diff -Nru kdiff3-1.8.01/.arcconfig kdiff3-1.8.3/.arcconfig --- kdiff3-1.8.01/.arcconfig 2019-05-18 01:01:30.000000000 +0000 +++ kdiff3-1.8.3/.arcconfig 1970-01-01 00:00:00.000000000 +0000 @@ -1,3 +0,0 @@ -{ - "phabricator.uri" : "https://phabricator.kde.org/" -} diff -Nru kdiff3-1.8.01/ChangeLog kdiff3-1.8.3/ChangeLog --- kdiff3-1.8.01/ChangeLog 2019-05-18 01:01:30.000000000 +0000 +++ kdiff3-1.8.3/ChangeLog 2020-06-25 00:17:35.000000000 +0000 @@ -1,3 +1,43 @@ +Version 1.8.3 - 2020-06-24 +=========================== +Bug 423001 fixed reload on Windows. +15f1cc4e - Fixed error handling during directory compare. +065a3997, 2d56cd94, 42b3b5e4 - Only give one error message per directory compare opperation. +Bug 419722 - Fix crash when clipboard is available. Mainly affects some network setups. +f2d89bbc - Rework intial window display and full screen toggling. +BUG:421048 - Treat /dev/null as non-existant as git expects. + +Version 1.8.2 - 2020-03-29 +=========================== +Bug 411472 Allow editing of blank lines and don't mark newly intserted lines as a confilict +2ba20222 - Remove broken attempt to optimize drawing on horizonal scroll. +Bug 418813 - Fix line numbers not shown. Use QString::number directly not through a format string. +11e93232 - Correcly support "Print Current Page" +64804a64 - Don't attempt to free nullptr in SourceData::FileData::reset() +f4c66ace - Make Preferance dialog panes scrollable if too large to fit on screen. +de06e561 - Fix dialog filter on windows. +e8d06774 - Switch to QElapsedTime for timing avoids explictly undefined behavior inside qt if time is changed. +05e2d6fb - Fix sync mode. +f9bd88a1 - Make matching in CvsIngnoreList always honor bCaseSensitive setting. +418ea78c - Don't use temporary with QLatin1String constructor strange things will happen. +b058c060 - ignore over size cvsignore files +Bug 410962 - Fix '-L' parameter handling +b4b2c970 - Restore acciedently deleted --auto option +Bug 411602 - Fixing missing menu items also resolves a potiential crash in MergeResultWindow::slotUpdateAvailabilities (Bug 407745). +d4239b92 - Prevent intermient crash during reload/refresh +Bug 410008 - Show diff for empty/missing files. +3bb755c5 - Don't give false error when comparing empty folders +Bug 408991 - 4ad69790,0737cc3e,0402f84a - Close files when not in use - Fixes "Too many open files" bug. +Bug 407829 - Avoid crash when recieving mouse or key events during earily startup. +cc6d76e3 - Don't try to manually build url if parent is not set. +85052379 - Fix crash when canceling by using only one event loop in ProgressDialog. +d151f151 - Don't append to already complete url. +d3cb2def - Fix manual url building in FileAccess::setFromUdsEntry - scheme should not change now. +Bug 405918 - Fix craft install instructions for windows +Bug 411586 - Fix crash in OptionDialog::slotApply() +Bug 407745 - Fix crash in MergeResultWindow::slotUpdateAvailabilities +Bug 407894,399070 - Fixed redraw for horizonal scrolling. + Version 1.8 - 2019-03-22 =========================== -Don't enable "Choose C for Everthing" on two way merge. @@ -26,7 +66,7 @@ - Improved handling of texts with both right to left and left to right languages (mixed Arabic and western texts). - Improved handling of Chinese and Japanese. - Whitespace characters are now shown as dots for spaces and arrows for tabs, and not only in differences. - - Fixed symlink comparison (Qt4 symLinkTarget returns absolute paths) + - Fixed symlink comparison (Qt4 symLinkTarget returns absolute paths) - Text analysis for rendering with QTextLayout is interruptable and multithreaded. (See progressbar and abort-button in statusbar) - Fix for saving to relative path in KDE-environments. (Patch from Harald Sitter) - Fixed bug in 0.9.97: Directory compare was always case sensitive. @@ -50,7 +90,7 @@ - Fixed mouse wheel problem. (Patch by David Hay) - Change an encoding in diff text window via click on encoding label. (Patch by Alexey Kostromin) - Fix for tab-key moving focus instead of adding a tab character in MergeResultWindow. -- Workaround for git on Cygwin that allows KDiff3 to find files in a Cygwin "/tmp" directory +- Workaround for git on Cygwin that allows KDiff3 to find files in a Cygwin "/tmp" directory when environment variable "CYGWIN_BIN" is set. (Patch by Nigel Stewart) - Removed iostream dependency (Patch by Nigel Stewart) - Regression test framework (by Maurice van der Pot) @@ -76,7 +116,7 @@ - String corrections (Frederik Schwarzer) - Fixed writing to KIO. - OS2-Port (Patch by Silvan Scherrer) -- Fixed problem where destination directory would be renamed or deleted during copy operation. +- Fixed problem where destination directory would be renamed or deleted during copy operation. Now if the destination directory exists only the files inside will be copied. - In merge: Separate lines where the automatic choice would be the same but for different reasons. - Fixed some problems with huge files in directory comparison mode (>2GB) (but direct comparison is still not possible) @@ -86,7 +126,7 @@ - Exclude printing code if Qt was compiled without printing support. - For Windows: Fixed handling of unicode characters in command line parameters. - Improved "old mac" lineendstyle handling: Break lines. -- Detect encoding specified in xml header or html "meta" tag. +- Detect encoding specified in xml header or html "meta" tag. Version 0.9.95 - 2009/03/03 =========================== @@ -180,7 +220,7 @@ - Filename-edit above DiffInputWindows - Windows-Context Menu in A/B/C-columns for dir-comparison (Windows only) - Edit Menu: Select All (Ctrl-A) -- New commandline options: +- New commandline options: --config filename: Select an individual config file. (Now also available for Windows and Qt-only version.) --cs config: Change one specific setting via the command line. (For settings that were previously adjustable via GUI only.) --confighelp: Show available config items and their current values. @@ -233,7 +273,7 @@ - Fix for MergeResultWindow-contextmenu: All items were disabled always. (new in 0.9.84) - Fix for problem when opening files specified relative to current directory. (new in 0.9.84, qt-only-version) - Fix for compilation with older gcc (2.9x) -- Several Word-wrap problems fixed: +- Several Word-wrap problems fixed: - Find string with word wrap active didn't work if found text was not in first wrap-line. - overview-position was not updated when toggling word wrap - horizontal scrollbar was not updated when toggling word wrap @@ -253,15 +293,15 @@ ============================ New Features: - Word Wrap for DiffTextWindow -- Directory-Comparison: Option "Full Analysis" allows you to show the number of solved vs. unsolved +- Directory-Comparison: Option "Full Analysis" allows you to show the number of solved vs. unsolved conflicts or deltas vs. whitespace-changes in the directory tree. - Diff-Menu for Diff-view specific entries -- Docs now contain a new chapter for uses of preprocessor and line-matching-preprocessor. +- Docs now contain a new chapter for uses of preprocessor and line-matching-preprocessor. - Added several credits which now are also visible in the Qt-only version. - The Qt-only version now also shows all command-line options. Under windows a dialog shows them. - Command line options -u and -L for Subversion-support. - Command line options --L1/2/3 for specifying alias names. -- In the Qt-only-version the user-interface-language can be set via the regional-settings +- In the Qt-only-version the user-interface-language can be set via the regional-settings (only effective after a restart). - ProgressDialog redesign for recursive use. - Overview now allows you to show the delta between two other files in triplediff-mode. @@ -305,7 +345,7 @@ (To avoid accidental overwrites.) - Icon for "Highlight white space differences." - Editor-Option: Line End Style for saving: Dos/Windows "\r\n" vs. Unix "\n" -- Merge output editor: Corrected wrong encoding for output-filename and +- Merge output editor: Corrected wrong encoding for output-filename and user-typed characters. - Speedup for reading directories under Windows. - Enhanced progress dialog responsiveness during local file copy. @@ -317,7 +357,7 @@ - Bugfix for 3 file-compare (and A or B don't exist, crashed) - Bugfix for crash when second directory is merged - Some keyboard-shortcuts for selection of merge-operation didn't work correctly. -- Shortcuts Ctrl-1/2/3 are possible in textmergewindow and in dirmergewindow, +- Shortcuts Ctrl-1/2/3 are possible in textmergewindow and in dirmergewindow, depending on the focus. - First steps towards internationalisation - Manpage doc/en/kdiff3.1 by Eike Sauer (for Debian) diff -Nru kdiff3-1.8.01/CMakeLists.txt kdiff3-1.8.3/CMakeLists.txt --- kdiff3-1.8.01/CMakeLists.txt 2019-05-18 01:01:30.000000000 +0000 +++ kdiff3-1.8.3/CMakeLists.txt 2020-06-25 00:17:35.000000000 +0000 @@ -3,11 +3,12 @@ project(kdiff3) -set(CMAKE_CXX_EXTENSIONS OFF ) #don't use non-standard extensions +set(CMAKE_CXX_EXTENSIONS ON ) #disable trigraphs in clang/gcc -- officially removed in c++17 set(CMAKE_EXPORT_COMPILE_COMMANDS ON) set(ECM_MIN_VERSION "5.10.0") set(QT_MIN_VERSION "5.6.0") -set(KF5_MIN_VERSION "5.23.0") +#KF5 5.27 fixes a crash bug triggered on exit. +set(KF5_MIN_VERSION "5.27.0") find_package(ECM ${ECM_MIN_VERSION} CONFIG REQUIRED) set( @@ -25,7 +26,7 @@ include(ECMAddAppIcon) include(ECMSetupVersion) -ecm_setup_version(1.8.1 VARIABLE_PREFIX KDIFF3 VERSION_HEADER ${CMAKE_BINARY_DIR}/src/version.h) +ecm_setup_version(1.8.3 VARIABLE_PREFIX KDIFF3 VERSION_HEADER ${CMAKE_BINARY_DIR}/src/version.h) find_package( Qt5 ${QT_MIN_VERSION} @@ -49,6 +50,7 @@ IconThemes ) +option(ENABLE_AUTO "Enable kdiff3's '--auto' flag" ON) option(ENABLE_CLANG_TIDY "Run clang-tidy if available and cmake version >=3.6" OFF) set(KDiff3_LIBRARIES ${Qt5PrintSupport_LIBRARIES} KF5::I18n KF5::CoreAddons KF5::Crash KF5::IconThemes ) @@ -56,14 +58,16 @@ if (CMAKE_CXX_COMPILER_ID MATCHES "Clang") #Adjust clang specific warnings set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wshadow") - set(CLANG_WARNING_FLAGS "-Wno-invalid-pp-token -Wno-comment -Wshorten-64-to-32 -Wstring-conversion -Wc++11-narrowing -fstack-protector-all") + set(CLANG_WARNING_FLAGS "-Wno-trigraphs -Wno-invalid-pp-token -Wno-comment -Wshorten-64-to-32 -Wstring-conversion -Wc++11-narrowing -fstack-protector-all") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CLANG_WARNING_FLAGS}") elseif(CMAKE_CXX_COMPILER_ID MATCHES "MSVC") add_definitions(-DNOMINMAX) #Suppress MSVCs min/max macros elseif(CMAKE_CXX_COMPILER_ID MATCHES "GNU") + if(CMAKE_CXX_COMPILER_VERSION VERSION_LESS 8.0) set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fstack-check") + endif() if(CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 7.0) - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wduplicated-cond -Wduplicated-branches -Wshadow") + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wno-trigraphs -Wduplicated-cond -Wduplicated-branches -Wshadow") endif() endif() @@ -89,11 +93,21 @@ cxx_static_assert ) +if(ENABLE_AUTO) + add_definitions( + -DENABLE_AUTO + ) +endif() + add_definitions( -DQT_DEPRECATED_WARNINGS #Get warnings from QT about deprecated functions. -DQT_NO_URL_CAST_FROM_STRING # casting from string to url does not always behave as you might think -DQT_RESTRICTED_CAST_FROM_ASCII #casting from char*/QByteArray to QString can produce unexpected results for non-latin characters. -DQT_NO_CAST_TO_ASCII + -DQT_DISABLE_DEPRECATED_BEFORE=0x050600#disable depriated api for Qt<5.6. + #KF5 5.64+ flags + #Don't warn for API depreciated after 5.27.0 (below as hex.hex.hex number) + -DKF_DEPRECATED_WARNINGS_SINCE=0x051A00 ) add_subdirectory(src) diff -Nru kdiff3-1.8.01/debian/changelog kdiff3-1.8.3/debian/changelog --- kdiff3-1.8.01/debian/changelog 2020-06-30 05:07:37.000000000 +0000 +++ kdiff3-1.8.3/debian/changelog 2020-07-05 06:17:21.000000000 +0000 @@ -1,3 +1,20 @@ +kdiff3 (1.8.3-1) unstable; urgency=medium + + * New upstream release: + - fixes handling of the -L command line option (Closes: #939017) + - fixes missing menu items (Closes: #962960) + * Update the build dependencies according to the upstream build system: + - bump the KF packages to 5.27.0 + * Update the patches: + - upstream_Don-t-try-to-set-value-unless-scrollbar-exists.patch: drop, + backported from upstream + - libatomic.diff: refresh + * Add the upstream signing key. + * Do not ship the diff_ext.mo translations, as they are for a component + specific for Windows. + + -- Pino Toscano Sun, 05 Jul 2020 08:17:21 +0200 + kdiff3 (1.8.01-2) unstable; urgency=medium * Switch the maintainer to Debian KDE Extras Team, as agreed with Eike; diff -Nru kdiff3-1.8.01/debian/control kdiff3-1.8.3/debian/control --- kdiff3-1.8.01/debian/control 2020-06-30 05:02:18.000000000 +0000 +++ kdiff3-1.8.3/debian/control 2020-07-03 05:47:41.000000000 +0000 @@ -10,15 +10,15 @@ cmake (>= 3.1~), extra-cmake-modules (>= 5.10.0~), qtbase5-dev (>= 5.6.0~), - libkf5config-dev (>= 5.23.0~), - libkf5coreaddons-dev (>= 5.23.0~), - libkf5crash-dev (>= 5.23.0~), - libkf5doctools-dev (>= 5.23.0~), - libkf5iconthemes-dev (>= 5.23.0~), - libkf5i18n-dev (>= 5.23.0~), - libkf5kio-dev (>= 5.23.0~), - libkf5parts-dev (>= 5.23.0~), - libkf5widgetsaddons-dev (>= 5.23.0~), + libkf5config-dev (>= 5.27.0~), + libkf5coreaddons-dev (>= 5.27.0~), + libkf5crash-dev (>= 5.27.0~), + libkf5doctools-dev (>= 5.27.0~), + libkf5iconthemes-dev (>= 5.27.0~), + libkf5i18n-dev (>= 5.27.0~), + libkf5kio-dev (>= 5.27.0~), + libkf5parts-dev (>= 5.27.0~), + libkf5widgetsaddons-dev (>= 5.27.0~), Standards-Version: 4.5.0 Rules-Requires-Root: no Homepage: https://kde.org/applications/development/kdiff3 diff -Nru kdiff3-1.8.01/debian/patches/libatomic.diff kdiff3-1.8.3/debian/patches/libatomic.diff --- kdiff3-1.8.01/debian/patches/libatomic.diff 2020-06-29 17:31:56.000000000 +0000 +++ kdiff3-1.8.3/debian/patches/libatomic.diff 2020-07-03 05:52:48.000000000 +0000 @@ -2,8 +2,8 @@ Author: eike@debian.org --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -51,7 +51,7 @@ - +@@ -53,7 +53,7 @@ find_package( + option(ENABLE_AUTO "Enable kdiff3's '--auto' flag" ON) option(ENABLE_CLANG_TIDY "Run clang-tidy if available and cmake version >=3.6" OFF) -set(KDiff3_LIBRARIES ${Qt5PrintSupport_LIBRARIES} KF5::I18n KF5::CoreAddons KF5::Crash KF5::IconThemes ) diff -Nru kdiff3-1.8.01/debian/patches/series kdiff3-1.8.3/debian/patches/series --- kdiff3-1.8.01/debian/patches/series 2020-06-29 18:47:48.000000000 +0000 +++ kdiff3-1.8.3/debian/patches/series 2020-07-03 05:51:52.000000000 +0000 @@ -1,2 +1 @@ -upstream_Don-t-try-to-set-value-unless-scrollbar-exists.patch libatomic.diff diff -Nru kdiff3-1.8.01/debian/patches/upstream_Don-t-try-to-set-value-unless-scrollbar-exists.patch kdiff3-1.8.3/debian/patches/upstream_Don-t-try-to-set-value-unless-scrollbar-exists.patch --- kdiff3-1.8.01/debian/patches/upstream_Don-t-try-to-set-value-unless-scrollbar-exists.patch 2020-06-29 18:44:54.000000000 +0000 +++ kdiff3-1.8.3/debian/patches/upstream_Don-t-try-to-set-value-unless-scrollbar-exists.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,79 +0,0 @@ -From 6fd52582694f5616df3ec135fe22f21fc281036d Mon Sep 17 00:00:00 2001 -From: Michael Reeves -Date: Tue, 2 Jul 2019 22:44:41 -0400 -Subject: [PATCH] Don't try to set value unless scrollbar exists. - -Mouse or key events can be sent before the scrollbars are setup properly. - -BUG: 407829 -FIXED-IN:1.8.2 ---- - src/kdiff3.h | 4 ++-- - src/pdiff.cpp | 20 ++++++++++++++------ - 2 files changed, 16 insertions(+), 8 deletions(-) - -diff --git a/src/kdiff3.h b/src/kdiff3.h -index aca6f89..158e4ab 100644 ---- a/src/kdiff3.h -+++ b/src/kdiff3.h -@@ -318,8 +318,8 @@ class KDiff3App : public QSplitter - QSplitter* m_pMainSplitter; - QWidget* m_pMainWidget; - QWidget* m_pMergeWindowFrame; -- ReversibleScrollBar* m_pHScrollBar; -- QScrollBar* m_pDiffVScrollBar; -+ ReversibleScrollBar* m_pHScrollBar = nullptr; -+ QScrollBar* m_pDiffVScrollBar = nullptr; - QScrollBar* m_pMergeVScrollBar; - - DiffTextWindow* m_pDiffTextWindow1; -diff --git a/src/pdiff.cpp b/src/pdiff.cpp -index 1094297..8a3ddb1 100644 ---- a/src/pdiff.cpp -+++ b/src/pdiff.cpp -@@ -537,12 +537,12 @@ void KDiff3App::resizeMergeResultWindow() - - void KDiff3App::scrollDiffTextWindow(int deltaX, int deltaY) - { -- if(deltaY != 0) -+ if(deltaY != 0 && m_pDiffVScrollBar != nullptr) - { - m_pDiffVScrollBar->setValue(m_pDiffVScrollBar->value() + deltaY); - m_pOverview->setRange(m_pDiffVScrollBar->value(), m_pDiffVScrollBar->pageStep()); - } -- if(deltaX != 0) -+ if(deltaX != 0 && m_pHScrollBar != nullptr) - m_pHScrollBar->QScrollBar::setValue(m_pHScrollBar->value() + deltaX); - } - -@@ -954,15 +954,23 @@ void KDiff3App::keyPressEvent(QKeyEvent* keyEvent) - break; - case Qt::Key_Home: - if(bCtrl) -- m_pDiffVScrollBar->setValue(0); -+ { -+ if(m_pDiffVScrollBar != nullptr) m_pDiffVScrollBar->setValue(0); -+ } - else -- m_pHScrollBar->setValue(0); -+ { -+ if(m_pHScrollBar != nullptr) m_pHScrollBar->setValue(0); -+ } - break; - case Qt::Key_End: - if(bCtrl) -- m_pDiffVScrollBar->setValue(m_pDiffVScrollBar->maximum()); -+ { -+ if(m_pDiffVScrollBar != nullptr) m_pDiffVScrollBar->setValue(m_pDiffVScrollBar->maximum()); -+ } - else -- m_pHScrollBar->setValue(m_pHScrollBar->maximum()); -+ { -+ if(m_pHScrollBar != nullptr) m_pHScrollBar->setValue(m_pHScrollBar->maximum()); -+ } - break; - default: - break; --- -2.27.0 - diff -Nru kdiff3-1.8.01/debian/rules kdiff3-1.8.3/debian/rules --- kdiff3-1.8.01/debian/rules 2020-06-29 18:02:43.000000000 +0000 +++ kdiff3-1.8.3/debian/rules 2020-07-03 06:19:46.000000000 +0000 @@ -6,3 +6,8 @@ %: dh $@ --with kf5 + +override_dh_auto_install: + dh_auto_install + # drop translations of Windows-only component + rm debian/tmp/usr/share/locale/*/LC_MESSAGES/diff_ext.mo diff -Nru kdiff3-1.8.01/debian/upstream/signing-key.asc kdiff3-1.8.3/debian/upstream/signing-key.asc --- kdiff3-1.8.01/debian/upstream/signing-key.asc 1970-01-01 00:00:00.000000000 +0000 +++ kdiff3-1.8.3/debian/upstream/signing-key.asc 2020-07-03 06:01:57.000000000 +0000 @@ -0,0 +1,28 @@ +-----BEGIN PGP PUBLIC KEY BLOCK----- + +mQINBE0iloUBEAC02n3+spjRz+9/qiKHuOojr0Gli9IYGdtz+uE2WE8iy/vlNJcg +9ai3baaERzekbs3G59d5QswPpWDdpnxJ9i8W/pucCzZ8tCk2Squ8QWeEne30M2BQ +mGBfjUVx/z/giTpShuWTzi4LHYfZa6Hl5HmmhN73YfvvsADLWZbH5YaZttyz6kir +t2olMlirNUi8m77DsK6T+6KMuBTkFjvKj1acJovyPLuH0PvJ568c6g7sVOe2K+MO +ANsBvU+3zssE5dJfS2QNZNT4venpv7m3hTij2BEsVGl2D5VxuGZusygDpL6Liao9 +S7TF0DXMaY/89h1H/DFR7ewJcdFIeOaQBg2SydczqOnoJJmfPJnx6hoTaQ8HqAvk +owNz2o2kZvWddD9kX63iEZmqWo6XVEpQSRa9nwEIcsuGbGakjiT7XGJLme/ROkYi +xdpQbQHJ7YWxK/Q2qC5H69xaPGpgZIz7gFCHlwNfFI1Ykn1UgJ2gNomj4u2040gk +wTq3XtTsA4y1YOUPXCR1G+vx/qzEehjV6GGhQtmiFp+7/kpKVfca+QrxwKszBHAP +O7yEwwZmVYdqL39mu7yrBPeqQdp/mJgrB1NsGQO7sHyQ8JTXqnYKsXBC5O800duV +uYEubi+Ws5SzuXpBOm726o89eFtAVhteri6PSTecavScaT9G+IISzVnAxwARAQAB +tCRNaWNoYWVsIFJlZXZlcyA8cmVldmVzLjg3QGdtYWlsLmNvbT6JAjgEEwECACIF +Ak0iloUCGy8GCwkIBwMCBhUIAgkKCwQWAgMBAh4BAheAAAoJEPRCs21hSwa821kP +/jFIuCoWt837PjeZ8POz6K7SAcbpEsxMc/MYZcB1Z71nHrcnUuIRs+1Suwifb9Eb +7dZF6X3H5HLMgvCH30iB+kG5jVAr0mNlHMFa/s0nwom4hq/jCzrdg0kzNLwP+4cg +bR45zjq8lugtQQ1KloxXRAG6g26cv6DpHQQcOJGCQhbVIimDsxgfJEJld8iJKail +59XDqVZG4rvAtmdApreZYzqhgY09RCAP37zmjbTQYyNvhyrVVQQKT9MibM2zJ75W +A98vNzDvwDKxGX5JZpElnVbTOrr58U8OAIjXx9yXywa96uXrhTxNea36Ntp2b9Tr +dYMuK3GjK2EEf1dkH8L+ntUtjnfdgHCZeDFqVUgmHkNoBBVupEgXIzEwRqghvmxG +ykgVxaCW3ycsSQVUqrE+1eU89bRfjnBzQ+NZewceah0cv3m3Y5HAiyYd9uSlSPdT +HVllFW1jXlE5BqbV1/PbMQP54qjAa9vPrI+xn/NwWJTwKz3AH838URY0ZNfgRL09 +1cNLN72p59LLBsr0YZYFsMKcxoVFdx6SEe0Gaozs8Y+T6LCLaNgWUFVGuuZzQSIo +IjSWk8/33lOqBvnUD0h6KK/PAO9C4GyqrgZHci3N/TwkDpJgQMwUiRgqNGrPmxRt +uPG4qtMgBkSlt5hk39yPcsgkkiVSneKMire8gbdQ7+zH +=nhS5 +-----END PGP PUBLIC KEY BLOCK----- diff -Nru kdiff3-1.8.01/debian/watch kdiff3-1.8.3/debian/watch --- kdiff3-1.8.01/debian/watch 2020-06-29 18:24:34.000000000 +0000 +++ kdiff3-1.8.3/debian/watch 2020-07-03 06:02:03.000000000 +0000 @@ -1,2 +1,2 @@ version=4 -https://download.kde.org/stable/kdiff3/kdiff3-([\d\.]+)\.tar\.xz +opts=pgpsigurlmangle=s/$/.sig/ https://download.kde.org/stable/kdiff3/kdiff3-([\d\.]+)\.tar\.xz diff -Nru kdiff3-1.8.01/diff_ext_for_kdiff3/diff_ext.cpp kdiff3-1.8.3/diff_ext_for_kdiff3/diff_ext.cpp --- kdiff3-1.8.01/diff_ext_for_kdiff3/diff_ext.cpp 2019-05-18 01:01:30.000000000 +0000 +++ kdiff3-1.8.3/diff_ext_for_kdiff3/diff_ext.cpp 2020-06-25 00:17:35.000000000 +0000 @@ -34,169 +34,6 @@ #include #include - -#ifdef UNICODE - -static void parseString( const std::wstring& s, size_t& i /*pos*/, std::wstring& r /*result*/ ) -{ - size_t size = s.size(); - ++i; // Skip initial '"' - for( ; i s_translationMap; -static tstring s_translationFileName; - -void readTranslationFile() -{ - s_translationMap.clear(); - FILE* pFile = _tfopen( s_translationFileName.c_str(), TEXT("rb") ); - if ( pFile ) - { - MESSAGELOG( TEXT( "Reading translations: " ) + s_translationFileName ); - std::vector buffer; - try { - if ( fseek(pFile, 0, SEEK_END)==0 ) - { - size_t length = ftell(pFile); // Get the file length - buffer.resize(length); - fseek(pFile, 0, SEEK_SET ); - fread(&buffer[0], 1, length, pFile ); - } - } - catch(...) - { - } - fclose(pFile); - - if (buffer.size()>0) - { - size_t bufferSize = buffer.size(); - int offset = 0; - if ( buffer[0]=='\xEF' && buffer[1]=='\xBB' && buffer[2]=='\xBF' ) - { - offset += 3; - bufferSize -= 3; - } - - size_t sLength = MultiByteToWideChar(CP_UTF8,0,&buffer[offset], (int)bufferSize, 0, 0 ); - std::wstring s( sLength, L' ' ); - MultiByteToWideChar(CP_UTF8,0,&buffer[offset], (int)bufferSize, &s[0], (int)s.size() ); - - // Now analyze the file and extract translation strings - std::wstring msgid; - std::wstring msgstr; - msgid.reserve( 1000 ); - msgstr.reserve( 1000 ); - bool bExpectingId = true; - for( size_t i=0; i5 && wcsncmp( &s[i], L"msgid", 5 )==0 ) - { - if ( !msgid.empty() && !msgstr.empty() ) - { - s_translationMap[msgid] = msgstr; - } - bExpectingId = true; - msgid.clear(); - i+=4; - } - else if ( sLength-i>6 && wcsncmp( &s[i], L"msgstr", 6 )==0 ) - { - bExpectingId = false; - msgstr.clear(); - i+=5; - } - else - { - // Unexpected ? - } - } - } - } - else - { - ERRORLOG( TEXT( "Reading translations failed: " ) + s_translationFileName ); - } -} - -static tstring getTranslation( const tstring& fallback ) -{ - std::map< std::wstring, std::wstring >::iterator i = s_translationMap.find( fallback ); - if (i!=s_translationMap.end()) - return i->second; - return fallback; -} -#else - -static tstring getTranslation( const tstring& fallback ) -{ - return fallback; -} - -#endif - - -static void replaceArgs( tstring& s, const tstring& r1, const tstring& r2=TEXT(""), const tstring& r3=TEXT("") ) -{ - tstring arg1 = TEXT("%1"); - size_t pos1 = s.find( arg1 ); - tstring arg2 = TEXT("%2"); - size_t pos2 = s.find( arg2 ); - tstring arg3 = TEXT("%3"); - size_t pos3 = s.find( arg3 ); - if ( pos1 != size_t(-1) ) - { - s.replace( pos1, arg1.length(), r1 ); - if ( pos2 != size_t(-1) && pos1recent_files() ) @@ -265,17 +102,6 @@ { LOG(); -#ifdef UNICODE - tstring installDir = SERVER::instance()->getRegistryKeyString( TEXT(""), TEXT("InstallDir") ); - tstring language = SERVER::instance()->getRegistryKeyString( TEXT(""), TEXT("Language") ); - tstring translationFileName = installDir + TEXT("\\translations\\diff_ext_") + language + TEXT(".po"); - if ( s_translationFileName != translationFileName ) - { - s_translationFileName = translationFileName; - readTranslationFile(); - } -#endif - FORMATETC format = {CF_HDROP, 0, DVASPECT_CONTENT, -1, TYMED_HGLOBAL}; STGMEDIUM medium; medium.tymed = TYMED_HGLOBAL; @@ -288,8 +114,6 @@ TCHAR tmp[MAX_PATH]; - //initialize_language(); - if (m_nrOfSelectedFiles >= 1 && m_nrOfSelectedFiles <= 3) { DragQueryFile(drop, 0, tmp, MAX_PATH); @@ -388,15 +212,17 @@ if(m_nrOfSelectedFiles == 1) { size_t nrOfRecentFiles = m_recentFiles.size(); - tstring menuStringCompare = i18n("Compare with %1"); - tstring menuStringMerge = i18n("Merge with %1"); + tstring menuStringCompare; + tstring menuStringMerge; tstring firstFileName; if( nrOfRecentFiles>=1 ) { firstFileName = TEXT("'") + cut_to_length( m_recentFiles.front() ) + TEXT("'"); } - replaceArgs( menuStringCompare, firstFileName ); - replaceArgs( menuStringMerge, firstFileName ); + + menuStringCompare = i18n("Compare with %1", firstFileName); + menuStringMerge = i18n("Merge with %1", firstFileName); + m_id_DiffWith = insertMenuItemHelper( subMenu, id++, pos2++, menuStringCompare, nrOfRecentFiles >=1 ? MFS_ENABLED : MFS_DISABLED ); m_id_MergeWith = insertMenuItemHelper( subMenu, id++, pos2++, menuStringMerge, nrOfRecentFiles >=1 ? MFS_ENABLED : MFS_DISABLED ); @@ -405,11 +231,10 @@ // tstring firstFileName = cut_to_length( m_recentFiles.front() ); // tstring secondFileName = cut_to_length( *(++m_recentFiles.begin()) ); //} - m_id_Merge3 = insertMenuItemHelper( subMenu, id++, pos2++, i18n("3-way merge with base"), + m_id_Merge3 = insertMenuItemHelper( subMenu, id++, pos2++, fromQString(i18n("3-way merge with base")), nrOfRecentFiles >=2 ? MFS_ENABLED : MFS_DISABLED ); - menuString = i18n("Save '%1' for later"); - replaceArgs( menuString, _file_name1 ); + menuString = fromQString(i18n("Save '%1' for later", toQString(_file_name1))); m_id_DiffLater = insertMenuItemHelper( subMenu, id++, pos2++, menuString ); HMENU file_list = CreateMenu(); @@ -423,25 +248,25 @@ ++n; } - insertMenuItemHelper( subMenu, id++, pos2++, i18n("Compare with ..."), + insertMenuItemHelper( subMenu, id++, pos2++, fromQString(i18n("Compare with ...")), nrOfRecentFiles > 0 ? MFS_ENABLED : MFS_DISABLED, file_list ); - m_id_ClearList = insertMenuItemHelper( subMenu, id++, pos2++, i18n("Clear list"), nrOfRecentFiles >=1 ? MFS_ENABLED : MFS_DISABLED ); + m_id_ClearList = insertMenuItemHelper( subMenu, id++, pos2++, fromQString(i18n("Clear list")), nrOfRecentFiles >=1 ? MFS_ENABLED : MFS_DISABLED ); } else if(m_nrOfSelectedFiles == 2) { //= "Diff " + cut_to_length(_file_name1, 20)+" and "+cut_to_length(_file_name2, 20); - m_id_Diff = insertMenuItemHelper( subMenu, id++, pos2++, i18n("Compare") ); + m_id_Diff = insertMenuItemHelper( subMenu, id++, pos2++, fromQString(i18n("Compare")) ); } else if ( m_nrOfSelectedFiles == 3 ) { - m_id_Diff3 = insertMenuItemHelper( subMenu, id++, pos2++, i18n("3 way comparison") ); + m_id_Diff3 = insertMenuItemHelper( subMenu, id++, pos2++, fromQString(i18n("3 way comparison")) ); } else { // More than 3 files selected? } - m_id_About = insertMenuItemHelper( subMenu, id++, pos2++, i18n("About Diff-Ext ...") ); + m_id_About = insertMenuItemHelper( subMenu, id++, pos2++, fromQString(i18n("About Diff-Ext ...")) ); insertMenuItemHelper( menu, id++, position++, TEXT("KDiff3"), MFS_ENABLED, subMenu ); @@ -512,14 +337,13 @@ else if(id == m_id_About) { LOG(); - std::wstring sBits = i18n("(32 Bit)"); + QString sBits = i18n("(32 Bit)"); if (sizeof(void*)==8) - sBits = i18n("(64 Bit)"); - MessageBox( _hwnd, (i18n("Diff-Ext Copyright (c) 2003-2006, Sergey Zorin. All rights reserved.\n") + MessageBox( _hwnd, (fromQString(i18n("Diff-Ext Copyright (c) 2003-2006, Sergey Zorin. All rights reserved.\n") + i18n("This software is distributable under the BSD-2-Clause license.\n") + i18n("Some extensions for KDiff3 (c) 2006-2013 by Joachim Eibl.\n") - + i18n("Homepage for Diff-Ext: http://diff-ext.sourceforge.net\n")).c_str() - , (i18n("About Diff-Ext for KDiff3 ")+sBits).c_str(), MB_OK ); + + i18n("Homepage for Diff-Ext: http://diff-ext.sourceforge.net\n"))).c_str() + , fromQString(i18n("About Diff-Ext for KDiff3 ")+sBits).c_str(), MB_OK ); } else { @@ -545,7 +369,7 @@ HRESULT ret = NOERROR; if(uFlags == GCS_HELPTEXT) { - tstring helpString; + QString helpString; if( idCmd == m_id_Diff ) { helpString = i18n("Compare selected files"); @@ -554,14 +378,12 @@ { if(!m_recentFiles.empty()) { - helpString = i18n("Compare '%1' with '%2'"); - replaceArgs( helpString, _file_name1, m_recentFiles.front() ); + helpString = i18n("Compare '%1' with '%2'", toQString(_file_name1), toQString(m_recentFiles.front())); } } else if(idCmd == m_id_DiffLater) { - helpString = i18n("Save '%1' for later operation"); - replaceArgs( helpString, _file_name1 ); + helpString = i18n("Save '%1' for later operation", _file_name1); } else if((idCmd >= m_id_DiffWith_Base) && (idCmd < m_id_DiffWith_Base+m_recentFiles.size())) { @@ -574,12 +396,11 @@ if ( i!=m_recentFiles.end() ) { - helpString = i18n("Compare '%1' with '%2'"); - replaceArgs( helpString, _file_name1, *i ); + helpString = i18n("Compare '%1' with '%2'", toQString(_file_name1), toQString(*i)); } } } - lstrcpyn( (LPTSTR)pszName, helpString.c_str(), cchMax ); + lstrcpyn( (LPTSTR)pszName, fromQString(helpString).c_str(), cchMax ); } else { @@ -616,10 +437,10 @@ if (bError) { - tstring message = i18n("Could not start KDiff3. Please rerun KDiff3 installation."); - message += TEXT("\n") + i18n("Command") + TEXT(": ") + command; - message += TEXT("\n") + i18n("CommandLine") + TEXT(": ") + commandLine; - MessageBox(_hwnd, message.c_str(), i18n("Diff-Ext For KDiff3").c_str(), MB_OK); + tstring message = fromQString(i18n("Could not start KDiff3. Please rerun KDiff3 installation.")); + message += TEXT("\n") + fromQString(i18n("Command")) + TEXT(": ") + command; + message += TEXT("\n") + fromQString(i18n("CommandLine")) + TEXT(": ") + commandLine; + MessageBox(_hwnd, message.c_str(), fromQString(i18n("Diff-Ext For KDiff3")).c_str(), MB_OK); } } diff -Nru kdiff3-1.8.01/diff_ext_for_kdiff3/diff_ext.h kdiff3-1.8.3/diff_ext_for_kdiff3/diff_ext.h --- kdiff3-1.8.01/diff_ext_for_kdiff3/diff_ext.h 2019-05-18 01:01:30.000000000 +0000 +++ kdiff3-1.8.3/diff_ext_for_kdiff3/diff_ext.h 2020-06-25 00:17:35.000000000 +0000 @@ -58,7 +58,6 @@ void diff( const tstring& arguments ); void diff_with(unsigned int num, bool bMerge); tstring cut_to_length(const tstring&, size_t length = 64); - void initialize_language(); private: UINT m_nrOfSelectedFiles; diff -Nru kdiff3-1.8.01/diff_ext_for_kdiff3/diffextstring.h kdiff3-1.8.3/diff_ext_for_kdiff3/diffextstring.h --- kdiff3-1.8.01/diff_ext_for_kdiff3/diffextstring.h 2019-05-18 01:01:30.000000000 +0000 +++ kdiff3-1.8.3/diff_ext_for_kdiff3/diffextstring.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,176 +0,0 @@ -/* - * Copyright (c) 2003, Sergey Zorin. All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR - * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES - * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF - * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - * - */ - - -#ifndef __string_h__ -#define __string_h__ - -#include -#include - -#include -#include - -class STRING; -inline STRING operator+( const STRING& s1, const STRING& s2); - -class STRING { - public: - static const int begin = 0; - static const int end = -1; - - public: - STRING(const STRING& s) { - _str = new TCHAR[s.length()+1]; - lstrcpy(_str, s); - } - - STRING(const TCHAR* str = TEXT("")) { - _str = new TCHAR[lstrlen(str)+1]; - lstrcpy(_str, str); - } - - ~STRING() { - delete[] _str; - } - - void resize( size_t newLength ) - { - size_t oldLength = length(); - if ( newLength < oldLength ) { - _str[newLength] = 0; // Just truncate the string - } else if( newLength>oldLength) { - TCHAR* p = new TCHAR[ newLength + 1 ]; - lstrcpy(p, _str); - for( size_t i=oldLength; i #include -//#include -//#include -//#include -//#include #include "server.h" #include "class_factory.h" diff -Nru kdiff3-1.8.01/diff_ext_for_kdiff3/server.h kdiff3-1.8.3/diff_ext_for_kdiff3/server.h --- kdiff3-1.8.01/diff_ext_for_kdiff3/server.h 2019-05-18 01:01:30.000000000 +0000 +++ kdiff3-1.8.3/diff_ext_for_kdiff3/server.h 2020-06-25 00:17:35.000000000 +0000 @@ -32,8 +32,16 @@ #ifdef UNICODE typedef std::wstring tstring; + +#define toQString(s) QString::fromStdWString(s) +#define fromQString(s) (s).toStdWString() + #else typedef std::string tstring; + +#define toQString(s) { QString::fromStdString(s);} +#define fromQString(s) { (s).toStdString();} + #endif #define MESSAGELOG( msg ) SERVER::logMessage( __FUNCTION__, __FILE__, __LINE__, msg ) @@ -53,34 +61,34 @@ public: static SERVER* instance(); void initLogging(); - + public: virtual ~SERVER(); - + tstring getRegistryKeyString( const tstring& subKey, const tstring& value ); - + HINSTANCE handle() const; - + HRESULT do_register(); HRESULT do_unregister(); - + void lock(); void release(); - + ULONG reference_count() const { return _reference_count; } - + std::list< tstring >& recent_files(); - + void save_history() const; static void logMessage( const char* function, const char* file, int line, const tstring& msg ); - + private: SERVER(); SERVER(const SERVER&) {} - + private: LONG _reference_count; std::list* m_pRecentFiles; diff -Nru kdiff3-1.8.01/doc/en/index.docbook kdiff3-1.8.3/doc/en/index.docbook --- kdiff3-1.8.01/doc/en/index.docbook 2019-05-18 01:01:30.000000000 +0000 +++ kdiff3-1.8.3/doc/en/index.docbook 2020-06-25 00:17:35.000000000 +0000 @@ -54,7 +54,7 @@ Do NOT change these in the translation. --> 2019-02-22 -1.08.01 +1.08.02 diff -Nru kdiff3-1.8.01/.gitlab-nonkde.yml kdiff3-1.8.3/.gitlab-nonkde.yml --- kdiff3-1.8.01/.gitlab-nonkde.yml 1970-01-01 00:00:00.000000000 +0000 +++ kdiff3-1.8.3/.gitlab-nonkde.yml 2020-06-25 00:17:35.000000000 +0000 @@ -0,0 +1,36 @@ +stages: + - build + - test + +build_ubuntu_18_04: + stage: build + image: reporter123/cmake:bionic + + before_script: + - apt-get update + - apt-get install -y libqt5test5 gettext qtbase5-dev extra-cmake-modules libkf5i18n-dev libkf5coreaddons-dev libkf5iconthemes-dev libkf5parts-dev libkf5doctools-dev libkf5crash-dev + script: + - cmake -DBUILD_TESTING=YES . + - make + artifacts: + untracked: true + retry: + max: 2 + when: + - runner_system_failure + - stuck_or_timeout_failure + +ubuntu_18_04_test: + stage: test + needs: ["build_ubuntu_18_04"] + image: reporter123/cmake:bionic + before_script: + - apt-get update + - apt-get install -y libqt5test5 + script: + - make ARGS="-V -E appstreamtest" test #exclude appstreamtest this does not run properly in my image + retry: + max: 2 + when: + - runner_system_failure + - stuck_or_timeout_failure diff -Nru kdiff3-1.8.01/INSTALL kdiff3-1.8.3/INSTALL --- kdiff3-1.8.01/INSTALL 2019-05-18 01:01:30.000000000 +0000 +++ kdiff3-1.8.3/INSTALL 2020-06-25 00:17:35.000000000 +0000 @@ -1,6 +1,6 @@ Building KDiff3 requires the fallowing minimium versions: 1)Qt 5.6 or later - 2)KF5 5.14+ + 2)KF5 5.27+ 3)CMake 3.1 4)ECM 1.8 Support compilers: @@ -33,20 +33,30 @@ 1)Set-ExecutionPolicy -Scope CurrentUser RemoteSigned 2)iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/KDE/craft/master/setup/install_craft.ps1')) -You may also have exempt your craft directory from virus scans as these can interefer with the build process. +You may also have to exempt your craft directory from virus scans as these can interefer with the build process. 1)cd to your craft root Run: 2)C:\CraftRoot\craft\craftenv.ps1 -3)craft kdiff3 -At this point you can run kdiff3 itself via the fallowing: +3)craft png2ico +4)craft kdiff3 +If you what to build 1.8x than use: +4) craft --target 1.8 kdiff3 + +Otherwise craft will use master which is the developement branch and therefor more likely to experiance breakage. + +At this point you can run kdiff3 itself via the following: cb kdiff3 bin/kdiff3 If you want to create an install package you would run: -4)craft --package kdiff3 +5)craft nsis -This will be a time consuming process on first run as craft will have download all dependencies. +6)craft --package kdiff3 or craft --target 1.8 --package kdiff3 + +This will be a time consuming process on first run as craft will have to download all dependencies. KDiff3 does not require special configuration for craft. There should be an installer package generated in CraftRoot/tmp + +Please contact kde-windows@kde.org before filing a bug report regarding this process. \ No newline at end of file diff -Nru kdiff3-1.8.01/kdiff3fileitemactionplugin/kdiff3fileitemaction.h kdiff3-1.8.3/kdiff3fileitemactionplugin/kdiff3fileitemaction.h --- kdiff3-1.8.01/kdiff3fileitemactionplugin/kdiff3fileitemaction.h 2019-05-18 01:01:30.000000000 +0000 +++ kdiff3-1.8.3/kdiff3fileitemactionplugin/kdiff3fileitemaction.h 2020-06-25 00:17:35.000000000 +0000 @@ -49,7 +49,7 @@ private: QList m_list; - QWidget* m_pParentWidget; + QWidget* m_pParentWidget = nullptr; //KFileItemListProperties m_fileItemInfos; }; #endif diff -Nru kdiff3-1.8.01/kdiff3fileitemactionplugin/kdiff3fileitemaction.json kdiff3-1.8.3/kdiff3fileitemactionplugin/kdiff3fileitemaction.json --- kdiff3-1.8.01/kdiff3fileitemactionplugin/kdiff3fileitemaction.json 2019-05-18 01:01:30.000000000 +0000 +++ kdiff3-1.8.3/kdiff3fileitemactionplugin/kdiff3fileitemaction.json 2020-06-25 00:17:35.000000000 +0000 @@ -11,19 +11,24 @@ "Name[de]": "Dateien und Ordner vergleichen und zusammenführen mit KDiff3", "Name[en_GB]": "Compare/Merge Files/Directories with KDiff3", "Name[es]": "Comparar o fusionar archivos o directorios con KDiff3", + "Name[eu]": "Alderatu/bateratu fitxategiak/direktorioak KDiff3 erabiliz", "Name[fi]": "Vertaa ja yhdistä tiedostoja ja kansioita KDiff3:lla", "Name[fr]": "Comparaison et fusion de fichiers ou de dossiers à l'aide de « KDiff3 »", "Name[gl]": "Comparar ou mesturar ficheiros ou directorios con KDiff3", + "Name[ia]": "Compara/Fusiona Files/Directorios con KDiff3", "Name[it]": "Confronta e fonde i file o le cartelle con KDiff3", "Name[ko]": "KDiff3으로 파일과 디렉터리를 비교하거나 병합", "Name[nl]": "Vergelijk/Voeg samen bestanden/mappen met KDiff3", + "Name[nn]": "Samanlikna/flett filer/mapper med KDiff3", "Name[pl]": "Porównuj/Scalaj pliki/katalogi z KDiff3", "Name[pt]": "Comparar/Reunir os Ficheiros/Pastas com o KDiff3", "Name[pt_BR]": "Comparar/Mesclar arquivos/pastas com o KDiff3", + "Name[ru]": "Сравнение и слияние файлов и каталогов с использованием приложения KDiff3", "Name[sk]": "Porovnať/zlúčiť súbory/adresáre s KDiff3", "Name[sv]": "Jämför/Sammanfoga filer/kataloger med KDiff3", "Name[uk]": "Порівняння та об'єднання файлів та каталогів за допомогою KDiff3", "Name[x-test]": "xxCompare/Merge Files/Directories with KDiff3xx", + "Name[zh_CN]": "使用KDiff3比较/合并文件或文件夹", "Name[zh_TW]": "使用 KDiff3 比較/合併檔案或資料夾", "ServiceTypes": [ "KFileItemAction/Plugin" diff -Nru kdiff3-1.8.01/po/ar/kdiff3.po kdiff3-1.8.3/po/ar/kdiff3.po --- kdiff3-1.8.01/po/ar/kdiff3.po 2019-05-18 01:01:47.000000000 +0000 +++ kdiff3-1.8.3/po/ar/kdiff3.po 2020-06-25 00:18:01.000000000 +0000 @@ -3,8 +3,8 @@ msgid "" msgstr "" "Project-Id-Version: kdiff3\n" -"Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2019-04-18 08:02+0200\n" +"Report-Msgid-Bugs-To: https://bugs.kde.org\n" +"POT-Creation-Date: 2020-06-22 07:48+0200\n" "PO-Revision-Date: 2006-12-03 19:06+0100\n" "Last-Translator: محمد سعد Mohamed SAAD \n" "Language-Team: Arabic \n" @@ -26,334 +26,334 @@ msgid "Your emails" msgstr "" -#: difftextwindow.cpp:412 +#: difftextwindow.cpp:414 #, kde-format msgid "File %1: Line %2" msgstr "" -#: difftextwindow.cpp:414 +#: difftextwindow.cpp:416 #, fuzzy, kde-format msgid "File %1: Line not available" msgstr "غير متوفر" -#: difftextwindow.cpp:1780 +#: difftextwindow.cpp:1778 #, kde-format msgid "Encoding:" msgstr "" -#: difftextwindow.cpp:1782 mergeresultwindow.cpp:3138 optiondialog.cpp:818 +#: difftextwindow.cpp:1781 mergeresultwindow.cpp:3166 optiondialog.cpp:840 #, kde-format msgid "Line end style:" msgstr "" -#: difftextwindow.cpp:1810 directorymergewindow.cpp:382 -#: directorymergewindow.cpp:433 directorymergewindow.cpp:524 -#: directorymergewindow.cpp:3058 directorymergewindow.cpp:3189 -#: directorymergewindow.cpp:3417 mergeresultwindow.cpp:942 -#: mergeresultwindow.cpp:944 mergeresultwindow.cpp:946 -#: mergeresultwindow.cpp:948 mergeresultwindow.cpp:1814 -#: mergeresultwindow.cpp:3170 mergeresultwindow.cpp:3177 optiondialog.cpp:962 -#: optiondialog.cpp:975 pdiff.cpp:833 pdiff.cpp:835 pdiff.cpp:837 pdiff.cpp:839 -#: pdiff.cpp:861 smalldialogs.cpp:124 smalldialogs.cpp:126 smalldialogs.cpp:127 -#: smalldialogs.cpp:130 +#: difftextwindow.cpp:1809 directorymergewindow.cpp:383 +#: directorymergewindow.cpp:434 directorymergewindow.cpp:525 +#: directorymergewindow.cpp:3072 directorymergewindow.cpp:3203 +#: directorymergewindow.cpp:3431 mergeresultwindow.cpp:970 +#: mergeresultwindow.cpp:972 mergeresultwindow.cpp:974 +#: mergeresultwindow.cpp:976 mergeresultwindow.cpp:1842 +#: mergeresultwindow.cpp:3198 mergeresultwindow.cpp:3205 optiondialog.cpp:1002 +#: optiondialog.cpp:1015 pdiff.cpp:823 pdiff.cpp:825 pdiff.cpp:827 +#: pdiff.cpp:829 pdiff.cpp:851 smalldialogs.cpp:131 smalldialogs.cpp:133 +#: smalldialogs.cpp:134 smalldialogs.cpp:137 #, kde-format msgid "A" msgstr "أ" -#: difftextwindow.cpp:1810 directorymergewindow.cpp:384 -#: directorymergewindow.cpp:436 directorymergewindow.cpp:526 -#: directorymergewindow.cpp:3064 directorymergewindow.cpp:3190 -#: directorymergewindow.cpp:3418 mergeresultwindow.cpp:942 -#: mergeresultwindow.cpp:944 mergeresultwindow.cpp:950 -#: mergeresultwindow.cpp:952 mergeresultwindow.cpp:1816 -#: mergeresultwindow.cpp:3172 mergeresultwindow.cpp:3179 optiondialog.cpp:963 -#: optiondialog.cpp:976 pdiff.cpp:833 pdiff.cpp:835 pdiff.cpp:841 pdiff.cpp:843 -#: pdiff.cpp:863 smalldialogs.cpp:124 smalldialogs.cpp:125 smalldialogs.cpp:128 -#: smalldialogs.cpp:131 +#: difftextwindow.cpp:1809 directorymergewindow.cpp:385 +#: directorymergewindow.cpp:437 directorymergewindow.cpp:527 +#: directorymergewindow.cpp:3078 directorymergewindow.cpp:3204 +#: directorymergewindow.cpp:3432 mergeresultwindow.cpp:970 +#: mergeresultwindow.cpp:972 mergeresultwindow.cpp:978 +#: mergeresultwindow.cpp:980 mergeresultwindow.cpp:1844 +#: mergeresultwindow.cpp:3200 mergeresultwindow.cpp:3207 optiondialog.cpp:1003 +#: optiondialog.cpp:1016 pdiff.cpp:823 pdiff.cpp:825 pdiff.cpp:831 +#: pdiff.cpp:833 pdiff.cpp:853 smalldialogs.cpp:131 smalldialogs.cpp:132 +#: smalldialogs.cpp:135 smalldialogs.cpp:138 #, kde-format msgid "B" msgstr "ب" -#: difftextwindow.cpp:1810 directorymergewindow.cpp:386 -#: directorymergewindow.cpp:439 directorymergewindow.cpp:528 -#: directorymergewindow.cpp:3070 directorymergewindow.cpp:3191 -#: directorymergewindow.cpp:3419 mergeresultwindow.cpp:946 -#: mergeresultwindow.cpp:948 mergeresultwindow.cpp:950 -#: mergeresultwindow.cpp:952 mergeresultwindow.cpp:1818 -#: mergeresultwindow.cpp:3174 mergeresultwindow.cpp:3181 optiondialog.cpp:977 -#: pdiff.cpp:837 pdiff.cpp:839 pdiff.cpp:841 pdiff.cpp:843 pdiff.cpp:865 -#: smalldialogs.cpp:125 smalldialogs.cpp:126 smalldialogs.cpp:129 -#: smalldialogs.cpp:132 +#: difftextwindow.cpp:1809 directorymergewindow.cpp:387 +#: directorymergewindow.cpp:440 directorymergewindow.cpp:529 +#: directorymergewindow.cpp:3084 directorymergewindow.cpp:3205 +#: directorymergewindow.cpp:3433 mergeresultwindow.cpp:974 +#: mergeresultwindow.cpp:976 mergeresultwindow.cpp:978 +#: mergeresultwindow.cpp:980 mergeresultwindow.cpp:1846 +#: mergeresultwindow.cpp:3202 mergeresultwindow.cpp:3209 optiondialog.cpp:1017 +#: pdiff.cpp:827 pdiff.cpp:829 pdiff.cpp:831 pdiff.cpp:833 pdiff.cpp:855 +#: smalldialogs.cpp:132 smalldialogs.cpp:133 smalldialogs.cpp:136 +#: smalldialogs.cpp:139 #, kde-format msgid "C" msgstr "س" -#: difftextwindow.cpp:1810 +#: difftextwindow.cpp:1809 #, kde-format msgid "A (Base)" msgstr "" -#: difftextwindow.cpp:1812 +#: difftextwindow.cpp:1811 #, kde-format msgid "Encoding: %1" msgstr "" -#: difftextwindow.cpp:1813 mergeresultwindow.cpp:3183 +#: difftextwindow.cpp:1812 mergeresultwindow.cpp:3211 #, kde-format msgid "Unix" msgstr "" -#: difftextwindow.cpp:1813 mergeresultwindow.cpp:3184 +#: difftextwindow.cpp:1812 mergeresultwindow.cpp:3212 #, kde-format msgid "DOS" msgstr "" -#: difftextwindow.cpp:1813 +#: difftextwindow.cpp:1812 #, kde-format msgid "Line end style: %1" msgstr "" -#: difftextwindow.cpp:1835 kdiff3.cpp:873 +#: difftextwindow.cpp:1834 kdiff3.cpp:874 #, kde-format msgid "Top line" msgstr "السطر الأعلى" -#: difftextwindow.cpp:1845 +#: difftextwindow.cpp:1843 #, kde-format msgid "End" msgstr "النهاية" -#: difftextwindow.cpp:1903 smalldialogs.cpp:235 +#: difftextwindow.cpp:1901 smalldialogs.cpp:245 #, fuzzy, kde-format msgid "Open File" msgstr "العملية" -#: difftextwindow.cpp:1951 optiondialog.cpp:387 +#: difftextwindow.cpp:1943 optiondialog.cpp:389 #, kde-format msgid "Unicode, 8 bit" msgstr "" -#: difftextwindow.cpp:1966 +#: difftextwindow.cpp:1958 #, kde-format msgid "Other" msgstr "" -#: directorymergewindow.cpp:409 directorymergewindow.cpp:3424 +#: directorymergewindow.cpp:410 directorymergewindow.cpp:3438 #, kde-format msgid "Copy A to B" msgstr "أنسخ A إلى B" -#: directorymergewindow.cpp:412 directorymergewindow.cpp:3425 +#: directorymergewindow.cpp:413 directorymergewindow.cpp:3439 #, kde-format msgid "Copy B to A" msgstr "أنسخ B إلى A" -#: directorymergewindow.cpp:415 directorymergewindow.cpp:3426 +#: directorymergewindow.cpp:416 directorymergewindow.cpp:3440 #, kde-format msgid "Delete A" msgstr "أمحي A" -#: directorymergewindow.cpp:418 directorymergewindow.cpp:3427 +#: directorymergewindow.cpp:419 directorymergewindow.cpp:3441 #, kde-format msgid "Delete B" msgstr "أمحي B" -#: directorymergewindow.cpp:421 +#: directorymergewindow.cpp:422 #, kde-format msgid "Delete A & B" msgstr "أمحي A و B" -#: directorymergewindow.cpp:424 directorymergewindow.cpp:3429 +#: directorymergewindow.cpp:425 directorymergewindow.cpp:3443 #, kde-format msgid "Merge to A" msgstr "" -#: directorymergewindow.cpp:427 directorymergewindow.cpp:3430 +#: directorymergewindow.cpp:428 directorymergewindow.cpp:3444 #, kde-format msgid "Merge to B" msgstr "" -#: directorymergewindow.cpp:430 +#: directorymergewindow.cpp:431 #, kde-format msgid "Merge to A & B" msgstr "" -#: directorymergewindow.cpp:442 directorymergewindow.cpp:3421 +#: directorymergewindow.cpp:443 directorymergewindow.cpp:3435 #, kde-format msgid "Delete (if exists)" msgstr "أمحي ( إذا كان موجود )" -#: directorymergewindow.cpp:445 directorymergewindow.cpp:448 -#: directorymergewindow.cpp:3420 optiondialog.cpp:925 smalldialogs.cpp:113 +#: directorymergewindow.cpp:446 directorymergewindow.cpp:449 +#: directorymergewindow.cpp:3434 smalldialogs.cpp:120 #, kde-format msgid "Merge" msgstr "" -#: directorymergewindow.cpp:445 directorymergewindow.cpp:448 +#: directorymergewindow.cpp:446 directorymergewindow.cpp:449 #, kde-format msgid "Merge (manual)" msgstr "" -#: directorymergewindow.cpp:451 +#: directorymergewindow.cpp:452 #, kde-format msgid "Error: Conflicting File Types" msgstr "" -#: directorymergewindow.cpp:454 +#: directorymergewindow.cpp:455 #, kde-format msgid "Error: Changed and Deleted" msgstr "" -#: directorymergewindow.cpp:457 +#: directorymergewindow.cpp:458 #, kde-format msgid "Error: Dates are equal but files are not." msgstr "" -#: directorymergewindow.cpp:471 +#: directorymergewindow.cpp:472 #, fuzzy, kde-format #| msgid "Done." msgid "Done" msgstr "إنتهيت." -#: directorymergewindow.cpp:473 +#: directorymergewindow.cpp:474 #, fuzzy, kde-format msgid "Error" msgstr "خطأ." -#: directorymergewindow.cpp:475 +#: directorymergewindow.cpp:476 #, kde-format msgid "Skipped." msgstr "" -#: directorymergewindow.cpp:477 +#: directorymergewindow.cpp:478 #, kde-format msgid "Not saved." msgstr "غير محفوظ." -#: directorymergewindow.cpp:479 +#: directorymergewindow.cpp:480 #, kde-format msgid "In progress..." msgstr "جاري..." -#: directorymergewindow.cpp:481 +#: directorymergewindow.cpp:482 #, kde-format msgid "To do." msgstr "واجب العمل." -#: directorymergewindow.cpp:522 +#: directorymergewindow.cpp:523 #, kde-format msgid "Name" msgstr "الاسم" -#: directorymergewindow.cpp:530 +#: directorymergewindow.cpp:531 #, kde-format msgid "Operation" msgstr "العملية" -#: directorymergewindow.cpp:532 +#: directorymergewindow.cpp:533 #, kde-format msgid "Status" msgstr "الحالة" -#: directorymergewindow.cpp:534 +#: directorymergewindow.cpp:535 #, kde-format msgid "Unsolved" msgstr "" -#: directorymergewindow.cpp:536 +#: directorymergewindow.cpp:537 #, kde-format msgid "Solved" msgstr "" -#: directorymergewindow.cpp:538 +#: directorymergewindow.cpp:539 #, kde-format msgid "Nonwhite" msgstr "" -#: directorymergewindow.cpp:540 +#: directorymergewindow.cpp:541 #, kde-format msgid "White" msgstr "أبيض" -#: directorymergewindow.cpp:674 +#: directorymergewindow.cpp:676 #, kde-format msgid "Unable to compare non-normal file with normal file." msgstr "" -#: directorymergewindow.cpp:688 +#: directorymergewindow.cpp:690 #, kde-format msgid "Mix of links and normal files." msgstr "" -#: directorymergewindow.cpp:695 +#: directorymergewindow.cpp:697 #, kde-format msgid "Link: " msgstr "" -#: directorymergewindow.cpp:704 +#: directorymergewindow.cpp:706 #, kde-format msgid "Size. " msgstr "القياس: " -#: directorymergewindow.cpp:718 directorymergewindow.cpp:728 +#: directorymergewindow.cpp:720 directorymergewindow.cpp:730 #, kde-format msgid "Date & Size: " msgstr "التاريخ و القياس: " -#: directorymergewindow.cpp:748 +#: directorymergewindow.cpp:751 #, kde-format msgid "Comparing file..." msgstr "جاري مقارنة الملف..." -#: directorymergewindow.cpp:801 +#: directorymergewindow.cpp:813 #, kde-format msgid "" "You are currently doing a directory merge. Are you sure, you want to abort " "the merge and rescan the directory?" msgstr "" -#: directorymergewindow.cpp:802 kdiff3.cpp:698 kdiff3.cpp:708 kdiff3.cpp:720 -#: mergeresultwindow.cpp:372 pdiff.cpp:1033 pdiff.cpp:1910 pdiff.cpp:1920 +#: directorymergewindow.cpp:814 kdiff3.cpp:697 kdiff3.cpp:707 kdiff3.cpp:719 +#: mergeresultwindow.cpp:400 pdiff.cpp:1031 pdiff.cpp:1920 pdiff.cpp:1930 #, kde-format msgid "Warning" msgstr "" -#: directorymergewindow.cpp:803 directorymergewindow.cpp:3393 +#: directorymergewindow.cpp:815 directorymergewindow.cpp:3407 #, kde-format msgid "Rescan" msgstr "إعادة المسح" -#: directorymergewindow.cpp:804 pdiff.cpp:1035 +#: directorymergewindow.cpp:816 pdiff.cpp:1033 #, kde-format msgid "Continue Merging" msgstr "" -#: directorymergewindow.cpp:971 +#: directorymergewindow.cpp:984 #, kde-format msgid "Opening of directories failed:" msgstr "فشل فتح المجلّدات:" -#: directorymergewindow.cpp:975 +#: directorymergewindow.cpp:988 #, kde-format msgid "Dir A \"%1\" does not exist or is not a directory.\n" msgstr "الدليل A \"%1\" غير موجود أو هو ليس دليل.\n" -#: directorymergewindow.cpp:980 +#: directorymergewindow.cpp:993 #, kde-format msgid "Dir B \"%1\" does not exist or is not a directory.\n" msgstr "الدليل B \"%1\" غير موجود أو هو ليس دليل.\n" -#: directorymergewindow.cpp:985 +#: directorymergewindow.cpp:998 #, kde-format msgid "Dir C \"%1\" does not exist or is not a directory.\n" msgstr "الدليل C \"%1\" غير موجود أو هو ليس دليل.\n" -#: directorymergewindow.cpp:988 +#: directorymergewindow.cpp:1001 #, kde-format msgid "Directory Open Error" msgstr "خطأ فتح الدليل" -#: directorymergewindow.cpp:996 +#: directorymergewindow.cpp:1009 #, kde-format msgid "" "The destination directory must not be the same as A or B when three " @@ -361,49 +361,49 @@ "Check again before continuing." msgstr "" -#: directorymergewindow.cpp:998 +#: directorymergewindow.cpp:1011 #, kde-format msgid "Parameter Warning" msgstr "تحذير بشأن الضوابط" -#: directorymergewindow.cpp:1003 +#: directorymergewindow.cpp:1016 #, kde-format msgid "Scanning directories..." msgstr "جاري مسح المجلّدات...." -#: directorymergewindow.cpp:1029 +#: directorymergewindow.cpp:1042 #, kde-format msgid "Reading Directory A" msgstr "قراءة الدليل A" -#: directorymergewindow.cpp:1038 +#: directorymergewindow.cpp:1051 #, kde-format msgid "Reading Directory B" msgstr "قراءة الدليل B" -#: directorymergewindow.cpp:1048 +#: directorymergewindow.cpp:1061 #, kde-format msgid "Reading Directory C" msgstr "قراءة الدليل C" -#: directorymergewindow.cpp:1064 +#: directorymergewindow.cpp:1077 #, kde-format msgid "Some subdirectories were not readable in" msgstr "" -#: directorymergewindow.cpp:1069 +#: directorymergewindow.cpp:1082 #, kde-format msgid "Check the permissions of the subdirectories." msgstr "إفحص الأذون للمجلّدات الفرعية." -#: directorymergewindow.cpp:1106 kdiff3.cpp:666 kdiff3.cpp:753 kdiff3.cpp:777 -#: kdiff3.cpp:1065 kdiff3.cpp:1086 pdiff.cpp:1116 pdiff.cpp:1170 pdiff.cpp:1218 -#: pdiff.cpp:1234 pdiff.cpp:1277 pdiff.cpp:1301 +#: directorymergewindow.cpp:1119 kdiff3.cpp:665 kdiff3.cpp:752 kdiff3.cpp:776 +#: kdiff3.cpp:1072 kdiff3.cpp:1093 pdiff.cpp:1115 pdiff.cpp:1178 pdiff.cpp:1228 +#: pdiff.cpp:1244 pdiff.cpp:1287 pdiff.cpp:1311 #, kde-format msgid "Ready." msgstr "جاهز." -#: directorymergewindow.cpp:1121 +#: directorymergewindow.cpp:1134 #, kde-format msgid "" "Directory Comparison Status\n" @@ -413,23 +413,23 @@ "Number of different files: %3" msgstr "" -#: directorymergewindow.cpp:1128 +#: directorymergewindow.cpp:1141 #, fuzzy, kde-format #| msgid "Number of equal files:" msgid "Number of manual merges: %1" msgstr "عدد الملفات المتساوية:" -#: directorymergewindow.cpp:1394 +#: directorymergewindow.cpp:1407 #, kde-format msgid "This affects all merge operations." msgstr "" -#: directorymergewindow.cpp:1395 +#: directorymergewindow.cpp:1408 #, kde-format msgid "Changing All Merge Operations" msgstr "" -#: directorymergewindow.cpp:1695 +#: directorymergewindow.cpp:1708 #, fuzzy, kde-format #| msgid "Processing " msgid "" @@ -437,45 +437,45 @@ "%3" msgstr "جاري الإجراء " -#: directorymergewindow.cpp:1738 directorymergewindow.cpp:1742 +#: directorymergewindow.cpp:1751 directorymergewindow.cpp:1755 #, kde-format msgid "Some files could not be processed." msgstr "" -#: directorymergewindow.cpp:2222 directorymergewindow.cpp:2247 -#: directorymergewindow.cpp:2271 +#: directorymergewindow.cpp:2235 directorymergewindow.cpp:2260 +#: directorymergewindow.cpp:2285 #, kde-format msgid "This operation is currently not possible." msgstr "هذه العملية ليست ممكنة حالياً." -#: directorymergewindow.cpp:2222 directorymergewindow.cpp:2247 -#: directorymergewindow.cpp:2271 directorymergewindow.cpp:2552 +#: directorymergewindow.cpp:2235 directorymergewindow.cpp:2260 +#: directorymergewindow.cpp:2285 directorymergewindow.cpp:2565 #, kde-format msgid "Operation Not Possible" msgstr "العملية غير ممكنة" -#: directorymergewindow.cpp:2318 +#: directorymergewindow.cpp:2332 #, fuzzy, kde-format #| msgid "An error occurred while copying.\n" msgid "An error occurred while copying." msgstr "حصل خطأ عند النسخ.\n" -#: directorymergewindow.cpp:2319 directorymergewindow.cpp:2759 +#: directorymergewindow.cpp:2333 directorymergewindow.cpp:2772 #, kde-format msgid "Merge Error" msgstr "" -#: directorymergewindow.cpp:2396 +#: directorymergewindow.cpp:2410 #, kde-format msgid "Unknown merge operation. (This must never happen!)" msgstr "" -#: directorymergewindow.cpp:2441 +#: directorymergewindow.cpp:2455 #, kde-format msgid "Unknown merge operation." msgstr "" -#: directorymergewindow.cpp:2454 +#: directorymergewindow.cpp:2468 #, kde-format msgid "" "The merge is about to begin.\n" @@ -488,50 +488,50 @@ "whatsoever! Make backups of your vital data!" msgstr "" -#: directorymergewindow.cpp:2459 +#: directorymergewindow.cpp:2473 #, kde-format msgid "Starting Merge" msgstr "" -#: directorymergewindow.cpp:2460 +#: directorymergewindow.cpp:2474 #, kde-format msgid "Do It" msgstr "إفعله" -#: directorymergewindow.cpp:2461 +#: directorymergewindow.cpp:2475 #, kde-format msgid "Simulate It" msgstr "" -#: directorymergewindow.cpp:2487 +#: directorymergewindow.cpp:2501 #, kde-format msgid "" "The highlighted item has a different type in the different directories. " "Select what to do." msgstr "" -#: directorymergewindow.cpp:2491 +#: directorymergewindow.cpp:2505 #, kde-format msgid "" "The modification dates of the file are equal but the files are not. Select " "what to do." msgstr "" -#: directorymergewindow.cpp:2495 +#: directorymergewindow.cpp:2509 #, kde-format msgid "" "The highlighted item was changed in one directory and deleted in the other. " "Select what to do." msgstr "" -#: directorymergewindow.cpp:2552 +#: directorymergewindow.cpp:2565 #, kde-format msgid "" "This operation is currently not possible because directory merge is " "currently running." msgstr "" -#: directorymergewindow.cpp:2609 +#: directorymergewindow.cpp:2622 #, kde-format msgid "" "There was an error in the last step.\n" @@ -539,973 +539,980 @@ "to skip this item?" msgstr "" -#: directorymergewindow.cpp:2611 +#: directorymergewindow.cpp:2624 #, kde-format msgid "Continue merge after an error" msgstr "" -#: directorymergewindow.cpp:2612 +#: directorymergewindow.cpp:2625 #, kde-format msgid "Continue With Last Item" msgstr "تابع بلبند الأخير" -#: directorymergewindow.cpp:2613 +#: directorymergewindow.cpp:2626 #, kde-format msgid "Skip Item" msgstr "" -#: directorymergewindow.cpp:2709 +#: directorymergewindow.cpp:2722 #, kde-format msgid "Merge operation complete." msgstr "" -#: directorymergewindow.cpp:2709 directorymergewindow.cpp:2712 +#: directorymergewindow.cpp:2722 directorymergewindow.cpp:2725 #, kde-format msgid "Merge Complete" msgstr "" -#: directorymergewindow.cpp:2722 +#: directorymergewindow.cpp:2735 #, kde-format msgid "" "Simulated merge complete: Check if you agree with the proposed operations." msgstr "" -#: directorymergewindow.cpp:2758 +#: directorymergewindow.cpp:2771 #, fuzzy, kde-format #| msgid "An error occurred. Press OK to see detailed information.\n" msgid "An error occurred. Press OK to see detailed information." msgstr "حصل خطأ. إضغط موافق لترى المعلومات المفصلة.\n" -#: directorymergewindow.cpp:2791 +#: directorymergewindow.cpp:2804 #, kde-format msgid "Error: While deleting %1: Creating backup failed." msgstr "" -#: directorymergewindow.cpp:2798 +#: directorymergewindow.cpp:2811 #, kde-format msgid "delete directory recursively( %1 )" msgstr "" -#: directorymergewindow.cpp:2800 +#: directorymergewindow.cpp:2813 #, kde-format msgid "delete( %1 )" msgstr "" -#: directorymergewindow.cpp:2815 +#: directorymergewindow.cpp:2828 #, kde-format msgid "Error: delete dir operation failed while trying to read the directory." msgstr "" -#: directorymergewindow.cpp:2834 +#: directorymergewindow.cpp:2847 #, kde-format msgid "Error: rmdir( %1 ) operation failed." msgstr "" -#: directorymergewindow.cpp:2844 +#: directorymergewindow.cpp:2857 #, kde-format msgid "Error: delete operation failed." msgstr "" -#: directorymergewindow.cpp:2870 +#: directorymergewindow.cpp:2884 #, kde-format msgid "manual merge( %1, %2, %3 -> %4)" msgstr "" -#: directorymergewindow.cpp:2873 +#: directorymergewindow.cpp:2887 #, kde-format msgid "" " Note: After a manual merge the user should continue by pressing F7." msgstr "" -#: directorymergewindow.cpp:2900 +#: directorymergewindow.cpp:2914 #, kde-format msgid "Error: copy( %1 -> %2 ) failed.Deleting existing destination failed." msgstr "" -#: directorymergewindow.cpp:2909 +#: directorymergewindow.cpp:2923 #, kde-format msgid "copyLink( %1 -> %2 )" msgstr "" -#: directorymergewindow.cpp:2918 +#: directorymergewindow.cpp:2932 #, kde-format msgid "Error: copyLink failed: Remote links are not yet supported." msgstr "" -#: directorymergewindow.cpp:2928 +#: directorymergewindow.cpp:2942 #, kde-format msgid "Error: copyLink failed." msgstr "" -#: directorymergewindow.cpp:2953 +#: directorymergewindow.cpp:2967 #, kde-format msgid "copy( %1 -> %2 )" msgstr "نسخ( %1 -> %2 )" -#: directorymergewindow.cpp:2979 +#: directorymergewindow.cpp:2993 #, kde-format msgid "Error during rename( %1 -> %2 ): Cannot delete existing destination." msgstr "" -#: directorymergewindow.cpp:2986 +#: directorymergewindow.cpp:3000 #, kde-format msgid "rename( %1 -> %2 )" msgstr "إعادة تسمية( %1 -> %2 )" -#: directorymergewindow.cpp:2995 +#: directorymergewindow.cpp:3009 #, kde-format msgid "Error: Rename failed." msgstr "خطأ: فشلت إعادة التسمية." -#: directorymergewindow.cpp:3013 +#: directorymergewindow.cpp:3027 #, kde-format msgid "Error during makeDir of %1. Cannot delete existing file." msgstr "" -#: directorymergewindow.cpp:3030 +#: directorymergewindow.cpp:3044 #, kde-format msgid "makeDir( %1 )" msgstr "" -#: directorymergewindow.cpp:3040 +#: directorymergewindow.cpp:3054 #, kde-format msgid "Error while creating directory." msgstr "خطأ عند إنشاء الدليل." -#: directorymergewindow.cpp:3076 directorymergewindow.cpp:3195 +#: directorymergewindow.cpp:3090 directorymergewindow.cpp:3209 #, kde-format msgid "Dest" msgstr "الهدف" -#: directorymergewindow.cpp:3084 directorymergewindow.cpp:3113 +#: directorymergewindow.cpp:3098 directorymergewindow.cpp:3127 #, kde-format msgid "Dir" msgstr "الدليل" -#: directorymergewindow.cpp:3084 +#: directorymergewindow.cpp:3098 #, kde-format msgid "Type" msgstr "النوع" -#: directorymergewindow.cpp:3084 +#: directorymergewindow.cpp:3098 #, kde-format msgid "Size" msgstr "الحجم" -#: directorymergewindow.cpp:3085 +#: directorymergewindow.cpp:3099 #, kde-format msgid "Attr" msgstr "" -#: directorymergewindow.cpp:3085 +#: directorymergewindow.cpp:3099 #, kde-format msgid "Last Modification" msgstr "آخر تغيير" -#: directorymergewindow.cpp:3085 +#: directorymergewindow.cpp:3099 #, kde-format msgid "Link-Destination" msgstr "" -#: directorymergewindow.cpp:3113 +#: directorymergewindow.cpp:3127 #, kde-format msgid "File" msgstr "" -#: directorymergewindow.cpp:3113 +#: directorymergewindow.cpp:3127 #, kde-format msgid "-Link" msgstr "" -#: directorymergewindow.cpp:3119 +#: directorymergewindow.cpp:3133 #, kde-format msgid "not available" msgstr "غير متوفر" -#: directorymergewindow.cpp:3137 +#: directorymergewindow.cpp:3151 #, kde-format msgid "A (Dest): " msgstr "" -#: directorymergewindow.cpp:3141 +#: directorymergewindow.cpp:3155 #, kde-format msgid "A: " msgstr "" -#: directorymergewindow.cpp:3141 +#: directorymergewindow.cpp:3155 #, kde-format msgid "A (Base): " msgstr "" -#: directorymergewindow.cpp:3147 +#: directorymergewindow.cpp:3161 #, kde-format msgid "B (Dest): " msgstr "" -#: directorymergewindow.cpp:3151 +#: directorymergewindow.cpp:3165 #, kde-format msgid "B: " msgstr "" -#: directorymergewindow.cpp:3156 +#: directorymergewindow.cpp:3170 #, kde-format msgid "C (Dest): " msgstr "" -#: directorymergewindow.cpp:3160 +#: directorymergewindow.cpp:3174 #, kde-format msgid "C: " msgstr "" -#: directorymergewindow.cpp:3163 +#: directorymergewindow.cpp:3177 #, kde-format msgid "Dest: " msgstr "الهدف: " #. i18n("Saving Directory Merge State ...")); -#: directorymergewindow.cpp:3238 +#: directorymergewindow.cpp:3252 #, kde-format msgid "Save Directory Merge State As..." msgstr "" -#: directorymergewindow.cpp:3387 +#: directorymergewindow.cpp:3401 #, kde-format msgid "Start/Continue Directory Merge" msgstr "" -#: directorymergewindow.cpp:3388 +#: directorymergewindow.cpp:3402 #, kde-format msgid "Run Operation for Current Item" msgstr "نفّذ العملية للبند الحالي" -#: directorymergewindow.cpp:3389 +#: directorymergewindow.cpp:3403 #, kde-format msgid "Compare Selected File" msgstr "قارن الملفات المختارة" -#: directorymergewindow.cpp:3390 +#: directorymergewindow.cpp:3404 #, kde-format msgid "Merge Current File" msgstr "" -#: directorymergewindow.cpp:3390 +#: directorymergewindow.cpp:3404 #, kde-format msgid "" "Merge\n" "File" msgstr "" -#: directorymergewindow.cpp:3391 +#: directorymergewindow.cpp:3405 #, kde-format msgid "Fold All Subdirs" msgstr "" -#: directorymergewindow.cpp:3392 +#: directorymergewindow.cpp:3406 #, kde-format msgid "Unfold All Subdirs" msgstr "" #. i18n("Save Directory Merge State ..."), 0, this, &DirectoryMergeWindow::slotSaveMergeState, ac, "dir_save_merge_state"); #. i18n("Load Directory Merge State ..."), 0, this, &DirectoryMergeWindow::slotLoadMergeState, ac, "dir_load_merge_state"); -#: directorymergewindow.cpp:3396 +#: directorymergewindow.cpp:3410 #, kde-format msgid "Choose A for All Items" msgstr "" -#: directorymergewindow.cpp:3397 +#: directorymergewindow.cpp:3411 #, kde-format msgid "Choose B for All Items" msgstr "" -#: directorymergewindow.cpp:3398 +#: directorymergewindow.cpp:3412 #, kde-format msgid "Choose C for All Items" msgstr "" -#: directorymergewindow.cpp:3399 +#: directorymergewindow.cpp:3413 #, kde-format msgid "Auto-Choose Operation for All Items" msgstr "عملية إختيار تلقائية لكل البنود" -#: directorymergewindow.cpp:3400 +#: directorymergewindow.cpp:3414 #, kde-format msgid "No Operation for All Items" msgstr "لا عملية لكل البنود" #. i18n("Synchronize Directories"), 0, this, &DirectoryMergeWindow::slotSynchronizeDirectories, ac, "dir_synchronize_directories"); #. d->m_pDirChooseNewerFiles = GuiUtils::createAction< KToggleAction >(i18n("Copy Newer Files Instead of Merging"), 0, this, &DirectoryMergeWindow::slotChooseNewerFiles, ac, "dir_choose_newer_files"); -#: directorymergewindow.cpp:3405 +#: directorymergewindow.cpp:3419 #, kde-format msgid "Show Identical Files" msgstr "أعرض الملفات المتشابهة" -#: directorymergewindow.cpp:3405 +#: directorymergewindow.cpp:3419 #, fuzzy, kde-format msgid "" "Identical\n" "Files" msgstr "أعرض الملفات المتشابهة" -#: directorymergewindow.cpp:3406 +#: directorymergewindow.cpp:3420 #, kde-format msgid "Show Different Files" msgstr "أعرض الملفات المختلفة" -#: directorymergewindow.cpp:3407 +#: directorymergewindow.cpp:3421 #, kde-format msgid "Show Files only in A" msgstr "أعرض الملفات فقط في أ" -#: directorymergewindow.cpp:3407 +#: directorymergewindow.cpp:3421 #, fuzzy, kde-format msgid "" "Files\n" "only in A" msgstr "أعرض الملفات فقط في أ" -#: directorymergewindow.cpp:3408 +#: directorymergewindow.cpp:3422 #, kde-format msgid "Show Files only in B" msgstr "أعرض الملفات فقط في ب" -#: directorymergewindow.cpp:3408 +#: directorymergewindow.cpp:3422 #, fuzzy, kde-format msgid "" "Files\n" "only in B" msgstr "أعرض الملفات فقط في ب" -#: directorymergewindow.cpp:3409 +#: directorymergewindow.cpp:3423 #, kde-format msgid "Show Files only in C" msgstr "أعرض الملفات فقط في س" -#: directorymergewindow.cpp:3409 +#: directorymergewindow.cpp:3423 #, fuzzy, kde-format msgid "" "Files\n" "only in C" msgstr "أعرض الملفات فقط في س" -#: directorymergewindow.cpp:3413 +#: directorymergewindow.cpp:3427 #, kde-format msgid "Compare Explicitly Selected Files" msgstr "" -#: directorymergewindow.cpp:3414 +#: directorymergewindow.cpp:3428 #, kde-format msgid "Merge Explicitly Selected Files" msgstr "" -#: directorymergewindow.cpp:3416 directorymergewindow.cpp:3423 +#: directorymergewindow.cpp:3430 directorymergewindow.cpp:3437 #, kde-format msgid "Do Nothing" msgstr "لا تفعل أي شيئ" -#: directorymergewindow.cpp:3428 +#: directorymergewindow.cpp:3442 #, kde-format msgid "Delete A && B" msgstr "أمحي أ و ب" -#: directorymergewindow.cpp:3431 +#: directorymergewindow.cpp:3445 #, kde-format msgid "Merge to A && B" msgstr "" -#: fileaccess.cpp:462 SourceData.cpp:493 +#: fileaccess.cpp:301 +#, kde-format +msgid "Unable to determine full url. No parent specified." +msgstr "" + +#: fileaccess.cpp:482 SourceData.cpp:506 #, fuzzy, kde-format #| msgid "Reading file: %1" msgid "Failed to read file: %1" msgstr "جاري قراءة الملف: %1" -#: fileaccess.cpp:587 +#: fileaccess.cpp:624 #, kde-format msgid "Creating temp copy of %1 failed." msgstr "فشل إنشاء نسخة مؤقتة من %1." -#: fileaccess.cpp:595 fileaccess.cpp:600 +#: fileaccess.cpp:632 fileaccess.cpp:637 #, fuzzy, kde-format #| msgid "Opening %1 failed." msgid "Opening %1 failed. %2" msgstr "فشل فتح %1." -#: fileaccess.cpp:619 fileaccess.cpp:627 +#: fileaccess.cpp:656 fileaccess.cpp:664 #, fuzzy, kde-format #| msgid "Error reading from %1" msgid "Error reading from %1. %2" msgstr "خطأ عند القراءة من %1" -#: fileaccess.cpp:751 +#: fileaccess.cpp:788 #, kde-format msgid "" "While trying to make a backup, deleting an older backup failed.\n" "Filename: %1" msgstr "" -#: fileaccess.cpp:758 +#: fileaccess.cpp:795 #, kde-format msgid "" "While trying to make a backup, renaming failed.\n" "Filenames: %1 -> %2" msgstr "" -#: fileaccess.cpp:828 +#: fileaccess.cpp:865 #, kde-format msgid "Getting file status: %1" msgstr "جاري طلب حالة الملف: %1" -#: fileaccess.cpp:869 +#: fileaccess.cpp:906 #, kde-format msgid "Reading file: %1" msgstr "جاري قراءة الملف: %1" -#: fileaccess.cpp:907 +#: fileaccess.cpp:944 #, kde-format msgid "Writing file: %1" msgstr "جاري كتابة الملف: %1" -#: fileaccess.cpp:940 +#: fileaccess.cpp:977 #, kde-format msgid "Out of memory" msgstr "" -#: fileaccess.cpp:976 +#: fileaccess.cpp:1013 #, kde-format msgid "Making directory: %1" msgstr "" -#: fileaccess.cpp:997 +#: fileaccess.cpp:1034 #, kde-format msgid "Removing directory: %1" msgstr "" -#: fileaccess.cpp:1012 +#: fileaccess.cpp:1049 #, kde-format msgid "Removing file: %1" msgstr "" -#: fileaccess.cpp:1028 +#: fileaccess.cpp:1065 #, kde-format msgid "Creating symbolic link: %1 -> %2" msgstr "" -#: fileaccess.cpp:1052 +#: fileaccess.cpp:1089 #, kde-format msgid "Renaming file: %1 -> %2" msgstr "إعادة تسمية الملف: %1 -> %2" -#: fileaccess.cpp:1086 +#: fileaccess.cpp:1123 #, kde-format msgid "Copying file: %1 -> %2" msgstr "نسخ الملف: %1 -> %2" -#: fileaccess.cpp:1108 +#: fileaccess.cpp:1145 #, fuzzy, kde-format #| msgid "Reading Directory A" msgid "Reading directory: %1" msgstr "قراءة الدليل A" -#: fileaccess.cpp:1162 +#: fileaccess.cpp:1202 #, kde-format msgid "Listing directory: %1" msgstr "" -#: kdiff3.cpp:181 +#: kdiff3.cpp:182 #, kde-format msgid "Current Configuration:" msgstr "" -#: kdiff3.cpp:186 +#: kdiff3.cpp:187 #, kde-format msgid "Config Option Error:" msgstr "" -#: kdiff3.cpp:240 +#: kdiff3.cpp:246 #, kde-format msgid "Option --auto used, but no output file specified." msgstr "" -#: kdiff3.cpp:416 +#: kdiff3.cpp:405 #, kde-format msgid "Option --auto ignored for directory comparison." msgstr "" -#: kdiff3.cpp:460 +#: kdiff3.cpp:449 #, kde-format msgid "Saving failed." msgstr "" -#: kdiff3.cpp:496 pdiff.cpp:1098 -#, kde-format +#: kdiff3.cpp:494 pdiff.cpp:1096 +#, fuzzy, kde-format +#| msgid "Opening of directories failed:" msgid "Opening of these files failed:" -msgstr "" +msgstr "فشل فتح المجلّدات:" -#: kdiff3.cpp:505 -#, kde-format -msgid "File Open Error" -msgstr "" +#: kdiff3.cpp:503 pdiff.cpp:1105 +#, fuzzy, kde-format +#| msgid "Directory Open Error" +msgid "File open error" +msgstr "خطأ فتح الدليل" -#: kdiff3.cpp:533 +#: kdiff3.cpp:532 #, kde-format msgid "Opens documents for comparison..." msgstr "" -#: kdiff3.cpp:535 +#: kdiff3.cpp:534 #, fuzzy, kde-format msgid "Reload" msgstr "جاهز." -#: kdiff3.cpp:538 +#: kdiff3.cpp:537 #, kde-format msgid "Saves the merge result. All conflicts must be solved!" msgstr "" -#: kdiff3.cpp:540 +#: kdiff3.cpp:539 #, kde-format msgid "Saves the current document as..." msgstr "" -#: kdiff3.cpp:543 +#: kdiff3.cpp:542 #, kde-format msgid "Print the differences" msgstr "" -#: kdiff3.cpp:546 +#: kdiff3.cpp:545 #, kde-format msgid "Quits the application" msgstr "يخرج من التطبيق" -#: kdiff3.cpp:549 +#: kdiff3.cpp:548 #, kde-format msgid "Cuts the selected section and puts it to the clipboard" msgstr "" -#: kdiff3.cpp:552 +#: kdiff3.cpp:551 #, kde-format msgid "Copies the selected section to the clipboard" msgstr "" -#: kdiff3.cpp:554 +#: kdiff3.cpp:553 #, kde-format msgid "Pastes the clipboard contents to current position" msgstr "" -#: kdiff3.cpp:557 +#: kdiff3.cpp:556 #, kde-format msgid "Select everything in current window" msgstr "" -#: kdiff3.cpp:560 +#: kdiff3.cpp:559 #, kde-format msgid "Search for a string" msgstr "" -#: kdiff3.cpp:562 +#: kdiff3.cpp:561 #, kde-format msgid "Search again for the string" msgstr "" -#: kdiff3.cpp:567 +#: kdiff3.cpp:566 #, kde-format msgid "Enables/disables the statusbar" msgstr "" -#: kdiff3.cpp:571 +#: kdiff3.cpp:570 #, kde-format msgid "Configure KDiff3..." msgstr "" -#: kdiff3.cpp:590 +#: kdiff3.cpp:589 #, kde-format msgid "Go to Current Delta" msgstr "" -#: kdiff3.cpp:590 +#: kdiff3.cpp:589 #, kde-format msgid "" "Current\n" "Delta" msgstr "" -#: kdiff3.cpp:592 +#: kdiff3.cpp:591 #, kde-format msgid "Go to First Delta" msgstr "" -#: kdiff3.cpp:592 +#: kdiff3.cpp:591 #, kde-format msgid "" "First\n" "Delta" msgstr "" -#: kdiff3.cpp:594 +#: kdiff3.cpp:593 #, kde-format msgid "Go to Last Delta" msgstr "" -#: kdiff3.cpp:594 +#: kdiff3.cpp:593 #, kde-format msgid "" "Last\n" "Delta" msgstr "" -#: kdiff3.cpp:596 +#: kdiff3.cpp:595 #, kde-format msgid "(Skips white space differences when \"Show White Space\" is disabled.)" msgstr "" -#: kdiff3.cpp:597 +#: kdiff3.cpp:596 #, kde-format msgid "" "(Does not skip white space differences even when \"Show White Space\" is " "disabled.)" msgstr "" -#: kdiff3.cpp:598 +#: kdiff3.cpp:597 #, kde-format msgid "Go to Previous Delta" msgstr "" -#: kdiff3.cpp:598 +#: kdiff3.cpp:597 #, kde-format msgid "" "Prev\n" "Delta" msgstr "" -#: kdiff3.cpp:600 +#: kdiff3.cpp:599 #, kde-format msgid "Go to Next Delta" msgstr "" -#: kdiff3.cpp:600 +#: kdiff3.cpp:599 #, kde-format msgid "" "Next\n" "Delta" msgstr "" -#: kdiff3.cpp:602 +#: kdiff3.cpp:601 #, kde-format msgid "Go to Previous Conflict" msgstr "" -#: kdiff3.cpp:602 +#: kdiff3.cpp:601 #, kde-format msgid "" "Prev\n" "Conflict" msgstr "" -#: kdiff3.cpp:604 +#: kdiff3.cpp:603 #, kde-format msgid "Go to Next Conflict" msgstr "" -#: kdiff3.cpp:604 +#: kdiff3.cpp:603 #, kde-format msgid "" "Next\n" "Conflict" msgstr "" -#: kdiff3.cpp:606 +#: kdiff3.cpp:605 #, kde-format msgid "Go to Previous Unsolved Conflict" msgstr "" -#: kdiff3.cpp:606 +#: kdiff3.cpp:605 #, kde-format msgid "" "Prev\n" "Unsolved" msgstr "" -#: kdiff3.cpp:608 +#: kdiff3.cpp:607 #, kde-format msgid "Go to Next Unsolved Conflict" msgstr "" -#: kdiff3.cpp:608 +#: kdiff3.cpp:607 #, kde-format msgid "" "Next\n" "Unsolved" msgstr "" -#: kdiff3.cpp:610 +#: kdiff3.cpp:609 #, kde-format msgid "Select Line(s) From A" msgstr "" -#: kdiff3.cpp:610 +#: kdiff3.cpp:609 #, kde-format msgid "" "Choose\n" "A" msgstr "" -#: kdiff3.cpp:611 +#: kdiff3.cpp:610 #, kde-format msgid "Select Line(s) From B" msgstr "" -#: kdiff3.cpp:611 +#: kdiff3.cpp:610 #, kde-format msgid "" "Choose\n" "B" msgstr "" -#: kdiff3.cpp:612 +#: kdiff3.cpp:611 #, kde-format msgid "Select Line(s) From C" msgstr "" -#: kdiff3.cpp:612 +#: kdiff3.cpp:611 #, kde-format msgid "" "Choose\n" "C" msgstr "" -#: kdiff3.cpp:613 +#: kdiff3.cpp:612 #, kde-format msgid "Automatically Go to Next Unsolved Conflict After Source Selection" msgstr "" -#: kdiff3.cpp:613 +#: kdiff3.cpp:612 #, kde-format msgid "" "Auto\n" "Next" msgstr "" -#: kdiff3.cpp:615 +#: kdiff3.cpp:614 #, kde-format msgid "Show Space && Tabulator Characters" msgstr "" -#: kdiff3.cpp:615 +#: kdiff3.cpp:614 #, kde-format msgid "" "White\n" "Characters" msgstr "" -#: kdiff3.cpp:616 +#: kdiff3.cpp:615 #, kde-format msgid "Show White Space" msgstr "" -#: kdiff3.cpp:616 +#: kdiff3.cpp:615 #, kde-format msgid "" "White\n" "Deltas" msgstr "" -#: kdiff3.cpp:618 +#: kdiff3.cpp:617 #, kde-format msgid "Show Line Numbers" msgstr "" -#: kdiff3.cpp:618 +#: kdiff3.cpp:617 #, kde-format msgid "" "Line\n" "Numbers" msgstr "" -#: kdiff3.cpp:620 +#: kdiff3.cpp:619 #, kde-format msgid "Automatically Solve Simple Conflicts" msgstr "" -#: kdiff3.cpp:621 +#: kdiff3.cpp:620 #, kde-format msgid "Set Deltas to Conflicts" msgstr "" -#: kdiff3.cpp:622 +#: kdiff3.cpp:621 #, kde-format msgid "Run Regular Expression Auto Merge" msgstr "" -#: kdiff3.cpp:623 +#: kdiff3.cpp:622 #, kde-format msgid "Automatically Solve History Conflicts" msgstr "" -#: kdiff3.cpp:624 +#: kdiff3.cpp:623 #, kde-format msgid "Split Diff At Selection" msgstr "" -#: kdiff3.cpp:625 +#: kdiff3.cpp:624 #, kde-format msgid "Join Selected Diffs" msgstr "" -#: kdiff3.cpp:627 +#: kdiff3.cpp:626 #, kde-format msgid "Show Window A" msgstr "" -#: kdiff3.cpp:628 +#: kdiff3.cpp:627 #, kde-format msgid "Show Window B" msgstr "" -#: kdiff3.cpp:629 +#: kdiff3.cpp:628 #, kde-format msgid "Show Window C" msgstr "" -#: kdiff3.cpp:631 +#: kdiff3.cpp:630 #, kde-format msgid "Normal Overview" msgstr "" -#: kdiff3.cpp:632 +#: kdiff3.cpp:631 #, kde-format msgid "A vs. B Overview" msgstr "" -#: kdiff3.cpp:633 +#: kdiff3.cpp:632 #, kde-format msgid "A vs. C Overview" msgstr "" -#: kdiff3.cpp:634 +#: kdiff3.cpp:633 #, kde-format msgid "B vs. C Overview" msgstr "" -#: kdiff3.cpp:635 +#: kdiff3.cpp:634 #, kde-format msgid "Word Wrap Diff Windows" msgstr "" -#: kdiff3.cpp:636 +#: kdiff3.cpp:635 #, kde-format msgid "Add Manual Diff Alignment" msgstr "" -#: kdiff3.cpp:637 +#: kdiff3.cpp:636 #, kde-format msgid "Clear All Manual Diff Alignments" msgstr "" -#: kdiff3.cpp:639 +#: kdiff3.cpp:638 #, kde-format msgid "Focus Next Window" msgstr "" -#: kdiff3.cpp:640 +#: kdiff3.cpp:639 #, kde-format msgid "Focus Prev Window" msgstr "" -#: kdiff3.cpp:641 +#: kdiff3.cpp:640 #, kde-format msgid "Toggle Split Orientation" msgstr "" -#: kdiff3.cpp:643 +#: kdiff3.cpp:642 #, kde-format msgid "Dir && Text Split Screen View" msgstr "" -#: kdiff3.cpp:645 +#: kdiff3.cpp:644 #, kde-format msgid "Toggle Between Dir && Text View" msgstr "" -#: kdiff3.cpp:697 pdiff.cpp:1909 +#: kdiff3.cpp:696 pdiff.cpp:1919 #, kde-format msgid "The merge result has not been saved." msgstr "" -#: kdiff3.cpp:699 +#: kdiff3.cpp:698 #, kde-format msgid "Save && Quit" msgstr "" -#: kdiff3.cpp:700 +#: kdiff3.cpp:699 #, kde-format msgid "Quit Without Saving" msgstr "" -#: kdiff3.cpp:708 pdiff.cpp:1920 +#: kdiff3.cpp:707 pdiff.cpp:1930 #, kde-format msgid "Saving the merge result failed." msgstr "" -#: kdiff3.cpp:719 pdiff.cpp:1032 +#: kdiff3.cpp:718 pdiff.cpp:1030 #, kde-format msgid "" "You are currently doing a directory merge. Are you sure, you want to abort?" msgstr "" -#: kdiff3.cpp:742 +#: kdiff3.cpp:741 #, kde-format msgid "Saving file..." msgstr "" -#: kdiff3.cpp:759 +#: kdiff3.cpp:758 #, kde-format msgid "Saving file with a new filename..." msgstr "" -#: kdiff3.cpp:761 +#: kdiff3.cpp:760 #, kde-format msgid "Save As..." msgstr "" -#: kdiff3.cpp:820 +#: kdiff3.cpp:819 #, kde-format msgid "Printing not implemented." msgstr "" -#: kdiff3.cpp:857 +#: kdiff3.cpp:858 #, kde-format msgid "Printing..." msgstr "" -#: kdiff3.cpp:943 +#: kdiff3.cpp:948 #, kde-format msgid "Printing page %1 of %2" msgstr "" -#: kdiff3.cpp:1000 +#: kdiff3.cpp:1006 #, fuzzy, kde-format msgid " (Selection)" msgstr "أمحي A" -#: kdiff3.cpp:1027 +#: kdiff3.cpp:1034 #, kde-format msgid "Printing completed." msgstr "" -#: kdiff3.cpp:1031 +#: kdiff3.cpp:1038 #, kde-format msgid "Printing aborted." msgstr "" -#: kdiff3.cpp:1038 +#: kdiff3.cpp:1045 #, kde-format msgid "Exiting..." msgstr "" -#: kdiff3.cpp:1049 +#: kdiff3.cpp:1056 #, kde-format msgid "Toggling toolbar..." msgstr "" -#: kdiff3.cpp:1070 +#: kdiff3.cpp:1077 #, kde-format msgid "Toggle the statusbar..." msgstr "" @@ -1530,7 +1537,7 @@ msgid "Joachim Eibl" msgstr "" -#: kdiff3_part.cpp:173 kdiff3_part.cpp:254 +#: kdiff3_part.cpp:174 kdiff3_part.cpp:255 #, kde-format msgid "Could not find files for comparison." msgstr "" @@ -1548,7 +1555,7 @@ msgstr "&تابع" #. i18n: ectx: ToolBar (mainToolBar) -#: kdiff3_part.rc:16 main.cpp:88 +#: kdiff3_part.rc:16 main.cpp:89 #, kde-format msgid "KDiff3" msgstr "" @@ -1615,198 +1622,203 @@ msgid "Main Toolbar" msgstr "" -#: main.cpp:68 main.cpp:72 +#: main.cpp:69 main.cpp:73 #, kde-format msgid "Ignored. (User defined.)" msgstr "" -#: main.cpp:92 +#: main.cpp:93 #, kde-format msgid " (64 bit)" msgstr "" -#: main.cpp:94 +#: main.cpp:95 #, kde-format msgid " (32 bit)" msgstr "" -#: main.cpp:95 +#: main.cpp:96 #, kde-format msgid "Tool for Comparison and Merge of Files and Directories" msgstr "" -#: main.cpp:96 +#: main.cpp:97 #, kde-format msgid "(c) 2002-2014 Joachim Eibl, (c) 2017 Michael Reeves KF5/Qt5 port" msgstr "" -#: main.cpp:112 +#: main.cpp:113 #, kde-format msgid "Merge the input." msgstr "" -#: main.cpp:113 +#: main.cpp:114 #, kde-format msgid "Explicit base file. For compatibility with certain tools." msgstr "" -#: main.cpp:114 +#: main.cpp:115 #, kde-format msgid "Output file. Implies -m. E.g.: -o newfile.txt" msgstr "" -#: main.cpp:115 +#: main.cpp:116 #, kde-format msgid "Output file, again. (For compatibility with certain tools.)" msgstr "" -#: main.cpp:116 +#: main.cpp:118 #, kde-format msgid "No GUI if all conflicts are auto-solvable. (Needs -o file)" msgstr "" -#: main.cpp:117 +#: main.cpp:120 +#, kde-format +msgid "Ignored." +msgstr "" + +#: main.cpp:122 #, kde-format msgid "Do not solve conflicts automatically." msgstr "" -#: main.cpp:118 +#: main.cpp:123 #, kde-format msgid "Visible name replacement for input file 1 (base)." msgstr "" -#: main.cpp:119 +#: main.cpp:124 #, kde-format msgid "Visible name replacement for input file 2." msgstr "" -#: main.cpp:120 +#: main.cpp:125 #, kde-format msgid "Visible name replacement for input file 3." msgstr "" -#: main.cpp:121 +#: main.cpp:126 #, kde-format msgid "Alternative visible name replacement. Supply this once for every input." msgstr "" -#: main.cpp:122 +#: main.cpp:127 #, kde-format msgid "" "Override a config setting. Use once for every setting. E.g.: --cs " "\"AutoAdvance=1\"" msgstr "" -#: main.cpp:123 +#: main.cpp:128 #, kde-format msgid "Show list of config settings and current values." msgstr "" -#: main.cpp:124 +#: main.cpp:129 #, kde-format msgid "Use a different config file." msgstr "" -#: main.cpp:127 +#: main.cpp:132 #, kde-format msgid "file1 to open (base, if not specified via --base)" msgstr "" -#: main.cpp:128 +#: main.cpp:133 #, kde-format msgid "file2 to open" msgstr "" -#: main.cpp:129 +#: main.cpp:134 #, kde-format msgid "file3 to open" msgstr "" -#: main.cpp:153 +#: main.cpp:158 #, kde-format msgid "See kdiff3 --help for supported options." msgstr "" -#: mergeresultwindow.cpp:158 +#: mergeresultwindow.cpp:171 #, kde-format msgid "Choose A Everywhere" msgstr "" -#: mergeresultwindow.cpp:159 +#: mergeresultwindow.cpp:172 #, kde-format msgid "Choose B Everywhere" msgstr "" -#: mergeresultwindow.cpp:160 +#: mergeresultwindow.cpp:173 #, kde-format msgid "Choose C Everywhere" msgstr "" -#: mergeresultwindow.cpp:161 +#: mergeresultwindow.cpp:174 #, kde-format msgid "Choose A for All Unsolved Conflicts" msgstr "" -#: mergeresultwindow.cpp:162 +#: mergeresultwindow.cpp:175 #, kde-format msgid "Choose B for All Unsolved Conflicts" msgstr "" -#: mergeresultwindow.cpp:163 +#: mergeresultwindow.cpp:176 #, kde-format msgid "Choose C for All Unsolved Conflicts" msgstr "" -#: mergeresultwindow.cpp:164 +#: mergeresultwindow.cpp:177 #, kde-format msgid "Choose A for All Unsolved Whitespace Conflicts" msgstr "" -#: mergeresultwindow.cpp:165 +#: mergeresultwindow.cpp:178 #, kde-format msgid "Choose B for All Unsolved Whitespace Conflicts" msgstr "" -#: mergeresultwindow.cpp:166 +#: mergeresultwindow.cpp:179 #, kde-format msgid "Choose C for All Unsolved Whitespace Conflicts" msgstr "" -#: mergeresultwindow.cpp:176 +#: mergeresultwindow.cpp:204 #, kde-format msgid "Number of remaining unsolved conflicts: %1 (of which %2 are whitespace)" msgstr "" -#: mergeresultwindow.cpp:370 +#: mergeresultwindow.cpp:398 #, kde-format msgid "" "The output has been modified.\n" "If you continue your changes will be lost." msgstr "" -#: mergeresultwindow.cpp:936 pdiff.cpp:827 +#: mergeresultwindow.cpp:964 pdiff.cpp:817 #, kde-format msgid "All input files are binary equal." msgstr "" -#: mergeresultwindow.cpp:938 +#: mergeresultwindow.cpp:966 #, kde-format msgid "All input files contain the same text." msgstr "" -#: mergeresultwindow.cpp:942 mergeresultwindow.cpp:946 -#: mergeresultwindow.cpp:950 pdiff.cpp:833 pdiff.cpp:837 pdiff.cpp:841 +#: mergeresultwindow.cpp:970 mergeresultwindow.cpp:974 +#: mergeresultwindow.cpp:978 pdiff.cpp:823 pdiff.cpp:827 pdiff.cpp:831 #, kde-format msgid "Files %1 and %2 are binary equal.\n" msgstr "" -#: mergeresultwindow.cpp:944 mergeresultwindow.cpp:948 -#: mergeresultwindow.cpp:952 +#: mergeresultwindow.cpp:972 mergeresultwindow.cpp:976 +#: mergeresultwindow.cpp:980 #, kde-format msgid "Files %1 and %2 have equal text.\n" msgstr "" -#: mergeresultwindow.cpp:958 +#: mergeresultwindow.cpp:986 #, kde-format msgid "" "Total number of conflicts: %1\n" @@ -1815,39 +1827,39 @@ "%4" msgstr "" -#: mergeresultwindow.cpp:964 +#: mergeresultwindow.cpp:992 #, kde-format msgid "Conflicts" msgstr "" -#: mergeresultwindow.cpp:1873 +#: mergeresultwindow.cpp:1901 #, kde-format msgid "" msgstr "" -#: mergeresultwindow.cpp:1881 +#: mergeresultwindow.cpp:1909 #, kde-format msgid "" msgstr "" -#: mergeresultwindow.cpp:1883 mergeresultwindow.cpp:2755 +#: mergeresultwindow.cpp:1911 mergeresultwindow.cpp:2783 #, kde-format msgid "" msgstr "" -#: mergeresultwindow.cpp:2967 +#: mergeresultwindow.cpp:2995 #, kde-format msgid "" "Not all conflicts are solved yet.\n" "File not saved." msgstr "" -#: mergeresultwindow.cpp:2969 mergeresultwindow.cpp:2978 +#: mergeresultwindow.cpp:2997 mergeresultwindow.cpp:3006 #, kde-format msgid "Conflicts Left" msgstr "" -#: mergeresultwindow.cpp:2976 +#: mergeresultwindow.cpp:3004 #, kde-format msgid "" "There is a line end style conflict. Please choose the line end style " @@ -1855,7 +1867,7 @@ "File not saved." msgstr "" -#: mergeresultwindow.cpp:2990 +#: mergeresultwindow.cpp:3018 #, kde-format msgid "" "\n" @@ -1863,57 +1875,57 @@ "Creating backup failed. File not saved." msgstr "" -#: mergeresultwindow.cpp:2990 mergeresultwindow.cpp:3038 +#: mergeresultwindow.cpp:3018 mergeresultwindow.cpp:3066 #, kde-format msgid "File Save Error" msgstr "" -#: mergeresultwindow.cpp:3038 +#: mergeresultwindow.cpp:3066 #, kde-format msgid "Error while writing." msgstr "" -#: mergeresultwindow.cpp:3110 +#: mergeresultwindow.cpp:3138 #, kde-format msgid "Output:" msgstr "" -#: mergeresultwindow.cpp:3123 mergeresultwindow.cpp:3315 +#: mergeresultwindow.cpp:3151 mergeresultwindow.cpp:3343 #, kde-format msgid "[Modified]" msgstr "" -#: mergeresultwindow.cpp:3130 +#: mergeresultwindow.cpp:3158 #, kde-format msgid "Encoding for saving:" msgstr "" -#: mergeresultwindow.cpp:3230 +#: mergeresultwindow.cpp:3258 #, kde-format msgid "Conflict" msgstr "" -#: mergeresultwindow.cpp:3262 +#: mergeresultwindow.cpp:3290 #, kde-format msgid "Codec from A: %1" msgstr "" -#: mergeresultwindow.cpp:3264 +#: mergeresultwindow.cpp:3292 #, kde-format msgid "Codec from B: %1" msgstr "" -#: mergeresultwindow.cpp:3266 +#: mergeresultwindow.cpp:3294 #, kde-format msgid "Codec from C: %1" msgstr "" -#: optiondialog.cpp:119 +#: optiondialog.cpp:121 #, kde-format msgid "Change Font" msgstr "" -#: optiondialog.cpp:135 optiondialog.cpp:145 +#: optiondialog.cpp:137 optiondialog.cpp:147 #, kde-format msgid "" "Font: %1, %2, %3\n" @@ -1921,206 +1933,206 @@ "Example:" msgstr "" -#: optiondialog.cpp:388 +#: optiondialog.cpp:390 #, kde-format msgid "Unicode" msgstr "" -#: optiondialog.cpp:389 +#: optiondialog.cpp:391 #, kde-format msgid "Latin1" msgstr "" -#: optiondialog.cpp:408 +#: optiondialog.cpp:410 #, kde-format msgid "Change this if non-ASCII characters are not displayed correctly." msgstr "" -#: optiondialog.cpp:491 +#: optiondialog.cpp:495 #, fuzzy, kde-format msgid "Configure" msgstr "&تابع" -#: optiondialog.cpp:568 +#: optiondialog.cpp:573 #, kde-format msgid "Font" msgstr "" -#: optiondialog.cpp:570 +#: optiondialog.cpp:575 #, kde-format msgid "Editor & Diff Output Font" msgstr "" -#: optiondialog.cpp:589 +#: optiondialog.cpp:594 #, kde-format msgid "Application font" msgstr "" -#: optiondialog.cpp:594 +#: optiondialog.cpp:599 #, kde-format msgid "File view font" msgstr "" -#: optiondialog.cpp:613 +#: optiondialog.cpp:618 #, kde-format msgctxt "Title for color settings page" msgid "Color" msgstr "" -#: optiondialog.cpp:614 +#: optiondialog.cpp:619 #, kde-format msgid "Colors Settings" msgstr "" -#: optiondialog.cpp:631 +#: optiondialog.cpp:644 #, kde-format msgid "Editor and Diff Views:" msgstr "" -#: optiondialog.cpp:639 +#: optiondialog.cpp:652 #, kde-format msgid "Foreground color:" msgstr "" -#: optiondialog.cpp:647 +#: optiondialog.cpp:660 #, kde-format msgid "Background color:" msgstr "" -#: optiondialog.cpp:657 +#: optiondialog.cpp:670 #, kde-format msgid "Diff background color:" msgstr "" -#: optiondialog.cpp:666 +#: optiondialog.cpp:679 #, kde-format msgid "Color A:" msgstr "" -#: optiondialog.cpp:675 +#: optiondialog.cpp:688 #, kde-format msgid "Color B:" msgstr "" -#: optiondialog.cpp:684 +#: optiondialog.cpp:697 #, kde-format msgid "Color C:" msgstr "" -#: optiondialog.cpp:692 +#: optiondialog.cpp:705 #, kde-format msgid "Conflict color:" msgstr "" -#: optiondialog.cpp:701 +#: optiondialog.cpp:714 #, kde-format msgid "Current range background color:" msgstr "" -#: optiondialog.cpp:710 +#: optiondialog.cpp:723 #, kde-format msgid "Current range diff background color:" msgstr "" -#: optiondialog.cpp:718 +#: optiondialog.cpp:731 #, kde-format msgid "Color for manually aligned difference ranges:" msgstr "" -#: optiondialog.cpp:725 +#: optiondialog.cpp:738 #, kde-format msgid "Directory Comparison View:" msgstr "" -#: optiondialog.cpp:731 +#: optiondialog.cpp:744 #, kde-format msgid "Newest file color:" msgstr "" -#: optiondialog.cpp:736 +#: optiondialog.cpp:749 #, kde-format msgid "" "Changing this color will only be effective when starting the next directory " "comparison." msgstr "" -#: optiondialog.cpp:741 +#: optiondialog.cpp:754 #, kde-format msgid "Oldest file color:" msgstr "" -#: optiondialog.cpp:750 +#: optiondialog.cpp:763 #, kde-format msgid "Middle age file color:" msgstr "" -#: optiondialog.cpp:759 +#: optiondialog.cpp:772 #, kde-format msgid "Color for missing files:" msgstr "" -#: optiondialog.cpp:773 +#: optiondialog.cpp:786 #, kde-format msgid "Editor" msgstr "" -#: optiondialog.cpp:774 +#: optiondialog.cpp:787 #, kde-format msgid "Editor Behavior" msgstr "" -#: optiondialog.cpp:787 +#: optiondialog.cpp:809 #, kde-format msgid "Tab inserts spaces" msgstr "" -#: optiondialog.cpp:791 +#: optiondialog.cpp:813 #, kde-format msgid "" "On: Pressing tab generates the appropriate number of spaces.\n" "Off: A tab character will be inserted." msgstr "" -#: optiondialog.cpp:796 +#: optiondialog.cpp:818 #, kde-format msgid "Tab size:" msgstr "" -#: optiondialog.cpp:803 +#: optiondialog.cpp:825 #, kde-format msgid "Auto indentation" msgstr "" -#: optiondialog.cpp:807 +#: optiondialog.cpp:829 #, kde-format msgid "On: The indentation of the previous line is used for a new line.\n" msgstr "" -#: optiondialog.cpp:810 +#: optiondialog.cpp:832 #, kde-format msgid "Auto copy selection" msgstr "" -#: optiondialog.cpp:814 +#: optiondialog.cpp:836 #, kde-format msgid "" "On: Any selection is immediately written to the clipboard.\n" "Off: You must explicitly copy e.g. via Ctrl-C." msgstr "" -#: optiondialog.cpp:829 +#: optiondialog.cpp:851 #, kde-format msgid "" "Sets the line endings for when an edited file is saved.\n" "DOS/Windows: CR+LF; UNIX: LF; with CR=0D, LF=0A" msgstr "" -#: optiondialog.cpp:839 +#: optiondialog.cpp:861 #, kde-format msgid "Diff" msgstr "" -#: optiondialog.cpp:840 +#: optiondialog.cpp:862 #, kde-format msgid "Diff Settings" msgstr "" @@ -2134,12 +2146,12 @@ #. ); #. ++line; #. -#: optiondialog.cpp:865 +#: optiondialog.cpp:896 #, kde-format msgid "Ignore numbers (treat as white space)" msgstr "" -#: optiondialog.cpp:869 +#: optiondialog.cpp:900 #, kde-format msgid "" "Ignore number characters during line matching phase. (Similar to Ignore " @@ -2147,66 +2159,66 @@ "Might help to compare files with numeric data." msgstr "" -#: optiondialog.cpp:873 +#: optiondialog.cpp:904 #, kde-format msgid "Ignore C/C++ comments (treat as white space)" msgstr "" -#: optiondialog.cpp:876 +#: optiondialog.cpp:907 #, kde-format msgid "Treat C/C++ comments like white space." msgstr "" -#: optiondialog.cpp:879 +#: optiondialog.cpp:910 #, kde-format msgid "Ignore case (treat as white space)" msgstr "" -#: optiondialog.cpp:883 +#: optiondialog.cpp:914 #, kde-format msgid "Treat case differences like white space changes. ('a'<=>'A')" msgstr "" -#: optiondialog.cpp:886 +#: optiondialog.cpp:917 #, kde-format msgid "Preprocessor command:" msgstr "" -#: optiondialog.cpp:891 +#: optiondialog.cpp:922 #, kde-format msgid "User defined pre-processing. (See the docs for details.)" msgstr "" -#: optiondialog.cpp:894 +#: optiondialog.cpp:925 #, kde-format msgid "Line-matching preprocessor command:" msgstr "" -#: optiondialog.cpp:899 +#: optiondialog.cpp:930 #, kde-format msgid "" "This pre-processor is only used during line matching.\n" "(See the docs for details.)" msgstr "" -#: optiondialog.cpp:902 +#: optiondialog.cpp:933 #, kde-format msgid "Try hard (slower)" msgstr "" -#: optiondialog.cpp:906 +#: optiondialog.cpp:937 #, kde-format msgid "" "Enables the --minimal option for the external diff.\n" "The analysis of big files will be much slower." msgstr "" -#: optiondialog.cpp:910 +#: optiondialog.cpp:941 #, kde-format msgid "Align B and C for 3 input files" msgstr "" -#: optiondialog.cpp:914 +#: optiondialog.cpp:945 #, kde-format msgid "" "Try to align B and C when comparing or merging three input files.\n" @@ -2214,66 +2226,72 @@ "(Default is off.)" msgstr "" -#: optiondialog.cpp:926 +#: optiondialog.cpp:956 +#, kde-format +msgctxt "Settings page" +msgid "Merge" +msgstr "" + +#: optiondialog.cpp:957 #, kde-format msgid "Merge Settings" msgstr "" -#: optiondialog.cpp:940 +#: optiondialog.cpp:980 #, kde-format msgid "Auto advance delay (ms):" msgstr "" -#: optiondialog.cpp:946 +#: optiondialog.cpp:986 #, kde-format 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 "" -#: optiondialog.cpp:950 +#: optiondialog.cpp:990 #, kde-format msgid "Show info dialogs" msgstr "" -#: optiondialog.cpp:953 +#: optiondialog.cpp:993 #, kde-format msgid "Show a dialog with information about the number of conflicts." msgstr "" -#: optiondialog.cpp:956 +#: optiondialog.cpp:996 #, kde-format msgid "White space 2-file merge default:" msgstr "" -#: optiondialog.cpp:961 optiondialog.cpp:974 +#: optiondialog.cpp:1001 optiondialog.cpp:1014 #, kde-format msgid "Manual Choice" msgstr "" -#: optiondialog.cpp:965 optiondialog.cpp:979 +#: optiondialog.cpp:1005 optiondialog.cpp:1019 #, kde-format msgid "" "Allow the merge algorithm to automatically select an input for white-space-" "only changes." msgstr "" -#: optiondialog.cpp:969 +#: optiondialog.cpp:1009 #, kde-format msgid "White space 3-file merge default:" msgstr "" -#: optiondialog.cpp:983 +#: optiondialog.cpp:1023 #, kde-format msgid "Automatic Merge Regular Expression" msgstr "" -#: optiondialog.cpp:991 smalldialogs.cpp:449 +#: optiondialog.cpp:1031 smalldialogs.cpp:459 #, kde-format msgid "Auto merge regular expression:" msgstr "" -#: optiondialog.cpp:996 +#: optiondialog.cpp:1036 #, kde-format msgid "" "Regular expression for lines where KDiff3 should automatically choose one " @@ -2282,29 +2300,29 @@ "- if available - C, otherwise B will be chosen." msgstr "" -#: optiondialog.cpp:1002 +#: optiondialog.cpp:1042 #, kde-format msgid "Run regular expression auto merge on merge start" msgstr "" -#: optiondialog.cpp:1005 +#: optiondialog.cpp:1045 #, kde-format msgid "" "Run the merge for auto merge regular expressions\n" "immediately when a merge starts.\n" msgstr "" -#: optiondialog.cpp:1010 +#: optiondialog.cpp:1050 #, kde-format msgid "Version Control History Merging" msgstr "" -#: optiondialog.cpp:1018 smalldialogs.cpp:476 +#: optiondialog.cpp:1058 smalldialogs.cpp:486 #, kde-format msgid "History start regular expression:" msgstr "" -#: optiondialog.cpp:1023 +#: optiondialog.cpp:1063 #, kde-format msgid "" "Regular expression for the start of the version control history entry.\n" @@ -2312,12 +2330,12 @@ "Default value: \".*\\$Log.*\\$.*\"" msgstr "" -#: optiondialog.cpp:1029 smalldialogs.cpp:504 +#: optiondialog.cpp:1069 smalldialogs.cpp:514 #, kde-format msgid "History entry start regular expression:" msgstr "" -#: optiondialog.cpp:1042 +#: optiondialog.cpp:1082 #, kde-format msgid "" "A version control history entry consists of several lines.\n" @@ -2329,22 +2347,22 @@ "See the documentation for details." msgstr "" -#: optiondialog.cpp:1050 +#: optiondialog.cpp:1090 #, kde-format msgid "History merge sorting" msgstr "" -#: optiondialog.cpp:1053 +#: optiondialog.cpp:1093 #, kde-format msgid "Sort version control history by a key." msgstr "" -#: optiondialog.cpp:1063 +#: optiondialog.cpp:1103 #, kde-format msgid "History entry start sort key order:" msgstr "" -#: optiondialog.cpp:1068 +#: optiondialog.cpp:1108 #, kde-format msgid "" "Each pair of parentheses used in the regular expression for the history " @@ -2356,37 +2374,37 @@ "See the documentation for details." msgstr "" -#: optiondialog.cpp:1079 +#: optiondialog.cpp:1119 #, kde-format msgid "Merge version control history on merge start" msgstr "" -#: optiondialog.cpp:1082 +#: optiondialog.cpp:1122 #, kde-format msgid "Run version control history automerge on merge start." msgstr "" -#: optiondialog.cpp:1086 +#: optiondialog.cpp:1126 #, fuzzy, kde-format msgid "Max number of history entries:" msgstr "عدد المجلّدات الفرعية:" -#: optiondialog.cpp:1090 +#: optiondialog.cpp:1130 #, kde-format msgid "Cut off after specified number. Use -1 for infinite number of entries." msgstr "" -#: optiondialog.cpp:1094 +#: optiondialog.cpp:1134 #, kde-format msgid "Test your regular expressions" msgstr "" -#: optiondialog.cpp:1099 +#: optiondialog.cpp:1139 #, kde-format msgid "Irrelevant merge command:" msgstr "" -#: optiondialog.cpp:1104 +#: optiondialog.cpp:1144 #, kde-format msgid "" "If specified this script is run after automerge\n" @@ -2394,12 +2412,12 @@ "Called with the parameters: filename1 filename2 filename3" msgstr "" -#: optiondialog.cpp:1109 +#: optiondialog.cpp:1149 #, kde-format msgid "Auto save and quit on merge without conflicts" msgstr "" -#: optiondialog.cpp:1113 +#: optiondialog.cpp:1153 #, kde-format msgid "" "If KDiff3 was started for a file-merge from the command line and all\n" @@ -2408,27 +2426,27 @@ "(Similar to command line option \"--auto\".)" msgstr "" -#: optiondialog.cpp:1124 optiondialog.cpp:1125 +#: optiondialog.cpp:1164 optiondialog.cpp:1165 #, fuzzy, kde-format msgid "Directory" msgstr "قراءة الدليل A" -#: optiondialog.cpp:1137 +#: optiondialog.cpp:1185 #, kde-format msgid "Recursive directories" msgstr "" -#: optiondialog.cpp:1140 +#: optiondialog.cpp:1188 #, kde-format msgid "Whether to analyze subdirectories or not." msgstr "" -#: optiondialog.cpp:1142 +#: optiondialog.cpp:1190 #, kde-format msgid "File pattern(s):" msgstr "" -#: optiondialog.cpp:1148 +#: optiondialog.cpp:1196 #, kde-format msgid "" "Pattern(s) of files to be analyzed. \n" @@ -2436,12 +2454,12 @@ "Several Patterns can be specified by using the separator: ';'" msgstr "" -#: optiondialog.cpp:1153 +#: optiondialog.cpp:1201 #, kde-format msgid "File-anti-pattern(s):" msgstr "" -#: optiondialog.cpp:1159 +#: optiondialog.cpp:1207 #, kde-format msgid "" "Pattern(s) of files to be excluded from analysis. \n" @@ -2449,12 +2467,12 @@ "Several Patterns can be specified by using the separator: ';'" msgstr "" -#: optiondialog.cpp:1164 +#: optiondialog.cpp:1212 #, kde-format msgid "Dir-anti-pattern(s):" msgstr "" -#: optiondialog.cpp:1170 +#: optiondialog.cpp:1218 #, kde-format msgid "" "Pattern(s) of directories to be excluded from analysis. \n" @@ -2462,58 +2480,58 @@ "Several Patterns can be specified by using the separator: ';'" msgstr "" -#: optiondialog.cpp:1175 +#: optiondialog.cpp:1223 #, kde-format msgid "Use .cvsignore" msgstr "" -#: optiondialog.cpp:1179 +#: optiondialog.cpp:1227 #, kde-format msgid "" "Extends the antipattern to anything that would be ignored by CVS.\n" "Via local \".cvsignore\" files this can be directory specific." msgstr "" -#: optiondialog.cpp:1183 +#: optiondialog.cpp:1231 #, kde-format msgid "Find hidden files and directories" msgstr "" -#: optiondialog.cpp:1186 +#: optiondialog.cpp:1234 #, kde-format msgid "Finds hidden files and directories." msgstr "" -#: optiondialog.cpp:1189 +#: optiondialog.cpp:1237 #, kde-format msgid "Follow file links" msgstr "" -#: optiondialog.cpp:1193 +#: optiondialog.cpp:1241 #, kde-format msgid "" "On: Compare the file the link points to.\n" "Off: Compare the links." msgstr "" -#: optiondialog.cpp:1197 +#: optiondialog.cpp:1245 #, kde-format msgid "Follow directory links" msgstr "" -#: optiondialog.cpp:1201 +#: optiondialog.cpp:1249 #, kde-format msgid "" "On: Compare the directory the link points to.\n" "Off: Compare the links." msgstr "" -#: optiondialog.cpp:1210 +#: optiondialog.cpp:1258 #, kde-format msgid "Case sensitive filename comparison" msgstr "" -#: optiondialog.cpp:1214 +#: optiondialog.cpp:1262 #, kde-format msgid "" "The directory comparison will compare files or directories when their names " @@ -2522,63 +2540,63 @@ "off, otherwise on.)" msgstr "" -#: optiondialog.cpp:1218 +#: optiondialog.cpp:1266 #, kde-format msgid "Unfold all subdirectories on load" msgstr "" -#: optiondialog.cpp:1222 +#: optiondialog.cpp:1270 #, kde-format msgid "" "On: Unfold all subdirectories when starting a directory diff.\n" "Off: Leave subdirectories folded." msgstr "" -#: optiondialog.cpp:1226 +#: optiondialog.cpp:1274 #, kde-format msgid "Skip directory status report" msgstr "" -#: optiondialog.cpp:1230 +#: optiondialog.cpp:1278 #, kde-format msgid "" "On: Do not show the Directory Comparison Status.\n" "Off: Show the status dialog on start." msgstr "" -#: optiondialog.cpp:1234 +#: optiondialog.cpp:1282 #, kde-format msgid "File Comparison Mode" msgstr "" -#: optiondialog.cpp:1239 +#: optiondialog.cpp:1287 #, kde-format msgid "Binary comparison" msgstr "" -#: optiondialog.cpp:1241 +#: optiondialog.cpp:1289 #, kde-format msgid "Binary comparison of each file. (Default)" msgstr "" -#: optiondialog.cpp:1244 +#: optiondialog.cpp:1292 #, kde-format msgid "Full analysis" msgstr "" -#: optiondialog.cpp:1246 +#: optiondialog.cpp:1294 #, kde-format msgid "" "Do a full analysis and show statistics information in extra columns.\n" "(Slower than a binary comparison, much slower for binary files.)" msgstr "" -#: optiondialog.cpp:1250 +#: optiondialog.cpp:1298 #, kde-format msgid "Trust the size and modification date (unsafe)" msgstr "" -#: optiondialog.cpp:1252 +#: optiondialog.cpp:1300 #, kde-format msgid "" "Assume that files are equal if the modification date and file length are " @@ -2588,14 +2606,14 @@ "Useful for big directories or slow networks." msgstr "" -#: optiondialog.cpp:1257 +#: optiondialog.cpp:1305 #, kde-format msgid "" "Trust the size and date, but use binary comparison if date does not match " "(unsafe)" msgstr "" -#: optiondialog.cpp:1259 +#: optiondialog.cpp:1307 #, kde-format msgid "" "Assume that files are equal if the modification date and file length are " @@ -2604,12 +2622,12 @@ "Useful for big directories or slow networks." msgstr "" -#: optiondialog.cpp:1264 +#: optiondialog.cpp:1312 #, kde-format msgid "Trust the size (unsafe)" msgstr "" -#: optiondialog.cpp:1266 +#: optiondialog.cpp:1314 #, kde-format msgid "" "Assume that files are equal if their file lengths are equal.\n" @@ -2617,12 +2635,12 @@ "download." msgstr "" -#: optiondialog.cpp:1273 +#: optiondialog.cpp:1321 #, kde-format msgid "Synchronize directories" msgstr "" -#: optiondialog.cpp:1277 +#: optiondialog.cpp:1325 #, kde-format msgid "" "Offers to store files in both directories so that\n" @@ -2630,24 +2648,24 @@ "Works only when comparing two directories without specifying a destination." msgstr "" -#: optiondialog.cpp:1283 +#: optiondialog.cpp:1331 #, kde-format msgid "White space differences considered equal" msgstr "" -#: optiondialog.cpp:1287 +#: optiondialog.cpp:1335 #, kde-format msgid "" "If files differ only by white space consider them equal.\n" "This is only active when full analysis is chosen." msgstr "" -#: optiondialog.cpp:1293 +#: optiondialog.cpp:1341 #, kde-format msgid "Copy newer instead of merging (unsafe)" msgstr "" -#: optiondialog.cpp:1297 +#: optiondialog.cpp:1345 #, kde-format msgid "" "Do not look inside, just take the newer file.\n" @@ -2655,46 +2673,46 @@ "Only effective when comparing two directories." msgstr "" -#: optiondialog.cpp:1302 +#: optiondialog.cpp:1350 #, kde-format msgid "Backup files (.orig)" msgstr "" -#: optiondialog.cpp:1306 +#: optiondialog.cpp:1354 #, kde-format msgid "" "If 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 "" -#: optiondialog.cpp:1382 optiondialog.cpp:1383 +#: optiondialog.cpp:1430 optiondialog.cpp:1431 #, kde-format msgid "Regional Settings" msgstr "" -#: optiondialog.cpp:1397 +#: optiondialog.cpp:1454 #, kde-format msgid "Use the same encoding for everything:" msgstr "" -#: optiondialog.cpp:1401 +#: optiondialog.cpp:1458 #, kde-format msgid "" "Enable this allows to change all encodings by changing the first only.\n" "Disable this if different individual settings are needed." msgstr "" -#: optiondialog.cpp:1405 +#: optiondialog.cpp:1462 #, kde-format msgid "Note: Local Encoding is \"%1\"" msgstr "" -#: optiondialog.cpp:1409 +#: optiondialog.cpp:1466 #, kde-format msgid "File Encoding for A:" msgstr "" -#: optiondialog.cpp:1416 +#: optiondialog.cpp:1473 #, kde-format msgid "" "If enabled then Unicode (UTF-16 or UTF-8) encoding will be detected.\n" @@ -2703,32 +2721,32 @@ "(Unicode detection depends on the first bytes of a file.)" msgstr "" -#: optiondialog.cpp:1419 optiondialog.cpp:1430 optiondialog.cpp:1441 +#: optiondialog.cpp:1476 optiondialog.cpp:1487 optiondialog.cpp:1498 #, kde-format msgid "Auto Detect Unicode" msgstr "" -#: optiondialog.cpp:1425 +#: optiondialog.cpp:1482 #, kde-format msgid "File Encoding for B:" msgstr "" -#: optiondialog.cpp:1436 +#: optiondialog.cpp:1493 #, kde-format msgid "File Encoding for C:" msgstr "" -#: optiondialog.cpp:1447 +#: optiondialog.cpp:1504 #, kde-format msgid "File Encoding for Merge Output and Saving:" msgstr "" -#: optiondialog.cpp:1452 +#: optiondialog.cpp:1509 #, kde-format msgid "Auto Select" msgstr "" -#: optiondialog.cpp:1456 +#: optiondialog.cpp:1513 #, kde-format msgid "" "If enabled then the encoding from the input files is used.\n" @@ -2736,39 +2754,39 @@ "saving." msgstr "" -#: optiondialog.cpp:1459 +#: optiondialog.cpp:1516 #, kde-format msgid "File Encoding for Preprocessor Files:" msgstr "" -#: optiondialog.cpp:1471 +#: optiondialog.cpp:1528 #, kde-format msgid "Right To Left Language" msgstr "" -#: optiondialog.cpp:1475 +#: optiondialog.cpp:1532 #, kde-format msgid "" "Some languages are read from right to left.\n" "This setting will change the viewer and editor accordingly." msgstr "" -#: optiondialog.cpp:1485 +#: optiondialog.cpp:1542 #, kde-format msgid "Integration" msgstr "" -#: optiondialog.cpp:1486 +#: optiondialog.cpp:1543 #, kde-format msgid "Integration Settings" msgstr "" -#: optiondialog.cpp:1499 +#: optiondialog.cpp:1564 #, kde-format msgid "Command line options to ignore:" msgstr "" -#: optiondialog.cpp:1505 +#: optiondialog.cpp:1570 #, kde-format msgid "" "List of command line options that should be ignored when KDiff3 is used by " @@ -2777,19 +2795,19 @@ "This will suppress the \"Unknown option\" error." msgstr "" -#: optiondialog.cpp:1510 +#: optiondialog.cpp:1575 #, kde-format msgid "Quit also via Escape key" msgstr "" -#: optiondialog.cpp:1514 +#: optiondialog.cpp:1579 #, kde-format msgid "" "Fast method to exit.\n" "For those who are used to using the Escape key." msgstr "" -#: optiondialog.cpp:1598 +#: optiondialog.cpp:1653 #, kde-format msgid "This resets all options. Not only those of the current topic." msgstr "" @@ -2839,77 +2857,68 @@ msgid "Disable Unsafe Options" msgstr "" -#: pdiff.cpp:158 +#: pdiff.cpp:160 #, kde-format msgid "Loading A" msgstr "" -#: pdiff.cpp:167 -#, kde-format -msgid "Errors occurred during pre-processing of file A." -msgstr "" +#: pdiff.cpp:162 +#, fuzzy, kde-format +#| msgid "Reading file: %1" +msgid "Loading A: %1" +msgstr "جاري قراءة الملف: %1" -#: pdiff.cpp:172 +#: pdiff.cpp:170 #, kde-format msgid "Loading B" msgstr "" -#: pdiff.cpp:179 -#, kde-format -msgid "Errors occurred during pre-processing of file B." -msgstr "" - -#: pdiff.cpp:202 pdiff.cpp:241 +#: pdiff.cpp:201 pdiff.cpp:237 #, kde-format msgid "Diff: A <-> B" msgstr "" -#: pdiff.cpp:208 pdiff.cpp:279 pdiff.cpp:293 +#: pdiff.cpp:207 pdiff.cpp:275 pdiff.cpp:289 #, kde-format msgid "Linediff: A <-> B" msgstr "" -#: pdiff.cpp:225 +#: pdiff.cpp:224 #, kde-format msgid "Loading C" msgstr "" -#: pdiff.cpp:232 -#, kde-format -msgid "Errors occurred during pre-processing of file C." -msgstr "" - -#: pdiff.cpp:250 +#: pdiff.cpp:246 #, kde-format msgid "Diff: A <-> C" msgstr "" -#: pdiff.cpp:261 +#: pdiff.cpp:257 #, kde-format msgid "Diff: B <-> C" msgstr "" -#: pdiff.cpp:283 pdiff.cpp:297 +#: pdiff.cpp:279 pdiff.cpp:293 #, kde-format msgid "Linediff: B <-> C" msgstr "" -#: pdiff.cpp:287 pdiff.cpp:301 +#: pdiff.cpp:283 pdiff.cpp:297 #, kde-format msgid "Linediff: A <-> C" msgstr "" -#: pdiff.cpp:829 +#: pdiff.cpp:819 #, kde-format msgid "All input files contain the same text, but are not binary equal." msgstr "" -#: pdiff.cpp:835 pdiff.cpp:839 pdiff.cpp:843 +#: pdiff.cpp:825 pdiff.cpp:829 pdiff.cpp:833 #, kde-format msgid "Files %1 and %2 have equal text, but are not binary equal. \n" msgstr "" -#: pdiff.cpp:853 +#: pdiff.cpp:843 #, kde-format msgid "" "Some input files do not seem to be pure text files.\n" @@ -2917,17 +2926,17 @@ "Continue at your own risk." msgstr "" -#: pdiff.cpp:863 +#: pdiff.cpp:853 #, kde-format msgid ", B" msgstr "" -#: pdiff.cpp:865 +#: pdiff.cpp:855 #, kde-format msgid ", C" msgstr "" -#: pdiff.cpp:867 +#: pdiff.cpp:857 #, kde-format msgid "" "Some input characters could not be converted to valid unicode.\n" @@ -2936,77 +2945,72 @@ "Affected input files are in %1." msgstr "" -#: pdiff.cpp:1034 +#: pdiff.cpp:1032 #, kde-format msgid "Abort" msgstr "" -#: pdiff.cpp:1040 pdiff.cpp:1130 +#: pdiff.cpp:1038 pdiff.cpp:1129 #, kde-format msgid "Opening files..." msgstr "" -#: pdiff.cpp:1107 -#, kde-format -msgid "File open error" -msgstr "" - -#: pdiff.cpp:1202 +#: pdiff.cpp:1212 #, kde-format msgid "Cutting selection..." msgstr "" -#: pdiff.cpp:1223 +#: pdiff.cpp:1233 #, kde-format msgid "Copying selection to clipboard..." msgstr "" -#: pdiff.cpp:1239 +#: pdiff.cpp:1249 #, kde-format msgid "Inserting clipboard contents..." msgstr "" -#: pdiff.cpp:1695 +#: pdiff.cpp:1705 #, kde-format msgid "Word wrap (Cancel disables word wrap)" msgstr "" -#: pdiff.cpp:1696 +#: pdiff.cpp:1706 #, kde-format msgid "Calculating max width for horizontal scrollbar" msgstr "" -#: pdiff.cpp:1911 +#: pdiff.cpp:1921 #, kde-format msgid "Save && Continue" msgstr "" -#: pdiff.cpp:1912 +#: pdiff.cpp:1922 #, kde-format msgid "Continue Without Saving" msgstr "" -#: pdiff.cpp:2124 +#: pdiff.cpp:2134 #, kde-format msgid "Search complete." msgstr "" -#: pdiff.cpp:2124 +#: pdiff.cpp:2134 #, kde-format msgid "Search Complete" msgstr "" -#: pdiff.cpp:2375 +#: pdiff.cpp:2385 #, kde-format msgid "Nothing is selected in either diff input window." msgstr "" -#: pdiff.cpp:2375 +#: pdiff.cpp:2385 #, kde-format msgid "Error while adding manual diff range" msgstr "" -#: progress.cpp:59 progress.cpp:71 +#: progress.cpp:61 progress.cpp:73 #, kde-format msgid "&Cancel" msgstr "" @@ -3016,188 +3020,188 @@ msgid "A (Base):" msgstr "" -#: smalldialogs.cpp:68 smalldialogs.cpp:85 smalldialogs.cpp:102 -#: smalldialogs.cpp:144 +#: smalldialogs.cpp:71 smalldialogs.cpp:90 smalldialogs.cpp:109 +#: smalldialogs.cpp:154 #, kde-format msgid "File..." msgstr "" -#: smalldialogs.cpp:70 smalldialogs.cpp:87 smalldialogs.cpp:104 -#: smalldialogs.cpp:146 +#: smalldialogs.cpp:73 smalldialogs.cpp:92 smalldialogs.cpp:111 +#: smalldialogs.cpp:156 #, kde-format msgid "Dir..." msgstr "" -#: smalldialogs.cpp:96 +#: smalldialogs.cpp:103 #, kde-format msgid "C (Optional):" msgstr "" -#: smalldialogs.cpp:119 +#: smalldialogs.cpp:126 #, kde-format msgid "Swap/Copy Names..." msgstr "" -#: smalldialogs.cpp:124 smalldialogs.cpp:125 smalldialogs.cpp:126 +#: smalldialogs.cpp:131 smalldialogs.cpp:132 smalldialogs.cpp:133 #, kde-format msgid "Swap %1<->%2" msgstr "" -#: smalldialogs.cpp:127 smalldialogs.cpp:128 smalldialogs.cpp:129 +#: smalldialogs.cpp:134 smalldialogs.cpp:135 smalldialogs.cpp:136 #, kde-format msgid "Copy %1->Output" msgstr "" -#: smalldialogs.cpp:130 smalldialogs.cpp:131 smalldialogs.cpp:132 +#: smalldialogs.cpp:137 smalldialogs.cpp:138 smalldialogs.cpp:139 #, kde-format msgid "Swap %1<->Output" msgstr "" -#: smalldialogs.cpp:138 +#: smalldialogs.cpp:148 #, kde-format msgid "Output (optional):" msgstr "" -#: smalldialogs.cpp:168 +#: smalldialogs.cpp:178 #, kde-format msgid "Configure..." msgstr "" -#: smalldialogs.cpp:233 +#: smalldialogs.cpp:243 #, fuzzy, kde-format msgid "Open Directory" msgstr "قراءة الدليل A" -#: smalldialogs.cpp:234 +#: smalldialogs.cpp:244 #, kde-format msgid "Select Output File" msgstr "" -#: smalldialogs.cpp:393 +#: smalldialogs.cpp:403 #, kde-format msgid "Search text:" msgstr "" -#: smalldialogs.cpp:400 +#: smalldialogs.cpp:410 #, kde-format msgid "Case sensitive" msgstr "" -#: smalldialogs.cpp:403 +#: smalldialogs.cpp:413 #, kde-format msgid "Search A" msgstr "" -#: smalldialogs.cpp:408 +#: smalldialogs.cpp:418 #, kde-format msgid "Search B" msgstr "" -#: smalldialogs.cpp:413 +#: smalldialogs.cpp:423 #, kde-format msgid "Search C" msgstr "" -#: smalldialogs.cpp:418 +#: smalldialogs.cpp:428 #, kde-format msgid "Search output" msgstr "" -#: smalldialogs.cpp:425 +#: smalldialogs.cpp:435 #, kde-format msgid "&Search" msgstr "" -#: smalldialogs.cpp:444 +#: smalldialogs.cpp:454 #, kde-format msgid "Regular Expression Tester" msgstr "" -#: smalldialogs.cpp:457 +#: smalldialogs.cpp:467 #, kde-format msgid "Example auto merge line:" msgstr "" -#: smalldialogs.cpp:459 +#: smalldialogs.cpp:469 #, kde-format msgid "To test auto merge, copy a line as used in your files." msgstr "" -#: smalldialogs.cpp:465 smalldialogs.cpp:493 smalldialogs.cpp:529 +#: smalldialogs.cpp:475 smalldialogs.cpp:503 smalldialogs.cpp:539 #, kde-format msgid "Match result:" msgstr "" -#: smalldialogs.cpp:484 +#: smalldialogs.cpp:494 #, kde-format msgid "Example history start line (with leading comment):" msgstr "" -#: smalldialogs.cpp:486 +#: smalldialogs.cpp:496 #, kde-format msgid "" "Copy a history start line as used in your files,\n" "including the leading comment." msgstr "" -#: smalldialogs.cpp:512 +#: smalldialogs.cpp:522 #, kde-format msgid "History sort key order:" msgstr "" -#: smalldialogs.cpp:520 +#: smalldialogs.cpp:530 #, kde-format msgid "Example history entry start line (without leading comment):" msgstr "" -#: smalldialogs.cpp:522 +#: smalldialogs.cpp:532 #, kde-format msgid "" "Copy a history entry start line as used in your files,\n" "but omit the leading comment." msgstr "" -#: smalldialogs.cpp:536 +#: smalldialogs.cpp:546 #, kde-format msgid "Sort key result:" msgstr "" -#: smalldialogs.cpp:584 smalldialogs.cpp:594 smalldialogs.cpp:614 +#: smalldialogs.cpp:594 smalldialogs.cpp:604 smalldialogs.cpp:624 #, kde-format msgid "Match success." msgstr "" -#: smalldialogs.cpp:588 smalldialogs.cpp:598 smalldialogs.cpp:620 +#: smalldialogs.cpp:598 smalldialogs.cpp:608 smalldialogs.cpp:630 #, kde-format msgid "Match failed." msgstr "" -#: smalldialogs.cpp:605 +#: smalldialogs.cpp:615 #, kde-format msgid "Opening and closing parentheses do not match in regular expression." msgstr "" -#: SourceData.cpp:150 +#: SourceData.cpp:153 #, kde-format msgid "Writing clipboard data to temp file failed." msgstr "فشل كتابة بيانات الحافظة إلى الملف المؤقت." -#: SourceData.cpp:154 +#: SourceData.cpp:157 #, kde-format msgid "From Clipboard" msgstr "من الحافظة" -#: SourceData.cpp:335 +#: SourceData.cpp:348 #, kde-format msgid "%1 is not a normal file." msgstr "" -#: SourceData.cpp:427 +#: SourceData.cpp:440 #, kde-format msgid " Temp file is: %1" msgstr "" -#: SourceData.cpp:432 +#: SourceData.cpp:445 #, kde-format msgid "" "Preprocessing possibly failed. Check this command:\n" @@ -3212,12 +3216,12 @@ "\n" "سيتم تعطيل الإجراء التمهيدي الآن." -#: SourceData.cpp:443 SourceData.cpp:512 +#: SourceData.cpp:456 SourceData.cpp:525 #, kde-format msgid "File %1 too large to process. Skipping." msgstr "" -#: SourceData.cpp:487 +#: SourceData.cpp:500 #, kde-format msgid "" "The line-matching-preprocessing possibly failed. Check this command:\n" diff -Nru kdiff3-1.8.01/po/bg/kdiff3.po kdiff3-1.8.3/po/bg/kdiff3.po --- kdiff3-1.8.01/po/bg/kdiff3.po 2019-05-18 01:01:49.000000000 +0000 +++ kdiff3-1.8.3/po/bg/kdiff3.po 2020-06-25 00:18:03.000000000 +0000 @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: kdiff3\n" -"Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2019-04-18 08:02+0200\n" +"Report-Msgid-Bugs-To: https://bugs.kde.org\n" +"POT-Creation-Date: 2020-06-22 07:48+0200\n" "PO-Revision-Date: 2011-09-29 09:35+0300\n" "Last-Translator: Yasen Pramatarov \n" "Language-Team: Bulgarian \n" @@ -28,291 +28,291 @@ msgid "Your emails" msgstr "yasen@lindeas.com,zlatkopopov@fsa-bg.org" -#: difftextwindow.cpp:412 +#: difftextwindow.cpp:414 #, kde-format msgid "File %1: Line %2" msgstr "" -#: difftextwindow.cpp:414 +#: difftextwindow.cpp:416 #, fuzzy, kde-format #| msgid "Line not available" msgid "File %1: Line not available" msgstr "Редът липсва" -#: difftextwindow.cpp:1780 +#: difftextwindow.cpp:1778 #, kde-format msgid "Encoding:" msgstr "Кодова таблица:" -#: difftextwindow.cpp:1782 mergeresultwindow.cpp:3138 optiondialog.cpp:818 +#: difftextwindow.cpp:1781 mergeresultwindow.cpp:3166 optiondialog.cpp:840 #, kde-format msgid "Line end style:" msgstr "Край на ред:" -#: difftextwindow.cpp:1810 directorymergewindow.cpp:382 -#: directorymergewindow.cpp:433 directorymergewindow.cpp:524 -#: directorymergewindow.cpp:3058 directorymergewindow.cpp:3189 -#: directorymergewindow.cpp:3417 mergeresultwindow.cpp:942 -#: mergeresultwindow.cpp:944 mergeresultwindow.cpp:946 -#: mergeresultwindow.cpp:948 mergeresultwindow.cpp:1814 -#: mergeresultwindow.cpp:3170 mergeresultwindow.cpp:3177 optiondialog.cpp:962 -#: optiondialog.cpp:975 pdiff.cpp:833 pdiff.cpp:835 pdiff.cpp:837 pdiff.cpp:839 -#: pdiff.cpp:861 smalldialogs.cpp:124 smalldialogs.cpp:126 smalldialogs.cpp:127 -#: smalldialogs.cpp:130 +#: difftextwindow.cpp:1809 directorymergewindow.cpp:383 +#: directorymergewindow.cpp:434 directorymergewindow.cpp:525 +#: directorymergewindow.cpp:3072 directorymergewindow.cpp:3203 +#: directorymergewindow.cpp:3431 mergeresultwindow.cpp:970 +#: mergeresultwindow.cpp:972 mergeresultwindow.cpp:974 +#: mergeresultwindow.cpp:976 mergeresultwindow.cpp:1842 +#: mergeresultwindow.cpp:3198 mergeresultwindow.cpp:3205 optiondialog.cpp:1002 +#: optiondialog.cpp:1015 pdiff.cpp:823 pdiff.cpp:825 pdiff.cpp:827 +#: pdiff.cpp:829 pdiff.cpp:851 smalldialogs.cpp:131 smalldialogs.cpp:133 +#: smalldialogs.cpp:134 smalldialogs.cpp:137 #, kde-format msgid "A" msgstr "А" -#: difftextwindow.cpp:1810 directorymergewindow.cpp:384 -#: directorymergewindow.cpp:436 directorymergewindow.cpp:526 -#: directorymergewindow.cpp:3064 directorymergewindow.cpp:3190 -#: directorymergewindow.cpp:3418 mergeresultwindow.cpp:942 -#: mergeresultwindow.cpp:944 mergeresultwindow.cpp:950 -#: mergeresultwindow.cpp:952 mergeresultwindow.cpp:1816 -#: mergeresultwindow.cpp:3172 mergeresultwindow.cpp:3179 optiondialog.cpp:963 -#: optiondialog.cpp:976 pdiff.cpp:833 pdiff.cpp:835 pdiff.cpp:841 pdiff.cpp:843 -#: pdiff.cpp:863 smalldialogs.cpp:124 smalldialogs.cpp:125 smalldialogs.cpp:128 -#: smalldialogs.cpp:131 +#: difftextwindow.cpp:1809 directorymergewindow.cpp:385 +#: directorymergewindow.cpp:437 directorymergewindow.cpp:527 +#: directorymergewindow.cpp:3078 directorymergewindow.cpp:3204 +#: directorymergewindow.cpp:3432 mergeresultwindow.cpp:970 +#: mergeresultwindow.cpp:972 mergeresultwindow.cpp:978 +#: mergeresultwindow.cpp:980 mergeresultwindow.cpp:1844 +#: mergeresultwindow.cpp:3200 mergeresultwindow.cpp:3207 optiondialog.cpp:1003 +#: optiondialog.cpp:1016 pdiff.cpp:823 pdiff.cpp:825 pdiff.cpp:831 +#: pdiff.cpp:833 pdiff.cpp:853 smalldialogs.cpp:131 smalldialogs.cpp:132 +#: smalldialogs.cpp:135 smalldialogs.cpp:138 #, kde-format msgid "B" msgstr "Б" -#: difftextwindow.cpp:1810 directorymergewindow.cpp:386 -#: directorymergewindow.cpp:439 directorymergewindow.cpp:528 -#: directorymergewindow.cpp:3070 directorymergewindow.cpp:3191 -#: directorymergewindow.cpp:3419 mergeresultwindow.cpp:946 -#: mergeresultwindow.cpp:948 mergeresultwindow.cpp:950 -#: mergeresultwindow.cpp:952 mergeresultwindow.cpp:1818 -#: mergeresultwindow.cpp:3174 mergeresultwindow.cpp:3181 optiondialog.cpp:977 -#: pdiff.cpp:837 pdiff.cpp:839 pdiff.cpp:841 pdiff.cpp:843 pdiff.cpp:865 -#: smalldialogs.cpp:125 smalldialogs.cpp:126 smalldialogs.cpp:129 -#: smalldialogs.cpp:132 +#: difftextwindow.cpp:1809 directorymergewindow.cpp:387 +#: directorymergewindow.cpp:440 directorymergewindow.cpp:529 +#: directorymergewindow.cpp:3084 directorymergewindow.cpp:3205 +#: directorymergewindow.cpp:3433 mergeresultwindow.cpp:974 +#: mergeresultwindow.cpp:976 mergeresultwindow.cpp:978 +#: mergeresultwindow.cpp:980 mergeresultwindow.cpp:1846 +#: mergeresultwindow.cpp:3202 mergeresultwindow.cpp:3209 optiondialog.cpp:1017 +#: pdiff.cpp:827 pdiff.cpp:829 pdiff.cpp:831 pdiff.cpp:833 pdiff.cpp:855 +#: smalldialogs.cpp:132 smalldialogs.cpp:133 smalldialogs.cpp:136 +#: smalldialogs.cpp:139 #, kde-format msgid "C" msgstr "В" -#: difftextwindow.cpp:1810 +#: difftextwindow.cpp:1809 #, fuzzy, kde-format #| msgid "A (Base):" msgid "A (Base)" msgstr "А (основен):" -#: difftextwindow.cpp:1812 +#: difftextwindow.cpp:1811 #, fuzzy, kde-format #| msgid "Encoding:" msgid "Encoding: %1" msgstr "Кодова таблица:" -#: difftextwindow.cpp:1813 mergeresultwindow.cpp:3183 +#: difftextwindow.cpp:1812 mergeresultwindow.cpp:3211 #, kde-format msgid "Unix" msgstr "Unix" -#: difftextwindow.cpp:1813 mergeresultwindow.cpp:3184 +#: difftextwindow.cpp:1812 mergeresultwindow.cpp:3212 #, kde-format msgid "DOS" msgstr "DOS" -#: difftextwindow.cpp:1813 +#: difftextwindow.cpp:1812 #, fuzzy, kde-format #| msgid "Line end style:" msgid "Line end style: %1" msgstr "Край на ред:" -#: difftextwindow.cpp:1835 kdiff3.cpp:873 +#: difftextwindow.cpp:1834 kdiff3.cpp:874 #, kde-format msgid "Top line" msgstr "Най-горен ред" -#: difftextwindow.cpp:1845 +#: difftextwindow.cpp:1843 #, kde-format msgid "End" msgstr "Край" -#: difftextwindow.cpp:1903 smalldialogs.cpp:235 +#: difftextwindow.cpp:1901 smalldialogs.cpp:245 #, fuzzy, kde-format #| msgid "Opening files..." msgid "Open File" msgstr "Отваряне на файлове..." -#: difftextwindow.cpp:1951 optiondialog.cpp:387 +#: difftextwindow.cpp:1943 optiondialog.cpp:389 #, kde-format msgid "Unicode, 8 bit" msgstr "Unicode, 8 бита" -#: difftextwindow.cpp:1966 +#: difftextwindow.cpp:1958 #, kde-format msgid "Other" msgstr "" -#: directorymergewindow.cpp:409 directorymergewindow.cpp:3424 +#: directorymergewindow.cpp:410 directorymergewindow.cpp:3438 #, kde-format msgid "Copy A to B" msgstr "Копиране на А в Б" -#: directorymergewindow.cpp:412 directorymergewindow.cpp:3425 +#: directorymergewindow.cpp:413 directorymergewindow.cpp:3439 #, kde-format msgid "Copy B to A" msgstr "Копиране на Б в А" -#: directorymergewindow.cpp:415 directorymergewindow.cpp:3426 +#: directorymergewindow.cpp:416 directorymergewindow.cpp:3440 #, kde-format msgid "Delete A" msgstr "Изтриване на А" -#: directorymergewindow.cpp:418 directorymergewindow.cpp:3427 +#: directorymergewindow.cpp:419 directorymergewindow.cpp:3441 #, kde-format msgid "Delete B" msgstr "Изтриване на Б" -#: directorymergewindow.cpp:421 +#: directorymergewindow.cpp:422 #, kde-format msgid "Delete A & B" msgstr "Изтриване на А и Б" -#: directorymergewindow.cpp:424 directorymergewindow.cpp:3429 +#: directorymergewindow.cpp:425 directorymergewindow.cpp:3443 #, kde-format msgid "Merge to A" msgstr "Сливане с А" -#: directorymergewindow.cpp:427 directorymergewindow.cpp:3430 +#: directorymergewindow.cpp:428 directorymergewindow.cpp:3444 #, kde-format msgid "Merge to B" msgstr "Сливане с Б" -#: directorymergewindow.cpp:430 +#: directorymergewindow.cpp:431 #, kde-format msgid "Merge to A & B" msgstr "Сливане с А и Б" -#: directorymergewindow.cpp:442 directorymergewindow.cpp:3421 +#: directorymergewindow.cpp:443 directorymergewindow.cpp:3435 #, kde-format msgid "Delete (if exists)" msgstr "Изтриване (ако съществува)" -#: directorymergewindow.cpp:445 directorymergewindow.cpp:448 -#: directorymergewindow.cpp:3420 optiondialog.cpp:925 smalldialogs.cpp:113 +#: directorymergewindow.cpp:446 directorymergewindow.cpp:449 +#: directorymergewindow.cpp:3434 smalldialogs.cpp:120 #, kde-format msgid "Merge" msgstr "Сливане" -#: directorymergewindow.cpp:445 directorymergewindow.cpp:448 +#: directorymergewindow.cpp:446 directorymergewindow.cpp:449 #, kde-format msgid "Merge (manual)" msgstr "Сливане (ръчно)" -#: directorymergewindow.cpp:451 +#: directorymergewindow.cpp:452 #, kde-format msgid "Error: Conflicting File Types" msgstr "Грешка: Конфликт в типовете на файлове" -#: directorymergewindow.cpp:454 +#: directorymergewindow.cpp:455 #, kde-format msgid "Error: Changed and Deleted" msgstr "Грешка: Променено и изтрито" -#: directorymergewindow.cpp:457 +#: directorymergewindow.cpp:458 #, kde-format msgid "Error: Dates are equal but files are not." msgstr "Грешка: Датите са еднакви, но файловете не са." -#: directorymergewindow.cpp:471 +#: directorymergewindow.cpp:472 #, fuzzy, kde-format #| msgid "Done." msgid "Done" msgstr "Изпълнено." -#: directorymergewindow.cpp:473 +#: directorymergewindow.cpp:474 #, kde-format msgid "Error" msgstr "Грешка" -#: directorymergewindow.cpp:475 +#: directorymergewindow.cpp:476 #, kde-format msgid "Skipped." msgstr "Прескочен." -#: directorymergewindow.cpp:477 +#: directorymergewindow.cpp:478 #, kde-format msgid "Not saved." msgstr "Не е записан." -#: directorymergewindow.cpp:479 +#: directorymergewindow.cpp:480 #, kde-format msgid "In progress..." msgstr "Изпълнява се..." -#: directorymergewindow.cpp:481 +#: directorymergewindow.cpp:482 #, kde-format msgid "To do." msgstr "Задача." -#: directorymergewindow.cpp:522 +#: directorymergewindow.cpp:523 #, kde-format msgid "Name" msgstr "Име" -#: directorymergewindow.cpp:530 +#: directorymergewindow.cpp:531 #, kde-format msgid "Operation" msgstr "Действие" -#: directorymergewindow.cpp:532 +#: directorymergewindow.cpp:533 #, kde-format msgid "Status" msgstr "Състояние" -#: directorymergewindow.cpp:534 +#: directorymergewindow.cpp:535 #, kde-format msgid "Unsolved" msgstr "Нерешен" -#: directorymergewindow.cpp:536 +#: directorymergewindow.cpp:537 #, kde-format msgid "Solved" msgstr "Решен" -#: directorymergewindow.cpp:538 +#: directorymergewindow.cpp:539 #, kde-format msgid "Nonwhite" msgstr "Запълнено" -#: directorymergewindow.cpp:540 +#: directorymergewindow.cpp:541 #, kde-format msgid "White" msgstr "Празно" -#: directorymergewindow.cpp:674 +#: directorymergewindow.cpp:676 #, kde-format msgid "Unable to compare non-normal file with normal file." msgstr "" -#: directorymergewindow.cpp:688 +#: directorymergewindow.cpp:690 #, kde-format msgid "Mix of links and normal files." msgstr "Комбинация от препратки и нормални файлове." -#: directorymergewindow.cpp:695 +#: directorymergewindow.cpp:697 #, kde-format msgid "Link: " msgstr "Препратка: " -#: directorymergewindow.cpp:704 +#: directorymergewindow.cpp:706 #, kde-format msgid "Size. " msgstr "Размер. " -#: directorymergewindow.cpp:718 directorymergewindow.cpp:728 +#: directorymergewindow.cpp:720 directorymergewindow.cpp:730 #, kde-format msgid "Date & Size: " msgstr "Дата и размер: " -#: directorymergewindow.cpp:748 +#: directorymergewindow.cpp:751 #, kde-format msgid "Comparing file..." msgstr "Сравняване на файл..." -#: directorymergewindow.cpp:801 +#: directorymergewindow.cpp:813 #, kde-format msgid "" "You are currently doing a directory merge. Are you sure, you want to abort " @@ -321,48 +321,48 @@ "В момента извършвате сливане на директория. Сигурни ли сте, че искате да " "прекъснете сливането и да сканирате отново директорията?" -#: directorymergewindow.cpp:802 kdiff3.cpp:698 kdiff3.cpp:708 kdiff3.cpp:720 -#: mergeresultwindow.cpp:372 pdiff.cpp:1033 pdiff.cpp:1910 pdiff.cpp:1920 +#: directorymergewindow.cpp:814 kdiff3.cpp:697 kdiff3.cpp:707 kdiff3.cpp:719 +#: mergeresultwindow.cpp:400 pdiff.cpp:1031 pdiff.cpp:1920 pdiff.cpp:1930 #, kde-format msgid "Warning" msgstr "Предупреждение" -#: directorymergewindow.cpp:803 directorymergewindow.cpp:3393 +#: directorymergewindow.cpp:815 directorymergewindow.cpp:3407 #, kde-format msgid "Rescan" msgstr "Ново сканиране" -#: directorymergewindow.cpp:804 pdiff.cpp:1035 +#: directorymergewindow.cpp:816 pdiff.cpp:1033 #, kde-format msgid "Continue Merging" msgstr "Продължение на сливането" -#: directorymergewindow.cpp:971 +#: directorymergewindow.cpp:984 #, kde-format msgid "Opening of directories failed:" msgstr "Отварянето на директориите беше неуспешно:" -#: directorymergewindow.cpp:975 +#: directorymergewindow.cpp:988 #, kde-format msgid "Dir A \"%1\" does not exist or is not a directory.\n" msgstr "Директория А \"%1\" не съществува или не е директория.\n" -#: directorymergewindow.cpp:980 +#: directorymergewindow.cpp:993 #, kde-format msgid "Dir B \"%1\" does not exist or is not a directory.\n" msgstr "Директория Б \"%1\" не съществува или не е директория.\n" -#: directorymergewindow.cpp:985 +#: directorymergewindow.cpp:998 #, kde-format msgid "Dir C \"%1\" does not exist or is not a directory.\n" msgstr "Директория В \"%1\" не съществува или не е директория.\n" -#: directorymergewindow.cpp:988 +#: directorymergewindow.cpp:1001 #, kde-format msgid "Directory Open Error" msgstr "Грешка при отваряне на директория" -#: directorymergewindow.cpp:996 +#: directorymergewindow.cpp:1009 #, kde-format msgid "" "The destination directory must not be the same as A or B when three " @@ -373,49 +373,49 @@ "същата като А или Б.\n" "Проверете отново преди да продължите." -#: directorymergewindow.cpp:998 +#: directorymergewindow.cpp:1011 #, kde-format msgid "Parameter Warning" msgstr "Предупреждение за параметър" -#: directorymergewindow.cpp:1003 +#: directorymergewindow.cpp:1016 #, kde-format msgid "Scanning directories..." msgstr "Сканиране на директориите..." -#: directorymergewindow.cpp:1029 +#: directorymergewindow.cpp:1042 #, kde-format msgid "Reading Directory A" msgstr "Четене на директория А" -#: directorymergewindow.cpp:1038 +#: directorymergewindow.cpp:1051 #, kde-format msgid "Reading Directory B" msgstr "Четене на директория Б" -#: directorymergewindow.cpp:1048 +#: directorymergewindow.cpp:1061 #, kde-format msgid "Reading Directory C" msgstr "Четене на директория В" -#: directorymergewindow.cpp:1064 +#: directorymergewindow.cpp:1077 #, kde-format msgid "Some subdirectories were not readable in" msgstr "Някои от поддиректориите са нечетими" -#: directorymergewindow.cpp:1069 +#: directorymergewindow.cpp:1082 #, kde-format msgid "Check the permissions of the subdirectories." msgstr "Проверете правата на поддиректориите." -#: directorymergewindow.cpp:1106 kdiff3.cpp:666 kdiff3.cpp:753 kdiff3.cpp:777 -#: kdiff3.cpp:1065 kdiff3.cpp:1086 pdiff.cpp:1116 pdiff.cpp:1170 pdiff.cpp:1218 -#: pdiff.cpp:1234 pdiff.cpp:1277 pdiff.cpp:1301 +#: directorymergewindow.cpp:1119 kdiff3.cpp:665 kdiff3.cpp:752 kdiff3.cpp:776 +#: kdiff3.cpp:1072 kdiff3.cpp:1093 pdiff.cpp:1115 pdiff.cpp:1178 pdiff.cpp:1228 +#: pdiff.cpp:1244 pdiff.cpp:1287 pdiff.cpp:1311 #, kde-format msgid "Ready." msgstr "В готовност." -#: directorymergewindow.cpp:1121 +#: directorymergewindow.cpp:1134 #, kde-format msgid "" "Directory Comparison Status\n" @@ -425,23 +425,23 @@ "Number of different files: %3" msgstr "" -#: directorymergewindow.cpp:1128 +#: directorymergewindow.cpp:1141 #, fuzzy, kde-format #| msgid "Number of manual merges:" msgid "Number of manual merges: %1" msgstr "Бройка на ръчните сливания:" -#: directorymergewindow.cpp:1394 +#: directorymergewindow.cpp:1407 #, kde-format msgid "This affects all merge operations." msgstr "Това засяга всички операции по сливане." -#: directorymergewindow.cpp:1395 +#: directorymergewindow.cpp:1408 #, kde-format msgid "Changing All Merge Operations" msgstr "Промяна на всички операции по сливане" -#: directorymergewindow.cpp:1695 +#: directorymergewindow.cpp:1708 #, fuzzy, kde-format #| msgid "Processing " msgid "" @@ -449,45 +449,45 @@ "%3" msgstr "Обработка " -#: directorymergewindow.cpp:1738 directorymergewindow.cpp:1742 +#: directorymergewindow.cpp:1751 directorymergewindow.cpp:1755 #, kde-format msgid "Some files could not be processed." msgstr "" -#: directorymergewindow.cpp:2222 directorymergewindow.cpp:2247 -#: directorymergewindow.cpp:2271 +#: directorymergewindow.cpp:2235 directorymergewindow.cpp:2260 +#: directorymergewindow.cpp:2285 #, kde-format msgid "This operation is currently not possible." msgstr "Това действие в момента не е възможно." -#: directorymergewindow.cpp:2222 directorymergewindow.cpp:2247 -#: directorymergewindow.cpp:2271 directorymergewindow.cpp:2552 +#: directorymergewindow.cpp:2235 directorymergewindow.cpp:2260 +#: directorymergewindow.cpp:2285 directorymergewindow.cpp:2565 #, kde-format msgid "Operation Not Possible" msgstr "Действието не е възможно" -#: directorymergewindow.cpp:2318 +#: directorymergewindow.cpp:2332 #, fuzzy, kde-format #| msgid "An error occurred while copying.\n" msgid "An error occurred while copying." msgstr "Възникна грешка по време на копирането.\n" -#: directorymergewindow.cpp:2319 directorymergewindow.cpp:2759 +#: directorymergewindow.cpp:2333 directorymergewindow.cpp:2772 #, kde-format msgid "Merge Error" msgstr "Грешка при сливане" -#: directorymergewindow.cpp:2396 +#: directorymergewindow.cpp:2410 #, kde-format msgid "Unknown merge operation. (This must never happen!)" msgstr "Непозната операция за сливане. (Това не трябва да се случва никога!)" -#: directorymergewindow.cpp:2441 +#: directorymergewindow.cpp:2455 #, kde-format msgid "Unknown merge operation." msgstr "Непозната операция за сливане." -#: directorymergewindow.cpp:2454 +#: directorymergewindow.cpp:2468 #, kde-format msgid "" "The merge is about to begin.\n" @@ -507,22 +507,22 @@ "Имайте предвид, че тази програма е все още бета версия и изобщо НЯМА " "ГАРАНЦИЯ! Правете резервни копия на важната информация!" -#: directorymergewindow.cpp:2459 +#: directorymergewindow.cpp:2473 #, kde-format msgid "Starting Merge" msgstr "Стартиране на сливането" -#: directorymergewindow.cpp:2460 +#: directorymergewindow.cpp:2474 #, kde-format msgid "Do It" msgstr "Изпълнение" -#: directorymergewindow.cpp:2461 +#: directorymergewindow.cpp:2475 #, kde-format msgid "Simulate It" msgstr "Симулация" -#: directorymergewindow.cpp:2487 +#: directorymergewindow.cpp:2501 #, kde-format msgid "" "The highlighted item has a different type in the different directories. " @@ -531,7 +531,7 @@ "Осветеният елемент има различни типове в различните директории. Изберете " "какво да се направи." -#: directorymergewindow.cpp:2491 +#: directorymergewindow.cpp:2505 #, kde-format msgid "" "The modification dates of the file are equal but the files are not. Select " @@ -540,7 +540,7 @@ "Датите на последна промяна на файловете са еднакви, но файловете не са. " "Изберете какво да се направи." -#: directorymergewindow.cpp:2495 +#: directorymergewindow.cpp:2509 #, kde-format msgid "" "The highlighted item was changed in one directory and deleted in the other. " @@ -549,7 +549,7 @@ "Осветеният елемент е променен в една директория и е изтрит в друга. Изберете " "какво да се направи." -#: directorymergewindow.cpp:2552 +#: directorymergewindow.cpp:2565 #, kde-format msgid "" "This operation is currently not possible because directory merge is " @@ -558,7 +558,7 @@ "В момента действието е невъзможно, тъй като тече процес на сливане на " "директории." -#: directorymergewindow.cpp:2609 +#: directorymergewindow.cpp:2622 #, kde-format msgid "" "There was an error in the last step.\n" @@ -569,32 +569,32 @@ "Искате ли да продължите с елемента, който е причинил тази грешка или ще го " "прескочите?" -#: directorymergewindow.cpp:2611 +#: directorymergewindow.cpp:2624 #, kde-format msgid "Continue merge after an error" msgstr "Продължаване на сливането след грешката" -#: directorymergewindow.cpp:2612 +#: directorymergewindow.cpp:2625 #, kde-format msgid "Continue With Last Item" msgstr "Продължаване с последния елемент" -#: directorymergewindow.cpp:2613 +#: directorymergewindow.cpp:2626 #, kde-format msgid "Skip Item" msgstr "Прескачане на елемент" -#: directorymergewindow.cpp:2709 +#: directorymergewindow.cpp:2722 #, kde-format msgid "Merge operation complete." msgstr "Операцията по сливане завърши." -#: directorymergewindow.cpp:2709 directorymergewindow.cpp:2712 +#: directorymergewindow.cpp:2722 directorymergewindow.cpp:2725 #, kde-format msgid "Merge Complete" msgstr "Сливането завърши" -#: directorymergewindow.cpp:2722 +#: directorymergewindow.cpp:2735 #, kde-format msgid "" "Simulated merge complete: Check if you agree with the proposed operations." @@ -602,53 +602,53 @@ "Симулацията на сливане завърши: Проверете дали сте съгласни с предложените " "действия." -#: directorymergewindow.cpp:2758 +#: directorymergewindow.cpp:2771 #, fuzzy, kde-format #| msgid "An error occurred. Press OK to see detailed information.\n" msgid "An error occurred. Press OK to see detailed information." msgstr "" "Възникнала е грешка. Натиснете \"ОК\", за да видите подробна информация.\n" -#: directorymergewindow.cpp:2791 +#: directorymergewindow.cpp:2804 #, kde-format msgid "Error: While deleting %1: Creating backup failed." msgstr "" "Грешка: По време на изтриването на %1: Създаването на резервно копие беше " "неуспешно." -#: directorymergewindow.cpp:2798 +#: directorymergewindow.cpp:2811 #, kde-format msgid "delete directory recursively( %1 )" msgstr "рекурсивно изтриване на директория( %1 )" -#: directorymergewindow.cpp:2800 +#: directorymergewindow.cpp:2813 #, kde-format msgid "delete( %1 )" msgstr "изтриване( %1 )" -#: directorymergewindow.cpp:2815 +#: directorymergewindow.cpp:2828 #, kde-format msgid "Error: delete dir operation failed while trying to read the directory." msgstr "" "Грешка: операцията по изтриване беше неуспешна при опит за четене на " "директорията." -#: directorymergewindow.cpp:2834 +#: directorymergewindow.cpp:2847 #, kde-format msgid "Error: rmdir( %1 ) operation failed." msgstr "Грешка: операцията по изтриване на директория( %1 ) беше неуспешна." -#: directorymergewindow.cpp:2844 +#: directorymergewindow.cpp:2857 #, kde-format msgid "Error: delete operation failed." msgstr "Грешка: операцията по изтриване беше неуспешна." -#: directorymergewindow.cpp:2870 +#: directorymergewindow.cpp:2884 #, kde-format msgid "manual merge( %1, %2, %3 -> %4)" msgstr "ръчно сливане( %1, %2, %3 -> %4)" -#: directorymergewindow.cpp:2873 +#: directorymergewindow.cpp:2887 #, kde-format msgid "" " Note: After a manual merge the user should continue by pressing F7." @@ -656,187 +656,187 @@ " Забележка: След ръчно сливане, потребителят трябва да натисне клавиш " "F7, за да продължи." -#: directorymergewindow.cpp:2900 +#: directorymergewindow.cpp:2914 #, kde-format msgid "Error: copy( %1 -> %2 ) failed.Deleting existing destination failed." msgstr "" "Грешка: копирането на ( %1 -> %2 ) беше неуспешно. Изтриването на " "съществуващото местоназначение е неуспешно." -#: directorymergewindow.cpp:2909 +#: directorymergewindow.cpp:2923 #, kde-format msgid "copyLink( %1 -> %2 )" msgstr "копиране на препратка( %1 -> %2 )" -#: directorymergewindow.cpp:2918 +#: directorymergewindow.cpp:2932 #, kde-format msgid "Error: copyLink failed: Remote links are not yet supported." msgstr "" "Грешка: копирането на препратка беше неуспешно: Отдалечени препратки не се " "поддържат." -#: directorymergewindow.cpp:2928 +#: directorymergewindow.cpp:2942 #, kde-format msgid "Error: copyLink failed." msgstr "Грешка: копирането на препратка беше неуспешно." -#: directorymergewindow.cpp:2953 +#: directorymergewindow.cpp:2967 #, kde-format msgid "copy( %1 -> %2 )" msgstr "копиране( %1 -> %2 )" -#: directorymergewindow.cpp:2979 +#: directorymergewindow.cpp:2993 #, kde-format msgid "Error during rename( %1 -> %2 ): Cannot delete existing destination." msgstr "" "Грешка по време на преименуване( %1 -> %2 ): Изтриването на съществуващото " "местоназначение беше неуспешно." -#: directorymergewindow.cpp:2986 +#: directorymergewindow.cpp:3000 #, kde-format msgid "rename( %1 -> %2 )" msgstr "преименуване( %1 -> %2 )" -#: directorymergewindow.cpp:2995 +#: directorymergewindow.cpp:3009 #, kde-format msgid "Error: Rename failed." msgstr "Грешка: Преименуването беше неуспешно." -#: directorymergewindow.cpp:3013 +#: directorymergewindow.cpp:3027 #, kde-format msgid "Error during makeDir of %1. Cannot delete existing file." msgstr "" "Грешка по време на създаване на директория %1. Не може да се изтрие " "съществуващ файл." -#: directorymergewindow.cpp:3030 +#: directorymergewindow.cpp:3044 #, kde-format msgid "makeDir( %1 )" msgstr "създаване на директория( %1 )" -#: directorymergewindow.cpp:3040 +#: directorymergewindow.cpp:3054 #, kde-format msgid "Error while creating directory." msgstr "Грешка по време на създаване на директория." -#: directorymergewindow.cpp:3076 directorymergewindow.cpp:3195 +#: directorymergewindow.cpp:3090 directorymergewindow.cpp:3209 #, kde-format msgid "Dest" msgstr "Местоназначение" -#: directorymergewindow.cpp:3084 directorymergewindow.cpp:3113 +#: directorymergewindow.cpp:3098 directorymergewindow.cpp:3127 #, kde-format msgid "Dir" msgstr "Директория" -#: directorymergewindow.cpp:3084 +#: directorymergewindow.cpp:3098 #, kde-format msgid "Type" msgstr "Вид" -#: directorymergewindow.cpp:3084 +#: directorymergewindow.cpp:3098 #, kde-format msgid "Size" msgstr "Размер" -#: directorymergewindow.cpp:3085 +#: directorymergewindow.cpp:3099 #, kde-format msgid "Attr" msgstr "Атрибути" -#: directorymergewindow.cpp:3085 +#: directorymergewindow.cpp:3099 #, kde-format msgid "Last Modification" msgstr "Последна промяна" -#: directorymergewindow.cpp:3085 +#: directorymergewindow.cpp:3099 #, kde-format msgid "Link-Destination" msgstr "Местоназначение на препратката" -#: directorymergewindow.cpp:3113 +#: directorymergewindow.cpp:3127 #, kde-format msgid "File" msgstr "Файл" -#: directorymergewindow.cpp:3113 +#: directorymergewindow.cpp:3127 #, fuzzy, kde-format #| msgid "Link: " msgid "-Link" msgstr "Препратка: " -#: directorymergewindow.cpp:3119 +#: directorymergewindow.cpp:3133 #, kde-format msgid "not available" msgstr "не е наличен" -#: directorymergewindow.cpp:3137 +#: directorymergewindow.cpp:3151 #, kde-format msgid "A (Dest): " msgstr "А (местоназначение): " -#: directorymergewindow.cpp:3141 +#: directorymergewindow.cpp:3155 #, kde-format msgid "A: " msgstr "" -#: directorymergewindow.cpp:3141 +#: directorymergewindow.cpp:3155 #, kde-format msgid "A (Base): " msgstr "А (основно): " -#: directorymergewindow.cpp:3147 +#: directorymergewindow.cpp:3161 #, kde-format msgid "B (Dest): " msgstr "Б (местоназначение): " -#: directorymergewindow.cpp:3151 +#: directorymergewindow.cpp:3165 #, kde-format msgid "B: " msgstr "" -#: directorymergewindow.cpp:3156 +#: directorymergewindow.cpp:3170 #, kde-format msgid "C (Dest): " msgstr "В (местоназначение): " -#: directorymergewindow.cpp:3160 +#: directorymergewindow.cpp:3174 #, kde-format msgid "C: " msgstr "" -#: directorymergewindow.cpp:3163 +#: directorymergewindow.cpp:3177 #, kde-format msgid "Dest: " msgstr "Местоназначение: " #. i18n("Saving Directory Merge State ...")); -#: directorymergewindow.cpp:3238 +#: directorymergewindow.cpp:3252 #, kde-format msgid "Save Directory Merge State As..." msgstr "Запис състоянието при сливане като..." -#: directorymergewindow.cpp:3387 +#: directorymergewindow.cpp:3401 #, kde-format msgid "Start/Continue Directory Merge" msgstr "Стартиране/Продължение на сливането на директория" -#: directorymergewindow.cpp:3388 +#: directorymergewindow.cpp:3402 #, kde-format msgid "Run Operation for Current Item" msgstr "Стартиране на операцията за текущия елемент" -#: directorymergewindow.cpp:3389 +#: directorymergewindow.cpp:3403 #, kde-format msgid "Compare Selected File" msgstr "Сравняване на маркираните файлове" -#: directorymergewindow.cpp:3390 +#: directorymergewindow.cpp:3404 #, kde-format msgid "Merge Current File" msgstr "Сливане на текущия файл" -#: directorymergewindow.cpp:3390 +#: directorymergewindow.cpp:3404 #, kde-format msgid "" "Merge\n" @@ -845,51 +845,51 @@ "Сливане\n" "на файл" -#: directorymergewindow.cpp:3391 +#: directorymergewindow.cpp:3405 #, kde-format msgid "Fold All Subdirs" msgstr "Скриване на всички поддиректории" -#: directorymergewindow.cpp:3392 +#: directorymergewindow.cpp:3406 #, kde-format msgid "Unfold All Subdirs" msgstr "Показване на всички поддиректории" #. i18n("Save Directory Merge State ..."), 0, this, &DirectoryMergeWindow::slotSaveMergeState, ac, "dir_save_merge_state"); #. i18n("Load Directory Merge State ..."), 0, this, &DirectoryMergeWindow::slotLoadMergeState, ac, "dir_load_merge_state"); -#: directorymergewindow.cpp:3396 +#: directorymergewindow.cpp:3410 #, kde-format msgid "Choose A for All Items" msgstr "Изберете А за всички елементи" -#: directorymergewindow.cpp:3397 +#: directorymergewindow.cpp:3411 #, kde-format msgid "Choose B for All Items" msgstr "Изберете Б за всички елементи" -#: directorymergewindow.cpp:3398 +#: directorymergewindow.cpp:3412 #, kde-format msgid "Choose C for All Items" msgstr "Изберете В за всички елементи" -#: directorymergewindow.cpp:3399 +#: directorymergewindow.cpp:3413 #, kde-format msgid "Auto-Choose Operation for All Items" msgstr "Автоматично избиране на операция за всички елементи" -#: directorymergewindow.cpp:3400 +#: directorymergewindow.cpp:3414 #, kde-format msgid "No Operation for All Items" msgstr "Без операция за всички елементи" #. i18n("Synchronize Directories"), 0, this, &DirectoryMergeWindow::slotSynchronizeDirectories, ac, "dir_synchronize_directories"); #. d->m_pDirChooseNewerFiles = GuiUtils::createAction< KToggleAction >(i18n("Copy Newer Files Instead of Merging"), 0, this, &DirectoryMergeWindow::slotChooseNewerFiles, ac, "dir_choose_newer_files"); -#: directorymergewindow.cpp:3405 +#: directorymergewindow.cpp:3419 #, kde-format msgid "Show Identical Files" msgstr "Показване на идентични файлове" -#: directorymergewindow.cpp:3405 +#: directorymergewindow.cpp:3419 #, kde-format msgid "" "Identical\n" @@ -898,17 +898,17 @@ "Идентични\n" "файлове" -#: directorymergewindow.cpp:3406 +#: directorymergewindow.cpp:3420 #, kde-format msgid "Show Different Files" msgstr "Показване на различните файлове" -#: directorymergewindow.cpp:3407 +#: directorymergewindow.cpp:3421 #, kde-format msgid "Show Files only in A" msgstr "Показване на файлове само в A" -#: directorymergewindow.cpp:3407 +#: directorymergewindow.cpp:3421 #, kde-format msgid "" "Files\n" @@ -917,12 +917,12 @@ "Файлове\n" "само в A" -#: directorymergewindow.cpp:3408 +#: directorymergewindow.cpp:3422 #, kde-format msgid "Show Files only in B" msgstr "Показване на файлове само в B" -#: directorymergewindow.cpp:3408 +#: directorymergewindow.cpp:3422 #, kde-format msgid "" "Files\n" @@ -931,12 +931,12 @@ "Файлове\n" "само в B" -#: directorymergewindow.cpp:3409 +#: directorymergewindow.cpp:3423 #, kde-format msgid "Show Files only in C" msgstr "Показване на файлове само в C" -#: directorymergewindow.cpp:3409 +#: directorymergewindow.cpp:3423 #, kde-format msgid "" "Files\n" @@ -945,55 +945,60 @@ "Файлове\n" "само в C" -#: directorymergewindow.cpp:3413 +#: directorymergewindow.cpp:3427 #, kde-format msgid "Compare Explicitly Selected Files" msgstr "Сравняване на маркираните файлове" -#: directorymergewindow.cpp:3414 +#: directorymergewindow.cpp:3428 #, kde-format msgid "Merge Explicitly Selected Files" msgstr "Сливане на маркираните файлове" -#: directorymergewindow.cpp:3416 directorymergewindow.cpp:3423 +#: directorymergewindow.cpp:3430 directorymergewindow.cpp:3437 #, kde-format msgid "Do Nothing" msgstr "Да не се прави нищо" -#: directorymergewindow.cpp:3428 +#: directorymergewindow.cpp:3442 #, kde-format msgid "Delete A && B" msgstr "Изтриване на А и Б" -#: directorymergewindow.cpp:3431 +#: directorymergewindow.cpp:3445 #, kde-format msgid "Merge to A && B" msgstr "Сливане в А и Б" -#: fileaccess.cpp:462 SourceData.cpp:493 +#: fileaccess.cpp:301 +#, kde-format +msgid "Unable to determine full url. No parent specified." +msgstr "" + +#: fileaccess.cpp:482 SourceData.cpp:506 #, fuzzy, kde-format #| msgid "Reading file: %1" msgid "Failed to read file: %1" msgstr "Чете на файл: %1" -#: fileaccess.cpp:587 +#: fileaccess.cpp:624 #, kde-format msgid "Creating temp copy of %1 failed." msgstr "Създаването на временно копие на %1 беше неуспешно." -#: fileaccess.cpp:595 fileaccess.cpp:600 +#: fileaccess.cpp:632 fileaccess.cpp:637 #, fuzzy, kde-format #| msgid "Opening %1 failed." msgid "Opening %1 failed. %2" msgstr "Отварянето на %1 беше неуспешно." -#: fileaccess.cpp:619 fileaccess.cpp:627 +#: fileaccess.cpp:656 fileaccess.cpp:664 #, fuzzy, kde-format #| msgid "Error reading from %1" msgid "Error reading from %1. %2" msgstr "Грешка по време на четене от %1" -#: fileaccess.cpp:751 +#: fileaccess.cpp:788 #, fuzzy, kde-format #| msgid "" #| "While trying to make a backup, deleting an older backup failed. \n" @@ -1006,7 +1011,7 @@ "беше неуспешно.\n" "Име на файл: " -#: fileaccess.cpp:758 +#: fileaccess.cpp:795 #, fuzzy, kde-format #| msgid "" #| "While trying to make a backup, renaming failed. \n" @@ -1019,179 +1024,179 @@ "неуспешно.\n" "Имена на файлове: " -#: fileaccess.cpp:828 +#: fileaccess.cpp:865 #, kde-format msgid "Getting file status: %1" msgstr "Вземане статуса на файл: %1" -#: fileaccess.cpp:869 +#: fileaccess.cpp:906 #, kde-format msgid "Reading file: %1" msgstr "Чете на файл: %1" -#: fileaccess.cpp:907 +#: fileaccess.cpp:944 #, kde-format msgid "Writing file: %1" msgstr "Запис на файл: %1" -#: fileaccess.cpp:940 +#: fileaccess.cpp:977 #, kde-format msgid "Out of memory" msgstr "Няма памет" -#: fileaccess.cpp:976 +#: fileaccess.cpp:1013 #, kde-format msgid "Making directory: %1" msgstr "Създаване на директория: %1" -#: fileaccess.cpp:997 +#: fileaccess.cpp:1034 #, kde-format msgid "Removing directory: %1" msgstr "Премахване на директория: %1" -#: fileaccess.cpp:1012 +#: fileaccess.cpp:1049 #, kde-format msgid "Removing file: %1" msgstr "Премахване на файл: %1" -#: fileaccess.cpp:1028 +#: fileaccess.cpp:1065 #, kde-format msgid "Creating symbolic link: %1 -> %2" msgstr "Създаване на връзка към символи: %1 -> %2" -#: fileaccess.cpp:1052 +#: fileaccess.cpp:1089 #, kde-format msgid "Renaming file: %1 -> %2" msgstr "Преименуване на файл: %1 -> %2" -#: fileaccess.cpp:1086 +#: fileaccess.cpp:1123 #, kde-format msgid "Copying file: %1 -> %2" msgstr "Копиране на файл: %1 -> %2" -#: fileaccess.cpp:1108 +#: fileaccess.cpp:1145 #, fuzzy, kde-format #| msgid "Reading directory: " msgid "Reading directory: %1" msgstr "Четене на директория: " -#: fileaccess.cpp:1162 +#: fileaccess.cpp:1202 #, kde-format msgid "Listing directory: %1" msgstr "Списък на директория: %1" -#: kdiff3.cpp:181 +#: kdiff3.cpp:182 #, kde-format msgid "Current Configuration:" msgstr "Текуща конфигурация:" -#: kdiff3.cpp:186 +#: kdiff3.cpp:187 #, kde-format msgid "Config Option Error:" msgstr "Грешка на опция за конфигурация:" -#: kdiff3.cpp:240 +#: kdiff3.cpp:246 #, kde-format msgid "Option --auto used, but no output file specified." msgstr "Използвана е настройка --auto, но не е указан изходен файл." -#: kdiff3.cpp:416 +#: kdiff3.cpp:405 #, kde-format msgid "Option --auto ignored for directory comparison." msgstr "Игнорирана е настройка --auto за сравняване на директории." -#: kdiff3.cpp:460 +#: kdiff3.cpp:449 #, kde-format msgid "Saving failed." msgstr "Записът беше неуспешен." -#: kdiff3.cpp:496 pdiff.cpp:1098 +#: kdiff3.cpp:494 pdiff.cpp:1096 #, kde-format msgid "Opening of these files failed:" msgstr "Отварянето на тези файлове беше неуспешно:" -#: kdiff3.cpp:505 +#: kdiff3.cpp:503 pdiff.cpp:1105 #, kde-format -msgid "File Open Error" +msgid "File open error" msgstr "Грешка при отваряне на файл" -#: kdiff3.cpp:533 +#: kdiff3.cpp:532 #, kde-format msgid "Opens documents for comparison..." msgstr "Отваря документ за сравняване..." -#: kdiff3.cpp:535 +#: kdiff3.cpp:534 #, kde-format msgid "Reload" msgstr "Презареждане" -#: kdiff3.cpp:538 +#: kdiff3.cpp:537 #, kde-format msgid "Saves the merge result. All conflicts must be solved!" msgstr "" "Запис на резултатът от сливането. Всички конфликти трябва да са решени!" -#: kdiff3.cpp:540 +#: kdiff3.cpp:539 #, kde-format msgid "Saves the current document as..." msgstr "Запис на текущият документ като..." -#: kdiff3.cpp:543 +#: kdiff3.cpp:542 #, kde-format msgid "Print the differences" msgstr "Отпечатване на разликите" -#: kdiff3.cpp:546 +#: kdiff3.cpp:545 #, kde-format msgid "Quits the application" msgstr "Излиза от програмата" -#: kdiff3.cpp:549 +#: kdiff3.cpp:548 #, kde-format msgid "Cuts the selected section and puts it to the clipboard" msgstr "Изрязва избраната област и я слага в системния буфер" -#: kdiff3.cpp:552 +#: kdiff3.cpp:551 #, kde-format msgid "Copies the selected section to the clipboard" msgstr "Копира избраната област в системния буфер" -#: kdiff3.cpp:554 +#: kdiff3.cpp:553 #, kde-format msgid "Pastes the clipboard contents to current position" msgstr "Поставяне съдържанието на системния буфер на посоченото място" -#: kdiff3.cpp:557 +#: kdiff3.cpp:556 #, kde-format msgid "Select everything in current window" msgstr "Избиране на всичко в текущия прозорец" -#: kdiff3.cpp:560 +#: kdiff3.cpp:559 #, kde-format msgid "Search for a string" msgstr "Търсене на низ" -#: kdiff3.cpp:562 +#: kdiff3.cpp:561 #, kde-format msgid "Search again for the string" msgstr "Повторно търсене на низа" -#: kdiff3.cpp:567 +#: kdiff3.cpp:566 #, kde-format msgid "Enables/disables the statusbar" msgstr "Включва/Изключва лентата за състоянието" -#: kdiff3.cpp:571 +#: kdiff3.cpp:570 #, kde-format msgid "Configure KDiff3..." msgstr "Настройване на KDiff3..." -#: kdiff3.cpp:590 +#: kdiff3.cpp:589 #, kde-format msgid "Go to Current Delta" msgstr "Отиване на текущата разлика" -#: kdiff3.cpp:590 +#: kdiff3.cpp:589 #, kde-format msgid "" "Current\n" @@ -1200,12 +1205,12 @@ "Текуща\n" "разлика" -#: kdiff3.cpp:592 +#: kdiff3.cpp:591 #, kde-format msgid "Go to First Delta" msgstr "Отиване на първата разлика" -#: kdiff3.cpp:592 +#: kdiff3.cpp:591 #, kde-format msgid "" "First\n" @@ -1214,12 +1219,12 @@ "Първа\n" "разлика" -#: kdiff3.cpp:594 +#: kdiff3.cpp:593 #, kde-format msgid "Go to Last Delta" msgstr "Отиване на последната разлика" -#: kdiff3.cpp:594 +#: kdiff3.cpp:593 #, kde-format msgid "" "Last\n" @@ -1228,14 +1233,14 @@ "Последна\n" "разлика" -#: kdiff3.cpp:596 +#: kdiff3.cpp:595 #, kde-format msgid "(Skips white space differences when \"Show White Space\" is disabled.)" msgstr "" "(Прескача разликата в интервалите, когато настройката \"Показване на " "интервалите\" е изключена.)" -#: kdiff3.cpp:597 +#: kdiff3.cpp:596 #, kde-format msgid "" "(Does not skip white space differences even when \"Show White Space\" is " @@ -1244,12 +1249,12 @@ "(Прескача разликата в интервалите, дори когато настройката \"Показване на " "интервалите\" е изключена.)" -#: kdiff3.cpp:598 +#: kdiff3.cpp:597 #, kde-format msgid "Go to Previous Delta" msgstr "Отиване на предишната разлика" -#: kdiff3.cpp:598 +#: kdiff3.cpp:597 #, kde-format msgid "" "Prev\n" @@ -1258,12 +1263,12 @@ "Предишна\n" "разлика" -#: kdiff3.cpp:600 +#: kdiff3.cpp:599 #, kde-format msgid "Go to Next Delta" msgstr "Отиване на следващата разлика" -#: kdiff3.cpp:600 +#: kdiff3.cpp:599 #, kde-format msgid "" "Next\n" @@ -1272,12 +1277,12 @@ "Следваща\n" "разлика" -#: kdiff3.cpp:602 +#: kdiff3.cpp:601 #, kde-format msgid "Go to Previous Conflict" msgstr "Отиване на предишния конфликт" -#: kdiff3.cpp:602 +#: kdiff3.cpp:601 #, kde-format msgid "" "Prev\n" @@ -1286,12 +1291,12 @@ "Предишен\n" "конфликт" -#: kdiff3.cpp:604 +#: kdiff3.cpp:603 #, kde-format msgid "Go to Next Conflict" msgstr "Отиване на следващия конфликт" -#: kdiff3.cpp:604 +#: kdiff3.cpp:603 #, kde-format msgid "" "Next\n" @@ -1300,12 +1305,12 @@ "Следващ\n" "конфликт" -#: kdiff3.cpp:606 +#: kdiff3.cpp:605 #, kde-format msgid "Go to Previous Unsolved Conflict" msgstr "Отиване на предишния неразрешен конфликт" -#: kdiff3.cpp:606 +#: kdiff3.cpp:605 #, kde-format msgid "" "Prev\n" @@ -1314,12 +1319,12 @@ "Предишен\n" "неразрешен" -#: kdiff3.cpp:608 +#: kdiff3.cpp:607 #, kde-format msgid "Go to Next Unsolved Conflict" msgstr "Отиване на следващия неразрешен конфликт" -#: kdiff3.cpp:608 +#: kdiff3.cpp:607 #, kde-format msgid "" "Next\n" @@ -1328,12 +1333,12 @@ "Следващ\n" "неразрешен" -#: kdiff3.cpp:610 +#: kdiff3.cpp:609 #, kde-format msgid "Select Line(s) From A" msgstr "Маркирайте ред(ове) от А" -#: kdiff3.cpp:610 +#: kdiff3.cpp:609 #, kde-format msgid "" "Choose\n" @@ -1342,12 +1347,12 @@ "Изберете\n" "А" -#: kdiff3.cpp:611 +#: kdiff3.cpp:610 #, kde-format msgid "Select Line(s) From B" msgstr "Изберете ред(ове) от Б" -#: kdiff3.cpp:611 +#: kdiff3.cpp:610 #, kde-format msgid "" "Choose\n" @@ -1356,12 +1361,12 @@ "Изберете\n" "Б" -#: kdiff3.cpp:612 +#: kdiff3.cpp:611 #, kde-format msgid "Select Line(s) From C" msgstr "Изберете ред(ове) от В" -#: kdiff3.cpp:612 +#: kdiff3.cpp:611 #, kde-format msgid "" "Choose\n" @@ -1370,14 +1375,14 @@ "Изберете\n" "В" -#: kdiff3.cpp:613 +#: kdiff3.cpp:612 #, kde-format msgid "Automatically Go to Next Unsolved Conflict After Source Selection" msgstr "" "Автоматично прехвърляне към следващия нерешен конфликт, след избиране на " "източник" -#: kdiff3.cpp:613 +#: kdiff3.cpp:612 #, kde-format msgid "" "Auto\n" @@ -1386,13 +1391,13 @@ "Автоматично\n" "средващо" -#: kdiff3.cpp:615 +#: kdiff3.cpp:614 #, fuzzy, kde-format #| msgid "Show Space && Tabulator Characters for Differences" msgid "Show Space && Tabulator Characters" msgstr "Показване на символите за интервал и табулация за разлика" -#: kdiff3.cpp:615 +#: kdiff3.cpp:614 #, kde-format msgid "" "White\n" @@ -1401,12 +1406,12 @@ "Празни\n" "символи" -#: kdiff3.cpp:616 +#: kdiff3.cpp:615 #, kde-format msgid "Show White Space" msgstr "Показване на интервалите" -#: kdiff3.cpp:616 +#: kdiff3.cpp:615 #, kde-format msgid "" "White\n" @@ -1415,12 +1420,12 @@ "Разлики в\n" "интервалите" -#: kdiff3.cpp:618 +#: kdiff3.cpp:617 #, kde-format msgid "Show Line Numbers" msgstr "Показване на номера на редове" -#: kdiff3.cpp:618 +#: kdiff3.cpp:617 #, kde-format msgid "" "Line\n" @@ -1429,133 +1434,133 @@ "Номера на\n" "редовете" -#: kdiff3.cpp:620 +#: kdiff3.cpp:619 #, kde-format msgid "Automatically Solve Simple Conflicts" msgstr "Автоматично разрешаване на простите конфликти" -#: kdiff3.cpp:621 +#: kdiff3.cpp:620 #, kde-format msgid "Set Deltas to Conflicts" msgstr "Задаване на действията за конфликти" -#: kdiff3.cpp:622 +#: kdiff3.cpp:621 #, kde-format msgid "Run Regular Expression Auto Merge" msgstr "Изпълнение на автосливане на регулярни изрази" -#: kdiff3.cpp:623 +#: kdiff3.cpp:622 #, kde-format msgid "Automatically Solve History Conflicts" msgstr "Автоматично разрешаване на конфликтите в историята" -#: kdiff3.cpp:624 +#: kdiff3.cpp:623 #, kde-format msgid "Split Diff At Selection" msgstr "Разделяне на разликата при избраното" -#: kdiff3.cpp:625 +#: kdiff3.cpp:624 #, kde-format msgid "Join Selected Diffs" msgstr "Сливане на избраните разлики" -#: kdiff3.cpp:627 +#: kdiff3.cpp:626 #, kde-format msgid "Show Window A" msgstr "Показване на прозорец А" -#: kdiff3.cpp:628 +#: kdiff3.cpp:627 #, kde-format msgid "Show Window B" msgstr "Показване на прозорец Б" -#: kdiff3.cpp:629 +#: kdiff3.cpp:628 #, kde-format msgid "Show Window C" msgstr "Показване на прозорец В" -#: kdiff3.cpp:631 +#: kdiff3.cpp:630 #, kde-format msgid "Normal Overview" msgstr "Нормален изглед" -#: kdiff3.cpp:632 +#: kdiff3.cpp:631 #, kde-format msgid "A vs. B Overview" msgstr "Изглед на А срещу Б" -#: kdiff3.cpp:633 +#: kdiff3.cpp:632 #, kde-format msgid "A vs. C Overview" msgstr "Изглед на А срещу В" -#: kdiff3.cpp:634 +#: kdiff3.cpp:633 #, kde-format msgid "B vs. C Overview" msgstr "Изглед на Б срещу В" -#: kdiff3.cpp:635 +#: kdiff3.cpp:634 #, kde-format msgid "Word Wrap Diff Windows" msgstr "Пренасяне на думите за различните прозорци" -#: kdiff3.cpp:636 +#: kdiff3.cpp:635 #, kde-format msgid "Add Manual Diff Alignment" msgstr "Добавяне на ръчно подравняване на разликите" -#: kdiff3.cpp:637 +#: kdiff3.cpp:636 #, kde-format msgid "Clear All Manual Diff Alignments" msgstr "Изчистване на на ръчно подравняване на разликите" -#: kdiff3.cpp:639 +#: kdiff3.cpp:638 #, kde-format msgid "Focus Next Window" msgstr "Фокусиране на следващия прозорец" -#: kdiff3.cpp:640 +#: kdiff3.cpp:639 #, kde-format msgid "Focus Prev Window" msgstr "Фокусиране върху предишния прозорец" -#: kdiff3.cpp:641 +#: kdiff3.cpp:640 #, kde-format msgid "Toggle Split Orientation" msgstr "Превключване към разделена подредба" -#: kdiff3.cpp:643 +#: kdiff3.cpp:642 #, kde-format msgid "Dir && Text Split Screen View" msgstr "Разделен изглед на директория и текст" -#: kdiff3.cpp:645 +#: kdiff3.cpp:644 #, kde-format msgid "Toggle Between Dir && Text View" msgstr "Превключване между изглед на директория и текст" -#: kdiff3.cpp:697 pdiff.cpp:1909 +#: kdiff3.cpp:696 pdiff.cpp:1919 #, fuzzy, kde-format #| msgid "The merge result hasn't been saved." msgid "The merge result has not been saved." msgstr "Резултатът от сливането не е записан." -#: kdiff3.cpp:699 +#: kdiff3.cpp:698 #, kde-format msgid "Save && Quit" msgstr "Запис и изход" -#: kdiff3.cpp:700 +#: kdiff3.cpp:699 #, kde-format msgid "Quit Without Saving" msgstr "Изход без запис" -#: kdiff3.cpp:708 pdiff.cpp:1920 +#: kdiff3.cpp:707 pdiff.cpp:1930 #, kde-format msgid "Saving the merge result failed." msgstr "Записът на резултата от сливането беше неуспешен." -#: kdiff3.cpp:719 pdiff.cpp:1032 +#: kdiff3.cpp:718 pdiff.cpp:1030 #, kde-format msgid "" "You are currently doing a directory merge. Are you sure, you want to abort?" @@ -1563,63 +1568,63 @@ "В момента извършвате сливане на директории. Сигурни ли сте, че искате да го " "прекъснете?" -#: kdiff3.cpp:742 +#: kdiff3.cpp:741 #, kde-format msgid "Saving file..." msgstr "Запис на файл..." -#: kdiff3.cpp:759 +#: kdiff3.cpp:758 #, kde-format msgid "Saving file with a new filename..." msgstr "Запис на файл с ново име..." -#: kdiff3.cpp:761 +#: kdiff3.cpp:760 #, kde-format msgid "Save As..." msgstr "Запис като..." -#: kdiff3.cpp:820 +#: kdiff3.cpp:819 #, kde-format msgid "Printing not implemented." msgstr "Отпечатването не е внедрено." -#: kdiff3.cpp:857 +#: kdiff3.cpp:858 #, kde-format msgid "Printing..." msgstr "Отпечатване..." -#: kdiff3.cpp:943 +#: kdiff3.cpp:948 #, kde-format msgid "Printing page %1 of %2" msgstr "" -#: kdiff3.cpp:1000 +#: kdiff3.cpp:1006 #, fuzzy, kde-format #| msgid "Selection" msgid " (Selection)" msgstr "Избрано" -#: kdiff3.cpp:1027 +#: kdiff3.cpp:1034 #, kde-format msgid "Printing completed." msgstr "Отпечатването приключи." -#: kdiff3.cpp:1031 +#: kdiff3.cpp:1038 #, kde-format msgid "Printing aborted." msgstr "Отпечатването е прекъснато." -#: kdiff3.cpp:1038 +#: kdiff3.cpp:1045 #, kde-format msgid "Exiting..." msgstr "Излизане..." -#: kdiff3.cpp:1049 +#: kdiff3.cpp:1056 #, kde-format msgid "Toggling toolbar..." msgstr "Превключване на лентата с инструменти..." -#: kdiff3.cpp:1070 +#: kdiff3.cpp:1077 #, kde-format msgid "Toggle the statusbar..." msgstr "Превключване на лентата за състоянието..." @@ -1645,7 +1650,7 @@ msgid "Joachim Eibl" msgstr "Joachim Eibl" -#: kdiff3_part.cpp:173 kdiff3_part.cpp:254 +#: kdiff3_part.cpp:174 kdiff3_part.cpp:255 #, fuzzy, kde-format #| msgid "Couldn't find files for comparison." msgid "Could not find files for comparison." @@ -1664,7 +1669,7 @@ msgstr "Настройки на KDiff3" #. i18n: ectx: ToolBar (mainToolBar) -#: kdiff3_part.rc:16 main.cpp:88 +#: kdiff3_part.rc:16 main.cpp:89 #, kde-format msgid "KDiff3" msgstr "KDiff3" @@ -1736,87 +1741,93 @@ msgid "Main Toolbar" msgstr "Главна лента с инструменти" -#: main.cpp:68 main.cpp:72 +#: main.cpp:69 main.cpp:73 #, kde-format msgid "Ignored. (User defined.)" msgstr "Пренебрегнато. (Задава се от потребителя.)" -#: main.cpp:92 +#: main.cpp:93 #, kde-format msgid " (64 bit)" msgstr "" -#: main.cpp:94 +#: main.cpp:95 #, kde-format msgid " (32 bit)" msgstr "" -#: main.cpp:95 +#: main.cpp:96 #, kde-format msgid "Tool for Comparison and Merge of Files and Directories" msgstr "Инструмент за сравняване и сливане на файлове и директории" -#: main.cpp:96 +#: main.cpp:97 #, kde-format msgid "(c) 2002-2014 Joachim Eibl, (c) 2017 Michael Reeves KF5/Qt5 port" msgstr "" -#: main.cpp:112 +#: main.cpp:113 #, kde-format msgid "Merge the input." msgstr "Сливане на входа." -#: main.cpp:113 +#: main.cpp:114 #, kde-format msgid "Explicit base file. For compatibility with certain tools." msgstr "Изричен основен файл. За съвместимост с някои инструменти." -#: main.cpp:114 +#: main.cpp:115 #, kde-format msgid "Output file. Implies -m. E.g.: -o newfile.txt" msgstr "Изходен файл. Съдържа -m Например: -o newfile.txt" -#: main.cpp:115 +#: main.cpp:116 #, kde-format msgid "Output file, again. (For compatibility with certain tools.)" msgstr "Отново изходен файл. (За съвместимост с някои инструменти)" -#: main.cpp:116 +#: main.cpp:118 #, kde-format msgid "No GUI if all conflicts are auto-solvable. (Needs -o file)" msgstr "" "Без графичен интерфейс, ако всички конфликти могат да се разрешат " "автоматично. (Нуждае се от -о файл)" -#: main.cpp:117 +#: main.cpp:120 +#, fuzzy, kde-format +#| msgid "Ignore" +msgid "Ignored." +msgstr "Пренебрегване" + +#: main.cpp:122 #, fuzzy, kde-format #| msgid "Don't solve conflicts automatically. (For compatibility...)" msgid "Do not solve conflicts automatically." msgstr "Без автоматично разрешаване на конфликтите. (За съвместимост...)" -#: main.cpp:118 +#: main.cpp:123 #, kde-format msgid "Visible name replacement for input file 1 (base)." msgstr "Видима размяна на имената на файловете за входен файл 1 (основен)." -#: main.cpp:119 +#: main.cpp:124 #, kde-format msgid "Visible name replacement for input file 2." msgstr "Видима размяна на имената на файловете за входен файл 2." -#: main.cpp:120 +#: main.cpp:125 #, kde-format msgid "Visible name replacement for input file 3." msgstr "Видима размяна на имената на файловете за входен файл 3." -#: main.cpp:121 +#: main.cpp:126 #, kde-format msgid "Alternative visible name replacement. Supply this once for every input." msgstr "" "Алтернативна размяна на имената на файловете. Използвайте го веднъж за всеки " "вход." -#: main.cpp:122 +#: main.cpp:127 #, kde-format msgid "" "Override a config setting. Use once for every setting. E.g.: --cs " @@ -1825,87 +1836,87 @@ "Пише върху настройките. Използвайте веднъж за всяка настройка. Например: --" "cs \"AutoAdvance=1\"" -#: main.cpp:123 +#: main.cpp:128 #, kde-format msgid "Show list of config settings and current values." msgstr "Показване на списък с настройки и текущи стойности." -#: main.cpp:124 +#: main.cpp:129 #, kde-format msgid "Use a different config file." msgstr "Използване на различни конфигурационни файлове." -#: main.cpp:127 +#: main.cpp:132 #, kde-format msgid "file1 to open (base, if not specified via --base)" msgstr "да се отвори файл 1 (основен, ако не е указан с --base)" -#: main.cpp:128 +#: main.cpp:133 #, kde-format msgid "file2 to open" msgstr "да се отвори файл 2" -#: main.cpp:129 +#: main.cpp:134 #, kde-format msgid "file3 to open" msgstr "да се отвори файл 3" -#: main.cpp:153 +#: main.cpp:158 #, kde-format msgid "See kdiff3 --help for supported options." msgstr "" -#: mergeresultwindow.cpp:158 +#: mergeresultwindow.cpp:171 #, kde-format msgid "Choose A Everywhere" msgstr "Избиране на А навсякъде" -#: mergeresultwindow.cpp:159 +#: mergeresultwindow.cpp:172 #, kde-format msgid "Choose B Everywhere" msgstr "Избиране на Б навсякъде" -#: mergeresultwindow.cpp:160 +#: mergeresultwindow.cpp:173 #, kde-format msgid "Choose C Everywhere" msgstr "Избиране на В навсякъде" -#: mergeresultwindow.cpp:161 +#: mergeresultwindow.cpp:174 #, kde-format msgid "Choose A for All Unsolved Conflicts" msgstr "Избиране на А за всички нерешени конфликти" -#: mergeresultwindow.cpp:162 +#: mergeresultwindow.cpp:175 #, kde-format msgid "Choose B for All Unsolved Conflicts" msgstr "Избиране на Б за всички нерешени конфликти" -#: mergeresultwindow.cpp:163 +#: mergeresultwindow.cpp:176 #, kde-format msgid "Choose C for All Unsolved Conflicts" msgstr "Избиране на В за всички нерешени конфликти" -#: mergeresultwindow.cpp:164 +#: mergeresultwindow.cpp:177 #, kde-format msgid "Choose A for All Unsolved Whitespace Conflicts" msgstr "Избиране на А за всички нерешени конфликти, свързани с интервали" -#: mergeresultwindow.cpp:165 +#: mergeresultwindow.cpp:178 #, kde-format msgid "Choose B for All Unsolved Whitespace Conflicts" msgstr "Избиране на Б за всички нерешени конфликти, свързани с интервали" -#: mergeresultwindow.cpp:166 +#: mergeresultwindow.cpp:179 #, kde-format msgid "Choose C for All Unsolved Whitespace Conflicts" msgstr "Избиране на В за всички нерешени конфликти, свързани с интервали" -#: mergeresultwindow.cpp:176 +#: mergeresultwindow.cpp:204 #, kde-format msgid "Number of remaining unsolved conflicts: %1 (of which %2 are whitespace)" msgstr "Брой оставащи нерешени конфликти: %1 (от които %2 са интервали)" -#: mergeresultwindow.cpp:370 +#: mergeresultwindow.cpp:398 #, kde-format msgid "" "The output has been modified.\n" @@ -1914,29 +1925,29 @@ "Изходът е променен.\n" "Ако продължите промените ще бъдат загубени." -#: mergeresultwindow.cpp:936 pdiff.cpp:827 +#: mergeresultwindow.cpp:964 pdiff.cpp:817 #, kde-format msgid "All input files are binary equal." msgstr "Всички входни файлове са двоично еднакви." -#: mergeresultwindow.cpp:938 +#: mergeresultwindow.cpp:966 #, kde-format msgid "All input files contain the same text." msgstr "Входните файлове съдържат еднакъв текст." -#: mergeresultwindow.cpp:942 mergeresultwindow.cpp:946 -#: mergeresultwindow.cpp:950 pdiff.cpp:833 pdiff.cpp:837 pdiff.cpp:841 +#: mergeresultwindow.cpp:970 mergeresultwindow.cpp:974 +#: mergeresultwindow.cpp:978 pdiff.cpp:823 pdiff.cpp:827 pdiff.cpp:831 #, kde-format msgid "Files %1 and %2 are binary equal.\n" msgstr "Файлове %1 и %2 са двоично еднакви.\n" -#: mergeresultwindow.cpp:944 mergeresultwindow.cpp:948 -#: mergeresultwindow.cpp:952 +#: mergeresultwindow.cpp:972 mergeresultwindow.cpp:976 +#: mergeresultwindow.cpp:980 #, kde-format msgid "Files %1 and %2 have equal text.\n" msgstr "Файлове %1 и %2 съдържат еднакъв текст. \n" -#: mergeresultwindow.cpp:958 +#: mergeresultwindow.cpp:986 #, kde-format msgid "" "Total number of conflicts: %1\n" @@ -1945,27 +1956,27 @@ "%4" msgstr "" -#: mergeresultwindow.cpp:964 +#: mergeresultwindow.cpp:992 #, kde-format msgid "Conflicts" msgstr "Конфликти" -#: mergeresultwindow.cpp:1873 +#: mergeresultwindow.cpp:1901 #, kde-format msgid "" msgstr "<Няма входен ред>" -#: mergeresultwindow.cpp:1881 +#: mergeresultwindow.cpp:1909 #, kde-format msgid "" msgstr "<Сливане на конфликт (Само интервали)>" -#: mergeresultwindow.cpp:1883 mergeresultwindow.cpp:2755 +#: mergeresultwindow.cpp:1911 mergeresultwindow.cpp:2783 #, kde-format msgid "" msgstr "<Сливане на конфликт>" -#: mergeresultwindow.cpp:2967 +#: mergeresultwindow.cpp:2995 #, fuzzy, kde-format #| msgid "" #| "Not all conflicts are solved yet.\n" @@ -1977,12 +1988,12 @@ "Все още не всички конфликти са решени.\n" "Файлът не е записан.\n" -#: mergeresultwindow.cpp:2969 mergeresultwindow.cpp:2978 +#: mergeresultwindow.cpp:2997 mergeresultwindow.cpp:3006 #, kde-format msgid "Conflicts Left" msgstr "Оставащи конфликти" -#: mergeresultwindow.cpp:2976 +#: mergeresultwindow.cpp:3004 #, fuzzy, kde-format #| msgid "" #| "There is a line end style conflict. Please choose the line end style " @@ -1996,7 +2007,7 @@ "Има конфликт във видовете край на ред. Изберете край на ред ръчно.\n" "Файлът не е запазен.\n" -#: mergeresultwindow.cpp:2990 +#: mergeresultwindow.cpp:3018 #, kde-format msgid "" "\n" @@ -2007,62 +2018,62 @@ "\n" "Създаването на резервно копие беше неуспешно. Файлът не е записан." -#: mergeresultwindow.cpp:2990 mergeresultwindow.cpp:3038 +#: mergeresultwindow.cpp:3018 mergeresultwindow.cpp:3066 #, kde-format msgid "File Save Error" msgstr "Грешка при запис на файл" -#: mergeresultwindow.cpp:3038 +#: mergeresultwindow.cpp:3066 #, kde-format msgid "Error while writing." msgstr "Грешка по време на запис." -#: mergeresultwindow.cpp:3110 +#: mergeresultwindow.cpp:3138 #, fuzzy, kde-format #| msgid "Output" msgid "Output:" msgstr "Резултат" -#: mergeresultwindow.cpp:3123 mergeresultwindow.cpp:3315 +#: mergeresultwindow.cpp:3151 mergeresultwindow.cpp:3343 #, kde-format msgid "[Modified]" msgstr "[Променено]" -#: mergeresultwindow.cpp:3130 +#: mergeresultwindow.cpp:3158 #, fuzzy, kde-format #| msgid "Encoding for saving" msgid "Encoding for saving:" msgstr "Кодова таблица за запис" -#: mergeresultwindow.cpp:3230 +#: mergeresultwindow.cpp:3258 #, kde-format msgid "Conflict" msgstr "Конфликт" -#: mergeresultwindow.cpp:3262 +#: mergeresultwindow.cpp:3290 #, fuzzy, kde-format #| msgid "Codec from" msgid "Codec from A: %1" msgstr "Кодек от" -#: mergeresultwindow.cpp:3264 +#: mergeresultwindow.cpp:3292 #, fuzzy, kde-format #| msgid "Codec from" msgid "Codec from B: %1" msgstr "Кодек от" -#: mergeresultwindow.cpp:3266 +#: mergeresultwindow.cpp:3294 #, fuzzy, kde-format #| msgid "Codec from" msgid "Codec from C: %1" msgstr "Кодек от" -#: optiondialog.cpp:119 +#: optiondialog.cpp:121 #, kde-format msgid "Change Font" msgstr "" -#: optiondialog.cpp:135 optiondialog.cpp:145 +#: optiondialog.cpp:137 optiondialog.cpp:147 #, kde-format msgid "" "Font: %1, %2, %3\n" @@ -2070,125 +2081,125 @@ "Example:" msgstr "" -#: optiondialog.cpp:388 +#: optiondialog.cpp:390 #, kde-format msgid "Unicode" msgstr "Unicode" -#: optiondialog.cpp:389 +#: optiondialog.cpp:391 #, kde-format msgid "Latin1" msgstr "Latin1" -#: optiondialog.cpp:408 +#: optiondialog.cpp:410 #, kde-format msgid "Change this if non-ASCII characters are not displayed correctly." msgstr "Променете това ако не-ASCII символите не се изобразяват правилно." -#: optiondialog.cpp:491 +#: optiondialog.cpp:495 #, kde-format msgid "Configure" msgstr "Настройки" -#: optiondialog.cpp:568 +#: optiondialog.cpp:573 #, kde-format msgid "Font" msgstr "Шрифт" -#: optiondialog.cpp:570 +#: optiondialog.cpp:575 #, kde-format msgid "Editor & Diff Output Font" msgstr "Изходен шрифт за редактора и разделителя" -#: optiondialog.cpp:589 +#: optiondialog.cpp:594 #, kde-format msgid "Application font" msgstr "" -#: optiondialog.cpp:594 +#: optiondialog.cpp:599 #, fuzzy, kde-format #| msgid "File Save Error" msgid "File view font" msgstr "Грешка при запис на файл" -#: optiondialog.cpp:613 +#: optiondialog.cpp:618 #, fuzzy, kde-format #| msgid "Color" msgctxt "Title for color settings page" msgid "Color" msgstr "Цвят" -#: optiondialog.cpp:614 +#: optiondialog.cpp:619 #, kde-format msgid "Colors Settings" msgstr "Цветови настройки" -#: optiondialog.cpp:631 +#: optiondialog.cpp:644 #, kde-format msgid "Editor and Diff Views:" msgstr "Редактор за преглед на разлики:" -#: optiondialog.cpp:639 +#: optiondialog.cpp:652 #, kde-format msgid "Foreground color:" msgstr "Цвят на преден план:" -#: optiondialog.cpp:647 +#: optiondialog.cpp:660 #, kde-format msgid "Background color:" msgstr "Цвят за фон:" -#: optiondialog.cpp:657 +#: optiondialog.cpp:670 #, kde-format msgid "Diff background color:" msgstr "Различен цвят за фон:" -#: optiondialog.cpp:666 +#: optiondialog.cpp:679 #, kde-format msgid "Color A:" msgstr "Цвят А:" -#: optiondialog.cpp:675 +#: optiondialog.cpp:688 #, kde-format msgid "Color B:" msgstr "Цвят Б:" -#: optiondialog.cpp:684 +#: optiondialog.cpp:697 #, kde-format msgid "Color C:" msgstr "Цвят В:" -#: optiondialog.cpp:692 +#: optiondialog.cpp:705 #, kde-format msgid "Conflict color:" msgstr "Цвят за конфликт:" -#: optiondialog.cpp:701 +#: optiondialog.cpp:714 #, kde-format msgid "Current range background color:" msgstr "Текущ обхват за цвета на фон:" -#: optiondialog.cpp:710 +#: optiondialog.cpp:723 #, kde-format msgid "Current range diff background color:" msgstr "Текущ обхват за цвета на фон на разделител:" -#: optiondialog.cpp:718 +#: optiondialog.cpp:731 #, kde-format msgid "Color for manually aligned difference ranges:" msgstr "Цвят на обхват за ръчно избрани разлики:" -#: optiondialog.cpp:725 +#: optiondialog.cpp:738 #, kde-format msgid "Directory Comparison View:" msgstr "Преглед на сравняването на директории:" -#: optiondialog.cpp:731 +#: optiondialog.cpp:744 #, kde-format msgid "Newest file color:" msgstr "Цвят на най-новия файл:" -#: optiondialog.cpp:736 +#: optiondialog.cpp:749 #, kde-format msgid "" "Changing this color will only be effective when starting the next directory " @@ -2197,37 +2208,37 @@ "Промяната на този цвят ще има ефект само при сравняване на следващата " "директория." -#: optiondialog.cpp:741 +#: optiondialog.cpp:754 #, kde-format msgid "Oldest file color:" msgstr "Цвят на най-стария файл:" -#: optiondialog.cpp:750 +#: optiondialog.cpp:763 #, kde-format msgid "Middle age file color:" msgstr "Цвят на средно стар файл:" -#: optiondialog.cpp:759 +#: optiondialog.cpp:772 #, kde-format msgid "Color for missing files:" msgstr "Цвят на липсващи файлове:" -#: optiondialog.cpp:773 +#: optiondialog.cpp:786 #, kde-format msgid "Editor" msgstr "Редактор" -#: optiondialog.cpp:774 +#: optiondialog.cpp:787 #, kde-format msgid "Editor Behavior" msgstr "Поведение на редактора" -#: optiondialog.cpp:787 +#: optiondialog.cpp:809 #, kde-format msgid "Tab inserts spaces" msgstr "Tab вмъква интервали" -#: optiondialog.cpp:791 +#: optiondialog.cpp:813 #, kde-format msgid "" "On: Pressing tab generates the appropriate number of spaces.\n" @@ -2236,27 +2247,27 @@ "Включено: Натискането на табулация изписва подходящ брой интервали.\n" "Изключено: Ще бъде вмъкнат един символ за табулация." -#: optiondialog.cpp:796 +#: optiondialog.cpp:818 #, kde-format msgid "Tab size:" msgstr "Големина на табулация:" -#: optiondialog.cpp:803 +#: optiondialog.cpp:825 #, kde-format msgid "Auto indentation" msgstr "Автоматичен отстъп" -#: optiondialog.cpp:807 +#: optiondialog.cpp:829 #, kde-format msgid "On: The indentation of the previous line is used for a new line.\n" msgstr "Включено: Отстъпа на предишния ред се използва за всеки нов.\n" -#: optiondialog.cpp:810 +#: optiondialog.cpp:832 #, kde-format msgid "Auto copy selection" msgstr "Автоматично копиране на избраното" -#: optiondialog.cpp:814 +#: optiondialog.cpp:836 #, fuzzy, kde-format #| msgid "" #| "On: Any selection is immediately written to the clipboard.\n" @@ -2268,7 +2279,7 @@ "Включено: Всичко избрано се записва веднага в системния буфер.\n" "Изключено: Трябва изрично да копирате, например с Ctrl-C." -#: optiondialog.cpp:829 +#: optiondialog.cpp:851 #, kde-format msgid "" "Sets the line endings for when an edited file is saved.\n" @@ -2277,12 +2288,12 @@ "Задава края на реда, когато редактирания файл бива записан.\n" "DOS/Windows: CR+LF; UNIX: LF; with CR=0D, LF=0A" -#: optiondialog.cpp:839 +#: optiondialog.cpp:861 #, kde-format msgid "Diff" msgstr "Разлика" -#: optiondialog.cpp:840 +#: optiondialog.cpp:862 #, kde-format msgid "Diff Settings" msgstr "Настройки за разлика" @@ -2296,13 +2307,13 @@ #. ); #. ++line; #. -#: optiondialog.cpp:865 +#: optiondialog.cpp:896 #, fuzzy, kde-format #| msgid "Treat as white space." msgid "Ignore numbers (treat as white space)" msgstr "Третиране като интервали." -#: optiondialog.cpp:869 +#: optiondialog.cpp:900 #, kde-format msgid "" "Ignore number characters during line matching phase. (Similar to Ignore " @@ -2313,48 +2324,48 @@ "пренебрегването на интервалите.)\n" "Може да помогне да се сравнят файлове с числова информация." -#: optiondialog.cpp:873 +#: optiondialog.cpp:904 #, fuzzy, kde-format #| msgid "Treat C/C++ comments like white space." msgid "Ignore C/C++ comments (treat as white space)" msgstr "Третиране на С/С++ коментарите като интервали." -#: optiondialog.cpp:876 +#: optiondialog.cpp:907 #, kde-format msgid "Treat C/C++ comments like white space." msgstr "Третиране на С/С++ коментарите като интервали." -#: optiondialog.cpp:879 +#: optiondialog.cpp:910 #, fuzzy, kde-format #| msgid "Treat as white space." msgid "Ignore case (treat as white space)" msgstr "Третиране като интервали." -#: optiondialog.cpp:883 +#: optiondialog.cpp:914 #, kde-format msgid "Treat case differences like white space changes. ('a'<=>'A')" msgstr "" "Третиране на разликата в регистъра като промяна в интервалите. (\"a\"<=>\"A" "\")" -#: optiondialog.cpp:886 +#: optiondialog.cpp:917 #, kde-format msgid "Preprocessor command:" msgstr "Команда за предварителна обработка:" -#: optiondialog.cpp:891 +#: optiondialog.cpp:922 #, kde-format msgid "User defined pre-processing. (See the docs for details.)" msgstr "" "Дефинирана от потребителя предварителна обработка. (Погледнете " "документацията за подробности.)" -#: optiondialog.cpp:894 +#: optiondialog.cpp:925 #, kde-format msgid "Line-matching preprocessor command:" msgstr "Команда за предварителна обработка на съвпадение на редове:" -#: optiondialog.cpp:899 +#: optiondialog.cpp:930 #, kde-format msgid "" "This pre-processor is only used during line matching.\n" @@ -2363,12 +2374,12 @@ "Тази предварителна обработка се използва само при съвпадения на редове.\n" "(Вижте документацията за допълнителна информация.)" -#: optiondialog.cpp:902 +#: optiondialog.cpp:933 #, kde-format msgid "Try hard (slower)" msgstr "Опитване по-усърдно (по-бавно)" -#: optiondialog.cpp:906 +#: optiondialog.cpp:937 #, kde-format msgid "" "Enables the --minimal option for the external diff.\n" @@ -2377,12 +2388,12 @@ "Включва настройка --minimal за външното разделяне.\n" "Анализирането на големи файлове ще е много по-бавно." -#: optiondialog.cpp:910 +#: optiondialog.cpp:941 #, kde-format msgid "Align B and C for 3 input files" msgstr "" -#: optiondialog.cpp:914 +#: optiondialog.cpp:945 #, kde-format msgid "" "Try to align B and C when comparing or merging three input files.\n" @@ -2390,17 +2401,24 @@ "(Default is off.)" msgstr "" -#: optiondialog.cpp:926 +#: optiondialog.cpp:956 +#, fuzzy, kde-format +#| msgid "Merge" +msgctxt "Settings page" +msgid "Merge" +msgstr "Сливане" + +#: optiondialog.cpp:957 #, kde-format msgid "Merge Settings" msgstr "Настройки за сливане" -#: optiondialog.cpp:940 +#: optiondialog.cpp:980 #, kde-format msgid "Auto advance delay (ms):" msgstr "Забавяне на автоматичното придвижване (милисекунди):" -#: optiondialog.cpp:946 +#: optiondialog.cpp:986 #, kde-format msgid "" "When in Auto-Advance mode the result of the current selection is shown \n" @@ -2411,27 +2429,27 @@ "за определен период от време преди да се премине на следващ конфликт. " "Обхват: 0-2000 мсек" -#: optiondialog.cpp:950 +#: optiondialog.cpp:990 #, kde-format msgid "Show info dialogs" msgstr "Показване на уведомления" -#: optiondialog.cpp:953 +#: optiondialog.cpp:993 #, kde-format msgid "Show a dialog with information about the number of conflicts." msgstr "Показване на прозорец с данни за броя на конфликтите." -#: optiondialog.cpp:956 +#: optiondialog.cpp:996 #, kde-format msgid "White space 2-file merge default:" msgstr "Интервал по подразбиране при сливане на 2 файла:" -#: optiondialog.cpp:961 optiondialog.cpp:974 +#: optiondialog.cpp:1001 optiondialog.cpp:1014 #, kde-format msgid "Manual Choice" msgstr "Ръчен избор" -#: optiondialog.cpp:965 optiondialog.cpp:979 +#: optiondialog.cpp:1005 optiondialog.cpp:1019 #, kde-format msgid "" "Allow the merge algorithm to automatically select an input for white-space-" @@ -2440,22 +2458,22 @@ "Позволяване на сливащия алгоритъм автоматично да избира вход за промени от " "типа интервали." -#: optiondialog.cpp:969 +#: optiondialog.cpp:1009 #, kde-format msgid "White space 3-file merge default:" msgstr "Интервал по подразбиране при сливане на 3 файла:" -#: optiondialog.cpp:983 +#: optiondialog.cpp:1023 #, kde-format msgid "Automatic Merge Regular Expression" msgstr "Автоматично сливане на регулярни изрази" -#: optiondialog.cpp:991 smalldialogs.cpp:449 +#: optiondialog.cpp:1031 smalldialogs.cpp:459 #, kde-format msgid "Auto merge regular expression:" msgstr "Автосливане на регулярни изрази:" -#: optiondialog.cpp:996 +#: optiondialog.cpp:1036 #, kde-format msgid "" "Regular expression for lines where KDiff3 should automatically choose one " @@ -2468,12 +2486,12 @@ "Когато някой ред с конфликт съвпадне с регулярния израз,\n" "тогава \"- if available - C\", иначе ще бъде избран B." -#: optiondialog.cpp:1002 +#: optiondialog.cpp:1042 #, kde-format msgid "Run regular expression auto merge on merge start" msgstr "Изпълнение на автосливане на регулярни изрази при начало на сливането" -#: optiondialog.cpp:1005 +#: optiondialog.cpp:1045 #, kde-format msgid "" "Run the merge for auto merge regular expressions\n" @@ -2482,17 +2500,17 @@ "Изпълнение на сливане за автосливане на регулярни изрази\n" "веднага след започване на сливане.\n" -#: optiondialog.cpp:1010 +#: optiondialog.cpp:1050 #, kde-format msgid "Version Control History Merging" msgstr "Сливане историята на версиите" -#: optiondialog.cpp:1018 smalldialogs.cpp:476 +#: optiondialog.cpp:1058 smalldialogs.cpp:486 #, kde-format msgid "History start regular expression:" msgstr "Регулярен израз за начало на история:" -#: optiondialog.cpp:1023 +#: optiondialog.cpp:1063 #, kde-format msgid "" "Regular expression for the start of the version control history entry.\n" @@ -2504,12 +2522,12 @@ "Обикновено това съдържа ключова дума \"$Log$\".\n" "Стойност по подразбиране: \".*\\$Log.*\\$.*\"" -#: optiondialog.cpp:1029 smalldialogs.cpp:504 +#: optiondialog.cpp:1069 smalldialogs.cpp:514 #, kde-format msgid "History entry start regular expression:" msgstr "Регулярен израз за начало на историята:" -#: optiondialog.cpp:1042 +#: optiondialog.cpp:1082 #, kde-format msgid "" "A version control history entry consists of several lines.\n" @@ -2528,22 +2546,22 @@ "Ако е празно, тогава KDiff3 ще счита, че празните редове разделят записите.\n" "За повече подробности вижте документацията." -#: optiondialog.cpp:1050 +#: optiondialog.cpp:1090 #, kde-format msgid "History merge sorting" msgstr "Подреждане сливането на историята" -#: optiondialog.cpp:1053 +#: optiondialog.cpp:1093 #, kde-format msgid "Sort version control history by a key." msgstr "Подреждане на история на версиите по ключ." -#: optiondialog.cpp:1063 +#: optiondialog.cpp:1103 #, kde-format msgid "History entry start sort key order:" msgstr "Ред за сортиране на ключове за история:" -#: optiondialog.cpp:1068 +#: optiondialog.cpp:1108 #, kde-format msgid "" "Each pair of parentheses used in the regular expression for the history " @@ -2562,37 +2580,37 @@ "Ако е празно, няма да се прави подреждане.\n" "За повече информация вижте документацията." -#: optiondialog.cpp:1079 +#: optiondialog.cpp:1119 #, kde-format msgid "Merge version control history on merge start" msgstr "Сливане на историята за версии при стартиране" -#: optiondialog.cpp:1082 +#: optiondialog.cpp:1122 #, kde-format msgid "Run version control history automerge on merge start." msgstr "Автосливане на историята за версии при стартиране." -#: optiondialog.cpp:1086 +#: optiondialog.cpp:1126 #, kde-format msgid "Max number of history entries:" msgstr "Макс. брой записи в историята:" -#: optiondialog.cpp:1090 +#: optiondialog.cpp:1130 #, kde-format msgid "Cut off after specified number. Use -1 for infinite number of entries." msgstr "Отрязване след посочения брой. Използвайте -1 за \"безкрайно\"." -#: optiondialog.cpp:1094 +#: optiondialog.cpp:1134 #, kde-format msgid "Test your regular expressions" msgstr "Изпробване на регулярни изрази" -#: optiondialog.cpp:1099 +#: optiondialog.cpp:1139 #, kde-format msgid "Irrelevant merge command:" msgstr "Неподходяща команда за сливане:" -#: optiondialog.cpp:1104 +#: optiondialog.cpp:1144 #, kde-format msgid "" "If specified this script is run after automerge\n" @@ -2603,12 +2621,12 @@ "при условие ,че не са открити други промени.\n" "Извикани с параметри: има на файл 1има на файл 2 име на файл 3" -#: optiondialog.cpp:1109 +#: optiondialog.cpp:1149 #, kde-format msgid "Auto save and quit on merge without conflicts" msgstr "Автозапис и изход ако сливането е без конфликти" -#: optiondialog.cpp:1113 +#: optiondialog.cpp:1153 #, kde-format msgid "" "If KDiff3 was started for a file-merge from the command line and all\n" @@ -2621,27 +2639,27 @@ "тогава следва автоматичен запис и изход.\n" "(Подобно на командата \"--auto\".)" -#: optiondialog.cpp:1124 optiondialog.cpp:1125 +#: optiondialog.cpp:1164 optiondialog.cpp:1165 #, kde-format msgid "Directory" msgstr "Директория" -#: optiondialog.cpp:1137 +#: optiondialog.cpp:1185 #, kde-format msgid "Recursive directories" msgstr "Рекурсивни директории" -#: optiondialog.cpp:1140 +#: optiondialog.cpp:1188 #, kde-format msgid "Whether to analyze subdirectories or not." msgstr "Дали да се анализират или не поддиректориите." -#: optiondialog.cpp:1142 +#: optiondialog.cpp:1190 #, kde-format msgid "File pattern(s):" msgstr "Шаблон(и) за файл:" -#: optiondialog.cpp:1148 +#: optiondialog.cpp:1196 #, kde-format msgid "" "Pattern(s) of files to be analyzed. \n" @@ -2652,12 +2670,12 @@ "Wildcards: \"*\" and \"?\"\n" "Могат да се определят няколко шаблона чрез използване на разделителя: \";\"" -#: optiondialog.cpp:1153 +#: optiondialog.cpp:1201 #, kde-format msgid "File-anti-pattern(s):" msgstr "Анти шаблон(и) за файл:" -#: optiondialog.cpp:1159 +#: optiondialog.cpp:1207 #, kde-format msgid "" "Pattern(s) of files to be excluded from analysis. \n" @@ -2668,12 +2686,12 @@ "Wildcards: \"*\" and \"?\"\n" "Могат да се определят няколко шаблона чрез използване на разделителя: \";\"" -#: optiondialog.cpp:1164 +#: optiondialog.cpp:1212 #, kde-format msgid "Dir-anti-pattern(s):" msgstr "Анти шаблон(и) за директория:" -#: optiondialog.cpp:1170 +#: optiondialog.cpp:1218 #, kde-format msgid "" "Pattern(s) of directories to be excluded from analysis. \n" @@ -2684,12 +2702,12 @@ "Wildcards: \"*\" and \"?\"\n" "Могат да се определят няколко шаблона чрез използване на разделителя: \";\"" -#: optiondialog.cpp:1175 +#: optiondialog.cpp:1223 #, kde-format msgid "Use .cvsignore" msgstr "Използване на .cvsignore" -#: optiondialog.cpp:1179 +#: optiondialog.cpp:1227 #, kde-format msgid "" "Extends the antipattern to anything that would be ignored by CVS.\n" @@ -2699,23 +2717,23 @@ "Чрез локалните файлове \".cvsignore\", това може да се настройва за отделни " "директории." -#: optiondialog.cpp:1183 +#: optiondialog.cpp:1231 #, kde-format msgid "Find hidden files and directories" msgstr "Откриване на скрити файлове и директории" -#: optiondialog.cpp:1186 +#: optiondialog.cpp:1234 #, fuzzy, kde-format #| msgid "Find hidden files and directories" msgid "Finds hidden files and directories." msgstr "Откриване на скрити файлове и директории" -#: optiondialog.cpp:1189 +#: optiondialog.cpp:1237 #, kde-format msgid "Follow file links" msgstr "Проследяване на файловите препратки" -#: optiondialog.cpp:1193 +#: optiondialog.cpp:1241 #, kde-format msgid "" "On: Compare the file the link points to.\n" @@ -2724,12 +2742,12 @@ "Включено: Сравнява файла, към който сочи препратката.\n" "Изключено: Сравнява препратките." -#: optiondialog.cpp:1197 +#: optiondialog.cpp:1245 #, kde-format msgid "Follow directory links" msgstr "Проследяване на препратките към директория" -#: optiondialog.cpp:1201 +#: optiondialog.cpp:1249 #, kde-format msgid "" "On: Compare the directory the link points to.\n" @@ -2738,12 +2756,12 @@ "Включено: Сравнява директорията, към която сочи препратката.\n" "Изключено: Сравнява препратките." -#: optiondialog.cpp:1210 +#: optiondialog.cpp:1258 #, kde-format msgid "Case sensitive filename comparison" msgstr "Сравняване на имена, чувствително към регистър" -#: optiondialog.cpp:1214 +#: optiondialog.cpp:1262 #, kde-format msgid "" "The directory comparison will compare files or directories when their names " @@ -2756,52 +2774,52 @@ "включете тази опция, ако регистъра трябва да съвпада. (По подразбиране за " "Windows е изключено, иначе - включено.)" -#: optiondialog.cpp:1218 +#: optiondialog.cpp:1266 #, fuzzy, kde-format #| msgid "Unfold All Subdirs" msgid "Unfold all subdirectories on load" msgstr "Показване на всички поддиректории" -#: optiondialog.cpp:1222 +#: optiondialog.cpp:1270 #, kde-format msgid "" "On: Unfold all subdirectories when starting a directory diff.\n" "Off: Leave subdirectories folded." msgstr "" -#: optiondialog.cpp:1226 +#: optiondialog.cpp:1274 #, kde-format msgid "Skip directory status report" msgstr "" -#: optiondialog.cpp:1230 +#: optiondialog.cpp:1278 #, kde-format msgid "" "On: Do not show the Directory Comparison Status.\n" "Off: Show the status dialog on start." msgstr "" -#: optiondialog.cpp:1234 +#: optiondialog.cpp:1282 #, kde-format msgid "File Comparison Mode" msgstr "Режим \"сравняване на файлове\"" -#: optiondialog.cpp:1239 +#: optiondialog.cpp:1287 #, kde-format msgid "Binary comparison" msgstr "Двоично сравнение" -#: optiondialog.cpp:1241 +#: optiondialog.cpp:1289 #, kde-format msgid "Binary comparison of each file. (Default)" msgstr "Двоично сравнение за всеки файл. (По подразбиране)" -#: optiondialog.cpp:1244 +#: optiondialog.cpp:1292 #, kde-format msgid "Full analysis" msgstr "Пълен анализ" -#: optiondialog.cpp:1246 +#: optiondialog.cpp:1294 #, kde-format msgid "" "Do a full analysis and show statistics information in extra columns.\n" @@ -2811,12 +2829,12 @@ "колони.\n" "(По-бавно от двоичното сравнение, много по-бавно за двоични файлове.)" -#: optiondialog.cpp:1250 +#: optiondialog.cpp:1298 #, kde-format msgid "Trust the size and modification date (unsafe)" msgstr "Доверяване на размера и датата на промяна (опасно)" -#: optiondialog.cpp:1252 +#: optiondialog.cpp:1300 #, kde-format msgid "" "Assume that files are equal if the modification date and file length are " @@ -2831,7 +2849,7 @@ "отчетени като различни.\n" "Може да се използва за големи директории или бавни мрежи." -#: optiondialog.cpp:1257 +#: optiondialog.cpp:1305 #, kde-format msgid "" "Trust the size and date, but use binary comparison if date does not match " @@ -2840,7 +2858,7 @@ "Доверяване на размера и датата, но използване на двоично сравнение, ако " "датата не съвпада (опасно)" -#: optiondialog.cpp:1259 +#: optiondialog.cpp:1307 #, kde-format msgid "" "Assume that files are equal if the modification date and file length are " @@ -2853,12 +2871,12 @@ "Ако датата не е еднаква, но размирите са, се използва двоично сравнение.\n" "Полезно за големи директории или бавни мрежи." -#: optiondialog.cpp:1264 +#: optiondialog.cpp:1312 #, kde-format msgid "Trust the size (unsafe)" msgstr "Доверяване на големината (опасно)" -#: optiondialog.cpp:1266 +#: optiondialog.cpp:1314 #, kde-format msgid "" "Assume that files are equal if their file lengths are equal.\n" @@ -2869,12 +2887,12 @@ "Полезно за големи директории или бавни мрежи, когато датата се променя по " "време на сваляне." -#: optiondialog.cpp:1273 +#: optiondialog.cpp:1321 #, kde-format msgid "Synchronize directories" msgstr "Синхронизиране на директории" -#: optiondialog.cpp:1277 +#: optiondialog.cpp:1325 #, kde-format msgid "" "Offers to store files in both directories so that\n" @@ -2886,12 +2904,12 @@ "Работи само, когато се сравняват две директории без определено " "местонахождение." -#: optiondialog.cpp:1283 +#: optiondialog.cpp:1331 #, kde-format msgid "White space differences considered equal" msgstr "Разликите в интервалите да се приемат за еднакви" -#: optiondialog.cpp:1287 +#: optiondialog.cpp:1335 #, kde-format msgid "" "If files differ only by white space consider them equal.\n" @@ -2900,12 +2918,12 @@ "Файловете да се считат за еднакви, ако се различават само по интервалите.\n" "Това работи само ако е избран пълен анализ." -#: optiondialog.cpp:1293 +#: optiondialog.cpp:1341 #, kde-format msgid "Copy newer instead of merging (unsafe)" msgstr "Копиране на по-новите, вместо сливане (не е безопасно)" -#: optiondialog.cpp:1297 +#: optiondialog.cpp:1345 #, fuzzy, kde-format #| msgid "" #| "Don't look inside, just take the newer file.\n" @@ -2920,12 +2938,12 @@ "(Използвайте го само ако знаете какво правите!)\n" "Ефективно е, само ако се сравняват две директории." -#: optiondialog.cpp:1302 +#: optiondialog.cpp:1350 #, kde-format msgid "Backup files (.orig)" msgstr "Резервни копия на файлове (.orig)" -#: optiondialog.cpp:1306 +#: optiondialog.cpp:1354 #, kde-format msgid "" "If a file would be saved over an old file, then the old file\n" @@ -2934,17 +2952,17 @@ "Когато файл ще се записва върху стар файл, тогава старият файл\n" "ще бъде преименуван с разширение \".orig\", вместо да бъде изтрит." -#: optiondialog.cpp:1382 optiondialog.cpp:1383 +#: optiondialog.cpp:1430 optiondialog.cpp:1431 #, kde-format msgid "Regional Settings" msgstr "Регионални настройки" -#: optiondialog.cpp:1397 +#: optiondialog.cpp:1454 #, kde-format msgid "Use the same encoding for everything:" msgstr "Използване на еднаква кодова таблица за всичко:" -#: optiondialog.cpp:1401 +#: optiondialog.cpp:1458 #, kde-format msgid "" "Enable this allows to change all encodings by changing the first only.\n" @@ -2954,18 +2972,18 @@ "първата.\n" "Изключете са необходими различни индивидуални настройки." -#: optiondialog.cpp:1405 +#: optiondialog.cpp:1462 #, fuzzy, kde-format #| msgid "Note: Local Encoding is " msgid "Note: Local Encoding is \"%1\"" msgstr "Забележка: Локалната кодова таблица е " -#: optiondialog.cpp:1409 +#: optiondialog.cpp:1466 #, kde-format msgid "File Encoding for A:" msgstr "Файлова кодова таблица за А:" -#: optiondialog.cpp:1416 +#: optiondialog.cpp:1473 #, kde-format msgid "" "If enabled then Unicode (UTF-16 or UTF-8) encoding will be detected.\n" @@ -2978,32 +2996,32 @@ "кодиране.\n" "(Намирането на Уникод зависи от първите байтове във файла.)" -#: optiondialog.cpp:1419 optiondialog.cpp:1430 optiondialog.cpp:1441 +#: optiondialog.cpp:1476 optiondialog.cpp:1487 optiondialog.cpp:1498 #, kde-format msgid "Auto Detect Unicode" msgstr "Автонамиране на Уникод" -#: optiondialog.cpp:1425 +#: optiondialog.cpp:1482 #, kde-format msgid "File Encoding for B:" msgstr "Файлова кодова таблица за Б:" -#: optiondialog.cpp:1436 +#: optiondialog.cpp:1493 #, kde-format msgid "File Encoding for C:" msgstr "Файлова кодова таблица за В:" -#: optiondialog.cpp:1447 +#: optiondialog.cpp:1504 #, kde-format msgid "File Encoding for Merge Output and Saving:" msgstr "Кодова таблица на файла за резултата от сливането и записване:" -#: optiondialog.cpp:1452 +#: optiondialog.cpp:1509 #, kde-format msgid "Auto Select" msgstr "Автоматично избиране" -#: optiondialog.cpp:1456 +#: optiondialog.cpp:1513 #, kde-format msgid "" "If enabled then the encoding from the input files is used.\n" @@ -3015,17 +3033,17 @@ "Когато има нещо неясно, ще се появи прозорец , от където може да избере " "кодиране." -#: optiondialog.cpp:1459 +#: optiondialog.cpp:1516 #, kde-format msgid "File Encoding for Preprocessor Files:" msgstr "Кодова таблица на файл за файлове за предварителна обработка:" -#: optiondialog.cpp:1471 +#: optiondialog.cpp:1528 #, kde-format msgid "Right To Left Language" msgstr "Езици тип \"отдясно на ляво\"" -#: optiondialog.cpp:1475 +#: optiondialog.cpp:1532 #, kde-format msgid "" "Some languages are read from right to left.\n" @@ -3034,22 +3052,22 @@ "Някои езици се четат отдясно наляво.\n" "Тази настройка ще промени съответно редактора и визуализатора." -#: optiondialog.cpp:1485 +#: optiondialog.cpp:1542 #, kde-format msgid "Integration" msgstr "Интеграция" -#: optiondialog.cpp:1486 +#: optiondialog.cpp:1543 #, kde-format msgid "Integration Settings" msgstr "Настройки на интеграцията" -#: optiondialog.cpp:1499 +#: optiondialog.cpp:1564 #, kde-format msgid "Command line options to ignore:" msgstr "Опции за команден ред, които да бъдат игнорирани:" -#: optiondialog.cpp:1505 +#: optiondialog.cpp:1570 #, kde-format msgid "" "List of command line options that should be ignored when KDiff3 is used by " @@ -3062,19 +3080,19 @@ "Могат да бъдат посочени няколко стойности, разделени с \";\" \n" "Това ще потисне съобщението \"Непозната грешка\"." -#: optiondialog.cpp:1510 +#: optiondialog.cpp:1575 #, kde-format msgid "Quit also via Escape key" msgstr "Излизане и с клавиша \"Escape\"" -#: optiondialog.cpp:1514 +#: optiondialog.cpp:1579 #, kde-format msgid "" "Fast method to exit.\n" "For those who are used to using the Escape key." msgstr "" -#: optiondialog.cpp:1598 +#: optiondialog.cpp:1653 #, kde-format msgid "This resets all options. Not only those of the current topic." msgstr "Това ще възстанови всички настройки. Не само тези в текущата тема." @@ -3129,77 +3147,68 @@ msgid "Disable Unsafe Options" msgstr "Изключване на опасните опции" -#: pdiff.cpp:158 +#: pdiff.cpp:160 #, kde-format msgid "Loading A" msgstr "Зареждане на А" -#: pdiff.cpp:167 -#, kde-format -msgid "Errors occurred during pre-processing of file A." -msgstr "" +#: pdiff.cpp:162 +#, fuzzy, kde-format +#| msgid "Loading A" +msgid "Loading A: %1" +msgstr "Зареждане на А" -#: pdiff.cpp:172 +#: pdiff.cpp:170 #, kde-format msgid "Loading B" msgstr "Зареждане на Б" -#: pdiff.cpp:179 -#, kde-format -msgid "Errors occurred during pre-processing of file B." -msgstr "" - -#: pdiff.cpp:202 pdiff.cpp:241 +#: pdiff.cpp:201 pdiff.cpp:237 #, kde-format msgid "Diff: A <-> B" msgstr "Разлика: A <-> Б" -#: pdiff.cpp:208 pdiff.cpp:279 pdiff.cpp:293 +#: pdiff.cpp:207 pdiff.cpp:275 pdiff.cpp:289 #, kde-format msgid "Linediff: A <-> B" msgstr "Разлика на линия: A <-> Б" -#: pdiff.cpp:225 +#: pdiff.cpp:224 #, kde-format msgid "Loading C" msgstr "Зареждане на В" -#: pdiff.cpp:232 -#, kde-format -msgid "Errors occurred during pre-processing of file C." -msgstr "" - -#: pdiff.cpp:250 +#: pdiff.cpp:246 #, kde-format msgid "Diff: A <-> C" msgstr "Разлика: А <-> B" -#: pdiff.cpp:261 +#: pdiff.cpp:257 #, kde-format msgid "Diff: B <-> C" msgstr "Разлика: Б <-> B" -#: pdiff.cpp:283 pdiff.cpp:297 +#: pdiff.cpp:279 pdiff.cpp:293 #, kde-format msgid "Linediff: B <-> C" msgstr "Разлика на ред: Б <-> B" -#: pdiff.cpp:287 pdiff.cpp:301 +#: pdiff.cpp:283 pdiff.cpp:297 #, kde-format msgid "Linediff: A <-> C" msgstr "Разлика на ред: A <-> B" -#: pdiff.cpp:829 +#: pdiff.cpp:819 #, kde-format msgid "All input files contain the same text, but are not binary equal." msgstr "Входните файлове съдържат еднакъв текст, но не са двоично еднакви." -#: pdiff.cpp:835 pdiff.cpp:839 pdiff.cpp:843 +#: pdiff.cpp:825 pdiff.cpp:829 pdiff.cpp:833 #, kde-format msgid "Files %1 and %2 have equal text, but are not binary equal. \n" msgstr "Файлове %1 и %2 са с еднакъв текст, но не са двоично еднакви. \n" -#: pdiff.cpp:853 +#: pdiff.cpp:843 #, fuzzy, kde-format #| msgid "" #| "Some inputfiles don't seem to be pure textfiles.\n" @@ -3215,17 +3224,17 @@ "информация.\n" "Продължавате на собствена отговорност." -#: pdiff.cpp:863 +#: pdiff.cpp:853 #, kde-format msgid ", B" msgstr "" -#: pdiff.cpp:865 +#: pdiff.cpp:855 #, kde-format msgid ", C" msgstr "" -#: pdiff.cpp:867 +#: pdiff.cpp:857 #, kde-format msgid "" "Some input characters could not be converted to valid unicode.\n" @@ -3234,77 +3243,72 @@ "Affected input files are in %1." msgstr "" -#: pdiff.cpp:1034 +#: pdiff.cpp:1032 #, kde-format msgid "Abort" msgstr "Прекъсване" -#: pdiff.cpp:1040 pdiff.cpp:1130 +#: pdiff.cpp:1038 pdiff.cpp:1129 #, kde-format msgid "Opening files..." msgstr "Отваряне на файлове..." -#: pdiff.cpp:1107 -#, kde-format -msgid "File open error" -msgstr "Грешка при отваряне на файл" - -#: pdiff.cpp:1202 +#: pdiff.cpp:1212 #, kde-format msgid "Cutting selection..." msgstr "Изрязване на избраното..." -#: pdiff.cpp:1223 +#: pdiff.cpp:1233 #, kde-format msgid "Copying selection to clipboard..." msgstr "Копиране на избраното в системния буфер..." -#: pdiff.cpp:1239 +#: pdiff.cpp:1249 #, kde-format msgid "Inserting clipboard contents..." msgstr "Вмъкване съдържанието на системния буфер..." -#: pdiff.cpp:1695 +#: pdiff.cpp:1705 #, kde-format msgid "Word wrap (Cancel disables word wrap)" msgstr "" -#: pdiff.cpp:1696 +#: pdiff.cpp:1706 #, kde-format msgid "Calculating max width for horizontal scrollbar" msgstr "" -#: pdiff.cpp:1911 +#: pdiff.cpp:1921 #, kde-format msgid "Save && Continue" msgstr "Запис и продължение" -#: pdiff.cpp:1912 +#: pdiff.cpp:1922 #, kde-format msgid "Continue Without Saving" msgstr "Продължение без запис" -#: pdiff.cpp:2124 +#: pdiff.cpp:2134 #, kde-format msgid "Search complete." msgstr "Търсенето завърши." -#: pdiff.cpp:2124 +#: pdiff.cpp:2134 #, kde-format msgid "Search Complete" msgstr "Търсенето завърши" -#: pdiff.cpp:2375 +#: pdiff.cpp:2385 #, kde-format msgid "Nothing is selected in either diff input window." msgstr "Нищо не е избрано в прозореца за разлики." -#: pdiff.cpp:2375 +#: pdiff.cpp:2385 #, kde-format msgid "Error while adding manual diff range" msgstr "Грешка при ръчно добавяне на охват за разликите" -#: progress.cpp:59 progress.cpp:71 +#: progress.cpp:61 progress.cpp:73 #, kde-format msgid "&Cancel" msgstr "&Отказ" @@ -3314,126 +3318,126 @@ msgid "A (Base):" msgstr "А (основен):" -#: smalldialogs.cpp:68 smalldialogs.cpp:85 smalldialogs.cpp:102 -#: smalldialogs.cpp:144 +#: smalldialogs.cpp:71 smalldialogs.cpp:90 smalldialogs.cpp:109 +#: smalldialogs.cpp:154 #, kde-format msgid "File..." msgstr "Файл..." -#: smalldialogs.cpp:70 smalldialogs.cpp:87 smalldialogs.cpp:104 -#: smalldialogs.cpp:146 +#: smalldialogs.cpp:73 smalldialogs.cpp:92 smalldialogs.cpp:111 +#: smalldialogs.cpp:156 #, kde-format msgid "Dir..." msgstr "Директория..." -#: smalldialogs.cpp:96 +#: smalldialogs.cpp:103 #, kde-format msgid "C (Optional):" msgstr "В (по избор):" -#: smalldialogs.cpp:119 +#: smalldialogs.cpp:126 #, fuzzy, kde-format #| msgid "Swap/Copy Names ..." msgid "Swap/Copy Names..." msgstr "Размяна/Копиране на имена ..." -#: smalldialogs.cpp:124 smalldialogs.cpp:125 smalldialogs.cpp:126 +#: smalldialogs.cpp:131 smalldialogs.cpp:132 smalldialogs.cpp:133 #, kde-format msgid "Swap %1<->%2" msgstr "Размяна: %1<->%2" -#: smalldialogs.cpp:127 smalldialogs.cpp:128 smalldialogs.cpp:129 +#: smalldialogs.cpp:134 smalldialogs.cpp:135 smalldialogs.cpp:136 #, kde-format msgid "Copy %1->Output" msgstr "Копиране: %1-> Изходни данни" -#: smalldialogs.cpp:130 smalldialogs.cpp:131 smalldialogs.cpp:132 +#: smalldialogs.cpp:137 smalldialogs.cpp:138 smalldialogs.cpp:139 #, kde-format msgid "Swap %1<->Output" msgstr "Размяна: %1 <-> Изходни данни" -#: smalldialogs.cpp:138 +#: smalldialogs.cpp:148 #, kde-format msgid "Output (optional):" msgstr "Резултат (по избор):" -#: smalldialogs.cpp:168 +#: smalldialogs.cpp:178 #, kde-format msgid "Configure..." msgstr "Настройване..." -#: smalldialogs.cpp:233 +#: smalldialogs.cpp:243 #, fuzzy, kde-format #| msgid "Directory" msgid "Open Directory" msgstr "Директория" -#: smalldialogs.cpp:234 +#: smalldialogs.cpp:244 #, kde-format msgid "Select Output File" msgstr "" -#: smalldialogs.cpp:393 +#: smalldialogs.cpp:403 #, kde-format msgid "Search text:" msgstr "Търсене на текст:" -#: smalldialogs.cpp:400 +#: smalldialogs.cpp:410 #, kde-format msgid "Case sensitive" msgstr "Чувствителен регистър" -#: smalldialogs.cpp:403 +#: smalldialogs.cpp:413 #, kde-format msgid "Search A" msgstr "Търсене в А" -#: smalldialogs.cpp:408 +#: smalldialogs.cpp:418 #, kde-format msgid "Search B" msgstr "Търсене в Б" -#: smalldialogs.cpp:413 +#: smalldialogs.cpp:423 #, kde-format msgid "Search C" msgstr "Търсене във В" -#: smalldialogs.cpp:418 +#: smalldialogs.cpp:428 #, kde-format msgid "Search output" msgstr "Резултат от търсенето" -#: smalldialogs.cpp:425 +#: smalldialogs.cpp:435 #, kde-format msgid "&Search" msgstr "&Търсене" -#: smalldialogs.cpp:444 +#: smalldialogs.cpp:454 #, kde-format msgid "Regular Expression Tester" msgstr "Изпробване за регулярни изрази" -#: smalldialogs.cpp:457 +#: smalldialogs.cpp:467 #, kde-format msgid "Example auto merge line:" msgstr "Примерен ред за начало на автосливане:" -#: smalldialogs.cpp:459 +#: smalldialogs.cpp:469 #, kde-format msgid "To test auto merge, copy a line as used in your files." msgstr "За изпробване на автосливането копирайте ред от използваните файлове." -#: smalldialogs.cpp:465 smalldialogs.cpp:493 smalldialogs.cpp:529 +#: smalldialogs.cpp:475 smalldialogs.cpp:503 smalldialogs.cpp:539 #, kde-format msgid "Match result:" msgstr "Съвпадащ резултат:" -#: smalldialogs.cpp:484 +#: smalldialogs.cpp:494 #, kde-format msgid "Example history start line (with leading comment):" msgstr "Ред за примерно стартиране на история (в водещ коментар):" -#: smalldialogs.cpp:486 +#: smalldialogs.cpp:496 #, kde-format msgid "" "Copy a history start line as used in your files,\n" @@ -3442,17 +3446,17 @@ "Копирайте ред на започване на история като във файловете,\n" "включително и водещия коментар." -#: smalldialogs.cpp:512 +#: smalldialogs.cpp:522 #, kde-format msgid "History sort key order:" msgstr "Ред за сортиращ ключ:" -#: smalldialogs.cpp:520 +#: smalldialogs.cpp:530 #, kde-format msgid "Example history entry start line (without leading comment):" msgstr "Примерен ред за стартиране на история (без водещ коментар):" -#: smalldialogs.cpp:522 +#: smalldialogs.cpp:532 #, kde-format msgid "" "Copy a history entry start line as used in your files,\n" @@ -3461,48 +3465,48 @@ "Копирайте реда за начало на история като във файловете,\n" "но пропуснете водещия коментар." -#: smalldialogs.cpp:536 +#: smalldialogs.cpp:546 #, kde-format msgid "Sort key result:" msgstr "Резултат от подреждането на ключове:" -#: smalldialogs.cpp:584 smalldialogs.cpp:594 smalldialogs.cpp:614 +#: smalldialogs.cpp:594 smalldialogs.cpp:604 smalldialogs.cpp:624 #, kde-format msgid "Match success." msgstr "Съвпадението е успешно." -#: smalldialogs.cpp:588 smalldialogs.cpp:598 smalldialogs.cpp:620 +#: smalldialogs.cpp:598 smalldialogs.cpp:608 smalldialogs.cpp:630 #, kde-format msgid "Match failed." msgstr "Съвпадението беше неуспешен." -#: smalldialogs.cpp:605 +#: smalldialogs.cpp:615 #, kde-format msgid "Opening and closing parentheses do not match in regular expression." msgstr "Отварящите и затварящи скоби не съвпадат в регулярния израз." -#: SourceData.cpp:150 +#: SourceData.cpp:153 #, kde-format msgid "Writing clipboard data to temp file failed." msgstr "Грешка при запис на системния буфер във временен файл." -#: SourceData.cpp:154 +#: SourceData.cpp:157 #, kde-format msgid "From Clipboard" msgstr "От системния буфер" -#: SourceData.cpp:335 +#: SourceData.cpp:348 #, fuzzy, kde-format #| msgid "Mix of links and normal files." msgid "%1 is not a normal file." msgstr "Комбинация от препратки и нормални файлове." -#: SourceData.cpp:427 +#: SourceData.cpp:440 #, kde-format msgid " Temp file is: %1" msgstr "" -#: SourceData.cpp:432 +#: SourceData.cpp:445 #, kde-format msgid "" "Preprocessing possibly failed. Check this command:\n" @@ -3518,12 +3522,12 @@ "\n" "Командата за предварителна обработка ще бъде неактивна." -#: SourceData.cpp:443 SourceData.cpp:512 +#: SourceData.cpp:456 SourceData.cpp:525 #, kde-format msgid "File %1 too large to process. Skipping." msgstr "" -#: SourceData.cpp:487 +#: SourceData.cpp:500 #, kde-format msgid "" "The line-matching-preprocessing possibly failed. Check this command:\n" diff -Nru kdiff3-1.8.01/po/br/kdiff3.po kdiff3-1.8.3/po/br/kdiff3.po --- kdiff3-1.8.01/po/br/kdiff3.po 2019-05-18 01:01:49.000000000 +0000 +++ kdiff3-1.8.3/po/br/kdiff3.po 2020-06-25 00:18:05.000000000 +0000 @@ -3,8 +3,8 @@ msgid "" msgstr "" "Project-Id-Version: kdeextragear-1/kdiff3.po\n" -"Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2019-04-18 08:02+0200\n" +"Report-Msgid-Bugs-To: https://bugs.kde.org\n" +"POT-Creation-Date: 2020-06-22 07:48+0200\n" "PO-Revision-Date: 2004-09-20 15:44+0200\n" "Last-Translator: Thierry Vignaud \n" "Language-Team: br \n" @@ -12,7 +12,7 @@ "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=1; plural=0;\n" +"Plural-Forms: nplurals=2; plural=(n > 1);\n" #, kde-format msgctxt "NAME OF TRANSLATORS" @@ -24,337 +24,337 @@ msgid "Your emails" msgstr "" -#: difftextwindow.cpp:412 +#: difftextwindow.cpp:414 #, kde-format msgid "File %1: Line %2" msgstr "" -#: difftextwindow.cpp:414 +#: difftextwindow.cpp:416 #, fuzzy, kde-format #| msgid "not available" msgid "File %1: Line not available" msgstr "n'eo ket da gaout" -#: difftextwindow.cpp:1780 +#: difftextwindow.cpp:1778 #, kde-format msgid "Encoding:" msgstr "" -#: difftextwindow.cpp:1782 mergeresultwindow.cpp:3138 optiondialog.cpp:818 +#: difftextwindow.cpp:1781 mergeresultwindow.cpp:3166 optiondialog.cpp:840 #, kde-format msgid "Line end style:" msgstr "" -#: difftextwindow.cpp:1810 directorymergewindow.cpp:382 -#: directorymergewindow.cpp:433 directorymergewindow.cpp:524 -#: directorymergewindow.cpp:3058 directorymergewindow.cpp:3189 -#: directorymergewindow.cpp:3417 mergeresultwindow.cpp:942 -#: mergeresultwindow.cpp:944 mergeresultwindow.cpp:946 -#: mergeresultwindow.cpp:948 mergeresultwindow.cpp:1814 -#: mergeresultwindow.cpp:3170 mergeresultwindow.cpp:3177 optiondialog.cpp:962 -#: optiondialog.cpp:975 pdiff.cpp:833 pdiff.cpp:835 pdiff.cpp:837 pdiff.cpp:839 -#: pdiff.cpp:861 smalldialogs.cpp:124 smalldialogs.cpp:126 smalldialogs.cpp:127 -#: smalldialogs.cpp:130 +#: difftextwindow.cpp:1809 directorymergewindow.cpp:383 +#: directorymergewindow.cpp:434 directorymergewindow.cpp:525 +#: directorymergewindow.cpp:3072 directorymergewindow.cpp:3203 +#: directorymergewindow.cpp:3431 mergeresultwindow.cpp:970 +#: mergeresultwindow.cpp:972 mergeresultwindow.cpp:974 +#: mergeresultwindow.cpp:976 mergeresultwindow.cpp:1842 +#: mergeresultwindow.cpp:3198 mergeresultwindow.cpp:3205 optiondialog.cpp:1002 +#: optiondialog.cpp:1015 pdiff.cpp:823 pdiff.cpp:825 pdiff.cpp:827 +#: pdiff.cpp:829 pdiff.cpp:851 smalldialogs.cpp:131 smalldialogs.cpp:133 +#: smalldialogs.cpp:134 smalldialogs.cpp:137 #, kde-format msgid "A" msgstr "A" -#: difftextwindow.cpp:1810 directorymergewindow.cpp:384 -#: directorymergewindow.cpp:436 directorymergewindow.cpp:526 -#: directorymergewindow.cpp:3064 directorymergewindow.cpp:3190 -#: directorymergewindow.cpp:3418 mergeresultwindow.cpp:942 -#: mergeresultwindow.cpp:944 mergeresultwindow.cpp:950 -#: mergeresultwindow.cpp:952 mergeresultwindow.cpp:1816 -#: mergeresultwindow.cpp:3172 mergeresultwindow.cpp:3179 optiondialog.cpp:963 -#: optiondialog.cpp:976 pdiff.cpp:833 pdiff.cpp:835 pdiff.cpp:841 pdiff.cpp:843 -#: pdiff.cpp:863 smalldialogs.cpp:124 smalldialogs.cpp:125 smalldialogs.cpp:128 -#: smalldialogs.cpp:131 +#: difftextwindow.cpp:1809 directorymergewindow.cpp:385 +#: directorymergewindow.cpp:437 directorymergewindow.cpp:527 +#: directorymergewindow.cpp:3078 directorymergewindow.cpp:3204 +#: directorymergewindow.cpp:3432 mergeresultwindow.cpp:970 +#: mergeresultwindow.cpp:972 mergeresultwindow.cpp:978 +#: mergeresultwindow.cpp:980 mergeresultwindow.cpp:1844 +#: mergeresultwindow.cpp:3200 mergeresultwindow.cpp:3207 optiondialog.cpp:1003 +#: optiondialog.cpp:1016 pdiff.cpp:823 pdiff.cpp:825 pdiff.cpp:831 +#: pdiff.cpp:833 pdiff.cpp:853 smalldialogs.cpp:131 smalldialogs.cpp:132 +#: smalldialogs.cpp:135 smalldialogs.cpp:138 #, kde-format msgid "B" msgstr "G" -#: difftextwindow.cpp:1810 directorymergewindow.cpp:386 -#: directorymergewindow.cpp:439 directorymergewindow.cpp:528 -#: directorymergewindow.cpp:3070 directorymergewindow.cpp:3191 -#: directorymergewindow.cpp:3419 mergeresultwindow.cpp:946 -#: mergeresultwindow.cpp:948 mergeresultwindow.cpp:950 -#: mergeresultwindow.cpp:952 mergeresultwindow.cpp:1818 -#: mergeresultwindow.cpp:3174 mergeresultwindow.cpp:3181 optiondialog.cpp:977 -#: pdiff.cpp:837 pdiff.cpp:839 pdiff.cpp:841 pdiff.cpp:843 pdiff.cpp:865 -#: smalldialogs.cpp:125 smalldialogs.cpp:126 smalldialogs.cpp:129 -#: smalldialogs.cpp:132 +#: difftextwindow.cpp:1809 directorymergewindow.cpp:387 +#: directorymergewindow.cpp:440 directorymergewindow.cpp:529 +#: directorymergewindow.cpp:3084 directorymergewindow.cpp:3205 +#: directorymergewindow.cpp:3433 mergeresultwindow.cpp:974 +#: mergeresultwindow.cpp:976 mergeresultwindow.cpp:978 +#: mergeresultwindow.cpp:980 mergeresultwindow.cpp:1846 +#: mergeresultwindow.cpp:3202 mergeresultwindow.cpp:3209 optiondialog.cpp:1017 +#: pdiff.cpp:827 pdiff.cpp:829 pdiff.cpp:831 pdiff.cpp:833 pdiff.cpp:855 +#: smalldialogs.cpp:132 smalldialogs.cpp:133 smalldialogs.cpp:136 +#: smalldialogs.cpp:139 #, kde-format msgid "C" msgstr "C" -#: difftextwindow.cpp:1810 +#: difftextwindow.cpp:1809 #, kde-format msgid "A (Base)" msgstr "" -#: difftextwindow.cpp:1812 +#: difftextwindow.cpp:1811 #, kde-format msgid "Encoding: %1" msgstr "" -#: difftextwindow.cpp:1813 mergeresultwindow.cpp:3183 +#: difftextwindow.cpp:1812 mergeresultwindow.cpp:3211 #, kde-format msgid "Unix" msgstr "" -#: difftextwindow.cpp:1813 mergeresultwindow.cpp:3184 +#: difftextwindow.cpp:1812 mergeresultwindow.cpp:3212 #, kde-format msgid "DOS" msgstr "" -#: difftextwindow.cpp:1813 +#: difftextwindow.cpp:1812 #, kde-format msgid "Line end style: %1" msgstr "" -#: difftextwindow.cpp:1835 kdiff3.cpp:873 +#: difftextwindow.cpp:1834 kdiff3.cpp:874 #, kde-format msgid "Top line" msgstr "" -#: difftextwindow.cpp:1845 +#: difftextwindow.cpp:1843 #, kde-format msgid "End" msgstr "Dibenn" -#: difftextwindow.cpp:1903 smalldialogs.cpp:235 +#: difftextwindow.cpp:1901 smalldialogs.cpp:245 #, fuzzy, kde-format #| msgid "Opening files..." msgid "Open File" msgstr "Emaon o tigeriñ ar restroù ..." -#: difftextwindow.cpp:1951 optiondialog.cpp:387 +#: difftextwindow.cpp:1943 optiondialog.cpp:389 #, kde-format msgid "Unicode, 8 bit" msgstr "Unicode, 8 bit" -#: difftextwindow.cpp:1966 +#: difftextwindow.cpp:1958 #, kde-format msgid "Other" msgstr "" -#: directorymergewindow.cpp:409 directorymergewindow.cpp:3424 +#: directorymergewindow.cpp:410 directorymergewindow.cpp:3438 #, kde-format msgid "Copy A to B" msgstr "Eilañ A da B" -#: directorymergewindow.cpp:412 directorymergewindow.cpp:3425 +#: directorymergewindow.cpp:413 directorymergewindow.cpp:3439 #, kde-format msgid "Copy B to A" msgstr "Eilañ B da A" -#: directorymergewindow.cpp:415 directorymergewindow.cpp:3426 +#: directorymergewindow.cpp:416 directorymergewindow.cpp:3440 #, kde-format msgid "Delete A" msgstr "Lemel A" -#: directorymergewindow.cpp:418 directorymergewindow.cpp:3427 +#: directorymergewindow.cpp:419 directorymergewindow.cpp:3441 #, kde-format msgid "Delete B" msgstr "Lemel B" -#: directorymergewindow.cpp:421 +#: directorymergewindow.cpp:422 #, kde-format msgid "Delete A & B" msgstr "Lemel A & B" -#: directorymergewindow.cpp:424 directorymergewindow.cpp:3429 +#: directorymergewindow.cpp:425 directorymergewindow.cpp:3443 #, kde-format msgid "Merge to A" msgstr "" -#: directorymergewindow.cpp:427 directorymergewindow.cpp:3430 +#: directorymergewindow.cpp:428 directorymergewindow.cpp:3444 #, kde-format msgid "Merge to B" msgstr "" -#: directorymergewindow.cpp:430 +#: directorymergewindow.cpp:431 #, kde-format msgid "Merge to A & B" msgstr "" -#: directorymergewindow.cpp:442 directorymergewindow.cpp:3421 +#: directorymergewindow.cpp:443 directorymergewindow.cpp:3435 #, kde-format msgid "Delete (if exists)" msgstr "" -#: directorymergewindow.cpp:445 directorymergewindow.cpp:448 -#: directorymergewindow.cpp:3420 optiondialog.cpp:925 smalldialogs.cpp:113 +#: directorymergewindow.cpp:446 directorymergewindow.cpp:449 +#: directorymergewindow.cpp:3434 smalldialogs.cpp:120 #, kde-format msgid "Merge" msgstr "Dastum" -#: directorymergewindow.cpp:445 directorymergewindow.cpp:448 +#: directorymergewindow.cpp:446 directorymergewindow.cpp:449 #, kde-format msgid "Merge (manual)" msgstr "" -#: directorymergewindow.cpp:451 +#: directorymergewindow.cpp:452 #, kde-format msgid "Error: Conflicting File Types" msgstr "" -#: directorymergewindow.cpp:454 +#: directorymergewindow.cpp:455 #, kde-format msgid "Error: Changed and Deleted" msgstr "" -#: directorymergewindow.cpp:457 +#: directorymergewindow.cpp:458 #, kde-format msgid "Error: Dates are equal but files are not." msgstr "" -#: directorymergewindow.cpp:471 +#: directorymergewindow.cpp:472 #, fuzzy, kde-format #| msgid "Done." msgid "Done" msgstr "Graet." -#: directorymergewindow.cpp:473 +#: directorymergewindow.cpp:474 #, fuzzy, kde-format #| msgid "Error." msgid "Error" msgstr "Fazi." -#: directorymergewindow.cpp:475 +#: directorymergewindow.cpp:476 #, kde-format msgid "Skipped." msgstr "Tremenet." -#: directorymergewindow.cpp:477 +#: directorymergewindow.cpp:478 #, kde-format msgid "Not saved." msgstr "N'eo ket enrollet." -#: directorymergewindow.cpp:479 +#: directorymergewindow.cpp:480 #, kde-format msgid "In progress..." msgstr "Ober a ran ..." -#: directorymergewindow.cpp:481 +#: directorymergewindow.cpp:482 #, kde-format msgid "To do." msgstr "Traoù d'ober." -#: directorymergewindow.cpp:522 +#: directorymergewindow.cpp:523 #, kde-format msgid "Name" msgstr "Anv" -#: directorymergewindow.cpp:530 +#: directorymergewindow.cpp:531 #, kde-format msgid "Operation" msgstr "Ober" -#: directorymergewindow.cpp:532 +#: directorymergewindow.cpp:533 #, kde-format msgid "Status" msgstr "Stad" -#: directorymergewindow.cpp:534 +#: directorymergewindow.cpp:535 #, kde-format msgid "Unsolved" msgstr "" -#: directorymergewindow.cpp:536 +#: directorymergewindow.cpp:537 #, kde-format msgid "Solved" msgstr "" -#: directorymergewindow.cpp:538 +#: directorymergewindow.cpp:539 #, kde-format msgid "Nonwhite" msgstr "" -#: directorymergewindow.cpp:540 +#: directorymergewindow.cpp:541 #, kde-format msgid "White" msgstr "Gwenn" -#: directorymergewindow.cpp:674 +#: directorymergewindow.cpp:676 #, kde-format msgid "Unable to compare non-normal file with normal file." msgstr "" -#: directorymergewindow.cpp:688 +#: directorymergewindow.cpp:690 #, kde-format msgid "Mix of links and normal files." msgstr "" -#: directorymergewindow.cpp:695 +#: directorymergewindow.cpp:697 #, kde-format msgid "Link: " msgstr "Liamm : " -#: directorymergewindow.cpp:704 +#: directorymergewindow.cpp:706 #, kde-format msgid "Size. " msgstr "Ment. " -#: directorymergewindow.cpp:718 directorymergewindow.cpp:728 +#: directorymergewindow.cpp:720 directorymergewindow.cpp:730 #, kde-format msgid "Date & Size: " msgstr "Deiziad ha ment : " -#: directorymergewindow.cpp:748 +#: directorymergewindow.cpp:751 #, kde-format msgid "Comparing file..." msgstr "" -#: directorymergewindow.cpp:801 +#: directorymergewindow.cpp:813 #, kde-format msgid "" "You are currently doing a directory merge. Are you sure, you want to abort " "the merge and rescan the directory?" msgstr "" -#: directorymergewindow.cpp:802 kdiff3.cpp:698 kdiff3.cpp:708 kdiff3.cpp:720 -#: mergeresultwindow.cpp:372 pdiff.cpp:1033 pdiff.cpp:1910 pdiff.cpp:1920 +#: directorymergewindow.cpp:814 kdiff3.cpp:697 kdiff3.cpp:707 kdiff3.cpp:719 +#: mergeresultwindow.cpp:400 pdiff.cpp:1031 pdiff.cpp:1920 pdiff.cpp:1930 #, kde-format msgid "Warning" msgstr "" -#: directorymergewindow.cpp:803 directorymergewindow.cpp:3393 +#: directorymergewindow.cpp:815 directorymergewindow.cpp:3407 #, kde-format msgid "Rescan" msgstr "" -#: directorymergewindow.cpp:804 pdiff.cpp:1035 +#: directorymergewindow.cpp:816 pdiff.cpp:1033 #, kde-format msgid "Continue Merging" msgstr "" -#: directorymergewindow.cpp:971 +#: directorymergewindow.cpp:984 #, kde-format msgid "Opening of directories failed:" msgstr "Sac'het eo digeriñ ar renkelloù :" -#: directorymergewindow.cpp:975 +#: directorymergewindow.cpp:988 #, kde-format msgid "Dir A \"%1\" does not exist or is not a directory.\n" msgstr "" -#: directorymergewindow.cpp:980 +#: directorymergewindow.cpp:993 #, kde-format msgid "Dir B \"%1\" does not exist or is not a directory.\n" msgstr "" -#: directorymergewindow.cpp:985 +#: directorymergewindow.cpp:998 #, kde-format msgid "Dir C \"%1\" does not exist or is not a directory.\n" msgstr "" -#: directorymergewindow.cpp:988 +#: directorymergewindow.cpp:1001 #, kde-format msgid "Directory Open Error" msgstr "Fazi en ur zigeriñ ar renkell" -#: directorymergewindow.cpp:996 +#: directorymergewindow.cpp:1009 #, kde-format msgid "" "The destination directory must not be the same as A or B when three " @@ -362,49 +362,49 @@ "Check again before continuing." msgstr "" -#: directorymergewindow.cpp:998 +#: directorymergewindow.cpp:1011 #, kde-format msgid "Parameter Warning" msgstr "" -#: directorymergewindow.cpp:1003 +#: directorymergewindow.cpp:1016 #, kde-format msgid "Scanning directories..." msgstr "Emaon o tielfennañ ar renkelloù ..." -#: directorymergewindow.cpp:1029 +#: directorymergewindow.cpp:1042 #, kde-format msgid "Reading Directory A" msgstr "Emaon o lenn ar renkell A" -#: directorymergewindow.cpp:1038 +#: directorymergewindow.cpp:1051 #, kde-format msgid "Reading Directory B" msgstr "Emaon o lenn ar renkell B" -#: directorymergewindow.cpp:1048 +#: directorymergewindow.cpp:1061 #, kde-format msgid "Reading Directory C" msgstr "Emaon o lenn ar renkell C" -#: directorymergewindow.cpp:1064 +#: directorymergewindow.cpp:1077 #, kde-format msgid "Some subdirectories were not readable in" msgstr "" -#: directorymergewindow.cpp:1069 +#: directorymergewindow.cpp:1082 #, kde-format msgid "Check the permissions of the subdirectories." msgstr "" -#: directorymergewindow.cpp:1106 kdiff3.cpp:666 kdiff3.cpp:753 kdiff3.cpp:777 -#: kdiff3.cpp:1065 kdiff3.cpp:1086 pdiff.cpp:1116 pdiff.cpp:1170 pdiff.cpp:1218 -#: pdiff.cpp:1234 pdiff.cpp:1277 pdiff.cpp:1301 +#: directorymergewindow.cpp:1119 kdiff3.cpp:665 kdiff3.cpp:752 kdiff3.cpp:776 +#: kdiff3.cpp:1072 kdiff3.cpp:1093 pdiff.cpp:1115 pdiff.cpp:1178 pdiff.cpp:1228 +#: pdiff.cpp:1244 pdiff.cpp:1287 pdiff.cpp:1311 #, kde-format msgid "Ready." msgstr "Prest." -#: directorymergewindow.cpp:1121 +#: directorymergewindow.cpp:1134 #, kde-format msgid "" "Directory Comparison Status\n" @@ -414,23 +414,23 @@ "Number of different files: %3" msgstr "" -#: directorymergewindow.cpp:1128 +#: directorymergewindow.cpp:1141 #, fuzzy, kde-format #| msgid "Number of subdirectories:" msgid "Number of manual merges: %1" msgstr "Niver a is-renkelloù :" -#: directorymergewindow.cpp:1394 +#: directorymergewindow.cpp:1407 #, kde-format msgid "This affects all merge operations." msgstr "" -#: directorymergewindow.cpp:1395 +#: directorymergewindow.cpp:1408 #, kde-format msgid "Changing All Merge Operations" msgstr "" -#: directorymergewindow.cpp:1695 +#: directorymergewindow.cpp:1708 #, fuzzy, kde-format #| msgid "Processing " msgid "" @@ -438,45 +438,45 @@ "%3" msgstr "O treterez " -#: directorymergewindow.cpp:1738 directorymergewindow.cpp:1742 +#: directorymergewindow.cpp:1751 directorymergewindow.cpp:1755 #, kde-format msgid "Some files could not be processed." msgstr "" -#: directorymergewindow.cpp:2222 directorymergewindow.cpp:2247 -#: directorymergewindow.cpp:2271 +#: directorymergewindow.cpp:2235 directorymergewindow.cpp:2260 +#: directorymergewindow.cpp:2285 #, kde-format msgid "This operation is currently not possible." msgstr "" -#: directorymergewindow.cpp:2222 directorymergewindow.cpp:2247 -#: directorymergewindow.cpp:2271 directorymergewindow.cpp:2552 +#: directorymergewindow.cpp:2235 directorymergewindow.cpp:2260 +#: directorymergewindow.cpp:2285 directorymergewindow.cpp:2565 #, kde-format msgid "Operation Not Possible" msgstr "" -#: directorymergewindow.cpp:2318 +#: directorymergewindow.cpp:2332 #, fuzzy, kde-format #| msgid "An error occurred while copying.\n" msgid "An error occurred while copying." msgstr "Degouezhet ez eus ar fazi en ur eilañ.\n" -#: directorymergewindow.cpp:2319 directorymergewindow.cpp:2759 +#: directorymergewindow.cpp:2333 directorymergewindow.cpp:2772 #, kde-format msgid "Merge Error" msgstr "Fazi en ur dastum" -#: directorymergewindow.cpp:2396 +#: directorymergewindow.cpp:2410 #, kde-format msgid "Unknown merge operation. (This must never happen!)" msgstr "" -#: directorymergewindow.cpp:2441 +#: directorymergewindow.cpp:2455 #, kde-format msgid "Unknown merge operation." msgstr "" -#: directorymergewindow.cpp:2454 +#: directorymergewindow.cpp:2468 #, kde-format msgid "" "The merge is about to begin.\n" @@ -489,50 +489,50 @@ "whatsoever! Make backups of your vital data!" msgstr "" -#: directorymergewindow.cpp:2459 +#: directorymergewindow.cpp:2473 #, kde-format msgid "Starting Merge" msgstr "" -#: directorymergewindow.cpp:2460 +#: directorymergewindow.cpp:2474 #, kde-format msgid "Do It" msgstr "" -#: directorymergewindow.cpp:2461 +#: directorymergewindow.cpp:2475 #, kde-format msgid "Simulate It" msgstr "" -#: directorymergewindow.cpp:2487 +#: directorymergewindow.cpp:2501 #, kde-format msgid "" "The highlighted item has a different type in the different directories. " "Select what to do." msgstr "" -#: directorymergewindow.cpp:2491 +#: directorymergewindow.cpp:2505 #, kde-format msgid "" "The modification dates of the file are equal but the files are not. Select " "what to do." msgstr "" -#: directorymergewindow.cpp:2495 +#: directorymergewindow.cpp:2509 #, kde-format msgid "" "The highlighted item was changed in one directory and deleted in the other. " "Select what to do." msgstr "" -#: directorymergewindow.cpp:2552 +#: directorymergewindow.cpp:2565 #, kde-format msgid "" "This operation is currently not possible because directory merge is " "currently running." msgstr "" -#: directorymergewindow.cpp:2609 +#: directorymergewindow.cpp:2622 #, kde-format msgid "" "There was an error in the last step.\n" @@ -540,258 +540,258 @@ "to skip this item?" msgstr "" -#: directorymergewindow.cpp:2611 +#: directorymergewindow.cpp:2624 #, kde-format msgid "Continue merge after an error" msgstr "" -#: directorymergewindow.cpp:2612 +#: directorymergewindow.cpp:2625 #, kde-format msgid "Continue With Last Item" msgstr "" -#: directorymergewindow.cpp:2613 +#: directorymergewindow.cpp:2626 #, kde-format msgid "Skip Item" msgstr "Tremen an dra" -#: directorymergewindow.cpp:2709 +#: directorymergewindow.cpp:2722 #, kde-format msgid "Merge operation complete." msgstr "" -#: directorymergewindow.cpp:2709 directorymergewindow.cpp:2712 +#: directorymergewindow.cpp:2722 directorymergewindow.cpp:2725 #, kde-format msgid "Merge Complete" msgstr "" -#: directorymergewindow.cpp:2722 +#: directorymergewindow.cpp:2735 #, kde-format msgid "" "Simulated merge complete: Check if you agree with the proposed operations." msgstr "" -#: directorymergewindow.cpp:2758 +#: directorymergewindow.cpp:2771 #, fuzzy, kde-format #| msgid "An error occurred. Press OK to see detailed information.\n" msgid "An error occurred. Press OK to see detailed information." msgstr "Degouezhet ez eus ar fazi. Gwaskit OK da welet an titouroù munut.\n" -#: directorymergewindow.cpp:2791 +#: directorymergewindow.cpp:2804 #, kde-format msgid "Error: While deleting %1: Creating backup failed." msgstr "" -#: directorymergewindow.cpp:2798 +#: directorymergewindow.cpp:2811 #, kde-format msgid "delete directory recursively( %1 )" msgstr "" -#: directorymergewindow.cpp:2800 +#: directorymergewindow.cpp:2813 #, kde-format msgid "delete( %1 )" msgstr "dilemel( %1 )" -#: directorymergewindow.cpp:2815 +#: directorymergewindow.cpp:2828 #, kde-format msgid "Error: delete dir operation failed while trying to read the directory." msgstr "" -#: directorymergewindow.cpp:2834 +#: directorymergewindow.cpp:2847 #, kde-format msgid "Error: rmdir( %1 ) operation failed." msgstr "" -#: directorymergewindow.cpp:2844 +#: directorymergewindow.cpp:2857 #, kde-format msgid "Error: delete operation failed." msgstr "Fazi : sac'het eo lemel." -#: directorymergewindow.cpp:2870 +#: directorymergewindow.cpp:2884 #, kde-format msgid "manual merge( %1, %2, %3 -> %4)" msgstr "" -#: directorymergewindow.cpp:2873 +#: directorymergewindow.cpp:2887 #, kde-format msgid "" " Note: After a manual merge the user should continue by pressing F7." msgstr "" -#: directorymergewindow.cpp:2900 +#: directorymergewindow.cpp:2914 #, kde-format msgid "Error: copy( %1 -> %2 ) failed.Deleting existing destination failed." msgstr "" -#: directorymergewindow.cpp:2909 +#: directorymergewindow.cpp:2923 #, kde-format msgid "copyLink( %1 -> %2 )" msgstr "" -#: directorymergewindow.cpp:2918 +#: directorymergewindow.cpp:2932 #, kde-format msgid "Error: copyLink failed: Remote links are not yet supported." msgstr "" -#: directorymergewindow.cpp:2928 +#: directorymergewindow.cpp:2942 #, kde-format msgid "Error: copyLink failed." msgstr "" -#: directorymergewindow.cpp:2953 +#: directorymergewindow.cpp:2967 #, kde-format msgid "copy( %1 -> %2 )" msgstr "eilañ( %1 -> %2 )" -#: directorymergewindow.cpp:2979 +#: directorymergewindow.cpp:2993 #, kde-format msgid "Error during rename( %1 -> %2 ): Cannot delete existing destination." msgstr "" -#: directorymergewindow.cpp:2986 +#: directorymergewindow.cpp:3000 #, kde-format msgid "rename( %1 -> %2 )" msgstr "adenvel( %1 -> %2 )" -#: directorymergewindow.cpp:2995 +#: directorymergewindow.cpp:3009 #, kde-format msgid "Error: Rename failed." msgstr "" -#: directorymergewindow.cpp:3013 +#: directorymergewindow.cpp:3027 #, kde-format msgid "Error during makeDir of %1. Cannot delete existing file." msgstr "" -#: directorymergewindow.cpp:3030 +#: directorymergewindow.cpp:3044 #, kde-format msgid "makeDir( %1 )" msgstr "" -#: directorymergewindow.cpp:3040 +#: directorymergewindow.cpp:3054 #, kde-format msgid "Error while creating directory." msgstr "Fazi en ur c'hrouiñ ur renkell." -#: directorymergewindow.cpp:3076 directorymergewindow.cpp:3195 +#: directorymergewindow.cpp:3090 directorymergewindow.cpp:3209 #, kde-format msgid "Dest" msgstr "Dehaez." -#: directorymergewindow.cpp:3084 directorymergewindow.cpp:3113 +#: directorymergewindow.cpp:3098 directorymergewindow.cpp:3127 #, kde-format msgid "Dir" msgstr "Renkell" -#: directorymergewindow.cpp:3084 +#: directorymergewindow.cpp:3098 #, kde-format msgid "Type" msgstr "Seurt" -#: directorymergewindow.cpp:3084 +#: directorymergewindow.cpp:3098 #, kde-format msgid "Size" msgstr "Ment" -#: directorymergewindow.cpp:3085 +#: directorymergewindow.cpp:3099 #, kde-format msgid "Attr" msgstr "" -#: directorymergewindow.cpp:3085 +#: directorymergewindow.cpp:3099 #, kde-format msgid "Last Modification" msgstr "Kemm diwezhañ" -#: directorymergewindow.cpp:3085 +#: directorymergewindow.cpp:3099 #, kde-format msgid "Link-Destination" msgstr "Liamm dehaezadur" -#: directorymergewindow.cpp:3113 +#: directorymergewindow.cpp:3127 #, fuzzy, kde-format #| msgid "File..." msgid "File" msgstr "Restr ..." -#: directorymergewindow.cpp:3113 +#: directorymergewindow.cpp:3127 #, fuzzy, kde-format #| msgid "Link: " msgid "-Link" msgstr "Liamm : " -#: directorymergewindow.cpp:3119 +#: directorymergewindow.cpp:3133 #, kde-format msgid "not available" msgstr "n'eo ket da gaout" -#: directorymergewindow.cpp:3137 +#: directorymergewindow.cpp:3151 #, kde-format msgid "A (Dest): " msgstr "" -#: directorymergewindow.cpp:3141 +#: directorymergewindow.cpp:3155 #, kde-format msgid "A: " msgstr "" -#: directorymergewindow.cpp:3141 +#: directorymergewindow.cpp:3155 #, kde-format msgid "A (Base): " msgstr "" -#: directorymergewindow.cpp:3147 +#: directorymergewindow.cpp:3161 #, kde-format msgid "B (Dest): " msgstr "" -#: directorymergewindow.cpp:3151 +#: directorymergewindow.cpp:3165 #, kde-format msgid "B: " msgstr "" -#: directorymergewindow.cpp:3156 +#: directorymergewindow.cpp:3170 #, kde-format msgid "C (Dest): " msgstr "" -#: directorymergewindow.cpp:3160 +#: directorymergewindow.cpp:3174 #, kde-format msgid "C: " msgstr "" -#: directorymergewindow.cpp:3163 +#: directorymergewindow.cpp:3177 #, kde-format msgid "Dest: " msgstr "Dehaez. : " #. i18n("Saving Directory Merge State ...")); -#: directorymergewindow.cpp:3238 +#: directorymergewindow.cpp:3252 #, kde-format msgid "Save Directory Merge State As..." msgstr "" -#: directorymergewindow.cpp:3387 +#: directorymergewindow.cpp:3401 #, kde-format msgid "Start/Continue Directory Merge" msgstr "" -#: directorymergewindow.cpp:3388 +#: directorymergewindow.cpp:3402 #, kde-format msgid "Run Operation for Current Item" msgstr "" -#: directorymergewindow.cpp:3389 +#: directorymergewindow.cpp:3403 #, kde-format msgid "Compare Selected File" msgstr "" -#: directorymergewindow.cpp:3390 +#: directorymergewindow.cpp:3404 #, kde-format msgid "Merge Current File" msgstr "" -#: directorymergewindow.cpp:3390 +#: directorymergewindow.cpp:3404 #, fuzzy, kde-format #| msgid "Merge" msgid "" @@ -799,68 +799,68 @@ "File" msgstr "Dastum" -#: directorymergewindow.cpp:3391 +#: directorymergewindow.cpp:3405 #, kde-format msgid "Fold All Subdirs" msgstr "" -#: directorymergewindow.cpp:3392 +#: directorymergewindow.cpp:3406 #, kde-format msgid "Unfold All Subdirs" msgstr "" #. i18n("Save Directory Merge State ..."), 0, this, &DirectoryMergeWindow::slotSaveMergeState, ac, "dir_save_merge_state"); #. i18n("Load Directory Merge State ..."), 0, this, &DirectoryMergeWindow::slotLoadMergeState, ac, "dir_load_merge_state"); -#: directorymergewindow.cpp:3396 +#: directorymergewindow.cpp:3410 #, kde-format msgid "Choose A for All Items" msgstr "" -#: directorymergewindow.cpp:3397 +#: directorymergewindow.cpp:3411 #, kde-format msgid "Choose B for All Items" msgstr "" -#: directorymergewindow.cpp:3398 +#: directorymergewindow.cpp:3412 #, kde-format msgid "Choose C for All Items" msgstr "" -#: directorymergewindow.cpp:3399 +#: directorymergewindow.cpp:3413 #, kde-format msgid "Auto-Choose Operation for All Items" msgstr "" -#: directorymergewindow.cpp:3400 +#: directorymergewindow.cpp:3414 #, kde-format msgid "No Operation for All Items" msgstr "" #. i18n("Synchronize Directories"), 0, this, &DirectoryMergeWindow::slotSynchronizeDirectories, ac, "dir_synchronize_directories"); #. d->m_pDirChooseNewerFiles = GuiUtils::createAction< KToggleAction >(i18n("Copy Newer Files Instead of Merging"), 0, this, &DirectoryMergeWindow::slotChooseNewerFiles, ac, "dir_choose_newer_files"); -#: directorymergewindow.cpp:3405 +#: directorymergewindow.cpp:3419 #, kde-format msgid "Show Identical Files" msgstr "" -#: directorymergewindow.cpp:3405 +#: directorymergewindow.cpp:3419 #, kde-format msgid "" "Identical\n" "Files" msgstr "" -#: directorymergewindow.cpp:3406 +#: directorymergewindow.cpp:3420 #, kde-format msgid "Show Different Files" msgstr "" -#: directorymergewindow.cpp:3407 +#: directorymergewindow.cpp:3421 #, kde-format msgid "Show Files only in A" msgstr "Diskouez restroù a zo e A hepken" -#: directorymergewindow.cpp:3407 +#: directorymergewindow.cpp:3421 #, fuzzy, kde-format #| msgid "Show Files only in A" msgid "" @@ -868,12 +868,12 @@ "only in A" msgstr "Diskouez restroù a zo e A hepken" -#: directorymergewindow.cpp:3408 +#: directorymergewindow.cpp:3422 #, kde-format msgid "Show Files only in B" msgstr "Diskouez restroù a zo e B hepken" -#: directorymergewindow.cpp:3408 +#: directorymergewindow.cpp:3422 #, fuzzy, kde-format #| msgid "Show Files only in B" msgid "" @@ -881,12 +881,12 @@ "only in B" msgstr "Diskouez restroù a zo e B hepken" -#: directorymergewindow.cpp:3409 +#: directorymergewindow.cpp:3423 #, kde-format msgid "Show Files only in C" msgstr "Diskouez restroù a zo e C hepken" -#: directorymergewindow.cpp:3409 +#: directorymergewindow.cpp:3423 #, fuzzy, kde-format #| msgid "Show Files only in C" msgid "" @@ -894,397 +894,403 @@ "only in C" msgstr "Diskouez restroù a zo e C hepken" -#: directorymergewindow.cpp:3413 +#: directorymergewindow.cpp:3427 #, kde-format msgid "Compare Explicitly Selected Files" msgstr "" -#: directorymergewindow.cpp:3414 +#: directorymergewindow.cpp:3428 #, kde-format msgid "Merge Explicitly Selected Files" msgstr "" -#: directorymergewindow.cpp:3416 directorymergewindow.cpp:3423 +#: directorymergewindow.cpp:3430 directorymergewindow.cpp:3437 #, kde-format msgid "Do Nothing" msgstr "Ober netra" -#: directorymergewindow.cpp:3428 +#: directorymergewindow.cpp:3442 #, kde-format msgid "Delete A && B" msgstr "Lemel A && B" -#: directorymergewindow.cpp:3431 +#: directorymergewindow.cpp:3445 #, kde-format msgid "Merge to A && B" msgstr "" -#: fileaccess.cpp:462 SourceData.cpp:493 +#: fileaccess.cpp:301 +#, kde-format +msgid "Unable to determine full url. No parent specified." +msgstr "" + +#: fileaccess.cpp:482 SourceData.cpp:506 #, fuzzy, kde-format #| msgid "Reading file: %1" msgid "Failed to read file: %1" msgstr "Emaon o lenn ar restr : %1" -#: fileaccess.cpp:587 +#: fileaccess.cpp:624 #, kde-format msgid "Creating temp copy of %1 failed." msgstr "" -#: fileaccess.cpp:595 fileaccess.cpp:600 +#: fileaccess.cpp:632 fileaccess.cpp:637 #, fuzzy, kde-format #| msgid "Opening %1 failed." msgid "Opening %1 failed. %2" msgstr "Sac'het eo digeiñ ar restr %1." -#: fileaccess.cpp:619 fileaccess.cpp:627 +#: fileaccess.cpp:656 fileaccess.cpp:664 #, fuzzy, kde-format #| msgid "Error reading from %1" msgid "Error reading from %1. %2" msgstr "Fazi en ur less eus %1." -#: fileaccess.cpp:751 +#: fileaccess.cpp:788 #, kde-format msgid "" "While trying to make a backup, deleting an older backup failed.\n" "Filename: %1" msgstr "" -#: fileaccess.cpp:758 +#: fileaccess.cpp:795 #, kde-format msgid "" "While trying to make a backup, renaming failed.\n" "Filenames: %1 -> %2" msgstr "" -#: fileaccess.cpp:828 +#: fileaccess.cpp:865 #, kde-format msgid "Getting file status: %1" msgstr "" -#: fileaccess.cpp:869 +#: fileaccess.cpp:906 #, kde-format msgid "Reading file: %1" msgstr "Emaon o lenn ar restr : %1" -#: fileaccess.cpp:907 +#: fileaccess.cpp:944 #, kde-format msgid "Writing file: %1" msgstr "Emaon o skrivañ ar restr : %1" -#: fileaccess.cpp:940 +#: fileaccess.cpp:977 #, kde-format msgid "Out of memory" msgstr "Memor ebet" -#: fileaccess.cpp:976 +#: fileaccess.cpp:1013 #, kde-format msgid "Making directory: %1" msgstr "Oc'h oberiañ ar renkell : %1" -#: fileaccess.cpp:997 +#: fileaccess.cpp:1034 #, kde-format msgid "Removing directory: %1" msgstr "Emaon o tilemel ar renkell : %1" -#: fileaccess.cpp:1012 +#: fileaccess.cpp:1049 #, kde-format msgid "Removing file: %1" msgstr "Emaon o tilemel ar restr : %1" -#: fileaccess.cpp:1028 +#: fileaccess.cpp:1065 #, kde-format msgid "Creating symbolic link: %1 -> %2" msgstr "" -#: fileaccess.cpp:1052 +#: fileaccess.cpp:1089 #, kde-format msgid "Renaming file: %1 -> %2" msgstr "Emaon oc'h adenvel ar restr : %1 -> %2" -#: fileaccess.cpp:1086 +#: fileaccess.cpp:1123 #, kde-format msgid "Copying file: %1 -> %2" msgstr "Emaon oc'h eilañ ar restr : %1 -> %2" -#: fileaccess.cpp:1108 +#: fileaccess.cpp:1145 #, fuzzy, kde-format #| msgid "Reading directory: " msgid "Reading directory: %1" msgstr "Emaon o lenn ar renkell :" -#: fileaccess.cpp:1162 +#: fileaccess.cpp:1202 #, kde-format msgid "Listing directory: %1" msgstr "" -#: kdiff3.cpp:181 +#: kdiff3.cpp:182 #, kde-format msgid "Current Configuration:" msgstr "" -#: kdiff3.cpp:186 +#: kdiff3.cpp:187 #, kde-format msgid "Config Option Error:" msgstr "Fazi er dibarzh kefluniañ :" -#: kdiff3.cpp:240 +#: kdiff3.cpp:246 #, kde-format msgid "Option --auto used, but no output file specified." msgstr "" -#: kdiff3.cpp:416 +#: kdiff3.cpp:405 #, kde-format msgid "Option --auto ignored for directory comparison." msgstr "" -#: kdiff3.cpp:460 +#: kdiff3.cpp:449 #, kde-format msgid "Saving failed." msgstr "Fazi en ur enrollañ." -#: kdiff3.cpp:496 pdiff.cpp:1098 -#, kde-format +#: kdiff3.cpp:494 pdiff.cpp:1096 +#, fuzzy, kde-format +#| msgid "Opening of directories failed:" msgid "Opening of these files failed:" -msgstr "" +msgstr "Sac'het eo digeriñ ar renkelloù :" -#: kdiff3.cpp:505 +#: kdiff3.cpp:503 pdiff.cpp:1105 #, kde-format -msgid "File Open Error" +msgid "File open error" msgstr "Fazi en ur zigeriñ ar restr" -#: kdiff3.cpp:533 +#: kdiff3.cpp:532 #, kde-format msgid "Opens documents for comparison..." msgstr "" -#: kdiff3.cpp:535 +#: kdiff3.cpp:534 #, fuzzy, kde-format #| msgid "Ready." msgid "Reload" msgstr "Prest." -#: kdiff3.cpp:538 +#: kdiff3.cpp:537 #, kde-format msgid "Saves the merge result. All conflicts must be solved!" msgstr "" -#: kdiff3.cpp:540 +#: kdiff3.cpp:539 #, kde-format msgid "Saves the current document as..." msgstr "Enrollañ a ra an teul red e ..." -#: kdiff3.cpp:543 +#: kdiff3.cpp:542 #, kde-format msgid "Print the differences" msgstr "" -#: kdiff3.cpp:546 +#: kdiff3.cpp:545 #, kde-format msgid "Quits the application" msgstr "Kuitaat a ra ar meziant" -#: kdiff3.cpp:549 +#: kdiff3.cpp:548 #, kde-format msgid "Cuts the selected section and puts it to the clipboard" msgstr "" -#: kdiff3.cpp:552 +#: kdiff3.cpp:551 #, kde-format msgid "Copies the selected section to the clipboard" msgstr "Eilañ a ra an dachenn dibabet er golver" -#: kdiff3.cpp:554 +#: kdiff3.cpp:553 #, kde-format msgid "Pastes the clipboard contents to current position" msgstr "" -#: kdiff3.cpp:557 +#: kdiff3.cpp:556 #, kde-format msgid "Select everything in current window" msgstr "" -#: kdiff3.cpp:560 +#: kdiff3.cpp:559 #, kde-format msgid "Search for a string" msgstr "" -#: kdiff3.cpp:562 +#: kdiff3.cpp:561 #, kde-format msgid "Search again for the string" msgstr "" -#: kdiff3.cpp:567 +#: kdiff3.cpp:566 #, kde-format msgid "Enables/disables the statusbar" msgstr "Kuzhat/Diskouez ar varenn stad" -#: kdiff3.cpp:571 +#: kdiff3.cpp:570 #, kde-format msgid "Configure KDiff3..." msgstr "Kefluniañ KDiff3 ..." -#: kdiff3.cpp:590 +#: kdiff3.cpp:589 #, kde-format msgid "Go to Current Delta" msgstr "" -#: kdiff3.cpp:590 +#: kdiff3.cpp:589 #, kde-format msgid "" "Current\n" "Delta" msgstr "" -#: kdiff3.cpp:592 +#: kdiff3.cpp:591 #, kde-format msgid "Go to First Delta" msgstr "" -#: kdiff3.cpp:592 +#: kdiff3.cpp:591 #, kde-format msgid "" "First\n" "Delta" msgstr "" -#: kdiff3.cpp:594 +#: kdiff3.cpp:593 #, kde-format msgid "Go to Last Delta" msgstr "" -#: kdiff3.cpp:594 +#: kdiff3.cpp:593 #, kde-format msgid "" "Last\n" "Delta" msgstr "" -#: kdiff3.cpp:596 +#: kdiff3.cpp:595 #, kde-format msgid "(Skips white space differences when \"Show White Space\" is disabled.)" msgstr "" -#: kdiff3.cpp:597 +#: kdiff3.cpp:596 #, kde-format msgid "" "(Does not skip white space differences even when \"Show White Space\" is " "disabled.)" msgstr "" -#: kdiff3.cpp:598 +#: kdiff3.cpp:597 #, kde-format msgid "Go to Previous Delta" msgstr "" -#: kdiff3.cpp:598 +#: kdiff3.cpp:597 #, kde-format msgid "" "Prev\n" "Delta" msgstr "" -#: kdiff3.cpp:600 +#: kdiff3.cpp:599 #, kde-format msgid "Go to Next Delta" msgstr "" -#: kdiff3.cpp:600 +#: kdiff3.cpp:599 #, kde-format msgid "" "Next\n" "Delta" msgstr "" -#: kdiff3.cpp:602 +#: kdiff3.cpp:601 #, kde-format msgid "Go to Previous Conflict" msgstr "" -#: kdiff3.cpp:602 +#: kdiff3.cpp:601 #, kde-format msgid "" "Prev\n" "Conflict" msgstr "" -#: kdiff3.cpp:604 +#: kdiff3.cpp:603 #, kde-format msgid "Go to Next Conflict" msgstr "" -#: kdiff3.cpp:604 +#: kdiff3.cpp:603 #, kde-format msgid "" "Next\n" "Conflict" msgstr "" -#: kdiff3.cpp:606 +#: kdiff3.cpp:605 #, kde-format msgid "Go to Previous Unsolved Conflict" msgstr "" -#: kdiff3.cpp:606 +#: kdiff3.cpp:605 #, kde-format msgid "" "Prev\n" "Unsolved" msgstr "" -#: kdiff3.cpp:608 +#: kdiff3.cpp:607 #, kde-format msgid "Go to Next Unsolved Conflict" msgstr "" -#: kdiff3.cpp:608 +#: kdiff3.cpp:607 #, kde-format msgid "" "Next\n" "Unsolved" msgstr "" -#: kdiff3.cpp:610 +#: kdiff3.cpp:609 #, kde-format msgid "Select Line(s) From A" msgstr "" -#: kdiff3.cpp:610 +#: kdiff3.cpp:609 #, kde-format msgid "" "Choose\n" "A" msgstr "" -#: kdiff3.cpp:611 +#: kdiff3.cpp:610 #, kde-format msgid "Select Line(s) From B" msgstr "" -#: kdiff3.cpp:611 +#: kdiff3.cpp:610 #, kde-format msgid "" "Choose\n" "B" msgstr "" -#: kdiff3.cpp:612 +#: kdiff3.cpp:611 #, kde-format msgid "Select Line(s) From C" msgstr "" -#: kdiff3.cpp:612 +#: kdiff3.cpp:611 #, kde-format msgid "" "Choose\n" "C" msgstr "" -#: kdiff3.cpp:613 +#: kdiff3.cpp:612 #, kde-format msgid "Automatically Go to Next Unsolved Conflict After Source Selection" msgstr "" -#: kdiff3.cpp:613 +#: kdiff3.cpp:612 #, fuzzy, kde-format #| msgid "Auto Select" msgid "" @@ -1292,36 +1298,36 @@ "Next" msgstr "Dibab ent emgefreek" -#: kdiff3.cpp:615 +#: kdiff3.cpp:614 #, kde-format msgid "Show Space && Tabulator Characters" msgstr "" -#: kdiff3.cpp:615 +#: kdiff3.cpp:614 #, kde-format msgid "" "White\n" "Characters" msgstr "" -#: kdiff3.cpp:616 +#: kdiff3.cpp:615 #, kde-format msgid "Show White Space" msgstr "" -#: kdiff3.cpp:616 +#: kdiff3.cpp:615 #, kde-format msgid "" "White\n" "Deltas" msgstr "" -#: kdiff3.cpp:618 +#: kdiff3.cpp:617 #, kde-format msgid "Show Line Numbers" msgstr "Diskouez niverennoù linenn" -#: kdiff3.cpp:618 +#: kdiff3.cpp:617 #, fuzzy, kde-format #| msgid "Show Line Numbers" msgid "" @@ -1329,196 +1335,196 @@ "Numbers" msgstr "Diskouez niverennoù linenn" -#: kdiff3.cpp:620 +#: kdiff3.cpp:619 #, kde-format msgid "Automatically Solve Simple Conflicts" msgstr "" -#: kdiff3.cpp:621 +#: kdiff3.cpp:620 #, kde-format msgid "Set Deltas to Conflicts" msgstr "" -#: kdiff3.cpp:622 +#: kdiff3.cpp:621 #, kde-format msgid "Run Regular Expression Auto Merge" msgstr "" -#: kdiff3.cpp:623 +#: kdiff3.cpp:622 #, kde-format msgid "Automatically Solve History Conflicts" msgstr "" -#: kdiff3.cpp:624 +#: kdiff3.cpp:623 #, kde-format msgid "Split Diff At Selection" msgstr "" -#: kdiff3.cpp:625 +#: kdiff3.cpp:624 #, kde-format msgid "Join Selected Diffs" msgstr "" -#: kdiff3.cpp:627 +#: kdiff3.cpp:626 #, kde-format msgid "Show Window A" msgstr "Diskouez ar prenestr A" -#: kdiff3.cpp:628 +#: kdiff3.cpp:627 #, kde-format msgid "Show Window B" msgstr "Diskouez ar prenestr B" -#: kdiff3.cpp:629 +#: kdiff3.cpp:628 #, kde-format msgid "Show Window C" msgstr "Diskouez ar prenestr C" -#: kdiff3.cpp:631 +#: kdiff3.cpp:630 #, kde-format msgid "Normal Overview" msgstr "" -#: kdiff3.cpp:632 +#: kdiff3.cpp:631 #, kde-format msgid "A vs. B Overview" msgstr "" -#: kdiff3.cpp:633 +#: kdiff3.cpp:632 #, kde-format msgid "A vs. C Overview" msgstr "" -#: kdiff3.cpp:634 +#: kdiff3.cpp:633 #, kde-format msgid "B vs. C Overview" msgstr "" -#: kdiff3.cpp:635 +#: kdiff3.cpp:634 #, kde-format msgid "Word Wrap Diff Windows" msgstr "" -#: kdiff3.cpp:636 +#: kdiff3.cpp:635 #, kde-format msgid "Add Manual Diff Alignment" msgstr "" -#: kdiff3.cpp:637 +#: kdiff3.cpp:636 #, kde-format msgid "Clear All Manual Diff Alignments" msgstr "" -#: kdiff3.cpp:639 +#: kdiff3.cpp:638 #, kde-format msgid "Focus Next Window" msgstr "Fokuz ouzh ar brenestr a-heul" -#: kdiff3.cpp:640 +#: kdiff3.cpp:639 #, kde-format msgid "Focus Prev Window" msgstr "Fokuz ouzh ar brenestr diaraok" -#: kdiff3.cpp:641 +#: kdiff3.cpp:640 #, kde-format msgid "Toggle Split Orientation" msgstr "" -#: kdiff3.cpp:643 +#: kdiff3.cpp:642 #, kde-format msgid "Dir && Text Split Screen View" msgstr "" -#: kdiff3.cpp:645 +#: kdiff3.cpp:644 #, kde-format msgid "Toggle Between Dir && Text View" msgstr "" -#: kdiff3.cpp:697 pdiff.cpp:1909 +#: kdiff3.cpp:696 pdiff.cpp:1919 #, kde-format msgid "The merge result has not been saved." msgstr "" -#: kdiff3.cpp:699 +#: kdiff3.cpp:698 #, kde-format msgid "Save && Quit" msgstr "Enrollañ && kuitaat" -#: kdiff3.cpp:700 +#: kdiff3.cpp:699 #, kde-format msgid "Quit Without Saving" msgstr "Kuitaat hep enrollañ" -#: kdiff3.cpp:708 pdiff.cpp:1920 +#: kdiff3.cpp:707 pdiff.cpp:1930 #, kde-format msgid "Saving the merge result failed." msgstr "" -#: kdiff3.cpp:719 pdiff.cpp:1032 +#: kdiff3.cpp:718 pdiff.cpp:1030 #, kde-format msgid "" "You are currently doing a directory merge. Are you sure, you want to abort?" msgstr "" -#: kdiff3.cpp:742 +#: kdiff3.cpp:741 #, kde-format msgid "Saving file..." msgstr "Emaon oc'h enrollañ ar restr ..." -#: kdiff3.cpp:759 +#: kdiff3.cpp:758 #, kde-format msgid "Saving file with a new filename..." msgstr "Oc'h enrollañ ar restr gant un anv restr nevez ..." -#: kdiff3.cpp:761 +#: kdiff3.cpp:760 #, kde-format msgid "Save As..." msgstr "" -#: kdiff3.cpp:820 +#: kdiff3.cpp:819 #, fuzzy, kde-format #| msgid "Printing completed." msgid "Printing not implemented." msgstr "Echu eo moulañ." -#: kdiff3.cpp:857 +#: kdiff3.cpp:858 #, fuzzy, kde-format #| msgid "Printing..." msgid "Printing..." msgstr "Emaon o voulañ ..." -#: kdiff3.cpp:943 +#: kdiff3.cpp:948 #, kde-format msgid "Printing page %1 of %2" msgstr "" -#: kdiff3.cpp:1000 +#: kdiff3.cpp:1006 #, fuzzy, kde-format #| msgid "Selection" msgid " (Selection)" msgstr "Diuzadenn" -#: kdiff3.cpp:1027 +#: kdiff3.cpp:1034 #, kde-format msgid "Printing completed." msgstr "Echu eo moulañ." -#: kdiff3.cpp:1031 +#: kdiff3.cpp:1038 #, kde-format msgid "Printing aborted." msgstr "Nullet eo ar voulañ." -#: kdiff3.cpp:1038 +#: kdiff3.cpp:1045 #, kde-format msgid "Exiting..." msgstr "Emaon o kuitaat ..." -#: kdiff3.cpp:1049 +#: kdiff3.cpp:1056 #, kde-format msgid "Toggling toolbar..." msgstr "Emaon o kuzhat/diskouez ar varenn ostilh ..." -#: kdiff3.cpp:1070 +#: kdiff3.cpp:1077 #, kde-format msgid "Toggle the statusbar..." msgstr "Diskouez/Kuzhat ar varenn stad ..." @@ -1544,7 +1550,7 @@ msgid "Joachim Eibl" msgstr "" -#: kdiff3_part.cpp:173 kdiff3_part.cpp:254 +#: kdiff3_part.cpp:174 kdiff3_part.cpp:255 #, kde-format msgid "Could not find files for comparison." msgstr "" @@ -1562,7 +1568,7 @@ msgstr "Kefluniañ KDiff3" #. i18n: ectx: ToolBar (mainToolBar) -#: kdiff3_part.rc:16 main.cpp:88 +#: kdiff3_part.rc:16 main.cpp:89 #, kde-format msgid "KDiff3" msgstr "KDiff3" @@ -1631,198 +1637,203 @@ msgid "Main Toolbar" msgstr "" -#: main.cpp:68 main.cpp:72 +#: main.cpp:69 main.cpp:73 #, kde-format msgid "Ignored. (User defined.)" msgstr "" -#: main.cpp:92 +#: main.cpp:93 #, kde-format msgid " (64 bit)" msgstr "" -#: main.cpp:94 +#: main.cpp:95 #, kde-format msgid " (32 bit)" msgstr "" -#: main.cpp:95 +#: main.cpp:96 #, kde-format msgid "Tool for Comparison and Merge of Files and Directories" msgstr "" -#: main.cpp:96 +#: main.cpp:97 #, kde-format msgid "(c) 2002-2014 Joachim Eibl, (c) 2017 Michael Reeves KF5/Qt5 port" msgstr "" -#: main.cpp:112 +#: main.cpp:113 #, kde-format msgid "Merge the input." msgstr "" -#: main.cpp:113 +#: main.cpp:114 #, kde-format msgid "Explicit base file. For compatibility with certain tools." msgstr "" -#: main.cpp:114 +#: main.cpp:115 #, kde-format msgid "Output file. Implies -m. E.g.: -o newfile.txt" msgstr "" -#: main.cpp:115 +#: main.cpp:116 #, kde-format msgid "Output file, again. (For compatibility with certain tools.)" msgstr "" -#: main.cpp:116 +#: main.cpp:118 #, kde-format msgid "No GUI if all conflicts are auto-solvable. (Needs -o file)" msgstr "" -#: main.cpp:117 +#: main.cpp:120 +#, kde-format +msgid "Ignored." +msgstr "" + +#: main.cpp:122 #, kde-format msgid "Do not solve conflicts automatically." msgstr "" -#: main.cpp:118 +#: main.cpp:123 #, kde-format msgid "Visible name replacement for input file 1 (base)." msgstr "" -#: main.cpp:119 +#: main.cpp:124 #, kde-format msgid "Visible name replacement for input file 2." msgstr "" -#: main.cpp:120 +#: main.cpp:125 #, kde-format msgid "Visible name replacement for input file 3." msgstr "" -#: main.cpp:121 +#: main.cpp:126 #, kde-format msgid "Alternative visible name replacement. Supply this once for every input." msgstr "" -#: main.cpp:122 +#: main.cpp:127 #, kde-format msgid "" "Override a config setting. Use once for every setting. E.g.: --cs " "\"AutoAdvance=1\"" msgstr "" -#: main.cpp:123 +#: main.cpp:128 #, kde-format msgid "Show list of config settings and current values." msgstr "" -#: main.cpp:124 +#: main.cpp:129 #, kde-format msgid "Use a different config file." msgstr "" -#: main.cpp:127 +#: main.cpp:132 #, kde-format msgid "file1 to open (base, if not specified via --base)" msgstr "" -#: main.cpp:128 +#: main.cpp:133 #, kde-format msgid "file2 to open" msgstr "restr2 da zigeriñ" -#: main.cpp:129 +#: main.cpp:134 #, kde-format msgid "file3 to open" msgstr "restr3 da zigeriñ" -#: main.cpp:153 +#: main.cpp:158 #, kde-format msgid "See kdiff3 --help for supported options." msgstr "" -#: mergeresultwindow.cpp:158 +#: mergeresultwindow.cpp:171 #, kde-format msgid "Choose A Everywhere" msgstr "" -#: mergeresultwindow.cpp:159 +#: mergeresultwindow.cpp:172 #, kde-format msgid "Choose B Everywhere" msgstr "" -#: mergeresultwindow.cpp:160 +#: mergeresultwindow.cpp:173 #, kde-format msgid "Choose C Everywhere" msgstr "" -#: mergeresultwindow.cpp:161 +#: mergeresultwindow.cpp:174 #, kde-format msgid "Choose A for All Unsolved Conflicts" msgstr "" -#: mergeresultwindow.cpp:162 +#: mergeresultwindow.cpp:175 #, kde-format msgid "Choose B for All Unsolved Conflicts" msgstr "" -#: mergeresultwindow.cpp:163 +#: mergeresultwindow.cpp:176 #, kde-format msgid "Choose C for All Unsolved Conflicts" msgstr "" -#: mergeresultwindow.cpp:164 +#: mergeresultwindow.cpp:177 #, kde-format msgid "Choose A for All Unsolved Whitespace Conflicts" msgstr "" -#: mergeresultwindow.cpp:165 +#: mergeresultwindow.cpp:178 #, kde-format msgid "Choose B for All Unsolved Whitespace Conflicts" msgstr "" -#: mergeresultwindow.cpp:166 +#: mergeresultwindow.cpp:179 #, kde-format msgid "Choose C for All Unsolved Whitespace Conflicts" msgstr "" -#: mergeresultwindow.cpp:176 +#: mergeresultwindow.cpp:204 #, kde-format msgid "Number of remaining unsolved conflicts: %1 (of which %2 are whitespace)" msgstr "" -#: mergeresultwindow.cpp:370 +#: mergeresultwindow.cpp:398 #, kde-format msgid "" "The output has been modified.\n" "If you continue your changes will be lost." msgstr "" -#: mergeresultwindow.cpp:936 pdiff.cpp:827 +#: mergeresultwindow.cpp:964 pdiff.cpp:817 #, kde-format msgid "All input files are binary equal." msgstr "" -#: mergeresultwindow.cpp:938 +#: mergeresultwindow.cpp:966 #, kde-format msgid "All input files contain the same text." msgstr "" -#: mergeresultwindow.cpp:942 mergeresultwindow.cpp:946 -#: mergeresultwindow.cpp:950 pdiff.cpp:833 pdiff.cpp:837 pdiff.cpp:841 +#: mergeresultwindow.cpp:970 mergeresultwindow.cpp:974 +#: mergeresultwindow.cpp:978 pdiff.cpp:823 pdiff.cpp:827 pdiff.cpp:831 #, kde-format msgid "Files %1 and %2 are binary equal.\n" msgstr "" -#: mergeresultwindow.cpp:944 mergeresultwindow.cpp:948 -#: mergeresultwindow.cpp:952 +#: mergeresultwindow.cpp:972 mergeresultwindow.cpp:976 +#: mergeresultwindow.cpp:980 #, kde-format msgid "Files %1 and %2 have equal text.\n" msgstr "" -#: mergeresultwindow.cpp:958 +#: mergeresultwindow.cpp:986 #, kde-format msgid "" "Total number of conflicts: %1\n" @@ -1831,39 +1842,39 @@ "%4" msgstr "" -#: mergeresultwindow.cpp:964 +#: mergeresultwindow.cpp:992 #, kde-format msgid "Conflicts" msgstr "" -#: mergeresultwindow.cpp:1873 +#: mergeresultwindow.cpp:1901 #, kde-format msgid "" msgstr "" -#: mergeresultwindow.cpp:1881 +#: mergeresultwindow.cpp:1909 #, kde-format msgid "" msgstr "" -#: mergeresultwindow.cpp:1883 mergeresultwindow.cpp:2755 +#: mergeresultwindow.cpp:1911 mergeresultwindow.cpp:2783 #, kde-format msgid "" msgstr "" -#: mergeresultwindow.cpp:2967 +#: mergeresultwindow.cpp:2995 #, kde-format msgid "" "Not all conflicts are solved yet.\n" "File not saved." msgstr "" -#: mergeresultwindow.cpp:2969 mergeresultwindow.cpp:2978 +#: mergeresultwindow.cpp:2997 mergeresultwindow.cpp:3006 #, kde-format msgid "Conflicts Left" msgstr "" -#: mergeresultwindow.cpp:2976 +#: mergeresultwindow.cpp:3004 #, kde-format msgid "" "There is a line end style conflict. Please choose the line end style " @@ -1871,7 +1882,7 @@ "File not saved." msgstr "" -#: mergeresultwindow.cpp:2990 +#: mergeresultwindow.cpp:3018 #, kde-format msgid "" "\n" @@ -1879,58 +1890,58 @@ "Creating backup failed. File not saved." msgstr "" -#: mergeresultwindow.cpp:2990 mergeresultwindow.cpp:3038 +#: mergeresultwindow.cpp:3018 mergeresultwindow.cpp:3066 #, kde-format msgid "File Save Error" msgstr "" -#: mergeresultwindow.cpp:3038 +#: mergeresultwindow.cpp:3066 #, kde-format msgid "Error while writing." msgstr "Fazi en ur skrivañ." -#: mergeresultwindow.cpp:3110 +#: mergeresultwindow.cpp:3138 #, fuzzy, kde-format #| msgid "Output" msgid "Output:" msgstr "Ezkas" -#: mergeresultwindow.cpp:3123 mergeresultwindow.cpp:3315 +#: mergeresultwindow.cpp:3151 mergeresultwindow.cpp:3343 #, kde-format msgid "[Modified]" msgstr "[Kemmet]" -#: mergeresultwindow.cpp:3130 +#: mergeresultwindow.cpp:3158 #, kde-format msgid "Encoding for saving:" msgstr "" -#: mergeresultwindow.cpp:3230 +#: mergeresultwindow.cpp:3258 #, kde-format msgid "Conflict" msgstr "" -#: mergeresultwindow.cpp:3262 +#: mergeresultwindow.cpp:3290 #, kde-format msgid "Codec from A: %1" msgstr "" -#: mergeresultwindow.cpp:3264 +#: mergeresultwindow.cpp:3292 #, kde-format msgid "Codec from B: %1" msgstr "" -#: mergeresultwindow.cpp:3266 +#: mergeresultwindow.cpp:3294 #, kde-format msgid "Codec from C: %1" msgstr "" -#: optiondialog.cpp:119 +#: optiondialog.cpp:121 #, kde-format msgid "Change Font" msgstr "" -#: optiondialog.cpp:135 optiondialog.cpp:145 +#: optiondialog.cpp:137 optiondialog.cpp:147 #, kde-format msgid "" "Font: %1, %2, %3\n" @@ -1938,208 +1949,208 @@ "Example:" msgstr "" -#: optiondialog.cpp:388 +#: optiondialog.cpp:390 #, kde-format msgid "Unicode" msgstr "Unicode" -#: optiondialog.cpp:389 +#: optiondialog.cpp:391 #, kde-format msgid "Latin1" msgstr "Latin1" -#: optiondialog.cpp:408 +#: optiondialog.cpp:410 #, kde-format msgid "Change this if non-ASCII characters are not displayed correctly." msgstr "" -#: optiondialog.cpp:491 +#: optiondialog.cpp:495 #, fuzzy, kde-format #| msgid "Configure..." msgid "Configure" msgstr "Kefluniañ ..." -#: optiondialog.cpp:568 +#: optiondialog.cpp:573 #, kde-format msgid "Font" msgstr "" -#: optiondialog.cpp:570 +#: optiondialog.cpp:575 #, kde-format msgid "Editor & Diff Output Font" msgstr "" -#: optiondialog.cpp:589 +#: optiondialog.cpp:594 #, kde-format msgid "Application font" msgstr "" -#: optiondialog.cpp:594 +#: optiondialog.cpp:599 #, kde-format msgid "File view font" msgstr "" -#: optiondialog.cpp:613 +#: optiondialog.cpp:618 #, fuzzy, kde-format #| msgid "Color" msgctxt "Title for color settings page" msgid "Color" msgstr "Liv" -#: optiondialog.cpp:614 +#: optiondialog.cpp:619 #, kde-format msgid "Colors Settings" msgstr "Kefluniadur al livioù" -#: optiondialog.cpp:631 +#: optiondialog.cpp:644 #, kde-format msgid "Editor and Diff Views:" msgstr "" -#: optiondialog.cpp:639 +#: optiondialog.cpp:652 #, kde-format msgid "Foreground color:" msgstr "Liv war-c'horre :" -#: optiondialog.cpp:647 +#: optiondialog.cpp:660 #, kde-format msgid "Background color:" msgstr "Liv an drekleur :" -#: optiondialog.cpp:657 +#: optiondialog.cpp:670 #, kde-format msgid "Diff background color:" msgstr "" -#: optiondialog.cpp:666 +#: optiondialog.cpp:679 #, kde-format msgid "Color A:" msgstr "Liv A :" -#: optiondialog.cpp:675 +#: optiondialog.cpp:688 #, kde-format msgid "Color B:" msgstr "Liv B :" -#: optiondialog.cpp:684 +#: optiondialog.cpp:697 #, kde-format msgid "Color C:" msgstr "Liv C :" -#: optiondialog.cpp:692 +#: optiondialog.cpp:705 #, kde-format msgid "Conflict color:" msgstr "" -#: optiondialog.cpp:701 +#: optiondialog.cpp:714 #, kde-format msgid "Current range background color:" msgstr "" -#: optiondialog.cpp:710 +#: optiondialog.cpp:723 #, kde-format msgid "Current range diff background color:" msgstr "" -#: optiondialog.cpp:718 +#: optiondialog.cpp:731 #, kde-format msgid "Color for manually aligned difference ranges:" msgstr "" -#: optiondialog.cpp:725 +#: optiondialog.cpp:738 #, kde-format msgid "Directory Comparison View:" msgstr "" -#: optiondialog.cpp:731 +#: optiondialog.cpp:744 #, kde-format msgid "Newest file color:" msgstr "" -#: optiondialog.cpp:736 +#: optiondialog.cpp:749 #, kde-format msgid "" "Changing this color will only be effective when starting the next directory " "comparison." msgstr "" -#: optiondialog.cpp:741 +#: optiondialog.cpp:754 #, kde-format msgid "Oldest file color:" msgstr "" -#: optiondialog.cpp:750 +#: optiondialog.cpp:763 #, kde-format msgid "Middle age file color:" msgstr "" -#: optiondialog.cpp:759 +#: optiondialog.cpp:772 #, kde-format msgid "Color for missing files:" msgstr "" -#: optiondialog.cpp:773 +#: optiondialog.cpp:786 #, kde-format msgid "Editor" msgstr "Aozer" -#: optiondialog.cpp:774 +#: optiondialog.cpp:787 #, kde-format msgid "Editor Behavior" msgstr "Emzalc'h an aozer" -#: optiondialog.cpp:787 +#: optiondialog.cpp:809 #, kde-format msgid "Tab inserts spaces" msgstr "" -#: optiondialog.cpp:791 +#: optiondialog.cpp:813 #, kde-format msgid "" "On: Pressing tab generates the appropriate number of spaces.\n" "Off: A tab character will be inserted." msgstr "" -#: optiondialog.cpp:796 +#: optiondialog.cpp:818 #, kde-format msgid "Tab size:" msgstr "Ment ar bevennig :" -#: optiondialog.cpp:803 +#: optiondialog.cpp:825 #, kde-format msgid "Auto indentation" msgstr "Emgeflosk" -#: optiondialog.cpp:807 +#: optiondialog.cpp:829 #, kde-format msgid "On: The indentation of the previous line is used for a new line.\n" msgstr "" -#: optiondialog.cpp:810 +#: optiondialog.cpp:832 #, kde-format msgid "Auto copy selection" msgstr "" -#: optiondialog.cpp:814 +#: optiondialog.cpp:836 #, kde-format msgid "" "On: Any selection is immediately written to the clipboard.\n" "Off: You must explicitly copy e.g. via Ctrl-C." msgstr "" -#: optiondialog.cpp:829 +#: optiondialog.cpp:851 #, kde-format msgid "" "Sets the line endings for when an edited file is saved.\n" "DOS/Windows: CR+LF; UNIX: LF; with CR=0D, LF=0A" msgstr "" -#: optiondialog.cpp:839 +#: optiondialog.cpp:861 #, kde-format msgid "Diff" msgstr "Diff" -#: optiondialog.cpp:840 +#: optiondialog.cpp:862 #, fuzzy, kde-format msgid "Diff Settings" msgstr "Kefluniadur rann-vro" @@ -2153,12 +2164,12 @@ #. ); #. ++line; #. -#: optiondialog.cpp:865 +#: optiondialog.cpp:896 #, kde-format msgid "Ignore numbers (treat as white space)" msgstr "" -#: optiondialog.cpp:869 +#: optiondialog.cpp:900 #, kde-format msgid "" "Ignore number characters during line matching phase. (Similar to Ignore " @@ -2166,66 +2177,66 @@ "Might help to compare files with numeric data." msgstr "" -#: optiondialog.cpp:873 +#: optiondialog.cpp:904 #, kde-format msgid "Ignore C/C++ comments (treat as white space)" msgstr "" -#: optiondialog.cpp:876 +#: optiondialog.cpp:907 #, kde-format msgid "Treat C/C++ comments like white space." msgstr "" -#: optiondialog.cpp:879 +#: optiondialog.cpp:910 #, kde-format msgid "Ignore case (treat as white space)" msgstr "" -#: optiondialog.cpp:883 +#: optiondialog.cpp:914 #, kde-format msgid "Treat case differences like white space changes. ('a'<=>'A')" msgstr "" -#: optiondialog.cpp:886 +#: optiondialog.cpp:917 #, kde-format msgid "Preprocessor command:" msgstr "" -#: optiondialog.cpp:891 +#: optiondialog.cpp:922 #, kde-format msgid "User defined pre-processing. (See the docs for details.)" msgstr "" -#: optiondialog.cpp:894 +#: optiondialog.cpp:925 #, kde-format msgid "Line-matching preprocessor command:" msgstr "" -#: optiondialog.cpp:899 +#: optiondialog.cpp:930 #, kde-format msgid "" "This pre-processor is only used during line matching.\n" "(See the docs for details.)" msgstr "" -#: optiondialog.cpp:902 +#: optiondialog.cpp:933 #, kde-format msgid "Try hard (slower)" msgstr "" -#: optiondialog.cpp:906 +#: optiondialog.cpp:937 #, kde-format msgid "" "Enables the --minimal option for the external diff.\n" "The analysis of big files will be much slower." msgstr "" -#: optiondialog.cpp:910 +#: optiondialog.cpp:941 #, kde-format msgid "Align B and C for 3 input files" msgstr "" -#: optiondialog.cpp:914 +#: optiondialog.cpp:945 #, kde-format msgid "" "Try to align B and C when comparing or merging three input files.\n" @@ -2233,67 +2244,74 @@ "(Default is off.)" msgstr "" -#: optiondialog.cpp:926 +#: optiondialog.cpp:956 +#, fuzzy, kde-format +#| msgid "Merge" +msgctxt "Settings page" +msgid "Merge" +msgstr "Dastum" + +#: optiondialog.cpp:957 #, fuzzy, kde-format msgid "Merge Settings" msgstr "Kefluniadur rann-vro" -#: optiondialog.cpp:940 +#: optiondialog.cpp:980 #, kde-format msgid "Auto advance delay (ms):" msgstr "" -#: optiondialog.cpp:946 +#: optiondialog.cpp:986 #, kde-format 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 "" -#: optiondialog.cpp:950 +#: optiondialog.cpp:990 #, fuzzy, kde-format #| msgid "Show Window A" msgid "Show info dialogs" msgstr "Diskouez ar prenestr A" -#: optiondialog.cpp:953 +#: optiondialog.cpp:993 #, kde-format msgid "Show a dialog with information about the number of conflicts." msgstr "" -#: optiondialog.cpp:956 +#: optiondialog.cpp:996 #, kde-format msgid "White space 2-file merge default:" msgstr "" -#: optiondialog.cpp:961 optiondialog.cpp:974 +#: optiondialog.cpp:1001 optiondialog.cpp:1014 #, kde-format msgid "Manual Choice" msgstr "Choazh diwar zorn" -#: optiondialog.cpp:965 optiondialog.cpp:979 +#: optiondialog.cpp:1005 optiondialog.cpp:1019 #, kde-format msgid "" "Allow the merge algorithm to automatically select an input for white-space-" "only changes." msgstr "" -#: optiondialog.cpp:969 +#: optiondialog.cpp:1009 #, kde-format msgid "White space 3-file merge default:" msgstr "" -#: optiondialog.cpp:983 +#: optiondialog.cpp:1023 #, kde-format msgid "Automatic Merge Regular Expression" msgstr "" -#: optiondialog.cpp:991 smalldialogs.cpp:449 +#: optiondialog.cpp:1031 smalldialogs.cpp:459 #, kde-format msgid "Auto merge regular expression:" msgstr "" -#: optiondialog.cpp:996 +#: optiondialog.cpp:1036 #, kde-format msgid "" "Regular expression for lines where KDiff3 should automatically choose one " @@ -2302,29 +2320,29 @@ "- if available - C, otherwise B will be chosen." msgstr "" -#: optiondialog.cpp:1002 +#: optiondialog.cpp:1042 #, kde-format msgid "Run regular expression auto merge on merge start" msgstr "" -#: optiondialog.cpp:1005 +#: optiondialog.cpp:1045 #, kde-format msgid "" "Run the merge for auto merge regular expressions\n" "immediately when a merge starts.\n" msgstr "" -#: optiondialog.cpp:1010 +#: optiondialog.cpp:1050 #, kde-format msgid "Version Control History Merging" msgstr "" -#: optiondialog.cpp:1018 smalldialogs.cpp:476 +#: optiondialog.cpp:1058 smalldialogs.cpp:486 #, kde-format msgid "History start regular expression:" msgstr "" -#: optiondialog.cpp:1023 +#: optiondialog.cpp:1063 #, kde-format msgid "" "Regular expression for the start of the version control history entry.\n" @@ -2332,12 +2350,12 @@ "Default value: \".*\\$Log.*\\$.*\"" msgstr "" -#: optiondialog.cpp:1029 smalldialogs.cpp:504 +#: optiondialog.cpp:1069 smalldialogs.cpp:514 #, kde-format msgid "History entry start regular expression:" msgstr "" -#: optiondialog.cpp:1042 +#: optiondialog.cpp:1082 #, kde-format msgid "" "A version control history entry consists of several lines.\n" @@ -2349,22 +2367,22 @@ "See the documentation for details." msgstr "" -#: optiondialog.cpp:1050 +#: optiondialog.cpp:1090 #, kde-format msgid "History merge sorting" msgstr "" -#: optiondialog.cpp:1053 +#: optiondialog.cpp:1093 #, kde-format msgid "Sort version control history by a key." msgstr "" -#: optiondialog.cpp:1063 +#: optiondialog.cpp:1103 #, kde-format msgid "History entry start sort key order:" msgstr "" -#: optiondialog.cpp:1068 +#: optiondialog.cpp:1108 #, kde-format msgid "" "Each pair of parentheses used in the regular expression for the history " @@ -2376,37 +2394,37 @@ "See the documentation for details." msgstr "" -#: optiondialog.cpp:1079 +#: optiondialog.cpp:1119 #, kde-format msgid "Merge version control history on merge start" msgstr "" -#: optiondialog.cpp:1082 +#: optiondialog.cpp:1122 #, kde-format msgid "Run version control history automerge on merge start." msgstr "" -#: optiondialog.cpp:1086 +#: optiondialog.cpp:1126 #, fuzzy, kde-format msgid "Max number of history entries:" msgstr "Niver a is-renkelloù :" -#: optiondialog.cpp:1090 +#: optiondialog.cpp:1130 #, kde-format msgid "Cut off after specified number. Use -1 for infinite number of entries." msgstr "" -#: optiondialog.cpp:1094 +#: optiondialog.cpp:1134 #, kde-format msgid "Test your regular expressions" msgstr "" -#: optiondialog.cpp:1099 +#: optiondialog.cpp:1139 #, kde-format msgid "Irrelevant merge command:" msgstr "" -#: optiondialog.cpp:1104 +#: optiondialog.cpp:1144 #, kde-format msgid "" "If specified this script is run after automerge\n" @@ -2414,12 +2432,12 @@ "Called with the parameters: filename1 filename2 filename3" msgstr "" -#: optiondialog.cpp:1109 +#: optiondialog.cpp:1149 #, kde-format msgid "Auto save and quit on merge without conflicts" msgstr "" -#: optiondialog.cpp:1113 +#: optiondialog.cpp:1153 #, kde-format msgid "" "If KDiff3 was started for a file-merge from the command line and all\n" @@ -2428,28 +2446,28 @@ "(Similar to command line option \"--auto\".)" msgstr "" -#: optiondialog.cpp:1124 optiondialog.cpp:1125 +#: optiondialog.cpp:1164 optiondialog.cpp:1165 #, fuzzy, kde-format #| msgid "&Directory" msgid "Directory" msgstr "&Renkell" -#: optiondialog.cpp:1137 +#: optiondialog.cpp:1185 #, kde-format msgid "Recursive directories" msgstr "" -#: optiondialog.cpp:1140 +#: optiondialog.cpp:1188 #, kde-format msgid "Whether to analyze subdirectories or not." msgstr "" -#: optiondialog.cpp:1142 +#: optiondialog.cpp:1190 #, kde-format msgid "File pattern(s):" msgstr "Sil(où) restr :" -#: optiondialog.cpp:1148 +#: optiondialog.cpp:1196 #, kde-format msgid "" "Pattern(s) of files to be analyzed. \n" @@ -2457,12 +2475,12 @@ "Several Patterns can be specified by using the separator: ';'" msgstr "" -#: optiondialog.cpp:1153 +#: optiondialog.cpp:1201 #, kde-format msgid "File-anti-pattern(s):" msgstr "" -#: optiondialog.cpp:1159 +#: optiondialog.cpp:1207 #, kde-format msgid "" "Pattern(s) of files to be excluded from analysis. \n" @@ -2470,12 +2488,12 @@ "Several Patterns can be specified by using the separator: ';'" msgstr "" -#: optiondialog.cpp:1164 +#: optiondialog.cpp:1212 #, kde-format msgid "Dir-anti-pattern(s):" msgstr "" -#: optiondialog.cpp:1170 +#: optiondialog.cpp:1218 #, kde-format msgid "" "Pattern(s) of directories to be excluded from analysis. \n" @@ -2483,58 +2501,58 @@ "Several Patterns can be specified by using the separator: ';'" msgstr "" -#: optiondialog.cpp:1175 +#: optiondialog.cpp:1223 #, kde-format msgid "Use .cvsignore" msgstr "Implijit .cvsignore" -#: optiondialog.cpp:1179 +#: optiondialog.cpp:1227 #, kde-format msgid "" "Extends the antipattern to anything that would be ignored by CVS.\n" "Via local \".cvsignore\" files this can be directory specific." msgstr "" -#: optiondialog.cpp:1183 +#: optiondialog.cpp:1231 #, kde-format msgid "Find hidden files and directories" msgstr "" -#: optiondialog.cpp:1186 +#: optiondialog.cpp:1234 #, kde-format msgid "Finds hidden files and directories." msgstr "" -#: optiondialog.cpp:1189 +#: optiondialog.cpp:1237 #, kde-format msgid "Follow file links" msgstr "Heuliañ liammoù ar retroù" -#: optiondialog.cpp:1193 +#: optiondialog.cpp:1241 #, kde-format msgid "" "On: Compare the file the link points to.\n" "Off: Compare the links." msgstr "" -#: optiondialog.cpp:1197 +#: optiondialog.cpp:1245 #, kde-format msgid "Follow directory links" msgstr "Heuliañ liammoù ar renkelloù" -#: optiondialog.cpp:1201 +#: optiondialog.cpp:1249 #, kde-format msgid "" "On: Compare the directory the link points to.\n" "Off: Compare the links." msgstr "" -#: optiondialog.cpp:1210 +#: optiondialog.cpp:1258 #, kde-format msgid "Case sensitive filename comparison" msgstr "" -#: optiondialog.cpp:1214 +#: optiondialog.cpp:1262 #, kde-format msgid "" "The directory comparison will compare files or directories when their names " @@ -2543,63 +2561,63 @@ "off, otherwise on.)" msgstr "" -#: optiondialog.cpp:1218 +#: optiondialog.cpp:1266 #, kde-format msgid "Unfold all subdirectories on load" msgstr "" -#: optiondialog.cpp:1222 +#: optiondialog.cpp:1270 #, kde-format msgid "" "On: Unfold all subdirectories when starting a directory diff.\n" "Off: Leave subdirectories folded." msgstr "" -#: optiondialog.cpp:1226 +#: optiondialog.cpp:1274 #, kde-format msgid "Skip directory status report" msgstr "" -#: optiondialog.cpp:1230 +#: optiondialog.cpp:1278 #, kde-format msgid "" "On: Do not show the Directory Comparison Status.\n" "Off: Show the status dialog on start." msgstr "" -#: optiondialog.cpp:1234 +#: optiondialog.cpp:1282 #, kde-format msgid "File Comparison Mode" msgstr "" -#: optiondialog.cpp:1239 +#: optiondialog.cpp:1287 #, kde-format msgid "Binary comparison" msgstr "" -#: optiondialog.cpp:1241 +#: optiondialog.cpp:1289 #, kde-format msgid "Binary comparison of each file. (Default)" msgstr "" -#: optiondialog.cpp:1244 +#: optiondialog.cpp:1292 #, kde-format msgid "Full analysis" msgstr "" -#: optiondialog.cpp:1246 +#: optiondialog.cpp:1294 #, kde-format msgid "" "Do a full analysis and show statistics information in extra columns.\n" "(Slower than a binary comparison, much slower for binary files.)" msgstr "" -#: optiondialog.cpp:1250 +#: optiondialog.cpp:1298 #, kde-format msgid "Trust the size and modification date (unsafe)" msgstr "" -#: optiondialog.cpp:1252 +#: optiondialog.cpp:1300 #, kde-format msgid "" "Assume that files are equal if the modification date and file length are " @@ -2609,14 +2627,14 @@ "Useful for big directories or slow networks." msgstr "" -#: optiondialog.cpp:1257 +#: optiondialog.cpp:1305 #, kde-format msgid "" "Trust the size and date, but use binary comparison if date does not match " "(unsafe)" msgstr "" -#: optiondialog.cpp:1259 +#: optiondialog.cpp:1307 #, kde-format msgid "" "Assume that files are equal if the modification date and file length are " @@ -2625,12 +2643,12 @@ "Useful for big directories or slow networks." msgstr "" -#: optiondialog.cpp:1264 +#: optiondialog.cpp:1312 #, kde-format msgid "Trust the size (unsafe)" msgstr "" -#: optiondialog.cpp:1266 +#: optiondialog.cpp:1314 #, kde-format msgid "" "Assume that files are equal if their file lengths are equal.\n" @@ -2638,12 +2656,12 @@ "download." msgstr "" -#: optiondialog.cpp:1273 +#: optiondialog.cpp:1321 #, kde-format msgid "Synchronize directories" msgstr "" -#: optiondialog.cpp:1277 +#: optiondialog.cpp:1325 #, kde-format msgid "" "Offers to store files in both directories so that\n" @@ -2651,24 +2669,24 @@ "Works only when comparing two directories without specifying a destination." msgstr "" -#: optiondialog.cpp:1283 +#: optiondialog.cpp:1331 #, kde-format msgid "White space differences considered equal" msgstr "" -#: optiondialog.cpp:1287 +#: optiondialog.cpp:1335 #, kde-format msgid "" "If files differ only by white space consider them equal.\n" "This is only active when full analysis is chosen." msgstr "" -#: optiondialog.cpp:1293 +#: optiondialog.cpp:1341 #, kde-format msgid "Copy newer instead of merging (unsafe)" msgstr "" -#: optiondialog.cpp:1297 +#: optiondialog.cpp:1345 #, kde-format msgid "" "Do not look inside, just take the newer file.\n" @@ -2676,46 +2694,46 @@ "Only effective when comparing two directories." msgstr "" -#: optiondialog.cpp:1302 +#: optiondialog.cpp:1350 #, kde-format msgid "Backup files (.orig)" msgstr "" -#: optiondialog.cpp:1306 +#: optiondialog.cpp:1354 #, kde-format msgid "" "If 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 "" -#: optiondialog.cpp:1382 optiondialog.cpp:1383 +#: optiondialog.cpp:1430 optiondialog.cpp:1431 #, kde-format msgid "Regional Settings" msgstr "Kefluniadur rann-vro" -#: optiondialog.cpp:1397 +#: optiondialog.cpp:1454 #, kde-format msgid "Use the same encoding for everything:" msgstr "" -#: optiondialog.cpp:1401 +#: optiondialog.cpp:1458 #, kde-format msgid "" "Enable this allows to change all encodings by changing the first only.\n" "Disable this if different individual settings are needed." msgstr "" -#: optiondialog.cpp:1405 +#: optiondialog.cpp:1462 #, kde-format msgid "Note: Local Encoding is \"%1\"" msgstr "" -#: optiondialog.cpp:1409 +#: optiondialog.cpp:1466 #, kde-format msgid "File Encoding for A:" msgstr "" -#: optiondialog.cpp:1416 +#: optiondialog.cpp:1473 #, kde-format msgid "" "If enabled then Unicode (UTF-16 or UTF-8) encoding will be detected.\n" @@ -2724,32 +2742,32 @@ "(Unicode detection depends on the first bytes of a file.)" msgstr "" -#: optiondialog.cpp:1419 optiondialog.cpp:1430 optiondialog.cpp:1441 +#: optiondialog.cpp:1476 optiondialog.cpp:1487 optiondialog.cpp:1498 #, kde-format msgid "Auto Detect Unicode" msgstr "" -#: optiondialog.cpp:1425 +#: optiondialog.cpp:1482 #, kde-format msgid "File Encoding for B:" msgstr "" -#: optiondialog.cpp:1436 +#: optiondialog.cpp:1493 #, kde-format msgid "File Encoding for C:" msgstr "" -#: optiondialog.cpp:1447 +#: optiondialog.cpp:1504 #, kde-format msgid "File Encoding for Merge Output and Saving:" msgstr "" -#: optiondialog.cpp:1452 +#: optiondialog.cpp:1509 #, kde-format msgid "Auto Select" msgstr "Dibab ent emgefreek" -#: optiondialog.cpp:1456 +#: optiondialog.cpp:1513 #, kde-format msgid "" "If enabled then the encoding from the input files is used.\n" @@ -2757,39 +2775,39 @@ "saving." msgstr "" -#: optiondialog.cpp:1459 +#: optiondialog.cpp:1516 #, kde-format msgid "File Encoding for Preprocessor Files:" msgstr "" -#: optiondialog.cpp:1471 +#: optiondialog.cpp:1528 #, kde-format msgid "Right To Left Language" msgstr "" -#: optiondialog.cpp:1475 +#: optiondialog.cpp:1532 #, kde-format msgid "" "Some languages are read from right to left.\n" "This setting will change the viewer and editor accordingly." msgstr "" -#: optiondialog.cpp:1485 +#: optiondialog.cpp:1542 #, kde-format msgid "Integration" msgstr "" -#: optiondialog.cpp:1486 +#: optiondialog.cpp:1543 #, kde-format msgid "Integration Settings" msgstr "" -#: optiondialog.cpp:1499 +#: optiondialog.cpp:1564 #, kde-format msgid "Command line options to ignore:" msgstr "" -#: optiondialog.cpp:1505 +#: optiondialog.cpp:1570 #, kde-format msgid "" "List of command line options that should be ignored when KDiff3 is used by " @@ -2798,19 +2816,19 @@ "This will suppress the \"Unknown option\" error." msgstr "" -#: optiondialog.cpp:1510 +#: optiondialog.cpp:1575 #, kde-format msgid "Quit also via Escape key" msgstr "" -#: optiondialog.cpp:1514 +#: optiondialog.cpp:1579 #, kde-format msgid "" "Fast method to exit.\n" "For those who are used to using the Escape key." msgstr "" -#: optiondialog.cpp:1598 +#: optiondialog.cpp:1653 #, kde-format msgid "This resets all options. Not only those of the current topic." msgstr "" @@ -2860,77 +2878,68 @@ msgid "Disable Unsafe Options" msgstr "" -#: pdiff.cpp:158 +#: pdiff.cpp:160 #, kde-format msgid "Loading A" msgstr "Emaon o kargañ A" -#: pdiff.cpp:167 -#, kde-format -msgid "Errors occurred during pre-processing of file A." -msgstr "" +#: pdiff.cpp:162 +#, fuzzy, kde-format +#| msgid "Loading A" +msgid "Loading A: %1" +msgstr "Emaon o kargañ A" -#: pdiff.cpp:172 +#: pdiff.cpp:170 #, kde-format msgid "Loading B" msgstr "Emaon o kargañ B" -#: pdiff.cpp:179 -#, kde-format -msgid "Errors occurred during pre-processing of file B." -msgstr "" - -#: pdiff.cpp:202 pdiff.cpp:241 +#: pdiff.cpp:201 pdiff.cpp:237 #, kde-format msgid "Diff: A <-> B" msgstr "" -#: pdiff.cpp:208 pdiff.cpp:279 pdiff.cpp:293 +#: pdiff.cpp:207 pdiff.cpp:275 pdiff.cpp:289 #, kde-format msgid "Linediff: A <-> B" msgstr "" -#: pdiff.cpp:225 +#: pdiff.cpp:224 #, kde-format msgid "Loading C" msgstr "Emaon o kargañ C" -#: pdiff.cpp:232 -#, kde-format -msgid "Errors occurred during pre-processing of file C." -msgstr "" - -#: pdiff.cpp:250 +#: pdiff.cpp:246 #, kde-format msgid "Diff: A <-> C" msgstr "" -#: pdiff.cpp:261 +#: pdiff.cpp:257 #, kde-format msgid "Diff: B <-> C" msgstr "" -#: pdiff.cpp:283 pdiff.cpp:297 +#: pdiff.cpp:279 pdiff.cpp:293 #, kde-format msgid "Linediff: B <-> C" msgstr "" -#: pdiff.cpp:287 pdiff.cpp:301 +#: pdiff.cpp:283 pdiff.cpp:297 #, kde-format msgid "Linediff: A <-> C" msgstr "" -#: pdiff.cpp:829 +#: pdiff.cpp:819 #, kde-format msgid "All input files contain the same text, but are not binary equal." msgstr "" -#: pdiff.cpp:835 pdiff.cpp:839 pdiff.cpp:843 +#: pdiff.cpp:825 pdiff.cpp:829 pdiff.cpp:833 #, kde-format msgid "Files %1 and %2 have equal text, but are not binary equal. \n" msgstr "" -#: pdiff.cpp:853 +#: pdiff.cpp:843 #, kde-format msgid "" "Some input files do not seem to be pure text files.\n" @@ -2938,17 +2947,17 @@ "Continue at your own risk." msgstr "" -#: pdiff.cpp:863 +#: pdiff.cpp:853 #, kde-format msgid ", B" msgstr "" -#: pdiff.cpp:865 +#: pdiff.cpp:855 #, kde-format msgid ", C" msgstr "" -#: pdiff.cpp:867 +#: pdiff.cpp:857 #, kde-format msgid "" "Some input characters could not be converted to valid unicode.\n" @@ -2957,77 +2966,72 @@ "Affected input files are in %1." msgstr "" -#: pdiff.cpp:1034 +#: pdiff.cpp:1032 #, kde-format msgid "Abort" msgstr "Paouez" -#: pdiff.cpp:1040 pdiff.cpp:1130 +#: pdiff.cpp:1038 pdiff.cpp:1129 #, kde-format msgid "Opening files..." msgstr "Emaon o tigeriñ ar restroù ..." -#: pdiff.cpp:1107 -#, kde-format -msgid "File open error" -msgstr "Fazi en ur zigeriñ ar restr" - -#: pdiff.cpp:1202 +#: pdiff.cpp:1212 #, kde-format msgid "Cutting selection..." msgstr "O troc'hañ an dibab ..." -#: pdiff.cpp:1223 +#: pdiff.cpp:1233 #, kde-format msgid "Copying selection to clipboard..." msgstr "Oc'h eilañ an dibab d'ar golver ..." -#: pdiff.cpp:1239 +#: pdiff.cpp:1249 #, kde-format msgid "Inserting clipboard contents..." msgstr "" -#: pdiff.cpp:1695 +#: pdiff.cpp:1705 #, kde-format msgid "Word wrap (Cancel disables word wrap)" msgstr "" -#: pdiff.cpp:1696 +#: pdiff.cpp:1706 #, kde-format msgid "Calculating max width for horizontal scrollbar" msgstr "" -#: pdiff.cpp:1911 +#: pdiff.cpp:1921 #, kde-format msgid "Save && Continue" msgstr "Enrollañ && Kenderc'hel" -#: pdiff.cpp:1912 +#: pdiff.cpp:1922 #, kde-format msgid "Continue Without Saving" msgstr "" -#: pdiff.cpp:2124 +#: pdiff.cpp:2134 #, kde-format msgid "Search complete." msgstr "Echu eo ar glask." -#: pdiff.cpp:2124 +#: pdiff.cpp:2134 #, kde-format msgid "Search Complete" msgstr "" -#: pdiff.cpp:2375 +#: pdiff.cpp:2385 #, kde-format msgid "Nothing is selected in either diff input window." msgstr "" -#: pdiff.cpp:2375 +#: pdiff.cpp:2385 #, kde-format msgid "Error while adding manual diff range" msgstr "" -#: progress.cpp:59 progress.cpp:71 +#: progress.cpp:61 progress.cpp:73 #, kde-format msgid "&Cancel" msgstr "" @@ -3037,189 +3041,189 @@ msgid "A (Base):" msgstr "" -#: smalldialogs.cpp:68 smalldialogs.cpp:85 smalldialogs.cpp:102 -#: smalldialogs.cpp:144 +#: smalldialogs.cpp:71 smalldialogs.cpp:90 smalldialogs.cpp:109 +#: smalldialogs.cpp:154 #, kde-format msgid "File..." msgstr "Restr ..." -#: smalldialogs.cpp:70 smalldialogs.cpp:87 smalldialogs.cpp:104 -#: smalldialogs.cpp:146 +#: smalldialogs.cpp:73 smalldialogs.cpp:92 smalldialogs.cpp:111 +#: smalldialogs.cpp:156 #, kde-format msgid "Dir..." msgstr "Renkell ..." -#: smalldialogs.cpp:96 +#: smalldialogs.cpp:103 #, kde-format msgid "C (Optional):" msgstr "" -#: smalldialogs.cpp:119 +#: smalldialogs.cpp:126 #, kde-format msgid "Swap/Copy Names..." msgstr "" -#: smalldialogs.cpp:124 smalldialogs.cpp:125 smalldialogs.cpp:126 +#: smalldialogs.cpp:131 smalldialogs.cpp:132 smalldialogs.cpp:133 #, kde-format msgid "Swap %1<->%2" msgstr "" -#: smalldialogs.cpp:127 smalldialogs.cpp:128 smalldialogs.cpp:129 +#: smalldialogs.cpp:134 smalldialogs.cpp:135 smalldialogs.cpp:136 #, kde-format msgid "Copy %1->Output" msgstr "" -#: smalldialogs.cpp:130 smalldialogs.cpp:131 smalldialogs.cpp:132 +#: smalldialogs.cpp:137 smalldialogs.cpp:138 smalldialogs.cpp:139 #, kde-format msgid "Swap %1<->Output" msgstr "" -#: smalldialogs.cpp:138 +#: smalldialogs.cpp:148 #, kde-format msgid "Output (optional):" msgstr "" -#: smalldialogs.cpp:168 +#: smalldialogs.cpp:178 #, kde-format msgid "Configure..." msgstr "Kefluniañ ..." -#: smalldialogs.cpp:233 +#: smalldialogs.cpp:243 #, fuzzy, kde-format #| msgid "&Directory" msgid "Open Directory" msgstr "&Renkell" -#: smalldialogs.cpp:234 +#: smalldialogs.cpp:244 #, kde-format msgid "Select Output File" msgstr "" -#: smalldialogs.cpp:393 +#: smalldialogs.cpp:403 #, kde-format msgid "Search text:" msgstr "Skrid klasket :" -#: smalldialogs.cpp:400 +#: smalldialogs.cpp:410 #, kde-format msgid "Case sensitive" msgstr "Evezhiek ouzh ar c'hef" -#: smalldialogs.cpp:403 +#: smalldialogs.cpp:413 #, kde-format msgid "Search A" msgstr "Klask A" -#: smalldialogs.cpp:408 +#: smalldialogs.cpp:418 #, kde-format msgid "Search B" msgstr "Klask B" -#: smalldialogs.cpp:413 +#: smalldialogs.cpp:423 #, kde-format msgid "Search C" msgstr "Klask C" -#: smalldialogs.cpp:418 +#: smalldialogs.cpp:428 #, kde-format msgid "Search output" msgstr "" -#: smalldialogs.cpp:425 +#: smalldialogs.cpp:435 #, kde-format msgid "&Search" msgstr "&Klask" -#: smalldialogs.cpp:444 +#: smalldialogs.cpp:454 #, kde-format msgid "Regular Expression Tester" msgstr "" -#: smalldialogs.cpp:457 +#: smalldialogs.cpp:467 #, kde-format msgid "Example auto merge line:" msgstr "" -#: smalldialogs.cpp:459 +#: smalldialogs.cpp:469 #, kde-format msgid "To test auto merge, copy a line as used in your files." msgstr "" -#: smalldialogs.cpp:465 smalldialogs.cpp:493 smalldialogs.cpp:529 +#: smalldialogs.cpp:475 smalldialogs.cpp:503 smalldialogs.cpp:539 #, kde-format msgid "Match result:" msgstr "" -#: smalldialogs.cpp:484 +#: smalldialogs.cpp:494 #, kde-format msgid "Example history start line (with leading comment):" msgstr "" -#: smalldialogs.cpp:486 +#: smalldialogs.cpp:496 #, kde-format msgid "" "Copy a history start line as used in your files,\n" "including the leading comment." msgstr "" -#: smalldialogs.cpp:512 +#: smalldialogs.cpp:522 #, kde-format msgid "History sort key order:" msgstr "" -#: smalldialogs.cpp:520 +#: smalldialogs.cpp:530 #, kde-format msgid "Example history entry start line (without leading comment):" msgstr "" -#: smalldialogs.cpp:522 +#: smalldialogs.cpp:532 #, kde-format msgid "" "Copy a history entry start line as used in your files,\n" "but omit the leading comment." msgstr "" -#: smalldialogs.cpp:536 +#: smalldialogs.cpp:546 #, kde-format msgid "Sort key result:" msgstr "" -#: smalldialogs.cpp:584 smalldialogs.cpp:594 smalldialogs.cpp:614 +#: smalldialogs.cpp:594 smalldialogs.cpp:604 smalldialogs.cpp:624 #, kde-format msgid "Match success." msgstr "" -#: smalldialogs.cpp:588 smalldialogs.cpp:598 smalldialogs.cpp:620 +#: smalldialogs.cpp:598 smalldialogs.cpp:608 smalldialogs.cpp:630 #, kde-format msgid "Match failed." msgstr "" -#: smalldialogs.cpp:605 +#: smalldialogs.cpp:615 #, kde-format msgid "Opening and closing parentheses do not match in regular expression." msgstr "" -#: SourceData.cpp:150 +#: SourceData.cpp:153 #, kde-format msgid "Writing clipboard data to temp file failed." msgstr "" -#: SourceData.cpp:154 +#: SourceData.cpp:157 #, kde-format msgid "From Clipboard" msgstr "Eus ar golver" -#: SourceData.cpp:335 +#: SourceData.cpp:348 #, kde-format msgid "%1 is not a normal file." msgstr "" -#: SourceData.cpp:427 +#: SourceData.cpp:440 #, kde-format msgid " Temp file is: %1" msgstr "" -#: SourceData.cpp:432 +#: SourceData.cpp:445 #, kde-format msgid "" "Preprocessing possibly failed. Check this command:\n" @@ -3229,12 +3233,12 @@ "The preprocessing command will be disabled now." msgstr "" -#: SourceData.cpp:443 SourceData.cpp:512 +#: SourceData.cpp:456 SourceData.cpp:525 #, kde-format msgid "File %1 too large to process. Skipping." msgstr "" -#: SourceData.cpp:487 +#: SourceData.cpp:500 #, kde-format msgid "" "The line-matching-preprocessing possibly failed. Check this command:\n" diff -Nru kdiff3-1.8.01/po/bs/kdiff3fileitemactionplugin.po kdiff3-1.8.3/po/bs/kdiff3fileitemactionplugin.po --- kdiff3-1.8.01/po/bs/kdiff3fileitemactionplugin.po 2019-05-18 01:01:49.000000000 +0000 +++ kdiff3-1.8.3/po/bs/kdiff3fileitemactionplugin.po 2020-06-25 00:18:05.000000000 +0000 @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: kdiff3fileitemactionplugin.po\n" -"Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2019-03-22 03:09+0100\n" +"Report-Msgid-Bugs-To: https://bugs.kde.org\n" +"POT-Creation-Date: 2019-08-30 07:40+0200\n" "PO-Revision-Date: 2015-02-15 22:44+0000\n" "Last-Translator: Samir Ribić \n" "Language-Team: bs \n" diff -Nru kdiff3-1.8.01/po/bs/kdiff3.po kdiff3-1.8.3/po/bs/kdiff3.po --- kdiff3-1.8.01/po/bs/kdiff3.po 2019-05-18 01:01:49.000000000 +0000 +++ kdiff3-1.8.3/po/bs/kdiff3.po 2020-06-25 00:18:05.000000000 +0000 @@ -1,8 +1,8 @@ msgid "" msgstr "" "Project-Id-Version: kdiff3\n" -"Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2019-04-18 08:02+0200\n" +"Report-Msgid-Bugs-To: https://bugs.kde.org\n" +"POT-Creation-Date: 2020-06-22 07:48+0200\n" "PO-Revision-Date: 2014-10-20 20:22+0000\n" "Last-Translator: Samir Ribić \n" "Language-Team: Bosnian\n" @@ -25,291 +25,291 @@ msgid "Your emails" msgstr "Samir.ribic@etf.unsa.ba,mbabic1@etf.unsa.ba" -#: difftextwindow.cpp:412 +#: difftextwindow.cpp:414 #, kde-format msgid "File %1: Line %2" msgstr "" -#: difftextwindow.cpp:414 +#: difftextwindow.cpp:416 #, fuzzy, kde-format #| msgid "Line not available" msgid "File %1: Line not available" msgstr "Linija nije na raspolaganju" -#: difftextwindow.cpp:1780 +#: difftextwindow.cpp:1778 #, kde-format msgid "Encoding:" msgstr "Kodiranje:" -#: difftextwindow.cpp:1782 mergeresultwindow.cpp:3138 optiondialog.cpp:818 +#: difftextwindow.cpp:1781 mergeresultwindow.cpp:3166 optiondialog.cpp:840 #, kde-format msgid "Line end style:" msgstr "Stil završetka linije:" -#: difftextwindow.cpp:1810 directorymergewindow.cpp:382 -#: directorymergewindow.cpp:433 directorymergewindow.cpp:524 -#: directorymergewindow.cpp:3058 directorymergewindow.cpp:3189 -#: directorymergewindow.cpp:3417 mergeresultwindow.cpp:942 -#: mergeresultwindow.cpp:944 mergeresultwindow.cpp:946 -#: mergeresultwindow.cpp:948 mergeresultwindow.cpp:1814 -#: mergeresultwindow.cpp:3170 mergeresultwindow.cpp:3177 optiondialog.cpp:962 -#: optiondialog.cpp:975 pdiff.cpp:833 pdiff.cpp:835 pdiff.cpp:837 pdiff.cpp:839 -#: pdiff.cpp:861 smalldialogs.cpp:124 smalldialogs.cpp:126 smalldialogs.cpp:127 -#: smalldialogs.cpp:130 +#: difftextwindow.cpp:1809 directorymergewindow.cpp:383 +#: directorymergewindow.cpp:434 directorymergewindow.cpp:525 +#: directorymergewindow.cpp:3072 directorymergewindow.cpp:3203 +#: directorymergewindow.cpp:3431 mergeresultwindow.cpp:970 +#: mergeresultwindow.cpp:972 mergeresultwindow.cpp:974 +#: mergeresultwindow.cpp:976 mergeresultwindow.cpp:1842 +#: mergeresultwindow.cpp:3198 mergeresultwindow.cpp:3205 optiondialog.cpp:1002 +#: optiondialog.cpp:1015 pdiff.cpp:823 pdiff.cpp:825 pdiff.cpp:827 +#: pdiff.cpp:829 pdiff.cpp:851 smalldialogs.cpp:131 smalldialogs.cpp:133 +#: smalldialogs.cpp:134 smalldialogs.cpp:137 #, kde-format msgid "A" msgstr "A" -#: difftextwindow.cpp:1810 directorymergewindow.cpp:384 -#: directorymergewindow.cpp:436 directorymergewindow.cpp:526 -#: directorymergewindow.cpp:3064 directorymergewindow.cpp:3190 -#: directorymergewindow.cpp:3418 mergeresultwindow.cpp:942 -#: mergeresultwindow.cpp:944 mergeresultwindow.cpp:950 -#: mergeresultwindow.cpp:952 mergeresultwindow.cpp:1816 -#: mergeresultwindow.cpp:3172 mergeresultwindow.cpp:3179 optiondialog.cpp:963 -#: optiondialog.cpp:976 pdiff.cpp:833 pdiff.cpp:835 pdiff.cpp:841 pdiff.cpp:843 -#: pdiff.cpp:863 smalldialogs.cpp:124 smalldialogs.cpp:125 smalldialogs.cpp:128 -#: smalldialogs.cpp:131 +#: difftextwindow.cpp:1809 directorymergewindow.cpp:385 +#: directorymergewindow.cpp:437 directorymergewindow.cpp:527 +#: directorymergewindow.cpp:3078 directorymergewindow.cpp:3204 +#: directorymergewindow.cpp:3432 mergeresultwindow.cpp:970 +#: mergeresultwindow.cpp:972 mergeresultwindow.cpp:978 +#: mergeresultwindow.cpp:980 mergeresultwindow.cpp:1844 +#: mergeresultwindow.cpp:3200 mergeresultwindow.cpp:3207 optiondialog.cpp:1003 +#: optiondialog.cpp:1016 pdiff.cpp:823 pdiff.cpp:825 pdiff.cpp:831 +#: pdiff.cpp:833 pdiff.cpp:853 smalldialogs.cpp:131 smalldialogs.cpp:132 +#: smalldialogs.cpp:135 smalldialogs.cpp:138 #, kde-format msgid "B" msgstr "B" -#: difftextwindow.cpp:1810 directorymergewindow.cpp:386 -#: directorymergewindow.cpp:439 directorymergewindow.cpp:528 -#: directorymergewindow.cpp:3070 directorymergewindow.cpp:3191 -#: directorymergewindow.cpp:3419 mergeresultwindow.cpp:946 -#: mergeresultwindow.cpp:948 mergeresultwindow.cpp:950 -#: mergeresultwindow.cpp:952 mergeresultwindow.cpp:1818 -#: mergeresultwindow.cpp:3174 mergeresultwindow.cpp:3181 optiondialog.cpp:977 -#: pdiff.cpp:837 pdiff.cpp:839 pdiff.cpp:841 pdiff.cpp:843 pdiff.cpp:865 -#: smalldialogs.cpp:125 smalldialogs.cpp:126 smalldialogs.cpp:129 -#: smalldialogs.cpp:132 +#: difftextwindow.cpp:1809 directorymergewindow.cpp:387 +#: directorymergewindow.cpp:440 directorymergewindow.cpp:529 +#: directorymergewindow.cpp:3084 directorymergewindow.cpp:3205 +#: directorymergewindow.cpp:3433 mergeresultwindow.cpp:974 +#: mergeresultwindow.cpp:976 mergeresultwindow.cpp:978 +#: mergeresultwindow.cpp:980 mergeresultwindow.cpp:1846 +#: mergeresultwindow.cpp:3202 mergeresultwindow.cpp:3209 optiondialog.cpp:1017 +#: pdiff.cpp:827 pdiff.cpp:829 pdiff.cpp:831 pdiff.cpp:833 pdiff.cpp:855 +#: smalldialogs.cpp:132 smalldialogs.cpp:133 smalldialogs.cpp:136 +#: smalldialogs.cpp:139 #, kde-format msgid "C" msgstr "C" -#: difftextwindow.cpp:1810 +#: difftextwindow.cpp:1809 #, fuzzy, kde-format #| msgid "A (Base):" msgid "A (Base)" msgstr "A (baza):" -#: difftextwindow.cpp:1812 +#: difftextwindow.cpp:1811 #, fuzzy, kde-format #| msgid "Encoding:" msgid "Encoding: %1" msgstr "Kodiranje:" -#: difftextwindow.cpp:1813 mergeresultwindow.cpp:3183 +#: difftextwindow.cpp:1812 mergeresultwindow.cpp:3211 #, kde-format msgid "Unix" msgstr "Unix" -#: difftextwindow.cpp:1813 mergeresultwindow.cpp:3184 +#: difftextwindow.cpp:1812 mergeresultwindow.cpp:3212 #, kde-format msgid "DOS" msgstr "DOS" -#: difftextwindow.cpp:1813 +#: difftextwindow.cpp:1812 #, fuzzy, kde-format #| msgid "Line end style:" msgid "Line end style: %1" msgstr "Stil završetka linije:" -#: difftextwindow.cpp:1835 kdiff3.cpp:873 +#: difftextwindow.cpp:1834 kdiff3.cpp:874 #, kde-format msgid "Top line" msgstr "Gornja linija" -#: difftextwindow.cpp:1845 +#: difftextwindow.cpp:1843 #, kde-format msgid "End" msgstr "Kraj" -#: difftextwindow.cpp:1903 smalldialogs.cpp:235 +#: difftextwindow.cpp:1901 smalldialogs.cpp:245 #, fuzzy, kde-format #| msgid "Opening files..." msgid "Open File" msgstr "Otvaram datoteke..." -#: difftextwindow.cpp:1951 optiondialog.cpp:387 +#: difftextwindow.cpp:1943 optiondialog.cpp:389 #, kde-format msgid "Unicode, 8 bit" msgstr "Unicode, 8-bitni" -#: difftextwindow.cpp:1966 +#: difftextwindow.cpp:1958 #, kde-format msgid "Other" msgstr "" -#: directorymergewindow.cpp:409 directorymergewindow.cpp:3424 +#: directorymergewindow.cpp:410 directorymergewindow.cpp:3438 #, kde-format msgid "Copy A to B" msgstr "Kopiraj A u B" -#: directorymergewindow.cpp:412 directorymergewindow.cpp:3425 +#: directorymergewindow.cpp:413 directorymergewindow.cpp:3439 #, kde-format msgid "Copy B to A" msgstr "Kopiraj B u A" -#: directorymergewindow.cpp:415 directorymergewindow.cpp:3426 +#: directorymergewindow.cpp:416 directorymergewindow.cpp:3440 #, kde-format msgid "Delete A" msgstr "Obriši A" -#: directorymergewindow.cpp:418 directorymergewindow.cpp:3427 +#: directorymergewindow.cpp:419 directorymergewindow.cpp:3441 #, kde-format msgid "Delete B" msgstr "Obriši B" -#: directorymergewindow.cpp:421 +#: directorymergewindow.cpp:422 #, kde-format msgid "Delete A & B" msgstr "Obriši A i B" -#: directorymergewindow.cpp:424 directorymergewindow.cpp:3429 +#: directorymergewindow.cpp:425 directorymergewindow.cpp:3443 #, kde-format msgid "Merge to A" msgstr "Stopi u A" -#: directorymergewindow.cpp:427 directorymergewindow.cpp:3430 +#: directorymergewindow.cpp:428 directorymergewindow.cpp:3444 #, kde-format msgid "Merge to B" msgstr "Stopi u B" -#: directorymergewindow.cpp:430 +#: directorymergewindow.cpp:431 #, kde-format msgid "Merge to A & B" msgstr "Stopi A i B" -#: directorymergewindow.cpp:442 directorymergewindow.cpp:3421 +#: directorymergewindow.cpp:443 directorymergewindow.cpp:3435 #, kde-format msgid "Delete (if exists)" msgstr "Obriši (ako postoji)" -#: directorymergewindow.cpp:445 directorymergewindow.cpp:448 -#: directorymergewindow.cpp:3420 optiondialog.cpp:925 smalldialogs.cpp:113 +#: directorymergewindow.cpp:446 directorymergewindow.cpp:449 +#: directorymergewindow.cpp:3434 smalldialogs.cpp:120 #, kde-format msgid "Merge" msgstr "Stopi" -#: directorymergewindow.cpp:445 directorymergewindow.cpp:448 +#: directorymergewindow.cpp:446 directorymergewindow.cpp:449 #, kde-format msgid "Merge (manual)" msgstr "Stopi (ručno)" -#: directorymergewindow.cpp:451 +#: directorymergewindow.cpp:452 #, kde-format msgid "Error: Conflicting File Types" msgstr "Greška: Sukobljeni tipovi datoteka" -#: directorymergewindow.cpp:454 +#: directorymergewindow.cpp:455 #, kde-format msgid "Error: Changed and Deleted" msgstr "Greška: Promijenjeno i obrisano" -#: directorymergewindow.cpp:457 +#: directorymergewindow.cpp:458 #, kde-format msgid "Error: Dates are equal but files are not." msgstr "Greška: Datumi su jednaki ali datoteke nisu." -#: directorymergewindow.cpp:471 +#: directorymergewindow.cpp:472 #, fuzzy, kde-format #| msgid "Done." msgid "Done" msgstr "Gotovo." -#: directorymergewindow.cpp:473 +#: directorymergewindow.cpp:474 #, kde-format msgid "Error" msgstr "Greška" -#: directorymergewindow.cpp:475 +#: directorymergewindow.cpp:476 #, kde-format msgid "Skipped." msgstr "Preskočeno." -#: directorymergewindow.cpp:477 +#: directorymergewindow.cpp:478 #, kde-format msgid "Not saved." msgstr "Nije snimljeno." -#: directorymergewindow.cpp:479 +#: directorymergewindow.cpp:480 #, kde-format msgid "In progress..." msgstr "U toku..." -#: directorymergewindow.cpp:481 +#: directorymergewindow.cpp:482 #, kde-format msgid "To do." msgstr "Uraditi." -#: directorymergewindow.cpp:522 +#: directorymergewindow.cpp:523 #, kde-format msgid "Name" msgstr "Naziv" -#: directorymergewindow.cpp:530 +#: directorymergewindow.cpp:531 #, kde-format msgid "Operation" msgstr "Operacija" -#: directorymergewindow.cpp:532 +#: directorymergewindow.cpp:533 #, kde-format msgid "Status" msgstr "Status" -#: directorymergewindow.cpp:534 +#: directorymergewindow.cpp:535 #, kde-format msgid "Unsolved" msgstr "Neriješen" -#: directorymergewindow.cpp:536 +#: directorymergewindow.cpp:537 #, kde-format msgid "Solved" msgstr "Riješen" -#: directorymergewindow.cpp:538 +#: directorymergewindow.cpp:539 #, kde-format msgid "Nonwhite" msgstr "Ne-bijelo" -#: directorymergewindow.cpp:540 +#: directorymergewindow.cpp:541 #, kde-format msgid "White" msgstr "Bijelo" -#: directorymergewindow.cpp:674 +#: directorymergewindow.cpp:676 #, kde-format msgid "Unable to compare non-normal file with normal file." msgstr "" -#: directorymergewindow.cpp:688 +#: directorymergewindow.cpp:690 #, kde-format msgid "Mix of links and normal files." msgstr "Mješavina veza i normalnih datoteka." -#: directorymergewindow.cpp:695 +#: directorymergewindow.cpp:697 #, kde-format msgid "Link: " msgstr "Veza: " -#: directorymergewindow.cpp:704 +#: directorymergewindow.cpp:706 #, kde-format msgid "Size. " msgstr "Veličina. " -#: directorymergewindow.cpp:718 directorymergewindow.cpp:728 +#: directorymergewindow.cpp:720 directorymergewindow.cpp:730 #, kde-format msgid "Date & Size: " msgstr "Datum i veličina: " -#: directorymergewindow.cpp:748 +#: directorymergewindow.cpp:751 #, kde-format msgid "Comparing file..." msgstr "Upoređujem datoteku..." -#: directorymergewindow.cpp:801 +#: directorymergewindow.cpp:813 #, kde-format msgid "" "You are currently doing a directory merge. Are you sure, you want to abort " @@ -318,48 +318,48 @@ "Trenutno stapate direktorije. Da li ste sigurni da želite prekinuti stapanje " "i ponovo skenirati direktorij?" -#: directorymergewindow.cpp:802 kdiff3.cpp:698 kdiff3.cpp:708 kdiff3.cpp:720 -#: mergeresultwindow.cpp:372 pdiff.cpp:1033 pdiff.cpp:1910 pdiff.cpp:1920 +#: directorymergewindow.cpp:814 kdiff3.cpp:697 kdiff3.cpp:707 kdiff3.cpp:719 +#: mergeresultwindow.cpp:400 pdiff.cpp:1031 pdiff.cpp:1920 pdiff.cpp:1930 #, kde-format msgid "Warning" msgstr "Upozorenje" -#: directorymergewindow.cpp:803 directorymergewindow.cpp:3393 +#: directorymergewindow.cpp:815 directorymergewindow.cpp:3407 #, kde-format msgid "Rescan" msgstr "Ponovo skeniraj" -#: directorymergewindow.cpp:804 pdiff.cpp:1035 +#: directorymergewindow.cpp:816 pdiff.cpp:1033 #, kde-format msgid "Continue Merging" msgstr "Nastavi stapanje" -#: directorymergewindow.cpp:971 +#: directorymergewindow.cpp:984 #, kde-format msgid "Opening of directories failed:" msgstr "Otvaranje direktorija nije uspjelo:" -#: directorymergewindow.cpp:975 +#: directorymergewindow.cpp:988 #, kde-format msgid "Dir A \"%1\" does not exist or is not a directory.\n" msgstr "Direktorij A \"%1\" ne postoji ili nije direktorij.\n" -#: directorymergewindow.cpp:980 +#: directorymergewindow.cpp:993 #, kde-format msgid "Dir B \"%1\" does not exist or is not a directory.\n" msgstr "Direktorij B \"%1\" ne postoji ili nije direktorij.\n" -#: directorymergewindow.cpp:985 +#: directorymergewindow.cpp:998 #, kde-format msgid "Dir C \"%1\" does not exist or is not a directory.\n" msgstr "Direktorij C \"%1\" ne postoji ili nije direktorij.\n" -#: directorymergewindow.cpp:988 +#: directorymergewindow.cpp:1001 #, kde-format msgid "Directory Open Error" msgstr "Greška pri otvaranju direktorij" -#: directorymergewindow.cpp:996 +#: directorymergewindow.cpp:1009 #, kde-format msgid "" "The destination directory must not be the same as A or B when three " @@ -370,49 +370,49 @@ "direktorija.\n" "Provjerite ponovo prije nego nastavite." -#: directorymergewindow.cpp:998 +#: directorymergewindow.cpp:1011 #, kde-format msgid "Parameter Warning" msgstr "Upozorenje o parametrima" -#: directorymergewindow.cpp:1003 +#: directorymergewindow.cpp:1016 #, kde-format msgid "Scanning directories..." msgstr "Skeniram direktorije..." -#: directorymergewindow.cpp:1029 +#: directorymergewindow.cpp:1042 #, kde-format msgid "Reading Directory A" msgstr "Čitam direktorij A" -#: directorymergewindow.cpp:1038 +#: directorymergewindow.cpp:1051 #, kde-format msgid "Reading Directory B" msgstr "Čitam direktorij B" -#: directorymergewindow.cpp:1048 +#: directorymergewindow.cpp:1061 #, kde-format msgid "Reading Directory C" msgstr "Čitam direktorij C" -#: directorymergewindow.cpp:1064 +#: directorymergewindow.cpp:1077 #, kde-format msgid "Some subdirectories were not readable in" msgstr "Neki poddirektoriji nisu bili čitljivi u" -#: directorymergewindow.cpp:1069 +#: directorymergewindow.cpp:1082 #, kde-format msgid "Check the permissions of the subdirectories." msgstr "Provjerite dozvole poddirektorija." -#: directorymergewindow.cpp:1106 kdiff3.cpp:666 kdiff3.cpp:753 kdiff3.cpp:777 -#: kdiff3.cpp:1065 kdiff3.cpp:1086 pdiff.cpp:1116 pdiff.cpp:1170 pdiff.cpp:1218 -#: pdiff.cpp:1234 pdiff.cpp:1277 pdiff.cpp:1301 +#: directorymergewindow.cpp:1119 kdiff3.cpp:665 kdiff3.cpp:752 kdiff3.cpp:776 +#: kdiff3.cpp:1072 kdiff3.cpp:1093 pdiff.cpp:1115 pdiff.cpp:1178 pdiff.cpp:1228 +#: pdiff.cpp:1244 pdiff.cpp:1287 pdiff.cpp:1311 #, kde-format msgid "Ready." msgstr "Spreman." -#: directorymergewindow.cpp:1121 +#: directorymergewindow.cpp:1134 #, kde-format msgid "" "Directory Comparison Status\n" @@ -422,23 +422,23 @@ "Number of different files: %3" msgstr "" -#: directorymergewindow.cpp:1128 +#: directorymergewindow.cpp:1141 #, fuzzy, kde-format #| msgid "Number of manual merges:" msgid "Number of manual merges: %1" msgstr "Broj ručnih stapanja:" -#: directorymergewindow.cpp:1394 +#: directorymergewindow.cpp:1407 #, kde-format msgid "This affects all merge operations." msgstr "Ovo utiče na sve operacije stapanja." -#: directorymergewindow.cpp:1395 +#: directorymergewindow.cpp:1408 #, kde-format msgid "Changing All Merge Operations" msgstr "Mijenjam sve operacije stapanja" -#: directorymergewindow.cpp:1695 +#: directorymergewindow.cpp:1708 #, fuzzy, kde-format #| msgid "Processing " msgid "" @@ -446,45 +446,45 @@ "%3" msgstr "Obrađujem " -#: directorymergewindow.cpp:1738 directorymergewindow.cpp:1742 +#: directorymergewindow.cpp:1751 directorymergewindow.cpp:1755 #, kde-format msgid "Some files could not be processed." msgstr "" -#: directorymergewindow.cpp:2222 directorymergewindow.cpp:2247 -#: directorymergewindow.cpp:2271 +#: directorymergewindow.cpp:2235 directorymergewindow.cpp:2260 +#: directorymergewindow.cpp:2285 #, kde-format msgid "This operation is currently not possible." msgstr "Ova operacija trenutno nije moguća." -#: directorymergewindow.cpp:2222 directorymergewindow.cpp:2247 -#: directorymergewindow.cpp:2271 directorymergewindow.cpp:2552 +#: directorymergewindow.cpp:2235 directorymergewindow.cpp:2260 +#: directorymergewindow.cpp:2285 directorymergewindow.cpp:2565 #, kde-format msgid "Operation Not Possible" msgstr "Operacija nije moguća" -#: directorymergewindow.cpp:2318 +#: directorymergewindow.cpp:2332 #, fuzzy, kde-format #| msgid "An error occurred while copying.\n" msgid "An error occurred while copying." msgstr "Došlo je do greške u toku kopiranja.\n" -#: directorymergewindow.cpp:2319 directorymergewindow.cpp:2759 +#: directorymergewindow.cpp:2333 directorymergewindow.cpp:2772 #, kde-format msgid "Merge Error" msgstr "Greška stapanja" -#: directorymergewindow.cpp:2396 +#: directorymergewindow.cpp:2410 #, kde-format msgid "Unknown merge operation. (This must never happen!)" msgstr "Nepoznata operacija stapanja. (Ovo nikad ne smije da se desi!)" -#: directorymergewindow.cpp:2441 +#: directorymergewindow.cpp:2455 #, kde-format msgid "Unknown merge operation." msgstr "Nepoznata operacija stapanja." -#: directorymergewindow.cpp:2454 +#: directorymergewindow.cpp:2468 #, kde-format msgid "" "The merge is about to begin.\n" @@ -504,22 +504,22 @@ "Znajte da ovaj program još uvijek ima beta status i nema NIKAKVIH GARANCIJA " "uopšte! Napravite rezervu svojih najvažnijih podataka!" -#: directorymergewindow.cpp:2459 +#: directorymergewindow.cpp:2473 #, kde-format msgid "Starting Merge" msgstr "Počinjem stapanje" -#: directorymergewindow.cpp:2460 +#: directorymergewindow.cpp:2474 #, kde-format msgid "Do It" msgstr "Uradi" -#: directorymergewindow.cpp:2461 +#: directorymergewindow.cpp:2475 #, kde-format msgid "Simulate It" msgstr "Simuliraj" -#: directorymergewindow.cpp:2487 +#: directorymergewindow.cpp:2501 #, kde-format msgid "" "The highlighted item has a different type in the different directories. " @@ -528,7 +528,7 @@ "Istaknuta stavka različitog je tipa u različitim direktorijima. Odaberite " "šta činiti." -#: directorymergewindow.cpp:2491 +#: directorymergewindow.cpp:2505 #, kde-format msgid "" "The modification dates of the file are equal but the files are not. Select " @@ -536,7 +536,7 @@ msgstr "" "Datumi izmjene datoteke su jednaki ali datoteke nisu. Odaberite šta činiti." -#: directorymergewindow.cpp:2495 +#: directorymergewindow.cpp:2509 #, kde-format msgid "" "The highlighted item was changed in one directory and deleted in the other. " @@ -545,7 +545,7 @@ "Označena stavka je promijenjena u jednom folderu i obrisana u drugom. " "Odaberite šta učiniti." -#: directorymergewindow.cpp:2552 +#: directorymergewindow.cpp:2565 #, kde-format msgid "" "This operation is currently not possible because directory merge is " @@ -553,7 +553,7 @@ msgstr "" "Ova operacija trenutno nije moguća zato što je stapanje direktorija u toku." -#: directorymergewindow.cpp:2609 +#: directorymergewindow.cpp:2622 #, kde-format msgid "" "There was an error in the last step.\n" @@ -564,32 +564,32 @@ "Želite li da nastavite sa stavkom koja je izazvala grešku ili želite da je " "preskočite?" -#: directorymergewindow.cpp:2611 +#: directorymergewindow.cpp:2624 #, kde-format msgid "Continue merge after an error" msgstr "Nastavi stapanje poslije greške" -#: directorymergewindow.cpp:2612 +#: directorymergewindow.cpp:2625 #, kde-format msgid "Continue With Last Item" msgstr "Nastavi sa posljednjom stavkom" -#: directorymergewindow.cpp:2613 +#: directorymergewindow.cpp:2626 #, kde-format msgid "Skip Item" msgstr "Preskoči stavku" -#: directorymergewindow.cpp:2709 +#: directorymergewindow.cpp:2722 #, kde-format msgid "Merge operation complete." msgstr "Operacija stapanja je završena." -#: directorymergewindow.cpp:2709 directorymergewindow.cpp:2712 +#: directorymergewindow.cpp:2722 directorymergewindow.cpp:2725 #, kde-format msgid "Merge Complete" msgstr "Stapanje je završeno" -#: directorymergewindow.cpp:2722 +#: directorymergewindow.cpp:2735 #, kde-format msgid "" "Simulated merge complete: Check if you agree with the proposed operations." @@ -597,7 +597,7 @@ "Simulirano stapanje je završeno: Provjerite da li se slažete sa predloženim " "operacijama." -#: directorymergewindow.cpp:2758 +#: directorymergewindow.cpp:2771 #, fuzzy, kde-format #| msgid "An error occurred. Press OK to see detailed information.\n" msgid "An error occurred. Press OK to see detailed information." @@ -605,44 +605,44 @@ "Došlo je do greške. Pritisnite \"U redu\" da biste vidjeli detaljne " "informacije.\n" -#: directorymergewindow.cpp:2791 +#: directorymergewindow.cpp:2804 #, kde-format msgid "Error: While deleting %1: Creating backup failed." msgstr "Greška: U toku brisanja %1: Stvaranje rezerve nije uspjelo." -#: directorymergewindow.cpp:2798 +#: directorymergewindow.cpp:2811 #, kde-format msgid "delete directory recursively( %1 )" msgstr "obriši direktorij rekurzivno( %1 )" -#: directorymergewindow.cpp:2800 +#: directorymergewindow.cpp:2813 #, kde-format msgid "delete( %1 )" msgstr "obriši( %1 )" -#: directorymergewindow.cpp:2815 +#: directorymergewindow.cpp:2828 #, kde-format msgid "Error: delete dir operation failed while trying to read the directory." msgstr "" "Greška: Operacija brisanja direktorija nije uspjela u toku pokušaja da se " "direktorij pročita." -#: directorymergewindow.cpp:2834 +#: directorymergewindow.cpp:2847 #, kde-format msgid "Error: rmdir( %1 ) operation failed." msgstr "Greška: Operacija rmdir( %1 ) nije uspjela." -#: directorymergewindow.cpp:2844 +#: directorymergewindow.cpp:2857 #, kde-format msgid "Error: delete operation failed." msgstr "Greška: Operacija brisanja nije uspjela." -#: directorymergewindow.cpp:2870 +#: directorymergewindow.cpp:2884 #, kde-format msgid "manual merge( %1, %2, %3 -> %4)" msgstr "ručno stapanje( %1, %2, %3 -> %4)" -#: directorymergewindow.cpp:2873 +#: directorymergewindow.cpp:2887 #, kde-format msgid "" " Note: After a manual merge the user should continue by pressing F7." @@ -650,186 +650,186 @@ " Napomena: Poslije ručnog stapanja korisnik bi trebalo da nastavi pomoću " "F7." -#: directorymergewindow.cpp:2900 +#: directorymergewindow.cpp:2914 #, kde-format msgid "Error: copy( %1 -> %2 ) failed.Deleting existing destination failed." msgstr "" "Greška: Kopiranje( %1 -> %2 ) nije uspjelo. Brisanje postojećeg odredišta " "nije uspjelo." -#: directorymergewindow.cpp:2909 +#: directorymergewindow.cpp:2923 #, kde-format msgid "copyLink( %1 -> %2 )" msgstr "kopiranje veze( %1 -> %2 )" -#: directorymergewindow.cpp:2918 +#: directorymergewindow.cpp:2932 #, kde-format msgid "Error: copyLink failed: Remote links are not yet supported." msgstr "" "Greška: Kopiranje veze nije uspjelo: Udaljene veze još uvijek nisu podržane." -#: directorymergewindow.cpp:2928 +#: directorymergewindow.cpp:2942 #, kde-format msgid "Error: copyLink failed." msgstr "Greška: Kopiranje veze nije uspjelo." -#: directorymergewindow.cpp:2953 +#: directorymergewindow.cpp:2967 #, kde-format msgid "copy( %1 -> %2 )" msgstr "kopiraj( %1 -> %2 )" -#: directorymergewindow.cpp:2979 +#: directorymergewindow.cpp:2993 #, kde-format msgid "Error during rename( %1 -> %2 ): Cannot delete existing destination." msgstr "" "Greška u toku preimenovanja( %1 -> %2 ): Ne mogu da obrišem postojeće " "odredište." -#: directorymergewindow.cpp:2986 +#: directorymergewindow.cpp:3000 #, kde-format msgid "rename( %1 -> %2 )" msgstr "preimenuj( %1 -> %2 )" -#: directorymergewindow.cpp:2995 +#: directorymergewindow.cpp:3009 #, kde-format msgid "Error: Rename failed." msgstr "Greška: Preimenovanje nije uspjelo." -#: directorymergewindow.cpp:3013 +#: directorymergewindow.cpp:3027 #, kde-format msgid "Error during makeDir of %1. Cannot delete existing file." msgstr "" "Greška u toku pravljenja direktorija %1. Ne mogu da obrišem postojeću " "datoteku." -#: directorymergewindow.cpp:3030 +#: directorymergewindow.cpp:3044 #, kde-format msgid "makeDir( %1 )" msgstr "napravi direktorij( %1 )" -#: directorymergewindow.cpp:3040 +#: directorymergewindow.cpp:3054 #, kde-format msgid "Error while creating directory." msgstr "Greška u toku stvaranja direktorija." -#: directorymergewindow.cpp:3076 directorymergewindow.cpp:3195 +#: directorymergewindow.cpp:3090 directorymergewindow.cpp:3209 #, kde-format msgid "Dest" msgstr "Odr." -#: directorymergewindow.cpp:3084 directorymergewindow.cpp:3113 +#: directorymergewindow.cpp:3098 directorymergewindow.cpp:3127 #, kde-format msgid "Dir" msgstr "Dir." -#: directorymergewindow.cpp:3084 +#: directorymergewindow.cpp:3098 #, kde-format msgid "Type" msgstr "Tip" -#: directorymergewindow.cpp:3084 +#: directorymergewindow.cpp:3098 #, kde-format msgid "Size" msgstr "Veličina" -#: directorymergewindow.cpp:3085 +#: directorymergewindow.cpp:3099 #, kde-format msgid "Attr" msgstr "Atr." -#: directorymergewindow.cpp:3085 +#: directorymergewindow.cpp:3099 #, kde-format msgid "Last Modification" msgstr "Posljednja izmjena" -#: directorymergewindow.cpp:3085 +#: directorymergewindow.cpp:3099 #, kde-format msgid "Link-Destination" msgstr "Veza-odredište" -#: directorymergewindow.cpp:3113 +#: directorymergewindow.cpp:3127 #, kde-format msgid "File" msgstr "Datoteka" -#: directorymergewindow.cpp:3113 +#: directorymergewindow.cpp:3127 #, fuzzy, kde-format #| msgid "Link: " msgid "-Link" msgstr "Veza: " -#: directorymergewindow.cpp:3119 +#: directorymergewindow.cpp:3133 #, kde-format msgid "not available" msgstr "nije dostupno" -#: directorymergewindow.cpp:3137 +#: directorymergewindow.cpp:3151 #, kde-format msgid "A (Dest): " msgstr "A (odr.): " -#: directorymergewindow.cpp:3141 +#: directorymergewindow.cpp:3155 #, kde-format msgid "A: " msgstr "" -#: directorymergewindow.cpp:3141 +#: directorymergewindow.cpp:3155 #, kde-format msgid "A (Base): " msgstr "A (baza): " -#: directorymergewindow.cpp:3147 +#: directorymergewindow.cpp:3161 #, kde-format msgid "B (Dest): " msgstr "B (odr.): " -#: directorymergewindow.cpp:3151 +#: directorymergewindow.cpp:3165 #, kde-format msgid "B: " msgstr "" -#: directorymergewindow.cpp:3156 +#: directorymergewindow.cpp:3170 #, kde-format msgid "C (Dest): " msgstr "C (odr.): " -#: directorymergewindow.cpp:3160 +#: directorymergewindow.cpp:3174 #, kde-format msgid "C: " msgstr "" -#: directorymergewindow.cpp:3163 +#: directorymergewindow.cpp:3177 #, kde-format msgid "Dest: " msgstr "Odr.: " #. i18n("Saving Directory Merge State ...")); -#: directorymergewindow.cpp:3238 +#: directorymergewindow.cpp:3252 #, kde-format msgid "Save Directory Merge State As..." msgstr "Snimi stanje stapanja direktorija kao..." -#: directorymergewindow.cpp:3387 +#: directorymergewindow.cpp:3401 #, kde-format msgid "Start/Continue Directory Merge" msgstr "Pokreni/nastavi stapanje direktorija" -#: directorymergewindow.cpp:3388 +#: directorymergewindow.cpp:3402 #, kde-format msgid "Run Operation for Current Item" msgstr "Pokreni operaciju za trenutnu stavku" -#: directorymergewindow.cpp:3389 +#: directorymergewindow.cpp:3403 #, kde-format msgid "Compare Selected File" msgstr "Uporedi odabranu datoteku" -#: directorymergewindow.cpp:3390 +#: directorymergewindow.cpp:3404 #, kde-format msgid "Merge Current File" msgstr "Stopi trenutnu datoteku" -#: directorymergewindow.cpp:3390 +#: directorymergewindow.cpp:3404 #, kde-format msgid "" "Merge\n" @@ -838,51 +838,51 @@ "Spoji\n" "Datoteku" -#: directorymergewindow.cpp:3391 +#: directorymergewindow.cpp:3405 #, kde-format msgid "Fold All Subdirs" msgstr "Sažmi sve poddirektorije" -#: directorymergewindow.cpp:3392 +#: directorymergewindow.cpp:3406 #, kde-format msgid "Unfold All Subdirs" msgstr "Raširi sve poddirektorije" #. i18n("Save Directory Merge State ..."), 0, this, &DirectoryMergeWindow::slotSaveMergeState, ac, "dir_save_merge_state"); #. i18n("Load Directory Merge State ..."), 0, this, &DirectoryMergeWindow::slotLoadMergeState, ac, "dir_load_merge_state"); -#: directorymergewindow.cpp:3396 +#: directorymergewindow.cpp:3410 #, kde-format msgid "Choose A for All Items" msgstr "Izaberi A za sve stavke" -#: directorymergewindow.cpp:3397 +#: directorymergewindow.cpp:3411 #, kde-format msgid "Choose B for All Items" msgstr "Izaberi B za sve stavke" -#: directorymergewindow.cpp:3398 +#: directorymergewindow.cpp:3412 #, kde-format msgid "Choose C for All Items" msgstr "Izaberi C za sve stavke" -#: directorymergewindow.cpp:3399 +#: directorymergewindow.cpp:3413 #, kde-format msgid "Auto-Choose Operation for All Items" msgstr "Automatski izaberi operaciju za sve stavke" -#: directorymergewindow.cpp:3400 +#: directorymergewindow.cpp:3414 #, kde-format msgid "No Operation for All Items" msgstr "Nema operacije za sve stavke" #. i18n("Synchronize Directories"), 0, this, &DirectoryMergeWindow::slotSynchronizeDirectories, ac, "dir_synchronize_directories"); #. d->m_pDirChooseNewerFiles = GuiUtils::createAction< KToggleAction >(i18n("Copy Newer Files Instead of Merging"), 0, this, &DirectoryMergeWindow::slotChooseNewerFiles, ac, "dir_choose_newer_files"); -#: directorymergewindow.cpp:3405 +#: directorymergewindow.cpp:3419 #, kde-format msgid "Show Identical Files" msgstr "Prikaži identične datoteke" -#: directorymergewindow.cpp:3405 +#: directorymergewindow.cpp:3419 #, kde-format msgid "" "Identical\n" @@ -891,17 +891,17 @@ "Iste\n" "Datoteke" -#: directorymergewindow.cpp:3406 +#: directorymergewindow.cpp:3420 #, kde-format msgid "Show Different Files" msgstr "Prikaži različite datoteke" -#: directorymergewindow.cpp:3407 +#: directorymergewindow.cpp:3421 #, kde-format msgid "Show Files only in A" msgstr "Prikaži datoteke samo u A" -#: directorymergewindow.cpp:3407 +#: directorymergewindow.cpp:3421 #, kde-format msgid "" "Files\n" @@ -910,12 +910,12 @@ "Datoteke\n" "samo u A" -#: directorymergewindow.cpp:3408 +#: directorymergewindow.cpp:3422 #, kde-format msgid "Show Files only in B" msgstr "Prikaži datoteke samo u B" -#: directorymergewindow.cpp:3408 +#: directorymergewindow.cpp:3422 #, kde-format msgid "" "Files\n" @@ -924,12 +924,12 @@ "Datoteke\n" "samo u B" -#: directorymergewindow.cpp:3409 +#: directorymergewindow.cpp:3423 #, kde-format msgid "Show Files only in C" msgstr "Prikaži datoteke samo u C" -#: directorymergewindow.cpp:3409 +#: directorymergewindow.cpp:3423 #, kde-format msgid "" "Files\n" @@ -938,55 +938,60 @@ "Datoteke\n" "samo u C" -#: directorymergewindow.cpp:3413 +#: directorymergewindow.cpp:3427 #, kde-format msgid "Compare Explicitly Selected Files" msgstr "Uporedi eksplicitno odabrane datoteke" -#: directorymergewindow.cpp:3414 +#: directorymergewindow.cpp:3428 #, kde-format msgid "Merge Explicitly Selected Files" msgstr "Stopi eksplicitno odabrane datoteke" -#: directorymergewindow.cpp:3416 directorymergewindow.cpp:3423 +#: directorymergewindow.cpp:3430 directorymergewindow.cpp:3437 #, kde-format msgid "Do Nothing" msgstr "Ne čini ništa" -#: directorymergewindow.cpp:3428 +#: directorymergewindow.cpp:3442 #, kde-format msgid "Delete A && B" msgstr "Obriši A i B" -#: directorymergewindow.cpp:3431 +#: directorymergewindow.cpp:3445 #, kde-format msgid "Merge to A && B" msgstr "Stopi u A i B" -#: fileaccess.cpp:462 SourceData.cpp:493 +#: fileaccess.cpp:301 +#, kde-format +msgid "Unable to determine full url. No parent specified." +msgstr "" + +#: fileaccess.cpp:482 SourceData.cpp:506 #, fuzzy, kde-format #| msgid "Reading file: %1" msgid "Failed to read file: %1" msgstr "Čitam datoteku: %1" -#: fileaccess.cpp:587 +#: fileaccess.cpp:624 #, kde-format msgid "Creating temp copy of %1 failed." msgstr "Stvaranje privremene kopije datoteke %1 nije uspjelo." -#: fileaccess.cpp:595 fileaccess.cpp:600 +#: fileaccess.cpp:632 fileaccess.cpp:637 #, fuzzy, kde-format #| msgid "Opening %1 failed." msgid "Opening %1 failed. %2" msgstr "Otvaranje datoteke %1 nije uspjelo." -#: fileaccess.cpp:619 fileaccess.cpp:627 +#: fileaccess.cpp:656 fileaccess.cpp:664 #, fuzzy, kde-format #| msgid "Error reading from %1" msgid "Error reading from %1. %2" msgstr "Greška pri čitanju iz %1" -#: fileaccess.cpp:751 +#: fileaccess.cpp:788 #, fuzzy, kde-format #| msgid "" #| "While trying to make a backup, deleting an older backup failed. \n" @@ -999,7 +1004,7 @@ "uspjelo.\n" "Naziv datoteke: " -#: fileaccess.cpp:758 +#: fileaccess.cpp:795 #, fuzzy, kde-format #| msgid "" #| "While trying to make a backup, renaming failed. \n" @@ -1011,178 +1016,178 @@ "U toku pokušaja da se napravi rezerva, preimenovanje nije uspjelo.\n" "Nazivi datoteka: " -#: fileaccess.cpp:828 +#: fileaccess.cpp:865 #, kde-format msgid "Getting file status: %1" msgstr "Dobavljam status datoteke: %1" -#: fileaccess.cpp:869 +#: fileaccess.cpp:906 #, kde-format msgid "Reading file: %1" msgstr "Čitam datoteku: %1" -#: fileaccess.cpp:907 +#: fileaccess.cpp:944 #, kde-format msgid "Writing file: %1" msgstr "Pišem datoteku: %1" -#: fileaccess.cpp:940 +#: fileaccess.cpp:977 #, kde-format msgid "Out of memory" msgstr "Nema memorije" -#: fileaccess.cpp:976 +#: fileaccess.cpp:1013 #, kde-format msgid "Making directory: %1" msgstr "Pravim direktorij: %1" -#: fileaccess.cpp:997 +#: fileaccess.cpp:1034 #, kde-format msgid "Removing directory: %1" msgstr "Uklanjam direktorij: %1" -#: fileaccess.cpp:1012 +#: fileaccess.cpp:1049 #, kde-format msgid "Removing file: %1" msgstr "Uklanjam datoteku: %1" -#: fileaccess.cpp:1028 +#: fileaccess.cpp:1065 #, kde-format msgid "Creating symbolic link: %1 -> %2" msgstr "Stvaram simboličku vezu: %1 -> %2" -#: fileaccess.cpp:1052 +#: fileaccess.cpp:1089 #, kde-format msgid "Renaming file: %1 -> %2" msgstr "Mijenjam naziv datoteke: %1 -> %2" -#: fileaccess.cpp:1086 +#: fileaccess.cpp:1123 #, kde-format msgid "Copying file: %1 -> %2" msgstr "Kopiram datoteku: %1 -> %2" -#: fileaccess.cpp:1108 +#: fileaccess.cpp:1145 #, fuzzy, kde-format #| msgid "Reading directory: " msgid "Reading directory: %1" msgstr "Čitam direktorij: " -#: fileaccess.cpp:1162 +#: fileaccess.cpp:1202 #, kde-format msgid "Listing directory: %1" msgstr "Listam direktorij: %1" -#: kdiff3.cpp:181 +#: kdiff3.cpp:182 #, kde-format msgid "Current Configuration:" msgstr "Trenutna konfiguracija:" -#: kdiff3.cpp:186 +#: kdiff3.cpp:187 #, kde-format msgid "Config Option Error:" msgstr "Greška konfiguracione opcije:" -#: kdiff3.cpp:240 +#: kdiff3.cpp:246 #, kde-format msgid "Option --auto used, but no output file specified." msgstr "Opcija --auto je upotrijebljena, ali nije navedena izlazna datoteka." -#: kdiff3.cpp:416 +#: kdiff3.cpp:405 #, kde-format msgid "Option --auto ignored for directory comparison." msgstr "Opcija --auto se ignoriše za poređenje direktorija." -#: kdiff3.cpp:460 +#: kdiff3.cpp:449 #, kde-format msgid "Saving failed." msgstr "Snimanje nije uspjelo." -#: kdiff3.cpp:496 pdiff.cpp:1098 +#: kdiff3.cpp:494 pdiff.cpp:1096 #, kde-format msgid "Opening of these files failed:" msgstr "Otvaranje ovih datoteka nije uspjelo:" -#: kdiff3.cpp:505 +#: kdiff3.cpp:503 pdiff.cpp:1105 #, kde-format -msgid "File Open Error" +msgid "File open error" msgstr "Greška pri otvaranju datoteke" -#: kdiff3.cpp:533 +#: kdiff3.cpp:532 #, kde-format msgid "Opens documents for comparison..." msgstr "Otvara dokumente za poređenje..." -#: kdiff3.cpp:535 +#: kdiff3.cpp:534 #, kde-format msgid "Reload" msgstr "Osvježi" -#: kdiff3.cpp:538 +#: kdiff3.cpp:537 #, kde-format msgid "Saves the merge result. All conflicts must be solved!" msgstr "Snima rezultat stapanja. Svi sukobi moraju biti riješeni!" -#: kdiff3.cpp:540 +#: kdiff3.cpp:539 #, kde-format msgid "Saves the current document as..." msgstr "Snima trenutne dokumente kao..." -#: kdiff3.cpp:543 +#: kdiff3.cpp:542 #, kde-format msgid "Print the differences" msgstr "Štampaj razlike" -#: kdiff3.cpp:546 +#: kdiff3.cpp:545 #, kde-format msgid "Quits the application" msgstr "Izlazi iz aplikacije" -#: kdiff3.cpp:549 +#: kdiff3.cpp:548 #, kde-format msgid "Cuts the selected section and puts it to the clipboard" msgstr "Isjeca odabrani odjeljak i stavlja ga u clipboard" -#: kdiff3.cpp:552 +#: kdiff3.cpp:551 #, kde-format msgid "Copies the selected section to the clipboard" msgstr "Kopira odabrani odjeljak u clipboard" -#: kdiff3.cpp:554 +#: kdiff3.cpp:553 #, kde-format msgid "Pastes the clipboard contents to current position" msgstr "Zalijepi clipboard sadržaj na trenutnu poziciju" -#: kdiff3.cpp:557 +#: kdiff3.cpp:556 #, kde-format msgid "Select everything in current window" msgstr "Odaberi sve u trenutnom prozoru" -#: kdiff3.cpp:560 +#: kdiff3.cpp:559 #, kde-format msgid "Search for a string" msgstr "Potraži znakovni niz" -#: kdiff3.cpp:562 +#: kdiff3.cpp:561 #, kde-format msgid "Search again for the string" msgstr "Ponovo potraži znakovni niz" -#: kdiff3.cpp:567 +#: kdiff3.cpp:566 #, kde-format msgid "Enables/disables the statusbar" msgstr "Uključuje/isključuje statusnu traku" -#: kdiff3.cpp:571 +#: kdiff3.cpp:570 #, kde-format msgid "Configure KDiff3..." msgstr "Podesi KDiff3..." -#: kdiff3.cpp:590 +#: kdiff3.cpp:589 #, kde-format msgid "Go to Current Delta" msgstr "Idi na trenutnu deltu" -#: kdiff3.cpp:590 +#: kdiff3.cpp:589 #, kde-format msgid "" "Current\n" @@ -1191,12 +1196,12 @@ "Trenutni\n" "Delta" -#: kdiff3.cpp:592 +#: kdiff3.cpp:591 #, kde-format msgid "Go to First Delta" msgstr "Idi na prvu deltu" -#: kdiff3.cpp:592 +#: kdiff3.cpp:591 #, kde-format msgid "" "First\n" @@ -1205,12 +1210,12 @@ "Prva\n" "Delta" -#: kdiff3.cpp:594 +#: kdiff3.cpp:593 #, kde-format msgid "Go to Last Delta" msgstr "Idi na posljednju deltu" -#: kdiff3.cpp:594 +#: kdiff3.cpp:593 #, kde-format msgid "" "Last\n" @@ -1219,14 +1224,14 @@ "Posljednja\n" "Delta" -#: kdiff3.cpp:596 +#: kdiff3.cpp:595 #, kde-format msgid "(Skips white space differences when \"Show White Space\" is disabled.)" msgstr "" "(Preskače razlike u blanko znacima kada je \"Prikaži blanko znake\" " "isključeno.)" -#: kdiff3.cpp:597 +#: kdiff3.cpp:596 #, kde-format msgid "" "(Does not skip white space differences even when \"Show White Space\" is " @@ -1235,12 +1240,12 @@ "(Ne preskače razlike u blanko znacima čak i kada je \"Prikaži blanko znake\" " "isključeno.)" -#: kdiff3.cpp:598 +#: kdiff3.cpp:597 #, kde-format msgid "Go to Previous Delta" msgstr "Idi na prethodnu deltu" -#: kdiff3.cpp:598 +#: kdiff3.cpp:597 #, kde-format msgid "" "Prev\n" @@ -1249,12 +1254,12 @@ "Prethodno\n" "Delta" -#: kdiff3.cpp:600 +#: kdiff3.cpp:599 #, kde-format msgid "Go to Next Delta" msgstr "Idi na slijedeću deltu" -#: kdiff3.cpp:600 +#: kdiff3.cpp:599 #, kde-format msgid "" "Next\n" @@ -1263,12 +1268,12 @@ "Sljedeća\n" "Delta" -#: kdiff3.cpp:602 +#: kdiff3.cpp:601 #, kde-format msgid "Go to Previous Conflict" msgstr "Idi na prethodni sukob" -#: kdiff3.cpp:602 +#: kdiff3.cpp:601 #, kde-format msgid "" "Prev\n" @@ -1277,12 +1282,12 @@ "Prethodni\n" "Konflikt" -#: kdiff3.cpp:604 +#: kdiff3.cpp:603 #, kde-format msgid "Go to Next Conflict" msgstr "Idi na slijedeći sukob" -#: kdiff3.cpp:604 +#: kdiff3.cpp:603 #, kde-format msgid "" "Next\n" @@ -1291,12 +1296,12 @@ "Sljedeći\n" "Konflikt" -#: kdiff3.cpp:606 +#: kdiff3.cpp:605 #, kde-format msgid "Go to Previous Unsolved Conflict" msgstr "Idi na prethodni neriješeni sukob" -#: kdiff3.cpp:606 +#: kdiff3.cpp:605 #, kde-format msgid "" "Prev\n" @@ -1305,12 +1310,12 @@ "Prethodni\n" "Neriješen" -#: kdiff3.cpp:608 +#: kdiff3.cpp:607 #, kde-format msgid "Go to Next Unsolved Conflict" msgstr "Idi na slijedeći neriješeni sukob" -#: kdiff3.cpp:608 +#: kdiff3.cpp:607 #, kde-format msgid "" "Next\n" @@ -1319,12 +1324,12 @@ "Sljedeći\n" "Neriješen" -#: kdiff3.cpp:610 +#: kdiff3.cpp:609 #, kde-format msgid "Select Line(s) From A" msgstr "Odaberite liniju/linije iz A" -#: kdiff3.cpp:610 +#: kdiff3.cpp:609 #, kde-format msgid "" "Choose\n" @@ -1333,12 +1338,12 @@ "Odaberi\n" "A" -#: kdiff3.cpp:611 +#: kdiff3.cpp:610 #, kde-format msgid "Select Line(s) From B" msgstr "Odaberite liniju/linije iz B" -#: kdiff3.cpp:611 +#: kdiff3.cpp:610 #, kde-format msgid "" "Choose\n" @@ -1347,12 +1352,12 @@ "Odaberi\n" "B" -#: kdiff3.cpp:612 +#: kdiff3.cpp:611 #, kde-format msgid "Select Line(s) From C" msgstr "Odaberite liniju/linije iz C" -#: kdiff3.cpp:612 +#: kdiff3.cpp:611 #, kde-format msgid "" "Choose\n" @@ -1361,12 +1366,12 @@ "Odaberi\n" "C" -#: kdiff3.cpp:613 +#: kdiff3.cpp:612 #, kde-format msgid "Automatically Go to Next Unsolved Conflict After Source Selection" msgstr "Automatski idi na slijedeći neriješeni sukob nakon izbora izvora" -#: kdiff3.cpp:613 +#: kdiff3.cpp:612 #, kde-format msgid "" "Auto\n" @@ -1375,13 +1380,13 @@ "Automatski\n" "Sljedeći" -#: kdiff3.cpp:615 +#: kdiff3.cpp:614 #, fuzzy, kde-format #| msgid "Show Space && Tabulator Characters for Differences" msgid "Show Space && Tabulator Characters" msgstr "Prikaži znakove razmaka i tabulatora za razlike" -#: kdiff3.cpp:615 +#: kdiff3.cpp:614 #, kde-format msgid "" "White\n" @@ -1390,12 +1395,12 @@ "Bijeli\n" "Karakteri" -#: kdiff3.cpp:616 +#: kdiff3.cpp:615 #, kde-format msgid "Show White Space" msgstr "Prikaži blanko znak" -#: kdiff3.cpp:616 +#: kdiff3.cpp:615 #, kde-format msgid "" "White\n" @@ -1404,12 +1409,12 @@ "Bijele\n" "Delte" -#: kdiff3.cpp:618 +#: kdiff3.cpp:617 #, kde-format msgid "Show Line Numbers" msgstr "Prikaži brojeve linija" -#: kdiff3.cpp:618 +#: kdiff3.cpp:617 #, kde-format msgid "" "Line\n" @@ -1418,195 +1423,195 @@ "Linijski\n" "Brojevi" -#: kdiff3.cpp:620 +#: kdiff3.cpp:619 #, kde-format msgid "Automatically Solve Simple Conflicts" msgstr "Automatski riješi jednostavne sukobe" -#: kdiff3.cpp:621 +#: kdiff3.cpp:620 #, kde-format msgid "Set Deltas to Conflicts" msgstr "Postavi delte na sukobe" -#: kdiff3.cpp:622 +#: kdiff3.cpp:621 #, kde-format msgid "Run Regular Expression Auto Merge" msgstr "Pokreni auto-stapanje regularnih izraza" -#: kdiff3.cpp:623 +#: kdiff3.cpp:622 #, kde-format msgid "Automatically Solve History Conflicts" msgstr "Automatski riješi sukobe historije" -#: kdiff3.cpp:624 +#: kdiff3.cpp:623 #, kde-format msgid "Split Diff At Selection" msgstr "Razdvoji razlike pri odabiru" -#: kdiff3.cpp:625 +#: kdiff3.cpp:624 #, kde-format msgid "Join Selected Diffs" msgstr "Sjedini odabrane razlike" -#: kdiff3.cpp:627 +#: kdiff3.cpp:626 #, kde-format msgid "Show Window A" msgstr "Prikaži prozor A" -#: kdiff3.cpp:628 +#: kdiff3.cpp:627 #, kde-format msgid "Show Window B" msgstr "Prikaži prozor B" -#: kdiff3.cpp:629 +#: kdiff3.cpp:628 #, kde-format msgid "Show Window C" msgstr "Prikaži prozor C" -#: kdiff3.cpp:631 +#: kdiff3.cpp:630 #, kde-format msgid "Normal Overview" msgstr "Normalan pregled" -#: kdiff3.cpp:632 +#: kdiff3.cpp:631 #, kde-format msgid "A vs. B Overview" msgstr "Pregled A prema B" -#: kdiff3.cpp:633 +#: kdiff3.cpp:632 #, kde-format msgid "A vs. C Overview" msgstr "Pregled A prema C" -#: kdiff3.cpp:634 +#: kdiff3.cpp:633 #, kde-format msgid "B vs. C Overview" msgstr "Pregled B prema C" -#: kdiff3.cpp:635 +#: kdiff3.cpp:634 #, kde-format msgid "Word Wrap Diff Windows" msgstr "Prozori razlika omota riječi" -#: kdiff3.cpp:636 +#: kdiff3.cpp:635 #, kde-format msgid "Add Manual Diff Alignment" msgstr "Dodaj ručno poravnanje razlika" -#: kdiff3.cpp:637 +#: kdiff3.cpp:636 #, kde-format msgid "Clear All Manual Diff Alignments" msgstr "Izbriši sva ručna poravnanja razlika" -#: kdiff3.cpp:639 +#: kdiff3.cpp:638 #, kde-format msgid "Focus Next Window" msgstr "Fokusiraj slijedeći prozor" -#: kdiff3.cpp:640 +#: kdiff3.cpp:639 #, kde-format msgid "Focus Prev Window" msgstr "Fokusiraj prethodni prozor" -#: kdiff3.cpp:641 +#: kdiff3.cpp:640 #, kde-format msgid "Toggle Split Orientation" msgstr "Prebaci orijentaciju razdvajanja" -#: kdiff3.cpp:643 +#: kdiff3.cpp:642 #, kde-format msgid "Dir && Text Split Screen View" msgstr "Podijeljeni prikaz ekrana za dir. i tekst" -#: kdiff3.cpp:645 +#: kdiff3.cpp:644 #, kde-format msgid "Toggle Between Dir && Text View" msgstr "Prebaci između dir. i tekst. prikaza" -#: kdiff3.cpp:697 pdiff.cpp:1909 +#: kdiff3.cpp:696 pdiff.cpp:1919 #, fuzzy, kde-format #| msgid "The merge result hasn't been saved." msgid "The merge result has not been saved." msgstr "Rezultat stapanja nije snimljen." -#: kdiff3.cpp:699 +#: kdiff3.cpp:698 #, kde-format msgid "Save && Quit" msgstr "Snimi i izađi" -#: kdiff3.cpp:700 +#: kdiff3.cpp:699 #, kde-format msgid "Quit Without Saving" msgstr "Izađi bez snimanja" -#: kdiff3.cpp:708 pdiff.cpp:1920 +#: kdiff3.cpp:707 pdiff.cpp:1930 #, kde-format msgid "Saving the merge result failed." msgstr "Snimanje rezultata stapanja nije uspjelo." -#: kdiff3.cpp:719 pdiff.cpp:1032 +#: kdiff3.cpp:718 pdiff.cpp:1030 #, kde-format msgid "" "You are currently doing a directory merge. Are you sure, you want to abort?" msgstr "Trenutno stapate direktorije. Da li ste sigurni da želite prekinuti?" -#: kdiff3.cpp:742 +#: kdiff3.cpp:741 #, kde-format msgid "Saving file..." msgstr "Snimam datoteku..." -#: kdiff3.cpp:759 +#: kdiff3.cpp:758 #, kde-format msgid "Saving file with a new filename..." msgstr "Snimam datoteku pod novim nazivom..." -#: kdiff3.cpp:761 +#: kdiff3.cpp:760 #, kde-format msgid "Save As..." msgstr "Snimi kao..." -#: kdiff3.cpp:820 +#: kdiff3.cpp:819 #, kde-format msgid "Printing not implemented." msgstr "Printanje nije izvršeno." -#: kdiff3.cpp:857 +#: kdiff3.cpp:858 #, kde-format msgid "Printing..." msgstr "Štampam..." -#: kdiff3.cpp:943 +#: kdiff3.cpp:948 #, kde-format msgid "Printing page %1 of %2" msgstr "" -#: kdiff3.cpp:1000 +#: kdiff3.cpp:1006 #, fuzzy, kde-format #| msgid "Selection" msgid " (Selection)" msgstr "Odabir" -#: kdiff3.cpp:1027 +#: kdiff3.cpp:1034 #, kde-format msgid "Printing completed." msgstr "Štampanje završeno." -#: kdiff3.cpp:1031 +#: kdiff3.cpp:1038 #, kde-format msgid "Printing aborted." msgstr "Štampanje prekinuto." -#: kdiff3.cpp:1038 +#: kdiff3.cpp:1045 #, kde-format msgid "Exiting..." msgstr "Izlazim..." -#: kdiff3.cpp:1049 +#: kdiff3.cpp:1056 #, kde-format msgid "Toggling toolbar..." msgstr "Prebacujem traku sa alatom..." -#: kdiff3.cpp:1070 +#: kdiff3.cpp:1077 #, kde-format msgid "Toggle the statusbar..." msgstr "Prebaci statusnu traku..." @@ -1632,7 +1637,7 @@ msgid "Joachim Eibl" msgstr "Joachim Eibl" -#: kdiff3_part.cpp:173 kdiff3_part.cpp:254 +#: kdiff3_part.cpp:174 kdiff3_part.cpp:255 #, fuzzy, kde-format #| msgid "Couldn't find files for comparison." msgid "Could not find files for comparison." @@ -1651,7 +1656,7 @@ msgstr "Podesi KDiff3" #. i18n: ectx: ToolBar (mainToolBar) -#: kdiff3_part.rc:16 main.cpp:88 +#: kdiff3_part.rc:16 main.cpp:89 #, kde-format msgid "KDiff3" msgstr "KDiff3" @@ -1723,84 +1728,90 @@ msgid "Main Toolbar" msgstr "Glavna alatna traka" -#: main.cpp:68 main.cpp:72 +#: main.cpp:69 main.cpp:73 #, kde-format msgid "Ignored. (User defined.)" msgstr "Ignorisano. (Korisnički definisano)." -#: main.cpp:92 +#: main.cpp:93 #, kde-format msgid " (64 bit)" msgstr "" -#: main.cpp:94 +#: main.cpp:95 #, kde-format msgid " (32 bit)" msgstr "" -#: main.cpp:95 +#: main.cpp:96 #, kde-format msgid "Tool for Comparison and Merge of Files and Directories" msgstr "Alat za upoređivanje i stapanje datoteka i direktorija" -#: main.cpp:96 +#: main.cpp:97 #, kde-format msgid "(c) 2002-2014 Joachim Eibl, (c) 2017 Michael Reeves KF5/Qt5 port" msgstr "" -#: main.cpp:112 +#: main.cpp:113 #, kde-format msgid "Merge the input." msgstr "Stopi ulaz." -#: main.cpp:113 +#: main.cpp:114 #, kde-format msgid "Explicit base file. For compatibility with certain tools." msgstr "Eksplicitna bazna datoteka. Za kompatibilnost sa određenim alatima." -#: main.cpp:114 +#: main.cpp:115 #, kde-format msgid "Output file. Implies -m. E.g.: -o newfile.txt" msgstr "Izlazna datoteka. Implicira -m. Npr.: -o newfile.txt" -#: main.cpp:115 +#: main.cpp:116 #, kde-format msgid "Output file, again. (For compatibility with certain tools.)" msgstr "Izlazna datoteka, ponovo. (Za kompatibilnost sa određenim alatima.)" -#: main.cpp:116 +#: main.cpp:118 #, kde-format msgid "No GUI if all conflicts are auto-solvable. (Needs -o file)" msgstr "Bez GUI-ja ako su svi sukobi automatski rješivi. (Zahtjeva -o file)" -#: main.cpp:117 +#: main.cpp:120 +#, fuzzy, kde-format +#| msgid "Ignore" +msgid "Ignored." +msgstr "Ignoriši" + +#: main.cpp:122 #, fuzzy, kde-format #| msgid "Don't solve conflicts automatically. (For compatibility...)" msgid "Do not solve conflicts automatically." msgstr "Ne rješavaj sukobe automatski. (Za kompatibilnost...)" -#: main.cpp:118 +#: main.cpp:123 #, kde-format msgid "Visible name replacement for input file 1 (base)." msgstr "Vidljiva zamjena naziva za ulaznu datoteku 1 (bazna)." -#: main.cpp:119 +#: main.cpp:124 #, kde-format msgid "Visible name replacement for input file 2." msgstr "Vidljiva zamjena naziva za ulaznu datoteku 2." -#: main.cpp:120 +#: main.cpp:125 #, kde-format msgid "Visible name replacement for input file 3." msgstr "Vidljiva zamjena naziva za ulaznu datoteku 3." -#: main.cpp:121 +#: main.cpp:126 #, kde-format msgid "Alternative visible name replacement. Supply this once for every input." msgstr "" "Alternativa vidljivoj zamijeni naziva. Dobavite ovo jednom za svaki ulaz." -#: main.cpp:122 +#: main.cpp:127 #, kde-format msgid "" "Override a config setting. Use once for every setting. E.g.: --cs " @@ -1809,87 +1820,87 @@ "Prespoji postavku konfiguracije. Koristi jednom za svaku postavku. Npr.: --" "cs \"AutoAdvance=1\"" -#: main.cpp:123 +#: main.cpp:128 #, kde-format msgid "Show list of config settings and current values." msgstr "Prikaži listu postavki konfiguracije i trenutnih vrijednosti." -#: main.cpp:124 +#: main.cpp:129 #, kde-format msgid "Use a different config file." msgstr "Koristi drugačiju konfiguracionu datoteku." -#: main.cpp:127 +#: main.cpp:132 #, kde-format msgid "file1 to open (base, if not specified via --base)" msgstr "datoteka 1 za otvaranje (bazna, ako nije naveden preko --base)" -#: main.cpp:128 +#: main.cpp:133 #, kde-format msgid "file2 to open" msgstr "datoteka 2 za otvaranje" -#: main.cpp:129 +#: main.cpp:134 #, kde-format msgid "file3 to open" msgstr "datoteka 3 za otvaranje" -#: main.cpp:153 +#: main.cpp:158 #, kde-format msgid "See kdiff3 --help for supported options." msgstr "" -#: mergeresultwindow.cpp:158 +#: mergeresultwindow.cpp:171 #, kde-format msgid "Choose A Everywhere" msgstr "Svuda izaberi A" -#: mergeresultwindow.cpp:159 +#: mergeresultwindow.cpp:172 #, kde-format msgid "Choose B Everywhere" msgstr "Svuda izaberi B" -#: mergeresultwindow.cpp:160 +#: mergeresultwindow.cpp:173 #, kde-format msgid "Choose C Everywhere" msgstr "Svuda izaberi C" -#: mergeresultwindow.cpp:161 +#: mergeresultwindow.cpp:174 #, kde-format msgid "Choose A for All Unsolved Conflicts" msgstr "Izaberi A za sve neriješene sukobe" -#: mergeresultwindow.cpp:162 +#: mergeresultwindow.cpp:175 #, kde-format msgid "Choose B for All Unsolved Conflicts" msgstr "Izaberi B za sve neriješene sukobe" -#: mergeresultwindow.cpp:163 +#: mergeresultwindow.cpp:176 #, kde-format msgid "Choose C for All Unsolved Conflicts" msgstr "Izaberi C za sve neriješene sukobe" -#: mergeresultwindow.cpp:164 +#: mergeresultwindow.cpp:177 #, kde-format msgid "Choose A for All Unsolved Whitespace Conflicts" msgstr "Izaberi A za sve neriješene sukobe blanko znakova" -#: mergeresultwindow.cpp:165 +#: mergeresultwindow.cpp:178 #, kde-format msgid "Choose B for All Unsolved Whitespace Conflicts" msgstr "Izaberi B za sve neriješene sukobe blanko znakova" -#: mergeresultwindow.cpp:166 +#: mergeresultwindow.cpp:179 #, kde-format msgid "Choose C for All Unsolved Whitespace Conflicts" msgstr "Izaberi C za sve neriješene sukobe blanko znakova" -#: mergeresultwindow.cpp:176 +#: mergeresultwindow.cpp:204 #, kde-format msgid "Number of remaining unsolved conflicts: %1 (of which %2 are whitespace)" msgstr "Broj preostalih neriješenih sukoba: %1 (od kojih su %2 blanko znaci)" -#: mergeresultwindow.cpp:370 +#: mergeresultwindow.cpp:398 #, kde-format msgid "" "The output has been modified.\n" @@ -1898,29 +1909,29 @@ "Izlaz je izmijenjen.\n" "Ako nastavite, vaše izmjene će biti izgubljene." -#: mergeresultwindow.cpp:936 pdiff.cpp:827 +#: mergeresultwindow.cpp:964 pdiff.cpp:817 #, kde-format msgid "All input files are binary equal." msgstr "Sve ulazne datoteke su binarno jednake." -#: mergeresultwindow.cpp:938 +#: mergeresultwindow.cpp:966 #, kde-format msgid "All input files contain the same text." msgstr "Sve ulazne datoteke sadrže isti tekst." -#: mergeresultwindow.cpp:942 mergeresultwindow.cpp:946 -#: mergeresultwindow.cpp:950 pdiff.cpp:833 pdiff.cpp:837 pdiff.cpp:841 +#: mergeresultwindow.cpp:970 mergeresultwindow.cpp:974 +#: mergeresultwindow.cpp:978 pdiff.cpp:823 pdiff.cpp:827 pdiff.cpp:831 #, kde-format msgid "Files %1 and %2 are binary equal.\n" msgstr "Datoteke %1 i %2 su binarno jednake.\n" -#: mergeresultwindow.cpp:944 mergeresultwindow.cpp:948 -#: mergeresultwindow.cpp:952 +#: mergeresultwindow.cpp:972 mergeresultwindow.cpp:976 +#: mergeresultwindow.cpp:980 #, kde-format msgid "Files %1 and %2 have equal text.\n" msgstr "Dokumenti %1 i %2 imaju isti tekst.\n" -#: mergeresultwindow.cpp:958 +#: mergeresultwindow.cpp:986 #, kde-format msgid "" "Total number of conflicts: %1\n" @@ -1929,27 +1940,27 @@ "%4" msgstr "" -#: mergeresultwindow.cpp:964 +#: mergeresultwindow.cpp:992 #, kde-format msgid "Conflicts" msgstr "Sukobi" -#: mergeresultwindow.cpp:1873 +#: mergeresultwindow.cpp:1901 #, kde-format msgid "" msgstr "" -#: mergeresultwindow.cpp:1881 +#: mergeresultwindow.cpp:1909 #, kde-format msgid "" msgstr "" -#: mergeresultwindow.cpp:1883 mergeresultwindow.cpp:2755 +#: mergeresultwindow.cpp:1911 mergeresultwindow.cpp:2783 #, kde-format msgid "" msgstr "" -#: mergeresultwindow.cpp:2967 +#: mergeresultwindow.cpp:2995 #, fuzzy, kde-format #| msgid "" #| "Not all conflicts are solved yet.\n" @@ -1961,12 +1972,12 @@ "Još uvijek nisu riješeni svi sukobi.\n" "Datoteka nije snimljena.\n" -#: mergeresultwindow.cpp:2969 mergeresultwindow.cpp:2978 +#: mergeresultwindow.cpp:2997 mergeresultwindow.cpp:3006 #, kde-format msgid "Conflicts Left" msgstr "Preostali sukobi" -#: mergeresultwindow.cpp:2976 +#: mergeresultwindow.cpp:3004 #, fuzzy, kde-format #| msgid "" #| "There is a line end style conflict. Please choose the line end style " @@ -1981,7 +1992,7 @@ "ručno.\n" "Dokument nije sačuvan.\n" -#: mergeresultwindow.cpp:2990 +#: mergeresultwindow.cpp:3018 #, kde-format msgid "" "\n" @@ -1992,62 +2003,62 @@ "\n" "Stvaranje rezerve nije uspjelo. Datoteka nije snimljena." -#: mergeresultwindow.cpp:2990 mergeresultwindow.cpp:3038 +#: mergeresultwindow.cpp:3018 mergeresultwindow.cpp:3066 #, kde-format msgid "File Save Error" msgstr "Greška u snimanju datoteke" -#: mergeresultwindow.cpp:3038 +#: mergeresultwindow.cpp:3066 #, kde-format msgid "Error while writing." msgstr "Greška prilikom pisanja." -#: mergeresultwindow.cpp:3110 +#: mergeresultwindow.cpp:3138 #, fuzzy, kde-format #| msgid "Output" msgid "Output:" msgstr "Izlaz" -#: mergeresultwindow.cpp:3123 mergeresultwindow.cpp:3315 +#: mergeresultwindow.cpp:3151 mergeresultwindow.cpp:3343 #, kde-format msgid "[Modified]" msgstr "[Izmijenjen]" -#: mergeresultwindow.cpp:3130 +#: mergeresultwindow.cpp:3158 #, fuzzy, kde-format #| msgid "Encoding for saving" msgid "Encoding for saving:" msgstr "Kodiranje za snimanje" -#: mergeresultwindow.cpp:3230 +#: mergeresultwindow.cpp:3258 #, kde-format msgid "Conflict" msgstr "Konflikt" -#: mergeresultwindow.cpp:3262 +#: mergeresultwindow.cpp:3290 #, fuzzy, kde-format #| msgid "Codec from" msgid "Codec from A: %1" msgstr "Codec od" -#: mergeresultwindow.cpp:3264 +#: mergeresultwindow.cpp:3292 #, fuzzy, kde-format #| msgid "Codec from" msgid "Codec from B: %1" msgstr "Codec od" -#: mergeresultwindow.cpp:3266 +#: mergeresultwindow.cpp:3294 #, fuzzy, kde-format #| msgid "Codec from" msgid "Codec from C: %1" msgstr "Codec od" -#: optiondialog.cpp:119 +#: optiondialog.cpp:121 #, kde-format msgid "Change Font" msgstr "" -#: optiondialog.cpp:135 optiondialog.cpp:145 +#: optiondialog.cpp:137 optiondialog.cpp:147 #, kde-format msgid "" "Font: %1, %2, %3\n" @@ -2055,125 +2066,125 @@ "Example:" msgstr "" -#: optiondialog.cpp:388 +#: optiondialog.cpp:390 #, kde-format msgid "Unicode" msgstr "Unicode" -#: optiondialog.cpp:389 +#: optiondialog.cpp:391 #, kde-format msgid "Latin1" msgstr "Latin1" -#: optiondialog.cpp:408 +#: optiondialog.cpp:410 #, kde-format msgid "Change this if non-ASCII characters are not displayed correctly." msgstr "Izmijenite ovo ako se znakovi koji nisu ASCII ne prikazuju ispravno." -#: optiondialog.cpp:491 +#: optiondialog.cpp:495 #, kde-format msgid "Configure" msgstr "Podesi" -#: optiondialog.cpp:568 +#: optiondialog.cpp:573 #, kde-format msgid "Font" msgstr "Font" -#: optiondialog.cpp:570 +#: optiondialog.cpp:575 #, kde-format msgid "Editor & Diff Output Font" msgstr "Font editora i raz. izlaza" -#: optiondialog.cpp:589 +#: optiondialog.cpp:594 #, kde-format msgid "Application font" msgstr "" -#: optiondialog.cpp:594 +#: optiondialog.cpp:599 #, fuzzy, kde-format #| msgid "File Save Error" msgid "File view font" msgstr "Greška u snimanju datoteke" -#: optiondialog.cpp:613 +#: optiondialog.cpp:618 #, fuzzy, kde-format #| msgid "Color" msgctxt "Title for color settings page" msgid "Color" msgstr "Boja" -#: optiondialog.cpp:614 +#: optiondialog.cpp:619 #, kde-format msgid "Colors Settings" msgstr "Postavke boja" -#: optiondialog.cpp:631 +#: optiondialog.cpp:644 #, kde-format msgid "Editor and Diff Views:" msgstr "Prikazi editora i razlika:" -#: optiondialog.cpp:639 +#: optiondialog.cpp:652 #, kde-format msgid "Foreground color:" msgstr "Boja iscrtavanja:" -#: optiondialog.cpp:647 +#: optiondialog.cpp:660 #, kde-format msgid "Background color:" msgstr "Boja pozadine:" -#: optiondialog.cpp:657 +#: optiondialog.cpp:670 #, kde-format msgid "Diff background color:" msgstr "Boja pozadine razlika:" -#: optiondialog.cpp:666 +#: optiondialog.cpp:679 #, kde-format msgid "Color A:" msgstr "Boja A:" -#: optiondialog.cpp:675 +#: optiondialog.cpp:688 #, kde-format msgid "Color B:" msgstr "Boja B:" -#: optiondialog.cpp:684 +#: optiondialog.cpp:697 #, kde-format msgid "Color C:" msgstr "Boja C:" -#: optiondialog.cpp:692 +#: optiondialog.cpp:705 #, kde-format msgid "Conflict color:" msgstr "Boja sukoba:" -#: optiondialog.cpp:701 +#: optiondialog.cpp:714 #, kde-format msgid "Current range background color:" msgstr "Pozadinska boja trenutnog opsega:" -#: optiondialog.cpp:710 +#: optiondialog.cpp:723 #, kde-format msgid "Current range diff background color:" msgstr "Pozadinska boja trenutnog opsega razlika:" -#: optiondialog.cpp:718 +#: optiondialog.cpp:731 #, kde-format msgid "Color for manually aligned difference ranges:" msgstr "Boja za ručno poravnate opsege razlika:" -#: optiondialog.cpp:725 +#: optiondialog.cpp:738 #, kde-format msgid "Directory Comparison View:" msgstr "Prikaz poređenja direktorija:" -#: optiondialog.cpp:731 +#: optiondialog.cpp:744 #, kde-format msgid "Newest file color:" msgstr "Boja najnovije datoteke:" -#: optiondialog.cpp:736 +#: optiondialog.cpp:749 #, kde-format msgid "" "Changing this color will only be effective when starting the next directory " @@ -2182,37 +2193,37 @@ "Izmjena ove boje će biti djelotvorna samo kod pokretanja slijedeće usporedbe " "direktorija." -#: optiondialog.cpp:741 +#: optiondialog.cpp:754 #, kde-format msgid "Oldest file color:" msgstr "Boja najstarije datoteke:" -#: optiondialog.cpp:750 +#: optiondialog.cpp:763 #, kde-format msgid "Middle age file color:" msgstr "Boja srednjovječne datoteke:" -#: optiondialog.cpp:759 +#: optiondialog.cpp:772 #, kde-format msgid "Color for missing files:" msgstr "Boja za nestale datoteke:" -#: optiondialog.cpp:773 +#: optiondialog.cpp:786 #, kde-format msgid "Editor" msgstr "Editor" -#: optiondialog.cpp:774 +#: optiondialog.cpp:787 #, kde-format msgid "Editor Behavior" msgstr "Ponašanje editora" -#: optiondialog.cpp:787 +#: optiondialog.cpp:809 #, kde-format msgid "Tab inserts spaces" msgstr "Tabulator ubacuje razmake" -#: optiondialog.cpp:791 +#: optiondialog.cpp:813 #, kde-format msgid "" "On: Pressing tab generates the appropriate number of spaces.\n" @@ -2221,27 +2232,27 @@ "On: Pritiskom na tab generiše se odgovarajući broj razmaka.\n" "Off: Tab karakter će biti umetnut." -#: optiondialog.cpp:796 +#: optiondialog.cpp:818 #, kde-format msgid "Tab size:" msgstr "Veličina tabulatora:" -#: optiondialog.cpp:803 +#: optiondialog.cpp:825 #, kde-format msgid "Auto indentation" msgstr "Automatsko uvlačenje" -#: optiondialog.cpp:807 +#: optiondialog.cpp:829 #, kde-format msgid "On: The indentation of the previous line is used for a new line.\n" msgstr "Uključeno: Uvlačenje prethodne linije koristi se za novu liniju.\n" -#: optiondialog.cpp:810 +#: optiondialog.cpp:832 #, kde-format msgid "Auto copy selection" msgstr "Automatsko kopiranje izbora" -#: optiondialog.cpp:814 +#: optiondialog.cpp:836 #, fuzzy, kde-format #| msgid "" #| "On: Any selection is immediately written to the clipboard.\n" @@ -2253,7 +2264,7 @@ "Uključeno: Svaki izbor se odmah upisuje u clipboard.\n" "Isključeno: Morate eksplicitno kopirati, nrp. preko Ctrl+C." -#: optiondialog.cpp:829 +#: optiondialog.cpp:851 #, kde-format msgid "" "Sets the line endings for when an edited file is saved.\n" @@ -2262,12 +2273,12 @@ "Postavlja završetke linija kada se izmijenjena datoteka snima.\n" "DOS/Windows: CR+LF; Unix: LF; sa CR=0D, LF=0A" -#: optiondialog.cpp:839 +#: optiondialog.cpp:861 #, kde-format msgid "Diff" msgstr "Diff" -#: optiondialog.cpp:840 +#: optiondialog.cpp:862 #, kde-format msgid "Diff Settings" msgstr "Podešavanja proframa Diff" @@ -2281,13 +2292,13 @@ #. ); #. ++line; #. -#: optiondialog.cpp:865 +#: optiondialog.cpp:896 #, fuzzy, kde-format #| msgid "Treat as white space." msgid "Ignore numbers (treat as white space)" msgstr "Tretirajte kao bijeli prostor." -#: optiondialog.cpp:869 +#: optiondialog.cpp:900 #, kde-format msgid "" "Ignore number characters during line matching phase. (Similar to Ignore " @@ -2298,46 +2309,46 @@ "ignorisanju blanko znakova.)\n" "Može pomoći pri uspoređivanju datoteka sa numeričkim podacima." -#: optiondialog.cpp:873 +#: optiondialog.cpp:904 #, fuzzy, kde-format #| msgid "Treat C/C++ comments like white space." msgid "Ignore C/C++ comments (treat as white space)" msgstr "Tretiraj C/C++ komentare kao blanko znake." -#: optiondialog.cpp:876 +#: optiondialog.cpp:907 #, kde-format msgid "Treat C/C++ comments like white space." msgstr "Tretiraj C/C++ komentare kao blanko znake." -#: optiondialog.cpp:879 +#: optiondialog.cpp:910 #, fuzzy, kde-format #| msgid "Treat as white space." msgid "Ignore case (treat as white space)" msgstr "Tretirajte kao bijeli prostor." -#: optiondialog.cpp:883 +#: optiondialog.cpp:914 #, kde-format msgid "Treat case differences like white space changes. ('a'<=>'A')" msgstr "" "Tretira razliku u veličini slova kao promjene blanko znakova. ('a'<=>'A')" -#: optiondialog.cpp:886 +#: optiondialog.cpp:917 #, kde-format msgid "Preprocessor command:" msgstr "Predobradna naredba:" -#: optiondialog.cpp:891 +#: optiondialog.cpp:922 #, kde-format msgid "User defined pre-processing. (See the docs for details.)" msgstr "" "Korisnički definisana predobrada. (Pogledajte dokumentaciju radi detalja.)" -#: optiondialog.cpp:894 +#: optiondialog.cpp:925 #, kde-format msgid "Line-matching preprocessor command:" msgstr "Predobradna naredba za usklađivanje linija:" -#: optiondialog.cpp:899 +#: optiondialog.cpp:930 #, kde-format msgid "" "This pre-processor is only used during line matching.\n" @@ -2346,12 +2357,12 @@ "Ova predobrada se koristi samo tokom usklađivanja linija.\n" "(Pogledajte dokumentaciju radi detalja.)" -#: optiondialog.cpp:902 +#: optiondialog.cpp:933 #, kde-format msgid "Try hard (slower)" msgstr "Potrudi se (sporije)" -#: optiondialog.cpp:906 +#: optiondialog.cpp:937 #, kde-format msgid "" "Enables the --minimal option for the external diff.\n" @@ -2360,12 +2371,12 @@ "Uključuje opciju --minimal za spoljašnje razlikovanje.\n" "Analiza velikih datoteka će biti mnogo sporija." -#: optiondialog.cpp:910 +#: optiondialog.cpp:941 #, kde-format msgid "Align B and C for 3 input files" msgstr "Poravnaj B i C za 3 ulazna dokumenta" -#: optiondialog.cpp:914 +#: optiondialog.cpp:945 #, kde-format msgid "" "Try to align B and C when comparing or merging three input files.\n" @@ -2377,17 +2388,24 @@ "komplikovanije.\n" "(Zadano je isključeno.)" -#: optiondialog.cpp:926 +#: optiondialog.cpp:956 +#, fuzzy, kde-format +#| msgid "Merge" +msgctxt "Settings page" +msgid "Merge" +msgstr "Stopi" + +#: optiondialog.cpp:957 #, kde-format msgid "Merge Settings" msgstr "Postavke spajanja" -#: optiondialog.cpp:940 +#: optiondialog.cpp:980 #, kde-format msgid "Auto advance delay (ms):" msgstr "Zastoj automatskog napredovanja (ms):" -#: optiondialog.cpp:946 +#: optiondialog.cpp:986 #, kde-format msgid "" "When in Auto-Advance mode the result of the current selection is shown \n" @@ -2396,27 +2414,27 @@ "U režimu automatskog napredovanja rezultat trenutnog izbora prikazuje se \n" "za navedeno vrijeme, prije skoka na slijedeći sukob. Opseg: 0-2000 ms" -#: optiondialog.cpp:950 +#: optiondialog.cpp:990 #, kde-format msgid "Show info dialogs" msgstr "Prikaži informacijske dijaloge" -#: optiondialog.cpp:953 +#: optiondialog.cpp:993 #, kde-format msgid "Show a dialog with information about the number of conflicts." msgstr "Prikaži dijalog sa informacijama o broju konflikata." -#: optiondialog.cpp:956 +#: optiondialog.cpp:996 #, kde-format msgid "White space 2-file merge default:" msgstr "Podrazumjevano stapanje blanko znakova dvije datoteke:" -#: optiondialog.cpp:961 optiondialog.cpp:974 +#: optiondialog.cpp:1001 optiondialog.cpp:1014 #, kde-format msgid "Manual Choice" msgstr "Ručni izbor" -#: optiondialog.cpp:965 optiondialog.cpp:979 +#: optiondialog.cpp:1005 optiondialog.cpp:1019 #, kde-format msgid "" "Allow the merge algorithm to automatically select an input for white-space-" @@ -2425,22 +2443,22 @@ "Dozvoljava algoritmu stapanja da automatski odabere ulaz za izmjene samo u " "blanko znakovima." -#: optiondialog.cpp:969 +#: optiondialog.cpp:1009 #, kde-format msgid "White space 3-file merge default:" msgstr "Podrazumjevano stapanje blanko znakova tri datoteke:" -#: optiondialog.cpp:983 +#: optiondialog.cpp:1023 #, kde-format msgid "Automatic Merge Regular Expression" msgstr "Regularni izraz automatskog stapanja" -#: optiondialog.cpp:991 smalldialogs.cpp:449 +#: optiondialog.cpp:1031 smalldialogs.cpp:459 #, kde-format msgid "Auto merge regular expression:" msgstr "Regularni izraz auto-stapanja:" -#: optiondialog.cpp:996 +#: optiondialog.cpp:1036 #, kde-format msgid "" "Regular expression for lines where KDiff3 should automatically choose one " @@ -2453,12 +2471,12 @@ "Kada linija sa sukobom odgovara regularnom izrazu onda\n" "- ako je dostupan - C, u protivnom će B biti izabran." -#: optiondialog.cpp:1002 +#: optiondialog.cpp:1042 #, kde-format msgid "Run regular expression auto merge on merge start" msgstr "Pokreni auto-stapanje regularnih izraza na početku stapanja" -#: optiondialog.cpp:1005 +#: optiondialog.cpp:1045 #, kde-format msgid "" "Run the merge for auto merge regular expressions\n" @@ -2467,17 +2485,17 @@ "Pokreni stapanje za regularne izraze auto-stapanja\n" "odmah kada stapanje počne.\n" -#: optiondialog.cpp:1010 +#: optiondialog.cpp:1050 #, kde-format msgid "Version Control History Merging" msgstr "Stapanje historije kontrola verzije" -#: optiondialog.cpp:1018 smalldialogs.cpp:476 +#: optiondialog.cpp:1058 smalldialogs.cpp:486 #, kde-format msgid "History start regular expression:" msgstr "Regularni izraz početka historije:" -#: optiondialog.cpp:1023 +#: optiondialog.cpp:1063 #, kde-format msgid "" "Regular expression for the start of the version control history entry.\n" @@ -2488,12 +2506,12 @@ "Obično ova linija sadrži \"$Log$\" ključnu riječ.\n" "Zadana vrijednost: \".*\\$Log.*\\$.*\"" -#: optiondialog.cpp:1029 smalldialogs.cpp:504 +#: optiondialog.cpp:1069 smalldialogs.cpp:514 #, kde-format msgid "History entry start regular expression:" msgstr "Regularni izraz početka zapisa historije:" -#: optiondialog.cpp:1042 +#: optiondialog.cpp:1082 #, kde-format msgid "" "A version control history entry consists of several lines.\n" @@ -2513,22 +2531,22 @@ "zapise historije.\n" "Pogledati dokumentaciju radi detalja." -#: optiondialog.cpp:1050 +#: optiondialog.cpp:1090 #, kde-format msgid "History merge sorting" msgstr "Sortiranje stapanja historije" -#: optiondialog.cpp:1053 +#: optiondialog.cpp:1093 #, kde-format msgid "Sort version control history by a key." msgstr "Sortiraj historiju kontrola verzije pomoću tipke." -#: optiondialog.cpp:1063 +#: optiondialog.cpp:1103 #, kde-format msgid "History entry start sort key order:" msgstr "Poredak tipki za sortiranje početka zapisa historije:" -#: optiondialog.cpp:1068 +#: optiondialog.cpp:1108 #, kde-format msgid "" "Each pair of parentheses used in the regular expression for the history " @@ -2547,38 +2565,38 @@ "Ako je lijevo prazno, onda neće biti sortiranja.\n" "Pogledajte dokumentaciju za detalje." -#: optiondialog.cpp:1079 +#: optiondialog.cpp:1119 #, kde-format msgid "Merge version control history on merge start" msgstr "Stopi historiju kontrola verzije na početku stapanja" -#: optiondialog.cpp:1082 +#: optiondialog.cpp:1122 #, kde-format msgid "Run version control history automerge on merge start." msgstr "Pokreni auto-stapanje historije kontrola verzije na početku stapanja." -#: optiondialog.cpp:1086 +#: optiondialog.cpp:1126 #, kde-format msgid "Max number of history entries:" msgstr "Najveći broj zapisa historije:" -#: optiondialog.cpp:1090 +#: optiondialog.cpp:1130 #, kde-format msgid "Cut off after specified number. Use -1 for infinite number of entries." msgstr "" "Odrežite nakon određenog broja. Koristite -1 za beskonačan broj prijava." -#: optiondialog.cpp:1094 +#: optiondialog.cpp:1134 #, kde-format msgid "Test your regular expressions" msgstr "Testirajte svoje regularne izraze" -#: optiondialog.cpp:1099 +#: optiondialog.cpp:1139 #, kde-format msgid "Irrelevant merge command:" msgstr "Nevažna naredba stapanja:" -#: optiondialog.cpp:1104 +#: optiondialog.cpp:1144 #, kde-format msgid "" "If specified this script is run after automerge\n" @@ -2589,12 +2607,12 @@ "kada nisu ustanovljene nikakve druge važne promjene.\n" "Pozvana parametrima: filename1 filename2 filename3" -#: optiondialog.cpp:1109 +#: optiondialog.cpp:1149 #, kde-format msgid "Auto save and quit on merge without conflicts" msgstr "Automatsko snimanje i izlazak na spajanju bez konflikta" -#: optiondialog.cpp:1113 +#: optiondialog.cpp:1153 #, kde-format msgid "" "If KDiff3 was started for a file-merge from the command line and all\n" @@ -2607,27 +2625,27 @@ "izađi.\n" "(Slično opciji komandne linije \"--auto\".)" -#: optiondialog.cpp:1124 optiondialog.cpp:1125 +#: optiondialog.cpp:1164 optiondialog.cpp:1165 #, kde-format msgid "Directory" msgstr "Direktorij" -#: optiondialog.cpp:1137 +#: optiondialog.cpp:1185 #, kde-format msgid "Recursive directories" msgstr "Rekurzivni direktoriji" -#: optiondialog.cpp:1140 +#: optiondialog.cpp:1188 #, kde-format msgid "Whether to analyze subdirectories or not." msgstr "Bilo da se analiziraju poddirektoriji ili ne." -#: optiondialog.cpp:1142 +#: optiondialog.cpp:1190 #, kde-format msgid "File pattern(s):" msgstr "Uzorak/uzorci datoteka:" -#: optiondialog.cpp:1148 +#: optiondialog.cpp:1196 #, kde-format msgid "" "Pattern(s) of files to be analyzed. \n" @@ -2638,12 +2656,12 @@ "Zamjenski znaci: '*' i '?'\n" "Više uzoraka može biti navedeno upotrebom razdjelnika: ';'" -#: optiondialog.cpp:1153 +#: optiondialog.cpp:1201 #, kde-format msgid "File-anti-pattern(s):" msgstr "Anti-uzorak/uzorci datoteka:" -#: optiondialog.cpp:1159 +#: optiondialog.cpp:1207 #, kde-format msgid "" "Pattern(s) of files to be excluded from analysis. \n" @@ -2654,12 +2672,12 @@ "Zamjenski znaci: '*' i '?'\n" "Više uzoraka može biti navedeno upotrebom razdjelnika: ';'" -#: optiondialog.cpp:1164 +#: optiondialog.cpp:1212 #, kde-format msgid "Dir-anti-pattern(s):" msgstr "Anti-uzorak/uzorci direktorija:" -#: optiondialog.cpp:1170 +#: optiondialog.cpp:1218 #, kde-format msgid "" "Pattern(s) of directories to be excluded from analysis. \n" @@ -2670,12 +2688,12 @@ "Zamjenski znaci: '*' i '?'\n" "Više uzoraka može biti navedeno upotrebom razdjelnika: ';'" -#: optiondialog.cpp:1175 +#: optiondialog.cpp:1223 #, kde-format msgid "Use .cvsignore" msgstr "Koristi datoteku .cvsignore" -#: optiondialog.cpp:1179 +#: optiondialog.cpp:1227 #, kde-format msgid "" "Extends the antipattern to anything that would be ignored by CVS.\n" @@ -2684,23 +2702,23 @@ "Proširuje antipatern na sve što će biti ignorisano od CVS.\n" "Preko lokal \".cvsignore\" dokumenata ovo može biti direktorijski specifično." -#: optiondialog.cpp:1183 +#: optiondialog.cpp:1231 #, kde-format msgid "Find hidden files and directories" msgstr "Pronađi skrivene datoteke i direktorije" -#: optiondialog.cpp:1186 +#: optiondialog.cpp:1234 #, fuzzy, kde-format #| msgid "Find hidden files and directories" msgid "Finds hidden files and directories." msgstr "Pronađi skrivene datoteke i direktorije" -#: optiondialog.cpp:1189 +#: optiondialog.cpp:1237 #, kde-format msgid "Follow file links" msgstr "Prati veze datoteka" -#: optiondialog.cpp:1193 +#: optiondialog.cpp:1241 #, kde-format msgid "" "On: Compare the file the link points to.\n" @@ -2709,12 +2727,12 @@ "Uključeno: Uporedi datoteku na koju pokazuje veza.\n" "Isključeno: Uporedi veze." -#: optiondialog.cpp:1197 +#: optiondialog.cpp:1245 #, kde-format msgid "Follow directory links" msgstr "Prati veze direktorija" -#: optiondialog.cpp:1201 +#: optiondialog.cpp:1249 #, kde-format msgid "" "On: Compare the directory the link points to.\n" @@ -2723,12 +2741,12 @@ "Uključeno: Uporedi direktorij na koji pokazuje veza.\n" "Isključeno: Uporedi veze." -#: optiondialog.cpp:1210 +#: optiondialog.cpp:1258 #, kde-format msgid "Case sensitive filename comparison" msgstr "Poređenje datoteka po nazivu koje razlikuje veličinu slova" -#: optiondialog.cpp:1214 +#: optiondialog.cpp:1262 #, kde-format msgid "" "The directory comparison will compare files or directories when their names " @@ -2741,52 +2759,52 @@ "Postavi ovu opciju ako se veličine slova za nazive moraju podudarati. " "(Podrazumjevano za Windows je isključeno, u protivnom uključeno.)" -#: optiondialog.cpp:1218 +#: optiondialog.cpp:1266 #, fuzzy, kde-format #| msgid "Unfold All Subdirs" msgid "Unfold all subdirectories on load" msgstr "Raširi sve poddirektorije" -#: optiondialog.cpp:1222 +#: optiondialog.cpp:1270 #, kde-format msgid "" "On: Unfold all subdirectories when starting a directory diff.\n" "Off: Leave subdirectories folded." msgstr "" -#: optiondialog.cpp:1226 +#: optiondialog.cpp:1274 #, kde-format msgid "Skip directory status report" msgstr "" -#: optiondialog.cpp:1230 +#: optiondialog.cpp:1278 #, kde-format msgid "" "On: Do not show the Directory Comparison Status.\n" "Off: Show the status dialog on start." msgstr "" -#: optiondialog.cpp:1234 +#: optiondialog.cpp:1282 #, kde-format msgid "File Comparison Mode" msgstr "Režim poređenja datoteka" -#: optiondialog.cpp:1239 +#: optiondialog.cpp:1287 #, kde-format msgid "Binary comparison" msgstr "Binarno poređenje" -#: optiondialog.cpp:1241 +#: optiondialog.cpp:1289 #, kde-format msgid "Binary comparison of each file. (Default)" msgstr "Binarno poređenje za svaku datoteku. (Podrazumjevano)" -#: optiondialog.cpp:1244 +#: optiondialog.cpp:1292 #, kde-format msgid "Full analysis" msgstr "Puna analiza" -#: optiondialog.cpp:1246 +#: optiondialog.cpp:1294 #, kde-format msgid "" "Do a full analysis and show statistics information in extra columns.\n" @@ -2795,12 +2813,12 @@ "Obavi punu analizu i prikaži statističke podatke u dodatnim kolonama.\n" "(Sporije nego binarno poređenje, mnogo sporije za binarne datoteke.)" -#: optiondialog.cpp:1250 +#: optiondialog.cpp:1298 #, kde-format msgid "Trust the size and modification date (unsafe)" msgstr "Čuvaj veličinu i datum promjene (nesigurno)" -#: optiondialog.cpp:1252 +#: optiondialog.cpp:1300 #, kde-format msgid "" "Assume that files are equal if the modification date and file length are " @@ -2815,7 +2833,7 @@ "kao drugačije.\n" "Korisno za velike direktorije ili na sporim mrežama." -#: optiondialog.cpp:1257 +#: optiondialog.cpp:1305 #, kde-format msgid "" "Trust the size and date, but use binary comparison if date does not match " @@ -2824,7 +2842,7 @@ "Čuvaj veličinu i datum, ali koristi binarno poređenje ako datum ne odgovara " "(nesigurno)" -#: optiondialog.cpp:1259 +#: optiondialog.cpp:1307 #, kde-format msgid "" "Assume that files are equal if the modification date and file length are " @@ -2837,12 +2855,12 @@ "Ako datumi nisu jednaki, ali su veličine, koristite binarno poređenje\n" "Korisno za velike direktorije ili na sporim mrežama." -#: optiondialog.cpp:1264 +#: optiondialog.cpp:1312 #, kde-format msgid "Trust the size (unsafe)" msgstr "Čuvaj veličinu (nesigurno)" -#: optiondialog.cpp:1266 +#: optiondialog.cpp:1314 #, kde-format msgid "" "Assume that files are equal if their file lengths are equal.\n" @@ -2853,12 +2871,12 @@ "Korisno za velike direktorije ili spore mreže kada je datum izmijenjen u " "toku preuzimanja." -#: optiondialog.cpp:1273 +#: optiondialog.cpp:1321 #, kde-format msgid "Synchronize directories" msgstr "Sinhronizuj direktorije" -#: optiondialog.cpp:1277 +#: optiondialog.cpp:1325 #, kde-format msgid "" "Offers to store files in both directories so that\n" @@ -2869,12 +2887,12 @@ "da su oba direktorija nakon toga ista.\n" "Radi samo kada se porede dva direktorija bez navođenja odredišta." -#: optiondialog.cpp:1283 +#: optiondialog.cpp:1331 #, kde-format msgid "White space differences considered equal" msgstr "Razlike blanko znakova smatraju se jednakim" -#: optiondialog.cpp:1287 +#: optiondialog.cpp:1335 #, kde-format msgid "" "If files differ only by white space consider them equal.\n" @@ -2883,12 +2901,12 @@ "Ako se datoteke razlikuju samo po blanko znacima, smatraj ih jednakim.\n" "Ovo je aktivno samo kada je odabrana puna analiza." -#: optiondialog.cpp:1293 +#: optiondialog.cpp:1341 #, kde-format msgid "Copy newer instead of merging (unsafe)" msgstr "Kopiraj noviji umjesto stapanja (nesigurno)" -#: optiondialog.cpp:1297 +#: optiondialog.cpp:1345 #, fuzzy, kde-format #| msgid "" #| "Don't look inside, just take the newer file.\n" @@ -2903,12 +2921,12 @@ "(Koristite ovo samo ako znate šta radite!)\n" "Djelotvorno samo kada se porede dva direktorija." -#: optiondialog.cpp:1302 +#: optiondialog.cpp:1350 #, kde-format msgid "Backup files (.orig)" msgstr "Napravi rezerve datoteka (.orig)" -#: optiondialog.cpp:1306 +#: optiondialog.cpp:1354 #, kde-format msgid "" "If a file would be saved over an old file, then the old file\n" @@ -2917,17 +2935,17 @@ "Ako dokument bude snimljen preko starog dokumenta, onda stari dokument\n" "će biti preimenovan sa '.orig' ekstenzijom umjesto da bude izbrisan." -#: optiondialog.cpp:1382 optiondialog.cpp:1383 +#: optiondialog.cpp:1430 optiondialog.cpp:1431 #, kde-format msgid "Regional Settings" msgstr "Regionalne postavke" -#: optiondialog.cpp:1397 +#: optiondialog.cpp:1454 #, kde-format msgid "Use the same encoding for everything:" msgstr "Koristi isto kodiranje za sve:" -#: optiondialog.cpp:1401 +#: optiondialog.cpp:1458 #, kde-format msgid "" "Enable this allows to change all encodings by changing the first only.\n" @@ -2936,18 +2954,18 @@ "Uključivanjem ovog možete promijeniti sva kodiranja promjenom samo prvog.\n" "Isključite ovo ako su potrebne različite zasebne postavke." -#: optiondialog.cpp:1405 +#: optiondialog.cpp:1462 #, fuzzy, kde-format #| msgid "Note: Local Encoding is " msgid "Note: Local Encoding is \"%1\"" msgstr "Napomna: Lokalno kodiranje je " -#: optiondialog.cpp:1409 +#: optiondialog.cpp:1466 #, kde-format msgid "File Encoding for A:" msgstr "Kodiranje datoteke za A:" -#: optiondialog.cpp:1416 +#: optiondialog.cpp:1473 #, kde-format msgid "" "If enabled then Unicode (UTF-16 or UTF-8) encoding will be detected.\n" @@ -2960,32 +2978,32 @@ "rezervno.\n" "(Unicode detekcija ovisi o prvim bajtovima u datoteci.)" -#: optiondialog.cpp:1419 optiondialog.cpp:1430 optiondialog.cpp:1441 +#: optiondialog.cpp:1476 optiondialog.cpp:1487 optiondialog.cpp:1498 #, kde-format msgid "Auto Detect Unicode" msgstr "Automatsko nalaženje Unicode" -#: optiondialog.cpp:1425 +#: optiondialog.cpp:1482 #, kde-format msgid "File Encoding for B:" msgstr "Kodiranje datoteke za B:" -#: optiondialog.cpp:1436 +#: optiondialog.cpp:1493 #, kde-format msgid "File Encoding for C:" msgstr "Kodiranje datoteke za C:" -#: optiondialog.cpp:1447 +#: optiondialog.cpp:1504 #, kde-format msgid "File Encoding for Merge Output and Saving:" msgstr "Kodiranje datoteke za stapanje izlaza i snimanje:" -#: optiondialog.cpp:1452 +#: optiondialog.cpp:1509 #, kde-format msgid "Auto Select" msgstr "Automatski izbor" -#: optiondialog.cpp:1456 +#: optiondialog.cpp:1513 #, kde-format msgid "" "If enabled then the encoding from the input files is used.\n" @@ -2996,17 +3014,17 @@ "U nesigurnim slučajevima dijalog će pitati korisnika za odabir kodiranja za " "snimanje." -#: optiondialog.cpp:1459 +#: optiondialog.cpp:1516 #, kde-format msgid "File Encoding for Preprocessor Files:" msgstr "Kodiranje datoteke za preprocesorke datoteke:" -#: optiondialog.cpp:1471 +#: optiondialog.cpp:1528 #, kde-format msgid "Right To Left Language" msgstr "Jezik s desna na lijevo" -#: optiondialog.cpp:1475 +#: optiondialog.cpp:1532 #, kde-format msgid "" "Some languages are read from right to left.\n" @@ -3015,22 +3033,22 @@ "Neki jezici se čitaju s desna na lijevo.\n" "Ova postavka će prilagoditi tome prikazivač i editor." -#: optiondialog.cpp:1485 +#: optiondialog.cpp:1542 #, kde-format msgid "Integration" msgstr "Uklapanje" -#: optiondialog.cpp:1486 +#: optiondialog.cpp:1543 #, kde-format msgid "Integration Settings" msgstr "Postavke uklapanja" -#: optiondialog.cpp:1499 +#: optiondialog.cpp:1564 #, kde-format msgid "Command line options to ignore:" msgstr "Opcije komandne linije koje treba ignorisati:" -#: optiondialog.cpp:1505 +#: optiondialog.cpp:1570 #, kde-format msgid "" "List of command line options that should be ignored when KDiff3 is used by " @@ -3043,12 +3061,12 @@ "Nekoliko vrijednosti se mogu navesti ukoliko je odvojeno putem ';'\n" "To će suzbiti \"Nepoznati opciju\" pogrešku." -#: optiondialog.cpp:1510 +#: optiondialog.cpp:1575 #, kde-format msgid "Quit also via Escape key" msgstr "Izađi i sa Escape tipkom" -#: optiondialog.cpp:1514 +#: optiondialog.cpp:1579 #, kde-format msgid "" "Fast method to exit.\n" @@ -3057,7 +3075,7 @@ "Brzi način za izlazak.\n" "Za one koji koriste Escape tipku za izlazak." -#: optiondialog.cpp:1598 +#: optiondialog.cpp:1653 #, kde-format msgid "This resets all options. Not only those of the current topic." msgstr "Ovo poništava sve opcije. Ne samo one na trenutnoj temi." @@ -3112,77 +3130,68 @@ msgid "Disable Unsafe Options" msgstr "Isključi nesigurne opcije" -#: pdiff.cpp:158 +#: pdiff.cpp:160 #, kde-format msgid "Loading A" msgstr "Učitavam A" -#: pdiff.cpp:167 -#, kde-format -msgid "Errors occurred during pre-processing of file A." -msgstr "" +#: pdiff.cpp:162 +#, fuzzy, kde-format +#| msgid "Loading A" +msgid "Loading A: %1" +msgstr "Učitavam A" -#: pdiff.cpp:172 +#: pdiff.cpp:170 #, kde-format msgid "Loading B" msgstr "Učitavam B" -#: pdiff.cpp:179 -#, kde-format -msgid "Errors occurred during pre-processing of file B." -msgstr "" - -#: pdiff.cpp:202 pdiff.cpp:241 +#: pdiff.cpp:201 pdiff.cpp:237 #, kde-format msgid "Diff: A <-> B" msgstr "Raz.: A <-> B" -#: pdiff.cpp:208 pdiff.cpp:279 pdiff.cpp:293 +#: pdiff.cpp:207 pdiff.cpp:275 pdiff.cpp:289 #, kde-format msgid "Linediff: A <-> B" msgstr "Raz.lin.: A <-> B" -#: pdiff.cpp:225 +#: pdiff.cpp:224 #, kde-format msgid "Loading C" msgstr "Učitavam C" -#: pdiff.cpp:232 -#, kde-format -msgid "Errors occurred during pre-processing of file C." -msgstr "" - -#: pdiff.cpp:250 +#: pdiff.cpp:246 #, kde-format msgid "Diff: A <-> C" msgstr "Raz.: A <-> C" -#: pdiff.cpp:261 +#: pdiff.cpp:257 #, kde-format msgid "Diff: B <-> C" msgstr "Raz.: B <-> C" -#: pdiff.cpp:283 pdiff.cpp:297 +#: pdiff.cpp:279 pdiff.cpp:293 #, kde-format msgid "Linediff: B <-> C" msgstr "Raz.lin.: B <-> C" -#: pdiff.cpp:287 pdiff.cpp:301 +#: pdiff.cpp:283 pdiff.cpp:297 #, kde-format msgid "Linediff: A <-> C" msgstr "Raz.lin.: A <-> C" -#: pdiff.cpp:829 +#: pdiff.cpp:819 #, kde-format msgid "All input files contain the same text, but are not binary equal." msgstr "Sve ulazne datoteke sadrže isti tekst, ali nisu binarno jednake." -#: pdiff.cpp:835 pdiff.cpp:839 pdiff.cpp:843 +#: pdiff.cpp:825 pdiff.cpp:829 pdiff.cpp:833 #, kde-format msgid "Files %1 and %2 have equal text, but are not binary equal. \n" msgstr "Datoteke %1 i %2 imaju jednak tekst, ali nisu binarno jednake. \n" -#: pdiff.cpp:853 +#: pdiff.cpp:843 #, fuzzy, kde-format #| msgid "" #| "Some inputfiles don't seem to be pure textfiles.\n" @@ -3197,17 +3206,17 @@ "Imajte na umu da KDiff3-stapanje nije namijenjeno binarnim podacima.\n" "Nastavite na sopstveni rizik." -#: pdiff.cpp:863 +#: pdiff.cpp:853 #, kde-format msgid ", B" msgstr "" -#: pdiff.cpp:865 +#: pdiff.cpp:855 #, kde-format msgid ", C" msgstr "" -#: pdiff.cpp:867 +#: pdiff.cpp:857 #, fuzzy, kde-format #| msgid "" #| "Some input characters could not be converted to valid unicode.\n" @@ -3225,77 +3234,72 @@ "Ne snimajte rezltat ako niste sigurni. Nastavite na svoj rizik.\n" "Zahvaćeni ulazni dokumenti su u %1." -#: pdiff.cpp:1034 +#: pdiff.cpp:1032 #, kde-format msgid "Abort" msgstr "Prekini" -#: pdiff.cpp:1040 pdiff.cpp:1130 +#: pdiff.cpp:1038 pdiff.cpp:1129 #, kde-format msgid "Opening files..." msgstr "Otvaram datoteke..." -#: pdiff.cpp:1107 -#, kde-format -msgid "File open error" -msgstr "Greška pri otvaranju datoteke" - -#: pdiff.cpp:1202 +#: pdiff.cpp:1212 #, kde-format msgid "Cutting selection..." msgstr "Isjecam odabrano..." -#: pdiff.cpp:1223 +#: pdiff.cpp:1233 #, kde-format msgid "Copying selection to clipboard..." msgstr "Kopiram odabrano u clipboard..." -#: pdiff.cpp:1239 +#: pdiff.cpp:1249 #, kde-format msgid "Inserting clipboard contents..." msgstr "Ubacujem sadržaje clipboarda..." -#: pdiff.cpp:1695 +#: pdiff.cpp:1705 #, kde-format msgid "Word wrap (Cancel disables word wrap)" msgstr "" -#: pdiff.cpp:1696 +#: pdiff.cpp:1706 #, kde-format msgid "Calculating max width for horizontal scrollbar" msgstr "" -#: pdiff.cpp:1911 +#: pdiff.cpp:1921 #, kde-format msgid "Save && Continue" msgstr "Snimi i nastavi" -#: pdiff.cpp:1912 +#: pdiff.cpp:1922 #, kde-format msgid "Continue Without Saving" msgstr "Nastavi bez snimanja" -#: pdiff.cpp:2124 +#: pdiff.cpp:2134 #, kde-format msgid "Search complete." msgstr "Pretraga je završena." -#: pdiff.cpp:2124 +#: pdiff.cpp:2134 #, kde-format msgid "Search Complete" msgstr "Pretraga je gotova" -#: pdiff.cpp:2375 +#: pdiff.cpp:2385 #, kde-format msgid "Nothing is selected in either diff input window." msgstr "Ništa nije odabrano niti u jednom ulaznom prozoru razlika." -#: pdiff.cpp:2375 +#: pdiff.cpp:2385 #, kde-format msgid "Error while adding manual diff range" msgstr "Greška u toku dodavanja ručnog opsega razlika" -#: progress.cpp:59 progress.cpp:71 +#: progress.cpp:61 progress.cpp:73 #, kde-format msgid "&Cancel" msgstr "&Odustani" @@ -3305,127 +3309,127 @@ msgid "A (Base):" msgstr "A (baza):" -#: smalldialogs.cpp:68 smalldialogs.cpp:85 smalldialogs.cpp:102 -#: smalldialogs.cpp:144 +#: smalldialogs.cpp:71 smalldialogs.cpp:90 smalldialogs.cpp:109 +#: smalldialogs.cpp:154 #, kde-format msgid "File..." msgstr "Datoteka..." -#: smalldialogs.cpp:70 smalldialogs.cpp:87 smalldialogs.cpp:104 -#: smalldialogs.cpp:146 +#: smalldialogs.cpp:73 smalldialogs.cpp:92 smalldialogs.cpp:111 +#: smalldialogs.cpp:156 #, kde-format msgid "Dir..." msgstr "Dir..." -#: smalldialogs.cpp:96 +#: smalldialogs.cpp:103 #, kde-format msgid "C (Optional):" msgstr "C (opcionalno):" -#: smalldialogs.cpp:119 +#: smalldialogs.cpp:126 #, fuzzy, kde-format #| msgid "Swap/Copy Names ..." msgid "Swap/Copy Names..." msgstr "Razmijeni/Kopiraj nazive ..." -#: smalldialogs.cpp:124 smalldialogs.cpp:125 smalldialogs.cpp:126 +#: smalldialogs.cpp:131 smalldialogs.cpp:132 smalldialogs.cpp:133 #, kde-format msgid "Swap %1<->%2" msgstr "Razmijeni %1<->%2" -#: smalldialogs.cpp:127 smalldialogs.cpp:128 smalldialogs.cpp:129 +#: smalldialogs.cpp:134 smalldialogs.cpp:135 smalldialogs.cpp:136 #, kde-format msgid "Copy %1->Output" msgstr "Kopiraj %1->Izlaz" -#: smalldialogs.cpp:130 smalldialogs.cpp:131 smalldialogs.cpp:132 +#: smalldialogs.cpp:137 smalldialogs.cpp:138 smalldialogs.cpp:139 #, kde-format msgid "Swap %1<->Output" msgstr "Razmijeni %1<->Izlaz" -#: smalldialogs.cpp:138 +#: smalldialogs.cpp:148 #, kde-format msgid "Output (optional):" msgstr "Izlaz (opcionalno):" -#: smalldialogs.cpp:168 +#: smalldialogs.cpp:178 #, kde-format msgid "Configure..." msgstr "Podesi..." -#: smalldialogs.cpp:233 +#: smalldialogs.cpp:243 #, fuzzy, kde-format #| msgid "Directory" msgid "Open Directory" msgstr "Direktorij" -#: smalldialogs.cpp:234 +#: smalldialogs.cpp:244 #, kde-format msgid "Select Output File" msgstr "" -#: smalldialogs.cpp:393 +#: smalldialogs.cpp:403 #, kde-format msgid "Search text:" msgstr "Tekst za pretragu:" -#: smalldialogs.cpp:400 +#: smalldialogs.cpp:410 #, kde-format msgid "Case sensitive" msgstr "Razlikuje veličinu slova" -#: smalldialogs.cpp:403 +#: smalldialogs.cpp:413 #, kde-format msgid "Search A" msgstr "Pretraži A" -#: smalldialogs.cpp:408 +#: smalldialogs.cpp:418 #, kde-format msgid "Search B" msgstr "Pretraži B" -#: smalldialogs.cpp:413 +#: smalldialogs.cpp:423 #, kde-format msgid "Search C" msgstr "Pretraži C" -#: smalldialogs.cpp:418 +#: smalldialogs.cpp:428 #, kde-format msgid "Search output" msgstr "Izlaz pretrage" -#: smalldialogs.cpp:425 +#: smalldialogs.cpp:435 #, kde-format msgid "&Search" msgstr "&Traži" -#: smalldialogs.cpp:444 +#: smalldialogs.cpp:454 #, kde-format msgid "Regular Expression Tester" msgstr "Ispitivač regularnih izraza" -#: smalldialogs.cpp:457 +#: smalldialogs.cpp:467 #, kde-format msgid "Example auto merge line:" msgstr "Primjer linije auto-stapanja:" -#: smalldialogs.cpp:459 +#: smalldialogs.cpp:469 #, kde-format msgid "To test auto merge, copy a line as used in your files." msgstr "" "Za test automatskog spajanja, kopirajte liniju kako je korištena u dokumentu." -#: smalldialogs.cpp:465 smalldialogs.cpp:493 smalldialogs.cpp:529 +#: smalldialogs.cpp:475 smalldialogs.cpp:503 smalldialogs.cpp:539 #, kde-format msgid "Match result:" msgstr "Rezultat usklađivanja:" -#: smalldialogs.cpp:484 +#: smalldialogs.cpp:494 #, kde-format msgid "Example history start line (with leading comment):" msgstr "Primjer početne linije historije (sa glavnim komentarom):" -#: smalldialogs.cpp:486 +#: smalldialogs.cpp:496 #, kde-format msgid "" "Copy a history start line as used in your files,\n" @@ -3435,17 +3439,17 @@ "datotekama,\n" "uključujući glavni komentar." -#: smalldialogs.cpp:512 +#: smalldialogs.cpp:522 #, kde-format msgid "History sort key order:" msgstr "Poredak tipki za sortiranje historije:" -#: smalldialogs.cpp:520 +#: smalldialogs.cpp:530 #, kde-format msgid "Example history entry start line (without leading comment):" msgstr "Primjer početne linije zapisa historije (bez glavnog komentara):" -#: smalldialogs.cpp:522 +#: smalldialogs.cpp:532 #, kde-format msgid "" "Copy a history entry start line as used in your files,\n" @@ -3455,48 +3459,48 @@ "datotekama,\n" "ali izostavite glavni komentar." -#: smalldialogs.cpp:536 +#: smalldialogs.cpp:546 #, kde-format msgid "Sort key result:" msgstr "Rezultat tipki za sortiranje:" -#: smalldialogs.cpp:584 smalldialogs.cpp:594 smalldialogs.cpp:614 +#: smalldialogs.cpp:594 smalldialogs.cpp:604 smalldialogs.cpp:624 #, kde-format msgid "Match success." msgstr "Usklađivanje uspjelo." -#: smalldialogs.cpp:588 smalldialogs.cpp:598 smalldialogs.cpp:620 +#: smalldialogs.cpp:598 smalldialogs.cpp:608 smalldialogs.cpp:630 #, kde-format msgid "Match failed." msgstr "Usklađivanje nije uspjelo." -#: smalldialogs.cpp:605 +#: smalldialogs.cpp:615 #, kde-format msgid "Opening and closing parentheses do not match in regular expression." msgstr "Otvarajuća i zatvarajuća zagrada se ne podudaraju u regularnom izrazu." -#: SourceData.cpp:150 +#: SourceData.cpp:153 #, kde-format msgid "Writing clipboard data to temp file failed." msgstr "Upisivanje podataka iz clipboarda u privremenu datoteku nije uspjelo." -#: SourceData.cpp:154 +#: SourceData.cpp:157 #, kde-format msgid "From Clipboard" msgstr "Iz clipboarda" -#: SourceData.cpp:335 +#: SourceData.cpp:348 #, fuzzy, kde-format #| msgid "Mix of links and normal files." msgid "%1 is not a normal file." msgstr "Mješavina veza i normalnih datoteka." -#: SourceData.cpp:427 +#: SourceData.cpp:440 #, kde-format msgid " Temp file is: %1" msgstr "" -#: SourceData.cpp:432 +#: SourceData.cpp:445 #, kde-format msgid "" "Preprocessing possibly failed. Check this command:\n" @@ -3511,12 +3515,12 @@ "\n" "Naredba predobrade će sada biti isključena." -#: SourceData.cpp:443 SourceData.cpp:512 +#: SourceData.cpp:456 SourceData.cpp:525 #, kde-format msgid "File %1 too large to process. Skipping." msgstr "" -#: SourceData.cpp:487 +#: SourceData.cpp:500 #, kde-format msgid "" "The line-matching-preprocessing possibly failed. Check this command:\n" diff -Nru kdiff3-1.8.01/po/ca/diff_ext.po kdiff3-1.8.3/po/ca/diff_ext.po --- kdiff3-1.8.01/po/ca/diff_ext.po 2019-05-18 01:01:50.000000000 +0000 +++ kdiff3-1.8.3/po/ca/diff_ext.po 2020-06-25 00:18:07.000000000 +0000 @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: diff_ext\n" -"Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2019-03-22 03:09+0100\n" +"Report-Msgid-Bugs-To: https://bugs.kde.org\n" +"POT-Creation-Date: 2019-11-04 07:54+0100\n" "PO-Revision-Date: 2018-08-06 11:49+0100\n" "Last-Translator: Josep Ma. Ferrer \n" "Language-Team: Catalan \n" @@ -19,121 +19,116 @@ "Plural-Forms: nplurals=2; plural=n != 1;\n" "X-Generator: Lokalize 2.0\n" -#: diff_ext.cpp:391 +#: diff_ext.cpp:223 #, kde-format msgid "Compare with %1" msgstr "Compara amb %1" -#: diff_ext.cpp:392 +#: diff_ext.cpp:224 #, kde-format msgid "Merge with %1" msgstr "Fusiona amb %1" -#: diff_ext.cpp:408 +#: diff_ext.cpp:234 #, kde-format msgid "3-way merge with base" msgstr "Fusió a tres bandes amb la base" -#: diff_ext.cpp:411 +#: diff_ext.cpp:237 #, kde-format msgid "Save '%1' for later" msgstr "Desa «%1» per després" -#: diff_ext.cpp:426 +#: diff_ext.cpp:251 #, kde-format msgid "Compare with ..." msgstr "Compara amb..." -#: diff_ext.cpp:429 +#: diff_ext.cpp:254 #, kde-format msgid "Clear list" msgstr "Neteja la llista" -#: diff_ext.cpp:434 +#: diff_ext.cpp:259 #, kde-format msgid "Compare" msgstr "Compara" -#: diff_ext.cpp:438 +#: diff_ext.cpp:263 #, kde-format msgid "3 way comparison" msgstr "Comparació a 3 bandes" -#: diff_ext.cpp:444 +#: diff_ext.cpp:269 #, kde-format msgid "About Diff-Ext ..." msgstr "Quant al Diff-Ext..." -#: diff_ext.cpp:515 +#: diff_ext.cpp:340 #, kde-format msgid "(32 Bit)" msgstr "(32 bits)" -#: diff_ext.cpp:517 -#, kde-format -msgid "(64 Bit)" -msgstr "(64 bits)" - -#: diff_ext.cpp:518 +#: diff_ext.cpp:342 #, kde-format msgid "Diff-Ext Copyright (c) 2003-2006, Sergey Zorin. All rights reserved.\n" msgstr "" "Diff-Ext Copyright (c) 2003-2006, Sergey Zorin. Tots els drets reservats.\n" -#: diff_ext.cpp:519 +#: diff_ext.cpp:343 #, kde-format msgid "This software is distributable under the BSD-2-Clause license.\n" msgstr "" "Aquest programari és pot distribuir sota la llicència BSD-2-Clàusula.\n" -#: diff_ext.cpp:520 +#: diff_ext.cpp:344 #, kde-format msgid "Some extensions for KDiff3 (c) 2006-2013 by Joachim Eibl.\n" msgstr "Diverses extensions del KDiff3 (c) 2006-2013 pel Joachim Eibl.\n" -#: diff_ext.cpp:521 +#: diff_ext.cpp:345 #, kde-format msgid "Homepage for Diff-Ext: http://diff-ext.sourceforge.net\n" msgstr "Pàgina web del Diff-Ext: http://diff-ext.sourceforge.net\n" -#: diff_ext.cpp:522 +#: diff_ext.cpp:346 #, kde-format msgid "About Diff-Ext for KDiff3 " msgstr "Quant al Diff-Ext per al KDiff3" -#: diff_ext.cpp:551 +#: diff_ext.cpp:375 #, kde-format msgid "Compare selected files" msgstr "Compara els fitxers seleccionats" -#: diff_ext.cpp:557 diff_ext.cpp:577 +#: diff_ext.cpp:381 diff_ext.cpp:399 #, kde-format msgid "Compare '%1' with '%2'" msgstr "Compara amb «%1» amb «%2»" -#: diff_ext.cpp:563 +#: diff_ext.cpp:386 #, kde-format msgid "Save '%1' for later operation" msgstr "Desa «%1» per a una operació posterior" -#: diff_ext.cpp:619 +#: diff_ext.cpp:440 #, kde-format msgid "Could not start KDiff3. Please rerun KDiff3 installation." msgstr "" "No s'ha pogut iniciar el KDiff3. Torneu a executar la instal·lació del " "KDiff3." -#: diff_ext.cpp:620 +#: diff_ext.cpp:441 #, kde-format msgid "Command" msgstr "Ordre" -#: diff_ext.cpp:621 +#: diff_ext.cpp:442 #, kde-format msgid "CommandLine" msgstr "Línia_d'ordres" -#: diff_ext.cpp:622 +#: diff_ext.cpp:443 #, kde-format msgid "Diff-Ext For KDiff3" msgstr "Diff-Ext per al KDiff3" \ No newline at end of file diff -Nru kdiff3-1.8.01/po/ca/docs/kdiff3/index.docbook kdiff3-1.8.3/po/ca/docs/kdiff3/index.docbook --- kdiff3-1.8.01/po/ca/docs/kdiff3/index.docbook 1970-01-01 00:00:00.000000000 +0000 +++ kdiff3-1.8.3/po/ca/docs/kdiff3/index.docbook 2020-06-25 00:19:11.000000000 +0000 @@ -0,0 +1,3618 @@ + +KDiff3"> + + +]> + + + + + + +El manual del &kdiff3; + + +Michael Reeves
reeves.87@gmail.com
Joachim Eibl
joachim.eibl at gmx.de +
 + +&traductor.Antoni.Bella; + + + +2002-2007 +Joachim Eibl + + +2017-2019 +Michael Reeves + + + +&FDLNotice; + + + +22 de febrer de 2019 +1.08.02 + + + +El &kdiff3; és una eina per a la comparació i fusionat de fitxers i directoris +compara i fusiona dos o tres fitxers o directoris des de l'entrada, +mostra les diferències línia per línia i caràcter per caràcter (!), +proporciona la facilitat del fusionat automàtic, +té un editor per a la solució còmoda dels conflictes de fusionat, +proporciona transparència de xarxa a través del KIO, +té opcions per a ressaltar o ocultar els canvis en els espais en blanc o els comentaris, +admet Unicode, UTF-8 i altres codificacions de fitxer, +imprimeix les diferències, +admet la paraula clau per al control de versions i un historial de les fusions. + +Aquest document descriu la versió 1.8 del &kdiff3;. + + + + + +KDE +kdiff3 +diff +fusiona +CVS +diff triple +compara +fitxers +directoris +control de versions +fusionat a tres bandes +diferències a la línia +sincronitza +kpart +kio +transparent a la xarxa +editor +espai en blanc +comentaris + + + + +Introducció +Un altre frontal de diferències? +Hi ha diverses eines gràfiques de diferències. Perquè triar el &kdiff3;? Deixeu-me dir perquè el vaig escriure. El &kdiff3; va començar perquè vaig haver de fer un fusionat difícil. El fusionat és necessari quan diverses persones treballen en els mateixos fitxers en un projecte. Un fusionat pot ser una cosa automatitzada, quan l'eina de fusionat no només té fitxers nous (anomenats «branques»), sinó també el fitxer original (anomenat «base»). L'eina de fusionat prendrà qualsevol modificació que només s'hagi realitzat en una branca. Quan diversos col·laboradors canvien les mateixes línies, l'eina de fusionat detectarà els conflictes que s'han de resoldre manualment. Llavors el fusionat serà difícil perquè un col·laborador ha canviat moltes coses i ha corregit el sagnat en molts llocs. Un altre col·laborador també ha canviat molt text en el mateix fitxer, el qual ha resultat en diversos conflictes de fusionat. L'eina que vaig emprar llavors, només mostrava les línies canviades, però no el que s'havia canviat dins d'aquestes línies. I no hi havia informació només sobre on s'havia canviat el sagnat. El fusionat va ser un petit malson. De manera que aquest va ser el començament. La primera versió podia mostrar les diferències dins d'una línia i mostrava les diferències dels espais en blanc. Més tard es van anar afegint moltes altres característiques per a fer augmentar la utilitat. Per exemple, si voleu comparar un text amb rapidesa, podreu copiar-lo al porta-retalls i enganxar-lo a qualsevol de les finestres de diferències. Una característica que va requerir un gran esforç va ser la facilitat de comparació i fusionat dels directoris, la qual va convertir el programa gairebé en tot un explorador de fitxers. Espero que el &kdiff3; també funcioni per a vosaltres. Gaudiu-ne! Joachim Eibl (2003) + + +Captures de pantalla i característiques +Aquesta captura de pantalla mostra la diferència entre dos fitxers de text +(Emprant una versió inicial del &kdiff3;): + + + + +El fusionat a 3 bandes està totalment admès. Aquest és útil si dues persones canvien el codi de forma independent. El fitxer original (la base) s'utilitzarà per ajudar al &kdiff3; a seleccionar automàticament els canvis correctes. L'editor del fusionat que hi ha a sota les finestres de diferències permet resoldre els conflictes, mentre mostra el resultat que obtindreu. Fins i tot podreu editar la sortida. Aquesta captura de pantalla mostra els tres fitxers d'entrada fusionats: + + + + + +El &kdiff3; també ajuda a comparar i fusionar directoris sencers. Aquesta captura de pantalla mostra el &kdiff3; durant un fusionat de directoris: + + + + + + +Més característiques +Visor de diferències línia per línia i caràcter per caràcter +En utilitzar les possibilitats d'una pantalla gràfica en color, el &kdiff3; mostrarà amb exactitud quina és la diferència. Us agradarà quan hàgiu de fer moltes revisions de codi. + + + + + +Vegeu d'una mirada les diferències en els espai en blanc +Els espais i les tabulacions que difereixen apareixeran visibles. Quan les línies només difereixin en la quantitat d'espais en blanc, això es veurà d'una ullada a la columna del resum al costat esquerre. (No més preocupacions quan algú canviï el sagnat). + + + + + +Diferències triples +Analitzeu tres fitxer i vegeu en què difereixen. Les finestres esquerra/mig/dreta s'anomenen A/B/C i tenen el color blau/verd/magenta respectivament. Si un fitxer és el mateix i un fitxer és diferent en una línia, el color mostrarà quin fitxer difereix. El color vermell indicarà que els altres dos fitxers són diferents. + + + + + +Fusionat còmode de dos o tres fitxers d'entrada +Es pot emprar el &kdiff3; per a fusionar dos o tres fitxers d'entrada i els fusionarà automàticament tant com sigui possible. El resultat es presentarà en una finestra editable on la majoria dels conflictes es podran resoldre amb un sol clic del ratolí: Seleccioneu els respectius botons ... a les finestres A/B/C per a seleccionar la font que s'emprarà. També podreu seleccionar més d'una font. Atès que aquesta finestra de sortida és un editor, fins i tot els conflictes que necessiten correccions addicionals es podran resoldre aquí sense requerir cap altra eina. + + +I... + + Navegació ràpida mitjançant botons. + Un clic del ratolí en una columna del resum sincronitzarà totes les finestres per a mostrar la mateixa posició. + Seleccioneu i copieu des de qualsevol finestra i enganxeu-ho a la finestra de resultats del fusionat. + Columna de la visió de conjunt que mostra on es troben els canvis i els conflictes. + Els colors es poden ajustar a les vostres preferències específiques. + Mida ajustable de la pestanya. + Opció per inserir espais en lloc de tabulacions. + Obriu fitxers amb comoditat mitjançant el diàleg o especifiqueu els fitxers a la línia d'ordres. + Cerqueu cadenes en totes les finestres de text amb els elements de menú EditaCerca (&Ctrl;F) i EditaCerca la següent (F3). + Mostra els números de línia per a cada línia. + Enganxeu des del porta-retalls o arrossegueu el text a una finestra d'entrada de diferències. + Transparència de xarxa a través del KIO. + Es pot emprar com a visor de diferències des del &kdevelop; 3. + Ajust de les paraules per a les línies llargues. + Admet Unicode, UTF-8 i altres còdecs. + Admet els idiomes de dreta a esquerra. + ... + + + + + +Comparar i fusionar fitxers + +Opcions de la línia d'ordres + +Comparar 2 fitxers: +kdiff3 fitxer_1 fitxer_2 + + + +Fusionar 2 fitxers: +kdiff3 fitxer_1 fitxer_2 -m + kdiff3 fitxer_1 fitxer_2 -o fitxer_de_sortida + + + +Comparar 3 fitxers: +kdiff3 fitxer_1 fitxer_2 fitxer_3 + + + +Fusionar 3 fitxers: +kdiff3 fitxer_1 fitxer_2 fitxer_3 -m +kdiff3 fitxer_1 fitxer_2 fitxer_3 -o fitxer_de_sortida + +Tingueu en compte que el fitxer_1 es tractarà com la base del fitxer_2 i el fitxer_3. + + +Cas especial: fitxers amb el mateix nom +Si tots els fitxers tenen el mateix nom però estan en directoris diferents, podreu reduir el treball de tipografia especificant el nom de fitxer només per al primer fitxer, &pex;: +kdiff3 dir1/nom_fitxer dir2 dir3 + + + +Línia d'ordres per iniciar una comparació o fusionat de directoris: +Això és molt similar, però ara es tracta de directoris. +kdiff3 dir1 dir2 + kdiff3 dir1 dir2 -o directori_destinació + kdiff3 dir1 dir2 dir3 + kdiff3 dir1 dir2 dir3 -o directori_destinació + +Per a comparar i fusionar directoris, encara podeu continuar llegint aquí. + + +D'altres opcions a la línia d'ordres +Per a veure tots els tipus d'opcions disponibles de la línia d'ordres, escriviu +kdiff3 --help + +Sortida d'exemple: +Opcions: + -m, --merge Fusiona l'entrada. + -b, --base fitxer Fitxer base explícit. Per compatibilitat amb certes eines. + -o, --output fitxer Fitxer de sortida. Implica -m. P. ex.: -o fitxer_nou.txt + --out fitxer Fitxer de sortida, de nou. (Per compatibilitat amb certes eines). + --auto Sense IGU si tots els conflictes es poden resoldre automàticament. (Necessita -o fitxer) + --qall No es resoldran automàticament els conflictes. (Per compatibilitat...) + --L1 àlies_1 Substitueix el nom visible per al fitxer d'entrada 1 (base). + --L2 àlies_2 Substitueix el nom visible per al fitxer d'entrada 2. + --L3 àlies_3 Substitueix el nom visible per al fitxer d'entrada 3. + -L, --fname àlies El nom visible alternatiu per a la substitució. Proporcioneu-lo una vegada per a cada entrada. + --cs cadena Solapa un ajustament de la configuració. Useu-lo un cop per a cada ajustament. P. ex.: --cs "AutoAdvance=1" + --confighelp Mostra una llista dels ajustaments de configuració amb els valors actuals. + --config fitxer Usa un fitxer de configuració diferent. + +L'opció permet ajustar un valor de configuració que d'una altra manera només es podrà ajustar a través dels diàlegs de configuració. Fixeu-vos, que quan finalitzi el &kdiff3;, el valor modificat s'emmagatzemarà juntament amb els altres ajustaments. Amb trobareu els noms dels elements disponibles amb el seu valor actual. +Mitjançant podreu especificar un fitxer de configuració diferent. Quan empreu sovint el &kdiff3; amb configuracions completament diferents, això permetrà canviar amb facilitat entre elles. + +Opcions a ignorar de la línia d'ordres +Molta gent vol emprar el &kdiff3; amb algun sistema per al control de versions. Però quan aquest sistema per al control de versions crida al &kdiff3; utilitzant paràmetres de la línia d'ordres que el &kdiff3; no reconeix, llavors el &kdiff3; finalitzarà amb un error. La integració dels ajustaments permet especificar paràmetres de la línia d'ordres que el &kdiff3; haurà d'ignorar. Apareixeran en l'ús de l'ajuda com en aquest exemple: +--foo Ignorada. (Definida per l'usuari). + + + Opcions a ignorar de la línia d'ordres:Una llista d'opcions, separades per punt i coma «;». Quan aparegui una d'aquestes opcions a la línia d'ordres, el &kdiff3; la ignorarà i s'executarà sense informar d'un error. (De manera predeterminada és «u;query;html;abort»). + +Quan això no és suficient, es recomana escriure un script d'intèrpret d'ordres que faci la traducció de l'opció. + + + + +Diàleg d'obertura +Atès que la majoria dels fitxers d'entrada hauran de ser seleccionables, el programa té un diàleg d'obertura especial: + + + +El diàleg d'obertura permet editar els noms dels fitxers, seleccionant un fitxer mitjançant l'explorador de fitxers mitjançant botó Fitxer... o permet escollir fitxers recents des de les llistes desplegables. Si torneu a obrir el diàleg, els noms actuals encara hi romandran. El tercer fitxer d'entrada no és obligatori. Si l'entrada per a C roman buida, només es realitzarà una anàlisi de diferències entre dos fitxers. També podreu seleccionar un directori mitjançant el botó Dir.... Si s'especifica un directori per a A, s'iniciarà una comparació/fusionat de directoris. Si A especifica un fitxer però B, C o la sortida especifiquen un directori, llavors el &kdiff3; utilitzarà el nom de fitxer de A en els directoris especificats. Si se selecciona Fusiona, llavors la línia Sortida esdevindrà editable. Però no caldrà especificar immediatament el nom del fitxer de sortida. També ho podreu posposar fins el desament. El botó Configura... obrirà el diàleg d'opcions, de manera que podreu establir les opcions abans d'executar l'anàlisi. + + +Enganxar i arrossegar a l'entrada +De vegades voldreu comparar parts d'un text que no prové d'un fitxer. El &kdiff3; també permet enganxar text des del porta-retalls a la finestra d'entrada de diferències que té el focus. L'anàlisi de les diferències ocorrerà immediatament. En el diàleg d'obertura no necessitareu especificar cap fitxer, simplement tanqueu-lo mitjançant el botó Cancel·la. També podreu utilitzar l'acció arrossega i deixa anar: arrossegueu un fitxer des d'un gestor de fitxers o el text seleccionat des d'un editor i deixeu-lo anar en una finestra d'entrada de diferències. Quina és la idea? De vegades, un fitxer contindrà dues funcions similars, però comprovar com de similars són en realitat és un gran esforç si primer heu de crear dos fitxers i després carregar-los. Ara podreu simplement copiar, enganxar i comparar les seccions rellevants. Nota: Actualment no es pot arrossegar res des del &kdiff3;. Només s'admet deixar anar a la finestra d'entrada de diferències. Avís: Alguns editors encara interpreten l'arrossega i deixa anar en un altre programa com un retalla (en lloc de copia) i enganxa. Llavors podríeu perdre les vostres dades originals. + + +Comparar fitxers i interpretar la informació a les finestres d'entrada + + + +Línia d'informacióA la part superior de cada finestra de text es troba la seva «línia d'informació». Les línies d'informació de les finestres d'entrada contenen una lletra A, B o C, el nom editable del fitxer, un botó per examinar i el número de línia de la primera línia visible a la finestra. (Tingueu en compte que la finestra C és opcional). Cada línia d'informació apareix en un color diferent. Quan seleccioneu un altre fitxer mitjançant l'exploració o acabeu d'editar el nom del fitxer prement &Intro;, el fitxer nou es carregarà i es compararà amb el/s fitxer/s ja carregat/s. Donar colorLes tres finestres d'entrada tenen assignades les lletres A, B i C. A té color blau, B té verd i C té magenta. (Aquests són els valors predeterminats, però es poden canviar a l'element Color en el diàleg de configuració). Quan es detecta una diferència, el color mostrarà quin fitxer d'entrada difereix. Quan difereixen els altres dos fitxers d'entrada, el color utilitzat per a expressar-ho serà el vermell de manera predeterminada (l'opció Color del conflicte a l'element Color en el diàleg de configuració). Aquest esquema de colors és especialment útil en el cas de tres fitxers d'entrada, els quals es veuran a la següent secció (Fusionar). Columna del resumA l'esquerra de cada text hi ha la «columna de resum». Si ocorre cap diferència en una línia, la columna de resum mostrarà el color respectiu. Per a una diferència de només espais en blanc, el resum estarà marcat. Per als llenguatges de programació on l'espai en blanc no és tan important, això és útil per a veure d'una ullada si s'ha modificat quelcom important. (En C/C++, l'espai en blanc només és interessant dins de les cadenes, comentaris, per al preprocessador i en algunes situacions molt esotèriques). La línia vertical que separa la columna del resum i el text s'interromprà si el fitxer d'entrada no hi tenia línies. Quan estigui habilitat l'ajust de paraules, aquesta línia vertical apareixerà puntejada per a les línies ajustades. Columna de la visió de conjuntA la part dreta, es veu una columna «visió de conjunt» a l'esquerra de la barra de desplaçament vertical. Mostra la columna de resum comprimit de l'entrada A. Totes les diferències i els conflictes seran visibles d'una ullada. Quan només s'emprin dues finestres d'entrada, totes les diferències apareixeran aquí en vermell perquè cada diferència també és un conflicte. Un rectangle negre emmarcarà la part visible de les entrades. Per als fitxers d'entrada molt llargs, quan el nombre de línies d'entrada sigui més gran que l'alçada de la columna de la visió de conjunt en píxels, diverses línies d'entrada compartiran una línia de la visió de conjunt. Llavors, un conflicte tindrà la màxima prioritat sobre les diferències senzilles, les quals tindran prioritat sobre sense canvis, de manera que aquí no es perdrà cap diferència o conflicte. En fer clic a dins d'aquesta columna de la visió de conjunt, es mostrarà el text corresponent. Alinear les línies manualmentDe vegades, l'algoritme col·loca línies incorrectes una al costat de l'altra. O voldreu comparar una part del text amb el text en una posició completament diferent en l'altre fitxer. Per a aquestes situacions, podreu indicar manualment al &kdiff3; que s'alineï amb certes línies. Seleccioneu amb el ratolí el text per al qual voleu millorar l'alineació com ho faríeu per a copiar i enganxar a la primera vista de diferències i després escolliu l'element de menú Vista de les diferènciesAfegeix alineació manual de les diferències (drecera &Ctrl;Y). Apareixerà una barra taronja a la columna de resum al costat del text triat. Repetiu-ho per a la segona i (si està disponible) per a la tercera vista de diferències. El &kdiff3; tornarà immediatament a calcular les diferències cada vegada que ho feu, i alinearà les línies triades. Per descomptat, algunes de les línies intermèdies prèviament coincidents podrien no coincidir més. Actualment, el fusionat no admet l'ús de l'ajuda del manual de «diff». Unir i dividir manualment seccions del «diff»En alguns casos, el &kdiff3; veurà massa o molt poques seccions de diferències per fusionar. En aquest cas, podreu unir o dividir les seccions existents. Afegiu seccions noves seleccionant primer el text en les línies que estan juntes en qualsevol finestra d'entrada (com per a copiar al porta-retalls). Després trieu l'element de menú FusionaDivideix les diferències a la selecció. Les divisions s'afegiran a sobre de la primera línia i a sota de l'última línia del text seleccionat. Si només voleu afegir una secció, seleccioneu el text que comença en una altra secció dividida. Per unir seccions en qualsevol finestra d'entrada, seleccioneu quelcom en les línies de les seccions a unir. (També podreu unir diverses seccions en un sol pas). Després, trieu l'element de menú FusionaUneix les diferències seleccionades. + + + +Fusionar i la finestra de l'editor per a la sortida del fusionat + + + +La finestra de l'editor per a la sortida del fusionat (a sota de les finestres d'entrada de diferències) també té una línia d'informació a la part superior que mostra Sortida:, el nom del fitxer i l'etiqueta [Modificat] si heu editat quelcom. En general, contindrà una mica de text mitjançant les instal·lacions de fusionat automàtic, però sovint també contindrà conflictes. El desament estarà inhabilitat fins que es resolguin tots els conflictes! (Utilitzeu els botons Vés al conflicte no resolt anterior/següent per a trobar els conflictes restants). Amb només dos fitxers d'entrada, cada diferència també és un conflicte que s'haurà de resoldre manualment. Amb tres fitxers d'entrada, el primer fitxer es tractarà com a base, mentre que el segon i el tercer contindran les modificacions. Quan en qualsevol línia només hagin canviat l'entrada B o C però no totes dues, llavors se seleccionarà automàticament la font canviada. Només quan B i C hagin canviat en les mateixes línies, l'eina detectarà un conflicte que s'haurà de resoldre manualment. Quan B i C siguin iguals, però no iguals que A, llavors se seleccionarà C. La columna del resumLa finestra de l'editor per a la sortida del fusionat també té una columna del resum a l'esquerra. Mostra la lletra de l'entrada des de la qual s'ha seleccionat una línia o res si les tres fonts són iguals en una línia. Per als conflictes, mostrarà un signe d'interrogació «?» i la línia mostrarà «<Conflicte de fusió>», tot en vermell. Com resoldre els conflictes línia per línia portaria molt de temps, les línies s'agruparan en grups que tenen la mateixa diferència i característiques del conflicte. Però només els conflictes d'espai en blanc se separaran dels conflictes que no són d'espai en blanc per a facilitar el fusionat dels fitxers si el sagnat s'ha canviat en moltes línies. Establir el grup actual, sincronitzar el fusionat i la posició de la vista de les diferènciesEn fer clic a dins de la columna de resum amb el &BER; a qualsevol finestra, el començament del grup que pertanyi a aquesta línia es mostrarà en totes les finestres. Aquest grup es convertirà en el «grup actual». Es ressaltarà amb el «Color de fons de les diferències de l'interval actual» i apareixerà una barra negra a la banda esquerra del text. Triar les entrades A, B o C per als conflictes actuals i editarLa barra de botons que hi ha a sota de la barra de menús conté tres botons selectors d'entrada que contenen les lletres A, B i C. Feu clic al botó selector d'entrada per inserir (o eliminar si ja està inserit) les línies des de la respectiva font. Per triar les línies des de diverses entrades, feu clic als botons respectius en l'ordre necessari. Per exemple, si voleu que les línies de B apareguin a la sortida abans que les línies de A, primer feu clic a B i després a A. Si utilitzeu el botó Vés automàticament al conflicte no resolt següent després de seleccionar una font (vegeu la secció Avanç automàtic), haureu d'inhabilitar això abans d'escollir línies des de diverses entrades o si voleu editar les línies després de la vostra elecció. Altrament, el &kdiff3; saltarà al següent conflicte després de triar la primera entrada. Sovint és útil editar directament la sortida del fusionat. La columna del resum mostrarà «m» per a cada línia que s'ha modificat manualment. Quan, per exemple, les diferències estiguin alineades de manera que simplement triar les entrades no serà satisfactori, podreu marcar el text necessari i utilitzar copia i enganxa normalment per a col·locar-ho a la sortida del fusionat. De vegades, quan s'elimina una línia, ja sigui per fusionat automàtic o per edició, i no queden altres línies en aquest grup, llavors apareixerà el text «<La línia no és codi>» en aquesta línia. Només es tracta d'un marcador de posició per al grup per a quan pugueu canviar d'opinió i seleccionar de nou alguna font. Aquest text no apareixerà al fitxer desat ni en cap selecció que vulgueu copiar i enganxar. El text «<Conflicte de fusió>» apareixerà en el porta-retalls si copieu i enganxeu algun text que contingui aquesta línia. Però tot i així aneu amb compte en fer-ho. Triar l'entrada A, B o C per a tots els conflictesEl fusionat normal començarà resolent automàticament els conflictes senzills. Però el menú Fusiona proporciona algunes accions per a altres necessitats habituals. Si heu de seleccionar la mateixa font per a la majoria dels conflictes, podreu triar A, B o C a tot arreu, o només per als conflictes restants sense resoldre, o per als conflictes d'espais en blanc sense resoldre. Si voleu decidir cada diferència d'espai, podreu fer Estableix les diferències d'espais com a conflictes. O si voleu tornar a les opcions automàtiques del &kdiff3;, seleccioneu Resol automàticament els conflictes senzills. Després, el &kdiff3; tornarà a iniciar el fusionat. Per a accions que canviïn les vostres modificacions anteriors, el &kdiff3; demanarà la vostra confirmació abans de continuar. Nota: En triar una font per als conflictes dels espais en blanc sense resoldre i s'emprin les opcions Ignora els números (tracta'ls com a espais en blanc) o Ignora els comentaris de C/C++ (tracta'ls com a espais en blanc) a l'element Diff en el diàleg de configuració són emprades de manera que els canvis en els números o comentaris també es tractaran com a espais en blanc. Fusionat automàtic de les paraules clau i l'historial en el control de versions (registre)Molts sistemes per al control de versions admeten paraules clau especials al fitxer. (P. ex., «$Date$», «$Header$», «$Author$», «$Log$», &etc;) Durant el registre, el sistema per al control de versions (VCS) canvia aquestes línies. Per exemple, «$Date$» es convertirà en «$Date: 2005/03/22 18:45:01 $». Atès que aquesta línia serà diferent en cada versió del fitxer, requerirà la interacció manual durant el fusionat. El &kdiff3; ofereix fusionat automàtic per a aquests elements. Per a les línies senzilles que coincideixen amb l'opció Fusiona automàticament amb l'expressió regular en tots els fitxers d'entrada, el &kdiff3; triarà la línia de B o, si està disponible, de C. (A més, cal que les línies en qüestió s'alineïn en la comparació i la línia anterior no contingui cap conflicte). Aquest fusionat automàtic pot executar-se immediatament després que comenci un fusionat (activeu l'opció Executa la fusió automàtica amb l'expressió regular a l'inici del fusionat) o més tard mitjançant l'element de menú FusionaExecuta la fusió automàtica amb l'expressió regular. També s'admet el fusionat automàtic per a l'historial del control de versions (també anomenat «registre»). El fusionat automàtic de l'historial pot executar-se immediatament quan comença el fusionat activant l'opció Fusiona l'historial del control de versions quan es comenci a fusionar a l'element Fusiona al diàleg de configuració o més tard mitjançant l'element de menú FusionaResol automàticament els conflictes cronològics. En general, l'historial del control de versions comença amb una línia que conté la paraula clau «$Log$». Aquesta haurà de coincidir amb l'opció Expressió regular per a l'inici de l'historial a l'element Fusiona al diàleg de configuració. El &kdiff3; detectarà quines línies posteriors hi ha a l'historial mitjançant l'anàlisi dels caràcters principals que precedeixen a la paraula clau «$Log$». Si també apareixen els mateixos caràcters de «comentari principal» en les següents línies, també s'inclouran a l'historial. Durant cada registre, el VCS escriu una línia única que especifica la informació de la versió, data i hora seguida de les línies amb els comentaris de l'usuari. Aquestes línies formen una entrada a l'historial. Aquesta secció de l'historial creixerà amb cada registre i les entrades més recents apareixeran a la part superior (després de la línia d'inici de l'historial). Quan per al desenvolupament en paral·lel dos o més desenvolupadors registrin en una branca del fitxer, l'historial de fusionat contindrà diverses entrades que apareixeran com a conflictes durant el fusionat de les branques. Atès que fusionar-les pot tornar-se molt tediós, el &kdiff3; ofereix suport amb dues estratègies possibles: simplement inserir a la part superior la informació de l'historial d'ambdós col·laboradors o ordenar la informació de l'historial amb una clau definida per l'usuari. El mètode simplement inserir totes les entrades és més fàcil de configurar. El &kdiff3; només necessita un mètode per a detectar quines línies pertanyen a una entrada de l'historial. La majoria dels VCS insereixen una línia buida després de cada entrada de l'historial. Si no hi ha altres línies buides, aquest és un criteri suficient per al &kdiff3;. Simplement establiu una Expressió regular per a l'inici d'entrada de l'historial buida. Si el criteri de línia buida no és suficient, podreu especificar una expressió regular per a detectar el començament de l'entrada de l'historial. Tingueu present que el &kdiff3; eliminarà les entrades duplicades de l'historial. Si una entrada de l'historial aparèixer diverses vegades en l'historial d'un fitxer d'entrada, només quedarà una entrada a la sortida. Si voleu ordenar l'historial, haureu d'especificar com s'haurà de construir la clau d'ordenació. Utilitzeu parèntesis a l'Expressió regular per a l'inici d'entrada de l'historial a l'element Fusiona al diàleg de configuració per agrupar parts de l'expressió regular que després s'utilitzaran per a la clau d'ordenació. Després, especifiqueu el Criteri d'ordenació de les claus per a l'inici de l'entrada de l'historial, especificant una llista separada per comes «,» dels números que es refereixen a la posició del grup en l'expressió regular. A causa que això no és tan fàcil de fer immediatament, podreu provar i millorar les expressions regulars i la generació de les claus en un diàleg dedicat prement el botó Comprova les expressions regulars. Exemple: suposem un historial similar a aquest: +/************************************************************************** +** HISTORY: $Log: \toms_merge_main_view\MyApplication\src\complexalgorithm.cpp $ +** +** \main\integration_branch_12 2 Apr 2001 10:45:41 tom +** Merged branch simon_branch_15. +** +** \main\henry_bugfix_branch_7\1 30 Mar 2001 19:22:05 henry +** Improved the speed for subroutine convertToMesh(). +** Fixed crash. +**************************************************************************/ + La línia d'inici de l'historial coincideix amb l'expressió regular «.*\$Log.*\$.*». Després segueixen les entrades de l'historial. La línia amb la paraula clau «$Log$» comença amb dos «*», després dels quals segueix un espai. El &kdiff3; utilitzarà la primera cadena que no sigui un espai en blanc com a «comentari principal» i suposarà que l'historial acaba en la primera línia sense aquest comentari principal. En aquest exemple, l'última línia acaba amb una cadena que també comença amb dos «*», però en lloc d'un caràcter d'espai més segueix «*». Per tant, aquesta línia acaba l'historial. Si no es requereix l'ordenació de l'historial, l'expressió regular de la línia d'inici per a l'entrada de l'historial podria tenir aquest aspecte. (Aquesta línia es divideix en dos perquè d'una altra manera no hi cabria). +\s*\\main\\\S+\s+[0-9]+ (Jan|Feb|Mar|Apr|May|Jun|Jul|Aug|Sep|Oct|Nov|Dec) + [0-9][0-9][0-9][0-9] [0-9][0-9]:[0-9][0-9]:[0-9][0-9]\s+.* + Per obtenir detalls sobre les expressions regulars, consulteu la documentació sobre expressions regulars de Trolltech. Recordeu que «\s» (amb «s» en minúscula) coincidirà amb qualsevol espai en blanc i «\S» (amb «S» en majúscula) coincidirà amb qualsevol espai que no sigui en blanc. En el nostre exemple, l'inici de l'entrada de l'historial conté primer la informació de la versió amb l'expressió regular «\\main\\\S+», la data que consisteix en el dia «[0-9]+», el mes «(Jan|Feb|Mar|Apr|May|Jun|Jul|Aug|Sep|Oct|Nov|Dec)» i l'any «[0-9][0-9][0-9][0-9]», l'hora «[0-9][0-9]:[0-9][0-9]:[0-9][0-9]» i finalment el nom d'inici de la sessió dels desenvolupadors «.*». Recordeu que els caràcters en el «comentari principal» (a l'exemple «**») ja seran eliminats pel &kdiff3; abans d'intentar fer coincidir, per tant, l'expressió regular començarà amb una coincidència per a cap o més caràcters d'espai en blanc «\s*». A causa que els caràcters de comentari poden diferir en cada fitxer (&pex;, a C/C++ s'utilitzen altres caràcters de comentari que en un script en Perl) el &kdiff3; s'ocuparà dels caràcters de comentari principals i no haureu d'especificar-los a l'expressió regular. Si necessiteu un historial ordenat. Llavors s'haurà de calcular la clau d'ordenació. Per això, les parts rellevants de l'expressió regular s'hauran d'agrupar entre parèntesis. (Els parèntesis addicionals també poden romandre si l'ordenació de l'historial està inhabilitada). +\s*\\main\\(\S+)\s+([0-9]+) (Jan|Feb|Mar|Apr|May|Jun|Jul|Aug|Sep|Oct|Nov|Dec) + ([0-9][0-9][0-9][0-9]) ([0-9][0-9]:[0-9][0-9]:[0-9][0-9])\s+(.*) + Els parèntesis ara contenen 1. informació de la versió, 2. dia, 3. mes, 4. any, 5. hora i 6. nom. Però si volem ordenar per data i hora, ens caldrà construir una clau amb els elements en un ordre diferent d'aparició: Primer l'any, seguit del mes, dia, hora, informació de la versió i nom. Per tant, l'ordre d'ordenació a especificar serà «4,3,2,5,1,6». A causa que els noms dels mesos no són bons per a l'ordenació («Abr» seria el primer) el &kdiff3; detectarà en quin ordre s'han donat els noms dels mesos i utilitzarà aquest nombre en el seu lloc («Abr» -> «04»). I si es troba un nombre pur, es transformarà en un valor de 4 dígits amb zeros a l'esquerra per a l'ordenació. Finalment, la clau d'ordenació resultant per a la primera línia d'inici de l'entrada de l'historial serà: 2001 04 0002 10:45:41 integration_branch_12 tom + +Per a més informació, vegeu la secció Ajustaments del fusionat. + + + +Navegar i editar +Es realitza molta navegació amb les barres de desplaçament i el ratolí, però també es pot navegar amb les tecles. Si feu clic a qualsevol de les finestres, podreu utilitzar les dreceres &Left;, &Right;, &Up;, &Down;, &PgUp;, &PgDn;, &Home;, &End;, &Ctrl;&Home; i &Ctrl;&End; com ho faríeu en altres programes. La columna de la visió de conjunt que hi ha al costat de la barra de desplaçament vertical dels fitxers d'entrada també es pot utilitzar per a navegar fent-hi clic. També podreu utilitzar la roda del ratolí per a desplaçar-vos cap amunt i cap avall. A l'editor de la sortida del fusionat també podreu utilitzar les altres tecles per editar. Podeu alternar entre el mode insereix i sobreescriu amb la tecla &Ins;. (De manera predeterminada és el mode insereix). Un clic amb el &BER; dins de qualsevol columna de resum, se sincronitzaran totes les finestres per a mostrar el començament del mateix grup de línies (com s'explica a la secció Establir el grup actual, sincronitzar el fusionat i la posició de la vista de les diferències). La barra de botons també conté nou botons de navegació amb els quals podreu saltar a la diferència actual/primera/última, a la diferència següent/anterior (&Ctrl;&Down;/&Ctrl;&Up;), al conflicte següent/anterior (&Ctrl;&PgDn;/&Ctrl;&PgUp;), o al conflicte sense resoldre següent/anterior. Recordeu que per al &kdiff3; un «conflicte» que no s'ha resolt automàticament a l'inici del fusionat seguirà sent un «conflicte» fins i tot si es resol. D'aquí la necessitat de distingir els «conflictes no resolts». +Avanç automàtic +També hi ha un botó Vés automàticament al conflicte no resolt següent després de seleccionar una font (avanç automàtic). Si l'habiliteu, llavors, quan se selecciona una font, el &kdiff3; saltarà i seleccionarà el següent conflicte no resolt automàticament. Això ajudarà sempre que vulgueu triar una única font. Quan necessiteu les dues fonts, o vulgueu editar després de seleccionar, llavors probablement ho vulgueu desactivar. Abans de continuar amb el següent conflicte no resolt, el &kdiff3; mostrarà l'efecte de la vostra elecció durant un curt temps. Aquest retard es pot ajustar als ajustaments de les diferències i fusionat: podeu especificar el Retard de l'avanç automàtic en mil·lisegons entre 0 i 2000. Consell: Cansat de molts clics? Utilitzeu un petit retard i les dreceres &Ctrl;1/2/3 per a seleccionar A/B/C per a molts conflictes. + + + +Seleccionar, copiar i enganxar +Les finestres d'entrada no mostren un cursor, de manera que les seleccions s'han de fer amb el ratolí; fent clic amb el &BER; a l'inici, mantenint premut el botó del ratolí i movent-se fins al final, on el deixareu anar de nou. També podeu seleccionar una paraula fent-hi doble clic. A l'editor de sortida del fusionat també podreu seleccionar mitjançant el teclat mantenint premuda la tecla &Maj; i navegant amb les tecles de cursor. Si la selecció excedeix l'interval visible, podreu moure el ratolí sobre les vores de la finestra, el qual farà que el &kdiff3; es desplaci en aquesta direcció. Per a seleccions molt grans també podreu utilitzar les tecles de navegació mentre manteniu premut el ratolí. Per exemple, empreu &PgUp; i &PgDn; per anar ràpidament a una determinada posició. A la posició final deixeu anar el botó del ratolí. Per a seleccionar tot el que hi ha a la finestra actual, utilitzeu l'element de menú Edita Selecciona-ho tot (&Ctrl;A). Per a copiar al porta-retalls, haureu de prémer el botó Copia (&Ctrl;C o &Ctrl;&Ins;). Però hi ha una opció Copia la selecció automàticament. Si està habilitada, el que seleccioneu es copiarà immediatament i no caldrà copiar explícitament. Però aneu amb compte en emprar-ho, perquè el contingut del porta-retalls podria destruir-se de manera accidental. Retalla (&Ctrl;X o &Maj;∇) copia al porta-retalls i suprimeix el text seleccionat. Enganxa (&Ctrl;V o &Maj;&Ins;) insereix el text en el porta-retalls a la posició del cursor o sobre la selecció actual. Si enganxeu a qualsevol de les finestres d'entrada de diferències, el contingut del porta-retalls es mostrarà en aquesta finestra i la comparació es reiniciarà immediatament. Això és útil per obtenir ràpidament un fragment de text d'algun lloc i comparar-lo amb una altra cosa sense crear primer els fitxers. + + +Desar +El desament només es permetrà quan es resolguin tots els conflictes. Si el fitxer ja existeix i l'opció Fitxers per a còpia de seguretat està habilitada a l'element Directori en el diàleg de configuració, el fitxer existent serà reanomenat amb una extensió .orig, però si aquest fitxer existeix, s'eliminarà. Quan sortiu o comenceu una altra anàlisi de diferències i les dades encara no s'hagin desat, el &kdiff3; demanarà si les voleu desar, cancel·lar o continuar sense desar. (El &kdiff3; no capta cap senyal. Per tant, si «mateu» una instància del &kdiff3;, es perdran les vostres dades). Els finals de línia es desen d'acord amb el mètode normal en el sistema operatiu subjacent. Per als Unices, cada línia acaba amb un caràcter de salt de línia «\n», mentre que per als sistemes basats en Win32 cada línia acaba amb un retorn de carro + un salt de línia «\r\n». El &kdiff3; no conservarà els finals de línia dels fitxers d'entrada, el qual també voldrà dir que no heu d'emprar el &kdiff3; amb els fitxers binaris. + + +Cercar les cadenes +Podeu cercar una cadena en qualsevol finestra de text del &kdiff3;. L'element de menú EditaCerca... (&Ctrl;F) obre un diàleg que permetrà especificar la cadena a cercar. També podreu seleccionar les finestres on s'ha de cercar. Sempre es començarà a cercar per la part superior. Utilitzeu l'element de menú EditaCerca la següent... (F3) per passar a la següent ocurrència. Si seleccioneu cercar a diverses finestres, se cercarà des de la primera finestra de dalt a baix abans que es comenci la cerca de nou a la següent finestra a la part superior, &etc; + + +Imprimir +El &kdiff3; admet la impressió de diferències en fitxers de text. L'element de menú FitxerImprimeix... (&Ctrl;P) obre un diàleg que permetrà seleccionar la impressora i ajustar altres opcions. Hi ha diverses possibilitats per ajustar l'interval. A causa dels diferents diàlegs d'impressió en els diferents sistemes operatius, varia el mètode per aconseguir certes seleccions de l'interval. + + Tot:Ho imprimeix tot. + Actual:Imprimeix una pàgina que comença en la primera línia visible de la finestra. (En els sistemes sense aquesta opció, això es pot aconseguir especificant el número de pàgina 10.000 per a imprimir). + Selecció:Abans de triar imprimir, seleccioneu el text amb el ratolí (com per a copiar i enganxar) en una de les finestres d'entrada de diferències per a definir l'inici i final de la línia. Si no s'ha seleccionat cap text en una de les finestres d'entrada de diferències, llavors aquesta no serà una opció disponible. (En els sistemes sense aquesta opció, això es pot aconseguir especificant el número de pàgina 9.999 per a imprimir). + Interval:Especifica la primera i la darrera pàgina. + +Altres opcions importants per imprimir es prenen de les opcions normals: + Tipus de lletra i mida + Mostra els números de les línies + Ajust de les paraules + Colors + &etc; + +El format apaïsat també es recomana per a la impressió. + + +Opcions +Les opcions i la llista de fitxers recents es desaran quan sortiu del programa i es tornaran a carregar quan l'inicieu. (Element de menú Arranjament Configura el &kdiff3;...). +Tipus de lletra +Seleccioneu un tipus de lletra d'amplada fixa. (En alguns sistemes, aquest diàleg també presentarà tipus de lletra d'amplada variable, però no les hauríeu d'emprar). + + Tipus de lletra en cursiva per a les diferències d'espais:Si la seleccioneu, les diferències de text es dibuixaran amb la versió en cursiva del tipus de lletra seleccionat. Si el tipus de lletra no admet cursiva, llavors això no farà res. + + + + +Colors + + Color de primer pla:En general negre. + Color de fons:En general blanc. + Color de fons de les diferències:En general gris clar. + Color A:En general blau fosc. + Color B:En general verd fosc. + Color C:En general magenta fosc. + Color del conflicte:En general vermell. + Color de fons de l'interval actual:En general groc clar. + Color de fons de les diferències de l'interval actual:En general groc fosc. + Color per als intervals de diferències alineades manualment:En general taronja. + Color del fitxer més nou:En general verd. + Color del fitxer més antic:En general vermell. + Color del fitxer d'edat intermèdia:En general groc fosc. + Color dels fitxers que no disponibles:En general negre. + +Canviar els colors per a la comparació de directoris serà efectiu només quan inicieu la propera comparació de directoris. +En els sistemes amb només 16 o 256 colors, alguns colors no estaran disponibles en forma pura. En aquests sistemes, el botó Omissió triarà un color pur. + + +Ajustaments de l'editor + + El tabulador insereix espais:Si està inhabilitada i premeu la tecla , s'inserirà un caràcter de tabulació. En cas contrari, s'inseriran la quantitat adequada de caràcters. + Mida de la tabulació:Es pot ajustar a les vostres necessitats específiques. El valor predeterminat és 8. + Sagnat automàtic:Quan es prem &Intro; o Entra, s'utilitzarà el sagnat de la línia anterior per a la línia nova. + Copia la selecció automàticament:Cada selecció es copiarà immediatament al porta-retalls quan està activa i no necessitareu copiar explícitament. + Estil del salt de línia:Quan deseu, podreu seleccionar l'estil del final de línia que preferiu. L'opció predeterminada és l'opció comuna per al sistema operatiu emprat. + + + +Ajustaments del «diff» +Quan es comparen fitxers, el &kdiff3; primer intentarà fer coincidir les línies que són iguals en tots els fitxers d'entrada. Només durant aquest pas podreu ignorar els espais en blanc. El segon pas compararà cada línia. En aquest pas no s'ignoraran els espais en blanc. A més, durant el fusionat, no s'ignoraran els espais en blanc. + + + Ignora els números:El valor predeterminat és desactivada. Els caràcters numèrics («0»-«9», «.», «-») s'ignoraran en la primera part de l'anàlisi en la qual es realitza la coincidència de les línies. No obstant això, en el resultat es mostraran les diferències, però es tractaran com a espais en blanc. + Ignora els comentaris de C/C++:El valor predeterminat és desactivada. Els canvis en els comentaris es tractaran com a canvis en els espais en blanc. + Ignora les majúscules/minúscules:El valor predeterminat és desactivada. Les diferències entre majúscules i minúscules dels caràcters (com «A» front «a») es tractaran com a canvis en els espais en blanc. + Ordre del preprocessador:Vegeu la següent secció. + Ordre del preprocessador per a la coincidència de les línies:Vegeu la següent secció. + Esforça't:Intenta trobar una diferència d'espai encara més petita. (El valor predeterminat és activada). Això probablement serà efectiu per a fitxers complicats i grans. I lent per a fitxers molt grans. + + + +Ajustaments del fusionat + + Retard de l'avanç automàtic (ms):Quan està en el mode d'avanç automàtic, aquest ajustament especificarà quant de temps mostrar el resultat de la selecció abans de saltar al següent conflicte sense resoldre. + Opció predeterminada dels espais en blanc en la fusió de 2/3 fitxers:Resoldrà automàticament tots els conflictes en els espais en blanc triant el fitxer especificat. (El valor predeterminat és elecció manual). Útil si els espais en blanc en realitat no són importants en molts fitxers. Si ho necessiteu ocasionalment, millor utilitzeu Escull A/B/C a tots els conflictes dels espais en blanc no resolts al menú Fusiona. Recordeu que si s'habilita Ignora els números (tracta'ls com a espais en blanc) o Ignora els comentaris de C/C++ (tracta'ls com a espais en blanc), aquesta opció automàtica també s'aplica als conflictes en els nombres o comentaris. + Fusiona automàticament amb l'expressió regular:Expressió regular per a les línies on el &kdiff3; haurà de triar automàticament una font. Vegeu també Fusionat automàtic.... + Executa la fusió automàtica amb l'expressió regular a l'inici del fusionat:Si està activada, el &kdiff3; executarà el fusionat automàtic utilitzant l'opció Fusiona automàticament amb l'expressió regular quan s'inicia un fusionat. + Expressió regular per a l'inici d'entrada de l'historial:Expressió regular per a l'inici de les entrades de l'historial de fusionat. Normalment aquesta línia conté la paraula clau «$Log$». Valor predeterminat «.*\$Log.*\$.» + Expressió regular per a l'inici d'entrada de l'historial:Una entrada de l'historial per al control de versions consisteix de diverses línies. Especifiqueu l'expressió regular per a detectar la primera línia (sense el comentari inicial). Empreu els parèntesis per agrupar les claus que vulgueu utilitzar per a ordenar-les. Si es deixa en blanc, llavors el &kdiff3; assumirà que les línies en blanc separen les entrades de l'historial. Per a més detalls, vegeu també el Fusionat automàtic.... + Ordena el fusionat de l'historial:Habilita l'ordenació de l'historial en el control de versions. + Criteri d'ordenació de les claus per a l'inici de l'entrada de l'historial:Cada parell de parèntesis emprats a l'expressió regular per a l'inici de l'entrada de l'historial agruparà una clau que es pot emprar per a ordenar. Especifiqueu la llista de claus (que estan numerades en ordre d'ocurrència començant per 1) utilitzant «,» com a separador (&pex;, «4,5,6,1,2,3,7»). Si es deixa en blanc, no s'ordenarà. Per a més detalls, vegeu també el Fusionat automàtic.... + Fusiona l'historial del control de versions quan es comenci a fusionar:Si està activada, el &kdiff3; executarà el fusionat automàtic de l'historial utilitzant les opcions abans esmentades quan s'inicia un fusionat. + Nombre màxim d'entrades de l'historial:El &kdiff3; truncarà la llista de l'historial després del nombre especificat d'entrades. Utilitzeu -1 per evitar el truncament. (De manera predeterminada és -1). + Comprova les expressions regularsAquest botó mostra un diàleg que permet millorar i provar les expressions regulars anteriors. Simplement copieu les dades respectives dels vostres fitxers a les línies d'exemple. L'opció Resultat coincident: mostrarà immediatament si coincideixen. L'opció Resultat de la clau d'ordenació: mostrarà la clau utilitzada per a l'ordenació en el fusionat de l'historial. + Ordre de fusió irrellevant:Especifiqueu una ordre que s'haurà de cridar quan el &kdiff3; detecti que per a un fusionat de tres fitxers, el fitxer B no aporta cap dada rellevant que no es trobi en el contingut del fitxer C. L'ordre es cridarà amb els tres noms de fitxer com a paràmetres. Les dades que coincideixin amb l'Fusiona automàticament amb l'expressió regular o en l'historial no es consideraran rellevants. + + + + +Fusionar els directoris +Aquestes opcions estan relacionades amb l'exploració dels directoris i el maneig del fusionat: Per als detalls, vegeu Comparar/Fusionar directoris. No obstant això, aquí hi ha una opció que també és rellevant per al desaments de fitxers individuals: + + Fitxers per a còpia de seguretat (.orig):Quan es desa un fitxer i ja hi ha una versió anterior, la versió original canviarà de nom amb l'extensió .orig. Si ja existeix un fitxer de còpia de seguretat antic amb l'extensió .orig, s'eliminarà per a fer-ho sense còpia de seguretat. + + + +Opcions regional i d'idioma + + Idioma:Ajusta l'idioma de la interfície d'usuari. Canviar aquesta opció no afectarà el programa en execució. Haureu de sortir i reiniciar el &kdiff3; perquè es canviï l'idioma. (Aquesta opció no estarà disponible a la versió dels &frameworks; del &kdiff3;). + Usa la mateixa codificació a tot arreu:Les següents opcions de codificació es poden ajustar per separat per a cada element o si aquesta opció és certa, tots els valors prendran el primer valor. + Codificació local:A sobre dels selectors del còdec apareixerà una nota indicant quina és la codificació local. (Això no és ajustable, però per a la vostra informació en el cas que no la conegueu, però necessiteu seleccionar-la). + Codificació per al fitxer A/B/C:Ajusta la codificació del fitxer per als fitxers d'entrada. Això té un efecte sobre com s'interpretaran els caràcters especials. Podreu ajustar cada còdec per separat, fins i tot podreu comparar i fusionar fitxers que s'han desat amb còdecs diferents. + Codificació dels fitxers de sortida en el fusionat i desar:Quan hàgiu editat un fitxer, podreu ajustar quina codificació es farà servir en fer el desament al disc. + Codificació dels fitxers del preprocessador:Quan definiu els preprocessadors, és possible que no puguin operar amb el vostre còdec. (&pex;: els fitxers tenen unicode de 16 bits i el preprocessador només pot prendre &ASCII; de 8 bits). Amb aquesta opció podreu definir la codificació per a la sortida del preprocessador. + Idioma de dreta a esquerra:Alguns idiomes s'escriuen de dreta a esquerra. Quan aquesta opció està habilitada, el &kdiff3; dibuixarà el text de dreta a esquerra en les finestres d'entrada de les diferències i en la finestra de sortida del fusionat. Recordeu que si inicieu el &kdiff3; amb l'opció de línia d'ordres , llavors tota la disposició també es mostrarà de dreta a esquerra. (Aquesta és una característica proporcionada per les &Qt;). Aquesta documentació es va escriure assumint que aquesta opció o la disposició inversa estan inhabilitades. Per tant, algunes referències a «esquerra» o «dreta» s'hauran de substituir per les seves respectives contraparts si empreu aquestes opcions. + + + + +Miscel·lània +(Aquestes opcions i accions estan disponibles en els menús o a la barra de botons). + + Mostra els números de les línies:Podeu seleccionar si s'han de mostrar els números de línia per als fitxers d'entrada. + Mostra els caràcters d'espai en blanc i els de tabulació per a les diferències:De vegades, els espais visibles i les tabulacions molesten. Ho podeu desactivar. + Mostra els espais en blanc:Desactiveu-la per a suprimir qualsevol ressaltat dels canvis només dels espais en blanc en el text o en les columnes de la visió de conjunt. (Tingueu en compte que això també s'aplicarà als canvis en els números o comentaris si estan actives les opcions «Ignora els números» o «Ignora els comentaris de C/C++»). + Opcions per a la visió de conjunt:Aquestes opcions només estaran disponibles quan es comparin tres fitxers. En el mode normal, totes les diferències es mostraran en una columna de la visió de conjunt codificada per colors. Però de vegades és especialment interessant en les diferències entre només dos d'aquests tres fitxers. En seleccionar «A front B», «A front C» o «B front C», es mostrarà una segona columna de la visió de conjunt amb la informació requerida al costat de la visió de conjunt normal. + Ajusta les línies a les finestres de diferències:Ajusta les línies quan la seva longitud excedeix l'amplada d'una finestra. + Mostra la finestra A/B/C:De vegades es vol utilitzar millor l'espai a la pantalla per a les línies llargues. Oculta les finestres que no són importants. (Al menú Finestra). + Commuta l'orientació de les divisions:Canvia entre les finestres de diferències que es mostren una a costat de l'altra (A a l'esquerra de B, i B a l'esquerra de C) o una damunt de l'altra (A a sobre de B, i B a sobre de C). Això també hauria d'ajudar per a línies llargues. (Al menú Finestres). + Comença un fusionat ràpidament:De vegades esteu veient les diferències d'espais i decidiu fusionar. «Fusiona el fitxer actual» al menú Directori també funciona si només compareu dos fitxers. Un sol clic inicia la fusió i utilitza el nom del fitxer de l'últim fitxer d'entrada com el nom predeterminat del fitxer de sortida. (Quan s'utilitza per tornar a iniciar un fusionat, es mantindrà el nom del fitxer de sortida). + + + +Configurar les dreceres del teclat +Actualment, només la versió dels &frameworks; admet dreceres de teclat configurables per l'usuari. (Menú ArranjamentConfigura les dreceres...). + + + +Ordres del preprocessador +El &kdiff3; admet dues opcions del preprocessador. + + Ordre del preprocessador:Quan es llegeix qualsevol fitxer, es canalitzarà a través d'aquesta ordre externa. La sortida d'aquesta ordre serà visible en lloc del fitxer original. Podeu escriure el vostre propi preprocessador que satisfaci les vostres necessitats específiques. Empreu-la per a retallar parts pertorbadores del fitxer, o per a corregir automàticament el sagnat, &etc; + Ordre del preprocessador per a la coincidència de les línies:Quan es llegeix qualsevol fitxer, es canalitzarà a través d'aquesta ordre externa. Si també s'especifica una ordre del preprocessador (vegeu a dalt), llavors la sortida del preprocessador serà l'entrada del preprocessador per a la coincidència de les línies. La sortida només s'utilitzarà en l'anàlisi durant la fase de coincidència de les línies. Podeu escriure el vostre propi preprocessador que satisfaci les vostres necessitats específiques. Cada línia d'entrada haurà de tenir una línia de sortida corresponent. + + +La idea és permetre a l'usuari una major flexibilitat mentre configura el resultat de les diferències. Però això requereix un programa extern, i molts usuaris no volen escriure'n un ells mateixos. La bona notícia és que molt sovint sed o perl faran la feina. +Exemple: un cas senzill de prova: es considera el fitxer a.txt (6 línies): + aa + ba + ca + da + ea + fa + I el fitxer b.txt (3 línies): + cg + dg + eg + Sense un preprocessador, les següents línies es col·locarien una a una al costat de l'altra: + aa - cg + ba - dg + ca - eg + da + ea + fa + Probablement això no sigui desitjable ja que la primera lletra conté la informació realment interessant. Per ajudar a l'algoritme de coincidència a ignorar la segona lletra, podem utilitzar una ordre de preprocessador per a la coincidència de les línies, que substitueixi «g» amb «a»: + sed 's/g/a/' + Amb aquesta ordre, el resultat de la comparació serà: + aa + ba + ca - cg + da - dg + ea - eg + fa + Internament, l'algoritme de coincidència veu els fitxers després d'executar el preprocessador per a la coincidència de les línies, però a la pantalla el fitxer no canviarà. (El preprocessador normal també canviarà les dades a la pantalla). + +Bàsics al <command +>sed</command +> +Aquesta secció només presenta algunes característiques molt bàsiques de sed. Per a més informació, vegeu info:/sed o http://www.gnu.org/software/sed/manual/html_mono/sed.html. Trobareu una versió precompilada per a &Windows; a http://unxutils.sourceforge.net. Recordeu que els següents exemples suposen que l'ordre sed es troba en alguna carpeta a la variable d'entorn PATH. Si aquest no és el cas, haureu d'especificar el camí absolut per a l'ordre. +En aquest context, només s'utilitza l'ordre sed com a ordre de substitució: + sed 's/EXPRESSIÓ_REGULAR/SUBSTITUCIÓ/ETIQUETES' + Abans d'utilitzar una ordre nova dins del &kdiff3;, primer haureu de provar-ho a la consola. Aquí l'ordre echo és d'utilitat. Exemple: + echo abrakadabra | sed 's/a/o/' + -> obrakadabra + Aquest exemple mostra una ordre de sed molt senzilla que substitueix la primera ocurrència de «a» amb «o». Si voleu substituir-les totes, llavors necessitareu l'etiqueta «g»: + echo abrakadabra | sed 's/a/o/g' + -> obrokodobro + El símbol «|» és l'ordre de canonada que transfereix la sortida de l'ordre anterior a l'entrada de la següent ordre. Si voleu provar amb un fitxer més llarg, podreu utilitzar l'ordre cat en els sistemes similars a &UNIX; o type en els sistemes similars a &Windows;. L'ordre sed farà la substitució de cada línia. cat nom_fitxer | sed opcions + + + +Exemples per a <command +>sed</command +> emprats al &kdiff3;- +Ignorar els altres tipus de comentaris +Actualment, el &kdiff3; només comprèn els comentaris a C/C++. Utilitzant l'ordre del preprocessador per a la coincidència de les línies també podreu ignorar altres tipus de comentaris, convertint-los en comentaris a C/C++. Exemple: per ignorar els comentaris que comencen amb «#», us agradarà convertir-los a «//». Recordeu que també haureu d'habilitar l'opció «Ignora els comentaris de C/C++» per a que tingui efecte. Una ordre apropiada del preprocessador per a la coincidència de les línies seria: + sed 's/#/\/\//' + Com que per a sed, el caràcter «/» té un significat especial, cal col·locar el caràcter «\» abans de cada «/» a la cadena de substitució. De vegades es requereix «\» per afegir o eliminar un significat especial de certs caràcters. Les cometes simples «'» només són importants quan es prova a l'intèrpret d'ordres, ja que en cas contrari intentarà processar alguns caràcters. El &kdiff3; no fa això excepte per a les seqüències d'escapament «\"» i «\\». + +Diferències sensibles a majúscules +Utilitzeu la següent ordre del preprocessador per a la coincidència de les línies per a convertir tota l'entrada a majúscules: + sed 's/\(.*\)/\U\1/' + Aquí el «.*» és una expressió regular que coincideix amb qualsevol cadena i en aquest context coincideix amb tots els caràcters de la línia. El «\1» a la cadena de substitució es refereix al text coincident dins el primer parell de «\(» i «\)». La «\U» converteix el text inserit en majúscules. + + +Ignorar les paraules clau del control de versions +El CVS i altres sistemes per al control de versions utilitzen diverses paraules clau per inserir cadenes generades automàticament (info:/cvs/Keyword substitution). Tots segueixen el patró «$PARAULA_CLAU text generat$». Ara necessitem una ordre del preprocessador per a la coincidència de les línies que només elimini el text generat: + sed 's/\$\(Revision\|Author\|Log\|Header\|Date\).*\$/\$\1\$/' + El «\|» separa les possibles paraules clau. És possible que vulgueu modificar aquesta llista segons les vostres necessitats. El «\» abans del «$» és necessari perquè en cas contrari el «$» coincidirà amb el final de la línia. +Mentre experimenteu amb sed, podríeu arribar a comprendre fins i tot aquestes expressions regulars. Són útils perquè hi ha molts altres programes que també admeten coses similars. + + +Ignorar els números +Ignorar els números en realitat és una opció incorporada. Però com un altre exemple, així és com es veuria com una ordre del preprocessador per a la coincidència de les línies. + sed 's/[0123456789.-]//g' + Qualsevol caràcter dins de «[» i «]» serà una coincidència i serà substituït per res. + + +Ignorar certes columnes +De vegades, un text té un format molt estricte i conté columnes que sempre voleu ignorar, mentre que hi ha altres columnes que voldreu conservar per a la seva anàlisi. En el següent exemple, s'ignoren les primeres cinc columnes (caràcters), es conserven les següents deu columnes, després de nou s'ignoren cinc columnes i es conserva la resta de la línia. + sed 's/.....\(..........\).....\(.*\)/\1\2/' + Cada punt «.» coincidirà amb qualsevol caràcter individual. El «\1» i «\2» a la cadena de substitució es refereixen al text coincident dins del primer i segon parell de «\(» i «\)» denotant el text a preservar. + + +Combinar diverses substitucions +De vegades voldreu aplicar diverses substitucions alhora. Després podreu utilitzar el punt i coma «;» per a separar les unes de les altres. Exemple: echo abrakadabra | sed 's/a/o/g;s/\(.*\)/\U\1/' + -> OBROKODOBRO + + + + +Emprar <command +>perl</command +> en comptes de <command +>sed</command +> +En comptes de sed, possiblement voldreu utilitzar una mica més com perl. + perl -p -e 's/EXPRESSIÓ_REGULAR/SUBSTITUCIÓ/ETIQUETES' + Però alguns detalls són diferents en perl. Recordeu que on sed necessitava «\(» i «\)» el perl requereix el més simple «(» i «)» sense precedir «\». Exemple: sed 's/\(.*\)/\U\1/' + perl -p -e 's/(.*)/\U\1/' + + + + + +Ordre d'execució del preprocessador +En la següent ordre, les dades es canalitzen a través de tots els preprocessadors interns i externs: + +Prepocessador normal, +Preprocessador per a la coincidència de les línies, +Ignora les majúscules/minúscules (conversió a majúscules), +Detecció dels comentaris a C/C++, +Ignora els números, +Ignora els espais en blanc + +Les dades després del preprocessador normal es conservaran per a la seva visualització i fusionat. Les altres operacions només modificaran les dades que vegi l'algoritme de coincidència de les línies. En els rars casos en què utilitzeu un preprocessador normal, tingueu en compte que el preprocessador per a la coincidència de les línies veurà la sortida del preprocessador normal com a una entrada. + + +Avís +Les ordres del preprocessador solen ser molt útils, però com amb qualsevol opció que modifiqui els textos o oculti certes diferències automàticament, pot passar per alt certes diferències accidentalment i, en el pitjor dels casos, destruir dades importants. Per aquesta raó, durant un fusionat, si s'empra una ordre del preprocessador normal, el &kdiff3; dirà i us demanarà si s'ha d'inhabilitar o no. Però no us avisarà si una ordre del preprocessador per a la coincidència de les línies està activa. El fusionat no es completarà fins que es resolguin tots els conflictes. Si inhabiliteu «Mostra els espais en blanc», també seran visibles les diferències que es van eliminar amb l'ordre del preprocessador per a la coincidència de les línies. Si el botó Desa roman inhabilitat durant un fusionat (a causa que romanen conflictes), podreu habilitar «Mostra els espais en blanc». Si no voleu fusionar manualment aquestes diferències menys importants, podreu seleccionar «Escull [A|B|C] a tots els conflictes dels espais en blanc no resolts» al menú Fusiona. + + + + + +Comparació i fusionat de directoris amb el &kdiff3; +Introducció a la comparació i fusionat de directoris +Sovint, els programadors han de modificar molts fitxers en un directori per aconseguir el seu propòsit. Per això, el &kdiff3; també permet comparar i fusionar directoris complets de forma recursiva! Encara que comparar i fusionar directoris sembla força obvi, hi ha diversos detalls que haureu de conèixer. Per descomptat, el més important és el fet que ara es podran veure afectats molts fitxers per cada operació. Si no teniu còpies de seguretat de totes les dades originals, podria ser molt difícil o fins i tot impossible tornar a l'estat original. De manera que abans de començar un fusionat, assegureu-vos que les vostres dades estan segures i que serà possible tornar a l'estat inicial. Si creeu un arxiu o utilitzeu algun sistema per al control de versions -aquesta és la vostra decisió-, fins i tot els programadors i integradors experimentats necessiten de tant en tant les fonts antigues. I tingueu en compte que encara que jo (l'autor del &kdiff3;) intento fer-ho el millor possible, no puc garantir que no hi hagi errors. Segons la GPL de GNU, NO HI HA CAP GARANTIA per a aquest programa. Així que sigueu humil i tingueu-ho sempre present: +
+ Errar és humà, però per arruïnar realment les coses, necessitareu un ordinador. +
+De manera que això és el que aquest programa pot fer: el &kdiff3;... + + ...llegeix i compara dos o tres directoris de forma recursiva, + ...té una cura especial en els enllaços simbòlics, + ...permet explorar fitxers amb doble clic del ratolí, + ...per a cada element proposa una operació de fusionat, el qual podreu canviar abans d'iniciar el fusionat del directori, + ...permet simular el fusionat i llista les accions que tindran lloc, sense fer-les realment, + ...permet realment fer el fusionat, i permet interactuar quan sigui necessària la interacció manual, + ...permet executar l'operació seleccionada per a tots els elements (tecla F7) o l'element seleccionat (tecla F6), + ...permet continuar el fusionat després de la interacció manual amb la tecla F7, + ...de manera opcional crea còpies de seguretat, amb l'extensió .orig, + ... + + + +Començar amb la comparació o fusionat dels directoris +Això és molt similar al fusionat i comparació de fitxers individuals. Només haureu d'especificar els directoris a la línia d'ordres o en el diàleg per obrir fitxers. +Comparar/Fusionar dos directoris: +kdiff3 dir1 dir2 + kdiff3 dir1 dir2 -o directori_destinació + +Si no s'especifica un directori de destinació, el &kdiff3; emprarà dir2. + + +Comparar/Fusionar l'arbre de directoris: +kdiff3 dir1 dir2 dir3 + kdiff3 dir1 dir2 dir3 -o directori_destinació + +Quan es fusionen 3 directoris, s'utilitza dir1 com a base per al fusionat. Si no s'especifica cap directori de destinació, el &kdiff3; utilitzarà dir3 com el directori de destinació per al fusionat. + +Recordeu que només la comparació començarà automàticament, no el fusionat. Per això, primer haureu de seleccionar una entrada de menú o la tecla F7. (Més detalls més endavant). + + + +Informació visible en fusionar directoris +Mentre es llegeixen els directoris, apareixerà un quadre de missatge informant sobre el progrés. Si interrompeu l'exploració del directori, només es llistaran els fitxers que s'hagin comparat fins llavors. Quan es completa l'exploració del directori, el &kdiff3; mostrarà un quadre de llista amb els resultats restants... + + + +...i els detalls sobre l'element actualment seleccionat a la dreta: + + + + + +La columna Nom +Cada fitxer i directori que s'ha trobat durant l'exploració es mostrarà aquí en un arbre. Podreu seleccionar un element fent-hi clic amb el ratolí. Els directoris estaran plegats de manera predeterminada. Els podreu desplegar i plegar fent clic al signe «+»/«-» o fent doble clic sobre l'element o amb les tecles de cursor &Left;/&Right;. El menú Directori també conté dues accions Plega tots els subdirectoris i Desplega tots els subdirectors amb les quals podreu contraure o expandir tots els directoris alhora. Si feu doble clic a un element de fitxer, s'iniciarà la comparació dels fitxers i apareixerà la finestra de diferències. +La imatge a la columna Nom reflectirà el tipus de fitxer en el primer directori («A»). Pot ser una d'aquestes: + + Fitxer normal + Directori normal (imatge del directori) + Enllaç amb un fitxer (imatge del fitxer amb una fletxa d'enllaç) + Enllaç amb un directori (imatge del directori amb una fletxa d'enllaç) + +Si el tipus de fitxer és diferent en els altres directoris, això serà visible en les columnes A/B/C i en la finestra que mostra els detalls sobre l'element seleccionat. Tingueu en compte que, en aquest cas, no es podrà seleccionar automàticament cap operació de fusionat. En iniciar el fusionat, l'usuari serà informat dels problemes d'aquest tipus. + + +Les columnes A/B/C i l'esquema de colors +Com es pot veure a la imatge de dalt, els colors vermell, verd, groc i negre s'utilitzen en les columnes A/B/C. + + Negre: aquest element no existeix en aquest directori. + Verd: element més nou. + Groc: més antic que el verd, més nou que el vermell. + Vermell: element més antic. + +Però per als elements que eren idèntics en la comparació, el seu color també serà idèntic fins i tot si l'antiguitat no ho és. Els directoris es consideraran iguals si tots els elements que contenen són idèntics. Llavors també tindran el mateix color. Però l'antiguitat d'un directori no es considera pel seu color. La idea d'aquest esquema de coloració el vaig trobar a dirdiff. Els colors s'assemblen als colors d'una fulla que és verda quan és nova, més tard es torna groga i vermella quan és vella. + +La columna Operació +Després de comparar els directoris, el &kdiff3; també avaluarà una proposta per a una operació de fusionat. Això es mostra a la columna «Operació». Podreu modificar l'operació fent clic sobre l'operació que voleu canviar. Apareixerà un petit menú emergent que us permetrà seleccionar una operació per a aquest element. (També podreu seleccionar les operacions més necessàries mitjançant el teclat. &Ctrl;1/2/3/4/∇ seleccionarà A/B/C/Fusiona/Suprimeix respectivament, si està disponible). Aquesta operació s'executarà durant el fusionat. Quines operacions hi haurà disponibles, dependrà de l'element i del mode de fusionat en què esteu. El mode de fusionat serà un de + + Fusionar tres directoris («A» es tracta com la base més antiga d'ambdós). + Fusionar dos directoris. + Mode sincronitza dos directoris (activat mitjançant l'opció «Sincronitza els directoris»). + +En el fusionat de tres directoris, la proposta d'operació serà: Si per a un element... + + ...els tres directoris són iguals: copiar des de C + ...A i C són iguals però B no ho és: copiar des de B (o si B no existeix, suprimir la destinació si existeix) + ...A i B són iguals però C no ho és: copiar des de C (o si C no existeix, suprimir la destinació si existeix) + ...B i C són iguals però A no ho és: copiar des de C (o si C no existeix, suprimir la destinació si existeix) + ...només existeix A: suprimir la destinació (si existeix) + ...només existeix B: copiar des de B + ...només existeix C: copiar des de C + ...A, B i C no són iguals: fusionar + ...A, B i C no tenen el mateix tipus de fitxer (&pex;, A és un directori, B és un fitxer): «Error: Tipus de fitxer en conflicte». Si bé aquests elements existeixen, el fusionat de directoris no pot començar. + +En el fusionat de dos directoris, la proposta d'operació serà: Si per a un element... + + ...ambdós directoris són iguals: copiar des de B + ...A existeix, però no B: copiar des d'A + ...B existeix, però no A: copiar des de B + ...A i B existeixen però no són iguals: fusionar + ...A i B no tenen el mateix tipus de fitxer (&pex;, A és un directori, B és un fitxer): «Error: Tipus de fitxer en conflicte». Si bé aquests elements existeixen, el fusionat de directoris no pot començar. + +El mode de sincronització està actiu si només s'han especificat dos directoris i cap destinació explícita, i si l'opció Sincronitza els directoris està activa. Després, el &kdiff3; seleccionarà una operació predeterminada perquè els dos directoris siguin iguals després. Si per a un element... + + ...ambdós directoris són iguals: no es farà res. + ...A existeix, però no B: copiar A a B + ...B existeix, però no A: copiar B a A + ...A i B existeixen, però no són iguals: fusionar i emmagatzemar el resultat en ambdós directoris. (Per a l'usuari, el nom visible del fitxer desat és B, però després el &kdiff3; també copiarà B a A). + ...A i B no tenen el mateix tipus de fitxer (&pex;, A és un directori, B és un fitxer): «Error: Tipus de fitxer en conflicte». Si bé aquests elements existeixen, el fusionat de directoris no pot començar. + +Quan es fusionen dos directoris i se selecciona l'opció Copia el més nou en comptes de fusionar-los, el &kdiff3; examinarà les dates i proposarà triar el fitxer més nou. Si els fitxers no són iguals però tenen dates iguals, llavors l'operació contindrà «Error: les dates són iguals però els fitxers no». Si bé aquests elements existeixen, el fusionat de directoris no pot començar. + + +La columna Estat +Durant el fusionat, es processarà un fitxer rere l'altre. La columna d'estat mostrarà «Fet» per als elements on l'operació de fusionat ha tingut èxit i altres textos si succeeix alguna cosa inesperada. Quan es completa un fusionat, haureu de realitzar una última comprovació per a veure si l'estat de tots els elements és acceptable. + + +Columnes d'estadístiques +Quan el mode de comparació de fitxers Anàlisi completa està habilitat en les opcions, el &kdiff3; mostrarà columnes addicionals que contenen el nombre de conflictes no resolts, resolts, no blanc i espai en blanc. (La columna Resolt només es mostrarà en comparar o fusionar 3 directoris). + + +Seleccionar els fitxers llistats +Diverses opcions influeixen en els fitxers que es llisten aquí. Alguns són accessibles en el diàleg de configuració. El menú Directori conté les entrades: + Mostra els fitxers idèntics: els fitxers que s'han detectat com a iguals en tots els directoris d'entrada. + Mostra els fitxers diferents: els fitxers que existeixen a dos o més directoris però que no són iguals. + Mostra els fitxers que només són a A: els fitxers que només existeixen a A, però no a B o C. + Mostra els fitxers que només són a B: els fitxers que només existeixen a B, però no a A o C. + Mostra els fitxers que només són a C: els fitxers que només existeixen a C, però no a A o B. + +Activeu només les opcions Mostra per als elements que voleu llistar. Si, per exemple, només voleu llistar tots els elements que hi ha a A o a B però no en ambdós, haureu d'activar Mostra els fitxers que només són a A i Mostra els fitxers que només són a B i desactivar totes les altres (Mostra els fitxers idèntics, Mostra els fitxers diferents, Mostra els fitxers que només són a C). La llista s'actualitzarà immediatament per a reflectir el canvi. Aquestes opcions també s'apliquen als directoris amb una excepció: inhabilitant Mostra els fitxers diferents no ocultarà cap directori sencer. Això només funcionarà per a dins dels fitxers. Tingueu en compte que d'aquestes, només l'opció Mostra els fitxers idèntics és persistent. Les altres estaran habilitades en iniciar el &kdiff3;. + + + + + +Fer un fusionat del directori A +Podreu fusionar l'element seleccionat (fitxer o directori) o tots els elements. Quan hàgiu realitzat totes les vostres eleccions d'operació (també en tots els subdirectoris), llavors podreu iniciar el fusionat. Recordeu que si no heu especificat explícitament un directori de destinació, llavors la destinació serà «C» en el mode de tres directoris, «B» en el mode de fusionat de dos directoris, i en el mode de sincronització serà «A» o/i «B». Si heu especificat un directori de destinació, comproveu també que tots els elements que haurien d'estar a la sortida estiguin a l'arbre. Hi ha algunes opcions que fan que certs elements siguin omesos en la comparació i fusionat de directoris. Marqueu aquestes opcions per evitar sorpreses desagradables: + + Directoris recursius: si està desactivada, no es trobaran els elements en els subdirectoris. + Patró/Negatiu del patró: inclou/exclou els elements que coincideixen + Excloure els fitxers ocults + Les opcions «Mostra» (Mostra els fitxers idèntics/diferents, Mostra els fitxers que només són a A/B/C) + +Si canvieu la configuració per enumerar més arxius, ha de tornar a escanejar a través de menú DirectoriTorna a explorar. (La raó d'això és que per a una velocitat de comparació més ràpida, el &kdiff3; ometrà la comparació dels fitxers suprimits seguint aquest criteri). Si heu canviat els vostres patrons de fitxers i directoris per excloure fitxers, la llista de fitxers s'actualitzarà immediatament en tancar el diàleg d'opcions. Recordeu que quan escriviu en un directori completament nou, generalment també voldreu copiar els fitxers idèntics. En aquest cas, habiliteu l'opció Mostra els fitxers idèntics. Si el directori de destinació és una de les entrades, llavors això no caldrà perquè el fitxer ja hi és. Si fins ara esteu satisfet, la resta serà fàcil. Per fusionar tots els elements: Seleccioneu Comença/Continua el fusionat dels directoris al menú Directori o premeu F7 (la qual és la drecera predeterminada). Per a només fusionar l'element actual: seleccioneu Executa l'operació per a l'element actual o premeu F6. Si a causa de tipus de fitxers en conflicte encara hi ha alguns elements amb operacions no vàlides, apareixerà un quadre de missatge i s'indicaran aquests elements, de manera que pugueu seleccionar una operació vàlida per a l'element. Si fusioneu tots els elements, apareixerà un diàleg que us donarà les opcions Fes-ho, Simula-ho i Cancel·la. + + Seleccioneu Simula-ho si voleu veure el que es faria sense fer-ho en realitat. Es mostrarà una llista detallada de totes les operacions. + En cas contrari, seleccioneu Fes-ho per a començar en realitat a fusionar. + +Llavors el &kdiff3; executarà l'operació especificada per a tots els elements. Si es requereix interacció manual (fusionat d'un sol fitxer), s'obrirà una finestra de fusionat (vegeu la captura de pantalla gran). En acabar de fusionar manualment un fitxer, torneu a seleccionar Comença/Continua el fusionat dels directoris o la tecla F7. Si encara no l'heu desat, un diàleg us demanarà que ho feu. Llavors el &kdiff3; continuarà amb el següent element. Quan el &kdiff3; troba un error, us ho indicarà i mostrarà la informació detallada sobre l'estat. Al final d'aquesta llista, hi haurà alguns missatges d'error que us ajudaran a comprendre la causa del problema. Quan continueu fusionant (tecla F7), el &kdiff3; us donarà l'opció de tornar a intentar o ometre l'element que ha causat el problema. Això vol dir que abans de continuar podreu triar una altra operació o resoldre el problema per altres mitjans. Quan es completi el fusionat, el &kdiff3; us informarà mitjançant un quadre de missatge. Si alguns elements s'han fusionat individualment abans d'executar el fusionat de directoris, el &kdiff3; us ho recordarà (mentre continueu amb aquesta sessió de fusionat), i no els tornarà a fusionar més tard quan s'executi el fusionat de tots els elements. Fins i tot quan s'ha omès el fusionat o no s'ha desat res, aquests elements comptaran com a completats. Només quan canvieu l'operació de fusionat, l'estat Fet de l'element serà eliminat i podreu fusionar de nou. + + +Opcions per a comparar i fusionar directoris +Les preferències del &kdiff3; (menú ArranjamentConfigura el &kdiff3;...) té una secció anomenada Fusionat de directoris amb aquestes opcions: + + + Directoris recursius:Seleccioneu si voleu cercar als directoris de forma recursiva. + Patró/ons dels fitxers:Només es col·locaran a l'arbre els fitxers que coincideixin aquí amb qualsevol patró. Podreu especificar més d'un patró utilitzant el punt i coma «;» com a separador. Els comodins vàlids: «*» i «?». (&pex;, «*.cpp;*.h»). El valor predeterminat és «*». Aquest patró no s'utilitza en els directoris. + Negatiu del/s patró/ons dels fitxers:Els fitxers que coincideixin amb aquest patró s'exclouran de l'arbre. Podreu especificar més d'un patró utilitzant el punt i coma «;» com a separador. Els comodins vàlids: «*» i «?». El valor predeterminat és «*.orig;*.o;*.obj». + Negatiu del/s patró/ons dels directoris:Els directoris que coincideixin amb aquest patró s'exclouran de l'arbre. Podreu especificar més d'un patró utilitzant el punt i coma «;» com a separador. Els comodins vàlids: «*» i «?» El valor predeterminat és «CVS;deps;.svn». + Utilitza «CVS-Ignore»:S'ignoraran els fitxers i directoris que també serien ignorats pel CVS. El CVS ignora molts fitxers generats automàticament. El gran avantatge és que pot ser un directori específic a través d'un fitxer local .cvsignore. (Vegeu info:/cvs/cvsignore). + Cerca als fitxers i directoris ocults:En alguns sistemes de fitxers, els fitxers tenen un atribut «Ocult». En altres sistemes, un nom de fitxer que comença amb un punt «.» fa que resti ocult. Aquesta opció permet decidir si voleu incloure o no aquests fitxers en l'arbre. El valor predeterminat és activada. + Segueix els enllaços de fitxer:Per als enllaços a fitxers: quan està inhabilitada, es compararan els enllaços simbòlics. Quan està habilitada, es compararan els fitxers que hi ha al darrere dels enllaços. El valor predeterminat és desactivada. + Segueix els enllaços de directori:Per als enllaços a directoris: quan està inhabilitada, es compararan els enllaços simbòlics. Quan està habilitada, l'enllaç es tractarà com un directori i s'explorarà de forma recursiva. (Recordeu que el programa no comprovarà si l'enllaç és «recursiu». Llavors, per exemple, un directori que conté un enllaç a un directori causaria un bucle infinit, i després d'un temps quan la pila es desbordi o s'esgoti tota la memòria, es bloquejarà el programa). El valor predeterminat és desactivada. + La comparació dels noms de fitxer és sensible a majúscules i minúscules:De manera predeterminada és fals al &Windows;, cert per als altres sistemes operatius. + Mode de comparació dels fitxers: + + Comparació binària:Aquest és el mode de comparació de fitxers predeterminat. + Anàlisi completa:Fa una anàlisi completa de cada fitxer i mostra les columnes d'informació estadística. (Nombre de conflictes Resolt, No resolt, No blanc i Blanc). L'anàlisi completa és més lenta que una anàlisi binària senzilla, i molt més lenta quan s'utilitza en fitxers que no contenen text. (Especifiqueu el negatiu del patrons de fitxer apropiats). + Confia en la data de modificació:Si compareu directoris grans en una xarxa lenta, podria ser més ràpid comparar només les dates de modificació i la longitud del fitxer. Però aquesta millora en la velocitat ve amb el preu d'una petita incertesa. Utilitzeu aquesta opció amb cura. El valor predeterminat és desactivada. + Confia en la mida:Similar a confiar en la data de modificació. No succeeix una comparació real. Dos fitxers es consideraran iguals si les seves mides de fitxer són iguals. Això és útil quan l'operació de còpia de fitxers no conserva la data de modificació. Utilitzeu aquesta opció amb cura. El valor predeterminat és desactivada. + + + Sincronitza els directoris:Activa el Mode de sincronització quan es comparen dos directoris i no s'ha especificat cap directori de destinació explícit. En aquest mode, les operacions propostes s'escolliran de manera que ambdós directoris font siguin iguals després. A més, el resultat del fusionat s'escriurà en ambdós directoris. El valor predeterminat és desactivada. + Copia el més nou en comptes de fusionar-los:En lloc de fusionar l'operació proposada, es copiarà la font més nova si han succeït canvis. (Considerat insegur, perquè implica que sabeu que l'altre fitxer no ha estat també editat. Comproveu-ho per assegurar-vos en tots els casos). El valor predeterminat és desactivada. + Fitxers per a còpia de seguretat (.orig):Si se substitueix un fitxer o directori complet per un altre o se suprimeix, la versió original canviarà de nom amb l'extensió .orig. Si ja existeix un fitxer antic de còpia de seguretat amb aquesta extensió, se suprimirà sense còpia de seguretat. Això també afectarà el fusionat normal de fitxers individuals, no només en el mode fusionat de directoris. El valor predeterminat és activada. + + + +Altres funcions a la finestra per al fusionat de directoris +Mode de pantalla dividida/completa +En general, la vista de llista per al fusionat de directoris romandrà visible mentre es compara o fusiona un sol fitxer. Amb el ratolí, podreu moure la barra divisòria que separa la llista de fitxers de les finestres de diferències de text. Si no voleu això, podreu inhabilitar Vista de pantalla dividida en text i directoris al menú Directori. Després podreu utilitzar Commuta la vista al menú Directori per a canviar entre la llista de fitxers i la vista de diferències de text que després ocuparan la pantalla completa. + +Comparar o fusionar un sol fitxer +Probablement preferireu un doble clic del ratolí en un fitxer per a comparar-lo. No obstant això, també hi ha una entrada al menú Directori. També podreu fusionar directament un sol fitxer seleccionant-lo i triant l'element de menú FusionaFusiona el fitxer actual. En desar el resultat, l'estat s'establirà com a fet i el fitxer no es fusionarà de nou si s'inicia un fusionat de directori. Fixeu-vos, que aquesta informació d'estat es perdrà quan torneu a executar una anàlisi de directori: DirectoriTorna a explorar + +Comparar o fusionar fitxers amb noms diferents +A vegades necessitareu comparar o fusionar fitxers amb noms diferents (&pex;, el fitxer actual i la còpia de seguretat a la mateixa carpeta). Seleccioneu el fitxer exacte fent clic a la icona a la columna A, B o C. El primer fitxer seleccionat s'haurà de marcar amb una A, el segon i el tercer amb B i C, independentment de la columna en la que es trobin. D'aquesta manera només es podran triar fins a tres fitxers. Continueu triant Compara els fitxers seleccionats explícitament o Fusiona els fitxers seleccionats explícitament des del menú Directori. Per a la vostra comoditat, aquestes entrades de menú també apareixeran com un menú contextual quan feu clic dret en l'últim fitxer seleccionat. La comparació o fusionat d'un fitxer succeirà a la mateixa finestra. Si s'utilitza aquest mètode per als directoris, s'obrirà una finestra nova. + + + + +Temes diversos + +Transparència de xarxa a través del KIO +Esclaus KIO +La biblioteca KIO dels &frameworks; admet la transparència de xarxa mitjançant els esclaus KIO. El &kdiff3; la farà servir per a llegir els fitxers d'entrada i per explorar els directoris. Això vol dir que podreu especificar fitxers i directoris en recursos locals i remots mitjançant els &URL;. Exemple: +kdiff3 test.cpp ftp://ftp.faraway.org/test.cpp + kdiff3 tar:/home/hacker/archive.tar.gz/dir ./dir + + +La primera línia compara un fitxer local amb un fitxer en un servidor &FTP;. La segona línia compara un directori dins d'un arxiu comprimit amb un directori local. Altres esclaus KIO que també són interessants: + +Fitxers des del WWW (http:), +Fitxers des de l'&FTP; (ftp:), +Transferència de fitxers encriptats (fish:, sftp:), +Recursos de &Windows; (smb:), +Fitxers locals (file:), + +Altres coses que també són possibles, però probablement menys útils: + +Pàgines «man» (man:), +Pàgines «info» (info:), + + + +Com escriure els URL +Un &URL; té una sintaxi diferent en comparació amb els camins dels fitxers i directoris locals. S'han de considerar algunes coses: + +Un camí pot ser relatiu i pot contenir «.» o «..». Això no és possible per als &URL; que sempre són absoluts. Els caràcters especials s'han d'escriure amb «escapament». («#» -> «%23», espai -> «%20», &etc;) Per exemple, un fitxer amb el nom «/#foo#» tindria l'&URL; «file:/%23foo%23». Quan els &URL; no funcionin com s'espera, primer intenteu obrir-los al &konqueror;. + + + + +Capacitats dels esclaus KIO +La transparència de xarxa té un inconvenient: no tots els recursos tenen les mateixes capacitats. De vegades això es deu al sistema de fitxers del servidor, de vegades a causa del protocol. Aquí hi ha una breu llista de les restriccions: + +De vegades no s'admeten els enllaços. O no hi ha forma de distingir si un enllaç apunta a un fitxer o directori. Sempre assumint un fitxer. (ftp:, sftp:). No sempre es pot determinar la mida del fitxer. Suport limitat per als permisos. No hi ha possibilitat de modificar els permisos o el temps de modificació, de manera que els permisos o el temps d'una còpia diferiran de l'original. (Vegeu l'opció Confia en la mida). (Per a modificar els permisos o el temps de modificació només és possible per als fitxers locals). + + + + + +Emprar el &kdiff3; com a una KPart +El &kdiff3; és una KPart. Actualment implementa la interfície KParts::ReadOnlyPart. El seu ús principal és com a visor de diferències en el &kdevelop;. El &kdevelop; sempre inicia primer el visor de diferències intern. Per a invocar el &kdiff3;, premeu el &BDR; a la finestra de la vista de diferències i seleccioneu Mostra a la part del &kdiff3; al menú contextual. El &kdiff3; normalment requereix dos fitxers complets com a entrada. Quan s'utilitza com a part, el &kdiff3; assumirà que el fitxer d'entrada és un fitxer de pedaç en el format unificat. Llavors el &kdiff3; recuperarà els noms de fitxer originals des del fitxer de pedaç. Almenys un dels dos fitxers haurà d'estar disponible. Llavors el &kdiff3; invocarà l'ordre patch per a recrear el segon fitxer. En el &dolphin; podreu seleccionar un fitxer de pedaç i seleccionar l'element Vista prèvia aPart del &kdiff3; al menú contextual. Tingueu en compte que això no funcionarà si cap dels fitxers originals està disponible, i no és fiable si els fitxers originals han canviat des que es va generar el fitxer de pedaç. Quan s'executa com a part, el &kdiff3; només proporciona una diferència de dos fitxers amb una barra d'eines i un menú molt petits. De manera que el fusionat o la comparació de directoris no són admeses. + + + +Usar el &kdiff3; com a una eina de «diff» i fusionat de &git; +Es pot emprar el &kdiff3; com a una eina de «diff» i fusionat de &git;. +Simplement afegiu les següents línies al vostre fitxer gitconfig. +[diff] + tool = kdiff3 +[difftool "kdiff3"] + path = <camí cap al binari kdiff3 al vostre sistema> +[difftool] + prompt = false + keepBackup = false + trustExitCode = false +[merge] + tool = kdiff3 +[mergetool] + prompt = false + keepBackup = false + keepTemporaries = false +[mergetool "kdiff3"] + path = <camí cap al binari kdiff3 al vostre sistema> + +Després, per a veure les diferències entre dos «commits», utilitzeu git difftool primera_suma segona_suma --tool=kdiff3 --cc algun_fitxer_a_larbre_de_Git +Per a fusionar una branca amb el &kdiff3;, utilitzeu git merge nom_branca && git mergetool --tool=kdiff3 +Una vegada resolts els conflictes de fusionat de la forma habitual, n'hi haurà prou amb confirmar els canvis per fer la tasca. + + + + +Preguntes i respostes&reporting.bugs; &updating.documentation; + +Per què s'anomena «&kdiff3;»? Les eines anomenades KDiff i KDiff2 (ara s'anomenen &kompare;) ja existeixen. A més, &kdiff3; hauria de suggerir que pot fusionar com l'eina diff3 a la col·lecció «Diff-Tool». + +Per què el vaig alliberar sota la GPL? Estic emprant programes GPL des de fa molt de temps i vaig aprendre molt en fer una ullada a moltes de les fonts. Per tant, aquest és el meu «Gràcies» a tots els programadors que també ho van fer o que faran el mateix. + +Manquen alguns botons i funcions. Què passa? Heu compilat des del codi font però probablement no heu especificat el prefix correcte per a la instal·lació. De manera predeterminada, el cmake vol instal·lar a /usr/local però després no pot trobar el fitxer de recursos de la interfície d'usuari (&ead;, kdiff3ui.rc). El fitxer README conté més informació sobre el prefix correcte. + +Sovint, les línies que són similars però no idèntiques apareixen una a costat de l'altra, però de vegades no. Per què? Les línies on només la quantitat de caràcters d'espai en blanc és diferent, es tractaran com a «iguals» al començament, mentre que només un caràcter no blanc diferent farà que les línies siguin «diferents». Si apareixen línies similars una al costat de l'altra, això en realitat és una coincidència, però afortunadament sovint és així. Vegeu també l'ajuda del manual de «diff». + +Per què s'han de resoldre tots els conflictes abans que es pugui desar el resultat del fusionat? Per a cada secció igual o diferent, l'editor a la finestra de resultats del fusionat recordarà on comença o on acaba. Això és necessari perquè els conflictes es puguin resoldre manualment simplement seleccionant el botó de la font (A, B o C). Aquesta informació es perdrà mentre es desa com a text i és massa esforç crear un format de fitxer especial que admeti desar i restaurar tota la informació necessària. + +Com puc sincronitzar les vistes de les diferències i el fusionat, de manera que totes les vistes mostrin la mateixa posició al text? Feu clic a la columna del resum a l'esquerra del text. (Vegeu també aquí). + +Per què l'editor a la finestra de resultats del fusionat no té l'opció «Desfés»? Això seria massa esforç fins ara. Sempre podreu restaurar una versió des d'una font (A, B o C) fent clic al botó corresponent. De totes maneres, per a una gran edició, es recomana emprar un altre editor. + +Quan elimino una mica de text, de sobte apareix «<La línia no és codi>» i no es pot suprimir. Què vol dir i com es pot treure? Per a cada secció igual o diferent, l'editor a la finestra de resultats del fusionat recordarà on comença o on acaba. «<La línia no és codi>» vol dir que no queda res en una secció, ni tan sols un caràcter de línia nova. Això pot succeir mentre es fusiona automàticament o s'edita. Això no és cap problema, ja que aquest suggeriment no apareixerà en el fitxer desat. Si voleu recuperar la font original, només haureu de seleccionar la secció (feu clic a la columna de resum esquerra) i després feu clic al botó de la font amb el contingut necessari (A/B o C). + +Per què el &kdiff3; no admet el ressaltat de la sintaxi? El &kdiff3; ja utilitza molts colors per a ressaltar les diferències. Més ressaltat seria confús. Per a això, empreu un altre editor. + +Puc emprar el &kdiff3; per a comparar fitxers OpenOffice.org, &Microsoft; Word, &Microsoft; Excel, &PDF;, &etc;? Encara que el &kdiff3; analitzarà qualsevol tipus de fitxer, el resultat probablement no serà molt satisfactori. El &kdiff3; es va crear per a comparar fitxers de text pur. L'OpenOffice.org, el &Microsoft; Word, el &Microsoft; Excel, &etc; emmagatzemen molta més informació en els fitxers (sobre els tipus de lletra, imatges, pàgines, colors, &etc;) que el &kdiff3; no coneix. Per tant, el &kdiff3; mostrarà el contingut del fitxer interpretat com a text pur, però això podria ser il·legible o al menys es veurà molt estrany. Com la majoria dels programes avui en dia emmagatzemen el seu contingut en el format &XML;, és possible que pugueu llegir-lo com a text pur. Llavors, si el canvi només ha estat petit, el &kdiff3; encara podria ajudar-vos. La millor solució si només voleu comparar el text (sense objectes incrustats com les imatges) és utilitzar els elements de menú EditaSelecciona-ho tot i EditaCopia en el vostre programa per a copiar el text interessant en el porta-retalls i després en el &kdiff3; enganxar el text en qualsevol finestra d'entrada de les diferències. (Vegeu també Seleccionar, copiar i enganxar). + +On està l'opció per a directoris Llista només les diferències en els espais? Ara hi ha diverses opcions «Mostra» al menú Directori. Inhabilitant Mostra els fitxers idèntics aconseguireu el que solíeu fer habilitant Llista només les diferències en els espais. + +Com puc fer una gran selecció a la finestra d'entrada de les diferències? El desplaçament porta molt de temps? Inicieu la selecció com de costum (feu clic i manteniu premut el &BER;). Llavors empreu les tecles de navegació (&pex;, &PgUp;, &PgDn;) mentre manteniu premut el &BER;. (Vegeu també Seleccionar, copiar i enganxar). + +Aquí hi ha molta informació, però la meva pregunta encara no s'ha respost. Si us plau, envieu-me la vostra pregunta. Agraeixo cada comentari. + + + + + + +Crèdits i llicència + +&kdiff3;; Eina per a la comparació i fusionat de fitxers i directoris +Copyright del programa 2002-2007 Joachim Eibl joachim.eibl at gmx.de +Diverses idees genials i informes d'errors han vingut de col·legues i molta gent a la Wild Wild Web. Gràcies a vosaltres! + +Copyright de la documentació © 2002-2007 Joachim Eibl joachim.eibl at gmx.de + +Traductor de la documentació: &credits.Antoni.Bella; &underFDL; &underGPL; + +&documentation.index; + + + Binary files /tmp/tmpTxwPj4/FOdOX4m4Im/kdiff3-1.8.01/po/ca/docs/kdiff3/letter_by_letter.png and /tmp/tmpTxwPj4/mqn9IX4anS/kdiff3-1.8.3/po/ca/docs/kdiff3/letter_by_letter.png differ diff -Nru kdiff3-1.8.01/po/ca/docs/kdiff3/man-kdiff3.1.docbook kdiff3-1.8.3/po/ca/docs/kdiff3/man-kdiff3.1.docbook --- kdiff3-1.8.01/po/ca/docs/kdiff3/man-kdiff3.1.docbook 1970-01-01 00:00:00.000000000 +0000 +++ kdiff3-1.8.3/po/ca/docs/kdiff3/man-kdiff3.1.docbook 2020-06-25 00:19:11.000000000 +0000 @@ -0,0 +1,452 @@ + + +]> + + + +Manual d'usuari del KDiff3 +BurkhardLueck Pàgina de manual del KDiff3. &Burkhard.Lueck.mail; +22 de febrer de 2019 +kdiff3 1.8 + + + +kdiff3 +1 + + + +kdiff3 +Eina per a comparar i fusionar fitxers i directoris + + + +kdiff3 fitxer fitxer fitxer àlies1 àlies2 àlies3 àlies cadena fitxer + + + +Descripció +Compara dos o tres fitxers o directoris des de l'entrada. + + + + +Opcions + + + +Ignorat. (Definit per l'usuari). + + + + +Ignorat. (Definit per l'usuari). + + + + +Ignorat. (Definit per l'usuari). + + + + +Ignorat. (Definit per l'usuari). + + + + +Fusiona l'entrada. + + + + fitxer +Fitxer base explícit. Per compatibilitat amb certes eines. + + + + fitxer +Fitxer de sortida. Implica -m. &pex;: -o fitxernou.txt + + + + fitxer +Fitxer de sortida, un altre cop. (Per compatibilitat amb certes eines). + + + + +Sense IGU si tots els conflictes es poden resoldre automàticament. (Cal fitxer). + + + + +No resol els conflictes automàticament. + + + + àlies1 +Reemplaçament del nom visible pel fitxer de sortida 1 (base). + + + + àlies2 +Reemplaçament del nom visible pel fitxer de sortida 2. + + + + àlies3 +Reemplaçament del nom visible pel fitxer de sortida 3. + + + + àlies +Reemplaçament del nom visible alternatiu. Proporcioneu-lo per a cada sortida. + + + + cadena +Sobreescriu l'ajustament de la configuració. Useu-ho per a cada ajustament. &pex;: AutoAdvance=1. + + + + +Mostra una llista dels ajustaments de configuració i el valor actual. + + + + fitxer +Usa un fitxer de configuració diferent. + + + + +Fitxer1 a obrir (base, si no s'especifica via ). + + + + +Fitxer 2 a obrir. + + + + +Fitxer 2 a obrir. + + + + + + + +Vegeu també + +Hi ha disponible documentació d'usuari més detallada des de help:/kdiff3 (introduïu aquest &URL; al &konqueror; o executeu khelpcenter help:/kdiff3). +kf5options(7) +qt5options(7) + + + + +Autors +Aquesta pàgina de manual ha estat preparada per en &Burkhard.Lueck; &Burkhard.Lueck.mail;. + + + Binary files /tmp/tmpTxwPj4/FOdOX4m4Im/kdiff3-1.8.01/po/ca/docs/kdiff3/open_dialog.png and /tmp/tmpTxwPj4/mqn9IX4anS/kdiff3-1.8.3/po/ca/docs/kdiff3/open_dialog.png differ diff -Nru kdiff3-1.8.01/po/ca/kdiff3fileitemactionplugin.po kdiff3-1.8.3/po/ca/kdiff3fileitemactionplugin.po --- kdiff3-1.8.01/po/ca/kdiff3fileitemactionplugin.po 2019-05-18 01:01:50.000000000 +0000 +++ kdiff3-1.8.3/po/ca/kdiff3fileitemactionplugin.po 2020-06-25 00:18:07.000000000 +0000 @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: kdiff3fileitemactionplugin\n" -"Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2019-03-22 03:09+0100\n" +"Report-Msgid-Bugs-To: https://bugs.kde.org\n" +"POT-Creation-Date: 2019-08-30 07:40+0200\n" "PO-Revision-Date: 2019-03-22 18:02+0100\n" "Last-Translator: Josep Ma. Ferrer \n" "Language-Team: Catalan \n" diff -Nru kdiff3-1.8.01/po/ca/kdiff3.po kdiff3-1.8.3/po/ca/kdiff3.po --- kdiff3-1.8.01/po/ca/kdiff3.po 2019-05-18 01:01:50.000000000 +0000 +++ kdiff3-1.8.3/po/ca/kdiff3.po 2020-06-25 00:18:07.000000000 +0000 @@ -1,16 +1,16 @@ # Translation of kdiff3.po to Catalan -# Copyright (C) 2011-2019 This_file_is_part_of_KDE +# Copyright (C) 2011-2020 This_file_is_part_of_KDE # This file is distributed under the license LGPL version 2 or later # # Joan Maspons , 2011. -# Josep Ma. Ferrer , 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019. -# Antoni Bella Pérez , 2014, 2018, 2019. +# Josep Ma. Ferrer , 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020. +# Antoni Bella Pérez , 2014, 2018, 2019, 2020. msgid "" msgstr "" "Project-Id-Version: kdiff3\n" -"Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2019-04-18 08:02+0200\n" -"PO-Revision-Date: 2019-03-09 13:05+0100\n" +"Report-Msgid-Bugs-To: https://bugs.kde.org\n" +"POT-Creation-Date: 2020-06-22 07:48+0200\n" +"PO-Revision-Date: 2020-03-31 19:47+0100\n" "Last-Translator: Josep Ma. Ferrer \n" "Language-Team: Catalan \n" "Language: ca\n" @@ -24,292 +24,292 @@ #, kde-format msgctxt "NAME OF TRANSLATORS" msgid "Your names" -msgstr "Joan Maspons Ventura" +msgstr "Joan Maspons Ventura,Antoni Bella" #, kde-format msgctxt "EMAIL OF TRANSLATORS" msgid "Your emails" -msgstr "joanmaspons@gmail.com" +msgstr "joanmaspons@gmail.com,antonibella5@yahoo.com" -#: difftextwindow.cpp:412 +#: difftextwindow.cpp:414 #, kde-format msgid "File %1: Line %2" msgstr "Fitxer %1: Línia %2" -#: difftextwindow.cpp:414 +#: difftextwindow.cpp:416 #, kde-format msgid "File %1: Line not available" msgstr "Fitxer %1: Línia no disponible" -#: difftextwindow.cpp:1780 +#: difftextwindow.cpp:1778 #, kde-format msgid "Encoding:" msgstr "Codificació:" -#: difftextwindow.cpp:1782 mergeresultwindow.cpp:3138 optiondialog.cpp:818 +#: difftextwindow.cpp:1781 mergeresultwindow.cpp:3166 optiondialog.cpp:840 #, kde-format msgid "Line end style:" msgstr "Estil del salt de línia:" -#: difftextwindow.cpp:1810 directorymergewindow.cpp:382 -#: directorymergewindow.cpp:433 directorymergewindow.cpp:524 -#: directorymergewindow.cpp:3058 directorymergewindow.cpp:3189 -#: directorymergewindow.cpp:3417 mergeresultwindow.cpp:942 -#: mergeresultwindow.cpp:944 mergeresultwindow.cpp:946 -#: mergeresultwindow.cpp:948 mergeresultwindow.cpp:1814 -#: mergeresultwindow.cpp:3170 mergeresultwindow.cpp:3177 optiondialog.cpp:962 -#: optiondialog.cpp:975 pdiff.cpp:833 pdiff.cpp:835 pdiff.cpp:837 pdiff.cpp:839 -#: pdiff.cpp:861 smalldialogs.cpp:124 smalldialogs.cpp:126 smalldialogs.cpp:127 -#: smalldialogs.cpp:130 +#: difftextwindow.cpp:1809 directorymergewindow.cpp:383 +#: directorymergewindow.cpp:434 directorymergewindow.cpp:525 +#: directorymergewindow.cpp:3072 directorymergewindow.cpp:3203 +#: directorymergewindow.cpp:3431 mergeresultwindow.cpp:970 +#: mergeresultwindow.cpp:972 mergeresultwindow.cpp:974 +#: mergeresultwindow.cpp:976 mergeresultwindow.cpp:1842 +#: mergeresultwindow.cpp:3198 mergeresultwindow.cpp:3205 optiondialog.cpp:1002 +#: optiondialog.cpp:1015 pdiff.cpp:823 pdiff.cpp:825 pdiff.cpp:827 +#: pdiff.cpp:829 pdiff.cpp:851 smalldialogs.cpp:131 smalldialogs.cpp:133 +#: smalldialogs.cpp:134 smalldialogs.cpp:137 #, kde-format msgid "A" msgstr "A" -#: difftextwindow.cpp:1810 directorymergewindow.cpp:384 -#: directorymergewindow.cpp:436 directorymergewindow.cpp:526 -#: directorymergewindow.cpp:3064 directorymergewindow.cpp:3190 -#: directorymergewindow.cpp:3418 mergeresultwindow.cpp:942 -#: mergeresultwindow.cpp:944 mergeresultwindow.cpp:950 -#: mergeresultwindow.cpp:952 mergeresultwindow.cpp:1816 -#: mergeresultwindow.cpp:3172 mergeresultwindow.cpp:3179 optiondialog.cpp:963 -#: optiondialog.cpp:976 pdiff.cpp:833 pdiff.cpp:835 pdiff.cpp:841 pdiff.cpp:843 -#: pdiff.cpp:863 smalldialogs.cpp:124 smalldialogs.cpp:125 smalldialogs.cpp:128 -#: smalldialogs.cpp:131 +#: difftextwindow.cpp:1809 directorymergewindow.cpp:385 +#: directorymergewindow.cpp:437 directorymergewindow.cpp:527 +#: directorymergewindow.cpp:3078 directorymergewindow.cpp:3204 +#: directorymergewindow.cpp:3432 mergeresultwindow.cpp:970 +#: mergeresultwindow.cpp:972 mergeresultwindow.cpp:978 +#: mergeresultwindow.cpp:980 mergeresultwindow.cpp:1844 +#: mergeresultwindow.cpp:3200 mergeresultwindow.cpp:3207 optiondialog.cpp:1003 +#: optiondialog.cpp:1016 pdiff.cpp:823 pdiff.cpp:825 pdiff.cpp:831 +#: pdiff.cpp:833 pdiff.cpp:853 smalldialogs.cpp:131 smalldialogs.cpp:132 +#: smalldialogs.cpp:135 smalldialogs.cpp:138 #, kde-format msgid "B" msgstr "B" -#: difftextwindow.cpp:1810 directorymergewindow.cpp:386 -#: directorymergewindow.cpp:439 directorymergewindow.cpp:528 -#: directorymergewindow.cpp:3070 directorymergewindow.cpp:3191 -#: directorymergewindow.cpp:3419 mergeresultwindow.cpp:946 -#: mergeresultwindow.cpp:948 mergeresultwindow.cpp:950 -#: mergeresultwindow.cpp:952 mergeresultwindow.cpp:1818 -#: mergeresultwindow.cpp:3174 mergeresultwindow.cpp:3181 optiondialog.cpp:977 -#: pdiff.cpp:837 pdiff.cpp:839 pdiff.cpp:841 pdiff.cpp:843 pdiff.cpp:865 -#: smalldialogs.cpp:125 smalldialogs.cpp:126 smalldialogs.cpp:129 -#: smalldialogs.cpp:132 +#: difftextwindow.cpp:1809 directorymergewindow.cpp:387 +#: directorymergewindow.cpp:440 directorymergewindow.cpp:529 +#: directorymergewindow.cpp:3084 directorymergewindow.cpp:3205 +#: directorymergewindow.cpp:3433 mergeresultwindow.cpp:974 +#: mergeresultwindow.cpp:976 mergeresultwindow.cpp:978 +#: mergeresultwindow.cpp:980 mergeresultwindow.cpp:1846 +#: mergeresultwindow.cpp:3202 mergeresultwindow.cpp:3209 optiondialog.cpp:1017 +#: pdiff.cpp:827 pdiff.cpp:829 pdiff.cpp:831 pdiff.cpp:833 pdiff.cpp:855 +#: smalldialogs.cpp:132 smalldialogs.cpp:133 smalldialogs.cpp:136 +#: smalldialogs.cpp:139 #, kde-format msgid "C" msgstr "C" -#: difftextwindow.cpp:1810 +#: difftextwindow.cpp:1809 #, kde-format msgid "A (Base)" msgstr "A (Base)" -#: difftextwindow.cpp:1812 +#: difftextwindow.cpp:1811 #, kde-format msgid "Encoding: %1" msgstr "Codificació: %1" -#: difftextwindow.cpp:1813 mergeresultwindow.cpp:3183 +#: difftextwindow.cpp:1812 mergeresultwindow.cpp:3211 #, kde-format msgid "Unix" msgstr "Unix" -#: difftextwindow.cpp:1813 mergeresultwindow.cpp:3184 +#: difftextwindow.cpp:1812 mergeresultwindow.cpp:3212 #, kde-format msgid "DOS" msgstr "DOS" -#: difftextwindow.cpp:1813 +#: difftextwindow.cpp:1812 #, kde-format msgid "Line end style: %1" msgstr "Estil del salt de línia: %1" -#: difftextwindow.cpp:1835 kdiff3.cpp:873 +#: difftextwindow.cpp:1834 kdiff3.cpp:874 #, kde-format msgid "Top line" msgstr "Línia superior" -#: difftextwindow.cpp:1845 +#: difftextwindow.cpp:1843 #, kde-format msgid "End" msgstr "Final" -#: difftextwindow.cpp:1903 smalldialogs.cpp:235 +#: difftextwindow.cpp:1901 smalldialogs.cpp:245 #, kde-format msgid "Open File" msgstr "Obre un fitxer" -#: difftextwindow.cpp:1951 optiondialog.cpp:387 +#: difftextwindow.cpp:1943 optiondialog.cpp:389 #, kde-format msgid "Unicode, 8 bit" msgstr "Unicode, 8 bits" -#: difftextwindow.cpp:1966 +#: difftextwindow.cpp:1958 #, kde-format msgid "Other" msgstr "Altres" -#: directorymergewindow.cpp:409 directorymergewindow.cpp:3424 +#: directorymergewindow.cpp:410 directorymergewindow.cpp:3438 #, kde-format msgid "Copy A to B" msgstr "Copia A a B" -#: directorymergewindow.cpp:412 directorymergewindow.cpp:3425 +#: directorymergewindow.cpp:413 directorymergewindow.cpp:3439 #, kde-format msgid "Copy B to A" msgstr "Copia B a A" -#: directorymergewindow.cpp:415 directorymergewindow.cpp:3426 +#: directorymergewindow.cpp:416 directorymergewindow.cpp:3440 #, kde-format msgid "Delete A" msgstr "Suprimeix A" -#: directorymergewindow.cpp:418 directorymergewindow.cpp:3427 +#: directorymergewindow.cpp:419 directorymergewindow.cpp:3441 #, kde-format msgid "Delete B" msgstr "Suprimeix B" -#: directorymergewindow.cpp:421 +#: directorymergewindow.cpp:422 #, kde-format msgid "Delete A & B" msgstr "Suprimeix A i B" -#: directorymergewindow.cpp:424 directorymergewindow.cpp:3429 +#: directorymergewindow.cpp:425 directorymergewindow.cpp:3443 #, kde-format msgid "Merge to A" msgstr "Fusiona a A" -#: directorymergewindow.cpp:427 directorymergewindow.cpp:3430 +#: directorymergewindow.cpp:428 directorymergewindow.cpp:3444 #, kde-format msgid "Merge to B" msgstr "Fusiona a B" -#: directorymergewindow.cpp:430 +#: directorymergewindow.cpp:431 #, kde-format msgid "Merge to A & B" msgstr "Fusiona a A i B" -#: directorymergewindow.cpp:442 directorymergewindow.cpp:3421 +#: directorymergewindow.cpp:443 directorymergewindow.cpp:3435 #, kde-format msgid "Delete (if exists)" msgstr "Suprimeix (si existeix)" -#: directorymergewindow.cpp:445 directorymergewindow.cpp:448 -#: directorymergewindow.cpp:3420 optiondialog.cpp:925 smalldialogs.cpp:113 +#: directorymergewindow.cpp:446 directorymergewindow.cpp:449 +#: directorymergewindow.cpp:3434 smalldialogs.cpp:120 #, kde-format msgid "Merge" msgstr "Fusiona" -#: directorymergewindow.cpp:445 directorymergewindow.cpp:448 +#: directorymergewindow.cpp:446 directorymergewindow.cpp:449 #, kde-format msgid "Merge (manual)" msgstr "Fusiona (manualment)" -#: directorymergewindow.cpp:451 +#: directorymergewindow.cpp:452 #, kde-format msgid "Error: Conflicting File Types" msgstr "Error: tipus de fitxer en conflicte" -#: directorymergewindow.cpp:454 +#: directorymergewindow.cpp:455 #, kde-format msgid "Error: Changed and Deleted" msgstr "Error: canviat i suprimit" -#: directorymergewindow.cpp:457 +#: directorymergewindow.cpp:458 #, kde-format msgid "Error: Dates are equal but files are not." msgstr "Error: les dates són iguals però els fitxers no." -#: directorymergewindow.cpp:471 +#: directorymergewindow.cpp:472 #, kde-format msgid "Done" msgstr "Fet" -#: directorymergewindow.cpp:473 +#: directorymergewindow.cpp:474 #, kde-format msgid "Error" msgstr "Error" -#: directorymergewindow.cpp:475 +#: directorymergewindow.cpp:476 #, kde-format msgid "Skipped." msgstr "S'ha omès." -#: directorymergewindow.cpp:477 +#: directorymergewindow.cpp:478 #, kde-format msgid "Not saved." msgstr "No desat." -#: directorymergewindow.cpp:479 +#: directorymergewindow.cpp:480 #, kde-format msgid "In progress..." msgstr "En curs..." -#: directorymergewindow.cpp:481 +#: directorymergewindow.cpp:482 #, kde-format msgid "To do." msgstr "Pendent." -#: directorymergewindow.cpp:522 +#: directorymergewindow.cpp:523 #, kde-format msgid "Name" msgstr "Nom" -#: directorymergewindow.cpp:530 +#: directorymergewindow.cpp:531 #, kde-format msgid "Operation" msgstr "Operació" -#: directorymergewindow.cpp:532 +#: directorymergewindow.cpp:533 #, kde-format msgid "Status" msgstr "Estat" -#: directorymergewindow.cpp:534 +#: directorymergewindow.cpp:535 #, kde-format msgid "Unsolved" msgstr "No resolt" -#: directorymergewindow.cpp:536 +#: directorymergewindow.cpp:537 #, kde-format msgid "Solved" msgstr "Resolt" -#: directorymergewindow.cpp:538 +#: directorymergewindow.cpp:539 #, kde-format msgid "Nonwhite" msgstr "No blanc" -#: directorymergewindow.cpp:540 +#: directorymergewindow.cpp:541 #, kde-format msgid "White" msgstr "Blanc" -#: directorymergewindow.cpp:674 +#: directorymergewindow.cpp:676 #, kde-format msgid "Unable to compare non-normal file with normal file." msgstr "No es pot comparar un fitxer no normal amb un de normal." -#: directorymergewindow.cpp:688 +#: directorymergewindow.cpp:690 #, kde-format msgid "Mix of links and normal files." msgstr "Barreja d'enllaços i fitxers normals." -#: directorymergewindow.cpp:695 +#: directorymergewindow.cpp:697 #, kde-format msgid "Link: " msgstr "Enllaç: " -#: directorymergewindow.cpp:704 +#: directorymergewindow.cpp:706 #, kde-format msgid "Size. " msgstr "Mida. " -#: directorymergewindow.cpp:718 directorymergewindow.cpp:728 +#: directorymergewindow.cpp:720 directorymergewindow.cpp:730 #, kde-format msgid "Date & Size: " msgstr "Data i mida: " -#: directorymergewindow.cpp:748 +#: directorymergewindow.cpp:751 #, kde-format msgid "Comparing file..." msgstr "S'està comparant el fitxer..." -#: directorymergewindow.cpp:801 +#: directorymergewindow.cpp:813 #, kde-format msgid "" "You are currently doing a directory merge. Are you sure, you want to abort " @@ -318,48 +318,48 @@ "Actualment esteu fent una fusió de directoris. Segur que voleu interrompre " "la fusió i tornar a explorar el directori?" -#: directorymergewindow.cpp:802 kdiff3.cpp:698 kdiff3.cpp:708 kdiff3.cpp:720 -#: mergeresultwindow.cpp:372 pdiff.cpp:1033 pdiff.cpp:1910 pdiff.cpp:1920 +#: directorymergewindow.cpp:814 kdiff3.cpp:697 kdiff3.cpp:707 kdiff3.cpp:719 +#: mergeresultwindow.cpp:400 pdiff.cpp:1031 pdiff.cpp:1920 pdiff.cpp:1930 #, kde-format msgid "Warning" msgstr "Atenció" -#: directorymergewindow.cpp:803 directorymergewindow.cpp:3393 +#: directorymergewindow.cpp:815 directorymergewindow.cpp:3407 #, kde-format msgid "Rescan" msgstr "Torna a explorar" -#: directorymergewindow.cpp:804 pdiff.cpp:1035 +#: directorymergewindow.cpp:816 pdiff.cpp:1033 #, kde-format msgid "Continue Merging" msgstr "Continua fusionant" -#: directorymergewindow.cpp:971 +#: directorymergewindow.cpp:984 #, kde-format msgid "Opening of directories failed:" msgstr "Ha fallat en obrir els directoris:" -#: directorymergewindow.cpp:975 +#: directorymergewindow.cpp:988 #, kde-format msgid "Dir A \"%1\" does not exist or is not a directory.\n" msgstr "El directori A «%1» no existeix o no és un directori.\n" -#: directorymergewindow.cpp:980 +#: directorymergewindow.cpp:993 #, kde-format msgid "Dir B \"%1\" does not exist or is not a directory.\n" msgstr "El directori B «%1» no existeix o no és un directori.\n" -#: directorymergewindow.cpp:985 +#: directorymergewindow.cpp:998 #, kde-format msgid "Dir C \"%1\" does not exist or is not a directory.\n" msgstr "El directori C «%1» no existeix o no és un directori.\n" -#: directorymergewindow.cpp:988 +#: directorymergewindow.cpp:1001 #, kde-format msgid "Directory Open Error" msgstr "Error en obrir el directori" -#: directorymergewindow.cpp:996 +#: directorymergewindow.cpp:1009 #, kde-format msgid "" "The destination directory must not be the same as A or B when three " @@ -370,49 +370,49 @@ "diferent de l'A o el B.\n" "Torneu-ho a comprovar abans de continuar." -#: directorymergewindow.cpp:998 +#: directorymergewindow.cpp:1011 #, kde-format msgid "Parameter Warning" msgstr "Alerta de paràmetres" -#: directorymergewindow.cpp:1003 +#: directorymergewindow.cpp:1016 #, kde-format msgid "Scanning directories..." msgstr "S'estan explorant els directoris..." -#: directorymergewindow.cpp:1029 +#: directorymergewindow.cpp:1042 #, kde-format msgid "Reading Directory A" msgstr "S'està llegint el directori A" -#: directorymergewindow.cpp:1038 +#: directorymergewindow.cpp:1051 #, kde-format msgid "Reading Directory B" msgstr "S'està llegint el directori B" -#: directorymergewindow.cpp:1048 +#: directorymergewindow.cpp:1061 #, kde-format msgid "Reading Directory C" msgstr "S'està llegint el directori C" -#: directorymergewindow.cpp:1064 +#: directorymergewindow.cpp:1077 #, kde-format msgid "Some subdirectories were not readable in" msgstr "Alguns subdirectoris no eren llegibles a" -#: directorymergewindow.cpp:1069 +#: directorymergewindow.cpp:1082 #, kde-format msgid "Check the permissions of the subdirectories." msgstr "Comproveu els permisos dels subdirectoris." -#: directorymergewindow.cpp:1106 kdiff3.cpp:666 kdiff3.cpp:753 kdiff3.cpp:777 -#: kdiff3.cpp:1065 kdiff3.cpp:1086 pdiff.cpp:1116 pdiff.cpp:1170 pdiff.cpp:1218 -#: pdiff.cpp:1234 pdiff.cpp:1277 pdiff.cpp:1301 +#: directorymergewindow.cpp:1119 kdiff3.cpp:665 kdiff3.cpp:752 kdiff3.cpp:776 +#: kdiff3.cpp:1072 kdiff3.cpp:1093 pdiff.cpp:1115 pdiff.cpp:1178 pdiff.cpp:1228 +#: pdiff.cpp:1244 pdiff.cpp:1287 pdiff.cpp:1311 #, kde-format msgid "Ready." msgstr "Preparat." -#: directorymergewindow.cpp:1121 +#: directorymergewindow.cpp:1134 #, kde-format msgid "" "Directory Comparison Status\n" @@ -427,22 +427,22 @@ "Nombre de fitxers iguals: %2\n" "Nombre de fitxers diferents: %3" -#: directorymergewindow.cpp:1128 +#: directorymergewindow.cpp:1141 #, kde-format msgid "Number of manual merges: %1" msgstr "Nombre de fusions manuals: %1" -#: directorymergewindow.cpp:1394 +#: directorymergewindow.cpp:1407 #, kde-format msgid "This affects all merge operations." msgstr "Això afectarà a totes les operacions de fusionat." -#: directorymergewindow.cpp:1395 +#: directorymergewindow.cpp:1408 #, kde-format msgid "Changing All Merge Operations" msgstr "S'estan canviant totes les operacions de fusionat" -#: directorymergewindow.cpp:1695 +#: directorymergewindow.cpp:1708 #, kde-format msgid "" "Processing %1 / %2\n" @@ -451,44 +451,44 @@ "S'està processant %1 / %2\n" "%3" -#: directorymergewindow.cpp:1738 directorymergewindow.cpp:1742 +#: directorymergewindow.cpp:1751 directorymergewindow.cpp:1755 #, kde-format msgid "Some files could not be processed." msgstr "Alguns fitxers no s'han pogut processar." -#: directorymergewindow.cpp:2222 directorymergewindow.cpp:2247 -#: directorymergewindow.cpp:2271 +#: directorymergewindow.cpp:2235 directorymergewindow.cpp:2260 +#: directorymergewindow.cpp:2285 #, kde-format msgid "This operation is currently not possible." msgstr "Actualment aquesta opció no és possible." -#: directorymergewindow.cpp:2222 directorymergewindow.cpp:2247 -#: directorymergewindow.cpp:2271 directorymergewindow.cpp:2552 +#: directorymergewindow.cpp:2235 directorymergewindow.cpp:2260 +#: directorymergewindow.cpp:2285 directorymergewindow.cpp:2565 #, kde-format msgid "Operation Not Possible" msgstr "Operació no possible" -#: directorymergewindow.cpp:2318 +#: directorymergewindow.cpp:2332 #, kde-format msgid "An error occurred while copying." msgstr "Hi ha hagut un error en copiar." -#: directorymergewindow.cpp:2319 directorymergewindow.cpp:2759 +#: directorymergewindow.cpp:2333 directorymergewindow.cpp:2772 #, kde-format msgid "Merge Error" msgstr "Error de fusionat" -#: directorymergewindow.cpp:2396 +#: directorymergewindow.cpp:2410 #, kde-format msgid "Unknown merge operation. (This must never happen!)" msgstr "Operació de fusionat desconeguda. (Això no hauria de passar mai!)" -#: directorymergewindow.cpp:2441 +#: directorymergewindow.cpp:2455 #, kde-format msgid "Unknown merge operation." msgstr "Operació de fusionat desconeguda." -#: directorymergewindow.cpp:2454 +#: directorymergewindow.cpp:2468 #, kde-format msgid "" "The merge is about to begin.\n" @@ -508,22 +508,22 @@ "Sigueu conscient que aquest programa encara està en fase de proves i no hi " "ha CAP GARANTIA! Feu còpies de seguretat de les vostres dades vitals!" -#: directorymergewindow.cpp:2459 +#: directorymergewindow.cpp:2473 #, kde-format msgid "Starting Merge" msgstr "S'està iniciant el fusionat" -#: directorymergewindow.cpp:2460 +#: directorymergewindow.cpp:2474 #, kde-format msgid "Do It" msgstr "Fes-ho" -#: directorymergewindow.cpp:2461 +#: directorymergewindow.cpp:2475 #, kde-format msgid "Simulate It" msgstr "Simula-ho" -#: directorymergewindow.cpp:2487 +#: directorymergewindow.cpp:2501 #, kde-format msgid "" "The highlighted item has a different type in the different directories. " @@ -532,7 +532,7 @@ "L'element ressaltat té un tipus diferent als diferents directoris. " "Seleccioneu què fer." -#: directorymergewindow.cpp:2491 +#: directorymergewindow.cpp:2505 #, kde-format msgid "" "The modification dates of the file are equal but the files are not. Select " @@ -541,7 +541,7 @@ "Les dates de modificació dels fitxers són iguals però els fitxers no ho són. " "Seleccioneu què fer." -#: directorymergewindow.cpp:2495 +#: directorymergewindow.cpp:2509 #, kde-format msgid "" "The highlighted item was changed in one directory and deleted in the other. " @@ -550,7 +550,7 @@ "L'element ressaltat va ser canviat en un directori i suprimit a l'altre. " "Seleccioneu què fer." -#: directorymergewindow.cpp:2552 +#: directorymergewindow.cpp:2565 #, kde-format msgid "" "This operation is currently not possible because directory merge is " @@ -559,7 +559,7 @@ "Actualment aquesta operació no és possible perquè s'està a mig procés de " "fusionat." -#: directorymergewindow.cpp:2609 +#: directorymergewindow.cpp:2622 #, kde-format msgid "" "There was an error in the last step.\n" @@ -569,32 +569,32 @@ "S'ha produït un error en l'últim pas.\n" "Voleu continuar amb l'element que ha causat l'error o voleu ometre'l?" -#: directorymergewindow.cpp:2611 +#: directorymergewindow.cpp:2624 #, kde-format msgid "Continue merge after an error" msgstr "Després d'un error continua fusionant" -#: directorymergewindow.cpp:2612 +#: directorymergewindow.cpp:2625 #, kde-format msgid "Continue With Last Item" msgstr "Continua amb l'últim element" -#: directorymergewindow.cpp:2613 +#: directorymergewindow.cpp:2626 #, kde-format msgid "Skip Item" msgstr "Omet l'element" -#: directorymergewindow.cpp:2709 +#: directorymergewindow.cpp:2722 #, kde-format msgid "Merge operation complete." msgstr "Operació de fusionat completada." -#: directorymergewindow.cpp:2709 directorymergewindow.cpp:2712 +#: directorymergewindow.cpp:2722 directorymergewindow.cpp:2725 #, kde-format msgid "Merge Complete" msgstr "Fusió completada" -#: directorymergewindow.cpp:2722 +#: directorymergewindow.cpp:2735 #, kde-format msgid "" "Simulated merge complete: Check if you agree with the proposed operations." @@ -602,233 +602,233 @@ "Simulació de fusionat completada: comproveu si esteu d'acord amb les " "operacions proposades." -#: directorymergewindow.cpp:2758 +#: directorymergewindow.cpp:2771 #, kde-format msgid "An error occurred. Press OK to see detailed information." msgstr "" "Hi ha hagut un error. Per a veure informació detallada premeu «D'acord»." -#: directorymergewindow.cpp:2791 +#: directorymergewindow.cpp:2804 #, kde-format msgid "Error: While deleting %1: Creating backup failed." msgstr "Error: en suprimir %1: ha fallat en crear una còpia de seguretat." -#: directorymergewindow.cpp:2798 +#: directorymergewindow.cpp:2811 #, kde-format msgid "delete directory recursively( %1 )" msgstr "suprimeix el directori recursivament (%1)" -#: directorymergewindow.cpp:2800 +#: directorymergewindow.cpp:2813 #, kde-format msgid "delete( %1 )" msgstr "suprimeix (%1)" -#: directorymergewindow.cpp:2815 +#: directorymergewindow.cpp:2828 #, kde-format msgid "Error: delete dir operation failed while trying to read the directory." msgstr "" "Error: l'operació de supressió del directori ha fallat en intentar llegir-lo." -#: directorymergewindow.cpp:2834 +#: directorymergewindow.cpp:2847 #, kde-format msgid "Error: rmdir( %1 ) operation failed." -msgstr "Error: ha fallat l'operació d'eliminar la carpeta (%1)." +msgstr "Error: ha fallat l'operació de suprimir la carpeta (%1)." -#: directorymergewindow.cpp:2844 +#: directorymergewindow.cpp:2857 #, kde-format msgid "Error: delete operation failed." msgstr "Error: ha fallat l'operació de supressió." -#: directorymergewindow.cpp:2870 +#: directorymergewindow.cpp:2884 #, kde-format msgid "manual merge( %1, %2, %3 -> %4)" msgstr "fusió manual ( %1, %2, %3 -> %4)" -#: directorymergewindow.cpp:2873 +#: directorymergewindow.cpp:2887 #, kde-format msgid "" " Note: After a manual merge the user should continue by pressing F7." msgstr "" " Nota: abans de fusionar manualment, l'usuari ha de continuar prement F7." -#: directorymergewindow.cpp:2900 +#: directorymergewindow.cpp:2914 #, kde-format msgid "Error: copy( %1 -> %2 ) failed.Deleting existing destination failed." msgstr "" "Error: ha fallat la còpia (%1 -> %2). La supressió de la destinació existent " "ha fallat." -#: directorymergewindow.cpp:2909 +#: directorymergewindow.cpp:2923 #, kde-format msgid "copyLink( %1 -> %2 )" msgstr "copia l'enllaç (%1 -> %2)" -#: directorymergewindow.cpp:2918 +#: directorymergewindow.cpp:2932 #, kde-format msgid "Error: copyLink failed: Remote links are not yet supported." msgstr "" "Error: ha fallat la còpia de l'enllaç: els enllaços remots encara no estan " "admesos." -#: directorymergewindow.cpp:2928 +#: directorymergewindow.cpp:2942 #, kde-format msgid "Error: copyLink failed." msgstr "Error: ha fallat la còpia de l'enllaç." -#: directorymergewindow.cpp:2953 +#: directorymergewindow.cpp:2967 #, kde-format msgid "copy( %1 -> %2 )" msgstr "copia (%1 -> %2)" -#: directorymergewindow.cpp:2979 +#: directorymergewindow.cpp:2993 #, kde-format msgid "Error during rename( %1 -> %2 ): Cannot delete existing destination." msgstr "" "Error en reanomenar (%1 -> %2): no es pot suprimir la destinació existent." -#: directorymergewindow.cpp:2986 +#: directorymergewindow.cpp:3000 #, kde-format msgid "rename( %1 -> %2 )" msgstr "reanomena (%1 -> %2)" -#: directorymergewindow.cpp:2995 +#: directorymergewindow.cpp:3009 #, kde-format msgid "Error: Rename failed." msgstr "Error: el canvi de nom ha fallat." -#: directorymergewindow.cpp:3013 +#: directorymergewindow.cpp:3027 #, kde-format msgid "Error during makeDir of %1. Cannot delete existing file." msgstr "" -"Error en crear el directori de %1. No es pot suprimir el fitxer existent." +"Error en crear la carpeta de %1. No es pot suprimir el fitxer existent." -#: directorymergewindow.cpp:3030 +#: directorymergewindow.cpp:3044 #, kde-format msgid "makeDir( %1 )" -msgstr "crea el directori (%1)" +msgstr "crea la carpeta (%1)" -#: directorymergewindow.cpp:3040 +#: directorymergewindow.cpp:3054 #, kde-format msgid "Error while creating directory." msgstr "Error en crear el directori." -#: directorymergewindow.cpp:3076 directorymergewindow.cpp:3195 +#: directorymergewindow.cpp:3090 directorymergewindow.cpp:3209 #, kde-format msgid "Dest" msgstr "Destinació" -#: directorymergewindow.cpp:3084 directorymergewindow.cpp:3113 +#: directorymergewindow.cpp:3098 directorymergewindow.cpp:3127 #, kde-format msgid "Dir" msgstr "Directori" -#: directorymergewindow.cpp:3084 +#: directorymergewindow.cpp:3098 #, kde-format msgid "Type" msgstr "Tipus" -#: directorymergewindow.cpp:3084 +#: directorymergewindow.cpp:3098 #, kde-format msgid "Size" msgstr "Mida" -#: directorymergewindow.cpp:3085 +#: directorymergewindow.cpp:3099 #, kde-format msgid "Attr" msgstr "Atributs" -#: directorymergewindow.cpp:3085 +#: directorymergewindow.cpp:3099 #, kde-format msgid "Last Modification" msgstr "Darrera modificació" -#: directorymergewindow.cpp:3085 +#: directorymergewindow.cpp:3099 #, kde-format msgid "Link-Destination" msgstr "Destinació de l'enllaç" -#: directorymergewindow.cpp:3113 +#: directorymergewindow.cpp:3127 #, kde-format msgid "File" msgstr "Fitxer" -#: directorymergewindow.cpp:3113 +#: directorymergewindow.cpp:3127 #, kde-format msgid "-Link" msgstr "-Enllaç" -#: directorymergewindow.cpp:3119 +#: directorymergewindow.cpp:3133 #, kde-format msgid "not available" msgstr "no disponible" -#: directorymergewindow.cpp:3137 +#: directorymergewindow.cpp:3151 #, kde-format msgid "A (Dest): " msgstr "A (Destinació): " -#: directorymergewindow.cpp:3141 +#: directorymergewindow.cpp:3155 #, kde-format msgid "A: " msgstr "A: " -#: directorymergewindow.cpp:3141 +#: directorymergewindow.cpp:3155 #, kde-format msgid "A (Base): " msgstr "A (Base): " -#: directorymergewindow.cpp:3147 +#: directorymergewindow.cpp:3161 #, kde-format msgid "B (Dest): " msgstr "B (Destinació): " -#: directorymergewindow.cpp:3151 +#: directorymergewindow.cpp:3165 #, kde-format msgid "B: " msgstr "B: " -#: directorymergewindow.cpp:3156 +#: directorymergewindow.cpp:3170 #, kde-format msgid "C (Dest): " msgstr "C (Destinació): " -#: directorymergewindow.cpp:3160 +#: directorymergewindow.cpp:3174 #, kde-format msgid "C: " msgstr "C: " -#: directorymergewindow.cpp:3163 +#: directorymergewindow.cpp:3177 #, kde-format msgid "Dest: " msgstr "Destinació: " #. i18n("Saving Directory Merge State ...")); -#: directorymergewindow.cpp:3238 +#: directorymergewindow.cpp:3252 #, kde-format msgid "Save Directory Merge State As..." msgstr "Desa l'estat de fusionat dels directoris com a..." -#: directorymergewindow.cpp:3387 +#: directorymergewindow.cpp:3401 #, kde-format msgid "Start/Continue Directory Merge" msgstr "Comença/Continua el fusionat dels directoris" -#: directorymergewindow.cpp:3388 +#: directorymergewindow.cpp:3402 #, kde-format msgid "Run Operation for Current Item" msgstr "Executa l'operació per a l'element actual" -#: directorymergewindow.cpp:3389 +#: directorymergewindow.cpp:3403 #, kde-format msgid "Compare Selected File" msgstr "Compara el fitxer seleccionat" -#: directorymergewindow.cpp:3390 +#: directorymergewindow.cpp:3404 #, kde-format msgid "Merge Current File" msgstr "Fusiona el fitxer actual" -#: directorymergewindow.cpp:3390 +#: directorymergewindow.cpp:3404 #, kde-format msgid "" "Merge\n" @@ -837,51 +837,51 @@ "Fitxer\n" "Fusionat" -#: directorymergewindow.cpp:3391 +#: directorymergewindow.cpp:3405 #, kde-format msgid "Fold All Subdirs" msgstr "Plega tots els subdirectoris" -#: directorymergewindow.cpp:3392 +#: directorymergewindow.cpp:3406 #, kde-format msgid "Unfold All Subdirs" msgstr "Desplega tots els subdirectoris" #. i18n("Save Directory Merge State ..."), 0, this, &DirectoryMergeWindow::slotSaveMergeState, ac, "dir_save_merge_state"); #. i18n("Load Directory Merge State ..."), 0, this, &DirectoryMergeWindow::slotLoadMergeState, ac, "dir_load_merge_state"); -#: directorymergewindow.cpp:3396 +#: directorymergewindow.cpp:3410 #, kde-format msgid "Choose A for All Items" msgstr "Tria A per a tots els elements" -#: directorymergewindow.cpp:3397 +#: directorymergewindow.cpp:3411 #, kde-format msgid "Choose B for All Items" msgstr "Tria B per a tots els elements" -#: directorymergewindow.cpp:3398 +#: directorymergewindow.cpp:3412 #, kde-format msgid "Choose C for All Items" msgstr "Tria C per a tots els elements" -#: directorymergewindow.cpp:3399 +#: directorymergewindow.cpp:3413 #, kde-format msgid "Auto-Choose Operation for All Items" msgstr "Tria automàticament l'operació per a tots els elements" -#: directorymergewindow.cpp:3400 +#: directorymergewindow.cpp:3414 #, kde-format msgid "No Operation for All Items" msgstr "Cap operació per a tots els elements" #. i18n("Synchronize Directories"), 0, this, &DirectoryMergeWindow::slotSynchronizeDirectories, ac, "dir_synchronize_directories"); #. d->m_pDirChooseNewerFiles = GuiUtils::createAction< KToggleAction >(i18n("Copy Newer Files Instead of Merging"), 0, this, &DirectoryMergeWindow::slotChooseNewerFiles, ac, "dir_choose_newer_files"); -#: directorymergewindow.cpp:3405 +#: directorymergewindow.cpp:3419 #, kde-format msgid "Show Identical Files" msgstr "Mostra els fitxers idèntics" -#: directorymergewindow.cpp:3405 +#: directorymergewindow.cpp:3419 #, kde-format msgid "" "Identical\n" @@ -890,17 +890,17 @@ "Fitxers\n" "Idèntics" -#: directorymergewindow.cpp:3406 +#: directorymergewindow.cpp:3420 #, kde-format msgid "Show Different Files" msgstr "Mostra els fitxers diferents" -#: directorymergewindow.cpp:3407 +#: directorymergewindow.cpp:3421 #, kde-format msgid "Show Files only in A" msgstr "Mostra els fitxers que només són a A" -#: directorymergewindow.cpp:3407 +#: directorymergewindow.cpp:3421 #, kde-format msgid "" "Files\n" @@ -909,12 +909,12 @@ "Fitxers\n" "que només són a A" -#: directorymergewindow.cpp:3408 +#: directorymergewindow.cpp:3422 #, kde-format msgid "Show Files only in B" msgstr "Mostra els fitxers que només són a B" -#: directorymergewindow.cpp:3408 +#: directorymergewindow.cpp:3422 #, kde-format msgid "" "Files\n" @@ -923,12 +923,12 @@ "Fitxers\n" "que només són a B" -#: directorymergewindow.cpp:3409 +#: directorymergewindow.cpp:3423 #, kde-format msgid "Show Files only in C" msgstr "Mostra els fitxers que només són a C" -#: directorymergewindow.cpp:3409 +#: directorymergewindow.cpp:3423 #, kde-format msgid "" "Files\n" @@ -937,52 +937,57 @@ "Fitxers\n" "que només són a C" -#: directorymergewindow.cpp:3413 +#: directorymergewindow.cpp:3427 #, kde-format msgid "Compare Explicitly Selected Files" msgstr "Compara els fitxers seleccionats explícitament" -#: directorymergewindow.cpp:3414 +#: directorymergewindow.cpp:3428 #, kde-format msgid "Merge Explicitly Selected Files" msgstr "Fusiona els fitxers seleccionats explícitament" -#: directorymergewindow.cpp:3416 directorymergewindow.cpp:3423 +#: directorymergewindow.cpp:3430 directorymergewindow.cpp:3437 #, kde-format msgid "Do Nothing" msgstr "No facis res" -#: directorymergewindow.cpp:3428 +#: directorymergewindow.cpp:3442 #, kde-format msgid "Delete A && B" msgstr "Suprimeix A i B" -#: directorymergewindow.cpp:3431 +#: directorymergewindow.cpp:3445 #, kde-format msgid "Merge to A && B" msgstr "Fusiona a A i B" -#: fileaccess.cpp:462 SourceData.cpp:493 +#: fileaccess.cpp:301 +#, kde-format +msgid "Unable to determine full url. No parent specified." +msgstr "No s'ha pogut determinar l'URL complet. Especificat cap pare." + +#: fileaccess.cpp:482 SourceData.cpp:506 #, kde-format msgid "Failed to read file: %1" msgstr "Ha fallat en llegir el fitxer: %1." -#: fileaccess.cpp:587 +#: fileaccess.cpp:624 #, kde-format msgid "Creating temp copy of %1 failed." msgstr "Ha fallat la creació de la còpia temporal de %1." -#: fileaccess.cpp:595 fileaccess.cpp:600 +#: fileaccess.cpp:632 fileaccess.cpp:637 #, kde-format msgid "Opening %1 failed. %2" msgstr "Ha fallat l'obertura de %1. %2" -#: fileaccess.cpp:619 fileaccess.cpp:627 +#: fileaccess.cpp:656 fileaccess.cpp:664 #, kde-format msgid "Error reading from %1. %2" msgstr "Error en llegir des de %1. %2" -#: fileaccess.cpp:751 +#: fileaccess.cpp:788 #, kde-format msgid "" "While trying to make a backup, deleting an older backup failed.\n" @@ -992,7 +997,7 @@ "nova.\n" "Nom de fitxer: %1" -#: fileaccess.cpp:758 +#: fileaccess.cpp:795 #, kde-format msgid "" "While trying to make a backup, renaming failed.\n" @@ -1001,178 +1006,178 @@ "Ha fallat el reanomenament en intentar fer una còpia de seguretat.\n" "Noms de fitxer: %1 -> %2" -#: fileaccess.cpp:828 +#: fileaccess.cpp:865 #, kde-format msgid "Getting file status: %1" msgstr "S'està obtenint l'estat del fitxer: %1" -#: fileaccess.cpp:869 +#: fileaccess.cpp:906 #, kde-format msgid "Reading file: %1" msgstr "S'està llegint el fitxer: %1" -#: fileaccess.cpp:907 +#: fileaccess.cpp:944 #, kde-format msgid "Writing file: %1" msgstr "S'està escrivint el fitxer: %1" -#: fileaccess.cpp:940 +#: fileaccess.cpp:977 #, kde-format msgid "Out of memory" msgstr "Memòria exhaurida" -#: fileaccess.cpp:976 +#: fileaccess.cpp:1013 #, kde-format msgid "Making directory: %1" msgstr "S'està creant el directori: %1" -#: fileaccess.cpp:997 +#: fileaccess.cpp:1034 #, kde-format msgid "Removing directory: %1" msgstr "S'està eliminant el directori: %1" -#: fileaccess.cpp:1012 +#: fileaccess.cpp:1049 #, kde-format msgid "Removing file: %1" msgstr "S'està eliminant el fitxer: %1" -#: fileaccess.cpp:1028 +#: fileaccess.cpp:1065 #, kde-format msgid "Creating symbolic link: %1 -> %2" msgstr "S'està creant l'enllaç simbòlic: %1 -> %2" -#: fileaccess.cpp:1052 +#: fileaccess.cpp:1089 #, kde-format msgid "Renaming file: %1 -> %2" msgstr "S'està reanomenant el fitxer: %1 -> %2" -#: fileaccess.cpp:1086 +#: fileaccess.cpp:1123 #, kde-format msgid "Copying file: %1 -> %2" msgstr "S'està copiant el fitxer: %1 -> %2" -#: fileaccess.cpp:1108 +#: fileaccess.cpp:1145 #, kde-format msgid "Reading directory: %1" msgstr "S'està llegint el directori: %1" -#: fileaccess.cpp:1162 +#: fileaccess.cpp:1202 #, kde-format msgid "Listing directory: %1" -msgstr "S'està llistant el directori: %1" +msgstr "S'està llistant la carpeta: %1" -#: kdiff3.cpp:181 +#: kdiff3.cpp:182 #, kde-format msgid "Current Configuration:" msgstr "Configuració actual:" -#: kdiff3.cpp:186 +#: kdiff3.cpp:187 #, kde-format msgid "Config Option Error:" msgstr "Error de l'opció de configuració:" -#: kdiff3.cpp:240 +#: kdiff3.cpp:246 #, kde-format msgid "Option --auto used, but no output file specified." msgstr "" "Heu usat l'opció --auto, però no heu especificat cap fitxer de sortida." -#: kdiff3.cpp:416 +#: kdiff3.cpp:405 #, kde-format msgid "Option --auto ignored for directory comparison." msgstr "L'opció --auto s'ignora en comparar directoris." -#: kdiff3.cpp:460 +#: kdiff3.cpp:449 #, kde-format msgid "Saving failed." msgstr "El desament ha fallat." -#: kdiff3.cpp:496 pdiff.cpp:1098 +#: kdiff3.cpp:494 pdiff.cpp:1096 #, kde-format msgid "Opening of these files failed:" msgstr "Ha fallat en obrir aquests fitxers:" -#: kdiff3.cpp:505 +#: kdiff3.cpp:503 pdiff.cpp:1105 #, kde-format -msgid "File Open Error" +msgid "File open error" msgstr "S'ha produït un error en obrir el fitxer" -#: kdiff3.cpp:533 +#: kdiff3.cpp:532 #, kde-format msgid "Opens documents for comparison..." msgstr "Obre els documents per a comparar-los..." -#: kdiff3.cpp:535 +#: kdiff3.cpp:534 #, kde-format msgid "Reload" msgstr "Recarrega" -#: kdiff3.cpp:538 +#: kdiff3.cpp:537 #, kde-format msgid "Saves the merge result. All conflicts must be solved!" msgstr "Desa el resultat de la fusió. S'han de resoldre tots els conflictes!" -#: kdiff3.cpp:540 +#: kdiff3.cpp:539 #, kde-format msgid "Saves the current document as..." msgstr "Desa el document actual com a..." -#: kdiff3.cpp:543 +#: kdiff3.cpp:542 #, kde-format msgid "Print the differences" msgstr "Imprimeix les diferències" -#: kdiff3.cpp:546 +#: kdiff3.cpp:545 #, kde-format msgid "Quits the application" msgstr "Surt de l'aplicació" -#: kdiff3.cpp:549 +#: kdiff3.cpp:548 #, kde-format msgid "Cuts the selected section and puts it to the clipboard" msgstr "Retalla la secció seleccionada i la posa al porta-retalls" -#: kdiff3.cpp:552 +#: kdiff3.cpp:551 #, kde-format msgid "Copies the selected section to the clipboard" msgstr "Copia la secció seleccionada al porta-retalls" -#: kdiff3.cpp:554 +#: kdiff3.cpp:553 #, kde-format msgid "Pastes the clipboard contents to current position" msgstr "Enganxa el contingut del porta-retalls a la posició actual" -#: kdiff3.cpp:557 +#: kdiff3.cpp:556 #, kde-format msgid "Select everything in current window" msgstr "Selecciona tot el que hi ha a la finestra actual" -#: kdiff3.cpp:560 +#: kdiff3.cpp:559 #, kde-format msgid "Search for a string" msgstr "Cerca una cadena" -#: kdiff3.cpp:562 +#: kdiff3.cpp:561 #, kde-format msgid "Search again for the string" msgstr "Torna a cercar la cadena" -#: kdiff3.cpp:567 +#: kdiff3.cpp:566 #, kde-format msgid "Enables/disables the statusbar" msgstr "Activa/desactiva la barra d'estat" -#: kdiff3.cpp:571 +#: kdiff3.cpp:570 #, kde-format msgid "Configure KDiff3..." msgstr "Configura el KDiff3..." -#: kdiff3.cpp:590 +#: kdiff3.cpp:589 #, kde-format msgid "Go to Current Delta" msgstr "Vés a la diferència actual" -#: kdiff3.cpp:590 +#: kdiff3.cpp:589 #, kde-format msgid "" "Current\n" @@ -1181,12 +1186,12 @@ "Diferència\n" "actual" -#: kdiff3.cpp:592 +#: kdiff3.cpp:591 #, kde-format msgid "Go to First Delta" msgstr "Vés a la primera diferència" -#: kdiff3.cpp:592 +#: kdiff3.cpp:591 #, kde-format msgid "" "First\n" @@ -1195,12 +1200,12 @@ "Primera\n" "diferència" -#: kdiff3.cpp:594 +#: kdiff3.cpp:593 #, kde-format msgid "Go to Last Delta" msgstr "Vés a l'última diferència" -#: kdiff3.cpp:594 +#: kdiff3.cpp:593 #, kde-format msgid "" "Last\n" @@ -1209,14 +1214,14 @@ "Última\n" "diferència" -#: kdiff3.cpp:596 +#: kdiff3.cpp:595 #, kde-format msgid "(Skips white space differences when \"Show White Space\" is disabled.)" msgstr "" "(S'ignoren les diferències en els espais en blanc quan «Mostra els espais en " "blanc» està desactivat)." -#: kdiff3.cpp:597 +#: kdiff3.cpp:596 #, kde-format msgid "" "(Does not skip white space differences even when \"Show White Space\" is " @@ -1225,12 +1230,12 @@ "(No s'ignoren les diferències en els espais en blanc quan «Mostra els espais " "en blanc» està desactivat)." -#: kdiff3.cpp:598 +#: kdiff3.cpp:597 #, kde-format msgid "Go to Previous Delta" msgstr "Vés a la diferència anterior" -#: kdiff3.cpp:598 +#: kdiff3.cpp:597 #, kde-format msgid "" "Prev\n" @@ -1239,12 +1244,12 @@ "Diferència\n" "anterior" -#: kdiff3.cpp:600 +#: kdiff3.cpp:599 #, kde-format msgid "Go to Next Delta" msgstr "Vés a la diferència següent" -#: kdiff3.cpp:600 +#: kdiff3.cpp:599 #, kde-format msgid "" "Next\n" @@ -1253,12 +1258,12 @@ "Diferència\n" "següent" -#: kdiff3.cpp:602 +#: kdiff3.cpp:601 #, kde-format msgid "Go to Previous Conflict" msgstr "Vés al conflicte anterior" -#: kdiff3.cpp:602 +#: kdiff3.cpp:601 #, kde-format msgid "" "Prev\n" @@ -1267,12 +1272,12 @@ "Conflicte\n" "anterior" -#: kdiff3.cpp:604 +#: kdiff3.cpp:603 #, kde-format msgid "Go to Next Conflict" msgstr "Vés al conflicte següent" -#: kdiff3.cpp:604 +#: kdiff3.cpp:603 #, kde-format msgid "" "Next\n" @@ -1281,12 +1286,12 @@ "Conflicte\n" "següent" -#: kdiff3.cpp:606 +#: kdiff3.cpp:605 #, kde-format msgid "Go to Previous Unsolved Conflict" msgstr "Vés al conflicte no resolt anterior" -#: kdiff3.cpp:606 +#: kdiff3.cpp:605 #, kde-format msgid "" "Prev\n" @@ -1295,12 +1300,12 @@ "No resolt\n" "anterior" -#: kdiff3.cpp:608 +#: kdiff3.cpp:607 #, kde-format msgid "Go to Next Unsolved Conflict" msgstr "Vés al conflicte no resolt següent" -#: kdiff3.cpp:608 +#: kdiff3.cpp:607 #, kde-format msgid "" "Next\n" @@ -1309,12 +1314,12 @@ "No resolt\n" "següent" -#: kdiff3.cpp:610 +#: kdiff3.cpp:609 #, kde-format msgid "Select Line(s) From A" msgstr "Selecciona línies d'A" -#: kdiff3.cpp:610 +#: kdiff3.cpp:609 #, kde-format msgid "" "Choose\n" @@ -1323,12 +1328,12 @@ "Escull\n" "A" -#: kdiff3.cpp:611 +#: kdiff3.cpp:610 #, kde-format msgid "Select Line(s) From B" msgstr "Selecciona línies de B" -#: kdiff3.cpp:611 +#: kdiff3.cpp:610 #, kde-format msgid "" "Choose\n" @@ -1337,12 +1342,12 @@ "Escull\n" "B" -#: kdiff3.cpp:612 +#: kdiff3.cpp:611 #, kde-format msgid "Select Line(s) From C" msgstr "Selecciona línies de C" -#: kdiff3.cpp:612 +#: kdiff3.cpp:611 #, kde-format msgid "" "Choose\n" @@ -1351,14 +1356,14 @@ "Escull\n" "C" -#: kdiff3.cpp:613 +#: kdiff3.cpp:612 #, kde-format msgid "Automatically Go to Next Unsolved Conflict After Source Selection" msgstr "" "Vés automàticament al conflicte no resolt següent després de seleccionar una " "font" -#: kdiff3.cpp:613 +#: kdiff3.cpp:612 #, kde-format msgid "" "Auto\n" @@ -1367,12 +1372,12 @@ "Automàticament\n" "al següent" -#: kdiff3.cpp:615 +#: kdiff3.cpp:614 #, kde-format msgid "Show Space && Tabulator Characters" msgstr "Mostra els caràcters d'espai en blanc i els de tabulació" -#: kdiff3.cpp:615 +#: kdiff3.cpp:614 #, kde-format msgid "" "White\n" @@ -1381,12 +1386,12 @@ "Caràcters\n" "en blanc" -#: kdiff3.cpp:616 +#: kdiff3.cpp:615 #, kde-format msgid "Show White Space" msgstr "Mostra els espais en blanc" -#: kdiff3.cpp:616 +#: kdiff3.cpp:615 #, kde-format msgid "" "White\n" @@ -1395,12 +1400,12 @@ "Diferències\n" "d'espais" -#: kdiff3.cpp:618 +#: kdiff3.cpp:617 #, kde-format msgid "Show Line Numbers" msgstr "Mostra els números de les línies" -#: kdiff3.cpp:618 +#: kdiff3.cpp:617 #, kde-format msgid "" "Line\n" @@ -1409,132 +1414,132 @@ "Números\n" "de línia" -#: kdiff3.cpp:620 +#: kdiff3.cpp:619 #, kde-format msgid "Automatically Solve Simple Conflicts" msgstr "Resol automàticament els conflictes senzills" -#: kdiff3.cpp:621 +#: kdiff3.cpp:620 #, kde-format msgid "Set Deltas to Conflicts" msgstr "Estableix les diferències com a conflictes" -#: kdiff3.cpp:622 +#: kdiff3.cpp:621 #, kde-format msgid "Run Regular Expression Auto Merge" -msgstr "Executa el fusionat automàtic de l'expressió regular" +msgstr "Executa el fusionat automàtic amb l'expressió regular" -#: kdiff3.cpp:623 +#: kdiff3.cpp:622 #, kde-format msgid "Automatically Solve History Conflicts" msgstr "Resol automàticament els conflictes cronològics" -#: kdiff3.cpp:624 +#: kdiff3.cpp:623 #, kde-format msgid "Split Diff At Selection" msgstr "Divideix les diferències a la selecció" -#: kdiff3.cpp:625 +#: kdiff3.cpp:624 #, kde-format msgid "Join Selected Diffs" msgstr "Uneix les diferències seleccionades" -#: kdiff3.cpp:627 +#: kdiff3.cpp:626 #, kde-format msgid "Show Window A" msgstr "Mostra la finestra A" -#: kdiff3.cpp:628 +#: kdiff3.cpp:627 #, kde-format msgid "Show Window B" msgstr "Mostra la finestra B" -#: kdiff3.cpp:629 +#: kdiff3.cpp:628 #, kde-format msgid "Show Window C" msgstr "Mostra la finestra C" -#: kdiff3.cpp:631 +#: kdiff3.cpp:630 #, kde-format msgid "Normal Overview" -msgstr "Resum normal" +msgstr "Visió de conjunt normal" -#: kdiff3.cpp:632 +#: kdiff3.cpp:631 #, kde-format msgid "A vs. B Overview" -msgstr "Resum d'A contra B" +msgstr "Visió de conjunt d'A contra B" -#: kdiff3.cpp:633 +#: kdiff3.cpp:632 #, kde-format msgid "A vs. C Overview" -msgstr "Resum d'A contra C" +msgstr "Visió de conjunt d'A contra C" -#: kdiff3.cpp:634 +#: kdiff3.cpp:633 #, kde-format msgid "B vs. C Overview" -msgstr "Resum de B contra C" +msgstr "Visió de conjunt de B contra C" -#: kdiff3.cpp:635 +#: kdiff3.cpp:634 #, kde-format msgid "Word Wrap Diff Windows" -msgstr "Ajusta les línies de les finestres de diferències" +msgstr "Ajusta les línies a les finestres de diferències" -#: kdiff3.cpp:636 +#: kdiff3.cpp:635 #, kde-format msgid "Add Manual Diff Alignment" msgstr "Afegeix alineació manual de les diferències" -#: kdiff3.cpp:637 +#: kdiff3.cpp:636 #, kde-format msgid "Clear All Manual Diff Alignments" msgstr "Neteja totes les alineacions manuals de les diferències" -#: kdiff3.cpp:639 +#: kdiff3.cpp:638 #, kde-format msgid "Focus Next Window" msgstr "Focus a la finestra següent" -#: kdiff3.cpp:640 +#: kdiff3.cpp:639 #, kde-format msgid "Focus Prev Window" msgstr "Focus a la finestra anterior" -#: kdiff3.cpp:641 +#: kdiff3.cpp:640 #, kde-format msgid "Toggle Split Orientation" msgstr "Commuta l'orientació de les divisions" -#: kdiff3.cpp:643 +#: kdiff3.cpp:642 #, kde-format msgid "Dir && Text Split Screen View" msgstr "Vista de pantalla dividida en text i directoris" -#: kdiff3.cpp:645 +#: kdiff3.cpp:644 #, kde-format msgid "Toggle Between Dir && Text View" msgstr "Commuta entre la vista de directoris i text" -#: kdiff3.cpp:697 pdiff.cpp:1909 +#: kdiff3.cpp:696 pdiff.cpp:1919 #, kde-format msgid "The merge result has not been saved." msgstr "El resultat del fusionat no s'ha desat." -#: kdiff3.cpp:699 +#: kdiff3.cpp:698 #, kde-format msgid "Save && Quit" msgstr "Desa i surt" -#: kdiff3.cpp:700 +#: kdiff3.cpp:699 #, kde-format msgid "Quit Without Saving" msgstr "Surt sense desar" -#: kdiff3.cpp:708 pdiff.cpp:1920 +#: kdiff3.cpp:707 pdiff.cpp:1930 #, kde-format msgid "Saving the merge result failed." msgstr "Ha fallat en desar el resultat del fusionat." -#: kdiff3.cpp:719 pdiff.cpp:1032 +#: kdiff3.cpp:718 pdiff.cpp:1030 #, kde-format msgid "" "You are currently doing a directory merge. Are you sure, you want to abort?" @@ -1542,62 +1547,62 @@ "Actualment esteu fent una fusió de directoris. Segur que la voleu " "interrompre?" -#: kdiff3.cpp:742 +#: kdiff3.cpp:741 #, kde-format msgid "Saving file..." msgstr "S'està desant el fitxer..." -#: kdiff3.cpp:759 +#: kdiff3.cpp:758 #, kde-format msgid "Saving file with a new filename..." msgstr "S'està desant el fitxer amb un nom nou..." -#: kdiff3.cpp:761 +#: kdiff3.cpp:760 #, kde-format msgid "Save As..." msgstr "Desa com a..." -#: kdiff3.cpp:820 +#: kdiff3.cpp:819 #, kde-format msgid "Printing not implemented." msgstr "Impressió no implementada." -#: kdiff3.cpp:857 +#: kdiff3.cpp:858 #, kde-format msgid "Printing..." msgstr "S'està imprimint..." -#: kdiff3.cpp:943 +#: kdiff3.cpp:948 #, kde-format msgid "Printing page %1 of %2" msgstr "S'està imprimint la pàgina %1 de %2" -#: kdiff3.cpp:1000 +#: kdiff3.cpp:1006 #, kde-format msgid " (Selection)" msgstr " (Selecció)" -#: kdiff3.cpp:1027 +#: kdiff3.cpp:1034 #, kde-format msgid "Printing completed." msgstr "Impressió completada." -#: kdiff3.cpp:1031 +#: kdiff3.cpp:1038 #, kde-format msgid "Printing aborted." msgstr "S'ha interromput la impressió." -#: kdiff3.cpp:1038 +#: kdiff3.cpp:1045 #, kde-format msgid "Exiting..." msgstr "S'està sortint..." -#: kdiff3.cpp:1049 +#: kdiff3.cpp:1056 #, kde-format msgid "Toggling toolbar..." msgstr "S'està commutant la barra d'eines..." -#: kdiff3.cpp:1070 +#: kdiff3.cpp:1077 #, kde-format msgid "Toggle the statusbar..." msgstr "Commuta la barra d'estat..." @@ -1622,10 +1627,10 @@ msgid "Joachim Eibl" msgstr "Joachim Eibl" -#: kdiff3_part.cpp:173 kdiff3_part.cpp:254 +#: kdiff3_part.cpp:174 kdiff3_part.cpp:255 #, kde-format msgid "Could not find files for comparison." -msgstr "No s'han trobat fitxers per a comparar." +msgstr "No s'ha trobat cap fitxer per a comparar." #. i18n: ectx: Menu (movement) #: kdiff3_part.rc:4 @@ -1640,7 +1645,7 @@ msgstr "Configura el KDiff3" #. i18n: ectx: ToolBar (mainToolBar) -#: kdiff3_part.rc:16 main.cpp:88 +#: kdiff3_part.rc:16 main.cpp:89 #, kde-format msgid "KDiff3" msgstr "KDiff3" @@ -1710,87 +1715,92 @@ msgid "Main Toolbar" msgstr "Barra d'eines principal" -#: main.cpp:68 main.cpp:72 +#: main.cpp:69 main.cpp:73 #, kde-format msgid "Ignored. (User defined.)" msgstr "Ignorat. (Definit per l'usuari)." -#: main.cpp:92 +#: main.cpp:93 #, kde-format msgid " (64 bit)" msgstr " (64 bits)" -#: main.cpp:94 +#: main.cpp:95 #, kde-format msgid " (32 bit)" msgstr " (32 bits)" -#: main.cpp:95 +#: main.cpp:96 #, kde-format msgid "Tool for Comparison and Merge of Files and Directories" msgstr "Eina per a comparar i fusionar fitxers i directoris" -#: main.cpp:96 +#: main.cpp:97 #, kde-format msgid "(c) 2002-2014 Joachim Eibl, (c) 2017 Michael Reeves KF5/Qt5 port" msgstr "" "(c) 2002-2014 Joachim Eibl, (c) 2017 Michael Reeves adaptació a KF5/Qt5" -#: main.cpp:112 +#: main.cpp:113 #, kde-format msgid "Merge the input." msgstr "Fusiona l'entrada." -#: main.cpp:113 +#: main.cpp:114 #, kde-format msgid "Explicit base file. For compatibility with certain tools." msgstr "Fitxer base explícit. Per compatibilitat amb certes eines." -#: main.cpp:114 +#: main.cpp:115 #, kde-format msgid "Output file. Implies -m. E.g.: -o newfile.txt" msgstr "Fitxer de sortida. Implica -m P. ex: -o fitxernou.txt" -#: main.cpp:115 +#: main.cpp:116 #, kde-format msgid "Output file, again. (For compatibility with certain tools.)" msgstr "" "Fitxer de sortida, un altre cop. (Per compatibilitat amb certes eines)." -#: main.cpp:116 +#: main.cpp:118 #, kde-format msgid "No GUI if all conflicts are auto-solvable. (Needs -o file)" msgstr "" "Sense IGU si tots els conflictes es poden resoldre automàticament. (Cal -o " "fitxer)" -#: main.cpp:117 +#: main.cpp:120 +#, kde-format +msgid "Ignored." +msgstr "Ignorat." + +#: main.cpp:122 #, kde-format msgid "Do not solve conflicts automatically." msgstr "No resol els conflictes automàticament." -#: main.cpp:118 +#: main.cpp:123 #, kde-format msgid "Visible name replacement for input file 1 (base)." msgstr "Reemplaçament del nom visible pel fitxer de sortida 1 (base)." -#: main.cpp:119 +#: main.cpp:124 #, kde-format msgid "Visible name replacement for input file 2." msgstr "Reemplaçament del nom visible pel fitxer de sortida 2." -#: main.cpp:120 +#: main.cpp:125 #, kde-format msgid "Visible name replacement for input file 3." msgstr "Reemplaçament del nom visible pel fitxer de sortida 3." -#: main.cpp:121 +#: main.cpp:126 #, kde-format msgid "Alternative visible name replacement. Supply this once for every input." msgstr "" "Reemplaçament del nom visible alternatiu. Proporcioneu-lo per a cada sortida." -#: main.cpp:122 +#: main.cpp:127 #, kde-format msgid "" "Override a config setting. Use once for every setting. E.g.: --cs " @@ -1799,89 +1809,89 @@ "Sobreescriu l'ajustament de la configuració. Useu-ho per a cada ajustament. " "P. ex.: --cs \"AutoAdvance=1\"" -#: main.cpp:123 +#: main.cpp:128 #, kde-format msgid "Show list of config settings and current values." msgstr "Mostra una llista dels ajustaments de configuració i el valor actual." -#: main.cpp:124 +#: main.cpp:129 #, kde-format msgid "Use a different config file." msgstr "Usa un fitxer de configuració diferent." -#: main.cpp:127 +#: main.cpp:132 #, kde-format msgid "file1 to open (base, if not specified via --base)" msgstr "Fitxer1 a obrir (base, si no s'especifica via --base)." -#: main.cpp:128 +#: main.cpp:133 #, kde-format msgid "file2 to open" msgstr "Fitxer 2 a obrir." -#: main.cpp:129 +#: main.cpp:134 #, kde-format msgid "file3 to open" msgstr "Fitxer 3 a obrir." -#: main.cpp:153 +#: main.cpp:158 #, kde-format msgid "See kdiff3 --help for supported options." msgstr "Vegeu «kdiff3 --help» per a les opcions admeses." -#: mergeresultwindow.cpp:158 +#: mergeresultwindow.cpp:171 #, kde-format msgid "Choose A Everywhere" msgstr "Escull A a tot arreu" -#: mergeresultwindow.cpp:159 +#: mergeresultwindow.cpp:172 #, kde-format msgid "Choose B Everywhere" msgstr "Escull B a tot arreu" -#: mergeresultwindow.cpp:160 +#: mergeresultwindow.cpp:173 #, kde-format msgid "Choose C Everywhere" msgstr "Escull C a tot arreu" -#: mergeresultwindow.cpp:161 +#: mergeresultwindow.cpp:174 #, kde-format msgid "Choose A for All Unsolved Conflicts" msgstr "Escull A a tots els conflictes no resolts" -#: mergeresultwindow.cpp:162 +#: mergeresultwindow.cpp:175 #, kde-format msgid "Choose B for All Unsolved Conflicts" msgstr "Escull B a tots els conflictes no resolts" -#: mergeresultwindow.cpp:163 +#: mergeresultwindow.cpp:176 #, kde-format msgid "Choose C for All Unsolved Conflicts" msgstr "Escull C a tots els conflictes no resolts" -#: mergeresultwindow.cpp:164 +#: mergeresultwindow.cpp:177 #, kde-format msgid "Choose A for All Unsolved Whitespace Conflicts" msgstr "Escull A a tots els conflictes dels espais en blanc no resolts" -#: mergeresultwindow.cpp:165 +#: mergeresultwindow.cpp:178 #, kde-format msgid "Choose B for All Unsolved Whitespace Conflicts" msgstr "Escull B a tots els conflictes dels espais en blanc no resolts" -#: mergeresultwindow.cpp:166 +#: mergeresultwindow.cpp:179 #, kde-format msgid "Choose C for All Unsolved Whitespace Conflicts" msgstr "Escull C a tots els conflictes dels espais en blanc no resolts" -#: mergeresultwindow.cpp:176 +#: mergeresultwindow.cpp:204 #, kde-format msgid "Number of remaining unsolved conflicts: %1 (of which %2 are whitespace)" msgstr "" -"Nombre de conflictes sense resoldre pendents: %1 (dels quals %2 són espais " +"Nombre de conflictes pendents sense resoldre: %1 (dels quals %2 són espais " "en blanc)" -#: mergeresultwindow.cpp:370 +#: mergeresultwindow.cpp:398 #, kde-format msgid "" "The output has been modified.\n" @@ -1890,29 +1900,29 @@ "S'ha modificat la sortida.\n" "Si continueu, es perdran els canvis." -#: mergeresultwindow.cpp:936 pdiff.cpp:827 +#: mergeresultwindow.cpp:964 pdiff.cpp:817 #, kde-format msgid "All input files are binary equal." msgstr "Tots els fitxers d'entrada són binàriament iguals." -#: mergeresultwindow.cpp:938 +#: mergeresultwindow.cpp:966 #, kde-format msgid "All input files contain the same text." msgstr "Tots els fitxers d'entrada contenen el mateix text." -#: mergeresultwindow.cpp:942 mergeresultwindow.cpp:946 -#: mergeresultwindow.cpp:950 pdiff.cpp:833 pdiff.cpp:837 pdiff.cpp:841 +#: mergeresultwindow.cpp:970 mergeresultwindow.cpp:974 +#: mergeresultwindow.cpp:978 pdiff.cpp:823 pdiff.cpp:827 pdiff.cpp:831 #, kde-format msgid "Files %1 and %2 are binary equal.\n" msgstr "Els fitxers %1 i %2 són binàriament iguals.\n" -#: mergeresultwindow.cpp:944 mergeresultwindow.cpp:948 -#: mergeresultwindow.cpp:952 +#: mergeresultwindow.cpp:972 mergeresultwindow.cpp:976 +#: mergeresultwindow.cpp:980 #, kde-format msgid "Files %1 and %2 have equal text.\n" msgstr "Els fitxers %1 i %2 tenen el mateix text.\n" -#: mergeresultwindow.cpp:958 +#: mergeresultwindow.cpp:986 #, kde-format msgid "" "Total number of conflicts: %1\n" @@ -1925,27 +1935,27 @@ "Nre. de conflictes sense resoldre: %3\n" "%4" -#: mergeresultwindow.cpp:964 +#: mergeresultwindow.cpp:992 #, kde-format msgid "Conflicts" msgstr "Conflictes" -#: mergeresultwindow.cpp:1873 +#: mergeresultwindow.cpp:1901 #, kde-format msgid "" msgstr "" -#: mergeresultwindow.cpp:1881 +#: mergeresultwindow.cpp:1909 #, kde-format msgid "" msgstr "" -#: mergeresultwindow.cpp:1883 mergeresultwindow.cpp:2755 +#: mergeresultwindow.cpp:1911 mergeresultwindow.cpp:2783 #, kde-format msgid "" msgstr "" -#: mergeresultwindow.cpp:2967 +#: mergeresultwindow.cpp:2995 #, kde-format msgid "" "Not all conflicts are solved yet.\n" @@ -1954,12 +1964,12 @@ "Encara no s'han resolt tots els conflictes.\n" "El fitxer no s'ha desat." -#: mergeresultwindow.cpp:2969 mergeresultwindow.cpp:2978 +#: mergeresultwindow.cpp:2997 mergeresultwindow.cpp:3006 #, kde-format msgid "Conflicts Left" msgstr "Conflictes pendents" -#: mergeresultwindow.cpp:2976 +#: mergeresultwindow.cpp:3004 #, kde-format msgid "" "There is a line end style conflict. Please choose the line end style " @@ -1970,7 +1980,7 @@ "del salt de línia.\n" "El fitxer no s'ha desat." -#: mergeresultwindow.cpp:2990 +#: mergeresultwindow.cpp:3018 #, kde-format msgid "" "\n" @@ -1981,57 +1991,57 @@ "\n" "Ha fallat la creació de la còpia de seguretat. El fitxer no s'ha desat." -#: mergeresultwindow.cpp:2990 mergeresultwindow.cpp:3038 +#: mergeresultwindow.cpp:3018 mergeresultwindow.cpp:3066 #, kde-format msgid "File Save Error" msgstr "Error en desar el fitxer" -#: mergeresultwindow.cpp:3038 +#: mergeresultwindow.cpp:3066 #, kde-format msgid "Error while writing." msgstr "Error en escriure." -#: mergeresultwindow.cpp:3110 +#: mergeresultwindow.cpp:3138 #, kde-format msgid "Output:" msgstr "Sortida:" -#: mergeresultwindow.cpp:3123 mergeresultwindow.cpp:3315 +#: mergeresultwindow.cpp:3151 mergeresultwindow.cpp:3343 #, kde-format msgid "[Modified]" msgstr "[Modificat]" -#: mergeresultwindow.cpp:3130 +#: mergeresultwindow.cpp:3158 #, kde-format msgid "Encoding for saving:" msgstr "Codificació per desar:" -#: mergeresultwindow.cpp:3230 +#: mergeresultwindow.cpp:3258 #, kde-format msgid "Conflict" msgstr "Conflicte" -#: mergeresultwindow.cpp:3262 +#: mergeresultwindow.cpp:3290 #, kde-format msgid "Codec from A: %1" msgstr "Còdec d'A: %1" -#: mergeresultwindow.cpp:3264 +#: mergeresultwindow.cpp:3292 #, kde-format msgid "Codec from B: %1" msgstr "Còdec de B: %1" -#: mergeresultwindow.cpp:3266 +#: mergeresultwindow.cpp:3294 #, kde-format msgid "Codec from C: %1" msgstr "Còdec de C: %1" -#: optiondialog.cpp:119 +#: optiondialog.cpp:121 #, kde-format msgid "Change Font" msgstr "Canvia el tipus de lletra" -#: optiondialog.cpp:135 optiondialog.cpp:145 +#: optiondialog.cpp:137 optiondialog.cpp:147 #, kde-format msgid "" "Font: %1, %2, %3\n" @@ -2042,123 +2052,123 @@ "\n" "Exemple:" -#: optiondialog.cpp:388 +#: optiondialog.cpp:390 #, kde-format msgid "Unicode" msgstr "Unicode" -#: optiondialog.cpp:389 +#: optiondialog.cpp:391 #, kde-format msgid "Latin1" msgstr "Latin1" -#: optiondialog.cpp:408 +#: optiondialog.cpp:410 #, kde-format msgid "Change this if non-ASCII characters are not displayed correctly." msgstr "Canvia això si els caràcters no ASCII no es mostren correctament." -#: optiondialog.cpp:491 +#: optiondialog.cpp:495 #, kde-format msgid "Configure" msgstr "Configura" -#: optiondialog.cpp:568 +#: optiondialog.cpp:573 #, kde-format msgid "Font" msgstr "Tipus de lletra" -#: optiondialog.cpp:570 +#: optiondialog.cpp:575 #, kde-format msgid "Editor & Diff Output Font" msgstr "Tipus de lletra de l'editor i la sortida de diferències" -#: optiondialog.cpp:589 +#: optiondialog.cpp:594 #, kde-format msgid "Application font" msgstr "Tipus de lletra de l'aplicació" -#: optiondialog.cpp:594 +#: optiondialog.cpp:599 #, kde-format msgid "File view font" msgstr "Tipus de lletra de la vista de fitxers" -#: optiondialog.cpp:613 +#: optiondialog.cpp:618 #, kde-format msgctxt "Title for color settings page" msgid "Color" msgstr "Color" -#: optiondialog.cpp:614 +#: optiondialog.cpp:619 #, kde-format msgid "Colors Settings" msgstr "Arranjament dels colors" -#: optiondialog.cpp:631 +#: optiondialog.cpp:644 #, kde-format msgid "Editor and Diff Views:" msgstr "Vistes de l'editor i les diferències:" -#: optiondialog.cpp:639 +#: optiondialog.cpp:652 #, kde-format msgid "Foreground color:" msgstr "Color de primer pla:" -#: optiondialog.cpp:647 +#: optiondialog.cpp:660 #, kde-format msgid "Background color:" msgstr "Color de fons:" -#: optiondialog.cpp:657 +#: optiondialog.cpp:670 #, kde-format msgid "Diff background color:" msgstr "Color de fons de les diferències:" -#: optiondialog.cpp:666 +#: optiondialog.cpp:679 #, kde-format msgid "Color A:" msgstr "Color A:" -#: optiondialog.cpp:675 +#: optiondialog.cpp:688 #, kde-format msgid "Color B:" msgstr "Color B:" -#: optiondialog.cpp:684 +#: optiondialog.cpp:697 #, kde-format msgid "Color C:" msgstr "Color C:" -#: optiondialog.cpp:692 +#: optiondialog.cpp:705 #, kde-format msgid "Conflict color:" msgstr "Color del conflicte:" -#: optiondialog.cpp:701 +#: optiondialog.cpp:714 #, kde-format msgid "Current range background color:" msgstr "Color de fons de l'interval actual:" -#: optiondialog.cpp:710 +#: optiondialog.cpp:723 #, kde-format msgid "Current range diff background color:" msgstr "Color de fons de les diferències de l'interval actual:" -#: optiondialog.cpp:718 +#: optiondialog.cpp:731 #, kde-format msgid "Color for manually aligned difference ranges:" -msgstr "Color pels intervals de diferències alineades manualment:" +msgstr "Color per als intervals de diferències alineades manualment:" -#: optiondialog.cpp:725 +#: optiondialog.cpp:738 #, kde-format msgid "Directory Comparison View:" -msgstr "Vista de la comparació de directoris:" +msgstr "Vista en la comparació de directoris:" -#: optiondialog.cpp:731 +#: optiondialog.cpp:744 #, kde-format msgid "Newest file color:" msgstr "Color del fitxer més nou:" -#: optiondialog.cpp:736 +#: optiondialog.cpp:749 #, kde-format msgid "" "Changing this color will only be effective when starting the next directory " @@ -2167,37 +2177,37 @@ "El canvi d'aquest color només serà efectiu quan es comenci la propera " "comparació de directoris." -#: optiondialog.cpp:741 +#: optiondialog.cpp:754 #, kde-format msgid "Oldest file color:" msgstr "Color del fitxer més antic:" -#: optiondialog.cpp:750 +#: optiondialog.cpp:763 #, kde-format msgid "Middle age file color:" msgstr "Color del fitxer d'edat intermèdia:" -#: optiondialog.cpp:759 +#: optiondialog.cpp:772 #, kde-format msgid "Color for missing files:" msgstr "Color dels fitxers no disponibles:" -#: optiondialog.cpp:773 +#: optiondialog.cpp:786 #, kde-format msgid "Editor" msgstr "Editor" -#: optiondialog.cpp:774 +#: optiondialog.cpp:787 #, kde-format msgid "Editor Behavior" msgstr "Comportament de l'editor" -#: optiondialog.cpp:787 +#: optiondialog.cpp:809 #, kde-format msgid "Tab inserts spaces" msgstr "El tabulador insereix espais" -#: optiondialog.cpp:791 +#: optiondialog.cpp:813 #, kde-format msgid "" "On: Pressing tab generates the appropriate number of spaces.\n" @@ -2207,28 +2217,28 @@ "blanc.\n" "Desactivat: s'inserirà un caràcter de tabulació." -#: optiondialog.cpp:796 +#: optiondialog.cpp:818 #, kde-format msgid "Tab size:" msgstr "Mida de la tabulació:" -#: optiondialog.cpp:803 +#: optiondialog.cpp:825 #, kde-format msgid "Auto indentation" msgstr "Sagnat automàtic" -#: optiondialog.cpp:807 +#: optiondialog.cpp:829 #, kde-format msgid "On: The indentation of the previous line is used for a new line.\n" msgstr "" "Activat: s'usarà el sagnat de la línia prèvia per a les línies noves.\n" -#: optiondialog.cpp:810 +#: optiondialog.cpp:832 #, kde-format msgid "Auto copy selection" msgstr "Copia la selecció automàticament" -#: optiondialog.cpp:814 +#: optiondialog.cpp:836 #, kde-format msgid "" "On: Any selection is immediately written to the clipboard.\n" @@ -2237,7 +2247,7 @@ "Activat: totes les seleccions es desaran immediatament al porta-retalls.\n" "Desactivat: haureu de copiar explícitament, p. ex. mitjançant Ctrl-C." -#: optiondialog.cpp:829 +#: optiondialog.cpp:851 #, kde-format msgid "" "Sets the line endings for when an edited file is saved.\n" @@ -2246,12 +2256,12 @@ "Estableix els finals de línia quan es desin els fitxers editats.\n" "Dos/Windows: CR+LF; UNIX: LF; amb CR=0D, LF=0A" -#: optiondialog.cpp:839 +#: optiondialog.cpp:861 #, kde-format msgid "Diff" msgstr "Diferència" -#: optiondialog.cpp:840 +#: optiondialog.cpp:862 #, kde-format msgid "Diff Settings" msgstr "Arranjament del diff" @@ -2265,12 +2275,12 @@ #. ); #. ++line; #. -#: optiondialog.cpp:865 +#: optiondialog.cpp:896 #, kde-format msgid "Ignore numbers (treat as white space)" msgstr "Ignora els números (tracta'ls com a espais en blanc)" -#: optiondialog.cpp:869 +#: optiondialog.cpp:900 #, kde-format msgid "" "Ignore number characters during line matching phase. (Similar to Ignore " @@ -2281,45 +2291,45 @@ "ignorar els espais en blanc).\n" "Pot ajudar a comparar fitxers amb dades numèriques." -#: optiondialog.cpp:873 +#: optiondialog.cpp:904 #, kde-format msgid "Ignore C/C++ comments (treat as white space)" msgstr "Ignora els comentaris de C/C++ (tracta'ls com a espais en blanc)" -#: optiondialog.cpp:876 +#: optiondialog.cpp:907 #, kde-format msgid "Treat C/C++ comments like white space." msgstr "Tracta els comentaris de C/C++ com si fossin espais en blanc." -#: optiondialog.cpp:879 +#: optiondialog.cpp:910 #, kde-format msgid "Ignore case (treat as white space)" -msgstr "Ignora les majúscules/minúscules (tracta'ls com a espais en blanc)" +msgstr "Ignora les majúscules/minúscules (tracta-les com a espais en blanc)" -#: optiondialog.cpp:883 +#: optiondialog.cpp:914 #, kde-format msgid "Treat case differences like white space changes. ('a'<=>'A')" msgstr "" "Tracta les diferències de caixa com si fossin canvis d'espais en blanc(«a» " "<=> «A»)" -#: optiondialog.cpp:886 +#: optiondialog.cpp:917 #, kde-format msgid "Preprocessor command:" msgstr "Ordre del preprocessador:" -#: optiondialog.cpp:891 +#: optiondialog.cpp:922 #, kde-format msgid "User defined pre-processing. (See the docs for details.)" msgstr "" "Preprocessament definit per l'usuari. (Vegeu la documentació pels detalls)." -#: optiondialog.cpp:894 +#: optiondialog.cpp:925 #, kde-format msgid "Line-matching preprocessor command:" -msgstr "Ordre del preprocessador d'encaix de línies:" +msgstr "Ordre del preprocessador per a la coincidència de les línies:" -#: optiondialog.cpp:899 +#: optiondialog.cpp:930 #, kde-format msgid "" "This pre-processor is only used during line matching.\n" @@ -2328,12 +2338,12 @@ "Aquest preprocessador només s'usa durant l'encaix de línies.\n" "(Per a més detalls vegeu la documentació)." -#: optiondialog.cpp:902 +#: optiondialog.cpp:933 #, kde-format msgid "Try hard (slower)" msgstr "Esforça't (més lent)" -#: optiondialog.cpp:906 +#: optiondialog.cpp:937 #, kde-format msgid "" "Enables the --minimal option for the external diff.\n" @@ -2342,12 +2352,12 @@ "Activa l'opció --minimal pel «diff» extern.\n" "L'anàlisi de fitxers grans serà encara més lenta." -#: optiondialog.cpp:910 +#: optiondialog.cpp:941 #, kde-format msgid "Align B and C for 3 input files" msgstr "Alinea B i C per 3 fitxers d'entrada" -#: optiondialog.cpp:914 +#: optiondialog.cpp:945 #, kde-format msgid "" "Try to align B and C when comparing or merging three input files.\n" @@ -2358,17 +2368,23 @@ "No recomanat per a fusionar, ja que pot ser més complicat.\n" "(Desactivat per defecte)." -#: optiondialog.cpp:926 +#: optiondialog.cpp:956 +#, kde-format +msgctxt "Settings page" +msgid "Merge" +msgstr "Fusionat" + +#: optiondialog.cpp:957 #, kde-format msgid "Merge Settings" msgstr "Arranjament del fusionat" -#: optiondialog.cpp:940 +#: optiondialog.cpp:980 #, kde-format msgid "Auto advance delay (ms):" msgstr "Retard de l'avanç automàtic (ms):" -#: optiondialog.cpp:946 +#: optiondialog.cpp:986 #, kde-format msgid "" "When in Auto-Advance mode the result of the current selection is shown \n" @@ -2378,27 +2394,27 @@ "de la selecció actual durant el temps especificat, abans de saltar al\n" "conflicte següent. Interval: 0-2000 ms" -#: optiondialog.cpp:950 +#: optiondialog.cpp:990 #, kde-format msgid "Show info dialogs" msgstr "Mostra els diàlegs informatius" -#: optiondialog.cpp:953 +#: optiondialog.cpp:993 #, kde-format msgid "Show a dialog with information about the number of conflicts." msgstr "Mostra un diàleg amb informació sobre el nombre de conflictes." -#: optiondialog.cpp:956 +#: optiondialog.cpp:996 #, kde-format msgid "White space 2-file merge default:" msgstr "Opció per defecte dels espais en blanc en la fusió de 2 fitxers:" -#: optiondialog.cpp:961 optiondialog.cpp:974 +#: optiondialog.cpp:1001 optiondialog.cpp:1014 #, kde-format msgid "Manual Choice" msgstr "Selecció manual" -#: optiondialog.cpp:965 optiondialog.cpp:979 +#: optiondialog.cpp:1005 optiondialog.cpp:1019 #, kde-format msgid "" "Allow the merge algorithm to automatically select an input for white-space-" @@ -2407,22 +2423,22 @@ "Permet que l'algoritme de fusió seleccioni automàticament una entrada pels " "canvis d'espais en blanc." -#: optiondialog.cpp:969 +#: optiondialog.cpp:1009 #, kde-format msgid "White space 3-file merge default:" msgstr "Opció per defecte dels espais en blanc en la fusió de 3 fitxers:" -#: optiondialog.cpp:983 +#: optiondialog.cpp:1023 #, kde-format msgid "Automatic Merge Regular Expression" -msgstr "Fusió automàtica de l'expressió regular" +msgstr "Fusió automàtica amb l'expressió regular" -#: optiondialog.cpp:991 smalldialogs.cpp:449 +#: optiondialog.cpp:1031 smalldialogs.cpp:459 #, kde-format msgid "Auto merge regular expression:" -msgstr "Fusiona automàticament l'expressió regular:" +msgstr "Fusiona automàticament amb l'expressió regular:" -#: optiondialog.cpp:996 +#: optiondialog.cpp:1036 #, kde-format msgid "" "Regular expression for lines where KDiff3 should automatically choose one " @@ -2435,32 +2451,33 @@ "Quan una línia amb un conflicte concorda amb l'expressió regular, aleshores\n" "-si està disponible- s'escollirà C, si no, B." -#: optiondialog.cpp:1002 +#: optiondialog.cpp:1042 #, kde-format msgid "Run regular expression auto merge on merge start" msgstr "" -"Executa la fusió automàtica de l'expressió regular a l'inici del fusionat" +"Executa la fusió automàtica amb l'expressió regular a l'inici del fusionat" -#: optiondialog.cpp:1005 +#: optiondialog.cpp:1045 #, kde-format msgid "" "Run the merge for auto merge regular expressions\n" "immediately when a merge starts.\n" msgstr "" -"Fusiona automàticament l'expressió regular\n" +"Fusiona automàticament amb les expressions regulars\n" "just en començar el fusionat.\n" -#: optiondialog.cpp:1010 +#: optiondialog.cpp:1050 #, kde-format msgid "Version Control History Merging" msgstr "Fusió de l'historial del control de versions" -#: optiondialog.cpp:1018 smalldialogs.cpp:476 +#: optiondialog.cpp:1058 smalldialogs.cpp:486 #, kde-format msgid "History start regular expression:" msgstr "Expressió regular per a l'inici de l'historial:" -#: optiondialog.cpp:1023 +# skip-rule: t-pu_sp +#: optiondialog.cpp:1063 #, kde-format msgid "" "Regular expression for the start of the version control history entry.\n" @@ -2472,12 +2489,12 @@ "Normalment aquesta línia conté la paraula clau «$Log$».\n" "Valor per defecte: «.*\\$Log.*\\$.*»" -#: optiondialog.cpp:1029 smalldialogs.cpp:504 +#: optiondialog.cpp:1069 smalldialogs.cpp:514 #, kde-format msgid "History entry start regular expression:" msgstr "Expressió regular per a l'inici d'entrada de l'historial:" -#: optiondialog.cpp:1042 +#: optiondialog.cpp:1082 #, kde-format msgid "" "A version control history entry consists of several lines.\n" @@ -2497,23 +2514,23 @@ "entrades de l'historial.\n" "Per a més detalls, vegeu la documentació." -#: optiondialog.cpp:1050 +#: optiondialog.cpp:1090 #, kde-format msgid "History merge sorting" msgstr "Ordena el fusionat de l'historial" -#: optiondialog.cpp:1053 +#: optiondialog.cpp:1093 #, kde-format msgid "Sort version control history by a key." msgstr "Ordena l'historial del control de versions per una clau." -#: optiondialog.cpp:1063 +#: optiondialog.cpp:1103 #, kde-format msgid "History entry start sort key order:" msgstr "" "Criteri d'ordenació de les claus per a l'inici de l'entrada de l'historial:" -#: optiondialog.cpp:1068 +#: optiondialog.cpp:1108 #, kde-format msgid "" "Each pair of parentheses used in the regular expression for the history " @@ -2532,42 +2549,42 @@ "Si es deixa en blanc, no s'ordenarà.\n" "Per a més detalls, vegeu la documentació." -#: optiondialog.cpp:1079 +#: optiondialog.cpp:1119 #, kde-format msgid "Merge version control history on merge start" msgstr "Fusiona l'historial del control de versions quan es comenci a fusionar" -#: optiondialog.cpp:1082 +#: optiondialog.cpp:1122 #, kde-format msgid "Run version control history automerge on merge start." msgstr "" "Executa la fusió automàtica de l'historial del control de versions quan es " "comenci a fusionar." -#: optiondialog.cpp:1086 +#: optiondialog.cpp:1126 #, kde-format msgid "Max number of history entries:" msgstr "Nombre màxim d'entrades de l'historial:" # skip-rule: kct-cut -#: optiondialog.cpp:1090 +#: optiondialog.cpp:1130 #, kde-format msgid "Cut off after specified number. Use -1 for infinite number of entries." msgstr "" "Talla a partir d'un número especificat. Useu -1 per a un nombre infinit " "d'entrades." -#: optiondialog.cpp:1094 +#: optiondialog.cpp:1134 #, kde-format msgid "Test your regular expressions" -msgstr "Comprova l'expressió regular" +msgstr "Comprova les expressions regulars" -#: optiondialog.cpp:1099 +#: optiondialog.cpp:1139 #, kde-format msgid "Irrelevant merge command:" msgstr "Ordre de fusió irrellevant:" -#: optiondialog.cpp:1104 +#: optiondialog.cpp:1144 #, kde-format msgid "" "If specified this script is run after automerge\n" @@ -2578,12 +2595,12 @@ "quan no s'hagin detectat altres canvis apropiats.\n" "Cridat amb els paràmetres: nomdefitxer1 nomdefitxer2 nomdefitxer3" -#: optiondialog.cpp:1109 +#: optiondialog.cpp:1149 #, kde-format msgid "Auto save and quit on merge without conflicts" msgstr "En els fusionats sense conflictes desa i surt automàticament" -#: optiondialog.cpp:1113 +#: optiondialog.cpp:1153 #, kde-format msgid "" "If KDiff3 was started for a file-merge from the command line and all\n" @@ -2596,27 +2613,27 @@ "desa i surt.\n" "(Similar a l'opció de la línia d'ordres «--auto»)." -#: optiondialog.cpp:1124 optiondialog.cpp:1125 +#: optiondialog.cpp:1164 optiondialog.cpp:1165 #, kde-format msgid "Directory" msgstr "Directori" -#: optiondialog.cpp:1137 +#: optiondialog.cpp:1185 #, kde-format msgid "Recursive directories" msgstr "Directoris recursius" -#: optiondialog.cpp:1140 +#: optiondialog.cpp:1188 #, kde-format msgid "Whether to analyze subdirectories or not." msgstr "Si analitzar o no els subdirectoris." -#: optiondialog.cpp:1142 +#: optiondialog.cpp:1190 #, kde-format msgid "File pattern(s):" msgstr "Patró dels fitxers:" -#: optiondialog.cpp:1148 +#: optiondialog.cpp:1196 #, kde-format msgid "" "Pattern(s) of files to be analyzed. \n" @@ -2627,12 +2644,12 @@ "Comodins: «*» i «?»\n" "Es poden especificar diversos patrons separant-los amb: «;»" -#: optiondialog.cpp:1153 +#: optiondialog.cpp:1201 #, kde-format msgid "File-anti-pattern(s):" msgstr "Negatiu del patró dels fitxers:" -#: optiondialog.cpp:1159 +#: optiondialog.cpp:1207 #, kde-format msgid "" "Pattern(s) of files to be excluded from analysis. \n" @@ -2643,12 +2660,12 @@ "Comodins: «*» i «?»\n" "Es poden especificar diversos patrons separant-los amb: «;»" -#: optiondialog.cpp:1164 +#: optiondialog.cpp:1212 #, kde-format msgid "Dir-anti-pattern(s):" msgstr "Negatiu del patró dels directoris:" -#: optiondialog.cpp:1170 +#: optiondialog.cpp:1218 #, kde-format msgid "" "Pattern(s) of directories to be excluded from analysis. \n" @@ -2659,12 +2676,12 @@ "Comodins: «*» i «?»\n" "Es poden especificar diversos patrons separant-los amb: «;»" -#: optiondialog.cpp:1175 +#: optiondialog.cpp:1223 #, kde-format msgid "Use .cvsignore" msgstr "Usa .cvsignore" -#: optiondialog.cpp:1179 +#: optiondialog.cpp:1227 #, kde-format msgid "" "Extends the antipattern to anything that would be ignored by CVS.\n" @@ -2674,22 +2691,22 @@ "Per mitjà dels fitxers «.cvsignore» locals això pot ser específic de cada " "directori." -#: optiondialog.cpp:1183 +#: optiondialog.cpp:1231 #, kde-format msgid "Find hidden files and directories" -msgstr "Troba als fitxers i directoris ocults" +msgstr "Cerca als fitxers i directoris ocults" -#: optiondialog.cpp:1186 +#: optiondialog.cpp:1234 #, kde-format msgid "Finds hidden files and directories." -msgstr "Troba als fitxers i directoris ocults." +msgstr "Cerca als fitxers i directoris ocults." -#: optiondialog.cpp:1189 +#: optiondialog.cpp:1237 #, kde-format msgid "Follow file links" msgstr "Segueix els enllaços de fitxer" -#: optiondialog.cpp:1193 +#: optiondialog.cpp:1241 #, kde-format msgid "" "On: Compare the file the link points to.\n" @@ -2698,12 +2715,12 @@ "Activat: compara el fitxer al qual apunta l'enllaç.\n" "Desactivat: compara els enllaços." -#: optiondialog.cpp:1197 +#: optiondialog.cpp:1245 #, kde-format msgid "Follow directory links" msgstr "Segueix els enllaços de directori" -#: optiondialog.cpp:1201 +#: optiondialog.cpp:1249 #, kde-format msgid "" "On: Compare the directory the link points to.\n" @@ -2712,13 +2729,13 @@ "Activat: compara el directori al qual apunta l'enllaç.\n" "Desactivat: compara els enllaços." -#: optiondialog.cpp:1210 +#: optiondialog.cpp:1258 #, kde-format msgid "Case sensitive filename comparison" msgstr "" "La comparació dels noms de fitxer és sensible a majúscules i minúscules" -#: optiondialog.cpp:1214 +#: optiondialog.cpp:1262 #, kde-format msgid "" "The directory comparison will compare files or directories when their names " @@ -2731,12 +2748,12 @@ "Activeu aquesta opció si la caixa dels noms ha de coincidir. (Per defecte en " "Windows està desactivat, en altres entorns està activat)." -#: optiondialog.cpp:1218 +#: optiondialog.cpp:1266 #, kde-format msgid "Unfold all subdirectories on load" msgstr "Desplega tots els subdirectoris en carregar" -#: optiondialog.cpp:1222 +#: optiondialog.cpp:1270 #, kde-format msgid "" "On: Unfold all subdirectories when starting a directory diff.\n" @@ -2745,12 +2762,12 @@ "Actiu: Desplega tots els subdirectoris en iniciar un «diff» de directori.\n" "Inactiu: Deixa plegats els subdirectoris." -#: optiondialog.cpp:1226 +#: optiondialog.cpp:1274 #, kde-format msgid "Skip directory status report" msgstr "Omet l'informe d'estat del directori" -#: optiondialog.cpp:1230 +#: optiondialog.cpp:1278 #, kde-format msgid "" "On: Do not show the Directory Comparison Status.\n" @@ -2759,27 +2776,27 @@ "Actiu: No mostra l'estat de comparació del directori.\n" "Inactiu: Mostra el diàleg d'estat en iniciar." -#: optiondialog.cpp:1234 +#: optiondialog.cpp:1282 #, kde-format msgid "File Comparison Mode" msgstr "Mode de comparació dels fitxers" -#: optiondialog.cpp:1239 +#: optiondialog.cpp:1287 #, kde-format msgid "Binary comparison" msgstr "Comparació binària" -#: optiondialog.cpp:1241 +#: optiondialog.cpp:1289 #, kde-format msgid "Binary comparison of each file. (Default)" msgstr "Comparació binària de cada fitxer. (Per defecte)" -#: optiondialog.cpp:1244 +#: optiondialog.cpp:1292 #, kde-format msgid "Full analysis" msgstr "Anàlisi completa" -#: optiondialog.cpp:1246 +#: optiondialog.cpp:1294 #, kde-format msgid "" "Do a full analysis and show statistics information in extra columns.\n" @@ -2790,12 +2807,12 @@ "(Més lent que una comparació binària, més lent encara per als fitxers " "binaris)." -#: optiondialog.cpp:1250 +#: optiondialog.cpp:1298 #, kde-format msgid "Trust the size and modification date (unsafe)" msgstr "Confia en la mida i la data de modificació (insegur)" -#: optiondialog.cpp:1252 +#: optiondialog.cpp:1300 #, kde-format msgid "" "Assume that files are equal if the modification date and file length are " @@ -2810,7 +2827,7 @@ "mostraran com si fossin diferents.\n" "Útil per a directoris grans o xarxes lentes." -#: optiondialog.cpp:1257 +#: optiondialog.cpp:1305 #, kde-format msgid "" "Trust the size and date, but use binary comparison if date does not match " @@ -2819,7 +2836,7 @@ "Confia en la mida i la data dels fitxers però compara'ls binàriament si les " "dates no concorden (insegur)" -#: optiondialog.cpp:1259 +#: optiondialog.cpp:1307 #, kde-format msgid "" "Assume that files are equal if the modification date and file length are " @@ -2832,12 +2849,12 @@ "Si les dates no són iguals però les mides sí, usa la comparació binària.\n" "Útil per a directoris grans o xarxes lentes." -#: optiondialog.cpp:1264 +#: optiondialog.cpp:1312 #, kde-format msgid "Trust the size (unsafe)" msgstr "Confia en la mida (insegur)" -#: optiondialog.cpp:1266 +#: optiondialog.cpp:1314 #, kde-format msgid "" "Assume that files are equal if their file lengths are equal.\n" @@ -2848,12 +2865,12 @@ "Útil per a directoris grans o xarxes lentes quan la data es modifica durant " "la descàrrega." -#: optiondialog.cpp:1273 +#: optiondialog.cpp:1321 #, kde-format msgid "Synchronize directories" msgstr "Sincronitza els directoris" -#: optiondialog.cpp:1277 +#: optiondialog.cpp:1325 #, kde-format msgid "" "Offers to store files in both directories so that\n" @@ -2865,12 +2882,12 @@ "Només funciona quan es comparen dos directoris sense especificar una " "destinació." -#: optiondialog.cpp:1283 +#: optiondialog.cpp:1331 #, kde-format msgid "White space differences considered equal" msgstr "Les diferències en els espais en blanc no es consideren" -#: optiondialog.cpp:1287 +#: optiondialog.cpp:1335 #, kde-format msgid "" "If files differ only by white space consider them equal.\n" @@ -2880,12 +2897,12 @@ "iguals.\n" "Això només és actiu quan s'escull l'anàlisi completa." -#: optiondialog.cpp:1293 +#: optiondialog.cpp:1341 #, kde-format msgid "Copy newer instead of merging (unsafe)" msgstr "Copia el més nou en comptes de fusionar-los (insegur)" -#: optiondialog.cpp:1297 +#: optiondialog.cpp:1345 #, kde-format msgid "" "Do not look inside, just take the newer file.\n" @@ -2896,12 +2913,12 @@ "(Useu això només si sabeu què esteu fent).\n" "Només és efectiu quan es comparen dos directoris." -#: optiondialog.cpp:1302 +#: optiondialog.cpp:1350 #, kde-format msgid "Backup files (.orig)" msgstr "Fitxers per a còpia de seguretat (.orig)" -#: optiondialog.cpp:1306 +#: optiondialog.cpp:1354 #, kde-format msgid "" "If a file would be saved over an old file, then the old file\n" @@ -2910,17 +2927,17 @@ "Si un fitxer es desa sobre un fitxer més antic, llavors el fitxer antic\n" "es reanomenarà amb una extensió «.orig» en comptes de ser suprimit." -#: optiondialog.cpp:1382 optiondialog.cpp:1383 +#: optiondialog.cpp:1430 optiondialog.cpp:1431 #, kde-format msgid "Regional Settings" msgstr "Arranjament regional" -#: optiondialog.cpp:1397 +#: optiondialog.cpp:1454 #, kde-format msgid "Use the same encoding for everything:" msgstr "Usa la mateixa codificació a tot arreu:" -#: optiondialog.cpp:1401 +#: optiondialog.cpp:1458 #, kde-format msgid "" "Enable this allows to change all encodings by changing the first only.\n" @@ -2930,17 +2947,17 @@ "primera.\n" "Desactiveu-ho si necessiteu ajustaments diferents per a cada fitxer." -#: optiondialog.cpp:1405 +#: optiondialog.cpp:1462 #, kde-format msgid "Note: Local Encoding is \"%1\"" msgstr "Nota: la codificació local és «%1»" -#: optiondialog.cpp:1409 +#: optiondialog.cpp:1466 #, kde-format msgid "File Encoding for A:" msgstr "Codificació pel fitxer A:" -#: optiondialog.cpp:1416 +#: optiondialog.cpp:1473 #, kde-format msgid "" "If enabled then Unicode (UTF-16 or UTF-8) encoding will be detected.\n" @@ -2953,32 +2970,32 @@ "alternativa.\n" "(La detecció de l'Unicode depèn dels primers bytes d'un fitxer)." -#: optiondialog.cpp:1419 optiondialog.cpp:1430 optiondialog.cpp:1441 +#: optiondialog.cpp:1476 optiondialog.cpp:1487 optiondialog.cpp:1498 #, kde-format msgid "Auto Detect Unicode" msgstr "Detecta automàticament l'Unicode" -#: optiondialog.cpp:1425 +#: optiondialog.cpp:1482 #, kde-format msgid "File Encoding for B:" msgstr "Codificació pel fitxer B:" -#: optiondialog.cpp:1436 +#: optiondialog.cpp:1493 #, kde-format msgid "File Encoding for C:" msgstr "Codificació pel fitxer C:" -#: optiondialog.cpp:1447 +#: optiondialog.cpp:1504 #, kde-format msgid "File Encoding for Merge Output and Saving:" msgstr "Codificació dels fitxers de sortida en el fusionat i desar:" -#: optiondialog.cpp:1452 +#: optiondialog.cpp:1509 #, kde-format msgid "Auto Select" msgstr "Selecciona automàticament" -#: optiondialog.cpp:1456 +#: optiondialog.cpp:1513 #, kde-format msgid "" "If enabled then the encoding from the input files is used.\n" @@ -2989,17 +3006,17 @@ "En els casos ambigus un diàleg demanarà a l'usuari que esculli la " "codificació a usar per desar." -#: optiondialog.cpp:1459 +#: optiondialog.cpp:1516 #, kde-format msgid "File Encoding for Preprocessor Files:" msgstr "Codificació dels fitxers del preprocessador:" -#: optiondialog.cpp:1471 +#: optiondialog.cpp:1528 #, kde-format msgid "Right To Left Language" msgstr "Idioma de dreta a esquerra" -#: optiondialog.cpp:1475 +#: optiondialog.cpp:1532 #, kde-format msgid "" "Some languages are read from right to left.\n" @@ -3008,22 +3025,22 @@ "Alguns idiomes es llegeixen de dreta a esquerra.\n" "Aquest ajustament canviarà el visor i l'editor per adaptar-s'hi." -#: optiondialog.cpp:1485 +#: optiondialog.cpp:1542 #, kde-format msgid "Integration" msgstr "Integració" -#: optiondialog.cpp:1486 +#: optiondialog.cpp:1543 #, kde-format msgid "Integration Settings" msgstr "Arranjament de la integració" -#: optiondialog.cpp:1499 +#: optiondialog.cpp:1564 #, kde-format msgid "Command line options to ignore:" -msgstr "Opcions de la línia d'ordres a ignorar:" +msgstr "Opcions a ignorar de la línia d'ordres:" -#: optiondialog.cpp:1505 +#: optiondialog.cpp:1570 #, kde-format msgid "" "List of command line options that should be ignored when KDiff3 is used by " @@ -3036,12 +3053,12 @@ "Es poden especificar diversos valors separant-los amb «;».\n" "Això solucionarà l'error «Opció desconeguda»." -#: optiondialog.cpp:1510 +#: optiondialog.cpp:1575 #, kde-format msgid "Quit also via Escape key" msgstr "Surt també en prémer la tecla d'escapada" -#: optiondialog.cpp:1514 +#: optiondialog.cpp:1579 #, kde-format msgid "" "Fast method to exit.\n" @@ -3050,7 +3067,7 @@ "Mètode ràpid per sortir.\n" "Pels qui estigueu acostumats a usar la tecla d'escapada." -#: optiondialog.cpp:1598 +#: optiondialog.cpp:1653 #, kde-format msgid "This resets all options. Not only those of the current topic." msgstr "Això restableix totes les opcions, no només les del tema actual." @@ -3072,7 +3089,7 @@ #: pdiff.cpp:122 #, kde-format msgid "PreprocessorCmd: " -msgstr "OrdreDePreprosessador: " +msgstr "OrdreDelPreprosessador: " #: pdiff.cpp:127 #, kde-format @@ -3106,80 +3123,70 @@ msgid "Disable Unsafe Options" msgstr "Desactiva les opcions insegures" -#: pdiff.cpp:158 +#: pdiff.cpp:160 #, kde-format msgid "Loading A" msgstr "S'està carregant A" -#: pdiff.cpp:167 +#: pdiff.cpp:162 #, kde-format -msgid "Errors occurred during pre-processing of file A." -msgstr "S'han detectat errors durant el preprocés del fitxer A." +msgid "Loading A: %1" +msgstr "S'està carregant A: %1" -#: pdiff.cpp:172 +#: pdiff.cpp:170 #, kde-format msgid "Loading B" msgstr "S'està carregant B" -#: pdiff.cpp:179 -#, kde-format -msgid "Errors occurred during pre-processing of file B." -msgstr "S'han detectat errors durant el preprocés del fitxer B." - -#: pdiff.cpp:202 pdiff.cpp:241 +#: pdiff.cpp:201 pdiff.cpp:237 #, kde-format msgid "Diff: A <-> B" msgstr "Diferència: A <-> B" -#: pdiff.cpp:208 pdiff.cpp:279 pdiff.cpp:293 +#: pdiff.cpp:207 pdiff.cpp:275 pdiff.cpp:289 #, kde-format msgid "Linediff: A <-> B" msgstr "Diferència de línia: A <-> B" -#: pdiff.cpp:225 +#: pdiff.cpp:224 #, kde-format msgid "Loading C" msgstr "S'està carregant C" -#: pdiff.cpp:232 -#, kde-format -msgid "Errors occurred during pre-processing of file C." -msgstr "S'han detectat errors durant el preprocés del fitxer C." - -#: pdiff.cpp:250 +#: pdiff.cpp:246 #, kde-format msgid "Diff: A <-> C" msgstr "Diferència: A <-> C" -#: pdiff.cpp:261 +#: pdiff.cpp:257 #, kde-format msgid "Diff: B <-> C" msgstr "Diferència: B <-> C" -#: pdiff.cpp:283 pdiff.cpp:297 +#: pdiff.cpp:279 pdiff.cpp:293 #, kde-format msgid "Linediff: B <-> C" msgstr "Diferència de línia: B <-> C" -#: pdiff.cpp:287 pdiff.cpp:301 +#: pdiff.cpp:283 pdiff.cpp:297 #, kde-format msgid "Linediff: A <-> C" msgstr "Diferència de línia: A <-> C" -#: pdiff.cpp:829 +#: pdiff.cpp:819 #, kde-format msgid "All input files contain the same text, but are not binary equal." msgstr "" "Tots els fitxers d'entrada contenen el mateix text però no són binàriament " "iguals." -#: pdiff.cpp:835 pdiff.cpp:839 pdiff.cpp:843 +#: pdiff.cpp:825 pdiff.cpp:829 pdiff.cpp:833 #, kde-format msgid "Files %1 and %2 have equal text, but are not binary equal. \n" msgstr "" "Els fitxers %1 i %2 tenen el mateix text, però binàriament no són iguals. \n" -#: pdiff.cpp:853 +#: pdiff.cpp:843 #, kde-format msgid "" "Some input files do not seem to be pure text files.\n" @@ -3191,17 +3198,17 @@ "binàries.\n" "Continueu sota la vostra responsabilitat." -#: pdiff.cpp:863 +#: pdiff.cpp:853 #, kde-format msgid ", B" msgstr ", B" -#: pdiff.cpp:865 +#: pdiff.cpp:855 #, kde-format msgid ", C" msgstr ", C" -#: pdiff.cpp:867 +#: pdiff.cpp:857 #, kde-format msgid "" "Some input characters could not be converted to valid unicode.\n" @@ -3216,78 +3223,73 @@ "responsabilitat.\n" "Els fitxers d'entrada afectats són a %1." -#: pdiff.cpp:1034 +#: pdiff.cpp:1032 #, kde-format msgid "Abort" msgstr "Interromp" -#: pdiff.cpp:1040 pdiff.cpp:1130 +#: pdiff.cpp:1038 pdiff.cpp:1129 #, kde-format msgid "Opening files..." msgstr "S'estan obrint els fitxers..." -#: pdiff.cpp:1107 -#, kde-format -msgid "File open error" -msgstr "S'ha produït un error en obrir el fitxer" - -#: pdiff.cpp:1202 +#: pdiff.cpp:1212 #, kde-format msgid "Cutting selection..." msgstr "S'està tallant la selecció..." -#: pdiff.cpp:1223 +#: pdiff.cpp:1233 #, kde-format msgid "Copying selection to clipboard..." msgstr "S'està copiant la selecció al porta-retalls..." -#: pdiff.cpp:1239 +#: pdiff.cpp:1249 #, kde-format msgid "Inserting clipboard contents..." msgstr "S'està inserint el contingut del porta-retalls..." -#: pdiff.cpp:1695 +#: pdiff.cpp:1705 #, kde-format msgid "Word wrap (Cancel disables word wrap)" msgstr "Ajust de paraula (Cancel·la desactiva l'ajust de paraula)" -#: pdiff.cpp:1696 +#: pdiff.cpp:1706 #, kde-format msgid "Calculating max width for horizontal scrollbar" msgstr "" "S'està calculant l'amplada màxima per a la barra de desplaçament horitzontal" -#: pdiff.cpp:1911 +#: pdiff.cpp:1921 #, kde-format msgid "Save && Continue" msgstr "Desa i continua" -#: pdiff.cpp:1912 +#: pdiff.cpp:1922 #, kde-format msgid "Continue Without Saving" msgstr "Continua sense desar" -#: pdiff.cpp:2124 +#: pdiff.cpp:2134 #, kde-format msgid "Search complete." msgstr "S'ha finalitzat la cerca." -#: pdiff.cpp:2124 +#: pdiff.cpp:2134 #, kde-format msgid "Search Complete" msgstr "Cerca completa" -#: pdiff.cpp:2375 +#: pdiff.cpp:2385 #, kde-format msgid "Nothing is selected in either diff input window." msgstr "No hi ha res seleccionat en cap de les finestres de diferències." -#: pdiff.cpp:2375 +#: pdiff.cpp:2385 #, kde-format msgid "Error while adding manual diff range" msgstr "Error en afegir un interval manual de diferències" -#: progress.cpp:59 progress.cpp:71 +#: progress.cpp:61 progress.cpp:73 #, kde-format msgid "&Cancel" msgstr "&Cancel·la" @@ -3297,126 +3299,126 @@ msgid "A (Base):" msgstr "A (Base):" -#: smalldialogs.cpp:68 smalldialogs.cpp:85 smalldialogs.cpp:102 -#: smalldialogs.cpp:144 +#: smalldialogs.cpp:71 smalldialogs.cpp:90 smalldialogs.cpp:109 +#: smalldialogs.cpp:154 #, kde-format msgid "File..." msgstr "Fitxer..." -#: smalldialogs.cpp:70 smalldialogs.cpp:87 smalldialogs.cpp:104 -#: smalldialogs.cpp:146 +#: smalldialogs.cpp:73 smalldialogs.cpp:92 smalldialogs.cpp:111 +#: smalldialogs.cpp:156 #, kde-format msgid "Dir..." msgstr "Directori..." -#: smalldialogs.cpp:96 +#: smalldialogs.cpp:103 #, kde-format msgid "C (Optional):" msgstr "C (opcional):" -#: smalldialogs.cpp:119 +#: smalldialogs.cpp:126 #, kde-format msgid "Swap/Copy Names..." msgstr "Intercanvia/Copia els noms..." -#: smalldialogs.cpp:124 smalldialogs.cpp:125 smalldialogs.cpp:126 +#: smalldialogs.cpp:131 smalldialogs.cpp:132 smalldialogs.cpp:133 #, kde-format msgid "Swap %1<->%2" msgstr "Intercanvia %1<->%2" -#: smalldialogs.cpp:127 smalldialogs.cpp:128 smalldialogs.cpp:129 +#: smalldialogs.cpp:134 smalldialogs.cpp:135 smalldialogs.cpp:136 #, kde-format msgid "Copy %1->Output" msgstr "Copia %1 ->sortida" -#: smalldialogs.cpp:130 smalldialogs.cpp:131 smalldialogs.cpp:132 +#: smalldialogs.cpp:137 smalldialogs.cpp:138 smalldialogs.cpp:139 #, kde-format msgid "Swap %1<->Output" msgstr "Intercanvia %1<->sortida" -#: smalldialogs.cpp:138 +#: smalldialogs.cpp:148 #, kde-format msgid "Output (optional):" msgstr "Sortida (opcional):" -#: smalldialogs.cpp:168 +#: smalldialogs.cpp:178 #, kde-format msgid "Configure..." msgstr "Configura..." -#: smalldialogs.cpp:233 +#: smalldialogs.cpp:243 #, kde-format msgid "Open Directory" msgstr "Obre un directori" -#: smalldialogs.cpp:234 +#: smalldialogs.cpp:244 #, kde-format msgid "Select Output File" msgstr "Selecció del fitxer de sortida" -#: smalldialogs.cpp:393 +#: smalldialogs.cpp:403 #, kde-format msgid "Search text:" msgstr "Cerca el text:" -#: smalldialogs.cpp:400 +#: smalldialogs.cpp:410 #, kde-format msgid "Case sensitive" msgstr "Distingeix entre majúscules i minúscules" -#: smalldialogs.cpp:403 +#: smalldialogs.cpp:413 #, kde-format msgid "Search A" msgstr "Cerca A" -#: smalldialogs.cpp:408 +#: smalldialogs.cpp:418 #, kde-format msgid "Search B" msgstr "Cerca B" -#: smalldialogs.cpp:413 +#: smalldialogs.cpp:423 #, kde-format msgid "Search C" msgstr "Cerca C" -#: smalldialogs.cpp:418 +#: smalldialogs.cpp:428 #, kde-format msgid "Search output" msgstr "Cerca la sortida" -#: smalldialogs.cpp:425 +#: smalldialogs.cpp:435 #, kde-format msgid "&Search" msgstr "&Cerca" -#: smalldialogs.cpp:444 +#: smalldialogs.cpp:454 #, kde-format msgid "Regular Expression Tester" msgstr "Provador de l'expressió regular" -#: smalldialogs.cpp:457 +#: smalldialogs.cpp:467 #, kde-format msgid "Example auto merge line:" msgstr "Exemple de línia de fusió automàtica:" -#: smalldialogs.cpp:459 +#: smalldialogs.cpp:469 #, kde-format msgid "To test auto merge, copy a line as used in your files." msgstr "" "Per a provar la fusió automàtica, copieu una línia com les usades als " "vostres fitxers." -#: smalldialogs.cpp:465 smalldialogs.cpp:493 smalldialogs.cpp:529 +#: smalldialogs.cpp:475 smalldialogs.cpp:503 smalldialogs.cpp:539 #, kde-format msgid "Match result:" msgstr "Resultat coincident:" -#: smalldialogs.cpp:484 +#: smalldialogs.cpp:494 #, kde-format msgid "Example history start line (with leading comment):" msgstr "Exemple de línia d'inici de l'historial (amb el comentari inicial):" -#: smalldialogs.cpp:486 +#: smalldialogs.cpp:496 #, kde-format msgid "" "Copy a history start line as used in your files,\n" @@ -3425,19 +3427,19 @@ "Copieu una línia d'inici de l'historial com les usades als vostres fitxers,\n" "incloent-hi el comentari inicial." -#: smalldialogs.cpp:512 +#: smalldialogs.cpp:522 #, kde-format msgid "History sort key order:" msgstr "Criteri d'ordenació de les claus de l'historial:" -#: smalldialogs.cpp:520 +#: smalldialogs.cpp:530 #, kde-format msgid "Example history entry start line (without leading comment):" msgstr "" "Exemple d'inici de línia d'entrada de l'historial (sense el comentari " "inicial):" -#: smalldialogs.cpp:522 +#: smalldialogs.cpp:532 #, kde-format msgid "" "Copy a history entry start line as used in your files,\n" @@ -3447,49 +3449,49 @@ "vostres fitxers,\n" "sense incloure el comentari inicial." -#: smalldialogs.cpp:536 +#: smalldialogs.cpp:546 #, kde-format msgid "Sort key result:" msgstr "Resultat de la clau d'ordenació:" # PERFER: alineament? -#: smalldialogs.cpp:584 smalldialogs.cpp:594 smalldialogs.cpp:614 +#: smalldialogs.cpp:594 smalldialogs.cpp:604 smalldialogs.cpp:624 #, kde-format msgid "Match success." msgstr "Encaix correcte." -#: smalldialogs.cpp:588 smalldialogs.cpp:598 smalldialogs.cpp:620 +#: smalldialogs.cpp:598 smalldialogs.cpp:608 smalldialogs.cpp:630 #, kde-format msgid "Match failed." msgstr "Ha fallat l'encaix." -#: smalldialogs.cpp:605 +#: smalldialogs.cpp:615 #, kde-format msgid "Opening and closing parentheses do not match in regular expression." msgstr "" "L'obertura i tancament de parèntesis no encaixa en l'expressió regular." -#: SourceData.cpp:150 +#: SourceData.cpp:153 #, kde-format msgid "Writing clipboard data to temp file failed." msgstr "Ha fallat l'escriptura de dades del porta-retalls al fitxer temporal." -#: SourceData.cpp:154 +#: SourceData.cpp:157 #, kde-format msgid "From Clipboard" msgstr "Des del porta-retalls" -#: SourceData.cpp:335 +#: SourceData.cpp:348 #, kde-format msgid "%1 is not a normal file." msgstr "%1 no és un fitxer normal." -#: SourceData.cpp:427 +#: SourceData.cpp:440 #, kde-format msgid " Temp file is: %1" msgstr " El fitxer temporal és: %1" -#: SourceData.cpp:432 +#: SourceData.cpp:445 #, kde-format msgid "" "Preprocessing possibly failed. Check this command:\n" @@ -3504,12 +3506,12 @@ "\n" "L'ordre de preprocessament es desactivarà ara." -#: SourceData.cpp:443 SourceData.cpp:512 +#: SourceData.cpp:456 SourceData.cpp:525 #, kde-format msgid "File %1 too large to process. Skipping." msgstr "Fitxer %1 és massa gran per processar. S'omet." -#: SourceData.cpp:487 +#: SourceData.cpp:500 #, kde-format msgid "" "The line-matching-preprocessing possibly failed. Check this command:\n" @@ -3543,210 +3545,4 @@ #: Utils.cpp:96 #, kde-format msgid "No program specified." -msgstr "No s'ha especificat cap programa." - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -# PERFER: alineament? \ No newline at end of file +msgstr "No s'ha especificat cap programa." \ No newline at end of file diff -Nru kdiff3-1.8.01/po/ca@valencia/diff_ext.po kdiff3-1.8.3/po/ca@valencia/diff_ext.po --- kdiff3-1.8.01/po/ca@valencia/diff_ext.po 2019-05-18 01:01:50.000000000 +0000 +++ kdiff3-1.8.3/po/ca@valencia/diff_ext.po 2020-06-25 00:18:07.000000000 +0000 @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: diff_ext\n" -"Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2019-03-22 03:09+0100\n" +"Report-Msgid-Bugs-To: https://bugs.kde.org\n" +"POT-Creation-Date: 2019-11-04 07:54+0100\n" "PO-Revision-Date: 2018-08-06 11:49+0100\n" "Last-Translator: Josep Ma. Ferrer \n" "Language-Team: Catalan \n" @@ -19,121 +19,116 @@ "Plural-Forms: nplurals=2; plural=n != 1;\n" "X-Generator: Lokalize 2.0\n" -#: diff_ext.cpp:391 +#: diff_ext.cpp:223 #, kde-format msgid "Compare with %1" msgstr "Compara amb %1" -#: diff_ext.cpp:392 +#: diff_ext.cpp:224 #, kde-format msgid "Merge with %1" msgstr "Fusiona amb %1" -#: diff_ext.cpp:408 +#: diff_ext.cpp:234 #, kde-format msgid "3-way merge with base" msgstr "Fusió a tres bandes amb la base" -#: diff_ext.cpp:411 +#: diff_ext.cpp:237 #, kde-format msgid "Save '%1' for later" msgstr "Guarda «%1» per després" -#: diff_ext.cpp:426 +#: diff_ext.cpp:251 #, kde-format msgid "Compare with ..." msgstr "Compara amb..." -#: diff_ext.cpp:429 +#: diff_ext.cpp:254 #, kde-format msgid "Clear list" msgstr "Neteja la llista" -#: diff_ext.cpp:434 +#: diff_ext.cpp:259 #, kde-format msgid "Compare" msgstr "Compara" -#: diff_ext.cpp:438 +#: diff_ext.cpp:263 #, kde-format msgid "3 way comparison" msgstr "Comparació a 3 bandes" -#: diff_ext.cpp:444 +#: diff_ext.cpp:269 #, kde-format msgid "About Diff-Ext ..." msgstr "Quant al Diff-Ext..." -#: diff_ext.cpp:515 +#: diff_ext.cpp:340 #, kde-format msgid "(32 Bit)" msgstr "(32 bits)" -#: diff_ext.cpp:517 -#, kde-format -msgid "(64 Bit)" -msgstr "(64 bits)" - -#: diff_ext.cpp:518 +#: diff_ext.cpp:342 #, kde-format msgid "Diff-Ext Copyright (c) 2003-2006, Sergey Zorin. All rights reserved.\n" msgstr "" "Diff-Ext Copyright (c) 2003-2006, Sergey Zorin. Tots els drets reservats.\n" -#: diff_ext.cpp:519 +#: diff_ext.cpp:343 #, kde-format msgid "This software is distributable under the BSD-2-Clause license.\n" msgstr "" "Aquest programari és pot distribuir sota la llicència BSD-2-Clàusula.\n" -#: diff_ext.cpp:520 +#: diff_ext.cpp:344 #, kde-format msgid "Some extensions for KDiff3 (c) 2006-2013 by Joachim Eibl.\n" msgstr "Diverses extensions del KDiff3 (c) 2006-2013 pel Joachim Eibl.\n" -#: diff_ext.cpp:521 +#: diff_ext.cpp:345 #, kde-format msgid "Homepage for Diff-Ext: http://diff-ext.sourceforge.net\n" msgstr "Pàgina web del Diff-Ext: http://diff-ext.sourceforge.net\n" -#: diff_ext.cpp:522 +#: diff_ext.cpp:346 #, kde-format msgid "About Diff-Ext for KDiff3 " msgstr "Quant al Diff-Ext per al KDiff3" -#: diff_ext.cpp:551 +#: diff_ext.cpp:375 #, kde-format msgid "Compare selected files" msgstr "Compara els fitxers seleccionats" -#: diff_ext.cpp:557 diff_ext.cpp:577 +#: diff_ext.cpp:381 diff_ext.cpp:399 #, kde-format msgid "Compare '%1' with '%2'" msgstr "Compara amb «%1» amb «%2»" -#: diff_ext.cpp:563 +#: diff_ext.cpp:386 #, kde-format msgid "Save '%1' for later operation" msgstr "Guarda «%1» per a una operació posterior" -#: diff_ext.cpp:619 +#: diff_ext.cpp:440 #, kde-format msgid "Could not start KDiff3. Please rerun KDiff3 installation." msgstr "" "No s'ha pogut iniciar el KDiff3. Torneu a executar la instal·lació del " "KDiff3." -#: diff_ext.cpp:620 +#: diff_ext.cpp:441 #, kde-format msgid "Command" msgstr "Ordre" -#: diff_ext.cpp:621 +#: diff_ext.cpp:442 #, kde-format msgid "CommandLine" msgstr "Línia_d'ordres" -#: diff_ext.cpp:622 +#: diff_ext.cpp:443 #, kde-format msgid "Diff-Ext For KDiff3" msgstr "Diff-Ext per al KDiff3" \ No newline at end of file diff -Nru kdiff3-1.8.01/po/ca@valencia/kdiff3fileitemactionplugin.po kdiff3-1.8.3/po/ca@valencia/kdiff3fileitemactionplugin.po --- kdiff3-1.8.01/po/ca@valencia/kdiff3fileitemactionplugin.po 2019-05-18 01:01:50.000000000 +0000 +++ kdiff3-1.8.3/po/ca@valencia/kdiff3fileitemactionplugin.po 2020-06-25 00:18:07.000000000 +0000 @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: kdiff3fileitemactionplugin\n" -"Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2019-03-22 03:09+0100\n" +"Report-Msgid-Bugs-To: https://bugs.kde.org\n" +"POT-Creation-Date: 2019-08-30 07:40+0200\n" "PO-Revision-Date: 2019-03-22 18:02+0100\n" "Last-Translator: Josep Ma. Ferrer \n" "Language-Team: Catalan \n" diff -Nru kdiff3-1.8.01/po/ca@valencia/kdiff3.po kdiff3-1.8.3/po/ca@valencia/kdiff3.po --- kdiff3-1.8.01/po/ca@valencia/kdiff3.po 2019-05-18 01:01:50.000000000 +0000 +++ kdiff3-1.8.3/po/ca@valencia/kdiff3.po 2020-06-25 00:18:07.000000000 +0000 @@ -1,16 +1,16 @@ # Translation of kdiff3.po to Catalan (Valencian) -# Copyright (C) 2011-2019 This_file_is_part_of_KDE +# Copyright (C) 2011-2020 This_file_is_part_of_KDE # This file is distributed under the license LGPL version 2 or later # # Joan Maspons , 2011. -# Josep Ma. Ferrer , 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019. -# Antoni Bella Pérez , 2014, 2018, 2019. +# Josep Ma. Ferrer , 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020. +# Antoni Bella Pérez , 2014, 2018, 2019, 2020. msgid "" msgstr "" "Project-Id-Version: kdiff3\n" -"Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2019-04-18 08:02+0200\n" -"PO-Revision-Date: 2019-03-09 13:05+0100\n" +"Report-Msgid-Bugs-To: https://bugs.kde.org\n" +"POT-Creation-Date: 2020-06-22 07:48+0200\n" +"PO-Revision-Date: 2020-03-31 19:47+0100\n" "Last-Translator: Josep Ma. Ferrer \n" "Language-Team: Catalan \n" "Language: ca@valencia\n" @@ -24,292 +24,292 @@ #, kde-format msgctxt "NAME OF TRANSLATORS" msgid "Your names" -msgstr "Joan Maspons Ventura" +msgstr "Joan Maspons Ventura,Antoni Bella" #, kde-format msgctxt "EMAIL OF TRANSLATORS" msgid "Your emails" -msgstr "joanmaspons@gmail.com" +msgstr "joanmaspons@gmail.com,antonibella5@yahoo.com" -#: difftextwindow.cpp:412 +#: difftextwindow.cpp:414 #, kde-format msgid "File %1: Line %2" msgstr "Fitxer %1: Línia %2" -#: difftextwindow.cpp:414 +#: difftextwindow.cpp:416 #, kde-format msgid "File %1: Line not available" msgstr "Fitxer %1: Línia no disponible" -#: difftextwindow.cpp:1780 +#: difftextwindow.cpp:1778 #, kde-format msgid "Encoding:" msgstr "Codificació:" -#: difftextwindow.cpp:1782 mergeresultwindow.cpp:3138 optiondialog.cpp:818 +#: difftextwindow.cpp:1781 mergeresultwindow.cpp:3166 optiondialog.cpp:840 #, kde-format msgid "Line end style:" msgstr "Estil del salt de línia:" -#: difftextwindow.cpp:1810 directorymergewindow.cpp:382 -#: directorymergewindow.cpp:433 directorymergewindow.cpp:524 -#: directorymergewindow.cpp:3058 directorymergewindow.cpp:3189 -#: directorymergewindow.cpp:3417 mergeresultwindow.cpp:942 -#: mergeresultwindow.cpp:944 mergeresultwindow.cpp:946 -#: mergeresultwindow.cpp:948 mergeresultwindow.cpp:1814 -#: mergeresultwindow.cpp:3170 mergeresultwindow.cpp:3177 optiondialog.cpp:962 -#: optiondialog.cpp:975 pdiff.cpp:833 pdiff.cpp:835 pdiff.cpp:837 pdiff.cpp:839 -#: pdiff.cpp:861 smalldialogs.cpp:124 smalldialogs.cpp:126 smalldialogs.cpp:127 -#: smalldialogs.cpp:130 +#: difftextwindow.cpp:1809 directorymergewindow.cpp:383 +#: directorymergewindow.cpp:434 directorymergewindow.cpp:525 +#: directorymergewindow.cpp:3072 directorymergewindow.cpp:3203 +#: directorymergewindow.cpp:3431 mergeresultwindow.cpp:970 +#: mergeresultwindow.cpp:972 mergeresultwindow.cpp:974 +#: mergeresultwindow.cpp:976 mergeresultwindow.cpp:1842 +#: mergeresultwindow.cpp:3198 mergeresultwindow.cpp:3205 optiondialog.cpp:1002 +#: optiondialog.cpp:1015 pdiff.cpp:823 pdiff.cpp:825 pdiff.cpp:827 +#: pdiff.cpp:829 pdiff.cpp:851 smalldialogs.cpp:131 smalldialogs.cpp:133 +#: smalldialogs.cpp:134 smalldialogs.cpp:137 #, kde-format msgid "A" msgstr "A" -#: difftextwindow.cpp:1810 directorymergewindow.cpp:384 -#: directorymergewindow.cpp:436 directorymergewindow.cpp:526 -#: directorymergewindow.cpp:3064 directorymergewindow.cpp:3190 -#: directorymergewindow.cpp:3418 mergeresultwindow.cpp:942 -#: mergeresultwindow.cpp:944 mergeresultwindow.cpp:950 -#: mergeresultwindow.cpp:952 mergeresultwindow.cpp:1816 -#: mergeresultwindow.cpp:3172 mergeresultwindow.cpp:3179 optiondialog.cpp:963 -#: optiondialog.cpp:976 pdiff.cpp:833 pdiff.cpp:835 pdiff.cpp:841 pdiff.cpp:843 -#: pdiff.cpp:863 smalldialogs.cpp:124 smalldialogs.cpp:125 smalldialogs.cpp:128 -#: smalldialogs.cpp:131 +#: difftextwindow.cpp:1809 directorymergewindow.cpp:385 +#: directorymergewindow.cpp:437 directorymergewindow.cpp:527 +#: directorymergewindow.cpp:3078 directorymergewindow.cpp:3204 +#: directorymergewindow.cpp:3432 mergeresultwindow.cpp:970 +#: mergeresultwindow.cpp:972 mergeresultwindow.cpp:978 +#: mergeresultwindow.cpp:980 mergeresultwindow.cpp:1844 +#: mergeresultwindow.cpp:3200 mergeresultwindow.cpp:3207 optiondialog.cpp:1003 +#: optiondialog.cpp:1016 pdiff.cpp:823 pdiff.cpp:825 pdiff.cpp:831 +#: pdiff.cpp:833 pdiff.cpp:853 smalldialogs.cpp:131 smalldialogs.cpp:132 +#: smalldialogs.cpp:135 smalldialogs.cpp:138 #, kde-format msgid "B" msgstr "B" -#: difftextwindow.cpp:1810 directorymergewindow.cpp:386 -#: directorymergewindow.cpp:439 directorymergewindow.cpp:528 -#: directorymergewindow.cpp:3070 directorymergewindow.cpp:3191 -#: directorymergewindow.cpp:3419 mergeresultwindow.cpp:946 -#: mergeresultwindow.cpp:948 mergeresultwindow.cpp:950 -#: mergeresultwindow.cpp:952 mergeresultwindow.cpp:1818 -#: mergeresultwindow.cpp:3174 mergeresultwindow.cpp:3181 optiondialog.cpp:977 -#: pdiff.cpp:837 pdiff.cpp:839 pdiff.cpp:841 pdiff.cpp:843 pdiff.cpp:865 -#: smalldialogs.cpp:125 smalldialogs.cpp:126 smalldialogs.cpp:129 -#: smalldialogs.cpp:132 +#: difftextwindow.cpp:1809 directorymergewindow.cpp:387 +#: directorymergewindow.cpp:440 directorymergewindow.cpp:529 +#: directorymergewindow.cpp:3084 directorymergewindow.cpp:3205 +#: directorymergewindow.cpp:3433 mergeresultwindow.cpp:974 +#: mergeresultwindow.cpp:976 mergeresultwindow.cpp:978 +#: mergeresultwindow.cpp:980 mergeresultwindow.cpp:1846 +#: mergeresultwindow.cpp:3202 mergeresultwindow.cpp:3209 optiondialog.cpp:1017 +#: pdiff.cpp:827 pdiff.cpp:829 pdiff.cpp:831 pdiff.cpp:833 pdiff.cpp:855 +#: smalldialogs.cpp:132 smalldialogs.cpp:133 smalldialogs.cpp:136 +#: smalldialogs.cpp:139 #, kde-format msgid "C" msgstr "C" -#: difftextwindow.cpp:1810 +#: difftextwindow.cpp:1809 #, kde-format msgid "A (Base)" msgstr "A (Base)" -#: difftextwindow.cpp:1812 +#: difftextwindow.cpp:1811 #, kde-format msgid "Encoding: %1" msgstr "Codificació: %1" -#: difftextwindow.cpp:1813 mergeresultwindow.cpp:3183 +#: difftextwindow.cpp:1812 mergeresultwindow.cpp:3211 #, kde-format msgid "Unix" msgstr "Unix" -#: difftextwindow.cpp:1813 mergeresultwindow.cpp:3184 +#: difftextwindow.cpp:1812 mergeresultwindow.cpp:3212 #, kde-format msgid "DOS" msgstr "DOS" -#: difftextwindow.cpp:1813 +#: difftextwindow.cpp:1812 #, kde-format msgid "Line end style: %1" msgstr "Estil del salt de línia: %1" -#: difftextwindow.cpp:1835 kdiff3.cpp:873 +#: difftextwindow.cpp:1834 kdiff3.cpp:874 #, kde-format msgid "Top line" msgstr "Línia superior" -#: difftextwindow.cpp:1845 +#: difftextwindow.cpp:1843 #, kde-format msgid "End" msgstr "Final" -#: difftextwindow.cpp:1903 smalldialogs.cpp:235 +#: difftextwindow.cpp:1901 smalldialogs.cpp:245 #, kde-format msgid "Open File" msgstr "Obri un fitxer" -#: difftextwindow.cpp:1951 optiondialog.cpp:387 +#: difftextwindow.cpp:1943 optiondialog.cpp:389 #, kde-format msgid "Unicode, 8 bit" msgstr "Unicode, 8 bits" -#: difftextwindow.cpp:1966 +#: difftextwindow.cpp:1958 #, kde-format msgid "Other" msgstr "Altres" -#: directorymergewindow.cpp:409 directorymergewindow.cpp:3424 +#: directorymergewindow.cpp:410 directorymergewindow.cpp:3438 #, kde-format msgid "Copy A to B" msgstr "Copia A a B" -#: directorymergewindow.cpp:412 directorymergewindow.cpp:3425 +#: directorymergewindow.cpp:413 directorymergewindow.cpp:3439 #, kde-format msgid "Copy B to A" msgstr "Copia B a A" -#: directorymergewindow.cpp:415 directorymergewindow.cpp:3426 +#: directorymergewindow.cpp:416 directorymergewindow.cpp:3440 #, kde-format msgid "Delete A" msgstr "Suprimeix A" -#: directorymergewindow.cpp:418 directorymergewindow.cpp:3427 +#: directorymergewindow.cpp:419 directorymergewindow.cpp:3441 #, kde-format msgid "Delete B" msgstr "Suprimeix B" -#: directorymergewindow.cpp:421 +#: directorymergewindow.cpp:422 #, kde-format msgid "Delete A & B" msgstr "Suprimeix A i B" -#: directorymergewindow.cpp:424 directorymergewindow.cpp:3429 +#: directorymergewindow.cpp:425 directorymergewindow.cpp:3443 #, kde-format msgid "Merge to A" msgstr "Fusiona a A" -#: directorymergewindow.cpp:427 directorymergewindow.cpp:3430 +#: directorymergewindow.cpp:428 directorymergewindow.cpp:3444 #, kde-format msgid "Merge to B" msgstr "Fusiona a B" -#: directorymergewindow.cpp:430 +#: directorymergewindow.cpp:431 #, kde-format msgid "Merge to A & B" msgstr "Fusiona a A i B" -#: directorymergewindow.cpp:442 directorymergewindow.cpp:3421 +#: directorymergewindow.cpp:443 directorymergewindow.cpp:3435 #, kde-format msgid "Delete (if exists)" msgstr "Suprimeix (si existeix)" -#: directorymergewindow.cpp:445 directorymergewindow.cpp:448 -#: directorymergewindow.cpp:3420 optiondialog.cpp:925 smalldialogs.cpp:113 +#: directorymergewindow.cpp:446 directorymergewindow.cpp:449 +#: directorymergewindow.cpp:3434 smalldialogs.cpp:120 #, kde-format msgid "Merge" msgstr "Fusiona" -#: directorymergewindow.cpp:445 directorymergewindow.cpp:448 +#: directorymergewindow.cpp:446 directorymergewindow.cpp:449 #, kde-format msgid "Merge (manual)" msgstr "Fusiona (manualment)" -#: directorymergewindow.cpp:451 +#: directorymergewindow.cpp:452 #, kde-format msgid "Error: Conflicting File Types" msgstr "Error: tipus de fitxer en conflicte" -#: directorymergewindow.cpp:454 +#: directorymergewindow.cpp:455 #, kde-format msgid "Error: Changed and Deleted" msgstr "Error: canviat i suprimit" -#: directorymergewindow.cpp:457 +#: directorymergewindow.cpp:458 #, kde-format msgid "Error: Dates are equal but files are not." msgstr "Error: les dates són iguals però els fitxers no." -#: directorymergewindow.cpp:471 +#: directorymergewindow.cpp:472 #, kde-format msgid "Done" msgstr "Fet" -#: directorymergewindow.cpp:473 +#: directorymergewindow.cpp:474 #, kde-format msgid "Error" msgstr "Error" -#: directorymergewindow.cpp:475 +#: directorymergewindow.cpp:476 #, kde-format msgid "Skipped." msgstr "S'ha omés." -#: directorymergewindow.cpp:477 +#: directorymergewindow.cpp:478 #, kde-format msgid "Not saved." msgstr "No guardat." -#: directorymergewindow.cpp:479 +#: directorymergewindow.cpp:480 #, kde-format msgid "In progress..." msgstr "En curs..." -#: directorymergewindow.cpp:481 +#: directorymergewindow.cpp:482 #, kde-format msgid "To do." msgstr "Pendent." -#: directorymergewindow.cpp:522 +#: directorymergewindow.cpp:523 #, kde-format msgid "Name" msgstr "Nom" -#: directorymergewindow.cpp:530 +#: directorymergewindow.cpp:531 #, kde-format msgid "Operation" msgstr "Operació" -#: directorymergewindow.cpp:532 +#: directorymergewindow.cpp:533 #, kde-format msgid "Status" msgstr "Estat" -#: directorymergewindow.cpp:534 +#: directorymergewindow.cpp:535 #, kde-format msgid "Unsolved" msgstr "No resolt" -#: directorymergewindow.cpp:536 +#: directorymergewindow.cpp:537 #, kde-format msgid "Solved" msgstr "Resolt" -#: directorymergewindow.cpp:538 +#: directorymergewindow.cpp:539 #, kde-format msgid "Nonwhite" msgstr "No blanc" -#: directorymergewindow.cpp:540 +#: directorymergewindow.cpp:541 #, kde-format msgid "White" msgstr "Blanc" -#: directorymergewindow.cpp:674 +#: directorymergewindow.cpp:676 #, kde-format msgid "Unable to compare non-normal file with normal file." msgstr "No es pot comparar un fitxer no normal amb un de normal." -#: directorymergewindow.cpp:688 +#: directorymergewindow.cpp:690 #, kde-format msgid "Mix of links and normal files." msgstr "Barreja d'enllaços i fitxers normals." -#: directorymergewindow.cpp:695 +#: directorymergewindow.cpp:697 #, kde-format msgid "Link: " msgstr "Enllaç: " -#: directorymergewindow.cpp:704 +#: directorymergewindow.cpp:706 #, kde-format msgid "Size. " msgstr "Mida. " -#: directorymergewindow.cpp:718 directorymergewindow.cpp:728 +#: directorymergewindow.cpp:720 directorymergewindow.cpp:730 #, kde-format msgid "Date & Size: " msgstr "Data i mida: " -#: directorymergewindow.cpp:748 +#: directorymergewindow.cpp:751 #, kde-format msgid "Comparing file..." msgstr "S'està comparant el fitxer..." -#: directorymergewindow.cpp:801 +#: directorymergewindow.cpp:813 #, kde-format msgid "" "You are currently doing a directory merge. Are you sure, you want to abort " @@ -318,48 +318,48 @@ "Actualment esteu fent una fusió de directoris. Segur que voleu interrompre " "la fusió i tornar a explorar el directori?" -#: directorymergewindow.cpp:802 kdiff3.cpp:698 kdiff3.cpp:708 kdiff3.cpp:720 -#: mergeresultwindow.cpp:372 pdiff.cpp:1033 pdiff.cpp:1910 pdiff.cpp:1920 +#: directorymergewindow.cpp:814 kdiff3.cpp:697 kdiff3.cpp:707 kdiff3.cpp:719 +#: mergeresultwindow.cpp:400 pdiff.cpp:1031 pdiff.cpp:1920 pdiff.cpp:1930 #, kde-format msgid "Warning" msgstr "Atenció" -#: directorymergewindow.cpp:803 directorymergewindow.cpp:3393 +#: directorymergewindow.cpp:815 directorymergewindow.cpp:3407 #, kde-format msgid "Rescan" msgstr "Torna a explorar" -#: directorymergewindow.cpp:804 pdiff.cpp:1035 +#: directorymergewindow.cpp:816 pdiff.cpp:1033 #, kde-format msgid "Continue Merging" msgstr "Continua fusionant" -#: directorymergewindow.cpp:971 +#: directorymergewindow.cpp:984 #, kde-format msgid "Opening of directories failed:" msgstr "Ha fallat en obrir els directoris:" -#: directorymergewindow.cpp:975 +#: directorymergewindow.cpp:988 #, kde-format msgid "Dir A \"%1\" does not exist or is not a directory.\n" msgstr "El directori A «%1» no existeix o no és un directori.\n" -#: directorymergewindow.cpp:980 +#: directorymergewindow.cpp:993 #, kde-format msgid "Dir B \"%1\" does not exist or is not a directory.\n" msgstr "El directori B «%1» no existeix o no és un directori.\n" -#: directorymergewindow.cpp:985 +#: directorymergewindow.cpp:998 #, kde-format msgid "Dir C \"%1\" does not exist or is not a directory.\n" msgstr "El directori C «%1» no existeix o no és un directori.\n" -#: directorymergewindow.cpp:988 +#: directorymergewindow.cpp:1001 #, kde-format msgid "Directory Open Error" msgstr "Error en obrir el directori" -#: directorymergewindow.cpp:996 +#: directorymergewindow.cpp:1009 #, kde-format msgid "" "The destination directory must not be the same as A or B when three " @@ -370,49 +370,49 @@ "diferent de l'A o el B.\n" "Torneu-ho a comprovar abans de continuar." -#: directorymergewindow.cpp:998 +#: directorymergewindow.cpp:1011 #, kde-format msgid "Parameter Warning" msgstr "Alerta de paràmetres" -#: directorymergewindow.cpp:1003 +#: directorymergewindow.cpp:1016 #, kde-format msgid "Scanning directories..." msgstr "S'estan explorant els directoris..." -#: directorymergewindow.cpp:1029 +#: directorymergewindow.cpp:1042 #, kde-format msgid "Reading Directory A" msgstr "S'està llegint el directori A" -#: directorymergewindow.cpp:1038 +#: directorymergewindow.cpp:1051 #, kde-format msgid "Reading Directory B" msgstr "S'està llegint el directori B" -#: directorymergewindow.cpp:1048 +#: directorymergewindow.cpp:1061 #, kde-format msgid "Reading Directory C" msgstr "S'està llegint el directori C" -#: directorymergewindow.cpp:1064 +#: directorymergewindow.cpp:1077 #, kde-format msgid "Some subdirectories were not readable in" msgstr "Alguns subdirectoris no eren llegibles a" -#: directorymergewindow.cpp:1069 +#: directorymergewindow.cpp:1082 #, kde-format msgid "Check the permissions of the subdirectories." msgstr "Comproveu els permisos dels subdirectoris." -#: directorymergewindow.cpp:1106 kdiff3.cpp:666 kdiff3.cpp:753 kdiff3.cpp:777 -#: kdiff3.cpp:1065 kdiff3.cpp:1086 pdiff.cpp:1116 pdiff.cpp:1170 pdiff.cpp:1218 -#: pdiff.cpp:1234 pdiff.cpp:1277 pdiff.cpp:1301 +#: directorymergewindow.cpp:1119 kdiff3.cpp:665 kdiff3.cpp:752 kdiff3.cpp:776 +#: kdiff3.cpp:1072 kdiff3.cpp:1093 pdiff.cpp:1115 pdiff.cpp:1178 pdiff.cpp:1228 +#: pdiff.cpp:1244 pdiff.cpp:1287 pdiff.cpp:1311 #, kde-format msgid "Ready." msgstr "Preparat." -#: directorymergewindow.cpp:1121 +#: directorymergewindow.cpp:1134 #, kde-format msgid "" "Directory Comparison Status\n" @@ -427,22 +427,22 @@ "Nombre de fitxers iguals: %2\n" "Nombre de fitxers diferents: %3" -#: directorymergewindow.cpp:1128 +#: directorymergewindow.cpp:1141 #, kde-format msgid "Number of manual merges: %1" msgstr "Nombre de fusions manuals: %1" -#: directorymergewindow.cpp:1394 +#: directorymergewindow.cpp:1407 #, kde-format msgid "This affects all merge operations." msgstr "Això afectarà a totes les operacions de fusionat." -#: directorymergewindow.cpp:1395 +#: directorymergewindow.cpp:1408 #, kde-format msgid "Changing All Merge Operations" msgstr "S'estan canviant totes les operacions de fusionat" -#: directorymergewindow.cpp:1695 +#: directorymergewindow.cpp:1708 #, kde-format msgid "" "Processing %1 / %2\n" @@ -451,44 +451,44 @@ "S'està processant %1 / %2\n" "%3" -#: directorymergewindow.cpp:1738 directorymergewindow.cpp:1742 +#: directorymergewindow.cpp:1751 directorymergewindow.cpp:1755 #, kde-format msgid "Some files could not be processed." msgstr "Alguns fitxers no s'han pogut processar." -#: directorymergewindow.cpp:2222 directorymergewindow.cpp:2247 -#: directorymergewindow.cpp:2271 +#: directorymergewindow.cpp:2235 directorymergewindow.cpp:2260 +#: directorymergewindow.cpp:2285 #, kde-format msgid "This operation is currently not possible." msgstr "Actualment aquesta opció no és possible." -#: directorymergewindow.cpp:2222 directorymergewindow.cpp:2247 -#: directorymergewindow.cpp:2271 directorymergewindow.cpp:2552 +#: directorymergewindow.cpp:2235 directorymergewindow.cpp:2260 +#: directorymergewindow.cpp:2285 directorymergewindow.cpp:2565 #, kde-format msgid "Operation Not Possible" msgstr "Operació no possible" -#: directorymergewindow.cpp:2318 +#: directorymergewindow.cpp:2332 #, kde-format msgid "An error occurred while copying." msgstr "Hi ha hagut un error en copiar." -#: directorymergewindow.cpp:2319 directorymergewindow.cpp:2759 +#: directorymergewindow.cpp:2333 directorymergewindow.cpp:2772 #, kde-format msgid "Merge Error" msgstr "Error de fusionat" -#: directorymergewindow.cpp:2396 +#: directorymergewindow.cpp:2410 #, kde-format msgid "Unknown merge operation. (This must never happen!)" msgstr "Operació de fusionat desconeguda. (Això no hauria de passar mai!)" -#: directorymergewindow.cpp:2441 +#: directorymergewindow.cpp:2455 #, kde-format msgid "Unknown merge operation." msgstr "Operació de fusionat desconeguda." -#: directorymergewindow.cpp:2454 +#: directorymergewindow.cpp:2468 #, kde-format msgid "" "The merge is about to begin.\n" @@ -508,22 +508,22 @@ "Sigueu conscient que aquest programa encara està en fase de proves i no hi " "ha CAP GARANTIA! Feu còpies de seguretat de les vostres dades vitals!" -#: directorymergewindow.cpp:2459 +#: directorymergewindow.cpp:2473 #, kde-format msgid "Starting Merge" msgstr "S'està iniciant el fusionat" -#: directorymergewindow.cpp:2460 +#: directorymergewindow.cpp:2474 #, kde-format msgid "Do It" msgstr "Fes-ho" -#: directorymergewindow.cpp:2461 +#: directorymergewindow.cpp:2475 #, kde-format msgid "Simulate It" msgstr "Simula-ho" -#: directorymergewindow.cpp:2487 +#: directorymergewindow.cpp:2501 #, kde-format msgid "" "The highlighted item has a different type in the different directories. " @@ -532,7 +532,7 @@ "L'element ressaltat té un tipus diferent als diferents directoris. " "Seleccioneu què fer." -#: directorymergewindow.cpp:2491 +#: directorymergewindow.cpp:2505 #, kde-format msgid "" "The modification dates of the file are equal but the files are not. Select " @@ -541,7 +541,7 @@ "Les dates de modificació dels fitxers són iguals però els fitxers no ho són. " "Seleccioneu què fer." -#: directorymergewindow.cpp:2495 +#: directorymergewindow.cpp:2509 #, kde-format msgid "" "The highlighted item was changed in one directory and deleted in the other. " @@ -550,7 +550,7 @@ "L'element ressaltat va ser canviat en un directori i suprimit a l'altre. " "Seleccioneu què fer." -#: directorymergewindow.cpp:2552 +#: directorymergewindow.cpp:2565 #, kde-format msgid "" "This operation is currently not possible because directory merge is " @@ -559,7 +559,7 @@ "Actualment aquesta operació no és possible perquè s'està a mig procés de " "fusionat." -#: directorymergewindow.cpp:2609 +#: directorymergewindow.cpp:2622 #, kde-format msgid "" "There was an error in the last step.\n" @@ -569,32 +569,32 @@ "S'ha produït un error en l'últim pas.\n" "Voleu continuar amb l'element que ha causat l'error o voleu ometre'l?" -#: directorymergewindow.cpp:2611 +#: directorymergewindow.cpp:2624 #, kde-format msgid "Continue merge after an error" msgstr "Després d'un error continua fusionant" -#: directorymergewindow.cpp:2612 +#: directorymergewindow.cpp:2625 #, kde-format msgid "Continue With Last Item" msgstr "Continua amb l'últim element" -#: directorymergewindow.cpp:2613 +#: directorymergewindow.cpp:2626 #, kde-format msgid "Skip Item" msgstr "Omet l'element" -#: directorymergewindow.cpp:2709 +#: directorymergewindow.cpp:2722 #, kde-format msgid "Merge operation complete." msgstr "Operació de fusionat completada." -#: directorymergewindow.cpp:2709 directorymergewindow.cpp:2712 +#: directorymergewindow.cpp:2722 directorymergewindow.cpp:2725 #, kde-format msgid "Merge Complete" msgstr "Fusió completada" -#: directorymergewindow.cpp:2722 +#: directorymergewindow.cpp:2735 #, kde-format msgid "" "Simulated merge complete: Check if you agree with the proposed operations." @@ -602,233 +602,233 @@ "Simulació de fusionat completada: comproveu si esteu d'acord amb les " "operacions proposades." -#: directorymergewindow.cpp:2758 +#: directorymergewindow.cpp:2771 #, kde-format msgid "An error occurred. Press OK to see detailed information." msgstr "" "Hi ha hagut un error. Per a veure informació detallada premeu «D'acord»." -#: directorymergewindow.cpp:2791 +#: directorymergewindow.cpp:2804 #, kde-format msgid "Error: While deleting %1: Creating backup failed." msgstr "Error: en suprimir %1: ha fallat en crear una còpia de seguretat." -#: directorymergewindow.cpp:2798 +#: directorymergewindow.cpp:2811 #, kde-format msgid "delete directory recursively( %1 )" msgstr "suprimeix el directori recursivament (%1)" -#: directorymergewindow.cpp:2800 +#: directorymergewindow.cpp:2813 #, kde-format msgid "delete( %1 )" msgstr "suprimeix (%1)" -#: directorymergewindow.cpp:2815 +#: directorymergewindow.cpp:2828 #, kde-format msgid "Error: delete dir operation failed while trying to read the directory." msgstr "" "Error: l'operació de supressió del directori ha fallat en intentar llegir-lo." -#: directorymergewindow.cpp:2834 +#: directorymergewindow.cpp:2847 #, kde-format msgid "Error: rmdir( %1 ) operation failed." -msgstr "Error: ha fallat l'operació d'eliminar la carpeta (%1)." +msgstr "Error: ha fallat l'operació de suprimir la carpeta (%1)." -#: directorymergewindow.cpp:2844 +#: directorymergewindow.cpp:2857 #, kde-format msgid "Error: delete operation failed." msgstr "Error: ha fallat l'operació de supressió." -#: directorymergewindow.cpp:2870 +#: directorymergewindow.cpp:2884 #, kde-format msgid "manual merge( %1, %2, %3 -> %4)" msgstr "fusió manual ( %1, %2, %3 -> %4)" -#: directorymergewindow.cpp:2873 +#: directorymergewindow.cpp:2887 #, kde-format msgid "" " Note: After a manual merge the user should continue by pressing F7." msgstr "" " Nota: abans de fusionar manualment, l'usuari ha de continuar prement F7." -#: directorymergewindow.cpp:2900 +#: directorymergewindow.cpp:2914 #, kde-format msgid "Error: copy( %1 -> %2 ) failed.Deleting existing destination failed." msgstr "" "Error: ha fallat la còpia (%1 -> %2). La supressió de la destinació existent " "ha fallat." -#: directorymergewindow.cpp:2909 +#: directorymergewindow.cpp:2923 #, kde-format msgid "copyLink( %1 -> %2 )" msgstr "copia l'enllaç (%1 -> %2)" -#: directorymergewindow.cpp:2918 +#: directorymergewindow.cpp:2932 #, kde-format msgid "Error: copyLink failed: Remote links are not yet supported." msgstr "" "Error: ha fallat la còpia de l'enllaç: els enllaços remots encara no estan " "admesos." -#: directorymergewindow.cpp:2928 +#: directorymergewindow.cpp:2942 #, kde-format msgid "Error: copyLink failed." msgstr "Error: ha fallat la còpia de l'enllaç." -#: directorymergewindow.cpp:2953 +#: directorymergewindow.cpp:2967 #, kde-format msgid "copy( %1 -> %2 )" msgstr "copia (%1 -> %2)" -#: directorymergewindow.cpp:2979 +#: directorymergewindow.cpp:2993 #, kde-format msgid "Error during rename( %1 -> %2 ): Cannot delete existing destination." msgstr "" "Error en reanomenar (%1 -> %2): no es pot suprimir la destinació existent." -#: directorymergewindow.cpp:2986 +#: directorymergewindow.cpp:3000 #, kde-format msgid "rename( %1 -> %2 )" msgstr "reanomena (%1 -> %2)" -#: directorymergewindow.cpp:2995 +#: directorymergewindow.cpp:3009 #, kde-format msgid "Error: Rename failed." msgstr "Error: el canvi de nom ha fallat." -#: directorymergewindow.cpp:3013 +#: directorymergewindow.cpp:3027 #, kde-format msgid "Error during makeDir of %1. Cannot delete existing file." msgstr "" -"Error en crear el directori de %1. No es pot suprimir el fitxer existent." +"Error en crear la carpeta de %1. No es pot suprimir el fitxer existent." -#: directorymergewindow.cpp:3030 +#: directorymergewindow.cpp:3044 #, kde-format msgid "makeDir( %1 )" -msgstr "crea el directori (%1)" +msgstr "crea la carpeta (%1)" -#: directorymergewindow.cpp:3040 +#: directorymergewindow.cpp:3054 #, kde-format msgid "Error while creating directory." msgstr "Error en crear el directori." -#: directorymergewindow.cpp:3076 directorymergewindow.cpp:3195 +#: directorymergewindow.cpp:3090 directorymergewindow.cpp:3209 #, kde-format msgid "Dest" msgstr "Destinació" -#: directorymergewindow.cpp:3084 directorymergewindow.cpp:3113 +#: directorymergewindow.cpp:3098 directorymergewindow.cpp:3127 #, kde-format msgid "Dir" msgstr "Directori" -#: directorymergewindow.cpp:3084 +#: directorymergewindow.cpp:3098 #, kde-format msgid "Type" msgstr "Tipus" -#: directorymergewindow.cpp:3084 +#: directorymergewindow.cpp:3098 #, kde-format msgid "Size" msgstr "Mida" -#: directorymergewindow.cpp:3085 +#: directorymergewindow.cpp:3099 #, kde-format msgid "Attr" msgstr "Atributs" -#: directorymergewindow.cpp:3085 +#: directorymergewindow.cpp:3099 #, kde-format msgid "Last Modification" msgstr "Darrera modificació" -#: directorymergewindow.cpp:3085 +#: directorymergewindow.cpp:3099 #, kde-format msgid "Link-Destination" msgstr "Destinació de l'enllaç" -#: directorymergewindow.cpp:3113 +#: directorymergewindow.cpp:3127 #, kde-format msgid "File" msgstr "Fitxer" -#: directorymergewindow.cpp:3113 +#: directorymergewindow.cpp:3127 #, kde-format msgid "-Link" msgstr "-Enllaç" -#: directorymergewindow.cpp:3119 +#: directorymergewindow.cpp:3133 #, kde-format msgid "not available" msgstr "no disponible" -#: directorymergewindow.cpp:3137 +#: directorymergewindow.cpp:3151 #, kde-format msgid "A (Dest): " msgstr "A (Destinació): " -#: directorymergewindow.cpp:3141 +#: directorymergewindow.cpp:3155 #, kde-format msgid "A: " msgstr "A: " -#: directorymergewindow.cpp:3141 +#: directorymergewindow.cpp:3155 #, kde-format msgid "A (Base): " msgstr "A (Base): " -#: directorymergewindow.cpp:3147 +#: directorymergewindow.cpp:3161 #, kde-format msgid "B (Dest): " msgstr "B (Destinació): " -#: directorymergewindow.cpp:3151 +#: directorymergewindow.cpp:3165 #, kde-format msgid "B: " msgstr "B: " -#: directorymergewindow.cpp:3156 +#: directorymergewindow.cpp:3170 #, kde-format msgid "C (Dest): " msgstr "C (Destinació): " -#: directorymergewindow.cpp:3160 +#: directorymergewindow.cpp:3174 #, kde-format msgid "C: " msgstr "C: " -#: directorymergewindow.cpp:3163 +#: directorymergewindow.cpp:3177 #, kde-format msgid "Dest: " msgstr "Destinació: " #. i18n("Saving Directory Merge State ...")); -#: directorymergewindow.cpp:3238 +#: directorymergewindow.cpp:3252 #, kde-format msgid "Save Directory Merge State As..." msgstr "Guarda l'estat de fusionat dels directoris com a..." -#: directorymergewindow.cpp:3387 +#: directorymergewindow.cpp:3401 #, kde-format msgid "Start/Continue Directory Merge" msgstr "Comença/Continua el fusionat dels directoris" -#: directorymergewindow.cpp:3388 +#: directorymergewindow.cpp:3402 #, kde-format msgid "Run Operation for Current Item" msgstr "Executa l'operació per a l'element actual" -#: directorymergewindow.cpp:3389 +#: directorymergewindow.cpp:3403 #, kde-format msgid "Compare Selected File" msgstr "Compara el fitxer seleccionat" -#: directorymergewindow.cpp:3390 +#: directorymergewindow.cpp:3404 #, kde-format msgid "Merge Current File" msgstr "Fusiona el fitxer actual" -#: directorymergewindow.cpp:3390 +#: directorymergewindow.cpp:3404 #, kde-format msgid "" "Merge\n" @@ -837,51 +837,51 @@ "Fitxer\n" "Fusionat" -#: directorymergewindow.cpp:3391 +#: directorymergewindow.cpp:3405 #, kde-format msgid "Fold All Subdirs" msgstr "Plega tots els subdirectoris" -#: directorymergewindow.cpp:3392 +#: directorymergewindow.cpp:3406 #, kde-format msgid "Unfold All Subdirs" msgstr "Desplega tots els subdirectoris" #. i18n("Save Directory Merge State ..."), 0, this, &DirectoryMergeWindow::slotSaveMergeState, ac, "dir_save_merge_state"); #. i18n("Load Directory Merge State ..."), 0, this, &DirectoryMergeWindow::slotLoadMergeState, ac, "dir_load_merge_state"); -#: directorymergewindow.cpp:3396 +#: directorymergewindow.cpp:3410 #, kde-format msgid "Choose A for All Items" msgstr "Tria A per a tots els elements" -#: directorymergewindow.cpp:3397 +#: directorymergewindow.cpp:3411 #, kde-format msgid "Choose B for All Items" msgstr "Tria B per a tots els elements" -#: directorymergewindow.cpp:3398 +#: directorymergewindow.cpp:3412 #, kde-format msgid "Choose C for All Items" msgstr "Tria C per a tots els elements" -#: directorymergewindow.cpp:3399 +#: directorymergewindow.cpp:3413 #, kde-format msgid "Auto-Choose Operation for All Items" msgstr "Tria automàticament l'operació per a tots els elements" -#: directorymergewindow.cpp:3400 +#: directorymergewindow.cpp:3414 #, kde-format msgid "No Operation for All Items" msgstr "Cap operació per a tots els elements" #. i18n("Synchronize Directories"), 0, this, &DirectoryMergeWindow::slotSynchronizeDirectories, ac, "dir_synchronize_directories"); #. d->m_pDirChooseNewerFiles = GuiUtils::createAction< KToggleAction >(i18n("Copy Newer Files Instead of Merging"), 0, this, &DirectoryMergeWindow::slotChooseNewerFiles, ac, "dir_choose_newer_files"); -#: directorymergewindow.cpp:3405 +#: directorymergewindow.cpp:3419 #, kde-format msgid "Show Identical Files" msgstr "Mostra els fitxers idèntics" -#: directorymergewindow.cpp:3405 +#: directorymergewindow.cpp:3419 #, kde-format msgid "" "Identical\n" @@ -890,17 +890,17 @@ "Fitxers\n" "Idèntics" -#: directorymergewindow.cpp:3406 +#: directorymergewindow.cpp:3420 #, kde-format msgid "Show Different Files" msgstr "Mostra els fitxers diferents" -#: directorymergewindow.cpp:3407 +#: directorymergewindow.cpp:3421 #, kde-format msgid "Show Files only in A" msgstr "Mostra els fitxers que només són a A" -#: directorymergewindow.cpp:3407 +#: directorymergewindow.cpp:3421 #, kde-format msgid "" "Files\n" @@ -909,12 +909,12 @@ "Fitxers\n" "que només són a A" -#: directorymergewindow.cpp:3408 +#: directorymergewindow.cpp:3422 #, kde-format msgid "Show Files only in B" msgstr "Mostra els fitxers que només són a B" -#: directorymergewindow.cpp:3408 +#: directorymergewindow.cpp:3422 #, kde-format msgid "" "Files\n" @@ -923,12 +923,12 @@ "Fitxers\n" "que només són a B" -#: directorymergewindow.cpp:3409 +#: directorymergewindow.cpp:3423 #, kde-format msgid "Show Files only in C" msgstr "Mostra els fitxers que només són a C" -#: directorymergewindow.cpp:3409 +#: directorymergewindow.cpp:3423 #, kde-format msgid "" "Files\n" @@ -937,52 +937,57 @@ "Fitxers\n" "que només són a C" -#: directorymergewindow.cpp:3413 +#: directorymergewindow.cpp:3427 #, kde-format msgid "Compare Explicitly Selected Files" msgstr "Compara els fitxers seleccionats explícitament" -#: directorymergewindow.cpp:3414 +#: directorymergewindow.cpp:3428 #, kde-format msgid "Merge Explicitly Selected Files" msgstr "Fusiona els fitxers seleccionats explícitament" -#: directorymergewindow.cpp:3416 directorymergewindow.cpp:3423 +#: directorymergewindow.cpp:3430 directorymergewindow.cpp:3437 #, kde-format msgid "Do Nothing" msgstr "No faces res" -#: directorymergewindow.cpp:3428 +#: directorymergewindow.cpp:3442 #, kde-format msgid "Delete A && B" msgstr "Suprimeix A i B" -#: directorymergewindow.cpp:3431 +#: directorymergewindow.cpp:3445 #, kde-format msgid "Merge to A && B" msgstr "Fusiona a A i B" -#: fileaccess.cpp:462 SourceData.cpp:493 +#: fileaccess.cpp:301 +#, kde-format +msgid "Unable to determine full url. No parent specified." +msgstr "No s'ha pogut determinar l'URL complet. Especificat cap pare." + +#: fileaccess.cpp:482 SourceData.cpp:506 #, kde-format msgid "Failed to read file: %1" msgstr "Ha fallat en llegir el fitxer: %1." -#: fileaccess.cpp:587 +#: fileaccess.cpp:624 #, kde-format msgid "Creating temp copy of %1 failed." msgstr "Ha fallat la creació de la còpia temporal de %1." -#: fileaccess.cpp:595 fileaccess.cpp:600 +#: fileaccess.cpp:632 fileaccess.cpp:637 #, kde-format msgid "Opening %1 failed. %2" msgstr "Ha fallat l'obertura de %1. %2" -#: fileaccess.cpp:619 fileaccess.cpp:627 +#: fileaccess.cpp:656 fileaccess.cpp:664 #, kde-format msgid "Error reading from %1. %2" msgstr "Error en llegir des de %1. %2" -#: fileaccess.cpp:751 +#: fileaccess.cpp:788 #, kde-format msgid "" "While trying to make a backup, deleting an older backup failed.\n" @@ -992,7 +997,7 @@ "nova.\n" "Nom de fitxer: %1" -#: fileaccess.cpp:758 +#: fileaccess.cpp:795 #, kde-format msgid "" "While trying to make a backup, renaming failed.\n" @@ -1001,177 +1006,177 @@ "Ha fallat el reanomenament en intentar fer una còpia de seguretat.\n" "Noms de fitxer: %1 -> %2" -#: fileaccess.cpp:828 +#: fileaccess.cpp:865 #, kde-format msgid "Getting file status: %1" msgstr "S'està obtenint l'estat del fitxer: %1" -#: fileaccess.cpp:869 +#: fileaccess.cpp:906 #, kde-format msgid "Reading file: %1" msgstr "S'està llegint el fitxer: %1" -#: fileaccess.cpp:907 +#: fileaccess.cpp:944 #, kde-format msgid "Writing file: %1" msgstr "S'està escrivint el fitxer: %1" -#: fileaccess.cpp:940 +#: fileaccess.cpp:977 #, kde-format msgid "Out of memory" msgstr "Memòria exhaurida" -#: fileaccess.cpp:976 +#: fileaccess.cpp:1013 #, kde-format msgid "Making directory: %1" msgstr "S'està creant el directori: %1" -#: fileaccess.cpp:997 +#: fileaccess.cpp:1034 #, kde-format msgid "Removing directory: %1" msgstr "S'està eliminant el directori: %1" -#: fileaccess.cpp:1012 +#: fileaccess.cpp:1049 #, kde-format msgid "Removing file: %1" msgstr "S'està eliminant el fitxer: %1" -#: fileaccess.cpp:1028 +#: fileaccess.cpp:1065 #, kde-format msgid "Creating symbolic link: %1 -> %2" msgstr "S'està creant l'enllaç simbòlic: %1 -> %2" -#: fileaccess.cpp:1052 +#: fileaccess.cpp:1089 #, kde-format msgid "Renaming file: %1 -> %2" msgstr "S'està reanomenant el fitxer: %1 -> %2" -#: fileaccess.cpp:1086 +#: fileaccess.cpp:1123 #, kde-format msgid "Copying file: %1 -> %2" msgstr "S'està copiant el fitxer: %1 -> %2" -#: fileaccess.cpp:1108 +#: fileaccess.cpp:1145 #, kde-format msgid "Reading directory: %1" msgstr "S'està llegint el directori: %1" -#: fileaccess.cpp:1162 +#: fileaccess.cpp:1202 #, kde-format msgid "Listing directory: %1" -msgstr "S'està llistant el directori: %1" +msgstr "S'està llistant la carpeta: %1" -#: kdiff3.cpp:181 +#: kdiff3.cpp:182 #, kde-format msgid "Current Configuration:" msgstr "Configuració actual:" -#: kdiff3.cpp:186 +#: kdiff3.cpp:187 #, kde-format msgid "Config Option Error:" msgstr "Error de l'opció de configuració:" -#: kdiff3.cpp:240 +#: kdiff3.cpp:246 #, kde-format msgid "Option --auto used, but no output file specified." msgstr "Heu usat l'opció --auto, però no heu especificat cap fitxer d'eixida." -#: kdiff3.cpp:416 +#: kdiff3.cpp:405 #, kde-format msgid "Option --auto ignored for directory comparison." msgstr "L'opció --auto s'ignora en comparar directoris." -#: kdiff3.cpp:460 +#: kdiff3.cpp:449 #, kde-format msgid "Saving failed." msgstr "El desament ha fallat." -#: kdiff3.cpp:496 pdiff.cpp:1098 +#: kdiff3.cpp:494 pdiff.cpp:1096 #, kde-format msgid "Opening of these files failed:" msgstr "Ha fallat en obrir aquests fitxers:" -#: kdiff3.cpp:505 +#: kdiff3.cpp:503 pdiff.cpp:1105 #, kde-format -msgid "File Open Error" +msgid "File open error" msgstr "S'ha produït un error en obrir el fitxer" -#: kdiff3.cpp:533 +#: kdiff3.cpp:532 #, kde-format msgid "Opens documents for comparison..." msgstr "Obri els documents per a comparar-los..." -#: kdiff3.cpp:535 +#: kdiff3.cpp:534 #, kde-format msgid "Reload" msgstr "Recarrega" -#: kdiff3.cpp:538 +#: kdiff3.cpp:537 #, kde-format msgid "Saves the merge result. All conflicts must be solved!" msgstr "Guarda el resultat de la fusió. S'han de resoldre tots els conflictes!" -#: kdiff3.cpp:540 +#: kdiff3.cpp:539 #, kde-format msgid "Saves the current document as..." msgstr "Guarda el document actual com a..." -#: kdiff3.cpp:543 +#: kdiff3.cpp:542 #, kde-format msgid "Print the differences" msgstr "Imprimeix les diferències" -#: kdiff3.cpp:546 +#: kdiff3.cpp:545 #, kde-format msgid "Quits the application" msgstr "Ix de l'aplicació" -#: kdiff3.cpp:549 +#: kdiff3.cpp:548 #, kde-format msgid "Cuts the selected section and puts it to the clipboard" msgstr "Retalla la secció seleccionada i la posa al porta-retalls" -#: kdiff3.cpp:552 +#: kdiff3.cpp:551 #, kde-format msgid "Copies the selected section to the clipboard" msgstr "Copia la secció seleccionada al porta-retalls" -#: kdiff3.cpp:554 +#: kdiff3.cpp:553 #, kde-format msgid "Pastes the clipboard contents to current position" msgstr "Enganxa el contingut del porta-retalls a la posició actual" -#: kdiff3.cpp:557 +#: kdiff3.cpp:556 #, kde-format msgid "Select everything in current window" msgstr "Selecciona tot el que hi ha a la finestra actual" -#: kdiff3.cpp:560 +#: kdiff3.cpp:559 #, kde-format msgid "Search for a string" msgstr "Cerca una cadena" -#: kdiff3.cpp:562 +#: kdiff3.cpp:561 #, kde-format msgid "Search again for the string" msgstr "Torna a cercar la cadena" -#: kdiff3.cpp:567 +#: kdiff3.cpp:566 #, kde-format msgid "Enables/disables the statusbar" msgstr "Activa/desactiva la barra d'estat" -#: kdiff3.cpp:571 +#: kdiff3.cpp:570 #, kde-format msgid "Configure KDiff3..." msgstr "Configura el KDiff3..." -#: kdiff3.cpp:590 +#: kdiff3.cpp:589 #, kde-format msgid "Go to Current Delta" msgstr "Vés a la diferència actual" -#: kdiff3.cpp:590 +#: kdiff3.cpp:589 #, kde-format msgid "" "Current\n" @@ -1180,12 +1185,12 @@ "Diferència\n" "actual" -#: kdiff3.cpp:592 +#: kdiff3.cpp:591 #, kde-format msgid "Go to First Delta" msgstr "Vés a la primera diferència" -#: kdiff3.cpp:592 +#: kdiff3.cpp:591 #, kde-format msgid "" "First\n" @@ -1194,12 +1199,12 @@ "Primera\n" "diferència" -#: kdiff3.cpp:594 +#: kdiff3.cpp:593 #, kde-format msgid "Go to Last Delta" msgstr "Vés a l'última diferència" -#: kdiff3.cpp:594 +#: kdiff3.cpp:593 #, kde-format msgid "" "Last\n" @@ -1208,14 +1213,14 @@ "Última\n" "diferència" -#: kdiff3.cpp:596 +#: kdiff3.cpp:595 #, kde-format msgid "(Skips white space differences when \"Show White Space\" is disabled.)" msgstr "" "(S'ignoren les diferències en els espais en blanc quan «Mostra els espais en " "blanc» està desactivat)." -#: kdiff3.cpp:597 +#: kdiff3.cpp:596 #, kde-format msgid "" "(Does not skip white space differences even when \"Show White Space\" is " @@ -1224,12 +1229,12 @@ "(No s'ignoren les diferències en els espais en blanc quan «Mostra els espais " "en blanc» està desactivat)." -#: kdiff3.cpp:598 +#: kdiff3.cpp:597 #, kde-format msgid "Go to Previous Delta" msgstr "Vés a la diferència anterior" -#: kdiff3.cpp:598 +#: kdiff3.cpp:597 #, kde-format msgid "" "Prev\n" @@ -1238,12 +1243,12 @@ "Diferència\n" "anterior" -#: kdiff3.cpp:600 +#: kdiff3.cpp:599 #, kde-format msgid "Go to Next Delta" msgstr "Vés a la diferència següent" -#: kdiff3.cpp:600 +#: kdiff3.cpp:599 #, kde-format msgid "" "Next\n" @@ -1252,12 +1257,12 @@ "Diferència\n" "següent" -#: kdiff3.cpp:602 +#: kdiff3.cpp:601 #, kde-format msgid "Go to Previous Conflict" msgstr "Vés al conflicte anterior" -#: kdiff3.cpp:602 +#: kdiff3.cpp:601 #, kde-format msgid "" "Prev\n" @@ -1266,12 +1271,12 @@ "Conflicte\n" "anterior" -#: kdiff3.cpp:604 +#: kdiff3.cpp:603 #, kde-format msgid "Go to Next Conflict" msgstr "Vés al conflicte següent" -#: kdiff3.cpp:604 +#: kdiff3.cpp:603 #, kde-format msgid "" "Next\n" @@ -1280,12 +1285,12 @@ "Conflicte\n" "següent" -#: kdiff3.cpp:606 +#: kdiff3.cpp:605 #, kde-format msgid "Go to Previous Unsolved Conflict" msgstr "Vés al conflicte no resolt anterior" -#: kdiff3.cpp:606 +#: kdiff3.cpp:605 #, kde-format msgid "" "Prev\n" @@ -1294,12 +1299,12 @@ "No resolt\n" "anterior" -#: kdiff3.cpp:608 +#: kdiff3.cpp:607 #, kde-format msgid "Go to Next Unsolved Conflict" msgstr "Vés al conflicte no resolt següent" -#: kdiff3.cpp:608 +#: kdiff3.cpp:607 #, kde-format msgid "" "Next\n" @@ -1308,12 +1313,12 @@ "No resolt\n" "següent" -#: kdiff3.cpp:610 +#: kdiff3.cpp:609 #, kde-format msgid "Select Line(s) From A" msgstr "Selecciona línies d'A" -#: kdiff3.cpp:610 +#: kdiff3.cpp:609 #, kde-format msgid "" "Choose\n" @@ -1322,12 +1327,12 @@ "Trieu\n" "A" -#: kdiff3.cpp:611 +#: kdiff3.cpp:610 #, kde-format msgid "Select Line(s) From B" msgstr "Selecciona línies de B" -#: kdiff3.cpp:611 +#: kdiff3.cpp:610 #, kde-format msgid "" "Choose\n" @@ -1336,12 +1341,12 @@ "Trieu\n" "B" -#: kdiff3.cpp:612 +#: kdiff3.cpp:611 #, kde-format msgid "Select Line(s) From C" msgstr "Selecciona línies de C" -#: kdiff3.cpp:612 +#: kdiff3.cpp:611 #, kde-format msgid "" "Choose\n" @@ -1350,14 +1355,14 @@ "Trieu\n" "C" -#: kdiff3.cpp:613 +#: kdiff3.cpp:612 #, kde-format msgid "Automatically Go to Next Unsolved Conflict After Source Selection" msgstr "" "Vés automàticament al conflicte no resolt següent després de seleccionar una " "font" -#: kdiff3.cpp:613 +#: kdiff3.cpp:612 #, kde-format msgid "" "Auto\n" @@ -1366,12 +1371,12 @@ "Automàticament\n" "al següent" -#: kdiff3.cpp:615 +#: kdiff3.cpp:614 #, kde-format msgid "Show Space && Tabulator Characters" msgstr "Mostra els caràcters d'espai en blanc i els de tabulació" -#: kdiff3.cpp:615 +#: kdiff3.cpp:614 #, kde-format msgid "" "White\n" @@ -1380,12 +1385,12 @@ "Caràcters\n" "en blanc" -#: kdiff3.cpp:616 +#: kdiff3.cpp:615 #, kde-format msgid "Show White Space" msgstr "Mostra els espais en blanc" -#: kdiff3.cpp:616 +#: kdiff3.cpp:615 #, kde-format msgid "" "White\n" @@ -1394,12 +1399,12 @@ "Diferències\n" "d'espais" -#: kdiff3.cpp:618 +#: kdiff3.cpp:617 #, kde-format msgid "Show Line Numbers" msgstr "Mostra els números de les línies" -#: kdiff3.cpp:618 +#: kdiff3.cpp:617 #, kde-format msgid "" "Line\n" @@ -1408,132 +1413,132 @@ "Números\n" "de línia" -#: kdiff3.cpp:620 +#: kdiff3.cpp:619 #, kde-format msgid "Automatically Solve Simple Conflicts" msgstr "Resol automàticament els conflictes senzills" -#: kdiff3.cpp:621 +#: kdiff3.cpp:620 #, kde-format msgid "Set Deltas to Conflicts" msgstr "Estableix les diferències com a conflictes" -#: kdiff3.cpp:622 +#: kdiff3.cpp:621 #, kde-format msgid "Run Regular Expression Auto Merge" -msgstr "Executa el fusionat automàtic de l'expressió regular" +msgstr "Executa el fusionat automàtic amb l'expressió regular" -#: kdiff3.cpp:623 +#: kdiff3.cpp:622 #, kde-format msgid "Automatically Solve History Conflicts" msgstr "Resol automàticament els conflictes cronològics" -#: kdiff3.cpp:624 +#: kdiff3.cpp:623 #, kde-format msgid "Split Diff At Selection" msgstr "Divideix les diferències a la selecció" -#: kdiff3.cpp:625 +#: kdiff3.cpp:624 #, kde-format msgid "Join Selected Diffs" msgstr "Uneix les diferències seleccionades" -#: kdiff3.cpp:627 +#: kdiff3.cpp:626 #, kde-format msgid "Show Window A" msgstr "Mostra la finestra A" -#: kdiff3.cpp:628 +#: kdiff3.cpp:627 #, kde-format msgid "Show Window B" msgstr "Mostra la finestra B" -#: kdiff3.cpp:629 +#: kdiff3.cpp:628 #, kde-format msgid "Show Window C" msgstr "Mostra la finestra C" -#: kdiff3.cpp:631 +#: kdiff3.cpp:630 #, kde-format msgid "Normal Overview" -msgstr "Resum normal" +msgstr "Visió de conjunt normal" -#: kdiff3.cpp:632 +#: kdiff3.cpp:631 #, kde-format msgid "A vs. B Overview" -msgstr "Resum d'A contra B" +msgstr "Visió de conjunt d'A contra B" -#: kdiff3.cpp:633 +#: kdiff3.cpp:632 #, kde-format msgid "A vs. C Overview" -msgstr "Resum d'A contra C" +msgstr "Visió de conjunt d'A contra C" -#: kdiff3.cpp:634 +#: kdiff3.cpp:633 #, kde-format msgid "B vs. C Overview" -msgstr "Resum de B contra C" +msgstr "Visió de conjunt de B contra C" -#: kdiff3.cpp:635 +#: kdiff3.cpp:634 #, kde-format msgid "Word Wrap Diff Windows" -msgstr "Ajusta les línies de les finestres de diferències" +msgstr "Ajusta les línies a les finestres de diferències" -#: kdiff3.cpp:636 +#: kdiff3.cpp:635 #, kde-format msgid "Add Manual Diff Alignment" msgstr "Afig alineació manual de les diferències" -#: kdiff3.cpp:637 +#: kdiff3.cpp:636 #, kde-format msgid "Clear All Manual Diff Alignments" msgstr "Neteja totes les alineacions manuals de les diferències" -#: kdiff3.cpp:639 +#: kdiff3.cpp:638 #, kde-format msgid "Focus Next Window" msgstr "Focus a la finestra següent" -#: kdiff3.cpp:640 +#: kdiff3.cpp:639 #, kde-format msgid "Focus Prev Window" msgstr "Focus a la finestra anterior" -#: kdiff3.cpp:641 +#: kdiff3.cpp:640 #, kde-format msgid "Toggle Split Orientation" msgstr "Commuta l'orientació de les divisions" -#: kdiff3.cpp:643 +#: kdiff3.cpp:642 #, kde-format msgid "Dir && Text Split Screen View" msgstr "Vista de pantalla dividida en text i directoris" -#: kdiff3.cpp:645 +#: kdiff3.cpp:644 #, kde-format msgid "Toggle Between Dir && Text View" msgstr "Commuta entre la vista de directoris i text" -#: kdiff3.cpp:697 pdiff.cpp:1909 +#: kdiff3.cpp:696 pdiff.cpp:1919 #, kde-format msgid "The merge result has not been saved." msgstr "El resultat del fusionat no s'ha guardat." -#: kdiff3.cpp:699 +#: kdiff3.cpp:698 #, kde-format msgid "Save && Quit" msgstr "Guarda i ix" -#: kdiff3.cpp:700 +#: kdiff3.cpp:699 #, kde-format msgid "Quit Without Saving" msgstr "Ix sense guardar" -#: kdiff3.cpp:708 pdiff.cpp:1920 +#: kdiff3.cpp:707 pdiff.cpp:1930 #, kde-format msgid "Saving the merge result failed." msgstr "Ha fallat en guardar el resultat del fusionat." -#: kdiff3.cpp:719 pdiff.cpp:1032 +#: kdiff3.cpp:718 pdiff.cpp:1030 #, kde-format msgid "" "You are currently doing a directory merge. Are you sure, you want to abort?" @@ -1541,62 +1546,62 @@ "Actualment esteu fent una fusió de directoris. Segur que la voleu " "interrompre?" -#: kdiff3.cpp:742 +#: kdiff3.cpp:741 #, kde-format msgid "Saving file..." msgstr "S'està desant el fitxer..." -#: kdiff3.cpp:759 +#: kdiff3.cpp:758 #, kde-format msgid "Saving file with a new filename..." msgstr "S'està desant el fitxer amb un nom nou..." -#: kdiff3.cpp:761 +#: kdiff3.cpp:760 #, kde-format msgid "Save As..." msgstr "Guarda com a..." -#: kdiff3.cpp:820 +#: kdiff3.cpp:819 #, kde-format msgid "Printing not implemented." msgstr "Impressió no implementada." -#: kdiff3.cpp:857 +#: kdiff3.cpp:858 #, kde-format msgid "Printing..." msgstr "S'està imprimint..." -#: kdiff3.cpp:943 +#: kdiff3.cpp:948 #, kde-format msgid "Printing page %1 of %2" msgstr "S'està imprimint la pàgina %1 de %2" -#: kdiff3.cpp:1000 +#: kdiff3.cpp:1006 #, kde-format msgid " (Selection)" msgstr " (Selecció)" -#: kdiff3.cpp:1027 +#: kdiff3.cpp:1034 #, kde-format msgid "Printing completed." msgstr "Impressió completada." -#: kdiff3.cpp:1031 +#: kdiff3.cpp:1038 #, kde-format msgid "Printing aborted." msgstr "S'ha interromput la impressió." -#: kdiff3.cpp:1038 +#: kdiff3.cpp:1045 #, kde-format msgid "Exiting..." msgstr "S'està eixint..." -#: kdiff3.cpp:1049 +#: kdiff3.cpp:1056 #, kde-format msgid "Toggling toolbar..." msgstr "S'està commutant la barra d'eines..." -#: kdiff3.cpp:1070 +#: kdiff3.cpp:1077 #, kde-format msgid "Toggle the statusbar..." msgstr "Commuta la barra d'estat..." @@ -1621,10 +1626,10 @@ msgid "Joachim Eibl" msgstr "Joachim Eibl" -#: kdiff3_part.cpp:173 kdiff3_part.cpp:254 +#: kdiff3_part.cpp:174 kdiff3_part.cpp:255 #, kde-format msgid "Could not find files for comparison." -msgstr "No s'han trobat fitxers per a comparar." +msgstr "No s'ha trobat cap fitxer per a comparar." #. i18n: ectx: Menu (movement) #: kdiff3_part.rc:4 @@ -1639,7 +1644,7 @@ msgstr "Configura el KDiff3" #. i18n: ectx: ToolBar (mainToolBar) -#: kdiff3_part.rc:16 main.cpp:88 +#: kdiff3_part.rc:16 main.cpp:89 #, kde-format msgid "KDiff3" msgstr "KDiff3" @@ -1709,86 +1714,91 @@ msgid "Main Toolbar" msgstr "Barra d'eines principal" -#: main.cpp:68 main.cpp:72 +#: main.cpp:69 main.cpp:73 #, kde-format msgid "Ignored. (User defined.)" msgstr "Ignorat. (Definit per l'usuari)." -#: main.cpp:92 +#: main.cpp:93 #, kde-format msgid " (64 bit)" msgstr " (64 bits)" -#: main.cpp:94 +#: main.cpp:95 #, kde-format msgid " (32 bit)" msgstr " (32 bits)" -#: main.cpp:95 +#: main.cpp:96 #, kde-format msgid "Tool for Comparison and Merge of Files and Directories" msgstr "Eina per a comparar i fusionar fitxers i directoris" -#: main.cpp:96 +#: main.cpp:97 #, kde-format msgid "(c) 2002-2014 Joachim Eibl, (c) 2017 Michael Reeves KF5/Qt5 port" msgstr "" "(c) 2002-2014 Joachim Eibl, (c) 2017 Michael Reeves adaptació a KF5/Qt5" -#: main.cpp:112 +#: main.cpp:113 #, kde-format msgid "Merge the input." msgstr "Fusiona l'entrada." -#: main.cpp:113 +#: main.cpp:114 #, kde-format msgid "Explicit base file. For compatibility with certain tools." msgstr "Fitxer base explícit. Per compatibilitat amb certes eines." -#: main.cpp:114 +#: main.cpp:115 #, kde-format msgid "Output file. Implies -m. E.g.: -o newfile.txt" msgstr "Fitxer d'eixida. Implica -m P. ex: -o fitxernou.txt" -#: main.cpp:115 +#: main.cpp:116 #, kde-format msgid "Output file, again. (For compatibility with certain tools.)" msgstr "Fitxer d'eixida, un altre cop. (Per compatibilitat amb certes eines)." -#: main.cpp:116 +#: main.cpp:118 #, kde-format msgid "No GUI if all conflicts are auto-solvable. (Needs -o file)" msgstr "" "Sense IGU si tots els conflictes es poden resoldre automàticament. (Cal -o " "fitxer)" -#: main.cpp:117 +#: main.cpp:120 +#, kde-format +msgid "Ignored." +msgstr "Ignorat." + +#: main.cpp:122 #, kde-format msgid "Do not solve conflicts automatically." msgstr "No resol els conflictes automàticament." -#: main.cpp:118 +#: main.cpp:123 #, kde-format msgid "Visible name replacement for input file 1 (base)." msgstr "Reemplaçament del nom visible pel fitxer d'eixida 1 (base)." -#: main.cpp:119 +#: main.cpp:124 #, kde-format msgid "Visible name replacement for input file 2." msgstr "Reemplaçament del nom visible pel fitxer d'eixida 2." -#: main.cpp:120 +#: main.cpp:125 #, kde-format msgid "Visible name replacement for input file 3." msgstr "Reemplaçament del nom visible pel fitxer d'eixida 3." -#: main.cpp:121 +#: main.cpp:126 #, kde-format msgid "Alternative visible name replacement. Supply this once for every input." msgstr "" "Reemplaçament del nom visible alternatiu. Proporcioneu-lo per a cada eixida." -#: main.cpp:122 +#: main.cpp:127 #, kde-format msgid "" "Override a config setting. Use once for every setting. E.g.: --cs " @@ -1797,89 +1807,89 @@ "Sobreescriu l'ajustament de la configuració. Useu-ho per a cada ajustament. " "P. ex.: --cs \"AutoAdvance=1\"" -#: main.cpp:123 +#: main.cpp:128 #, kde-format msgid "Show list of config settings and current values." msgstr "Mostra una llista dels ajustaments de configuració i el valor actual." -#: main.cpp:124 +#: main.cpp:129 #, kde-format msgid "Use a different config file." msgstr "Usa un fitxer de configuració diferent." -#: main.cpp:127 +#: main.cpp:132 #, kde-format msgid "file1 to open (base, if not specified via --base)" msgstr "Fitxer1 a obrir (base, si no s'especifica via --base)." -#: main.cpp:128 +#: main.cpp:133 #, kde-format msgid "file2 to open" msgstr "Fitxer 2 a obrir." -#: main.cpp:129 +#: main.cpp:134 #, kde-format msgid "file3 to open" msgstr "Fitxer 3 a obrir." -#: main.cpp:153 +#: main.cpp:158 #, kde-format msgid "See kdiff3 --help for supported options." msgstr "Vegeu «kdiff3 --help» per a les opcions admeses." -#: mergeresultwindow.cpp:158 +#: mergeresultwindow.cpp:171 #, kde-format msgid "Choose A Everywhere" msgstr "Trieu A a tot arreu" -#: mergeresultwindow.cpp:159 +#: mergeresultwindow.cpp:172 #, kde-format msgid "Choose B Everywhere" msgstr "Trieu B a tot arreu" -#: mergeresultwindow.cpp:160 +#: mergeresultwindow.cpp:173 #, kde-format msgid "Choose C Everywhere" msgstr "Trieu C a tot arreu" -#: mergeresultwindow.cpp:161 +#: mergeresultwindow.cpp:174 #, kde-format msgid "Choose A for All Unsolved Conflicts" msgstr "Trieu A a tots els conflictes no resolts" -#: mergeresultwindow.cpp:162 +#: mergeresultwindow.cpp:175 #, kde-format msgid "Choose B for All Unsolved Conflicts" msgstr "Trieu B a tots els conflictes no resolts" -#: mergeresultwindow.cpp:163 +#: mergeresultwindow.cpp:176 #, kde-format msgid "Choose C for All Unsolved Conflicts" msgstr "Trieu C a tots els conflictes no resolts" -#: mergeresultwindow.cpp:164 +#: mergeresultwindow.cpp:177 #, kde-format msgid "Choose A for All Unsolved Whitespace Conflicts" msgstr "Trieu A a tots els conflictes dels espais en blanc no resolts" -#: mergeresultwindow.cpp:165 +#: mergeresultwindow.cpp:178 #, kde-format msgid "Choose B for All Unsolved Whitespace Conflicts" msgstr "Trieu B a tots els conflictes dels espais en blanc no resolts" -#: mergeresultwindow.cpp:166 +#: mergeresultwindow.cpp:179 #, kde-format msgid "Choose C for All Unsolved Whitespace Conflicts" msgstr "Trieu C a tots els conflictes dels espais en blanc no resolts" -#: mergeresultwindow.cpp:176 +#: mergeresultwindow.cpp:204 #, kde-format msgid "Number of remaining unsolved conflicts: %1 (of which %2 are whitespace)" msgstr "" -"Nombre de conflictes sense resoldre pendents: %1 (dels quals %2 són espais " +"Nombre de conflictes pendents sense resoldre: %1 (dels quals %2 són espais " "en blanc)" -#: mergeresultwindow.cpp:370 +#: mergeresultwindow.cpp:398 #, kde-format msgid "" "The output has been modified.\n" @@ -1888,29 +1898,29 @@ "S'ha modificat l'eixida.\n" "Si continueu, es perdran els canvis." -#: mergeresultwindow.cpp:936 pdiff.cpp:827 +#: mergeresultwindow.cpp:964 pdiff.cpp:817 #, kde-format msgid "All input files are binary equal." msgstr "Tots els fitxers d'entrada són binàriament iguals." -#: mergeresultwindow.cpp:938 +#: mergeresultwindow.cpp:966 #, kde-format msgid "All input files contain the same text." msgstr "Tots els fitxers d'entrada contenen el mateix text." -#: mergeresultwindow.cpp:942 mergeresultwindow.cpp:946 -#: mergeresultwindow.cpp:950 pdiff.cpp:833 pdiff.cpp:837 pdiff.cpp:841 +#: mergeresultwindow.cpp:970 mergeresultwindow.cpp:974 +#: mergeresultwindow.cpp:978 pdiff.cpp:823 pdiff.cpp:827 pdiff.cpp:831 #, kde-format msgid "Files %1 and %2 are binary equal.\n" msgstr "Els fitxers %1 i %2 són binàriament iguals.\n" -#: mergeresultwindow.cpp:944 mergeresultwindow.cpp:948 -#: mergeresultwindow.cpp:952 +#: mergeresultwindow.cpp:972 mergeresultwindow.cpp:976 +#: mergeresultwindow.cpp:980 #, kde-format msgid "Files %1 and %2 have equal text.\n" msgstr "Els fitxers %1 i %2 tenen el mateix text.\n" -#: mergeresultwindow.cpp:958 +#: mergeresultwindow.cpp:986 #, kde-format msgid "" "Total number of conflicts: %1\n" @@ -1923,27 +1933,27 @@ "Nre. de conflictes sense resoldre: %3\n" "%4" -#: mergeresultwindow.cpp:964 +#: mergeresultwindow.cpp:992 #, kde-format msgid "Conflicts" msgstr "Conflictes" -#: mergeresultwindow.cpp:1873 +#: mergeresultwindow.cpp:1901 #, kde-format msgid "" msgstr "" -#: mergeresultwindow.cpp:1881 +#: mergeresultwindow.cpp:1909 #, kde-format msgid "" msgstr "" -#: mergeresultwindow.cpp:1883 mergeresultwindow.cpp:2755 +#: mergeresultwindow.cpp:1911 mergeresultwindow.cpp:2783 #, kde-format msgid "" msgstr "" -#: mergeresultwindow.cpp:2967 +#: mergeresultwindow.cpp:2995 #, kde-format msgid "" "Not all conflicts are solved yet.\n" @@ -1952,12 +1962,12 @@ "Encara no s'han resolt tots els conflictes.\n" "El fitxer no s'ha guardat." -#: mergeresultwindow.cpp:2969 mergeresultwindow.cpp:2978 +#: mergeresultwindow.cpp:2997 mergeresultwindow.cpp:3006 #, kde-format msgid "Conflicts Left" msgstr "Conflictes pendents" -#: mergeresultwindow.cpp:2976 +#: mergeresultwindow.cpp:3004 #, kde-format msgid "" "There is a line end style conflict. Please choose the line end style " @@ -1968,7 +1978,7 @@ "del salt de línia.\n" "El fitxer no s'ha guardat." -#: mergeresultwindow.cpp:2990 +#: mergeresultwindow.cpp:3018 #, kde-format msgid "" "\n" @@ -1979,57 +1989,57 @@ "\n" "Ha fallat la creació de la còpia de seguretat. El fitxer no s'ha guardat." -#: mergeresultwindow.cpp:2990 mergeresultwindow.cpp:3038 +#: mergeresultwindow.cpp:3018 mergeresultwindow.cpp:3066 #, kde-format msgid "File Save Error" msgstr "Error en guardar el fitxer" -#: mergeresultwindow.cpp:3038 +#: mergeresultwindow.cpp:3066 #, kde-format msgid "Error while writing." msgstr "Error en escriure." -#: mergeresultwindow.cpp:3110 +#: mergeresultwindow.cpp:3138 #, kde-format msgid "Output:" msgstr "Eixida:" -#: mergeresultwindow.cpp:3123 mergeresultwindow.cpp:3315 +#: mergeresultwindow.cpp:3151 mergeresultwindow.cpp:3343 #, kde-format msgid "[Modified]" msgstr "[Modificat]" -#: mergeresultwindow.cpp:3130 +#: mergeresultwindow.cpp:3158 #, kde-format msgid "Encoding for saving:" msgstr "Codificació per guardar:" -#: mergeresultwindow.cpp:3230 +#: mergeresultwindow.cpp:3258 #, kde-format msgid "Conflict" msgstr "Conflicte" -#: mergeresultwindow.cpp:3262 +#: mergeresultwindow.cpp:3290 #, kde-format msgid "Codec from A: %1" msgstr "Còdec d'A: %1" -#: mergeresultwindow.cpp:3264 +#: mergeresultwindow.cpp:3292 #, kde-format msgid "Codec from B: %1" msgstr "Còdec de B: %1" -#: mergeresultwindow.cpp:3266 +#: mergeresultwindow.cpp:3294 #, kde-format msgid "Codec from C: %1" msgstr "Còdec de C: %1" -#: optiondialog.cpp:119 +#: optiondialog.cpp:121 #, kde-format msgid "Change Font" msgstr "Canvia el tipus de lletra" -#: optiondialog.cpp:135 optiondialog.cpp:145 +#: optiondialog.cpp:137 optiondialog.cpp:147 #, kde-format msgid "" "Font: %1, %2, %3\n" @@ -2040,123 +2050,123 @@ "\n" "Exemple:" -#: optiondialog.cpp:388 +#: optiondialog.cpp:390 #, kde-format msgid "Unicode" msgstr "Unicode" -#: optiondialog.cpp:389 +#: optiondialog.cpp:391 #, kde-format msgid "Latin1" msgstr "Latin1" -#: optiondialog.cpp:408 +#: optiondialog.cpp:410 #, kde-format msgid "Change this if non-ASCII characters are not displayed correctly." msgstr "Canvia això si els caràcters no ASCII no es mostren correctament." -#: optiondialog.cpp:491 +#: optiondialog.cpp:495 #, kde-format msgid "Configure" msgstr "Configura" -#: optiondialog.cpp:568 +#: optiondialog.cpp:573 #, kde-format msgid "Font" msgstr "Tipus de lletra" -#: optiondialog.cpp:570 +#: optiondialog.cpp:575 #, kde-format msgid "Editor & Diff Output Font" msgstr "Tipus de lletra de l'editor i l'eixida de diferències" -#: optiondialog.cpp:589 +#: optiondialog.cpp:594 #, kde-format msgid "Application font" msgstr "Tipus de lletra de l'aplicació" -#: optiondialog.cpp:594 +#: optiondialog.cpp:599 #, kde-format msgid "File view font" msgstr "Tipus de lletra de la vista de fitxers" -#: optiondialog.cpp:613 +#: optiondialog.cpp:618 #, kde-format msgctxt "Title for color settings page" msgid "Color" msgstr "Color" -#: optiondialog.cpp:614 +#: optiondialog.cpp:619 #, kde-format msgid "Colors Settings" msgstr "Arranjament dels colors" -#: optiondialog.cpp:631 +#: optiondialog.cpp:644 #, kde-format msgid "Editor and Diff Views:" msgstr "Vistes de l'editor i les diferències:" -#: optiondialog.cpp:639 +#: optiondialog.cpp:652 #, kde-format msgid "Foreground color:" msgstr "Color de primer pla:" -#: optiondialog.cpp:647 +#: optiondialog.cpp:660 #, kde-format msgid "Background color:" msgstr "Color de fons:" -#: optiondialog.cpp:657 +#: optiondialog.cpp:670 #, kde-format msgid "Diff background color:" msgstr "Color de fons de les diferències:" -#: optiondialog.cpp:666 +#: optiondialog.cpp:679 #, kde-format msgid "Color A:" msgstr "Color A:" -#: optiondialog.cpp:675 +#: optiondialog.cpp:688 #, kde-format msgid "Color B:" msgstr "Color B:" -#: optiondialog.cpp:684 +#: optiondialog.cpp:697 #, kde-format msgid "Color C:" msgstr "Color C:" -#: optiondialog.cpp:692 +#: optiondialog.cpp:705 #, kde-format msgid "Conflict color:" msgstr "Color del conflicte:" -#: optiondialog.cpp:701 +#: optiondialog.cpp:714 #, kde-format msgid "Current range background color:" msgstr "Color de fons de l'interval actual:" -#: optiondialog.cpp:710 +#: optiondialog.cpp:723 #, kde-format msgid "Current range diff background color:" msgstr "Color de fons de les diferències de l'interval actual:" -#: optiondialog.cpp:718 +#: optiondialog.cpp:731 #, kde-format msgid "Color for manually aligned difference ranges:" -msgstr "Color pels intervals de diferències alineades manualment:" +msgstr "Color per als intervals de diferències alineades manualment:" -#: optiondialog.cpp:725 +#: optiondialog.cpp:738 #, kde-format msgid "Directory Comparison View:" -msgstr "Vista de la comparació de directoris:" +msgstr "Vista en la comparació de directoris:" -#: optiondialog.cpp:731 +#: optiondialog.cpp:744 #, kde-format msgid "Newest file color:" msgstr "Color del fitxer més nou:" -#: optiondialog.cpp:736 +#: optiondialog.cpp:749 #, kde-format msgid "" "Changing this color will only be effective when starting the next directory " @@ -2165,37 +2175,37 @@ "El canvi d'aquest color només serà efectiu quan es comence la propera " "comparació de directoris." -#: optiondialog.cpp:741 +#: optiondialog.cpp:754 #, kde-format msgid "Oldest file color:" msgstr "Color del fitxer més antic:" -#: optiondialog.cpp:750 +#: optiondialog.cpp:763 #, kde-format msgid "Middle age file color:" msgstr "Color del fitxer d'edat intermèdia:" -#: optiondialog.cpp:759 +#: optiondialog.cpp:772 #, kde-format msgid "Color for missing files:" msgstr "Color dels fitxers no disponibles:" -#: optiondialog.cpp:773 +#: optiondialog.cpp:786 #, kde-format msgid "Editor" msgstr "Editor" -#: optiondialog.cpp:774 +#: optiondialog.cpp:787 #, kde-format msgid "Editor Behavior" msgstr "Comportament de l'editor" -#: optiondialog.cpp:787 +#: optiondialog.cpp:809 #, kde-format msgid "Tab inserts spaces" msgstr "El tabulador insereix espais" -#: optiondialog.cpp:791 +#: optiondialog.cpp:813 #, kde-format msgid "" "On: Pressing tab generates the appropriate number of spaces.\n" @@ -2205,28 +2215,28 @@ "blanc.\n" "Desactivat: s'inserirà un caràcter de tabulació." -#: optiondialog.cpp:796 +#: optiondialog.cpp:818 #, kde-format msgid "Tab size:" msgstr "Mida de la tabulació:" -#: optiondialog.cpp:803 +#: optiondialog.cpp:825 #, kde-format msgid "Auto indentation" msgstr "Sagnat automàtic" -#: optiondialog.cpp:807 +#: optiondialog.cpp:829 #, kde-format msgid "On: The indentation of the previous line is used for a new line.\n" msgstr "" "Activat: s'usarà el sagnat de la línia prèvia per a les línies noves.\n" -#: optiondialog.cpp:810 +#: optiondialog.cpp:832 #, kde-format msgid "Auto copy selection" msgstr "Copia la selecció automàticament" -#: optiondialog.cpp:814 +#: optiondialog.cpp:836 #, kde-format msgid "" "On: Any selection is immediately written to the clipboard.\n" @@ -2235,7 +2245,7 @@ "Activat: totes les seleccions es guardaran immediatament al porta-retalls.\n" "Desactivat: haureu de copiar explícitament, p. ex. mitjançant Ctrl-C." -#: optiondialog.cpp:829 +#: optiondialog.cpp:851 #, kde-format msgid "" "Sets the line endings for when an edited file is saved.\n" @@ -2244,12 +2254,12 @@ "Estableix els finals de línia quan es guarden els fitxers editats.\n" "Dos/Windows: CR+LF; UNIX: LF; amb CR=0D, LF=0A" -#: optiondialog.cpp:839 +#: optiondialog.cpp:861 #, kde-format msgid "Diff" msgstr "Diferència" -#: optiondialog.cpp:840 +#: optiondialog.cpp:862 #, kde-format msgid "Diff Settings" msgstr "Arranjament del diff" @@ -2263,12 +2273,12 @@ #. ); #. ++line; #. -#: optiondialog.cpp:865 +#: optiondialog.cpp:896 #, kde-format msgid "Ignore numbers (treat as white space)" msgstr "Ignora els números (tracta'ls com a espais en blanc)" -#: optiondialog.cpp:869 +#: optiondialog.cpp:900 #, kde-format msgid "" "Ignore number characters during line matching phase. (Similar to Ignore " @@ -2279,45 +2289,45 @@ "ignorar els espais en blanc).\n" "Pot ajudar a comparar fitxers amb dades numèriques." -#: optiondialog.cpp:873 +#: optiondialog.cpp:904 #, kde-format msgid "Ignore C/C++ comments (treat as white space)" msgstr "Ignora els comentaris de C/C++ (tracta'ls com a espais en blanc)" -#: optiondialog.cpp:876 +#: optiondialog.cpp:907 #, kde-format msgid "Treat C/C++ comments like white space." msgstr "Tracta els comentaris de C/C++ com si fossin espais en blanc." -#: optiondialog.cpp:879 +#: optiondialog.cpp:910 #, kde-format msgid "Ignore case (treat as white space)" -msgstr "Ignora les majúscules/minúscules (tracta'ls com a espais en blanc)" +msgstr "Ignora les majúscules/minúscules (tracta-les com a espais en blanc)" -#: optiondialog.cpp:883 +#: optiondialog.cpp:914 #, kde-format msgid "Treat case differences like white space changes. ('a'<=>'A')" msgstr "" "Tracta les diferències de caixa com si fossin canvis d'espais en blanc(«a» " "<=> «A»)" -#: optiondialog.cpp:886 +#: optiondialog.cpp:917 #, kde-format msgid "Preprocessor command:" msgstr "Ordre del preprocessador:" -#: optiondialog.cpp:891 +#: optiondialog.cpp:922 #, kde-format msgid "User defined pre-processing. (See the docs for details.)" msgstr "" "Preprocessament definit per l'usuari. (Vegeu la documentació pels detalls)." -#: optiondialog.cpp:894 +#: optiondialog.cpp:925 #, kde-format msgid "Line-matching preprocessor command:" -msgstr "Ordre del preprocessador d'encaix de línies:" +msgstr "Ordre del preprocessador per a la coincidència de les línies:" -#: optiondialog.cpp:899 +#: optiondialog.cpp:930 #, kde-format msgid "" "This pre-processor is only used during line matching.\n" @@ -2326,12 +2336,12 @@ "Aquest preprocessador només s'usa durant l'encaix de línies.\n" "(Per a més detalls vegeu la documentació)." -#: optiondialog.cpp:902 +#: optiondialog.cpp:933 #, kde-format msgid "Try hard (slower)" msgstr "Esforça't (més lent)" -#: optiondialog.cpp:906 +#: optiondialog.cpp:937 #, kde-format msgid "" "Enables the --minimal option for the external diff.\n" @@ -2340,12 +2350,12 @@ "Activa l'opció --minimal pel «diff» extern.\n" "L'anàlisi de fitxers grans serà encara més lenta." -#: optiondialog.cpp:910 +#: optiondialog.cpp:941 #, kde-format msgid "Align B and C for 3 input files" msgstr "Alinea B i C per 3 fitxers d'entrada" -#: optiondialog.cpp:914 +#: optiondialog.cpp:945 #, kde-format msgid "" "Try to align B and C when comparing or merging three input files.\n" @@ -2356,17 +2366,23 @@ "No recomanat per a fusionar, ja que pot ser més complicat.\n" "(Desactivat per defecte)." -#: optiondialog.cpp:926 +#: optiondialog.cpp:956 +#, kde-format +msgctxt "Settings page" +msgid "Merge" +msgstr "Fusionat" + +#: optiondialog.cpp:957 #, kde-format msgid "Merge Settings" msgstr "Arranjament del fusionat" -#: optiondialog.cpp:940 +#: optiondialog.cpp:980 #, kde-format msgid "Auto advance delay (ms):" msgstr "Retard de l'avanç automàtic (ms):" -#: optiondialog.cpp:946 +#: optiondialog.cpp:986 #, kde-format msgid "" "When in Auto-Advance mode the result of the current selection is shown \n" @@ -2376,27 +2392,27 @@ "de la selecció actual durant el temps especificat, abans de saltar al\n" "conflicte següent. Interval: 0-2000 ms" -#: optiondialog.cpp:950 +#: optiondialog.cpp:990 #, kde-format msgid "Show info dialogs" msgstr "Mostra els diàlegs informatius" -#: optiondialog.cpp:953 +#: optiondialog.cpp:993 #, kde-format msgid "Show a dialog with information about the number of conflicts." msgstr "Mostra un diàleg amb informació sobre el nombre de conflictes." -#: optiondialog.cpp:956 +#: optiondialog.cpp:996 #, kde-format msgid "White space 2-file merge default:" msgstr "Opció per defecte dels espais en blanc en la fusió de 2 fitxers:" -#: optiondialog.cpp:961 optiondialog.cpp:974 +#: optiondialog.cpp:1001 optiondialog.cpp:1014 #, kde-format msgid "Manual Choice" msgstr "Selecció manual" -#: optiondialog.cpp:965 optiondialog.cpp:979 +#: optiondialog.cpp:1005 optiondialog.cpp:1019 #, kde-format msgid "" "Allow the merge algorithm to automatically select an input for white-space-" @@ -2405,22 +2421,22 @@ "Permet que l'algoritme de fusió seleccioni automàticament una entrada pels " "canvis d'espais en blanc." -#: optiondialog.cpp:969 +#: optiondialog.cpp:1009 #, kde-format msgid "White space 3-file merge default:" msgstr "Opció per defecte dels espais en blanc en la fusió de 3 fitxers:" -#: optiondialog.cpp:983 +#: optiondialog.cpp:1023 #, kde-format msgid "Automatic Merge Regular Expression" -msgstr "Fusió automàtica de l'expressió regular" +msgstr "Fusió automàtica amb l'expressió regular" -#: optiondialog.cpp:991 smalldialogs.cpp:449 +#: optiondialog.cpp:1031 smalldialogs.cpp:459 #, kde-format msgid "Auto merge regular expression:" -msgstr "Fusiona automàticament l'expressió regular:" +msgstr "Fusiona automàticament amb l'expressió regular:" -#: optiondialog.cpp:996 +#: optiondialog.cpp:1036 #, kde-format msgid "" "Regular expression for lines where KDiff3 should automatically choose one " @@ -2433,32 +2449,33 @@ "Quan una línia amb un conflicte concorda amb l'expressió regular, aleshores\n" "-si està disponible- s'escollirà C, si no, B." -#: optiondialog.cpp:1002 +#: optiondialog.cpp:1042 #, kde-format msgid "Run regular expression auto merge on merge start" msgstr "" -"Executa la fusió automàtica de l'expressió regular a l'inici del fusionat" +"Executa la fusió automàtica amb l'expressió regular a l'inici del fusionat" -#: optiondialog.cpp:1005 +#: optiondialog.cpp:1045 #, kde-format msgid "" "Run the merge for auto merge regular expressions\n" "immediately when a merge starts.\n" msgstr "" -"Fusiona automàticament l'expressió regular\n" +"Fusiona automàticament amb les expressions regulars\n" "just en començar el fusionat.\n" -#: optiondialog.cpp:1010 +#: optiondialog.cpp:1050 #, kde-format msgid "Version Control History Merging" msgstr "Fusió de l'historial del control de versions" -#: optiondialog.cpp:1018 smalldialogs.cpp:476 +#: optiondialog.cpp:1058 smalldialogs.cpp:486 #, kde-format msgid "History start regular expression:" msgstr "Expressió regular per a l'inici de l'historial:" -#: optiondialog.cpp:1023 +# skip-rule: t-pu_sp +#: optiondialog.cpp:1063 #, kde-format msgid "" "Regular expression for the start of the version control history entry.\n" @@ -2470,12 +2487,12 @@ "Normalment aquesta línia conté la paraula clau «$Log$».\n" "Valor per defecte: «.*\\$Log.*\\$.*»" -#: optiondialog.cpp:1029 smalldialogs.cpp:504 +#: optiondialog.cpp:1069 smalldialogs.cpp:514 #, kde-format msgid "History entry start regular expression:" msgstr "Expressió regular per a l'inici d'entrada de l'historial:" -#: optiondialog.cpp:1042 +#: optiondialog.cpp:1082 #, kde-format msgid "" "A version control history entry consists of several lines.\n" @@ -2495,23 +2512,23 @@ "entrades de l'historial.\n" "Per a més detalls, vegeu la documentació." -#: optiondialog.cpp:1050 +#: optiondialog.cpp:1090 #, kde-format msgid "History merge sorting" msgstr "Ordena el fusionat de l'historial" -#: optiondialog.cpp:1053 +#: optiondialog.cpp:1093 #, kde-format msgid "Sort version control history by a key." msgstr "Ordena l'historial del control de versions per una clau." -#: optiondialog.cpp:1063 +#: optiondialog.cpp:1103 #, kde-format msgid "History entry start sort key order:" msgstr "" "Criteri d'ordenació de les claus per a l'inici de l'entrada de l'historial:" -#: optiondialog.cpp:1068 +#: optiondialog.cpp:1108 #, kde-format msgid "" "Each pair of parentheses used in the regular expression for the history " @@ -2530,42 +2547,42 @@ "Si es deixa en blanc, no s'ordenarà.\n" "Per a més detalls, vegeu la documentació." -#: optiondialog.cpp:1079 +#: optiondialog.cpp:1119 #, kde-format msgid "Merge version control history on merge start" msgstr "Fusiona l'historial del control de versions quan es comence a fusionar" -#: optiondialog.cpp:1082 +#: optiondialog.cpp:1122 #, kde-format msgid "Run version control history automerge on merge start." msgstr "" "Executa la fusió automàtica de l'historial del control de versions quan es " "comence a fusionar." -#: optiondialog.cpp:1086 +#: optiondialog.cpp:1126 #, kde-format msgid "Max number of history entries:" msgstr "Nombre màxim d'entrades de l'historial:" # skip-rule: kct-cut -#: optiondialog.cpp:1090 +#: optiondialog.cpp:1130 #, kde-format msgid "Cut off after specified number. Use -1 for infinite number of entries." msgstr "" "Talla a partir d'un número especificat. Useu -1 per a un nombre infinit " "d'entrades." -#: optiondialog.cpp:1094 +#: optiondialog.cpp:1134 #, kde-format msgid "Test your regular expressions" -msgstr "Comprova l'expressió regular" +msgstr "Comprova les expressions regulars" -#: optiondialog.cpp:1099 +#: optiondialog.cpp:1139 #, kde-format msgid "Irrelevant merge command:" msgstr "Ordre de fusió irrellevant:" -#: optiondialog.cpp:1104 +#: optiondialog.cpp:1144 #, kde-format msgid "" "If specified this script is run after automerge\n" @@ -2576,12 +2593,12 @@ "quan no s'hagen detectat altres canvis apropiats.\n" "Cridat amb els paràmetres: nomdefitxer1 nomdefitxer2 nomdefitxer3" -#: optiondialog.cpp:1109 +#: optiondialog.cpp:1149 #, kde-format msgid "Auto save and quit on merge without conflicts" msgstr "En els fusionats sense conflictes guarda i ix automàticament" -#: optiondialog.cpp:1113 +#: optiondialog.cpp:1153 #, kde-format msgid "" "If KDiff3 was started for a file-merge from the command line and all\n" @@ -2594,27 +2611,27 @@ "guarda i ix.\n" "(Similar a l'opció de la línia d'ordres «--auto»)." -#: optiondialog.cpp:1124 optiondialog.cpp:1125 +#: optiondialog.cpp:1164 optiondialog.cpp:1165 #, kde-format msgid "Directory" msgstr "Directori" -#: optiondialog.cpp:1137 +#: optiondialog.cpp:1185 #, kde-format msgid "Recursive directories" msgstr "Directoris recursius" -#: optiondialog.cpp:1140 +#: optiondialog.cpp:1188 #, kde-format msgid "Whether to analyze subdirectories or not." msgstr "Si analitzar o no els subdirectoris." -#: optiondialog.cpp:1142 +#: optiondialog.cpp:1190 #, kde-format msgid "File pattern(s):" msgstr "Patró dels fitxers:" -#: optiondialog.cpp:1148 +#: optiondialog.cpp:1196 #, kde-format msgid "" "Pattern(s) of files to be analyzed. \n" @@ -2625,12 +2642,12 @@ "Comodins: «*» i «?»\n" "Es poden especificar diversos patrons separant-los amb: «;»" -#: optiondialog.cpp:1153 +#: optiondialog.cpp:1201 #, kde-format msgid "File-anti-pattern(s):" msgstr "Negatiu del patró dels fitxers:" -#: optiondialog.cpp:1159 +#: optiondialog.cpp:1207 #, kde-format msgid "" "Pattern(s) of files to be excluded from analysis. \n" @@ -2641,12 +2658,12 @@ "Comodins: «*» i «?»\n" "Es poden especificar diversos patrons separant-los amb: «;»" -#: optiondialog.cpp:1164 +#: optiondialog.cpp:1212 #, kde-format msgid "Dir-anti-pattern(s):" msgstr "Negatiu del patró dels directoris:" -#: optiondialog.cpp:1170 +#: optiondialog.cpp:1218 #, kde-format msgid "" "Pattern(s) of directories to be excluded from analysis. \n" @@ -2657,12 +2674,12 @@ "Comodins: «*» i «?»\n" "Es poden especificar diversos patrons separant-los amb: «;»" -#: optiondialog.cpp:1175 +#: optiondialog.cpp:1223 #, kde-format msgid "Use .cvsignore" msgstr "Usa .cvsignore" -#: optiondialog.cpp:1179 +#: optiondialog.cpp:1227 #, kde-format msgid "" "Extends the antipattern to anything that would be ignored by CVS.\n" @@ -2672,22 +2689,22 @@ "Per mitjà dels fitxers «.cvsignore» locals això pot ser específic de cada " "directori." -#: optiondialog.cpp:1183 +#: optiondialog.cpp:1231 #, kde-format msgid "Find hidden files and directories" -msgstr "Troba als fitxers i directoris ocults" +msgstr "Cerca als fitxers i directoris ocults" -#: optiondialog.cpp:1186 +#: optiondialog.cpp:1234 #, kde-format msgid "Finds hidden files and directories." -msgstr "Troba als fitxers i directoris ocults." +msgstr "Cerca als fitxers i directoris ocults." -#: optiondialog.cpp:1189 +#: optiondialog.cpp:1237 #, kde-format msgid "Follow file links" msgstr "Segueix els enllaços de fitxer" -#: optiondialog.cpp:1193 +#: optiondialog.cpp:1241 #, kde-format msgid "" "On: Compare the file the link points to.\n" @@ -2696,12 +2713,12 @@ "Activat: compara el fitxer al qual apunta l'enllaç.\n" "Desactivat: compara els enllaços." -#: optiondialog.cpp:1197 +#: optiondialog.cpp:1245 #, kde-format msgid "Follow directory links" msgstr "Segueix els enllaços de directori" -#: optiondialog.cpp:1201 +#: optiondialog.cpp:1249 #, kde-format msgid "" "On: Compare the directory the link points to.\n" @@ -2710,13 +2727,13 @@ "Activat: compara el directori al qual apunta l'enllaç.\n" "Desactivat: compara els enllaços." -#: optiondialog.cpp:1210 +#: optiondialog.cpp:1258 #, kde-format msgid "Case sensitive filename comparison" msgstr "" "La comparació dels noms de fitxer és sensible a majúscules i minúscules" -#: optiondialog.cpp:1214 +#: optiondialog.cpp:1262 #, kde-format msgid "" "The directory comparison will compare files or directories when their names " @@ -2729,12 +2746,12 @@ "Activeu aquesta opció si la caixa dels noms ha de coincidir. (Per defecte en " "Windows està desactivat, en altres entorns està activat)." -#: optiondialog.cpp:1218 +#: optiondialog.cpp:1266 #, kde-format msgid "Unfold all subdirectories on load" msgstr "Desplega tots els subdirectoris en carregar" -#: optiondialog.cpp:1222 +#: optiondialog.cpp:1270 #, kde-format msgid "" "On: Unfold all subdirectories when starting a directory diff.\n" @@ -2743,12 +2760,12 @@ "Actiu: Desplega tots els subdirectoris en iniciar un «diff» de directori.\n" "Inactiu: Deixa plegats els subdirectoris." -#: optiondialog.cpp:1226 +#: optiondialog.cpp:1274 #, kde-format msgid "Skip directory status report" msgstr "Omet l'informe d'estat del directori" -#: optiondialog.cpp:1230 +#: optiondialog.cpp:1278 #, kde-format msgid "" "On: Do not show the Directory Comparison Status.\n" @@ -2757,27 +2774,27 @@ "Actiu: No mostra l'estat de comparació del directori.\n" "Inactiu: Mostra el diàleg d'estat en iniciar." -#: optiondialog.cpp:1234 +#: optiondialog.cpp:1282 #, kde-format msgid "File Comparison Mode" msgstr "Mode de comparació dels fitxers" -#: optiondialog.cpp:1239 +#: optiondialog.cpp:1287 #, kde-format msgid "Binary comparison" msgstr "Comparació binària" -#: optiondialog.cpp:1241 +#: optiondialog.cpp:1289 #, kde-format msgid "Binary comparison of each file. (Default)" msgstr "Comparació binària de cada fitxer. (Per defecte)" -#: optiondialog.cpp:1244 +#: optiondialog.cpp:1292 #, kde-format msgid "Full analysis" msgstr "Anàlisi completa" -#: optiondialog.cpp:1246 +#: optiondialog.cpp:1294 #, kde-format msgid "" "Do a full analysis and show statistics information in extra columns.\n" @@ -2788,12 +2805,12 @@ "(Més lent que una comparació binària, més lent encara per als fitxers " "binaris)." -#: optiondialog.cpp:1250 +#: optiondialog.cpp:1298 #, kde-format msgid "Trust the size and modification date (unsafe)" msgstr "Confia en la mida i la data de modificació (insegur)" -#: optiondialog.cpp:1252 +#: optiondialog.cpp:1300 #, kde-format msgid "" "Assume that files are equal if the modification date and file length are " @@ -2808,7 +2825,7 @@ "mostraran com si fossin diferents.\n" "Útil per a directoris grans o xarxes lentes." -#: optiondialog.cpp:1257 +#: optiondialog.cpp:1305 #, kde-format msgid "" "Trust the size and date, but use binary comparison if date does not match " @@ -2817,7 +2834,7 @@ "Confia en la mida i la data dels fitxers però compara'ls binàriament si les " "dates no concorden (insegur)" -#: optiondialog.cpp:1259 +#: optiondialog.cpp:1307 #, kde-format msgid "" "Assume that files are equal if the modification date and file length are " @@ -2830,12 +2847,12 @@ "Si les dates no són iguals però les mides sí, usa la comparació binària.\n" "Útil per a directoris grans o xarxes lentes." -#: optiondialog.cpp:1264 +#: optiondialog.cpp:1312 #, kde-format msgid "Trust the size (unsafe)" msgstr "Confia en la mida (insegur)" -#: optiondialog.cpp:1266 +#: optiondialog.cpp:1314 #, kde-format msgid "" "Assume that files are equal if their file lengths are equal.\n" @@ -2846,12 +2863,12 @@ "Útil per a directoris grans o xarxes lentes quan la data es modifica durant " "la descàrrega." -#: optiondialog.cpp:1273 +#: optiondialog.cpp:1321 #, kde-format msgid "Synchronize directories" msgstr "Sincronitza els directoris" -#: optiondialog.cpp:1277 +#: optiondialog.cpp:1325 #, kde-format msgid "" "Offers to store files in both directories so that\n" @@ -2863,12 +2880,12 @@ "Només funciona quan es comparen dos directoris sense especificar una " "destinació." -#: optiondialog.cpp:1283 +#: optiondialog.cpp:1331 #, kde-format msgid "White space differences considered equal" msgstr "Les diferències en els espais en blanc no es consideren" -#: optiondialog.cpp:1287 +#: optiondialog.cpp:1335 #, kde-format msgid "" "If files differ only by white space consider them equal.\n" @@ -2878,12 +2895,12 @@ "iguals.\n" "Això només és actiu quan s'trieu l'anàlisi completa." -#: optiondialog.cpp:1293 +#: optiondialog.cpp:1341 #, kde-format msgid "Copy newer instead of merging (unsafe)" msgstr "Copia el més nou en comptes de fusionar-los (insegur)" -#: optiondialog.cpp:1297 +#: optiondialog.cpp:1345 #, kde-format msgid "" "Do not look inside, just take the newer file.\n" @@ -2894,12 +2911,12 @@ "(Useu això només si sabeu què esteu fent).\n" "Només és efectiu quan es comparen dos directoris." -#: optiondialog.cpp:1302 +#: optiondialog.cpp:1350 #, kde-format msgid "Backup files (.orig)" msgstr "Fitxers per a còpia de seguretat (.orig)" -#: optiondialog.cpp:1306 +#: optiondialog.cpp:1354 #, kde-format msgid "" "If a file would be saved over an old file, then the old file\n" @@ -2908,17 +2925,17 @@ "Si un fitxer es guarda sobre un fitxer més antic, llavors el fitxer antic\n" "es reanomenarà amb una extensió «.orig» en comptes de ser suprimit." -#: optiondialog.cpp:1382 optiondialog.cpp:1383 +#: optiondialog.cpp:1430 optiondialog.cpp:1431 #, kde-format msgid "Regional Settings" msgstr "Arranjament regional" -#: optiondialog.cpp:1397 +#: optiondialog.cpp:1454 #, kde-format msgid "Use the same encoding for everything:" msgstr "Usa la mateixa codificació a tot arreu:" -#: optiondialog.cpp:1401 +#: optiondialog.cpp:1458 #, kde-format msgid "" "Enable this allows to change all encodings by changing the first only.\n" @@ -2928,17 +2945,17 @@ "primera.\n" "Desactiveu-ho si necessiteu ajustaments diferents per a cada fitxer." -#: optiondialog.cpp:1405 +#: optiondialog.cpp:1462 #, kde-format msgid "Note: Local Encoding is \"%1\"" msgstr "Nota: la codificació local és «%1»" -#: optiondialog.cpp:1409 +#: optiondialog.cpp:1466 #, kde-format msgid "File Encoding for A:" msgstr "Codificació pel fitxer A:" -#: optiondialog.cpp:1416 +#: optiondialog.cpp:1473 #, kde-format msgid "" "If enabled then Unicode (UTF-16 or UTF-8) encoding will be detected.\n" @@ -2951,32 +2968,32 @@ "alternativa.\n" "(La detecció de l'Unicode depèn dels primers bytes d'un fitxer)." -#: optiondialog.cpp:1419 optiondialog.cpp:1430 optiondialog.cpp:1441 +#: optiondialog.cpp:1476 optiondialog.cpp:1487 optiondialog.cpp:1498 #, kde-format msgid "Auto Detect Unicode" msgstr "Detecta automàticament l'Unicode" -#: optiondialog.cpp:1425 +#: optiondialog.cpp:1482 #, kde-format msgid "File Encoding for B:" msgstr "Codificació pel fitxer B:" -#: optiondialog.cpp:1436 +#: optiondialog.cpp:1493 #, kde-format msgid "File Encoding for C:" msgstr "Codificació pel fitxer C:" -#: optiondialog.cpp:1447 +#: optiondialog.cpp:1504 #, kde-format msgid "File Encoding for Merge Output and Saving:" msgstr "Codificació dels fitxers d'eixida en el fusionat i guardar:" -#: optiondialog.cpp:1452 +#: optiondialog.cpp:1509 #, kde-format msgid "Auto Select" msgstr "Selecciona automàticament" -#: optiondialog.cpp:1456 +#: optiondialog.cpp:1513 #, kde-format msgid "" "If enabled then the encoding from the input files is used.\n" @@ -2987,17 +3004,17 @@ "En els casos ambigus un diàleg demanarà a l'usuari que esculli la " "codificació a usar per guardar." -#: optiondialog.cpp:1459 +#: optiondialog.cpp:1516 #, kde-format msgid "File Encoding for Preprocessor Files:" msgstr "Codificació dels fitxers del preprocessador:" -#: optiondialog.cpp:1471 +#: optiondialog.cpp:1528 #, kde-format msgid "Right To Left Language" msgstr "Idioma de dreta a esquerra" -#: optiondialog.cpp:1475 +#: optiondialog.cpp:1532 #, kde-format msgid "" "Some languages are read from right to left.\n" @@ -3006,22 +3023,22 @@ "Alguns idiomes es lligen de dreta a esquerra.\n" "Aquest ajustament canviarà el visor i l'editor per adaptar-s'hi." -#: optiondialog.cpp:1485 +#: optiondialog.cpp:1542 #, kde-format msgid "Integration" msgstr "Integració" -#: optiondialog.cpp:1486 +#: optiondialog.cpp:1543 #, kde-format msgid "Integration Settings" msgstr "Arranjament de la integració" -#: optiondialog.cpp:1499 +#: optiondialog.cpp:1564 #, kde-format msgid "Command line options to ignore:" -msgstr "Opcions de la línia d'ordres a ignorar:" +msgstr "Opcions a ignorar de la línia d'ordres:" -#: optiondialog.cpp:1505 +#: optiondialog.cpp:1570 #, kde-format msgid "" "List of command line options that should be ignored when KDiff3 is used by " @@ -3034,12 +3051,12 @@ "Es poden especificar diversos valors separant-los amb «;».\n" "Això solucionarà l'error «Opció desconeguda»." -#: optiondialog.cpp:1510 +#: optiondialog.cpp:1575 #, kde-format msgid "Quit also via Escape key" msgstr "Ix també en prémer la tecla d'escapada" -#: optiondialog.cpp:1514 +#: optiondialog.cpp:1579 #, kde-format msgid "" "Fast method to exit.\n" @@ -3048,7 +3065,7 @@ "Mètode ràpid per eixir.\n" "Pels qui estigueu acostumats a usar la tecla d'escapada." -#: optiondialog.cpp:1598 +#: optiondialog.cpp:1653 #, kde-format msgid "This resets all options. Not only those of the current topic." msgstr "Això restableix totes les opcions, no només les del tema actual." @@ -3070,7 +3087,7 @@ #: pdiff.cpp:122 #, kde-format msgid "PreprocessorCmd: " -msgstr "OrdreDePreprosessador: " +msgstr "OrdreDelPreprosessador: " #: pdiff.cpp:127 #, kde-format @@ -3104,80 +3121,70 @@ msgid "Disable Unsafe Options" msgstr "Desactiva les opcions insegures" -#: pdiff.cpp:158 +#: pdiff.cpp:160 #, kde-format msgid "Loading A" msgstr "S'està carregant A" -#: pdiff.cpp:167 +#: pdiff.cpp:162 #, kde-format -msgid "Errors occurred during pre-processing of file A." -msgstr "S'han detectat errors durant el preprocés del fitxer A." +msgid "Loading A: %1" +msgstr "S'està carregant A: %1" -#: pdiff.cpp:172 +#: pdiff.cpp:170 #, kde-format msgid "Loading B" msgstr "S'està carregant B" -#: pdiff.cpp:179 -#, kde-format -msgid "Errors occurred during pre-processing of file B." -msgstr "S'han detectat errors durant el preprocés del fitxer B." - -#: pdiff.cpp:202 pdiff.cpp:241 +#: pdiff.cpp:201 pdiff.cpp:237 #, kde-format msgid "Diff: A <-> B" msgstr "Diferència: A <-> B" -#: pdiff.cpp:208 pdiff.cpp:279 pdiff.cpp:293 +#: pdiff.cpp:207 pdiff.cpp:275 pdiff.cpp:289 #, kde-format msgid "Linediff: A <-> B" msgstr "Diferència de línia: A <-> B" -#: pdiff.cpp:225 +#: pdiff.cpp:224 #, kde-format msgid "Loading C" msgstr "S'està carregant C" -#: pdiff.cpp:232 -#, kde-format -msgid "Errors occurred during pre-processing of file C." -msgstr "S'han detectat errors durant el preprocés del fitxer C." - -#: pdiff.cpp:250 +#: pdiff.cpp:246 #, kde-format msgid "Diff: A <-> C" msgstr "Diferència: A <-> C" -#: pdiff.cpp:261 +#: pdiff.cpp:257 #, kde-format msgid "Diff: B <-> C" msgstr "Diferència: B <-> C" -#: pdiff.cpp:283 pdiff.cpp:297 +#: pdiff.cpp:279 pdiff.cpp:293 #, kde-format msgid "Linediff: B <-> C" msgstr "Diferència de línia: B <-> C" -#: pdiff.cpp:287 pdiff.cpp:301 +#: pdiff.cpp:283 pdiff.cpp:297 #, kde-format msgid "Linediff: A <-> C" msgstr "Diferència de línia: A <-> C" -#: pdiff.cpp:829 +#: pdiff.cpp:819 #, kde-format msgid "All input files contain the same text, but are not binary equal." msgstr "" "Tots els fitxers d'entrada contenen el mateix text però no són binàriament " "iguals." -#: pdiff.cpp:835 pdiff.cpp:839 pdiff.cpp:843 +#: pdiff.cpp:825 pdiff.cpp:829 pdiff.cpp:833 #, kde-format msgid "Files %1 and %2 have equal text, but are not binary equal. \n" msgstr "" "Els fitxers %1 i %2 tenen el mateix text, però binàriament no són iguals. \n" -#: pdiff.cpp:853 +#: pdiff.cpp:843 #, kde-format msgid "" "Some input files do not seem to be pure text files.\n" @@ -3189,17 +3196,17 @@ "binàries.\n" "Continueu sota la vostra responsabilitat." -#: pdiff.cpp:863 +#: pdiff.cpp:853 #, kde-format msgid ", B" msgstr ", B" -#: pdiff.cpp:865 +#: pdiff.cpp:855 #, kde-format msgid ", C" msgstr ", C" -#: pdiff.cpp:867 +#: pdiff.cpp:857 #, kde-format msgid "" "Some input characters could not be converted to valid unicode.\n" @@ -3214,78 +3221,73 @@ "responsabilitat.\n" "Els fitxers d'entrada afectats són a %1." -#: pdiff.cpp:1034 +#: pdiff.cpp:1032 #, kde-format msgid "Abort" msgstr "Interromp" -#: pdiff.cpp:1040 pdiff.cpp:1130 +#: pdiff.cpp:1038 pdiff.cpp:1129 #, kde-format msgid "Opening files..." msgstr "S'estan obrint els fitxers..." -#: pdiff.cpp:1107 -#, kde-format -msgid "File open error" -msgstr "S'ha produït un error en obrir el fitxer" - -#: pdiff.cpp:1202 +#: pdiff.cpp:1212 #, kde-format msgid "Cutting selection..." msgstr "S'està tallant la selecció..." -#: pdiff.cpp:1223 +#: pdiff.cpp:1233 #, kde-format msgid "Copying selection to clipboard..." msgstr "S'està copiant la selecció al porta-retalls..." -#: pdiff.cpp:1239 +#: pdiff.cpp:1249 #, kde-format msgid "Inserting clipboard contents..." msgstr "S'està inserint el contingut del porta-retalls..." -#: pdiff.cpp:1695 +#: pdiff.cpp:1705 #, kde-format msgid "Word wrap (Cancel disables word wrap)" msgstr "Ajust de paraula (Cancel·la desactiva l'ajust de paraula)" -#: pdiff.cpp:1696 +#: pdiff.cpp:1706 #, kde-format msgid "Calculating max width for horizontal scrollbar" msgstr "" "S'està calculant l'amplària màxima per a la barra de desplaçament horitzontal" -#: pdiff.cpp:1911 +#: pdiff.cpp:1921 #, kde-format msgid "Save && Continue" msgstr "Guarda i continua" -#: pdiff.cpp:1912 +#: pdiff.cpp:1922 #, kde-format msgid "Continue Without Saving" msgstr "Continua sense guardar" -#: pdiff.cpp:2124 +#: pdiff.cpp:2134 #, kde-format msgid "Search complete." msgstr "S'ha finalitzat la cerca." -#: pdiff.cpp:2124 +#: pdiff.cpp:2134 #, kde-format msgid "Search Complete" msgstr "Cerca completa" -#: pdiff.cpp:2375 +#: pdiff.cpp:2385 #, kde-format msgid "Nothing is selected in either diff input window." msgstr "No hi ha res seleccionat en cap de les finestres de diferències." -#: pdiff.cpp:2375 +#: pdiff.cpp:2385 #, kde-format msgid "Error while adding manual diff range" msgstr "Error en afegir un interval manual de diferències" -#: progress.cpp:59 progress.cpp:71 +#: progress.cpp:61 progress.cpp:73 #, kde-format msgid "&Cancel" msgstr "&Cancel·la" @@ -3295,126 +3297,126 @@ msgid "A (Base):" msgstr "A (Base):" -#: smalldialogs.cpp:68 smalldialogs.cpp:85 smalldialogs.cpp:102 -#: smalldialogs.cpp:144 +#: smalldialogs.cpp:71 smalldialogs.cpp:90 smalldialogs.cpp:109 +#: smalldialogs.cpp:154 #, kde-format msgid "File..." msgstr "Fitxer..." -#: smalldialogs.cpp:70 smalldialogs.cpp:87 smalldialogs.cpp:104 -#: smalldialogs.cpp:146 +#: smalldialogs.cpp:73 smalldialogs.cpp:92 smalldialogs.cpp:111 +#: smalldialogs.cpp:156 #, kde-format msgid "Dir..." msgstr "Directori..." -#: smalldialogs.cpp:96 +#: smalldialogs.cpp:103 #, kde-format msgid "C (Optional):" msgstr "C (opcional):" -#: smalldialogs.cpp:119 +#: smalldialogs.cpp:126 #, kde-format msgid "Swap/Copy Names..." msgstr "Intercanvia/Copia els noms..." -#: smalldialogs.cpp:124 smalldialogs.cpp:125 smalldialogs.cpp:126 +#: smalldialogs.cpp:131 smalldialogs.cpp:132 smalldialogs.cpp:133 #, kde-format msgid "Swap %1<->%2" msgstr "Intercanvia %1<->%2" -#: smalldialogs.cpp:127 smalldialogs.cpp:128 smalldialogs.cpp:129 +#: smalldialogs.cpp:134 smalldialogs.cpp:135 smalldialogs.cpp:136 #, kde-format msgid "Copy %1->Output" msgstr "Copia %1 ->eixida" -#: smalldialogs.cpp:130 smalldialogs.cpp:131 smalldialogs.cpp:132 +#: smalldialogs.cpp:137 smalldialogs.cpp:138 smalldialogs.cpp:139 #, kde-format msgid "Swap %1<->Output" msgstr "Intercanvia %1<->eixida" -#: smalldialogs.cpp:138 +#: smalldialogs.cpp:148 #, kde-format msgid "Output (optional):" msgstr "Eixida (opcional):" -#: smalldialogs.cpp:168 +#: smalldialogs.cpp:178 #, kde-format msgid "Configure..." msgstr "Configura..." -#: smalldialogs.cpp:233 +#: smalldialogs.cpp:243 #, kde-format msgid "Open Directory" msgstr "Obri un directori" -#: smalldialogs.cpp:234 +#: smalldialogs.cpp:244 #, kde-format msgid "Select Output File" msgstr "Selecció del fitxer d'eixida" -#: smalldialogs.cpp:393 +#: smalldialogs.cpp:403 #, kde-format msgid "Search text:" msgstr "Cerca el text:" -#: smalldialogs.cpp:400 +#: smalldialogs.cpp:410 #, kde-format msgid "Case sensitive" msgstr "Distingeix entre majúscules i minúscules" -#: smalldialogs.cpp:403 +#: smalldialogs.cpp:413 #, kde-format msgid "Search A" msgstr "Cerca A" -#: smalldialogs.cpp:408 +#: smalldialogs.cpp:418 #, kde-format msgid "Search B" msgstr "Cerca B" -#: smalldialogs.cpp:413 +#: smalldialogs.cpp:423 #, kde-format msgid "Search C" msgstr "Cerca C" -#: smalldialogs.cpp:418 +#: smalldialogs.cpp:428 #, kde-format msgid "Search output" msgstr "Cerca l'eixida" -#: smalldialogs.cpp:425 +#: smalldialogs.cpp:435 #, kde-format msgid "&Search" msgstr "&Cerca" -#: smalldialogs.cpp:444 +#: smalldialogs.cpp:454 #, kde-format msgid "Regular Expression Tester" msgstr "Provador de l'expressió regular" -#: smalldialogs.cpp:457 +#: smalldialogs.cpp:467 #, kde-format msgid "Example auto merge line:" msgstr "Exemple de línia de fusió automàtica:" -#: smalldialogs.cpp:459 +#: smalldialogs.cpp:469 #, kde-format msgid "To test auto merge, copy a line as used in your files." msgstr "" "Per a provar la fusió automàtica, copieu una línia com les usades als " "vostres fitxers." -#: smalldialogs.cpp:465 smalldialogs.cpp:493 smalldialogs.cpp:529 +#: smalldialogs.cpp:475 smalldialogs.cpp:503 smalldialogs.cpp:539 #, kde-format msgid "Match result:" msgstr "Resultat coincident:" -#: smalldialogs.cpp:484 +#: smalldialogs.cpp:494 #, kde-format msgid "Example history start line (with leading comment):" msgstr "Exemple de línia d'inici de l'historial (amb el comentari inicial):" -#: smalldialogs.cpp:486 +#: smalldialogs.cpp:496 #, kde-format msgid "" "Copy a history start line as used in your files,\n" @@ -3423,19 +3425,19 @@ "Copieu una línia d'inici de l'historial com les usades als vostres fitxers,\n" "incloent-hi el comentari inicial." -#: smalldialogs.cpp:512 +#: smalldialogs.cpp:522 #, kde-format msgid "History sort key order:" msgstr "Criteri d'ordenació de les claus de l'historial:" -#: smalldialogs.cpp:520 +#: smalldialogs.cpp:530 #, kde-format msgid "Example history entry start line (without leading comment):" msgstr "" "Exemple d'inici de línia d'entrada de l'historial (sense el comentari " "inicial):" -#: smalldialogs.cpp:522 +#: smalldialogs.cpp:532 #, kde-format msgid "" "Copy a history entry start line as used in your files,\n" @@ -3445,49 +3447,49 @@ "vostres fitxers,\n" "sense incloure el comentari inicial." -#: smalldialogs.cpp:536 +#: smalldialogs.cpp:546 #, kde-format msgid "Sort key result:" msgstr "Resultat de la clau d'ordenació:" # PERFER: alineament? -#: smalldialogs.cpp:584 smalldialogs.cpp:594 smalldialogs.cpp:614 +#: smalldialogs.cpp:594 smalldialogs.cpp:604 smalldialogs.cpp:624 #, kde-format msgid "Match success." msgstr "Encaix correcte." -#: smalldialogs.cpp:588 smalldialogs.cpp:598 smalldialogs.cpp:620 +#: smalldialogs.cpp:598 smalldialogs.cpp:608 smalldialogs.cpp:630 #, kde-format msgid "Match failed." msgstr "Ha fallat l'encaix." -#: smalldialogs.cpp:605 +#: smalldialogs.cpp:615 #, kde-format msgid "Opening and closing parentheses do not match in regular expression." msgstr "" "L'obertura i tancament de parèntesis no encaixa en l'expressió regular." -#: SourceData.cpp:150 +#: SourceData.cpp:153 #, kde-format msgid "Writing clipboard data to temp file failed." msgstr "Ha fallat l'escriptura de dades del porta-retalls al fitxer temporal." -#: SourceData.cpp:154 +#: SourceData.cpp:157 #, kde-format msgid "From Clipboard" msgstr "Des del porta-retalls" -#: SourceData.cpp:335 +#: SourceData.cpp:348 #, kde-format msgid "%1 is not a normal file." msgstr "%1 no és un fitxer normal." -#: SourceData.cpp:427 +#: SourceData.cpp:440 #, kde-format msgid " Temp file is: %1" msgstr " El fitxer temporal és: %1" -#: SourceData.cpp:432 +#: SourceData.cpp:445 #, kde-format msgid "" "Preprocessing possibly failed. Check this command:\n" @@ -3502,12 +3504,12 @@ "\n" "L'ordre de preprocessament es desactivarà ara." -#: SourceData.cpp:443 SourceData.cpp:512 +#: SourceData.cpp:456 SourceData.cpp:525 #, kde-format msgid "File %1 too large to process. Skipping." msgstr "Fitxer %1 és massa gran per processar. S'omet." -#: SourceData.cpp:487 +#: SourceData.cpp:500 #, kde-format msgid "" "The line-matching-preprocessing possibly failed. Check this command:\n" diff -Nru kdiff3-1.8.01/po/cs/diff_ext.po kdiff3-1.8.3/po/cs/diff_ext.po --- kdiff3-1.8.01/po/cs/diff_ext.po 2019-05-18 01:01:52.000000000 +0000 +++ kdiff3-1.8.3/po/cs/diff_ext.po 2020-06-25 00:18:09.000000000 +0000 @@ -5,8 +5,8 @@ msgid "" msgstr "" "Project-Id-Version: \n" -"Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2019-03-22 03:09+0100\n" +"Report-Msgid-Bugs-To: https://bugs.kde.org\n" +"POT-Creation-Date: 2019-11-04 07:54+0100\n" "PO-Revision-Date: 2018-08-17 14:25+0100\n" "Last-Translator: Vit Pelcak \n" "Language-Team: Czech \n" @@ -17,117 +17,112 @@ "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" "X-Generator: Lokalize 2.0\n" -#: diff_ext.cpp:391 +#: diff_ext.cpp:223 #, kde-format msgid "Compare with %1" msgstr "Porovnat s %1" -#: diff_ext.cpp:392 +#: diff_ext.cpp:224 #, kde-format msgid "Merge with %1" msgstr "Sloučit s %1" -#: diff_ext.cpp:408 +#: diff_ext.cpp:234 #, kde-format msgid "3-way merge with base" msgstr "Trojcestné sloučení se základem" -#: diff_ext.cpp:411 +#: diff_ext.cpp:237 #, kde-format msgid "Save '%1' for later" msgstr "Uložit '%1' na později" -#: diff_ext.cpp:426 +#: diff_ext.cpp:251 #, kde-format msgid "Compare with ..." msgstr "Porovnat s ..." -#: diff_ext.cpp:429 +#: diff_ext.cpp:254 #, kde-format msgid "Clear list" msgstr "Vyčistit seznam" -#: diff_ext.cpp:434 +#: diff_ext.cpp:259 #, kde-format msgid "Compare" msgstr "Porovnat s" -#: diff_ext.cpp:438 +#: diff_ext.cpp:263 #, kde-format msgid "3 way comparison" msgstr "Trojcestné porovnání" -#: diff_ext.cpp:444 +#: diff_ext.cpp:269 #, kde-format msgid "About Diff-Ext ..." msgstr "O aplikaci Diff-Ext..." -#: diff_ext.cpp:515 +#: diff_ext.cpp:340 #, kde-format msgid "(32 Bit)" msgstr "(32 Bit)" -#: diff_ext.cpp:517 -#, kde-format -msgid "(64 Bit)" -msgstr "(64 Bit)" - -#: diff_ext.cpp:518 +#: diff_ext.cpp:342 #, kde-format msgid "Diff-Ext Copyright (c) 2003-2006, Sergey Zorin. All rights reserved.\n" msgstr "" -#: diff_ext.cpp:519 +#: diff_ext.cpp:343 #, kde-format msgid "This software is distributable under the BSD-2-Clause license.\n" msgstr "" -#: diff_ext.cpp:520 +#: diff_ext.cpp:344 #, kde-format msgid "Some extensions for KDiff3 (c) 2006-2013 by Joachim Eibl.\n" msgstr "" -#: diff_ext.cpp:521 +#: diff_ext.cpp:345 #, kde-format msgid "Homepage for Diff-Ext: http://diff-ext.sourceforge.net\n" msgstr "" -#: diff_ext.cpp:522 +#: diff_ext.cpp:346 #, kde-format msgid "About Diff-Ext for KDiff3 " msgstr "" -#: diff_ext.cpp:551 +#: diff_ext.cpp:375 #, kde-format msgid "Compare selected files" msgstr "" -#: diff_ext.cpp:557 diff_ext.cpp:577 +#: diff_ext.cpp:381 diff_ext.cpp:399 #, kde-format msgid "Compare '%1' with '%2'" msgstr "Porovnat '%1' s '%2'" -#: diff_ext.cpp:563 +#: diff_ext.cpp:386 #, kde-format msgid "Save '%1' for later operation" msgstr "" -#: diff_ext.cpp:619 +#: diff_ext.cpp:440 #, kde-format msgid "Could not start KDiff3. Please rerun KDiff3 installation." msgstr "" -#: diff_ext.cpp:620 +#: diff_ext.cpp:441 #, kde-format msgid "Command" msgstr "Příkaz" -#: diff_ext.cpp:621 +#: diff_ext.cpp:442 #, kde-format msgid "CommandLine" msgstr "" -#: diff_ext.cpp:622 +#: diff_ext.cpp:443 #, kde-format msgid "Diff-Ext For KDiff3" msgstr "Diff-Ext pro KDiff3" \ No newline at end of file diff -Nru kdiff3-1.8.01/po/cs/kdiff3fileitemactionplugin.po kdiff3-1.8.3/po/cs/kdiff3fileitemactionplugin.po --- kdiff3-1.8.01/po/cs/kdiff3fileitemactionplugin.po 2019-05-18 01:01:52.000000000 +0000 +++ kdiff3-1.8.3/po/cs/kdiff3fileitemactionplugin.po 2020-06-25 00:18:09.000000000 +0000 @@ -1,12 +1,12 @@ # Copyright (C) YEAR This_file_is_part_of_KDE # This file is distributed under the same license as the PACKAGE package. -# Vít Pelčák , 2011, 2013, 2018. +# Vít Pelčák , 2011, 2013, 2018, 2020. # msgid "" msgstr "" "Project-Id-Version: \n" -"Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2019-03-22 03:09+0100\n" +"Report-Msgid-Bugs-To: https://bugs.kde.org\n" +"POT-Creation-Date: 2019-08-30 07:40+0200\n" "PO-Revision-Date: 2018-06-11 12:45+0100\n" "Last-Translator: Vit Pelcak \n" "Language-Team: Czech \n" @@ -14,7 +14,7 @@ "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: Lokalize 2.0\n" +"X-Generator: Lokalize 20.04.1\n" "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" #: kdiff3fileitemaction.cpp:92 diff -Nru kdiff3-1.8.01/po/cs/kdiff3.po kdiff3-1.8.3/po/cs/kdiff3.po --- kdiff3-1.8.01/po/cs/kdiff3.po 2019-05-18 01:01:52.000000000 +0000 +++ kdiff3-1.8.3/po/cs/kdiff3.po 2020-06-25 00:18:09.000000000 +0000 @@ -1,14 +1,14 @@ # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. -# Vít Pelčák , 2010, 2011, 2013, 2014, 2015, 2017, 2018. +# Vít Pelčák , 2010, 2011, 2013, 2014, 2015, 2017, 2018, 2019, 2020. # Tomáš Chvátal , 2012, 2013. # msgid "" msgstr "" "Project-Id-Version: trunk_kdiff3\n" -"Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2019-04-18 08:02+0200\n" -"PO-Revision-Date: 2018-08-30 16:48+0100\n" +"Report-Msgid-Bugs-To: https://bugs.kde.org\n" +"POT-Creation-Date: 2020-06-22 07:48+0200\n" +"PO-Revision-Date: 2020-01-17 16:17+0100\n" "Last-Translator: Vit Pelcak \n" "Language-Team: Czech \n" "Language: cs\n" @@ -16,7 +16,7 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" -"X-Generator: Lokalize 2.0\n" +"X-Generator: Lokalize 20.04.1\n" #, kde-format msgctxt "NAME OF TRANSLATORS" @@ -28,285 +28,285 @@ msgid "Your emails" msgstr "dom.toretto@seznam.cz" -#: difftextwindow.cpp:412 +#: difftextwindow.cpp:414 #, kde-format msgid "File %1: Line %2" msgstr "Soubor %1: Řádek %2" -#: difftextwindow.cpp:414 +#: difftextwindow.cpp:416 #, kde-format msgid "File %1: Line not available" msgstr "Soubor %1: Řádek není dostupný" -#: difftextwindow.cpp:1780 +#: difftextwindow.cpp:1778 #, kde-format msgid "Encoding:" msgstr "Kódování:" -#: difftextwindow.cpp:1782 mergeresultwindow.cpp:3138 optiondialog.cpp:818 +#: difftextwindow.cpp:1781 mergeresultwindow.cpp:3166 optiondialog.cpp:840 #, kde-format msgid "Line end style:" msgstr "Styl konce řádku:" -#: difftextwindow.cpp:1810 directorymergewindow.cpp:382 -#: directorymergewindow.cpp:433 directorymergewindow.cpp:524 -#: directorymergewindow.cpp:3058 directorymergewindow.cpp:3189 -#: directorymergewindow.cpp:3417 mergeresultwindow.cpp:942 -#: mergeresultwindow.cpp:944 mergeresultwindow.cpp:946 -#: mergeresultwindow.cpp:948 mergeresultwindow.cpp:1814 -#: mergeresultwindow.cpp:3170 mergeresultwindow.cpp:3177 optiondialog.cpp:962 -#: optiondialog.cpp:975 pdiff.cpp:833 pdiff.cpp:835 pdiff.cpp:837 pdiff.cpp:839 -#: pdiff.cpp:861 smalldialogs.cpp:124 smalldialogs.cpp:126 smalldialogs.cpp:127 -#: smalldialogs.cpp:130 +#: difftextwindow.cpp:1809 directorymergewindow.cpp:383 +#: directorymergewindow.cpp:434 directorymergewindow.cpp:525 +#: directorymergewindow.cpp:3072 directorymergewindow.cpp:3203 +#: directorymergewindow.cpp:3431 mergeresultwindow.cpp:970 +#: mergeresultwindow.cpp:972 mergeresultwindow.cpp:974 +#: mergeresultwindow.cpp:976 mergeresultwindow.cpp:1842 +#: mergeresultwindow.cpp:3198 mergeresultwindow.cpp:3205 optiondialog.cpp:1002 +#: optiondialog.cpp:1015 pdiff.cpp:823 pdiff.cpp:825 pdiff.cpp:827 +#: pdiff.cpp:829 pdiff.cpp:851 smalldialogs.cpp:131 smalldialogs.cpp:133 +#: smalldialogs.cpp:134 smalldialogs.cpp:137 #, kde-format msgid "A" msgstr "A" -#: difftextwindow.cpp:1810 directorymergewindow.cpp:384 -#: directorymergewindow.cpp:436 directorymergewindow.cpp:526 -#: directorymergewindow.cpp:3064 directorymergewindow.cpp:3190 -#: directorymergewindow.cpp:3418 mergeresultwindow.cpp:942 -#: mergeresultwindow.cpp:944 mergeresultwindow.cpp:950 -#: mergeresultwindow.cpp:952 mergeresultwindow.cpp:1816 -#: mergeresultwindow.cpp:3172 mergeresultwindow.cpp:3179 optiondialog.cpp:963 -#: optiondialog.cpp:976 pdiff.cpp:833 pdiff.cpp:835 pdiff.cpp:841 pdiff.cpp:843 -#: pdiff.cpp:863 smalldialogs.cpp:124 smalldialogs.cpp:125 smalldialogs.cpp:128 -#: smalldialogs.cpp:131 +#: difftextwindow.cpp:1809 directorymergewindow.cpp:385 +#: directorymergewindow.cpp:437 directorymergewindow.cpp:527 +#: directorymergewindow.cpp:3078 directorymergewindow.cpp:3204 +#: directorymergewindow.cpp:3432 mergeresultwindow.cpp:970 +#: mergeresultwindow.cpp:972 mergeresultwindow.cpp:978 +#: mergeresultwindow.cpp:980 mergeresultwindow.cpp:1844 +#: mergeresultwindow.cpp:3200 mergeresultwindow.cpp:3207 optiondialog.cpp:1003 +#: optiondialog.cpp:1016 pdiff.cpp:823 pdiff.cpp:825 pdiff.cpp:831 +#: pdiff.cpp:833 pdiff.cpp:853 smalldialogs.cpp:131 smalldialogs.cpp:132 +#: smalldialogs.cpp:135 smalldialogs.cpp:138 #, kde-format msgid "B" msgstr "B" -#: difftextwindow.cpp:1810 directorymergewindow.cpp:386 -#: directorymergewindow.cpp:439 directorymergewindow.cpp:528 -#: directorymergewindow.cpp:3070 directorymergewindow.cpp:3191 -#: directorymergewindow.cpp:3419 mergeresultwindow.cpp:946 -#: mergeresultwindow.cpp:948 mergeresultwindow.cpp:950 -#: mergeresultwindow.cpp:952 mergeresultwindow.cpp:1818 -#: mergeresultwindow.cpp:3174 mergeresultwindow.cpp:3181 optiondialog.cpp:977 -#: pdiff.cpp:837 pdiff.cpp:839 pdiff.cpp:841 pdiff.cpp:843 pdiff.cpp:865 -#: smalldialogs.cpp:125 smalldialogs.cpp:126 smalldialogs.cpp:129 -#: smalldialogs.cpp:132 +#: difftextwindow.cpp:1809 directorymergewindow.cpp:387 +#: directorymergewindow.cpp:440 directorymergewindow.cpp:529 +#: directorymergewindow.cpp:3084 directorymergewindow.cpp:3205 +#: directorymergewindow.cpp:3433 mergeresultwindow.cpp:974 +#: mergeresultwindow.cpp:976 mergeresultwindow.cpp:978 +#: mergeresultwindow.cpp:980 mergeresultwindow.cpp:1846 +#: mergeresultwindow.cpp:3202 mergeresultwindow.cpp:3209 optiondialog.cpp:1017 +#: pdiff.cpp:827 pdiff.cpp:829 pdiff.cpp:831 pdiff.cpp:833 pdiff.cpp:855 +#: smalldialogs.cpp:132 smalldialogs.cpp:133 smalldialogs.cpp:136 +#: smalldialogs.cpp:139 #, kde-format msgid "C" msgstr "C" -#: difftextwindow.cpp:1810 +#: difftextwindow.cpp:1809 #, kde-format msgid "A (Base)" msgstr "A (základní)" -#: difftextwindow.cpp:1812 +#: difftextwindow.cpp:1811 #, kde-format msgid "Encoding: %1" msgstr "Kódování: %1" -#: difftextwindow.cpp:1813 mergeresultwindow.cpp:3183 +#: difftextwindow.cpp:1812 mergeresultwindow.cpp:3211 #, kde-format msgid "Unix" msgstr "Unix" -#: difftextwindow.cpp:1813 mergeresultwindow.cpp:3184 +#: difftextwindow.cpp:1812 mergeresultwindow.cpp:3212 #, kde-format msgid "DOS" msgstr "DOS" -#: difftextwindow.cpp:1813 +#: difftextwindow.cpp:1812 #, kde-format msgid "Line end style: %1" msgstr "Styl konce řádku: %1" -#: difftextwindow.cpp:1835 kdiff3.cpp:873 +#: difftextwindow.cpp:1834 kdiff3.cpp:874 #, kde-format msgid "Top line" msgstr "Horní řádek" -#: difftextwindow.cpp:1845 +#: difftextwindow.cpp:1843 #, kde-format msgid "End" msgstr "Konec" -#: difftextwindow.cpp:1903 smalldialogs.cpp:235 +#: difftextwindow.cpp:1901 smalldialogs.cpp:245 #, kde-format msgid "Open File" msgstr "Otevřít soubor" -#: difftextwindow.cpp:1951 optiondialog.cpp:387 +#: difftextwindow.cpp:1943 optiondialog.cpp:389 #, kde-format msgid "Unicode, 8 bit" msgstr "Unicode, 8 bit" -#: difftextwindow.cpp:1966 +#: difftextwindow.cpp:1958 #, kde-format msgid "Other" msgstr "Jiné" -#: directorymergewindow.cpp:409 directorymergewindow.cpp:3424 +#: directorymergewindow.cpp:410 directorymergewindow.cpp:3438 #, kde-format msgid "Copy A to B" msgstr "Zkopírovat A do B" -#: directorymergewindow.cpp:412 directorymergewindow.cpp:3425 +#: directorymergewindow.cpp:413 directorymergewindow.cpp:3439 #, kde-format msgid "Copy B to A" msgstr "Zkopírovat B do A" -#: directorymergewindow.cpp:415 directorymergewindow.cpp:3426 +#: directorymergewindow.cpp:416 directorymergewindow.cpp:3440 #, kde-format msgid "Delete A" msgstr "Smazat A" -#: directorymergewindow.cpp:418 directorymergewindow.cpp:3427 +#: directorymergewindow.cpp:419 directorymergewindow.cpp:3441 #, kde-format msgid "Delete B" msgstr "Smazat B" -#: directorymergewindow.cpp:421 +#: directorymergewindow.cpp:422 #, kde-format msgid "Delete A & B" msgstr "Smazat A a B" -#: directorymergewindow.cpp:424 directorymergewindow.cpp:3429 +#: directorymergewindow.cpp:425 directorymergewindow.cpp:3443 #, kde-format msgid "Merge to A" msgstr "Sloučit do A" -#: directorymergewindow.cpp:427 directorymergewindow.cpp:3430 +#: directorymergewindow.cpp:428 directorymergewindow.cpp:3444 #, kde-format msgid "Merge to B" msgstr "Sloučit do B" -#: directorymergewindow.cpp:430 +#: directorymergewindow.cpp:431 #, kde-format msgid "Merge to A & B" msgstr "Sloučit do A a B" -#: directorymergewindow.cpp:442 directorymergewindow.cpp:3421 +#: directorymergewindow.cpp:443 directorymergewindow.cpp:3435 #, kde-format msgid "Delete (if exists)" msgstr "Smazat (pokud existuje)" -#: directorymergewindow.cpp:445 directorymergewindow.cpp:448 -#: directorymergewindow.cpp:3420 optiondialog.cpp:925 smalldialogs.cpp:113 +#: directorymergewindow.cpp:446 directorymergewindow.cpp:449 +#: directorymergewindow.cpp:3434 smalldialogs.cpp:120 #, kde-format msgid "Merge" msgstr "Sloučení" -#: directorymergewindow.cpp:445 directorymergewindow.cpp:448 +#: directorymergewindow.cpp:446 directorymergewindow.cpp:449 #, kde-format msgid "Merge (manual)" msgstr "Sloučit (ručně)" -#: directorymergewindow.cpp:451 +#: directorymergewindow.cpp:452 #, kde-format msgid "Error: Conflicting File Types" msgstr "Chyba: Konflikt typů souborů" -#: directorymergewindow.cpp:454 +#: directorymergewindow.cpp:455 #, kde-format msgid "Error: Changed and Deleted" msgstr "Chyba: Změněno a smazáno" -#: directorymergewindow.cpp:457 +#: directorymergewindow.cpp:458 #, kde-format msgid "Error: Dates are equal but files are not." msgstr "Chyba: Data jsou shodná, ale soubory nikoliv." -#: directorymergewindow.cpp:471 +#: directorymergewindow.cpp:472 #, kde-format msgid "Done" msgstr "Hotovo" -#: directorymergewindow.cpp:473 +#: directorymergewindow.cpp:474 #, kde-format msgid "Error" msgstr "Chyba" -#: directorymergewindow.cpp:475 +#: directorymergewindow.cpp:476 #, kde-format msgid "Skipped." msgstr "Přeskočeno." -#: directorymergewindow.cpp:477 +#: directorymergewindow.cpp:478 #, kde-format msgid "Not saved." msgstr "Neuloženo." -#: directorymergewindow.cpp:479 +#: directorymergewindow.cpp:480 #, kde-format msgid "In progress..." msgstr "Probíhá..." -#: directorymergewindow.cpp:481 +#: directorymergewindow.cpp:482 #, kde-format msgid "To do." msgstr "Udělat." -#: directorymergewindow.cpp:522 +#: directorymergewindow.cpp:523 #, kde-format msgid "Name" msgstr "Jméno" -#: directorymergewindow.cpp:530 +#: directorymergewindow.cpp:531 #, kde-format msgid "Operation" msgstr "Operace" -#: directorymergewindow.cpp:532 +#: directorymergewindow.cpp:533 #, kde-format msgid "Status" msgstr "Stav" -#: directorymergewindow.cpp:534 +#: directorymergewindow.cpp:535 #, kde-format msgid "Unsolved" msgstr "Nevyřešeno" -#: directorymergewindow.cpp:536 +#: directorymergewindow.cpp:537 #, kde-format msgid "Solved" msgstr "Vyřešeno" -#: directorymergewindow.cpp:538 +#: directorymergewindow.cpp:539 #, kde-format msgid "Nonwhite" msgstr "Nebílý" -#: directorymergewindow.cpp:540 +#: directorymergewindow.cpp:541 #, kde-format msgid "White" msgstr "Bílá" -#: directorymergewindow.cpp:674 +#: directorymergewindow.cpp:676 #, kde-format msgid "Unable to compare non-normal file with normal file." -msgstr "" +msgstr "Nelze porovnat normální a nenormální soubor." -#: directorymergewindow.cpp:688 +#: directorymergewindow.cpp:690 #, kde-format msgid "Mix of links and normal files." msgstr "Směs odkazů a běžných souborů." -#: directorymergewindow.cpp:695 +#: directorymergewindow.cpp:697 #, kde-format msgid "Link: " msgstr "Odkaz: " -#: directorymergewindow.cpp:704 +#: directorymergewindow.cpp:706 #, kde-format msgid "Size. " msgstr "Velikost" -#: directorymergewindow.cpp:718 directorymergewindow.cpp:728 +#: directorymergewindow.cpp:720 directorymergewindow.cpp:730 #, kde-format msgid "Date & Size: " msgstr "Datum a velikost: " -#: directorymergewindow.cpp:748 +#: directorymergewindow.cpp:751 #, kde-format msgid "Comparing file..." msgstr "Porovnávám soubory..." -#: directorymergewindow.cpp:801 +#: directorymergewindow.cpp:813 #, kde-format msgid "" "You are currently doing a directory merge. Are you sure, you want to abort " @@ -315,48 +315,48 @@ "Právě probíhá slučování adresářů. Opravdu si přejete slučování ukončit a " "znovu prohledat adresář?" -#: directorymergewindow.cpp:802 kdiff3.cpp:698 kdiff3.cpp:708 kdiff3.cpp:720 -#: mergeresultwindow.cpp:372 pdiff.cpp:1033 pdiff.cpp:1910 pdiff.cpp:1920 +#: directorymergewindow.cpp:814 kdiff3.cpp:697 kdiff3.cpp:707 kdiff3.cpp:719 +#: mergeresultwindow.cpp:400 pdiff.cpp:1031 pdiff.cpp:1920 pdiff.cpp:1930 #, kde-format msgid "Warning" msgstr "Varování" -#: directorymergewindow.cpp:803 directorymergewindow.cpp:3393 +#: directorymergewindow.cpp:815 directorymergewindow.cpp:3407 #, kde-format msgid "Rescan" msgstr "Znovu prohledat" -#: directorymergewindow.cpp:804 pdiff.cpp:1035 +#: directorymergewindow.cpp:816 pdiff.cpp:1033 #, kde-format msgid "Continue Merging" msgstr "Pokračovat se slučováním" -#: directorymergewindow.cpp:971 +#: directorymergewindow.cpp:984 #, kde-format msgid "Opening of directories failed:" msgstr "Otevírání adresářů selhalo:" -#: directorymergewindow.cpp:975 +#: directorymergewindow.cpp:988 #, 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:980 +#: directorymergewindow.cpp:993 #, 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:985 +#: directorymergewindow.cpp:998 #, 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:988 +#: directorymergewindow.cpp:1001 #, kde-format msgid "Directory Open Error" msgstr "Chyba otvírání adresáře" -#: directorymergewindow.cpp:996 +#: directorymergewindow.cpp:1009 #, kde-format msgid "" "The destination directory must not be the same as A or B when three " @@ -366,49 +366,49 @@ "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:998 +#: directorymergewindow.cpp:1011 #, kde-format msgid "Parameter Warning" msgstr "Varování - parametr" -#: directorymergewindow.cpp:1003 +#: directorymergewindow.cpp:1016 #, kde-format msgid "Scanning directories..." msgstr "Prohledávání adresářů..." -#: directorymergewindow.cpp:1029 +#: directorymergewindow.cpp:1042 #, kde-format msgid "Reading Directory A" msgstr "Načítání adresáře A" -#: directorymergewindow.cpp:1038 +#: directorymergewindow.cpp:1051 #, kde-format msgid "Reading Directory B" msgstr "Načítání adresáře B" -#: directorymergewindow.cpp:1048 +#: directorymergewindow.cpp:1061 #, kde-format msgid "Reading Directory C" msgstr "Načítání adresáře C" -#: directorymergewindow.cpp:1064 +#: directorymergewindow.cpp:1077 #, kde-format msgid "Some subdirectories were not readable in" msgstr "Některé podadresáře byly nečitelné v" -#: directorymergewindow.cpp:1069 +#: directorymergewindow.cpp:1082 #, kde-format msgid "Check the permissions of the subdirectories." msgstr "Zkontrolujte oprávnění podadresářů." -#: directorymergewindow.cpp:1106 kdiff3.cpp:666 kdiff3.cpp:753 kdiff3.cpp:777 -#: kdiff3.cpp:1065 kdiff3.cpp:1086 pdiff.cpp:1116 pdiff.cpp:1170 pdiff.cpp:1218 -#: pdiff.cpp:1234 pdiff.cpp:1277 pdiff.cpp:1301 +#: directorymergewindow.cpp:1119 kdiff3.cpp:665 kdiff3.cpp:752 kdiff3.cpp:776 +#: kdiff3.cpp:1072 kdiff3.cpp:1093 pdiff.cpp:1115 pdiff.cpp:1178 pdiff.cpp:1228 +#: pdiff.cpp:1244 pdiff.cpp:1287 pdiff.cpp:1311 #, kde-format msgid "Ready." msgstr "Připraven." -#: directorymergewindow.cpp:1121 +#: directorymergewindow.cpp:1134 #, kde-format msgid "" "Directory Comparison Status\n" @@ -423,22 +423,22 @@ "Počet shodných souborů: %2\n" "Počet odlišných souborů: %3" -#: directorymergewindow.cpp:1128 +#: directorymergewindow.cpp:1141 #, kde-format msgid "Number of manual merges: %1" msgstr "Počet ručních sloučení: %1" -#: directorymergewindow.cpp:1394 +#: directorymergewindow.cpp:1407 #, kde-format msgid "This affects all merge operations." msgstr "Toto ovlivňuje všechny operace slučování." -#: directorymergewindow.cpp:1395 +#: directorymergewindow.cpp:1408 #, kde-format msgid "Changing All Merge Operations" msgstr "Změna všech operací sloučení" -#: directorymergewindow.cpp:1695 +#: directorymergewindow.cpp:1708 #, kde-format msgid "" "Processing %1 / %2\n" @@ -447,44 +447,44 @@ "Zpracovává se soubor %1 / %2\n" "%3" -#: directorymergewindow.cpp:1738 directorymergewindow.cpp:1742 +#: directorymergewindow.cpp:1751 directorymergewindow.cpp:1755 #, kde-format msgid "Some files could not be processed." -msgstr "" +msgstr "Některé soubory nelze zpracovat." -#: directorymergewindow.cpp:2222 directorymergewindow.cpp:2247 -#: directorymergewindow.cpp:2271 +#: directorymergewindow.cpp:2235 directorymergewindow.cpp:2260 +#: directorymergewindow.cpp:2285 #, kde-format msgid "This operation is currently not possible." msgstr "Tuto operaci nelze nyní provést." -#: directorymergewindow.cpp:2222 directorymergewindow.cpp:2247 -#: directorymergewindow.cpp:2271 directorymergewindow.cpp:2552 +#: directorymergewindow.cpp:2235 directorymergewindow.cpp:2260 +#: directorymergewindow.cpp:2285 directorymergewindow.cpp:2565 #, kde-format msgid "Operation Not Possible" msgstr "Operaci nelze provést" -#: directorymergewindow.cpp:2318 +#: directorymergewindow.cpp:2332 #, kde-format msgid "An error occurred while copying." msgstr "Během kopírování došlo k chybě." -#: directorymergewindow.cpp:2319 directorymergewindow.cpp:2759 +#: directorymergewindow.cpp:2333 directorymergewindow.cpp:2772 #, kde-format msgid "Merge Error" msgstr "Chyba slučování" -#: directorymergewindow.cpp:2396 +#: directorymergewindow.cpp:2410 #, kde-format msgid "Unknown merge operation. (This must never happen!)" msgstr "Neznámá slučovací operace. (Toto se nesmí nikdy stát.)" -#: directorymergewindow.cpp:2441 +#: directorymergewindow.cpp:2455 #, kde-format msgid "Unknown merge operation." msgstr "Neznámá slučovací operace." -#: directorymergewindow.cpp:2454 +#: directorymergewindow.cpp:2468 #, kde-format msgid "" "The merge is about to begin.\n" @@ -504,36 +504,36 @@ "Uvědomte si, že tento program je stále ve stavu beta a proto není vůbec " "žádná ZÁRUKA vaše důležitá data si zazálohujte." -#: directorymergewindow.cpp:2459 +#: directorymergewindow.cpp:2473 #, kde-format msgid "Starting Merge" msgstr "Spouští se sloučení" -#: directorymergewindow.cpp:2460 +#: directorymergewindow.cpp:2474 #, kde-format msgid "Do It" msgstr "Provést" -#: directorymergewindow.cpp:2461 +#: directorymergewindow.cpp:2475 #, kde-format msgid "Simulate It" msgstr "Simulovat" -#: directorymergewindow.cpp:2487 +#: directorymergewindow.cpp:2501 #, kde-format msgid "" "The highlighted item has a different type in the different directories. " "Select what to do." msgstr "Zvýrazněná položka je jiného typu v jiném adresáři. Zvolte co udělat." -#: directorymergewindow.cpp:2491 +#: directorymergewindow.cpp:2505 #, kde-format msgid "" "The modification dates of the file are equal but the files are not. Select " "what to do." msgstr "Datum změny souboru je shodné, soubory však nikoliv. Zvolte co udělat." -#: directorymergewindow.cpp:2495 +#: directorymergewindow.cpp:2509 #, kde-format msgid "" "The highlighted item was changed in one directory and deleted in the other. " @@ -542,7 +542,7 @@ "Zvýrazněná položka byla pozměněna v jednom adresáři a v druhém byla smazána. " "Zvolte co udělat." -#: directorymergewindow.cpp:2552 +#: directorymergewindow.cpp:2565 #, kde-format msgid "" "This operation is currently not possible because directory merge is " @@ -550,7 +550,7 @@ msgstr "" "Tato operace není nyní možná, protože slučování adresáře právě probíhá." -#: directorymergewindow.cpp:2609 +#: directorymergewindow.cpp:2622 #, kde-format msgid "" "There was an error in the last step.\n" @@ -561,32 +561,32 @@ "Přejete si pokračovat s položkou, která chybu způsobila, nebo si přejete " "položku přeskočit?" -#: directorymergewindow.cpp:2611 +#: directorymergewindow.cpp:2624 #, kde-format msgid "Continue merge after an error" msgstr "Pokračovat se slučováním po chybě" -#: directorymergewindow.cpp:2612 +#: directorymergewindow.cpp:2625 #, kde-format msgid "Continue With Last Item" msgstr "Pokračovat s poslední položkou" -#: directorymergewindow.cpp:2613 +#: directorymergewindow.cpp:2626 #, kde-format msgid "Skip Item" msgstr "Přeskočit položku" -#: directorymergewindow.cpp:2709 +#: directorymergewindow.cpp:2722 #, kde-format msgid "Merge operation complete." msgstr "Operace sloučení dokončena." -#: directorymergewindow.cpp:2709 directorymergewindow.cpp:2712 +#: directorymergewindow.cpp:2722 directorymergewindow.cpp:2725 #, kde-format msgid "Merge Complete" msgstr "Slučování dokončeno" -#: directorymergewindow.cpp:2722 +#: directorymergewindow.cpp:2735 #, kde-format msgid "" "Simulated merge complete: Check if you agree with the proposed operations." @@ -594,226 +594,226 @@ "Simulované sloučení dokončeno: Ověřte si, zda souhlasíte s navrženými " "operacemi." -#: directorymergewindow.cpp:2758 +#: directorymergewindow.cpp:2771 #, kde-format msgid "An error occurred. Press OK to see detailed information." msgstr "Vyskytla se chyba. Podrobné informace uvidíte po stisknutí OK." -#: directorymergewindow.cpp:2791 +#: directorymergewindow.cpp:2804 #, kde-format msgid "Error: While deleting %1: Creating backup failed." msgstr "Chyba: při mazání %1: Vytvoření zálohy selhalo." -#: directorymergewindow.cpp:2798 +#: directorymergewindow.cpp:2811 #, kde-format msgid "delete directory recursively( %1 )" msgstr "smazat adresář rekurzivně( %1 )" -#: directorymergewindow.cpp:2800 +#: directorymergewindow.cpp:2813 #, kde-format msgid "delete( %1 )" msgstr "odstranit( %1)" -#: directorymergewindow.cpp:2815 +#: directorymergewindow.cpp:2828 #, kde-format msgid "Error: delete dir operation failed while trying to read the directory." msgstr "Chyba: operace mazání adresáře selhala při pokusu načítání adresáře." -#: directorymergewindow.cpp:2834 +#: directorymergewindow.cpp:2847 #, kde-format msgid "Error: rmdir( %1 ) operation failed." msgstr "Chyba: operace smazat adresář( %1 ) selhala." -#: directorymergewindow.cpp:2844 +#: directorymergewindow.cpp:2857 #, kde-format msgid "Error: delete operation failed." msgstr "Chyba: operace mazání selhala." -#: directorymergewindow.cpp:2870 +#: directorymergewindow.cpp:2884 #, kde-format msgid "manual merge( %1, %2, %3 -> %4)" msgstr "ručně sloučit( %1, %2, %3 -> %4)" -#: directorymergewindow.cpp:2873 +#: directorymergewindow.cpp:2887 #, kde-format msgid "" " Note: After a manual merge the user should continue by pressing F7." msgstr "Pozn.: Po ručním slučování by měl uživatel pokračovat stiskem F7." -#: directorymergewindow.cpp:2900 +#: directorymergewindow.cpp:2914 #, kde-format msgid "Error: copy( %1 -> %2 ) failed.Deleting existing destination failed." msgstr "" "Chyba: Kopírování ( %1 -> %2 ) selhalo. Existující cíl nelze odstranit." -#: directorymergewindow.cpp:2909 +#: directorymergewindow.cpp:2923 #, kde-format msgid "copyLink( %1 -> %2 )" msgstr "Kopírovat odkaz ( %1 -> %2 )" -#: directorymergewindow.cpp:2918 +#: directorymergewindow.cpp:2932 #, kde-format msgid "Error: copyLink failed: Remote links are not yet supported." msgstr "" "Chyba: kopírování odkazu selhalo: Vzdálené odkazy nejsou nyní podporovány." -#: directorymergewindow.cpp:2928 +#: directorymergewindow.cpp:2942 #, kde-format msgid "Error: copyLink failed." msgstr "Chyba: kopírování odkazu selhalo." -#: directorymergewindow.cpp:2953 +#: directorymergewindow.cpp:2967 #, kde-format msgid "copy( %1 -> %2 )" msgstr "kopírovat( %1 -> %2 )" -#: directorymergewindow.cpp:2979 +#: directorymergewindow.cpp:2993 #, kde-format msgid "Error during rename( %1 -> %2 ): Cannot delete existing destination." msgstr "Chyba při přejmenování ( %1 -> %2 ): Existující cíl nelze odstranit." -#: directorymergewindow.cpp:2986 +#: directorymergewindow.cpp:3000 #, kde-format msgid "rename( %1 -> %2 )" msgstr "přejmenovat( %1 -> %2 )" -#: directorymergewindow.cpp:2995 +#: directorymergewindow.cpp:3009 #, kde-format msgid "Error: Rename failed." msgstr "Chyba: Přejmenování selhalo." -#: directorymergewindow.cpp:3013 +#: directorymergewindow.cpp:3027 #, kde-format msgid "Error during makeDir of %1. Cannot delete existing file." msgstr "Chyba při vytvoření adresáře %1. Nelze odstranit existující soubor." -#: directorymergewindow.cpp:3030 +#: directorymergewindow.cpp:3044 #, kde-format msgid "makeDir( %1 )" msgstr "Vytvořit adresář ( %1 )" -#: directorymergewindow.cpp:3040 +#: directorymergewindow.cpp:3054 #, kde-format msgid "Error while creating directory." msgstr "Chyba při vytvoření adresáře." -#: directorymergewindow.cpp:3076 directorymergewindow.cpp:3195 +#: directorymergewindow.cpp:3090 directorymergewindow.cpp:3209 #, kde-format msgid "Dest" msgstr "Cíl" -#: directorymergewindow.cpp:3084 directorymergewindow.cpp:3113 +#: directorymergewindow.cpp:3098 directorymergewindow.cpp:3127 #, kde-format msgid "Dir" msgstr "Adresář" -#: directorymergewindow.cpp:3084 +#: directorymergewindow.cpp:3098 #, kde-format msgid "Type" msgstr "Typ" -#: directorymergewindow.cpp:3084 +#: directorymergewindow.cpp:3098 #, kde-format msgid "Size" msgstr "Velikost" -#: directorymergewindow.cpp:3085 +#: directorymergewindow.cpp:3099 #, kde-format msgid "Attr" msgstr "Atributy" -#: directorymergewindow.cpp:3085 +#: directorymergewindow.cpp:3099 #, kde-format msgid "Last Modification" msgstr "Poslední změna" -#: directorymergewindow.cpp:3085 +#: directorymergewindow.cpp:3099 #, kde-format msgid "Link-Destination" msgstr "Cíl odkazu" -#: directorymergewindow.cpp:3113 +#: directorymergewindow.cpp:3127 #, kde-format msgid "File" msgstr "Soubor" -#: directorymergewindow.cpp:3113 +#: directorymergewindow.cpp:3127 #, kde-format msgid "-Link" msgstr "- Odkaz" -#: directorymergewindow.cpp:3119 +#: directorymergewindow.cpp:3133 #, kde-format msgid "not available" msgstr "nedostupný" -#: directorymergewindow.cpp:3137 +#: directorymergewindow.cpp:3151 #, kde-format msgid "A (Dest): " msgstr "A (cíl): " -#: directorymergewindow.cpp:3141 +#: directorymergewindow.cpp:3155 #, kde-format msgid "A: " -msgstr "" +msgstr "A: " -#: directorymergewindow.cpp:3141 +#: directorymergewindow.cpp:3155 #, kde-format msgid "A (Base): " msgstr "A (základní): " -#: directorymergewindow.cpp:3147 +#: directorymergewindow.cpp:3161 #, kde-format msgid "B (Dest): " msgstr "B (cíl): " -#: directorymergewindow.cpp:3151 +#: directorymergewindow.cpp:3165 #, kde-format msgid "B: " -msgstr "" +msgstr "B: " -#: directorymergewindow.cpp:3156 +#: directorymergewindow.cpp:3170 #, kde-format msgid "C (Dest): " msgstr "C (cíl): " -#: directorymergewindow.cpp:3160 +#: directorymergewindow.cpp:3174 #, kde-format msgid "C: " -msgstr "" +msgstr "C: " -#: directorymergewindow.cpp:3163 +#: directorymergewindow.cpp:3177 #, kde-format msgid "Dest: " msgstr "Cíl: " #. i18n("Saving Directory Merge State ...")); -#: directorymergewindow.cpp:3238 +#: directorymergewindow.cpp:3252 #, kde-format msgid "Save Directory Merge State As..." msgstr "Uložit stav sloučení adresáře jako..." -#: directorymergewindow.cpp:3387 +#: directorymergewindow.cpp:3401 #, kde-format msgid "Start/Continue Directory Merge" msgstr "Spustit / pokračovat ve sloučení adresářů" -#: directorymergewindow.cpp:3388 +#: directorymergewindow.cpp:3402 #, kde-format msgid "Run Operation for Current Item" msgstr "Spustit operaci pro aktuální položku" -#: directorymergewindow.cpp:3389 +#: directorymergewindow.cpp:3403 #, kde-format msgid "Compare Selected File" msgstr "Porovnat vybraný soubor" -#: directorymergewindow.cpp:3390 +#: directorymergewindow.cpp:3404 #, kde-format msgid "Merge Current File" msgstr "Sloučit aktuální soubory" -#: directorymergewindow.cpp:3390 +#: directorymergewindow.cpp:3404 #, kde-format msgid "" "Merge\n" @@ -822,51 +822,51 @@ "Sloučit\n" "Soubor" -#: directorymergewindow.cpp:3391 +#: directorymergewindow.cpp:3405 #, kde-format msgid "Fold All Subdirs" msgstr "Sbalit všechny podadresáře" -#: directorymergewindow.cpp:3392 +#: directorymergewindow.cpp:3406 #, kde-format msgid "Unfold All Subdirs" msgstr "Rozbalit všechny podadresáře" #. i18n("Save Directory Merge State ..."), 0, this, &DirectoryMergeWindow::slotSaveMergeState, ac, "dir_save_merge_state"); #. i18n("Load Directory Merge State ..."), 0, this, &DirectoryMergeWindow::slotLoadMergeState, ac, "dir_load_merge_state"); -#: directorymergewindow.cpp:3396 +#: directorymergewindow.cpp:3410 #, kde-format msgid "Choose A for All Items" msgstr "Zvolit A pro všechny položky" -#: directorymergewindow.cpp:3397 +#: directorymergewindow.cpp:3411 #, kde-format msgid "Choose B for All Items" msgstr "Zvolit B pro všechny položky" -#: directorymergewindow.cpp:3398 +#: directorymergewindow.cpp:3412 #, kde-format msgid "Choose C for All Items" msgstr "Zvolit C pro všechny položky" -#: directorymergewindow.cpp:3399 +#: directorymergewindow.cpp:3413 #, kde-format msgid "Auto-Choose Operation for All Items" msgstr "Automaticky zvolit operaci pro všechny položky" -#: directorymergewindow.cpp:3400 +#: directorymergewindow.cpp:3414 #, kde-format msgid "No Operation for All Items" msgstr "Žádná operace pro všechny položky" #. i18n("Synchronize Directories"), 0, this, &DirectoryMergeWindow::slotSynchronizeDirectories, ac, "dir_synchronize_directories"); #. d->m_pDirChooseNewerFiles = GuiUtils::createAction< KToggleAction >(i18n("Copy Newer Files Instead of Merging"), 0, this, &DirectoryMergeWindow::slotChooseNewerFiles, ac, "dir_choose_newer_files"); -#: directorymergewindow.cpp:3405 +#: directorymergewindow.cpp:3419 #, kde-format msgid "Show Identical Files" msgstr "Zobrazit identické soubory" -#: directorymergewindow.cpp:3405 +#: directorymergewindow.cpp:3419 #, kde-format msgid "" "Identical\n" @@ -875,17 +875,17 @@ "Shodné\n" "Soubory" -#: directorymergewindow.cpp:3406 +#: directorymergewindow.cpp:3420 #, kde-format msgid "Show Different Files" msgstr "Zobrazit rozdílné soubory" -#: directorymergewindow.cpp:3407 +#: directorymergewindow.cpp:3421 #, kde-format msgid "Show Files only in A" msgstr "Zobrazit soubory pouze v A" -#: directorymergewindow.cpp:3407 +#: directorymergewindow.cpp:3421 #, kde-format msgid "" "Files\n" @@ -894,12 +894,12 @@ "Soubory\n" "pouze v A" -#: directorymergewindow.cpp:3408 +#: directorymergewindow.cpp:3422 #, kde-format msgid "Show Files only in B" msgstr "Zobrazit soubory pouze v B" -#: directorymergewindow.cpp:3408 +#: directorymergewindow.cpp:3422 #, kde-format msgid "" "Files\n" @@ -908,12 +908,12 @@ "Soubory\n" "pouze v B" -#: directorymergewindow.cpp:3409 +#: directorymergewindow.cpp:3423 #, kde-format msgid "Show Files only in C" msgstr "Zobrazit soubory pouze v C" -#: directorymergewindow.cpp:3409 +#: directorymergewindow.cpp:3423 #, kde-format msgid "" "Files\n" @@ -922,52 +922,57 @@ "Soubory\n" "pouze v C" -#: directorymergewindow.cpp:3413 +#: directorymergewindow.cpp:3427 #, kde-format msgid "Compare Explicitly Selected Files" msgstr "Porovnat výlučně vybrané soubory" -#: directorymergewindow.cpp:3414 +#: directorymergewindow.cpp:3428 #, kde-format msgid "Merge Explicitly Selected Files" msgstr "Sloučit výlučně vybrané soubory" -#: directorymergewindow.cpp:3416 directorymergewindow.cpp:3423 +#: directorymergewindow.cpp:3430 directorymergewindow.cpp:3437 #, kde-format msgid "Do Nothing" msgstr "Nedělat nic" -#: directorymergewindow.cpp:3428 +#: directorymergewindow.cpp:3442 #, kde-format msgid "Delete A && B" msgstr "Smazat A a B" -#: directorymergewindow.cpp:3431 +#: directorymergewindow.cpp:3445 #, kde-format msgid "Merge to A && B" msgstr "Sloučit do A a B" -#: fileaccess.cpp:462 SourceData.cpp:493 +#: fileaccess.cpp:301 +#, kde-format +msgid "Unable to determine full url. No parent specified." +msgstr "Nelze zjistit plnou URL. Nebyl zadán rodič." + +#: fileaccess.cpp:482 SourceData.cpp:506 #, kde-format msgid "Failed to read file: %1" -msgstr "" +msgstr "Soubor nelze přečíst: %1" -#: fileaccess.cpp:587 +#: fileaccess.cpp:624 #, kde-format msgid "Creating temp copy of %1 failed." msgstr "Vytváření dočasné kopie %1 selhalo." -#: fileaccess.cpp:595 fileaccess.cpp:600 +#: fileaccess.cpp:632 fileaccess.cpp:637 #, kde-format msgid "Opening %1 failed. %2" -msgstr "" +msgstr "Otevření %1 selhalo. %2" -#: fileaccess.cpp:619 fileaccess.cpp:627 +#: fileaccess.cpp:656 fileaccess.cpp:664 #, kde-format msgid "Error reading from %1. %2" -msgstr "" +msgstr "Chyba při čtení z %1. %2" -#: fileaccess.cpp:751 +#: fileaccess.cpp:788 #, kde-format msgid "" "While trying to make a backup, deleting an older backup failed.\n" @@ -976,7 +981,7 @@ "Při pokusu o vytvoření zálohy selhalo odstraňování staré zálohy. \n" "Název souboru: %1" -#: fileaccess.cpp:758 +#: fileaccess.cpp:795 #, kde-format msgid "" "While trying to make a backup, renaming failed.\n" @@ -985,177 +990,177 @@ "Při pokusu o vytvoření zálohy selhalo přejmenování. \n" "Název souboru: %1 -> %2" -#: fileaccess.cpp:828 +#: fileaccess.cpp:865 #, kde-format msgid "Getting file status: %1" msgstr "Získávám stav souboru: %1" -#: fileaccess.cpp:869 +#: fileaccess.cpp:906 #, kde-format msgid "Reading file: %1" msgstr "Načítám soubor: %1" -#: fileaccess.cpp:907 +#: fileaccess.cpp:944 #, kde-format msgid "Writing file: %1" msgstr "Zapisuji soubor: %1" -#: fileaccess.cpp:940 +#: fileaccess.cpp:977 #, kde-format msgid "Out of memory" msgstr "Nedostatek paměti" -#: fileaccess.cpp:976 +#: fileaccess.cpp:1013 #, kde-format msgid "Making directory: %1" msgstr "Vytvářím adresář: %1" -#: fileaccess.cpp:997 +#: fileaccess.cpp:1034 #, kde-format msgid "Removing directory: %1" msgstr "Odstraňuji adresář: %1" -#: fileaccess.cpp:1012 +#: fileaccess.cpp:1049 #, kde-format msgid "Removing file: %1" msgstr "Odstraňuji soubor: %1" -#: fileaccess.cpp:1028 +#: fileaccess.cpp:1065 #, kde-format msgid "Creating symbolic link: %1 -> %2" msgstr "Vytvářím symbolický odkaz: %1 -> %2" -#: fileaccess.cpp:1052 +#: fileaccess.cpp:1089 #, kde-format msgid "Renaming file: %1 -> %2" msgstr "Přejmenovávám soubor: %1 -> %2" -#: fileaccess.cpp:1086 +#: fileaccess.cpp:1123 #, kde-format msgid "Copying file: %1 -> %2" msgstr "Kopíruji soubor: %1 -> %2" -#: fileaccess.cpp:1108 +#: fileaccess.cpp:1145 #, kde-format msgid "Reading directory: %1" msgstr "Načítám adresář: %1" -#: fileaccess.cpp:1162 +#: fileaccess.cpp:1202 #, kde-format msgid "Listing directory: %1" msgstr "Výpis adresáře: %1" -#: kdiff3.cpp:181 +#: kdiff3.cpp:182 #, kde-format msgid "Current Configuration:" msgstr "Aktuální nastavení:" -#: kdiff3.cpp:186 +#: kdiff3.cpp:187 #, kde-format msgid "Config Option Error:" msgstr "Chyba volby nastavení:" -#: kdiff3.cpp:240 +#: kdiff3.cpp:246 #, kde-format msgid "Option --auto used, but no output file specified." msgstr "Je použit parametr --auto, ale není zadán výstupní soubor." -#: kdiff3.cpp:416 +#: kdiff3.cpp:405 #, kde-format msgid "Option --auto ignored for directory comparison." msgstr "Parametr --auto je při porovnávání adresářů ignorován." -#: kdiff3.cpp:460 +#: kdiff3.cpp:449 #, kde-format msgid "Saving failed." msgstr "Ukládání selhalo." -#: kdiff3.cpp:496 pdiff.cpp:1098 +#: kdiff3.cpp:494 pdiff.cpp:1096 #, kde-format msgid "Opening of these files failed:" msgstr "Otevření těchto souborů selhalo:" -#: kdiff3.cpp:505 +#: kdiff3.cpp:503 pdiff.cpp:1105 #, kde-format -msgid "File Open Error" +msgid "File open error" msgstr "Chyba otevírání souboru" -#: kdiff3.cpp:533 +#: kdiff3.cpp:532 #, kde-format msgid "Opens documents for comparison..." msgstr "Otevře dokumenty pro porovnání..." -#: kdiff3.cpp:535 +#: kdiff3.cpp:534 #, kde-format msgid "Reload" msgstr "Obnovit" -#: kdiff3.cpp:538 +#: kdiff3.cpp:537 #, kde-format msgid "Saves the merge result. All conflicts must be solved!" msgstr "Uloží výsledek sloučení. Musí být vyřešeny všechny konflikty." -#: kdiff3.cpp:540 +#: kdiff3.cpp:539 #, kde-format msgid "Saves the current document as..." msgstr "Uloží aktuální dokument jako..." -#: kdiff3.cpp:543 +#: kdiff3.cpp:542 #, kde-format msgid "Print the differences" msgstr "Vytisknout rozdíly" -#: kdiff3.cpp:546 +#: kdiff3.cpp:545 #, kde-format msgid "Quits the application" msgstr "Ukončí aplikaci" -#: kdiff3.cpp:549 +#: kdiff3.cpp:548 #, kde-format 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:552 +#: kdiff3.cpp:551 #, kde-format msgid "Copies the selected section to the clipboard" msgstr "Zkopíruje vybranou sekci do schránky" -#: kdiff3.cpp:554 +#: kdiff3.cpp:553 #, kde-format msgid "Pastes the clipboard contents to current position" msgstr "Vloží současný obsah schránky na aktuální pozici" -#: kdiff3.cpp:557 +#: kdiff3.cpp:556 #, kde-format msgid "Select everything in current window" msgstr "Vybrat vše v aktuálním okně" -#: kdiff3.cpp:560 +#: kdiff3.cpp:559 #, kde-format msgid "Search for a string" msgstr "Hledání řetězce" -#: kdiff3.cpp:562 +#: kdiff3.cpp:561 #, kde-format msgid "Search again for the string" msgstr "Další hledání řetězce" -#: kdiff3.cpp:567 +#: kdiff3.cpp:566 #, kde-format msgid "Enables/disables the statusbar" msgstr "Povolí/zakáže stavový panel" -#: kdiff3.cpp:571 +#: kdiff3.cpp:570 #, kde-format msgid "Configure KDiff3..." msgstr "Nastavit: KDiff3..." -#: kdiff3.cpp:590 +#: kdiff3.cpp:589 #, kde-format msgid "Go to Current Delta" msgstr "Přejít na aktuální rozdíl" -#: kdiff3.cpp:590 +#: kdiff3.cpp:589 #, kde-format msgid "" "Current\n" @@ -1164,12 +1169,12 @@ "Aktuální\n" "rozdíl" -#: kdiff3.cpp:592 +#: kdiff3.cpp:591 #, kde-format msgid "Go to First Delta" msgstr "Přejít na první rozdíl" -#: kdiff3.cpp:592 +#: kdiff3.cpp:591 #, kde-format msgid "" "First\n" @@ -1178,12 +1183,12 @@ "První\n" "rozdíl" -#: kdiff3.cpp:594 +#: kdiff3.cpp:593 #, kde-format msgid "Go to Last Delta" msgstr "Přejít na poslední rozdíl" -#: kdiff3.cpp:594 +#: kdiff3.cpp:593 #, kde-format msgid "" "Last\n" @@ -1192,13 +1197,13 @@ "Poslední\n" "rozdíl" -#: kdiff3.cpp:596 +#: kdiff3.cpp:595 #, kde-format msgid "(Skips white space differences when \"Show White Space\" is disabled.)" msgstr "" "(Přeskočí rozdíly v mezerách pokud je vypnuta volba \"Zobrazit mezery\".)" -#: kdiff3.cpp:597 +#: kdiff3.cpp:596 #, kde-format msgid "" "(Does not skip white space differences even when \"Show White Space\" is " @@ -1207,12 +1212,12 @@ "(Nepřeskočí rozdíly v mezerách ani pokud je vypnuta volba \"Zobrazit mezery" "\".)" -#: kdiff3.cpp:598 +#: kdiff3.cpp:597 #, kde-format msgid "Go to Previous Delta" msgstr "Přejít na předchozí rozdíl" -#: kdiff3.cpp:598 +#: kdiff3.cpp:597 #, kde-format msgid "" "Prev\n" @@ -1221,12 +1226,12 @@ "Předchozí\n" "rozdíl" -#: kdiff3.cpp:600 +#: kdiff3.cpp:599 #, kde-format msgid "Go to Next Delta" msgstr "Přejít na následující rozdíl" -#: kdiff3.cpp:600 +#: kdiff3.cpp:599 #, kde-format msgid "" "Next\n" @@ -1235,12 +1240,12 @@ "Následující\n" "rozdíl" -#: kdiff3.cpp:602 +#: kdiff3.cpp:601 #, kde-format msgid "Go to Previous Conflict" msgstr "Přejít na předchozí konflikt" -#: kdiff3.cpp:602 +#: kdiff3.cpp:601 #, kde-format msgid "" "Prev\n" @@ -1249,12 +1254,12 @@ "Předchozí\n" "Konflikt" -#: kdiff3.cpp:604 +#: kdiff3.cpp:603 #, kde-format msgid "Go to Next Conflict" msgstr "Přejít na následující konflikt" -#: kdiff3.cpp:604 +#: kdiff3.cpp:603 #, kde-format msgid "" "Next\n" @@ -1263,12 +1268,12 @@ "Následující\n" "Konflikt" -#: kdiff3.cpp:606 +#: kdiff3.cpp:605 #, kde-format msgid "Go to Previous Unsolved Conflict" msgstr "Přejít na předchozí nevyřešený konflikt" -#: kdiff3.cpp:606 +#: kdiff3.cpp:605 #, kde-format msgid "" "Prev\n" @@ -1277,12 +1282,12 @@ "Předchozí\n" "Nevyřešeno" -#: kdiff3.cpp:608 +#: kdiff3.cpp:607 #, kde-format msgid "Go to Next Unsolved Conflict" msgstr "Přejít na následující nevyřešený konflikt" -#: kdiff3.cpp:608 +#: kdiff3.cpp:607 #, kde-format msgid "" "Next\n" @@ -1291,12 +1296,12 @@ "Následující\n" "Nevyřešeno" -#: kdiff3.cpp:610 +#: kdiff3.cpp:609 #, kde-format msgid "Select Line(s) From A" msgstr "Vybrat řádky z A" -#: kdiff3.cpp:610 +#: kdiff3.cpp:609 #, kde-format msgid "" "Choose\n" @@ -1305,12 +1310,12 @@ "Zvolit\n" "A" -#: kdiff3.cpp:611 +#: kdiff3.cpp:610 #, kde-format msgid "Select Line(s) From B" msgstr "Vybrat řádky z B" -#: kdiff3.cpp:611 +#: kdiff3.cpp:610 #, kde-format msgid "" "Choose\n" @@ -1319,12 +1324,12 @@ "Zvolit\n" "B" -#: kdiff3.cpp:612 +#: kdiff3.cpp:611 #, kde-format msgid "Select Line(s) From C" msgstr "Vybrat řádky z C" -#: kdiff3.cpp:612 +#: kdiff3.cpp:611 #, kde-format msgid "" "Choose\n" @@ -1333,12 +1338,12 @@ "Zvolit\n" "C" -#: kdiff3.cpp:613 +#: kdiff3.cpp:612 #, kde-format msgid "Automatically Go to Next Unsolved Conflict After Source Selection" msgstr "Po výběru zdroje automaticky přejít na následující nevyřešený konflikt" -#: kdiff3.cpp:613 +#: kdiff3.cpp:612 #, kde-format msgid "" "Auto\n" @@ -1347,12 +1352,12 @@ "Automaticky\n" "Následující" -#: kdiff3.cpp:615 +#: kdiff3.cpp:614 #, kde-format msgid "Show Space && Tabulator Characters" msgstr "Zobrazit znaky mezer a tabulátorů" -#: kdiff3.cpp:615 +#: kdiff3.cpp:614 #, kde-format msgid "" "White\n" @@ -1361,12 +1366,12 @@ "Bílé\n" "znaky" -#: kdiff3.cpp:616 +#: kdiff3.cpp:615 #, kde-format msgid "Show White Space" msgstr "Zobrazit mezery" -#: kdiff3.cpp:616 +#: kdiff3.cpp:615 #, kde-format msgid "" "White\n" @@ -1375,12 +1380,12 @@ "Mezery\n" "rozdíly" -#: kdiff3.cpp:618 +#: kdiff3.cpp:617 #, kde-format msgid "Show Line Numbers" msgstr "Zobrazit čísla řádků" -#: kdiff3.cpp:618 +#: kdiff3.cpp:617 #, kde-format msgid "" "Line\n" @@ -1389,193 +1394,193 @@ "Řádky\n" "čísla" -#: kdiff3.cpp:620 +#: kdiff3.cpp:619 #, kde-format msgid "Automatically Solve Simple Conflicts" msgstr "Automaticky vyřešit jednoduché konflikty" -#: kdiff3.cpp:621 +#: kdiff3.cpp:620 #, kde-format msgid "Set Deltas to Conflicts" msgstr "Všechny rozdíly považovat za konflikty" -#: kdiff3.cpp:622 +#: kdiff3.cpp:621 #, kde-format msgid "Run Regular Expression Auto Merge" msgstr "Spustit regulární výraz automatického sloučení" -#: kdiff3.cpp:623 +#: kdiff3.cpp:622 #, kde-format msgid "Automatically Solve History Conflicts" msgstr "Automaticky vyřešit historii konfliktů" -#: kdiff3.cpp:624 +#: kdiff3.cpp:623 #, kde-format msgid "Split Diff At Selection" msgstr "Rozdělit rozdíl ve výběru" -#: kdiff3.cpp:625 +#: kdiff3.cpp:624 #, kde-format msgid "Join Selected Diffs" msgstr "Sloučit vybrané rozdíly" -#: kdiff3.cpp:627 +#: kdiff3.cpp:626 #, kde-format msgid "Show Window A" msgstr "Zobrazit okno A" -#: kdiff3.cpp:628 +#: kdiff3.cpp:627 #, kde-format msgid "Show Window B" msgstr "Zobrazit okno B" -#: kdiff3.cpp:629 +#: kdiff3.cpp:628 #, kde-format msgid "Show Window C" msgstr "Zobrazit okno C" -#: kdiff3.cpp:631 +#: kdiff3.cpp:630 #, kde-format msgid "Normal Overview" msgstr "Normální přehled" -#: kdiff3.cpp:632 +#: kdiff3.cpp:631 #, kde-format msgid "A vs. B Overview" msgstr "Přehled A proti B" -#: kdiff3.cpp:633 +#: kdiff3.cpp:632 #, kde-format msgid "A vs. C Overview" msgstr "Přehled A proti C" -#: kdiff3.cpp:634 +#: kdiff3.cpp:633 #, kde-format msgid "B vs. C Overview" msgstr "Přehled B proti C" -#: kdiff3.cpp:635 +#: kdiff3.cpp:634 #, kde-format msgid "Word Wrap Diff Windows" msgstr "Zalamovat řádky v porovnávacích oknech" -#: kdiff3.cpp:636 +#: kdiff3.cpp:635 #, kde-format msgid "Add Manual Diff Alignment" msgstr "Ručně přidat zarovnání" -#: kdiff3.cpp:637 +#: kdiff3.cpp:636 #, kde-format msgid "Clear All Manual Diff Alignments" msgstr "Odstranit všechna ručně přidaná zarovnání" -#: kdiff3.cpp:639 +#: kdiff3.cpp:638 #, kde-format msgid "Focus Next Window" msgstr "Zaměřit následující okno" -#: kdiff3.cpp:640 +#: kdiff3.cpp:639 #, kde-format msgid "Focus Prev Window" msgstr "Zaostřit předchozí okno" -#: kdiff3.cpp:641 +#: kdiff3.cpp:640 #, kde-format msgid "Toggle Split Orientation" msgstr "Přepnout orientaci rozdělení" -#: kdiff3.cpp:643 +#: kdiff3.cpp:642 #, kde-format msgid "Dir && Text Split Screen View" msgstr "Zobrazit rozdělení obrazovky na adresáře a text" -#: kdiff3.cpp:645 +#: kdiff3.cpp:644 #, kde-format msgid "Toggle Between Dir && Text View" msgstr "Přepnout mezi zobrazením adresáře textu" -#: kdiff3.cpp:697 pdiff.cpp:1909 +#: kdiff3.cpp:696 pdiff.cpp:1919 #, kde-format msgid "The merge result has not been saved." msgstr "Výsledek sloučení nebyl uložen." -#: kdiff3.cpp:699 +#: kdiff3.cpp:698 #, kde-format msgid "Save && Quit" msgstr "Uložit a ukončit" -#: kdiff3.cpp:700 +#: kdiff3.cpp:699 #, kde-format msgid "Quit Without Saving" msgstr "Ukončit bez uložení" -#: kdiff3.cpp:708 pdiff.cpp:1920 +#: kdiff3.cpp:707 pdiff.cpp:1930 #, kde-format msgid "Saving the merge result failed." msgstr "Uložení výsledku sloučení selhalo." -#: kdiff3.cpp:719 pdiff.cpp:1032 +#: kdiff3.cpp:718 pdiff.cpp:1030 #, kde-format msgid "" "You are currently doing a directory merge. Are you sure, you want to abort?" msgstr "Právě probíhá sloučení adresářů. Opravdu si jej přejete ukončit?" -#: kdiff3.cpp:742 +#: kdiff3.cpp:741 #, kde-format msgid "Saving file..." msgstr "Ukládám soubor..." -#: kdiff3.cpp:759 +#: kdiff3.cpp:758 #, kde-format msgid "Saving file with a new filename..." msgstr "Ukládám soubor pod jiným názvem..." -#: kdiff3.cpp:761 +#: kdiff3.cpp:760 #, kde-format msgid "Save As..." msgstr "Uložit jako..." -#: kdiff3.cpp:820 +#: kdiff3.cpp:819 #, kde-format msgid "Printing not implemented." msgstr "Tisk neimplementován" -#: kdiff3.cpp:857 +#: kdiff3.cpp:858 #, kde-format msgid "Printing..." msgstr "Tisknu..." -#: kdiff3.cpp:943 +#: kdiff3.cpp:948 #, kde-format msgid "Printing page %1 of %2" msgstr "Tisknu stránku %1 z %2" -#: kdiff3.cpp:1000 +#: kdiff3.cpp:1006 #, kde-format msgid " (Selection)" msgstr " (Výběr)" -#: kdiff3.cpp:1027 +#: kdiff3.cpp:1034 #, kde-format msgid "Printing completed." msgstr "Tisk dokončen." -#: kdiff3.cpp:1031 +#: kdiff3.cpp:1038 #, kde-format msgid "Printing aborted." msgstr "Tisk přerušen." -#: kdiff3.cpp:1038 +#: kdiff3.cpp:1045 #, kde-format msgid "Exiting..." msgstr "Ukončuji..." -#: kdiff3.cpp:1049 +#: kdiff3.cpp:1056 #, kde-format msgid "Toggling toolbar..." msgstr "Přepínání panelu nástrojů..." -#: kdiff3.cpp:1070 +#: kdiff3.cpp:1077 #, kde-format msgid "Toggle the statusbar..." msgstr "Přepnout stavový panel..." @@ -1600,7 +1605,7 @@ msgid "Joachim Eibl" msgstr "Joachim Eibl" -#: kdiff3_part.cpp:173 kdiff3_part.cpp:254 +#: kdiff3_part.cpp:174 kdiff3_part.cpp:255 #, kde-format msgid "Could not find files for comparison." msgstr "Nelze nalézt soubory k porovnání." @@ -1618,7 +1623,7 @@ msgstr "Nastavit: KDiff3" #. i18n: ectx: ToolBar (mainToolBar) -#: kdiff3_part.rc:16 main.cpp:88 +#: kdiff3_part.rc:16 main.cpp:89 #, kde-format msgid "KDiff3" msgstr "KDiff3" @@ -1688,84 +1693,89 @@ msgid "Main Toolbar" msgstr "Hlavní panel nástrojů" -#: main.cpp:68 main.cpp:72 +#: main.cpp:69 main.cpp:73 #, kde-format msgid "Ignored. (User defined.)" msgstr "Ignorováno (Nastaveno uživatelem)" -#: main.cpp:92 +#: main.cpp:93 #, kde-format msgid " (64 bit)" msgstr " (64 bit)" -#: main.cpp:94 +#: main.cpp:95 #, kde-format msgid " (32 bit)" msgstr " (32 bit)" -#: main.cpp:95 +#: main.cpp:96 #, kde-format msgid "Tool for Comparison and Merge of Files and Directories" msgstr "Nástroj pro porovnávání a slučování souborů a adresářů" -#: main.cpp:96 +#: main.cpp:97 #, kde-format msgid "(c) 2002-2014 Joachim Eibl, (c) 2017 Michael Reeves KF5/Qt5 port" msgstr "(c) 2002-2014 Joachim Eibl, (c) 2017 Michael Reeves port do KF5/Qt5" -#: main.cpp:112 +#: main.cpp:113 #, kde-format msgid "Merge the input." msgstr "Sloučit vstup." -#: main.cpp:113 +#: main.cpp:114 #, kde-format msgid "Explicit base file. For compatibility with certain tools." msgstr "Výhradně základní soubor. Pro kompatibilitu s některými nástroji." -#: main.cpp:114 +#: main.cpp:115 #, kde-format msgid "Output file. Implies -m. E.g.: -o newfile.txt" msgstr "Název výstupního souboru. Např.: -o novysoubor.txt" -#: main.cpp:115 +#: main.cpp:116 #, kde-format msgid "Output file, again. (For compatibility with certain tools.)" msgstr "Výstupní soubor znovu. (Kvůli kompatibilitě s určitými nástroji.)" -#: main.cpp:116 +#: main.cpp:118 #, kde-format msgid "No GUI if all conflicts are auto-solvable. (Needs -o file)" msgstr "" "Nezobrazovat GUI, pokud jsou všechny konflikty řešitelné automaticky. " "(Potřebuje -o soubor)" -#: main.cpp:117 +#: main.cpp:120 +#, kde-format +msgid "Ignored." +msgstr "Ignorováno." + +#: main.cpp:122 #, kde-format msgid "Do not solve conflicts automatically." msgstr "Neřešit problémy automaticky." -#: main.cpp:118 +#: main.cpp:123 #, kde-format msgid "Visible name replacement for input file 1 (base)." msgstr "Náhradní název pro vstupní soubor 1 (základní)." -#: main.cpp:119 +#: main.cpp:124 #, kde-format msgid "Visible name replacement for input file 2." msgstr "Náhradní název pro vstupní soubor 2." -#: main.cpp:120 +#: main.cpp:125 #, kde-format msgid "Visible name replacement for input file 3." msgstr "Náhradní název pro vstupní soubor 3." -#: main.cpp:121 +#: main.cpp:126 #, kde-format msgid "Alternative visible name replacement. Supply this once for every input." msgstr "Alternativa náhradního názvu. Tato možnost se nabízí pro každý vstup." -#: main.cpp:122 +#: main.cpp:127 #, kde-format msgid "" "Override a config setting. Use once for every setting. E.g.: --cs " @@ -1774,88 +1784,88 @@ "Přepsat konfiguraci. Použít pro každé nastavení. Např.: --cs " "\"AutoAdvance=1\"" -#: main.cpp:123 +#: main.cpp:128 #, kde-format msgid "Show list of config settings and current values." msgstr "Zobrazit seznam všech nastavení a aktuálních hodnot." -#: main.cpp:124 +#: main.cpp:129 #, kde-format msgid "Use a different config file." msgstr "Použít rozdílný konfigurační soubor." -#: main.cpp:127 +#: main.cpp:132 #, kde-format msgid "file1 to open (base, if not specified via --base)" msgstr "první soubor k otevření (základní, pokud není zadáno pomocí --base)" -#: main.cpp:128 +#: main.cpp:133 #, kde-format msgid "file2 to open" msgstr "druhý soubor k otevření" -#: main.cpp:129 +#: main.cpp:134 #, kde-format msgid "file3 to open" msgstr "třetí soubor k otevření" -#: main.cpp:153 +#: main.cpp:158 #, kde-format msgid "See kdiff3 --help for supported options." msgstr "Podporované volby zjistíte pomocí kdiff3 --help." -#: mergeresultwindow.cpp:158 +#: mergeresultwindow.cpp:171 #, kde-format msgid "Choose A Everywhere" msgstr "Všude zvolit A" -#: mergeresultwindow.cpp:159 +#: mergeresultwindow.cpp:172 #, kde-format msgid "Choose B Everywhere" msgstr "Všude zvolit B" -#: mergeresultwindow.cpp:160 +#: mergeresultwindow.cpp:173 #, kde-format msgid "Choose C Everywhere" msgstr "Všude zvolit C" -#: mergeresultwindow.cpp:161 +#: mergeresultwindow.cpp:174 #, kde-format msgid "Choose A for All Unsolved Conflicts" msgstr "Zvolit A pro všechny nevyřešené konflikty" -#: mergeresultwindow.cpp:162 +#: mergeresultwindow.cpp:175 #, kde-format msgid "Choose B for All Unsolved Conflicts" msgstr "Zvolit B pro všechny nevyřešené konflikty" -#: mergeresultwindow.cpp:163 +#: mergeresultwindow.cpp:176 #, kde-format msgid "Choose C for All Unsolved Conflicts" msgstr "Zvolit C pro všechny nevyřešené konflikty" -#: mergeresultwindow.cpp:164 +#: mergeresultwindow.cpp:177 #, kde-format msgid "Choose A for All Unsolved Whitespace Conflicts" msgstr "Zvolit A pro všechny nevyřešené konflikty s mezerami" -#: mergeresultwindow.cpp:165 +#: mergeresultwindow.cpp:178 #, kde-format msgid "Choose B for All Unsolved Whitespace Conflicts" msgstr "Zvolit B pro všechny nevyřešené konflikty s mezerami" -#: mergeresultwindow.cpp:166 +#: mergeresultwindow.cpp:179 #, kde-format msgid "Choose C for All Unsolved Whitespace Conflicts" msgstr "Zvolit C pro všechny nevyřešené konflikty s mezerami" -#: mergeresultwindow.cpp:176 +#: mergeresultwindow.cpp:204 #, kde-format msgid "Number of remaining unsolved conflicts: %1 (of which %2 are whitespace)" msgstr "" "Počet zbývajících nevyřešených konfliktů: %1 (z nichž počet mezer je %2)" -#: mergeresultwindow.cpp:370 +#: mergeresultwindow.cpp:398 #, kde-format msgid "" "The output has been modified.\n" @@ -1864,29 +1874,29 @@ "Výstup byl pozměněn.\n" "Pokud budete pokračovat, vaše změny budou ztraceny." -#: mergeresultwindow.cpp:936 pdiff.cpp:827 +#: mergeresultwindow.cpp:964 pdiff.cpp:817 #, kde-format msgid "All input files are binary equal." msgstr "Všechny vstupní soubory jsou binárně shodné." -#: mergeresultwindow.cpp:938 +#: mergeresultwindow.cpp:966 #, kde-format msgid "All input files contain the same text." msgstr "Všechny vstupní soubory obsahují shodný text." -#: mergeresultwindow.cpp:942 mergeresultwindow.cpp:946 -#: mergeresultwindow.cpp:950 pdiff.cpp:833 pdiff.cpp:837 pdiff.cpp:841 +#: mergeresultwindow.cpp:970 mergeresultwindow.cpp:974 +#: mergeresultwindow.cpp:978 pdiff.cpp:823 pdiff.cpp:827 pdiff.cpp:831 #, kde-format msgid "Files %1 and %2 are binary equal.\n" msgstr "Soubor %1 a %2 je binárně shodný.\n" -#: mergeresultwindow.cpp:944 mergeresultwindow.cpp:948 -#: mergeresultwindow.cpp:952 +#: mergeresultwindow.cpp:972 mergeresultwindow.cpp:976 +#: mergeresultwindow.cpp:980 #, kde-format msgid "Files %1 and %2 have equal text.\n" msgstr "Soubory %1 a %2 mají shodný text.\n" -#: mergeresultwindow.cpp:958 +#: mergeresultwindow.cpp:986 #, kde-format msgid "" "Total number of conflicts: %1\n" @@ -1899,27 +1909,27 @@ "Počet nevyřešených konfliktů: %3\n" "%4" -#: mergeresultwindow.cpp:964 +#: mergeresultwindow.cpp:992 #, kde-format msgid "Conflicts" msgstr "Konflikty" -#: mergeresultwindow.cpp:1873 +#: mergeresultwindow.cpp:1901 #, kde-format msgid "" msgstr "<Žádný řádek ve frontě>" -#: mergeresultwindow.cpp:1881 +#: mergeresultwindow.cpp:1909 #, kde-format msgid "" msgstr "" -#: mergeresultwindow.cpp:1883 mergeresultwindow.cpp:2755 +#: mergeresultwindow.cpp:1911 mergeresultwindow.cpp:2783 #, kde-format msgid "" msgstr "" -#: mergeresultwindow.cpp:2967 +#: mergeresultwindow.cpp:2995 #, kde-format msgid "" "Not all conflicts are solved yet.\n" @@ -1928,12 +1938,12 @@ "Všechny konflikty nejsou vyřešeny.\n" "Soubor nebyl uložen." -#: mergeresultwindow.cpp:2969 mergeresultwindow.cpp:2978 +#: mergeresultwindow.cpp:2997 mergeresultwindow.cpp:3006 #, kde-format msgid "Conflicts Left" msgstr "Zbývající konflikty" -#: mergeresultwindow.cpp:2976 +#: mergeresultwindow.cpp:3004 #, kde-format msgid "" "There is a line end style conflict. Please choose the line end style " @@ -1943,7 +1953,7 @@ "Konflikt druhu konce řádku. Zvolte prosím druh konce řádku ručně.\n" "Soubor nebyl uložen." -#: mergeresultwindow.cpp:2990 +#: mergeresultwindow.cpp:3018 #, kde-format msgid "" "\n" @@ -1954,57 +1964,57 @@ "\n" "Vytvoření zálohy selhalo. Soubor nebyl uložen." -#: mergeresultwindow.cpp:2990 mergeresultwindow.cpp:3038 +#: mergeresultwindow.cpp:3018 mergeresultwindow.cpp:3066 #, kde-format msgid "File Save Error" msgstr "Chyba ukládání souboru" -#: mergeresultwindow.cpp:3038 +#: mergeresultwindow.cpp:3066 #, kde-format msgid "Error while writing." msgstr "Chyba při zápisu." -#: mergeresultwindow.cpp:3110 +#: mergeresultwindow.cpp:3138 #, kde-format msgid "Output:" msgstr "Výstup:" -#: mergeresultwindow.cpp:3123 mergeresultwindow.cpp:3315 +#: mergeresultwindow.cpp:3151 mergeresultwindow.cpp:3343 #, kde-format msgid "[Modified]" msgstr "[Pozměněno]" -#: mergeresultwindow.cpp:3130 +#: mergeresultwindow.cpp:3158 #, kde-format msgid "Encoding for saving:" msgstr "Kódování pro uložení:" -#: mergeresultwindow.cpp:3230 +#: mergeresultwindow.cpp:3258 #, kde-format msgid "Conflict" msgstr "Konflikt" -#: mergeresultwindow.cpp:3262 +#: mergeresultwindow.cpp:3290 #, kde-format msgid "Codec from A: %1" msgstr "Kodek od A: %1" -#: mergeresultwindow.cpp:3264 +#: mergeresultwindow.cpp:3292 #, kde-format msgid "Codec from B: %1" msgstr "Kodek od B: %1" -#: mergeresultwindow.cpp:3266 +#: mergeresultwindow.cpp:3294 #, kde-format msgid "Codec from C: %1" msgstr "Kodek od C: %1" -#: optiondialog.cpp:119 +#: optiondialog.cpp:121 #, kde-format msgid "Change Font" msgstr "Změnit písmo" -#: optiondialog.cpp:135 optiondialog.cpp:145 +#: optiondialog.cpp:137 optiondialog.cpp:147 #, kde-format msgid "" "Font: %1, %2, %3\n" @@ -2015,124 +2025,124 @@ "\n" "Příklad:" -#: optiondialog.cpp:388 +#: optiondialog.cpp:390 #, kde-format msgid "Unicode" msgstr "Unicode" -#: optiondialog.cpp:389 +#: optiondialog.cpp:391 #, kde-format msgid "Latin1" msgstr "Latin1" -#: optiondialog.cpp:408 +#: optiondialog.cpp:410 #, kde-format msgid "Change this if non-ASCII characters are not displayed correctly." msgstr "" "Pokud nejsou jiné než ASCII znaky správně zobrazeny, změňte tuto hodnotu." -#: optiondialog.cpp:491 +#: optiondialog.cpp:495 #, kde-format msgid "Configure" msgstr "Nastavit" -#: optiondialog.cpp:568 +#: optiondialog.cpp:573 #, kde-format msgid "Font" msgstr "Písmo" -#: optiondialog.cpp:570 +#: optiondialog.cpp:575 #, kde-format msgid "Editor & Diff Output Font" msgstr "Výstupní písmo editoru & porovnávání" -#: optiondialog.cpp:589 +#: optiondialog.cpp:594 #, kde-format msgid "Application font" msgstr "Písmo aplikace" -#: optiondialog.cpp:594 +#: optiondialog.cpp:599 #, kde-format msgid "File view font" msgstr "Písmo pro prohlížení souborů" -#: optiondialog.cpp:613 +#: optiondialog.cpp:618 #, kde-format msgctxt "Title for color settings page" msgid "Color" -msgstr "" +msgstr "Barva" -#: optiondialog.cpp:614 +#: optiondialog.cpp:619 #, kde-format msgid "Colors Settings" msgstr "Nastavení barev" -#: optiondialog.cpp:631 +#: optiondialog.cpp:644 #, kde-format msgid "Editor and Diff Views:" msgstr "Zobrazení editoru a porovnávání:" -#: optiondialog.cpp:639 +#: optiondialog.cpp:652 #, kde-format msgid "Foreground color:" msgstr "Barva popředí:" -#: optiondialog.cpp:647 +#: optiondialog.cpp:660 #, kde-format msgid "Background color:" msgstr "Barva pozadí:" -#: optiondialog.cpp:657 +#: optiondialog.cpp:670 #, kde-format msgid "Diff background color:" msgstr "Barva pozadí rozdílů:" -#: optiondialog.cpp:666 +#: optiondialog.cpp:679 #, kde-format msgid "Color A:" msgstr "Barva A:" -#: optiondialog.cpp:675 +#: optiondialog.cpp:688 #, kde-format msgid "Color B:" msgstr "Barva B:" -#: optiondialog.cpp:684 +#: optiondialog.cpp:697 #, kde-format msgid "Color C:" msgstr "Barva C:" -#: optiondialog.cpp:692 +#: optiondialog.cpp:705 #, kde-format msgid "Conflict color:" msgstr "Barva konfliktů:" -#: optiondialog.cpp:701 +#: optiondialog.cpp:714 #, kde-format msgid "Current range background color:" msgstr "Barva pozadí rozdílů v aktuální oblasti:" -#: optiondialog.cpp:710 +#: optiondialog.cpp:723 #, kde-format msgid "Current range diff background color:" msgstr "Barva pozadí aktuální oblasti:" -#: optiondialog.cpp:718 +#: optiondialog.cpp:731 #, kde-format msgid "Color for manually aligned difference ranges:" msgstr "Barva pro ručně upravené rozdíly oblasti:" -#: optiondialog.cpp:725 +#: optiondialog.cpp:738 #, kde-format msgid "Directory Comparison View:" msgstr "Zobrazení porovnání adresářů:" -#: optiondialog.cpp:731 +#: optiondialog.cpp:744 #, kde-format msgid "Newest file color:" msgstr "Barva nejnovějšího souboru:" -#: optiondialog.cpp:736 +#: optiondialog.cpp:749 #, kde-format msgid "" "Changing this color will only be effective when starting the next directory " @@ -2141,37 +2151,37 @@ "Změna této barvy je účinná pouze při spuštění porovnávání následujícího " "adresáře." -#: optiondialog.cpp:741 +#: optiondialog.cpp:754 #, kde-format msgid "Oldest file color:" msgstr "Barva nejstaršího souboru:" -#: optiondialog.cpp:750 +#: optiondialog.cpp:763 #, kde-format msgid "Middle age file color:" msgstr "Barva středně starého souboru:" -#: optiondialog.cpp:759 +#: optiondialog.cpp:772 #, kde-format msgid "Color for missing files:" msgstr "Barva chybějících souborů:" -#: optiondialog.cpp:773 +#: optiondialog.cpp:786 #, kde-format msgid "Editor" msgstr "Editor" -#: optiondialog.cpp:774 +#: optiondialog.cpp:787 #, kde-format msgid "Editor Behavior" msgstr "Chování editoru" -#: optiondialog.cpp:787 +#: optiondialog.cpp:809 #, kde-format msgid "Tab inserts spaces" msgstr "Tabulátor vloží mezery" -#: optiondialog.cpp:791 +#: optiondialog.cpp:813 #, kde-format msgid "" "On: Pressing tab generates the appropriate number of spaces.\n" @@ -2180,27 +2190,27 @@ "Vyp: Stisknutí tabulátoru vygeneruje příslušný počet míst.\n" "Vyp: Bude vložen znak tabulátoru." -#: optiondialog.cpp:796 +#: optiondialog.cpp:818 #, kde-format msgid "Tab size:" msgstr "Velikost tabulátoru:" -#: optiondialog.cpp:803 +#: optiondialog.cpp:825 #, kde-format msgid "Auto indentation" msgstr "Automaticky odsadit" -#: optiondialog.cpp:807 +#: optiondialog.cpp:829 #, kde-format msgid "On: The indentation of the previous line is used for a new line.\n" msgstr "Zap: Odsazení z předchozího řádku bude použito pro nový řádek.\n" -#: optiondialog.cpp:810 +#: optiondialog.cpp:832 #, kde-format msgid "Auto copy selection" msgstr "Automaticky zkopírovat výběr" -#: optiondialog.cpp:814 +#: optiondialog.cpp:836 #, kde-format msgid "" "On: Any selection is immediately written to the clipboard.\n" @@ -2209,7 +2219,7 @@ "Zap: Celý výběr je ihned vložen do schránky.\n" "Vyp: Musíte explicitně zkopírovat např.: pomocí Ctrl-C." -#: optiondialog.cpp:829 +#: optiondialog.cpp:851 #, kde-format msgid "" "Sets the line endings for when an edited file is saved.\n" @@ -2218,12 +2228,12 @@ "Zvolte kódování konce řádku při uložení editovaného souboru.\n" "DOS/Windows: CR+LF; UNIX: LF; with CR=0D, LF=0A" -#: optiondialog.cpp:839 +#: optiondialog.cpp:861 #, kde-format msgid "Diff" msgstr "Porovnávání" -#: optiondialog.cpp:840 +#: optiondialog.cpp:862 #, kde-format msgid "Diff Settings" msgstr "Nastavení porovnávání" @@ -2237,12 +2247,12 @@ #. ); #. ++line; #. -#: optiondialog.cpp:865 +#: optiondialog.cpp:896 #, kde-format msgid "Ignore numbers (treat as white space)" msgstr "Ignorovat čísla (zacházet jako s prázdným místem)" -#: optiondialog.cpp:869 +#: optiondialog.cpp:900 #, kde-format msgid "" "Ignore number characters during line matching phase. (Similar to Ignore " @@ -2253,46 +2263,46 @@ "Ignorovat prázdná místa.)\n" "Může pomoci porovnávat soubory s číselnými znaky." -#: optiondialog.cpp:873 +#: optiondialog.cpp:904 #, kde-format msgid "Ignore C/C++ comments (treat as white space)" msgstr "Ignorovat komentáře C-C++ (zacházet jako s prázdným místem)" -#: optiondialog.cpp:876 +#: optiondialog.cpp:907 #, kde-format msgid "Treat C/C++ comments like white space." msgstr "Považuje komentáře C/C++ za prázdné místo." -#: optiondialog.cpp:879 +#: optiondialog.cpp:910 #, kde-format msgid "Ignore case (treat as white space)" msgstr "Ignorovat velikost písmen (zacházet jako s prázdným místem)" -#: optiondialog.cpp:883 +#: optiondialog.cpp:914 #, kde-format msgid "Treat case differences like white space changes. ('a'<=>'A')" msgstr "" "Nakládá s rozdíly malých a VELKÝCH písmen jako se změnami prázdných míst. " "('a'<=>'A')" -#: optiondialog.cpp:886 +#: optiondialog.cpp:917 #, kde-format msgid "Preprocessor command:" msgstr "Příkaz předběžného zpracování:" -#: optiondialog.cpp:891 +#: optiondialog.cpp:922 #, kde-format msgid "User defined pre-processing. (See the docs for details.)" msgstr "" "Uživatelsky nastavené předběžné zpracování. (Podrobnosti získáte v " "dokumentaci.)" -#: optiondialog.cpp:894 +#: optiondialog.cpp:925 #, kde-format msgid "Line-matching preprocessor command:" msgstr "Příkaz předběžného zpracování shody řádku:" -#: optiondialog.cpp:899 +#: optiondialog.cpp:930 #, kde-format msgid "" "This pre-processor is only used during line matching.\n" @@ -2301,12 +2311,12 @@ "Toto předběžné zpracování je použito pouze při shodě řádku.\n" "(Podrobnosti získáte v dokumentaci.)" -#: optiondialog.cpp:902 +#: optiondialog.cpp:933 #, kde-format msgid "Try hard (slower)" msgstr "Důkladné hledání (pomalejší)" -#: optiondialog.cpp:906 +#: optiondialog.cpp:937 #, kde-format msgid "" "Enables the --minimal option for the external diff.\n" @@ -2315,12 +2325,12 @@ "Pro externí porovnávání přidá parametr --minimal.\n" "Analýza velkých souborů bude mnohem pomalejší." -#: optiondialog.cpp:910 +#: optiondialog.cpp:941 #, kde-format msgid "Align B and C for 3 input files" msgstr "Přizpůsobit B a C pro 3 vstupní soubory" -#: optiondialog.cpp:914 +#: optiondialog.cpp:945 #, kde-format msgid "" "Try to align B and C when comparing or merging three input files.\n" @@ -2333,17 +2343,23 @@ "komplikací.\n" "(Výchozí ve vypnuto.)" -#: optiondialog.cpp:926 +#: optiondialog.cpp:956 +#, kde-format +msgctxt "Settings page" +msgid "Merge" +msgstr "Sloučení" + +#: optiondialog.cpp:957 #, kde-format msgid "Merge Settings" msgstr "Nastavení sloučení" -#: optiondialog.cpp:940 +#: optiondialog.cpp:980 #, kde-format msgid "Auto advance delay (ms):" msgstr "Zpoždění pro automatický posun:" -#: optiondialog.cpp:946 +#: optiondialog.cpp:986 #, kde-format msgid "" "When in Auto-Advance mode the result of the current selection is shown \n" @@ -2352,27 +2368,27 @@ "V režimu automatického posunu bude před přechodem na následující konflikt \n" "zobrazen aktuální výběr po zadaný počet sekund. Rozsah: 0-2000ms" -#: optiondialog.cpp:950 +#: optiondialog.cpp:990 #, kde-format msgid "Show info dialogs" msgstr "Zobrazit informační dialogy" -#: optiondialog.cpp:953 +#: optiondialog.cpp:993 #, kde-format msgid "Show a dialog with information about the number of conflicts." msgstr "Zobrazí dialog s informacemi o počtu konfliktů." -#: optiondialog.cpp:956 +#: optiondialog.cpp:996 #, kde-format msgid "White space 2-file merge default:" msgstr "Výchozí (hodnota) pro mezery při sloučení dvou souborů:" -#: optiondialog.cpp:961 optiondialog.cpp:974 +#: optiondialog.cpp:1001 optiondialog.cpp:1014 #, kde-format msgid "Manual Choice" msgstr "Zvolit ručně" -#: optiondialog.cpp:965 optiondialog.cpp:979 +#: optiondialog.cpp:1005 optiondialog.cpp:1019 #, kde-format msgid "" "Allow the merge algorithm to automatically select an input for white-space-" @@ -2381,22 +2397,22 @@ "Umožní slučovacímu algoritmu automaticky zvolit vstup pouze pro změny " "prázdných míst." -#: optiondialog.cpp:969 +#: optiondialog.cpp:1009 #, kde-format msgid "White space 3-file merge default:" msgstr "Výchozí (hodnota) pro mezery při sloučení třech souborů:" -#: optiondialog.cpp:983 +#: optiondialog.cpp:1023 #, kde-format msgid "Automatic Merge Regular Expression" msgstr "Automatické sloučení regulárních výrazů" -#: optiondialog.cpp:991 smalldialogs.cpp:449 +#: optiondialog.cpp:1031 smalldialogs.cpp:459 #, kde-format msgid "Auto merge regular expression:" msgstr "Automaticky sloučit regulární výraz:" -#: optiondialog.cpp:996 +#: optiondialog.cpp:1036 #, kde-format msgid "" "Regular expression for lines where KDiff3 should automatically choose one " @@ -2408,12 +2424,12 @@ "Pokud řádek s konfliktem odpovídá regulárnímu výrazu, pak bude vybrán C,\n" "pokud je dostupný, v opačném případě B." -#: optiondialog.cpp:1002 +#: optiondialog.cpp:1042 #, kde-format msgid "Run regular expression auto merge on merge start" msgstr "Spustit regulární výraz automatického sloučení při spuštění sloučení" -#: optiondialog.cpp:1005 +#: optiondialog.cpp:1045 #, kde-format msgid "" "Run the merge for auto merge regular expressions\n" @@ -2422,17 +2438,17 @@ "Spustí automatické sloučení regulárních výrazů\n" "ihned při spuštění sloučení.\n" -#: optiondialog.cpp:1010 +#: optiondialog.cpp:1050 #, kde-format msgid "Version Control History Merging" msgstr "Sloučení historie správy verzí" -#: optiondialog.cpp:1018 smalldialogs.cpp:476 +#: optiondialog.cpp:1058 smalldialogs.cpp:486 #, kde-format msgid "History start regular expression:" msgstr "Historie spuštění regulárních výrazů:" -#: optiondialog.cpp:1023 +#: optiondialog.cpp:1063 #, kde-format msgid "" "Regular expression for the start of the version control history entry.\n" @@ -2443,12 +2459,12 @@ "Obvykle tento řádek obsahuje klíčové slovo \"$Log$\".\n" "Výchozí hodnota: \".*\\$Log.*\\$.*\"" -#: optiondialog.cpp:1029 smalldialogs.cpp:504 +#: optiondialog.cpp:1069 smalldialogs.cpp:514 #, kde-format msgid "History entry start regular expression:" msgstr "Regulární výraz pro záznamy historie spouštění:" -#: optiondialog.cpp:1042 +#: optiondialog.cpp:1082 #, kde-format msgid "" "A version control history entry consists of several lines.\n" @@ -2466,22 +2482,22 @@ "historie.\n" "Podrobnosti získáte v dokumentaci." -#: optiondialog.cpp:1050 +#: optiondialog.cpp:1090 #, kde-format msgid "History merge sorting" msgstr "Seřadit historii sloučení" -#: optiondialog.cpp:1053 +#: optiondialog.cpp:1093 #, kde-format msgid "Sort version control history by a key." msgstr "Seřadit historii správy verzí podle klíče." -#: optiondialog.cpp:1063 +#: optiondialog.cpp:1103 #, kde-format msgid "History entry start sort key order:" msgstr "Klíč k setřídění záznamů historie spuštění:" -#: optiondialog.cpp:1068 +#: optiondialog.cpp:1108 #, kde-format msgid "" "Each pair of parentheses used in the regular expression for the history " @@ -2500,38 +2516,38 @@ "Pokud zůstane prázdné, potom k setřídění nedojde.\n" "Podrobnosti získáte v dokumentaci." -#: optiondialog.cpp:1079 +#: optiondialog.cpp:1119 #, kde-format msgid "Merge version control history on merge start" msgstr "Při spuštění sloučení sloučit historii správy verzí" -#: optiondialog.cpp:1082 +#: optiondialog.cpp:1122 #, kde-format msgid "Run version control history automerge on merge start." msgstr "" "Při spuštění sloučení spustí automatické sloučení historie správy verzí." -#: optiondialog.cpp:1086 +#: optiondialog.cpp:1126 #, kde-format msgid "Max number of history entries:" msgstr "Maximální počet záznamů historie:" -#: optiondialog.cpp:1090 +#: optiondialog.cpp:1130 #, kde-format msgid "Cut off after specified number. Use -1 for infinite number of entries." msgstr "Po zadaném čísle odstřihnout. Číslo -1 znamená nekonečno položek." -#: optiondialog.cpp:1094 +#: optiondialog.cpp:1134 #, kde-format msgid "Test your regular expressions" msgstr "Vyzkoušet vaše regulární výrazy" -#: optiondialog.cpp:1099 +#: optiondialog.cpp:1139 #, kde-format msgid "Irrelevant merge command:" msgstr "Příkaz při irelevantním sloučení:" -#: optiondialog.cpp:1104 +#: optiondialog.cpp:1144 #, kde-format msgid "" "If specified this script is run after automerge\n" @@ -2542,12 +2558,12 @@ "pokud nebudou zjištěny další relevantní změny.\n" "Voláno s parametry: NázevSouboru1 NázevSouboru3 NázevSouboru3" -#: optiondialog.cpp:1109 +#: optiondialog.cpp:1149 #, kde-format msgid "Auto save and quit on merge without conflicts" msgstr "Automaticky uložit a ukončit při sloučení bez konfliktů" -#: optiondialog.cpp:1113 +#: optiondialog.cpp:1153 #, kde-format msgid "" "If KDiff3 was started for a file-merge from the command line and all\n" @@ -2560,27 +2576,27 @@ "automatické.\n" "(Podobně jako volba příkazového řádku \"--auto\".)" -#: optiondialog.cpp:1124 optiondialog.cpp:1125 +#: optiondialog.cpp:1164 optiondialog.cpp:1165 #, kde-format msgid "Directory" msgstr "Adresář" -#: optiondialog.cpp:1137 +#: optiondialog.cpp:1185 #, kde-format msgid "Recursive directories" msgstr "Rekurzivní adresáře" -#: optiondialog.cpp:1140 +#: optiondialog.cpp:1188 #, kde-format msgid "Whether to analyze subdirectories or not." msgstr "Zda analyzovat podadresáře, nebo nikoliv." -#: optiondialog.cpp:1142 +#: optiondialog.cpp:1190 #, kde-format msgid "File pattern(s):" msgstr "Maska souborů:" -#: optiondialog.cpp:1148 +#: optiondialog.cpp:1196 #, kde-format msgid "" "Pattern(s) of files to be analyzed. \n" @@ -2591,12 +2607,12 @@ "Zástupné znaky: '*' a '?'\n" " Více šablon lze zadat při použití oddělovače: ';'" -#: optiondialog.cpp:1153 +#: optiondialog.cpp:1201 #, kde-format msgid "File-anti-pattern(s):" msgstr "Anti-maska souborů:" -#: optiondialog.cpp:1159 +#: optiondialog.cpp:1207 #, kde-format msgid "" "Pattern(s) of files to be excluded from analysis. \n" @@ -2607,12 +2623,12 @@ "Zástupné znaky: '*' a '?'\n" " Více šablon lze zadat při použití oddělovače: ';'" -#: optiondialog.cpp:1164 +#: optiondialog.cpp:1212 #, kde-format msgid "Dir-anti-pattern(s):" msgstr "Anti-maska adresářů:" -#: optiondialog.cpp:1170 +#: optiondialog.cpp:1218 #, kde-format msgid "" "Pattern(s) of directories to be excluded from analysis. \n" @@ -2623,12 +2639,12 @@ "Zástupné znaky: '*' a '?'\n" " Více šablon lze zadat při použití oddělovače: ';'" -#: optiondialog.cpp:1175 +#: optiondialog.cpp:1223 #, kde-format msgid "Use .cvsignore" msgstr "Použít .cvsignore" -#: optiondialog.cpp:1179 +#: optiondialog.cpp:1227 #, kde-format msgid "" "Extends the antipattern to anything that would be ignored by CVS.\n" @@ -2637,22 +2653,22 @@ "Rozšiřuje anti-masku na vše co by CVS ignoroval.\n" "Pomocí souborů \".cvsignore\" může být zvolen adresář." -#: optiondialog.cpp:1183 +#: optiondialog.cpp:1231 #, kde-format msgid "Find hidden files and directories" msgstr "Prohledat skryté soubory a adresáře" -#: optiondialog.cpp:1186 +#: optiondialog.cpp:1234 #, kde-format msgid "Finds hidden files and directories." -msgstr "" +msgstr "Prohledat skryté soubory a adresáře." -#: optiondialog.cpp:1189 +#: optiondialog.cpp:1237 #, kde-format msgid "Follow file links" msgstr "Sledovat odkazy souborů" -#: optiondialog.cpp:1193 +#: optiondialog.cpp:1241 #, kde-format msgid "" "On: Compare the file the link points to.\n" @@ -2661,12 +2677,12 @@ "Zap: Porovná soubor na který odkaz ukazuje.\n" "Vyp: Porovná odkazy." -#: optiondialog.cpp:1197 +#: optiondialog.cpp:1245 #, kde-format msgid "Follow directory links" msgstr "Sledovat odkazy adresářů" -#: optiondialog.cpp:1201 +#: optiondialog.cpp:1249 #, kde-format msgid "" "On: Compare the directory the link points to.\n" @@ -2675,12 +2691,12 @@ "Zap: Porovná adresář na který odkaz ukazuje.\n" "Vyp: Porovná odkazy." -#: optiondialog.cpp:1210 +#: optiondialog.cpp:1258 #, kde-format msgid "Case sensitive filename comparison" msgstr "Při porovnávání rozlišovat VELKÁ/malá písmena v názvu souboru" -#: optiondialog.cpp:1214 +#: optiondialog.cpp:1262 #, kde-format msgid "" "The directory comparison will compare files or directories when their names " @@ -2693,12 +2709,12 @@ "Volbu nastavte, pokud se názvy musí shodovat. (Výchozí pro Windows je Vyp., " "v ostatních případech Zap.)" -#: optiondialog.cpp:1218 +#: optiondialog.cpp:1266 #, kde-format msgid "Unfold all subdirectories on load" msgstr "Rozbalit při načtení všechny podsložky" -#: optiondialog.cpp:1222 +#: optiondialog.cpp:1270 #, kde-format msgid "" "On: Unfold all subdirectories when starting a directory diff.\n" @@ -2707,12 +2723,12 @@ "Zap: Rozbalit všechny podsložky při spuštění porovnání adresářů.\n" "Vyp.: Ponechat podsložky sbalené." -#: optiondialog.cpp:1226 +#: optiondialog.cpp:1274 #, kde-format msgid "Skip directory status report" msgstr "Přeskočit hlášení stavu adresáře" -#: optiondialog.cpp:1230 +#: optiondialog.cpp:1278 #, kde-format msgid "" "On: Do not show the Directory Comparison Status.\n" @@ -2721,27 +2737,27 @@ "Zap.: Nezobrazovat stav porovnání adresáře.\n" "Vyp.: Zobrazit stavový dialog při spuštění." -#: optiondialog.cpp:1234 +#: optiondialog.cpp:1282 #, kde-format msgid "File Comparison Mode" msgstr "Režim porovnávání souborů" -#: optiondialog.cpp:1239 +#: optiondialog.cpp:1287 #, kde-format msgid "Binary comparison" msgstr "Binární porovnávání" -#: optiondialog.cpp:1241 +#: optiondialog.cpp:1289 #, kde-format msgid "Binary comparison of each file. (Default)" msgstr "Binárně porovnává každý soubor. (Výchozí)" -#: optiondialog.cpp:1244 +#: optiondialog.cpp:1292 #, kde-format msgid "Full analysis" msgstr "Důkladná analýza" -#: optiondialog.cpp:1246 +#: optiondialog.cpp:1294 #, kde-format msgid "" "Do a full analysis and show statistics information in extra columns.\n" @@ -2751,12 +2767,12 @@ "sloupcích.\n" "(Pomalejší než binární porovnávání, mnohem pomalejší pro binární soubory.)" -#: optiondialog.cpp:1250 +#: optiondialog.cpp:1298 #, kde-format msgid "Trust the size and modification date (unsafe)" msgstr "Důvěřovat velikosti a datu změny (nejisté)" -#: optiondialog.cpp:1252 +#: optiondialog.cpp:1300 #, kde-format msgid "" "Assume that files are equal if the modification date and file length are " @@ -2771,7 +2787,7 @@ "rozdílné.\n" "Vhodné pro velké adresáře, nebo pomalé sítě." -#: optiondialog.cpp:1257 +#: optiondialog.cpp:1305 #, kde-format msgid "" "Trust the size and date, but use binary comparison if date does not match " @@ -2780,7 +2796,7 @@ "Důvěřovat velikosti a datu, ale pokud se datum neshoduje, porovnat binárně " "(nejisté)" -#: optiondialog.cpp:1259 +#: optiondialog.cpp:1307 #, kde-format msgid "" "Assume that files are equal if the modification date and file length are " @@ -2794,12 +2810,12 @@ "porovnávání.\n" "Vhodné pro velké adresáře, nebo pomalé sítě." -#: optiondialog.cpp:1264 +#: optiondialog.cpp:1312 #, kde-format msgid "Trust the size (unsafe)" msgstr "Důvěřovat velikosti (nejisté)" -#: optiondialog.cpp:1266 +#: optiondialog.cpp:1314 #, kde-format msgid "" "Assume that files are equal if their file lengths are equal.\n" @@ -2810,12 +2826,12 @@ "Vhodné pro velké adresáře, nebo pomalé sítě, pokud bude datum upraven při " "stahování." -#: optiondialog.cpp:1273 +#: optiondialog.cpp:1321 #, kde-format msgid "Synchronize directories" msgstr "Synchronizovat adresáře" -#: optiondialog.cpp:1277 +#: optiondialog.cpp:1325 #, kde-format msgid "" "Offers to store files in both directories so that\n" @@ -2826,12 +2842,12 @@ "takže jsou potom oba adresáře stejné.\n" "Funguje pouze při porovnávání dvou adresářů bez určení cíle." -#: optiondialog.cpp:1283 +#: optiondialog.cpp:1331 #, kde-format msgid "White space differences considered equal" msgstr "Při rozdílech v mezerách pokládat za shodné" -#: optiondialog.cpp:1287 +#: optiondialog.cpp:1335 #, kde-format msgid "" "If files differ only by white space consider them equal.\n" @@ -2840,12 +2856,12 @@ "Pokud se soubory liší pouze v mezerách, považují se za shodné.\n" "Aktivní pouze pokud je vybrána volba Důkladná analýza." -#: optiondialog.cpp:1293 +#: optiondialog.cpp:1341 #, kde-format msgid "Copy newer instead of merging (unsafe)" msgstr "Kopírovat novější namísto sloučení (nejisté)" -#: optiondialog.cpp:1297 +#: optiondialog.cpp:1345 #, kde-format msgid "" "Do not look inside, just take the newer file.\n" @@ -2856,12 +2872,12 @@ "(Použít jen pokud víte co děláte.)\n" "Účinné pouze při porovnávání dvou adresářů." -#: optiondialog.cpp:1302 +#: optiondialog.cpp:1350 #, kde-format msgid "Backup files (.orig)" msgstr "Zálohovat soubory (.orig)" -#: optiondialog.cpp:1306 +#: optiondialog.cpp:1354 #, kde-format msgid "" "If a file would be saved over an old file, then the old file\n" @@ -2870,17 +2886,17 @@ "Pokud by byl soubor uložen přes starý soubor, pak bude původní soubor\n" "uložen s příponou '.orig' místo toho, aby byl smazán." -#: optiondialog.cpp:1382 optiondialog.cpp:1383 +#: optiondialog.cpp:1430 optiondialog.cpp:1431 #, kde-format msgid "Regional Settings" msgstr "Místní nastavení" -#: optiondialog.cpp:1397 +#: optiondialog.cpp:1454 #, kde-format msgid "Use the same encoding for everything:" msgstr "Použít stejné kódování pro všechny:" -#: optiondialog.cpp:1401 +#: optiondialog.cpp:1458 #, kde-format msgid "" "Enable this allows to change all encodings by changing the first only.\n" @@ -2890,17 +2906,17 @@ "prvního.\n" "Vypnout, pokud je požadováno rozdílné nastavení." -#: optiondialog.cpp:1405 +#: optiondialog.cpp:1462 #, kde-format msgid "Note: Local Encoding is \"%1\"" msgstr "Pozn.: Místní kódování je \"%1\"" -#: optiondialog.cpp:1409 +#: optiondialog.cpp:1466 #, kde-format msgid "File Encoding for A:" msgstr "Kódování souboru A:" -#: optiondialog.cpp:1416 +#: optiondialog.cpp:1473 #, kde-format msgid "" "If enabled then Unicode (UTF-16 or UTF-8) encoding will be detected.\n" @@ -2912,32 +2928,32 @@ "Pokud není soubor Unicode, pak bude vybrané kódování použito jako náhradní.\n" "(Detekce Unicode závisí na prvním bajtu souboru.)" -#: optiondialog.cpp:1419 optiondialog.cpp:1430 optiondialog.cpp:1441 +#: optiondialog.cpp:1476 optiondialog.cpp:1487 optiondialog.cpp:1498 #, kde-format msgid "Auto Detect Unicode" msgstr "Automaticky rozeznat Unicode" -#: optiondialog.cpp:1425 +#: optiondialog.cpp:1482 #, kde-format msgid "File Encoding for B:" msgstr "Kódování souboru B:" -#: optiondialog.cpp:1436 +#: optiondialog.cpp:1493 #, kde-format msgid "File Encoding for C:" msgstr "Kódování souboru C:" -#: optiondialog.cpp:1447 +#: optiondialog.cpp:1504 #, kde-format msgid "File Encoding for Merge Output and Saving:" msgstr "Kódování souboru pro výstup sloučení a uložení:" -#: optiondialog.cpp:1452 +#: optiondialog.cpp:1509 #, kde-format msgid "Auto Select" msgstr "Automaticky vybrat" -#: optiondialog.cpp:1456 +#: optiondialog.cpp:1513 #, kde-format msgid "" "If enabled then the encoding from the input files is used.\n" @@ -2948,17 +2964,17 @@ "V nejasných případech bude uživatel dotázán dialogem na výběr kódování pro " "uložení." -#: optiondialog.cpp:1459 +#: optiondialog.cpp:1516 #, kde-format msgid "File Encoding for Preprocessor Files:" msgstr "Kódování souboru pro soubory předběžného zpracování:" -#: optiondialog.cpp:1471 +#: optiondialog.cpp:1528 #, kde-format msgid "Right To Left Language" msgstr "Jazyky čtené zprava doleva" -#: optiondialog.cpp:1475 +#: optiondialog.cpp:1532 #, kde-format msgid "" "Some languages are read from right to left.\n" @@ -2967,22 +2983,22 @@ "Některé jazyky se čtou zprava doleva.\n" "Tato volba podle toho upraví prohlížeč a editor." -#: optiondialog.cpp:1485 +#: optiondialog.cpp:1542 #, kde-format msgid "Integration" msgstr "Integrace" -#: optiondialog.cpp:1486 +#: optiondialog.cpp:1543 #, kde-format msgid "Integration Settings" msgstr "Nastavení integrace" -#: optiondialog.cpp:1499 +#: optiondialog.cpp:1564 #, kde-format msgid "Command line options to ignore:" msgstr "Ignorovat volby příkazového řádku:" -#: optiondialog.cpp:1505 +#: optiondialog.cpp:1570 #, kde-format msgid "" "List of command line options that should be ignored when KDiff3 is used by " @@ -2995,12 +3011,12 @@ "Může být použito několik hodnot pokud jsou odděleny ';'\n" "Tímto bude potlačena chyba \"Unknown option\"." -#: optiondialog.cpp:1510 +#: optiondialog.cpp:1575 #, kde-format msgid "Quit also via Escape key" msgstr "Ukončit také klávesou Escape" -#: optiondialog.cpp:1514 +#: optiondialog.cpp:1579 #, kde-format msgid "" "Fast method to exit.\n" @@ -3009,7 +3025,7 @@ "Rychlý způsob ukončení.\n" "Pro ty, kteří jsou zvyklí používat klávesu Escape." -#: optiondialog.cpp:1598 +#: optiondialog.cpp:1653 #, kde-format msgid "This resets all options. Not only those of the current topic." msgstr "Budou obnovena všechna nastavení. Nikoliv pouze aktuální téma." @@ -3065,78 +3081,68 @@ msgid "Disable Unsafe Options" msgstr "Zakázat nebezpečné volby" -#: pdiff.cpp:158 +#: pdiff.cpp:160 #, kde-format msgid "Loading A" msgstr "Načítám A" -#: pdiff.cpp:167 +#: pdiff.cpp:162 #, kde-format -msgid "Errors occurred during pre-processing of file A." -msgstr "Při předběžném zpracovávání souboru A nastaly chyby." +msgid "Loading A: %1" +msgstr "Načítám A: %1" -#: pdiff.cpp:172 +#: pdiff.cpp:170 #, kde-format msgid "Loading B" msgstr "Načítám B" -#: pdiff.cpp:179 -#, kde-format -msgid "Errors occurred during pre-processing of file B." -msgstr "Při předběžném zpracovávání souboru B nastaly chyby." - -#: pdiff.cpp:202 pdiff.cpp:241 +#: pdiff.cpp:201 pdiff.cpp:237 #, kde-format msgid "Diff: A <-> B" msgstr "Rozdíly: A <-> B" -#: pdiff.cpp:208 pdiff.cpp:279 pdiff.cpp:293 +#: pdiff.cpp:207 pdiff.cpp:275 pdiff.cpp:289 #, kde-format msgid "Linediff: A <-> B" msgstr "Rozdíly řádků: A <-> B" -#: pdiff.cpp:225 +#: pdiff.cpp:224 #, kde-format msgid "Loading C" msgstr "Načítám C" -#: pdiff.cpp:232 -#, kde-format -msgid "Errors occurred during pre-processing of file C." -msgstr "Při předběžném zpracovávání souboru C nastaly chyby." - -#: pdiff.cpp:250 +#: pdiff.cpp:246 #, kde-format msgid "Diff: A <-> C" msgstr "Rozdíly: A <-> C" -#: pdiff.cpp:261 +#: pdiff.cpp:257 #, kde-format msgid "Diff: B <-> C" msgstr "Rozdíly: B <-> C" -#: pdiff.cpp:283 pdiff.cpp:297 +#: pdiff.cpp:279 pdiff.cpp:293 #, kde-format msgid "Linediff: B <-> C" msgstr "Rozdíly řádků: B <-> C" -#: pdiff.cpp:287 pdiff.cpp:301 +#: pdiff.cpp:283 pdiff.cpp:297 #, kde-format msgid "Linediff: A <-> C" msgstr "Rozdíly řádků: A <-> C" -#: pdiff.cpp:829 +#: pdiff.cpp:819 #, kde-format msgid "All input files contain the same text, but are not binary equal." msgstr "" "Všechny vstupní soubory obsahují stejný text, ale nejsou binárně shodné." -#: pdiff.cpp:835 pdiff.cpp:839 pdiff.cpp:843 +#: pdiff.cpp:825 pdiff.cpp:829 pdiff.cpp:833 #, kde-format msgid "Files %1 and %2 have equal text, but are not binary equal. \n" msgstr "Soubor %1 a %2 obsahuje stejný text, ale není binárně shodný. \n" -#: pdiff.cpp:853 +#: pdiff.cpp:843 #, kde-format msgid "" "Some input files do not seem to be pure text files.\n" @@ -3147,17 +3153,17 @@ "Vezměte na vědomí, že slučování v KDiff3 nebylo myšleno pro binární data.\n" "Pokračování na vlastní riziko." -#: pdiff.cpp:863 +#: pdiff.cpp:853 #, kde-format msgid ", B" msgstr ", B" -#: pdiff.cpp:865 +#: pdiff.cpp:855 #, kde-format msgid ", C" msgstr ", C" -#: pdiff.cpp:867 +#: pdiff.cpp:857 #, kde-format msgid "" "Some input characters could not be converted to valid unicode.\n" @@ -3170,77 +3176,72 @@ "Neukládejte výsledek, pokud si nejste jisti. Pokračujte na vlastní riziko.\n" "Dotčené vstupní soubory jsou v %1." -#: pdiff.cpp:1034 +#: pdiff.cpp:1032 #, kde-format msgid "Abort" msgstr "Přerušit" -#: pdiff.cpp:1040 pdiff.cpp:1130 +#: pdiff.cpp:1038 pdiff.cpp:1129 #, kde-format msgid "Opening files..." msgstr "Otevírám soubory..." -#: pdiff.cpp:1107 -#, kde-format -msgid "File open error" -msgstr "Chyba otevírání souboru" - -#: pdiff.cpp:1202 +#: pdiff.cpp:1212 #, kde-format msgid "Cutting selection..." msgstr "Vyjímám výběr..." -#: pdiff.cpp:1223 +#: pdiff.cpp:1233 #, kde-format msgid "Copying selection to clipboard..." msgstr "Kopíruji výběr do schránky..." -#: pdiff.cpp:1239 +#: pdiff.cpp:1249 #, kde-format msgid "Inserting clipboard contents..." msgstr "Vkládám obsah schránky..." -#: pdiff.cpp:1695 +#: pdiff.cpp:1705 #, kde-format msgid "Word wrap (Cancel disables word wrap)" msgstr "Zalamování slov (Zručit vypne zalamování slov)" -#: pdiff.cpp:1696 +#: pdiff.cpp:1706 #, kde-format msgid "Calculating max width for horizontal scrollbar" msgstr "Počítám maximální šířku pro vodorovný posuvník" -#: pdiff.cpp:1911 +#: pdiff.cpp:1921 #, kde-format msgid "Save && Continue" msgstr "Uložit a pokračovat" -#: pdiff.cpp:1912 +#: pdiff.cpp:1922 #, kde-format msgid "Continue Without Saving" msgstr "Pokračovat bez ukládání" -#: pdiff.cpp:2124 +#: pdiff.cpp:2134 #, kde-format msgid "Search complete." msgstr "Vyhledávání dokončeno." -#: pdiff.cpp:2124 +#: pdiff.cpp:2134 #, kde-format msgid "Search Complete" msgstr "Vyhledávání dokončeno" -#: pdiff.cpp:2375 +#: pdiff.cpp:2385 #, kde-format msgid "Nothing is selected in either diff input window." msgstr "Není nic vybráno v žádném vstupním okně rozdílů." -#: pdiff.cpp:2375 +#: pdiff.cpp:2385 #, kde-format msgid "Error while adding manual diff range" msgstr "Chyba ručního přidávání rozsahu k porovnání" -#: progress.cpp:59 progress.cpp:71 +#: progress.cpp:61 progress.cpp:73 #, kde-format msgid "&Cancel" msgstr "Z&rušit" @@ -3250,125 +3251,125 @@ msgid "A (Base):" msgstr "A (základní):" -#: smalldialogs.cpp:68 smalldialogs.cpp:85 smalldialogs.cpp:102 -#: smalldialogs.cpp:144 +#: smalldialogs.cpp:71 smalldialogs.cpp:90 smalldialogs.cpp:109 +#: smalldialogs.cpp:154 #, kde-format msgid "File..." msgstr "Soubor..." -#: smalldialogs.cpp:70 smalldialogs.cpp:87 smalldialogs.cpp:104 -#: smalldialogs.cpp:146 +#: smalldialogs.cpp:73 smalldialogs.cpp:92 smalldialogs.cpp:111 +#: smalldialogs.cpp:156 #, kde-format msgid "Dir..." msgstr "Adresář..." -#: smalldialogs.cpp:96 +#: smalldialogs.cpp:103 #, kde-format msgid "C (Optional):" msgstr "C (nepovinné):" -#: smalldialogs.cpp:119 +#: smalldialogs.cpp:126 #, kde-format msgid "Swap/Copy Names..." msgstr "Prohodit/kopírovat názvy ..." -#: smalldialogs.cpp:124 smalldialogs.cpp:125 smalldialogs.cpp:126 +#: smalldialogs.cpp:131 smalldialogs.cpp:132 smalldialogs.cpp:133 #, kde-format msgid "Swap %1<->%2" msgstr "Prohodit %1<->%2" -#: smalldialogs.cpp:127 smalldialogs.cpp:128 smalldialogs.cpp:129 +#: smalldialogs.cpp:134 smalldialogs.cpp:135 smalldialogs.cpp:136 #, kde-format msgid "Copy %1->Output" msgstr "Kopírovat %1->Výstup" -#: smalldialogs.cpp:130 smalldialogs.cpp:131 smalldialogs.cpp:132 +#: smalldialogs.cpp:137 smalldialogs.cpp:138 smalldialogs.cpp:139 #, kde-format msgid "Swap %1<->Output" msgstr "Prohodit %1<->Výstup" -#: smalldialogs.cpp:138 +#: smalldialogs.cpp:148 #, kde-format msgid "Output (optional):" msgstr "Výstup (nepovinné):" -#: smalldialogs.cpp:168 +#: smalldialogs.cpp:178 #, kde-format msgid "Configure..." msgstr "Nastavit..." -#: smalldialogs.cpp:233 +#: smalldialogs.cpp:243 #, kde-format msgid "Open Directory" msgstr "Otevřít adresář" -#: smalldialogs.cpp:234 +#: smalldialogs.cpp:244 #, kde-format msgid "Select Output File" msgstr "Vyberte výstupní soubor" -#: smalldialogs.cpp:393 +#: smalldialogs.cpp:403 #, kde-format msgid "Search text:" msgstr "Hledat text:" -#: smalldialogs.cpp:400 +#: smalldialogs.cpp:410 #, kde-format msgid "Case sensitive" msgstr "Rozlišovat VELKÁ/malá" -#: smalldialogs.cpp:403 +#: smalldialogs.cpp:413 #, kde-format msgid "Search A" msgstr "Prohledat A" -#: smalldialogs.cpp:408 +#: smalldialogs.cpp:418 #, kde-format msgid "Search B" msgstr "Prohledat B" -#: smalldialogs.cpp:413 +#: smalldialogs.cpp:423 #, kde-format msgid "Search C" msgstr "Prohledat C" -#: smalldialogs.cpp:418 +#: smalldialogs.cpp:428 #, kde-format msgid "Search output" msgstr "Prohledat výstup" -#: smalldialogs.cpp:425 +#: smalldialogs.cpp:435 #, kde-format msgid "&Search" msgstr "&Hledat" -#: smalldialogs.cpp:444 +#: smalldialogs.cpp:454 #, kde-format msgid "Regular Expression Tester" msgstr "Testovat regulární výraz" -#: smalldialogs.cpp:457 +#: smalldialogs.cpp:467 #, kde-format msgid "Example auto merge line:" msgstr "Příklad řádku automatického sloučení:" -#: smalldialogs.cpp:459 +#: smalldialogs.cpp:469 #, kde-format msgid "To test auto merge, copy a line as used in your files." msgstr "" "Pro vyzkoušení automatického sloučení zkopírujte řádek z vašeho souboru." -#: smalldialogs.cpp:465 smalldialogs.cpp:493 smalldialogs.cpp:529 +#: smalldialogs.cpp:475 smalldialogs.cpp:503 smalldialogs.cpp:539 #, kde-format msgid "Match result:" msgstr "Výsledek shody:" -#: smalldialogs.cpp:484 +#: smalldialogs.cpp:494 #, kde-format msgid "Example history start line (with leading comment):" msgstr "Příklad počátečního řádku historie (včetně úvodního komentáře):" -#: smalldialogs.cpp:486 +#: smalldialogs.cpp:496 #, kde-format msgid "" "Copy a history start line as used in your files,\n" @@ -3377,17 +3378,17 @@ "Zkopírujte úvodní řádek historie z vašeho souboru\n" "včetně úvodního komentáře." -#: smalldialogs.cpp:512 +#: smalldialogs.cpp:522 #, kde-format msgid "History sort key order:" msgstr "Klíč k setřídění historie:" -#: smalldialogs.cpp:520 +#: smalldialogs.cpp:530 #, kde-format msgid "Example history entry start line (without leading comment):" msgstr "Příklad počátečního řádku záznamů historie (bez úvodního komentáře):" -#: smalldialogs.cpp:522 +#: smalldialogs.cpp:532 #, kde-format msgid "" "Copy a history entry start line as used in your files,\n" @@ -3396,47 +3397,47 @@ "Zkopírujte úvodní řádek záznamů historie z vašeho souboru,\n" "avšak vynechte úvodní komentář." -#: smalldialogs.cpp:536 +#: smalldialogs.cpp:546 #, kde-format msgid "Sort key result:" msgstr "Výsledek klíče k setřídění:" -#: smalldialogs.cpp:584 smalldialogs.cpp:594 smalldialogs.cpp:614 +#: smalldialogs.cpp:594 smalldialogs.cpp:604 smalldialogs.cpp:624 #, kde-format msgid "Match success." msgstr "Shoda úspěšná." -#: smalldialogs.cpp:588 smalldialogs.cpp:598 smalldialogs.cpp:620 +#: smalldialogs.cpp:598 smalldialogs.cpp:608 smalldialogs.cpp:630 #, kde-format msgid "Match failed." msgstr "Shoda selhala." -#: smalldialogs.cpp:605 +#: smalldialogs.cpp:615 #, kde-format msgid "Opening and closing parentheses do not match in regular expression." msgstr "Levé a pravé závorky se do regulárního výrazu nehodí." -#: SourceData.cpp:150 +#: SourceData.cpp:153 #, kde-format msgid "Writing clipboard data to temp file failed." msgstr "Zápis dat schránky do dočasného souboru selhal." -#: SourceData.cpp:154 +#: SourceData.cpp:157 #, kde-format msgid "From Clipboard" msgstr "Ze schránky" -#: SourceData.cpp:335 +#: SourceData.cpp:348 #, kde-format msgid "%1 is not a normal file." -msgstr "" +msgstr "%1 není místní soubor." -#: SourceData.cpp:427 +#: SourceData.cpp:440 #, kde-format msgid " Temp file is: %1" -msgstr "" +msgstr " Dočasný soubor je: %1" -#: SourceData.cpp:432 +#: SourceData.cpp:445 #, kde-format msgid "" "Preprocessing possibly failed. Check this command:\n" @@ -3451,12 +3452,12 @@ "\n" "Příkaz předběžného zpracování bude nyní vypnut." -#: SourceData.cpp:443 SourceData.cpp:512 +#: SourceData.cpp:456 SourceData.cpp:525 #, kde-format msgid "File %1 too large to process. Skipping." msgstr "Soubor %1 je pro zpracování velký. Přeskakuji." -#: SourceData.cpp:487 +#: SourceData.cpp:500 #, kde-format msgid "" "The line-matching-preprocessing possibly failed. Check this command:\n" @@ -3474,17 +3475,17 @@ #: Utils.cpp:77 #, kde-format msgid "Expecting space after closing quote." -msgstr "" +msgstr "Očekávána mezera po ukončující uvozovce." #: Utils.cpp:80 #, kde-format msgid "Unmatched quote." -msgstr "" +msgstr "Neodpovídají si uvozovky." #: Utils.cpp:89 #, kde-format msgid "Unexpected quote character within argument." -msgstr "" +msgstr "Neočekávaná uvozovka uvnitř argumentu." #: Utils.cpp:96 #, kde-format diff -Nru kdiff3-1.8.01/po/cy/kdiff3.po kdiff3-1.8.3/po/cy/kdiff3.po --- kdiff3-1.8.01/po/cy/kdiff3.po 2019-05-18 01:01:52.000000000 +0000 +++ kdiff3-1.8.3/po/cy/kdiff3.po 2020-06-25 00:18:10.000000000 +0000 @@ -1,8 +1,8 @@ msgid "" msgstr "" "Project-Id-Version: ../cy/messages//kdeextragear-1/kdiff3.po\n" -"Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2019-04-18 08:02+0200\n" +"Report-Msgid-Bugs-To: https://bugs.kde.org\n" +"POT-Creation-Date: 2020-06-22 07:48+0200\n" "PO-Revision-Date: 2004-09-20 15:44+0200\n" "Last-Translator: Thierry Vignaud \n" "Language-Team: cy \n" @@ -22,338 +22,338 @@ msgid "Your emails" msgstr "" -#: difftextwindow.cpp:412 +#: difftextwindow.cpp:414 #, kde-format msgid "File %1: Line %2" msgstr "" -#: difftextwindow.cpp:414 +#: difftextwindow.cpp:416 #, fuzzy, kde-format #| msgid "not available" msgid "File %1: Line not available" msgstr "dim ar gael" -#: difftextwindow.cpp:1780 +#: difftextwindow.cpp:1778 #, kde-format msgid "Encoding:" msgstr "" -#: difftextwindow.cpp:1782 mergeresultwindow.cpp:3138 optiondialog.cpp:818 +#: difftextwindow.cpp:1781 mergeresultwindow.cpp:3166 optiondialog.cpp:840 #, kde-format msgid "Line end style:" msgstr "Arddull pen y llinell:" -#: difftextwindow.cpp:1810 directorymergewindow.cpp:382 -#: directorymergewindow.cpp:433 directorymergewindow.cpp:524 -#: directorymergewindow.cpp:3058 directorymergewindow.cpp:3189 -#: directorymergewindow.cpp:3417 mergeresultwindow.cpp:942 -#: mergeresultwindow.cpp:944 mergeresultwindow.cpp:946 -#: mergeresultwindow.cpp:948 mergeresultwindow.cpp:1814 -#: mergeresultwindow.cpp:3170 mergeresultwindow.cpp:3177 optiondialog.cpp:962 -#: optiondialog.cpp:975 pdiff.cpp:833 pdiff.cpp:835 pdiff.cpp:837 pdiff.cpp:839 -#: pdiff.cpp:861 smalldialogs.cpp:124 smalldialogs.cpp:126 smalldialogs.cpp:127 -#: smalldialogs.cpp:130 +#: difftextwindow.cpp:1809 directorymergewindow.cpp:383 +#: directorymergewindow.cpp:434 directorymergewindow.cpp:525 +#: directorymergewindow.cpp:3072 directorymergewindow.cpp:3203 +#: directorymergewindow.cpp:3431 mergeresultwindow.cpp:970 +#: mergeresultwindow.cpp:972 mergeresultwindow.cpp:974 +#: mergeresultwindow.cpp:976 mergeresultwindow.cpp:1842 +#: mergeresultwindow.cpp:3198 mergeresultwindow.cpp:3205 optiondialog.cpp:1002 +#: optiondialog.cpp:1015 pdiff.cpp:823 pdiff.cpp:825 pdiff.cpp:827 +#: pdiff.cpp:829 pdiff.cpp:851 smalldialogs.cpp:131 smalldialogs.cpp:133 +#: smalldialogs.cpp:134 smalldialogs.cpp:137 #, kde-format msgid "A" msgstr "A" -#: difftextwindow.cpp:1810 directorymergewindow.cpp:384 -#: directorymergewindow.cpp:436 directorymergewindow.cpp:526 -#: directorymergewindow.cpp:3064 directorymergewindow.cpp:3190 -#: directorymergewindow.cpp:3418 mergeresultwindow.cpp:942 -#: mergeresultwindow.cpp:944 mergeresultwindow.cpp:950 -#: mergeresultwindow.cpp:952 mergeresultwindow.cpp:1816 -#: mergeresultwindow.cpp:3172 mergeresultwindow.cpp:3179 optiondialog.cpp:963 -#: optiondialog.cpp:976 pdiff.cpp:833 pdiff.cpp:835 pdiff.cpp:841 pdiff.cpp:843 -#: pdiff.cpp:863 smalldialogs.cpp:124 smalldialogs.cpp:125 smalldialogs.cpp:128 -#: smalldialogs.cpp:131 +#: difftextwindow.cpp:1809 directorymergewindow.cpp:385 +#: directorymergewindow.cpp:437 directorymergewindow.cpp:527 +#: directorymergewindow.cpp:3078 directorymergewindow.cpp:3204 +#: directorymergewindow.cpp:3432 mergeresultwindow.cpp:970 +#: mergeresultwindow.cpp:972 mergeresultwindow.cpp:978 +#: mergeresultwindow.cpp:980 mergeresultwindow.cpp:1844 +#: mergeresultwindow.cpp:3200 mergeresultwindow.cpp:3207 optiondialog.cpp:1003 +#: optiondialog.cpp:1016 pdiff.cpp:823 pdiff.cpp:825 pdiff.cpp:831 +#: pdiff.cpp:833 pdiff.cpp:853 smalldialogs.cpp:131 smalldialogs.cpp:132 +#: smalldialogs.cpp:135 smalldialogs.cpp:138 #, kde-format msgid "B" msgstr "B" -#: difftextwindow.cpp:1810 directorymergewindow.cpp:386 -#: directorymergewindow.cpp:439 directorymergewindow.cpp:528 -#: directorymergewindow.cpp:3070 directorymergewindow.cpp:3191 -#: directorymergewindow.cpp:3419 mergeresultwindow.cpp:946 -#: mergeresultwindow.cpp:948 mergeresultwindow.cpp:950 -#: mergeresultwindow.cpp:952 mergeresultwindow.cpp:1818 -#: mergeresultwindow.cpp:3174 mergeresultwindow.cpp:3181 optiondialog.cpp:977 -#: pdiff.cpp:837 pdiff.cpp:839 pdiff.cpp:841 pdiff.cpp:843 pdiff.cpp:865 -#: smalldialogs.cpp:125 smalldialogs.cpp:126 smalldialogs.cpp:129 -#: smalldialogs.cpp:132 +#: difftextwindow.cpp:1809 directorymergewindow.cpp:387 +#: directorymergewindow.cpp:440 directorymergewindow.cpp:529 +#: directorymergewindow.cpp:3084 directorymergewindow.cpp:3205 +#: directorymergewindow.cpp:3433 mergeresultwindow.cpp:974 +#: mergeresultwindow.cpp:976 mergeresultwindow.cpp:978 +#: mergeresultwindow.cpp:980 mergeresultwindow.cpp:1846 +#: mergeresultwindow.cpp:3202 mergeresultwindow.cpp:3209 optiondialog.cpp:1017 +#: pdiff.cpp:827 pdiff.cpp:829 pdiff.cpp:831 pdiff.cpp:833 pdiff.cpp:855 +#: smalldialogs.cpp:132 smalldialogs.cpp:133 smalldialogs.cpp:136 +#: smalldialogs.cpp:139 #, kde-format msgid "C" msgstr "C" -#: difftextwindow.cpp:1810 +#: difftextwindow.cpp:1809 #, kde-format msgid "A (Base)" msgstr "" -#: difftextwindow.cpp:1812 +#: difftextwindow.cpp:1811 #, kde-format msgid "Encoding: %1" msgstr "" -#: difftextwindow.cpp:1813 mergeresultwindow.cpp:3183 +#: difftextwindow.cpp:1812 mergeresultwindow.cpp:3211 #, kde-format msgid "Unix" msgstr "" -#: difftextwindow.cpp:1813 mergeresultwindow.cpp:3184 +#: difftextwindow.cpp:1812 mergeresultwindow.cpp:3212 #, kde-format msgid "DOS" msgstr "" -#: difftextwindow.cpp:1813 +#: difftextwindow.cpp:1812 #, fuzzy, kde-format #| msgid "Line end style:" msgid "Line end style: %1" msgstr "Arddull pen y llinell:" -#: difftextwindow.cpp:1835 kdiff3.cpp:873 +#: difftextwindow.cpp:1834 kdiff3.cpp:874 #, kde-format msgid "Top line" msgstr "" -#: difftextwindow.cpp:1845 +#: difftextwindow.cpp:1843 #, kde-format msgid "End" msgstr "Diwedd" -#: difftextwindow.cpp:1903 smalldialogs.cpp:235 +#: difftextwindow.cpp:1901 smalldialogs.cpp:245 #, fuzzy, kde-format #| msgid "File..." msgid "Open File" msgstr "Ffeil..." -#: difftextwindow.cpp:1951 optiondialog.cpp:387 +#: difftextwindow.cpp:1943 optiondialog.cpp:389 #, kde-format msgid "Unicode, 8 bit" msgstr "" -#: difftextwindow.cpp:1966 +#: difftextwindow.cpp:1958 #, kde-format msgid "Other" msgstr "" -#: directorymergewindow.cpp:409 directorymergewindow.cpp:3424 +#: directorymergewindow.cpp:410 directorymergewindow.cpp:3438 #, kde-format msgid "Copy A to B" msgstr "" -#: directorymergewindow.cpp:412 directorymergewindow.cpp:3425 +#: directorymergewindow.cpp:413 directorymergewindow.cpp:3439 #, kde-format msgid "Copy B to A" msgstr "" -#: directorymergewindow.cpp:415 directorymergewindow.cpp:3426 +#: directorymergewindow.cpp:416 directorymergewindow.cpp:3440 #, kde-format msgid "Delete A" msgstr "" -#: directorymergewindow.cpp:418 directorymergewindow.cpp:3427 +#: directorymergewindow.cpp:419 directorymergewindow.cpp:3441 #, kde-format msgid "Delete B" msgstr "" -#: directorymergewindow.cpp:421 +#: directorymergewindow.cpp:422 #, kde-format msgid "Delete A & B" msgstr "" -#: directorymergewindow.cpp:424 directorymergewindow.cpp:3429 +#: directorymergewindow.cpp:425 directorymergewindow.cpp:3443 #, kde-format msgid "Merge to A" msgstr "" -#: directorymergewindow.cpp:427 directorymergewindow.cpp:3430 +#: directorymergewindow.cpp:428 directorymergewindow.cpp:3444 #, kde-format msgid "Merge to B" msgstr "" -#: directorymergewindow.cpp:430 +#: directorymergewindow.cpp:431 #, kde-format msgid "Merge to A & B" msgstr "" -#: directorymergewindow.cpp:442 directorymergewindow.cpp:3421 +#: directorymergewindow.cpp:443 directorymergewindow.cpp:3435 #, kde-format msgid "Delete (if exists)" msgstr "" -#: directorymergewindow.cpp:445 directorymergewindow.cpp:448 -#: directorymergewindow.cpp:3420 optiondialog.cpp:925 smalldialogs.cpp:113 +#: directorymergewindow.cpp:446 directorymergewindow.cpp:449 +#: directorymergewindow.cpp:3434 smalldialogs.cpp:120 #, kde-format msgid "Merge" msgstr "Cyfuno" -#: directorymergewindow.cpp:445 directorymergewindow.cpp:448 +#: directorymergewindow.cpp:446 directorymergewindow.cpp:449 #, kde-format msgid "Merge (manual)" msgstr "" -#: directorymergewindow.cpp:451 +#: directorymergewindow.cpp:452 #, kde-format msgid "Error: Conflicting File Types" msgstr "" -#: directorymergewindow.cpp:454 +#: directorymergewindow.cpp:455 #, kde-format msgid "Error: Changed and Deleted" msgstr "" -#: directorymergewindow.cpp:457 +#: directorymergewindow.cpp:458 #, kde-format msgid "Error: Dates are equal but files are not." msgstr "" -#: directorymergewindow.cpp:471 +#: directorymergewindow.cpp:472 #, fuzzy, kde-format #| msgid "Done." msgid "Done" msgstr "Wedi'i wneud." -#: directorymergewindow.cpp:473 +#: directorymergewindow.cpp:474 #, fuzzy, kde-format #| msgid "Error." msgid "Error" msgstr "Gwall." -#: directorymergewindow.cpp:475 +#: directorymergewindow.cpp:476 #, kde-format msgid "Skipped." msgstr "" -#: directorymergewindow.cpp:477 +#: directorymergewindow.cpp:478 #, kde-format msgid "Not saved." msgstr "" -#: directorymergewindow.cpp:479 +#: directorymergewindow.cpp:480 #, kde-format msgid "In progress..." msgstr "" -#: directorymergewindow.cpp:481 +#: directorymergewindow.cpp:482 #, kde-format msgid "To do." msgstr "" -#: directorymergewindow.cpp:522 +#: directorymergewindow.cpp:523 #, kde-format msgid "Name" msgstr "Enw" -#: directorymergewindow.cpp:530 +#: directorymergewindow.cpp:531 #, kde-format msgid "Operation" msgstr "Gweithrediad" -#: directorymergewindow.cpp:532 +#: directorymergewindow.cpp:533 #, kde-format msgid "Status" msgstr "Cyflwr" -#: directorymergewindow.cpp:534 +#: directorymergewindow.cpp:535 #, kde-format msgid "Unsolved" msgstr "" -#: directorymergewindow.cpp:536 +#: directorymergewindow.cpp:537 #, kde-format msgid "Solved" msgstr "" -#: directorymergewindow.cpp:538 +#: directorymergewindow.cpp:539 #, kde-format msgid "Nonwhite" msgstr "" -#: directorymergewindow.cpp:540 +#: directorymergewindow.cpp:541 #, kde-format msgid "White" msgstr "Gwyn" -#: directorymergewindow.cpp:674 +#: directorymergewindow.cpp:676 #, kde-format msgid "Unable to compare non-normal file with normal file." msgstr "" -#: directorymergewindow.cpp:688 +#: directorymergewindow.cpp:690 #, kde-format msgid "Mix of links and normal files." msgstr "" -#: directorymergewindow.cpp:695 +#: directorymergewindow.cpp:697 #, kde-format msgid "Link: " msgstr "Cyswllt : " -#: directorymergewindow.cpp:704 +#: directorymergewindow.cpp:706 #, kde-format msgid "Size. " msgstr "" -#: directorymergewindow.cpp:718 directorymergewindow.cpp:728 +#: directorymergewindow.cpp:720 directorymergewindow.cpp:730 #, kde-format msgid "Date & Size: " msgstr "" -#: directorymergewindow.cpp:748 +#: directorymergewindow.cpp:751 #, fuzzy, kde-format msgid "Comparing file..." msgstr "Yn cadw ffeil..." -#: directorymergewindow.cpp:801 +#: directorymergewindow.cpp:813 #, kde-format msgid "" "You are currently doing a directory merge. Are you sure, you want to abort " "the merge and rescan the directory?" msgstr "" -#: directorymergewindow.cpp:802 kdiff3.cpp:698 kdiff3.cpp:708 kdiff3.cpp:720 -#: mergeresultwindow.cpp:372 pdiff.cpp:1033 pdiff.cpp:1910 pdiff.cpp:1920 +#: directorymergewindow.cpp:814 kdiff3.cpp:697 kdiff3.cpp:707 kdiff3.cpp:719 +#: mergeresultwindow.cpp:400 pdiff.cpp:1031 pdiff.cpp:1920 pdiff.cpp:1930 #, kde-format msgid "Warning" msgstr "" -#: directorymergewindow.cpp:803 directorymergewindow.cpp:3393 +#: directorymergewindow.cpp:815 directorymergewindow.cpp:3407 #, kde-format msgid "Rescan" msgstr "Ailsyllu" -#: directorymergewindow.cpp:804 pdiff.cpp:1035 +#: directorymergewindow.cpp:816 pdiff.cpp:1033 #, kde-format msgid "Continue Merging" msgstr "" -#: directorymergewindow.cpp:971 +#: directorymergewindow.cpp:984 #, kde-format msgid "Opening of directories failed:" msgstr "" -#: directorymergewindow.cpp:975 +#: directorymergewindow.cpp:988 #, kde-format msgid "Dir A \"%1\" does not exist or is not a directory.\n" msgstr "" -#: directorymergewindow.cpp:980 +#: directorymergewindow.cpp:993 #, kde-format msgid "Dir B \"%1\" does not exist or is not a directory.\n" msgstr "" -#: directorymergewindow.cpp:985 +#: directorymergewindow.cpp:998 #, kde-format msgid "Dir C \"%1\" does not exist or is not a directory.\n" msgstr "" -#: directorymergewindow.cpp:988 +#: directorymergewindow.cpp:1001 #, kde-format msgid "Directory Open Error" msgstr "" -#: directorymergewindow.cpp:996 +#: directorymergewindow.cpp:1009 #, kde-format msgid "" "The destination directory must not be the same as A or B when three " @@ -361,49 +361,49 @@ "Check again before continuing." msgstr "" -#: directorymergewindow.cpp:998 +#: directorymergewindow.cpp:1011 #, kde-format msgid "Parameter Warning" msgstr "" -#: directorymergewindow.cpp:1003 +#: directorymergewindow.cpp:1016 #, kde-format msgid "Scanning directories..." msgstr "" -#: directorymergewindow.cpp:1029 +#: directorymergewindow.cpp:1042 #, kde-format msgid "Reading Directory A" msgstr "" -#: directorymergewindow.cpp:1038 +#: directorymergewindow.cpp:1051 #, kde-format msgid "Reading Directory B" msgstr "" -#: directorymergewindow.cpp:1048 +#: directorymergewindow.cpp:1061 #, kde-format msgid "Reading Directory C" msgstr "" -#: directorymergewindow.cpp:1064 +#: directorymergewindow.cpp:1077 #, kde-format msgid "Some subdirectories were not readable in" msgstr "" -#: directorymergewindow.cpp:1069 +#: directorymergewindow.cpp:1082 #, kde-format msgid "Check the permissions of the subdirectories." msgstr "" -#: directorymergewindow.cpp:1106 kdiff3.cpp:666 kdiff3.cpp:753 kdiff3.cpp:777 -#: kdiff3.cpp:1065 kdiff3.cpp:1086 pdiff.cpp:1116 pdiff.cpp:1170 pdiff.cpp:1218 -#: pdiff.cpp:1234 pdiff.cpp:1277 pdiff.cpp:1301 +#: directorymergewindow.cpp:1119 kdiff3.cpp:665 kdiff3.cpp:752 kdiff3.cpp:776 +#: kdiff3.cpp:1072 kdiff3.cpp:1093 pdiff.cpp:1115 pdiff.cpp:1178 pdiff.cpp:1228 +#: pdiff.cpp:1244 pdiff.cpp:1287 pdiff.cpp:1311 #, kde-format msgid "Ready." msgstr "Parod." -#: directorymergewindow.cpp:1121 +#: directorymergewindow.cpp:1134 #, kde-format msgid "" "Directory Comparison Status\n" @@ -413,66 +413,66 @@ "Number of different files: %3" msgstr "" -#: directorymergewindow.cpp:1128 +#: directorymergewindow.cpp:1141 #, kde-format msgid "Number of manual merges: %1" msgstr "" -#: directorymergewindow.cpp:1394 +#: directorymergewindow.cpp:1407 #, kde-format msgid "This affects all merge operations." msgstr "" -#: directorymergewindow.cpp:1395 +#: directorymergewindow.cpp:1408 #, kde-format msgid "Changing All Merge Operations" msgstr "" -#: directorymergewindow.cpp:1695 +#: directorymergewindow.cpp:1708 #, kde-format msgid "" "Processing %1 / %2\n" "%3" msgstr "" -#: directorymergewindow.cpp:1738 directorymergewindow.cpp:1742 +#: directorymergewindow.cpp:1751 directorymergewindow.cpp:1755 #, kde-format msgid "Some files could not be processed." msgstr "" -#: directorymergewindow.cpp:2222 directorymergewindow.cpp:2247 -#: directorymergewindow.cpp:2271 +#: directorymergewindow.cpp:2235 directorymergewindow.cpp:2260 +#: directorymergewindow.cpp:2285 #, kde-format msgid "This operation is currently not possible." msgstr "" -#: directorymergewindow.cpp:2222 directorymergewindow.cpp:2247 -#: directorymergewindow.cpp:2271 directorymergewindow.cpp:2552 +#: directorymergewindow.cpp:2235 directorymergewindow.cpp:2260 +#: directorymergewindow.cpp:2285 directorymergewindow.cpp:2565 #, kde-format msgid "Operation Not Possible" msgstr "" -#: directorymergewindow.cpp:2318 +#: directorymergewindow.cpp:2332 #, kde-format msgid "An error occurred while copying." msgstr "" -#: directorymergewindow.cpp:2319 directorymergewindow.cpp:2759 +#: directorymergewindow.cpp:2333 directorymergewindow.cpp:2772 #, kde-format msgid "Merge Error" msgstr "" -#: directorymergewindow.cpp:2396 +#: directorymergewindow.cpp:2410 #, kde-format msgid "Unknown merge operation. (This must never happen!)" msgstr "" -#: directorymergewindow.cpp:2441 +#: directorymergewindow.cpp:2455 #, kde-format msgid "Unknown merge operation." msgstr "" -#: directorymergewindow.cpp:2454 +#: directorymergewindow.cpp:2468 #, kde-format msgid "" "The merge is about to begin.\n" @@ -485,50 +485,50 @@ "whatsoever! Make backups of your vital data!" msgstr "" -#: directorymergewindow.cpp:2459 +#: directorymergewindow.cpp:2473 #, kde-format msgid "Starting Merge" msgstr "" -#: directorymergewindow.cpp:2460 +#: directorymergewindow.cpp:2474 #, kde-format msgid "Do It" msgstr "" -#: directorymergewindow.cpp:2461 +#: directorymergewindow.cpp:2475 #, kde-format msgid "Simulate It" msgstr "" -#: directorymergewindow.cpp:2487 +#: directorymergewindow.cpp:2501 #, kde-format msgid "" "The highlighted item has a different type in the different directories. " "Select what to do." msgstr "" -#: directorymergewindow.cpp:2491 +#: directorymergewindow.cpp:2505 #, kde-format msgid "" "The modification dates of the file are equal but the files are not. Select " "what to do." msgstr "" -#: directorymergewindow.cpp:2495 +#: directorymergewindow.cpp:2509 #, kde-format msgid "" "The highlighted item was changed in one directory and deleted in the other. " "Select what to do." msgstr "" -#: directorymergewindow.cpp:2552 +#: directorymergewindow.cpp:2565 #, kde-format msgid "" "This operation is currently not possible because directory merge is " "currently running." msgstr "" -#: directorymergewindow.cpp:2609 +#: directorymergewindow.cpp:2622 #, kde-format msgid "" "There was an error in the last step.\n" @@ -536,257 +536,257 @@ "to skip this item?" msgstr "" -#: directorymergewindow.cpp:2611 +#: directorymergewindow.cpp:2624 #, kde-format msgid "Continue merge after an error" msgstr "" -#: directorymergewindow.cpp:2612 +#: directorymergewindow.cpp:2625 #, kde-format msgid "Continue With Last Item" msgstr "" -#: directorymergewindow.cpp:2613 +#: directorymergewindow.cpp:2626 #, kde-format msgid "Skip Item" msgstr "" -#: directorymergewindow.cpp:2709 +#: directorymergewindow.cpp:2722 #, kde-format msgid "Merge operation complete." msgstr "" -#: directorymergewindow.cpp:2709 directorymergewindow.cpp:2712 +#: directorymergewindow.cpp:2722 directorymergewindow.cpp:2725 #, kde-format msgid "Merge Complete" msgstr "" -#: directorymergewindow.cpp:2722 +#: directorymergewindow.cpp:2735 #, kde-format msgid "" "Simulated merge complete: Check if you agree with the proposed operations." msgstr "" -#: directorymergewindow.cpp:2758 +#: directorymergewindow.cpp:2771 #, kde-format msgid "An error occurred. Press OK to see detailed information." msgstr "" -#: directorymergewindow.cpp:2791 +#: directorymergewindow.cpp:2804 #, kde-format msgid "Error: While deleting %1: Creating backup failed." msgstr "" -#: directorymergewindow.cpp:2798 +#: directorymergewindow.cpp:2811 #, kde-format msgid "delete directory recursively( %1 )" msgstr "" -#: directorymergewindow.cpp:2800 +#: directorymergewindow.cpp:2813 #, kde-format msgid "delete( %1 )" msgstr "" -#: directorymergewindow.cpp:2815 +#: directorymergewindow.cpp:2828 #, kde-format msgid "Error: delete dir operation failed while trying to read the directory." msgstr "" -#: directorymergewindow.cpp:2834 +#: directorymergewindow.cpp:2847 #, kde-format msgid "Error: rmdir( %1 ) operation failed." msgstr "" -#: directorymergewindow.cpp:2844 +#: directorymergewindow.cpp:2857 #, kde-format msgid "Error: delete operation failed." msgstr "" -#: directorymergewindow.cpp:2870 +#: directorymergewindow.cpp:2884 #, kde-format msgid "manual merge( %1, %2, %3 -> %4)" msgstr "" -#: directorymergewindow.cpp:2873 +#: directorymergewindow.cpp:2887 #, kde-format msgid "" " Note: After a manual merge the user should continue by pressing F7." msgstr "" -#: directorymergewindow.cpp:2900 +#: directorymergewindow.cpp:2914 #, kde-format msgid "Error: copy( %1 -> %2 ) failed.Deleting existing destination failed." msgstr "" -#: directorymergewindow.cpp:2909 +#: directorymergewindow.cpp:2923 #, kde-format msgid "copyLink( %1 -> %2 )" msgstr "" -#: directorymergewindow.cpp:2918 +#: directorymergewindow.cpp:2932 #, kde-format msgid "Error: copyLink failed: Remote links are not yet supported." msgstr "" -#: directorymergewindow.cpp:2928 +#: directorymergewindow.cpp:2942 #, kde-format msgid "Error: copyLink failed." msgstr "" -#: directorymergewindow.cpp:2953 +#: directorymergewindow.cpp:2967 #, kde-format msgid "copy( %1 -> %2 )" msgstr "" -#: directorymergewindow.cpp:2979 +#: directorymergewindow.cpp:2993 #, kde-format msgid "Error during rename( %1 -> %2 ): Cannot delete existing destination." msgstr "" -#: directorymergewindow.cpp:2986 +#: directorymergewindow.cpp:3000 #, kde-format msgid "rename( %1 -> %2 )" msgstr "" -#: directorymergewindow.cpp:2995 +#: directorymergewindow.cpp:3009 #, kde-format msgid "Error: Rename failed." msgstr "" -#: directorymergewindow.cpp:3013 +#: directorymergewindow.cpp:3027 #, kde-format msgid "Error during makeDir of %1. Cannot delete existing file." msgstr "" -#: directorymergewindow.cpp:3030 +#: directorymergewindow.cpp:3044 #, kde-format msgid "makeDir( %1 )" msgstr "" -#: directorymergewindow.cpp:3040 +#: directorymergewindow.cpp:3054 #, kde-format msgid "Error while creating directory." msgstr "" -#: directorymergewindow.cpp:3076 directorymergewindow.cpp:3195 +#: directorymergewindow.cpp:3090 directorymergewindow.cpp:3209 #, kde-format msgid "Dest" msgstr "" -#: directorymergewindow.cpp:3084 directorymergewindow.cpp:3113 +#: directorymergewindow.cpp:3098 directorymergewindow.cpp:3127 #, kde-format msgid "Dir" msgstr "" -#: directorymergewindow.cpp:3084 +#: directorymergewindow.cpp:3098 #, kde-format msgid "Type" msgstr "Math" -#: directorymergewindow.cpp:3084 +#: directorymergewindow.cpp:3098 #, kde-format msgid "Size" msgstr "Maint" -#: directorymergewindow.cpp:3085 +#: directorymergewindow.cpp:3099 #, kde-format msgid "Attr" msgstr "" -#: directorymergewindow.cpp:3085 +#: directorymergewindow.cpp:3099 #, kde-format msgid "Last Modification" msgstr "" -#: directorymergewindow.cpp:3085 +#: directorymergewindow.cpp:3099 #, kde-format msgid "Link-Destination" msgstr "" -#: directorymergewindow.cpp:3113 +#: directorymergewindow.cpp:3127 #, fuzzy, kde-format #| msgid "File..." msgid "File" msgstr "Ffeil..." -#: directorymergewindow.cpp:3113 +#: directorymergewindow.cpp:3127 #, fuzzy, kde-format #| msgid "Link: " msgid "-Link" msgstr "Cyswllt : " -#: directorymergewindow.cpp:3119 +#: directorymergewindow.cpp:3133 #, kde-format msgid "not available" msgstr "dim ar gael" -#: directorymergewindow.cpp:3137 +#: directorymergewindow.cpp:3151 #, kde-format msgid "A (Dest): " msgstr "" -#: directorymergewindow.cpp:3141 +#: directorymergewindow.cpp:3155 #, kde-format msgid "A: " msgstr "" -#: directorymergewindow.cpp:3141 +#: directorymergewindow.cpp:3155 #, kde-format msgid "A (Base): " msgstr "" -#: directorymergewindow.cpp:3147 +#: directorymergewindow.cpp:3161 #, kde-format msgid "B (Dest): " msgstr "" -#: directorymergewindow.cpp:3151 +#: directorymergewindow.cpp:3165 #, kde-format msgid "B: " msgstr "" -#: directorymergewindow.cpp:3156 +#: directorymergewindow.cpp:3170 #, kde-format msgid "C (Dest): " msgstr "" -#: directorymergewindow.cpp:3160 +#: directorymergewindow.cpp:3174 #, kde-format msgid "C: " msgstr "" -#: directorymergewindow.cpp:3163 +#: directorymergewindow.cpp:3177 #, kde-format msgid "Dest: " msgstr "" #. i18n("Saving Directory Merge State ...")); -#: directorymergewindow.cpp:3238 +#: directorymergewindow.cpp:3252 #, kde-format msgid "Save Directory Merge State As..." msgstr "" -#: directorymergewindow.cpp:3387 +#: directorymergewindow.cpp:3401 #, kde-format msgid "Start/Continue Directory Merge" msgstr "" -#: directorymergewindow.cpp:3388 +#: directorymergewindow.cpp:3402 #, kde-format msgid "Run Operation for Current Item" msgstr "" -#: directorymergewindow.cpp:3389 +#: directorymergewindow.cpp:3403 #, kde-format msgid "Compare Selected File" msgstr "" -#: directorymergewindow.cpp:3390 +#: directorymergewindow.cpp:3404 #, kde-format msgid "Merge Current File" msgstr "" -#: directorymergewindow.cpp:3390 +#: directorymergewindow.cpp:3404 #, fuzzy, kde-format #| msgid "Merge" msgid "" @@ -794,403 +794,408 @@ "File" msgstr "Cyfuno" -#: directorymergewindow.cpp:3391 +#: directorymergewindow.cpp:3405 #, kde-format msgid "Fold All Subdirs" msgstr "" -#: directorymergewindow.cpp:3392 +#: directorymergewindow.cpp:3406 #, kde-format msgid "Unfold All Subdirs" msgstr "" #. i18n("Save Directory Merge State ..."), 0, this, &DirectoryMergeWindow::slotSaveMergeState, ac, "dir_save_merge_state"); #. i18n("Load Directory Merge State ..."), 0, this, &DirectoryMergeWindow::slotLoadMergeState, ac, "dir_load_merge_state"); -#: directorymergewindow.cpp:3396 +#: directorymergewindow.cpp:3410 #, kde-format msgid "Choose A for All Items" msgstr "" -#: directorymergewindow.cpp:3397 +#: directorymergewindow.cpp:3411 #, kde-format msgid "Choose B for All Items" msgstr "" -#: directorymergewindow.cpp:3398 +#: directorymergewindow.cpp:3412 #, kde-format msgid "Choose C for All Items" msgstr "" -#: directorymergewindow.cpp:3399 +#: directorymergewindow.cpp:3413 #, kde-format msgid "Auto-Choose Operation for All Items" msgstr "" -#: directorymergewindow.cpp:3400 +#: directorymergewindow.cpp:3414 #, kde-format msgid "No Operation for All Items" msgstr "" #. i18n("Synchronize Directories"), 0, this, &DirectoryMergeWindow::slotSynchronizeDirectories, ac, "dir_synchronize_directories"); #. d->m_pDirChooseNewerFiles = GuiUtils::createAction< KToggleAction >(i18n("Copy Newer Files Instead of Merging"), 0, this, &DirectoryMergeWindow::slotChooseNewerFiles, ac, "dir_choose_newer_files"); -#: directorymergewindow.cpp:3405 +#: directorymergewindow.cpp:3419 #, kde-format msgid "Show Identical Files" msgstr "" -#: directorymergewindow.cpp:3405 +#: directorymergewindow.cpp:3419 #, kde-format msgid "" "Identical\n" "Files" msgstr "" -#: directorymergewindow.cpp:3406 +#: directorymergewindow.cpp:3420 #, kde-format msgid "Show Different Files" msgstr "" -#: directorymergewindow.cpp:3407 +#: directorymergewindow.cpp:3421 #, kde-format msgid "Show Files only in A" msgstr "" -#: directorymergewindow.cpp:3407 +#: directorymergewindow.cpp:3421 #, kde-format msgid "" "Files\n" "only in A" msgstr "" -#: directorymergewindow.cpp:3408 +#: directorymergewindow.cpp:3422 #, kde-format msgid "Show Files only in B" msgstr "" -#: directorymergewindow.cpp:3408 +#: directorymergewindow.cpp:3422 #, kde-format msgid "" "Files\n" "only in B" msgstr "" -#: directorymergewindow.cpp:3409 +#: directorymergewindow.cpp:3423 #, kde-format msgid "Show Files only in C" msgstr "" -#: directorymergewindow.cpp:3409 +#: directorymergewindow.cpp:3423 #, kde-format msgid "" "Files\n" "only in C" msgstr "" -#: directorymergewindow.cpp:3413 +#: directorymergewindow.cpp:3427 #, kde-format msgid "Compare Explicitly Selected Files" msgstr "" -#: directorymergewindow.cpp:3414 +#: directorymergewindow.cpp:3428 #, kde-format msgid "Merge Explicitly Selected Files" msgstr "" -#: directorymergewindow.cpp:3416 directorymergewindow.cpp:3423 +#: directorymergewindow.cpp:3430 directorymergewindow.cpp:3437 #, kde-format msgid "Do Nothing" msgstr "" -#: directorymergewindow.cpp:3428 +#: directorymergewindow.cpp:3442 #, kde-format msgid "Delete A && B" msgstr "" -#: directorymergewindow.cpp:3431 +#: directorymergewindow.cpp:3445 #, kde-format msgid "Merge to A && B" msgstr "" -#: fileaccess.cpp:462 SourceData.cpp:493 +#: fileaccess.cpp:301 +#, kde-format +msgid "Unable to determine full url. No parent specified." +msgstr "" + +#: fileaccess.cpp:482 SourceData.cpp:506 #, kde-format msgid "Failed to read file: %1" msgstr "" -#: fileaccess.cpp:587 +#: fileaccess.cpp:624 #, kde-format msgid "Creating temp copy of %1 failed." msgstr "" -#: fileaccess.cpp:595 fileaccess.cpp:600 +#: fileaccess.cpp:632 fileaccess.cpp:637 #, kde-format msgid "Opening %1 failed. %2" msgstr "" -#: fileaccess.cpp:619 fileaccess.cpp:627 +#: fileaccess.cpp:656 fileaccess.cpp:664 #, kde-format msgid "Error reading from %1. %2" msgstr "" -#: fileaccess.cpp:751 +#: fileaccess.cpp:788 #, kde-format msgid "" "While trying to make a backup, deleting an older backup failed.\n" "Filename: %1" msgstr "" -#: fileaccess.cpp:758 +#: fileaccess.cpp:795 #, kde-format msgid "" "While trying to make a backup, renaming failed.\n" "Filenames: %1 -> %2" msgstr "" -#: fileaccess.cpp:828 +#: fileaccess.cpp:865 #, kde-format msgid "Getting file status: %1" msgstr "" -#: fileaccess.cpp:869 +#: fileaccess.cpp:906 #, kde-format msgid "Reading file: %1" msgstr "" -#: fileaccess.cpp:907 +#: fileaccess.cpp:944 #, kde-format msgid "Writing file: %1" msgstr "" -#: fileaccess.cpp:940 +#: fileaccess.cpp:977 #, kde-format msgid "Out of memory" msgstr "Allan o Gof." -#: fileaccess.cpp:976 +#: fileaccess.cpp:1013 #, kde-format msgid "Making directory: %1" msgstr "" -#: fileaccess.cpp:997 +#: fileaccess.cpp:1034 #, kde-format msgid "Removing directory: %1" msgstr "" -#: fileaccess.cpp:1012 +#: fileaccess.cpp:1049 #, kde-format msgid "Removing file: %1" msgstr "" -#: fileaccess.cpp:1028 +#: fileaccess.cpp:1065 #, kde-format msgid "Creating symbolic link: %1 -> %2" msgstr "" -#: fileaccess.cpp:1052 +#: fileaccess.cpp:1089 #, kde-format msgid "Renaming file: %1 -> %2" msgstr "" -#: fileaccess.cpp:1086 +#: fileaccess.cpp:1123 #, kde-format msgid "Copying file: %1 -> %2" msgstr "" -#: fileaccess.cpp:1108 +#: fileaccess.cpp:1145 #, fuzzy, kde-format #| msgid "&Directory" msgid "Reading directory: %1" msgstr "&Cyfeiriadur" -#: fileaccess.cpp:1162 +#: fileaccess.cpp:1202 #, kde-format msgid "Listing directory: %1" msgstr "" -#: kdiff3.cpp:181 +#: kdiff3.cpp:182 #, kde-format msgid "Current Configuration:" msgstr "" -#: kdiff3.cpp:186 +#: kdiff3.cpp:187 #, fuzzy, kde-format msgid "Config Option Error:" msgstr "Gwall agor ffeil" -#: kdiff3.cpp:240 +#: kdiff3.cpp:246 #, kde-format msgid "Option --auto used, but no output file specified." msgstr "" -#: kdiff3.cpp:416 +#: kdiff3.cpp:405 #, kde-format msgid "Option --auto ignored for directory comparison." msgstr "" -#: kdiff3.cpp:460 +#: kdiff3.cpp:449 #, kde-format msgid "Saving failed." msgstr "" -#: kdiff3.cpp:496 pdiff.cpp:1098 +#: kdiff3.cpp:494 pdiff.cpp:1096 #, kde-format msgid "Opening of these files failed:" msgstr "" -#: kdiff3.cpp:505 +#: kdiff3.cpp:503 pdiff.cpp:1105 #, kde-format -msgid "File Open Error" +msgid "File open error" msgstr "Gwall agor ffeil" -#: kdiff3.cpp:533 +#: kdiff3.cpp:532 #, kde-format msgid "Opens documents for comparison..." msgstr "" -#: kdiff3.cpp:535 +#: kdiff3.cpp:534 #, fuzzy, kde-format #| msgid "Ready." msgid "Reload" msgstr "Parod." -#: kdiff3.cpp:538 +#: kdiff3.cpp:537 #, kde-format msgid "Saves the merge result. All conflicts must be solved!" msgstr "" -#: kdiff3.cpp:540 +#: kdiff3.cpp:539 #, kde-format msgid "Saves the current document as..." msgstr "" -#: kdiff3.cpp:543 +#: kdiff3.cpp:542 #, kde-format msgid "Print the differences" msgstr "" -#: kdiff3.cpp:546 +#: kdiff3.cpp:545 #, kde-format msgid "Quits the application" msgstr "Terfynu'r cymhwysiad" -#: kdiff3.cpp:549 +#: kdiff3.cpp:548 #, kde-format msgid "Cuts the selected section and puts it to the clipboard" msgstr "Torri'r adran dewisiedig a'i roi ar y gludfwrdd" -#: kdiff3.cpp:552 +#: kdiff3.cpp:551 #, kde-format msgid "Copies the selected section to the clipboard" msgstr "Copïo'r adran dewisiedig i'r gludfwrdd" -#: kdiff3.cpp:554 +#: kdiff3.cpp:553 #, fuzzy, kde-format #| msgid "Pastes the clipboard contents to actual position" msgid "Pastes the clipboard contents to current position" msgstr "Gludo cynnwys y gludfwrdd i'r fan wirioneddol" -#: kdiff3.cpp:557 +#: kdiff3.cpp:556 #, kde-format msgid "Select everything in current window" msgstr "" -#: kdiff3.cpp:560 +#: kdiff3.cpp:559 #, kde-format msgid "Search for a string" msgstr "" -#: kdiff3.cpp:562 +#: kdiff3.cpp:561 #, kde-format msgid "Search again for the string" msgstr "" -#: kdiff3.cpp:567 +#: kdiff3.cpp:566 #, kde-format msgid "Enables/disables the statusbar" msgstr "Galluogi/analluogi'r bar cyflwr" -#: kdiff3.cpp:571 +#: kdiff3.cpp:570 #, kde-format msgid "Configure KDiff3..." msgstr "" -#: kdiff3.cpp:590 +#: kdiff3.cpp:589 #, kde-format msgid "Go to Current Delta" msgstr "" -#: kdiff3.cpp:590 +#: kdiff3.cpp:589 #, kde-format msgid "" "Current\n" "Delta" msgstr "" -#: kdiff3.cpp:592 +#: kdiff3.cpp:591 #, kde-format msgid "Go to First Delta" msgstr "" -#: kdiff3.cpp:592 +#: kdiff3.cpp:591 #, kde-format msgid "" "First\n" "Delta" msgstr "" -#: kdiff3.cpp:594 +#: kdiff3.cpp:593 #, kde-format msgid "Go to Last Delta" msgstr "" -#: kdiff3.cpp:594 +#: kdiff3.cpp:593 #, kde-format msgid "" "Last\n" "Delta" msgstr "" -#: kdiff3.cpp:596 +#: kdiff3.cpp:595 #, kde-format msgid "(Skips white space differences when \"Show White Space\" is disabled.)" msgstr "" -#: kdiff3.cpp:597 +#: kdiff3.cpp:596 #, kde-format msgid "" "(Does not skip white space differences even when \"Show White Space\" is " "disabled.)" msgstr "" -#: kdiff3.cpp:598 +#: kdiff3.cpp:597 #, kde-format msgid "Go to Previous Delta" msgstr "" -#: kdiff3.cpp:598 +#: kdiff3.cpp:597 #, kde-format msgid "" "Prev\n" "Delta" msgstr "" -#: kdiff3.cpp:600 +#: kdiff3.cpp:599 #, kde-format msgid "Go to Next Delta" msgstr "" -#: kdiff3.cpp:600 +#: kdiff3.cpp:599 #, kde-format msgid "" "Next\n" "Delta" msgstr "" -#: kdiff3.cpp:602 +#: kdiff3.cpp:601 #, kde-format msgid "Go to Previous Conflict" msgstr "" -#: kdiff3.cpp:602 +#: kdiff3.cpp:601 #, fuzzy, kde-format #| msgid "Conflicts" msgid "" @@ -1198,12 +1203,12 @@ "Conflict" msgstr "Gwrthdrawiadau" -#: kdiff3.cpp:604 +#: kdiff3.cpp:603 #, kde-format msgid "Go to Next Conflict" msgstr "" -#: kdiff3.cpp:604 +#: kdiff3.cpp:603 #, fuzzy, kde-format #| msgid "Conflicts" msgid "" @@ -1211,303 +1216,303 @@ "Conflict" msgstr "Gwrthdrawiadau" -#: kdiff3.cpp:606 +#: kdiff3.cpp:605 #, kde-format msgid "Go to Previous Unsolved Conflict" msgstr "" -#: kdiff3.cpp:606 +#: kdiff3.cpp:605 #, kde-format msgid "" "Prev\n" "Unsolved" msgstr "" -#: kdiff3.cpp:608 +#: kdiff3.cpp:607 #, kde-format msgid "Go to Next Unsolved Conflict" msgstr "" -#: kdiff3.cpp:608 +#: kdiff3.cpp:607 #, kde-format msgid "" "Next\n" "Unsolved" msgstr "" -#: kdiff3.cpp:610 +#: kdiff3.cpp:609 #, kde-format msgid "Select Line(s) From A" msgstr "" -#: kdiff3.cpp:610 +#: kdiff3.cpp:609 #, kde-format msgid "" "Choose\n" "A" msgstr "" -#: kdiff3.cpp:611 +#: kdiff3.cpp:610 #, kde-format msgid "Select Line(s) From B" msgstr "" -#: kdiff3.cpp:611 +#: kdiff3.cpp:610 #, kde-format msgid "" "Choose\n" "B" msgstr "" -#: kdiff3.cpp:612 +#: kdiff3.cpp:611 #, kde-format msgid "Select Line(s) From C" msgstr "" -#: kdiff3.cpp:612 +#: kdiff3.cpp:611 #, kde-format msgid "" "Choose\n" "C" msgstr "" -#: kdiff3.cpp:613 +#: kdiff3.cpp:612 #, kde-format msgid "Automatically Go to Next Unsolved Conflict After Source Selection" msgstr "" -#: kdiff3.cpp:613 +#: kdiff3.cpp:612 #, fuzzy, kde-format msgid "" "Auto\n" "Next" msgstr "dim detholiad" -#: kdiff3.cpp:615 +#: kdiff3.cpp:614 #, kde-format msgid "Show Space && Tabulator Characters" msgstr "" -#: kdiff3.cpp:615 +#: kdiff3.cpp:614 #, kde-format msgid "" "White\n" "Characters" msgstr "" -#: kdiff3.cpp:616 +#: kdiff3.cpp:615 #, kde-format msgid "Show White Space" msgstr "" -#: kdiff3.cpp:616 +#: kdiff3.cpp:615 #, kde-format msgid "" "White\n" "Deltas" msgstr "" -#: kdiff3.cpp:618 +#: kdiff3.cpp:617 #, kde-format msgid "Show Line Numbers" msgstr "" -#: kdiff3.cpp:618 +#: kdiff3.cpp:617 #, kde-format msgid "" "Line\n" "Numbers" msgstr "" -#: kdiff3.cpp:620 +#: kdiff3.cpp:619 #, kde-format msgid "Automatically Solve Simple Conflicts" msgstr "" -#: kdiff3.cpp:621 +#: kdiff3.cpp:620 #, kde-format msgid "Set Deltas to Conflicts" msgstr "" -#: kdiff3.cpp:622 +#: kdiff3.cpp:621 #, kde-format msgid "Run Regular Expression Auto Merge" msgstr "" -#: kdiff3.cpp:623 +#: kdiff3.cpp:622 #, kde-format msgid "Automatically Solve History Conflicts" msgstr "" -#: kdiff3.cpp:624 +#: kdiff3.cpp:623 #, kde-format msgid "Split Diff At Selection" msgstr "" -#: kdiff3.cpp:625 +#: kdiff3.cpp:624 #, kde-format msgid "Join Selected Diffs" msgstr "" -#: kdiff3.cpp:627 +#: kdiff3.cpp:626 #, kde-format msgid "Show Window A" msgstr "" -#: kdiff3.cpp:628 +#: kdiff3.cpp:627 #, kde-format msgid "Show Window B" msgstr "" -#: kdiff3.cpp:629 +#: kdiff3.cpp:628 #, kde-format msgid "Show Window C" msgstr "" -#: kdiff3.cpp:631 +#: kdiff3.cpp:630 #, kde-format msgid "Normal Overview" msgstr "" -#: kdiff3.cpp:632 +#: kdiff3.cpp:631 #, kde-format msgid "A vs. B Overview" msgstr "" -#: kdiff3.cpp:633 +#: kdiff3.cpp:632 #, kde-format msgid "A vs. C Overview" msgstr "" -#: kdiff3.cpp:634 +#: kdiff3.cpp:633 #, kde-format msgid "B vs. C Overview" msgstr "" -#: kdiff3.cpp:635 +#: kdiff3.cpp:634 #, kde-format msgid "Word Wrap Diff Windows" msgstr "" -#: kdiff3.cpp:636 +#: kdiff3.cpp:635 #, kde-format msgid "Add Manual Diff Alignment" msgstr "" -#: kdiff3.cpp:637 +#: kdiff3.cpp:636 #, kde-format msgid "Clear All Manual Diff Alignments" msgstr "" -#: kdiff3.cpp:639 +#: kdiff3.cpp:638 #, kde-format msgid "Focus Next Window" msgstr "" -#: kdiff3.cpp:640 +#: kdiff3.cpp:639 #, kde-format msgid "Focus Prev Window" msgstr "" -#: kdiff3.cpp:641 +#: kdiff3.cpp:640 #, kde-format msgid "Toggle Split Orientation" msgstr "" -#: kdiff3.cpp:643 +#: kdiff3.cpp:642 #, kde-format msgid "Dir && Text Split Screen View" msgstr "" -#: kdiff3.cpp:645 +#: kdiff3.cpp:644 #, kde-format msgid "Toggle Between Dir && Text View" msgstr "" -#: kdiff3.cpp:697 pdiff.cpp:1909 +#: kdiff3.cpp:696 pdiff.cpp:1919 #, kde-format msgid "The merge result has not been saved." msgstr "" -#: kdiff3.cpp:699 +#: kdiff3.cpp:698 #, kde-format msgid "Save && Quit" msgstr "" -#: kdiff3.cpp:700 +#: kdiff3.cpp:699 #, kde-format msgid "Quit Without Saving" msgstr "Gorffen heb gadw" -#: kdiff3.cpp:708 pdiff.cpp:1920 +#: kdiff3.cpp:707 pdiff.cpp:1930 #, kde-format msgid "Saving the merge result failed." msgstr "" -#: kdiff3.cpp:719 pdiff.cpp:1032 +#: kdiff3.cpp:718 pdiff.cpp:1030 #, kde-format msgid "" "You are currently doing a directory merge. Are you sure, you want to abort?" msgstr "" -#: kdiff3.cpp:742 +#: kdiff3.cpp:741 #, kde-format msgid "Saving file..." msgstr "Yn cadw ffeil..." -#: kdiff3.cpp:759 +#: kdiff3.cpp:758 #, kde-format msgid "Saving file with a new filename..." msgstr "" -#: kdiff3.cpp:761 +#: kdiff3.cpp:760 #, kde-format msgid "Save As..." msgstr "" -#: kdiff3.cpp:820 +#: kdiff3.cpp:819 #, kde-format msgid "Printing not implemented." msgstr "" -#: kdiff3.cpp:857 +#: kdiff3.cpp:858 #, fuzzy, kde-format #| msgid "Printing..." msgid "Printing..." msgstr "Argraffu..." -#: kdiff3.cpp:943 +#: kdiff3.cpp:948 #, kde-format msgid "Printing page %1 of %2" msgstr "" -#: kdiff3.cpp:1000 +#: kdiff3.cpp:1006 #, fuzzy, kde-format #| msgid "Selection" msgid " (Selection)" msgstr "Dewisiad" -#: kdiff3.cpp:1027 +#: kdiff3.cpp:1034 #, kde-format msgid "Printing completed." msgstr "" -#: kdiff3.cpp:1031 +#: kdiff3.cpp:1038 #, kde-format msgid "Printing aborted." msgstr "" -#: kdiff3.cpp:1038 +#: kdiff3.cpp:1045 #, kde-format msgid "Exiting..." msgstr "Terfynu..." -#: kdiff3.cpp:1049 +#: kdiff3.cpp:1056 #, kde-format msgid "Toggling toolbar..." msgstr "Dangos/cuddio'r bar offer..." -#: kdiff3.cpp:1070 +#: kdiff3.cpp:1077 #, kde-format msgid "Toggle the statusbar..." msgstr "Dangos/cuddio'r bar cyflwr..." @@ -1532,7 +1537,7 @@ msgid "Joachim Eibl" msgstr "" -#: kdiff3_part.cpp:173 kdiff3_part.cpp:254 +#: kdiff3_part.cpp:174 kdiff3_part.cpp:255 #, kde-format msgid "Could not find files for comparison." msgstr "" @@ -1551,7 +1556,7 @@ msgstr "Ffurfweddu..." #. i18n: ectx: ToolBar (mainToolBar) -#: kdiff3_part.rc:16 main.cpp:88 +#: kdiff3_part.rc:16 main.cpp:89 #, kde-format msgid "KDiff3" msgstr "" @@ -1620,198 +1625,203 @@ msgid "Main Toolbar" msgstr "" -#: main.cpp:68 main.cpp:72 +#: main.cpp:69 main.cpp:73 #, kde-format msgid "Ignored. (User defined.)" msgstr "" -#: main.cpp:92 +#: main.cpp:93 #, kde-format msgid " (64 bit)" msgstr "" -#: main.cpp:94 +#: main.cpp:95 #, kde-format msgid " (32 bit)" msgstr "" -#: main.cpp:95 +#: main.cpp:96 #, kde-format msgid "Tool for Comparison and Merge of Files and Directories" msgstr "" -#: main.cpp:96 +#: main.cpp:97 #, kde-format msgid "(c) 2002-2014 Joachim Eibl, (c) 2017 Michael Reeves KF5/Qt5 port" msgstr "" -#: main.cpp:112 +#: main.cpp:113 #, kde-format msgid "Merge the input." msgstr "" -#: main.cpp:113 +#: main.cpp:114 #, kde-format msgid "Explicit base file. For compatibility with certain tools." msgstr "" -#: main.cpp:114 +#: main.cpp:115 #, kde-format msgid "Output file. Implies -m. E.g.: -o newfile.txt" msgstr "" -#: main.cpp:115 +#: main.cpp:116 #, kde-format msgid "Output file, again. (For compatibility with certain tools.)" msgstr "" -#: main.cpp:116 +#: main.cpp:118 #, kde-format msgid "No GUI if all conflicts are auto-solvable. (Needs -o file)" msgstr "" -#: main.cpp:117 +#: main.cpp:120 +#, kde-format +msgid "Ignored." +msgstr "" + +#: main.cpp:122 #, kde-format msgid "Do not solve conflicts automatically." msgstr "" -#: main.cpp:118 +#: main.cpp:123 #, kde-format msgid "Visible name replacement for input file 1 (base)." msgstr "" -#: main.cpp:119 +#: main.cpp:124 #, kde-format msgid "Visible name replacement for input file 2." msgstr "" -#: main.cpp:120 +#: main.cpp:125 #, kde-format msgid "Visible name replacement for input file 3." msgstr "" -#: main.cpp:121 +#: main.cpp:126 #, kde-format msgid "Alternative visible name replacement. Supply this once for every input." msgstr "" -#: main.cpp:122 +#: main.cpp:127 #, kde-format msgid "" "Override a config setting. Use once for every setting. E.g.: --cs " "\"AutoAdvance=1\"" msgstr "" -#: main.cpp:123 +#: main.cpp:128 #, kde-format msgid "Show list of config settings and current values." msgstr "" -#: main.cpp:124 +#: main.cpp:129 #, kde-format msgid "Use a different config file." msgstr "" -#: main.cpp:127 +#: main.cpp:132 #, kde-format msgid "file1 to open (base, if not specified via --base)" msgstr "" -#: main.cpp:128 +#: main.cpp:133 #, kde-format msgid "file2 to open" msgstr "" -#: main.cpp:129 +#: main.cpp:134 #, kde-format msgid "file3 to open" msgstr "" -#: main.cpp:153 +#: main.cpp:158 #, kde-format msgid "See kdiff3 --help for supported options." msgstr "" -#: mergeresultwindow.cpp:158 +#: mergeresultwindow.cpp:171 #, kde-format msgid "Choose A Everywhere" msgstr "" -#: mergeresultwindow.cpp:159 +#: mergeresultwindow.cpp:172 #, kde-format msgid "Choose B Everywhere" msgstr "" -#: mergeresultwindow.cpp:160 +#: mergeresultwindow.cpp:173 #, kde-format msgid "Choose C Everywhere" msgstr "" -#: mergeresultwindow.cpp:161 +#: mergeresultwindow.cpp:174 #, kde-format msgid "Choose A for All Unsolved Conflicts" msgstr "" -#: mergeresultwindow.cpp:162 +#: mergeresultwindow.cpp:175 #, kde-format msgid "Choose B for All Unsolved Conflicts" msgstr "" -#: mergeresultwindow.cpp:163 +#: mergeresultwindow.cpp:176 #, kde-format msgid "Choose C for All Unsolved Conflicts" msgstr "" -#: mergeresultwindow.cpp:164 +#: mergeresultwindow.cpp:177 #, kde-format msgid "Choose A for All Unsolved Whitespace Conflicts" msgstr "" -#: mergeresultwindow.cpp:165 +#: mergeresultwindow.cpp:178 #, kde-format msgid "Choose B for All Unsolved Whitespace Conflicts" msgstr "" -#: mergeresultwindow.cpp:166 +#: mergeresultwindow.cpp:179 #, kde-format msgid "Choose C for All Unsolved Whitespace Conflicts" msgstr "" -#: mergeresultwindow.cpp:176 +#: mergeresultwindow.cpp:204 #, kde-format msgid "Number of remaining unsolved conflicts: %1 (of which %2 are whitespace)" msgstr "" -#: mergeresultwindow.cpp:370 +#: mergeresultwindow.cpp:398 #, kde-format msgid "" "The output has been modified.\n" "If you continue your changes will be lost." msgstr "" -#: mergeresultwindow.cpp:936 pdiff.cpp:827 +#: mergeresultwindow.cpp:964 pdiff.cpp:817 #, kde-format msgid "All input files are binary equal." msgstr "" -#: mergeresultwindow.cpp:938 +#: mergeresultwindow.cpp:966 #, kde-format msgid "All input files contain the same text." msgstr "" -#: mergeresultwindow.cpp:942 mergeresultwindow.cpp:946 -#: mergeresultwindow.cpp:950 pdiff.cpp:833 pdiff.cpp:837 pdiff.cpp:841 +#: mergeresultwindow.cpp:970 mergeresultwindow.cpp:974 +#: mergeresultwindow.cpp:978 pdiff.cpp:823 pdiff.cpp:827 pdiff.cpp:831 #, kde-format msgid "Files %1 and %2 are binary equal.\n" msgstr "" -#: mergeresultwindow.cpp:944 mergeresultwindow.cpp:948 -#: mergeresultwindow.cpp:952 +#: mergeresultwindow.cpp:972 mergeresultwindow.cpp:976 +#: mergeresultwindow.cpp:980 #, kde-format msgid "Files %1 and %2 have equal text.\n" msgstr "" -#: mergeresultwindow.cpp:958 +#: mergeresultwindow.cpp:986 #, kde-format msgid "" "Total number of conflicts: %1\n" @@ -1820,39 +1830,39 @@ "%4" msgstr "" -#: mergeresultwindow.cpp:964 +#: mergeresultwindow.cpp:992 #, kde-format msgid "Conflicts" msgstr "Gwrthdrawiadau" -#: mergeresultwindow.cpp:1873 +#: mergeresultwindow.cpp:1901 #, kde-format msgid "" msgstr "" -#: mergeresultwindow.cpp:1881 +#: mergeresultwindow.cpp:1909 #, kde-format msgid "" msgstr "" -#: mergeresultwindow.cpp:1883 mergeresultwindow.cpp:2755 +#: mergeresultwindow.cpp:1911 mergeresultwindow.cpp:2783 #, kde-format msgid "" msgstr "" -#: mergeresultwindow.cpp:2967 +#: mergeresultwindow.cpp:2995 #, kde-format msgid "" "Not all conflicts are solved yet.\n" "File not saved." msgstr "" -#: mergeresultwindow.cpp:2969 mergeresultwindow.cpp:2978 +#: mergeresultwindow.cpp:2997 mergeresultwindow.cpp:3006 #, kde-format msgid "Conflicts Left" msgstr "" -#: mergeresultwindow.cpp:2976 +#: mergeresultwindow.cpp:3004 #, kde-format msgid "" "There is a line end style conflict. Please choose the line end style " @@ -1860,7 +1870,7 @@ "File not saved." msgstr "" -#: mergeresultwindow.cpp:2990 +#: mergeresultwindow.cpp:3018 #, kde-format msgid "" "\n" @@ -1868,59 +1878,59 @@ "Creating backup failed. File not saved." msgstr "" -#: mergeresultwindow.cpp:2990 mergeresultwindow.cpp:3038 +#: mergeresultwindow.cpp:3018 mergeresultwindow.cpp:3066 #, kde-format msgid "File Save Error" msgstr "" -#: mergeresultwindow.cpp:3038 +#: mergeresultwindow.cpp:3066 #, kde-format msgid "Error while writing." msgstr "" -#: mergeresultwindow.cpp:3110 +#: mergeresultwindow.cpp:3138 #, fuzzy, kde-format #| msgid "Output" msgid "Output:" msgstr "Allbwn" -#: mergeresultwindow.cpp:3123 mergeresultwindow.cpp:3315 +#: mergeresultwindow.cpp:3151 mergeresultwindow.cpp:3343 #, kde-format msgid "[Modified]" msgstr "" -#: mergeresultwindow.cpp:3130 +#: mergeresultwindow.cpp:3158 #, kde-format msgid "Encoding for saving:" msgstr "" -#: mergeresultwindow.cpp:3230 +#: mergeresultwindow.cpp:3258 #, fuzzy, kde-format #| msgid "Conflicts" msgid "Conflict" msgstr "Gwrthdrawiadau" -#: mergeresultwindow.cpp:3262 +#: mergeresultwindow.cpp:3290 #, kde-format msgid "Codec from A: %1" msgstr "" -#: mergeresultwindow.cpp:3264 +#: mergeresultwindow.cpp:3292 #, kde-format msgid "Codec from B: %1" msgstr "" -#: mergeresultwindow.cpp:3266 +#: mergeresultwindow.cpp:3294 #, kde-format msgid "Codec from C: %1" msgstr "" -#: optiondialog.cpp:119 +#: optiondialog.cpp:121 #, kde-format msgid "Change Font" msgstr "" -#: optiondialog.cpp:135 optiondialog.cpp:145 +#: optiondialog.cpp:137 optiondialog.cpp:147 #, kde-format msgid "" "Font: %1, %2, %3\n" @@ -1928,208 +1938,208 @@ "Example:" msgstr "" -#: optiondialog.cpp:388 +#: optiondialog.cpp:390 #, kde-format msgid "Unicode" msgstr "Ungôd" -#: optiondialog.cpp:389 +#: optiondialog.cpp:391 #, kde-format msgid "Latin1" msgstr "Lladin1" -#: optiondialog.cpp:408 +#: optiondialog.cpp:410 #, kde-format msgid "Change this if non-ASCII characters are not displayed correctly." msgstr "" -#: optiondialog.cpp:491 +#: optiondialog.cpp:495 #, fuzzy, kde-format #| msgid "Configure..." msgid "Configure" msgstr "Ffurfweddu..." -#: optiondialog.cpp:568 +#: optiondialog.cpp:573 #, kde-format msgid "Font" msgstr "" -#: optiondialog.cpp:570 +#: optiondialog.cpp:575 #, kde-format msgid "Editor & Diff Output Font" msgstr "" -#: optiondialog.cpp:589 +#: optiondialog.cpp:594 #, kde-format msgid "Application font" msgstr "" -#: optiondialog.cpp:594 +#: optiondialog.cpp:599 #, kde-format msgid "File view font" msgstr "" -#: optiondialog.cpp:613 +#: optiondialog.cpp:618 #, fuzzy, kde-format #| msgid "Color" msgctxt "Title for color settings page" msgid "Color" msgstr "Lliw" -#: optiondialog.cpp:614 +#: optiondialog.cpp:619 #, fuzzy, kde-format msgid "Colors Settings" msgstr "Gosodiadau Rhanbarthol" -#: optiondialog.cpp:631 +#: optiondialog.cpp:644 #, kde-format msgid "Editor and Diff Views:" msgstr "" -#: optiondialog.cpp:639 +#: optiondialog.cpp:652 #, kde-format msgid "Foreground color:" msgstr "Lliw blaendir:" -#: optiondialog.cpp:647 +#: optiondialog.cpp:660 #, kde-format msgid "Background color:" msgstr "Lliw'r cefndir:" -#: optiondialog.cpp:657 +#: optiondialog.cpp:670 #, kde-format msgid "Diff background color:" msgstr "" -#: optiondialog.cpp:666 +#: optiondialog.cpp:679 #, kde-format msgid "Color A:" msgstr "" -#: optiondialog.cpp:675 +#: optiondialog.cpp:688 #, kde-format msgid "Color B:" msgstr "" -#: optiondialog.cpp:684 +#: optiondialog.cpp:697 #, kde-format msgid "Color C:" msgstr "" -#: optiondialog.cpp:692 +#: optiondialog.cpp:705 #, kde-format msgid "Conflict color:" msgstr "" -#: optiondialog.cpp:701 +#: optiondialog.cpp:714 #, kde-format msgid "Current range background color:" msgstr "" -#: optiondialog.cpp:710 +#: optiondialog.cpp:723 #, kde-format msgid "Current range diff background color:" msgstr "" -#: optiondialog.cpp:718 +#: optiondialog.cpp:731 #, kde-format msgid "Color for manually aligned difference ranges:" msgstr "" -#: optiondialog.cpp:725 +#: optiondialog.cpp:738 #, kde-format msgid "Directory Comparison View:" msgstr "" -#: optiondialog.cpp:731 +#: optiondialog.cpp:744 #, kde-format msgid "Newest file color:" msgstr "" -#: optiondialog.cpp:736 +#: optiondialog.cpp:749 #, kde-format msgid "" "Changing this color will only be effective when starting the next directory " "comparison." msgstr "" -#: optiondialog.cpp:741 +#: optiondialog.cpp:754 #, kde-format msgid "Oldest file color:" msgstr "" -#: optiondialog.cpp:750 +#: optiondialog.cpp:763 #, kde-format msgid "Middle age file color:" msgstr "" -#: optiondialog.cpp:759 +#: optiondialog.cpp:772 #, kde-format msgid "Color for missing files:" msgstr "" -#: optiondialog.cpp:773 +#: optiondialog.cpp:786 #, kde-format msgid "Editor" msgstr "Golygydd" -#: optiondialog.cpp:774 +#: optiondialog.cpp:787 #, kde-format msgid "Editor Behavior" msgstr "" -#: optiondialog.cpp:787 +#: optiondialog.cpp:809 #, kde-format msgid "Tab inserts spaces" msgstr "" -#: optiondialog.cpp:791 +#: optiondialog.cpp:813 #, kde-format msgid "" "On: Pressing tab generates the appropriate number of spaces.\n" "Off: A tab character will be inserted." msgstr "" -#: optiondialog.cpp:796 +#: optiondialog.cpp:818 #, kde-format msgid "Tab size:" msgstr "Maint tab:" -#: optiondialog.cpp:803 +#: optiondialog.cpp:825 #, kde-format msgid "Auto indentation" msgstr "" -#: optiondialog.cpp:807 +#: optiondialog.cpp:829 #, kde-format msgid "On: The indentation of the previous line is used for a new line.\n" msgstr "" -#: optiondialog.cpp:810 +#: optiondialog.cpp:832 #, kde-format msgid "Auto copy selection" msgstr "" -#: optiondialog.cpp:814 +#: optiondialog.cpp:836 #, kde-format msgid "" "On: Any selection is immediately written to the clipboard.\n" "Off: You must explicitly copy e.g. via Ctrl-C." msgstr "" -#: optiondialog.cpp:829 +#: optiondialog.cpp:851 #, kde-format msgid "" "Sets the line endings for when an edited file is saved.\n" "DOS/Windows: CR+LF; UNIX: LF; with CR=0D, LF=0A" msgstr "" -#: optiondialog.cpp:839 +#: optiondialog.cpp:861 #, kde-format msgid "Diff" msgstr "" -#: optiondialog.cpp:840 +#: optiondialog.cpp:862 #, fuzzy, kde-format msgid "Diff Settings" msgstr "Gosodiadau Rhanbarthol" @@ -2143,12 +2153,12 @@ #. ); #. ++line; #. -#: optiondialog.cpp:865 +#: optiondialog.cpp:896 #, kde-format msgid "Ignore numbers (treat as white space)" msgstr "" -#: optiondialog.cpp:869 +#: optiondialog.cpp:900 #, kde-format msgid "" "Ignore number characters during line matching phase. (Similar to Ignore " @@ -2156,66 +2166,66 @@ "Might help to compare files with numeric data." msgstr "" -#: optiondialog.cpp:873 +#: optiondialog.cpp:904 #, kde-format msgid "Ignore C/C++ comments (treat as white space)" msgstr "" -#: optiondialog.cpp:876 +#: optiondialog.cpp:907 #, kde-format msgid "Treat C/C++ comments like white space." msgstr "" -#: optiondialog.cpp:879 +#: optiondialog.cpp:910 #, kde-format msgid "Ignore case (treat as white space)" msgstr "" -#: optiondialog.cpp:883 +#: optiondialog.cpp:914 #, kde-format msgid "Treat case differences like white space changes. ('a'<=>'A')" msgstr "" -#: optiondialog.cpp:886 +#: optiondialog.cpp:917 #, kde-format msgid "Preprocessor command:" msgstr "" -#: optiondialog.cpp:891 +#: optiondialog.cpp:922 #, kde-format msgid "User defined pre-processing. (See the docs for details.)" msgstr "" -#: optiondialog.cpp:894 +#: optiondialog.cpp:925 #, kde-format msgid "Line-matching preprocessor command:" msgstr "" -#: optiondialog.cpp:899 +#: optiondialog.cpp:930 #, kde-format msgid "" "This pre-processor is only used during line matching.\n" "(See the docs for details.)" msgstr "" -#: optiondialog.cpp:902 +#: optiondialog.cpp:933 #, kde-format msgid "Try hard (slower)" msgstr "" -#: optiondialog.cpp:906 +#: optiondialog.cpp:937 #, kde-format msgid "" "Enables the --minimal option for the external diff.\n" "The analysis of big files will be much slower." msgstr "" -#: optiondialog.cpp:910 +#: optiondialog.cpp:941 #, kde-format msgid "Align B and C for 3 input files" msgstr "" -#: optiondialog.cpp:914 +#: optiondialog.cpp:945 #, kde-format msgid "" "Try to align B and C when comparing or merging three input files.\n" @@ -2223,66 +2233,73 @@ "(Default is off.)" msgstr "" -#: optiondialog.cpp:926 +#: optiondialog.cpp:956 +#, fuzzy, kde-format +#| msgid "Merge" +msgctxt "Settings page" +msgid "Merge" +msgstr "Cyfuno" + +#: optiondialog.cpp:957 #, fuzzy, kde-format msgid "Merge Settings" msgstr "Gosodiadau Rhanbarthol" -#: optiondialog.cpp:940 +#: optiondialog.cpp:980 #, kde-format msgid "Auto advance delay (ms):" msgstr "" -#: optiondialog.cpp:946 +#: optiondialog.cpp:986 #, kde-format 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 "" -#: optiondialog.cpp:950 +#: optiondialog.cpp:990 #, kde-format msgid "Show info dialogs" msgstr "" -#: optiondialog.cpp:953 +#: optiondialog.cpp:993 #, kde-format msgid "Show a dialog with information about the number of conflicts." msgstr "" -#: optiondialog.cpp:956 +#: optiondialog.cpp:996 #, kde-format msgid "White space 2-file merge default:" msgstr "" -#: optiondialog.cpp:961 optiondialog.cpp:974 +#: optiondialog.cpp:1001 optiondialog.cpp:1014 #, kde-format msgid "Manual Choice" msgstr "Dewis gyda llaw" -#: optiondialog.cpp:965 optiondialog.cpp:979 +#: optiondialog.cpp:1005 optiondialog.cpp:1019 #, kde-format msgid "" "Allow the merge algorithm to automatically select an input for white-space-" "only changes." msgstr "" -#: optiondialog.cpp:969 +#: optiondialog.cpp:1009 #, kde-format msgid "White space 3-file merge default:" msgstr "" -#: optiondialog.cpp:983 +#: optiondialog.cpp:1023 #, kde-format msgid "Automatic Merge Regular Expression" msgstr "" -#: optiondialog.cpp:991 smalldialogs.cpp:449 +#: optiondialog.cpp:1031 smalldialogs.cpp:459 #, kde-format msgid "Auto merge regular expression:" msgstr "" -#: optiondialog.cpp:996 +#: optiondialog.cpp:1036 #, kde-format msgid "" "Regular expression for lines where KDiff3 should automatically choose one " @@ -2291,29 +2308,29 @@ "- if available - C, otherwise B will be chosen." msgstr "" -#: optiondialog.cpp:1002 +#: optiondialog.cpp:1042 #, kde-format msgid "Run regular expression auto merge on merge start" msgstr "" -#: optiondialog.cpp:1005 +#: optiondialog.cpp:1045 #, kde-format msgid "" "Run the merge for auto merge regular expressions\n" "immediately when a merge starts.\n" msgstr "" -#: optiondialog.cpp:1010 +#: optiondialog.cpp:1050 #, kde-format msgid "Version Control History Merging" msgstr "" -#: optiondialog.cpp:1018 smalldialogs.cpp:476 +#: optiondialog.cpp:1058 smalldialogs.cpp:486 #, kde-format msgid "History start regular expression:" msgstr "" -#: optiondialog.cpp:1023 +#: optiondialog.cpp:1063 #, kde-format msgid "" "Regular expression for the start of the version control history entry.\n" @@ -2321,12 +2338,12 @@ "Default value: \".*\\$Log.*\\$.*\"" msgstr "" -#: optiondialog.cpp:1029 smalldialogs.cpp:504 +#: optiondialog.cpp:1069 smalldialogs.cpp:514 #, kde-format msgid "History entry start regular expression:" msgstr "" -#: optiondialog.cpp:1042 +#: optiondialog.cpp:1082 #, kde-format msgid "" "A version control history entry consists of several lines.\n" @@ -2338,22 +2355,22 @@ "See the documentation for details." msgstr "" -#: optiondialog.cpp:1050 +#: optiondialog.cpp:1090 #, kde-format msgid "History merge sorting" msgstr "" -#: optiondialog.cpp:1053 +#: optiondialog.cpp:1093 #, kde-format msgid "Sort version control history by a key." msgstr "" -#: optiondialog.cpp:1063 +#: optiondialog.cpp:1103 #, kde-format msgid "History entry start sort key order:" msgstr "" -#: optiondialog.cpp:1068 +#: optiondialog.cpp:1108 #, kde-format msgid "" "Each pair of parentheses used in the regular expression for the history " @@ -2365,37 +2382,37 @@ "See the documentation for details." msgstr "" -#: optiondialog.cpp:1079 +#: optiondialog.cpp:1119 #, kde-format msgid "Merge version control history on merge start" msgstr "" -#: optiondialog.cpp:1082 +#: optiondialog.cpp:1122 #, kde-format msgid "Run version control history automerge on merge start." msgstr "" -#: optiondialog.cpp:1086 +#: optiondialog.cpp:1126 #, kde-format msgid "Max number of history entries:" msgstr "" -#: optiondialog.cpp:1090 +#: optiondialog.cpp:1130 #, kde-format msgid "Cut off after specified number. Use -1 for infinite number of entries." msgstr "" -#: optiondialog.cpp:1094 +#: optiondialog.cpp:1134 #, kde-format msgid "Test your regular expressions" msgstr "" -#: optiondialog.cpp:1099 +#: optiondialog.cpp:1139 #, kde-format msgid "Irrelevant merge command:" msgstr "" -#: optiondialog.cpp:1104 +#: optiondialog.cpp:1144 #, kde-format msgid "" "If specified this script is run after automerge\n" @@ -2403,12 +2420,12 @@ "Called with the parameters: filename1 filename2 filename3" msgstr "" -#: optiondialog.cpp:1109 +#: optiondialog.cpp:1149 #, kde-format msgid "Auto save and quit on merge without conflicts" msgstr "" -#: optiondialog.cpp:1113 +#: optiondialog.cpp:1153 #, kde-format msgid "" "If KDiff3 was started for a file-merge from the command line and all\n" @@ -2417,28 +2434,28 @@ "(Similar to command line option \"--auto\".)" msgstr "" -#: optiondialog.cpp:1124 optiondialog.cpp:1125 +#: optiondialog.cpp:1164 optiondialog.cpp:1165 #, fuzzy, kde-format #| msgid "&Directory" msgid "Directory" msgstr "&Cyfeiriadur" -#: optiondialog.cpp:1137 +#: optiondialog.cpp:1185 #, kde-format msgid "Recursive directories" msgstr "" -#: optiondialog.cpp:1140 +#: optiondialog.cpp:1188 #, kde-format msgid "Whether to analyze subdirectories or not." msgstr "" -#: optiondialog.cpp:1142 +#: optiondialog.cpp:1190 #, kde-format msgid "File pattern(s):" msgstr "" -#: optiondialog.cpp:1148 +#: optiondialog.cpp:1196 #, kde-format msgid "" "Pattern(s) of files to be analyzed. \n" @@ -2446,12 +2463,12 @@ "Several Patterns can be specified by using the separator: ';'" msgstr "" -#: optiondialog.cpp:1153 +#: optiondialog.cpp:1201 #, kde-format msgid "File-anti-pattern(s):" msgstr "" -#: optiondialog.cpp:1159 +#: optiondialog.cpp:1207 #, kde-format msgid "" "Pattern(s) of files to be excluded from analysis. \n" @@ -2459,12 +2476,12 @@ "Several Patterns can be specified by using the separator: ';'" msgstr "" -#: optiondialog.cpp:1164 +#: optiondialog.cpp:1212 #, kde-format msgid "Dir-anti-pattern(s):" msgstr "" -#: optiondialog.cpp:1170 +#: optiondialog.cpp:1218 #, kde-format msgid "" "Pattern(s) of directories to be excluded from analysis. \n" @@ -2472,58 +2489,58 @@ "Several Patterns can be specified by using the separator: ';'" msgstr "" -#: optiondialog.cpp:1175 +#: optiondialog.cpp:1223 #, kde-format msgid "Use .cvsignore" msgstr "" -#: optiondialog.cpp:1179 +#: optiondialog.cpp:1227 #, kde-format msgid "" "Extends the antipattern to anything that would be ignored by CVS.\n" "Via local \".cvsignore\" files this can be directory specific." msgstr "" -#: optiondialog.cpp:1183 +#: optiondialog.cpp:1231 #, kde-format msgid "Find hidden files and directories" msgstr "" -#: optiondialog.cpp:1186 +#: optiondialog.cpp:1234 #, kde-format msgid "Finds hidden files and directories." msgstr "" -#: optiondialog.cpp:1189 +#: optiondialog.cpp:1237 #, kde-format msgid "Follow file links" msgstr "" -#: optiondialog.cpp:1193 +#: optiondialog.cpp:1241 #, kde-format msgid "" "On: Compare the file the link points to.\n" "Off: Compare the links." msgstr "" -#: optiondialog.cpp:1197 +#: optiondialog.cpp:1245 #, kde-format msgid "Follow directory links" msgstr "" -#: optiondialog.cpp:1201 +#: optiondialog.cpp:1249 #, kde-format msgid "" "On: Compare the directory the link points to.\n" "Off: Compare the links." msgstr "" -#: optiondialog.cpp:1210 +#: optiondialog.cpp:1258 #, kde-format msgid "Case sensitive filename comparison" msgstr "" -#: optiondialog.cpp:1214 +#: optiondialog.cpp:1262 #, kde-format msgid "" "The directory comparison will compare files or directories when their names " @@ -2532,63 +2549,63 @@ "off, otherwise on.)" msgstr "" -#: optiondialog.cpp:1218 +#: optiondialog.cpp:1266 #, kde-format msgid "Unfold all subdirectories on load" msgstr "" -#: optiondialog.cpp:1222 +#: optiondialog.cpp:1270 #, kde-format msgid "" "On: Unfold all subdirectories when starting a directory diff.\n" "Off: Leave subdirectories folded." msgstr "" -#: optiondialog.cpp:1226 +#: optiondialog.cpp:1274 #, kde-format msgid "Skip directory status report" msgstr "" -#: optiondialog.cpp:1230 +#: optiondialog.cpp:1278 #, kde-format msgid "" "On: Do not show the Directory Comparison Status.\n" "Off: Show the status dialog on start." msgstr "" -#: optiondialog.cpp:1234 +#: optiondialog.cpp:1282 #, kde-format msgid "File Comparison Mode" msgstr "" -#: optiondialog.cpp:1239 +#: optiondialog.cpp:1287 #, kde-format msgid "Binary comparison" msgstr "" -#: optiondialog.cpp:1241 +#: optiondialog.cpp:1289 #, kde-format msgid "Binary comparison of each file. (Default)" msgstr "" -#: optiondialog.cpp:1244 +#: optiondialog.cpp:1292 #, kde-format msgid "Full analysis" msgstr "" -#: optiondialog.cpp:1246 +#: optiondialog.cpp:1294 #, kde-format msgid "" "Do a full analysis and show statistics information in extra columns.\n" "(Slower than a binary comparison, much slower for binary files.)" msgstr "" -#: optiondialog.cpp:1250 +#: optiondialog.cpp:1298 #, kde-format msgid "Trust the size and modification date (unsafe)" msgstr "" -#: optiondialog.cpp:1252 +#: optiondialog.cpp:1300 #, kde-format msgid "" "Assume that files are equal if the modification date and file length are " @@ -2598,14 +2615,14 @@ "Useful for big directories or slow networks." msgstr "" -#: optiondialog.cpp:1257 +#: optiondialog.cpp:1305 #, kde-format msgid "" "Trust the size and date, but use binary comparison if date does not match " "(unsafe)" msgstr "" -#: optiondialog.cpp:1259 +#: optiondialog.cpp:1307 #, kde-format msgid "" "Assume that files are equal if the modification date and file length are " @@ -2614,12 +2631,12 @@ "Useful for big directories or slow networks." msgstr "" -#: optiondialog.cpp:1264 +#: optiondialog.cpp:1312 #, kde-format msgid "Trust the size (unsafe)" msgstr "" -#: optiondialog.cpp:1266 +#: optiondialog.cpp:1314 #, kde-format msgid "" "Assume that files are equal if their file lengths are equal.\n" @@ -2627,12 +2644,12 @@ "download." msgstr "" -#: optiondialog.cpp:1273 +#: optiondialog.cpp:1321 #, kde-format msgid "Synchronize directories" msgstr "" -#: optiondialog.cpp:1277 +#: optiondialog.cpp:1325 #, kde-format msgid "" "Offers to store files in both directories so that\n" @@ -2640,24 +2657,24 @@ "Works only when comparing two directories without specifying a destination." msgstr "" -#: optiondialog.cpp:1283 +#: optiondialog.cpp:1331 #, kde-format msgid "White space differences considered equal" msgstr "" -#: optiondialog.cpp:1287 +#: optiondialog.cpp:1335 #, kde-format msgid "" "If files differ only by white space consider them equal.\n" "This is only active when full analysis is chosen." msgstr "" -#: optiondialog.cpp:1293 +#: optiondialog.cpp:1341 #, kde-format msgid "Copy newer instead of merging (unsafe)" msgstr "" -#: optiondialog.cpp:1297 +#: optiondialog.cpp:1345 #, kde-format msgid "" "Do not look inside, just take the newer file.\n" @@ -2665,46 +2682,46 @@ "Only effective when comparing two directories." msgstr "" -#: optiondialog.cpp:1302 +#: optiondialog.cpp:1350 #, kde-format msgid "Backup files (.orig)" msgstr "" -#: optiondialog.cpp:1306 +#: optiondialog.cpp:1354 #, kde-format msgid "" "If 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 "" -#: optiondialog.cpp:1382 optiondialog.cpp:1383 +#: optiondialog.cpp:1430 optiondialog.cpp:1431 #, kde-format msgid "Regional Settings" msgstr "Gosodiadau Rhanbarthol" -#: optiondialog.cpp:1397 +#: optiondialog.cpp:1454 #, kde-format msgid "Use the same encoding for everything:" msgstr "" -#: optiondialog.cpp:1401 +#: optiondialog.cpp:1458 #, kde-format msgid "" "Enable this allows to change all encodings by changing the first only.\n" "Disable this if different individual settings are needed." msgstr "" -#: optiondialog.cpp:1405 +#: optiondialog.cpp:1462 #, kde-format msgid "Note: Local Encoding is \"%1\"" msgstr "" -#: optiondialog.cpp:1409 +#: optiondialog.cpp:1466 #, kde-format msgid "File Encoding for A:" msgstr "" -#: optiondialog.cpp:1416 +#: optiondialog.cpp:1473 #, kde-format msgid "" "If enabled then Unicode (UTF-16 or UTF-8) encoding will be detected.\n" @@ -2713,32 +2730,32 @@ "(Unicode detection depends on the first bytes of a file.)" msgstr "" -#: optiondialog.cpp:1419 optiondialog.cpp:1430 optiondialog.cpp:1441 +#: optiondialog.cpp:1476 optiondialog.cpp:1487 optiondialog.cpp:1498 #, kde-format msgid "Auto Detect Unicode" msgstr "" -#: optiondialog.cpp:1425 +#: optiondialog.cpp:1482 #, kde-format msgid "File Encoding for B:" msgstr "" -#: optiondialog.cpp:1436 +#: optiondialog.cpp:1493 #, kde-format msgid "File Encoding for C:" msgstr "" -#: optiondialog.cpp:1447 +#: optiondialog.cpp:1504 #, kde-format msgid "File Encoding for Merge Output and Saving:" msgstr "" -#: optiondialog.cpp:1452 +#: optiondialog.cpp:1509 #, fuzzy, kde-format msgid "Auto Select" msgstr "dim detholiad" -#: optiondialog.cpp:1456 +#: optiondialog.cpp:1513 #, kde-format msgid "" "If enabled then the encoding from the input files is used.\n" @@ -2746,39 +2763,39 @@ "saving." msgstr "" -#: optiondialog.cpp:1459 +#: optiondialog.cpp:1516 #, kde-format msgid "File Encoding for Preprocessor Files:" msgstr "" -#: optiondialog.cpp:1471 +#: optiondialog.cpp:1528 #, kde-format msgid "Right To Left Language" msgstr "" -#: optiondialog.cpp:1475 +#: optiondialog.cpp:1532 #, kde-format msgid "" "Some languages are read from right to left.\n" "This setting will change the viewer and editor accordingly." msgstr "" -#: optiondialog.cpp:1485 +#: optiondialog.cpp:1542 #, fuzzy, kde-format msgid "Integration" msgstr "Gweithrediad" -#: optiondialog.cpp:1486 +#: optiondialog.cpp:1543 #, fuzzy, kde-format msgid "Integration Settings" msgstr "Gosodiadau Rhanbarthol" -#: optiondialog.cpp:1499 +#: optiondialog.cpp:1564 #, kde-format msgid "Command line options to ignore:" msgstr "" -#: optiondialog.cpp:1505 +#: optiondialog.cpp:1570 #, kde-format msgid "" "List of command line options that should be ignored when KDiff3 is used by " @@ -2787,19 +2804,19 @@ "This will suppress the \"Unknown option\" error." msgstr "" -#: optiondialog.cpp:1510 +#: optiondialog.cpp:1575 #, kde-format msgid "Quit also via Escape key" msgstr "" -#: optiondialog.cpp:1514 +#: optiondialog.cpp:1579 #, kde-format msgid "" "Fast method to exit.\n" "For those who are used to using the Escape key." msgstr "" -#: optiondialog.cpp:1598 +#: optiondialog.cpp:1653 #, kde-format msgid "This resets all options. Not only those of the current topic." msgstr "" @@ -2849,77 +2866,67 @@ msgid "Disable Unsafe Options" msgstr "" -#: pdiff.cpp:158 +#: pdiff.cpp:160 #, kde-format msgid "Loading A" msgstr "" -#: pdiff.cpp:167 +#: pdiff.cpp:162 #, kde-format -msgid "Errors occurred during pre-processing of file A." +msgid "Loading A: %1" msgstr "" -#: pdiff.cpp:172 +#: pdiff.cpp:170 #, kde-format msgid "Loading B" msgstr "" -#: pdiff.cpp:179 -#, kde-format -msgid "Errors occurred during pre-processing of file B." -msgstr "" - -#: pdiff.cpp:202 pdiff.cpp:241 +#: pdiff.cpp:201 pdiff.cpp:237 #, kde-format msgid "Diff: A <-> B" msgstr "" -#: pdiff.cpp:208 pdiff.cpp:279 pdiff.cpp:293 +#: pdiff.cpp:207 pdiff.cpp:275 pdiff.cpp:289 #, kde-format msgid "Linediff: A <-> B" msgstr "" -#: pdiff.cpp:225 +#: pdiff.cpp:224 #, kde-format msgid "Loading C" msgstr "" -#: pdiff.cpp:232 -#, kde-format -msgid "Errors occurred during pre-processing of file C." -msgstr "" - -#: pdiff.cpp:250 +#: pdiff.cpp:246 #, kde-format msgid "Diff: A <-> C" msgstr "" -#: pdiff.cpp:261 +#: pdiff.cpp:257 #, kde-format msgid "Diff: B <-> C" msgstr "" -#: pdiff.cpp:283 pdiff.cpp:297 +#: pdiff.cpp:279 pdiff.cpp:293 #, kde-format msgid "Linediff: B <-> C" msgstr "" -#: pdiff.cpp:287 pdiff.cpp:301 +#: pdiff.cpp:283 pdiff.cpp:297 #, kde-format msgid "Linediff: A <-> C" msgstr "" -#: pdiff.cpp:829 +#: pdiff.cpp:819 #, kde-format msgid "All input files contain the same text, but are not binary equal." msgstr "" -#: pdiff.cpp:835 pdiff.cpp:839 pdiff.cpp:843 +#: pdiff.cpp:825 pdiff.cpp:829 pdiff.cpp:833 #, kde-format msgid "Files %1 and %2 have equal text, but are not binary equal. \n" msgstr "" -#: pdiff.cpp:853 +#: pdiff.cpp:843 #, kde-format msgid "" "Some input files do not seem to be pure text files.\n" @@ -2927,17 +2934,17 @@ "Continue at your own risk." msgstr "" -#: pdiff.cpp:863 +#: pdiff.cpp:853 #, kde-format msgid ", B" msgstr "" -#: pdiff.cpp:865 +#: pdiff.cpp:855 #, kde-format msgid ", C" msgstr "" -#: pdiff.cpp:867 +#: pdiff.cpp:857 #, kde-format msgid "" "Some input characters could not be converted to valid unicode.\n" @@ -2946,77 +2953,72 @@ "Affected input files are in %1." msgstr "" -#: pdiff.cpp:1034 +#: pdiff.cpp:1032 #, kde-format msgid "Abort" msgstr "Erthylu" -#: pdiff.cpp:1040 pdiff.cpp:1130 +#: pdiff.cpp:1038 pdiff.cpp:1129 #, kde-format msgid "Opening files..." msgstr "" -#: pdiff.cpp:1107 -#, kde-format -msgid "File open error" -msgstr "Gwall agor ffeil" - -#: pdiff.cpp:1202 +#: pdiff.cpp:1212 #, kde-format msgid "Cutting selection..." msgstr "Yn torri'r dewisiad..." -#: pdiff.cpp:1223 +#: pdiff.cpp:1233 #, kde-format msgid "Copying selection to clipboard..." msgstr "Yn copïo'r dewisiad i'r clipfwrdd..." -#: pdiff.cpp:1239 +#: pdiff.cpp:1249 #, kde-format msgid "Inserting clipboard contents..." msgstr "Yn mewnosod cynnwys y clipfwrdd..." -#: pdiff.cpp:1695 +#: pdiff.cpp:1705 #, kde-format msgid "Word wrap (Cancel disables word wrap)" msgstr "" -#: pdiff.cpp:1696 +#: pdiff.cpp:1706 #, kde-format msgid "Calculating max width for horizontal scrollbar" msgstr "" -#: pdiff.cpp:1911 +#: pdiff.cpp:1921 #, kde-format msgid "Save && Continue" msgstr "" -#: pdiff.cpp:1912 +#: pdiff.cpp:1922 #, kde-format msgid "Continue Without Saving" msgstr "" -#: pdiff.cpp:2124 +#: pdiff.cpp:2134 #, kde-format msgid "Search complete." msgstr "" -#: pdiff.cpp:2124 +#: pdiff.cpp:2134 #, kde-format msgid "Search Complete" msgstr "" -#: pdiff.cpp:2375 +#: pdiff.cpp:2385 #, kde-format msgid "Nothing is selected in either diff input window." msgstr "" -#: pdiff.cpp:2375 +#: pdiff.cpp:2385 #, kde-format msgid "Error while adding manual diff range" msgstr "" -#: progress.cpp:59 progress.cpp:71 +#: progress.cpp:61 progress.cpp:73 #, kde-format msgid "&Cancel" msgstr "" @@ -3026,189 +3028,189 @@ msgid "A (Base):" msgstr "" -#: smalldialogs.cpp:68 smalldialogs.cpp:85 smalldialogs.cpp:102 -#: smalldialogs.cpp:144 +#: smalldialogs.cpp:71 smalldialogs.cpp:90 smalldialogs.cpp:109 +#: smalldialogs.cpp:154 #, kde-format msgid "File..." msgstr "Ffeil..." -#: smalldialogs.cpp:70 smalldialogs.cpp:87 smalldialogs.cpp:104 -#: smalldialogs.cpp:146 +#: smalldialogs.cpp:73 smalldialogs.cpp:92 smalldialogs.cpp:111 +#: smalldialogs.cpp:156 #, kde-format msgid "Dir..." msgstr "" -#: smalldialogs.cpp:96 +#: smalldialogs.cpp:103 #, kde-format msgid "C (Optional):" msgstr "" -#: smalldialogs.cpp:119 +#: smalldialogs.cpp:126 #, kde-format msgid "Swap/Copy Names..." msgstr "" -#: smalldialogs.cpp:124 smalldialogs.cpp:125 smalldialogs.cpp:126 +#: smalldialogs.cpp:131 smalldialogs.cpp:132 smalldialogs.cpp:133 #, kde-format msgid "Swap %1<->%2" msgstr "" -#: smalldialogs.cpp:127 smalldialogs.cpp:128 smalldialogs.cpp:129 +#: smalldialogs.cpp:134 smalldialogs.cpp:135 smalldialogs.cpp:136 #, kde-format msgid "Copy %1->Output" msgstr "" -#: smalldialogs.cpp:130 smalldialogs.cpp:131 smalldialogs.cpp:132 +#: smalldialogs.cpp:137 smalldialogs.cpp:138 smalldialogs.cpp:139 #, kde-format msgid "Swap %1<->Output" msgstr "" -#: smalldialogs.cpp:138 +#: smalldialogs.cpp:148 #, kde-format msgid "Output (optional):" msgstr "" -#: smalldialogs.cpp:168 +#: smalldialogs.cpp:178 #, kde-format msgid "Configure..." msgstr "Ffurfweddu..." -#: smalldialogs.cpp:233 +#: smalldialogs.cpp:243 #, fuzzy, kde-format #| msgid "&Directory" msgid "Open Directory" msgstr "&Cyfeiriadur" -#: smalldialogs.cpp:234 +#: smalldialogs.cpp:244 #, kde-format msgid "Select Output File" msgstr "" -#: smalldialogs.cpp:393 +#: smalldialogs.cpp:403 #, fuzzy, kde-format msgid "Search text:" msgstr " &Chwilio" -#: smalldialogs.cpp:400 +#: smalldialogs.cpp:410 #, kde-format msgid "Case sensitive" msgstr "Llythrennau mawr/bach o bwys" -#: smalldialogs.cpp:403 +#: smalldialogs.cpp:413 #, kde-format msgid "Search A" msgstr "" -#: smalldialogs.cpp:408 +#: smalldialogs.cpp:418 #, kde-format msgid "Search B" msgstr "" -#: smalldialogs.cpp:413 +#: smalldialogs.cpp:423 #, kde-format msgid "Search C" msgstr "" -#: smalldialogs.cpp:418 +#: smalldialogs.cpp:428 #, kde-format msgid "Search output" msgstr "" -#: smalldialogs.cpp:425 +#: smalldialogs.cpp:435 #, kde-format msgid "&Search" msgstr " &Chwilio" -#: smalldialogs.cpp:444 +#: smalldialogs.cpp:454 #, kde-format msgid "Regular Expression Tester" msgstr "" -#: smalldialogs.cpp:457 +#: smalldialogs.cpp:467 #, kde-format msgid "Example auto merge line:" msgstr "" -#: smalldialogs.cpp:459 +#: smalldialogs.cpp:469 #, kde-format msgid "To test auto merge, copy a line as used in your files." msgstr "" -#: smalldialogs.cpp:465 smalldialogs.cpp:493 smalldialogs.cpp:529 +#: smalldialogs.cpp:475 smalldialogs.cpp:503 smalldialogs.cpp:539 #, kde-format msgid "Match result:" msgstr "" -#: smalldialogs.cpp:484 +#: smalldialogs.cpp:494 #, kde-format msgid "Example history start line (with leading comment):" msgstr "" -#: smalldialogs.cpp:486 +#: smalldialogs.cpp:496 #, kde-format msgid "" "Copy a history start line as used in your files,\n" "including the leading comment." msgstr "" -#: smalldialogs.cpp:512 +#: smalldialogs.cpp:522 #, kde-format msgid "History sort key order:" msgstr "" -#: smalldialogs.cpp:520 +#: smalldialogs.cpp:530 #, kde-format msgid "Example history entry start line (without leading comment):" msgstr "" -#: smalldialogs.cpp:522 +#: smalldialogs.cpp:532 #, kde-format msgid "" "Copy a history entry start line as used in your files,\n" "but omit the leading comment." msgstr "" -#: smalldialogs.cpp:536 +#: smalldialogs.cpp:546 #, kde-format msgid "Sort key result:" msgstr "" -#: smalldialogs.cpp:584 smalldialogs.cpp:594 smalldialogs.cpp:614 +#: smalldialogs.cpp:594 smalldialogs.cpp:604 smalldialogs.cpp:624 #, kde-format msgid "Match success." msgstr "" -#: smalldialogs.cpp:588 smalldialogs.cpp:598 smalldialogs.cpp:620 +#: smalldialogs.cpp:598 smalldialogs.cpp:608 smalldialogs.cpp:630 #, kde-format msgid "Match failed." msgstr "" -#: smalldialogs.cpp:605 +#: smalldialogs.cpp:615 #, kde-format msgid "Opening and closing parentheses do not match in regular expression." msgstr "" -#: SourceData.cpp:150 +#: SourceData.cpp:153 #, kde-format msgid "Writing clipboard data to temp file failed." msgstr "" -#: SourceData.cpp:154 +#: SourceData.cpp:157 #, kde-format msgid "From Clipboard" msgstr "" -#: SourceData.cpp:335 +#: SourceData.cpp:348 #, kde-format msgid "%1 is not a normal file." msgstr "" -#: SourceData.cpp:427 +#: SourceData.cpp:440 #, kde-format msgid " Temp file is: %1" msgstr "" -#: SourceData.cpp:432 +#: SourceData.cpp:445 #, kde-format msgid "" "Preprocessing possibly failed. Check this command:\n" @@ -3218,12 +3220,12 @@ "The preprocessing command will be disabled now." msgstr "" -#: SourceData.cpp:443 SourceData.cpp:512 +#: SourceData.cpp:456 SourceData.cpp:525 #, kde-format msgid "File %1 too large to process. Skipping." msgstr "" -#: SourceData.cpp:487 +#: SourceData.cpp:500 #, kde-format msgid "" "The line-matching-preprocessing possibly failed. Check this command:\n" diff -Nru kdiff3-1.8.01/po/da/kdiff3fileitemactionplugin.po kdiff3-1.8.3/po/da/kdiff3fileitemactionplugin.po --- kdiff3-1.8.01/po/da/kdiff3fileitemactionplugin.po 2019-05-18 01:01:53.000000000 +0000 +++ kdiff3-1.8.3/po/da/kdiff3fileitemactionplugin.po 2020-06-25 00:18:11.000000000 +0000 @@ -5,8 +5,8 @@ msgid "" msgstr "" "Project-Id-Version: \n" -"Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2019-03-22 03:09+0100\n" +"Report-Msgid-Bugs-To: https://bugs.kde.org\n" +"POT-Creation-Date: 2019-08-30 07:40+0200\n" "PO-Revision-Date: 2011-05-08 11:28+0200\n" "Last-Translator: Martin Schlander \n" "Language-Team: Danish \n" diff -Nru kdiff3-1.8.01/po/da/kdiff3.po kdiff3-1.8.3/po/da/kdiff3.po --- kdiff3-1.8.01/po/da/kdiff3.po 2019-05-18 01:01:53.000000000 +0000 +++ kdiff3-1.8.3/po/da/kdiff3.po 2020-06-25 00:18:11.000000000 +0000 @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: kdiff3\n" -"Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2019-04-18 08:02+0200\n" +"Report-Msgid-Bugs-To: https://bugs.kde.org\n" +"POT-Creation-Date: 2020-06-22 07:48+0200\n" "PO-Revision-Date: 2011-09-03 19:27+0200\n" "Last-Translator: Martin Schlander \n" "Language-Team: Danish \n" @@ -30,291 +30,291 @@ msgid "Your emails" msgstr "mschlander@opensuse.org" -#: difftextwindow.cpp:412 +#: difftextwindow.cpp:414 #, kde-format msgid "File %1: Line %2" msgstr "" -#: difftextwindow.cpp:414 +#: difftextwindow.cpp:416 #, fuzzy, kde-format #| msgid "Line not available" msgid "File %1: Line not available" msgstr "Linjen er ikke tilgængelig" -#: difftextwindow.cpp:1780 +#: difftextwindow.cpp:1778 #, kde-format msgid "Encoding:" msgstr "Tegnsæt:" -#: difftextwindow.cpp:1782 mergeresultwindow.cpp:3138 optiondialog.cpp:818 +#: difftextwindow.cpp:1781 mergeresultwindow.cpp:3166 optiondialog.cpp:840 #, kde-format msgid "Line end style:" msgstr "Linjeslut-stil:" -#: difftextwindow.cpp:1810 directorymergewindow.cpp:382 -#: directorymergewindow.cpp:433 directorymergewindow.cpp:524 -#: directorymergewindow.cpp:3058 directorymergewindow.cpp:3189 -#: directorymergewindow.cpp:3417 mergeresultwindow.cpp:942 -#: mergeresultwindow.cpp:944 mergeresultwindow.cpp:946 -#: mergeresultwindow.cpp:948 mergeresultwindow.cpp:1814 -#: mergeresultwindow.cpp:3170 mergeresultwindow.cpp:3177 optiondialog.cpp:962 -#: optiondialog.cpp:975 pdiff.cpp:833 pdiff.cpp:835 pdiff.cpp:837 pdiff.cpp:839 -#: pdiff.cpp:861 smalldialogs.cpp:124 smalldialogs.cpp:126 smalldialogs.cpp:127 -#: smalldialogs.cpp:130 +#: difftextwindow.cpp:1809 directorymergewindow.cpp:383 +#: directorymergewindow.cpp:434 directorymergewindow.cpp:525 +#: directorymergewindow.cpp:3072 directorymergewindow.cpp:3203 +#: directorymergewindow.cpp:3431 mergeresultwindow.cpp:970 +#: mergeresultwindow.cpp:972 mergeresultwindow.cpp:974 +#: mergeresultwindow.cpp:976 mergeresultwindow.cpp:1842 +#: mergeresultwindow.cpp:3198 mergeresultwindow.cpp:3205 optiondialog.cpp:1002 +#: optiondialog.cpp:1015 pdiff.cpp:823 pdiff.cpp:825 pdiff.cpp:827 +#: pdiff.cpp:829 pdiff.cpp:851 smalldialogs.cpp:131 smalldialogs.cpp:133 +#: smalldialogs.cpp:134 smalldialogs.cpp:137 #, kde-format msgid "A" msgstr "A" -#: difftextwindow.cpp:1810 directorymergewindow.cpp:384 -#: directorymergewindow.cpp:436 directorymergewindow.cpp:526 -#: directorymergewindow.cpp:3064 directorymergewindow.cpp:3190 -#: directorymergewindow.cpp:3418 mergeresultwindow.cpp:942 -#: mergeresultwindow.cpp:944 mergeresultwindow.cpp:950 -#: mergeresultwindow.cpp:952 mergeresultwindow.cpp:1816 -#: mergeresultwindow.cpp:3172 mergeresultwindow.cpp:3179 optiondialog.cpp:963 -#: optiondialog.cpp:976 pdiff.cpp:833 pdiff.cpp:835 pdiff.cpp:841 pdiff.cpp:843 -#: pdiff.cpp:863 smalldialogs.cpp:124 smalldialogs.cpp:125 smalldialogs.cpp:128 -#: smalldialogs.cpp:131 +#: difftextwindow.cpp:1809 directorymergewindow.cpp:385 +#: directorymergewindow.cpp:437 directorymergewindow.cpp:527 +#: directorymergewindow.cpp:3078 directorymergewindow.cpp:3204 +#: directorymergewindow.cpp:3432 mergeresultwindow.cpp:970 +#: mergeresultwindow.cpp:972 mergeresultwindow.cpp:978 +#: mergeresultwindow.cpp:980 mergeresultwindow.cpp:1844 +#: mergeresultwindow.cpp:3200 mergeresultwindow.cpp:3207 optiondialog.cpp:1003 +#: optiondialog.cpp:1016 pdiff.cpp:823 pdiff.cpp:825 pdiff.cpp:831 +#: pdiff.cpp:833 pdiff.cpp:853 smalldialogs.cpp:131 smalldialogs.cpp:132 +#: smalldialogs.cpp:135 smalldialogs.cpp:138 #, kde-format msgid "B" msgstr "B" -#: difftextwindow.cpp:1810 directorymergewindow.cpp:386 -#: directorymergewindow.cpp:439 directorymergewindow.cpp:528 -#: directorymergewindow.cpp:3070 directorymergewindow.cpp:3191 -#: directorymergewindow.cpp:3419 mergeresultwindow.cpp:946 -#: mergeresultwindow.cpp:948 mergeresultwindow.cpp:950 -#: mergeresultwindow.cpp:952 mergeresultwindow.cpp:1818 -#: mergeresultwindow.cpp:3174 mergeresultwindow.cpp:3181 optiondialog.cpp:977 -#: pdiff.cpp:837 pdiff.cpp:839 pdiff.cpp:841 pdiff.cpp:843 pdiff.cpp:865 -#: smalldialogs.cpp:125 smalldialogs.cpp:126 smalldialogs.cpp:129 -#: smalldialogs.cpp:132 +#: difftextwindow.cpp:1809 directorymergewindow.cpp:387 +#: directorymergewindow.cpp:440 directorymergewindow.cpp:529 +#: directorymergewindow.cpp:3084 directorymergewindow.cpp:3205 +#: directorymergewindow.cpp:3433 mergeresultwindow.cpp:974 +#: mergeresultwindow.cpp:976 mergeresultwindow.cpp:978 +#: mergeresultwindow.cpp:980 mergeresultwindow.cpp:1846 +#: mergeresultwindow.cpp:3202 mergeresultwindow.cpp:3209 optiondialog.cpp:1017 +#: pdiff.cpp:827 pdiff.cpp:829 pdiff.cpp:831 pdiff.cpp:833 pdiff.cpp:855 +#: smalldialogs.cpp:132 smalldialogs.cpp:133 smalldialogs.cpp:136 +#: smalldialogs.cpp:139 #, kde-format msgid "C" msgstr "C" -#: difftextwindow.cpp:1810 +#: difftextwindow.cpp:1809 #, fuzzy, kde-format #| msgid "A (Base):" msgid "A (Base)" msgstr "A (Basis):" -#: difftextwindow.cpp:1812 +#: difftextwindow.cpp:1811 #, fuzzy, kde-format #| msgid "Encoding:" msgid "Encoding: %1" msgstr "Tegnsæt:" -#: difftextwindow.cpp:1813 mergeresultwindow.cpp:3183 +#: difftextwindow.cpp:1812 mergeresultwindow.cpp:3211 #, kde-format msgid "Unix" msgstr "Unix" -#: difftextwindow.cpp:1813 mergeresultwindow.cpp:3184 +#: difftextwindow.cpp:1812 mergeresultwindow.cpp:3212 #, kde-format msgid "DOS" msgstr "DOS" -#: difftextwindow.cpp:1813 +#: difftextwindow.cpp:1812 #, fuzzy, kde-format #| msgid "Line end style:" msgid "Line end style: %1" msgstr "Linjeslut-stil:" -#: difftextwindow.cpp:1835 kdiff3.cpp:873 +#: difftextwindow.cpp:1834 kdiff3.cpp:874 #, kde-format msgid "Top line" msgstr "Toplinje" -#: difftextwindow.cpp:1845 +#: difftextwindow.cpp:1843 #, kde-format msgid "End" msgstr "Slut" -#: difftextwindow.cpp:1903 smalldialogs.cpp:235 +#: difftextwindow.cpp:1901 smalldialogs.cpp:245 #, fuzzy, kde-format #| msgid "Opening files..." msgid "Open File" msgstr "Åbner filer..." -#: difftextwindow.cpp:1951 optiondialog.cpp:387 +#: difftextwindow.cpp:1943 optiondialog.cpp:389 #, kde-format msgid "Unicode, 8 bit" msgstr "Unicode, 8 bit" -#: difftextwindow.cpp:1966 +#: difftextwindow.cpp:1958 #, kde-format msgid "Other" msgstr "" -#: directorymergewindow.cpp:409 directorymergewindow.cpp:3424 +#: directorymergewindow.cpp:410 directorymergewindow.cpp:3438 #, kde-format msgid "Copy A to B" msgstr "Kopiér A til B" -#: directorymergewindow.cpp:412 directorymergewindow.cpp:3425 +#: directorymergewindow.cpp:413 directorymergewindow.cpp:3439 #, kde-format msgid "Copy B to A" msgstr "Kopiér B til A" -#: directorymergewindow.cpp:415 directorymergewindow.cpp:3426 +#: directorymergewindow.cpp:416 directorymergewindow.cpp:3440 #, kde-format msgid "Delete A" msgstr "Slet A" -#: directorymergewindow.cpp:418 directorymergewindow.cpp:3427 +#: directorymergewindow.cpp:419 directorymergewindow.cpp:3441 #, kde-format msgid "Delete B" msgstr "Slet B" -#: directorymergewindow.cpp:421 +#: directorymergewindow.cpp:422 #, kde-format msgid "Delete A & B" msgstr "Slet A & B" -#: directorymergewindow.cpp:424 directorymergewindow.cpp:3429 +#: directorymergewindow.cpp:425 directorymergewindow.cpp:3443 #, kde-format msgid "Merge to A" msgstr "Indflet til A" -#: directorymergewindow.cpp:427 directorymergewindow.cpp:3430 +#: directorymergewindow.cpp:428 directorymergewindow.cpp:3444 #, kde-format msgid "Merge to B" msgstr "Indflet til B" -#: directorymergewindow.cpp:430 +#: directorymergewindow.cpp:431 #, kde-format msgid "Merge to A & B" msgstr "Indflet til A & B" -#: directorymergewindow.cpp:442 directorymergewindow.cpp:3421 +#: directorymergewindow.cpp:443 directorymergewindow.cpp:3435 #, kde-format msgid "Delete (if exists)" msgstr "Slet (hvis det eksisterer)" -#: directorymergewindow.cpp:445 directorymergewindow.cpp:448 -#: directorymergewindow.cpp:3420 optiondialog.cpp:925 smalldialogs.cpp:113 +#: directorymergewindow.cpp:446 directorymergewindow.cpp:449 +#: directorymergewindow.cpp:3434 smalldialogs.cpp:120 #, kde-format msgid "Merge" msgstr "Indflet" -#: directorymergewindow.cpp:445 directorymergewindow.cpp:448 +#: directorymergewindow.cpp:446 directorymergewindow.cpp:449 #, kde-format msgid "Merge (manual)" msgstr "Indflet (manuelt)" -#: directorymergewindow.cpp:451 +#: directorymergewindow.cpp:452 #, kde-format msgid "Error: Conflicting File Types" msgstr "Fejl: Filtyper i konflikt" -#: directorymergewindow.cpp:454 +#: directorymergewindow.cpp:455 #, kde-format msgid "Error: Changed and Deleted" msgstr "Fejl: Ændret og slettet" -#: directorymergewindow.cpp:457 +#: directorymergewindow.cpp:458 #, kde-format msgid "Error: Dates are equal but files are not." msgstr "Fejl: Datoer er ens men filer er ikke." -#: directorymergewindow.cpp:471 +#: directorymergewindow.cpp:472 #, fuzzy, kde-format #| msgid "Done." msgid "Done" msgstr "Færdig." -#: directorymergewindow.cpp:473 +#: directorymergewindow.cpp:474 #, kde-format msgid "Error" msgstr "Fejl" -#: directorymergewindow.cpp:475 +#: directorymergewindow.cpp:476 #, kde-format msgid "Skipped." msgstr "Sprunget over." -#: directorymergewindow.cpp:477 +#: directorymergewindow.cpp:478 #, kde-format msgid "Not saved." msgstr "Ikke gemt." -#: directorymergewindow.cpp:479 +#: directorymergewindow.cpp:480 #, kde-format msgid "In progress..." msgstr "I fremgang..." -#: directorymergewindow.cpp:481 +#: directorymergewindow.cpp:482 #, kde-format msgid "To do." msgstr "At gøre." -#: directorymergewindow.cpp:522 +#: directorymergewindow.cpp:523 #, kde-format msgid "Name" msgstr "Navn" -#: directorymergewindow.cpp:530 +#: directorymergewindow.cpp:531 #, kde-format msgid "Operation" msgstr "Operation" -#: directorymergewindow.cpp:532 +#: directorymergewindow.cpp:533 #, kde-format msgid "Status" msgstr "Status" -#: directorymergewindow.cpp:534 +#: directorymergewindow.cpp:535 #, kde-format msgid "Unsolved" msgstr "Uløst" -#: directorymergewindow.cpp:536 +#: directorymergewindow.cpp:537 #, kde-format msgid "Solved" msgstr "Løst" -#: directorymergewindow.cpp:538 +#: directorymergewindow.cpp:539 #, kde-format msgid "Nonwhite" msgstr "Ikke-hvid" -#: directorymergewindow.cpp:540 +#: directorymergewindow.cpp:541 #, kde-format msgid "White" msgstr "Hvid" -#: directorymergewindow.cpp:674 +#: directorymergewindow.cpp:676 #, kde-format msgid "Unable to compare non-normal file with normal file." msgstr "" -#: directorymergewindow.cpp:688 +#: directorymergewindow.cpp:690 #, kde-format msgid "Mix of links and normal files." msgstr "Blanding af link og normale filer." -#: directorymergewindow.cpp:695 +#: directorymergewindow.cpp:697 #, kde-format msgid "Link: " msgstr "Link: " -#: directorymergewindow.cpp:704 +#: directorymergewindow.cpp:706 #, kde-format msgid "Size. " msgstr "Størrelse. " -#: directorymergewindow.cpp:718 directorymergewindow.cpp:728 +#: directorymergewindow.cpp:720 directorymergewindow.cpp:730 #, kde-format msgid "Date & Size: " msgstr "Dato & Størrelse: " -#: directorymergewindow.cpp:748 +#: directorymergewindow.cpp:751 #, kde-format msgid "Comparing file..." msgstr "Sammenligner fil..." -#: directorymergewindow.cpp:801 +#: directorymergewindow.cpp:813 #, kde-format msgid "" "You are currently doing a directory merge. Are you sure, you want to abort " @@ -323,48 +323,48 @@ "Du er ved at udføre en mappeindfletning. Er du sikker på at du ønsker at " "afbryde indfletningen og scanne mappen igen?" -#: directorymergewindow.cpp:802 kdiff3.cpp:698 kdiff3.cpp:708 kdiff3.cpp:720 -#: mergeresultwindow.cpp:372 pdiff.cpp:1033 pdiff.cpp:1910 pdiff.cpp:1920 +#: directorymergewindow.cpp:814 kdiff3.cpp:697 kdiff3.cpp:707 kdiff3.cpp:719 +#: mergeresultwindow.cpp:400 pdiff.cpp:1031 pdiff.cpp:1920 pdiff.cpp:1930 #, kde-format msgid "Warning" msgstr "Advarsel" -#: directorymergewindow.cpp:803 directorymergewindow.cpp:3393 +#: directorymergewindow.cpp:815 directorymergewindow.cpp:3407 #, kde-format msgid "Rescan" msgstr "Genscan" -#: directorymergewindow.cpp:804 pdiff.cpp:1035 +#: directorymergewindow.cpp:816 pdiff.cpp:1033 #, kde-format msgid "Continue Merging" msgstr "Fortsæt med indfletning" -#: directorymergewindow.cpp:971 +#: directorymergewindow.cpp:984 #, kde-format msgid "Opening of directories failed:" msgstr "Det mislykkedes at åbne mapper:" -#: directorymergewindow.cpp:975 +#: directorymergewindow.cpp:988 #, 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:980 +#: directorymergewindow.cpp:993 #, 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:985 +#: directorymergewindow.cpp:998 #, 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:988 +#: directorymergewindow.cpp:1001 #, kde-format msgid "Directory Open Error" msgstr "Fejl ved åbning af mappe" -#: directorymergewindow.cpp:996 +#: directorymergewindow.cpp:1009 #, kde-format msgid "" "The destination directory must not be the same as A or B when three " @@ -375,49 +375,49 @@ "sammen.\n" "Tjek igen før du fortsætter." -#: directorymergewindow.cpp:998 +#: directorymergewindow.cpp:1011 #, kde-format msgid "Parameter Warning" msgstr "Parameteradvarsel" -#: directorymergewindow.cpp:1003 +#: directorymergewindow.cpp:1016 #, kde-format msgid "Scanning directories..." msgstr "Scanner mapper..." -#: directorymergewindow.cpp:1029 +#: directorymergewindow.cpp:1042 #, kde-format msgid "Reading Directory A" msgstr "Læser mappen A" -#: directorymergewindow.cpp:1038 +#: directorymergewindow.cpp:1051 #, kde-format msgid "Reading Directory B" msgstr "Læser mappen B" -#: directorymergewindow.cpp:1048 +#: directorymergewindow.cpp:1061 #, kde-format msgid "Reading Directory C" msgstr "Læser mappen C" -#: directorymergewindow.cpp:1064 +#: directorymergewindow.cpp:1077 #, kde-format msgid "Some subdirectories were not readable in" msgstr "Nogle undermapper kunne ikke læses i" -#: directorymergewindow.cpp:1069 +#: directorymergewindow.cpp:1082 #, kde-format msgid "Check the permissions of the subdirectories." msgstr "Tjek tilladelser for undermapperne." -#: directorymergewindow.cpp:1106 kdiff3.cpp:666 kdiff3.cpp:753 kdiff3.cpp:777 -#: kdiff3.cpp:1065 kdiff3.cpp:1086 pdiff.cpp:1116 pdiff.cpp:1170 pdiff.cpp:1218 -#: pdiff.cpp:1234 pdiff.cpp:1277 pdiff.cpp:1301 +#: directorymergewindow.cpp:1119 kdiff3.cpp:665 kdiff3.cpp:752 kdiff3.cpp:776 +#: kdiff3.cpp:1072 kdiff3.cpp:1093 pdiff.cpp:1115 pdiff.cpp:1178 pdiff.cpp:1228 +#: pdiff.cpp:1244 pdiff.cpp:1287 pdiff.cpp:1311 #, kde-format msgid "Ready." msgstr "Klar." -#: directorymergewindow.cpp:1121 +#: directorymergewindow.cpp:1134 #, kde-format msgid "" "Directory Comparison Status\n" @@ -427,23 +427,23 @@ "Number of different files: %3" msgstr "" -#: directorymergewindow.cpp:1128 +#: directorymergewindow.cpp:1141 #, fuzzy, kde-format #| msgid "Number of manual merges:" msgid "Number of manual merges: %1" msgstr "Antal manuelle indfletninger:" -#: directorymergewindow.cpp:1394 +#: directorymergewindow.cpp:1407 #, kde-format msgid "This affects all merge operations." msgstr "Dette påvirker alle indfletningsoperationer." -#: directorymergewindow.cpp:1395 +#: directorymergewindow.cpp:1408 #, kde-format msgid "Changing All Merge Operations" msgstr "Ændrer alle indfletningsoperationer" -#: directorymergewindow.cpp:1695 +#: directorymergewindow.cpp:1708 #, fuzzy, kde-format #| msgid "Processing " msgid "" @@ -451,45 +451,45 @@ "%3" msgstr "Behandler" -#: directorymergewindow.cpp:1738 directorymergewindow.cpp:1742 +#: directorymergewindow.cpp:1751 directorymergewindow.cpp:1755 #, kde-format msgid "Some files could not be processed." msgstr "" -#: directorymergewindow.cpp:2222 directorymergewindow.cpp:2247 -#: directorymergewindow.cpp:2271 +#: directorymergewindow.cpp:2235 directorymergewindow.cpp:2260 +#: directorymergewindow.cpp:2285 #, kde-format msgid "This operation is currently not possible." msgstr "Denne operation er ikke mulig for øjeblikket." -#: directorymergewindow.cpp:2222 directorymergewindow.cpp:2247 -#: directorymergewindow.cpp:2271 directorymergewindow.cpp:2552 +#: directorymergewindow.cpp:2235 directorymergewindow.cpp:2260 +#: directorymergewindow.cpp:2285 directorymergewindow.cpp:2565 #, kde-format msgid "Operation Not Possible" msgstr "Operation ikke mulig" -#: directorymergewindow.cpp:2318 +#: directorymergewindow.cpp:2332 #, fuzzy, kde-format #| msgid "An error occurred while copying.\n" msgid "An error occurred while copying." msgstr "Der opstod en fejl mens der kopieredes.\n" -#: directorymergewindow.cpp:2319 directorymergewindow.cpp:2759 +#: directorymergewindow.cpp:2333 directorymergewindow.cpp:2772 #, kde-format msgid "Merge Error" msgstr "Indfletningsfejl" -#: directorymergewindow.cpp:2396 +#: directorymergewindow.cpp:2410 #, kde-format msgid "Unknown merge operation. (This must never happen!)" msgstr "Ukendt indfletningsoperation. (Dette skulle ikke kunne ske!)" -#: directorymergewindow.cpp:2441 +#: directorymergewindow.cpp:2455 #, kde-format msgid "Unknown merge operation." msgstr "Ukendt indfletningsoperation." -#: directorymergewindow.cpp:2454 +#: directorymergewindow.cpp:2468 #, kde-format msgid "" "The merge is about to begin.\n" @@ -509,22 +509,22 @@ "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:2459 +#: directorymergewindow.cpp:2473 #, kde-format msgid "Starting Merge" msgstr "Starter indfletning" -#: directorymergewindow.cpp:2460 +#: directorymergewindow.cpp:2474 #, kde-format msgid "Do It" msgstr "Gør det" -#: directorymergewindow.cpp:2461 +#: directorymergewindow.cpp:2475 #, kde-format msgid "Simulate It" msgstr "Simulér det" -#: directorymergewindow.cpp:2487 +#: directorymergewindow.cpp:2501 #, kde-format msgid "" "The highlighted item has a different type in the different directories. " @@ -533,7 +533,7 @@ "Det fremhævede element har forskellig type i de forskellige mapper. Vælg " "hvad der skal gøres." -#: directorymergewindow.cpp:2491 +#: directorymergewindow.cpp:2505 #, kde-format msgid "" "The modification dates of the file are equal but the files are not. Select " @@ -542,7 +542,7 @@ "Ændringsdatoerne for filerne er ens, men filerne er ikke ens. Vælg hvad der " "skal gøres." -#: directorymergewindow.cpp:2495 +#: directorymergewindow.cpp:2509 #, kde-format msgid "" "The highlighted item was changed in one directory and deleted in the other. " @@ -551,7 +551,7 @@ "Det fremhævede element er blevet ændret i én mappe og slettet i en anden. " "Vælg hvad der skal gøres." -#: directorymergewindow.cpp:2552 +#: directorymergewindow.cpp:2565 #, kde-format msgid "" "This operation is currently not possible because directory merge is " @@ -560,7 +560,7 @@ "Denne operation er ikke mulig lige nu da mappe-indfletningen kører for " "øjeblikket." -#: directorymergewindow.cpp:2609 +#: directorymergewindow.cpp:2622 #, kde-format msgid "" "There was an error in the last step.\n" @@ -571,81 +571,81 @@ "Vil du fortsætte med det element der forårsagede fejlen eller vil du springe " "dette element over?" -#: directorymergewindow.cpp:2611 +#: directorymergewindow.cpp:2624 #, kde-format msgid "Continue merge after an error" msgstr "Fortsæt med indfletning efter en fejl" -#: directorymergewindow.cpp:2612 +#: directorymergewindow.cpp:2625 #, kde-format msgid "Continue With Last Item" msgstr "Fortsæt med det sidste element" -#: directorymergewindow.cpp:2613 +#: directorymergewindow.cpp:2626 #, kde-format msgid "Skip Item" msgstr "Spring elementet over" -#: directorymergewindow.cpp:2709 +#: directorymergewindow.cpp:2722 #, kde-format msgid "Merge operation complete." msgstr "Indfletningsoperation færdig." -#: directorymergewindow.cpp:2709 directorymergewindow.cpp:2712 +#: directorymergewindow.cpp:2722 directorymergewindow.cpp:2725 #, kde-format msgid "Merge Complete" msgstr "Indfletning færdig" -#: directorymergewindow.cpp:2722 +#: directorymergewindow.cpp:2735 #, kde-format 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:2758 +#: directorymergewindow.cpp:2771 #, fuzzy, kde-format #| msgid "An error occurred. Press OK to see detailed information.\n" msgid "An error occurred. Press OK to see detailed information." msgstr "Der opstod en fejl. Tryk på OK for at se detaljeret information.\n" -#: directorymergewindow.cpp:2791 +#: directorymergewindow.cpp:2804 #, kde-format msgid "Error: While deleting %1: Creating backup failed." msgstr "Fejl: Under sletning af %1: Det mislykkedes at lave sikkerhedskopi." -#: directorymergewindow.cpp:2798 +#: directorymergewindow.cpp:2811 #, kde-format msgid "delete directory recursively( %1 )" msgstr "slet mappe rekursivt( %1 )" -#: directorymergewindow.cpp:2800 +#: directorymergewindow.cpp:2813 #, kde-format msgid "delete( %1 )" msgstr "slet( %1 )" -#: directorymergewindow.cpp:2815 +#: directorymergewindow.cpp:2828 #, kde-format 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:2834 +#: directorymergewindow.cpp:2847 #, kde-format msgid "Error: rmdir( %1 ) operation failed." msgstr "Fejl: rmdir( %1 ) operation mislykkedes." -#: directorymergewindow.cpp:2844 +#: directorymergewindow.cpp:2857 #, kde-format msgid "Error: delete operation failed." msgstr "Fejl: slet-operation mislykkedes." -#: directorymergewindow.cpp:2870 +#: directorymergewindow.cpp:2884 #, kde-format msgid "manual merge( %1, %2, %3 -> %4)" msgstr "manuel indfletning( %1, %2, %3 -> %4)" -#: directorymergewindow.cpp:2873 +#: directorymergewindow.cpp:2887 #, kde-format msgid "" " Note: After a manual merge the user should continue by pressing F7." @@ -653,180 +653,180 @@ " Bemærk: Efter en manuel indfletning skal brugeren fortsætte ved at " "trykke på F7." -#: directorymergewindow.cpp:2900 +#: directorymergewindow.cpp:2914 #, 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:2909 +#: directorymergewindow.cpp:2923 #, kde-format msgid "copyLink( %1 -> %2 )" msgstr "copyLink( %1 -> %2 )" -#: directorymergewindow.cpp:2918 +#: directorymergewindow.cpp:2932 #, kde-format msgid "Error: copyLink failed: Remote links are not yet supported." msgstr "Fejl: copyLink mislykkedes: Eksterne link er endnu ikke understøttede." -#: directorymergewindow.cpp:2928 +#: directorymergewindow.cpp:2942 #, kde-format msgid "Error: copyLink failed." msgstr "Fejl: copyLink mislykkedes." -#: directorymergewindow.cpp:2953 +#: directorymergewindow.cpp:2967 #, kde-format msgid "copy( %1 -> %2 )" msgstr "copy( %1 -> %2 )" -#: directorymergewindow.cpp:2979 +#: directorymergewindow.cpp:2993 #, 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:2986 +#: directorymergewindow.cpp:3000 #, kde-format msgid "rename( %1 -> %2 )" msgstr "rename( %1 -> %2 )" -#: directorymergewindow.cpp:2995 +#: directorymergewindow.cpp:3009 #, kde-format msgid "Error: Rename failed." msgstr "Fejl: Omdøbning mislykkedes." -#: directorymergewindow.cpp:3013 +#: directorymergewindow.cpp:3027 #, 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:3030 +#: directorymergewindow.cpp:3044 #, kde-format msgid "makeDir( %1 )" msgstr "makeDir( %1 )" -#: directorymergewindow.cpp:3040 +#: directorymergewindow.cpp:3054 #, kde-format msgid "Error while creating directory." msgstr "Fejl ved oprettelse af mappe." -#: directorymergewindow.cpp:3076 directorymergewindow.cpp:3195 +#: directorymergewindow.cpp:3090 directorymergewindow.cpp:3209 #, kde-format msgid "Dest" msgstr "Mål" -#: directorymergewindow.cpp:3084 directorymergewindow.cpp:3113 +#: directorymergewindow.cpp:3098 directorymergewindow.cpp:3127 #, kde-format msgid "Dir" msgstr "Mappe" -#: directorymergewindow.cpp:3084 +#: directorymergewindow.cpp:3098 #, kde-format msgid "Type" msgstr "Type" -#: directorymergewindow.cpp:3084 +#: directorymergewindow.cpp:3098 #, kde-format msgid "Size" msgstr "Størrelse" -#: directorymergewindow.cpp:3085 +#: directorymergewindow.cpp:3099 #, kde-format msgid "Attr" msgstr "Attr" -#: directorymergewindow.cpp:3085 +#: directorymergewindow.cpp:3099 #, kde-format msgid "Last Modification" msgstr "Sidste ændring" -#: directorymergewindow.cpp:3085 +#: directorymergewindow.cpp:3099 #, kde-format msgid "Link-Destination" msgstr "Link-destination" -#: directorymergewindow.cpp:3113 +#: directorymergewindow.cpp:3127 #, kde-format msgid "File" msgstr "Fil" -#: directorymergewindow.cpp:3113 +#: directorymergewindow.cpp:3127 #, fuzzy, kde-format #| msgid "Link: " msgid "-Link" msgstr "Link: " -#: directorymergewindow.cpp:3119 +#: directorymergewindow.cpp:3133 #, kde-format msgid "not available" msgstr "ikke tilgængelig" -#: directorymergewindow.cpp:3137 +#: directorymergewindow.cpp:3151 #, kde-format msgid "A (Dest): " msgstr "A (Dest): " -#: directorymergewindow.cpp:3141 +#: directorymergewindow.cpp:3155 #, kde-format msgid "A: " msgstr "" -#: directorymergewindow.cpp:3141 +#: directorymergewindow.cpp:3155 #, kde-format msgid "A (Base): " msgstr "A (Basis): " -#: directorymergewindow.cpp:3147 +#: directorymergewindow.cpp:3161 #, kde-format msgid "B (Dest): " msgstr "B (Dest): " -#: directorymergewindow.cpp:3151 +#: directorymergewindow.cpp:3165 #, kde-format msgid "B: " msgstr "" -#: directorymergewindow.cpp:3156 +#: directorymergewindow.cpp:3170 #, kde-format msgid "C (Dest): " msgstr "C (Dest): " -#: directorymergewindow.cpp:3160 +#: directorymergewindow.cpp:3174 #, kde-format msgid "C: " msgstr "" -#: directorymergewindow.cpp:3163 +#: directorymergewindow.cpp:3177 #, kde-format msgid "Dest: " msgstr "Dest: " #. i18n("Saving Directory Merge State ...")); -#: directorymergewindow.cpp:3238 +#: directorymergewindow.cpp:3252 #, kde-format msgid "Save Directory Merge State As..." msgstr "Gem tilstand for mappesammenfletning som..." -#: directorymergewindow.cpp:3387 +#: directorymergewindow.cpp:3401 #, kde-format msgid "Start/Continue Directory Merge" msgstr "Start/Fortsæt mappeindfletning" -#: directorymergewindow.cpp:3388 +#: directorymergewindow.cpp:3402 #, kde-format msgid "Run Operation for Current Item" msgstr "Kør operation for dette element" -#: directorymergewindow.cpp:3389 +#: directorymergewindow.cpp:3403 #, kde-format msgid "Compare Selected File" msgstr "Sammenlign udvalgt fil" -#: directorymergewindow.cpp:3390 +#: directorymergewindow.cpp:3404 #, kde-format msgid "Merge Current File" msgstr "Indflet udvalgt fil" -#: directorymergewindow.cpp:3390 +#: directorymergewindow.cpp:3404 #, kde-format msgid "" "Merge\n" @@ -835,51 +835,51 @@ "Sammenflet\n" "fil" -#: directorymergewindow.cpp:3391 +#: directorymergewindow.cpp:3405 #, kde-format msgid "Fold All Subdirs" msgstr "Fold alle undermapper sammen" -#: directorymergewindow.cpp:3392 +#: directorymergewindow.cpp:3406 #, kde-format msgid "Unfold All Subdirs" msgstr "Fold alle undermapper ud" #. i18n("Save Directory Merge State ..."), 0, this, &DirectoryMergeWindow::slotSaveMergeState, ac, "dir_save_merge_state"); #. i18n("Load Directory Merge State ..."), 0, this, &DirectoryMergeWindow::slotLoadMergeState, ac, "dir_load_merge_state"); -#: directorymergewindow.cpp:3396 +#: directorymergewindow.cpp:3410 #, kde-format msgid "Choose A for All Items" msgstr "Vælg A for alle elementer" -#: directorymergewindow.cpp:3397 +#: directorymergewindow.cpp:3411 #, kde-format msgid "Choose B for All Items" msgstr "Vælg B for alle elementer" -#: directorymergewindow.cpp:3398 +#: directorymergewindow.cpp:3412 #, kde-format msgid "Choose C for All Items" msgstr "Vælg C for alle elementer" -#: directorymergewindow.cpp:3399 +#: directorymergewindow.cpp:3413 #, kde-format msgid "Auto-Choose Operation for All Items" msgstr "Auto-vælg operation for alle elementer" -#: directorymergewindow.cpp:3400 +#: directorymergewindow.cpp:3414 #, kde-format msgid "No Operation for All Items" msgstr "Ingen operation for alle elementer" #. i18n("Synchronize Directories"), 0, this, &DirectoryMergeWindow::slotSynchronizeDirectories, ac, "dir_synchronize_directories"); #. d->m_pDirChooseNewerFiles = GuiUtils::createAction< KToggleAction >(i18n("Copy Newer Files Instead of Merging"), 0, this, &DirectoryMergeWindow::slotChooseNewerFiles, ac, "dir_choose_newer_files"); -#: directorymergewindow.cpp:3405 +#: directorymergewindow.cpp:3419 #, kde-format msgid "Show Identical Files" msgstr "Vis identiske filer" -#: directorymergewindow.cpp:3405 +#: directorymergewindow.cpp:3419 #, kde-format msgid "" "Identical\n" @@ -888,17 +888,17 @@ "Identiske\n" "filer" -#: directorymergewindow.cpp:3406 +#: directorymergewindow.cpp:3420 #, kde-format msgid "Show Different Files" msgstr "Vis forskellige filer" -#: directorymergewindow.cpp:3407 +#: directorymergewindow.cpp:3421 #, kde-format msgid "Show Files only in A" msgstr "Vis kun filer i A" -#: directorymergewindow.cpp:3407 +#: directorymergewindow.cpp:3421 #, kde-format msgid "" "Files\n" @@ -907,12 +907,12 @@ "Filer\n" "kun i A" -#: directorymergewindow.cpp:3408 +#: directorymergewindow.cpp:3422 #, kde-format msgid "Show Files only in B" msgstr "Vis kun filer i B" -#: directorymergewindow.cpp:3408 +#: directorymergewindow.cpp:3422 #, kde-format msgid "" "Files\n" @@ -921,12 +921,12 @@ "Filer\n" "kun i B" -#: directorymergewindow.cpp:3409 +#: directorymergewindow.cpp:3423 #, kde-format msgid "Show Files only in C" msgstr "Vis filer som kun er i C" -#: directorymergewindow.cpp:3409 +#: directorymergewindow.cpp:3423 #, kde-format msgid "" "Files\n" @@ -935,55 +935,60 @@ "Filer\n" "kun i C" -#: directorymergewindow.cpp:3413 +#: directorymergewindow.cpp:3427 #, kde-format msgid "Compare Explicitly Selected Files" msgstr "Sammenlign eksplicit markerede filer" -#: directorymergewindow.cpp:3414 +#: directorymergewindow.cpp:3428 #, kde-format msgid "Merge Explicitly Selected Files" msgstr "Sammenflet eksplicit markerede filer" -#: directorymergewindow.cpp:3416 directorymergewindow.cpp:3423 +#: directorymergewindow.cpp:3430 directorymergewindow.cpp:3437 #, kde-format msgid "Do Nothing" msgstr "Gør intet" -#: directorymergewindow.cpp:3428 +#: directorymergewindow.cpp:3442 #, kde-format msgid "Delete A && B" msgstr "Slet A && B" -#: directorymergewindow.cpp:3431 +#: directorymergewindow.cpp:3445 #, kde-format msgid "Merge to A && B" msgstr "Indflet til A && B" -#: fileaccess.cpp:462 SourceData.cpp:493 +#: fileaccess.cpp:301 +#, kde-format +msgid "Unable to determine full url. No parent specified." +msgstr "" + +#: fileaccess.cpp:482 SourceData.cpp:506 #, fuzzy, kde-format #| msgid "Reading file: %1" msgid "Failed to read file: %1" msgstr "Læser fil: %1" -#: fileaccess.cpp:587 +#: fileaccess.cpp:624 #, kde-format msgid "Creating temp copy of %1 failed." msgstr "Oprettelse af midlertidig kopi af %1 mislykkedes." -#: fileaccess.cpp:595 fileaccess.cpp:600 +#: fileaccess.cpp:632 fileaccess.cpp:637 #, fuzzy, kde-format #| msgid "Opening %1 failed." msgid "Opening %1 failed. %2" msgstr "Åbning af %1 mislykkedes." -#: fileaccess.cpp:619 fileaccess.cpp:627 +#: fileaccess.cpp:656 fileaccess.cpp:664 #, fuzzy, kde-format #| msgid "Error reading from %1" msgid "Error reading from %1. %2" msgstr "Fejl ved læsning fra %1" -#: fileaccess.cpp:751 +#: fileaccess.cpp:788 #, fuzzy, kde-format #| msgid "" #| "While trying to make a backup, deleting an older backup failed. \n" @@ -996,7 +1001,7 @@ "sikkerhedskopieringen.\n" "Filnavn: " -#: fileaccess.cpp:758 +#: fileaccess.cpp:795 #, fuzzy, kde-format #| msgid "" #| "While trying to make a backup, renaming failed. \n" @@ -1008,178 +1013,178 @@ "Det mislykkedes at ændre navnet under sikkerhedskopieringen\n" "Filnavne:" -#: fileaccess.cpp:828 +#: fileaccess.cpp:865 #, kde-format msgid "Getting file status: %1" msgstr "Henter filstatus: %1" -#: fileaccess.cpp:869 +#: fileaccess.cpp:906 #, kde-format msgid "Reading file: %1" msgstr "Læser fil: %1" -#: fileaccess.cpp:907 +#: fileaccess.cpp:944 #, kde-format msgid "Writing file: %1" msgstr "Skriver fil: %1" -#: fileaccess.cpp:940 +#: fileaccess.cpp:977 #, kde-format msgid "Out of memory" msgstr "Ude af hukommelse" -#: fileaccess.cpp:976 +#: fileaccess.cpp:1013 #, kde-format msgid "Making directory: %1" msgstr "Opretter mappe: %1" -#: fileaccess.cpp:997 +#: fileaccess.cpp:1034 #, kde-format msgid "Removing directory: %1" msgstr "Fjerner mappe: %1" -#: fileaccess.cpp:1012 +#: fileaccess.cpp:1049 #, kde-format msgid "Removing file: %1" msgstr "Fjerner fil: %1" -#: fileaccess.cpp:1028 +#: fileaccess.cpp:1065 #, kde-format msgid "Creating symbolic link: %1 -> %2" msgstr "Laver symbolsk link: %1 -> %2" -#: fileaccess.cpp:1052 +#: fileaccess.cpp:1089 #, kde-format msgid "Renaming file: %1 -> %2" msgstr "Omdøber fil: %1 -> %2" -#: fileaccess.cpp:1086 +#: fileaccess.cpp:1123 #, kde-format msgid "Copying file: %1 -> %2" msgstr "Kopierer fil: %1 -> %2" -#: fileaccess.cpp:1108 +#: fileaccess.cpp:1145 #, fuzzy, kde-format #| msgid "Reading directory: " msgid "Reading directory: %1" msgstr "Læser mappe:" -#: fileaccess.cpp:1162 +#: fileaccess.cpp:1202 #, kde-format msgid "Listing directory: %1" msgstr "Giver en liste af mappe: %1" -#: kdiff3.cpp:181 +#: kdiff3.cpp:182 #, kde-format msgid "Current Configuration:" msgstr "Nuværende konfiguration:" -#: kdiff3.cpp:186 +#: kdiff3.cpp:187 #, kde-format msgid "Config Option Error:" msgstr "Fejl i indstillingstilvalg:" -#: kdiff3.cpp:240 +#: kdiff3.cpp:246 #, kde-format msgid "Option --auto used, but no output file specified." msgstr "Tilvalg --auto brugt, men ingen uddatafil angivet." -#: kdiff3.cpp:416 +#: kdiff3.cpp:405 #, kde-format msgid "Option --auto ignored for directory comparison." msgstr "Tilvalg --auto ignoreret for mappesammenligning." -#: kdiff3.cpp:460 +#: kdiff3.cpp:449 #, kde-format msgid "Saving failed." msgstr "Det mislykkedes at gemme." -#: kdiff3.cpp:496 pdiff.cpp:1098 +#: kdiff3.cpp:494 pdiff.cpp:1096 #, kde-format msgid "Opening of these files failed:" msgstr "Det mislykkedes at åbne disse filer:" -#: kdiff3.cpp:505 +#: kdiff3.cpp:503 pdiff.cpp:1105 #, kde-format -msgid "File Open Error" +msgid "File open error" msgstr "Fejl ved åbning af fil" -#: kdiff3.cpp:533 +#: kdiff3.cpp:532 #, kde-format msgid "Opens documents for comparison..." msgstr "Åbner dokumenter til sammenligning..." -#: kdiff3.cpp:535 +#: kdiff3.cpp:534 #, kde-format msgid "Reload" msgstr "Genindlæs" -#: kdiff3.cpp:538 +#: kdiff3.cpp:537 #, kde-format msgid "Saves the merge result. All conflicts must be solved!" msgstr "gemmer indfletningsresultatet. Alle konflikter skal løses!" -#: kdiff3.cpp:540 +#: kdiff3.cpp:539 #, kde-format msgid "Saves the current document as..." msgstr "Gemmer dette dokument som..." -#: kdiff3.cpp:543 +#: kdiff3.cpp:542 #, kde-format msgid "Print the differences" msgstr "Udskriv forskellene" -#: kdiff3.cpp:546 +#: kdiff3.cpp:545 #, kde-format msgid "Quits the application" msgstr "Afslutter programmet" -#: kdiff3.cpp:549 +#: kdiff3.cpp:548 #, kde-format msgid "Cuts the selected section and puts it to the clipboard" msgstr "Udklipper det markerede udvalg og lægger det på udklipsholderen" -#: kdiff3.cpp:552 +#: kdiff3.cpp:551 #, kde-format msgid "Copies the selected section to the clipboard" msgstr "Kopierer det valgte udsnit til udklipsholderen" -#: kdiff3.cpp:554 +#: kdiff3.cpp:553 #, kde-format msgid "Pastes the clipboard contents to current position" msgstr "Indsætter udklipsholderens indhold på den aktuelle position" -#: kdiff3.cpp:557 +#: kdiff3.cpp:556 #, kde-format msgid "Select everything in current window" msgstr "Markér alting i nuværende vindue" -#: kdiff3.cpp:560 +#: kdiff3.cpp:559 #, kde-format msgid "Search for a string" msgstr "Søg efter en streng" -#: kdiff3.cpp:562 +#: kdiff3.cpp:561 #, kde-format msgid "Search again for the string" msgstr "Søg efter strengen igen" -#: kdiff3.cpp:567 +#: kdiff3.cpp:566 #, kde-format msgid "Enables/disables the statusbar" msgstr "Slår statuslinjen til/fra" -#: kdiff3.cpp:571 +#: kdiff3.cpp:570 #, kde-format msgid "Configure KDiff3..." msgstr "Indstil KDiff3..." -#: kdiff3.cpp:590 +#: kdiff3.cpp:589 #, kde-format msgid "Go to Current Delta" msgstr "Gå til den aktuelle delta" -#: kdiff3.cpp:590 +#: kdiff3.cpp:589 #, kde-format msgid "" "Current\n" @@ -1188,12 +1193,12 @@ "Aktuel\n" "delta" -#: kdiff3.cpp:592 +#: kdiff3.cpp:591 #, kde-format msgid "Go to First Delta" msgstr "Gå til første delta" -#: kdiff3.cpp:592 +#: kdiff3.cpp:591 #, kde-format msgid "" "First\n" @@ -1202,12 +1207,12 @@ "Første\n" "delta" -#: kdiff3.cpp:594 +#: kdiff3.cpp:593 #, kde-format msgid "Go to Last Delta" msgstr "Gå til sidste delta" -#: kdiff3.cpp:594 +#: kdiff3.cpp:593 #, kde-format msgid "" "Last\n" @@ -1216,13 +1221,13 @@ "Sidste\n" "delta" -#: kdiff3.cpp:596 +#: kdiff3.cpp:595 #, kde-format msgid "(Skips white space differences when \"Show White Space\" is disabled.)" msgstr "" "(Springer over forskelle i blanktegn når \"Vis blanktegn\" er deaktiveret.)" -#: kdiff3.cpp:597 +#: kdiff3.cpp:596 #, kde-format msgid "" "(Does not skip white space differences even when \"Show White Space\" is " @@ -1231,12 +1236,12 @@ "(Springer ikke over forskelle i blanktegn også selvom \"Vis blanktegn\" er " "deaktiveret.)" -#: kdiff3.cpp:598 +#: kdiff3.cpp:597 #, kde-format msgid "Go to Previous Delta" msgstr "Gå til forrige delta" -#: kdiff3.cpp:598 +#: kdiff3.cpp:597 #, kde-format msgid "" "Prev\n" @@ -1245,12 +1250,12 @@ "Forrige\n" "delta" -#: kdiff3.cpp:600 +#: kdiff3.cpp:599 #, kde-format msgid "Go to Next Delta" msgstr "Gå til næste delta" -#: kdiff3.cpp:600 +#: kdiff3.cpp:599 #, kde-format msgid "" "Next\n" @@ -1259,12 +1264,12 @@ "Næste\n" "delta" -#: kdiff3.cpp:602 +#: kdiff3.cpp:601 #, kde-format msgid "Go to Previous Conflict" msgstr "Gå til forrige konflikt" -#: kdiff3.cpp:602 +#: kdiff3.cpp:601 #, kde-format msgid "" "Prev\n" @@ -1273,12 +1278,12 @@ "Forrige\n" "konflikt" -#: kdiff3.cpp:604 +#: kdiff3.cpp:603 #, kde-format msgid "Go to Next Conflict" msgstr "Gå til næste konflikt" -#: kdiff3.cpp:604 +#: kdiff3.cpp:603 #, kde-format msgid "" "Next\n" @@ -1287,12 +1292,12 @@ "Næste\n" "konflikt" -#: kdiff3.cpp:606 +#: kdiff3.cpp:605 #, kde-format msgid "Go to Previous Unsolved Conflict" msgstr "Gå til forrige uløste konflikt" -#: kdiff3.cpp:606 +#: kdiff3.cpp:605 #, kde-format msgid "" "Prev\n" @@ -1301,12 +1306,12 @@ "Forrige\n" "uløste" -#: kdiff3.cpp:608 +#: kdiff3.cpp:607 #, kde-format msgid "Go to Next Unsolved Conflict" msgstr "Gå til næste uløste konflikt" -#: kdiff3.cpp:608 +#: kdiff3.cpp:607 #, kde-format msgid "" "Next\n" @@ -1315,12 +1320,12 @@ "Næste\n" "uløste" -#: kdiff3.cpp:610 +#: kdiff3.cpp:609 #, kde-format msgid "Select Line(s) From A" msgstr "Vælg linjer fra A" -#: kdiff3.cpp:610 +#: kdiff3.cpp:609 #, kde-format msgid "" "Choose\n" @@ -1329,12 +1334,12 @@ "Vælg\n" "A" -#: kdiff3.cpp:611 +#: kdiff3.cpp:610 #, kde-format msgid "Select Line(s) From B" msgstr "Vælg linjer fra B" -#: kdiff3.cpp:611 +#: kdiff3.cpp:610 #, kde-format msgid "" "Choose\n" @@ -1343,12 +1348,12 @@ "Vælg\n" "B" -#: kdiff3.cpp:612 +#: kdiff3.cpp:611 #, kde-format msgid "Select Line(s) From C" msgstr "Vælg linjer fra C" -#: kdiff3.cpp:612 +#: kdiff3.cpp:611 #, kde-format msgid "" "Choose\n" @@ -1357,12 +1362,12 @@ "Vælg\n" "C" -#: kdiff3.cpp:613 +#: kdiff3.cpp:612 #, kde-format msgid "Automatically Go to Next Unsolved Conflict After Source Selection" msgstr "Gå automatiske til næste uløste konflikt efter kildevalg" -#: kdiff3.cpp:613 +#: kdiff3.cpp:612 #, kde-format msgid "" "Auto\n" @@ -1371,13 +1376,13 @@ "Auto\n" "næste" -#: kdiff3.cpp:615 +#: kdiff3.cpp:614 #, fuzzy, kde-format #| msgid "Show Space && Tabulator Characters for Differences" msgid "Show Space && Tabulator Characters" msgstr "Vis mellemrums && tabulator-tegn for forskelle" -#: kdiff3.cpp:615 +#: kdiff3.cpp:614 #, kde-format msgid "" "White\n" @@ -1386,12 +1391,12 @@ "Hvide\n" "tegn" -#: kdiff3.cpp:616 +#: kdiff3.cpp:615 #, kde-format msgid "Show White Space" msgstr "Vis blanktegn" -#: kdiff3.cpp:616 +#: kdiff3.cpp:615 #, kde-format msgid "" "White\n" @@ -1400,12 +1405,12 @@ "Hvide\n" "deltaer" -#: kdiff3.cpp:618 +#: kdiff3.cpp:617 #, kde-format msgid "Show Line Numbers" msgstr "Vis linjenumre" -#: kdiff3.cpp:618 +#: kdiff3.cpp:617 #, kde-format msgid "" "Line\n" @@ -1414,133 +1419,133 @@ "Linje-\n" "numre" -#: kdiff3.cpp:620 +#: kdiff3.cpp:619 #, kde-format msgid "Automatically Solve Simple Conflicts" msgstr "Løs simple konflikter automatisk" -#: kdiff3.cpp:621 +#: kdiff3.cpp:620 #, kde-format msgid "Set Deltas to Conflicts" msgstr "Sæt deltaer til konflikter" -#: kdiff3.cpp:622 +#: kdiff3.cpp:621 #, kde-format msgid "Run Regular Expression Auto Merge" msgstr "Kør automatisk sammenfletning med regulært udtryk" -#: kdiff3.cpp:623 +#: kdiff3.cpp:622 #, kde-format msgid "Automatically Solve History Conflicts" msgstr "Løs historikkonflikter automatisk" -#: kdiff3.cpp:624 +#: kdiff3.cpp:623 #, kde-format msgid "Split Diff At Selection" msgstr "Opdel sammenligning ved markering" -#: kdiff3.cpp:625 +#: kdiff3.cpp:624 #, kde-format msgid "Join Selected Diffs" msgstr "Føj markerede sammenligninger sammen" -#: kdiff3.cpp:627 +#: kdiff3.cpp:626 #, kde-format msgid "Show Window A" msgstr "Vis vindue A" -#: kdiff3.cpp:628 +#: kdiff3.cpp:627 #, kde-format msgid "Show Window B" msgstr "Vis vindue B" -#: kdiff3.cpp:629 +#: kdiff3.cpp:628 #, kde-format msgid "Show Window C" msgstr "Vis vindue V" -#: kdiff3.cpp:631 +#: kdiff3.cpp:630 #, kde-format msgid "Normal Overview" msgstr "Normalt overblik" -#: kdiff3.cpp:632 +#: kdiff3.cpp:631 #, kde-format msgid "A vs. B Overview" msgstr "A vs. B overblik" -#: kdiff3.cpp:633 +#: kdiff3.cpp:632 #, kde-format msgid "A vs. C Overview" msgstr "A vs. C overblik" -#: kdiff3.cpp:634 +#: kdiff3.cpp:633 #, kde-format msgid "B vs. C Overview" msgstr "B vs. C overblik" -#: kdiff3.cpp:635 +#: kdiff3.cpp:634 #, kde-format msgid "Word Wrap Diff Windows" msgstr "Tekstombrydning i diff-vinduer" -#: kdiff3.cpp:636 +#: kdiff3.cpp:635 #, kde-format msgid "Add Manual Diff Alignment" msgstr "Tilføj manuel justering af sammenligning" -#: kdiff3.cpp:637 +#: kdiff3.cpp:636 #, kde-format msgid "Clear All Manual Diff Alignments" msgstr "Ryd alle manuelle justeringer af sammenligning" -#: kdiff3.cpp:639 +#: kdiff3.cpp:638 #, kde-format msgid "Focus Next Window" msgstr "Fokus på næste vindue" -#: kdiff3.cpp:640 +#: kdiff3.cpp:639 #, kde-format msgid "Focus Prev Window" msgstr "Fokus på forrige vindue" -#: kdiff3.cpp:641 +#: kdiff3.cpp:640 #, kde-format msgid "Toggle Split Orientation" msgstr "Slå opdelt orientering til og fra" -#: kdiff3.cpp:643 +#: kdiff3.cpp:642 #, kde-format msgid "Dir && Text Split Screen View" msgstr "Mappe && tekst opdelt skærmvisning" -#: kdiff3.cpp:645 +#: kdiff3.cpp:644 #, kde-format msgid "Toggle Between Dir && Text View" msgstr "Skift mellem Mappe && tekstvisning" -#: kdiff3.cpp:697 pdiff.cpp:1909 +#: kdiff3.cpp:696 pdiff.cpp:1919 #, fuzzy, kde-format #| msgid "The merge result hasn't been saved." msgid "The merge result has not been saved." msgstr "Indfletningsresultatet er ikke blevet gemt." -#: kdiff3.cpp:699 +#: kdiff3.cpp:698 #, kde-format msgid "Save && Quit" msgstr "Gem && afslut" -#: kdiff3.cpp:700 +#: kdiff3.cpp:699 #, kde-format msgid "Quit Without Saving" msgstr "Afslut uden at gemme" -#: kdiff3.cpp:708 pdiff.cpp:1920 +#: kdiff3.cpp:707 pdiff.cpp:1930 #, kde-format msgid "Saving the merge result failed." msgstr "Det mislykkedes at gemme indfletningsresultatet." -#: kdiff3.cpp:719 pdiff.cpp:1032 +#: kdiff3.cpp:718 pdiff.cpp:1030 #, kde-format msgid "" "You are currently doing a directory merge. Are you sure, you want to abort?" @@ -1548,63 +1553,63 @@ "Du er ved at udføre en mappeindfletning. Er du sikker på du ønskler at " "afbryde?" -#: kdiff3.cpp:742 +#: kdiff3.cpp:741 #, kde-format msgid "Saving file..." msgstr "Gemmer fil..." -#: kdiff3.cpp:759 +#: kdiff3.cpp:758 #, kde-format msgid "Saving file with a new filename..." msgstr "Gemmer fil med nyt filnavn..." -#: kdiff3.cpp:761 +#: kdiff3.cpp:760 #, kde-format msgid "Save As..." msgstr "Gem som..." -#: kdiff3.cpp:820 +#: kdiff3.cpp:819 #, kde-format msgid "Printing not implemented." msgstr "Udskrift er ikke implementeret." -#: kdiff3.cpp:857 +#: kdiff3.cpp:858 #, kde-format msgid "Printing..." msgstr "Udskriver..." -#: kdiff3.cpp:943 +#: kdiff3.cpp:948 #, kde-format msgid "Printing page %1 of %2" msgstr "" -#: kdiff3.cpp:1000 +#: kdiff3.cpp:1006 #, fuzzy, kde-format #| msgid "Selection" msgid " (Selection)" msgstr "Markering" -#: kdiff3.cpp:1027 +#: kdiff3.cpp:1034 #, kde-format msgid "Printing completed." msgstr "Udskrift færdig." -#: kdiff3.cpp:1031 +#: kdiff3.cpp:1038 #, kde-format msgid "Printing aborted." msgstr "Udskrift afbrudt." -#: kdiff3.cpp:1038 +#: kdiff3.cpp:1045 #, kde-format msgid "Exiting..." msgstr "Går ud..." -#: kdiff3.cpp:1049 +#: kdiff3.cpp:1056 #, kde-format msgid "Toggling toolbar..." msgstr "Slår værktøjslinje til/fra" -#: kdiff3.cpp:1070 +#: kdiff3.cpp:1077 #, kde-format msgid "Toggle the statusbar..." msgstr "Slå statuslinje til/fra..." @@ -1630,7 +1635,7 @@ msgid "Joachim Eibl" msgstr "Joachim Eibl" -#: kdiff3_part.cpp:173 kdiff3_part.cpp:254 +#: kdiff3_part.cpp:174 kdiff3_part.cpp:255 #, fuzzy, kde-format #| msgid "Couldn't find files for comparison." msgid "Could not find files for comparison." @@ -1649,7 +1654,7 @@ msgstr "Indstil KDiff3" #. i18n: ectx: ToolBar (mainToolBar) -#: kdiff3_part.rc:16 main.cpp:88 +#: kdiff3_part.rc:16 main.cpp:89 #, kde-format msgid "KDiff3" msgstr "KDiff3" @@ -1721,85 +1726,91 @@ msgid "Main Toolbar" msgstr "Hovedværktøjslinje" -#: main.cpp:68 main.cpp:72 +#: main.cpp:69 main.cpp:73 #, kde-format msgid "Ignored. (User defined.)" msgstr "Ignoreres. (brugerdefineret)" -#: main.cpp:92 +#: main.cpp:93 #, kde-format msgid " (64 bit)" msgstr "" -#: main.cpp:94 +#: main.cpp:95 #, kde-format msgid " (32 bit)" msgstr "" -#: main.cpp:95 +#: main.cpp:96 #, kde-format msgid "Tool for Comparison and Merge of Files and Directories" msgstr "Værktøj til sammenligning og sammenfletning af filer og mapper" -#: main.cpp:96 +#: main.cpp:97 #, kde-format msgid "(c) 2002-2014 Joachim Eibl, (c) 2017 Michael Reeves KF5/Qt5 port" msgstr "" -#: main.cpp:112 +#: main.cpp:113 #, kde-format msgid "Merge the input." msgstr "Indflet inddata." -#: main.cpp:113 +#: main.cpp:114 #, kde-format msgid "Explicit base file. For compatibility with certain tools." msgstr "Eksplicit basisfil. For kompatibilitet med visse værktøjer." -#: main.cpp:114 +#: main.cpp:115 #, kde-format msgid "Output file. Implies -m. E.g.: -o newfile.txt" msgstr "Uddatafil. Implicerer -m. F.eks.: -o nyfil.txt" -#: main.cpp:115 +#: main.cpp:116 #, kde-format msgid "Output file, again. (For compatibility with certain tools.)" msgstr "Uddatafil, igen. (For kompatibilitet med visse værktøjer.)" -#: main.cpp:116 +#: main.cpp:118 #, kde-format msgid "No GUI if all conflicts are auto-solvable. (Needs -o file)" msgstr "" "Ingen GUI hvis alle konflikter er løsbare af sig selv. (Behøver -o fil)" -#: main.cpp:117 +#: main.cpp:120 +#, fuzzy, kde-format +#| msgid "Ignore" +msgid "Ignored." +msgstr "Ignorér" + +#: main.cpp:122 #, fuzzy, kde-format #| msgid "Don't solve conflicts automatically. (For compatibility...)" msgid "Do not solve conflicts automatically." msgstr "Løs ikke konflikter automatisk. (For kompatibilitet...)" -#: main.cpp:118 +#: main.cpp:123 #, kde-format msgid "Visible name replacement for input file 1 (base)." msgstr "Synlig navneerstatning for inddatafil 1 (basis)." -#: main.cpp:119 +#: main.cpp:124 #, kde-format msgid "Visible name replacement for input file 2." msgstr "Synlig navneerstatning for inddatafil 2." -#: main.cpp:120 +#: main.cpp:125 #, kde-format msgid "Visible name replacement for input file 3." msgstr "Synlig navneerstatning for inddatafil 3." -#: main.cpp:121 +#: main.cpp:126 #, kde-format msgid "Alternative visible name replacement. Supply this once for every input." msgstr "" "Alternativ synlig navneerstatning. Angiv dette en gang for hver inddata." -#: main.cpp:122 +#: main.cpp:127 #, kde-format msgid "" "Override a config setting. Use once for every setting. E.g.: --cs " @@ -1808,87 +1819,87 @@ "Sæt en indstilling ud af kraft. Brug en gang for hver indstilling, f.eks. --" "cs \"AutoAdvance=1\"" -#: main.cpp:123 +#: main.cpp:128 #, kde-format msgid "Show list of config settings and current values." msgstr "Vis liste med indstillinger og nuværende værdier." -#: main.cpp:124 +#: main.cpp:129 #, kde-format msgid "Use a different config file." msgstr "Brug en anden indstillingsfil." -#: main.cpp:127 +#: main.cpp:132 #, kde-format msgid "file1 to open (base, if not specified via --base)" msgstr "fil1 der skal åbnes (basis, hvis ikke angivet via --base)" -#: main.cpp:128 +#: main.cpp:133 #, kde-format msgid "file2 to open" msgstr "fil2 der skal åbnes" -#: main.cpp:129 +#: main.cpp:134 #, kde-format msgid "file3 to open" msgstr "fil3 der skal åbnes" -#: main.cpp:153 +#: main.cpp:158 #, kde-format msgid "See kdiff3 --help for supported options." msgstr "" -#: mergeresultwindow.cpp:158 +#: mergeresultwindow.cpp:171 #, kde-format msgid "Choose A Everywhere" msgstr "Vælg A overalt" -#: mergeresultwindow.cpp:159 +#: mergeresultwindow.cpp:172 #, kde-format msgid "Choose B Everywhere" msgstr "Vælg B overalt" -#: mergeresultwindow.cpp:160 +#: mergeresultwindow.cpp:173 #, kde-format msgid "Choose C Everywhere" msgstr "Vælg C overalt" -#: mergeresultwindow.cpp:161 +#: mergeresultwindow.cpp:174 #, kde-format msgid "Choose A for All Unsolved Conflicts" msgstr "Vælg A for alle uløste konflikter" -#: mergeresultwindow.cpp:162 +#: mergeresultwindow.cpp:175 #, kde-format msgid "Choose B for All Unsolved Conflicts" msgstr "Vælg B for alle uløste konflikter" -#: mergeresultwindow.cpp:163 +#: mergeresultwindow.cpp:176 #, kde-format msgid "Choose C for All Unsolved Conflicts" msgstr "Vælg C for alle uløste konflikter" -#: mergeresultwindow.cpp:164 +#: mergeresultwindow.cpp:177 #, kde-format msgid "Choose A for All Unsolved Whitespace Conflicts" msgstr "Vælg A for alle uløste konflikter med blanktegn" -#: mergeresultwindow.cpp:165 +#: mergeresultwindow.cpp:178 #, kde-format msgid "Choose B for All Unsolved Whitespace Conflicts" msgstr "Vælg B for alle uløste konflikter med blanktegn" -#: mergeresultwindow.cpp:166 +#: mergeresultwindow.cpp:179 #, kde-format msgid "Choose C for All Unsolved Whitespace Conflicts" msgstr "Vælg C for alle uløste konflikter med blanktegn" -#: mergeresultwindow.cpp:176 +#: mergeresultwindow.cpp:204 #, kde-format msgid "Number of remaining unsolved conflicts: %1 (of which %2 are whitespace)" msgstr "Antal tilbageværende uløste konflikter: %1 (af hvilke %2 er blanktegn)" -#: mergeresultwindow.cpp:370 +#: mergeresultwindow.cpp:398 #, kde-format msgid "" "The output has been modified.\n" @@ -1897,29 +1908,29 @@ "Uddata er blevet ændret.\n" "Hvis du fortsætter vil dine ændringer gå tabt." -#: mergeresultwindow.cpp:936 pdiff.cpp:827 +#: mergeresultwindow.cpp:964 pdiff.cpp:817 #, kde-format msgid "All input files are binary equal." msgstr "Alle inddata-filer er binært ens." -#: mergeresultwindow.cpp:938 +#: mergeresultwindow.cpp:966 #, kde-format msgid "All input files contain the same text." msgstr "Alle inddata-filer indeholder den samme tekst." -#: mergeresultwindow.cpp:942 mergeresultwindow.cpp:946 -#: mergeresultwindow.cpp:950 pdiff.cpp:833 pdiff.cpp:837 pdiff.cpp:841 +#: mergeresultwindow.cpp:970 mergeresultwindow.cpp:974 +#: mergeresultwindow.cpp:978 pdiff.cpp:823 pdiff.cpp:827 pdiff.cpp:831 #, kde-format msgid "Files %1 and %2 are binary equal.\n" msgstr "Filerne %1 og %2 er binært ens.\n" -#: mergeresultwindow.cpp:944 mergeresultwindow.cpp:948 -#: mergeresultwindow.cpp:952 +#: mergeresultwindow.cpp:972 mergeresultwindow.cpp:976 +#: mergeresultwindow.cpp:980 #, kde-format msgid "Files %1 and %2 have equal text.\n" msgstr "Filerne %1 og %2 har ens tekst.\n" -#: mergeresultwindow.cpp:958 +#: mergeresultwindow.cpp:986 #, kde-format msgid "" "Total number of conflicts: %1\n" @@ -1928,27 +1939,27 @@ "%4" msgstr "" -#: mergeresultwindow.cpp:964 +#: mergeresultwindow.cpp:992 #, kde-format msgid "Conflicts" msgstr "Konflikter" -#: mergeresultwindow.cpp:1873 +#: mergeresultwindow.cpp:1901 #, kde-format msgid "" msgstr "" -#: mergeresultwindow.cpp:1881 +#: mergeresultwindow.cpp:1909 #, kde-format msgid "" msgstr "" -#: mergeresultwindow.cpp:1883 mergeresultwindow.cpp:2755 +#: mergeresultwindow.cpp:1911 mergeresultwindow.cpp:2783 #, kde-format msgid "" msgstr "" -#: mergeresultwindow.cpp:2967 +#: mergeresultwindow.cpp:2995 #, fuzzy, kde-format #| msgid "" #| "Not all conflicts are solved yet.\n" @@ -1960,12 +1971,12 @@ "Ikke alle konflikter er løst endnu.\n" "Filen er ikke gemt.\n" -#: mergeresultwindow.cpp:2969 mergeresultwindow.cpp:2978 +#: mergeresultwindow.cpp:2997 mergeresultwindow.cpp:3006 #, kde-format msgid "Conflicts Left" msgstr "Konflikter tilovers" -#: mergeresultwindow.cpp:2976 +#: mergeresultwindow.cpp:3004 #, fuzzy, kde-format #| msgid "" #| "There is a line end style conflict. Please choose the line end style " @@ -1980,7 +1991,7 @@ "linjeafslutning manuelt.\n" "Filen blev ikke gemt.\n" -#: mergeresultwindow.cpp:2990 +#: mergeresultwindow.cpp:3018 #, kde-format msgid "" "\n" @@ -1991,62 +2002,62 @@ "\n" "Mislykkedes at oprette sikkerhedskopi. Filen blev ikke gemt." -#: mergeresultwindow.cpp:2990 mergeresultwindow.cpp:3038 +#: mergeresultwindow.cpp:3018 mergeresultwindow.cpp:3066 #, kde-format msgid "File Save Error" msgstr "Fejl ved at gemme fil" -#: mergeresultwindow.cpp:3038 +#: mergeresultwindow.cpp:3066 #, kde-format msgid "Error while writing." msgstr "Fejl ved skrivning." -#: mergeresultwindow.cpp:3110 +#: mergeresultwindow.cpp:3138 #, fuzzy, kde-format #| msgid "Output" msgid "Output:" msgstr "Uddata" -#: mergeresultwindow.cpp:3123 mergeresultwindow.cpp:3315 +#: mergeresultwindow.cpp:3151 mergeresultwindow.cpp:3343 #, kde-format msgid "[Modified]" msgstr "[Ændret]" -#: mergeresultwindow.cpp:3130 +#: mergeresultwindow.cpp:3158 #, fuzzy, kde-format #| msgid "Encoding for saving" msgid "Encoding for saving:" msgstr "Filtegnsæt for at gemme" -#: mergeresultwindow.cpp:3230 +#: mergeresultwindow.cpp:3258 #, kde-format msgid "Conflict" msgstr "Konflikt" -#: mergeresultwindow.cpp:3262 +#: mergeresultwindow.cpp:3290 #, fuzzy, kde-format #| msgid "Codec from" msgid "Codec from A: %1" msgstr "Koder fra" -#: mergeresultwindow.cpp:3264 +#: mergeresultwindow.cpp:3292 #, fuzzy, kde-format #| msgid "Codec from" msgid "Codec from B: %1" msgstr "Koder fra" -#: mergeresultwindow.cpp:3266 +#: mergeresultwindow.cpp:3294 #, fuzzy, kde-format #| msgid "Codec from" msgid "Codec from C: %1" msgstr "Koder fra" -#: optiondialog.cpp:119 +#: optiondialog.cpp:121 #, kde-format msgid "Change Font" msgstr "" -#: optiondialog.cpp:135 optiondialog.cpp:145 +#: optiondialog.cpp:137 optiondialog.cpp:147 #, kde-format msgid "" "Font: %1, %2, %3\n" @@ -2054,162 +2065,162 @@ "Example:" msgstr "" -#: optiondialog.cpp:388 +#: optiondialog.cpp:390 #, kde-format msgid "Unicode" msgstr "Unicode" -#: optiondialog.cpp:389 +#: optiondialog.cpp:391 #, kde-format msgid "Latin1" msgstr "Latin1" -#: optiondialog.cpp:408 +#: optiondialog.cpp:410 #, kde-format msgid "Change this if non-ASCII characters are not displayed correctly." msgstr "Ændr dette hvis ikke-ASCII tegn ikke vises rigtigt." -#: optiondialog.cpp:491 +#: optiondialog.cpp:495 #, kde-format msgid "Configure" msgstr "Indstil" -#: optiondialog.cpp:568 +#: optiondialog.cpp:573 #, kde-format msgid "Font" msgstr "Skrifttype" -#: optiondialog.cpp:570 +#: optiondialog.cpp:575 #, kde-format msgid "Editor & Diff Output Font" msgstr "Editor & Diff uddata-skrifttype" -#: optiondialog.cpp:589 +#: optiondialog.cpp:594 #, kde-format msgid "Application font" msgstr "" -#: optiondialog.cpp:594 +#: optiondialog.cpp:599 #, fuzzy, kde-format #| msgid "File Save Error" msgid "File view font" msgstr "Fejl ved at gemme fil" -#: optiondialog.cpp:613 +#: optiondialog.cpp:618 #, fuzzy, kde-format #| msgid "Color" msgctxt "Title for color settings page" msgid "Color" msgstr "Farve" -#: optiondialog.cpp:614 +#: optiondialog.cpp:619 #, kde-format msgid "Colors Settings" msgstr "Farveindstillinger" -#: optiondialog.cpp:631 +#: optiondialog.cpp:644 #, kde-format msgid "Editor and Diff Views:" msgstr "Editor- og forskelsvisninger:" -#: optiondialog.cpp:639 +#: optiondialog.cpp:652 #, kde-format msgid "Foreground color:" msgstr "Forgrundsfarve:" -#: optiondialog.cpp:647 +#: optiondialog.cpp:660 #, kde-format msgid "Background color:" msgstr "Baggrundsfarve:" -#: optiondialog.cpp:657 +#: optiondialog.cpp:670 #, kde-format msgid "Diff background color:" msgstr "Diff baggrundsfarve:" -#: optiondialog.cpp:666 +#: optiondialog.cpp:679 #, kde-format msgid "Color A:" msgstr "Farve A:" -#: optiondialog.cpp:675 +#: optiondialog.cpp:688 #, kde-format msgid "Color B:" msgstr "Farve B:" -#: optiondialog.cpp:684 +#: optiondialog.cpp:697 #, kde-format msgid "Color C:" msgstr "Farve C:" -#: optiondialog.cpp:692 +#: optiondialog.cpp:705 #, kde-format msgid "Conflict color:" msgstr "Konfliktfarve:" -#: optiondialog.cpp:701 +#: optiondialog.cpp:714 #, kde-format msgid "Current range background color:" msgstr "Baggrundsfarve for aktuelt område:" -#: optiondialog.cpp:710 +#: optiondialog.cpp:723 #, kde-format msgid "Current range diff background color:" msgstr "Diff baggrundsfarve for aktuelt område:" -#: optiondialog.cpp:718 +#: optiondialog.cpp:731 #, kde-format msgid "Color for manually aligned difference ranges:" msgstr "Farvelæg for manuelt justerede sammenligningsområder:" -#: optiondialog.cpp:725 +#: optiondialog.cpp:738 #, kde-format msgid "Directory Comparison View:" msgstr "Mappesammenligningsvisning:" -#: optiondialog.cpp:731 +#: optiondialog.cpp:744 #, kde-format msgid "Newest file color:" msgstr "Farve for nyeste fil:" -#: optiondialog.cpp:736 +#: optiondialog.cpp:749 #, kde-format msgid "" "Changing this color will only be effective when starting the next directory " "comparison." msgstr "At ændre farven får kun virkning når næste mappesammenligning startes." -#: optiondialog.cpp:741 +#: optiondialog.cpp:754 #, kde-format msgid "Oldest file color:" msgstr "Farve for ældste fil:" -#: optiondialog.cpp:750 +#: optiondialog.cpp:763 #, kde-format msgid "Middle age file color:" msgstr "Farve for middelgammel fil:" -#: optiondialog.cpp:759 +#: optiondialog.cpp:772 #, kde-format msgid "Color for missing files:" msgstr "Farve for manglende filer:" -#: optiondialog.cpp:773 +#: optiondialog.cpp:786 #, kde-format msgid "Editor" msgstr "Editor" -#: optiondialog.cpp:774 +#: optiondialog.cpp:787 #, kde-format msgid "Editor Behavior" msgstr "Editor-opførsel" -#: optiondialog.cpp:787 +#: optiondialog.cpp:809 #, kde-format msgid "Tab inserts spaces" msgstr "Tab indsætter mellemrum" -#: optiondialog.cpp:791 +#: optiondialog.cpp:813 #, kde-format msgid "" "On: Pressing tab generates the appropriate number of spaces.\n" @@ -2218,27 +2229,27 @@ "Til: Tryk på tab genererer et passende antal mellemrum.\n" "Fra: Et Tab-tegn bliver indsat." -#: optiondialog.cpp:796 +#: optiondialog.cpp:818 #, kde-format msgid "Tab size:" msgstr "Tab-størrelse:" -#: optiondialog.cpp:803 +#: optiondialog.cpp:825 #, kde-format msgid "Auto indentation" msgstr "Auto-indrykning" -#: optiondialog.cpp:807 +#: optiondialog.cpp:829 #, kde-format msgid "On: The indentation of the previous line is used for a new line.\n" msgstr "Til: Indrykningen for den tidligere linje bruges for en ny linje.\n" -#: optiondialog.cpp:810 +#: optiondialog.cpp:832 #, kde-format msgid "Auto copy selection" msgstr "Autokopi udvalg" -#: optiondialog.cpp:814 +#: optiondialog.cpp:836 #, fuzzy, kde-format #| msgid "" #| "On: Any selection is immediately written to the clipboard.\n" @@ -2250,7 +2261,7 @@ "Til: Enhver markering bliver umiddelbart skrevet til udklipsholderen.\n" "Fra: Du skal eksplicit kopiere f.eks. via Ctrl-C." -#: optiondialog.cpp:829 +#: optiondialog.cpp:851 #, kde-format msgid "" "Sets the line endings for when an edited file is saved.\n" @@ -2259,12 +2270,12 @@ "Sætter linjeafslutninger for når en redigeret fil gemmes.\n" "DOS/Windows: CR+LF; UNIX: LF; med CR=0D, LF=0A" -#: optiondialog.cpp:839 +#: optiondialog.cpp:861 #, kde-format msgid "Diff" msgstr "Diff" -#: optiondialog.cpp:840 +#: optiondialog.cpp:862 #, kde-format msgid "Diff Settings" msgstr "Diff-indstillinger" @@ -2278,13 +2289,13 @@ #. ); #. ++line; #. -#: optiondialog.cpp:865 +#: optiondialog.cpp:896 #, fuzzy, kde-format #| msgid "Treat as white space." msgid "Ignore numbers (treat as white space)" msgstr "Behandl som white space." -#: optiondialog.cpp:869 +#: optiondialog.cpp:900 #, kde-format msgid "" "Ignore number characters during line matching phase. (Similar to Ignore " @@ -2295,46 +2306,46 @@ "blanktegn.)\n" "Kan muligvis hjælpe med at sammenligne numeriske data." -#: optiondialog.cpp:873 +#: optiondialog.cpp:904 #, fuzzy, kde-format #| msgid "Treat C/C++ comments like white space." msgid "Ignore C/C++ comments (treat as white space)" msgstr "Behandl C/C++ kommentarer ligesom blanktegn." -#: optiondialog.cpp:876 +#: optiondialog.cpp:907 #, kde-format msgid "Treat C/C++ comments like white space." msgstr "Behandl C/C++ kommentarer ligesom blanktegn." -#: optiondialog.cpp:879 +#: optiondialog.cpp:910 #, fuzzy, kde-format #| msgid "Treat as white space." msgid "Ignore case (treat as white space)" msgstr "Behandl som white space." -#: optiondialog.cpp:883 +#: optiondialog.cpp:914 #, kde-format msgid "Treat case differences like white space changes. ('a'<=>'A')" msgstr "" "Behandl forskel mellem store og små bogstaver som ændringer i blanktegn. " "('a'<=>'A')" -#: optiondialog.cpp:886 +#: optiondialog.cpp:917 #, kde-format msgid "Preprocessor command:" msgstr "Præprocessor kommando:" -#: optiondialog.cpp:891 +#: optiondialog.cpp:922 #, kde-format msgid "User defined pre-processing. (See the docs for details.)" msgstr "Brugerdefineret præ-proces. (Se dokumentationen for detaljer.)" -#: optiondialog.cpp:894 +#: optiondialog.cpp:925 #, kde-format msgid "Line-matching preprocessor command:" msgstr "Linje-matchende præprocessor kommando:" -#: optiondialog.cpp:899 +#: optiondialog.cpp:930 #, kde-format msgid "" "This pre-processor is only used during line matching.\n" @@ -2343,12 +2354,12 @@ "Denne præ-processor bruges kun når du matcher linjer.\n" "(Se dokumentationen for detaljer.)" -#: optiondialog.cpp:902 +#: optiondialog.cpp:933 #, kde-format msgid "Try hard (slower)" msgstr "Prøv hårdt (langsommere)" -#: optiondialog.cpp:906 +#: optiondialog.cpp:937 #, kde-format msgid "" "Enables the --minimal option for the external diff.\n" @@ -2357,12 +2368,12 @@ "Aktiverer --minimal tilvalget for den eksterne diff.\n" "Analysen af store filer vil være meget langsommere." -#: optiondialog.cpp:910 +#: optiondialog.cpp:941 #, kde-format msgid "Align B and C for 3 input files" msgstr "Justér B og C til 3 input-filer" -#: optiondialog.cpp:914 +#: optiondialog.cpp:945 #, kde-format msgid "" "Try to align B and C when comparing or merging three input files.\n" @@ -2375,17 +2386,24 @@ "kompliceret.\n" "(Standard er \"Fra\".)" -#: optiondialog.cpp:926 +#: optiondialog.cpp:956 +#, fuzzy, kde-format +#| msgid "Merge" +msgctxt "Settings page" +msgid "Merge" +msgstr "Indflet" + +#: optiondialog.cpp:957 #, kde-format msgid "Merge Settings" msgstr "Sammenfletningsindstillinger" -#: optiondialog.cpp:940 +#: optiondialog.cpp:980 #, kde-format msgid "Auto advance delay (ms):" msgstr "Auto fremad-tøven (ms):" -#: optiondialog.cpp:946 +#: optiondialog.cpp:986 #, kde-format msgid "" "When in Auto-Advance mode the result of the current selection is shown \n" @@ -2395,27 +2413,27 @@ "i det angiven tidsrum tid, før der springes frem til den næste konflikt. " "Område: 0-2000 ms" -#: optiondialog.cpp:950 +#: optiondialog.cpp:990 #, kde-format msgid "Show info dialogs" msgstr "Vis infodialoger" -#: optiondialog.cpp:953 +#: optiondialog.cpp:993 #, kde-format msgid "Show a dialog with information about the number of conflicts." msgstr "Vis en dialog med information om antallet af konflikter." -#: optiondialog.cpp:956 +#: optiondialog.cpp:996 #, kde-format msgid "White space 2-file merge default:" msgstr "Standard for 2-fils indfletning af blanktegn:" -#: optiondialog.cpp:961 optiondialog.cpp:974 +#: optiondialog.cpp:1001 optiondialog.cpp:1014 #, kde-format msgid "Manual Choice" msgstr "Manuelt valg" -#: optiondialog.cpp:965 optiondialog.cpp:979 +#: optiondialog.cpp:1005 optiondialog.cpp:1019 #, kde-format msgid "" "Allow the merge algorithm to automatically select an input for white-space-" @@ -2424,22 +2442,22 @@ "Tillad indfletningsalgoritmen automatisk at vælge et input for ændringer kun " "af blanktegn." -#: optiondialog.cpp:969 +#: optiondialog.cpp:1009 #, kde-format msgid "White space 3-file merge default:" msgstr "Standard for 3-fils indfletning:" -#: optiondialog.cpp:983 +#: optiondialog.cpp:1023 #, kde-format msgid "Automatic Merge Regular Expression" msgstr "Automatisk sammenfletning med regulært udtryk" -#: optiondialog.cpp:991 smalldialogs.cpp:449 +#: optiondialog.cpp:1031 smalldialogs.cpp:459 #, kde-format msgid "Auto merge regular expression:" msgstr "Regulært udtryk for automatisk sammenfletning:" -#: optiondialog.cpp:996 +#: optiondialog.cpp:1036 #, kde-format msgid "" "Regular expression for lines where KDiff3 should automatically choose one " @@ -2451,13 +2469,13 @@ "Når en linje med en konflikt matcher det regulære udtryk vælges -C \n" "om tilgængeligt, ellers vælges B." -#: optiondialog.cpp:1002 +#: optiondialog.cpp:1042 #, kde-format msgid "Run regular expression auto merge on merge start" msgstr "" "Kør automatisk sammenfletning med regulært udtryk når sammenfletning starter" -#: optiondialog.cpp:1005 +#: optiondialog.cpp:1045 #, kde-format msgid "" "Run the merge for auto merge regular expressions\n" @@ -2466,17 +2484,17 @@ "Kør automatisk sammenfletning med regulært\n" "udtryk med det samme når en sammenfletning starter.\n" -#: optiondialog.cpp:1010 +#: optiondialog.cpp:1050 #, kde-format msgid "Version Control History Merging" msgstr "Sammenfletning ifølge versionskontrolhistorik" -#: optiondialog.cpp:1018 smalldialogs.cpp:476 +#: optiondialog.cpp:1058 smalldialogs.cpp:486 #, kde-format msgid "History start regular expression:" msgstr "Regulært udtryk for historikkens begyndelse:" -#: optiondialog.cpp:1023 +#: optiondialog.cpp:1063 #, kde-format msgid "" "Regular expression for the start of the version control history entry.\n" @@ -2487,12 +2505,12 @@ "Som oftest indeholder linjen nøgleordet \"$Log$\".\n" "Standardværdi: \".*\\$Log.*\\$.*\"" -#: optiondialog.cpp:1029 smalldialogs.cpp:504 +#: optiondialog.cpp:1069 smalldialogs.cpp:514 #, kde-format msgid "History entry start regular expression:" msgstr "Regulært udtryk for historikindgangens begyndelse:" -#: optiondialog.cpp:1042 +#: optiondialog.cpp:1082 #, kde-format msgid "" "A version control history entry consists of several lines.\n" @@ -2511,22 +2529,22 @@ "historikposterne ad.\n" "Se dokumentationen for detaljer." -#: optiondialog.cpp:1050 +#: optiondialog.cpp:1090 #, kde-format msgid "History merge sorting" msgstr "Sortering af historiksammenfletning" -#: optiondialog.cpp:1053 +#: optiondialog.cpp:1093 #, kde-format msgid "Sort version control history by a key." msgstr "Sortér versionskontrolhistorikken med en nøgle." -#: optiondialog.cpp:1063 +#: optiondialog.cpp:1103 #, kde-format msgid "History entry start sort key order:" msgstr "Sorteringsnøglernes rækkefølge fra historikpostens begyndelse:" -#: optiondialog.cpp:1068 +#: optiondialog.cpp:1108 #, kde-format msgid "" "Each pair of parentheses used in the regular expression for the history " @@ -2546,40 +2564,40 @@ "Hvis det efterlades tomt, udføres ingen sortering.\n" "Se dokumentationen for detaljer." -#: optiondialog.cpp:1079 +#: optiondialog.cpp:1119 #, kde-format msgid "Merge version control history on merge start" msgstr "" "Sammenfletning ifølge versionskontrolhistorik når sammenfletning starter" -#: optiondialog.cpp:1082 +#: optiondialog.cpp:1122 #, kde-format msgid "Run version control history automerge on merge start." msgstr "" "Kør automatisk sammenfletning ifølge versionskontrolhistorik når " "sammenfletning starter." -#: optiondialog.cpp:1086 +#: optiondialog.cpp:1126 #, kde-format msgid "Max number of history entries:" msgstr "Maks. antal historikindgange:" -#: optiondialog.cpp:1090 +#: optiondialog.cpp:1130 #, kde-format msgid "Cut off after specified number. Use -1 for infinite number of entries." msgstr "Afbryd efter angivet antal. Brug -1 for uendeligt antal indgange." -#: optiondialog.cpp:1094 +#: optiondialog.cpp:1134 #, kde-format msgid "Test your regular expressions" msgstr "Test dine regulære udtryk" -#: optiondialog.cpp:1099 +#: optiondialog.cpp:1139 #, kde-format msgid "Irrelevant merge command:" msgstr "Ikke relevant sammenfletningskommando:" -#: optiondialog.cpp:1104 +#: optiondialog.cpp:1144 #, kde-format msgid "" "If specified this script is run after automerge\n" @@ -2590,12 +2608,12 @@ "når ingen andre relevante ændringer blev detekteret.\n" "Kaldes med parametrene: filnavn1 filnavn2 filnavn3" -#: optiondialog.cpp:1109 +#: optiondialog.cpp:1149 #, kde-format msgid "Auto save and quit on merge without conflicts" msgstr "Gem automatisk og afslut ved sammenfletning uden konflikter" -#: optiondialog.cpp:1113 +#: optiondialog.cpp:1153 #, kde-format msgid "" "If KDiff3 was started for a file-merge from the command line and all\n" @@ -2608,27 +2626,27 @@ "automatisk.\n" "(Ligesom kommandolinjetilvalget \"--auto\".)" -#: optiondialog.cpp:1124 optiondialog.cpp:1125 +#: optiondialog.cpp:1164 optiondialog.cpp:1165 #, kde-format msgid "Directory" msgstr "Mappe" -#: optiondialog.cpp:1137 +#: optiondialog.cpp:1185 #, kde-format msgid "Recursive directories" msgstr "Rekursive mapper" -#: optiondialog.cpp:1140 +#: optiondialog.cpp:1188 #, kde-format msgid "Whether to analyze subdirectories or not." msgstr "Om undermapper skal analyseres eller ej." -#: optiondialog.cpp:1142 +#: optiondialog.cpp:1190 #, kde-format msgid "File pattern(s):" msgstr "Filmønstre:" -#: optiondialog.cpp:1148 +#: optiondialog.cpp:1196 #, kde-format msgid "" "Pattern(s) of files to be analyzed. \n" @@ -2639,12 +2657,12 @@ "Jokertegn: '*' og '?'\n" "Flere mønstre kan angives ved brug af adskillertegnet: ';'" -#: optiondialog.cpp:1153 +#: optiondialog.cpp:1201 #, kde-format msgid "File-anti-pattern(s):" msgstr "Fil-anti-mønstre:" -#: optiondialog.cpp:1159 +#: optiondialog.cpp:1207 #, kde-format msgid "" "Pattern(s) of files to be excluded from analysis. \n" @@ -2655,12 +2673,12 @@ "Jokertegn: '*' og '?'\n" "Flere mønstre kan angives ved brug af adskillertegnet: ';'" -#: optiondialog.cpp:1164 +#: optiondialog.cpp:1212 #, kde-format msgid "Dir-anti-pattern(s):" msgstr "Mappe-anti-mønstre:" -#: optiondialog.cpp:1170 +#: optiondialog.cpp:1218 #, kde-format msgid "" "Pattern(s) of directories to be excluded from analysis. \n" @@ -2671,12 +2689,12 @@ "Jokertegn: '*' og '?'\n" "Flere mønstre kan angives ved brug af adskillertegnet: ';'" -#: optiondialog.cpp:1175 +#: optiondialog.cpp:1223 #, kde-format msgid "Use .cvsignore" msgstr "Brug .cvsignore" -#: optiondialog.cpp:1179 +#: optiondialog.cpp:1227 #, kde-format msgid "" "Extends the antipattern to anything that would be ignored by CVS.\n" @@ -2685,23 +2703,23 @@ "Udvider anti-mønstret til hvadsomhelst der ville blive ignoreret af CVS.\n" "Via lokale \".cvsignore\"-filer kan dette være specifikt for en enkel mappe." -#: optiondialog.cpp:1183 +#: optiondialog.cpp:1231 #, kde-format msgid "Find hidden files and directories" msgstr "Find skjulte filer og mapper" -#: optiondialog.cpp:1186 +#: optiondialog.cpp:1234 #, fuzzy, kde-format #| msgid "Find hidden files and directories" msgid "Finds hidden files and directories." msgstr "Find skjulte filer og mapper" -#: optiondialog.cpp:1189 +#: optiondialog.cpp:1237 #, kde-format msgid "Follow file links" msgstr "Følger fil-link" -#: optiondialog.cpp:1193 +#: optiondialog.cpp:1241 #, kde-format msgid "" "On: Compare the file the link points to.\n" @@ -2710,12 +2728,12 @@ "Til: Sammenlign med filen som linket peger på.\n" "Fra: Sammenlign link." -#: optiondialog.cpp:1197 +#: optiondialog.cpp:1245 #, kde-format msgid "Follow directory links" msgstr "Følg mappe-link" -#: optiondialog.cpp:1201 +#: optiondialog.cpp:1249 #, kde-format msgid "" "On: Compare the directory the link points to.\n" @@ -2724,12 +2742,12 @@ "Til: Sammenlign med mappen som linket peger på.\n" "Fra: Sammenlign link." -#: optiondialog.cpp:1210 +#: optiondialog.cpp:1258 #, kde-format msgid "Case sensitive filename comparison" msgstr "Versalfølsom filnavnesammenligning" -#: optiondialog.cpp:1214 +#: optiondialog.cpp:1262 #, kde-format msgid "" "The directory comparison will compare files or directories when their names " @@ -2741,52 +2759,52 @@ "Angiv dette tilvalg hvis navnenes versaltilstand skal matche. " "(Standardværdien for Windows er fra, ellers til.)" -#: optiondialog.cpp:1218 +#: optiondialog.cpp:1266 #, fuzzy, kde-format #| msgid "Unfold All Subdirs" msgid "Unfold all subdirectories on load" msgstr "Fold alle undermapper ud" -#: optiondialog.cpp:1222 +#: optiondialog.cpp:1270 #, kde-format msgid "" "On: Unfold all subdirectories when starting a directory diff.\n" "Off: Leave subdirectories folded." msgstr "" -#: optiondialog.cpp:1226 +#: optiondialog.cpp:1274 #, kde-format msgid "Skip directory status report" msgstr "" -#: optiondialog.cpp:1230 +#: optiondialog.cpp:1278 #, kde-format msgid "" "On: Do not show the Directory Comparison Status.\n" "Off: Show the status dialog on start." msgstr "" -#: optiondialog.cpp:1234 +#: optiondialog.cpp:1282 #, kde-format msgid "File Comparison Mode" msgstr "Filsammenligningstilstand" -#: optiondialog.cpp:1239 +#: optiondialog.cpp:1287 #, kde-format msgid "Binary comparison" msgstr "Binær sammenligning" -#: optiondialog.cpp:1241 +#: optiondialog.cpp:1289 #, kde-format msgid "Binary comparison of each file. (Default)" msgstr "Binær sammenligning af hver fil. (Standard)" -#: optiondialog.cpp:1244 +#: optiondialog.cpp:1292 #, kde-format msgid "Full analysis" msgstr "Fuld analyse" -#: optiondialog.cpp:1246 +#: optiondialog.cpp:1294 #, kde-format msgid "" "Do a full analysis and show statistics information in extra columns.\n" @@ -2795,12 +2813,12 @@ "Udfør en fuld analyse og vis statistisk information i ekstra søjler.\n" "(Langsommere end en binær sammenligning, meget langsommere for binære filer.)" -#: optiondialog.cpp:1250 +#: optiondialog.cpp:1298 #, kde-format msgid "Trust the size and modification date (unsafe)" msgstr "Stol på størrelsen og ændringsdatoen (usikkert)" -#: optiondialog.cpp:1252 +#: optiondialog.cpp:1300 #, kde-format msgid "" "Assume that files are equal if the modification date and file length are " @@ -2813,7 +2831,7 @@ "Filer med ens indhold men forskellig ændringsdatoer vil se forskellige ud.\n" "Nyttigt til store mapper og langsomme netværk." -#: optiondialog.cpp:1257 +#: optiondialog.cpp:1305 #, kde-format msgid "" "Trust the size and date, but use binary comparison if date does not match " @@ -2822,7 +2840,7 @@ "Stol på størrelse og dato, men brug binær sammenligning hvis dato ikke " "matcher (usikkert)" -#: optiondialog.cpp:1259 +#: optiondialog.cpp:1307 #, kde-format msgid "" "Assume that files are equal if the modification date and file length are " @@ -2834,12 +2852,12 @@ "Hvis datoen ikke er ens men størrelsen er, bruges binær sammenligning.\n" "Nyttig til store mapper eller langsomme netværk." -#: optiondialog.cpp:1264 +#: optiondialog.cpp:1312 #, kde-format msgid "Trust the size (unsafe)" msgstr "Stol på størrelsen (usikker)" -#: optiondialog.cpp:1266 +#: optiondialog.cpp:1314 #, kde-format msgid "" "Assume that files are equal if their file lengths are equal.\n" @@ -2850,12 +2868,12 @@ "Nyttigt for store mapper eller langsomme netværk, når datoen er ændret efter " "filer er hentet." -#: optiondialog.cpp:1273 +#: optiondialog.cpp:1321 #, kde-format msgid "Synchronize directories" msgstr "Synkronisér mapper" -#: optiondialog.cpp:1277 +#: optiondialog.cpp:1325 #, kde-format msgid "" "Offers to store files in both directories so that\n" @@ -2866,12 +2884,12 @@ "begge mapper er ens bagefter.\n" "Virker kun når to mapper sammenlignes uden at angive nogen destination." -#: optiondialog.cpp:1283 +#: optiondialog.cpp:1331 #, kde-format msgid "White space differences considered equal" msgstr "Forskelle i blanktegn anses for ens" -#: optiondialog.cpp:1287 +#: optiondialog.cpp:1335 #, kde-format msgid "" "If files differ only by white space consider them equal.\n" @@ -2880,12 +2898,12 @@ "Hvis filer kun adskiller sig med blanktegn, anses dem for ens.\n" "Dette er kun aktiveret når fuldstændig analyse vælges." -#: optiondialog.cpp:1293 +#: optiondialog.cpp:1341 #, kde-format msgid "Copy newer instead of merging (unsafe)" msgstr "Kopiér nyere i stedet for at indflette (usikker)" -#: optiondialog.cpp:1297 +#: optiondialog.cpp:1345 #, fuzzy, kde-format #| msgid "" #| "Don't look inside, just take the newer file.\n" @@ -2900,12 +2918,12 @@ "(Brug kun dette hvis du ved hvad du foretager dig!)\n" "Kun effektivt når to mapper sammenlignes." -#: optiondialog.cpp:1302 +#: optiondialog.cpp:1350 #, kde-format msgid "Backup files (.orig)" msgstr "Sikkerhedskopieringsfiler (.orig)" -#: optiondialog.cpp:1306 +#: optiondialog.cpp:1354 #, kde-format msgid "" "If a file would be saved over an old file, then the old file\n" @@ -2914,17 +2932,17 @@ "Hvis en fil ville blive gemt over en gammel fil, så vil den gamle\n" "fil blive omdøbt med en '.orig'-endelse i stedet for at blive slettet." -#: optiondialog.cpp:1382 optiondialog.cpp:1383 +#: optiondialog.cpp:1430 optiondialog.cpp:1431 #, kde-format msgid "Regional Settings" msgstr "Regionsindstillinger" -#: optiondialog.cpp:1397 +#: optiondialog.cpp:1454 #, kde-format msgid "Use the same encoding for everything:" msgstr "Brug samme tegnsæt til alt:" -#: optiondialog.cpp:1401 +#: optiondialog.cpp:1458 #, kde-format msgid "" "Enable this allows to change all encodings by changing the first only.\n" @@ -2933,18 +2951,18 @@ "At aktivere dette lader dig ændre alle tegnsæt ved at kun ændre den første.\n" "Deaktivér det hvis forskellige individuelle indstillinger behøves." -#: optiondialog.cpp:1405 +#: optiondialog.cpp:1462 #, fuzzy, kde-format #| msgid "Note: Local Encoding is " msgid "Note: Local Encoding is \"%1\"" msgstr "Bemærk: Lokalt tegnsæt er " -#: optiondialog.cpp:1409 +#: optiondialog.cpp:1466 #, kde-format msgid "File Encoding for A:" msgstr "Filtegnsæt for A:" -#: optiondialog.cpp:1416 +#: optiondialog.cpp:1473 #, kde-format msgid "" "If enabled then Unicode (UTF-16 or UTF-8) encoding will be detected.\n" @@ -2956,32 +2974,32 @@ "Hvis filen ikke er Unicode, bruges det valgte tegnsæt som reserve.\n" "(Detektering af Unicode afhænger af de første bytes i en fil.)" -#: optiondialog.cpp:1419 optiondialog.cpp:1430 optiondialog.cpp:1441 +#: optiondialog.cpp:1476 optiondialog.cpp:1487 optiondialog.cpp:1498 #, kde-format msgid "Auto Detect Unicode" msgstr "Detektér Unicode automatisk" -#: optiondialog.cpp:1425 +#: optiondialog.cpp:1482 #, kde-format msgid "File Encoding for B:" msgstr "Filtegnsæt for B:" -#: optiondialog.cpp:1436 +#: optiondialog.cpp:1493 #, kde-format msgid "File Encoding for C:" msgstr "Filtegnsæt for C:" -#: optiondialog.cpp:1447 +#: optiondialog.cpp:1504 #, kde-format msgid "File Encoding for Merge Output and Saving:" msgstr "Filtegnsæt for sammenflettede uddata og når der gemmes:" -#: optiondialog.cpp:1452 +#: optiondialog.cpp:1509 #, kde-format msgid "Auto Select" msgstr "Automatisk markering" -#: optiondialog.cpp:1456 +#: optiondialog.cpp:1513 #, kde-format msgid "" "If enabled then the encoding from the input files is used.\n" @@ -2992,17 +3010,17 @@ "I tvetydige tilfælde bedes brugeren om at vælge kodning at gemme med via en " "dialog." -#: optiondialog.cpp:1459 +#: optiondialog.cpp:1516 #, kde-format msgid "File Encoding for Preprocessor Files:" msgstr "Filtegnsæt for forbehandlingsfiler:" -#: optiondialog.cpp:1471 +#: optiondialog.cpp:1528 #, kde-format msgid "Right To Left Language" msgstr "Sprog som læses fra højre til venstre" -#: optiondialog.cpp:1475 +#: optiondialog.cpp:1532 #, kde-format msgid "" "Some languages are read from right to left.\n" @@ -3011,22 +3029,22 @@ "Nogle sprog læses fra højre til venstre.\n" "Indstillingen ændrer visningen og editoren på tilsvarende måde." -#: optiondialog.cpp:1485 +#: optiondialog.cpp:1542 #, kde-format msgid "Integration" msgstr "Integrering" -#: optiondialog.cpp:1486 +#: optiondialog.cpp:1543 #, kde-format msgid "Integration Settings" msgstr "Integreringsindstillinger" -#: optiondialog.cpp:1499 +#: optiondialog.cpp:1564 #, kde-format msgid "Command line options to ignore:" msgstr "Kommandolinjeflag at ignorere:" -#: optiondialog.cpp:1505 +#: optiondialog.cpp:1570 #, kde-format msgid "" "List of command line options that should be ignored when KDiff3 is used by " @@ -3039,12 +3057,12 @@ "Flere værdier kan angives hvis de adskilles af ';'\n" "Dette undertrykker fejlmeddelelsen \"Ukendt flag\"." -#: optiondialog.cpp:1510 +#: optiondialog.cpp:1575 #, kde-format msgid "Quit also via Escape key" msgstr "Afslut også med Escape-tasten" -#: optiondialog.cpp:1514 +#: optiondialog.cpp:1579 #, kde-format msgid "" "Fast method to exit.\n" @@ -3053,7 +3071,7 @@ "Hurtig metode til afslutning.\n" "For dem der er vant til at bruge Escape-tasten." -#: optiondialog.cpp:1598 +#: optiondialog.cpp:1653 #, kde-format msgid "This resets all options. Not only those of the current topic." msgstr "Dette nulstiller alle tilvalg. Ikke kun dem der angår dette emne." @@ -3109,79 +3127,70 @@ msgid "Disable Unsafe Options" msgstr "Deaktivér usikre tilvalg" -#: pdiff.cpp:158 +#: pdiff.cpp:160 #, kde-format msgid "Loading A" msgstr "Indlæser A" -#: pdiff.cpp:167 -#, kde-format -msgid "Errors occurred during pre-processing of file A." -msgstr "" +#: pdiff.cpp:162 +#, fuzzy, kde-format +#| msgid "Loading A" +msgid "Loading A: %1" +msgstr "Indlæser A" -#: pdiff.cpp:172 +#: pdiff.cpp:170 #, kde-format msgid "Loading B" msgstr "Indlæser B" -#: pdiff.cpp:179 -#, kde-format -msgid "Errors occurred during pre-processing of file B." -msgstr "" - -#: pdiff.cpp:202 pdiff.cpp:241 +#: pdiff.cpp:201 pdiff.cpp:237 #, kde-format msgid "Diff: A <-> B" msgstr "Diff: A <-> B" -#: pdiff.cpp:208 pdiff.cpp:279 pdiff.cpp:293 +#: pdiff.cpp:207 pdiff.cpp:275 pdiff.cpp:289 #, kde-format msgid "Linediff: A <-> B" msgstr "Linjeforskel: A <-> B" -#: pdiff.cpp:225 +#: pdiff.cpp:224 #, kde-format msgid "Loading C" msgstr "Indlæser C" -#: pdiff.cpp:232 -#, kde-format -msgid "Errors occurred during pre-processing of file C." -msgstr "" - -#: pdiff.cpp:250 +#: pdiff.cpp:246 #, kde-format msgid "Diff: A <-> C" msgstr "Diff: A <-> C" -#: pdiff.cpp:261 +#: pdiff.cpp:257 #, kde-format msgid "Diff: B <-> C" msgstr "Diff: B <-> C" -#: pdiff.cpp:283 pdiff.cpp:297 +#: pdiff.cpp:279 pdiff.cpp:293 #, kde-format msgid "Linediff: B <-> C" msgstr "Linjeforskel: B <-> C" -#: pdiff.cpp:287 pdiff.cpp:301 +#: pdiff.cpp:283 pdiff.cpp:297 #, kde-format msgid "Linediff: A <-> C" msgstr "Linjeforskel: A <-> C" -#: pdiff.cpp:829 +#: pdiff.cpp:819 #, kde-format 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:835 pdiff.cpp:839 pdiff.cpp:843 +#: pdiff.cpp:825 pdiff.cpp:829 pdiff.cpp:833 #, 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:853 +#: pdiff.cpp:843 #, fuzzy, kde-format #| msgid "" #| "Some inputfiles don't seem to be pure textfiles.\n" @@ -3196,17 +3205,17 @@ "Bemærk at KDiff3-indfletningen ikke er beregnet til binære data.\n" "Fortsæt på eget ansvar." -#: pdiff.cpp:863 +#: pdiff.cpp:853 #, kde-format msgid ", B" msgstr "" -#: pdiff.cpp:865 +#: pdiff.cpp:855 #, kde-format msgid ", C" msgstr "" -#: pdiff.cpp:867 +#: pdiff.cpp:857 #, fuzzy, kde-format #| msgid "" #| "Some input characters could not be converted to valid unicode.\n" @@ -3225,77 +3234,72 @@ "Hvis du er i tvivl så gem ikke resultatet. Fortsæt på eget ansvar.\n" "De omfattede input-filer er i %1." -#: pdiff.cpp:1034 +#: pdiff.cpp:1032 #, kde-format msgid "Abort" msgstr "Afbryd" -#: pdiff.cpp:1040 pdiff.cpp:1130 +#: pdiff.cpp:1038 pdiff.cpp:1129 #, kde-format msgid "Opening files..." msgstr "Åbner filer..." -#: pdiff.cpp:1107 -#, kde-format -msgid "File open error" -msgstr "Fejl ved åbning af fil" - -#: pdiff.cpp:1202 +#: pdiff.cpp:1212 #, kde-format msgid "Cutting selection..." msgstr "Klipper valgene ud..." -#: pdiff.cpp:1223 +#: pdiff.cpp:1233 #, kde-format msgid "Copying selection to clipboard..." msgstr "Kopierer markering til udklipsholderen..." -#: pdiff.cpp:1239 +#: pdiff.cpp:1249 #, kde-format msgid "Inserting clipboard contents..." msgstr "Indsætter udklipsholderens indhold..." -#: pdiff.cpp:1695 +#: pdiff.cpp:1705 #, kde-format msgid "Word wrap (Cancel disables word wrap)" msgstr "" -#: pdiff.cpp:1696 +#: pdiff.cpp:1706 #, kde-format msgid "Calculating max width for horizontal scrollbar" msgstr "" -#: pdiff.cpp:1911 +#: pdiff.cpp:1921 #, kde-format msgid "Save && Continue" msgstr "Gem && Fortsæt" -#: pdiff.cpp:1912 +#: pdiff.cpp:1922 #, kde-format msgid "Continue Without Saving" msgstr "Fortsæt uden at gemme" -#: pdiff.cpp:2124 +#: pdiff.cpp:2134 #, kde-format msgid "Search complete." msgstr "Søgning færdig." -#: pdiff.cpp:2124 +#: pdiff.cpp:2134 #, kde-format msgid "Search Complete" msgstr "Søgning færdig" -#: pdiff.cpp:2375 +#: pdiff.cpp:2385 #, kde-format msgid "Nothing is selected in either diff input window." msgstr "Ingenting er markeret i inddatavindue med sammenligning." -#: pdiff.cpp:2375 +#: pdiff.cpp:2385 #, kde-format msgid "Error while adding manual diff range" msgstr "Fejl ved tilføjelse manuelt sammenligningsområde" -#: progress.cpp:59 progress.cpp:71 +#: progress.cpp:61 progress.cpp:73 #, kde-format msgid "&Cancel" msgstr "&Annullér" @@ -3305,128 +3309,128 @@ msgid "A (Base):" msgstr "A (Basis):" -#: smalldialogs.cpp:68 smalldialogs.cpp:85 smalldialogs.cpp:102 -#: smalldialogs.cpp:144 +#: smalldialogs.cpp:71 smalldialogs.cpp:90 smalldialogs.cpp:109 +#: smalldialogs.cpp:154 #, kde-format msgid "File..." msgstr "Fil..." -#: smalldialogs.cpp:70 smalldialogs.cpp:87 smalldialogs.cpp:104 -#: smalldialogs.cpp:146 +#: smalldialogs.cpp:73 smalldialogs.cpp:92 smalldialogs.cpp:111 +#: smalldialogs.cpp:156 #, kde-format msgid "Dir..." msgstr "Mappe..." -#: smalldialogs.cpp:96 +#: smalldialogs.cpp:103 #, kde-format msgid "C (Optional):" msgstr "C (Frivillig):" -#: smalldialogs.cpp:119 +#: smalldialogs.cpp:126 #, fuzzy, kde-format #| msgid "Swap/Copy Names ..." msgid "Swap/Copy Names..." msgstr "Skift eller kopiér navne..." -#: smalldialogs.cpp:124 smalldialogs.cpp:125 smalldialogs.cpp:126 +#: smalldialogs.cpp:131 smalldialogs.cpp:132 smalldialogs.cpp:133 #, kde-format msgid "Swap %1<->%2" msgstr "Skift %1 ud mod %2" -#: smalldialogs.cpp:127 smalldialogs.cpp:128 smalldialogs.cpp:129 +#: smalldialogs.cpp:134 smalldialogs.cpp:135 smalldialogs.cpp:136 #, kde-format msgid "Copy %1->Output" msgstr "Kopiér %1 til uddata" -#: smalldialogs.cpp:130 smalldialogs.cpp:131 smalldialogs.cpp:132 +#: smalldialogs.cpp:137 smalldialogs.cpp:138 smalldialogs.cpp:139 #, kde-format msgid "Swap %1<->Output" msgstr "Skift %1 ud mod uddata" -#: smalldialogs.cpp:138 +#: smalldialogs.cpp:148 #, kde-format msgid "Output (optional):" msgstr "Uddata (frivillig):" -#: smalldialogs.cpp:168 +#: smalldialogs.cpp:178 #, kde-format msgid "Configure..." msgstr "Indstil..." -#: smalldialogs.cpp:233 +#: smalldialogs.cpp:243 #, fuzzy, kde-format #| msgid "Directory" msgid "Open Directory" msgstr "Mappe" -#: smalldialogs.cpp:234 +#: smalldialogs.cpp:244 #, kde-format msgid "Select Output File" msgstr "" -#: smalldialogs.cpp:393 +#: smalldialogs.cpp:403 #, kde-format msgid "Search text:" msgstr "Søgetekst:" -#: smalldialogs.cpp:400 +#: smalldialogs.cpp:410 #, kde-format msgid "Case sensitive" msgstr "Versalfølsom" -#: smalldialogs.cpp:403 +#: smalldialogs.cpp:413 #, kde-format msgid "Search A" msgstr "Gennemsøg A" -#: smalldialogs.cpp:408 +#: smalldialogs.cpp:418 #, kde-format msgid "Search B" msgstr "Gennemsøg B" -#: smalldialogs.cpp:413 +#: smalldialogs.cpp:423 #, kde-format msgid "Search C" msgstr "Gennemsøg C" -#: smalldialogs.cpp:418 +#: smalldialogs.cpp:428 #, kde-format msgid "Search output" msgstr "Søgeuddata" -#: smalldialogs.cpp:425 +#: smalldialogs.cpp:435 #, kde-format msgid "&Search" msgstr "&Søg" -#: smalldialogs.cpp:444 +#: smalldialogs.cpp:454 #, kde-format msgid "Regular Expression Tester" msgstr "Test af regulære udtryk" -#: smalldialogs.cpp:457 +#: smalldialogs.cpp:467 #, kde-format msgid "Example auto merge line:" msgstr "Eksempel på linje for automatisk sammenfletning:" -#: smalldialogs.cpp:459 +#: smalldialogs.cpp:469 #, kde-format msgid "To test auto merge, copy a line as used in your files." msgstr "" "For at teste automatisk sammenfletning, kopieres en linje som bruges i dine " "filer." -#: smalldialogs.cpp:465 smalldialogs.cpp:493 smalldialogs.cpp:529 +#: smalldialogs.cpp:475 smalldialogs.cpp:503 smalldialogs.cpp:539 #, kde-format msgid "Match result:" msgstr "Matchningsresultat:" -#: smalldialogs.cpp:484 +#: smalldialogs.cpp:494 #, kde-format msgid "Example history start line (with leading comment):" msgstr "Eksempel på startlinje for historik (med indledende kommentar):" -#: smalldialogs.cpp:486 +#: smalldialogs.cpp:496 #, kde-format msgid "" "Copy a history start line as used in your files,\n" @@ -3435,18 +3439,18 @@ "Kopiér en startlinje for historik som bruges i dine filer,\n" "inkluderende den indledende kommentar." -#: smalldialogs.cpp:512 +#: smalldialogs.cpp:522 #, kde-format msgid "History sort key order:" msgstr "Sorteringsnøglerækkefølge for historik:" -#: smalldialogs.cpp:520 +#: smalldialogs.cpp:530 #, kde-format msgid "Example history entry start line (without leading comment):" msgstr "" "Eksempel på startlinje for en historikindgang (uden indledende kommentar):" -#: smalldialogs.cpp:522 +#: smalldialogs.cpp:532 #, kde-format msgid "" "Copy a history entry start line as used in your files,\n" @@ -3455,48 +3459,48 @@ "Kopiér en startlinje for en historikindgang som bruges i dine filer,\n" "men udelad den indledende kommentar." -#: smalldialogs.cpp:536 +#: smalldialogs.cpp:546 #, kde-format msgid "Sort key result:" msgstr "Sorteringsnøgleresultat:" -#: smalldialogs.cpp:584 smalldialogs.cpp:594 smalldialogs.cpp:614 +#: smalldialogs.cpp:594 smalldialogs.cpp:604 smalldialogs.cpp:624 #, kde-format msgid "Match success." msgstr "Matchning lykkedes." -#: smalldialogs.cpp:588 smalldialogs.cpp:598 smalldialogs.cpp:620 +#: smalldialogs.cpp:598 smalldialogs.cpp:608 smalldialogs.cpp:630 #, kde-format msgid "Match failed." msgstr "Matchning mislykkedes." -#: smalldialogs.cpp:605 +#: smalldialogs.cpp:615 #, kde-format msgid "Opening and closing parentheses do not match in regular expression." msgstr "Start- og slutparentes matcher ikke i regulært udtryk." -#: SourceData.cpp:150 +#: SourceData.cpp:153 #, kde-format msgid "Writing clipboard data to temp file failed." msgstr "Skrivning af udklipsholderdata til midlertidig fil mislykkedes." -#: SourceData.cpp:154 +#: SourceData.cpp:157 #, kde-format msgid "From Clipboard" msgstr "Fra udklipsholderen" -#: SourceData.cpp:335 +#: SourceData.cpp:348 #, fuzzy, kde-format #| msgid "Mix of links and normal files." msgid "%1 is not a normal file." msgstr "Blanding af link og normale filer." -#: SourceData.cpp:427 +#: SourceData.cpp:440 #, kde-format msgid " Temp file is: %1" msgstr "" -#: SourceData.cpp:432 +#: SourceData.cpp:445 #, kde-format msgid "" "Preprocessing possibly failed. Check this command:\n" @@ -3511,12 +3515,12 @@ "\n" "Forbehandlingskommandoen vil blive deaktiveret nu." -#: SourceData.cpp:443 SourceData.cpp:512 +#: SourceData.cpp:456 SourceData.cpp:525 #, kde-format msgid "File %1 too large to process. Skipping." msgstr "" -#: SourceData.cpp:487 +#: SourceData.cpp:500 #, kde-format msgid "" "The line-matching-preprocessing possibly failed. Check this command:\n" diff -Nru kdiff3-1.8.01/po/de/diff_ext.po kdiff3-1.8.3/po/de/diff_ext.po --- kdiff3-1.8.01/po/de/diff_ext.po 2019-05-18 01:01:54.000000000 +0000 +++ kdiff3-1.8.3/po/de/diff_ext.po 2020-06-25 00:18:11.000000000 +0000 @@ -5,8 +5,8 @@ msgid "" msgstr "" "Project-Id-Version: kdiff3\n" -"Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2019-03-22 03:09+0100\n" +"Report-Msgid-Bugs-To: https://bugs.kde.org\n" +"POT-Creation-Date: 2019-11-04 07:54+0100\n" "PO-Revision-Date: 2018-11-22 13:04+0100\n" "Last-Translator: Burkhard Lück \n" "Language-Team: German \n" @@ -17,119 +17,114 @@ "Plural-Forms: nplurals=2; plural=n != 1;\n" "X-Generator: Lokalize 2.0\n" -#: diff_ext.cpp:391 +#: diff_ext.cpp:223 #, kde-format msgid "Compare with %1" msgstr "Mit %1 vergleichen" -#: diff_ext.cpp:392 +#: diff_ext.cpp:224 #, kde-format msgid "Merge with %1" msgstr "Mit %1 zusammenführen" -#: diff_ext.cpp:408 +#: diff_ext.cpp:234 #, kde-format msgid "3-way merge with base" msgstr "3-Wege-Zusammenführung mit Basis" -#: diff_ext.cpp:411 +#: diff_ext.cpp:237 #, kde-format msgid "Save '%1' for later" msgstr "„%1“ für später speichern" -#: diff_ext.cpp:426 +#: diff_ext.cpp:251 #, kde-format msgid "Compare with ..." msgstr "Vergleichen mit ..." -#: diff_ext.cpp:429 +#: diff_ext.cpp:254 #, kde-format msgid "Clear list" msgstr "Liste leeren" -#: diff_ext.cpp:434 +#: diff_ext.cpp:259 #, kde-format msgid "Compare" msgstr "Vergleichen" -#: diff_ext.cpp:438 +#: diff_ext.cpp:263 #, kde-format msgid "3 way comparison" msgstr "3-Wege-Vergleich" -#: diff_ext.cpp:444 +#: diff_ext.cpp:269 #, kde-format msgid "About Diff-Ext ..." msgstr "Über Diff-Ext ..." -#: diff_ext.cpp:515 +#: diff_ext.cpp:340 #, kde-format msgid "(32 Bit)" msgstr "(32 Bit)" -#: diff_ext.cpp:517 -#, kde-format -msgid "(64 Bit)" -msgstr "(64 Bit)" - -#: diff_ext.cpp:518 +#: diff_ext.cpp:342 #, kde-format msgid "Diff-Ext Copyright (c) 2003-2006, Sergey Zorin. All rights reserved.\n" msgstr "" "Diff-Ext Copyright (c) 2003-2006, Sergey Zorin. Alle Rechte vorbehalten.\n" -#: diff_ext.cpp:519 +#: diff_ext.cpp:343 #, kde-format msgid "This software is distributable under the BSD-2-Clause license.\n" msgstr "Diese Software wird unter der Lizenz BSD-2-Clause verteilt.\n" -#: diff_ext.cpp:520 +#: diff_ext.cpp:344 #, kde-format msgid "Some extensions for KDiff3 (c) 2006-2013 by Joachim Eibl.\n" msgstr "Einige Erweiterungen f+r KDiff3 (c) 2006-2013 von Joachim Eibl.\n" -#: diff_ext.cpp:521 +#: diff_ext.cpp:345 #, kde-format msgid "Homepage for Diff-Ext: http://diff-ext.sourceforge.net\n" msgstr "Webseite von Diff-Ext: http://diff-ext.sourceforge.net\n" -#: diff_ext.cpp:522 +#: diff_ext.cpp:346 #, kde-format msgid "About Diff-Ext for KDiff3 " msgstr "Über Diff-Ext für KDiff3 " -#: diff_ext.cpp:551 +#: diff_ext.cpp:375 #, kde-format msgid "Compare selected files" msgstr "Ausgewählte Dateien vergleichen" -#: diff_ext.cpp:557 diff_ext.cpp:577 +#: diff_ext.cpp:381 diff_ext.cpp:399 #, kde-format msgid "Compare '%1' with '%2'" msgstr "„%1“ mit „%2“ vergleichen" -#: diff_ext.cpp:563 +#: diff_ext.cpp:386 #, kde-format msgid "Save '%1' for later operation" msgstr "„%1“ für spätere Operation speichern" -#: diff_ext.cpp:619 +#: diff_ext.cpp:440 #, kde-format msgid "Could not start KDiff3. Please rerun KDiff3 installation." msgstr "" "KDiff3 kann nicht gestartet werden. Bitte installieren Sie KDiff3 erneut." -#: diff_ext.cpp:620 +#: diff_ext.cpp:441 #, kde-format msgid "Command" msgstr "Befehl" -#: diff_ext.cpp:621 +#: diff_ext.cpp:442 #, kde-format msgid "CommandLine" msgstr "Befehlszeile" -#: diff_ext.cpp:622 +#: diff_ext.cpp:443 #, kde-format msgid "Diff-Ext For KDiff3" msgstr "Diff-Ext für KDiff3" \ No newline at end of file diff -Nru kdiff3-1.8.01/po/de/docs/kdiff3/index.docbook kdiff3-1.8.3/po/de/docs/kdiff3/index.docbook --- kdiff3-1.8.01/po/de/docs/kdiff3/index.docbook 1970-01-01 00:00:00.000000000 +0000 +++ kdiff3-1.8.3/po/de/docs/kdiff3/index.docbook 2020-06-25 00:19:13.000000000 +0000 @@ -0,0 +1,3375 @@ + +KDiff3"> + + +]> + + + + + + +Das Handbuch zu &kdiff3; + + +Michael Reeves
reeves.87@gmail.com
Joachim Eibl
joachim.eibl at gmx.de +
 + +ThomasReitelbach
tr@erdfunkstelle.de
Deutsche Übersetzung + + + +2002-2007 +Joachim Eibl + + +2017-2019 +Michael Reeves + + + +&FDLNotice; + + + +2019-02-22 +1.08.02 + + + +&kdiff3; ist ein Programm zum Anzeigen von Unterschieden und zum Zusammenführen von Dateien und Ordnern. +vergleicht zwei oder drei Textdateien bzw. Ordner und führt sie zusammen, +kann Unterschiede zeilenweise und sogar Zeichen für Zeichen anzeigen, +hat eine Funktion zum automatischen Zusammenführen, +enthält einen speziellen komfortablen Editor zum Auflösen von Konflikten beim Zusammenführen, +ist mit Hilfe von KIO Netzwerktransparent, +kann Unterschiede in Leerräumen oder Kommentaren besonders hervorheben oder ausblenden. +unterstützt Unicode, UTF-8 und weitere Dateikodierungen. +druckt Abweichungen, +unterstützt Schlüsselwörter für Versionsverwaltung und Verlauf-Zusammenführung. + +Dieses Dokument beschreibt &kdiff3; in der Version 1.8. + + + + + +KDE +kdiff3 +vergleichen +zusammenführen +CVS +dreifach-vergleichen +vergleichen +Dateien +Ordner +Versionskontrolle +Drei-Wege-Zusammenführen +Unterschiede innerhalb einer Zeile +synchronisieren +kpart +kio +netzwerktransparent +Editor +Leerraum +Kommentare + + + + +Einführung +Noch eine Oberfläche zu Diff? +Es gibt viele grafische Werkzeuge zum Vergleichen. Warum also &kdiff3;? Lassen Sie mich kurz erklären, warum ich das Programm geschrieben habe. &kdiff3; wurde programmiert, weil ich eine sehr komplizierte Zusammenführung durchzuführen hatte. Zusammenführen wird dann nötig, wenn mehrere Personen an der gleichen Datei in einem Projekt arbeiten. Wenn das verwendete Werkzeug zum Zusammenführen nicht nur die geänderten Dateien (Branch genannt), sondern auch die Originale (Basis) zur Verfügung hat, kann das Zusammenführen gewissermaßen automatisiert werden. Das Programm wird dann automatisch die in der Branch gemachten Änderungen auswählen. Doch wenn mehrere Beitragende die gleichen Zeilen ändern, wird ein Konflikt erkannt. Solch ein Konflikt muss dann von Hand aufgelöst werden. Die Zusammenführung war sehr kompliziert, weil einer der Beitragenden viele Änderungen vorgenommen und gleichzeitig an vielen Stellen die Einrückung korrigiert hatte. Ein weiterer Programmierer hatte in der gleichen Datei viel Text verändert. Das Ergebnis waren zahlreiche Konflikte beim Zusammenführen. Das von mir benutzte Programm zeigte mir nur die geänderten Zeilen an, ich konnte aber nicht sehen, was genau sich innerhalb dieser Zeilen geändert hatte. Und es gab keinerlei Hinweise auf die Stellen, wo sich vielleicht nur die Einrückung geändert hatte. Das Zusammenführen dieser Änderungen war ein kleiner Albtraum. Das war also der Beginn. Die erste Version von &kdiff3; konnte Unterschiede innerhalb einer Zeile und Änderungen an Leerräumen darstellen. Später wurden noch jede Menge weiterer nützlicher Funktionen hinzugefügt. Wenn Sie zum Beispiel schnell Text vergleichen möchten, kopieren Sie ihn einfach in die Zwischenablage und fügen ihn in eines der Vergleichsfenster ein. Eine Funktion die viel Arbeit machte, war das Vergleichen und Zusammenführen von Ordnern. Diese Funktion verwandelte &kdiff3; beinahe in einen vollwertigen Datei-Browser. Ich hoffe, dass Sie viel Nutzen an &kdiff3; haben und wünsche Ihnen viel Freude! Joachim Eibl (2003) + + +Bildschirmfotos und Funktionen +Dieses Bildschirmfoto zeigt die Unterschiede zwischen zwei Textdateien +(Unter Verwendung einer frühen Version von &kdiff3;): + + + + +Auch 3-Wege-Zusammenführen wird vollständig unterstützt. Dies ist nützlich, wenn zwei Personen unabhängig voneinander an einem Quelltext arbeiten und Änderungen vornehmen. Die Originaldatei (die Basis) hilft &kdiff3; beim automatischen Auswählen der jeweils korrekten Änderungen. Der Zusammenführungs-Editor unter den Diff-Fenstern ermöglicht das Auflösen von Konflikten und zeigt gleichzeitig das zu erwartende Ergebnis an. In diesem Editor können Sie das Ergebnis sogar direkt bearbeiten. Das Bildschirmfoto zeigt drei Quell-Dateien beim Zusammenführen: + + + + + +&kdiff3; hilft Ihnen auch beim Vergleichen und Zusammenführen kompletter Ordner. Dieses Bildschirmfoto zeigt &kdiff3; beim Ordnerzusammenführen: + + + + + + +Weitere Funktionen +Zeilen- und sogar zeichenweises Darstellen von Unterschieden +&kdiff3; zeigt die exakten Unterschiede an und bedient sich dazu der Möglichkeiten heutiger Farbmonitore. Wenn Sie häufig Quelltexte überprüfen müssen, werden Sie diese Funktion mögen. + + + + + +Erkennen von Unterschieden in Leerräumen auf einen Blick +Unterschiede in Leerräumen und Tabulatoren werden sichtbar dargestellt. Wenn sich Zeilen nur in einer gewissen Anzahl an Leerräumen unterscheiden, kann man das auf einen Blick an der Zusammenfassung in der Spalte an der linken Seite sehen. (Kein Ärger mehr, wenn Jemand die Einrückung ändert.) + + + + + +3-Wege-Vergleichen +Man kann drei Dateien analysieren und sehen, wo sie sich unterscheiden. Das linke/mittlere/rechte Fenster hat den Namen A/B/C und ist entsprechend blau/grün/magenta eingefärbt. Wenn eine Datei gleich ist, und die andere sich in einer Zeile unterscheidet, dann zeigt die Farbe an, welche Datei unterschiedlich ist. Rote Farbe bedeutet, dass beide sich Dateien unterscheiden. + + + + + +Komfortables zusammenführen von zwei oder drei Dateien +Mit &kdiff3; kann man zwei oder drei Dateien zusammenführen. Dabei führt &kdiff3; so viel wie möglich automatisch zusammen. Das Ergebnis wird in einem editierbaren Fenster angezeigt, dort können die meisten Konflikte schon mit einem einfachen Mausklick gelöst werden: Wählen Sie zwischen den Knöpfen A/B/C, um die zu benutzende Quelle auszuwählen. Sie können auch mehr als eine Quelle wählen. Weil das Fenster im Grunde ein Editor ist, können hier selbst Konflikte, die eine weitere Bearbeitung erfordern, einfach aufgelöst werden. Sie benötigen dazu keine weiteren Hilfsmittel. + + +Und ... + + Schnelle Navigation über Knöpfe. + Ein Mausklick in die Zusammenfassungs-Spalte gleicht alle Fenster ab, sodass alle die gleiche Stelle anzeigen. + Kopieren Sie eine Auswahl aus irgendeinem Fenster einfach in das Ergebnisfenster. + Die Übersichtsspalte zeigt an, wo sich Änderungen und Konflikte befinden. + Die Farben sind an Ihre Bedürfnisse anpassbar. + Die Größe von Unterfenstern ist veränderbar. + Es gibt die Option, anstelle von Tabulatoren Leerzeichen einzufügen. + Bequemes Öffnen von Dateien über einen Dialog oder über die Befehlszeile. + Suchen (Strg-F) und Weitersuchen (F3) nach bestimmten Zeichenketten in allen Textfenstern. + Anzeigen der Zeilennummer zu jeder Zeile. + Einfügen aus der Zwischenablage oder das Ziehen von Text in ein Vergleichsfenster. + Netzwerktransparenz durch KIO. + &kdiff3; kann als Anzeigemodul in KDevelop 3 genutzt werden, um Unterschiede anzuzeigen. + Zeilenumbruch für lange Zeilen + Unterstützung für Unicode, UTF-8 und weitere Kodierungen. + Unterstützung für Sprachen, die von rechts nach links geschrieben werden. + ... + + + + + +Dateivergleichsmethode: + +Befehlszeilen-Optionen + +Vergleichen von zwei Dateien: +kdiff3 datei1 datei2 + + + +Zusammenführen von zwei Dateien: +kdiff3 datei1 datei2 -m + kdiff3 datei1 datei2 -o ausgabedatei + + + +Vergleichen von drei Dateien: +kdiff3 datei1 datei2 datei3 + + + +Zusammenführen von drei Dateien: +kdiff3 datei1 datei2 datei3 -m + kdiff3 datei1 datei2 datei3 -o ausgabedatei + +Beachten Sie, dass datei1 als Basis für datei2 und datei3 verwendet wird. + + +Spezialfall: Dateien mit gleichem Namen +Wenn alle Dateien den gleichen Namen haben, aber in verschiedenen Ordnern liegen, dann können Sie sich die Tipparbeit erleichtern, indem Sie nur den Dateinamen der ersten Datei vollständig ausschreiben. Beispiel: +kdiff3 Ordner1/Dateiname Ordner2 Ordner3 + + + +Befehlszeile zum Vergleichen bzw. Zusammenführen von Ordnern: +Das Vorgehen ist hier sehr ähnlich, doch nun geht es um Ordner. +kdiff3 Ordner1 Ordner2 + kdiff3 Ordner1 Ordner2 -o Zielordner + kdiff3 Ordner1 Ordner2 Ordner3 + kdiff3 Ordner1 Ordner2 Ordner3 -o Zielordner + +Zum Vergleichen bzw. Zusammenführen von Ordnern lesen Sie bitte hier weiter. + + +Andere Befehlszeilen-Optionen +Mehr Informationen zu den Befehlszeilen-Optionen erhalten Sie mit diesem Befehl: +kdiff3 --help + +Beispielausgabe: +kdiff3 --help +Options: + -m, --merge Quellen zusammenführen. + -b, --base file Explizite Basisdatei. Für Kompatibilität mit anderen Programmen. + -o, --output datei Ausgabe-Datei. Impliziert -m. Z. B.: -o neueDatei.txt + --out file Ausgabe-Datei. (Für Kompatibilität mit anderen Programmen.) + --auto Keine grafische Oberfläche, wenn alle Konflikte automatisch aufgelöst werden können. (Benötigt -o datei) + --qall Konflikte nicht automatisch auflösen. (Aus Kompatibilitätsgründen.) + --L1 alias1 Sichtbarer Namensersatz für Quelldatei 1 (Basis). + --L2 alias2 Sichtbarer Namensersatz für Quelldatei 2. + --L3 alias3 Sichtbarer Namensersatz für Quelldatei 3. + -L, --fname alias Alternativer sichtbarer Namensersatz. Für jede Quelldatei einmal angeben. + --cs string Eine Einstellung ändern. Je Einstellung verwendbar. z. B.: --cs „AutoAdvance=1“ + --confighelp Liste aller Einstellungen und aktueller Werte anzeigen. + --config file Eine andere Einstellungsdatei verwenden. + +Die Option ermöglicht die Anpassung eines Konfigurationswertes, der ansonsten nur in einem Einrichtungsdialog geändert werden kann. Beachten Sie, das bei der Beendigung von &kdiff3; dieser geänderte Wert zusammen mit anderen Einstellungen gespeichert wird. Mit der Option werden alle verfügbaren Einträge und deren aktuelle Werte angezeigt. +Mit können Sie eine andere Einrichtungsdatei vorgeben. Benutzen Sie &kdiff3; häufig mit verschiedenen unterschiedlichen Einstellungen, können Sie mit dieser Option leicht zwischen ihnen wechseln. + +Ignorierbare Befehlszeilen-Optionen +&kdiff3; soll häufig mit einigen Versionsverwaltungssystemen verwendet werden. Wenn jedoch ein Versionsverwaltungssystem &kdiff3; mit Befehlszeilenparametern aufruft, die &kdiff3; nicht kennt und daher nicht verarbeiten kann, wird das Programm mit einem Fehler beendet. Diese Einstellung ermöglicht es, Befehlszeilenparameter anzugeben, die von &kdiff3; ignoriert werden sollen. Dies wird in der Hilfe wie folgt angezeigt: +--foo Ignoriert. (Benutzerdefiniert.) + + + Ignorierbare Befehlszeilenoptionen:Eine Liste von Optionen, durch Semikolon ";" getrennt. Wird eine dieser Optionen auf der Befehlszeile benutzt, ignoriert &kdiff3; sie und startet ohne Fehlermeldung. Die Voreinstellung ist „u;query;html;abort“. + +Wenn das nicht ausreicht, dann wird empfohlen, ein Shell-Skript zu schreiben, das die Optionen übersetzt. + + + + +Dateiauswahl-Dialog +Weil mehrere Dateien auszuwählen sind, hat &kdiff3; einen besonderen Dialog zum Öffnen von Dateien: + + + +Der Dateidialog ermöglicht die manuelle Eingabe von Dateinamen, die Auswahl über den Datei-Browser (Datei...) oder das Auswählen einer zuletzt geöffneten Datei aus dem Auswahlfeld. Der Dateidialog merkt sich Ihre Auswahl und zeigt sie beim nächsten Mal wieder an. Sie müssen keine dritte Datei angeben, wenn Sie den Eintrag für C leer lassen, wird die Analyse der Unterschiede mit zwei Dateien durchgeführt. Über den Knopf Ordner... können Sie auch einen Ordner auswählen. Wenn Sie einen Ordner wählen, wird das Vergleichen bzw. Zusammenführen von Ordnern eingeleitet. Wenn für A eine Datei ausgewählt wird, für B und C jedoch ein Ordner, dann benutzt &kdiff3; den Dateinamen aus A in den beiden anderen Ordnern. Wenn Zusammenführen angekreuzt ist, wird das Eingabefeld für Ziel aktiv und lässt sich bearbeiten. Es ist allerdings nicht unbedingt erforderlich, sofort eine Ausgabedatei festzulegen. Sie können diesen Schritt auch später beim Speichern erledigen. Der Knopf Einrichten öffnet einen Dialog mit Einstellungen. Hier können Sie Optionen festlegen bevor Sie mit dem Vergleichen/Zusammenführen beginnen. + + +Einfügen und Ablegen von Text +Manchmal möchte man nicht eine ganze Datei, sondern nur Teile eines Textes vergleichen. &kdiff3; ermöglicht Ihnen, Textteile aus der Zwischenablage in das aktive Vergleichsfenster einzufügen. Der Vergleich beginnt dann sofort. Im Dateidialog müssen Sie keine Dateien auswählen, Sie können den Dialog einfach mit dem Knopf Abbrechen schließen. Sie können auch Ziehen und Ablegen benutzen: Ziehen Sie einfach eine Datei aus einem Dateiverwaltungsprogramm oder ausgewählten Text aus einem Editor und lassen Sie ihn über einem Vergleichsfenster fallen. Welcher Gedanke steckt dahinter? Manchmal enthält eine Datei z. B. mehrere ähnliche Funktionen. Wenn Sie herausfinden möchten, wie ähnlich sich diese Funktionen sind, wäre das ein relativ großer Aufwand. Sie müssten erst zwei entsprechende Dateien erstellen, sie in &kdiff3; laden und diese dann vergleichen. Jetzt können Sie die relevanten Abschnitte einfach kopieren, einfügen und dann vergleichen. Anmerkung: Zurzeit können Sie nichts aus &kdiff3; herausziehen. Nur das Fallenlassen von Text in ein Vergleichsfenster wird unterstützt. Warnung: Einige Editoren interpretieren das Ziehen und Ablegen von Text in ein anderes Programm als Ausschneiden und Einfügen (anstelle von Kopieren und Einfügen). In einem solchen Fall könnten Ihre Originaldaten verloren gehen. + + +Dateivergleiche und Interpretation der angezeigten Informationen in den Quellfenstern + + + +Info-ZeileIm oberen Teil jedes Textfensters befindet sich die Info-Zeile. Die Info-Zeile der Quellfenster enthält die Zeichen A, B oder C, den Dateinamen und die Zeilennummer der ersten sichtbaren Zeile im Fenster. Beachten Sie, dass Fenster C optional ist. Jede Info-Zeile hat eine unterschiedliche Farbe. Wenn Sie eine andere Datei im Auswahldialog gewählt oder nach Eingabe des Dateinamens die Eingabetaste gedrückt haben, wird die neue Datei geladen und mit den bereits geöffneten Dateien verglichen. FarbgebungDen drei Quellfenstern sind die Buchstaben A, B und C zugeordnet. A hat die Farbe Blau, B die Farbe Grün und C ist magenta. (Diese Voreinstellungen können über das Menü Einstellungen geändert werden.) Wenn ein Unterschied erkannt wird, sieht man an der Farbe, welche Datei sich unterscheidet. Wenn sich beide Dateien unterscheiden, ist die voreingestellte Farbe dafür Rot. (Farbe für Konflikte in den Einstellungen). Das Farbschema ist besonders nützlich, wenn Sie drei Dateien vergleichen. Das ist im nächsten Abschnitt (Zusammenführen) gut zu sehen. Zusammenfassungs-SpalteLinks neben dem Text befindet sich die Zusammenfassungs-Spalte. Wenn Unterschiede gefunden wurden, zeigt die Spalte die entsprechende Farbe an. Bei Unterschieden in Leerräumen wird die Farbe gerastert angezeigt. Bei einigen Programmiersprachen wo Leerräume nicht so wichtig sind, ist es nützlich, nur die relevanten Änderungen zu sehen. (Bei C/C++ z. B. sind Leerräume nur in Zeichenketten und Kommentaren, für die Vorverarbeitung und in wenigen, seltenen Einzelfällen relevant.) Die vertikale Linie, die die Zusammenfassungs-Spalte vom Text trennt, wird an den Stellen unterbrochen, wo die jeweilige Quelldatei keine Zeilen hat. Wenn der Zeilenumbruch aktiviert ist, wird die Linie an umgebrochenen Zeilen gepunktet dargestellt. Übersichts-SpalteAn der rechten Seite befindet sich eine Übersichts-Spalte, direkt links neben der vertikalen Bildlaufleiste. Sie zeigt eine komprimierte Zusammenfassung des gesamten Fenster A. Alle Unterschiede und Konflikte sind hier auf einen Blick erkennbar. Wenn nur zwei Quellfenster genutzt werden, dann erscheinen alle Unterschiede rot, denn dann ist jeder Unterschied gleichzeitig auch ein Konflikt. Der aktuell sichtbare Bereich der Quelltexte wird durch ein schwarzes Rechteck umrandet. Bei sehr langen Quelldateien mit mehr Zeilen als die Übersichts-Spalte in Pixeln anzeigen kann, teilen sich mehrere Zeilen jeweils eine Zeile in der Übersichts-Spalte. Ein Konflikt hat gegenüber einfacher Unterschiede die höchste Priorität. Unterschiede wiederum haben eine höhere Priorität als keine Änderungen. So gehen keine Konflikte oder Unterschiede verloren. Durch einen Klick in die Übersichts-Spalte wird der zugehörige Text angezeigt. Zeilen manuell ausrichtenManchmal platziert der Algorithmus die falschen Zeilen nebeneinander. Oder Sie möchten einen Textteil mit einem Text an einer völlig anderen Position in der anderen Datei vergleichen. In solchen Situationen können Sie mit &kdiff3; bestimmte Zeilen ausrichten. Markieren Sie den Text wie für das Kopieren und Einfügen in der ersten Vergleichsansicht und wählen dann „Manuelle Ausrichtung hinzufügen“ (&Ctrl;Y) im Menü „Vergleichsansicht“. Eine orangefarbene Leiste wird dann in der Zusammenfassungsspalte angezeigt. Wiederholen Sie diesen Schritt für die zweite und gegebenenfalls dritte Vergleichsansicht. &kdiff3; berechnet die Unterschiede bei jedem Schritt sofort neu und richtet die ausgewählten Zeilen aus. Dann passen einige vorher passenden Zeilen möglicherweise nicht mehr. Zurzeit unterstützt das Zusammenführen noch nicht die manuelle Ausrichtung der Zeilen von Unterschieden Diff-Abschnitte manuell verbinden oder trennenIn einigen Fällen zeigt &kdiff3; zu viele oder zu wenige Diff-Abschnitte an. Dann können Sie vorhandene Abschnitt zusammenführen oder aufteilen. Um neue Abschnitte hinzuzufügen, wählen Sie zuerst Text in den zusammengehörigen Zeilen in einem der Eingabefenster wie für das Kopieren in die Zwischenablage. Wählen Sie dann „Unterschied bei der Auswahlmarkierung trennen“ im Menü „Zusammenführung“. Die Trennung erfolgt oberhalb der ersten und unterhalb der letzten Zeile des ausgewählten Texts. Wenn Sie nur einen Abschnitt hinzufügen möchten, wählen Sie Text am Beginn einer anderen Abschnittsteilung. Um Zeilen in einem der Eingabefenster zu verbinden, wählen Sie die zu verbindenden Zeilen aus. Sie können auch mehrere Abschnitte auf einmal verbinden. Wählen Sie dann „Markierte Unterschiede verbinden“ im Menü „Zusammenführen“. + + + +Zusammenführen und das editierbare Ergebnisfenster + + + +Das Ergebnisfenster (unter den Vergleichsfenstern) hat auch eine Info-Zeile mit der Aufschrift Ausgabe:, dem Dateinamen und [Geändert] wenn Sie das Ergebnis bearbeitet haben. Üblicherweise enthält es durch das automatische Zusammenführen bereits Text, aber oft enthält es auch Konflikte. Bis alle Konflikte aufgelöst sind, ist das Speichern deaktiviert. Benutzen Sie die Knöpfe Zu vorigem/nächstem gelösten/ungelösten Konflikt springen, um die noch verbleibenden Konflikte zu finden. Wenn nur zwei Vergleichsfenster benutzt werden, ist jeder Unterschied gleichzeitig auch ein Konflikt, der manuell gelöst werden muss. Bei drei Vergleichsfenstern wird die erste Datei als Basis verwendet, und die zweite und dritte Datei enthalten die Änderungen. Wenn eine Zeile nur in Datei B oder C geändert wurde, aber nicht in beiden, dann wird automatisch die richtige Änderung ausgewählt. Wenn B und C allerdings Änderungen in der gleichen Zeile enthalten, erkennt &kdiff3; einen manuell zu lösenden Konflikt. Wenn B und C identisch sind, sich aber von A unterscheiden, dann wird C als Quelle ausgewählt. Die Zusammenfassungs-SpalteDas Ergebnisfenster hat auch eine Zusammenfassungs-Spalte an der linken Seite. Sie zeigt entweder den Buchstaben des Vergleichsfensters an von dem eine Zeile stammt, oder sie ist leer, wenn alle drei Quellen an der Stelle identisch sind. Konflikte werden mit einem roten Fragezeichen ? und dem Text <Zusammenführungskonflikt> dargestellt. Weil das zeilenweise Auflösen von Konflikten sehr lange dauern würde, werden Zeilen mit gleichem Unterschied und Charakteristika gruppiert. Konflikte mit Leerräume- und Konflikte mit Nicht-Leerräumen Zeichen werden getrennt dargestellt, um das Zusammenführen von Dateien mit vielen Änderungen von Einrückungen zu vereinfachen. Einstellung der aktuellen Gruppe und Abgleich der Zusammenführungs- und Diff-AnsichtspositionenDurch einen Klick mit der linken Maustaste in die Zusammenfassungs-Spalte in einem der Fenster wird die erste zu der Zeile gehörende Gruppe in allen Fenstern angezeigt. Diese Gruppe wird dann die aktuelle Gruppe. Sie wird mit der Farbe Hintergrundfarbe für aktuellen Bereich hervorgehoben und jeweils zur Linken erscheint ein schwarzer Balken. Auswahl der Eingabe A, B oder C für den aktuellen Konflikt und zur BearbeitungIn der Werkzeugleiste unter der Menüleiste sind drei Knöpfe zur Auswahl der Eingabe mit den Buchstaben „A“, „B“ und „C“ enthalten. Klicken Sie auf diese Knöpfe, um Zeilen einzufügen oder bereits eingefügte Zeilen der entsprechenden Quelle zu löschen. Um Zeilen in mehreren Eingabefenstern auszuwählen, klicken Sie auf die zugehörigen Knöpfe in der gewünschten Reihenfolge. Wenn Sie die Zeilen aus „B“ vor den Zeilen auf „A“ anzeigen möchten, klicken Sie zuerst auf „B“ und dann auf „A“. Wenn Sie die Einstellung Automatisch zu nächstem ungelösten Konflikt weiterspringen verwenden, sollten Sie das abschalten, ehe Sie Zeilen aus mehreren Eingabefenstern wählen oder wenn Sie die Zeilen nach Ihrer Auswahl bearbeiten möchten. Ansonsten springt &kdiff3; zum ersten Konflikt nach der Auswahl der ersten Eingabe. Es ist oft hilfreich, die Ausgabe der Zusammenführung zu bearbeiten. In der Zusammenfassungsspalte wird das Zeichen „m“ für jede manuell geänderte Zeile angezeigt. Wenn zum Beispiel die Unterschiede in einer Weise ausgerichtet sind, das die Auswahl der Eingaben zu keinen befriedigenden Ergebnissen führen, dann markieren Sie den gewünschten Text und nutzen Kopieren und Einfügen, um ihn in die Ausgabe der Zusammenfassung einzufügen. Manchmal bleibt durch das automatische Zusammenführen oder durch manuelles Bearbeiten keine weitere Zeile mehr in der Gruppe übrig; dann wird in diesen Zeilen der Text <Keine Zeile in der Quelle> angezeigt. Das ist nur ein Platzhalter für den Fall, dass Sie Ihre Meinung ändern und vielleicht doch wieder eine andere Quelle wählen. Dieser Text erscheint weder in der endgültigen gespeicherten Datei, noch in einer Markierung die Sie vielleicht kopieren und woanders einfügen. Der Text <Zusammenführungskonflikt> erscheint allerdings in der Zwischenablage, wenn Sie solchen Text aus dem Ergebnisfenster kopieren. Gehen Sie vorsichtig mit dieser Funktion um. Auswahl der Eingabe A, B oder C für alle KonflikteDas normale Zusammenführen startet mit dem automatischen Lösen einfacher Konflikte. Das Menü Zusammenführen enthält einige häufig verwendete Funktionen. Wenn Sie bei den meisten Konflikten die gleiche Quelle auswählen müssen, können Sie z. B. überall A, B oder C auswählen. Die gleiche Möglichkeit gibt es auch für die noch verbleibenden ungelösten Konflikte oder sogar für die noch verbleibenden ungelösten Konflikte in Leerräumen. Wenn Sie solche Entscheidungen nicht zusammengefasst für eine Gruppe, sondern sogar für jeden einzelnen Unterschied im Detail treffen möchten, dann wählen Sie Alle Unterschiede zu Konflikten machen. Sie können wieder zur automatischen Auswahl von &kdiff3; zurück, indem Sie Automatisch einfache Konflikte lösen wählen. &kdiff3; startet das Zusammenführen dann erneut. &kdiff3; fragt nach, bevor Ihre eventuell gemachten Änderungen verloren gehen. Hinweis: Wenn beim Auswählen der Quellen die Optionen Zahlen ignorieren oder C/C++ Kommentare ignorieren aktiviert sind, werden Änderungen in Zahlen oder Kommentaren auch wie Leerräume behandelt. Automatische Zusammenführung von Schlüsselwörtern von Versionskontrollsystemen und dem Verlauf (Protokoll)Viele Versionsverwaltungssysteme unterstützen Schlüsselwörter in der Datei wie "$Date$", "$Header$", "$Author$", "$Log$" &etc; Beim Einspielen ändert das Versionsverwaltungssystem (VCS) diese Zeilen. "$Date$" wird zum Beispiel zu "$Date: 2005/03/22 18:45:01 $". Da diesen Zeile in jeder Version der Datei verschieden ist, würde ein manueller Eingriff beim Zusammenführen nötig sein. &kdiff3; bietet ein automatisches Zusammenführen für diese Einträge. Bei einfachen Zeilen, auf die die Einstellung „Regulärer Ausdruck für automatische Zusammenführung“ in allen Eingabedateien zutrifft, wählt &kdiff3; die Zeile aus B oder - wenn verfügbar - aus C. Außerdem ist es erforderlich, dass die betreffenden Zeilen im Vergleich enthalten sind und die vorherige Zeile keinen Konflikt enthält. Dieses automatische Zusammenführen kann entweder sofort nach dem Beginn einer Zusammenführung mit „Zusammenführung über regulären Ausdruck beim Start einer Zusammenführung durchführen“ oder später mit „Zusammenführung über regulären Ausdruck starten“ aus dem Menü „Zusammenführen“ ausgeführt werden. Automatisches Zusammenführen für den Verlauf oder Protokoll von Versionsverwaltungssystemen wird ebenfalls unterstützt. Das automatische Zusammenführen des Verlaufs kann entweder durch die Aktivierung von „Versionsverwaltungs-Verlauf beim Start einer Zusammenführung zusammenführen“ oder später durch „Verlauf-Konflikte automatisch auflösen“ aus dem Menü „Zusammenführen“ gestartet werden. Normalerweise beginnt das Protokoll des Versionsverlaufs mit dem Schlüsselwort „$Log$“. Dies muss zur Einstellung Regulärer Ausdruck für Verlauf-Start passen. &kdiff3; erkennt, welche der folgenden Zeilen im Verlaufsprotokoll enthalten sind, indem die die Zeichen vor „$Log$“ analysiert werden. Wenn diese Zeichen auch in den folgenden Zeilen erscheinen, werden Sie auch als Teil des Protokolls betrachtet. Beim jedem Einspielen schreibt das Versionsverwaltungssystem eine eindeutige Zeile mit Informationen über Version, Datum und Zeit und danach den Kommentar des Benutzers. Diese Zeilen bilden einen Verlaufseintrag. Dieser Verlaufsabschnitt wird mit jedem Einspielen größer und die neueren Einträge werden oben nach der Verlaufsprotokollzeile eingefügt. Wenn bei gleichzeitiger Entwicklung zwei oder mehr Entwickler einen Zweig (Branch) der Datei einspielen, enthält der Zusammenführungsverlauf mehrere Einträge, die als Konflikt beim Zusammenführen der Zweige erscheint. Das dieses Zusammenführen sehr langweilig ist , unterstützt &kdiff3; zwei verschiedene Strategien: Einfügen der Verlaufsinformationen beider Entwickler am Anfang oder Sortierung durch einen benutzerdefinierten Schlüssel. Die Methode nur alle Einträge einzufügen, ist einfacher einzurichten. &kdiff3; benötigt nur eine Methode, um die zu einem Verlaufseintrag gehörenden Zeilen zu erkennen. Die meisten Versionsverwaltungssysteme fügen nach jedem Verlaufseintrag eine Leerzeile ein. Gibt es keinen anderen Leerzeilen, ist dies Kriterium für &kdiff3; ausreichend. Löschen Sie den Text für Regulärer Ausdruck für Verlauf-Eintrag-Startzeile an. Ist das Kriterium für eine Leerzeile nicht ausreichend,können Sie einen regulären Ausdruck für den Beginn des Verlaufseintrags angeben. Beachten Sie, dass &kdiff3; doppelte Einträge im Verlauf entfernt. Wenn ein Eintrag mehrfach im Verlauf einer Eingabedatei vorkommt, bleibt in der Ausgabe nur ein Eintrag übrig. Möchten Sie den Verlauf sortieren, müssen Sie den Schlüssel dazu angeben. Verwenden Sie Klammern, um Teile von Regulärer Ausdruck für Verlauf-Eintrag-Startzeile zu gruppieren, um diesen Ausdruck später zum Sortieren zu verwenden. Geben Sie dann für Sortierschlüsselreihenfolge für Verlauf-Eintragsstart eine durch Komma getrennte Liste von Zahlen mit der Position der Gruppen im regulären Ausdruck. Da es nicht so einfach ist, sofort richtige Ausdrücke zu schreiben, können Sie die regulären Ausdrücke und Schlüsselgenerierung in einem dafür vorgesehenen Dialog verbessern und testen, indem Sie den Knopf „Testen Sie Ihre regulären Ausdrücke“ drücken. Beispiel: Angenommen ein Verlauf sieht so aus: +/************************************************************************** +** HISTORY: $Log: \toms_merge_main_view\MyApplication\src\complexalgorithm.cpp $ +** +** \main\integration_branch_12 2 Apr 2001 10:45:41 tom +** Merged branch simon_branch_15. +** +** \main\henry_bugfix_branch_7\1 30 Mar 2001 19:22:05 henry +** Improved the speed for subroutine convertToMesh(). +** Fixed crash. +**************************************************************************/ + Der Verlauf beginnt mit der Startzeile, auf die der reguläre Ausdruck ".*\$Log.*\$.*" zutrifft. Dann folgen die Einträge. Die Zeile mit dem Schlüsselwort „$Log$“ beginnt mit zwei „*“ und danach ein Leerzeichen. &kdiff3; verwendet den ersten Text ohne Leerzeichen als „Startkommentar“ und nimmt an, dass der Verlauf mit der ersten Zeile ohne diesen Startkommentar endet. In diesem Beispiel enthält die letzte Zeile auch zwei Zeichen „*“ am Anfang, aber dann folgen weitere „*“ statt eines Leerzeichens. Daher endet der Verlauf mit dieser Zeile. Ist eine Sortierung des Verlaufs nicht erforderlich, kann ein regulärer Ausdruck für die Startzeile des Verlaufseintrags zum Beispiel so aussehen: +\s*\\main\\\S+\s+[0-9]+ (Jan|Feb|Mar|Apr|May|Jun|Jul|Aug|Sep|Oct|Nov|Dec) + [0-9][0-9][0-9][0-9] [0-9][0-9]:[0-9][0-9]:[0-9][0-9]\s+.* + Dieser Ausdruck wurde in zwei Teile getrennt, da er sonst zu lang ist. Weitere Informationen über reguläre Ausdrücke finden Sie in der Trolltech-Dokumentation. Beachten Sie, dass das klein geschriebene „\s“ auf jedes Leerraumzeichen und das groß geschriebene "\S" auf jedes Nicht-Leerraumzeichen passt. In diesem Beispiel enthält der Beginn des Verlaufseintrags zuerst die Versionsinformation mit „\\main\\\S+“, das Datum aus Tag „[0-9]+“, Monat „(Jan|Feb|Mar|Apr|May|Jun|Jul|Aug|Sep|Oct|Nov|Dec)“ und Jahr „[0-9][0-9][0-9][0-9]“, die Zeit „[0-9][0-9]:[0-9][0-9]:[0-9][0-9]“ und schließlich den Benutzernamen des Entwicklers „.*“. Beachten Sie, dass die Startkommentar-Zeichen, in diesem Beispiel "**" bereits durch &kdiff3; vor der Suchen nach Übereinstimmung entfernt werden. Daher beginnt der reguläre Ausdruck mit einem oder Leerraumzeichen mit "\s*". Da Kommentarzeichen in jeder Datei je nach verwendeter Programmiersprache verschieden sein können, werden die Startkommentar-Zeichen von &kdiff3; entfernt und sollten nicht im regulären Ausdruck angegeben werden. Wenn Sie den Verlauf sortiert haben möchten, muss dazu ein Sortierschlüssel berechnet werden. Dazu müssen die maßgebenden Teile im regulären Ausdruck durch Klammern gruppiert werden. Die zusätzlichen Klammer können im Verlaufseintrag verbleiben, wenn die Sortierung abgeschaltet ist. +\s*\\main\\(\S+)\s+([0-9]+) (Jan|Feb|Mar|Apr|May|Jun|Jul|Aug|Sep|Oct|Nov|Dec) + ([0-9][0-9][0-9][0-9]) ([0-9][0-9]:[0-9][0-9]:[0-9][0-9])\s+(.*) + Die Klammern enthalten jetzt: 1. Versionsinformation, 2. Tag, 3. Monat, 4. Jahr, 5. Zeit, 6. Name. Wenn Sie jedoch nach Datum und Zeit sortieren möchten, muss zuerst ein Schlüssel mit den Elementen in einer anderen Reihenfolge konstruiert werden. Zuerst das Jahr, dann Monat, Tag, Zeit, Versionsinformation und Name. Daher muss als Sortierschlüssel "4,3,2,5,1,6" angegeben werden. Da Monatsnamen nicht zur Sortierung geeignet sind, weil dabei „Apr“ zuerst käme, ermittelt &kdiff3; die Reihenfolge der angegebenen Monatsnamen und benutzt dies dann. In diesem Fall wird „Apr“ die Zahl „04“ zugeordnet. Eine Zahl wird in einen Wert mit vier Dezimalstellen mit vorangestellten Nullen für die Sortierung. Schließlich ergibt sich als Sortierschlüssel für die Startzeile des ersten Verlaufseintrags: 2001 04 0002 10:45:41 integration_branch_12 tom + +Weitere Informationen finden Sie unter Zusammenführung-Einstellungen. + + + +Navigieren und Bearbeiten +Navigiert wird hauptsächlich mit den Bildlaufleisten und der Maus, aber Sie können dazu auch die Tastatur benutzen. Wenn Sie in eines der Fenster klicken, können Sie die Pfeiltasten links, rechts, hoch, runter, Bild auf, Bild ab, Pos1, Ende, Strg+Pos1 und Strg+Ende benutzen, so wie Sie es auch von anderen Programmen gewohnt sind. Die Übersichts-Spalte neben der vertikalen Bildlaufleiste kann durch hineinklicken auch zum Navigieren benutzt werden. Außerdem können Sie das Mausrad zum hoch- und runterblättern benutzen. Im Ausgabefenster können Sie auch die anderen Tasten zum Bearbeiten verwenden. Mit der Taste Einfg können Sie zwischen Einfüge- und Überschreibmodus wechseln. (Voreingestellt ist der Einfügemodus.) Ein Klick mit der linken Maustaste in eine der Zusammenfassungs-Spalten gleicht die Ansicht aller Fenster auf den Anfang der jeweiligen Gruppe von Zeilen ab, wie bereits im Abschnitt Einstellung der aktuellen Gruppe und Abgleich der Zusammenführungs- und Diff-Ansichtspositionen erläutert wird. Die Werkzeugleiste enthält neun Knöpfe zur Navigation, mit denen Sie zum aktuellen/ersten/letzten Unterschied, zum nächsten/vorigen Unterschied (Strg+Pfeil runter/Strg+Pfeil hoch), zum nächsten/vorigen Konflikt (Strg+Bild Auf/Strg-Bild ab) oder zum nächsten/vorigen ungelösten Konflikt springen können. Beachten Sie, dass &kdiff3; alle nicht automatisch gelösten Konflikte auch nach dem manuellen Lösen weiterhin als Konflikt betrachtet. Daher muss zwischen gelösten und ungelösten Konflikten unterschieden werden. +Automatisch weitergehen +Es gibt auch einen Knopf Automatisch zum nächsten ungelösten Konflikt weiterspringen. Wenn Sie dies aktivieren, wird &kdiff3; nach der ersten Auswahl der Quelle automatisch zum nächsten ungelösten Konflikt weiterspringen und ihn lösen. Das ist hilfreich, wenn Sie immer nur eine Quelle wählen möchten. Wenn Sie beide Quellen brauchen, oder das Ergebnis nach der Auswahl noch bearbeiten möchten, dann sollten Sie diese Funktion ausschalten. Bevor &kdiff3; zum nächsten ungelösten Konflikt weiterspringt, wird das Ergebnis der Auswahl für eine kurze Zeit angezeigt. Die Verzögerungszeit kann im Abschnitt Vergleich und Zusammenführung in den Einstellungen bestimmt werden: Geben Sie für Verzögerung für das automatische Weiterspringen einen Wert zwischen 0 und 2000 Millisekunden an. Tipp: Wenn Sie sich viele Mausklicks sparen möchten, dann benutzen Sie eine kurze Verzögerungszeit und die Tastenkürzel Strg-1/2/3 zum Auswählen der Quellen A/B/C. + + + +Markieren, Kopieren und Einfügen +In den Vergleichsfenstern wird kein Cursor angezeigt, daher müssen Markierungen mit der Maus gemacht werden. Drücken Sie am Beginn der Markierung die linke Maustaste und halten Sie sie gedrückt, ziehen Sie die Maus dann bis zum Ende der Markierung und lassen Sie hier die Maustaste wieder los. Ein einzelnes Wort kann auch einfach durch einen Doppelklick darauf markiert werden. Im Ergebnisfenster können Sie zum Markieren auch die Tastatur benutzen. Drücken Sie dazu die Umschalt-Taste und verändern Sie die Markierung mit den Pfeiltasten. Wenn die Auswahl den auf dem Bildschirm angezeigten Bereich überschreitet, schieben Sie den Mauszeiger über den Rand des Fensters. Dann blättert &kdiff3; in dieser Richtung. Für eine sehr große Auswahl können Sie auch die Navigationstasten zusammen mit gedrückter Maustaste verwenden. Benutzen Sie zum Beispiel die Tasten „Bild ab“ und „Bild auf“, um schnell zu einer bestimmten Position zu gehen. Haben Sie die gewünschte Endposition erreicht, lassen Sie die Maustaste los. Um den gesamten Text im aktuellen Fenster auszuwählen, benutzen Sie im Menü Bearbeiten Alles auswählen (Ctrl+A). Um die Markierung in die Zwischenablage zu kopieren, müssen Sie den Knopf Kopieren (Strg+C oder Strg+Einfg) drücken. Es gibt auch die Option Auswahl automatisch kopieren. Wenn diese aktiviert ist, wird, was immer Sie markieren, automatisch in die Zwischenablage kopiert und das manuelle Kopieren entfällt. Seien Sie mit dieser Option aber vorsichtig, denn Sie könnten so den Inhalt der Zwischenablage versehentlich überschreiben. „Ausschneiden“ (Strg-X oder Umschalt-Entf) kopiert in die Zwischenablage und löscht den markierten Text. „Einfügen“ (Strg-V oder Umschalt-Einfg) fügt den Text aus der Zwischenablage an der aktuellen Cursor-Position ein bzw. ersetzt die aktuelle Markierung. Wenn Sie den Inhalt der Zwischenablage in eines der Diff-Eingabefenster fügen, wird er hier angezeigt und der Vergleich wird sofort wieder neu gestartet. Dies ist nützlich, wenn Sie einen beliebigen Text irgend woher mit einem anderen Text vergleichen möchten, ohne dafür zuerst Dateien zu erstellen. + + +Speichern +Speichern ist erst möglich, wenn alle Konflikte gelöst sind. Falls die Datei bereits existiert und die Option Sicherungskopie erstellen aktiviert ist, dann erhält die bestehende Datei die Endung .orig. Wenn bereits eine .orig-Datei existiert, wird diese überschrieben. Wenn Sie einen weiteren Vergleich starten bzw. beenden und noch nicht gespeichert haben, dann fragt &kdiff3;, ob Sie Speichern, Abbrechen oder ohne zu speichern fortfahren möchten. (&kdiff3; fängt allerdings keine System-Signale ab. Wenn Sie &kdiff3; also mit dem Signal kill beenden, gehen Ihre nicht gespeicherten Daten verloren.) Zeilenenden werden entsprechend dem zugrunde liegenden Betriebssystem gespeichert. Unix-Varianten verwenden ein Zeilenvorschub-Zeichen \n, und Win32-basierte Systeme benutzen Wagenrücklauf + Zeilenvorschub \r\n. &kdiff3; behält die Zeilenenden der Quelldateien nicht bei, darum sollten Sie &kdiff3; auch nicht mit Binärdateien verwenden. + + +Suchen und Finden von Zeichenketten +Sie können in jedem Textfenster von &kdiff3; nach einer Zeichenkette suchen. Die Funktion Suchen... (Strg+F) im Menü Bearbeiten öffnet einen Dialog, in dem Sie die zu suchende Zeichenkette eingeben können. Eine Suche beginnt immer am Anfang. Mit der Funktion Weitersuchen (F3) können Sie zum nächsten Vorkommen der gesuchten Zeichenkette springen. Wenn Sie eine Suche über mehrere Fenster aktiviert haben, wird erst das erste Fenster vom Beginn bis zum Ende durchsucht, danach das nächste Fenster &etc; + + +Drucken +&kdiff3; unterstützt das Drucken von Unterschieden für Textdateien. Mit der Aktion Drucken ... aus dem Menü Datei öffnen Sie einen Dialog, in dem der Drucker ausgewählt und weitere Einstellungen angepasst werden können. Es gibt mehrere Möglichkeiten, den Druckbereich einzustellen. Da sich die Druckerdialoge auf den verschiedenen Betriebssystemen unterscheiden, ist das Verfahren zur Einstellung des Druckbereichs auch unterschiedlich. + + Alles druckenDruckt alle Unterschiede + Aktuell:Druckt eine Seite, die mit der ersten sichtbaren Zeile des Fensters beginnt. Auf Systemen ohne diese Einstellung verwenden Sie dazu die Angabe von Zeile 10000 für das Drucken. + Auswahl:Wählen Sie vor dem Drucken Text mit der Maus wie für das Kopieren und Einfügen in einem der Diff-Eingabefenster, um die erste und letzte Zeile zu definieren. Ist kein Text in einem der Diff-Eingabefenster ausgewählt, ist diese Einstellung deaktiviert. Auf Systemen ohne diese Einstellung dann dies mit der Angabe einer Zeilennummer von 9999 erreicht werden. + Bereich:Bestimmt die erste und letzte Seite des Drucks. + +Weitere wichtige Einstellungen zum Drucken können wie üblich ausgewählt werden: + Schrift und Schriftgröße + Zeilennummern anzeigen + Zeilenumbruch + Farben + &etc; + +Das Querformat wird für das Ausdrucken empfohlen. + + +Optionen +Die Optionen und die Liste der zuletzt verwendeten Dateien wird beim Beenden automatisch gespeichert und beim nächsten Start wiederhergestellt. (Menü Einstellungen->&kdiff3; einrichten ...) +Schriftart +Wählen Sie eine Schrift mit fester Breite. (Auf einigen Systemen stellt der Dialog auch Schriften mit variabler Breite zur Auswahl, Sie sollten diese aber nicht benutzen.) + + Kursivschrift bei Unterschieden:Wenn Sie diese Option aktivieren, werden Unterschiede in kursiver Schrift dargestellt. Wenn die gewählte Schrift diese Darstellung nicht unterstützt, passiert gar nichts. + + + + +Farben + + Vordergrundfarbe:Üblicherweise Schwarz. + Hintergrundfarbe:Üblicherweise Weiß. + Hintergrundfarbe bei Unterschieden:Üblicherweise helles Grau. + Farbe für A:Üblicherweise dunkles Blau. + Farbe für B:Üblicherweise dunkles Grün. + Farbe für C:Üblicherweise dunkles Magenta. + Farbe für Konflikte:Üblicherweise Rot. + Hintergrundfarbe für aktuellen Bereich:Üblicherweise helles Gelb. + Hintergrundfarbe für Unterschiede im aktuellen Bereich:Üblicherweise dunkles Gelb. + Farbe für manuell ausgewählte Unterschiede:Üblicherweise Orange. + Farbe für neueste Datei in der Ordnervergleichsansicht:Üblicherweise Grün. + Farbe für älteste Datei in der Ordnervergleichsansicht:Üblicherweise Rot. + Farbe für mittelalte Datei in der Ordnervergleichsansicht:Üblicherweise dunkles Gelb. + Farbe für fehlende Datei in der Ordnervergleichsansicht:Üblicherweise Schwarz. + +Die Änderung der Farbe für den Ordnervergleich wird erst beim Start des nächsten Ordnervergleichs wirksam. +An Systemen mit nur 16 oder 256 Farben könnten einige Farben nicht in ihrer reinen Form verfügbar sein sondern würden gerastert dargestellt werden. An diesen Systemen stellt der Knopf Voreinstellungen automatisch eine ungerasterte Farbe ein. + + +Editoreinstellungen + + Tabulator fügt Leerzeichen ein:Wenn diese Option aktiviert ist, wird beim Drücken der Tabulator-Taste die entsprechende Anzahl an Leerzeichen eingefügt. Ansonsten wird ein Tabulator-Zeichen eingefügt. + Tabulatorweite:Kann nach Ihren persönlichen Vorstellungen eingestellt werden. Voreingestellt ist 8. + Automatisch einrücken:Wenn Sie die Eingabetaste drücken, wird die Einrückung der vorangehenden Zeile automatisch auch für die nächste Zeile verwendet. + Auswahl automatisch kopieren:Wenn diese Option aktiviert ist, wird jede Auswahl automatisch in die Zwischenablage kopiert. Das manuelle Kopieren in die Zwischenablage entfällt dann. + Zeilenende-Kodierung:Sie können auswählen, welchen Zeilenende-Kodierung Sie zum Speichern bevorzugen. Der voreingestellte Wert ist die allgemein übliche Auswahl auf dem verwendeten Betriebssystem. + + + +Diff-Optionen +Beim Vergleichen von Dateien versucht &kdiff3; zuerst, alle vollständig identischen Zeilen in den Quelldateien zu finden. Nur bei diesem ersten Schritt können Leerräume ignoriert werden. Der zweite Schritt vergleicht jede Zeile. In diesem Schritt werden Leerräume nicht ignoriert. Auch beim Zusammenführen werden Leerräume nicht ignoriert. + + + Zahlen ignorierenIn der Voreinstellung ist diese Option deaktiviert. Im ersten Teil der Analyse werden Zahlen und zugehörige Zeichen ('0'-'9', '.', '-') ignoriert. Im Ergebnis werden die Unterschiede dennoch angezeigt, aber sie werden wie Leerräume behandelt. + C/C++-Kommentare ignorierenIn der Voreinstellung ist diese Option deaktiviert. Änderungen in Kommentaren werden wie Änderungen in Leerräumen behandelt. + Unterschiede bei Groß- und Kleinschreibung ignorierenIn der Voreinstellung ist diese Option deaktiviert. Unterschiede in einzelnen Zeichen (wie z. B. 'A' und 'a') werden wie Unterschiede in Leerräumen behandelt. + Vorverarbeitungsbefehl:Siehe nächster Abschnitt. + Vorverarbeitungsbefehl nur für Zeilenabgleich:Siehe nächster Abschnitt. + Aufwendig suchen (langsamer):Intensiv nach noch kleineren Unterschieden suchen. Die Option ist in der Voreinstellung aktiviert. Sie ist effektiv bei komplizierten und großen Dateien, aber langsam bei sehr großen Dateien. + + + +Einstellungen für das Zusammenführen + + Verzögerung für das automatische Weiterspringen (ms):In diesem Modus bestimmt diese Einstellung, wie lange das Ergebnis der Auswahl angezeigt wird, bevor zum nächsten ungelösten Konflikt weitergesprungen wird. + Leerraum-Autoauswahl bei 2 Dateien:Löst automatische alle Konflikte in Leerräumen, indem die gewählte Datei als Quelle benutzt wird. (Voreingestellt ist manuelle Auswahl.) Das ist nützlich, wenn Leerräume in vielen Dateien weniger wichtig sind. Wenn Sie dies nur von Zeit zu Zeit benötigen, dann nutzen Sie besser die Funktionen Für alle ungelösten Leerraum-Konflikte A/B/C wählen aus dem Menü Zusammenführen.Beachten Sie, dass die Automatische Auswahl auch Konflikte in Zahlen oder Kommentaren betrifft, wenn die Optionen Zahlen ignorieren oder C/C++-Kommentare ignorieren aktiviert sind. + Regulärer Ausdruck für automatische Zusammenführung:Regulärer Ausdruck für Zeilen, für die automatisch eine Quelle auswählen soll. Siehe auch Automatische Zusammenführung. + Zusammenführung über regulären Ausdruck beim Start einer Zusammenführung durchführen:Ist diese Einstellung aktiviert, benutzt &kdiff3; beim Zusammenführen einen Regulären Ausdruck für automatische Zusammenführung, wenn die Zusammenführung gestartet wird. + Regulärer Ausdruck für Verlauf-Start:Regulärer Ausdruck für die Startzeile des Versionsverwaltungs-Verlaufs. Normalerweise enthält diese Zeile das Schlüsselwort „$Log$“.Voreinstellung: „.*\$Log.*\$.*“ + Regulärer Ausdruck für Verlauf-Eintrag-Startzeile:Ein Verlaufseintrag für eine Versionsverwaltung besteht aus mehreren Zeilen. Geben Sie einen regulären Ausdruck an, um die erste Zeile (ohne die voranstehenden Kommentarzeichen) zu erkennen. Verwenden Sie runde Klammern, um Sortierschlüssel zu gruppieren. Fehlen diese Angaben, nimmt &kdiff3; an, dass die Verlauf-Einträge durch Leerzeilen getrennt sind. Siehe auch Automatische Zusammenführung .... + Sortierte Verlauf-Zusammenführung:Sortierung der Verlauf-Einträge für Versionsverwaltungssystemen aktivieren + Sortierschlüsselreihenfolge für Verlauf-Eintragsstart:Jedes runde Klammer im regulären Ausdruck des Verlauf-Start-Eintrags gruppiert einen Schlüssel, der für die Sortierung verwendet werden kann. Geben Sie eine Liste der Schlüssel an (nummeriert in der Auftrittsreihenfolge, mit 1 beginnend), wobei das Komma als Trennzeichen verwendet wird. (z. B.: „4,5,6,1,2,3,7“). Wenn der Eintrag leer ist, wird keine Sortierung durchgeführt. Siehe auch Automatische Zusammenführung .... + Versionsverwaltungs-Verlauf beim Start einer Zusammenführung zusammenführen:Ist diese Einstellung aktiviert, benutzt &kdiff3; beim der automatischen Zusammenführung des Verlaufs die zuvor genannten Einstellungen, wenn die Zusammenführung gestartet wird. + Maximale Anzahl Verlauf-Einträge:&kdiff3; kürzt die Verlaufsliste auf die angegebene Anzahl von Einträgen. Verwenden Sie den Wert -1, die Voreinstellung, um das zu verhindern. + Testen Sie Ihre regulären AusdrückeMit diesem Knopf wird ein Dialog angezeigt, in dem Sie die oben genannten regulären Ausdrücke verbessern und testen können. Kopieren Sie die relevanten Zeilen aus Ihrer Datei in die Beispielzeile. Das Übereinstimmungsergebnis zeigt sofort an, ob der Ausdruck passt. Das Sortierschlüsselergebnis zeigt den verwendeten Schlüssel für die Sortierung der Verlaufszusammenführung. + Befehl bei irrelevanter Zusammenführung:Geben Sie einen eigenen Befehl ein, der aufgerufen wird, wenn &kdiff3; feststellt, dass beim Zusammenführen von drei Dateien die Datei B keine wesentlichen Daten beiträgt, die nicht auch schon in C enthalten sind. Dieser Befehl wird mit den drei Dateinamen als Parameter aufgerufen, Daten die auf „Regulärer Ausdruck für automatische Zusammenführung“ passen oder bereits im Verlauf enthalten sind, werden als unwesentlich betrachtet. + + + + +Ordnerzusammenführung +Diese Optionen werden im Kapitel zum Einlesen von Ordnern und Durchführen einer Zusammenführung behandelt. Schauen Sie für Details unter Dokumentation zum Ordnervergleich und Zusammenführung nach. Es gibt hier dennoch eine Option die auch beim Speichern von einzelnen Dateien relevant ist: + + Sicherungskopie erstellen (.orig):Wenn eine Datei gespeichert wird und bereits eine ältere Version existiert, dann wird der Originalversion das Suffix .orig angehängt. Wenn bereits eine solche Sicherungsdatei mit dem Suffix .orig existiert, wird diese ohne weitere Sicherung gelöscht. + + + +Regional- und Spracheinstellungen + + Sprache:Passt die Sprache der Benutzeroberfläche an. Das Ändern dieser Option betrifft nicht das aktuell laufende Programm. Sie müssen &kdiff3; beenden und neu starten, damit die Änderung aktiv wird. Diese Option ist in der Frameworks-Version von &kdiff3; nicht verfügbar. + Überall die gleiche Kodierung verwenden:Die folgenden Kodierungseinstellungen können für jeden Eintrag separat eingestellt werden. Wenn man diese Option aktiviert, wird für alle Einträge die obere Einstellung verwendet. + Lokale Kodierung:Über den Auswahlfeldern für die Kodierung erscheint ein kurzer Hinweis, was die lokale Kodierung ist. (Dies kann hier nicht geändert werden und hat für Sie rein informellen Charakter.) + Datei-Kodierung für A/B/C:Passen Sie die Datei-Kodierung für Quelldateien an. Dies beeinflusst, wie Sonderzeichen behandelt und interpretiert werden. Da die Kodierung für jede Datei einzeln einstellbar ist, können selbst Dateien mit unterschiedlicher Kodierung verglichen und zusammengeführt werden. + Dateikodierung für Zusammenführung und Speichern:Wenn Sie eine Datei bearbeitet haben, können Sie hier festlegen, welche Kodierung zum Speichern verwendet werden soll. + Dateikodierung für Vorverarbeitungs-Dateien:Wenn Sie Vorverarbeitungsbefehle definieren, könnten sie eventuell nicht mit Ihrem Codec funktionieren. (Z. B. könnten Ihre Dateien 16-Bit Unicode sein, aber der Vorverarbeitungsbefehl kann nur mit 8-Bit ASCII umgehen.) Mit dieser Option kann man die Kodierung der Ausgabe von Vorverarbeitungsbefehlen festlegen. + Rechts-nach-Links-Sprache:Einige Sprachen werden von Rechts nach Links geschrieben. Wenn diese Option aktiviert ist, zeigt &kdiff3; den Text in Vergleichs- und Zusammenführungs-Fenstern von Rechts nach Links an. Wenn Sie &kdiff3; mit der Option --reverse starten, wird das gesamte Layout der Programmoberfläche von Rechts nach Links angezeigt. (Dies ist eine Funktion von Qt.) Diese Dokumentation wurde unter der Annahme geschrieben, dass Rechts-nach-Links Sprache und umgedrehtes Layout abgeschaltet sind. Wenn Sie diese Optionen verwenden, müssen Sie also Referenzen auf Rechts und Links entsprechend umkehren. + + + + +Verschiedenes +Diese Optionen und Aktionen sind in den Menüs oder den Werkzeugleisten zu finden. + + Zeilennummern anzeigen:Sie können wählen, ob in den Quelldateien die Zeilennummern angezeigt werden sollen. + Leerzeichen und Tabulator-Zeichen in Unterschieden anzeigen:Manchmal sind sichtbare Leerzeichen und Tabulatoren störend. Sie können die Anzeige dieser Zeichen abschalten. + Leerräume anzeigen:Schalten Sie dies ab, um Hervorhebungen von Änderungen in Leerräumen in den Text- oder Übersichtsspalten zu unterdrücken. (Hinweis: Dies gilt auch für Änderungen in Zahlen oder Kommentaren, wenn die Optionen Zahlen ignorieren oder C/C++-Kommentare ignorieren aktiviert sind.) + Übersichts-Optionen:Dieses Auswahl ist nur verfügbar, wenn Sie drei Dateien vergleichen. Im normalen Modus werden alle Unterschiede in einer farblich kodierten Übersichts-Spalte angezeigt. Aber manchmal möchten Sie vielleicht nur die Unterschiede zwischen zwei von drei Dateien sehen. Nach Auswahl von A <-> B, A <-> C oder B <-> C wird neben der normalen noch eine zweite Übersichts-Spalte mit den benötigten Informationen angezeigt. + Zeilenumbruch für Vergleichsanzeige:Aktiviert den Zeilenumbruch in der Vergleichsanzeige, wenn die Länge einer Zeile die Breite des Fensters überschreitet. + Fenster A/B/C anzeigen:Manchmal möchte man den verfügbaren Platz auf dem Bildschirm lieber für lange Zeilen benutzen. Blenden Sie einfach die weniger wichtigen Fenster aus. Diese Option befindet sich im Menü Fenster. + Ausrichtung der Fensterteilung umschalten:Ordnet die Vergleichsfenster nebeneinander oder übereinander an. Dies kann auch zum Anzeigen von langen Zeilen nützlich sein. Diese Option befindet sich im Menü Fenster. + Aktuelle Datei zusammenführen:Manchmal betrachten Sie die Unterschiede und entscheiden sich dann unvermittelt, die Dateien zusammenzuführen. Aktuelle Datei zusammenführen im Menü Zusammenführen funktioniert auch dann, wenn Sie nur zwei Dateien vergleichen. Ein einfacher Klick startet die Zusammenführung und benutzt den Dateinamen der letzten Quelldatei als voreingestellten Namen für die Ausgabedatei. Wenn diese Funktion benutzt wird, um das Zusammenführen erneut zu starten, dann wird der Name der zuletzt benutzten Ausgabedatei beibehalten. + + + +Kurzbefehle festlegen +Zurzeit unterstützt nur die Frameworks-Version benutzerdefinierbare Kurzbefehle (Menü: Einstellungen->Kurzbefehle festlegen ...) + + + +Vorverarbeitungsbefehle +&kdiff3; unterstützt zwei Vorverarbeitungsbefehle. + + Vorverarbeitungsbefehl:Beim Lesen einer Datei wird sie zuerst diesem externen Befehl übergeben. In &kdiff3; wird dann die Ausgabe des Befehls sichtbar, und nicht die Datei selbst. Sie können Ihren eigenen Vorverarbeitungsbefehle schreiben, die genau Ihre Ansprüchen erfüllen. Sie können diese Funktion z. B. zum Herausschneiden störender Teile oder zum Korrigieren der Einrückung verwenden. + Vorverarbeitungsbefehl nur für Zeilenabgleich:Beim Lesen einer Datei wird sie zuerst diesem externen Befehl übergeben. Wenn auch ein normaler Vorverarbeitungsbefehl angegeben wurde (siehe oben), dann ist die Ausgabe des Befehls die Eingabe dieses Vorverarbeitungsbefehls. Die Ausgabe des Befehls wird nur beim Zeilenabgleich verwendet. Sie können Ihre eigenen Vorverarbeitungsbefehle schreiben, der genau Ihre Ansprüchen erfüllen. Jede Eingabe-Zeile muss eine zugehörige Ausgabe-Zeile haben. + + +Der Gedanke dahinter ist, dem Anwender mehr Flexibilität beim Einrichten der Diff-Ergebnisse zu ermöglichen. Doch dafür wird ein externes Programm benötigt, und die meisten Anwender möchten das nicht selbst programmieren. Die Gute Nachricht ist allerdings, dass in dem meisten Fällen sed oder perl vollkommen ausreichen. +Beispiel: Ein einfacher Testfall. Wie nehmen eine Datei a.txt (6 Zeilen): + aa + ba + ca + da + ea + fa + Und eine Datei b.txt (3 Zeilen): + cg + dg + eg + Ohne Vorverarbeitung würden die folgenden Zeilen nebeneinander stehen: + aa - cg + ba - dg + ca - eg + da + ea + fa + Dies ist allerdings nicht das gewünschte Ergebnis, weil der erste Buchstabe die interessante Information darstellt. Um den Suchalgorythmus beim Abgleich zu unterstützen, ignorieren wir den zweiten Buchstaben. Dazu kann folgende Zeilen-Vorverarbeitung verwendet werden, der g durch a ersetzt: + sed 's/g/a/' + Mit diesem Befehl würde das Ergebnis so aussehen: + aa + ba + ca - cg + da - dg + ea - eg + fa + Programmintern sieht der Vergleichsalgorythmus die Dateien erst nach dem Durchlauf de Zeilen-Vorverarbeitung, auf dem Bildschirm jedoch erscheinen die Dateien unverändert. (Die normale Vorverarbeitung würde auch die Daten auf dem Bildschirm ändern.) + +<command +>sed</command +>-Grundlagen +Dieser Abschnitt führt Sie nur in einige sehr grundlegende Funktionen von sed ein. Weiterführende Informationen finden Sie unter info:/sed oder http://www.gnu.org/software/sed/manual/html_mono/sed.html. Eine vorkompilierte Version für Windows finden Sie unter http://unxutils.sourceforge.net. Beachten Sie, dass die folgenden Beispiele voraussetzen, dass der Befehl sed sich in einem Ordner in der PATH-Variable befindet. Falls das nicht der Fall sein sollte, müssen Sie den vollständigen Pfad zu sed angeben. +In diesem Kontext wird nur der sed-Substitute-Befehl benutzt: + sed 's/REGEXP/ERSATZ/SCHALTER' + Bevor Sie in &kdiff3; einen neuen Befehl benutzen, sollten Sie ihn zuerst in der Konsole testen. Hier kann der echo-Befehl sehr hilfreich sein. Beispiel: + echo abrakadabra | sed 's/a/o/' + -> obrakadabra + Dieses Beispiel zeigt einen einfachen sed-Befehl, der das erste Vorkommen von a durch o ersetzt. Wenn Sie alle Vorkommen ersetzen möchten, müssen Sie den Schalter g benutzen: + echo abrakadabra | sed 's/a/o/g' + -> obrokodobro + Das |-Symbol ist der Pipe-Befehl, er übergibt die Ausgabe des ersten Befehls an die Eingabe des folgenden Befehls. Wenn Sie Ihren sed-Befehl mit einer längeren Datei testen möchten, dann können Sie unter Unix cat und unter Window type dazu benutzen. sed wird die Ersetzung in jeder Zeile der Datei durchführen. cat dateiname | sed optionen + + + +Beispielanwendungen von <command +>sed</command +> in &kdiff3; +Ignorieren weiterer Kommentartypen +Zurzeit unterstützt &kdiff3; nur C/C++-Kommentare. Mit Hilfe des Vorverarbeitungsbefehl nur für Zeilenabgleich können Sie auf andere Kommentar-Arten unterstützen. Dafür wandeln Sie diese in C/C++-Kommentare um. Beispiel: Um Kommentare zu ignorieren, die mit # beginnen, würden Sie diese zu // umwandeln. Außerdem muss natürlich die Option C/C++-Kommentare ignorieren aktiviert sein damit dies etwas bewirkt. Ein passender Befehl für den Vorverarbeitungsbefehl nur für Zeilenabgleich wäre zum Beispiel: + sed 's/#/\/\//' + Weil das Zeichen / für sed ein Sonderzeichen ist, muss jedem / ein \ vorangestellt werden. Manchmal wird dies benötigt, um einem Sonderzeichen die besondere Bedeutung zu entziehen. Die einfachen Anführungszeichen (') sind nur beim Testen auf der Befehlszeile wichtig, weil die Shell sonst versucht, einige Zeichen zu verarbeiten. In KDiff3 werden nur die Escape-Sequenzen wie '\"' und '\\' verarbeitet. + +Diff ohne Beachtung der Groß-/ Kleinschreibung +Verwenden Sie diesen Vorverarbeitungsbefehl für Zeilenabgleich um die Eingabe in Großbuchstaben umzuwandeln: + sed 's/\(.*\)/\U\1/' + Das .* ist ein regulärer Ausdruck, der auf jede Zeichenkette passt und in diesem Zusammenhang daher alle Zeichen in einer Zeile erfasst. Die \1 in der Ersetzungs-Zeichenkette bezieht sich auf den gefundenen Text im ersten Klammerpaar. Das \U wandelt den gefundenen Text in Großbuchstaben um. + + +Ignorieren von Schlüsselwörtern aus Versionskontrolle-Systemen +CVS und andere Versionskontrolle-Systeme verwenden einige Schlüsselwörter, um automatisch erzeugte Zeichenketten einzufügen (info:/cvs/Keyword substitution). Alle folgen demselben Muster $SCHLÜSSELWORT erzeugter Text$. Nun wird also ein Vorverarbeitungsbefehl für Zeilenabgleich benötigt, der den automatisch erzeugten Text entfernt: + sed 's/\$\(Revision\|Author\|Log\|Header\|Date\).*\$/\$\1\$/' + Das \| trennt die möglichen Schlüsselwörter. Sie können die Liste nach Bedarf ändern. Das \ vor dem $ ist nötig, weil $ ein Sonderzeichen ist und Ende der Zeile bedeuten würde. +Während Sie mit sed experimentieren, beginnen Sie vielleicht, es zu verstehen und vielleicht mögen Sie diese regulären Ausdrücke sogar. Sie sind sehr nützlich weil es viele Programme gibt, die sehr ähnliche Dinge unterstützen. + + +Ignorieren von Zahlen +Das Ignorieren von Zahlen ist eigentlich eine bereits eingebaute Funktion in KDiff3. Aber sie ist gut als Beispiel für einen weiteren Vorverarbeitungsbefehl für Zeilenabgleich geeignet. + sed 's/[0123456789.-]//g' + Jedes Zeichen zwischen '[' und ']' ist eine Übereinstimmung, und jede Übereinstimmung wird durch nichts ersetzt, also quasi gelöscht. + + +Ignorieren von bestimmten Spalten +Manchmal ist ein Text nach strengen Regeln formatiert und enthält Spalten, die Sie grundsätzlich ignorieren möchten, und andere Spalten, die Sie für die Analyse heranziehen möchten. Im folgenden Beispiel werden die ersten fünf Spalten (Zeichen) ignoriert, dann 10 Spalten beibehalten, dann wieder fünf Spalten ignoriert und der Rest der Zeile wird beibehalten. + sed 's/.....\(..........\).....\(.*\)/\1\2/' + Jeder Punkt '.' passt auf genau ein Zeichen. Die \1 und \2 in der Ersetzungs-Zeichenkette beziehen sich auf den gefundenen Text im ersten und zweiten Klammerpaar und markieren so den beizubehaltenden Text. + + +Mehrere Ersetzungen kombinieren +Manchmal möchten Sie vielleicht mehrere Ersetzungen auf einmal durchführen. Dann können Sie das Semikolon „;“ benutzen, um die Ersetzungen voneinander zu trennen. Beispiel: echo abrakadabra | sed 's/a/o/g;s/\(.*\)/\U\1/' + -> OBROKODOBRO + + + + +<command +>perl</command +> statt <command +>sed</command +> benutzen +Statt sed können Sie auch etwas anderes wie z. B. perl verwenden. + perl -p -e 's/REGEXP/ERSETZUNG/SCHALTER' + Allerdings sind bei perl einige Details anders. Wo sed \( und \) benötigt, braucht perl nur noch ( und ) ohne das vorangestellte '\'. Beispiel: sed 's/\(.*\)/\U\1/' + perl -p -e 's/(.*)/\U\1/' + + + + + +Reihenfolge der Ausführung von Vorverarbeitungsbefehlen +Die Daten werden durch interne und externe Vorverarbeitungsbefehle in dieser Reihenfolge durchgeschleust: + +Normale Vorverarbeitungsbefehle, +Vorverarbeitungsbefehl für Zeilenabgleich, +Groß-/Kleinschreibung ignorieren (Umwandlung in Großbuchstaben), +Erkennung von C/C++ Kommentaren, +Zahlen ignorieren, +Leerräume ignorieren + +Die Daten nach der normalen Vorverarbeitung werden für die Anzeige und zum Zusammenführen beibehalten. Die weiteren Operationen verändern nur die Daten, die der Zeilenabgleich-Algorithmus sieht. Beachten Sie: In seltenen Fällen wenn Sie einen normalen Vorverarbeitungsbefehlverwenden, sieht der Zeilenabgleich-Vorverarbeitung die Ausgabe der normalen Vorverarbeitung als Eingabe. + + +Warnung +Die Vorverarbeitungsbefehle sind sehr nützlich, aber wie bei jeder Funktion, die Text verändert oder Unterschiede ausblendet, können Sie versehentlich bestimmte Unterschiede nicht bemerken und im schlimmsten Fall wichtige Daten zerstören. Beim Zusammenführen werden Sie daher von &kdiff3; gewarnt, falls ein Vorverarbeitungsbefehl benutzt wurde. Sie werden gefragt, ob dieser deaktiviert werden soll oder nicht. Sie werden allerdings nicht gewarnt, wenn ein Vorverarbeitungsbefehl für den Zeilenabgleich benutzt wird. Das Zusammenführen ist nicht abgeschlossen bevor nicht alle Konflikte aufgelöst wurden. Falls Sie Leerräume anzeigen deaktiviert haben, dann sind die vom Zeilenabgleich-Vorverarbeitung entfernten Unterschiede ebenfalls unsichtbar. Wenn der Knopf Speichern während des Zusammenführens deaktiviert bleibt (durch nicht aufgelöste Konflikte), dann aktivieren Sie Leerräume anzeigen. Falls diese weniger wichtigen Unterschiede nicht zusammengeführt werden sollen, können Sie auch Für alle ungelöste Konflikte A/B/C wählen im Menü Zusammenführen auswählen. + + + + + +Mit &kdiff3; Ordner vergleichen und zusammenführen +Einführung zum Ordnervergleich oder -zusammenführung +Oftmals müssen Programmierer in einem Ordner viele Dateien bearbeiten. Aus diesem Grund können Sie mit &kdiff3; komplette Ordner rekursiv vergleichen und zusammenführen. Auch wenn das Vergleichen und Zusammenführen von ganzen Ordnern recht naheliegend und einleuchtend erscheint, gibt es einige Details, die Sie wissen sollten. Der wichtigste Punkt ist natürlich, dass sich jeder Durchlauf dieser Funktion gleich auf viele Dateien auswirkt. Wenn Sie keine Sicherungskopie der Originaldaten haben, könnte es schwer oder gar unmöglich werden, den Originalstand wiederherzustellen. Bevor Sie das Zusammenführen starten, sollten Sie also sicherstellen, dass Ihre Daten gesichert sind und das Sie alles rückgängig machen können. Ob Sie ein Archiv erstellen oder ein System zur Versionskontrolle benutzen, ist Ihre Entscheidung; selbst erfahrene Programmierer und Integratoren benötigen hin und wieder die alten Quelltexte. Bitte beachten Sie auch, dass selbst ich (der Autor von &kdiff3;) keine Garantie geben kann, dass das Programm fehlerlos ist. Entsprechend der GNU-GPL gibt es für dieses Programm KEINE GARANTIE. Also denken Sie daran: +
+ Irren ist menschlich, aber um etwas wirklich durcheinander zu bringen braucht man schon einen Computer ;-) +
+All diese Dinge kann &kdiff3; für Sie erledigen: &kdiff3; ... + + ... liest und vergleicht rekursiv zwei oder drei Ordner, + ... behandelt symbolische Verknüpfungen besonders vorsichtig, + ... lässt Sie Ihre Dateien per Mausklick durchsuchen, + ... macht für jedes Objekt einen Vorschlag zum Zusammenführen; Sie können den Vorschlag vor dem Start anpassen, + ... kann das Zusammenführen simulieren und zeigt die simulierten Änderungen an, ohne sie wirklich durchzuführen, + ... führt letztendlich die Zusammenführung durch und lässt Sie (wenn nötig) eingreifen, + ... führt ausgewählte Aktionen entweder mit allen (F7-Taste), oder nur mit den ausgewählten Objekten (F6-Taste) aus, + ... setzt das Zusammenführen nach einem manuellen Eingriff fort (F7-Taste), + ... erzeugt optional Sicherungskopien mit der Erweiterung.orig, + ... + + + +Ordnervergleich oder -zusammenführung starten +Dies ist dem Vergleichen und Zusammenführen von einzelnen Dateien sehr ähnlich. Sie müssen nur Ordner auf der Befehlszeile oder im Dialog Datei öffnen angeben. +Vergleichen/Zusammenführen von zwei Ordnern: +kdiff3 Ordner1 Ordner2 + kdiff3 Ordner1 Ordner2 -o Zielordner + +Wenn kein Zielordner angegeben wurde, benutzt &kdiff3; Ordner2. + + +Vergleichen/Zusammenführen von drei Ordnern: +kdiff3 Ordner1 Ordner2 Ordner3 + kdiff3 Ordner1 Ordner2 Ordner3 -o Zielordner + +Wenn drei Ordner zusammengeführt werden, dann wird Ordner1 als Basis benutzt. Wenn kein Zielordner angegeben wurde, verwendet &kdiff3; Ordner3 als Zielordner. + +Beachten Sie, dass nur der Vergleich von Ordnern automatisch startet, nicht das Zusammenführen. Um das Zusammenführen zu starten, müssen Sie den entsprechenden Menüeintrag auswählen oder die F7-Taste drücken. (Weitere Details folgen.) + + + +Angezeigte Informationen über Ordnerzusammenführung +Während dem Einlesen der Ordner informiert Sie ein kleines Nachrichtenfenster über den aktuellen Fortschritt. Wenn Sie das Scannen der Ordner abbrechen, werden nur die Dateien aufgelistet, die bis dahin verglichen wurden. Wenn das Scannen der Ordner abgeschlossen ist, zeigt &kdiff3; ein Listenfenster mit den Ergebnissen auf der linken Seite, ... + + + +... und den Details zu dem jeweils ausgewählten Objekt auf der rechten Seite: + + + + + +Die Spalte <quote +>Name</quote +> +Jede Datei und jeder Ordner, die beim Verarbeiten gefunden wurde, wird hier in einem Baum dargestellt. Sie können ein Objekt mit einem einfachen Mausklick auswählen. Die Ordnerstruktur wird normalerweise zusammengeklappt dargestellt. Sie können einen Ordner aufklappen, indem Sie auf das +/- klicken, oder auf das Objekt doppelklicken oder indem Sie die Pfeiltasten für links/rechts benutzen. Das Menü Ordner enthält zwei Funktionen Alle Unterordner einklappen und Alle Unterordner aufklappen mit denen Sie alle Ordner auf- bzw. zuklappen können. Wenn Sie auf eine Datei doppelklicken, wird der Dateivergleich gestartet und es erscheint ein Vergleichsfenster. +Das Symbol in der Spalte Name spiegelt den Dateityp im ersten Ordner (A) wieder. Diese Typen sind möglich: + + Normale Datei + Normaler Ordner (Ordner-Symbol) + Verknüpfung zu einer Datei (Datei-Symbol mit einem Verknüpfungs-Pfeil) + Verknüpfung auf einen Ordner (Ordner-Symbol mit einem Verknüpfungs-Pfeil) + +Wenn der Dateityp in den anderen Ordnern unterschiedlich ist, dann ist dies in den Spalten A/B/C und in dem Detailfenster zu dem ausgewählten Objekt sichtbar. In einem solchen Fall kann die Zusammenführungsaktion nicht automatisch gewählt werden. Wenn das Zusammenführen gestartet wird, werden Sie über Probleme dieser Art nochmals informiert. + + +Die Spalten A/B/C und das Farbschema +Wie in dem obigen Bild zu sehen ist, werden in den Spalten A/B/C die Farben Rot, Grün, Gelb und Schwarz verwendet. + + Schwarz: Dieser Eintrag existiert nicht in diesem Ordner. + Grün: Neuester Eintrag. + Gelb: Älter als grün, neuer als rot. + Rot: Ältester Eintrag. + +Bei identischen Einträgen ist die Farbe allerdings auch identisch, auch wenn das Alter der Einträge unterschiedlich ist. Ordner werden als identisch betrachtet, wenn ihr gesamter Inhalt identisch ist. Dann haben auch Ordner die gleiche Farbe. Bei Ordnern ist das Alter unerheblich für seine Farbe. Die Idee zu diesem Farbschema basiert auf dirdiff. Die Farben spiegeln die Farben eines Blattes wieder, welches erst grün ist, dann gelb wird und später, wenn es alt ist, rot wird. + +Die Aktions-Spalte +Nach dem Vergleichen der Ordner schlägt &kdiff3; eine Zusammenführungsaktion vor. Dieser Vorschlag wird in der Aktions-Spalte angezeigt. Sie können den Vorschlag ändern, indem Sie auf den entsprechenden Eintrag klicken. Daraufhin erscheint ein kleines Menü, in dem Sie eine Aktion auswählen können. Die häufigsten Aktionen können Sie auch mit der Tastatur auswählen. Strg+1/2/3/4/Entf wählt entsprechend A/B/C/Zusammenführen/Löschen aus. Die Aktion wird dann während des Zusammenführens ausgeführt. Welche Aktionen möglich sind, hängt von dem Eintrag und dem aktuellen Zusammenführungs-Modus ab. Mögliche Zusammenführungs-Modi sind + + Drei-Ordner-Zusammenführen (A wird als die ältere Basis für die beiden anderen herangezogen). + Zwei-Ordner-Zusammenführen. + Zwei-Ordner-Abgleich-Modus (aktivieren Sie diesen Modus mit der Option Ordner abgleichen). + +Beim Zusammenführen von drei Ordnern sind diese Aktions-Vorschläge möglich: Wenn für ein Objekt... + + ... alle drei Ordner identisch sind: Kopieren von C + ... A und C identisch sind, aber nicht B: Kopieren von B (oder falls B nicht existiert, löschen des Ziels, falls es existiert) + ... A und B identisch sind, aber nicht C: Kopieren von C (oder falls C nicht existiert, löschen des Ziels, falls es existiert) + ... B und C identisch sind, aber nicht A: Kopieren von C (oder falls C nicht existiert, löschen des Ziels, falls es existiert) + ... nur A existiert: Löschen des Ziels (falls es existiert) + ... nur B existiert: Kopieren von B + ... nur C existiert: Kopieren von C + ... A, B und C nicht identisch sind: Zusammenführen + ... A, B und C nicht den gleichen Dateityp haben (z. B. wenn A ein Ordner und B eine Datei ist): Fehler: Konflikt der Dateitypen. Solange solche fehlerhaften Objekte existieren, kann das Zusammenführen nicht gestartet werden. + +Beim Zusammenführen von zwei Ordnern sind diese Aktions-Vorschläge möglich: Wenn für ein Objekt... + + ... beide Ordner gleich sind: Kopieren von B + ... A existiert, aber nicht B: Kopieren von A + ... B existiert, aber nicht A: Kopieren von B + ... A und B existieren aber nicht identisch sind: Zusammenführen + ... A und B nicht den gleichen Dateityp haben (z. B. wenn A ein Ordner und B eine Datei ist): Fehler: Konflikt der Dateitypen. Solange solche fehlerhaften Objekte existieren, kann das Zusammenführen nicht gestartet werden. + +Der Modus zum Abgleich ist aktiv, wenn nur zwei Ordner und kein expliziter Zielordner angegeben wurden und wenn die Option Ordner abgleichen aktiv ist. Dann wählt &kdiff3; die nötige Aktion aus, damit nachher beide Ordner identisch sind. Wenn für einen Eintrag ... + + ... beide Ordner identisch sind: Es wird nichts unternommen. + ... A existiert, aber nicht B: Kopieren von A nach B + ... B existiert, aber nicht A: Kopieren von B nach A + ... A und B existieren, aber nicht identisch sind: Zusammenführen und das Ergebnis in beiden Ordnern speichern. (Der Anwender sieht als sichtbaren Dateinamen für die Ausgabedatei nur B; direkt nach dem Zusammenführen kopiert &kdiff3; B nach A.) + ... A und B nicht den gleichen Dateityp haben (z. B. wenn A ein Ordner und B eine Datei ist): Fehler: Konflikt der Dateitypen. Solange solche fehlerhaften Objekte existieren, kann das Zusammenführen nicht gestartet werden. + +Wenn zwei Ordner zusammengeführt werden und die Option Neuere Datei statt Zusammenführung auswählen (unsicher) aktiviert ist, dann untersucht &kdiff3; das Datum der Dateien und schlägt die neuere Datei zum Kopieren vor. Wenn die Dateien unterschiedlich sind, aber das gleiche Datum aufweisen, dann erscheint eine Fehlermeldung Fehler: Gleiches Datum, aber unterschiedliche Dateien.. Solange solche Fehler nicht beseitigt sind, kann das Zusammenführen der Ordner nicht gestartet werden. + + +Die Status-Spalte +Während des Zusammenführens wird eine Datei nach der anderen abgearbeitet. Sie Status-Spalte zeigt Fertig an, wenn das Zusammenführen erfolgreich war, und entsprechend andere Meldungen, wenn etwas Unerwartetes auftrat. Wenn das Zusammenführen abgeschlossen ist, sollten Sie eine letzte Überprüfung vornehmen und nachsehen, ob der Status aller Einträge in Ordnung ist. + + +Die Statistik-Spalte +Wenn im Einrichtungsdialog die Dateivergleichsmethode Vollständige Analyse gewählt ist, wird &kdiff3; weitere Spalten anzeigen. Diese enthalten die Anzahl ungelöster, gelöster, Nicht-Leerraum- und Leerraum-Konflikte. Die Spalte für gelöste Konflikte wird nur angezeigt, wenn drei Ordner verglichen oder zusammengeführt werden. + + +Auswahl angezeigter Dateien +Mehrere Einstellungen beeinflussen, welche Dateien hier angezeigt werden. Einige dieser Optionen finden Sie im Einrichtungsdialog. Das Menü Ordner enthält folgende Aktionen: + Identische Dateien anzeigen: Dateien, die in allen Eingabeordnern gleich sind + Unterschiedliche Dateien anzeigen: Dateien, die unterschiedlich und in zwei oder mehreren Ordnern vorhanden sind + Dateien anzeigen, die nur in A existieren: Dateien, die in A, aber nicht in B oder C vorhanden sind. + Dateien anzeigen, die nur in B existieren: Dateien, die in B, aber nicht in A oder C vorhanden sind. + Dateien anzeigen, die nur in C existieren: Dateien, die in C, aber nicht in A oder B vorhanden sind. + +Aktivieren Sie nur die Anzeige-Optionen für die Einträge, die aufgeführt werden sollen. Wenn Sie zum Beispiel nur alle Einträge zeigen möchten, die entweder nur in A oder B vorhanden sind, müssen Sie „Dateien anzeigen, die nur in A existieren“ und „Dateien anzeigen, die nur in B existieren“ aktivieren und alle anderen Einstellungen („Identische Dateien anzeigen“, „Unterschiedliche Dateien anzeigen“, „Dateien anzeigen, die nur in C existieren“) ausschalten. Die Anzeige wird bei diesen Änderungen sofort aktualisiert. Diese Einstellungen treffen auch mit einer Ausnahme für Ordner zu. Das Abschalten von „Unterschiedliche Dateien anzeigen“ blendet keine vollständigen Ordner aus. Dies funktioniert nur für die Dateien in Ordnern. Beachten Sie, das von diesen Einstellungen nur die Auswahl von „Identische Dateien anzeigen“ beim Beenden gespeichert wird und daher beim nächsten Start wieder auf den gleichen Wert gesetzt ist. Alle anderen Einstellungen sind beim Start von &kdiff3; aktiviert. + + + + + +Ordnerzusammenführung +Sie können entweder den gerade ausgewählten Eintrag (Datei oder Ordner) zusammenführen, oder alle Einträge auf einmal. Wenn Sie alle Zusammenführungsaktionen ausgewählt haben (auch in allen Unterordnern), können Sie das Zusammenführen starten. Beachten Sie bitte: Wenn Sie keinen Zielordner angegeben haben, dann wird im Modus Drei-Ordner-Zusammenführen C als Ziel benutzt, beim Zwei-Ordner-Zusammenführen wird B als Ziel gewählt und beim Abgleichen wird A und/oder B als Ziel verwendet. Wenn Sie einen Zielordner ausgewählt haben, prüfen Sie bitte nachher, ob alle Einträge die im Zielordner sein sollten, auch in der Ordnerstruktur angezeigt werden. Es gibt einige Optionen durch die bestimmte Einträge übersprungen werden könnten. Überprüfen Sie diese Optionen um unliebsame Überraschungen zu vermeiden: + + Unterordner einbeziehen: Wenn diese Option deaktiviert ist, werden keine Dateien in Unterordnern bearbeitet. + Datei-Muster/Datei-Ausschlussmuster: Ein-/ und Ausschließen auf das Muster passender Einträge + Versteckte Dateien und Ordner einbeziehen + "Anzeige"-Optionen (Identische/Unterschiedliche Dateien anzeigen, Dateien anzeigen, die nur in A/B/C existieren) + +Wenn Sie die Einstellungen ändern, um mehr Dateien anzuzeigen, müssen die Anzeige mit OrdnerNeu einlesen aktualisieren. Die Grund dafür ist, dass &kdiff3; für diese auf Grund der Kriterien ausgeschlossenen Dateien keinen Vergleich ausführt, um schneller zu arbeiten. Wenn Sie die Muster für Dateien und Ordner geändert haben, wird die Dateiliste beim Schließen des Einstellungsdialogs sofort aktualisiert. Beachten Sie, dass beim Schreiben in einen vollständig neuen Ordner normalerweise auch die identischen Dateien kopiert werden sollen.Aktivieren Sie dafür die Einstellung Identische Dateien anzeigen. Ist der Zielordner eines der Eingabefenster, so ist dies nicht erforderlich, da die Dateien bereits vorhanden sind. Wenn Sie soweit zufrieden sind, ist der Rest einfach. Um alle Einträge zusammenzuführen: Wählen Sie Ordnerzusammenführung starten/fortsetzen im Ordner oder drücken Sie F7 (das Tastenkürzel). Um nur den aktuellen Eintrag zusammenzuführen: Wählen Sie Aktion des aktuellen Elements ausführen oder drücken Sie F6. Wenn durch widersprüchliche Dateitypen immer noch ungültige Zusammenführungsaktionen existieren, erscheint eine Meldung die auf die fehlerhaften Elemente hinweist. Sie können für sie dann eine gültige Aktion auswählen. Wenn Sie alle Einträge zusammenführen, erscheint ein Dialogfenster mit den Optionen Start, Simulieren und Abbrechen. + + Wählen Sie Simulieren wenn Sie erst sehen möchten, was passiert, ohne das wirklich Änderungen vorgenommen werden. Sie erhalten dann eine ausführliche Liste aller Aktionen. + Ansonsten klicken Sie auf Start, um das Zusammenführen wirklich zu beginnen. + +&kdiff3; führt dann bestimmte Aktionen mit allen Einträgen durch. Wenn ein manueller Eingriff nötig ist (zusammenführen einer einzelnen Datei), dann öffnet sich ein Zusammenführen-Fenster (beachten Sie das Bildschirmfoto). Wenn Sie mit dem manuellen Zusammenführen einer Datei fertig sind, wählen Sie erneut Ordnerzusammenführung starten/fortsetzen oder drücken Sie F7. Wenn Sie noch nicht gespeichert haben, erscheint ein entsprechender Dialog. Dann führt &kdiff3; seine Arbeit mit dem nächsten Eintrag fort. Wenn &kdiff3; auf einen Fehler stösst, erscheint eine Nachricht und ausführliche Status-Informationen. Am Schluss der Liste sehen Sie einige Fehlermeldungen, die Ihnen helfen sollen, die Ursache des Problems auszumachen. Wenn Sie das Zusammenführen fortsetzen (F7-Taste), lässt &kdiff3; Ihnen die Wahl es erneut zu versuchen, oder den problematischen Eintrag zu überspringen. So haben Sie die Möglichkeit, eine andere Aktion für den Eintrag auszuwählen oder das Problem auf andere Weise zu lösen, bevor Sie mit dem Zusammenführen fortfahren. &kdiff3; informiert Sie mit einem Nachrichten-Fenster, wenn das Zusammenführen abgeschlossen ist. Falls einige Einträge individuell zusammengeführt wurden, merkt sich &kdiff3; diese Einträge in der aktuellen Sitzung und führt sie beim späteren Zusammenführen aller Einträge nicht nochmals zusammen. Selbst wenn hier das Zusammenführen übersprungen wurde oder nicht gespeichert wurde, werden diese Einträge als erledigt betrachtet. Nur wenn Sie die Zusammenführungsaktion ändern, werden diese Einträge erneut zusammengeführt. + + +Optionen zum Vergleichen und Zusammenführen von Ordnern +Der Einrichtungsdialog von &kdiff3; (Menü Einstellungen->&kdiff3; einrichten ...) hat nun eine Seite namens Ordner mit diesen Optionen: + + + Unterordner einbeziehen:Stellen Sie ein, ob Ordner rekursiv durchsucht werden sollen. + Datei-Muster:Nur Dateien, die auf das angegebene Muster passen, werden im Elementbaum angezeigt. Es können mehrere Muster eingegeben werden. Trennen Sie die Muster mit einem Semikolon ;. Gültige Platzhalter sind:* und ?. (z. B. *.cpp;*.h). Die Voreinstellung ist *. Dieses Muster wird nicht für Ordner verwendet. + Datei-Ausschlussmuster:Dateien und Ordner, die diesem Muster entsprechen, werden nicht im Elementbaum angezeigt. Es kann mehr als ein Muster eingegeben werden, benutzen Sie das Semikolon ; als Trennzeichen . Gültige Platzhalter sind:* und ?. Voreinstellung ist *.orig;*.o;*.obj. + Ordner-Ausschlussmuster:Ordner, die diesem Muster entsprechen, werden nicht im Elementbaum angezeigt. Es kann mehr als ein Muster eingegeben werden, benutzen Sie das Semikolon ; als Trennzeichen . Gültige Platzhalter sind:* und ?. Voreinstellung ist CVS;deps;.svn. + .cvsignore verwenden:Ignoriert Dateien, die auch von CVS ignoriert werden würden. Viele automatisch erzeugte Dateien werden von CVS ignoriert. Der große Vorteil ist, dass dies für jeden Ordner mit einer lokalen .cvsignore-Datei eingestellt werden kann. (Weitere Informationen unter info:/cvs/cvsignore.) + Versteckte Dateien und Ordner einbeziehen:In einigen Dateisystemen haben Dateien ein Attribut Versteckt. In anderen Dateisystemen markiert ein vorangestellter Punkt . eine Datei als versteckt. Mit dieser Option können Sie festlegen, ob diese Dateien im Elementbaum angezeigt werden sollen oder nicht. Diese Option ist in der Voreinstellung eingeschaltet. + Datei-Verknüpfungen folgen:Bei Verknüpfungen auf Dateien: Wenn die Option abgeschaltet ist, werden symbolische Verknüpfungen verglichen. Wenn die Option eingeschaltet ist, werden die Dateien verglichen, auf die die Links zeigen. Dies ist in der Voreinstellung deaktiviert. + Ordner-Verknüpfungen folgen:Bei Verknüpfungen auf Ordner: Wenn die Option abgeschaltet ist, werden die symbolischen Verknüpfungen verglichen. Wenn die Option eingeschaltet ist, werden die Verknüpfungen wie normale Ordner behandelt und rekursiv durchsucht. Beachten Sie, dass &kdiff3; nicht auf mögliche Rekursionen prüft. Eine Verknüpfung auf einen Ordner, der eine Verknüpfung auf sich selbst enthält, führt zu einer Endlosschleife und &kdiff3; stürzt ab. Diese Option ist in der Voreinstellung abgeschaltet. + Groß-/Kleinschreibung bei Dateinamen:Unter Windows ist diese Einstellung standardmäßig deaktiviert und unter allen anderen Betriebssystemen aktiviert. + Dateivergleichsmethode: + + Binärvergleich:Dies ist die voreingestellte Vergleichsmethode. + Vollständige Analyse:Führt eine vollständige Analyse jeder Datei durch und zeigt die Statistik-Spalten an. (Die Anzahl gelöster, ungelöster, Nicht-Leerraum-Konflikte.) Die vollständige Analyse ist langsamer als eine einfache binäre Analyse, und wesentlich langsamer, wenn sie auf Dateien angewendet wird, die keinen Text enthalten. Geben Sie ein entsprechendes Auschlussmuster ein. + Änderungsdatum vertrauen (unsicher)Wenn Sie große Ordner über ein langsames Netzwerk vergleichen, geht es möglicherweise schneller, nur das Änderungsdatum und die Dateigröße zu vergleichen. Dieser Geschwindigkeitsvorteil kostet Sie allerdings ein gewisses Maß an Sicherheit. Bitte mit Vorsicht benutzen. Diese Option ist in der Voreinstellung abgeschaltet. + Größe vertrauen (unsicher)Ähnlich wie Änderungsdatum vertrauen. Es findet kein echter Vergleich statt. Die Dateien werden als identisch betrachtet, wenn sie gleich groß sind. Das kann z. B. nützlich sein, wenn beim Kopieren das Änderungsdatum verlorengegangen ist. Bitte mit Vorsicht benutzen. Diese Option ist in der Voreinstellung abgeschaltet. + + + Ordner abgleichen:Aktiviert den Synchronisieren-Modus wenn zwei Ordner verglichen werden und kein Zielordner angegeben wurde. In diesem Modus werden die Vorschläge zum Zusammenführen so ausgewählt, dass nachher beide Ordner identisch sind. Auch die Ergebnisse vom Zusammenführen von Dateien werden in beiden Ordnern gespeichert. Diese Option ist in der Voreinstellung abgeschaltet. + Neuere Datei statt Zusammenführung auswählen (unsicher):Falls es Unterschiede gibt, wird statt des Zusammenführens das Kopieren der neueren Datei als Aktion vorgeschlagen. Dies wird als unsicher betrachtet, denn es wird das Wissen vorausgesetzt, dass die andere Datei nicht auch verändert wurde. Sie sollten dies in jedem Fall prüfen. Diese Option ist in der Voreinstellung abgeschaltet. + Sicherungskopie erstellen (.orig):Wenn eine Datei oder ein Ordner ersetzt oder gelöscht wird, dann wird die Originalversion umbenannt und erhält die Erweiterung .orig. Wenn eine alte Sicherungsdatei mit der Erweiterung .orig bereits existiert, so wird diese ohne weitere Sicherung gelöscht. Das betrifft auch das normale Zusammenführen einzelner Dateien, nicht nur das Zusammenführen ganzer Ordner. Diese Option ist in der Voreinstellung eingeschaltet. + + + +Weitere Funktionen im Fenster Ordnerzusammenführung +Ordner- & Textansicht teilen sich Hauptfenster +Normalerweise bleibt die Ansicht der Ordner-Zusammenführen während der Zusammenführung einzelner Dateien sichtbar. Sie können den Fensterteiler mit der Maus verschieben. Wenn Sie das nicht wollen, können Sie die Option Ordner- Textansicht teilen sich Hauptfenster im Fenster-Menü abschalten und mittels Zwischen Ordner- & Textansicht umschalten zwischen den beiden Ansichten umschalten. + +Vergleichen und Zusammenführen einer einzelnen Datei +Wahrscheinlich bevorzugen Sie, eine Datei einfach mittels Doppelklick zu vergleichen. Dennoch gibt es im Menü Ordner auch einen entsprechenden Menüeintrag. Sie können eine einzelne Datei auch direkt zusammenführen, ohne erst die Ordnerzusammenführen starten zu müssen. Dazu benutzen Sie die Funktion Aktuelle Datei zusammenführen aus dem Menü Zusammenführen. Sobald Sie das Ergebnis speichern, wird der Status auf Erledigt gesetzt und die Datei wird nicht nochmals zusammengeführt, wenn Sie das Ordnerzusammenführen starten. Dieser Status geht allerdings verloren, wenn Sie den Ordner erneut einlesen: Menü Ordner -> Neu einlesen + +Vergleichen und Zusammenführen von Dateien mit verschiedenen Namen +Manchmal möchten Sie Dateien mit unterschiedlichen Namen vergleichen oder zusammenführen, ⪚ die aktuelle Datei und eine Sicherungsdatei im selben Ordner. Wählen Sie die Dateien, indem Sie auf das Symbol in der Spalte A, B oder C klicken. Die erste ausgewählte Datei wird mit „A“ und die zweite und dritte mit „B“ und „C“ gekennzeichnet, unabhängig von der Spalte, in der sie sich befinden. Nur bis zu drei Dateien können auf diese Art ausgewählt werden. Wählen Sie dann „Explizit ausgewählte Dateien vergleichen“ oder „Explizit ausgewählte Dateien zusammenführen“ aus dem Menü „Ordner“. Diese Einträge sind auch im Kontextmenü enthalten, das Sie mit Klicken der &RMBn; auf die zuletzt ausgewählte Datei öffnen können. Der Vergleich oder die Zusammenführung einer Datei erfolgt im gleichen Fenster. Wird diese Methode auf Ordner angewendet, wird ein neues Fenster geöffnet. + + + + +Verschiedene Themen + +Netzwerktransparenz durch KIO-Eingabe-/Ausgabemodule +KIO-Ein-/Ausgabemodule +Die Frameworks-Bibliothek KIO unterstützt Netzwerktransparenz mit Hilfe von KIO-Ein-/Ausgabemodulen. &kdiff3; benutzt dies zum Einlesen von Dateien und Ordnern. Auf diese Weise können Sie Dateien und Ordner zum Öffnen angeben, die sich auf lokalen oder entfernten Rechnern befinden. Beispiel: +kdiff3 test.cpp ftp://ftp.weitweg.org/test.cpp + kdiff3 tar:/home/hacker/archiv.tar.gz/ordner ./ordner + + +Die erste Befehlszeile vergleicht eine lokale Datei mit einer Datei auf einem FTP-Server. Die zweite Befehlszeile vergleicht einen Ordner innerhalb eines komprimierten Archivs mit einem lokalen Ordner. Weitere interessante KIO-Slaves sind: + +Dateien aus dem WWW (http:), +Dateien von FTP (ftp:), +Verschlüsselte Dateiübertragung (fish:, sftp:), +Windows-Ressourcen (smb:), +Lokale Dateien (file:), + +Des weiteren wäre möglich (wenn auch weniger nützlich): + +Man-Pages (man:), +Info-Seiten (info:), + + + +Wie man eine URL schreibt +Eine URL hat eine andere Syntax als lokale Dateien und Ordner. Ein paar Dinge sollten Sie beachten: + +Ein Pfad kann relativ sein und . oder .. enthalten. Das ist mit URLs nicht möglich, diese sind immer absolut. Sonderzeichen müssen maskiert werden. (#->%23, Leerzeichen->%20, u.s.w.). Zum Beispiel hat eine Datei mit dem Namen /#foo# die URL file:/%23foo%23. Wenn eine URL nicht wie erwartet funktioniert, versuchen Sie erst mal, diese im Konqueror zu öffnen. + + + + +Fähigkeiten von KIO-Slaves +Netzwerktransparenz hat auch einen Nachteil: Nicht alle Ressourcen haben die gleichen Fähigkeiten. Manchmal aufgrund des Dateisystems auf dem Server, manchmal durch das verwendete Protokoll. Es folgt eine kurze Liste der Einschränkungen: + +Teilweise werden keine Verknüpfungen unterstützt. Oder es kann nicht unterschieden werden, ob ein Verknüpfung auf eine Datei oder einen Ordner zeigt. Dann wird immer eine Datei als Verknüpfungsziel angenommen. (ftp:, sftp:). Die Dateigröße kann nicht immer ermittelt werden. Eingeschränkte Unterstützung für Berechtigungen. Es gibt keine Möglichkeit, Berechtigungen oder Veränderungsdatum zu bearbeiten. Daher weichen die Berechtigungen oder das Veränderungsdatum vom Original ab. Beachten Sie hierzu die Option Größe vertrauen. Dies ist nur bei lokalen Dateien möglich. + + + + + +&kdiff3; als KPart-Komponente benutzen +&kdiff3; ist ein KPart-Komponente. Zurzeit ist die KParts::ReadOnlyPart-Schnittstelle eingebaut. Der hauptsächliche Verwendungszweck ist zurzeit als Unterschiede-Betrachter in KDevelop. KDevelop startet zuerst immer den eingebauten Unterschiede-Betrachter. Um &kdiff3; zu starten, drücken Sie die rechte Maustaste über dem Unterschiede-Betrachter und wählen dann In KDiff3Part anzeigen aus dem Kontextmenü. Normalerweise benötigt &kdiff3; zwei vollständige Eingabedateien. Wenn es allerdings als KPart-Komponente benutzt wird, nimmt &kdiff3; an, dass die Eingabedatei eine Patch-Datei im „Unified“-Format ist. Dann entnimmt &kdiff3; die Namen der Originaldateien aus der Patch-Datei. Mindestens eine der beiden Dateien muss existieren. Dann startet &kdiff3; das Programm patch um die fehlende Datei wiederherzustellen. Im &dolphin; können Sie auf eine Patch-Datei klicken und aus dem Kontextmenü Vorschau in-KDiff3Part auswählen. Beachten Sie bitte, dass das nicht funktioniert, wenn keine der Originaldateien existiert. Außerdem ist dies unzuverlässig, wenn sich die Originaldateien seit Erzeugung der Patch-Datei verändert haben. Wenn &kdiff3; als KPart-Komponente ausgeführt wird, unterstützt es nur das Vergleichen von zwei Dateien, eine sehr kleine Werkzeugleiste und Menü. Das Zusammenführen oder das Vergleichen von Ordnern wird im KPart-Modus nicht unterstützt. + + + +&kdiff3; für Git Diff und Merge benutzen +&kdiff3; kann für Git Diff und Merge verwendet werden. +Fügen Sie dazu die folgenden Zeilen in Ihre Datei gitconfig ein: +[diff] + tool = kdiff3 +[difftool "kdiff3"] + path = <path to kdiff3 binary in your system> +[difftool] + prompt = false + keepBackup = false + trustExitCode = false +[merge] + tool = kdiff3 +[mergetool] + prompt = false + keepBackup = false + keepTemporaries = false +[mergetool "kdiff3"] + path = <path to kdiff3 binary in your system +> + +Um dann den Unterschied zwischen zwei Commits anzuzeigen, verwenden Sie git difftool first_hash second_hash --tool=kdiff3 --cc some_file_in_the_git_tree +Um einen Zweig mit &kdiff3; zusammenzuführen, verwenden Sie git merge branch_name && git mergetool --tool=kdiff3 +Nach dem Auflösen von Konflikten beim Zusammenführen mit der normalen Vorgehensweise können Sie die Änderungen einspielen. + + + + +Fragen und Antworten +&reporting.bugs; &updating.documentation; + +Warum heißt das Programm &kdiff3;? Werkzeuge mit dem Namen KDiff und KDiff2 (nun heißt es Kompare) gibt es bereits. Außerdem weist der Name KDiff3 bereits darauf hin, dass es zusammenführen kann wie das Programm diff3 aus der Diff-Tool-Sammlung. + +Warum wurde KDiff3 unter der GPL lizenziert? Ich verwende GPL-Programme schon sehr lange und habe viel gelernt, indem ich in die Quellen anderer Programme geschaut habe. Dies ist mein Dankeschön an alle Programmierer die diesen Weg gegangen sind oder ihn mal so gehen werden. + +Einige Knöpfe und Funktionen fehlen. Was ist passiert? Sie haben das Programm aus den Quellen kompiliert und dabei vermutlich nicht den richtigen Präfix für die Installation angegeben. In der Voreinstellung wird &kdiff3; in /usr/local installiert, aber dann können die Ressourcen für die Benutzerschnittstellen nicht gefunden werden (z. B. kdiff3ui.rc). In der README-Datei finden Sie nähere Informationen zum richtigen Präfix. + +Häufig werden ähnliche, aber nicht identische Zeilen nebeneinander angezeigt, und manchmal nicht. Warum? Wenn nur die Anzahl an Leerräumen unterschiedlich ist, werden diese Zeilen erstmal als identisch behandelt; wenn jedoch auch nur ein Nicht-Leerraum unterschiedlich ist, wird die Zeile als nicht identisch behandelt. Wenn ähnliche Zeilen nebeneinander angezeigt werden, ist das tatsächlich Zufall, kommt aber leider häufig vor. Siehe auch Zeilen manuell ausrichten. + +Warum müssen alle Konflikte gelöst sein, bevor das Ergebnis gespeichert werden kann? Der Editor merkt sich für jeden Unterschied in den Dateien wo er beginnt und wo er endet. Das ist nötig, um einen Konflikt einfach durch das Klicken in den Quelltext und Auswählen des Knopfes A/B/C lösen zu können. Diese wichtige Information geht allerdings verloren, wenn das Ergebnis einfach als Textdatei gespeichert wird und es ist zuviel Aufwand, extra ein eigenes Dateiformat zu entwerfen, das diese Informationen speichern könnte. + +Wie kann ich die Ansichten für die Unterschiede und das Zusammenführen so abgleichen, dass in allen Ansichten die gleiche Textposition gezeigt wird? Klicken Sie in die Zusammenfassungs-Spalte links neben dem Text, weitere Informationen dazu finden Sie in diesem Abschnitt. + +Warum hat der Editor im Ergebnisfenster einer Zusammenführung keine Funktion Rückgängig? Der Aufwand dafür war bisher zu groß. Sie können eine bestimmte Version immer durch das Auswählen einer Quelle A/B/C wiederherstellen. Um größere Mengen an Text zu bearbeiten, sollte ein anderer Editor verwendet werden. + +Nach dem Entfernen von Text wird plötzlich <Keine Zeile in der Quelle> angezeigt und der Text lässt sich nicht löschen. Was bedeutet das und wie kann das entfernt werden? Der Editor merkt sich für jeden gleichen und unterschiedlichen Abschnitt Anfang und Ende. <No src line> bedeutet, dass in diesem Abschnitt nichts mehr existiert, noch nicht mal mehr das Zeichen für den Zeilenvorschub. So etwas kann beim automatischen Zusammenführen oder beim Editieren passieren und ist kein Problem, denn der Text erscheint nicht in der gespeicherten Datei. Wenn Sie den Originaltext wiederherstellen möchten, klicken Sie in den Abschnitt und wählen die korrekte Quelle A/B/C aus. + +Warum unterstützt &kdiff3; keine Syntax-Hervorhebung? &kdiff3; benutzt bereits viele Farben zum Hervorheben von Unterschieden. Noch mehr Hervorhebung wäre verwirrend und verfehlt den Zweck. Benutzen Sie dafür bitte einen anderen Editor. + +Kann ich &kdiff3; benutzen, um Dateien von OpenOffice.Org, Word, Excel, PDF-Dateien &etc; zu vergleichen? Obwohl &kdiff3; jede beliebige Datei analysiert, wird das Ergebnis Sie wahrscheinlich nicht zufrieden stellen. &kdiff3; wurde zum Vergleich von einfachen Textdateien entwickelt. OpenOffice, Word, Excel &etc; speichern viel mehr Informationen in den Dateien, zum Beispiel Schriften, Bilder, Seiten, Farben &etc; Diese Informationen kann &kdiff3; nicht verarbeiten. Daher zeigt &kdiff3; den Inhalt der Dateien als einfachen Text an. Diese Anzeige kann nicht lesbar sein oder zumindest seltsam aussehen. Da heute viele Programme den Inhalt von Dokumenten in Dateien im XML-Format abspeichern, können diese Dateien auch als einfacher Text gelesen werden. Bei kleinen Änderungen kann &kdiff3; immer noch hilfreich sein. Um nur den Text ohne eingebettete Objekte wie Bilder zu vergleichen, wählen Sie alles aus und kopieren dann den Text in die Zwischenablage. In &kdiff3; fügen Sie dann den Text in eins der Diff-Eingabefenster ein, siehe auch Auswahl, Kopieren und Einfügen. + +Wo ist die Option Nur Unterschiede anzeigen für Ordner geblieben? Es gibt jetzt mehrere Anzeige-Optionen im Menü Ordner. Deaktivieren Sie „Identische Dateien anzeigen“, das führt zum gleichen Ergebnis wie früher „Nur Unterschiede anzeigen“. + +Wie kann ich eine große Auswahl im Diff-Eingabefenster erstellen, wenn das Blättern so lange dauert? Starten Sie die Auswahl wie üblich durch Klicken und Halten der linken Maustaste. Benutzen Sie dann die Navigationstasten wie zum Beispiel „Bild ab“ oder „Bild auf“ und halten dabei die linke Maustaste gedrückt. Siehe auch Auswählen, Kopieren und Einfügen. + +Wird Ihre Frage hier nicht beantwortet? Bitte senden Sie mir Ihre Frage zu. Ich bin dankbar für jeden Kommentar. + + + + + + +Danksagungen und Lizenz + +&kdiff3; - Ein Programm zum Vergleichen und Zusammenführen von Dateien und Ordnern +Programm-Copyright 2002-2007 Joachim Eibl joachim.eibl at gmx.de +Viele gute Ideen und Fehlerberichte kamen von Kollegen und vielen Leuten aus dem Wild Wild Web. Vielen Dank! + +Dokumentation Copyright © 2002-2007 Joachim Eibl joachim.eibl at gmx.de + +Deutsche Übersetzung: Thomas Reitelbach tr@erdfunkstelle.de +&underFDL; &underGPL; + +&documentation.index; + + + diff -Nru kdiff3-1.8.01/po/de/kdiff3fileitemactionplugin.po kdiff3-1.8.3/po/de/kdiff3fileitemactionplugin.po --- kdiff3-1.8.01/po/de/kdiff3fileitemactionplugin.po 2019-05-18 01:01:54.000000000 +0000 +++ kdiff3-1.8.3/po/de/kdiff3fileitemactionplugin.po 2020-06-25 00:18:11.000000000 +0000 @@ -1,18 +1,18 @@ # Frederik Schwarzer , 2011, 2018. -# Burkhard Lück , 2013, 2018. +# Burkhard Lück , 2013, 2018, 2019. msgid "" msgstr "" "Project-Id-Version: kdiff3fileitemactionplugin\n" -"Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2019-03-22 03:09+0100\n" -"PO-Revision-Date: 2018-11-21 17:12+0100\n" +"Report-Msgid-Bugs-To: https://bugs.kde.org\n" +"POT-Creation-Date: 2019-08-30 07:40+0200\n" +"PO-Revision-Date: 2019-05-24 13:02+0200\n" "Last-Translator: Burkhard Lück \n" "Language-Team: German \n" "Language: de\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: Lokalize 2.0\n" +"X-Generator: Lokalize 18.12.3\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" #: kdiff3fileitemaction.cpp:92 @@ -66,16 +66,10 @@ msgstr "Über KDiff3-Menü-Modul ..." #: kdiff3fileitemaction.cpp:287 -#, fuzzy, kde-format -#| msgid "" -#| "KDiff3 File Item Action Plugin: Copyright (C) 2011 Joachim Eibl\n" -#| "KDiff3 homepage: http://kdiff3.sourceforge.net\n" -#| "\n" +#, kde-format msgid "KDiff3 File Item Action Plugin: Copyright (C) 2011 Joachim Eibl\n" msgstr "" "KDiff3-Aktionsmodul für Dateieinträge: Copyright (C) 2011 Joachim Eibl\n" -"KDiff3-Homepage: http://kdiff3.sourceforge.net\n" -"\n" #: kdiff3fileitemaction.cpp:288 #, kde-format diff -Nru kdiff3-1.8.01/po/de/kdiff3.po kdiff3-1.8.3/po/de/kdiff3.po --- kdiff3-1.8.01/po/de/kdiff3.po 2019-05-18 01:01:54.000000000 +0000 +++ kdiff3-1.8.3/po/de/kdiff3.po 2020-06-25 00:18:11.000000000 +0000 @@ -2,13 +2,13 @@ # Joachim Eibl , 2004, 2005, 2006. # Thomas Reitelbach , 2004, 2006. # Frederik Schwarzer , 2008, 2009, 2010, 2011, 2012, 2018. -# Burkhard Lück , 2008, 2009, 2011, 2012, 2013, 2018, 2019. +# Burkhard Lück , 2008, 2009, 2011, 2012, 2013, 2018, 2019, 2020. msgid "" msgstr "" "Project-Id-Version: kdiff3\n" -"Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2019-04-18 08:02+0200\n" -"PO-Revision-Date: 2019-01-31 06:56+0100\n" +"Report-Msgid-Bugs-To: https://bugs.kde.org\n" +"POT-Creation-Date: 2020-06-22 07:48+0200\n" +"PO-Revision-Date: 2020-02-04 07:34+0100\n" "Last-Translator: Burkhard Lück \n" "Language-Team: German \n" "Language: de\n" @@ -16,7 +16,7 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Generator: Lokalize 2.0\n" +"X-Generator: Lokalize 18.12.3\n" #, kde-format msgctxt "NAME OF TRANSLATORS" @@ -28,285 +28,285 @@ msgid "Your emails" msgstr "schwarzer@kde.org" -#: difftextwindow.cpp:412 +#: difftextwindow.cpp:414 #, kde-format msgid "File %1: Line %2" msgstr "Datei: %1 Zeile %2" -#: difftextwindow.cpp:414 +#: difftextwindow.cpp:416 #, kde-format msgid "File %1: Line not available" msgstr "Datei %1: Zeile nicht vorhanden" -#: difftextwindow.cpp:1780 +#: difftextwindow.cpp:1778 #, kde-format msgid "Encoding:" msgstr "Kodierung:" -#: difftextwindow.cpp:1782 mergeresultwindow.cpp:3138 optiondialog.cpp:818 +#: difftextwindow.cpp:1781 mergeresultwindow.cpp:3166 optiondialog.cpp:840 #, kde-format msgid "Line end style:" msgstr "Zeilenende-Kodierung:" -#: difftextwindow.cpp:1810 directorymergewindow.cpp:382 -#: directorymergewindow.cpp:433 directorymergewindow.cpp:524 -#: directorymergewindow.cpp:3058 directorymergewindow.cpp:3189 -#: directorymergewindow.cpp:3417 mergeresultwindow.cpp:942 -#: mergeresultwindow.cpp:944 mergeresultwindow.cpp:946 -#: mergeresultwindow.cpp:948 mergeresultwindow.cpp:1814 -#: mergeresultwindow.cpp:3170 mergeresultwindow.cpp:3177 optiondialog.cpp:962 -#: optiondialog.cpp:975 pdiff.cpp:833 pdiff.cpp:835 pdiff.cpp:837 pdiff.cpp:839 -#: pdiff.cpp:861 smalldialogs.cpp:124 smalldialogs.cpp:126 smalldialogs.cpp:127 -#: smalldialogs.cpp:130 +#: difftextwindow.cpp:1809 directorymergewindow.cpp:383 +#: directorymergewindow.cpp:434 directorymergewindow.cpp:525 +#: directorymergewindow.cpp:3072 directorymergewindow.cpp:3203 +#: directorymergewindow.cpp:3431 mergeresultwindow.cpp:970 +#: mergeresultwindow.cpp:972 mergeresultwindow.cpp:974 +#: mergeresultwindow.cpp:976 mergeresultwindow.cpp:1842 +#: mergeresultwindow.cpp:3198 mergeresultwindow.cpp:3205 optiondialog.cpp:1002 +#: optiondialog.cpp:1015 pdiff.cpp:823 pdiff.cpp:825 pdiff.cpp:827 +#: pdiff.cpp:829 pdiff.cpp:851 smalldialogs.cpp:131 smalldialogs.cpp:133 +#: smalldialogs.cpp:134 smalldialogs.cpp:137 #, kde-format msgid "A" msgstr "A" -#: difftextwindow.cpp:1810 directorymergewindow.cpp:384 -#: directorymergewindow.cpp:436 directorymergewindow.cpp:526 -#: directorymergewindow.cpp:3064 directorymergewindow.cpp:3190 -#: directorymergewindow.cpp:3418 mergeresultwindow.cpp:942 -#: mergeresultwindow.cpp:944 mergeresultwindow.cpp:950 -#: mergeresultwindow.cpp:952 mergeresultwindow.cpp:1816 -#: mergeresultwindow.cpp:3172 mergeresultwindow.cpp:3179 optiondialog.cpp:963 -#: optiondialog.cpp:976 pdiff.cpp:833 pdiff.cpp:835 pdiff.cpp:841 pdiff.cpp:843 -#: pdiff.cpp:863 smalldialogs.cpp:124 smalldialogs.cpp:125 smalldialogs.cpp:128 -#: smalldialogs.cpp:131 +#: difftextwindow.cpp:1809 directorymergewindow.cpp:385 +#: directorymergewindow.cpp:437 directorymergewindow.cpp:527 +#: directorymergewindow.cpp:3078 directorymergewindow.cpp:3204 +#: directorymergewindow.cpp:3432 mergeresultwindow.cpp:970 +#: mergeresultwindow.cpp:972 mergeresultwindow.cpp:978 +#: mergeresultwindow.cpp:980 mergeresultwindow.cpp:1844 +#: mergeresultwindow.cpp:3200 mergeresultwindow.cpp:3207 optiondialog.cpp:1003 +#: optiondialog.cpp:1016 pdiff.cpp:823 pdiff.cpp:825 pdiff.cpp:831 +#: pdiff.cpp:833 pdiff.cpp:853 smalldialogs.cpp:131 smalldialogs.cpp:132 +#: smalldialogs.cpp:135 smalldialogs.cpp:138 #, kde-format msgid "B" msgstr "B" -#: difftextwindow.cpp:1810 directorymergewindow.cpp:386 -#: directorymergewindow.cpp:439 directorymergewindow.cpp:528 -#: directorymergewindow.cpp:3070 directorymergewindow.cpp:3191 -#: directorymergewindow.cpp:3419 mergeresultwindow.cpp:946 -#: mergeresultwindow.cpp:948 mergeresultwindow.cpp:950 -#: mergeresultwindow.cpp:952 mergeresultwindow.cpp:1818 -#: mergeresultwindow.cpp:3174 mergeresultwindow.cpp:3181 optiondialog.cpp:977 -#: pdiff.cpp:837 pdiff.cpp:839 pdiff.cpp:841 pdiff.cpp:843 pdiff.cpp:865 -#: smalldialogs.cpp:125 smalldialogs.cpp:126 smalldialogs.cpp:129 -#: smalldialogs.cpp:132 +#: difftextwindow.cpp:1809 directorymergewindow.cpp:387 +#: directorymergewindow.cpp:440 directorymergewindow.cpp:529 +#: directorymergewindow.cpp:3084 directorymergewindow.cpp:3205 +#: directorymergewindow.cpp:3433 mergeresultwindow.cpp:974 +#: mergeresultwindow.cpp:976 mergeresultwindow.cpp:978 +#: mergeresultwindow.cpp:980 mergeresultwindow.cpp:1846 +#: mergeresultwindow.cpp:3202 mergeresultwindow.cpp:3209 optiondialog.cpp:1017 +#: pdiff.cpp:827 pdiff.cpp:829 pdiff.cpp:831 pdiff.cpp:833 pdiff.cpp:855 +#: smalldialogs.cpp:132 smalldialogs.cpp:133 smalldialogs.cpp:136 +#: smalldialogs.cpp:139 #, kde-format msgid "C" msgstr "C" -#: difftextwindow.cpp:1810 +#: difftextwindow.cpp:1809 #, kde-format msgid "A (Base)" msgstr "A (Basis)" -#: difftextwindow.cpp:1812 +#: difftextwindow.cpp:1811 #, kde-format msgid "Encoding: %1" msgstr "Kodierung: %1" -#: difftextwindow.cpp:1813 mergeresultwindow.cpp:3183 +#: difftextwindow.cpp:1812 mergeresultwindow.cpp:3211 #, kde-format msgid "Unix" msgstr "Unix" -#: difftextwindow.cpp:1813 mergeresultwindow.cpp:3184 +#: difftextwindow.cpp:1812 mergeresultwindow.cpp:3212 #, kde-format msgid "DOS" msgstr "DOS" -#: difftextwindow.cpp:1813 +#: difftextwindow.cpp:1812 #, kde-format msgid "Line end style: %1" msgstr "Zeilenende-Kodierung: %1" -#: difftextwindow.cpp:1835 kdiff3.cpp:873 +#: difftextwindow.cpp:1834 kdiff3.cpp:874 #, kde-format msgid "Top line" msgstr "Oberste Zeile" -#: difftextwindow.cpp:1845 +#: difftextwindow.cpp:1843 #, kde-format msgid "End" msgstr "Ende" -#: difftextwindow.cpp:1903 smalldialogs.cpp:235 +#: difftextwindow.cpp:1901 smalldialogs.cpp:245 #, kde-format msgid "Open File" msgstr "Datei öffnen" -#: difftextwindow.cpp:1951 optiondialog.cpp:387 +#: difftextwindow.cpp:1943 optiondialog.cpp:389 #, kde-format msgid "Unicode, 8 bit" msgstr "Unicode, 8 bit" -#: difftextwindow.cpp:1966 +#: difftextwindow.cpp:1958 #, kde-format msgid "Other" msgstr "Andere" -#: directorymergewindow.cpp:409 directorymergewindow.cpp:3424 +#: directorymergewindow.cpp:410 directorymergewindow.cpp:3438 #, kde-format msgid "Copy A to B" msgstr "A nach B kopieren" -#: directorymergewindow.cpp:412 directorymergewindow.cpp:3425 +#: directorymergewindow.cpp:413 directorymergewindow.cpp:3439 #, kde-format msgid "Copy B to A" msgstr "B nach A kopieren" -#: directorymergewindow.cpp:415 directorymergewindow.cpp:3426 +#: directorymergewindow.cpp:416 directorymergewindow.cpp:3440 #, kde-format msgid "Delete A" msgstr "A löschen" -#: directorymergewindow.cpp:418 directorymergewindow.cpp:3427 +#: directorymergewindow.cpp:419 directorymergewindow.cpp:3441 #, kde-format msgid "Delete B" msgstr "B löschen" -#: directorymergewindow.cpp:421 +#: directorymergewindow.cpp:422 #, kde-format msgid "Delete A & B" msgstr "A & B löschen" -#: directorymergewindow.cpp:424 directorymergewindow.cpp:3429 +#: directorymergewindow.cpp:425 directorymergewindow.cpp:3443 #, kde-format msgid "Merge to A" msgstr "Zusammenführen nach A" -#: directorymergewindow.cpp:427 directorymergewindow.cpp:3430 +#: directorymergewindow.cpp:428 directorymergewindow.cpp:3444 #, kde-format msgid "Merge to B" msgstr "Zusammenführen nach B" -#: directorymergewindow.cpp:430 +#: directorymergewindow.cpp:431 #, kde-format msgid "Merge to A & B" msgstr "Zusammenführen nach A & B" -#: directorymergewindow.cpp:442 directorymergewindow.cpp:3421 +#: directorymergewindow.cpp:443 directorymergewindow.cpp:3435 #, kde-format msgid "Delete (if exists)" msgstr "Löschen (falls vorhanden)" -#: directorymergewindow.cpp:445 directorymergewindow.cpp:448 -#: directorymergewindow.cpp:3420 optiondialog.cpp:925 smalldialogs.cpp:113 +#: directorymergewindow.cpp:446 directorymergewindow.cpp:449 +#: directorymergewindow.cpp:3434 smalldialogs.cpp:120 #, kde-format msgid "Merge" msgstr "Zusammenführen" -#: directorymergewindow.cpp:445 directorymergewindow.cpp:448 +#: directorymergewindow.cpp:446 directorymergewindow.cpp:449 #, kde-format msgid "Merge (manual)" msgstr "Zusammenführen (manuell)" -#: directorymergewindow.cpp:451 +#: directorymergewindow.cpp:452 #, kde-format msgid "Error: Conflicting File Types" msgstr "Fehler: Konflikt der Dateitypen" -#: directorymergewindow.cpp:454 +#: directorymergewindow.cpp:455 #, kde-format msgid "Error: Changed and Deleted" msgstr "Fehler: Geändert und gelöscht" -#: directorymergewindow.cpp:457 +#: directorymergewindow.cpp:458 #, kde-format msgid "Error: Dates are equal but files are not." msgstr "Fehler: Gleiches Datum, aber unterschiedliche Dateien." -#: directorymergewindow.cpp:471 +#: directorymergewindow.cpp:472 #, kde-format msgid "Done" msgstr "Fertig" -#: directorymergewindow.cpp:473 +#: directorymergewindow.cpp:474 #, kde-format msgid "Error" msgstr "Fehler" -#: directorymergewindow.cpp:475 +#: directorymergewindow.cpp:476 #, kde-format msgid "Skipped." msgstr "Übersprungen." -#: directorymergewindow.cpp:477 +#: directorymergewindow.cpp:478 #, kde-format msgid "Not saved." msgstr "Nicht gespeichert." -#: directorymergewindow.cpp:479 +#: directorymergewindow.cpp:480 #, kde-format msgid "In progress..." msgstr "In Bearbeitung ..." -#: directorymergewindow.cpp:481 +#: directorymergewindow.cpp:482 #, kde-format msgid "To do." msgstr "Unerledigt." -#: directorymergewindow.cpp:522 +#: directorymergewindow.cpp:523 #, kde-format msgid "Name" msgstr "Name" -#: directorymergewindow.cpp:530 +#: directorymergewindow.cpp:531 #, kde-format msgid "Operation" msgstr "Aktion" -#: directorymergewindow.cpp:532 +#: directorymergewindow.cpp:533 #, kde-format msgid "Status" msgstr "Status" -#: directorymergewindow.cpp:534 +#: directorymergewindow.cpp:535 #, kde-format msgid "Unsolved" msgstr "Ungelöst" -#: directorymergewindow.cpp:536 +#: directorymergewindow.cpp:537 #, kde-format msgid "Solved" msgstr "Aufgelöst" -#: directorymergewindow.cpp:538 +#: directorymergewindow.cpp:539 #, kde-format msgid "Nonwhite" msgstr "Nicht-Leerraum" -#: directorymergewindow.cpp:540 +#: directorymergewindow.cpp:541 #, kde-format msgid "White" msgstr "Leerraum" -#: directorymergewindow.cpp:674 +#: directorymergewindow.cpp:676 #, kde-format msgid "Unable to compare non-normal file with normal file." -msgstr "" +msgstr "Vergleich von spezieller und normaler Datei ist nicht möglich." -#: directorymergewindow.cpp:688 +#: directorymergewindow.cpp:690 #, kde-format msgid "Mix of links and normal files." msgstr "Vermischung von Verknüpfungen und Dateien" -#: directorymergewindow.cpp:695 +#: directorymergewindow.cpp:697 #, kde-format msgid "Link: " msgstr "Verknüpfung: " -#: directorymergewindow.cpp:704 +#: directorymergewindow.cpp:706 #, kde-format msgid "Size. " msgstr "Größe." -#: directorymergewindow.cpp:718 directorymergewindow.cpp:728 +#: directorymergewindow.cpp:720 directorymergewindow.cpp:730 #, kde-format msgid "Date & Size: " msgstr "Datum & Größe: " -#: directorymergewindow.cpp:748 +#: directorymergewindow.cpp:751 #, kde-format msgid "Comparing file..." msgstr "Datei wird verglichen ..." -#: directorymergewindow.cpp:801 +#: directorymergewindow.cpp:813 #, kde-format msgid "" "You are currently doing a directory merge. Are you sure, you want to abort " @@ -315,48 +315,48 @@ "Sie sind dabei, Ordner zusammenzuführen. Sind Sie sicher, dass Sie diese " "Operation abbrechen und den Ordner erneut einlesen möchten?" -#: directorymergewindow.cpp:802 kdiff3.cpp:698 kdiff3.cpp:708 kdiff3.cpp:720 -#: mergeresultwindow.cpp:372 pdiff.cpp:1033 pdiff.cpp:1910 pdiff.cpp:1920 +#: directorymergewindow.cpp:814 kdiff3.cpp:697 kdiff3.cpp:707 kdiff3.cpp:719 +#: mergeresultwindow.cpp:400 pdiff.cpp:1031 pdiff.cpp:1920 pdiff.cpp:1930 #, kde-format msgid "Warning" msgstr "Achtung" -#: directorymergewindow.cpp:803 directorymergewindow.cpp:3393 +#: directorymergewindow.cpp:815 directorymergewindow.cpp:3407 #, kde-format msgid "Rescan" msgstr "Neu einlesen" -#: directorymergewindow.cpp:804 pdiff.cpp:1035 +#: directorymergewindow.cpp:816 pdiff.cpp:1033 #, kde-format msgid "Continue Merging" msgstr "Zusammenführung fortsetzen" -#: directorymergewindow.cpp:971 +#: directorymergewindow.cpp:984 #, kde-format msgid "Opening of directories failed:" msgstr "Öffnen der Ordner fehlgeschlagen:" -#: directorymergewindow.cpp:975 +#: directorymergewindow.cpp:988 #, 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:980 +#: directorymergewindow.cpp:993 #, 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:985 +#: directorymergewindow.cpp:998 #, 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:988 +#: directorymergewindow.cpp:1001 #, kde-format msgid "Directory Open Error" msgstr "Fehler beim Öffnen des Ordners" -#: directorymergewindow.cpp:996 +#: directorymergewindow.cpp:1009 #, kde-format msgid "" "The destination directory must not be the same as A or B when three " @@ -367,49 +367,49 @@ "oder B identisch sein.\n" "Bitte überprüfen Sie das bevor Sie fortfahren." -#: directorymergewindow.cpp:998 +#: directorymergewindow.cpp:1011 #, kde-format msgid "Parameter Warning" msgstr "Parameter-Warnung" -#: directorymergewindow.cpp:1003 +#: directorymergewindow.cpp:1016 #, kde-format msgid "Scanning directories..." msgstr "Ordner werden eingelesen ..." -#: directorymergewindow.cpp:1029 +#: directorymergewindow.cpp:1042 #, kde-format msgid "Reading Directory A" msgstr "Einlesen von Ordner A" -#: directorymergewindow.cpp:1038 +#: directorymergewindow.cpp:1051 #, kde-format msgid "Reading Directory B" msgstr "Einlesen von Ordner B" -#: directorymergewindow.cpp:1048 +#: directorymergewindow.cpp:1061 #, kde-format msgid "Reading Directory C" msgstr "Einlesen von Ordner C" -#: directorymergewindow.cpp:1064 +#: directorymergewindow.cpp:1077 #, kde-format msgid "Some subdirectories were not readable in" msgstr "Einige Unterordner nicht lesbar in" -#: directorymergewindow.cpp:1069 +#: directorymergewindow.cpp:1082 #, kde-format msgid "Check the permissions of the subdirectories." msgstr "Überprüfen Sie bitte die Zugriffsrechte für die Unterordner." -#: directorymergewindow.cpp:1106 kdiff3.cpp:666 kdiff3.cpp:753 kdiff3.cpp:777 -#: kdiff3.cpp:1065 kdiff3.cpp:1086 pdiff.cpp:1116 pdiff.cpp:1170 pdiff.cpp:1218 -#: pdiff.cpp:1234 pdiff.cpp:1277 pdiff.cpp:1301 +#: directorymergewindow.cpp:1119 kdiff3.cpp:665 kdiff3.cpp:752 kdiff3.cpp:776 +#: kdiff3.cpp:1072 kdiff3.cpp:1093 pdiff.cpp:1115 pdiff.cpp:1178 pdiff.cpp:1228 +#: pdiff.cpp:1244 pdiff.cpp:1287 pdiff.cpp:1311 #, kde-format msgid "Ready." msgstr "Bereit." -#: directorymergewindow.cpp:1121 +#: directorymergewindow.cpp:1134 #, kde-format msgid "" "Directory Comparison Status\n" @@ -424,22 +424,22 @@ "Anzahl gleicher Dateien:%2\n" "Anzahl unterschiedlicher Dateien: %3" -#: directorymergewindow.cpp:1128 +#: directorymergewindow.cpp:1141 #, kde-format msgid "Number of manual merges: %1" msgstr "Anzahl der manuellen Zusammenführungen: %1" -#: directorymergewindow.cpp:1394 +#: directorymergewindow.cpp:1407 #, kde-format msgid "This affects all merge operations." msgstr "Dies beeinflusst alle Zusammenführungsaktionen." -#: directorymergewindow.cpp:1395 +#: directorymergewindow.cpp:1408 #, kde-format msgid "Changing All Merge Operations" msgstr "Änderung aller Zusammenführungsaktionen" -#: directorymergewindow.cpp:1695 +#: directorymergewindow.cpp:1708 #, kde-format msgid "" "Processing %1 / %2\n" @@ -448,44 +448,44 @@ "Verarbeitung %1 / %2\n" "%3" -#: directorymergewindow.cpp:1738 directorymergewindow.cpp:1742 +#: directorymergewindow.cpp:1751 directorymergewindow.cpp:1755 #, kde-format msgid "Some files could not be processed." msgstr "Einige Dateien können nicht bearbeitet werden." -#: directorymergewindow.cpp:2222 directorymergewindow.cpp:2247 -#: directorymergewindow.cpp:2271 +#: directorymergewindow.cpp:2235 directorymergewindow.cpp:2260 +#: directorymergewindow.cpp:2285 #, kde-format msgid "This operation is currently not possible." msgstr "Diese Aktion ist momentan nicht zulässig." -#: directorymergewindow.cpp:2222 directorymergewindow.cpp:2247 -#: directorymergewindow.cpp:2271 directorymergewindow.cpp:2552 +#: directorymergewindow.cpp:2235 directorymergewindow.cpp:2260 +#: directorymergewindow.cpp:2285 directorymergewindow.cpp:2565 #, kde-format msgid "Operation Not Possible" msgstr "Unzulässige Aktion" -#: directorymergewindow.cpp:2318 +#: directorymergewindow.cpp:2332 #, kde-format msgid "An error occurred while copying." msgstr "Während des Kopierens ist ein Fehler aufgetreten." -#: directorymergewindow.cpp:2319 directorymergewindow.cpp:2759 +#: directorymergewindow.cpp:2333 directorymergewindow.cpp:2772 #, kde-format msgid "Merge Error" msgstr "Zusammenführungsfehler" -#: directorymergewindow.cpp:2396 +#: directorymergewindow.cpp:2410 #, kde-format msgid "Unknown merge operation. (This must never happen!)" msgstr "Unbekannte Zusammenführungsaktion. (Sollte nie passieren!)" -#: directorymergewindow.cpp:2441 +#: directorymergewindow.cpp:2455 #, kde-format msgid "Unknown merge operation." msgstr "Unbekannte Zusammenführungsaktion." -#: directorymergewindow.cpp:2454 +#: directorymergewindow.cpp:2468 #, kde-format msgid "" "The merge is about to begin.\n" @@ -506,22 +506,22 @@ "Sie sollten aber wissen, dass dieses Programm noch Beta-Status hat und es " "KEINE GARANTIE gibt! Erstellen Sie Sicherungskopien Ihrer wichtigen Daten!" -#: directorymergewindow.cpp:2459 +#: directorymergewindow.cpp:2473 #, kde-format msgid "Starting Merge" msgstr "Start der Zusammenführung" -#: directorymergewindow.cpp:2460 +#: directorymergewindow.cpp:2474 #, kde-format msgid "Do It" msgstr "Start" -#: directorymergewindow.cpp:2461 +#: directorymergewindow.cpp:2475 #, kde-format msgid "Simulate It" msgstr "Simulieren" -#: directorymergewindow.cpp:2487 +#: directorymergewindow.cpp:2501 #, kde-format msgid "" "The highlighted item has a different type in the different directories. " @@ -530,7 +530,7 @@ "Das markierte Element hat einen unterschiedlichen Typ in den verschiedenen " "Ordnern. Wählen Sie eine Aktion." -#: directorymergewindow.cpp:2491 +#: directorymergewindow.cpp:2505 #, kde-format msgid "" "The modification dates of the file are equal but the files are not. Select " @@ -539,7 +539,7 @@ "Für die markierte Datei ist zwar das Datum der letzten Änderung gleich, aber " "die Dateien unterscheiden sich. Wählen Sie die Zusammenführungsaktion." -#: directorymergewindow.cpp:2495 +#: directorymergewindow.cpp:2509 #, kde-format msgid "" "The highlighted item was changed in one directory and deleted in the other. " @@ -548,7 +548,7 @@ "Das markierte Element wurde in einem Ordner geändert und im anderen " "gelöscht. Wählen Sie eine Aktion." -#: directorymergewindow.cpp:2552 +#: directorymergewindow.cpp:2565 #, kde-format msgid "" "This operation is currently not possible because directory merge is " @@ -557,7 +557,7 @@ "Diese Aktion ist derzeit nicht möglich, weil noch eine Ordnerzusammenführung " "läuft." -#: directorymergewindow.cpp:2609 +#: directorymergewindow.cpp:2622 #, kde-format msgid "" "There was an error in the last step.\n" @@ -567,32 +567,32 @@ "Beim letzten Element ist ein Fehler aufgetreten.\n" "Möchten Sie mit diesem Element fortfahren, oder es überspringen?" -#: directorymergewindow.cpp:2611 +#: directorymergewindow.cpp:2624 #, kde-format msgid "Continue merge after an error" msgstr "Fortsetzung der Zusammenführung nach einem Fehler" -#: directorymergewindow.cpp:2612 +#: directorymergewindow.cpp:2625 #, kde-format msgid "Continue With Last Item" msgstr "Mit letztem Element fortfahren" -#: directorymergewindow.cpp:2613 +#: directorymergewindow.cpp:2626 #, kde-format msgid "Skip Item" msgstr "Element überspringen" -#: directorymergewindow.cpp:2709 +#: directorymergewindow.cpp:2722 #, kde-format msgid "Merge operation complete." msgstr "Die Zusammenführung ist abgeschlossen." -#: directorymergewindow.cpp:2709 directorymergewindow.cpp:2712 +#: directorymergewindow.cpp:2722 directorymergewindow.cpp:2725 #, kde-format msgid "Merge Complete" msgstr "Zusammenführung abgeschlossen." -#: directorymergewindow.cpp:2722 +#: directorymergewindow.cpp:2735 #, kde-format msgid "" "Simulated merge complete: Check if you agree with the proposed operations." @@ -600,235 +600,235 @@ "Die simulierte Zusammenführung ist abgeschlossen. Überprüfen Sie, ob Sie mit " "den vorgeschlagenen Aktionen einverstanden sind." -#: directorymergewindow.cpp:2758 +#: directorymergewindow.cpp:2771 #, kde-format msgid "An error occurred. Press OK to see detailed information." msgstr "Ein Fehler ist aufgetreten. Wählen Sie OK um Details zu sehen." -#: directorymergewindow.cpp:2791 +#: directorymergewindow.cpp:2804 #, 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:2798 +#: directorymergewindow.cpp:2811 #, kde-format msgid "delete directory recursively( %1 )" msgstr "Lösche Ordner rekursiv( %1 )" -#: directorymergewindow.cpp:2800 +#: directorymergewindow.cpp:2813 #, kde-format msgid "delete( %1 )" -msgstr "Lösche( %1 )" +msgstr "Löschen ( %1 )" -#: directorymergewindow.cpp:2815 +#: directorymergewindow.cpp:2828 #, kde-format 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:2834 +#: directorymergewindow.cpp:2847 #, kde-format msgid "Error: rmdir( %1 ) operation failed." msgstr "Fehler: Ordner löschen( %1 ) Operation fehlgeschlagen." -#: directorymergewindow.cpp:2844 +#: directorymergewindow.cpp:2857 #, kde-format msgid "Error: delete operation failed." msgstr "Fehler: Löschoperation fehlgeschlagen." -#: directorymergewindow.cpp:2870 +#: directorymergewindow.cpp:2884 #, kde-format msgid "manual merge( %1, %2, %3 -> %4)" msgstr "Manuelles Zusammenführen( %1, %2, %3 -> %4)" -#: directorymergewindow.cpp:2873 +#: directorymergewindow.cpp:2887 #, kde-format msgid "" " Note: After a manual merge the user should continue by pressing F7." msgstr " Hinweis: Nach manuellem Zusammenführen mit F7 fortsetzen." -#: directorymergewindow.cpp:2900 +#: directorymergewindow.cpp:2914 #, 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:2909 +#: directorymergewindow.cpp:2923 #, kde-format msgid "copyLink( %1 -> %2 )" msgstr "Verknüpfung kopieren( %1 -> %2 )" -#: directorymergewindow.cpp:2918 +#: directorymergewindow.cpp:2932 #, kde-format msgid "Error: copyLink failed: Remote links are not yet supported." msgstr "" "Fehler: Verknüpfung kopieren: Nichtlokale Verknüpfungen werden nicht " "unterstützt." -#: directorymergewindow.cpp:2928 +#: directorymergewindow.cpp:2942 #, kde-format msgid "Error: copyLink failed." msgstr "Fehler: Verknüpfung kopieren fehlgeschlagen." -#: directorymergewindow.cpp:2953 +#: directorymergewindow.cpp:2967 #, kde-format msgid "copy( %1 -> %2 )" msgstr "kopieren( %1 -> %2 )" -#: directorymergewindow.cpp:2979 +#: directorymergewindow.cpp:2993 #, 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:2986 +#: directorymergewindow.cpp:3000 #, kde-format msgid "rename( %1 -> %2 )" msgstr "Umbenennen( %1 -> %2 )" -#: directorymergewindow.cpp:2995 +#: directorymergewindow.cpp:3009 #, kde-format msgid "Error: Rename failed." msgstr "Fehler: Umbenennen fehlgeschlagen." -#: directorymergewindow.cpp:3013 +#: directorymergewindow.cpp:3027 #, 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:3030 +#: directorymergewindow.cpp:3044 #, kde-format msgid "makeDir( %1 )" msgstr "Ordner erstellen( %1 )" -#: directorymergewindow.cpp:3040 +#: directorymergewindow.cpp:3054 #, kde-format msgid "Error while creating directory." msgstr "Fehler beim Erstellen des Ordners." -#: directorymergewindow.cpp:3076 directorymergewindow.cpp:3195 +#: directorymergewindow.cpp:3090 directorymergewindow.cpp:3209 #, kde-format msgid "Dest" msgstr "Ziel" -#: directorymergewindow.cpp:3084 directorymergewindow.cpp:3113 +#: directorymergewindow.cpp:3098 directorymergewindow.cpp:3127 #, kde-format msgid "Dir" msgstr "Ordner" -#: directorymergewindow.cpp:3084 +#: directorymergewindow.cpp:3098 #, kde-format msgid "Type" msgstr "Typ" -#: directorymergewindow.cpp:3084 +#: directorymergewindow.cpp:3098 #, kde-format msgid "Size" msgstr "Größe" -#: directorymergewindow.cpp:3085 +#: directorymergewindow.cpp:3099 #, kde-format msgid "Attr" msgstr "Attr" -#: directorymergewindow.cpp:3085 +#: directorymergewindow.cpp:3099 #, kde-format msgid "Last Modification" msgstr "Letzte Änderung" -#: directorymergewindow.cpp:3085 +#: directorymergewindow.cpp:3099 #, kde-format msgid "Link-Destination" msgstr "Verknüpfungsziel" -#: directorymergewindow.cpp:3113 +#: directorymergewindow.cpp:3127 #, kde-format msgid "File" msgstr "Datei" -#: directorymergewindow.cpp:3113 +#: directorymergewindow.cpp:3127 #, kde-format msgid "-Link" msgstr "-Verknüpfung" -#: directorymergewindow.cpp:3119 +#: directorymergewindow.cpp:3133 #, kde-format msgid "not available" msgstr "nicht verfügbar" -#: directorymergewindow.cpp:3137 +#: directorymergewindow.cpp:3151 #, kde-format msgid "A (Dest): " msgstr "A (Ziel): " -#: directorymergewindow.cpp:3141 +#: directorymergewindow.cpp:3155 #, kde-format msgid "A: " msgstr "A: " -#: directorymergewindow.cpp:3141 +#: directorymergewindow.cpp:3155 #, kde-format msgid "A (Base): " msgstr "A (Basis): " -#: directorymergewindow.cpp:3147 +#: directorymergewindow.cpp:3161 #, kde-format msgid "B (Dest): " msgstr "B (Ziel): " -#: directorymergewindow.cpp:3151 +#: directorymergewindow.cpp:3165 #, kde-format msgid "B: " msgstr "B: " -#: directorymergewindow.cpp:3156 +#: directorymergewindow.cpp:3170 #, kde-format msgid "C (Dest): " msgstr "C (Ziel): " -#: directorymergewindow.cpp:3160 +#: directorymergewindow.cpp:3174 #, kde-format msgid "C: " msgstr "C: " -#: directorymergewindow.cpp:3163 +#: directorymergewindow.cpp:3177 #, kde-format msgid "Dest: " msgstr "Ziel: " #. i18n("Saving Directory Merge State ...")); -#: directorymergewindow.cpp:3238 +#: directorymergewindow.cpp:3252 #, kde-format msgid "Save Directory Merge State As..." msgstr "Status der Ordnerzusammenführung speichern unter ..." -#: directorymergewindow.cpp:3387 +#: directorymergewindow.cpp:3401 #, kde-format msgid "Start/Continue Directory Merge" msgstr "Ordnerzusammenführung starten/fortsetzen" -#: directorymergewindow.cpp:3388 +#: directorymergewindow.cpp:3402 #, kde-format msgid "Run Operation for Current Item" msgstr "Aktion des aktuellen Elements ausführen" -#: directorymergewindow.cpp:3389 +#: directorymergewindow.cpp:3403 #, kde-format msgid "Compare Selected File" msgstr "Gewählte Datei vergleichen" -#: directorymergewindow.cpp:3390 +#: directorymergewindow.cpp:3404 #, kde-format msgid "Merge Current File" msgstr "Aktuelle Datei zusammenführen" -#: directorymergewindow.cpp:3390 +#: directorymergewindow.cpp:3404 #, kde-format msgid "" "Merge\n" @@ -837,51 +837,51 @@ "Datei\n" "zusammenführen" -#: directorymergewindow.cpp:3391 +#: directorymergewindow.cpp:3405 #, kde-format msgid "Fold All Subdirs" msgstr "Alle Unterordner einklappen" -#: directorymergewindow.cpp:3392 +#: directorymergewindow.cpp:3406 #, kde-format msgid "Unfold All Subdirs" msgstr "Alle Unterordner ausklappen" #. i18n("Save Directory Merge State ..."), 0, this, &DirectoryMergeWindow::slotSaveMergeState, ac, "dir_save_merge_state"); #. i18n("Load Directory Merge State ..."), 0, this, &DirectoryMergeWindow::slotLoadMergeState, ac, "dir_load_merge_state"); -#: directorymergewindow.cpp:3396 +#: directorymergewindow.cpp:3410 #, kde-format msgid "Choose A for All Items" msgstr "Für alle Elemente A wählen" -#: directorymergewindow.cpp:3397 +#: directorymergewindow.cpp:3411 #, kde-format msgid "Choose B for All Items" msgstr "Für alle Elemente B wählen" -#: directorymergewindow.cpp:3398 +#: directorymergewindow.cpp:3412 #, kde-format msgid "Choose C for All Items" msgstr "Für alle Elemente C wählen" -#: directorymergewindow.cpp:3399 +#: directorymergewindow.cpp:3413 #, kde-format msgid "Auto-Choose Operation for All Items" msgstr "Aktion für alle Elemente automatisch wählen" -#: directorymergewindow.cpp:3400 +#: directorymergewindow.cpp:3414 #, kde-format msgid "No Operation for All Items" msgstr "Keine Aktion für alle Elemente" #. i18n("Synchronize Directories"), 0, this, &DirectoryMergeWindow::slotSynchronizeDirectories, ac, "dir_synchronize_directories"); #. d->m_pDirChooseNewerFiles = GuiUtils::createAction< KToggleAction >(i18n("Copy Newer Files Instead of Merging"), 0, this, &DirectoryMergeWindow::slotChooseNewerFiles, ac, "dir_choose_newer_files"); -#: directorymergewindow.cpp:3405 +#: directorymergewindow.cpp:3419 #, kde-format msgid "Show Identical Files" msgstr "Identische Dateien anzeigen" -#: directorymergewindow.cpp:3405 +#: directorymergewindow.cpp:3419 #, kde-format msgid "" "Identical\n" @@ -890,17 +890,17 @@ "Identische\n" "Dateien" -#: directorymergewindow.cpp:3406 +#: directorymergewindow.cpp:3420 #, kde-format msgid "Show Different Files" msgstr "Unterschiedliche Dateien anzeigen" -#: directorymergewindow.cpp:3407 +#: directorymergewindow.cpp:3421 #, kde-format msgid "Show Files only in A" msgstr "Dateien anzeigen, die nur in A existieren" -#: directorymergewindow.cpp:3407 +#: directorymergewindow.cpp:3421 #, kde-format msgid "" "Files\n" @@ -909,12 +909,12 @@ "Dateien\n" "nur in A" -#: directorymergewindow.cpp:3408 +#: directorymergewindow.cpp:3422 #, kde-format msgid "Show Files only in B" msgstr "Dateien anzeigen, die nur in B existieren" -#: directorymergewindow.cpp:3408 +#: directorymergewindow.cpp:3422 #, kde-format msgid "" "Files\n" @@ -923,12 +923,12 @@ "Dateien\n" "nur in B" -#: directorymergewindow.cpp:3409 +#: directorymergewindow.cpp:3423 #, kde-format msgid "Show Files only in C" msgstr "Dateien anzeigen, die nur in C existieren" -#: directorymergewindow.cpp:3409 +#: directorymergewindow.cpp:3423 #, kde-format msgid "" "Files\n" @@ -937,53 +937,59 @@ "Dateien\n" "nur in C" -#: directorymergewindow.cpp:3413 +#: directorymergewindow.cpp:3427 #, kde-format msgid "Compare Explicitly Selected Files" msgstr "Explizit ausgewählte Dateien vergleichen" -#: directorymergewindow.cpp:3414 +#: directorymergewindow.cpp:3428 #, kde-format msgid "Merge Explicitly Selected Files" msgstr "Explizit ausgewählte Dateien zusammenführen" -#: directorymergewindow.cpp:3416 directorymergewindow.cpp:3423 +#: directorymergewindow.cpp:3430 directorymergewindow.cpp:3437 #, kde-format msgid "Do Nothing" msgstr "Nichts tun" -#: directorymergewindow.cpp:3428 +#: directorymergewindow.cpp:3442 #, kde-format msgid "Delete A && B" msgstr "A && B löschen" -#: directorymergewindow.cpp:3431 +#: directorymergewindow.cpp:3445 #, kde-format msgid "Merge to A && B" msgstr "Nach A && B zusammenführen" -#: fileaccess.cpp:462 SourceData.cpp:493 +#: fileaccess.cpp:301 +#, kde-format +msgid "Unable to determine full url. No parent specified." +msgstr "" +"Die vollständige URL kann nicht ermittelt werden. Es wurde kein Pfad " +"angegeben." + +#: fileaccess.cpp:482 SourceData.cpp:506 #, kde-format msgid "Failed to read file: %1" msgstr "Datei %1 kann nicht gelesen werden" -#: fileaccess.cpp:587 +#: fileaccess.cpp:624 #, kde-format msgid "Creating temp copy of %1 failed." msgstr "Erstellung einer temporären Kopie von %1 ist fehlgeschlagen." -#: fileaccess.cpp:595 fileaccess.cpp:600 +#: fileaccess.cpp:632 fileaccess.cpp:637 #, kde-format msgid "Opening %1 failed. %2" msgstr "Öffnen von %1 ist fehlgeschlagen. %2" -#: fileaccess.cpp:619 fileaccess.cpp:627 -#, fuzzy, kde-format -#| msgid "Error reading from %1" +#: fileaccess.cpp:656 fileaccess.cpp:664 +#, kde-format msgid "Error reading from %1. %2" -msgstr "Fehler beim Lesen von %1" +msgstr "Fehler beim Lesen von %1. %2" -#: fileaccess.cpp:751 +#: fileaccess.cpp:788 #, kde-format msgid "" "While trying to make a backup, deleting an older backup failed.\n" @@ -993,7 +999,7 @@ "vorhandene Sicherungskopie nicht gelöscht worden.\n" "Datei: %1" -#: fileaccess.cpp:758 +#: fileaccess.cpp:795 #, kde-format msgid "" "While trying to make a backup, renaming failed.\n" @@ -1003,179 +1009,179 @@ "fehlgeschlagen:\n" "Dateien: %1 -> %2" -#: fileaccess.cpp:828 +#: fileaccess.cpp:865 #, kde-format msgid "Getting file status: %1" msgstr "Dateistatus holen: %1" -#: fileaccess.cpp:869 +#: fileaccess.cpp:906 #, kde-format msgid "Reading file: %1" msgstr "Datei wird gelesen: %1" -#: fileaccess.cpp:907 +#: fileaccess.cpp:944 #, kde-format msgid "Writing file: %1" msgstr "Datei wird geschrieben: %1" -#: fileaccess.cpp:940 +#: fileaccess.cpp:977 #, kde-format msgid "Out of memory" msgstr "Nicht genügend Speicher" -#: fileaccess.cpp:976 +#: fileaccess.cpp:1013 #, kde-format msgid "Making directory: %1" msgstr "Ordner wird erstellt: %1" -#: fileaccess.cpp:997 +#: fileaccess.cpp:1034 #, kde-format msgid "Removing directory: %1" msgstr "Ordner wird gelöscht: %1" -#: fileaccess.cpp:1012 +#: fileaccess.cpp:1049 #, kde-format msgid "Removing file: %1" msgstr "Datei wird gelöscht: %1" -#: fileaccess.cpp:1028 +#: fileaccess.cpp:1065 #, kde-format msgid "Creating symbolic link: %1 -> %2" msgstr "Symbolische Verknüpfung wird erstellt: %1 -> %2" -#: fileaccess.cpp:1052 +#: fileaccess.cpp:1089 #, kde-format msgid "Renaming file: %1 -> %2" msgstr "Datei wird umbenannt: %1 -> %2" -#: fileaccess.cpp:1086 +#: fileaccess.cpp:1123 #, kde-format msgid "Copying file: %1 -> %2" msgstr "Datei wird kopiert: %1 -> %2" -#: fileaccess.cpp:1108 +#: fileaccess.cpp:1145 #, kde-format msgid "Reading directory: %1" msgstr "Ordner wird eingelesen: %1" -#: fileaccess.cpp:1162 +#: fileaccess.cpp:1202 #, kde-format msgid "Listing directory: %1" msgstr "Ordner anzeigen: %1" -#: kdiff3.cpp:181 +#: kdiff3.cpp:182 #, kde-format msgid "Current Configuration:" msgstr "Aktuelle Einstellungen:" -#: kdiff3.cpp:186 +#: kdiff3.cpp:187 #, kde-format msgid "Config Option Error:" msgstr "Fehler in der Einstellungsoption:" -#: kdiff3.cpp:240 +#: kdiff3.cpp:246 #, kde-format msgid "Option --auto used, but no output file specified." msgstr "Option --auto verwendet, aber keine Ausgabedatei angegeben." -#: kdiff3.cpp:416 +#: kdiff3.cpp:405 #, kde-format msgid "Option --auto ignored for directory comparison." msgstr "Option --auto wird beim Vergleich von Ordnern ignoriert." -#: kdiff3.cpp:460 +#: kdiff3.cpp:449 #, kde-format msgid "Saving failed." msgstr "Speichern fehlgeschlagen." -#: kdiff3.cpp:496 pdiff.cpp:1098 +#: kdiff3.cpp:494 pdiff.cpp:1096 #, kde-format msgid "Opening of these files failed:" msgstr "Öffnen dieser Dateien ist fehlgeschlagen:" -#: kdiff3.cpp:505 +#: kdiff3.cpp:503 pdiff.cpp:1105 #, kde-format -msgid "File Open Error" -msgstr "Fehler beim Dateiöffnen" +msgid "File open error" +msgstr "Fehler beim Öffnen der Datei" -#: kdiff3.cpp:533 +#: kdiff3.cpp:532 #, kde-format msgid "Opens documents for comparison..." msgstr "Dateien für Vergleich öffnen ..." -#: kdiff3.cpp:535 +#: kdiff3.cpp:534 #, kde-format msgid "Reload" msgstr "Neu laden" -#: kdiff3.cpp:538 +#: kdiff3.cpp:537 #, kde-format msgid "Saves the merge result. All conflicts must be solved!" msgstr "" "Speichert das Ergebnis der Zusammenführung. Alle Konflikte müssen aufgelöst " "sein." -#: kdiff3.cpp:540 +#: kdiff3.cpp:539 #, kde-format msgid "Saves the current document as..." msgstr "Speichert das aktuelle Dokument als ..." -#: kdiff3.cpp:543 +#: kdiff3.cpp:542 #, kde-format msgid "Print the differences" msgstr "Unterschiede drucken" -#: kdiff3.cpp:546 +#: kdiff3.cpp:545 #, kde-format msgid "Quits the application" msgstr "Beendet das Programm" -#: kdiff3.cpp:549 +#: kdiff3.cpp:548 #, kde-format msgid "Cuts the selected section and puts it to the clipboard" msgstr "Schneidet die Auswahl aus und kopiert sie in die Zwischenablage" -#: kdiff3.cpp:552 +#: kdiff3.cpp:551 #, kde-format msgid "Copies the selected section to the clipboard" msgstr "Kopiert den ausgewählten Bereich in die Zwischenablage" -#: kdiff3.cpp:554 +#: kdiff3.cpp:553 #, kde-format msgid "Pastes the clipboard contents to current position" msgstr "Fügt den Inhalt der Zwischenablage an der aktuellen Position ein" -#: kdiff3.cpp:557 +#: kdiff3.cpp:556 #, kde-format msgid "Select everything in current window" msgstr "Alles in aktuellem Fenster auswählen" -#: kdiff3.cpp:560 +#: kdiff3.cpp:559 #, kde-format msgid "Search for a string" msgstr "Nach Text suchen" -#: kdiff3.cpp:562 +#: kdiff3.cpp:561 #, kde-format msgid "Search again for the string" msgstr "Weitersuchen" -#: kdiff3.cpp:567 +#: kdiff3.cpp:566 #, kde-format msgid "Enables/disables the statusbar" msgstr "Blendet die Statusleiste ein/aus" -#: kdiff3.cpp:571 +#: kdiff3.cpp:570 #, kde-format msgid "Configure KDiff3..." msgstr "KDiff3 einrichten ..." -#: kdiff3.cpp:590 +#: kdiff3.cpp:589 #, kde-format msgid "Go to Current Delta" msgstr "Zu aktuellem Unterschied springen" -#: kdiff3.cpp:590 +#: kdiff3.cpp:589 #, kde-format msgid "" "Current\n" @@ -1184,12 +1190,12 @@ "Aktueller\n" "Unterschied" -#: kdiff3.cpp:592 +#: kdiff3.cpp:591 #, kde-format msgid "Go to First Delta" msgstr "Zum ersten Unterschied springen" -#: kdiff3.cpp:592 +#: kdiff3.cpp:591 #, kde-format msgid "" "First\n" @@ -1198,12 +1204,12 @@ "Erster\n" "Unterschied" -#: kdiff3.cpp:594 +#: kdiff3.cpp:593 #, kde-format msgid "Go to Last Delta" msgstr "Zum letzten Unterschied springen" -#: kdiff3.cpp:594 +#: kdiff3.cpp:593 #, kde-format msgid "" "Last\n" @@ -1212,14 +1218,14 @@ "Letzter\n" "Unterschied" -#: kdiff3.cpp:596 +#: kdiff3.cpp:595 #, kde-format 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:597 +#: kdiff3.cpp:596 #, kde-format msgid "" "(Does not skip white space differences even when \"Show White Space\" is " @@ -1228,12 +1234,12 @@ "(Unterschiede in Leerräumen werden nicht übersprungen, auch wenn „Leerräume " "anzeigen“ ausgeschaltet ist.)" -#: kdiff3.cpp:598 +#: kdiff3.cpp:597 #, kde-format msgid "Go to Previous Delta" msgstr "Zu vorherigem Unterschied springen" -#: kdiff3.cpp:598 +#: kdiff3.cpp:597 #, kde-format msgid "" "Prev\n" @@ -1242,12 +1248,12 @@ "Vorheriger\n" "Unterschied" -#: kdiff3.cpp:600 +#: kdiff3.cpp:599 #, kde-format msgid "Go to Next Delta" msgstr "Zu nächstem Unterschied springen" -#: kdiff3.cpp:600 +#: kdiff3.cpp:599 #, kde-format msgid "" "Next\n" @@ -1256,12 +1262,12 @@ "Nächster\n" "Unterschied" -#: kdiff3.cpp:602 +#: kdiff3.cpp:601 #, kde-format msgid "Go to Previous Conflict" msgstr "Zu vorherigem Konflikt springen" -#: kdiff3.cpp:602 +#: kdiff3.cpp:601 #, kde-format msgid "" "Prev\n" @@ -1270,12 +1276,12 @@ "Vorheriger\n" "Konflikt" -#: kdiff3.cpp:604 +#: kdiff3.cpp:603 #, kde-format msgid "Go to Next Conflict" msgstr "Zu nächstem Konflikt springen" -#: kdiff3.cpp:604 +#: kdiff3.cpp:603 #, kde-format msgid "" "Next\n" @@ -1284,12 +1290,12 @@ "Nächster\n" "Konflikt" -#: kdiff3.cpp:606 +#: kdiff3.cpp:605 #, kde-format msgid "Go to Previous Unsolved Conflict" msgstr "Zu vorherigem ungelösten Konflikt springen" -#: kdiff3.cpp:606 +#: kdiff3.cpp:605 #, kde-format msgid "" "Prev\n" @@ -1298,12 +1304,12 @@ "Vorheriger\n" "Ungelöster" -#: kdiff3.cpp:608 +#: kdiff3.cpp:607 #, kde-format msgid "Go to Next Unsolved Conflict" msgstr "Zu nächstem ungelösten Konflikt springen" -#: kdiff3.cpp:608 +#: kdiff3.cpp:607 #, kde-format msgid "" "Next\n" @@ -1312,12 +1318,12 @@ "Nächster\n" "Ungelöster" -#: kdiff3.cpp:610 +#: kdiff3.cpp:609 #, kde-format msgid "Select Line(s) From A" msgstr "Zeile(n) von A wählen" -#: kdiff3.cpp:610 +#: kdiff3.cpp:609 #, kde-format msgid "" "Choose\n" @@ -1326,12 +1332,12 @@ "Wähle\n" "A" -#: kdiff3.cpp:611 +#: kdiff3.cpp:610 #, kde-format msgid "Select Line(s) From B" msgstr "Zeile(n) von B wählen" -#: kdiff3.cpp:611 +#: kdiff3.cpp:610 #, kde-format msgid "" "Choose\n" @@ -1340,12 +1346,12 @@ "Wähle\n" "B" -#: kdiff3.cpp:612 +#: kdiff3.cpp:611 #, kde-format msgid "Select Line(s) From C" msgstr "Zeile(n) von C wählen" -#: kdiff3.cpp:612 +#: kdiff3.cpp:611 #, kde-format msgid "" "Choose\n" @@ -1354,12 +1360,12 @@ "Wähle\n" "C" -#: kdiff3.cpp:613 +#: kdiff3.cpp:612 #, kde-format msgid "Automatically Go to Next Unsolved Conflict After Source Selection" msgstr "Automatisch zu nächstem ungelösten Konflikt weiterspringen" -#: kdiff3.cpp:613 +#: kdiff3.cpp:612 #, kde-format msgid "" "Auto\n" @@ -1368,12 +1374,12 @@ "Automatisch\n" "zum nächsten" -#: kdiff3.cpp:615 +#: kdiff3.cpp:614 #, kde-format msgid "Show Space && Tabulator Characters" msgstr "Leer- und Tabulator-Zeichen anzeigen" -#: kdiff3.cpp:615 +#: kdiff3.cpp:614 #, kde-format msgid "" "White\n" @@ -1382,12 +1388,12 @@ "Leer-\n" "räume" -#: kdiff3.cpp:616 +#: kdiff3.cpp:615 #, kde-format msgid "Show White Space" msgstr "Leerräume anzeigen" -#: kdiff3.cpp:616 +#: kdiff3.cpp:615 #, kde-format msgid "" "White\n" @@ -1396,12 +1402,12 @@ "Leerraum-\n" "Unterschiede" -#: kdiff3.cpp:618 +#: kdiff3.cpp:617 #, kde-format msgid "Show Line Numbers" msgstr "Zeilennummern anzeigen" -#: kdiff3.cpp:618 +#: kdiff3.cpp:617 #, kde-format msgid "" "Line\n" @@ -1410,132 +1416,132 @@ "Zeilen-\n" "nummern" -#: kdiff3.cpp:620 +#: kdiff3.cpp:619 #, kde-format msgid "Automatically Solve Simple Conflicts" msgstr "Einfache Konflikte automatisch lösen" -#: kdiff3.cpp:621 +#: kdiff3.cpp:620 #, kde-format msgid "Set Deltas to Conflicts" msgstr "Alle Unterschiede zu Konflikten machen" -#: kdiff3.cpp:622 +#: kdiff3.cpp:621 #, kde-format msgid "Run Regular Expression Auto Merge" msgstr "Zusammenführung über regulären Ausdruck starten" -#: kdiff3.cpp:623 +#: kdiff3.cpp:622 #, kde-format msgid "Automatically Solve History Conflicts" msgstr "Verlauf-Konflikte automatisch auflösen" -#: kdiff3.cpp:624 +#: kdiff3.cpp:623 #, kde-format msgid "Split Diff At Selection" msgstr "Unterschied bei der Auswahlmarkierung trennen" -#: kdiff3.cpp:625 +#: kdiff3.cpp:624 #, kde-format msgid "Join Selected Diffs" msgstr "Markierte Unterschiede verbinden" -#: kdiff3.cpp:627 +#: kdiff3.cpp:626 #, kde-format msgid "Show Window A" msgstr "Fenster A anzeigen" -#: kdiff3.cpp:628 +#: kdiff3.cpp:627 #, kde-format msgid "Show Window B" msgstr "Fenster B anzeigen" -#: kdiff3.cpp:629 +#: kdiff3.cpp:628 #, kde-format msgid "Show Window C" msgstr "Fenster C anzeigen" -#: kdiff3.cpp:631 +#: kdiff3.cpp:630 #, kde-format msgid "Normal Overview" msgstr "Normale Übersicht" -#: kdiff3.cpp:632 +#: kdiff3.cpp:631 #, kde-format msgid "A vs. B Overview" msgstr "A/B-Übersicht" -#: kdiff3.cpp:633 +#: kdiff3.cpp:632 #, kde-format msgid "A vs. C Overview" msgstr "A/C-Übersicht" -#: kdiff3.cpp:634 +#: kdiff3.cpp:633 #, kde-format msgid "B vs. C Overview" msgstr "B/C-Übersicht" -#: kdiff3.cpp:635 +#: kdiff3.cpp:634 #, kde-format msgid "Word Wrap Diff Windows" msgstr "Zeilenumbruch für Vergleichsanzeige" -#: kdiff3.cpp:636 +#: kdiff3.cpp:635 #, kde-format msgid "Add Manual Diff Alignment" msgstr "Manuelle Ausrichtung hinzufügen" -#: kdiff3.cpp:637 +#: kdiff3.cpp:636 #, kde-format msgid "Clear All Manual Diff Alignments" msgstr "Alle manuellen Ausrichtungen entfernen" -#: kdiff3.cpp:639 +#: kdiff3.cpp:638 #, kde-format msgid "Focus Next Window" msgstr "Nächstes Fenster aktivieren" -#: kdiff3.cpp:640 +#: kdiff3.cpp:639 #, kde-format msgid "Focus Prev Window" msgstr "Vorheriges Fenster aktivieren" -#: kdiff3.cpp:641 +#: kdiff3.cpp:640 #, kde-format msgid "Toggle Split Orientation" msgstr "Ausrichtung der Fensterteilung umschalten" -#: kdiff3.cpp:643 +#: kdiff3.cpp:642 #, kde-format msgid "Dir && Text Split Screen View" msgstr "Ordner- && Textansicht teilen sich Hauptfenster" -#: kdiff3.cpp:645 +#: kdiff3.cpp:644 #, kde-format msgid "Toggle Between Dir && Text View" msgstr "Zwischen Ordner- && Textansicht umschalten" -#: kdiff3.cpp:697 pdiff.cpp:1909 +#: kdiff3.cpp:696 pdiff.cpp:1919 #, kde-format msgid "The merge result has not been saved." msgstr "Das Ergebnis der Zusammenführung wurde nicht gespeichert." -#: kdiff3.cpp:699 +#: kdiff3.cpp:698 #, kde-format msgid "Save && Quit" msgstr "Speichern && Beenden" -#: kdiff3.cpp:700 +#: kdiff3.cpp:699 #, kde-format msgid "Quit Without Saving" msgstr "Ohne zu speichern beenden" -#: kdiff3.cpp:708 pdiff.cpp:1920 +#: kdiff3.cpp:707 pdiff.cpp:1930 #, kde-format msgid "Saving the merge result failed." msgstr "Speichern des Ergebnisses der Zusammenführung ist fehlgeschlagen." -#: kdiff3.cpp:719 pdiff.cpp:1032 +#: kdiff3.cpp:718 pdiff.cpp:1030 #, kde-format msgid "" "You are currently doing a directory merge. Are you sure, you want to abort?" @@ -1543,62 +1549,62 @@ "Sie führen eine Ordnerzusammenführung durch. Sind Sie sicher, dass Sie diese " "beenden möchten?" -#: kdiff3.cpp:742 +#: kdiff3.cpp:741 #, kde-format msgid "Saving file..." msgstr "Datei wird gespeichert ..." -#: kdiff3.cpp:759 +#: kdiff3.cpp:758 #, kde-format msgid "Saving file with a new filename..." msgstr "Datei wird unter neuem Namen gespeichert ..." -#: kdiff3.cpp:761 +#: kdiff3.cpp:760 #, kde-format msgid "Save As..." msgstr "Speichern unter ..." -#: kdiff3.cpp:820 +#: kdiff3.cpp:819 #, kde-format msgid "Printing not implemented." msgstr "Eine Druckfunktion ist zurzeit noch nicht verfügbar." -#: kdiff3.cpp:857 +#: kdiff3.cpp:858 #, kde-format msgid "Printing..." msgstr "Druckvorgang läuft ..." -#: kdiff3.cpp:943 +#: kdiff3.cpp:948 #, kde-format msgid "Printing page %1 of %2" msgstr "Seite %1 von %2 wird gedruckt" -#: kdiff3.cpp:1000 +#: kdiff3.cpp:1006 #, kde-format msgid " (Selection)" msgstr " (Auswahl)" -#: kdiff3.cpp:1027 +#: kdiff3.cpp:1034 #, kde-format msgid "Printing completed." msgstr "Drucken beendet." -#: kdiff3.cpp:1031 +#: kdiff3.cpp:1038 #, kde-format msgid "Printing aborted." msgstr "Drucken abgebrochen." -#: kdiff3.cpp:1038 +#: kdiff3.cpp:1045 #, kde-format msgid "Exiting..." msgstr "Wird beendet ..." -#: kdiff3.cpp:1049 +#: kdiff3.cpp:1056 #, kde-format msgid "Toggling toolbar..." msgstr "Werkzeugleiste anzeigen/ausblenden ..." -#: kdiff3.cpp:1070 +#: kdiff3.cpp:1077 #, kde-format msgid "Toggle the statusbar..." msgstr "Statusleiste anzeigen/ausblenden ..." @@ -1623,7 +1629,7 @@ msgid "Joachim Eibl" msgstr "Joachim Eibl" -#: kdiff3_part.cpp:173 kdiff3_part.cpp:254 +#: kdiff3_part.cpp:174 kdiff3_part.cpp:255 #, kde-format msgid "Could not find files for comparison." msgstr "Dateien für Vergleich wurden nicht gefunden." @@ -1641,7 +1647,7 @@ msgstr "KDiff3 einrichten" #. i18n: ectx: ToolBar (mainToolBar) -#: kdiff3_part.rc:16 main.cpp:88 +#: kdiff3_part.rc:16 main.cpp:89 #, kde-format msgid "KDiff3" msgstr "KDiff3" @@ -1711,87 +1717,92 @@ msgid "Main Toolbar" msgstr "Haupt-Werkzeugleiste" -#: main.cpp:68 main.cpp:72 +#: main.cpp:69 main.cpp:73 #, kde-format msgid "Ignored. (User defined.)" msgstr "Ignoriert. (Benutzerdefiniert.)" -#: main.cpp:92 +#: main.cpp:93 #, kde-format msgid " (64 bit)" msgstr " (64 bit)" -#: main.cpp:94 +#: main.cpp:95 #, kde-format msgid " (32 bit)" msgstr " (32 bit)" -#: main.cpp:95 +#: main.cpp:96 #, kde-format msgid "Tool for Comparison and Merge of Files and Directories" msgstr "Programm zum Vergleichen und Zusammenführen von Dateien und Ordnern" -#: main.cpp:96 +#: main.cpp:97 #, kde-format msgid "(c) 2002-2014 Joachim Eibl, (c) 2017 Michael Reeves KF5/Qt5 port" msgstr "" "Copyright © 2002-2014 Joachim Eibl, Copyright © 2017 Michael Reeves " "Portierung zu KF5/Qt5" -#: main.cpp:112 +#: main.cpp:113 #, kde-format msgid "Merge the input." msgstr "Quellen zusammenführen." -#: main.cpp:113 +#: main.cpp:114 #, kde-format msgid "Explicit base file. For compatibility with certain tools." msgstr "Explizite Basisdatei. Für Kompatibilität mit anderen Werkzeugen." -#: main.cpp:114 +#: main.cpp:115 #, kde-format msgid "Output file. Implies -m. E.g.: -o newfile.txt" msgstr "Ergebnisdateiname bei Zusammenführung. z. B.: -o neu.txt" -#: main.cpp:115 +#: main.cpp:116 #, kde-format msgid "Output file, again. (For compatibility with certain tools.)" msgstr "Ergebnisdatei. (Für Kompatibilität mit anderen Werkzeugen.)" -#: main.cpp:116 +#: main.cpp:118 #, kde-format msgid "No GUI if all conflicts are auto-solvable. (Needs -o file)" msgstr "" "Kein Fenster anzeigen, wenn alle Konflikte automatisch auflösbar sind. " "(Benötigt -o)" -#: main.cpp:117 +#: main.cpp:120 +#, kde-format +msgid "Ignored." +msgstr "Ignoriert." + +#: main.cpp:122 #, kde-format msgid "Do not solve conflicts automatically." msgstr "Konflikte nicht automatisch lösen." -#: main.cpp:118 +#: main.cpp:123 #, kde-format msgid "Visible name replacement for input file 1 (base)." msgstr "Anderer angezeigter Dateiname für erste Datei (Basis)." -#: main.cpp:119 +#: main.cpp:124 #, kde-format msgid "Visible name replacement for input file 2." msgstr "Anderer angezeigter Dateiname für zweite Datei." -#: main.cpp:120 +#: main.cpp:125 #, kde-format msgid "Visible name replacement for input file 3." msgstr "Anderer angezeigter Dateiname für dritte Datei." -#: main.cpp:121 +#: main.cpp:126 #, kde-format msgid "Alternative visible name replacement. Supply this once for every input." msgstr "" "Anderer angezeigter Dateiname: Kann für jede Quelle spezifiziert werden." -#: main.cpp:122 +#: main.cpp:127 #, kde-format msgid "" "Override a config setting. Use once for every setting. E.g.: --cs " @@ -1800,89 +1811,89 @@ "Eine Einstellung ändern. Je Einstellung verwendbar. z. B.: --cs " "„AutoAdvance=1“" -#: main.cpp:123 +#: main.cpp:128 #, kde-format msgid "Show list of config settings and current values." msgstr "Liste aller Einstellungen und aktueller Werte anzeigen." -#: main.cpp:124 +#: main.cpp:129 #, kde-format msgid "Use a different config file." msgstr "Eine andere Einstellungsdatei verwenden." -#: main.cpp:127 +#: main.cpp:132 #, kde-format msgid "file1 to open (base, if not specified via --base)" msgstr "Erste Datei (Basis, falls nicht --base verwendet wird)" -#: main.cpp:128 +#: main.cpp:133 #, kde-format msgid "file2 to open" msgstr "Zweite Datei" -#: main.cpp:129 +#: main.cpp:134 #, kde-format msgid "file3 to open" msgstr "Dritte Datei" -#: main.cpp:153 +#: main.cpp:158 #, kde-format msgid "See kdiff3 --help for supported options." msgstr "kdiff3 --help zeigt all unterstützten Optionen." -#: mergeresultwindow.cpp:158 +#: mergeresultwindow.cpp:171 #, kde-format msgid "Choose A Everywhere" msgstr "Für alle A wählen" -#: mergeresultwindow.cpp:159 +#: mergeresultwindow.cpp:172 #, kde-format msgid "Choose B Everywhere" msgstr "Für alle B wählen" -#: mergeresultwindow.cpp:160 +#: mergeresultwindow.cpp:173 #, kde-format msgid "Choose C Everywhere" msgstr "Für alle C wählen" -#: mergeresultwindow.cpp:161 +#: mergeresultwindow.cpp:174 #, kde-format msgid "Choose A for All Unsolved Conflicts" msgstr "Für alle ungelösten Konflikte A wählen" -#: mergeresultwindow.cpp:162 +#: mergeresultwindow.cpp:175 #, kde-format msgid "Choose B for All Unsolved Conflicts" msgstr "Für alle ungelösten Konflikte B wählen" -#: mergeresultwindow.cpp:163 +#: mergeresultwindow.cpp:176 #, kde-format msgid "Choose C for All Unsolved Conflicts" msgstr "Für alle ungelösten Konflikte C wählen" -#: mergeresultwindow.cpp:164 +#: mergeresultwindow.cpp:177 #, kde-format msgid "Choose A for All Unsolved Whitespace Conflicts" msgstr "Für alle ungelösten Leerraum-Konflikte A wählen" -#: mergeresultwindow.cpp:165 +#: mergeresultwindow.cpp:178 #, kde-format msgid "Choose B for All Unsolved Whitespace Conflicts" msgstr "Für alle ungelösten Leerraum-Konflikte B wählen" -#: mergeresultwindow.cpp:166 +#: mergeresultwindow.cpp:179 #, kde-format msgid "Choose C for All Unsolved Whitespace Conflicts" msgstr "Für alle ungelösten Leerraum-Konflikte C wählen" -#: mergeresultwindow.cpp:176 +#: mergeresultwindow.cpp:204 #, kde-format msgid "Number of remaining unsolved conflicts: %1 (of which %2 are whitespace)" msgstr "" "Anzahl der verbleibenden ungelösten Konflikte: %1 (%2 davon Leerraum-" "Konflikte)" -#: mergeresultwindow.cpp:370 +#: mergeresultwindow.cpp:398 #, kde-format msgid "" "The output has been modified.\n" @@ -1891,29 +1902,29 @@ "Das Ergebnis wurde verändert.\n" "Wenn Sie fortsetzen, gehen die Änderungen verloren." -#: mergeresultwindow.cpp:936 pdiff.cpp:827 +#: mergeresultwindow.cpp:964 pdiff.cpp:817 #, kde-format msgid "All input files are binary equal." msgstr "Alle Quelldateien sind binär identisch." -#: mergeresultwindow.cpp:938 +#: mergeresultwindow.cpp:966 #, kde-format msgid "All input files contain the same text." msgstr "Alle Quelldateien enthalten den gleichen Text." -#: mergeresultwindow.cpp:942 mergeresultwindow.cpp:946 -#: mergeresultwindow.cpp:950 pdiff.cpp:833 pdiff.cpp:837 pdiff.cpp:841 +#: mergeresultwindow.cpp:970 mergeresultwindow.cpp:974 +#: mergeresultwindow.cpp:978 pdiff.cpp:823 pdiff.cpp:827 pdiff.cpp:831 #, kde-format msgid "Files %1 and %2 are binary equal.\n" msgstr "Die Dateien %1 und %2 sind binär identisch.\n" -#: mergeresultwindow.cpp:944 mergeresultwindow.cpp:948 -#: mergeresultwindow.cpp:952 +#: mergeresultwindow.cpp:972 mergeresultwindow.cpp:976 +#: mergeresultwindow.cpp:980 #, kde-format msgid "Files %1 and %2 have equal text.\n" msgstr "Die Dateien %1 und %2 enthalten den gleichen Text. \n" -#: mergeresultwindow.cpp:958 +#: mergeresultwindow.cpp:986 #, kde-format msgid "" "Total number of conflicts: %1\n" @@ -1926,27 +1937,27 @@ "Anzahl der ungelösten Konflikte: %3\n" "%4" -#: mergeresultwindow.cpp:964 +#: mergeresultwindow.cpp:992 #, kde-format msgid "Conflicts" msgstr "Konflikte" -#: mergeresultwindow.cpp:1873 +#: mergeresultwindow.cpp:1901 #, kde-format msgid "" msgstr "" -#: mergeresultwindow.cpp:1881 +#: mergeresultwindow.cpp:1909 #, kde-format msgid "" msgstr "" -#: mergeresultwindow.cpp:1883 mergeresultwindow.cpp:2755 +#: mergeresultwindow.cpp:1911 mergeresultwindow.cpp:2783 #, kde-format msgid "" msgstr "" -#: mergeresultwindow.cpp:2967 +#: mergeresultwindow.cpp:2995 #, kde-format msgid "" "Not all conflicts are solved yet.\n" @@ -1955,12 +1966,12 @@ "Noch sind nicht alle Konflikte aufgelöst.\n" "Die Datei wurde nicht gespeichert." -#: mergeresultwindow.cpp:2969 mergeresultwindow.cpp:2978 +#: mergeresultwindow.cpp:2997 mergeresultwindow.cpp:3006 #, kde-format msgid "Conflicts Left" msgstr "Es sind noch ungelöste Konflikte übrig" -#: mergeresultwindow.cpp:2976 +#: mergeresultwindow.cpp:3004 #, kde-format msgid "" "There is a line end style conflict. Please choose the line end style " @@ -1971,7 +1982,7 @@ "Zeilenende.\n" "Die Datei wurde nicht gespeichert." -#: mergeresultwindow.cpp:2990 +#: mergeresultwindow.cpp:3018 #, kde-format msgid "" "\n" @@ -1983,57 +1994,57 @@ "Anlegen der Sicherungskopie ist fehlgeschlagen. Die Datei wurde nicht " "gespeichert." -#: mergeresultwindow.cpp:2990 mergeresultwindow.cpp:3038 +#: mergeresultwindow.cpp:3018 mergeresultwindow.cpp:3066 #, kde-format msgid "File Save Error" msgstr "Fehler beim Speichern der Datei" -#: mergeresultwindow.cpp:3038 +#: mergeresultwindow.cpp:3066 #, kde-format msgid "Error while writing." msgstr "Fehler beim Schreiben." -#: mergeresultwindow.cpp:3110 +#: mergeresultwindow.cpp:3138 #, kde-format msgid "Output:" msgstr "Ausgabe:" -#: mergeresultwindow.cpp:3123 mergeresultwindow.cpp:3315 +#: mergeresultwindow.cpp:3151 mergeresultwindow.cpp:3343 #, kde-format msgid "[Modified]" msgstr "[Geändert]" -#: mergeresultwindow.cpp:3130 +#: mergeresultwindow.cpp:3158 #, kde-format msgid "Encoding for saving:" msgstr "Dateikodierung zum Speichern:" -#: mergeresultwindow.cpp:3230 +#: mergeresultwindow.cpp:3258 #, kde-format msgid "Conflict" msgstr "Konflikt" -#: mergeresultwindow.cpp:3262 +#: mergeresultwindow.cpp:3290 #, kde-format msgid "Codec from A: %1" msgstr "Codec von A: %1" -#: mergeresultwindow.cpp:3264 +#: mergeresultwindow.cpp:3292 #, kde-format msgid "Codec from B: %1" msgstr "Codec von B: %1" -#: mergeresultwindow.cpp:3266 +#: mergeresultwindow.cpp:3294 #, kde-format msgid "Codec from C: %1" msgstr "Codec von C: %1" -#: optiondialog.cpp:119 +#: optiondialog.cpp:121 #, kde-format msgid "Change Font" msgstr "Schriftart ändern" -#: optiondialog.cpp:135 optiondialog.cpp:145 +#: optiondialog.cpp:137 optiondialog.cpp:147 #, kde-format msgid "" "Font: %1, %2, %3\n" @@ -2044,125 +2055,125 @@ "\n" "Beispiel:" -#: optiondialog.cpp:388 +#: optiondialog.cpp:390 #, kde-format msgid "Unicode" msgstr "Unicode" -#: optiondialog.cpp:389 +#: optiondialog.cpp:391 #, kde-format msgid "Latin1" msgstr "Latin1" -#: optiondialog.cpp:408 +#: optiondialog.cpp:410 #, kde-format msgid "Change this if non-ASCII characters are not displayed correctly." msgstr "" "Falls die speziellen Zeichen Ihrer Sprache nicht korrekt dargestellt werden, " "können Sie diesen Wert ändern." -#: optiondialog.cpp:491 +#: optiondialog.cpp:495 #, kde-format msgid "Configure" msgstr "Einrichten" -#: optiondialog.cpp:568 +#: optiondialog.cpp:573 #, kde-format msgid "Font" msgstr "Schriftart" -#: optiondialog.cpp:570 +#: optiondialog.cpp:575 #, kde-format msgid "Editor & Diff Output Font" msgstr "Schrift für Editor & Vergleichsfenster" -#: optiondialog.cpp:589 +#: optiondialog.cpp:594 #, kde-format msgid "Application font" msgstr "Schriftart der Anwendung" -#: optiondialog.cpp:594 +#: optiondialog.cpp:599 #, kde-format msgid "File view font" msgstr "Schriftart der Dateiansicht" -#: optiondialog.cpp:613 +#: optiondialog.cpp:618 #, kde-format msgctxt "Title for color settings page" msgid "Color" msgstr "Farbe" -#: optiondialog.cpp:614 +#: optiondialog.cpp:619 #, kde-format msgid "Colors Settings" msgstr "Farbeinstellungen" -#: optiondialog.cpp:631 +#: optiondialog.cpp:644 #, kde-format msgid "Editor and Diff Views:" msgstr "Editor und Unterschiedsansicht:" -#: optiondialog.cpp:639 +#: optiondialog.cpp:652 #, kde-format msgid "Foreground color:" msgstr "Vordergrundfarbe:" -#: optiondialog.cpp:647 +#: optiondialog.cpp:660 #, kde-format msgid "Background color:" msgstr "Hintergrundfarbe:" -#: optiondialog.cpp:657 +#: optiondialog.cpp:670 #, kde-format msgid "Diff background color:" msgstr "Hintergrundfarbe bei Unterschieden:" -#: optiondialog.cpp:666 +#: optiondialog.cpp:679 #, kde-format msgid "Color A:" msgstr "Farbe für A:" -#: optiondialog.cpp:675 +#: optiondialog.cpp:688 #, kde-format msgid "Color B:" msgstr "Farbe für B:" -#: optiondialog.cpp:684 +#: optiondialog.cpp:697 #, kde-format msgid "Color C:" msgstr "Farbe für C:" -#: optiondialog.cpp:692 +#: optiondialog.cpp:705 #, kde-format msgid "Conflict color:" msgstr "Farbe für Konflikte:" -#: optiondialog.cpp:701 +#: optiondialog.cpp:714 #, kde-format msgid "Current range background color:" msgstr "Hintergrundfarbe für aktuellen Bereich:" -#: optiondialog.cpp:710 +#: optiondialog.cpp:723 #, kde-format msgid "Current range diff background color:" msgstr "Hintergrundfarbe für Unterschiede im aktuellen Bereich:" -#: optiondialog.cpp:718 +#: optiondialog.cpp:731 #, kde-format msgid "Color for manually aligned difference ranges:" msgstr "Farbe für manuell ausgerichtete Unterschiede:" -#: optiondialog.cpp:725 +#: optiondialog.cpp:738 #, kde-format msgid "Directory Comparison View:" msgstr "Ordnervergleichsansicht:" -#: optiondialog.cpp:731 +#: optiondialog.cpp:744 #, kde-format msgid "Newest file color:" msgstr "Farbe für neueste Datei:" -#: optiondialog.cpp:736 +#: optiondialog.cpp:749 #, kde-format msgid "" "Changing this color will only be effective when starting the next directory " @@ -2171,37 +2182,37 @@ "Änderung dieser Farbe wird erst beim Start des nächsten Ordnervergleichs " "wirksam." -#: optiondialog.cpp:741 +#: optiondialog.cpp:754 #, kde-format msgid "Oldest file color:" msgstr "Farbe für älteste Datei:" -#: optiondialog.cpp:750 +#: optiondialog.cpp:763 #, kde-format msgid "Middle age file color:" msgstr "Farbe für mittelalte Datei:" -#: optiondialog.cpp:759 +#: optiondialog.cpp:772 #, kde-format msgid "Color for missing files:" msgstr "Farbe für fehlende Datei:" -#: optiondialog.cpp:773 +#: optiondialog.cpp:786 #, kde-format msgid "Editor" msgstr "Editor" -#: optiondialog.cpp:774 +#: optiondialog.cpp:787 #, kde-format msgid "Editor Behavior" msgstr "Verhalten des Editors" -#: optiondialog.cpp:787 +#: optiondialog.cpp:809 #, kde-format msgid "Tab inserts spaces" msgstr "Tabulator fügt Leerzeichen ein" -#: optiondialog.cpp:791 +#: optiondialog.cpp:813 #, kde-format msgid "" "On: Pressing tab generates the appropriate number of spaces.\n" @@ -2210,29 +2221,29 @@ "Falls aktiv wird bei Betätigen der Tabulator-Taste die passende Anzahl\n" "Leerzeichen eingefügt. Sonst wird ein Tabulatorzeichen eingefügt." -#: optiondialog.cpp:796 +#: optiondialog.cpp:818 #, kde-format msgid "Tab size:" msgstr "Tabulatorweite:" -#: optiondialog.cpp:803 +#: optiondialog.cpp:825 #, kde-format msgid "Auto indentation" msgstr "Automatisch einrücken" -#: optiondialog.cpp:807 +#: optiondialog.cpp:829 #, kde-format msgid "On: The indentation of the previous line is used for a new line.\n" msgstr "" "Wenn aktiv, wird die Einrückung der vorherigen Zeile bei neuen Zeilen " "übernommen.\n" -#: optiondialog.cpp:810 +#: optiondialog.cpp:832 #, kde-format msgid "Auto copy selection" msgstr "Auswahl automatisch kopieren" -#: optiondialog.cpp:814 +#: optiondialog.cpp:836 #, kde-format msgid "" "On: Any selection is immediately written to the clipboard.\n" @@ -2242,7 +2253,7 @@ "kopiert.\n" "Sonst müssen Sie sie explizit kopieren, z. B. mit Strg-C." -#: optiondialog.cpp:829 +#: optiondialog.cpp:851 #, kde-format msgid "" "Sets the line endings for when an edited file is saved.\n" @@ -2251,12 +2262,12 @@ "Legt die Kodierung für Zeilenenden beim Speichern fest.\n" "DOS/Windows: CR+LF; Unix: LF; mit CR=0D, LF=0A" -#: optiondialog.cpp:839 +#: optiondialog.cpp:861 #, kde-format msgid "Diff" msgstr "Diff" -#: optiondialog.cpp:840 +#: optiondialog.cpp:862 #, kde-format msgid "Diff Settings" msgstr "Vergleichseinstellungen" @@ -2271,12 +2282,12 @@ #. ); #. ++line; #. -#: optiondialog.cpp:865 +#: optiondialog.cpp:896 #, kde-format msgid "Ignore numbers (treat as white space)" msgstr "Zahlen ignorieren, wie Leerräume behandeln" -#: optiondialog.cpp:869 +#: optiondialog.cpp:900 #, kde-format msgid "" "Ignore number characters during line matching phase. (Similar to Ignore " @@ -2286,45 +2297,45 @@ "Zahlen werden während des Vergleichs wie Leerräume behandelt.\n" "Dies kann sinnvoll sein, wenn Dateien viele Zahlen enthalten." -#: optiondialog.cpp:873 +#: optiondialog.cpp:904 #, kde-format msgid "Ignore C/C++ comments (treat as white space)" msgstr "C/C++-Kommentare ignorieren, wie Leerräume behandeln" -#: optiondialog.cpp:876 +#: optiondialog.cpp:907 #, kde-format msgid "Treat C/C++ comments like white space." msgstr "C/C++-Kommentare wie Leerräume behandeln." # Is part of another sentence, thus no full stop -#: optiondialog.cpp:879 +#: optiondialog.cpp:910 #, kde-format msgid "Ignore case (treat as white space)" msgstr "Groß-/Kleinschreibung ignorieren, wie Leerräume behandeln" -#: optiondialog.cpp:883 +#: optiondialog.cpp:914 #, kde-format msgid "Treat case differences like white space changes. ('a'<=>'A')" msgstr "" "Unterschiede bei Groß- und Kleinschreibung wie Änderungen in Leerräumen " "behandeln. („a“<=>„A“)" -#: optiondialog.cpp:886 +#: optiondialog.cpp:917 #, kde-format msgid "Preprocessor command:" msgstr "Vorverarbeitungsbefehl:" -#: optiondialog.cpp:891 +#: optiondialog.cpp:922 #, kde-format msgid "User defined pre-processing. (See the docs for details.)" msgstr "Benutzerdefinierbare Vorverarbeitung: (Siehe Handbuch für Details.)" -#: optiondialog.cpp:894 +#: optiondialog.cpp:925 #, kde-format msgid "Line-matching preprocessor command:" msgstr "Vorverarbeitungsbefehl nur für Zeilenabgleich:" -#: optiondialog.cpp:899 +#: optiondialog.cpp:930 #, kde-format msgid "" "This pre-processor is only used during line matching.\n" @@ -2333,12 +2344,12 @@ "Dieser Vorverarbeitungsbefehl wirkt nur in der Phase des Zeilenabgleichs.\n" "(Siehe Handbuch für Details.)" -#: optiondialog.cpp:902 +#: optiondialog.cpp:933 #, kde-format msgid "Try hard (slower)" msgstr "Aufwendig suchen (langsamer)" -#: optiondialog.cpp:906 +#: optiondialog.cpp:937 #, kde-format msgid "" "Enables the --minimal option for the external diff.\n" @@ -2348,12 +2359,12 @@ "Änderungen zu suchen. \n" "Für sehr große Dateien kann der Vergleich viel langsamer sein." -#: optiondialog.cpp:910 +#: optiondialog.cpp:941 #, kde-format msgid "Align B and C for 3 input files" msgstr "B und C bei drei Eingabedateien abgleichen" -#: optiondialog.cpp:914 +#: optiondialog.cpp:945 #, kde-format msgid "" "Try to align B and C when comparing or merging three input files.\n" @@ -2366,17 +2377,24 @@ "werden können.\n" "(Voreingestellt ist dies deaktiviert.)" -#: optiondialog.cpp:926 +#: optiondialog.cpp:956 +#, fuzzy, kde-format +#| msgid "Merge" +msgctxt "Settings page" +msgid "Merge" +msgstr "Zusammenführen" + +#: optiondialog.cpp:957 #, kde-format msgid "Merge Settings" msgstr "Einstellungen für das Zusammenführen" -#: optiondialog.cpp:940 +#: optiondialog.cpp:980 #, kde-format msgid "Auto advance delay (ms):" msgstr "Verzögerung für das automatische Weiterspringen (ms):" -#: optiondialog.cpp:946 +#: optiondialog.cpp:986 #, kde-format msgid "" "When in Auto-Advance mode the result of the current selection is shown \n" @@ -2386,27 +2404,27 @@ "letzten Auswahl\n" "für diese Dauer angezeigt, bevor weiter gesprungen wird. (0-2000 ms)" -#: optiondialog.cpp:950 +#: optiondialog.cpp:990 #, kde-format msgid "Show info dialogs" msgstr "Infofenster anzeigen" -#: optiondialog.cpp:953 +#: optiondialog.cpp:993 #, kde-format msgid "Show a dialog with information about the number of conflicts." msgstr "Fenster mit Informationen über die Anzahl der Konflikte anzeigen." -#: optiondialog.cpp:956 +#: optiondialog.cpp:996 #, kde-format msgid "White space 2-file merge default:" msgstr "Leerraum-Autoauswahl bei 2 Dateien:" -#: optiondialog.cpp:961 optiondialog.cpp:974 +#: optiondialog.cpp:1001 optiondialog.cpp:1014 #, kde-format msgid "Manual Choice" msgstr "Manuelle Auswahl" -#: optiondialog.cpp:965 optiondialog.cpp:979 +#: optiondialog.cpp:1005 optiondialog.cpp:1019 #, kde-format msgid "" "Allow the merge algorithm to automatically select an input for white-space-" @@ -2415,22 +2433,22 @@ "Bei Datei-Zusammenführungen wird automatisch diese Vorauswahl für " "ausschließlich Leerraum-Konflikte gewählt." -#: optiondialog.cpp:969 +#: optiondialog.cpp:1009 #, kde-format msgid "White space 3-file merge default:" msgstr "Leerraum-Autoauswahl bei 3 Dateien:" -#: optiondialog.cpp:983 +#: optiondialog.cpp:1023 #, kde-format msgid "Automatic Merge Regular Expression" msgstr "Regulärer Ausdruck für automatische Zusammenführung" -#: optiondialog.cpp:991 smalldialogs.cpp:449 +#: optiondialog.cpp:1031 smalldialogs.cpp:459 #, kde-format msgid "Auto merge regular expression:" msgstr "Regulärer Ausdruck für automatische Zusammenführung:" -#: optiondialog.cpp:996 +#: optiondialog.cpp:1036 #, kde-format msgid "" "Regular expression for lines where KDiff3 should automatically choose one " @@ -2443,14 +2461,14 @@ "Wenn eine Konfliktzeile auf diesen regulären Ausdruck passt, wird\n" "– sofern verfügbar – C, ansonsten B ausgewählt." -#: optiondialog.cpp:1002 +#: optiondialog.cpp:1042 #, kde-format msgid "Run regular expression auto merge on merge start" msgstr "" "Zusammenführung über regulären Ausdruck beim Start einer Zusammenführung " "durchführen" -#: optiondialog.cpp:1005 +#: optiondialog.cpp:1045 #, kde-format msgid "" "Run the merge for auto merge regular expressions\n" @@ -2459,17 +2477,17 @@ "Zusammenführung über reguläre Ausdrücke sofort\n" "beim Start einer Zusammenführung ausführen.\n" -#: optiondialog.cpp:1010 +#: optiondialog.cpp:1050 #, kde-format msgid "Version Control History Merging" msgstr "Versionsverwaltungs-Verlauf-Zusammenführung" -#: optiondialog.cpp:1018 smalldialogs.cpp:476 +#: optiondialog.cpp:1058 smalldialogs.cpp:486 #, kde-format msgid "History start regular expression:" msgstr "Regulärer Ausdruck für Verlauf-Start:" -#: optiondialog.cpp:1023 +#: optiondialog.cpp:1063 #, kde-format msgid "" "Regular expression for the start of the version control history entry.\n" @@ -2480,12 +2498,12 @@ "Normalerweise enthält diese Zeile das Schlüsselwort „$Log$“.\n" "Voreinstellung: „.*\\$Log.*\\$.*“" -#: optiondialog.cpp:1029 smalldialogs.cpp:504 +#: optiondialog.cpp:1069 smalldialogs.cpp:514 #, kde-format msgid "History entry start regular expression:" msgstr "Regulärer Ausdruck für Verlauf-Eintrag-Startzeile:" -#: optiondialog.cpp:1042 +#: optiondialog.cpp:1082 #, kde-format msgid "" "A version control history entry consists of several lines.\n" @@ -2504,22 +2522,22 @@ "Leerzeilen\n" "getrennt sind. (Siehe Handbuch für Details.)" -#: optiondialog.cpp:1050 +#: optiondialog.cpp:1090 #, kde-format msgid "History merge sorting" msgstr "Sortierte Verlauf-Zusammenführung" -#: optiondialog.cpp:1053 +#: optiondialog.cpp:1093 #, kde-format msgid "Sort version control history by a key." msgstr "Schlüsselbasierte Sortierung der Versionsverwaltungs-Verlauf-Einträge" -#: optiondialog.cpp:1063 +#: optiondialog.cpp:1103 #, kde-format msgid "History entry start sort key order:" msgstr "Sortierschlüsselreihenfolge für Verlauf-Eintragsstart:" -#: optiondialog.cpp:1068 +#: optiondialog.cpp:1108 #, kde-format msgid "" "Each pair of parentheses used in the regular expression for the history " @@ -2539,40 +2557,40 @@ "Wenn der Eintrag leer ist, wird keine Sortierung durchgeführt.\n" "(Siehe Handbuch für Details)." -#: optiondialog.cpp:1079 +#: optiondialog.cpp:1119 #, kde-format msgid "Merge version control history on merge start" msgstr "" "Versionsverwaltungs-Verlauf beim Start einer Zusammenführung zusammenführen" -#: optiondialog.cpp:1082 +#: optiondialog.cpp:1122 #, kde-format msgid "Run version control history automerge on merge start." msgstr "" "Startet eine Versionsverwaltungs-Verlauf-Zusammenführung beim Start einer " "Zusammenführung" -#: optiondialog.cpp:1086 +#: optiondialog.cpp:1126 #, kde-format msgid "Max number of history entries:" msgstr "Maximale Anzahl Verlauf-Einträge:" -#: optiondialog.cpp:1090 +#: optiondialog.cpp:1130 #, kde-format msgid "Cut off after specified number. Use -1 for infinite number of entries." msgstr "Nach angegebener Anzahl abschneiden. -1 bedeutet unbegrenzt." -#: optiondialog.cpp:1094 +#: optiondialog.cpp:1134 #, kde-format msgid "Test your regular expressions" msgstr "Testen Sie Ihre regulären Ausdrücke" -#: optiondialog.cpp:1099 +#: optiondialog.cpp:1139 #, kde-format msgid "Irrelevant merge command:" msgstr "Befehl bei irrelevanter Zusammenführung:" -#: optiondialog.cpp:1104 +#: optiondialog.cpp:1144 #, kde-format msgid "" "If specified this script is run after automerge\n" @@ -2584,14 +2602,14 @@ "ausgeführt, wenn keine relevanten Änderungen erkannt wurden.\n" "Der Aufruf erfolgt mit den Parametern: Dateiname1 Dateiname2 Dateiname3" -#: optiondialog.cpp:1109 +#: optiondialog.cpp:1149 #, kde-format msgid "Auto save and quit on merge without conflicts" msgstr "" "Automatisch speichern und beenden, wenn ohne Konflikte zusammengeführt " "werden kann" -#: optiondialog.cpp:1113 +#: optiondialog.cpp:1153 #, kde-format msgid "" "If KDiff3 was started for a file-merge from the command line and all\n" @@ -2605,27 +2623,27 @@ "Benutzerinteraktion aufzulösen sind.\n" "(Ähnlich zur Befehlszeilen-Option „--auto“)." -#: optiondialog.cpp:1124 optiondialog.cpp:1125 +#: optiondialog.cpp:1164 optiondialog.cpp:1165 #, kde-format msgid "Directory" msgstr "Ordner" -#: optiondialog.cpp:1137 +#: optiondialog.cpp:1185 #, kde-format msgid "Recursive directories" msgstr "Unterordner einbeziehen" -#: optiondialog.cpp:1140 +#: optiondialog.cpp:1188 #, kde-format msgid "Whether to analyze subdirectories or not." msgstr "Falls aktiv, werden auch Unterordner eingelesen." -#: optiondialog.cpp:1142 +#: optiondialog.cpp:1190 #, kde-format msgid "File pattern(s):" msgstr "Datei-Muster:" -#: optiondialog.cpp:1148 +#: optiondialog.cpp:1196 #, kde-format msgid "" "Pattern(s) of files to be analyzed. \n" @@ -2636,12 +2654,12 @@ "Platzhalterzeichen: „*“ und „?“\n" "Es können mehrere Muster getrennt durch „;“ angegeben werden." -#: optiondialog.cpp:1153 +#: optiondialog.cpp:1201 #, kde-format msgid "File-anti-pattern(s):" msgstr "Datei-Ausschlussmuster:" -#: optiondialog.cpp:1159 +#: optiondialog.cpp:1207 #, kde-format msgid "" "Pattern(s) of files to be excluded from analysis. \n" @@ -2652,12 +2670,12 @@ "Platzhalterzeichen: „*“ und „?“\n" "Es können mehrere Muster getrennt durch „;“ angegeben werden." -#: optiondialog.cpp:1164 +#: optiondialog.cpp:1212 #, kde-format msgid "Dir-anti-pattern(s):" msgstr "Ordner-Ausschlussmuster:" -#: optiondialog.cpp:1170 +#: optiondialog.cpp:1218 #, kde-format msgid "" "Pattern(s) of directories to be excluded from analysis. \n" @@ -2668,12 +2686,12 @@ "Platzhalterzeichen: „*“ und „?“\n" "Es können mehrere Muster getrennt durch „;“ angegeben werden." -#: optiondialog.cpp:1175 +#: optiondialog.cpp:1223 #, kde-format msgid "Use .cvsignore" msgstr ".cvsignore verwenden" -#: optiondialog.cpp:1179 +#: optiondialog.cpp:1227 #, kde-format msgid "" "Extends the antipattern to anything that would be ignored by CVS.\n" @@ -2683,22 +2701,22 @@ "Mit lokalen „.cvsignore“-Dateien kann dies für einzelne Ordner eingestellt " "werden." -#: optiondialog.cpp:1183 +#: optiondialog.cpp:1231 #, kde-format msgid "Find hidden files and directories" msgstr "Versteckte Dateien und Ordner einbeziehen" -#: optiondialog.cpp:1186 +#: optiondialog.cpp:1234 #, kde-format msgid "Finds hidden files and directories." msgstr "Versteckte Dateien und Ordner werden einbezogen." -#: optiondialog.cpp:1189 +#: optiondialog.cpp:1237 #, kde-format msgid "Follow file links" msgstr "Datei-Verknüpfungen folgen" -#: optiondialog.cpp:1193 +#: optiondialog.cpp:1241 #, kde-format msgid "" "On: Compare the file the link points to.\n" @@ -2708,12 +2726,12 @@ "verglichen.\n" "Sonst nur die Verknüpfungen selbst." -#: optiondialog.cpp:1197 +#: optiondialog.cpp:1245 #, kde-format msgid "Follow directory links" msgstr "Ordner-Verknüpfungen folgen" -#: optiondialog.cpp:1201 +#: optiondialog.cpp:1249 #, kde-format msgid "" "On: Compare the directory the link points to.\n" @@ -2722,12 +2740,12 @@ "Falls aktiv werden die Ordner, auf die eine Verknüpfung zeigt, verglichen.\n" "Sonst nur die Verknüpfungen." -#: optiondialog.cpp:1210 +#: optiondialog.cpp:1258 #, kde-format msgid "Case sensitive filename comparison" msgstr "Groß-/Kleinschreibung bei Dateinamen" -#: optiondialog.cpp:1214 +#: optiondialog.cpp:1262 #, kde-format msgid "" "The directory comparison will compare files or directories when their names " @@ -2740,12 +2758,12 @@ "Aktivieren Sie diese Einstellung, wenn es auch auf Groß-/Kleinschreibung im " "Dateinamen ankommt. (Voreinstellung für Windows ist aus, sonst ein.)" -#: optiondialog.cpp:1218 +#: optiondialog.cpp:1266 #, kde-format msgid "Unfold all subdirectories on load" msgstr "Alle Unterordner beim Laden ausklappen" -#: optiondialog.cpp:1222 +#: optiondialog.cpp:1270 #, kde-format msgid "" "On: Unfold all subdirectories when starting a directory diff.\n" @@ -2755,12 +2773,12 @@ "ausgeklappt.\n" "Ansonsten bleiben die Unterordner eingeklappt." -#: optiondialog.cpp:1226 +#: optiondialog.cpp:1274 #, kde-format msgid "Skip directory status report" msgstr "Ordner-Statusreport überspringen" -#: optiondialog.cpp:1230 +#: optiondialog.cpp:1278 #, kde-format msgid "" "On: Do not show the Directory Comparison Status.\n" @@ -2769,27 +2787,27 @@ "Falls aktiv wird der Ordnervergleichsstatus nicht angezeigt.\n" "Ansonsten wird der Statusdialog beim Start angezeigt." -#: optiondialog.cpp:1234 +#: optiondialog.cpp:1282 #, kde-format msgid "File Comparison Mode" msgstr "Dateivergleichsmethode" -#: optiondialog.cpp:1239 +#: optiondialog.cpp:1287 #, kde-format msgid "Binary comparison" msgstr "Binärvergleich" -#: optiondialog.cpp:1241 +#: optiondialog.cpp:1289 #, kde-format msgid "Binary comparison of each file. (Default)" msgstr "Binärvergleich aller Dateien (Voreinstellung)" -#: optiondialog.cpp:1244 +#: optiondialog.cpp:1292 #, kde-format msgid "Full analysis" msgstr "Vollständige Analyse" -#: optiondialog.cpp:1246 +#: optiondialog.cpp:1294 #, kde-format msgid "" "Do a full analysis and show statistics information in extra columns.\n" @@ -2799,12 +2817,12 @@ "Spalten anzeigen.\n" "(Langsamer als Binärvergleich, viel langsamer bei Binärdateien.)" -#: optiondialog.cpp:1250 +#: optiondialog.cpp:1298 #, kde-format msgid "Trust the size and modification date (unsafe)" msgstr "Änderungsdatum vertrauen (unsicher)" -#: optiondialog.cpp:1252 +#: optiondialog.cpp:1300 #, kde-format msgid "" "Assume that files are equal if the modification date and file length are " @@ -2819,7 +2837,7 @@ "unterschiedliche angezeigt.\n" "Hilfreich bei großen Ordnern oder langsamen Verbindungen." -#: optiondialog.cpp:1257 +#: optiondialog.cpp:1305 #, kde-format msgid "" "Trust the size and date, but use binary comparison if date does not match " @@ -2828,7 +2846,7 @@ "Größe und Datum vertrauen, aber binär vergleichen, wenn Datum nicht " "übereinstimmt (unsicher)" -#: optiondialog.cpp:1259 +#: optiondialog.cpp:1307 #, kde-format msgid "" "Assume that files are equal if the modification date and file length are " @@ -2842,12 +2860,12 @@ "verglichen.\n" "Hilfreich bei großen Ordnern oder langsamen Verbindungen." -#: optiondialog.cpp:1264 +#: optiondialog.cpp:1312 #, kde-format msgid "Trust the size (unsafe)" msgstr "Größe vertrauen (unsicher)" -#: optiondialog.cpp:1266 +#: optiondialog.cpp:1314 #, kde-format msgid "" "Assume that files are equal if their file lengths are equal.\n" @@ -2858,12 +2876,12 @@ "Hilfreich bei großen Ordnern oder langsamen Verbindungen, wenn das " "Änderungsdatum beim Kopieren modifiziert wird." -#: optiondialog.cpp:1273 +#: optiondialog.cpp:1321 #, kde-format msgid "Synchronize directories" msgstr "Ordner abgleichen" -#: optiondialog.cpp:1277 +#: optiondialog.cpp:1325 #, kde-format msgid "" "Offers to store files in both directories so that\n" @@ -2875,12 +2893,12 @@ "Funktioniert nur, wenn zwei Ordner verglichen werden, und kein Ziel " "angegeben ist." -#: optiondialog.cpp:1283 +#: optiondialog.cpp:1331 #, kde-format msgid "White space differences considered equal" msgstr "Dateien mit Leerraum-Unterschieden als gleich markieren" -#: optiondialog.cpp:1287 +#: optiondialog.cpp:1335 #, kde-format msgid "" "If files differ only by white space consider them equal.\n" @@ -2890,12 +2908,12 @@ "gleiche Dateien behandelt werden.\n" "Dies ist nur wählbar, wenn vollständige Analyse ausgewählt ist." -#: optiondialog.cpp:1293 +#: optiondialog.cpp:1341 #, kde-format msgid "Copy newer instead of merging (unsafe)" msgstr "Neuere Datei statt Zusammenführung auswählen (unsicher)" -#: optiondialog.cpp:1297 +#: optiondialog.cpp:1345 #, kde-format msgid "" "Do not look inside, just take the newer file.\n" @@ -2908,12 +2926,12 @@ "Falls inaktiv wird eine Zusammenführung vorgeschlagen.\n" "Nur beim Vergleich zweier Ordner wirksam." -#: optiondialog.cpp:1302 +#: optiondialog.cpp:1350 #, kde-format msgid "Backup files (.orig)" msgstr "Sicherungskopie erstellen (.orig)" -#: optiondialog.cpp:1306 +#: optiondialog.cpp:1354 #, kde-format msgid "" "If a file would be saved over an old file, then the old file\n" @@ -2922,17 +2940,17 @@ "Wenn eine Datei über eine existierende Datei gespeichert wird, bekommt die \n" "bestehende Datei die Erweiterung „.orig“ und wird nicht gelöscht." -#: optiondialog.cpp:1382 optiondialog.cpp:1383 +#: optiondialog.cpp:1430 optiondialog.cpp:1431 #, kde-format msgid "Regional Settings" msgstr "Regionaleinstellungen" -#: optiondialog.cpp:1397 +#: optiondialog.cpp:1454 #, kde-format msgid "Use the same encoding for everything:" msgstr "Überall die gleiche Kodierung verwenden:" -#: optiondialog.cpp:1401 +#: optiondialog.cpp:1458 #, kde-format msgid "" "Enable this allows to change all encodings by changing the first only.\n" @@ -2942,17 +2960,17 @@ "ersten eingestellt werden. Dies auszuschalten erlaubt individuelle " "Einstellungen." -#: optiondialog.cpp:1405 +#: optiondialog.cpp:1462 #, kde-format msgid "Note: Local Encoding is \"%1\"" msgstr "Hinweis: Die lokale Kodierung ist „%1“" -#: optiondialog.cpp:1409 +#: optiondialog.cpp:1466 #, kde-format msgid "File Encoding for A:" msgstr "Dateikodierung für A:" -#: optiondialog.cpp:1416 +#: optiondialog.cpp:1473 #, kde-format msgid "" "If enabled then Unicode (UTF-16 or UTF-8) encoding will be detected.\n" @@ -2966,32 +2984,32 @@ "verwendet.\n" "(Unicode-Erkennung hängt von den ersten Bytes der Datei ab.)" -#: optiondialog.cpp:1419 optiondialog.cpp:1430 optiondialog.cpp:1441 +#: optiondialog.cpp:1476 optiondialog.cpp:1487 optiondialog.cpp:1498 #, kde-format msgid "Auto Detect Unicode" msgstr "Unicode automatisch erkennen" -#: optiondialog.cpp:1425 +#: optiondialog.cpp:1482 #, kde-format msgid "File Encoding for B:" msgstr "Dateikodierung für B:" -#: optiondialog.cpp:1436 +#: optiondialog.cpp:1493 #, kde-format msgid "File Encoding for C:" msgstr "Dateikodierung für C:" -#: optiondialog.cpp:1447 +#: optiondialog.cpp:1504 #, kde-format msgid "File Encoding for Merge Output and Saving:" msgstr "Dateikodierung für Zusammenführung und Speichern:" -#: optiondialog.cpp:1452 +#: optiondialog.cpp:1509 #, kde-format msgid "Auto Select" msgstr "Automatisch wählen" -#: optiondialog.cpp:1456 +#: optiondialog.cpp:1513 #, kde-format msgid "" "If enabled then the encoding from the input files is used.\n" @@ -3003,17 +3021,17 @@ "Ist diese nicht eindeutig zu bestimmen, wird der Benutzer beim Speichern " "gefragt." -#: optiondialog.cpp:1459 +#: optiondialog.cpp:1516 #, kde-format msgid "File Encoding for Preprocessor Files:" msgstr "Dateikodierung für Vorverarbeitungs-Dateien:" -#: optiondialog.cpp:1471 +#: optiondialog.cpp:1528 #, kde-format msgid "Right To Left Language" msgstr "Rechts-Nach-Links-Sprache" -#: optiondialog.cpp:1475 +#: optiondialog.cpp:1532 #, kde-format msgid "" "Some languages are read from right to left.\n" @@ -3022,22 +3040,22 @@ "Einige Sprachen werden von rechts nach links gelesen.\n" "Diese Einstellung ändert die Anzeige und den Editor entsprechend." -#: optiondialog.cpp:1485 +#: optiondialog.cpp:1542 #, kde-format msgid "Integration" msgstr "Integration" -#: optiondialog.cpp:1486 +#: optiondialog.cpp:1543 #, kde-format msgid "Integration Settings" msgstr "Einstellungen für Integration" -#: optiondialog.cpp:1499 +#: optiondialog.cpp:1564 #, kde-format msgid "Command line options to ignore:" msgstr "Ignorierbare Befehlszeilenoptionen:" -#: optiondialog.cpp:1505 +#: optiondialog.cpp:1570 #, kde-format msgid "" "List of command line options that should be ignored when KDiff3 is used by " @@ -3050,12 +3068,12 @@ "Mehrere Werte können mit Trennzeichen „;“ angegeben werden.\n" "Dies wird die Fehlermeldung „Unbekannte Option“ beim Start unterdrücken. " -#: optiondialog.cpp:1510 +#: optiondialog.cpp:1575 #, kde-format msgid "Quit also via Escape key" msgstr "Auch mit der Escape-Taste beenden" -#: optiondialog.cpp:1514 +#: optiondialog.cpp:1579 #, kde-format msgid "" "Fast method to exit.\n" @@ -3064,7 +3082,7 @@ "Schnelle Art zu beenden.\n" "Für die, die es gewohnt sind, die Escape-Taste zu benutzen." -#: optiondialog.cpp:1598 +#: optiondialog.cpp:1653 #, kde-format msgid "This resets all options. Not only those of the current topic." msgstr "" @@ -3122,81 +3140,71 @@ msgid "Disable Unsafe Options" msgstr "Unsichere Einstellung deaktivieren" -#: pdiff.cpp:158 +#: pdiff.cpp:160 #, kde-format msgid "Loading A" msgstr "A wird geladen" -#: pdiff.cpp:167 +#: pdiff.cpp:162 #, kde-format -msgid "Errors occurred during pre-processing of file A." -msgstr "Es sind Fehler bei der Vorverarbeitung von Datei A aufgetreten." +msgid "Loading A: %1" +msgstr "A wird geladen: %1" -#: pdiff.cpp:172 +#: pdiff.cpp:170 #, kde-format msgid "Loading B" msgstr "B wird geladen" -#: pdiff.cpp:179 -#, kde-format -msgid "Errors occurred during pre-processing of file B." -msgstr "Es sind Fehler bei der Vorverarbeitung von Datei B aufgetreten." - -#: pdiff.cpp:202 pdiff.cpp:241 +#: pdiff.cpp:201 pdiff.cpp:237 #, kde-format msgid "Diff: A <-> B" msgstr "Vergleiche: A <-> B" -#: pdiff.cpp:208 pdiff.cpp:279 pdiff.cpp:293 +#: pdiff.cpp:207 pdiff.cpp:275 pdiff.cpp:289 #, kde-format msgid "Linediff: A <-> B" msgstr "Zeilenvergleich: A <-> B" -#: pdiff.cpp:225 +#: pdiff.cpp:224 #, kde-format msgid "Loading C" msgstr "C wird geladen" -#: pdiff.cpp:232 -#, kde-format -msgid "Errors occurred during pre-processing of file C." -msgstr "Es sind Fehler bei der Vorverarbeitung von Datei C aufgetreten." - -#: pdiff.cpp:250 +#: pdiff.cpp:246 #, kde-format msgid "Diff: A <-> C" msgstr "Vergleiche: A <-> C" -#: pdiff.cpp:261 +#: pdiff.cpp:257 #, kde-format msgid "Diff: B <-> C" msgstr "Vergleiche: B <-> C" -#: pdiff.cpp:283 pdiff.cpp:297 +#: pdiff.cpp:279 pdiff.cpp:293 #, kde-format msgid "Linediff: B <-> C" msgstr "Zeilenvergleich: B <-> C" -#: pdiff.cpp:287 pdiff.cpp:301 +#: pdiff.cpp:283 pdiff.cpp:297 #, kde-format msgid "Linediff: A <-> C" msgstr "Zeilenvergleich: A <-> C" -#: pdiff.cpp:829 +#: pdiff.cpp:819 #, kde-format 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:835 pdiff.cpp:839 pdiff.cpp:843 +#: pdiff.cpp:825 pdiff.cpp:829 pdiff.cpp:833 #, 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:853 +#: pdiff.cpp:843 #, kde-format msgid "" "Some input files do not seem to be pure text files.\n" @@ -3207,17 +3215,17 @@ "Beachten Sie, dass KDiff3 nicht für den Binärdatenvergleich konzipiert ist.\n" "Sie fahren auf eigenes Risiko fort." -#: pdiff.cpp:863 +#: pdiff.cpp:853 #, kde-format msgid ", B" msgstr ", B" -#: pdiff.cpp:865 +#: pdiff.cpp:855 #, kde-format msgid ", C" msgstr ", C" -#: pdiff.cpp:867 +#: pdiff.cpp:857 #, kde-format msgid "" "Some input characters could not be converted to valid unicode.\n" @@ -3231,77 +3239,72 @@ "Speichern Sie das Ergebnis nicht, wenn Sie sich nicht sicher sind.\n" "Die betroffenen Dateien liegen in %1." -#: pdiff.cpp:1034 +#: pdiff.cpp:1032 #, kde-format msgid "Abort" msgstr "Abbrechen" -#: pdiff.cpp:1040 pdiff.cpp:1130 +#: pdiff.cpp:1038 pdiff.cpp:1129 #, kde-format msgid "Opening files..." msgstr "Dateien werden geöffnet ..." -#: pdiff.cpp:1107 -#, kde-format -msgid "File open error" -msgstr "Fehler beim Öffnen der Datei" - -#: pdiff.cpp:1202 +#: pdiff.cpp:1212 #, kde-format msgid "Cutting selection..." msgstr "Auswahl wird ausgeschnitten ..." -#: pdiff.cpp:1223 +#: pdiff.cpp:1233 #, kde-format msgid "Copying selection to clipboard..." msgstr "Auswahl wird in Zwischenablage kopiert ..." -#: pdiff.cpp:1239 +#: pdiff.cpp:1249 #, kde-format msgid "Inserting clipboard contents..." msgstr "Inhalt der Zwischenablage wird eingefügt ..." -#: pdiff.cpp:1695 +#: pdiff.cpp:1705 #, kde-format msgid "Word wrap (Cancel disables word wrap)" msgstr "Zeilenumbruch (Abbrechen deaktiviert den Zeilenumbruch)" -#: pdiff.cpp:1696 +#: pdiff.cpp:1706 #, kde-format msgid "Calculating max width for horizontal scrollbar" msgstr "Maximale Breite wird für horizontale Bildlaufleiste berechnet" -#: pdiff.cpp:1911 +#: pdiff.cpp:1921 #, kde-format msgid "Save && Continue" msgstr "Speichern && Fortsetzen" -#: pdiff.cpp:1912 +#: pdiff.cpp:1922 #, kde-format msgid "Continue Without Saving" msgstr "Fortsetzen ohne zu speichern" -#: pdiff.cpp:2124 +#: pdiff.cpp:2134 #, kde-format msgid "Search complete." msgstr "Suche abgeschlossen." -#: pdiff.cpp:2124 +#: pdiff.cpp:2134 #, kde-format msgid "Search Complete" msgstr "Suche abgeschlossen" -#: pdiff.cpp:2375 +#: pdiff.cpp:2385 #, kde-format msgid "Nothing is selected in either diff input window." msgstr "In keinem der Unterschiedsfenster ist eine Auswahl markiert." -#: pdiff.cpp:2375 +#: pdiff.cpp:2385 #, kde-format msgid "Error while adding manual diff range" msgstr "Fehler beim Hinzufügen einer manuellen Ausrichtung." -#: progress.cpp:59 progress.cpp:71 +#: progress.cpp:61 progress.cpp:73 #, kde-format msgid "&Cancel" msgstr "&Abbrechen" @@ -3311,126 +3314,126 @@ msgid "A (Base):" msgstr "A (Basis):" -#: smalldialogs.cpp:68 smalldialogs.cpp:85 smalldialogs.cpp:102 -#: smalldialogs.cpp:144 +#: smalldialogs.cpp:71 smalldialogs.cpp:90 smalldialogs.cpp:109 +#: smalldialogs.cpp:154 #, kde-format msgid "File..." msgstr "Datei ..." -#: smalldialogs.cpp:70 smalldialogs.cpp:87 smalldialogs.cpp:104 -#: smalldialogs.cpp:146 +#: smalldialogs.cpp:73 smalldialogs.cpp:92 smalldialogs.cpp:111 +#: smalldialogs.cpp:156 #, kde-format msgid "Dir..." msgstr "Ordner ..." -#: smalldialogs.cpp:96 +#: smalldialogs.cpp:103 #, kde-format msgid "C (Optional):" msgstr "C (Optional):" -#: smalldialogs.cpp:119 +#: smalldialogs.cpp:126 #, kde-format msgid "Swap/Copy Names..." msgstr "Namen tauschen/kopieren ..." -#: smalldialogs.cpp:124 smalldialogs.cpp:125 smalldialogs.cpp:126 +#: smalldialogs.cpp:131 smalldialogs.cpp:132 smalldialogs.cpp:133 #, kde-format msgid "Swap %1<->%2" msgstr "%1<->%2 tauschen" -#: smalldialogs.cpp:127 smalldialogs.cpp:128 smalldialogs.cpp:129 +#: smalldialogs.cpp:134 smalldialogs.cpp:135 smalldialogs.cpp:136 #, kde-format msgid "Copy %1->Output" msgstr "%1->Ziel kopieren" -#: smalldialogs.cpp:130 smalldialogs.cpp:131 smalldialogs.cpp:132 +#: smalldialogs.cpp:137 smalldialogs.cpp:138 smalldialogs.cpp:139 #, kde-format msgid "Swap %1<->Output" msgstr "%1<->Ziel tauschen" -#: smalldialogs.cpp:138 +#: smalldialogs.cpp:148 #, kde-format msgid "Output (optional):" msgstr "Ziel (optional):" -#: smalldialogs.cpp:168 +#: smalldialogs.cpp:178 #, kde-format msgid "Configure..." msgstr "Einrichten ..." -#: smalldialogs.cpp:233 +#: smalldialogs.cpp:243 #, kde-format msgid "Open Directory" msgstr "Ordner öffnen" -#: smalldialogs.cpp:234 +#: smalldialogs.cpp:244 #, kde-format msgid "Select Output File" msgstr "Ausgabedatei wählen" -#: smalldialogs.cpp:393 +#: smalldialogs.cpp:403 #, kde-format msgid "Search text:" msgstr "Suchtext:" -#: smalldialogs.cpp:400 +#: smalldialogs.cpp:410 #, kde-format msgid "Case sensitive" msgstr "Groß-/Kleinschreibung beachten" -#: smalldialogs.cpp:403 +#: smalldialogs.cpp:413 #, kde-format msgid "Search A" msgstr "In A suchen" -#: smalldialogs.cpp:408 +#: smalldialogs.cpp:418 #, kde-format msgid "Search B" msgstr "In B suchen" -#: smalldialogs.cpp:413 +#: smalldialogs.cpp:423 #, kde-format msgid "Search C" msgstr "In C suchen" -#: smalldialogs.cpp:418 +#: smalldialogs.cpp:428 #, kde-format msgid "Search output" msgstr "Im Ergebnis suchen" -#: smalldialogs.cpp:425 +#: smalldialogs.cpp:435 #, kde-format msgid "&Search" msgstr "&Suchen" -#: smalldialogs.cpp:444 +#: smalldialogs.cpp:454 #, kde-format msgid "Regular Expression Tester" msgstr "Testhilfe für reguläre Ausdrücke" -#: smalldialogs.cpp:457 +#: smalldialogs.cpp:467 #, kde-format msgid "Example auto merge line:" msgstr "Beispielzeile für automatische Zusammenführung:" -#: smalldialogs.cpp:459 +#: smalldialogs.cpp:469 #, kde-format msgid "To test auto merge, copy a line as used in your files." msgstr "" "Um die automatische Zusammenführung zu testen, kopieren Sie eine Zeile aus " "Ihrer Datei." -#: smalldialogs.cpp:465 smalldialogs.cpp:493 smalldialogs.cpp:529 +#: smalldialogs.cpp:475 smalldialogs.cpp:503 smalldialogs.cpp:539 #, kde-format msgid "Match result:" msgstr "Übereinstimmungsergebnis:" -#: smalldialogs.cpp:484 +#: smalldialogs.cpp:494 #, kde-format msgid "Example history start line (with leading comment):" msgstr "Beispielzeile für Verlauf-Startzeile (mit Kommentarzeichen):" -#: smalldialogs.cpp:486 +#: smalldialogs.cpp:496 #, kde-format msgid "" "Copy a history start line as used in your files,\n" @@ -3439,17 +3442,17 @@ "Kopieren Sie eine Verlauf-Startzeile aus Ihren Dateien,\n" "inklusive der Kommentarzeichen am Anfang der Zeile." -#: smalldialogs.cpp:512 +#: smalldialogs.cpp:522 #, kde-format msgid "History sort key order:" msgstr "Verlauf-Sortierschlüsselreihenfolge:" -#: smalldialogs.cpp:520 +#: smalldialogs.cpp:530 #, kde-format msgid "Example history entry start line (without leading comment):" msgstr "Beispiel-Verlaufeintragstartzeile (ohne Kommentarzeichen):" -#: smalldialogs.cpp:522 +#: smalldialogs.cpp:532 #, kde-format msgid "" "Copy a history entry start line as used in your files,\n" @@ -3458,49 +3461,49 @@ "Kopieren Sie eine Verlaufeintragsstartzeile aus Ihren Dateien,\n" "wobei Sie hier die Kommentarzeichen am Anfang weglassen." -#: smalldialogs.cpp:536 +#: smalldialogs.cpp:546 #, kde-format msgid "Sort key result:" msgstr "Sortierschlüsselergebnis:" -#: smalldialogs.cpp:584 smalldialogs.cpp:594 smalldialogs.cpp:614 +#: smalldialogs.cpp:594 smalldialogs.cpp:604 smalldialogs.cpp:624 #, kde-format msgid "Match success." msgstr "Übereinstimmung erfolgreich." -#: smalldialogs.cpp:588 smalldialogs.cpp:598 smalldialogs.cpp:620 +#: smalldialogs.cpp:598 smalldialogs.cpp:608 smalldialogs.cpp:630 #, kde-format msgid "Match failed." msgstr "Übereinstimmung fehlgeschlagen." -#: smalldialogs.cpp:605 +#: smalldialogs.cpp:615 #, kde-format msgid "Opening and closing parentheses do not match in regular expression." msgstr "" "Öffnende und schließende runde Klammern in regulärem Ausdruck passen nicht " "zusammen." -#: SourceData.cpp:150 +#: SourceData.cpp:153 #, kde-format msgid "Writing clipboard data to temp file failed." msgstr "Speichern der Zwischenablage in temporäre Datei ist fehlgeschlagen." -#: SourceData.cpp:154 +#: SourceData.cpp:157 #, kde-format msgid "From Clipboard" msgstr "Aus Zwischenablage" -#: SourceData.cpp:335 +#: SourceData.cpp:348 #, kde-format msgid "%1 is not a normal file." msgstr "%1 ist keine normale Datei." -#: SourceData.cpp:427 +#: SourceData.cpp:440 #, kde-format msgid " Temp file is: %1" -msgstr "" +msgstr " Temporäre Datei ist %1" -#: SourceData.cpp:432 +#: SourceData.cpp:445 #, kde-format msgid "" "Preprocessing possibly failed. Check this command:\n" @@ -3516,12 +3519,12 @@ "\n" "Diese Vorverarbeitung wird nun deaktiviert." -#: SourceData.cpp:443 SourceData.cpp:512 +#: SourceData.cpp:456 SourceData.cpp:525 #, kde-format msgid "File %1 too large to process. Skipping." msgstr "Die Datei %1 ist zu groß zum Bearbeiten und wird übersprungen." -#: SourceData.cpp:487 +#: SourceData.cpp:500 #, kde-format msgid "" "The line-matching-preprocessing possibly failed. Check this command:\n" diff -Nru kdiff3-1.8.01/po/el/kdiff3fileitemactionplugin.po kdiff3-1.8.3/po/el/kdiff3fileitemactionplugin.po --- kdiff3-1.8.01/po/el/kdiff3fileitemactionplugin.po 2019-05-18 01:01:54.000000000 +0000 +++ kdiff3-1.8.3/po/el/kdiff3fileitemactionplugin.po 2020-06-25 00:18:11.000000000 +0000 @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: kdiff3fileitemactionplugin\n" -"Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2019-03-22 03:09+0100\n" +"Report-Msgid-Bugs-To: https://bugs.kde.org\n" +"POT-Creation-Date: 2019-08-30 07:40+0200\n" "PO-Revision-Date: 2012-04-22 08:16+0200\n" "Last-Translator: Dimitrios Glentadakis \n" "Language-Team: Greek \n" diff -Nru kdiff3-1.8.01/po/el/kdiff3.po kdiff3-1.8.3/po/el/kdiff3.po --- kdiff3-1.8.01/po/el/kdiff3.po 2019-05-18 01:01:54.000000000 +0000 +++ kdiff3-1.8.3/po/el/kdiff3.po 2020-06-25 00:18:11.000000000 +0000 @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: kdiff3\n" -"Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2019-04-18 08:02+0200\n" +"Report-Msgid-Bugs-To: https://bugs.kde.org\n" +"POT-Creation-Date: 2020-06-22 07:48+0200\n" "PO-Revision-Date: 2011-11-20 05:11+0300\n" "Last-Translator: Stelios \n" "Language-Team: Greek \n" @@ -29,291 +29,291 @@ msgid "Your emails" msgstr "manolis@koppermind.homelinux.org, gpantsis@gmail.com" -#: difftextwindow.cpp:412 +#: difftextwindow.cpp:414 #, kde-format msgid "File %1: Line %2" msgstr "" -#: difftextwindow.cpp:414 +#: difftextwindow.cpp:416 #, fuzzy, kde-format #| msgid "Line not available" msgid "File %1: Line not available" msgstr "Μη διαθέσιμη γραμμή" -#: difftextwindow.cpp:1780 +#: difftextwindow.cpp:1778 #, kde-format msgid "Encoding:" msgstr "Κωδικοποίηση:" -#: difftextwindow.cpp:1782 mergeresultwindow.cpp:3138 optiondialog.cpp:818 +#: difftextwindow.cpp:1781 mergeresultwindow.cpp:3166 optiondialog.cpp:840 #, kde-format msgid "Line end style:" msgstr "Στυλ τέλους γραμμής:" -#: difftextwindow.cpp:1810 directorymergewindow.cpp:382 -#: directorymergewindow.cpp:433 directorymergewindow.cpp:524 -#: directorymergewindow.cpp:3058 directorymergewindow.cpp:3189 -#: directorymergewindow.cpp:3417 mergeresultwindow.cpp:942 -#: mergeresultwindow.cpp:944 mergeresultwindow.cpp:946 -#: mergeresultwindow.cpp:948 mergeresultwindow.cpp:1814 -#: mergeresultwindow.cpp:3170 mergeresultwindow.cpp:3177 optiondialog.cpp:962 -#: optiondialog.cpp:975 pdiff.cpp:833 pdiff.cpp:835 pdiff.cpp:837 pdiff.cpp:839 -#: pdiff.cpp:861 smalldialogs.cpp:124 smalldialogs.cpp:126 smalldialogs.cpp:127 -#: smalldialogs.cpp:130 +#: difftextwindow.cpp:1809 directorymergewindow.cpp:383 +#: directorymergewindow.cpp:434 directorymergewindow.cpp:525 +#: directorymergewindow.cpp:3072 directorymergewindow.cpp:3203 +#: directorymergewindow.cpp:3431 mergeresultwindow.cpp:970 +#: mergeresultwindow.cpp:972 mergeresultwindow.cpp:974 +#: mergeresultwindow.cpp:976 mergeresultwindow.cpp:1842 +#: mergeresultwindow.cpp:3198 mergeresultwindow.cpp:3205 optiondialog.cpp:1002 +#: optiondialog.cpp:1015 pdiff.cpp:823 pdiff.cpp:825 pdiff.cpp:827 +#: pdiff.cpp:829 pdiff.cpp:851 smalldialogs.cpp:131 smalldialogs.cpp:133 +#: smalldialogs.cpp:134 smalldialogs.cpp:137 #, kde-format msgid "A" msgstr "Α" -#: difftextwindow.cpp:1810 directorymergewindow.cpp:384 -#: directorymergewindow.cpp:436 directorymergewindow.cpp:526 -#: directorymergewindow.cpp:3064 directorymergewindow.cpp:3190 -#: directorymergewindow.cpp:3418 mergeresultwindow.cpp:942 -#: mergeresultwindow.cpp:944 mergeresultwindow.cpp:950 -#: mergeresultwindow.cpp:952 mergeresultwindow.cpp:1816 -#: mergeresultwindow.cpp:3172 mergeresultwindow.cpp:3179 optiondialog.cpp:963 -#: optiondialog.cpp:976 pdiff.cpp:833 pdiff.cpp:835 pdiff.cpp:841 pdiff.cpp:843 -#: pdiff.cpp:863 smalldialogs.cpp:124 smalldialogs.cpp:125 smalldialogs.cpp:128 -#: smalldialogs.cpp:131 +#: difftextwindow.cpp:1809 directorymergewindow.cpp:385 +#: directorymergewindow.cpp:437 directorymergewindow.cpp:527 +#: directorymergewindow.cpp:3078 directorymergewindow.cpp:3204 +#: directorymergewindow.cpp:3432 mergeresultwindow.cpp:970 +#: mergeresultwindow.cpp:972 mergeresultwindow.cpp:978 +#: mergeresultwindow.cpp:980 mergeresultwindow.cpp:1844 +#: mergeresultwindow.cpp:3200 mergeresultwindow.cpp:3207 optiondialog.cpp:1003 +#: optiondialog.cpp:1016 pdiff.cpp:823 pdiff.cpp:825 pdiff.cpp:831 +#: pdiff.cpp:833 pdiff.cpp:853 smalldialogs.cpp:131 smalldialogs.cpp:132 +#: smalldialogs.cpp:135 smalldialogs.cpp:138 #, kde-format msgid "B" msgstr "Β" -#: difftextwindow.cpp:1810 directorymergewindow.cpp:386 -#: directorymergewindow.cpp:439 directorymergewindow.cpp:528 -#: directorymergewindow.cpp:3070 directorymergewindow.cpp:3191 -#: directorymergewindow.cpp:3419 mergeresultwindow.cpp:946 -#: mergeresultwindow.cpp:948 mergeresultwindow.cpp:950 -#: mergeresultwindow.cpp:952 mergeresultwindow.cpp:1818 -#: mergeresultwindow.cpp:3174 mergeresultwindow.cpp:3181 optiondialog.cpp:977 -#: pdiff.cpp:837 pdiff.cpp:839 pdiff.cpp:841 pdiff.cpp:843 pdiff.cpp:865 -#: smalldialogs.cpp:125 smalldialogs.cpp:126 smalldialogs.cpp:129 -#: smalldialogs.cpp:132 +#: difftextwindow.cpp:1809 directorymergewindow.cpp:387 +#: directorymergewindow.cpp:440 directorymergewindow.cpp:529 +#: directorymergewindow.cpp:3084 directorymergewindow.cpp:3205 +#: directorymergewindow.cpp:3433 mergeresultwindow.cpp:974 +#: mergeresultwindow.cpp:976 mergeresultwindow.cpp:978 +#: mergeresultwindow.cpp:980 mergeresultwindow.cpp:1846 +#: mergeresultwindow.cpp:3202 mergeresultwindow.cpp:3209 optiondialog.cpp:1017 +#: pdiff.cpp:827 pdiff.cpp:829 pdiff.cpp:831 pdiff.cpp:833 pdiff.cpp:855 +#: smalldialogs.cpp:132 smalldialogs.cpp:133 smalldialogs.cpp:136 +#: smalldialogs.cpp:139 #, kde-format msgid "C" msgstr "Γ" -#: difftextwindow.cpp:1810 +#: difftextwindow.cpp:1809 #, fuzzy, kde-format #| msgid "A (Base):" msgid "A (Base)" msgstr "Α (Βάση):" -#: difftextwindow.cpp:1812 +#: difftextwindow.cpp:1811 #, fuzzy, kde-format #| msgid "Encoding:" msgid "Encoding: %1" msgstr "Κωδικοποίηση:" -#: difftextwindow.cpp:1813 mergeresultwindow.cpp:3183 +#: difftextwindow.cpp:1812 mergeresultwindow.cpp:3211 #, kde-format msgid "Unix" msgstr "Unix" -#: difftextwindow.cpp:1813 mergeresultwindow.cpp:3184 +#: difftextwindow.cpp:1812 mergeresultwindow.cpp:3212 #, kde-format msgid "DOS" msgstr "DOS" -#: difftextwindow.cpp:1813 +#: difftextwindow.cpp:1812 #, fuzzy, kde-format #| msgid "Line end style:" msgid "Line end style: %1" msgstr "Στυλ τέλους γραμμής:" -#: difftextwindow.cpp:1835 kdiff3.cpp:873 +#: difftextwindow.cpp:1834 kdiff3.cpp:874 #, kde-format msgid "Top line" msgstr "Πάνω γραμμή" -#: difftextwindow.cpp:1845 +#: difftextwindow.cpp:1843 #, kde-format msgid "End" msgstr "Τέλος" -#: difftextwindow.cpp:1903 smalldialogs.cpp:235 +#: difftextwindow.cpp:1901 smalldialogs.cpp:245 #, fuzzy, kde-format #| msgid "Opening files..." msgid "Open File" msgstr "Άνοιγμα αρχείων..." -#: difftextwindow.cpp:1951 optiondialog.cpp:387 +#: difftextwindow.cpp:1943 optiondialog.cpp:389 #, kde-format msgid "Unicode, 8 bit" msgstr "Unicode, 8 bit" -#: difftextwindow.cpp:1966 +#: difftextwindow.cpp:1958 #, kde-format msgid "Other" msgstr "" -#: directorymergewindow.cpp:409 directorymergewindow.cpp:3424 +#: directorymergewindow.cpp:410 directorymergewindow.cpp:3438 #, kde-format msgid "Copy A to B" msgstr "Αντιγραφή του Α στο Β" -#: directorymergewindow.cpp:412 directorymergewindow.cpp:3425 +#: directorymergewindow.cpp:413 directorymergewindow.cpp:3439 #, kde-format msgid "Copy B to A" msgstr "Αντιγραφή του Β στο Α" -#: directorymergewindow.cpp:415 directorymergewindow.cpp:3426 +#: directorymergewindow.cpp:416 directorymergewindow.cpp:3440 #, kde-format msgid "Delete A" msgstr "Διαγραφή του Α" -#: directorymergewindow.cpp:418 directorymergewindow.cpp:3427 +#: directorymergewindow.cpp:419 directorymergewindow.cpp:3441 #, kde-format msgid "Delete B" msgstr "Διαγραφή του Β" -#: directorymergewindow.cpp:421 +#: directorymergewindow.cpp:422 #, kde-format msgid "Delete A & B" msgstr "Διαγραφή των Α & Β" -#: directorymergewindow.cpp:424 directorymergewindow.cpp:3429 +#: directorymergewindow.cpp:425 directorymergewindow.cpp:3443 #, kde-format msgid "Merge to A" msgstr "Συγχώνευση στο Α" -#: directorymergewindow.cpp:427 directorymergewindow.cpp:3430 +#: directorymergewindow.cpp:428 directorymergewindow.cpp:3444 #, kde-format msgid "Merge to B" msgstr "Συγχώνευση στο Β" -#: directorymergewindow.cpp:430 +#: directorymergewindow.cpp:431 #, kde-format msgid "Merge to A & B" msgstr "Συγχώνευση στα Α & Β" -#: directorymergewindow.cpp:442 directorymergewindow.cpp:3421 +#: directorymergewindow.cpp:443 directorymergewindow.cpp:3435 #, kde-format msgid "Delete (if exists)" msgstr "Διαγραφή (αν υπάρχει)" -#: directorymergewindow.cpp:445 directorymergewindow.cpp:448 -#: directorymergewindow.cpp:3420 optiondialog.cpp:925 smalldialogs.cpp:113 +#: directorymergewindow.cpp:446 directorymergewindow.cpp:449 +#: directorymergewindow.cpp:3434 smalldialogs.cpp:120 #, kde-format msgid "Merge" msgstr "Συγχώνευση" -#: directorymergewindow.cpp:445 directorymergewindow.cpp:448 +#: directorymergewindow.cpp:446 directorymergewindow.cpp:449 #, kde-format msgid "Merge (manual)" msgstr "Συγχώνευση (χειροκίνητη)" -#: directorymergewindow.cpp:451 +#: directorymergewindow.cpp:452 #, kde-format msgid "Error: Conflicting File Types" msgstr "Σφάλμα: Σύγκρουση τύπου αρχείων" -#: directorymergewindow.cpp:454 +#: directorymergewindow.cpp:455 #, kde-format msgid "Error: Changed and Deleted" msgstr "Σφάλμα: τροποποιήθηκε και διαγράφτηκε" -#: directorymergewindow.cpp:457 +#: directorymergewindow.cpp:458 #, kde-format msgid "Error: Dates are equal but files are not." msgstr "Σφάλμα: Οι ημερομηνίες είναι ίδιες αλλά τα αρχεία όχι." -#: directorymergewindow.cpp:471 +#: directorymergewindow.cpp:472 #, fuzzy, kde-format #| msgid "Done." msgid "Done" msgstr "Έγινε." -#: directorymergewindow.cpp:473 +#: directorymergewindow.cpp:474 #, kde-format msgid "Error" msgstr "Σφάλμα" -#: directorymergewindow.cpp:475 +#: directorymergewindow.cpp:476 #, kde-format msgid "Skipped." msgstr "Παραλείφθηκε." -#: directorymergewindow.cpp:477 +#: directorymergewindow.cpp:478 #, kde-format msgid "Not saved." msgstr "Δεν αποθηκεύτηκε." -#: directorymergewindow.cpp:479 +#: directorymergewindow.cpp:480 #, kde-format msgid "In progress..." msgstr "Σε πρόοδο..." -#: directorymergewindow.cpp:481 +#: directorymergewindow.cpp:482 #, kde-format msgid "To do." msgstr "Προς υλοποίηση." -#: directorymergewindow.cpp:522 +#: directorymergewindow.cpp:523 #, kde-format msgid "Name" msgstr "Όνομα" -#: directorymergewindow.cpp:530 +#: directorymergewindow.cpp:531 #, kde-format msgid "Operation" msgstr "Λειτουργία" -#: directorymergewindow.cpp:532 +#: directorymergewindow.cpp:533 #, kde-format msgid "Status" msgstr "Κατάσταση" -#: directorymergewindow.cpp:534 +#: directorymergewindow.cpp:535 #, kde-format msgid "Unsolved" msgstr "Μη λυμένο" -#: directorymergewindow.cpp:536 +#: directorymergewindow.cpp:537 #, kde-format msgid "Solved" msgstr "Λυμένο" -#: directorymergewindow.cpp:538 +#: directorymergewindow.cpp:539 #, kde-format msgid "Nonwhite" msgstr "Μη κενό" -#: directorymergewindow.cpp:540 +#: directorymergewindow.cpp:541 #, kde-format msgid "White" msgstr "Κενό" -#: directorymergewindow.cpp:674 +#: directorymergewindow.cpp:676 #, kde-format msgid "Unable to compare non-normal file with normal file." msgstr "" -#: directorymergewindow.cpp:688 +#: directorymergewindow.cpp:690 #, kde-format msgid "Mix of links and normal files." msgstr "Ανάμιξη δεσμών και κανονικών αρχείων." -#: directorymergewindow.cpp:695 +#: directorymergewindow.cpp:697 #, kde-format msgid "Link: " msgstr "Σύνδεσμος: " -#: directorymergewindow.cpp:704 +#: directorymergewindow.cpp:706 #, kde-format msgid "Size. " msgstr "Μέγεθος. " -#: directorymergewindow.cpp:718 directorymergewindow.cpp:728 +#: directorymergewindow.cpp:720 directorymergewindow.cpp:730 #, kde-format msgid "Date & Size: " msgstr "Ημερομηνία & μέγεθος: " -#: directorymergewindow.cpp:748 +#: directorymergewindow.cpp:751 #, kde-format msgid "Comparing file..." msgstr "Σύγκριση αρχείου..." -#: directorymergewindow.cpp:801 +#: directorymergewindow.cpp:813 #, kde-format msgid "" "You are currently doing a directory merge. Are you sure, you want to abort " @@ -322,48 +322,48 @@ "Αυτή τη στιγμή κάνετε μια συγχώνευση καταλόγου. Είστε σίγουροι ότι " "επιθυμείτε την εγκατάλειψη της συγχώνευσης και την επανασάρωση του καταλόγου;" -#: directorymergewindow.cpp:802 kdiff3.cpp:698 kdiff3.cpp:708 kdiff3.cpp:720 -#: mergeresultwindow.cpp:372 pdiff.cpp:1033 pdiff.cpp:1910 pdiff.cpp:1920 +#: directorymergewindow.cpp:814 kdiff3.cpp:697 kdiff3.cpp:707 kdiff3.cpp:719 +#: mergeresultwindow.cpp:400 pdiff.cpp:1031 pdiff.cpp:1920 pdiff.cpp:1930 #, kde-format msgid "Warning" msgstr "Προειδοποίηση" -#: directorymergewindow.cpp:803 directorymergewindow.cpp:3393 +#: directorymergewindow.cpp:815 directorymergewindow.cpp:3407 #, kde-format msgid "Rescan" msgstr "Επανασάρωση" -#: directorymergewindow.cpp:804 pdiff.cpp:1035 +#: directorymergewindow.cpp:816 pdiff.cpp:1033 #, kde-format msgid "Continue Merging" msgstr "Συνέχεια συγχώνευσης" -#: directorymergewindow.cpp:971 +#: directorymergewindow.cpp:984 #, kde-format msgid "Opening of directories failed:" msgstr "Το άνοιγμα των καταλόγων απέτυχε:" -#: directorymergewindow.cpp:975 +#: directorymergewindow.cpp:988 #, kde-format msgid "Dir A \"%1\" does not exist or is not a directory.\n" msgstr "Ο κατάλογος Α \"%1\" δεν υπάρχει ή δεν είναι κατάλογος.\n" -#: directorymergewindow.cpp:980 +#: directorymergewindow.cpp:993 #, kde-format msgid "Dir B \"%1\" does not exist or is not a directory.\n" msgstr "Ο κατάλογος Β \"%1\" δεν υπάρχει ή δεν είναι κατάλογος.\n" -#: directorymergewindow.cpp:985 +#: directorymergewindow.cpp:998 #, kde-format msgid "Dir C \"%1\" does not exist or is not a directory.\n" msgstr "Ο κατάλογος Γ \"%1\" δεν υπάρχει ή δεν είναι κατάλογος.\n" -#: directorymergewindow.cpp:988 +#: directorymergewindow.cpp:1001 #, kde-format msgid "Directory Open Error" msgstr "Σφάλμα ανοίγματος Καταλόγου" -#: directorymergewindow.cpp:996 +#: directorymergewindow.cpp:1009 #, kde-format msgid "" "The destination directory must not be the same as A or B when three " @@ -374,49 +374,49 @@ "συγχωνεύονται τρεις κατάλογοι.\n" "Κάντε έναν έλεγχο ξανά πριν συνεχίσετε." -#: directorymergewindow.cpp:998 +#: directorymergewindow.cpp:1011 #, kde-format msgid "Parameter Warning" msgstr "Προειδοποίηση παραμέτρου" -#: directorymergewindow.cpp:1003 +#: directorymergewindow.cpp:1016 #, kde-format msgid "Scanning directories..." msgstr "Σάρωση καταλόγων..." -#: directorymergewindow.cpp:1029 +#: directorymergewindow.cpp:1042 #, kde-format msgid "Reading Directory A" msgstr "Ανάγνωση καταλόγου Α" -#: directorymergewindow.cpp:1038 +#: directorymergewindow.cpp:1051 #, kde-format msgid "Reading Directory B" msgstr "Ανάγνωση καταλόγου Β" -#: directorymergewindow.cpp:1048 +#: directorymergewindow.cpp:1061 #, kde-format msgid "Reading Directory C" msgstr "Ανάγνωση καταλόγου Γ" -#: directorymergewindow.cpp:1064 +#: directorymergewindow.cpp:1077 #, kde-format msgid "Some subdirectories were not readable in" msgstr "Μερικοί υποκατάλογοι δεν είναι αναγνώσιμοι στο" -#: directorymergewindow.cpp:1069 +#: directorymergewindow.cpp:1082 #, kde-format msgid "Check the permissions of the subdirectories." msgstr "Ελέγξτε τις άδειες χρήσης των υποκαταλόγων." -#: directorymergewindow.cpp:1106 kdiff3.cpp:666 kdiff3.cpp:753 kdiff3.cpp:777 -#: kdiff3.cpp:1065 kdiff3.cpp:1086 pdiff.cpp:1116 pdiff.cpp:1170 pdiff.cpp:1218 -#: pdiff.cpp:1234 pdiff.cpp:1277 pdiff.cpp:1301 +#: directorymergewindow.cpp:1119 kdiff3.cpp:665 kdiff3.cpp:752 kdiff3.cpp:776 +#: kdiff3.cpp:1072 kdiff3.cpp:1093 pdiff.cpp:1115 pdiff.cpp:1178 pdiff.cpp:1228 +#: pdiff.cpp:1244 pdiff.cpp:1287 pdiff.cpp:1311 #, kde-format msgid "Ready." msgstr "Έτοιμο." -#: directorymergewindow.cpp:1121 +#: directorymergewindow.cpp:1134 #, kde-format msgid "" "Directory Comparison Status\n" @@ -426,23 +426,23 @@ "Number of different files: %3" msgstr "" -#: directorymergewindow.cpp:1128 +#: directorymergewindow.cpp:1141 #, fuzzy, kde-format #| msgid "Number of manual merges:" msgid "Number of manual merges: %1" msgstr "Αριθμός χειροκίνητων συγχωνεύσεων:" -#: directorymergewindow.cpp:1394 +#: directorymergewindow.cpp:1407 #, kde-format msgid "This affects all merge operations." msgstr "Αυτό επηρεάζει όλες τις συγχωνεύσεις." -#: directorymergewindow.cpp:1395 +#: directorymergewindow.cpp:1408 #, kde-format msgid "Changing All Merge Operations" msgstr "Αλλαγή όλων των λειτουργιών συγχώνευσης" -#: directorymergewindow.cpp:1695 +#: directorymergewindow.cpp:1708 #, fuzzy, kde-format #| msgid "Processing " msgid "" @@ -450,45 +450,45 @@ "%3" msgstr "Επεξεργασία " -#: directorymergewindow.cpp:1738 directorymergewindow.cpp:1742 +#: directorymergewindow.cpp:1751 directorymergewindow.cpp:1755 #, kde-format msgid "Some files could not be processed." msgstr "" -#: directorymergewindow.cpp:2222 directorymergewindow.cpp:2247 -#: directorymergewindow.cpp:2271 +#: directorymergewindow.cpp:2235 directorymergewindow.cpp:2260 +#: directorymergewindow.cpp:2285 #, kde-format msgid "This operation is currently not possible." msgstr "Αυτή η λειτουργία δεν είναι δυνατή αυτή τη στιγμή." -#: directorymergewindow.cpp:2222 directorymergewindow.cpp:2247 -#: directorymergewindow.cpp:2271 directorymergewindow.cpp:2552 +#: directorymergewindow.cpp:2235 directorymergewindow.cpp:2260 +#: directorymergewindow.cpp:2285 directorymergewindow.cpp:2565 #, kde-format msgid "Operation Not Possible" msgstr "Μη δυνατή λειτουργία" -#: directorymergewindow.cpp:2318 +#: directorymergewindow.cpp:2332 #, fuzzy, kde-format #| msgid "An error occurred while copying.\n" msgid "An error occurred while copying." msgstr "Ένα σφάλμα παρουσιάστηκε κατά την αντιγραφή.\n" -#: directorymergewindow.cpp:2319 directorymergewindow.cpp:2759 +#: directorymergewindow.cpp:2333 directorymergewindow.cpp:2772 #, kde-format msgid "Merge Error" msgstr "Σφάλμα συγχώνευσης" -#: directorymergewindow.cpp:2396 +#: directorymergewindow.cpp:2410 #, kde-format msgid "Unknown merge operation. (This must never happen!)" msgstr "Άγνωστη λειτουργία συγχώνευσης. (Δε θα έπρεπε να συμβεί ποτέ!)" -#: directorymergewindow.cpp:2441 +#: directorymergewindow.cpp:2455 #, kde-format msgid "Unknown merge operation." msgstr "Άγνωστη λειτουργία συγχώνευσης." -#: directorymergewindow.cpp:2454 +#: directorymergewindow.cpp:2468 #, kde-format msgid "" "The merge is about to begin.\n" @@ -510,22 +510,22 @@ "υπάρχει ΕΓΓΥΗΣΗ ούτως ή άλλως! Κάντε αντίγραφα ασφαλείας για τα σημαντικά " "δεδομένα σας!" -#: directorymergewindow.cpp:2459 +#: directorymergewindow.cpp:2473 #, kde-format msgid "Starting Merge" msgstr "Εκκίνηση συγχώνευσης" -#: directorymergewindow.cpp:2460 +#: directorymergewindow.cpp:2474 #, kde-format msgid "Do It" msgstr "Εκτέλεση" -#: directorymergewindow.cpp:2461 +#: directorymergewindow.cpp:2475 #, kde-format msgid "Simulate It" msgstr "Εξομοίωση" -#: directorymergewindow.cpp:2487 +#: directorymergewindow.cpp:2501 #, kde-format msgid "" "The highlighted item has a different type in the different directories. " @@ -534,7 +534,7 @@ "Το τονισμένο αντικείμενο έχει διαφορετικό τύπο σε διαφορετικούς καταλόγους. " "Επιλέξτε τι θέλετε να κάνετε." -#: directorymergewindow.cpp:2491 +#: directorymergewindow.cpp:2505 #, kde-format msgid "" "The modification dates of the file are equal but the files are not. Select " @@ -543,7 +543,7 @@ "Οι ημερομηνίες τροποποίησης των αρχείων είναι ίδιες αλλά τα αρχεία δεν " "είναι. Επιλέξτε τι θέλετε να κάνετε." -#: directorymergewindow.cpp:2495 +#: directorymergewindow.cpp:2509 #, kde-format msgid "" "The highlighted item was changed in one directory and deleted in the other. " @@ -552,7 +552,7 @@ "Το τονισμένο αντικείμενο άλλαξε σε έναν κατάλογο και διαγράφτηκε σε έναν " "άλλο. Επιλέξτε τι θέλετε να κάνετε." -#: directorymergewindow.cpp:2552 +#: directorymergewindow.cpp:2565 #, kde-format msgid "" "This operation is currently not possible because directory merge is " @@ -561,7 +561,7 @@ "Αυτή η λειτουργία δεν είναι αυτή τη στιγμή δυνατή γιατί η συγχώνευση " "καταλόγου εκτελείται αυτήν τη στιγμή." -#: directorymergewindow.cpp:2609 +#: directorymergewindow.cpp:2622 #, kde-format msgid "" "There was an error in the last step.\n" @@ -572,32 +572,32 @@ "Επιθυμείτε τη συνέχεια με το αντικείμενο που προκάλεσε το σφάλμα ή " "επιθυμείτε την παράλειψή του;" -#: directorymergewindow.cpp:2611 +#: directorymergewindow.cpp:2624 #, kde-format msgid "Continue merge after an error" msgstr "Συνέχεια συγχώνευσης μετά από ένα σφάλμα" -#: directorymergewindow.cpp:2612 +#: directorymergewindow.cpp:2625 #, kde-format msgid "Continue With Last Item" msgstr "Συνέχεια με το τελευταίο αντικείμενο" -#: directorymergewindow.cpp:2613 +#: directorymergewindow.cpp:2626 #, kde-format msgid "Skip Item" msgstr "Παράλειψη αντικειμένου" -#: directorymergewindow.cpp:2709 +#: directorymergewindow.cpp:2722 #, kde-format msgid "Merge operation complete." msgstr "Η λειτουργία συγχώνευσης ολοκληρώθηκε." -#: directorymergewindow.cpp:2709 directorymergewindow.cpp:2712 +#: directorymergewindow.cpp:2722 directorymergewindow.cpp:2725 #, kde-format msgid "Merge Complete" msgstr "Η συγχώνευση ολοκληρώθηκε" -#: directorymergewindow.cpp:2722 +#: directorymergewindow.cpp:2735 #, kde-format msgid "" "Simulated merge complete: Check if you agree with the proposed operations." @@ -605,7 +605,7 @@ "Η εξομοίωση συγχώνευσης ολοκληρώθηκε: Ελέγξτε αν συμφωνείτε με τις " "προτεινόμενες ενέργειες." -#: directorymergewindow.cpp:2758 +#: directorymergewindow.cpp:2771 #, fuzzy, kde-format #| msgid "An error occurred. Press OK to see detailed information.\n" msgid "An error occurred. Press OK to see detailed information." @@ -613,46 +613,46 @@ "Παρουσιάστηκε ένα σφάλμα. Πατήστε το Εντάξει για να δείτε λεπτομερείς " "πληροφορίες.\n" -#: directorymergewindow.cpp:2791 +#: directorymergewindow.cpp:2804 #, kde-format msgid "Error: While deleting %1: Creating backup failed." msgstr "" "Σφάλμα: Κατά τη διαγραφή του %1: Η δημιουργία του αντιγράφου ασφαλείας " "απέτυχε." -#: directorymergewindow.cpp:2798 +#: directorymergewindow.cpp:2811 #, kde-format msgid "delete directory recursively( %1 )" msgstr "αναδρομική διαγραφή καταλόγου( %1 )" -#: directorymergewindow.cpp:2800 +#: directorymergewindow.cpp:2813 #, kde-format msgid "delete( %1 )" msgstr "διαγραφή ( %1 )" -#: directorymergewindow.cpp:2815 +#: directorymergewindow.cpp:2828 #, kde-format msgid "Error: delete dir operation failed while trying to read the directory." msgstr "" "Σφάλμα: η διαγραφή καταλόγου απέτυχε κατά την προσπάθεια ανάγνωσης του " "καταλόγου." -#: directorymergewindow.cpp:2834 +#: directorymergewindow.cpp:2847 #, kde-format msgid "Error: rmdir( %1 ) operation failed." msgstr "Σφάλμα: η λειτουργία rmdir( %1 ) απέτυχε." -#: directorymergewindow.cpp:2844 +#: directorymergewindow.cpp:2857 #, kde-format msgid "Error: delete operation failed." msgstr "Σφάλμα: η διαγραφή απέτυχε." -#: directorymergewindow.cpp:2870 +#: directorymergewindow.cpp:2884 #, kde-format msgid "manual merge( %1, %2, %3 -> %4)" msgstr "χειροκίνητη συγχώνευση( %1, %2, %3 -> %4)" -#: directorymergewindow.cpp:2873 +#: directorymergewindow.cpp:2887 #, kde-format msgid "" " Note: After a manual merge the user should continue by pressing F7." @@ -660,187 +660,187 @@ " Σημείωση: Μετά από μία χειροκίνητη συγχώνευση ο χρήστης θα πρέπει να " "συνεχίσει πατώντας F7." -#: directorymergewindow.cpp:2900 +#: directorymergewindow.cpp:2914 #, kde-format msgid "Error: copy( %1 -> %2 ) failed.Deleting existing destination failed." msgstr "" "Σφάλμα: η αντιγραφή ( %1 -> %2 ) απέτυχε. Η διαγραφή του υπάρχοντος " "προορισμού απέτυχε." -#: directorymergewindow.cpp:2909 +#: directorymergewindow.cpp:2923 #, kde-format msgid "copyLink( %1 -> %2 )" msgstr "Αντιγραφή δεσμού( %1 -> %2 )" -#: directorymergewindow.cpp:2918 +#: directorymergewindow.cpp:2932 #, kde-format msgid "Error: copyLink failed: Remote links are not yet supported." msgstr "" "Σφάλμα: η αντιγραφή δεσμού απέτυχε: Οι απομακρυσμένοι δεσμοί δεν " "υποστηρίζονται ακόμα." -#: directorymergewindow.cpp:2928 +#: directorymergewindow.cpp:2942 #, kde-format msgid "Error: copyLink failed." msgstr "Σφάλμα: η αντιγραφή δεσμού απέτυχε." -#: directorymergewindow.cpp:2953 +#: directorymergewindow.cpp:2967 #, kde-format msgid "copy( %1 -> %2 )" msgstr "αντιγραφή ( %1 -> %2 )" -#: directorymergewindow.cpp:2979 +#: directorymergewindow.cpp:2993 #, kde-format msgid "Error during rename( %1 -> %2 ): Cannot delete existing destination." msgstr "" "Σφάλμα κατά την μετονομασία( %1 -> %2 ): Αδυναμία διαγραφής του υπάρχοντος " "προορισμού." -#: directorymergewindow.cpp:2986 +#: directorymergewindow.cpp:3000 #, kde-format msgid "rename( %1 -> %2 )" msgstr "μετονομασία ( %1 -> %2 )" -#: directorymergewindow.cpp:2995 +#: directorymergewindow.cpp:3009 #, kde-format msgid "Error: Rename failed." msgstr "Σφάλμα: Η μετονομασία απέτυχε." -#: directorymergewindow.cpp:3013 +#: directorymergewindow.cpp:3027 #, kde-format msgid "Error during makeDir of %1. Cannot delete existing file." msgstr "" "Σφάλμα κατά τη δημιουργία του καταλόγου %1. Αδύνατη η διαγραφή υπάρχοντος " "αρχείου." -#: directorymergewindow.cpp:3030 +#: directorymergewindow.cpp:3044 #, kde-format msgid "makeDir( %1 )" msgstr "Δημιουργία καταλόγου( %1 )" -#: directorymergewindow.cpp:3040 +#: directorymergewindow.cpp:3054 #, kde-format msgid "Error while creating directory." msgstr "Σφάλμα κατά τη δημιουργία του καταλόγου." -#: directorymergewindow.cpp:3076 directorymergewindow.cpp:3195 +#: directorymergewindow.cpp:3090 directorymergewindow.cpp:3209 #, kde-format msgid "Dest" msgstr "Προορ." -#: directorymergewindow.cpp:3084 directorymergewindow.cpp:3113 +#: directorymergewindow.cpp:3098 directorymergewindow.cpp:3127 #, kde-format msgid "Dir" msgstr "Κατ" -#: directorymergewindow.cpp:3084 +#: directorymergewindow.cpp:3098 #, kde-format msgid "Type" msgstr "Τύπος" -#: directorymergewindow.cpp:3084 +#: directorymergewindow.cpp:3098 #, kde-format msgid "Size" msgstr "Μέγεθος" -#: directorymergewindow.cpp:3085 +#: directorymergewindow.cpp:3099 #, kde-format msgid "Attr" msgstr "Ιδιοτ" -#: directorymergewindow.cpp:3085 +#: directorymergewindow.cpp:3099 #, kde-format msgid "Last Modification" msgstr "Τελευταία τροποποίηση" -#: directorymergewindow.cpp:3085 +#: directorymergewindow.cpp:3099 #, kde-format msgid "Link-Destination" msgstr "Δεσμός-προορισμός" -#: directorymergewindow.cpp:3113 +#: directorymergewindow.cpp:3127 #, kde-format msgid "File" msgstr "Αρχείο" -#: directorymergewindow.cpp:3113 +#: directorymergewindow.cpp:3127 #, fuzzy, kde-format #| msgid "Link: " msgid "-Link" msgstr "Σύνδεσμος: " -#: directorymergewindow.cpp:3119 +#: directorymergewindow.cpp:3133 #, kde-format msgid "not available" msgstr "μη διαθέσιμο" -#: directorymergewindow.cpp:3137 +#: directorymergewindow.cpp:3151 #, kde-format msgid "A (Dest): " msgstr "A (Προορ): " -#: directorymergewindow.cpp:3141 +#: directorymergewindow.cpp:3155 #, kde-format msgid "A: " msgstr "" -#: directorymergewindow.cpp:3141 +#: directorymergewindow.cpp:3155 #, kde-format msgid "A (Base): " msgstr "A (Βάση): " -#: directorymergewindow.cpp:3147 +#: directorymergewindow.cpp:3161 #, kde-format msgid "B (Dest): " msgstr "B (Προορ): " -#: directorymergewindow.cpp:3151 +#: directorymergewindow.cpp:3165 #, kde-format msgid "B: " msgstr "" -#: directorymergewindow.cpp:3156 +#: directorymergewindow.cpp:3170 #, kde-format msgid "C (Dest): " msgstr "Γ (Προορ): " -#: directorymergewindow.cpp:3160 +#: directorymergewindow.cpp:3174 #, kde-format msgid "C: " msgstr "" -#: directorymergewindow.cpp:3163 +#: directorymergewindow.cpp:3177 #, kde-format msgid "Dest: " msgstr "Προορ: " #. i18n("Saving Directory Merge State ...")); -#: directorymergewindow.cpp:3238 +#: directorymergewindow.cpp:3252 #, kde-format msgid "Save Directory Merge State As..." msgstr "Αποθήκευση κατάστασης συγχώνευσης καταλόγου ως..." -#: directorymergewindow.cpp:3387 +#: directorymergewindow.cpp:3401 #, kde-format msgid "Start/Continue Directory Merge" msgstr "Έναρξη/συνέχεια συγχώνευσης καταλόγου" -#: directorymergewindow.cpp:3388 +#: directorymergewindow.cpp:3402 #, kde-format msgid "Run Operation for Current Item" msgstr "Εκτέλεση της λειτουργίας για το τρέχον αντικείμενο" -#: directorymergewindow.cpp:3389 +#: directorymergewindow.cpp:3403 #, kde-format msgid "Compare Selected File" msgstr "Σύγκριση του επιλεγμένου αρχείου" -#: directorymergewindow.cpp:3390 +#: directorymergewindow.cpp:3404 #, kde-format msgid "Merge Current File" msgstr "Συγχώνευση του επιλεγμένου αρχείου" -#: directorymergewindow.cpp:3390 +#: directorymergewindow.cpp:3404 #, kde-format msgid "" "Merge\n" @@ -849,51 +849,51 @@ "Συγχώνευση\n" "αρχείου" -#: directorymergewindow.cpp:3391 +#: directorymergewindow.cpp:3405 #, kde-format msgid "Fold All Subdirs" msgstr "Αναδίπλωση όλων των υποκαταλόγων" -#: directorymergewindow.cpp:3392 +#: directorymergewindow.cpp:3406 #, kde-format msgid "Unfold All Subdirs" msgstr "Ανάπτυξη όλων των υποκαταλόγων" #. i18n("Save Directory Merge State ..."), 0, this, &DirectoryMergeWindow::slotSaveMergeState, ac, "dir_save_merge_state"); #. i18n("Load Directory Merge State ..."), 0, this, &DirectoryMergeWindow::slotLoadMergeState, ac, "dir_load_merge_state"); -#: directorymergewindow.cpp:3396 +#: directorymergewindow.cpp:3410 #, kde-format msgid "Choose A for All Items" msgstr "Επιλογή του Α για όλα τα αντικείμενα" -#: directorymergewindow.cpp:3397 +#: directorymergewindow.cpp:3411 #, kde-format msgid "Choose B for All Items" msgstr "Επιλογή του Β για όλα τα αντικείμενα" -#: directorymergewindow.cpp:3398 +#: directorymergewindow.cpp:3412 #, kde-format msgid "Choose C for All Items" msgstr "Επιλογή του Γ για Όλα τα αντικείμενα" -#: directorymergewindow.cpp:3399 +#: directorymergewindow.cpp:3413 #, kde-format msgid "Auto-Choose Operation for All Items" msgstr "Λειτουργία αυτόματης επιλογής για όλα τα αντικείμενα" -#: directorymergewindow.cpp:3400 +#: directorymergewindow.cpp:3414 #, kde-format msgid "No Operation for All Items" msgstr "Καμία λειτουργία για όλα τα αντικείμενα" #. i18n("Synchronize Directories"), 0, this, &DirectoryMergeWindow::slotSynchronizeDirectories, ac, "dir_synchronize_directories"); #. d->m_pDirChooseNewerFiles = GuiUtils::createAction< KToggleAction >(i18n("Copy Newer Files Instead of Merging"), 0, this, &DirectoryMergeWindow::slotChooseNewerFiles, ac, "dir_choose_newer_files"); -#: directorymergewindow.cpp:3405 +#: directorymergewindow.cpp:3419 #, kde-format msgid "Show Identical Files" msgstr "Εμφάνιση ταυτόσημων αρχείων" -#: directorymergewindow.cpp:3405 +#: directorymergewindow.cpp:3419 #, kde-format msgid "" "Identical\n" @@ -902,17 +902,17 @@ "Ταυτόσημα\n" "αρχεία" -#: directorymergewindow.cpp:3406 +#: directorymergewindow.cpp:3420 #, kde-format msgid "Show Different Files" msgstr "Εμφάνιση διαφορετικών αρχείων" -#: directorymergewindow.cpp:3407 +#: directorymergewindow.cpp:3421 #, kde-format msgid "Show Files only in A" msgstr "Εμφάνιση αρχείων μόνο στο Α" -#: directorymergewindow.cpp:3407 +#: directorymergewindow.cpp:3421 #, kde-format msgid "" "Files\n" @@ -921,12 +921,12 @@ "Αρχεία\n" "μόνο στο Α" -#: directorymergewindow.cpp:3408 +#: directorymergewindow.cpp:3422 #, kde-format msgid "Show Files only in B" msgstr "Εμφάνιση αρχείων μόνο στο Β" -#: directorymergewindow.cpp:3408 +#: directorymergewindow.cpp:3422 #, kde-format msgid "" "Files\n" @@ -935,12 +935,12 @@ "Αρχεία\n" "μόνο στο Β" -#: directorymergewindow.cpp:3409 +#: directorymergewindow.cpp:3423 #, kde-format msgid "Show Files only in C" msgstr "Εμφάνιση αρχείων μόνο στο Γ" -#: directorymergewindow.cpp:3409 +#: directorymergewindow.cpp:3423 #, kde-format msgid "" "Files\n" @@ -949,55 +949,60 @@ "Αρχεία\n" "μόνο στο Γ" -#: directorymergewindow.cpp:3413 +#: directorymergewindow.cpp:3427 #, kde-format msgid "Compare Explicitly Selected Files" msgstr "Σύγκριση άμεσα επιλεγμένων αρχείων" -#: directorymergewindow.cpp:3414 +#: directorymergewindow.cpp:3428 #, kde-format msgid "Merge Explicitly Selected Files" msgstr "Συγχώνευση άμεσα επιλεγμένων αρχείων" -#: directorymergewindow.cpp:3416 directorymergewindow.cpp:3423 +#: directorymergewindow.cpp:3430 directorymergewindow.cpp:3437 #, kde-format msgid "Do Nothing" msgstr "Να μη γίνει τίποτα" -#: directorymergewindow.cpp:3428 +#: directorymergewindow.cpp:3442 #, kde-format msgid "Delete A && B" msgstr "Διαγραφή των A && B" -#: directorymergewindow.cpp:3431 +#: directorymergewindow.cpp:3445 #, kde-format msgid "Merge to A && B" msgstr "Συγχώνευση σε A && B" -#: fileaccess.cpp:462 SourceData.cpp:493 +#: fileaccess.cpp:301 +#, kde-format +msgid "Unable to determine full url. No parent specified." +msgstr "" + +#: fileaccess.cpp:482 SourceData.cpp:506 #, fuzzy, kde-format #| msgid "Reading file: %1" msgid "Failed to read file: %1" msgstr "Ανάγνωση αρχείου: %1" -#: fileaccess.cpp:587 +#: fileaccess.cpp:624 #, kde-format msgid "Creating temp copy of %1 failed." msgstr "Η δημιουργία του προσωρινού αντιγράφου για το %1 απέτυχε." -#: fileaccess.cpp:595 fileaccess.cpp:600 +#: fileaccess.cpp:632 fileaccess.cpp:637 #, fuzzy, kde-format #| msgid "Opening %1 failed." msgid "Opening %1 failed. %2" msgstr "Το άνοιγμα του %1 απέτυχε." -#: fileaccess.cpp:619 fileaccess.cpp:627 +#: fileaccess.cpp:656 fileaccess.cpp:664 #, fuzzy, kde-format #| msgid "Error reading from %1" msgid "Error reading from %1. %2" msgstr "Σφάλμα ανάγνωσης από το %1" -#: fileaccess.cpp:751 +#: fileaccess.cpp:788 #, fuzzy, kde-format #| msgid "" #| "While trying to make a backup, deleting an older backup failed. \n" @@ -1010,7 +1015,7 @@ "αντιγράφου ασφαλείας. \n" "Όνομα αρχείου: " -#: fileaccess.cpp:758 +#: fileaccess.cpp:795 #, fuzzy, kde-format #| msgid "" #| "While trying to make a backup, renaming failed. \n" @@ -1022,180 +1027,180 @@ "Αποτυχία μετονομασίας, κατά τη δημιουργία αντιγράφου ασφαλείας. \n" "Ονόματα αρχείων: " -#: fileaccess.cpp:828 +#: fileaccess.cpp:865 #, kde-format msgid "Getting file status: %1" msgstr "Ανάκτηση κατάστασης αρχείου: %1" -#: fileaccess.cpp:869 +#: fileaccess.cpp:906 #, kde-format msgid "Reading file: %1" msgstr "Ανάγνωση αρχείου: %1" -#: fileaccess.cpp:907 +#: fileaccess.cpp:944 #, kde-format msgid "Writing file: %1" msgstr "Εγγραφή αρχείου: %1" -#: fileaccess.cpp:940 +#: fileaccess.cpp:977 #, kde-format msgid "Out of memory" msgstr "Τέλος μνήμης" -#: fileaccess.cpp:976 +#: fileaccess.cpp:1013 #, kde-format msgid "Making directory: %1" msgstr "Δημιουργία καταλόγου: %1" -#: fileaccess.cpp:997 +#: fileaccess.cpp:1034 #, kde-format msgid "Removing directory: %1" msgstr "Αφαίρεση καταλόγου: %1" -#: fileaccess.cpp:1012 +#: fileaccess.cpp:1049 #, kde-format msgid "Removing file: %1" msgstr "Αφαίρεση αρχείου: %1" -#: fileaccess.cpp:1028 +#: fileaccess.cpp:1065 #, kde-format msgid "Creating symbolic link: %1 -> %2" msgstr "Δημιουργία συμβολικού δεσμού: %1 -> %2" -#: fileaccess.cpp:1052 +#: fileaccess.cpp:1089 #, kde-format msgid "Renaming file: %1 -> %2" msgstr "Μετονομασία αρχείου: %1 -> %2" -#: fileaccess.cpp:1086 +#: fileaccess.cpp:1123 #, kde-format msgid "Copying file: %1 -> %2" msgstr "Αντιγραφή αρχείου: %1 -> %2" -#: fileaccess.cpp:1108 +#: fileaccess.cpp:1145 #, fuzzy, kde-format #| msgid "Reading directory: " msgid "Reading directory: %1" msgstr "Ανάγνωση καταλόγου: " -#: fileaccess.cpp:1162 +#: fileaccess.cpp:1202 #, kde-format msgid "Listing directory: %1" msgstr "Εμφάνιση καταλόγου: %1" -#: kdiff3.cpp:181 +#: kdiff3.cpp:182 #, kde-format msgid "Current Configuration:" msgstr "Τρέχουσα διαμόρφωση:" -#: kdiff3.cpp:186 +#: kdiff3.cpp:187 #, kde-format msgid "Config Option Error:" msgstr "Σφάλμα διαμόρφωσης επιλογής:" -#: kdiff3.cpp:240 +#: kdiff3.cpp:246 #, kde-format msgid "Option --auto used, but no output file specified." msgstr "Χρησιμοποιήθηκε η επιλογή --auto, αλλά δεν καθορίστηκε αρχείο εξόδου." -#: kdiff3.cpp:416 +#: kdiff3.cpp:405 #, kde-format msgid "Option --auto ignored for directory comparison." msgstr "Η επιλογή --auto αγνοήθηκε για τη σύγκριση καταλόγων." -#: kdiff3.cpp:460 +#: kdiff3.cpp:449 #, kde-format msgid "Saving failed." msgstr "Η αποθήκευση απέτυχε." -#: kdiff3.cpp:496 pdiff.cpp:1098 +#: kdiff3.cpp:494 pdiff.cpp:1096 #, kde-format msgid "Opening of these files failed:" msgstr "Το άνοιγμα αυτών των αρχείων απέτυχε:" -#: kdiff3.cpp:505 +#: kdiff3.cpp:503 pdiff.cpp:1105 #, kde-format -msgid "File Open Error" +msgid "File open error" msgstr "Σφάλμα ανοίγματος αρχείου" -#: kdiff3.cpp:533 +#: kdiff3.cpp:532 #, kde-format msgid "Opens documents for comparison..." msgstr "Ανοίγει έγγραφα για σύγκριση..." -#: kdiff3.cpp:535 +#: kdiff3.cpp:534 #, kde-format msgid "Reload" msgstr "Επαναφόρτωση" -#: kdiff3.cpp:538 +#: kdiff3.cpp:537 #, kde-format msgid "Saves the merge result. All conflicts must be solved!" msgstr "" "Αποθηκεύει το αποτέλεσμα της συγχώνευσης. Όλες οι συγκρούσεις θα πρέπει να " "έχουν επιλυθεί!" -#: kdiff3.cpp:540 +#: kdiff3.cpp:539 #, kde-format msgid "Saves the current document as..." msgstr "Αποθηκεύει το τρέχον έγγραφο ως..." -#: kdiff3.cpp:543 +#: kdiff3.cpp:542 #, kde-format msgid "Print the differences" msgstr "Εκτύπωση των διαφορών" -#: kdiff3.cpp:546 +#: kdiff3.cpp:545 #, kde-format msgid "Quits the application" msgstr "Κλείνει την εφαρμογή" -#: kdiff3.cpp:549 +#: kdiff3.cpp:548 #, kde-format msgid "Cuts the selected section and puts it to the clipboard" msgstr "Αποκοπή του επιλεγμένου τμήματος και τοποθέτηση στο πρόχειρο" -#: kdiff3.cpp:552 +#: kdiff3.cpp:551 #, kde-format msgid "Copies the selected section to the clipboard" msgstr "Αντιγραφή του επιλεγμένου τμήματος στο πρόχειρο" -#: kdiff3.cpp:554 +#: kdiff3.cpp:553 #, kde-format msgid "Pastes the clipboard contents to current position" msgstr "Επικόλληση των περιεχομένων του πρόχειρου στην ενεργή θέση" -#: kdiff3.cpp:557 +#: kdiff3.cpp:556 #, kde-format msgid "Select everything in current window" msgstr "Επιλογή όλων στο τρέχον παράθυρο" -#: kdiff3.cpp:560 +#: kdiff3.cpp:559 #, kde-format msgid "Search for a string" msgstr "Αναζήτηση για μια συμβολοσειρά" -#: kdiff3.cpp:562 +#: kdiff3.cpp:561 #, kde-format msgid "Search again for the string" msgstr "Αναζήτηση ξανά για μια συμβολοσειρά" -#: kdiff3.cpp:567 +#: kdiff3.cpp:566 #, kde-format msgid "Enables/disables the statusbar" msgstr "Ενεργοποιεί/απενεργοποιεί τη γραμμή κατάστασης" -#: kdiff3.cpp:571 +#: kdiff3.cpp:570 #, kde-format msgid "Configure KDiff3..." msgstr "Διαμόρφωση του KDiff3..." -#: kdiff3.cpp:590 +#: kdiff3.cpp:589 #, kde-format msgid "Go to Current Delta" msgstr "Μετάβαση στην τρέχουσα διαφορά" -#: kdiff3.cpp:590 +#: kdiff3.cpp:589 #, kde-format msgid "" "Current\n" @@ -1204,12 +1209,12 @@ "Τρέχουσα\n" "διαφορά" -#: kdiff3.cpp:592 +#: kdiff3.cpp:591 #, kde-format msgid "Go to First Delta" msgstr "Μετάβαση στη πρώτη διαφορά" -#: kdiff3.cpp:592 +#: kdiff3.cpp:591 #, kde-format msgid "" "First\n" @@ -1218,12 +1223,12 @@ "Πρώτη\n" "διαφορά" -#: kdiff3.cpp:594 +#: kdiff3.cpp:593 #, kde-format msgid "Go to Last Delta" msgstr "Μετάβαση στην τελευταία διαφορά" -#: kdiff3.cpp:594 +#: kdiff3.cpp:593 #, kde-format msgid "" "Last\n" @@ -1232,14 +1237,14 @@ "Τελευταία\n" "διαφορά" -#: kdiff3.cpp:596 +#: kdiff3.cpp:595 #, kde-format msgid "(Skips white space differences when \"Show White Space\" is disabled.)" msgstr "" "(Παράλειψη των διαφορών στα κενά όταν είναι απενεργοποιημένη η \"Εμφάνιση " "κενών\")" -#: kdiff3.cpp:597 +#: kdiff3.cpp:596 #, kde-format msgid "" "(Does not skip white space differences even when \"Show White Space\" is " @@ -1248,12 +1253,12 @@ "(Μη παράλειψη των διαφορών στα κενά ακόμη και αν είναι απενεργοποιημένη η " "\"Εμφάνιση κενών\")" -#: kdiff3.cpp:598 +#: kdiff3.cpp:597 #, kde-format msgid "Go to Previous Delta" msgstr "Μετάβαση στη προηγούμενη διαφορά" -#: kdiff3.cpp:598 +#: kdiff3.cpp:597 #, kde-format msgid "" "Prev\n" @@ -1262,12 +1267,12 @@ "Προηγούμενη\n" "διαφορά" -#: kdiff3.cpp:600 +#: kdiff3.cpp:599 #, kde-format msgid "Go to Next Delta" msgstr "Μετάβαση στην επόμενη διαφορά" -#: kdiff3.cpp:600 +#: kdiff3.cpp:599 #, kde-format msgid "" "Next\n" @@ -1276,12 +1281,12 @@ "Επόμενη\n" "διαφορά" -#: kdiff3.cpp:602 +#: kdiff3.cpp:601 #, kde-format msgid "Go to Previous Conflict" msgstr "Μετάβαση στην προηγούμενη σύγκρουση" -#: kdiff3.cpp:602 +#: kdiff3.cpp:601 #, kde-format msgid "" "Prev\n" @@ -1290,12 +1295,12 @@ "Προηγούμενη\n" "σύγκρουση" -#: kdiff3.cpp:604 +#: kdiff3.cpp:603 #, kde-format msgid "Go to Next Conflict" msgstr "Μετάβαση στην επόμενη σύγκρουση" -#: kdiff3.cpp:604 +#: kdiff3.cpp:603 #, kde-format msgid "" "Next\n" @@ -1304,12 +1309,12 @@ "Επόμενη\n" "σύγκρουση" -#: kdiff3.cpp:606 +#: kdiff3.cpp:605 #, kde-format msgid "Go to Previous Unsolved Conflict" msgstr "Μετάβαση στην προηγούμενη μη λυμένη σύγκρουση" -#: kdiff3.cpp:606 +#: kdiff3.cpp:605 #, kde-format msgid "" "Prev\n" @@ -1318,12 +1323,12 @@ "Προηγούμενη\n" "μη λυμένη" -#: kdiff3.cpp:608 +#: kdiff3.cpp:607 #, kde-format msgid "Go to Next Unsolved Conflict" msgstr "Μετάβαση στην επόμενη μη λυμένη σύγκρουση" -#: kdiff3.cpp:608 +#: kdiff3.cpp:607 #, kde-format msgid "" "Next\n" @@ -1332,12 +1337,12 @@ "Επόμενη\n" "μη λυμένη" -#: kdiff3.cpp:610 +#: kdiff3.cpp:609 #, kde-format msgid "Select Line(s) From A" msgstr "Επιλογή γραμμής(ών) από το Α" -#: kdiff3.cpp:610 +#: kdiff3.cpp:609 #, kde-format msgid "" "Choose\n" @@ -1346,12 +1351,12 @@ "Επιλογή\n" "A" -#: kdiff3.cpp:611 +#: kdiff3.cpp:610 #, kde-format msgid "Select Line(s) From B" msgstr "Επιλογή γραμμής(ών) από το Β" -#: kdiff3.cpp:611 +#: kdiff3.cpp:610 #, kde-format msgid "" "Choose\n" @@ -1360,12 +1365,12 @@ "Επιλογή\n" "B" -#: kdiff3.cpp:612 +#: kdiff3.cpp:611 #, kde-format msgid "Select Line(s) From C" msgstr "Επιλογή γραμμής(ών) από το Γ" -#: kdiff3.cpp:612 +#: kdiff3.cpp:611 #, kde-format msgid "" "Choose\n" @@ -1374,13 +1379,13 @@ "Επιλογή\n" "Γ" -#: kdiff3.cpp:613 +#: kdiff3.cpp:612 #, kde-format msgid "Automatically Go to Next Unsolved Conflict After Source Selection" msgstr "" "Αυτόματη μετάβαση στην επόμενη μη λυμένη σύγκρουση μετά την επιλογή πηγής" -#: kdiff3.cpp:613 +#: kdiff3.cpp:612 #, kde-format msgid "" "Auto\n" @@ -1389,13 +1394,13 @@ "Αυτόματα\n" "επόμενο" -#: kdiff3.cpp:615 +#: kdiff3.cpp:614 #, fuzzy, kde-format #| msgid "Show Space && Tabulator Characters for Differences" msgid "Show Space && Tabulator Characters" msgstr "Εμφάνιση κενών && χαρακτήρων οριοθέτησης για διαφορές" -#: kdiff3.cpp:615 +#: kdiff3.cpp:614 #, kde-format msgid "" "White\n" @@ -1404,12 +1409,12 @@ "Κενοί\n" "χαρακτήρες" -#: kdiff3.cpp:616 +#: kdiff3.cpp:615 #, kde-format msgid "Show White Space" msgstr "Εμφάνιση κενών" -#: kdiff3.cpp:616 +#: kdiff3.cpp:615 #, kde-format msgid "" "White\n" @@ -1418,12 +1423,12 @@ "Κενές\n" "διαφορές" -#: kdiff3.cpp:618 +#: kdiff3.cpp:617 #, kde-format msgid "Show Line Numbers" msgstr "Εμφάνιση αριθμών γραμμής" -#: kdiff3.cpp:618 +#: kdiff3.cpp:617 #, kde-format msgid "" "Line\n" @@ -1432,133 +1437,133 @@ "Αριθμοί\n" "γραμμών" -#: kdiff3.cpp:620 +#: kdiff3.cpp:619 #, kde-format msgid "Automatically Solve Simple Conflicts" msgstr "Αυτόματη επίλυση απλών συγκρούσεων" -#: kdiff3.cpp:621 +#: kdiff3.cpp:620 #, kde-format msgid "Set Deltas to Conflicts" msgstr "Ορισμός διαφορών στις συγκρούσεις" -#: kdiff3.cpp:622 +#: kdiff3.cpp:621 #, kde-format msgid "Run Regular Expression Auto Merge" msgstr "Εκτέλεση κανονικής έκφρασης αυτόματης συγχώνευσης" -#: kdiff3.cpp:623 +#: kdiff3.cpp:622 #, kde-format msgid "Automatically Solve History Conflicts" msgstr "Αυτόματη επίλυση συγκρούσεων ιστορικού" -#: kdiff3.cpp:624 +#: kdiff3.cpp:623 #, kde-format msgid "Split Diff At Selection" msgstr "Διαίρεση διαφορών στην επιλογή" -#: kdiff3.cpp:625 +#: kdiff3.cpp:624 #, kde-format msgid "Join Selected Diffs" msgstr "Ένωση των επιλεγμένων διαφορών" -#: kdiff3.cpp:627 +#: kdiff3.cpp:626 #, kde-format msgid "Show Window A" msgstr "Εμφάνιση του παραθύρου Α" -#: kdiff3.cpp:628 +#: kdiff3.cpp:627 #, kde-format msgid "Show Window B" msgstr "Εμφάνιση του παραθύρου Β" -#: kdiff3.cpp:629 +#: kdiff3.cpp:628 #, kde-format msgid "Show Window C" msgstr "Εμφάνιση του παραθύρου Γ" -#: kdiff3.cpp:631 +#: kdiff3.cpp:630 #, kde-format msgid "Normal Overview" msgstr "Κανονική επισκόπηση" -#: kdiff3.cpp:632 +#: kdiff3.cpp:631 #, kde-format msgid "A vs. B Overview" msgstr "Επισκόπηση Α με το Β" -#: kdiff3.cpp:633 +#: kdiff3.cpp:632 #, kde-format msgid "A vs. C Overview" msgstr "Επισκόπηση Α με το Γ" -#: kdiff3.cpp:634 +#: kdiff3.cpp:633 #, kde-format msgid "B vs. C Overview" msgstr "Επισκόπηση Β με το Γ" -#: kdiff3.cpp:635 +#: kdiff3.cpp:634 #, kde-format msgid "Word Wrap Diff Windows" msgstr "Αναδίπλωση λέξεων στα παράθυρα διαφοράς" -#: kdiff3.cpp:636 +#: kdiff3.cpp:635 #, kde-format msgid "Add Manual Diff Alignment" msgstr "Προσθήκη χειροκίνητης στοίχισης διαφορών" -#: kdiff3.cpp:637 +#: kdiff3.cpp:636 #, kde-format msgid "Clear All Manual Diff Alignments" msgstr "Καθαρισμός όλων των χειροκίνητων στοιχίσεων διαφορών" -#: kdiff3.cpp:639 +#: kdiff3.cpp:638 #, kde-format msgid "Focus Next Window" msgstr "Εστίαση στο επόμενο παράθυρο" -#: kdiff3.cpp:640 +#: kdiff3.cpp:639 #, kde-format msgid "Focus Prev Window" msgstr "Εστίαση στο προηγούμενο παράθυρο" -#: kdiff3.cpp:641 +#: kdiff3.cpp:640 #, kde-format msgid "Toggle Split Orientation" msgstr "Εναλλαγή προσανατολισμού διαίρεσης" -#: kdiff3.cpp:643 +#: kdiff3.cpp:642 #, kde-format msgid "Dir && Text Split Screen View" msgstr "Διαίρεση προβολής καταλόγου && κειμένου" -#: kdiff3.cpp:645 +#: kdiff3.cpp:644 #, kde-format msgid "Toggle Between Dir && Text View" msgstr "Εναλλαγή μεταξύ προβολής καταλόγου && κειμένου" -#: kdiff3.cpp:697 pdiff.cpp:1909 +#: kdiff3.cpp:696 pdiff.cpp:1919 #, fuzzy, kde-format #| msgid "The merge result hasn't been saved." msgid "The merge result has not been saved." msgstr "Το αποτέλεσμα της συγχώνευσης δεν έχει αποθηκευτεί." -#: kdiff3.cpp:699 +#: kdiff3.cpp:698 #, kde-format msgid "Save && Quit" msgstr "Αποθήκευση && έξοδος" -#: kdiff3.cpp:700 +#: kdiff3.cpp:699 #, kde-format msgid "Quit Without Saving" msgstr "Έξοδος χωρίς αποθήκευση" -#: kdiff3.cpp:708 pdiff.cpp:1920 +#: kdiff3.cpp:707 pdiff.cpp:1930 #, kde-format msgid "Saving the merge result failed." msgstr "Αποτυχία αποθήκευσης του αποτελέσματος συγχώνευσης." -#: kdiff3.cpp:719 pdiff.cpp:1032 +#: kdiff3.cpp:718 pdiff.cpp:1030 #, kde-format msgid "" "You are currently doing a directory merge. Are you sure, you want to abort?" @@ -1566,63 +1571,63 @@ "Αυτή τη στιγμή εκτελείται μια συγχώνευση καταλόγου. Είστε σίγουροι ότι " "επιθυμείτε να την εγκαταλείψετε;" -#: kdiff3.cpp:742 +#: kdiff3.cpp:741 #, kde-format msgid "Saving file..." msgstr "Αποθήκευση αρχείου..." -#: kdiff3.cpp:759 +#: kdiff3.cpp:758 #, kde-format msgid "Saving file with a new filename..." msgstr "Αποθήκευση αρχείου με ένα νέο όνομα..." -#: kdiff3.cpp:761 +#: kdiff3.cpp:760 #, kde-format msgid "Save As..." msgstr "Αποθήκευση ως..." -#: kdiff3.cpp:820 +#: kdiff3.cpp:819 #, kde-format msgid "Printing not implemented." msgstr "Η εκτύπωση δεν πραγματοποιήθηκε." -#: kdiff3.cpp:857 +#: kdiff3.cpp:858 #, kde-format msgid "Printing..." msgstr "Εκτύπωση..." -#: kdiff3.cpp:943 +#: kdiff3.cpp:948 #, kde-format msgid "Printing page %1 of %2" msgstr "" -#: kdiff3.cpp:1000 +#: kdiff3.cpp:1006 #, fuzzy, kde-format #| msgid "Selection" msgid " (Selection)" msgstr "Επιλογή" -#: kdiff3.cpp:1027 +#: kdiff3.cpp:1034 #, kde-format msgid "Printing completed." msgstr "Η εκτύπωση ολοκληρώθηκε." -#: kdiff3.cpp:1031 +#: kdiff3.cpp:1038 #, kde-format msgid "Printing aborted." msgstr "Εγκατάλειψη εκτύπωσης." -#: kdiff3.cpp:1038 +#: kdiff3.cpp:1045 #, kde-format msgid "Exiting..." msgstr "Έξοδος..." -#: kdiff3.cpp:1049 +#: kdiff3.cpp:1056 #, kde-format msgid "Toggling toolbar..." msgstr "Εναλλαγή γραμμής εργαλείων..." -#: kdiff3.cpp:1070 +#: kdiff3.cpp:1077 #, kde-format msgid "Toggle the statusbar..." msgstr "Εναλλαγή της γραμμής κατάστασης..." @@ -1648,7 +1653,7 @@ msgid "Joachim Eibl" msgstr "Joachim Eibl" -#: kdiff3_part.cpp:173 kdiff3_part.cpp:254 +#: kdiff3_part.cpp:174 kdiff3_part.cpp:255 #, fuzzy, kde-format #| msgid "Couldn't find files for comparison." msgid "Could not find files for comparison." @@ -1667,7 +1672,7 @@ msgstr "Διαμόρφωση του KDiff3" #. i18n: ectx: ToolBar (mainToolBar) -#: kdiff3_part.rc:16 main.cpp:88 +#: kdiff3_part.rc:16 main.cpp:89 #, kde-format msgid "KDiff3" msgstr "KDiff3" @@ -1739,86 +1744,92 @@ msgid "Main Toolbar" msgstr "Κύρια γραμμή εργαλείων" -#: main.cpp:68 main.cpp:72 +#: main.cpp:69 main.cpp:73 #, kde-format msgid "Ignored. (User defined.)" msgstr "Παραλείφθηκε. (ορισμένο από τον χρήστη.)" -#: main.cpp:92 +#: main.cpp:93 #, kde-format msgid " (64 bit)" msgstr "" -#: main.cpp:94 +#: main.cpp:95 #, kde-format msgid " (32 bit)" msgstr "" -#: main.cpp:95 +#: main.cpp:96 #, kde-format msgid "Tool for Comparison and Merge of Files and Directories" msgstr "Εργαλείο για σύγκριση και συγχώνευση αρχείων και καταλόγων" -#: main.cpp:96 +#: main.cpp:97 #, kde-format msgid "(c) 2002-2014 Joachim Eibl, (c) 2017 Michael Reeves KF5/Qt5 port" msgstr "" -#: main.cpp:112 +#: main.cpp:113 #, kde-format msgid "Merge the input." msgstr "Συγχώνευση της εισόδου." -#: main.cpp:113 +#: main.cpp:114 #, kde-format msgid "Explicit base file. For compatibility with certain tools." msgstr "Άμεσο αρχείο βάση. Για συμβατότητα με ορισμένα εργαλεία." -#: main.cpp:114 +#: main.cpp:115 #, kde-format msgid "Output file. Implies -m. E.g.: -o newfile.txt" msgstr "Αρχείο εξόδου. Εννοείται η επιλογή -m. Π.χ.: -o newfile.txt" -#: main.cpp:115 +#: main.cpp:116 #, kde-format msgid "Output file, again. (For compatibility with certain tools.)" msgstr "Αρχείο εξόδου, και πάλι. (Για συμβατότητα με ορισμένα εργαλεία.)" -#: main.cpp:116 +#: main.cpp:118 #, kde-format msgid "No GUI if all conflicts are auto-solvable. (Needs -o file)" msgstr "" "Χωρίς γραφικό περιβάλλον αν όλες οι συγκρούσεις μπορούν να επιλυθούν " "αυτόματα. (Απαιτεί το -o file)" -#: main.cpp:117 +#: main.cpp:120 +#, fuzzy, kde-format +#| msgid "Ignore" +msgid "Ignored." +msgstr "Αγνόηση" + +#: main.cpp:122 #, fuzzy, kde-format #| msgid "Don't solve conflicts automatically. (For compatibility...)" msgid "Do not solve conflicts automatically." msgstr "Να μη γίνει αυτόματη επίλυση συγκρούσεων. (Για συμβατότητα...)" -#: main.cpp:118 +#: main.cpp:123 #, kde-format msgid "Visible name replacement for input file 1 (base)." msgstr "Ορατή αντικατάσταση ονόματος για το αρχείο εισόδου 1 (βάση)." -#: main.cpp:119 +#: main.cpp:124 #, kde-format msgid "Visible name replacement for input file 2." msgstr "Ορατή αντικατάσταση ονόματος για το αρχείο εισόδου 2." -#: main.cpp:120 +#: main.cpp:125 #, kde-format msgid "Visible name replacement for input file 3." msgstr "Ορατή αντικατάσταση ονόματος για το αρχείο εισόδου 3." -#: main.cpp:121 +#: main.cpp:126 #, kde-format msgid "Alternative visible name replacement. Supply this once for every input." msgstr "" "Εναλλακτική ορατή αντικατάσταση ονόματος. Δώστε το μία φορά για κάθε είσοδο." -#: main.cpp:122 +#: main.cpp:127 #, kde-format msgid "" "Override a config setting. Use once for every setting. E.g.: --cs " @@ -1827,89 +1838,89 @@ "Αντικατάσταση μίας ρύθμισης διαμόρφωσης. Χρήση μία φορά για κάθε ρύθμιση. Π." "χ.: --cs \"AutoAdvance=1\"" -#: main.cpp:123 +#: main.cpp:128 #, kde-format msgid "Show list of config settings and current values." msgstr "Εμφάνιση λίστας ρυθμίσεων διαμόρφωσης και τρεχουσών τιμών." -#: main.cpp:124 +#: main.cpp:129 #, kde-format msgid "Use a different config file." msgstr "Χρήση ενός διαφορετικού αρχείου διαμόρφωσης." -#: main.cpp:127 +#: main.cpp:132 #, kde-format msgid "file1 to open (base, if not specified via --base)" msgstr "αρχείο1 για άνοιγμα (βάση, αν δεν καθοριστεί μέσω του --base)" -#: main.cpp:128 +#: main.cpp:133 #, kde-format msgid "file2 to open" msgstr "αρχείο2 για άνοιγμα" -#: main.cpp:129 +#: main.cpp:134 #, kde-format msgid "file3 to open" msgstr "αρχείο3 για άνοιγμα" -#: main.cpp:153 +#: main.cpp:158 #, kde-format msgid "See kdiff3 --help for supported options." msgstr "" -#: mergeresultwindow.cpp:158 +#: mergeresultwindow.cpp:171 #, kde-format msgid "Choose A Everywhere" msgstr "Επιλογή παντού του Α" -#: mergeresultwindow.cpp:159 +#: mergeresultwindow.cpp:172 #, kde-format msgid "Choose B Everywhere" msgstr "Επιλογή παντού του Β" -#: mergeresultwindow.cpp:160 +#: mergeresultwindow.cpp:173 #, kde-format msgid "Choose C Everywhere" msgstr "Επιλογή παντού το Γ" -#: mergeresultwindow.cpp:161 +#: mergeresultwindow.cpp:174 #, kde-format msgid "Choose A for All Unsolved Conflicts" msgstr "Επιλογή του Α για όλες τις μη λυμένες διαφορές" -#: mergeresultwindow.cpp:162 +#: mergeresultwindow.cpp:175 #, kde-format msgid "Choose B for All Unsolved Conflicts" msgstr "Επιλογή του Β για όλες τις μη λυμένες διαφορές" -#: mergeresultwindow.cpp:163 +#: mergeresultwindow.cpp:176 #, kde-format msgid "Choose C for All Unsolved Conflicts" msgstr "Επιλογή του Γ για όλες τις μη λυμένες διαφορές" -#: mergeresultwindow.cpp:164 +#: mergeresultwindow.cpp:177 #, kde-format msgid "Choose A for All Unsolved Whitespace Conflicts" msgstr "Επιλογή του Α για όλες τις μη λυμένες διαφορές κενών" -#: mergeresultwindow.cpp:165 +#: mergeresultwindow.cpp:178 #, kde-format msgid "Choose B for All Unsolved Whitespace Conflicts" msgstr "Επιλογή του Β για όλες τις μη λυμένες διαφορές κενών" -#: mergeresultwindow.cpp:166 +#: mergeresultwindow.cpp:179 #, kde-format msgid "Choose C for All Unsolved Whitespace Conflicts" msgstr "Επιλογή του Γ για όλες τις μη λυμένες διαφορές κενών" -#: mergeresultwindow.cpp:176 +#: mergeresultwindow.cpp:204 #, kde-format msgid "Number of remaining unsolved conflicts: %1 (of which %2 are whitespace)" msgstr "" "Αριθμός εναπομείναντων ανεπίλυτων συγκρούσεων: %1 ( %2 από τις οποίες " "αφορούν κενά)" -#: mergeresultwindow.cpp:370 +#: mergeresultwindow.cpp:398 #, kde-format msgid "" "The output has been modified.\n" @@ -1918,29 +1929,29 @@ "Η έξοδος έχει τροποποιηθεί.\n" "Αν συνεχίσετε οι αλλαγές σας θα χαθούν." -#: mergeresultwindow.cpp:936 pdiff.cpp:827 +#: mergeresultwindow.cpp:964 pdiff.cpp:817 #, kde-format msgid "All input files are binary equal." msgstr "Όλα τα αρχεία εισόδου είναι δυαδικά ίσα." -#: mergeresultwindow.cpp:938 +#: mergeresultwindow.cpp:966 #, kde-format msgid "All input files contain the same text." msgstr "Όλα τα αρχεία εισόδου περιέχουν το ίδιο κείμενο." -#: mergeresultwindow.cpp:942 mergeresultwindow.cpp:946 -#: mergeresultwindow.cpp:950 pdiff.cpp:833 pdiff.cpp:837 pdiff.cpp:841 +#: mergeresultwindow.cpp:970 mergeresultwindow.cpp:974 +#: mergeresultwindow.cpp:978 pdiff.cpp:823 pdiff.cpp:827 pdiff.cpp:831 #, kde-format msgid "Files %1 and %2 are binary equal.\n" msgstr "Τα αρχεία %1 και %2 είναι δυαδικά ίσα.\n" -#: mergeresultwindow.cpp:944 mergeresultwindow.cpp:948 -#: mergeresultwindow.cpp:952 +#: mergeresultwindow.cpp:972 mergeresultwindow.cpp:976 +#: mergeresultwindow.cpp:980 #, kde-format msgid "Files %1 and %2 have equal text.\n" msgstr "Τα αρχεία %1 και %2 περιέχουν το ίδιο κείμενο. \n" -#: mergeresultwindow.cpp:958 +#: mergeresultwindow.cpp:986 #, kde-format msgid "" "Total number of conflicts: %1\n" @@ -1949,27 +1960,27 @@ "%4" msgstr "" -#: mergeresultwindow.cpp:964 +#: mergeresultwindow.cpp:992 #, kde-format msgid "Conflicts" msgstr "Συγκρούσεις" -#: mergeresultwindow.cpp:1873 +#: mergeresultwindow.cpp:1901 #, kde-format msgid "" msgstr "<Χωρίς γραμμή πηγής>" -#: mergeresultwindow.cpp:1881 +#: mergeresultwindow.cpp:1909 #, kde-format msgid "" msgstr "<Σύγκρουση συγχώνευσης (μόνο κενών)>" -#: mergeresultwindow.cpp:1883 mergeresultwindow.cpp:2755 +#: mergeresultwindow.cpp:1911 mergeresultwindow.cpp:2783 #, kde-format msgid "" msgstr "<Σύγκρουση συγχώνευσης>" -#: mergeresultwindow.cpp:2967 +#: mergeresultwindow.cpp:2995 #, fuzzy, kde-format #| msgid "" #| "Not all conflicts are solved yet.\n" @@ -1981,12 +1992,12 @@ "Δεν έχουν επιλυθεί ακόμη όλες οι συγκρούσεις.\n" "Το αρχείο δεν αποθηκεύτηκε.\n" -#: mergeresultwindow.cpp:2969 mergeresultwindow.cpp:2978 +#: mergeresultwindow.cpp:2997 mergeresultwindow.cpp:3006 #, kde-format msgid "Conflicts Left" msgstr "Συγκρούσεις που απομένουν" -#: mergeresultwindow.cpp:2976 +#: mergeresultwindow.cpp:3004 #, fuzzy, kde-format #| msgid "" #| "There is a line end style conflict. Please choose the line end style " @@ -2001,7 +2012,7 @@ "γραμμής χειροκίνητα.\n" "Το αρχείο δεν αποθηκεύτηκε.\n" -#: mergeresultwindow.cpp:2990 +#: mergeresultwindow.cpp:3018 #, kde-format msgid "" "\n" @@ -2012,62 +2023,62 @@ "\n" "Η δημιουργία αντιγράφου ασφαλείας απέτυχε. Το αρχείο δεν αποθηκεύτηκε." -#: mergeresultwindow.cpp:2990 mergeresultwindow.cpp:3038 +#: mergeresultwindow.cpp:3018 mergeresultwindow.cpp:3066 #, kde-format msgid "File Save Error" msgstr "Σφάλμα εγγραφής αρχείου" -#: mergeresultwindow.cpp:3038 +#: mergeresultwindow.cpp:3066 #, kde-format msgid "Error while writing." msgstr "Σφάλμα κατά την εγγραφή." -#: mergeresultwindow.cpp:3110 +#: mergeresultwindow.cpp:3138 #, fuzzy, kde-format #| msgid "Output" msgid "Output:" msgstr "Έξοδος" -#: mergeresultwindow.cpp:3123 mergeresultwindow.cpp:3315 +#: mergeresultwindow.cpp:3151 mergeresultwindow.cpp:3343 #, kde-format msgid "[Modified]" msgstr "[Τροποποιημένο]" -#: mergeresultwindow.cpp:3130 +#: mergeresultwindow.cpp:3158 #, fuzzy, kde-format #| msgid "Encoding for saving" msgid "Encoding for saving:" msgstr "Κωδικοποίηση για την αποθήκευση" -#: mergeresultwindow.cpp:3230 +#: mergeresultwindow.cpp:3258 #, kde-format msgid "Conflict" msgstr "Σύγκρουση" -#: mergeresultwindow.cpp:3262 +#: mergeresultwindow.cpp:3290 #, fuzzy, kde-format #| msgid "Codec from" msgid "Codec from A: %1" msgstr "Κωδικοποιητής από" -#: mergeresultwindow.cpp:3264 +#: mergeresultwindow.cpp:3292 #, fuzzy, kde-format #| msgid "Codec from" msgid "Codec from B: %1" msgstr "Κωδικοποιητής από" -#: mergeresultwindow.cpp:3266 +#: mergeresultwindow.cpp:3294 #, fuzzy, kde-format #| msgid "Codec from" msgid "Codec from C: %1" msgstr "Κωδικοποιητής από" -#: optiondialog.cpp:119 +#: optiondialog.cpp:121 #, kde-format msgid "Change Font" msgstr "" -#: optiondialog.cpp:135 optiondialog.cpp:145 +#: optiondialog.cpp:137 optiondialog.cpp:147 #, kde-format msgid "" "Font: %1, %2, %3\n" @@ -2075,125 +2086,125 @@ "Example:" msgstr "" -#: optiondialog.cpp:388 +#: optiondialog.cpp:390 #, kde-format msgid "Unicode" msgstr "Unicode" -#: optiondialog.cpp:389 +#: optiondialog.cpp:391 #, kde-format msgid "Latin1" msgstr "Latin1" -#: optiondialog.cpp:408 +#: optiondialog.cpp:410 #, kde-format msgid "Change this if non-ASCII characters are not displayed correctly." msgstr "Τροποποιήστε αυτό αν οι μη ASCII χαρακτήρες δεν εμφανίζονται σωστά." -#: optiondialog.cpp:491 +#: optiondialog.cpp:495 #, kde-format msgid "Configure" msgstr "Διαμόρφωση" -#: optiondialog.cpp:568 +#: optiondialog.cpp:573 #, kde-format msgid "Font" msgstr "Γραμματοσειρά" -#: optiondialog.cpp:570 +#: optiondialog.cpp:575 #, kde-format msgid "Editor & Diff Output Font" msgstr "Γραμματοσειρά επεξεργαστή & εξόδου διαφορών" -#: optiondialog.cpp:589 +#: optiondialog.cpp:594 #, kde-format msgid "Application font" msgstr "" -#: optiondialog.cpp:594 +#: optiondialog.cpp:599 #, fuzzy, kde-format #| msgid "File Save Error" msgid "File view font" msgstr "Σφάλμα εγγραφής αρχείου" -#: optiondialog.cpp:613 +#: optiondialog.cpp:618 #, fuzzy, kde-format #| msgid "Color" msgctxt "Title for color settings page" msgid "Color" msgstr "Χρώμα" -#: optiondialog.cpp:614 +#: optiondialog.cpp:619 #, kde-format msgid "Colors Settings" msgstr "Ρυθμίσεις χρωμάτων" -#: optiondialog.cpp:631 +#: optiondialog.cpp:644 #, kde-format msgid "Editor and Diff Views:" msgstr "Προβολές επεξεργαστή και διαφορών:" -#: optiondialog.cpp:639 +#: optiondialog.cpp:652 #, kde-format msgid "Foreground color:" msgstr "Χρώμα προσκηνίου:" -#: optiondialog.cpp:647 +#: optiondialog.cpp:660 #, kde-format msgid "Background color:" msgstr "Χρώμα φόντου:" -#: optiondialog.cpp:657 +#: optiondialog.cpp:670 #, kde-format msgid "Diff background color:" msgstr "Χρώμα φόντου διαφορών:" -#: optiondialog.cpp:666 +#: optiondialog.cpp:679 #, kde-format msgid "Color A:" msgstr "Χρώμα Α:" -#: optiondialog.cpp:675 +#: optiondialog.cpp:688 #, kde-format msgid "Color B:" msgstr "Χρώμα Β:" -#: optiondialog.cpp:684 +#: optiondialog.cpp:697 #, kde-format msgid "Color C:" msgstr "Χρώμα Γ:" -#: optiondialog.cpp:692 +#: optiondialog.cpp:705 #, kde-format msgid "Conflict color:" msgstr "Χρώμα σύγκρουσης:" -#: optiondialog.cpp:701 +#: optiondialog.cpp:714 #, kde-format msgid "Current range background color:" msgstr "Τρέχον εύρος χρώματος φόντου:" -#: optiondialog.cpp:710 +#: optiondialog.cpp:723 #, kde-format msgid "Current range diff background color:" msgstr "Τρέχον εύρος χρώματος φόντου διαφορών:" -#: optiondialog.cpp:718 +#: optiondialog.cpp:731 #, kde-format msgid "Color for manually aligned difference ranges:" msgstr "Χρώμα για χειροκίνητα στοιχισμένα εύρη διαφορών:" -#: optiondialog.cpp:725 +#: optiondialog.cpp:738 #, kde-format msgid "Directory Comparison View:" msgstr "Προβολή σύγκρισης καταλόγου:" -#: optiondialog.cpp:731 +#: optiondialog.cpp:744 #, kde-format msgid "Newest file color:" msgstr "Χρώμα νεότερου αρχείου:" -#: optiondialog.cpp:736 +#: optiondialog.cpp:749 #, kde-format msgid "" "Changing this color will only be effective when starting the next directory " @@ -2202,37 +2213,37 @@ "Η τροποποίηση αυτού του χρώματος θα έχει ισχύ κατά την επόμενη σύγκριση " "καταλόγου." -#: optiondialog.cpp:741 +#: optiondialog.cpp:754 #, kde-format msgid "Oldest file color:" msgstr "Χρώμα παλαιότερου αρχείου:" -#: optiondialog.cpp:750 +#: optiondialog.cpp:763 #, kde-format msgid "Middle age file color:" msgstr "Χρώμα μέσου αρχείου:" -#: optiondialog.cpp:759 +#: optiondialog.cpp:772 #, kde-format msgid "Color for missing files:" msgstr "Χρώμα αρχείων που λείπουν:" -#: optiondialog.cpp:773 +#: optiondialog.cpp:786 #, kde-format msgid "Editor" msgstr "Επεξεργαστής" -#: optiondialog.cpp:774 +#: optiondialog.cpp:787 #, kde-format msgid "Editor Behavior" msgstr "Συμπεριφορά επεξεργαστή" -#: optiondialog.cpp:787 +#: optiondialog.cpp:809 #, kde-format msgid "Tab inserts spaces" msgstr "Το Tab εισάγει κενά" -#: optiondialog.cpp:791 +#: optiondialog.cpp:813 #, kde-format msgid "" "On: Pressing tab generates the appropriate number of spaces.\n" @@ -2241,29 +2252,29 @@ "Ενεργοποιημένο: Πατώντας το tab εισάγεται ο κατάλληλος αριθμός κενών.\n" "Απενεργοποιημένο: Θα εισαχθεί ο χαρακτήρας στηλοθέτη (tab)." -#: optiondialog.cpp:796 +#: optiondialog.cpp:818 #, kde-format msgid "Tab size:" msgstr "Μέγεθος στηλοθέτη:" -#: optiondialog.cpp:803 +#: optiondialog.cpp:825 #, kde-format msgid "Auto indentation" msgstr "Αυτόματη χρήση εσοχών" -#: optiondialog.cpp:807 +#: optiondialog.cpp:829 #, kde-format msgid "On: The indentation of the previous line is used for a new line.\n" msgstr "" "Ενεργοποιημένο: Η εσοχή της προηγούμενης γραμμής θα χρησιμοποιηθεί για μια " "νέα γραμμή.\n" -#: optiondialog.cpp:810 +#: optiondialog.cpp:832 #, kde-format msgid "Auto copy selection" msgstr "Αυτόματη αντιγραφή επιλογής" -#: optiondialog.cpp:814 +#: optiondialog.cpp:836 #, fuzzy, kde-format #| msgid "" #| "On: Any selection is immediately written to the clipboard.\n" @@ -2275,7 +2286,7 @@ "Ενεργοποιημένο: Οποιαδήποτε επιλογή γράφεται άμεσα στο πρόχειρο. " "Απενεργοποιημένο: Θα πρέπει να την αντιγράψετε εσείς π.χ. μέσω του Ctrl-C." -#: optiondialog.cpp:829 +#: optiondialog.cpp:851 #, kde-format msgid "" "Sets the line endings for when an edited file is saved.\n" @@ -2285,12 +2296,12 @@ "αρχείο.\n" "DOS/Windows: CR+LF; UNIX: LF; με τα CR=0D, LF=0A" -#: optiondialog.cpp:839 +#: optiondialog.cpp:861 #, kde-format msgid "Diff" msgstr "Diff" -#: optiondialog.cpp:840 +#: optiondialog.cpp:862 #, kde-format msgid "Diff Settings" msgstr "Ρυθμίσεις του Diff" @@ -2304,13 +2315,13 @@ #. ); #. ++line; #. -#: optiondialog.cpp:865 +#: optiondialog.cpp:896 #, fuzzy, kde-format #| msgid "Treat as white space." msgid "Ignore numbers (treat as white space)" msgstr "Θεώρηση ως κενά." -#: optiondialog.cpp:869 +#: optiondialog.cpp:900 #, kde-format msgid "" "Ignore number characters during line matching phase. (Similar to Ignore " @@ -2321,46 +2332,46 @@ "παράβλεψη κενών).\n" "Μπορεί να φανεί χρήσιμο κατά τη σύγκριση αρχείων με αριθμητικά δεδομένα." -#: optiondialog.cpp:873 +#: optiondialog.cpp:904 #, fuzzy, kde-format #| msgid "Treat C/C++ comments like white space." msgid "Ignore C/C++ comments (treat as white space)" msgstr "Θεώρηση των σχολίων C/C++ σαν κενά." -#: optiondialog.cpp:876 +#: optiondialog.cpp:907 #, kde-format msgid "Treat C/C++ comments like white space." msgstr "Θεώρηση των σχολίων C/C++ σαν κενά." -#: optiondialog.cpp:879 +#: optiondialog.cpp:910 #, fuzzy, kde-format #| msgid "Treat as white space." msgid "Ignore case (treat as white space)" msgstr "Θεώρηση ως κενά." -#: optiondialog.cpp:883 +#: optiondialog.cpp:914 #, kde-format msgid "Treat case differences like white space changes. ('a'<=>'A')" msgstr "Χειρισμός των διαφορών σε πεζά/κεφαλαία ως αλλαγές κενών. ('α'<=>'Α')" -#: optiondialog.cpp:886 +#: optiondialog.cpp:917 #, kde-format msgid "Preprocessor command:" msgstr "Εντολή προεπεξεργαστή:" -#: optiondialog.cpp:891 +#: optiondialog.cpp:922 #, kde-format msgid "User defined pre-processing. (See the docs for details.)" msgstr "" "Προεπεξεργασία ορισμένη από το χρήστη. (Δείτε τα εγχειρίδια για " "λεπτομέρειες)." -#: optiondialog.cpp:894 +#: optiondialog.cpp:925 #, kde-format msgid "Line-matching preprocessor command:" msgstr "Εντολή προεπεξεργαστή για ταίριασμα γραμμών:" -#: optiondialog.cpp:899 +#: optiondialog.cpp:930 #, kde-format msgid "" "This pre-processor is only used during line matching.\n" @@ -2369,12 +2380,12 @@ "Ο προεπεξεργαστής χρησιμοποιείται μόνο κατά το ταίριασμα γραμμών.\n" "(Δείτε τα εγχειρίδια για λεπτομέρειες)." -#: optiondialog.cpp:902 +#: optiondialog.cpp:933 #, kde-format msgid "Try hard (slower)" msgstr "Εις βάθος ανάλυση (πιο αργό)" -#: optiondialog.cpp:906 +#: optiondialog.cpp:937 #, kde-format msgid "" "Enables the --minimal option for the external diff.\n" @@ -2383,12 +2394,12 @@ "Ενεργοποιεί την επιλογή --minimal για το εξωτερικό diff.\n" "Η ανάλυση μεγάλων αρχείων θα είναι αισθητά πιο αργή." -#: optiondialog.cpp:910 +#: optiondialog.cpp:941 #, kde-format msgid "Align B and C for 3 input files" msgstr "Στοίχιση Β και Γ για 3 αρχεία εισόδου" -#: optiondialog.cpp:914 +#: optiondialog.cpp:945 #, kde-format msgid "" "Try to align B and C when comparing or merging three input files.\n" @@ -2401,17 +2412,24 @@ "διαδικασία.\n" "
(Προκαθορισμένα ανενεργό.)" -#: optiondialog.cpp:926 +#: optiondialog.cpp:956 +#, fuzzy, kde-format +#| msgid "Merge" +msgctxt "Settings page" +msgid "Merge" +msgstr "Συγχώνευση" + +#: optiondialog.cpp:957 #, kde-format msgid "Merge Settings" msgstr "Ρυθμίσεις συγχώνευσης" -#: optiondialog.cpp:940 +#: optiondialog.cpp:980 #, kde-format msgid "Auto advance delay (ms):" msgstr "Καθυστέρηση αυτόματης μετάβασης (ms):" -#: optiondialog.cpp:946 +#: optiondialog.cpp:986 #, kde-format msgid "" "When in Auto-Advance mode the result of the current selection is shown \n" @@ -2422,28 +2440,28 @@ "για τον καθορισμένο χρόνο, πριν την μεταπήδηση στην επόμενη σύγκρουση. " "Εύρος: 0-2000 ms" -#: optiondialog.cpp:950 +#: optiondialog.cpp:990 #, kde-format msgid "Show info dialogs" msgstr "Εμφάνιση παραθύρων διαλόγου πληροφοριών" -#: optiondialog.cpp:953 +#: optiondialog.cpp:993 #, kde-format msgid "Show a dialog with information about the number of conflicts." msgstr "" "Εμφανίζει ένα παράθυρο διαλόγου με πληροφορία για τον αριθμό των συγκρούσεων." -#: optiondialog.cpp:956 +#: optiondialog.cpp:996 #, kde-format msgid "White space 2-file merge default:" msgstr "Προκαθορισμός κενών διαφορών συγχώνευσης 2 αρχείων:" -#: optiondialog.cpp:961 optiondialog.cpp:974 +#: optiondialog.cpp:1001 optiondialog.cpp:1014 #, kde-format msgid "Manual Choice" msgstr "Χειροκίνητη επιλογή" -#: optiondialog.cpp:965 optiondialog.cpp:979 +#: optiondialog.cpp:1005 optiondialog.cpp:1019 #, kde-format msgid "" "Allow the merge algorithm to automatically select an input for white-space-" @@ -2452,22 +2470,22 @@ "Επιτρέπει στον αλγόριθμο συγχώνευσης την αυτόματη επιλογή μιας εισόδου για " "διαφορές μόνο κενών." -#: optiondialog.cpp:969 +#: optiondialog.cpp:1009 #, kde-format msgid "White space 3-file merge default:" msgstr "Προκαθορισμός κενών διαφορών συγχώνευσης 3 αρχείων:" -#: optiondialog.cpp:983 +#: optiondialog.cpp:1023 #, kde-format msgid "Automatic Merge Regular Expression" msgstr "Κανονική έκφραση αυτόματης συγχώνευσης" -#: optiondialog.cpp:991 smalldialogs.cpp:449 +#: optiondialog.cpp:1031 smalldialogs.cpp:459 #, kde-format msgid "Auto merge regular expression:" msgstr "Κανονική έκφραση αυτόματης συγχώνευσης:" -#: optiondialog.cpp:996 +#: optiondialog.cpp:1036 #, kde-format msgid "" "Regular expression for lines where KDiff3 should automatically choose one " @@ -2481,13 +2499,13 @@ "το Γ, αν\n" "είναι διαθέσιμο, ενώ σε άλλη περίπτωση το Β." -#: optiondialog.cpp:1002 +#: optiondialog.cpp:1042 #, kde-format msgid "Run regular expression auto merge on merge start" msgstr "" "Εκτέλεση κανονικής έκφρασης αυτόματης συγχώνευσης στην αρχή της συγχώνευσης" -#: optiondialog.cpp:1005 +#: optiondialog.cpp:1045 #, kde-format msgid "" "Run the merge for auto merge regular expressions\n" @@ -2496,17 +2514,17 @@ "Εκτέλεση της συγχώνευσης για κανονικές εκφράσεις αυτόματης συγχώνευσης\n" "αμέσως μετά την έναρξη της συγχώνευσης.\n" -#: optiondialog.cpp:1010 +#: optiondialog.cpp:1050 #, kde-format msgid "Version Control History Merging" msgstr "Συγχώνευση ιστορικού ελέγχου έκδοσης" -#: optiondialog.cpp:1018 smalldialogs.cpp:476 +#: optiondialog.cpp:1058 smalldialogs.cpp:486 #, kde-format msgid "History start regular expression:" msgstr "Κανονική έκφραση έναρξης ιστορικού:" -#: optiondialog.cpp:1023 +#: optiondialog.cpp:1063 #, kde-format msgid "" "Regular expression for the start of the version control history entry.\n" @@ -2517,12 +2535,12 @@ "Συνήθως αυτή η γραμμή περιέχει τη λέξη κλειδί \"$Log$\".\n" "Η προκαθορισμένη τιμή είναι: \".*\\$Log.*\\$.*\"" -#: optiondialog.cpp:1029 smalldialogs.cpp:504 +#: optiondialog.cpp:1069 smalldialogs.cpp:514 #, kde-format msgid "History entry start regular expression:" msgstr "Κανονική έκφραση για την έναρξη της καταχώρησης ιστορικού:" -#: optiondialog.cpp:1042 +#: optiondialog.cpp:1082 #, kde-format msgid "" "A version control history entry consists of several lines.\n" @@ -2542,22 +2560,22 @@ "διαχωρίζονται με κενές γραμμές.\n" "Δείτε την τεκμηρίωση για λεπτομέρειες." -#: optiondialog.cpp:1050 +#: optiondialog.cpp:1090 #, kde-format msgid "History merge sorting" msgstr "Ταξινόμηση ιστορικού συγχώνευσης" -#: optiondialog.cpp:1053 +#: optiondialog.cpp:1093 #, kde-format msgid "Sort version control history by a key." msgstr "Ταξινόμηση ιστορικού ελέγχου εκδόσεων κατά ένα κλειδί." -#: optiondialog.cpp:1063 +#: optiondialog.cpp:1103 #, kde-format msgid "History entry start sort key order:" msgstr "Σειρά ταξινόμησης ιστορικού ελέγχου εκδόσεων:" -#: optiondialog.cpp:1068 +#: optiondialog.cpp:1108 #, kde-format msgid "" "Each pair of parentheses used in the regular expression for the history " @@ -2577,40 +2595,40 @@ "Αν μείνει κενό, τότε δεν θα γίνει ταξινόμηση.\n" "Δείτε την τεκμηρίωση για λεπτομέρειες." -#: optiondialog.cpp:1079 +#: optiondialog.cpp:1119 #, kde-format msgid "Merge version control history on merge start" msgstr "Συγχώνευση ιστορικού ελέγχου έκδοσης κατά την έναρξη συγχώνευσης" -#: optiondialog.cpp:1082 +#: optiondialog.cpp:1122 #, kde-format msgid "Run version control history automerge on merge start." msgstr "" "Εκτέλεση συγχώνευσης ιστορικού ελέγχου έκδοσης κατά την έναρξη συγχώνευσης." -#: optiondialog.cpp:1086 +#: optiondialog.cpp:1126 #, kde-format msgid "Max number of history entries:" msgstr "Μέγιστος αριθμός καταχωρήσεων ιστορικού:" -#: optiondialog.cpp:1090 +#: optiondialog.cpp:1130 #, kde-format msgid "Cut off after specified number. Use -1 for infinite number of entries." msgstr "" "Αφαίρεση μετά από καθορισμένο αριθμό. Χρησιμοποιήστε το -1 για απεριόριστο " "αριθμό καταχωρήσεων." -#: optiondialog.cpp:1094 +#: optiondialog.cpp:1134 #, kde-format msgid "Test your regular expressions" msgstr "Δοκιμή των κανονικών εκφράσεών σας" -#: optiondialog.cpp:1099 +#: optiondialog.cpp:1139 #, kde-format msgid "Irrelevant merge command:" msgstr "Εντολή συγχώνευσης με σχετικού:" -#: optiondialog.cpp:1104 +#: optiondialog.cpp:1144 #, kde-format msgid "" "If specified this script is run after automerge\n" @@ -2621,12 +2639,12 @@ "όταν δεν εντοπιστούν άλλες σχετικές τροποποιήσεις.\n" "Καλείται με παραμέτρους τα: όνομααρχείου1 όνομααρχείου2 όνομααρχείου3" -#: optiondialog.cpp:1109 +#: optiondialog.cpp:1149 #, kde-format msgid "Auto save and quit on merge without conflicts" msgstr "Αυτόματη αποθήκευση και έξοδος κατά τη συγχώνευση χωρίς συγκρούσεις" -#: optiondialog.cpp:1113 +#: optiondialog.cpp:1153 #, kde-format msgid "" "If KDiff3 was started for a file-merge from the command line and all\n" @@ -2640,27 +2658,27 @@ "γίνεται αυτόματη αποθήκευση και έξοδος.\n" "(Παρόμοιο με την επιλογή της γραμμής εντολών \"--auto\"." -#: optiondialog.cpp:1124 optiondialog.cpp:1125 +#: optiondialog.cpp:1164 optiondialog.cpp:1165 #, kde-format msgid "Directory" msgstr "Κατάλογος" -#: optiondialog.cpp:1137 +#: optiondialog.cpp:1185 #, kde-format msgid "Recursive directories" msgstr "Αναδρομικά στους καταλόγους" -#: optiondialog.cpp:1140 +#: optiondialog.cpp:1188 #, kde-format msgid "Whether to analyze subdirectories or not." msgstr "Αν θα αναλυθούν οι υποκατάλογοι ή όχι." -#: optiondialog.cpp:1142 +#: optiondialog.cpp:1190 #, kde-format msgid "File pattern(s):" msgstr "Μοτίβα αρχείου:" -#: optiondialog.cpp:1148 +#: optiondialog.cpp:1196 #, kde-format msgid "" "Pattern(s) of files to be analyzed. \n" @@ -2671,12 +2689,12 @@ "Σύμβολα υποκατάστασης: '*' και '?'\n" "Μπορούν να οριστούν πολλαπλά μοτίβα χρησιμοποιώντας το διαχωριστικό: ';'" -#: optiondialog.cpp:1153 +#: optiondialog.cpp:1201 #, kde-format msgid "File-anti-pattern(s):" msgstr "Αντίστροφα μοτίβα αρχείου:" -#: optiondialog.cpp:1159 +#: optiondialog.cpp:1207 #, kde-format msgid "" "Pattern(s) of files to be excluded from analysis. \n" @@ -2687,12 +2705,12 @@ "Σύμβολα υποκατάστασης: '*' και '?'\n" "Μπορούν να οριστούν πολλαπλά μοτίβα χρησιμοποιώντας το διαχωριστικό: ';'" -#: optiondialog.cpp:1164 +#: optiondialog.cpp:1212 #, kde-format msgid "Dir-anti-pattern(s):" msgstr "Αντίστροφα μοτίβα καταλόγου:" -#: optiondialog.cpp:1170 +#: optiondialog.cpp:1218 #, kde-format msgid "" "Pattern(s) of directories to be excluded from analysis. \n" @@ -2703,12 +2721,12 @@ "Σύμβολα υποκατάστασης: '*' και '?'\n" "Μπορούν να οριστούν πολλαπλά μοτίβα χρησιμοποιώντας το διαχωριστικό: ';'" -#: optiondialog.cpp:1175 +#: optiondialog.cpp:1223 #, kde-format msgid "Use .cvsignore" msgstr "Χρήση .cvsignore" -#: optiondialog.cpp:1179 +#: optiondialog.cpp:1227 #, kde-format msgid "" "Extends the antipattern to anything that would be ignored by CVS.\n" @@ -2718,23 +2736,23 @@ "Μέσω των τοπικών αρχείων \".cvsignore\" μπορεί αυτό να είναι συγκεκριμένου " "καταλόγου." -#: optiondialog.cpp:1183 +#: optiondialog.cpp:1231 #, kde-format msgid "Find hidden files and directories" msgstr "Αναζήτηση κρυφών αρχείων και καταλόγων" -#: optiondialog.cpp:1186 +#: optiondialog.cpp:1234 #, fuzzy, kde-format #| msgid "Find hidden files and directories" msgid "Finds hidden files and directories." msgstr "Αναζήτηση κρυφών αρχείων και καταλόγων" -#: optiondialog.cpp:1189 +#: optiondialog.cpp:1237 #, kde-format msgid "Follow file links" msgstr "Ακολούθηση δεσμών αρχείων" -#: optiondialog.cpp:1193 +#: optiondialog.cpp:1241 #, kde-format msgid "" "On: Compare the file the link points to.\n" @@ -2743,12 +2761,12 @@ "Ενεργοποιημένο: Σύγκριση του αρχείου στο οποίο δείχνει ο δεσμός.\n" "Απενεργοποιημένο: Σύγκριση των δεσμών." -#: optiondialog.cpp:1197 +#: optiondialog.cpp:1245 #, kde-format msgid "Follow directory links" msgstr "Ακολούθηση δεσμών καταλόγων" -#: optiondialog.cpp:1201 +#: optiondialog.cpp:1249 #, kde-format msgid "" "On: Compare the directory the link points to.\n" @@ -2757,12 +2775,12 @@ "Ενεργοποιημένο: Σύγκριση του καταλόγου στο οποίο δείχνει ο δεσμός.\n" "Απενεργοποιημένο: Σύγκριση των δεσμών." -#: optiondialog.cpp:1210 +#: optiondialog.cpp:1258 #, kde-format msgid "Case sensitive filename comparison" msgstr "Σύγκριση αρχείων με ευαισθησία κεφαλαίων/πεζών" -#: optiondialog.cpp:1214 +#: optiondialog.cpp:1262 #, kde-format msgid "" "The directory comparison will compare files or directories when their names " @@ -2776,52 +2794,52 @@ "ταιριάζουν. (Προκαθορισμένο για τα Windows είναι ανενεργό, ενώ σε άλλη " "περίπτωση είναι ενεργό.)" -#: optiondialog.cpp:1218 +#: optiondialog.cpp:1266 #, fuzzy, kde-format #| msgid "Unfold All Subdirs" msgid "Unfold all subdirectories on load" msgstr "Ανάπτυξη όλων των υποκαταλόγων" -#: optiondialog.cpp:1222 +#: optiondialog.cpp:1270 #, kde-format msgid "" "On: Unfold all subdirectories when starting a directory diff.\n" "Off: Leave subdirectories folded." msgstr "" -#: optiondialog.cpp:1226 +#: optiondialog.cpp:1274 #, kde-format msgid "Skip directory status report" msgstr "" -#: optiondialog.cpp:1230 +#: optiondialog.cpp:1278 #, kde-format msgid "" "On: Do not show the Directory Comparison Status.\n" "Off: Show the status dialog on start." msgstr "" -#: optiondialog.cpp:1234 +#: optiondialog.cpp:1282 #, kde-format msgid "File Comparison Mode" msgstr "Λειτουργία σύγκρισης αρχείου" -#: optiondialog.cpp:1239 +#: optiondialog.cpp:1287 #, kde-format msgid "Binary comparison" msgstr "Δυαδική σύγκριση" -#: optiondialog.cpp:1241 +#: optiondialog.cpp:1289 #, kde-format msgid "Binary comparison of each file. (Default)" msgstr "Δυαδική σύγκριση του κάθε αρχείου (Προκαθορισμένο)" -#: optiondialog.cpp:1244 +#: optiondialog.cpp:1292 #, kde-format msgid "Full analysis" msgstr "Πλήρης ανάλυση" -#: optiondialog.cpp:1246 +#: optiondialog.cpp:1294 #, kde-format msgid "" "Do a full analysis and show statistics information in extra columns.\n" @@ -2830,12 +2848,12 @@ "Πραγματοποιεί πλήρη ανάλυση και εμφανίζει στατιστικά σε επιπλέον στήλες.\n" "(Πιο αργό από τη δυαδική σύγκριση, και πολύ πιο αργό για δυαδικά αρχεία)." -#: optiondialog.cpp:1250 +#: optiondialog.cpp:1298 #, kde-format msgid "Trust the size and modification date (unsafe)" msgstr "Εμπιστοσύνη στο μέγεθος και την ημερομηνία τροποποίησης (μη ασφαλές)" -#: optiondialog.cpp:1252 +#: optiondialog.cpp:1300 #, kde-format msgid "" "Assume that files are equal if the modification date and file length are " @@ -2850,7 +2868,7 @@ "εμφανίζονται ως διαφορετικά.\n" "Χρήσιμο για μεγάλους καταλόγους ή αργά δίκτυα." -#: optiondialog.cpp:1257 +#: optiondialog.cpp:1305 #, kde-format msgid "" "Trust the size and date, but use binary comparison if date does not match " @@ -2859,7 +2877,7 @@ "Δείξτε εμπιστοσύνη στο μέγεθος και στην ημερομηνία, αλλά χρησιμοποιήστε " "δυαδική σύγκριση αν η ημερομηνία δεν είναι ίδια (μη ασφαλές)" -#: optiondialog.cpp:1259 +#: optiondialog.cpp:1307 #, kde-format msgid "" "Assume that files are equal if the modification date and file length are " @@ -2873,12 +2891,12 @@ "δυαδικής σύγκρισης.\n" "Χρήσιμο για μεγάλους καταλόγους ή αργά δίκτυα." -#: optiondialog.cpp:1264 +#: optiondialog.cpp:1312 #, kde-format msgid "Trust the size (unsafe)" msgstr "Δείξτε εμπιστοσύνη στο μέγεθος (μη ασφαλές)" -#: optiondialog.cpp:1266 +#: optiondialog.cpp:1314 #, kde-format msgid "" "Assume that files are equal if their file lengths are equal.\n" @@ -2889,12 +2907,12 @@ "Χρήσιμο για μεγάλους καταλόγους ή αργά δίκτυα όπου η ημερομηνία " "τροποποιείται κατά τη λήψη." -#: optiondialog.cpp:1273 +#: optiondialog.cpp:1321 #, kde-format msgid "Synchronize directories" msgstr "Συγχρονισμός καταλόγων" -#: optiondialog.cpp:1277 +#: optiondialog.cpp:1325 #, kde-format msgid "" "Offers to store files in both directories so that\n" @@ -2906,12 +2924,12 @@ "Δουλεύει μόνο κατά τη σύγκριση δύο καταλόγων χωρίς να έχει καθοριστεί " "προορισμός." -#: optiondialog.cpp:1283 +#: optiondialog.cpp:1331 #, kde-format msgid "White space differences considered equal" msgstr "Οι διαφορές των κενών θεωρούνται ίσες" -#: optiondialog.cpp:1287 +#: optiondialog.cpp:1335 #, kde-format msgid "" "If files differ only by white space consider them equal.\n" @@ -2920,12 +2938,12 @@ "Αν τα αρχεία διαφέρουν μόνο σε κενούς χαρακτήρες θεωρούνται ότι είναι ίσα.\n" "Αυτό είναι ενεργοποιημένο μόνο όταν επιλεγεί η πλήρης ανάλυση." -#: optiondialog.cpp:1293 +#: optiondialog.cpp:1341 #, kde-format msgid "Copy newer instead of merging (unsafe)" msgstr "Αντιγραφή του νεότερου αντί για συγχώνευση (μη ασφαλές)" -#: optiondialog.cpp:1297 +#: optiondialog.cpp:1345 #, fuzzy, kde-format #| msgid "" #| "Don't look inside, just take the newer file.\n" @@ -2940,12 +2958,12 @@ "(Χρησιμοποιήστε το μόνο αν ξέρετε τι κάνετε!)\n" "Δουλεύει μόνο όταν συγκρίνονται δύο κατάλογοι." -#: optiondialog.cpp:1302 +#: optiondialog.cpp:1350 #, kde-format msgid "Backup files (.orig)" msgstr "Δημιουργία αντιγράφων ασφαλείας (.orig)" -#: optiondialog.cpp:1306 +#: optiondialog.cpp:1354 #, kde-format msgid "" "If a file would be saved over an old file, then the old file\n" @@ -2954,17 +2972,17 @@ "Όταν ένα αρχείο αποθηκευτεί με το όνομα ενός υπάρχοντος αρχείου, το υπάρχον " "αρχείο θα μετονομαστεί με επέκταση '.orig' αντί να διαγραφεί." -#: optiondialog.cpp:1382 optiondialog.cpp:1383 +#: optiondialog.cpp:1430 optiondialog.cpp:1431 #, kde-format msgid "Regional Settings" msgstr "Ρυθμίσεις περιοχής" -#: optiondialog.cpp:1397 +#: optiondialog.cpp:1454 #, kde-format msgid "Use the same encoding for everything:" msgstr "Χρήση της ίδιας κωδικοποίησης παντού:" -#: optiondialog.cpp:1401 +#: optiondialog.cpp:1458 #, kde-format msgid "" "Enable this allows to change all encodings by changing the first only.\n" @@ -2975,18 +2993,18 @@ "Απενεργοποιήστε αυτή την επιλογή αν χρειάζεστε διαφορετικές επί μέρους " "επιλογές." -#: optiondialog.cpp:1405 +#: optiondialog.cpp:1462 #, fuzzy, kde-format #| msgid "Note: Local Encoding is " msgid "Note: Local Encoding is \"%1\"" msgstr "Σημείωση: Η τοπική κωδικοποίηση είναι " -#: optiondialog.cpp:1409 +#: optiondialog.cpp:1466 #, kde-format msgid "File Encoding for A:" msgstr "Κωδικοποίηση αρχείου για το Α:" -#: optiondialog.cpp:1416 +#: optiondialog.cpp:1473 #, kde-format msgid "" "If enabled then Unicode (UTF-16 or UTF-8) encoding will be detected.\n" @@ -2999,32 +3017,32 @@ "Αν το αρχείο δεν είναι Unicode θα χρησιμοποιηθεί η επιλεγμένη κωδικοποίηση.\n" "(Η ανίχνευση του Unicode εξαρτάται από τα πρώτα byte του αρχείου.)" -#: optiondialog.cpp:1419 optiondialog.cpp:1430 optiondialog.cpp:1441 +#: optiondialog.cpp:1476 optiondialog.cpp:1487 optiondialog.cpp:1498 #, kde-format msgid "Auto Detect Unicode" msgstr "Αυτόματη ανίχνευση Unicode" -#: optiondialog.cpp:1425 +#: optiondialog.cpp:1482 #, kde-format msgid "File Encoding for B:" msgstr "Κωδικοποίηση αρχείου για το Β:" -#: optiondialog.cpp:1436 +#: optiondialog.cpp:1493 #, kde-format msgid "File Encoding for C:" msgstr "Κωδικοποίηση αρχείου για το Γ:" -#: optiondialog.cpp:1447 +#: optiondialog.cpp:1504 #, kde-format msgid "File Encoding for Merge Output and Saving:" msgstr "Κωδικοποίηση αρχείου για την έξοδο συγχώνευσης και την αποθήκευση:" -#: optiondialog.cpp:1452 +#: optiondialog.cpp:1509 #, kde-format msgid "Auto Select" msgstr "Αυτόματη επιλογή" -#: optiondialog.cpp:1456 +#: optiondialog.cpp:1513 #, kde-format msgid "" "If enabled then the encoding from the input files is used.\n" @@ -3035,17 +3053,17 @@ "Σε περίπτωση αμφιβολίας θα εμφανιστεί ένα παράθυρο διαλόγου όπου ο χρήστης " "θα πρέπει να επιλέξει την κωδικοποίηση για την αποθήκευση." -#: optiondialog.cpp:1459 +#: optiondialog.cpp:1516 #, kde-format msgid "File Encoding for Preprocessor Files:" msgstr "Κωδικοποίηση για τα αρχεία του προεπεξεργαστή:" -#: optiondialog.cpp:1471 +#: optiondialog.cpp:1528 #, kde-format msgid "Right To Left Language" msgstr "Γλώσσας αναγνώσιμη από δεξιά στα αριστερά" -#: optiondialog.cpp:1475 +#: optiondialog.cpp:1532 #, kde-format msgid "" "Some languages are read from right to left.\n" @@ -3054,22 +3072,22 @@ "Μερικές γλώσσες διαβάζονται από δεξιά στα αριστερά.\n" "Αυτή η ρύθμιση θα τροποποίηση τον προβολέα και τον επεξεργαστή κατάλληλα." -#: optiondialog.cpp:1485 +#: optiondialog.cpp:1542 #, kde-format msgid "Integration" msgstr "Ενσωμάτωση" -#: optiondialog.cpp:1486 +#: optiondialog.cpp:1543 #, kde-format msgid "Integration Settings" msgstr "Ρυθμίσεις ενσωμάτωσης" -#: optiondialog.cpp:1499 +#: optiondialog.cpp:1564 #, kde-format msgid "Command line options to ignore:" msgstr "Επιλογές γραμμής εντολών για αγνόηση:" -#: optiondialog.cpp:1505 +#: optiondialog.cpp:1570 #, kde-format msgid "" "List of command line options that should be ignored when KDiff3 is used by " @@ -3082,12 +3100,12 @@ "Μπορούν να ορισθούν πολλές τιμές διαχωρισμένες με το ';'\n" "Αυτό καταστέλλει το σφάλμα \"Άγνωστης επιλογής\"." -#: optiondialog.cpp:1510 +#: optiondialog.cpp:1575 #, kde-format msgid "Quit also via Escape key" msgstr "Έξοδος επίσης και με το πλήκτρο Esc" -#: optiondialog.cpp:1514 +#: optiondialog.cpp:1579 #, kde-format msgid "" "Fast method to exit.\n" @@ -3096,7 +3114,7 @@ "Γρήγορη μέθοδος εξόδου.\n" "
Γι' αυτούς που έχουν συνηθίσει τη χρήση του πλήκτρου Esc." -#: optiondialog.cpp:1598 +#: optiondialog.cpp:1653 #, kde-format msgid "This resets all options. Not only those of the current topic." msgstr "" @@ -3152,79 +3170,70 @@ msgid "Disable Unsafe Options" msgstr "Απενεργοποίηση μη ασφαλών επιλογών" -#: pdiff.cpp:158 +#: pdiff.cpp:160 #, kde-format msgid "Loading A" msgstr "Φόρτωση του Α" -#: pdiff.cpp:167 -#, kde-format -msgid "Errors occurred during pre-processing of file A." -msgstr "" +#: pdiff.cpp:162 +#, fuzzy, kde-format +#| msgid "Loading A" +msgid "Loading A: %1" +msgstr "Φόρτωση του Α" -#: pdiff.cpp:172 +#: pdiff.cpp:170 #, kde-format msgid "Loading B" msgstr "Φόρτωση του Β" -#: pdiff.cpp:179 -#, kde-format -msgid "Errors occurred during pre-processing of file B." -msgstr "" - -#: pdiff.cpp:202 pdiff.cpp:241 +#: pdiff.cpp:201 pdiff.cpp:237 #, kde-format msgid "Diff: A <-> B" msgstr "Διαφορά: Α <-> Β" -#: pdiff.cpp:208 pdiff.cpp:279 pdiff.cpp:293 +#: pdiff.cpp:207 pdiff.cpp:275 pdiff.cpp:289 #, kde-format msgid "Linediff: A <-> B" msgstr "Διαφορά γραμμής: Α <-> Β" -#: pdiff.cpp:225 +#: pdiff.cpp:224 #, kde-format msgid "Loading C" msgstr "Φόρτωση του Γ" -#: pdiff.cpp:232 -#, kde-format -msgid "Errors occurred during pre-processing of file C." -msgstr "" - -#: pdiff.cpp:250 +#: pdiff.cpp:246 #, kde-format msgid "Diff: A <-> C" msgstr "Διαφορά: Α <-> Γ" -#: pdiff.cpp:261 +#: pdiff.cpp:257 #, kde-format msgid "Diff: B <-> C" msgstr "Διαφορά: Β <-> Γ" -#: pdiff.cpp:283 pdiff.cpp:297 +#: pdiff.cpp:279 pdiff.cpp:293 #, kde-format msgid "Linediff: B <-> C" msgstr "Διαφορά γραμμής: Β <-> Γ" -#: pdiff.cpp:287 pdiff.cpp:301 +#: pdiff.cpp:283 pdiff.cpp:297 #, kde-format msgid "Linediff: A <-> C" msgstr "Διαφορά γραμμής: Α <-> Γ" -#: pdiff.cpp:829 +#: pdiff.cpp:819 #, kde-format msgid "All input files contain the same text, but are not binary equal." msgstr "" "Όλα τα αρχεία εισόδου περιέχουν το ίδιο κείμενο, αλλά δεν είναι δυαδικά ίσα." -#: pdiff.cpp:835 pdiff.cpp:839 pdiff.cpp:843 +#: pdiff.cpp:825 pdiff.cpp:829 pdiff.cpp:833 #, kde-format msgid "Files %1 and %2 have equal text, but are not binary equal. \n" msgstr "" "Τα αρχεία %1 και %2 περιέχουν το ίδιο κείμενο, αλλά δεν είναι δυαδικά ίσα.\n" -#: pdiff.cpp:853 +#: pdiff.cpp:843 #, fuzzy, kde-format #| msgid "" #| "Some inputfiles don't seem to be pure textfiles.\n" @@ -3239,17 +3248,17 @@ "Σημειώστε ότι το KDiff3-merge δε φτιάχτηκε για δυαδικά δεδομένα.\n" "Αν συνεχίσετε θα είναι με δική σας ευθύνη." -#: pdiff.cpp:863 +#: pdiff.cpp:853 #, kde-format msgid ", B" msgstr "" -#: pdiff.cpp:865 +#: pdiff.cpp:855 #, kde-format msgid ", C" msgstr "" -#: pdiff.cpp:867 +#: pdiff.cpp:857 #, fuzzy, kde-format #| msgid "" #| "Some input characters could not be converted to valid unicode.\n" @@ -3270,77 +3279,72 @@ "ευθύνη.\n" "Τα επηρεαζόμενα αρχεία εισόδου είναι στο %1." -#: pdiff.cpp:1034 +#: pdiff.cpp:1032 #, kde-format msgid "Abort" msgstr "Εγκατάλειψη" -#: pdiff.cpp:1040 pdiff.cpp:1130 +#: pdiff.cpp:1038 pdiff.cpp:1129 #, kde-format msgid "Opening files..." msgstr "Άνοιγμα αρχείων..." -#: pdiff.cpp:1107 -#, kde-format -msgid "File open error" -msgstr "Σφάλμα ανοίγματος αρχείου" - -#: pdiff.cpp:1202 +#: pdiff.cpp:1212 #, kde-format msgid "Cutting selection..." msgstr "Αποκοπή επιλογής..." -#: pdiff.cpp:1223 +#: pdiff.cpp:1233 #, kde-format msgid "Copying selection to clipboard..." msgstr "Αντιγραφή της επιλογής στο πρόχειρο..." -#: pdiff.cpp:1239 +#: pdiff.cpp:1249 #, kde-format msgid "Inserting clipboard contents..." msgstr "Εισαγωγή των περιεχομένων του προχείρου..." -#: pdiff.cpp:1695 +#: pdiff.cpp:1705 #, kde-format msgid "Word wrap (Cancel disables word wrap)" msgstr "" -#: pdiff.cpp:1696 +#: pdiff.cpp:1706 #, kde-format msgid "Calculating max width for horizontal scrollbar" msgstr "" -#: pdiff.cpp:1911 +#: pdiff.cpp:1921 #, kde-format msgid "Save && Continue" msgstr "Αποθήκευση && συνέχεια" -#: pdiff.cpp:1912 +#: pdiff.cpp:1922 #, kde-format msgid "Continue Without Saving" msgstr "Συνέχεια χωρίς αποθήκευση" -#: pdiff.cpp:2124 +#: pdiff.cpp:2134 #, kde-format msgid "Search complete." msgstr "Η αναζήτηση ολοκληρώθηκε." -#: pdiff.cpp:2124 +#: pdiff.cpp:2134 #, kde-format msgid "Search Complete" msgstr "Η αναζήτηση ολοκληρώθηκε" -#: pdiff.cpp:2375 +#: pdiff.cpp:2385 #, kde-format msgid "Nothing is selected in either diff input window." msgstr "Δεν έχει επιλεγεί τίποτα σε κανένα παράθυρο εισαγωγής διαφορών." -#: pdiff.cpp:2375 +#: pdiff.cpp:2385 #, kde-format msgid "Error while adding manual diff range" msgstr "Σφάλμα κατά την προσθήκη χειροκίνητου εύρους διαφορών" -#: progress.cpp:59 progress.cpp:71 +#: progress.cpp:61 progress.cpp:73 #, kde-format msgid "&Cancel" msgstr "&Ακύρωση" @@ -3350,128 +3354,128 @@ msgid "A (Base):" msgstr "Α (Βάση):" -#: smalldialogs.cpp:68 smalldialogs.cpp:85 smalldialogs.cpp:102 -#: smalldialogs.cpp:144 +#: smalldialogs.cpp:71 smalldialogs.cpp:90 smalldialogs.cpp:109 +#: smalldialogs.cpp:154 #, kde-format msgid "File..." msgstr "Αρχείο..." -#: smalldialogs.cpp:70 smalldialogs.cpp:87 smalldialogs.cpp:104 -#: smalldialogs.cpp:146 +#: smalldialogs.cpp:73 smalldialogs.cpp:92 smalldialogs.cpp:111 +#: smalldialogs.cpp:156 #, kde-format msgid "Dir..." msgstr "Κατάλογος..." -#: smalldialogs.cpp:96 +#: smalldialogs.cpp:103 #, kde-format msgid "C (Optional):" msgstr "Γ (Προαιρετικό):" -#: smalldialogs.cpp:119 +#: smalldialogs.cpp:126 #, fuzzy, kde-format #| msgid "Swap/Copy Names ..." msgid "Swap/Copy Names..." msgstr "Εναλλαγή/Αντιγραφή ονομάτων..." -#: smalldialogs.cpp:124 smalldialogs.cpp:125 smalldialogs.cpp:126 +#: smalldialogs.cpp:131 smalldialogs.cpp:132 smalldialogs.cpp:133 #, kde-format msgid "Swap %1<->%2" msgstr "Εναλλαγή %1<->%2" -#: smalldialogs.cpp:127 smalldialogs.cpp:128 smalldialogs.cpp:129 +#: smalldialogs.cpp:134 smalldialogs.cpp:135 smalldialogs.cpp:136 #, kde-format msgid "Copy %1->Output" msgstr "Αντιγραφή %1->Έξοδο" -#: smalldialogs.cpp:130 smalldialogs.cpp:131 smalldialogs.cpp:132 +#: smalldialogs.cpp:137 smalldialogs.cpp:138 smalldialogs.cpp:139 #, kde-format msgid "Swap %1<->Output" msgstr "Εναλλαγή %1<->Έξοδος" -#: smalldialogs.cpp:138 +#: smalldialogs.cpp:148 #, kde-format msgid "Output (optional):" msgstr "Έξοδος (προαιρετική):" -#: smalldialogs.cpp:168 +#: smalldialogs.cpp:178 #, kde-format msgid "Configure..." msgstr "Διαμόρφωση..." -#: smalldialogs.cpp:233 +#: smalldialogs.cpp:243 #, fuzzy, kde-format #| msgid "Directory" msgid "Open Directory" msgstr "Κατάλογος" -#: smalldialogs.cpp:234 +#: smalldialogs.cpp:244 #, kde-format msgid "Select Output File" msgstr "" -#: smalldialogs.cpp:393 +#: smalldialogs.cpp:403 #, kde-format msgid "Search text:" msgstr "Αναζήτηση κειμένου:" -#: smalldialogs.cpp:400 +#: smalldialogs.cpp:410 #, kde-format msgid "Case sensitive" msgstr "Διάκριση πεζών/κεφαλαίων" -#: smalldialogs.cpp:403 +#: smalldialogs.cpp:413 #, kde-format msgid "Search A" msgstr "Αναζήτηση στο Α" -#: smalldialogs.cpp:408 +#: smalldialogs.cpp:418 #, kde-format msgid "Search B" msgstr "Αναζήτηση στο Β" -#: smalldialogs.cpp:413 +#: smalldialogs.cpp:423 #, kde-format msgid "Search C" msgstr "Αναζήτηση στο Γ" -#: smalldialogs.cpp:418 +#: smalldialogs.cpp:428 #, kde-format msgid "Search output" msgstr "Έξοδος αναζήτησης" -#: smalldialogs.cpp:425 +#: smalldialogs.cpp:435 #, kde-format msgid "&Search" msgstr "&Αναζήτηση" -#: smalldialogs.cpp:444 +#: smalldialogs.cpp:454 #, kde-format msgid "Regular Expression Tester" msgstr "Δοκιμή κανονικής έκφρασης" -#: smalldialogs.cpp:457 +#: smalldialogs.cpp:467 #, kde-format msgid "Example auto merge line:" msgstr "Παράδειγμα γραμμής αυτόματης συγχώνευσης:" -#: smalldialogs.cpp:459 +#: smalldialogs.cpp:469 #, kde-format msgid "To test auto merge, copy a line as used in your files." msgstr "" "Για τη δοκιμή αυτόματης συγχώνευσης, αντιγράψτε μια γραμμή όπως αυτή " "χρησιμοποιείται στα αρχεία σας." -#: smalldialogs.cpp:465 smalldialogs.cpp:493 smalldialogs.cpp:529 +#: smalldialogs.cpp:475 smalldialogs.cpp:503 smalldialogs.cpp:539 #, kde-format msgid "Match result:" msgstr "Αποτέλεσμα ταιριάσματος:" -#: smalldialogs.cpp:484 +#: smalldialogs.cpp:494 #, kde-format msgid "Example history start line (with leading comment):" msgstr "Παράδειγμα γραμμής αρχής ιστορικού (χωρίς το σχόλιο που προηγείται):" -#: smalldialogs.cpp:486 +#: smalldialogs.cpp:496 #, kde-format msgid "" "Copy a history start line as used in your files,\n" @@ -3481,19 +3485,19 @@ "σας,\n" "χωρίς να περιληφθεί το σχόλιο που προηγείται." -#: smalldialogs.cpp:512 +#: smalldialogs.cpp:522 #, kde-format msgid "History sort key order:" msgstr "Σειρά κλειδιών ταξινόμησης ιστορικού:" -#: smalldialogs.cpp:520 +#: smalldialogs.cpp:530 #, kde-format msgid "Example history entry start line (without leading comment):" msgstr "" "Παράδειγμα γραμμής αρχής καταχώρησης ιστορικού (χωρίς το σχόλιο που " "προηγείται):" -#: smalldialogs.cpp:522 +#: smalldialogs.cpp:532 #, kde-format msgid "" "Copy a history entry start line as used in your files,\n" @@ -3503,50 +3507,50 @@ "στα αρχεία σας,\n" "χωρίς να περιλάβετε το σχόλιο που προηγείται." -#: smalldialogs.cpp:536 +#: smalldialogs.cpp:546 #, kde-format msgid "Sort key result:" msgstr "Αποτέλεσμα κλειδιού ταξινόμησης:" -#: smalldialogs.cpp:584 smalldialogs.cpp:594 smalldialogs.cpp:614 +#: smalldialogs.cpp:594 smalldialogs.cpp:604 smalldialogs.cpp:624 #, kde-format msgid "Match success." msgstr "Επιτυχία ταιριάσματος." -#: smalldialogs.cpp:588 smalldialogs.cpp:598 smalldialogs.cpp:620 +#: smalldialogs.cpp:598 smalldialogs.cpp:608 smalldialogs.cpp:630 #, kde-format msgid "Match failed." msgstr "Αποτυχία ταιριάσματος." -#: smalldialogs.cpp:605 +#: smalldialogs.cpp:615 #, kde-format msgid "Opening and closing parentheses do not match in regular expression." msgstr "" "Αδυναμία ταιριάσματος παρενθέσεων ανοίγματος και κλεισίματος στην κανονική " "έκφραση." -#: SourceData.cpp:150 +#: SourceData.cpp:153 #, kde-format msgid "Writing clipboard data to temp file failed." msgstr "Η εγγραφή δεδομένων στο προσωρινό αρχείο απέτυχε." -#: SourceData.cpp:154 +#: SourceData.cpp:157 #, kde-format msgid "From Clipboard" msgstr "Από το πρόχειρο" -#: SourceData.cpp:335 +#: SourceData.cpp:348 #, fuzzy, kde-format #| msgid "Mix of links and normal files." msgid "%1 is not a normal file." msgstr "Ανάμιξη δεσμών και κανονικών αρχείων." -#: SourceData.cpp:427 +#: SourceData.cpp:440 #, kde-format msgid " Temp file is: %1" msgstr "" -#: SourceData.cpp:432 +#: SourceData.cpp:445 #, kde-format msgid "" "Preprocessing possibly failed. Check this command:\n" @@ -3561,12 +3565,12 @@ "\n" "Η εντολή προεπεξεργασίας θα απενεργοποιηθεί τώρα." -#: SourceData.cpp:443 SourceData.cpp:512 +#: SourceData.cpp:456 SourceData.cpp:525 #, kde-format msgid "File %1 too large to process. Skipping." msgstr "" -#: SourceData.cpp:487 +#: SourceData.cpp:500 #, kde-format msgid "" "The line-matching-preprocessing possibly failed. Check this command:\n" diff -Nru kdiff3-1.8.01/po/en_GB/diff_ext.po kdiff3-1.8.3/po/en_GB/diff_ext.po --- kdiff3-1.8.01/po/en_GB/diff_ext.po 2019-05-18 01:01:55.000000000 +0000 +++ kdiff3-1.8.3/po/en_GB/diff_ext.po 2020-06-25 00:18:13.000000000 +0000 @@ -5,11 +5,11 @@ msgid "" msgstr "" "Project-Id-Version: \n" -"Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2019-03-22 03:09+0100\n" +"Report-Msgid-Bugs-To: https://bugs.kde.org\n" +"POT-Creation-Date: 2019-11-04 07:54+0100\n" "PO-Revision-Date: 2018-08-15 12:55+0100\n" "Last-Translator: Steve Allewell \n" -"Language-Team: British English \n" +"Language-Team: British English \n" "Language: en_GB\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -17,117 +17,112 @@ "Plural-Forms: nplurals=2; plural=n != 1;\n" "X-Generator: Lokalize 2.0\n" -#: diff_ext.cpp:391 +#: diff_ext.cpp:223 #, kde-format msgid "Compare with %1" msgstr "Compare with %1" -#: diff_ext.cpp:392 +#: diff_ext.cpp:224 #, kde-format msgid "Merge with %1" msgstr "Merge with %1" -#: diff_ext.cpp:408 +#: diff_ext.cpp:234 #, kde-format msgid "3-way merge with base" msgstr "3-way merge with base" -#: diff_ext.cpp:411 +#: diff_ext.cpp:237 #, kde-format msgid "Save '%1' for later" msgstr "Save '%1' for later" -#: diff_ext.cpp:426 +#: diff_ext.cpp:251 #, kde-format msgid "Compare with ..." msgstr "Compare with ..." -#: diff_ext.cpp:429 +#: diff_ext.cpp:254 #, kde-format msgid "Clear list" msgstr "Clear list" -#: diff_ext.cpp:434 +#: diff_ext.cpp:259 #, kde-format msgid "Compare" msgstr "Compare" -#: diff_ext.cpp:438 +#: diff_ext.cpp:263 #, kde-format msgid "3 way comparison" msgstr "3 way comparison" -#: diff_ext.cpp:444 +#: diff_ext.cpp:269 #, kde-format msgid "About Diff-Ext ..." msgstr "About Diff-Ext ..." -#: diff_ext.cpp:515 +#: diff_ext.cpp:340 #, kde-format msgid "(32 Bit)" msgstr "(32 Bit)" -#: diff_ext.cpp:517 -#, kde-format -msgid "(64 Bit)" -msgstr "(64 Bit)" - -#: diff_ext.cpp:518 +#: diff_ext.cpp:342 #, kde-format msgid "Diff-Ext Copyright (c) 2003-2006, Sergey Zorin. All rights reserved.\n" msgstr "Diff-Ext Copyright (c) 2003-2006, Sergey Zorin. All rights reserved.\n" -#: diff_ext.cpp:519 +#: diff_ext.cpp:343 #, kde-format msgid "This software is distributable under the BSD-2-Clause license.\n" msgstr "This software is distributable under the BSD-2-Clause licence.\n" -#: diff_ext.cpp:520 +#: diff_ext.cpp:344 #, kde-format msgid "Some extensions for KDiff3 (c) 2006-2013 by Joachim Eibl.\n" msgstr "Some extensions for KDiff3 (c) 2006-2013 by Joachim Eibl.\n" -#: diff_ext.cpp:521 +#: diff_ext.cpp:345 #, kde-format msgid "Homepage for Diff-Ext: http://diff-ext.sourceforge.net\n" msgstr "Homepage for Diff-Ext: http://diff-ext.sourceforge.net\n" -#: diff_ext.cpp:522 +#: diff_ext.cpp:346 #, kde-format msgid "About Diff-Ext for KDiff3 " msgstr "About Diff-Ext for KDiff3 " -#: diff_ext.cpp:551 +#: diff_ext.cpp:375 #, kde-format msgid "Compare selected files" msgstr "Compare selected files" -#: diff_ext.cpp:557 diff_ext.cpp:577 +#: diff_ext.cpp:381 diff_ext.cpp:399 #, kde-format msgid "Compare '%1' with '%2'" msgstr "Compare '%1' with '%2'" -#: diff_ext.cpp:563 +#: diff_ext.cpp:386 #, kde-format msgid "Save '%1' for later operation" msgstr "Save '%1' for later operation" -#: diff_ext.cpp:619 +#: diff_ext.cpp:440 #, kde-format msgid "Could not start KDiff3. Please rerun KDiff3 installation." msgstr "Could not start KDiff3. Please rerun KDiff3 installation." -#: diff_ext.cpp:620 +#: diff_ext.cpp:441 #, kde-format msgid "Command" msgstr "Command" -#: diff_ext.cpp:621 +#: diff_ext.cpp:442 #, kde-format msgid "CommandLine" msgstr "CommandLine" -#: diff_ext.cpp:622 +#: diff_ext.cpp:443 #, kde-format msgid "Diff-Ext For KDiff3" msgstr "Diff-Ext For KDiff3" \ No newline at end of file diff -Nru kdiff3-1.8.01/po/en_GB/kdiff3fileitemactionplugin.po kdiff3-1.8.3/po/en_GB/kdiff3fileitemactionplugin.po --- kdiff3-1.8.01/po/en_GB/kdiff3fileitemactionplugin.po 2019-05-18 01:01:55.000000000 +0000 +++ kdiff3-1.8.3/po/en_GB/kdiff3fileitemactionplugin.po 2020-06-25 00:18:13.000000000 +0000 @@ -5,11 +5,11 @@ msgid "" msgstr "" "Project-Id-Version: \n" -"Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2019-03-22 03:09+0100\n" +"Report-Msgid-Bugs-To: https://bugs.kde.org\n" +"POT-Creation-Date: 2019-08-30 07:40+0200\n" "PO-Revision-Date: 2019-03-24 19:06+0000\n" "Last-Translator: Steve Allewell \n" -"Language-Team: British English \n" +"Language-Team: British English \n" "Language: en_GB\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" diff -Nru kdiff3-1.8.01/po/en_GB/kdiff3.po kdiff3-1.8.3/po/en_GB/kdiff3.po --- kdiff3-1.8.01/po/en_GB/kdiff3.po 2019-05-18 01:01:55.000000000 +0000 +++ kdiff3-1.8.3/po/en_GB/kdiff3.po 2020-06-25 00:18:13.000000000 +0000 @@ -4,15 +4,15 @@ # Malcolm Hunter , 2003. # Jonathan Riddell , 2003. # Andrew Coles , 2004, 2005, 2009, 2010. -# Steve Allewell , 2014, 2018, 2019. +# Steve Allewell , 2014, 2018, 2019, 2020. msgid "" msgstr "" "Project-Id-Version: kdiff3\n" -"Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2019-04-18 08:02+0200\n" -"PO-Revision-Date: 2019-03-24 19:06+0000\n" +"Report-Msgid-Bugs-To: https://bugs.kde.org\n" +"POT-Creation-Date: 2020-06-22 07:48+0200\n" +"PO-Revision-Date: 2020-03-31 12:18+0100\n" "Last-Translator: Steve Allewell \n" -"Language-Team: British English \n" +"Language-Team: British English \n" "Language: en_GB\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -30,285 +30,285 @@ msgid "Your emails" msgstr "andrew_coles@yahoo.co.uk, steve.allewell@gmail.com" -#: difftextwindow.cpp:412 +#: difftextwindow.cpp:414 #, kde-format msgid "File %1: Line %2" msgstr "File %1: Line %2" -#: difftextwindow.cpp:414 +#: difftextwindow.cpp:416 #, kde-format msgid "File %1: Line not available" msgstr "File %1: Line not available" -#: difftextwindow.cpp:1780 +#: difftextwindow.cpp:1778 #, kde-format msgid "Encoding:" msgstr "Encoding:" -#: difftextwindow.cpp:1782 mergeresultwindow.cpp:3138 optiondialog.cpp:818 +#: difftextwindow.cpp:1781 mergeresultwindow.cpp:3166 optiondialog.cpp:840 #, kde-format msgid "Line end style:" msgstr "Line end style:" -#: difftextwindow.cpp:1810 directorymergewindow.cpp:382 -#: directorymergewindow.cpp:433 directorymergewindow.cpp:524 -#: directorymergewindow.cpp:3058 directorymergewindow.cpp:3189 -#: directorymergewindow.cpp:3417 mergeresultwindow.cpp:942 -#: mergeresultwindow.cpp:944 mergeresultwindow.cpp:946 -#: mergeresultwindow.cpp:948 mergeresultwindow.cpp:1814 -#: mergeresultwindow.cpp:3170 mergeresultwindow.cpp:3177 optiondialog.cpp:962 -#: optiondialog.cpp:975 pdiff.cpp:833 pdiff.cpp:835 pdiff.cpp:837 pdiff.cpp:839 -#: pdiff.cpp:861 smalldialogs.cpp:124 smalldialogs.cpp:126 smalldialogs.cpp:127 -#: smalldialogs.cpp:130 +#: difftextwindow.cpp:1809 directorymergewindow.cpp:383 +#: directorymergewindow.cpp:434 directorymergewindow.cpp:525 +#: directorymergewindow.cpp:3072 directorymergewindow.cpp:3203 +#: directorymergewindow.cpp:3431 mergeresultwindow.cpp:970 +#: mergeresultwindow.cpp:972 mergeresultwindow.cpp:974 +#: mergeresultwindow.cpp:976 mergeresultwindow.cpp:1842 +#: mergeresultwindow.cpp:3198 mergeresultwindow.cpp:3205 optiondialog.cpp:1002 +#: optiondialog.cpp:1015 pdiff.cpp:823 pdiff.cpp:825 pdiff.cpp:827 +#: pdiff.cpp:829 pdiff.cpp:851 smalldialogs.cpp:131 smalldialogs.cpp:133 +#: smalldialogs.cpp:134 smalldialogs.cpp:137 #, kde-format msgid "A" msgstr "A" -#: difftextwindow.cpp:1810 directorymergewindow.cpp:384 -#: directorymergewindow.cpp:436 directorymergewindow.cpp:526 -#: directorymergewindow.cpp:3064 directorymergewindow.cpp:3190 -#: directorymergewindow.cpp:3418 mergeresultwindow.cpp:942 -#: mergeresultwindow.cpp:944 mergeresultwindow.cpp:950 -#: mergeresultwindow.cpp:952 mergeresultwindow.cpp:1816 -#: mergeresultwindow.cpp:3172 mergeresultwindow.cpp:3179 optiondialog.cpp:963 -#: optiondialog.cpp:976 pdiff.cpp:833 pdiff.cpp:835 pdiff.cpp:841 pdiff.cpp:843 -#: pdiff.cpp:863 smalldialogs.cpp:124 smalldialogs.cpp:125 smalldialogs.cpp:128 -#: smalldialogs.cpp:131 +#: difftextwindow.cpp:1809 directorymergewindow.cpp:385 +#: directorymergewindow.cpp:437 directorymergewindow.cpp:527 +#: directorymergewindow.cpp:3078 directorymergewindow.cpp:3204 +#: directorymergewindow.cpp:3432 mergeresultwindow.cpp:970 +#: mergeresultwindow.cpp:972 mergeresultwindow.cpp:978 +#: mergeresultwindow.cpp:980 mergeresultwindow.cpp:1844 +#: mergeresultwindow.cpp:3200 mergeresultwindow.cpp:3207 optiondialog.cpp:1003 +#: optiondialog.cpp:1016 pdiff.cpp:823 pdiff.cpp:825 pdiff.cpp:831 +#: pdiff.cpp:833 pdiff.cpp:853 smalldialogs.cpp:131 smalldialogs.cpp:132 +#: smalldialogs.cpp:135 smalldialogs.cpp:138 #, kde-format msgid "B" msgstr "B" -#: difftextwindow.cpp:1810 directorymergewindow.cpp:386 -#: directorymergewindow.cpp:439 directorymergewindow.cpp:528 -#: directorymergewindow.cpp:3070 directorymergewindow.cpp:3191 -#: directorymergewindow.cpp:3419 mergeresultwindow.cpp:946 -#: mergeresultwindow.cpp:948 mergeresultwindow.cpp:950 -#: mergeresultwindow.cpp:952 mergeresultwindow.cpp:1818 -#: mergeresultwindow.cpp:3174 mergeresultwindow.cpp:3181 optiondialog.cpp:977 -#: pdiff.cpp:837 pdiff.cpp:839 pdiff.cpp:841 pdiff.cpp:843 pdiff.cpp:865 -#: smalldialogs.cpp:125 smalldialogs.cpp:126 smalldialogs.cpp:129 -#: smalldialogs.cpp:132 +#: difftextwindow.cpp:1809 directorymergewindow.cpp:387 +#: directorymergewindow.cpp:440 directorymergewindow.cpp:529 +#: directorymergewindow.cpp:3084 directorymergewindow.cpp:3205 +#: directorymergewindow.cpp:3433 mergeresultwindow.cpp:974 +#: mergeresultwindow.cpp:976 mergeresultwindow.cpp:978 +#: mergeresultwindow.cpp:980 mergeresultwindow.cpp:1846 +#: mergeresultwindow.cpp:3202 mergeresultwindow.cpp:3209 optiondialog.cpp:1017 +#: pdiff.cpp:827 pdiff.cpp:829 pdiff.cpp:831 pdiff.cpp:833 pdiff.cpp:855 +#: smalldialogs.cpp:132 smalldialogs.cpp:133 smalldialogs.cpp:136 +#: smalldialogs.cpp:139 #, kde-format msgid "C" msgstr "C" -#: difftextwindow.cpp:1810 +#: difftextwindow.cpp:1809 #, kde-format msgid "A (Base)" msgstr "A (Base)" -#: difftextwindow.cpp:1812 +#: difftextwindow.cpp:1811 #, kde-format msgid "Encoding: %1" msgstr "Encoding: %1" -#: difftextwindow.cpp:1813 mergeresultwindow.cpp:3183 +#: difftextwindow.cpp:1812 mergeresultwindow.cpp:3211 #, kde-format msgid "Unix" msgstr "Unix" -#: difftextwindow.cpp:1813 mergeresultwindow.cpp:3184 +#: difftextwindow.cpp:1812 mergeresultwindow.cpp:3212 #, kde-format msgid "DOS" msgstr "DOS" -#: difftextwindow.cpp:1813 +#: difftextwindow.cpp:1812 #, kde-format msgid "Line end style: %1" msgstr "Line end style: %1" -#: difftextwindow.cpp:1835 kdiff3.cpp:873 +#: difftextwindow.cpp:1834 kdiff3.cpp:874 #, kde-format msgid "Top line" msgstr "Top line" -#: difftextwindow.cpp:1845 +#: difftextwindow.cpp:1843 #, kde-format msgid "End" msgstr "End" -#: difftextwindow.cpp:1903 smalldialogs.cpp:235 +#: difftextwindow.cpp:1901 smalldialogs.cpp:245 #, kde-format msgid "Open File" msgstr "Open File" -#: difftextwindow.cpp:1951 optiondialog.cpp:387 +#: difftextwindow.cpp:1943 optiondialog.cpp:389 #, kde-format msgid "Unicode, 8 bit" msgstr "Unicode, 8 bit" -#: difftextwindow.cpp:1966 +#: difftextwindow.cpp:1958 #, kde-format msgid "Other" msgstr "Other" -#: directorymergewindow.cpp:409 directorymergewindow.cpp:3424 +#: directorymergewindow.cpp:410 directorymergewindow.cpp:3438 #, kde-format msgid "Copy A to B" msgstr "Copy A to B" -#: directorymergewindow.cpp:412 directorymergewindow.cpp:3425 +#: directorymergewindow.cpp:413 directorymergewindow.cpp:3439 #, kde-format msgid "Copy B to A" msgstr "Copy B to A" -#: directorymergewindow.cpp:415 directorymergewindow.cpp:3426 +#: directorymergewindow.cpp:416 directorymergewindow.cpp:3440 #, kde-format msgid "Delete A" msgstr "Delete A" -#: directorymergewindow.cpp:418 directorymergewindow.cpp:3427 +#: directorymergewindow.cpp:419 directorymergewindow.cpp:3441 #, kde-format msgid "Delete B" msgstr "Delete B" -#: directorymergewindow.cpp:421 +#: directorymergewindow.cpp:422 #, kde-format msgid "Delete A & B" msgstr "Delete A & B" -#: directorymergewindow.cpp:424 directorymergewindow.cpp:3429 +#: directorymergewindow.cpp:425 directorymergewindow.cpp:3443 #, kde-format msgid "Merge to A" msgstr "Merge to A" -#: directorymergewindow.cpp:427 directorymergewindow.cpp:3430 +#: directorymergewindow.cpp:428 directorymergewindow.cpp:3444 #, kde-format msgid "Merge to B" msgstr "Merge to B" -#: directorymergewindow.cpp:430 +#: directorymergewindow.cpp:431 #, kde-format msgid "Merge to A & B" msgstr "Merge to A & B" -#: directorymergewindow.cpp:442 directorymergewindow.cpp:3421 +#: directorymergewindow.cpp:443 directorymergewindow.cpp:3435 #, kde-format msgid "Delete (if exists)" msgstr "Delete (if exists)" -#: directorymergewindow.cpp:445 directorymergewindow.cpp:448 -#: directorymergewindow.cpp:3420 optiondialog.cpp:925 smalldialogs.cpp:113 +#: directorymergewindow.cpp:446 directorymergewindow.cpp:449 +#: directorymergewindow.cpp:3434 smalldialogs.cpp:120 #, kde-format msgid "Merge" msgstr "Merge" -#: directorymergewindow.cpp:445 directorymergewindow.cpp:448 +#: directorymergewindow.cpp:446 directorymergewindow.cpp:449 #, kde-format msgid "Merge (manual)" msgstr "Merge (manual)" -#: directorymergewindow.cpp:451 +#: directorymergewindow.cpp:452 #, kde-format msgid "Error: Conflicting File Types" msgstr "Error: Conflicting File Types" -#: directorymergewindow.cpp:454 +#: directorymergewindow.cpp:455 #, kde-format msgid "Error: Changed and Deleted" msgstr "Error: Changed and Deleted" -#: directorymergewindow.cpp:457 +#: directorymergewindow.cpp:458 #, kde-format msgid "Error: Dates are equal but files are not." msgstr "Error: Dates are equal but files are not." -#: directorymergewindow.cpp:471 +#: directorymergewindow.cpp:472 #, kde-format msgid "Done" msgstr "Done" -#: directorymergewindow.cpp:473 +#: directorymergewindow.cpp:474 #, kde-format msgid "Error" msgstr "Error" -#: directorymergewindow.cpp:475 +#: directorymergewindow.cpp:476 #, kde-format msgid "Skipped." msgstr "Skipped." -#: directorymergewindow.cpp:477 +#: directorymergewindow.cpp:478 #, kde-format msgid "Not saved." msgstr "Not saved." -#: directorymergewindow.cpp:479 +#: directorymergewindow.cpp:480 #, kde-format msgid "In progress..." msgstr "In progress..." -#: directorymergewindow.cpp:481 +#: directorymergewindow.cpp:482 #, kde-format msgid "To do." msgstr "To do." -#: directorymergewindow.cpp:522 +#: directorymergewindow.cpp:523 #, kde-format msgid "Name" msgstr "Name" -#: directorymergewindow.cpp:530 +#: directorymergewindow.cpp:531 #, kde-format msgid "Operation" msgstr "Operation" -#: directorymergewindow.cpp:532 +#: directorymergewindow.cpp:533 #, kde-format msgid "Status" msgstr "Status" -#: directorymergewindow.cpp:534 +#: directorymergewindow.cpp:535 #, kde-format msgid "Unsolved" msgstr "Unsolved" -#: directorymergewindow.cpp:536 +#: directorymergewindow.cpp:537 #, kde-format msgid "Solved" msgstr "Solved" -#: directorymergewindow.cpp:538 +#: directorymergewindow.cpp:539 #, kde-format msgid "Nonwhite" msgstr "Nonwhite" -#: directorymergewindow.cpp:540 +#: directorymergewindow.cpp:541 #, kde-format msgid "White" msgstr "White" -#: directorymergewindow.cpp:674 +#: directorymergewindow.cpp:676 #, kde-format msgid "Unable to compare non-normal file with normal file." msgstr "Unable to compare non-normal file with normal file." -#: directorymergewindow.cpp:688 +#: directorymergewindow.cpp:690 #, kde-format msgid "Mix of links and normal files." msgstr "Mix of links and normal files." -#: directorymergewindow.cpp:695 +#: directorymergewindow.cpp:697 #, kde-format msgid "Link: " msgstr "Link: " -#: directorymergewindow.cpp:704 +#: directorymergewindow.cpp:706 #, kde-format msgid "Size. " msgstr "Size. " -#: directorymergewindow.cpp:718 directorymergewindow.cpp:728 +#: directorymergewindow.cpp:720 directorymergewindow.cpp:730 #, kde-format msgid "Date & Size: " msgstr "Date & Size: " -#: directorymergewindow.cpp:748 +#: directorymergewindow.cpp:751 #, kde-format msgid "Comparing file..." msgstr "Comparing file..." -#: directorymergewindow.cpp:801 +#: directorymergewindow.cpp:813 #, kde-format msgid "" "You are currently doing a directory merge. Are you sure, you want to abort " @@ -317,48 +317,48 @@ "You are currently doing a directory merge. Are you sure, you want to abort " "the merge and rescan the directory?" -#: directorymergewindow.cpp:802 kdiff3.cpp:698 kdiff3.cpp:708 kdiff3.cpp:720 -#: mergeresultwindow.cpp:372 pdiff.cpp:1033 pdiff.cpp:1910 pdiff.cpp:1920 +#: directorymergewindow.cpp:814 kdiff3.cpp:697 kdiff3.cpp:707 kdiff3.cpp:719 +#: mergeresultwindow.cpp:400 pdiff.cpp:1031 pdiff.cpp:1920 pdiff.cpp:1930 #, kde-format msgid "Warning" msgstr "Warning" -#: directorymergewindow.cpp:803 directorymergewindow.cpp:3393 +#: directorymergewindow.cpp:815 directorymergewindow.cpp:3407 #, kde-format msgid "Rescan" msgstr "Rescan" -#: directorymergewindow.cpp:804 pdiff.cpp:1035 +#: directorymergewindow.cpp:816 pdiff.cpp:1033 #, kde-format msgid "Continue Merging" msgstr "Continue Merging" -#: directorymergewindow.cpp:971 +#: directorymergewindow.cpp:984 #, kde-format msgid "Opening of directories failed:" msgstr "Opening of directories failed:" -#: directorymergewindow.cpp:975 +#: directorymergewindow.cpp:988 #, 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:980 +#: directorymergewindow.cpp:993 #, 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:985 +#: directorymergewindow.cpp:998 #, 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:988 +#: directorymergewindow.cpp:1001 #, kde-format msgid "Directory Open Error" msgstr "Directory Open Error" -#: directorymergewindow.cpp:996 +#: directorymergewindow.cpp:1009 #, kde-format msgid "" "The destination directory must not be the same as A or B when three " @@ -369,49 +369,49 @@ "directories are merged.\n" "Check again before continuing." -#: directorymergewindow.cpp:998 +#: directorymergewindow.cpp:1011 #, kde-format msgid "Parameter Warning" msgstr "Parameter Warning" -#: directorymergewindow.cpp:1003 +#: directorymergewindow.cpp:1016 #, kde-format msgid "Scanning directories..." msgstr "Scanning directories..." -#: directorymergewindow.cpp:1029 +#: directorymergewindow.cpp:1042 #, kde-format msgid "Reading Directory A" msgstr "Reading Directory A" -#: directorymergewindow.cpp:1038 +#: directorymergewindow.cpp:1051 #, kde-format msgid "Reading Directory B" msgstr "Reading Directory B" -#: directorymergewindow.cpp:1048 +#: directorymergewindow.cpp:1061 #, kde-format msgid "Reading Directory C" msgstr "Reading Directory C" -#: directorymergewindow.cpp:1064 +#: directorymergewindow.cpp:1077 #, kde-format msgid "Some subdirectories were not readable in" msgstr "Some subdirectories were not readable in" -#: directorymergewindow.cpp:1069 +#: directorymergewindow.cpp:1082 #, kde-format msgid "Check the permissions of the subdirectories." msgstr "Check the permissions of the subdirectories." -#: directorymergewindow.cpp:1106 kdiff3.cpp:666 kdiff3.cpp:753 kdiff3.cpp:777 -#: kdiff3.cpp:1065 kdiff3.cpp:1086 pdiff.cpp:1116 pdiff.cpp:1170 pdiff.cpp:1218 -#: pdiff.cpp:1234 pdiff.cpp:1277 pdiff.cpp:1301 +#: directorymergewindow.cpp:1119 kdiff3.cpp:665 kdiff3.cpp:752 kdiff3.cpp:776 +#: kdiff3.cpp:1072 kdiff3.cpp:1093 pdiff.cpp:1115 pdiff.cpp:1178 pdiff.cpp:1228 +#: pdiff.cpp:1244 pdiff.cpp:1287 pdiff.cpp:1311 #, kde-format msgid "Ready." msgstr "Ready." -#: directorymergewindow.cpp:1121 +#: directorymergewindow.cpp:1134 #, kde-format msgid "" "Directory Comparison Status\n" @@ -426,22 +426,22 @@ "Number of equal files: %2\n" "Number of different files: %3" -#: directorymergewindow.cpp:1128 +#: directorymergewindow.cpp:1141 #, kde-format msgid "Number of manual merges: %1" msgstr "Number of manual merges: %1" -#: directorymergewindow.cpp:1394 +#: directorymergewindow.cpp:1407 #, kde-format msgid "This affects all merge operations." msgstr "This affects all merge operations." -#: directorymergewindow.cpp:1395 +#: directorymergewindow.cpp:1408 #, kde-format msgid "Changing All Merge Operations" msgstr "Changing All Merge Operations" -#: directorymergewindow.cpp:1695 +#: directorymergewindow.cpp:1708 #, kde-format msgid "" "Processing %1 / %2\n" @@ -450,44 +450,44 @@ "Processing %1 / %2\n" "%3" -#: directorymergewindow.cpp:1738 directorymergewindow.cpp:1742 +#: directorymergewindow.cpp:1751 directorymergewindow.cpp:1755 #, kde-format msgid "Some files could not be processed." msgstr "Some files could not be processed." -#: directorymergewindow.cpp:2222 directorymergewindow.cpp:2247 -#: directorymergewindow.cpp:2271 +#: directorymergewindow.cpp:2235 directorymergewindow.cpp:2260 +#: directorymergewindow.cpp:2285 #, kde-format msgid "This operation is currently not possible." msgstr "This operation is currently not possible." -#: directorymergewindow.cpp:2222 directorymergewindow.cpp:2247 -#: directorymergewindow.cpp:2271 directorymergewindow.cpp:2552 +#: directorymergewindow.cpp:2235 directorymergewindow.cpp:2260 +#: directorymergewindow.cpp:2285 directorymergewindow.cpp:2565 #, kde-format msgid "Operation Not Possible" msgstr "Operation Not Possible" -#: directorymergewindow.cpp:2318 +#: directorymergewindow.cpp:2332 #, kde-format msgid "An error occurred while copying." msgstr "An error occurred while copying." -#: directorymergewindow.cpp:2319 directorymergewindow.cpp:2759 +#: directorymergewindow.cpp:2333 directorymergewindow.cpp:2772 #, kde-format msgid "Merge Error" msgstr "Merge Error" -#: directorymergewindow.cpp:2396 +#: directorymergewindow.cpp:2410 #, kde-format msgid "Unknown merge operation. (This must never happen!)" msgstr "Unknown merge operation. (This must never happen!)" -#: directorymergewindow.cpp:2441 +#: directorymergewindow.cpp:2455 #, kde-format msgid "Unknown merge operation." msgstr "Unknown merge operation." -#: directorymergewindow.cpp:2454 +#: directorymergewindow.cpp:2468 #, kde-format msgid "" "The merge is about to begin.\n" @@ -508,22 +508,22 @@ "Be aware that this program still has beta status and there is NO WARRANTY " "whatsoever! Make backups of your vital data!" -#: directorymergewindow.cpp:2459 +#: directorymergewindow.cpp:2473 #, kde-format msgid "Starting Merge" msgstr "Starting Merge" -#: directorymergewindow.cpp:2460 +#: directorymergewindow.cpp:2474 #, kde-format msgid "Do It" msgstr "Do It" -#: directorymergewindow.cpp:2461 +#: directorymergewindow.cpp:2475 #, kde-format msgid "Simulate It" msgstr "Simulate It" -#: directorymergewindow.cpp:2487 +#: directorymergewindow.cpp:2501 #, kde-format msgid "" "The highlighted item has a different type in the different directories. " @@ -532,7 +532,7 @@ "The highlighted item has a different type in the different directories. " "Select what to do." -#: directorymergewindow.cpp:2491 +#: directorymergewindow.cpp:2505 #, kde-format msgid "" "The modification dates of the file are equal but the files are not. Select " @@ -541,7 +541,7 @@ "The modification dates of the file are equal but the files are not. Select " "what to do." -#: directorymergewindow.cpp:2495 +#: directorymergewindow.cpp:2509 #, kde-format msgid "" "The highlighted item was changed in one directory and deleted in the other. " @@ -550,7 +550,7 @@ "The highlighted item was changed in one directory and deleted in the other. " "Select what to do." -#: directorymergewindow.cpp:2552 +#: directorymergewindow.cpp:2565 #, kde-format msgid "" "This operation is currently not possible because directory merge is " @@ -559,7 +559,7 @@ "This operation is currently not possible because directory merge is " "currently running." -#: directorymergewindow.cpp:2609 +#: directorymergewindow.cpp:2622 #, kde-format msgid "" "There was an error in the last step.\n" @@ -570,257 +570,257 @@ "Do you want to continue with the item that caused the error or do you want " "to skip this item?" -#: directorymergewindow.cpp:2611 +#: directorymergewindow.cpp:2624 #, kde-format msgid "Continue merge after an error" msgstr "Continue merge after an error" -#: directorymergewindow.cpp:2612 +#: directorymergewindow.cpp:2625 #, kde-format msgid "Continue With Last Item" msgstr "Continue With Last Item" -#: directorymergewindow.cpp:2613 +#: directorymergewindow.cpp:2626 #, kde-format msgid "Skip Item" msgstr "Skip Item" -#: directorymergewindow.cpp:2709 +#: directorymergewindow.cpp:2722 #, kde-format msgid "Merge operation complete." msgstr "Merge operation complete." -#: directorymergewindow.cpp:2709 directorymergewindow.cpp:2712 +#: directorymergewindow.cpp:2722 directorymergewindow.cpp:2725 #, kde-format msgid "Merge Complete" msgstr "Merge Complete" -#: directorymergewindow.cpp:2722 +#: directorymergewindow.cpp:2735 #, kde-format 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:2758 +#: directorymergewindow.cpp:2771 #, kde-format msgid "An error occurred. Press OK to see detailed information." msgstr "An error occurred. Press OK to see detailed information." -#: directorymergewindow.cpp:2791 +#: directorymergewindow.cpp:2804 #, kde-format msgid "Error: While deleting %1: Creating backup failed." msgstr "Error: While deleting %1: Creating backup failed." -#: directorymergewindow.cpp:2798 +#: directorymergewindow.cpp:2811 #, kde-format msgid "delete directory recursively( %1 )" msgstr "delete directory recursively( %1 )" -#: directorymergewindow.cpp:2800 +#: directorymergewindow.cpp:2813 #, kde-format msgid "delete( %1 )" msgstr "delete( %1 )" -#: directorymergewindow.cpp:2815 +#: directorymergewindow.cpp:2828 #, kde-format 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:2834 +#: directorymergewindow.cpp:2847 #, kde-format msgid "Error: rmdir( %1 ) operation failed." msgstr "Error: rmdir( %1 ) operation failed." -#: directorymergewindow.cpp:2844 +#: directorymergewindow.cpp:2857 #, kde-format msgid "Error: delete operation failed." msgstr "Error: delete operation failed." -#: directorymergewindow.cpp:2870 +#: directorymergewindow.cpp:2884 #, kde-format msgid "manual merge( %1, %2, %3 -> %4)" msgstr "manual merge( %1, %2, %3 -> %4)" -#: directorymergewindow.cpp:2873 +#: directorymergewindow.cpp:2887 #, kde-format 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:2900 +#: directorymergewindow.cpp:2914 #, kde-format msgid "Error: copy( %1 -> %2 ) failed.Deleting existing destination failed." msgstr "Error: copy( %1 -> %2 ) failed.Deleting existing destination failed." -#: directorymergewindow.cpp:2909 +#: directorymergewindow.cpp:2923 #, kde-format msgid "copyLink( %1 -> %2 )" msgstr "copyLink( %1 -> %2 )" -#: directorymergewindow.cpp:2918 +#: directorymergewindow.cpp:2932 #, kde-format msgid "Error: copyLink failed: Remote links are not yet supported." msgstr "Error: copyLink failed: Remote links are not yet supported." -#: directorymergewindow.cpp:2928 +#: directorymergewindow.cpp:2942 #, kde-format msgid "Error: copyLink failed." msgstr "Error: copyLink failed." -#: directorymergewindow.cpp:2953 +#: directorymergewindow.cpp:2967 #, kde-format msgid "copy( %1 -> %2 )" msgstr "copy( %1 -> %2 )" -#: directorymergewindow.cpp:2979 +#: directorymergewindow.cpp:2993 #, kde-format msgid "Error during rename( %1 -> %2 ): Cannot delete existing destination." msgstr "Error during rename( %1 -> %2 ): Cannot delete existing destination." -#: directorymergewindow.cpp:2986 +#: directorymergewindow.cpp:3000 #, kde-format msgid "rename( %1 -> %2 )" msgstr "rename( %1 -> %2 )" -#: directorymergewindow.cpp:2995 +#: directorymergewindow.cpp:3009 #, kde-format msgid "Error: Rename failed." msgstr "Error: Rename failed." -#: directorymergewindow.cpp:3013 +#: directorymergewindow.cpp:3027 #, kde-format msgid "Error during makeDir of %1. Cannot delete existing file." msgstr "Error during makeDir of %1. Cannot delete existing file." -#: directorymergewindow.cpp:3030 +#: directorymergewindow.cpp:3044 #, kde-format msgid "makeDir( %1 )" msgstr "makeDir( %1 )" -#: directorymergewindow.cpp:3040 +#: directorymergewindow.cpp:3054 #, kde-format msgid "Error while creating directory." msgstr "Error while creating directory." -#: directorymergewindow.cpp:3076 directorymergewindow.cpp:3195 +#: directorymergewindow.cpp:3090 directorymergewindow.cpp:3209 #, kde-format msgid "Dest" msgstr "Dest" -#: directorymergewindow.cpp:3084 directorymergewindow.cpp:3113 +#: directorymergewindow.cpp:3098 directorymergewindow.cpp:3127 #, kde-format msgid "Dir" msgstr "Dir" -#: directorymergewindow.cpp:3084 +#: directorymergewindow.cpp:3098 #, kde-format msgid "Type" msgstr "Type" -#: directorymergewindow.cpp:3084 +#: directorymergewindow.cpp:3098 #, kde-format msgid "Size" msgstr "Size" -#: directorymergewindow.cpp:3085 +#: directorymergewindow.cpp:3099 #, kde-format msgid "Attr" msgstr "Attr" -#: directorymergewindow.cpp:3085 +#: directorymergewindow.cpp:3099 #, kde-format msgid "Last Modification" msgstr "Last Modification" -#: directorymergewindow.cpp:3085 +#: directorymergewindow.cpp:3099 #, kde-format msgid "Link-Destination" msgstr "Link-Destination" -#: directorymergewindow.cpp:3113 +#: directorymergewindow.cpp:3127 #, kde-format msgid "File" msgstr "File" -#: directorymergewindow.cpp:3113 +#: directorymergewindow.cpp:3127 #, kde-format msgid "-Link" msgstr "-Link" -#: directorymergewindow.cpp:3119 +#: directorymergewindow.cpp:3133 #, kde-format msgid "not available" msgstr "not available" -#: directorymergewindow.cpp:3137 +#: directorymergewindow.cpp:3151 #, kde-format msgid "A (Dest): " msgstr "A (Dest): " -#: directorymergewindow.cpp:3141 +#: directorymergewindow.cpp:3155 #, kde-format msgid "A: " msgstr "A: " -#: directorymergewindow.cpp:3141 +#: directorymergewindow.cpp:3155 #, kde-format msgid "A (Base): " msgstr "A (Base): " -#: directorymergewindow.cpp:3147 +#: directorymergewindow.cpp:3161 #, kde-format msgid "B (Dest): " msgstr "B (Dest): " -#: directorymergewindow.cpp:3151 +#: directorymergewindow.cpp:3165 #, kde-format msgid "B: " msgstr "B: " -#: directorymergewindow.cpp:3156 +#: directorymergewindow.cpp:3170 #, kde-format msgid "C (Dest): " msgstr "C (Dest): " -#: directorymergewindow.cpp:3160 +#: directorymergewindow.cpp:3174 #, kde-format msgid "C: " msgstr "C: " -#: directorymergewindow.cpp:3163 +#: directorymergewindow.cpp:3177 #, kde-format msgid "Dest: " msgstr "Dest: " #. i18n("Saving Directory Merge State ...")); -#: directorymergewindow.cpp:3238 +#: directorymergewindow.cpp:3252 #, kde-format msgid "Save Directory Merge State As..." msgstr "Save Directory Merge State As..." -#: directorymergewindow.cpp:3387 +#: directorymergewindow.cpp:3401 #, kde-format msgid "Start/Continue Directory Merge" msgstr "Start/Continue Directory Merge" -#: directorymergewindow.cpp:3388 +#: directorymergewindow.cpp:3402 #, kde-format msgid "Run Operation for Current Item" msgstr "Run Operation for Current Item" -#: directorymergewindow.cpp:3389 +#: directorymergewindow.cpp:3403 #, kde-format msgid "Compare Selected File" msgstr "Compare Selected File" -#: directorymergewindow.cpp:3390 +#: directorymergewindow.cpp:3404 #, kde-format msgid "Merge Current File" msgstr "Merge Current File" -#: directorymergewindow.cpp:3390 +#: directorymergewindow.cpp:3404 #, kde-format msgid "" "Merge\n" @@ -829,51 +829,51 @@ "Merge\n" "File" -#: directorymergewindow.cpp:3391 +#: directorymergewindow.cpp:3405 #, kde-format msgid "Fold All Subdirs" msgstr "Fold All Subdirs" -#: directorymergewindow.cpp:3392 +#: directorymergewindow.cpp:3406 #, kde-format msgid "Unfold All Subdirs" msgstr "Unfold All Subdirs" #. i18n("Save Directory Merge State ..."), 0, this, &DirectoryMergeWindow::slotSaveMergeState, ac, "dir_save_merge_state"); #. i18n("Load Directory Merge State ..."), 0, this, &DirectoryMergeWindow::slotLoadMergeState, ac, "dir_load_merge_state"); -#: directorymergewindow.cpp:3396 +#: directorymergewindow.cpp:3410 #, kde-format msgid "Choose A for All Items" msgstr "Choose A for All Items" -#: directorymergewindow.cpp:3397 +#: directorymergewindow.cpp:3411 #, kde-format msgid "Choose B for All Items" msgstr "Choose B for All Items" -#: directorymergewindow.cpp:3398 +#: directorymergewindow.cpp:3412 #, kde-format msgid "Choose C for All Items" msgstr "Choose C for All Items" -#: directorymergewindow.cpp:3399 +#: directorymergewindow.cpp:3413 #, kde-format msgid "Auto-Choose Operation for All Items" msgstr "Auto-Choose Operation for All Items" -#: directorymergewindow.cpp:3400 +#: directorymergewindow.cpp:3414 #, kde-format msgid "No Operation for All Items" msgstr "No Operation for All Items" #. i18n("Synchronize Directories"), 0, this, &DirectoryMergeWindow::slotSynchronizeDirectories, ac, "dir_synchronize_directories"); #. d->m_pDirChooseNewerFiles = GuiUtils::createAction< KToggleAction >(i18n("Copy Newer Files Instead of Merging"), 0, this, &DirectoryMergeWindow::slotChooseNewerFiles, ac, "dir_choose_newer_files"); -#: directorymergewindow.cpp:3405 +#: directorymergewindow.cpp:3419 #, kde-format msgid "Show Identical Files" msgstr "Show Identical Files" -#: directorymergewindow.cpp:3405 +#: directorymergewindow.cpp:3419 #, kde-format msgid "" "Identical\n" @@ -882,17 +882,17 @@ "Identical\n" "Files" -#: directorymergewindow.cpp:3406 +#: directorymergewindow.cpp:3420 #, kde-format msgid "Show Different Files" msgstr "Show Different Files" -#: directorymergewindow.cpp:3407 +#: directorymergewindow.cpp:3421 #, kde-format msgid "Show Files only in A" msgstr "Show Files only in A" -#: directorymergewindow.cpp:3407 +#: directorymergewindow.cpp:3421 #, kde-format msgid "" "Files\n" @@ -901,12 +901,12 @@ "Files\n" "only in A" -#: directorymergewindow.cpp:3408 +#: directorymergewindow.cpp:3422 #, kde-format msgid "Show Files only in B" msgstr "Show Files only in B" -#: directorymergewindow.cpp:3408 +#: directorymergewindow.cpp:3422 #, kde-format msgid "" "Files\n" @@ -915,12 +915,12 @@ "Files\n" "only in B" -#: directorymergewindow.cpp:3409 +#: directorymergewindow.cpp:3423 #, kde-format msgid "Show Files only in C" msgstr "Show Files only in C" -#: directorymergewindow.cpp:3409 +#: directorymergewindow.cpp:3423 #, kde-format msgid "" "Files\n" @@ -929,52 +929,57 @@ "Files\n" "only in C" -#: directorymergewindow.cpp:3413 +#: directorymergewindow.cpp:3427 #, kde-format msgid "Compare Explicitly Selected Files" msgstr "Compare Explicitly Selected Files" -#: directorymergewindow.cpp:3414 +#: directorymergewindow.cpp:3428 #, kde-format msgid "Merge Explicitly Selected Files" msgstr "Merge Explicitly Selected Files" -#: directorymergewindow.cpp:3416 directorymergewindow.cpp:3423 +#: directorymergewindow.cpp:3430 directorymergewindow.cpp:3437 #, kde-format msgid "Do Nothing" msgstr "Do Nothing" -#: directorymergewindow.cpp:3428 +#: directorymergewindow.cpp:3442 #, kde-format msgid "Delete A && B" msgstr "Delete A && B" -#: directorymergewindow.cpp:3431 +#: directorymergewindow.cpp:3445 #, kde-format msgid "Merge to A && B" msgstr "Merge to A && B" -#: fileaccess.cpp:462 SourceData.cpp:493 +#: fileaccess.cpp:301 +#, kde-format +msgid "Unable to determine full url. No parent specified." +msgstr "Unable to determine full URL. No parent specified." + +#: fileaccess.cpp:482 SourceData.cpp:506 #, kde-format msgid "Failed to read file: %1" msgstr "Failed to read file: %1" -#: fileaccess.cpp:587 +#: fileaccess.cpp:624 #, kde-format msgid "Creating temp copy of %1 failed." msgstr "Creating temp copy of %1 failed." -#: fileaccess.cpp:595 fileaccess.cpp:600 +#: fileaccess.cpp:632 fileaccess.cpp:637 #, kde-format msgid "Opening %1 failed. %2" msgstr "Opening %1 failed. %2" -#: fileaccess.cpp:619 fileaccess.cpp:627 +#: fileaccess.cpp:656 fileaccess.cpp:664 #, kde-format msgid "Error reading from %1. %2" msgstr "Error reading from %1. %2" -#: fileaccess.cpp:751 +#: fileaccess.cpp:788 #, kde-format msgid "" "While trying to make a backup, deleting an older backup failed.\n" @@ -983,7 +988,7 @@ "While trying to make a backup, deleting an older backup failed.\n" "Filename: %1" -#: fileaccess.cpp:758 +#: fileaccess.cpp:795 #, kde-format msgid "" "While trying to make a backup, renaming failed.\n" @@ -992,177 +997,177 @@ "While trying to make a backup, renaming failed.\n" "Filenames: %1 -> %2" -#: fileaccess.cpp:828 +#: fileaccess.cpp:865 #, kde-format msgid "Getting file status: %1" msgstr "Getting file status: %1" -#: fileaccess.cpp:869 +#: fileaccess.cpp:906 #, kde-format msgid "Reading file: %1" msgstr "Reading file: %1" -#: fileaccess.cpp:907 +#: fileaccess.cpp:944 #, kde-format msgid "Writing file: %1" msgstr "Writing file: %1" -#: fileaccess.cpp:940 +#: fileaccess.cpp:977 #, kde-format msgid "Out of memory" msgstr "Out of memory" -#: fileaccess.cpp:976 +#: fileaccess.cpp:1013 #, kde-format msgid "Making directory: %1" msgstr "Making directory: %1" -#: fileaccess.cpp:997 +#: fileaccess.cpp:1034 #, kde-format msgid "Removing directory: %1" msgstr "Removing directory: %1" -#: fileaccess.cpp:1012 +#: fileaccess.cpp:1049 #, kde-format msgid "Removing file: %1" msgstr "Removing file: %1" -#: fileaccess.cpp:1028 +#: fileaccess.cpp:1065 #, kde-format msgid "Creating symbolic link: %1 -> %2" msgstr "Creating symbolic link: %1 -> %2" -#: fileaccess.cpp:1052 +#: fileaccess.cpp:1089 #, kde-format msgid "Renaming file: %1 -> %2" msgstr "Renaming file: %1 -> %2" -#: fileaccess.cpp:1086 +#: fileaccess.cpp:1123 #, kde-format msgid "Copying file: %1 -> %2" msgstr "Copying file: %1 -> %2" -#: fileaccess.cpp:1108 +#: fileaccess.cpp:1145 #, kde-format msgid "Reading directory: %1" msgstr "Reading directory: %1" -#: fileaccess.cpp:1162 +#: fileaccess.cpp:1202 #, kde-format msgid "Listing directory: %1" msgstr "Listing directory: %1" -#: kdiff3.cpp:181 +#: kdiff3.cpp:182 #, kde-format msgid "Current Configuration:" msgstr "Current Configuration:" -#: kdiff3.cpp:186 +#: kdiff3.cpp:187 #, kde-format msgid "Config Option Error:" msgstr "Config Option Error:" -#: kdiff3.cpp:240 +#: kdiff3.cpp:246 #, kde-format msgid "Option --auto used, but no output file specified." msgstr "Option --auto used, but no output file specified." -#: kdiff3.cpp:416 +#: kdiff3.cpp:405 #, kde-format msgid "Option --auto ignored for directory comparison." msgstr "Option --auto ignored for directory comparison." -#: kdiff3.cpp:460 +#: kdiff3.cpp:449 #, kde-format msgid "Saving failed." msgstr "Saving failed." -#: kdiff3.cpp:496 pdiff.cpp:1098 +#: kdiff3.cpp:494 pdiff.cpp:1096 #, kde-format msgid "Opening of these files failed:" msgstr "Opening of these files failed:" -#: kdiff3.cpp:505 +#: kdiff3.cpp:503 pdiff.cpp:1105 #, kde-format -msgid "File Open Error" -msgstr "File Open Error" +msgid "File open error" +msgstr "File open error" -#: kdiff3.cpp:533 +#: kdiff3.cpp:532 #, kde-format msgid "Opens documents for comparison..." msgstr "Opens documents for comparison..." -#: kdiff3.cpp:535 +#: kdiff3.cpp:534 #, kde-format msgid "Reload" msgstr "Reload" -#: kdiff3.cpp:538 +#: kdiff3.cpp:537 #, kde-format msgid "Saves the merge result. All conflicts must be solved!" msgstr "Saves the merge result. All conflicts must be solved!" -#: kdiff3.cpp:540 +#: kdiff3.cpp:539 #, kde-format msgid "Saves the current document as..." msgstr "Saves the current document as..." -#: kdiff3.cpp:543 +#: kdiff3.cpp:542 #, kde-format msgid "Print the differences" msgstr "Print the differences" -#: kdiff3.cpp:546 +#: kdiff3.cpp:545 #, kde-format msgid "Quits the application" msgstr "Quits the application" -#: kdiff3.cpp:549 +#: kdiff3.cpp:548 #, kde-format msgid "Cuts the selected section and puts it to the clipboard" msgstr "Cuts the selected section and puts it to the clipboard" -#: kdiff3.cpp:552 +#: kdiff3.cpp:551 #, kde-format msgid "Copies the selected section to the clipboard" msgstr "Copies the selected section to the clipboard" -#: kdiff3.cpp:554 +#: kdiff3.cpp:553 #, kde-format msgid "Pastes the clipboard contents to current position" msgstr "Pastes the clipboard contents to current position" -#: kdiff3.cpp:557 +#: kdiff3.cpp:556 #, kde-format msgid "Select everything in current window" msgstr "Select everything in current window" -#: kdiff3.cpp:560 +#: kdiff3.cpp:559 #, kde-format msgid "Search for a string" msgstr "Search for a string" -#: kdiff3.cpp:562 +#: kdiff3.cpp:561 #, kde-format msgid "Search again for the string" msgstr "Search again for the string" -#: kdiff3.cpp:567 +#: kdiff3.cpp:566 #, kde-format msgid "Enables/disables the statusbar" msgstr "Enables/disables the statusbar" -#: kdiff3.cpp:571 +#: kdiff3.cpp:570 #, kde-format msgid "Configure KDiff3..." msgstr "Configure KDiff3..." -#: kdiff3.cpp:590 +#: kdiff3.cpp:589 #, kde-format msgid "Go to Current Delta" msgstr "Go to Current Delta" -#: kdiff3.cpp:590 +#: kdiff3.cpp:589 #, kde-format msgid "" "Current\n" @@ -1171,12 +1176,12 @@ "Current\n" "Delta" -#: kdiff3.cpp:592 +#: kdiff3.cpp:591 #, kde-format msgid "Go to First Delta" msgstr "Go to First Delta" -#: kdiff3.cpp:592 +#: kdiff3.cpp:591 #, kde-format msgid "" "First\n" @@ -1185,12 +1190,12 @@ "First\n" "Delta" -#: kdiff3.cpp:594 +#: kdiff3.cpp:593 #, kde-format msgid "Go to Last Delta" msgstr "Go to Last Delta" -#: kdiff3.cpp:594 +#: kdiff3.cpp:593 #, kde-format msgid "" "Last\n" @@ -1199,12 +1204,12 @@ "Last\n" "Delta" -#: kdiff3.cpp:596 +#: kdiff3.cpp:595 #, kde-format msgid "(Skips white space differences when \"Show White Space\" is disabled.)" msgstr "(Skips white space differences when \"Show White Space\" is disabled.)" -#: kdiff3.cpp:597 +#: kdiff3.cpp:596 #, kde-format msgid "" "(Does not skip white space differences even when \"Show White Space\" is " @@ -1213,12 +1218,12 @@ "(Does not skip white space differences even when \"Show White Space\" is " "disabled.)" -#: kdiff3.cpp:598 +#: kdiff3.cpp:597 #, kde-format msgid "Go to Previous Delta" msgstr "Go to Previous Delta" -#: kdiff3.cpp:598 +#: kdiff3.cpp:597 #, kde-format msgid "" "Prev\n" @@ -1227,12 +1232,12 @@ "Prev\n" "Delta" -#: kdiff3.cpp:600 +#: kdiff3.cpp:599 #, kde-format msgid "Go to Next Delta" msgstr "Go to Next Delta" -#: kdiff3.cpp:600 +#: kdiff3.cpp:599 #, kde-format msgid "" "Next\n" @@ -1241,12 +1246,12 @@ "Next\n" "Delta" -#: kdiff3.cpp:602 +#: kdiff3.cpp:601 #, kde-format msgid "Go to Previous Conflict" msgstr "Go to Previous Conflict" -#: kdiff3.cpp:602 +#: kdiff3.cpp:601 #, kde-format msgid "" "Prev\n" @@ -1255,12 +1260,12 @@ "Prev\n" "Conflict" -#: kdiff3.cpp:604 +#: kdiff3.cpp:603 #, kde-format msgid "Go to Next Conflict" msgstr "Go to Next Conflict" -#: kdiff3.cpp:604 +#: kdiff3.cpp:603 #, kde-format msgid "" "Next\n" @@ -1269,12 +1274,12 @@ "Next\n" "Conflict" -#: kdiff3.cpp:606 +#: kdiff3.cpp:605 #, kde-format msgid "Go to Previous Unsolved Conflict" msgstr "Go to Previous Unsolved Conflict" -#: kdiff3.cpp:606 +#: kdiff3.cpp:605 #, kde-format msgid "" "Prev\n" @@ -1283,12 +1288,12 @@ "Prev\n" "Unsolved" -#: kdiff3.cpp:608 +#: kdiff3.cpp:607 #, kde-format msgid "Go to Next Unsolved Conflict" msgstr "Go to Next Unsolved Conflict" -#: kdiff3.cpp:608 +#: kdiff3.cpp:607 #, kde-format msgid "" "Next\n" @@ -1297,12 +1302,12 @@ "Next\n" "Unsolved" -#: kdiff3.cpp:610 +#: kdiff3.cpp:609 #, kde-format msgid "Select Line(s) From A" msgstr "Select Line(s) From A" -#: kdiff3.cpp:610 +#: kdiff3.cpp:609 #, kde-format msgid "" "Choose\n" @@ -1311,12 +1316,12 @@ "Choose\n" "A" -#: kdiff3.cpp:611 +#: kdiff3.cpp:610 #, kde-format msgid "Select Line(s) From B" msgstr "Select Line(s) From B" -#: kdiff3.cpp:611 +#: kdiff3.cpp:610 #, kde-format msgid "" "Choose\n" @@ -1325,12 +1330,12 @@ "Choose\n" "B" -#: kdiff3.cpp:612 +#: kdiff3.cpp:611 #, kde-format msgid "Select Line(s) From C" msgstr "Select Line(s) From C" -#: kdiff3.cpp:612 +#: kdiff3.cpp:611 #, kde-format msgid "" "Choose\n" @@ -1339,12 +1344,12 @@ "Choose\n" "C" -#: kdiff3.cpp:613 +#: kdiff3.cpp:612 #, kde-format msgid "Automatically Go to Next Unsolved Conflict After Source Selection" msgstr "Automatically Go to Next Unsolved Conflict After Source Selection" -#: kdiff3.cpp:613 +#: kdiff3.cpp:612 #, kde-format msgid "" "Auto\n" @@ -1353,12 +1358,12 @@ "Auto\n" "Next" -#: kdiff3.cpp:615 +#: kdiff3.cpp:614 #, kde-format msgid "Show Space && Tabulator Characters" msgstr "Show Space && Tabulator Characters" -#: kdiff3.cpp:615 +#: kdiff3.cpp:614 #, kde-format msgid "" "White\n" @@ -1367,12 +1372,12 @@ "White\n" "Characters" -#: kdiff3.cpp:616 +#: kdiff3.cpp:615 #, kde-format msgid "Show White Space" msgstr "Show White Space" -#: kdiff3.cpp:616 +#: kdiff3.cpp:615 #, kde-format msgid "" "White\n" @@ -1381,12 +1386,12 @@ "White\n" "Deltas" -#: kdiff3.cpp:618 +#: kdiff3.cpp:617 #, kde-format msgid "Show Line Numbers" msgstr "Show Line Numbers" -#: kdiff3.cpp:618 +#: kdiff3.cpp:617 #, kde-format msgid "" "Line\n" @@ -1395,194 +1400,194 @@ "Line\n" "Numbers" -#: kdiff3.cpp:620 +#: kdiff3.cpp:619 #, kde-format msgid "Automatically Solve Simple Conflicts" msgstr "Automatically Solve Simple Conflicts" -#: kdiff3.cpp:621 +#: kdiff3.cpp:620 #, kde-format msgid "Set Deltas to Conflicts" msgstr "Set Deltas to Conflicts" -#: kdiff3.cpp:622 +#: kdiff3.cpp:621 #, kde-format msgid "Run Regular Expression Auto Merge" msgstr "Run Regular Expression Auto Merge" -#: kdiff3.cpp:623 +#: kdiff3.cpp:622 #, kde-format msgid "Automatically Solve History Conflicts" msgstr "Automatically Solve History Conflicts" -#: kdiff3.cpp:624 +#: kdiff3.cpp:623 #, kde-format msgid "Split Diff At Selection" msgstr "Split Diff At Selection" -#: kdiff3.cpp:625 +#: kdiff3.cpp:624 #, kde-format msgid "Join Selected Diffs" msgstr "Join Selected Diffs" -#: kdiff3.cpp:627 +#: kdiff3.cpp:626 #, kde-format msgid "Show Window A" msgstr "Show Window A" -#: kdiff3.cpp:628 +#: kdiff3.cpp:627 #, kde-format msgid "Show Window B" msgstr "Show Window B" -#: kdiff3.cpp:629 +#: kdiff3.cpp:628 #, kde-format msgid "Show Window C" msgstr "Show Window C" -#: kdiff3.cpp:631 +#: kdiff3.cpp:630 #, kde-format msgid "Normal Overview" msgstr "Normal Overview" -#: kdiff3.cpp:632 +#: kdiff3.cpp:631 #, kde-format msgid "A vs. B Overview" msgstr "A vs. B Overview" -#: kdiff3.cpp:633 +#: kdiff3.cpp:632 #, kde-format msgid "A vs. C Overview" msgstr "A vs. C Overview" -#: kdiff3.cpp:634 +#: kdiff3.cpp:633 #, kde-format msgid "B vs. C Overview" msgstr "B vs. C Overview" -#: kdiff3.cpp:635 +#: kdiff3.cpp:634 #, kde-format msgid "Word Wrap Diff Windows" msgstr "Word Wrap Diff Windows" -#: kdiff3.cpp:636 +#: kdiff3.cpp:635 #, kde-format msgid "Add Manual Diff Alignment" msgstr "Add Manual Diff Alignment" -#: kdiff3.cpp:637 +#: kdiff3.cpp:636 #, kde-format msgid "Clear All Manual Diff Alignments" msgstr "Clear All Manual Diff Alignments" -#: kdiff3.cpp:639 +#: kdiff3.cpp:638 #, kde-format msgid "Focus Next Window" msgstr "Focus Next Window" -#: kdiff3.cpp:640 +#: kdiff3.cpp:639 #, kde-format msgid "Focus Prev Window" msgstr "Focus Prev Window" -#: kdiff3.cpp:641 +#: kdiff3.cpp:640 #, kde-format msgid "Toggle Split Orientation" msgstr "Toggle Split Orientation" -#: kdiff3.cpp:643 +#: kdiff3.cpp:642 #, kde-format msgid "Dir && Text Split Screen View" msgstr "Dir && Text Split Screen View" -#: kdiff3.cpp:645 +#: kdiff3.cpp:644 #, kde-format msgid "Toggle Between Dir && Text View" msgstr "Toggle Between Dir && Text View" -#: kdiff3.cpp:697 pdiff.cpp:1909 +#: kdiff3.cpp:696 pdiff.cpp:1919 #, kde-format msgid "The merge result has not been saved." msgstr "The merge result has not been saved." -#: kdiff3.cpp:699 +#: kdiff3.cpp:698 #, kde-format msgid "Save && Quit" msgstr "Save && Quit" -#: kdiff3.cpp:700 +#: kdiff3.cpp:699 #, kde-format msgid "Quit Without Saving" msgstr "Quit Without Saving" -#: kdiff3.cpp:708 pdiff.cpp:1920 +#: kdiff3.cpp:707 pdiff.cpp:1930 #, kde-format msgid "Saving the merge result failed." msgstr "Saving the merge result failed." -#: kdiff3.cpp:719 pdiff.cpp:1032 +#: kdiff3.cpp:718 pdiff.cpp:1030 #, kde-format 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:742 +#: kdiff3.cpp:741 #, kde-format msgid "Saving file..." msgstr "Saving file..." -#: kdiff3.cpp:759 +#: kdiff3.cpp:758 #, kde-format msgid "Saving file with a new filename..." msgstr "Saving file with a new filename..." -#: kdiff3.cpp:761 +#: kdiff3.cpp:760 #, kde-format msgid "Save As..." msgstr "Save As..." -#: kdiff3.cpp:820 +#: kdiff3.cpp:819 #, kde-format msgid "Printing not implemented." msgstr "Printing not implemented." -#: kdiff3.cpp:857 +#: kdiff3.cpp:858 #, kde-format msgid "Printing..." msgstr "Printing..." -#: kdiff3.cpp:943 +#: kdiff3.cpp:948 #, kde-format msgid "Printing page %1 of %2" msgstr "Printing page %1 of %2" -#: kdiff3.cpp:1000 +#: kdiff3.cpp:1006 #, kde-format msgid " (Selection)" msgstr " (Selection)" -#: kdiff3.cpp:1027 +#: kdiff3.cpp:1034 #, kde-format msgid "Printing completed." msgstr "Printing completed." -#: kdiff3.cpp:1031 +#: kdiff3.cpp:1038 #, kde-format msgid "Printing aborted." msgstr "Printing aborted." -#: kdiff3.cpp:1038 +#: kdiff3.cpp:1045 #, kde-format msgid "Exiting..." msgstr "Exiting..." -#: kdiff3.cpp:1049 +#: kdiff3.cpp:1056 #, kde-format msgid "Toggling toolbar..." msgstr "Toggling toolbar..." -#: kdiff3.cpp:1070 +#: kdiff3.cpp:1077 #, kde-format msgid "Toggle the statusbar..." msgstr "Toggle the statusbar..." @@ -1607,7 +1612,7 @@ msgid "Joachim Eibl" msgstr "Joachim Eibl" -#: kdiff3_part.cpp:173 kdiff3_part.cpp:254 +#: kdiff3_part.cpp:174 kdiff3_part.cpp:255 #, kde-format msgid "Could not find files for comparison." msgstr "Could not find files for comparison." @@ -1625,7 +1630,7 @@ msgstr "Configure KDiff3" #. i18n: ectx: ToolBar (mainToolBar) -#: kdiff3_part.rc:16 main.cpp:88 +#: kdiff3_part.rc:16 main.cpp:89 #, kde-format msgid "KDiff3" msgstr "KDiff3" @@ -1695,83 +1700,88 @@ msgid "Main Toolbar" msgstr "Main Toolbar" -#: main.cpp:68 main.cpp:72 +#: main.cpp:69 main.cpp:73 #, kde-format msgid "Ignored. (User defined.)" msgstr "Ignored. (User defined.)" -#: main.cpp:92 +#: main.cpp:93 #, kde-format msgid " (64 bit)" msgstr " (64 bit)" -#: main.cpp:94 +#: main.cpp:95 #, kde-format msgid " (32 bit)" msgstr " (32 bit)" -#: main.cpp:95 +#: main.cpp:96 #, kde-format msgid "Tool for Comparison and Merge of Files and Directories" msgstr "Tool for Comparison and Merge of Files and Directories" -#: main.cpp:96 +#: main.cpp:97 #, kde-format msgid "(c) 2002-2014 Joachim Eibl, (c) 2017 Michael Reeves KF5/Qt5 port" msgstr "(c) 2002-2014 Joachim Eibl, (c) 2017 Michael Reeves KF5/Qt5 port" -#: main.cpp:112 +#: main.cpp:113 #, kde-format msgid "Merge the input." msgstr "Merge the input." -#: main.cpp:113 +#: main.cpp:114 #, kde-format msgid "Explicit base file. For compatibility with certain tools." msgstr "Explicit base file. For compatibility with certain tools." -#: main.cpp:114 +#: main.cpp:115 #, kde-format msgid "Output file. Implies -m. E.g.: -o newfile.txt" msgstr "Output file. Implies -m. E.g.: -o newfile.txt" -#: main.cpp:115 +#: main.cpp:116 #, kde-format msgid "Output file, again. (For compatibility with certain tools.)" msgstr "Output file, again. (For compatibility with certain tools.)" -#: main.cpp:116 +#: main.cpp:118 #, kde-format msgid "No GUI if all conflicts are auto-solvable. (Needs -o file)" msgstr "No GUI if all conflicts are auto-solvable. (Needs -o file)" -#: main.cpp:117 +#: main.cpp:120 +#, kde-format +msgid "Ignored." +msgstr "Ignored." + +#: main.cpp:122 #, kde-format msgid "Do not solve conflicts automatically." msgstr "Do not solve conflicts automatically." -#: main.cpp:118 +#: main.cpp:123 #, kde-format msgid "Visible name replacement for input file 1 (base)." msgstr "Visible name replacement for input file 1 (base)." -#: main.cpp:119 +#: main.cpp:124 #, kde-format msgid "Visible name replacement for input file 2." msgstr "Visible name replacement for input file 2." -#: main.cpp:120 +#: main.cpp:125 #, kde-format msgid "Visible name replacement for input file 3." msgstr "Visible name replacement for input file 3." -#: main.cpp:121 +#: main.cpp:126 #, kde-format msgid "Alternative visible name replacement. Supply this once for every input." msgstr "" "Alternative visible name replacement. Supply this once for every input." -#: main.cpp:122 +#: main.cpp:127 #, kde-format msgid "" "Override a config setting. Use once for every setting. E.g.: --cs " @@ -1780,88 +1790,88 @@ "Override a config setting. Use once for every setting. E.g.: --cs " "\"AutoAdvance=1\"" -#: main.cpp:123 +#: main.cpp:128 #, kde-format msgid "Show list of config settings and current values." msgstr "Show list of config settings and current values." -#: main.cpp:124 +#: main.cpp:129 #, kde-format msgid "Use a different config file." msgstr "Use a different config file." -#: main.cpp:127 +#: main.cpp:132 #, kde-format msgid "file1 to open (base, if not specified via --base)" msgstr "file1 to open (base, if not specified via --base)" -#: main.cpp:128 +#: main.cpp:133 #, kde-format msgid "file2 to open" msgstr "file2 to open" -#: main.cpp:129 +#: main.cpp:134 #, kde-format msgid "file3 to open" msgstr "file3 to open" -#: main.cpp:153 +#: main.cpp:158 #, kde-format msgid "See kdiff3 --help for supported options." msgstr "See kdiff3 --help for supported options." -#: mergeresultwindow.cpp:158 +#: mergeresultwindow.cpp:171 #, kde-format msgid "Choose A Everywhere" msgstr "Choose A Everywhere" -#: mergeresultwindow.cpp:159 +#: mergeresultwindow.cpp:172 #, kde-format msgid "Choose B Everywhere" msgstr "Choose B Everywhere" -#: mergeresultwindow.cpp:160 +#: mergeresultwindow.cpp:173 #, kde-format msgid "Choose C Everywhere" msgstr "Choose C Everywhere" -#: mergeresultwindow.cpp:161 +#: mergeresultwindow.cpp:174 #, kde-format msgid "Choose A for All Unsolved Conflicts" msgstr "Choose A for All Unsolved Conflicts" -#: mergeresultwindow.cpp:162 +#: mergeresultwindow.cpp:175 #, kde-format msgid "Choose B for All Unsolved Conflicts" msgstr "Choose B for All Unsolved Conflicts" -#: mergeresultwindow.cpp:163 +#: mergeresultwindow.cpp:176 #, kde-format msgid "Choose C for All Unsolved Conflicts" msgstr "Choose C for All Unsolved Conflicts" -#: mergeresultwindow.cpp:164 +#: mergeresultwindow.cpp:177 #, kde-format msgid "Choose A for All Unsolved Whitespace Conflicts" msgstr "Choose A for All Unsolved Whitespace Conflicts" -#: mergeresultwindow.cpp:165 +#: mergeresultwindow.cpp:178 #, kde-format msgid "Choose B for All Unsolved Whitespace Conflicts" msgstr "Choose B for All Unsolved Whitespace Conflicts" -#: mergeresultwindow.cpp:166 +#: mergeresultwindow.cpp:179 #, kde-format msgid "Choose C for All Unsolved Whitespace Conflicts" msgstr "Choose C for All Unsolved Whitespace Conflicts" -#: mergeresultwindow.cpp:176 +#: mergeresultwindow.cpp:204 #, kde-format msgid "Number of remaining unsolved conflicts: %1 (of which %2 are whitespace)" msgstr "" "Number of remaining unsolved conflicts: %1 (of which %2 are whitespace)" -#: mergeresultwindow.cpp:370 +#: mergeresultwindow.cpp:398 #, kde-format msgid "" "The output has been modified.\n" @@ -1870,29 +1880,29 @@ "The output has been modified.\n" "If you continue your changes will be lost." -#: mergeresultwindow.cpp:936 pdiff.cpp:827 +#: mergeresultwindow.cpp:964 pdiff.cpp:817 #, kde-format msgid "All input files are binary equal." msgstr "All input files are binary equal." -#: mergeresultwindow.cpp:938 +#: mergeresultwindow.cpp:966 #, kde-format msgid "All input files contain the same text." msgstr "All input files contain the same text." -#: mergeresultwindow.cpp:942 mergeresultwindow.cpp:946 -#: mergeresultwindow.cpp:950 pdiff.cpp:833 pdiff.cpp:837 pdiff.cpp:841 +#: mergeresultwindow.cpp:970 mergeresultwindow.cpp:974 +#: mergeresultwindow.cpp:978 pdiff.cpp:823 pdiff.cpp:827 pdiff.cpp:831 #, kde-format msgid "Files %1 and %2 are binary equal.\n" msgstr "Files %1 and %2 are binary equal.\n" -#: mergeresultwindow.cpp:944 mergeresultwindow.cpp:948 -#: mergeresultwindow.cpp:952 +#: mergeresultwindow.cpp:972 mergeresultwindow.cpp:976 +#: mergeresultwindow.cpp:980 #, kde-format msgid "Files %1 and %2 have equal text.\n" msgstr "Files %1 and %2 have equal text.\n" -#: mergeresultwindow.cpp:958 +#: mergeresultwindow.cpp:986 #, kde-format msgid "" "Total number of conflicts: %1\n" @@ -1905,27 +1915,27 @@ "Nr of unsolved conflicts: %3\n" "%4" -#: mergeresultwindow.cpp:964 +#: mergeresultwindow.cpp:992 #, kde-format msgid "Conflicts" msgstr "Conflicts" -#: mergeresultwindow.cpp:1873 +#: mergeresultwindow.cpp:1901 #, kde-format msgid "" msgstr "" -#: mergeresultwindow.cpp:1881 +#: mergeresultwindow.cpp:1909 #, kde-format msgid "" msgstr "" -#: mergeresultwindow.cpp:1883 mergeresultwindow.cpp:2755 +#: mergeresultwindow.cpp:1911 mergeresultwindow.cpp:2783 #, kde-format msgid "" msgstr "" -#: mergeresultwindow.cpp:2967 +#: mergeresultwindow.cpp:2995 #, kde-format msgid "" "Not all conflicts are solved yet.\n" @@ -1934,12 +1944,12 @@ "Not all conflicts are solved yet.\n" "File not saved." -#: mergeresultwindow.cpp:2969 mergeresultwindow.cpp:2978 +#: mergeresultwindow.cpp:2997 mergeresultwindow.cpp:3006 #, kde-format msgid "Conflicts Left" msgstr "Conflicts Left" -#: mergeresultwindow.cpp:2976 +#: mergeresultwindow.cpp:3004 #, kde-format msgid "" "There is a line end style conflict. Please choose the line end style " @@ -1950,7 +1960,7 @@ "manually.\n" "File not saved." -#: mergeresultwindow.cpp:2990 +#: mergeresultwindow.cpp:3018 #, kde-format msgid "" "\n" @@ -1961,57 +1971,57 @@ "\n" "Creating backup failed. File not saved." -#: mergeresultwindow.cpp:2990 mergeresultwindow.cpp:3038 +#: mergeresultwindow.cpp:3018 mergeresultwindow.cpp:3066 #, kde-format msgid "File Save Error" msgstr "File Save Error" -#: mergeresultwindow.cpp:3038 +#: mergeresultwindow.cpp:3066 #, kde-format msgid "Error while writing." msgstr "Error while writing." -#: mergeresultwindow.cpp:3110 +#: mergeresultwindow.cpp:3138 #, kde-format msgid "Output:" msgstr "Output:" -#: mergeresultwindow.cpp:3123 mergeresultwindow.cpp:3315 +#: mergeresultwindow.cpp:3151 mergeresultwindow.cpp:3343 #, kde-format msgid "[Modified]" msgstr "[Modified]" -#: mergeresultwindow.cpp:3130 +#: mergeresultwindow.cpp:3158 #, kde-format msgid "Encoding for saving:" msgstr "Encoding for saving:" -#: mergeresultwindow.cpp:3230 +#: mergeresultwindow.cpp:3258 #, kde-format msgid "Conflict" msgstr "Conflict" -#: mergeresultwindow.cpp:3262 +#: mergeresultwindow.cpp:3290 #, kde-format msgid "Codec from A: %1" msgstr "Codec from A: %1" -#: mergeresultwindow.cpp:3264 +#: mergeresultwindow.cpp:3292 #, kde-format msgid "Codec from B: %1" msgstr "Codec from B: %1" -#: mergeresultwindow.cpp:3266 +#: mergeresultwindow.cpp:3294 #, kde-format msgid "Codec from C: %1" msgstr "Codec from C: %1" -#: optiondialog.cpp:119 +#: optiondialog.cpp:121 #, kde-format msgid "Change Font" msgstr "Change Font" -#: optiondialog.cpp:135 optiondialog.cpp:145 +#: optiondialog.cpp:137 optiondialog.cpp:147 #, kde-format msgid "" "Font: %1, %2, %3\n" @@ -2022,123 +2032,123 @@ "\n" "Example:" -#: optiondialog.cpp:388 +#: optiondialog.cpp:390 #, kde-format msgid "Unicode" msgstr "Unicode" -#: optiondialog.cpp:389 +#: optiondialog.cpp:391 #, kde-format msgid "Latin1" msgstr "Latin1" -#: optiondialog.cpp:408 +#: optiondialog.cpp:410 #, kde-format msgid "Change this if non-ASCII characters are not displayed correctly." msgstr "Change this if non-ASCII characters are not displayed correctly." -#: optiondialog.cpp:491 +#: optiondialog.cpp:495 #, kde-format msgid "Configure" msgstr "Configure" -#: optiondialog.cpp:568 +#: optiondialog.cpp:573 #, kde-format msgid "Font" msgstr "Font" -#: optiondialog.cpp:570 +#: optiondialog.cpp:575 #, kde-format msgid "Editor & Diff Output Font" msgstr "Editor & Diff Output Font" -#: optiondialog.cpp:589 +#: optiondialog.cpp:594 #, kde-format msgid "Application font" msgstr "Application font" -#: optiondialog.cpp:594 +#: optiondialog.cpp:599 #, kde-format msgid "File view font" msgstr "File view font" -#: optiondialog.cpp:613 +#: optiondialog.cpp:618 #, kde-format msgctxt "Title for color settings page" msgid "Color" msgstr "Colour" -#: optiondialog.cpp:614 +#: optiondialog.cpp:619 #, kde-format msgid "Colors Settings" msgstr "Colour Settings" -#: optiondialog.cpp:631 +#: optiondialog.cpp:644 #, kde-format msgid "Editor and Diff Views:" msgstr "Editor and Diff Views:" -#: optiondialog.cpp:639 +#: optiondialog.cpp:652 #, kde-format msgid "Foreground color:" msgstr "Foreground colour:" -#: optiondialog.cpp:647 +#: optiondialog.cpp:660 #, kde-format msgid "Background color:" msgstr "Background colour:" -#: optiondialog.cpp:657 +#: optiondialog.cpp:670 #, kde-format msgid "Diff background color:" msgstr "Diff background colour:" -#: optiondialog.cpp:666 +#: optiondialog.cpp:679 #, kde-format msgid "Color A:" msgstr "Colour A:" -#: optiondialog.cpp:675 +#: optiondialog.cpp:688 #, kde-format msgid "Color B:" msgstr "Colour B:" -#: optiondialog.cpp:684 +#: optiondialog.cpp:697 #, kde-format msgid "Color C:" msgstr "Colour C:" -#: optiondialog.cpp:692 +#: optiondialog.cpp:705 #, kde-format msgid "Conflict color:" msgstr "Conflict colour:" -#: optiondialog.cpp:701 +#: optiondialog.cpp:714 #, kde-format msgid "Current range background color:" msgstr "Current range background colour:" -#: optiondialog.cpp:710 +#: optiondialog.cpp:723 #, kde-format msgid "Current range diff background color:" msgstr "Current range diff background colour:" -#: optiondialog.cpp:718 +#: optiondialog.cpp:731 #, kde-format msgid "Color for manually aligned difference ranges:" msgstr "Colour for manually aligned difference ranges:" -#: optiondialog.cpp:725 +#: optiondialog.cpp:738 #, kde-format msgid "Directory Comparison View:" msgstr "Directory Comparison View:" -#: optiondialog.cpp:731 +#: optiondialog.cpp:744 #, kde-format msgid "Newest file color:" msgstr "Newest file colour:" -#: optiondialog.cpp:736 +#: optiondialog.cpp:749 #, kde-format msgid "" "Changing this color will only be effective when starting the next directory " @@ -2147,37 +2157,37 @@ "Changing this colour will only be effective when starting the next directory " "comparison." -#: optiondialog.cpp:741 +#: optiondialog.cpp:754 #, kde-format msgid "Oldest file color:" msgstr "Oldest file colour:" -#: optiondialog.cpp:750 +#: optiondialog.cpp:763 #, kde-format msgid "Middle age file color:" msgstr "Middle age file colour:" -#: optiondialog.cpp:759 +#: optiondialog.cpp:772 #, kde-format msgid "Color for missing files:" msgstr "Colour for missing files:" -#: optiondialog.cpp:773 +#: optiondialog.cpp:786 #, kde-format msgid "Editor" msgstr "Editor" -#: optiondialog.cpp:774 +#: optiondialog.cpp:787 #, kde-format msgid "Editor Behavior" msgstr "Editor Behaviour" -#: optiondialog.cpp:787 +#: optiondialog.cpp:809 #, kde-format msgid "Tab inserts spaces" msgstr "Tab inserts spaces" -#: optiondialog.cpp:791 +#: optiondialog.cpp:813 #, kde-format msgid "" "On: Pressing tab generates the appropriate number of spaces.\n" @@ -2186,27 +2196,27 @@ "On: Pressing tab generates the appropriate number of spaces.\n" "Off: A tab character will be inserted." -#: optiondialog.cpp:796 +#: optiondialog.cpp:818 #, kde-format msgid "Tab size:" msgstr "Tab size:" -#: optiondialog.cpp:803 +#: optiondialog.cpp:825 #, kde-format msgid "Auto indentation" msgstr "Auto indentation" -#: optiondialog.cpp:807 +#: optiondialog.cpp:829 #, kde-format msgid "On: The indentation of the previous line is used for a new line.\n" msgstr "On: The indentation of the previous line is used for a new line.\n" -#: optiondialog.cpp:810 +#: optiondialog.cpp:832 #, kde-format msgid "Auto copy selection" msgstr "Auto copy selection" -#: optiondialog.cpp:814 +#: optiondialog.cpp:836 #, kde-format msgid "" "On: Any selection is immediately written to the clipboard.\n" @@ -2215,7 +2225,7 @@ "On: Any selection is immediately written to the clipboard.\n" "Off: You must explicitly copy e.g. via Ctrl-C." -#: optiondialog.cpp:829 +#: optiondialog.cpp:851 #, kde-format msgid "" "Sets the line endings for when an edited file is saved.\n" @@ -2224,12 +2234,12 @@ "Sets the line endings for when an edited file is saved.\n" "DOS/Windows: CR+LF; UNIX: LF; with CR=0D, LF=0A" -#: optiondialog.cpp:839 +#: optiondialog.cpp:861 #, kde-format msgid "Diff" msgstr "Diff" -#: optiondialog.cpp:840 +#: optiondialog.cpp:862 #, kde-format msgid "Diff Settings" msgstr "Diff Settings" @@ -2243,12 +2253,12 @@ #. ); #. ++line; #. -#: optiondialog.cpp:865 +#: optiondialog.cpp:896 #, kde-format msgid "Ignore numbers (treat as white space)" msgstr "Ignore numbers (treat as white space)" -#: optiondialog.cpp:869 +#: optiondialog.cpp:900 #, kde-format msgid "" "Ignore number characters during line matching phase. (Similar to Ignore " @@ -2259,42 +2269,42 @@ "white space.)\n" "Might help to compare files with numeric data." -#: optiondialog.cpp:873 +#: optiondialog.cpp:904 #, kde-format msgid "Ignore C/C++ comments (treat as white space)" msgstr "Ignore C/C++ comments (treat as white space)" -#: optiondialog.cpp:876 +#: optiondialog.cpp:907 #, kde-format msgid "Treat C/C++ comments like white space." msgstr "Treat C/C++ comments like white space." -#: optiondialog.cpp:879 +#: optiondialog.cpp:910 #, kde-format msgid "Ignore case (treat as white space)" msgstr "Ignore case (treat as white space)" -#: optiondialog.cpp:883 +#: optiondialog.cpp:914 #, kde-format msgid "Treat case differences like white space changes. ('a'<=>'A')" msgstr "Treat case differences like white space changes. ('a'<=>'A')" -#: optiondialog.cpp:886 +#: optiondialog.cpp:917 #, kde-format msgid "Preprocessor command:" msgstr "Preprocessor command:" -#: optiondialog.cpp:891 +#: optiondialog.cpp:922 #, kde-format msgid "User defined pre-processing. (See the docs for details.)" msgstr "User defined pre-processing. (See the docs for details.)" -#: optiondialog.cpp:894 +#: optiondialog.cpp:925 #, kde-format msgid "Line-matching preprocessor command:" msgstr "Line-matching preprocessor command:" -#: optiondialog.cpp:899 +#: optiondialog.cpp:930 #, kde-format msgid "" "This pre-processor is only used during line matching.\n" @@ -2303,12 +2313,12 @@ "This pre-processor is only used during line matching.\n" "(See the docs for details.)" -#: optiondialog.cpp:902 +#: optiondialog.cpp:933 #, kde-format msgid "Try hard (slower)" msgstr "Try hard (slower)" -#: optiondialog.cpp:906 +#: optiondialog.cpp:937 #, kde-format msgid "" "Enables the --minimal option for the external diff.\n" @@ -2317,12 +2327,12 @@ "Enables the --minimal option for the external diff.\n" "The analysis of big files will be much slower." -#: optiondialog.cpp:910 +#: optiondialog.cpp:941 #, kde-format msgid "Align B and C for 3 input files" msgstr "Align B and C for 3 input files" -#: optiondialog.cpp:914 +#: optiondialog.cpp:945 #, kde-format msgid "" "Try to align B and C when comparing or merging three input files.\n" @@ -2333,17 +2343,23 @@ "Not recommended for merging because merge might get more complicated.\n" "(Default is off.)" -#: optiondialog.cpp:926 +#: optiondialog.cpp:956 +#, kde-format +msgctxt "Settings page" +msgid "Merge" +msgstr "Merge" + +#: optiondialog.cpp:957 #, kde-format msgid "Merge Settings" msgstr "Merge Settings" -#: optiondialog.cpp:940 +#: optiondialog.cpp:980 #, kde-format msgid "Auto advance delay (ms):" msgstr "Auto advance delay (ms):" -#: optiondialog.cpp:946 +#: optiondialog.cpp:986 #, kde-format msgid "" "When in Auto-Advance mode the result of the current selection is shown \n" @@ -2352,27 +2368,27 @@ "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" -#: optiondialog.cpp:950 +#: optiondialog.cpp:990 #, kde-format msgid "Show info dialogs" msgstr "Show info dialogues" -#: optiondialog.cpp:953 +#: optiondialog.cpp:993 #, kde-format msgid "Show a dialog with information about the number of conflicts." msgstr "Show a dialogue with information about the number of conflicts." -#: optiondialog.cpp:956 +#: optiondialog.cpp:996 #, kde-format msgid "White space 2-file merge default:" msgstr "White space 2-file merge default:" -#: optiondialog.cpp:961 optiondialog.cpp:974 +#: optiondialog.cpp:1001 optiondialog.cpp:1014 #, kde-format msgid "Manual Choice" msgstr "Manual Choice" -#: optiondialog.cpp:965 optiondialog.cpp:979 +#: optiondialog.cpp:1005 optiondialog.cpp:1019 #, kde-format msgid "" "Allow the merge algorithm to automatically select an input for white-space-" @@ -2381,22 +2397,22 @@ "Allow the merge algorithm to automatically select an input for white-space-" "only changes." -#: optiondialog.cpp:969 +#: optiondialog.cpp:1009 #, kde-format msgid "White space 3-file merge default:" msgstr "White space 3-file merge default:" -#: optiondialog.cpp:983 +#: optiondialog.cpp:1023 #, kde-format msgid "Automatic Merge Regular Expression" msgstr "Automatic Merge Regular Expression" -#: optiondialog.cpp:991 smalldialogs.cpp:449 +#: optiondialog.cpp:1031 smalldialogs.cpp:459 #, kde-format msgid "Auto merge regular expression:" msgstr "Auto merge regular expression:" -#: optiondialog.cpp:996 +#: optiondialog.cpp:1036 #, kde-format msgid "" "Regular expression for lines where KDiff3 should automatically choose one " @@ -2409,12 +2425,12 @@ "When a line with a conflict matches the regular expression then\n" "- if available - C, otherwise B will be chosen." -#: optiondialog.cpp:1002 +#: optiondialog.cpp:1042 #, kde-format msgid "Run regular expression auto merge on merge start" msgstr "Run regular expression auto merge on merge start" -#: optiondialog.cpp:1005 +#: optiondialog.cpp:1045 #, kde-format msgid "" "Run the merge for auto merge regular expressions\n" @@ -2423,17 +2439,17 @@ "Run the merge for auto merge regular expressions\n" "immediately when a merge starts.\n" -#: optiondialog.cpp:1010 +#: optiondialog.cpp:1050 #, kde-format msgid "Version Control History Merging" msgstr "Version Control History Merging" -#: optiondialog.cpp:1018 smalldialogs.cpp:476 +#: optiondialog.cpp:1058 smalldialogs.cpp:486 #, kde-format msgid "History start regular expression:" msgstr "History start regular expression:" -#: optiondialog.cpp:1023 +#: optiondialog.cpp:1063 #, kde-format msgid "" "Regular expression for the start of the version control history entry.\n" @@ -2444,12 +2460,12 @@ "Usually this line contains the \"$Log$\" keyword.\n" "Default value: \".*\\$Log.*\\$.*\"" -#: optiondialog.cpp:1029 smalldialogs.cpp:504 +#: optiondialog.cpp:1069 smalldialogs.cpp:514 #, kde-format msgid "History entry start regular expression:" msgstr "History entry start regular expression:" -#: optiondialog.cpp:1042 +#: optiondialog.cpp:1082 #, kde-format msgid "" "A version control history entry consists of several lines.\n" @@ -2468,22 +2484,22 @@ "entries.\n" "See the documentation for details." -#: optiondialog.cpp:1050 +#: optiondialog.cpp:1090 #, kde-format msgid "History merge sorting" msgstr "History merge sorting" -#: optiondialog.cpp:1053 +#: optiondialog.cpp:1093 #, kde-format msgid "Sort version control history by a key." msgstr "Sort version control history by a key." -#: optiondialog.cpp:1063 +#: optiondialog.cpp:1103 #, kde-format msgid "History entry start sort key order:" msgstr "History entry start sort key order:" -#: optiondialog.cpp:1068 +#: optiondialog.cpp:1108 #, kde-format msgid "" "Each pair of parentheses used in the regular expression for the history " @@ -2502,37 +2518,37 @@ "If left empty, then no sorting will be done.\n" "See the documentation for details." -#: optiondialog.cpp:1079 +#: optiondialog.cpp:1119 #, kde-format msgid "Merge version control history on merge start" msgstr "Merge version control history on merge start" -#: optiondialog.cpp:1082 +#: optiondialog.cpp:1122 #, kde-format msgid "Run version control history automerge on merge start." msgstr "Run version control history automerge on merge start." -#: optiondialog.cpp:1086 +#: optiondialog.cpp:1126 #, kde-format msgid "Max number of history entries:" msgstr "Max number of history entries:" -#: optiondialog.cpp:1090 +#: optiondialog.cpp:1130 #, kde-format msgid "Cut off after specified number. Use -1 for infinite number of entries." msgstr "Cut off after specified number. Use -1 for infinite number of entries." -#: optiondialog.cpp:1094 +#: optiondialog.cpp:1134 #, kde-format msgid "Test your regular expressions" msgstr "Test your regular expressions" -#: optiondialog.cpp:1099 +#: optiondialog.cpp:1139 #, kde-format msgid "Irrelevant merge command:" msgstr "Irrelevant merge command:" -#: optiondialog.cpp:1104 +#: optiondialog.cpp:1144 #, kde-format msgid "" "If specified this script is run after automerge\n" @@ -2543,12 +2559,12 @@ "when no other relevant changes were detected.\n" "Called with the parameters: filename1 filename2 filename3" -#: optiondialog.cpp:1109 +#: optiondialog.cpp:1149 #, kde-format msgid "Auto save and quit on merge without conflicts" msgstr "Auto save and quit on merge without conflicts" -#: optiondialog.cpp:1113 +#: optiondialog.cpp:1153 #, kde-format msgid "" "If KDiff3 was started for a file-merge from the command line and all\n" @@ -2561,27 +2577,27 @@ "quit.\n" "(Similar to command line option \"--auto\".)" -#: optiondialog.cpp:1124 optiondialog.cpp:1125 +#: optiondialog.cpp:1164 optiondialog.cpp:1165 #, kde-format msgid "Directory" msgstr "Directory" -#: optiondialog.cpp:1137 +#: optiondialog.cpp:1185 #, kde-format msgid "Recursive directories" msgstr "Recursive directories" -#: optiondialog.cpp:1140 +#: optiondialog.cpp:1188 #, kde-format msgid "Whether to analyze subdirectories or not." msgstr "Whether to analyse subdirectories or not." -#: optiondialog.cpp:1142 +#: optiondialog.cpp:1190 #, kde-format msgid "File pattern(s):" msgstr "File pattern(s):" -#: optiondialog.cpp:1148 +#: optiondialog.cpp:1196 #, kde-format msgid "" "Pattern(s) of files to be analyzed. \n" @@ -2592,12 +2608,12 @@ "Wildcards: '*' and '?'\n" "Several Patterns can be specified by using the separator: ';'" -#: optiondialog.cpp:1153 +#: optiondialog.cpp:1201 #, kde-format msgid "File-anti-pattern(s):" msgstr "File-anti-pattern(s):" -#: optiondialog.cpp:1159 +#: optiondialog.cpp:1207 #, kde-format msgid "" "Pattern(s) of files to be excluded from analysis. \n" @@ -2608,12 +2624,12 @@ "Wildcards: '*' and '?'\n" "Several Patterns can be specified by using the separator: ';'" -#: optiondialog.cpp:1164 +#: optiondialog.cpp:1212 #, kde-format msgid "Dir-anti-pattern(s):" msgstr "Dir-anti-pattern(s):" -#: optiondialog.cpp:1170 +#: optiondialog.cpp:1218 #, kde-format msgid "" "Pattern(s) of directories to be excluded from analysis. \n" @@ -2624,12 +2640,12 @@ "Wildcards: '*' and '?'\n" "Several Patterns can be specified by using the separator: ';'" -#: optiondialog.cpp:1175 +#: optiondialog.cpp:1223 #, kde-format msgid "Use .cvsignore" msgstr "Use .cvsignore" -#: optiondialog.cpp:1179 +#: optiondialog.cpp:1227 #, kde-format msgid "" "Extends the antipattern to anything that would be ignored by CVS.\n" @@ -2638,22 +2654,22 @@ "Extends the antipattern to anything that would be ignored by CVS.\n" "Via local \".cvsignore\" files this can be directory specific." -#: optiondialog.cpp:1183 +#: optiondialog.cpp:1231 #, kde-format msgid "Find hidden files and directories" msgstr "Find hidden files and directories" -#: optiondialog.cpp:1186 +#: optiondialog.cpp:1234 #, kde-format msgid "Finds hidden files and directories." msgstr "Finds hidden files and directories." -#: optiondialog.cpp:1189 +#: optiondialog.cpp:1237 #, kde-format msgid "Follow file links" msgstr "Follow file links" -#: optiondialog.cpp:1193 +#: optiondialog.cpp:1241 #, kde-format msgid "" "On: Compare the file the link points to.\n" @@ -2662,12 +2678,12 @@ "On: Compare the file the link points to.\n" "Off: Compare the links." -#: optiondialog.cpp:1197 +#: optiondialog.cpp:1245 #, kde-format msgid "Follow directory links" msgstr "Follow directory links" -#: optiondialog.cpp:1201 +#: optiondialog.cpp:1249 #, kde-format msgid "" "On: Compare the directory the link points to.\n" @@ -2676,12 +2692,12 @@ "On: Compare the directory the link points to.\n" "Off: Compare the links." -#: optiondialog.cpp:1210 +#: optiondialog.cpp:1258 #, kde-format msgid "Case sensitive filename comparison" msgstr "Case sensitive filename comparison" -#: optiondialog.cpp:1214 +#: optiondialog.cpp:1262 #, kde-format msgid "" "The directory comparison will compare files or directories when their names " @@ -2694,12 +2710,12 @@ "Set this option if the case of the names must match. (Default for Windows is " "off, otherwise on.)" -#: optiondialog.cpp:1218 +#: optiondialog.cpp:1266 #, kde-format msgid "Unfold all subdirectories on load" msgstr "Unfold all subdirectories on load" -#: optiondialog.cpp:1222 +#: optiondialog.cpp:1270 #, kde-format msgid "" "On: Unfold all subdirectories when starting a directory diff.\n" @@ -2708,12 +2724,12 @@ "On: Unfold all subdirectories when starting a directory diff.\n" "Off: Leave subdirectories folded." -#: optiondialog.cpp:1226 +#: optiondialog.cpp:1274 #, kde-format msgid "Skip directory status report" msgstr "Skip directory status report" -#: optiondialog.cpp:1230 +#: optiondialog.cpp:1278 #, kde-format msgid "" "On: Do not show the Directory Comparison Status.\n" @@ -2722,27 +2738,27 @@ "On: Do not show the Directory Comparison Status.\n" "Off: Show the status dialogue on start." -#: optiondialog.cpp:1234 +#: optiondialog.cpp:1282 #, kde-format msgid "File Comparison Mode" msgstr "File Comparison Mode" -#: optiondialog.cpp:1239 +#: optiondialog.cpp:1287 #, kde-format msgid "Binary comparison" msgstr "Binary comparison" -#: optiondialog.cpp:1241 +#: optiondialog.cpp:1289 #, kde-format msgid "Binary comparison of each file. (Default)" msgstr "Binary comparison of each file. (Default)" -#: optiondialog.cpp:1244 +#: optiondialog.cpp:1292 #, kde-format msgid "Full analysis" msgstr "Full analysis" -#: optiondialog.cpp:1246 +#: optiondialog.cpp:1294 #, kde-format msgid "" "Do a full analysis and show statistics information in extra columns.\n" @@ -2751,12 +2767,12 @@ "Do a full analysis and show statistics information in extra columns.\n" "(Slower than a binary comparison, much slower for binary files.)" -#: optiondialog.cpp:1250 +#: optiondialog.cpp:1298 #, kde-format msgid "Trust the size and modification date (unsafe)" msgstr "Trust the size and modification date (unsafe)" -#: optiondialog.cpp:1252 +#: optiondialog.cpp:1300 #, kde-format msgid "" "Assume that files are equal if the modification date and file length are " @@ -2771,7 +2787,7 @@ "different.\n" "Useful for big directories or slow networks." -#: optiondialog.cpp:1257 +#: optiondialog.cpp:1305 #, kde-format msgid "" "Trust the size and date, but use binary comparison if date does not match " @@ -2780,7 +2796,7 @@ "Trust the size and date, but use binary comparison if date does not match " "(unsafe)" -#: optiondialog.cpp:1259 +#: optiondialog.cpp:1307 #, kde-format msgid "" "Assume that files are equal if the modification date and file length are " @@ -2793,12 +2809,12 @@ "If the dates are not equal but the sizes are, use binary comparison.\n" "Useful for big directories or slow networks." -#: optiondialog.cpp:1264 +#: optiondialog.cpp:1312 #, kde-format msgid "Trust the size (unsafe)" msgstr "Trust the size (unsafe)" -#: optiondialog.cpp:1266 +#: optiondialog.cpp:1314 #, kde-format msgid "" "Assume that files are equal if their file lengths are equal.\n" @@ -2809,12 +2825,12 @@ "Useful for big directories or slow networks when the date is modified during " "download." -#: optiondialog.cpp:1273 +#: optiondialog.cpp:1321 #, kde-format msgid "Synchronize directories" msgstr "Synchronise directories" -#: optiondialog.cpp:1277 +#: optiondialog.cpp:1325 #, kde-format msgid "" "Offers to store files in both directories so that\n" @@ -2825,12 +2841,12 @@ "both directories are the same afterwards.\n" "Works only when comparing two directories without specifying a destination." -#: optiondialog.cpp:1283 +#: optiondialog.cpp:1331 #, kde-format msgid "White space differences considered equal" msgstr "White space differences considered equal" -#: optiondialog.cpp:1287 +#: optiondialog.cpp:1335 #, kde-format msgid "" "If files differ only by white space consider them equal.\n" @@ -2839,12 +2855,12 @@ "If files differ only by white space consider them equal.\n" "This is only active when full analysis is chosen." -#: optiondialog.cpp:1293 +#: optiondialog.cpp:1341 #, kde-format msgid "Copy newer instead of merging (unsafe)" msgstr "Copy newer instead of merging (unsafe)" -#: optiondialog.cpp:1297 +#: optiondialog.cpp:1345 #, kde-format msgid "" "Do not look inside, just take the newer file.\n" @@ -2855,12 +2871,12 @@ "(Use this only if you know what you are doing!)\n" "Only effective when comparing two directories." -#: optiondialog.cpp:1302 +#: optiondialog.cpp:1350 #, kde-format msgid "Backup files (.orig)" msgstr "Backup files (.orig)" -#: optiondialog.cpp:1306 +#: optiondialog.cpp:1354 #, kde-format msgid "" "If a file would be saved over an old file, then the old file\n" @@ -2869,17 +2885,17 @@ "If 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." -#: optiondialog.cpp:1382 optiondialog.cpp:1383 +#: optiondialog.cpp:1430 optiondialog.cpp:1431 #, kde-format msgid "Regional Settings" msgstr "Regional Settings" -#: optiondialog.cpp:1397 +#: optiondialog.cpp:1454 #, kde-format msgid "Use the same encoding for everything:" msgstr "Use the same encoding for everything:" -#: optiondialog.cpp:1401 +#: optiondialog.cpp:1458 #, kde-format msgid "" "Enable this allows to change all encodings by changing the first only.\n" @@ -2888,17 +2904,17 @@ "Enable this allows to change all encodings by changing the first only.\n" "Disable this if different individual settings are needed." -#: optiondialog.cpp:1405 +#: optiondialog.cpp:1462 #, kde-format msgid "Note: Local Encoding is \"%1\"" msgstr "Note: Local Encoding is \"%1\"" -#: optiondialog.cpp:1409 +#: optiondialog.cpp:1466 #, kde-format msgid "File Encoding for A:" msgstr "File Encoding for A:" -#: optiondialog.cpp:1416 +#: optiondialog.cpp:1473 #, kde-format msgid "" "If enabled then Unicode (UTF-16 or UTF-8) encoding will be detected.\n" @@ -2911,32 +2927,32 @@ "fallback.\n" "(Unicode detection depends on the first bytes of a file.)" -#: optiondialog.cpp:1419 optiondialog.cpp:1430 optiondialog.cpp:1441 +#: optiondialog.cpp:1476 optiondialog.cpp:1487 optiondialog.cpp:1498 #, kde-format msgid "Auto Detect Unicode" msgstr "Auto Detect Unicode" -#: optiondialog.cpp:1425 +#: optiondialog.cpp:1482 #, kde-format msgid "File Encoding for B:" msgstr "File Encoding for B:" -#: optiondialog.cpp:1436 +#: optiondialog.cpp:1493 #, kde-format msgid "File Encoding for C:" msgstr "File Encoding for C:" -#: optiondialog.cpp:1447 +#: optiondialog.cpp:1504 #, kde-format msgid "File Encoding for Merge Output and Saving:" msgstr "File Encoding for Merge Output and Saving:" -#: optiondialog.cpp:1452 +#: optiondialog.cpp:1509 #, kde-format msgid "Auto Select" msgstr "Auto Select" -#: optiondialog.cpp:1456 +#: optiondialog.cpp:1513 #, kde-format msgid "" "If enabled then the encoding from the input files is used.\n" @@ -2947,17 +2963,17 @@ "In ambiguous cases a dialogue will ask the user to choose the encoding for " "saving." -#: optiondialog.cpp:1459 +#: optiondialog.cpp:1516 #, kde-format msgid "File Encoding for Preprocessor Files:" msgstr "File Encoding for Preprocessor Files:" -#: optiondialog.cpp:1471 +#: optiondialog.cpp:1528 #, kde-format msgid "Right To Left Language" msgstr "Right To Left Language" -#: optiondialog.cpp:1475 +#: optiondialog.cpp:1532 #, kde-format msgid "" "Some languages are read from right to left.\n" @@ -2966,22 +2982,22 @@ "Some languages are read from right to left.\n" "This setting will change the viewer and editor accordingly." -#: optiondialog.cpp:1485 +#: optiondialog.cpp:1542 #, kde-format msgid "Integration" msgstr "Integration" -#: optiondialog.cpp:1486 +#: optiondialog.cpp:1543 #, kde-format msgid "Integration Settings" msgstr "Integration Settings" -#: optiondialog.cpp:1499 +#: optiondialog.cpp:1564 #, kde-format msgid "Command line options to ignore:" msgstr "Command line options to ignore:" -#: optiondialog.cpp:1505 +#: optiondialog.cpp:1570 #, kde-format msgid "" "List of command line options that should be ignored when KDiff3 is used by " @@ -2994,12 +3010,12 @@ "Several values can be specified if separated via ';'\n" "This will suppress the \"Unknown option\" error." -#: optiondialog.cpp:1510 +#: optiondialog.cpp:1575 #, kde-format msgid "Quit also via Escape key" msgstr "Quit also via Escape key" -#: optiondialog.cpp:1514 +#: optiondialog.cpp:1579 #, kde-format msgid "" "Fast method to exit.\n" @@ -3008,7 +3024,7 @@ "Fast method to exit.\n" "For those who are used to using the Escape key." -#: optiondialog.cpp:1598 +#: optiondialog.cpp:1653 #, kde-format msgid "This resets all options. Not only those of the current topic." msgstr "This resets all options. Not only those of the current topic." @@ -3063,77 +3079,67 @@ msgid "Disable Unsafe Options" msgstr "Disable Unsafe Options" -#: pdiff.cpp:158 +#: pdiff.cpp:160 #, kde-format msgid "Loading A" msgstr "Loading A" -#: pdiff.cpp:167 +#: pdiff.cpp:162 #, kde-format -msgid "Errors occurred during pre-processing of file A." -msgstr "Errors occurred during pre-processing of file A." +msgid "Loading A: %1" +msgstr "Loading A: %1" -#: pdiff.cpp:172 +#: pdiff.cpp:170 #, kde-format msgid "Loading B" msgstr "Loading B" -#: pdiff.cpp:179 -#, kde-format -msgid "Errors occurred during pre-processing of file B." -msgstr "Errors occurred during pre-processing of file B." - -#: pdiff.cpp:202 pdiff.cpp:241 +#: pdiff.cpp:201 pdiff.cpp:237 #, kde-format msgid "Diff: A <-> B" msgstr "Diff: A <-> B" -#: pdiff.cpp:208 pdiff.cpp:279 pdiff.cpp:293 +#: pdiff.cpp:207 pdiff.cpp:275 pdiff.cpp:289 #, kde-format msgid "Linediff: A <-> B" msgstr "Linediff: A <-> B" -#: pdiff.cpp:225 +#: pdiff.cpp:224 #, kde-format msgid "Loading C" msgstr "Loading C" -#: pdiff.cpp:232 -#, kde-format -msgid "Errors occurred during pre-processing of file C." -msgstr "Errors occurred during pre-processing of file C." - -#: pdiff.cpp:250 +#: pdiff.cpp:246 #, kde-format msgid "Diff: A <-> C" msgstr "Diff: A <-> C" -#: pdiff.cpp:261 +#: pdiff.cpp:257 #, kde-format msgid "Diff: B <-> C" msgstr "Diff: B <-> C" -#: pdiff.cpp:283 pdiff.cpp:297 +#: pdiff.cpp:279 pdiff.cpp:293 #, kde-format msgid "Linediff: B <-> C" msgstr "Linediff: B <-> C" -#: pdiff.cpp:287 pdiff.cpp:301 +#: pdiff.cpp:283 pdiff.cpp:297 #, kde-format msgid "Linediff: A <-> C" msgstr "Linediff: A <-> C" -#: pdiff.cpp:829 +#: pdiff.cpp:819 #, kde-format msgid "All input files contain the same text, but are not binary equal." msgstr "All input files contain the same text, but are not binary equal." -#: pdiff.cpp:835 pdiff.cpp:839 pdiff.cpp:843 +#: pdiff.cpp:825 pdiff.cpp:829 pdiff.cpp:833 #, kde-format msgid "Files %1 and %2 have equal text, but are not binary equal. \n" msgstr "Files %1 and %2 have equal text, but are not binary equal. \n" -#: pdiff.cpp:853 +#: pdiff.cpp:843 #, kde-format msgid "" "Some input files do not seem to be pure text files.\n" @@ -3144,17 +3150,17 @@ "Note that the KDiff3 merge was not meant for binary data.\n" "Continue at your own risk." -#: pdiff.cpp:863 +#: pdiff.cpp:853 #, kde-format msgid ", B" msgstr ", B" -#: pdiff.cpp:865 +#: pdiff.cpp:855 #, kde-format msgid ", C" msgstr ", C" -#: pdiff.cpp:867 +#: pdiff.cpp:857 #, kde-format msgid "" "Some input characters could not be converted to valid unicode.\n" @@ -3167,77 +3173,72 @@ "Do not save the result if unsure. Continue at your own risk.\n" "Affected input files are in %1." -#: pdiff.cpp:1034 +#: pdiff.cpp:1032 #, kde-format msgid "Abort" msgstr "Abort" -#: pdiff.cpp:1040 pdiff.cpp:1130 +#: pdiff.cpp:1038 pdiff.cpp:1129 #, kde-format msgid "Opening files..." msgstr "Opening files..." -#: pdiff.cpp:1107 -#, kde-format -msgid "File open error" -msgstr "File open error" - -#: pdiff.cpp:1202 +#: pdiff.cpp:1212 #, kde-format msgid "Cutting selection..." msgstr "Cutting selection..." -#: pdiff.cpp:1223 +#: pdiff.cpp:1233 #, kde-format msgid "Copying selection to clipboard..." msgstr "Copying selection to clipboard..." -#: pdiff.cpp:1239 +#: pdiff.cpp:1249 #, kde-format msgid "Inserting clipboard contents..." msgstr "Inserting clipboard contents..." -#: pdiff.cpp:1695 +#: pdiff.cpp:1705 #, kde-format msgid "Word wrap (Cancel disables word wrap)" msgstr "Word wrap (Cancel disables word wrap)" -#: pdiff.cpp:1696 +#: pdiff.cpp:1706 #, kde-format msgid "Calculating max width for horizontal scrollbar" msgstr "Calculating max width for horizontal scrollbar" -#: pdiff.cpp:1911 +#: pdiff.cpp:1921 #, kde-format msgid "Save && Continue" msgstr "Save && Continue" -#: pdiff.cpp:1912 +#: pdiff.cpp:1922 #, kde-format msgid "Continue Without Saving" msgstr "Continue Without Saving" -#: pdiff.cpp:2124 +#: pdiff.cpp:2134 #, kde-format msgid "Search complete." msgstr "Search complete." -#: pdiff.cpp:2124 +#: pdiff.cpp:2134 #, kde-format msgid "Search Complete" msgstr "Search Complete" -#: pdiff.cpp:2375 +#: pdiff.cpp:2385 #, kde-format msgid "Nothing is selected in either diff input window." msgstr "Nothing is selected in either diff input window." -#: pdiff.cpp:2375 +#: pdiff.cpp:2385 #, kde-format msgid "Error while adding manual diff range" msgstr "Error while adding manual diff range" -#: progress.cpp:59 progress.cpp:71 +#: progress.cpp:61 progress.cpp:73 #, kde-format msgid "&Cancel" msgstr "&Cancel" @@ -3247,124 +3248,124 @@ msgid "A (Base):" msgstr "A (Base):" -#: smalldialogs.cpp:68 smalldialogs.cpp:85 smalldialogs.cpp:102 -#: smalldialogs.cpp:144 +#: smalldialogs.cpp:71 smalldialogs.cpp:90 smalldialogs.cpp:109 +#: smalldialogs.cpp:154 #, kde-format msgid "File..." msgstr "File..." -#: smalldialogs.cpp:70 smalldialogs.cpp:87 smalldialogs.cpp:104 -#: smalldialogs.cpp:146 +#: smalldialogs.cpp:73 smalldialogs.cpp:92 smalldialogs.cpp:111 +#: smalldialogs.cpp:156 #, kde-format msgid "Dir..." msgstr "Dir..." -#: smalldialogs.cpp:96 +#: smalldialogs.cpp:103 #, kde-format msgid "C (Optional):" msgstr "C (Optional):" -#: smalldialogs.cpp:119 +#: smalldialogs.cpp:126 #, kde-format msgid "Swap/Copy Names..." msgstr "Swap/Copy Names..." -#: smalldialogs.cpp:124 smalldialogs.cpp:125 smalldialogs.cpp:126 +#: smalldialogs.cpp:131 smalldialogs.cpp:132 smalldialogs.cpp:133 #, kde-format msgid "Swap %1<->%2" msgstr "Swap %1<->%2" -#: smalldialogs.cpp:127 smalldialogs.cpp:128 smalldialogs.cpp:129 +#: smalldialogs.cpp:134 smalldialogs.cpp:135 smalldialogs.cpp:136 #, kde-format msgid "Copy %1->Output" msgstr "Copy %1->Output" -#: smalldialogs.cpp:130 smalldialogs.cpp:131 smalldialogs.cpp:132 +#: smalldialogs.cpp:137 smalldialogs.cpp:138 smalldialogs.cpp:139 #, kde-format msgid "Swap %1<->Output" msgstr "Swap %1<->Output" -#: smalldialogs.cpp:138 +#: smalldialogs.cpp:148 #, kde-format msgid "Output (optional):" msgstr "Output (optional):" -#: smalldialogs.cpp:168 +#: smalldialogs.cpp:178 #, kde-format msgid "Configure..." msgstr "Configure..." -#: smalldialogs.cpp:233 +#: smalldialogs.cpp:243 #, kde-format msgid "Open Directory" msgstr "Open Directory" -#: smalldialogs.cpp:234 +#: smalldialogs.cpp:244 #, kde-format msgid "Select Output File" msgstr "Select Output File" -#: smalldialogs.cpp:393 +#: smalldialogs.cpp:403 #, kde-format msgid "Search text:" msgstr "Search text:" -#: smalldialogs.cpp:400 +#: smalldialogs.cpp:410 #, kde-format msgid "Case sensitive" msgstr "Case sensitive" -#: smalldialogs.cpp:403 +#: smalldialogs.cpp:413 #, kde-format msgid "Search A" msgstr "Search A" -#: smalldialogs.cpp:408 +#: smalldialogs.cpp:418 #, kde-format msgid "Search B" msgstr "Search B" -#: smalldialogs.cpp:413 +#: smalldialogs.cpp:423 #, kde-format msgid "Search C" msgstr "Search C" -#: smalldialogs.cpp:418 +#: smalldialogs.cpp:428 #, kde-format msgid "Search output" msgstr "Search output" -#: smalldialogs.cpp:425 +#: smalldialogs.cpp:435 #, kde-format msgid "&Search" msgstr "&Search" -#: smalldialogs.cpp:444 +#: smalldialogs.cpp:454 #, kde-format msgid "Regular Expression Tester" msgstr "Regular Expression Tester" -#: smalldialogs.cpp:457 +#: smalldialogs.cpp:467 #, kde-format msgid "Example auto merge line:" msgstr "Example auto merge line:" -#: smalldialogs.cpp:459 +#: smalldialogs.cpp:469 #, kde-format msgid "To test auto merge, copy a line as used in your files." msgstr "To test auto merge, copy a line as used in your files." -#: smalldialogs.cpp:465 smalldialogs.cpp:493 smalldialogs.cpp:529 +#: smalldialogs.cpp:475 smalldialogs.cpp:503 smalldialogs.cpp:539 #, kde-format msgid "Match result:" msgstr "Match result:" -#: smalldialogs.cpp:484 +#: smalldialogs.cpp:494 #, kde-format msgid "Example history start line (with leading comment):" msgstr "Example history start line (with leading comment):" -#: smalldialogs.cpp:486 +#: smalldialogs.cpp:496 #, kde-format msgid "" "Copy a history start line as used in your files,\n" @@ -3373,17 +3374,17 @@ "Copy a history start line as used in your files,\n" "including the leading comment." -#: smalldialogs.cpp:512 +#: smalldialogs.cpp:522 #, kde-format msgid "History sort key order:" msgstr "History sort key order:" -#: smalldialogs.cpp:520 +#: smalldialogs.cpp:530 #, kde-format msgid "Example history entry start line (without leading comment):" msgstr "Example history entry start line (without leading comment):" -#: smalldialogs.cpp:522 +#: smalldialogs.cpp:532 #, kde-format msgid "" "Copy a history entry start line as used in your files,\n" @@ -3392,47 +3393,47 @@ "Copy a history entry start line as used in your files,\n" "but omit the leading comment." -#: smalldialogs.cpp:536 +#: smalldialogs.cpp:546 #, kde-format msgid "Sort key result:" msgstr "Sort key result:" -#: smalldialogs.cpp:584 smalldialogs.cpp:594 smalldialogs.cpp:614 +#: smalldialogs.cpp:594 smalldialogs.cpp:604 smalldialogs.cpp:624 #, kde-format msgid "Match success." msgstr "Match success." -#: smalldialogs.cpp:588 smalldialogs.cpp:598 smalldialogs.cpp:620 +#: smalldialogs.cpp:598 smalldialogs.cpp:608 smalldialogs.cpp:630 #, kde-format msgid "Match failed." msgstr "Match failed." -#: smalldialogs.cpp:605 +#: smalldialogs.cpp:615 #, kde-format msgid "Opening and closing parentheses do not match in regular expression." msgstr "Opening and closing brackets do not match in regular expression." -#: SourceData.cpp:150 +#: SourceData.cpp:153 #, kde-format msgid "Writing clipboard data to temp file failed." msgstr "Writing clipboard data to temp file failed." -#: SourceData.cpp:154 +#: SourceData.cpp:157 #, kde-format msgid "From Clipboard" msgstr "From Clipboard" -#: SourceData.cpp:335 +#: SourceData.cpp:348 #, kde-format msgid "%1 is not a normal file." msgstr "%1 is not a normal file." -#: SourceData.cpp:427 +#: SourceData.cpp:440 #, kde-format msgid " Temp file is: %1" msgstr " Temp file is: %1" -#: SourceData.cpp:432 +#: SourceData.cpp:445 #, kde-format msgid "" "Preprocessing possibly failed. Check this command:\n" @@ -3447,12 +3448,12 @@ "\n" "The preprocessing command will be disabled now." -#: SourceData.cpp:443 SourceData.cpp:512 +#: SourceData.cpp:456 SourceData.cpp:525 #, kde-format msgid "File %1 too large to process. Skipping." msgstr "File %1 too large to process. Skipping." -#: SourceData.cpp:487 +#: SourceData.cpp:500 #, kde-format msgid "" "The line-matching-preprocessing possibly failed. Check this command:\n" diff -Nru kdiff3-1.8.01/po/eo/kdiff3.po kdiff3-1.8.3/po/eo/kdiff3.po --- kdiff3-1.8.01/po/eo/kdiff3.po 2019-05-18 01:01:56.000000000 +0000 +++ kdiff3-1.8.3/po/eo/kdiff3.po 2020-06-25 00:18:14.000000000 +0000 @@ -4,8 +4,8 @@ msgid "" msgstr "" "Project-Id-Version: kdiff3\n" -"Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2019-04-18 08:02+0200\n" +"Report-Msgid-Bugs-To: https://bugs.kde.org\n" +"POT-Creation-Date: 2020-06-22 07:48+0200\n" "PO-Revision-Date: 2009-11-15 12:06+0100\n" "Last-Translator: Axel Rousseau \n" "Language-Team: esperanto \n" @@ -26,337 +26,337 @@ msgid "Your emails" msgstr "axel@esperanto-jeunes.org" -#: difftextwindow.cpp:412 +#: difftextwindow.cpp:414 #, kde-format msgid "File %1: Line %2" msgstr "" -#: difftextwindow.cpp:414 +#: difftextwindow.cpp:416 #, fuzzy, kde-format #| msgid "not available" msgid "File %1: Line not available" msgstr "Ne disponebla" -#: difftextwindow.cpp:1780 +#: difftextwindow.cpp:1778 #, kde-format msgid "Encoding:" msgstr "Kodigo:" -#: difftextwindow.cpp:1782 mergeresultwindow.cpp:3138 optiondialog.cpp:818 +#: difftextwindow.cpp:1781 mergeresultwindow.cpp:3166 optiondialog.cpp:840 #, kde-format msgid "Line end style:" msgstr "" -#: difftextwindow.cpp:1810 directorymergewindow.cpp:382 -#: directorymergewindow.cpp:433 directorymergewindow.cpp:524 -#: directorymergewindow.cpp:3058 directorymergewindow.cpp:3189 -#: directorymergewindow.cpp:3417 mergeresultwindow.cpp:942 -#: mergeresultwindow.cpp:944 mergeresultwindow.cpp:946 -#: mergeresultwindow.cpp:948 mergeresultwindow.cpp:1814 -#: mergeresultwindow.cpp:3170 mergeresultwindow.cpp:3177 optiondialog.cpp:962 -#: optiondialog.cpp:975 pdiff.cpp:833 pdiff.cpp:835 pdiff.cpp:837 pdiff.cpp:839 -#: pdiff.cpp:861 smalldialogs.cpp:124 smalldialogs.cpp:126 smalldialogs.cpp:127 -#: smalldialogs.cpp:130 +#: difftextwindow.cpp:1809 directorymergewindow.cpp:383 +#: directorymergewindow.cpp:434 directorymergewindow.cpp:525 +#: directorymergewindow.cpp:3072 directorymergewindow.cpp:3203 +#: directorymergewindow.cpp:3431 mergeresultwindow.cpp:970 +#: mergeresultwindow.cpp:972 mergeresultwindow.cpp:974 +#: mergeresultwindow.cpp:976 mergeresultwindow.cpp:1842 +#: mergeresultwindow.cpp:3198 mergeresultwindow.cpp:3205 optiondialog.cpp:1002 +#: optiondialog.cpp:1015 pdiff.cpp:823 pdiff.cpp:825 pdiff.cpp:827 +#: pdiff.cpp:829 pdiff.cpp:851 smalldialogs.cpp:131 smalldialogs.cpp:133 +#: smalldialogs.cpp:134 smalldialogs.cpp:137 #, kde-format msgid "A" msgstr "A" -#: difftextwindow.cpp:1810 directorymergewindow.cpp:384 -#: directorymergewindow.cpp:436 directorymergewindow.cpp:526 -#: directorymergewindow.cpp:3064 directorymergewindow.cpp:3190 -#: directorymergewindow.cpp:3418 mergeresultwindow.cpp:942 -#: mergeresultwindow.cpp:944 mergeresultwindow.cpp:950 -#: mergeresultwindow.cpp:952 mergeresultwindow.cpp:1816 -#: mergeresultwindow.cpp:3172 mergeresultwindow.cpp:3179 optiondialog.cpp:963 -#: optiondialog.cpp:976 pdiff.cpp:833 pdiff.cpp:835 pdiff.cpp:841 pdiff.cpp:843 -#: pdiff.cpp:863 smalldialogs.cpp:124 smalldialogs.cpp:125 smalldialogs.cpp:128 -#: smalldialogs.cpp:131 +#: difftextwindow.cpp:1809 directorymergewindow.cpp:385 +#: directorymergewindow.cpp:437 directorymergewindow.cpp:527 +#: directorymergewindow.cpp:3078 directorymergewindow.cpp:3204 +#: directorymergewindow.cpp:3432 mergeresultwindow.cpp:970 +#: mergeresultwindow.cpp:972 mergeresultwindow.cpp:978 +#: mergeresultwindow.cpp:980 mergeresultwindow.cpp:1844 +#: mergeresultwindow.cpp:3200 mergeresultwindow.cpp:3207 optiondialog.cpp:1003 +#: optiondialog.cpp:1016 pdiff.cpp:823 pdiff.cpp:825 pdiff.cpp:831 +#: pdiff.cpp:833 pdiff.cpp:853 smalldialogs.cpp:131 smalldialogs.cpp:132 +#: smalldialogs.cpp:135 smalldialogs.cpp:138 #, kde-format msgid "B" msgstr "B" -#: difftextwindow.cpp:1810 directorymergewindow.cpp:386 -#: directorymergewindow.cpp:439 directorymergewindow.cpp:528 -#: directorymergewindow.cpp:3070 directorymergewindow.cpp:3191 -#: directorymergewindow.cpp:3419 mergeresultwindow.cpp:946 -#: mergeresultwindow.cpp:948 mergeresultwindow.cpp:950 -#: mergeresultwindow.cpp:952 mergeresultwindow.cpp:1818 -#: mergeresultwindow.cpp:3174 mergeresultwindow.cpp:3181 optiondialog.cpp:977 -#: pdiff.cpp:837 pdiff.cpp:839 pdiff.cpp:841 pdiff.cpp:843 pdiff.cpp:865 -#: smalldialogs.cpp:125 smalldialogs.cpp:126 smalldialogs.cpp:129 -#: smalldialogs.cpp:132 +#: difftextwindow.cpp:1809 directorymergewindow.cpp:387 +#: directorymergewindow.cpp:440 directorymergewindow.cpp:529 +#: directorymergewindow.cpp:3084 directorymergewindow.cpp:3205 +#: directorymergewindow.cpp:3433 mergeresultwindow.cpp:974 +#: mergeresultwindow.cpp:976 mergeresultwindow.cpp:978 +#: mergeresultwindow.cpp:980 mergeresultwindow.cpp:1846 +#: mergeresultwindow.cpp:3202 mergeresultwindow.cpp:3209 optiondialog.cpp:1017 +#: pdiff.cpp:827 pdiff.cpp:829 pdiff.cpp:831 pdiff.cpp:833 pdiff.cpp:855 +#: smalldialogs.cpp:132 smalldialogs.cpp:133 smalldialogs.cpp:136 +#: smalldialogs.cpp:139 #, kde-format msgid "C" msgstr "C" -#: difftextwindow.cpp:1810 +#: difftextwindow.cpp:1809 #, kde-format msgid "A (Base)" msgstr "" -#: difftextwindow.cpp:1812 +#: difftextwindow.cpp:1811 #, fuzzy, kde-format #| msgid "Encoding:" msgid "Encoding: %1" msgstr "Kodigo:" -#: difftextwindow.cpp:1813 mergeresultwindow.cpp:3183 +#: difftextwindow.cpp:1812 mergeresultwindow.cpp:3211 #, kde-format msgid "Unix" msgstr "Unix" -#: difftextwindow.cpp:1813 mergeresultwindow.cpp:3184 +#: difftextwindow.cpp:1812 mergeresultwindow.cpp:3212 #, kde-format msgid "DOS" msgstr "DOS" -#: difftextwindow.cpp:1813 +#: difftextwindow.cpp:1812 #, kde-format msgid "Line end style: %1" msgstr "" -#: difftextwindow.cpp:1835 kdiff3.cpp:873 +#: difftextwindow.cpp:1834 kdiff3.cpp:874 #, kde-format msgid "Top line" msgstr "" -#: difftextwindow.cpp:1845 +#: difftextwindow.cpp:1843 #, kde-format msgid "End" msgstr "Fino" -#: difftextwindow.cpp:1903 smalldialogs.cpp:235 +#: difftextwindow.cpp:1901 smalldialogs.cpp:245 #, fuzzy, kde-format #| msgid "File" msgid "Open File" msgstr "Dosiero" -#: difftextwindow.cpp:1951 optiondialog.cpp:387 +#: difftextwindow.cpp:1943 optiondialog.cpp:389 #, kde-format msgid "Unicode, 8 bit" msgstr "" -#: difftextwindow.cpp:1966 +#: difftextwindow.cpp:1958 #, kde-format msgid "Other" msgstr "" -#: directorymergewindow.cpp:409 directorymergewindow.cpp:3424 +#: directorymergewindow.cpp:410 directorymergewindow.cpp:3438 #, kde-format msgid "Copy A to B" msgstr "" -#: directorymergewindow.cpp:412 directorymergewindow.cpp:3425 +#: directorymergewindow.cpp:413 directorymergewindow.cpp:3439 #, kde-format msgid "Copy B to A" msgstr "" -#: directorymergewindow.cpp:415 directorymergewindow.cpp:3426 +#: directorymergewindow.cpp:416 directorymergewindow.cpp:3440 #, kde-format msgid "Delete A" msgstr "" -#: directorymergewindow.cpp:418 directorymergewindow.cpp:3427 +#: directorymergewindow.cpp:419 directorymergewindow.cpp:3441 #, kde-format msgid "Delete B" msgstr "" -#: directorymergewindow.cpp:421 +#: directorymergewindow.cpp:422 #, kde-format msgid "Delete A & B" msgstr "" -#: directorymergewindow.cpp:424 directorymergewindow.cpp:3429 +#: directorymergewindow.cpp:425 directorymergewindow.cpp:3443 #, kde-format msgid "Merge to A" msgstr "" -#: directorymergewindow.cpp:427 directorymergewindow.cpp:3430 +#: directorymergewindow.cpp:428 directorymergewindow.cpp:3444 #, kde-format msgid "Merge to B" msgstr "" -#: directorymergewindow.cpp:430 +#: directorymergewindow.cpp:431 #, kde-format msgid "Merge to A & B" msgstr "" -#: directorymergewindow.cpp:442 directorymergewindow.cpp:3421 +#: directorymergewindow.cpp:443 directorymergewindow.cpp:3435 #, kde-format msgid "Delete (if exists)" msgstr "" -#: directorymergewindow.cpp:445 directorymergewindow.cpp:448 -#: directorymergewindow.cpp:3420 optiondialog.cpp:925 smalldialogs.cpp:113 +#: directorymergewindow.cpp:446 directorymergewindow.cpp:449 +#: directorymergewindow.cpp:3434 smalldialogs.cpp:120 #, kde-format msgid "Merge" msgstr "Mergi" -#: directorymergewindow.cpp:445 directorymergewindow.cpp:448 +#: directorymergewindow.cpp:446 directorymergewindow.cpp:449 #, kde-format msgid "Merge (manual)" msgstr "" -#: directorymergewindow.cpp:451 +#: directorymergewindow.cpp:452 #, kde-format msgid "Error: Conflicting File Types" msgstr "" -#: directorymergewindow.cpp:454 +#: directorymergewindow.cpp:455 #, kde-format msgid "Error: Changed and Deleted" msgstr "" -#: directorymergewindow.cpp:457 +#: directorymergewindow.cpp:458 #, kde-format msgid "Error: Dates are equal but files are not." msgstr "" -#: directorymergewindow.cpp:471 +#: directorymergewindow.cpp:472 #, fuzzy, kde-format #| msgid "Done." msgid "Done" msgstr "Farita." -#: directorymergewindow.cpp:473 +#: directorymergewindow.cpp:474 #, kde-format msgid "Error" msgstr "Eraro" -#: directorymergewindow.cpp:475 +#: directorymergewindow.cpp:476 #, kde-format msgid "Skipped." msgstr "" -#: directorymergewindow.cpp:477 +#: directorymergewindow.cpp:478 #, kde-format msgid "Not saved." msgstr "" -#: directorymergewindow.cpp:479 +#: directorymergewindow.cpp:480 #, kde-format msgid "In progress..." msgstr "" -#: directorymergewindow.cpp:481 +#: directorymergewindow.cpp:482 #, kde-format msgid "To do." msgstr "" -#: directorymergewindow.cpp:522 +#: directorymergewindow.cpp:523 #, kde-format msgid "Name" msgstr "Nomo" -#: directorymergewindow.cpp:530 +#: directorymergewindow.cpp:531 #, kde-format msgid "Operation" msgstr "Operacio" -#: directorymergewindow.cpp:532 +#: directorymergewindow.cpp:533 #, kde-format msgid "Status" msgstr "Stato" -#: directorymergewindow.cpp:534 +#: directorymergewindow.cpp:535 #, kde-format msgid "Unsolved" msgstr "" -#: directorymergewindow.cpp:536 +#: directorymergewindow.cpp:537 #, kde-format msgid "Solved" msgstr "" -#: directorymergewindow.cpp:538 +#: directorymergewindow.cpp:539 #, kde-format msgid "Nonwhite" msgstr "" -#: directorymergewindow.cpp:540 +#: directorymergewindow.cpp:541 #, kde-format msgid "White" msgstr "" -#: directorymergewindow.cpp:674 +#: directorymergewindow.cpp:676 #, kde-format msgid "Unable to compare non-normal file with normal file." msgstr "" -#: directorymergewindow.cpp:688 +#: directorymergewindow.cpp:690 #, kde-format msgid "Mix of links and normal files." msgstr "" -#: directorymergewindow.cpp:695 +#: directorymergewindow.cpp:697 #, kde-format msgid "Link: " msgstr "" -#: directorymergewindow.cpp:704 +#: directorymergewindow.cpp:706 #, kde-format msgid "Size. " msgstr "" -#: directorymergewindow.cpp:718 directorymergewindow.cpp:728 +#: directorymergewindow.cpp:720 directorymergewindow.cpp:730 #, kde-format msgid "Date & Size: " msgstr "" -#: directorymergewindow.cpp:748 +#: directorymergewindow.cpp:751 #, kde-format msgid "Comparing file..." msgstr "" -#: directorymergewindow.cpp:801 +#: directorymergewindow.cpp:813 #, kde-format msgid "" "You are currently doing a directory merge. Are you sure, you want to abort " "the merge and rescan the directory?" msgstr "" -#: directorymergewindow.cpp:802 kdiff3.cpp:698 kdiff3.cpp:708 kdiff3.cpp:720 -#: mergeresultwindow.cpp:372 pdiff.cpp:1033 pdiff.cpp:1910 pdiff.cpp:1920 +#: directorymergewindow.cpp:814 kdiff3.cpp:697 kdiff3.cpp:707 kdiff3.cpp:719 +#: mergeresultwindow.cpp:400 pdiff.cpp:1031 pdiff.cpp:1920 pdiff.cpp:1930 #, kde-format msgid "Warning" msgstr "Averto" -#: directorymergewindow.cpp:803 directorymergewindow.cpp:3393 +#: directorymergewindow.cpp:815 directorymergewindow.cpp:3407 #, kde-format msgid "Rescan" msgstr "Reserĉi" -#: directorymergewindow.cpp:804 pdiff.cpp:1035 +#: directorymergewindow.cpp:816 pdiff.cpp:1033 #, kde-format msgid "Continue Merging" msgstr "" -#: directorymergewindow.cpp:971 +#: directorymergewindow.cpp:984 #, kde-format msgid "Opening of directories failed:" msgstr "" -#: directorymergewindow.cpp:975 +#: directorymergewindow.cpp:988 #, kde-format msgid "Dir A \"%1\" does not exist or is not a directory.\n" msgstr "" -#: directorymergewindow.cpp:980 +#: directorymergewindow.cpp:993 #, kde-format msgid "Dir B \"%1\" does not exist or is not a directory.\n" msgstr "" -#: directorymergewindow.cpp:985 +#: directorymergewindow.cpp:998 #, kde-format msgid "Dir C \"%1\" does not exist or is not a directory.\n" msgstr "" -#: directorymergewindow.cpp:988 +#: directorymergewindow.cpp:1001 #, kde-format msgid "Directory Open Error" msgstr "" -#: directorymergewindow.cpp:996 +#: directorymergewindow.cpp:1009 #, kde-format msgid "" "The destination directory must not be the same as A or B when three " @@ -364,49 +364,49 @@ "Check again before continuing." msgstr "" -#: directorymergewindow.cpp:998 +#: directorymergewindow.cpp:1011 #, kde-format msgid "Parameter Warning" msgstr "" -#: directorymergewindow.cpp:1003 +#: directorymergewindow.cpp:1016 #, kde-format msgid "Scanning directories..." msgstr "" -#: directorymergewindow.cpp:1029 +#: directorymergewindow.cpp:1042 #, kde-format msgid "Reading Directory A" msgstr "" -#: directorymergewindow.cpp:1038 +#: directorymergewindow.cpp:1051 #, kde-format msgid "Reading Directory B" msgstr "" -#: directorymergewindow.cpp:1048 +#: directorymergewindow.cpp:1061 #, kde-format msgid "Reading Directory C" msgstr "" -#: directorymergewindow.cpp:1064 +#: directorymergewindow.cpp:1077 #, kde-format msgid "Some subdirectories were not readable in" msgstr "" -#: directorymergewindow.cpp:1069 +#: directorymergewindow.cpp:1082 #, kde-format msgid "Check the permissions of the subdirectories." msgstr "" -#: directorymergewindow.cpp:1106 kdiff3.cpp:666 kdiff3.cpp:753 kdiff3.cpp:777 -#: kdiff3.cpp:1065 kdiff3.cpp:1086 pdiff.cpp:1116 pdiff.cpp:1170 pdiff.cpp:1218 -#: pdiff.cpp:1234 pdiff.cpp:1277 pdiff.cpp:1301 +#: directorymergewindow.cpp:1119 kdiff3.cpp:665 kdiff3.cpp:752 kdiff3.cpp:776 +#: kdiff3.cpp:1072 kdiff3.cpp:1093 pdiff.cpp:1115 pdiff.cpp:1178 pdiff.cpp:1228 +#: pdiff.cpp:1244 pdiff.cpp:1287 pdiff.cpp:1311 #, kde-format msgid "Ready." msgstr "Preta." -#: directorymergewindow.cpp:1121 +#: directorymergewindow.cpp:1134 #, kde-format msgid "" "Directory Comparison Status\n" @@ -416,66 +416,66 @@ "Number of different files: %3" msgstr "" -#: directorymergewindow.cpp:1128 +#: directorymergewindow.cpp:1141 #, kde-format msgid "Number of manual merges: %1" msgstr "" -#: directorymergewindow.cpp:1394 +#: directorymergewindow.cpp:1407 #, kde-format msgid "This affects all merge operations." msgstr "" -#: directorymergewindow.cpp:1395 +#: directorymergewindow.cpp:1408 #, kde-format msgid "Changing All Merge Operations" msgstr "" -#: directorymergewindow.cpp:1695 +#: directorymergewindow.cpp:1708 #, kde-format msgid "" "Processing %1 / %2\n" "%3" msgstr "" -#: directorymergewindow.cpp:1738 directorymergewindow.cpp:1742 +#: directorymergewindow.cpp:1751 directorymergewindow.cpp:1755 #, kde-format msgid "Some files could not be processed." msgstr "" -#: directorymergewindow.cpp:2222 directorymergewindow.cpp:2247 -#: directorymergewindow.cpp:2271 +#: directorymergewindow.cpp:2235 directorymergewindow.cpp:2260 +#: directorymergewindow.cpp:2285 #, kde-format msgid "This operation is currently not possible." msgstr "" -#: directorymergewindow.cpp:2222 directorymergewindow.cpp:2247 -#: directorymergewindow.cpp:2271 directorymergewindow.cpp:2552 +#: directorymergewindow.cpp:2235 directorymergewindow.cpp:2260 +#: directorymergewindow.cpp:2285 directorymergewindow.cpp:2565 #, kde-format msgid "Operation Not Possible" msgstr "" -#: directorymergewindow.cpp:2318 +#: directorymergewindow.cpp:2332 #, kde-format msgid "An error occurred while copying." msgstr "" -#: directorymergewindow.cpp:2319 directorymergewindow.cpp:2759 +#: directorymergewindow.cpp:2333 directorymergewindow.cpp:2772 #, kde-format msgid "Merge Error" msgstr "" -#: directorymergewindow.cpp:2396 +#: directorymergewindow.cpp:2410 #, kde-format msgid "Unknown merge operation. (This must never happen!)" msgstr "" -#: directorymergewindow.cpp:2441 +#: directorymergewindow.cpp:2455 #, kde-format msgid "Unknown merge operation." msgstr "" -#: directorymergewindow.cpp:2454 +#: directorymergewindow.cpp:2468 #, kde-format msgid "" "The merge is about to begin.\n" @@ -488,50 +488,50 @@ "whatsoever! Make backups of your vital data!" msgstr "" -#: directorymergewindow.cpp:2459 +#: directorymergewindow.cpp:2473 #, kde-format msgid "Starting Merge" msgstr "" -#: directorymergewindow.cpp:2460 +#: directorymergewindow.cpp:2474 #, kde-format msgid "Do It" msgstr "" -#: directorymergewindow.cpp:2461 +#: directorymergewindow.cpp:2475 #, kde-format msgid "Simulate It" msgstr "" -#: directorymergewindow.cpp:2487 +#: directorymergewindow.cpp:2501 #, kde-format msgid "" "The highlighted item has a different type in the different directories. " "Select what to do." msgstr "" -#: directorymergewindow.cpp:2491 +#: directorymergewindow.cpp:2505 #, kde-format msgid "" "The modification dates of the file are equal but the files are not. Select " "what to do." msgstr "" -#: directorymergewindow.cpp:2495 +#: directorymergewindow.cpp:2509 #, kde-format msgid "" "The highlighted item was changed in one directory and deleted in the other. " "Select what to do." msgstr "" -#: directorymergewindow.cpp:2552 +#: directorymergewindow.cpp:2565 #, kde-format msgid "" "This operation is currently not possible because directory merge is " "currently running." msgstr "" -#: directorymergewindow.cpp:2609 +#: directorymergewindow.cpp:2622 #, kde-format msgid "" "There was an error in the last step.\n" @@ -539,401 +539,406 @@ "to skip this item?" msgstr "" -#: directorymergewindow.cpp:2611 +#: directorymergewindow.cpp:2624 #, kde-format msgid "Continue merge after an error" msgstr "" -#: directorymergewindow.cpp:2612 +#: directorymergewindow.cpp:2625 #, kde-format msgid "Continue With Last Item" msgstr "" -#: directorymergewindow.cpp:2613 +#: directorymergewindow.cpp:2626 #, kde-format msgid "Skip Item" msgstr "" -#: directorymergewindow.cpp:2709 +#: directorymergewindow.cpp:2722 #, kde-format msgid "Merge operation complete." msgstr "" -#: directorymergewindow.cpp:2709 directorymergewindow.cpp:2712 +#: directorymergewindow.cpp:2722 directorymergewindow.cpp:2725 #, kde-format msgid "Merge Complete" msgstr "" -#: directorymergewindow.cpp:2722 +#: directorymergewindow.cpp:2735 #, kde-format msgid "" "Simulated merge complete: Check if you agree with the proposed operations." msgstr "" -#: directorymergewindow.cpp:2758 +#: directorymergewindow.cpp:2771 #, fuzzy, kde-format #| msgid "An error occurred. Press OK to see detailed information.\n" msgid "An error occurred. Press OK to see detailed information." msgstr "Okazis eraro. Press OK to see detailed information.\n" -#: directorymergewindow.cpp:2791 +#: directorymergewindow.cpp:2804 #, kde-format msgid "Error: While deleting %1: Creating backup failed." msgstr "" -#: directorymergewindow.cpp:2798 +#: directorymergewindow.cpp:2811 #, kde-format msgid "delete directory recursively( %1 )" msgstr "" -#: directorymergewindow.cpp:2800 +#: directorymergewindow.cpp:2813 #, kde-format msgid "delete( %1 )" msgstr "" -#: directorymergewindow.cpp:2815 +#: directorymergewindow.cpp:2828 #, kde-format msgid "Error: delete dir operation failed while trying to read the directory." msgstr "" -#: directorymergewindow.cpp:2834 +#: directorymergewindow.cpp:2847 #, kde-format msgid "Error: rmdir( %1 ) operation failed." msgstr "" -#: directorymergewindow.cpp:2844 +#: directorymergewindow.cpp:2857 #, kde-format msgid "Error: delete operation failed." msgstr "" -#: directorymergewindow.cpp:2870 +#: directorymergewindow.cpp:2884 #, kde-format msgid "manual merge( %1, %2, %3 -> %4)" msgstr "" -#: directorymergewindow.cpp:2873 +#: directorymergewindow.cpp:2887 #, kde-format msgid "" " Note: After a manual merge the user should continue by pressing F7." msgstr "" -#: directorymergewindow.cpp:2900 +#: directorymergewindow.cpp:2914 #, kde-format msgid "Error: copy( %1 -> %2 ) failed.Deleting existing destination failed." msgstr "" -#: directorymergewindow.cpp:2909 +#: directorymergewindow.cpp:2923 #, kde-format msgid "copyLink( %1 -> %2 )" msgstr "" -#: directorymergewindow.cpp:2918 +#: directorymergewindow.cpp:2932 #, kde-format msgid "Error: copyLink failed: Remote links are not yet supported." msgstr "" -#: directorymergewindow.cpp:2928 +#: directorymergewindow.cpp:2942 #, kde-format msgid "Error: copyLink failed." msgstr "" -#: directorymergewindow.cpp:2953 +#: directorymergewindow.cpp:2967 #, kde-format msgid "copy( %1 -> %2 )" msgstr "" -#: directorymergewindow.cpp:2979 +#: directorymergewindow.cpp:2993 #, kde-format msgid "Error during rename( %1 -> %2 ): Cannot delete existing destination." msgstr "" -#: directorymergewindow.cpp:2986 +#: directorymergewindow.cpp:3000 #, kde-format msgid "rename( %1 -> %2 )" msgstr "" -#: directorymergewindow.cpp:2995 +#: directorymergewindow.cpp:3009 #, kde-format msgid "Error: Rename failed." msgstr "" -#: directorymergewindow.cpp:3013 +#: directorymergewindow.cpp:3027 #, kde-format msgid "Error during makeDir of %1. Cannot delete existing file." msgstr "" -#: directorymergewindow.cpp:3030 +#: directorymergewindow.cpp:3044 #, kde-format msgid "makeDir( %1 )" msgstr "" -#: directorymergewindow.cpp:3040 +#: directorymergewindow.cpp:3054 #, kde-format msgid "Error while creating directory." msgstr "" -#: directorymergewindow.cpp:3076 directorymergewindow.cpp:3195 +#: directorymergewindow.cpp:3090 directorymergewindow.cpp:3209 #, kde-format msgid "Dest" msgstr "" -#: directorymergewindow.cpp:3084 directorymergewindow.cpp:3113 +#: directorymergewindow.cpp:3098 directorymergewindow.cpp:3127 #, kde-format msgid "Dir" msgstr "" -#: directorymergewindow.cpp:3084 +#: directorymergewindow.cpp:3098 #, kde-format msgid "Type" msgstr "Tipo" -#: directorymergewindow.cpp:3084 +#: directorymergewindow.cpp:3098 #, kde-format msgid "Size" msgstr "Grandeco" -#: directorymergewindow.cpp:3085 +#: directorymergewindow.cpp:3099 #, kde-format msgid "Attr" msgstr "" -#: directorymergewindow.cpp:3085 +#: directorymergewindow.cpp:3099 #, kde-format msgid "Last Modification" msgstr "" -#: directorymergewindow.cpp:3085 +#: directorymergewindow.cpp:3099 #, kde-format msgid "Link-Destination" msgstr "" -#: directorymergewindow.cpp:3113 +#: directorymergewindow.cpp:3127 #, kde-format msgid "File" msgstr "Dosiero" -#: directorymergewindow.cpp:3113 +#: directorymergewindow.cpp:3127 #, kde-format msgid "-Link" msgstr "" -#: directorymergewindow.cpp:3119 +#: directorymergewindow.cpp:3133 #, kde-format msgid "not available" msgstr "Ne disponebla" -#: directorymergewindow.cpp:3137 +#: directorymergewindow.cpp:3151 #, kde-format msgid "A (Dest): " msgstr "" -#: directorymergewindow.cpp:3141 +#: directorymergewindow.cpp:3155 #, kde-format msgid "A: " msgstr "" -#: directorymergewindow.cpp:3141 +#: directorymergewindow.cpp:3155 #, kde-format msgid "A (Base): " msgstr "" -#: directorymergewindow.cpp:3147 +#: directorymergewindow.cpp:3161 #, kde-format msgid "B (Dest): " msgstr "" -#: directorymergewindow.cpp:3151 +#: directorymergewindow.cpp:3165 #, kde-format msgid "B: " msgstr "" -#: directorymergewindow.cpp:3156 +#: directorymergewindow.cpp:3170 #, kde-format msgid "C (Dest): " msgstr "" -#: directorymergewindow.cpp:3160 +#: directorymergewindow.cpp:3174 #, kde-format msgid "C: " msgstr "" -#: directorymergewindow.cpp:3163 +#: directorymergewindow.cpp:3177 #, kde-format msgid "Dest: " msgstr "" #. i18n("Saving Directory Merge State ...")); -#: directorymergewindow.cpp:3238 +#: directorymergewindow.cpp:3252 #, kde-format msgid "Save Directory Merge State As..." msgstr "" -#: directorymergewindow.cpp:3387 +#: directorymergewindow.cpp:3401 #, kde-format msgid "Start/Continue Directory Merge" msgstr "" -#: directorymergewindow.cpp:3388 +#: directorymergewindow.cpp:3402 #, kde-format msgid "Run Operation for Current Item" msgstr "" -#: directorymergewindow.cpp:3389 +#: directorymergewindow.cpp:3403 #, kde-format msgid "Compare Selected File" msgstr "" -#: directorymergewindow.cpp:3390 +#: directorymergewindow.cpp:3404 #, kde-format msgid "Merge Current File" msgstr "" -#: directorymergewindow.cpp:3390 +#: directorymergewindow.cpp:3404 #, kde-format msgid "" "Merge\n" "File" msgstr "" -#: directorymergewindow.cpp:3391 +#: directorymergewindow.cpp:3405 #, kde-format msgid "Fold All Subdirs" msgstr "" -#: directorymergewindow.cpp:3392 +#: directorymergewindow.cpp:3406 #, kde-format msgid "Unfold All Subdirs" msgstr "" #. i18n("Save Directory Merge State ..."), 0, this, &DirectoryMergeWindow::slotSaveMergeState, ac, "dir_save_merge_state"); #. i18n("Load Directory Merge State ..."), 0, this, &DirectoryMergeWindow::slotLoadMergeState, ac, "dir_load_merge_state"); -#: directorymergewindow.cpp:3396 +#: directorymergewindow.cpp:3410 #, kde-format msgid "Choose A for All Items" msgstr "" -#: directorymergewindow.cpp:3397 +#: directorymergewindow.cpp:3411 #, kde-format msgid "Choose B for All Items" msgstr "" -#: directorymergewindow.cpp:3398 +#: directorymergewindow.cpp:3412 #, kde-format msgid "Choose C for All Items" msgstr "" -#: directorymergewindow.cpp:3399 +#: directorymergewindow.cpp:3413 #, kde-format msgid "Auto-Choose Operation for All Items" msgstr "" -#: directorymergewindow.cpp:3400 +#: directorymergewindow.cpp:3414 #, kde-format msgid "No Operation for All Items" msgstr "" #. i18n("Synchronize Directories"), 0, this, &DirectoryMergeWindow::slotSynchronizeDirectories, ac, "dir_synchronize_directories"); #. d->m_pDirChooseNewerFiles = GuiUtils::createAction< KToggleAction >(i18n("Copy Newer Files Instead of Merging"), 0, this, &DirectoryMergeWindow::slotChooseNewerFiles, ac, "dir_choose_newer_files"); -#: directorymergewindow.cpp:3405 +#: directorymergewindow.cpp:3419 #, kde-format msgid "Show Identical Files" msgstr "" -#: directorymergewindow.cpp:3405 +#: directorymergewindow.cpp:3419 #, kde-format msgid "" "Identical\n" "Files" msgstr "" -#: directorymergewindow.cpp:3406 +#: directorymergewindow.cpp:3420 #, kde-format msgid "Show Different Files" msgstr "" -#: directorymergewindow.cpp:3407 +#: directorymergewindow.cpp:3421 #, kde-format msgid "Show Files only in A" msgstr "" -#: directorymergewindow.cpp:3407 +#: directorymergewindow.cpp:3421 #, kde-format msgid "" "Files\n" "only in A" msgstr "" -#: directorymergewindow.cpp:3408 +#: directorymergewindow.cpp:3422 #, kde-format msgid "Show Files only in B" msgstr "" -#: directorymergewindow.cpp:3408 +#: directorymergewindow.cpp:3422 #, kde-format msgid "" "Files\n" "only in B" msgstr "" -#: directorymergewindow.cpp:3409 +#: directorymergewindow.cpp:3423 #, kde-format msgid "Show Files only in C" msgstr "" -#: directorymergewindow.cpp:3409 +#: directorymergewindow.cpp:3423 #, kde-format msgid "" "Files\n" "only in C" msgstr "" -#: directorymergewindow.cpp:3413 +#: directorymergewindow.cpp:3427 #, kde-format msgid "Compare Explicitly Selected Files" msgstr "" -#: directorymergewindow.cpp:3414 +#: directorymergewindow.cpp:3428 #, kde-format msgid "Merge Explicitly Selected Files" msgstr "" -#: directorymergewindow.cpp:3416 directorymergewindow.cpp:3423 +#: directorymergewindow.cpp:3430 directorymergewindow.cpp:3437 #, kde-format msgid "Do Nothing" msgstr "Nenion fari" -#: directorymergewindow.cpp:3428 +#: directorymergewindow.cpp:3442 #, kde-format msgid "Delete A && B" msgstr "" -#: directorymergewindow.cpp:3431 +#: directorymergewindow.cpp:3445 #, kde-format msgid "Merge to A && B" msgstr "" -#: fileaccess.cpp:462 SourceData.cpp:493 +#: fileaccess.cpp:301 +#, kde-format +msgid "Unable to determine full url. No parent specified." +msgstr "" + +#: fileaccess.cpp:482 SourceData.cpp:506 #, kde-format msgid "Failed to read file: %1" msgstr "" -#: fileaccess.cpp:587 +#: fileaccess.cpp:624 #, kde-format msgid "Creating temp copy of %1 failed." msgstr "" -#: fileaccess.cpp:595 fileaccess.cpp:600 +#: fileaccess.cpp:632 fileaccess.cpp:637 #, kde-format msgid "Opening %1 failed. %2" msgstr "" -#: fileaccess.cpp:619 fileaccess.cpp:627 +#: fileaccess.cpp:656 fileaccess.cpp:664 #, fuzzy, kde-format #| msgid "Error reading from %1" msgid "Error reading from %1. %2" msgstr "Eraro okazis dum legado de %1" -#: fileaccess.cpp:751 +#: fileaccess.cpp:788 #, fuzzy, kde-format #| msgid "" #| "While trying to make a backup, deleting an older backup failed. \n" @@ -945,7 +950,7 @@ "While trying to make a backup, deleting an older backup failed. \n" "Dosiernomo: " -#: fileaccess.cpp:758 +#: fileaccess.cpp:795 #, fuzzy, kde-format #| msgid "" #| "While trying to make a backup, deleting an older backup failed. \n" @@ -957,565 +962,565 @@ "While trying to make a backup, deleting an older backup failed. \n" "Dosiernomo: " -#: fileaccess.cpp:828 +#: fileaccess.cpp:865 #, kde-format msgid "Getting file status: %1" msgstr "" -#: fileaccess.cpp:869 +#: fileaccess.cpp:906 #, kde-format msgid "Reading file: %1" msgstr "" -#: fileaccess.cpp:907 +#: fileaccess.cpp:944 #, kde-format msgid "Writing file: %1" msgstr "" -#: fileaccess.cpp:940 +#: fileaccess.cpp:977 #, kde-format msgid "Out of memory" msgstr "" -#: fileaccess.cpp:976 +#: fileaccess.cpp:1013 #, kde-format msgid "Making directory: %1" msgstr "" -#: fileaccess.cpp:997 +#: fileaccess.cpp:1034 #, kde-format msgid "Removing directory: %1" msgstr "" -#: fileaccess.cpp:1012 +#: fileaccess.cpp:1049 #, kde-format msgid "Removing file: %1" msgstr "" -#: fileaccess.cpp:1028 +#: fileaccess.cpp:1065 #, kde-format msgid "Creating symbolic link: %1 -> %2" msgstr "" -#: fileaccess.cpp:1052 +#: fileaccess.cpp:1089 #, kde-format msgid "Renaming file: %1 -> %2" msgstr "" -#: fileaccess.cpp:1086 +#: fileaccess.cpp:1123 #, kde-format msgid "Copying file: %1 -> %2" msgstr "" -#: fileaccess.cpp:1108 +#: fileaccess.cpp:1145 #, fuzzy, kde-format #| msgid "Directory" msgid "Reading directory: %1" msgstr "Dosierujo" -#: fileaccess.cpp:1162 +#: fileaccess.cpp:1202 #, kde-format msgid "Listing directory: %1" msgstr "" -#: kdiff3.cpp:181 +#: kdiff3.cpp:182 #, kde-format msgid "Current Configuration:" msgstr "" -#: kdiff3.cpp:186 +#: kdiff3.cpp:187 #, kde-format msgid "Config Option Error:" msgstr "" -#: kdiff3.cpp:240 +#: kdiff3.cpp:246 #, kde-format msgid "Option --auto used, but no output file specified." msgstr "" -#: kdiff3.cpp:416 +#: kdiff3.cpp:405 #, kde-format msgid "Option --auto ignored for directory comparison." msgstr "" -#: kdiff3.cpp:460 +#: kdiff3.cpp:449 #, kde-format msgid "Saving failed." msgstr "" -#: kdiff3.cpp:496 pdiff.cpp:1098 +#: kdiff3.cpp:494 pdiff.cpp:1096 #, kde-format msgid "Opening of these files failed:" msgstr "" -#: kdiff3.cpp:505 +#: kdiff3.cpp:503 pdiff.cpp:1105 #, kde-format -msgid "File Open Error" +msgid "File open error" msgstr "" -#: kdiff3.cpp:533 +#: kdiff3.cpp:532 #, kde-format msgid "Opens documents for comparison..." msgstr "" -#: kdiff3.cpp:535 +#: kdiff3.cpp:534 #, kde-format msgid "Reload" msgstr "Reŝargi" -#: kdiff3.cpp:538 +#: kdiff3.cpp:537 #, kde-format msgid "Saves the merge result. All conflicts must be solved!" msgstr "" -#: kdiff3.cpp:540 +#: kdiff3.cpp:539 #, kde-format msgid "Saves the current document as..." msgstr "" -#: kdiff3.cpp:543 +#: kdiff3.cpp:542 #, kde-format msgid "Print the differences" msgstr "" -#: kdiff3.cpp:546 +#: kdiff3.cpp:545 #, kde-format msgid "Quits the application" msgstr "Finas la programon" -#: kdiff3.cpp:549 +#: kdiff3.cpp:548 #, kde-format msgid "Cuts the selected section and puts it to the clipboard" msgstr "Eltondos la elektaĵon kaj enpoŝigos ĝin" -#: kdiff3.cpp:552 +#: kdiff3.cpp:551 #, kde-format msgid "Copies the selected section to the clipboard" msgstr "Kopios la apartigatan regionon poŝen" -#: kdiff3.cpp:554 +#: kdiff3.cpp:553 #, fuzzy, kde-format #| msgid "Pastes the clipboard contents to actual position" msgid "Pastes the clipboard contents to current position" msgstr "Elpoŝigos la poŝan enhavon al la aktuala pozicio" -#: kdiff3.cpp:557 +#: kdiff3.cpp:556 #, kde-format msgid "Select everything in current window" msgstr "" -#: kdiff3.cpp:560 +#: kdiff3.cpp:559 #, kde-format msgid "Search for a string" msgstr "" -#: kdiff3.cpp:562 +#: kdiff3.cpp:561 #, kde-format msgid "Search again for the string" msgstr "" -#: kdiff3.cpp:567 +#: kdiff3.cpp:566 #, kde-format msgid "Enables/disables the statusbar" msgstr "(Mal)ŝaltos la statbreton" -#: kdiff3.cpp:571 +#: kdiff3.cpp:570 #, kde-format msgid "Configure KDiff3..." msgstr "" -#: kdiff3.cpp:590 +#: kdiff3.cpp:589 #, kde-format msgid "Go to Current Delta" msgstr "" -#: kdiff3.cpp:590 +#: kdiff3.cpp:589 #, kde-format msgid "" "Current\n" "Delta" msgstr "" -#: kdiff3.cpp:592 +#: kdiff3.cpp:591 #, kde-format msgid "Go to First Delta" msgstr "" -#: kdiff3.cpp:592 +#: kdiff3.cpp:591 #, kde-format msgid "" "First\n" "Delta" msgstr "" -#: kdiff3.cpp:594 +#: kdiff3.cpp:593 #, kde-format msgid "Go to Last Delta" msgstr "" -#: kdiff3.cpp:594 +#: kdiff3.cpp:593 #, kde-format msgid "" "Last\n" "Delta" msgstr "" -#: kdiff3.cpp:596 +#: kdiff3.cpp:595 #, kde-format msgid "(Skips white space differences when \"Show White Space\" is disabled.)" msgstr "" -#: kdiff3.cpp:597 +#: kdiff3.cpp:596 #, kde-format msgid "" "(Does not skip white space differences even when \"Show White Space\" is " "disabled.)" msgstr "" -#: kdiff3.cpp:598 +#: kdiff3.cpp:597 #, kde-format msgid "Go to Previous Delta" msgstr "" -#: kdiff3.cpp:598 +#: kdiff3.cpp:597 #, kde-format msgid "" "Prev\n" "Delta" msgstr "" -#: kdiff3.cpp:600 +#: kdiff3.cpp:599 #, kde-format msgid "Go to Next Delta" msgstr "" -#: kdiff3.cpp:600 +#: kdiff3.cpp:599 #, kde-format msgid "" "Next\n" "Delta" msgstr "" -#: kdiff3.cpp:602 +#: kdiff3.cpp:601 #, kde-format msgid "Go to Previous Conflict" msgstr "" -#: kdiff3.cpp:602 +#: kdiff3.cpp:601 #, kde-format msgid "" "Prev\n" "Conflict" msgstr "" -#: kdiff3.cpp:604 +#: kdiff3.cpp:603 #, kde-format msgid "Go to Next Conflict" msgstr "" -#: kdiff3.cpp:604 +#: kdiff3.cpp:603 #, kde-format msgid "" "Next\n" "Conflict" msgstr "" -#: kdiff3.cpp:606 +#: kdiff3.cpp:605 #, kde-format msgid "Go to Previous Unsolved Conflict" msgstr "" -#: kdiff3.cpp:606 +#: kdiff3.cpp:605 #, kde-format msgid "" "Prev\n" "Unsolved" msgstr "" -#: kdiff3.cpp:608 +#: kdiff3.cpp:607 #, kde-format msgid "Go to Next Unsolved Conflict" msgstr "" -#: kdiff3.cpp:608 +#: kdiff3.cpp:607 #, kde-format msgid "" "Next\n" "Unsolved" msgstr "" -#: kdiff3.cpp:610 +#: kdiff3.cpp:609 #, kde-format msgid "Select Line(s) From A" msgstr "" -#: kdiff3.cpp:610 +#: kdiff3.cpp:609 #, kde-format msgid "" "Choose\n" "A" msgstr "" -#: kdiff3.cpp:611 +#: kdiff3.cpp:610 #, kde-format msgid "Select Line(s) From B" msgstr "" -#: kdiff3.cpp:611 +#: kdiff3.cpp:610 #, kde-format msgid "" "Choose\n" "B" msgstr "" -#: kdiff3.cpp:612 +#: kdiff3.cpp:611 #, kde-format msgid "Select Line(s) From C" msgstr "" -#: kdiff3.cpp:612 +#: kdiff3.cpp:611 #, kde-format msgid "" "Choose\n" "C" msgstr "" -#: kdiff3.cpp:613 +#: kdiff3.cpp:612 #, kde-format msgid "Automatically Go to Next Unsolved Conflict After Source Selection" msgstr "" -#: kdiff3.cpp:613 +#: kdiff3.cpp:612 #, kde-format msgid "" "Auto\n" "Next" msgstr "" -#: kdiff3.cpp:615 +#: kdiff3.cpp:614 #, kde-format msgid "Show Space && Tabulator Characters" msgstr "" -#: kdiff3.cpp:615 +#: kdiff3.cpp:614 #, kde-format msgid "" "White\n" "Characters" msgstr "" -#: kdiff3.cpp:616 +#: kdiff3.cpp:615 #, kde-format msgid "Show White Space" msgstr "" -#: kdiff3.cpp:616 +#: kdiff3.cpp:615 #, kde-format msgid "" "White\n" "Deltas" msgstr "" -#: kdiff3.cpp:618 +#: kdiff3.cpp:617 #, kde-format msgid "Show Line Numbers" msgstr "" -#: kdiff3.cpp:618 +#: kdiff3.cpp:617 #, kde-format msgid "" "Line\n" "Numbers" msgstr "" -#: kdiff3.cpp:620 +#: kdiff3.cpp:619 #, kde-format msgid "Automatically Solve Simple Conflicts" msgstr "" -#: kdiff3.cpp:621 +#: kdiff3.cpp:620 #, kde-format msgid "Set Deltas to Conflicts" msgstr "" -#: kdiff3.cpp:622 +#: kdiff3.cpp:621 #, kde-format msgid "Run Regular Expression Auto Merge" msgstr "" -#: kdiff3.cpp:623 +#: kdiff3.cpp:622 #, kde-format msgid "Automatically Solve History Conflicts" msgstr "" -#: kdiff3.cpp:624 +#: kdiff3.cpp:623 #, kde-format msgid "Split Diff At Selection" msgstr "" -#: kdiff3.cpp:625 +#: kdiff3.cpp:624 #, kde-format msgid "Join Selected Diffs" msgstr "" -#: kdiff3.cpp:627 +#: kdiff3.cpp:626 #, kde-format msgid "Show Window A" msgstr "" -#: kdiff3.cpp:628 +#: kdiff3.cpp:627 #, kde-format msgid "Show Window B" msgstr "" -#: kdiff3.cpp:629 +#: kdiff3.cpp:628 #, kde-format msgid "Show Window C" msgstr "" -#: kdiff3.cpp:631 +#: kdiff3.cpp:630 #, kde-format msgid "Normal Overview" msgstr "" -#: kdiff3.cpp:632 +#: kdiff3.cpp:631 #, kde-format msgid "A vs. B Overview" msgstr "" -#: kdiff3.cpp:633 +#: kdiff3.cpp:632 #, kde-format msgid "A vs. C Overview" msgstr "" -#: kdiff3.cpp:634 +#: kdiff3.cpp:633 #, kde-format msgid "B vs. C Overview" msgstr "" -#: kdiff3.cpp:635 +#: kdiff3.cpp:634 #, kde-format msgid "Word Wrap Diff Windows" msgstr "" -#: kdiff3.cpp:636 +#: kdiff3.cpp:635 #, kde-format msgid "Add Manual Diff Alignment" msgstr "" -#: kdiff3.cpp:637 +#: kdiff3.cpp:636 #, kde-format msgid "Clear All Manual Diff Alignments" msgstr "" -#: kdiff3.cpp:639 +#: kdiff3.cpp:638 #, kde-format msgid "Focus Next Window" msgstr "" -#: kdiff3.cpp:640 +#: kdiff3.cpp:639 #, kde-format msgid "Focus Prev Window" msgstr "" -#: kdiff3.cpp:641 +#: kdiff3.cpp:640 #, kde-format msgid "Toggle Split Orientation" msgstr "" -#: kdiff3.cpp:643 +#: kdiff3.cpp:642 #, kde-format msgid "Dir && Text Split Screen View" msgstr "" -#: kdiff3.cpp:645 +#: kdiff3.cpp:644 #, kde-format msgid "Toggle Between Dir && Text View" msgstr "" -#: kdiff3.cpp:697 pdiff.cpp:1909 +#: kdiff3.cpp:696 pdiff.cpp:1919 #, kde-format msgid "The merge result has not been saved." msgstr "" -#: kdiff3.cpp:699 +#: kdiff3.cpp:698 #, kde-format msgid "Save && Quit" msgstr "" -#: kdiff3.cpp:700 +#: kdiff3.cpp:699 #, kde-format msgid "Quit Without Saving" msgstr "" -#: kdiff3.cpp:708 pdiff.cpp:1920 +#: kdiff3.cpp:707 pdiff.cpp:1930 #, kde-format msgid "Saving the merge result failed." msgstr "" -#: kdiff3.cpp:719 pdiff.cpp:1032 +#: kdiff3.cpp:718 pdiff.cpp:1030 #, kde-format msgid "" "You are currently doing a directory merge. Are you sure, you want to abort?" msgstr "" -#: kdiff3.cpp:742 +#: kdiff3.cpp:741 #, kde-format msgid "Saving file..." msgstr "Konservante dosieron..." -#: kdiff3.cpp:759 +#: kdiff3.cpp:758 #, kde-format msgid "Saving file with a new filename..." msgstr "Konservante dosieron kun nova dosiernomo..." -#: kdiff3.cpp:761 +#: kdiff3.cpp:760 #, kde-format msgid "Save As..." msgstr "Konservi kiel..." -#: kdiff3.cpp:820 +#: kdiff3.cpp:819 #, kde-format msgid "Printing not implemented." msgstr "" -#: kdiff3.cpp:857 +#: kdiff3.cpp:858 #, kde-format msgid "Printing..." msgstr "Presante..." -#: kdiff3.cpp:943 +#: kdiff3.cpp:948 #, kde-format msgid "Printing page %1 of %2" msgstr "" -#: kdiff3.cpp:1000 +#: kdiff3.cpp:1006 #, fuzzy, kde-format #| msgid "Selection" msgid " (Selection)" msgstr "Elektaĵo" -#: kdiff3.cpp:1027 +#: kdiff3.cpp:1034 #, kde-format msgid "Printing completed." msgstr "" -#: kdiff3.cpp:1031 +#: kdiff3.cpp:1038 #, kde-format msgid "Printing aborted." msgstr "" -#: kdiff3.cpp:1038 +#: kdiff3.cpp:1045 #, kde-format msgid "Exiting..." msgstr "Finante..." -#: kdiff3.cpp:1049 +#: kdiff3.cpp:1056 #, kde-format msgid "Toggling toolbar..." msgstr "Inversigante ilobreton..." -#: kdiff3.cpp:1070 +#: kdiff3.cpp:1077 #, kde-format msgid "Toggle the statusbar..." msgstr "Inversigante la statobreton..." @@ -1540,7 +1545,7 @@ msgid "Joachim Eibl" msgstr "Joachim Eibl" -#: kdiff3_part.cpp:173 kdiff3_part.cpp:254 +#: kdiff3_part.cpp:174 kdiff3_part.cpp:255 #, kde-format msgid "Could not find files for comparison." msgstr "" @@ -1559,7 +1564,7 @@ msgstr "Agordi" #. i18n: ectx: ToolBar (mainToolBar) -#: kdiff3_part.rc:16 main.cpp:88 +#: kdiff3_part.rc:16 main.cpp:89 #, kde-format msgid "KDiff3" msgstr "" @@ -1627,198 +1632,204 @@ msgid "Main Toolbar" msgstr "Ĉefa ilobreto" -#: main.cpp:68 main.cpp:72 +#: main.cpp:69 main.cpp:73 #, kde-format msgid "Ignored. (User defined.)" msgstr "" -#: main.cpp:92 +#: main.cpp:93 #, kde-format msgid " (64 bit)" msgstr "" -#: main.cpp:94 +#: main.cpp:95 #, kde-format msgid " (32 bit)" msgstr "" -#: main.cpp:95 +#: main.cpp:96 #, kde-format msgid "Tool for Comparison and Merge of Files and Directories" msgstr "" -#: main.cpp:96 +#: main.cpp:97 #, kde-format msgid "(c) 2002-2014 Joachim Eibl, (c) 2017 Michael Reeves KF5/Qt5 port" msgstr "" -#: main.cpp:112 +#: main.cpp:113 #, kde-format msgid "Merge the input." msgstr "" -#: main.cpp:113 +#: main.cpp:114 #, kde-format msgid "Explicit base file. For compatibility with certain tools." msgstr "" -#: main.cpp:114 +#: main.cpp:115 #, kde-format msgid "Output file. Implies -m. E.g.: -o newfile.txt" msgstr "" -#: main.cpp:115 +#: main.cpp:116 #, kde-format msgid "Output file, again. (For compatibility with certain tools.)" msgstr "" -#: main.cpp:116 +#: main.cpp:118 #, kde-format msgid "No GUI if all conflicts are auto-solvable. (Needs -o file)" msgstr "" -#: main.cpp:117 +#: main.cpp:120 +#, fuzzy, kde-format +#| msgid "Ignore" +msgid "Ignored." +msgstr "Ignori" + +#: main.cpp:122 #, kde-format msgid "Do not solve conflicts automatically." msgstr "" -#: main.cpp:118 +#: main.cpp:123 #, kde-format msgid "Visible name replacement for input file 1 (base)." msgstr "" -#: main.cpp:119 +#: main.cpp:124 #, kde-format msgid "Visible name replacement for input file 2." msgstr "" -#: main.cpp:120 +#: main.cpp:125 #, kde-format msgid "Visible name replacement for input file 3." msgstr "" -#: main.cpp:121 +#: main.cpp:126 #, kde-format msgid "Alternative visible name replacement. Supply this once for every input." msgstr "" -#: main.cpp:122 +#: main.cpp:127 #, kde-format msgid "" "Override a config setting. Use once for every setting. E.g.: --cs " "\"AutoAdvance=1\"" msgstr "" -#: main.cpp:123 +#: main.cpp:128 #, kde-format msgid "Show list of config settings and current values." msgstr "" -#: main.cpp:124 +#: main.cpp:129 #, kde-format msgid "Use a different config file." msgstr "" -#: main.cpp:127 +#: main.cpp:132 #, kde-format msgid "file1 to open (base, if not specified via --base)" msgstr "" -#: main.cpp:128 +#: main.cpp:133 #, kde-format msgid "file2 to open" msgstr "" -#: main.cpp:129 +#: main.cpp:134 #, kde-format msgid "file3 to open" msgstr "" -#: main.cpp:153 +#: main.cpp:158 #, kde-format msgid "See kdiff3 --help for supported options." msgstr "" -#: mergeresultwindow.cpp:158 +#: mergeresultwindow.cpp:171 #, kde-format msgid "Choose A Everywhere" msgstr "" -#: mergeresultwindow.cpp:159 +#: mergeresultwindow.cpp:172 #, kde-format msgid "Choose B Everywhere" msgstr "" -#: mergeresultwindow.cpp:160 +#: mergeresultwindow.cpp:173 #, kde-format msgid "Choose C Everywhere" msgstr "" -#: mergeresultwindow.cpp:161 +#: mergeresultwindow.cpp:174 #, kde-format msgid "Choose A for All Unsolved Conflicts" msgstr "" -#: mergeresultwindow.cpp:162 +#: mergeresultwindow.cpp:175 #, kde-format msgid "Choose B for All Unsolved Conflicts" msgstr "" -#: mergeresultwindow.cpp:163 +#: mergeresultwindow.cpp:176 #, kde-format msgid "Choose C for All Unsolved Conflicts" msgstr "" -#: mergeresultwindow.cpp:164 +#: mergeresultwindow.cpp:177 #, kde-format msgid "Choose A for All Unsolved Whitespace Conflicts" msgstr "" -#: mergeresultwindow.cpp:165 +#: mergeresultwindow.cpp:178 #, kde-format msgid "Choose B for All Unsolved Whitespace Conflicts" msgstr "" -#: mergeresultwindow.cpp:166 +#: mergeresultwindow.cpp:179 #, kde-format msgid "Choose C for All Unsolved Whitespace Conflicts" msgstr "" -#: mergeresultwindow.cpp:176 +#: mergeresultwindow.cpp:204 #, kde-format msgid "Number of remaining unsolved conflicts: %1 (of which %2 are whitespace)" msgstr "" -#: mergeresultwindow.cpp:370 +#: mergeresultwindow.cpp:398 #, kde-format msgid "" "The output has been modified.\n" "If you continue your changes will be lost." msgstr "" -#: mergeresultwindow.cpp:936 pdiff.cpp:827 +#: mergeresultwindow.cpp:964 pdiff.cpp:817 #, kde-format msgid "All input files are binary equal." msgstr "" -#: mergeresultwindow.cpp:938 +#: mergeresultwindow.cpp:966 #, kde-format msgid "All input files contain the same text." msgstr "" -#: mergeresultwindow.cpp:942 mergeresultwindow.cpp:946 -#: mergeresultwindow.cpp:950 pdiff.cpp:833 pdiff.cpp:837 pdiff.cpp:841 +#: mergeresultwindow.cpp:970 mergeresultwindow.cpp:974 +#: mergeresultwindow.cpp:978 pdiff.cpp:823 pdiff.cpp:827 pdiff.cpp:831 #, kde-format msgid "Files %1 and %2 are binary equal.\n" msgstr "" -#: mergeresultwindow.cpp:944 mergeresultwindow.cpp:948 -#: mergeresultwindow.cpp:952 +#: mergeresultwindow.cpp:972 mergeresultwindow.cpp:976 +#: mergeresultwindow.cpp:980 #, kde-format msgid "Files %1 and %2 have equal text.\n" msgstr "" -#: mergeresultwindow.cpp:958 +#: mergeresultwindow.cpp:986 #, kde-format msgid "" "Total number of conflicts: %1\n" @@ -1827,27 +1838,27 @@ "%4" msgstr "" -#: mergeresultwindow.cpp:964 +#: mergeresultwindow.cpp:992 #, kde-format msgid "Conflicts" msgstr "" -#: mergeresultwindow.cpp:1873 +#: mergeresultwindow.cpp:1901 #, kde-format msgid "" msgstr "" -#: mergeresultwindow.cpp:1881 +#: mergeresultwindow.cpp:1909 #, kde-format msgid "" msgstr "" -#: mergeresultwindow.cpp:1883 mergeresultwindow.cpp:2755 +#: mergeresultwindow.cpp:1911 mergeresultwindow.cpp:2783 #, kde-format msgid "" msgstr "" -#: mergeresultwindow.cpp:2967 +#: mergeresultwindow.cpp:2995 #, fuzzy, kde-format #| msgid "" #| "Not all conflicts are solved yet.\n" @@ -1859,12 +1870,12 @@ "Not all conflicts are solved yet.\n" "Dosiero ne konservita.\n" -#: mergeresultwindow.cpp:2969 mergeresultwindow.cpp:2978 +#: mergeresultwindow.cpp:2997 mergeresultwindow.cpp:3006 #, kde-format msgid "Conflicts Left" msgstr "" -#: mergeresultwindow.cpp:2976 +#: mergeresultwindow.cpp:3004 #, kde-format msgid "" "There is a line end style conflict. Please choose the line end style " @@ -1872,7 +1883,7 @@ "File not saved." msgstr "" -#: mergeresultwindow.cpp:2990 +#: mergeresultwindow.cpp:3018 #, kde-format msgid "" "\n" @@ -1880,59 +1891,59 @@ "Creating backup failed. File not saved." msgstr "" -#: mergeresultwindow.cpp:2990 mergeresultwindow.cpp:3038 +#: mergeresultwindow.cpp:3018 mergeresultwindow.cpp:3066 #, kde-format msgid "File Save Error" msgstr "" -#: mergeresultwindow.cpp:3038 +#: mergeresultwindow.cpp:3066 #, kde-format msgid "Error while writing." msgstr "" -#: mergeresultwindow.cpp:3110 +#: mergeresultwindow.cpp:3138 #, fuzzy, kde-format #| msgid "Output" msgid "Output:" msgstr "Eligo" -#: mergeresultwindow.cpp:3123 mergeresultwindow.cpp:3315 +#: mergeresultwindow.cpp:3151 mergeresultwindow.cpp:3343 #, kde-format msgid "[Modified]" msgstr "" -#: mergeresultwindow.cpp:3130 +#: mergeresultwindow.cpp:3158 #, fuzzy, kde-format #| msgid "Encoding:" msgid "Encoding for saving:" msgstr "Kodigo:" -#: mergeresultwindow.cpp:3230 +#: mergeresultwindow.cpp:3258 #, kde-format msgid "Conflict" msgstr "Konflikto" -#: mergeresultwindow.cpp:3262 +#: mergeresultwindow.cpp:3290 #, kde-format msgid "Codec from A: %1" msgstr "" -#: mergeresultwindow.cpp:3264 +#: mergeresultwindow.cpp:3292 #, kde-format msgid "Codec from B: %1" msgstr "" -#: mergeresultwindow.cpp:3266 +#: mergeresultwindow.cpp:3294 #, kde-format msgid "Codec from C: %1" msgstr "" -#: optiondialog.cpp:119 +#: optiondialog.cpp:121 #, kde-format msgid "Change Font" msgstr "" -#: optiondialog.cpp:135 optiondialog.cpp:145 +#: optiondialog.cpp:137 optiondialog.cpp:147 #, kde-format msgid "" "Font: %1, %2, %3\n" @@ -1940,207 +1951,207 @@ "Example:" msgstr "" -#: optiondialog.cpp:388 +#: optiondialog.cpp:390 #, kde-format msgid "Unicode" msgstr "Unikodo" -#: optiondialog.cpp:389 +#: optiondialog.cpp:391 #, kde-format msgid "Latin1" msgstr "Latin1" -#: optiondialog.cpp:408 +#: optiondialog.cpp:410 #, kde-format msgid "Change this if non-ASCII characters are not displayed correctly." msgstr "" -#: optiondialog.cpp:491 +#: optiondialog.cpp:495 #, kde-format msgid "Configure" msgstr "Agordi" -#: optiondialog.cpp:568 +#: optiondialog.cpp:573 #, kde-format msgid "Font" msgstr "Tiparo" -#: optiondialog.cpp:570 +#: optiondialog.cpp:575 #, kde-format msgid "Editor & Diff Output Font" msgstr "" -#: optiondialog.cpp:589 +#: optiondialog.cpp:594 #, kde-format msgid "Application font" msgstr "" -#: optiondialog.cpp:594 +#: optiondialog.cpp:599 #, kde-format msgid "File view font" msgstr "" -#: optiondialog.cpp:613 +#: optiondialog.cpp:618 #, fuzzy, kde-format #| msgid "Color" msgctxt "Title for color settings page" msgid "Color" msgstr "Koloro" -#: optiondialog.cpp:614 +#: optiondialog.cpp:619 #, kde-format msgid "Colors Settings" msgstr "" -#: optiondialog.cpp:631 +#: optiondialog.cpp:644 #, kde-format msgid "Editor and Diff Views:" msgstr "" -#: optiondialog.cpp:639 +#: optiondialog.cpp:652 #, kde-format msgid "Foreground color:" msgstr "Malfona koloro:" -#: optiondialog.cpp:647 +#: optiondialog.cpp:660 #, kde-format msgid "Background color:" msgstr "Fona koloro:" -#: optiondialog.cpp:657 +#: optiondialog.cpp:670 #, kde-format msgid "Diff background color:" msgstr "" -#: optiondialog.cpp:666 +#: optiondialog.cpp:679 #, kde-format msgid "Color A:" msgstr "" -#: optiondialog.cpp:675 +#: optiondialog.cpp:688 #, kde-format msgid "Color B:" msgstr "" -#: optiondialog.cpp:684 +#: optiondialog.cpp:697 #, kde-format msgid "Color C:" msgstr "" -#: optiondialog.cpp:692 +#: optiondialog.cpp:705 #, kde-format msgid "Conflict color:" msgstr "" -#: optiondialog.cpp:701 +#: optiondialog.cpp:714 #, kde-format msgid "Current range background color:" msgstr "" -#: optiondialog.cpp:710 +#: optiondialog.cpp:723 #, kde-format msgid "Current range diff background color:" msgstr "" -#: optiondialog.cpp:718 +#: optiondialog.cpp:731 #, kde-format msgid "Color for manually aligned difference ranges:" msgstr "" -#: optiondialog.cpp:725 +#: optiondialog.cpp:738 #, kde-format msgid "Directory Comparison View:" msgstr "" -#: optiondialog.cpp:731 +#: optiondialog.cpp:744 #, kde-format msgid "Newest file color:" msgstr "" -#: optiondialog.cpp:736 +#: optiondialog.cpp:749 #, kde-format msgid "" "Changing this color will only be effective when starting the next directory " "comparison." msgstr "" -#: optiondialog.cpp:741 +#: optiondialog.cpp:754 #, kde-format msgid "Oldest file color:" msgstr "" -#: optiondialog.cpp:750 +#: optiondialog.cpp:763 #, kde-format msgid "Middle age file color:" msgstr "" -#: optiondialog.cpp:759 +#: optiondialog.cpp:772 #, kde-format msgid "Color for missing files:" msgstr "" -#: optiondialog.cpp:773 +#: optiondialog.cpp:786 #, kde-format msgid "Editor" msgstr "Redaktilo" -#: optiondialog.cpp:774 +#: optiondialog.cpp:787 #, kde-format msgid "Editor Behavior" msgstr "" -#: optiondialog.cpp:787 +#: optiondialog.cpp:809 #, kde-format msgid "Tab inserts spaces" msgstr "" -#: optiondialog.cpp:791 +#: optiondialog.cpp:813 #, kde-format msgid "" "On: Pressing tab generates the appropriate number of spaces.\n" "Off: A tab character will be inserted." msgstr "" -#: optiondialog.cpp:796 +#: optiondialog.cpp:818 #, kde-format msgid "Tab size:" msgstr "" -#: optiondialog.cpp:803 +#: optiondialog.cpp:825 #, kde-format msgid "Auto indentation" msgstr "" -#: optiondialog.cpp:807 +#: optiondialog.cpp:829 #, kde-format msgid "On: The indentation of the previous line is used for a new line.\n" msgstr "" -#: optiondialog.cpp:810 +#: optiondialog.cpp:832 #, kde-format msgid "Auto copy selection" msgstr "" -#: optiondialog.cpp:814 +#: optiondialog.cpp:836 #, kde-format msgid "" "On: Any selection is immediately written to the clipboard.\n" "Off: You must explicitly copy e.g. via Ctrl-C." msgstr "" -#: optiondialog.cpp:829 +#: optiondialog.cpp:851 #, kde-format msgid "" "Sets the line endings for when an edited file is saved.\n" "DOS/Windows: CR+LF; UNIX: LF; with CR=0D, LF=0A" msgstr "" -#: optiondialog.cpp:839 +#: optiondialog.cpp:861 #, kde-format msgid "Diff" msgstr "" -#: optiondialog.cpp:840 +#: optiondialog.cpp:862 #, kde-format msgid "Diff Settings" msgstr "" @@ -2154,12 +2165,12 @@ #. ); #. ++line; #. -#: optiondialog.cpp:865 +#: optiondialog.cpp:896 #, kde-format msgid "Ignore numbers (treat as white space)" msgstr "" -#: optiondialog.cpp:869 +#: optiondialog.cpp:900 #, kde-format msgid "" "Ignore number characters during line matching phase. (Similar to Ignore " @@ -2167,66 +2178,66 @@ "Might help to compare files with numeric data." msgstr "" -#: optiondialog.cpp:873 +#: optiondialog.cpp:904 #, kde-format msgid "Ignore C/C++ comments (treat as white space)" msgstr "" -#: optiondialog.cpp:876 +#: optiondialog.cpp:907 #, kde-format msgid "Treat C/C++ comments like white space." msgstr "" -#: optiondialog.cpp:879 +#: optiondialog.cpp:910 #, kde-format msgid "Ignore case (treat as white space)" msgstr "" -#: optiondialog.cpp:883 +#: optiondialog.cpp:914 #, kde-format msgid "Treat case differences like white space changes. ('a'<=>'A')" msgstr "" -#: optiondialog.cpp:886 +#: optiondialog.cpp:917 #, kde-format msgid "Preprocessor command:" msgstr "" -#: optiondialog.cpp:891 +#: optiondialog.cpp:922 #, kde-format msgid "User defined pre-processing. (See the docs for details.)" msgstr "" -#: optiondialog.cpp:894 +#: optiondialog.cpp:925 #, kde-format msgid "Line-matching preprocessor command:" msgstr "" -#: optiondialog.cpp:899 +#: optiondialog.cpp:930 #, kde-format msgid "" "This pre-processor is only used during line matching.\n" "(See the docs for details.)" msgstr "" -#: optiondialog.cpp:902 +#: optiondialog.cpp:933 #, kde-format msgid "Try hard (slower)" msgstr "" -#: optiondialog.cpp:906 +#: optiondialog.cpp:937 #, kde-format msgid "" "Enables the --minimal option for the external diff.\n" "The analysis of big files will be much slower." msgstr "" -#: optiondialog.cpp:910 +#: optiondialog.cpp:941 #, kde-format msgid "Align B and C for 3 input files" msgstr "" -#: optiondialog.cpp:914 +#: optiondialog.cpp:945 #, kde-format msgid "" "Try to align B and C when comparing or merging three input files.\n" @@ -2234,66 +2245,73 @@ "(Default is off.)" msgstr "" -#: optiondialog.cpp:926 +#: optiondialog.cpp:956 +#, fuzzy, kde-format +#| msgid "Merge" +msgctxt "Settings page" +msgid "Merge" +msgstr "Mergi" + +#: optiondialog.cpp:957 #, kde-format msgid "Merge Settings" msgstr "" -#: optiondialog.cpp:940 +#: optiondialog.cpp:980 #, kde-format msgid "Auto advance delay (ms):" msgstr "" -#: optiondialog.cpp:946 +#: optiondialog.cpp:986 #, kde-format 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 "" -#: optiondialog.cpp:950 +#: optiondialog.cpp:990 #, kde-format msgid "Show info dialogs" msgstr "" -#: optiondialog.cpp:953 +#: optiondialog.cpp:993 #, kde-format msgid "Show a dialog with information about the number of conflicts." msgstr "" -#: optiondialog.cpp:956 +#: optiondialog.cpp:996 #, kde-format msgid "White space 2-file merge default:" msgstr "" -#: optiondialog.cpp:961 optiondialog.cpp:974 +#: optiondialog.cpp:1001 optiondialog.cpp:1014 #, kde-format msgid "Manual Choice" msgstr "" -#: optiondialog.cpp:965 optiondialog.cpp:979 +#: optiondialog.cpp:1005 optiondialog.cpp:1019 #, kde-format msgid "" "Allow the merge algorithm to automatically select an input for white-space-" "only changes." msgstr "" -#: optiondialog.cpp:969 +#: optiondialog.cpp:1009 #, kde-format msgid "White space 3-file merge default:" msgstr "" -#: optiondialog.cpp:983 +#: optiondialog.cpp:1023 #, kde-format msgid "Automatic Merge Regular Expression" msgstr "" -#: optiondialog.cpp:991 smalldialogs.cpp:449 +#: optiondialog.cpp:1031 smalldialogs.cpp:459 #, kde-format msgid "Auto merge regular expression:" msgstr "" -#: optiondialog.cpp:996 +#: optiondialog.cpp:1036 #, kde-format msgid "" "Regular expression for lines where KDiff3 should automatically choose one " @@ -2302,29 +2320,29 @@ "- if available - C, otherwise B will be chosen." msgstr "" -#: optiondialog.cpp:1002 +#: optiondialog.cpp:1042 #, kde-format msgid "Run regular expression auto merge on merge start" msgstr "" -#: optiondialog.cpp:1005 +#: optiondialog.cpp:1045 #, kde-format msgid "" "Run the merge for auto merge regular expressions\n" "immediately when a merge starts.\n" msgstr "" -#: optiondialog.cpp:1010 +#: optiondialog.cpp:1050 #, kde-format msgid "Version Control History Merging" msgstr "" -#: optiondialog.cpp:1018 smalldialogs.cpp:476 +#: optiondialog.cpp:1058 smalldialogs.cpp:486 #, kde-format msgid "History start regular expression:" msgstr "" -#: optiondialog.cpp:1023 +#: optiondialog.cpp:1063 #, kde-format msgid "" "Regular expression for the start of the version control history entry.\n" @@ -2332,12 +2350,12 @@ "Default value: \".*\\$Log.*\\$.*\"" msgstr "" -#: optiondialog.cpp:1029 smalldialogs.cpp:504 +#: optiondialog.cpp:1069 smalldialogs.cpp:514 #, kde-format msgid "History entry start regular expression:" msgstr "" -#: optiondialog.cpp:1042 +#: optiondialog.cpp:1082 #, kde-format msgid "" "A version control history entry consists of several lines.\n" @@ -2349,22 +2367,22 @@ "See the documentation for details." msgstr "" -#: optiondialog.cpp:1050 +#: optiondialog.cpp:1090 #, kde-format msgid "History merge sorting" msgstr "" -#: optiondialog.cpp:1053 +#: optiondialog.cpp:1093 #, kde-format msgid "Sort version control history by a key." msgstr "" -#: optiondialog.cpp:1063 +#: optiondialog.cpp:1103 #, kde-format msgid "History entry start sort key order:" msgstr "" -#: optiondialog.cpp:1068 +#: optiondialog.cpp:1108 #, kde-format msgid "" "Each pair of parentheses used in the regular expression for the history " @@ -2376,37 +2394,37 @@ "See the documentation for details." msgstr "" -#: optiondialog.cpp:1079 +#: optiondialog.cpp:1119 #, kde-format msgid "Merge version control history on merge start" msgstr "" -#: optiondialog.cpp:1082 +#: optiondialog.cpp:1122 #, kde-format msgid "Run version control history automerge on merge start." msgstr "" -#: optiondialog.cpp:1086 +#: optiondialog.cpp:1126 #, kde-format msgid "Max number of history entries:" msgstr "" -#: optiondialog.cpp:1090 +#: optiondialog.cpp:1130 #, kde-format msgid "Cut off after specified number. Use -1 for infinite number of entries." msgstr "" -#: optiondialog.cpp:1094 +#: optiondialog.cpp:1134 #, kde-format msgid "Test your regular expressions" msgstr "" -#: optiondialog.cpp:1099 +#: optiondialog.cpp:1139 #, kde-format msgid "Irrelevant merge command:" msgstr "" -#: optiondialog.cpp:1104 +#: optiondialog.cpp:1144 #, kde-format msgid "" "If specified this script is run after automerge\n" @@ -2414,12 +2432,12 @@ "Called with the parameters: filename1 filename2 filename3" msgstr "" -#: optiondialog.cpp:1109 +#: optiondialog.cpp:1149 #, kde-format msgid "Auto save and quit on merge without conflicts" msgstr "" -#: optiondialog.cpp:1113 +#: optiondialog.cpp:1153 #, kde-format msgid "" "If KDiff3 was started for a file-merge from the command line and all\n" @@ -2428,27 +2446,27 @@ "(Similar to command line option \"--auto\".)" msgstr "" -#: optiondialog.cpp:1124 optiondialog.cpp:1125 +#: optiondialog.cpp:1164 optiondialog.cpp:1165 #, kde-format msgid "Directory" msgstr "Dosierujo" -#: optiondialog.cpp:1137 +#: optiondialog.cpp:1185 #, kde-format msgid "Recursive directories" msgstr "" -#: optiondialog.cpp:1140 +#: optiondialog.cpp:1188 #, kde-format msgid "Whether to analyze subdirectories or not." msgstr "" -#: optiondialog.cpp:1142 +#: optiondialog.cpp:1190 #, kde-format msgid "File pattern(s):" msgstr "" -#: optiondialog.cpp:1148 +#: optiondialog.cpp:1196 #, kde-format msgid "" "Pattern(s) of files to be analyzed. \n" @@ -2456,12 +2474,12 @@ "Several Patterns can be specified by using the separator: ';'" msgstr "" -#: optiondialog.cpp:1153 +#: optiondialog.cpp:1201 #, kde-format msgid "File-anti-pattern(s):" msgstr "" -#: optiondialog.cpp:1159 +#: optiondialog.cpp:1207 #, kde-format msgid "" "Pattern(s) of files to be excluded from analysis. \n" @@ -2469,12 +2487,12 @@ "Several Patterns can be specified by using the separator: ';'" msgstr "" -#: optiondialog.cpp:1164 +#: optiondialog.cpp:1212 #, kde-format msgid "Dir-anti-pattern(s):" msgstr "" -#: optiondialog.cpp:1170 +#: optiondialog.cpp:1218 #, kde-format msgid "" "Pattern(s) of directories to be excluded from analysis. \n" @@ -2482,58 +2500,58 @@ "Several Patterns can be specified by using the separator: ';'" msgstr "" -#: optiondialog.cpp:1175 +#: optiondialog.cpp:1223 #, kde-format msgid "Use .cvsignore" msgstr "" -#: optiondialog.cpp:1179 +#: optiondialog.cpp:1227 #, kde-format msgid "" "Extends the antipattern to anything that would be ignored by CVS.\n" "Via local \".cvsignore\" files this can be directory specific." msgstr "" -#: optiondialog.cpp:1183 +#: optiondialog.cpp:1231 #, kde-format msgid "Find hidden files and directories" msgstr "" -#: optiondialog.cpp:1186 +#: optiondialog.cpp:1234 #, kde-format msgid "Finds hidden files and directories." msgstr "" -#: optiondialog.cpp:1189 +#: optiondialog.cpp:1237 #, kde-format msgid "Follow file links" msgstr "" -#: optiondialog.cpp:1193 +#: optiondialog.cpp:1241 #, kde-format msgid "" "On: Compare the file the link points to.\n" "Off: Compare the links." msgstr "" -#: optiondialog.cpp:1197 +#: optiondialog.cpp:1245 #, kde-format msgid "Follow directory links" msgstr "" -#: optiondialog.cpp:1201 +#: optiondialog.cpp:1249 #, kde-format msgid "" "On: Compare the directory the link points to.\n" "Off: Compare the links." msgstr "" -#: optiondialog.cpp:1210 +#: optiondialog.cpp:1258 #, kde-format msgid "Case sensitive filename comparison" msgstr "" -#: optiondialog.cpp:1214 +#: optiondialog.cpp:1262 #, kde-format msgid "" "The directory comparison will compare files or directories when their names " @@ -2542,63 +2560,63 @@ "off, otherwise on.)" msgstr "" -#: optiondialog.cpp:1218 +#: optiondialog.cpp:1266 #, kde-format msgid "Unfold all subdirectories on load" msgstr "" -#: optiondialog.cpp:1222 +#: optiondialog.cpp:1270 #, kde-format msgid "" "On: Unfold all subdirectories when starting a directory diff.\n" "Off: Leave subdirectories folded." msgstr "" -#: optiondialog.cpp:1226 +#: optiondialog.cpp:1274 #, kde-format msgid "Skip directory status report" msgstr "" -#: optiondialog.cpp:1230 +#: optiondialog.cpp:1278 #, kde-format msgid "" "On: Do not show the Directory Comparison Status.\n" "Off: Show the status dialog on start." msgstr "" -#: optiondialog.cpp:1234 +#: optiondialog.cpp:1282 #, kde-format msgid "File Comparison Mode" msgstr "" -#: optiondialog.cpp:1239 +#: optiondialog.cpp:1287 #, kde-format msgid "Binary comparison" msgstr "" -#: optiondialog.cpp:1241 +#: optiondialog.cpp:1289 #, kde-format msgid "Binary comparison of each file. (Default)" msgstr "" -#: optiondialog.cpp:1244 +#: optiondialog.cpp:1292 #, kde-format msgid "Full analysis" msgstr "" -#: optiondialog.cpp:1246 +#: optiondialog.cpp:1294 #, kde-format msgid "" "Do a full analysis and show statistics information in extra columns.\n" "(Slower than a binary comparison, much slower for binary files.)" msgstr "" -#: optiondialog.cpp:1250 +#: optiondialog.cpp:1298 #, kde-format msgid "Trust the size and modification date (unsafe)" msgstr "" -#: optiondialog.cpp:1252 +#: optiondialog.cpp:1300 #, kde-format msgid "" "Assume that files are equal if the modification date and file length are " @@ -2608,14 +2626,14 @@ "Useful for big directories or slow networks." msgstr "" -#: optiondialog.cpp:1257 +#: optiondialog.cpp:1305 #, kde-format msgid "" "Trust the size and date, but use binary comparison if date does not match " "(unsafe)" msgstr "" -#: optiondialog.cpp:1259 +#: optiondialog.cpp:1307 #, kde-format msgid "" "Assume that files are equal if the modification date and file length are " @@ -2624,12 +2642,12 @@ "Useful for big directories or slow networks." msgstr "" -#: optiondialog.cpp:1264 +#: optiondialog.cpp:1312 #, kde-format msgid "Trust the size (unsafe)" msgstr "" -#: optiondialog.cpp:1266 +#: optiondialog.cpp:1314 #, kde-format msgid "" "Assume that files are equal if their file lengths are equal.\n" @@ -2637,12 +2655,12 @@ "download." msgstr "" -#: optiondialog.cpp:1273 +#: optiondialog.cpp:1321 #, kde-format msgid "Synchronize directories" msgstr "" -#: optiondialog.cpp:1277 +#: optiondialog.cpp:1325 #, kde-format msgid "" "Offers to store files in both directories so that\n" @@ -2650,24 +2668,24 @@ "Works only when comparing two directories without specifying a destination." msgstr "" -#: optiondialog.cpp:1283 +#: optiondialog.cpp:1331 #, kde-format msgid "White space differences considered equal" msgstr "" -#: optiondialog.cpp:1287 +#: optiondialog.cpp:1335 #, kde-format msgid "" "If files differ only by white space consider them equal.\n" "This is only active when full analysis is chosen." msgstr "" -#: optiondialog.cpp:1293 +#: optiondialog.cpp:1341 #, kde-format msgid "Copy newer instead of merging (unsafe)" msgstr "" -#: optiondialog.cpp:1297 +#: optiondialog.cpp:1345 #, kde-format msgid "" "Do not look inside, just take the newer file.\n" @@ -2675,46 +2693,46 @@ "Only effective when comparing two directories." msgstr "" -#: optiondialog.cpp:1302 +#: optiondialog.cpp:1350 #, kde-format msgid "Backup files (.orig)" msgstr "" -#: optiondialog.cpp:1306 +#: optiondialog.cpp:1354 #, kde-format msgid "" "If 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 "" -#: optiondialog.cpp:1382 optiondialog.cpp:1383 +#: optiondialog.cpp:1430 optiondialog.cpp:1431 #, kde-format msgid "Regional Settings" msgstr "" -#: optiondialog.cpp:1397 +#: optiondialog.cpp:1454 #, kde-format msgid "Use the same encoding for everything:" msgstr "" -#: optiondialog.cpp:1401 +#: optiondialog.cpp:1458 #, kde-format msgid "" "Enable this allows to change all encodings by changing the first only.\n" "Disable this if different individual settings are needed." msgstr "" -#: optiondialog.cpp:1405 +#: optiondialog.cpp:1462 #, kde-format msgid "Note: Local Encoding is \"%1\"" msgstr "" -#: optiondialog.cpp:1409 +#: optiondialog.cpp:1466 #, kde-format msgid "File Encoding for A:" msgstr "" -#: optiondialog.cpp:1416 +#: optiondialog.cpp:1473 #, kde-format msgid "" "If enabled then Unicode (UTF-16 or UTF-8) encoding will be detected.\n" @@ -2723,32 +2741,32 @@ "(Unicode detection depends on the first bytes of a file.)" msgstr "" -#: optiondialog.cpp:1419 optiondialog.cpp:1430 optiondialog.cpp:1441 +#: optiondialog.cpp:1476 optiondialog.cpp:1487 optiondialog.cpp:1498 #, kde-format msgid "Auto Detect Unicode" msgstr "" -#: optiondialog.cpp:1425 +#: optiondialog.cpp:1482 #, kde-format msgid "File Encoding for B:" msgstr "" -#: optiondialog.cpp:1436 +#: optiondialog.cpp:1493 #, kde-format msgid "File Encoding for C:" msgstr "" -#: optiondialog.cpp:1447 +#: optiondialog.cpp:1504 #, kde-format msgid "File Encoding for Merge Output and Saving:" msgstr "" -#: optiondialog.cpp:1452 +#: optiondialog.cpp:1509 #, kde-format msgid "Auto Select" msgstr "" -#: optiondialog.cpp:1456 +#: optiondialog.cpp:1513 #, kde-format msgid "" "If enabled then the encoding from the input files is used.\n" @@ -2756,39 +2774,39 @@ "saving." msgstr "" -#: optiondialog.cpp:1459 +#: optiondialog.cpp:1516 #, kde-format msgid "File Encoding for Preprocessor Files:" msgstr "" -#: optiondialog.cpp:1471 +#: optiondialog.cpp:1528 #, kde-format msgid "Right To Left Language" msgstr "" -#: optiondialog.cpp:1475 +#: optiondialog.cpp:1532 #, kde-format msgid "" "Some languages are read from right to left.\n" "This setting will change the viewer and editor accordingly." msgstr "" -#: optiondialog.cpp:1485 +#: optiondialog.cpp:1542 #, kde-format msgid "Integration" msgstr "" -#: optiondialog.cpp:1486 +#: optiondialog.cpp:1543 #, kde-format msgid "Integration Settings" msgstr "" -#: optiondialog.cpp:1499 +#: optiondialog.cpp:1564 #, kde-format msgid "Command line options to ignore:" msgstr "" -#: optiondialog.cpp:1505 +#: optiondialog.cpp:1570 #, kde-format msgid "" "List of command line options that should be ignored when KDiff3 is used by " @@ -2797,19 +2815,19 @@ "This will suppress the \"Unknown option\" error." msgstr "" -#: optiondialog.cpp:1510 +#: optiondialog.cpp:1575 #, kde-format msgid "Quit also via Escape key" msgstr "" -#: optiondialog.cpp:1514 +#: optiondialog.cpp:1579 #, kde-format msgid "" "Fast method to exit.\n" "For those who are used to using the Escape key." msgstr "" -#: optiondialog.cpp:1598 +#: optiondialog.cpp:1653 #, kde-format msgid "This resets all options. Not only those of the current topic." msgstr "" @@ -2859,77 +2877,68 @@ msgid "Disable Unsafe Options" msgstr "" -#: pdiff.cpp:158 +#: pdiff.cpp:160 #, kde-format msgid "Loading A" msgstr "" -#: pdiff.cpp:167 -#, kde-format -msgid "Errors occurred during pre-processing of file A." -msgstr "" +#: pdiff.cpp:162 +#, fuzzy, kde-format +#| msgid "Encoding:" +msgid "Loading A: %1" +msgstr "Kodigo:" -#: pdiff.cpp:172 +#: pdiff.cpp:170 #, kde-format msgid "Loading B" msgstr "" -#: pdiff.cpp:179 -#, kde-format -msgid "Errors occurred during pre-processing of file B." -msgstr "" - -#: pdiff.cpp:202 pdiff.cpp:241 +#: pdiff.cpp:201 pdiff.cpp:237 #, kde-format msgid "Diff: A <-> B" msgstr "" -#: pdiff.cpp:208 pdiff.cpp:279 pdiff.cpp:293 +#: pdiff.cpp:207 pdiff.cpp:275 pdiff.cpp:289 #, kde-format msgid "Linediff: A <-> B" msgstr "" -#: pdiff.cpp:225 +#: pdiff.cpp:224 #, kde-format msgid "Loading C" msgstr "" -#: pdiff.cpp:232 -#, kde-format -msgid "Errors occurred during pre-processing of file C." -msgstr "" - -#: pdiff.cpp:250 +#: pdiff.cpp:246 #, kde-format msgid "Diff: A <-> C" msgstr "" -#: pdiff.cpp:261 +#: pdiff.cpp:257 #, kde-format msgid "Diff: B <-> C" msgstr "" -#: pdiff.cpp:283 pdiff.cpp:297 +#: pdiff.cpp:279 pdiff.cpp:293 #, kde-format msgid "Linediff: B <-> C" msgstr "" -#: pdiff.cpp:287 pdiff.cpp:301 +#: pdiff.cpp:283 pdiff.cpp:297 #, kde-format msgid "Linediff: A <-> C" msgstr "" -#: pdiff.cpp:829 +#: pdiff.cpp:819 #, kde-format msgid "All input files contain the same text, but are not binary equal." msgstr "" -#: pdiff.cpp:835 pdiff.cpp:839 pdiff.cpp:843 +#: pdiff.cpp:825 pdiff.cpp:829 pdiff.cpp:833 #, kde-format msgid "Files %1 and %2 have equal text, but are not binary equal. \n" msgstr "" -#: pdiff.cpp:853 +#: pdiff.cpp:843 #, kde-format msgid "" "Some input files do not seem to be pure text files.\n" @@ -2937,17 +2946,17 @@ "Continue at your own risk." msgstr "" -#: pdiff.cpp:863 +#: pdiff.cpp:853 #, kde-format msgid ", B" msgstr "" -#: pdiff.cpp:865 +#: pdiff.cpp:855 #, kde-format msgid ", C" msgstr "" -#: pdiff.cpp:867 +#: pdiff.cpp:857 #, kde-format msgid "" "Some input characters could not be converted to valid unicode.\n" @@ -2956,77 +2965,72 @@ "Affected input files are in %1." msgstr "" -#: pdiff.cpp:1034 +#: pdiff.cpp:1032 #, kde-format msgid "Abort" msgstr "Ĉesigi" -#: pdiff.cpp:1040 pdiff.cpp:1130 +#: pdiff.cpp:1038 pdiff.cpp:1129 #, kde-format msgid "Opening files..." msgstr "" -#: pdiff.cpp:1107 -#, kde-format -msgid "File open error" -msgstr "" - -#: pdiff.cpp:1202 +#: pdiff.cpp:1212 #, kde-format msgid "Cutting selection..." msgstr "Eltondanta elekton..." -#: pdiff.cpp:1223 +#: pdiff.cpp:1233 #, kde-format msgid "Copying selection to clipboard..." msgstr "Kopianta elekton al tondujo..." -#: pdiff.cpp:1239 +#: pdiff.cpp:1249 #, kde-format msgid "Inserting clipboard contents..." msgstr "Enmetanta tondujan enhavon..." -#: pdiff.cpp:1695 +#: pdiff.cpp:1705 #, kde-format msgid "Word wrap (Cancel disables word wrap)" msgstr "" -#: pdiff.cpp:1696 +#: pdiff.cpp:1706 #, kde-format msgid "Calculating max width for horizontal scrollbar" msgstr "" -#: pdiff.cpp:1911 +#: pdiff.cpp:1921 #, kde-format msgid "Save && Continue" msgstr "" -#: pdiff.cpp:1912 +#: pdiff.cpp:1922 #, kde-format msgid "Continue Without Saving" msgstr "" -#: pdiff.cpp:2124 +#: pdiff.cpp:2134 #, kde-format msgid "Search complete." msgstr "" -#: pdiff.cpp:2124 +#: pdiff.cpp:2134 #, kde-format msgid "Search Complete" msgstr "" -#: pdiff.cpp:2375 +#: pdiff.cpp:2385 #, kde-format msgid "Nothing is selected in either diff input window." msgstr "" -#: pdiff.cpp:2375 +#: pdiff.cpp:2385 #, kde-format msgid "Error while adding manual diff range" msgstr "" -#: progress.cpp:59 progress.cpp:71 +#: progress.cpp:61 progress.cpp:73 #, kde-format msgid "&Cancel" msgstr "&Rezigni" @@ -3036,189 +3040,189 @@ msgid "A (Base):" msgstr "" -#: smalldialogs.cpp:68 smalldialogs.cpp:85 smalldialogs.cpp:102 -#: smalldialogs.cpp:144 +#: smalldialogs.cpp:71 smalldialogs.cpp:90 smalldialogs.cpp:109 +#: smalldialogs.cpp:154 #, kde-format msgid "File..." msgstr "Dosiero..." -#: smalldialogs.cpp:70 smalldialogs.cpp:87 smalldialogs.cpp:104 -#: smalldialogs.cpp:146 +#: smalldialogs.cpp:73 smalldialogs.cpp:92 smalldialogs.cpp:111 +#: smalldialogs.cpp:156 #, kde-format msgid "Dir..." msgstr "" -#: smalldialogs.cpp:96 +#: smalldialogs.cpp:103 #, kde-format msgid "C (Optional):" msgstr "" -#: smalldialogs.cpp:119 +#: smalldialogs.cpp:126 #, kde-format msgid "Swap/Copy Names..." msgstr "" -#: smalldialogs.cpp:124 smalldialogs.cpp:125 smalldialogs.cpp:126 +#: smalldialogs.cpp:131 smalldialogs.cpp:132 smalldialogs.cpp:133 #, kde-format msgid "Swap %1<->%2" msgstr "" -#: smalldialogs.cpp:127 smalldialogs.cpp:128 smalldialogs.cpp:129 +#: smalldialogs.cpp:134 smalldialogs.cpp:135 smalldialogs.cpp:136 #, kde-format msgid "Copy %1->Output" msgstr "" -#: smalldialogs.cpp:130 smalldialogs.cpp:131 smalldialogs.cpp:132 +#: smalldialogs.cpp:137 smalldialogs.cpp:138 smalldialogs.cpp:139 #, kde-format msgid "Swap %1<->Output" msgstr "" -#: smalldialogs.cpp:138 +#: smalldialogs.cpp:148 #, kde-format msgid "Output (optional):" msgstr "" -#: smalldialogs.cpp:168 +#: smalldialogs.cpp:178 #, kde-format msgid "Configure..." msgstr "Agordu..." -#: smalldialogs.cpp:233 +#: smalldialogs.cpp:243 #, fuzzy, kde-format #| msgid "Directory" msgid "Open Directory" msgstr "Dosierujo" -#: smalldialogs.cpp:234 +#: smalldialogs.cpp:244 #, kde-format msgid "Select Output File" msgstr "" -#: smalldialogs.cpp:393 +#: smalldialogs.cpp:403 #, kde-format msgid "Search text:" msgstr "" -#: smalldialogs.cpp:400 +#: smalldialogs.cpp:410 #, kde-format msgid "Case sensitive" msgstr "Usklecodistinga" -#: smalldialogs.cpp:403 +#: smalldialogs.cpp:413 #, kde-format msgid "Search A" msgstr "" -#: smalldialogs.cpp:408 +#: smalldialogs.cpp:418 #, kde-format msgid "Search B" msgstr "" -#: smalldialogs.cpp:413 +#: smalldialogs.cpp:423 #, kde-format msgid "Search C" msgstr "" -#: smalldialogs.cpp:418 +#: smalldialogs.cpp:428 #, kde-format msgid "Search output" msgstr "" -#: smalldialogs.cpp:425 +#: smalldialogs.cpp:435 #, kde-format msgid "&Search" msgstr "&Serĉi" -#: smalldialogs.cpp:444 +#: smalldialogs.cpp:454 #, kde-format msgid "Regular Expression Tester" msgstr "" -#: smalldialogs.cpp:457 +#: smalldialogs.cpp:467 #, kde-format msgid "Example auto merge line:" msgstr "" -#: smalldialogs.cpp:459 +#: smalldialogs.cpp:469 #, kde-format msgid "To test auto merge, copy a line as used in your files." msgstr "" -#: smalldialogs.cpp:465 smalldialogs.cpp:493 smalldialogs.cpp:529 +#: smalldialogs.cpp:475 smalldialogs.cpp:503 smalldialogs.cpp:539 #, kde-format msgid "Match result:" msgstr "" -#: smalldialogs.cpp:484 +#: smalldialogs.cpp:494 #, kde-format msgid "Example history start line (with leading comment):" msgstr "" -#: smalldialogs.cpp:486 +#: smalldialogs.cpp:496 #, kde-format msgid "" "Copy a history start line as used in your files,\n" "including the leading comment." msgstr "" -#: smalldialogs.cpp:512 +#: smalldialogs.cpp:522 #, kde-format msgid "History sort key order:" msgstr "" -#: smalldialogs.cpp:520 +#: smalldialogs.cpp:530 #, kde-format msgid "Example history entry start line (without leading comment):" msgstr "" -#: smalldialogs.cpp:522 +#: smalldialogs.cpp:532 #, kde-format msgid "" "Copy a history entry start line as used in your files,\n" "but omit the leading comment." msgstr "" -#: smalldialogs.cpp:536 +#: smalldialogs.cpp:546 #, kde-format msgid "Sort key result:" msgstr "" -#: smalldialogs.cpp:584 smalldialogs.cpp:594 smalldialogs.cpp:614 +#: smalldialogs.cpp:594 smalldialogs.cpp:604 smalldialogs.cpp:624 #, kde-format msgid "Match success." msgstr "" -#: smalldialogs.cpp:588 smalldialogs.cpp:598 smalldialogs.cpp:620 +#: smalldialogs.cpp:598 smalldialogs.cpp:608 smalldialogs.cpp:630 #, kde-format msgid "Match failed." msgstr "" -#: smalldialogs.cpp:605 +#: smalldialogs.cpp:615 #, kde-format msgid "Opening and closing parentheses do not match in regular expression." msgstr "" -#: SourceData.cpp:150 +#: SourceData.cpp:153 #, kde-format msgid "Writing clipboard data to temp file failed." msgstr "" -#: SourceData.cpp:154 +#: SourceData.cpp:157 #, kde-format msgid "From Clipboard" msgstr "" -#: SourceData.cpp:335 +#: SourceData.cpp:348 #, kde-format msgid "%1 is not a normal file." msgstr "" -#: SourceData.cpp:427 +#: SourceData.cpp:440 #, kde-format msgid " Temp file is: %1" msgstr "" -#: SourceData.cpp:432 +#: SourceData.cpp:445 #, kde-format msgid "" "Preprocessing possibly failed. Check this command:\n" @@ -3228,12 +3232,12 @@ "The preprocessing command will be disabled now." msgstr "" -#: SourceData.cpp:443 SourceData.cpp:512 +#: SourceData.cpp:456 SourceData.cpp:525 #, kde-format msgid "File %1 too large to process. Skipping." msgstr "" -#: SourceData.cpp:487 +#: SourceData.cpp:500 #, kde-format msgid "" "The line-matching-preprocessing possibly failed. Check this command:\n" diff -Nru kdiff3-1.8.01/po/es/diff_ext.po kdiff3-1.8.3/po/es/diff_ext.po --- kdiff3-1.8.01/po/es/diff_ext.po 2019-05-18 01:01:56.000000000 +0000 +++ kdiff3-1.8.3/po/es/diff_ext.po 2020-06-25 00:18:14.000000000 +0000 @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: diff_ext\n" -"Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2019-03-22 03:09+0100\n" +"Report-Msgid-Bugs-To: https://bugs.kde.org\n" +"POT-Creation-Date: 2019-11-04 07:54+0100\n" "PO-Revision-Date: 2018-12-09 22:39+0100\n" "Last-Translator: Eloy Cuadra \n" "Language-Team: Spanish \n" @@ -19,121 +19,116 @@ "Plural-Forms: nplurals=2; plural=n != 1;\n" "X-Generator: Lokalize 2.0\n" -#: diff_ext.cpp:391 +#: diff_ext.cpp:223 #, kde-format msgid "Compare with %1" msgstr "Comparar con %1" -#: diff_ext.cpp:392 +#: diff_ext.cpp:224 #, kde-format msgid "Merge with %1" msgstr "Fusionar con %1" -#: diff_ext.cpp:408 +#: diff_ext.cpp:234 #, kde-format msgid "3-way merge with base" msgstr "Fusión de 3 vías con la base" -#: diff_ext.cpp:411 +#: diff_ext.cpp:237 #, kde-format msgid "Save '%1' for later" msgstr "Guardar «%1» para más tarde" -#: diff_ext.cpp:426 +#: diff_ext.cpp:251 #, kde-format msgid "Compare with ..." msgstr "Comparar con..." -#: diff_ext.cpp:429 +#: diff_ext.cpp:254 #, kde-format msgid "Clear list" msgstr "Borrar la lista" -#: diff_ext.cpp:434 +#: diff_ext.cpp:259 #, kde-format msgid "Compare" msgstr "Comparar" -#: diff_ext.cpp:438 +#: diff_ext.cpp:263 #, kde-format msgid "3 way comparison" msgstr "Comparación de 3 vías" -#: diff_ext.cpp:444 +#: diff_ext.cpp:269 #, kde-format msgid "About Diff-Ext ..." msgstr "Acerca de Diff-Ext..." -#: diff_ext.cpp:515 +#: diff_ext.cpp:340 #, kde-format msgid "(32 Bit)" msgstr "(32 bits)" -#: diff_ext.cpp:517 -#, kde-format -msgid "(64 Bit)" -msgstr "(64 bits)" - -#: diff_ext.cpp:518 +#: diff_ext.cpp:342 #, kde-format msgid "Diff-Ext Copyright (c) 2003-2006, Sergey Zorin. All rights reserved.\n" msgstr "" "Diff-Ext Copyright © 2003-2006, Sergey Zorin. Todos los derechos " "reservados.\n" -#: diff_ext.cpp:519 +#: diff_ext.cpp:343 #, kde-format msgid "This software is distributable under the BSD-2-Clause license.\n" msgstr "" "Este software se puede distribuir bajo la licencia BSD de 2 cláusulas.\n" -#: diff_ext.cpp:520 +#: diff_ext.cpp:344 #, kde-format msgid "Some extensions for KDiff3 (c) 2006-2013 by Joachim Eibl.\n" msgstr "Algunas extensiones para KDiff3 © 2006-2013 por Joachim Eibl.\n" -#: diff_ext.cpp:521 +#: diff_ext.cpp:345 #, kde-format msgid "Homepage for Diff-Ext: http://diff-ext.sourceforge.net\n" msgstr "Página web de Diff-Ext: http://diff-ext.sourceforge.net\n" -#: diff_ext.cpp:522 +#: diff_ext.cpp:346 #, kde-format msgid "About Diff-Ext for KDiff3 " msgstr "Acerca de Diff-Ext para KDiff3" -#: diff_ext.cpp:551 +#: diff_ext.cpp:375 #, kde-format msgid "Compare selected files" msgstr "Comparar los archivos seleccionados" -#: diff_ext.cpp:557 diff_ext.cpp:577 +#: diff_ext.cpp:381 diff_ext.cpp:399 #, kde-format msgid "Compare '%1' with '%2'" msgstr "Comparar «%1» con «%2»" -#: diff_ext.cpp:563 +#: diff_ext.cpp:386 #, kde-format msgid "Save '%1' for later operation" msgstr "Guardar «%1» para su uso posterior" -#: diff_ext.cpp:619 +#: diff_ext.cpp:440 #, kde-format msgid "Could not start KDiff3. Please rerun KDiff3 installation." msgstr "" "No se ha podido iniciar KDiff3. Vuelva a realizar la instalación de KDiff3." -#: diff_ext.cpp:620 +#: diff_ext.cpp:441 #, kde-format msgid "Command" msgstr "Orden" -#: diff_ext.cpp:621 +#: diff_ext.cpp:442 #, kde-format msgid "CommandLine" msgstr "Línea de órdenes" -#: diff_ext.cpp:622 +#: diff_ext.cpp:443 #, kde-format msgid "Diff-Ext For KDiff3" msgstr "Diff-Ext para KDiff3" \ No newline at end of file diff -Nru kdiff3-1.8.01/po/es/docs/kdiff3/index.docbook kdiff3-1.8.3/po/es/docs/kdiff3/index.docbook --- kdiff3-1.8.01/po/es/docs/kdiff3/index.docbook 1970-01-01 00:00:00.000000000 +0000 +++ kdiff3-1.8.3/po/es/docs/kdiff3/index.docbook 2020-06-25 00:19:15.000000000 +0000 @@ -0,0 +1,2931 @@ + +KDiff3"> + + +]> + + + + + + +El manual de &kdiff3; + + +Michael Reeves
reeves.87@gmail.com
Joachim Eibl
joachim.eibl at gmx.de +
 + + Santiago Fernández Sancho
santi@kde-es.org
 Traductor + + + +2002-2007 +Joachim Eibl + + +2017-2019 +Michael Reeves + + + +&FDLNotice; + + + +2019-02-22 +1.08.02 + + + +&kdiff3; es una herramienta para ver diferencias y fusionar archivos y directorios que: +Compara y fusiona dos o tres archivos o directorios de texto. +Muestra las diferencias línea a línea y carácter a carácter (!). +Proporciona una utilidad de fusión automática. +Tiene un editor para resolver de forma cómoda los conflictos de fusión. +Proporciona transparencia de red a través de KIO. +Tiene opciones para resaltar u ocultar los cambios en los espacios en blanco o en los comentarios. +Permite usar Unicode, UTF-8 y otras codificaciones de archivo. +Imprime diferencias. +Permite claves de control de versiones e historial de fusiones. + +Este documento describe la versión 1.8 de &kdiff3;. + + + + + +KDE +kdiff3 +diferencia +fusión +CVS +triple diferencia +comparar +archivos +directorios +control de versiones +fusión del árbol +diferencias en línea +sincronización +kpart +kio +transparencia de red +editor +espacio en blanco +comentarios + + + + +Introducción +¿Otra interfaz para diff? +Ya existen varias herramientas gráficas para diff. ¿Por qué elegir &kdiff3;? Déjeme decirle por qué lo escribí. &kdiff3; se inició debido a la dificultad para hacer la fusión. La fusión es necesaria cuando varias personas trabajan sobre los mismos archivos en un proyecto. Una fusión puede ser algo automatizado, cuando la herramienta de fusión no solo tiene nuevos archivos modificados (llamados «ramas»), sino también el archivo original (llamado «base»). La herramienta de fusión seleccionará automáticamente cualquier modificación que se haga solo en una rama. Cuando varios colaboradores cambian la misma línea, la herramienta detecta un conflicto que deberá resolverse manualmente. La fusión se vuelve difícil porque, por ejemplo, un colaborador cambió muchas cosas y corrigió el sangrado en algunos lugares. Otro colaborador también cambió mucho texto en el mismo archivo, y todo esto dio como resultado varios conflictos durante la fusión. La herramienta que utilizaba, solo mostraba las líneas cambiadas, pero no los cambios hechos en estas líneas. Y no había información sobre los cambios en el sangrado. La fusión era una pequeña pesadilla. Por eso empecé. La primera versión podía mostrar las diferencias en un línea y las diferencias en los espacios en blanco. Después se añadieron otras características para incrementar la utilidad. Por ejemplo, si desea comparar algún texto rápidamente, podrá copiarlo al portapapeles y pegarlo en otra ventana de diff. Una característica que requería un enorme esfuerzo era la capacidad de comparar y fusionar directorios, que convirtió el programa en un navegador de archivos completo. Espero que &kdiff3; le funcione también. ¡Diviértase! Joachim Eibl (2003) + + +Capturas de pantalla y características +Esta captura de pantalla muestra la diferencia entre dos archivos de texto. +(Utilizando una versión temprana de &kdiff3;): + + + + +Existe 3 formas de fusión totalmente implementadas. Resulta útil si dos personas modifican código de forma independiente. El archivo original (la base) se usa para ayudar a &kdiff3; a seleccionar automáticamente los cambios correctos. El editor de fusión que hay debajo de la ventana de diferencias le permite resolver los conflictos, a la vez que le muestra la salida. También podrá editar la salida. Esta captura de pantalla muestra tres archivos de entrada que se pueden fusionar: + + + + + +&kdiff3; también le ayuda a comparar y fusionar directorios completos. Esta captura muestra &kdiff3; durante la fusión de un directorio: + + + + + + +Más características +Visor de diferencias línea a línea y carácter a carácter +Usando las posibilidades de un visor gráfico a color &kdiff3;, muestra con exactitud cuál es la diferencia. Cuando haga algunas revisiones de código, obtendrá algo parecido a esto. + + + + + +Ver diferencias de espacios en blanco de un vistazo +Los espacios y tabulaciones que difieren se muestran visiblemente. Cuando las líneas difieren solo en la cantidad de espacios en blanco puede verse de un vistazo en la columna resumen en la parte izquierda (no más preocupaciones cuando se hagan cambios en el sangrado). + + + + + +Triple diferencia +Analiza tres archivos y ve dónde está la diferencia. Las ventanas izquierda/central/derecha se llamarán A/B/C y tendrán los colores azul/verde/gris respectivamente. Si un archivo es igual y el otro es diferente en una línea, el color mostrado en el archivo será diferente. El color rojo significa que ambos archivos son diferentes. + + + + + +Fusión cómoda de dos o tres archivos de entrada +&kdiff3; puede utilizarse para fusionar dos o tres archivos de entrada y hacer la fusión todo lo automática que sea posible. El resultado se presentará en una ventana editable donde se podrán resolver la mayor parte de los conflictos con una pulsación de ratón: Seleccione los botones A/B/C de la barra de botones para seleccionar la fuente que se utilizará. También podrá seleccionar más de una fuente. Como la ventana de salida es un editor aunque los conflictos puedan necesitar correcciones más profundas, este hecho puede resolverse aquí sin ninguna herramienta adicional. + + +Y... + + Navegación rápida a través de los botones. + Una pulsación del ratón en la columna resumen sincronizará todas las ventanas para mostrar la misma posición. + Seleccione una copia desde cualquier ventana y péguela en la ventana de fusión del resultado. + Columna de vista general que muestra los cambios y conflictos. + Los colores pueden ajustarse a sus preferencias. + Tamaño de pestaña ajustable. + Opción de insertar espacios en lugar de tabuladores. + Abrir archivos cómodamente a través de un diálogo o especificando archivos en la línea de órdenes. + Buscar cadenas en todas las ventanas de texto. Buscar (Ctrl-F) y Buscar siguiente (F3). + Mostrar los números de línea. + Pegar el portapapeles y arrastrar texto a una ventana de diferencias. + Transferencia de red a través de KIO. + Puede utilizarse como visor de diff en KDevelop 3. + Ajuste de línea para las líneas largas. + Uso de Unicode, UTF-8 y otras codificaciones. + Uso de idiomas que se escriben de derecha a izquierda. + ... + + + + + +Comparación y fusión de archivos + +Opciones de la línea de órdenes + +Comparar 2 archivos: +kdiff3 archivo1 archivo2 + + + +Fusionar 2 archivos: +kdiff3 archivo1 archivo2 -m + kdiff3 archivo1 archivo2 -o archivosalida + + + +Comparar 3 archivos: +kdiff3 archivo1 archivo2 archivo3 + + + +Fusionar 3 archivos: +kdiff3 archivo1 archivo2 archivo3 -m + kdiff3 archivo1 archivo2 archivo3 -o archivosalida + +Tenga en cuenta que archivo1 será tratado como base de archivo2 y archivo3. + + +Caso especial: Archivos con el mismo nombre +Si todos los archivos tienen el mismo nombre pero están en directorios diferentes, puede reducir el tipo de trabajo especificando el nombre del archivo solo para el primer archivo. Por ejemplo: +kdiff3 directorio1/nombrearchivo directorio2 directorio3 + + + +Línea de órdenes para iniciar la comparación o fusión de un directorio: +Es muy similar, pero ahora sobre directorios. +kdiff3 directorio1 directorio2 + kdiff3 directorio1 directorio2 -o directoriodestino + kdiff3 directorio1 directorio2 directorio3 + kdiff3 directorio1 directorio2 directorio3 -o directoriodestino + +Para la comparación y fusión de directorios puede continuar leyendo aquí. + + +Opciones de la línea de órdenes +Para obtener más información sobre las opciones de la línea de órdenes utilice: +kdiff3 --help + +Ejemplo de salida: +Opciones: + -m, --merge Fusiona la entrada. + -b, --base archivo Archivo base explícito. Por compatibilidad con ciertas herramientas. + -o, --output archivo Archivo de salida. Supone -m. Ejem.: -o nuevoarchivo.txt + --out archivo Archivo de salida, de nuevo. (Por compatibilidad con ciertas herramientas.) + --auto Sin interfaz si todos los conflictos se resuelven de forma automática. (Necesita -o archivo) + --qall No resuelve los conflictos automáticamente. (Por compatibilidad...) + --L1 alias1 Reemplazo de nombre visible para la entrada del archivo 1 (base). + --L2 alias2 Reemplazo de nombre visible para la entrada del archivo 2. + --L3 alias3 Reemplazo de nombre visible para la entrada del archivo 3. + -L, --fname alias Reemplazo de nombre visible alternativo. Proporcione este una vez para cada entrada. + --cs string Sobrescribe la configuración. Utilícelo una vez para cada opción. Por ejemplo: --cs "AutoAdvance=1" + --confighelp Muestra la lista de las opciones de configuración y sus valores actuales. + --config file Utiliza un archivo de configuración diferente. + +La opción le permite ajustar un valor de configuración que de otra forma solo sería ajustable a través del diálogo de configuración. Pero asegúrese de que cuando &kdiff3; finalice se guarden los valores con las configuraciones nuevas. Con puede encontrar los nombres de los elementos disponibles y los valores actuales. +A través de puede especificar un archivo de configuración diferente. Cuando utilice con frecuencia diferentes configuraciones para &kdiff3; esto le permitirá cambiar entre ellas. + +Opciones de la línea de órdenes que se ignoran +Mucha gente quiere utilizar &kdiff3; con algún sistema de control de versiones. Pero cuando el sistema de control de versiones llama a &kdiff3; utilizando los parámetros de la línea de órdenes &kdiff3; no los reconoce, y termina con un error. Las preferencias de integración le permiten especificar los parámetros de línea de órdenes que &kdiff3; debería ignorar. Aparecerán en la ayuda de uso, de forma similar a este ejemplo: +--foo Ignored. (Definida por el usuario.) + + + Opciones de la línea de órdenes a ignorar:Una lista de opciones separadas por punto y coma «;». Cuando aparezca una de estas opciones en una línea de órdenes, &kdiff3; la ignorará y se ejecutará sin informar de ningún error (el valor predeterminado es «u;query;html;abort»). + +Si esto no es suficiente, se recomienda escribir un script para el intérprete de órdenes que traduzcan esta opción. + + + + +Diálogo abrir +Como se pueden seleccionar varios archivos de entrada, el programa tiene un diálogo de apertura especial: + + + +El diálogo abrir le permite editar los nombres de los archivos manualmente, seleccionando un archivo a través del navegador de archivos («Archivo...») o permitir la elección de los archivos recientes a través de las listas desplegables. Si abre el diálogo nuevamente, el nombre actual continúa ahí. El tercer archivo de entrada no es necesario. si la entrada para «C» permanece vacía, solo se efectuará el análisis de diferencia de dos archivos. Puede seleccionar un directorio a través de «Dir...». Si se especifica un directorio para A entonces comienza la comparación/fusión de directorios. Si en A especifica un archivo y en B, C o en la salida se especifica un directorio, &kdiff3; usa el nombre del archivo de A en los directorios especificados. Si está seleccionado «Fusionar», la línea de «Salida» será editable. Pero no se necesita especificar el nombre de archivo de salida de forma inmediata. Puede posponerlo hasta que lo guarde. El botón «Configurar...» abre el diálogo de opciones, de forma que pueda seleccionar las opciones antes de realizar el análisis. + + +Pegar y soltar la entrada +Algunas veces deseará comparar partes de un texto que no sea propiamente un archivo. &kdiff3; también le permite pegar texto desde el portapapeles a la ventana de entrada de diff que tenga el foco. El análisis de las diferencias se producirá inmediatamente. En el diálogo abrir no necesitará especificar archivos entonces, ciérrelo con el botón «Cancelar». También podrá utilizar arrastrar y soltar: Arrastre un archivo desde un administrador de archivos o seleccione texto en un editor y arrástrelo a la ventana de entrada. ¿Cuál es la idea? Algunas veces un archivo contiene dos funciones similares, pero comprobar las similitudes es un esfuerzo enorme si primero debe crear los archivos y luego cargarlos. Ahora bastará con copiar, pegar y comparar las secciones relevantes. Nota: En estos momentos no podrá arrastrar nada desde &kdiff3;. Solo está permitido en la ventana de entrada diff. Aviso: Algunos editores todavía interpretan arrastrar y soltar en otro programa como cortar (en lugar de copiar) y pegar. En este caso sus datos originales se perderían. + + +Interpretar la información en las ventanas de entrada + + + +Línea de informaciónEn la parte superior de cada ventana de texto se encuentra la «línea de información». Las líneas de información de las ventanas de entrada contienen una letra «A», «B» y «C», el nombre del archivo, un botón para el navegador, y el número de línea de la primera línea visible en la ventana (recuerde que la ventana «C» es opcional). Cada línea de información aparecerá con un color diferente. Cuando selecciona otro archivo a través del navegador o termina de editar el nombre del archivo pulsando entrar, el nuevo archivo se cargará y se comparará con el(los) archivo(s) que ya estaba(n) cargado(s). ColoreadoLas tres ventanas de entrada tienen asignadas las letras «A», «B» y «C». «A» tiene color azul, «B» verde y «C» magenta (estos son los valores predeterminados, pero puede cambiarlos en el menú Preferencias). Cuando se detecta una diferencia el color mostrado en el archivo de entrada cambia. Cuando los dos archivos presentan diferencias el color utilizado para expresar esto es rojo de manera predeterminada («Color de conflicto» en las preferencias). Este esquema de color es especialmente práctico en el caso de que tenga tres archivos de entrada, tal y como se verá en la próxima sección (Fusionar). Columna resumenA la izquierda de cada texto se encuentra la «columna resumen». Si las diferencias se producen en una línea, la columna resumen muestra el color correspondiente. Si la diferencia es solo de espacios en blanco, se marca el resumen. Para los lenguajes de programación en los que los espacios no son importantes es práctico para apreciar de un vistazo si se modificó algo importante. (En C/C++ los espacios en blanco solo son interesantes en el interior de las cadenas, comentarios, para el preprocesador y en otra serie de extrañas situaciones). La línea vertical que separa la columna resumen y el texto se interrumpe si el archivo de entrada no tiene líneas. Cuando se activa el ajuste de línea, esta línea vertical aparecerá punteada en las líneas ajustadas. Columna de visión generalEn el lado derecho podemos encontrar la columna «visión general», a la izquierda de la barra de desplazamiento. Muestra la columna de resumen comprimida de la entrada «A». todas las diferencias y conflictos se pueden apreciar de un vistazo. Cuando solo se utilizan dos ventanas de entrada, todas las diferencias aparecerán en rojo, ya que cada diferencia supondrá un conflicto. Un rectángulo negro marca la parte visible de las entradas. Para los archivos con entradas muy largas, cuando el número de líneas es más grande que la altura de la columna visión general en pixels, varias líneas de entrada compartirán una línea de visión general. Un conflicto tendrá más prioridad que las simples diferencias, que a su vez tendrán prioridad sobre lo no cambiado, de forma que no se pierdan las diferencias o los conflictos aquí. Pulsando sobre la columna de visión general se mostrará el correspondiente texto. Líneas alineadas manualmenteAlgunas veces el algoritmo sitúa líneas incorrectas unas al lado de otras. O desea comparar un trozo de texto con otro texto que está en una posición completamente diferente en el otro archivo. Para estas situaciones puede indicar a &kdiff3; manualmente que alinee algunas líneas. Marque el texto que quiera alinear con el ratón, como si estuviera copiando y pegando, en la primera vista de diferencia y seleccione «Añadir alineación manual de diferencias» en el menú «Diffview» (acceso rápido de teclado &Ctrl;Y). Aparecerá una barra naranja en la columna resumen al lado del texto seleccionado. Repita esto para la segunda y (si está disponible) para la tercera vista. &kdiff3; recalculará inmediatamente las diferencias cada vez que haga esto, y alineará las líneas elegidas. Por supuesto, alguna de las líneas que antes coincidían puede que ya no coincidan. En la actualidad, la fusión no permite el uso de ayuda manual de diff. Secciones de división y unión manualEn algunos casos &kdiff3; verá muy pocas o demasiadas secciones diff para fusionar. Si este es el caso, puede unir o dividir las secciones existentes. Añada secciones nuevas seleccionando primero el texto de las líneas situadas junto a las ventanas de entrada (para copiarlo al portapapeles). A continuación elija «Dividir Diff en la selección» en el menú «Fusionar». Las divisiones se añadirán encima de la primera línea bajo el texto seleccionado. Si solo desea añadir una sección, seleccione el texto por el que comienza la sección que desea dividir. Para unir secciones en las ventanas de entrada seleccione varias líneas en las secciones que desea unir (puede unir varias secciones en un solo paso). A continuación elija «Unir las diferencias seleccionadas» en el menú «Fusionar». + + + +Fusionar y la ventana del editor de la salida fusionada + + + +La ventana del editor de la salida fusionada (bajo las ventanas de la entrada de diferencias) también tiene una línea de información sobre ella que mostrará «Salida», el nombre del archivo y «[Modificado]» si edita algo. Normalmente contendrá texto que podrá fusionarse automáticamente con facilidad, pero algunas veces también contendrá conflictos. La opción de guardar se ha desactivado hasta que se hayan resuelto todos los conflictos (use los botones «Ir al conflicto anterior/siguiente sin resolver» para encontrar los conflictos pendientes). Con solo dos archivos de entrada, cada diferencia es también un conflicto que debe resolverse manualmente. Con tres archivos de entrada el primer archivo se utiliza como base, mientras que el segundo y tercer archivos de entrada contienen las modificaciones. Si en cualquier línea solo tienen cambios la entrada B o la C, pero no ambas, se seleccionará automáticamente la fuente cambiada. Solo cuando B y C tengan cambios en las mismas líneas, la herramienta detectará un conflicto que debe resolverse manualmente. Cuando B y C sean iguales, pero diferentes a A, se seleccionará C. La columna resumenEl editor de la salida de la fusión también tiene una columna resumen a su izquierda. Mostrará la letra de la entrada de la que se seleccionó la línea, o nada si las tres fuentes son iguales en esa línea. Para los conflictos mostrará un signo de interrogación «?» y la línea mostrará «<Conflicto de fusión>», en rojo. Puesto que resolver los conflictos línea a línea es muy arduo, las líneas se agruparán en grupos que tengan las mismas diferencias y conflictos característicos. Pero los conflictos causados solo por espacios en blanco se separarán de los conflictos no causados por espacios en blanco para facilitar la fusión de los archivos cuando el sangrado cambia en muchas líneas. Configurar el grupo actual, sincronizado de fusión y posición de vista de diferenciasCuando se pulsa en la columna resumen con el botón izquierdo del ratón en la ventana a la que pertenezca este grupo, se seleccionarán todas las ventanas y se mostrará el comienzo de este grupo (esto implica un salto automático en la posición de la ventana si el principio del grupo no se encuentra visible). El grupo se convierte en el «grupo actual». Se resalta con la «gama (diff) de color del fondo actual» y aparecerá una barra negra en la parte izquierda del texto. Seleccionar las entradas A, B o C para el conflicto actual y la ediciónLa barra de botones bajo el menú incluye tres botones para seleccionar las entradas que contienen las letras «A», «B» y «C». Pulse el botón selector de entrada para insertar (o eliminar si ya se ha insertado) las líneas de la fuente respectiva. Para seleccionar las líneas de varias entradas pulse los botones correspondientes en el orden que necesite. Por ejemplo, si desea que las líneas de «B» aparezcan antes de las líneas de «A» en la salida, pulse primero «B» y luego «A». Si estaba utilizando la opción avance automático («Automáticamente ir al conflicto siguiente sin resolver después de una selección de origen»), debería desactivarla antes de elegir líneas desde varias entradas o editar líneas después de su elección. Si no lo hace, &kdiff3; saltará al siguiente conflicto después de elegir la primera entrada. Suele ser práctico para editar directamente la salida resultante de la fusión. La columna resumen mostrará «m» para cada línea que se haya modificado manualmente. Cuando, por ejemplo, las diferencias estén alineadas de forma que la simple elección no sea satisfactoria, puede marcar el texto necesario y utilizar copiar y pegar de forma normal para situarlo en la salida de la fusión. Algunas veces, cuando una línea se elimina, ya sea por la fusión o por la edición manual, y no hay más líneas en este grupo, aparecerá el texto <Sin línea fuente>. Se coloca en lugar del grupo de forma que pueda cambiar de idea y seleccionar de nuevo la fuente. Este texto no aparecerá en el archivo guardado o en cualquier selección que copie y pegue. El texto «<Conflicto de fusión>» aparecerá en el portapapeles si copia y pega texto que la contenga. Pero tenga cuidado al hacerlo. Seleccionar las entradas A, B o C para todos los conflictosLa fusión normal se inicia resolviendo los conflictos sencillos automáticamente. Pero el menú «Fusionar» proporciona algunas acciones para otras necesidades habituales. Si ha seleccionado la misma fuente para más conflictos, podrá seleccionar «A», «B» o «C» en cualquier sitio, o solo para los conflictos pendientes de resolver, o para los conflictos sin resolver que sean debidos a espacios. Si desea decidir cada delta por sí mismo, puede «Establecer deltas a conflictos». O si desea volver a las elecciones automáticas de &kdiff3; seleccione «Resolver automáticamente conflictos simples». &kdiff3; reiniciará la fusión. Para las acciones que cambien sus modificaciones anteriores, &kdiff3; le pedirá confirmación antes de proceder. Nota: Cuando seleccione fuente para los conflictos de espacios en blanco sin resolver y las opciones «Ignorar números» o «Ignorar comentarios C/C++», los cambios en los números o en los comentarios se tratarán también como espacios en blanco. Fusión automática de las claves de control de versión y del historial (registro)Muchos sistemas de control de versión permiten usar palabras claves especiales en el archivo (p. ej.: «$Date$$», «$Header$», «$Author$», «$Log$», etc.) Durante la descarga el sistema de control de versiones (VCS) cambia estas líneas. Por ejemplo, «$Date$» se cambiará por «$Date: 2005/03/22 18:45:01 $». Como esta línea será diferente en cada versión del archivo, podría requerir interacción manual durante la fusión. &kdiff3; ofrece fusión automática para estos elementos. Para las líneas que coincidan con la opción «Fusionar automáticamente expresión regular» en todos los archivos de entrada de &kdiff3; se elegirá la línea desde B o -si está disponible- desde C (adicionalmente es necesario que las líneas en cuestión si las comparamos con las líneas anteriores no han de tener conflictos). Esta fusión automática también se puede ejecutar de forma inmediata después de iniciar la fusión (active la opción «Ejecutar expresión regular de fusión automática al iniciar la fusión») o posteriormente a través del menú de fusión «Ejecutar expresión regular de fusión automática»). También se permite la fusión automática del historial de control de versión (también llamado «registro»). El historial de fusión automática se puede ejecutar automáticamente cuando se inicie la fusión activando la opción «Resolver automáticamente los conflictos del historial». Normalmente el historial de control de versión comienza con una línea que contiene la palabra clave «$Log$». Esta deberá coincidir con la opción «El historial comienza con la expresión regular». &kdiff3; detecta que las siguientes líneas se encuentran en el historial analizando los caracteres importantes que se encuentran delante de la palabra clave «$Log$». Si el mismo «comentario importante» también aparece en las siguientes líneas, también estas se incluirán en el historial. Durante cada descarga el VCS escribe una única línea especificando la versión, fecha, e información horaria seguida de líneas con comentarios del usuario. Estas líneas forman una entrada de historial. Esta sección del historial crece cada vez que descarga de forma que las entrada más recientes aparecerán en la parte superior (después de la línea de inicio del historial). Cuando dos o más desarrolladores que están realizando un desarrollo paralelo descargan una rama de un archivo la fusión del historial contendrá varias entradas que aparecerán como conflictos durante la fusión de las ramas. Como esta fusión puede ser muy aburrida, &kdiff3; le permite usar dos posibles estrategias: Insertar la información del historial de ambos colaboradores en la parte superior u ordenar la información del historial por una clave definida por el usuario. El método que simplemente inserta las entradas es fácil de configurar. &kdiff3; solo necesita un método para detectar qué líneas pertenecen a una entrada del historial. La mayor parte de los VCS insertan una línea vacía después de cada entrada del historial. Si no hay otras líneas vacías, este criterio es suficiente para &kdiff3;. Seleccione «Entrada del historial que inicia una expresión regular». Si el criterio de la línea vacía no es suficiente, puede especificar una expresión regular para detectar el inicio de la entrada del historial. Tenga en cuenta que &kdiff3; eliminará las entradas duplicadas del historial. Si una entrada aparece varias veces en el historial de un archivo de entrada, solo permanecerá una entrada en la salida. Si desea ordenar el historial, debe especificar cómo se debe construir la clave de ordenación. Utilice paréntesis en «Entrada del historial que inicia una expresión regular» para agrupar partes del a expresión regular que se deberían utilizar posteriormente para la tecla de ordenación. A continuación especifique «Orden de la clave de ordenación que inicia la entrada del historial» especificando una lista de números separados por una coma «,» para referirse a la posición del grupo en la expresión regular. Debido a que no es sencillo de hacer al primer intento, podrá comprobar y mejorar la expresión regular y la generación de clave en un diálogo dedicado pulsando el botón «Comprobar sus expresiones regulares». Ejemplo: Supongamos que tenemos un historial similar a este: +/************************************************************************** +** HISTORIAL: $Log: \vista_principal_de_tom\MiAplicación\src\algoritmocomplejo.cpp $ +** +** \main\rama_integración_12 2 Abr 2001 10:45:41 tom +** rama fusionada simon_rama_15. +** +** \main\henry_correccionerrores_rama_7\1 30 Mar 2001 19:22:05 henry +** mejora la velocidad de la subrutina convertToMesh(). +** Eliminación de fallo. +**************************************************************************/ + La línea de comienzo del historial es la que coincida con la expresión regular ".*\$Log.*\$.*". Las siguientes son las entradas del historial. La línea con «$Log$» -la palabra clave comienza con dos «*» seguidos de un espacio. &kdiff3; utiliza la cadena con el primer espacio no vacío como «comentario importante» y asume que el historial finaliza en la primera línea sin este comentario importante. En este ejemplo la última línea finaliza con una cadena que también comienza con dos «*», pero en lugar de un carácter de espacio le siguen más «*». Por tanto, esta línea finalizará el historial. Si no es necesaria la ordenación del historial, la entrada del historial comenzará con una línea de expresión regular como esta (esta línea se divide en dos porque, en caso contrario, no se podría ajustar) +\s*\\main\\\S+\s+[0-9]+ (Ene|Feb|Mar|Abr|May|Jun|Jul|Ago|Sep|Oct|Nov|Dic) + [0-9][0-9][0-9][0-9] [0-9][0-9]:[0-9][0-9]:[0-9][0-9]\s+.* + Para obtener detalles sobre las expresiones regulares, por favor, consulte la documentación de las expresiones regulares de Trolltech. Tenga en cuenta que «\s» (con la «s» minúscula) coincidirá con cualquier espacio y «\S» (con «S» mayúscula) coincidirá con lo que no sean espacios en blanco. En nuestro ejemplo la entrada del historial deberá contener primero la versión de información de la expresión regular "\\main\\\S+", la fecha formada por el día «[0-9]+», mes «(Ene|Feb|Mar|Abr|May|Jun|Jul|Ago|Sep|Oct|Nov|Dic)» y año «[0-9][0-9][0-9][0-9]», la hora «[0-9][0-9]:[0-9][0-9]:[0-9][0-9]» y, finalmente, el nombre de registro del desarrollador «.*». Observe que el «comentario importante» (en el ejemplo «**») lo eliminará &kdiff3; antes de buscar la coincidencia, de ahí que la expresión regular comience con con una expresión regular para ninguno o más espacios en blanco «.*». Puesto que los caracteres de comentario puede ser diferentes en cada archivo (por ejemplo, C/C++ utilizan caracteres de comentarios diferentes a los que utiliza Perl script) &kdiff3; tiene en cuenta los caracteres de los comentarios y no debería especificarlos en la expresión regular. Si necesita un historial ordenado, se calculará la clave de ordenación. Para esta las partes relevantes en la expresión regular se deben agrupar entre paréntesis (los paréntesis adicionales puede mantenerse aunque desactive la ordenación del historial). +(Ene|Feb|Mar|Abr|May|Jun|Jul|Ago|Sep|Oct|Nov|Dic) + ([0-9][0-9][0-9][0-9]) ([0-9][0-9]:[0-9][0-9]:[0-9][0-9])\s+(.*) + Los paréntesis ahora contendrán: 1. versión de información, 2. día, 3. mes, 4. año, 5. hora, 6. nombre. Pero si deseamos ordenarlos por fecha y hora, necesitará construir una clave con los elementos en un orden de aparición diferente: Primero el año, seguido del mes, día, hora, información de versión y nombre. De ahí que el orden de la clave de ordenación que se deba especificar sea «4,3,2,5,1,6». Ya que los nombres de los meses no son buenos para la ordenación («Abr» iría primero) &kdiff3; detectará que son nombres de meses y utilizará números en su lugar («Abr»->«04»). Si se encuentra un número puro se transformará en un valor de 4 dígitos con ceros significativos para la ordenación. Finalmente la clave de ordenación resultante que iniciará la primera entrada del historial será: 2001 04 0002 10:45:41 rama_integración_12 tom + +Para obtener más detalles consulte también Preferencias de fusión. + + + +Navegación y edición +La mayor parte de la navegación puede realizarse con las barras de desplazamiento y el ratón, pero también puede navegar con las teclas. Si pulsa en cualquier ventana puede utilizar los cursores izquierdo, derecho, arriba, abajo, página arriba, página abajo, inicio, fin, Ctrl-Inicio, Ctrl-Fin tal y como lo haría en otros programas. La columna vista general situada al lado de la barra vertical de desplazamiento en los archivos de entrada también puede utilizarse para navegar pulsando sobre ella. También puede utilizar la rueda del ratón para desplazarse arriba y abajo. En el editor de la salida de fusión también puede utilizar las otras teclas para la edición. Puede cambiar entre los modos insertar y sobrescribir con la tecla Insertar (el modo predeterminado es insertar). Una pulsación del botón izquierdo del ratón en la columna resumen sincronizará todas las ventanas para mostrar el inicio del mismo grupo de líneas (tal y como se explicaba en la sección «Configurar el grupo actual, sincronizado de fusión y posición de vista de diferencias»). La barra de botones también contiene siete botones de navegación con los que podrá saltar a la diferencia actual/primera/última, a la siguiente/anterior diferencia (Ctrl-Flecha abajo/Ctrl-Flecha arriba), al siguiente/anterior conflicto (Ctrl-Página abajo/Ctrl-Página arriba), o al siguiente/anterior conflicto sin resolver. Tenga en cuenta que para &kdiff3; un «conflicto» que no se pudo resolver automáticamente al comienzo de la fusión continúa siendo un «conflicto» aunque se haya resuelto. De aquí la necesidad de distinguir los «conflictos sin resolver» +Avance automático +También existe el botón «Automáticamente ir al conflicto siguiente sin resolver después de una selección origen» (avance automático). Si activa esto, cuando se seleccione una fuente &kdiff3; saltará automáticamente al siguiente conflicto sin resolver. Esto puede ayudarle cuando desee seleccionar una sola fuente. Cuando necesite ambas fuerte, o desee editar después de la selección, probablemente querrá desactivar esto. Antes de continuar con el siguiente conflicto sin resolver &kdiff3; muestra el resultado de su elección durante un momento. Este retardo es ajustable en las preferencias Diff y fusión: Puede especificar en «Retardo auto avanzado» en milisegundos un valor entre 0 y 2.000. Pista: ¿Cansado de tanta pulsación? Utilice un retardo de avance automático pequeño y los accesos rápidos Ctrl-1/2/3 para seleccionar A/B/C para muchos de los conflictos. + + + +Seleccionar, copiar y pegar +Las ventanas de entrada no muestran un cursor, por ello las selecciones se hacen pulsando el botón izquierdo del ratón al inicio, manteniendo pulsado el botón del ratón y moviéndose al final, momento en el que soltará el botón del ratón. También puede seleccionar una palabra con una doble pulsación. En la salida del editor de la fusión puede realizar la selección a través del teclado manteniendo pulsado el botón «mayúsculas» y navegando con las teclas de cursor. Si la selección excede el rango visible puede desplazar el ratón sobre los bordes de la ventana que harán que &kdiff3; se desplace en esta dirección. Para las selecciones muy largas puede utilizar las teclas de navegación mientras mantiene pulsado el ratón. Por ejemplo, use RePág y AvPág para ir rápidamente a una posición determinada. Al final de la posición suelte el botón del ratón. Para seleccionarlo todo en la ventana actual utilice el menú «Editar»->«Seleccionar todo» (Ctrl-A). Para copiar al portapapeles debe pulsar el botón «Copiar» (Ctrl-C o Ctrl-Insertar). Pero también existe la opción «Auto copiar selección». Si está activado, todo lo que seleccione se copiará inmediatamente y no necesitará realizar la copia explícitamente. Ponga atención cuando lo utilice ya que el contenido del portapapeles puede destruirse accidentalmente. «Cortar» (Ctrl-X o Mayúsculas-Borrar) copia el texto seleccionado al portapapeles y lo borra. «Pegar» (Ctrl-V o Mayúsculas-Insertar) inserta el texto del portapapeles en la posición del cursor o sobre la selección actual. Si pega algo en cualquier ventana de entrada de diferencia se mostrará el contenido del portapapeles en esta ventana y la comparación se reiniciará inmediatamente. Es práctico si desea guardar rápidamente un trozo de texto de alguna parte y compararlo con algo sin crear los archivos en primer lugar. + + +Guardar +Guardar solo estará permitido cuando se hayan resuelto todos los conflictos. Si el archivo ya existe y la opción «Archivos de copia de seguridad» está activada, se cambiará el nombre del archivo existente con la extensión «.orig»; pero si ya existe dicho archivo, se borrará. Cuando salga o inicie otro análisis de diferencias y los datos no se hayan guardado, &kdiff3; le preguntará si desea guardar, cancelar o continuar sin guardar (&kdiff3; no captura ninguna señal. Por eso, si ejecuta «kill» sobre &kdiff3;, sus datos se perderán). Los finales de línea se guardan de acuerdo con el método utilizado por el sistema operativo. Para Unix, cada línea termina con un carácter de nueva línea «\n», mientras que para los sistemas basados en Win-32 cada línea termina con un retorno de carro + un nueva línea «\r\n». &kdiff3; no conserva los finales de línea de los archivos de entrada, lo que significa que no debería utilizar &kdiff3; con archivos binarios. + + +Buscar cadenas +Puede buscar una cadena en cualquier ventana de texto de &kdiff3;. La orden «Buscar...» («Ctrl-F) en el menú Editar abre un diálogo que le permite especificar la cadena a buscar. La búsqueda siempre comenzará en la parte superior. Utilice la orden «Buscar siguiente» («F3») para buscar la siguiente aparición. si selecciona la búsqueda en varias ventanas se comenzará a buscar en la primera ventana de arriba hacia abajo antes de iniciar la búsqueda en la parte superior de la siguiente ventana, etc. + + +Impresión +&kdiff3; permite imprimir las diferencias de los archivos de texto. La orden «Imprimir» (Ctrl-P) en el menú archivo abre un diálogo que permite seleccionar la impresora y ajustar otras opciones. Existen varias posibilidades de ajustar el rango. Debido a las diferencias existentes en los diálogos de impresión de los diversos sistemas operativos, el método para realizar determinadas selecciones variará. + + Todo:Imprime todo. + Actual:Imprime un página comenzando en la primera línea visible de la ventana (en sistemas sin esta opción se puede suplir este inconveniente especificando la página número 10000 para imprimir). + Selección:Antes de realizar esta elección de impresión seleccione el texto con el ratón (como para copiar y pegar) en una de las ventanas de entrada de diferencias para definir las líneas inicial y final. Si no hay texto seleccionado en una de las ventanas de diferencia, no estará disponible esta opción (en sistemas sin esta opción se puede conseguir el mismo resultado especificando la página 9999). + Intervalo:Especifique la primera y última página. + +Otras opciones importantes para la impresión son las habituales: + Letra, tamaño de letra + Mostrar números de línea + Ajuste de texto + Colores + etc. + +También se recomienda la impresión en formato apaisado. + + +Opciones +Las opciones y la lista de archivos recientes se guardarán cuando salga del programa, y se volverán a cargar cuando lo inicie (Menú Preferencias->Configurar &kdiff3; ...). +Fuente +Seleccione un tipo de letra de ancho fijo (en algunos sistemas este diálogo puede mostrar tipos de letra de ancho variable, pero no debería utilizarlas). + + Fuente cursiva para deltas:Si selecciona esto, las diferencias de texto se dibujarán con la versión cursiva del tipo de letra. Si el tipo de letra no permite el uso de cursiva, no hará nada. + + + + +Colores + + Color del primer plano:Habitualmente negro. + Color de fondo:Habitualmente blanco. + Color del fondo de diff:Habitualmente gris claro. + Color A:Habitualmente azul oscuro. + Color B:Habitualmente verde oscuro. + Color C:Habitualmente magenta oscuro. + Color de conflicto:Habitualmente rojo. + Rango actual de color de fondo:Habitualmente amarillo claro. + Rango actual de color de fondo de diff:Habitualmente amarillo oscuro. + Color para intervalos de diferencias seleccionados manualmente:Habitualmente naranja. + Color del archivo más nuevo en la comparación de directorios:Habitualmente verde. + Color del archivo más antiguo en la comparación de directorios:Habitualmente rojo. + Color de los archivos de antigüedad media en la comparación de directorios:Habitualmente amarillo oscuro. + Color para los archivos que faltan en la comparación de directorios:Habitualmente negro. + +Los cambios de color para la comparación de directorios no tendrán efecto hasta la siguiente vez que inicie la comparación de directorios. +En sistemas que solo tengan 16 o 256 colores, algunos de ellos no estarán disponibles en su forma exacta. En estos sistemas, el botón «Predeterminados» seleccionará un color puro. + + +Preferencias del editor + + El tabulador inserta espacios:Si está desactivado y pulsa la tecla tabulador, se insertará un carácter de tabulación; en caso contrario, se insertará la cantidad adecuada de caracteres. + Tamaño del tabulador:Se puede ajustar para sus necesidades. El valor predeterminado es 8. + Sangrado automático:Cuando pulsa Entrar; o Return el sangrado de la línea anterior se utiliza para la nueva línea. + Copiar la selección automáticamente:Cada selección se copia inmediatamente al portapapeles de forma que no necesitará copiarlo explícitamente. + Estilo del final de línea:Al guardar puede seleccionar qué estilo de línea prefiere. El valor predeterminado es la elección habitual para el sistema operativo utilizado. + + + +Preferencias de fusión +Cuando se comparan archivos, &kdiff3; primero intenta hacer coincidir las líneas que sean iguales en todos los archivos de entrada. Solo durante este paso se ignorarán los espacios en blanco. El segundo paso compara cada línea. En este paso los espacios en blanco no se ignorarán. Los espacios en blanco tampoco se ignorarán durante la fusión. + + + Ignorar números:De forma predeterminada estará desactivado. Los caracteres numéricos («0-9», «.», «-») se ignorarán en la primera parte del análisis en la que se efectuará la coincidencia de líneas. Sin embargo en el resultado las diferencias sí se mostrarán, pero serán tratadas como espacios en blanco. + Ignorar comentarios de C/C++:De forma predeterminada estará desactivado. Los cambios en los comentarios se tratarán como cambios de espacios en blanco. + Ignorar mayúsculas:De forma predeterminada estará desactivado. Las diferencias de mayúsculas y minúsculas de los caracteres (como «A» y «a») se tratarán como cambios de espacios en blanco. + Orden del preprocesador:Vea la siguiente sección. + Orden de preprocesador de coincidencia de línea:Vea la siguiente sección. + Intentar más a fondo:Intenta encontrar más a fondo una delta más pequeña (de forma predeterminada estará activada). Debería ser efectivo para archivos grandes y complicados. Y lento para archivos muy grandes. + + + +Preferencias de fusión + + Retardo auto avanzado (ms):Cuando está activado el modo de «auto avanzado» aquí se especifica durante cuanto tiempo se mostrará el resultado de la selección antes de saltar al siguiente conflicto sin resolver. + Fusionar de forma predeterminada espacios en blanco de dos/tres archivos:Resuelve automáticamente todos los conflictos de los espacios en blanco seleccionando el archivo especificado (el modo predeterminado es el manual). Práctico si los espacios no son realmente importantes en los archivos. Si solo necesita esto ocasionalmente mejor utilice «Seleccionar A/B/C para todos conflictos de los espacios en blanco sin resolver» en el menú Fusionar. Tenga en cuenta que si ha activado «Ignorar números» o «Ignorar comentarios de C/C++» esta elección automática también se aplica a los conflictos en los números y en los comentarios. + Expresión regular de fusión automática:Expresión regular para las líneas en las que &kdiff3; debería elegir automáticamente una fuente. Consulte también Fusión automática. + Ejecutar expresión regular de fusión automática al iniciar la fusión:Si está activado &kdiff3; ejecutará la fusión automática utilizando la «expresión regular de fusión automática» cuando se inicie una fusión. + Expresión regular de inicio de historial:Expresión regular para el inicio de la entrada del historial de fusiones. Normalmente, esta línea contiene la palabra clave «$Log$». El valor predeterminado es «.*\$Log.*\$.*». + Expresión regular de inicio de entrada del historial:Una entrada del historial de fusión está formada por varias líneas. Especifique la expresión regular para detectar la primera línea (sin el comentario importante). Utilice paréntesis para agrupar las claves que desee utilizar para la ordenación. Si está vacío, &kdiff3; asume que las líneas vacías separan entradas del historial. Consulte también Fusión automática. + Ordenación del historial de fusión:Activar ordenación del historial del control de versiones + orden de la clave de ordenación del inicio de la entrada del historial:Cada paréntesis utilizado en la expresión regular para la entrada del inicio del historial agrupa una clave que puede utilizarse para la ordenación. Especifique la lista de claves (están numeradas en orden de aparición comenzando con 1) y utilizando «,» como separador (p. ej. «4,5,6,1,2,3,7»). Si permanece vacío, no se realizará ordenación. Consulte también fusión automática. + Historial del control de versión de fusión al iniciar la fusiónSi está activado, &kdiff3; ejecuta automáticamente la fusión del historial utilizando las opciones antes mencionadas cuando se inicia una fusión. + Número máximo de entradas en el historial:&kdiff3; corta la lista del historial después del número especificado de entradas. Utilice -1 para evitar el corte (el valor predeterminado es -1). + Compruebe sus expresiones regularesEste botón muestra un diálogo que le permite mejorar y comprobar la expresión regular. Copie los datos de sus archivos en las líneas de ejemplo. Los «Resultados coincidentes» si la coincidencia se produjo o no. El «Resultado de la clave de ordenación» mostrará la clave utilizada para la ordenación del historial de fusión. + Orden de fusión irrelevante:Especifique una orden que debería ser llamada cuando &kdiff3; detecte que para el archivo B no contiene datos relevantes ya que están incluidos en C. La orden se llama con los tres nombres de archivo como parámetros. Los datos deberán coincidir con la «expresión regular de fusión automática» o con el historial, si no se considera relevante. + + + + +Fusión de directorios +Estas opciones están relacionadas con la exploración del directorio y el manejo de la fusión: Vea la Comparación/fusión de directorios de documentos para obtener los detalles. También existe una opción relevante para guardar archivos sencillos: + + Archivos de copia de seguridad:Cuando se guarde un archivo y ya exista una versión antigua, se cambiará el nombre de la versión original con la extensión «.orig». Si ya existía un archivo de copia de seguridad antigua con la extensión «.orig», se borrará. + + + +Configuraciones regionales + + Idioma:Ajusta el idioma de la interfaz de usuario. Cambiar esta opción no afectará a la ejecución del programa. Tendrá que salir y reiniciar &kdiff3; para que el cambio tenga efecto (esta opción no está disponible en la versión de Frameworks de &kdiff3;). + Usar la misma codificación para todo:Las siguientes opciones de codificación se pueden ajustar de forma separada para cada elemento, o si esta opción está activada, todos los valores tomarán el primer valor. + Codificación local:Sobre los selectores de código aparece una nota que le indica cuál es la codificación local (no es ajustable, ya que se utiliza para informarle de su codificación en caso de que no la conozca, y necesite seleccionarla). + Codificación de archivo para A/B/C:Ajusta la codificación para los archivos de entrada. Esto tiene efecto en la interpretación de los caracteres especiales. Como puede ajustar cada codificación por separado puede comparar y fusionar archivos guardados con diferentes codificaciones. + Codificación de archivo para la salida de la fusión y guardar:Cuando haya editado un archivo, podrá ajustar qué codificación se utilizará al guardarse en el disco. + Codificación de archivo para los archivos del preprocesador:Cuando defina el preprocesador puede que no sea capaz de operar con su codificación (ejem: Sus archivos son de unicode de 16 bit y su preprocesador solo puede utilizar ascii de 8 bit). Con esta opción puede definir la codificación de la salida del preprocesador. + Idioma de derecha a izquierda:Algunos idiomas se escriben de derecha a izquierda. Cuando esta opción está activada, &kdiff3; dibuja el texto de derecha a izquierda en las ventanas de entrada de diff y en la ventana de la salida de la fusión. Tenga en cuenta que si inicia &kdiff3; con la opción de línea de órdenes «--reverse» toda la distribución se hará de derecha a izquierda también (esta es una característica proporcionada por Qt). Este manual se escribió asumiendo que «Idioma de derecha a izquierda» o invertir distribución están desactivados. Por ello, algunas referencias a «izquierda» o «derecha» se reemplazarán por sus respectivas homólogas si utiliza estas opciones. + + + + +Varios +Estas opciones y acciones están disponibles en los menús o en la barra de botones. + + Mostrar números de líneas:Puede seleccionar si los números deberían mostrarse en los archivos de entrada. + Mostrar caracteres espacio y tabulador por diferencias:Algunas veces los espacios visibles y los tabuladores molestan. Puede desactivarlos. + Mostrar espacio en blanco:Desactívelo para suprimir cualquier resaltado o cambio de «solo espacio en blanco» en el texto o en las columnas de vista general (tenga en cuenta que esto también se aplicará a los cambios en los números y comentarios si están activadas las opciones «Ignorar números» o «Ignorar comentarios C/C++»). + Opciones de la vista general:Estas elecciones están disponibles cuando compara tres archivos. En el modo normal todas las diferencias se muestra en un color codificado en la columna de vista general. Pero algunas veces puede estar interesado en las diferencias entre solo dos de los tres archivos. Seleccionando vista «A vs. B», «A vs. C» o «B vs. C» se mostrará una segunda columna de vista general con la información requerida situado al lado de la visión general normal. + Ajuste de palabras en las ventanas diff:Ajusta las líneas cuando su longitud excede del ancho de una ventana. + Mostrar ventana A/B/C:Algunas veces deseará utilizar mejor el espacio de la pantalla para las líneas largas. Oculte las ventanas que no sean importantes (en el menú Ventanas). + Cambiar orientación de división:Cambia entre las ventanas diff mostrándolas una cerca de la otra (A a la izquierda de B, y a la izquierda de C) o una sobre otra (A sobre B y sobre C). También debería servir de ayuda para las líneas largas (en el menú Ventanas). + Iniciar fusión rápida:Algunas veces puede estar viendo las deltas y decidir fusionarlas. «Fusionar el archivo actual» en el menú Directorio también funcionará si solo compara dos archivos. Una simple pulsación inicia la fusión y utiliza el nombre de archivo del último archivo de entrada como nombre de archivo predeterminado (cuando se utiliza esto para reiniciar una fusión, se conservará el nombre de archivo de la salida). + + + +Configurar accesos rápidos de teclado +En estos momentos solo la versión para Frameworks permite accesos rápidos de teclado configurables por el usuario (Menú Preferencias->Configurar accesos rápidos). + + + +Órdenes del preprocesador +&kdiff3; permite dos opciones para el preprocesador. + + Orden del preprocesador:Cuando se lee cualquier archivo, se redirigirá a través de esta orden externa. Se podrá ver la salida de esta orden en lugar del archivo original. Puede escribir su propio preprocesador que cubra sus necesidades específicas. Utilice esto para cortar determinadas partes del archivo, o para corregir de forma automática el sangrado, etc. + Orden de preprocesador de coincidencia de línea:Cuando se lee cualquier archivo, se redirigirá a través de esta orden externa. Si se especifica una orden de preprocesado (ver a continuación), la salida del preprocesador será la entrada de la coincidencia de líneas del preprocesador. La salida solo se utilizará durante la fase de coincidencia de líneas durante el análisis. Puede escribir su propio preprocesador que cubra sus necesidades específicas. Cada línea de entrada tendrá la correspondiente línea de salida. + + +La idea es permitir al usuario gran flexibilidad durante la configuración del resultado de diff. Pero necesita un programa externo, y muchos usuarios no quieren escribirlo ellos. La buena noticia es que muchas veces sed o perl harán este trabajo. +Ejemplo: Prueba de mayúsculas sencilla: considerar el archivo a.txt (6 líneas): + aa + ba + ca + da + ea + fa + y el archivo b.txt (3 líneas): + cg + dg + eg +Sin un preprocesador las siguientes líneas se situarán unas al lado de otras: + aa - cg + ba - dg + ca - eg + da + ea + fa + Esto no es lo que probablemente lo que se desea, ya que la primera letra contiene realmente información interesante. Para ayudar al algoritmo de coincidencias a ignorar la segunda letra podemos utilizar una orden de preprocesador, que reemplace «g» con «a»: + sed 's/g/a/' + Con esta orden el resultado del a comparación será: + aa + ba + ca - cg + da - dg + ea - eg + fa +Internamente el algoritmo de coincidencia ve los archivos después de la ejecución de la línea del preprocesador de coincidencia, pero en la pantalla el archivo continúa sin cambios (el preprocesador normal cambiará también los datos en la pantalla). + +Lo básico de <command +>sed</command +> +Esta sección solo introduce algunas características muy básicas de sed. Para obtener más información consulte info:/sed o http://www.gnu.org/software/sed/manual/html_mono/sed.html. Una versión precompilada para Windows puede encontrarse en http://unxutils.sourceforge.net. Tenga en cuenta que los siguientes ejemplos asumen que la orden sed se encuentra en algún directorio definido en la variable de entorno PATH. Si este no es el caso, deberá especificar la ruta completa absoluta de lo orden. +En este contexto solo se utiliza la orden de sustitución sed: + sed 's/REGEXP/REEMPLAZO/MODIFICADORES' + Antes de utilizar una orden nueva con &kdiff3;, debería comprobarla en una consola. Aquí será práctica la orden echo. Ejemplo: + echo abrakadabra | sed 's/a/o/' + -> obrakadabra + Este ejemplo muestra una orden sed muy simple que reemplaza la primera aparición de «a» con «o». Si desea reemplazar todas las apariciones necesitará el modificador «g»: + echo abrakadabra | sed 's/a/o/g' + -> obrokodobro + El símbolo «|» es la orden de tubería que transfiere la salida de la orden anterior a la entrada de la siguiente orden. Si desea comprobar el uso con un archivo largo puede usar cat en los sistemas tipo Unix o type en los sistemas tipo Windows. sed hará la sustitución para cada línea. cat nombrearchivo | sed opciones + + + +Ejemplos para <command +>sed</command +> usados en &kdiff3; +Ignorar otros tipos de comentarios +En estos momentos &kdiff3; solo entiende los comentarios de C/C++. Si usa la orden del preprocesador para coincidencia de líneas también podrá ignorar otros tipos de comentarios, convirtiéndolos en comentarios de C/C++. Por ejemplo, para ignorar los comentarios que comiencen por «#», debería convertirlos en comentarios que empiecen por «//». Tenga en cuenta que debe tener activada la opción «Ignorar comentarios de C/C++» para que tenga efecto. Una orden apropiada del preprocesador de coincidencia de líneas podría ser: + sed 's/#/\/\//' +Al igual que para sed el carácter «/» tienen un significado especial, y es necesario poner el carácter «\» antes de cada «/» en la cadena de sustitución. Algunas veces, «\» es necesario para añadir o eliminar un significado especial de ciertos caracteres. Las comillas simples (') son importantes solo cuando se hagan pruebas en el intérprete de órdenes, ya que en caso contrario tratará de procesar algunos caracteres. KDiff3 no hará esto, excepto con las secuencias de escape «\"» y «\\». + +Sensibilidad de diff a mayúsculas y minúsculas +Utilice la siguiente orden de preprocesado de coincidencia de línea para convertir todas las entradas a mayúsculas: + sed 's/\(.*\)/\U\1/' +Aquí el «.*» es una expresión regular que incluye a todos los caracteres en la línea. El «\1» en la cadena de reemplazo hace referencia al texto que coincide con el primer par de «\(» y «\)». La «\U» convierte el texto insertado a mayúsculas. + + +Ignorar las claves de control de versión +CVS y otros sistemas de control de versión utilizan algunas claves para insertar cadenas automáticamente generadas (info:/cvs/Keyword sustitución). Todos ellos siguen el modelo «$CLAVE generada texto$». Ahora necesitaremos una orden de preprocesado que elimine solo el texto generado: + sed 's/\$\(Revision\|Author\|Log\|Header\|Date\).*\$/\$\1\$/' + Las «\|» separan las posibles claves. Podría querer modificar esta lista para acomodarla a sus necesidades. La «\» before the «$» es necesaria porque de otra forma «$» coincidirá con el final de la línea. +Mientras experimenta con sed puede llegar a entender y a gustarle las expresiones regulares. Son prácticas porque hay muchos programas que permiten cosas similares. + + +Ignorar números +Ignorar los números en realidad es una opción de construcción. Pero como en otros ejemplos, indica el aspecto que podría tener la orden de preprocesado. + sed 's/[0123456789.-]//g' + Cualquier carácter entre «[» y «]» será una coincidencia y no se reemplazará con nada. + + +Ignorar ciertas columnas +Algunas veces una texto tiene un formato muy estricto y contiene columnas que desearía ignorar, mientras que otras columnas deseará conservarlas para el análisis. En el siguiente ejemplo las primeras cinco columnas (caracteres) se ignorarán, las siguientes diez se conservarán, otras cinco se ignorarán y el resto de la línea se conservará. + sed 's/.....\(..........\).....\(.*\)/\1\2/' + Cada punto «.» coincidirá con cualquier carácter simple. El «\1» y el «\2» en la cadena de reemplazo hacen referencia al texto coincidente dentro del primer y segundo par de «\(» y «\)» indicando el texto que se conservará. + + +Combinar varias sustituciones +Algunas veces deseará aplicar varias sustituciones a la vez. Puede utilizar el punto y coma «;» para separarlas unas de otras. Ejemplo: echo abrakadabra | sed 's/a/o/g;s/\(.*\)/\U\1/' + -> OBROKODOBRO + + + + +Utilizar <command +>perl</command +> en lugar de <command +>sed</command +> +En lugar de sed podría utilizar algo como perl. + perl -p -e 's/EXPREG/REEMPLAZO/MODIFICADORES' + Pero algunos detalles son diferentes en perl. Tenga en cuenta que sed necesita «\(» y «\)» perl necesita solo «(» y «)» sin estar precedido de «\». Ejemplo: sed 's/\(.*\)/\U\1/' + perl -p -e 's/(.*)/\U\1/' + + + + + +Orden de la ejecución de preprocesado +Los datos van pasando por todos los preprocesadores internos y externos en el siguiente orden: + +Preprocesador normal. +Preprocesador de coincidencia de líneas. +Ignorar mayúsculas (conversión a mayúsculas). +Detección de comentarios C/C++. +Ignorar números. +Ignorar espacios en blanco. + +Los datos después del preprocesador normal se conservarán para mostrarse y fusionarse. El resto de operaciones solo modificarán los datos para que los vea el algoritmo de coincidencia de líneas de diff. En alguna ocasión cuando use el preprocesador normal se dará cuenta de que el preprocesador de coincidencia de líneas verá la salida del preprocesador normal como entrada. + + +Aviso +La orden de preprocesado suele ser muy práctica, pero como con cualquier opción que modifique su texto u oculte ciertas diferencias automáticamente, puede saltarse accidentalmente ciertas diferencias y en el peor de los casos destruir datos importantes. Por esta razón, durante una fusión, si &kdiff3; utiliza una orden de preprocesado normal le preguntará si desea desactivarla o no. Pero no se producirá ningún aviso si está activada la orden de preprocesado de líneas coincidentes. La fusión no se completará hasta que se resuelvan los conflictos. Si desactiva «Mostrar espacios en blanco» las diferencias eliminadas con la orden de preprocesado de líneas coincidentes también estarán visibles. Si el botón guardar continúa desactivado durante una fusión (porque aún existen conflictos), asegúrese de activar «Mostrar espacios en blanco». Si no desea fusionar estas diferencias sin importancia de forma manual puede elegir «Seleccionar [A|B|C] para todos los conflictos de espacios en blanco sin resolver» en el menú Fusionar. + + + + + +Comparación y fusión de directorios con &kdiff3; +Iniciar la comparación y fusión del directorio +Frecuentemente los programadores modifican varios archivos en un directorio para conseguir su propósito. Para esto &kdiff3; también le permite comparar y fusionar directorios completos recursivamente. Aunque la comparación y fusión de directorios parezca bastante obvia, existen varios detalles que debería conocer. Lo más importante es el hecho de que la operación podría afectar a muchos archivos. Si no tiene copias de seguridad de los datos originales, podría ser complicado e incluso imposible devolverlos a su estado original. Por lo tanto, antes de realizar una fusión, asegúrese de guardar sus datos en un lugar seguro, de forma que sea posible volver atrás. Si crea un archivo o utiliza algún sistema de control de versiones es cosa suya, pero los programadores experimentados y los integradores pueden necesitan las antiguas fuentes. Y tenga en cuenta que a pesar de que yo (el autor de &kdiff3;) intento hacerlo lo mejor posible, no garantizo que no existan fallos. De acuerdo con la licencia GNU GPL NO EXISTE NINGUNA GARANTÍA para este programa. Por lo tanto, sea humilde y tenga siempre lo siguiente en mente: +
+ Errar es humano, pero para echar las cosas a perder necesita un ordenador. +
+Esto es lo que este programa puede hacer por usted: &kdiff3; ... + + ... lee y compara dos o tres directorios recursivamente. + ... tiene un especial cuidado con los enlaces simbólicos. + ... le permitirá navegar por los directorios con una doble pulsación del ratón. + ... para cada elemento propone una operación de fusión, que puede cambiar antes de iniciar la fusión del directorio. + ... le permite simular la fusión y lista las acciones que se realizarían si se llegasen a llevar a cabo. + ... le permite realizar la fusión, y le permite interactuar cuando sea necesaria la interacción manual. + ... le permite ejecutar las operaciones seleccionadas para todos los elementos (tecla F7) o para el elemento seleccionado (tecla F6). + ... le permite continuar la fusión después de la interacción manual con la tecla F7. + ... crea copias de seguridad opcionales, con la extensión «.orig». + ... + + + +Iniciar la comparación o fusión del directorio +Es similar a la fusión y comparación de archivos. Solo debe especificar los directorios en la línea de órdenes o en el diálogo abrir archivo. +Comparar/fusionar dos directorios: +kdiff3 directorio1 directorio2 + kdiff3 directorio1 directorio2 -o directorio-destino + +Si no se especifica directorio de destino, &kdiff3; usará directorio2. + + +Comparar/fusionar tres directorios: +kdiff3 directorio1 directorio2 directorio3 + kdiff3 directorio1 directorio2 directorio3 -o directorio-destino + +Cuando se fusionen tres directorios directorio1 se utiliza como base para la fusión. Si no se especifica directorio destino, &kdiff3; usará directorio3 como directorio de destino para la fusión. + +Tenga en cuenta que solo la comparación se inicia automáticamente, no la fusión. Para esto debería seleccionar la entrada de menú o la tecla F7 (más detalles a continuación). + + + +Información visible del directorio de fusión +Mientras lee estos directorios se mostrará un cuadro de diálogo en el que se informará del progreso. Si cancela la exploración del directorio, solo se compararán los archivos listados. Cuando se termine la exploración del directorio &kdiff3; mostrará una lista con el resultado... + + + +... y detalles sobre el elemento seleccionado actualmente a la derecha: + + + + + +La columna nombre +Cada archivo y directorio que se encuentre durante la exploración se mostrará aquí en un árbol. Puede seleccionar un elemento pulsando una vez con el ratón. De forma predeterminada los directorios están contraídos. Puede expandirlos y contraerlos pulsando en «+»/«-», con una doble pulsación, o utilizando las teclas Flecha izquierda o Flecha derecha. El menú «Directorio» también contiene dos acciones «Plegar todos los subdirectorios» y «Desplegar todos los subdirectorios» con los que podrá contraer y expandir todos los directorios de una vez. Si hace una doble pulsación sobre un elemento de archivo comenzará la comparación y aparecerá la ventana de diferencias de archivos. +La imagen de la columna nombre reflejará el tipo de archivo en el primer directorio («A»). Puede ser uno de estos: + + Archivo normal. + Directorio normal (imagen de directorio). + Enlace a un archivo (imagen de archivo con una flecha de enlace). + Enlace a un directorio (imagen de directorio con una flecha de enlace). + +Si el tipo de archivo es diferente en el resto de directorios, esto podrá verse en las columnas A/B/C y en la ventana que muestra los detalles sobre el elemento seleccionado. Tenga en cuenta que en este caso la fusión no podrá seleccionarse automáticamente. Cuando inicie la fusión, el usuario será informado de problemas de este tipo. + + +Las columnas A/B/C y el esquema de coloreado +Como puede verse en la imagen superior los colores rojo, verde, amarillo y negro son los que se utilizan en las columnas A/B/C. + + Negro: Este elemento no existe en este directorio. + Verde: El elemento más nuevo. + Amarillo: Más antiguo que verde, más nuevo que rojo. + Rojo: El elemento más antiguo. + +Pero para los elementos que son idénticos en la comparación sus colores son idénticos aunque no coincida la antigüedad. Los directorios se consideran iguales si todos los elementos que contienen son idénticos. Entonces tendrán el mismo color. Pero la antigüedad de un directorio no se considerará para su color. La idea de este esquema de color se basa en dirdiff.Los colores son semejantes a las hojas, que son verdes cuando nacen, se vuelven amarillas más tarde y cuando envejecen se vuelven rojos. + +La columna Operación +Después de comparar los directorios &kdiff3; también evalúa una propuesta para una operación de fusión. Esto se muestra en la columna «Operación». Puede modificar la operación pulsando en la operación que desee cambiar. Aparecerá un pequeño menú y le permitirá seleccionar una operación para este elemento (también puede seleccionar las operaciones a través del teclado. Ctrl+1/2/3/4/Supr seleccionarán A/B/C/Fusionar/Borrar respectivamente si están disponibles). Esta operación se ejecutará durante la fusión. La disponibilidad de estas operaciones dependerá del elemento y del modo de fusión. El modo de fusión será uno de los siguientes: + + Fusión del árbol de directorios («A» será tratada como la base más antigua de ambas). + Fusionar dos directorios. + Sincronizar dos directorios (activado a través de la opción «Sincronizar directorios»). + +En la fusión de tres directorios la operación propuesta será: Si para un elemento... + + ... todos los árboles de directorios son iguales: Copiar desde C. + ... A y C son iguales pero B no: Copiar desde B (o si B no existe, borra el destino, si existe). + ... A y B son iguales pero C no: Copiar desde C (o si C no existe, borra el destino, si existe). + ... B y C son iguales pero A no: Copiar desde C (o si C no existe, borra el destino, si existe). + ... solo existe A: Borrar el destino (si existe). + ... solo existe B: Copiar desde B. + ... solo existe C: Copiar desde C. + ... A, B y C no son iguales: Fusionar. + ... A, B y C no tienen el mismo tipo de archivo (p.ej. A es un directorio, B es un archivo): «Error: Conflicto en los tipos de archivo». Mientras existan elementos como estos la fusión de directorio no comenzará. + +En la fusión de dos directorios la operación propuesta será: Si para un elemento... + + ... ambos directorios son iguales: Copiar desde B. + ... A existe, pero B no: Copiar desde A. + ... B existe, pero no A: Copiar desde B. + ... A y B existe pero no son iguales: Fusionar. + ... A y B no tienen el mismo tipo de archivo (p.ej. A es un directorio, B es un archivo): «Error: Conflicto en los tipos de archivo». Mientras existan de elementos como estos la fusión de directorio no comenzará. + +El modo de sincronización estará activo si solo existen dos directorios, no se ha especificado destino y está activa la opción «Sincronizar directorios». &kdiff3; seleccionará una operación predeterminada de forma que ambos directorios sean idénticos después. Si para un elemento ... + + ... ambos directorios son iguales: No se hará nada. + ... A existe, pero B no: copiar A a B. + ... B existe, pero A no: Copiar B a A. + ... A y B existen, pero no son iguales: Fusionar y guardar el resultado en ambos directorios (para los usuarios el nombre de archivo guardado es B, pero entonces &kdiff3; copiará B a A). + ... A y B no tienen el mismo tipo de archivo (p.ej. A es un directorio, B es un archivo): «Error: Conflicto en los tipos de archivo». Mientras existan de elementos como estos la fusión de directorio no comenzará. + +Cuando se fusionen dos directorios y esté seleccionada la opción «Copiar nuevo en lugar de fusionar», &kdiff3; buscará en las fechas y propondrá como elección el nuevo archivo. Si los archivos no son iguales pero tienen las mismas fechas, la operación contendrá «Error: Las fechas son iguales pero los archivos no». Mientras estos elementos existan no se iniciará la fusión de directorios. + + +La columna estado +Durante la fusión se procesará un archivo tras otro. La columna estado mostrará «Hecho» para los elementos donde se haya producido la operación de fusión, y otro texto si sucede algo inesperado. Cuando se completa una fusión, debería hacer una última comprobación para ver si el estado de todos los elementos es el adecuado. + + +Columnas estadísticas +Cuando está activado en las opciones el modo de comparación de archivos «Análisis completo», &kdiff3; mostrará columnas que contienen el número de conflictos sin resolver, resueltos, no en blanco o de espacios en blanco (la columna resueltos solo se mostrará cuando se comparen o fusionen directorios). + + +Seleccionar archivos listados +Varias opciones influyen en los archivos que se listarán aquí. Algunas son accesibles a través del diálogo preferencias. El menú Directorio contiene las entradas: + «Mostrar archivos idénticos». Archivos que se han detectado como iguales en todos los directorios. + «Mostrar archivos diferentes». Archivos que existen en dos o más directorios pero que no son iguales. + «Mostrar archivos solo en A». Archivos que existen solo en A, pero no en B o C. + «Mostrar archivos solo en B». Archivos que existen solo en B, pero no en A o C. + «Mostrar archivos solo en C». Archivos que existen solo en C, pero no en A o B. + +Active las opciones «Mostrar» para los elementos que desee listar. Si por ejemplo solo desea listar todos los elementos que existan en A o en B pero no en ambos, deberá activar «Mostrar archivos solo en A» y «Mostrar archivos solo en B» y desactivar todas las demás («Mostrar archivos idénticos», «Mostrar archivos diferentes», «Mostrar archivos solo en C»). La lista se actualizará inmediatamente para reflejar los cambios. Estas opciones también se aplican para los directorio con una excepción: Desactivar «Mostrar archivos diferentes» no ocultará ningún directorio. Solo funcionará para los archivos que contenga. Tenga en cuenta que de estas opciones solo es persistente la opción «Mostrar archivos idénticos». Los otros se activarán cuando se inicie &kdiff3;. + + + + + +Hacer una fusión de directorios +Puede fusionar el elemento seleccionado (archivo o directorio) o todos los elementos. Cuando haya hecho todas sus operaciones de elección (en todos los subdirectorios también) podrá iniciar la fusión. Sea consciente de que si no especifica un directorio de destino explícitamente, el destino será «C» en el modo de tres directorios, «B» en el modo de fusión de dos directorios, y en el modo de sincronización será «A» y/o «B». Si ha especificado un directorio de destino marque todos los elementos del árbol que debieran estar en la salida. Existen algunas opciones que hará que se omitan ciertos elementos del directorio de comparación y del de fusión. Marque estas opciones para evitar sorpresas desagradables: + + «Directorios recursivos»: Si está desactivado, no se buscarán los elementos de los directorios. + «Patrón»/«Anti-patrón»: Incluir/excluir elementos que coincidan. + «Excluir archivos ocultos» + «Mostrar» opciones (Mostrar archivos idénticos/diferentes, archivos solo en A/B/C) + +Si cambia las preferencias para listar más archivos, debería volver a buscar a través del menú «Directorio»->«Volver a buscar» (el motivo es que para realizar una comparación rápida &kdiff3; omite la comparación para los archivos suprimidos por este criterio). Si cambia sus patrones de archivo y directorio de exclusión de archivos, la lista de archivos se actualizará inmediatamente al cerrar el diálogo de las opciones. Tenga en cuenta que cuando escribe un nuevo directorio completo también deseará copiar los archivos idénticos. En este caso active la opción «Mostrar archivos idénticos». Si su directorio de destino es una de las entradas, esto no será necesario ya que el archivo ya estará aquí. Si está satisfecho con esto, el resto es sencillo. Para fusionar todos los elementos: Seleccione «Comenzar/continuar fusión de directorio» en el menú «Directorio» o pulse F7 (que es el acceso rápido). Para fusionar solo el elemento actual: Seleccione «Realizar operación para el elemento actual» o pulse F6. Si debido a tipos de archivos conflictivos todavía continúan existiendo operaciones no válidas, aparecerá un mensaje señalándolo, de forma que pueda seleccionar una operación válida para este elemento. Si fusiona todos los elementos aparecerá un diálogo proporcionándole las opciones «Hacer», «Simular» y «Cancelar». + + Seleccione «Simular» si desea ver el resultado sin hacer la fusión. Se mostrará un lista de todas las operaciones. + En caso contrario, seleccione «Hacer» para iniciar la fusión. + +Entonces &kdiff3; realizará las operaciones especificadas para todos los elementos. Si se precisa interacción manual (fusión de un solo archivo), aparecerá una ventana de fusión (vea la gran captura de pantalla). Cuando haya terminado con un archivo, seleccione de nuevo «Comenzar/continuar fusión de directorio» o la tecla F7. Si todavía no la había guardado, un diálogo le preguntará para hacerlo. Entonces &kdiff3; continuará con el siguiente elemento. Cuando &kdiff3; encuentre un error, este se lo indicará con información literal del estado. En la parte inferior de la lista, aparecerán algunos mensajes de error que deberían ayudarle a entender la causa del problema. Cuando continúe con la fusión (tecla F7) &kdiff3; le permitirá reintentar o saltarse el elemento que provocó el problema. Esto significa que antes de continuar puede seleccionar otra operación o resolver el problema por otros medios. Cuando la fusión se haya completado, &kdiff3; le informará a través de un cuadro de diálogo. Si algunos elementos se fusionaron de forma individual &kdiff3; lo recordará (mientras esté en esta sesión de fusión), y no les fusionará nuevamente cuando haga la fusión para todos los elementos. Incluso cuando se salte la fusión o no se guarde nada estos elementos se contarán como completos. Solo cuando cambie la operación de fusión se eliminará el estado «hecho» del elemento y se podrá fusionar de nuevo. + + +Opciones para comparación y fusión de directorios +Las preferencias de &kdiff3; (menú «Preferencias»->«Configurar &kdiff3;») ahora tienen una sección llamada «Fusión de directorio» con estas opciones: + + + Directorios recursivos:Indica si se realizará la búsqueda en los directorios de forma recursiva. + Patrón(es) de archivo(s):Solo los archivos que coincidan con el patrón se colocarán en el árbol. Puede especificarse más de un patrón utilizando el punto y coma «;» como separador. Comodines válidos: «*» y «?» (p. ej. «*.cpp;*.h»). El valor predeterminado es «*». Este patrón no se utiliza en directorios. + Anti-patrón(es) de archivo:Los archivos y directorios que coincidan con este patrón se excluirán del árbol. Se puede especificar más de un patrón utilizando el «;» como separador. Comodines válidos: «*» y «?». El valor predeterminado es «*.orig;*.o;*.obj». + Anti-patrón(es) de directorio:Los archivos y directorios que coincidan con este patrón se excluirán del árbol. Se puede especificar más de un patrón utilizando el «;» como separador. Comodines válidos: «*» y «?». El valor predeterminado es «CVS;deps;.svn». + Uso de CVS-Ignore:Ignora los archivos y directorios que también se vayan a ignorar por el CVS. Muchos archivos generados automáticamente se ignorarán por el CVS. La gran ventaja es que puede ser un directorio especificado a través del archivo local «.cvsignore» (consulte info:/cvs/cvsignore). + Buscar archivos y directorios ocultos:En algunos sistemas de archivos tienen un atributo «Oculto». En otros sistemas el nombre de archivo comienza con un punto («.»), lo que hace que esté oculto. Esta opción le permite decidir si incluir o no estos archivos en el árbol. De forma predeterminada está activado. + Seguir enlaces de archivos:Para los enlaces de los archivos: Cuando esté desactivado, se compararán los enlaces simbólicos. Cuando esté activado, se compararán los archivos que estén detrás de los enlaces. De forma predeterminada está desactivada. + Seguir enlaces de directorios:Para los enlaces de los directorios: Cuando esté desactivado se compararán los enlaces simbólicos. Cuando esté activado, el enlace será tratado como un directorio y se explorará recursivamente (tenga en cuenta que el programa no comprueba si el enlace es «recursivo»). Así por ejemplo, un directorio que contenga un enlace al directorio puede provocar un bucle infinito, y después de cierto tiempo podrá sobrecargar la pila o utilizar toda la memoria, colgando el programa). De forma predeterminada está desactivada. + Comparación de nombres de archivo sensible a mayúsculas y minúsculas:El valor predeterminado es false (falso) para Windows, true (verdadero) para otros sistemas operativos. + Modo de comparación de archivos: + + Comparación binaria:Este es el modo de comparación de archivos predeterminado. + Análisis completo:Hace un análisis completo de cada archivo y muestra las columnas de información estadística (número de conflictos resueltos, sin resolver, no blancos y blancos). El análisis completo es más lento que un simple análisis binario, y mucho más lento cuando se utiliza con archivos que no contienen texto (especifique el anti-patrón archivo). + Validar la fecha de modificación:Si compara directorios grandes sobre una red lenta, es más rápido comparar solo las fechas de modificación y el tamaño del archivo. Pero esta mejora del rendimiento paga el precio de una pequeña inseguridad. Utilice esta opción con cuidado. De forma predeterminada estará desactivada. + Validar el tamaño:Similar a la validación de la fecha. No hace comparaciones reales. Dos archivos se consideran iguales si sus tamaños son iguales. Esto es práctico cuando la operación de copiado no conserva la fecha de modificación. Utilice esta opción con cuidado. De forma predeterminada estará desactivada. + + + Sincronizar directorios:Activa el «Modo sincronizado» cuando se comparan dos directorios y no se especificó el directorio de destino. En este modo las operaciones propuestas se seleccionarán de forma que tras realizar la operación ambos directorios queden iguales. Por ello el resultado de la fusión se escribirá en ambos directorios. De forma predeterminada estará desactivada. + Copiar el más nuevo en vez de fusionar:En lugar de fusionar la operación propuesta será copiar la fuente nueva si hubo algún cambio (considerado inseguro, ya que implica que el otro directorio no ha sido editado. Deberá hacer una comprobación para cada caso). De forma predeterminada estará desactivada. + Archivos de copia de seguridad:Si se reemplaza un archivo o directorio por otro o se borra, se cambiará el nombre de la versión original con la extensión «.orig». Si ya existía un archivo con la extensión «.orig», se borrará sin hacer copia de seguridad. También afecta a la fusión normal de archivos simples, no solo al modo de fusión de directorios. Estará activada por omisión. + + + +Otras funciones en la ventana del directorio de fusión +Modo de pantalla dividida/completa +Normalmente la vista de la lista de fusión de directorios permanece visible cuando se compara o fusiona un solo archivo. Con el ratón puede mover la barra divisoria que separa la lista de archivos de las ventanas de texto diff. Si no desea esto, puede desactivar la «Vista de pantalla dividida» en el menú «Directorio». A continuación utilice «Cambiar vista» en el menú «Directorio» para conmutar entre la lista de archivos y la ventana de texto diff que ocupará la pantalla completa. + +Comparar o fusionar un solo archivo +Probablemente preferirá una doble pulsación del ratón sobre un archivo para compararlos. Sin embargo existe una entrada en el menú «Directorio». También puede fusionar directamente un solo archivo, sin iniciar la fusión del directorio a través de la opción «Fusionar un solo archivo» en el menú «Directorio». Al guardar el resultado, el estado cambiará a «hecho», y el archivo no se fusionará si se inicia una fusión de directorio. Pero tenga en cuenta que la información del estado se perderá cuando vuelva a explorar un directorio: Menú «Directorio»->«Volver a buscar». + +Comparar o fusionar archivos con nombres diferentes +Algunas veces necesitará comparar o fusionar archivos con nombres diferentes (p. ej. el archivo actual y la copia de seguridad en la misma carpeta). Seleccione el archivo exacto pulsando en el icono en la columna A, B o C. El primer archivo seleccionado se marcará con una «A», el segundo y tercero con «B» y «C» con independencia de la columna en la que esté. Solo se podrá seleccionar en la parte superior de los árboles de archivos. Seleccione «Comparar explícitamente archivos seleccionados» o «Fusionar explícitamente archivos seleccionados» desde el menú «Directorio». Estas entradas también aparecerán como menú contextual cuando pulse el botón derecho cuando pulse el último archivo seleccionado. La comparación o fusión de un archivo se realizará en la misma ventana. Si este método se utiliza para directorios se abrirá una ventana nueva. + + + + +Temas variados + +Transferencia de red a través de KIO +KIO-Slaves +La biblioteca KIO de Frameworks implementa transparencia de red a través de los KIO-slaves. &kdiff3; la usa para leer los archivos de entrada y para explorar directorios. Esto significa que puede indicar archivos y directorios locales y en recursos remotos a través de sus URL. Ejemplo: +kdiff3 prueba.cpp ftp://ftp.muylejos.org/prueba.cpp +kdiff3 tar:/home/hacker/archivo.tar.gz/dir ./dir + + +La primera línea compara un archivo local con un archivo en un servidor FTP. La segunda línea compara un directorio con un archivo comprimido con un directorio local. Otros KIO-slaves interesantes son: + +Archivos de la web (http:). +Archivos desde el FTP (ftp:). +Transferencia de archivos cifrados (fish:, sftp:). +Recursos de Windows (smb:). +Archivos locales (file:). + +Otras cosas posibles, aunque probablemente menos útiles, son: + +Páginas de manual (man:). +Páginas de información (info:). + + + +Cómo escribir URL +Un URL tiene una sintaxis diferente comparada con las rutas de los archivos y directorios locales. Algunas cosas a considerar son: + +Una ruta puede ser relativa y puede contener «.» o «..» Esto no es posible para URL, que son siempre absolutos. Los caracteres especiales deben escribirse «escapados» («#» se convertirá en «%23», los espacios se convertirán en «%20» y así sucesivamente). Por ejemplo, un archivo con el nombre «/#foo#», tendrá el URL «file:///%23foo%23». Cuando un URL no funcione tal y como esperaba, intente abrirla primero en Konqueror. + + + + +Capacidades de los KIO-Slaves. +La transparencia de red tiene un inconveniente: No todos los recursos tienen las mismas capacidades. Algunas veces esto es debido al sistema de archivos del servidor, otras al protocolo. Aquí tenemos una pequeña lista de restricciones: + +Algunas veces no permite el uso de enlaces. O no hay forma de distinguir si un enlace apunta a un archivo o a un directorio. Siempre se asume un archivo (ftp:, sftp:). No siempre se puede determinar el tamaño del archivo. Implementación limitada de permisos. No hay posibilidad de modificar los permisos o la hora, por ello los permisos o la hora de la copia puede diferir del original (vea la opción «Verificar tamaño»). La modificación de permisos o de la hora solo es posible en los archivos locales. + + + + + +Utilizar &kdiff3; como un KPart +KDiff3 es un KPart. Actualmente implementa la interfaz KParts::ReadOnlyPart-interface. Su principal utilización es la de visor de diferencias en KDevelop. KDevelop siempre inicia primero el visor interno de diferencias. Para llamar a &kdiff3; pulse el botón derecho del ratón en la ventana de diferencias y seleccione «Mostrar en KDiff3Part» en el menú contextual. &kdiff3; normalmente requiere dos archivos completos como entrada. Cuando se utiliza como una parte &kdiff3; asume que el archivo de entrada es un archivo de parches en formato unificado. &kdiff3; recupera el nombre del archivo original del archivo del parche. Al menos uno de los dos archivos debe estar disponible. &kdiff3; llamará a patch para volver a crear el segundo archivo. En &dolphin; puede seleccionar un archivo de parche y seleccionar «Previsualizar en» - «KDiff3Part» desde el menú contextual. Sea consciente de que esto no funcionará si no está disponible ninguno de los archivos originales, y no será fiable si hubo modificaciones en el(los) archivo(s) original(es) desde que se generó el parche. Cuando se ejecute como una parte, &kdiff3; solo proporcionará la diferencia de dos archivos, una pequeñísima barra de herramientas y un menú. La fusión y comparación de directorios no está permitida. + + + +Uso de &kdiff3; para diferencias de Git y como herramienta de fusión +&kdiff3; se puede usar para las diferencias de Git y como herramienta de fusión. +Solo tiene que añadir las siguientes líneas en su archivo gitconfig. +[diff] + tool = kdiff3 +[difftool "kdiff3"] + path = <ruta al binario de kdiff3 en su sistema> +[difftool] + prompt = false + keepBackup = false + trustExitCode = false +[merge] + tool = kdiff3 +[mergetool] + prompt = false + keepBackup = false + keepTemporaries = false +[mergetool "kdiff3"] + path = <ruta al binario de kdiff3 en su sistema +> + +A continuación, para ver las diferencias entre dos «commits», use git difftool primer_hash segundo_hash --tool=kdiff3 --cc archivo_en_el_árbol_de_git +Para fusionar una rama con &kdiff3;, use git merge nombre_de_la_rama && git mergetool --tool=kdiff3 +Después de resolver los conflictos de fusión del modo habitual, basta con enviar los cambios para terminar la tarea. + + + + +Preguntas y respuestas&reporting.bugs; &updating.documentation; + +¿Por qué se llama «&kdiff3;»? Las herramientas llamadas «KDiff» y «KDiff2» (ahora llamada «Kompare») ya existen. Por tanto «KDiff3» debería sugerir que incluye la fusión de forma similar a la herramienta «diff3» de la colección de herramientas Diff. + +¿Por qué la he liberado bajo la GPL? He utilizado programas GPL durante mucho tiempo y aprendí mucho echando un vistazo a muchas fuentes. Esta es mi forma de dar las «gracias» a todos programadores que han hecho lo mismo. + +Faltan algunos botones y funciones. ¿Que está pasando? Seguramente compiló el código fuente, aunque es probable que no indicara de forma correcta el prefijo para la instalación. Por omisión, cmake intentará instalar en /usr/local, pero luego no se puede encontrar el archivo de recursos de la interfaz de usuario (es decir, kdiff3ui.rc). El archivo README contiene más información sobre el prefijo correcto. + +Algunas líneas que son similares, pero no idénticas aparecen unas al lado de las otras, pero no siempre. ¿Por qué? Las líneas que solo contienen una cantidad diferente de espacios se tratan «igual» al principio, de forma que solo una diferencia en un carácter que no sea un espacio en blanco hará que las líneas sean «diferentes». Si aparecen líneas similares unas al lado de las otras, en realidad es una coincidencia, y sucede algunas veces. Consulte el manual de ayuda de Diff. + +¿Por qué se deben resolver todos los conflictos de fusión antes de guardarlos? Para cada sección ya sea igual o diferente el editor en la ventana de resultado de la fusión recordará su comienzo y su final. Esto es necesario para que los conflictos puedan resolverse manualmente pulsando el botón de la fuente (A, B o C). Esta información se perderá cuando se guarde el texto y es demasiado complicado crear un formato de archivo especial que permita guardar y restaurar toda la información. + +Cómo puedo sincronizar las vista de diferencia y de fusión, de forma que todas muestren la misma posición de texto? Pulse en la columna de resumen situada a la izquierda del texto (Consulte también esto.) + +¿Por qué el editor en la ventana de resultado no tiene una función «deshacer»? Es demasiado esfuerzo por el momento. Siempre puede restaurar una versión a partir de una fuente (A, B o C) pulsando el botón respectivo. Para editar archivos grandes se recomienda utilizar otro editor. + +Cuando eliminó texto, de repente aparece «<Sin línea fuente>» y no se puede borrar. ¿Qué significa y cómo puedo eliminarlo? Para cada sección igual o diferente el editor de la ventana de resultado de la fusión recuerda dónde comienza y dónde termina. «<Sin línea fuente>» significa que no falta nada en una sección, ni siquiera un carácter de línea nueva. Esto puede suceder mientras realiza la fusión automática o mientras está editando. Esto no es un problema, ya que no aparecerá en el archivo guardado. Si desea volver al archivo original seleccione la sección (pulse en la columna de resumen a la izquierda) y después pulse el botón de la fuente con los contenidos necesarios (A/B o C). + +¿Por qué &kdiff3; no permite usar resaltado de sintaxis? &kdiff3; ya utiliza muchos colores para resaltar las diferencias. Más resaltado resultaría confuso. Utilice otro editor para esto. + +Puedo utilizar &kdiff3; para comparar archivos OpenOffice.Org, Word, Excel, PDF, &etc;? A pesar de que &kdiff3; analizará cualquier tipo de archivo, el resultado no será satisfactorio. &kdiff3; se creó para comparar archivos de texto puro. OpenOffice, Word, Excel, etc. guardan mucha más información en los archivos (relativa a tipos de letra, imágenes, páginas, colores, etc.) con la que &kdiff3; no sabe qué hacer. Por tanto &kdiff3; le mostrará el contenido del archivo interpretado como si fuera texto puro, pero esto no es para lo que se utiliza. Desde que muchos programa guardan su contenido en formato XML, puede ser capaz de leer este como texto puro. Por tanto si el cambio es pequeño, &kdiff3; todavía puede ayudarle. La mejor solución si solo desea comparar texto (sin objetos empotrados como imágenes) es utilizar «Seleccionar todo» y «Copiar» en su programa para copiar el texto interesante al portapapeles y a continuación pegar en &kdiff3; el texto en cualquiera de las ventanas de diferencias (Consulte también Seleccionar, copiar y pegar). + +¿Donde está la opción de directorio «Listar solo deltas»? Ahora existen varias opciones «Mostrar» en el menú directorio. Desactivar «Mostrar archivos idénticos» activará «Listar solo deltas» + +¿Cómo puedo realizar una selección grande en la ventana de entrada de diferencias sin tardar demasiado tiempo? Inicie la selección de la forma habitual (pulse y mantenga pulsado el botón izquierdo del ratón). A continuación utilice las teclas de navegación (p.ej. RePag, AvPág) manteniendo pulsado el botón izquierdo del ratón (consulte también Seleccionar, copiar y pegar). + +Aquí hay mucha información, pero ¿su pregunta sigue sin respuesta? Por favor, envíeme su pregunta. Aprecio todos los comentarios. + + + + + + +Créditos y licencia + +&kdiff3; - Herramienta de comparación y fusión de archivos y directorios. +Derechos de autor del programa. 2002-2007. Joachim Eibl joachim.eibl en gmx.de. +Algunas buenas ideas e informes de fallos me llegaron de colegas y de mucha gente a lo largo de la red ¡Gracias! + +Derechos de autor de la documentación. © 2002-2007. Joachim Eibl joachim.eibl en gmx.de. + +Traducido por Santiago Fernández Sancho santi@kde-es.org. &underFDL; &underGPL; + +&documentation.index; + + + diff -Nru kdiff3-1.8.01/po/es/docs/kdiff3/man-kdiff3.1.docbook kdiff3-1.8.3/po/es/docs/kdiff3/man-kdiff3.1.docbook --- kdiff3-1.8.01/po/es/docs/kdiff3/man-kdiff3.1.docbook 1970-01-01 00:00:00.000000000 +0000 +++ kdiff3-1.8.3/po/es/docs/kdiff3/man-kdiff3.1.docbook 2020-06-25 00:19:15.000000000 +0000 @@ -0,0 +1,452 @@ + + +]> + + + +Manual del usuario de KDiff3 +BurkhardLueck Página man de KDiff3. &Burkhard.Lueck.mail; +2019-02-22 +kdiff3 1.8 + + + +kdiff3 +1 + + + +kdiff3 +Herramienta para comparar y fusionar archivos y directorios + + + +kdiff3 archivo archivo archivo alias1 alias2 alias3 alias texto file + + + +Descripción +Compara dos o tres archivos o directorios de entrada. + + + + +Opciones + + + +Ignorado (definido por el usuario). + + + + +Ignorado (definido por el usuario). + + + + +Ignorado (definido por el usuario). + + + + +Ignorado (definido por el usuario). + + + + +Fusionar la entrada. + + + + archivo +Archivo base explícito (para compatibilidad con otras herramientas). + + + + archivo +Archivo de salida. Implica -m. Por ejemplo: -o archivonuevo.txt + + + + archivo +Archivo de salida, también (para compatibilidad con otras herramientas). + + + + +No mostrar la interfaz gráfica si todos los conflictos se pueden resolver automáticamente (necesita archivo). + + + + +No resolver conflictos automáticamente. + + + + alias1 +Sustituto de nombre visible para el archivo de entrada 1 (base). + + + + alias2 +Sustituto de nombre visible para el archivo de entrada 2. + + + + alias3 +Sustituto de nombre visible para el archivo de entrada 3. + + + + alias +Sustituto alternativo de nombre visible. Debe introducirse una vez para cada entrada. + + + + texto +Usar este valor en lugar de una preferencia de configuración. Debe usarlo una vez para cada preferencia. Por ejemplo: AutoAdvance=1. + + + + +Mostrar una lista de las preferencias de configuración y sus valores actuales. + + + + archivo +Usar un archivo de configuración diferente. + + + + +archivo1 a abrir (base, si no se indica usando --). + + + + +archivo2 a abrir. + + + + +archivo2 a abrir. + + + + + + + +Consulte también + +Dispone de documentación de usuario más detallada usando help:/kdiff3 (introduzca esta &URL; en &konqueror; o ejecute khelpcenter help:/kdiff3). +kf5options(7) +qt5options(7) + + + + +Autores +Esta página de manual fue escrita por &Burkhard.Lueck; &Burkhard.Lueck.mail;. + + + diff -Nru kdiff3-1.8.01/po/es/kdiff3fileitemactionplugin.po kdiff3-1.8.3/po/es/kdiff3fileitemactionplugin.po --- kdiff3-1.8.01/po/es/kdiff3fileitemactionplugin.po 2019-05-18 01:01:56.000000000 +0000 +++ kdiff3-1.8.3/po/es/kdiff3fileitemactionplugin.po 2020-06-25 00:18:14.000000000 +0000 @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: \n" -"Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2019-03-22 03:09+0100\n" +"Report-Msgid-Bugs-To: https://bugs.kde.org\n" +"POT-Creation-Date: 2019-08-30 07:40+0200\n" "PO-Revision-Date: 2019-03-22 21:43+0100\n" "Last-Translator: Sofia Priego \n" "Language-Team: Spanish \n" diff -Nru kdiff3-1.8.01/po/es/kdiff3.po kdiff3-1.8.3/po/es/kdiff3.po --- kdiff3-1.8.01/po/es/kdiff3.po 2019-05-18 01:01:56.000000000 +0000 +++ kdiff3-1.8.3/po/es/kdiff3.po 2020-06-25 00:18:14.000000000 +0000 @@ -8,311 +8,314 @@ # santi , 2005, 2006, 2007. # Santiago Fernandez Sancho , 2006, 2008. # Israel Garcia Garcia , 2010, 2011. -# Eloy Cuadra , 2011, 2014, 2018, 2019. +# Eloy Cuadra , 2011, 2014, 2018, 2019, 2020. msgid "" msgstr "" "Project-Id-Version: kdiff3\n" -"Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2019-04-18 08:02+0200\n" -"PO-Revision-Date: 2019-03-09 21:45+0100\n" +"Report-Msgid-Bugs-To: https://bugs.kde.org\n" +"POT-Creation-Date: 2020-06-22 07:48+0200\n" +"PO-Revision-Date: 2020-02-08 20:16+0100\n" "Last-Translator: Sofia Priego \n" "Language-Team: Spanish \n" "Language: es\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: Lokalize 18.12.2\n" +"X-Generator: Lokalize 19.12.2\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" #, kde-format msgctxt "NAME OF TRANSLATORS" msgid "Your names" -msgstr "Eloy Cuadra,Israel García García,Santiago Fernández Sancho" +msgstr "" +"Sofía Priego,Eloy Cuadra,Israel García García,Santiago Fernández Sancho" #, kde-format msgctxt "EMAIL OF TRANSLATORS" msgid "Your emails" -msgstr "ecuadra@eloihr.net,israelgarcia86@gmail.com,santi@kde-es.org" +msgstr "" +"spriego@darksylvania.net,ecuadra@eloihr.net,israelgarcia86@gmail.com," +"santi@kde-es.org" -#: difftextwindow.cpp:412 +#: difftextwindow.cpp:414 #, kde-format msgid "File %1: Line %2" msgstr "Archivo %1: Línea %2" -#: difftextwindow.cpp:414 +#: difftextwindow.cpp:416 #, kde-format msgid "File %1: Line not available" msgstr "Archivo %1: Línea no disponible" -#: difftextwindow.cpp:1780 +#: difftextwindow.cpp:1778 #, kde-format msgid "Encoding:" msgstr "Codificación:" -#: difftextwindow.cpp:1782 mergeresultwindow.cpp:3138 optiondialog.cpp:818 +#: difftextwindow.cpp:1781 mergeresultwindow.cpp:3166 optiondialog.cpp:840 #, kde-format msgid "Line end style:" msgstr "Estilo de fin de línea:" -#: difftextwindow.cpp:1810 directorymergewindow.cpp:382 -#: directorymergewindow.cpp:433 directorymergewindow.cpp:524 -#: directorymergewindow.cpp:3058 directorymergewindow.cpp:3189 -#: directorymergewindow.cpp:3417 mergeresultwindow.cpp:942 -#: mergeresultwindow.cpp:944 mergeresultwindow.cpp:946 -#: mergeresultwindow.cpp:948 mergeresultwindow.cpp:1814 -#: mergeresultwindow.cpp:3170 mergeresultwindow.cpp:3177 optiondialog.cpp:962 -#: optiondialog.cpp:975 pdiff.cpp:833 pdiff.cpp:835 pdiff.cpp:837 pdiff.cpp:839 -#: pdiff.cpp:861 smalldialogs.cpp:124 smalldialogs.cpp:126 smalldialogs.cpp:127 -#: smalldialogs.cpp:130 +#: difftextwindow.cpp:1809 directorymergewindow.cpp:383 +#: directorymergewindow.cpp:434 directorymergewindow.cpp:525 +#: directorymergewindow.cpp:3072 directorymergewindow.cpp:3203 +#: directorymergewindow.cpp:3431 mergeresultwindow.cpp:970 +#: mergeresultwindow.cpp:972 mergeresultwindow.cpp:974 +#: mergeresultwindow.cpp:976 mergeresultwindow.cpp:1842 +#: mergeresultwindow.cpp:3198 mergeresultwindow.cpp:3205 optiondialog.cpp:1002 +#: optiondialog.cpp:1015 pdiff.cpp:823 pdiff.cpp:825 pdiff.cpp:827 +#: pdiff.cpp:829 pdiff.cpp:851 smalldialogs.cpp:131 smalldialogs.cpp:133 +#: smalldialogs.cpp:134 smalldialogs.cpp:137 #, kde-format msgid "A" msgstr "A" -#: difftextwindow.cpp:1810 directorymergewindow.cpp:384 -#: directorymergewindow.cpp:436 directorymergewindow.cpp:526 -#: directorymergewindow.cpp:3064 directorymergewindow.cpp:3190 -#: directorymergewindow.cpp:3418 mergeresultwindow.cpp:942 -#: mergeresultwindow.cpp:944 mergeresultwindow.cpp:950 -#: mergeresultwindow.cpp:952 mergeresultwindow.cpp:1816 -#: mergeresultwindow.cpp:3172 mergeresultwindow.cpp:3179 optiondialog.cpp:963 -#: optiondialog.cpp:976 pdiff.cpp:833 pdiff.cpp:835 pdiff.cpp:841 pdiff.cpp:843 -#: pdiff.cpp:863 smalldialogs.cpp:124 smalldialogs.cpp:125 smalldialogs.cpp:128 -#: smalldialogs.cpp:131 +#: difftextwindow.cpp:1809 directorymergewindow.cpp:385 +#: directorymergewindow.cpp:437 directorymergewindow.cpp:527 +#: directorymergewindow.cpp:3078 directorymergewindow.cpp:3204 +#: directorymergewindow.cpp:3432 mergeresultwindow.cpp:970 +#: mergeresultwindow.cpp:972 mergeresultwindow.cpp:978 +#: mergeresultwindow.cpp:980 mergeresultwindow.cpp:1844 +#: mergeresultwindow.cpp:3200 mergeresultwindow.cpp:3207 optiondialog.cpp:1003 +#: optiondialog.cpp:1016 pdiff.cpp:823 pdiff.cpp:825 pdiff.cpp:831 +#: pdiff.cpp:833 pdiff.cpp:853 smalldialogs.cpp:131 smalldialogs.cpp:132 +#: smalldialogs.cpp:135 smalldialogs.cpp:138 #, kde-format msgid "B" msgstr "B" -#: difftextwindow.cpp:1810 directorymergewindow.cpp:386 -#: directorymergewindow.cpp:439 directorymergewindow.cpp:528 -#: directorymergewindow.cpp:3070 directorymergewindow.cpp:3191 -#: directorymergewindow.cpp:3419 mergeresultwindow.cpp:946 -#: mergeresultwindow.cpp:948 mergeresultwindow.cpp:950 -#: mergeresultwindow.cpp:952 mergeresultwindow.cpp:1818 -#: mergeresultwindow.cpp:3174 mergeresultwindow.cpp:3181 optiondialog.cpp:977 -#: pdiff.cpp:837 pdiff.cpp:839 pdiff.cpp:841 pdiff.cpp:843 pdiff.cpp:865 -#: smalldialogs.cpp:125 smalldialogs.cpp:126 smalldialogs.cpp:129 -#: smalldialogs.cpp:132 +#: difftextwindow.cpp:1809 directorymergewindow.cpp:387 +#: directorymergewindow.cpp:440 directorymergewindow.cpp:529 +#: directorymergewindow.cpp:3084 directorymergewindow.cpp:3205 +#: directorymergewindow.cpp:3433 mergeresultwindow.cpp:974 +#: mergeresultwindow.cpp:976 mergeresultwindow.cpp:978 +#: mergeresultwindow.cpp:980 mergeresultwindow.cpp:1846 +#: mergeresultwindow.cpp:3202 mergeresultwindow.cpp:3209 optiondialog.cpp:1017 +#: pdiff.cpp:827 pdiff.cpp:829 pdiff.cpp:831 pdiff.cpp:833 pdiff.cpp:855 +#: smalldialogs.cpp:132 smalldialogs.cpp:133 smalldialogs.cpp:136 +#: smalldialogs.cpp:139 #, kde-format msgid "C" msgstr "C" -#: difftextwindow.cpp:1810 +#: difftextwindow.cpp:1809 #, kde-format msgid "A (Base)" msgstr "A (Base)" -#: difftextwindow.cpp:1812 +#: difftextwindow.cpp:1811 #, kde-format msgid "Encoding: %1" msgstr "Codificando: %1" -#: difftextwindow.cpp:1813 mergeresultwindow.cpp:3183 +#: difftextwindow.cpp:1812 mergeresultwindow.cpp:3211 #, kde-format msgid "Unix" msgstr "Unix" -#: difftextwindow.cpp:1813 mergeresultwindow.cpp:3184 +#: difftextwindow.cpp:1812 mergeresultwindow.cpp:3212 #, kde-format msgid "DOS" msgstr "DOS" -#: difftextwindow.cpp:1813 +#: difftextwindow.cpp:1812 #, kde-format msgid "Line end style: %1" msgstr "Estilo de fin de línea: %1" -#: difftextwindow.cpp:1835 kdiff3.cpp:873 +#: difftextwindow.cpp:1834 kdiff3.cpp:874 #, kde-format msgid "Top line" msgstr "Línea superior" -#: difftextwindow.cpp:1845 +#: difftextwindow.cpp:1843 #, kde-format msgid "End" msgstr "Fin" -#: difftextwindow.cpp:1903 smalldialogs.cpp:235 +#: difftextwindow.cpp:1901 smalldialogs.cpp:245 #, kde-format msgid "Open File" msgstr "Abrir archivo" -#: difftextwindow.cpp:1951 optiondialog.cpp:387 +#: difftextwindow.cpp:1943 optiondialog.cpp:389 #, kde-format msgid "Unicode, 8 bit" msgstr "Unicode, 8 bit" -#: difftextwindow.cpp:1966 +#: difftextwindow.cpp:1958 #, kde-format msgid "Other" msgstr "Otro" -#: directorymergewindow.cpp:409 directorymergewindow.cpp:3424 +#: directorymergewindow.cpp:410 directorymergewindow.cpp:3438 #, kde-format msgid "Copy A to B" msgstr "Copiar A a B" -#: directorymergewindow.cpp:412 directorymergewindow.cpp:3425 +#: directorymergewindow.cpp:413 directorymergewindow.cpp:3439 #, kde-format msgid "Copy B to A" msgstr "Copiar B a A" -#: directorymergewindow.cpp:415 directorymergewindow.cpp:3426 +#: directorymergewindow.cpp:416 directorymergewindow.cpp:3440 #, kde-format msgid "Delete A" msgstr "Borrar A" -#: directorymergewindow.cpp:418 directorymergewindow.cpp:3427 +#: directorymergewindow.cpp:419 directorymergewindow.cpp:3441 #, kde-format msgid "Delete B" msgstr "Borrar B" -#: directorymergewindow.cpp:421 +#: directorymergewindow.cpp:422 #, kde-format msgid "Delete A & B" msgstr "Borrar A y B" -#: directorymergewindow.cpp:424 directorymergewindow.cpp:3429 +#: directorymergewindow.cpp:425 directorymergewindow.cpp:3443 #, kde-format msgid "Merge to A" msgstr "Fusionar a A" -#: directorymergewindow.cpp:427 directorymergewindow.cpp:3430 +#: directorymergewindow.cpp:428 directorymergewindow.cpp:3444 #, kde-format msgid "Merge to B" msgstr "Fusionar a B" -#: directorymergewindow.cpp:430 +#: directorymergewindow.cpp:431 #, kde-format msgid "Merge to A & B" msgstr "Fusionar a A y B" -#: directorymergewindow.cpp:442 directorymergewindow.cpp:3421 +#: directorymergewindow.cpp:443 directorymergewindow.cpp:3435 #, kde-format msgid "Delete (if exists)" msgstr "Borrar (si existe)" -#: directorymergewindow.cpp:445 directorymergewindow.cpp:448 -#: directorymergewindow.cpp:3420 optiondialog.cpp:925 smalldialogs.cpp:113 +#: directorymergewindow.cpp:446 directorymergewindow.cpp:449 +#: directorymergewindow.cpp:3434 smalldialogs.cpp:120 #, kde-format msgid "Merge" msgstr "Fusionar" -#: directorymergewindow.cpp:445 directorymergewindow.cpp:448 +#: directorymergewindow.cpp:446 directorymergewindow.cpp:449 #, kde-format msgid "Merge (manual)" msgstr "Fusionar (manual)" -#: directorymergewindow.cpp:451 +#: directorymergewindow.cpp:452 #, kde-format msgid "Error: Conflicting File Types" msgstr "Error: Conflicto de tipos de archivo" -#: directorymergewindow.cpp:454 +#: directorymergewindow.cpp:455 #, kde-format msgid "Error: Changed and Deleted" msgstr "Error: Cambiado y borrando" -#: directorymergewindow.cpp:457 +#: directorymergewindow.cpp:458 #, kde-format msgid "Error: Dates are equal but files are not." msgstr "Error: Las fechas son iguales pero los archivos no." -#: directorymergewindow.cpp:471 +#: directorymergewindow.cpp:472 #, kde-format msgid "Done" msgstr "Terminado" -#: directorymergewindow.cpp:473 +#: directorymergewindow.cpp:474 #, kde-format msgid "Error" msgstr "Error" -#: directorymergewindow.cpp:475 +#: directorymergewindow.cpp:476 #, kde-format msgid "Skipped." msgstr "Omitido." -#: directorymergewindow.cpp:477 +#: directorymergewindow.cpp:478 #, kde-format msgid "Not saved." msgstr "Sin guardar." -#: directorymergewindow.cpp:479 +#: directorymergewindow.cpp:480 #, kde-format msgid "In progress..." msgstr "En progreso..." -#: directorymergewindow.cpp:481 +#: directorymergewindow.cpp:482 #, kde-format msgid "To do." msgstr "Por hacer." -#: directorymergewindow.cpp:522 +#: directorymergewindow.cpp:523 #, kde-format msgid "Name" msgstr "Nombre" -#: directorymergewindow.cpp:530 +#: directorymergewindow.cpp:531 #, kde-format msgid "Operation" msgstr "Operación" -#: directorymergewindow.cpp:532 +#: directorymergewindow.cpp:533 #, kde-format msgid "Status" msgstr "Estado" -#: directorymergewindow.cpp:534 +#: directorymergewindow.cpp:535 #, kde-format msgid "Unsolved" msgstr "Sin resolver" -#: directorymergewindow.cpp:536 +#: directorymergewindow.cpp:537 #, kde-format msgid "Solved" msgstr "Resuelto" -#: directorymergewindow.cpp:538 +#: directorymergewindow.cpp:539 #, kde-format msgid "Nonwhite" msgstr "No blanco" -#: directorymergewindow.cpp:540 +#: directorymergewindow.cpp:541 #, kde-format msgid "White" msgstr "Blanco" -#: directorymergewindow.cpp:674 +#: directorymergewindow.cpp:676 #, kde-format msgid "Unable to compare non-normal file with normal file." msgstr "No se puede comparar un archivo no normal con otro normal." -#: directorymergewindow.cpp:688 +#: directorymergewindow.cpp:690 #, kde-format msgid "Mix of links and normal files." msgstr "Mezcla de enlaces y archivos normales." -#: directorymergewindow.cpp:695 +#: directorymergewindow.cpp:697 #, kde-format msgid "Link: " msgstr "Enlace: " -#: directorymergewindow.cpp:704 +#: directorymergewindow.cpp:706 #, kde-format msgid "Size. " msgstr "Tamaño: " -#: directorymergewindow.cpp:718 directorymergewindow.cpp:728 +#: directorymergewindow.cpp:720 directorymergewindow.cpp:730 #, kde-format msgid "Date & Size: " msgstr "Fecha y tamaño: " -#: directorymergewindow.cpp:748 +#: directorymergewindow.cpp:751 #, kde-format msgid "Comparing file..." msgstr "Comparando archivo..." -#: directorymergewindow.cpp:801 +#: directorymergewindow.cpp:813 #, kde-format msgid "" "You are currently doing a directory merge. Are you sure, you want to abort " @@ -321,48 +324,48 @@ "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:802 kdiff3.cpp:698 kdiff3.cpp:708 kdiff3.cpp:720 -#: mergeresultwindow.cpp:372 pdiff.cpp:1033 pdiff.cpp:1910 pdiff.cpp:1920 +#: directorymergewindow.cpp:814 kdiff3.cpp:697 kdiff3.cpp:707 kdiff3.cpp:719 +#: mergeresultwindow.cpp:400 pdiff.cpp:1031 pdiff.cpp:1920 pdiff.cpp:1930 #, kde-format msgid "Warning" msgstr "Aviso" -#: directorymergewindow.cpp:803 directorymergewindow.cpp:3393 +#: directorymergewindow.cpp:815 directorymergewindow.cpp:3407 #, kde-format msgid "Rescan" msgstr "Volver a buscar" -#: directorymergewindow.cpp:804 pdiff.cpp:1035 +#: directorymergewindow.cpp:816 pdiff.cpp:1033 #, kde-format msgid "Continue Merging" msgstr "Continuar fusionando" -#: directorymergewindow.cpp:971 +#: directorymergewindow.cpp:984 #, kde-format msgid "Opening of directories failed:" msgstr "Falló la apertura de directorios:" -#: directorymergewindow.cpp:975 +#: directorymergewindow.cpp:988 #, 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:980 +#: directorymergewindow.cpp:993 #, 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:985 +#: directorymergewindow.cpp:998 #, 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:988 +#: directorymergewindow.cpp:1001 #, kde-format msgid "Directory Open Error" msgstr "Error al abrir directorio" -#: directorymergewindow.cpp:996 +#: directorymergewindow.cpp:1009 #, kde-format msgid "" "The destination directory must not be the same as A or B when three " @@ -373,49 +376,49 @@ "directorio estan fusionados.\n" "Compruebe de nuevo antes de continuar." -#: directorymergewindow.cpp:998 +#: directorymergewindow.cpp:1011 #, kde-format msgid "Parameter Warning" msgstr "Advertencia en el parámetro" -#: directorymergewindow.cpp:1003 +#: directorymergewindow.cpp:1016 #, kde-format msgid "Scanning directories..." msgstr "Escaneando directorios..." -#: directorymergewindow.cpp:1029 +#: directorymergewindow.cpp:1042 #, kde-format msgid "Reading Directory A" msgstr "Leyendo directorio A" -#: directorymergewindow.cpp:1038 +#: directorymergewindow.cpp:1051 #, kde-format msgid "Reading Directory B" msgstr "Leyendo directorio B" -#: directorymergewindow.cpp:1048 +#: directorymergewindow.cpp:1061 #, kde-format msgid "Reading Directory C" msgstr "Leyendo directorio C" -#: directorymergewindow.cpp:1064 +#: directorymergewindow.cpp:1077 #, kde-format msgid "Some subdirectories were not readable in" msgstr "Algunos subdirectorios no se pudieron leer" -#: directorymergewindow.cpp:1069 +#: directorymergewindow.cpp:1082 #, kde-format msgid "Check the permissions of the subdirectories." msgstr "Comprobar los permisos de los subdirectorios." -#: directorymergewindow.cpp:1106 kdiff3.cpp:666 kdiff3.cpp:753 kdiff3.cpp:777 -#: kdiff3.cpp:1065 kdiff3.cpp:1086 pdiff.cpp:1116 pdiff.cpp:1170 pdiff.cpp:1218 -#: pdiff.cpp:1234 pdiff.cpp:1277 pdiff.cpp:1301 +#: directorymergewindow.cpp:1119 kdiff3.cpp:665 kdiff3.cpp:752 kdiff3.cpp:776 +#: kdiff3.cpp:1072 kdiff3.cpp:1093 pdiff.cpp:1115 pdiff.cpp:1178 pdiff.cpp:1228 +#: pdiff.cpp:1244 pdiff.cpp:1287 pdiff.cpp:1311 #, kde-format msgid "Ready." msgstr "Listo." -#: directorymergewindow.cpp:1121 +#: directorymergewindow.cpp:1134 #, kde-format msgid "" "Directory Comparison Status\n" @@ -430,22 +433,22 @@ "Número de archivos idénticos: %2\n" "Número de archivos distintos: %3" -#: directorymergewindow.cpp:1128 +#: directorymergewindow.cpp:1141 #, kde-format msgid "Number of manual merges: %1" msgstr "Número de fusiones manuales: %1" -#: directorymergewindow.cpp:1394 +#: directorymergewindow.cpp:1407 #, kde-format msgid "This affects all merge operations." msgstr "Esto afecta a todas las operaciones de fusión." -#: directorymergewindow.cpp:1395 +#: directorymergewindow.cpp:1408 #, kde-format msgid "Changing All Merge Operations" msgstr "Cambiando todas las operaciones de fusión" -#: directorymergewindow.cpp:1695 +#: directorymergewindow.cpp:1708 #, kde-format msgid "" "Processing %1 / %2\n" @@ -454,44 +457,44 @@ "Procesando %1 / %2\n" "%3" -#: directorymergewindow.cpp:1738 directorymergewindow.cpp:1742 +#: directorymergewindow.cpp:1751 directorymergewindow.cpp:1755 #, kde-format msgid "Some files could not be processed." msgstr "No se han podido procesar algunos archivos." -#: directorymergewindow.cpp:2222 directorymergewindow.cpp:2247 -#: directorymergewindow.cpp:2271 +#: directorymergewindow.cpp:2235 directorymergewindow.cpp:2260 +#: directorymergewindow.cpp:2285 #, kde-format msgid "This operation is currently not possible." msgstr "Esta operación no es posible actualmente." -#: directorymergewindow.cpp:2222 directorymergewindow.cpp:2247 -#: directorymergewindow.cpp:2271 directorymergewindow.cpp:2552 +#: directorymergewindow.cpp:2235 directorymergewindow.cpp:2260 +#: directorymergewindow.cpp:2285 directorymergewindow.cpp:2565 #, kde-format msgid "Operation Not Possible" msgstr "Operación imposible" -#: directorymergewindow.cpp:2318 +#: directorymergewindow.cpp:2332 #, kde-format msgid "An error occurred while copying." msgstr "Ha ocurrido un error al copiar." -#: directorymergewindow.cpp:2319 directorymergewindow.cpp:2759 +#: directorymergewindow.cpp:2333 directorymergewindow.cpp:2772 #, kde-format msgid "Merge Error" msgstr "Error de fusión" -#: directorymergewindow.cpp:2396 +#: directorymergewindow.cpp:2410 #, kde-format msgid "Unknown merge operation. (This must never happen!)" msgstr "Operación de fusión desconocida. (Esto no debe ocurrir nunca)" -#: directorymergewindow.cpp:2441 +#: directorymergewindow.cpp:2455 #, kde-format msgid "Unknown merge operation." msgstr "Operación de fusión desconocida." -#: directorymergewindow.cpp:2454 +#: directorymergewindow.cpp:2468 #, kde-format msgid "" "The merge is about to begin.\n" @@ -512,22 +515,22 @@ "NINGUNA GARANTÍA en ningún caso. ¡Haga copias de respaldo de sus datos " "importantes!" -#: directorymergewindow.cpp:2459 +#: directorymergewindow.cpp:2473 #, kde-format msgid "Starting Merge" msgstr "Comenzando fusión" -#: directorymergewindow.cpp:2460 +#: directorymergewindow.cpp:2474 #, kde-format msgid "Do It" msgstr "Hacerlo" -#: directorymergewindow.cpp:2461 +#: directorymergewindow.cpp:2475 #, kde-format msgid "Simulate It" msgstr "Simularlo" -#: directorymergewindow.cpp:2487 +#: directorymergewindow.cpp:2501 #, kde-format msgid "" "The highlighted item has a different type in the different directories. " @@ -536,7 +539,7 @@ "El elemento marcado tiene un tipo diferente en los diferentes directorios. " "Seleccione qué hacer." -#: directorymergewindow.cpp:2491 +#: directorymergewindow.cpp:2505 #, kde-format msgid "" "The modification dates of the file are equal but the files are not. Select " @@ -545,7 +548,7 @@ "Las fechas de modificación del archivo son iguales pero los archivos no. " "Seleccionar qué hacer." -#: directorymergewindow.cpp:2495 +#: directorymergewindow.cpp:2509 #, kde-format msgid "" "The highlighted item was changed in one directory and deleted in the other. " @@ -554,7 +557,7 @@ "El elemento marcado está cambiado en una carpeta y borrado en la otra. " "Seleccione qué hacer." -#: directorymergewindow.cpp:2552 +#: directorymergewindow.cpp:2565 #, kde-format msgid "" "This operation is currently not possible because directory merge is " @@ -563,7 +566,7 @@ "Esta operación no es posible actualmente porque se está ejecutando una " "fusión de directorios." -#: directorymergewindow.cpp:2609 +#: directorymergewindow.cpp:2622 #, kde-format msgid "" "There was an error in the last step.\n" @@ -574,32 +577,32 @@ "¿Desea continuar con el elemento que causó el error o desea omitir este " "elemento?" -#: directorymergewindow.cpp:2611 +#: directorymergewindow.cpp:2624 #, kde-format msgid "Continue merge after an error" msgstr "Continuar la fusión después de un error" -#: directorymergewindow.cpp:2612 +#: directorymergewindow.cpp:2625 #, kde-format msgid "Continue With Last Item" msgstr "Continuar con el último elemento" -#: directorymergewindow.cpp:2613 +#: directorymergewindow.cpp:2626 #, kde-format msgid "Skip Item" msgstr "Omitir elemento" -#: directorymergewindow.cpp:2709 +#: directorymergewindow.cpp:2722 #, kde-format msgid "Merge operation complete." msgstr "Operación de fusión completa." -#: directorymergewindow.cpp:2709 directorymergewindow.cpp:2712 +#: directorymergewindow.cpp:2722 directorymergewindow.cpp:2725 #, kde-format msgid "Merge Complete" msgstr "Fusión completa" -#: directorymergewindow.cpp:2722 +#: directorymergewindow.cpp:2735 #, kde-format msgid "" "Simulated merge complete: Check if you agree with the proposed operations." @@ -607,50 +610,50 @@ "Fusión simulada completa. Compruebe si está de acuerdo con las operaciones " "propuestas." -#: directorymergewindow.cpp:2758 +#: directorymergewindow.cpp:2771 #, kde-format msgid "An error occurred. Press OK to see detailed information." msgstr "" "Ha ocurrido un error. Pulse «Aceptar» para ver información mas detallada." -#: directorymergewindow.cpp:2791 +#: directorymergewindow.cpp:2804 #, kde-format msgid "Error: While deleting %1: Creating backup failed." msgstr "Error: Mientras se borraba %1: Falló la creación de copia de respaldo." -#: directorymergewindow.cpp:2798 +#: directorymergewindow.cpp:2811 #, kde-format msgid "delete directory recursively( %1 )" msgstr "borrar directorio recursivamente( %1 )" -#: directorymergewindow.cpp:2800 +#: directorymergewindow.cpp:2813 #, kde-format msgid "delete( %1 )" msgstr "borrar( %1 )" -#: directorymergewindow.cpp:2815 +#: directorymergewindow.cpp:2828 #, kde-format msgid "Error: delete dir operation failed while trying to read the directory." msgstr "" "Error: la operación de borrado de directorio falló al intentar leer el " "directorio." -#: directorymergewindow.cpp:2834 +#: directorymergewindow.cpp:2847 #, kde-format msgid "Error: rmdir( %1 ) operation failed." msgstr "Error: la operación rmdir( %1 ) falló." -#: directorymergewindow.cpp:2844 +#: directorymergewindow.cpp:2857 #, kde-format msgid "Error: delete operation failed." msgstr "Error: falló la operación de borrado." -#: directorymergewindow.cpp:2870 +#: directorymergewindow.cpp:2884 #, kde-format msgid "manual merge( %1, %2, %3 -> %4)" msgstr "fusión manual ( %1, %2, %3 -> %4)" -#: directorymergewindow.cpp:2873 +#: directorymergewindow.cpp:2887 #, kde-format msgid "" " Note: After a manual merge the user should continue by pressing F7." @@ -658,182 +661,182 @@ " Nota: Después de una fusión manual el usuario puede continuar " "presionando F7." -#: directorymergewindow.cpp:2900 +#: directorymergewindow.cpp:2914 #, 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:2909 +#: directorymergewindow.cpp:2923 #, kde-format msgid "copyLink( %1 -> %2 )" msgstr "copyLink( %1 -> %2 )" -#: directorymergewindow.cpp:2918 +#: directorymergewindow.cpp:2932 #, kde-format msgid "Error: copyLink failed: Remote links are not yet supported." msgstr "" "Error: falló copyLink. Los enlaces remotos no están implementados todavía." -#: directorymergewindow.cpp:2928 +#: directorymergewindow.cpp:2942 #, kde-format msgid "Error: copyLink failed." msgstr "Error: falló copyLink." -#: directorymergewindow.cpp:2953 +#: directorymergewindow.cpp:2967 #, kde-format msgid "copy( %1 -> %2 )" msgstr "copy( %1 -> %2 )" -#: directorymergewindow.cpp:2979 +#: directorymergewindow.cpp:2993 #, kde-format msgid "Error during rename( %1 -> %2 ): Cannot delete existing destination." msgstr "" "Error durante el cambio de nombre( %1 -> %2 ): No se puede borrar un destino " "existente." -#: directorymergewindow.cpp:2986 +#: directorymergewindow.cpp:3000 #, kde-format msgid "rename( %1 -> %2 )" msgstr "cambiar nombre( %1 -> %2 )" -#: directorymergewindow.cpp:2995 +#: directorymergewindow.cpp:3009 #, kde-format msgid "Error: Rename failed." msgstr "Error: Fallo al cambiar el nombre." -#: directorymergewindow.cpp:3013 +#: directorymergewindow.cpp:3027 #, kde-format msgid "Error during makeDir of %1. Cannot delete existing file." msgstr "Error durante makeDir de %1. No se puede borrar un archivo existente." -#: directorymergewindow.cpp:3030 +#: directorymergewindow.cpp:3044 #, kde-format msgid "makeDir( %1 )" msgstr "makeDir( %1 )" -#: directorymergewindow.cpp:3040 +#: directorymergewindow.cpp:3054 #, kde-format msgid "Error while creating directory." msgstr "Error al crear el directorio." -#: directorymergewindow.cpp:3076 directorymergewindow.cpp:3195 +#: directorymergewindow.cpp:3090 directorymergewindow.cpp:3209 #, kde-format msgid "Dest" msgstr "Dest" -#: directorymergewindow.cpp:3084 directorymergewindow.cpp:3113 +#: directorymergewindow.cpp:3098 directorymergewindow.cpp:3127 #, kde-format msgid "Dir" msgstr "Dir" -#: directorymergewindow.cpp:3084 +#: directorymergewindow.cpp:3098 #, kde-format msgid "Type" msgstr "Tipo" -#: directorymergewindow.cpp:3084 +#: directorymergewindow.cpp:3098 #, kde-format msgid "Size" msgstr "Tamaño" -#: directorymergewindow.cpp:3085 +#: directorymergewindow.cpp:3099 #, kde-format msgid "Attr" msgstr "Atrib" -#: directorymergewindow.cpp:3085 +#: directorymergewindow.cpp:3099 #, kde-format msgid "Last Modification" msgstr "Última modificación" -#: directorymergewindow.cpp:3085 +#: directorymergewindow.cpp:3099 #, kde-format msgid "Link-Destination" msgstr "Destino del enlace" -#: directorymergewindow.cpp:3113 +#: directorymergewindow.cpp:3127 #, kde-format msgid "File" msgstr "Archivo" -#: directorymergewindow.cpp:3113 +#: directorymergewindow.cpp:3127 #, kde-format msgid "-Link" msgstr "-Enlace" -#: directorymergewindow.cpp:3119 +#: directorymergewindow.cpp:3133 #, kde-format msgid "not available" msgstr "no disponible" -#: directorymergewindow.cpp:3137 +#: directorymergewindow.cpp:3151 #, kde-format msgid "A (Dest): " msgstr "A (Dest): " -#: directorymergewindow.cpp:3141 +#: directorymergewindow.cpp:3155 #, kde-format msgid "A: " msgstr "A: " -#: directorymergewindow.cpp:3141 +#: directorymergewindow.cpp:3155 #, kde-format msgid "A (Base): " msgstr "A (base): " -#: directorymergewindow.cpp:3147 +#: directorymergewindow.cpp:3161 #, kde-format msgid "B (Dest): " msgstr "B (Dest): " -#: directorymergewindow.cpp:3151 +#: directorymergewindow.cpp:3165 #, kde-format msgid "B: " msgstr "B: " -#: directorymergewindow.cpp:3156 +#: directorymergewindow.cpp:3170 #, kde-format msgid "C (Dest): " msgstr "C (Dest): " -#: directorymergewindow.cpp:3160 +#: directorymergewindow.cpp:3174 #, kde-format msgid "C: " msgstr "C: " -#: directorymergewindow.cpp:3163 +#: directorymergewindow.cpp:3177 #, kde-format msgid "Dest: " msgstr "Dest: " #. i18n("Saving Directory Merge State ...")); -#: directorymergewindow.cpp:3238 +#: directorymergewindow.cpp:3252 #, kde-format msgid "Save Directory Merge State As..." msgstr "Guardar estado del directorio de fusión como..." -#: directorymergewindow.cpp:3387 +#: directorymergewindow.cpp:3401 #, kde-format msgid "Start/Continue Directory Merge" msgstr "Comenzar/Continuar fusión de directorio" -#: directorymergewindow.cpp:3388 +#: directorymergewindow.cpp:3402 #, kde-format msgid "Run Operation for Current Item" msgstr "Realizar operación para el elemento actual" -#: directorymergewindow.cpp:3389 +#: directorymergewindow.cpp:3403 #, kde-format msgid "Compare Selected File" msgstr "Comparar el archivo seleccionado" -#: directorymergewindow.cpp:3390 +#: directorymergewindow.cpp:3404 #, kde-format msgid "Merge Current File" msgstr "Fusionar archivo actual" -#: directorymergewindow.cpp:3390 +#: directorymergewindow.cpp:3404 #, kde-format msgid "" "Merge\n" @@ -842,51 +845,51 @@ "Fusionar\n" "archivo" -#: directorymergewindow.cpp:3391 +#: directorymergewindow.cpp:3405 #, kde-format msgid "Fold All Subdirs" msgstr "Plegar todos los subdirectorios" -#: directorymergewindow.cpp:3392 +#: directorymergewindow.cpp:3406 #, kde-format msgid "Unfold All Subdirs" msgstr "Desplegar todos los subdirectorios" #. i18n("Save Directory Merge State ..."), 0, this, &DirectoryMergeWindow::slotSaveMergeState, ac, "dir_save_merge_state"); #. i18n("Load Directory Merge State ..."), 0, this, &DirectoryMergeWindow::slotLoadMergeState, ac, "dir_load_merge_state"); -#: directorymergewindow.cpp:3396 +#: directorymergewindow.cpp:3410 #, kde-format msgid "Choose A for All Items" msgstr "Elegir A para todos los elementos" -#: directorymergewindow.cpp:3397 +#: directorymergewindow.cpp:3411 #, kde-format msgid "Choose B for All Items" msgstr "Elegir B para todos los elementos" -#: directorymergewindow.cpp:3398 +#: directorymergewindow.cpp:3412 #, kde-format msgid "Choose C for All Items" msgstr "Elegir C para todos los elementos" -#: directorymergewindow.cpp:3399 +#: directorymergewindow.cpp:3413 #, kde-format msgid "Auto-Choose Operation for All Items" msgstr "Auto-elegir operación para todos los elementos" -#: directorymergewindow.cpp:3400 +#: directorymergewindow.cpp:3414 #, kde-format msgid "No Operation for All Items" msgstr "Ninguna operación para todos los elementos" #. i18n("Synchronize Directories"), 0, this, &DirectoryMergeWindow::slotSynchronizeDirectories, ac, "dir_synchronize_directories"); #. d->m_pDirChooseNewerFiles = GuiUtils::createAction< KToggleAction >(i18n("Copy Newer Files Instead of Merging"), 0, this, &DirectoryMergeWindow::slotChooseNewerFiles, ac, "dir_choose_newer_files"); -#: directorymergewindow.cpp:3405 +#: directorymergewindow.cpp:3419 #, kde-format msgid "Show Identical Files" msgstr "Mostrar archivos idénticos" -#: directorymergewindow.cpp:3405 +#: directorymergewindow.cpp:3419 #, kde-format msgid "" "Identical\n" @@ -895,17 +898,17 @@ "Archivos\n" "idénticos" -#: directorymergewindow.cpp:3406 +#: directorymergewindow.cpp:3420 #, kde-format msgid "Show Different Files" msgstr "Mostrar archivos diferentes" -#: directorymergewindow.cpp:3407 +#: directorymergewindow.cpp:3421 #, kde-format msgid "Show Files only in A" msgstr "Mostrar archivos solo en A" -#: directorymergewindow.cpp:3407 +#: directorymergewindow.cpp:3421 #, kde-format msgid "" "Files\n" @@ -914,12 +917,12 @@ "Archivos\n" "solo en A" -#: directorymergewindow.cpp:3408 +#: directorymergewindow.cpp:3422 #, kde-format msgid "Show Files only in B" msgstr "Mostrar archivos solo en B" -#: directorymergewindow.cpp:3408 +#: directorymergewindow.cpp:3422 #, kde-format msgid "" "Files\n" @@ -928,12 +931,12 @@ "Archivos\n" "solo en B" -#: directorymergewindow.cpp:3409 +#: directorymergewindow.cpp:3423 #, kde-format msgid "Show Files only in C" msgstr "Mostrar archivos solo en C" -#: directorymergewindow.cpp:3409 +#: directorymergewindow.cpp:3423 #, kde-format msgid "" "Files\n" @@ -942,52 +945,59 @@ "Archivos\n" "solo en C" -#: directorymergewindow.cpp:3413 +#: directorymergewindow.cpp:3427 #, kde-format msgid "Compare Explicitly Selected Files" msgstr "Comparar explícitamente los archivos seleccionados" -#: directorymergewindow.cpp:3414 +#: directorymergewindow.cpp:3428 #, kde-format msgid "Merge Explicitly Selected Files" msgstr "Fusionar explícitamente los archivos seleccionados" -#: directorymergewindow.cpp:3416 directorymergewindow.cpp:3423 +#: directorymergewindow.cpp:3430 directorymergewindow.cpp:3437 #, kde-format msgid "Do Nothing" msgstr "No hacer nada" -#: directorymergewindow.cpp:3428 +#: directorymergewindow.cpp:3442 #, kde-format msgid "Delete A && B" msgstr "Borrar A y B" -#: directorymergewindow.cpp:3431 +#: directorymergewindow.cpp:3445 #, kde-format msgid "Merge to A && B" msgstr "Fusionar a A y B" -#: fileaccess.cpp:462 SourceData.cpp:493 +#: fileaccess.cpp:301 +#, kde-format +msgid "Unable to determine full url. No parent specified." +msgstr "" +"No se ha podido determinar la URL completa. No se ha especificado ningún " +"padre." + +#: fileaccess.cpp:482 SourceData.cpp:506 #, kde-format msgid "Failed to read file: %1" msgstr "Ha fallado la lectura del archivo: %1" -#: fileaccess.cpp:587 +#: fileaccess.cpp:624 #, kde-format msgid "Creating temp copy of %1 failed." msgstr "Falló la creación de la copia temporal de %1." -#: fileaccess.cpp:595 fileaccess.cpp:600 +#: fileaccess.cpp:632 fileaccess.cpp:637 #, kde-format msgid "Opening %1 failed. %2" msgstr "La apertura de %1 ha fallado. %2" -#: fileaccess.cpp:619 fileaccess.cpp:627 +#: fileaccess.cpp:656 fileaccess.cpp:664 #, kde-format msgid "Error reading from %1. %2" msgstr "Error al leer de %1. %2" -#: fileaccess.cpp:751 +#: fileaccess.cpp:788 #, kde-format msgid "" "While trying to make a backup, deleting an older backup failed.\n" @@ -997,7 +1007,7 @@ "hacer una copia de respaldo.\n" "Nombre del archivo: %1" -#: fileaccess.cpp:758 +#: fileaccess.cpp:795 #, kde-format msgid "" "While trying to make a backup, renaming failed.\n" @@ -1007,178 +1017,178 @@ "copia de respaldo.\n" "Nombre de los archivos: %1 -> %2" -#: fileaccess.cpp:828 +#: fileaccess.cpp:865 #, kde-format msgid "Getting file status: %1" msgstr "Obteniendo estado de archivo: %1" -#: fileaccess.cpp:869 +#: fileaccess.cpp:906 #, kde-format msgid "Reading file: %1" msgstr "Leyendo archivo: %1" -#: fileaccess.cpp:907 +#: fileaccess.cpp:944 #, kde-format msgid "Writing file: %1" msgstr "Escribiendo archivo: %1" -#: fileaccess.cpp:940 +#: fileaccess.cpp:977 #, kde-format msgid "Out of memory" msgstr "Fuera de memoria" -#: fileaccess.cpp:976 +#: fileaccess.cpp:1013 #, kde-format msgid "Making directory: %1" msgstr "Creando directorio: %1" -#: fileaccess.cpp:997 +#: fileaccess.cpp:1034 #, kde-format msgid "Removing directory: %1" msgstr "Eliminando directorio: %1" -#: fileaccess.cpp:1012 +#: fileaccess.cpp:1049 #, kde-format msgid "Removing file: %1" msgstr "Eliminando archivo: %1" -#: fileaccess.cpp:1028 +#: fileaccess.cpp:1065 #, kde-format msgid "Creating symbolic link: %1 -> %2" msgstr "Creando enlace simbólico: %1 -> %2" -#: fileaccess.cpp:1052 +#: fileaccess.cpp:1089 #, kde-format msgid "Renaming file: %1 -> %2" msgstr "Renombrando archivo: %1 -> %2" -#: fileaccess.cpp:1086 +#: fileaccess.cpp:1123 #, kde-format msgid "Copying file: %1 -> %2" msgstr "Copiando archivo: %1 -> %2" -#: fileaccess.cpp:1108 +#: fileaccess.cpp:1145 #, kde-format msgid "Reading directory: %1" msgstr "Leyendo directorio: %1" -#: fileaccess.cpp:1162 +#: fileaccess.cpp:1202 #, kde-format msgid "Listing directory: %1" msgstr "Listando directorio: %1" -#: kdiff3.cpp:181 +#: kdiff3.cpp:182 #, kde-format msgid "Current Configuration:" msgstr "Configuración actual:" -#: kdiff3.cpp:186 +#: kdiff3.cpp:187 #, kde-format msgid "Config Option Error:" msgstr "Configuración de la opción de error:" -#: kdiff3.cpp:240 +#: kdiff3.cpp:246 #, kde-format msgid "Option --auto used, but no output file specified." msgstr "Opción --auto usada, pero sin archivo de salida especificado." -#: kdiff3.cpp:416 +#: kdiff3.cpp:405 #, kde-format msgid "Option --auto ignored for directory comparison." msgstr "Opción --auto ignorada para comparación de directorio." -#: kdiff3.cpp:460 +#: kdiff3.cpp:449 #, kde-format msgid "Saving failed." msgstr "Fallo al guardar." -#: kdiff3.cpp:496 pdiff.cpp:1098 +#: kdiff3.cpp:494 pdiff.cpp:1096 #, kde-format msgid "Opening of these files failed:" msgstr "Fallo al abrir estos archivos:" -#: kdiff3.cpp:505 +#: kdiff3.cpp:503 pdiff.cpp:1105 #, kde-format -msgid "File Open Error" -msgstr "Error de apertura de archivo" +msgid "File open error" +msgstr "Error al abrir el archivo" -#: kdiff3.cpp:533 +#: kdiff3.cpp:532 #, kde-format msgid "Opens documents for comparison..." msgstr "Abre documentos para comparación..." -#: kdiff3.cpp:535 +#: kdiff3.cpp:534 #, kde-format msgid "Reload" msgstr "Volver a cargar" -#: kdiff3.cpp:538 +#: kdiff3.cpp:537 #, kde-format 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:540 +#: kdiff3.cpp:539 #, kde-format msgid "Saves the current document as..." msgstr "Guarda el documento actual como..." -#: kdiff3.cpp:543 +#: kdiff3.cpp:542 #, kde-format msgid "Print the differences" msgstr "Imprimir las diferencias" -#: kdiff3.cpp:546 +#: kdiff3.cpp:545 #, kde-format msgid "Quits the application" msgstr "Sale de la aplicación" -#: kdiff3.cpp:549 +#: kdiff3.cpp:548 #, kde-format 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:552 +#: kdiff3.cpp:551 #, kde-format msgid "Copies the selected section to the clipboard" msgstr "Copia la sección seleccionada al portapapeles" -#: kdiff3.cpp:554 +#: kdiff3.cpp:553 #, kde-format msgid "Pastes the clipboard contents to current position" msgstr "Pastes the clipboard contents to current position" -#: kdiff3.cpp:557 +#: kdiff3.cpp:556 #, kde-format msgid "Select everything in current window" msgstr "Seleccionar todo en la ventana actual" -#: kdiff3.cpp:560 +#: kdiff3.cpp:559 #, kde-format msgid "Search for a string" msgstr "Buscar por una cadena" -#: kdiff3.cpp:562 +#: kdiff3.cpp:561 #, kde-format msgid "Search again for the string" msgstr "Buscar de nuevo la cadena" -#: kdiff3.cpp:567 +#: kdiff3.cpp:566 #, kde-format msgid "Enables/disables the statusbar" msgstr "Activar/desactivar la barra de estado" -#: kdiff3.cpp:571 +#: kdiff3.cpp:570 #, kde-format msgid "Configure KDiff3..." msgstr "Configurar KDiff3..." -#: kdiff3.cpp:590 +#: kdiff3.cpp:589 #, kde-format msgid "Go to Current Delta" msgstr "Ir al Delta actual" -#: kdiff3.cpp:590 +#: kdiff3.cpp:589 #, kde-format msgid "" "Current\n" @@ -1187,12 +1197,12 @@ "Delta\n" "actual" -#: kdiff3.cpp:592 +#: kdiff3.cpp:591 #, kde-format msgid "Go to First Delta" msgstr "Ir al primer Delta" -#: kdiff3.cpp:592 +#: kdiff3.cpp:591 #, kde-format msgid "" "First\n" @@ -1201,12 +1211,12 @@ "Primer\n" "delta" -#: kdiff3.cpp:594 +#: kdiff3.cpp:593 #, kde-format msgid "Go to Last Delta" msgstr "Ir al último Delta" -#: kdiff3.cpp:594 +#: kdiff3.cpp:593 #, kde-format msgid "" "Last\n" @@ -1215,14 +1225,14 @@ "Último\n" "delta" -#: kdiff3.cpp:596 +#: kdiff3.cpp:595 #, kde-format 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:597 +#: kdiff3.cpp:596 #, kde-format msgid "" "(Does not skip white space differences even when \"Show White Space\" is " @@ -1231,12 +1241,12 @@ "(No omite diferencias de espacios en blanco incluso cuando «Mostrar espacios " "en blanco» esta desactivado)." -#: kdiff3.cpp:598 +#: kdiff3.cpp:597 #, kde-format msgid "Go to Previous Delta" msgstr "Ir al Delta anterior" -#: kdiff3.cpp:598 +#: kdiff3.cpp:597 #, kde-format msgid "" "Prev\n" @@ -1245,12 +1255,12 @@ "Delta\n" "anterior" -#: kdiff3.cpp:600 +#: kdiff3.cpp:599 #, kde-format msgid "Go to Next Delta" msgstr "Ir al siguiente Delta" -#: kdiff3.cpp:600 +#: kdiff3.cpp:599 #, kde-format msgid "" "Next\n" @@ -1259,12 +1269,12 @@ "Siguiente\n" "Delta" -#: kdiff3.cpp:602 +#: kdiff3.cpp:601 #, kde-format msgid "Go to Previous Conflict" msgstr "Ir al conflicto anterior" -#: kdiff3.cpp:602 +#: kdiff3.cpp:601 #, kde-format msgid "" "Prev\n" @@ -1273,12 +1283,12 @@ "Conflicto\n" "anterior" -#: kdiff3.cpp:604 +#: kdiff3.cpp:603 #, kde-format msgid "Go to Next Conflict" msgstr "Ir al conflicto siguiente" -#: kdiff3.cpp:604 +#: kdiff3.cpp:603 #, kde-format msgid "" "Next\n" @@ -1287,12 +1297,12 @@ "Conflicto\n" "siguiente" -#: kdiff3.cpp:606 +#: kdiff3.cpp:605 #, kde-format msgid "Go to Previous Unsolved Conflict" msgstr "Ir al conflicto anterior sin resolver" -#: kdiff3.cpp:606 +#: kdiff3.cpp:605 #, kde-format msgid "" "Prev\n" @@ -1301,12 +1311,12 @@ "Sin resolver\n" "anterior" -#: kdiff3.cpp:608 +#: kdiff3.cpp:607 #, kde-format msgid "Go to Next Unsolved Conflict" msgstr "Ir al conflicto siguiente sin resolver" -#: kdiff3.cpp:608 +#: kdiff3.cpp:607 #, kde-format msgid "" "Next\n" @@ -1315,12 +1325,12 @@ "Sin resolver\n" "siguiente" -#: kdiff3.cpp:610 +#: kdiff3.cpp:609 #, kde-format msgid "Select Line(s) From A" msgstr "Seleccionar línea(s) de A" -#: kdiff3.cpp:610 +#: kdiff3.cpp:609 #, kde-format msgid "" "Choose\n" @@ -1329,12 +1339,12 @@ "Elegir\n" "A" -#: kdiff3.cpp:611 +#: kdiff3.cpp:610 #, kde-format msgid "Select Line(s) From B" msgstr "Seleccionar línea(s) de B" -#: kdiff3.cpp:611 +#: kdiff3.cpp:610 #, kde-format msgid "" "Choose\n" @@ -1343,12 +1353,12 @@ "Elegir\n" "B" -#: kdiff3.cpp:612 +#: kdiff3.cpp:611 #, kde-format msgid "Select Line(s) From C" msgstr "Seleccionar línea(s) de C" -#: kdiff3.cpp:612 +#: kdiff3.cpp:611 #, kde-format msgid "" "Choose\n" @@ -1357,14 +1367,14 @@ "Elegir\n" "C" -#: kdiff3.cpp:613 +#: kdiff3.cpp:612 #, kde-format 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:613 +#: kdiff3.cpp:612 #, kde-format msgid "" "Auto\n" @@ -1373,12 +1383,12 @@ "Siguiente\n" "automática" -#: kdiff3.cpp:615 +#: kdiff3.cpp:614 #, kde-format msgid "Show Space && Tabulator Characters" msgstr "Mostrar caracteres espacio y tabulador" -#: kdiff3.cpp:615 +#: kdiff3.cpp:614 #, kde-format msgid "" "White\n" @@ -1387,12 +1397,12 @@ "Caracteres\n" "en blanco" -#: kdiff3.cpp:616 +#: kdiff3.cpp:615 #, kde-format msgid "Show White Space" msgstr "Mostar espacio en blanco" -#: kdiff3.cpp:616 +#: kdiff3.cpp:615 #, kde-format msgid "" "White\n" @@ -1401,12 +1411,12 @@ "Deltas en\n" "blanco" -#: kdiff3.cpp:618 +#: kdiff3.cpp:617 #, kde-format msgid "Show Line Numbers" msgstr "Mostar número de líneas" -#: kdiff3.cpp:618 +#: kdiff3.cpp:617 #, kde-format msgid "" "Line\n" @@ -1415,132 +1425,132 @@ "Números de\n" "línea" -#: kdiff3.cpp:620 +#: kdiff3.cpp:619 #, kde-format msgid "Automatically Solve Simple Conflicts" msgstr "Resolver automáticamente conflictos sencillos" -#: kdiff3.cpp:621 +#: kdiff3.cpp:620 #, kde-format msgid "Set Deltas to Conflicts" msgstr "Establecer Deltas a conflictos" -#: kdiff3.cpp:622 +#: kdiff3.cpp:621 #, kde-format msgid "Run Regular Expression Auto Merge" msgstr "Ejecutar expresión regular de fusión automática" -#: kdiff3.cpp:623 +#: kdiff3.cpp:622 #, kde-format msgid "Automatically Solve History Conflicts" msgstr "Resolver automáticamente conflictos históricamente" -#: kdiff3.cpp:624 +#: kdiff3.cpp:623 #, kde-format msgid "Split Diff At Selection" msgstr "Dividir Diff en la selección" -#: kdiff3.cpp:625 +#: kdiff3.cpp:624 #, kde-format msgid "Join Selected Diffs" msgstr "Unir las diferencias seleccionadas" -#: kdiff3.cpp:627 +#: kdiff3.cpp:626 #, kde-format msgid "Show Window A" msgstr "Mostar ventana A" -#: kdiff3.cpp:628 +#: kdiff3.cpp:627 #, kde-format msgid "Show Window B" msgstr "Mostar ventana B" -#: kdiff3.cpp:629 +#: kdiff3.cpp:628 #, kde-format msgid "Show Window C" msgstr "Mostar ventana C" -#: kdiff3.cpp:631 +#: kdiff3.cpp:630 #, kde-format msgid "Normal Overview" msgstr "Vista normal" -#: kdiff3.cpp:632 +#: kdiff3.cpp:631 #, kde-format msgid "A vs. B Overview" msgstr "Vista A vs. B" -#: kdiff3.cpp:633 +#: kdiff3.cpp:632 #, kde-format msgid "A vs. C Overview" msgstr "Vista A vs. C" -#: kdiff3.cpp:634 +#: kdiff3.cpp:633 #, kde-format msgid "B vs. C Overview" msgstr "Vista B vs. C" -#: kdiff3.cpp:635 +#: kdiff3.cpp:634 #, kde-format msgid "Word Wrap Diff Windows" msgstr "Ventanas de diferencias con ajuste de palabra" -#: kdiff3.cpp:636 +#: kdiff3.cpp:635 #, kde-format msgid "Add Manual Diff Alignment" msgstr "Añadir alineación manual de las diferencias" -#: kdiff3.cpp:637 +#: kdiff3.cpp:636 #, kde-format msgid "Clear All Manual Diff Alignments" msgstr "Borrar todas las alineaciones de diferencias manuales" -#: kdiff3.cpp:639 +#: kdiff3.cpp:638 #, kde-format msgid "Focus Next Window" msgstr "Ir a la siguiente ventana" -#: kdiff3.cpp:640 +#: kdiff3.cpp:639 #, kde-format msgid "Focus Prev Window" msgstr "Ir a la ventana anterior" -#: kdiff3.cpp:641 +#: kdiff3.cpp:640 #, kde-format msgid "Toggle Split Orientation" msgstr "Conmutar orientación de división" -#: kdiff3.cpp:643 +#: kdiff3.cpp:642 #, kde-format msgid "Dir && Text Split Screen View" msgstr "Vista de la conmutación de pantalla Dir y Texto" -#: kdiff3.cpp:645 +#: kdiff3.cpp:644 #, kde-format msgid "Toggle Between Dir && Text View" msgstr "Conmutar entre vista Dir y Texto" -#: kdiff3.cpp:697 pdiff.cpp:1909 +#: kdiff3.cpp:696 pdiff.cpp:1919 #, kde-format msgid "The merge result has not been saved." msgstr "El resultado de la fusión no ha sido guardado." -#: kdiff3.cpp:699 +#: kdiff3.cpp:698 #, kde-format msgid "Save && Quit" msgstr "Guardar y salir" -#: kdiff3.cpp:700 +#: kdiff3.cpp:699 #, kde-format msgid "Quit Without Saving" msgstr "Salir sin guardar" -#: kdiff3.cpp:708 pdiff.cpp:1920 +#: kdiff3.cpp:707 pdiff.cpp:1930 #, kde-format msgid "Saving the merge result failed." msgstr "Falló al guardar el resultado de la fusión." -#: kdiff3.cpp:719 pdiff.cpp:1032 +#: kdiff3.cpp:718 pdiff.cpp:1030 #, kde-format msgid "" "You are currently doing a directory merge. Are you sure, you want to abort?" @@ -1548,62 +1558,62 @@ "Actualmente está haciendo una fusión de directorio. ¿Está seguro de que " "desea abandonar?" -#: kdiff3.cpp:742 +#: kdiff3.cpp:741 #, kde-format msgid "Saving file..." msgstr "Guardando archivo..." -#: kdiff3.cpp:759 +#: kdiff3.cpp:758 #, kde-format msgid "Saving file with a new filename..." msgstr "Guardando archivo con un nuevo nombre..." -#: kdiff3.cpp:761 +#: kdiff3.cpp:760 #, kde-format msgid "Save As..." msgstr "Guardar como..." -#: kdiff3.cpp:820 +#: kdiff3.cpp:819 #, kde-format msgid "Printing not implemented." msgstr "Impresión no implementada." -#: kdiff3.cpp:857 +#: kdiff3.cpp:858 #, kde-format msgid "Printing..." msgstr "Impriminendo..." -#: kdiff3.cpp:943 +#: kdiff3.cpp:948 #, kde-format msgid "Printing page %1 of %2" msgstr "Imprimiendo página %1 de %2" -#: kdiff3.cpp:1000 +#: kdiff3.cpp:1006 #, kde-format msgid " (Selection)" msgstr " (Selección)" -#: kdiff3.cpp:1027 +#: kdiff3.cpp:1034 #, kde-format msgid "Printing completed." msgstr "Impresión completada." -#: kdiff3.cpp:1031 +#: kdiff3.cpp:1038 #, kde-format msgid "Printing aborted." msgstr "Impresión cancelada." -#: kdiff3.cpp:1038 +#: kdiff3.cpp:1045 #, kde-format msgid "Exiting..." msgstr "Saliendo..." -#: kdiff3.cpp:1049 +#: kdiff3.cpp:1056 #, kde-format msgid "Toggling toolbar..." msgstr "Cambiando barra de herramientas..." -#: kdiff3.cpp:1070 +#: kdiff3.cpp:1077 #, kde-format msgid "Toggle the statusbar..." msgstr "Conmutar la barra de estado..." @@ -1628,7 +1638,7 @@ msgid "Joachim Eibl" msgstr "Joachim Eibl" -#: kdiff3_part.cpp:173 kdiff3_part.cpp:254 +#: kdiff3_part.cpp:174 kdiff3_part.cpp:255 #, kde-format msgid "Could not find files for comparison." msgstr "No ha sido posible encontrar los archivos a comparar." @@ -1646,7 +1656,7 @@ msgstr "Configurar KDiff3" #. i18n: ectx: ToolBar (mainToolBar) -#: kdiff3_part.rc:16 main.cpp:88 +#: kdiff3_part.rc:16 main.cpp:89 #, kde-format msgid "KDiff3" msgstr "KDiff3" @@ -1716,87 +1726,92 @@ msgid "Main Toolbar" msgstr "Barra de herramientas principal" -#: main.cpp:68 main.cpp:72 +#: main.cpp:69 main.cpp:73 #, kde-format msgid "Ignored. (User defined.)" msgstr "Ignorado. (Definido por el usuario)." -#: main.cpp:92 +#: main.cpp:93 #, kde-format msgid " (64 bit)" msgstr " (64 bits)" -#: main.cpp:94 +#: main.cpp:95 #, kde-format msgid " (32 bit)" msgstr " (32 bits)" -#: main.cpp:95 +#: main.cpp:96 #, kde-format msgid "Tool for Comparison and Merge of Files and Directories" msgstr "Herramienta para comparación y fusión de archivos y directorios" -#: main.cpp:96 +#: main.cpp:97 #, kde-format msgid "(c) 2002-2014 Joachim Eibl, (c) 2017 Michael Reeves KF5/Qt5 port" msgstr "© 2002-2014 Joachim Eibl, © 2017 Michael Reeves (adaptación a KF5/Qt5)" -#: main.cpp:112 +#: main.cpp:113 #, kde-format msgid "Merge the input." msgstr "Fusionar la entrada." -#: main.cpp:113 +#: main.cpp:114 #, kde-format msgid "Explicit base file. For compatibility with certain tools." msgstr "Archivo base explícito. Para compatibilidad con algunas herramientas." -#: main.cpp:114 +#: main.cpp:115 #, kde-format msgid "Output file. Implies -m. E.g.: -o newfile.txt" msgstr "Archivo de salida. Implica -m. E.g.: -o newfile.txt" -#: main.cpp:115 +#: main.cpp:116 #, kde-format msgid "Output file, again. (For compatibility with certain tools.)" msgstr "" "Archivo de salida, de nuevo. (Para compatibilidad con algunas herramientas)." -#: main.cpp:116 +#: main.cpp:118 #, kde-format msgid "No GUI if all conflicts are auto-solvable. (Needs -o file)" msgstr "" "Ninguna interfaz gráfica de usuario si todos los conflictos son auto-" "resolvibles. (necesita archivo -o)" -#: main.cpp:117 +#: main.cpp:120 +#, kde-format +msgid "Ignored." +msgstr "Ignorado." + +#: main.cpp:122 #, kde-format msgid "Do not solve conflicts automatically." msgstr "No resolver conflictos automáticamente." -#: main.cpp:118 +#: main.cpp:123 #, kde-format msgid "Visible name replacement for input file 1 (base)." msgstr "Reemplazamiento visible de nombre para el archivo de entrada 1 (base)." -#: main.cpp:119 +#: main.cpp:124 #, kde-format msgid "Visible name replacement for input file 2." msgstr "Reemplazamiento visible de nombre para el archivo de entrada 2." -#: main.cpp:120 +#: main.cpp:125 #, kde-format msgid "Visible name replacement for input file 3." msgstr "Reemplazamiento visible de nombre para el archivo de entrada 3." -#: main.cpp:121 +#: main.cpp:126 #, kde-format msgid "Alternative visible name replacement. Supply this once for every input." msgstr "" "Reemplazamiento alternativo visible de nombre. Facilitarlo una vez por cada " "entrada." -#: main.cpp:122 +#: main.cpp:127 #, kde-format msgid "" "Override a config setting. Use once for every setting. E.g.: --cs " @@ -1805,89 +1820,89 @@ "Sustituir una opción de configuración. Utilícelo para cada configuración. P. " "ej.: --cs \"AutoAdvance=1\"" -#: main.cpp:123 +#: main.cpp:128 #, kde-format msgid "Show list of config settings and current values." msgstr "Mostrar una lista de las preferencias y valores actuales." -#: main.cpp:124 +#: main.cpp:129 #, kde-format msgid "Use a different config file." msgstr "Utilizar un archivo de configuración diferente." -#: main.cpp:127 +#: main.cpp:132 #, kde-format msgid "file1 to open (base, if not specified via --base)" msgstr "archivo1 a abrir (base, si no se ha especificado vía --base)" -#: main.cpp:128 +#: main.cpp:133 #, kde-format msgid "file2 to open" msgstr "archivo2 a abrir" -#: main.cpp:129 +#: main.cpp:134 #, kde-format msgid "file3 to open" msgstr "archivo3 a abrir" -#: main.cpp:153 +#: main.cpp:158 #, kde-format msgid "See kdiff3 --help for supported options." msgstr "Consulte «kdiff3 --help» para ver las opciones posibles." -#: mergeresultwindow.cpp:158 +#: mergeresultwindow.cpp:171 #, kde-format msgid "Choose A Everywhere" msgstr "Elegir A en cualquier sitio" -#: mergeresultwindow.cpp:159 +#: mergeresultwindow.cpp:172 #, kde-format msgid "Choose B Everywhere" msgstr "Elegir B en cualquier sitio" -#: mergeresultwindow.cpp:160 +#: mergeresultwindow.cpp:173 #, kde-format msgid "Choose C Everywhere" msgstr "Elegir C en cualquier sitio" -#: mergeresultwindow.cpp:161 +#: mergeresultwindow.cpp:174 #, kde-format msgid "Choose A for All Unsolved Conflicts" msgstr "Elegir A para todos los conflictos sin resolver" -#: mergeresultwindow.cpp:162 +#: mergeresultwindow.cpp:175 #, kde-format msgid "Choose B for All Unsolved Conflicts" msgstr "Elegir B para todos los conflictos sin resolver" -#: mergeresultwindow.cpp:163 +#: mergeresultwindow.cpp:176 #, kde-format msgid "Choose C for All Unsolved Conflicts" msgstr "Elegir C para todos los conflictos sin resolver" -#: mergeresultwindow.cpp:164 +#: mergeresultwindow.cpp:177 #, kde-format msgid "Choose A for All Unsolved Whitespace Conflicts" msgstr "Elegir A para todos los conflictos de espacios en blanco sin resolver" -#: mergeresultwindow.cpp:165 +#: mergeresultwindow.cpp:178 #, kde-format msgid "Choose B for All Unsolved Whitespace Conflicts" msgstr "Elegir B para todos los conflictos de espacios en blanco sin resolver" -#: mergeresultwindow.cpp:166 +#: mergeresultwindow.cpp:179 #, kde-format msgid "Choose C for All Unsolved Whitespace Conflicts" msgstr "Elegir C para todos los conflictos de espacios en blanco sin resolver" -#: mergeresultwindow.cpp:176 +#: mergeresultwindow.cpp:204 #, kde-format msgid "Number of remaining unsolved conflicts: %1 (of which %2 are whitespace)" msgstr "" "Número de conflictos sin resolver: %1 (%2 de los cuales son espacios en " "blanco)" -#: mergeresultwindow.cpp:370 +#: mergeresultwindow.cpp:398 #, kde-format msgid "" "The output has been modified.\n" @@ -1896,29 +1911,29 @@ "La salida ha sido modificada.\n" "Si continua, sus cambios se perderán." -#: mergeresultwindow.cpp:936 pdiff.cpp:827 +#: mergeresultwindow.cpp:964 pdiff.cpp:817 #, kde-format msgid "All input files are binary equal." msgstr "Todos los archivos de entrada son binariamente iguales." -#: mergeresultwindow.cpp:938 +#: mergeresultwindow.cpp:966 #, kde-format msgid "All input files contain the same text." msgstr "Todos los archivos de entrada contienen el mismo texto." -#: mergeresultwindow.cpp:942 mergeresultwindow.cpp:946 -#: mergeresultwindow.cpp:950 pdiff.cpp:833 pdiff.cpp:837 pdiff.cpp:841 +#: mergeresultwindow.cpp:970 mergeresultwindow.cpp:974 +#: mergeresultwindow.cpp:978 pdiff.cpp:823 pdiff.cpp:827 pdiff.cpp:831 #, kde-format msgid "Files %1 and %2 are binary equal.\n" msgstr "Los archivos %1 y %2 son binariamente iguales.\n" -#: mergeresultwindow.cpp:944 mergeresultwindow.cpp:948 -#: mergeresultwindow.cpp:952 +#: mergeresultwindow.cpp:972 mergeresultwindow.cpp:976 +#: mergeresultwindow.cpp:980 #, kde-format msgid "Files %1 and %2 have equal text.\n" msgstr "Los archivos %1 y %2 tiene el mismo texto.\n" -#: mergeresultwindow.cpp:958 +#: mergeresultwindow.cpp:986 #, kde-format msgid "" "Total number of conflicts: %1\n" @@ -1931,27 +1946,27 @@ "Número de conflictos sin resolver: %3\n" "%4" -#: mergeresultwindow.cpp:964 +#: mergeresultwindow.cpp:992 #, kde-format msgid "Conflicts" msgstr "Conflictos" -#: mergeresultwindow.cpp:1873 +#: mergeresultwindow.cpp:1901 #, kde-format msgid "" msgstr "" -#: mergeresultwindow.cpp:1881 +#: mergeresultwindow.cpp:1909 #, kde-format msgid "" msgstr "" -#: mergeresultwindow.cpp:1883 mergeresultwindow.cpp:2755 +#: mergeresultwindow.cpp:1911 mergeresultwindow.cpp:2783 #, kde-format msgid "" msgstr "" -#: mergeresultwindow.cpp:2967 +#: mergeresultwindow.cpp:2995 #, kde-format msgid "" "Not all conflicts are solved yet.\n" @@ -1960,12 +1975,12 @@ "Todavía no se han resuelto todos los conflictos.\n" "Archivo sin guardar." -#: mergeresultwindow.cpp:2969 mergeresultwindow.cpp:2978 +#: mergeresultwindow.cpp:2997 mergeresultwindow.cpp:3006 #, kde-format msgid "Conflicts Left" msgstr "Conflictos que faltan" -#: mergeresultwindow.cpp:2976 +#: mergeresultwindow.cpp:3004 #, kde-format msgid "" "There is a line end style conflict. Please choose the line end style " @@ -1976,7 +1991,7 @@ "de línea manualmente.\n" "No se ha guardado el archivo." -#: mergeresultwindow.cpp:2990 +#: mergeresultwindow.cpp:3018 #, kde-format msgid "" "\n" @@ -1987,57 +2002,57 @@ "\n" "Fallo al crear copia de respaldo. Archivo sin guardar." -#: mergeresultwindow.cpp:2990 mergeresultwindow.cpp:3038 +#: mergeresultwindow.cpp:3018 mergeresultwindow.cpp:3066 #, kde-format msgid "File Save Error" msgstr "Error al guardar archivo" -#: mergeresultwindow.cpp:3038 +#: mergeresultwindow.cpp:3066 #, kde-format msgid "Error while writing." msgstr "Error al escribir." -#: mergeresultwindow.cpp:3110 +#: mergeresultwindow.cpp:3138 #, kde-format msgid "Output:" msgstr "Salida:" -#: mergeresultwindow.cpp:3123 mergeresultwindow.cpp:3315 +#: mergeresultwindow.cpp:3151 mergeresultwindow.cpp:3343 #, kde-format msgid "[Modified]" msgstr "[Modificado]" -#: mergeresultwindow.cpp:3130 +#: mergeresultwindow.cpp:3158 #, kde-format msgid "Encoding for saving:" msgstr "Codificación para guardar:" -#: mergeresultwindow.cpp:3230 +#: mergeresultwindow.cpp:3258 #, kde-format msgid "Conflict" msgstr "Conflicto" -#: mergeresultwindow.cpp:3262 +#: mergeresultwindow.cpp:3290 #, kde-format msgid "Codec from A: %1" msgstr "Códec de A: %1" -#: mergeresultwindow.cpp:3264 +#: mergeresultwindow.cpp:3292 #, kde-format msgid "Codec from B: %1" msgstr "Códec de B: %1" -#: mergeresultwindow.cpp:3266 +#: mergeresultwindow.cpp:3294 #, kde-format msgid "Codec from C: %1" msgstr "Códec de C: %1" -#: optiondialog.cpp:119 +#: optiondialog.cpp:121 #, kde-format msgid "Change Font" msgstr "Cambiar tipo de letra" -#: optiondialog.cpp:135 optiondialog.cpp:145 +#: optiondialog.cpp:137 optiondialog.cpp:147 #, kde-format msgid "" "Font: %1, %2, %3\n" @@ -2048,123 +2063,123 @@ "\n" "Ejemplo:" -#: optiondialog.cpp:388 +#: optiondialog.cpp:390 #, kde-format msgid "Unicode" msgstr "Unicode" -#: optiondialog.cpp:389 +#: optiondialog.cpp:391 #, kde-format msgid "Latin1" msgstr "Latin1" -#: optiondialog.cpp:408 +#: optiondialog.cpp:410 #, kde-format msgid "Change this if non-ASCII characters are not displayed correctly." msgstr "Cambier esto si ningún carácter ASCII se muestra correctamente." -#: optiondialog.cpp:491 +#: optiondialog.cpp:495 #, kde-format msgid "Configure" msgstr "Configurar" -#: optiondialog.cpp:568 +#: optiondialog.cpp:573 #, kde-format msgid "Font" msgstr "Tipo de letra" -#: optiondialog.cpp:570 +#: optiondialog.cpp:575 #, kde-format msgid "Editor & Diff Output Font" msgstr "Tipo de letra para el editor y salida diff" -#: optiondialog.cpp:589 +#: optiondialog.cpp:594 #, kde-format msgid "Application font" msgstr "Tipo de letra de la aplicación" -#: optiondialog.cpp:594 +#: optiondialog.cpp:599 #, kde-format msgid "File view font" msgstr "Tipo de letra para la vista de archivos" -#: optiondialog.cpp:613 +#: optiondialog.cpp:618 #, kde-format msgctxt "Title for color settings page" msgid "Color" msgstr "Color" -#: optiondialog.cpp:614 +#: optiondialog.cpp:619 #, kde-format msgid "Colors Settings" msgstr "Preferencias de color" -#: optiondialog.cpp:631 +#: optiondialog.cpp:644 #, kde-format msgid "Editor and Diff Views:" msgstr "Vistas del editor y las diferencias:" -#: optiondialog.cpp:639 +#: optiondialog.cpp:652 #, kde-format msgid "Foreground color:" msgstr "Color de primer plano:" -#: optiondialog.cpp:647 +#: optiondialog.cpp:660 #, kde-format msgid "Background color:" msgstr "Color de fondo:" -#: optiondialog.cpp:657 +#: optiondialog.cpp:670 #, kde-format msgid "Diff background color:" msgstr "Color de fondo de diff:" -#: optiondialog.cpp:666 +#: optiondialog.cpp:679 #, kde-format msgid "Color A:" msgstr "Color A:" -#: optiondialog.cpp:675 +#: optiondialog.cpp:688 #, kde-format msgid "Color B:" msgstr "Color B:" -#: optiondialog.cpp:684 +#: optiondialog.cpp:697 #, kde-format msgid "Color C:" msgstr "Color C:" -#: optiondialog.cpp:692 +#: optiondialog.cpp:705 #, kde-format msgid "Conflict color:" msgstr "Color de conflicto:" -#: optiondialog.cpp:701 +#: optiondialog.cpp:714 #, kde-format msgid "Current range background color:" msgstr "Intervalo actual de color de fondo:" -#: optiondialog.cpp:710 +#: optiondialog.cpp:723 #, kde-format msgid "Current range diff background color:" msgstr "Intervalo actual de color de fondo de diff:" -#: optiondialog.cpp:718 +#: optiondialog.cpp:731 #, kde-format msgid "Color for manually aligned difference ranges:" msgstr "Color para los intervalos de diferencias alineadas manualmente:" -#: optiondialog.cpp:725 +#: optiondialog.cpp:738 #, kde-format msgid "Directory Comparison View:" msgstr "Vista de comparación de directorio:" -#: optiondialog.cpp:731 +#: optiondialog.cpp:744 #, kde-format msgid "Newest file color:" msgstr "Color del archivo más nuevo:" -#: optiondialog.cpp:736 +#: optiondialog.cpp:749 #, kde-format msgid "" "Changing this color will only be effective when starting the next directory " @@ -2173,76 +2188,76 @@ "Cambiar este color solo será efectivo cuando inicie de nuevo la comparación " "de directorios." -#: optiondialog.cpp:741 +#: optiondialog.cpp:754 #, kde-format msgid "Oldest file color:" msgstr "Color del archivo más antiguo:" -#: optiondialog.cpp:750 +#: optiondialog.cpp:763 #, kde-format msgid "Middle age file color:" msgstr "Color de los archivos intermedios:" -#: optiondialog.cpp:759 +#: optiondialog.cpp:772 #, kde-format msgid "Color for missing files:" msgstr "Color de los archivos que faltan:" -#: optiondialog.cpp:773 +#: optiondialog.cpp:786 #, kde-format msgid "Editor" msgstr "Editor" -#: optiondialog.cpp:774 +#: optiondialog.cpp:787 #, kde-format msgid "Editor Behavior" msgstr "Comportamiento del editor" -#: optiondialog.cpp:787 +#: optiondialog.cpp:809 #, kde-format msgid "Tab inserts spaces" msgstr "El tabulador inserta espacios" -#: optiondialog.cpp:791 +#: optiondialog.cpp:813 #, kde-format msgid "" "On: Pressing tab generates the appropriate number of spaces.\n" "Off: A tab character will be inserted." msgstr "" -"Activado: Pulsando el tabulador generará el número apropiado de espacios.\n" -"Desactivado: Se insertará un carácter de tabulador." +"Activado: al pulsar el tabulador se genera el número apropiado de espacios.\n" +"Desactivado: se insertará un carácter de tabulador." -#: optiondialog.cpp:796 +#: optiondialog.cpp:818 #, kde-format msgid "Tab size:" msgstr "Tamaño del tabulador:" -#: optiondialog.cpp:803 +#: optiondialog.cpp:825 #, kde-format msgid "Auto indentation" msgstr "Auto sangrado" -#: optiondialog.cpp:807 +#: optiondialog.cpp:829 #, kde-format msgid "On: The indentation of the previous line is used for a new line.\n" msgstr "" -"Activado: Se usará el sangrado de la línea anterior para una nueva línea.\n" +"Activado: se usará el sangrado de la línea anterior para una nueva línea.\n" -#: optiondialog.cpp:810 +#: optiondialog.cpp:832 #, kde-format msgid "Auto copy selection" msgstr "Auto-copiar selección" -#: optiondialog.cpp:814 +#: optiondialog.cpp:836 #, kde-format msgid "" "On: Any selection is immediately written to the clipboard.\n" "Off: You must explicitly copy e.g. via Ctrl-C." msgstr "" -"Activado: Se copiará inmediatamente cualquier selección al portapapeles.\n" -"Desactivado: Debe copiarlo explícitamente (por ejemplo, con Ctrl-C)." +"Activado: se copiará inmediatamente cualquier selección al portapapeles.\n" +"Desactivado: debe copiarlo explícitamente (por ejemplo, con Ctrl-C)." -#: optiondialog.cpp:829 +#: optiondialog.cpp:851 #, kde-format msgid "" "Sets the line endings for when an edited file is saved.\n" @@ -2251,12 +2266,12 @@ "Establece los finales de linea para cuando un archivo editado se guarde.\n" "DOS/Windows: CR+LF; Unix: LF; con CR=0D, LF=0A" -#: optiondialog.cpp:839 +#: optiondialog.cpp:861 #, kde-format msgid "Diff" msgstr "Diff" -#: optiondialog.cpp:840 +#: optiondialog.cpp:862 #, kde-format msgid "Diff Settings" msgstr "Preferencias de Diff" @@ -2270,12 +2285,12 @@ #. ); #. ++line; #. -#: optiondialog.cpp:865 +#: optiondialog.cpp:896 #, kde-format msgid "Ignore numbers (treat as white space)" msgstr "Ignorar números (tratarlos como espacios en blanco)" -#: optiondialog.cpp:869 +#: optiondialog.cpp:900 #, kde-format msgid "" "Ignore number characters during line matching phase. (Similar to Ignore " @@ -2286,47 +2301,47 @@ "a ignorar espacios en blanco).\n" "Puede ayudar a comparar archivos con datos numéricos." -#: optiondialog.cpp:873 +#: optiondialog.cpp:904 #, kde-format msgid "Ignore C/C++ comments (treat as white space)" msgstr "Ignorar comentarios de C/C++ (tratarlos como espacios en blanco)" -#: optiondialog.cpp:876 +#: optiondialog.cpp:907 #, kde-format msgid "Treat C/C++ comments like white space." msgstr "Trata los comentarios de C/C++ como espacios en blanco." -#: optiondialog.cpp:879 +#: optiondialog.cpp:910 #, kde-format msgid "Ignore case (treat as white space)" msgstr "" "Ignorar distinción entre mayúsculas y minúsculas (tratarlas como espacios en " "blanco)" -#: optiondialog.cpp:883 +#: optiondialog.cpp:914 #, kde-format msgid "Treat case differences like white space changes. ('a'<=>'A')" msgstr "" "Tratar las diferencias de mayúsculas como cambios de espacios en blanco " "('a'<=>'A')" -#: optiondialog.cpp:886 +#: optiondialog.cpp:917 #, kde-format msgid "Preprocessor command:" msgstr "Orden del preprocesador:" -#: optiondialog.cpp:891 +#: optiondialog.cpp:922 #, kde-format msgid "User defined pre-processing. (See the docs for details.)" msgstr "" "Usar pre-procesamiento definido. (Ver los documentos para mas detalles)." -#: optiondialog.cpp:894 +#: optiondialog.cpp:925 #, kde-format msgid "Line-matching preprocessor command:" msgstr "Orden de preprocesador de coincidencia de línea:" -#: optiondialog.cpp:899 +#: optiondialog.cpp:930 #, kde-format msgid "" "This pre-processor is only used during line matching.\n" @@ -2335,12 +2350,12 @@ "Este pre-procesador solo se usa durante la combinación de línea.\n" "(Ver documentos para mas detalles)." -#: optiondialog.cpp:902 +#: optiondialog.cpp:933 #, kde-format msgid "Try hard (slower)" msgstr "Intentar mas a fondo (mas lento)" -#: optiondialog.cpp:906 +#: optiondialog.cpp:937 #, kde-format msgid "" "Enables the --minimal option for the external diff.\n" @@ -2349,12 +2364,12 @@ "Activa la --opción mínima para el diff externo.\n" "El análisis de archivos grandos será mas lento." -#: optiondialog.cpp:910 +#: optiondialog.cpp:941 #, kde-format msgid "Align B and C for 3 input files" msgstr "Alinear B y C para 3 archivos de entrada" -#: optiondialog.cpp:914 +#: optiondialog.cpp:945 #, kde-format msgid "" "Try to align B and C when comparing or merging three input files.\n" @@ -2367,17 +2382,23 @@ "complicada.\n" "(De manera predeterminada está deshabilitada)." -#: optiondialog.cpp:926 +#: optiondialog.cpp:956 +#, kde-format +msgctxt "Settings page" +msgid "Merge" +msgstr "Fusionar" + +#: optiondialog.cpp:957 #, kde-format msgid "Merge Settings" msgstr "Preferencias de fusión" -#: optiondialog.cpp:940 +#: optiondialog.cpp:980 #, kde-format msgid "Auto advance delay (ms):" msgstr "Retardo auto avanzado (ms):" -#: optiondialog.cpp:946 +#: optiondialog.cpp:986 #, kde-format msgid "" "When in Auto-Advance mode the result of the current selection is shown \n" @@ -2387,27 +2408,27 @@ "para el tiempo especificado, antes de saltar al siguiente conflicto. " "Intervalo: 0-2000 ms" -#: optiondialog.cpp:950 +#: optiondialog.cpp:990 #, kde-format msgid "Show info dialogs" msgstr "Mostrar diálogos con información" -#: optiondialog.cpp:953 +#: optiondialog.cpp:993 #, kde-format msgid "Show a dialog with information about the number of conflicts." msgstr "Mostrar un diálogo con información sobre el número de conflictos." -#: optiondialog.cpp:956 +#: optiondialog.cpp:996 #, kde-format msgid "White space 2-file merge default:" msgstr "Fusionar espacios en blanco de dos archivos de forma predeterminada:" -#: optiondialog.cpp:961 optiondialog.cpp:974 +#: optiondialog.cpp:1001 optiondialog.cpp:1014 #, kde-format msgid "Manual Choice" msgstr "Elección manual" -#: optiondialog.cpp:965 optiondialog.cpp:979 +#: optiondialog.cpp:1005 optiondialog.cpp:1019 #, kde-format msgid "" "Allow the merge algorithm to automatically select an input for white-space-" @@ -2416,22 +2437,22 @@ "Permitir el algoritmo de fusión para seleccionar automáticamente una entrada " "para solo los cambios de espacios en blanco." -#: optiondialog.cpp:969 +#: optiondialog.cpp:1009 #, kde-format msgid "White space 3-file merge default:" msgstr "Fusionar espacios en blanco de tres archivos de forma predeterminada:" -#: optiondialog.cpp:983 +#: optiondialog.cpp:1023 #, kde-format msgid "Automatic Merge Regular Expression" msgstr "Expresión regular de fusión automática" -#: optiondialog.cpp:991 smalldialogs.cpp:449 +#: optiondialog.cpp:1031 smalldialogs.cpp:459 #, kde-format msgid "Auto merge regular expression:" msgstr "Expresión regular de fusión automática:" -#: optiondialog.cpp:996 +#: optiondialog.cpp:1036 #, kde-format msgid "" "Regular expression for lines where KDiff3 should automatically choose one " @@ -2445,13 +2466,13 @@ "elegirá\n" "- si está disponible - C, sino B." -#: optiondialog.cpp:1002 +#: optiondialog.cpp:1042 #, kde-format msgid "Run regular expression auto merge on merge start" msgstr "" "Ejecutar la expresión regular de fusión automática al iniciar la fusión" -#: optiondialog.cpp:1005 +#: optiondialog.cpp:1045 #, kde-format msgid "" "Run the merge for auto merge regular expressions\n" @@ -2460,17 +2481,17 @@ "Ejecuta la fusión para las expresiones regulares de fusión automática\n" "de forma inmediata cuando se inicia la fusión.\n" -#: optiondialog.cpp:1010 +#: optiondialog.cpp:1050 #, kde-format msgid "Version Control History Merging" msgstr "Fusionado del historial de control de versiones" -#: optiondialog.cpp:1018 smalldialogs.cpp:476 +#: optiondialog.cpp:1058 smalldialogs.cpp:486 #, kde-format msgid "History start regular expression:" msgstr "Expresión regular de inicio del historial:" -#: optiondialog.cpp:1023 +#: optiondialog.cpp:1063 #, kde-format msgid "" "Regular expression for the start of the version control history entry.\n" @@ -2482,12 +2503,12 @@ "Esta línea suele contener la palabra clave «$Log$».\n" "El valor predeterminado es: «.*\\$Log.*\\$.*»" -#: optiondialog.cpp:1029 smalldialogs.cpp:504 +#: optiondialog.cpp:1069 smalldialogs.cpp:514 #, kde-format msgid "History entry start regular expression:" msgstr "Expresión regular de inicio de la entrada del historial:" -#: optiondialog.cpp:1042 +#: optiondialog.cpp:1082 #, kde-format msgid "" "A version control history entry consists of several lines.\n" @@ -2508,23 +2529,23 @@ "del historial.\n" "Consulte la documentación para obtener más detalles." -#: optiondialog.cpp:1050 +#: optiondialog.cpp:1090 #, kde-format msgid "History merge sorting" msgstr "Ordenación de fusión del historial" -#: optiondialog.cpp:1053 +#: optiondialog.cpp:1093 #, kde-format msgid "Sort version control history by a key." msgstr "Ordenar el historial del control de versiones con una clave." -#: optiondialog.cpp:1063 +#: optiondialog.cpp:1103 #, kde-format msgid "History entry start sort key order:" msgstr "" "Orden de la clave de ordenación del inicio de la entrada del historial:" -#: optiondialog.cpp:1068 +#: optiondialog.cpp:1108 #, kde-format msgid "" "Each pair of parentheses used in the regular expression for the history " @@ -2543,41 +2564,41 @@ "Si se deja vacío, no se realizará ordenación.\n" "Consulte la documentación para obtener más detalles." -#: optiondialog.cpp:1079 +#: optiondialog.cpp:1119 #, kde-format msgid "Merge version control history on merge start" msgstr "Fusionar el historial de control de versiones al iniciar la fusión" -#: optiondialog.cpp:1082 +#: optiondialog.cpp:1122 #, kde-format msgid "Run version control history automerge on merge start." msgstr "" "Ejecuta la fusión automática del historial del control de versiones al " "iniciar el fusionado." -#: optiondialog.cpp:1086 +#: optiondialog.cpp:1126 #, kde-format msgid "Max number of history entries:" msgstr "Número máximo de entradas en el historial:" -#: optiondialog.cpp:1090 +#: optiondialog.cpp:1130 #, kde-format msgid "Cut off after specified number. Use -1 for infinite number of entries." msgstr "" "Cortar después del número especificado. Utilice -1 para un número ilimitado " "de entradas." -#: optiondialog.cpp:1094 +#: optiondialog.cpp:1134 #, kde-format msgid "Test your regular expressions" msgstr "Verificar sus expresiones regulares" -#: optiondialog.cpp:1099 +#: optiondialog.cpp:1139 #, kde-format msgid "Irrelevant merge command:" msgstr "Orden de fusión irrelevante:" -#: optiondialog.cpp:1104 +#: optiondialog.cpp:1144 #, kde-format msgid "" "If specified this script is run after automerge\n" @@ -2588,12 +2609,12 @@ "cuando no se hayan detectado otros cambios pertinentes.\n" "Se llama con los parámetros: nombrearchivo1 nombrearchivo2 nombrearchivo3" -#: optiondialog.cpp:1109 +#: optiondialog.cpp:1149 #, kde-format msgid "Auto save and quit on merge without conflicts" msgstr "Guardar automáticamente y salir al fusionar sin conflictos" -#: optiondialog.cpp:1113 +#: optiondialog.cpp:1153 #, kde-format msgid "" "If KDiff3 was started for a file-merge from the command line and all\n" @@ -2607,59 +2628,59 @@ "automáticamente y se saldrá.\n" "(Similar a la opción «--auto» de la línea de órdenes)." -#: optiondialog.cpp:1124 optiondialog.cpp:1125 +#: optiondialog.cpp:1164 optiondialog.cpp:1165 #, kde-format msgid "Directory" msgstr "Carpeta" -#: optiondialog.cpp:1137 +#: optiondialog.cpp:1185 #, kde-format msgid "Recursive directories" msgstr "Introducirse en los directorios" -#: optiondialog.cpp:1140 +#: optiondialog.cpp:1188 #, kde-format msgid "Whether to analyze subdirectories or not." msgstr "Analizar los subdirectorios o no." -#: optiondialog.cpp:1142 +#: optiondialog.cpp:1190 #, kde-format msgid "File pattern(s):" -msgstr "Patron(es) de archivo(s):" +msgstr "Patrones de archivos:" -#: optiondialog.cpp:1148 +#: optiondialog.cpp:1196 #, kde-format msgid "" "Pattern(s) of files to be analyzed. \n" "Wildcards: '*' and '?'\n" "Several Patterns can be specified by using the separator: ';'" msgstr "" -"Patron(es) de archivos a analizar.\n" -"Comodines: '*' y '?'\n" -"Se pueden especificar muchos patrones usando el separador: ';'" +"Patrones de archivos a analizar.\n" +"Comodines: «*» y «?»\n" +"Se pueden indicar varios patrones usando el separador: «;»" -#: optiondialog.cpp:1153 +#: optiondialog.cpp:1201 #, kde-format msgid "File-anti-pattern(s):" -msgstr "Patron(es) anti-archivo(s):" +msgstr "Patrones antiarchivos:" -#: optiondialog.cpp:1159 +#: optiondialog.cpp:1207 #, kde-format msgid "" "Pattern(s) of files to be excluded from analysis. \n" "Wildcards: '*' and '?'\n" "Several Patterns can be specified by using the separator: ';'" msgstr "" -"Patron(es) de archivos a excluir del análisis.\n" -"Comodines: '*' y '?'\n" -"Se pueden especificar muchos patrones usando el separador: ';'" +"Patrones de archivos a excluir del análisis.\n" +"Comodines: «*» y «?»\n" +"Se pueden indicar varios patrones usando el separador: «;»" -#: optiondialog.cpp:1164 +#: optiondialog.cpp:1212 #, kde-format msgid "Dir-anti-pattern(s):" msgstr "Patron(es) anti-directorio(s):" -#: optiondialog.cpp:1170 +#: optiondialog.cpp:1218 #, kde-format msgid "" "Pattern(s) of directories to be excluded from analysis. \n" @@ -2670,12 +2691,12 @@ "Comodines: '*' y '?'\n" "Se pueden especificar muchos patrones usando el separador: ';'" -#: optiondialog.cpp:1175 +#: optiondialog.cpp:1223 #, kde-format msgid "Use .cvsignore" msgstr "Usar .cvsignore" -#: optiondialog.cpp:1179 +#: optiondialog.cpp:1227 #, kde-format msgid "" "Extends the antipattern to anything that would be ignored by CVS.\n" @@ -2685,36 +2706,36 @@ "Esto puede ser especificado por directorios vía archivos locales «." "cvsignore»." -#: optiondialog.cpp:1183 +#: optiondialog.cpp:1231 #, kde-format msgid "Find hidden files and directories" msgstr "Buscar archivos y directorios ocultos" -#: optiondialog.cpp:1186 +#: optiondialog.cpp:1234 #, kde-format msgid "Finds hidden files and directories." msgstr "Buscar archivos y directorios ocultos." -#: optiondialog.cpp:1189 +#: optiondialog.cpp:1237 #, kde-format msgid "Follow file links" msgstr "Seguir enlaces de archivos" -#: optiondialog.cpp:1193 +#: optiondialog.cpp:1241 #, kde-format msgid "" "On: Compare the file the link points to.\n" "Off: Compare the links." msgstr "" -"On: Comparar el archivo que al que apunta el enlace.\n" -"Off: Comparar los enlaces." +"Activado: comparar el archivo al que apunta el enlace.\n" +"Desactivado: comparar los enlaces." -#: optiondialog.cpp:1197 +#: optiondialog.cpp:1245 #, kde-format msgid "Follow directory links" msgstr "Seguir enlaces de directorios" -#: optiondialog.cpp:1201 +#: optiondialog.cpp:1249 #, kde-format msgid "" "On: Compare the directory the link points to.\n" @@ -2723,12 +2744,12 @@ "On: Comparar el directorio al que apunta el enlace.\n" "Off: Comparar los enlaces." -#: optiondialog.cpp:1210 +#: optiondialog.cpp:1258 #, kde-format msgid "Case sensitive filename comparison" msgstr "Comparación de nombres de archivo sensible a mayúsculas y minúsculas" -#: optiondialog.cpp:1214 +#: optiondialog.cpp:1262 #, kde-format msgid "" "The directory comparison will compare files or directories when their names " @@ -2742,12 +2763,12 @@ "mayúsculas y minúsculas (para Windows el valor predeterminado es " "desactivado, en otro caso, estará activado)" -#: optiondialog.cpp:1218 +#: optiondialog.cpp:1266 #, kde-format msgid "Unfold all subdirectories on load" msgstr "Desplegar todos los subdirectorios al cargar" -#: optiondialog.cpp:1222 +#: optiondialog.cpp:1270 #, kde-format msgid "" "On: Unfold all subdirectories when starting a directory diff.\n" @@ -2757,12 +2778,12 @@ "directorios.\n" "Desactivado: dejar los subdirectorios plegados." -#: optiondialog.cpp:1226 +#: optiondialog.cpp:1274 #, kde-format msgid "Skip directory status report" msgstr "Omitir el informe del estado de los directorios" -#: optiondialog.cpp:1230 +#: optiondialog.cpp:1278 #, kde-format msgid "" "On: Do not show the Directory Comparison Status.\n" @@ -2771,27 +2792,27 @@ "Activado: no mostrar el estado de la comparación de directorios.\n" "Desactivado: mostrar el diálogo de estado al iniciar." -#: optiondialog.cpp:1234 +#: optiondialog.cpp:1282 #, kde-format msgid "File Comparison Mode" msgstr "Modo de comparación de archivos" -#: optiondialog.cpp:1239 +#: optiondialog.cpp:1287 #, kde-format msgid "Binary comparison" msgstr "Comparación binaria" -#: optiondialog.cpp:1241 +#: optiondialog.cpp:1289 #, kde-format msgid "Binary comparison of each file. (Default)" msgstr "Comparación binaria de cada archivo (predeterminado)" -#: optiondialog.cpp:1244 +#: optiondialog.cpp:1292 #, kde-format msgid "Full analysis" msgstr "Análisis completo" -#: optiondialog.cpp:1246 +#: optiondialog.cpp:1294 #, kde-format msgid "" "Do a full analysis and show statistics information in extra columns.\n" @@ -2802,12 +2823,12 @@ "(Mas lento que una comparación binara, mucho mas lento para archivos " "binarios)." -#: optiondialog.cpp:1250 +#: optiondialog.cpp:1298 #, kde-format msgid "Trust the size and modification date (unsafe)" msgstr "Validar el tamaño y la fecha de modificación (inseguro)" -#: optiondialog.cpp:1252 +#: optiondialog.cpp:1300 #, kde-format msgid "" "Assume that files are equal if the modification date and file length are " @@ -2822,7 +2843,7 @@ "considerarán diferentes.\n" "Útil para directorios grandes o redes lentas." -#: optiondialog.cpp:1257 +#: optiondialog.cpp:1305 #, kde-format msgid "" "Trust the size and date, but use binary comparison if date does not match " @@ -2831,7 +2852,7 @@ "Validar el tamaño y la fecha, pero utilizar comparación binaria si la fecha " "no coincide (inseguro)" -#: optiondialog.cpp:1259 +#: optiondialog.cpp:1307 #, kde-format msgid "" "Assume that files are equal if the modification date and file length are " @@ -2845,12 +2866,12 @@ "comparación binaria.\n" "Útil para carpetas grandes o redes lentas." -#: optiondialog.cpp:1264 +#: optiondialog.cpp:1312 #, kde-format msgid "Trust the size (unsafe)" msgstr "Validar el tamaño (inseguro)" -#: optiondialog.cpp:1266 +#: optiondialog.cpp:1314 #, kde-format msgid "" "Assume that files are equal if their file lengths are equal.\n" @@ -2861,12 +2882,12 @@ "Útil para directorios grandes y redes lentas cuando la fecha se modifica " "durante la descarga." -#: optiondialog.cpp:1273 +#: optiondialog.cpp:1321 #, kde-format msgid "Synchronize directories" msgstr "Sincronizar directorios" -#: optiondialog.cpp:1277 +#: optiondialog.cpp:1325 #, kde-format msgid "" "Offers to store files in both directories so that\n" @@ -2877,12 +2898,12 @@ "ambios directorios sean después el mismo.\n" "Solo funciona cuando se compara dos directorios sin especificar un destino." -#: optiondialog.cpp:1283 +#: optiondialog.cpp:1331 #, kde-format msgid "White space differences considered equal" msgstr "Las diferencias de espacios en blanco se consideran igual" -#: optiondialog.cpp:1287 +#: optiondialog.cpp:1335 #, kde-format msgid "" "If files differ only by white space consider them equal.\n" @@ -2892,12 +2913,12 @@ "igual.\n" "Esto solamente está activo cuando se elije análisis completo." -#: optiondialog.cpp:1293 +#: optiondialog.cpp:1341 #, kde-format msgid "Copy newer instead of merging (unsafe)" msgstr "Copiar el más reciente en lugar de fusionar (no es seguro)" -#: optiondialog.cpp:1297 +#: optiondialog.cpp:1345 #, kde-format msgid "" "Do not look inside, just take the newer file.\n" @@ -2908,12 +2929,12 @@ "(Use esto solo si sabe lo que está haciendo).\n" "Solo es efectivo al comparar dos directorios." -#: optiondialog.cpp:1302 +#: optiondialog.cpp:1350 #, kde-format msgid "Backup files (.orig)" msgstr "Archivos de copias de respaldo (.orig)" -#: optiondialog.cpp:1306 +#: optiondialog.cpp:1354 #, kde-format msgid "" "If a file would be saved over an old file, then the old file\n" @@ -2922,17 +2943,17 @@ "Cuando un archivo se graba sobre otro mas antiguo, se cambiará el\n" "nombre del archivo antiguo con la extensión '.orig' en lugar de ser borrado." -#: optiondialog.cpp:1382 optiondialog.cpp:1383 +#: optiondialog.cpp:1430 optiondialog.cpp:1431 #, kde-format msgid "Regional Settings" msgstr "Preferencias regionales" -#: optiondialog.cpp:1397 +#: optiondialog.cpp:1454 #, kde-format msgid "Use the same encoding for everything:" msgstr "Usar la misma codificación para todo:" -#: optiondialog.cpp:1401 +#: optiondialog.cpp:1458 #, kde-format msgid "" "Enable this allows to change all encodings by changing the first only.\n" @@ -2942,17 +2963,17 @@ "primera.\n" "Desactivar esto si se necesitan preferencias individuales diferentes." -#: optiondialog.cpp:1405 +#: optiondialog.cpp:1462 #, kde-format msgid "Note: Local Encoding is \"%1\"" msgstr "Nota: la codificación local es «%1»" -#: optiondialog.cpp:1409 +#: optiondialog.cpp:1466 #, kde-format msgid "File Encoding for A:" msgstr "Codificación de archivo para A:" -#: optiondialog.cpp:1416 +#: optiondialog.cpp:1473 #, kde-format msgid "" "If enabled then Unicode (UTF-16 or UTF-8) encoding will be detected.\n" @@ -2965,32 +2986,32 @@ "seleccionada como alternativa.\n" "(La detección Unicode depende de los primeros bytes de un archivo)." -#: optiondialog.cpp:1419 optiondialog.cpp:1430 optiondialog.cpp:1441 +#: optiondialog.cpp:1476 optiondialog.cpp:1487 optiondialog.cpp:1498 #, kde-format msgid "Auto Detect Unicode" msgstr "Detección automática de Unicode" -#: optiondialog.cpp:1425 +#: optiondialog.cpp:1482 #, kde-format msgid "File Encoding for B:" msgstr "Codificación de archivo para B:" -#: optiondialog.cpp:1436 +#: optiondialog.cpp:1493 #, kde-format msgid "File Encoding for C:" msgstr "Codificación de archivo para C:" -#: optiondialog.cpp:1447 +#: optiondialog.cpp:1504 #, kde-format msgid "File Encoding for Merge Output and Saving:" msgstr "Codificación de archivo para la salida de la fusión y guardar:" -#: optiondialog.cpp:1452 +#: optiondialog.cpp:1509 #, kde-format msgid "Auto Select" msgstr "Selección automática" -#: optiondialog.cpp:1456 +#: optiondialog.cpp:1513 #, kde-format msgid "" "If enabled then the encoding from the input files is used.\n" @@ -3001,17 +3022,17 @@ "En los casos dudosos un diálogo pedirá al usuario que elija la codificación " "para el guardado." -#: optiondialog.cpp:1459 +#: optiondialog.cpp:1516 #, kde-format msgid "File Encoding for Preprocessor Files:" msgstr "Codificación de archivo para los archivos del preprocesador:" -#: optiondialog.cpp:1471 +#: optiondialog.cpp:1528 #, kde-format msgid "Right To Left Language" msgstr "Lenguaje de derecha a izquierda" -#: optiondialog.cpp:1475 +#: optiondialog.cpp:1532 #, kde-format msgid "" "Some languages are read from right to left.\n" @@ -3020,22 +3041,22 @@ "Algunos lenguajes se leen de derecha a izquierda.\n" "Esta configuración cambiará el visor y el editor adaptándolo." -#: optiondialog.cpp:1485 +#: optiondialog.cpp:1542 #, kde-format msgid "Integration" msgstr "Integración" -#: optiondialog.cpp:1486 +#: optiondialog.cpp:1543 #, kde-format msgid "Integration Settings" msgstr "Preferencias de integración" -#: optiondialog.cpp:1499 +#: optiondialog.cpp:1564 #, kde-format msgid "Command line options to ignore:" msgstr "Opciones de la línea de órdenes que se ignorarán:" -#: optiondialog.cpp:1505 +#: optiondialog.cpp:1570 #, kde-format msgid "" "List of command line options that should be ignored when KDiff3 is used by " @@ -3048,12 +3069,12 @@ "Se pueden especificar varios valores separados por «;»\n" "Eliminará el error «Error desconocido»." -#: optiondialog.cpp:1510 +#: optiondialog.cpp:1575 #, kde-format msgid "Quit also via Escape key" msgstr "Salir también con la tecla «Esc»" -#: optiondialog.cpp:1514 +#: optiondialog.cpp:1579 #, kde-format msgid "" "Fast method to exit.\n" @@ -3062,7 +3083,7 @@ "Método rápido para salir.\n" "Para aquellos que usan la tecla «Esc»." -#: optiondialog.cpp:1598 +#: optiondialog.cpp:1653 #, kde-format msgid "This resets all options. Not only those of the current topic." msgstr "Esto reestablece todas las opciones. No solo las de tema actual." @@ -3119,81 +3140,71 @@ msgid "Disable Unsafe Options" msgstr "Desactivar opciones inseguras" -#: pdiff.cpp:158 +#: pdiff.cpp:160 #, kde-format msgid "Loading A" msgstr "Cargando A" -#: pdiff.cpp:167 +#: pdiff.cpp:162 #, kde-format -msgid "Errors occurred during pre-processing of file A." -msgstr "Han ocurrido errores durante el procesamiento previo del archivo A." +msgid "Loading A: %1" +msgstr "Cargando A: %1" -#: pdiff.cpp:172 +#: pdiff.cpp:170 #, kde-format msgid "Loading B" msgstr "Cargando B" -#: pdiff.cpp:179 -#, kde-format -msgid "Errors occurred during pre-processing of file B." -msgstr "Han ocurrido errores durante el procesamiento previo del archivo B." - -#: pdiff.cpp:202 pdiff.cpp:241 +#: pdiff.cpp:201 pdiff.cpp:237 #, kde-format msgid "Diff: A <-> B" msgstr "Dif: A <-> B" -#: pdiff.cpp:208 pdiff.cpp:279 pdiff.cpp:293 +#: pdiff.cpp:207 pdiff.cpp:275 pdiff.cpp:289 #, kde-format msgid "Linediff: A <-> B" msgstr "Lineadiff: A <-> B" -#: pdiff.cpp:225 +#: pdiff.cpp:224 #, kde-format msgid "Loading C" msgstr "Cargando C" -#: pdiff.cpp:232 -#, kde-format -msgid "Errors occurred during pre-processing of file C." -msgstr "Han ocurrido errores durante el procesamiento previo del archivo C." - -#: pdiff.cpp:250 +#: pdiff.cpp:246 #, kde-format msgid "Diff: A <-> C" msgstr "Dif: A <-> C" -#: pdiff.cpp:261 +#: pdiff.cpp:257 #, kde-format msgid "Diff: B <-> C" msgstr "Dif: B <-> C" -#: pdiff.cpp:283 pdiff.cpp:297 +#: pdiff.cpp:279 pdiff.cpp:293 #, kde-format msgid "Linediff: B <-> C" msgstr "Lineadiff: B <-> C" -#: pdiff.cpp:287 pdiff.cpp:301 +#: pdiff.cpp:283 pdiff.cpp:297 #, kde-format msgid "Linediff: A <-> C" msgstr "Lineadiff: A <-> C" -#: pdiff.cpp:829 +#: pdiff.cpp:819 #, kde-format 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:835 pdiff.cpp:839 pdiff.cpp:843 +#: pdiff.cpp:825 pdiff.cpp:829 pdiff.cpp:833 #, 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:853 +#: pdiff.cpp:843 #, kde-format msgid "" "Some input files do not seem to be pure text files.\n" @@ -3204,17 +3215,17 @@ "Tenga en cuenta que la fusión de KDiff3 no se creó para datos binarios.\n" "Continúe bajo su propia responsabilidad." -#: pdiff.cpp:863 +#: pdiff.cpp:853 #, kde-format msgid ", B" msgstr ", B" -#: pdiff.cpp:865 +#: pdiff.cpp:855 #, kde-format msgid ", C" msgstr ", C" -#: pdiff.cpp:867 +#: pdiff.cpp:857 #, kde-format msgid "" "Some input characters could not be converted to valid unicode.\n" @@ -3229,80 +3240,75 @@ "responsabilidad.\n" "Los archivos de entrada afectados están en %1." -#: pdiff.cpp:1034 +#: pdiff.cpp:1032 #, kde-format msgid "Abort" msgstr "Abandonar" -#: pdiff.cpp:1040 pdiff.cpp:1130 +#: pdiff.cpp:1038 pdiff.cpp:1129 #, kde-format msgid "Opening files..." msgstr "Abriendo archivos..." -#: pdiff.cpp:1107 -#, kde-format -msgid "File open error" -msgstr "Error al abrir el archivo" - -#: pdiff.cpp:1202 +#: pdiff.cpp:1212 #, kde-format msgid "Cutting selection..." msgstr "Cortando selección..." -#: pdiff.cpp:1223 +#: pdiff.cpp:1233 #, kde-format msgid "Copying selection to clipboard..." msgstr "Copiando la selección al portapapeles..." -#: pdiff.cpp:1239 +#: pdiff.cpp:1249 #, kde-format msgid "Inserting clipboard contents..." msgstr "Insertando el contenido del portapapeles..." -#: pdiff.cpp:1695 +#: pdiff.cpp:1705 #, kde-format msgid "Word wrap (Cancel disables word wrap)" msgstr "Ajuste de línea («Cancelar» desactiva el ajuste de línea)" -#: pdiff.cpp:1696 +#: pdiff.cpp:1706 #, kde-format msgid "Calculating max width for horizontal scrollbar" msgstr "" "Calculando la anchura máxima para la barra de desplazamiento horizontal" -#: pdiff.cpp:1911 +#: pdiff.cpp:1921 #, kde-format msgid "Save && Continue" msgstr "Guardar y continuar" -#: pdiff.cpp:1912 +#: pdiff.cpp:1922 #, kde-format msgid "Continue Without Saving" msgstr "Continuar sin guardar" -#: pdiff.cpp:2124 +#: pdiff.cpp:2134 #, kde-format msgid "Search complete." msgstr "Búsqueda completada." -#: pdiff.cpp:2124 +#: pdiff.cpp:2134 #, kde-format msgid "Search Complete" msgstr "Búsqueda completada" -#: pdiff.cpp:2375 +#: pdiff.cpp:2385 #, kde-format 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:2375 +#: pdiff.cpp:2385 #, kde-format msgid "Error while adding manual diff range" msgstr "Error al añadir un intervalo de diferencia manual" -#: progress.cpp:59 progress.cpp:71 +#: progress.cpp:61 progress.cpp:73 #, kde-format msgid "&Cancel" msgstr "&Cancelar" @@ -3312,127 +3318,127 @@ msgid "A (Base):" msgstr "A (Base):" -#: smalldialogs.cpp:68 smalldialogs.cpp:85 smalldialogs.cpp:102 -#: smalldialogs.cpp:144 +#: smalldialogs.cpp:71 smalldialogs.cpp:90 smalldialogs.cpp:109 +#: smalldialogs.cpp:154 #, kde-format msgid "File..." msgstr "Archivo..." -#: smalldialogs.cpp:70 smalldialogs.cpp:87 smalldialogs.cpp:104 -#: smalldialogs.cpp:146 +#: smalldialogs.cpp:73 smalldialogs.cpp:92 smalldialogs.cpp:111 +#: smalldialogs.cpp:156 #, kde-format msgid "Dir..." msgstr "Dir..." -#: smalldialogs.cpp:96 +#: smalldialogs.cpp:103 #, kde-format msgid "C (Optional):" msgstr "C (Opcional):" -#: smalldialogs.cpp:119 +#: smalldialogs.cpp:126 #, kde-format msgid "Swap/Copy Names..." msgstr "Intercambiar/copiar nombres..." -#: smalldialogs.cpp:124 smalldialogs.cpp:125 smalldialogs.cpp:126 +#: smalldialogs.cpp:131 smalldialogs.cpp:132 smalldialogs.cpp:133 #, kde-format msgid "Swap %1<->%2" msgstr "Intercambiar %1<->%2" -#: smalldialogs.cpp:127 smalldialogs.cpp:128 smalldialogs.cpp:129 +#: smalldialogs.cpp:134 smalldialogs.cpp:135 smalldialogs.cpp:136 #, kde-format msgid "Copy %1->Output" msgstr "Copiar %1->Salida" -#: smalldialogs.cpp:130 smalldialogs.cpp:131 smalldialogs.cpp:132 +#: smalldialogs.cpp:137 smalldialogs.cpp:138 smalldialogs.cpp:139 #, kde-format msgid "Swap %1<->Output" msgstr "Intercambiar %1<->Salida" -#: smalldialogs.cpp:138 +#: smalldialogs.cpp:148 #, kde-format msgid "Output (optional):" msgstr "Salida (opcional):" -#: smalldialogs.cpp:168 +#: smalldialogs.cpp:178 #, kde-format msgid "Configure..." msgstr "Configurar..." -#: smalldialogs.cpp:233 +#: smalldialogs.cpp:243 #, kde-format msgid "Open Directory" msgstr "Abrir directorio" -#: smalldialogs.cpp:234 +#: smalldialogs.cpp:244 #, kde-format msgid "Select Output File" msgstr "Seleccionar archivo de salida" -#: smalldialogs.cpp:393 +#: smalldialogs.cpp:403 #, kde-format msgid "Search text:" msgstr "Buscar texto:" -#: smalldialogs.cpp:400 +#: smalldialogs.cpp:410 #, kde-format msgid "Case sensitive" msgstr "Distinción de mayúsculas" -#: smalldialogs.cpp:403 +#: smalldialogs.cpp:413 #, kde-format msgid "Search A" msgstr "Buscar A" -#: smalldialogs.cpp:408 +#: smalldialogs.cpp:418 #, kde-format msgid "Search B" msgstr "Buscar B" -#: smalldialogs.cpp:413 +#: smalldialogs.cpp:423 #, kde-format msgid "Search C" msgstr "Buscar C" -#: smalldialogs.cpp:418 +#: smalldialogs.cpp:428 #, kde-format msgid "Search output" msgstr "Buscar salida" -#: smalldialogs.cpp:425 +#: smalldialogs.cpp:435 #, kde-format msgid "&Search" msgstr "Bu&scar" -#: smalldialogs.cpp:444 +#: smalldialogs.cpp:454 #, kde-format msgid "Regular Expression Tester" msgstr "Verificar expresión regular" -#: smalldialogs.cpp:457 +#: smalldialogs.cpp:467 #, kde-format msgid "Example auto merge line:" msgstr "Ejemplo de línea de fusión automática:" -#: smalldialogs.cpp:459 +#: smalldialogs.cpp:469 #, kde-format msgid "To test auto merge, copy a line as used in your files." msgstr "" "Para una prueba de fusión automática compie una línea tal y como se utiliza " "en sus archivos." -#: smalldialogs.cpp:465 smalldialogs.cpp:493 smalldialogs.cpp:529 +#: smalldialogs.cpp:475 smalldialogs.cpp:503 smalldialogs.cpp:539 #, kde-format msgid "Match result:" msgstr "Resultado coincidente:" -#: smalldialogs.cpp:484 +#: smalldialogs.cpp:494 #, kde-format msgid "Example history start line (with leading comment):" msgstr "" "Ejemplo de la línea de inicio del historial (con comentarios importantes):" -#: smalldialogs.cpp:486 +#: smalldialogs.cpp:496 #, kde-format msgid "" "Copy a history start line as used in your files,\n" @@ -3442,19 +3448,19 @@ "archivos,\n" "incluyendo los comentarios importantes." -#: smalldialogs.cpp:512 +#: smalldialogs.cpp:522 #, kde-format msgid "History sort key order:" msgstr "Orden de la clave de ordenación del historial:" -#: smalldialogs.cpp:520 +#: smalldialogs.cpp:530 #, kde-format msgid "Example history entry start line (without leading comment):" msgstr "" "Ejemplo de la línea de inicio de la entrada del historial (sin comentarios " "importantes):" -#: smalldialogs.cpp:522 +#: smalldialogs.cpp:532 #, kde-format msgid "" "Copy a history entry start line as used in your files,\n" @@ -3464,48 +3470,48 @@ "en sus archivos,\n" "pero omite los comentarios importantes." -#: smalldialogs.cpp:536 +#: smalldialogs.cpp:546 #, kde-format msgid "Sort key result:" msgstr "Resultado de la clave de ordenación:" -#: smalldialogs.cpp:584 smalldialogs.cpp:594 smalldialogs.cpp:614 +#: smalldialogs.cpp:594 smalldialogs.cpp:604 smalldialogs.cpp:624 #, kde-format msgid "Match success." msgstr "Coincidencia correcta." -#: smalldialogs.cpp:588 smalldialogs.cpp:598 smalldialogs.cpp:620 +#: smalldialogs.cpp:598 smalldialogs.cpp:608 smalldialogs.cpp:630 #, kde-format msgid "Match failed." msgstr "Coincidencia fallida." -#: smalldialogs.cpp:605 +#: smalldialogs.cpp:615 #, kde-format msgid "Opening and closing parentheses do not match in regular expression." msgstr "" "Apertura y cierre de paréntesis que no coinciden en la expresión regular." -#: SourceData.cpp:150 +#: SourceData.cpp:153 #, kde-format msgid "Writing clipboard data to temp file failed." msgstr "Error al escribir los datos del portapapeles en el archivo temporal." -#: SourceData.cpp:154 +#: SourceData.cpp:157 #, kde-format msgid "From Clipboard" msgstr "Desde el portapapeles" -#: SourceData.cpp:335 +#: SourceData.cpp:348 #, kde-format msgid "%1 is not a normal file." msgstr "%1 no es un archivo normal." -#: SourceData.cpp:427 +#: SourceData.cpp:440 #, kde-format msgid " Temp file is: %1" msgstr " El archivo temporal es: %1" -#: SourceData.cpp:432 +#: SourceData.cpp:445 #, kde-format msgid "" "Preprocessing possibly failed. Check this command:\n" @@ -3520,12 +3526,12 @@ "\n" "La orden de pre-procesamiento se desactivará ahora." -#: SourceData.cpp:443 SourceData.cpp:512 +#: SourceData.cpp:456 SourceData.cpp:525 #, kde-format msgid "File %1 too large to process. Skipping." msgstr "El archivo %1 es demasiado grande para procesarlo. Se omite." -#: SourceData.cpp:487 +#: SourceData.cpp:500 #, kde-format msgid "" "The line-matching-preprocessing possibly failed. Check this command:\n" diff -Nru kdiff3-1.8.01/po/et/kdiff3fileitemactionplugin.po kdiff3-1.8.3/po/et/kdiff3fileitemactionplugin.po --- kdiff3-1.8.01/po/et/kdiff3fileitemactionplugin.po 2019-05-18 01:01:56.000000000 +0000 +++ kdiff3-1.8.3/po/et/kdiff3fileitemactionplugin.po 2020-06-25 00:18:14.000000000 +0000 @@ -1,25 +1,24 @@ # Copyright (C) YEAR This_file_is_part_of_KDE # This file is distributed under the same license as the PACKAGE package. # -# Marek Laane , 2011. +# Marek Laane , 2011, 2019. msgid "" msgstr "" "Project-Id-Version: \n" -"Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2019-03-22 03:09+0100\n" -"PO-Revision-Date: 2011-06-22 19:44+0300\n" -"Last-Translator: Marek Laane \n" +"Report-Msgid-Bugs-To: https://bugs.kde.org\n" +"POT-Creation-Date: 2019-08-30 07:40+0200\n" +"PO-Revision-Date: 2019-11-20 00:30+0200\n" +"Last-Translator: Marek Laane \n" "Language-Team: Estonian \n" "Language: et\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: Lokalize 1.2\n" +"X-Generator: Lokalize 19.08.1\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" #: kdiff3fileitemaction.cpp:92 -#, fuzzy, kde-format -#| msgid "KDiff3 ..." +#, kde-format msgid "KDiff3..." msgstr "KDiff3 ..." @@ -44,10 +43,9 @@ msgstr "Kolme faili ühendamine baasiga" #: kdiff3fileitemaction.cpp:149 -#, fuzzy, kde-format -#| msgid "Compare with ..." +#, kde-format msgid "Compare with..." -msgstr "Võrdle failiga..." +msgstr "Võrdle failiga ..." #: kdiff3fileitemaction.cpp:161 #, kde-format @@ -65,35 +63,17 @@ msgstr "Kolme faili võrdlemine" #: kdiff3fileitemaction.cpp:179 -#, fuzzy, kde-format -#| msgid "About KDiff3 menu plugin ..." +#, kde-format msgid "About KDiff3 menu plugin..." -msgstr "KDiff3 menüüplugina teave..." +msgstr "KDiff3 menüüplugina teave ..." #: kdiff3fileitemaction.cpp:287 -#, fuzzy, kde-format -#| msgid "" -#| "KDiff3 File Item Action Plugin: Copyright (C) 2011 Joachim Eibl\n" -#| "KDiff3 homepage: http://kdiff3.sourceforge.net\n" -#| "\n" +#, kde-format msgid "KDiff3 File Item Action Plugin: Copyright (C) 2011 Joachim Eibl\n" -msgstr "" -"KDiff3 failitoimingute plugin: autoriõigus (C) 2011: Joachim Eibl\n" -"KDiff3 kodulehekülg: http://kdiff3.sourceforge.net\n" -"\n" +msgstr "KDiff3 failitoimingute plugin: autoriõigus (C) 2011: Joachim Eibl\n" #: kdiff3fileitemaction.cpp:288 -#, fuzzy, kde-format -#| msgid "" -#| "Using the contextmenu extension:\n" -#| "For simple comparison of two selected 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." +#, kde-format msgid "" "Using the context menu extension:\n" "For simple comparison of two selected files choose \"Compare\".\n" diff -Nru kdiff3-1.8.01/po/et/kdiff3.po kdiff3-1.8.3/po/et/kdiff3.po --- kdiff3-1.8.01/po/et/kdiff3.po 2019-05-18 01:01:56.000000000 +0000 +++ kdiff3-1.8.3/po/et/kdiff3.po 2020-06-25 00:18:14.000000000 +0000 @@ -2,20 +2,20 @@ # Copyright (C) 2003 Free Software Foundation, Inc. # # Marek Laane , 2003-2009. -# Marek Laane , 2009, 2010, 2011, 2012. +# Marek Laane , 2009, 2010, 2011, 2012, 2019. msgid "" msgstr "" "Project-Id-Version: kdiff3\n" -"Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2019-04-18 08:02+0200\n" -"PO-Revision-Date: 2012-11-06 05:42+0200\n" -"Last-Translator: Marek Laane \n" +"Report-Msgid-Bugs-To: https://bugs.kde.org\n" +"POT-Creation-Date: 2020-06-22 07:48+0200\n" +"PO-Revision-Date: 2019-12-05 19:40+0200\n" +"Last-Translator: Marek Laane \n" "Language-Team: Estonian \n" "Language: et\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: Lokalize 1.5\n" +"X-Generator: Lokalize 19.08.1\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" #, kde-format @@ -26,293 +26,287 @@ #, kde-format msgctxt "EMAIL OF TRANSLATORS" msgid "Your emails" -msgstr "bald@smail.ee" +msgstr "qiilaq69@gmail.com" -#: difftextwindow.cpp:412 +#: difftextwindow.cpp:414 #, kde-format msgid "File %1: Line %2" -msgstr "" +msgstr "Fail %1: Rida %2" -#: difftextwindow.cpp:414 -#, fuzzy, kde-format -#| msgid "Line not available" +#: difftextwindow.cpp:416 +#, kde-format msgid "File %1: Line not available" -msgstr "Rida pole kättesaadav" +msgstr "Fail %1: Rida pole kättesaadav" -#: difftextwindow.cpp:1780 +#: difftextwindow.cpp:1778 #, kde-format msgid "Encoding:" msgstr "Kodeering:" -#: difftextwindow.cpp:1782 mergeresultwindow.cpp:3138 optiondialog.cpp:818 +#: difftextwindow.cpp:1781 mergeresultwindow.cpp:3166 optiondialog.cpp:840 #, kde-format msgid "Line end style:" msgstr "Realõpu stiil:" -#: difftextwindow.cpp:1810 directorymergewindow.cpp:382 -#: directorymergewindow.cpp:433 directorymergewindow.cpp:524 -#: directorymergewindow.cpp:3058 directorymergewindow.cpp:3189 -#: directorymergewindow.cpp:3417 mergeresultwindow.cpp:942 -#: mergeresultwindow.cpp:944 mergeresultwindow.cpp:946 -#: mergeresultwindow.cpp:948 mergeresultwindow.cpp:1814 -#: mergeresultwindow.cpp:3170 mergeresultwindow.cpp:3177 optiondialog.cpp:962 -#: optiondialog.cpp:975 pdiff.cpp:833 pdiff.cpp:835 pdiff.cpp:837 pdiff.cpp:839 -#: pdiff.cpp:861 smalldialogs.cpp:124 smalldialogs.cpp:126 smalldialogs.cpp:127 -#: smalldialogs.cpp:130 +#: difftextwindow.cpp:1809 directorymergewindow.cpp:383 +#: directorymergewindow.cpp:434 directorymergewindow.cpp:525 +#: directorymergewindow.cpp:3072 directorymergewindow.cpp:3203 +#: directorymergewindow.cpp:3431 mergeresultwindow.cpp:970 +#: mergeresultwindow.cpp:972 mergeresultwindow.cpp:974 +#: mergeresultwindow.cpp:976 mergeresultwindow.cpp:1842 +#: mergeresultwindow.cpp:3198 mergeresultwindow.cpp:3205 optiondialog.cpp:1002 +#: optiondialog.cpp:1015 pdiff.cpp:823 pdiff.cpp:825 pdiff.cpp:827 +#: pdiff.cpp:829 pdiff.cpp:851 smalldialogs.cpp:131 smalldialogs.cpp:133 +#: smalldialogs.cpp:134 smalldialogs.cpp:137 #, kde-format msgid "A" msgstr "A" -#: difftextwindow.cpp:1810 directorymergewindow.cpp:384 -#: directorymergewindow.cpp:436 directorymergewindow.cpp:526 -#: directorymergewindow.cpp:3064 directorymergewindow.cpp:3190 -#: directorymergewindow.cpp:3418 mergeresultwindow.cpp:942 -#: mergeresultwindow.cpp:944 mergeresultwindow.cpp:950 -#: mergeresultwindow.cpp:952 mergeresultwindow.cpp:1816 -#: mergeresultwindow.cpp:3172 mergeresultwindow.cpp:3179 optiondialog.cpp:963 -#: optiondialog.cpp:976 pdiff.cpp:833 pdiff.cpp:835 pdiff.cpp:841 pdiff.cpp:843 -#: pdiff.cpp:863 smalldialogs.cpp:124 smalldialogs.cpp:125 smalldialogs.cpp:128 -#: smalldialogs.cpp:131 +#: difftextwindow.cpp:1809 directorymergewindow.cpp:385 +#: directorymergewindow.cpp:437 directorymergewindow.cpp:527 +#: directorymergewindow.cpp:3078 directorymergewindow.cpp:3204 +#: directorymergewindow.cpp:3432 mergeresultwindow.cpp:970 +#: mergeresultwindow.cpp:972 mergeresultwindow.cpp:978 +#: mergeresultwindow.cpp:980 mergeresultwindow.cpp:1844 +#: mergeresultwindow.cpp:3200 mergeresultwindow.cpp:3207 optiondialog.cpp:1003 +#: optiondialog.cpp:1016 pdiff.cpp:823 pdiff.cpp:825 pdiff.cpp:831 +#: pdiff.cpp:833 pdiff.cpp:853 smalldialogs.cpp:131 smalldialogs.cpp:132 +#: smalldialogs.cpp:135 smalldialogs.cpp:138 #, kde-format msgid "B" msgstr "B" -#: difftextwindow.cpp:1810 directorymergewindow.cpp:386 -#: directorymergewindow.cpp:439 directorymergewindow.cpp:528 -#: directorymergewindow.cpp:3070 directorymergewindow.cpp:3191 -#: directorymergewindow.cpp:3419 mergeresultwindow.cpp:946 -#: mergeresultwindow.cpp:948 mergeresultwindow.cpp:950 -#: mergeresultwindow.cpp:952 mergeresultwindow.cpp:1818 -#: mergeresultwindow.cpp:3174 mergeresultwindow.cpp:3181 optiondialog.cpp:977 -#: pdiff.cpp:837 pdiff.cpp:839 pdiff.cpp:841 pdiff.cpp:843 pdiff.cpp:865 -#: smalldialogs.cpp:125 smalldialogs.cpp:126 smalldialogs.cpp:129 -#: smalldialogs.cpp:132 +#: difftextwindow.cpp:1809 directorymergewindow.cpp:387 +#: directorymergewindow.cpp:440 directorymergewindow.cpp:529 +#: directorymergewindow.cpp:3084 directorymergewindow.cpp:3205 +#: directorymergewindow.cpp:3433 mergeresultwindow.cpp:974 +#: mergeresultwindow.cpp:976 mergeresultwindow.cpp:978 +#: mergeresultwindow.cpp:980 mergeresultwindow.cpp:1846 +#: mergeresultwindow.cpp:3202 mergeresultwindow.cpp:3209 optiondialog.cpp:1017 +#: pdiff.cpp:827 pdiff.cpp:829 pdiff.cpp:831 pdiff.cpp:833 pdiff.cpp:855 +#: smalldialogs.cpp:132 smalldialogs.cpp:133 smalldialogs.cpp:136 +#: smalldialogs.cpp:139 #, kde-format msgid "C" msgstr "C" -#: difftextwindow.cpp:1810 -#, fuzzy, kde-format -#| msgid "A (Base):" +#: difftextwindow.cpp:1809 +#, kde-format msgid "A (Base)" -msgstr "A (baas):" +msgstr "A (baas)" -#: difftextwindow.cpp:1812 -#, fuzzy, kde-format -#| msgid "Encoding:" +#: difftextwindow.cpp:1811 +#, kde-format msgid "Encoding: %1" -msgstr "Kodeering:" +msgstr "Kodeering: %1" -#: difftextwindow.cpp:1813 mergeresultwindow.cpp:3183 +#: difftextwindow.cpp:1812 mergeresultwindow.cpp:3211 #, kde-format msgid "Unix" msgstr "UNIX" -#: difftextwindow.cpp:1813 mergeresultwindow.cpp:3184 +#: difftextwindow.cpp:1812 mergeresultwindow.cpp:3212 #, kde-format msgid "DOS" msgstr "DOS" -#: difftextwindow.cpp:1813 -#, fuzzy, kde-format -#| msgid "Line end style:" +#: difftextwindow.cpp:1812 +#, kde-format msgid "Line end style: %1" -msgstr "Realõpu stiil:" +msgstr "Realõpu stiil: %1" -#: difftextwindow.cpp:1835 kdiff3.cpp:873 +#: difftextwindow.cpp:1834 kdiff3.cpp:874 #, kde-format msgid "Top line" msgstr "Ülarida" -#: difftextwindow.cpp:1845 +#: difftextwindow.cpp:1843 #, kde-format msgid "End" msgstr "Lõpp" -#: difftextwindow.cpp:1903 smalldialogs.cpp:235 -#, fuzzy, kde-format -#| msgid "Opening files..." +#: difftextwindow.cpp:1901 smalldialogs.cpp:245 +#, kde-format msgid "Open File" -msgstr "Failide avamine..." +msgstr "Faili avamine" -#: difftextwindow.cpp:1951 optiondialog.cpp:387 +#: difftextwindow.cpp:1943 optiondialog.cpp:389 #, kde-format msgid "Unicode, 8 bit" msgstr "Unicode (8-bitine)" -#: difftextwindow.cpp:1966 +#: difftextwindow.cpp:1958 #, kde-format msgid "Other" -msgstr "" +msgstr "Muu" -#: directorymergewindow.cpp:409 directorymergewindow.cpp:3424 +#: directorymergewindow.cpp:410 directorymergewindow.cpp:3438 #, kde-format msgid "Copy A to B" msgstr "Kopeeri A->B" -#: directorymergewindow.cpp:412 directorymergewindow.cpp:3425 +#: directorymergewindow.cpp:413 directorymergewindow.cpp:3439 #, kde-format msgid "Copy B to A" msgstr "Kopeeri B->A" -#: directorymergewindow.cpp:415 directorymergewindow.cpp:3426 +#: directorymergewindow.cpp:416 directorymergewindow.cpp:3440 #, kde-format msgid "Delete A" msgstr "Kustuta A" -#: directorymergewindow.cpp:418 directorymergewindow.cpp:3427 +#: directorymergewindow.cpp:419 directorymergewindow.cpp:3441 #, kde-format msgid "Delete B" msgstr "Kustuta B" -#: directorymergewindow.cpp:421 +#: directorymergewindow.cpp:422 #, kde-format msgid "Delete A & B" msgstr "Kustuta A ja B" -#: directorymergewindow.cpp:424 directorymergewindow.cpp:3429 +#: directorymergewindow.cpp:425 directorymergewindow.cpp:3443 #, kde-format msgid "Merge to A" msgstr "Ühenda A-sse" -#: directorymergewindow.cpp:427 directorymergewindow.cpp:3430 +#: directorymergewindow.cpp:428 directorymergewindow.cpp:3444 #, kde-format msgid "Merge to B" msgstr "Ühenda B-sse" -#: directorymergewindow.cpp:430 +#: directorymergewindow.cpp:431 #, kde-format msgid "Merge to A & B" msgstr "Ühenda A-sse ja B-sse" -#: directorymergewindow.cpp:442 directorymergewindow.cpp:3421 +#: directorymergewindow.cpp:443 directorymergewindow.cpp:3435 #, kde-format msgid "Delete (if exists)" msgstr "Kustuta (kui on olemas)" -#: directorymergewindow.cpp:445 directorymergewindow.cpp:448 -#: directorymergewindow.cpp:3420 optiondialog.cpp:925 smalldialogs.cpp:113 +#: directorymergewindow.cpp:446 directorymergewindow.cpp:449 +#: directorymergewindow.cpp:3434 smalldialogs.cpp:120 #, kde-format msgid "Merge" msgstr "Ühenda" -#: directorymergewindow.cpp:445 directorymergewindow.cpp:448 +#: directorymergewindow.cpp:446 directorymergewindow.cpp:449 #, kde-format msgid "Merge (manual)" msgstr "Ühenda (käsitsi)" -#: directorymergewindow.cpp:451 +#: directorymergewindow.cpp:452 #, kde-format msgid "Error: Conflicting File Types" msgstr "Viga: failitüüpide vastuolu" -#: directorymergewindow.cpp:454 +#: directorymergewindow.cpp:455 #, kde-format msgid "Error: Changed and Deleted" msgstr "Viga: muudetud ja kustutatud" -#: directorymergewindow.cpp:457 +#: directorymergewindow.cpp:458 #, kde-format msgid "Error: Dates are equal but files are not." msgstr "Viga: kuupäevad on samad, aga mitte failid." -#: directorymergewindow.cpp:471 -#, fuzzy, kde-format -#| msgid "Done." +#: directorymergewindow.cpp:472 +#, kde-format msgid "Done" -msgstr "Tehtud." +msgstr "Tehtud" -#: directorymergewindow.cpp:473 +#: directorymergewindow.cpp:474 #, kde-format msgid "Error" msgstr "Viga" -#: directorymergewindow.cpp:475 +#: directorymergewindow.cpp:476 #, kde-format msgid "Skipped." msgstr "Vahele jäetud." -#: directorymergewindow.cpp:477 +#: directorymergewindow.cpp:478 #, kde-format msgid "Not saved." msgstr "Ei salvestatud." -#: directorymergewindow.cpp:479 +#: directorymergewindow.cpp:480 #, kde-format msgid "In progress..." msgstr "Töös..." -#: directorymergewindow.cpp:481 +#: directorymergewindow.cpp:482 #, kde-format msgid "To do." msgstr "Veel tegemata." -#: directorymergewindow.cpp:522 +#: directorymergewindow.cpp:523 #, kde-format msgid "Name" msgstr "Nimi" -#: directorymergewindow.cpp:530 +#: directorymergewindow.cpp:531 #, kde-format msgid "Operation" msgstr "Operatsioon" -#: directorymergewindow.cpp:532 +#: directorymergewindow.cpp:533 #, kde-format msgid "Status" msgstr "Staatus" -#: directorymergewindow.cpp:534 +#: directorymergewindow.cpp:535 #, kde-format msgid "Unsolved" msgstr "Lahendamata" -#: directorymergewindow.cpp:536 +#: directorymergewindow.cpp:537 #, kde-format msgid "Solved" msgstr "Lahendatud" -#: directorymergewindow.cpp:538 +#: directorymergewindow.cpp:539 #, kde-format msgid "Nonwhite" msgstr "Mitte-tühimärk" -#: directorymergewindow.cpp:540 +#: directorymergewindow.cpp:541 #, kde-format msgid "White" msgstr "Tühimärk" -#: directorymergewindow.cpp:674 +#: directorymergewindow.cpp:676 #, kde-format msgid "Unable to compare non-normal file with normal file." -msgstr "" +msgstr "Ebatavalist ja tavalist faili ei õnnestunud võrrelda." -#: directorymergewindow.cpp:688 +#: directorymergewindow.cpp:690 #, kde-format msgid "Mix of links and normal files." msgstr "Viitade ja tavafailide segu." -#: directorymergewindow.cpp:695 +#: directorymergewindow.cpp:697 #, kde-format msgid "Link: " msgstr "Viit: " -#: directorymergewindow.cpp:704 +#: directorymergewindow.cpp:706 #, kde-format msgid "Size. " msgstr "Suurus. " -#: directorymergewindow.cpp:718 directorymergewindow.cpp:728 +#: directorymergewindow.cpp:720 directorymergewindow.cpp:730 #, kde-format msgid "Date & Size: " msgstr "Kuupäev ja suurus: " -#: directorymergewindow.cpp:748 +#: directorymergewindow.cpp:751 #, kde-format msgid "Comparing file..." msgstr "Faili võrdlemine..." -#: directorymergewindow.cpp:801 +#: directorymergewindow.cpp:813 #, kde-format msgid "" "You are currently doing a directory merge. Are you sure, you want to abort " @@ -321,48 +315,48 @@ "Sul on parajasti käsil kataloogi ühendamine. Kas tõesti ühendamine " "katkestada ja kataloog uuesti läbi uurida?" -#: directorymergewindow.cpp:802 kdiff3.cpp:698 kdiff3.cpp:708 kdiff3.cpp:720 -#: mergeresultwindow.cpp:372 pdiff.cpp:1033 pdiff.cpp:1910 pdiff.cpp:1920 +#: directorymergewindow.cpp:814 kdiff3.cpp:697 kdiff3.cpp:707 kdiff3.cpp:719 +#: mergeresultwindow.cpp:400 pdiff.cpp:1031 pdiff.cpp:1920 pdiff.cpp:1930 #, kde-format msgid "Warning" msgstr "Hoiatus" -#: directorymergewindow.cpp:803 directorymergewindow.cpp:3393 +#: directorymergewindow.cpp:815 directorymergewindow.cpp:3407 #, kde-format msgid "Rescan" msgstr "Uuri uuesti läbi" -#: directorymergewindow.cpp:804 pdiff.cpp:1035 +#: directorymergewindow.cpp:816 pdiff.cpp:1033 #, kde-format msgid "Continue Merging" msgstr "Jätka ühendamist" -#: directorymergewindow.cpp:971 +#: directorymergewindow.cpp:984 #, kde-format msgid "Opening of directories failed:" msgstr "Kataloogide avamine nurjus:" -#: directorymergewindow.cpp:975 +#: directorymergewindow.cpp:988 #, 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:980 +#: directorymergewindow.cpp:993 #, 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:985 +#: directorymergewindow.cpp:998 #, 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:988 +#: directorymergewindow.cpp:1001 #, kde-format msgid "Directory Open Error" msgstr "Kataloogi avamise viga" -#: directorymergewindow.cpp:996 +#: directorymergewindow.cpp:1009 #, kde-format msgid "" "The destination directory must not be the same as A or B when three " @@ -372,49 +366,49 @@ "Sihtkataloog ei saa kolme kataloogi ühendamisel olla sama, mis A või B.\n" "Kontrolli seda asja enne jätkamist." -#: directorymergewindow.cpp:998 +#: directorymergewindow.cpp:1011 #, kde-format msgid "Parameter Warning" msgstr "Parameetri hoiatus" -#: directorymergewindow.cpp:1003 +#: directorymergewindow.cpp:1016 #, kde-format msgid "Scanning directories..." msgstr "Kataloogide läbiuurimine..." -#: directorymergewindow.cpp:1029 +#: directorymergewindow.cpp:1042 #, kde-format msgid "Reading Directory A" msgstr "Kataloogi A lugemine" -#: directorymergewindow.cpp:1038 +#: directorymergewindow.cpp:1051 #, kde-format msgid "Reading Directory B" msgstr "Kataloogi B lugemine" -#: directorymergewindow.cpp:1048 +#: directorymergewindow.cpp:1061 #, kde-format msgid "Reading Directory C" msgstr "Kataloogi C lugemine" -#: directorymergewindow.cpp:1064 +#: directorymergewindow.cpp:1077 #, kde-format msgid "Some subdirectories were not readable in" msgstr "Mõned alamkataloogid ei olnud loetavad:" -#: directorymergewindow.cpp:1069 +#: directorymergewindow.cpp:1082 #, kde-format msgid "Check the permissions of the subdirectories." msgstr "Kontrolli alamkataloogide õigusi." -#: directorymergewindow.cpp:1106 kdiff3.cpp:666 kdiff3.cpp:753 kdiff3.cpp:777 -#: kdiff3.cpp:1065 kdiff3.cpp:1086 pdiff.cpp:1116 pdiff.cpp:1170 pdiff.cpp:1218 -#: pdiff.cpp:1234 pdiff.cpp:1277 pdiff.cpp:1301 +#: directorymergewindow.cpp:1119 kdiff3.cpp:665 kdiff3.cpp:752 kdiff3.cpp:776 +#: kdiff3.cpp:1072 kdiff3.cpp:1093 pdiff.cpp:1115 pdiff.cpp:1178 pdiff.cpp:1228 +#: pdiff.cpp:1244 pdiff.cpp:1287 pdiff.cpp:1311 #, kde-format msgid "Ready." msgstr "Valmis." -#: directorymergewindow.cpp:1121 +#: directorymergewindow.cpp:1134 #, kde-format msgid "" "Directory Comparison Status\n" @@ -423,70 +417,74 @@ "Number of equal files: %2\n" "Number of different files: %3" msgstr "" +"Kataloogide võrdlemise staatus\n" +"\n" +"Alamkataloogide arv: %1\n" +"Võrdsete failide arv: %2\n" +"Erinevate failide arv: %3" -#: directorymergewindow.cpp:1128 -#, fuzzy, kde-format -#| msgid "Number of manual merges:" +#: directorymergewindow.cpp:1141 +#, kde-format msgid "Number of manual merges: %1" -msgstr "Käsitsiühendamiste arv:" +msgstr "Käsitsiühendamiste arv: %1" -#: directorymergewindow.cpp:1394 +#: directorymergewindow.cpp:1407 #, kde-format msgid "This affects all merge operations." msgstr "See mõjutab kõiki ühendamisoperatsioone." -#: directorymergewindow.cpp:1395 +#: directorymergewindow.cpp:1408 #, kde-format msgid "Changing All Merge Operations" msgstr "Kõigi ühendamisoperatsioonide muutmine" -#: directorymergewindow.cpp:1695 -#, fuzzy, kde-format -#| msgid "Processing " +#: directorymergewindow.cpp:1708 +#, kde-format msgid "" "Processing %1 / %2\n" "%3" -msgstr "Töödeldakse " +msgstr "" +"Töödeldakse %1 / %2\n" +"%3" -#: directorymergewindow.cpp:1738 directorymergewindow.cpp:1742 +#: directorymergewindow.cpp:1751 directorymergewindow.cpp:1755 #, kde-format msgid "Some files could not be processed." -msgstr "" +msgstr "Mõnda faili ei õnnestunud töödelda." -#: directorymergewindow.cpp:2222 directorymergewindow.cpp:2247 -#: directorymergewindow.cpp:2271 +#: directorymergewindow.cpp:2235 directorymergewindow.cpp:2260 +#: directorymergewindow.cpp:2285 #, kde-format msgid "This operation is currently not possible." msgstr "See operatsioon ei ole praegu võimalik." -#: directorymergewindow.cpp:2222 directorymergewindow.cpp:2247 -#: directorymergewindow.cpp:2271 directorymergewindow.cpp:2552 +#: directorymergewindow.cpp:2235 directorymergewindow.cpp:2260 +#: directorymergewindow.cpp:2285 directorymergewindow.cpp:2565 #, kde-format msgid "Operation Not Possible" msgstr "Operatsioon ei ole võimalik" -#: directorymergewindow.cpp:2318 -#, fuzzy, kde-format -#| msgid "An error occurred while copying.\n" +#: directorymergewindow.cpp:2332 +#, kde-format msgid "An error occurred while copying." -msgstr "Kopeerimisel tekkis viga.\n" +msgstr "Kopeerimisel tekkis viga." -#: directorymergewindow.cpp:2319 directorymergewindow.cpp:2759 +#: directorymergewindow.cpp:2333 directorymergewindow.cpp:2772 #, kde-format msgid "Merge Error" msgstr "Ühendamise viga" -#: directorymergewindow.cpp:2396 +#: directorymergewindow.cpp:2410 #, kde-format msgid "Unknown merge operation. (This must never happen!)" msgstr "Tundmatu ühendamisoperatsioon. (Seda ei peaks kunagi ette tulema!)" -#: directorymergewindow.cpp:2441 +#: directorymergewindow.cpp:2455 #, kde-format msgid "Unknown merge operation." msgstr "Tundmatu ühendamisoperatsioon." -#: directorymergewindow.cpp:2454 +#: directorymergewindow.cpp:2468 #, kde-format msgid "" "The merge is about to begin.\n" @@ -508,22 +506,22 @@ "üldse midagi juhtub või et kõik õigesti juhtub! Tee kindlasti tähtsatest " "andmetest varukoopia!" -#: directorymergewindow.cpp:2459 +#: directorymergewindow.cpp:2473 #, kde-format msgid "Starting Merge" msgstr "Ühendamise alustamine" -#: directorymergewindow.cpp:2460 +#: directorymergewindow.cpp:2474 #, kde-format msgid "Do It" msgstr "Tee ära" -#: directorymergewindow.cpp:2461 +#: directorymergewindow.cpp:2475 #, kde-format msgid "Simulate It" msgstr "Simuleeri" -#: directorymergewindow.cpp:2487 +#: directorymergewindow.cpp:2501 #, kde-format msgid "" "The highlighted item has a different type in the different directories. " @@ -532,7 +530,7 @@ "Esiletõstetud element on erinevates kataloogides erineva tüübiga. Otsusta, " "mida teha." -#: directorymergewindow.cpp:2491 +#: directorymergewindow.cpp:2505 #, kde-format msgid "" "The modification dates of the file are equal but the files are not. Select " @@ -540,7 +538,7 @@ msgstr "" "Failide muutmise aeg on sama, aga failid ise mitte. Otsusta, mida teha." -#: directorymergewindow.cpp:2495 +#: directorymergewindow.cpp:2509 #, kde-format msgid "" "The highlighted item was changed in one directory and deleted in the other. " @@ -549,7 +547,7 @@ "Esiletõstetud elementi on muudetud ühes ja kustutatud teises kataloogis. " "Otsusta, mida teha." -#: directorymergewindow.cpp:2552 +#: directorymergewindow.cpp:2565 #, kde-format msgid "" "This operation is currently not possible because directory merge is " @@ -557,7 +555,7 @@ msgstr "" "See operatsioon ei ole praegu võimalik, sest käib kataloogide ühendamine." -#: directorymergewindow.cpp:2609 +#: directorymergewindow.cpp:2622 #, kde-format msgid "" "There was an error in the last step.\n" @@ -567,32 +565,32 @@ "Viimasel sammul tekkis viga.\n" "Kas soovid jätkata elemendiga, mis vea põhjustas, või selle vahele jätta?" -#: directorymergewindow.cpp:2611 +#: directorymergewindow.cpp:2624 #, kde-format msgid "Continue merge after an error" msgstr "Jätka ühendamist pärast viga" -#: directorymergewindow.cpp:2612 +#: directorymergewindow.cpp:2625 #, kde-format msgid "Continue With Last Item" msgstr "Jätka viimase elemendiga" -#: directorymergewindow.cpp:2613 +#: directorymergewindow.cpp:2626 #, kde-format msgid "Skip Item" msgstr "Jäta vahele" -#: directorymergewindow.cpp:2709 +#: directorymergewindow.cpp:2722 #, kde-format msgid "Merge operation complete." msgstr "Ühendamisoperatsioon lõpetatud." -#: directorymergewindow.cpp:2709 directorymergewindow.cpp:2712 +#: directorymergewindow.cpp:2722 directorymergewindow.cpp:2725 #, kde-format msgid "Merge Complete" msgstr "Ühendamine lõpetatud" -#: directorymergewindow.cpp:2722 +#: directorymergewindow.cpp:2735 #, kde-format msgid "" "Simulated merge complete: Check if you agree with the proposed operations." @@ -600,230 +598,228 @@ "Ühendamise simulatsioon lõpetatud: märgi, kui oled pakutavate " "operatsioonidega nõus." -#: directorymergewindow.cpp:2758 -#, fuzzy, kde-format -#| msgid "An error occurred. Press OK to see detailed information.\n" +#: directorymergewindow.cpp:2771 +#, kde-format msgid "An error occurred. Press OK to see detailed information." -msgstr "Tekkis viga. Lähema info saamiseks klõpsa 'OK'.\n" +msgstr "Tekkis viga. Lähema info saamiseks klõpsa 'OK'." -#: directorymergewindow.cpp:2791 +#: directorymergewindow.cpp:2804 #, kde-format msgid "Error: While deleting %1: Creating backup failed." msgstr "Viga %1 kustutamisel: varukoopia loomine nurjus." -#: directorymergewindow.cpp:2798 +#: directorymergewindow.cpp:2811 #, kde-format msgid "delete directory recursively( %1 )" msgstr "kustuta kataloog rekursiivselt( %1 )" -#: directorymergewindow.cpp:2800 +#: directorymergewindow.cpp:2813 #, kde-format msgid "delete( %1 )" msgstr "kustuta( %1 )" -#: directorymergewindow.cpp:2815 +#: directorymergewindow.cpp:2828 #, kde-format msgid "Error: delete dir operation failed while trying to read the directory." msgstr "Viga: kataloogi kustutamine nurjus juba kataloogi lugemise katsel." -#: directorymergewindow.cpp:2834 +#: directorymergewindow.cpp:2847 #, kde-format msgid "Error: rmdir( %1 ) operation failed." msgstr "Viga: operatsioon rmdir( %1 ) nurjus." -#: directorymergewindow.cpp:2844 +#: directorymergewindow.cpp:2857 #, kde-format msgid "Error: delete operation failed." msgstr "Viga: kustutamisoperatsioon nurjus." -#: directorymergewindow.cpp:2870 +#: directorymergewindow.cpp:2884 #, kde-format msgid "manual merge( %1, %2, %3 -> %4)" msgstr "käsitsi ühendamine( %1, %2, %3 -> %4)" -#: directorymergewindow.cpp:2873 +#: directorymergewindow.cpp:2887 #, kde-format 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:2900 +#: directorymergewindow.cpp:2914 #, 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:2909 +#: directorymergewindow.cpp:2923 #, kde-format msgid "copyLink( %1 -> %2 )" msgstr "kopeeri viit( %1 -> %2)" -#: directorymergewindow.cpp:2918 +#: directorymergewindow.cpp:2932 #, kde-format msgid "Error: copyLink failed: Remote links are not yet supported." msgstr "Viga: viida kopeerimine nurjus, sest kaugviidad ei ole veel toetatud." -#: directorymergewindow.cpp:2928 +#: directorymergewindow.cpp:2942 #, kde-format msgid "Error: copyLink failed." msgstr "Viga: viida kopeerimine nurjus." -#: directorymergewindow.cpp:2953 +#: directorymergewindow.cpp:2967 #, kde-format msgid "copy( %1 -> %2 )" msgstr "kopeeri( %1 -> %2)" -#: directorymergewindow.cpp:2979 +#: directorymergewindow.cpp:2993 #, 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:2986 +#: directorymergewindow.cpp:3000 #, kde-format msgid "rename( %1 -> %2 )" msgstr "nimeta ümber( %1 -> %2)" -#: directorymergewindow.cpp:2995 +#: directorymergewindow.cpp:3009 #, kde-format msgid "Error: Rename failed." msgstr "Viga: ümbernimetamine nurjus." -#: directorymergewindow.cpp:3013 +#: directorymergewindow.cpp:3027 #, kde-format msgid "Error during makeDir of %1. Cannot delete existing file." msgstr "Viga kataloogi %1 loomisel: olemasoleva faili kustutamine nurjus." -#: directorymergewindow.cpp:3030 +#: directorymergewindow.cpp:3044 #, kde-format msgid "makeDir( %1 )" msgstr "loo kataloog( %1 )" -#: directorymergewindow.cpp:3040 +#: directorymergewindow.cpp:3054 #, kde-format msgid "Error while creating directory." msgstr "Viga kataloogi loomisel." -#: directorymergewindow.cpp:3076 directorymergewindow.cpp:3195 +#: directorymergewindow.cpp:3090 directorymergewindow.cpp:3209 #, kde-format msgid "Dest" msgstr "Sihtkoht" -#: directorymergewindow.cpp:3084 directorymergewindow.cpp:3113 +#: directorymergewindow.cpp:3098 directorymergewindow.cpp:3127 #, kde-format msgid "Dir" msgstr "Kataloog" -#: directorymergewindow.cpp:3084 +#: directorymergewindow.cpp:3098 #, kde-format msgid "Type" msgstr "Tüüp" -#: directorymergewindow.cpp:3084 +#: directorymergewindow.cpp:3098 #, kde-format msgid "Size" msgstr "Suurus" -#: directorymergewindow.cpp:3085 +#: directorymergewindow.cpp:3099 #, kde-format msgid "Attr" msgstr "Atribuut" -#: directorymergewindow.cpp:3085 +#: directorymergewindow.cpp:3099 #, kde-format msgid "Last Modification" msgstr "Viimase muutmise aeg" -#: directorymergewindow.cpp:3085 +#: directorymergewindow.cpp:3099 #, kde-format msgid "Link-Destination" msgstr "Viit-sihtkoht" -#: directorymergewindow.cpp:3113 +#: directorymergewindow.cpp:3127 #, kde-format msgid "File" msgstr "Fail" -#: directorymergewindow.cpp:3113 -#, fuzzy, kde-format -#| msgid "Link: " +#: directorymergewindow.cpp:3127 +#, kde-format msgid "-Link" -msgstr "Viit: " +msgstr "-Viit: " -#: directorymergewindow.cpp:3119 +#: directorymergewindow.cpp:3133 #, kde-format msgid "not available" msgstr "pole kättesaadav" -#: directorymergewindow.cpp:3137 +#: directorymergewindow.cpp:3151 #, kde-format msgid "A (Dest): " msgstr "A (sihtkoht): " -#: directorymergewindow.cpp:3141 +#: directorymergewindow.cpp:3155 #, kde-format msgid "A: " -msgstr "" +msgstr "A: " -#: directorymergewindow.cpp:3141 +#: directorymergewindow.cpp:3155 #, kde-format msgid "A (Base): " msgstr "A (baas): " -#: directorymergewindow.cpp:3147 +#: directorymergewindow.cpp:3161 #, kde-format msgid "B (Dest): " msgstr "B (sihtkoht): " -#: directorymergewindow.cpp:3151 +#: directorymergewindow.cpp:3165 #, kde-format msgid "B: " -msgstr "" +msgstr "B: " -#: directorymergewindow.cpp:3156 +#: directorymergewindow.cpp:3170 #, kde-format msgid "C (Dest): " msgstr "C (sihtkoht): " -#: directorymergewindow.cpp:3160 +#: directorymergewindow.cpp:3174 #, kde-format msgid "C: " -msgstr "" +msgstr "C: " -#: directorymergewindow.cpp:3163 +#: directorymergewindow.cpp:3177 #, kde-format msgid "Dest: " msgstr "Sihtkoht: " #. i18n("Saving Directory Merge State ...")); -#: directorymergewindow.cpp:3238 +#: directorymergewindow.cpp:3252 #, kde-format msgid "Save Directory Merge State As..." msgstr "Kataloogi ühendamisoleku salvestamine..." -#: directorymergewindow.cpp:3387 +#: directorymergewindow.cpp:3401 #, kde-format msgid "Start/Continue Directory Merge" msgstr "Alusta/jätka kataloogi ühendamist" -#: directorymergewindow.cpp:3388 +#: directorymergewindow.cpp:3402 #, kde-format msgid "Run Operation for Current Item" msgstr "Käivita operatsioon käesoleva elemendiga" -#: directorymergewindow.cpp:3389 +#: directorymergewindow.cpp:3403 #, kde-format msgid "Compare Selected File" msgstr "Võrdle valitud faili" -#: directorymergewindow.cpp:3390 +#: directorymergewindow.cpp:3404 #, kde-format msgid "Merge Current File" msgstr "Ühenda praegune fail" -#: directorymergewindow.cpp:3390 +#: directorymergewindow.cpp:3404 #, kde-format msgid "" "Merge\n" @@ -832,51 +828,51 @@ "Ühenda\n" "fail" -#: directorymergewindow.cpp:3391 +#: directorymergewindow.cpp:3405 #, kde-format msgid "Fold All Subdirs" msgstr "Ava kõik alamkataloogid" -#: directorymergewindow.cpp:3392 +#: directorymergewindow.cpp:3406 #, kde-format msgid "Unfold All Subdirs" msgstr "Sule kõik alamkataloogid" #. i18n("Save Directory Merge State ..."), 0, this, &DirectoryMergeWindow::slotSaveMergeState, ac, "dir_save_merge_state"); #. i18n("Load Directory Merge State ..."), 0, this, &DirectoryMergeWindow::slotLoadMergeState, ac, "dir_load_merge_state"); -#: directorymergewindow.cpp:3396 +#: directorymergewindow.cpp:3410 #, kde-format msgid "Choose A for All Items" msgstr "Vali A kõigile elementidele" -#: directorymergewindow.cpp:3397 +#: directorymergewindow.cpp:3411 #, kde-format msgid "Choose B for All Items" msgstr "Vali B kõigile elementidele" -#: directorymergewindow.cpp:3398 +#: directorymergewindow.cpp:3412 #, kde-format msgid "Choose C for All Items" msgstr "Vali C kõigile elementidele" -#: directorymergewindow.cpp:3399 +#: directorymergewindow.cpp:3413 #, kde-format msgid "Auto-Choose Operation for All Items" msgstr "Automaatne valik kõigile elementidele" -#: directorymergewindow.cpp:3400 +#: directorymergewindow.cpp:3414 #, kde-format msgid "No Operation for All Items" msgstr "Ei ühtki operatsiooni kõigile elementidele" #. i18n("Synchronize Directories"), 0, this, &DirectoryMergeWindow::slotSynchronizeDirectories, ac, "dir_synchronize_directories"); #. d->m_pDirChooseNewerFiles = GuiUtils::createAction< KToggleAction >(i18n("Copy Newer Files Instead of Merging"), 0, this, &DirectoryMergeWindow::slotChooseNewerFiles, ac, "dir_choose_newer_files"); -#: directorymergewindow.cpp:3405 +#: directorymergewindow.cpp:3419 #, kde-format msgid "Show Identical Files" msgstr "Näita identseid faile" -#: directorymergewindow.cpp:3405 +#: directorymergewindow.cpp:3419 #, kde-format msgid "" "Identical\n" @@ -885,17 +881,17 @@ "Identsed\n" "failid" -#: directorymergewindow.cpp:3406 +#: directorymergewindow.cpp:3420 #, kde-format msgid "Show Different Files" msgstr "Näita erinevaid faile" -#: directorymergewindow.cpp:3407 +#: directorymergewindow.cpp:3421 #, kde-format msgid "Show Files only in A" msgstr "Näita ainult A faile" -#: directorymergewindow.cpp:3407 +#: directorymergewindow.cpp:3421 #, kde-format msgid "" "Files\n" @@ -904,12 +900,12 @@ "Ainult\n" "A failid" -#: directorymergewindow.cpp:3408 +#: directorymergewindow.cpp:3422 #, kde-format msgid "Show Files only in B" msgstr "Näita ainult B faile" -#: directorymergewindow.cpp:3408 +#: directorymergewindow.cpp:3422 #, kde-format msgid "" "Files\n" @@ -918,12 +914,12 @@ "Ainult\n" "B failid" -#: directorymergewindow.cpp:3409 +#: directorymergewindow.cpp:3423 #, kde-format msgid "Show Files only in C" msgstr "Näita ainult C faile" -#: directorymergewindow.cpp:3409 +#: directorymergewindow.cpp:3423 #, kde-format msgid "" "Files\n" @@ -932,251 +928,246 @@ "Ainult\n" "C failid" -#: directorymergewindow.cpp:3413 +#: directorymergewindow.cpp:3427 #, kde-format msgid "Compare Explicitly Selected Files" msgstr "Võrdle valitud faile" -#: directorymergewindow.cpp:3414 +#: directorymergewindow.cpp:3428 #, kde-format msgid "Merge Explicitly Selected Files" msgstr "Ühenda valitud failid" -#: directorymergewindow.cpp:3416 directorymergewindow.cpp:3423 +#: directorymergewindow.cpp:3430 directorymergewindow.cpp:3437 #, kde-format msgid "Do Nothing" msgstr "Ära tee midagi" -#: directorymergewindow.cpp:3428 +#: directorymergewindow.cpp:3442 #, kde-format msgid "Delete A && B" msgstr "Kustuta A ja B" -#: directorymergewindow.cpp:3431 +#: directorymergewindow.cpp:3445 #, kde-format msgid "Merge to A && B" msgstr "Ühenda A-sse ja B-sse" -#: fileaccess.cpp:462 SourceData.cpp:493 -#, fuzzy, kde-format -#| msgid "Reading file: %1" +#: fileaccess.cpp:301 +#, kde-format +msgid "Unable to determine full url. No parent specified." +msgstr "Täieliku URL-i tuvastamine nurjus. Eellast pole määratud." + +#: fileaccess.cpp:482 SourceData.cpp:506 +#, kde-format msgid "Failed to read file: %1" msgstr "Faili lugemine: %1" -#: fileaccess.cpp:587 +#: fileaccess.cpp:624 #, kde-format msgid "Creating temp copy of %1 failed." msgstr "%1 ajutise koopia loomine nurjus." -#: fileaccess.cpp:595 fileaccess.cpp:600 -#, fuzzy, kde-format -#| msgid "Opening %1 failed." +#: fileaccess.cpp:632 fileaccess.cpp:637 +#, kde-format msgid "Opening %1 failed. %2" -msgstr "%1 avamine nurjus." +msgstr "%1 avamine nurjus. %2" -#: fileaccess.cpp:619 fileaccess.cpp:627 -#, fuzzy, kde-format -#| msgid "Error reading from %1" +#: fileaccess.cpp:656 fileaccess.cpp:664 +#, kde-format msgid "Error reading from %1. %2" -msgstr "Viga %1 lugemisel" +msgstr "Viga %1 lugemisel. %2" -#: fileaccess.cpp:751 -#, fuzzy, kde-format -#| msgid "" -#| "While trying to make a backup, deleting an older backup failed. \n" -#| "Filename: " +#: fileaccess.cpp:788 +#, kde-format msgid "" "While trying to make a backup, deleting an older backup failed.\n" "Filename: %1" msgstr "" -"Varukoopia tegemisel nurjus vanema varukoopia kustutamine. \n" -"Faili nimi: " +"Varukoopia tegemisel nurjus vanema varukoopia kustutamine.\n" +"Faili nimi: %1" -#: fileaccess.cpp:758 -#, fuzzy, kde-format -#| msgid "" -#| "While trying to make a backup, renaming failed. \n" -#| "Filenames: " +#: fileaccess.cpp:795 +#, kde-format msgid "" "While trying to make a backup, renaming failed.\n" "Filenames: %1 -> %2" msgstr "" -"Varukoopia tegemisel nurjus ümbernimetamine. \n" -"Failide nimed: " +"Varukoopia tegemisel nurjus nime muutmine. \n" +"Failide nimed: %1 -> %2" -#: fileaccess.cpp:828 +#: fileaccess.cpp:865 #, kde-format msgid "Getting file status: %1" msgstr "Faili staatuse hankimine: %1" -#: fileaccess.cpp:869 +#: fileaccess.cpp:906 #, kde-format msgid "Reading file: %1" msgstr "Faili lugemine: %1" -#: fileaccess.cpp:907 +#: fileaccess.cpp:944 #, kde-format msgid "Writing file: %1" msgstr "Faili kirjutamine: %1" -#: fileaccess.cpp:940 +#: fileaccess.cpp:977 #, kde-format msgid "Out of memory" msgstr "Mälu napib" -#: fileaccess.cpp:976 +#: fileaccess.cpp:1013 #, kde-format msgid "Making directory: %1" msgstr "Kataloogi loomine: %1" -#: fileaccess.cpp:997 +#: fileaccess.cpp:1034 #, kde-format msgid "Removing directory: %1" msgstr "Kataloogi eemaldamine: %1" -#: fileaccess.cpp:1012 +#: fileaccess.cpp:1049 #, kde-format msgid "Removing file: %1" msgstr "Faili eemaldamine: %1" -#: fileaccess.cpp:1028 +#: fileaccess.cpp:1065 #, kde-format msgid "Creating symbolic link: %1 -> %2" msgstr "Nimeviida loomine: %1 -> %2" -#: fileaccess.cpp:1052 +#: fileaccess.cpp:1089 #, kde-format msgid "Renaming file: %1 -> %2" msgstr "Faili ümbernimetamine: %1 -> %2" -#: fileaccess.cpp:1086 +#: fileaccess.cpp:1123 #, kde-format msgid "Copying file: %1 -> %2" msgstr "Faili kopeerimine: %1 -> %2" -#: fileaccess.cpp:1108 -#, fuzzy, kde-format -#| msgid "Reading directory: " +#: fileaccess.cpp:1145 +#, kde-format msgid "Reading directory: %1" -msgstr "Kataloogi lugemine: " +msgstr "Kataloogi lugemine: %1" -#: fileaccess.cpp:1162 +#: fileaccess.cpp:1202 #, kde-format msgid "Listing directory: %1" msgstr "Kataloogi uurimine: %1" -#: kdiff3.cpp:181 +#: kdiff3.cpp:182 #, kde-format msgid "Current Configuration:" msgstr "Aktiivne seadistus:" -#: kdiff3.cpp:186 +#: kdiff3.cpp:187 #, kde-format msgid "Config Option Error:" msgstr "Seadistusvõtme viga:" -#: kdiff3.cpp:240 +#: kdiff3.cpp:246 #, kde-format msgid "Option --auto used, but no output file specified." msgstr "Kasutati võtit --auto, kuid väljundfail pole määratud." -#: kdiff3.cpp:416 +#: kdiff3.cpp:405 #, kde-format msgid "Option --auto ignored for directory comparison." msgstr "Kataloogide võrdlemisel ignoreeriti võtit --auto." -#: kdiff3.cpp:460 +#: kdiff3.cpp:449 #, kde-format msgid "Saving failed." msgstr "Salvestamine nurjus." -#: kdiff3.cpp:496 pdiff.cpp:1098 +#: kdiff3.cpp:494 pdiff.cpp:1096 #, kde-format msgid "Opening of these files failed:" msgstr "Nende failide avamine nurjus:" -#: kdiff3.cpp:505 +#: kdiff3.cpp:503 pdiff.cpp:1105 #, kde-format -msgid "File Open Error" +msgid "File open error" msgstr "Viga faili avamisel" -#: kdiff3.cpp:533 +#: kdiff3.cpp:532 #, kde-format msgid "Opens documents for comparison..." msgstr "Avab dokumendid võrdlemiseks..." -#: kdiff3.cpp:535 +#: kdiff3.cpp:534 #, kde-format msgid "Reload" msgstr "Laadi uuesti" -#: kdiff3.cpp:538 +#: kdiff3.cpp:537 #, kde-format msgid "Saves the merge result. All conflicts must be solved!" msgstr "" "Salvestab ühendamise tulemuse. Kõik konfliktid peavad olema lahendatud!" -#: kdiff3.cpp:540 +#: kdiff3.cpp:539 #, kde-format msgid "Saves the current document as..." msgstr "Salvestab käesoleva dokumendi nimega..." -#: kdiff3.cpp:543 +#: kdiff3.cpp:542 #, kde-format msgid "Print the differences" msgstr "Trükib erinevused" -#: kdiff3.cpp:546 +#: kdiff3.cpp:545 #, kde-format msgid "Quits the application" msgstr "Väljub rakendusest" -#: kdiff3.cpp:549 +#: kdiff3.cpp:548 #, kde-format msgid "Cuts the selected section and puts it to the clipboard" msgstr "Valitud teksti lõikamine ja asetamine lõikepuhvrisse" -#: kdiff3.cpp:552 +#: kdiff3.cpp:551 #, kde-format msgid "Copies the selected section to the clipboard" msgstr "Kopeerib valitud lõigu lõikepuhvrisse" -#: kdiff3.cpp:554 +#: kdiff3.cpp:553 #, kde-format msgid "Pastes the clipboard contents to current position" msgstr "Lõikepuhvri sisu asetamine praegusesse asukohta" -#: kdiff3.cpp:557 +#: kdiff3.cpp:556 #, kde-format msgid "Select everything in current window" msgstr "Kogu aktiivse akna sisu valimine" -#: kdiff3.cpp:560 +#: kdiff3.cpp:559 #, kde-format msgid "Search for a string" msgstr "Otsib stringi" -#: kdiff3.cpp:562 +#: kdiff3.cpp:561 #, kde-format msgid "Search again for the string" msgstr "Otsib uuesti stringi" -#: kdiff3.cpp:567 +#: kdiff3.cpp:566 #, kde-format msgid "Enables/disables the statusbar" msgstr "Lülitab staatusriba sisse/välja" -#: kdiff3.cpp:571 +#: kdiff3.cpp:570 #, kde-format msgid "Configure KDiff3..." msgstr "KDiff3 seadistamine..." -#: kdiff3.cpp:590 +#: kdiff3.cpp:589 #, kde-format msgid "Go to Current Delta" msgstr "Liigu praegusele erinevusele" -#: kdiff3.cpp:590 +#: kdiff3.cpp:589 #, kde-format msgid "" "Current\n" @@ -1185,12 +1176,12 @@ "Praegune\n" "erinevus" -#: kdiff3.cpp:592 +#: kdiff3.cpp:591 #, kde-format msgid "Go to First Delta" msgstr "Liigu esimesele erinevusele" -#: kdiff3.cpp:592 +#: kdiff3.cpp:591 #, kde-format msgid "" "First\n" @@ -1199,12 +1190,12 @@ "Esimene\n" "erinevus" -#: kdiff3.cpp:594 +#: kdiff3.cpp:593 #, kde-format msgid "Go to Last Delta" msgstr "Liigu viimasele erinevusele" -#: kdiff3.cpp:594 +#: kdiff3.cpp:593 #, kde-format msgid "" "Last\n" @@ -1213,14 +1204,14 @@ "Viimane\n" "erinevus" -#: kdiff3.cpp:596 +#: kdiff3.cpp:595 #, kde-format 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:597 +#: kdiff3.cpp:596 #, kde-format msgid "" "(Does not skip white space differences even when \"Show White Space\" is " @@ -1229,12 +1220,12 @@ "(Tühimärkide erinevusi näidatakse isegi siis, kui \"Tühimärkide näitamine\" " "ei ole sees.)" -#: kdiff3.cpp:598 +#: kdiff3.cpp:597 #, kde-format msgid "Go to Previous Delta" msgstr "Liigu eelmisele erinevusele" -#: kdiff3.cpp:598 +#: kdiff3.cpp:597 #, kde-format msgid "" "Prev\n" @@ -1243,12 +1234,12 @@ "Eelmine\n" "erinevus" -#: kdiff3.cpp:600 +#: kdiff3.cpp:599 #, kde-format msgid "Go to Next Delta" msgstr "Liigu järgmisele erinevusele" -#: kdiff3.cpp:600 +#: kdiff3.cpp:599 #, kde-format msgid "" "Next\n" @@ -1257,12 +1248,12 @@ "Järgmine\n" "erinevus" -#: kdiff3.cpp:602 +#: kdiff3.cpp:601 #, kde-format msgid "Go to Previous Conflict" msgstr "Liigu eelmisele konfliktile" -#: kdiff3.cpp:602 +#: kdiff3.cpp:601 #, kde-format msgid "" "Prev\n" @@ -1271,12 +1262,12 @@ "Eelmine\n" "konflikt" -#: kdiff3.cpp:604 +#: kdiff3.cpp:603 #, kde-format msgid "Go to Next Conflict" msgstr "Liigu järgmisele konfliktile" -#: kdiff3.cpp:604 +#: kdiff3.cpp:603 #, kde-format msgid "" "Next\n" @@ -1285,12 +1276,12 @@ "Järgmine\n" "konflikt" -#: kdiff3.cpp:606 +#: kdiff3.cpp:605 #, kde-format msgid "Go to Previous Unsolved Conflict" msgstr "Liigu eelmisele lahendamata konfliktile" -#: kdiff3.cpp:606 +#: kdiff3.cpp:605 #, kde-format msgid "" "Prev\n" @@ -1299,12 +1290,12 @@ "Eelmine\n" "lahendamata" -#: kdiff3.cpp:608 +#: kdiff3.cpp:607 #, kde-format msgid "Go to Next Unsolved Conflict" msgstr "Liigu järgmisele lahendamata konfliktile" -#: kdiff3.cpp:608 +#: kdiff3.cpp:607 #, kde-format msgid "" "Next\n" @@ -1313,12 +1304,12 @@ "Järgmine\n" "lahendamata" -#: kdiff3.cpp:610 +#: kdiff3.cpp:609 #, kde-format msgid "Select Line(s) From A" msgstr "Vali rida/read A-st" -#: kdiff3.cpp:610 +#: kdiff3.cpp:609 #, kde-format msgid "" "Choose\n" @@ -1327,12 +1318,12 @@ "Vali\n" "A" -#: kdiff3.cpp:611 +#: kdiff3.cpp:610 #, kde-format msgid "Select Line(s) From B" msgstr "Vali rida/read B-st" -#: kdiff3.cpp:611 +#: kdiff3.cpp:610 #, kde-format msgid "" "Choose\n" @@ -1341,12 +1332,12 @@ "Vali\n" "B" -#: kdiff3.cpp:612 +#: kdiff3.cpp:611 #, kde-format msgid "Select Line(s) From C" msgstr "Vali rida/read C-st" -#: kdiff3.cpp:612 +#: kdiff3.cpp:611 #, kde-format msgid "" "Choose\n" @@ -1355,13 +1346,13 @@ "Vali\n" "C" -#: kdiff3.cpp:613 +#: kdiff3.cpp:612 #, kde-format msgid "Automatically Go to Next Unsolved Conflict After Source Selection" msgstr "" "Pärast allikavalikut liigu automaatselt järgmisele lahendamata konfliktile" -#: kdiff3.cpp:613 +#: kdiff3.cpp:612 #, kde-format msgid "" "Auto\n" @@ -1370,25 +1361,24 @@ "Automaatselt\n" "järgmine" -#: kdiff3.cpp:615 -#, fuzzy, kde-format -#| msgid "Show Space && Tabulator Characters for Differences" +#: kdiff3.cpp:614 +#, kde-format msgid "Show Space && Tabulator Characters" -msgstr "Näita erinevusi tühiku- ja tabeldusmärkides" +msgstr "Näita tühiku- ja tabeldusmärke" -#: kdiff3.cpp:615 +#: kdiff3.cpp:614 #, kde-format msgid "" "White\n" "Characters" msgstr "Tühimärgid" -#: kdiff3.cpp:616 +#: kdiff3.cpp:615 #, kde-format msgid "Show White Space" msgstr "Näita tühimärke" -#: kdiff3.cpp:616 +#: kdiff3.cpp:615 #, kde-format msgid "" "White\n" @@ -1397,235 +1387,231 @@ "Tühimärkide\n" "erinevus" -#: kdiff3.cpp:618 +#: kdiff3.cpp:617 #, kde-format msgid "Show Line Numbers" msgstr "Näita reanumbreid" -#: kdiff3.cpp:618 +#: kdiff3.cpp:617 #, kde-format msgid "" "Line\n" "Numbers" msgstr "Reanumbrid" -#: kdiff3.cpp:620 +#: kdiff3.cpp:619 #, kde-format msgid "Automatically Solve Simple Conflicts" msgstr "Lahenda automaatselt lihtsad konfliktid" -#: kdiff3.cpp:621 +#: kdiff3.cpp:620 #, kde-format msgid "Set Deltas to Conflicts" msgstr "Määra erinevused konfliktideks" -#: kdiff3.cpp:622 +#: kdiff3.cpp:621 #, kde-format msgid "Run Regular Expression Auto Merge" msgstr "Käivita regulaaravaldisega automaatühendamine" -#: kdiff3.cpp:623 +#: kdiff3.cpp:622 #, kde-format msgid "Automatically Solve History Conflicts" msgstr "Lahenda automaatselt ajalookonfliktid" -#: kdiff3.cpp:624 +#: kdiff3.cpp:623 #, kde-format msgid "Split Diff At Selection" msgstr "Jaga erinevused valiku juures" -#: kdiff3.cpp:625 +#: kdiff3.cpp:624 #, kde-format msgid "Join Selected Diffs" msgstr "Liida valitud erinevused" -#: kdiff3.cpp:627 +#: kdiff3.cpp:626 #, kde-format msgid "Show Window A" msgstr "Näita akent A" -#: kdiff3.cpp:628 +#: kdiff3.cpp:627 #, kde-format msgid "Show Window B" msgstr "Näita akent B" -#: kdiff3.cpp:629 +#: kdiff3.cpp:628 #, kde-format msgid "Show Window C" msgstr "Näita akent C" -#: kdiff3.cpp:631 +#: kdiff3.cpp:630 #, kde-format msgid "Normal Overview" msgstr "Normaalne ülevaade" -#: kdiff3.cpp:632 +#: kdiff3.cpp:631 #, kde-format msgid "A vs. B Overview" msgstr "A-B ülevaade" -#: kdiff3.cpp:633 +#: kdiff3.cpp:632 #, kde-format msgid "A vs. C Overview" msgstr "A-C ülevaade" -#: kdiff3.cpp:634 +#: kdiff3.cpp:633 #, kde-format msgid "B vs. C Overview" msgstr "B-C ülevaade" -#: kdiff3.cpp:635 +#: kdiff3.cpp:634 #, kde-format msgid "Word Wrap Diff Windows" msgstr "Reamurdmine võrdlusakendes" -#: kdiff3.cpp:636 +#: kdiff3.cpp:635 #, kde-format msgid "Add Manual Diff Alignment" msgstr "Lisa käsitsi samasus" -#: kdiff3.cpp:637 +#: kdiff3.cpp:636 #, kde-format msgid "Clear All Manual Diff Alignments" msgstr "Eemalda kõik käsitsi määratud samasused" -#: kdiff3.cpp:639 +#: kdiff3.cpp:638 #, kde-format msgid "Focus Next Window" msgstr "Fokuseeri järgmisele aknale" -#: kdiff3.cpp:640 +#: kdiff3.cpp:639 #, kde-format msgid "Focus Prev Window" msgstr "Fokuseeri eelmisele aknale" -#: kdiff3.cpp:641 +#: kdiff3.cpp:640 #, kde-format msgid "Toggle Split Orientation" msgstr "Lülita poolitamissuund" -#: kdiff3.cpp:643 +#: kdiff3.cpp:642 #, kde-format msgid "Dir && Text Split Screen View" msgstr "Kataloogi ja teksti poolitamisvaade" -#: kdiff3.cpp:645 +#: kdiff3.cpp:644 #, kde-format msgid "Toggle Between Dir && Text View" msgstr "Lülita kataloogi- ja tekstivaadet" -#: kdiff3.cpp:697 pdiff.cpp:1909 -#, fuzzy, kde-format -#| msgid "The merge result hasn't been saved." +#: kdiff3.cpp:696 pdiff.cpp:1919 +#, kde-format msgid "The merge result has not been saved." msgstr "Ühendamise tulemust pole salvestatud." -#: kdiff3.cpp:699 +#: kdiff3.cpp:698 #, kde-format msgid "Save && Quit" msgstr "Salvesta ja välju" -#: kdiff3.cpp:700 +#: kdiff3.cpp:699 #, kde-format msgid "Quit Without Saving" msgstr "Välju salvestamata" -#: kdiff3.cpp:708 pdiff.cpp:1920 +#: kdiff3.cpp:707 pdiff.cpp:1930 #, kde-format msgid "Saving the merge result failed." msgstr "Ühendamise tulemuse salvestamine nurjus." -#: kdiff3.cpp:719 pdiff.cpp:1032 +#: kdiff3.cpp:718 pdiff.cpp:1030 #, kde-format 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:742 +#: kdiff3.cpp:741 #, kde-format msgid "Saving file..." msgstr "Faili salvestamine..." -#: kdiff3.cpp:759 +#: kdiff3.cpp:758 #, kde-format msgid "Saving file with a new filename..." msgstr "Faili salvestamine uue nimega..." -#: kdiff3.cpp:761 +#: kdiff3.cpp:760 #, kde-format msgid "Save As..." msgstr "Salvestamine..." -#: kdiff3.cpp:820 +#: kdiff3.cpp:819 #, kde-format msgid "Printing not implemented." msgstr "Trükkimine ei ole veel võimalik." -#: kdiff3.cpp:857 +#: kdiff3.cpp:858 #, kde-format msgid "Printing..." msgstr "Trükkimine..." -#: kdiff3.cpp:943 +#: kdiff3.cpp:948 #, kde-format msgid "Printing page %1 of %2" -msgstr "" +msgstr "Trükitakse lehekülge %1 / %2" -#: kdiff3.cpp:1000 -#, fuzzy, kde-format -#| msgid "Selection" +#: kdiff3.cpp:1006 +#, kde-format msgid " (Selection)" -msgstr "Valik" +msgstr " (Valik)" -#: kdiff3.cpp:1027 +#: kdiff3.cpp:1034 #, kde-format msgid "Printing completed." msgstr "Trükkimine lõpetatud." -#: kdiff3.cpp:1031 +#: kdiff3.cpp:1038 #, kde-format msgid "Printing aborted." msgstr "Trükkimine katkestati" -#: kdiff3.cpp:1038 +#: kdiff3.cpp:1045 #, kde-format msgid "Exiting..." msgstr "Väljumine..." -#: kdiff3.cpp:1049 +#: kdiff3.cpp:1056 #, kde-format msgid "Toggling toolbar..." msgstr "Tööriistariba lülitamine..." -#: kdiff3.cpp:1070 +#: kdiff3.cpp:1077 #, kde-format msgid "Toggle the statusbar..." msgstr "Olekuriba lülitamine..." #: kdiff3_part.cpp:45 -#, fuzzy, kde-format -#| msgid "KDiff3Part" +#, kde-format msgid "KDiff3 Part" msgstr "KDiff3 komponent" #: kdiff3_part.cpp:46 #, kde-format msgid "A KPart to display SVG images" -msgstr "" +msgstr "KPart SVG-piltide näitamiseks" #: kdiff3_part.cpp:48 #, kde-format msgid "Copyright 2007, Aurélien Gâteau " -msgstr "" +msgstr "Autoriõigus 2007: Aurélien Gâteau " #: kdiff3_part.cpp:49 #, kde-format msgid "Joachim Eibl" msgstr "Joachim Eibl" -#: kdiff3_part.cpp:173 kdiff3_part.cpp:254 -#, fuzzy, kde-format -#| msgid "Couldn't find files for comparison." +#: kdiff3_part.cpp:174 kdiff3_part.cpp:255 +#, kde-format msgid "Could not find files for comparison." msgstr "Faile võrdlemiseks ei leitud." @@ -1642,7 +1628,7 @@ msgstr "KDiff3 seadistamine" #. i18n: ectx: ToolBar (mainToolBar) -#: kdiff3_part.rc:16 main.cpp:88 +#: kdiff3_part.rc:16 main.cpp:89 #, kde-format msgid "KDiff3" msgstr "KDiff3" @@ -1684,8 +1670,7 @@ #. i18n: ectx: Menu (movement) #: kdiff3_shell.rc:50 -#, fuzzy, kde-format -#| msgid "&Movement" +#, kde-format msgid "M&ovement" msgstr "&Liikumine" @@ -1697,10 +1682,9 @@ #. i18n: ectx: Menu (merge) #: kdiff3_shell.rc:73 -#, fuzzy, kde-format -#| msgid "Merge" +#, kde-format msgid "M&erge" -msgstr "Ühenda" +msgstr "Ü&hendamine" #. i18n: ectx: Menu (window) #: kdiff3_shell.rc:95 @@ -1714,84 +1698,88 @@ msgid "Main Toolbar" msgstr "Peamine tööriistariba" -#: main.cpp:68 main.cpp:72 +#: main.cpp:69 main.cpp:73 #, kde-format msgid "Ignored. (User defined.)" msgstr "Ignoreeritakse (kasutaja määratud)" -#: main.cpp:92 +#: main.cpp:93 #, kde-format msgid " (64 bit)" -msgstr "" +msgstr " (64-bitine)" -#: main.cpp:94 +#: main.cpp:95 #, kde-format msgid " (32 bit)" -msgstr "" +msgstr " (32-bitine)" -#: main.cpp:95 +#: main.cpp:96 #, kde-format msgid "Tool for Comparison and Merge of Files and Directories" msgstr "Failide ja kataloogide võrdlemise ning ühendamise vahend" -#: main.cpp:96 +#: main.cpp:97 #, kde-format msgid "(c) 2002-2014 Joachim Eibl, (c) 2017 Michael Reeves KF5/Qt5 port" -msgstr "" +msgstr "(c) 2002-2014: Joachim Eibl, (c) 2017: Michael Reeves KF5/Qt5 port" -#: main.cpp:112 +#: main.cpp:113 #, kde-format msgid "Merge the input." msgstr "Liidab sisendi." -#: main.cpp:113 +#: main.cpp:114 #, kde-format msgid "Explicit base file. For compatibility with certain tools." msgstr "Konkreetne põhifail (ühilduvuseks teatud tööriistadega)." -#: main.cpp:114 +#: main.cpp:115 #, kde-format msgid "Output file. Implies -m. E.g.: -o newfile.txt" msgstr "Väljundfail. Eeldab -m. Nt. -o uusfail.txt" -#: main.cpp:115 +#: main.cpp:116 #, kde-format msgid "Output file, again. (For compatibility with certain tools.)" msgstr "Taas väljundfail (ühilduvuseks teatud tööriistadega)" -#: main.cpp:116 +#: main.cpp:118 #, kde-format msgid "No GUI if all conflicts are auto-solvable. (Needs -o file)" msgstr "GUI puudub, kui kõik konfliktid lahenevad ise (vajalik on -o fail)" -#: main.cpp:117 -#, fuzzy, kde-format -#| msgid "Don't solve conflicts automatically. (For compatibility...)" +#: main.cpp:120 +#, kde-format +msgid "Ignored." +msgstr "Eiratakse." + +#: main.cpp:122 +#, kde-format msgid "Do not solve conflicts automatically." -msgstr "Konflikte ei lahendata automaatselt (jälle ühilduvuse nimel...)" +msgstr "Konflikte ei lahendata automaatselt." -#: main.cpp:118 +#: main.cpp:123 #, kde-format msgid "Visible name replacement for input file 1 (base)." msgstr "Nähtava nime asendus sisendfailile 1 (baas)." -#: main.cpp:119 +#: main.cpp:124 #, kde-format msgid "Visible name replacement for input file 2." msgstr "Nähtava nime asendus sisendfailile 2." -#: main.cpp:120 +#: main.cpp:125 #, kde-format msgid "Visible name replacement for input file 3." msgstr "Nähtava nime asendus sisendfailile 3." -#: main.cpp:121 +#: main.cpp:126 #, kde-format msgid "Alternative visible name replacement. Supply this once for every input." msgstr "" "Nähtava nime alternatiivne asendus. See tuleb anda kord iga sisendi jaoks." -#: main.cpp:122 +#: main.cpp:127 #, kde-format msgid "" "Override a config setting. Use once for every setting. E.g.: --cs " @@ -1800,87 +1788,87 @@ "Seadistusvõtme tühistamine. Tuleb kasutada iga võtme jaoks eraldi, nt. --cs " "\"AutoAdvance=1\"" -#: main.cpp:123 +#: main.cpp:128 #, kde-format msgid "Show list of config settings and current values." msgstr "Seadistuste nimekirja ja võtmete kehtivate väärtuste näitamine." -#: main.cpp:124 +#: main.cpp:129 #, kde-format msgid "Use a different config file." msgstr "Muu seadistustefaili kasutamine." -#: main.cpp:127 +#: main.cpp:132 #, kde-format msgid "file1 to open (base, if not specified via --base)" msgstr "avatav fail1 (põhifail, kui --base teisiti ei määra)" -#: main.cpp:128 +#: main.cpp:133 #, kde-format msgid "file2 to open" msgstr "avatav fail2" -#: main.cpp:129 +#: main.cpp:134 #, kde-format msgid "file3 to open" msgstr "avatav fail3" -#: main.cpp:153 +#: main.cpp:158 #, kde-format msgid "See kdiff3 --help for supported options." -msgstr "" +msgstr "Toetatud valikuid näitab kdiff3 --help." -#: mergeresultwindow.cpp:158 +#: mergeresultwindow.cpp:171 #, kde-format msgid "Choose A Everywhere" msgstr "Vali A kõikjal" -#: mergeresultwindow.cpp:159 +#: mergeresultwindow.cpp:172 #, kde-format msgid "Choose B Everywhere" msgstr "Vali B kõikjal" -#: mergeresultwindow.cpp:160 +#: mergeresultwindow.cpp:173 #, kde-format msgid "Choose C Everywhere" msgstr "Vali C kõikjal" -#: mergeresultwindow.cpp:161 +#: mergeresultwindow.cpp:174 #, kde-format msgid "Choose A for All Unsolved Conflicts" msgstr "Vali A kõigi lahendamata konfliktide korral" -#: mergeresultwindow.cpp:162 +#: mergeresultwindow.cpp:175 #, kde-format msgid "Choose B for All Unsolved Conflicts" msgstr "Vali B kõigi lahendamata konfliktide korral" -#: mergeresultwindow.cpp:163 +#: mergeresultwindow.cpp:176 #, kde-format msgid "Choose C for All Unsolved Conflicts" msgstr "Vali C kõigi lahendamata konfliktide korral" -#: mergeresultwindow.cpp:164 +#: mergeresultwindow.cpp:177 #, kde-format msgid "Choose A for All Unsolved Whitespace Conflicts" msgstr "Vali A kõigi lahendamata tühimärgikonkfliktide korral" -#: mergeresultwindow.cpp:165 +#: mergeresultwindow.cpp:178 #, kde-format msgid "Choose B for All Unsolved Whitespace Conflicts" msgstr "Vali B kõigi lahendamata tühimärgikonkfliktide korral" -#: mergeresultwindow.cpp:166 +#: mergeresultwindow.cpp:179 #, kde-format msgid "Choose C for All Unsolved Whitespace Conflicts" msgstr "Vali C kõigi lahendamata tühimärgikonkfliktide korral" -#: mergeresultwindow.cpp:176 +#: mergeresultwindow.cpp:204 #, kde-format msgid "Number of remaining unsolved conflicts: %1 (of which %2 are whitespace)" msgstr "Lahendamata konfliktide arv: %1 (neist %2 on tühimärgierinevused)" -#: mergeresultwindow.cpp:370 +#: mergeresultwindow.cpp:398 #, kde-format msgid "" "The output has been modified.\n" @@ -1889,29 +1877,29 @@ "Väljundit on muudetud.\n" "Kui jätkad, lähevad sinu muudatused kaotsi." -#: mergeresultwindow.cpp:936 pdiff.cpp:827 +#: mergeresultwindow.cpp:964 pdiff.cpp:817 #, kde-format msgid "All input files are binary equal." msgstr "Kõik sisendfailid on binaarselt võrdsed." -#: mergeresultwindow.cpp:938 +#: mergeresultwindow.cpp:966 #, kde-format msgid "All input files contain the same text." msgstr "Kõik sisendfailid sisaldavad ühesugust teksti." -#: mergeresultwindow.cpp:942 mergeresultwindow.cpp:946 -#: mergeresultwindow.cpp:950 pdiff.cpp:833 pdiff.cpp:837 pdiff.cpp:841 +#: mergeresultwindow.cpp:970 mergeresultwindow.cpp:974 +#: mergeresultwindow.cpp:978 pdiff.cpp:823 pdiff.cpp:827 pdiff.cpp:831 #, kde-format msgid "Files %1 and %2 are binary equal.\n" msgstr "Failid %1 ja %2 on binaarselt võrdsed.\n" -#: mergeresultwindow.cpp:944 mergeresultwindow.cpp:948 -#: mergeresultwindow.cpp:952 +#: mergeresultwindow.cpp:972 mergeresultwindow.cpp:976 +#: mergeresultwindow.cpp:980 #, kde-format msgid "Files %1 and %2 have equal text.\n" msgstr "Failid %1 ja %2 on ühesuguse tekstiga. \n" -#: mergeresultwindow.cpp:958 +#: mergeresultwindow.cpp:986 #, kde-format msgid "" "Total number of conflicts: %1\n" @@ -1919,59 +1907,56 @@ "Nr of unsolved conflicts: %3\n" "%4" msgstr "" +"Konfliktide koguarv: %1\n" +"Automaatselt lahendatud konfliktide arv: %2\n" +"Lahendamata konfliktide arv: %3\n" +"%4" -#: mergeresultwindow.cpp:964 +#: mergeresultwindow.cpp:992 #, kde-format msgid "Conflicts" msgstr "Konfliktid" -#: mergeresultwindow.cpp:1873 +#: mergeresultwindow.cpp:1901 #, kde-format msgid "" msgstr "" -#: mergeresultwindow.cpp:1881 +#: mergeresultwindow.cpp:1909 #, kde-format msgid "" msgstr "<Ühendamise konflikt (ainult tühimärgid)>" -#: mergeresultwindow.cpp:1883 mergeresultwindow.cpp:2755 +#: mergeresultwindow.cpp:1911 mergeresultwindow.cpp:2783 #, kde-format msgid "" msgstr "<Ühendamise konflikt>" -#: mergeresultwindow.cpp:2967 -#, fuzzy, kde-format -#| msgid "" -#| "Not all conflicts are solved yet.\n" -#| "File not saved.\n" +#: mergeresultwindow.cpp:2995 +#, kde-format msgid "" "Not all conflicts are solved yet.\n" "File not saved." msgstr "" "Kõik konfliktid pole veel lahendatud.\n" -"Faili ei salvestatud.\n" +"Faili ei salvestatud." -#: mergeresultwindow.cpp:2969 mergeresultwindow.cpp:2978 +#: mergeresultwindow.cpp:2997 mergeresultwindow.cpp:3006 #, kde-format msgid "Conflicts Left" msgstr "Järelejäänud konfliktid" -#: mergeresultwindow.cpp:2976 -#, fuzzy, kde-format -#| msgid "" -#| "There is a line end style conflict. Please choose the line end style " -#| "manually.\n" -#| "File not saved.\n" +#: mergeresultwindow.cpp:3004 +#, kde-format msgid "" "There is a line end style conflict. Please choose the line end style " "manually.\n" "File not saved." msgstr "" "Tekkis realõpu stiili konflikt. Palun vali realõpu stiil käsitsi.\n" -"Faili ei salvestatud.\n" +"Faili ei salvestatud." -#: mergeresultwindow.cpp:2990 +#: mergeresultwindow.cpp:3018 #, kde-format msgid "" "\n" @@ -1982,188 +1967,184 @@ "\n" "Varukoopia loomine nurjus. Faili ei salvestatud." -#: mergeresultwindow.cpp:2990 mergeresultwindow.cpp:3038 +#: mergeresultwindow.cpp:3018 mergeresultwindow.cpp:3066 #, kde-format msgid "File Save Error" msgstr "Faili salvestamise viga" -#: mergeresultwindow.cpp:3038 +#: mergeresultwindow.cpp:3066 #, kde-format msgid "Error while writing." msgstr "Kirjutamise viga." -#: mergeresultwindow.cpp:3110 -#, fuzzy, kde-format -#| msgid "Output" +#: mergeresultwindow.cpp:3138 +#, kde-format msgid "Output:" -msgstr "Väljund" +msgstr "Väljund:" -#: mergeresultwindow.cpp:3123 mergeresultwindow.cpp:3315 +#: mergeresultwindow.cpp:3151 mergeresultwindow.cpp:3343 #, kde-format msgid "[Modified]" msgstr "[Muudetud]" -#: mergeresultwindow.cpp:3130 -#, fuzzy, kde-format -#| msgid "Encoding for saving" +#: mergeresultwindow.cpp:3158 +#, kde-format msgid "Encoding for saving:" -msgstr "Kodeering salvestamisel" +msgstr "Kodeering salvestamisel:" -#: mergeresultwindow.cpp:3230 +#: mergeresultwindow.cpp:3258 #, kde-format msgid "Conflict" msgstr "Konflikt" -#: mergeresultwindow.cpp:3262 -#, fuzzy, kde-format -#| msgid "Codec from" +#: mergeresultwindow.cpp:3290 +#, kde-format msgid "Codec from A: %1" -msgstr "Koodek" +msgstr "A koodek: %1" -#: mergeresultwindow.cpp:3264 -#, fuzzy, kde-format -#| msgid "Codec from" +#: mergeresultwindow.cpp:3292 +#, kde-format msgid "Codec from B: %1" -msgstr "Koodek" +msgstr "B koodek: %1" -#: mergeresultwindow.cpp:3266 -#, fuzzy, kde-format -#| msgid "Codec from" +#: mergeresultwindow.cpp:3294 +#, kde-format msgid "Codec from C: %1" -msgstr "Koodek" +msgstr "C koodek: %1" -#: optiondialog.cpp:119 +#: optiondialog.cpp:121 #, kde-format msgid "Change Font" -msgstr "" +msgstr "Muuda fonti" -#: optiondialog.cpp:135 optiondialog.cpp:145 +#: optiondialog.cpp:137 optiondialog.cpp:147 #, kde-format msgid "" "Font: %1, %2, %3\n" "\n" "Example:" msgstr "" +"Font: %1, %2, %3\n" +"\n" +"Näide:" -#: optiondialog.cpp:388 +#: optiondialog.cpp:390 #, kde-format msgid "Unicode" msgstr "Unicode" -#: optiondialog.cpp:389 +#: optiondialog.cpp:391 #, kde-format msgid "Latin1" msgstr "Latin1" -#: optiondialog.cpp:408 +#: optiondialog.cpp:410 #, kde-format msgid "Change this if non-ASCII characters are not displayed correctly." msgstr "Muuda, kui mitte-ASCII sümboleid ei näidata korrektselt." -#: optiondialog.cpp:491 +#: optiondialog.cpp:495 #, kde-format msgid "Configure" msgstr "Seadistamine" -#: optiondialog.cpp:568 +#: optiondialog.cpp:573 #, kde-format msgid "Font" msgstr "Font" -#: optiondialog.cpp:570 +#: optiondialog.cpp:575 #, kde-format msgid "Editor & Diff Output Font" msgstr "Redaktori ja erinevuse väljundi font" -#: optiondialog.cpp:589 +#: optiondialog.cpp:594 #, kde-format msgid "Application font" -msgstr "" +msgstr "Rakenduse font" -#: optiondialog.cpp:594 -#, fuzzy, kde-format -#| msgid "File Save Error" +#: optiondialog.cpp:599 +#, kde-format msgid "File view font" -msgstr "Faili salvestamise viga" +msgstr "Failivaate font" -#: optiondialog.cpp:613 -#, fuzzy, kde-format -#| msgid "Color" +#: optiondialog.cpp:618 +#, kde-format msgctxt "Title for color settings page" msgid "Color" msgstr "Värv" -#: optiondialog.cpp:614 +#: optiondialog.cpp:619 #, kde-format msgid "Colors Settings" msgstr "Värviseadistused" -#: optiondialog.cpp:631 +#: optiondialog.cpp:644 #, kde-format msgid "Editor and Diff Views:" msgstr "Redaktori ja erinevuse vaated:" -#: optiondialog.cpp:639 +#: optiondialog.cpp:652 #, kde-format msgid "Foreground color:" msgstr "Esiplaani värv:" -#: optiondialog.cpp:647 +#: optiondialog.cpp:660 #, kde-format msgid "Background color:" msgstr "Tausta värv:" -#: optiondialog.cpp:657 +#: optiondialog.cpp:670 #, kde-format msgid "Diff background color:" msgstr "Erinevuse tausta värv:" -#: optiondialog.cpp:666 +#: optiondialog.cpp:679 #, kde-format msgid "Color A:" msgstr "Värv A:" -#: optiondialog.cpp:675 +#: optiondialog.cpp:688 #, kde-format msgid "Color B:" msgstr "Värv B:" -#: optiondialog.cpp:684 +#: optiondialog.cpp:697 #, kde-format msgid "Color C:" msgstr "Värv C:" -#: optiondialog.cpp:692 +#: optiondialog.cpp:705 #, kde-format msgid "Conflict color:" msgstr "Konflikti värv:" -#: optiondialog.cpp:701 +#: optiondialog.cpp:714 #, kde-format msgid "Current range background color:" msgstr "Praeguse vahemiku tausta värv:" -#: optiondialog.cpp:710 +#: optiondialog.cpp:723 #, kde-format msgid "Current range diff background color:" msgstr "Praeguse vahemiku erinevuse tausta värv:" -#: optiondialog.cpp:718 +#: optiondialog.cpp:731 #, kde-format msgid "Color for manually aligned difference ranges:" msgstr "Käsitsi määratud samasuse vahemiku värv:" -#: optiondialog.cpp:725 +#: optiondialog.cpp:738 #, kde-format msgid "Directory Comparison View:" msgstr "Kataloogi võrdlemise vaade:" -#: optiondialog.cpp:731 +#: optiondialog.cpp:744 #, kde-format msgid "Newest file color:" msgstr "Uusima faili värv:" -#: optiondialog.cpp:736 +#: optiondialog.cpp:749 #, kde-format msgid "" "Changing this color will only be effective when starting the next directory " @@ -2172,37 +2153,37 @@ "Seda värvi muudetakse alles siis, kui alustad järgmist kataloogide " "võrdlemist." -#: optiondialog.cpp:741 +#: optiondialog.cpp:754 #, kde-format msgid "Oldest file color:" msgstr "Vanima faili värv:" -#: optiondialog.cpp:750 +#: optiondialog.cpp:763 #, kde-format msgid "Middle age file color:" msgstr "Keskmise vanusega faili värv:" -#: optiondialog.cpp:759 +#: optiondialog.cpp:772 #, kde-format msgid "Color for missing files:" msgstr "Puuduvate failide värv:" -#: optiondialog.cpp:773 +#: optiondialog.cpp:786 #, kde-format msgid "Editor" msgstr "Redaktor" -#: optiondialog.cpp:774 +#: optiondialog.cpp:787 #, kde-format msgid "Editor Behavior" msgstr "Redaktori käitumine" -#: optiondialog.cpp:787 +#: optiondialog.cpp:809 #, kde-format msgid "Tab inserts spaces" msgstr "TAB lisab tühikud" -#: optiondialog.cpp:791 +#: optiondialog.cpp:813 #, kde-format msgid "" "On: Pressing tab generates the appropriate number of spaces.\n" @@ -2211,39 +2192,36 @@ "Sees: TAB klahvi vajutamine tekitab sobiva hulga tühikuid.\n" "Väljas: lisatakse tabeldusmärk." -#: optiondialog.cpp:796 +#: optiondialog.cpp:818 #, kde-format msgid "Tab size:" msgstr "TABi suurus:" -#: optiondialog.cpp:803 +#: optiondialog.cpp:825 #, kde-format msgid "Auto indentation" msgstr "Automaatne taandus" -#: optiondialog.cpp:807 +#: optiondialog.cpp:829 #, kde-format msgid "On: The indentation of the previous line is used for a new line.\n" msgstr "Sees: uuel real kasutatakse eelmise rea taandust.\n" -#: optiondialog.cpp:810 +#: optiondialog.cpp:832 #, kde-format msgid "Auto copy selection" msgstr "Valiku automaatne kopeerimine" -#: optiondialog.cpp:814 -#, fuzzy, kde-format -#| msgid "" -#| "On: Any selection is immediately written to the clipboard.\n" -#| "Off: You must explicitely copy e.g. via Ctrl-C." +#: optiondialog.cpp:836 +#, kde-format msgid "" "On: Any selection is immediately written to the clipboard.\n" "Off: You must explicitly copy e.g. via Ctrl-C." msgstr "" "Sees: iga valik asetatakse otsekohe lõikepuhvrisse.\n" -"Väljas: kopeerimiseks tuleb anda selge käsk, nt. CTRL+C." +"Väljas: kopeerimiseks tuleb anda selge käsk, nt. Ctrl+C." -#: optiondialog.cpp:829 +#: optiondialog.cpp:851 #, kde-format msgid "" "Sets the line endings for when an edited file is saved.\n" @@ -2252,12 +2230,12 @@ "Määrab realõpu stiili redigeeritud faili salvestamisel.\n" "DOS/Windows: CR+LF; Unix: LF; sealjuures CR=0D, LF=0A" -#: optiondialog.cpp:839 +#: optiondialog.cpp:861 #, kde-format msgid "Diff" msgstr "Erinevused" -#: optiondialog.cpp:840 +#: optiondialog.cpp:862 #, kde-format msgid "Diff Settings" msgstr "Erinevuse seadistused" @@ -2271,13 +2249,12 @@ #. ); #. ++line; #. -#: optiondialog.cpp:865 -#, fuzzy, kde-format -#| msgid "Treat as white space." +#: optiondialog.cpp:896 +#, kde-format msgid "Ignore numbers (treat as white space)" -msgstr "Käsitletakse tühimärkidena." +msgstr "Numbrite eiramine (käsitletakse tühimärkidena)" -#: optiondialog.cpp:869 +#: optiondialog.cpp:900 #, kde-format msgid "" "Ignore number characters during line matching phase. (Similar to Ignore " @@ -2288,44 +2265,42 @@ "ignoreerimisega).\n" "Võib olla abiks numbrilisi andmeid sisaldavate failide võrdlemisel." -#: optiondialog.cpp:873 -#, fuzzy, kde-format -#| msgid "Treat C/C++ comments like white space." +#: optiondialog.cpp:904 +#, kde-format msgid "Ignore C/C++ comments (treat as white space)" -msgstr "C/C++ kommentaare käsitletakse tühimärkidena." +msgstr "C/C++ kommentaaride eiramine (käsitletakse tühimärkidena)" -#: optiondialog.cpp:876 +#: optiondialog.cpp:907 #, kde-format msgid "Treat C/C++ comments like white space." msgstr "C/C++ kommentaare käsitletakse tühimärkidena." -#: optiondialog.cpp:879 -#, fuzzy, kde-format -#| msgid "Treat as white space." +#: optiondialog.cpp:910 +#, kde-format msgid "Ignore case (treat as white space)" -msgstr "Käsitletakse tühimärkidena." +msgstr "Tähesuuruse eiramine (käsitletakse tühimärkidena)" -#: optiondialog.cpp:883 +#: optiondialog.cpp:914 #, kde-format msgid "Treat case differences like white space changes. ('a'<=>'A')" msgstr "Tõstuerinevusi käsitletakse tühimärgimuutustena. ('a'<=>'A')" -#: optiondialog.cpp:886 +#: optiondialog.cpp:917 #, kde-format msgid "Preprocessor command:" msgstr "Eeltöötluse käsk" -#: optiondialog.cpp:891 +#: optiondialog.cpp:922 #, kde-format msgid "User defined pre-processing. (See the docs for details.)" msgstr "Kasutaja määratud eeltöötlus (vaata lähemalt käsiraamatust)." -#: optiondialog.cpp:894 +#: optiondialog.cpp:925 #, kde-format msgid "Line-matching preprocessor command:" msgstr "Ridade sobivuse eeltöötluse käsk:" -#: optiondialog.cpp:899 +#: optiondialog.cpp:930 #, kde-format msgid "" "This pre-processor is only used during line matching.\n" @@ -2334,12 +2309,12 @@ "Seda eeltöötlusvahendit kasutatakse ainult ridade sobivuse leidmisel\n" "(vaata lähemalt käsiraamatust)." -#: optiondialog.cpp:902 +#: optiondialog.cpp:933 #, kde-format msgid "Try hard (slower)" msgstr "Karm uurimine (aeglane)" -#: optiondialog.cpp:906 +#: optiondialog.cpp:937 #, kde-format msgid "" "Enables the --minimal option for the external diff.\n" @@ -2348,12 +2323,12 @@ "Lubab välise diff-rakenduse korral võtme --minimal.\n" "Suurte failide analüüs muutub palju aeglasemaks." -#: optiondialog.cpp:910 +#: optiondialog.cpp:941 #, kde-format msgid "Align B and C for 3 input files" msgstr "B ja C joondamine 3 sisendfaili korral" -#: optiondialog.cpp:914 +#: optiondialog.cpp:945 #, kde-format msgid "" "Try to align B and C when comparing or merging three input files.\n" @@ -2366,17 +2341,24 @@ "keeruliseks.\n" "(Vaikimisi on välja lülitatud.)" -#: optiondialog.cpp:926 +#: optiondialog.cpp:956 +#, fuzzy, kde-format +#| msgid "Merge" +msgctxt "Settings page" +msgid "Merge" +msgstr "Ühenda" + +#: optiondialog.cpp:957 #, kde-format msgid "Merge Settings" msgstr "Ühendamise seadistused" -#: optiondialog.cpp:940 +#: optiondialog.cpp:980 #, kde-format msgid "Auto advance delay (ms):" msgstr "Automaatse edasiliikumise viivitus (ms):" -#: optiondialog.cpp:946 +#: optiondialog.cpp:986 #, kde-format msgid "" "When in Auto-Advance mode the result of the current selection is shown \n" @@ -2385,27 +2367,27 @@ "Automaatse edasiliikumise režiimis näidatakse tulemust määratud aeg ning \n" "siis hüpatakse järgmisele konfliktile. Vahemik: 0-2000 ms" -#: optiondialog.cpp:950 +#: optiondialog.cpp:990 #, kde-format msgid "Show info dialogs" msgstr "Infodialoogide näitamine" -#: optiondialog.cpp:953 +#: optiondialog.cpp:993 #, kde-format msgid "Show a dialog with information about the number of conflicts." msgstr "Infodialoogi näitamine konfliktide arvu kohta." -#: optiondialog.cpp:956 +#: optiondialog.cpp:996 #, kde-format msgid "White space 2-file merge default:" msgstr "Tühimärkide käsitlemine kahe faili ühendamisel:" -#: optiondialog.cpp:961 optiondialog.cpp:974 +#: optiondialog.cpp:1001 optiondialog.cpp:1014 #, kde-format msgid "Manual Choice" msgstr "Käsitsivalik" -#: optiondialog.cpp:965 optiondialog.cpp:979 +#: optiondialog.cpp:1005 optiondialog.cpp:1019 #, kde-format msgid "" "Allow the merge algorithm to automatically select an input for white-space-" @@ -2414,22 +2396,22 @@ "Lubab ühendamisalgoritmil ainult tühimärkides seisneva erinevuse korral " "automaatselt valida sisendi." -#: optiondialog.cpp:969 +#: optiondialog.cpp:1009 #, kde-format msgid "White space 3-file merge default:" msgstr "Tühimärkide käsitlemine kolme faili ühendamisel:" -#: optiondialog.cpp:983 +#: optiondialog.cpp:1023 #, kde-format msgid "Automatic Merge Regular Expression" msgstr "Automaatühendamise regulaaravaldis" -#: optiondialog.cpp:991 smalldialogs.cpp:449 +#: optiondialog.cpp:1031 smalldialogs.cpp:459 #, kde-format msgid "Auto merge regular expression:" msgstr "Automaatühendamise regulaaravaldis:" -#: optiondialog.cpp:996 +#: optiondialog.cpp:1036 #, kde-format msgid "" "Regular expression for lines where KDiff3 should automatically choose one " @@ -2441,12 +2423,12 @@ "Kui konflikti sisaldav rida sobib regulaaravaldisega, siis\n" "valitakse - kui võimalik - C, vastasel juhul B." -#: optiondialog.cpp:1002 +#: optiondialog.cpp:1042 #, kde-format msgid "Run regular expression auto merge on merge start" msgstr "Regulaaravaldisega automaatühendamine ühendamise alustamisel" -#: optiondialog.cpp:1005 +#: optiondialog.cpp:1045 #, kde-format msgid "" "Run the merge for auto merge regular expressions\n" @@ -2455,17 +2437,17 @@ "Regulaarühendusega automaatühendamine käivitatakse\n" "kohe ühendamise alustamisel.\n" -#: optiondialog.cpp:1010 +#: optiondialog.cpp:1050 #, kde-format msgid "Version Control History Merging" msgstr "Versioonikonrolli ajaloo ühendamine" -#: optiondialog.cpp:1018 smalldialogs.cpp:476 +#: optiondialog.cpp:1058 smalldialogs.cpp:486 #, kde-format msgid "History start regular expression:" msgstr "Ajaloo alguse regulaaravaldis:" -#: optiondialog.cpp:1023 +#: optiondialog.cpp:1063 #, kde-format msgid "" "Regular expression for the start of the version control history entry.\n" @@ -2476,12 +2458,12 @@ "Tavaliselt leidub seal real võtmesõna \"$Log$\".\n" "Vaikimisi: \".*\\$Log.*\\$.*\"" -#: optiondialog.cpp:1029 smalldialogs.cpp:504 +#: optiondialog.cpp:1069 smalldialogs.cpp:514 #, kde-format msgid "History entry start regular expression:" msgstr "Ajalookirje alguse regulaaravaldis:" -#: optiondialog.cpp:1042 +#: optiondialog.cpp:1082 #, kde-format msgid "" "A version control history entry consists of several lines.\n" @@ -2500,22 +2482,22 @@ "read.\n" "Täpsemalt räägib sellest käsiraamat." -#: optiondialog.cpp:1050 +#: optiondialog.cpp:1090 #, kde-format msgid "History merge sorting" msgstr "Ajaloo ühendamise sortimine" -#: optiondialog.cpp:1053 +#: optiondialog.cpp:1093 #, kde-format msgid "Sort version control history by a key." msgstr "Versioonikontrolli ajaloo sortimine võtmete järgi." -#: optiondialog.cpp:1063 +#: optiondialog.cpp:1103 #, kde-format msgid "History entry start sort key order:" msgstr "Ajalookirje alguse sortimisvõtmete järjekord:" -#: optiondialog.cpp:1068 +#: optiondialog.cpp:1108 #, kde-format msgid "" "Each pair of parentheses used in the regular expression for the history " @@ -2533,39 +2515,39 @@ "Kui see tühjaks jätta, siis midagi ei sordita.\n" "Täpsemalt räägib sellest käsiraamat." -#: optiondialog.cpp:1079 +#: optiondialog.cpp:1119 #, kde-format msgid "Merge version control history on merge start" msgstr "Versioonikontrolli ajaloo ühendamine ühendamise alustamisel" -#: optiondialog.cpp:1082 +#: optiondialog.cpp:1122 #, kde-format msgid "Run version control history automerge on merge start." msgstr "" "Versioonikontrolli ajaloo automaatühendamise käivitamine kohe ühendamise " "alustamisel." -#: optiondialog.cpp:1086 +#: optiondialog.cpp:1126 #, kde-format msgid "Max number of history entries:" msgstr "Ajalookirjete maks. arv:" -#: optiondialog.cpp:1090 +#: optiondialog.cpp:1130 #, kde-format msgid "Cut off after specified number. Use -1 for infinite number of entries." msgstr "Kärpimine pärast määratud arvu. -1 tähendab piirangu puudumist." -#: optiondialog.cpp:1094 +#: optiondialog.cpp:1134 #, kde-format msgid "Test your regular expressions" msgstr "Regulaaravaldiste test" -#: optiondialog.cpp:1099 +#: optiondialog.cpp:1139 #, kde-format msgid "Irrelevant merge command:" msgstr "Ebaolulise ühendamise käsk:" -#: optiondialog.cpp:1104 +#: optiondialog.cpp:1144 #, kde-format msgid "" "If specified this script is run after automerge\n" @@ -2576,12 +2558,12 @@ "pärast automaatühendamist, kui muid muudatusi ei avastada.\n" "See kutsutakse välja parameetritega: failinimi1 failinimi2 failinimi3" -#: optiondialog.cpp:1109 +#: optiondialog.cpp:1149 #, kde-format msgid "Auto save and quit on merge without conflicts" msgstr "Automaatne salvestamine ja väljumine konfliktideta ühendamisel" -#: optiondialog.cpp:1113 +#: optiondialog.cpp:1153 #, kde-format msgid "" "If KDiff3 was started for a file-merge from the command line and all\n" @@ -2594,27 +2576,27 @@ "automaatselt.\n" "(Samane käsurea võtmega \"--auto\")" -#: optiondialog.cpp:1124 optiondialog.cpp:1125 +#: optiondialog.cpp:1164 optiondialog.cpp:1165 #, kde-format msgid "Directory" msgstr "Kataloog" -#: optiondialog.cpp:1137 +#: optiondialog.cpp:1185 #, kde-format msgid "Recursive directories" msgstr "Rekursiivsed kataloogid" -#: optiondialog.cpp:1140 +#: optiondialog.cpp:1188 #, kde-format msgid "Whether to analyze subdirectories or not." msgstr "Kas analüüsida alamkatalooge või mitte." -#: optiondialog.cpp:1142 +#: optiondialog.cpp:1190 #, kde-format msgid "File pattern(s):" msgstr "Failimustrid:" -#: optiondialog.cpp:1148 +#: optiondialog.cpp:1196 #, kde-format msgid "" "Pattern(s) of files to be analyzed. \n" @@ -2625,12 +2607,12 @@ "Metamärgid: '*' ja '?'\n" "Mitme mustri määramisel kasuta eraldajana semikoolonit (;)" -#: optiondialog.cpp:1153 +#: optiondialog.cpp:1201 #, kde-format msgid "File-anti-pattern(s):" msgstr "Anti-failimustrid:" -#: optiondialog.cpp:1159 +#: optiondialog.cpp:1207 #, kde-format msgid "" "Pattern(s) of files to be excluded from analysis. \n" @@ -2641,12 +2623,12 @@ "Metamärgid: '*' ja '?'\n" "Mitme mustri määramisel kasuta eraldajana semikoolonit (;)" -#: optiondialog.cpp:1164 +#: optiondialog.cpp:1212 #, kde-format msgid "Dir-anti-pattern(s):" msgstr "Anti-kataloogimustrid:" -#: optiondialog.cpp:1170 +#: optiondialog.cpp:1218 #, kde-format msgid "" "Pattern(s) of directories to be excluded from analysis. \n" @@ -2657,12 +2639,12 @@ "Metamärgid: '*' ja '?'\n" "Mitme mustri määramisel kasuta eraldajana semikoolonit (;)" -#: optiondialog.cpp:1175 +#: optiondialog.cpp:1223 #, kde-format msgid "Use .cvsignore" msgstr ".cvsignore kasutamine" -#: optiondialog.cpp:1179 +#: optiondialog.cpp:1227 #, kde-format msgid "" "Extends the antipattern to anything that would be ignored by CVS.\n" @@ -2671,23 +2653,22 @@ "Laiendab antimustrit kõigele, mida eiraks CVS.\n" "Kohalike \".cvsignore\" failide abil võib see olla kataloogipõhine." -#: optiondialog.cpp:1183 +#: optiondialog.cpp:1231 #, kde-format msgid "Find hidden files and directories" msgstr "Peidetud failide ja kataloogide otsimine" -#: optiondialog.cpp:1186 -#, fuzzy, kde-format -#| msgid "Find hidden files and directories" +#: optiondialog.cpp:1234 +#, kde-format msgid "Finds hidden files and directories." -msgstr "Peidetud failide ja kataloogide otsimine" +msgstr "Peidetud failide ja kataloogide otsimine." -#: optiondialog.cpp:1189 +#: optiondialog.cpp:1237 #, kde-format msgid "Follow file links" msgstr "Failiviitade järgimine" -#: optiondialog.cpp:1193 +#: optiondialog.cpp:1241 #, kde-format msgid "" "On: Compare the file the link points to.\n" @@ -2696,12 +2677,12 @@ "Sees: võrreldakse faili, mille viit osutab.\n" "Väljas: võrreldakse viitu." -#: optiondialog.cpp:1197 +#: optiondialog.cpp:1245 #, kde-format msgid "Follow directory links" msgstr "Kataloogiviitade järgimine" -#: optiondialog.cpp:1201 +#: optiondialog.cpp:1249 #, kde-format msgid "" "On: Compare the directory the link points to.\n" @@ -2710,12 +2691,12 @@ "Sees: võrreldakse kataloogi, mille viit osutab.\n" "Väljas: võrreldakse viitu." -#: optiondialog.cpp:1210 +#: optiondialog.cpp:1258 #, kde-format msgid "Case sensitive filename comparison" msgstr "Tõstutundlik failinimede võrdlemine" -#: optiondialog.cpp:1214 +#: optiondialog.cpp:1262 #, kde-format msgid "" "The directory comparison will compare files or directories when their names " @@ -2727,52 +2708,56 @@ "Selle valiku sisselülitamisel peab sobima ka nimede tähesuurus (Windowsis on " "see vaikimisi välja lülitatud, muidu sees)." -#: optiondialog.cpp:1218 -#, fuzzy, kde-format -#| msgid "Unfold All Subdirs" +#: optiondialog.cpp:1266 +#, kde-format msgid "Unfold all subdirectories on load" -msgstr "Sule kõik alamkataloogid" +msgstr "Laadimisel avatakse kõik alamkataloogid" -#: optiondialog.cpp:1222 +#: optiondialog.cpp:1270 #, kde-format msgid "" "On: Unfold all subdirectories when starting a directory diff.\n" "Off: Leave subdirectories folded." msgstr "" +"Sees: kataloogide erinevuste otsimise alustades avatakse kõik " +"alamkataloogid.\n" +"Väljas: alamkataloogid jäetakse suletuks." -#: optiondialog.cpp:1226 +#: optiondialog.cpp:1274 #, kde-format msgid "Skip directory status report" -msgstr "" +msgstr "Kataloogide staatuse aruanne jäetakse vahele" -#: optiondialog.cpp:1230 +#: optiondialog.cpp:1278 #, kde-format msgid "" "On: Do not show the Directory Comparison Status.\n" "Off: Show the status dialog on start." msgstr "" +"Sees: kataloogide võrdlemise staatust ei näidata.\n" +"Väljas: Staatusedialoogi näitamine alustamisel." -#: optiondialog.cpp:1234 +#: optiondialog.cpp:1282 #, kde-format msgid "File Comparison Mode" msgstr "Faili võrdlemise režiim" -#: optiondialog.cpp:1239 +#: optiondialog.cpp:1287 #, kde-format msgid "Binary comparison" msgstr "Binaarvõrdlus" -#: optiondialog.cpp:1241 +#: optiondialog.cpp:1289 #, kde-format msgid "Binary comparison of each file. (Default)" msgstr "Iga faili binaarvõrdlus. (vaikimisi)" -#: optiondialog.cpp:1244 +#: optiondialog.cpp:1292 #, kde-format msgid "Full analysis" msgstr "Täielik analüüs" -#: optiondialog.cpp:1246 +#: optiondialog.cpp:1294 #, kde-format msgid "" "Do a full analysis and show statistics information in extra columns.\n" @@ -2781,12 +2766,12 @@ "Tehakse täielik analüüs, statistikat näidatakse lisaveergudes.\n" "(Aeglasem kui binaarvõrdlus ja eriti aeglane binaarfailide korral.)" -#: optiondialog.cpp:1250 +#: optiondialog.cpp:1298 #, kde-format msgid "Trust the size and modification date (unsafe)" msgstr "Suuruse ja muutmiskuupäeva usaldamine (ebaturvaline)" -#: optiondialog.cpp:1252 +#: optiondialog.cpp:1300 #, kde-format msgid "" "Assume that files are equal if the modification date and file length are " @@ -2800,7 +2785,7 @@ "Ühesuguse sisu, kuid erineva muutmiskuupäevaga faile peetakse erinevaks.\n" "Mõttekas suurte kataloogide või aeglase võrgu korral." -#: optiondialog.cpp:1257 +#: optiondialog.cpp:1305 #, kde-format msgid "" "Trust the size and date, but use binary comparison if date does not match " @@ -2809,7 +2794,7 @@ "Suuruse ja muutmiskuupäeva usaldamine, kuid muutmiskuupäeva erinemisel " "binaarvõrdluse kasutamine (pole turvaline)" -#: optiondialog.cpp:1259 +#: optiondialog.cpp:1307 #, kde-format msgid "" "Assume that files are equal if the modification date and file length are " @@ -2822,12 +2807,12 @@ "Kui kuupäevad ei ole võrdsed, aga suurus on, kasutatakse binaarvõrdlust.\n" "Mõttekas suurte kataloogide või aeglase võrgu korral." -#: optiondialog.cpp:1264 +#: optiondialog.cpp:1312 #, kde-format msgid "Trust the size (unsafe)" msgstr "Suuruse usaldamine (ebaturvaline)" -#: optiondialog.cpp:1266 +#: optiondialog.cpp:1314 #, kde-format msgid "" "Assume that files are equal if their file lengths are equal.\n" @@ -2838,12 +2823,12 @@ "Mõttekas suurte kataloogide või aeglase võrgu korral, kui kuupäev võib " "allalaadimise käigus olla muutunud." -#: optiondialog.cpp:1273 +#: optiondialog.cpp:1321 #, kde-format msgid "Synchronize directories" msgstr "Kataloogide sünkroniseerimine" -#: optiondialog.cpp:1277 +#: optiondialog.cpp:1325 #, kde-format msgid "" "Offers to store files in both directories so that\n" @@ -2854,12 +2839,12 @@ "nii et need näevad pärast seda välja ühesugused.\n" "Toimib ainult kahe kataloogi võrdlemisel ilma sihtkohta määramata." -#: optiondialog.cpp:1283 +#: optiondialog.cpp:1331 #, kde-format msgid "White space differences considered equal" msgstr "Tühimärkide erinevust ei arvestata" -#: optiondialog.cpp:1287 +#: optiondialog.cpp:1335 #, kde-format msgid "" "If files differ only by white space consider them equal.\n" @@ -2868,17 +2853,13 @@ "Kui failid erinevad ainult tühimärkide poolest, peetakse neid võrdseks.\n" "See valik on aktiivne ainult täieliku analüüsi korral." -#: optiondialog.cpp:1293 +#: optiondialog.cpp:1341 #, kde-format msgid "Copy newer instead of merging (unsafe)" msgstr "Ühendamise asemel kopeeritakse uuem (ebaturvaline)" -#: optiondialog.cpp:1297 -#, fuzzy, kde-format -#| msgid "" -#| "Don't look inside, just take the newer file.\n" -#| "(Use this only if you know what you are doing!)\n" -#| "Only effective when comparing two directories." +#: optiondialog.cpp:1345 +#, kde-format msgid "" "Do not look inside, just take the newer file.\n" "(Use this only if you know what you are doing!)\n" @@ -2888,12 +2869,12 @@ "(Kasuta ainult siis, kui tead, mida teed!)\n" "Toimib ainult kahe kataloogi võrdlemisel." -#: optiondialog.cpp:1302 +#: optiondialog.cpp:1350 #, kde-format msgid "Backup files (.orig)" msgstr "Failidest tehakse varukoopia (.orig)" -#: optiondialog.cpp:1306 +#: optiondialog.cpp:1354 #, kde-format msgid "" "If a file would be saved over an old file, then the old file\n" @@ -2902,17 +2883,17 @@ "Kui fail salvestatakse vana faili asemele, ei kustutata vana faili,\n" "vaid sellele antakse uus nimi laiendiga '.orig'." -#: optiondialog.cpp:1382 optiondialog.cpp:1383 +#: optiondialog.cpp:1430 optiondialog.cpp:1431 #, kde-format msgid "Regional Settings" msgstr "Lokaale seadistused" -#: optiondialog.cpp:1397 +#: optiondialog.cpp:1454 #, kde-format msgid "Use the same encoding for everything:" msgstr "Kõikjal kasutatakse kodeeringut:" -#: optiondialog.cpp:1401 +#: optiondialog.cpp:1458 #, kde-format msgid "" "Enable this allows to change all encodings by changing the first only.\n" @@ -2921,18 +2902,17 @@ "Lubab muuta kõiki kodeeringuid ainult esimest kodeeringut muutes.\n" "Kui vaja on erinevaid määratlusi, lülita välja." -#: optiondialog.cpp:1405 -#, fuzzy, kde-format -#| msgid "Note: Local Encoding is " +#: optiondialog.cpp:1462 +#, kde-format msgid "Note: Local Encoding is \"%1\"" -msgstr "Märkus: kohalik kodeering on " +msgstr "Märkus: kohalik kodeering on \"%1\"" -#: optiondialog.cpp:1409 +#: optiondialog.cpp:1466 #, kde-format msgid "File Encoding for A:" msgstr "A kodeering:" -#: optiondialog.cpp:1416 +#: optiondialog.cpp:1473 #, kde-format msgid "" "If enabled then Unicode (UTF-16 or UTF-8) encoding will be detected.\n" @@ -2945,32 +2925,32 @@ "kodeeringut.\n" "(Unicode tuvastamine sõltub faili esimestest baitidest.)" -#: optiondialog.cpp:1419 optiondialog.cpp:1430 optiondialog.cpp:1441 +#: optiondialog.cpp:1476 optiondialog.cpp:1487 optiondialog.cpp:1498 #, kde-format msgid "Auto Detect Unicode" msgstr "Unicode automaatne tuvastamine" -#: optiondialog.cpp:1425 +#: optiondialog.cpp:1482 #, kde-format msgid "File Encoding for B:" msgstr "B kodeering:" -#: optiondialog.cpp:1436 +#: optiondialog.cpp:1493 #, kde-format msgid "File Encoding for C:" msgstr "C kodeering:" -#: optiondialog.cpp:1447 +#: optiondialog.cpp:1504 #, kde-format msgid "File Encoding for Merge Output and Saving:" msgstr "Kodeering ühendamisväljundil ja salvestamisel:" -#: optiondialog.cpp:1452 +#: optiondialog.cpp:1509 #, kde-format msgid "Auto Select" msgstr "Automaatne valik" -#: optiondialog.cpp:1456 +#: optiondialog.cpp:1513 #, kde-format msgid "" "If enabled then the encoding from the input files is used.\n" @@ -2981,17 +2961,17 @@ "Kahtluse korral ilmub dialoog, mis laseb kasutajal valida salvestamisel " "kasutatava kodeeringu." -#: optiondialog.cpp:1459 +#: optiondialog.cpp:1516 #, kde-format msgid "File Encoding for Preprocessor Files:" msgstr "Eelprotsessori failide kodeering:" -#: optiondialog.cpp:1471 +#: optiondialog.cpp:1528 #, kde-format msgid "Right To Left Language" msgstr "Paremalt-vasakule keeled" -#: optiondialog.cpp:1475 +#: optiondialog.cpp:1532 #, kde-format msgid "" "Some languages are read from right to left.\n" @@ -3000,22 +2980,22 @@ "Mõningaid keeli loetakse ja kirjutatakse paremalt vasakule.\n" "Selle valikuga saab vastavalt muuta näitajat ja redaktorit." -#: optiondialog.cpp:1485 +#: optiondialog.cpp:1542 #, kde-format msgid "Integration" msgstr "Integreerimine" -#: optiondialog.cpp:1486 +#: optiondialog.cpp:1543 #, kde-format msgid "Integration Settings" msgstr "Integreerimisseadistused" -#: optiondialog.cpp:1499 +#: optiondialog.cpp:1564 #, kde-format msgid "Command line options to ignore:" msgstr "Ignoreeritavad käsurea võtmed:" -#: optiondialog.cpp:1505 +#: optiondialog.cpp:1570 #, kde-format msgid "" "List of command line options that should be ignored when KDiff3 is used by " @@ -3028,12 +3008,12 @@ "Mitme väärtuse andmisel tuleb need eraldada semikooloniga (;).\n" "See väldib vigu \"Tundmatu võti\"." -#: optiondialog.cpp:1510 +#: optiondialog.cpp:1575 #, kde-format msgid "Quit also via Escape key" msgstr "Väljumine ka klahviga Escape" -#: optiondialog.cpp:1514 +#: optiondialog.cpp:1579 #, kde-format msgid "" "Fast method to exit.\n" @@ -3042,7 +3022,7 @@ "Kiire väljumisviis.\n" "Mõeldud neile, kellele on südamelähedane klahv Escape." -#: optiondialog.cpp:1598 +#: optiondialog.cpp:1653 #, kde-format msgid "This resets all options. Not only those of the current topic." msgstr "See lähtestab kõik valikud, mitte ainult praeguse teema omad." @@ -3097,84 +3077,70 @@ msgid "Disable Unsafe Options" msgstr "Keela ebaturvalised valikud" -#: pdiff.cpp:158 +#: pdiff.cpp:160 #, kde-format msgid "Loading A" msgstr "A laadimine" -#: pdiff.cpp:167 +#: pdiff.cpp:162 #, kde-format -msgid "Errors occurred during pre-processing of file A." -msgstr "" +msgid "Loading A: %1" +msgstr "A laadimine: %1" -#: pdiff.cpp:172 +#: pdiff.cpp:170 #, kde-format msgid "Loading B" msgstr "B laadimine" -#: pdiff.cpp:179 -#, kde-format -msgid "Errors occurred during pre-processing of file B." -msgstr "" - -#: pdiff.cpp:202 pdiff.cpp:241 +#: pdiff.cpp:201 pdiff.cpp:237 #, kde-format msgid "Diff: A <-> B" msgstr "Erinevus: A <-> B" -#: pdiff.cpp:208 pdiff.cpp:279 pdiff.cpp:293 +#: pdiff.cpp:207 pdiff.cpp:275 pdiff.cpp:289 #, kde-format msgid "Linediff: A <-> B" msgstr "Reaerinevus: A <-> B" -#: pdiff.cpp:225 +#: pdiff.cpp:224 #, kde-format msgid "Loading C" msgstr "C laadimine" -#: pdiff.cpp:232 -#, kde-format -msgid "Errors occurred during pre-processing of file C." -msgstr "" - -#: pdiff.cpp:250 +#: pdiff.cpp:246 #, kde-format msgid "Diff: A <-> C" msgstr "Erinevus: A <-> C" -#: pdiff.cpp:261 +#: pdiff.cpp:257 #, kde-format msgid "Diff: B <-> C" msgstr "Erinevus: B <-> C" -#: pdiff.cpp:283 pdiff.cpp:297 +#: pdiff.cpp:279 pdiff.cpp:293 #, kde-format msgid "Linediff: B <-> C" msgstr "Reaerinevus: B <-> C" -#: pdiff.cpp:287 pdiff.cpp:301 +#: pdiff.cpp:283 pdiff.cpp:297 #, kde-format msgid "Linediff: A <-> C" msgstr "Reaerinevus: A <-> C" -#: pdiff.cpp:829 +#: pdiff.cpp:819 #, kde-format 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:835 pdiff.cpp:839 pdiff.cpp:843 +#: pdiff.cpp:825 pdiff.cpp:829 pdiff.cpp:833 #, 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:853 -#, fuzzy, kde-format -#| 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." +#: pdiff.cpp:843 +#, kde-format msgid "" "Some input files do not seem to be pure text files.\n" "Note that the KDiff3 merge was not meant for binary data.\n" @@ -3184,23 +3150,18 @@ "Arvesta, et KDiff3 ühendamine ei ole mõeldud binaarfailidele.\n" "Jätka oma riskil." -#: pdiff.cpp:863 +#: pdiff.cpp:853 #, kde-format msgid ", B" -msgstr "" +msgstr ", B" -#: pdiff.cpp:865 +#: pdiff.cpp:855 #, kde-format msgid ", C" -msgstr "" +msgstr ", C" -#: pdiff.cpp:867 -#, fuzzy, kde-format -#| msgid "" -#| "Some input characters could not be converted to valid unicode.\n" -#| "You might be using the wrong codec. (e.g. UTF-8 for non UTF-8 files).\n" -#| "Don't save the result if unsure. Continue at your own risk.\n" -#| "Affected input files are in %1." +#: pdiff.cpp:857 +#, kde-format msgid "" "Some input characters could not be converted to valid unicode.\n" "You might be using the wrong codec. (e.g. UTF-8 for non UTF-8 files).\n" @@ -3212,77 +3173,72 @@ "Kui sa pole kindel, ära salvesta tulemust. Jätka omal vastutusel.\n" "Mõjutatud sisendfailid asuvad %1." -#: pdiff.cpp:1034 +#: pdiff.cpp:1032 #, kde-format msgid "Abort" msgstr "Katkesta" -#: pdiff.cpp:1040 pdiff.cpp:1130 +#: pdiff.cpp:1038 pdiff.cpp:1129 #, kde-format msgid "Opening files..." msgstr "Failide avamine..." -#: pdiff.cpp:1107 -#, kde-format -msgid "File open error" -msgstr "Viga faili avamisel" - -#: pdiff.cpp:1202 +#: pdiff.cpp:1212 #, kde-format msgid "Cutting selection..." msgstr "Valitud teksti lõikamine..." -#: pdiff.cpp:1223 +#: pdiff.cpp:1233 #, kde-format msgid "Copying selection to clipboard..." msgstr "Valitud teksti kopeerimine lõikepuhvrisse..." -#: pdiff.cpp:1239 +#: pdiff.cpp:1249 #, kde-format msgid "Inserting clipboard contents..." msgstr "Lõikepuhvri sisu sisestamine..." -#: pdiff.cpp:1695 +#: pdiff.cpp:1705 #, kde-format msgid "Word wrap (Cancel disables word wrap)" -msgstr "" +msgstr "Reamurdmine (Loobumine keelab reamurdmise)" -#: pdiff.cpp:1696 +#: pdiff.cpp:1706 #, kde-format msgid "Calculating max width for horizontal scrollbar" -msgstr "" +msgstr "Rõhtse kerimisriba maks. laiuse arvutamine" -#: pdiff.cpp:1911 +#: pdiff.cpp:1921 #, kde-format msgid "Save && Continue" msgstr "Salvesta ja jätka" -#: pdiff.cpp:1912 +#: pdiff.cpp:1922 #, kde-format msgid "Continue Without Saving" msgstr "Jätka salvestamata" -#: pdiff.cpp:2124 +#: pdiff.cpp:2134 #, kde-format msgid "Search complete." msgstr "Otsing lõpetatud." -#: pdiff.cpp:2124 +#: pdiff.cpp:2134 #, kde-format msgid "Search Complete" msgstr "Otsing lõpetatud" -#: pdiff.cpp:2375 +#: pdiff.cpp:2385 #, kde-format msgid "Nothing is selected in either diff input window." msgstr "Erinevuste sisendakendes pole midagi valitud." -#: pdiff.cpp:2375 +#: pdiff.cpp:2385 #, kde-format msgid "Error while adding manual diff range" msgstr "Viga käsitsi määratud samasuse vahemiku lisamisel" -#: progress.cpp:59 progress.cpp:71 +#: progress.cpp:61 progress.cpp:73 #, kde-format msgid "&Cancel" msgstr "&Loobu" @@ -3292,126 +3248,124 @@ msgid "A (Base):" msgstr "A (baas):" -#: smalldialogs.cpp:68 smalldialogs.cpp:85 smalldialogs.cpp:102 -#: smalldialogs.cpp:144 +#: smalldialogs.cpp:71 smalldialogs.cpp:90 smalldialogs.cpp:109 +#: smalldialogs.cpp:154 #, kde-format msgid "File..." msgstr "Fail..." -#: smalldialogs.cpp:70 smalldialogs.cpp:87 smalldialogs.cpp:104 -#: smalldialogs.cpp:146 +#: smalldialogs.cpp:73 smalldialogs.cpp:92 smalldialogs.cpp:111 +#: smalldialogs.cpp:156 #, kde-format msgid "Dir..." msgstr "Kataloog..." -#: smalldialogs.cpp:96 +#: smalldialogs.cpp:103 #, kde-format msgid "C (Optional):" msgstr "C (lisavõimalus):" -#: smalldialogs.cpp:119 -#, fuzzy, kde-format -#| msgid "Swap/Copy Names ..." +#: smalldialogs.cpp:126 +#, kde-format msgid "Swap/Copy Names..." -msgstr "Vaheta/kopeeri nimed..." +msgstr "Vaheta/kopeeri nimed ..." -#: smalldialogs.cpp:124 smalldialogs.cpp:125 smalldialogs.cpp:126 +#: smalldialogs.cpp:131 smalldialogs.cpp:132 smalldialogs.cpp:133 #, kde-format msgid "Swap %1<->%2" msgstr "Vaheta %1<->%2" -#: smalldialogs.cpp:127 smalldialogs.cpp:128 smalldialogs.cpp:129 +#: smalldialogs.cpp:134 smalldialogs.cpp:135 smalldialogs.cpp:136 #, kde-format msgid "Copy %1->Output" msgstr "Kopeeri %1->väljund" -#: smalldialogs.cpp:130 smalldialogs.cpp:131 smalldialogs.cpp:132 +#: smalldialogs.cpp:137 smalldialogs.cpp:138 smalldialogs.cpp:139 #, kde-format msgid "Swap %1<->Output" msgstr "Vaheta %1<->väljund" -#: smalldialogs.cpp:138 +#: smalldialogs.cpp:148 #, kde-format msgid "Output (optional):" msgstr "Väljund (lisavõimalus):" -#: smalldialogs.cpp:168 +#: smalldialogs.cpp:178 #, kde-format msgid "Configure..." msgstr "Seadista..." -#: smalldialogs.cpp:233 -#, fuzzy, kde-format -#| msgid "Directory" +#: smalldialogs.cpp:243 +#, kde-format msgid "Open Directory" -msgstr "Kataloog" +msgstr "Kataloog avamine" -#: smalldialogs.cpp:234 +#: smalldialogs.cpp:244 #, kde-format msgid "Select Output File" -msgstr "" +msgstr "Väljundfaili valimine" -#: smalldialogs.cpp:393 +#: smalldialogs.cpp:403 #, kde-format msgid "Search text:" msgstr "Otsitav tekst:" -#: smalldialogs.cpp:400 +#: smalldialogs.cpp:410 #, kde-format msgid "Case sensitive" msgstr "Tõstutundlik" -#: smalldialogs.cpp:403 +#: smalldialogs.cpp:413 #, kde-format msgid "Search A" msgstr "Otsi A" -#: smalldialogs.cpp:408 +#: smalldialogs.cpp:418 #, kde-format msgid "Search B" msgstr "Otsi B" -#: smalldialogs.cpp:413 +#: smalldialogs.cpp:423 #, kde-format msgid "Search C" msgstr "Otsi C" -#: smalldialogs.cpp:418 +#: smalldialogs.cpp:428 #, kde-format msgid "Search output" msgstr "Otsingu väljund" -#: smalldialogs.cpp:425 +#: smalldialogs.cpp:435 #, kde-format msgid "&Search" msgstr "&Otsi" -#: smalldialogs.cpp:444 +#: smalldialogs.cpp:454 #, kde-format msgid "Regular Expression Tester" msgstr "Regulaaravaldise test" -#: smalldialogs.cpp:457 +#: smalldialogs.cpp:467 #, kde-format msgid "Example auto merge line:" msgstr "Automaatühendamise näidisrida:" -#: smalldialogs.cpp:459 +#: smalldialogs.cpp:469 #, kde-format msgid "To test auto merge, copy a line as used in your files." msgstr "Kopeeri automaatühendamise testimiseks rida oma failist." -#: smalldialogs.cpp:465 smalldialogs.cpp:493 smalldialogs.cpp:529 +#: smalldialogs.cpp:475 smalldialogs.cpp:503 smalldialogs.cpp:539 #, kde-format msgid "Match result:" msgstr "Sobivuse tulemus:" -#: smalldialogs.cpp:484 +#: smalldialogs.cpp:494 #, kde-format msgid "Example history start line (with leading comment):" msgstr "Ajaloo alguse näidisrida (alustava kommentaariga):" -#: smalldialogs.cpp:486 +#: smalldialogs.cpp:496 #, kde-format msgid "" "Copy a history start line as used in your files,\n" @@ -3420,17 +3374,17 @@ "Kopeeri oma failist ajaloo alguse rida,\n" "kaasa arvatud alustav kommentaar." -#: smalldialogs.cpp:512 +#: smalldialogs.cpp:522 #, kde-format msgid "History sort key order:" msgstr "Ajaloo sortimisvõtme järjekord:" -#: smalldialogs.cpp:520 +#: smalldialogs.cpp:530 #, kde-format msgid "Example history entry start line (without leading comment):" msgstr "Ajalookirje alguse näidisrida (alustava kommentaarita):" -#: smalldialogs.cpp:522 +#: smalldialogs.cpp:532 #, kde-format msgid "" "Copy a history entry start line as used in your files,\n" @@ -3439,48 +3393,47 @@ "Kopeeri oma failist ajalookirje alguse rida,\n" "kuid ilma alustava kommentaarita." -#: smalldialogs.cpp:536 +#: smalldialogs.cpp:546 #, kde-format msgid "Sort key result:" msgstr "Sorteerimisvõtme tulemus:" -#: smalldialogs.cpp:584 smalldialogs.cpp:594 smalldialogs.cpp:614 +#: smalldialogs.cpp:594 smalldialogs.cpp:604 smalldialogs.cpp:624 #, kde-format msgid "Match success." msgstr "Leiti sobivus." -#: smalldialogs.cpp:588 smalldialogs.cpp:598 smalldialogs.cpp:620 +#: smalldialogs.cpp:598 smalldialogs.cpp:608 smalldialogs.cpp:630 #, kde-format msgid "Match failed." msgstr "Sobivust ei leitud." -#: smalldialogs.cpp:605 +#: smalldialogs.cpp:615 #, kde-format msgid "Opening and closing parentheses do not match in regular expression." msgstr "Regulaaravaldises ei sobi alustavad ja lõpetavad sulud." -#: SourceData.cpp:150 +#: SourceData.cpp:153 #, kde-format msgid "Writing clipboard data to temp file failed." msgstr "Lõikepuhvri andmete kirjutamine ajutisse faili nurjus." -#: SourceData.cpp:154 +#: SourceData.cpp:157 #, kde-format msgid "From Clipboard" msgstr "Lõikepuhvrist" -#: SourceData.cpp:335 -#, fuzzy, kde-format -#| msgid "Mix of links and normal files." +#: SourceData.cpp:348 +#, kde-format msgid "%1 is not a normal file." -msgstr "Viitade ja tavafailide segu." +msgstr "%1 ei ole tavaline fail." -#: SourceData.cpp:427 +#: SourceData.cpp:440 #, kde-format msgid " Temp file is: %1" -msgstr "" +msgstr " Ajutine fail on: %1" -#: SourceData.cpp:432 +#: SourceData.cpp:445 #, kde-format msgid "" "Preprocessing possibly failed. Check this command:\n" @@ -3495,12 +3448,12 @@ "\n" "Praegu lülitatakse eeltöötluse käsu rakendamine välja." -#: SourceData.cpp:443 SourceData.cpp:512 +#: SourceData.cpp:456 SourceData.cpp:525 #, kde-format msgid "File %1 too large to process. Skipping." -msgstr "" +msgstr "Fail %1 on töötlemiseks liiga suur. Jäetakse vahele." -#: SourceData.cpp:487 +#: SourceData.cpp:500 #, kde-format msgid "" "The line-matching-preprocessing possibly failed. Check this command:\n" @@ -3516,21 +3469,19 @@ "Praegu lülitatakse reasobivuse eeltöötluse käsu rakendamine välja." #: Utils.cpp:77 -#, fuzzy, kde-format -#| msgid "Expecting space after closing apostroph." +#, kde-format msgid "Expecting space after closing quote." -msgstr "Lõpetava apostroofi järel oodati tühikut." +msgstr "Lõpetava tsitaadimärgi järel oodati tühikut." #: Utils.cpp:80 #, kde-format msgid "Unmatched quote." -msgstr "" +msgstr "Tsitaadimärgid ei sobi kokku." #: Utils.cpp:89 -#, fuzzy, kde-format -#| msgid "Unexpected apostroph within argument." +#, kde-format msgid "Unexpected quote character within argument." -msgstr "Ootamatu apostroof argumendi sees." +msgstr "Ootamatu tsitaadimärk argumendi sees." #: Utils.cpp:96 #, kde-format diff -Nru kdiff3-1.8.01/po/eu/diff_ext.po kdiff3-1.8.3/po/eu/diff_ext.po --- kdiff3-1.8.01/po/eu/diff_ext.po 1970-01-01 00:00:00.000000000 +0000 +++ kdiff3-1.8.3/po/eu/diff_ext.po 2020-06-25 00:18:14.000000000 +0000 @@ -0,0 +1,133 @@ +# Translation of diff_ext.po to Euskara/Basque (eu). +# Copyright (C) 2020, This file is copyright: +# This file is distributed under the same license as the kdiff3 package. +# KDE euskaratzeko proiektuko arduraduna . +# +# Translators: +# Iñigo Salvador Azurmendi , 2020. +msgid "" +msgstr "" +"Project-Id-Version: kdiff3\n" +"Report-Msgid-Bugs-To: https://bugs.kde.org\n" +"POT-Creation-Date: 2019-11-04 07:54+0100\n" +"PO-Revision-Date: 2020-05-02 22:53+0200\n" +"Last-Translator: Iñigo Salvador Azurmendi \n" +"Language-Team: Basque \n" +"Language: eu\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" +"X-Generator: Lokalize 20.04.0\n" + +#: diff_ext.cpp:223 +#, kde-format +msgid "Compare with %1" +msgstr "Alderatu %1(r)ekin" + +#: diff_ext.cpp:224 +#, kde-format +msgid "Merge with %1" +msgstr "Bateratu %1(r)ekin" + +#: diff_ext.cpp:234 +#, kde-format +msgid "3-way merge with base" +msgstr "3 aldeko bateratzea oinarriarekin" + +#: diff_ext.cpp:237 +#, kde-format +msgid "Save '%1' for later" +msgstr "Gorde '%1' geroko" + +#: diff_ext.cpp:251 +#, kde-format +msgid "Compare with ..." +msgstr "Alderatu honekin ..." + +#: diff_ext.cpp:254 +#, kde-format +msgid "Clear list" +msgstr "Garbitu zerrenda" + +#: diff_ext.cpp:259 +#, kde-format +msgid "Compare" +msgstr "Alderatu" + +#: diff_ext.cpp:263 +#, kde-format +msgid "3 way comparison" +msgstr "3 aldeko alderatzea" + +#: diff_ext.cpp:269 +#, kde-format +msgid "About Diff-Ext ..." +msgstr "«Diff-Ext»i buruz ..." + +#: diff_ext.cpp:340 +#, kde-format +msgid "(32 Bit)" +msgstr "(32 Bit)" + +#: diff_ext.cpp:342 +#, kde-format +msgid "Diff-Ext Copyright (c) 2003-2006, Sergey Zorin. All rights reserved.\n" +msgstr "" +"Diff-Ext Copyright (c) 2003-2006, Sergey Zorin. Eskubide guztiak erreserbatu " +"dira.\n" + +#: diff_ext.cpp:343 +#, kde-format +msgid "This software is distributable under the BSD-2-Clause license.\n" +msgstr "Software BSD-2-Clause lizentziapean banatzen da.\n" + +#: diff_ext.cpp:344 +#, kde-format +msgid "Some extensions for KDiff3 (c) 2006-2013 by Joachim Eibl.\n" +msgstr "KDiff3-rako hedapen batzuk (c) 2006-2013 Joachim Eibl-ek.\n" + +#: diff_ext.cpp:345 +#, kde-format +msgid "Homepage for Diff-Ext: http://diff-ext.sourceforge.net\n" +msgstr "«Diff-Ext»en orri nagusia: http://diff-ext.sourceforge.net\n" + +#: diff_ext.cpp:346 +#, kde-format +msgid "About Diff-Ext for KDiff3 " +msgstr "KDiff3-rako «Diff-Ext»i buruz" + +#: diff_ext.cpp:375 +#, kde-format +msgid "Compare selected files" +msgstr "Alderatu hautatutako fitxategiak" + +#: diff_ext.cpp:381 diff_ext.cpp:399 +#, kde-format +msgid "Compare '%1' with '%2'" +msgstr "Alderatu '%1' '%2'(r)ekin" + +#: diff_ext.cpp:386 +#, kde-format +msgid "Save '%1' for later operation" +msgstr "Gorde '%1' ondorengo eragiketarako" + +#: diff_ext.cpp:440 +#, kde-format +msgid "Could not start KDiff3. Please rerun KDiff3 installation." +msgstr "Ezin izan da KDiff3 abiarazi. KDiff3 berriz instalatu." + +#: diff_ext.cpp:441 +#, kde-format +msgid "Command" +msgstr "Komandoa" + +#: diff_ext.cpp:442 +#, kde-format +msgid "CommandLine" +msgstr "Komando-lerroa" + +#: diff_ext.cpp:443 +#, kde-format +msgid "Diff-Ext For KDiff3" +msgstr "Diff-Ext KDiff3-rako" \ No newline at end of file diff -Nru kdiff3-1.8.01/po/eu/kdiff3fileitemactionplugin.po kdiff3-1.8.3/po/eu/kdiff3fileitemactionplugin.po --- kdiff3-1.8.01/po/eu/kdiff3fileitemactionplugin.po 1970-01-01 00:00:00.000000000 +0000 +++ kdiff3-1.8.3/po/eu/kdiff3fileitemactionplugin.po 2020-06-25 00:18:14.000000000 +0000 @@ -0,0 +1,106 @@ +# Translation of kdiff3fileitemactionplugin.po to Euskara/Basque (eu). +# Copyright (C) 2020, This file is copyright: +# This file is distributed under the same license as the kdiff3 package. +# KDE euskaratzeko proiektuko arduraduna . +# +# Translators: +# Iñigo Salvador Azurmendi , 2020. +msgid "" +msgstr "" +"Project-Id-Version: kdiff3\n" +"Report-Msgid-Bugs-To: https://bugs.kde.org\n" +"POT-Creation-Date: 2019-08-30 07:40+0200\n" +"PO-Revision-Date: 2020-05-03 00:20+0200\n" +"Last-Translator: Iñigo Salvador Azurmendi \n" +"Language-Team: Basque \n" +"Language: eu\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" +"X-Generator: Lokalize 20.04.0\n" + +#: kdiff3fileitemaction.cpp:92 +#, kde-format +msgid "KDiff3..." +msgstr "KDiff3..." + +#: kdiff3fileitemaction.cpp:124 +#, kde-format +msgid "Compare with %1" +msgstr "Alderatu %1(r)ekin" + +#: kdiff3fileitemaction.cpp:130 +#, kde-format +msgid "Merge with %1" +msgstr "Bateratu %1(r)ekin" + +#: kdiff3fileitemaction.cpp:136 +#, kde-format +msgid "Save '%1' for later" +msgstr "Gorde '%1' geroko" + +#: kdiff3fileitemaction.cpp:142 +#, kde-format +msgid "3-way merge with base" +msgstr "3 aldeko bateratzea oinarriarekin" + +#: kdiff3fileitemaction.cpp:149 +#, kde-format +msgid "Compare with..." +msgstr "Alderatu honekin..." + +#: kdiff3fileitemaction.cpp:161 +#, kde-format +msgid "Clear list" +msgstr "Garbitu zerrenda" + +#: kdiff3fileitemaction.cpp:169 +#, kde-format +msgid "Compare" +msgstr "Konparatu" + +#: kdiff3fileitemaction.cpp:175 +#, kde-format +msgid "3 way comparison" +msgstr "3 aldeko alderatzea" + +#: kdiff3fileitemaction.cpp:179 +#, kde-format +msgid "About KDiff3 menu plugin..." +msgstr "KDiff3 menu pluginari buruz..." + +#: kdiff3fileitemaction.cpp:287 +#, kde-format +msgid "KDiff3 File Item Action Plugin: Copyright (C) 2011 Joachim Eibl\n" +msgstr "" +"KDiff3 fitxategi elementuen ekintza plugina: Copyright (C) 2011 Joachim " +"Eibl\n" + +#: kdiff3fileitemaction.cpp:288 +#, kde-format +msgid "" +"Using the context menu extension:\n" +"For simple comparison of two selected 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 " +"the 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." +msgstr "" +"Testuinguru menuko hedapena erabiltzea:\n" +"Hautatutako bi fitxategi alderatzeko «Alderatu» aukeratu.\n" +"Beste fitxategia beste nonbait badago, «Gorde» lehenengo fitxategia geroko. " +"«Alderatu honekin...» azpimenuan azalduko da. Ondoren erabili «Alderatu " +"honekin» bigarren fitxategian.\n" +"3 aldeko bateratzerako aurrena «Gorde» oinarri fitxategia, ondoren bateratu " +"beharreko adarra eta azkenik aukeratu «3 aldeko bateratzea oinarriarekin» " +"jomuga gisa erabiliko den beste adarrean.\n" +"Gauza bera egin behar da karpetak alderatzeko eta bateratzeko." + +#: kdiff3fileitemaction.cpp:296 +#, kde-format +msgid "About KDiff3 File Item Action Plugin" +msgstr "KDiff3 fitxategi elementuen ekintza pluginari buruz" \ No newline at end of file diff -Nru kdiff3-1.8.01/po/eu/kdiff3.po kdiff3-1.8.3/po/eu/kdiff3.po --- kdiff3-1.8.01/po/eu/kdiff3.po 2019-05-18 01:01:57.000000000 +0000 +++ kdiff3-1.8.3/po/eu/kdiff3.po 2020-06-25 00:18:14.000000000 +0000 @@ -1,24 +1,25 @@ # Translation of kdiff3.po to Euskara/Basque (eu). # Copyright (C) 2018, Free Software Foundation. -# This file is distributed under the same license as the kdereview package. -# KDE euskaratzeko proiektuaren arduraduna . +# Copyright (C) 2019-2020, This file is copyright: +# This file is distributed under the same license as the kdiff3 package. +# KDE euskaratzeko proiektuko arduraduna . # # Translators: -# Iñigo Salvador Azurmendi , 2018. +# Iñigo Salvador Azurmendi , 2018, 2020. msgid "" msgstr "" -"Project-Id-Version: \n" -"Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2019-04-18 08:02+0200\n" -"PO-Revision-Date: 2018-08-12 21:40+0100\n" +"Project-Id-Version: kdiff3\n" +"Report-Msgid-Bugs-To: https://bugs.kde.org\n" +"POT-Creation-Date: 2020-06-22 07:48+0200\n" +"PO-Revision-Date: 2020-05-05 00:14+0200\n" "Last-Translator: Iñigo Salvador Azurmendi \n" -"Language-Team: Basque \n" +"Language-Team: Basque \n" "Language: eu\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: Lokalize 2.0\n" +"X-Generator: Lokalize 20.04.0\n" #, kde-format msgctxt "NAME OF TRANSLATORS" @@ -30,285 +31,285 @@ msgid "Your emails" msgstr "Xalba@euskalnet.net" -#: difftextwindow.cpp:412 +#: difftextwindow.cpp:414 #, kde-format msgid "File %1: Line %2" msgstr "%1 fitxategia: %2 lerroa" -#: difftextwindow.cpp:414 +#: difftextwindow.cpp:416 #, kde-format msgid "File %1: Line not available" msgstr "%1 fitxategia: Lerro ez erabilgarri" -#: difftextwindow.cpp:1780 +#: difftextwindow.cpp:1778 #, kde-format msgid "Encoding:" msgstr "Kodeketa:" -#: difftextwindow.cpp:1782 mergeresultwindow.cpp:3138 optiondialog.cpp:818 +#: difftextwindow.cpp:1781 mergeresultwindow.cpp:3166 optiondialog.cpp:840 #, kde-format msgid "Line end style:" msgstr "Lerro amaiera estiloa:" -#: difftextwindow.cpp:1810 directorymergewindow.cpp:382 -#: directorymergewindow.cpp:433 directorymergewindow.cpp:524 -#: directorymergewindow.cpp:3058 directorymergewindow.cpp:3189 -#: directorymergewindow.cpp:3417 mergeresultwindow.cpp:942 -#: mergeresultwindow.cpp:944 mergeresultwindow.cpp:946 -#: mergeresultwindow.cpp:948 mergeresultwindow.cpp:1814 -#: mergeresultwindow.cpp:3170 mergeresultwindow.cpp:3177 optiondialog.cpp:962 -#: optiondialog.cpp:975 pdiff.cpp:833 pdiff.cpp:835 pdiff.cpp:837 pdiff.cpp:839 -#: pdiff.cpp:861 smalldialogs.cpp:124 smalldialogs.cpp:126 smalldialogs.cpp:127 -#: smalldialogs.cpp:130 +#: difftextwindow.cpp:1809 directorymergewindow.cpp:383 +#: directorymergewindow.cpp:434 directorymergewindow.cpp:525 +#: directorymergewindow.cpp:3072 directorymergewindow.cpp:3203 +#: directorymergewindow.cpp:3431 mergeresultwindow.cpp:970 +#: mergeresultwindow.cpp:972 mergeresultwindow.cpp:974 +#: mergeresultwindow.cpp:976 mergeresultwindow.cpp:1842 +#: mergeresultwindow.cpp:3198 mergeresultwindow.cpp:3205 optiondialog.cpp:1002 +#: optiondialog.cpp:1015 pdiff.cpp:823 pdiff.cpp:825 pdiff.cpp:827 +#: pdiff.cpp:829 pdiff.cpp:851 smalldialogs.cpp:131 smalldialogs.cpp:133 +#: smalldialogs.cpp:134 smalldialogs.cpp:137 #, kde-format msgid "A" msgstr "A" -#: difftextwindow.cpp:1810 directorymergewindow.cpp:384 -#: directorymergewindow.cpp:436 directorymergewindow.cpp:526 -#: directorymergewindow.cpp:3064 directorymergewindow.cpp:3190 -#: directorymergewindow.cpp:3418 mergeresultwindow.cpp:942 -#: mergeresultwindow.cpp:944 mergeresultwindow.cpp:950 -#: mergeresultwindow.cpp:952 mergeresultwindow.cpp:1816 -#: mergeresultwindow.cpp:3172 mergeresultwindow.cpp:3179 optiondialog.cpp:963 -#: optiondialog.cpp:976 pdiff.cpp:833 pdiff.cpp:835 pdiff.cpp:841 pdiff.cpp:843 -#: pdiff.cpp:863 smalldialogs.cpp:124 smalldialogs.cpp:125 smalldialogs.cpp:128 -#: smalldialogs.cpp:131 +#: difftextwindow.cpp:1809 directorymergewindow.cpp:385 +#: directorymergewindow.cpp:437 directorymergewindow.cpp:527 +#: directorymergewindow.cpp:3078 directorymergewindow.cpp:3204 +#: directorymergewindow.cpp:3432 mergeresultwindow.cpp:970 +#: mergeresultwindow.cpp:972 mergeresultwindow.cpp:978 +#: mergeresultwindow.cpp:980 mergeresultwindow.cpp:1844 +#: mergeresultwindow.cpp:3200 mergeresultwindow.cpp:3207 optiondialog.cpp:1003 +#: optiondialog.cpp:1016 pdiff.cpp:823 pdiff.cpp:825 pdiff.cpp:831 +#: pdiff.cpp:833 pdiff.cpp:853 smalldialogs.cpp:131 smalldialogs.cpp:132 +#: smalldialogs.cpp:135 smalldialogs.cpp:138 #, kde-format msgid "B" msgstr "B" -#: difftextwindow.cpp:1810 directorymergewindow.cpp:386 -#: directorymergewindow.cpp:439 directorymergewindow.cpp:528 -#: directorymergewindow.cpp:3070 directorymergewindow.cpp:3191 -#: directorymergewindow.cpp:3419 mergeresultwindow.cpp:946 -#: mergeresultwindow.cpp:948 mergeresultwindow.cpp:950 -#: mergeresultwindow.cpp:952 mergeresultwindow.cpp:1818 -#: mergeresultwindow.cpp:3174 mergeresultwindow.cpp:3181 optiondialog.cpp:977 -#: pdiff.cpp:837 pdiff.cpp:839 pdiff.cpp:841 pdiff.cpp:843 pdiff.cpp:865 -#: smalldialogs.cpp:125 smalldialogs.cpp:126 smalldialogs.cpp:129 -#: smalldialogs.cpp:132 +#: difftextwindow.cpp:1809 directorymergewindow.cpp:387 +#: directorymergewindow.cpp:440 directorymergewindow.cpp:529 +#: directorymergewindow.cpp:3084 directorymergewindow.cpp:3205 +#: directorymergewindow.cpp:3433 mergeresultwindow.cpp:974 +#: mergeresultwindow.cpp:976 mergeresultwindow.cpp:978 +#: mergeresultwindow.cpp:980 mergeresultwindow.cpp:1846 +#: mergeresultwindow.cpp:3202 mergeresultwindow.cpp:3209 optiondialog.cpp:1017 +#: pdiff.cpp:827 pdiff.cpp:829 pdiff.cpp:831 pdiff.cpp:833 pdiff.cpp:855 +#: smalldialogs.cpp:132 smalldialogs.cpp:133 smalldialogs.cpp:136 +#: smalldialogs.cpp:139 #, kde-format msgid "C" msgstr "C" -#: difftextwindow.cpp:1810 +#: difftextwindow.cpp:1809 #, kde-format msgid "A (Base)" msgstr "A (Oinarria)" -#: difftextwindow.cpp:1812 +#: difftextwindow.cpp:1811 #, kde-format msgid "Encoding: %1" msgstr "Kodeketa: %1" -#: difftextwindow.cpp:1813 mergeresultwindow.cpp:3183 +#: difftextwindow.cpp:1812 mergeresultwindow.cpp:3211 #, kde-format msgid "Unix" msgstr "UNIX" -#: difftextwindow.cpp:1813 mergeresultwindow.cpp:3184 +#: difftextwindow.cpp:1812 mergeresultwindow.cpp:3212 #, kde-format msgid "DOS" msgstr "DOS" -#: difftextwindow.cpp:1813 +#: difftextwindow.cpp:1812 #, kde-format msgid "Line end style: %1" msgstr "Lerro amaiera estiloa: %1" -#: difftextwindow.cpp:1835 kdiff3.cpp:873 +#: difftextwindow.cpp:1834 kdiff3.cpp:874 #, kde-format msgid "Top line" msgstr "Goiko lerroa" -#: difftextwindow.cpp:1845 +#: difftextwindow.cpp:1843 #, kde-format msgid "End" msgstr "Amaiera" -#: difftextwindow.cpp:1903 smalldialogs.cpp:235 +#: difftextwindow.cpp:1901 smalldialogs.cpp:245 #, kde-format msgid "Open File" msgstr "Ireki fitxategia" -#: difftextwindow.cpp:1951 optiondialog.cpp:387 +#: difftextwindow.cpp:1943 optiondialog.cpp:389 #, kde-format msgid "Unicode, 8 bit" msgstr "Unicode, 8 bit" -#: difftextwindow.cpp:1966 +#: difftextwindow.cpp:1958 #, kde-format msgid "Other" msgstr "Bestelakoak" -#: directorymergewindow.cpp:409 directorymergewindow.cpp:3424 +#: directorymergewindow.cpp:410 directorymergewindow.cpp:3438 #, kde-format msgid "Copy A to B" msgstr "Kopiatu A -> B" -#: directorymergewindow.cpp:412 directorymergewindow.cpp:3425 +#: directorymergewindow.cpp:413 directorymergewindow.cpp:3439 #, kde-format msgid "Copy B to A" msgstr "Kopiatu B -> A" -#: directorymergewindow.cpp:415 directorymergewindow.cpp:3426 +#: directorymergewindow.cpp:416 directorymergewindow.cpp:3440 #, kde-format msgid "Delete A" msgstr "Ezabatu A" -#: directorymergewindow.cpp:418 directorymergewindow.cpp:3427 +#: directorymergewindow.cpp:419 directorymergewindow.cpp:3441 #, kde-format msgid "Delete B" msgstr "Ezabatu B" -#: directorymergewindow.cpp:421 +#: directorymergewindow.cpp:422 #, kde-format msgid "Delete A & B" msgstr "Ezabatu A eta B" -#: directorymergewindow.cpp:424 directorymergewindow.cpp:3429 +#: directorymergewindow.cpp:425 directorymergewindow.cpp:3443 #, kde-format msgid "Merge to A" msgstr "Bateratu -> A" -#: directorymergewindow.cpp:427 directorymergewindow.cpp:3430 +#: directorymergewindow.cpp:428 directorymergewindow.cpp:3444 #, kde-format msgid "Merge to B" msgstr "Bateratu -> B" -#: directorymergewindow.cpp:430 +#: directorymergewindow.cpp:431 #, kde-format msgid "Merge to A & B" msgstr "Bateratu A-ra eta B-ra" -#: directorymergewindow.cpp:442 directorymergewindow.cpp:3421 +#: directorymergewindow.cpp:443 directorymergewindow.cpp:3435 #, kde-format msgid "Delete (if exists)" msgstr "Ezabatu (baldin badago)" -#: directorymergewindow.cpp:445 directorymergewindow.cpp:448 -#: directorymergewindow.cpp:3420 optiondialog.cpp:925 smalldialogs.cpp:113 +#: directorymergewindow.cpp:446 directorymergewindow.cpp:449 +#: directorymergewindow.cpp:3434 smalldialogs.cpp:120 #, kde-format msgid "Merge" msgstr "Bateratu" -#: directorymergewindow.cpp:445 directorymergewindow.cpp:448 +#: directorymergewindow.cpp:446 directorymergewindow.cpp:449 #, kde-format msgid "Merge (manual)" msgstr "Bateratu (eskuz)" -#: directorymergewindow.cpp:451 +#: directorymergewindow.cpp:452 #, kde-format msgid "Error: Conflicting File Types" msgstr "Errorea: Gaztazka duten fitxategi-motak" -#: directorymergewindow.cpp:454 +#: directorymergewindow.cpp:455 #, kde-format msgid "Error: Changed and Deleted" msgstr "Errorea: Aldatua eta ezabatua" -#: directorymergewindow.cpp:457 +#: directorymergewindow.cpp:458 #, kde-format msgid "Error: Dates are equal but files are not." msgstr "Errorea: Datak berdinak dira baino fitxategiak ez." -#: directorymergewindow.cpp:471 +#: directorymergewindow.cpp:472 #, kde-format msgid "Done" msgstr "Egina" -#: directorymergewindow.cpp:473 +#: directorymergewindow.cpp:474 #, kde-format msgid "Error" msgstr "Errorea" -#: directorymergewindow.cpp:475 +#: directorymergewindow.cpp:476 #, kde-format msgid "Skipped." msgstr "Alboratua." -#: directorymergewindow.cpp:477 +#: directorymergewindow.cpp:478 #, kde-format msgid "Not saved." msgstr "Gorde gabe." -#: directorymergewindow.cpp:479 +#: directorymergewindow.cpp:480 #, kde-format msgid "In progress..." msgstr "Lantzen..." -#: directorymergewindow.cpp:481 +#: directorymergewindow.cpp:482 #, kde-format msgid "To do." msgstr "Egiteko." -#: directorymergewindow.cpp:522 +#: directorymergewindow.cpp:523 #, kde-format msgid "Name" msgstr "Izena" -#: directorymergewindow.cpp:530 +#: directorymergewindow.cpp:531 #, kde-format msgid "Operation" msgstr "Eragiketa" -#: directorymergewindow.cpp:532 +#: directorymergewindow.cpp:533 #, kde-format msgid "Status" msgstr "Egoera" -#: directorymergewindow.cpp:534 +#: directorymergewindow.cpp:535 #, kde-format msgid "Unsolved" msgstr "Ebatzi gabea" -#: directorymergewindow.cpp:536 +#: directorymergewindow.cpp:537 #, kde-format msgid "Solved" msgstr "Ebatzia" -#: directorymergewindow.cpp:538 +#: directorymergewindow.cpp:539 #, kde-format msgid "Nonwhite" msgstr "Ez-zuria" -#: directorymergewindow.cpp:540 +#: directorymergewindow.cpp:541 #, kde-format msgid "White" msgstr "Zuria" -#: directorymergewindow.cpp:674 +#: directorymergewindow.cpp:676 #, kde-format msgid "Unable to compare non-normal file with normal file." -msgstr "" +msgstr "Ez da fitxategi ez-arruntak eta fitxategi arruntak alderatzeko gai." -#: directorymergewindow.cpp:688 +#: directorymergewindow.cpp:690 #, kde-format msgid "Mix of links and normal files." msgstr "Esteka eta fitxategi arrunten nahasketa." -#: directorymergewindow.cpp:695 +#: directorymergewindow.cpp:697 #, kde-format msgid "Link: " msgstr "Esteka: " -#: directorymergewindow.cpp:704 +#: directorymergewindow.cpp:706 #, kde-format msgid "Size. " msgstr "Neurria. " -#: directorymergewindow.cpp:718 directorymergewindow.cpp:728 +#: directorymergewindow.cpp:720 directorymergewindow.cpp:730 #, kde-format msgid "Date & Size: " msgstr "Data eta neurria: " -#: directorymergewindow.cpp:748 +#: directorymergewindow.cpp:751 #, kde-format msgid "Comparing file..." msgstr "Fitxategia alderatzen..." -#: directorymergewindow.cpp:801 +#: directorymergewindow.cpp:813 #, kde-format msgid "" "You are currently doing a directory merge. Are you sure, you want to abort " @@ -317,48 +318,48 @@ "Une honetan direktorioen arteko bateratze bat egiten ari zara. Ziur zaude, " "bateratzea galarazi eta direktorioa berriz aztertu nahi duzula?" -#: directorymergewindow.cpp:802 kdiff3.cpp:698 kdiff3.cpp:708 kdiff3.cpp:720 -#: mergeresultwindow.cpp:372 pdiff.cpp:1033 pdiff.cpp:1910 pdiff.cpp:1920 +#: directorymergewindow.cpp:814 kdiff3.cpp:697 kdiff3.cpp:707 kdiff3.cpp:719 +#: mergeresultwindow.cpp:400 pdiff.cpp:1031 pdiff.cpp:1920 pdiff.cpp:1930 #, kde-format msgid "Warning" msgstr "Abisua" -#: directorymergewindow.cpp:803 directorymergewindow.cpp:3393 +#: directorymergewindow.cpp:815 directorymergewindow.cpp:3407 #, kde-format msgid "Rescan" msgstr "Berriz aztertu" -#: directorymergewindow.cpp:804 pdiff.cpp:1035 +#: directorymergewindow.cpp:816 pdiff.cpp:1033 #, kde-format msgid "Continue Merging" msgstr "Jarraitu bateratzea" -#: directorymergewindow.cpp:971 +#: directorymergewindow.cpp:984 #, kde-format msgid "Opening of directories failed:" msgstr "Direktorioak irekitzea huts egin du:" -#: directorymergewindow.cpp:975 +#: directorymergewindow.cpp:988 #, kde-format msgid "Dir A \"%1\" does not exist or is not a directory.\n" msgstr "Dir A \"%1\" ez dago edo ez da direktorio bat.\n" -#: directorymergewindow.cpp:980 +#: directorymergewindow.cpp:993 #, kde-format msgid "Dir B \"%1\" does not exist or is not a directory.\n" msgstr "Dir B \"%1\" ez dago edo ez da direktorio bat.\n" -#: directorymergewindow.cpp:985 +#: directorymergewindow.cpp:998 #, kde-format msgid "Dir C \"%1\" does not exist or is not a directory.\n" msgstr "Dir C \"%1\" ez dago edo ez da direktorio bat.\n" -#: directorymergewindow.cpp:988 +#: directorymergewindow.cpp:1001 #, kde-format msgid "Directory Open Error" msgstr "Direktorio irekitze errorea" -#: directorymergewindow.cpp:996 +#: directorymergewindow.cpp:1009 #, kde-format msgid "" "The destination directory must not be the same as A or B when three " @@ -369,49 +370,49 @@ "bateratzen direnean.\n" "Egiaztatu berriz jarraitu baino lehen." -#: directorymergewindow.cpp:998 +#: directorymergewindow.cpp:1011 #, kde-format msgid "Parameter Warning" msgstr "Parametro abisua" -#: directorymergewindow.cpp:1003 +#: directorymergewindow.cpp:1016 #, kde-format msgid "Scanning directories..." msgstr "Direktorioak aztertzen..." -#: directorymergewindow.cpp:1029 +#: directorymergewindow.cpp:1042 #, kde-format msgid "Reading Directory A" msgstr "A direktorioa irakurtzen" -#: directorymergewindow.cpp:1038 +#: directorymergewindow.cpp:1051 #, kde-format msgid "Reading Directory B" msgstr "B direktorioa irakurtzen" -#: directorymergewindow.cpp:1048 +#: directorymergewindow.cpp:1061 #, kde-format msgid "Reading Directory C" msgstr "C direktorioa irakurtzen" -#: directorymergewindow.cpp:1064 +#: directorymergewindow.cpp:1077 #, kde-format msgid "Some subdirectories were not readable in" msgstr "Azpidirektorio batzuk ezin dira irakurri hemen " -#: directorymergewindow.cpp:1069 +#: directorymergewindow.cpp:1082 #, kde-format msgid "Check the permissions of the subdirectories." msgstr "Egiaztatu azpidirektorioen baimenak." -#: directorymergewindow.cpp:1106 kdiff3.cpp:666 kdiff3.cpp:753 kdiff3.cpp:777 -#: kdiff3.cpp:1065 kdiff3.cpp:1086 pdiff.cpp:1116 pdiff.cpp:1170 pdiff.cpp:1218 -#: pdiff.cpp:1234 pdiff.cpp:1277 pdiff.cpp:1301 +#: directorymergewindow.cpp:1119 kdiff3.cpp:665 kdiff3.cpp:752 kdiff3.cpp:776 +#: kdiff3.cpp:1072 kdiff3.cpp:1093 pdiff.cpp:1115 pdiff.cpp:1178 pdiff.cpp:1228 +#: pdiff.cpp:1244 pdiff.cpp:1287 pdiff.cpp:1311 #, kde-format msgid "Ready." msgstr "Prest." -#: directorymergewindow.cpp:1121 +#: directorymergewindow.cpp:1134 #, kde-format msgid "" "Directory Comparison Status\n" @@ -426,22 +427,22 @@ "Fitxategi berdinen kopurua: %2\n" "Fitxategi ezberdinen kopurua: %3" -#: directorymergewindow.cpp:1128 +#: directorymergewindow.cpp:1141 #, kde-format msgid "Number of manual merges: %1" msgstr "Eskuz bateratze kopurua: %1" -#: directorymergewindow.cpp:1394 +#: directorymergewindow.cpp:1407 #, kde-format msgid "This affects all merge operations." msgstr "Honek bateratze eragiketa guztiei eragiten die." -#: directorymergewindow.cpp:1395 +#: directorymergewindow.cpp:1408 #, kde-format msgid "Changing All Merge Operations" msgstr "Bateratze eragiketa guztiak aldatzen" -#: directorymergewindow.cpp:1695 +#: directorymergewindow.cpp:1708 #, kde-format msgid "" "Processing %1 / %2\n" @@ -450,44 +451,44 @@ "Prozesatzea %1 / %2\n" "%3" -#: directorymergewindow.cpp:1738 directorymergewindow.cpp:1742 +#: directorymergewindow.cpp:1751 directorymergewindow.cpp:1755 #, kde-format msgid "Some files could not be processed." -msgstr "" +msgstr "Fitxategi batzuk ezin dira prozesatu." -#: directorymergewindow.cpp:2222 directorymergewindow.cpp:2247 -#: directorymergewindow.cpp:2271 +#: directorymergewindow.cpp:2235 directorymergewindow.cpp:2260 +#: directorymergewindow.cpp:2285 #, kde-format msgid "This operation is currently not possible." msgstr "Eragiketa hau ezin da egin une honetan." -#: directorymergewindow.cpp:2222 directorymergewindow.cpp:2247 -#: directorymergewindow.cpp:2271 directorymergewindow.cpp:2552 +#: directorymergewindow.cpp:2235 directorymergewindow.cpp:2260 +#: directorymergewindow.cpp:2285 directorymergewindow.cpp:2565 #, kde-format msgid "Operation Not Possible" msgstr "Eragiketa ezinezkoa" -#: directorymergewindow.cpp:2318 +#: directorymergewindow.cpp:2332 #, kde-format msgid "An error occurred while copying." msgstr "Errore bat gertatu da kopiatzean." -#: directorymergewindow.cpp:2319 directorymergewindow.cpp:2759 +#: directorymergewindow.cpp:2333 directorymergewindow.cpp:2772 #, kde-format msgid "Merge Error" msgstr "Bateratze errorea" -#: directorymergewindow.cpp:2396 +#: directorymergewindow.cpp:2410 #, kde-format msgid "Unknown merge operation. (This must never happen!)" msgstr "Bateratze eragiketa ezezaguna. (Hau ez da sekula gertatu behar!)" -#: directorymergewindow.cpp:2441 +#: directorymergewindow.cpp:2455 #, kde-format msgid "Unknown merge operation." msgstr "Bateratze eragiketa ezezaguna." -#: directorymergewindow.cpp:2454 +#: directorymergewindow.cpp:2468 #, kde-format msgid "" "The merge is about to begin.\n" @@ -507,22 +508,22 @@ "Jakizu programa hau oraindik beta egoeran dela eta EZ duela inolako " "BERMERIK! Egin zure funtsezko datuen babes-kopia!" -#: directorymergewindow.cpp:2459 +#: directorymergewindow.cpp:2473 #, kde-format msgid "Starting Merge" msgstr "Bateratzea hasten" -#: directorymergewindow.cpp:2460 +#: directorymergewindow.cpp:2474 #, kde-format msgid "Do It" msgstr "Egin" -#: directorymergewindow.cpp:2461 +#: directorymergewindow.cpp:2475 #, kde-format msgid "Simulate It" msgstr "Simulatu" -#: directorymergewindow.cpp:2487 +#: directorymergewindow.cpp:2501 #, kde-format msgid "" "The highlighted item has a different type in the different directories. " @@ -531,7 +532,7 @@ "Nabarmendutako elementuak mota ezberdina du direktorio ezberdinetan. Hautatu " "zer egin." -#: directorymergewindow.cpp:2491 +#: directorymergewindow.cpp:2505 #, kde-format msgid "" "The modification dates of the file are equal but the files are not. Select " @@ -540,7 +541,7 @@ "Aldatze datak berdinak dira baino fitxategiak ez dira berdinak. Hautatu zer " "egin." -#: directorymergewindow.cpp:2495 +#: directorymergewindow.cpp:2509 #, kde-format msgid "" "The highlighted item was changed in one directory and deleted in the other. " @@ -549,7 +550,7 @@ "Nabarmendutako elementua aldatu egin da direktorio batean eta ezabatu " "bestean. Hautatu zer egin." -#: directorymergewindow.cpp:2552 +#: directorymergewindow.cpp:2565 #, kde-format msgid "" "This operation is currently not possible because directory merge is " @@ -558,7 +559,7 @@ "Eragiketa hau ezin da egin une honetan direktorioen bateratzea egiten ari " "delako oraintxe." -#: directorymergewindow.cpp:2609 +#: directorymergewindow.cpp:2622 #, kde-format msgid "" "There was an error in the last step.\n" @@ -569,32 +570,32 @@ "Jarraitu nahi duzu errorea eragin duen elementuarekin edo hura alboratu nahi " "duzu?" -#: directorymergewindow.cpp:2611 +#: directorymergewindow.cpp:2624 #, kde-format msgid "Continue merge after an error" msgstr "Jarraitu bateratzea errore baten ondoren" -#: directorymergewindow.cpp:2612 +#: directorymergewindow.cpp:2625 #, kde-format msgid "Continue With Last Item" msgstr "Jarraitu azken elementuarekin" -#: directorymergewindow.cpp:2613 +#: directorymergewindow.cpp:2626 #, kde-format msgid "Skip Item" msgstr "Alboratu elementua" -#: directorymergewindow.cpp:2709 +#: directorymergewindow.cpp:2722 #, kde-format msgid "Merge operation complete." msgstr "Bateratze eragiketa osatu da." -#: directorymergewindow.cpp:2709 directorymergewindow.cpp:2712 +#: directorymergewindow.cpp:2722 directorymergewindow.cpp:2725 #, kde-format msgid "Merge Complete" msgstr "Bateratzea osatu da" -#: directorymergewindow.cpp:2722 +#: directorymergewindow.cpp:2735 #, kde-format msgid "" "Simulated merge complete: Check if you agree with the proposed operations." @@ -602,49 +603,49 @@ "Simulatutako bateratzea osatu da: Egiaztatu proposatutako eragiketekin ados " "zauden." -#: directorymergewindow.cpp:2758 +#: directorymergewindow.cpp:2771 #, kde-format msgid "An error occurred. Press OK to see detailed information." msgstr "Errore bat gertatu da. Sakatu Ados informazio zehatza ikusteko." -#: directorymergewindow.cpp:2791 +#: directorymergewindow.cpp:2804 #, kde-format msgid "Error: While deleting %1: Creating backup failed." msgstr "Errorea: %1 ezabatzean: Babes-kopia sortzea huts egin du." -#: directorymergewindow.cpp:2798 +#: directorymergewindow.cpp:2811 #, kde-format msgid "delete directory recursively( %1 )" msgstr "ezabatu direktorioa modu errepikarian( %1 )" -#: directorymergewindow.cpp:2800 +#: directorymergewindow.cpp:2813 #, kde-format msgid "delete( %1 )" msgstr "ezabatu( %1 )" -#: directorymergewindow.cpp:2815 +#: directorymergewindow.cpp:2828 #, kde-format msgid "Error: delete dir operation failed while trying to read the directory." msgstr "" "Errorea: ezabatu direktorioa eragiketak huts egin du direktorioa irakurtzen " "saiatzean." -#: directorymergewindow.cpp:2834 +#: directorymergewindow.cpp:2847 #, kde-format msgid "Error: rmdir( %1 ) operation failed." msgstr "Errorea: rmdir( %1 ) eragiketak huts egin du." -#: directorymergewindow.cpp:2844 +#: directorymergewindow.cpp:2857 #, kde-format msgid "Error: delete operation failed." msgstr "Errorea: ezabatze eragiketak huts egin du." -#: directorymergewindow.cpp:2870 +#: directorymergewindow.cpp:2884 #, kde-format msgid "manual merge( %1, %2, %3 -> %4)" msgstr "eskuz bateratzea( %1, %2, %3 -> %4)" -#: directorymergewindow.cpp:2873 +#: directorymergewindow.cpp:2887 #, kde-format msgid "" " Note: After a manual merge the user should continue by pressing F7." @@ -652,184 +653,184 @@ " Oharra: Eskuz bateratu ondoren erabiltzaileak F7 sakatuta jarraitu " "beharko luke." -#: directorymergewindow.cpp:2900 +#: directorymergewindow.cpp:2914 #, kde-format msgid "Error: copy( %1 -> %2 ) failed.Deleting existing destination failed." msgstr "" "Errorea: kopiatu( %1 -> %2 ) huts egin du. Dagoen jomuga ezabatzea huts egin " "du." -#: directorymergewindow.cpp:2909 +#: directorymergewindow.cpp:2923 #, kde-format msgid "copyLink( %1 -> %2 )" msgstr "kopiatu-esteka( %1 -> %2 )" -#: directorymergewindow.cpp:2918 +#: directorymergewindow.cpp:2932 #, kde-format msgid "Error: copyLink failed: Remote links are not yet supported." msgstr "" "Errorea: kopiatu-estekak huts egin du: Urruneko estekak ez dira oraindik " "onartzen." -#: directorymergewindow.cpp:2928 +#: directorymergewindow.cpp:2942 #, kde-format msgid "Error: copyLink failed." msgstr "Errorea: kopiatu-estekak huts egin du." -#: directorymergewindow.cpp:2953 +#: directorymergewindow.cpp:2967 #, kde-format msgid "copy( %1 -> %2 )" msgstr "kopiatu( %1 -> %2 )" -#: directorymergewindow.cpp:2979 +#: directorymergewindow.cpp:2993 #, kde-format msgid "Error during rename( %1 -> %2 ): Cannot delete existing destination." msgstr "" "Errorea berrizendatu( %1 -> %2 ) bitartean: ezin ezabatu dagoen jomuga." -#: directorymergewindow.cpp:2986 +#: directorymergewindow.cpp:3000 #, kde-format msgid "rename( %1 -> %2 )" msgstr "berrizendatu( %1 -> %2)" -#: directorymergewindow.cpp:2995 +#: directorymergewindow.cpp:3009 #, kde-format msgid "Error: Rename failed." msgstr "Errorea: Berrizendatzea huts egin du." -#: directorymergewindow.cpp:3013 +#: directorymergewindow.cpp:3027 #, kde-format msgid "Error during makeDir of %1. Cannot delete existing file." msgstr "" "Errorea %1(r)en «makeDir» bitartean. Ezin da ezabatu dagoen fitxategia." -#: directorymergewindow.cpp:3030 +#: directorymergewindow.cpp:3044 #, kde-format msgid "makeDir( %1 )" msgstr "makeDir( %1 )" -#: directorymergewindow.cpp:3040 +#: directorymergewindow.cpp:3054 #, kde-format msgid "Error while creating directory." msgstr "Errorea direktorioa sortzean." -#: directorymergewindow.cpp:3076 directorymergewindow.cpp:3195 +#: directorymergewindow.cpp:3090 directorymergewindow.cpp:3209 #, kde-format msgid "Dest" msgstr "Jomuga" -#: directorymergewindow.cpp:3084 directorymergewindow.cpp:3113 +#: directorymergewindow.cpp:3098 directorymergewindow.cpp:3127 #, kde-format msgid "Dir" msgstr "Direktorioa" -#: directorymergewindow.cpp:3084 +#: directorymergewindow.cpp:3098 #, kde-format msgid "Type" msgstr "Mota" -#: directorymergewindow.cpp:3084 +#: directorymergewindow.cpp:3098 #, kde-format msgid "Size" msgstr "Neurria" -#: directorymergewindow.cpp:3085 +#: directorymergewindow.cpp:3099 #, kde-format msgid "Attr" msgstr "Atrib" -#: directorymergewindow.cpp:3085 +#: directorymergewindow.cpp:3099 #, kde-format msgid "Last Modification" msgstr "Azken aldaketa" -#: directorymergewindow.cpp:3085 +#: directorymergewindow.cpp:3099 #, kde-format msgid "Link-Destination" msgstr "Estekaren jomuga" -#: directorymergewindow.cpp:3113 +#: directorymergewindow.cpp:3127 #, kde-format msgid "File" msgstr "Fitxategia" -#: directorymergewindow.cpp:3113 +#: directorymergewindow.cpp:3127 #, kde-format msgid "-Link" msgstr "-esteka" -#: directorymergewindow.cpp:3119 +#: directorymergewindow.cpp:3133 #, kde-format msgid "not available" msgstr "ez eskuragarri" -#: directorymergewindow.cpp:3137 +#: directorymergewindow.cpp:3151 #, kde-format msgid "A (Dest): " msgstr "A (Jomuga): " -#: directorymergewindow.cpp:3141 +#: directorymergewindow.cpp:3155 #, kde-format msgid "A: " -msgstr "" +msgstr "A: " -#: directorymergewindow.cpp:3141 +#: directorymergewindow.cpp:3155 #, kde-format msgid "A (Base): " msgstr "A (Onarria): " -#: directorymergewindow.cpp:3147 +#: directorymergewindow.cpp:3161 #, kde-format msgid "B (Dest): " msgstr "B (Jomuga): " -#: directorymergewindow.cpp:3151 +#: directorymergewindow.cpp:3165 #, kde-format msgid "B: " -msgstr "" +msgstr "B: " -#: directorymergewindow.cpp:3156 +#: directorymergewindow.cpp:3170 #, kde-format msgid "C (Dest): " msgstr "C (Jomuga): " -#: directorymergewindow.cpp:3160 +#: directorymergewindow.cpp:3174 #, kde-format msgid "C: " -msgstr "" +msgstr "C: " -#: directorymergewindow.cpp:3163 +#: directorymergewindow.cpp:3177 #, kde-format msgid "Dest: " msgstr "Jomuga: " #. i18n("Saving Directory Merge State ...")); -#: directorymergewindow.cpp:3238 +#: directorymergewindow.cpp:3252 #, kde-format msgid "Save Directory Merge State As..." msgstr "Gorde direktorio bateratze egora honela..." -#: directorymergewindow.cpp:3387 +#: directorymergewindow.cpp:3401 #, kde-format msgid "Start/Continue Directory Merge" msgstr "Hasi/jarraitu direktorio bateratzea" -#: directorymergewindow.cpp:3388 +#: directorymergewindow.cpp:3402 #, kde-format msgid "Run Operation for Current Item" msgstr "Exekutatu eragiketa uneko elementuarentzat" -#: directorymergewindow.cpp:3389 +#: directorymergewindow.cpp:3403 #, kde-format msgid "Compare Selected File" msgstr "Alderatu hautatutako fitxategia" -#: directorymergewindow.cpp:3390 +#: directorymergewindow.cpp:3404 #, kde-format msgid "Merge Current File" msgstr "Bateratu uneko fitxategia" -#: directorymergewindow.cpp:3390 +#: directorymergewindow.cpp:3404 #, kde-format msgid "" "Merge\n" @@ -838,51 +839,51 @@ "Bateratu\n" "Fitxategia" -#: directorymergewindow.cpp:3391 +#: directorymergewindow.cpp:3405 #, kde-format msgid "Fold All Subdirs" msgstr "Tolestu azpidirektorio guztiak" -#: directorymergewindow.cpp:3392 +#: directorymergewindow.cpp:3406 #, kde-format msgid "Unfold All Subdirs" msgstr "Zabaldu direktorio guztiak" #. i18n("Save Directory Merge State ..."), 0, this, &DirectoryMergeWindow::slotSaveMergeState, ac, "dir_save_merge_state"); #. i18n("Load Directory Merge State ..."), 0, this, &DirectoryMergeWindow::slotLoadMergeState, ac, "dir_load_merge_state"); -#: directorymergewindow.cpp:3396 +#: directorymergewindow.cpp:3410 #, kde-format msgid "Choose A for All Items" msgstr "Hautatu A elementu guztietarako" -#: directorymergewindow.cpp:3397 +#: directorymergewindow.cpp:3411 #, kde-format msgid "Choose B for All Items" msgstr "Hautatu B elementu guztietarako" -#: directorymergewindow.cpp:3398 +#: directorymergewindow.cpp:3412 #, kde-format msgid "Choose C for All Items" msgstr "Hautatu C elementu guztietarako" -#: directorymergewindow.cpp:3399 +#: directorymergewindow.cpp:3413 #, kde-format msgid "Auto-Choose Operation for All Items" msgstr "Auto-aukeratu elementu guztientzako eragiketa" -#: directorymergewindow.cpp:3400 +#: directorymergewindow.cpp:3414 #, kde-format msgid "No Operation for All Items" msgstr "Ez dago elementu guztientzako eragiketarik" #. i18n("Synchronize Directories"), 0, this, &DirectoryMergeWindow::slotSynchronizeDirectories, ac, "dir_synchronize_directories"); #. d->m_pDirChooseNewerFiles = GuiUtils::createAction< KToggleAction >(i18n("Copy Newer Files Instead of Merging"), 0, this, &DirectoryMergeWindow::slotChooseNewerFiles, ac, "dir_choose_newer_files"); -#: directorymergewindow.cpp:3405 +#: directorymergewindow.cpp:3419 #, kde-format msgid "Show Identical Files" msgstr "Erakutsi fitxategi berdin-berdinak" -#: directorymergewindow.cpp:3405 +#: directorymergewindow.cpp:3419 #, kde-format msgid "" "Identical\n" @@ -891,17 +892,17 @@ "Fitxategi\n" "berdin-berdinak" -#: directorymergewindow.cpp:3406 +#: directorymergewindow.cpp:3420 #, kde-format msgid "Show Different Files" msgstr "Erakutsi fitxategi ezberdinak" -#: directorymergewindow.cpp:3407 +#: directorymergewindow.cpp:3421 #, kde-format msgid "Show Files only in A" msgstr "Erakutsi solik A-n dauden fitxategiak" -#: directorymergewindow.cpp:3407 +#: directorymergewindow.cpp:3421 #, kde-format msgid "" "Files\n" @@ -910,12 +911,12 @@ "Soilik A-n dauden\n" "fitxategiak" -#: directorymergewindow.cpp:3408 +#: directorymergewindow.cpp:3422 #, kde-format msgid "Show Files only in B" msgstr "Erakutsi solik B-n dauden fitxategiak" -#: directorymergewindow.cpp:3408 +#: directorymergewindow.cpp:3422 #, kde-format msgid "" "Files\n" @@ -924,12 +925,12 @@ "Solik B-n dauden\n" "fitxategiak" -#: directorymergewindow.cpp:3409 +#: directorymergewindow.cpp:3423 #, kde-format msgid "Show Files only in C" msgstr "Erakutsi solik C-n dauden fitxategiak" -#: directorymergewindow.cpp:3409 +#: directorymergewindow.cpp:3423 #, kde-format msgid "" "Files\n" @@ -938,55 +939,57 @@ "Soilik C-n dauden\n" "fitxategiak" -#: directorymergewindow.cpp:3413 +#: directorymergewindow.cpp:3427 #, kde-format msgid "Compare Explicitly Selected Files" msgstr "Alderatu berariaz hautatutako fitxategiak" -#: directorymergewindow.cpp:3414 +#: directorymergewindow.cpp:3428 #, kde-format msgid "Merge Explicitly Selected Files" msgstr "Bateratu berariaz hautatutako fitxategiak" -#: directorymergewindow.cpp:3416 directorymergewindow.cpp:3423 +#: directorymergewindow.cpp:3430 directorymergewindow.cpp:3437 #, kde-format msgid "Do Nothing" msgstr "Ez egin ezer" -#: directorymergewindow.cpp:3428 +#: directorymergewindow.cpp:3442 #, kde-format msgid "Delete A && B" msgstr "Ezabatu A eta B" -#: directorymergewindow.cpp:3431 +#: directorymergewindow.cpp:3445 #, kde-format msgid "Merge to A && B" msgstr "Bateratu A eta B" -#: fileaccess.cpp:462 SourceData.cpp:493 -#, fuzzy, kde-format -#| msgid "Reading file: %1" +#: fileaccess.cpp:301 +#, kde-format +msgid "Unable to determine full url. No parent specified." +msgstr "Ezin da zehaztu URL osoa. Ez da gurasorik zehaztu." + +#: fileaccess.cpp:482 SourceData.cpp:506 +#, kde-format msgid "Failed to read file: %1" -msgstr "Fitxategi irakurtzea: %1" +msgstr "Ezin izan da fitxategia irakurri: %1" -#: fileaccess.cpp:587 +#: fileaccess.cpp:624 #, kde-format msgid "Creating temp copy of %1 failed." msgstr "Aldi baterako %1(r)en kopia sortzea huts egin du." -#: fileaccess.cpp:595 fileaccess.cpp:600 -#, fuzzy, kde-format -#| msgid "Opening %1 failed." +#: fileaccess.cpp:632 fileaccess.cpp:637 +#, kde-format msgid "Opening %1 failed. %2" -msgstr "%1 irekitzea huts egin du." +msgstr "%1 irekitzea huts egin du. %2" -#: fileaccess.cpp:619 fileaccess.cpp:627 -#, fuzzy, kde-format -#| msgid "Error reading from %1" +#: fileaccess.cpp:656 fileaccess.cpp:664 +#, kde-format msgid "Error reading from %1. %2" -msgstr "Errorea %1(e)tik irakurtzean" +msgstr "Errorea %1(e)tik irakurtzean. %2" -#: fileaccess.cpp:751 +#: fileaccess.cpp:788 #, kde-format msgid "" "While trying to make a backup, deleting an older backup failed.\n" @@ -996,7 +999,7 @@ "egin du.\n" "Fitxategi-izena: %1" -#: fileaccess.cpp:758 +#: fileaccess.cpp:795 #, kde-format msgid "" "While trying to make a backup, renaming failed.\n" @@ -1005,177 +1008,177 @@ "Babes-kopia bat egiten saiatzean, berrizendatzea huts egin du.\n" "Fitxategi-izena: %1 -> %2" -#: fileaccess.cpp:828 +#: fileaccess.cpp:865 #, kde-format msgid "Getting file status: %1" msgstr "Fitxategi egoera lortzea: %1" -#: fileaccess.cpp:869 +#: fileaccess.cpp:906 #, kde-format msgid "Reading file: %1" msgstr "Fitxategi irakurtzea: %1" -#: fileaccess.cpp:907 +#: fileaccess.cpp:944 #, kde-format msgid "Writing file: %1" msgstr "Fitxategi idaztea: %1" -#: fileaccess.cpp:940 +#: fileaccess.cpp:977 #, kde-format msgid "Out of memory" msgstr "Memoria beteta" -#: fileaccess.cpp:976 +#: fileaccess.cpp:1013 #, kde-format msgid "Making directory: %1" msgstr "Direktorioa egitea: %1" -#: fileaccess.cpp:997 +#: fileaccess.cpp:1034 #, kde-format msgid "Removing directory: %1" msgstr "Direktorioa kentzea: %1" -#: fileaccess.cpp:1012 +#: fileaccess.cpp:1049 #, kde-format msgid "Removing file: %1" msgstr "Fitxategia kentzea: %1" -#: fileaccess.cpp:1028 +#: fileaccess.cpp:1065 #, kde-format msgid "Creating symbolic link: %1 -> %2" msgstr "Esteka sinbolikoa kentzea: %1 -> %2" -#: fileaccess.cpp:1052 +#: fileaccess.cpp:1089 #, kde-format msgid "Renaming file: %1 -> %2" msgstr "Fitxategi berrizendatzea: %1 -> %2" -#: fileaccess.cpp:1086 +#: fileaccess.cpp:1123 #, kde-format msgid "Copying file: %1 -> %2" msgstr "Fitxategi kopiatzea: %1 -> %2" -#: fileaccess.cpp:1108 +#: fileaccess.cpp:1145 #, kde-format msgid "Reading directory: %1" msgstr "Direktorioa irakurtzea: %1" -#: fileaccess.cpp:1162 +#: fileaccess.cpp:1202 #, kde-format msgid "Listing directory: %1" msgstr "Direktorioa zerrendatzea: %1" -#: kdiff3.cpp:181 +#: kdiff3.cpp:182 #, kde-format msgid "Current Configuration:" msgstr "Uneko konfigurazioa:" -#: kdiff3.cpp:186 +#: kdiff3.cpp:187 #, kde-format msgid "Config Option Error:" msgstr "Konfiguratze aukeraren errorea:" -#: kdiff3.cpp:240 +#: kdiff3.cpp:246 #, kde-format msgid "Option --auto used, but no output file specified." msgstr "--auto aukera erabili da, baino ez da irteera fitxategirik zehaztu." -#: kdiff3.cpp:416 +#: kdiff3.cpp:405 #, kde-format msgid "Option --auto ignored for directory comparison." msgstr "--auto aukera ez-ikusia direktorio alderatzerako." -#: kdiff3.cpp:460 +#: kdiff3.cpp:449 #, kde-format msgid "Saving failed." msgstr "Gordetzea huts egin du." -#: kdiff3.cpp:496 pdiff.cpp:1098 +#: kdiff3.cpp:494 pdiff.cpp:1096 #, kde-format msgid "Opening of these files failed:" msgstr "Fitxategi hauek irekitzea huts egin du:" -#: kdiff3.cpp:505 +#: kdiff3.cpp:503 pdiff.cpp:1105 #, kde-format -msgid "File Open Error" +msgid "File open error" msgstr "Fitxategi irekitze errorea" -#: kdiff3.cpp:533 +#: kdiff3.cpp:532 #, kde-format msgid "Opens documents for comparison..." msgstr "Dokumentuak irekitzen ditu alderatzeko..." -#: kdiff3.cpp:535 +#: kdiff3.cpp:534 #, kde-format msgid "Reload" msgstr "Birzamatu" -#: kdiff3.cpp:538 +#: kdiff3.cpp:537 #, kde-format msgid "Saves the merge result. All conflicts must be solved!" msgstr "Bateratze emaitza gordetzen du. Gatazka guztiak ebatzi behar dira!" -#: kdiff3.cpp:540 +#: kdiff3.cpp:539 #, kde-format msgid "Saves the current document as..." msgstr "Uneko dokumentua honela gordetzen du..." -#: kdiff3.cpp:543 +#: kdiff3.cpp:542 #, kde-format msgid "Print the differences" msgstr "Inprimatu ezberdintasunak" -#: kdiff3.cpp:546 +#: kdiff3.cpp:545 #, kde-format msgid "Quits the application" msgstr "Aplikazioa ixten du" -#: kdiff3.cpp:549 +#: kdiff3.cpp:548 #, kde-format msgid "Cuts the selected section and puts it to the clipboard" msgstr "Hautatutako atala moztu eta arbelean itsasten du" -#: kdiff3.cpp:552 +#: kdiff3.cpp:551 #, kde-format msgid "Copies the selected section to the clipboard" msgstr "Hautatutako atala arbelean kopiatzen du" -#: kdiff3.cpp:554 +#: kdiff3.cpp:553 #, kde-format msgid "Pastes the clipboard contents to current position" msgstr "Arbelaren edukia itsasten du uneko kokalekuan" -#: kdiff3.cpp:557 +#: kdiff3.cpp:556 #, kde-format msgid "Select everything in current window" msgstr "Hautatu uneko leihoko guztia" -#: kdiff3.cpp:560 +#: kdiff3.cpp:559 #, kde-format msgid "Search for a string" msgstr "Bilatu kate bat" -#: kdiff3.cpp:562 +#: kdiff3.cpp:561 #, kde-format msgid "Search again for the string" msgstr "Bilatu berriz katea" -#: kdiff3.cpp:567 +#: kdiff3.cpp:566 #, kde-format msgid "Enables/disables the statusbar" msgstr "Egoera-barra gaitzen/ezgaitzen du" -#: kdiff3.cpp:571 +#: kdiff3.cpp:570 #, kde-format msgid "Configure KDiff3..." msgstr "Konfiguratu KDiff3..." -#: kdiff3.cpp:590 +#: kdiff3.cpp:589 #, kde-format msgid "Go to Current Delta" msgstr "Joan uneko Deltara" -#: kdiff3.cpp:590 +#: kdiff3.cpp:589 #, kde-format msgid "" "Current\n" @@ -1184,12 +1187,12 @@ "Uneko\n" "Delta" -#: kdiff3.cpp:592 +#: kdiff3.cpp:591 #, kde-format msgid "Go to First Delta" msgstr "Joan lehen Deltara" -#: kdiff3.cpp:592 +#: kdiff3.cpp:591 #, kde-format msgid "" "First\n" @@ -1198,12 +1201,12 @@ "Lehen\n" "Delta" -#: kdiff3.cpp:594 +#: kdiff3.cpp:593 #, kde-format msgid "Go to Last Delta" msgstr "Joan azken Deltara" -#: kdiff3.cpp:594 +#: kdiff3.cpp:593 #, kde-format msgid "" "Last\n" @@ -1212,14 +1215,14 @@ "Azken\n" "Delta" -#: kdiff3.cpp:596 +#: kdiff3.cpp:595 #, kde-format msgid "(Skips white space differences when \"Show White Space\" is disabled.)" msgstr "" "(zuriuneen ezberdintasunak alboratzen ditu \"Erakutsi zuriuneak\" desgaitua " "dagoenean)" -#: kdiff3.cpp:597 +#: kdiff3.cpp:596 #, kde-format msgid "" "(Does not skip white space differences even when \"Show White Space\" is " @@ -1228,12 +1231,12 @@ "(ez ditu zuriuneen ezberdintasunak alboratzen \"Erakutsi zuriuneak\" " "desgaitua dagoenean ere)" -#: kdiff3.cpp:598 +#: kdiff3.cpp:597 #, kde-format msgid "Go to Previous Delta" msgstr "Joan aurreko Deltara" -#: kdiff3.cpp:598 +#: kdiff3.cpp:597 #, kde-format msgid "" "Prev\n" @@ -1242,12 +1245,12 @@ "Aurreko\n" "Delta" -#: kdiff3.cpp:600 +#: kdiff3.cpp:599 #, kde-format msgid "Go to Next Delta" msgstr "Joan hurrengo Deltara" -#: kdiff3.cpp:600 +#: kdiff3.cpp:599 #, kde-format msgid "" "Next\n" @@ -1256,12 +1259,12 @@ "Hurrengo\n" "Delta" -#: kdiff3.cpp:602 +#: kdiff3.cpp:601 #, kde-format msgid "Go to Previous Conflict" msgstr "Joan aurreko gatazkara" -#: kdiff3.cpp:602 +#: kdiff3.cpp:601 #, kde-format msgid "" "Prev\n" @@ -1270,12 +1273,12 @@ "Aurreko\n" "gatazka" -#: kdiff3.cpp:604 +#: kdiff3.cpp:603 #, kde-format msgid "Go to Next Conflict" msgstr "Joan hurrengo gatazkara" -#: kdiff3.cpp:604 +#: kdiff3.cpp:603 #, kde-format msgid "" "Next\n" @@ -1284,12 +1287,12 @@ "Hurrengo\n" "gatazka" -#: kdiff3.cpp:606 +#: kdiff3.cpp:605 #, kde-format msgid "Go to Previous Unsolved Conflict" msgstr "Joan hurrengo ebatzi gabeko gatazkara" -#: kdiff3.cpp:606 +#: kdiff3.cpp:605 #, kde-format msgid "" "Prev\n" @@ -1298,12 +1301,12 @@ "Aurreko\n" "ebatzi gabea" -#: kdiff3.cpp:608 +#: kdiff3.cpp:607 #, kde-format msgid "Go to Next Unsolved Conflict" msgstr "Joan hurrengo ebatzi gabeko gatazkara" -#: kdiff3.cpp:608 +#: kdiff3.cpp:607 #, kde-format msgid "" "Next\n" @@ -1312,12 +1315,12 @@ "Hurrengo\n" "ebatzi gabea" -#: kdiff3.cpp:610 +#: kdiff3.cpp:609 #, kde-format msgid "Select Line(s) From A" msgstr "Hautatu A-ko lerroa(k)" -#: kdiff3.cpp:610 +#: kdiff3.cpp:609 #, kde-format msgid "" "Choose\n" @@ -1326,12 +1329,12 @@ "Hautatu\n" "A" -#: kdiff3.cpp:611 +#: kdiff3.cpp:610 #, kde-format msgid "Select Line(s) From B" msgstr "Hautatu B-ko lerroa(k)" -#: kdiff3.cpp:611 +#: kdiff3.cpp:610 #, kde-format msgid "" "Choose\n" @@ -1340,12 +1343,12 @@ "Hautatu\n" "B" -#: kdiff3.cpp:612 +#: kdiff3.cpp:611 #, kde-format msgid "Select Line(s) From C" msgstr "Hautatu C-ko lerroa(k)" -#: kdiff3.cpp:612 +#: kdiff3.cpp:611 #, kde-format msgid "" "Choose\n" @@ -1354,13 +1357,13 @@ "Hautatu\n" "C" -#: kdiff3.cpp:613 +#: kdiff3.cpp:612 #, kde-format msgid "Automatically Go to Next Unsolved Conflict After Source Selection" msgstr "" "Automatikoki joan ebatzi gabeko hurrengo gatazkara sorburua hautatu ondoren" -#: kdiff3.cpp:613 +#: kdiff3.cpp:612 #, kde-format msgid "" "Auto\n" @@ -1369,12 +1372,12 @@ "Auto\n" "hurrengoa" -#: kdiff3.cpp:615 +#: kdiff3.cpp:614 #, kde-format msgid "Show Space && Tabulator Characters" msgstr "Erakutsi zuriune eta tabulatze karaktereak" -#: kdiff3.cpp:615 +#: kdiff3.cpp:614 #, kde-format msgid "" "White\n" @@ -1383,12 +1386,12 @@ "Zuriune\n" "karaktereak" -#: kdiff3.cpp:616 +#: kdiff3.cpp:615 #, kde-format msgid "Show White Space" msgstr "Erakutsi zuriuneak" -#: kdiff3.cpp:616 +#: kdiff3.cpp:615 #, kde-format msgid "" "White\n" @@ -1397,12 +1400,12 @@ "Zuriune\n" "Deltak" -#: kdiff3.cpp:618 +#: kdiff3.cpp:617 #, kde-format msgid "Show Line Numbers" msgstr "Erakutsi lerro zenbakiak" -#: kdiff3.cpp:618 +#: kdiff3.cpp:617 #, kde-format msgid "" "Line\n" @@ -1411,132 +1414,132 @@ "Lerro\n" "zenbakiak" -#: kdiff3.cpp:620 +#: kdiff3.cpp:619 #, kde-format msgid "Automatically Solve Simple Conflicts" msgstr "Automatikoki ebatzi gatazka erraz guztiak" -#: kdiff3.cpp:621 +#: kdiff3.cpp:620 #, kde-format msgid "Set Deltas to Conflicts" msgstr "Ezarri Deltak gatazkei" -#: kdiff3.cpp:622 +#: kdiff3.cpp:621 #, kde-format msgid "Run Regular Expression Auto Merge" msgstr "Exekutatu adierazpen erregularren bateratze automatikoa" -#: kdiff3.cpp:623 +#: kdiff3.cpp:622 #, kde-format msgid "Automatically Solve History Conflicts" msgstr "Automatikoki ebatzi historiako gatazkak" -#: kdiff3.cpp:624 +#: kdiff3.cpp:623 #, kde-format msgid "Split Diff At Selection" msgstr "Zatitu ezberdintasuna hautapenean" -#: kdiff3.cpp:625 +#: kdiff3.cpp:624 #, kde-format msgid "Join Selected Diffs" msgstr "Bildu hautatutako ezberdintasunak" -#: kdiff3.cpp:627 +#: kdiff3.cpp:626 #, kde-format msgid "Show Window A" msgstr "Erakutsi A leihoa" -#: kdiff3.cpp:628 +#: kdiff3.cpp:627 #, kde-format msgid "Show Window B" msgstr "Erakutsi B leihoa" -#: kdiff3.cpp:629 +#: kdiff3.cpp:628 #, kde-format msgid "Show Window C" msgstr "Erakutsi C leihoa" -#: kdiff3.cpp:631 +#: kdiff3.cpp:630 #, kde-format msgid "Normal Overview" msgstr "Ikuspegi orokor arrunta" -#: kdiff3.cpp:632 +#: kdiff3.cpp:631 #, kde-format msgid "A vs. B Overview" msgstr "A vs. B ikuspegi orokorra" -#: kdiff3.cpp:633 +#: kdiff3.cpp:632 #, kde-format msgid "A vs. C Overview" msgstr "A vs. C ikuspegi orokorra" -#: kdiff3.cpp:634 +#: kdiff3.cpp:633 #, kde-format msgid "B vs. C Overview" msgstr "B vs. C ikuspegi orokorra" -#: kdiff3.cpp:635 +#: kdiff3.cpp:634 #, kde-format msgid "Word Wrap Diff Windows" msgstr "Itzulbiratu ezberdintasun leihoak" -#: kdiff3.cpp:636 +#: kdiff3.cpp:635 #, kde-format msgid "Add Manual Diff Alignment" msgstr "Gehitu ezberdintasunak eskuz lerrokatzea" -#: kdiff3.cpp:637 +#: kdiff3.cpp:636 #, kde-format msgid "Clear All Manual Diff Alignments" msgstr "Garbitu ezberdintasunak eskuz lerrokatze guztiak" -#: kdiff3.cpp:639 +#: kdiff3.cpp:638 #, kde-format msgid "Focus Next Window" msgstr "Fokua hurrengo leihora" -#: kdiff3.cpp:640 +#: kdiff3.cpp:639 #, kde-format msgid "Focus Prev Window" msgstr "Fokua aurreko leihora" -#: kdiff3.cpp:641 +#: kdiff3.cpp:640 #, kde-format msgid "Toggle Split Orientation" msgstr "Txandakatu zatitze orientazioa" -#: kdiff3.cpp:643 +#: kdiff3.cpp:642 #, kde-format msgid "Dir && Text Split Screen View" msgstr "Direktorio eta testu pantaila zatitu ikuspegia" -#: kdiff3.cpp:645 +#: kdiff3.cpp:644 #, kde-format msgid "Toggle Between Dir && Text View" msgstr "Txandakatu direktorio eta testu ikuspegien artean" -#: kdiff3.cpp:697 pdiff.cpp:1909 +#: kdiff3.cpp:696 pdiff.cpp:1919 #, kde-format msgid "The merge result has not been saved." msgstr "Bateratzearen emaitza ez da gorde." -#: kdiff3.cpp:699 +#: kdiff3.cpp:698 #, kde-format msgid "Save && Quit" msgstr "Gorde eta irten" -#: kdiff3.cpp:700 +#: kdiff3.cpp:699 #, kde-format msgid "Quit Without Saving" msgstr "Irten gorde gabe" -#: kdiff3.cpp:708 pdiff.cpp:1920 +#: kdiff3.cpp:707 pdiff.cpp:1930 #, kde-format msgid "Saving the merge result failed." msgstr "Bateratzearen emaitza gordetzea huts egin du." -#: kdiff3.cpp:719 pdiff.cpp:1032 +#: kdiff3.cpp:718 pdiff.cpp:1030 #, kde-format msgid "" "You are currently doing a directory merge. Are you sure, you want to abort?" @@ -1544,62 +1547,62 @@ "Une honetan direktorioen bateratzea egiten ari zara. Ziur zaude, galarazi " "nahi duzula?" -#: kdiff3.cpp:742 +#: kdiff3.cpp:741 #, kde-format msgid "Saving file..." msgstr "Fitxategia gordetzen..." -#: kdiff3.cpp:759 +#: kdiff3.cpp:758 #, kde-format msgid "Saving file with a new filename..." msgstr "Fitxategia beste fitxategi-izen batekin gordetzen..." -#: kdiff3.cpp:761 +#: kdiff3.cpp:760 #, kde-format msgid "Save As..." msgstr "Gorde honela..." -#: kdiff3.cpp:820 +#: kdiff3.cpp:819 #, kde-format msgid "Printing not implemented." msgstr "Inprimatzea ez da inplementatu." -#: kdiff3.cpp:857 +#: kdiff3.cpp:858 #, kde-format msgid "Printing..." msgstr "Inprimatzen..." -#: kdiff3.cpp:943 +#: kdiff3.cpp:948 #, kde-format msgid "Printing page %1 of %2" msgstr "%2(e)tik %1. orrialdea inprimatzen" -#: kdiff3.cpp:1000 +#: kdiff3.cpp:1006 #, kde-format msgid " (Selection)" msgstr " (Hautapean)" -#: kdiff3.cpp:1027 +#: kdiff3.cpp:1034 #, kde-format msgid "Printing completed." msgstr "Inprimatzea osatu da." -#: kdiff3.cpp:1031 +#: kdiff3.cpp:1038 #, kde-format msgid "Printing aborted." msgstr "Inprimatzea galarazi da." -#: kdiff3.cpp:1038 +#: kdiff3.cpp:1045 #, kde-format msgid "Exiting..." msgstr "Irteten..." -#: kdiff3.cpp:1049 +#: kdiff3.cpp:1056 #, kde-format msgid "Toggling toolbar..." msgstr "Tresna-barra txandakatzen..." -#: kdiff3.cpp:1070 +#: kdiff3.cpp:1077 #, kde-format msgid "Toggle the statusbar..." msgstr "Txandakatu egoera-barra..." @@ -1624,7 +1627,7 @@ msgid "Joachim Eibl" msgstr "Joachim Eibl" -#: kdiff3_part.cpp:173 kdiff3_part.cpp:254 +#: kdiff3_part.cpp:174 kdiff3_part.cpp:255 #, kde-format msgid "Could not find files for comparison." msgstr "Ezin izan da alderatzeko fitxategirik aurkitu." @@ -1642,7 +1645,7 @@ msgstr "Konfiguratu KDiff3" #. i18n: ectx: ToolBar (mainToolBar) -#: kdiff3_part.rc:16 main.cpp:88 +#: kdiff3_part.rc:16 main.cpp:89 #, kde-format msgid "KDiff3" msgstr "KDiff3" @@ -1712,87 +1715,92 @@ msgid "Main Toolbar" msgstr "Tresna-barra nagusia" -#: main.cpp:68 main.cpp:72 +#: main.cpp:69 main.cpp:73 #, kde-format msgid "Ignored. (User defined.)" msgstr "Ez-ikusia. (Erabiltzaileak zehaztu du.)" -#: main.cpp:92 +#: main.cpp:93 #, kde-format msgid " (64 bit)" msgstr " (64 bit)" -#: main.cpp:94 +#: main.cpp:95 #, kde-format msgid " (32 bit)" msgstr " (32 bit)" -#: main.cpp:95 +#: main.cpp:96 #, kde-format msgid "Tool for Comparison and Merge of Files and Directories" msgstr "Fitxategiak eta direktorioak alderatu eta bateratzeko tresna" -#: main.cpp:96 +#: main.cpp:97 #, kde-format msgid "(c) 2002-2014 Joachim Eibl, (c) 2017 Michael Reeves KF5/Qt5 port" msgstr "(c) 2002-2014 Joachim Eibl, (c) 2017 Michael Reeves KF5/Qt5 eratorpena" -#: main.cpp:112 +#: main.cpp:113 #, kde-format msgid "Merge the input." msgstr "Bateratu sarrerakoa." -#: main.cpp:113 +#: main.cpp:114 #, kde-format msgid "Explicit base file. For compatibility with certain tools." msgstr "Oinarri fitxategi esplizitua. Zenbait tresnekin bateragarri izateko." -#: main.cpp:114 +#: main.cpp:115 #, kde-format msgid "Output file. Implies -m. E.g.: -o newfile.txt" msgstr "" "Irteerako fitxategia. Berarekin dakar -m. Adib.: -o fitxategiberria.txt" -#: main.cpp:115 +#: main.cpp:116 #, kde-format msgid "Output file, again. (For compatibility with certain tools.)" msgstr "" "Irteerak fitxategia, beste behin. (Zenbait tresnekin bateragarri izateko)" -#: main.cpp:116 +#: main.cpp:118 #, kde-format msgid "No GUI if all conflicts are auto-solvable. (Needs -o file)" msgstr "" "Interfaze grafikorik gabe gatazka guztiak auto-ebatzi ezkero. ( -o " "fitxategia behar du)" -#: main.cpp:117 +#: main.cpp:120 +#, kde-format +msgid "Ignored." +msgstr "Ezikusia." + +#: main.cpp:122 #, kde-format msgid "Do not solve conflicts automatically." msgstr "Ez ebatzi gatazkak automatikoki." -#: main.cpp:118 +#: main.cpp:123 #, kde-format msgid "Visible name replacement for input file 1 (base)." msgstr "Izen ikusgaiaren ordezkapena sarrerako 1 fitxategirako (oinarria)." -#: main.cpp:119 +#: main.cpp:124 #, kde-format msgid "Visible name replacement for input file 2." msgstr "Izen ikusgaiaren ordezkapena sarrerako 2 fitxategirako." -#: main.cpp:120 +#: main.cpp:125 #, kde-format msgid "Visible name replacement for input file 3." msgstr "Izen ikusgaiaren ordezkapena sarrerako 3 fitxategirako." -#: main.cpp:121 +#: main.cpp:126 #, kde-format msgid "Alternative visible name replacement. Supply this once for every input." msgstr "" "Ordezko izen ikusgaiaren ordezkapena. Hornitu hau behin sarrera guztietarako." -#: main.cpp:122 +#: main.cpp:127 #, kde-format msgid "" "Override a config setting. Use once for every setting. E.g.: --cs " @@ -1801,88 +1809,88 @@ "Gainezarri konfiguratze ezarpen bat. Erabili behin ezarpen bakoitzarentzat. " "Adib.: --cs \"AutoAdvance=1\"" -#: main.cpp:123 +#: main.cpp:128 #, kde-format msgid "Show list of config settings and current values." msgstr "Erakutsi konfiguratze ezarpen eta uneko balioaren zerrenda." -#: main.cpp:124 +#: main.cpp:129 #, kde-format msgid "Use a different config file." msgstr "Erabili konfiguratze fitxategi ezberdin bat." -#: main.cpp:127 +#: main.cpp:132 #, kde-format msgid "file1 to open (base, if not specified via --base)" msgstr "Ireki beharreko fitxategi1 (oinarria, --base bidez zehazten ez bada)" -#: main.cpp:128 +#: main.cpp:133 #, kde-format msgid "file2 to open" msgstr "Ireki beharreko fitxategi2" -#: main.cpp:129 +#: main.cpp:134 #, kde-format msgid "file3 to open" msgstr "Ireki beharreko fitxategi3" -#: main.cpp:153 +#: main.cpp:158 #, kde-format msgid "See kdiff3 --help for supported options." msgstr "Begiratu kdiff3 --help onartutako aukerak ikusteko." -#: mergeresultwindow.cpp:158 +#: mergeresultwindow.cpp:171 #, kde-format msgid "Choose A Everywhere" msgstr "Hautatu A leku guztietan" -#: mergeresultwindow.cpp:159 +#: mergeresultwindow.cpp:172 #, kde-format msgid "Choose B Everywhere" msgstr "Hautatu B leku guztietan" -#: mergeresultwindow.cpp:160 +#: mergeresultwindow.cpp:173 #, kde-format msgid "Choose C Everywhere" msgstr "Hautatu C leku guztietan" -#: mergeresultwindow.cpp:161 +#: mergeresultwindow.cpp:174 #, kde-format msgid "Choose A for All Unsolved Conflicts" msgstr "Hautatu A ebatzi gabeko gatazka guztiekin" -#: mergeresultwindow.cpp:162 +#: mergeresultwindow.cpp:175 #, kde-format msgid "Choose B for All Unsolved Conflicts" msgstr "Hautatu B ebatzi gabeko gatazka guztiekin" -#: mergeresultwindow.cpp:163 +#: mergeresultwindow.cpp:176 #, kde-format msgid "Choose C for All Unsolved Conflicts" msgstr "Hautatu C ebatzi gabeko gatazka guztiekin" -#: mergeresultwindow.cpp:164 +#: mergeresultwindow.cpp:177 #, kde-format msgid "Choose A for All Unsolved Whitespace Conflicts" msgstr "Hautatu A ebatzi gabeko zuriune gatazka guztiekin" -#: mergeresultwindow.cpp:165 +#: mergeresultwindow.cpp:178 #, kde-format msgid "Choose B for All Unsolved Whitespace Conflicts" msgstr "Hautatu B ebatzi gabeko zuriune gatazka guztiekin" -#: mergeresultwindow.cpp:166 +#: mergeresultwindow.cpp:179 #, kde-format msgid "Choose C for All Unsolved Whitespace Conflicts" msgstr "Hautatu C ebatzi gabeko zuriune gatazka guztiekin" -#: mergeresultwindow.cpp:176 +#: mergeresultwindow.cpp:204 #, kde-format msgid "Number of remaining unsolved conflicts: %1 (of which %2 are whitespace)" msgstr "" "Ebatzi gabe gelditzen den gatazka kopurua: %1 (haietatik %2 zuriuneak dira)" -#: mergeresultwindow.cpp:370 +#: mergeresultwindow.cpp:398 #, kde-format msgid "" "The output has been modified.\n" @@ -1891,29 +1899,29 @@ "Irteera aldatu egin da.\n" "Jarraitzen baduzu zure aldaketak galduko dira." -#: mergeresultwindow.cpp:936 pdiff.cpp:827 +#: mergeresultwindow.cpp:964 pdiff.cpp:817 #, kde-format msgid "All input files are binary equal." msgstr "Sarrerako fitxategi guztiak bitarrean berdinak dira." -#: mergeresultwindow.cpp:938 +#: mergeresultwindow.cpp:966 #, kde-format msgid "All input files contain the same text." msgstr "Sarrerako fitxategi guztiek testu bera dute." -#: mergeresultwindow.cpp:942 mergeresultwindow.cpp:946 -#: mergeresultwindow.cpp:950 pdiff.cpp:833 pdiff.cpp:837 pdiff.cpp:841 +#: mergeresultwindow.cpp:970 mergeresultwindow.cpp:974 +#: mergeresultwindow.cpp:978 pdiff.cpp:823 pdiff.cpp:827 pdiff.cpp:831 #, kde-format msgid "Files %1 and %2 are binary equal.\n" msgstr "%1 eta %2 fitxategiak bitarrean berdinak dira.\n" -#: mergeresultwindow.cpp:944 mergeresultwindow.cpp:948 -#: mergeresultwindow.cpp:952 +#: mergeresultwindow.cpp:972 mergeresultwindow.cpp:976 +#: mergeresultwindow.cpp:980 #, kde-format msgid "Files %1 and %2 have equal text.\n" msgstr "%1 eta %2 fitxategiek testu bera dute.\n" -#: mergeresultwindow.cpp:958 +#: mergeresultwindow.cpp:986 #, kde-format msgid "" "Total number of conflicts: %1\n" @@ -1926,27 +1934,27 @@ "Ebatzi gabeko gatazka kopurua: %3\n" "%4" -#: mergeresultwindow.cpp:964 +#: mergeresultwindow.cpp:992 #, kde-format msgid "Conflicts" msgstr "Gatazkak" -#: mergeresultwindow.cpp:1873 +#: mergeresultwindow.cpp:1901 #, kde-format msgid "" msgstr "" -#: mergeresultwindow.cpp:1881 +#: mergeresultwindow.cpp:1909 #, kde-format msgid "" msgstr "" -#: mergeresultwindow.cpp:1883 mergeresultwindow.cpp:2755 +#: mergeresultwindow.cpp:1911 mergeresultwindow.cpp:2783 #, kde-format msgid "" msgstr "" -#: mergeresultwindow.cpp:2967 +#: mergeresultwindow.cpp:2995 #, kde-format msgid "" "Not all conflicts are solved yet.\n" @@ -1955,12 +1963,12 @@ "Gatazka guztiak ez dira konpondu oraindik.\n" "Fitxategia ez da gorde." -#: mergeresultwindow.cpp:2969 mergeresultwindow.cpp:2978 +#: mergeresultwindow.cpp:2997 mergeresultwindow.cpp:3006 #, kde-format msgid "Conflicts Left" msgstr "Gelditzen diren gatazkak" -#: mergeresultwindow.cpp:2976 +#: mergeresultwindow.cpp:3004 #, kde-format msgid "" "There is a line end style conflict. Please choose the line end style " @@ -1971,7 +1979,7 @@ "eskuz.\n" "Fitxategia ez da gorde." -#: mergeresultwindow.cpp:2990 +#: mergeresultwindow.cpp:3018 #, kde-format msgid "" "\n" @@ -1982,57 +1990,57 @@ "\n" "Babes-kopia sortzea huts egin du. Fitxategia ez da gorde." -#: mergeresultwindow.cpp:2990 mergeresultwindow.cpp:3038 +#: mergeresultwindow.cpp:3018 mergeresultwindow.cpp:3066 #, kde-format msgid "File Save Error" msgstr "Fitxategi gordetze errorea" -#: mergeresultwindow.cpp:3038 +#: mergeresultwindow.cpp:3066 #, kde-format msgid "Error while writing." msgstr "Errorea idaztean." -#: mergeresultwindow.cpp:3110 +#: mergeresultwindow.cpp:3138 #, kde-format msgid "Output:" msgstr "Irteera:" -#: mergeresultwindow.cpp:3123 mergeresultwindow.cpp:3315 +#: mergeresultwindow.cpp:3151 mergeresultwindow.cpp:3343 #, kde-format msgid "[Modified]" msgstr "[Aldatua]" -#: mergeresultwindow.cpp:3130 +#: mergeresultwindow.cpp:3158 #, kde-format msgid "Encoding for saving:" msgstr "Gordetzeko kodeketa:" -#: mergeresultwindow.cpp:3230 +#: mergeresultwindow.cpp:3258 #, kde-format msgid "Conflict" msgstr "Gatazka" -#: mergeresultwindow.cpp:3262 +#: mergeresultwindow.cpp:3290 #, kde-format msgid "Codec from A: %1" msgstr "Aren kodeka: %1" -#: mergeresultwindow.cpp:3264 +#: mergeresultwindow.cpp:3292 #, kde-format msgid "Codec from B: %1" msgstr "Bren kodeka: %1" -#: mergeresultwindow.cpp:3266 +#: mergeresultwindow.cpp:3294 #, kde-format msgid "Codec from C: %1" msgstr "Cren kodeka: %1" -#: optiondialog.cpp:119 +#: optiondialog.cpp:121 #, kde-format msgid "Change Font" msgstr "Aldatu letra-tipoa" -#: optiondialog.cpp:135 optiondialog.cpp:145 +#: optiondialog.cpp:137 optiondialog.cpp:147 #, kde-format msgid "" "Font: %1, %2, %3\n" @@ -2043,124 +2051,123 @@ "\n" "Adibidea:" -#: optiondialog.cpp:388 +#: optiondialog.cpp:390 #, kde-format msgid "Unicode" msgstr "Unicode" -#: optiondialog.cpp:389 +#: optiondialog.cpp:391 #, kde-format msgid "Latin1" msgstr "Latin1" -#: optiondialog.cpp:408 +#: optiondialog.cpp:410 #, kde-format msgid "Change this if non-ASCII characters are not displayed correctly." msgstr "Aldatu hau, ASCII ez diren karaktereak ez badira ondo bistaratzen." -#: optiondialog.cpp:491 +#: optiondialog.cpp:495 #, kde-format msgid "Configure" msgstr "Konfiguratu" -#: optiondialog.cpp:568 +#: optiondialog.cpp:573 #, kde-format msgid "Font" msgstr "Letra-tipoa" -#: optiondialog.cpp:570 +#: optiondialog.cpp:575 #, kde-format msgid "Editor & Diff Output Font" msgstr "Editore eta ezberdintasun irteerako letra-tipoa" -#: optiondialog.cpp:589 +#: optiondialog.cpp:594 #, kde-format msgid "Application font" msgstr "Aplikazioaren letra-tipoa" -#: optiondialog.cpp:594 +#: optiondialog.cpp:599 #, kde-format msgid "File view font" msgstr "Fitxategi ikuspegiaren letra-tipoa" -#: optiondialog.cpp:613 -#, fuzzy, kde-format -#| msgid "Color" +#: optiondialog.cpp:618 +#, kde-format msgctxt "Title for color settings page" msgid "Color" msgstr "Kolorea" -#: optiondialog.cpp:614 +#: optiondialog.cpp:619 #, kde-format msgid "Colors Settings" msgstr "Koloreen ezarpenak" -#: optiondialog.cpp:631 +#: optiondialog.cpp:644 #, kde-format msgid "Editor and Diff Views:" msgstr "Editore eta ezberdintasun ikuspegiak:" -#: optiondialog.cpp:639 +#: optiondialog.cpp:652 #, kde-format msgid "Foreground color:" msgstr "Aurrealdeko kolorea:" -#: optiondialog.cpp:647 +#: optiondialog.cpp:660 #, kde-format msgid "Background color:" msgstr "Atzealdeko kolorea:" -#: optiondialog.cpp:657 +#: optiondialog.cpp:670 #, kde-format msgid "Diff background color:" msgstr "Ezberdintasun atzealdeko kolorea:" -#: optiondialog.cpp:666 +#: optiondialog.cpp:679 #, kde-format msgid "Color A:" msgstr "A kolorea:" -#: optiondialog.cpp:675 +#: optiondialog.cpp:688 #, kde-format msgid "Color B:" msgstr "B kolorea:" -#: optiondialog.cpp:684 +#: optiondialog.cpp:697 #, kde-format msgid "Color C:" msgstr "C kolorea:" -#: optiondialog.cpp:692 +#: optiondialog.cpp:705 #, kde-format msgid "Conflict color:" msgstr "Gatazka kolorea:" -#: optiondialog.cpp:701 +#: optiondialog.cpp:714 #, kde-format msgid "Current range background color:" msgstr "Uneko barrutiaren atzealdeko kolorea:" -#: optiondialog.cpp:710 +#: optiondialog.cpp:723 #, kde-format msgid "Current range diff background color:" msgstr "Uneko barrutiko ezberdintasunen atzealdeko kolorea:" -#: optiondialog.cpp:718 +#: optiondialog.cpp:731 #, kde-format msgid "Color for manually aligned difference ranges:" msgstr "Eskuz lerrokatutako ezberdintasun barrutien kolorea:" -#: optiondialog.cpp:725 +#: optiondialog.cpp:738 #, kde-format msgid "Directory Comparison View:" msgstr "Direktorioak alderatzeko ikuspegia:" -#: optiondialog.cpp:731 +#: optiondialog.cpp:744 #, kde-format msgid "Newest file color:" msgstr "Fitxategi berrienaren kolorea:" -#: optiondialog.cpp:736 +#: optiondialog.cpp:749 #, kde-format msgid "" "Changing this color will only be effective when starting the next directory " @@ -2169,37 +2176,37 @@ "Kolore hau aldatzea indarrean egongo da hurrengo direktorioen alderaketa " "hastean." -#: optiondialog.cpp:741 +#: optiondialog.cpp:754 #, kde-format msgid "Oldest file color:" msgstr "Fitxategi zaharrenaren kolorea:" -#: optiondialog.cpp:750 +#: optiondialog.cpp:763 #, kde-format msgid "Middle age file color:" msgstr "Adin ertaineko fitxategiaren kolorea:" -#: optiondialog.cpp:759 +#: optiondialog.cpp:772 #, kde-format msgid "Color for missing files:" msgstr "Falta diren fitxategientzako kolorea:" -#: optiondialog.cpp:773 +#: optiondialog.cpp:786 #, kde-format msgid "Editor" msgstr "Editorea" -#: optiondialog.cpp:774 +#: optiondialog.cpp:787 #, kde-format msgid "Editor Behavior" msgstr "Editorearen jokabidea" -#: optiondialog.cpp:787 +#: optiondialog.cpp:809 #, kde-format msgid "Tab inserts spaces" msgstr "Tabulatzeak zuriuneak txertatzen ditu" -#: optiondialog.cpp:791 +#: optiondialog.cpp:813 #, kde-format msgid "" "On: Pressing tab generates the appropriate number of spaces.\n" @@ -2208,28 +2215,28 @@ "Piztuta: Tabulatzea sakatzea zuriune kopuru egokia sortzen du.\n" "Itzalita: Tabulatze karaktere bat txertatuko da." -#: optiondialog.cpp:796 +#: optiondialog.cpp:818 #, kde-format msgid "Tab size:" msgstr "Tabulatze neurria:" -#: optiondialog.cpp:803 +#: optiondialog.cpp:825 #, kde-format msgid "Auto indentation" msgstr "Koskatze automatikoa" -#: optiondialog.cpp:807 +#: optiondialog.cpp:829 #, kde-format msgid "On: The indentation of the previous line is used for a new line.\n" msgstr "" "Piztuta: Aurreko lerroaren koskatzea erabiliko da lerro berri baterako.\n" -#: optiondialog.cpp:810 +#: optiondialog.cpp:832 #, kde-format msgid "Auto copy selection" msgstr "Automatikoki kopiatu hautapena" -#: optiondialog.cpp:814 +#: optiondialog.cpp:836 #, kde-format msgid "" "On: Any selection is immediately written to the clipboard.\n" @@ -2238,7 +2245,7 @@ "Piztuta: Hautapen guztiak berehala kopiatzen dira arbelera.\n" "Itzalita: Esplizituki kopiatu behar duzu adib. Ctrl-C bidez." -#: optiondialog.cpp:829 +#: optiondialog.cpp:851 #, kde-format msgid "" "Sets the line endings for when an edited file is saved.\n" @@ -2247,12 +2254,12 @@ "Lerro amaierak ezartzen ditu editatutako fitxategi bat gordetzen denerako.\n" "DOS/Windows: CR+LF; UNIX: LF; non CR=0D, LF=0A" -#: optiondialog.cpp:839 +#: optiondialog.cpp:861 #, kde-format msgid "Diff" msgstr "Ezberdintasuna" -#: optiondialog.cpp:840 +#: optiondialog.cpp:862 #, kde-format msgid "Diff Settings" msgstr "Ezberdintasun ezarpenak" @@ -2266,12 +2273,12 @@ #. ); #. ++line; #. -#: optiondialog.cpp:865 +#: optiondialog.cpp:896 #, kde-format msgid "Ignore numbers (treat as white space)" msgstr "Ez-ikusi zenbakiak (tratatu zuriuneak bailiran)" -#: optiondialog.cpp:869 +#: optiondialog.cpp:900 #, kde-format msgid "" "Ignore number characters during line matching phase. (Similar to Ignore " @@ -2282,45 +2289,45 @@ "zuriuneak» aukeraren antzekoa)\n" "Zenbakizko datuak dituzten lerroak alderatzen lagun lezake." -#: optiondialog.cpp:873 +#: optiondialog.cpp:904 #, kde-format msgid "Ignore C/C++ comments (treat as white space)" msgstr "Ez-ikusi C/C++ iruzkinak (tratatu zuriuneak bailiran)" -#: optiondialog.cpp:876 +#: optiondialog.cpp:907 #, kde-format msgid "Treat C/C++ comments like white space." msgstr "Tratatu C/C++ iruzkinak zuriuneak bailiran." -#: optiondialog.cpp:879 +#: optiondialog.cpp:910 #, kde-format msgid "Ignore case (treat as white space)" msgstr "Ez bereizi maiuskulak (tratatu zuriuneak bailiran)" -#: optiondialog.cpp:883 +#: optiondialog.cpp:914 #, kde-format msgid "Treat case differences like white space changes. ('a'<=>'A')" msgstr "" "Tratatu maius/minus ezberdintasunak zuriune aldaketak bailiran. ('a'<=>'A')" -#: optiondialog.cpp:886 +#: optiondialog.cpp:917 #, kde-format msgid "Preprocessor command:" msgstr "Aurre-prozesatzailearen komandoa:" -#: optiondialog.cpp:891 +#: optiondialog.cpp:922 #, kde-format msgid "User defined pre-processing. (See the docs for details.)" msgstr "" "Erabitzaileak zehaztutako aurre-prozesatzea. (Begiratu dokumentuak " "zehaztasun bila)" -#: optiondialog.cpp:894 +#: optiondialog.cpp:925 #, kde-format msgid "Line-matching preprocessor command:" msgstr "Lerro bat-etortze aurre-prozesatzailearen komandoa:" -#: optiondialog.cpp:899 +#: optiondialog.cpp:930 #, kde-format msgid "" "This pre-processor is only used during line matching.\n" @@ -2329,12 +2336,12 @@ "Aurre-prozesatzaile hau erabiltzen da soilik lerroen parekatzean.\n" "(Begiratu dokumentuak zehaztasun bila)" -#: optiondialog.cpp:902 +#: optiondialog.cpp:933 #, kde-format msgid "Try hard (slower)" msgstr "Saiatu gogor (motelagoa)" -#: optiondialog.cpp:906 +#: optiondialog.cpp:937 #, kde-format msgid "" "Enables the --minimal option for the external diff.\n" @@ -2343,12 +2350,12 @@ "Kanpoko ezberdintasunerako --minimal aukera gaitzen du.\n" "Fitxategien azterketa askoz motelagoa izango da." -#: optiondialog.cpp:910 +#: optiondialog.cpp:941 #, kde-format msgid "Align B and C for 3 input files" msgstr "Lerrokatu B eta C sarrerako 3 fitxategietarako" -#: optiondialog.cpp:914 +#: optiondialog.cpp:945 #, kde-format msgid "" "Try to align B and C when comparing or merging three input files.\n" @@ -2360,17 +2367,23 @@ "Ez da gomendatzen bateratzeko, bateratzea zaildu dezakeelako.\n" "(Lehenetsia itzalita da)" -#: optiondialog.cpp:926 +#: optiondialog.cpp:956 +#, kde-format +msgctxt "Settings page" +msgid "Merge" +msgstr "Bateratu" + +#: optiondialog.cpp:957 #, kde-format msgid "Merge Settings" msgstr "Bateratze ezarpenak" -#: optiondialog.cpp:940 +#: optiondialog.cpp:980 #, kde-format msgid "Auto advance delay (ms):" msgstr "Automatikoki aurreratze atzerapena (ms):" -#: optiondialog.cpp:946 +#: optiondialog.cpp:986 #, kde-format msgid "" "When in Auto-Advance mode the result of the current selection is shown \n" @@ -2379,50 +2392,50 @@ "Auto-aurreratze moduan uneko hautapenaren emaitza adierazitako denbora \n" "erakusten da, hurrengo gatazkara jauzi egin aurretik. Barrutia: 0-2000 ms" -#: optiondialog.cpp:950 +#: optiondialog.cpp:990 #, kde-format msgid "Show info dialogs" msgstr "Erakutsi informazio elkarrizketa-koadroak" -#: optiondialog.cpp:953 +#: optiondialog.cpp:993 #, kde-format msgid "Show a dialog with information about the number of conflicts." msgstr "" "Erakutsi elkarrizketa-koadro bat gatazka kopuruari buruzko informazioarekin." -#: optiondialog.cpp:956 +#: optiondialog.cpp:996 #, kde-format msgid "White space 2-file merge default:" msgstr "Zuriuneen 2-fitxategiren bateratze lehenetsia:" -#: optiondialog.cpp:961 optiondialog.cpp:974 +#: optiondialog.cpp:1001 optiondialog.cpp:1014 #, kde-format msgid "Manual Choice" msgstr "Hautapena eskuz" -#: optiondialog.cpp:965 optiondialog.cpp:979 +#: optiondialog.cpp:1005 optiondialog.cpp:1019 #, fuzzy, kde-format msgid "" "Allow the merge algorithm to automatically select an input for white-space-" "only changes." msgstr "Utzi bateratze algoritmoari automatikoki zuriuneen aldaketa soilerako" -#: optiondialog.cpp:969 +#: optiondialog.cpp:1009 #, kde-format msgid "White space 3-file merge default:" msgstr "Zuriuneen 3-fitxategiren bateratze lehenetsia:" -#: optiondialog.cpp:983 +#: optiondialog.cpp:1023 #, kde-format msgid "Automatic Merge Regular Expression" msgstr "Automatikoki bateratzeko adierazpen erregularra" -#: optiondialog.cpp:991 smalldialogs.cpp:449 +#: optiondialog.cpp:1031 smalldialogs.cpp:459 #, kde-format msgid "Auto merge regular expression:" msgstr "Auto-bateratze adierazpen erregularra:" -#: optiondialog.cpp:996 +#: optiondialog.cpp:1036 #, kde-format msgid "" "Regular expression for lines where KDiff3 should automatically choose one " @@ -2431,12 +2444,12 @@ "- if available - C, otherwise B will be chosen." msgstr "" -#: optiondialog.cpp:1002 +#: optiondialog.cpp:1042 #, kde-format msgid "Run regular expression auto merge on merge start" msgstr "Exekutatu adierazpen erregularraren auto-bateratzea bateratzea hastean" -#: optiondialog.cpp:1005 +#: optiondialog.cpp:1045 #, kde-format msgid "" "Run the merge for auto merge regular expressions\n" @@ -2445,17 +2458,17 @@ "Exekutatu bateratzea auto-bateratze adeirazpen erregularretarako\n" "berehala bateratze bat hasten denean.\n" -#: optiondialog.cpp:1010 +#: optiondialog.cpp:1050 #, kde-format msgid "Version Control History Merging" -msgstr "" +msgstr "Bertsio-kontroleko historia bateratzea" -#: optiondialog.cpp:1018 smalldialogs.cpp:476 +#: optiondialog.cpp:1058 smalldialogs.cpp:486 #, kde-format msgid "History start regular expression:" msgstr "" -#: optiondialog.cpp:1023 +#: optiondialog.cpp:1063 #, kde-format msgid "" "Regular expression for the start of the version control history entry.\n" @@ -2463,12 +2476,12 @@ "Default value: \".*\\$Log.*\\$.*\"" msgstr "" -#: optiondialog.cpp:1029 smalldialogs.cpp:504 +#: optiondialog.cpp:1069 smalldialogs.cpp:514 #, kde-format msgid "History entry start regular expression:" msgstr "" -#: optiondialog.cpp:1042 +#: optiondialog.cpp:1082 #, kde-format msgid "" "A version control history entry consists of several lines.\n" @@ -2480,22 +2493,22 @@ "See the documentation for details." msgstr "" -#: optiondialog.cpp:1050 +#: optiondialog.cpp:1090 #, kde-format msgid "History merge sorting" msgstr "" -#: optiondialog.cpp:1053 +#: optiondialog.cpp:1093 #, kde-format msgid "Sort version control history by a key." -msgstr "" +msgstr "Sailkatu bertsio kontroleko historia gako baten arabera." -#: optiondialog.cpp:1063 +#: optiondialog.cpp:1103 #, kde-format msgid "History entry start sort key order:" msgstr "" -#: optiondialog.cpp:1068 +#: optiondialog.cpp:1108 #, kde-format msgid "" "Each pair of parentheses used in the regular expression for the history " @@ -2507,37 +2520,37 @@ "See the documentation for details." msgstr "" -#: optiondialog.cpp:1079 +#: optiondialog.cpp:1119 #, kde-format msgid "Merge version control history on merge start" msgstr "" -#: optiondialog.cpp:1082 +#: optiondialog.cpp:1122 #, kde-format msgid "Run version control history automerge on merge start." msgstr "" -#: optiondialog.cpp:1086 +#: optiondialog.cpp:1126 #, kde-format msgid "Max number of history entries:" msgstr "" -#: optiondialog.cpp:1090 +#: optiondialog.cpp:1130 #, kde-format msgid "Cut off after specified number. Use -1 for infinite number of entries." msgstr "" -#: optiondialog.cpp:1094 +#: optiondialog.cpp:1134 #, kde-format msgid "Test your regular expressions" msgstr "Probatu zure adierazpen erregularrak" -#: optiondialog.cpp:1099 +#: optiondialog.cpp:1139 #, kde-format msgid "Irrelevant merge command:" msgstr "Bateratze komando hutsala:" -#: optiondialog.cpp:1104 +#: optiondialog.cpp:1144 #, kde-format msgid "" "If specified this script is run after automerge\n" @@ -2548,12 +2561,12 @@ "beste aipatzeko aldaketarik hauteman ez denean.\n" "Parametro hauekin deitua: fitxategiIzena1 fitxategiIzena2 fitxategiIzena3" -#: optiondialog.cpp:1109 +#: optiondialog.cpp:1149 #, kde-format msgid "Auto save and quit on merge without conflicts" msgstr "Auto-gorde eta irten gatazkarik gabeko bateratzeetan" -#: optiondialog.cpp:1113 +#: optiondialog.cpp:1153 #, kde-format msgid "" "If KDiff3 was started for a file-merge from the command line and all\n" @@ -2562,27 +2575,27 @@ "(Similar to command line option \"--auto\".)" msgstr "" -#: optiondialog.cpp:1124 optiondialog.cpp:1125 +#: optiondialog.cpp:1164 optiondialog.cpp:1165 #, kde-format msgid "Directory" msgstr "Direktorioa" -#: optiondialog.cpp:1137 +#: optiondialog.cpp:1185 #, kde-format msgid "Recursive directories" msgstr "Direktorio errepikariak" -#: optiondialog.cpp:1140 +#: optiondialog.cpp:1188 #, kde-format msgid "Whether to analyze subdirectories or not." msgstr "Azpi-direktorioak aztertu hala ez." -#: optiondialog.cpp:1142 +#: optiondialog.cpp:1190 #, kde-format msgid "File pattern(s):" msgstr "Fitxategi eredua(k):" -#: optiondialog.cpp:1148 +#: optiondialog.cpp:1196 #, kde-format msgid "" "Pattern(s) of files to be analyzed. \n" @@ -2593,25 +2606,28 @@ "Zernahitarako karaktereak: '*' eta '?'\n" "Hainbat eredu zehaztu daitezke banatzekoa erabiliz: ';'" -#: optiondialog.cpp:1153 +#: optiondialog.cpp:1201 #, kde-format msgid "File-anti-pattern(s):" -msgstr "" +msgstr "Fitxategi-ereduen alderantzizkoa(k):" -#: optiondialog.cpp:1159 +#: optiondialog.cpp:1207 #, kde-format msgid "" "Pattern(s) of files to be excluded from analysis. \n" "Wildcards: '*' and '?'\n" "Several Patterns can be specified by using the separator: ';'" msgstr "" +"Analisitik baztertu beharreko fitxategien eredua(k).\n" +"Zernahitarako karaktereak: '*' eta '?'\n" +"Hainbat eredu zehaztu daitezke bereiztekoa erabiliz: ';'" -#: optiondialog.cpp:1164 +#: optiondialog.cpp:1212 #, kde-format msgid "Dir-anti-pattern(s):" msgstr "" -#: optiondialog.cpp:1170 +#: optiondialog.cpp:1218 #, kde-format msgid "" "Pattern(s) of directories to be excluded from analysis. \n" @@ -2619,35 +2635,35 @@ "Several Patterns can be specified by using the separator: ';'" msgstr "" -#: optiondialog.cpp:1175 +#: optiondialog.cpp:1223 #, kde-format msgid "Use .cvsignore" msgstr "Erabili .cvsignore" -#: optiondialog.cpp:1179 +#: optiondialog.cpp:1227 #, kde-format msgid "" "Extends the antipattern to anything that would be ignored by CVS.\n" "Via local \".cvsignore\" files this can be directory specific." msgstr "" -#: optiondialog.cpp:1183 +#: optiondialog.cpp:1231 #, kde-format msgid "Find hidden files and directories" msgstr "Aurkitu ezkutuko fitxategiak eta direktorioak" -#: optiondialog.cpp:1186 +#: optiondialog.cpp:1234 #, fuzzy, kde-format #| msgid "Find hidden files and directories" msgid "Finds hidden files and directories." msgstr "Aurkitu ezkutuko fitxategiak eta direktorioak" -#: optiondialog.cpp:1189 +#: optiondialog.cpp:1237 #, kde-format msgid "Follow file links" msgstr "Jarraitu fitxategien estekei" -#: optiondialog.cpp:1193 +#: optiondialog.cpp:1241 #, kde-format msgid "" "On: Compare the file the link points to.\n" @@ -2656,12 +2672,12 @@ "Piztuta: Alderatu estekak erakusten duen fitxategia.\n" "Itzalita: Alderatu estekak." -#: optiondialog.cpp:1197 +#: optiondialog.cpp:1245 #, kde-format msgid "Follow directory links" msgstr "Jarraitu direktorioen estekei" -#: optiondialog.cpp:1201 +#: optiondialog.cpp:1249 #, kde-format msgid "" "On: Compare the directory the link points to.\n" @@ -2670,12 +2686,12 @@ "Piztuta: Alderatu estekak erakusten duen direktorioa.\n" "Itzalita: Alderatu estekak." -#: optiondialog.cpp:1210 +#: optiondialog.cpp:1258 #, kde-format msgid "Case sensitive filename comparison" msgstr "Fitxategi-izen alderatzea maiuskulak bereiziz" -#: optiondialog.cpp:1214 +#: optiondialog.cpp:1262 #, kde-format msgid "" "The directory comparison will compare files or directories when their names " @@ -2688,12 +2704,12 @@ "Ezarri aukera hau izenetan maiuskulak bereizi behar direnean. (Windows-erako " "lehenetsia itzalita da, bestela piztuta)" -#: optiondialog.cpp:1218 +#: optiondialog.cpp:1266 #, kde-format msgid "Unfold all subdirectories on load" msgstr "Zabaldu azpidirektorio guztiak zamatzean" -#: optiondialog.cpp:1222 +#: optiondialog.cpp:1270 #, kde-format msgid "" "On: Unfold all subdirectories when starting a directory diff.\n" @@ -2702,39 +2718,39 @@ "Piztuta: Zabaldu azpidirektorio guztiak direktorio ezberdintzea hastean.\n" "Itzalita: Utzi azpidirektorioak tolestuta." -#: optiondialog.cpp:1226 +#: optiondialog.cpp:1274 #, kde-format msgid "Skip directory status report" msgstr "" -#: optiondialog.cpp:1230 +#: optiondialog.cpp:1278 #, kde-format msgid "" "On: Do not show the Directory Comparison Status.\n" "Off: Show the status dialog on start." msgstr "" -#: optiondialog.cpp:1234 +#: optiondialog.cpp:1282 #, kde-format msgid "File Comparison Mode" msgstr "Fitxategi alderatze modua" -#: optiondialog.cpp:1239 +#: optiondialog.cpp:1287 #, kde-format msgid "Binary comparison" msgstr "Alderatze bitarra" -#: optiondialog.cpp:1241 +#: optiondialog.cpp:1289 #, kde-format msgid "Binary comparison of each file. (Default)" msgstr "Fitxategi bakoitzaren alderatze bitarra. (lehenetsia)" -#: optiondialog.cpp:1244 +#: optiondialog.cpp:1292 #, kde-format msgid "Full analysis" msgstr "Azterketa osoa" -#: optiondialog.cpp:1246 +#: optiondialog.cpp:1294 #, kde-format msgid "" "Do a full analysis and show statistics information in extra columns.\n" @@ -2744,12 +2760,12 @@ "gehigarrian.\n" "(Alderatze bitar bat baino motelagoa, askoz motelagoa fitxategi bitarrekin)" -#: optiondialog.cpp:1250 +#: optiondialog.cpp:1298 #, kde-format msgid "Trust the size and modification date (unsafe)" msgstr "Fidatu neurriaz eta aldaketa dataz (ez segurua)" -#: optiondialog.cpp:1252 +#: optiondialog.cpp:1300 #, kde-format msgid "" "Assume that files are equal if the modification date and file length are " @@ -2764,7 +2780,7 @@ "agertuko dira.\n" "Baliagarria direktorio handietarako edo sare mantsoetarako." -#: optiondialog.cpp:1257 +#: optiondialog.cpp:1305 #, kde-format msgid "" "Trust the size and date, but use binary comparison if date does not match " @@ -2773,7 +2789,7 @@ "Fidatu neurriaz eta dataz, baino erabili alderatze bitarra datak ez badatoz " "bat (ez segurua)" -#: optiondialog.cpp:1259 +#: optiondialog.cpp:1307 #, kde-format msgid "" "Assume that files are equal if the modification date and file length are " @@ -2786,12 +2802,12 @@ "Datak ez badatoz bat baino neurriak bai, erabili alderatze bitarra.\n" "Baliagarria direktorio handietarako edo sare mantsoetarako." -#: optiondialog.cpp:1264 +#: optiondialog.cpp:1312 #, kde-format msgid "Trust the size (unsafe)" msgstr "Fidatu neurriaz (ez segurua)" -#: optiondialog.cpp:1266 +#: optiondialog.cpp:1314 #, kde-format msgid "" "Assume that files are equal if their file lengths are equal.\n" @@ -2803,12 +2819,12 @@ "Baliagarria direktorio handietarako edo sare mantsoetarako, jaisterakoan " "data aldatzen denerako." -#: optiondialog.cpp:1273 +#: optiondialog.cpp:1321 #, kde-format msgid "Synchronize directories" msgstr "Sinkronizatu direktorioak" -#: optiondialog.cpp:1277 +#: optiondialog.cpp:1325 #, kde-format msgid "" "Offers to store files in both directories so that\n" @@ -2816,12 +2832,12 @@ "Works only when comparing two directories without specifying a destination." msgstr "" -#: optiondialog.cpp:1283 +#: optiondialog.cpp:1331 #, kde-format msgid "White space differences considered equal" msgstr "Zuriuneen ezberdintasunak berdin gisa hartuak" -#: optiondialog.cpp:1287 +#: optiondialog.cpp:1335 #, kde-format msgid "" "If files differ only by white space consider them equal.\n" @@ -2831,12 +2847,12 @@ "direla.\n" "Hau aktibo dago soilik «azterketa osoa» hautatzen denean." -#: optiondialog.cpp:1293 +#: optiondialog.cpp:1341 #, kde-format msgid "Copy newer instead of merging (unsafe)" msgstr "Kopiatu berriagoa bateratu ordez (ez segurua)" -#: optiondialog.cpp:1297 +#: optiondialog.cpp:1345 #, kde-format msgid "" "Do not look inside, just take the newer file.\n" @@ -2847,46 +2863,46 @@ "(erabili hau soilik zertan ari zaren badakizu!)\n" "Eraginkorra soilik bi direktorio alderatzean." -#: optiondialog.cpp:1302 +#: optiondialog.cpp:1350 #, kde-format msgid "Backup files (.orig)" msgstr "Babes-kopia fitxategiak (.orig)" -#: optiondialog.cpp:1306 +#: optiondialog.cpp:1354 #, kde-format msgid "" "If 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 "" -#: optiondialog.cpp:1382 optiondialog.cpp:1383 +#: optiondialog.cpp:1430 optiondialog.cpp:1431 #, kde-format msgid "Regional Settings" msgstr "Eskualde ezarpenak" -#: optiondialog.cpp:1397 +#: optiondialog.cpp:1454 #, kde-format msgid "Use the same encoding for everything:" msgstr "Erabili kodeketa bera denerako:" -#: optiondialog.cpp:1401 +#: optiondialog.cpp:1458 #, kde-format msgid "" "Enable this allows to change all encodings by changing the first only.\n" "Disable this if different individual settings are needed." msgstr "" -#: optiondialog.cpp:1405 +#: optiondialog.cpp:1462 #, kde-format msgid "Note: Local Encoding is \"%1\"" msgstr "Oharra: Bertako kodeketa \"%1\" da" -#: optiondialog.cpp:1409 +#: optiondialog.cpp:1466 #, kde-format msgid "File Encoding for A:" msgstr "Aren fitxategi kodeketa:" -#: optiondialog.cpp:1416 +#: optiondialog.cpp:1473 #, kde-format msgid "" "If enabled then Unicode (UTF-16 or UTF-8) encoding will be detected.\n" @@ -2895,32 +2911,32 @@ "(Unicode detection depends on the first bytes of a file.)" msgstr "" -#: optiondialog.cpp:1419 optiondialog.cpp:1430 optiondialog.cpp:1441 +#: optiondialog.cpp:1476 optiondialog.cpp:1487 optiondialog.cpp:1498 #, kde-format msgid "Auto Detect Unicode" msgstr "Auto-antzeman unicode" -#: optiondialog.cpp:1425 +#: optiondialog.cpp:1482 #, kde-format msgid "File Encoding for B:" msgstr "Bren fitxategi kodeketa:" -#: optiondialog.cpp:1436 +#: optiondialog.cpp:1493 #, kde-format msgid "File Encoding for C:" msgstr "Cren fitxategi kodeketa:" -#: optiondialog.cpp:1447 +#: optiondialog.cpp:1504 #, kde-format msgid "File Encoding for Merge Output and Saving:" msgstr "" -#: optiondialog.cpp:1452 +#: optiondialog.cpp:1509 #, kde-format msgid "Auto Select" msgstr "Auto-hautatu" -#: optiondialog.cpp:1456 +#: optiondialog.cpp:1513 #, kde-format msgid "" "If enabled then the encoding from the input files is used.\n" @@ -2928,17 +2944,17 @@ "saving." msgstr "" -#: optiondialog.cpp:1459 +#: optiondialog.cpp:1516 #, kde-format msgid "File Encoding for Preprocessor Files:" msgstr "Fitxategi kodeketa aurre-prozesatzaile fitxategietarako:" -#: optiondialog.cpp:1471 +#: optiondialog.cpp:1528 #, kde-format msgid "Right To Left Language" msgstr "Eskuinetik ezkerrerako hizkuntza" -#: optiondialog.cpp:1475 +#: optiondialog.cpp:1532 #, kde-format msgid "" "Some languages are read from right to left.\n" @@ -2947,22 +2963,22 @@ "Hizkuntza batzuk eskuinetik ezkerrera irakurtzen dira.\n" "Ezarpen honek erakuslea eta editorea horren arabera aldatuko ditu." -#: optiondialog.cpp:1485 +#: optiondialog.cpp:1542 #, kde-format msgid "Integration" msgstr "Bateratzea" -#: optiondialog.cpp:1486 +#: optiondialog.cpp:1543 #, kde-format msgid "Integration Settings" msgstr "Bateratze ezarpenak" -#: optiondialog.cpp:1499 +#: optiondialog.cpp:1564 #, kde-format msgid "Command line options to ignore:" msgstr "Ez-ikusi beharreko komando lerroko aukerak:" -#: optiondialog.cpp:1505 +#: optiondialog.cpp:1570 #, kde-format msgid "" "List of command line options that should be ignored when KDiff3 is used by " @@ -2971,12 +2987,12 @@ "This will suppress the \"Unknown option\" error." msgstr "" -#: optiondialog.cpp:1510 +#: optiondialog.cpp:1575 #, kde-format msgid "Quit also via Escape key" msgstr "Irten ere «ihes» teklaren bidez" -#: optiondialog.cpp:1514 +#: optiondialog.cpp:1579 #, kde-format msgid "" "Fast method to exit.\n" @@ -2985,7 +3001,7 @@ "Irteteko metodo azkarra.\n" "«Ihes» tekla erabiltzen ohituak daudenentzat." -#: optiondialog.cpp:1598 +#: optiondialog.cpp:1653 #, kde-format msgid "This resets all options. Not only those of the current topic." msgstr "Honek aukera guztiak berrezartzen ditu. Ez soilik uneko gaikoak." @@ -3041,80 +3057,70 @@ msgid "Disable Unsafe Options" msgstr "Desgaitu aukera ez seguruak" -#: pdiff.cpp:158 +#: pdiff.cpp:160 #, kde-format msgid "Loading A" msgstr "A zamatzen" -#: pdiff.cpp:167 +#: pdiff.cpp:162 #, kde-format -msgid "Errors occurred during pre-processing of file A." -msgstr "Erroreak izan dira A fitxategia aurre-prozesatzean." +msgid "Loading A: %1" +msgstr "A zamatzea: %1" -#: pdiff.cpp:172 +#: pdiff.cpp:170 #, kde-format msgid "Loading B" msgstr "B zamatzen" -#: pdiff.cpp:179 -#, kde-format -msgid "Errors occurred during pre-processing of file B." -msgstr "Erroreak izan dira B fitxategia aurre-prozesatzean." - -#: pdiff.cpp:202 pdiff.cpp:241 +#: pdiff.cpp:201 pdiff.cpp:237 #, kde-format msgid "Diff: A <-> B" msgstr "Ezberdintasuna: A <-> B" -#: pdiff.cpp:208 pdiff.cpp:279 pdiff.cpp:293 +#: pdiff.cpp:207 pdiff.cpp:275 pdiff.cpp:289 #, kde-format msgid "Linediff: A <-> B" msgstr "Lerro ezberdintasuna: A <-> B" -#: pdiff.cpp:225 +#: pdiff.cpp:224 #, kde-format msgid "Loading C" msgstr "C zamatzen" -#: pdiff.cpp:232 -#, kde-format -msgid "Errors occurred during pre-processing of file C." -msgstr "Erroreak izan dira C fitxategia aurre-prozesatzean." - -#: pdiff.cpp:250 +#: pdiff.cpp:246 #, kde-format msgid "Diff: A <-> C" msgstr "Ezberdintasuna: A <-> C" -#: pdiff.cpp:261 +#: pdiff.cpp:257 #, kde-format msgid "Diff: B <-> C" msgstr "Ezberdintasuna: B <-> C" -#: pdiff.cpp:283 pdiff.cpp:297 +#: pdiff.cpp:279 pdiff.cpp:293 #, kde-format msgid "Linediff: B <-> C" msgstr "Lerro ezberdintasuna: B <-> C" -#: pdiff.cpp:287 pdiff.cpp:301 +#: pdiff.cpp:283 pdiff.cpp:297 #, kde-format msgid "Linediff: A <-> C" msgstr "Lerro ezberdintasuna: A <-> C" -#: pdiff.cpp:829 +#: pdiff.cpp:819 #, kde-format msgid "All input files contain the same text, but are not binary equal." msgstr "" "Sarrerako fitxategi guztiek testu bera dute, baino ez dira bitarrean " "berdinak." -#: pdiff.cpp:835 pdiff.cpp:839 pdiff.cpp:843 +#: pdiff.cpp:825 pdiff.cpp:829 pdiff.cpp:833 #, kde-format msgid "Files %1 and %2 have equal text, but are not binary equal. \n" msgstr "" "%1 eta %2 fitxategiek testu bera dute, baino ez dira bitarrean berdinak.\n" -#: pdiff.cpp:853 +#: pdiff.cpp:843 #, kde-format msgid "" "Some input files do not seem to be pure text files.\n" @@ -3122,17 +3128,17 @@ "Continue at your own risk." msgstr "" -#: pdiff.cpp:863 +#: pdiff.cpp:853 #, kde-format msgid ", B" msgstr ", B" -#: pdiff.cpp:865 +#: pdiff.cpp:855 #, kde-format msgid ", C" msgstr ", C" -#: pdiff.cpp:867 +#: pdiff.cpp:857 #, kde-format msgid "" "Some input characters could not be converted to valid unicode.\n" @@ -3141,77 +3147,72 @@ "Affected input files are in %1." msgstr "" -#: pdiff.cpp:1034 +#: pdiff.cpp:1032 #, kde-format msgid "Abort" msgstr "Galarazi" -#: pdiff.cpp:1040 pdiff.cpp:1130 +#: pdiff.cpp:1038 pdiff.cpp:1129 #, kde-format msgid "Opening files..." msgstr "Fitxategiak irekitzen..." -#: pdiff.cpp:1107 -#, kde-format -msgid "File open error" -msgstr "Fitxategi irekitze errorea" - -#: pdiff.cpp:1202 +#: pdiff.cpp:1212 #, kde-format msgid "Cutting selection..." msgstr "Hautapena mozten..." -#: pdiff.cpp:1223 +#: pdiff.cpp:1233 #, kde-format msgid "Copying selection to clipboard..." msgstr "Hautapena arbelera kopiatzen..." -#: pdiff.cpp:1239 +#: pdiff.cpp:1249 #, kde-format msgid "Inserting clipboard contents..." msgstr "Arbelaren edukiak txertatzen..." -#: pdiff.cpp:1695 +#: pdiff.cpp:1705 #, kde-format msgid "Word wrap (Cancel disables word wrap)" msgstr "Itzulbira («Utzi»k itzulbiratzea desgaitzen du)" -#: pdiff.cpp:1696 +#: pdiff.cpp:1706 #, kde-format msgid "Calculating max width for horizontal scrollbar" msgstr "Labaintze-barra horizontalaren gehieneko zabalera kalkulatzen" -#: pdiff.cpp:1911 +#: pdiff.cpp:1921 #, kde-format msgid "Save && Continue" msgstr "Gorde eta jarraitu" -#: pdiff.cpp:1912 +#: pdiff.cpp:1922 #, kde-format msgid "Continue Without Saving" msgstr "Jarraitu gorde gabe" -#: pdiff.cpp:2124 +#: pdiff.cpp:2134 #, kde-format msgid "Search complete." msgstr "Bilaketa osatu da." -#: pdiff.cpp:2124 +#: pdiff.cpp:2134 #, kde-format msgid "Search Complete" msgstr "Bilaketa osatua" -#: pdiff.cpp:2375 +#: pdiff.cpp:2385 #, kde-format msgid "Nothing is selected in either diff input window." -msgstr "" +msgstr "Ez dago ezer hautatuta diff sarrerako leihoetan." -#: pdiff.cpp:2375 +#: pdiff.cpp:2385 #, kde-format msgid "Error while adding manual diff range" msgstr "" -#: progress.cpp:59 progress.cpp:71 +#: progress.cpp:61 progress.cpp:73 #, kde-format msgid "&Cancel" msgstr "&Utzi" @@ -3221,190 +3222,192 @@ msgid "A (Base):" msgstr "A (Oinarria):" -#: smalldialogs.cpp:68 smalldialogs.cpp:85 smalldialogs.cpp:102 -#: smalldialogs.cpp:144 +#: smalldialogs.cpp:71 smalldialogs.cpp:90 smalldialogs.cpp:109 +#: smalldialogs.cpp:154 #, kde-format msgid "File..." msgstr "Fitxategia..." -#: smalldialogs.cpp:70 smalldialogs.cpp:87 smalldialogs.cpp:104 -#: smalldialogs.cpp:146 +#: smalldialogs.cpp:73 smalldialogs.cpp:92 smalldialogs.cpp:111 +#: smalldialogs.cpp:156 #, kde-format msgid "Dir..." msgstr "Direktorioa..." -#: smalldialogs.cpp:96 +#: smalldialogs.cpp:103 #, kde-format msgid "C (Optional):" msgstr "C (Aukerakoa):" -#: smalldialogs.cpp:119 +#: smalldialogs.cpp:126 #, kde-format msgid "Swap/Copy Names..." msgstr "Trukatu/kopiatu izenak..." -#: smalldialogs.cpp:124 smalldialogs.cpp:125 smalldialogs.cpp:126 +#: smalldialogs.cpp:131 smalldialogs.cpp:132 smalldialogs.cpp:133 #, kde-format msgid "Swap %1<->%2" msgstr "Trukatu %1<->%2" -#: smalldialogs.cpp:127 smalldialogs.cpp:128 smalldialogs.cpp:129 +#: smalldialogs.cpp:134 smalldialogs.cpp:135 smalldialogs.cpp:136 #, kde-format msgid "Copy %1->Output" msgstr "Kopiatu %1->irteera" -#: smalldialogs.cpp:130 smalldialogs.cpp:131 smalldialogs.cpp:132 +#: smalldialogs.cpp:137 smalldialogs.cpp:138 smalldialogs.cpp:139 #, kde-format msgid "Swap %1<->Output" msgstr "Trukatu %1<->irteera" -#: smalldialogs.cpp:138 +#: smalldialogs.cpp:148 #, kde-format msgid "Output (optional):" msgstr "Irteera (aukerakoa):" -#: smalldialogs.cpp:168 +#: smalldialogs.cpp:178 #, kde-format msgid "Configure..." msgstr "Konfiguratu..." -#: smalldialogs.cpp:233 +#: smalldialogs.cpp:243 #, kde-format msgid "Open Directory" msgstr "Ireki direktorioa" -#: smalldialogs.cpp:234 +#: smalldialogs.cpp:244 #, kde-format msgid "Select Output File" msgstr "Hautatu irteera-fitxategia" -#: smalldialogs.cpp:393 +#: smalldialogs.cpp:403 #, kde-format msgid "Search text:" msgstr "Bilatu testua:" -#: smalldialogs.cpp:400 +#: smalldialogs.cpp:410 #, kde-format msgid "Case sensitive" msgstr "Bereizi maiuskulak" -#: smalldialogs.cpp:403 +#: smalldialogs.cpp:413 #, kde-format msgid "Search A" msgstr "Bilatu A" -#: smalldialogs.cpp:408 +#: smalldialogs.cpp:418 #, kde-format msgid "Search B" msgstr "Bilatu B" -#: smalldialogs.cpp:413 +#: smalldialogs.cpp:423 #, kde-format msgid "Search C" msgstr "Bilatu C" -#: smalldialogs.cpp:418 +#: smalldialogs.cpp:428 #, kde-format msgid "Search output" msgstr "Bilatu irteera" -#: smalldialogs.cpp:425 +#: smalldialogs.cpp:435 #, kde-format msgid "&Search" msgstr "&Bilatu" -#: smalldialogs.cpp:444 +#: smalldialogs.cpp:454 #, kde-format msgid "Regular Expression Tester" msgstr "Adierazpen erregularren probatzailea" -#: smalldialogs.cpp:457 +#: smalldialogs.cpp:467 #, kde-format msgid "Example auto merge line:" msgstr "Adibide auto-bateratze lerroa:" -#: smalldialogs.cpp:459 +#: smalldialogs.cpp:469 #, kde-format msgid "To test auto merge, copy a line as used in your files." msgstr "" -#: smalldialogs.cpp:465 smalldialogs.cpp:493 smalldialogs.cpp:529 +#: smalldialogs.cpp:475 smalldialogs.cpp:503 smalldialogs.cpp:539 #, kde-format msgid "Match result:" msgstr "Parekatze emaitza:" -#: smalldialogs.cpp:484 +#: smalldialogs.cpp:494 #, kde-format msgid "Example history start line (with leading comment):" msgstr "" -#: smalldialogs.cpp:486 +#: smalldialogs.cpp:496 #, kde-format msgid "" "Copy a history start line as used in your files,\n" "including the leading comment." msgstr "" -#: smalldialogs.cpp:512 +#: smalldialogs.cpp:522 #, kde-format msgid "History sort key order:" -msgstr "" +msgstr "Historiako sailkatze gakoen ordena:" -#: smalldialogs.cpp:520 +#: smalldialogs.cpp:530 #, kde-format msgid "Example history entry start line (without leading comment):" msgstr "" +"Historia sarrerako hasierako lerroaren adibidea (hasierako iruzkinik gabe):" -#: smalldialogs.cpp:522 +#: smalldialogs.cpp:532 #, kde-format msgid "" "Copy a history entry start line as used in your files,\n" "but omit the leading comment." msgstr "" +"Kopiatu historia sarrera baten hasierako lerroa zure fitxategietan\n" +"erabili gisa, baino kanporatu hasierako iruzkina." -#: smalldialogs.cpp:536 +#: smalldialogs.cpp:546 #, kde-format msgid "Sort key result:" -msgstr "" +msgstr "Sailkatze gakoaren emaitza:" -#: smalldialogs.cpp:584 smalldialogs.cpp:594 smalldialogs.cpp:614 +#: smalldialogs.cpp:594 smalldialogs.cpp:604 smalldialogs.cpp:624 #, kde-format msgid "Match success." -msgstr "" +msgstr "Parekatze zuzena." -#: smalldialogs.cpp:588 smalldialogs.cpp:598 smalldialogs.cpp:620 +#: smalldialogs.cpp:598 smalldialogs.cpp:608 smalldialogs.cpp:630 #, kde-format msgid "Match failed." -msgstr "" +msgstr "Parekatzeak huts egin du." -#: smalldialogs.cpp:605 +#: smalldialogs.cpp:615 #, kde-format msgid "Opening and closing parentheses do not match in regular expression." msgstr "" "Irekiera eta itxiera parentesiak ez datoz bat adierazpen erregularrean." -#: SourceData.cpp:150 +#: SourceData.cpp:153 #, kde-format msgid "Writing clipboard data to temp file failed." msgstr "Arbeleko datuak aldi baterako fitxategira kopiatzea huts egin du." -#: SourceData.cpp:154 +#: SourceData.cpp:157 #, kde-format msgid "From Clipboard" msgstr "Arbeletik" -#: SourceData.cpp:335 -#, fuzzy, kde-format -#| msgid "Mix of links and normal files." +#: SourceData.cpp:348 +#, kde-format msgid "%1 is not a normal file." -msgstr "Esteka eta fitxategi arrunten nahasketa." +msgstr "%1 ez da fitxategi arrunta." -#: SourceData.cpp:427 +#: SourceData.cpp:440 #, kde-format msgid " Temp file is: %1" -msgstr "" +msgstr " Aldi baterako fitxategia da: %1" -#: SourceData.cpp:432 +#: SourceData.cpp:445 #, kde-format msgid "" "Preprocessing possibly failed. Check this command:\n" @@ -3419,12 +3422,12 @@ "\n" "Aurreprozesatzeko komandoa desgaitua egonen da orain." -#: SourceData.cpp:443 SourceData.cpp:512 +#: SourceData.cpp:456 SourceData.cpp:525 #, kde-format msgid "File %1 too large to process. Skipping." msgstr "%1 fitxategia prozesatzeko handiegia. Alboratzen." -#: SourceData.cpp:487 +#: SourceData.cpp:500 #, kde-format msgid "" "The line-matching-preprocessing possibly failed. Check this command:\n" @@ -3441,21 +3444,19 @@ "Lerro-bat-etortze-aurreprozesatzeko komandoa desgaitu egingo da orain." #: Utils.cpp:77 -#, fuzzy, kde-format -#| msgid "Expecting space after closing apostroph." +#, kde-format msgid "Expecting space after closing quote." -msgstr "Zuriunea espero zen apostrofoa itxi ondoren." +msgstr "Zuriunea espero zen itxierako komatxoaren atzetik." #: Utils.cpp:80 #, kde-format msgid "Unmatched quote." -msgstr "" +msgstr "Itxi gabeko komatxoa." #: Utils.cpp:89 -#, fuzzy, kde-format -#| msgid "Unexpected apostroph within argument." +#, kde-format msgid "Unexpected quote character within argument." -msgstr "Ustekabeko apostrofoa argumentuen artean." +msgstr "Espero ez ziren komatxoak daude argumentuan." #: Utils.cpp:96 #, kde-format diff -Nru kdiff3-1.8.01/po/fi/diff_ext.po kdiff3-1.8.3/po/fi/diff_ext.po --- kdiff3-1.8.01/po/fi/diff_ext.po 2019-05-18 01:01:59.000000000 +0000 +++ kdiff3-1.8.3/po/fi/diff_ext.po 2020-06-25 00:18:18.000000000 +0000 @@ -5,8 +5,8 @@ msgid "" msgstr "" "Project-Id-Version: kdiff3\n" -"Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2019-03-22 03:09+0100\n" +"Report-Msgid-Bugs-To: https://bugs.kde.org\n" +"POT-Creation-Date: 2019-11-04 07:54+0100\n" "PO-Revision-Date: 2018-08-23 17:48+0200\n" "Last-Translator: Tommi Nieminen \n" "Language-Team: Finnish \n" @@ -17,119 +17,114 @@ "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Lokalize 2.0\n" -#: diff_ext.cpp:391 +#: diff_ext.cpp:223 #, kde-format msgid "Compare with %1" msgstr "Vertaa tiedostoon %1" -#: diff_ext.cpp:392 +#: diff_ext.cpp:224 #, kde-format msgid "Merge with %1" msgstr "Yhdistä tiedostoon %1" -#: diff_ext.cpp:408 +#: diff_ext.cpp:234 #, kde-format msgid "3-way merge with base" msgstr "Kolmivaiheinen yhdistäminen pohjaan" -#: diff_ext.cpp:411 +#: diff_ext.cpp:237 #, kde-format msgid "Save '%1' for later" msgstr "Tallenna ”%1” tuonnemmaksi" -#: diff_ext.cpp:426 +#: diff_ext.cpp:251 #, kde-format msgid "Compare with ..." msgstr "Vertaa tiedostoon…" -#: diff_ext.cpp:429 +#: diff_ext.cpp:254 #, kde-format msgid "Clear list" msgstr "Tyhjennä luettelo" -#: diff_ext.cpp:434 +#: diff_ext.cpp:259 #, kde-format msgid "Compare" msgstr "Vertaa" -#: diff_ext.cpp:438 +#: diff_ext.cpp:263 #, kde-format msgid "3 way comparison" msgstr "Kolmivaiheinen vertailu" -#: diff_ext.cpp:444 +#: diff_ext.cpp:269 #, kde-format msgid "About Diff-Ext ..." msgstr "Tietoa diff-laajennuksesta…" -#: diff_ext.cpp:515 +#: diff_ext.cpp:340 #, kde-format msgid "(32 Bit)" msgstr "(32-bittinen)" -#: diff_ext.cpp:517 -#, kde-format -msgid "(64 Bit)" -msgstr "(64-bittinen)" - -#: diff_ext.cpp:518 +#: diff_ext.cpp:342 #, kde-format msgid "Diff-Ext Copyright (c) 2003-2006, Sergey Zorin. All rights reserved.\n" msgstr "" "Diff-laajennuksen tekijänoikeudet © 2003–06 Sergey Zorin. Kaikki oikeudet " "pidätetään.\n" -#: diff_ext.cpp:519 +#: diff_ext.cpp:343 #, kde-format msgid "This software is distributable under the BSD-2-Clause license.\n" msgstr "Ohjelmaa voi levittää BSD-2-lisenssin mukaisesti.\n" -#: diff_ext.cpp:520 +#: diff_ext.cpp:344 #, kde-format msgid "Some extensions for KDiff3 (c) 2006-2013 by Joachim Eibl.\n" msgstr "Jotkin KDiff3-laajennukset © 2006–13 Joachim Eibl.\n" -#: diff_ext.cpp:521 +#: diff_ext.cpp:345 #, kde-format msgid "Homepage for Diff-Ext: http://diff-ext.sourceforge.net\n" msgstr "Diff-laajennuksen kotisivu: http://diff-ext.sourceforge.net\n" -#: diff_ext.cpp:522 +#: diff_ext.cpp:346 #, kde-format msgid "About Diff-Ext for KDiff3 " msgstr "Tietoa KDiff3:n diff-laajennuksesta" -#: diff_ext.cpp:551 +#: diff_ext.cpp:375 #, kde-format msgid "Compare selected files" msgstr "Vertaa valittuja tiedostoja" -#: diff_ext.cpp:557 diff_ext.cpp:577 +#: diff_ext.cpp:381 diff_ext.cpp:399 #, kde-format msgid "Compare '%1' with '%2'" msgstr "Vertaa tiedostoa ”%1” tiedostoon ”%2”" -#: diff_ext.cpp:563 +#: diff_ext.cpp:386 #, kde-format msgid "Save '%1' for later operation" msgstr "Tallenna ”%1” myöhemmin käsiteltäväksi" -#: diff_ext.cpp:619 +#: diff_ext.cpp:440 #, kde-format msgid "Could not start KDiff3. Please rerun KDiff3 installation." msgstr "KDiff3:n käynnistys epäonnistui. Asenna se uudelleen." -#: diff_ext.cpp:620 +#: diff_ext.cpp:441 #, kde-format msgid "Command" msgstr "Komento" -#: diff_ext.cpp:621 +#: diff_ext.cpp:442 #, kde-format msgid "CommandLine" msgstr "Komentorivi" -#: diff_ext.cpp:622 +#: diff_ext.cpp:443 #, kde-format msgid "Diff-Ext For KDiff3" msgstr "KDiff3:n diff-laajennus" \ No newline at end of file diff -Nru kdiff3-1.8.01/po/fi/kdiff3fileitemactionplugin.po kdiff3-1.8.3/po/fi/kdiff3fileitemactionplugin.po --- kdiff3-1.8.01/po/fi/kdiff3fileitemactionplugin.po 2019-05-18 01:01:59.000000000 +0000 +++ kdiff3-1.8.3/po/fi/kdiff3fileitemactionplugin.po 2020-06-25 00:18:18.000000000 +0000 @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: kdiff3fileitemactionplugin\n" -"Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2019-03-22 03:09+0100\n" +"Report-Msgid-Bugs-To: https://bugs.kde.org\n" +"POT-Creation-Date: 2019-08-30 07:40+0200\n" "PO-Revision-Date: 2019-05-12 18:14+0200\n" "Last-Translator: Tommi Nieminen \n" "Language-Team: Finnish \n" diff -Nru kdiff3-1.8.01/po/fi/kdiff3.po kdiff3-1.8.3/po/fi/kdiff3.po --- kdiff3-1.8.01/po/fi/kdiff3.po 2019-05-18 01:01:59.000000000 +0000 +++ kdiff3-1.8.3/po/fi/kdiff3.po 2020-06-25 00:18:18.000000000 +0000 @@ -2,14 +2,14 @@ # Author: Artnay # Author: Lliehu # Author: Niklas Laxström -# Tommi Nieminen , 2012, 2013, 2015, 2016, 2018, 2019. +# Tommi Nieminen , 2012, 2013, 2015, 2016, 2018, 2019, 2020. # Lasse Liehu , 2012, 2013, 2014, 2016. msgid "" msgstr "" "Project-Id-Version: kdiff3\n" -"Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2019-04-18 08:02+0200\n" -"PO-Revision-Date: 2019-05-12 18:18+0200\n" +"Report-Msgid-Bugs-To: https://bugs.kde.org\n" +"POT-Creation-Date: 2020-06-22 07:48+0200\n" +"PO-Revision-Date: 2020-06-17 22:39+0300\n" "Last-Translator: Tommi Nieminen \n" "Language-Team: Finnish \n" "Language: fi\n" @@ -17,7 +17,7 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "X-POT-Import-Date: 2012-12-01 22:21:44+0000\n" -"X-Generator: Lokalize 2.0\n" +"X-Generator: Lokalize 20.04.2\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #, kde-format @@ -30,286 +30,286 @@ msgid "Your emails" msgstr "translator@legisign.org" -#: difftextwindow.cpp:412 +#: difftextwindow.cpp:414 #, kde-format msgid "File %1: Line %2" msgstr "Tiedosto %1: rivi %2" -#: difftextwindow.cpp:414 +#: difftextwindow.cpp:416 #, kde-format msgid "File %1: Line not available" msgstr "Tiedosto %1: Rivi ei saatavilla" -#: difftextwindow.cpp:1780 +#: difftextwindow.cpp:1778 #, kde-format msgid "Encoding:" msgstr "Koodaus:" -#: difftextwindow.cpp:1782 mergeresultwindow.cpp:3138 optiondialog.cpp:818 +#: difftextwindow.cpp:1781 mergeresultwindow.cpp:3166 optiondialog.cpp:840 #, kde-format msgid "Line end style:" msgstr "Rivinlopetustapa:" -#: difftextwindow.cpp:1810 directorymergewindow.cpp:382 -#: directorymergewindow.cpp:433 directorymergewindow.cpp:524 -#: directorymergewindow.cpp:3058 directorymergewindow.cpp:3189 -#: directorymergewindow.cpp:3417 mergeresultwindow.cpp:942 -#: mergeresultwindow.cpp:944 mergeresultwindow.cpp:946 -#: mergeresultwindow.cpp:948 mergeresultwindow.cpp:1814 -#: mergeresultwindow.cpp:3170 mergeresultwindow.cpp:3177 optiondialog.cpp:962 -#: optiondialog.cpp:975 pdiff.cpp:833 pdiff.cpp:835 pdiff.cpp:837 pdiff.cpp:839 -#: pdiff.cpp:861 smalldialogs.cpp:124 smalldialogs.cpp:126 smalldialogs.cpp:127 -#: smalldialogs.cpp:130 +#: difftextwindow.cpp:1809 directorymergewindow.cpp:383 +#: directorymergewindow.cpp:434 directorymergewindow.cpp:525 +#: directorymergewindow.cpp:3072 directorymergewindow.cpp:3203 +#: directorymergewindow.cpp:3431 mergeresultwindow.cpp:970 +#: mergeresultwindow.cpp:972 mergeresultwindow.cpp:974 +#: mergeresultwindow.cpp:976 mergeresultwindow.cpp:1842 +#: mergeresultwindow.cpp:3198 mergeresultwindow.cpp:3205 optiondialog.cpp:1002 +#: optiondialog.cpp:1015 pdiff.cpp:823 pdiff.cpp:825 pdiff.cpp:827 +#: pdiff.cpp:829 pdiff.cpp:851 smalldialogs.cpp:131 smalldialogs.cpp:133 +#: smalldialogs.cpp:134 smalldialogs.cpp:137 #, kde-format msgid "A" msgstr "A" -#: difftextwindow.cpp:1810 directorymergewindow.cpp:384 -#: directorymergewindow.cpp:436 directorymergewindow.cpp:526 -#: directorymergewindow.cpp:3064 directorymergewindow.cpp:3190 -#: directorymergewindow.cpp:3418 mergeresultwindow.cpp:942 -#: mergeresultwindow.cpp:944 mergeresultwindow.cpp:950 -#: mergeresultwindow.cpp:952 mergeresultwindow.cpp:1816 -#: mergeresultwindow.cpp:3172 mergeresultwindow.cpp:3179 optiondialog.cpp:963 -#: optiondialog.cpp:976 pdiff.cpp:833 pdiff.cpp:835 pdiff.cpp:841 pdiff.cpp:843 -#: pdiff.cpp:863 smalldialogs.cpp:124 smalldialogs.cpp:125 smalldialogs.cpp:128 -#: smalldialogs.cpp:131 +#: difftextwindow.cpp:1809 directorymergewindow.cpp:385 +#: directorymergewindow.cpp:437 directorymergewindow.cpp:527 +#: directorymergewindow.cpp:3078 directorymergewindow.cpp:3204 +#: directorymergewindow.cpp:3432 mergeresultwindow.cpp:970 +#: mergeresultwindow.cpp:972 mergeresultwindow.cpp:978 +#: mergeresultwindow.cpp:980 mergeresultwindow.cpp:1844 +#: mergeresultwindow.cpp:3200 mergeresultwindow.cpp:3207 optiondialog.cpp:1003 +#: optiondialog.cpp:1016 pdiff.cpp:823 pdiff.cpp:825 pdiff.cpp:831 +#: pdiff.cpp:833 pdiff.cpp:853 smalldialogs.cpp:131 smalldialogs.cpp:132 +#: smalldialogs.cpp:135 smalldialogs.cpp:138 #, kde-format msgid "B" msgstr "B" -#: difftextwindow.cpp:1810 directorymergewindow.cpp:386 -#: directorymergewindow.cpp:439 directorymergewindow.cpp:528 -#: directorymergewindow.cpp:3070 directorymergewindow.cpp:3191 -#: directorymergewindow.cpp:3419 mergeresultwindow.cpp:946 -#: mergeresultwindow.cpp:948 mergeresultwindow.cpp:950 -#: mergeresultwindow.cpp:952 mergeresultwindow.cpp:1818 -#: mergeresultwindow.cpp:3174 mergeresultwindow.cpp:3181 optiondialog.cpp:977 -#: pdiff.cpp:837 pdiff.cpp:839 pdiff.cpp:841 pdiff.cpp:843 pdiff.cpp:865 -#: smalldialogs.cpp:125 smalldialogs.cpp:126 smalldialogs.cpp:129 -#: smalldialogs.cpp:132 +#: difftextwindow.cpp:1809 directorymergewindow.cpp:387 +#: directorymergewindow.cpp:440 directorymergewindow.cpp:529 +#: directorymergewindow.cpp:3084 directorymergewindow.cpp:3205 +#: directorymergewindow.cpp:3433 mergeresultwindow.cpp:974 +#: mergeresultwindow.cpp:976 mergeresultwindow.cpp:978 +#: mergeresultwindow.cpp:980 mergeresultwindow.cpp:1846 +#: mergeresultwindow.cpp:3202 mergeresultwindow.cpp:3209 optiondialog.cpp:1017 +#: pdiff.cpp:827 pdiff.cpp:829 pdiff.cpp:831 pdiff.cpp:833 pdiff.cpp:855 +#: smalldialogs.cpp:132 smalldialogs.cpp:133 smalldialogs.cpp:136 +#: smalldialogs.cpp:139 #, kde-format msgid "C" msgstr "C" -#: difftextwindow.cpp:1810 +#: difftextwindow.cpp:1809 #, kde-format msgid "A (Base)" msgstr "A (perusta)" -#: difftextwindow.cpp:1812 +#: difftextwindow.cpp:1811 #, kde-format msgid "Encoding: %1" msgstr "Koodaus: %1" -#: difftextwindow.cpp:1813 mergeresultwindow.cpp:3183 +#: difftextwindow.cpp:1812 mergeresultwindow.cpp:3211 #, kde-format msgid "Unix" msgstr "Unix" -#: difftextwindow.cpp:1813 mergeresultwindow.cpp:3184 +#: difftextwindow.cpp:1812 mergeresultwindow.cpp:3212 #, kde-format msgid "DOS" msgstr "DOS" -#: difftextwindow.cpp:1813 +#: difftextwindow.cpp:1812 #, kde-format msgid "Line end style: %1" msgstr "Rivinlopetustapa: %1" -#: difftextwindow.cpp:1835 kdiff3.cpp:873 +#: difftextwindow.cpp:1834 kdiff3.cpp:874 #, kde-format msgid "Top line" msgstr "Ylin rivi" -#: difftextwindow.cpp:1845 +#: difftextwindow.cpp:1843 #, kde-format msgid "End" msgstr "Loppu" -#: difftextwindow.cpp:1903 smalldialogs.cpp:235 +#: difftextwindow.cpp:1901 smalldialogs.cpp:245 #, kde-format msgid "Open File" msgstr "Avaa tiedosto" -#: difftextwindow.cpp:1951 optiondialog.cpp:387 +#: difftextwindow.cpp:1943 optiondialog.cpp:389 #, kde-format msgid "Unicode, 8 bit" msgstr "Unicode, 8-bittinen" -#: difftextwindow.cpp:1966 +#: difftextwindow.cpp:1958 #, kde-format msgid "Other" msgstr "Muu" -#: directorymergewindow.cpp:409 directorymergewindow.cpp:3424 +#: directorymergewindow.cpp:410 directorymergewindow.cpp:3438 #, kde-format msgid "Copy A to B" msgstr "Kopioi A B:hen" -#: directorymergewindow.cpp:412 directorymergewindow.cpp:3425 +#: directorymergewindow.cpp:413 directorymergewindow.cpp:3439 #, kde-format msgid "Copy B to A" msgstr "Kopioi B A:hen" -#: directorymergewindow.cpp:415 directorymergewindow.cpp:3426 +#: directorymergewindow.cpp:416 directorymergewindow.cpp:3440 #, kde-format msgid "Delete A" msgstr "Poista A" -#: directorymergewindow.cpp:418 directorymergewindow.cpp:3427 +#: directorymergewindow.cpp:419 directorymergewindow.cpp:3441 #, kde-format msgid "Delete B" msgstr "Poista B" -#: directorymergewindow.cpp:421 +#: directorymergewindow.cpp:422 #, kde-format msgid "Delete A & B" msgstr "Poista A ja B" -#: directorymergewindow.cpp:424 directorymergewindow.cpp:3429 +#: directorymergewindow.cpp:425 directorymergewindow.cpp:3443 #, kde-format msgid "Merge to A" msgstr "Yhdistä A:han" -#: directorymergewindow.cpp:427 directorymergewindow.cpp:3430 +#: directorymergewindow.cpp:428 directorymergewindow.cpp:3444 #, kde-format msgid "Merge to B" msgstr "Yhdistä B:hen" -#: directorymergewindow.cpp:430 +#: directorymergewindow.cpp:431 #, kde-format msgid "Merge to A & B" msgstr "Yhdistä A:han ja B:hen" -#: directorymergewindow.cpp:442 directorymergewindow.cpp:3421 +#: directorymergewindow.cpp:443 directorymergewindow.cpp:3435 #, kde-format msgid "Delete (if exists)" msgstr "Poista (jos olemassa)" -#: directorymergewindow.cpp:445 directorymergewindow.cpp:448 -#: directorymergewindow.cpp:3420 optiondialog.cpp:925 smalldialogs.cpp:113 +#: directorymergewindow.cpp:446 directorymergewindow.cpp:449 +#: directorymergewindow.cpp:3434 smalldialogs.cpp:120 #, kde-format msgid "Merge" msgstr "Yhdistä" -#: directorymergewindow.cpp:445 directorymergewindow.cpp:448 +#: directorymergewindow.cpp:446 directorymergewindow.cpp:449 #, kde-format msgid "Merge (manual)" msgstr "Yhdistä (käsin)" -#: directorymergewindow.cpp:451 +#: directorymergewindow.cpp:452 #, kde-format msgid "Error: Conflicting File Types" msgstr "Virhe: Tiedostotyypit ristiriidassa-" -#: directorymergewindow.cpp:454 +#: directorymergewindow.cpp:455 #, kde-format msgid "Error: Changed and Deleted" msgstr "Virhe: Muuttunut ja poistettu" -#: directorymergewindow.cpp:457 +#: directorymergewindow.cpp:458 #, kde-format msgid "Error: Dates are equal but files are not." msgstr "Virhe: Päiväykset yhtenevät mutta tiedostot eivät." -#: directorymergewindow.cpp:471 +#: directorymergewindow.cpp:472 #, kde-format msgid "Done" msgstr "Valmis" -#: directorymergewindow.cpp:473 +#: directorymergewindow.cpp:474 #, kde-format msgid "Error" msgstr "Virhe" -#: directorymergewindow.cpp:475 +#: directorymergewindow.cpp:476 #, kde-format msgid "Skipped." msgstr "Ohitettu." -#: directorymergewindow.cpp:477 +#: directorymergewindow.cpp:478 #, kde-format msgid "Not saved." msgstr "Ei tallennettu." -#: directorymergewindow.cpp:479 +#: directorymergewindow.cpp:480 #, kde-format msgid "In progress..." msgstr "Käynnissä…" # *** TARKISTA: Kun tietäisi kontekstin, olisi helpompi keksiä käännös! -#: directorymergewindow.cpp:481 +#: directorymergewindow.cpp:482 #, kde-format msgid "To do." msgstr "Tehtäviä." -#: directorymergewindow.cpp:522 +#: directorymergewindow.cpp:523 #, kde-format msgid "Name" msgstr "Nimi" -#: directorymergewindow.cpp:530 +#: directorymergewindow.cpp:531 #, kde-format msgid "Operation" msgstr "Toiminto" -#: directorymergewindow.cpp:532 +#: directorymergewindow.cpp:533 #, kde-format msgid "Status" msgstr "Tila" -#: directorymergewindow.cpp:534 +#: directorymergewindow.cpp:535 #, kde-format msgid "Unsolved" msgstr "Ratkaisematon" -#: directorymergewindow.cpp:536 +#: directorymergewindow.cpp:537 #, kde-format msgid "Solved" msgstr "Ratkaistu" -#: directorymergewindow.cpp:538 +#: directorymergewindow.cpp:539 #, kde-format msgid "Nonwhite" msgstr "Ei-tyhje" -#: directorymergewindow.cpp:540 +#: directorymergewindow.cpp:541 #, kde-format msgid "White" msgstr "Tyhje" -#: directorymergewindow.cpp:674 +#: directorymergewindow.cpp:676 #, kde-format msgid "Unable to compare non-normal file with normal file." msgstr "Epätavallista tiedostoa ei voi vertailla tavalliseen." -#: directorymergewindow.cpp:688 +#: directorymergewindow.cpp:690 #, kde-format msgid "Mix of links and normal files." msgstr "Sekoitus linkkejä ja tavallisia tiedostoja." -#: directorymergewindow.cpp:695 +#: directorymergewindow.cpp:697 #, kde-format msgid "Link: " msgstr "Linkki: " -#: directorymergewindow.cpp:704 +#: directorymergewindow.cpp:706 #, kde-format msgid "Size. " msgstr "Koko: " -#: directorymergewindow.cpp:718 directorymergewindow.cpp:728 +#: directorymergewindow.cpp:720 directorymergewindow.cpp:730 #, kde-format msgid "Date & Size: " msgstr "Päiväys ja koko: " -#: directorymergewindow.cpp:748 +#: directorymergewindow.cpp:751 #, kde-format msgid "Comparing file..." msgstr "Verrataan tiedostoa…" -#: directorymergewindow.cpp:801 +#: directorymergewindow.cpp:813 #, kde-format msgid "" "You are currently doing a directory merge. Are you sure, you want to abort " @@ -318,48 +318,48 @@ "Kansioita yhdistetään paraikaa. Haluatko varmasti keskeyttää yhdistämisen ja " "tutkia kansion uudelleen?" -#: directorymergewindow.cpp:802 kdiff3.cpp:698 kdiff3.cpp:708 kdiff3.cpp:720 -#: mergeresultwindow.cpp:372 pdiff.cpp:1033 pdiff.cpp:1910 pdiff.cpp:1920 +#: directorymergewindow.cpp:814 kdiff3.cpp:697 kdiff3.cpp:707 kdiff3.cpp:719 +#: mergeresultwindow.cpp:400 pdiff.cpp:1031 pdiff.cpp:1920 pdiff.cpp:1930 #, kde-format msgid "Warning" msgstr "Varoitus" -#: directorymergewindow.cpp:803 directorymergewindow.cpp:3393 +#: directorymergewindow.cpp:815 directorymergewindow.cpp:3407 #, kde-format msgid "Rescan" msgstr "Tutki uudelleen" -#: directorymergewindow.cpp:804 pdiff.cpp:1035 +#: directorymergewindow.cpp:816 pdiff.cpp:1033 #, kde-format msgid "Continue Merging" msgstr "Jatka yhdistämistä" -#: directorymergewindow.cpp:971 +#: directorymergewindow.cpp:984 #, kde-format msgid "Opening of directories failed:" msgstr "Kansioiden avaus epäonnistui:" -#: directorymergewindow.cpp:975 +#: directorymergewindow.cpp:988 #, kde-format msgid "Dir A \"%1\" does not exist or is not a directory.\n" msgstr "A-kansiota ”%1” ei ole olemassa tai se ei ole kansio.\n" -#: directorymergewindow.cpp:980 +#: directorymergewindow.cpp:993 #, kde-format msgid "Dir B \"%1\" does not exist or is not a directory.\n" msgstr "B-kansiota ”%1” ei ole olemassa tai se ei ole kansio.\n" -#: directorymergewindow.cpp:985 +#: directorymergewindow.cpp:998 #, kde-format msgid "Dir C \"%1\" does not exist or is not a directory.\n" msgstr "C-kansiota ”%1” ei ole olemassa tai se ei ole kansio.\n" -#: directorymergewindow.cpp:988 +#: directorymergewindow.cpp:1001 #, kde-format msgid "Directory Open Error" msgstr "Kansion avausvirhe" -#: directorymergewindow.cpp:996 +#: directorymergewindow.cpp:1009 #, kde-format msgid "" "The destination directory must not be the same as A or B when three " @@ -369,49 +369,49 @@ "Kohdekansio ei saa olla sama kuin A tai B, kun kolmea kansiota yhdistetään.\n" "Tarkista vielä ennen kuin jatkat." -#: directorymergewindow.cpp:998 +#: directorymergewindow.cpp:1011 #, kde-format msgid "Parameter Warning" msgstr "Parametrivaroitus" -#: directorymergewindow.cpp:1003 +#: directorymergewindow.cpp:1016 #, kde-format msgid "Scanning directories..." msgstr "Tutkitaan kansioita…" -#: directorymergewindow.cpp:1029 +#: directorymergewindow.cpp:1042 #, kde-format msgid "Reading Directory A" msgstr "Luetaan A-kansiota" -#: directorymergewindow.cpp:1038 +#: directorymergewindow.cpp:1051 #, kde-format msgid "Reading Directory B" msgstr "Luetaan B-kansiota" -#: directorymergewindow.cpp:1048 +#: directorymergewindow.cpp:1061 #, kde-format msgid "Reading Directory C" msgstr "Luetaan C-kansiota" -#: directorymergewindow.cpp:1064 +#: directorymergewindow.cpp:1077 #, kde-format msgid "Some subdirectories were not readable in" msgstr "Jotkin alikansiot eivät ole luettavissa kansiossa" -#: directorymergewindow.cpp:1069 +#: directorymergewindow.cpp:1082 #, kde-format msgid "Check the permissions of the subdirectories." msgstr "Tarkista alikansioiden oikeudet." -#: directorymergewindow.cpp:1106 kdiff3.cpp:666 kdiff3.cpp:753 kdiff3.cpp:777 -#: kdiff3.cpp:1065 kdiff3.cpp:1086 pdiff.cpp:1116 pdiff.cpp:1170 pdiff.cpp:1218 -#: pdiff.cpp:1234 pdiff.cpp:1277 pdiff.cpp:1301 +#: directorymergewindow.cpp:1119 kdiff3.cpp:665 kdiff3.cpp:752 kdiff3.cpp:776 +#: kdiff3.cpp:1072 kdiff3.cpp:1093 pdiff.cpp:1115 pdiff.cpp:1178 pdiff.cpp:1228 +#: pdiff.cpp:1244 pdiff.cpp:1287 pdiff.cpp:1311 #, kde-format msgid "Ready." msgstr "Valmis." -#: directorymergewindow.cpp:1121 +#: directorymergewindow.cpp:1134 #, kde-format msgid "" "Directory Comparison Status\n" @@ -426,22 +426,22 @@ "Yhteneviä tiedostoja: %2\n" "Eroavia tiedostoja: %3" -#: directorymergewindow.cpp:1128 +#: directorymergewindow.cpp:1141 #, kde-format msgid "Number of manual merges: %1" msgstr "Käyttäjän tekemiä yhdistämisiä: %1" -#: directorymergewindow.cpp:1394 +#: directorymergewindow.cpp:1407 #, kde-format msgid "This affects all merge operations." msgstr "Tämä vaikuttaa kaikkiin yhdistämistoimintoihin." -#: directorymergewindow.cpp:1395 +#: directorymergewindow.cpp:1408 #, kde-format msgid "Changing All Merge Operations" msgstr "Muutetaan kaikkia yhdistämistoimintoja" -#: directorymergewindow.cpp:1695 +#: directorymergewindow.cpp:1708 #, kde-format msgid "" "Processing %1 / %2\n" @@ -450,44 +450,44 @@ "Käsitellään: %1 / %2\n" "%3" -#: directorymergewindow.cpp:1738 directorymergewindow.cpp:1742 +#: directorymergewindow.cpp:1751 directorymergewindow.cpp:1755 #, kde-format msgid "Some files could not be processed." msgstr "Joitakin tiedostoja ei voitu käsitellä." -#: directorymergewindow.cpp:2222 directorymergewindow.cpp:2247 -#: directorymergewindow.cpp:2271 +#: directorymergewindow.cpp:2235 directorymergewindow.cpp:2260 +#: directorymergewindow.cpp:2285 #, kde-format msgid "This operation is currently not possible." msgstr "Tämä toiminto ei ole nyt mahdollinen." -#: directorymergewindow.cpp:2222 directorymergewindow.cpp:2247 -#: directorymergewindow.cpp:2271 directorymergewindow.cpp:2552 +#: directorymergewindow.cpp:2235 directorymergewindow.cpp:2260 +#: directorymergewindow.cpp:2285 directorymergewindow.cpp:2565 #, kde-format msgid "Operation Not Possible" msgstr "Toiminto ei mahdollinen" -#: directorymergewindow.cpp:2318 +#: directorymergewindow.cpp:2332 #, kde-format msgid "An error occurred while copying." msgstr "Kopioitaessa sattui virhe." -#: directorymergewindow.cpp:2319 directorymergewindow.cpp:2759 +#: directorymergewindow.cpp:2333 directorymergewindow.cpp:2772 #, kde-format msgid "Merge Error" msgstr "Yhdistämisvirhe" -#: directorymergewindow.cpp:2396 +#: directorymergewindow.cpp:2410 #, kde-format msgid "Unknown merge operation. (This must never happen!)" msgstr "Tuntematon yhdistämistoiminto. (Näin ei koskaan pitäisi käydä!)" -#: directorymergewindow.cpp:2441 +#: directorymergewindow.cpp:2455 #, kde-format msgid "Unknown merge operation." msgstr "Tuntematon yhdistämistoiminto." -#: directorymergewindow.cpp:2454 +#: directorymergewindow.cpp:2468 #, kde-format msgid "" "The merge is about to begin.\n" @@ -507,29 +507,29 @@ "Huomaa, että ohjelma on yhä beetavaiheessa eikä MINKÄÄNLAISTA TAKUUTA " "anneta! Tee varmuuskopiot tärkeistä tiedoistasi!" -#: directorymergewindow.cpp:2459 +#: directorymergewindow.cpp:2473 #, kde-format msgid "Starting Merge" msgstr "Aloitetaan yhdistäminen" -#: directorymergewindow.cpp:2460 +#: directorymergewindow.cpp:2474 #, kde-format msgid "Do It" msgstr "Toteuta" -#: directorymergewindow.cpp:2461 +#: directorymergewindow.cpp:2475 #, kde-format msgid "Simulate It" msgstr "Simuloi" -#: directorymergewindow.cpp:2487 +#: directorymergewindow.cpp:2501 #, kde-format msgid "" "The highlighted item has a different type in the different directories. " "Select what to do." msgstr "Korostettu kohde on eri tyyppiä eri kansioissa. Valitse, mitä tehdään." -#: directorymergewindow.cpp:2491 +#: directorymergewindow.cpp:2505 #, kde-format msgid "" "The modification dates of the file are equal but the files are not. Select " @@ -538,7 +538,7 @@ "Tiedostojen muutospäivämäärät ovat samat mutta tiedostot eivät. Valitse, " "mitä tehdään." -#: directorymergewindow.cpp:2495 +#: directorymergewindow.cpp:2509 #, kde-format msgid "" "The highlighted item was changed in one directory and deleted in the other. " @@ -547,7 +547,7 @@ "Korostettua kohdetta on muutettu toisessa kansiossa ja se on poistettu " "toisesta. Valitse, mitä tehdään." -#: directorymergewindow.cpp:2552 +#: directorymergewindow.cpp:2565 #, kde-format msgid "" "This operation is currently not possible because directory merge is " @@ -556,7 +556,7 @@ "Tämä toiminto ei juuri nyt ole mahdollinen, koska kansioita yhdistetään " "paraikaa." -#: directorymergewindow.cpp:2609 +#: directorymergewindow.cpp:2622 #, kde-format msgid "" "There was an error in the last step.\n" @@ -566,32 +566,32 @@ "Viime vaiheessa sattui virhe.\n" "Haluatko jatkaa kohteesta, joka aiheutti virheen, vai ohittaa tämän kohteen?" -#: directorymergewindow.cpp:2611 +#: directorymergewindow.cpp:2624 #, kde-format msgid "Continue merge after an error" msgstr "Jatka yhdistämistä virheen jälkeen" -#: directorymergewindow.cpp:2612 +#: directorymergewindow.cpp:2625 #, kde-format msgid "Continue With Last Item" msgstr "Jatka viimeisimmästä kohteesta" -#: directorymergewindow.cpp:2613 +#: directorymergewindow.cpp:2626 #, kde-format msgid "Skip Item" msgstr "Ohita kohde" -#: directorymergewindow.cpp:2709 +#: directorymergewindow.cpp:2722 #, kde-format msgid "Merge operation complete." msgstr "Yhdistämistoiminto valmis." -#: directorymergewindow.cpp:2709 directorymergewindow.cpp:2712 +#: directorymergewindow.cpp:2722 directorymergewindow.cpp:2725 #, kde-format msgid "Merge Complete" msgstr "Yhdistäminen valmis" -#: directorymergewindow.cpp:2722 +#: directorymergewindow.cpp:2735 #, kde-format msgid "" "Simulated merge complete: Check if you agree with the proposed operations." @@ -599,48 +599,48 @@ "Simuloitu yhdistäminen valmis: Tarkista, että olet samaa mieltä ehdotettujen " "toimintojen kanssa." -#: directorymergewindow.cpp:2758 +#: directorymergewindow.cpp:2771 #, kde-format msgid "An error occurred. Press OK to see detailed information." msgstr "Sattui virhe. Näet lisätietoja painamalla OK." -#: directorymergewindow.cpp:2791 +#: directorymergewindow.cpp:2804 #, kde-format msgid "Error: While deleting %1: Creating backup failed." msgstr "Virhe: Poistettaessa kohdetta %1: Varmuuskopion luonti epäonnistui." -#: directorymergewindow.cpp:2798 +#: directorymergewindow.cpp:2811 #, kde-format msgid "delete directory recursively( %1 )" msgstr "poista kansio alikansioineen (%1)" -#: directorymergewindow.cpp:2800 +#: directorymergewindow.cpp:2813 #, kde-format msgid "delete( %1 )" msgstr "poista (%1)" -#: directorymergewindow.cpp:2815 +#: directorymergewindow.cpp:2828 #, kde-format msgid "Error: delete dir operation failed while trying to read the directory." msgstr "" "Virhe: kansionpoistotoimenpide epäonnistui yritettäessä lukea kansiota." -#: directorymergewindow.cpp:2834 +#: directorymergewindow.cpp:2847 #, kde-format msgid "Error: rmdir( %1 ) operation failed." msgstr "Virhe: rmdir-toimenpide (%1) epäonnistui." -#: directorymergewindow.cpp:2844 +#: directorymergewindow.cpp:2857 #, kde-format msgid "Error: delete operation failed." msgstr "Virhe: poistotoimenpide epäonnistui." -#: directorymergewindow.cpp:2870 +#: directorymergewindow.cpp:2884 #, kde-format msgid "manual merge( %1, %2, %3 -> %4)" msgstr "yhdistäminen itse (%1, %2, %3 -> %4)" -#: directorymergewindow.cpp:2873 +#: directorymergewindow.cpp:2887 #, kde-format msgid "" " Note: After a manual merge the user should continue by pressing F7." @@ -648,183 +648,183 @@ " Huomaa: Itse tehdyn yhdistämisen jälkeen käyttäjän tulisi jatkaa " "painamalla F7." -#: directorymergewindow.cpp:2900 +#: directorymergewindow.cpp:2914 #, kde-format msgid "Error: copy( %1 -> %2 ) failed.Deleting existing destination failed." msgstr "" "Virhe: kopiointi %1 -> %2 epäonnistui. Olemassa olevaa kohdetta ei voida " "poistaa." -#: directorymergewindow.cpp:2909 +#: directorymergewindow.cpp:2923 #, kde-format msgid "copyLink( %1 -> %2 )" msgstr "kopioi linkki %1 -> %2" -#: directorymergewindow.cpp:2918 +#: directorymergewindow.cpp:2932 #, kde-format msgid "Error: copyLink failed: Remote links are not yet supported." msgstr "Virhe: linkin kopiointi epäonnistui. Etälinkkejä ei vielä tueta." -#: directorymergewindow.cpp:2928 +#: directorymergewindow.cpp:2942 #, kde-format msgid "Error: copyLink failed." msgstr "Virhe: linkin kopiointi epäonnistui." -#: directorymergewindow.cpp:2953 +#: directorymergewindow.cpp:2967 #, kde-format msgid "copy( %1 -> %2 )" msgstr "kopioi %1 -> %2" -#: directorymergewindow.cpp:2979 +#: directorymergewindow.cpp:2993 #, kde-format msgid "Error during rename( %1 -> %2 ): Cannot delete existing destination." msgstr "" "Virhe muutettaessa nimeä %1 -> %2: Olemassa olevaa kohdetta ei voida poistaa." -#: directorymergewindow.cpp:2986 +#: directorymergewindow.cpp:3000 #, kde-format msgid "rename( %1 -> %2 )" msgstr "muuta nimeä %1 -> %2" -#: directorymergewindow.cpp:2995 +#: directorymergewindow.cpp:3009 #, kde-format msgid "Error: Rename failed." msgstr "Virhe: Nimen muuttaminen epäonnistui." -#: directorymergewindow.cpp:3013 +#: directorymergewindow.cpp:3027 #, kde-format msgid "Error during makeDir of %1. Cannot delete existing file." msgstr "" "Virhe komennossa luotaessa kansiota %1. Olemassa olevaa tiedostoa ei voida " "poistaa." -#: directorymergewindow.cpp:3030 +#: directorymergewindow.cpp:3044 #, kde-format msgid "makeDir( %1 )" msgstr "makeDir( %1 )" -#: directorymergewindow.cpp:3040 +#: directorymergewindow.cpp:3054 #, kde-format msgid "Error while creating directory." msgstr "Virhe luotaessa kansiota." -#: directorymergewindow.cpp:3076 directorymergewindow.cpp:3195 +#: directorymergewindow.cpp:3090 directorymergewindow.cpp:3209 #, kde-format msgid "Dest" msgstr "Kohde" -#: directorymergewindow.cpp:3084 directorymergewindow.cpp:3113 +#: directorymergewindow.cpp:3098 directorymergewindow.cpp:3127 #, kde-format msgid "Dir" msgstr "Kansio" -#: directorymergewindow.cpp:3084 +#: directorymergewindow.cpp:3098 #, kde-format msgid "Type" msgstr "Tyyppi" -#: directorymergewindow.cpp:3084 +#: directorymergewindow.cpp:3098 #, kde-format msgid "Size" msgstr "Koko" -#: directorymergewindow.cpp:3085 +#: directorymergewindow.cpp:3099 #, kde-format msgid "Attr" msgstr "Määr" -#: directorymergewindow.cpp:3085 +#: directorymergewindow.cpp:3099 #, kde-format msgid "Last Modification" msgstr "Viim. muutos" -#: directorymergewindow.cpp:3085 +#: directorymergewindow.cpp:3099 #, kde-format msgid "Link-Destination" msgstr "Linkin kohde" -#: directorymergewindow.cpp:3113 +#: directorymergewindow.cpp:3127 #, kde-format msgid "File" msgstr "Tiedosto" -#: directorymergewindow.cpp:3113 +#: directorymergewindow.cpp:3127 #, kde-format msgid "-Link" msgstr "-linkki" -#: directorymergewindow.cpp:3119 +#: directorymergewindow.cpp:3133 #, kde-format msgid "not available" msgstr "ei saatavilla" -#: directorymergewindow.cpp:3137 +#: directorymergewindow.cpp:3151 #, kde-format msgid "A (Dest): " msgstr "A (kohde): " -#: directorymergewindow.cpp:3141 +#: directorymergewindow.cpp:3155 #, kde-format msgid "A: " msgstr "A: " -#: directorymergewindow.cpp:3141 +#: directorymergewindow.cpp:3155 #, kde-format msgid "A (Base): " msgstr "A (perusta): " -#: directorymergewindow.cpp:3147 +#: directorymergewindow.cpp:3161 #, kde-format msgid "B (Dest): " msgstr "B (kohde): " -#: directorymergewindow.cpp:3151 +#: directorymergewindow.cpp:3165 #, kde-format msgid "B: " msgstr "B: " -#: directorymergewindow.cpp:3156 +#: directorymergewindow.cpp:3170 #, kde-format msgid "C (Dest): " msgstr "C (kohde): " -#: directorymergewindow.cpp:3160 +#: directorymergewindow.cpp:3174 #, kde-format msgid "C: " msgstr "C: " -#: directorymergewindow.cpp:3163 +#: directorymergewindow.cpp:3177 #, kde-format msgid "Dest: " msgstr "Kohde: " #. i18n("Saving Directory Merge State ...")); -#: directorymergewindow.cpp:3238 +#: directorymergewindow.cpp:3252 #, kde-format msgid "Save Directory Merge State As..." msgstr "Tallenna kansioiden yhdistämisen tila nimellä…" -#: directorymergewindow.cpp:3387 +#: directorymergewindow.cpp:3401 #, kde-format msgid "Start/Continue Directory Merge" msgstr "Aloita kansioiden yhdistäminen tai jatka sitä" -#: directorymergewindow.cpp:3388 +#: directorymergewindow.cpp:3402 #, kde-format msgid "Run Operation for Current Item" msgstr "Käynnistä toimenpide nykyiselle tietueelle" -#: directorymergewindow.cpp:3389 +#: directorymergewindow.cpp:3403 #, kde-format msgid "Compare Selected File" msgstr "Vertaa valittua tiedostoa" -#: directorymergewindow.cpp:3390 +#: directorymergewindow.cpp:3404 #, kde-format msgid "Merge Current File" msgstr "Yhdistä nykyinen tiedosto" -#: directorymergewindow.cpp:3390 +#: directorymergewindow.cpp:3404 #, kde-format msgid "" "Merge\n" @@ -834,51 +834,51 @@ "tiedosto" # *** TARKISTA: Vai onko ympäristö sellainen, että jokin *toimenpide* voi kohdistua alikansioihinkin? -#: directorymergewindow.cpp:3391 +#: directorymergewindow.cpp:3405 #, kde-format msgid "Fold All Subdirs" msgstr "Piilota alikansiot" -#: directorymergewindow.cpp:3392 +#: directorymergewindow.cpp:3406 #, kde-format msgid "Unfold All Subdirs" msgstr "Näytä alikansiot" #. i18n("Save Directory Merge State ..."), 0, this, &DirectoryMergeWindow::slotSaveMergeState, ac, "dir_save_merge_state"); #. i18n("Load Directory Merge State ..."), 0, this, &DirectoryMergeWindow::slotLoadMergeState, ac, "dir_load_merge_state"); -#: directorymergewindow.cpp:3396 +#: directorymergewindow.cpp:3410 #, kde-format msgid "Choose A for All Items" msgstr "Valitse A kaikkiin kohteisiin" -#: directorymergewindow.cpp:3397 +#: directorymergewindow.cpp:3411 #, kde-format msgid "Choose B for All Items" msgstr "Valitse B kaikkiin kohteisiin" -#: directorymergewindow.cpp:3398 +#: directorymergewindow.cpp:3412 #, kde-format msgid "Choose C for All Items" msgstr "Valitse C kaikkiin kohteisiin" -#: directorymergewindow.cpp:3399 +#: directorymergewindow.cpp:3413 #, kde-format msgid "Auto-Choose Operation for All Items" msgstr "Valitse toiminto automaattisesti kaikkiin kohteisiin" -#: directorymergewindow.cpp:3400 +#: directorymergewindow.cpp:3414 #, kde-format msgid "No Operation for All Items" msgstr "Ei toimintoa kaikkiin kohteisiin" #. i18n("Synchronize Directories"), 0, this, &DirectoryMergeWindow::slotSynchronizeDirectories, ac, "dir_synchronize_directories"); #. d->m_pDirChooseNewerFiles = GuiUtils::createAction< KToggleAction >(i18n("Copy Newer Files Instead of Merging"), 0, this, &DirectoryMergeWindow::slotChooseNewerFiles, ac, "dir_choose_newer_files"); -#: directorymergewindow.cpp:3405 +#: directorymergewindow.cpp:3419 #, kde-format msgid "Show Identical Files" msgstr "Näytä identtiset tiedostot" -#: directorymergewindow.cpp:3405 +#: directorymergewindow.cpp:3419 #, kde-format msgid "" "Identical\n" @@ -887,17 +887,17 @@ "Identtiset\n" "tiedostot" -#: directorymergewindow.cpp:3406 +#: directorymergewindow.cpp:3420 #, kde-format msgid "Show Different Files" msgstr "Näytä eroavat tiedostot" -#: directorymergewindow.cpp:3407 +#: directorymergewindow.cpp:3421 #, kde-format msgid "Show Files only in A" msgstr "Näytä vain A:ssa olevat tiedostot" -#: directorymergewindow.cpp:3407 +#: directorymergewindow.cpp:3421 #, kde-format msgid "" "Files\n" @@ -906,12 +906,12 @@ "Tiedostot\n" "vain A:ssa" -#: directorymergewindow.cpp:3408 +#: directorymergewindow.cpp:3422 #, kde-format msgid "Show Files only in B" msgstr "Näytä vain B:ssä olevat tiedostot" -#: directorymergewindow.cpp:3408 +#: directorymergewindow.cpp:3422 #, kde-format msgid "" "Files\n" @@ -920,12 +920,12 @@ "Tiedostot\n" "vain B:ssä" -#: directorymergewindow.cpp:3409 +#: directorymergewindow.cpp:3423 #, kde-format msgid "Show Files only in C" msgstr "Näytä vain C:ssä olevat tiedostot" -#: directorymergewindow.cpp:3409 +#: directorymergewindow.cpp:3423 #, kde-format msgid "" "Files\n" @@ -935,52 +935,57 @@ "vain C:ssä" # Mahdoton sanoa, verrataanko vai valitaanko eksplisiittisesti :/ -#: directorymergewindow.cpp:3413 +#: directorymergewindow.cpp:3427 #, kde-format msgid "Compare Explicitly Selected Files" msgstr "Vertaa eksplisiittisesti valittuja tiedostoja" -#: directorymergewindow.cpp:3414 +#: directorymergewindow.cpp:3428 #, kde-format msgid "Merge Explicitly Selected Files" msgstr "Yhdistä eksplisiittisesti valitut tiedostot" -#: directorymergewindow.cpp:3416 directorymergewindow.cpp:3423 +#: directorymergewindow.cpp:3430 directorymergewindow.cpp:3437 #, kde-format msgid "Do Nothing" msgstr "Älä tee mitään" -#: directorymergewindow.cpp:3428 +#: directorymergewindow.cpp:3442 #, kde-format msgid "Delete A && B" msgstr "Poista A ja B" -#: directorymergewindow.cpp:3431 +#: directorymergewindow.cpp:3445 #, kde-format msgid "Merge to A && B" msgstr "Yhdistä A:han ja B:hen" -#: fileaccess.cpp:462 SourceData.cpp:493 +#: fileaccess.cpp:301 +#, kde-format +msgid "Unable to determine full url. No parent specified." +msgstr "Täyttä verkko-osoitetta ei voitu määrittää. Yläkansiota ei määritetty." + +#: fileaccess.cpp:482 SourceData.cpp:506 #, kde-format msgid "Failed to read file: %1" msgstr "Tiedoston luku epäonnistui: %1" -#: fileaccess.cpp:587 +#: fileaccess.cpp:624 #, kde-format msgid "Creating temp copy of %1 failed." msgstr "Väliaikaiskopion luominen tiedostosta %1 epäonnistui." -#: fileaccess.cpp:595 fileaccess.cpp:600 +#: fileaccess.cpp:632 fileaccess.cpp:637 #, kde-format msgid "Opening %1 failed. %2" msgstr "Tiedoston %1 avaus epäonnistui. %2" -#: fileaccess.cpp:619 fileaccess.cpp:627 +#: fileaccess.cpp:656 fileaccess.cpp:664 #, kde-format msgid "Error reading from %1. %2" msgstr "Virhe luettaessa tiedostosta %1. %2" -#: fileaccess.cpp:751 +#: fileaccess.cpp:788 #, kde-format msgid "" "While trying to make a backup, deleting an older backup failed.\n" @@ -990,7 +995,7 @@ "epäonnistui.\n" "Tiedostonimi: %1" -#: fileaccess.cpp:758 +#: fileaccess.cpp:795 #, kde-format msgid "" "While trying to make a backup, renaming failed.\n" @@ -999,177 +1004,177 @@ "Nimen muuttaminen epäonnistui yritettäessä tehdä varmuuskopiota.\n" "Tiedostonimet: %1 → %2" -#: fileaccess.cpp:828 +#: fileaccess.cpp:865 #, kde-format msgid "Getting file status: %1" msgstr "Noudetaan tiedoston tilaa: %1" -#: fileaccess.cpp:869 +#: fileaccess.cpp:906 #, kde-format msgid "Reading file: %1" msgstr "Luetaan tiedostoa: %1" -#: fileaccess.cpp:907 +#: fileaccess.cpp:944 #, kde-format msgid "Writing file: %1" msgstr "Kirjoitetaan tiedostoa: %1" -#: fileaccess.cpp:940 +#: fileaccess.cpp:977 #, kde-format msgid "Out of memory" msgstr "Muisti lopussa" -#: fileaccess.cpp:976 +#: fileaccess.cpp:1013 #, kde-format msgid "Making directory: %1" msgstr "Tehdään kansiota: %1" -#: fileaccess.cpp:997 +#: fileaccess.cpp:1034 #, kde-format msgid "Removing directory: %1" msgstr "Poistetaan kansiota: %1" -#: fileaccess.cpp:1012 +#: fileaccess.cpp:1049 #, kde-format msgid "Removing file: %1" msgstr "Poistetaan tiedostoa: %1" -#: fileaccess.cpp:1028 +#: fileaccess.cpp:1065 #, kde-format msgid "Creating symbolic link: %1 -> %2" msgstr "Luodaan symbolista linkkiä: %1 -> %2" -#: fileaccess.cpp:1052 +#: fileaccess.cpp:1089 #, kde-format msgid "Renaming file: %1 -> %2" msgstr "Muutetaan tiedoston nimeä: %1 -> %2" -#: fileaccess.cpp:1086 +#: fileaccess.cpp:1123 #, kde-format msgid "Copying file: %1 -> %2" msgstr "Kopioidaan tiedostoa: %1 -> %2" -#: fileaccess.cpp:1108 +#: fileaccess.cpp:1145 #, kde-format msgid "Reading directory: %1" msgstr "Luetaan kansiota: %1" -#: fileaccess.cpp:1162 +#: fileaccess.cpp:1202 #, kde-format msgid "Listing directory: %1" msgstr "Luetellaan kansiota: %1" -#: kdiff3.cpp:181 +#: kdiff3.cpp:182 #, kde-format msgid "Current Configuration:" msgstr "Nykyiset asetukset:" -#: kdiff3.cpp:186 +#: kdiff3.cpp:187 #, kde-format msgid "Config Option Error:" msgstr "Asetusvirhe:" -#: kdiff3.cpp:240 +#: kdiff3.cpp:246 #, kde-format msgid "Option --auto used, but no output file specified." msgstr "--auto-valitsinta käytetty antamatta tulostiedostoa." -#: kdiff3.cpp:416 +#: kdiff3.cpp:405 #, kde-format msgid "Option --auto ignored for directory comparison." msgstr "--auto-valitsin ohitettu kansiovertailussa." -#: kdiff3.cpp:460 +#: kdiff3.cpp:449 #, kde-format msgid "Saving failed." msgstr "Tallennus epäonnistui." -#: kdiff3.cpp:496 pdiff.cpp:1098 +#: kdiff3.cpp:494 pdiff.cpp:1096 #, kde-format msgid "Opening of these files failed:" msgstr "Näiden tiedostojen avaus epäonnistui:" -#: kdiff3.cpp:505 +#: kdiff3.cpp:503 pdiff.cpp:1105 #, kde-format -msgid "File Open Error" +msgid "File open error" msgstr "Tiedoston avausvirhe" -#: kdiff3.cpp:533 +#: kdiff3.cpp:532 #, kde-format msgid "Opens documents for comparison..." msgstr "Avaa tiedostot vertailtavaksi…" -#: kdiff3.cpp:535 +#: kdiff3.cpp:534 #, kde-format msgid "Reload" msgstr "Lataa uudelleen" -#: kdiff3.cpp:538 +#: kdiff3.cpp:537 #, kde-format msgid "Saves the merge result. All conflicts must be solved!" msgstr "Tallentaa yhdistämisen tuloksen. Kaikki ristiriidat on ratkaistava!" -#: kdiff3.cpp:540 +#: kdiff3.cpp:539 #, kde-format msgid "Saves the current document as..." msgstr "Tallentaa nykyisen tiedoston toisella nimellä" -#: kdiff3.cpp:543 +#: kdiff3.cpp:542 #, kde-format msgid "Print the differences" msgstr "Tulostaa erot" -#: kdiff3.cpp:546 +#: kdiff3.cpp:545 #, kde-format msgid "Quits the application" msgstr "Lopettaa ohjelman" -#: kdiff3.cpp:549 +#: kdiff3.cpp:548 #, kde-format msgid "Cuts the selected section and puts it to the clipboard" msgstr "Leikkaa valitun alueen ja vie sen leikepöydälle" -#: kdiff3.cpp:552 +#: kdiff3.cpp:551 #, kde-format msgid "Copies the selected section to the clipboard" msgstr "Kopioi valitun alueen leikepöydälle" -#: kdiff3.cpp:554 +#: kdiff3.cpp:553 #, kde-format msgid "Pastes the clipboard contents to current position" msgstr "Liittää leikepöydän sisällön nykyiseen sijaintiin" -#: kdiff3.cpp:557 +#: kdiff3.cpp:556 #, kde-format msgid "Select everything in current window" msgstr "Valitsee kaiken nykyisestä ikkunasta" -#: kdiff3.cpp:560 +#: kdiff3.cpp:559 #, kde-format msgid "Search for a string" msgstr "Etsi merkkijonoa" -#: kdiff3.cpp:562 +#: kdiff3.cpp:561 #, kde-format msgid "Search again for the string" msgstr "Etsi merkkijonoa uudelleen" -#: kdiff3.cpp:567 +#: kdiff3.cpp:566 #, kde-format msgid "Enables/disables the statusbar" msgstr "Näyttää tai piilottaa tilarivin" -#: kdiff3.cpp:571 +#: kdiff3.cpp:570 #, kde-format msgid "Configure KDiff3..." msgstr "KDiff3:n asetukset…" -#: kdiff3.cpp:590 +#: kdiff3.cpp:589 #, kde-format msgid "Go to Current Delta" msgstr "Siirry nykyiseen muutokseen" -#: kdiff3.cpp:590 +#: kdiff3.cpp:589 #, kde-format msgid "" "Current\n" @@ -1178,12 +1183,12 @@ "Nykyinen\n" "muutos" -#: kdiff3.cpp:592 +#: kdiff3.cpp:591 #, kde-format msgid "Go to First Delta" msgstr "Siirry ensimmäiseen muutokseen" -#: kdiff3.cpp:592 +#: kdiff3.cpp:591 #, kde-format msgid "" "First\n" @@ -1192,12 +1197,12 @@ "Ensimmäinen\n" "muutos" -#: kdiff3.cpp:594 +#: kdiff3.cpp:593 #, kde-format msgid "Go to Last Delta" msgstr "Siirry viimeiseen muutokseen" -#: kdiff3.cpp:594 +#: kdiff3.cpp:593 #, kde-format msgid "" "Last\n" @@ -1206,12 +1211,12 @@ "Viimeisin\n" "delta" -#: kdiff3.cpp:596 +#: kdiff3.cpp:595 #, kde-format msgid "(Skips white space differences when \"Show White Space\" is disabled.)" msgstr "(Ohittaa tyhjemerkkierot, kun ”Näytä tyhjemerkit” on poissa käytöstä.)" -#: kdiff3.cpp:597 +#: kdiff3.cpp:596 #, kde-format msgid "" "(Does not skip white space differences even when \"Show White Space\" is " @@ -1220,12 +1225,12 @@ "(Ei ohita tyhjemerkkieroja silloinkaan, kun ”Näytä tyhjemerkit” on poissa " "käytöstä.)" -#: kdiff3.cpp:598 +#: kdiff3.cpp:597 #, kde-format msgid "Go to Previous Delta" msgstr "Siirry edelliseen muutokseen" -#: kdiff3.cpp:598 +#: kdiff3.cpp:597 #, kde-format msgid "" "Prev\n" @@ -1234,12 +1239,12 @@ "Edellinen\n" "muutos" -#: kdiff3.cpp:600 +#: kdiff3.cpp:599 #, kde-format msgid "Go to Next Delta" msgstr "Siirry seuraavaan muutokseen" -#: kdiff3.cpp:600 +#: kdiff3.cpp:599 #, kde-format msgid "" "Next\n" @@ -1248,12 +1253,12 @@ "Seuraava\n" "muutos" -#: kdiff3.cpp:602 +#: kdiff3.cpp:601 #, kde-format msgid "Go to Previous Conflict" msgstr "Siirry edelliseen ristiriitaan" -#: kdiff3.cpp:602 +#: kdiff3.cpp:601 #, kde-format msgid "" "Prev\n" @@ -1262,12 +1267,12 @@ "Edellinen\n" "ristiriita" -#: kdiff3.cpp:604 +#: kdiff3.cpp:603 #, kde-format msgid "Go to Next Conflict" msgstr "Siirry seuraavaan ristiriitaan" -#: kdiff3.cpp:604 +#: kdiff3.cpp:603 #, kde-format msgid "" "Next\n" @@ -1276,12 +1281,12 @@ "Seuraava\n" "ristiriita" -#: kdiff3.cpp:606 +#: kdiff3.cpp:605 #, kde-format msgid "Go to Previous Unsolved Conflict" msgstr "Siirry edelliseen ratkaisemattomaan ristiriitaan" -#: kdiff3.cpp:606 +#: kdiff3.cpp:605 #, kde-format msgid "" "Prev\n" @@ -1290,12 +1295,12 @@ "Edellinen\n" "ratkaisematon" -#: kdiff3.cpp:608 +#: kdiff3.cpp:607 #, kde-format msgid "Go to Next Unsolved Conflict" msgstr "Siirry seuraavaan ratkaisemattomaan ristiriitaan" -#: kdiff3.cpp:608 +#: kdiff3.cpp:607 #, kde-format msgid "" "Next\n" @@ -1304,12 +1309,12 @@ "Seuraava\n" "ratkaisematon" -#: kdiff3.cpp:610 +#: kdiff3.cpp:609 #, kde-format msgid "Select Line(s) From A" msgstr "Valitse rivejä A:sta" -#: kdiff3.cpp:610 +#: kdiff3.cpp:609 #, kde-format msgid "" "Choose\n" @@ -1318,12 +1323,12 @@ "Valitse\n" "A" -#: kdiff3.cpp:611 +#: kdiff3.cpp:610 #, kde-format msgid "Select Line(s) From B" msgstr "Valitse rivejä B:stä" -#: kdiff3.cpp:611 +#: kdiff3.cpp:610 #, kde-format msgid "" "Choose\n" @@ -1332,12 +1337,12 @@ "Valitse\n" "B" -#: kdiff3.cpp:612 +#: kdiff3.cpp:611 #, kde-format msgid "Select Line(s) From C" msgstr "Valitse rivejä C:stä" -#: kdiff3.cpp:612 +#: kdiff3.cpp:611 #, kde-format msgid "" "Choose\n" @@ -1346,14 +1351,14 @@ "Valitse\n" "C" -#: kdiff3.cpp:613 +#: kdiff3.cpp:612 #, kde-format msgid "Automatically Go to Next Unsolved Conflict After Source Selection" msgstr "" "Siirry automaattisesti seuraavaan ratkaisemattomaan ristiriitaan lähteen " "valinnan jälkeen" -#: kdiff3.cpp:613 +#: kdiff3.cpp:612 #, kde-format msgid "" "Auto\n" @@ -1362,12 +1367,12 @@ "Autom.\n" "seuraava" -#: kdiff3.cpp:615 +#: kdiff3.cpp:614 #, kde-format msgid "Show Space && Tabulator Characters" msgstr "Näytä välilyönti- ja sarkainmerkit" -#: kdiff3.cpp:615 +#: kdiff3.cpp:614 #, kde-format msgid "" "White\n" @@ -1376,24 +1381,26 @@ "Tyhje-\n" "merkit" -#: kdiff3.cpp:616 +#: kdiff3.cpp:615 #, kde-format msgid "Show White Space" msgstr "Näytä tyhjemerkit" -#: kdiff3.cpp:616 +#: kdiff3.cpp:615 #, kde-format msgid "" "White\n" "Deltas" msgstr "" +"Tyhje-\n" +"deltat" -#: kdiff3.cpp:618 +#: kdiff3.cpp:617 #, kde-format msgid "Show Line Numbers" msgstr "Näytä rivinumerot" -#: kdiff3.cpp:618 +#: kdiff3.cpp:617 #, kde-format msgid "" "Line\n" @@ -1402,196 +1409,196 @@ "Rivi-\n" "numerot" -#: kdiff3.cpp:620 +#: kdiff3.cpp:619 #, kde-format msgid "Automatically Solve Simple Conflicts" msgstr "Ratkaise yksinkertaiset ristiriidat automaattisesti" # *** TARKISTA: Hmmh -#: kdiff3.cpp:621 +#: kdiff3.cpp:620 #, kde-format msgid "Set Deltas to Conflicts" msgstr "Aseta ristiriidat muutoksiksi" -#: kdiff3.cpp:622 +#: kdiff3.cpp:621 #, kde-format msgid "Run Regular Expression Auto Merge" msgstr "Suorita sääntölausekkeinen automaattiyhdistäminen" -#: kdiff3.cpp:623 +#: kdiff3.cpp:622 #, kde-format msgid "Automatically Solve History Conflicts" msgstr "Ratkaisu historiaristiriidat automaattisesti" -#: kdiff3.cpp:624 +#: kdiff3.cpp:623 #, kde-format msgid "Split Diff At Selection" msgstr "Jaa diff valinnan kohdalta" -#: kdiff3.cpp:625 +#: kdiff3.cpp:624 #, kde-format msgid "Join Selected Diffs" msgstr "Yhdistä valitut diffit" -#: kdiff3.cpp:627 +#: kdiff3.cpp:626 #, kde-format msgid "Show Window A" msgstr "Näytä A-ikkuna" -#: kdiff3.cpp:628 +#: kdiff3.cpp:627 #, kde-format msgid "Show Window B" msgstr "Näytä B-ikkuna" -#: kdiff3.cpp:629 +#: kdiff3.cpp:628 #, kde-format msgid "Show Window C" msgstr "Näytä C-ikkuna" -#: kdiff3.cpp:631 +#: kdiff3.cpp:630 #, kde-format msgid "Normal Overview" msgstr "Tavallinen yhteenveto" -#: kdiff3.cpp:632 +#: kdiff3.cpp:631 #, kde-format msgid "A vs. B Overview" msgstr "A–B-erojen yhteenveto" -#: kdiff3.cpp:633 +#: kdiff3.cpp:632 #, kde-format msgid "A vs. C Overview" msgstr "A–C-erojen yhteenveto" -#: kdiff3.cpp:634 +#: kdiff3.cpp:633 #, kde-format msgid "B vs. C Overview" msgstr "B–C-erojen yhteenveto" -#: kdiff3.cpp:635 +#: kdiff3.cpp:634 #, kde-format msgid "Word Wrap Diff Windows" msgstr "Rivitä vertailuikkunat" -#: kdiff3.cpp:636 +#: kdiff3.cpp:635 #, kde-format msgid "Add Manual Diff Alignment" msgstr "Lisää oma vertailutasauskohta" -#: kdiff3.cpp:637 +#: kdiff3.cpp:636 #, kde-format msgid "Clear All Manual Diff Alignments" msgstr "Tyhjennä kaikki omat vertailutasauskohdat" -#: kdiff3.cpp:639 +#: kdiff3.cpp:638 #, kde-format msgid "Focus Next Window" msgstr "Kohdista seuraavaan ikkunaan" -#: kdiff3.cpp:640 +#: kdiff3.cpp:639 #, kde-format msgid "Focus Prev Window" msgstr "Kohdista edellinen ikkuna" -#: kdiff3.cpp:641 +#: kdiff3.cpp:640 #, kde-format msgid "Toggle Split Orientation" msgstr "Vaihda jaon suuntaa" # *** TARKISTA: Tässä oletettu (split (dir + text) view), mutta voi olla myös ((dir) + (split text) view) -#: kdiff3.cpp:643 +#: kdiff3.cpp:642 #, kde-format msgid "Dir && Text Split Screen View" msgstr "Jaettu kansio- ja tekstinäkymä" -#: kdiff3.cpp:645 +#: kdiff3.cpp:644 #, kde-format msgid "Toggle Between Dir && Text View" msgstr "Vaihda kansio- ja tekstinäkymien välillä" -#: kdiff3.cpp:697 pdiff.cpp:1909 +#: kdiff3.cpp:696 pdiff.cpp:1919 #, kde-format msgid "The merge result has not been saved." msgstr "Yhdistämisen tulosta ei ole tallennettu." -#: kdiff3.cpp:699 +#: kdiff3.cpp:698 #, kde-format msgid "Save && Quit" msgstr "Tallenna ja lopeta" -#: kdiff3.cpp:700 +#: kdiff3.cpp:699 #, kde-format msgid "Quit Without Saving" msgstr "Lopeta tallentamatta" -#: kdiff3.cpp:708 pdiff.cpp:1920 +#: kdiff3.cpp:707 pdiff.cpp:1930 #, kde-format msgid "Saving the merge result failed." msgstr "Yhdistämisen tulosten tallennus epäonnistui." -#: kdiff3.cpp:719 pdiff.cpp:1032 +#: kdiff3.cpp:718 pdiff.cpp:1030 #, kde-format msgid "" "You are currently doing a directory merge. Are you sure, you want to abort?" msgstr "" "Olet tekemässä kansioiden yhdistämistä. Oletko varma vai haluatko keskeyttää?" -#: kdiff3.cpp:742 +#: kdiff3.cpp:741 #, kde-format msgid "Saving file..." msgstr "Tallennetaan tiedostoa…" -#: kdiff3.cpp:759 +#: kdiff3.cpp:758 #, kde-format msgid "Saving file with a new filename..." msgstr "Tallennetaan tiedostoa uudella nimellä…" -#: kdiff3.cpp:761 +#: kdiff3.cpp:760 #, kde-format msgid "Save As..." msgstr "Tallenna nimellä…" -#: kdiff3.cpp:820 +#: kdiff3.cpp:819 #, kde-format msgid "Printing not implemented." msgstr "Tulostusta ei ole toteutettu." -#: kdiff3.cpp:857 +#: kdiff3.cpp:858 #, kde-format msgid "Printing..." msgstr "Tulostetaan…" -#: kdiff3.cpp:943 +#: kdiff3.cpp:948 #, kde-format msgid "Printing page %1 of %2" msgstr "Tulostetaan sivua %1/%2" -#: kdiff3.cpp:1000 +#: kdiff3.cpp:1006 #, kde-format msgid " (Selection)" msgstr " (valinta)" -#: kdiff3.cpp:1027 +#: kdiff3.cpp:1034 #, kde-format msgid "Printing completed." msgstr "Tulostus valmis." -#: kdiff3.cpp:1031 +#: kdiff3.cpp:1038 #, kde-format msgid "Printing aborted." msgstr "Tulostus keskeytettiin." -#: kdiff3.cpp:1038 +#: kdiff3.cpp:1045 #, kde-format msgid "Exiting..." msgstr "Lopetetaan…" -#: kdiff3.cpp:1049 +#: kdiff3.cpp:1056 #, kde-format msgid "Toggling toolbar..." msgstr "Näytetään tai piilotetaan työkaluriviä…" -#: kdiff3.cpp:1070 +#: kdiff3.cpp:1077 #, kde-format msgid "Toggle the statusbar..." msgstr "Näytetään tai piilotetaan tilariviä…" @@ -1616,7 +1623,7 @@ msgid "Joachim Eibl" msgstr "Joachim Eibl" -#: kdiff3_part.cpp:173 kdiff3_part.cpp:254 +#: kdiff3_part.cpp:174 kdiff3_part.cpp:255 #, kde-format msgid "Could not find files for comparison." msgstr "Vertailtavia tiedostoja ei löytynyt." @@ -1634,7 +1641,7 @@ msgstr "KDiff3:n asetukset" #. i18n: ectx: ToolBar (mainToolBar) -#: kdiff3_part.rc:16 main.cpp:88 +#: kdiff3_part.rc:16 main.cpp:89 #, kde-format msgid "KDiff3" msgstr "KDiff3" @@ -1704,88 +1711,93 @@ msgid "Main Toolbar" msgstr "Päätyökalurivi" -#: main.cpp:68 main.cpp:72 +#: main.cpp:69 main.cpp:73 #, kde-format msgid "Ignored. (User defined.)" msgstr "Ohitettu. (Käyttäjän määritys.)" -#: main.cpp:92 +#: main.cpp:93 #, kde-format msgid " (64 bit)" msgstr " (64-bittinen)" -#: main.cpp:94 +#: main.cpp:95 #, kde-format msgid " (32 bit)" msgstr " (32-bittinen)" -#: main.cpp:95 +#: main.cpp:96 #, kde-format msgid "Tool for Comparison and Merge of Files and Directories" msgstr "Työkalu tiedostojen ja kansioiden vertailemiseksi ja yhdistämiseksi" -#: main.cpp:96 +#: main.cpp:97 #, kde-format msgid "(c) 2002-2014 Joachim Eibl, (c) 2017 Michael Reeves KF5/Qt5 port" msgstr "© 2002–14 Joachim Eibl, © 2017 Michael Reeves KF5/Qt5-siirros" -#: main.cpp:112 +#: main.cpp:113 #, kde-format msgid "Merge the input." msgstr "Yhdistä tulos." -#: main.cpp:113 +#: main.cpp:114 #, kde-format msgid "Explicit base file. For compatibility with certain tools." msgstr "" "Eksplisiittinen pohjatiedosto. Yhteensopivuussyistä tiettyjen työkalujen " "kanssa." -#: main.cpp:114 +#: main.cpp:115 #, kde-format msgid "Output file. Implies -m. E.g.: -o newfile.txt" msgstr "Tulostiedosto. Olettaa -m:n. Esim. -o uusitsto.txt" -#: main.cpp:115 +#: main.cpp:116 #, kde-format msgid "Output file, again. (For compatibility with certain tools.)" msgstr "" "Tulostiedosto taas. (Yhteensopivuussyistä tiettyjen työkalujen kanssa.)" -#: main.cpp:116 +#: main.cpp:118 #, kde-format msgid "No GUI if all conflicts are auto-solvable. (Needs -o file)" msgstr "" "Ei käyttöliittymää, jos kaikki ristiriidat voi ratkaista automaattisesti. " "(Vaatii -o tiedosto)" -#: main.cpp:117 +#: main.cpp:120 +#, kde-format +msgid "Ignored." +msgstr "Ohitettu." + +#: main.cpp:122 #, kde-format msgid "Do not solve conflicts automatically." msgstr "Älä ratkaise ristiriitoja automaattisesti." -#: main.cpp:118 +#: main.cpp:123 #, kde-format msgid "Visible name replacement for input file 1 (base)." msgstr "Syötetiedoston 1 (perustan) näkyvän nimen korvaus." -#: main.cpp:119 +#: main.cpp:124 #, kde-format msgid "Visible name replacement for input file 2." msgstr "Syötetiedoston 2 näkyvän nimen korvaus." -#: main.cpp:120 +#: main.cpp:125 #, kde-format msgid "Visible name replacement for input file 3." msgstr "Syötetiedoston 3 näkyvän nimen korvaus." -#: main.cpp:121 +#: main.cpp:126 #, kde-format msgid "Alternative visible name replacement. Supply this once for every input." msgstr "" "Vaihtoehtoinen näkyvän nimen korvaus. Anna tämä kerran kullekin syötteelle." -#: main.cpp:122 +#: main.cpp:127 #, kde-format msgid "" "Override a config setting. Use once for every setting. E.g.: --cs " @@ -1794,88 +1806,88 @@ "Ohita yksittäinen asetus. Käytä kerran kullekin asetukselle. Esim. --cs " "\"AutoAdvance=1\"" -#: main.cpp:123 +#: main.cpp:128 #, kde-format msgid "Show list of config settings and current values." msgstr "Näyttää nykyisten asetusten ja arvojen luettelon." -#: main.cpp:124 +#: main.cpp:129 #, kde-format msgid "Use a different config file." msgstr "Käytä toista asetustiedostoa." -#: main.cpp:127 +#: main.cpp:132 #, kde-format msgid "file1 to open (base, if not specified via --base)" msgstr "avattava tiedosto1 (pohja, ellei annettu --base)" -#: main.cpp:128 +#: main.cpp:133 #, kde-format msgid "file2 to open" msgstr "avattava tiedosto2" -#: main.cpp:129 +#: main.cpp:134 #, kde-format msgid "file3 to open" msgstr "avattava tiedosto3" -#: main.cpp:153 +#: main.cpp:158 #, kde-format msgid "See kdiff3 --help for supported options." msgstr "Komento kdiff --help näyttää tuetut valitsimet." -#: mergeresultwindow.cpp:158 +#: mergeresultwindow.cpp:171 #, kde-format msgid "Choose A Everywhere" msgstr "Valitse A kaikkialla" -#: mergeresultwindow.cpp:159 +#: mergeresultwindow.cpp:172 #, kde-format msgid "Choose B Everywhere" msgstr "Valitse B kaikkialla" -#: mergeresultwindow.cpp:160 +#: mergeresultwindow.cpp:173 #, kde-format msgid "Choose C Everywhere" msgstr "Valitse C kaikkialla" -#: mergeresultwindow.cpp:161 +#: mergeresultwindow.cpp:174 #, kde-format msgid "Choose A for All Unsolved Conflicts" msgstr "Valitse A kaikissa ratkaisemattomissa ristiriidoissa" -#: mergeresultwindow.cpp:162 +#: mergeresultwindow.cpp:175 #, kde-format msgid "Choose B for All Unsolved Conflicts" msgstr "Valitse B kaikissa ratkaisemattomissa ristiriidoissa" -#: mergeresultwindow.cpp:163 +#: mergeresultwindow.cpp:176 #, kde-format msgid "Choose C for All Unsolved Conflicts" msgstr "Valitse C kaikissa ratkaisemattomissa ristiriidoissa" -#: mergeresultwindow.cpp:164 +#: mergeresultwindow.cpp:177 #, kde-format msgid "Choose A for All Unsolved Whitespace Conflicts" msgstr "Valitse A kaikissa ratkaisemattomissa tyhjemerkkiristiriidoissa" -#: mergeresultwindow.cpp:165 +#: mergeresultwindow.cpp:178 #, kde-format msgid "Choose B for All Unsolved Whitespace Conflicts" msgstr "Valitse B kaikissa ratkaisemattomissa tyhjemerkkiristiriidoissa" -#: mergeresultwindow.cpp:166 +#: mergeresultwindow.cpp:179 #, kde-format msgid "Choose C for All Unsolved Whitespace Conflicts" msgstr "Valitse C kaikissa ratkaisemattomissa tyhjemerkkiristiriidoissa" -#: mergeresultwindow.cpp:176 +#: mergeresultwindow.cpp:204 #, kde-format msgid "Number of remaining unsolved conflicts: %1 (of which %2 are whitespace)" msgstr "" "Ratkaisemattomia ristiriitoja jäljellä: %1 (joista %2 liittyy tyhjemerkkeihn)" -#: mergeresultwindow.cpp:370 +#: mergeresultwindow.cpp:398 #, kde-format msgid "" "The output has been modified.\n" @@ -1884,29 +1896,29 @@ "Tulostetta on muutettu.\n" "Jos jatkat, muutoksesi menetetään." -#: mergeresultwindow.cpp:936 pdiff.cpp:827 +#: mergeresultwindow.cpp:964 pdiff.cpp:817 #, kde-format msgid "All input files are binary equal." msgstr "Kaikki syötetiedostot ovat binaarisesti samat." -#: mergeresultwindow.cpp:938 +#: mergeresultwindow.cpp:966 #, kde-format msgid "All input files contain the same text." msgstr "Kaikki syötetiedostot sisältävät saman tekstin." -#: mergeresultwindow.cpp:942 mergeresultwindow.cpp:946 -#: mergeresultwindow.cpp:950 pdiff.cpp:833 pdiff.cpp:837 pdiff.cpp:841 +#: mergeresultwindow.cpp:970 mergeresultwindow.cpp:974 +#: mergeresultwindow.cpp:978 pdiff.cpp:823 pdiff.cpp:827 pdiff.cpp:831 #, kde-format msgid "Files %1 and %2 are binary equal.\n" msgstr "Tiedostot %1 ja %2 ovat binaarisesti samat.\n" -#: mergeresultwindow.cpp:944 mergeresultwindow.cpp:948 -#: mergeresultwindow.cpp:952 +#: mergeresultwindow.cpp:972 mergeresultwindow.cpp:976 +#: mergeresultwindow.cpp:980 #, kde-format msgid "Files %1 and %2 have equal text.\n" msgstr "Tiedostojen %1 ja %2 tekstit ovat samat.\n" -#: mergeresultwindow.cpp:958 +#: mergeresultwindow.cpp:986 #, kde-format msgid "" "Total number of conflicts: %1\n" @@ -1919,27 +1931,27 @@ "Ratkaisemattomia: %3\n" "%4" -#: mergeresultwindow.cpp:964 +#: mergeresultwindow.cpp:992 #, kde-format msgid "Conflicts" msgstr "Ristiriidat" -#: mergeresultwindow.cpp:1873 +#: mergeresultwindow.cpp:1901 #, kde-format msgid "" msgstr "" -#: mergeresultwindow.cpp:1881 +#: mergeresultwindow.cpp:1909 #, kde-format msgid "" msgstr "" -#: mergeresultwindow.cpp:1883 mergeresultwindow.cpp:2755 +#: mergeresultwindow.cpp:1911 mergeresultwindow.cpp:2783 #, kde-format msgid "" msgstr "" -#: mergeresultwindow.cpp:2967 +#: mergeresultwindow.cpp:2995 #, kde-format msgid "" "Not all conflicts are solved yet.\n" @@ -1948,12 +1960,12 @@ "Kaikkia ristiriitoja ei vielä ratkaistu.\n" "Tiedostoa ei tallennettu." -#: mergeresultwindow.cpp:2969 mergeresultwindow.cpp:2978 +#: mergeresultwindow.cpp:2997 mergeresultwindow.cpp:3006 #, kde-format msgid "Conflicts Left" msgstr "Ristiriitoja jäljellä" -#: mergeresultwindow.cpp:2976 +#: mergeresultwindow.cpp:3004 #, kde-format msgid "" "There is a line end style conflict. Please choose the line end style " @@ -1963,7 +1975,7 @@ "Rivinloppumerkeissä on ristiriita. Valitse rivinlopetusmerkki itse.\n" "Tiedostoa ei tallennettu." -#: mergeresultwindow.cpp:2990 +#: mergeresultwindow.cpp:3018 #, kde-format msgid "" "\n" @@ -1974,57 +1986,57 @@ "\n" "Varmuuskopion luonti epäonnistui. Tiedostoa ei tallennettu." -#: mergeresultwindow.cpp:2990 mergeresultwindow.cpp:3038 +#: mergeresultwindow.cpp:3018 mergeresultwindow.cpp:3066 #, kde-format msgid "File Save Error" msgstr "Tiedoston tallennusvirhe" -#: mergeresultwindow.cpp:3038 +#: mergeresultwindow.cpp:3066 #, kde-format msgid "Error while writing." msgstr "Virhe kirjoitettaessa." -#: mergeresultwindow.cpp:3110 +#: mergeresultwindow.cpp:3138 #, kde-format msgid "Output:" msgstr "Tuloste:" -#: mergeresultwindow.cpp:3123 mergeresultwindow.cpp:3315 +#: mergeresultwindow.cpp:3151 mergeresultwindow.cpp:3343 #, kde-format msgid "[Modified]" msgstr "[Muutettu]" -#: mergeresultwindow.cpp:3130 +#: mergeresultwindow.cpp:3158 #, kde-format msgid "Encoding for saving:" msgstr "Tallennettaessa käytettävä koodaus:" -#: mergeresultwindow.cpp:3230 +#: mergeresultwindow.cpp:3258 #, kde-format msgid "Conflict" msgstr "Ristiriita" -#: mergeresultwindow.cpp:3262 +#: mergeresultwindow.cpp:3290 #, kde-format msgid "Codec from A: %1" msgstr "A:n merkistö: %1" -#: mergeresultwindow.cpp:3264 +#: mergeresultwindow.cpp:3292 #, kde-format msgid "Codec from B: %1" msgstr "B:n merkistö: %1" -#: mergeresultwindow.cpp:3266 +#: mergeresultwindow.cpp:3294 #, kde-format msgid "Codec from C: %1" msgstr "C:n merkistö: %1" -#: optiondialog.cpp:119 +#: optiondialog.cpp:121 #, kde-format msgid "Change Font" msgstr "Muuta fonttia" -#: optiondialog.cpp:135 optiondialog.cpp:145 +#: optiondialog.cpp:137 optiondialog.cpp:147 #, kde-format msgid "" "Font: %1, %2, %3\n" @@ -2035,123 +2047,123 @@ "\n" "Esimerkki:" -#: optiondialog.cpp:388 +#: optiondialog.cpp:390 #, kde-format msgid "Unicode" msgstr "Unicode" -#: optiondialog.cpp:389 +#: optiondialog.cpp:391 #, kde-format msgid "Latin1" msgstr "Latin-1" -#: optiondialog.cpp:408 +#: optiondialog.cpp:410 #, kde-format msgid "Change this if non-ASCII characters are not displayed correctly." msgstr "Valitse tämä, ellei ei-ASCII-merkkejä näytetä oikein." -#: optiondialog.cpp:491 +#: optiondialog.cpp:495 #, kde-format msgid "Configure" msgstr "Asetukset" -#: optiondialog.cpp:568 +#: optiondialog.cpp:573 #, kde-format msgid "Font" msgstr "Fontti" -#: optiondialog.cpp:570 +#: optiondialog.cpp:575 #, kde-format msgid "Editor & Diff Output Font" msgstr "Muokkaimen ja vertailutulosteen fontti" -#: optiondialog.cpp:589 +#: optiondialog.cpp:594 #, kde-format msgid "Application font" msgstr "Sovellusfontti" -#: optiondialog.cpp:594 +#: optiondialog.cpp:599 #, kde-format msgid "File view font" msgstr "Katselunäkymän fontti" -#: optiondialog.cpp:613 +#: optiondialog.cpp:618 #, kde-format msgctxt "Title for color settings page" msgid "Color" msgstr "Väri" -#: optiondialog.cpp:614 +#: optiondialog.cpp:619 #, kde-format msgid "Colors Settings" msgstr "Väriasetukset" -#: optiondialog.cpp:631 +#: optiondialog.cpp:644 #, kde-format msgid "Editor and Diff Views:" msgstr "Muokkain- ja diff-näkymät:" -#: optiondialog.cpp:639 +#: optiondialog.cpp:652 #, kde-format msgid "Foreground color:" msgstr "Tekstiväri:" -#: optiondialog.cpp:647 +#: optiondialog.cpp:660 #, kde-format msgid "Background color:" msgstr "Taustaväri:" -#: optiondialog.cpp:657 +#: optiondialog.cpp:670 #, kde-format msgid "Diff background color:" msgstr "Diff-taustaväri:" -#: optiondialog.cpp:666 +#: optiondialog.cpp:679 #, kde-format msgid "Color A:" msgstr "A-väri:" -#: optiondialog.cpp:675 +#: optiondialog.cpp:688 #, kde-format msgid "Color B:" msgstr "B-väri:" -#: optiondialog.cpp:684 +#: optiondialog.cpp:697 #, kde-format msgid "Color C:" msgstr "C-väri:" -#: optiondialog.cpp:692 +#: optiondialog.cpp:705 #, kde-format msgid "Conflict color:" msgstr "Ristiriitaväri:" -#: optiondialog.cpp:701 +#: optiondialog.cpp:714 #, kde-format msgid "Current range background color:" msgstr "Nykyisen alueen taustaväri:" -#: optiondialog.cpp:710 +#: optiondialog.cpp:723 #, kde-format msgid "Current range diff background color:" msgstr "Nykyisen alueen diff-taustaväri:" -#: optiondialog.cpp:718 +#: optiondialog.cpp:731 #, kde-format msgid "Color for manually aligned difference ranges:" msgstr "Omien tasauskohta-alueiden väri:" -#: optiondialog.cpp:725 +#: optiondialog.cpp:738 #, kde-format msgid "Directory Comparison View:" msgstr "Kansiovertailunäkymä:" -#: optiondialog.cpp:731 +#: optiondialog.cpp:744 #, kde-format msgid "Newest file color:" msgstr "Uusimman tiedoston väri:" -#: optiondialog.cpp:736 +#: optiondialog.cpp:749 #, kde-format msgid "" "Changing this color will only be effective when starting the next directory " @@ -2160,37 +2172,37 @@ "Tämän värin vaihtamisella on vaikutusta vasta käynnistettäessä seuraava " "kansiovertailu." -#: optiondialog.cpp:741 +#: optiondialog.cpp:754 #, kde-format msgid "Oldest file color:" msgstr "Vanhimman tiedoston väri:" -#: optiondialog.cpp:750 +#: optiondialog.cpp:763 #, kde-format msgid "Middle age file color:" msgstr "Keski-ikäisen tiedoston väri:" -#: optiondialog.cpp:759 +#: optiondialog.cpp:772 #, kde-format msgid "Color for missing files:" msgstr "Puuttuvien tiedostojen väri:" -#: optiondialog.cpp:773 +#: optiondialog.cpp:786 #, kde-format msgid "Editor" msgstr "Muokkain" -#: optiondialog.cpp:774 +#: optiondialog.cpp:787 #, kde-format msgid "Editor Behavior" msgstr "Muokkaimen toiminta" -#: optiondialog.cpp:787 +#: optiondialog.cpp:809 #, kde-format msgid "Tab inserts spaces" msgstr "Sarkain lisää välilyöntejä" -#: optiondialog.cpp:791 +#: optiondialog.cpp:813 #, kde-format msgid "" "On: Pressing tab generates the appropriate number of spaces.\n" @@ -2199,27 +2211,27 @@ "Käytössä: Sarkaimen painallus luo sopivan määrän välilyöntejä.\n" "Poissa käytöstä: Lisätään sarkainmerkki." -#: optiondialog.cpp:796 +#: optiondialog.cpp:818 #, kde-format msgid "Tab size:" msgstr "Sarkainleveys:" -#: optiondialog.cpp:803 +#: optiondialog.cpp:825 #, kde-format msgid "Auto indentation" msgstr "Automaattisisennys" -#: optiondialog.cpp:807 +#: optiondialog.cpp:829 #, kde-format msgid "On: The indentation of the previous line is used for a new line.\n" msgstr "Käytössä: Edellisen rivin sisennystä käytetään uudelle riville.\n" -#: optiondialog.cpp:810 +#: optiondialog.cpp:832 #, kde-format msgid "Auto copy selection" msgstr "Kopioi valinta automaattisesti" -#: optiondialog.cpp:814 +#: optiondialog.cpp:836 #, kde-format msgid "" "On: Any selection is immediately written to the clipboard.\n" @@ -2228,7 +2240,7 @@ "Käytössä: Valinta kopioidaan välittömästi leikepöydälle.\n" "Ei käytössä: Kopiointi on tehtävä itse esim. Ctrl-C:llä." -#: optiondialog.cpp:829 +#: optiondialog.cpp:851 #, kde-format msgid "" "Sets the line endings for when an edited file is saved.\n" @@ -2238,12 +2250,12 @@ "rivinloppumerkit.\n" "DOS/Windows: CR+LF, UNIX: LF (missä CR=0D, LF=0A)." -#: optiondialog.cpp:839 +#: optiondialog.cpp:861 #, kde-format msgid "Diff" msgstr "Diff" -#: optiondialog.cpp:840 +#: optiondialog.cpp:862 #, kde-format msgid "Diff Settings" msgstr "Diff-asetukset" @@ -2257,12 +2269,12 @@ #. ); #. ++line; #. -#: optiondialog.cpp:865 +#: optiondialog.cpp:896 #, kde-format msgid "Ignore numbers (treat as white space)" msgstr "Ohita numerot (kohtele tyhjänä tilana)" -#: optiondialog.cpp:869 +#: optiondialog.cpp:900 #, kde-format msgid "" "Ignore number characters during line matching phase. (Similar to Ignore " @@ -2273,43 +2285,43 @@ "ohitus.)\n" "Voi helpottaa numeerista tietoa sisältävien tiedostojen vertailua." -#: optiondialog.cpp:873 +#: optiondialog.cpp:904 #, kde-format msgid "Ignore C/C++ comments (treat as white space)" msgstr "Ohita C:n ja C++:n kommentit (kohtele tyhjänä tilana)" -#: optiondialog.cpp:876 +#: optiondialog.cpp:907 #, kde-format msgid "Treat C/C++ comments like white space." msgstr "Kohtele C:n/C++:n kommentteja tyhjemerkkeinä." -#: optiondialog.cpp:879 +#: optiondialog.cpp:910 #, kde-format msgid "Ignore case (treat as white space)" msgstr "Ohita pien- ja suuraakkosten ero (kohtele tyhjänä tilana)" -#: optiondialog.cpp:883 +#: optiondialog.cpp:914 #, kde-format msgid "Treat case differences like white space changes. ('a'<=>'A')" msgstr "" "Kohtele eroja suur- tai pienaakkostuksessa kuten tyhjemerkkejä (”a” <=> ”A”)." -#: optiondialog.cpp:886 +#: optiondialog.cpp:917 #, kde-format msgid "Preprocessor command:" msgstr "Esikäsittelykomento:" -#: optiondialog.cpp:891 +#: optiondialog.cpp:922 #, kde-format msgid "User defined pre-processing. (See the docs for details.)" msgstr "Käyttäjän määrittämä esikäsittely. (Katso lisätietoja ohjeista.)" -#: optiondialog.cpp:894 +#: optiondialog.cpp:925 #, kde-format msgid "Line-matching preprocessor command:" msgstr "Rivien vertailun esikäsittelykomento:" -#: optiondialog.cpp:899 +#: optiondialog.cpp:930 #, kde-format msgid "" "This pre-processor is only used during line matching.\n" @@ -2318,12 +2330,12 @@ "Tätä esikäsittelyä käytetään vain rivejä täsmättäessä.\n" "(Katso lisätietoja ohjeista.)" -#: optiondialog.cpp:902 +#: optiondialog.cpp:933 #, kde-format msgid "Try hard (slower)" msgstr "Yritä kovemmin (hitaampaa)" -#: optiondialog.cpp:906 +#: optiondialog.cpp:937 #, kde-format msgid "" "Enables the --minimal option for the external diff.\n" @@ -2332,12 +2344,12 @@ "Ottaa käyttöön --minimal-asetukset ulkoiselle diffille.\n" "Suurempien tiedostojen tarkastelu hidastuu huomattavasti." -#: optiondialog.cpp:910 +#: optiondialog.cpp:941 #, kde-format msgid "Align B and C for 3 input files" msgstr "Kohdista B ja C kolmelle syötetiedostolle" -#: optiondialog.cpp:914 +#: optiondialog.cpp:945 #, kde-format msgid "" "Try to align B and C when comparing or merging three input files.\n" @@ -2349,17 +2361,23 @@ "Ei suositeltavaa yhdistämisessä, koska se voi huomattavasti mutkistua.\n" "(Oletus on poissa käytöstä.)" -#: optiondialog.cpp:926 +#: optiondialog.cpp:956 +#, kde-format +msgctxt "Settings page" +msgid "Merge" +msgstr "Yhdistä" + +#: optiondialog.cpp:957 #, kde-format msgid "Merge Settings" msgstr "Yhdistämisasetukset" -#: optiondialog.cpp:940 +#: optiondialog.cpp:980 #, kde-format msgid "Auto advance delay (ms):" msgstr "Automaattietenemisen viive (ms):" -#: optiondialog.cpp:946 +#: optiondialog.cpp:986 #, kde-format msgid "" "When in Auto-Advance mode the result of the current selection is shown \n" @@ -2368,27 +2386,27 @@ "Automaattietenemistilassa nykyisen valinnan tulos näytetään annetun ajan\n" "ennen siirtymistä seuraavaan ristiriitaan. Väli: 0–2000 ms" -#: optiondialog.cpp:950 +#: optiondialog.cpp:990 #, kde-format msgid "Show info dialogs" msgstr "Näytä viesti-ikkunat" -#: optiondialog.cpp:953 +#: optiondialog.cpp:993 #, kde-format msgid "Show a dialog with information about the number of conflicts." msgstr "Näytä viesti-ikkuna ristiriitojen määrästä." -#: optiondialog.cpp:956 +#: optiondialog.cpp:996 #, kde-format msgid "White space 2-file merge default:" msgstr "2 tiedoston tyhjemerkkien yhdistämisen oletus:" -#: optiondialog.cpp:961 optiondialog.cpp:974 +#: optiondialog.cpp:1001 optiondialog.cpp:1014 #, kde-format msgid "Manual Choice" msgstr "Käyttäjän valinta" -#: optiondialog.cpp:965 optiondialog.cpp:979 +#: optiondialog.cpp:1005 optiondialog.cpp:1019 #, kde-format msgid "" "Allow the merge algorithm to automatically select an input for white-space-" @@ -2397,22 +2415,22 @@ "Anna yhdistämisalgoritmin valita syöte automaattisesti " "tyhjemerkkimuutoksissa." -#: optiondialog.cpp:969 +#: optiondialog.cpp:1009 #, kde-format msgid "White space 3-file merge default:" msgstr "3 tiedoston tyhjemerkkien yhdistämisen oletus:" -#: optiondialog.cpp:983 +#: optiondialog.cpp:1023 #, kde-format msgid "Automatic Merge Regular Expression" msgstr "Automaattisen yhdistämisen säännöllinen lauseke" -#: optiondialog.cpp:991 smalldialogs.cpp:449 +#: optiondialog.cpp:1031 smalldialogs.cpp:459 #, kde-format msgid "Auto merge regular expression:" msgstr "Automaattisen yhdistämisen säännöllinen lauseke:" -#: optiondialog.cpp:996 +#: optiondialog.cpp:1036 #, kde-format msgid "" "Regular expression for lines where KDiff3 should automatically choose one " @@ -2426,13 +2444,13 @@ "on\n" "käytettävissä, muuten B." -#: optiondialog.cpp:1002 +#: optiondialog.cpp:1042 #, kde-format msgid "Run regular expression auto merge on merge start" msgstr "" "Yhdistä automaattisesti säännöllisellä lausekkeella yhdistämisen aluksi" -#: optiondialog.cpp:1005 +#: optiondialog.cpp:1045 #, kde-format msgid "" "Run the merge for auto merge regular expressions\n" @@ -2441,17 +2459,17 @@ "Suorita automaattiyhdistämisen säännöllisten lausekkeiden\n" "yhdistäminen välittömästi yhdistämisen alussa.\n" -#: optiondialog.cpp:1010 +#: optiondialog.cpp:1050 #, kde-format msgid "Version Control History Merging" msgstr "Versionhallinnan historian yhdistäminen" -#: optiondialog.cpp:1018 smalldialogs.cpp:476 +#: optiondialog.cpp:1058 smalldialogs.cpp:486 #, kde-format msgid "History start regular expression:" msgstr "Historian alun säännöllinen lauseke:" -#: optiondialog.cpp:1023 +#: optiondialog.cpp:1063 #, kde-format msgid "" "Regular expression for the start of the version control history entry.\n" @@ -2462,12 +2480,12 @@ "Yleensä tällä rivillä on avainsana ”$Log$”.\n" "Oletusarvo: ”.*\\$Log.*\\$.*”" -#: optiondialog.cpp:1029 smalldialogs.cpp:504 +#: optiondialog.cpp:1069 smalldialogs.cpp:514 #, kde-format msgid "History entry start regular expression:" msgstr "Historiatietueen alun säännöllinen lauseke:" -#: optiondialog.cpp:1042 +#: optiondialog.cpp:1082 #, kde-format msgid "" "A version control history entry consists of several lines.\n" @@ -2486,22 +2504,22 @@ "rivin.\n" "Katso lisätietoa ohjeista." -#: optiondialog.cpp:1050 +#: optiondialog.cpp:1090 #, kde-format msgid "History merge sorting" msgstr "Historian yhdistämisen lajittelu" -#: optiondialog.cpp:1053 +#: optiondialog.cpp:1093 #, kde-format msgid "Sort version control history by a key." msgstr "Lajittele versionhallinnan historian avaimen perusteella." -#: optiondialog.cpp:1063 +#: optiondialog.cpp:1103 #, kde-format msgid "History entry start sort key order:" msgstr "Historiatietueen alun lajitteluavainjärjestys:" -#: optiondialog.cpp:1068 +#: optiondialog.cpp:1108 #, kde-format msgid "" "Each pair of parentheses used in the regular expression for the history " @@ -2519,39 +2537,39 @@ "Jos jätetään tyhjäksi, lajittelua ei tehdä.\n" "Lisätietoa löydät ohjeista." -#: optiondialog.cpp:1079 +#: optiondialog.cpp:1119 #, kde-format msgid "Merge version control history on merge start" msgstr "Yhdistä versionhallinnan historian yhdistämisen aluksi" -#: optiondialog.cpp:1082 +#: optiondialog.cpp:1122 #, kde-format msgid "Run version control history automerge on merge start." msgstr "" "Suorita versionhallinnan historian automaattiyhdistäminen yhdistämisen " "aluksi." -#: optiondialog.cpp:1086 +#: optiondialog.cpp:1126 #, kde-format msgid "Max number of history entries:" msgstr "Historiatietueiden enimmäismäärä:" -#: optiondialog.cpp:1090 +#: optiondialog.cpp:1130 #, kde-format msgid "Cut off after specified number. Use -1 for infinite number of entries." msgstr "Katkaise annetun määrän jälkeen. -1 sallii rajattoman tietuemäärän." -#: optiondialog.cpp:1094 +#: optiondialog.cpp:1134 #, kde-format msgid "Test your regular expressions" msgstr "Kokeile säännöllisiä lausekkeitasi" -#: optiondialog.cpp:1099 +#: optiondialog.cpp:1139 #, kde-format msgid "Irrelevant merge command:" msgstr "Merkityksetön yhdistämiskomento:" -#: optiondialog.cpp:1104 +#: optiondialog.cpp:1144 #, kde-format msgid "" "If specified this script is run after automerge\n" @@ -2562,12 +2580,12 @@ "yhdistämisen jälkeen, kun muita muutoksia ei havaita.\n" "Kutsutaan parametrein: tstonimi1 tstonimi2 tstonimi3" -#: optiondialog.cpp:1109 +#: optiondialog.cpp:1149 #, kde-format msgid "Auto save and quit on merge without conflicts" msgstr "Tallenna ristiriidattomat yhdistämiset automaattisesti ja lopeta" -#: optiondialog.cpp:1113 +#: optiondialog.cpp:1153 #, kde-format msgid "" "If KDiff3 was started for a file-merge from the command line and all\n" @@ -2580,27 +2598,27 @@ "lopeta\n" "automaattisesti. (Samankaltainen kuin komentorivivalitsin ”--auto”.)" -#: optiondialog.cpp:1124 optiondialog.cpp:1125 +#: optiondialog.cpp:1164 optiondialog.cpp:1165 #, kde-format msgid "Directory" msgstr "Kansio" -#: optiondialog.cpp:1137 +#: optiondialog.cpp:1185 #, kde-format msgid "Recursive directories" msgstr "Myös alikansiot" -#: optiondialog.cpp:1140 +#: optiondialog.cpp:1188 #, kde-format msgid "Whether to analyze subdirectories or not." msgstr "Tarkistetaanko alikansiotkin vai ei." -#: optiondialog.cpp:1142 +#: optiondialog.cpp:1190 #, kde-format msgid "File pattern(s):" msgstr "Tiedostohahmo(t):" -#: optiondialog.cpp:1148 +#: optiondialog.cpp:1196 #, kde-format msgid "" "Pattern(s) of files to be analyzed. \n" @@ -2611,12 +2629,12 @@ "Jokerit: ”*” ja ”?”.\n" "Useampia hahmoja voi antaa erottamalla ne puolipistein ”;”." -#: optiondialog.cpp:1153 +#: optiondialog.cpp:1201 #, kde-format msgid "File-anti-pattern(s):" msgstr "Käänteistiedostokuvio(t):" -#: optiondialog.cpp:1159 +#: optiondialog.cpp:1207 #, kde-format msgid "" "Pattern(s) of files to be excluded from analysis. \n" @@ -2627,12 +2645,12 @@ "Jokerimerkit: * ja ?\n" "Useampia tiedostokuvioita voi antaa puolipistein (;) erotettuna" -#: optiondialog.cpp:1164 +#: optiondialog.cpp:1212 #, kde-format msgid "Dir-anti-pattern(s):" msgstr "Käänteiskansiokuvio(t):" -#: optiondialog.cpp:1170 +#: optiondialog.cpp:1218 #, kde-format msgid "" "Pattern(s) of directories to be excluded from analysis. \n" @@ -2643,34 +2661,36 @@ "Jokerimerkit: * ja ?\n" "Useampia kuvioita voi antaa puolipistein (;) erotettuna" -#: optiondialog.cpp:1175 +#: optiondialog.cpp:1223 #, kde-format msgid "Use .cvsignore" msgstr "Käytä .cvsignore-tiedostoa" -#: optiondialog.cpp:1179 +#: optiondialog.cpp:1227 #, kde-format msgid "" "Extends the antipattern to anything that would be ignored by CVS.\n" "Via local \".cvsignore\" files this can be directory specific." msgstr "" +"Laajentaa vastakuvion kaikkeen, minkä CVS:kin jättää huomiotta.\n" +"Paikallisin ”.cvsignore”-säännöin tämä voi olla kansiokohtaista." -#: optiondialog.cpp:1183 +#: optiondialog.cpp:1231 #, kde-format msgid "Find hidden files and directories" msgstr "Etsi piilotiedostoja ja -kansioita" -#: optiondialog.cpp:1186 +#: optiondialog.cpp:1234 #, kde-format msgid "Finds hidden files and directories." msgstr "Etsii piilotiedostoja ja -kansioita." -#: optiondialog.cpp:1189 +#: optiondialog.cpp:1237 #, kde-format msgid "Follow file links" msgstr "Seuraa tiedostolinkkejä" -#: optiondialog.cpp:1193 +#: optiondialog.cpp:1241 #, kde-format msgid "" "On: Compare the file the link points to.\n" @@ -2679,12 +2699,12 @@ "Käytössä: Vertaa linkin osoittamaa tiedostoa.\n" "Poissa käytöstä: Vertaa linkkejä." -#: optiondialog.cpp:1197 +#: optiondialog.cpp:1245 #, kde-format msgid "Follow directory links" msgstr "Seuraa kansiolinkkejä" -#: optiondialog.cpp:1201 +#: optiondialog.cpp:1249 #, kde-format msgid "" "On: Compare the directory the link points to.\n" @@ -2693,12 +2713,12 @@ "Käytössä: Vertaa linkin osoittamaa kansiota.\n" "Poissa käytöstä: Vertaa linkkejä." -#: optiondialog.cpp:1210 +#: optiondialog.cpp:1258 #, kde-format msgid "Case sensitive filename comparison" msgstr "Erota pien- ja suuraakkoset tiedostonimiä vertailtaessa" -#: optiondialog.cpp:1214 +#: optiondialog.cpp:1262 #, kde-format msgid "" "The directory comparison will compare files or directories when their names " @@ -2710,12 +2730,12 @@ "Aseta tämä, jos tiedostonimien täytyy täsmätä tarkasti. (Windowsissa oletus " "on pois käytöstä, muuten käytössä.)" -#: optiondialog.cpp:1218 +#: optiondialog.cpp:1266 #, kde-format msgid "Unfold all subdirectories on load" msgstr "Laajenna kaikki alikansiot ladattaessa" -#: optiondialog.cpp:1222 +#: optiondialog.cpp:1270 #, kde-format msgid "" "On: Unfold all subdirectories when starting a directory diff.\n" @@ -2724,12 +2744,12 @@ "Käytössä: Laajenna kaikki alikansiot kansiovertailua aloitettaessa.\n" "Ei käytössä: Jätä alikansiot pois näkyvistä." -#: optiondialog.cpp:1226 +#: optiondialog.cpp:1274 #, kde-format msgid "Skip directory status report" msgstr "Ohita kansioiden tilaraportti" -#: optiondialog.cpp:1230 +#: optiondialog.cpp:1278 #, kde-format msgid "" "On: Do not show the Directory Comparison Status.\n" @@ -2738,27 +2758,27 @@ "Käytössä: Älä näytä kansiovertailun tilaa.\n" "Ei käytössä: Näytä tilaikkuna aloitettaessa." -#: optiondialog.cpp:1234 +#: optiondialog.cpp:1282 #, kde-format msgid "File Comparison Mode" msgstr "Tiedostonvertailutapa" -#: optiondialog.cpp:1239 +#: optiondialog.cpp:1287 #, kde-format msgid "Binary comparison" msgstr "Binaarivertailu" -#: optiondialog.cpp:1241 +#: optiondialog.cpp:1289 #, kde-format msgid "Binary comparison of each file. (Default)" msgstr "Kunkin tiedoston binaarivertailu (oletus)." -#: optiondialog.cpp:1244 +#: optiondialog.cpp:1292 #, kde-format msgid "Full analysis" msgstr "Täysi analyysi" -#: optiondialog.cpp:1246 +#: optiondialog.cpp:1294 #, kde-format msgid "" "Do a full analysis and show statistics information in extra columns.\n" @@ -2767,12 +2787,12 @@ "Tee täysi analyysi ja näytä tilastotiedot lisäsarakkeina.\n" "(Hitaampaa kuin binaarivertailu etenkin binaaritiedostoille.)" -#: optiondialog.cpp:1250 +#: optiondialog.cpp:1298 #, kde-format msgid "Trust the size and modification date (unsafe)" msgstr "Luota kokoon ja muutospäivään (turvatonta)" -#: optiondialog.cpp:1252 +#: optiondialog.cpp:1300 #, kde-format msgid "" "Assume that files are equal if the modification date and file length are " @@ -2786,7 +2806,7 @@ "Tiedostot, joilla on sama sisältö mutta eri muutospäivä näytetään eroavina.\n" "Kätevä suurille kansioille tai hitaille verkoille." -#: optiondialog.cpp:1257 +#: optiondialog.cpp:1305 #, kde-format msgid "" "Trust the size and date, but use binary comparison if date does not match " @@ -2795,7 +2815,7 @@ "Luota kokoon ja päiväykseen mutta käytä binaarivertailua, elleivät " "päiväykset vastaa (turvatonta)" -#: optiondialog.cpp:1259 +#: optiondialog.cpp:1307 #, kde-format msgid "" "Assume that files are equal if the modification date and file length are " @@ -2808,12 +2828,12 @@ "Elleivät päiväykset ole samat mutta koot ovat, käytetään binaarivertailua.\n" "Kätevä suurille kansioille tai hitaille verkoille." -#: optiondialog.cpp:1264 +#: optiondialog.cpp:1312 #, kde-format msgid "Trust the size (unsafe)" msgstr "Luota kokoon (turvatonta)" -#: optiondialog.cpp:1266 +#: optiondialog.cpp:1314 #, kde-format msgid "" "Assume that files are equal if their file lengths are equal.\n" @@ -2824,12 +2844,12 @@ "Kätevä suurille kansioille tai hitaille verkoille, jos päiväys muuttuu " "ladattaessa." -#: optiondialog.cpp:1273 +#: optiondialog.cpp:1321 #, kde-format msgid "Synchronize directories" msgstr "Synkronoi kansiot" -#: optiondialog.cpp:1277 +#: optiondialog.cpp:1325 #, kde-format msgid "" "Offers to store files in both directories so that\n" @@ -2840,12 +2860,12 @@ "jolloin kummankin kansion sisältö tulee samaksi.\n" "Toimii vain verrattaessa kahta kansiota ilman kohdetta." -#: optiondialog.cpp:1283 +#: optiondialog.cpp:1331 #, kde-format msgid "White space differences considered equal" msgstr "Tyhjemerkit eivät vaikuta lopputulokseen" -#: optiondialog.cpp:1287 +#: optiondialog.cpp:1335 #, kde-format msgid "" "If files differ only by white space consider them equal.\n" @@ -2854,12 +2874,12 @@ "Jos tiedostot eroavat vain tyhjemerkeiltään, pidä niitä yhtäläisinä.\n" "Tämä on aktiivinen vain, kun täysi analyysi on valittu." -#: optiondialog.cpp:1293 +#: optiondialog.cpp:1341 #, kde-format msgid "Copy newer instead of merging (unsafe)" msgstr "Kopioi uudempi yhdistämisen sijaan (turvatonta)" -#: optiondialog.cpp:1297 +#: optiondialog.cpp:1345 #, kde-format msgid "" "Do not look inside, just take the newer file.\n" @@ -2870,12 +2890,12 @@ "(Käytä tätä vain, jos tiedät mitä teet!)\n" "Tällä on vaikutusta vain verrattaessa kahta kansiota." -#: optiondialog.cpp:1302 +#: optiondialog.cpp:1350 #, kde-format msgid "Backup files (.orig)" msgstr "Varmuuskopioi tiedostot (.orig)" -#: optiondialog.cpp:1306 +#: optiondialog.cpp:1354 #, kde-format msgid "" "If a file would be saved over an old file, then the old file\n" @@ -2884,17 +2904,17 @@ "Jos tiedosto tallennettaisiin vanhemman päälle, vanhan tiedoston\n" "nimeen lisätään pääte ”.orig” sen sijaan, että se poistettaisiin." -#: optiondialog.cpp:1382 optiondialog.cpp:1383 +#: optiondialog.cpp:1430 optiondialog.cpp:1431 #, kde-format msgid "Regional Settings" msgstr "Maa-asetukset" -#: optiondialog.cpp:1397 +#: optiondialog.cpp:1454 #, kde-format msgid "Use the same encoding for everything:" msgstr "Käytä samaa merkkikoodausta kaikille:" -#: optiondialog.cpp:1401 +#: optiondialog.cpp:1458 #, kde-format msgid "" "Enable this allows to change all encodings by changing the first only.\n" @@ -2904,17 +2924,17 @@ "vaihtamalla.\n" "Poista käytöstä, jos tiedostot käyttävät eri merkkikoodauksia." -#: optiondialog.cpp:1405 +#: optiondialog.cpp:1462 #, kde-format msgid "Note: Local Encoding is \"%1\"" msgstr "Huomaa: Paikallinen merkkikoodaus on ”%1”" -#: optiondialog.cpp:1409 +#: optiondialog.cpp:1466 #, kde-format msgid "File Encoding for A:" msgstr "A-tiedoston koodaus:" -#: optiondialog.cpp:1416 +#: optiondialog.cpp:1473 #, kde-format msgid "" "If enabled then Unicode (UTF-16 or UTF-8) encoding will be detected.\n" @@ -2926,32 +2946,32 @@ "Ellei tiedosto ole Unicodea, käytetään varalla valittua merkkikoodausta.\n" "(Unicode-tunnistus tapahtuu tiedoston ensitavusta.)" -#: optiondialog.cpp:1419 optiondialog.cpp:1430 optiondialog.cpp:1441 +#: optiondialog.cpp:1476 optiondialog.cpp:1487 optiondialog.cpp:1498 #, kde-format msgid "Auto Detect Unicode" msgstr "Tunnista Unicode automaattisesti" -#: optiondialog.cpp:1425 +#: optiondialog.cpp:1482 #, kde-format msgid "File Encoding for B:" msgstr "B-tiedoston koodaus:" -#: optiondialog.cpp:1436 +#: optiondialog.cpp:1493 #, kde-format msgid "File Encoding for C:" msgstr "C-tiedoston koodaus:" -#: optiondialog.cpp:1447 +#: optiondialog.cpp:1504 #, kde-format msgid "File Encoding for Merge Output and Saving:" msgstr "Yhdistämisen tulosteen ja tallennuksen merkkikoodaus:" -#: optiondialog.cpp:1452 +#: optiondialog.cpp:1509 #, kde-format msgid "Auto Select" msgstr "Valitse automaattisesti" -#: optiondialog.cpp:1456 +#: optiondialog.cpp:1513 #, kde-format msgid "" "If enabled then the encoding from the input files is used.\n" @@ -2962,17 +2982,17 @@ "Epäselvissä tilanteissa käyttäjää pyydetään asettamaan tallennuksen " "merkkikoodaus." -#: optiondialog.cpp:1459 +#: optiondialog.cpp:1516 #, kde-format msgid "File Encoding for Preprocessor Files:" msgstr "Esikäsittelytiedostojen merkkikoodaus:" -#: optiondialog.cpp:1471 +#: optiondialog.cpp:1528 #, kde-format msgid "Right To Left Language" msgstr "Oikealta vasemmalle -kieli" -#: optiondialog.cpp:1475 +#: optiondialog.cpp:1532 #, kde-format msgid "" "Some languages are read from right to left.\n" @@ -2981,22 +3001,22 @@ "Joitakin kieliä luetaan oikealta vasemmalle.\n" "Tämä asetus asettaa katselimen ja muokkaimen vastaavasti." -#: optiondialog.cpp:1485 +#: optiondialog.cpp:1542 #, kde-format msgid "Integration" msgstr "Integrointi" -#: optiondialog.cpp:1486 +#: optiondialog.cpp:1543 #, kde-format msgid "Integration Settings" msgstr "Integrointiasetukset" -#: optiondialog.cpp:1499 +#: optiondialog.cpp:1564 #, kde-format msgid "Command line options to ignore:" msgstr "Ohitettavat komentorivivalitsimet:" -#: optiondialog.cpp:1505 +#: optiondialog.cpp:1570 #, kde-format msgid "" "List of command line options that should be ignored when KDiff3 is used by " @@ -3010,12 +3030,12 @@ "Tämä estää ”Tuntematon asetus” -virheen." # Eihän siinä koskaan taida Suomessa lukea koko ”Escape” -#: optiondialog.cpp:1510 +#: optiondialog.cpp:1575 #, kde-format msgid "Quit also via Escape key" msgstr "Lopeta myös Esc-näppäimellä" -#: optiondialog.cpp:1514 +#: optiondialog.cpp:1579 #, kde-format msgid "" "Fast method to exit.\n" @@ -3024,7 +3044,7 @@ "Nopea lopetustapa.\n" "Sopii niille, jotka ovat Escin käyttöön tottuneet." -#: optiondialog.cpp:1598 +#: optiondialog.cpp:1653 #, kde-format msgid "This resets all options. Not only those of the current topic." msgstr "Alustaa kaikki asetukset (ei vain nykyisen kohdan)." @@ -3079,81 +3099,71 @@ msgid "Disable Unsafe Options" msgstr "Poista turvattomat asetukset käytöstä" -#: pdiff.cpp:158 +#: pdiff.cpp:160 #, kde-format msgid "Loading A" msgstr "Ladataan A:ta" -#: pdiff.cpp:167 +#: pdiff.cpp:162 #, kde-format -msgid "Errors occurred during pre-processing of file A." -msgstr "A-tiedostoa esikäsiteltäessä sattui virheitä." +msgid "Loading A: %1" +msgstr "Ladataan A:ta: %1" -#: pdiff.cpp:172 +#: pdiff.cpp:170 #, kde-format msgid "Loading B" msgstr "Ladataan B:tä" -#: pdiff.cpp:179 -#, kde-format -msgid "Errors occurred during pre-processing of file B." -msgstr "B-tiedostoa esikäsiteltäessä sattui virheitä." - -#: pdiff.cpp:202 pdiff.cpp:241 +#: pdiff.cpp:201 pdiff.cpp:237 #, kde-format msgid "Diff: A <-> B" msgstr "Diff: A <-> B" -#: pdiff.cpp:208 pdiff.cpp:279 pdiff.cpp:293 +#: pdiff.cpp:207 pdiff.cpp:275 pdiff.cpp:289 #, kde-format msgid "Linediff: A <-> B" msgstr "Linediff: A <-> B" -#: pdiff.cpp:225 +#: pdiff.cpp:224 #, kde-format msgid "Loading C" msgstr "Ladataan C:tä" -#: pdiff.cpp:232 -#, kde-format -msgid "Errors occurred during pre-processing of file C." -msgstr "C-tiedostoa esikäsiteltäessä sattui virheitä." - -#: pdiff.cpp:250 +#: pdiff.cpp:246 #, kde-format msgid "Diff: A <-> C" msgstr "Diff: A <-> C" -#: pdiff.cpp:261 +#: pdiff.cpp:257 #, kde-format msgid "Diff: B <-> C" msgstr "Diff: B <-> C" -#: pdiff.cpp:283 pdiff.cpp:297 +#: pdiff.cpp:279 pdiff.cpp:293 #, kde-format msgid "Linediff: B <-> C" msgstr "Linediff: B <-> C" -#: pdiff.cpp:287 pdiff.cpp:301 +#: pdiff.cpp:283 pdiff.cpp:297 #, kde-format msgid "Linediff: A <-> C" msgstr "Linediff: A <-> C" -#: pdiff.cpp:829 +#: pdiff.cpp:819 #, kde-format msgid "All input files contain the same text, but are not binary equal." msgstr "" "Kaikissa syötetiedostoissa on sama teksti mutta eroja esiintyy binaarisella " "tasolla." -#: pdiff.cpp:835 pdiff.cpp:839 pdiff.cpp:843 +#: pdiff.cpp:825 pdiff.cpp:829 pdiff.cpp:833 #, kde-format msgid "Files %1 and %2 have equal text, but are not binary equal. \n" msgstr "" "Tiedostoissa %1 ja %2 on sama teksti mutta eroja esiintyy binaarisella " "tasolla.\n" -#: pdiff.cpp:853 +#: pdiff.cpp:843 #, kde-format msgid "" "Some input files do not seem to be pure text files.\n" @@ -3164,18 +3174,18 @@ "KDiff3:n yhdistystoimintoa ei ole tarkoitettu binaaritiedolle.\n" "Jatka omalla vastuullasi." -#: pdiff.cpp:863 +#: pdiff.cpp:853 #, kde-format msgid ", B" msgstr ", B" -#: pdiff.cpp:865 +#: pdiff.cpp:855 #, kde-format msgid ", C" msgstr ", C" # %1 sisältää ”A”, ”B”, ”C” tai jonkin näiden yhdistelmän pilkuin erotettuna. -#: pdiff.cpp:867 +#: pdiff.cpp:857 #, kde-format msgid "" "Some input characters could not be converted to valid unicode.\n" @@ -3188,77 +3198,72 @@ "Älä tallenna tulosta, ellet ole varma. Jatka omalla vastuullasi.\n" "Viesti koskee tiedostoja kohteessa %1." -#: pdiff.cpp:1034 +#: pdiff.cpp:1032 #, kde-format msgid "Abort" msgstr "Keskeytä" -#: pdiff.cpp:1040 pdiff.cpp:1130 +#: pdiff.cpp:1038 pdiff.cpp:1129 #, kde-format msgid "Opening files..." msgstr "Avataan tiedostoja…" -#: pdiff.cpp:1107 -#, kde-format -msgid "File open error" -msgstr "Tiedoston avausvirhe" - -#: pdiff.cpp:1202 +#: pdiff.cpp:1212 #, kde-format msgid "Cutting selection..." msgstr "Leikataan valintaa…" -#: pdiff.cpp:1223 +#: pdiff.cpp:1233 #, kde-format msgid "Copying selection to clipboard..." msgstr "Kopioidaan valintaa leikepöydälle…" -#: pdiff.cpp:1239 +#: pdiff.cpp:1249 #, kde-format msgid "Inserting clipboard contents..." msgstr "Liitetään leikepöydän sisältöä…" -#: pdiff.cpp:1695 +#: pdiff.cpp:1705 #, kde-format msgid "Word wrap (Cancel disables word wrap)" msgstr "Rivitys (Peru poistaa rivityksen käytöstä)" -#: pdiff.cpp:1696 +#: pdiff.cpp:1706 #, kde-format msgid "Calculating max width for horizontal scrollbar" msgstr "Lasketaan vaakavierityspalkin enimmäisleveyttä" -#: pdiff.cpp:1911 +#: pdiff.cpp:1921 #, kde-format msgid "Save && Continue" msgstr "Tallenna ja jatka" -#: pdiff.cpp:1912 +#: pdiff.cpp:1922 #, kde-format msgid "Continue Without Saving" msgstr "Jatka tallentamatta" -#: pdiff.cpp:2124 +#: pdiff.cpp:2134 #, kde-format msgid "Search complete." msgstr "Haku valmis." -#: pdiff.cpp:2124 +#: pdiff.cpp:2134 #, kde-format msgid "Search Complete" msgstr "Haku valmis" -#: pdiff.cpp:2375 +#: pdiff.cpp:2385 #, kde-format msgid "Nothing is selected in either diff input window." msgstr "Mitään ei ole valittu kummassakaan diff-syöteikkunassa." -#: pdiff.cpp:2375 +#: pdiff.cpp:2385 #, kde-format msgid "Error while adding manual diff range" msgstr "Virhe lisättäessä käsin diff-aluetta" -#: progress.cpp:59 progress.cpp:71 +#: progress.cpp:61 progress.cpp:73 #, kde-format msgid "&Cancel" msgstr "&Peru" @@ -3268,126 +3273,126 @@ msgid "A (Base):" msgstr "A (perusta):" -#: smalldialogs.cpp:68 smalldialogs.cpp:85 smalldialogs.cpp:102 -#: smalldialogs.cpp:144 +#: smalldialogs.cpp:71 smalldialogs.cpp:90 smalldialogs.cpp:109 +#: smalldialogs.cpp:154 #, kde-format msgid "File..." msgstr "Tiedosto…" -#: smalldialogs.cpp:70 smalldialogs.cpp:87 smalldialogs.cpp:104 -#: smalldialogs.cpp:146 +#: smalldialogs.cpp:73 smalldialogs.cpp:92 smalldialogs.cpp:111 +#: smalldialogs.cpp:156 #, kde-format msgid "Dir..." msgstr "Kansio…" -#: smalldialogs.cpp:96 +#: smalldialogs.cpp:103 #, kde-format msgid "C (Optional):" msgstr "C (valinnainen):" -#: smalldialogs.cpp:119 +#: smalldialogs.cpp:126 #, kde-format msgid "Swap/Copy Names..." msgstr "Vaihda/kopioi nimet…" -#: smalldialogs.cpp:124 smalldialogs.cpp:125 smalldialogs.cpp:126 +#: smalldialogs.cpp:131 smalldialogs.cpp:132 smalldialogs.cpp:133 #, kde-format msgid "Swap %1<->%2" msgstr "Vaihda %1<->%2" -#: smalldialogs.cpp:127 smalldialogs.cpp:128 smalldialogs.cpp:129 +#: smalldialogs.cpp:134 smalldialogs.cpp:135 smalldialogs.cpp:136 #, kde-format msgid "Copy %1->Output" msgstr "Kopioi %1–>tuloste" -#: smalldialogs.cpp:130 smalldialogs.cpp:131 smalldialogs.cpp:132 +#: smalldialogs.cpp:137 smalldialogs.cpp:138 smalldialogs.cpp:139 #, kde-format msgid "Swap %1<->Output" msgstr "Vaihda %1<->tuloste" -#: smalldialogs.cpp:138 +#: smalldialogs.cpp:148 #, kde-format msgid "Output (optional):" msgstr "Tuloste (valinnainen):" -#: smalldialogs.cpp:168 +#: smalldialogs.cpp:178 #, kde-format msgid "Configure..." msgstr "Asetukset…" -#: smalldialogs.cpp:233 +#: smalldialogs.cpp:243 #, kde-format msgid "Open Directory" msgstr "Avaa kansio" -#: smalldialogs.cpp:234 +#: smalldialogs.cpp:244 #, kde-format msgid "Select Output File" msgstr "Valitse tulostiedosto" -#: smalldialogs.cpp:393 +#: smalldialogs.cpp:403 #, kde-format msgid "Search text:" msgstr "Etsi tekstiä:" -#: smalldialogs.cpp:400 +#: smalldialogs.cpp:410 #, kde-format msgid "Case sensitive" msgstr "Erota pien- ja suuraakkoset" -#: smalldialogs.cpp:403 +#: smalldialogs.cpp:413 #, kde-format msgid "Search A" msgstr "Etsi A:sta" -#: smalldialogs.cpp:408 +#: smalldialogs.cpp:418 #, kde-format msgid "Search B" msgstr "Etsi B:stä" -#: smalldialogs.cpp:413 +#: smalldialogs.cpp:423 #, kde-format msgid "Search C" msgstr "Etsi C:stä" -#: smalldialogs.cpp:418 +#: smalldialogs.cpp:428 #, kde-format msgid "Search output" msgstr "Etsi tulosteesta" -#: smalldialogs.cpp:425 +#: smalldialogs.cpp:435 #, kde-format msgid "&Search" msgstr "&Etsi" -#: smalldialogs.cpp:444 +#: smalldialogs.cpp:454 #, kde-format msgid "Regular Expression Tester" msgstr "Säännöllisen lausekkeen testaus" -#: smalldialogs.cpp:457 +#: smalldialogs.cpp:467 #, kde-format msgid "Example auto merge line:" msgstr "Automaattiyhdistämisen esimerkkirivi:" -#: smalldialogs.cpp:459 +#: smalldialogs.cpp:469 #, kde-format msgid "To test auto merge, copy a line as used in your files." msgstr "" "Kokeillaksesi automaattiyhdistämistä kopioi rivi niin kuin se esiintyy " "tiedostoissasi." -#: smalldialogs.cpp:465 smalldialogs.cpp:493 smalldialogs.cpp:529 +#: smalldialogs.cpp:475 smalldialogs.cpp:503 smalldialogs.cpp:539 #, kde-format msgid "Match result:" msgstr "Haun tulos:" -#: smalldialogs.cpp:484 +#: smalldialogs.cpp:494 #, kde-format msgid "Example history start line (with leading comment):" msgstr "Esimerkkihistorian aloitusrivi (edeltävällä kommentilla):" -#: smalldialogs.cpp:486 +#: smalldialogs.cpp:496 #, kde-format msgid "" "Copy a history start line as used in your files,\n" @@ -3396,17 +3401,17 @@ "Kopioi historian aloitusrivi niin kuin se esiintyy tiedostoissasi\n" "edeltävä kommentti mukaan lukien." -#: smalldialogs.cpp:512 +#: smalldialogs.cpp:522 #, kde-format msgid "History sort key order:" msgstr "Historian lajittelujärjestys:" -#: smalldialogs.cpp:520 +#: smalldialogs.cpp:530 #, kde-format msgid "Example history entry start line (without leading comment):" msgstr "Historiatietueen aloitusrivin esimerkki (ilman alkukommenttia):" -#: smalldialogs.cpp:522 +#: smalldialogs.cpp:532 #, kde-format msgid "" "Copy a history entry start line as used in your files,\n" @@ -3415,48 +3420,48 @@ "Kopioi tiedostoissasi käytetty historiatietueen aloitusrivi\n" "mutta ilman alun kommenttia." -#: smalldialogs.cpp:536 +#: smalldialogs.cpp:546 #, kde-format msgid "Sort key result:" msgstr "Lajitteluavaimen tulos:" -#: smalldialogs.cpp:584 smalldialogs.cpp:594 smalldialogs.cpp:614 +#: smalldialogs.cpp:594 smalldialogs.cpp:604 smalldialogs.cpp:624 #, kde-format msgid "Match success." msgstr "Haku onnistui." -#: smalldialogs.cpp:588 smalldialogs.cpp:598 smalldialogs.cpp:620 +#: smalldialogs.cpp:598 smalldialogs.cpp:608 smalldialogs.cpp:630 #, kde-format msgid "Match failed." msgstr "Haku epäonnistui." -#: smalldialogs.cpp:605 +#: smalldialogs.cpp:615 #, kde-format msgid "Opening and closing parentheses do not match in regular expression." msgstr "" "Säännöllisen lausekkeen alkavien ja päättävien sulkujen määrä ei täsmää." -#: SourceData.cpp:150 +#: SourceData.cpp:153 #, kde-format msgid "Writing clipboard data to temp file failed." msgstr "Leikepöydän tietojen kirjoitus väliaikaistiedostoon epäonnistui." -#: SourceData.cpp:154 +#: SourceData.cpp:157 #, kde-format msgid "From Clipboard" msgstr "Leikepöydältä" -#: SourceData.cpp:335 +#: SourceData.cpp:348 #, kde-format msgid "%1 is not a normal file." msgstr "%1 ei ole tavallinen tiedosto." -#: SourceData.cpp:427 +#: SourceData.cpp:440 #, kde-format msgid " Temp file is: %1" msgstr " Väliaikaistiedosto on: %1" -#: SourceData.cpp:432 +#: SourceData.cpp:445 #, kde-format msgid "" "Preprocessing possibly failed. Check this command:\n" @@ -3471,12 +3476,12 @@ "\n" "Esikäsittelykomento poistetaan nyt käytöstä." -#: SourceData.cpp:443 SourceData.cpp:512 +#: SourceData.cpp:456 SourceData.cpp:525 #, kde-format msgid "File %1 too large to process. Skipping." msgstr "Tiedosto %1 on liian iso käsiteltäväksi. Ohitetaan." -#: SourceData.cpp:487 +#: SourceData.cpp:500 #, kde-format msgid "" "The line-matching-preprocessing possibly failed. Check this command:\n" @@ -3645,13 +3650,22 @@ -# *** TARKISTA: Voiko tähän saada %1:stä genetiivin, jolloin voisi olla ”%1 asetukset”? + + + + + + +# *** TARKISTA: Voiko tähän saada %1:stä genetiivin, jolloin voisi olla ”%1 asetukset”? + + + diff -Nru kdiff3-1.8.01/po/fr/diff_ext.po kdiff3-1.8.3/po/fr/diff_ext.po --- kdiff3-1.8.01/po/fr/diff_ext.po 2019-05-18 01:01:59.000000000 +0000 +++ kdiff3-1.8.3/po/fr/diff_ext.po 2020-06-25 00:18:18.000000000 +0000 @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: diff_ext\n" -"Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2019-03-22 03:09+0100\n" +"Report-Msgid-Bugs-To: https://bugs.kde.org\n" +"POT-Creation-Date: 2019-11-04 07:54+0100\n" "PO-Revision-Date: 2018-08-16 09:56+0800\n" "Last-Translator: Simon Depiets \n" "Language-Team: French \n" @@ -17,119 +17,114 @@ "X-Accelerator-Marker: &\n" "X-Text-Markup: kde4\n" -#: diff_ext.cpp:391 +#: diff_ext.cpp:223 #, kde-format msgid "Compare with %1" msgstr "Comparer avec %1" -#: diff_ext.cpp:392 +#: diff_ext.cpp:224 #, kde-format msgid "Merge with %1" msgstr "Fusionner avec %1" -#: diff_ext.cpp:408 +#: diff_ext.cpp:234 #, kde-format msgid "3-way merge with base" msgstr "Fusion de trois versions de fichiers avec la base" -#: diff_ext.cpp:411 +#: diff_ext.cpp:237 #, kde-format msgid "Save '%1' for later" msgstr "Enregistrer « %1 » pour plus tard" -#: diff_ext.cpp:426 +#: diff_ext.cpp:251 #, kde-format msgid "Compare with ..." msgstr "Comparer avec..." -#: diff_ext.cpp:429 +#: diff_ext.cpp:254 #, kde-format msgid "Clear list" msgstr "Effacer une liste" -#: diff_ext.cpp:434 +#: diff_ext.cpp:259 #, kde-format msgid "Compare" msgstr "Comparer" -#: diff_ext.cpp:438 +#: diff_ext.cpp:263 #, kde-format msgid "3 way comparison" msgstr "Comparaison de trois versions de fichiers" -#: diff_ext.cpp:444 +#: diff_ext.cpp:269 #, kde-format msgid "About Diff-Ext ..." msgstr "À propos de Diff-Ext..." -#: diff_ext.cpp:515 +#: diff_ext.cpp:340 #, kde-format msgid "(32 Bit)" msgstr "(32 bits)" -#: diff_ext.cpp:517 -#, kde-format -msgid "(64 Bit)" -msgstr "(64 bits)" - -#: diff_ext.cpp:518 +#: diff_ext.cpp:342 #, kde-format msgid "Diff-Ext Copyright (c) 2003-2006, Sergey Zorin. All rights reserved.\n" msgstr "" "Diff-Ext Copyright (c) 2003-2006, Sergey Zorin. Tous droits réservés.\n" -#: diff_ext.cpp:519 +#: diff_ext.cpp:343 #, kde-format msgid "This software is distributable under the BSD-2-Clause license.\n" msgstr "Ce programme est distribuable sous la licence BSD-2-Clause.\n" -#: diff_ext.cpp:520 +#: diff_ext.cpp:344 #, kde-format msgid "Some extensions for KDiff3 (c) 2006-2013 by Joachim Eibl.\n" msgstr "Certaines extensions pour KDiff3 (c) 2006-2013 par Joachim Eibl.\n" -#: diff_ext.cpp:521 +#: diff_ext.cpp:345 #, kde-format msgid "Homepage for Diff-Ext: http://diff-ext.sourceforge.net\n" msgstr "Page d'accueil de Diff-Ext : http://diff-ext.sourceforge.net\n" -#: diff_ext.cpp:522 +#: diff_ext.cpp:346 #, kde-format msgid "About Diff-Ext for KDiff3 " msgstr "À propos de Diff-Ext pour KDiff3" -#: diff_ext.cpp:551 +#: diff_ext.cpp:375 #, kde-format msgid "Compare selected files" msgstr "Comparer les fichiers sélectionnés" -#: diff_ext.cpp:557 diff_ext.cpp:577 +#: diff_ext.cpp:381 diff_ext.cpp:399 #, kde-format msgid "Compare '%1' with '%2'" msgstr "Comparer « %1 » avec « %2 »" -#: diff_ext.cpp:563 +#: diff_ext.cpp:386 #, kde-format msgid "Save '%1' for later operation" msgstr "Enregistrer « %1 » pour plus tard" -#: diff_ext.cpp:619 +#: diff_ext.cpp:440 #, kde-format msgid "Could not start KDiff3. Please rerun KDiff3 installation." msgstr "Impossible de démarrer KDiff3. Veuillez réinstaller KDiff3." # | msgid "Comment" -#: diff_ext.cpp:620 +#: diff_ext.cpp:441 #, kde-format msgid "Command" msgstr "Commande" -#: diff_ext.cpp:621 +#: diff_ext.cpp:442 #, kde-format msgid "CommandLine" msgstr "Ligne de commande" -#: diff_ext.cpp:622 +#: diff_ext.cpp:443 #, kde-format msgid "Diff-Ext For KDiff3" msgstr "Diff-Ext pour KDiff3" \ No newline at end of file diff -Nru kdiff3-1.8.01/po/fr/kdiff3fileitemactionplugin.po kdiff3-1.8.3/po/fr/kdiff3fileitemactionplugin.po --- kdiff3-1.8.01/po/fr/kdiff3fileitemactionplugin.po 2019-05-18 01:01:59.000000000 +0000 +++ kdiff3-1.8.3/po/fr/kdiff3fileitemactionplugin.po 2020-06-25 00:18:18.000000000 +0000 @@ -4,12 +4,13 @@ # Joëlle Cornavin , 2011. # xavier , 2013. # Simon Depiets , 2018, 2019. +# Johnny Jazeix , 2020. # msgid "" msgstr "" "Project-Id-Version: kdiff3fileitemactionplugin\n" -"Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2019-03-22 03:09+0100\n" +"Report-Msgid-Bugs-To: https://bugs.kde.org\n" +"POT-Creation-Date: 2019-08-30 07:40+0200\n" "PO-Revision-Date: 2019-03-20 01:11+0800\n" "Last-Translator: Simon Depiets \n" "Language-Team: French \n" @@ -18,7 +19,7 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" -"X-Generator: Lokalize 19.07.70\n" +"X-Generator: Lokalize 20.04.0\n" "X-Environment: kde\n" "X-Accelerator-Marker: &\n" "X-Text-Markup: kde4\n" diff -Nru kdiff3-1.8.01/po/fr/kdiff3.po kdiff3-1.8.3/po/fr/kdiff3.po --- kdiff3-1.8.01/po/fr/kdiff3.po 2019-05-18 01:01:59.000000000 +0000 +++ kdiff3-1.8.3/po/fr/kdiff3.po 2020-06-25 00:18:18.000000000 +0000 @@ -1,16 +1,17 @@ # translation of kdiff3.po to Français # traduction de kdiff3.po vers le Français # Copyright (C) 2004, 2005, 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. -# Simon Depiets <2df@tuxfamily.org>, 2005, 2018, 2019. +# Simon Depiets <2df@tuxfamily.org>, 2005, 2018, 2019, 2020. # Joëlle Cornavin , 2008, 2009, 2010, 2011, 2012. +# Johnny Jazeix , 2020. # msgid "" msgstr "" "Project-Id-Version: kdiff3\n" -"Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2019-04-18 08:02+0200\n" -"PO-Revision-Date: 2019-03-20 05:33+0800\n" -"Last-Translator: Simon Depiets \n" +"Report-Msgid-Bugs-To: https://bugs.kde.org\n" +"POT-Creation-Date: 2020-06-22 07:48+0200\n" +"PO-Revision-Date: 2020-05-07 12:09+0200\n" +"Last-Translator: Johnny Jazeix \n" "Language-Team: French \n" "Language: fr\n" "MIME-Version: 1.0\n" @@ -20,7 +21,7 @@ "X-Environment: kde\n" "X-Accelerator-Marker: &\n" "X-Text-Markup: kde4\n" -"X-Generator: Lokalize 19.07.70\n" +"X-Generator: Lokalize 20.07.70\n" #, kde-format msgctxt "NAME OF TRANSLATORS" @@ -32,285 +33,285 @@ msgid "Your emails" msgstr "jcorn@free.fr, sdepiets@gmail.com" -#: difftextwindow.cpp:412 +#: difftextwindow.cpp:414 #, kde-format msgid "File %1: Line %2" msgstr "Fichier %1 : ligne %2" -#: difftextwindow.cpp:414 +#: difftextwindow.cpp:416 #, kde-format msgid "File %1: Line not available" msgstr "Fichier %1 : Ligne non disponible" -#: difftextwindow.cpp:1780 +#: difftextwindow.cpp:1778 #, kde-format msgid "Encoding:" msgstr "Encodage :" -#: difftextwindow.cpp:1782 mergeresultwindow.cpp:3138 optiondialog.cpp:818 +#: difftextwindow.cpp:1781 mergeresultwindow.cpp:3166 optiondialog.cpp:840 #, kde-format msgid "Line end style:" msgstr "Style de fin de ligne :" -#: difftextwindow.cpp:1810 directorymergewindow.cpp:382 -#: directorymergewindow.cpp:433 directorymergewindow.cpp:524 -#: directorymergewindow.cpp:3058 directorymergewindow.cpp:3189 -#: directorymergewindow.cpp:3417 mergeresultwindow.cpp:942 -#: mergeresultwindow.cpp:944 mergeresultwindow.cpp:946 -#: mergeresultwindow.cpp:948 mergeresultwindow.cpp:1814 -#: mergeresultwindow.cpp:3170 mergeresultwindow.cpp:3177 optiondialog.cpp:962 -#: optiondialog.cpp:975 pdiff.cpp:833 pdiff.cpp:835 pdiff.cpp:837 pdiff.cpp:839 -#: pdiff.cpp:861 smalldialogs.cpp:124 smalldialogs.cpp:126 smalldialogs.cpp:127 -#: smalldialogs.cpp:130 +#: difftextwindow.cpp:1809 directorymergewindow.cpp:383 +#: directorymergewindow.cpp:434 directorymergewindow.cpp:525 +#: directorymergewindow.cpp:3072 directorymergewindow.cpp:3203 +#: directorymergewindow.cpp:3431 mergeresultwindow.cpp:970 +#: mergeresultwindow.cpp:972 mergeresultwindow.cpp:974 +#: mergeresultwindow.cpp:976 mergeresultwindow.cpp:1842 +#: mergeresultwindow.cpp:3198 mergeresultwindow.cpp:3205 optiondialog.cpp:1002 +#: optiondialog.cpp:1015 pdiff.cpp:823 pdiff.cpp:825 pdiff.cpp:827 +#: pdiff.cpp:829 pdiff.cpp:851 smalldialogs.cpp:131 smalldialogs.cpp:133 +#: smalldialogs.cpp:134 smalldialogs.cpp:137 #, kde-format msgid "A" msgstr "A" -#: difftextwindow.cpp:1810 directorymergewindow.cpp:384 -#: directorymergewindow.cpp:436 directorymergewindow.cpp:526 -#: directorymergewindow.cpp:3064 directorymergewindow.cpp:3190 -#: directorymergewindow.cpp:3418 mergeresultwindow.cpp:942 -#: mergeresultwindow.cpp:944 mergeresultwindow.cpp:950 -#: mergeresultwindow.cpp:952 mergeresultwindow.cpp:1816 -#: mergeresultwindow.cpp:3172 mergeresultwindow.cpp:3179 optiondialog.cpp:963 -#: optiondialog.cpp:976 pdiff.cpp:833 pdiff.cpp:835 pdiff.cpp:841 pdiff.cpp:843 -#: pdiff.cpp:863 smalldialogs.cpp:124 smalldialogs.cpp:125 smalldialogs.cpp:128 -#: smalldialogs.cpp:131 +#: difftextwindow.cpp:1809 directorymergewindow.cpp:385 +#: directorymergewindow.cpp:437 directorymergewindow.cpp:527 +#: directorymergewindow.cpp:3078 directorymergewindow.cpp:3204 +#: directorymergewindow.cpp:3432 mergeresultwindow.cpp:970 +#: mergeresultwindow.cpp:972 mergeresultwindow.cpp:978 +#: mergeresultwindow.cpp:980 mergeresultwindow.cpp:1844 +#: mergeresultwindow.cpp:3200 mergeresultwindow.cpp:3207 optiondialog.cpp:1003 +#: optiondialog.cpp:1016 pdiff.cpp:823 pdiff.cpp:825 pdiff.cpp:831 +#: pdiff.cpp:833 pdiff.cpp:853 smalldialogs.cpp:131 smalldialogs.cpp:132 +#: smalldialogs.cpp:135 smalldialogs.cpp:138 #, kde-format msgid "B" msgstr "B" -#: difftextwindow.cpp:1810 directorymergewindow.cpp:386 -#: directorymergewindow.cpp:439 directorymergewindow.cpp:528 -#: directorymergewindow.cpp:3070 directorymergewindow.cpp:3191 -#: directorymergewindow.cpp:3419 mergeresultwindow.cpp:946 -#: mergeresultwindow.cpp:948 mergeresultwindow.cpp:950 -#: mergeresultwindow.cpp:952 mergeresultwindow.cpp:1818 -#: mergeresultwindow.cpp:3174 mergeresultwindow.cpp:3181 optiondialog.cpp:977 -#: pdiff.cpp:837 pdiff.cpp:839 pdiff.cpp:841 pdiff.cpp:843 pdiff.cpp:865 -#: smalldialogs.cpp:125 smalldialogs.cpp:126 smalldialogs.cpp:129 -#: smalldialogs.cpp:132 +#: difftextwindow.cpp:1809 directorymergewindow.cpp:387 +#: directorymergewindow.cpp:440 directorymergewindow.cpp:529 +#: directorymergewindow.cpp:3084 directorymergewindow.cpp:3205 +#: directorymergewindow.cpp:3433 mergeresultwindow.cpp:974 +#: mergeresultwindow.cpp:976 mergeresultwindow.cpp:978 +#: mergeresultwindow.cpp:980 mergeresultwindow.cpp:1846 +#: mergeresultwindow.cpp:3202 mergeresultwindow.cpp:3209 optiondialog.cpp:1017 +#: pdiff.cpp:827 pdiff.cpp:829 pdiff.cpp:831 pdiff.cpp:833 pdiff.cpp:855 +#: smalldialogs.cpp:132 smalldialogs.cpp:133 smalldialogs.cpp:136 +#: smalldialogs.cpp:139 #, kde-format msgid "C" msgstr "C" -#: difftextwindow.cpp:1810 +#: difftextwindow.cpp:1809 #, kde-format msgid "A (Base)" msgstr "A (base)" -#: difftextwindow.cpp:1812 +#: difftextwindow.cpp:1811 #, kde-format msgid "Encoding: %1" msgstr "Encodage : %1" -#: difftextwindow.cpp:1813 mergeresultwindow.cpp:3183 +#: difftextwindow.cpp:1812 mergeresultwindow.cpp:3211 #, kde-format msgid "Unix" msgstr "Unix" -#: difftextwindow.cpp:1813 mergeresultwindow.cpp:3184 +#: difftextwindow.cpp:1812 mergeresultwindow.cpp:3212 #, kde-format msgid "DOS" msgstr "DOS" -#: difftextwindow.cpp:1813 +#: difftextwindow.cpp:1812 #, kde-format msgid "Line end style: %1" msgstr "Style de fin de ligne : %1" -#: difftextwindow.cpp:1835 kdiff3.cpp:873 +#: difftextwindow.cpp:1834 kdiff3.cpp:874 #, kde-format msgid "Top line" msgstr "Première ligne" -#: difftextwindow.cpp:1845 +#: difftextwindow.cpp:1843 #, kde-format msgid "End" msgstr "Fin" -#: difftextwindow.cpp:1903 smalldialogs.cpp:235 +#: difftextwindow.cpp:1901 smalldialogs.cpp:245 #, kde-format msgid "Open File" msgstr "Ouvrir un fichier" -#: difftextwindow.cpp:1951 optiondialog.cpp:387 +#: difftextwindow.cpp:1943 optiondialog.cpp:389 #, kde-format msgid "Unicode, 8 bit" msgstr "Unicode, 8 bit" -#: difftextwindow.cpp:1966 +#: difftextwindow.cpp:1958 #, kde-format msgid "Other" msgstr "Autre" -#: directorymergewindow.cpp:409 directorymergewindow.cpp:3424 +#: directorymergewindow.cpp:410 directorymergewindow.cpp:3438 #, kde-format msgid "Copy A to B" msgstr "Copier A vers B" -#: directorymergewindow.cpp:412 directorymergewindow.cpp:3425 +#: directorymergewindow.cpp:413 directorymergewindow.cpp:3439 #, kde-format msgid "Copy B to A" msgstr "Copier B vers A" -#: directorymergewindow.cpp:415 directorymergewindow.cpp:3426 +#: directorymergewindow.cpp:416 directorymergewindow.cpp:3440 #, kde-format msgid "Delete A" msgstr "Supprimer A" -#: directorymergewindow.cpp:418 directorymergewindow.cpp:3427 +#: directorymergewindow.cpp:419 directorymergewindow.cpp:3441 #, kde-format msgid "Delete B" msgstr "Supprimer B" -#: directorymergewindow.cpp:421 +#: directorymergewindow.cpp:422 #, kde-format msgid "Delete A & B" msgstr "Supprimer A et B" -#: directorymergewindow.cpp:424 directorymergewindow.cpp:3429 +#: directorymergewindow.cpp:425 directorymergewindow.cpp:3443 #, kde-format msgid "Merge to A" msgstr "Fusionner vers A" -#: directorymergewindow.cpp:427 directorymergewindow.cpp:3430 +#: directorymergewindow.cpp:428 directorymergewindow.cpp:3444 #, kde-format msgid "Merge to B" msgstr "Fusionner vers B" -#: directorymergewindow.cpp:430 +#: directorymergewindow.cpp:431 #, kde-format msgid "Merge to A & B" msgstr "Fusionner vers A et B" -#: directorymergewindow.cpp:442 directorymergewindow.cpp:3421 +#: directorymergewindow.cpp:443 directorymergewindow.cpp:3435 #, kde-format msgid "Delete (if exists)" msgstr "Supprimer (s'il existe)" -#: directorymergewindow.cpp:445 directorymergewindow.cpp:448 -#: directorymergewindow.cpp:3420 optiondialog.cpp:925 smalldialogs.cpp:113 +#: directorymergewindow.cpp:446 directorymergewindow.cpp:449 +#: directorymergewindow.cpp:3434 smalldialogs.cpp:120 #, kde-format msgid "Merge" msgstr "Fusion" -#: directorymergewindow.cpp:445 directorymergewindow.cpp:448 +#: directorymergewindow.cpp:446 directorymergewindow.cpp:449 #, kde-format msgid "Merge (manual)" msgstr "Fusion (manuelle)" -#: directorymergewindow.cpp:451 +#: directorymergewindow.cpp:452 #, kde-format msgid "Error: Conflicting File Types" msgstr "Erreur : conflit de types de fichiers" -#: directorymergewindow.cpp:454 +#: directorymergewindow.cpp:455 #, kde-format msgid "Error: Changed and Deleted" msgstr "Erreur : changé et supprimé" -#: directorymergewindow.cpp:457 +#: directorymergewindow.cpp:458 #, kde-format msgid "Error: Dates are equal but files are not." msgstr "Erreur : les dates sont identiques mais les fichiers ne le sont pas." -#: directorymergewindow.cpp:471 +#: directorymergewindow.cpp:472 #, kde-format msgid "Done" msgstr "Terminé" -#: directorymergewindow.cpp:473 +#: directorymergewindow.cpp:474 #, kde-format msgid "Error" msgstr "Erreur" -#: directorymergewindow.cpp:475 +#: directorymergewindow.cpp:476 #, kde-format msgid "Skipped." msgstr "Sauté." -#: directorymergewindow.cpp:477 +#: directorymergewindow.cpp:478 #, kde-format msgid "Not saved." msgstr "Non enregistré." -#: directorymergewindow.cpp:479 +#: directorymergewindow.cpp:480 #, kde-format msgid "In progress..." msgstr "En cours..." -#: directorymergewindow.cpp:481 +#: directorymergewindow.cpp:482 #, kde-format msgid "To do." msgstr "À faire." -#: directorymergewindow.cpp:522 +#: directorymergewindow.cpp:523 #, kde-format msgid "Name" msgstr "Nom" -#: directorymergewindow.cpp:530 +#: directorymergewindow.cpp:531 #, kde-format msgid "Operation" msgstr "Opération" -#: directorymergewindow.cpp:532 +#: directorymergewindow.cpp:533 #, kde-format msgid "Status" msgstr "État" -#: directorymergewindow.cpp:534 +#: directorymergewindow.cpp:535 #, kde-format msgid "Unsolved" msgstr "Non résolu" -#: directorymergewindow.cpp:536 +#: directorymergewindow.cpp:537 #, kde-format msgid "Solved" msgstr "Résolu" -#: directorymergewindow.cpp:538 +#: directorymergewindow.cpp:539 #, kde-format msgid "Nonwhite" msgstr "Non blanc" -#: directorymergewindow.cpp:540 +#: directorymergewindow.cpp:541 #, kde-format msgid "White" msgstr "Blanc" -#: directorymergewindow.cpp:674 +#: directorymergewindow.cpp:676 #, kde-format msgid "Unable to compare non-normal file with normal file." msgstr "Impossible de comparer un fichier non-normal à un fichier normal." -#: directorymergewindow.cpp:688 +#: directorymergewindow.cpp:690 #, kde-format msgid "Mix of links and normal files." msgstr "Mélange de liens et de fichiers normaux." -#: directorymergewindow.cpp:695 +#: directorymergewindow.cpp:697 #, kde-format msgid "Link: " msgstr "Lien : " -#: directorymergewindow.cpp:704 +#: directorymergewindow.cpp:706 #, kde-format msgid "Size. " msgstr "Taille. " -#: directorymergewindow.cpp:718 directorymergewindow.cpp:728 +#: directorymergewindow.cpp:720 directorymergewindow.cpp:730 #, kde-format msgid "Date & Size: " msgstr "Date et taille : " -#: directorymergewindow.cpp:748 +#: directorymergewindow.cpp:751 #, kde-format msgid "Comparing file..." msgstr "Comparaison du fichier..." -#: directorymergewindow.cpp:801 +#: directorymergewindow.cpp:813 #, kde-format msgid "" "You are currently doing a directory merge. Are you sure, you want to abort " @@ -319,48 +320,48 @@ "Vous effectuez actuellement une fusion de dossier. Voulez-vous vraiment " "abandonner la fusion et analyser à nouveau le dossier ?" -#: directorymergewindow.cpp:802 kdiff3.cpp:698 kdiff3.cpp:708 kdiff3.cpp:720 -#: mergeresultwindow.cpp:372 pdiff.cpp:1033 pdiff.cpp:1910 pdiff.cpp:1920 +#: directorymergewindow.cpp:814 kdiff3.cpp:697 kdiff3.cpp:707 kdiff3.cpp:719 +#: mergeresultwindow.cpp:400 pdiff.cpp:1031 pdiff.cpp:1920 pdiff.cpp:1930 #, kde-format msgid "Warning" msgstr "Avertissement" -#: directorymergewindow.cpp:803 directorymergewindow.cpp:3393 +#: directorymergewindow.cpp:815 directorymergewindow.cpp:3407 #, kde-format msgid "Rescan" msgstr "Analyser à nouveau" -#: directorymergewindow.cpp:804 pdiff.cpp:1035 +#: directorymergewindow.cpp:816 pdiff.cpp:1033 #, kde-format msgid "Continue Merging" msgstr "Poursuivre la fusion" -#: directorymergewindow.cpp:971 +#: directorymergewindow.cpp:984 #, kde-format msgid "Opening of directories failed:" msgstr "Impossible d'ouvrir les dossiers :" -#: directorymergewindow.cpp:975 +#: directorymergewindow.cpp:988 #, 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:980 +#: directorymergewindow.cpp:993 #, 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:985 +#: directorymergewindow.cpp:998 #, 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:988 +#: directorymergewindow.cpp:1001 #, kde-format msgid "Directory Open Error" msgstr "Erreur lors de l'ouverture du dossier" -#: directorymergewindow.cpp:996 +#: directorymergewindow.cpp:1009 #, kde-format msgid "" "The destination directory must not be the same as A or B when three " @@ -368,52 +369,52 @@ "Check again before continuing." msgstr "" "Le dossier de destination ne doit pas être le même que A ou B quand trois " -"fichiers sont fusionnés.\n" +"dossiers sont fusionnés.\n" "Vérifiez encore avant de continuer." -#: directorymergewindow.cpp:998 +#: directorymergewindow.cpp:1011 #, kde-format msgid "Parameter Warning" msgstr "Avertissement pour les paramètres" -#: directorymergewindow.cpp:1003 +#: directorymergewindow.cpp:1016 #, kde-format msgid "Scanning directories..." msgstr "Analyse des dossiers..." -#: directorymergewindow.cpp:1029 +#: directorymergewindow.cpp:1042 #, kde-format msgid "Reading Directory A" msgstr "Lecture du dossier A" -#: directorymergewindow.cpp:1038 +#: directorymergewindow.cpp:1051 #, kde-format msgid "Reading Directory B" msgstr "Lecture du dossier B" -#: directorymergewindow.cpp:1048 +#: directorymergewindow.cpp:1061 #, kde-format msgid "Reading Directory C" msgstr "Lecture du dossier C" -#: directorymergewindow.cpp:1064 +#: directorymergewindow.cpp:1077 #, kde-format msgid "Some subdirectories were not readable in" msgstr "Certains sous-dossiers ne sont pas lisibles dans" -#: directorymergewindow.cpp:1069 +#: directorymergewindow.cpp:1082 #, kde-format msgid "Check the permissions of the subdirectories." msgstr "Vérifiez les permissions des sous-dossiers." -#: directorymergewindow.cpp:1106 kdiff3.cpp:666 kdiff3.cpp:753 kdiff3.cpp:777 -#: kdiff3.cpp:1065 kdiff3.cpp:1086 pdiff.cpp:1116 pdiff.cpp:1170 pdiff.cpp:1218 -#: pdiff.cpp:1234 pdiff.cpp:1277 pdiff.cpp:1301 +#: directorymergewindow.cpp:1119 kdiff3.cpp:665 kdiff3.cpp:752 kdiff3.cpp:776 +#: kdiff3.cpp:1072 kdiff3.cpp:1093 pdiff.cpp:1115 pdiff.cpp:1178 pdiff.cpp:1228 +#: pdiff.cpp:1244 pdiff.cpp:1287 pdiff.cpp:1311 #, kde-format msgid "Ready." msgstr "Prêt." -#: directorymergewindow.cpp:1121 +#: directorymergewindow.cpp:1134 #, kde-format msgid "" "Directory Comparison Status\n" @@ -428,22 +429,22 @@ "Nombre de fichiers identiques : %2\n" "Nombre de fichiers différents : %3" -#: directorymergewindow.cpp:1128 +#: directorymergewindow.cpp:1141 #, kde-format msgid "Number of manual merges: %1" msgstr "Nombre de fusions manuelles : %1" -#: directorymergewindow.cpp:1394 +#: directorymergewindow.cpp:1407 #, kde-format msgid "This affects all merge operations." msgstr "Ce paramètre affecte toutes les opérations de fusion." -#: directorymergewindow.cpp:1395 +#: directorymergewindow.cpp:1408 #, kde-format msgid "Changing All Merge Operations" msgstr "Changement de toutes les opérations de fusion" -#: directorymergewindow.cpp:1695 +#: directorymergewindow.cpp:1708 #, kde-format msgid "" "Processing %1 / %2\n" @@ -452,44 +453,44 @@ "Traitement en cours %1 / %2\n" "%3" -#: directorymergewindow.cpp:1738 directorymergewindow.cpp:1742 +#: directorymergewindow.cpp:1751 directorymergewindow.cpp:1755 #, kde-format msgid "Some files could not be processed." msgstr "Impossible de traiter certains fichiers." -#: directorymergewindow.cpp:2222 directorymergewindow.cpp:2247 -#: directorymergewindow.cpp:2271 +#: directorymergewindow.cpp:2235 directorymergewindow.cpp:2260 +#: directorymergewindow.cpp:2285 #, kde-format msgid "This operation is currently not possible." msgstr "Cette opération n'est actuellement pas possible." -#: directorymergewindow.cpp:2222 directorymergewindow.cpp:2247 -#: directorymergewindow.cpp:2271 directorymergewindow.cpp:2552 +#: directorymergewindow.cpp:2235 directorymergewindow.cpp:2260 +#: directorymergewindow.cpp:2285 directorymergewindow.cpp:2565 #, kde-format msgid "Operation Not Possible" msgstr "Opération impossible" -#: directorymergewindow.cpp:2318 +#: directorymergewindow.cpp:2332 #, kde-format msgid "An error occurred while copying." msgstr "Une erreur est survenue lors de la copie." -#: directorymergewindow.cpp:2319 directorymergewindow.cpp:2759 +#: directorymergewindow.cpp:2333 directorymergewindow.cpp:2772 #, kde-format msgid "Merge Error" msgstr "Erreur de fusion" -#: directorymergewindow.cpp:2396 +#: directorymergewindow.cpp:2410 #, kde-format msgid "Unknown merge operation. (This must never happen!)" msgstr "Opération de fusion inconnue. (Ceci ne devrait jamais arriver !)" -#: directorymergewindow.cpp:2441 +#: directorymergewindow.cpp:2455 #, kde-format msgid "Unknown merge operation." msgstr "Opération de fusion inconnue." -#: directorymergewindow.cpp:2454 +#: directorymergewindow.cpp:2468 #, kde-format msgid "" "The merge is about to begin.\n" @@ -510,22 +511,22 @@ "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:2459 +#: directorymergewindow.cpp:2473 #, kde-format msgid "Starting Merge" msgstr "Démarrage de la fusion" -#: directorymergewindow.cpp:2460 +#: directorymergewindow.cpp:2474 #, kde-format msgid "Do It" msgstr "Effectuer la fusion" -#: directorymergewindow.cpp:2461 +#: directorymergewindow.cpp:2475 #, kde-format msgid "Simulate It" msgstr "Simuler la fusion" -#: directorymergewindow.cpp:2487 +#: directorymergewindow.cpp:2501 #, kde-format msgid "" "The highlighted item has a different type in the different directories. " @@ -534,7 +535,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:2491 +#: directorymergewindow.cpp:2505 #, kde-format msgid "" "The modification dates of the file are equal but the files are not. Select " @@ -543,7 +544,7 @@ "Les dates de modification du fichier sont identiques, mais les fichiers ne " "le sont pas. Choisissez ce qu'il faut faire." -#: directorymergewindow.cpp:2495 +#: directorymergewindow.cpp:2509 #, kde-format msgid "" "The highlighted item was changed in one directory and deleted in the other. " @@ -552,7 +553,7 @@ "L'élément mis en surbrillance a été modifié dans un dossier et supprimé dans " "l'autre. Choisissez ce qu'il faut faire." -#: directorymergewindow.cpp:2552 +#: directorymergewindow.cpp:2565 #, kde-format msgid "" "This operation is currently not possible because directory merge is " @@ -561,7 +562,7 @@ "Cette opération n'est actuellement pas possible car une fusion de dossiers " "est en cours." -#: directorymergewindow.cpp:2609 +#: directorymergewindow.cpp:2622 #, kde-format msgid "" "There was an error in the last step.\n" @@ -572,32 +573,32 @@ "Voulez-vous continuer avec l'élément ayant causé l'erreur ou voulez-vous le " "sauter ?" -#: directorymergewindow.cpp:2611 +#: directorymergewindow.cpp:2624 #, kde-format msgid "Continue merge after an error" msgstr "Continuer la fusion après une erreur" -#: directorymergewindow.cpp:2612 +#: directorymergewindow.cpp:2625 #, kde-format msgid "Continue With Last Item" msgstr "Continuer avec le dernier élément" -#: directorymergewindow.cpp:2613 +#: directorymergewindow.cpp:2626 #, kde-format msgid "Skip Item" msgstr "Sauter l'élément" -#: directorymergewindow.cpp:2709 +#: directorymergewindow.cpp:2722 #, kde-format msgid "Merge operation complete." msgstr "Opération de fusion terminée." -#: directorymergewindow.cpp:2709 directorymergewindow.cpp:2712 +#: directorymergewindow.cpp:2722 directorymergewindow.cpp:2725 #, kde-format msgid "Merge Complete" msgstr "Fusion terminée" -#: directorymergewindow.cpp:2722 +#: directorymergewindow.cpp:2735 #, kde-format msgid "" "Simulated merge complete: Check if you agree with the proposed operations." @@ -605,52 +606,52 @@ "Simulation de fusion achevée : vérifiez si vous êtes d'accord avec les " "opérations proposées." -#: directorymergewindow.cpp:2758 +#: directorymergewindow.cpp:2771 #, kde-format msgid "An error occurred. Press OK to see detailed information." msgstr "" "Une erreur s'est produite. Cliquez sur Ok pour afficher les informations " "détaillées." -#: directorymergewindow.cpp:2791 +#: directorymergewindow.cpp:2804 #, 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:2798 +#: directorymergewindow.cpp:2811 #, kde-format msgid "delete directory recursively( %1 )" msgstr "supprimer le dossier récursivement( %1 )" -#: directorymergewindow.cpp:2800 +#: directorymergewindow.cpp:2813 #, kde-format msgid "delete( %1 )" msgstr "supprimer( %1 )" -#: directorymergewindow.cpp:2815 +#: directorymergewindow.cpp:2828 #, kde-format 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:2834 +#: directorymergewindow.cpp:2847 #, kde-format msgid "Error: rmdir( %1 ) operation failed." msgstr "Erreur : opération de suppression de dossier( %1 ) impossible." -#: directorymergewindow.cpp:2844 +#: directorymergewindow.cpp:2857 #, kde-format msgid "Error: delete operation failed." msgstr "Erreur : opération de suppression impossible." -#: directorymergewindow.cpp:2870 +#: directorymergewindow.cpp:2884 #, kde-format msgid "manual merge( %1, %2, %3 -> %4)" msgstr "fusion manuelle(%1, %2, %3 -> %4)" -#: directorymergewindow.cpp:2873 +#: directorymergewindow.cpp:2887 #, kde-format msgid "" " Note: After a manual merge the user should continue by pressing F7." @@ -658,186 +659,186 @@ " Remarque : après une fusion manuelle, l'utilisateur devra continuer en " "appuyant sur F7." -#: directorymergewindow.cpp:2900 +#: directorymergewindow.cpp:2914 #, 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:2909 +#: directorymergewindow.cpp:2923 #, kde-format msgid "copyLink( %1 -> %2 )" msgstr "copier le lien( %1 -> %2 )" -#: directorymergewindow.cpp:2918 +#: directorymergewindow.cpp:2932 #, kde-format 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:2928 +#: directorymergewindow.cpp:2942 #, kde-format msgid "Error: copyLink failed." msgstr "Erreur : copie du lien impossible." -#: directorymergewindow.cpp:2953 +#: directorymergewindow.cpp:2967 #, kde-format msgid "copy( %1 -> %2 )" msgstr "copie( %1 -> %2 )" -#: directorymergewindow.cpp:2979 +#: directorymergewindow.cpp:2993 #, 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:2986 +#: directorymergewindow.cpp:3000 #, kde-format msgid "rename( %1 -> %2 )" msgstr "renommer( %1 -> %2 )" -#: directorymergewindow.cpp:2995 +#: directorymergewindow.cpp:3009 #, kde-format msgid "Error: Rename failed." msgstr "Erreur : renommage impossible." -#: directorymergewindow.cpp:3013 +#: directorymergewindow.cpp:3027 #, 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:3030 +#: directorymergewindow.cpp:3044 #, kde-format msgid "makeDir( %1 )" msgstr "création du dossier( %1 )" -#: directorymergewindow.cpp:3040 +#: directorymergewindow.cpp:3054 #, kde-format msgid "Error while creating directory." msgstr "Erreur durant la création du dossier." -#: directorymergewindow.cpp:3076 directorymergewindow.cpp:3195 +#: directorymergewindow.cpp:3090 directorymergewindow.cpp:3209 #, kde-format msgid "Dest" msgstr "Dest" -#: directorymergewindow.cpp:3084 directorymergewindow.cpp:3113 +#: directorymergewindow.cpp:3098 directorymergewindow.cpp:3127 #, kde-format msgid "Dir" msgstr "Dossier" -#: directorymergewindow.cpp:3084 +#: directorymergewindow.cpp:3098 #, kde-format msgid "Type" msgstr "Type" -#: directorymergewindow.cpp:3084 +#: directorymergewindow.cpp:3098 #, kde-format msgid "Size" msgstr "Taille" -#: directorymergewindow.cpp:3085 +#: directorymergewindow.cpp:3099 #, kde-format msgid "Attr" msgstr "Attr" -#: directorymergewindow.cpp:3085 +#: directorymergewindow.cpp:3099 #, kde-format msgid "Last Modification" msgstr "Dernière modification" -#: directorymergewindow.cpp:3085 +#: directorymergewindow.cpp:3099 #, kde-format msgid "Link-Destination" msgstr "Destination du lien" -#: directorymergewindow.cpp:3113 +#: directorymergewindow.cpp:3127 #, kde-format msgid "File" msgstr "Fichier" -#: directorymergewindow.cpp:3113 +#: directorymergewindow.cpp:3127 #, kde-format msgid "-Link" msgstr "-Lien" -#: directorymergewindow.cpp:3119 +#: directorymergewindow.cpp:3133 #, kde-format msgid "not available" msgstr "non disponible" -#: directorymergewindow.cpp:3137 +#: directorymergewindow.cpp:3151 #, kde-format msgid "A (Dest): " msgstr "A (Dest) : " -#: directorymergewindow.cpp:3141 +#: directorymergewindow.cpp:3155 #, kde-format msgid "A: " msgstr "A : " -#: directorymergewindow.cpp:3141 +#: directorymergewindow.cpp:3155 #, kde-format msgid "A (Base): " msgstr "A (Base) : " -#: directorymergewindow.cpp:3147 +#: directorymergewindow.cpp:3161 #, kde-format msgid "B (Dest): " msgstr "B (Dest) : " -#: directorymergewindow.cpp:3151 +#: directorymergewindow.cpp:3165 #, kde-format msgid "B: " msgstr "B : " -#: directorymergewindow.cpp:3156 +#: directorymergewindow.cpp:3170 #, kde-format msgid "C (Dest): " msgstr "C (Dest) : " -#: directorymergewindow.cpp:3160 +#: directorymergewindow.cpp:3174 #, kde-format msgid "C: " msgstr "C : " -#: directorymergewindow.cpp:3163 +#: directorymergewindow.cpp:3177 #, kde-format msgid "Dest: " msgstr "Dest : " #. i18n("Saving Directory Merge State ...")); -#: directorymergewindow.cpp:3238 +#: directorymergewindow.cpp:3252 #, kde-format msgid "Save Directory Merge State As..." msgstr "Enregistrer l'état de fusion des dossiers sous..." -#: directorymergewindow.cpp:3387 +#: directorymergewindow.cpp:3401 #, kde-format msgid "Start/Continue Directory Merge" msgstr "Démarrer / Poursuivre la fusion des dossiers" -#: directorymergewindow.cpp:3388 +#: directorymergewindow.cpp:3402 #, kde-format msgid "Run Operation for Current Item" msgstr "Lancer l'opération pour l'élément actuel" -#: directorymergewindow.cpp:3389 +#: directorymergewindow.cpp:3403 #, kde-format msgid "Compare Selected File" msgstr "Comparer le fichier sélectionné" -#: directorymergewindow.cpp:3390 +#: directorymergewindow.cpp:3404 #, kde-format msgid "Merge Current File" msgstr "Fusionner le fichier actuel" -#: directorymergewindow.cpp:3390 +#: directorymergewindow.cpp:3404 #, kde-format msgid "" "Merge\n" @@ -846,51 +847,51 @@ "Fusion\n" "Fichier" -#: directorymergewindow.cpp:3391 +#: directorymergewindow.cpp:3405 #, kde-format msgid "Fold All Subdirs" msgstr "Replier tous les sous-dossiers" -#: directorymergewindow.cpp:3392 +#: directorymergewindow.cpp:3406 #, kde-format msgid "Unfold All Subdirs" msgstr "Déplier tous les sous-dossiers" #. i18n("Save Directory Merge State ..."), 0, this, &DirectoryMergeWindow::slotSaveMergeState, ac, "dir_save_merge_state"); #. i18n("Load Directory Merge State ..."), 0, this, &DirectoryMergeWindow::slotLoadMergeState, ac, "dir_load_merge_state"); -#: directorymergewindow.cpp:3396 +#: directorymergewindow.cpp:3410 #, kde-format msgid "Choose A for All Items" msgstr "Choisir A pour tous les éléments" -#: directorymergewindow.cpp:3397 +#: directorymergewindow.cpp:3411 #, kde-format msgid "Choose B for All Items" msgstr "Choisir B pour tous les éléments" -#: directorymergewindow.cpp:3398 +#: directorymergewindow.cpp:3412 #, kde-format msgid "Choose C for All Items" msgstr "Choisir C pour tous les éléments" -#: directorymergewindow.cpp:3399 +#: directorymergewindow.cpp:3413 #, kde-format msgid "Auto-Choose Operation for All Items" msgstr "Choisir automatiquement l'opération pour tous les éléments" -#: directorymergewindow.cpp:3400 +#: directorymergewindow.cpp:3414 #, kde-format msgid "No Operation for All Items" msgstr "Pas d'opération pour tous les éléments" #. i18n("Synchronize Directories"), 0, this, &DirectoryMergeWindow::slotSynchronizeDirectories, ac, "dir_synchronize_directories"); #. d->m_pDirChooseNewerFiles = GuiUtils::createAction< KToggleAction >(i18n("Copy Newer Files Instead of Merging"), 0, this, &DirectoryMergeWindow::slotChooseNewerFiles, ac, "dir_choose_newer_files"); -#: directorymergewindow.cpp:3405 +#: directorymergewindow.cpp:3419 #, kde-format msgid "Show Identical Files" msgstr "Afficher les fichiers identiques" -#: directorymergewindow.cpp:3405 +#: directorymergewindow.cpp:3419 #, kde-format msgid "" "Identical\n" @@ -899,17 +900,17 @@ "Identiques\n" "Fichiers" -#: directorymergewindow.cpp:3406 +#: directorymergewindow.cpp:3420 #, kde-format msgid "Show Different Files" msgstr "Afficher les fichiers différents" -#: directorymergewindow.cpp:3407 +#: directorymergewindow.cpp:3421 #, kde-format msgid "Show Files only in A" msgstr "Afficher les fichiers uniquement dans A" -#: directorymergewindow.cpp:3407 +#: directorymergewindow.cpp:3421 #, kde-format msgid "" "Files\n" @@ -918,12 +919,12 @@ "Fichiers\n" "uniquement dans A" -#: directorymergewindow.cpp:3408 +#: directorymergewindow.cpp:3422 #, kde-format msgid "Show Files only in B" msgstr "Afficher les fichiers uniquement dans B" -#: directorymergewindow.cpp:3408 +#: directorymergewindow.cpp:3422 #, kde-format msgid "" "Files\n" @@ -932,12 +933,12 @@ "Fichiers\n" "uniquement dans B" -#: directorymergewindow.cpp:3409 +#: directorymergewindow.cpp:3423 #, kde-format msgid "Show Files only in C" msgstr "Afficher les fichiers uniquement dans C" -#: directorymergewindow.cpp:3409 +#: directorymergewindow.cpp:3423 #, kde-format msgid "" "Files\n" @@ -946,52 +947,57 @@ "Fichiers\n" "uniquement dans C" -#: directorymergewindow.cpp:3413 +#: directorymergewindow.cpp:3427 #, kde-format msgid "Compare Explicitly Selected Files" msgstr "Comparer les fichiers explicitement sélectionnés" -#: directorymergewindow.cpp:3414 +#: directorymergewindow.cpp:3428 #, kde-format msgid "Merge Explicitly Selected Files" msgstr "Fusionner les fichiers explicitement sélectionnés" -#: directorymergewindow.cpp:3416 directorymergewindow.cpp:3423 +#: directorymergewindow.cpp:3430 directorymergewindow.cpp:3437 #, kde-format msgid "Do Nothing" msgstr "Ne rien faire" -#: directorymergewindow.cpp:3428 +#: directorymergewindow.cpp:3442 #, kde-format msgid "Delete A && B" msgstr "Supprimer A et B" -#: directorymergewindow.cpp:3431 +#: directorymergewindow.cpp:3445 #, kde-format msgid "Merge to A && B" msgstr "Fusionner vers A et B" -#: fileaccess.cpp:462 SourceData.cpp:493 +#: fileaccess.cpp:301 +#, kde-format +msgid "Unable to determine full url. No parent specified." +msgstr "Impossible de déterminer l'URL complète. Aucun parent renseigné." + +#: fileaccess.cpp:482 SourceData.cpp:506 #, kde-format msgid "Failed to read file: %1" msgstr "Impossible de lire le fichier : %1" -#: fileaccess.cpp:587 +#: fileaccess.cpp:624 #, kde-format msgid "Creating temp copy of %1 failed." msgstr "Impossible de créer la copie temporaire de %1." -#: fileaccess.cpp:595 fileaccess.cpp:600 +#: fileaccess.cpp:632 fileaccess.cpp:637 #, kde-format msgid "Opening %1 failed. %2" msgstr "Impossible d'ouvrir %1. %2" -#: fileaccess.cpp:619 fileaccess.cpp:627 +#: fileaccess.cpp:656 fileaccess.cpp:664 #, kde-format msgid "Error reading from %1. %2" msgstr "Erreur de lecture depuis %1. %2" -#: fileaccess.cpp:751 +#: fileaccess.cpp:788 #, kde-format msgid "" "While trying to make a backup, deleting an older backup failed.\n" @@ -1001,7 +1007,7 @@ "sauvegarde.\n" "Nom du fichier : %1" -#: fileaccess.cpp:758 +#: fileaccess.cpp:795 #, kde-format msgid "" "While trying to make a backup, renaming failed.\n" @@ -1010,178 +1016,178 @@ "Le renommage a échoué pendant la tentative de sauvegarde.\n" "Noms des fichiers : %1 -> %2" -#: fileaccess.cpp:828 +#: fileaccess.cpp:865 #, kde-format msgid "Getting file status: %1" msgstr "Obtention de l'état du fichier : %1" -#: fileaccess.cpp:869 +#: fileaccess.cpp:906 #, kde-format msgid "Reading file: %1" msgstr "Lecture du fichier : %1" -#: fileaccess.cpp:907 +#: fileaccess.cpp:944 #, kde-format msgid "Writing file: %1" msgstr "Écriture du fichier : %1" -#: fileaccess.cpp:940 +#: fileaccess.cpp:977 #, kde-format msgid "Out of memory" msgstr "Mémoire pleine" -#: fileaccess.cpp:976 +#: fileaccess.cpp:1013 #, kde-format msgid "Making directory: %1" msgstr "Création du dossier : %1" -#: fileaccess.cpp:997 +#: fileaccess.cpp:1034 #, kde-format msgid "Removing directory: %1" msgstr "Suppression du dossier : %1" -#: fileaccess.cpp:1012 +#: fileaccess.cpp:1049 #, kde-format msgid "Removing file: %1" msgstr "Suppression du fichier : %1" -#: fileaccess.cpp:1028 +#: fileaccess.cpp:1065 #, kde-format msgid "Creating symbolic link: %1 -> %2" msgstr "Création d'un lien symbolique : %1 -> %2" -#: fileaccess.cpp:1052 +#: fileaccess.cpp:1089 #, kde-format msgid "Renaming file: %1 -> %2" msgstr "Renommage du fichier : %1 -> %2" -#: fileaccess.cpp:1086 +#: fileaccess.cpp:1123 #, kde-format msgid "Copying file: %1 -> %2" msgstr "Copie du fichier : %1 -> %2" -#: fileaccess.cpp:1108 +#: fileaccess.cpp:1145 #, kde-format msgid "Reading directory: %1" msgstr "Lecture du dossier : %1" -#: fileaccess.cpp:1162 +#: fileaccess.cpp:1202 #, kde-format msgid "Listing directory: %1" msgstr "Listage du dossier : %1" -#: kdiff3.cpp:181 +#: kdiff3.cpp:182 #, kde-format msgid "Current Configuration:" msgstr "Configuration actuelle :" -#: kdiff3.cpp:186 +#: kdiff3.cpp:187 #, kde-format msgid "Config Option Error:" msgstr "Erreur d'option de configuration :" -#: kdiff3.cpp:240 +#: kdiff3.cpp:246 #, kde-format msgid "Option --auto used, but no output file specified." msgstr "Option --auto utilisée, mais aucun fichier résultat spécifié." -#: kdiff3.cpp:416 +#: kdiff3.cpp:405 #, kde-format msgid "Option --auto ignored for directory comparison." msgstr "Option --auto ignorée pour la comparaison de dossiers." -#: kdiff3.cpp:460 +#: kdiff3.cpp:449 #, kde-format msgid "Saving failed." msgstr "Impossible d'enregistrer." -#: kdiff3.cpp:496 pdiff.cpp:1098 +#: kdiff3.cpp:494 pdiff.cpp:1096 #, kde-format msgid "Opening of these files failed:" msgstr "Ouverture de ces fichiers impossible :" -#: kdiff3.cpp:505 +#: kdiff3.cpp:503 pdiff.cpp:1105 #, kde-format -msgid "File Open Error" -msgstr "Erreur d'ouverture d'un fichier" +msgid "File open error" +msgstr "Erreur d'ouverture du fichier" -#: kdiff3.cpp:533 +#: kdiff3.cpp:532 #, kde-format msgid "Opens documents for comparison..." msgstr "Ouvre les documents pour faire une comparaison..." -#: kdiff3.cpp:535 +#: kdiff3.cpp:534 #, kde-format msgid "Reload" msgstr "Recharger" -#: kdiff3.cpp:538 +#: kdiff3.cpp:537 #, kde-format 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:540 +#: kdiff3.cpp:539 #, kde-format msgid "Saves the current document as..." msgstr "Enregistre le document actuel sous..." -#: kdiff3.cpp:543 +#: kdiff3.cpp:542 #, kde-format msgid "Print the differences" msgstr "Afficher les différences" -#: kdiff3.cpp:546 +#: kdiff3.cpp:545 #, kde-format msgid "Quits the application" msgstr "Quitte l'application" -#: kdiff3.cpp:549 +#: kdiff3.cpp:548 #, kde-format 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:552 +#: kdiff3.cpp:551 #, kde-format msgid "Copies the selected section to the clipboard" msgstr "Copie la sélection dans le presse-papiers" -#: kdiff3.cpp:554 +#: kdiff3.cpp:553 #, kde-format msgid "Pastes the clipboard contents to current position" msgstr "Colle le contenu du presse-papiers à la position actuelle" -#: kdiff3.cpp:557 +#: kdiff3.cpp:556 #, kde-format msgid "Select everything in current window" msgstr "Tout sélectionner dans la fenêtre actuelle" -#: kdiff3.cpp:560 +#: kdiff3.cpp:559 #, kde-format msgid "Search for a string" msgstr "Chercher une chaîne" -#: kdiff3.cpp:562 +#: kdiff3.cpp:561 #, kde-format msgid "Search again for the string" msgstr "Chercher à nouveau la chaîne" -#: kdiff3.cpp:567 +#: kdiff3.cpp:566 #, kde-format msgid "Enables/disables the statusbar" msgstr "Active/désactive la barre d'état" -#: kdiff3.cpp:571 +#: kdiff3.cpp:570 #, kde-format msgid "Configure KDiff3..." msgstr "Configurer KDiff3..." -#: kdiff3.cpp:590 +#: kdiff3.cpp:589 #, kde-format msgid "Go to Current Delta" msgstr "Aller au delta actuel" -#: kdiff3.cpp:590 +#: kdiff3.cpp:589 #, kde-format msgid "" "Current\n" @@ -1190,12 +1196,12 @@ "Actuel\n" "Delta" -#: kdiff3.cpp:592 +#: kdiff3.cpp:591 #, kde-format msgid "Go to First Delta" msgstr "Aller au premier delta" -#: kdiff3.cpp:592 +#: kdiff3.cpp:591 #, kde-format msgid "" "First\n" @@ -1204,12 +1210,12 @@ "Premier\n" "Delta" -#: kdiff3.cpp:594 +#: kdiff3.cpp:593 #, kde-format msgid "Go to Last Delta" msgstr "Aller au dernier delta" -#: kdiff3.cpp:594 +#: kdiff3.cpp:593 #, kde-format msgid "" "Last\n" @@ -1218,14 +1224,14 @@ "Dernier\n" "Delta" -#: kdiff3.cpp:596 +#: kdiff3.cpp:595 #, kde-format 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:597 +#: kdiff3.cpp:596 #, kde-format msgid "" "(Does not skip white space differences even when \"Show White Space\" is " @@ -1234,12 +1240,12 @@ "(Ne saute pas les différences d'espaces même quand « Afficher les espaces » " "est désactivé)" -#: kdiff3.cpp:598 +#: kdiff3.cpp:597 #, kde-format msgid "Go to Previous Delta" msgstr "Aller au delta précédent" -#: kdiff3.cpp:598 +#: kdiff3.cpp:597 #, kde-format msgid "" "Prev\n" @@ -1248,12 +1254,12 @@ "Précédent\n" "Delta" -#: kdiff3.cpp:600 +#: kdiff3.cpp:599 #, kde-format msgid "Go to Next Delta" msgstr "Aller au delta suivant" -#: kdiff3.cpp:600 +#: kdiff3.cpp:599 #, kde-format msgid "" "Next\n" @@ -1262,12 +1268,12 @@ "Suiv\n" "Delta" -#: kdiff3.cpp:602 +#: kdiff3.cpp:601 #, kde-format msgid "Go to Previous Conflict" msgstr "Aller au conflit précédent" -#: kdiff3.cpp:602 +#: kdiff3.cpp:601 #, kde-format msgid "" "Prev\n" @@ -1276,12 +1282,12 @@ "Préc\n" "Conflit" -#: kdiff3.cpp:604 +#: kdiff3.cpp:603 #, kde-format msgid "Go to Next Conflict" msgstr "Aller au conflit suivant" -#: kdiff3.cpp:604 +#: kdiff3.cpp:603 #, kde-format msgid "" "Next\n" @@ -1290,12 +1296,12 @@ "Suiv\n" "Conflit" -#: kdiff3.cpp:606 +#: kdiff3.cpp:605 #, kde-format msgid "Go to Previous Unsolved Conflict" msgstr "Aller au conflit non résolu précédent" -#: kdiff3.cpp:606 +#: kdiff3.cpp:605 #, kde-format msgid "" "Prev\n" @@ -1304,12 +1310,12 @@ "Préc\n" "Non résolu" -#: kdiff3.cpp:608 +#: kdiff3.cpp:607 #, kde-format msgid "Go to Next Unsolved Conflict" msgstr "Aller au conflit non résolu suivant" -#: kdiff3.cpp:608 +#: kdiff3.cpp:607 #, kde-format msgid "" "Next\n" @@ -1318,12 +1324,12 @@ "Suiv\n" "Non résolu" -#: kdiff3.cpp:610 +#: kdiff3.cpp:609 #, kde-format msgid "Select Line(s) From A" msgstr "Sélectionner la(les) ligne(s) à partir de A" -#: kdiff3.cpp:610 +#: kdiff3.cpp:609 #, kde-format msgid "" "Choose\n" @@ -1332,12 +1338,12 @@ "Choisir\n" "A" -#: kdiff3.cpp:611 +#: kdiff3.cpp:610 #, kde-format msgid "Select Line(s) From B" msgstr "Sélectionner la(les) ligne(s) à partir de B" -#: kdiff3.cpp:611 +#: kdiff3.cpp:610 #, kde-format msgid "" "Choose\n" @@ -1346,12 +1352,12 @@ "Choisir\n" "B" -#: kdiff3.cpp:612 +#: kdiff3.cpp:611 #, kde-format msgid "Select Line(s) From C" msgstr "Sélectionner la(les) ligne(s) à partir de C" -#: kdiff3.cpp:612 +#: kdiff3.cpp:611 #, kde-format msgid "" "Choose\n" @@ -1360,14 +1366,14 @@ "Choisir\n" "C" -#: kdiff3.cpp:613 +#: kdiff3.cpp:612 #, kde-format 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:613 +#: kdiff3.cpp:612 #, kde-format msgid "" "Auto\n" @@ -1376,12 +1382,12 @@ "Auto\n" "Suivant" -#: kdiff3.cpp:615 +#: kdiff3.cpp:614 #, kde-format msgid "Show Space && Tabulator Characters" msgstr "Afficher les caractères d'espacement et de tabulation" -#: kdiff3.cpp:615 +#: kdiff3.cpp:614 #, kde-format msgid "" "White\n" @@ -1390,12 +1396,12 @@ "Blanc\n" "Caractères" -#: kdiff3.cpp:616 +#: kdiff3.cpp:615 #, kde-format msgid "Show White Space" msgstr "Afficher les espaces" -#: kdiff3.cpp:616 +#: kdiff3.cpp:615 #, kde-format msgid "" "White\n" @@ -1404,12 +1410,12 @@ "Blanc\n" "Deltas" -#: kdiff3.cpp:618 +#: kdiff3.cpp:617 #, kde-format msgid "Show Line Numbers" msgstr "Afficher les numéros de lignes" -#: kdiff3.cpp:618 +#: kdiff3.cpp:617 #, kde-format msgid "" "Line\n" @@ -1418,132 +1424,132 @@ "Ligne\n" "Numéros" -#: kdiff3.cpp:620 +#: kdiff3.cpp:619 #, kde-format msgid "Automatically Solve Simple Conflicts" msgstr "Résoudre automatiquement les conflits simples" -#: kdiff3.cpp:621 +#: kdiff3.cpp:620 #, kde-format msgid "Set Deltas to Conflicts" msgstr "Attribuer des deltas aux conflits" -#: kdiff3.cpp:622 +#: kdiff3.cpp:621 #, kde-format msgid "Run Regular Expression Auto Merge" msgstr "Exécuter la fusion automatique de l'expression rationnelle" -#: kdiff3.cpp:623 +#: kdiff3.cpp:622 #, kde-format msgid "Automatically Solve History Conflicts" msgstr "Résoudre automatiquement les conflits d'historique" -#: kdiff3.cpp:624 +#: kdiff3.cpp:623 #, kde-format msgid "Split Diff At Selection" msgstr "Scinder les différences à la sélection" -#: kdiff3.cpp:625 +#: kdiff3.cpp:624 #, kde-format msgid "Join Selected Diffs" msgstr "Réunir les différences sélectionnées" -#: kdiff3.cpp:627 +#: kdiff3.cpp:626 #, kde-format msgid "Show Window A" msgstr "Afficher la fenêtre A" -#: kdiff3.cpp:628 +#: kdiff3.cpp:627 #, kde-format msgid "Show Window B" msgstr "Afficher la fenêtre B" -#: kdiff3.cpp:629 +#: kdiff3.cpp:628 #, kde-format msgid "Show Window C" msgstr "Afficher la fenêtre C" -#: kdiff3.cpp:631 +#: kdiff3.cpp:630 #, kde-format msgid "Normal Overview" msgstr "Vue d'ensemble normale" -#: kdiff3.cpp:632 +#: kdiff3.cpp:631 #, kde-format msgid "A vs. B Overview" msgstr "Vue d'ensemble de A par rapport à B" -#: kdiff3.cpp:633 +#: kdiff3.cpp:632 #, kde-format msgid "A vs. C Overview" msgstr "Vue d'ensemble de A par rapport à C" -#: kdiff3.cpp:634 +#: kdiff3.cpp:633 #, kde-format msgid "B vs. C Overview" msgstr "Vue d'ensemble de B par rapport à C" -#: kdiff3.cpp:635 +#: kdiff3.cpp:634 #, kde-format msgid "Word Wrap Diff Windows" msgstr "Retour à la ligne automatique des fenêtres d'affichage de différences" -#: kdiff3.cpp:636 +#: kdiff3.cpp:635 #, kde-format msgid "Add Manual Diff Alignment" msgstr "Ajouter l'alignement manuel des différences" -#: kdiff3.cpp:637 +#: kdiff3.cpp:636 #, kde-format msgid "Clear All Manual Diff Alignments" msgstr "Effacer tous les alignements manuels des différences" -#: kdiff3.cpp:639 +#: kdiff3.cpp:638 #, kde-format msgid "Focus Next Window" msgstr "Mettre le focus sur la fenêtre suivante" -#: kdiff3.cpp:640 +#: kdiff3.cpp:639 #, kde-format msgid "Focus Prev Window" msgstr "Mettre le focus sur la fenêtre précédente" -#: kdiff3.cpp:641 +#: kdiff3.cpp:640 #, kde-format msgid "Toggle Split Orientation" msgstr "Changer l'orientation du séparateur" -#: kdiff3.cpp:643 +#: kdiff3.cpp:642 #, kde-format msgid "Dir && Text Split Screen View" msgstr "Vue de l'écran divisé en dossier et texte" -#: kdiff3.cpp:645 +#: kdiff3.cpp:644 #, kde-format msgid "Toggle Between Dir && Text View" msgstr "Basculer entre l'affichage du dossier et l'affichage du texte" -#: kdiff3.cpp:697 pdiff.cpp:1909 +#: kdiff3.cpp:696 pdiff.cpp:1919 #, kde-format msgid "The merge result has not been saved." msgstr "Le résultat de la fusion n'a pas été enregistré." -#: kdiff3.cpp:699 +#: kdiff3.cpp:698 #, kde-format msgid "Save && Quit" msgstr "Enregistrer et quitter" -#: kdiff3.cpp:700 +#: kdiff3.cpp:699 #, kde-format msgid "Quit Without Saving" msgstr "Quitter sans enregistrer" -#: kdiff3.cpp:708 pdiff.cpp:1920 +#: kdiff3.cpp:707 pdiff.cpp:1930 #, kde-format msgid "Saving the merge result failed." msgstr "Enregistrement du résultat de la fusion impossible." -#: kdiff3.cpp:719 pdiff.cpp:1032 +#: kdiff3.cpp:718 pdiff.cpp:1030 #, kde-format msgid "" "You are currently doing a directory merge. Are you sure, you want to abort?" @@ -1551,62 +1557,62 @@ "Vous effectuez actuellement une fusion de dossiers. Voulez-vous vraiment " "l'interrompre ?" -#: kdiff3.cpp:742 +#: kdiff3.cpp:741 #, kde-format msgid "Saving file..." msgstr "Enregistrement du fichier..." -#: kdiff3.cpp:759 +#: kdiff3.cpp:758 #, kde-format msgid "Saving file with a new filename..." msgstr "Enregistrement du fichier sous un nouveau nom..." -#: kdiff3.cpp:761 +#: kdiff3.cpp:760 #, kde-format msgid "Save As..." msgstr "Enregistrer sous..." -#: kdiff3.cpp:820 +#: kdiff3.cpp:819 #, kde-format msgid "Printing not implemented." msgstr "Impression non implémentée." -#: kdiff3.cpp:857 +#: kdiff3.cpp:858 #, kde-format msgid "Printing..." msgstr "Impression..." -#: kdiff3.cpp:943 +#: kdiff3.cpp:948 #, kde-format msgid "Printing page %1 of %2" msgstr "Impression de la page %1 sur %2" -#: kdiff3.cpp:1000 +#: kdiff3.cpp:1006 #, kde-format msgid " (Selection)" msgstr " (Sélection)" -#: kdiff3.cpp:1027 +#: kdiff3.cpp:1034 #, kde-format msgid "Printing completed." msgstr "L'impression est terminée." -#: kdiff3.cpp:1031 +#: kdiff3.cpp:1038 #, kde-format msgid "Printing aborted." msgstr "Impression interrompue." -#: kdiff3.cpp:1038 +#: kdiff3.cpp:1045 #, kde-format msgid "Exiting..." msgstr "Fermeture..." -#: kdiff3.cpp:1049 +#: kdiff3.cpp:1056 #, kde-format msgid "Toggling toolbar..." msgstr "(Dés)Activation de la barre d'outils..." -#: kdiff3.cpp:1070 +#: kdiff3.cpp:1077 #, kde-format msgid "Toggle the statusbar..." msgstr "(Dés)Activation de la barre d'état..." @@ -1631,7 +1637,7 @@ msgid "Joachim Eibl" msgstr "Joachim Eibl" -#: kdiff3_part.cpp:173 kdiff3_part.cpp:254 +#: kdiff3_part.cpp:174 kdiff3_part.cpp:255 #, kde-format msgid "Could not find files for comparison." msgstr "Impossible de trouver les fichiers pour la comparaison." @@ -1649,7 +1655,7 @@ msgstr "Configurer KDiff3" #. i18n: ectx: ToolBar (mainToolBar) -#: kdiff3_part.rc:16 main.cpp:88 +#: kdiff3_part.rc:16 main.cpp:89 #, kde-format msgid "KDiff3" msgstr "KDiff3" @@ -1720,88 +1726,93 @@ msgid "Main Toolbar" msgstr "Barre principale" -#: main.cpp:68 main.cpp:72 +#: main.cpp:69 main.cpp:73 #, kde-format msgid "Ignored. (User defined.)" msgstr "Ignoré. (Défini par l'utilisateur)" -#: main.cpp:92 +#: main.cpp:93 #, kde-format msgid " (64 bit)" msgstr "(64 bits)" -#: main.cpp:94 +#: main.cpp:95 #, kde-format msgid " (32 bit)" msgstr "(32 bits)" -#: main.cpp:95 +#: main.cpp:96 #, kde-format msgid "Tool for Comparison and Merge of Files and Directories" msgstr "Outil de comparaison et de fusion de fichiers et de dossiers" -#: main.cpp:96 +#: main.cpp:97 #, kde-format msgid "(c) 2002-2014 Joachim Eibl, (c) 2017 Michael Reeves KF5/Qt5 port" msgstr "" "(c) 2002-2014 Joachim Eibl, (c) 2017 Michael Reeves Portage vers KF5/Qt5" -#: main.cpp:112 +#: main.cpp:113 #, kde-format msgid "Merge the input." msgstr "Fusionner les entrées." -#: main.cpp:113 +#: main.cpp:114 #, kde-format msgid "Explicit base file. For compatibility with certain tools." msgstr "Fichier de base explicite. Pour la compatibilité avec certains outils." -#: main.cpp:114 +#: main.cpp:115 #, kde-format msgid "Output file. Implies -m. E.g.: -o newfile.txt" msgstr "Fichier de sortie. Implique -m. Par ex. : -o nouveaufichier.txt" -#: main.cpp:115 +#: main.cpp:116 #, kde-format msgid "Output file, again. (For compatibility with certain tools.)" msgstr "" "Fichier de sortie, encore. (Pour la compatibilité avec certains outils)" -#: main.cpp:116 +#: main.cpp:118 #, kde-format msgid "No GUI if all conflicts are auto-solvable. (Needs -o file)" msgstr "" "Pas d'interface graphique si tous les conflits se résolvent automatiquement. " "(Nécessite un fichier -o)" -#: main.cpp:117 +#: main.cpp:120 +#, kde-format +msgid "Ignored." +msgstr "Ignoré." + +#: main.cpp:122 #, kde-format msgid "Do not solve conflicts automatically." msgstr "Ne pas résoudre les conflits automatiquement." -#: main.cpp:118 +#: main.cpp:123 #, kde-format msgid "Visible name replacement for input file 1 (base)." msgstr "Remplacement de nom visible pour le fichier d'entrée 1 (base)." -#: main.cpp:119 +#: main.cpp:124 #, kde-format msgid "Visible name replacement for input file 2." msgstr "Remplacement de nom visible pour le fichier d'entrée 2." -#: main.cpp:120 +#: main.cpp:125 #, kde-format msgid "Visible name replacement for input file 3." msgstr "Remplacement de nom visible pour le fichier d'entrée 3." -#: main.cpp:121 +#: main.cpp:126 #, kde-format msgid "Alternative visible name replacement. Supply this once for every input." msgstr "" "Remplacement de nom visible secondaire. À fournir une seule fois pour chaque " "entrée." -#: main.cpp:122 +#: main.cpp:127 #, kde-format msgid "" "Override a config setting. Use once for every setting. E.g.: --cs " @@ -1810,89 +1821,89 @@ "Annuler un paramètre de configuration. À utiliser une seule fois pour chaque " "paramètre. Par ex. : --cs « AutoAdvance=1 »" -#: main.cpp:123 +#: main.cpp:128 #, kde-format msgid "Show list of config settings and current values." msgstr "" "Afficher la liste des paramètres de configuration et les valeurs actuelles." -#: main.cpp:124 +#: main.cpp:129 #, kde-format msgid "Use a different config file." msgstr "Utiliser un fichier de configuration différent." -#: main.cpp:127 +#: main.cpp:132 #, kde-format msgid "file1 to open (base, if not specified via --base)" msgstr "fichier 1 à ouvrir (base, si non spécifié, via --base)" -#: main.cpp:128 +#: main.cpp:133 #, kde-format msgid "file2 to open" msgstr "fichier 2 à ouvrir" -#: main.cpp:129 +#: main.cpp:134 #, kde-format msgid "file3 to open" msgstr "fichier 3 à ouvrir" -#: main.cpp:153 +#: main.cpp:158 #, kde-format msgid "See kdiff3 --help for supported options." msgstr "Consulter kdiff3 --help pour les options prises en charge." -#: mergeresultwindow.cpp:158 +#: mergeresultwindow.cpp:171 #, kde-format msgid "Choose A Everywhere" msgstr "Choisir A partout" -#: mergeresultwindow.cpp:159 +#: mergeresultwindow.cpp:172 #, kde-format msgid "Choose B Everywhere" msgstr "Choisir B partout" -#: mergeresultwindow.cpp:160 +#: mergeresultwindow.cpp:173 #, kde-format msgid "Choose C Everywhere" msgstr "Choisir C partout" -#: mergeresultwindow.cpp:161 +#: mergeresultwindow.cpp:174 #, kde-format msgid "Choose A for All Unsolved Conflicts" msgstr "Choisir A pour tous les conflits non résolus" -#: mergeresultwindow.cpp:162 +#: mergeresultwindow.cpp:175 #, kde-format msgid "Choose B for All Unsolved Conflicts" msgstr "Choisir B pour tous les conflits non résolus" -#: mergeresultwindow.cpp:163 +#: mergeresultwindow.cpp:176 #, kde-format msgid "Choose C for All Unsolved Conflicts" msgstr "Choisir C pour tous les conflits non résolus" -#: mergeresultwindow.cpp:164 +#: mergeresultwindow.cpp:177 #, kde-format msgid "Choose A for All Unsolved Whitespace Conflicts" msgstr "Choisir A pour tous les conflits d'espaces non résolus" -#: mergeresultwindow.cpp:165 +#: mergeresultwindow.cpp:178 #, kde-format msgid "Choose B for All Unsolved Whitespace Conflicts" msgstr "Choisir B pour tous les conflits d'espaces non résolus" -#: mergeresultwindow.cpp:166 +#: mergeresultwindow.cpp:179 #, kde-format msgid "Choose C for All Unsolved Whitespace Conflicts" msgstr "Choisir C pour tous les conflits d'espaces non résolus" -#: mergeresultwindow.cpp:176 +#: mergeresultwindow.cpp:204 #, 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)" -#: mergeresultwindow.cpp:370 +#: mergeresultwindow.cpp:398 #, kde-format msgid "" "The output has been modified.\n" @@ -1901,29 +1912,29 @@ "La sortie a été modifiée.\n" "Si vous continuez, vos changement seront perdus." -#: mergeresultwindow.cpp:936 pdiff.cpp:827 +#: mergeresultwindow.cpp:964 pdiff.cpp:817 #, kde-format msgid "All input files are binary equal." msgstr "Tous les fichiers d'entrée sont binairement identiques." -#: mergeresultwindow.cpp:938 +#: mergeresultwindow.cpp:966 #, kde-format msgid "All input files contain the same text." msgstr "Tous les fichiers d'entrée contiennent le même texte." -#: mergeresultwindow.cpp:942 mergeresultwindow.cpp:946 -#: mergeresultwindow.cpp:950 pdiff.cpp:833 pdiff.cpp:837 pdiff.cpp:841 +#: mergeresultwindow.cpp:970 mergeresultwindow.cpp:974 +#: mergeresultwindow.cpp:978 pdiff.cpp:823 pdiff.cpp:827 pdiff.cpp:831 #, kde-format msgid "Files %1 and %2 are binary equal.\n" msgstr "Les fichiers %1 et %2 sont binairement identiques.\n" -#: mergeresultwindow.cpp:944 mergeresultwindow.cpp:948 -#: mergeresultwindow.cpp:952 +#: mergeresultwindow.cpp:972 mergeresultwindow.cpp:976 +#: mergeresultwindow.cpp:980 #, kde-format msgid "Files %1 and %2 have equal text.\n" msgstr "Les fichiers %1 et%2 ont un texte identique.\n" -#: mergeresultwindow.cpp:958 +#: mergeresultwindow.cpp:986 #, kde-format msgid "" "Total number of conflicts: %1\n" @@ -1936,27 +1947,27 @@ "Nb de conflits non résolus : %3\n" "%4" -#: mergeresultwindow.cpp:964 +#: mergeresultwindow.cpp:992 #, kde-format msgid "Conflicts" msgstr "Conflits" -#: mergeresultwindow.cpp:1873 +#: mergeresultwindow.cpp:1901 #, kde-format msgid "" msgstr "" -#: mergeresultwindow.cpp:1881 +#: mergeresultwindow.cpp:1909 #, kde-format msgid "" msgstr "" -#: mergeresultwindow.cpp:1883 mergeresultwindow.cpp:2755 +#: mergeresultwindow.cpp:1911 mergeresultwindow.cpp:2783 #, kde-format msgid "" msgstr "" -#: mergeresultwindow.cpp:2967 +#: mergeresultwindow.cpp:2995 #, kde-format msgid "" "Not all conflicts are solved yet.\n" @@ -1965,12 +1976,12 @@ "Tous les conflits ne sont pas encore résolus.\n" "Fichier non enregistré." -#: mergeresultwindow.cpp:2969 mergeresultwindow.cpp:2978 +#: mergeresultwindow.cpp:2997 mergeresultwindow.cpp:3006 #, kde-format msgid "Conflicts Left" msgstr "Conflits restants" -#: mergeresultwindow.cpp:2976 +#: mergeresultwindow.cpp:3004 #, kde-format msgid "" "There is a line end style conflict. Please choose the line end style " @@ -1981,7 +1992,7 @@ "style de fin de ligne.\n" "Fichier non enregistré." -#: mergeresultwindow.cpp:2990 +#: mergeresultwindow.cpp:3018 #, kde-format msgid "" "\n" @@ -1992,57 +2003,57 @@ "\n" "Création de la sauvegarde impossible. Fichier non enregistré." -#: mergeresultwindow.cpp:2990 mergeresultwindow.cpp:3038 +#: mergeresultwindow.cpp:3018 mergeresultwindow.cpp:3066 #, kde-format msgid "File Save Error" msgstr "Erreur lors de l'enregistrement du fichier" -#: mergeresultwindow.cpp:3038 +#: mergeresultwindow.cpp:3066 #, kde-format msgid "Error while writing." msgstr "Erreur durant l'écriture." -#: mergeresultwindow.cpp:3110 +#: mergeresultwindow.cpp:3138 #, kde-format msgid "Output:" msgstr "Sortie :" -#: mergeresultwindow.cpp:3123 mergeresultwindow.cpp:3315 +#: mergeresultwindow.cpp:3151 mergeresultwindow.cpp:3343 #, kde-format msgid "[Modified]" msgstr "[Modifié]" -#: mergeresultwindow.cpp:3130 +#: mergeresultwindow.cpp:3158 #, kde-format msgid "Encoding for saving:" msgstr "Encodage pour l'enregistrement :" -#: mergeresultwindow.cpp:3230 +#: mergeresultwindow.cpp:3258 #, kde-format msgid "Conflict" msgstr "Conflit" -#: mergeresultwindow.cpp:3262 +#: mergeresultwindow.cpp:3290 #, kde-format msgid "Codec from A: %1" msgstr "Codec de A : %1" -#: mergeresultwindow.cpp:3264 +#: mergeresultwindow.cpp:3292 #, kde-format msgid "Codec from B: %1" msgstr "Codec de B : %1" -#: mergeresultwindow.cpp:3266 +#: mergeresultwindow.cpp:3294 #, kde-format msgid "Codec from C: %1" msgstr "Codec de C : %1" -#: optiondialog.cpp:119 +#: optiondialog.cpp:121 #, kde-format msgid "Change Font" msgstr "Changer la police" -#: optiondialog.cpp:135 optiondialog.cpp:145 +#: optiondialog.cpp:137 optiondialog.cpp:147 #, kde-format msgid "" "Font: %1, %2, %3\n" @@ -2053,125 +2064,125 @@ "\n" "Exemple :" -#: optiondialog.cpp:388 +#: optiondialog.cpp:390 #, kde-format msgid "Unicode" msgstr "Unicode" -#: optiondialog.cpp:389 +#: optiondialog.cpp:391 #, kde-format msgid "Latin1" msgstr "Latin1" -#: optiondialog.cpp:408 +#: optiondialog.cpp:410 #, kde-format msgid "Change this if non-ASCII characters are not displayed correctly." msgstr "" "Changez ce paramètre si les caractères non-ASCII ne sont pas affichés " "correctement." -#: optiondialog.cpp:491 +#: optiondialog.cpp:495 #, kde-format msgid "Configure" msgstr "Configurer" -#: optiondialog.cpp:568 +#: optiondialog.cpp:573 #, kde-format msgid "Font" msgstr "Police" -#: optiondialog.cpp:570 +#: optiondialog.cpp:575 #, kde-format msgid "Editor & Diff Output Font" msgstr "Police de l'éditeur et de la sortie de l'analyse des différences" -#: optiondialog.cpp:589 +#: optiondialog.cpp:594 #, kde-format msgid "Application font" msgstr "Police de l'application" -#: optiondialog.cpp:594 +#: optiondialog.cpp:599 #, kde-format msgid "File view font" msgstr "Police d'affichage des fichiers" -#: optiondialog.cpp:613 +#: optiondialog.cpp:618 #, kde-format msgctxt "Title for color settings page" msgid "Color" msgstr "Couleur" -#: optiondialog.cpp:614 +#: optiondialog.cpp:619 #, kde-format msgid "Colors Settings" msgstr "Paramètres des couleurs" -#: optiondialog.cpp:631 +#: optiondialog.cpp:644 #, kde-format msgid "Editor and Diff Views:" msgstr "Vues de l'éditeur et de la fenêtre d'analyse de différences :" -#: optiondialog.cpp:639 +#: optiondialog.cpp:652 #, kde-format msgid "Foreground color:" msgstr "Couleur du premier plan :" -#: optiondialog.cpp:647 +#: optiondialog.cpp:660 #, kde-format msgid "Background color:" msgstr "Couleur de fond :" -#: optiondialog.cpp:657 +#: optiondialog.cpp:670 #, kde-format msgid "Diff background color:" msgstr "Couleur de fond pour l'affichage des différences :" -#: optiondialog.cpp:666 +#: optiondialog.cpp:679 #, kde-format msgid "Color A:" msgstr "Couleur A :" -#: optiondialog.cpp:675 +#: optiondialog.cpp:688 #, kde-format msgid "Color B:" msgstr "Couleur B :" -#: optiondialog.cpp:684 +#: optiondialog.cpp:697 #, kde-format msgid "Color C:" msgstr "Couleur C :" -#: optiondialog.cpp:692 +#: optiondialog.cpp:705 #, kde-format msgid "Conflict color:" msgstr "Couleur des conflits :" -#: optiondialog.cpp:701 +#: optiondialog.cpp:714 #, kde-format msgid "Current range background color:" msgstr "Couleur de fond de la plage actuelle :" -#: optiondialog.cpp:710 +#: optiondialog.cpp:723 #, kde-format msgid "Current range diff background color:" msgstr "Couleur de fond pour les différences dans la plage actuelle :" -#: optiondialog.cpp:718 +#: optiondialog.cpp:731 #, kde-format msgid "Color for manually aligned difference ranges:" msgstr "Couleur pour les plages de différences alignées manuellement :" -#: optiondialog.cpp:725 +#: optiondialog.cpp:738 #, kde-format msgid "Directory Comparison View:" msgstr "Affichage de comparaison des dossiers :" -#: optiondialog.cpp:731 +#: optiondialog.cpp:744 #, kde-format msgid "Newest file color:" msgstr "Couleur pour les fichiers les plus récents :" -#: optiondialog.cpp:736 +#: optiondialog.cpp:749 #, kde-format msgid "" "Changing this color will only be effective when starting the next directory " @@ -2180,37 +2191,37 @@ "Le changement de cette couleur ne sera effectif qu'au prochain démarrage de " "la comparaison des dossiers." -#: optiondialog.cpp:741 +#: optiondialog.cpp:754 #, kde-format msgid "Oldest file color:" msgstr "Couleur pour les fichiers les plus anciens :" -#: optiondialog.cpp:750 +#: optiondialog.cpp:763 #, kde-format msgid "Middle age file color:" msgstr "Couleur pour les fichiers d'âge moyen :" -#: optiondialog.cpp:759 +#: optiondialog.cpp:772 #, kde-format msgid "Color for missing files:" msgstr "Couleur pour les fichiers manquants :" -#: optiondialog.cpp:773 +#: optiondialog.cpp:786 #, kde-format msgid "Editor" msgstr "Éditeur" -#: optiondialog.cpp:774 +#: optiondialog.cpp:787 #, kde-format msgid "Editor Behavior" msgstr "Comportement de l'éditeur" -#: optiondialog.cpp:787 +#: optiondialog.cpp:809 #, kde-format msgid "Tab inserts spaces" msgstr "Une tabulation insère des espaces" -#: optiondialog.cpp:791 +#: optiondialog.cpp:813 #, kde-format msgid "" "On: Pressing tab generates the appropriate number of spaces.\n" @@ -2220,29 +2231,29 @@ "d'espaces.\n" "Désactivé : un caractère de tabulation va être inséré." -#: optiondialog.cpp:796 +#: optiondialog.cpp:818 #, kde-format msgid "Tab size:" msgstr "Taille d'une tabulation :" -#: optiondialog.cpp:803 +#: optiondialog.cpp:825 #, kde-format msgid "Auto indentation" msgstr "Indentation automatique" -#: optiondialog.cpp:807 +#: optiondialog.cpp:829 #, kde-format msgid "On: The indentation of the previous line is used for a new line.\n" msgstr "" "Activé : l'indentation de la ligne précédente est utilisée pour une nouvelle " "ligne.\n" -#: optiondialog.cpp:810 +#: optiondialog.cpp:832 #, kde-format msgid "Auto copy selection" msgstr "Copier automatiquement la sélection" -#: optiondialog.cpp:814 +#: optiondialog.cpp:836 #, kde-format msgid "" "On: Any selection is immediately written to the clipboard.\n" @@ -2251,7 +2262,7 @@ "Activé : toute sélection est immédiatement copiée dans le presse-papiers.\n" "Désactivé : vous devrez effectuer la copie explicitement (ex. via Ctrl-C)." -#: optiondialog.cpp:829 +#: optiondialog.cpp:851 #, kde-format msgid "" "Sets the line endings for when an edited file is saved.\n" @@ -2260,12 +2271,12 @@ "Configure les fins de ligne quand un fichier modifié est enregistré.\n" "DOS/Windows : CR+LF ; Unix : LF ; avec CR=0D, LF=0A" -#: optiondialog.cpp:839 +#: optiondialog.cpp:861 #, kde-format msgid "Diff" msgstr "Analyse des différences" -#: optiondialog.cpp:840 +#: optiondialog.cpp:862 #, kde-format msgid "Diff Settings" msgstr "Paramètres de l'analyse des différences" @@ -2279,12 +2290,12 @@ #. ); #. ++line; #. -#: optiondialog.cpp:865 +#: optiondialog.cpp:896 #, kde-format msgid "Ignore numbers (treat as white space)" msgstr "Ignorer les nombres (les considérer comme des espaces)" -#: optiondialog.cpp:869 +#: optiondialog.cpp:900 #, kde-format msgid "" "Ignore number characters during line matching phase. (Similar to Ignore " @@ -2295,46 +2306,46 @@ "de lignes. (Similaire à « Ignorer les espaces »).\n" "Peut aider à comparer des fichiers comportant des données numériques." -#: optiondialog.cpp:873 +#: optiondialog.cpp:904 #, kde-format msgid "Ignore C/C++ comments (treat as white space)" msgstr "Ignorer les commentaires C/C++ (les considérer comme des espaces)" -#: optiondialog.cpp:876 +#: optiondialog.cpp:907 #, kde-format msgid "Treat C/C++ comments like white space." msgstr "Considérer les commentaires C/C++ comme des espaces." -#: optiondialog.cpp:879 +#: optiondialog.cpp:910 #, kde-format msgid "Ignore case (treat as white space)" msgstr "Ignorer la casse (considérer comme des espaces)" -#: optiondialog.cpp:883 +#: optiondialog.cpp:914 #, kde-format msgid "Treat case differences like white space changes. ('a'<=>'A')" msgstr "" "Considérer les différences de casse comme des changements d'espaces. " "(« a »<=>« A »)" -#: optiondialog.cpp:886 +#: optiondialog.cpp:917 #, kde-format msgid "Preprocessor command:" msgstr "Commande du préprocesseur :" -#: optiondialog.cpp:891 +#: optiondialog.cpp:922 #, kde-format msgid "User defined pre-processing. (See the docs for details.)" msgstr "" "Pré-traitement défini par l'utilisateur. (Voir les documentations pour les " "détails)" -#: optiondialog.cpp:894 +#: optiondialog.cpp:925 #, kde-format msgid "Line-matching preprocessor command:" msgstr "Commande du préprocesseur pour la mise en correspondance de lignes :" -#: optiondialog.cpp:899 +#: optiondialog.cpp:930 #, kde-format msgid "" "This pre-processor is only used during line matching.\n" @@ -2344,12 +2355,12 @@ "lignes\n" "(consultez la documentation pour les détails)." -#: optiondialog.cpp:902 +#: optiondialog.cpp:933 #, kde-format msgid "Try hard (slower)" msgstr "Essayer encore (plus lent)" -#: optiondialog.cpp:906 +#: optiondialog.cpp:937 #, kde-format msgid "" "Enables the --minimal option for the external diff.\n" @@ -2358,12 +2369,12 @@ "Active l'option -minimal pour une analyse de différences externe.\n" "L'analyse de gros fichiers sera beaucoup plus lente." -#: optiondialog.cpp:910 +#: optiondialog.cpp:941 #, kde-format msgid "Align B and C for 3 input files" msgstr "Aligner B et C pour 3 fichiers d'entrée" -#: optiondialog.cpp:914 +#: optiondialog.cpp:945 #, kde-format msgid "" "Try to align B and C when comparing or merging three input files.\n" @@ -2376,17 +2387,23 @@ "pourrait s'en trouver plus complexe.\n" "(Par défaut, elle est désactivée)" -#: optiondialog.cpp:926 +#: optiondialog.cpp:956 +#, kde-format +msgctxt "Settings page" +msgid "Merge" +msgstr "Fusion" + +#: optiondialog.cpp:957 #, kde-format msgid "Merge Settings" msgstr "Paramètres de la fusion" -#: optiondialog.cpp:940 +#: optiondialog.cpp:980 #, kde-format msgid "Auto advance delay (ms):" msgstr "Délai d'avance automatique (en ms) :" -#: optiondialog.cpp:946 +#: optiondialog.cpp:986 #, kde-format msgid "" "When in Auto-Advance mode the result of the current selection is shown \n" @@ -2397,29 +2414,29 @@ "pour la période spécifiée, avant d'aller au conflit suivant. Intervalle : " "0-2 000 ms" -#: optiondialog.cpp:950 +#: optiondialog.cpp:990 #, kde-format msgid "Show info dialogs" msgstr "Afficher les boîtes de dialogue d'information" -#: optiondialog.cpp:953 +#: optiondialog.cpp:993 #, kde-format msgid "Show a dialog with information about the number of conflicts." msgstr "" "Affiche une boîte de dialogue contenant des informations sur le nombre de " "conflits." -#: optiondialog.cpp:956 +#: optiondialog.cpp:996 #, kde-format msgid "White space 2-file merge default:" msgstr "Option par défaut pour les espaces lors de la fusion de 2 fichiers :" -#: optiondialog.cpp:961 optiondialog.cpp:974 +#: optiondialog.cpp:1001 optiondialog.cpp:1014 #, kde-format msgid "Manual Choice" msgstr "Choix manuel" -#: optiondialog.cpp:965 optiondialog.cpp:979 +#: optiondialog.cpp:1005 optiondialog.cpp:1019 #, kde-format msgid "" "Allow the merge algorithm to automatically select an input for white-space-" @@ -2428,22 +2445,22 @@ "Autoriser l'algorithme de fusion à sélectionner automatiquement une entrée " "pour les changements d'espaces seuls." -#: optiondialog.cpp:969 +#: optiondialog.cpp:1009 #, kde-format msgid "White space 3-file merge default:" msgstr "Option par défaut pour les espaces lors de la fusion de 3 fichiers :" -#: optiondialog.cpp:983 +#: optiondialog.cpp:1023 #, kde-format msgid "Automatic Merge Regular Expression" msgstr "Expression rationnelle de fusion automatique" -#: optiondialog.cpp:991 smalldialogs.cpp:449 +#: optiondialog.cpp:1031 smalldialogs.cpp:459 #, kde-format msgid "Auto merge regular expression:" msgstr "Expression rationnelle de fusion automatique :" -#: optiondialog.cpp:996 +#: optiondialog.cpp:1036 #, kde-format msgid "" "Regular expression for lines where KDiff3 should automatically choose one " @@ -2457,14 +2474,14 @@ "rationnelle, alors\n" "la ligne C - si elle est disponible, sera choisie, sinon ce sera la ligne B." -#: optiondialog.cpp:1002 +#: optiondialog.cpp:1042 #, kde-format msgid "Run regular expression auto merge on merge start" msgstr "" "Exécuter la fusion automatique des expressions rationnelles au démarrage de " "la fusion" -#: optiondialog.cpp:1005 +#: optiondialog.cpp:1045 #, kde-format msgid "" "Run the merge for auto merge regular expressions\n" @@ -2473,17 +2490,17 @@ "Exécute la fusion pour les expressions rationnelles de fusion automatique\n" "immédiatement lorsqu'une fusion démarre.\n" -#: optiondialog.cpp:1010 +#: optiondialog.cpp:1050 #, kde-format msgid "Version Control History Merging" msgstr "Fusion de l'historique du contrôle de versions" -#: optiondialog.cpp:1018 smalldialogs.cpp:476 +#: optiondialog.cpp:1058 smalldialogs.cpp:486 #, kde-format msgid "History start regular expression:" msgstr "Expression rationnelle de début d'historique :" -#: optiondialog.cpp:1023 +#: optiondialog.cpp:1063 #, kde-format msgid "" "Regular expression for the start of the version control history entry.\n" @@ -2495,12 +2512,12 @@ "Habituellement, cette ligne contient le mot clé « $Log$ ».\n" "Valeur par défaut : « .*\\$Log.*\\$.* »" -#: optiondialog.cpp:1029 smalldialogs.cpp:504 +#: optiondialog.cpp:1069 smalldialogs.cpp:514 #, kde-format msgid "History entry start regular expression:" msgstr "Expression rationnelle de début d'un élément d'historique :" -#: optiondialog.cpp:1042 +#: optiondialog.cpp:1082 #, kde-format msgid "" "A version control history entry consists of several lines.\n" @@ -2521,22 +2538,22 @@ "séparent les éléments de l'historique.\n" "Consultez la documentation pour les détails." -#: optiondialog.cpp:1050 +#: optiondialog.cpp:1090 #, kde-format msgid "History merge sorting" msgstr "Tri de fusion de l'historique" -#: optiondialog.cpp:1053 +#: optiondialog.cpp:1093 #, kde-format msgid "Sort version control history by a key." msgstr "Trie l'historique de contrôle de versions par clé." -#: optiondialog.cpp:1063 +#: optiondialog.cpp:1103 #, kde-format msgid "History entry start sort key order:" msgstr "Ordre des clés de tri du début de l'élément de l'historique :" -#: optiondialog.cpp:1068 +#: optiondialog.cpp:1108 #, kde-format msgid "" "Each pair of parentheses used in the regular expression for the history " @@ -2556,42 +2573,42 @@ "Si ce champ reste vide, alors aucun tri ne sera effectué.\n" "Consultez la documentation pour les détails." -#: optiondialog.cpp:1079 +#: optiondialog.cpp:1119 #, kde-format msgid "Merge version control history on merge start" msgstr "" "Fusionner l'historique de contrôle de versions lors du démarrage de la fusion" -#: optiondialog.cpp:1082 +#: optiondialog.cpp:1122 #, kde-format msgid "Run version control history automerge on merge start." msgstr "" "Exécuter la fusion automatique de l'historique de contrôle de versions au " "début de la fusion." -#: optiondialog.cpp:1086 +#: optiondialog.cpp:1126 #, kde-format msgid "Max number of history entries:" msgstr "Nombre maximal d'éléments d'historique :" -#: optiondialog.cpp:1090 +#: optiondialog.cpp:1130 #, kde-format msgid "Cut off after specified number. Use -1 for infinite number of entries." msgstr "" "Couper après le nombre spécifié. Utiliser -1 pour un nombre illimité " "d'éléments." -#: optiondialog.cpp:1094 +#: optiondialog.cpp:1134 #, kde-format msgid "Test your regular expressions" msgstr "Testez vos expressions rationnelles" -#: optiondialog.cpp:1099 +#: optiondialog.cpp:1139 #, kde-format msgid "Irrelevant merge command:" msgstr "Commande de fusion non pertinente :" -#: optiondialog.cpp:1104 +#: optiondialog.cpp:1144 #, kde-format msgid "" "If specified this script is run after automerge\n" @@ -2602,12 +2619,12 @@ "quand aucun autre changement pertinent n'a été détecté.\n" "Appelée avec les paramètres : nomfichier1 nomfichier2 nomfichier3" -#: optiondialog.cpp:1109 +#: optiondialog.cpp:1149 #, kde-format msgid "Auto save and quit on merge without conflicts" msgstr "Enregistrer automatiquement et quitter en cas de fusion sans conflits" -#: optiondialog.cpp:1113 +#: optiondialog.cpp:1153 #, kde-format msgid "" "If KDiff3 was started for a file-merge from the command line and all\n" @@ -2622,27 +2639,27 @@ "l'application.\n" "(Similaire à l'option en ligne de commande « --auto »)" -#: optiondialog.cpp:1124 optiondialog.cpp:1125 +#: optiondialog.cpp:1164 optiondialog.cpp:1165 #, kde-format msgid "Directory" msgstr "Dossier" -#: optiondialog.cpp:1137 +#: optiondialog.cpp:1185 #, kde-format msgid "Recursive directories" msgstr "Dossiers récursifs" -#: optiondialog.cpp:1140 +#: optiondialog.cpp:1188 #, kde-format msgid "Whether to analyze subdirectories or not." msgstr "Si vous voulez ou non analyser les sous-dossiers." -#: optiondialog.cpp:1142 +#: optiondialog.cpp:1190 #, kde-format msgid "File pattern(s):" msgstr "Motif(s) de fichiers :" -#: optiondialog.cpp:1148 +#: optiondialog.cpp:1196 #, kde-format msgid "" "Pattern(s) of files to be analyzed. \n" @@ -2653,12 +2670,12 @@ "Jokers : « * » et «  ? » \n" "Plusieurs motifs peuvent être spécifiés à l'aide du séparateur : « ; »" -#: optiondialog.cpp:1153 +#: optiondialog.cpp:1201 #, kde-format msgid "File-anti-pattern(s):" msgstr "Motif(s) de fichiers refusé(s) :" -#: optiondialog.cpp:1159 +#: optiondialog.cpp:1207 #, kde-format msgid "" "Pattern(s) of files to be excluded from analysis. \n" @@ -2669,12 +2686,12 @@ "Jokers : « * » et « ? »\n" "Plusieurs motifs peuvent être spécifiés à l'aide du séparateur : « ; »" -#: optiondialog.cpp:1164 +#: optiondialog.cpp:1212 #, kde-format msgid "Dir-anti-pattern(s):" msgstr "Motif(s) de dossiers exclu(s) :" -#: optiondialog.cpp:1170 +#: optiondialog.cpp:1218 #, kde-format msgid "" "Pattern(s) of directories to be excluded from analysis. \n" @@ -2685,12 +2702,12 @@ "Jokers : « * » et « ? »\n" "Plusieurs motifs peuvent être spécifiés à l'aide du séparateur : « ; »" -#: optiondialog.cpp:1175 +#: optiondialog.cpp:1223 #, kde-format msgid "Use .cvsignore" msgstr "Utiliser .cvsignore" -#: optiondialog.cpp:1179 +#: optiondialog.cpp:1227 #, kde-format msgid "" "Extends the antipattern to anything that would be ignored by CVS.\n" @@ -2699,22 +2716,22 @@ "Étend l'exclusion de motif(s) à tout ce qui serait ignoré par CVS.\n" "Via les fichiers « .cvsignore » locaux, ce peut être spécifique à un dossier." -#: optiondialog.cpp:1183 +#: optiondialog.cpp:1231 #, kde-format msgid "Find hidden files and directories" msgstr "Chercher les fichiers et les dossiers cachés" -#: optiondialog.cpp:1186 +#: optiondialog.cpp:1234 #, kde-format msgid "Finds hidden files and directories." msgstr "Chercher les fichiers et les dossiers cachés." -#: optiondialog.cpp:1189 +#: optiondialog.cpp:1237 #, kde-format msgid "Follow file links" msgstr "Suivre les liens vers des fichiers" -#: optiondialog.cpp:1193 +#: optiondialog.cpp:1241 #, kde-format msgid "" "On: Compare the file the link points to.\n" @@ -2723,12 +2740,12 @@ "Activé : compare le fichier sur lequel pointe le lien.\n" "Désactivé : compare les liens." -#: optiondialog.cpp:1197 +#: optiondialog.cpp:1245 #, kde-format msgid "Follow directory links" msgstr "Suivre les liens vers un dossier" -#: optiondialog.cpp:1201 +#: optiondialog.cpp:1249 #, kde-format msgid "" "On: Compare the directory the link points to.\n" @@ -2737,12 +2754,12 @@ "Activé : compare le dossier sur lequel pointe le lien.\n" "Désactivé : compare les liens." -#: optiondialog.cpp:1210 +#: optiondialog.cpp:1258 #, kde-format msgid "Case sensitive filename comparison" msgstr "Tenir compte de la casse lors de la comparaison des noms de fichiers" -#: optiondialog.cpp:1214 +#: optiondialog.cpp:1262 #, kde-format msgid "" "The directory comparison will compare files or directories when their names " @@ -2755,12 +2772,12 @@ "Réglez cette option si la casse des noms doit correspondre. (Désactivée par " "défaut pour Windows, sinon Activée)" -#: optiondialog.cpp:1218 +#: optiondialog.cpp:1266 #, kde-format msgid "Unfold all subdirectories on load" msgstr "Déplier tous les sous-dossiers au chargement" -#: optiondialog.cpp:1222 +#: optiondialog.cpp:1270 #, kde-format msgid "" "On: Unfold all subdirectories when starting a directory diff.\n" @@ -2769,12 +2786,12 @@ "Activé : déplier tous les sous-dossiers lors d'une comparaison de dossiers.\n" "Désactivé : conserver les sous-dossiers repliés." -#: optiondialog.cpp:1226 +#: optiondialog.cpp:1274 #, kde-format msgid "Skip directory status report" msgstr "Sauter le rapport d'état du dossier" -#: optiondialog.cpp:1230 +#: optiondialog.cpp:1278 #, kde-format msgid "" "On: Do not show the Directory Comparison Status.\n" @@ -2783,27 +2800,27 @@ "Activé : ne pas afficher l'État de la comparaison des dossiers.\n" "Désactivé : afficher la boîte de dialogue d'état au démarrage." -#: optiondialog.cpp:1234 +#: optiondialog.cpp:1282 #, kde-format msgid "File Comparison Mode" msgstr "Mode de comparaison de fichiers" -#: optiondialog.cpp:1239 +#: optiondialog.cpp:1287 #, kde-format msgid "Binary comparison" msgstr "Comparaison binaire" -#: optiondialog.cpp:1241 +#: optiondialog.cpp:1289 #, kde-format msgid "Binary comparison of each file. (Default)" msgstr "Comparaison binaire de chaque fichier. (Par défaut)" -#: optiondialog.cpp:1244 +#: optiondialog.cpp:1292 #, kde-format msgid "Full analysis" msgstr "Analyse complète" -#: optiondialog.cpp:1246 +#: optiondialog.cpp:1294 #, kde-format msgid "" "Do a full analysis and show statistics information in extra columns.\n" @@ -2814,12 +2831,12 @@ "(Plus lente qu'une comparaison binaire, beaucoup plus pour les fichiers " "binaires)" -#: optiondialog.cpp:1250 +#: optiondialog.cpp:1298 #, kde-format msgid "Trust the size and modification date (unsafe)" msgstr "Se fier à la taille et à la date de modification (peu sûr)" -#: optiondialog.cpp:1252 +#: optiondialog.cpp:1300 #, kde-format msgid "" "Assume that files are equal if the modification date and file length are " @@ -2834,7 +2851,7 @@ "distinctes apparaîtront comme étant différents.\n" "Utile pour les dossiers volumineux ou les réseaux lents." -#: optiondialog.cpp:1257 +#: optiondialog.cpp:1305 #, kde-format msgid "" "Trust the size and date, but use binary comparison if date does not match " @@ -2843,7 +2860,7 @@ "Se fier à la tailler et à la date, mais utiliser la comparaison binaire si " "la date ne correspond pas (peu sûr)" -#: optiondialog.cpp:1259 +#: optiondialog.cpp:1307 #, kde-format msgid "" "Assume that files are equal if the modification date and file length are " @@ -2857,12 +2874,12 @@ "comparaison binaire.\n" "Utile pour les dossiers volumineux ou les réseaux lents." -#: optiondialog.cpp:1264 +#: optiondialog.cpp:1312 #, kde-format msgid "Trust the size (unsafe)" msgstr "Se fier à la taille (peu sûr)" -#: optiondialog.cpp:1266 +#: optiondialog.cpp:1314 #, kde-format msgid "" "Assume that files are equal if their file lengths are equal.\n" @@ -2874,12 +2891,12 @@ "Utile pour les dossiers volumineux ou les réseaux lents, quand la taille est " "modifiée durant le téléchargement." -#: optiondialog.cpp:1273 +#: optiondialog.cpp:1321 #, kde-format msgid "Synchronize directories" msgstr "Synchroniser les dossiers" -#: optiondialog.cpp:1277 +#: optiondialog.cpp:1325 #, kde-format msgid "" "Offers to store files in both directories so that\n" @@ -2891,12 +2908,12 @@ "Fonctionne seulement quand la comparaison de deux dossiers ne spécifie pas " "de destination." -#: optiondialog.cpp:1283 +#: optiondialog.cpp:1331 #, kde-format msgid "White space differences considered equal" msgstr "Différences d'espaces considérées comme égales" -#: optiondialog.cpp:1287 +#: optiondialog.cpp:1335 #, kde-format msgid "" "If files differ only by white space consider them equal.\n" @@ -2906,12 +2923,12 @@ "identiques.\n" "Cette fonction n'est active que si vous choisissez l'analyse complète." -#: optiondialog.cpp:1293 +#: optiondialog.cpp:1341 #, kde-format msgid "Copy newer instead of merging (unsafe)" msgstr "Copier le plus récent au lieu de fusionner (peu sûr)" -#: optiondialog.cpp:1297 +#: optiondialog.cpp:1345 #, kde-format msgid "" "Do not look inside, just take the newer file.\n" @@ -2922,12 +2939,12 @@ "(À n'utilisez que si vous savez ce que vous faites !)\n" "Option effective seulement lors de la comparaison de dossiers." -#: optiondialog.cpp:1302 +#: optiondialog.cpp:1350 #, kde-format msgid "Backup files (.orig)" msgstr "Sauvegarder les fichiers (.orig)" -#: optiondialog.cpp:1306 +#: optiondialog.cpp:1354 #, kde-format msgid "" "If a file would be saved over an old file, then the old file\n" @@ -2937,17 +2954,17 @@ "l'ancien\n" "sera renommé avec une extension « .orig » au lieu d'être supprimé." -#: optiondialog.cpp:1382 optiondialog.cpp:1383 +#: optiondialog.cpp:1430 optiondialog.cpp:1431 #, kde-format msgid "Regional Settings" msgstr "Paramètres régionaux" -#: optiondialog.cpp:1397 +#: optiondialog.cpp:1454 #, kde-format msgid "Use the same encoding for everything:" msgstr "Utiliser le même encodage pour tout :" -#: optiondialog.cpp:1401 +#: optiondialog.cpp:1458 #, kde-format msgid "" "Enable this allows to change all encodings by changing the first only.\n" @@ -2957,17 +2974,17 @@ "le premier.\n" "Décochez-la si des paramètres individuels différents sont nécessaires." -#: optiondialog.cpp:1405 +#: optiondialog.cpp:1462 #, kde-format msgid "Note: Local Encoding is \"%1\"" msgstr "Remarque : l'encodage local est « %1 »" -#: optiondialog.cpp:1409 +#: optiondialog.cpp:1466 #, kde-format msgid "File Encoding for A:" msgstr "Encodage du fichier pour A :" -#: optiondialog.cpp:1416 +#: optiondialog.cpp:1473 #, kde-format msgid "" "If enabled then Unicode (UTF-16 or UTF-8) encoding will be detected.\n" @@ -2981,32 +2998,32 @@ "utilisé comme solution de repli\n" "(la détection de l'Unicode repose sur les premiers octets d'un fichier)." -#: optiondialog.cpp:1419 optiondialog.cpp:1430 optiondialog.cpp:1441 +#: optiondialog.cpp:1476 optiondialog.cpp:1487 optiondialog.cpp:1498 #, kde-format msgid "Auto Detect Unicode" msgstr "Détecter automatiquement Unicode" -#: optiondialog.cpp:1425 +#: optiondialog.cpp:1482 #, kde-format msgid "File Encoding for B:" msgstr "Encodage du fichier pour B :" -#: optiondialog.cpp:1436 +#: optiondialog.cpp:1493 #, kde-format msgid "File Encoding for C:" msgstr "Encodage du fichier pour C :" -#: optiondialog.cpp:1447 +#: optiondialog.cpp:1504 #, kde-format msgid "File Encoding for Merge Output and Saving:" msgstr "Encodage du fichier pour la sortie de la fusion et l'enregistrement :" -#: optiondialog.cpp:1452 +#: optiondialog.cpp:1509 #, kde-format msgid "Auto Select" msgstr "Sélectionner automatiquement" -#: optiondialog.cpp:1456 +#: optiondialog.cpp:1513 #, kde-format msgid "" "If enabled then the encoding from the input files is used.\n" @@ -3018,17 +3035,17 @@ "Dans les cas ambigus, une boîte de dialogue demandera à l'utilisateur de " "choisir l'encodage pour l'enregistrement." -#: optiondialog.cpp:1459 +#: optiondialog.cpp:1516 #, kde-format msgid "File Encoding for Preprocessor Files:" msgstr "Encodage du fichier pour les fichiers préprocesseurs :" -#: optiondialog.cpp:1471 +#: optiondialog.cpp:1528 #, kde-format msgid "Right To Left Language" msgstr "Langue de droite à gauche" -#: optiondialog.cpp:1475 +#: optiondialog.cpp:1532 #, kde-format msgid "" "Some languages are read from right to left.\n" @@ -3037,22 +3054,22 @@ "Certaines langue se lisent de droite à gauche.\n" "Ce paramètre changera l'afficheur et l'éditeur en conséquence." -#: optiondialog.cpp:1485 +#: optiondialog.cpp:1542 #, kde-format msgid "Integration" msgstr "Intégration" -#: optiondialog.cpp:1486 +#: optiondialog.cpp:1543 #, kde-format msgid "Integration Settings" msgstr "Paramètres d'intégration" -#: optiondialog.cpp:1499 +#: optiondialog.cpp:1564 #, kde-format msgid "Command line options to ignore:" msgstr "Options en ligne de commande à ignorer :" -#: optiondialog.cpp:1505 +#: optiondialog.cpp:1570 #, kde-format msgid "" "List of command line options that should be ignored when KDiff3 is used by " @@ -3065,12 +3082,12 @@ "Plusieurs valeurs peuvent être spécifiées si on les sépare par des « ; »,\n" "ce qui supprimera l'erreur « Option inconnue »." -#: optiondialog.cpp:1510 +#: optiondialog.cpp:1575 #, kde-format msgid "Quit also via Escape key" msgstr "Quitter également à l'aide de la touche Echap" -#: optiondialog.cpp:1514 +#: optiondialog.cpp:1579 #, kde-format msgid "" "Fast method to exit.\n" @@ -3079,7 +3096,7 @@ "Méthode rapide pour sortir de l'application.\n" "Pour les personnes qui sont habituées à utiliser la touche Echap." -#: optiondialog.cpp:1598 +#: optiondialog.cpp:1653 #, kde-format msgid "This resets all options. Not only those of the current topic." msgstr "" @@ -3138,81 +3155,71 @@ msgid "Disable Unsafe Options" msgstr "Désactiver les options peu sûres" -#: pdiff.cpp:158 +#: pdiff.cpp:160 #, kde-format msgid "Loading A" msgstr "Chargement de A" -#: pdiff.cpp:167 +#: pdiff.cpp:162 #, kde-format -msgid "Errors occurred during pre-processing of file A." -msgstr "Erreurs lors du prétraitement du fichier A." +msgid "Loading A: %1" +msgstr "Chargement de A : %1" -#: pdiff.cpp:172 +#: pdiff.cpp:170 #, kde-format msgid "Loading B" msgstr "Chargement de B" -#: pdiff.cpp:179 -#, kde-format -msgid "Errors occurred during pre-processing of file B." -msgstr "Erreurs lors du prétraitement du fichier B." - -#: pdiff.cpp:202 pdiff.cpp:241 +#: pdiff.cpp:201 pdiff.cpp:237 #, kde-format msgid "Diff: A <-> B" msgstr "Différences : A <-> B" -#: pdiff.cpp:208 pdiff.cpp:279 pdiff.cpp:293 +#: pdiff.cpp:207 pdiff.cpp:275 pdiff.cpp:289 #, kde-format msgid "Linediff: A <-> B" msgstr "Différences de lignes : A <-> B" -#: pdiff.cpp:225 +#: pdiff.cpp:224 #, kde-format msgid "Loading C" msgstr "Chargement de C" -#: pdiff.cpp:232 -#, kde-format -msgid "Errors occurred during pre-processing of file C." -msgstr "Erreurs lors du prétraitement du fichier C." - -#: pdiff.cpp:250 +#: pdiff.cpp:246 #, kde-format msgid "Diff: A <-> C" msgstr "Différences : A <-> C" -#: pdiff.cpp:261 +#: pdiff.cpp:257 #, kde-format msgid "Diff: B <-> C" msgstr "Différences : B <-> C" -#: pdiff.cpp:283 pdiff.cpp:297 +#: pdiff.cpp:279 pdiff.cpp:293 #, kde-format msgid "Linediff: B <-> C" msgstr "Différences de lignes : B <-> C" -#: pdiff.cpp:287 pdiff.cpp:301 +#: pdiff.cpp:283 pdiff.cpp:297 #, kde-format msgid "Linediff: A <-> C" msgstr "Différences de lignes : A <-> C" -#: pdiff.cpp:829 +#: pdiff.cpp:819 #, kde-format 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:835 pdiff.cpp:839 pdiff.cpp:843 +#: pdiff.cpp:825 pdiff.cpp:829 pdiff.cpp:833 #, 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:853 +#: pdiff.cpp:843 #, kde-format msgid "" "Some input files do not seem to be pure text files.\n" @@ -3224,17 +3231,17 @@ "binaires.\n" "Continuez à vos risques et périls." -#: pdiff.cpp:863 +#: pdiff.cpp:853 #, kde-format msgid ", B" msgstr ", B" -#: pdiff.cpp:865 +#: pdiff.cpp:855 #, kde-format msgid ", C" msgstr ", C" -#: pdiff.cpp:867 +#: pdiff.cpp:857 #, kde-format msgid "" "Some input characters could not be converted to valid unicode.\n" @@ -3250,80 +3257,75 @@ "propres risques.\n" "Les fichiers affectés sont dans %1." -#: pdiff.cpp:1034 +#: pdiff.cpp:1032 #, kde-format msgid "Abort" msgstr "Abandonner" -#: pdiff.cpp:1040 pdiff.cpp:1130 +#: pdiff.cpp:1038 pdiff.cpp:1129 #, kde-format msgid "Opening files..." msgstr "Ouverture des fichiers..." -#: pdiff.cpp:1107 -#, kde-format -msgid "File open error" -msgstr "Erreur d'ouverture du fichier" - -#: pdiff.cpp:1202 +#: pdiff.cpp:1212 #, kde-format msgid "Cutting selection..." msgstr "Coupe de la sélection..." -#: pdiff.cpp:1223 +#: pdiff.cpp:1233 #, kde-format msgid "Copying selection to clipboard..." msgstr "Copie de la sélection dans le presse-papiers..." -#: pdiff.cpp:1239 +#: pdiff.cpp:1249 #, kde-format msgid "Inserting clipboard contents..." msgstr "Insertion du contenu du presse-papiers..." -#: pdiff.cpp:1695 +#: pdiff.cpp:1705 #, kde-format msgid "Word wrap (Cancel disables word wrap)" msgstr "" "Retour à la ligne automatique (L'annulation désactive le retour à la ligne)" -#: pdiff.cpp:1696 +#: pdiff.cpp:1706 #, kde-format msgid "Calculating max width for horizontal scrollbar" msgstr "Calcul de la largeur maximale pour la barre de défilement horizontale" -#: pdiff.cpp:1911 +#: pdiff.cpp:1921 #, kde-format msgid "Save && Continue" msgstr "Enregistrer et continuer" -#: pdiff.cpp:1912 +#: pdiff.cpp:1922 #, kde-format msgid "Continue Without Saving" msgstr "Continuer sans enregistrer" -#: pdiff.cpp:2124 +#: pdiff.cpp:2134 #, kde-format msgid "Search complete." msgstr "Recherche terminée." -#: pdiff.cpp:2124 +#: pdiff.cpp:2134 #, kde-format msgid "Search Complete" msgstr "Recherche terminée" -#: pdiff.cpp:2375 +#: pdiff.cpp:2385 #, kde-format 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:2375 +#: pdiff.cpp:2385 #, kde-format msgid "Error while adding manual diff range" msgstr "Erreur lors de l'ajout d'une plage de différences manuel" -#: progress.cpp:59 progress.cpp:71 +#: progress.cpp:61 progress.cpp:73 #, kde-format msgid "&Cancel" msgstr "&Annuler" @@ -3333,126 +3335,126 @@ msgid "A (Base):" msgstr "A (base) :" -#: smalldialogs.cpp:68 smalldialogs.cpp:85 smalldialogs.cpp:102 -#: smalldialogs.cpp:144 +#: smalldialogs.cpp:71 smalldialogs.cpp:90 smalldialogs.cpp:109 +#: smalldialogs.cpp:154 #, kde-format msgid "File..." msgstr "Fichier..." -#: smalldialogs.cpp:70 smalldialogs.cpp:87 smalldialogs.cpp:104 -#: smalldialogs.cpp:146 +#: smalldialogs.cpp:73 smalldialogs.cpp:92 smalldialogs.cpp:111 +#: smalldialogs.cpp:156 #, kde-format msgid "Dir..." msgstr "Dossier..." -#: smalldialogs.cpp:96 +#: smalldialogs.cpp:103 #, kde-format msgid "C (Optional):" msgstr "C (optionnel) :" -#: smalldialogs.cpp:119 +#: smalldialogs.cpp:126 #, kde-format msgid "Swap/Copy Names..." msgstr "Permuter / Copier les noms..." -#: smalldialogs.cpp:124 smalldialogs.cpp:125 smalldialogs.cpp:126 +#: smalldialogs.cpp:131 smalldialogs.cpp:132 smalldialogs.cpp:133 #, kde-format msgid "Swap %1<->%2" msgstr "Permuter %1<->%2" -#: smalldialogs.cpp:127 smalldialogs.cpp:128 smalldialogs.cpp:129 +#: smalldialogs.cpp:134 smalldialogs.cpp:135 smalldialogs.cpp:136 #, kde-format msgid "Copy %1->Output" msgstr "Copier %1->Sortie" -#: smalldialogs.cpp:130 smalldialogs.cpp:131 smalldialogs.cpp:132 +#: smalldialogs.cpp:137 smalldialogs.cpp:138 smalldialogs.cpp:139 #, kde-format msgid "Swap %1<->Output" msgstr "Permuter %1<->Sortie" -#: smalldialogs.cpp:138 +#: smalldialogs.cpp:148 #, kde-format msgid "Output (optional):" msgstr "Sortie (optionnel) :" -#: smalldialogs.cpp:168 +#: smalldialogs.cpp:178 #, kde-format msgid "Configure..." msgstr "Configurer..." -#: smalldialogs.cpp:233 +#: smalldialogs.cpp:243 #, kde-format msgid "Open Directory" msgstr "Ouvrir un dossier" -#: smalldialogs.cpp:234 +#: smalldialogs.cpp:244 #, kde-format msgid "Select Output File" msgstr "Sélectionnez le fichier de sortie" -#: smalldialogs.cpp:393 +#: smalldialogs.cpp:403 #, kde-format msgid "Search text:" msgstr "Texte à chercher :" -#: smalldialogs.cpp:400 +#: smalldialogs.cpp:410 #, kde-format msgid "Case sensitive" msgstr "Tenir compte de la casse" -#: smalldialogs.cpp:403 +#: smalldialogs.cpp:413 #, kde-format msgid "Search A" msgstr "Chercher dans A" -#: smalldialogs.cpp:408 +#: smalldialogs.cpp:418 #, kde-format msgid "Search B" msgstr "Chercher dans B" -#: smalldialogs.cpp:413 +#: smalldialogs.cpp:423 #, kde-format msgid "Search C" msgstr "Chercher dans C" -#: smalldialogs.cpp:418 +#: smalldialogs.cpp:428 #, kde-format msgid "Search output" msgstr "Chercher dans la sortie" -#: smalldialogs.cpp:425 +#: smalldialogs.cpp:435 #, kde-format msgid "&Search" msgstr "&Chercher" -#: smalldialogs.cpp:444 +#: smalldialogs.cpp:454 #, kde-format msgid "Regular Expression Tester" msgstr "Contrôleur d'expressions rationnelles" -#: smalldialogs.cpp:457 +#: smalldialogs.cpp:467 #, kde-format msgid "Example auto merge line:" msgstr "Exemple de ligne de fusion automatique :" -#: smalldialogs.cpp:459 +#: smalldialogs.cpp:469 #, kde-format msgid "To test auto merge, copy a line as used in your files." msgstr "" "Pour effectuer un test de fusion automatique, copiez une ligne comme utilisé " "dans vos fichiers." -#: smalldialogs.cpp:465 smalldialogs.cpp:493 smalldialogs.cpp:529 +#: smalldialogs.cpp:475 smalldialogs.cpp:503 smalldialogs.cpp:539 #, kde-format msgid "Match result:" msgstr "Résultat de la correspondance :" -#: smalldialogs.cpp:484 +#: smalldialogs.cpp:494 #, kde-format msgid "Example history start line (with leading comment):" msgstr "Exemple de ligne de début d'historique (avec commentaire de départ) :" -#: smalldialogs.cpp:486 +#: smalldialogs.cpp:496 #, kde-format msgid "" "Copy a history start line as used in your files,\n" @@ -3461,19 +3463,19 @@ "Copiez une ligne de début d'historique comme utilisé dans vos fichiers,\n" "y compris le commentaire de départ." -#: smalldialogs.cpp:512 +#: smalldialogs.cpp:522 #, kde-format msgid "History sort key order:" msgstr "Ordre des clés de tri de l'historique :" -#: smalldialogs.cpp:520 +#: smalldialogs.cpp:530 #, kde-format msgid "Example history entry start line (without leading comment):" msgstr "" "Exemple de ligne de début d'élément d'historique (avec commentaire de " "départ) :" -#: smalldialogs.cpp:522 +#: smalldialogs.cpp:532 #, kde-format msgid "" "Copy a history entry start line as used in your files,\n" @@ -3483,50 +3485,50 @@ "fichiers,\n" "mais en omettant le commentaire de départ." -#: smalldialogs.cpp:536 +#: smalldialogs.cpp:546 #, kde-format msgid "Sort key result:" msgstr "Résultat de la clé de tri :" -#: smalldialogs.cpp:584 smalldialogs.cpp:594 smalldialogs.cpp:614 +#: smalldialogs.cpp:594 smalldialogs.cpp:604 smalldialogs.cpp:624 #, kde-format msgid "Match success." msgstr "Correspondance correcte." -#: smalldialogs.cpp:588 smalldialogs.cpp:598 smalldialogs.cpp:620 +#: smalldialogs.cpp:598 smalldialogs.cpp:608 smalldialogs.cpp:630 #, kde-format msgid "Match failed." msgstr "Correspondance incorrecte." -#: smalldialogs.cpp:605 +#: smalldialogs.cpp:615 #, kde-format msgid "Opening and closing parentheses do not match in regular expression." msgstr "" "Les parenthèses d'ouverture et de fermeture ne correspondent pas dans " "l'expression rationnelle." -#: SourceData.cpp:150 +#: SourceData.cpp:153 #, kde-format msgid "Writing clipboard data to temp file failed." msgstr "" "Impossible d'écrire les données du presse-papiers dans un fichier temporaire." -#: SourceData.cpp:154 +#: SourceData.cpp:157 #, kde-format msgid "From Clipboard" msgstr "Depuis le presse-papiers" -#: SourceData.cpp:335 +#: SourceData.cpp:348 #, kde-format msgid "%1 is not a normal file." msgstr "« %1 » n'est pas un fichier normal." -#: SourceData.cpp:427 +#: SourceData.cpp:440 #, kde-format msgid " Temp file is: %1" msgstr " Le fichier temporaire est : %1" -#: SourceData.cpp:432 +#: SourceData.cpp:445 #, kde-format msgid "" "Preprocessing possibly failed. Check this command:\n" @@ -3541,12 +3543,12 @@ "\n" "La commande de pré-traitement sera désactivée dorénavant." -#: SourceData.cpp:443 SourceData.cpp:512 +#: SourceData.cpp:456 SourceData.cpp:525 #, kde-format msgid "File %1 too large to process. Skipping." msgstr "Le fichier %1 est trop volumineux pour être traité. Il sera sauté." -#: SourceData.cpp:487 +#: SourceData.cpp:500 #, kde-format msgid "" "The line-matching-preprocessing possibly failed. Check this command:\n" diff -Nru kdiff3-1.8.01/po/ga/kdiff3fileitemactionplugin.po kdiff3-1.8.3/po/ga/kdiff3fileitemactionplugin.po --- kdiff3-1.8.01/po/ga/kdiff3fileitemactionplugin.po 2019-05-18 01:01:59.000000000 +0000 +++ kdiff3-1.8.3/po/ga/kdiff3fileitemactionplugin.po 2020-06-25 00:18:18.000000000 +0000 @@ -5,8 +5,8 @@ msgid "" msgstr "" "Project-Id-Version: kdiff3fileitemactionplugin\n" -"Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2019-03-22 03:09+0100\n" +"Report-Msgid-Bugs-To: https://bugs.kde.org\n" +"POT-Creation-Date: 2019-08-30 07:40+0200\n" "PO-Revision-Date: 2011-12-28 12:28-0500\n" "Last-Translator: Kevin Scannell \n" "Language-Team: Irish \n" diff -Nru kdiff3-1.8.01/po/ga/kdiff3.po kdiff3-1.8.3/po/ga/kdiff3.po --- kdiff3-1.8.01/po/ga/kdiff3.po 2019-05-18 01:01:59.000000000 +0000 +++ kdiff3-1.8.3/po/ga/kdiff3.po 2020-06-25 00:18:18.000000000 +0000 @@ -5,8 +5,8 @@ msgid "" msgstr "" "Project-Id-Version: playground-devtools/kdiff3.po\n" -"Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2019-04-18 08:02+0200\n" +"Report-Msgid-Bugs-To: https://bugs.kde.org\n" +"POT-Creation-Date: 2020-06-22 07:48+0200\n" "PO-Revision-Date: 2008-04-18 14:59-0500\n" "Last-Translator: Kevin Scannell \n" "Language-Team: Irish \n" @@ -27,337 +27,337 @@ msgid "Your emails" msgstr "kscanne@gmail.com" -#: difftextwindow.cpp:412 +#: difftextwindow.cpp:414 #, kde-format msgid "File %1: Line %2" msgstr "" -#: difftextwindow.cpp:414 +#: difftextwindow.cpp:416 #, fuzzy, kde-format #| msgid "not available" msgid "File %1: Line not available" msgstr "níl ar fáil" -#: difftextwindow.cpp:1780 +#: difftextwindow.cpp:1778 #, kde-format msgid "Encoding:" msgstr "Ionchódú:" -#: difftextwindow.cpp:1782 mergeresultwindow.cpp:3138 optiondialog.cpp:818 +#: difftextwindow.cpp:1781 mergeresultwindow.cpp:3166 optiondialog.cpp:840 #, kde-format msgid "Line end style:" msgstr "" -#: difftextwindow.cpp:1810 directorymergewindow.cpp:382 -#: directorymergewindow.cpp:433 directorymergewindow.cpp:524 -#: directorymergewindow.cpp:3058 directorymergewindow.cpp:3189 -#: directorymergewindow.cpp:3417 mergeresultwindow.cpp:942 -#: mergeresultwindow.cpp:944 mergeresultwindow.cpp:946 -#: mergeresultwindow.cpp:948 mergeresultwindow.cpp:1814 -#: mergeresultwindow.cpp:3170 mergeresultwindow.cpp:3177 optiondialog.cpp:962 -#: optiondialog.cpp:975 pdiff.cpp:833 pdiff.cpp:835 pdiff.cpp:837 pdiff.cpp:839 -#: pdiff.cpp:861 smalldialogs.cpp:124 smalldialogs.cpp:126 smalldialogs.cpp:127 -#: smalldialogs.cpp:130 +#: difftextwindow.cpp:1809 directorymergewindow.cpp:383 +#: directorymergewindow.cpp:434 directorymergewindow.cpp:525 +#: directorymergewindow.cpp:3072 directorymergewindow.cpp:3203 +#: directorymergewindow.cpp:3431 mergeresultwindow.cpp:970 +#: mergeresultwindow.cpp:972 mergeresultwindow.cpp:974 +#: mergeresultwindow.cpp:976 mergeresultwindow.cpp:1842 +#: mergeresultwindow.cpp:3198 mergeresultwindow.cpp:3205 optiondialog.cpp:1002 +#: optiondialog.cpp:1015 pdiff.cpp:823 pdiff.cpp:825 pdiff.cpp:827 +#: pdiff.cpp:829 pdiff.cpp:851 smalldialogs.cpp:131 smalldialogs.cpp:133 +#: smalldialogs.cpp:134 smalldialogs.cpp:137 #, kde-format msgid "A" msgstr "A" -#: difftextwindow.cpp:1810 directorymergewindow.cpp:384 -#: directorymergewindow.cpp:436 directorymergewindow.cpp:526 -#: directorymergewindow.cpp:3064 directorymergewindow.cpp:3190 -#: directorymergewindow.cpp:3418 mergeresultwindow.cpp:942 -#: mergeresultwindow.cpp:944 mergeresultwindow.cpp:950 -#: mergeresultwindow.cpp:952 mergeresultwindow.cpp:1816 -#: mergeresultwindow.cpp:3172 mergeresultwindow.cpp:3179 optiondialog.cpp:963 -#: optiondialog.cpp:976 pdiff.cpp:833 pdiff.cpp:835 pdiff.cpp:841 pdiff.cpp:843 -#: pdiff.cpp:863 smalldialogs.cpp:124 smalldialogs.cpp:125 smalldialogs.cpp:128 -#: smalldialogs.cpp:131 +#: difftextwindow.cpp:1809 directorymergewindow.cpp:385 +#: directorymergewindow.cpp:437 directorymergewindow.cpp:527 +#: directorymergewindow.cpp:3078 directorymergewindow.cpp:3204 +#: directorymergewindow.cpp:3432 mergeresultwindow.cpp:970 +#: mergeresultwindow.cpp:972 mergeresultwindow.cpp:978 +#: mergeresultwindow.cpp:980 mergeresultwindow.cpp:1844 +#: mergeresultwindow.cpp:3200 mergeresultwindow.cpp:3207 optiondialog.cpp:1003 +#: optiondialog.cpp:1016 pdiff.cpp:823 pdiff.cpp:825 pdiff.cpp:831 +#: pdiff.cpp:833 pdiff.cpp:853 smalldialogs.cpp:131 smalldialogs.cpp:132 +#: smalldialogs.cpp:135 smalldialogs.cpp:138 #, kde-format msgid "B" msgstr "B" -#: difftextwindow.cpp:1810 directorymergewindow.cpp:386 -#: directorymergewindow.cpp:439 directorymergewindow.cpp:528 -#: directorymergewindow.cpp:3070 directorymergewindow.cpp:3191 -#: directorymergewindow.cpp:3419 mergeresultwindow.cpp:946 -#: mergeresultwindow.cpp:948 mergeresultwindow.cpp:950 -#: mergeresultwindow.cpp:952 mergeresultwindow.cpp:1818 -#: mergeresultwindow.cpp:3174 mergeresultwindow.cpp:3181 optiondialog.cpp:977 -#: pdiff.cpp:837 pdiff.cpp:839 pdiff.cpp:841 pdiff.cpp:843 pdiff.cpp:865 -#: smalldialogs.cpp:125 smalldialogs.cpp:126 smalldialogs.cpp:129 -#: smalldialogs.cpp:132 +#: difftextwindow.cpp:1809 directorymergewindow.cpp:387 +#: directorymergewindow.cpp:440 directorymergewindow.cpp:529 +#: directorymergewindow.cpp:3084 directorymergewindow.cpp:3205 +#: directorymergewindow.cpp:3433 mergeresultwindow.cpp:974 +#: mergeresultwindow.cpp:976 mergeresultwindow.cpp:978 +#: mergeresultwindow.cpp:980 mergeresultwindow.cpp:1846 +#: mergeresultwindow.cpp:3202 mergeresultwindow.cpp:3209 optiondialog.cpp:1017 +#: pdiff.cpp:827 pdiff.cpp:829 pdiff.cpp:831 pdiff.cpp:833 pdiff.cpp:855 +#: smalldialogs.cpp:132 smalldialogs.cpp:133 smalldialogs.cpp:136 +#: smalldialogs.cpp:139 #, kde-format msgid "C" msgstr "C" -#: difftextwindow.cpp:1810 +#: difftextwindow.cpp:1809 #, kde-format msgid "A (Base)" msgstr "" -#: difftextwindow.cpp:1812 +#: difftextwindow.cpp:1811 #, fuzzy, kde-format #| msgid "Encoding:" msgid "Encoding: %1" msgstr "Ionchódú:" -#: difftextwindow.cpp:1813 mergeresultwindow.cpp:3183 +#: difftextwindow.cpp:1812 mergeresultwindow.cpp:3211 #, kde-format msgid "Unix" msgstr "Unix" -#: difftextwindow.cpp:1813 mergeresultwindow.cpp:3184 +#: difftextwindow.cpp:1812 mergeresultwindow.cpp:3212 #, kde-format msgid "DOS" msgstr "DOS" -#: difftextwindow.cpp:1813 +#: difftextwindow.cpp:1812 #, kde-format msgid "Line end style: %1" msgstr "" -#: difftextwindow.cpp:1835 kdiff3.cpp:873 +#: difftextwindow.cpp:1834 kdiff3.cpp:874 #, kde-format msgid "Top line" msgstr "" -#: difftextwindow.cpp:1845 +#: difftextwindow.cpp:1843 #, kde-format msgid "End" msgstr "Deireadh" -#: difftextwindow.cpp:1903 smalldialogs.cpp:235 +#: difftextwindow.cpp:1901 smalldialogs.cpp:245 #, fuzzy, kde-format #| msgid "File" msgid "Open File" msgstr "Comhad" -#: difftextwindow.cpp:1951 optiondialog.cpp:387 +#: difftextwindow.cpp:1943 optiondialog.cpp:389 #, kde-format msgid "Unicode, 8 bit" msgstr "" -#: difftextwindow.cpp:1966 +#: difftextwindow.cpp:1958 #, kde-format msgid "Other" msgstr "" -#: directorymergewindow.cpp:409 directorymergewindow.cpp:3424 +#: directorymergewindow.cpp:410 directorymergewindow.cpp:3438 #, kde-format msgid "Copy A to B" msgstr "" -#: directorymergewindow.cpp:412 directorymergewindow.cpp:3425 +#: directorymergewindow.cpp:413 directorymergewindow.cpp:3439 #, kde-format msgid "Copy B to A" msgstr "" -#: directorymergewindow.cpp:415 directorymergewindow.cpp:3426 +#: directorymergewindow.cpp:416 directorymergewindow.cpp:3440 #, kde-format msgid "Delete A" msgstr "" -#: directorymergewindow.cpp:418 directorymergewindow.cpp:3427 +#: directorymergewindow.cpp:419 directorymergewindow.cpp:3441 #, kde-format msgid "Delete B" msgstr "" -#: directorymergewindow.cpp:421 +#: directorymergewindow.cpp:422 #, kde-format msgid "Delete A & B" msgstr "" -#: directorymergewindow.cpp:424 directorymergewindow.cpp:3429 +#: directorymergewindow.cpp:425 directorymergewindow.cpp:3443 #, kde-format msgid "Merge to A" msgstr "" -#: directorymergewindow.cpp:427 directorymergewindow.cpp:3430 +#: directorymergewindow.cpp:428 directorymergewindow.cpp:3444 #, kde-format msgid "Merge to B" msgstr "" -#: directorymergewindow.cpp:430 +#: directorymergewindow.cpp:431 #, kde-format msgid "Merge to A & B" msgstr "" -#: directorymergewindow.cpp:442 directorymergewindow.cpp:3421 +#: directorymergewindow.cpp:443 directorymergewindow.cpp:3435 #, kde-format msgid "Delete (if exists)" msgstr "" -#: directorymergewindow.cpp:445 directorymergewindow.cpp:448 -#: directorymergewindow.cpp:3420 optiondialog.cpp:925 smalldialogs.cpp:113 +#: directorymergewindow.cpp:446 directorymergewindow.cpp:449 +#: directorymergewindow.cpp:3434 smalldialogs.cpp:120 #, kde-format msgid "Merge" msgstr "Cumaisc" -#: directorymergewindow.cpp:445 directorymergewindow.cpp:448 +#: directorymergewindow.cpp:446 directorymergewindow.cpp:449 #, kde-format msgid "Merge (manual)" msgstr "" -#: directorymergewindow.cpp:451 +#: directorymergewindow.cpp:452 #, kde-format msgid "Error: Conflicting File Types" msgstr "" -#: directorymergewindow.cpp:454 +#: directorymergewindow.cpp:455 #, kde-format msgid "Error: Changed and Deleted" msgstr "" -#: directorymergewindow.cpp:457 +#: directorymergewindow.cpp:458 #, kde-format msgid "Error: Dates are equal but files are not." msgstr "" -#: directorymergewindow.cpp:471 +#: directorymergewindow.cpp:472 #, fuzzy, kde-format #| msgid "Done." msgid "Done" msgstr "Críochnaithe." -#: directorymergewindow.cpp:473 +#: directorymergewindow.cpp:474 #, kde-format msgid "Error" msgstr "Earráid" -#: directorymergewindow.cpp:475 +#: directorymergewindow.cpp:476 #, kde-format msgid "Skipped." msgstr "" -#: directorymergewindow.cpp:477 +#: directorymergewindow.cpp:478 #, kde-format msgid "Not saved." msgstr "" -#: directorymergewindow.cpp:479 +#: directorymergewindow.cpp:480 #, kde-format msgid "In progress..." msgstr "" -#: directorymergewindow.cpp:481 +#: directorymergewindow.cpp:482 #, kde-format msgid "To do." msgstr "" -#: directorymergewindow.cpp:522 +#: directorymergewindow.cpp:523 #, kde-format msgid "Name" msgstr "Ainm" -#: directorymergewindow.cpp:530 +#: directorymergewindow.cpp:531 #, kde-format msgid "Operation" msgstr "Oibríocht" -#: directorymergewindow.cpp:532 +#: directorymergewindow.cpp:533 #, kde-format msgid "Status" msgstr "Stádas" -#: directorymergewindow.cpp:534 +#: directorymergewindow.cpp:535 #, kde-format msgid "Unsolved" msgstr "" -#: directorymergewindow.cpp:536 +#: directorymergewindow.cpp:537 #, kde-format msgid "Solved" msgstr "Réitithe" -#: directorymergewindow.cpp:538 +#: directorymergewindow.cpp:539 #, kde-format msgid "Nonwhite" msgstr "" -#: directorymergewindow.cpp:540 +#: directorymergewindow.cpp:541 #, kde-format msgid "White" msgstr "Bán" -#: directorymergewindow.cpp:674 +#: directorymergewindow.cpp:676 #, kde-format msgid "Unable to compare non-normal file with normal file." msgstr "" -#: directorymergewindow.cpp:688 +#: directorymergewindow.cpp:690 #, kde-format msgid "Mix of links and normal files." msgstr "" -#: directorymergewindow.cpp:695 +#: directorymergewindow.cpp:697 #, kde-format msgid "Link: " msgstr "" -#: directorymergewindow.cpp:704 +#: directorymergewindow.cpp:706 #, kde-format msgid "Size. " msgstr "" -#: directorymergewindow.cpp:718 directorymergewindow.cpp:728 +#: directorymergewindow.cpp:720 directorymergewindow.cpp:730 #, kde-format msgid "Date & Size: " msgstr "" -#: directorymergewindow.cpp:748 +#: directorymergewindow.cpp:751 #, kde-format msgid "Comparing file..." msgstr "" -#: directorymergewindow.cpp:801 +#: directorymergewindow.cpp:813 #, kde-format msgid "" "You are currently doing a directory merge. Are you sure, you want to abort " "the merge and rescan the directory?" msgstr "" -#: directorymergewindow.cpp:802 kdiff3.cpp:698 kdiff3.cpp:708 kdiff3.cpp:720 -#: mergeresultwindow.cpp:372 pdiff.cpp:1033 pdiff.cpp:1910 pdiff.cpp:1920 +#: directorymergewindow.cpp:814 kdiff3.cpp:697 kdiff3.cpp:707 kdiff3.cpp:719 +#: mergeresultwindow.cpp:400 pdiff.cpp:1031 pdiff.cpp:1920 pdiff.cpp:1930 #, kde-format msgid "Warning" msgstr "Rabhadh" -#: directorymergewindow.cpp:803 directorymergewindow.cpp:3393 +#: directorymergewindow.cpp:815 directorymergewindow.cpp:3407 #, kde-format msgid "Rescan" msgstr "Athscan" -#: directorymergewindow.cpp:804 pdiff.cpp:1035 +#: directorymergewindow.cpp:816 pdiff.cpp:1033 #, kde-format msgid "Continue Merging" msgstr "" -#: directorymergewindow.cpp:971 +#: directorymergewindow.cpp:984 #, kde-format msgid "Opening of directories failed:" msgstr "" -#: directorymergewindow.cpp:975 +#: directorymergewindow.cpp:988 #, kde-format msgid "Dir A \"%1\" does not exist or is not a directory.\n" msgstr "" -#: directorymergewindow.cpp:980 +#: directorymergewindow.cpp:993 #, kde-format msgid "Dir B \"%1\" does not exist or is not a directory.\n" msgstr "" -#: directorymergewindow.cpp:985 +#: directorymergewindow.cpp:998 #, kde-format msgid "Dir C \"%1\" does not exist or is not a directory.\n" msgstr "" -#: directorymergewindow.cpp:988 +#: directorymergewindow.cpp:1001 #, kde-format msgid "Directory Open Error" msgstr "" -#: directorymergewindow.cpp:996 +#: directorymergewindow.cpp:1009 #, kde-format msgid "" "The destination directory must not be the same as A or B when three " @@ -365,49 +365,49 @@ "Check again before continuing." msgstr "" -#: directorymergewindow.cpp:998 +#: directorymergewindow.cpp:1011 #, kde-format msgid "Parameter Warning" msgstr "" -#: directorymergewindow.cpp:1003 +#: directorymergewindow.cpp:1016 #, kde-format msgid "Scanning directories..." msgstr "" -#: directorymergewindow.cpp:1029 +#: directorymergewindow.cpp:1042 #, kde-format msgid "Reading Directory A" msgstr "" -#: directorymergewindow.cpp:1038 +#: directorymergewindow.cpp:1051 #, kde-format msgid "Reading Directory B" msgstr "" -#: directorymergewindow.cpp:1048 +#: directorymergewindow.cpp:1061 #, kde-format msgid "Reading Directory C" msgstr "" -#: directorymergewindow.cpp:1064 +#: directorymergewindow.cpp:1077 #, kde-format msgid "Some subdirectories were not readable in" msgstr "" -#: directorymergewindow.cpp:1069 +#: directorymergewindow.cpp:1082 #, kde-format msgid "Check the permissions of the subdirectories." msgstr "" -#: directorymergewindow.cpp:1106 kdiff3.cpp:666 kdiff3.cpp:753 kdiff3.cpp:777 -#: kdiff3.cpp:1065 kdiff3.cpp:1086 pdiff.cpp:1116 pdiff.cpp:1170 pdiff.cpp:1218 -#: pdiff.cpp:1234 pdiff.cpp:1277 pdiff.cpp:1301 +#: directorymergewindow.cpp:1119 kdiff3.cpp:665 kdiff3.cpp:752 kdiff3.cpp:776 +#: kdiff3.cpp:1072 kdiff3.cpp:1093 pdiff.cpp:1115 pdiff.cpp:1178 pdiff.cpp:1228 +#: pdiff.cpp:1244 pdiff.cpp:1287 pdiff.cpp:1311 #, kde-format msgid "Ready." msgstr "Réidh." -#: directorymergewindow.cpp:1121 +#: directorymergewindow.cpp:1134 #, kde-format msgid "" "Directory Comparison Status\n" @@ -417,66 +417,66 @@ "Number of different files: %3" msgstr "" -#: directorymergewindow.cpp:1128 +#: directorymergewindow.cpp:1141 #, kde-format msgid "Number of manual merges: %1" msgstr "" -#: directorymergewindow.cpp:1394 +#: directorymergewindow.cpp:1407 #, kde-format msgid "This affects all merge operations." msgstr "" -#: directorymergewindow.cpp:1395 +#: directorymergewindow.cpp:1408 #, kde-format msgid "Changing All Merge Operations" msgstr "" -#: directorymergewindow.cpp:1695 +#: directorymergewindow.cpp:1708 #, kde-format msgid "" "Processing %1 / %2\n" "%3" msgstr "" -#: directorymergewindow.cpp:1738 directorymergewindow.cpp:1742 +#: directorymergewindow.cpp:1751 directorymergewindow.cpp:1755 #, kde-format msgid "Some files could not be processed." msgstr "" -#: directorymergewindow.cpp:2222 directorymergewindow.cpp:2247 -#: directorymergewindow.cpp:2271 +#: directorymergewindow.cpp:2235 directorymergewindow.cpp:2260 +#: directorymergewindow.cpp:2285 #, kde-format msgid "This operation is currently not possible." msgstr "" -#: directorymergewindow.cpp:2222 directorymergewindow.cpp:2247 -#: directorymergewindow.cpp:2271 directorymergewindow.cpp:2552 +#: directorymergewindow.cpp:2235 directorymergewindow.cpp:2260 +#: directorymergewindow.cpp:2285 directorymergewindow.cpp:2565 #, kde-format msgid "Operation Not Possible" msgstr "" -#: directorymergewindow.cpp:2318 +#: directorymergewindow.cpp:2332 #, kde-format msgid "An error occurred while copying." msgstr "" -#: directorymergewindow.cpp:2319 directorymergewindow.cpp:2759 +#: directorymergewindow.cpp:2333 directorymergewindow.cpp:2772 #, kde-format msgid "Merge Error" msgstr "" -#: directorymergewindow.cpp:2396 +#: directorymergewindow.cpp:2410 #, kde-format msgid "Unknown merge operation. (This must never happen!)" msgstr "" -#: directorymergewindow.cpp:2441 +#: directorymergewindow.cpp:2455 #, kde-format msgid "Unknown merge operation." msgstr "" -#: directorymergewindow.cpp:2454 +#: directorymergewindow.cpp:2468 #, kde-format msgid "" "The merge is about to begin.\n" @@ -489,50 +489,50 @@ "whatsoever! Make backups of your vital data!" msgstr "" -#: directorymergewindow.cpp:2459 +#: directorymergewindow.cpp:2473 #, kde-format msgid "Starting Merge" msgstr "" -#: directorymergewindow.cpp:2460 +#: directorymergewindow.cpp:2474 #, kde-format msgid "Do It" msgstr "" -#: directorymergewindow.cpp:2461 +#: directorymergewindow.cpp:2475 #, kde-format msgid "Simulate It" msgstr "" -#: directorymergewindow.cpp:2487 +#: directorymergewindow.cpp:2501 #, kde-format msgid "" "The highlighted item has a different type in the different directories. " "Select what to do." msgstr "" -#: directorymergewindow.cpp:2491 +#: directorymergewindow.cpp:2505 #, kde-format msgid "" "The modification dates of the file are equal but the files are not. Select " "what to do." msgstr "" -#: directorymergewindow.cpp:2495 +#: directorymergewindow.cpp:2509 #, kde-format msgid "" "The highlighted item was changed in one directory and deleted in the other. " "Select what to do." msgstr "" -#: directorymergewindow.cpp:2552 +#: directorymergewindow.cpp:2565 #, kde-format msgid "" "This operation is currently not possible because directory merge is " "currently running." msgstr "" -#: directorymergewindow.cpp:2609 +#: directorymergewindow.cpp:2622 #, kde-format msgid "" "There was an error in the last step.\n" @@ -540,971 +540,976 @@ "to skip this item?" msgstr "" -#: directorymergewindow.cpp:2611 +#: directorymergewindow.cpp:2624 #, kde-format msgid "Continue merge after an error" msgstr "" -#: directorymergewindow.cpp:2612 +#: directorymergewindow.cpp:2625 #, kde-format msgid "Continue With Last Item" msgstr "" -#: directorymergewindow.cpp:2613 +#: directorymergewindow.cpp:2626 #, kde-format msgid "Skip Item" msgstr "" -#: directorymergewindow.cpp:2709 +#: directorymergewindow.cpp:2722 #, kde-format msgid "Merge operation complete." msgstr "" -#: directorymergewindow.cpp:2709 directorymergewindow.cpp:2712 +#: directorymergewindow.cpp:2722 directorymergewindow.cpp:2725 #, kde-format msgid "Merge Complete" msgstr "" -#: directorymergewindow.cpp:2722 +#: directorymergewindow.cpp:2735 #, kde-format msgid "" "Simulated merge complete: Check if you agree with the proposed operations." msgstr "" -#: directorymergewindow.cpp:2758 +#: directorymergewindow.cpp:2771 #, kde-format msgid "An error occurred. Press OK to see detailed information." msgstr "" -#: directorymergewindow.cpp:2791 +#: directorymergewindow.cpp:2804 #, kde-format msgid "Error: While deleting %1: Creating backup failed." msgstr "" -#: directorymergewindow.cpp:2798 +#: directorymergewindow.cpp:2811 #, kde-format msgid "delete directory recursively( %1 )" msgstr "" -#: directorymergewindow.cpp:2800 +#: directorymergewindow.cpp:2813 #, kde-format msgid "delete( %1 )" msgstr "" -#: directorymergewindow.cpp:2815 +#: directorymergewindow.cpp:2828 #, kde-format msgid "Error: delete dir operation failed while trying to read the directory." msgstr "" -#: directorymergewindow.cpp:2834 +#: directorymergewindow.cpp:2847 #, kde-format msgid "Error: rmdir( %1 ) operation failed." msgstr "" -#: directorymergewindow.cpp:2844 +#: directorymergewindow.cpp:2857 #, kde-format msgid "Error: delete operation failed." msgstr "" -#: directorymergewindow.cpp:2870 +#: directorymergewindow.cpp:2884 #, kde-format msgid "manual merge( %1, %2, %3 -> %4)" msgstr "" -#: directorymergewindow.cpp:2873 +#: directorymergewindow.cpp:2887 #, kde-format msgid "" " Note: After a manual merge the user should continue by pressing F7." msgstr "" -#: directorymergewindow.cpp:2900 +#: directorymergewindow.cpp:2914 #, kde-format msgid "Error: copy( %1 -> %2 ) failed.Deleting existing destination failed." msgstr "" -#: directorymergewindow.cpp:2909 +#: directorymergewindow.cpp:2923 #, kde-format msgid "copyLink( %1 -> %2 )" msgstr "" -#: directorymergewindow.cpp:2918 +#: directorymergewindow.cpp:2932 #, kde-format msgid "Error: copyLink failed: Remote links are not yet supported." msgstr "" -#: directorymergewindow.cpp:2928 +#: directorymergewindow.cpp:2942 #, kde-format msgid "Error: copyLink failed." msgstr "" -#: directorymergewindow.cpp:2953 +#: directorymergewindow.cpp:2967 #, kde-format msgid "copy( %1 -> %2 )" msgstr "" -#: directorymergewindow.cpp:2979 +#: directorymergewindow.cpp:2993 #, kde-format msgid "Error during rename( %1 -> %2 ): Cannot delete existing destination." msgstr "" -#: directorymergewindow.cpp:2986 +#: directorymergewindow.cpp:3000 #, kde-format msgid "rename( %1 -> %2 )" msgstr "" -#: directorymergewindow.cpp:2995 +#: directorymergewindow.cpp:3009 #, kde-format msgid "Error: Rename failed." msgstr "" -#: directorymergewindow.cpp:3013 +#: directorymergewindow.cpp:3027 #, kde-format msgid "Error during makeDir of %1. Cannot delete existing file." msgstr "" -#: directorymergewindow.cpp:3030 +#: directorymergewindow.cpp:3044 #, kde-format msgid "makeDir( %1 )" msgstr "" -#: directorymergewindow.cpp:3040 +#: directorymergewindow.cpp:3054 #, kde-format msgid "Error while creating directory." msgstr "" -#: directorymergewindow.cpp:3076 directorymergewindow.cpp:3195 +#: directorymergewindow.cpp:3090 directorymergewindow.cpp:3209 #, kde-format msgid "Dest" msgstr "" -#: directorymergewindow.cpp:3084 directorymergewindow.cpp:3113 +#: directorymergewindow.cpp:3098 directorymergewindow.cpp:3127 #, kde-format msgid "Dir" msgstr "" -#: directorymergewindow.cpp:3084 +#: directorymergewindow.cpp:3098 #, kde-format msgid "Type" msgstr "Cineál" -#: directorymergewindow.cpp:3084 +#: directorymergewindow.cpp:3098 #, kde-format msgid "Size" msgstr "Méid" -#: directorymergewindow.cpp:3085 +#: directorymergewindow.cpp:3099 #, kde-format msgid "Attr" msgstr "" -#: directorymergewindow.cpp:3085 +#: directorymergewindow.cpp:3099 #, kde-format msgid "Last Modification" msgstr "" -#: directorymergewindow.cpp:3085 +#: directorymergewindow.cpp:3099 #, kde-format msgid "Link-Destination" msgstr "" -#: directorymergewindow.cpp:3113 +#: directorymergewindow.cpp:3127 #, kde-format msgid "File" msgstr "Comhad" -#: directorymergewindow.cpp:3113 +#: directorymergewindow.cpp:3127 #, kde-format msgid "-Link" msgstr "" -#: directorymergewindow.cpp:3119 +#: directorymergewindow.cpp:3133 #, kde-format msgid "not available" msgstr "níl ar fáil" -#: directorymergewindow.cpp:3137 +#: directorymergewindow.cpp:3151 #, kde-format msgid "A (Dest): " msgstr "" -#: directorymergewindow.cpp:3141 +#: directorymergewindow.cpp:3155 #, kde-format msgid "A: " msgstr "" -#: directorymergewindow.cpp:3141 +#: directorymergewindow.cpp:3155 #, kde-format msgid "A (Base): " msgstr "" -#: directorymergewindow.cpp:3147 +#: directorymergewindow.cpp:3161 #, kde-format msgid "B (Dest): " msgstr "" -#: directorymergewindow.cpp:3151 +#: directorymergewindow.cpp:3165 #, kde-format msgid "B: " msgstr "" -#: directorymergewindow.cpp:3156 +#: directorymergewindow.cpp:3170 #, kde-format msgid "C (Dest): " msgstr "" -#: directorymergewindow.cpp:3160 +#: directorymergewindow.cpp:3174 #, kde-format msgid "C: " msgstr "" -#: directorymergewindow.cpp:3163 +#: directorymergewindow.cpp:3177 #, kde-format msgid "Dest: " msgstr "" #. i18n("Saving Directory Merge State ...")); -#: directorymergewindow.cpp:3238 +#: directorymergewindow.cpp:3252 #, kde-format msgid "Save Directory Merge State As..." msgstr "" -#: directorymergewindow.cpp:3387 +#: directorymergewindow.cpp:3401 #, kde-format msgid "Start/Continue Directory Merge" msgstr "" -#: directorymergewindow.cpp:3388 +#: directorymergewindow.cpp:3402 #, kde-format msgid "Run Operation for Current Item" msgstr "" -#: directorymergewindow.cpp:3389 +#: directorymergewindow.cpp:3403 #, kde-format msgid "Compare Selected File" msgstr "" -#: directorymergewindow.cpp:3390 +#: directorymergewindow.cpp:3404 #, kde-format msgid "Merge Current File" msgstr "" -#: directorymergewindow.cpp:3390 +#: directorymergewindow.cpp:3404 #, kde-format msgid "" "Merge\n" "File" msgstr "" -#: directorymergewindow.cpp:3391 +#: directorymergewindow.cpp:3405 #, kde-format msgid "Fold All Subdirs" msgstr "" -#: directorymergewindow.cpp:3392 +#: directorymergewindow.cpp:3406 #, kde-format msgid "Unfold All Subdirs" msgstr "" #. i18n("Save Directory Merge State ..."), 0, this, &DirectoryMergeWindow::slotSaveMergeState, ac, "dir_save_merge_state"); #. i18n("Load Directory Merge State ..."), 0, this, &DirectoryMergeWindow::slotLoadMergeState, ac, "dir_load_merge_state"); -#: directorymergewindow.cpp:3396 +#: directorymergewindow.cpp:3410 #, kde-format msgid "Choose A for All Items" msgstr "" -#: directorymergewindow.cpp:3397 +#: directorymergewindow.cpp:3411 #, kde-format msgid "Choose B for All Items" msgstr "" -#: directorymergewindow.cpp:3398 +#: directorymergewindow.cpp:3412 #, kde-format msgid "Choose C for All Items" msgstr "" -#: directorymergewindow.cpp:3399 +#: directorymergewindow.cpp:3413 #, kde-format msgid "Auto-Choose Operation for All Items" msgstr "" -#: directorymergewindow.cpp:3400 +#: directorymergewindow.cpp:3414 #, kde-format msgid "No Operation for All Items" msgstr "" #. i18n("Synchronize Directories"), 0, this, &DirectoryMergeWindow::slotSynchronizeDirectories, ac, "dir_synchronize_directories"); #. d->m_pDirChooseNewerFiles = GuiUtils::createAction< KToggleAction >(i18n("Copy Newer Files Instead of Merging"), 0, this, &DirectoryMergeWindow::slotChooseNewerFiles, ac, "dir_choose_newer_files"); -#: directorymergewindow.cpp:3405 +#: directorymergewindow.cpp:3419 #, kde-format msgid "Show Identical Files" msgstr "" -#: directorymergewindow.cpp:3405 +#: directorymergewindow.cpp:3419 #, kde-format msgid "" "Identical\n" "Files" msgstr "" -#: directorymergewindow.cpp:3406 +#: directorymergewindow.cpp:3420 #, kde-format msgid "Show Different Files" msgstr "" -#: directorymergewindow.cpp:3407 +#: directorymergewindow.cpp:3421 #, kde-format msgid "Show Files only in A" msgstr "" -#: directorymergewindow.cpp:3407 +#: directorymergewindow.cpp:3421 #, kde-format msgid "" "Files\n" "only in A" msgstr "" -#: directorymergewindow.cpp:3408 +#: directorymergewindow.cpp:3422 #, kde-format msgid "Show Files only in B" msgstr "" -#: directorymergewindow.cpp:3408 +#: directorymergewindow.cpp:3422 #, kde-format msgid "" "Files\n" "only in B" msgstr "" -#: directorymergewindow.cpp:3409 +#: directorymergewindow.cpp:3423 #, kde-format msgid "Show Files only in C" msgstr "" -#: directorymergewindow.cpp:3409 +#: directorymergewindow.cpp:3423 #, kde-format msgid "" "Files\n" "only in C" msgstr "" -#: directorymergewindow.cpp:3413 +#: directorymergewindow.cpp:3427 #, kde-format msgid "Compare Explicitly Selected Files" msgstr "" -#: directorymergewindow.cpp:3414 +#: directorymergewindow.cpp:3428 #, kde-format msgid "Merge Explicitly Selected Files" msgstr "" -#: directorymergewindow.cpp:3416 directorymergewindow.cpp:3423 +#: directorymergewindow.cpp:3430 directorymergewindow.cpp:3437 #, kde-format msgid "Do Nothing" msgstr "Ná Déan Faic" -#: directorymergewindow.cpp:3428 +#: directorymergewindow.cpp:3442 #, kde-format msgid "Delete A && B" msgstr "" -#: directorymergewindow.cpp:3431 +#: directorymergewindow.cpp:3445 #, kde-format msgid "Merge to A && B" msgstr "" -#: fileaccess.cpp:462 SourceData.cpp:493 +#: fileaccess.cpp:301 +#, kde-format +msgid "Unable to determine full url. No parent specified." +msgstr "" + +#: fileaccess.cpp:482 SourceData.cpp:506 #, kde-format msgid "Failed to read file: %1" msgstr "" -#: fileaccess.cpp:587 +#: fileaccess.cpp:624 #, kde-format msgid "Creating temp copy of %1 failed." msgstr "" -#: fileaccess.cpp:595 fileaccess.cpp:600 +#: fileaccess.cpp:632 fileaccess.cpp:637 #, kde-format msgid "Opening %1 failed. %2" msgstr "" -#: fileaccess.cpp:619 fileaccess.cpp:627 +#: fileaccess.cpp:656 fileaccess.cpp:664 #, fuzzy, kde-format #| msgid "Error reading from %1" msgid "Error reading from %1. %2" msgstr "Earráid agus %1 á léamh" -#: fileaccess.cpp:751 +#: fileaccess.cpp:788 #, kde-format msgid "" "While trying to make a backup, deleting an older backup failed.\n" "Filename: %1" msgstr "" -#: fileaccess.cpp:758 +#: fileaccess.cpp:795 #, kde-format msgid "" "While trying to make a backup, renaming failed.\n" "Filenames: %1 -> %2" msgstr "" -#: fileaccess.cpp:828 +#: fileaccess.cpp:865 #, kde-format msgid "Getting file status: %1" msgstr "" -#: fileaccess.cpp:869 +#: fileaccess.cpp:906 #, kde-format msgid "Reading file: %1" msgstr "" -#: fileaccess.cpp:907 +#: fileaccess.cpp:944 #, kde-format msgid "Writing file: %1" msgstr "" -#: fileaccess.cpp:940 +#: fileaccess.cpp:977 #, kde-format msgid "Out of memory" msgstr "Cuimhne ídithe" -#: fileaccess.cpp:976 +#: fileaccess.cpp:1013 #, kde-format msgid "Making directory: %1" msgstr "" -#: fileaccess.cpp:997 +#: fileaccess.cpp:1034 #, kde-format msgid "Removing directory: %1" msgstr "" -#: fileaccess.cpp:1012 +#: fileaccess.cpp:1049 #, kde-format msgid "Removing file: %1" msgstr "" -#: fileaccess.cpp:1028 +#: fileaccess.cpp:1065 #, kde-format msgid "Creating symbolic link: %1 -> %2" msgstr "" -#: fileaccess.cpp:1052 +#: fileaccess.cpp:1089 #, kde-format msgid "Renaming file: %1 -> %2" msgstr "" -#: fileaccess.cpp:1086 +#: fileaccess.cpp:1123 #, kde-format msgid "Copying file: %1 -> %2" msgstr "" -#: fileaccess.cpp:1108 +#: fileaccess.cpp:1145 #, fuzzy, kde-format #| msgid "Directory" msgid "Reading directory: %1" msgstr "Comhadlann" -#: fileaccess.cpp:1162 +#: fileaccess.cpp:1202 #, kde-format msgid "Listing directory: %1" msgstr "" -#: kdiff3.cpp:181 +#: kdiff3.cpp:182 #, kde-format msgid "Current Configuration:" msgstr "" -#: kdiff3.cpp:186 +#: kdiff3.cpp:187 #, kde-format msgid "Config Option Error:" msgstr "" -#: kdiff3.cpp:240 +#: kdiff3.cpp:246 #, kde-format msgid "Option --auto used, but no output file specified." msgstr "" -#: kdiff3.cpp:416 +#: kdiff3.cpp:405 #, kde-format msgid "Option --auto ignored for directory comparison." msgstr "" -#: kdiff3.cpp:460 +#: kdiff3.cpp:449 #, kde-format msgid "Saving failed." msgstr "" -#: kdiff3.cpp:496 pdiff.cpp:1098 +#: kdiff3.cpp:494 pdiff.cpp:1096 #, kde-format msgid "Opening of these files failed:" msgstr "" -#: kdiff3.cpp:505 +#: kdiff3.cpp:503 pdiff.cpp:1105 #, kde-format -msgid "File Open Error" +msgid "File open error" msgstr "" -#: kdiff3.cpp:533 +#: kdiff3.cpp:532 #, kde-format msgid "Opens documents for comparison..." msgstr "" -#: kdiff3.cpp:535 +#: kdiff3.cpp:534 #, kde-format msgid "Reload" msgstr "Athluchtaigh" -#: kdiff3.cpp:538 +#: kdiff3.cpp:537 #, kde-format msgid "Saves the merge result. All conflicts must be solved!" msgstr "" -#: kdiff3.cpp:540 +#: kdiff3.cpp:539 #, kde-format msgid "Saves the current document as..." msgstr "" -#: kdiff3.cpp:543 +#: kdiff3.cpp:542 #, kde-format msgid "Print the differences" msgstr "" -#: kdiff3.cpp:546 +#: kdiff3.cpp:545 #, kde-format msgid "Quits the application" msgstr "Éirigh as an bhfeidhmchlár" -#: kdiff3.cpp:549 +#: kdiff3.cpp:548 #, kde-format msgid "Cuts the selected section and puts it to the clipboard" msgstr "Gearr an rannán roghnaithe agus cuir é sa ghearrthaisce" -#: kdiff3.cpp:552 +#: kdiff3.cpp:551 #, kde-format msgid "Copies the selected section to the clipboard" msgstr "Cuir cóip den rannán roghnaithe sa ghearrthaisce" -#: kdiff3.cpp:554 +#: kdiff3.cpp:553 #, kde-format msgid "Pastes the clipboard contents to current position" msgstr "Greamaigh inneachar na gearrthaisce ag ionad an chúrsóra" -#: kdiff3.cpp:557 +#: kdiff3.cpp:556 #, kde-format msgid "Select everything in current window" msgstr "" -#: kdiff3.cpp:560 +#: kdiff3.cpp:559 #, kde-format msgid "Search for a string" msgstr "" -#: kdiff3.cpp:562 +#: kdiff3.cpp:561 #, kde-format msgid "Search again for the string" msgstr "" -#: kdiff3.cpp:567 +#: kdiff3.cpp:566 #, kde-format msgid "Enables/disables the statusbar" msgstr "Cumasaigh/díchumasaigh an barra stádais" -#: kdiff3.cpp:571 +#: kdiff3.cpp:570 #, kde-format msgid "Configure KDiff3..." msgstr "" -#: kdiff3.cpp:590 +#: kdiff3.cpp:589 #, kde-format msgid "Go to Current Delta" msgstr "" -#: kdiff3.cpp:590 +#: kdiff3.cpp:589 #, kde-format msgid "" "Current\n" "Delta" msgstr "" -#: kdiff3.cpp:592 +#: kdiff3.cpp:591 #, kde-format msgid "Go to First Delta" msgstr "" -#: kdiff3.cpp:592 +#: kdiff3.cpp:591 #, kde-format msgid "" "First\n" "Delta" msgstr "" -#: kdiff3.cpp:594 +#: kdiff3.cpp:593 #, kde-format msgid "Go to Last Delta" msgstr "" -#: kdiff3.cpp:594 +#: kdiff3.cpp:593 #, kde-format msgid "" "Last\n" "Delta" msgstr "" -#: kdiff3.cpp:596 +#: kdiff3.cpp:595 #, kde-format msgid "(Skips white space differences when \"Show White Space\" is disabled.)" msgstr "" -#: kdiff3.cpp:597 +#: kdiff3.cpp:596 #, kde-format msgid "" "(Does not skip white space differences even when \"Show White Space\" is " "disabled.)" msgstr "" -#: kdiff3.cpp:598 +#: kdiff3.cpp:597 #, kde-format msgid "Go to Previous Delta" msgstr "" -#: kdiff3.cpp:598 +#: kdiff3.cpp:597 #, kde-format msgid "" "Prev\n" "Delta" msgstr "" -#: kdiff3.cpp:600 +#: kdiff3.cpp:599 #, kde-format msgid "Go to Next Delta" msgstr "" -#: kdiff3.cpp:600 +#: kdiff3.cpp:599 #, kde-format msgid "" "Next\n" "Delta" msgstr "" -#: kdiff3.cpp:602 +#: kdiff3.cpp:601 #, kde-format msgid "Go to Previous Conflict" msgstr "" -#: kdiff3.cpp:602 +#: kdiff3.cpp:601 #, kde-format msgid "" "Prev\n" "Conflict" msgstr "" -#: kdiff3.cpp:604 +#: kdiff3.cpp:603 #, kde-format msgid "Go to Next Conflict" msgstr "" -#: kdiff3.cpp:604 +#: kdiff3.cpp:603 #, kde-format msgid "" "Next\n" "Conflict" msgstr "" -#: kdiff3.cpp:606 +#: kdiff3.cpp:605 #, kde-format msgid "Go to Previous Unsolved Conflict" msgstr "" -#: kdiff3.cpp:606 +#: kdiff3.cpp:605 #, kde-format msgid "" "Prev\n" "Unsolved" msgstr "" -#: kdiff3.cpp:608 +#: kdiff3.cpp:607 #, kde-format msgid "Go to Next Unsolved Conflict" msgstr "" -#: kdiff3.cpp:608 +#: kdiff3.cpp:607 #, kde-format msgid "" "Next\n" "Unsolved" msgstr "" -#: kdiff3.cpp:610 +#: kdiff3.cpp:609 #, kde-format msgid "Select Line(s) From A" msgstr "" -#: kdiff3.cpp:610 +#: kdiff3.cpp:609 #, kde-format msgid "" "Choose\n" "A" msgstr "" -#: kdiff3.cpp:611 +#: kdiff3.cpp:610 #, kde-format msgid "Select Line(s) From B" msgstr "" -#: kdiff3.cpp:611 +#: kdiff3.cpp:610 #, kde-format msgid "" "Choose\n" "B" msgstr "" -#: kdiff3.cpp:612 +#: kdiff3.cpp:611 #, kde-format msgid "Select Line(s) From C" msgstr "" -#: kdiff3.cpp:612 +#: kdiff3.cpp:611 #, kde-format msgid "" "Choose\n" "C" msgstr "" -#: kdiff3.cpp:613 +#: kdiff3.cpp:612 #, kde-format msgid "Automatically Go to Next Unsolved Conflict After Source Selection" msgstr "" -#: kdiff3.cpp:613 +#: kdiff3.cpp:612 #, kde-format msgid "" "Auto\n" "Next" msgstr "" -#: kdiff3.cpp:615 +#: kdiff3.cpp:614 #, kde-format msgid "Show Space && Tabulator Characters" msgstr "" -#: kdiff3.cpp:615 +#: kdiff3.cpp:614 #, kde-format msgid "" "White\n" "Characters" msgstr "" -#: kdiff3.cpp:616 +#: kdiff3.cpp:615 #, kde-format msgid "Show White Space" msgstr "" -#: kdiff3.cpp:616 +#: kdiff3.cpp:615 #, kde-format msgid "" "White\n" "Deltas" msgstr "" -#: kdiff3.cpp:618 +#: kdiff3.cpp:617 #, kde-format msgid "Show Line Numbers" msgstr "" -#: kdiff3.cpp:618 +#: kdiff3.cpp:617 #, kde-format msgid "" "Line\n" "Numbers" msgstr "" -#: kdiff3.cpp:620 +#: kdiff3.cpp:619 #, kde-format msgid "Automatically Solve Simple Conflicts" msgstr "" -#: kdiff3.cpp:621 +#: kdiff3.cpp:620 #, kde-format msgid "Set Deltas to Conflicts" msgstr "" -#: kdiff3.cpp:622 +#: kdiff3.cpp:621 #, kde-format msgid "Run Regular Expression Auto Merge" msgstr "" -#: kdiff3.cpp:623 +#: kdiff3.cpp:622 #, kde-format msgid "Automatically Solve History Conflicts" msgstr "" -#: kdiff3.cpp:624 +#: kdiff3.cpp:623 #, kde-format msgid "Split Diff At Selection" msgstr "" -#: kdiff3.cpp:625 +#: kdiff3.cpp:624 #, kde-format msgid "Join Selected Diffs" msgstr "" -#: kdiff3.cpp:627 +#: kdiff3.cpp:626 #, kde-format msgid "Show Window A" msgstr "" -#: kdiff3.cpp:628 +#: kdiff3.cpp:627 #, kde-format msgid "Show Window B" msgstr "" -#: kdiff3.cpp:629 +#: kdiff3.cpp:628 #, kde-format msgid "Show Window C" msgstr "" -#: kdiff3.cpp:631 +#: kdiff3.cpp:630 #, kde-format msgid "Normal Overview" msgstr "" -#: kdiff3.cpp:632 +#: kdiff3.cpp:631 #, kde-format msgid "A vs. B Overview" msgstr "" -#: kdiff3.cpp:633 +#: kdiff3.cpp:632 #, kde-format msgid "A vs. C Overview" msgstr "" -#: kdiff3.cpp:634 +#: kdiff3.cpp:633 #, kde-format msgid "B vs. C Overview" msgstr "" -#: kdiff3.cpp:635 +#: kdiff3.cpp:634 #, kde-format msgid "Word Wrap Diff Windows" msgstr "" -#: kdiff3.cpp:636 +#: kdiff3.cpp:635 #, kde-format msgid "Add Manual Diff Alignment" msgstr "" -#: kdiff3.cpp:637 +#: kdiff3.cpp:636 #, kde-format msgid "Clear All Manual Diff Alignments" msgstr "" -#: kdiff3.cpp:639 +#: kdiff3.cpp:638 #, kde-format msgid "Focus Next Window" msgstr "" -#: kdiff3.cpp:640 +#: kdiff3.cpp:639 #, kde-format msgid "Focus Prev Window" msgstr "" -#: kdiff3.cpp:641 +#: kdiff3.cpp:640 #, kde-format msgid "Toggle Split Orientation" msgstr "" -#: kdiff3.cpp:643 +#: kdiff3.cpp:642 #, kde-format msgid "Dir && Text Split Screen View" msgstr "" -#: kdiff3.cpp:645 +#: kdiff3.cpp:644 #, kde-format msgid "Toggle Between Dir && Text View" msgstr "" -#: kdiff3.cpp:697 pdiff.cpp:1909 +#: kdiff3.cpp:696 pdiff.cpp:1919 #, kde-format msgid "The merge result has not been saved." msgstr "" -#: kdiff3.cpp:699 +#: kdiff3.cpp:698 #, kde-format msgid "Save && Quit" msgstr "" -#: kdiff3.cpp:700 +#: kdiff3.cpp:699 #, kde-format msgid "Quit Without Saving" msgstr "" -#: kdiff3.cpp:708 pdiff.cpp:1920 +#: kdiff3.cpp:707 pdiff.cpp:1930 #, kde-format msgid "Saving the merge result failed." msgstr "" -#: kdiff3.cpp:719 pdiff.cpp:1032 +#: kdiff3.cpp:718 pdiff.cpp:1030 #, kde-format msgid "" "You are currently doing a directory merge. Are you sure, you want to abort?" msgstr "" -#: kdiff3.cpp:742 +#: kdiff3.cpp:741 #, kde-format msgid "Saving file..." msgstr "Comhad á shábháil..." -#: kdiff3.cpp:759 +#: kdiff3.cpp:758 #, kde-format msgid "Saving file with a new filename..." msgstr "Comhad á shábháil le hainm comhaid nua..." -#: kdiff3.cpp:761 +#: kdiff3.cpp:760 #, kde-format msgid "Save As..." msgstr "Sábháil Mar..." -#: kdiff3.cpp:820 +#: kdiff3.cpp:819 #, kde-format msgid "Printing not implemented." msgstr "" -#: kdiff3.cpp:857 +#: kdiff3.cpp:858 #, kde-format msgid "Printing..." msgstr "Á Phriontáil..." -#: kdiff3.cpp:943 +#: kdiff3.cpp:948 #, kde-format msgid "Printing page %1 of %2" msgstr "" -#: kdiff3.cpp:1000 +#: kdiff3.cpp:1006 #, fuzzy, kde-format #| msgid "Selection" msgid " (Selection)" msgstr "Roghnú" -#: kdiff3.cpp:1027 +#: kdiff3.cpp:1034 #, kde-format msgid "Printing completed." msgstr "" -#: kdiff3.cpp:1031 +#: kdiff3.cpp:1038 #, kde-format msgid "Printing aborted." msgstr "Priontáil tobscortha." -#: kdiff3.cpp:1038 +#: kdiff3.cpp:1045 #, kde-format msgid "Exiting..." msgstr "Ag scor..." -#: kdiff3.cpp:1049 +#: kdiff3.cpp:1056 #, kde-format msgid "Toggling toolbar..." msgstr "Barra uirlisí á scoránú..." -#: kdiff3.cpp:1070 +#: kdiff3.cpp:1077 #, kde-format msgid "Toggle the statusbar..." msgstr "Scoránaigh an barra stádais..." @@ -1530,7 +1535,7 @@ msgid "Joachim Eibl" msgstr "Joachim Eibl" -#: kdiff3_part.cpp:173 kdiff3_part.cpp:254 +#: kdiff3_part.cpp:174 kdiff3_part.cpp:255 #, kde-format msgid "Could not find files for comparison." msgstr "" @@ -1550,7 +1555,7 @@ msgstr "Cumraigh" #. i18n: ectx: ToolBar (mainToolBar) -#: kdiff3_part.rc:16 main.cpp:88 +#: kdiff3_part.rc:16 main.cpp:89 #, kde-format msgid "KDiff3" msgstr "KDiff3" @@ -1618,198 +1623,204 @@ msgid "Main Toolbar" msgstr "Príomhbharra Uirlisí" -#: main.cpp:68 main.cpp:72 +#: main.cpp:69 main.cpp:73 #, kde-format msgid "Ignored. (User defined.)" msgstr "" -#: main.cpp:92 +#: main.cpp:93 #, kde-format msgid " (64 bit)" msgstr "" -#: main.cpp:94 +#: main.cpp:95 #, kde-format msgid " (32 bit)" msgstr "" -#: main.cpp:95 +#: main.cpp:96 #, kde-format msgid "Tool for Comparison and Merge of Files and Directories" msgstr "" -#: main.cpp:96 +#: main.cpp:97 #, kde-format msgid "(c) 2002-2014 Joachim Eibl, (c) 2017 Michael Reeves KF5/Qt5 port" msgstr "" -#: main.cpp:112 +#: main.cpp:113 #, kde-format msgid "Merge the input." msgstr "" -#: main.cpp:113 +#: main.cpp:114 #, kde-format msgid "Explicit base file. For compatibility with certain tools." msgstr "" -#: main.cpp:114 +#: main.cpp:115 #, kde-format msgid "Output file. Implies -m. E.g.: -o newfile.txt" msgstr "" -#: main.cpp:115 +#: main.cpp:116 #, kde-format msgid "Output file, again. (For compatibility with certain tools.)" msgstr "" -#: main.cpp:116 +#: main.cpp:118 #, kde-format msgid "No GUI if all conflicts are auto-solvable. (Needs -o file)" msgstr "" -#: main.cpp:117 +#: main.cpp:120 +#, fuzzy, kde-format +#| msgid "Ignore" +msgid "Ignored." +msgstr "Déan neamhaird de" + +#: main.cpp:122 #, kde-format msgid "Do not solve conflicts automatically." msgstr "" -#: main.cpp:118 +#: main.cpp:123 #, kde-format msgid "Visible name replacement for input file 1 (base)." msgstr "" -#: main.cpp:119 +#: main.cpp:124 #, kde-format msgid "Visible name replacement for input file 2." msgstr "" -#: main.cpp:120 +#: main.cpp:125 #, kde-format msgid "Visible name replacement for input file 3." msgstr "" -#: main.cpp:121 +#: main.cpp:126 #, kde-format msgid "Alternative visible name replacement. Supply this once for every input." msgstr "" -#: main.cpp:122 +#: main.cpp:127 #, kde-format msgid "" "Override a config setting. Use once for every setting. E.g.: --cs " "\"AutoAdvance=1\"" msgstr "" -#: main.cpp:123 +#: main.cpp:128 #, kde-format msgid "Show list of config settings and current values." msgstr "" -#: main.cpp:124 +#: main.cpp:129 #, kde-format msgid "Use a different config file." msgstr "" -#: main.cpp:127 +#: main.cpp:132 #, kde-format msgid "file1 to open (base, if not specified via --base)" msgstr "" -#: main.cpp:128 +#: main.cpp:133 #, kde-format msgid "file2 to open" msgstr "" -#: main.cpp:129 +#: main.cpp:134 #, kde-format msgid "file3 to open" msgstr "" -#: main.cpp:153 +#: main.cpp:158 #, kde-format msgid "See kdiff3 --help for supported options." msgstr "" -#: mergeresultwindow.cpp:158 +#: mergeresultwindow.cpp:171 #, kde-format msgid "Choose A Everywhere" msgstr "" -#: mergeresultwindow.cpp:159 +#: mergeresultwindow.cpp:172 #, kde-format msgid "Choose B Everywhere" msgstr "" -#: mergeresultwindow.cpp:160 +#: mergeresultwindow.cpp:173 #, kde-format msgid "Choose C Everywhere" msgstr "" -#: mergeresultwindow.cpp:161 +#: mergeresultwindow.cpp:174 #, kde-format msgid "Choose A for All Unsolved Conflicts" msgstr "" -#: mergeresultwindow.cpp:162 +#: mergeresultwindow.cpp:175 #, kde-format msgid "Choose B for All Unsolved Conflicts" msgstr "" -#: mergeresultwindow.cpp:163 +#: mergeresultwindow.cpp:176 #, kde-format msgid "Choose C for All Unsolved Conflicts" msgstr "" -#: mergeresultwindow.cpp:164 +#: mergeresultwindow.cpp:177 #, kde-format msgid "Choose A for All Unsolved Whitespace Conflicts" msgstr "" -#: mergeresultwindow.cpp:165 +#: mergeresultwindow.cpp:178 #, kde-format msgid "Choose B for All Unsolved Whitespace Conflicts" msgstr "" -#: mergeresultwindow.cpp:166 +#: mergeresultwindow.cpp:179 #, kde-format msgid "Choose C for All Unsolved Whitespace Conflicts" msgstr "" -#: mergeresultwindow.cpp:176 +#: mergeresultwindow.cpp:204 #, kde-format msgid "Number of remaining unsolved conflicts: %1 (of which %2 are whitespace)" msgstr "" -#: mergeresultwindow.cpp:370 +#: mergeresultwindow.cpp:398 #, kde-format msgid "" "The output has been modified.\n" "If you continue your changes will be lost." msgstr "" -#: mergeresultwindow.cpp:936 pdiff.cpp:827 +#: mergeresultwindow.cpp:964 pdiff.cpp:817 #, kde-format msgid "All input files are binary equal." msgstr "" -#: mergeresultwindow.cpp:938 +#: mergeresultwindow.cpp:966 #, kde-format msgid "All input files contain the same text." msgstr "" -#: mergeresultwindow.cpp:942 mergeresultwindow.cpp:946 -#: mergeresultwindow.cpp:950 pdiff.cpp:833 pdiff.cpp:837 pdiff.cpp:841 +#: mergeresultwindow.cpp:970 mergeresultwindow.cpp:974 +#: mergeresultwindow.cpp:978 pdiff.cpp:823 pdiff.cpp:827 pdiff.cpp:831 #, kde-format msgid "Files %1 and %2 are binary equal.\n" msgstr "" -#: mergeresultwindow.cpp:944 mergeresultwindow.cpp:948 -#: mergeresultwindow.cpp:952 +#: mergeresultwindow.cpp:972 mergeresultwindow.cpp:976 +#: mergeresultwindow.cpp:980 #, kde-format msgid "Files %1 and %2 have equal text.\n" msgstr "" -#: mergeresultwindow.cpp:958 +#: mergeresultwindow.cpp:986 #, kde-format msgid "" "Total number of conflicts: %1\n" @@ -1818,39 +1829,39 @@ "%4" msgstr "" -#: mergeresultwindow.cpp:964 +#: mergeresultwindow.cpp:992 #, kde-format msgid "Conflicts" msgstr "Coinbhleachtaí" -#: mergeresultwindow.cpp:1873 +#: mergeresultwindow.cpp:1901 #, kde-format msgid "" msgstr "" -#: mergeresultwindow.cpp:1881 +#: mergeresultwindow.cpp:1909 #, kde-format msgid "" msgstr "" -#: mergeresultwindow.cpp:1883 mergeresultwindow.cpp:2755 +#: mergeresultwindow.cpp:1911 mergeresultwindow.cpp:2783 #, kde-format msgid "" msgstr "" -#: mergeresultwindow.cpp:2967 +#: mergeresultwindow.cpp:2995 #, kde-format msgid "" "Not all conflicts are solved yet.\n" "File not saved." msgstr "" -#: mergeresultwindow.cpp:2969 mergeresultwindow.cpp:2978 +#: mergeresultwindow.cpp:2997 mergeresultwindow.cpp:3006 #, kde-format msgid "Conflicts Left" msgstr "" -#: mergeresultwindow.cpp:2976 +#: mergeresultwindow.cpp:3004 #, kde-format msgid "" "There is a line end style conflict. Please choose the line end style " @@ -1858,7 +1869,7 @@ "File not saved." msgstr "" -#: mergeresultwindow.cpp:2990 +#: mergeresultwindow.cpp:3018 #, kde-format msgid "" "\n" @@ -1866,59 +1877,59 @@ "Creating backup failed. File not saved." msgstr "" -#: mergeresultwindow.cpp:2990 mergeresultwindow.cpp:3038 +#: mergeresultwindow.cpp:3018 mergeresultwindow.cpp:3066 #, kde-format msgid "File Save Error" msgstr "" -#: mergeresultwindow.cpp:3038 +#: mergeresultwindow.cpp:3066 #, kde-format msgid "Error while writing." msgstr "" -#: mergeresultwindow.cpp:3110 +#: mergeresultwindow.cpp:3138 #, fuzzy, kde-format #| msgid "Output" msgid "Output:" msgstr "Aschur" -#: mergeresultwindow.cpp:3123 mergeresultwindow.cpp:3315 +#: mergeresultwindow.cpp:3151 mergeresultwindow.cpp:3343 #, kde-format msgid "[Modified]" msgstr "" -#: mergeresultwindow.cpp:3130 +#: mergeresultwindow.cpp:3158 #, fuzzy, kde-format #| msgid "Encoding:" msgid "Encoding for saving:" msgstr "Ionchódú:" -#: mergeresultwindow.cpp:3230 +#: mergeresultwindow.cpp:3258 #, kde-format msgid "Conflict" msgstr "Coinbhleacht" -#: mergeresultwindow.cpp:3262 +#: mergeresultwindow.cpp:3290 #, kde-format msgid "Codec from A: %1" msgstr "" -#: mergeresultwindow.cpp:3264 +#: mergeresultwindow.cpp:3292 #, kde-format msgid "Codec from B: %1" msgstr "" -#: mergeresultwindow.cpp:3266 +#: mergeresultwindow.cpp:3294 #, kde-format msgid "Codec from C: %1" msgstr "" -#: optiondialog.cpp:119 +#: optiondialog.cpp:121 #, kde-format msgid "Change Font" msgstr "" -#: optiondialog.cpp:135 optiondialog.cpp:145 +#: optiondialog.cpp:137 optiondialog.cpp:147 #, kde-format msgid "" "Font: %1, %2, %3\n" @@ -1926,207 +1937,207 @@ "Example:" msgstr "" -#: optiondialog.cpp:388 +#: optiondialog.cpp:390 #, kde-format msgid "Unicode" msgstr "Unicode" -#: optiondialog.cpp:389 +#: optiondialog.cpp:391 #, kde-format msgid "Latin1" msgstr "ISO 8859-1" -#: optiondialog.cpp:408 +#: optiondialog.cpp:410 #, kde-format msgid "Change this if non-ASCII characters are not displayed correctly." msgstr "" -#: optiondialog.cpp:491 +#: optiondialog.cpp:495 #, kde-format msgid "Configure" msgstr "Cumraigh" -#: optiondialog.cpp:568 +#: optiondialog.cpp:573 #, kde-format msgid "Font" msgstr "Cló" -#: optiondialog.cpp:570 +#: optiondialog.cpp:575 #, kde-format msgid "Editor & Diff Output Font" msgstr "" -#: optiondialog.cpp:589 +#: optiondialog.cpp:594 #, kde-format msgid "Application font" msgstr "" -#: optiondialog.cpp:594 +#: optiondialog.cpp:599 #, kde-format msgid "File view font" msgstr "" -#: optiondialog.cpp:613 +#: optiondialog.cpp:618 #, fuzzy, kde-format #| msgid "Color" msgctxt "Title for color settings page" msgid "Color" msgstr "Dath" -#: optiondialog.cpp:614 +#: optiondialog.cpp:619 #, kde-format msgid "Colors Settings" msgstr "" -#: optiondialog.cpp:631 +#: optiondialog.cpp:644 #, kde-format msgid "Editor and Diff Views:" msgstr "" -#: optiondialog.cpp:639 +#: optiondialog.cpp:652 #, kde-format msgid "Foreground color:" msgstr "Dath an tulra:" -#: optiondialog.cpp:647 +#: optiondialog.cpp:660 #, kde-format msgid "Background color:" msgstr "Dath an chúlra:" -#: optiondialog.cpp:657 +#: optiondialog.cpp:670 #, kde-format msgid "Diff background color:" msgstr "" -#: optiondialog.cpp:666 +#: optiondialog.cpp:679 #, kde-format msgid "Color A:" msgstr "" -#: optiondialog.cpp:675 +#: optiondialog.cpp:688 #, kde-format msgid "Color B:" msgstr "" -#: optiondialog.cpp:684 +#: optiondialog.cpp:697 #, kde-format msgid "Color C:" msgstr "" -#: optiondialog.cpp:692 +#: optiondialog.cpp:705 #, kde-format msgid "Conflict color:" msgstr "" -#: optiondialog.cpp:701 +#: optiondialog.cpp:714 #, kde-format msgid "Current range background color:" msgstr "" -#: optiondialog.cpp:710 +#: optiondialog.cpp:723 #, kde-format msgid "Current range diff background color:" msgstr "" -#: optiondialog.cpp:718 +#: optiondialog.cpp:731 #, kde-format msgid "Color for manually aligned difference ranges:" msgstr "" -#: optiondialog.cpp:725 +#: optiondialog.cpp:738 #, kde-format msgid "Directory Comparison View:" msgstr "" -#: optiondialog.cpp:731 +#: optiondialog.cpp:744 #, kde-format msgid "Newest file color:" msgstr "" -#: optiondialog.cpp:736 +#: optiondialog.cpp:749 #, kde-format msgid "" "Changing this color will only be effective when starting the next directory " "comparison." msgstr "" -#: optiondialog.cpp:741 +#: optiondialog.cpp:754 #, kde-format msgid "Oldest file color:" msgstr "" -#: optiondialog.cpp:750 +#: optiondialog.cpp:763 #, kde-format msgid "Middle age file color:" msgstr "" -#: optiondialog.cpp:759 +#: optiondialog.cpp:772 #, kde-format msgid "Color for missing files:" msgstr "" -#: optiondialog.cpp:773 +#: optiondialog.cpp:786 #, kde-format msgid "Editor" msgstr "Eagarthóir" -#: optiondialog.cpp:774 +#: optiondialog.cpp:787 #, kde-format msgid "Editor Behavior" msgstr "" -#: optiondialog.cpp:787 +#: optiondialog.cpp:809 #, kde-format msgid "Tab inserts spaces" msgstr "" -#: optiondialog.cpp:791 +#: optiondialog.cpp:813 #, kde-format msgid "" "On: Pressing tab generates the appropriate number of spaces.\n" "Off: A tab character will be inserted." msgstr "" -#: optiondialog.cpp:796 +#: optiondialog.cpp:818 #, kde-format msgid "Tab size:" msgstr "" -#: optiondialog.cpp:803 +#: optiondialog.cpp:825 #, kde-format msgid "Auto indentation" msgstr "" -#: optiondialog.cpp:807 +#: optiondialog.cpp:829 #, kde-format msgid "On: The indentation of the previous line is used for a new line.\n" msgstr "" -#: optiondialog.cpp:810 +#: optiondialog.cpp:832 #, kde-format msgid "Auto copy selection" msgstr "" -#: optiondialog.cpp:814 +#: optiondialog.cpp:836 #, kde-format msgid "" "On: Any selection is immediately written to the clipboard.\n" "Off: You must explicitly copy e.g. via Ctrl-C." msgstr "" -#: optiondialog.cpp:829 +#: optiondialog.cpp:851 #, kde-format msgid "" "Sets the line endings for when an edited file is saved.\n" "DOS/Windows: CR+LF; UNIX: LF; with CR=0D, LF=0A" msgstr "" -#: optiondialog.cpp:839 +#: optiondialog.cpp:861 #, kde-format msgid "Diff" msgstr "Diff" -#: optiondialog.cpp:840 +#: optiondialog.cpp:862 #, kde-format msgid "Diff Settings" msgstr "Socruithe Diff" @@ -2140,13 +2151,13 @@ #. ); #. ++line; #. -#: optiondialog.cpp:865 +#: optiondialog.cpp:896 #, fuzzy, kde-format #| msgid "Treat as white space." msgid "Ignore numbers (treat as white space)" msgstr "Déileálfar leis mar spás bán." -#: optiondialog.cpp:869 +#: optiondialog.cpp:900 #, kde-format msgid "" "Ignore number characters during line matching phase. (Similar to Ignore " @@ -2154,69 +2165,69 @@ "Might help to compare files with numeric data." msgstr "" -#: optiondialog.cpp:873 +#: optiondialog.cpp:904 #, fuzzy, kde-format #| msgid "Treat C/C++ comments like white space." msgid "Ignore C/C++ comments (treat as white space)" msgstr "Déileálfar le nótaí tráchta C/C++ mar spás bán." -#: optiondialog.cpp:876 +#: optiondialog.cpp:907 #, kde-format msgid "Treat C/C++ comments like white space." msgstr "Déileálfar le nótaí tráchta C/C++ mar spás bán." -#: optiondialog.cpp:879 +#: optiondialog.cpp:910 #, fuzzy, kde-format #| msgid "Treat as white space." msgid "Ignore case (treat as white space)" msgstr "Déileálfar leis mar spás bán." -#: optiondialog.cpp:883 +#: optiondialog.cpp:914 #, kde-format msgid "Treat case differences like white space changes. ('a'<=>'A')" msgstr "" "Déileálfar le difríochtaí i gcás mar athruithe sa spás bán. ('a'<=>'A')" -#: optiondialog.cpp:886 +#: optiondialog.cpp:917 #, kde-format msgid "Preprocessor command:" msgstr "" -#: optiondialog.cpp:891 +#: optiondialog.cpp:922 #, kde-format msgid "User defined pre-processing. (See the docs for details.)" msgstr "" -#: optiondialog.cpp:894 +#: optiondialog.cpp:925 #, kde-format msgid "Line-matching preprocessor command:" msgstr "" -#: optiondialog.cpp:899 +#: optiondialog.cpp:930 #, kde-format msgid "" "This pre-processor is only used during line matching.\n" "(See the docs for details.)" msgstr "" -#: optiondialog.cpp:902 +#: optiondialog.cpp:933 #, kde-format msgid "Try hard (slower)" msgstr "" -#: optiondialog.cpp:906 +#: optiondialog.cpp:937 #, kde-format msgid "" "Enables the --minimal option for the external diff.\n" "The analysis of big files will be much slower." msgstr "" -#: optiondialog.cpp:910 +#: optiondialog.cpp:941 #, kde-format msgid "Align B and C for 3 input files" msgstr "" -#: optiondialog.cpp:914 +#: optiondialog.cpp:945 #, kde-format msgid "" "Try to align B and C when comparing or merging three input files.\n" @@ -2224,66 +2235,73 @@ "(Default is off.)" msgstr "" -#: optiondialog.cpp:926 +#: optiondialog.cpp:956 +#, fuzzy, kde-format +#| msgid "Merge" +msgctxt "Settings page" +msgid "Merge" +msgstr "Cumaisc" + +#: optiondialog.cpp:957 #, kde-format msgid "Merge Settings" msgstr "" -#: optiondialog.cpp:940 +#: optiondialog.cpp:980 #, kde-format msgid "Auto advance delay (ms):" msgstr "" -#: optiondialog.cpp:946 +#: optiondialog.cpp:986 #, kde-format 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 "" -#: optiondialog.cpp:950 +#: optiondialog.cpp:990 #, kde-format msgid "Show info dialogs" msgstr "" -#: optiondialog.cpp:953 +#: optiondialog.cpp:993 #, kde-format msgid "Show a dialog with information about the number of conflicts." msgstr "" -#: optiondialog.cpp:956 +#: optiondialog.cpp:996 #, kde-format msgid "White space 2-file merge default:" msgstr "" -#: optiondialog.cpp:961 optiondialog.cpp:974 +#: optiondialog.cpp:1001 optiondialog.cpp:1014 #, kde-format msgid "Manual Choice" msgstr "" -#: optiondialog.cpp:965 optiondialog.cpp:979 +#: optiondialog.cpp:1005 optiondialog.cpp:1019 #, kde-format msgid "" "Allow the merge algorithm to automatically select an input for white-space-" "only changes." msgstr "" -#: optiondialog.cpp:969 +#: optiondialog.cpp:1009 #, kde-format msgid "White space 3-file merge default:" msgstr "" -#: optiondialog.cpp:983 +#: optiondialog.cpp:1023 #, kde-format msgid "Automatic Merge Regular Expression" msgstr "" -#: optiondialog.cpp:991 smalldialogs.cpp:449 +#: optiondialog.cpp:1031 smalldialogs.cpp:459 #, kde-format msgid "Auto merge regular expression:" msgstr "" -#: optiondialog.cpp:996 +#: optiondialog.cpp:1036 #, kde-format msgid "" "Regular expression for lines where KDiff3 should automatically choose one " @@ -2292,29 +2310,29 @@ "- if available - C, otherwise B will be chosen." msgstr "" -#: optiondialog.cpp:1002 +#: optiondialog.cpp:1042 #, kde-format msgid "Run regular expression auto merge on merge start" msgstr "" -#: optiondialog.cpp:1005 +#: optiondialog.cpp:1045 #, kde-format msgid "" "Run the merge for auto merge regular expressions\n" "immediately when a merge starts.\n" msgstr "" -#: optiondialog.cpp:1010 +#: optiondialog.cpp:1050 #, kde-format msgid "Version Control History Merging" msgstr "" -#: optiondialog.cpp:1018 smalldialogs.cpp:476 +#: optiondialog.cpp:1058 smalldialogs.cpp:486 #, kde-format msgid "History start regular expression:" msgstr "" -#: optiondialog.cpp:1023 +#: optiondialog.cpp:1063 #, kde-format msgid "" "Regular expression for the start of the version control history entry.\n" @@ -2322,12 +2340,12 @@ "Default value: \".*\\$Log.*\\$.*\"" msgstr "" -#: optiondialog.cpp:1029 smalldialogs.cpp:504 +#: optiondialog.cpp:1069 smalldialogs.cpp:514 #, kde-format msgid "History entry start regular expression:" msgstr "" -#: optiondialog.cpp:1042 +#: optiondialog.cpp:1082 #, kde-format msgid "" "A version control history entry consists of several lines.\n" @@ -2339,22 +2357,22 @@ "See the documentation for details." msgstr "" -#: optiondialog.cpp:1050 +#: optiondialog.cpp:1090 #, kde-format msgid "History merge sorting" msgstr "" -#: optiondialog.cpp:1053 +#: optiondialog.cpp:1093 #, kde-format msgid "Sort version control history by a key." msgstr "" -#: optiondialog.cpp:1063 +#: optiondialog.cpp:1103 #, kde-format msgid "History entry start sort key order:" msgstr "" -#: optiondialog.cpp:1068 +#: optiondialog.cpp:1108 #, kde-format msgid "" "Each pair of parentheses used in the regular expression for the history " @@ -2366,37 +2384,37 @@ "See the documentation for details." msgstr "" -#: optiondialog.cpp:1079 +#: optiondialog.cpp:1119 #, kde-format msgid "Merge version control history on merge start" msgstr "" -#: optiondialog.cpp:1082 +#: optiondialog.cpp:1122 #, kde-format msgid "Run version control history automerge on merge start." msgstr "" -#: optiondialog.cpp:1086 +#: optiondialog.cpp:1126 #, kde-format msgid "Max number of history entries:" msgstr "" -#: optiondialog.cpp:1090 +#: optiondialog.cpp:1130 #, kde-format msgid "Cut off after specified number. Use -1 for infinite number of entries." msgstr "" -#: optiondialog.cpp:1094 +#: optiondialog.cpp:1134 #, kde-format msgid "Test your regular expressions" msgstr "" -#: optiondialog.cpp:1099 +#: optiondialog.cpp:1139 #, kde-format msgid "Irrelevant merge command:" msgstr "" -#: optiondialog.cpp:1104 +#: optiondialog.cpp:1144 #, kde-format msgid "" "If specified this script is run after automerge\n" @@ -2404,12 +2422,12 @@ "Called with the parameters: filename1 filename2 filename3" msgstr "" -#: optiondialog.cpp:1109 +#: optiondialog.cpp:1149 #, kde-format msgid "Auto save and quit on merge without conflicts" msgstr "" -#: optiondialog.cpp:1113 +#: optiondialog.cpp:1153 #, kde-format msgid "" "If KDiff3 was started for a file-merge from the command line and all\n" @@ -2418,27 +2436,27 @@ "(Similar to command line option \"--auto\".)" msgstr "" -#: optiondialog.cpp:1124 optiondialog.cpp:1125 +#: optiondialog.cpp:1164 optiondialog.cpp:1165 #, kde-format msgid "Directory" msgstr "Comhadlann" -#: optiondialog.cpp:1137 +#: optiondialog.cpp:1185 #, kde-format msgid "Recursive directories" msgstr "" -#: optiondialog.cpp:1140 +#: optiondialog.cpp:1188 #, kde-format msgid "Whether to analyze subdirectories or not." msgstr "" -#: optiondialog.cpp:1142 +#: optiondialog.cpp:1190 #, kde-format msgid "File pattern(s):" msgstr "" -#: optiondialog.cpp:1148 +#: optiondialog.cpp:1196 #, kde-format msgid "" "Pattern(s) of files to be analyzed. \n" @@ -2446,12 +2464,12 @@ "Several Patterns can be specified by using the separator: ';'" msgstr "" -#: optiondialog.cpp:1153 +#: optiondialog.cpp:1201 #, kde-format msgid "File-anti-pattern(s):" msgstr "" -#: optiondialog.cpp:1159 +#: optiondialog.cpp:1207 #, kde-format msgid "" "Pattern(s) of files to be excluded from analysis. \n" @@ -2459,12 +2477,12 @@ "Several Patterns can be specified by using the separator: ';'" msgstr "" -#: optiondialog.cpp:1164 +#: optiondialog.cpp:1212 #, kde-format msgid "Dir-anti-pattern(s):" msgstr "" -#: optiondialog.cpp:1170 +#: optiondialog.cpp:1218 #, kde-format msgid "" "Pattern(s) of directories to be excluded from analysis. \n" @@ -2472,58 +2490,58 @@ "Several Patterns can be specified by using the separator: ';'" msgstr "" -#: optiondialog.cpp:1175 +#: optiondialog.cpp:1223 #, kde-format msgid "Use .cvsignore" msgstr "" -#: optiondialog.cpp:1179 +#: optiondialog.cpp:1227 #, kde-format msgid "" "Extends the antipattern to anything that would be ignored by CVS.\n" "Via local \".cvsignore\" files this can be directory specific." msgstr "" -#: optiondialog.cpp:1183 +#: optiondialog.cpp:1231 #, kde-format msgid "Find hidden files and directories" msgstr "" -#: optiondialog.cpp:1186 +#: optiondialog.cpp:1234 #, kde-format msgid "Finds hidden files and directories." msgstr "" -#: optiondialog.cpp:1189 +#: optiondialog.cpp:1237 #, kde-format msgid "Follow file links" msgstr "" -#: optiondialog.cpp:1193 +#: optiondialog.cpp:1241 #, kde-format msgid "" "On: Compare the file the link points to.\n" "Off: Compare the links." msgstr "" -#: optiondialog.cpp:1197 +#: optiondialog.cpp:1245 #, kde-format msgid "Follow directory links" msgstr "" -#: optiondialog.cpp:1201 +#: optiondialog.cpp:1249 #, kde-format msgid "" "On: Compare the directory the link points to.\n" "Off: Compare the links." msgstr "" -#: optiondialog.cpp:1210 +#: optiondialog.cpp:1258 #, kde-format msgid "Case sensitive filename comparison" msgstr "" -#: optiondialog.cpp:1214 +#: optiondialog.cpp:1262 #, kde-format msgid "" "The directory comparison will compare files or directories when their names " @@ -2532,63 +2550,63 @@ "off, otherwise on.)" msgstr "" -#: optiondialog.cpp:1218 +#: optiondialog.cpp:1266 #, kde-format msgid "Unfold all subdirectories on load" msgstr "" -#: optiondialog.cpp:1222 +#: optiondialog.cpp:1270 #, kde-format msgid "" "On: Unfold all subdirectories when starting a directory diff.\n" "Off: Leave subdirectories folded." msgstr "" -#: optiondialog.cpp:1226 +#: optiondialog.cpp:1274 #, kde-format msgid "Skip directory status report" msgstr "" -#: optiondialog.cpp:1230 +#: optiondialog.cpp:1278 #, kde-format msgid "" "On: Do not show the Directory Comparison Status.\n" "Off: Show the status dialog on start." msgstr "" -#: optiondialog.cpp:1234 +#: optiondialog.cpp:1282 #, kde-format msgid "File Comparison Mode" msgstr "" -#: optiondialog.cpp:1239 +#: optiondialog.cpp:1287 #, kde-format msgid "Binary comparison" msgstr "" -#: optiondialog.cpp:1241 +#: optiondialog.cpp:1289 #, kde-format msgid "Binary comparison of each file. (Default)" msgstr "" -#: optiondialog.cpp:1244 +#: optiondialog.cpp:1292 #, kde-format msgid "Full analysis" msgstr "" -#: optiondialog.cpp:1246 +#: optiondialog.cpp:1294 #, kde-format msgid "" "Do a full analysis and show statistics information in extra columns.\n" "(Slower than a binary comparison, much slower for binary files.)" msgstr "" -#: optiondialog.cpp:1250 +#: optiondialog.cpp:1298 #, kde-format msgid "Trust the size and modification date (unsafe)" msgstr "" -#: optiondialog.cpp:1252 +#: optiondialog.cpp:1300 #, kde-format msgid "" "Assume that files are equal if the modification date and file length are " @@ -2598,14 +2616,14 @@ "Useful for big directories or slow networks." msgstr "" -#: optiondialog.cpp:1257 +#: optiondialog.cpp:1305 #, kde-format msgid "" "Trust the size and date, but use binary comparison if date does not match " "(unsafe)" msgstr "" -#: optiondialog.cpp:1259 +#: optiondialog.cpp:1307 #, kde-format msgid "" "Assume that files are equal if the modification date and file length are " @@ -2614,12 +2632,12 @@ "Useful for big directories or slow networks." msgstr "" -#: optiondialog.cpp:1264 +#: optiondialog.cpp:1312 #, kde-format msgid "Trust the size (unsafe)" msgstr "" -#: optiondialog.cpp:1266 +#: optiondialog.cpp:1314 #, kde-format msgid "" "Assume that files are equal if their file lengths are equal.\n" @@ -2627,12 +2645,12 @@ "download." msgstr "" -#: optiondialog.cpp:1273 +#: optiondialog.cpp:1321 #, kde-format msgid "Synchronize directories" msgstr "" -#: optiondialog.cpp:1277 +#: optiondialog.cpp:1325 #, kde-format msgid "" "Offers to store files in both directories so that\n" @@ -2640,24 +2658,24 @@ "Works only when comparing two directories without specifying a destination." msgstr "" -#: optiondialog.cpp:1283 +#: optiondialog.cpp:1331 #, kde-format msgid "White space differences considered equal" msgstr "" -#: optiondialog.cpp:1287 +#: optiondialog.cpp:1335 #, kde-format msgid "" "If files differ only by white space consider them equal.\n" "This is only active when full analysis is chosen." msgstr "" -#: optiondialog.cpp:1293 +#: optiondialog.cpp:1341 #, kde-format msgid "Copy newer instead of merging (unsafe)" msgstr "" -#: optiondialog.cpp:1297 +#: optiondialog.cpp:1345 #, kde-format msgid "" "Do not look inside, just take the newer file.\n" @@ -2665,46 +2683,46 @@ "Only effective when comparing two directories." msgstr "" -#: optiondialog.cpp:1302 +#: optiondialog.cpp:1350 #, kde-format msgid "Backup files (.orig)" msgstr "" -#: optiondialog.cpp:1306 +#: optiondialog.cpp:1354 #, kde-format msgid "" "If 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 "" -#: optiondialog.cpp:1382 optiondialog.cpp:1383 +#: optiondialog.cpp:1430 optiondialog.cpp:1431 #, kde-format msgid "Regional Settings" msgstr "" -#: optiondialog.cpp:1397 +#: optiondialog.cpp:1454 #, kde-format msgid "Use the same encoding for everything:" msgstr "" -#: optiondialog.cpp:1401 +#: optiondialog.cpp:1458 #, kde-format msgid "" "Enable this allows to change all encodings by changing the first only.\n" "Disable this if different individual settings are needed." msgstr "" -#: optiondialog.cpp:1405 +#: optiondialog.cpp:1462 #, kde-format msgid "Note: Local Encoding is \"%1\"" msgstr "" -#: optiondialog.cpp:1409 +#: optiondialog.cpp:1466 #, kde-format msgid "File Encoding for A:" msgstr "" -#: optiondialog.cpp:1416 +#: optiondialog.cpp:1473 #, kde-format msgid "" "If enabled then Unicode (UTF-16 or UTF-8) encoding will be detected.\n" @@ -2713,32 +2731,32 @@ "(Unicode detection depends on the first bytes of a file.)" msgstr "" -#: optiondialog.cpp:1419 optiondialog.cpp:1430 optiondialog.cpp:1441 +#: optiondialog.cpp:1476 optiondialog.cpp:1487 optiondialog.cpp:1498 #, kde-format msgid "Auto Detect Unicode" msgstr "" -#: optiondialog.cpp:1425 +#: optiondialog.cpp:1482 #, kde-format msgid "File Encoding for B:" msgstr "" -#: optiondialog.cpp:1436 +#: optiondialog.cpp:1493 #, kde-format msgid "File Encoding for C:" msgstr "" -#: optiondialog.cpp:1447 +#: optiondialog.cpp:1504 #, kde-format msgid "File Encoding for Merge Output and Saving:" msgstr "" -#: optiondialog.cpp:1452 +#: optiondialog.cpp:1509 #, kde-format msgid "Auto Select" msgstr "Roghnaigh go hUathoibríoch" -#: optiondialog.cpp:1456 +#: optiondialog.cpp:1513 #, kde-format msgid "" "If enabled then the encoding from the input files is used.\n" @@ -2746,39 +2764,39 @@ "saving." msgstr "" -#: optiondialog.cpp:1459 +#: optiondialog.cpp:1516 #, kde-format msgid "File Encoding for Preprocessor Files:" msgstr "" -#: optiondialog.cpp:1471 +#: optiondialog.cpp:1528 #, kde-format msgid "Right To Left Language" msgstr "" -#: optiondialog.cpp:1475 +#: optiondialog.cpp:1532 #, kde-format msgid "" "Some languages are read from right to left.\n" "This setting will change the viewer and editor accordingly." msgstr "" -#: optiondialog.cpp:1485 +#: optiondialog.cpp:1542 #, kde-format msgid "Integration" msgstr "Comhtháthú" -#: optiondialog.cpp:1486 +#: optiondialog.cpp:1543 #, kde-format msgid "Integration Settings" msgstr "" -#: optiondialog.cpp:1499 +#: optiondialog.cpp:1564 #, kde-format msgid "Command line options to ignore:" msgstr "" -#: optiondialog.cpp:1505 +#: optiondialog.cpp:1570 #, kde-format msgid "" "List of command line options that should be ignored when KDiff3 is used by " @@ -2787,19 +2805,19 @@ "This will suppress the \"Unknown option\" error." msgstr "" -#: optiondialog.cpp:1510 +#: optiondialog.cpp:1575 #, kde-format msgid "Quit also via Escape key" msgstr "" -#: optiondialog.cpp:1514 +#: optiondialog.cpp:1579 #, kde-format msgid "" "Fast method to exit.\n" "For those who are used to using the Escape key." msgstr "" -#: optiondialog.cpp:1598 +#: optiondialog.cpp:1653 #, kde-format msgid "This resets all options. Not only those of the current topic." msgstr "" @@ -2849,77 +2867,68 @@ msgid "Disable Unsafe Options" msgstr "" -#: pdiff.cpp:158 +#: pdiff.cpp:160 #, kde-format msgid "Loading A" msgstr "" -#: pdiff.cpp:167 -#, kde-format -msgid "Errors occurred during pre-processing of file A." -msgstr "" +#: pdiff.cpp:162 +#, fuzzy, kde-format +#| msgid "Encoding:" +msgid "Loading A: %1" +msgstr "Ionchódú:" -#: pdiff.cpp:172 +#: pdiff.cpp:170 #, kde-format msgid "Loading B" msgstr "" -#: pdiff.cpp:179 -#, kde-format -msgid "Errors occurred during pre-processing of file B." -msgstr "" - -#: pdiff.cpp:202 pdiff.cpp:241 +#: pdiff.cpp:201 pdiff.cpp:237 #, kde-format msgid "Diff: A <-> B" msgstr "" -#: pdiff.cpp:208 pdiff.cpp:279 pdiff.cpp:293 +#: pdiff.cpp:207 pdiff.cpp:275 pdiff.cpp:289 #, kde-format msgid "Linediff: A <-> B" msgstr "" -#: pdiff.cpp:225 +#: pdiff.cpp:224 #, kde-format msgid "Loading C" msgstr "" -#: pdiff.cpp:232 -#, kde-format -msgid "Errors occurred during pre-processing of file C." -msgstr "" - -#: pdiff.cpp:250 +#: pdiff.cpp:246 #, kde-format msgid "Diff: A <-> C" msgstr "" -#: pdiff.cpp:261 +#: pdiff.cpp:257 #, kde-format msgid "Diff: B <-> C" msgstr "" -#: pdiff.cpp:283 pdiff.cpp:297 +#: pdiff.cpp:279 pdiff.cpp:293 #, kde-format msgid "Linediff: B <-> C" msgstr "" -#: pdiff.cpp:287 pdiff.cpp:301 +#: pdiff.cpp:283 pdiff.cpp:297 #, kde-format msgid "Linediff: A <-> C" msgstr "" -#: pdiff.cpp:829 +#: pdiff.cpp:819 #, kde-format msgid "All input files contain the same text, but are not binary equal." msgstr "" -#: pdiff.cpp:835 pdiff.cpp:839 pdiff.cpp:843 +#: pdiff.cpp:825 pdiff.cpp:829 pdiff.cpp:833 #, kde-format msgid "Files %1 and %2 have equal text, but are not binary equal. \n" msgstr "" -#: pdiff.cpp:853 +#: pdiff.cpp:843 #, kde-format msgid "" "Some input files do not seem to be pure text files.\n" @@ -2927,17 +2936,17 @@ "Continue at your own risk." msgstr "" -#: pdiff.cpp:863 +#: pdiff.cpp:853 #, kde-format msgid ", B" msgstr "" -#: pdiff.cpp:865 +#: pdiff.cpp:855 #, kde-format msgid ", C" msgstr "" -#: pdiff.cpp:867 +#: pdiff.cpp:857 #, kde-format msgid "" "Some input characters could not be converted to valid unicode.\n" @@ -2946,77 +2955,72 @@ "Affected input files are in %1." msgstr "" -#: pdiff.cpp:1034 +#: pdiff.cpp:1032 #, kde-format msgid "Abort" msgstr "Tobscoir" -#: pdiff.cpp:1040 pdiff.cpp:1130 +#: pdiff.cpp:1038 pdiff.cpp:1129 #, kde-format msgid "Opening files..." msgstr "" -#: pdiff.cpp:1107 -#, kde-format -msgid "File open error" -msgstr "" - -#: pdiff.cpp:1202 +#: pdiff.cpp:1212 #, kde-format msgid "Cutting selection..." msgstr "Roghnúchán á ghearradh..." -#: pdiff.cpp:1223 +#: pdiff.cpp:1233 #, kde-format msgid "Copying selection to clipboard..." msgstr "Roghnúchán á chóipeáil go dtí an ghearrthaisce..." -#: pdiff.cpp:1239 +#: pdiff.cpp:1249 #, kde-format msgid "Inserting clipboard contents..." msgstr "Inneachar na gearrthaisce á ionsá..." -#: pdiff.cpp:1695 +#: pdiff.cpp:1705 #, kde-format msgid "Word wrap (Cancel disables word wrap)" msgstr "" -#: pdiff.cpp:1696 +#: pdiff.cpp:1706 #, kde-format msgid "Calculating max width for horizontal scrollbar" msgstr "" -#: pdiff.cpp:1911 +#: pdiff.cpp:1921 #, kde-format msgid "Save && Continue" msgstr "" -#: pdiff.cpp:1912 +#: pdiff.cpp:1922 #, kde-format msgid "Continue Without Saving" msgstr "" -#: pdiff.cpp:2124 +#: pdiff.cpp:2134 #, kde-format msgid "Search complete." msgstr "" -#: pdiff.cpp:2124 +#: pdiff.cpp:2134 #, kde-format msgid "Search Complete" msgstr "" -#: pdiff.cpp:2375 +#: pdiff.cpp:2385 #, kde-format msgid "Nothing is selected in either diff input window." msgstr "" -#: pdiff.cpp:2375 +#: pdiff.cpp:2385 #, kde-format msgid "Error while adding manual diff range" msgstr "" -#: progress.cpp:59 progress.cpp:71 +#: progress.cpp:61 progress.cpp:73 #, kde-format msgid "&Cancel" msgstr "&Cealaigh" @@ -3026,189 +3030,189 @@ msgid "A (Base):" msgstr "" -#: smalldialogs.cpp:68 smalldialogs.cpp:85 smalldialogs.cpp:102 -#: smalldialogs.cpp:144 +#: smalldialogs.cpp:71 smalldialogs.cpp:90 smalldialogs.cpp:109 +#: smalldialogs.cpp:154 #, kde-format msgid "File..." msgstr "Comhad..." -#: smalldialogs.cpp:70 smalldialogs.cpp:87 smalldialogs.cpp:104 -#: smalldialogs.cpp:146 +#: smalldialogs.cpp:73 smalldialogs.cpp:92 smalldialogs.cpp:111 +#: smalldialogs.cpp:156 #, kde-format msgid "Dir..." msgstr "" -#: smalldialogs.cpp:96 +#: smalldialogs.cpp:103 #, kde-format msgid "C (Optional):" msgstr "" -#: smalldialogs.cpp:119 +#: smalldialogs.cpp:126 #, kde-format msgid "Swap/Copy Names..." msgstr "" -#: smalldialogs.cpp:124 smalldialogs.cpp:125 smalldialogs.cpp:126 +#: smalldialogs.cpp:131 smalldialogs.cpp:132 smalldialogs.cpp:133 #, kde-format msgid "Swap %1<->%2" msgstr "" -#: smalldialogs.cpp:127 smalldialogs.cpp:128 smalldialogs.cpp:129 +#: smalldialogs.cpp:134 smalldialogs.cpp:135 smalldialogs.cpp:136 #, kde-format msgid "Copy %1->Output" msgstr "" -#: smalldialogs.cpp:130 smalldialogs.cpp:131 smalldialogs.cpp:132 +#: smalldialogs.cpp:137 smalldialogs.cpp:138 smalldialogs.cpp:139 #, kde-format msgid "Swap %1<->Output" msgstr "" -#: smalldialogs.cpp:138 +#: smalldialogs.cpp:148 #, kde-format msgid "Output (optional):" msgstr "" -#: smalldialogs.cpp:168 +#: smalldialogs.cpp:178 #, kde-format msgid "Configure..." msgstr "Cumraigh..." -#: smalldialogs.cpp:233 +#: smalldialogs.cpp:243 #, fuzzy, kde-format #| msgid "Directory" msgid "Open Directory" msgstr "Comhadlann" -#: smalldialogs.cpp:234 +#: smalldialogs.cpp:244 #, kde-format msgid "Select Output File" msgstr "" -#: smalldialogs.cpp:393 +#: smalldialogs.cpp:403 #, kde-format msgid "Search text:" msgstr "" -#: smalldialogs.cpp:400 +#: smalldialogs.cpp:410 #, kde-format msgid "Case sensitive" msgstr "Cásíogair" -#: smalldialogs.cpp:403 +#: smalldialogs.cpp:413 #, kde-format msgid "Search A" msgstr "" -#: smalldialogs.cpp:408 +#: smalldialogs.cpp:418 #, kde-format msgid "Search B" msgstr "" -#: smalldialogs.cpp:413 +#: smalldialogs.cpp:423 #, kde-format msgid "Search C" msgstr "" -#: smalldialogs.cpp:418 +#: smalldialogs.cpp:428 #, kde-format msgid "Search output" msgstr "" -#: smalldialogs.cpp:425 +#: smalldialogs.cpp:435 #, kde-format msgid "&Search" msgstr "&Cuardach" -#: smalldialogs.cpp:444 +#: smalldialogs.cpp:454 #, kde-format msgid "Regular Expression Tester" msgstr "" -#: smalldialogs.cpp:457 +#: smalldialogs.cpp:467 #, kde-format msgid "Example auto merge line:" msgstr "" -#: smalldialogs.cpp:459 +#: smalldialogs.cpp:469 #, kde-format msgid "To test auto merge, copy a line as used in your files." msgstr "" -#: smalldialogs.cpp:465 smalldialogs.cpp:493 smalldialogs.cpp:529 +#: smalldialogs.cpp:475 smalldialogs.cpp:503 smalldialogs.cpp:539 #, kde-format msgid "Match result:" msgstr "" -#: smalldialogs.cpp:484 +#: smalldialogs.cpp:494 #, kde-format msgid "Example history start line (with leading comment):" msgstr "" -#: smalldialogs.cpp:486 +#: smalldialogs.cpp:496 #, kde-format msgid "" "Copy a history start line as used in your files,\n" "including the leading comment." msgstr "" -#: smalldialogs.cpp:512 +#: smalldialogs.cpp:522 #, kde-format msgid "History sort key order:" msgstr "" -#: smalldialogs.cpp:520 +#: smalldialogs.cpp:530 #, kde-format msgid "Example history entry start line (without leading comment):" msgstr "" -#: smalldialogs.cpp:522 +#: smalldialogs.cpp:532 #, kde-format msgid "" "Copy a history entry start line as used in your files,\n" "but omit the leading comment." msgstr "" -#: smalldialogs.cpp:536 +#: smalldialogs.cpp:546 #, kde-format msgid "Sort key result:" msgstr "" -#: smalldialogs.cpp:584 smalldialogs.cpp:594 smalldialogs.cpp:614 +#: smalldialogs.cpp:594 smalldialogs.cpp:604 smalldialogs.cpp:624 #, kde-format msgid "Match success." msgstr "" -#: smalldialogs.cpp:588 smalldialogs.cpp:598 smalldialogs.cpp:620 +#: smalldialogs.cpp:598 smalldialogs.cpp:608 smalldialogs.cpp:630 #, kde-format msgid "Match failed." msgstr "" -#: smalldialogs.cpp:605 +#: smalldialogs.cpp:615 #, kde-format msgid "Opening and closing parentheses do not match in regular expression." msgstr "" -#: SourceData.cpp:150 +#: SourceData.cpp:153 #, kde-format msgid "Writing clipboard data to temp file failed." msgstr "" -#: SourceData.cpp:154 +#: SourceData.cpp:157 #, kde-format msgid "From Clipboard" msgstr "" -#: SourceData.cpp:335 +#: SourceData.cpp:348 #, kde-format msgid "%1 is not a normal file." msgstr "" -#: SourceData.cpp:427 +#: SourceData.cpp:440 #, kde-format msgid " Temp file is: %1" msgstr "" -#: SourceData.cpp:432 +#: SourceData.cpp:445 #, kde-format msgid "" "Preprocessing possibly failed. Check this command:\n" @@ -3218,12 +3222,12 @@ "The preprocessing command will be disabled now." msgstr "" -#: SourceData.cpp:443 SourceData.cpp:512 +#: SourceData.cpp:456 SourceData.cpp:525 #, kde-format msgid "File %1 too large to process. Skipping." msgstr "" -#: SourceData.cpp:487 +#: SourceData.cpp:500 #, kde-format msgid "" "The line-matching-preprocessing possibly failed. Check this command:\n" diff -Nru kdiff3-1.8.01/po/gl/diff_ext.po kdiff3-1.8.3/po/gl/diff_ext.po --- kdiff3-1.8.01/po/gl/diff_ext.po 2019-05-18 01:02:00.000000000 +0000 +++ kdiff3-1.8.3/po/gl/diff_ext.po 2020-06-25 00:18:20.000000000 +0000 @@ -1,13 +1,13 @@ # Copyright (C) YEAR This file is copyright: # This file is distributed under the same license as the kdiff3 package. # -# Adrián Chaves (Gallaecio) , 2018. +# Adrián Chaves (Gallaecio) , 2018, 2019. msgid "" msgstr "" "Project-Id-Version: kdiff3\n" -"Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2019-03-22 03:09+0100\n" -"PO-Revision-Date: 2018-10-25 18:15+0100\n" +"Report-Msgid-Bugs-To: https://bugs.kde.org\n" +"POT-Creation-Date: 2019-11-04 07:54+0100\n" +"PO-Revision-Date: 2019-06-01 17:59+0200\n" "Last-Translator: Adrián Chaves (Gallaecio) \n" "Language-Team: Galician \n" "Language: gl\n" @@ -15,121 +15,115 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Generator: Lokalize 2.0\n" -#: diff_ext.cpp:391 +#: diff_ext.cpp:223 #, kde-format msgid "Compare with %1" msgstr "Comparar con %1" -#: diff_ext.cpp:392 +#: diff_ext.cpp:224 #, kde-format msgid "Merge with %1" msgstr "Fundir con %1" -#: diff_ext.cpp:408 +#: diff_ext.cpp:234 #, kde-format msgid "3-way merge with base" msgstr "Fusión de 3 ficheiros con base" -#: diff_ext.cpp:411 +#: diff_ext.cpp:237 #, kde-format msgid "Save '%1' for later" msgstr "Gardar «%1» para máis tarde" -#: diff_ext.cpp:426 +#: diff_ext.cpp:251 #, kde-format msgid "Compare with ..." msgstr "Comparar con…" -#: diff_ext.cpp:429 +#: diff_ext.cpp:254 #, kde-format msgid "Clear list" msgstr "Limpar a lista" -#: diff_ext.cpp:434 +#: diff_ext.cpp:259 #, kde-format msgid "Compare" msgstr "Comparar" -#: diff_ext.cpp:438 +#: diff_ext.cpp:263 #, kde-format msgid "3 way comparison" msgstr "Comparación de 3 ficheiros" -#: diff_ext.cpp:444 +#: diff_ext.cpp:269 #, kde-format msgid "About Diff-Ext ..." msgstr "Sobre Diff-Ext…" -#: diff_ext.cpp:515 +#: diff_ext.cpp:340 #, kde-format msgid "(32 Bit)" msgstr "(32 bits)" -#: diff_ext.cpp:517 -#, kde-format -msgid "(64 Bit)" -msgstr "(64 bits)" - -#: diff_ext.cpp:518 +#: diff_ext.cpp:342 #, kde-format msgid "Diff-Ext Copyright (c) 2003-2006, Sergey Zorin. All rights reserved.\n" msgstr "Diff-Ext © 2003-2006 Sergey Zorin. Todos os dereitos reservados.\n" -#: diff_ext.cpp:519 +#: diff_ext.cpp:343 #, kde-format msgid "This software is distributable under the BSD-2-Clause license.\n" msgstr "" "Este software pode distribuírse baixo os termos da licenza BSD de dúas " "cláusulas.\n" -#: diff_ext.cpp:520 +#: diff_ext.cpp:344 #, kde-format msgid "Some extensions for KDiff3 (c) 2006-2013 by Joachim Eibl.\n" -msgstr "Algunhas excepcións para KDiff3 © 2006-2013 Joachim Eibl.\n" +msgstr "Algúns complementos para KDiff3 © 2006-2013 Joachim Eibl.\n" -#: diff_ext.cpp:521 +#: diff_ext.cpp:345 #, kde-format msgid "Homepage for Diff-Ext: http://diff-ext.sourceforge.net\n" msgstr "Páxina web de Diff-Ext: http://diff-ext.sourceforge.net\n" -#: diff_ext.cpp:522 +#: diff_ext.cpp:346 #, kde-format msgid "About Diff-Ext for KDiff3 " msgstr "Sobre Diff-Ext para KDiff3 " -#: diff_ext.cpp:551 +#: diff_ext.cpp:375 #, kde-format msgid "Compare selected files" msgstr "Comparar os ficheiros seleccionados" -#: diff_ext.cpp:557 diff_ext.cpp:577 +#: diff_ext.cpp:381 diff_ext.cpp:399 #, kde-format msgid "Compare '%1' with '%2'" msgstr "Comparar «%1» con «%2»" -#: diff_ext.cpp:563 +#: diff_ext.cpp:386 #, kde-format msgid "Save '%1' for later operation" msgstr "Gardar «%1» para unha operación futura" -#: diff_ext.cpp:619 +#: diff_ext.cpp:440 #, kde-format msgid "Could not start KDiff3. Please rerun KDiff3 installation." msgstr "Non se puido iniciar KDiff3. Instale KDiff3 de novo." -#: diff_ext.cpp:620 +#: diff_ext.cpp:441 #, kde-format msgid "Command" msgstr "Orde" -#: diff_ext.cpp:621 +#: diff_ext.cpp:442 #, kde-format msgid "CommandLine" msgstr "Liña de ordes" -#: diff_ext.cpp:622 +#: diff_ext.cpp:443 #, kde-format msgid "Diff-Ext For KDiff3" msgstr "Diff-Ext para KDiff3" \ No newline at end of file diff -Nru kdiff3-1.8.01/po/gl/kdiff3fileitemactionplugin.po kdiff3-1.8.3/po/gl/kdiff3fileitemactionplugin.po --- kdiff3-1.8.01/po/gl/kdiff3fileitemactionplugin.po 2019-05-18 01:02:00.000000000 +0000 +++ kdiff3-1.8.3/po/gl/kdiff3fileitemactionplugin.po 2020-06-25 00:18:20.000000000 +0000 @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: \n" -"Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2019-03-22 03:09+0100\n" +"Report-Msgid-Bugs-To: https://bugs.kde.org\n" +"POT-Creation-Date: 2019-08-30 07:40+0200\n" "PO-Revision-Date: 2019-03-22 20:25+0100\n" "Last-Translator: Adrián Chaves (Gallaecio) \n" "Language-Team: Galician \n" @@ -15,11 +15,7 @@ "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: Lokalize 18.12.2\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Environment: kde\n" -"X-Accelerator-Marker: &\n" -"X-Text-Markup: kde4\n" #: kdiff3fileitemaction.cpp:92 #, kde-format diff -Nru kdiff3-1.8.01/po/gl/kdiff3.po kdiff3-1.8.3/po/gl/kdiff3.po --- kdiff3-1.8.01/po/gl/kdiff3.po 2019-05-18 01:02:00.000000000 +0000 +++ kdiff3-1.8.3/po/gl/kdiff3.po 2020-06-25 00:18:20.000000000 +0000 @@ -9,20 +9,17 @@ msgid "" msgstr "" "Project-Id-Version: kdiff3\n" -"Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2019-04-18 08:02+0200\n" -"PO-Revision-Date: 2019-03-16 18:20+0100\n" +"Report-Msgid-Bugs-To: https://bugs.kde.org\n" +"POT-Creation-Date: 2020-06-22 07:48+0200\n" +"PO-Revision-Date: 2019-10-19 22:33+0200\n" "Last-Translator: Adrián Chaves (Gallaecio) \n" -"Language-Team: Galician \n" +"Language-Team: Galician \n" "Language: gl\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: Lokalize 18.12.2\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Environment: kde\n" -"X-Accelerator-Marker: &\n" -"X-Text-Markup: kde4\n" +"X-Generator: Lokalize 19.11.70\n" #, kde-format msgctxt "NAME OF TRANSLATORS" @@ -34,285 +31,285 @@ msgid "Your emails" msgstr "xabier.villar@gmail.com" -#: difftextwindow.cpp:412 +#: difftextwindow.cpp:414 #, kde-format msgid "File %1: Line %2" msgstr "Ficheiro %1: liña %2" -#: difftextwindow.cpp:414 +#: difftextwindow.cpp:416 #, kde-format msgid "File %1: Line not available" msgstr "Ficheiro %1: a liña non está dispoñíbel" -#: difftextwindow.cpp:1780 +#: difftextwindow.cpp:1778 #, kde-format msgid "Encoding:" msgstr "Codificación:" -#: difftextwindow.cpp:1782 mergeresultwindow.cpp:3138 optiondialog.cpp:818 +#: difftextwindow.cpp:1781 mergeresultwindow.cpp:3166 optiondialog.cpp:840 #, kde-format msgid "Line end style:" msgstr "Estilo do fin de liña:" -#: difftextwindow.cpp:1810 directorymergewindow.cpp:382 -#: directorymergewindow.cpp:433 directorymergewindow.cpp:524 -#: directorymergewindow.cpp:3058 directorymergewindow.cpp:3189 -#: directorymergewindow.cpp:3417 mergeresultwindow.cpp:942 -#: mergeresultwindow.cpp:944 mergeresultwindow.cpp:946 -#: mergeresultwindow.cpp:948 mergeresultwindow.cpp:1814 -#: mergeresultwindow.cpp:3170 mergeresultwindow.cpp:3177 optiondialog.cpp:962 -#: optiondialog.cpp:975 pdiff.cpp:833 pdiff.cpp:835 pdiff.cpp:837 pdiff.cpp:839 -#: pdiff.cpp:861 smalldialogs.cpp:124 smalldialogs.cpp:126 smalldialogs.cpp:127 -#: smalldialogs.cpp:130 +#: difftextwindow.cpp:1809 directorymergewindow.cpp:383 +#: directorymergewindow.cpp:434 directorymergewindow.cpp:525 +#: directorymergewindow.cpp:3072 directorymergewindow.cpp:3203 +#: directorymergewindow.cpp:3431 mergeresultwindow.cpp:970 +#: mergeresultwindow.cpp:972 mergeresultwindow.cpp:974 +#: mergeresultwindow.cpp:976 mergeresultwindow.cpp:1842 +#: mergeresultwindow.cpp:3198 mergeresultwindow.cpp:3205 optiondialog.cpp:1002 +#: optiondialog.cpp:1015 pdiff.cpp:823 pdiff.cpp:825 pdiff.cpp:827 +#: pdiff.cpp:829 pdiff.cpp:851 smalldialogs.cpp:131 smalldialogs.cpp:133 +#: smalldialogs.cpp:134 smalldialogs.cpp:137 #, kde-format msgid "A" msgstr "A" -#: difftextwindow.cpp:1810 directorymergewindow.cpp:384 -#: directorymergewindow.cpp:436 directorymergewindow.cpp:526 -#: directorymergewindow.cpp:3064 directorymergewindow.cpp:3190 -#: directorymergewindow.cpp:3418 mergeresultwindow.cpp:942 -#: mergeresultwindow.cpp:944 mergeresultwindow.cpp:950 -#: mergeresultwindow.cpp:952 mergeresultwindow.cpp:1816 -#: mergeresultwindow.cpp:3172 mergeresultwindow.cpp:3179 optiondialog.cpp:963 -#: optiondialog.cpp:976 pdiff.cpp:833 pdiff.cpp:835 pdiff.cpp:841 pdiff.cpp:843 -#: pdiff.cpp:863 smalldialogs.cpp:124 smalldialogs.cpp:125 smalldialogs.cpp:128 -#: smalldialogs.cpp:131 +#: difftextwindow.cpp:1809 directorymergewindow.cpp:385 +#: directorymergewindow.cpp:437 directorymergewindow.cpp:527 +#: directorymergewindow.cpp:3078 directorymergewindow.cpp:3204 +#: directorymergewindow.cpp:3432 mergeresultwindow.cpp:970 +#: mergeresultwindow.cpp:972 mergeresultwindow.cpp:978 +#: mergeresultwindow.cpp:980 mergeresultwindow.cpp:1844 +#: mergeresultwindow.cpp:3200 mergeresultwindow.cpp:3207 optiondialog.cpp:1003 +#: optiondialog.cpp:1016 pdiff.cpp:823 pdiff.cpp:825 pdiff.cpp:831 +#: pdiff.cpp:833 pdiff.cpp:853 smalldialogs.cpp:131 smalldialogs.cpp:132 +#: smalldialogs.cpp:135 smalldialogs.cpp:138 #, kde-format msgid "B" msgstr "B" -#: difftextwindow.cpp:1810 directorymergewindow.cpp:386 -#: directorymergewindow.cpp:439 directorymergewindow.cpp:528 -#: directorymergewindow.cpp:3070 directorymergewindow.cpp:3191 -#: directorymergewindow.cpp:3419 mergeresultwindow.cpp:946 -#: mergeresultwindow.cpp:948 mergeresultwindow.cpp:950 -#: mergeresultwindow.cpp:952 mergeresultwindow.cpp:1818 -#: mergeresultwindow.cpp:3174 mergeresultwindow.cpp:3181 optiondialog.cpp:977 -#: pdiff.cpp:837 pdiff.cpp:839 pdiff.cpp:841 pdiff.cpp:843 pdiff.cpp:865 -#: smalldialogs.cpp:125 smalldialogs.cpp:126 smalldialogs.cpp:129 -#: smalldialogs.cpp:132 +#: difftextwindow.cpp:1809 directorymergewindow.cpp:387 +#: directorymergewindow.cpp:440 directorymergewindow.cpp:529 +#: directorymergewindow.cpp:3084 directorymergewindow.cpp:3205 +#: directorymergewindow.cpp:3433 mergeresultwindow.cpp:974 +#: mergeresultwindow.cpp:976 mergeresultwindow.cpp:978 +#: mergeresultwindow.cpp:980 mergeresultwindow.cpp:1846 +#: mergeresultwindow.cpp:3202 mergeresultwindow.cpp:3209 optiondialog.cpp:1017 +#: pdiff.cpp:827 pdiff.cpp:829 pdiff.cpp:831 pdiff.cpp:833 pdiff.cpp:855 +#: smalldialogs.cpp:132 smalldialogs.cpp:133 smalldialogs.cpp:136 +#: smalldialogs.cpp:139 #, kde-format msgid "C" msgstr "C" -#: difftextwindow.cpp:1810 +#: difftextwindow.cpp:1809 #, kde-format msgid "A (Base)" msgstr "A (base)" -#: difftextwindow.cpp:1812 +#: difftextwindow.cpp:1811 #, kde-format msgid "Encoding: %1" msgstr "Codificación: %1" -#: difftextwindow.cpp:1813 mergeresultwindow.cpp:3183 +#: difftextwindow.cpp:1812 mergeresultwindow.cpp:3211 #, kde-format msgid "Unix" msgstr "Unix" -#: difftextwindow.cpp:1813 mergeresultwindow.cpp:3184 +#: difftextwindow.cpp:1812 mergeresultwindow.cpp:3212 #, kde-format msgid "DOS" msgstr "DOS" -#: difftextwindow.cpp:1813 +#: difftextwindow.cpp:1812 #, kde-format msgid "Line end style: %1" msgstr "Estilo de fin de liña: %1" -#: difftextwindow.cpp:1835 kdiff3.cpp:873 +#: difftextwindow.cpp:1834 kdiff3.cpp:874 #, kde-format msgid "Top line" msgstr "Liña superior" -#: difftextwindow.cpp:1845 +#: difftextwindow.cpp:1843 #, kde-format msgid "End" msgstr "Fin" -#: difftextwindow.cpp:1903 smalldialogs.cpp:235 +#: difftextwindow.cpp:1901 smalldialogs.cpp:245 #, kde-format msgid "Open File" msgstr "Abrir un ficheiro" -#: difftextwindow.cpp:1951 optiondialog.cpp:387 +#: difftextwindow.cpp:1943 optiondialog.cpp:389 #, kde-format msgid "Unicode, 8 bit" msgstr "Unicode, 8 bit" -#: difftextwindow.cpp:1966 +#: difftextwindow.cpp:1958 #, kde-format msgid "Other" msgstr "Outro" -#: directorymergewindow.cpp:409 directorymergewindow.cpp:3424 +#: directorymergewindow.cpp:410 directorymergewindow.cpp:3438 #, kde-format msgid "Copy A to B" msgstr "Copiar A para B" -#: directorymergewindow.cpp:412 directorymergewindow.cpp:3425 +#: directorymergewindow.cpp:413 directorymergewindow.cpp:3439 #, kde-format msgid "Copy B to A" msgstr "Copiar B para A" -#: directorymergewindow.cpp:415 directorymergewindow.cpp:3426 +#: directorymergewindow.cpp:416 directorymergewindow.cpp:3440 #, kde-format msgid "Delete A" msgstr "Eliminar A" -#: directorymergewindow.cpp:418 directorymergewindow.cpp:3427 +#: directorymergewindow.cpp:419 directorymergewindow.cpp:3441 #, kde-format msgid "Delete B" msgstr "Eliminar B" -#: directorymergewindow.cpp:421 +#: directorymergewindow.cpp:422 #, kde-format msgid "Delete A & B" msgstr "Eliminar A e B" -#: directorymergewindow.cpp:424 directorymergewindow.cpp:3429 +#: directorymergewindow.cpp:425 directorymergewindow.cpp:3443 #, kde-format msgid "Merge to A" msgstr "Xuntar en A" -#: directorymergewindow.cpp:427 directorymergewindow.cpp:3430 +#: directorymergewindow.cpp:428 directorymergewindow.cpp:3444 #, kde-format msgid "Merge to B" msgstr "Xuntar en B" -#: directorymergewindow.cpp:430 +#: directorymergewindow.cpp:431 #, kde-format msgid "Merge to A & B" msgstr "Xuntar en A e B" -#: directorymergewindow.cpp:442 directorymergewindow.cpp:3421 +#: directorymergewindow.cpp:443 directorymergewindow.cpp:3435 #, kde-format msgid "Delete (if exists)" msgstr "Eliminar (se existe)" -#: directorymergewindow.cpp:445 directorymergewindow.cpp:448 -#: directorymergewindow.cpp:3420 optiondialog.cpp:925 smalldialogs.cpp:113 +#: directorymergewindow.cpp:446 directorymergewindow.cpp:449 +#: directorymergewindow.cpp:3434 smalldialogs.cpp:120 #, kde-format msgid "Merge" msgstr "Xuntar" -#: directorymergewindow.cpp:445 directorymergewindow.cpp:448 +#: directorymergewindow.cpp:446 directorymergewindow.cpp:449 #, kde-format msgid "Merge (manual)" msgstr "Xuntar (manual)" -#: directorymergewindow.cpp:451 +#: directorymergewindow.cpp:452 #, kde-format msgid "Error: Conflicting File Types" msgstr "Erro: Tipos de ficheiros en conflito" -#: directorymergewindow.cpp:454 +#: directorymergewindow.cpp:455 #, kde-format msgid "Error: Changed and Deleted" msgstr "Erro: Cambiado e eliminado" -#: directorymergewindow.cpp:457 +#: directorymergewindow.cpp:458 #, kde-format msgid "Error: Dates are equal but files are not." msgstr "Erro: As datas son iguais pero os ficheiros non." -#: directorymergewindow.cpp:471 +#: directorymergewindow.cpp:472 #, kde-format msgid "Done" msgstr "Feito" -#: directorymergewindow.cpp:473 +#: directorymergewindow.cpp:474 #, kde-format msgid "Error" msgstr "Erro" -#: directorymergewindow.cpp:475 +#: directorymergewindow.cpp:476 #, kde-format msgid "Skipped." msgstr "Ignorado." -#: directorymergewindow.cpp:477 +#: directorymergewindow.cpp:478 #, kde-format msgid "Not saved." msgstr "Non gardado." -#: directorymergewindow.cpp:479 +#: directorymergewindow.cpp:480 #, kde-format msgid "In progress..." msgstr "En progreso…" -#: directorymergewindow.cpp:481 +#: directorymergewindow.cpp:482 #, kde-format msgid "To do." msgstr "Por facer." -#: directorymergewindow.cpp:522 +#: directorymergewindow.cpp:523 #, kde-format msgid "Name" msgstr "Nome" -#: directorymergewindow.cpp:530 +#: directorymergewindow.cpp:531 #, kde-format msgid "Operation" msgstr "Operación" -#: directorymergewindow.cpp:532 +#: directorymergewindow.cpp:533 #, kde-format msgid "Status" msgstr "Estado" -#: directorymergewindow.cpp:534 +#: directorymergewindow.cpp:535 #, kde-format msgid "Unsolved" msgstr "Non resolvido" -#: directorymergewindow.cpp:536 +#: directorymergewindow.cpp:537 #, kde-format msgid "Solved" msgstr "Resolvido" -#: directorymergewindow.cpp:538 +#: directorymergewindow.cpp:539 #, kde-format msgid "Nonwhite" msgstr "Non baleiro" -#: directorymergewindow.cpp:540 +#: directorymergewindow.cpp:541 #, kde-format msgid "White" msgstr "Baleiro" -#: directorymergewindow.cpp:674 +#: directorymergewindow.cpp:676 #, kde-format msgid "Unable to compare non-normal file with normal file." msgstr "Non se pode comparar un ficheiro anormal cun ficheiro normal." -#: directorymergewindow.cpp:688 +#: directorymergewindow.cpp:690 #, kde-format msgid "Mix of links and normal files." msgstr "Mestura de ligazóns e ficheiros normais." -#: directorymergewindow.cpp:695 +#: directorymergewindow.cpp:697 #, kde-format msgid "Link: " msgstr "Ligazón: " -#: directorymergewindow.cpp:704 +#: directorymergewindow.cpp:706 #, kde-format msgid "Size. " msgstr "Tamaño. " -#: directorymergewindow.cpp:718 directorymergewindow.cpp:728 +#: directorymergewindow.cpp:720 directorymergewindow.cpp:730 #, kde-format msgid "Date & Size: " msgstr "Data e tamaño: " -#: directorymergewindow.cpp:748 +#: directorymergewindow.cpp:751 #, kde-format msgid "Comparing file..." msgstr "Estase a comparar o ficheiro…" -#: directorymergewindow.cpp:801 +#: directorymergewindow.cpp:813 #, kde-format msgid "" "You are currently doing a directory merge. Are you sure, you want to abort " @@ -321,48 +318,48 @@ "Está a facer unha fusión de directorios. Quere realmente interromper a " "fusión e analizar o directorio de novo?" -#: directorymergewindow.cpp:802 kdiff3.cpp:698 kdiff3.cpp:708 kdiff3.cpp:720 -#: mergeresultwindow.cpp:372 pdiff.cpp:1033 pdiff.cpp:1910 pdiff.cpp:1920 +#: directorymergewindow.cpp:814 kdiff3.cpp:697 kdiff3.cpp:707 kdiff3.cpp:719 +#: mergeresultwindow.cpp:400 pdiff.cpp:1031 pdiff.cpp:1920 pdiff.cpp:1930 #, kde-format msgid "Warning" msgstr "Aviso" -#: directorymergewindow.cpp:803 directorymergewindow.cpp:3393 +#: directorymergewindow.cpp:815 directorymergewindow.cpp:3407 #, kde-format msgid "Rescan" msgstr "Analizar de novo" -#: directorymergewindow.cpp:804 pdiff.cpp:1035 +#: directorymergewindow.cpp:816 pdiff.cpp:1033 #, kde-format msgid "Continue Merging" msgstr "Continuar coa fusión" -#: directorymergewindow.cpp:971 +#: directorymergewindow.cpp:984 #, kde-format msgid "Opening of directories failed:" msgstr "A apertura dos directorios fallou:" -#: directorymergewindow.cpp:975 +#: directorymergewindow.cpp:988 #, kde-format msgid "Dir A \"%1\" does not exist or is not a directory.\n" msgstr "O directorio A «%1» non existe ou non é un directorio.\n" -#: directorymergewindow.cpp:980 +#: directorymergewindow.cpp:993 #, kde-format msgid "Dir B \"%1\" does not exist or is not a directory.\n" msgstr "O directorio B «%1» non existe ou non é un directorio.\n" -#: directorymergewindow.cpp:985 +#: directorymergewindow.cpp:998 #, kde-format msgid "Dir C \"%1\" does not exist or is not a directory.\n" msgstr "O directorio C «%1» non existe ou non é un directorio.\n" -#: directorymergewindow.cpp:988 +#: directorymergewindow.cpp:1001 #, kde-format msgid "Directory Open Error" msgstr "Erro de acceso ao directorio" -#: directorymergewindow.cpp:996 +#: directorymergewindow.cpp:1009 #, kde-format msgid "" "The destination directory must not be the same as A or B when three " @@ -373,49 +370,49 @@ "fusionados tres directorios.\n" "Comprobe de novo antes de continuar." -#: directorymergewindow.cpp:998 +#: directorymergewindow.cpp:1011 #, kde-format msgid "Parameter Warning" msgstr "Aviso de parámetro" -#: directorymergewindow.cpp:1003 +#: directorymergewindow.cpp:1016 #, kde-format msgid "Scanning directories..." msgstr "Estase a analizar os directorios…" -#: directorymergewindow.cpp:1029 +#: directorymergewindow.cpp:1042 #, kde-format msgid "Reading Directory A" msgstr "Lendo o directorio A" -#: directorymergewindow.cpp:1038 +#: directorymergewindow.cpp:1051 #, kde-format msgid "Reading Directory B" msgstr "Lendo o directorio B" -#: directorymergewindow.cpp:1048 +#: directorymergewindow.cpp:1061 #, kde-format msgid "Reading Directory C" msgstr "Lendo o directorio C" -#: directorymergewindow.cpp:1064 +#: directorymergewindow.cpp:1077 #, kde-format msgid "Some subdirectories were not readable in" msgstr "Algúns dos subcartafoles non eran lexíbeis" -#: directorymergewindow.cpp:1069 +#: directorymergewindow.cpp:1082 #, kde-format msgid "Check the permissions of the subdirectories." msgstr "Comprobe os permisos dos subcartafoles." -#: directorymergewindow.cpp:1106 kdiff3.cpp:666 kdiff3.cpp:753 kdiff3.cpp:777 -#: kdiff3.cpp:1065 kdiff3.cpp:1086 pdiff.cpp:1116 pdiff.cpp:1170 pdiff.cpp:1218 -#: pdiff.cpp:1234 pdiff.cpp:1277 pdiff.cpp:1301 +#: directorymergewindow.cpp:1119 kdiff3.cpp:665 kdiff3.cpp:752 kdiff3.cpp:776 +#: kdiff3.cpp:1072 kdiff3.cpp:1093 pdiff.cpp:1115 pdiff.cpp:1178 pdiff.cpp:1228 +#: pdiff.cpp:1244 pdiff.cpp:1287 pdiff.cpp:1311 #, kde-format msgid "Ready." msgstr "Listo." -#: directorymergewindow.cpp:1121 +#: directorymergewindow.cpp:1134 #, kde-format msgid "" "Directory Comparison Status\n" @@ -430,22 +427,22 @@ "Número de ficheiros iguais: %2\n" "Número de ficheiros distintos: %3" -#: directorymergewindow.cpp:1128 +#: directorymergewindow.cpp:1141 #, kde-format msgid "Number of manual merges: %1" msgstr "Número de fusións manuais: %1" -#: directorymergewindow.cpp:1394 +#: directorymergewindow.cpp:1407 #, kde-format msgid "This affects all merge operations." msgstr "Isto afecta a todas as operacións de fusión." -#: directorymergewindow.cpp:1395 +#: directorymergewindow.cpp:1408 #, kde-format msgid "Changing All Merge Operations" msgstr "Estase a cambiar todas as operacións de fusión" -#: directorymergewindow.cpp:1695 +#: directorymergewindow.cpp:1708 #, kde-format msgid "" "Processing %1 / %2\n" @@ -454,44 +451,44 @@ "Procesando %1 / %2\n" "%3" -#: directorymergewindow.cpp:1738 directorymergewindow.cpp:1742 +#: directorymergewindow.cpp:1751 directorymergewindow.cpp:1755 #, kde-format msgid "Some files could not be processed." msgstr "Algúns ficheiros non puideron procesarse." -#: directorymergewindow.cpp:2222 directorymergewindow.cpp:2247 -#: directorymergewindow.cpp:2271 +#: directorymergewindow.cpp:2235 directorymergewindow.cpp:2260 +#: directorymergewindow.cpp:2285 #, kde-format msgid "This operation is currently not possible." msgstr "Esta operación non é posíbel de momento." -#: directorymergewindow.cpp:2222 directorymergewindow.cpp:2247 -#: directorymergewindow.cpp:2271 directorymergewindow.cpp:2552 +#: directorymergewindow.cpp:2235 directorymergewindow.cpp:2260 +#: directorymergewindow.cpp:2285 directorymergewindow.cpp:2565 #, kde-format msgid "Operation Not Possible" msgstr "Operación non posíbel" -#: directorymergewindow.cpp:2318 +#: directorymergewindow.cpp:2332 #, kde-format msgid "An error occurred while copying." msgstr "Produciuse un erro ao copiar." -#: directorymergewindow.cpp:2319 directorymergewindow.cpp:2759 +#: directorymergewindow.cpp:2333 directorymergewindow.cpp:2772 #, kde-format msgid "Merge Error" msgstr "Erro na fusión" -#: directorymergewindow.cpp:2396 +#: directorymergewindow.cpp:2410 #, kde-format msgid "Unknown merge operation. (This must never happen!)" msgstr "Operación de fusión descoñecida. (Isto non debera ocorrer nunca!)" -#: directorymergewindow.cpp:2441 +#: directorymergewindow.cpp:2455 #, kde-format msgid "Unknown merge operation." msgstr "Operación de fusión descoñecida." -#: directorymergewindow.cpp:2454 +#: directorymergewindow.cpp:2468 #, kde-format msgid "" "The merge is about to begin.\n" @@ -511,22 +508,22 @@ "Teña en conta que este programa aínda está en estado Beta e non hai ningunha " "GARANTÍA! Faga copias de seguranza dos seus datos vitais!" -#: directorymergewindow.cpp:2459 +#: directorymergewindow.cpp:2473 #, kde-format msgid "Starting Merge" msgstr "Estase a iniciar a fusión" -#: directorymergewindow.cpp:2460 +#: directorymergewindow.cpp:2474 #, kde-format msgid "Do It" msgstr "Facela" -#: directorymergewindow.cpp:2461 +#: directorymergewindow.cpp:2475 #, kde-format msgid "Simulate It" msgstr "Simulala" -#: directorymergewindow.cpp:2487 +#: directorymergewindow.cpp:2501 #, kde-format msgid "" "The highlighted item has a different type in the different directories. " @@ -534,7 +531,7 @@ msgstr "" "O elemento realzado ten un tipo distinto nos directorios. Escolla que facer." -#: directorymergewindow.cpp:2491 +#: directorymergewindow.cpp:2505 #, kde-format msgid "" "The modification dates of the file are equal but the files are not. Select " @@ -543,7 +540,7 @@ "As datas de modificación dos ficheiros son iguais pero estes non o son. " "Escolla que facer." -#: directorymergewindow.cpp:2495 +#: directorymergewindow.cpp:2509 #, kde-format msgid "" "The highlighted item was changed in one directory and deleted in the other. " @@ -552,7 +549,7 @@ "O elemento realzado cambiou nun directorio e eliminouse no outro. Escolla " "que facer." -#: directorymergewindow.cpp:2552 +#: directorymergewindow.cpp:2565 #, kde-format msgid "" "This operation is currently not possible because directory merge is " @@ -560,7 +557,7 @@ msgstr "" "Esta operación non é posíbel de momento porque se está a fundir o directorio." -#: directorymergewindow.cpp:2609 +#: directorymergewindow.cpp:2622 #, kde-format msgid "" "There was an error in the last step.\n" @@ -570,32 +567,32 @@ "Produciuse un erro no último paso.\n" "Quere continuar co elemento que causou o erro ou quere saltalo?" -#: directorymergewindow.cpp:2611 +#: directorymergewindow.cpp:2624 #, kde-format msgid "Continue merge after an error" msgstr "Continuar a fusión despois dun erro" -#: directorymergewindow.cpp:2612 +#: directorymergewindow.cpp:2625 #, kde-format msgid "Continue With Last Item" msgstr "Continuar co último elemento" -#: directorymergewindow.cpp:2613 +#: directorymergewindow.cpp:2626 #, kde-format msgid "Skip Item" msgstr "Saltar o elemento" -#: directorymergewindow.cpp:2709 +#: directorymergewindow.cpp:2722 #, kde-format msgid "Merge operation complete." msgstr "A operación de fusión concluíu." -#: directorymergewindow.cpp:2709 directorymergewindow.cpp:2712 +#: directorymergewindow.cpp:2722 directorymergewindow.cpp:2725 #, kde-format msgid "Merge Complete" msgstr "Fusión completada" -#: directorymergewindow.cpp:2722 +#: directorymergewindow.cpp:2735 #, kde-format msgid "" "Simulated merge complete: Check if you agree with the proposed operations." @@ -603,228 +600,228 @@ "A simulación da fusión concluíu: Comprobe se concorda coas operacións " "propostas." -#: directorymergewindow.cpp:2758 +#: directorymergewindow.cpp:2771 #, kde-format msgid "An error occurred. Press OK to see detailed information." msgstr "Ocorreu un erro. Prema Aceptar para ver información detallada." -#: directorymergewindow.cpp:2791 +#: directorymergewindow.cpp:2804 #, kde-format msgid "Error: While deleting %1: Creating backup failed." msgstr "Erro: Eliminando %1: A creación da copia de seguranza fallou." -#: directorymergewindow.cpp:2798 +#: directorymergewindow.cpp:2811 #, kde-format msgid "delete directory recursively( %1 )" msgstr "eliminar recursivamente os directorios (%1)" -#: directorymergewindow.cpp:2800 +#: directorymergewindow.cpp:2813 #, kde-format msgid "delete( %1 )" msgstr "eliminar (%1)" -#: directorymergewindow.cpp:2815 +#: directorymergewindow.cpp:2828 #, kde-format msgid "Error: delete dir operation failed while trying to read the directory." msgstr "" "Erro: a operaión de eliminación de directorio fallou ao intentar ler o " "directorio." -#: directorymergewindow.cpp:2834 +#: directorymergewindow.cpp:2847 #, kde-format msgid "Error: rmdir( %1 ) operation failed." msgstr "Erro: a operación rmdir (%1) fallou." -#: directorymergewindow.cpp:2844 +#: directorymergewindow.cpp:2857 #, kde-format msgid "Error: delete operation failed." msgstr "Erro: a operación de eliminación fallou." -#: directorymergewindow.cpp:2870 +#: directorymergewindow.cpp:2884 #, kde-format msgid "manual merge( %1, %2, %3 -> %4)" msgstr "unión manual(%1, %2, %3 -> %4)" -#: directorymergewindow.cpp:2873 +#: directorymergewindow.cpp:2887 #, kde-format msgid "" " Note: After a manual merge the user should continue by pressing F7." msgstr " Nota: Despois dunha unión manual debe continuar premendo F7." -#: directorymergewindow.cpp:2900 +#: directorymergewindow.cpp:2914 #, kde-format msgid "Error: copy( %1 -> %2 ) failed.Deleting existing destination failed." msgstr "Erro: copiar(%1 -> %2) fallou. Non se eliminou o destino existente." -#: directorymergewindow.cpp:2909 +#: directorymergewindow.cpp:2923 #, kde-format msgid "copyLink( %1 -> %2 )" msgstr "copyLink(%1 -> %2)" -#: directorymergewindow.cpp:2918 +#: directorymergewindow.cpp:2932 #, kde-format msgid "Error: copyLink failed: Remote links are not yet supported." msgstr "Erro: copyLink fallou: As ligazóns remotas aínda non se admiten." -#: directorymergewindow.cpp:2928 +#: directorymergewindow.cpp:2942 #, kde-format msgid "Error: copyLink failed." msgstr "Erro: copyLink fallou." -#: directorymergewindow.cpp:2953 +#: directorymergewindow.cpp:2967 #, kde-format msgid "copy( %1 -> %2 )" msgstr "copia(%1 -> %2)" -#: directorymergewindow.cpp:2979 +#: directorymergewindow.cpp:2993 #, kde-format msgid "Error during rename( %1 -> %2 ): Cannot delete existing destination." msgstr "" "Ocorreu un erro ao renomear (%1 → %2): Non se pode eliminar o destino " "existente." -#: directorymergewindow.cpp:2986 +#: directorymergewindow.cpp:3000 #, kde-format msgid "rename( %1 -> %2 )" msgstr "renomear (%1 → %2)" -#: directorymergewindow.cpp:2995 +#: directorymergewindow.cpp:3009 #, kde-format msgid "Error: Rename failed." msgstr "Erro: o renomeamento fallou." -#: directorymergewindow.cpp:3013 +#: directorymergewindow.cpp:3027 #, kde-format msgid "Error during makeDir of %1. Cannot delete existing file." msgstr "Erro durante makeDir de %1. Non se pode eliminar o ficheiro existente." -#: directorymergewindow.cpp:3030 +#: directorymergewindow.cpp:3044 #, kde-format msgid "makeDir( %1 )" msgstr "makeDir(%1)" -#: directorymergewindow.cpp:3040 +#: directorymergewindow.cpp:3054 #, kde-format msgid "Error while creating directory." msgstr "Ocorreu un erro ao crear o directorio." -#: directorymergewindow.cpp:3076 directorymergewindow.cpp:3195 +#: directorymergewindow.cpp:3090 directorymergewindow.cpp:3209 #, kde-format msgid "Dest" msgstr "Dest" -#: directorymergewindow.cpp:3084 directorymergewindow.cpp:3113 +#: directorymergewindow.cpp:3098 directorymergewindow.cpp:3127 #, kde-format msgid "Dir" msgstr "Dir" -#: directorymergewindow.cpp:3084 +#: directorymergewindow.cpp:3098 #, kde-format msgid "Type" msgstr "Tipo" -#: directorymergewindow.cpp:3084 +#: directorymergewindow.cpp:3098 #, kde-format msgid "Size" msgstr "Tamaño" -#: directorymergewindow.cpp:3085 +#: directorymergewindow.cpp:3099 #, kde-format msgid "Attr" msgstr "Atrib" -#: directorymergewindow.cpp:3085 +#: directorymergewindow.cpp:3099 #, kde-format msgid "Last Modification" msgstr "Última modificación" -#: directorymergewindow.cpp:3085 +#: directorymergewindow.cpp:3099 #, kde-format msgid "Link-Destination" msgstr "Destino da ligazón" -#: directorymergewindow.cpp:3113 +#: directorymergewindow.cpp:3127 #, kde-format msgid "File" msgstr "Ficheiro" -#: directorymergewindow.cpp:3113 +#: directorymergewindow.cpp:3127 #, kde-format msgid "-Link" msgstr "-Ligazón" -#: directorymergewindow.cpp:3119 +#: directorymergewindow.cpp:3133 #, kde-format msgid "not available" msgstr "non dispoñíbel" -#: directorymergewindow.cpp:3137 +#: directorymergewindow.cpp:3151 #, kde-format msgid "A (Dest): " msgstr "A (Dest): " -#: directorymergewindow.cpp:3141 +#: directorymergewindow.cpp:3155 #, kde-format msgid "A: " msgstr "A: " -#: directorymergewindow.cpp:3141 +#: directorymergewindow.cpp:3155 #, kde-format msgid "A (Base): " msgstr "A (Base): " -#: directorymergewindow.cpp:3147 +#: directorymergewindow.cpp:3161 #, kde-format msgid "B (Dest): " msgstr "B (Dest): " -#: directorymergewindow.cpp:3151 +#: directorymergewindow.cpp:3165 #, kde-format msgid "B: " msgstr "B: " -#: directorymergewindow.cpp:3156 +#: directorymergewindow.cpp:3170 #, kde-format msgid "C (Dest): " msgstr "C (Dest): " -#: directorymergewindow.cpp:3160 +#: directorymergewindow.cpp:3174 #, kde-format msgid "C: " msgstr "C: " -#: directorymergewindow.cpp:3163 +#: directorymergewindow.cpp:3177 #, kde-format msgid "Dest: " msgstr "Dest: " #. i18n("Saving Directory Merge State ...")); -#: directorymergewindow.cpp:3238 +#: directorymergewindow.cpp:3252 #, kde-format msgid "Save Directory Merge State As..." msgstr "Gardar o estado da fusión de directorios como…" -#: directorymergewindow.cpp:3387 +#: directorymergewindow.cpp:3401 #, kde-format msgid "Start/Continue Directory Merge" msgstr "Iniciar/Continuar a fusión do directorio" -#: directorymergewindow.cpp:3388 +#: directorymergewindow.cpp:3402 #, kde-format msgid "Run Operation for Current Item" msgstr "Executar a operación no elemento actual" -#: directorymergewindow.cpp:3389 +#: directorymergewindow.cpp:3403 #, kde-format msgid "Compare Selected File" msgstr "Comparar o ficheiro escollido" -#: directorymergewindow.cpp:3390 +#: directorymergewindow.cpp:3404 #, kde-format msgid "Merge Current File" msgstr "Fundir o ficheiro actual" -#: directorymergewindow.cpp:3390 +#: directorymergewindow.cpp:3404 #, kde-format msgid "" "Merge\n" @@ -833,51 +830,51 @@ "Xuntar\n" "o ficheiro" -#: directorymergewindow.cpp:3391 +#: directorymergewindow.cpp:3405 #, kde-format msgid "Fold All Subdirs" msgstr "Recoller todos os subcartafoles" -#: directorymergewindow.cpp:3392 +#: directorymergewindow.cpp:3406 #, kde-format msgid "Unfold All Subdirs" msgstr "Expandir todos os subcartafoles" #. i18n("Save Directory Merge State ..."), 0, this, &DirectoryMergeWindow::slotSaveMergeState, ac, "dir_save_merge_state"); #. i18n("Load Directory Merge State ..."), 0, this, &DirectoryMergeWindow::slotLoadMergeState, ac, "dir_load_merge_state"); -#: directorymergewindow.cpp:3396 +#: directorymergewindow.cpp:3410 #, kde-format msgid "Choose A for All Items" msgstr "Escoller todos os elementos de A" -#: directorymergewindow.cpp:3397 +#: directorymergewindow.cpp:3411 #, kde-format msgid "Choose B for All Items" msgstr "Escoller todos os elementos de B" -#: directorymergewindow.cpp:3398 +#: directorymergewindow.cpp:3412 #, kde-format msgid "Choose C for All Items" msgstr "Escoller todos os elementos de C" -#: directorymergewindow.cpp:3399 +#: directorymergewindow.cpp:3413 #, kde-format msgid "Auto-Choose Operation for All Items" msgstr "Escoller automaticamente a operación para todos os elementos" -#: directorymergewindow.cpp:3400 +#: directorymergewindow.cpp:3414 #, kde-format msgid "No Operation for All Items" msgstr "Ningunha operación para todos os elementos" #. i18n("Synchronize Directories"), 0, this, &DirectoryMergeWindow::slotSynchronizeDirectories, ac, "dir_synchronize_directories"); #. d->m_pDirChooseNewerFiles = GuiUtils::createAction< KToggleAction >(i18n("Copy Newer Files Instead of Merging"), 0, this, &DirectoryMergeWindow::slotChooseNewerFiles, ac, "dir_choose_newer_files"); -#: directorymergewindow.cpp:3405 +#: directorymergewindow.cpp:3419 #, kde-format msgid "Show Identical Files" msgstr "Mostrar os ficheiros idénticos" -#: directorymergewindow.cpp:3405 +#: directorymergewindow.cpp:3419 #, kde-format msgid "" "Identical\n" @@ -886,17 +883,17 @@ "Ficheiros\n" "idénticos" -#: directorymergewindow.cpp:3406 +#: directorymergewindow.cpp:3420 #, kde-format msgid "Show Different Files" msgstr "Mostrar os ficheiros distintos" -#: directorymergewindow.cpp:3407 +#: directorymergewindow.cpp:3421 #, kde-format msgid "Show Files only in A" msgstr "Mostrar os ficheiros só en A" -#: directorymergewindow.cpp:3407 +#: directorymergewindow.cpp:3421 #, kde-format msgid "" "Files\n" @@ -905,12 +902,12 @@ "Ficheiros\n" "só en A" -#: directorymergewindow.cpp:3408 +#: directorymergewindow.cpp:3422 #, kde-format msgid "Show Files only in B" msgstr "Mostrar os ficheiros só en B" -#: directorymergewindow.cpp:3408 +#: directorymergewindow.cpp:3422 #, kde-format msgid "" "Files\n" @@ -919,64 +916,69 @@ "Ficheiros\n" "só en B" -#: directorymergewindow.cpp:3409 +#: directorymergewindow.cpp:3423 #, kde-format msgid "Show Files only in C" msgstr "Mostrar os ficheiros só en C" -#: directorymergewindow.cpp:3409 +#: directorymergewindow.cpp:3423 #, kde-format msgid "" "Files\n" "only in C" msgstr "Ficheiros só en C" -#: directorymergewindow.cpp:3413 +#: directorymergewindow.cpp:3427 #, kde-format msgid "Compare Explicitly Selected Files" msgstr "Comparar os ficheiros escollidos explicitamente" -#: directorymergewindow.cpp:3414 +#: directorymergewindow.cpp:3428 #, kde-format msgid "Merge Explicitly Selected Files" msgstr "Fundir os ficheiros escollidos explicitamente" -#: directorymergewindow.cpp:3416 directorymergewindow.cpp:3423 +#: directorymergewindow.cpp:3430 directorymergewindow.cpp:3437 #, kde-format msgid "Do Nothing" msgstr "Non facer ren" -#: directorymergewindow.cpp:3428 +#: directorymergewindow.cpp:3442 #, kde-format msgid "Delete A && B" msgstr "Eliminar A e B" -#: directorymergewindow.cpp:3431 +#: directorymergewindow.cpp:3445 #, kde-format msgid "Merge to A && B" msgstr "Xuntar en A e B" -#: fileaccess.cpp:462 SourceData.cpp:493 +#: fileaccess.cpp:301 +#, kde-format +msgid "Unable to determine full url. No parent specified." +msgstr "Non se pode determinar o URL completo. Non se indicou ningún pai." + +#: fileaccess.cpp:482 SourceData.cpp:506 #, kde-format msgid "Failed to read file: %1" msgstr "Non se puido ler o ficheiro: %1." -#: fileaccess.cpp:587 +#: fileaccess.cpp:624 #, kde-format msgid "Creating temp copy of %1 failed." msgstr "Fallou a creación da copia temporal de %1." -#: fileaccess.cpp:595 fileaccess.cpp:600 +#: fileaccess.cpp:632 fileaccess.cpp:637 #, kde-format msgid "Opening %1 failed. %2" msgstr "Fallou a abertura de %1. %2" -#: fileaccess.cpp:619 fileaccess.cpp:627 +#: fileaccess.cpp:656 fileaccess.cpp:664 #, kde-format msgid "Error reading from %1. %2" msgstr "Ocorreu un erro ao ler de %1. %2" -#: fileaccess.cpp:751 +#: fileaccess.cpp:788 #, kde-format msgid "" "While trying to make a backup, deleting an older backup failed.\n" @@ -986,7 +988,7 @@ "unha copia de seguranza.\n" "Ficheiro: %1" -#: fileaccess.cpp:758 +#: fileaccess.cpp:795 #, kde-format msgid "" "While trying to make a backup, renaming failed.\n" @@ -995,179 +997,179 @@ "O cambio de nome fallou ao intentar facer unha copia de seguranza.\n" "Ficheiros: %1 → %2" -#: fileaccess.cpp:828 +#: fileaccess.cpp:865 #, kde-format msgid "Getting file status: %1" msgstr "Estase a obter o estado do ficheiro: %1" -#: fileaccess.cpp:869 +#: fileaccess.cpp:906 #, kde-format msgid "Reading file: %1" msgstr "Estase a ler o ficheiro: %1" -#: fileaccess.cpp:907 +#: fileaccess.cpp:944 #, kde-format msgid "Writing file: %1" msgstr "Estase a escribir o ficheiro: %1" -#: fileaccess.cpp:940 +#: fileaccess.cpp:977 #, kde-format msgid "Out of memory" msgstr "Esgotou a memoria" -#: fileaccess.cpp:976 +#: fileaccess.cpp:1013 #, kde-format msgid "Making directory: %1" msgstr "Estase a crear o directorio: %1" -#: fileaccess.cpp:997 +#: fileaccess.cpp:1034 #, kde-format msgid "Removing directory: %1" msgstr "Estase a retirar o directorio: %1" -#: fileaccess.cpp:1012 +#: fileaccess.cpp:1049 #, kde-format msgid "Removing file: %1" msgstr "Estase a retirar o ficheiro. %1" -#: fileaccess.cpp:1028 +#: fileaccess.cpp:1065 #, kde-format msgid "Creating symbolic link: %1 -> %2" msgstr "Estase a crear a ligazón simbólica: %1 -> %2" -#: fileaccess.cpp:1052 +#: fileaccess.cpp:1089 #, kde-format msgid "Renaming file: %1 -> %2" msgstr "Renomeando o ficheiro: %1 → %2" -#: fileaccess.cpp:1086 +#: fileaccess.cpp:1123 #, kde-format msgid "Copying file: %1 -> %2" msgstr "Estase a copiar o ficheiro: %1 -> %2" -#: fileaccess.cpp:1108 +#: fileaccess.cpp:1145 #, kde-format msgid "Reading directory: %1" msgstr "Lendo o directorio: %1" -#: fileaccess.cpp:1162 +#: fileaccess.cpp:1202 #, kde-format msgid "Listing directory: %1" msgstr "Estase a listar o directorio: %1" -#: kdiff3.cpp:181 +#: kdiff3.cpp:182 #, kde-format msgid "Current Configuration:" msgstr "Configuración actual:" -#: kdiff3.cpp:186 +#: kdiff3.cpp:187 #, kde-format msgid "Config Option Error:" msgstr "Erro da opción de configuración:" -#: kdiff3.cpp:240 +#: kdiff3.cpp:246 #, kde-format msgid "Option --auto used, but no output file specified." msgstr "" "Indicouse a opción --auto, pero non se especificou ningún ficheiro de saída." -#: kdiff3.cpp:416 +#: kdiff3.cpp:405 #, kde-format msgid "Option --auto ignored for directory comparison." msgstr "A opción --auto é ignorada para a comparación de directorios." -#: kdiff3.cpp:460 +#: kdiff3.cpp:449 #, kde-format msgid "Saving failed." msgstr "A garda fallou." -#: kdiff3.cpp:496 pdiff.cpp:1098 +#: kdiff3.cpp:494 pdiff.cpp:1096 #, kde-format msgid "Opening of these files failed:" msgstr "Fallou o acceso a estes ficheiros:" -#: kdiff3.cpp:505 +#: kdiff3.cpp:503 pdiff.cpp:1105 #, kde-format -msgid "File Open Error" -msgstr "Erro de acceso ao ficheiro" +msgid "File open error" +msgstr "Erro ao abrir o ficheiro" -#: kdiff3.cpp:533 +#: kdiff3.cpp:532 #, kde-format msgid "Opens documents for comparison..." msgstr "Abre os documentos para comparalos…" -#: kdiff3.cpp:535 +#: kdiff3.cpp:534 #, kde-format msgid "Reload" msgstr "Cargar de novo" -#: kdiff3.cpp:538 +#: kdiff3.cpp:537 #, kde-format 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:540 +#: kdiff3.cpp:539 #, kde-format msgid "Saves the current document as..." msgstr "Garda o documento actual como…" -#: kdiff3.cpp:543 +#: kdiff3.cpp:542 #, kde-format msgid "Print the differences" msgstr "Imprimir as diferenzas" -#: kdiff3.cpp:546 +#: kdiff3.cpp:545 #, kde-format msgid "Quits the application" -msgstr "Sae do aplicativo" +msgstr "Sae da aplicación" -#: kdiff3.cpp:549 +#: kdiff3.cpp:548 #, kde-format msgid "Cuts the selected section and puts it to the clipboard" msgstr "Corta a sección escollida e colócaa no portapapeis" -#: kdiff3.cpp:552 +#: kdiff3.cpp:551 #, kde-format msgid "Copies the selected section to the clipboard" msgstr "Copia a sección escollida no portapapeis" -#: kdiff3.cpp:554 +#: kdiff3.cpp:553 #, kde-format msgid "Pastes the clipboard contents to current position" msgstr "Pega o contido do portapapeis na posición actual" -#: kdiff3.cpp:557 +#: kdiff3.cpp:556 #, kde-format msgid "Select everything in current window" msgstr "Escolle todo na xanela actual" -#: kdiff3.cpp:560 +#: kdiff3.cpp:559 #, kde-format msgid "Search for a string" msgstr "Busca un texto" -#: kdiff3.cpp:562 +#: kdiff3.cpp:561 #, kde-format msgid "Search again for the string" msgstr "Busca de novo o texto" -#: kdiff3.cpp:567 +#: kdiff3.cpp:566 #, kde-format msgid "Enables/disables the statusbar" msgstr "Activa/desactiva a barra de estado" -#: kdiff3.cpp:571 +#: kdiff3.cpp:570 #, kde-format msgid "Configure KDiff3..." msgstr "Configurar KDiff3…" -#: kdiff3.cpp:590 +#: kdiff3.cpp:589 #, kde-format msgid "Go to Current Delta" msgstr "Ir ao delta actual" -#: kdiff3.cpp:590 +#: kdiff3.cpp:589 #, kde-format msgid "" "Current\n" @@ -1176,12 +1178,12 @@ "Delta\n" "actual" -#: kdiff3.cpp:592 +#: kdiff3.cpp:591 #, kde-format msgid "Go to First Delta" msgstr "Ir ao primeiro delta" -#: kdiff3.cpp:592 +#: kdiff3.cpp:591 #, kde-format msgid "" "First\n" @@ -1190,12 +1192,12 @@ "Primeiro\n" "delta" -#: kdiff3.cpp:594 +#: kdiff3.cpp:593 #, kde-format msgid "Go to Last Delta" msgstr "Ir ao último delta" -#: kdiff3.cpp:594 +#: kdiff3.cpp:593 #, kde-format msgid "" "Last\n" @@ -1204,14 +1206,14 @@ "Último\n" "delta" -#: kdiff3.cpp:596 +#: kdiff3.cpp:595 #, kde-format msgid "(Skips white space differences when \"Show White Space\" is disabled.)" msgstr "" "(Ignora as diferenzas de espazos se «Mostrar os espazos en branco» está " "desactivado.)" -#: kdiff3.cpp:597 +#: kdiff3.cpp:596 #, kde-format msgid "" "(Does not skip white space differences even when \"Show White Space\" is " @@ -1220,36 +1222,36 @@ "(Non ignora as diferenzas de espazos mesmo se «Mostrar os espazos en branco» " "está desactivado.)" -#: kdiff3.cpp:598 +#: kdiff3.cpp:597 #, kde-format msgid "Go to Previous Delta" msgstr "Ir ao delta anterior" -#: kdiff3.cpp:598 +#: kdiff3.cpp:597 #, kde-format msgid "" "Prev\n" "Delta" msgstr "Delta anterior" -#: kdiff3.cpp:600 +#: kdiff3.cpp:599 #, kde-format msgid "Go to Next Delta" msgstr "Ir ao seguinte delta" -#: kdiff3.cpp:600 +#: kdiff3.cpp:599 #, kde-format msgid "" "Next\n" "Delta" msgstr "Seguinte delta" -#: kdiff3.cpp:602 +#: kdiff3.cpp:601 #, kde-format msgid "Go to Previous Conflict" msgstr "Ir ao conflito anterior" -#: kdiff3.cpp:602 +#: kdiff3.cpp:601 #, kde-format msgid "" "Prev\n" @@ -1258,24 +1260,24 @@ "Conflito\n" "anterior" -#: kdiff3.cpp:604 +#: kdiff3.cpp:603 #, kde-format msgid "Go to Next Conflict" msgstr "Ir ao seguinte conflito" -#: kdiff3.cpp:604 +#: kdiff3.cpp:603 #, kde-format msgid "" "Next\n" "Conflict" msgstr "Seguinte conflito" -#: kdiff3.cpp:606 +#: kdiff3.cpp:605 #, kde-format msgid "Go to Previous Unsolved Conflict" msgstr "Ir ao anterior conflito por resolver" -#: kdiff3.cpp:606 +#: kdiff3.cpp:605 #, kde-format msgid "" "Prev\n" @@ -1284,12 +1286,12 @@ "Non resolvido\n" "anterior" -#: kdiff3.cpp:608 +#: kdiff3.cpp:607 #, kde-format msgid "Go to Next Unsolved Conflict" msgstr "Ir ao seguinte conflito por resolver" -#: kdiff3.cpp:608 +#: kdiff3.cpp:607 #, kde-format msgid "" "Next\n" @@ -1298,12 +1300,12 @@ "Seguinte\n" "non resolvido" -#: kdiff3.cpp:610 +#: kdiff3.cpp:609 #, kde-format msgid "Select Line(s) From A" msgstr "Escoller as liñas de A" -#: kdiff3.cpp:610 +#: kdiff3.cpp:609 #, kde-format msgid "" "Choose\n" @@ -1312,12 +1314,12 @@ "Escoller\n" "A" -#: kdiff3.cpp:611 +#: kdiff3.cpp:610 #, kde-format msgid "Select Line(s) From B" msgstr "Escoller as liñas de B" -#: kdiff3.cpp:611 +#: kdiff3.cpp:610 #, kde-format msgid "" "Choose\n" @@ -1326,12 +1328,12 @@ "Escoller\n" "B" -#: kdiff3.cpp:612 +#: kdiff3.cpp:611 #, kde-format msgid "Select Line(s) From C" msgstr "Escoller as liñas de C" -#: kdiff3.cpp:612 +#: kdiff3.cpp:611 #, kde-format msgid "" "Choose\n" @@ -1340,14 +1342,14 @@ "Escoller\n" "C" -#: kdiff3.cpp:613 +#: kdiff3.cpp:612 #, kde-format 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:613 +#: kdiff3.cpp:612 #, kde-format msgid "" "Auto\n" @@ -1356,12 +1358,12 @@ "Ir automaticamente\n" "ao seguinte" -#: kdiff3.cpp:615 +#: kdiff3.cpp:614 #, kde-format msgid "Show Space && Tabulator Characters" -msgstr "Mostrar os caracteres de espazo e tabulación" +msgstr "Mostrar os caracteres de espazos e tabuladores" -#: kdiff3.cpp:615 +#: kdiff3.cpp:614 #, kde-format msgid "" "White\n" @@ -1370,12 +1372,12 @@ "Caracteres\n" "en branco" -#: kdiff3.cpp:616 +#: kdiff3.cpp:615 #, kde-format msgid "Show White Space" msgstr "Mostrar os espazos en branco" -#: kdiff3.cpp:616 +#: kdiff3.cpp:615 #, kde-format msgid "" "White\n" @@ -1384,12 +1386,12 @@ "Deltas\n" "en branco" -#: kdiff3.cpp:618 +#: kdiff3.cpp:617 #, kde-format msgid "Show Line Numbers" msgstr "Mostrar os números de liña" -#: kdiff3.cpp:618 +#: kdiff3.cpp:617 #, kde-format msgid "" "Line\n" @@ -1398,193 +1400,193 @@ "Números\n" "de liña" -#: kdiff3.cpp:620 +#: kdiff3.cpp:619 #, kde-format msgid "Automatically Solve Simple Conflicts" msgstr "Resolver automaticamente os conflitos simples" -#: kdiff3.cpp:621 +#: kdiff3.cpp:620 #, kde-format msgid "Set Deltas to Conflicts" msgstr "Pasar os deltas para conflitos" -#: kdiff3.cpp:622 +#: kdiff3.cpp:621 #, kde-format msgid "Run Regular Expression Auto Merge" msgstr "Executar a fusión automática de expresións regulares" -#: kdiff3.cpp:623 +#: kdiff3.cpp:622 #, kde-format msgid "Automatically Solve History Conflicts" msgstr "Resolver automaticamente os conflitos do historial" -#: kdiff3.cpp:624 +#: kdiff3.cpp:623 #, kde-format msgid "Split Diff At Selection" msgstr "Dividir a diferenza na selección" -#: kdiff3.cpp:625 +#: kdiff3.cpp:624 #, kde-format msgid "Join Selected Diffs" msgstr "Xuntar as diferenzas escollidas" -#: kdiff3.cpp:627 +#: kdiff3.cpp:626 #, kde-format msgid "Show Window A" msgstr "Mostrar a xanela A" -#: kdiff3.cpp:628 +#: kdiff3.cpp:627 #, kde-format msgid "Show Window B" msgstr "Mostrar a xanela B" -#: kdiff3.cpp:629 +#: kdiff3.cpp:628 #, kde-format msgid "Show Window C" msgstr "Mostrar a xanela C" -#: kdiff3.cpp:631 +#: kdiff3.cpp:630 #, kde-format msgid "Normal Overview" msgstr "Resumo normal" -#: kdiff3.cpp:632 +#: kdiff3.cpp:631 #, kde-format msgid "A vs. B Overview" msgstr "Resumo A vs. B" -#: kdiff3.cpp:633 +#: kdiff3.cpp:632 #, kde-format msgid "A vs. C Overview" msgstr "Resumo A vs. C" -#: kdiff3.cpp:634 +#: kdiff3.cpp:633 #, kde-format msgid "B vs. C Overview" msgstr "Resumo B vs. C" -#: kdiff3.cpp:635 +#: kdiff3.cpp:634 #, kde-format msgid "Word Wrap Diff Windows" msgstr "Saltar de liña nas xanelas de diferenzas" -#: kdiff3.cpp:636 +#: kdiff3.cpp:635 #, kde-format msgid "Add Manual Diff Alignment" msgstr "Engadir o aliñamento manual das diferenzas" -#: kdiff3.cpp:637 +#: kdiff3.cpp:636 #, kde-format msgid "Clear All Manual Diff Alignments" msgstr "Limpar todos os aliñamentos de diferenzas manuais" -#: kdiff3.cpp:639 +#: kdiff3.cpp:638 #, kde-format msgid "Focus Next Window" msgstr "Enfocar a xanela seguinte" -#: kdiff3.cpp:640 +#: kdiff3.cpp:639 #, kde-format msgid "Focus Prev Window" msgstr "Enfocar a xanela anterior" -#: kdiff3.cpp:641 +#: kdiff3.cpp:640 #, kde-format msgid "Toggle Split Orientation" msgstr "Conmutar a orientación da repartición" -#: kdiff3.cpp:643 +#: kdiff3.cpp:642 #, kde-format msgid "Dir && Text Split Screen View" msgstr "Dividir a vista de directorios e texto" -#: kdiff3.cpp:645 +#: kdiff3.cpp:644 #, kde-format msgid "Toggle Between Dir && Text View" msgstr "Conmutar entre a vista de directorios e de texto" -#: kdiff3.cpp:697 pdiff.cpp:1909 +#: kdiff3.cpp:696 pdiff.cpp:1919 #, kde-format msgid "The merge result has not been saved." msgstr "O resultado da fusión aínda non se gardou." -#: kdiff3.cpp:699 +#: kdiff3.cpp:698 #, kde-format msgid "Save && Quit" msgstr "Gardar e saír" -#: kdiff3.cpp:700 +#: kdiff3.cpp:699 #, kde-format msgid "Quit Without Saving" msgstr "Saír sen gardar" -#: kdiff3.cpp:708 pdiff.cpp:1920 +#: kdiff3.cpp:707 pdiff.cpp:1930 #, kde-format msgid "Saving the merge result failed." msgstr "A garda do resultado da fusión fallou." -#: kdiff3.cpp:719 pdiff.cpp:1032 +#: kdiff3.cpp:718 pdiff.cpp:1030 #, kde-format msgid "" "You are currently doing a directory merge. Are you sure, you want to abort?" msgstr "Está a facer unha fusión de directorios. Quere realmente interrompela?" -#: kdiff3.cpp:742 +#: kdiff3.cpp:741 #, kde-format msgid "Saving file..." msgstr "Estase a gardar o ficheiro…" -#: kdiff3.cpp:759 +#: kdiff3.cpp:758 #, kde-format msgid "Saving file with a new filename..." msgstr "Estas a gardar o ficheiro cun nome novo…" -#: kdiff3.cpp:761 +#: kdiff3.cpp:760 #, kde-format msgid "Save As..." msgstr "Gardar como…" -#: kdiff3.cpp:820 +#: kdiff3.cpp:819 #, kde-format msgid "Printing not implemented." msgstr "A impresión non está realizada." -#: kdiff3.cpp:857 +#: kdiff3.cpp:858 #, kde-format msgid "Printing..." msgstr "Imprimindo…" -#: kdiff3.cpp:943 +#: kdiff3.cpp:948 #, kde-format msgid "Printing page %1 of %2" msgstr "Imprimindo a páxina %1 de %2." -#: kdiff3.cpp:1000 +#: kdiff3.cpp:1006 #, kde-format msgid " (Selection)" msgstr " (selección)" -#: kdiff3.cpp:1027 +#: kdiff3.cpp:1034 #, kde-format msgid "Printing completed." msgstr "A impresión rematou." -#: kdiff3.cpp:1031 +#: kdiff3.cpp:1038 #, kde-format msgid "Printing aborted." msgstr "Interrompeuse a impresión." -#: kdiff3.cpp:1038 +#: kdiff3.cpp:1045 #, kde-format msgid "Exiting..." msgstr "Saíndo…" -#: kdiff3.cpp:1049 +#: kdiff3.cpp:1056 #, kde-format msgid "Toggling toolbar..." msgstr "Estase a conmutar a barra de ferramentas…" -#: kdiff3.cpp:1070 +#: kdiff3.cpp:1077 #, kde-format msgid "Toggle the statusbar..." msgstr "Conmutar a barra de estado…" @@ -1609,7 +1611,7 @@ msgid "Joachim Eibl" msgstr "Joachim Eibl" -#: kdiff3_part.cpp:173 kdiff3_part.cpp:254 +#: kdiff3_part.cpp:174 kdiff3_part.cpp:255 #, kde-format msgid "Could not find files for comparison." msgstr "Non se puideron atopar os ficheiros a comparar." @@ -1627,7 +1629,7 @@ msgstr "Configurar KDiff3" #. i18n: ectx: ToolBar (mainToolBar) -#: kdiff3_part.rc:16 main.cpp:88 +#: kdiff3_part.rc:16 main.cpp:89 #, kde-format msgid "KDiff3" msgstr "KDiff3" @@ -1697,87 +1699,92 @@ msgid "Main Toolbar" msgstr "Barra de ferramentas Principal" -#: main.cpp:68 main.cpp:72 +#: main.cpp:69 main.cpp:73 #, kde-format msgid "Ignored. (User defined.)" msgstr "Ignorado. (Definido polo usuario.)" -#: main.cpp:92 +#: main.cpp:93 #, kde-format msgid " (64 bit)" msgstr " (64 bits)" -#: main.cpp:94 +#: main.cpp:95 #, kde-format msgid " (32 bit)" msgstr " (32 bits)" -#: main.cpp:95 +#: main.cpp:96 #, kde-format msgid "Tool for Comparison and Merge of Files and Directories" msgstr "Ferramenta para comparar e fundir ficheiros e directorios" -#: main.cpp:96 +#: main.cpp:97 #, kde-format msgid "(c) 2002-2014 Joachim Eibl, (c) 2017 Michael Reeves KF5/Qt5 port" msgstr "© 2002-2014 Joachim Eibl, © 2017 Michael Reeve; Adaptación a KF5 e Qt5" -#: main.cpp:112 +#: main.cpp:113 #, kde-format msgid "Merge the input." msgstr "Fundir a entrada." -#: main.cpp:113 +#: main.cpp:114 #, kde-format msgid "Explicit base file. For compatibility with certain tools." msgstr "" "Ficheiro de base explícito. Para compatibilidade con certas ferramentas." -#: main.cpp:114 +#: main.cpp:115 #, kde-format msgid "Output file. Implies -m. E.g.: -o newfile.txt" msgstr "Ficheiro de saída. Implica -m. P.ex.: -o novoficheiro.txt" -#: main.cpp:115 +#: main.cpp:116 #, kde-format msgid "Output file, again. (For compatibility with certain tools.)" msgstr "" "Ficheiro de saída, de novo. (Para compatibilidade con certas ferramentas)" -#: main.cpp:116 +#: main.cpp:118 #, kde-format msgid "No GUI if all conflicts are auto-solvable. (Needs -o file)" msgstr "" "Sen interface se todos os conflitos son resolvidos automaticamente. (Precisa " "de -o ficheiro)" -#: main.cpp:117 +#: main.cpp:120 +#, kde-format +msgid "Ignored." +msgstr "Ignorado." + +#: main.cpp:122 #, kde-format msgid "Do not solve conflicts automatically." msgstr "Non resolver os conflitos automaticamente." -#: main.cpp:118 +#: main.cpp:123 #, kde-format msgid "Visible name replacement for input file 1 (base)." msgstr "Substitución do nome visíbel para o ficheiro de entrada 1 (base)." -#: main.cpp:119 +#: main.cpp:124 #, kde-format msgid "Visible name replacement for input file 2." msgstr "Substitución do nome visíbel para o ficheiro de entrada 2." -#: main.cpp:120 +#: main.cpp:125 #, kde-format msgid "Visible name replacement for input file 3." msgstr "Substitución do nome visíbel para o ficheiro de entrada 3." -#: main.cpp:121 +#: main.cpp:126 #, kde-format msgid "Alternative visible name replacement. Supply this once for every input." msgstr "" "Substitución alternativa do nome visíbel. Indique isto para cada entrada." -#: main.cpp:122 +#: main.cpp:127 #, kde-format msgid "" "Override a config setting. Use once for every setting. E.g.: --cs " @@ -1786,88 +1793,88 @@ "Substitúe unha opción de configuración. Use unha vez para cada opción. P." "ex.: --cs \" AutoAdvance=1\"" -#: main.cpp:123 +#: main.cpp:128 #, kde-format msgid "Show list of config settings and current values." msgstr "Mostra unha lista das opcións de configuración e os valores actuais." -#: main.cpp:124 +#: main.cpp:129 #, kde-format msgid "Use a different config file." msgstr "Usar un ficheiro de configuración distinto." -#: main.cpp:127 +#: main.cpp:132 #, kde-format msgid "file1 to open (base, if not specified via --base)" msgstr "o ficheiro 1 a abrir (base, se non se indicou mediante --base)" -#: main.cpp:128 +#: main.cpp:133 #, kde-format msgid "file2 to open" msgstr "o ficheiro 2 a abrir" -#: main.cpp:129 +#: main.cpp:134 #, kde-format msgid "file3 to open" msgstr "o ficheiro 3 a abrir" -#: main.cpp:153 +#: main.cpp:158 #, kde-format msgid "See kdiff3 --help for supported options." msgstr "Ver con «kdiff3 --help» as opcións permitidas." -#: mergeresultwindow.cpp:158 +#: mergeresultwindow.cpp:171 #, kde-format msgid "Choose A Everywhere" msgstr "Escoller A en todas as partes" -#: mergeresultwindow.cpp:159 +#: mergeresultwindow.cpp:172 #, kde-format msgid "Choose B Everywhere" msgstr "Escoller B en todas as partes" -#: mergeresultwindow.cpp:160 +#: mergeresultwindow.cpp:173 #, kde-format msgid "Choose C Everywhere" msgstr "Escoller C en todas as partes" -#: mergeresultwindow.cpp:161 +#: mergeresultwindow.cpp:174 #, kde-format msgid "Choose A for All Unsolved Conflicts" msgstr "Escoller A en todos os conflitos por resolver" -#: mergeresultwindow.cpp:162 +#: mergeresultwindow.cpp:175 #, kde-format msgid "Choose B for All Unsolved Conflicts" msgstr "Escoller B en todos os conflitos por resolver" -#: mergeresultwindow.cpp:163 +#: mergeresultwindow.cpp:176 #, kde-format msgid "Choose C for All Unsolved Conflicts" msgstr "Escoller C en todos os conflitos por resolver" -#: mergeresultwindow.cpp:164 +#: mergeresultwindow.cpp:177 #, kde-format msgid "Choose A for All Unsolved Whitespace Conflicts" msgstr "Escoller A en todos os conflitos de espazos por resolver" -#: mergeresultwindow.cpp:165 +#: mergeresultwindow.cpp:178 #, kde-format msgid "Choose B for All Unsolved Whitespace Conflicts" msgstr "Escoller B en todos os conflitos de espazos por resolver" -#: mergeresultwindow.cpp:166 +#: mergeresultwindow.cpp:179 #, kde-format msgid "Choose C for All Unsolved Whitespace Conflicts" msgstr "Escoller C en todos os conflitos de espazos resolver" -#: mergeresultwindow.cpp:176 +#: mergeresultwindow.cpp:204 #, kde-format msgid "Number of remaining unsolved conflicts: %1 (of which %2 are whitespace)" msgstr "" "Número de conflitos por resolver: %1 (dos cales %2 son espazos en branco)" -#: mergeresultwindow.cpp:370 +#: mergeresultwindow.cpp:398 #, kde-format msgid "" "The output has been modified.\n" @@ -1876,29 +1883,29 @@ "Modificouse a saída.\n" "Se continúa os seus cambios esqueceranse." -#: mergeresultwindow.cpp:936 pdiff.cpp:827 +#: mergeresultwindow.cpp:964 pdiff.cpp:817 #, kde-format msgid "All input files are binary equal." msgstr "Todos os ficheiros de entrada son iguais a nivel binario." -#: mergeresultwindow.cpp:938 +#: mergeresultwindow.cpp:966 #, kde-format msgid "All input files contain the same text." msgstr "Todos os ficheiros de entrada conteñen o mesmo texto." -#: mergeresultwindow.cpp:942 mergeresultwindow.cpp:946 -#: mergeresultwindow.cpp:950 pdiff.cpp:833 pdiff.cpp:837 pdiff.cpp:841 +#: mergeresultwindow.cpp:970 mergeresultwindow.cpp:974 +#: mergeresultwindow.cpp:978 pdiff.cpp:823 pdiff.cpp:827 pdiff.cpp:831 #, kde-format msgid "Files %1 and %2 are binary equal.\n" msgstr "Os ficheiros %1 e %2 son iguais a nivel binario.\n" -#: mergeresultwindow.cpp:944 mergeresultwindow.cpp:948 -#: mergeresultwindow.cpp:952 +#: mergeresultwindow.cpp:972 mergeresultwindow.cpp:976 +#: mergeresultwindow.cpp:980 #, kde-format msgid "Files %1 and %2 have equal text.\n" msgstr "Os ficheiros %1 e %2 teñen texto igual.\n" -#: mergeresultwindow.cpp:958 +#: mergeresultwindow.cpp:986 #, kde-format msgid "" "Total number of conflicts: %1\n" @@ -1911,27 +1918,27 @@ "Número de conflitos sen resolver: %3\n" "%4" -#: mergeresultwindow.cpp:964 +#: mergeresultwindow.cpp:992 #, kde-format msgid "Conflicts" msgstr "Conflitos" -#: mergeresultwindow.cpp:1873 +#: mergeresultwindow.cpp:1901 #, kde-format msgid "" msgstr "" -#: mergeresultwindow.cpp:1881 +#: mergeresultwindow.cpp:1909 #, kde-format msgid "" msgstr "" -#: mergeresultwindow.cpp:1883 mergeresultwindow.cpp:2755 +#: mergeresultwindow.cpp:1911 mergeresultwindow.cpp:2783 #, kde-format msgid "" msgstr "" -#: mergeresultwindow.cpp:2967 +#: mergeresultwindow.cpp:2995 #, kde-format msgid "" "Not all conflicts are solved yet.\n" @@ -1940,12 +1947,12 @@ "Aínda non se resolveron todos os conflitos.\n" "O ficheiro non se gardou." -#: mergeresultwindow.cpp:2969 mergeresultwindow.cpp:2978 +#: mergeresultwindow.cpp:2997 mergeresultwindow.cpp:3006 #, kde-format msgid "Conflicts Left" msgstr "Quedan conflitos" -#: mergeresultwindow.cpp:2976 +#: mergeresultwindow.cpp:3004 #, kde-format msgid "" "There is a line end style conflict. Please choose the line end style " @@ -1955,7 +1962,7 @@ "Hai un conflito no estilo do fin de liña. Escóllao manualmente.\n" "Non se gardou o ficheiro." -#: mergeresultwindow.cpp:2990 +#: mergeresultwindow.cpp:3018 #, kde-format msgid "" "\n" @@ -1966,57 +1973,57 @@ "\n" "A creación da copia de seguranza fallou. O ficheiro non se gardou." -#: mergeresultwindow.cpp:2990 mergeresultwindow.cpp:3038 +#: mergeresultwindow.cpp:3018 mergeresultwindow.cpp:3066 #, kde-format msgid "File Save Error" msgstr "Erro ao gardar o ficheiro" -#: mergeresultwindow.cpp:3038 +#: mergeresultwindow.cpp:3066 #, kde-format msgid "Error while writing." msgstr "Ocorreu un erro ao gardar." -#: mergeresultwindow.cpp:3110 +#: mergeresultwindow.cpp:3138 #, kde-format msgid "Output:" msgstr "Saída:" -#: mergeresultwindow.cpp:3123 mergeresultwindow.cpp:3315 +#: mergeresultwindow.cpp:3151 mergeresultwindow.cpp:3343 #, kde-format msgid "[Modified]" msgstr "[Modificado]" -#: mergeresultwindow.cpp:3130 +#: mergeresultwindow.cpp:3158 #, kde-format msgid "Encoding for saving:" msgstr "Codificación para gardar:" -#: mergeresultwindow.cpp:3230 +#: mergeresultwindow.cpp:3258 #, kde-format msgid "Conflict" msgstr "Conflito" -#: mergeresultwindow.cpp:3262 +#: mergeresultwindow.cpp:3290 #, kde-format msgid "Codec from A: %1" msgstr "Códec de A: %1" -#: mergeresultwindow.cpp:3264 +#: mergeresultwindow.cpp:3292 #, kde-format msgid "Codec from B: %1" msgstr "Códec de B: %1" -#: mergeresultwindow.cpp:3266 +#: mergeresultwindow.cpp:3294 #, kde-format msgid "Codec from C: %1" msgstr "Códec de C: %1" -#: optiondialog.cpp:119 +#: optiondialog.cpp:121 #, kde-format msgid "Change Font" msgstr "Cambiar o tipo de letra" -#: optiondialog.cpp:135 optiondialog.cpp:145 +#: optiondialog.cpp:137 optiondialog.cpp:147 #, kde-format msgid "" "Font: %1, %2, %3\n" @@ -2027,124 +2034,124 @@ "\n" "Exemplo:" -#: optiondialog.cpp:388 +#: optiondialog.cpp:390 #, kde-format msgid "Unicode" msgstr "Unicode" -#: optiondialog.cpp:389 +#: optiondialog.cpp:391 #, kde-format msgid "Latin1" msgstr "Latin1" -#: optiondialog.cpp:408 +#: optiondialog.cpp:410 #, kde-format msgid "Change this if non-ASCII characters are not displayed correctly." msgstr "" "Cambie isto se os caracteres non-ASCII non son mostrados correctamente." -#: optiondialog.cpp:491 +#: optiondialog.cpp:495 #, kde-format msgid "Configure" msgstr "Configurar" -#: optiondialog.cpp:568 +#: optiondialog.cpp:573 #, kde-format msgid "Font" -msgstr "Tipo de letra" +msgstr "Fonte" -#: optiondialog.cpp:570 +#: optiondialog.cpp:575 #, kde-format msgid "Editor & Diff Output Font" msgstr "Tipo de letra do resultado de Diff e do editor" -#: optiondialog.cpp:589 +#: optiondialog.cpp:594 #, kde-format msgid "Application font" -msgstr "Tipo de letra do aplicativo" +msgstr "Tipo de letra da aplicación" -#: optiondialog.cpp:594 +#: optiondialog.cpp:599 #, kde-format msgid "File view font" msgstr "Tipo de letra da vista de ficheiros" -#: optiondialog.cpp:613 +#: optiondialog.cpp:618 #, kde-format msgctxt "Title for color settings page" msgid "Color" msgstr "Cor" -#: optiondialog.cpp:614 +#: optiondialog.cpp:619 #, kde-format msgid "Colors Settings" msgstr "Configuración das cores" -#: optiondialog.cpp:631 +#: optiondialog.cpp:644 #, kde-format msgid "Editor and Diff Views:" msgstr "Vistas do editor e das diferenzas:" -#: optiondialog.cpp:639 +#: optiondialog.cpp:652 #, kde-format msgid "Foreground color:" msgstr "Cor principal:" -#: optiondialog.cpp:647 +#: optiondialog.cpp:660 #, kde-format msgid "Background color:" msgstr "Cor de fondo:" -#: optiondialog.cpp:657 +#: optiondialog.cpp:670 #, kde-format msgid "Diff background color:" msgstr "Cor de fondo das diferenzas:" -#: optiondialog.cpp:666 +#: optiondialog.cpp:679 #, kde-format msgid "Color A:" msgstr "Cor A:" -#: optiondialog.cpp:675 +#: optiondialog.cpp:688 #, kde-format msgid "Color B:" msgstr "Cor B:" -#: optiondialog.cpp:684 +#: optiondialog.cpp:697 #, kde-format msgid "Color C:" msgstr "Cor C:" -#: optiondialog.cpp:692 +#: optiondialog.cpp:705 #, kde-format msgid "Conflict color:" msgstr "Cor de conflito:" -#: optiondialog.cpp:701 +#: optiondialog.cpp:714 #, kde-format msgid "Current range background color:" msgstr "Cor de fondo do intervalo actual:" -#: optiondialog.cpp:710 +#: optiondialog.cpp:723 #, kde-format msgid "Current range diff background color:" msgstr "Cor de fondo da diferenza do intervalo actual:" -#: optiondialog.cpp:718 +#: optiondialog.cpp:731 #, kde-format msgid "Color for manually aligned difference ranges:" msgstr "Cor dos intervalos de diferenzas aliñados manualmente:" -#: optiondialog.cpp:725 +#: optiondialog.cpp:738 #, kde-format msgid "Directory Comparison View:" msgstr "Vista de comparación dos directorios:" -#: optiondialog.cpp:731 +#: optiondialog.cpp:744 #, kde-format msgid "Newest file color:" msgstr "Cor do ficheiro máis recente:" -#: optiondialog.cpp:736 +#: optiondialog.cpp:749 #, kde-format msgid "" "Changing this color will only be effective when starting the next directory " @@ -2153,37 +2160,37 @@ "Se cambia esta cor, só terá efecto ao iniciar a próxima comparación de " "directorios." -#: optiondialog.cpp:741 +#: optiondialog.cpp:754 #, kde-format msgid "Oldest file color:" msgstr "Cor do ficheiro máis antigo:" -#: optiondialog.cpp:750 +#: optiondialog.cpp:763 #, kde-format msgid "Middle age file color:" msgstr "Cor dos ficheiros intermedios:" -#: optiondialog.cpp:759 +#: optiondialog.cpp:772 #, kde-format msgid "Color for missing files:" msgstr "Cor dos ficheiros en falta:" -#: optiondialog.cpp:773 +#: optiondialog.cpp:786 #, kde-format msgid "Editor" msgstr "Editor" -#: optiondialog.cpp:774 +#: optiondialog.cpp:787 #, kde-format msgid "Editor Behavior" msgstr "Comportamento do editor" -#: optiondialog.cpp:787 +#: optiondialog.cpp:809 #, kde-format msgid "Tab inserts spaces" msgstr "O tabulador insire espazos" -#: optiondialog.cpp:791 +#: optiondialog.cpp:813 #, kde-format msgid "" "On: Pressing tab generates the appropriate number of spaces.\n" @@ -2192,27 +2199,27 @@ "Activado: premer Tab xera o número axeitado de espazos.\n" "Non activado: inserirase un carácter de tabulación." -#: optiondialog.cpp:796 +#: optiondialog.cpp:818 #, kde-format msgid "Tab size:" msgstr "Tamaño das tabulacións:" -#: optiondialog.cpp:803 +#: optiondialog.cpp:825 #, kde-format msgid "Auto indentation" msgstr "Sangrado automático" -#: optiondialog.cpp:807 +#: optiondialog.cpp:829 #, kde-format msgid "On: The indentation of the previous line is used for a new line.\n" msgstr "Sinalado: O sangrado da liña anterior é usado na nova liña.\n" -#: optiondialog.cpp:810 +#: optiondialog.cpp:832 #, kde-format msgid "Auto copy selection" msgstr "Copiar automaticamente a selección" -#: optiondialog.cpp:814 +#: optiondialog.cpp:836 #, kde-format msgid "" "On: Any selection is immediately written to the clipboard.\n" @@ -2221,7 +2228,7 @@ "Sinalado: calquera selección é posta automaticamente no portapapeis.\n" "Non sinalado: Terá que copiar explicitamente, p.ex., con Ctrl+C." -#: optiondialog.cpp:829 +#: optiondialog.cpp:851 #, kde-format msgid "" "Sets the line endings for when an edited file is saved.\n" @@ -2230,12 +2237,12 @@ "Escolle as fins de liña para cando un ficheiro editado se garda.\n" "DOS/Windows: CR+LF; UNIX: LF; con CR=0D, LF=0A" -#: optiondialog.cpp:839 +#: optiondialog.cpp:861 #, kde-format msgid "Diff" msgstr "Diff" -#: optiondialog.cpp:840 +#: optiondialog.cpp:862 #, kde-format msgid "Diff Settings" msgstr "Configuración de Diff" @@ -2249,12 +2256,12 @@ #. ); #. ++line; #. -#: optiondialog.cpp:865 +#: optiondialog.cpp:896 #, kde-format msgid "Ignore numbers (treat as white space)" msgstr "Ignorar os números (tratar como espazo en branco)" -#: optiondialog.cpp:869 +#: optiondialog.cpp:900 #, kde-format msgid "" "Ignore number characters during line matching phase. (Similar to Ignore " @@ -2265,46 +2272,46 @@ "(Similar a Ignorar os espazos).\n" "Pode axudar a comparar ficheiros con datos numéricos." -#: optiondialog.cpp:873 +#: optiondialog.cpp:904 #, kde-format msgid "Ignore C/C++ comments (treat as white space)" msgstr "Ignorar os comentarios de C/C++ (tratalos como espazo en branco)" -#: optiondialog.cpp:876 +#: optiondialog.cpp:907 #, kde-format msgid "Treat C/C++ comments like white space." msgstr "Tratar os comentarios de C/C++ como espazo en branco." -#: optiondialog.cpp:879 +#: optiondialog.cpp:910 #, kde-format msgid "Ignore case (treat as white space)" msgstr "Ignorar as maiúsculas (tratalas como espazo en branco)" -#: optiondialog.cpp:883 +#: optiondialog.cpp:914 #, kde-format msgid "Treat case differences like white space changes. ('a'<=>'A')" msgstr "" "Trata as diferenzas de maiúsculas e minúsculas como cambios de espazo en " "branco. («a»<=>«A»)" -#: optiondialog.cpp:886 +#: optiondialog.cpp:917 #, kde-format msgid "Preprocessor command:" msgstr "Orde do preprocesador:" -#: optiondialog.cpp:891 +#: optiondialog.cpp:922 #, kde-format msgid "User defined pre-processing. (See the docs for details.)" msgstr "" "Preprocesamento definido polo usuario. (Consulte a documentación para máis " "detalles)." -#: optiondialog.cpp:894 +#: optiondialog.cpp:925 #, kde-format msgid "Line-matching preprocessor command:" msgstr "Orde do preprocesador para a correspondencia de liñas:" -#: optiondialog.cpp:899 +#: optiondialog.cpp:930 #, kde-format msgid "" "This pre-processor is only used during line matching.\n" @@ -2313,12 +2320,12 @@ "Este preprocesador só é usado na correspondencia das liñas.\n" "(Consulte a documentación para máis detalles)." -#: optiondialog.cpp:902 +#: optiondialog.cpp:933 #, kde-format msgid "Try hard (slower)" msgstr "Intentar con persistencia (lento)" -#: optiondialog.cpp:906 +#: optiondialog.cpp:937 #, kde-format msgid "" "Enables the --minimal option for the external diff.\n" @@ -2327,12 +2334,12 @@ "Activa a opción --minimal do «diff».\n" "A análise dos ficheiros grandes será moito máis lenta." -#: optiondialog.cpp:910 +#: optiondialog.cpp:941 #, kde-format msgid "Align B and C for 3 input files" msgstr "Aliñar B e C para 3 ficheiros de entrada" -#: optiondialog.cpp:914 +#: optiondialog.cpp:945 #, kde-format msgid "" "Try to align B and C when comparing or merging three input files.\n" @@ -2343,17 +2350,24 @@ "Non se recomenda á hora de fusionar porque se pode complicar.\n" "(De maneira predeterminada esta desactivado)." -#: optiondialog.cpp:926 +#: optiondialog.cpp:956 +#, fuzzy, kde-format +#| msgid "Merge" +msgctxt "Settings page" +msgid "Merge" +msgstr "Xuntar" + +#: optiondialog.cpp:957 #, kde-format msgid "Merge Settings" msgstr "Configuración da fusión" -#: optiondialog.cpp:940 +#: optiondialog.cpp:980 #, kde-format msgid "Auto advance delay (ms):" msgstr "Atraso no avance automático (ms):" -#: optiondialog.cpp:946 +#: optiondialog.cpp:986 #, kde-format msgid "" "When in Auto-Advance mode the result of the current selection is shown \n" @@ -2363,28 +2377,28 @@ "é mostrado durante o tempo indicado, antes de ir ao seguinte conflito. " "Intervalo: 0-2000 ms" -#: optiondialog.cpp:950 +#: optiondialog.cpp:990 #, kde-format msgid "Show info dialogs" msgstr "Mostrar os diálogos de información" -#: optiondialog.cpp:953 +#: optiondialog.cpp:993 #, kde-format msgid "Show a dialog with information about the number of conflicts." msgstr "Mostra un diálogo con información sobre o número de conflitos." -#: optiondialog.cpp:956 +#: optiondialog.cpp:996 #, kde-format msgid "White space 2-file merge default:" msgstr "" "Comportamento predeterminado de fusión de espazo en branco con 2 ficheiros:" -#: optiondialog.cpp:961 optiondialog.cpp:974 +#: optiondialog.cpp:1001 optiondialog.cpp:1014 #, kde-format msgid "Manual Choice" msgstr "Escolla manual" -#: optiondialog.cpp:965 optiondialog.cpp:979 +#: optiondialog.cpp:1005 optiondialog.cpp:1019 #, kde-format msgid "" "Allow the merge algorithm to automatically select an input for white-space-" @@ -2393,22 +2407,22 @@ "Permítelle ao algoritmo de unión escoller automaticamente a entrada a " "utilizar para os cambios de só espazo en branco." -#: optiondialog.cpp:969 +#: optiondialog.cpp:1009 #, kde-format msgid "White space 3-file merge default:" msgstr "Predeterminado da fusión de espazo en branco con 3 ficheiros:" -#: optiondialog.cpp:983 +#: optiondialog.cpp:1023 #, kde-format msgid "Automatic Merge Regular Expression" msgstr "Expresión regular de fusión automática" -#: optiondialog.cpp:991 smalldialogs.cpp:449 +#: optiondialog.cpp:1031 smalldialogs.cpp:459 #, kde-format msgid "Auto merge regular expression:" msgstr "Expresión regular de fusión automática:" -#: optiondialog.cpp:996 +#: optiondialog.cpp:1036 #, kde-format msgid "" "Regular expression for lines where KDiff3 should automatically choose one " @@ -2421,12 +2435,12 @@ "Cando unha liña cun conflito corresponda coa expresión regular entón\n" "C -se está dispoñíbel-, en caso contrario escollerase B." -#: optiondialog.cpp:1002 +#: optiondialog.cpp:1042 #, kde-format msgid "Run regular expression auto merge on merge start" msgstr "Executar a unión automática da expresión regular ao iniciar a fusión" -#: optiondialog.cpp:1005 +#: optiondialog.cpp:1045 #, kde-format msgid "" "Run the merge for auto merge regular expressions\n" @@ -2435,17 +2449,17 @@ "Executa a fusión para as expresións regulares de fusión automática\n" "inmediatamente despois do inicio dunha fusión.\n" -#: optiondialog.cpp:1010 +#: optiondialog.cpp:1050 #, kde-format msgid "Version Control History Merging" msgstr "Fusión do historial do control de versións" -#: optiondialog.cpp:1018 smalldialogs.cpp:476 +#: optiondialog.cpp:1058 smalldialogs.cpp:486 #, kde-format msgid "History start regular expression:" msgstr "Expresión regular do inicio do historial:" -#: optiondialog.cpp:1023 +#: optiondialog.cpp:1063 #, kde-format msgid "" "Regular expression for the start of the version control history entry.\n" @@ -2457,12 +2471,12 @@ "Normalmente, este valor contén a palabra clave «$Log$».\n" "Valor predeterminado: «.*\\$Log.*\\$.*»" -#: optiondialog.cpp:1029 smalldialogs.cpp:504 +#: optiondialog.cpp:1069 smalldialogs.cpp:514 #, kde-format msgid "History entry start regular expression:" msgstr "Expresión regular do inicio da entrada do historial:" -#: optiondialog.cpp:1042 +#: optiondialog.cpp:1082 #, kde-format msgid "" "A version control history entry consists of several lines.\n" @@ -2481,22 +2495,22 @@ "elementos do historial.\n" "Consulte documentación para saber máis detalles." -#: optiondialog.cpp:1050 +#: optiondialog.cpp:1090 #, kde-format msgid "History merge sorting" msgstr "Ordenación da fusión do historial" -#: optiondialog.cpp:1053 +#: optiondialog.cpp:1093 #, kde-format msgid "Sort version control history by a key." msgstr "Ordenar o historial do control de versións por unha chave." -#: optiondialog.cpp:1063 +#: optiondialog.cpp:1103 #, kde-format msgid "History entry start sort key order:" msgstr "Orde da chave de ordenación do inicio da entrada no historial:" -#: optiondialog.cpp:1068 +#: optiondialog.cpp:1108 #, kde-format msgid "" "Each pair of parentheses used in the regular expression for the history " @@ -2515,39 +2529,39 @@ "De deixalo baleiro, non será feita ningunha ordenación.\n" "Consulte a documentación para saber máis detalles." -#: optiondialog.cpp:1079 +#: optiondialog.cpp:1119 #, kde-format msgid "Merge version control history on merge start" msgstr "Unir o historial do control de versións ao iniciar a fusión" -#: optiondialog.cpp:1082 +#: optiondialog.cpp:1122 #, kde-format msgid "Run version control history automerge on merge start." msgstr "" "Executa a fusión automática do historial do control de versións ao iniciar a " "fusión." -#: optiondialog.cpp:1086 +#: optiondialog.cpp:1126 #, kde-format msgid "Max number of history entries:" msgstr "Número máximo de entradas do historial:" -#: optiondialog.cpp:1090 +#: optiondialog.cpp:1130 #, kde-format msgid "Cut off after specified number. Use -1 for infinite number of entries." msgstr "Remata tras o número indicado de entradas. Empregue -1 para infinitas." -#: optiondialog.cpp:1094 +#: optiondialog.cpp:1134 #, kde-format msgid "Test your regular expressions" msgstr "Verificar as expresións regulares" -#: optiondialog.cpp:1099 +#: optiondialog.cpp:1139 #, kde-format msgid "Irrelevant merge command:" msgstr "Orde de fusión irrelevante:" -#: optiondialog.cpp:1104 +#: optiondialog.cpp:1144 #, kde-format msgid "" "If specified this script is run after automerge\n" @@ -2558,12 +2572,12 @@ "cando non se detecten máis cambios relevantes.\n" "É invocado cos parámetros: ficheiro1 ficheiro2 ficheiro3" -#: optiondialog.cpp:1109 +#: optiondialog.cpp:1149 #, kde-format msgid "Auto save and quit on merge without conflicts" msgstr "Garda automaticamente e sae tras unha fusión sen conflitos" -#: optiondialog.cpp:1113 +#: optiondialog.cpp:1153 #, kde-format msgid "" "If KDiff3 was started for a file-merge from the command line and all\n" @@ -2576,27 +2590,27 @@ "entón garda automaticamente e sae.\n" "(Similar á opción da liña de ordes «--auto»)." -#: optiondialog.cpp:1124 optiondialog.cpp:1125 +#: optiondialog.cpp:1164 optiondialog.cpp:1165 #, kde-format msgid "Directory" msgstr "Directorio" -#: optiondialog.cpp:1137 +#: optiondialog.cpp:1185 #, kde-format msgid "Recursive directories" msgstr "Directorios recursivos" -#: optiondialog.cpp:1140 +#: optiondialog.cpp:1188 #, kde-format msgid "Whether to analyze subdirectories or not." msgstr "Indica se debe analizar os subcartafoles ou non." -#: optiondialog.cpp:1142 +#: optiondialog.cpp:1190 #, kde-format msgid "File pattern(s):" msgstr "Padróns de ficheiros:" -#: optiondialog.cpp:1148 +#: optiondialog.cpp:1196 #, kde-format msgid "" "Pattern(s) of files to be analyzed. \n" @@ -2607,12 +2621,12 @@ "Caracteres de substitución: «*» e «?»\n" "Pode indicar varios padróns usando o separador: «;»" -#: optiondialog.cpp:1153 +#: optiondialog.cpp:1201 #, kde-format msgid "File-anti-pattern(s):" msgstr "Anti-padróns de ficheiros:" -#: optiondialog.cpp:1159 +#: optiondialog.cpp:1207 #, kde-format msgid "" "Pattern(s) of files to be excluded from analysis. \n" @@ -2623,12 +2637,12 @@ "Caracteres de substitución: «*» e «?»\n" "Pode indicar varios padróns usando o separador: «;»" -#: optiondialog.cpp:1164 +#: optiondialog.cpp:1212 #, kde-format msgid "Dir-anti-pattern(s):" msgstr "Anti-padróns de directorios:" -#: optiondialog.cpp:1170 +#: optiondialog.cpp:1218 #, kde-format msgid "" "Pattern(s) of directories to be excluded from analysis. \n" @@ -2639,12 +2653,12 @@ "Caracteres de substitución: «*» e «?»\n" "Pode indicar varios padróns usando o separador: «;»" -#: optiondialog.cpp:1175 +#: optiondialog.cpp:1223 #, kde-format msgid "Use .cvsignore" msgstr "Empregar .cvsignore" -#: optiondialog.cpp:1179 +#: optiondialog.cpp:1227 #, kde-format msgid "" "Extends the antipattern to anything that would be ignored by CVS.\n" @@ -2654,22 +2668,22 @@ "Isto pode ser específico para cada directorio, mediante os ficheiros «." "cvsignore» locais." -#: optiondialog.cpp:1183 +#: optiondialog.cpp:1231 #, kde-format msgid "Find hidden files and directories" msgstr "Atopar ficheiros e directorios agochados" -#: optiondialog.cpp:1186 +#: optiondialog.cpp:1234 #, kde-format msgid "Finds hidden files and directories." msgstr "Atopa ficheiros e directorios agochados." -#: optiondialog.cpp:1189 +#: optiondialog.cpp:1237 #, kde-format msgid "Follow file links" msgstr "Seguir as ligazóns de ficheiros" -#: optiondialog.cpp:1193 +#: optiondialog.cpp:1241 #, kde-format msgid "" "On: Compare the file the link points to.\n" @@ -2678,12 +2692,12 @@ "Sinalado: Compara o ficheiro ao que apunta a ligazón.\n" "Non sinalado: Compara as ligazóns." -#: optiondialog.cpp:1197 +#: optiondialog.cpp:1245 #, kde-format msgid "Follow directory links" msgstr "Seguir as ligazóns de directorios" -#: optiondialog.cpp:1201 +#: optiondialog.cpp:1249 #, kde-format msgid "" "On: Compare the directory the link points to.\n" @@ -2692,13 +2706,13 @@ "Sinalado: Compara o directorio ao que apunta a ligazón.\n" "Non sinalado: Compara as ligazóns." -#: optiondialog.cpp:1210 +#: optiondialog.cpp:1258 #, kde-format msgid "Case sensitive filename comparison" msgstr "" "Comparación de nomes de ficheiros que distingue maiúsculas de minúsculas" -#: optiondialog.cpp:1214 +#: optiondialog.cpp:1262 #, kde-format msgid "" "The directory comparison will compare files or directories when their names " @@ -2712,12 +2726,12 @@ "predeterminada, en Windows, non está sinalada; en caso contrario, está " "sinalada.)" -#: optiondialog.cpp:1218 +#: optiondialog.cpp:1266 #, kde-format msgid "Unfold all subdirectories on load" msgstr "Expandir todos os subdirectorios ao cargar" -#: optiondialog.cpp:1222 +#: optiondialog.cpp:1270 #, kde-format msgid "" "On: Unfold all subdirectories when starting a directory diff.\n" @@ -2727,12 +2741,12 @@ "directorios.\n" "Desactivado: Deixar os subdirectorios colapsados." -#: optiondialog.cpp:1226 +#: optiondialog.cpp:1274 #, kde-format msgid "Skip directory status report" msgstr "Saltar o informe de estado do directorio" -#: optiondialog.cpp:1230 +#: optiondialog.cpp:1278 #, kde-format msgid "" "On: Do not show the Directory Comparison Status.\n" @@ -2741,27 +2755,27 @@ "Activado: Non mostrar o estado da comparación dos directorios.\n" "Desactivado: Mostrar o diálogo do estado no inicio." -#: optiondialog.cpp:1234 +#: optiondialog.cpp:1282 #, kde-format msgid "File Comparison Mode" msgstr "Modo de comparación dos ficheiros" -#: optiondialog.cpp:1239 +#: optiondialog.cpp:1287 #, kde-format msgid "Binary comparison" msgstr "Comparación binaria" -#: optiondialog.cpp:1241 +#: optiondialog.cpp:1289 #, kde-format msgid "Binary comparison of each file. (Default)" msgstr "Comparación binaria de cada ficheiro. (De maneira predeterminada)" -#: optiondialog.cpp:1244 +#: optiondialog.cpp:1292 #, kde-format msgid "Full analysis" msgstr "Análise completa" -#: optiondialog.cpp:1246 +#: optiondialog.cpp:1294 #, kde-format msgid "" "Do a full analysis and show statistics information in extra columns.\n" @@ -2772,12 +2786,12 @@ "(Máis lento que a comparación binaria, moito máis lento para ficheiros " "binarios.)" -#: optiondialog.cpp:1250 +#: optiondialog.cpp:1298 #, kde-format msgid "Trust the size and modification date (unsafe)" msgstr "Confiar no tamaño e data de modificación (inseguro)" -#: optiondialog.cpp:1252 +#: optiondialog.cpp:1300 #, kde-format msgid "" "Assume that files are equal if the modification date and file length are " @@ -2792,7 +2806,7 @@ "aparecerán como distintos.\n" "Útil con directorios grandes ou redes lentas." -#: optiondialog.cpp:1257 +#: optiondialog.cpp:1305 #, kde-format msgid "" "Trust the size and date, but use binary comparison if date does not match " @@ -2801,7 +2815,7 @@ "Confiar no tamaño e data, pero usar a comparación binaria se a data non casa " "(inseguro)" -#: optiondialog.cpp:1259 +#: optiondialog.cpp:1307 #, kde-format msgid "" "Assume that files are equal if the modification date and file length are " @@ -2815,12 +2829,12 @@ "binaria.\n" "Útil con directorios grandes ou redes lentas." -#: optiondialog.cpp:1264 +#: optiondialog.cpp:1312 #, kde-format msgid "Trust the size (unsafe)" msgstr "Confiar no tamaño (inseguro)" -#: optiondialog.cpp:1266 +#: optiondialog.cpp:1314 #, kde-format msgid "" "Assume that files are equal if their file lengths are equal.\n" @@ -2831,12 +2845,12 @@ "Útil para directorios grandes ou redes lentas cando a data é modificada na " "descarga." -#: optiondialog.cpp:1273 +#: optiondialog.cpp:1321 #, kde-format msgid "Synchronize directories" msgstr "Sincronizar os directorios" -#: optiondialog.cpp:1277 +#: optiondialog.cpp:1325 #, kde-format msgid "" "Offers to store files in both directories so that\n" @@ -2847,12 +2861,12 @@ "para que ambos queden iguais.\n" "Funciona só ao comparar dous directorios sen indicar un destino." -#: optiondialog.cpp:1283 +#: optiondialog.cpp:1331 #, kde-format msgid "White space differences considered equal" msgstr "As diferenzas en espazos en branco son consideradas como iguais" -#: optiondialog.cpp:1287 +#: optiondialog.cpp:1335 #, kde-format msgid "" "If files differ only by white space consider them equal.\n" @@ -2861,12 +2875,12 @@ "Se os ficheiros só difiren en espazos en branco considéraos iguais.\n" "Isto está activo só cando é escollida a análise completa." -#: optiondialog.cpp:1293 +#: optiondialog.cpp:1341 #, kde-format msgid "Copy newer instead of merging (unsafe)" msgstr "Copiar o máis recente en vez de fundir (inseguro)" -#: optiondialog.cpp:1297 +#: optiondialog.cpp:1345 #, kde-format msgid "" "Do not look inside, just take the newer file.\n" @@ -2877,12 +2891,12 @@ "(Use isto só se sabe o que está a facer!)\n" "Só é efectivo ao comparar dous directorios." -#: optiondialog.cpp:1302 +#: optiondialog.cpp:1350 #, kde-format msgid "Backup files (.orig)" msgstr "Facer copia de seguranza dos ficheiros (.orig)" -#: optiondialog.cpp:1306 +#: optiondialog.cpp:1354 #, kde-format msgid "" "If a file would be saved over an old file, then the old file\n" @@ -2892,17 +2906,17 @@ "renomearase\n" "o ficheiro anterior cunha extensión «.orig» en vez de eliminalo." -#: optiondialog.cpp:1382 optiondialog.cpp:1383 +#: optiondialog.cpp:1430 optiondialog.cpp:1431 #, kde-format msgid "Regional Settings" msgstr "Configuración rexional" -#: optiondialog.cpp:1397 +#: optiondialog.cpp:1454 #, kde-format msgid "Use the same encoding for everything:" msgstr "Utilizar a mesma codificación para todo:" -#: optiondialog.cpp:1401 +#: optiondialog.cpp:1458 #, kde-format msgid "" "Enable this allows to change all encodings by changing the first only.\n" @@ -2912,17 +2926,17 @@ "primeira.\n" "Desactíveo se precisa axustes individuais." -#: optiondialog.cpp:1405 +#: optiondialog.cpp:1462 #, kde-format msgid "Note: Local Encoding is \"%1\"" msgstr "Nota: A codificación local é «%1»" -#: optiondialog.cpp:1409 +#: optiondialog.cpp:1466 #, kde-format msgid "File Encoding for A:" msgstr "Codificación do ficheiro A:" -#: optiondialog.cpp:1416 +#: optiondialog.cpp:1473 #, kde-format msgid "" "If enabled then Unicode (UTF-16 or UTF-8) encoding will be detected.\n" @@ -2936,32 +2950,32 @@ "xeito de reserva.\n" "(A detección de Unicode depende dos primeiros bytes do ficheiro.)" -#: optiondialog.cpp:1419 optiondialog.cpp:1430 optiondialog.cpp:1441 +#: optiondialog.cpp:1476 optiondialog.cpp:1487 optiondialog.cpp:1498 #, kde-format msgid "Auto Detect Unicode" msgstr "Detectar automaticamente Unicode" -#: optiondialog.cpp:1425 +#: optiondialog.cpp:1482 #, kde-format msgid "File Encoding for B:" msgstr "Codificación do ficheiro B:" -#: optiondialog.cpp:1436 +#: optiondialog.cpp:1493 #, kde-format msgid "File Encoding for C:" msgstr "Codificación do ficheiro C:" -#: optiondialog.cpp:1447 +#: optiondialog.cpp:1504 #, kde-format msgid "File Encoding for Merge Output and Saving:" msgstr "Codificación do ficheiro para fusionar o resultado e gardar:" -#: optiondialog.cpp:1452 +#: optiondialog.cpp:1509 #, kde-format msgid "Auto Select" msgstr "Escoller automaticamente" -#: optiondialog.cpp:1456 +#: optiondialog.cpp:1513 #, kde-format msgid "" "If enabled then the encoding from the input files is used.\n" @@ -2972,17 +2986,17 @@ "entrada.\n" "En casos ambiguos un diálogo requiriralle que escolla a codificación." -#: optiondialog.cpp:1459 +#: optiondialog.cpp:1516 #, kde-format msgid "File Encoding for Preprocessor Files:" msgstr "Codificación dos ficheiros de preprocesador:" -#: optiondialog.cpp:1471 +#: optiondialog.cpp:1528 #, kde-format msgid "Right To Left Language" msgstr "Idioma de dereita a esquerda" -#: optiondialog.cpp:1475 +#: optiondialog.cpp:1532 #, kde-format msgid "" "Some languages are read from right to left.\n" @@ -2991,22 +3005,22 @@ "Algúns idiomas lense de dereita a esquerda.\n" "Esta opción cambia o visor e editor en consecuencia." -#: optiondialog.cpp:1485 +#: optiondialog.cpp:1542 #, kde-format msgid "Integration" msgstr "Integración" -#: optiondialog.cpp:1486 +#: optiondialog.cpp:1543 #, kde-format msgid "Integration Settings" msgstr "Configuración da integración" -#: optiondialog.cpp:1499 +#: optiondialog.cpp:1564 #, kde-format msgid "Command line options to ignore:" msgstr "Opcións da liña de ordes a ignorar:" -#: optiondialog.cpp:1505 +#: optiondialog.cpp:1570 #, kde-format msgid "" "List of command line options that should be ignored when KDiff3 is used by " @@ -3019,12 +3033,12 @@ "Se desexa indicar varios valores, sepáreos por «;»\n" "Isto elimina o erro de «Opción descoñecida»." -#: optiondialog.cpp:1510 +#: optiondialog.cpp:1575 #, kde-format msgid "Quit also via Escape key" msgstr "Saír tamén coa tecla Esc" -#: optiondialog.cpp:1514 +#: optiondialog.cpp:1579 #, kde-format msgid "" "Fast method to exit.\n" @@ -3033,7 +3047,7 @@ "Un sistema rápido de saír.\n" "Para quen teña o costume de empregar a tecla de Escape." -#: optiondialog.cpp:1598 +#: optiondialog.cpp:1653 #, kde-format msgid "This resets all options. Not only those of the current topic." msgstr "Isto repón todas as opcións, non só as do tema actual." @@ -3089,81 +3103,71 @@ msgid "Disable Unsafe Options" msgstr "Desactivar as opcións inseguras" -#: pdiff.cpp:158 +#: pdiff.cpp:160 #, kde-format msgid "Loading A" msgstr "Cargando A" -#: pdiff.cpp:167 +#: pdiff.cpp:162 #, kde-format -msgid "Errors occurred during pre-processing of file A." -msgstr "Producíronse erros durante o preprocesamento do ficheiro A." +msgid "Loading A: %1" +msgstr "Cargando A: %1" -#: pdiff.cpp:172 +#: pdiff.cpp:170 #, kde-format msgid "Loading B" msgstr "Cargando B" -#: pdiff.cpp:179 -#, kde-format -msgid "Errors occurred during pre-processing of file B." -msgstr "Producíronse erros durante o preprocesamento do ficheiro B." - -#: pdiff.cpp:202 pdiff.cpp:241 +#: pdiff.cpp:201 pdiff.cpp:237 #, kde-format msgid "Diff: A <-> B" msgstr "Diferenzas: A <-> B" -#: pdiff.cpp:208 pdiff.cpp:279 pdiff.cpp:293 +#: pdiff.cpp:207 pdiff.cpp:275 pdiff.cpp:289 #, kde-format msgid "Linediff: A <-> B" msgstr "Diferenzas de liñas: A <-> B" -#: pdiff.cpp:225 +#: pdiff.cpp:224 #, kde-format msgid "Loading C" msgstr "Cargando C" -#: pdiff.cpp:232 -#, kde-format -msgid "Errors occurred during pre-processing of file C." -msgstr "Producíronse erros durante o preprocesamento do ficheiro C." - -#: pdiff.cpp:250 +#: pdiff.cpp:246 #, kde-format msgid "Diff: A <-> C" msgstr "Diferenzas: A <-> C" -#: pdiff.cpp:261 +#: pdiff.cpp:257 #, kde-format msgid "Diff: B <-> C" msgstr "Diferenzas: B <-> C" -#: pdiff.cpp:283 pdiff.cpp:297 +#: pdiff.cpp:279 pdiff.cpp:293 #, kde-format msgid "Linediff: B <-> C" msgstr "Diferenzas de liñas: B <-> C" -#: pdiff.cpp:287 pdiff.cpp:301 +#: pdiff.cpp:283 pdiff.cpp:297 #, kde-format msgid "Linediff: A <-> C" msgstr "Diferenzas de liñas: A <-> C" -#: pdiff.cpp:829 +#: pdiff.cpp:819 #, kde-format 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 " "nivel binario." -#: pdiff.cpp:835 pdiff.cpp:839 pdiff.cpp:843 +#: pdiff.cpp:825 pdiff.cpp:829 pdiff.cpp:833 #, 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 nivel " "binario.\n" -#: pdiff.cpp:853 +#: pdiff.cpp:843 #, kde-format msgid "" "Some input files do not seem to be pure text files.\n" @@ -3174,17 +3178,17 @@ "Lembre que a fusión de KDiff3 non se pensou para os datos binarios.\n" "Continúe a súa conta e risco." -#: pdiff.cpp:863 +#: pdiff.cpp:853 #, kde-format msgid ", B" msgstr ", B" -#: pdiff.cpp:865 +#: pdiff.cpp:855 #, kde-format msgid ", C" msgstr ", C" -#: pdiff.cpp:867 +#: pdiff.cpp:857 #, kde-format msgid "" "Some input characters could not be converted to valid unicode.\n" @@ -3199,78 +3203,73 @@ "responsabilidade.\n" "Os ficheiros afectados están en %1." -#: pdiff.cpp:1034 +#: pdiff.cpp:1032 #, kde-format msgid "Abort" msgstr "Interromper" -#: pdiff.cpp:1040 pdiff.cpp:1130 +#: pdiff.cpp:1038 pdiff.cpp:1129 #, kde-format msgid "Opening files..." msgstr "Estase a abrir os ficheiros…" -#: pdiff.cpp:1107 -#, kde-format -msgid "File open error" -msgstr "Erro ao abrir o ficheiro" - -#: pdiff.cpp:1202 +#: pdiff.cpp:1212 #, kde-format msgid "Cutting selection..." msgstr "Estase a cortar a selección…" -#: pdiff.cpp:1223 +#: pdiff.cpp:1233 #, kde-format msgid "Copying selection to clipboard..." msgstr "Estase a copiar a selección para o portapapeis…" -#: pdiff.cpp:1239 +#: pdiff.cpp:1249 #, kde-format msgid "Inserting clipboard contents..." msgstr "Estase a inserir o contido do portapapeis…" -#: pdiff.cpp:1695 +#: pdiff.cpp:1705 #, kde-format msgid "Word wrap (Cancel disables word wrap)" msgstr "División visual das liñas («Cancelar» o desactiva)" -#: pdiff.cpp:1696 +#: pdiff.cpp:1706 #, kde-format msgid "Calculating max width for horizontal scrollbar" msgstr "Calculando a anchura máxima da barra de desprazamento horizontal." -#: pdiff.cpp:1911 +#: pdiff.cpp:1921 #, kde-format msgid "Save && Continue" msgstr "Gardar e continuar" -#: pdiff.cpp:1912 +#: pdiff.cpp:1922 #, kde-format msgid "Continue Without Saving" msgstr "Continuar sen gardar" -#: pdiff.cpp:2124 +#: pdiff.cpp:2134 #, kde-format msgid "Search complete." msgstr "Busca rematada." -#: pdiff.cpp:2124 +#: pdiff.cpp:2134 #, kde-format msgid "Search Complete" msgstr "Busca rematada" -#: pdiff.cpp:2375 +#: pdiff.cpp:2385 #, kde-format msgid "Nothing is selected in either diff input window." msgstr "" "Non hai nada escollido en ningunha das xanelas de entrada das diferenzas." -#: pdiff.cpp:2375 +#: pdiff.cpp:2385 #, kde-format msgid "Error while adding manual diff range" msgstr "Ocorreu un erro ao engadir o intervalo manual de diferenzas" -#: progress.cpp:59 progress.cpp:71 +#: progress.cpp:61 progress.cpp:73 #, kde-format msgid "&Cancel" msgstr "&Cancelar" @@ -3280,126 +3279,126 @@ msgid "A (Base):" msgstr "A (Base) :" -#: smalldialogs.cpp:68 smalldialogs.cpp:85 smalldialogs.cpp:102 -#: smalldialogs.cpp:144 +#: smalldialogs.cpp:71 smalldialogs.cpp:90 smalldialogs.cpp:109 +#: smalldialogs.cpp:154 #, kde-format msgid "File..." msgstr "Ficheiro…" -#: smalldialogs.cpp:70 smalldialogs.cpp:87 smalldialogs.cpp:104 -#: smalldialogs.cpp:146 +#: smalldialogs.cpp:73 smalldialogs.cpp:92 smalldialogs.cpp:111 +#: smalldialogs.cpp:156 #, kde-format msgid "Dir..." msgstr "Directorio…" -#: smalldialogs.cpp:96 +#: smalldialogs.cpp:103 #, kde-format msgid "C (Optional):" msgstr "C (Opcional):" -#: smalldialogs.cpp:119 +#: smalldialogs.cpp:126 #, kde-format msgid "Swap/Copy Names..." msgstr "Intercambiar ou copiar os nomes…" -#: smalldialogs.cpp:124 smalldialogs.cpp:125 smalldialogs.cpp:126 +#: smalldialogs.cpp:131 smalldialogs.cpp:132 smalldialogs.cpp:133 #, kde-format msgid "Swap %1<->%2" msgstr "Trocar %1<->%2" -#: smalldialogs.cpp:127 smalldialogs.cpp:128 smalldialogs.cpp:129 +#: smalldialogs.cpp:134 smalldialogs.cpp:135 smalldialogs.cpp:136 #, kde-format msgid "Copy %1->Output" msgstr "Copiar %1->Resultado" -#: smalldialogs.cpp:130 smalldialogs.cpp:131 smalldialogs.cpp:132 +#: smalldialogs.cpp:137 smalldialogs.cpp:138 smalldialogs.cpp:139 #, kde-format msgid "Swap %1<->Output" msgstr "Trocar %1<->Resultado" -#: smalldialogs.cpp:138 +#: smalldialogs.cpp:148 #, kde-format msgid "Output (optional):" msgstr "Resultado (opcional):" -#: smalldialogs.cpp:168 +#: smalldialogs.cpp:178 #, kde-format msgid "Configure..." msgstr "Configurar…" -#: smalldialogs.cpp:233 +#: smalldialogs.cpp:243 #, kde-format msgid "Open Directory" msgstr "Abrir un directorio" -#: smalldialogs.cpp:234 +#: smalldialogs.cpp:244 #, kde-format msgid "Select Output File" msgstr "Escoller o ficheiro de saída" -#: smalldialogs.cpp:393 +#: smalldialogs.cpp:403 #, kde-format msgid "Search text:" msgstr "Texto da busca:" -#: smalldialogs.cpp:400 +#: smalldialogs.cpp:410 #, kde-format msgid "Case sensitive" msgstr "Distinguir as maiúsculas" -#: smalldialogs.cpp:403 +#: smalldialogs.cpp:413 #, kde-format msgid "Search A" msgstr "Buscar A" -#: smalldialogs.cpp:408 +#: smalldialogs.cpp:418 #, kde-format msgid "Search B" msgstr "Buscar B" -#: smalldialogs.cpp:413 +#: smalldialogs.cpp:423 #, kde-format msgid "Search C" msgstr "Buscar C" -#: smalldialogs.cpp:418 +#: smalldialogs.cpp:428 #, kde-format msgid "Search output" msgstr "Resultado da busca" -#: smalldialogs.cpp:425 +#: smalldialogs.cpp:435 #, kde-format msgid "&Search" msgstr "&Buscar" -#: smalldialogs.cpp:444 +#: smalldialogs.cpp:454 #, kde-format msgid "Regular Expression Tester" msgstr "Verificador de expresións regulares" -#: smalldialogs.cpp:457 +#: smalldialogs.cpp:467 #, kde-format msgid "Example auto merge line:" msgstr "Liña de fusión automática de exemplo:" -#: smalldialogs.cpp:459 +#: smalldialogs.cpp:469 #, kde-format msgid "To test auto merge, copy a line as used in your files." msgstr "" "Para probar a fusión automática, copie unha liña como se use nos seus " "ficheiros." -#: smalldialogs.cpp:465 smalldialogs.cpp:493 smalldialogs.cpp:529 +#: smalldialogs.cpp:475 smalldialogs.cpp:503 smalldialogs.cpp:539 #, kde-format msgid "Match result:" msgstr "Resultado correspondente:" -#: smalldialogs.cpp:484 +#: smalldialogs.cpp:494 #, kde-format msgid "Example history start line (with leading comment):" msgstr "Liña inicial do historial do exemplo (co comentario inicial):" -#: smalldialogs.cpp:486 +#: smalldialogs.cpp:496 #, kde-format msgid "" "Copy a history start line as used in your files,\n" @@ -3408,18 +3407,18 @@ "Copie unha liña inicial do historial, como é usada nos seus ficheiros,\n" "incluíndo o comentario inicial." -#: smalldialogs.cpp:512 +#: smalldialogs.cpp:522 #, kde-format msgid "History sort key order:" msgstr "Orde da chave do historial:" -#: smalldialogs.cpp:520 +#: smalldialogs.cpp:530 #, kde-format msgid "Example history entry start line (without leading comment):" msgstr "" "Liña inicial da entrada do historial de exemplo (sen o comentario inicial):" -#: smalldialogs.cpp:522 +#: smalldialogs.cpp:532 #, kde-format msgid "" "Copy a history entry start line as used in your files,\n" @@ -3429,47 +3428,47 @@ "ficheiros,\n" "pero omita o comentario inicial." -#: smalldialogs.cpp:536 +#: smalldialogs.cpp:546 #, kde-format msgid "Sort key result:" msgstr "Resultado da chave de ordenación:" -#: smalldialogs.cpp:584 smalldialogs.cpp:594 smalldialogs.cpp:614 +#: smalldialogs.cpp:594 smalldialogs.cpp:604 smalldialogs.cpp:624 #, kde-format msgid "Match success." msgstr "Éxito na correspondencia." -#: smalldialogs.cpp:588 smalldialogs.cpp:598 smalldialogs.cpp:620 +#: smalldialogs.cpp:598 smalldialogs.cpp:608 smalldialogs.cpp:630 #, kde-format msgid "Match failed." msgstr "A correspondencia fallou." -#: smalldialogs.cpp:605 +#: smalldialogs.cpp:615 #, kde-format msgid "Opening and closing parentheses do not match in regular expression." msgstr "Os parénteses de abertura e peche non casan na expresión regular." -#: SourceData.cpp:150 +#: SourceData.cpp:153 #, kde-format msgid "Writing clipboard data to temp file failed." msgstr "A escritura dos datos do portapapeis no ficheiro temporal fallou." -#: SourceData.cpp:154 +#: SourceData.cpp:157 #, kde-format msgid "From Clipboard" msgstr "Do portapapeis" -#: SourceData.cpp:335 +#: SourceData.cpp:348 #, kde-format msgid "%1 is not a normal file." msgstr "%1 non é un ficheiro normal." -#: SourceData.cpp:427 +#: SourceData.cpp:440 #, kde-format msgid " Temp file is: %1" msgstr " O ficheiro temporal é: %1" -#: SourceData.cpp:432 +#: SourceData.cpp:445 #, kde-format msgid "" "Preprocessing possibly failed. Check this command:\n" @@ -3484,12 +3483,12 @@ "\n" "A orde de preprocesamento vai desactivarse." -#: SourceData.cpp:443 SourceData.cpp:512 +#: SourceData.cpp:456 SourceData.cpp:525 #, kde-format msgid "File %1 too large to process. Skipping." msgstr "O ficheiro %1 é grande de máis para procesalo. Saltarase." -#: SourceData.cpp:487 +#: SourceData.cpp:500 #, kde-format msgid "" "The line-matching-preprocessing possibly failed. Check this command:\n" @@ -3498,12 +3497,13 @@ "\n" "The line-matching-preprocessing command will be disabled now." msgstr "" -"O preprocesamento con busca de liñas probabelmente fallou. Revise esta " -"orde:\n" +"O preprocesamento para atopar coincidencias en liñas probabelmente fallou. " +"Revise esta orde:\n" "\n" " %1\n" "\n" -"A orde de preprocesamento con busca de liñas vai desactivarse." +"A orde de preprocesamento para atopar coincidencias en liñas vai " +"desactivarse." #: Utils.cpp:77 #, kde-format diff -Nru kdiff3-1.8.01/po/hi/kdiff3.po kdiff3-1.8.3/po/hi/kdiff3.po --- kdiff3-1.8.01/po/hi/kdiff3.po 2019-05-18 01:02:02.000000000 +0000 +++ kdiff3-1.8.3/po/hi/kdiff3.po 2020-06-25 00:18:22.000000000 +0000 @@ -4,8 +4,8 @@ msgid "" msgstr "" "Project-Id-Version: kdiff3\n" -"Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2019-04-18 08:02+0200\n" +"Report-Msgid-Bugs-To: https://bugs.kde.org\n" +"POT-Creation-Date: 2020-06-22 07:48+0200\n" "PO-Revision-Date: 2005-01-22 16:10+0530\n" "Last-Translator: Ravishankar Shrivastava \n" "Language-Team: indlinux-hindi \n" @@ -26,337 +26,337 @@ msgid "Your emails" msgstr "" -#: difftextwindow.cpp:412 +#: difftextwindow.cpp:414 #, kde-format msgid "File %1: Line %2" msgstr "" -#: difftextwindow.cpp:414 +#: difftextwindow.cpp:416 #, fuzzy, kde-format msgid "File %1: Line not available" msgstr "उपलब्ध नहीं" -#: difftextwindow.cpp:1780 +#: difftextwindow.cpp:1778 #, kde-format msgid "Encoding:" msgstr "" -#: difftextwindow.cpp:1782 mergeresultwindow.cpp:3138 optiondialog.cpp:818 +#: difftextwindow.cpp:1781 mergeresultwindow.cpp:3166 optiondialog.cpp:840 #, kde-format msgid "Line end style:" msgstr "पंक्ति ख़त्म होने की शैलीः" -#: difftextwindow.cpp:1810 directorymergewindow.cpp:382 -#: directorymergewindow.cpp:433 directorymergewindow.cpp:524 -#: directorymergewindow.cpp:3058 directorymergewindow.cpp:3189 -#: directorymergewindow.cpp:3417 mergeresultwindow.cpp:942 -#: mergeresultwindow.cpp:944 mergeresultwindow.cpp:946 -#: mergeresultwindow.cpp:948 mergeresultwindow.cpp:1814 -#: mergeresultwindow.cpp:3170 mergeresultwindow.cpp:3177 optiondialog.cpp:962 -#: optiondialog.cpp:975 pdiff.cpp:833 pdiff.cpp:835 pdiff.cpp:837 pdiff.cpp:839 -#: pdiff.cpp:861 smalldialogs.cpp:124 smalldialogs.cpp:126 smalldialogs.cpp:127 -#: smalldialogs.cpp:130 +#: difftextwindow.cpp:1809 directorymergewindow.cpp:383 +#: directorymergewindow.cpp:434 directorymergewindow.cpp:525 +#: directorymergewindow.cpp:3072 directorymergewindow.cpp:3203 +#: directorymergewindow.cpp:3431 mergeresultwindow.cpp:970 +#: mergeresultwindow.cpp:972 mergeresultwindow.cpp:974 +#: mergeresultwindow.cpp:976 mergeresultwindow.cpp:1842 +#: mergeresultwindow.cpp:3198 mergeresultwindow.cpp:3205 optiondialog.cpp:1002 +#: optiondialog.cpp:1015 pdiff.cpp:823 pdiff.cpp:825 pdiff.cpp:827 +#: pdiff.cpp:829 pdiff.cpp:851 smalldialogs.cpp:131 smalldialogs.cpp:133 +#: smalldialogs.cpp:134 smalldialogs.cpp:137 #, kde-format msgid "A" msgstr "अ" -#: difftextwindow.cpp:1810 directorymergewindow.cpp:384 -#: directorymergewindow.cpp:436 directorymergewindow.cpp:526 -#: directorymergewindow.cpp:3064 directorymergewindow.cpp:3190 -#: directorymergewindow.cpp:3418 mergeresultwindow.cpp:942 -#: mergeresultwindow.cpp:944 mergeresultwindow.cpp:950 -#: mergeresultwindow.cpp:952 mergeresultwindow.cpp:1816 -#: mergeresultwindow.cpp:3172 mergeresultwindow.cpp:3179 optiondialog.cpp:963 -#: optiondialog.cpp:976 pdiff.cpp:833 pdiff.cpp:835 pdiff.cpp:841 pdiff.cpp:843 -#: pdiff.cpp:863 smalldialogs.cpp:124 smalldialogs.cpp:125 smalldialogs.cpp:128 -#: smalldialogs.cpp:131 +#: difftextwindow.cpp:1809 directorymergewindow.cpp:385 +#: directorymergewindow.cpp:437 directorymergewindow.cpp:527 +#: directorymergewindow.cpp:3078 directorymergewindow.cpp:3204 +#: directorymergewindow.cpp:3432 mergeresultwindow.cpp:970 +#: mergeresultwindow.cpp:972 mergeresultwindow.cpp:978 +#: mergeresultwindow.cpp:980 mergeresultwindow.cpp:1844 +#: mergeresultwindow.cpp:3200 mergeresultwindow.cpp:3207 optiondialog.cpp:1003 +#: optiondialog.cpp:1016 pdiff.cpp:823 pdiff.cpp:825 pdiff.cpp:831 +#: pdiff.cpp:833 pdiff.cpp:853 smalldialogs.cpp:131 smalldialogs.cpp:132 +#: smalldialogs.cpp:135 smalldialogs.cpp:138 #, kde-format msgid "B" msgstr "ब" -#: difftextwindow.cpp:1810 directorymergewindow.cpp:386 -#: directorymergewindow.cpp:439 directorymergewindow.cpp:528 -#: directorymergewindow.cpp:3070 directorymergewindow.cpp:3191 -#: directorymergewindow.cpp:3419 mergeresultwindow.cpp:946 -#: mergeresultwindow.cpp:948 mergeresultwindow.cpp:950 -#: mergeresultwindow.cpp:952 mergeresultwindow.cpp:1818 -#: mergeresultwindow.cpp:3174 mergeresultwindow.cpp:3181 optiondialog.cpp:977 -#: pdiff.cpp:837 pdiff.cpp:839 pdiff.cpp:841 pdiff.cpp:843 pdiff.cpp:865 -#: smalldialogs.cpp:125 smalldialogs.cpp:126 smalldialogs.cpp:129 -#: smalldialogs.cpp:132 +#: difftextwindow.cpp:1809 directorymergewindow.cpp:387 +#: directorymergewindow.cpp:440 directorymergewindow.cpp:529 +#: directorymergewindow.cpp:3084 directorymergewindow.cpp:3205 +#: directorymergewindow.cpp:3433 mergeresultwindow.cpp:974 +#: mergeresultwindow.cpp:976 mergeresultwindow.cpp:978 +#: mergeresultwindow.cpp:980 mergeresultwindow.cpp:1846 +#: mergeresultwindow.cpp:3202 mergeresultwindow.cpp:3209 optiondialog.cpp:1017 +#: pdiff.cpp:827 pdiff.cpp:829 pdiff.cpp:831 pdiff.cpp:833 pdiff.cpp:855 +#: smalldialogs.cpp:132 smalldialogs.cpp:133 smalldialogs.cpp:136 +#: smalldialogs.cpp:139 #, kde-format msgid "C" msgstr "स" -#: difftextwindow.cpp:1810 +#: difftextwindow.cpp:1809 #, fuzzy, kde-format #| msgid "A (Base):" msgid "A (Base)" msgstr "अ (बेस):" -#: difftextwindow.cpp:1812 +#: difftextwindow.cpp:1811 #, kde-format msgid "Encoding: %1" msgstr "" -#: difftextwindow.cpp:1813 mergeresultwindow.cpp:3183 +#: difftextwindow.cpp:1812 mergeresultwindow.cpp:3211 #, kde-format msgid "Unix" msgstr "" -#: difftextwindow.cpp:1813 mergeresultwindow.cpp:3184 +#: difftextwindow.cpp:1812 mergeresultwindow.cpp:3212 #, kde-format msgid "DOS" msgstr "" -#: difftextwindow.cpp:1813 +#: difftextwindow.cpp:1812 #, fuzzy, kde-format #| msgid "Line end style:" msgid "Line end style: %1" msgstr "पंक्ति ख़त्म होने की शैलीः" -#: difftextwindow.cpp:1835 kdiff3.cpp:873 +#: difftextwindow.cpp:1834 kdiff3.cpp:874 #, fuzzy, kde-format msgid "Top line" msgstr "शीर्ष पंक्ति %1" -#: difftextwindow.cpp:1845 +#: difftextwindow.cpp:1843 #, kde-format msgid "End" msgstr "अंत" -#: difftextwindow.cpp:1903 smalldialogs.cpp:235 +#: difftextwindow.cpp:1901 smalldialogs.cpp:245 #, fuzzy, kde-format #| msgid "Opening files..." msgid "Open File" msgstr "फ़ाइलें खोली जा रही हैं..." -#: difftextwindow.cpp:1951 optiondialog.cpp:387 +#: difftextwindow.cpp:1943 optiondialog.cpp:389 #, kde-format msgid "Unicode, 8 bit" msgstr "" -#: difftextwindow.cpp:1966 +#: difftextwindow.cpp:1958 #, kde-format msgid "Other" msgstr "" -#: directorymergewindow.cpp:409 directorymergewindow.cpp:3424 +#: directorymergewindow.cpp:410 directorymergewindow.cpp:3438 #, kde-format msgid "Copy A to B" msgstr "अ की नक़ल ब में करें" -#: directorymergewindow.cpp:412 directorymergewindow.cpp:3425 +#: directorymergewindow.cpp:413 directorymergewindow.cpp:3439 #, kde-format msgid "Copy B to A" msgstr "ब की नक़ल अ में करें" -#: directorymergewindow.cpp:415 directorymergewindow.cpp:3426 +#: directorymergewindow.cpp:416 directorymergewindow.cpp:3440 #, kde-format msgid "Delete A" msgstr "अ को मिटाएँ" -#: directorymergewindow.cpp:418 directorymergewindow.cpp:3427 +#: directorymergewindow.cpp:419 directorymergewindow.cpp:3441 #, kde-format msgid "Delete B" msgstr "ब को मिटाएँ" -#: directorymergewindow.cpp:421 +#: directorymergewindow.cpp:422 #, kde-format msgid "Delete A & B" msgstr "अ तथा ब को मिटाएँ" -#: directorymergewindow.cpp:424 directorymergewindow.cpp:3429 +#: directorymergewindow.cpp:425 directorymergewindow.cpp:3443 #, kde-format msgid "Merge to A" msgstr "अ में सम्मिलित करें" -#: directorymergewindow.cpp:427 directorymergewindow.cpp:3430 +#: directorymergewindow.cpp:428 directorymergewindow.cpp:3444 #, kde-format msgid "Merge to B" msgstr "ब में सम्मिलित करें" -#: directorymergewindow.cpp:430 +#: directorymergewindow.cpp:431 #, kde-format msgid "Merge to A & B" msgstr "अ तथा ब में सम्मिलित करें" -#: directorymergewindow.cpp:442 directorymergewindow.cpp:3421 +#: directorymergewindow.cpp:443 directorymergewindow.cpp:3435 #, kde-format msgid "Delete (if exists)" msgstr "मिटाएँ (यदि मौजूद है)" -#: directorymergewindow.cpp:445 directorymergewindow.cpp:448 -#: directorymergewindow.cpp:3420 optiondialog.cpp:925 smalldialogs.cpp:113 +#: directorymergewindow.cpp:446 directorymergewindow.cpp:449 +#: directorymergewindow.cpp:3434 smalldialogs.cpp:120 #, kde-format msgid "Merge" msgstr "सम्मिलित करें" -#: directorymergewindow.cpp:445 directorymergewindow.cpp:448 +#: directorymergewindow.cpp:446 directorymergewindow.cpp:449 #, kde-format msgid "Merge (manual)" msgstr "सम्मिलित करें (हस्तचालित)" -#: directorymergewindow.cpp:451 +#: directorymergewindow.cpp:452 #, kde-format msgid "Error: Conflicting File Types" msgstr "त्रुटि: परस्पर विरोधी फ़ाइल क़िस्में" -#: directorymergewindow.cpp:454 +#: directorymergewindow.cpp:455 #, kde-format msgid "Error: Changed and Deleted" msgstr "" -#: directorymergewindow.cpp:457 +#: directorymergewindow.cpp:458 #, kde-format msgid "Error: Dates are equal but files are not." msgstr "त्रुटि: तारीखें तो एक समान हैं, परंतु फ़ाइलें नहीं." -#: directorymergewindow.cpp:471 +#: directorymergewindow.cpp:472 #, fuzzy, kde-format #| msgid "Done." msgid "Done" msgstr "सम्पन्न." -#: directorymergewindow.cpp:473 +#: directorymergewindow.cpp:474 #, fuzzy, kde-format msgid "Error" msgstr "त्रुटि." -#: directorymergewindow.cpp:475 +#: directorymergewindow.cpp:476 #, kde-format msgid "Skipped." msgstr "छोड़ा." -#: directorymergewindow.cpp:477 +#: directorymergewindow.cpp:478 #, kde-format msgid "Not saved." msgstr "सहेजा नहीं गया." -#: directorymergewindow.cpp:479 +#: directorymergewindow.cpp:480 #, kde-format msgid "In progress..." msgstr "प्रगति पर है..." -#: directorymergewindow.cpp:481 +#: directorymergewindow.cpp:482 #, kde-format msgid "To do." msgstr "कार्य-सूची" -#: directorymergewindow.cpp:522 +#: directorymergewindow.cpp:523 #, kde-format msgid "Name" msgstr "नाम" -#: directorymergewindow.cpp:530 +#: directorymergewindow.cpp:531 #, kde-format msgid "Operation" msgstr "ऑपरेशन" -#: directorymergewindow.cpp:532 +#: directorymergewindow.cpp:533 #, kde-format msgid "Status" msgstr "स्थिति" -#: directorymergewindow.cpp:534 +#: directorymergewindow.cpp:535 #, kde-format msgid "Unsolved" msgstr "हल नहीं" -#: directorymergewindow.cpp:536 +#: directorymergewindow.cpp:537 #, kde-format msgid "Solved" msgstr "हल कर लिया गया" -#: directorymergewindow.cpp:538 +#: directorymergewindow.cpp:539 #, kde-format msgid "Nonwhite" msgstr "सफेद-नहीं" -#: directorymergewindow.cpp:540 +#: directorymergewindow.cpp:541 #, kde-format msgid "White" msgstr "सफेद" -#: directorymergewindow.cpp:674 +#: directorymergewindow.cpp:676 #, kde-format msgid "Unable to compare non-normal file with normal file." msgstr "" -#: directorymergewindow.cpp:688 +#: directorymergewindow.cpp:690 #, kde-format msgid "Mix of links and normal files." msgstr "कड़ियों की मिलावटें तथा सामान्य फ़ाइलें." -#: directorymergewindow.cpp:695 +#: directorymergewindow.cpp:697 #, kde-format msgid "Link: " msgstr "कड़ी" -#: directorymergewindow.cpp:704 +#: directorymergewindow.cpp:706 #, kde-format msgid "Size. " msgstr "आकार." -#: directorymergewindow.cpp:718 directorymergewindow.cpp:728 +#: directorymergewindow.cpp:720 directorymergewindow.cpp:730 #, kde-format msgid "Date & Size: " msgstr "तारीख व आकार:" -#: directorymergewindow.cpp:748 +#: directorymergewindow.cpp:751 #, kde-format msgid "Comparing file..." msgstr "फ़ाइल की तुलना की जा रही है..." -#: directorymergewindow.cpp:801 +#: directorymergewindow.cpp:813 #, kde-format msgid "" "You are currently doing a directory merge. Are you sure, you want to abort " "the merge and rescan the directory?" msgstr "" -#: directorymergewindow.cpp:802 kdiff3.cpp:698 kdiff3.cpp:708 kdiff3.cpp:720 -#: mergeresultwindow.cpp:372 pdiff.cpp:1033 pdiff.cpp:1910 pdiff.cpp:1920 +#: directorymergewindow.cpp:814 kdiff3.cpp:697 kdiff3.cpp:707 kdiff3.cpp:719 +#: mergeresultwindow.cpp:400 pdiff.cpp:1031 pdiff.cpp:1920 pdiff.cpp:1930 #, kde-format msgid "Warning" msgstr "" -#: directorymergewindow.cpp:803 directorymergewindow.cpp:3393 +#: directorymergewindow.cpp:815 directorymergewindow.cpp:3407 #, kde-format msgid "Rescan" msgstr "री-स्कैन" -#: directorymergewindow.cpp:804 pdiff.cpp:1035 +#: directorymergewindow.cpp:816 pdiff.cpp:1033 #, kde-format msgid "Continue Merging" msgstr "मिलाया जाना जारी रखें" -#: directorymergewindow.cpp:971 +#: directorymergewindow.cpp:984 #, kde-format msgid "Opening of directories failed:" msgstr "डिरेक्ट्रीज़ खोलना असफल:" -#: directorymergewindow.cpp:975 +#: directorymergewindow.cpp:988 #, kde-format msgid "Dir A \"%1\" does not exist or is not a directory.\n" msgstr "डिरेक्ट्री अ \"%1\" या तो मौजूद नहीं है या फिर वह डिरेक्ट्री नहीं है.\n" -#: directorymergewindow.cpp:980 +#: directorymergewindow.cpp:993 #, kde-format msgid "Dir B \"%1\" does not exist or is not a directory.\n" msgstr "डिरेक्ट्री ब \"%1\" या तो मौजूद नहीं है या फिर वह डिरेक्ट्री नहीं है.\n" -#: directorymergewindow.cpp:985 +#: directorymergewindow.cpp:998 #, kde-format msgid "Dir C \"%1\" does not exist or is not a directory.\n" msgstr "डिरेक्ट्री स \"%1\" या तो मौजूद नहीं है या फिर वह डिरेक्ट्री नहीं है.\n" -#: directorymergewindow.cpp:988 +#: directorymergewindow.cpp:1001 #, kde-format msgid "Directory Open Error" msgstr "डिरेक्ट्री खोलने में त्रुटि" -#: directorymergewindow.cpp:996 +#: directorymergewindow.cpp:1009 #, kde-format msgid "" "The destination directory must not be the same as A or B when three " @@ -364,49 +364,49 @@ "Check again before continuing." msgstr "" -#: directorymergewindow.cpp:998 +#: directorymergewindow.cpp:1011 #, kde-format msgid "Parameter Warning" msgstr "पैरामीटर चेतावनी" -#: directorymergewindow.cpp:1003 +#: directorymergewindow.cpp:1016 #, kde-format msgid "Scanning directories..." msgstr "डिरेक्ट्रीज़ स्कैन किया जा रहा है..." -#: directorymergewindow.cpp:1029 +#: directorymergewindow.cpp:1042 #, kde-format msgid "Reading Directory A" msgstr "डिरेक्ट्री अ को पढ़ा जा रहा है" -#: directorymergewindow.cpp:1038 +#: directorymergewindow.cpp:1051 #, kde-format msgid "Reading Directory B" msgstr "डिरेक्ट्री ब को पढ़ा जा रहा है" -#: directorymergewindow.cpp:1048 +#: directorymergewindow.cpp:1061 #, kde-format msgid "Reading Directory C" msgstr "डिरेक्ट्री स को पढ़ा जा रहा है" -#: directorymergewindow.cpp:1064 +#: directorymergewindow.cpp:1077 #, kde-format msgid "Some subdirectories were not readable in" msgstr "कुछ सबडिरेक्ट्रीज़ इसमें पढ़े नहीं जा सकने वाले हैं" -#: directorymergewindow.cpp:1069 +#: directorymergewindow.cpp:1082 #, kde-format msgid "Check the permissions of the subdirectories." msgstr "सबडिरेक्ट्रीज़ की अनुमतियाँ जाँचें." -#: directorymergewindow.cpp:1106 kdiff3.cpp:666 kdiff3.cpp:753 kdiff3.cpp:777 -#: kdiff3.cpp:1065 kdiff3.cpp:1086 pdiff.cpp:1116 pdiff.cpp:1170 pdiff.cpp:1218 -#: pdiff.cpp:1234 pdiff.cpp:1277 pdiff.cpp:1301 +#: directorymergewindow.cpp:1119 kdiff3.cpp:665 kdiff3.cpp:752 kdiff3.cpp:776 +#: kdiff3.cpp:1072 kdiff3.cpp:1093 pdiff.cpp:1115 pdiff.cpp:1178 pdiff.cpp:1228 +#: pdiff.cpp:1244 pdiff.cpp:1287 pdiff.cpp:1311 #, kde-format msgid "Ready." msgstr "तैयार." -#: directorymergewindow.cpp:1121 +#: directorymergewindow.cpp:1134 #, kde-format msgid "" "Directory Comparison Status\n" @@ -416,23 +416,23 @@ "Number of different files: %3" msgstr "" -#: directorymergewindow.cpp:1128 +#: directorymergewindow.cpp:1141 #, fuzzy, kde-format #| msgid "Number of manual merges:" msgid "Number of manual merges: %1" msgstr "हस्तचालित सम्मिलित करने की संख्या:" -#: directorymergewindow.cpp:1394 +#: directorymergewindow.cpp:1407 #, kde-format msgid "This affects all merge operations." msgstr "यह सभी सम्मिलित ऑपरेशन को प्रभावित करेगा" -#: directorymergewindow.cpp:1395 +#: directorymergewindow.cpp:1408 #, kde-format msgid "Changing All Merge Operations" msgstr "सभी सम्मिलित करने के ऑपरेशन को बदला जा रहा है" -#: directorymergewindow.cpp:1695 +#: directorymergewindow.cpp:1708 #, fuzzy, kde-format #| msgid "Processing " msgid "" @@ -440,45 +440,45 @@ "%3" msgstr "प्रोसेसिंग" -#: directorymergewindow.cpp:1738 directorymergewindow.cpp:1742 +#: directorymergewindow.cpp:1751 directorymergewindow.cpp:1755 #, kde-format msgid "Some files could not be processed." msgstr "" -#: directorymergewindow.cpp:2222 directorymergewindow.cpp:2247 -#: directorymergewindow.cpp:2271 +#: directorymergewindow.cpp:2235 directorymergewindow.cpp:2260 +#: directorymergewindow.cpp:2285 #, kde-format msgid "This operation is currently not possible." msgstr "यह ऑपरेशन वर्तमान में संभव नहीं है." -#: directorymergewindow.cpp:2222 directorymergewindow.cpp:2247 -#: directorymergewindow.cpp:2271 directorymergewindow.cpp:2552 +#: directorymergewindow.cpp:2235 directorymergewindow.cpp:2260 +#: directorymergewindow.cpp:2285 directorymergewindow.cpp:2565 #, kde-format msgid "Operation Not Possible" msgstr "ऑपरेशन वर्तमान में संभव नहीं" -#: directorymergewindow.cpp:2318 +#: directorymergewindow.cpp:2332 #, fuzzy, kde-format #| msgid "An error occurred while copying.\n" msgid "An error occurred while copying." msgstr "नक़ल करने के दौरान एक त्रुटि हुई.\n" -#: directorymergewindow.cpp:2319 directorymergewindow.cpp:2759 +#: directorymergewindow.cpp:2333 directorymergewindow.cpp:2772 #, kde-format msgid "Merge Error" msgstr "सम्मिलित करने में त्रुटि" -#: directorymergewindow.cpp:2396 +#: directorymergewindow.cpp:2410 #, kde-format msgid "Unknown merge operation. (This must never happen!)" msgstr "सम्मिलित करने का अज्ञात ऑपरेशन. (ऐसा कभी नहीं होना चाहिए!)" -#: directorymergewindow.cpp:2441 +#: directorymergewindow.cpp:2455 #, kde-format msgid "Unknown merge operation." msgstr "सम्मिलित करने का अज्ञात ऑपरेशन. " -#: directorymergewindow.cpp:2454 +#: directorymergewindow.cpp:2468 #, kde-format msgid "" "The merge is about to begin.\n" @@ -491,50 +491,50 @@ "whatsoever! Make backups of your vital data!" msgstr "" -#: directorymergewindow.cpp:2459 +#: directorymergewindow.cpp:2473 #, kde-format msgid "Starting Merge" msgstr "सम्मिलित करना प्रारंभ किया जा रहा है" -#: directorymergewindow.cpp:2460 +#: directorymergewindow.cpp:2474 #, kde-format msgid "Do It" msgstr "इसे करें" -#: directorymergewindow.cpp:2461 +#: directorymergewindow.cpp:2475 #, kde-format msgid "Simulate It" msgstr "इसे सिमुलेट करें" -#: directorymergewindow.cpp:2487 +#: directorymergewindow.cpp:2501 #, kde-format msgid "" "The highlighted item has a different type in the different directories. " "Select what to do." msgstr "" -#: directorymergewindow.cpp:2491 +#: directorymergewindow.cpp:2505 #, kde-format msgid "" "The modification dates of the file are equal but the files are not. Select " "what to do." msgstr "" -#: directorymergewindow.cpp:2495 +#: directorymergewindow.cpp:2509 #, kde-format msgid "" "The highlighted item was changed in one directory and deleted in the other. " "Select what to do." msgstr "" -#: directorymergewindow.cpp:2552 +#: directorymergewindow.cpp:2565 #, kde-format msgid "" "This operation is currently not possible because directory merge is " "currently running." msgstr "" -#: directorymergewindow.cpp:2609 +#: directorymergewindow.cpp:2622 #, kde-format msgid "" "There was an error in the last step.\n" @@ -542,978 +542,983 @@ "to skip this item?" msgstr "" -#: directorymergewindow.cpp:2611 +#: directorymergewindow.cpp:2624 #, kde-format msgid "Continue merge after an error" msgstr "त्रुटि के बाद भी सम्मिलित करना जारी रखें" -#: directorymergewindow.cpp:2612 +#: directorymergewindow.cpp:2625 #, kde-format msgid "Continue With Last Item" msgstr "पिछली वस्तु के साथ जारी रखें" -#: directorymergewindow.cpp:2613 +#: directorymergewindow.cpp:2626 #, kde-format msgid "Skip Item" msgstr "वस्तु छोड़ें" -#: directorymergewindow.cpp:2709 +#: directorymergewindow.cpp:2722 #, kde-format msgid "Merge operation complete." msgstr "सम्मिलित करने की क्रिया पूरी हुई." -#: directorymergewindow.cpp:2709 directorymergewindow.cpp:2712 +#: directorymergewindow.cpp:2722 directorymergewindow.cpp:2725 #, kde-format msgid "Merge Complete" msgstr "सम्मिलित करना सम्पन्न" -#: directorymergewindow.cpp:2722 +#: directorymergewindow.cpp:2735 #, kde-format msgid "" "Simulated merge complete: Check if you agree with the proposed operations." msgstr "" -#: directorymergewindow.cpp:2758 +#: directorymergewindow.cpp:2771 #, fuzzy, kde-format #| msgid "An error occurred. Press OK to see detailed information.\n" msgid "An error occurred. Press OK to see detailed information." msgstr "एक त्रुटि हुई. विस्तृत जानकारी देखने के लिए ठीक को दबाएँ\n" -#: directorymergewindow.cpp:2791 +#: directorymergewindow.cpp:2804 #, kde-format msgid "Error: While deleting %1: Creating backup failed." msgstr "त्रुटि: %1 को मिटाने के दौरान: बैकअप बनाने में असफल." -#: directorymergewindow.cpp:2798 +#: directorymergewindow.cpp:2811 #, kde-format msgid "delete directory recursively( %1 )" msgstr "डिरेक्ट्री ( %1 ) को रिकर्सिवली मिटाएँ" -#: directorymergewindow.cpp:2800 +#: directorymergewindow.cpp:2813 #, kde-format msgid "delete( %1 )" msgstr "मिटाएं (%1)" -#: directorymergewindow.cpp:2815 +#: directorymergewindow.cpp:2828 #, kde-format msgid "Error: delete dir operation failed while trying to read the directory." msgstr "त्रुटि: डिरेक्ट्री को पढ़ने की कोशिश में डिरेक्ट्री मिटाने का कार्य असफल." -#: directorymergewindow.cpp:2834 +#: directorymergewindow.cpp:2847 #, kde-format msgid "Error: rmdir( %1 ) operation failed." msgstr "त्रुटि: rmdir( %1 ) क्रिया असफल." -#: directorymergewindow.cpp:2844 +#: directorymergewindow.cpp:2857 #, kde-format msgid "Error: delete operation failed." msgstr "त्रुटि: डिरेक्ट्री मिटाने का कार्य असफल." -#: directorymergewindow.cpp:2870 +#: directorymergewindow.cpp:2884 #, kde-format msgid "manual merge( %1, %2, %3 -> %4)" msgstr "हस्तचालित सम्मिलित करें( %1, %2, %3 -> %4)" -#: directorymergewindow.cpp:2873 +#: directorymergewindow.cpp:2887 #, kde-format msgid "" " Note: After a manual merge the user should continue by pressing F7." msgstr "" "टीप: हस्तचालित सम्मिलित करने के बाद उपयोक्ता को F7 को दबाकर जारी रखना चाहिए." -#: directorymergewindow.cpp:2900 +#: directorymergewindow.cpp:2914 #, kde-format msgid "Error: copy( %1 -> %2 ) failed.Deleting existing destination failed." msgstr "त्रुटि: नक़ल ( %1 -> %2 ) असफल. मौजूदा गंतव्य को मिटाना असफल." -#: directorymergewindow.cpp:2909 +#: directorymergewindow.cpp:2923 #, kde-format msgid "copyLink( %1 -> %2 )" msgstr "कापीलिंक ( %1 -> %2 )" -#: directorymergewindow.cpp:2918 +#: directorymergewindow.cpp:2932 #, kde-format msgid "Error: copyLink failed: Remote links are not yet supported." msgstr "त्रुटि: कापीलिंक असफल: रिमोट कड़ियाँ अभी समर्थित नहीं हैं." -#: directorymergewindow.cpp:2928 +#: directorymergewindow.cpp:2942 #, kde-format msgid "Error: copyLink failed." msgstr "त्रुटि: कापीलिंक असफल." -#: directorymergewindow.cpp:2953 +#: directorymergewindow.cpp:2967 #, kde-format msgid "copy( %1 -> %2 )" msgstr "नक़ल( %1 -> %2 )" -#: directorymergewindow.cpp:2979 +#: directorymergewindow.cpp:2993 #, kde-format msgid "Error during rename( %1 -> %2 ): Cannot delete existing destination." msgstr "" -#: directorymergewindow.cpp:2986 +#: directorymergewindow.cpp:3000 #, kde-format msgid "rename( %1 -> %2 )" msgstr "नाम बदलें( %1 -> %2 )" -#: directorymergewindow.cpp:2995 +#: directorymergewindow.cpp:3009 #, kde-format msgid "Error: Rename failed." msgstr "त्रुटि: नाम-बदलना असफल." -#: directorymergewindow.cpp:3013 +#: directorymergewindow.cpp:3027 #, kde-format msgid "Error during makeDir of %1. Cannot delete existing file." msgstr "%1 के मेकडिर के दौरान त्रुटि. मौजूदा फ़ाइल मिटा नहीं सकते." -#: directorymergewindow.cpp:3030 +#: directorymergewindow.cpp:3044 #, kde-format msgid "makeDir( %1 )" msgstr "मेकडिर( %1 )" -#: directorymergewindow.cpp:3040 +#: directorymergewindow.cpp:3054 #, kde-format msgid "Error while creating directory." msgstr "डिरेक्ट्री बनाने के दौरान त्रुटि." -#: directorymergewindow.cpp:3076 directorymergewindow.cpp:3195 +#: directorymergewindow.cpp:3090 directorymergewindow.cpp:3209 #, kde-format msgid "Dest" msgstr "गंतव्य" -#: directorymergewindow.cpp:3084 directorymergewindow.cpp:3113 +#: directorymergewindow.cpp:3098 directorymergewindow.cpp:3127 #, kde-format msgid "Dir" msgstr "डिर." -#: directorymergewindow.cpp:3084 +#: directorymergewindow.cpp:3098 #, kde-format msgid "Type" msgstr "क़िस्म" -#: directorymergewindow.cpp:3084 +#: directorymergewindow.cpp:3098 #, kde-format msgid "Size" msgstr "आकार" -#: directorymergewindow.cpp:3085 +#: directorymergewindow.cpp:3099 #, kde-format msgid "Attr" msgstr "एट्रि." -#: directorymergewindow.cpp:3085 +#: directorymergewindow.cpp:3099 #, kde-format msgid "Last Modification" msgstr "अंतिम परिवर्धन" -#: directorymergewindow.cpp:3085 +#: directorymergewindow.cpp:3099 #, kde-format msgid "Link-Destination" msgstr "लिंक-गंतव्य" -#: directorymergewindow.cpp:3113 +#: directorymergewindow.cpp:3127 #, fuzzy, kde-format msgid "File" msgstr "फ़ाइल..." -#: directorymergewindow.cpp:3113 +#: directorymergewindow.cpp:3127 #, fuzzy, kde-format #| msgid "Link: " msgid "-Link" msgstr "कड़ी" -#: directorymergewindow.cpp:3119 +#: directorymergewindow.cpp:3133 #, kde-format msgid "not available" msgstr "उपलब्ध नहीं" -#: directorymergewindow.cpp:3137 +#: directorymergewindow.cpp:3151 #, kde-format msgid "A (Dest): " msgstr "A (गंत.): " -#: directorymergewindow.cpp:3141 +#: directorymergewindow.cpp:3155 #, kde-format msgid "A: " msgstr "" -#: directorymergewindow.cpp:3141 +#: directorymergewindow.cpp:3155 #, kde-format msgid "A (Base): " msgstr "A (आधार): " -#: directorymergewindow.cpp:3147 +#: directorymergewindow.cpp:3161 #, kde-format msgid "B (Dest): " msgstr "B (गंत.): " -#: directorymergewindow.cpp:3151 +#: directorymergewindow.cpp:3165 #, kde-format msgid "B: " msgstr "" -#: directorymergewindow.cpp:3156 +#: directorymergewindow.cpp:3170 #, kde-format msgid "C (Dest): " msgstr "C (गंत.): " -#: directorymergewindow.cpp:3160 +#: directorymergewindow.cpp:3174 #, kde-format msgid "C: " msgstr "" -#: directorymergewindow.cpp:3163 +#: directorymergewindow.cpp:3177 #, kde-format msgid "Dest: " msgstr "गंतव्य:" #. i18n("Saving Directory Merge State ...")); -#: directorymergewindow.cpp:3238 +#: directorymergewindow.cpp:3252 #, fuzzy, kde-format msgid "Save Directory Merge State As..." msgstr "डिरेक्ट्री सम्मिलित करें" -#: directorymergewindow.cpp:3387 +#: directorymergewindow.cpp:3401 #, kde-format msgid "Start/Continue Directory Merge" msgstr "डिरेक्ट्री सम्मिलित करना प्रारंभ करें/जारी रखें" -#: directorymergewindow.cpp:3388 +#: directorymergewindow.cpp:3402 #, kde-format msgid "Run Operation for Current Item" msgstr "मौज़ूदा वस्तु के लिए ऑपरेशन चलाएँ" -#: directorymergewindow.cpp:3389 +#: directorymergewindow.cpp:3403 #, kde-format msgid "Compare Selected File" msgstr "चयनित फ़ाइल की तुलना करें" -#: directorymergewindow.cpp:3390 +#: directorymergewindow.cpp:3404 #, kde-format msgid "Merge Current File" msgstr "मौज़ूदा फ़ाइल सम्मिलित करें" -#: directorymergewindow.cpp:3390 +#: directorymergewindow.cpp:3404 #, fuzzy, kde-format msgid "" "Merge\n" "File" msgstr "सम्मिलित करें" -#: directorymergewindow.cpp:3391 +#: directorymergewindow.cpp:3405 #, kde-format msgid "Fold All Subdirs" msgstr "सभी सबडिरेक्ट्रीज फ़ोल्ड करें" -#: directorymergewindow.cpp:3392 +#: directorymergewindow.cpp:3406 #, kde-format msgid "Unfold All Subdirs" msgstr "सभी सबडिरेक्ट्रीज अनफ़ोल्ड करें" #. i18n("Save Directory Merge State ..."), 0, this, &DirectoryMergeWindow::slotSaveMergeState, ac, "dir_save_merge_state"); #. i18n("Load Directory Merge State ..."), 0, this, &DirectoryMergeWindow::slotLoadMergeState, ac, "dir_load_merge_state"); -#: directorymergewindow.cpp:3396 +#: directorymergewindow.cpp:3410 #, kde-format msgid "Choose A for All Items" msgstr "सभी वस्तुओं के लिए अ का चयन करें" -#: directorymergewindow.cpp:3397 +#: directorymergewindow.cpp:3411 #, kde-format msgid "Choose B for All Items" msgstr "सभी वस्तुओं के लिए ब का चयन करें" -#: directorymergewindow.cpp:3398 +#: directorymergewindow.cpp:3412 #, kde-format msgid "Choose C for All Items" msgstr "सभी वस्तुओं के लिए स का चयन करें" -#: directorymergewindow.cpp:3399 +#: directorymergewindow.cpp:3413 #, kde-format msgid "Auto-Choose Operation for All Items" msgstr "सभी वस्तुओं के लिए क्रिया स्वचालित चयन करें" -#: directorymergewindow.cpp:3400 +#: directorymergewindow.cpp:3414 #, kde-format msgid "No Operation for All Items" msgstr "सभी वस्तुओं के लिए कोई क्रिया नहीं" #. i18n("Synchronize Directories"), 0, this, &DirectoryMergeWindow::slotSynchronizeDirectories, ac, "dir_synchronize_directories"); #. d->m_pDirChooseNewerFiles = GuiUtils::createAction< KToggleAction >(i18n("Copy Newer Files Instead of Merging"), 0, this, &DirectoryMergeWindow::slotChooseNewerFiles, ac, "dir_choose_newer_files"); -#: directorymergewindow.cpp:3405 +#: directorymergewindow.cpp:3419 #, kde-format msgid "Show Identical Files" msgstr "" -#: directorymergewindow.cpp:3405 +#: directorymergewindow.cpp:3419 #, kde-format msgid "" "Identical\n" "Files" msgstr "" -#: directorymergewindow.cpp:3406 +#: directorymergewindow.cpp:3420 #, fuzzy, kde-format msgid "Show Different Files" msgstr "भिन्न फ़ाइलों की संख्या:" -#: directorymergewindow.cpp:3407 +#: directorymergewindow.cpp:3421 #, kde-format msgid "Show Files only in A" msgstr "" -#: directorymergewindow.cpp:3407 +#: directorymergewindow.cpp:3421 #, kde-format msgid "" "Files\n" "only in A" msgstr "" -#: directorymergewindow.cpp:3408 +#: directorymergewindow.cpp:3422 #, kde-format msgid "Show Files only in B" msgstr "" -#: directorymergewindow.cpp:3408 +#: directorymergewindow.cpp:3422 #, kde-format msgid "" "Files\n" "only in B" msgstr "" -#: directorymergewindow.cpp:3409 +#: directorymergewindow.cpp:3423 #, kde-format msgid "Show Files only in C" msgstr "" -#: directorymergewindow.cpp:3409 +#: directorymergewindow.cpp:3423 #, kde-format msgid "" "Files\n" "only in C" msgstr "" -#: directorymergewindow.cpp:3413 +#: directorymergewindow.cpp:3427 #, fuzzy, kde-format msgid "Compare Explicitly Selected Files" msgstr "चयनित फ़ाइल की तुलना करें" -#: directorymergewindow.cpp:3414 +#: directorymergewindow.cpp:3428 #, fuzzy, kde-format msgid "Merge Explicitly Selected Files" msgstr "चयनित फ़ाइल की तुलना करें" -#: directorymergewindow.cpp:3416 directorymergewindow.cpp:3423 +#: directorymergewindow.cpp:3430 directorymergewindow.cpp:3437 #, kde-format msgid "Do Nothing" msgstr "कुछ नहीं करें" -#: directorymergewindow.cpp:3428 +#: directorymergewindow.cpp:3442 #, kde-format msgid "Delete A && B" msgstr "अ तथा ब को मिटाएँ" -#: directorymergewindow.cpp:3431 +#: directorymergewindow.cpp:3445 #, kde-format msgid "Merge to A && B" msgstr "अ तथा ब में सम्मिलित करें" -#: fileaccess.cpp:462 SourceData.cpp:493 +#: fileaccess.cpp:301 +#, kde-format +msgid "Unable to determine full url. No parent specified." +msgstr "" + +#: fileaccess.cpp:482 SourceData.cpp:506 #, fuzzy, kde-format #| msgid "Reading file: %1" msgid "Failed to read file: %1" msgstr "फ़ाइल पढ़ा जा रहा है: %1" -#: fileaccess.cpp:587 +#: fileaccess.cpp:624 #, kde-format msgid "Creating temp copy of %1 failed." msgstr "%1 की अस्थाई नक़ल बनाना असफल." -#: fileaccess.cpp:595 fileaccess.cpp:600 +#: fileaccess.cpp:632 fileaccess.cpp:637 #, fuzzy, kde-format #| msgid "Opening %1 failed." msgid "Opening %1 failed. %2" msgstr "%1 को खोलना असफल" -#: fileaccess.cpp:619 fileaccess.cpp:627 +#: fileaccess.cpp:656 fileaccess.cpp:664 #, fuzzy, kde-format #| msgid "Error reading from %1" msgid "Error reading from %1. %2" msgstr "%1 से पढ़ने में त्रुटि" -#: fileaccess.cpp:751 +#: fileaccess.cpp:788 #, kde-format msgid "" "While trying to make a backup, deleting an older backup failed.\n" "Filename: %1" msgstr "" -#: fileaccess.cpp:758 +#: fileaccess.cpp:795 #, kde-format msgid "" "While trying to make a backup, renaming failed.\n" "Filenames: %1 -> %2" msgstr "" -#: fileaccess.cpp:828 +#: fileaccess.cpp:865 #, kde-format msgid "Getting file status: %1" msgstr "फ़ाइल स्थिति प्राप्त की जा रही है: %1" -#: fileaccess.cpp:869 +#: fileaccess.cpp:906 #, kde-format msgid "Reading file: %1" msgstr "फ़ाइल पढ़ा जा रहा है: %1" -#: fileaccess.cpp:907 +#: fileaccess.cpp:944 #, kde-format msgid "Writing file: %1" msgstr "फ़ाइल: %1 लिखा जा रहा है" -#: fileaccess.cpp:940 +#: fileaccess.cpp:977 #, kde-format msgid "Out of memory" msgstr "मेमोरी कम पड़ गई" -#: fileaccess.cpp:976 +#: fileaccess.cpp:1013 #, kde-format msgid "Making directory: %1" msgstr "डिरेक्ट्री बनाया जा रहा है: %1" -#: fileaccess.cpp:997 +#: fileaccess.cpp:1034 #, kde-format msgid "Removing directory: %1" msgstr "डिरेक्ट्री मिटाया जा रहा है: %1" -#: fileaccess.cpp:1012 +#: fileaccess.cpp:1049 #, kde-format msgid "Removing file: %1" msgstr "फ़ाइल मिटाया जा रहा है: %1" -#: fileaccess.cpp:1028 +#: fileaccess.cpp:1065 #, kde-format msgid "Creating symbolic link: %1 -> %2" msgstr "सिंबालिक कड़ी बनाई जा रही है: %1 -> %2" -#: fileaccess.cpp:1052 +#: fileaccess.cpp:1089 #, kde-format msgid "Renaming file: %1 -> %2" msgstr "फ़ाइलनाम बदला जा रहा है: %1 -> %2" -#: fileaccess.cpp:1086 +#: fileaccess.cpp:1123 #, kde-format msgid "Copying file: %1 -> %2" msgstr "फ़ाइल नक़ल की जा रही है: %1 -> %2" -#: fileaccess.cpp:1108 +#: fileaccess.cpp:1145 #, fuzzy, kde-format #| msgid "Reading directory: " msgid "Reading directory: %1" msgstr "डिरेक्ट्री को पढ़ा जा रहा है:" -#: fileaccess.cpp:1162 +#: fileaccess.cpp:1202 #, kde-format msgid "Listing directory: %1" msgstr "डिरेक्ट्री सूचीबद्ध की जा रही है: %1" -#: kdiff3.cpp:181 +#: kdiff3.cpp:182 #, fuzzy, kde-format msgid "Current Configuration:" msgstr "मौजूदा वस्तु सिंक ऑपरेशन" -#: kdiff3.cpp:186 +#: kdiff3.cpp:187 #, fuzzy, kde-format msgid "Config Option Error:" msgstr "फ़ाइल खोलने में त्रुटि" -#: kdiff3.cpp:240 +#: kdiff3.cpp:246 #, kde-format msgid "Option --auto used, but no output file specified." msgstr "विकल्प --auto का उपयोग किया गया, परंतु कोई आउटपुट फ़ाइल निर्दिष्ट नहीं." -#: kdiff3.cpp:416 +#: kdiff3.cpp:405 #, kde-format msgid "Option --auto ignored for directory comparison." msgstr "विकल्प --auto को डिरेक्ट्री तुलना करने में छोड़ा गया." -#: kdiff3.cpp:460 +#: kdiff3.cpp:449 #, kde-format msgid "Saving failed." msgstr "सहेजने में असफल." -#: kdiff3.cpp:496 pdiff.cpp:1098 +#: kdiff3.cpp:494 pdiff.cpp:1096 #, kde-format msgid "Opening of these files failed:" msgstr "इन फ़ाइलों को खोलना असफल:" -#: kdiff3.cpp:505 +#: kdiff3.cpp:503 pdiff.cpp:1105 #, kde-format -msgid "File Open Error" +msgid "File open error" msgstr "फ़ाइल खोलने में त्रुटि" -#: kdiff3.cpp:533 +#: kdiff3.cpp:532 #, kde-format msgid "Opens documents for comparison..." msgstr "दस्तावेज़ों को तुलना के लिए खोलता है..." -#: kdiff3.cpp:535 +#: kdiff3.cpp:534 #, fuzzy, kde-format msgid "Reload" msgstr "तैयार." -#: kdiff3.cpp:538 +#: kdiff3.cpp:537 #, kde-format msgid "Saves the merge result. All conflicts must be solved!" msgstr "" -#: kdiff3.cpp:540 +#: kdiff3.cpp:539 #, kde-format msgid "Saves the current document as..." msgstr "मौजूदा दस्तावेज़ ऐसे सहेजता है..." -#: kdiff3.cpp:543 +#: kdiff3.cpp:542 #, kde-format msgid "Print the differences" msgstr "" -#: kdiff3.cpp:546 +#: kdiff3.cpp:545 #, kde-format msgid "Quits the application" msgstr "अनुप्रयोग से बाहर होता है" -#: kdiff3.cpp:549 +#: kdiff3.cpp:548 #, kde-format msgid "Cuts the selected section and puts it to the clipboard" msgstr "" -#: kdiff3.cpp:552 +#: kdiff3.cpp:551 #, kde-format msgid "Copies the selected section to the clipboard" msgstr "चुने हुए अंश को क्लिपबोर्ड पर नक़ल करता है" -#: kdiff3.cpp:554 +#: kdiff3.cpp:553 #, fuzzy, kde-format #| msgid "Pastes the clipboard contents to actual position" msgid "Pastes the clipboard contents to current position" msgstr "क्लिपबोर्ड अवयवों को सही स्थान पर चिपकाता है" -#: kdiff3.cpp:557 +#: kdiff3.cpp:556 #, kde-format msgid "Select everything in current window" msgstr "" -#: kdiff3.cpp:560 +#: kdiff3.cpp:559 #, kde-format msgid "Search for a string" msgstr "स्ट्रिंग के लिए ढूंढें" -#: kdiff3.cpp:562 +#: kdiff3.cpp:561 #, kde-format msgid "Search again for the string" msgstr "स्ट्रिंग के लिए फिर से ढूंढें" -#: kdiff3.cpp:567 +#: kdiff3.cpp:566 #, kde-format msgid "Enables/disables the statusbar" msgstr "स्थिति-पट्टी सक्षम/अक्षम करें" -#: kdiff3.cpp:571 +#: kdiff3.cpp:570 #, kde-format msgid "Configure KDiff3..." msgstr "के-डिफ3 को कॉन्फ़िगर करें..." -#: kdiff3.cpp:590 +#: kdiff3.cpp:589 #, kde-format msgid "Go to Current Delta" msgstr "मौज़ूदा डेल्टा में जाएँ" -#: kdiff3.cpp:590 +#: kdiff3.cpp:589 #, fuzzy, kde-format msgid "" "Current\n" "Delta" msgstr "मौज़ूदा डेल्टा में जाएँ" -#: kdiff3.cpp:592 +#: kdiff3.cpp:591 #, kde-format msgid "Go to First Delta" msgstr "प्रथम डेल्टा में जाएँ" -#: kdiff3.cpp:592 +#: kdiff3.cpp:591 #, fuzzy, kde-format msgid "" "First\n" "Delta" msgstr "प्रथम डेल्टा में जाएँ" -#: kdiff3.cpp:594 +#: kdiff3.cpp:593 #, kde-format msgid "Go to Last Delta" msgstr "अंतिम डेल्टा में जाएँ" -#: kdiff3.cpp:594 +#: kdiff3.cpp:593 #, fuzzy, kde-format msgid "" "Last\n" "Delta" msgstr "अंतिम डेल्टा में जाएँ" -#: kdiff3.cpp:596 +#: kdiff3.cpp:595 #, kde-format msgid "(Skips white space differences when \"Show White Space\" is disabled.)" msgstr "" -#: kdiff3.cpp:597 +#: kdiff3.cpp:596 #, kde-format msgid "" "(Does not skip white space differences even when \"Show White Space\" is " "disabled.)" msgstr "" -#: kdiff3.cpp:598 +#: kdiff3.cpp:597 #, kde-format msgid "Go to Previous Delta" msgstr "पिछला डेल्टा में जाएँ" -#: kdiff3.cpp:598 +#: kdiff3.cpp:597 #, fuzzy, kde-format msgid "" "Prev\n" "Delta" msgstr "पिछला डेल्टा में जाएँ" -#: kdiff3.cpp:600 +#: kdiff3.cpp:599 #, kde-format msgid "Go to Next Delta" msgstr "अगला डेल्टा में जाएँ" -#: kdiff3.cpp:600 +#: kdiff3.cpp:599 #, fuzzy, kde-format msgid "" "Next\n" "Delta" msgstr "अगला डेल्टा में जाएँ" -#: kdiff3.cpp:602 +#: kdiff3.cpp:601 #, kde-format msgid "Go to Previous Conflict" msgstr "पिछले परस्पर विरोधों में जाएँ" -#: kdiff3.cpp:602 +#: kdiff3.cpp:601 #, fuzzy, kde-format msgid "" "Prev\n" "Conflict" msgstr "परस्पर विरोध" -#: kdiff3.cpp:604 +#: kdiff3.cpp:603 #, kde-format msgid "Go to Next Conflict" msgstr "अगले परस्पर विरोधों में जाएँ" -#: kdiff3.cpp:604 +#: kdiff3.cpp:603 #, fuzzy, kde-format msgid "" "Next\n" "Conflict" msgstr "अगले परस्पर विरोधों में जाएँ" -#: kdiff3.cpp:606 +#: kdiff3.cpp:605 #, kde-format msgid "Go to Previous Unsolved Conflict" msgstr "पिछले समाधान-रहित परस्पर विरोधों में जाएँ" -#: kdiff3.cpp:606 +#: kdiff3.cpp:605 #, fuzzy, kde-format msgid "" "Prev\n" "Unsolved" msgstr "हल नहीं" -#: kdiff3.cpp:608 +#: kdiff3.cpp:607 #, kde-format msgid "Go to Next Unsolved Conflict" msgstr "अगले समाधान-रहित परस्पर विरोधों में जाएँ" -#: kdiff3.cpp:608 +#: kdiff3.cpp:607 #, fuzzy, kde-format msgid "" "Next\n" "Unsolved" msgstr "हल नहीं" -#: kdiff3.cpp:610 +#: kdiff3.cpp:609 #, kde-format msgid "Select Line(s) From A" msgstr "अ से लाइन चुनें" -#: kdiff3.cpp:610 +#: kdiff3.cpp:609 #, kde-format msgid "" "Choose\n" "A" msgstr "" -#: kdiff3.cpp:611 +#: kdiff3.cpp:610 #, kde-format msgid "Select Line(s) From B" msgstr "ब से लाइन चुनें" -#: kdiff3.cpp:611 +#: kdiff3.cpp:610 #, kde-format msgid "" "Choose\n" "B" msgstr "" -#: kdiff3.cpp:612 +#: kdiff3.cpp:611 #, kde-format msgid "Select Line(s) From C" msgstr "स से लाइन चुनें" -#: kdiff3.cpp:612 +#: kdiff3.cpp:611 #, kde-format msgid "" "Choose\n" "C" msgstr "" -#: kdiff3.cpp:613 +#: kdiff3.cpp:612 #, kde-format msgid "Automatically Go to Next Unsolved Conflict After Source Selection" msgstr "" -#: kdiff3.cpp:613 +#: kdiff3.cpp:612 #, fuzzy, kde-format msgid "" "Auto\n" "Next" msgstr "स्वचालित नक़ल चयन" -#: kdiff3.cpp:615 +#: kdiff3.cpp:614 #, fuzzy, kde-format #| msgid "Show Space && Tabulator Characters for Differences" msgid "Show Space && Tabulator Characters" msgstr "भिन्नताओं के लिए टेबुलेटर अक्षर तथा जगह दिखाएँ " -#: kdiff3.cpp:615 +#: kdiff3.cpp:614 #, kde-format msgid "" "White\n" "Characters" msgstr "" -#: kdiff3.cpp:616 +#: kdiff3.cpp:615 #, kde-format msgid "Show White Space" msgstr "सफेद जगह दिखाएँ" -#: kdiff3.cpp:616 +#: kdiff3.cpp:615 #, kde-format msgid "" "White\n" "Deltas" msgstr "" -#: kdiff3.cpp:618 +#: kdiff3.cpp:617 #, kde-format msgid "Show Line Numbers" msgstr "पंक्ति क्रमांक दिखाएँ" -#: kdiff3.cpp:618 +#: kdiff3.cpp:617 #, fuzzy, kde-format msgid "" "Line\n" "Numbers" msgstr "पंक्ति क्रमांक दिखाएँ" -#: kdiff3.cpp:620 +#: kdiff3.cpp:619 #, kde-format msgid "Automatically Solve Simple Conflicts" msgstr "सादा परस्पर विरोधों का स्वचालित समाधान करें" -#: kdiff3.cpp:621 +#: kdiff3.cpp:620 #, kde-format msgid "Set Deltas to Conflicts" msgstr "डेल्टा को परस्पर विरोधों में सेट करें" -#: kdiff3.cpp:622 +#: kdiff3.cpp:621 #, kde-format msgid "Run Regular Expression Auto Merge" msgstr "" -#: kdiff3.cpp:623 +#: kdiff3.cpp:622 #, fuzzy, kde-format msgid "Automatically Solve History Conflicts" msgstr "सादा परस्पर विरोधों का स्वचालित समाधान करें" -#: kdiff3.cpp:624 +#: kdiff3.cpp:623 #, kde-format msgid "Split Diff At Selection" msgstr "" -#: kdiff3.cpp:625 +#: kdiff3.cpp:624 #, fuzzy, kde-format msgid "Join Selected Diffs" msgstr "चयनित फ़ाइल की तुलना करें" -#: kdiff3.cpp:627 +#: kdiff3.cpp:626 #, kde-format msgid "Show Window A" msgstr "विंडो अ दिखाएँ" -#: kdiff3.cpp:628 +#: kdiff3.cpp:627 #, kde-format msgid "Show Window B" msgstr "विंडो ब दिखाएँ" -#: kdiff3.cpp:629 +#: kdiff3.cpp:628 #, kde-format msgid "Show Window C" msgstr "विंडो स दिखाएँ" -#: kdiff3.cpp:631 +#: kdiff3.cpp:630 #, kde-format msgid "Normal Overview" msgstr "सामान्य ओवरव्यू" -#: kdiff3.cpp:632 +#: kdiff3.cpp:631 #, kde-format msgid "A vs. B Overview" msgstr "अ वि. ब ओवरव्यू" -#: kdiff3.cpp:633 +#: kdiff3.cpp:632 #, kde-format msgid "A vs. C Overview" msgstr "अ वि. स ओवरव्यू" -#: kdiff3.cpp:634 +#: kdiff3.cpp:633 #, kde-format msgid "B vs. C Overview" msgstr "ब वि. स ओवरव्यू" -#: kdiff3.cpp:635 +#: kdiff3.cpp:634 #, kde-format msgid "Word Wrap Diff Windows" msgstr "वर्ड व्रेप डिफ विंडोज़" -#: kdiff3.cpp:636 +#: kdiff3.cpp:635 #, kde-format msgid "Add Manual Diff Alignment" msgstr "" -#: kdiff3.cpp:637 +#: kdiff3.cpp:636 #, kde-format msgid "Clear All Manual Diff Alignments" msgstr "" -#: kdiff3.cpp:639 +#: kdiff3.cpp:638 #, kde-format msgid "Focus Next Window" msgstr "अगले विंडो पर फोकस" -#: kdiff3.cpp:640 +#: kdiff3.cpp:639 #, kde-format msgid "Focus Prev Window" msgstr "पिछले विंडो में फोकस" -#: kdiff3.cpp:641 +#: kdiff3.cpp:640 #, kde-format msgid "Toggle Split Orientation" msgstr "अलग करने की दिशा टॉगल करें" -#: kdiff3.cpp:643 +#: kdiff3.cpp:642 #, kde-format msgid "Dir && Text Split Screen View" msgstr "डिरेक्ट्री तथा पाठ स्प्लिट स्क्रीन दृश्य" -#: kdiff3.cpp:645 +#: kdiff3.cpp:644 #, kde-format msgid "Toggle Between Dir && Text View" msgstr "डिरेक्ट्री तथा पाठ दृश्य के बीच टॉगल करें" -#: kdiff3.cpp:697 pdiff.cpp:1909 +#: kdiff3.cpp:696 pdiff.cpp:1919 #, fuzzy, kde-format #| msgid "The merge result hasn't been saved." msgid "The merge result has not been saved." msgstr "सम्मिलित करने का परिणाम अभी सहेजा नहीं गया." -#: kdiff3.cpp:699 +#: kdiff3.cpp:698 #, kde-format msgid "Save && Quit" msgstr "सहेजें तथा बाहर हों" -#: kdiff3.cpp:700 +#: kdiff3.cpp:699 #, kde-format msgid "Quit Without Saving" msgstr "सहेजे बगैर बाहर हों" -#: kdiff3.cpp:708 pdiff.cpp:1920 +#: kdiff3.cpp:707 pdiff.cpp:1930 #, kde-format msgid "Saving the merge result failed." msgstr "सम्मिलित किया जाने का परिणाम सहेजना असफल." -#: kdiff3.cpp:719 pdiff.cpp:1032 +#: kdiff3.cpp:718 pdiff.cpp:1030 #, kde-format msgid "" "You are currently doing a directory merge. Are you sure, you want to abort?" msgstr "" -#: kdiff3.cpp:742 +#: kdiff3.cpp:741 #, kde-format msgid "Saving file..." msgstr "फ़ाइल सहेजा जा रहा है..." -#: kdiff3.cpp:759 +#: kdiff3.cpp:758 #, kde-format msgid "Saving file with a new filename..." msgstr "फ़ाइल नए फ़ाइलनाम के साथ सहेजा जा रहा है..." -#: kdiff3.cpp:761 +#: kdiff3.cpp:760 #, kde-format msgid "Save As..." msgstr "" -#: kdiff3.cpp:820 +#: kdiff3.cpp:819 #, fuzzy, kde-format msgid "Printing not implemented." msgstr "सम्मिलित करने की क्रिया पूरी हुई." -#: kdiff3.cpp:857 +#: kdiff3.cpp:858 #, fuzzy, kde-format msgid "Printing..." msgstr "बाहर हो रहे हैं..." -#: kdiff3.cpp:943 +#: kdiff3.cpp:948 #, kde-format msgid "Printing page %1 of %2" msgstr "" -#: kdiff3.cpp:1000 +#: kdiff3.cpp:1006 #, fuzzy, kde-format msgid " (Selection)" msgstr "अन्य फ़ॉन्ट चुनें" -#: kdiff3.cpp:1027 +#: kdiff3.cpp:1034 #, fuzzy, kde-format msgid "Printing completed." msgstr "सम्मिलित करने की क्रिया पूरी हुई." -#: kdiff3.cpp:1031 +#: kdiff3.cpp:1038 #, fuzzy, kde-format msgid "Printing aborted." msgstr "सम्मिलित करने की क्रिया पूरी हुई." -#: kdiff3.cpp:1038 +#: kdiff3.cpp:1045 #, kde-format msgid "Exiting..." msgstr "बाहर हो रहे हैं..." -#: kdiff3.cpp:1049 +#: kdiff3.cpp:1056 #, kde-format msgid "Toggling toolbar..." msgstr "टूलबार टॉगल किया जा रहा है..." -#: kdiff3.cpp:1070 +#: kdiff3.cpp:1077 #, kde-format msgid "Toggle the statusbar..." msgstr "स्थिति पट्टी टॉगल करें..." @@ -1539,7 +1544,7 @@ msgid "Joachim Eibl" msgstr "" -#: kdiff3_part.cpp:173 kdiff3_part.cpp:254 +#: kdiff3_part.cpp:174 kdiff3_part.cpp:255 #, fuzzy, kde-format #| msgid "Couldn't find files for comparison." msgid "Could not find files for comparison." @@ -1558,7 +1563,7 @@ msgstr "के-डिफ3 को कॉन्फ़िगर करें" #. i18n: ectx: ToolBar (mainToolBar) -#: kdiff3_part.rc:16 main.cpp:88 +#: kdiff3_part.rc:16 main.cpp:89 #, kde-format msgid "KDiff3" msgstr "के-डिफ3" @@ -1627,169 +1632,174 @@ msgid "Main Toolbar" msgstr "" -#: main.cpp:68 main.cpp:72 +#: main.cpp:69 main.cpp:73 #, kde-format msgid "Ignored. (User defined.)" msgstr "" -#: main.cpp:92 +#: main.cpp:93 #, kde-format msgid " (64 bit)" msgstr "" -#: main.cpp:94 +#: main.cpp:95 #, kde-format msgid " (32 bit)" msgstr "" -#: main.cpp:95 +#: main.cpp:96 #, kde-format msgid "Tool for Comparison and Merge of Files and Directories" msgstr "" -#: main.cpp:96 +#: main.cpp:97 #, kde-format msgid "(c) 2002-2014 Joachim Eibl, (c) 2017 Michael Reeves KF5/Qt5 port" msgstr "" -#: main.cpp:112 +#: main.cpp:113 #, kde-format msgid "Merge the input." msgstr "इनपुट सम्मिलित करें." -#: main.cpp:113 +#: main.cpp:114 #, kde-format msgid "Explicit base file. For compatibility with certain tools." msgstr "" -#: main.cpp:114 +#: main.cpp:115 #, kde-format msgid "Output file. Implies -m. E.g.: -o newfile.txt" msgstr "आउटपुट फ़ाइल. इम्प्लाइस -m. उदा.: -o newfile.txt" -#: main.cpp:115 +#: main.cpp:116 #, kde-format msgid "Output file, again. (For compatibility with certain tools.)" msgstr "आउटपुट फ़ाइल, फिर से. (कुछ औज़ारों के साथ कम्पेटिबिलिटी के लिए.)" -#: main.cpp:116 +#: main.cpp:118 #, kde-format msgid "No GUI if all conflicts are auto-solvable. (Needs -o file)" msgstr "" -#: main.cpp:117 +#: main.cpp:120 +#, fuzzy, kde-format +msgid "Ignored." +msgstr "केस अनदेखा करें" + +#: main.cpp:122 #, kde-format msgid "Do not solve conflicts automatically." msgstr "" -#: main.cpp:118 +#: main.cpp:123 #, kde-format msgid "Visible name replacement for input file 1 (base)." msgstr "इनपुट फ़ाइल 1 (आधार) के लिए विजिबल नाम रीप्लेसमेंट." -#: main.cpp:119 +#: main.cpp:124 #, kde-format msgid "Visible name replacement for input file 2." msgstr "इनपुट फ़ाइल 2 के लिए विजिबल नाम रीप्लेसमेंट." -#: main.cpp:120 +#: main.cpp:125 #, kde-format msgid "Visible name replacement for input file 3." msgstr "इनपुट फ़ाइल 3 के लिए विजिबल नाम रीप्लेसमेंट." -#: main.cpp:121 +#: main.cpp:126 #, kde-format msgid "Alternative visible name replacement. Supply this once for every input." msgstr "" -#: main.cpp:122 +#: main.cpp:127 #, kde-format msgid "" "Override a config setting. Use once for every setting. E.g.: --cs " "\"AutoAdvance=1\"" msgstr "" -#: main.cpp:123 +#: main.cpp:128 #, kde-format msgid "Show list of config settings and current values." msgstr "" -#: main.cpp:124 +#: main.cpp:129 #, fuzzy, kde-format msgid "Use a different config file." msgstr "भिन्न फ़ाइलों की संख्या:" -#: main.cpp:127 +#: main.cpp:132 #, kde-format msgid "file1 to open (base, if not specified via --base)" msgstr "खोलने के लिए फ़ाइल1 (आधार, यदि इसके द्वारा निर्दिष्ट नहीं --base)" -#: main.cpp:128 +#: main.cpp:133 #, kde-format msgid "file2 to open" msgstr "खोलने के लिए फ़ाइल2" -#: main.cpp:129 +#: main.cpp:134 #, kde-format msgid "file3 to open" msgstr "खोलने के लिए फ़ाइल3" -#: main.cpp:153 +#: main.cpp:158 #, kde-format msgid "See kdiff3 --help for supported options." msgstr "" -#: mergeresultwindow.cpp:158 +#: mergeresultwindow.cpp:171 #, kde-format msgid "Choose A Everywhere" msgstr "सभी जगह अ चुनें" -#: mergeresultwindow.cpp:159 +#: mergeresultwindow.cpp:172 #, kde-format msgid "Choose B Everywhere" msgstr "सभी जगह ब चुनें" -#: mergeresultwindow.cpp:160 +#: mergeresultwindow.cpp:173 #, kde-format msgid "Choose C Everywhere" msgstr "सभी जगह स चुनें" -#: mergeresultwindow.cpp:161 +#: mergeresultwindow.cpp:174 #, kde-format msgid "Choose A for All Unsolved Conflicts" msgstr "सभी समाधान-रहित परस्पर विरोधों के लिए अ चुनें" -#: mergeresultwindow.cpp:162 +#: mergeresultwindow.cpp:175 #, kde-format msgid "Choose B for All Unsolved Conflicts" msgstr "सभी समाधान-रहित परस्पर विरोधों के लिए ब चुनें" -#: mergeresultwindow.cpp:163 +#: mergeresultwindow.cpp:176 #, kde-format msgid "Choose C for All Unsolved Conflicts" msgstr "सभी समाधान-रहित परस्पर विरोधों के लिए स चुनें" -#: mergeresultwindow.cpp:164 +#: mergeresultwindow.cpp:177 #, kde-format msgid "Choose A for All Unsolved Whitespace Conflicts" msgstr "सभी समाधान-रहित सफेद-जगह परस्पर विरोधों के लिए अ चुनें" -#: mergeresultwindow.cpp:165 +#: mergeresultwindow.cpp:178 #, kde-format msgid "Choose B for All Unsolved Whitespace Conflicts" msgstr "सभी समाधान-रहित सफेद-जगह परस्पर विरोधों के लिए ब चुनें" -#: mergeresultwindow.cpp:166 +#: mergeresultwindow.cpp:179 #, kde-format msgid "Choose C for All Unsolved Whitespace Conflicts" msgstr "सभी समाधान-रहित सफेद-जगह परस्पर विरोधों के लिए स चुनें" -#: mergeresultwindow.cpp:176 +#: mergeresultwindow.cpp:204 #, fuzzy, kde-format msgid "Number of remaining unsolved conflicts: %1 (of which %2 are whitespace)" msgstr "बचे हुए समाधान-रहित विरोधाभासों की संख्या: %1" -#: mergeresultwindow.cpp:370 +#: mergeresultwindow.cpp:398 #, kde-format msgid "" "The output has been modified.\n" @@ -1798,29 +1808,29 @@ "आउटपुट परिवर्धित किया जा चुका है.\n" "यदि आप जारी रखते हैं तो आपके परिवर्तन खो जाएँगे." -#: mergeresultwindow.cpp:936 pdiff.cpp:827 +#: mergeresultwindow.cpp:964 pdiff.cpp:817 #, kde-format msgid "All input files are binary equal." msgstr "सभी इनपुट फ़ाइलें बाइनरी समान हैं." -#: mergeresultwindow.cpp:938 +#: mergeresultwindow.cpp:966 #, kde-format msgid "All input files contain the same text." msgstr "सभी इनपुट फ़ाइलें एक ही पाठ रखे हैं." -#: mergeresultwindow.cpp:942 mergeresultwindow.cpp:946 -#: mergeresultwindow.cpp:950 pdiff.cpp:833 pdiff.cpp:837 pdiff.cpp:841 +#: mergeresultwindow.cpp:970 mergeresultwindow.cpp:974 +#: mergeresultwindow.cpp:978 pdiff.cpp:823 pdiff.cpp:827 pdiff.cpp:831 #, fuzzy, kde-format msgid "Files %1 and %2 are binary equal.\n" msgstr "फ़ाइलें ब तथा स बाइनरी समान हैं.\n" -#: mergeresultwindow.cpp:944 mergeresultwindow.cpp:948 -#: mergeresultwindow.cpp:952 +#: mergeresultwindow.cpp:972 mergeresultwindow.cpp:976 +#: mergeresultwindow.cpp:980 #, fuzzy, kde-format msgid "Files %1 and %2 have equal text.\n" msgstr "फ़ाइलें अ तथा ब में पाठ समान हैं.\n" -#: mergeresultwindow.cpp:958 +#: mergeresultwindow.cpp:986 #, kde-format msgid "" "Total number of conflicts: %1\n" @@ -1829,27 +1839,27 @@ "%4" msgstr "" -#: mergeresultwindow.cpp:964 +#: mergeresultwindow.cpp:992 #, kde-format msgid "Conflicts" msgstr "परस्पर विरोध" -#: mergeresultwindow.cpp:1873 +#: mergeresultwindow.cpp:1901 #, kde-format msgid "" msgstr "<कोई स्रोत पंक्ति नहीं>" -#: mergeresultwindow.cpp:1881 +#: mergeresultwindow.cpp:1909 #, fuzzy, kde-format msgid "" msgstr "<विरोधाभास सम्मिलित करें>" -#: mergeresultwindow.cpp:1883 mergeresultwindow.cpp:2755 +#: mergeresultwindow.cpp:1911 mergeresultwindow.cpp:2783 #, kde-format msgid "" msgstr "<विरोधाभास सम्मिलित करें>" -#: mergeresultwindow.cpp:2967 +#: mergeresultwindow.cpp:2995 #, fuzzy, kde-format #| msgid "" #| "Not all conflicts are solved yet.\n" @@ -1861,12 +1871,12 @@ "अब तक सभी विरोधाभासों का समाधान नहीं किया गया है.\n" "फ़ाइल सहेजा नहीं गया.\n" -#: mergeresultwindow.cpp:2969 mergeresultwindow.cpp:2978 +#: mergeresultwindow.cpp:2997 mergeresultwindow.cpp:3006 #, kde-format msgid "Conflicts Left" msgstr "विरोधाभास बायाँ " -#: mergeresultwindow.cpp:2976 +#: mergeresultwindow.cpp:3004 #, kde-format msgid "" "There is a line end style conflict. Please choose the line end style " @@ -1874,7 +1884,7 @@ "File not saved." msgstr "" -#: mergeresultwindow.cpp:2990 +#: mergeresultwindow.cpp:3018 #, kde-format msgid "" "\n" @@ -1882,59 +1892,59 @@ "Creating backup failed. File not saved." msgstr "" -#: mergeresultwindow.cpp:2990 mergeresultwindow.cpp:3038 +#: mergeresultwindow.cpp:3018 mergeresultwindow.cpp:3066 #, kde-format msgid "File Save Error" msgstr "फ़ाइल सहेजने में त्रुटि" -#: mergeresultwindow.cpp:3038 +#: mergeresultwindow.cpp:3066 #, kde-format msgid "Error while writing." msgstr "लिखने के दौरान त्रुटि." -#: mergeresultwindow.cpp:3110 +#: mergeresultwindow.cpp:3138 #, fuzzy, kde-format #| msgid "Output" msgid "Output:" msgstr "आउटपुट" -#: mergeresultwindow.cpp:3123 mergeresultwindow.cpp:3315 +#: mergeresultwindow.cpp:3151 mergeresultwindow.cpp:3343 #, kde-format msgid "[Modified]" msgstr "[परिवर्धित]" -#: mergeresultwindow.cpp:3130 +#: mergeresultwindow.cpp:3158 #, kde-format msgid "Encoding for saving:" msgstr "" -#: mergeresultwindow.cpp:3230 +#: mergeresultwindow.cpp:3258 #, fuzzy, kde-format #| msgid "Conflicts" msgid "Conflict" msgstr "परस्पर विरोध" -#: mergeresultwindow.cpp:3262 +#: mergeresultwindow.cpp:3290 #, kde-format msgid "Codec from A: %1" msgstr "" -#: mergeresultwindow.cpp:3264 +#: mergeresultwindow.cpp:3292 #, kde-format msgid "Codec from B: %1" msgstr "" -#: mergeresultwindow.cpp:3266 +#: mergeresultwindow.cpp:3294 #, kde-format msgid "Codec from C: %1" msgstr "" -#: optiondialog.cpp:119 +#: optiondialog.cpp:121 #, kde-format msgid "Change Font" msgstr "" -#: optiondialog.cpp:135 optiondialog.cpp:145 +#: optiondialog.cpp:137 optiondialog.cpp:147 #, kde-format msgid "" "Font: %1, %2, %3\n" @@ -1942,208 +1952,208 @@ "Example:" msgstr "" -#: optiondialog.cpp:388 +#: optiondialog.cpp:390 #, kde-format msgid "Unicode" msgstr "" -#: optiondialog.cpp:389 +#: optiondialog.cpp:391 #, kde-format msgid "Latin1" msgstr "" -#: optiondialog.cpp:408 +#: optiondialog.cpp:410 #, kde-format msgid "Change this if non-ASCII characters are not displayed correctly." msgstr "" -#: optiondialog.cpp:491 +#: optiondialog.cpp:495 #, fuzzy, kde-format msgid "Configure" msgstr "कॉन्फ़िगर...." -#: optiondialog.cpp:568 +#: optiondialog.cpp:573 #, kde-format msgid "Font" msgstr "" -#: optiondialog.cpp:570 +#: optiondialog.cpp:575 #, kde-format msgid "Editor & Diff Output Font" msgstr "संपादक तथा डिफ़ आउटपुट फ़ॉन्ट" -#: optiondialog.cpp:589 +#: optiondialog.cpp:594 #, kde-format msgid "Application font" msgstr "" -#: optiondialog.cpp:594 +#: optiondialog.cpp:599 #, fuzzy, kde-format #| msgid "File Save Error" msgid "File view font" msgstr "फ़ाइल सहेजने में त्रुटि" -#: optiondialog.cpp:613 +#: optiondialog.cpp:618 #, fuzzy, kde-format #| msgid "Color" msgctxt "Title for color settings page" msgid "Color" msgstr "रंग" -#: optiondialog.cpp:614 +#: optiondialog.cpp:619 #, fuzzy, kde-format msgid "Colors Settings" msgstr "क्षेत्रीय विन्यास" -#: optiondialog.cpp:631 +#: optiondialog.cpp:644 #, kde-format msgid "Editor and Diff Views:" msgstr "" -#: optiondialog.cpp:639 +#: optiondialog.cpp:652 #, kde-format msgid "Foreground color:" msgstr "अग्रभूमि का रंगः" -#: optiondialog.cpp:647 +#: optiondialog.cpp:660 #, kde-format msgid "Background color:" msgstr "पृष्ठभूमि का रंगः" -#: optiondialog.cpp:657 +#: optiondialog.cpp:670 #, kde-format msgid "Diff background color:" msgstr "डिफ पृष्ठभूमि रंगः" -#: optiondialog.cpp:666 +#: optiondialog.cpp:679 #, kde-format msgid "Color A:" msgstr "रंग अ:" -#: optiondialog.cpp:675 +#: optiondialog.cpp:688 #, kde-format msgid "Color B:" msgstr "रंग ब:" -#: optiondialog.cpp:684 +#: optiondialog.cpp:697 #, kde-format msgid "Color C:" msgstr "रंग स:" -#: optiondialog.cpp:692 +#: optiondialog.cpp:705 #, kde-format msgid "Conflict color:" msgstr "विरोधाभास के लिए रंग:" -#: optiondialog.cpp:701 +#: optiondialog.cpp:714 #, kde-format msgid "Current range background color:" msgstr "वर्तमान सीमा पृष्ठभूमि रंग:" -#: optiondialog.cpp:710 +#: optiondialog.cpp:723 #, kde-format msgid "Current range diff background color:" msgstr "वर्तमान सीमा डिफ पृष्ठभूमि रंग:" -#: optiondialog.cpp:718 +#: optiondialog.cpp:731 #, kde-format msgid "Color for manually aligned difference ranges:" msgstr "" -#: optiondialog.cpp:725 +#: optiondialog.cpp:738 #, fuzzy, kde-format msgid "Directory Comparison View:" msgstr "डिरेक्ट्री तुलना स्थिति" -#: optiondialog.cpp:731 +#: optiondialog.cpp:744 #, kde-format msgid "Newest file color:" msgstr "" -#: optiondialog.cpp:736 +#: optiondialog.cpp:749 #, kde-format msgid "" "Changing this color will only be effective when starting the next directory " "comparison." msgstr "" -#: optiondialog.cpp:741 +#: optiondialog.cpp:754 #, kde-format msgid "Oldest file color:" msgstr "" -#: optiondialog.cpp:750 +#: optiondialog.cpp:763 #, kde-format msgid "Middle age file color:" msgstr "" -#: optiondialog.cpp:759 +#: optiondialog.cpp:772 #, kde-format msgid "Color for missing files:" msgstr "" -#: optiondialog.cpp:773 +#: optiondialog.cpp:786 #, kde-format msgid "Editor" msgstr "संपादक" -#: optiondialog.cpp:774 +#: optiondialog.cpp:787 #, kde-format msgid "Editor Behavior" msgstr "संपादक व्यवहार" -#: optiondialog.cpp:787 +#: optiondialog.cpp:809 #, kde-format msgid "Tab inserts spaces" msgstr "टैब जगह प्रविष्ट करता है" -#: optiondialog.cpp:791 +#: optiondialog.cpp:813 #, kde-format msgid "" "On: Pressing tab generates the appropriate number of spaces.\n" "Off: A tab character will be inserted." msgstr "" -#: optiondialog.cpp:796 +#: optiondialog.cpp:818 #, kde-format msgid "Tab size:" msgstr "टैब आकारः" -#: optiondialog.cpp:803 +#: optiondialog.cpp:825 #, kde-format msgid "Auto indentation" msgstr "स्वचालित हाशिया छोड़ना" -#: optiondialog.cpp:807 +#: optiondialog.cpp:829 #, kde-format msgid "On: The indentation of the previous line is used for a new line.\n" msgstr "" -#: optiondialog.cpp:810 +#: optiondialog.cpp:832 #, kde-format msgid "Auto copy selection" msgstr "स्वचालित नक़ल चयन" -#: optiondialog.cpp:814 +#: optiondialog.cpp:836 #, kde-format msgid "" "On: Any selection is immediately written to the clipboard.\n" "Off: You must explicitly copy e.g. via Ctrl-C." msgstr "" -#: optiondialog.cpp:829 +#: optiondialog.cpp:851 #, kde-format msgid "" "Sets the line endings for when an edited file is saved.\n" "DOS/Windows: CR+LF; UNIX: LF; with CR=0D, LF=0A" msgstr "" -#: optiondialog.cpp:839 +#: optiondialog.cpp:861 #, fuzzy, kde-format msgid "Diff" msgstr "के-डिफ3" -#: optiondialog.cpp:840 +#: optiondialog.cpp:862 #, fuzzy, kde-format msgid "Diff Settings" msgstr "डिफ तथा सम्मिलित करने का विन्यास" @@ -2157,12 +2167,12 @@ #. ); #. ++line; #. -#: optiondialog.cpp:865 +#: optiondialog.cpp:896 #, fuzzy, kde-format msgid "Ignore numbers (treat as white space)" msgstr "C/C++ कमेंट्स को सफेद जगह के रूप में समझें" -#: optiondialog.cpp:869 +#: optiondialog.cpp:900 #, kde-format msgid "" "Ignore number characters during line matching phase. (Similar to Ignore " @@ -2170,67 +2180,67 @@ "Might help to compare files with numeric data." msgstr "" -#: optiondialog.cpp:873 +#: optiondialog.cpp:904 #, fuzzy, kde-format #| msgid "Treat C/C++ comments like white space." msgid "Ignore C/C++ comments (treat as white space)" msgstr "C/C++ कमेंट्स को सफेद जगह के रूप में समझें" -#: optiondialog.cpp:876 +#: optiondialog.cpp:907 #, kde-format msgid "Treat C/C++ comments like white space." msgstr "C/C++ कमेंट्स को सफेद जगह के रूप में समझें" -#: optiondialog.cpp:879 +#: optiondialog.cpp:910 #, fuzzy, kde-format msgid "Ignore case (treat as white space)" msgstr "C/C++ कमेंट्स को सफेद जगह के रूप में समझें" -#: optiondialog.cpp:883 +#: optiondialog.cpp:914 #, kde-format msgid "Treat case differences like white space changes. ('a'<=>'A')" msgstr "केस डिफरेंसेस को सफेद जगह परिवर्तन के रूप में समझें. ('a'<=>'A')" -#: optiondialog.cpp:886 +#: optiondialog.cpp:917 #, kde-format msgid "Preprocessor command:" msgstr "प्री-प्रोसेसर कमांड:" -#: optiondialog.cpp:891 +#: optiondialog.cpp:922 #, kde-format msgid "User defined pre-processing. (See the docs for details.)" msgstr "उपयोक्ता पारिभाषित प्री-प्रोसेसिंग. (विवरण के लिए दस्तावेज़ देखें.)" -#: optiondialog.cpp:894 +#: optiondialog.cpp:925 #, kde-format msgid "Line-matching preprocessor command:" msgstr "लाइन-मैचिंग प्री-प्रोसेसर कमांड:" -#: optiondialog.cpp:899 +#: optiondialog.cpp:930 #, kde-format msgid "" "This pre-processor is only used during line matching.\n" "(See the docs for details.)" msgstr "" -#: optiondialog.cpp:902 +#: optiondialog.cpp:933 #, kde-format msgid "Try hard (slower)" msgstr "गंभीर कोशिश करें (धीमा)" -#: optiondialog.cpp:906 +#: optiondialog.cpp:937 #, kde-format msgid "" "Enables the --minimal option for the external diff.\n" "The analysis of big files will be much slower." msgstr "" -#: optiondialog.cpp:910 +#: optiondialog.cpp:941 #, kde-format msgid "Align B and C for 3 input files" msgstr "" -#: optiondialog.cpp:914 +#: optiondialog.cpp:945 #, kde-format msgid "" "Try to align B and C when comparing or merging three input files.\n" @@ -2238,67 +2248,74 @@ "(Default is off.)" msgstr "" -#: optiondialog.cpp:926 +#: optiondialog.cpp:956 +#, fuzzy, kde-format +#| msgid "Merge" +msgctxt "Settings page" +msgid "Merge" +msgstr "सम्मिलित करें" + +#: optiondialog.cpp:957 #, fuzzy, kde-format msgid "Merge Settings" msgstr "डिफ तथा सम्मिलित करने का विन्यास" -#: optiondialog.cpp:940 +#: optiondialog.cpp:980 #, kde-format msgid "Auto advance delay (ms):" msgstr "स्वचालित एडवान्स देरी (मि.से.):" -#: optiondialog.cpp:946 +#: optiondialog.cpp:986 #, kde-format 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 "" -#: optiondialog.cpp:950 +#: optiondialog.cpp:990 #, fuzzy, kde-format #| msgid "Show Window A" msgid "Show info dialogs" msgstr "विंडो अ दिखाएँ" -#: optiondialog.cpp:953 +#: optiondialog.cpp:993 #, kde-format msgid "Show a dialog with information about the number of conflicts." msgstr "" -#: optiondialog.cpp:956 +#: optiondialog.cpp:996 #, kde-format msgid "White space 2-file merge default:" msgstr "सफेद जगह 2-फ़ाइल सम्मिलित डिफ़ॉल्ट:" -#: optiondialog.cpp:961 optiondialog.cpp:974 +#: optiondialog.cpp:1001 optiondialog.cpp:1014 #, kde-format msgid "Manual Choice" msgstr "हस्तचालित चुनाव" -#: optiondialog.cpp:965 optiondialog.cpp:979 +#: optiondialog.cpp:1005 optiondialog.cpp:1019 #, kde-format msgid "" "Allow the merge algorithm to automatically select an input for white-space-" "only changes." msgstr "" -#: optiondialog.cpp:969 +#: optiondialog.cpp:1009 #, kde-format msgid "White space 3-file merge default:" msgstr "सफेद जगह 3-फ़ाइल सम्मिलित डिफ़ॉल्ट:" -#: optiondialog.cpp:983 +#: optiondialog.cpp:1023 #, kde-format msgid "Automatic Merge Regular Expression" msgstr "" -#: optiondialog.cpp:991 smalldialogs.cpp:449 +#: optiondialog.cpp:1031 smalldialogs.cpp:459 #, kde-format msgid "Auto merge regular expression:" msgstr "" -#: optiondialog.cpp:996 +#: optiondialog.cpp:1036 #, kde-format msgid "" "Regular expression for lines where KDiff3 should automatically choose one " @@ -2307,29 +2324,29 @@ "- if available - C, otherwise B will be chosen." msgstr "" -#: optiondialog.cpp:1002 +#: optiondialog.cpp:1042 #, kde-format msgid "Run regular expression auto merge on merge start" msgstr "" -#: optiondialog.cpp:1005 +#: optiondialog.cpp:1045 #, kde-format msgid "" "Run the merge for auto merge regular expressions\n" "immediately when a merge starts.\n" msgstr "" -#: optiondialog.cpp:1010 +#: optiondialog.cpp:1050 #, kde-format msgid "Version Control History Merging" msgstr "" -#: optiondialog.cpp:1018 smalldialogs.cpp:476 +#: optiondialog.cpp:1058 smalldialogs.cpp:486 #, kde-format msgid "History start regular expression:" msgstr "" -#: optiondialog.cpp:1023 +#: optiondialog.cpp:1063 #, kde-format msgid "" "Regular expression for the start of the version control history entry.\n" @@ -2337,12 +2354,12 @@ "Default value: \".*\\$Log.*\\$.*\"" msgstr "" -#: optiondialog.cpp:1029 smalldialogs.cpp:504 +#: optiondialog.cpp:1069 smalldialogs.cpp:514 #, kde-format msgid "History entry start regular expression:" msgstr "" -#: optiondialog.cpp:1042 +#: optiondialog.cpp:1082 #, kde-format msgid "" "A version control history entry consists of several lines.\n" @@ -2354,22 +2371,22 @@ "See the documentation for details." msgstr "" -#: optiondialog.cpp:1050 +#: optiondialog.cpp:1090 #, kde-format msgid "History merge sorting" msgstr "" -#: optiondialog.cpp:1053 +#: optiondialog.cpp:1093 #, kde-format msgid "Sort version control history by a key." msgstr "" -#: optiondialog.cpp:1063 +#: optiondialog.cpp:1103 #, kde-format msgid "History entry start sort key order:" msgstr "" -#: optiondialog.cpp:1068 +#: optiondialog.cpp:1108 #, kde-format msgid "" "Each pair of parentheses used in the regular expression for the history " @@ -2381,37 +2398,37 @@ "See the documentation for details." msgstr "" -#: optiondialog.cpp:1079 +#: optiondialog.cpp:1119 #, kde-format msgid "Merge version control history on merge start" msgstr "" -#: optiondialog.cpp:1082 +#: optiondialog.cpp:1122 #, kde-format msgid "Run version control history automerge on merge start." msgstr "" -#: optiondialog.cpp:1086 +#: optiondialog.cpp:1126 #, fuzzy, kde-format msgid "Max number of history entries:" msgstr "सबडिरेक्ट्रीज़ की संख्या:" -#: optiondialog.cpp:1090 +#: optiondialog.cpp:1130 #, kde-format msgid "Cut off after specified number. Use -1 for infinite number of entries." msgstr "" -#: optiondialog.cpp:1094 +#: optiondialog.cpp:1134 #, kde-format msgid "Test your regular expressions" msgstr "" -#: optiondialog.cpp:1099 +#: optiondialog.cpp:1139 #, kde-format msgid "Irrelevant merge command:" msgstr "" -#: optiondialog.cpp:1104 +#: optiondialog.cpp:1144 #, kde-format msgid "" "If specified this script is run after automerge\n" @@ -2419,12 +2436,12 @@ "Called with the parameters: filename1 filename2 filename3" msgstr "" -#: optiondialog.cpp:1109 +#: optiondialog.cpp:1149 #, kde-format msgid "Auto save and quit on merge without conflicts" msgstr "" -#: optiondialog.cpp:1113 +#: optiondialog.cpp:1153 #, kde-format msgid "" "If KDiff3 was started for a file-merge from the command line and all\n" @@ -2433,28 +2450,28 @@ "(Similar to command line option \"--auto\".)" msgstr "" -#: optiondialog.cpp:1124 optiondialog.cpp:1125 +#: optiondialog.cpp:1164 optiondialog.cpp:1165 #, fuzzy, kde-format #| msgid "&Directory" msgid "Directory" msgstr "डिरेक्ट्री (&D)" -#: optiondialog.cpp:1137 +#: optiondialog.cpp:1185 #, kde-format msgid "Recursive directories" msgstr "डिरेक्ट्रीज़ रिकर्सिव करें" -#: optiondialog.cpp:1140 +#: optiondialog.cpp:1188 #, kde-format msgid "Whether to analyze subdirectories or not." msgstr "क्या सबडिरेक्ट्रीज़ को विश्लेषण करना है या नहीं. " -#: optiondialog.cpp:1142 +#: optiondialog.cpp:1190 #, kde-format msgid "File pattern(s):" msgstr "फ़ाइल पैटर्न:" -#: optiondialog.cpp:1148 +#: optiondialog.cpp:1196 #, kde-format msgid "" "Pattern(s) of files to be analyzed. \n" @@ -2462,12 +2479,12 @@ "Several Patterns can be specified by using the separator: ';'" msgstr "" -#: optiondialog.cpp:1153 +#: optiondialog.cpp:1201 #, kde-format msgid "File-anti-pattern(s):" msgstr "फ़ाइल-एन्टी-पैटर्न:" -#: optiondialog.cpp:1159 +#: optiondialog.cpp:1207 #, kde-format msgid "" "Pattern(s) of files to be excluded from analysis. \n" @@ -2475,12 +2492,12 @@ "Several Patterns can be specified by using the separator: ';'" msgstr "" -#: optiondialog.cpp:1164 +#: optiondialog.cpp:1212 #, kde-format msgid "Dir-anti-pattern(s):" msgstr "डिर-एन्टी-पैटर्न:" -#: optiondialog.cpp:1170 +#: optiondialog.cpp:1218 #, kde-format msgid "" "Pattern(s) of directories to be excluded from analysis. \n" @@ -2488,59 +2505,59 @@ "Several Patterns can be specified by using the separator: ';'" msgstr "" -#: optiondialog.cpp:1175 +#: optiondialog.cpp:1223 #, kde-format msgid "Use .cvsignore" msgstr ".cvsignore का उपयोग करें" -#: optiondialog.cpp:1179 +#: optiondialog.cpp:1227 #, kde-format msgid "" "Extends the antipattern to anything that would be ignored by CVS.\n" "Via local \".cvsignore\" files this can be directory specific." msgstr "" -#: optiondialog.cpp:1183 +#: optiondialog.cpp:1231 #, kde-format msgid "Find hidden files and directories" msgstr "छुपी फ़ाइलों तथा डिरेक्ट्रीज़ ढूंढें" -#: optiondialog.cpp:1186 +#: optiondialog.cpp:1234 #, fuzzy, kde-format #| msgid "Find hidden files and directories" msgid "Finds hidden files and directories." msgstr "छुपी फ़ाइलों तथा डिरेक्ट्रीज़ ढूंढें" -#: optiondialog.cpp:1189 +#: optiondialog.cpp:1237 #, kde-format msgid "Follow file links" msgstr "फ़ाइल कड़ियों का अनुसरण करें" -#: optiondialog.cpp:1193 +#: optiondialog.cpp:1241 #, kde-format msgid "" "On: Compare the file the link points to.\n" "Off: Compare the links." msgstr "" -#: optiondialog.cpp:1197 +#: optiondialog.cpp:1245 #, kde-format msgid "Follow directory links" msgstr "डिरेक्ट्री कड़ियों का अनुसरण करें" -#: optiondialog.cpp:1201 +#: optiondialog.cpp:1249 #, kde-format msgid "" "On: Compare the directory the link points to.\n" "Off: Compare the links." msgstr "" -#: optiondialog.cpp:1210 +#: optiondialog.cpp:1258 #, kde-format msgid "Case sensitive filename comparison" msgstr "" -#: optiondialog.cpp:1214 +#: optiondialog.cpp:1262 #, kde-format msgid "" "The directory comparison will compare files or directories when their names " @@ -2549,64 +2566,64 @@ "off, otherwise on.)" msgstr "" -#: optiondialog.cpp:1218 +#: optiondialog.cpp:1266 #, fuzzy, kde-format #| msgid "Unfold All Subdirs" msgid "Unfold all subdirectories on load" msgstr "सभी सबडिरेक्ट्रीज अनफ़ोल्ड करें" -#: optiondialog.cpp:1222 +#: optiondialog.cpp:1270 #, kde-format msgid "" "On: Unfold all subdirectories when starting a directory diff.\n" "Off: Leave subdirectories folded." msgstr "" -#: optiondialog.cpp:1226 +#: optiondialog.cpp:1274 #, kde-format msgid "Skip directory status report" msgstr "" -#: optiondialog.cpp:1230 +#: optiondialog.cpp:1278 #, kde-format msgid "" "On: Do not show the Directory Comparison Status.\n" "Off: Show the status dialog on start." msgstr "" -#: optiondialog.cpp:1234 +#: optiondialog.cpp:1282 #, kde-format msgid "File Comparison Mode" msgstr "फ़ाइल तुलना मोड" -#: optiondialog.cpp:1239 +#: optiondialog.cpp:1287 #, kde-format msgid "Binary comparison" msgstr "बाइनरी तुलना" -#: optiondialog.cpp:1241 +#: optiondialog.cpp:1289 #, kde-format msgid "Binary comparison of each file. (Default)" msgstr "प्रत्येक फ़ाइल की बाइनरी तुलना. (डिफ़ॉल्ट)" -#: optiondialog.cpp:1244 +#: optiondialog.cpp:1292 #, kde-format msgid "Full analysis" msgstr "पूर्ण विश्लेषण" -#: optiondialog.cpp:1246 +#: optiondialog.cpp:1294 #, kde-format msgid "" "Do a full analysis and show statistics information in extra columns.\n" "(Slower than a binary comparison, much slower for binary files.)" msgstr "" -#: optiondialog.cpp:1250 +#: optiondialog.cpp:1298 #, fuzzy, kde-format msgid "Trust the size and modification date (unsafe)" msgstr "परिवर्धन तारीख पर भरोसा करें (असुरक्षित)" -#: optiondialog.cpp:1252 +#: optiondialog.cpp:1300 #, kde-format msgid "" "Assume that files are equal if the modification date and file length are " @@ -2616,14 +2633,14 @@ "Useful for big directories or slow networks." msgstr "" -#: optiondialog.cpp:1257 +#: optiondialog.cpp:1305 #, fuzzy, kde-format msgid "" "Trust the size and date, but use binary comparison if date does not match " "(unsafe)" msgstr "परिवर्धन तारीख पर भरोसा करें (असुरक्षित)" -#: optiondialog.cpp:1259 +#: optiondialog.cpp:1307 #, kde-format msgid "" "Assume that files are equal if the modification date and file length are " @@ -2632,12 +2649,12 @@ "Useful for big directories or slow networks." msgstr "" -#: optiondialog.cpp:1264 +#: optiondialog.cpp:1312 #, kde-format msgid "Trust the size (unsafe)" msgstr "आकार पर भरोसा करें (असुरक्षित)" -#: optiondialog.cpp:1266 +#: optiondialog.cpp:1314 #, kde-format msgid "" "Assume that files are equal if their file lengths are equal.\n" @@ -2645,12 +2662,12 @@ "download." msgstr "" -#: optiondialog.cpp:1273 +#: optiondialog.cpp:1321 #, kde-format msgid "Synchronize directories" msgstr "डिरेक्ट्रीज़ सिंक्रोनाइज़ करें" -#: optiondialog.cpp:1277 +#: optiondialog.cpp:1325 #, kde-format msgid "" "Offers to store files in both directories so that\n" @@ -2658,24 +2675,24 @@ "Works only when comparing two directories without specifying a destination." msgstr "" -#: optiondialog.cpp:1283 +#: optiondialog.cpp:1331 #, fuzzy, kde-format msgid "White space differences considered equal" msgstr "सफेद जगह 3-फ़ाइल सम्मिलित डिफ़ॉल्ट:" -#: optiondialog.cpp:1287 +#: optiondialog.cpp:1335 #, kde-format msgid "" "If files differ only by white space consider them equal.\n" "This is only active when full analysis is chosen." msgstr "" -#: optiondialog.cpp:1293 +#: optiondialog.cpp:1341 #, kde-format msgid "Copy newer instead of merging (unsafe)" msgstr "सम्मिलित करने के बजाए नए की नक़ल करें (असुरक्षित)" -#: optiondialog.cpp:1297 +#: optiondialog.cpp:1345 #, kde-format msgid "" "Do not look inside, just take the newer file.\n" @@ -2683,46 +2700,46 @@ "Only effective when comparing two directories." msgstr "" -#: optiondialog.cpp:1302 +#: optiondialog.cpp:1350 #, kde-format msgid "Backup files (.orig)" msgstr "बैकअप फ़ाइलें (.orig)" -#: optiondialog.cpp:1306 +#: optiondialog.cpp:1354 #, kde-format msgid "" "If 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 "" -#: optiondialog.cpp:1382 optiondialog.cpp:1383 +#: optiondialog.cpp:1430 optiondialog.cpp:1431 #, kde-format msgid "Regional Settings" msgstr "क्षेत्रीय विन्यास" -#: optiondialog.cpp:1397 +#: optiondialog.cpp:1454 #, kde-format msgid "Use the same encoding for everything:" msgstr "" -#: optiondialog.cpp:1401 +#: optiondialog.cpp:1458 #, kde-format msgid "" "Enable this allows to change all encodings by changing the first only.\n" "Disable this if different individual settings are needed." msgstr "" -#: optiondialog.cpp:1405 +#: optiondialog.cpp:1462 #, fuzzy, kde-format msgid "Note: Local Encoding is \"%1\"" msgstr "स्थानीय एनकोडिंग इस्तेमाल करें" -#: optiondialog.cpp:1409 +#: optiondialog.cpp:1466 #, kde-format msgid "File Encoding for A:" msgstr "" -#: optiondialog.cpp:1416 +#: optiondialog.cpp:1473 #, kde-format msgid "" "If enabled then Unicode (UTF-16 or UTF-8) encoding will be detected.\n" @@ -2731,32 +2748,32 @@ "(Unicode detection depends on the first bytes of a file.)" msgstr "" -#: optiondialog.cpp:1419 optiondialog.cpp:1430 optiondialog.cpp:1441 +#: optiondialog.cpp:1476 optiondialog.cpp:1487 optiondialog.cpp:1498 #, kde-format msgid "Auto Detect Unicode" msgstr "" -#: optiondialog.cpp:1425 +#: optiondialog.cpp:1482 #, kde-format msgid "File Encoding for B:" msgstr "" -#: optiondialog.cpp:1436 +#: optiondialog.cpp:1493 #, kde-format msgid "File Encoding for C:" msgstr "" -#: optiondialog.cpp:1447 +#: optiondialog.cpp:1504 #, kde-format msgid "File Encoding for Merge Output and Saving:" msgstr "" -#: optiondialog.cpp:1452 +#: optiondialog.cpp:1509 #, fuzzy, kde-format msgid "Auto Select" msgstr "स्वचालित नक़ल चयन" -#: optiondialog.cpp:1456 +#: optiondialog.cpp:1513 #, kde-format msgid "" "If enabled then the encoding from the input files is used.\n" @@ -2764,39 +2781,39 @@ "saving." msgstr "" -#: optiondialog.cpp:1459 +#: optiondialog.cpp:1516 #, kde-format msgid "File Encoding for Preprocessor Files:" msgstr "" -#: optiondialog.cpp:1471 +#: optiondialog.cpp:1528 #, kde-format msgid "Right To Left Language" msgstr "" -#: optiondialog.cpp:1475 +#: optiondialog.cpp:1532 #, kde-format msgid "" "Some languages are read from right to left.\n" "This setting will change the viewer and editor accordingly." msgstr "" -#: optiondialog.cpp:1485 +#: optiondialog.cpp:1542 #, fuzzy, kde-format msgid "Integration" msgstr "ऑपरेशन" -#: optiondialog.cpp:1486 +#: optiondialog.cpp:1543 #, fuzzy, kde-format msgid "Integration Settings" msgstr "क्षेत्रीय विन्यास" -#: optiondialog.cpp:1499 +#: optiondialog.cpp:1564 #, kde-format msgid "Command line options to ignore:" msgstr "" -#: optiondialog.cpp:1505 +#: optiondialog.cpp:1570 #, kde-format msgid "" "List of command line options that should be ignored when KDiff3 is used by " @@ -2805,19 +2822,19 @@ "This will suppress the \"Unknown option\" error." msgstr "" -#: optiondialog.cpp:1510 +#: optiondialog.cpp:1575 #, kde-format msgid "Quit also via Escape key" msgstr "" -#: optiondialog.cpp:1514 +#: optiondialog.cpp:1579 #, kde-format msgid "" "Fast method to exit.\n" "For those who are used to using the Escape key." msgstr "" -#: optiondialog.cpp:1598 +#: optiondialog.cpp:1653 #, kde-format msgid "This resets all options. Not only those of the current topic." msgstr "यह सभी विकल्पों को रीसेट करता है. सिर्फ उनको ही नहीं जो मौजूदा विषय में हैं. " @@ -2867,77 +2884,68 @@ msgid "Disable Unsafe Options" msgstr "असुरक्षित विकल्प अक्षम करें" -#: pdiff.cpp:158 +#: pdiff.cpp:160 #, kde-format msgid "Loading A" msgstr "अ लोड किया जा रहा है" -#: pdiff.cpp:167 -#, kde-format -msgid "Errors occurred during pre-processing of file A." -msgstr "" +#: pdiff.cpp:162 +#, fuzzy, kde-format +#| msgid "Loading A" +msgid "Loading A: %1" +msgstr "अ लोड किया जा रहा है" -#: pdiff.cpp:172 +#: pdiff.cpp:170 #, kde-format msgid "Loading B" msgstr "ब लोड किया जा रहा है" -#: pdiff.cpp:179 -#, kde-format -msgid "Errors occurred during pre-processing of file B." -msgstr "" - -#: pdiff.cpp:202 pdiff.cpp:241 +#: pdiff.cpp:201 pdiff.cpp:237 #, kde-format msgid "Diff: A <-> B" msgstr "डिफ: अ <-> ब" -#: pdiff.cpp:208 pdiff.cpp:279 pdiff.cpp:293 +#: pdiff.cpp:207 pdiff.cpp:275 pdiff.cpp:289 #, kde-format msgid "Linediff: A <-> B" msgstr "लाइनडिफ: अ <-> ब" -#: pdiff.cpp:225 +#: pdiff.cpp:224 #, kde-format msgid "Loading C" msgstr "स लोड किया जा रहा है" -#: pdiff.cpp:232 -#, kde-format -msgid "Errors occurred during pre-processing of file C." -msgstr "" - -#: pdiff.cpp:250 +#: pdiff.cpp:246 #, kde-format msgid "Diff: A <-> C" msgstr "डिफ: अ <-> स" -#: pdiff.cpp:261 +#: pdiff.cpp:257 #, kde-format msgid "Diff: B <-> C" msgstr "डिफ: ब <-> स" -#: pdiff.cpp:283 pdiff.cpp:297 +#: pdiff.cpp:279 pdiff.cpp:293 #, kde-format msgid "Linediff: B <-> C" msgstr "लाइनडिफ: ब <-> स" -#: pdiff.cpp:287 pdiff.cpp:301 +#: pdiff.cpp:283 pdiff.cpp:297 #, kde-format msgid "Linediff: A <-> C" msgstr "लाइनडिफ: अ <-> स" -#: pdiff.cpp:829 +#: pdiff.cpp:819 #, fuzzy, kde-format msgid "All input files contain the same text, but are not binary equal." msgstr "सभी इनपुट फ़ाइलें एक ही पाठ रखे हैं." -#: pdiff.cpp:835 pdiff.cpp:839 pdiff.cpp:843 +#: pdiff.cpp:825 pdiff.cpp:829 pdiff.cpp:833 #, fuzzy, kde-format msgid "Files %1 and %2 have equal text, but are not binary equal. \n" msgstr "फ़ाइलें अ तथा ब बाइनरी समान हैं.\n" -#: pdiff.cpp:853 +#: pdiff.cpp:843 #, kde-format msgid "" "Some input files do not seem to be pure text files.\n" @@ -2945,17 +2953,17 @@ "Continue at your own risk." msgstr "" -#: pdiff.cpp:863 +#: pdiff.cpp:853 #, kde-format msgid ", B" msgstr "" -#: pdiff.cpp:865 +#: pdiff.cpp:855 #, kde-format msgid ", C" msgstr "" -#: pdiff.cpp:867 +#: pdiff.cpp:857 #, kde-format msgid "" "Some input characters could not be converted to valid unicode.\n" @@ -2964,77 +2972,72 @@ "Affected input files are in %1." msgstr "" -#: pdiff.cpp:1034 +#: pdiff.cpp:1032 #, kde-format msgid "Abort" msgstr "छोड़ें" -#: pdiff.cpp:1040 pdiff.cpp:1130 +#: pdiff.cpp:1038 pdiff.cpp:1129 #, kde-format msgid "Opening files..." msgstr "फ़ाइलें खोली जा रही हैं..." -#: pdiff.cpp:1107 -#, kde-format -msgid "File open error" -msgstr "फ़ाइल खोलने में त्रुटि" - -#: pdiff.cpp:1202 +#: pdiff.cpp:1212 #, kde-format msgid "Cutting selection..." msgstr "चयन को काटा जा रहा है..." -#: pdiff.cpp:1223 +#: pdiff.cpp:1233 #, kde-format msgid "Copying selection to clipboard..." msgstr "चुने हुए की नकल क्लिपबोर्ड पर बनाया जा रहा है..." -#: pdiff.cpp:1239 +#: pdiff.cpp:1249 #, kde-format msgid "Inserting clipboard contents..." msgstr "क्लिपबोर्ड के वस्तुओं को प्रविष्ट किया जा रहा है..." -#: pdiff.cpp:1695 +#: pdiff.cpp:1705 #, kde-format msgid "Word wrap (Cancel disables word wrap)" msgstr "" -#: pdiff.cpp:1696 +#: pdiff.cpp:1706 #, kde-format msgid "Calculating max width for horizontal scrollbar" msgstr "" -#: pdiff.cpp:1911 +#: pdiff.cpp:1921 #, kde-format msgid "Save && Continue" msgstr "सहेजें तथा जारी रखें" -#: pdiff.cpp:1912 +#: pdiff.cpp:1922 #, kde-format msgid "Continue Without Saving" msgstr "सहेजे बगैर जारी रखें" -#: pdiff.cpp:2124 +#: pdiff.cpp:2134 #, kde-format msgid "Search complete." msgstr "ढूंढना सम्पन्न" -#: pdiff.cpp:2124 +#: pdiff.cpp:2134 #, kde-format msgid "Search Complete" msgstr "ढूंढना सम्पन्न" -#: pdiff.cpp:2375 +#: pdiff.cpp:2385 #, kde-format msgid "Nothing is selected in either diff input window." msgstr "" -#: pdiff.cpp:2375 +#: pdiff.cpp:2385 #, fuzzy, kde-format msgid "Error while adding manual diff range" msgstr "डिरेक्ट्री बनाने के दौरान त्रुटि." -#: progress.cpp:59 progress.cpp:71 +#: progress.cpp:61 progress.cpp:73 #, kde-format msgid "&Cancel" msgstr "" @@ -3044,190 +3047,190 @@ msgid "A (Base):" msgstr "अ (बेस):" -#: smalldialogs.cpp:68 smalldialogs.cpp:85 smalldialogs.cpp:102 -#: smalldialogs.cpp:144 +#: smalldialogs.cpp:71 smalldialogs.cpp:90 smalldialogs.cpp:109 +#: smalldialogs.cpp:154 #, kde-format msgid "File..." msgstr "फ़ाइल..." -#: smalldialogs.cpp:70 smalldialogs.cpp:87 smalldialogs.cpp:104 -#: smalldialogs.cpp:146 +#: smalldialogs.cpp:73 smalldialogs.cpp:92 smalldialogs.cpp:111 +#: smalldialogs.cpp:156 #, kde-format msgid "Dir..." msgstr "डिर.:" -#: smalldialogs.cpp:96 +#: smalldialogs.cpp:103 #, kde-format msgid "C (Optional):" msgstr "स (वैकल्पिक):" -#: smalldialogs.cpp:119 +#: smalldialogs.cpp:126 #, kde-format msgid "Swap/Copy Names..." msgstr "" -#: smalldialogs.cpp:124 smalldialogs.cpp:125 smalldialogs.cpp:126 +#: smalldialogs.cpp:131 smalldialogs.cpp:132 smalldialogs.cpp:133 #, kde-format msgid "Swap %1<->%2" msgstr "" -#: smalldialogs.cpp:127 smalldialogs.cpp:128 smalldialogs.cpp:129 +#: smalldialogs.cpp:134 smalldialogs.cpp:135 smalldialogs.cpp:136 #, kde-format msgid "Copy %1->Output" msgstr "" -#: smalldialogs.cpp:130 smalldialogs.cpp:131 smalldialogs.cpp:132 +#: smalldialogs.cpp:137 smalldialogs.cpp:138 smalldialogs.cpp:139 #, kde-format msgid "Swap %1<->Output" msgstr "" -#: smalldialogs.cpp:138 +#: smalldialogs.cpp:148 #, kde-format msgid "Output (optional):" msgstr "आउटपुट (वैकल्पिक):" -#: smalldialogs.cpp:168 +#: smalldialogs.cpp:178 #, kde-format msgid "Configure..." msgstr "कॉन्फ़िगर...." -#: smalldialogs.cpp:233 +#: smalldialogs.cpp:243 #, fuzzy, kde-format #| msgid "&Directory" msgid "Open Directory" msgstr "डिरेक्ट्री (&D)" -#: smalldialogs.cpp:234 +#: smalldialogs.cpp:244 #, kde-format msgid "Select Output File" msgstr "" -#: smalldialogs.cpp:393 +#: smalldialogs.cpp:403 #, kde-format msgid "Search text:" msgstr "पाठ ढूंढें:" -#: smalldialogs.cpp:400 +#: smalldialogs.cpp:410 #, kde-format msgid "Case sensitive" msgstr "केस सेंसिटिव" -#: smalldialogs.cpp:403 +#: smalldialogs.cpp:413 #, kde-format msgid "Search A" msgstr "ढूंढें अ" -#: smalldialogs.cpp:408 +#: smalldialogs.cpp:418 #, kde-format msgid "Search B" msgstr "ढूंढें ब" -#: smalldialogs.cpp:413 +#: smalldialogs.cpp:423 #, kde-format msgid "Search C" msgstr "ढूंढें स" -#: smalldialogs.cpp:418 +#: smalldialogs.cpp:428 #, kde-format msgid "Search output" msgstr "ढूंढने के पश्चात् आउटपुट" -#: smalldialogs.cpp:425 +#: smalldialogs.cpp:435 #, kde-format msgid "&Search" msgstr "ढूंढें (&S)" -#: smalldialogs.cpp:444 +#: smalldialogs.cpp:454 #, kde-format msgid "Regular Expression Tester" msgstr "" -#: smalldialogs.cpp:457 +#: smalldialogs.cpp:467 #, kde-format msgid "Example auto merge line:" msgstr "" -#: smalldialogs.cpp:459 +#: smalldialogs.cpp:469 #, kde-format msgid "To test auto merge, copy a line as used in your files." msgstr "" -#: smalldialogs.cpp:465 smalldialogs.cpp:493 smalldialogs.cpp:529 +#: smalldialogs.cpp:475 smalldialogs.cpp:503 smalldialogs.cpp:539 #, kde-format msgid "Match result:" msgstr "" -#: smalldialogs.cpp:484 +#: smalldialogs.cpp:494 #, kde-format msgid "Example history start line (with leading comment):" msgstr "" -#: smalldialogs.cpp:486 +#: smalldialogs.cpp:496 #, kde-format msgid "" "Copy a history start line as used in your files,\n" "including the leading comment." msgstr "" -#: smalldialogs.cpp:512 +#: smalldialogs.cpp:522 #, kde-format msgid "History sort key order:" msgstr "" -#: smalldialogs.cpp:520 +#: smalldialogs.cpp:530 #, kde-format msgid "Example history entry start line (without leading comment):" msgstr "" -#: smalldialogs.cpp:522 +#: smalldialogs.cpp:532 #, kde-format msgid "" "Copy a history entry start line as used in your files,\n" "but omit the leading comment." msgstr "" -#: smalldialogs.cpp:536 +#: smalldialogs.cpp:546 #, kde-format msgid "Sort key result:" msgstr "" -#: smalldialogs.cpp:584 smalldialogs.cpp:594 smalldialogs.cpp:614 +#: smalldialogs.cpp:594 smalldialogs.cpp:604 smalldialogs.cpp:624 #, kde-format msgid "Match success." msgstr "" -#: smalldialogs.cpp:588 smalldialogs.cpp:598 smalldialogs.cpp:620 +#: smalldialogs.cpp:598 smalldialogs.cpp:608 smalldialogs.cpp:630 #, fuzzy, kde-format msgid "Match failed." msgstr "सहेजने में असफल." -#: smalldialogs.cpp:605 +#: smalldialogs.cpp:615 #, kde-format msgid "Opening and closing parentheses do not match in regular expression." msgstr "" -#: SourceData.cpp:150 +#: SourceData.cpp:153 #, kde-format msgid "Writing clipboard data to temp file failed." msgstr "क्लिपबोर्ड डाटा को अस्थाई फ़ाइल में लिखना असफल." -#: SourceData.cpp:154 +#: SourceData.cpp:157 #, kde-format msgid "From Clipboard" msgstr "क्लिपबोर्ड से" -#: SourceData.cpp:335 +#: SourceData.cpp:348 #, fuzzy, kde-format #| msgid "Mix of links and normal files." msgid "%1 is not a normal file." msgstr "कड़ियों की मिलावटें तथा सामान्य फ़ाइलें." -#: SourceData.cpp:427 +#: SourceData.cpp:440 #, kde-format msgid " Temp file is: %1" msgstr "" -#: SourceData.cpp:432 +#: SourceData.cpp:445 #, kde-format msgid "" "Preprocessing possibly failed. Check this command:\n" @@ -3237,12 +3240,12 @@ "The preprocessing command will be disabled now." msgstr "" -#: SourceData.cpp:443 SourceData.cpp:512 +#: SourceData.cpp:456 SourceData.cpp:525 #, kde-format msgid "File %1 too large to process. Skipping." msgstr "" -#: SourceData.cpp:487 +#: SourceData.cpp:500 #, kde-format msgid "" "The line-matching-preprocessing possibly failed. Check this command:\n" diff -Nru kdiff3-1.8.01/po/hne/kdiff3.po kdiff3-1.8.3/po/hne/kdiff3.po --- kdiff3-1.8.01/po/hne/kdiff3.po 2019-05-18 01:02:02.000000000 +0000 +++ kdiff3-1.8.3/po/hne/kdiff3.po 2020-06-25 00:18:22.000000000 +0000 @@ -3,12 +3,12 @@ msgid "" msgstr "" "Project-Id-Version: kdiff3\n" -"Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2019-04-18 08:02+0200\n" +"Report-Msgid-Bugs-To: https://bugs.kde.org\n" +"POT-Creation-Date: 2020-06-22 07:48+0200\n" "PO-Revision-Date: 2009-03-20 10:56+0530\n" "Last-Translator: Ravishankar Shrivastava \n" "Language-Team: Hindi \n" -"Language: hi\n" +"Language: hne\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -26,338 +26,338 @@ msgid "Your emails" msgstr "raviratlami@aol.in," -#: difftextwindow.cpp:412 +#: difftextwindow.cpp:414 #, kde-format msgid "File %1: Line %2" msgstr "" -#: difftextwindow.cpp:414 +#: difftextwindow.cpp:416 #, fuzzy, kde-format #| msgid "Line not available" msgid "File %1: Line not available" msgstr "लाइन नइ मिलत हे" -#: difftextwindow.cpp:1780 +#: difftextwindow.cpp:1778 #, kde-format msgid "Encoding:" msgstr "" -#: difftextwindow.cpp:1782 mergeresultwindow.cpp:3138 optiondialog.cpp:818 +#: difftextwindow.cpp:1781 mergeresultwindow.cpp:3166 optiondialog.cpp:840 #, kde-format msgid "Line end style:" msgstr "लकीर खतम होए के सैलीः" -#: difftextwindow.cpp:1810 directorymergewindow.cpp:382 -#: directorymergewindow.cpp:433 directorymergewindow.cpp:524 -#: directorymergewindow.cpp:3058 directorymergewindow.cpp:3189 -#: directorymergewindow.cpp:3417 mergeresultwindow.cpp:942 -#: mergeresultwindow.cpp:944 mergeresultwindow.cpp:946 -#: mergeresultwindow.cpp:948 mergeresultwindow.cpp:1814 -#: mergeresultwindow.cpp:3170 mergeresultwindow.cpp:3177 optiondialog.cpp:962 -#: optiondialog.cpp:975 pdiff.cpp:833 pdiff.cpp:835 pdiff.cpp:837 pdiff.cpp:839 -#: pdiff.cpp:861 smalldialogs.cpp:124 smalldialogs.cpp:126 smalldialogs.cpp:127 -#: smalldialogs.cpp:130 +#: difftextwindow.cpp:1809 directorymergewindow.cpp:383 +#: directorymergewindow.cpp:434 directorymergewindow.cpp:525 +#: directorymergewindow.cpp:3072 directorymergewindow.cpp:3203 +#: directorymergewindow.cpp:3431 mergeresultwindow.cpp:970 +#: mergeresultwindow.cpp:972 mergeresultwindow.cpp:974 +#: mergeresultwindow.cpp:976 mergeresultwindow.cpp:1842 +#: mergeresultwindow.cpp:3198 mergeresultwindow.cpp:3205 optiondialog.cpp:1002 +#: optiondialog.cpp:1015 pdiff.cpp:823 pdiff.cpp:825 pdiff.cpp:827 +#: pdiff.cpp:829 pdiff.cpp:851 smalldialogs.cpp:131 smalldialogs.cpp:133 +#: smalldialogs.cpp:134 smalldialogs.cpp:137 #, kde-format msgid "A" msgstr "अ" -#: difftextwindow.cpp:1810 directorymergewindow.cpp:384 -#: directorymergewindow.cpp:436 directorymergewindow.cpp:526 -#: directorymergewindow.cpp:3064 directorymergewindow.cpp:3190 -#: directorymergewindow.cpp:3418 mergeresultwindow.cpp:942 -#: mergeresultwindow.cpp:944 mergeresultwindow.cpp:950 -#: mergeresultwindow.cpp:952 mergeresultwindow.cpp:1816 -#: mergeresultwindow.cpp:3172 mergeresultwindow.cpp:3179 optiondialog.cpp:963 -#: optiondialog.cpp:976 pdiff.cpp:833 pdiff.cpp:835 pdiff.cpp:841 pdiff.cpp:843 -#: pdiff.cpp:863 smalldialogs.cpp:124 smalldialogs.cpp:125 smalldialogs.cpp:128 -#: smalldialogs.cpp:131 +#: difftextwindow.cpp:1809 directorymergewindow.cpp:385 +#: directorymergewindow.cpp:437 directorymergewindow.cpp:527 +#: directorymergewindow.cpp:3078 directorymergewindow.cpp:3204 +#: directorymergewindow.cpp:3432 mergeresultwindow.cpp:970 +#: mergeresultwindow.cpp:972 mergeresultwindow.cpp:978 +#: mergeresultwindow.cpp:980 mergeresultwindow.cpp:1844 +#: mergeresultwindow.cpp:3200 mergeresultwindow.cpp:3207 optiondialog.cpp:1003 +#: optiondialog.cpp:1016 pdiff.cpp:823 pdiff.cpp:825 pdiff.cpp:831 +#: pdiff.cpp:833 pdiff.cpp:853 smalldialogs.cpp:131 smalldialogs.cpp:132 +#: smalldialogs.cpp:135 smalldialogs.cpp:138 #, kde-format msgid "B" msgstr "ब" -#: difftextwindow.cpp:1810 directorymergewindow.cpp:386 -#: directorymergewindow.cpp:439 directorymergewindow.cpp:528 -#: directorymergewindow.cpp:3070 directorymergewindow.cpp:3191 -#: directorymergewindow.cpp:3419 mergeresultwindow.cpp:946 -#: mergeresultwindow.cpp:948 mergeresultwindow.cpp:950 -#: mergeresultwindow.cpp:952 mergeresultwindow.cpp:1818 -#: mergeresultwindow.cpp:3174 mergeresultwindow.cpp:3181 optiondialog.cpp:977 -#: pdiff.cpp:837 pdiff.cpp:839 pdiff.cpp:841 pdiff.cpp:843 pdiff.cpp:865 -#: smalldialogs.cpp:125 smalldialogs.cpp:126 smalldialogs.cpp:129 -#: smalldialogs.cpp:132 +#: difftextwindow.cpp:1809 directorymergewindow.cpp:387 +#: directorymergewindow.cpp:440 directorymergewindow.cpp:529 +#: directorymergewindow.cpp:3084 directorymergewindow.cpp:3205 +#: directorymergewindow.cpp:3433 mergeresultwindow.cpp:974 +#: mergeresultwindow.cpp:976 mergeresultwindow.cpp:978 +#: mergeresultwindow.cpp:980 mergeresultwindow.cpp:1846 +#: mergeresultwindow.cpp:3202 mergeresultwindow.cpp:3209 optiondialog.cpp:1017 +#: pdiff.cpp:827 pdiff.cpp:829 pdiff.cpp:831 pdiff.cpp:833 pdiff.cpp:855 +#: smalldialogs.cpp:132 smalldialogs.cpp:133 smalldialogs.cpp:136 +#: smalldialogs.cpp:139 #, kde-format msgid "C" msgstr "स" -#: difftextwindow.cpp:1810 +#: difftextwindow.cpp:1809 #, fuzzy, kde-format #| msgid "A (Base):" msgid "A (Base)" msgstr "अ (बेस):" -#: difftextwindow.cpp:1812 +#: difftextwindow.cpp:1811 #, kde-format msgid "Encoding: %1" msgstr "" -#: difftextwindow.cpp:1813 mergeresultwindow.cpp:3183 +#: difftextwindow.cpp:1812 mergeresultwindow.cpp:3211 #, kde-format msgid "Unix" msgstr "" -#: difftextwindow.cpp:1813 mergeresultwindow.cpp:3184 +#: difftextwindow.cpp:1812 mergeresultwindow.cpp:3212 #, kde-format msgid "DOS" msgstr "" -#: difftextwindow.cpp:1813 +#: difftextwindow.cpp:1812 #, fuzzy, kde-format #| msgid "Line end style:" msgid "Line end style: %1" msgstr "लकीर खतम होए के सैलीः" -#: difftextwindow.cpp:1835 kdiff3.cpp:873 +#: difftextwindow.cpp:1834 kdiff3.cpp:874 #, kde-format msgid "Top line" msgstr "सबसे ऊपर के लाइन" -#: difftextwindow.cpp:1845 +#: difftextwindow.cpp:1843 #, kde-format msgid "End" msgstr "आखरी" -#: difftextwindow.cpp:1903 smalldialogs.cpp:235 +#: difftextwindow.cpp:1901 smalldialogs.cpp:245 #, fuzzy, kde-format #| msgid "Opening files..." msgid "Open File" msgstr "फाइल मन ल खोलत हे..." -#: difftextwindow.cpp:1951 optiondialog.cpp:387 +#: difftextwindow.cpp:1943 optiondialog.cpp:389 #, kde-format msgid "Unicode, 8 bit" msgstr "युनिकोड, 8 बिट" -#: difftextwindow.cpp:1966 +#: difftextwindow.cpp:1958 #, kde-format msgid "Other" msgstr "" -#: directorymergewindow.cpp:409 directorymergewindow.cpp:3424 +#: directorymergewindow.cpp:410 directorymergewindow.cpp:3438 #, kde-format msgid "Copy A to B" msgstr "अ के नकल ब मं करव" -#: directorymergewindow.cpp:412 directorymergewindow.cpp:3425 +#: directorymergewindow.cpp:413 directorymergewindow.cpp:3439 #, kde-format msgid "Copy B to A" msgstr "ब के नकल अ मं करव" -#: directorymergewindow.cpp:415 directorymergewindow.cpp:3426 +#: directorymergewindow.cpp:416 directorymergewindow.cpp:3440 #, kde-format msgid "Delete A" msgstr "अ ल मेटाव" -#: directorymergewindow.cpp:418 directorymergewindow.cpp:3427 +#: directorymergewindow.cpp:419 directorymergewindow.cpp:3441 #, kde-format msgid "Delete B" msgstr "ब ल मेटाव" -#: directorymergewindow.cpp:421 +#: directorymergewindow.cpp:422 #, kde-format msgid "Delete A & B" msgstr "अ अउ ब ल मेटाव" -#: directorymergewindow.cpp:424 directorymergewindow.cpp:3429 +#: directorymergewindow.cpp:425 directorymergewindow.cpp:3443 #, kde-format msgid "Merge to A" msgstr "अ मं सम्मिलित करव" -#: directorymergewindow.cpp:427 directorymergewindow.cpp:3430 +#: directorymergewindow.cpp:428 directorymergewindow.cpp:3444 #, kde-format msgid "Merge to B" msgstr "ब मं सम्मिलित करव" -#: directorymergewindow.cpp:430 +#: directorymergewindow.cpp:431 #, kde-format msgid "Merge to A & B" msgstr "अ अउ ब मं सम्मिलित करव" -#: directorymergewindow.cpp:442 directorymergewindow.cpp:3421 +#: directorymergewindow.cpp:443 directorymergewindow.cpp:3435 #, kde-format msgid "Delete (if exists)" msgstr "मेटाव (यदि मौजूद हे)" -#: directorymergewindow.cpp:445 directorymergewindow.cpp:448 -#: directorymergewindow.cpp:3420 optiondialog.cpp:925 smalldialogs.cpp:113 +#: directorymergewindow.cpp:446 directorymergewindow.cpp:449 +#: directorymergewindow.cpp:3434 smalldialogs.cpp:120 #, kde-format msgid "Merge" msgstr "सम्मिलित करव" -#: directorymergewindow.cpp:445 directorymergewindow.cpp:448 +#: directorymergewindow.cpp:446 directorymergewindow.cpp:449 #, kde-format msgid "Merge (manual)" msgstr "सम्मिलित करव (हस्तचालित)" -#: directorymergewindow.cpp:451 +#: directorymergewindow.cpp:452 #, kde-format msgid "Error: Conflicting File Types" msgstr "गलती: आपसी विरोधी फाइल किसिम" -#: directorymergewindow.cpp:454 +#: directorymergewindow.cpp:455 #, kde-format msgid "Error: Changed and Deleted" msgstr "" -#: directorymergewindow.cpp:457 +#: directorymergewindow.cpp:458 #, kde-format msgid "Error: Dates are equal but files are not." msgstr "गलती: तारीकें तहां एक समान हे, फेर फाइल मन ल नइ." -#: directorymergewindow.cpp:471 +#: directorymergewindow.cpp:472 #, fuzzy, kde-format #| msgid "Done." msgid "Done" msgstr "पूरा." -#: directorymergewindow.cpp:473 +#: directorymergewindow.cpp:474 #, kde-format msgid "Error" msgstr "गलती" -#: directorymergewindow.cpp:475 +#: directorymergewindow.cpp:476 #, kde-format msgid "Skipped." msgstr "छोड़ा." -#: directorymergewindow.cpp:477 +#: directorymergewindow.cpp:478 #, kde-format msgid "Not saved." msgstr "सहेजिस नइ गिस." -#: directorymergewindow.cpp:479 +#: directorymergewindow.cpp:480 #, kde-format msgid "In progress..." msgstr "प्रगति मं हे..." -#: directorymergewindow.cpp:481 +#: directorymergewindow.cpp:482 #, kde-format msgid "To do." msgstr "काम-सूची" -#: directorymergewindow.cpp:522 +#: directorymergewindow.cpp:523 #, kde-format msgid "Name" msgstr "नाम" -#: directorymergewindow.cpp:530 +#: directorymergewindow.cpp:531 #, kde-format msgid "Operation" msgstr "आपरेसन" -#: directorymergewindow.cpp:532 +#: directorymergewindow.cpp:533 #, kde-format msgid "Status" msgstr "स्थिति" -#: directorymergewindow.cpp:534 +#: directorymergewindow.cpp:535 #, kde-format msgid "Unsolved" msgstr "हल नइ" -#: directorymergewindow.cpp:536 +#: directorymergewindow.cpp:537 #, kde-format msgid "Solved" msgstr "हल कर ले गिस" -#: directorymergewindow.cpp:538 +#: directorymergewindow.cpp:539 #, kde-format msgid "Nonwhite" msgstr "सफेद-नइ" -#: directorymergewindow.cpp:540 +#: directorymergewindow.cpp:541 #, kde-format msgid "White" msgstr "सफेद" -#: directorymergewindow.cpp:674 +#: directorymergewindow.cpp:676 #, kde-format msgid "Unable to compare non-normal file with normal file." msgstr "" -#: directorymergewindow.cpp:688 +#: directorymergewindow.cpp:690 #, kde-format msgid "Mix of links and normal files." msgstr "संकली के मिलावटें अउ सामान्य फाइल मन ल." -#: directorymergewindow.cpp:695 +#: directorymergewindow.cpp:697 #, kde-format msgid "Link: " msgstr "कड़ी" -#: directorymergewindow.cpp:704 +#: directorymergewindow.cpp:706 #, kde-format msgid "Size. " msgstr "आकार." -#: directorymergewindow.cpp:718 directorymergewindow.cpp:728 +#: directorymergewindow.cpp:720 directorymergewindow.cpp:730 #, kde-format msgid "Date & Size: " msgstr "तारीक अउ आकार:" -#: directorymergewindow.cpp:748 +#: directorymergewindow.cpp:751 #, kde-format msgid "Comparing file..." msgstr "फाइल के तुलना करत हे ..." -#: directorymergewindow.cpp:801 +#: directorymergewindow.cpp:813 #, kde-format msgid "" "You are currently doing a directory merge. Are you sure, you want to abort " "the merge and rescan the directory?" msgstr "" -#: directorymergewindow.cpp:802 kdiff3.cpp:698 kdiff3.cpp:708 kdiff3.cpp:720 -#: mergeresultwindow.cpp:372 pdiff.cpp:1033 pdiff.cpp:1910 pdiff.cpp:1920 +#: directorymergewindow.cpp:814 kdiff3.cpp:697 kdiff3.cpp:707 kdiff3.cpp:719 +#: mergeresultwindow.cpp:400 pdiff.cpp:1031 pdiff.cpp:1920 pdiff.cpp:1930 #, kde-format msgid "Warning" msgstr "चेतावनी" -#: directorymergewindow.cpp:803 directorymergewindow.cpp:3393 +#: directorymergewindow.cpp:815 directorymergewindow.cpp:3407 #, kde-format msgid "Rescan" msgstr "री-स्कैन" -#: directorymergewindow.cpp:804 pdiff.cpp:1035 +#: directorymergewindow.cpp:816 pdiff.cpp:1033 #, kde-format msgid "Continue Merging" msgstr "मिलाय जाना जारी रखव" -#: directorymergewindow.cpp:971 +#: directorymergewindow.cpp:984 #, kde-format msgid "Opening of directories failed:" msgstr "डिरेक्टरीज खोलना फेल:" -#: directorymergewindow.cpp:975 +#: directorymergewindow.cpp:988 #, kde-format msgid "Dir A \"%1\" does not exist or is not a directory.\n" msgstr "डिरेक्टरी अ \"%1\" या तो मौजूद नइ हे या फिर वो डिरेक्टरी नइ हे.\n" -#: directorymergewindow.cpp:980 +#: directorymergewindow.cpp:993 #, kde-format msgid "Dir B \"%1\" does not exist or is not a directory.\n" msgstr "डिरेक्टरी ब \"%1\" या तो मौजूद नइ हे या फिर वो डिरेक्टरी नइ हे.\n" -#: directorymergewindow.cpp:985 +#: directorymergewindow.cpp:998 #, kde-format msgid "Dir C \"%1\" does not exist or is not a directory.\n" msgstr "डिरेक्टरी स \"%1\" या तो मौजूद नइ हे या फिर वो डिरेक्टरी नइ हे.\n" -#: directorymergewindow.cpp:988 +#: directorymergewindow.cpp:1001 #, kde-format msgid "Directory Open Error" msgstr "डिरेक्टरी खोले मं गलती" -#: directorymergewindow.cpp:996 +#: directorymergewindow.cpp:1009 #, kde-format msgid "" "The destination directory must not be the same as A or B when three " @@ -365,49 +365,49 @@ "Check again before continuing." msgstr "" -#: directorymergewindow.cpp:998 +#: directorymergewindow.cpp:1011 #, kde-format msgid "Parameter Warning" msgstr "पैरामीटर चेतावनी" -#: directorymergewindow.cpp:1003 +#: directorymergewindow.cpp:1016 #, kde-format msgid "Scanning directories..." msgstr "डिरेक्टरीज स्कैन करत हे..." -#: directorymergewindow.cpp:1029 +#: directorymergewindow.cpp:1042 #, kde-format msgid "Reading Directory A" msgstr "डिरेक्टरी अ ल पढ़त हे" -#: directorymergewindow.cpp:1038 +#: directorymergewindow.cpp:1051 #, kde-format msgid "Reading Directory B" msgstr "डिरेक्टरी ब ल पढ़त हे" -#: directorymergewindow.cpp:1048 +#: directorymergewindow.cpp:1061 #, kde-format msgid "Reading Directory C" msgstr "डिरेक्टरी स ल पढ़त हे" -#: directorymergewindow.cpp:1064 +#: directorymergewindow.cpp:1077 #, kde-format msgid "Some subdirectories were not readable in" msgstr "कुछ सबडिरेक्टरीज ये मां पढ़े नइ जा सके वाले हे" -#: directorymergewindow.cpp:1069 +#: directorymergewindow.cpp:1082 #, kde-format msgid "Check the permissions of the subdirectories." msgstr "सबडिरेक्टरीज के अनुमति जांचव." -#: directorymergewindow.cpp:1106 kdiff3.cpp:666 kdiff3.cpp:753 kdiff3.cpp:777 -#: kdiff3.cpp:1065 kdiff3.cpp:1086 pdiff.cpp:1116 pdiff.cpp:1170 pdiff.cpp:1218 -#: pdiff.cpp:1234 pdiff.cpp:1277 pdiff.cpp:1301 +#: directorymergewindow.cpp:1119 kdiff3.cpp:665 kdiff3.cpp:752 kdiff3.cpp:776 +#: kdiff3.cpp:1072 kdiff3.cpp:1093 pdiff.cpp:1115 pdiff.cpp:1178 pdiff.cpp:1228 +#: pdiff.cpp:1244 pdiff.cpp:1287 pdiff.cpp:1311 #, kde-format msgid "Ready." msgstr "तैयार." -#: directorymergewindow.cpp:1121 +#: directorymergewindow.cpp:1134 #, kde-format msgid "" "Directory Comparison Status\n" @@ -417,23 +417,23 @@ "Number of different files: %3" msgstr "" -#: directorymergewindow.cpp:1128 +#: directorymergewindow.cpp:1141 #, fuzzy, kde-format #| msgid "Number of manual merges:" msgid "Number of manual merges: %1" msgstr "हस्तचालित सम्मिलित करे के संख्या:" -#: directorymergewindow.cpp:1394 +#: directorymergewindow.cpp:1407 #, kde-format msgid "This affects all merge operations." msgstr "ये सब्बो सम्मिलित आपरेसन ल प्रभावित करही" -#: directorymergewindow.cpp:1395 +#: directorymergewindow.cpp:1408 #, kde-format msgid "Changing All Merge Operations" msgstr "सब्बो सम्मिलित करे के आपरेसन ल बदलत हे" -#: directorymergewindow.cpp:1695 +#: directorymergewindow.cpp:1708 #, fuzzy, kde-format #| msgid "Processing " msgid "" @@ -441,45 +441,45 @@ "%3" msgstr "प्रोसेसिंग" -#: directorymergewindow.cpp:1738 directorymergewindow.cpp:1742 +#: directorymergewindow.cpp:1751 directorymergewindow.cpp:1755 #, kde-format msgid "Some files could not be processed." msgstr "" -#: directorymergewindow.cpp:2222 directorymergewindow.cpp:2247 -#: directorymergewindow.cpp:2271 +#: directorymergewindow.cpp:2235 directorymergewindow.cpp:2260 +#: directorymergewindow.cpp:2285 #, kde-format msgid "This operation is currently not possible." msgstr "ये आपरेसन अभी हाल के मं संभव नइ हे." -#: directorymergewindow.cpp:2222 directorymergewindow.cpp:2247 -#: directorymergewindow.cpp:2271 directorymergewindow.cpp:2552 +#: directorymergewindow.cpp:2235 directorymergewindow.cpp:2260 +#: directorymergewindow.cpp:2285 directorymergewindow.cpp:2565 #, kde-format msgid "Operation Not Possible" msgstr "आपरेसन अभी हाल के मं संभव नइ" -#: directorymergewindow.cpp:2318 +#: directorymergewindow.cpp:2332 #, fuzzy, kde-format #| msgid "An error occurred while copying.\n" msgid "An error occurred while copying." msgstr "नकल करे के समय एक गलती होइस.\n" -#: directorymergewindow.cpp:2319 directorymergewindow.cpp:2759 +#: directorymergewindow.cpp:2333 directorymergewindow.cpp:2772 #, kde-format msgid "Merge Error" msgstr "सम्मिलित करे मं गलती" -#: directorymergewindow.cpp:2396 +#: directorymergewindow.cpp:2410 #, kde-format msgid "Unknown merge operation. (This must never happen!)" msgstr "सम्मिलित करे के अग्यात आपरेसन. (अइसन कभू नइ होना चाही!)" -#: directorymergewindow.cpp:2441 +#: directorymergewindow.cpp:2455 #, kde-format msgid "Unknown merge operation." msgstr "सम्मिलित करे के अग्यात आपरेसन. " -#: directorymergewindow.cpp:2454 +#: directorymergewindow.cpp:2468 #, kde-format msgid "" "The merge is about to begin.\n" @@ -492,50 +492,50 @@ "whatsoever! Make backups of your vital data!" msgstr "" -#: directorymergewindow.cpp:2459 +#: directorymergewindow.cpp:2473 #, kde-format msgid "Starting Merge" msgstr "सम्मिलित करना चालू करत हे" -#: directorymergewindow.cpp:2460 +#: directorymergewindow.cpp:2474 #, kde-format msgid "Do It" msgstr "एला करव" -#: directorymergewindow.cpp:2461 +#: directorymergewindow.cpp:2475 #, kde-format msgid "Simulate It" msgstr "एला सिमुलेट करव" -#: directorymergewindow.cpp:2487 +#: directorymergewindow.cpp:2501 #, kde-format msgid "" "The highlighted item has a different type in the different directories. " "Select what to do." msgstr "" -#: directorymergewindow.cpp:2491 +#: directorymergewindow.cpp:2505 #, kde-format msgid "" "The modification dates of the file are equal but the files are not. Select " "what to do." msgstr "" -#: directorymergewindow.cpp:2495 +#: directorymergewindow.cpp:2509 #, kde-format msgid "" "The highlighted item was changed in one directory and deleted in the other. " "Select what to do." msgstr "" -#: directorymergewindow.cpp:2552 +#: directorymergewindow.cpp:2565 #, kde-format msgid "" "This operation is currently not possible because directory merge is " "currently running." msgstr "" -#: directorymergewindow.cpp:2609 +#: directorymergewindow.cpp:2622 #, kde-format msgid "" "There was an error in the last step.\n" @@ -543,257 +543,257 @@ "to skip this item?" msgstr "" -#: directorymergewindow.cpp:2611 +#: directorymergewindow.cpp:2624 #, kde-format msgid "Continue merge after an error" msgstr "गलती के बाद घलोक सम्मिलित करना जारी रखव" -#: directorymergewindow.cpp:2612 +#: directorymergewindow.cpp:2625 #, kde-format msgid "Continue With Last Item" msgstr "पिछला चीज के साथ जारी रखव" -#: directorymergewindow.cpp:2613 +#: directorymergewindow.cpp:2626 #, kde-format msgid "Skip Item" msgstr "चीज छोड़व" -#: directorymergewindow.cpp:2709 +#: directorymergewindow.cpp:2722 #, kde-format msgid "Merge operation complete." msgstr "सम्मिलित करे के काम पूरा होइस." -#: directorymergewindow.cpp:2709 directorymergewindow.cpp:2712 +#: directorymergewindow.cpp:2722 directorymergewindow.cpp:2725 #, kde-format msgid "Merge Complete" msgstr "सम्मिलित करना पूरा" -#: directorymergewindow.cpp:2722 +#: directorymergewindow.cpp:2735 #, kde-format msgid "" "Simulated merge complete: Check if you agree with the proposed operations." msgstr "" -#: directorymergewindow.cpp:2758 +#: directorymergewindow.cpp:2771 #, fuzzy, kde-format #| msgid "An error occurred. Press OK to see detailed information.\n" msgid "An error occurred. Press OK to see detailed information." msgstr "एक गलती होइस. विस्तृत जानकारी देखे बर ठीक ल दबाव\n" -#: directorymergewindow.cpp:2791 +#: directorymergewindow.cpp:2804 #, kde-format msgid "Error: While deleting %1: Creating backup failed." msgstr "गलती: %1 ल मेटाव के समय: बैकअप बनाए मं फेल." -#: directorymergewindow.cpp:2798 +#: directorymergewindow.cpp:2811 #, kde-format msgid "delete directory recursively( %1 )" msgstr "डिरेक्टरी ( %1 ) ल रिकर्सिवली मेटाव" -#: directorymergewindow.cpp:2800 +#: directorymergewindow.cpp:2813 #, kde-format msgid "delete( %1 )" msgstr "मेटाव (%1)" -#: directorymergewindow.cpp:2815 +#: directorymergewindow.cpp:2828 #, kde-format msgid "Error: delete dir operation failed while trying to read the directory." msgstr "गलती: डिरेक्टरी ल पढ़े के कोसिस मं डिरेक्टरी मेटाव के काम फेल." -#: directorymergewindow.cpp:2834 +#: directorymergewindow.cpp:2847 #, kde-format msgid "Error: rmdir( %1 ) operation failed." msgstr "गलती: rmdir( %1 ) काम फेल." -#: directorymergewindow.cpp:2844 +#: directorymergewindow.cpp:2857 #, kde-format msgid "Error: delete operation failed." msgstr "गलती: डिरेक्टरी मेटाव के काम फेल." -#: directorymergewindow.cpp:2870 +#: directorymergewindow.cpp:2884 #, kde-format msgid "manual merge( %1, %2, %3 -> %4)" msgstr "हस्तचालित सम्मिलित करव( %1, %2, %3 -> %4)" -#: directorymergewindow.cpp:2873 +#: directorymergewindow.cpp:2887 #, kde-format msgid "" " Note: After a manual merge the user should continue by pressing F7." msgstr "टीप: हस्तचालित सम्मिलित करे के बाद कमइया ल F7 ल दबाकर जारी रखना चाही." -#: directorymergewindow.cpp:2900 +#: directorymergewindow.cpp:2914 #, kde-format msgid "Error: copy( %1 -> %2 ) failed.Deleting existing destination failed." msgstr "गलती: नकल ( %1 -> %2 ) फेल. अभी हाल के गंतव्य ल मिटाना फेल." -#: directorymergewindow.cpp:2909 +#: directorymergewindow.cpp:2923 #, kde-format msgid "copyLink( %1 -> %2 )" msgstr "कापीसंकली ( %1 -> %2 )" -#: directorymergewindow.cpp:2918 +#: directorymergewindow.cpp:2932 #, kde-format msgid "Error: copyLink failed: Remote links are not yet supported." msgstr "गलती: कापीसंकली फेल: रिमोट कड़ियाँ अभी समर्थित नइ हे." -#: directorymergewindow.cpp:2928 +#: directorymergewindow.cpp:2942 #, kde-format msgid "Error: copyLink failed." msgstr "गलती: कापीसंकली फेल." -#: directorymergewindow.cpp:2953 +#: directorymergewindow.cpp:2967 #, kde-format msgid "copy( %1 -> %2 )" msgstr "नकल( %1 -> %2 )" -#: directorymergewindow.cpp:2979 +#: directorymergewindow.cpp:2993 #, kde-format msgid "Error during rename( %1 -> %2 ): Cannot delete existing destination." msgstr "" -#: directorymergewindow.cpp:2986 +#: directorymergewindow.cpp:3000 #, kde-format msgid "rename( %1 -> %2 )" msgstr "नाम बदलव( %1 -> %2 )" -#: directorymergewindow.cpp:2995 +#: directorymergewindow.cpp:3009 #, kde-format msgid "Error: Rename failed." msgstr "गलती: नाम-बदलना फेल." -#: directorymergewindow.cpp:3013 +#: directorymergewindow.cpp:3027 #, kde-format msgid "Error during makeDir of %1. Cannot delete existing file." msgstr "%1 के मेकडिर के समय गलती. अभी हाल के फाइल मिटा नइ सकहू." -#: directorymergewindow.cpp:3030 +#: directorymergewindow.cpp:3044 #, kde-format msgid "makeDir( %1 )" msgstr "मेकडिर( %1 )" -#: directorymergewindow.cpp:3040 +#: directorymergewindow.cpp:3054 #, kde-format msgid "Error while creating directory." msgstr "डिरेक्टरी बनाए के समय गलती." -#: directorymergewindow.cpp:3076 directorymergewindow.cpp:3195 +#: directorymergewindow.cpp:3090 directorymergewindow.cpp:3209 #, kde-format msgid "Dest" msgstr "गंतव्य" -#: directorymergewindow.cpp:3084 directorymergewindow.cpp:3113 +#: directorymergewindow.cpp:3098 directorymergewindow.cpp:3127 #, kde-format msgid "Dir" msgstr "डिर." -#: directorymergewindow.cpp:3084 +#: directorymergewindow.cpp:3098 #, kde-format msgid "Type" msgstr "किसिम" -#: directorymergewindow.cpp:3084 +#: directorymergewindow.cpp:3098 #, kde-format msgid "Size" msgstr "आकार" -#: directorymergewindow.cpp:3085 +#: directorymergewindow.cpp:3099 #, kde-format msgid "Attr" msgstr "एट्रि." -#: directorymergewindow.cpp:3085 +#: directorymergewindow.cpp:3099 #, kde-format msgid "Last Modification" msgstr "आखरी परिवर्धन" -#: directorymergewindow.cpp:3085 +#: directorymergewindow.cpp:3099 #, kde-format msgid "Link-Destination" msgstr "संकली-गंतव्य" -#: directorymergewindow.cpp:3113 +#: directorymergewindow.cpp:3127 #, kde-format msgid "File" msgstr "फाइल" -#: directorymergewindow.cpp:3113 +#: directorymergewindow.cpp:3127 #, fuzzy, kde-format #| msgid "Link: " msgid "-Link" msgstr "कड़ी" -#: directorymergewindow.cpp:3119 +#: directorymergewindow.cpp:3133 #, kde-format msgid "not available" msgstr "नइ मिलत" -#: directorymergewindow.cpp:3137 +#: directorymergewindow.cpp:3151 #, kde-format msgid "A (Dest): " msgstr "A (गंत.): " -#: directorymergewindow.cpp:3141 +#: directorymergewindow.cpp:3155 #, kde-format msgid "A: " msgstr "" -#: directorymergewindow.cpp:3141 +#: directorymergewindow.cpp:3155 #, kde-format msgid "A (Base): " msgstr "A (आधार): " -#: directorymergewindow.cpp:3147 +#: directorymergewindow.cpp:3161 #, kde-format msgid "B (Dest): " msgstr "B (गंत.): " -#: directorymergewindow.cpp:3151 +#: directorymergewindow.cpp:3165 #, kde-format msgid "B: " msgstr "" -#: directorymergewindow.cpp:3156 +#: directorymergewindow.cpp:3170 #, kde-format msgid "C (Dest): " msgstr "C (गंत.): " -#: directorymergewindow.cpp:3160 +#: directorymergewindow.cpp:3174 #, kde-format msgid "C: " msgstr "" -#: directorymergewindow.cpp:3163 +#: directorymergewindow.cpp:3177 #, kde-format msgid "Dest: " msgstr "गंतव्य:" #. i18n("Saving Directory Merge State ...")); -#: directorymergewindow.cpp:3238 +#: directorymergewindow.cpp:3252 #, kde-format msgid "Save Directory Merge State As..." msgstr "" -#: directorymergewindow.cpp:3387 +#: directorymergewindow.cpp:3401 #, kde-format msgid "Start/Continue Directory Merge" msgstr "डिरेक्टरी सम्मिलित करना चालू करव/जारी रखव" -#: directorymergewindow.cpp:3388 +#: directorymergewindow.cpp:3402 #, kde-format msgid "Run Operation for Current Item" msgstr "अभी हाल के चीज बर आपरेसन चलाव" -#: directorymergewindow.cpp:3389 +#: directorymergewindow.cpp:3403 #, kde-format msgid "Compare Selected File" msgstr "चुने गे फाइल के तुलना करव" -#: directorymergewindow.cpp:3390 +#: directorymergewindow.cpp:3404 #, kde-format msgid "Merge Current File" msgstr "अभी हाल के फाइल सम्मिलित करव" -#: directorymergewindow.cpp:3390 +#: directorymergewindow.cpp:3404 #, kde-format msgid "" "Merge\n" @@ -802,333 +802,338 @@ "फाइल\n" "मिलाव" -#: directorymergewindow.cpp:3391 +#: directorymergewindow.cpp:3405 #, kde-format msgid "Fold All Subdirs" msgstr "सब्बो सबडिरेक्टरीज फोल्ड करव" -#: directorymergewindow.cpp:3392 +#: directorymergewindow.cpp:3406 #, kde-format msgid "Unfold All Subdirs" msgstr "सब्बो सबडिरेक्टरीज अनफोल्ड करव" #. i18n("Save Directory Merge State ..."), 0, this, &DirectoryMergeWindow::slotSaveMergeState, ac, "dir_save_merge_state"); #. i18n("Load Directory Merge State ..."), 0, this, &DirectoryMergeWindow::slotLoadMergeState, ac, "dir_load_merge_state"); -#: directorymergewindow.cpp:3396 +#: directorymergewindow.cpp:3410 #, kde-format msgid "Choose A for All Items" msgstr "सब्बो चीज मन बर अ के चुनव" -#: directorymergewindow.cpp:3397 +#: directorymergewindow.cpp:3411 #, kde-format msgid "Choose B for All Items" msgstr "सब्बो चीज मन बर ब के चुनव" -#: directorymergewindow.cpp:3398 +#: directorymergewindow.cpp:3412 #, kde-format msgid "Choose C for All Items" msgstr "सब्बो चीज मन बर स के चुनव" -#: directorymergewindow.cpp:3399 +#: directorymergewindow.cpp:3413 #, kde-format msgid "Auto-Choose Operation for All Items" msgstr "सब्बो चीज मन बर काम अपने अपन चुनव" -#: directorymergewindow.cpp:3400 +#: directorymergewindow.cpp:3414 #, kde-format msgid "No Operation for All Items" msgstr "सब्बो चीज मन बर कोनो काम नइ" #. i18n("Synchronize Directories"), 0, this, &DirectoryMergeWindow::slotSynchronizeDirectories, ac, "dir_synchronize_directories"); #. d->m_pDirChooseNewerFiles = GuiUtils::createAction< KToggleAction >(i18n("Copy Newer Files Instead of Merging"), 0, this, &DirectoryMergeWindow::slotChooseNewerFiles, ac, "dir_choose_newer_files"); -#: directorymergewindow.cpp:3405 +#: directorymergewindow.cpp:3419 #, kde-format msgid "Show Identical Files" msgstr "" -#: directorymergewindow.cpp:3405 +#: directorymergewindow.cpp:3419 #, kde-format msgid "" "Identical\n" "Files" msgstr "" -#: directorymergewindow.cpp:3406 +#: directorymergewindow.cpp:3420 #, kde-format msgid "Show Different Files" msgstr "भिन्न फाइल देखाव" -#: directorymergewindow.cpp:3407 +#: directorymergewindow.cpp:3421 #, kde-format msgid "Show Files only in A" msgstr "" -#: directorymergewindow.cpp:3407 +#: directorymergewindow.cpp:3421 #, kde-format msgid "" "Files\n" "only in A" msgstr "" -#: directorymergewindow.cpp:3408 +#: directorymergewindow.cpp:3422 #, kde-format msgid "Show Files only in B" msgstr "" -#: directorymergewindow.cpp:3408 +#: directorymergewindow.cpp:3422 #, kde-format msgid "" "Files\n" "only in B" msgstr "" -#: directorymergewindow.cpp:3409 +#: directorymergewindow.cpp:3423 #, kde-format msgid "Show Files only in C" msgstr "" -#: directorymergewindow.cpp:3409 +#: directorymergewindow.cpp:3423 #, kde-format msgid "" "Files\n" "only in C" msgstr "" -#: directorymergewindow.cpp:3413 +#: directorymergewindow.cpp:3427 #, kde-format msgid "Compare Explicitly Selected Files" msgstr "" -#: directorymergewindow.cpp:3414 +#: directorymergewindow.cpp:3428 #, kde-format msgid "Merge Explicitly Selected Files" msgstr "" -#: directorymergewindow.cpp:3416 directorymergewindow.cpp:3423 +#: directorymergewindow.cpp:3430 directorymergewindow.cpp:3437 #, kde-format msgid "Do Nothing" msgstr "कुछ नइ करव" -#: directorymergewindow.cpp:3428 +#: directorymergewindow.cpp:3442 #, kde-format msgid "Delete A && B" msgstr "अ अउ ब ल मेटाव" -#: directorymergewindow.cpp:3431 +#: directorymergewindow.cpp:3445 #, kde-format msgid "Merge to A && B" msgstr "अ अउ ब मं सम्मिलित करव" -#: fileaccess.cpp:462 SourceData.cpp:493 +#: fileaccess.cpp:301 +#, kde-format +msgid "Unable to determine full url. No parent specified." +msgstr "" + +#: fileaccess.cpp:482 SourceData.cpp:506 #, fuzzy, kde-format #| msgid "Reading file: %1" msgid "Failed to read file: %1" msgstr "फ़ाइल पढ़त हे: %1" -#: fileaccess.cpp:587 +#: fileaccess.cpp:624 #, kde-format msgid "Creating temp copy of %1 failed." msgstr "%1 के अस्थाई नकल बनाना फेल." -#: fileaccess.cpp:595 fileaccess.cpp:600 +#: fileaccess.cpp:632 fileaccess.cpp:637 #, fuzzy, kde-format #| msgid "Opening %1 failed." msgid "Opening %1 failed. %2" msgstr "%1 ल खोलना फेल" -#: fileaccess.cpp:619 fileaccess.cpp:627 +#: fileaccess.cpp:656 fileaccess.cpp:664 #, fuzzy, kde-format #| msgid "Error reading from %1" msgid "Error reading from %1. %2" msgstr "%1 से पढ़े मं गलती" -#: fileaccess.cpp:751 +#: fileaccess.cpp:788 #, kde-format msgid "" "While trying to make a backup, deleting an older backup failed.\n" "Filename: %1" msgstr "" -#: fileaccess.cpp:758 +#: fileaccess.cpp:795 #, kde-format msgid "" "While trying to make a backup, renaming failed.\n" "Filenames: %1 -> %2" msgstr "" -#: fileaccess.cpp:828 +#: fileaccess.cpp:865 #, kde-format msgid "Getting file status: %1" msgstr "फाइल स्थिति प्राप्त करत हे : %1" -#: fileaccess.cpp:869 +#: fileaccess.cpp:906 #, kde-format msgid "Reading file: %1" msgstr "फ़ाइल पढ़त हे: %1" -#: fileaccess.cpp:907 +#: fileaccess.cpp:944 #, kde-format msgid "Writing file: %1" msgstr "फाइल: %1 लिखत हे" -#: fileaccess.cpp:940 +#: fileaccess.cpp:977 #, kde-format msgid "Out of memory" msgstr "मेमोरी कम पड़ गिस" -#: fileaccess.cpp:976 +#: fileaccess.cpp:1013 #, kde-format msgid "Making directory: %1" msgstr "डिरेक्टरी बनात हे: %1" -#: fileaccess.cpp:997 +#: fileaccess.cpp:1034 #, kde-format msgid "Removing directory: %1" msgstr "डिरेक्टरी मिटात हे: %1" -#: fileaccess.cpp:1012 +#: fileaccess.cpp:1049 #, kde-format msgid "Removing file: %1" msgstr "फाइल मिटात हे: %1" -#: fileaccess.cpp:1028 +#: fileaccess.cpp:1065 #, kde-format msgid "Creating symbolic link: %1 -> %2" msgstr "सिंबालिक संकली बनावत हे: %1 -> %2" -#: fileaccess.cpp:1052 +#: fileaccess.cpp:1089 #, kde-format msgid "Renaming file: %1 -> %2" msgstr "फाइलनाम बदलत हे: %1 -> %2" -#: fileaccess.cpp:1086 +#: fileaccess.cpp:1123 #, kde-format msgid "Copying file: %1 -> %2" msgstr "फाइल नकल करत हे : %1 -> %2" -#: fileaccess.cpp:1108 +#: fileaccess.cpp:1145 #, fuzzy, kde-format #| msgid "Reading directory: " msgid "Reading directory: %1" msgstr "डिरेक्टरी ल पढ़त हे:" -#: fileaccess.cpp:1162 +#: fileaccess.cpp:1202 #, kde-format msgid "Listing directory: %1" msgstr "डिरेक्टरी सूची मं करत हे : %1" -#: kdiff3.cpp:181 +#: kdiff3.cpp:182 #, kde-format msgid "Current Configuration:" msgstr "अभी हाल के कान्फिगरेसन:" -#: kdiff3.cpp:186 +#: kdiff3.cpp:187 #, kde-format msgid "Config Option Error:" msgstr "" -#: kdiff3.cpp:240 +#: kdiff3.cpp:246 #, kde-format msgid "Option --auto used, but no output file specified." msgstr "विकल्प --auto के उपयोग करिस, तिर कोनो आउटपुट फाइल निरधारित नइ." -#: kdiff3.cpp:416 +#: kdiff3.cpp:405 #, kde-format msgid "Option --auto ignored for directory comparison." msgstr "विकल्प --auto ल डिरेक्टरी तुलना करे मं छोड़ दे गिस." -#: kdiff3.cpp:460 +#: kdiff3.cpp:449 #, kde-format msgid "Saving failed." msgstr "सहेजे मं फेल." -#: kdiff3.cpp:496 pdiff.cpp:1098 +#: kdiff3.cpp:494 pdiff.cpp:1096 #, kde-format msgid "Opening of these files failed:" msgstr "ए फाइल मन ल खोलना फेल:" -#: kdiff3.cpp:505 +#: kdiff3.cpp:503 pdiff.cpp:1105 #, kde-format -msgid "File Open Error" +msgid "File open error" msgstr "फाइल खोले मं गलती" -#: kdiff3.cpp:533 +#: kdiff3.cpp:532 #, kde-format msgid "Opens documents for comparison..." msgstr "कागद मन ल तुलना बर खोलथे ..." -#: kdiff3.cpp:535 +#: kdiff3.cpp:534 #, kde-format msgid "Reload" msgstr "री-लोड" -#: kdiff3.cpp:538 +#: kdiff3.cpp:537 #, kde-format msgid "Saves the merge result. All conflicts must be solved!" msgstr "" -#: kdiff3.cpp:540 +#: kdiff3.cpp:539 #, kde-format msgid "Saves the current document as..." msgstr "अभी हाल के कागद अइसन सहेजथे ..." -#: kdiff3.cpp:543 +#: kdiff3.cpp:542 #, kde-format msgid "Print the differences" msgstr "" -#: kdiff3.cpp:546 +#: kdiff3.cpp:545 #, kde-format msgid "Quits the application" msgstr "अनुपरयोग से बाहिर होथे " -#: kdiff3.cpp:549 +#: kdiff3.cpp:548 #, kde-format msgid "Cuts the selected section and puts it to the clipboard" msgstr "" -#: kdiff3.cpp:552 +#: kdiff3.cpp:551 #, kde-format msgid "Copies the selected section to the clipboard" msgstr "चुने हुए अंस ल क्लिपबोर्ड मं नकल करथे " -#: kdiff3.cpp:554 +#: kdiff3.cpp:553 #, fuzzy, kde-format #| msgid "Pastes the clipboard contents to actual position" msgid "Pastes the clipboard contents to current position" msgstr "क्लिपबोर्ड अवयव मन ल सही जगह मं चिपकाथे " -#: kdiff3.cpp:557 +#: kdiff3.cpp:556 #, kde-format msgid "Select everything in current window" msgstr "" -#: kdiff3.cpp:560 +#: kdiff3.cpp:559 #, kde-format msgid "Search for a string" msgstr "स्ट्रिंग बर खोजव" -#: kdiff3.cpp:562 +#: kdiff3.cpp:561 #, kde-format msgid "Search again for the string" msgstr "स्ट्रिंग बर फिर से खोजव" -#: kdiff3.cpp:567 +#: kdiff3.cpp:566 #, kde-format msgid "Enables/disables the statusbar" msgstr "स्थिति-पट्टी सक्छम/अक्छम करव" -#: kdiff3.cpp:571 +#: kdiff3.cpp:570 #, kde-format msgid "Configure KDiff3..." msgstr "के-डिफ3 ल कान्फिगर करव..." -#: kdiff3.cpp:590 +#: kdiff3.cpp:589 #, kde-format msgid "Go to Current Delta" msgstr "अभी हाल के डेल्टा मं जाव" -#: kdiff3.cpp:590 +#: kdiff3.cpp:589 #, kde-format msgid "" "Current\n" @@ -1137,12 +1142,12 @@ "अभी हाल के\n" " डेल्टा" -#: kdiff3.cpp:592 +#: kdiff3.cpp:591 #, kde-format msgid "Go to First Delta" msgstr "पहिली डेल्टा मं जाव" -#: kdiff3.cpp:592 +#: kdiff3.cpp:591 #, kde-format msgid "" "First\n" @@ -1151,12 +1156,12 @@ "पहिली \n" "डेल्टा" -#: kdiff3.cpp:594 +#: kdiff3.cpp:593 #, kde-format msgid "Go to Last Delta" msgstr "आखरी डेल्टा मं जाव" -#: kdiff3.cpp:594 +#: kdiff3.cpp:593 #, kde-format msgid "" "Last\n" @@ -1165,24 +1170,24 @@ "आखरी\n" "डेल्टा" -#: kdiff3.cpp:596 +#: kdiff3.cpp:595 #, kde-format msgid "(Skips white space differences when \"Show White Space\" is disabled.)" msgstr "" -#: kdiff3.cpp:597 +#: kdiff3.cpp:596 #, kde-format msgid "" "(Does not skip white space differences even when \"Show White Space\" is " "disabled.)" msgstr "" -#: kdiff3.cpp:598 +#: kdiff3.cpp:597 #, kde-format msgid "Go to Previous Delta" msgstr "पिछला डेल्टा मं जाव" -#: kdiff3.cpp:598 +#: kdiff3.cpp:597 #, kde-format msgid "" "Prev\n" @@ -1191,12 +1196,12 @@ "पिछला \n" "डेल्टा" -#: kdiff3.cpp:600 +#: kdiff3.cpp:599 #, kde-format msgid "Go to Next Delta" msgstr "अगला डेल्टा मं जाव" -#: kdiff3.cpp:600 +#: kdiff3.cpp:599 #, kde-format msgid "" "Next\n" @@ -1205,12 +1210,12 @@ "अगला \n" "डेल्टा" -#: kdiff3.cpp:602 +#: kdiff3.cpp:601 #, kde-format msgid "Go to Previous Conflict" msgstr "पिछले आपसी विरोधों मं जाव" -#: kdiff3.cpp:602 +#: kdiff3.cpp:601 #, kde-format msgid "" "Prev\n" @@ -1219,12 +1224,12 @@ "पिछला\n" "आपसी विरोध" -#: kdiff3.cpp:604 +#: kdiff3.cpp:603 #, kde-format msgid "Go to Next Conflict" msgstr "अगले आपसी विरोधों मं जाव" -#: kdiff3.cpp:604 +#: kdiff3.cpp:603 #, kde-format msgid "" "Next\n" @@ -1233,12 +1238,12 @@ "अगले \n" "आपसी विरोध" -#: kdiff3.cpp:606 +#: kdiff3.cpp:605 #, kde-format msgid "Go to Previous Unsolved Conflict" msgstr "पिछले समाधान-रहित आपसी विरोधों मं जाव" -#: kdiff3.cpp:606 +#: kdiff3.cpp:605 #, kde-format msgid "" "Prev\n" @@ -1247,12 +1252,12 @@ "पिछला\n" "हल नइ" -#: kdiff3.cpp:608 +#: kdiff3.cpp:607 #, kde-format msgid "Go to Next Unsolved Conflict" msgstr "अगले समाधान-रहित आपसी विरोधों मं जाव" -#: kdiff3.cpp:608 +#: kdiff3.cpp:607 #, kde-format msgid "" "Next\n" @@ -1261,48 +1266,48 @@ "अगला\n" "हल नइ" -#: kdiff3.cpp:610 +#: kdiff3.cpp:609 #, kde-format msgid "Select Line(s) From A" msgstr "अ से लाइन चुनव" -#: kdiff3.cpp:610 +#: kdiff3.cpp:609 #, kde-format msgid "" "Choose\n" "A" msgstr "" -#: kdiff3.cpp:611 +#: kdiff3.cpp:610 #, kde-format msgid "Select Line(s) From B" msgstr "ब से लाइन चुनव" -#: kdiff3.cpp:611 +#: kdiff3.cpp:610 #, kde-format msgid "" "Choose\n" "B" msgstr "" -#: kdiff3.cpp:612 +#: kdiff3.cpp:611 #, kde-format msgid "Select Line(s) From C" msgstr "स से लाइन चुनव" -#: kdiff3.cpp:612 +#: kdiff3.cpp:611 #, kde-format msgid "" "Choose\n" "C" msgstr "" -#: kdiff3.cpp:613 +#: kdiff3.cpp:612 #, kde-format msgid "Automatically Go to Next Unsolved Conflict After Source Selection" msgstr "" -#: kdiff3.cpp:613 +#: kdiff3.cpp:612 #, kde-format msgid "" "Auto\n" @@ -1311,37 +1316,37 @@ "अपने अपन \n" "अगला" -#: kdiff3.cpp:615 +#: kdiff3.cpp:614 #, fuzzy, kde-format #| msgid "Show Space && Tabulator Characters for Differences" msgid "Show Space && Tabulator Characters" msgstr "भिन्नताओं बर टेबुलेटर अक्छर अउ जगह देखाव " -#: kdiff3.cpp:615 +#: kdiff3.cpp:614 #, kde-format msgid "" "White\n" "Characters" msgstr "" -#: kdiff3.cpp:616 +#: kdiff3.cpp:615 #, kde-format msgid "Show White Space" msgstr "सफेद जगह देखाव" -#: kdiff3.cpp:616 +#: kdiff3.cpp:615 #, kde-format msgid "" "White\n" "Deltas" msgstr "" -#: kdiff3.cpp:618 +#: kdiff3.cpp:617 #, kde-format msgid "Show Line Numbers" msgstr "लकीर नंबर देखाव" -#: kdiff3.cpp:618 +#: kdiff3.cpp:617 #, kde-format msgid "" "Line\n" @@ -1350,194 +1355,194 @@ "लकीर \n" "नंबर" -#: kdiff3.cpp:620 +#: kdiff3.cpp:619 #, kde-format msgid "Automatically Solve Simple Conflicts" msgstr "सादा आपसी विरोधों के अपने अपन समाधान करव" -#: kdiff3.cpp:621 +#: kdiff3.cpp:620 #, kde-format msgid "Set Deltas to Conflicts" msgstr "डेल्टा ल आपसी विरोधों मं सेट करव" -#: kdiff3.cpp:622 +#: kdiff3.cpp:621 #, kde-format msgid "Run Regular Expression Auto Merge" msgstr "" -#: kdiff3.cpp:623 +#: kdiff3.cpp:622 #, kde-format msgid "Automatically Solve History Conflicts" msgstr "इतिहास आपसी विरोधों के अपने अपन समाधान करव" -#: kdiff3.cpp:624 +#: kdiff3.cpp:623 #, kde-format msgid "Split Diff At Selection" msgstr "" -#: kdiff3.cpp:625 +#: kdiff3.cpp:624 #, kde-format msgid "Join Selected Diffs" msgstr "चुने गे डिफ मिलाव" -#: kdiff3.cpp:627 +#: kdiff3.cpp:626 #, kde-format msgid "Show Window A" msgstr "विंडो अ देखाव" -#: kdiff3.cpp:628 +#: kdiff3.cpp:627 #, kde-format msgid "Show Window B" msgstr "विंडो ब देखाव" -#: kdiff3.cpp:629 +#: kdiff3.cpp:628 #, kde-format msgid "Show Window C" msgstr "विंडो स देखाव" -#: kdiff3.cpp:631 +#: kdiff3.cpp:630 #, kde-format msgid "Normal Overview" msgstr "सामान्य ओवरव्यू" -#: kdiff3.cpp:632 +#: kdiff3.cpp:631 #, kde-format msgid "A vs. B Overview" msgstr "अ वि. ब ओवरव्यू" -#: kdiff3.cpp:633 +#: kdiff3.cpp:632 #, kde-format msgid "A vs. C Overview" msgstr "अ वि. स ओवरव्यू" -#: kdiff3.cpp:634 +#: kdiff3.cpp:633 #, kde-format msgid "B vs. C Overview" msgstr "ब वि. स ओवरव्यू" -#: kdiff3.cpp:635 +#: kdiff3.cpp:634 #, kde-format msgid "Word Wrap Diff Windows" msgstr "वर्ड व्रेप डिफ विंडोज" -#: kdiff3.cpp:636 +#: kdiff3.cpp:635 #, kde-format msgid "Add Manual Diff Alignment" msgstr "" -#: kdiff3.cpp:637 +#: kdiff3.cpp:636 #, kde-format msgid "Clear All Manual Diff Alignments" msgstr "" -#: kdiff3.cpp:639 +#: kdiff3.cpp:638 #, kde-format msgid "Focus Next Window" msgstr "अगले विंडो मं फोकस" -#: kdiff3.cpp:640 +#: kdiff3.cpp:639 #, kde-format msgid "Focus Prev Window" msgstr "पिछले विंडो मं फोकस" -#: kdiff3.cpp:641 +#: kdiff3.cpp:640 #, kde-format msgid "Toggle Split Orientation" msgstr "अलग करे के दिसा टागल करव" -#: kdiff3.cpp:643 +#: kdiff3.cpp:642 #, kde-format msgid "Dir && Text Split Screen View" msgstr "डिरेक्टरी अउ पाठ स्प्लिट स्क्रीन दृस्य" -#: kdiff3.cpp:645 +#: kdiff3.cpp:644 #, kde-format msgid "Toggle Between Dir && Text View" msgstr "डिरेक्टरी अउ पाठ दृस्य के बीच टागल करव" -#: kdiff3.cpp:697 pdiff.cpp:1909 +#: kdiff3.cpp:696 pdiff.cpp:1919 #, fuzzy, kde-format #| msgid "The merge result hasn't been saved." msgid "The merge result has not been saved." msgstr "सम्मिलित करे के परिनाम अभी सहेजे नइ गिस." -#: kdiff3.cpp:699 +#: kdiff3.cpp:698 #, kde-format msgid "Save && Quit" msgstr "सहेजव अउ बाहिर हों" -#: kdiff3.cpp:700 +#: kdiff3.cpp:699 #, kde-format msgid "Quit Without Saving" msgstr "सहेजे बिना बाहिर हों" -#: kdiff3.cpp:708 pdiff.cpp:1920 +#: kdiff3.cpp:707 pdiff.cpp:1930 #, kde-format msgid "Saving the merge result failed." msgstr "सम्मिलित करे जाय के परिनाम सहेजना फेल." -#: kdiff3.cpp:719 pdiff.cpp:1032 +#: kdiff3.cpp:718 pdiff.cpp:1030 #, kde-format msgid "" "You are currently doing a directory merge. Are you sure, you want to abort?" msgstr "" -#: kdiff3.cpp:742 +#: kdiff3.cpp:741 #, kde-format msgid "Saving file..." msgstr "फाइल सहेजत हे..." -#: kdiff3.cpp:759 +#: kdiff3.cpp:758 #, kde-format msgid "Saving file with a new filename..." msgstr "फाइल नवा फाइलनाम के साथ सहेजत हे..." -#: kdiff3.cpp:761 +#: kdiff3.cpp:760 #, kde-format msgid "Save As..." msgstr "अइसन सहेजव..." -#: kdiff3.cpp:820 +#: kdiff3.cpp:819 #, fuzzy, kde-format msgid "Printing not implemented." msgstr "सम्मिलित करे के काम पूरा होइस." -#: kdiff3.cpp:857 +#: kdiff3.cpp:858 #, fuzzy, kde-format msgid "Printing..." msgstr "छापव..." -#: kdiff3.cpp:943 +#: kdiff3.cpp:948 #, kde-format msgid "Printing page %1 of %2" msgstr "" -#: kdiff3.cpp:1000 +#: kdiff3.cpp:1006 #, fuzzy, kde-format msgid " (Selection)" msgstr "फोंट चुनव" -#: kdiff3.cpp:1027 +#: kdiff3.cpp:1034 #, fuzzy, kde-format msgid "Printing completed." msgstr "सम्मिलित करे के काम पूरा होइस." -#: kdiff3.cpp:1031 +#: kdiff3.cpp:1038 #, fuzzy, kde-format msgid "Printing aborted." msgstr "सम्मिलित करे के काम पूरा होइस." -#: kdiff3.cpp:1038 +#: kdiff3.cpp:1045 #, kde-format msgid "Exiting..." msgstr "बाहिर होवत हे..." -#: kdiff3.cpp:1049 +#: kdiff3.cpp:1056 #, kde-format msgid "Toggling toolbar..." msgstr "टूलबार टागल करत हे..." -#: kdiff3.cpp:1070 +#: kdiff3.cpp:1077 #, kde-format msgid "Toggle the statusbar..." msgstr "स्थिति पट्टी टागल करव..." @@ -1563,7 +1568,7 @@ msgid "Joachim Eibl" msgstr "" -#: kdiff3_part.cpp:173 kdiff3_part.cpp:254 +#: kdiff3_part.cpp:174 kdiff3_part.cpp:255 #, fuzzy, kde-format #| msgid "Couldn't find files for comparison." msgid "Could not find files for comparison." @@ -1582,7 +1587,7 @@ msgstr "के-डिफ3 ल कान्फिगर करव" #. i18n: ectx: ToolBar (mainToolBar) -#: kdiff3_part.rc:16 main.cpp:88 +#: kdiff3_part.rc:16 main.cpp:89 #, kde-format msgid "KDiff3" msgstr "के-डिफ3" @@ -1651,169 +1656,175 @@ msgid "Main Toolbar" msgstr "मुख्य औजार पट्टी" -#: main.cpp:68 main.cpp:72 +#: main.cpp:69 main.cpp:73 #, kde-format msgid "Ignored. (User defined.)" msgstr "" -#: main.cpp:92 +#: main.cpp:93 #, kde-format msgid " (64 bit)" msgstr "" -#: main.cpp:94 +#: main.cpp:95 #, kde-format msgid " (32 bit)" msgstr "" -#: main.cpp:95 +#: main.cpp:96 #, kde-format msgid "Tool for Comparison and Merge of Files and Directories" msgstr "" -#: main.cpp:96 +#: main.cpp:97 #, kde-format msgid "(c) 2002-2014 Joachim Eibl, (c) 2017 Michael Reeves KF5/Qt5 port" msgstr "" -#: main.cpp:112 +#: main.cpp:113 #, kde-format msgid "Merge the input." msgstr "इनपुट मिलाव." -#: main.cpp:113 +#: main.cpp:114 #, kde-format msgid "Explicit base file. For compatibility with certain tools." msgstr "" -#: main.cpp:114 +#: main.cpp:115 #, kde-format msgid "Output file. Implies -m. E.g.: -o newfile.txt" msgstr "आउटपुट फाइल. इम्प्लाइस -m. उदा.: -o newfile.txt" -#: main.cpp:115 +#: main.cpp:116 #, kde-format msgid "Output file, again. (For compatibility with certain tools.)" msgstr "आउटपुट फाइल, फिर से. (कुछ औजार मन के साथ कम्पेटिबिलिटी बर.)" -#: main.cpp:116 +#: main.cpp:118 #, kde-format msgid "No GUI if all conflicts are auto-solvable. (Needs -o file)" msgstr "" -#: main.cpp:117 +#: main.cpp:120 +#, fuzzy, kde-format +#| msgid "Ignore" +msgid "Ignored." +msgstr "अनदेखा करव" + +#: main.cpp:122 #, kde-format msgid "Do not solve conflicts automatically." msgstr "" -#: main.cpp:118 +#: main.cpp:123 #, kde-format msgid "Visible name replacement for input file 1 (base)." msgstr "इनपुट फाइल 1 (आधार) बर विजिबल नाम रीप्लेसमेंट." -#: main.cpp:119 +#: main.cpp:124 #, kde-format msgid "Visible name replacement for input file 2." msgstr "इनपुट फाइल 2 बर विजिबल नाम रीप्लेसमेंट." -#: main.cpp:120 +#: main.cpp:125 #, kde-format msgid "Visible name replacement for input file 3." msgstr "इनपुट फाइल 3 बर विजिबल नाम रीप्लेसमेंट." -#: main.cpp:121 +#: main.cpp:126 #, kde-format msgid "Alternative visible name replacement. Supply this once for every input." msgstr "" -#: main.cpp:122 +#: main.cpp:127 #, kde-format msgid "" "Override a config setting. Use once for every setting. E.g.: --cs " "\"AutoAdvance=1\"" msgstr "" -#: main.cpp:123 +#: main.cpp:128 #, kde-format msgid "Show list of config settings and current values." msgstr "" -#: main.cpp:124 +#: main.cpp:129 #, kde-format msgid "Use a different config file." msgstr "" -#: main.cpp:127 +#: main.cpp:132 #, kde-format msgid "file1 to open (base, if not specified via --base)" msgstr "खोले बर फाइल1 (आधार, यदि एखर साथ निरधारित नइ --base)" -#: main.cpp:128 +#: main.cpp:133 #, kde-format msgid "file2 to open" msgstr "खोले बर फाइल2" -#: main.cpp:129 +#: main.cpp:134 #, kde-format msgid "file3 to open" msgstr "खोले बर फाइल3" -#: main.cpp:153 +#: main.cpp:158 #, kde-format msgid "See kdiff3 --help for supported options." msgstr "" -#: mergeresultwindow.cpp:158 +#: mergeresultwindow.cpp:171 #, kde-format msgid "Choose A Everywhere" msgstr "सब्बो जगह अ चुनव" -#: mergeresultwindow.cpp:159 +#: mergeresultwindow.cpp:172 #, kde-format msgid "Choose B Everywhere" msgstr "सब्बो जगह ब चुनव" -#: mergeresultwindow.cpp:160 +#: mergeresultwindow.cpp:173 #, kde-format msgid "Choose C Everywhere" msgstr "सब्बो जगह स चुनव" -#: mergeresultwindow.cpp:161 +#: mergeresultwindow.cpp:174 #, kde-format msgid "Choose A for All Unsolved Conflicts" msgstr "सब्बो समाधान-रहित आपसी विरोधों बर अ चुनव" -#: mergeresultwindow.cpp:162 +#: mergeresultwindow.cpp:175 #, kde-format msgid "Choose B for All Unsolved Conflicts" msgstr "सब्बो समाधान-रहित आपसी विरोधों बर ब चुनव" -#: mergeresultwindow.cpp:163 +#: mergeresultwindow.cpp:176 #, kde-format msgid "Choose C for All Unsolved Conflicts" msgstr "सब्बो समाधान-रहित आपसी विरोधों बर स चुनव" -#: mergeresultwindow.cpp:164 +#: mergeresultwindow.cpp:177 #, kde-format msgid "Choose A for All Unsolved Whitespace Conflicts" msgstr "सब्बो समाधान-रहित सफेद-जगह आपसी विरोधों बर अ चुनव" -#: mergeresultwindow.cpp:165 +#: mergeresultwindow.cpp:178 #, kde-format msgid "Choose B for All Unsolved Whitespace Conflicts" msgstr "सब्बो समाधान-रहित सफेद-जगह आपसी विरोधों बर ब चुनव" -#: mergeresultwindow.cpp:166 +#: mergeresultwindow.cpp:179 #, kde-format msgid "Choose C for All Unsolved Whitespace Conflicts" msgstr "सब्बो समाधान-रहित सफेद-जगह आपसी विरोधों बर स चुनव" -#: mergeresultwindow.cpp:176 +#: mergeresultwindow.cpp:204 #, kde-format msgid "Number of remaining unsolved conflicts: %1 (of which %2 are whitespace)" msgstr "" -#: mergeresultwindow.cpp:370 +#: mergeresultwindow.cpp:398 #, kde-format msgid "" "The output has been modified.\n" @@ -1822,29 +1833,29 @@ "आउटपुट सुधारे जा गे हे.\n" "यदि आप मन जारी रखथो तहां आप मन के बदलाव खो जाही." -#: mergeresultwindow.cpp:936 pdiff.cpp:827 +#: mergeresultwindow.cpp:964 pdiff.cpp:817 #, kde-format msgid "All input files are binary equal." msgstr "सब्बो इनपुट फाइल बाइनरी समान हे." -#: mergeresultwindow.cpp:938 +#: mergeresultwindow.cpp:966 #, kde-format msgid "All input files contain the same text." msgstr "सब्बो इनपुट फाइल मन ल एके पाठ रखे हे." -#: mergeresultwindow.cpp:942 mergeresultwindow.cpp:946 -#: mergeresultwindow.cpp:950 pdiff.cpp:833 pdiff.cpp:837 pdiff.cpp:841 +#: mergeresultwindow.cpp:970 mergeresultwindow.cpp:974 +#: mergeresultwindow.cpp:978 pdiff.cpp:823 pdiff.cpp:827 pdiff.cpp:831 #, kde-format msgid "Files %1 and %2 are binary equal.\n" msgstr "" -#: mergeresultwindow.cpp:944 mergeresultwindow.cpp:948 -#: mergeresultwindow.cpp:952 +#: mergeresultwindow.cpp:972 mergeresultwindow.cpp:976 +#: mergeresultwindow.cpp:980 #, kde-format msgid "Files %1 and %2 have equal text.\n" msgstr "" -#: mergeresultwindow.cpp:958 +#: mergeresultwindow.cpp:986 #, kde-format msgid "" "Total number of conflicts: %1\n" @@ -1853,27 +1864,27 @@ "%4" msgstr "" -#: mergeresultwindow.cpp:964 +#: mergeresultwindow.cpp:992 #, kde-format msgid "Conflicts" msgstr "आपसी विरोध" -#: mergeresultwindow.cpp:1873 +#: mergeresultwindow.cpp:1901 #, kde-format msgid "" msgstr "<कोई स्रोत लकीर नइ>" -#: mergeresultwindow.cpp:1881 +#: mergeresultwindow.cpp:1909 #, kde-format msgid "" msgstr "<विरोधाभास (सिरिफ सफेद जगह) सम्मिलित करव>" -#: mergeresultwindow.cpp:1883 mergeresultwindow.cpp:2755 +#: mergeresultwindow.cpp:1911 mergeresultwindow.cpp:2783 #, kde-format msgid "" msgstr "<विरोधाभास सम्मिलित करव>" -#: mergeresultwindow.cpp:2967 +#: mergeresultwindow.cpp:2995 #, fuzzy, kde-format #| msgid "" #| "Not all conflicts are solved yet.\n" @@ -1885,12 +1896,12 @@ "अब तक सब्बो विरोधाभासों के समाधान नइ करे गे हे.\n" "फाइल सहेजे नइ गिस.\n" -#: mergeresultwindow.cpp:2969 mergeresultwindow.cpp:2978 +#: mergeresultwindow.cpp:2997 mergeresultwindow.cpp:3006 #, kde-format msgid "Conflicts Left" msgstr "विरोधाभास डेरी " -#: mergeresultwindow.cpp:2976 +#: mergeresultwindow.cpp:3004 #, kde-format msgid "" "There is a line end style conflict. Please choose the line end style " @@ -1898,7 +1909,7 @@ "File not saved." msgstr "" -#: mergeresultwindow.cpp:2990 +#: mergeresultwindow.cpp:3018 #, kde-format msgid "" "\n" @@ -1906,58 +1917,58 @@ "Creating backup failed. File not saved." msgstr "" -#: mergeresultwindow.cpp:2990 mergeresultwindow.cpp:3038 +#: mergeresultwindow.cpp:3018 mergeresultwindow.cpp:3066 #, kde-format msgid "File Save Error" msgstr "फाइल सहेजे मं गलती" -#: mergeresultwindow.cpp:3038 +#: mergeresultwindow.cpp:3066 #, kde-format msgid "Error while writing." msgstr "लिखे के समय गलती." -#: mergeresultwindow.cpp:3110 +#: mergeresultwindow.cpp:3138 #, fuzzy, kde-format #| msgid "Output" msgid "Output:" msgstr "आउटपुट" -#: mergeresultwindow.cpp:3123 mergeresultwindow.cpp:3315 +#: mergeresultwindow.cpp:3151 mergeresultwindow.cpp:3343 #, kde-format msgid "[Modified]" msgstr "[परिवर्धित]" -#: mergeresultwindow.cpp:3130 +#: mergeresultwindow.cpp:3158 #, kde-format msgid "Encoding for saving:" msgstr "" -#: mergeresultwindow.cpp:3230 +#: mergeresultwindow.cpp:3258 #, fuzzy, kde-format msgid "Conflict" msgstr "आपसी विरोध" -#: mergeresultwindow.cpp:3262 +#: mergeresultwindow.cpp:3290 #, kde-format msgid "Codec from A: %1" msgstr "" -#: mergeresultwindow.cpp:3264 +#: mergeresultwindow.cpp:3292 #, kde-format msgid "Codec from B: %1" msgstr "" -#: mergeresultwindow.cpp:3266 +#: mergeresultwindow.cpp:3294 #, kde-format msgid "Codec from C: %1" msgstr "" -#: optiondialog.cpp:119 +#: optiondialog.cpp:121 #, kde-format msgid "Change Font" msgstr "" -#: optiondialog.cpp:135 optiondialog.cpp:145 +#: optiondialog.cpp:137 optiondialog.cpp:147 #, kde-format msgid "" "Font: %1, %2, %3\n" @@ -1965,208 +1976,208 @@ "Example:" msgstr "" -#: optiondialog.cpp:388 +#: optiondialog.cpp:390 #, kde-format msgid "Unicode" msgstr "युनिकोड" -#: optiondialog.cpp:389 +#: optiondialog.cpp:391 #, kde-format msgid "Latin1" msgstr "लेटिन-१" -#: optiondialog.cpp:408 +#: optiondialog.cpp:410 #, kde-format msgid "Change this if non-ASCII characters are not displayed correctly." msgstr "" -#: optiondialog.cpp:491 +#: optiondialog.cpp:495 #, kde-format msgid "Configure" msgstr "कान्फिगर...." -#: optiondialog.cpp:568 +#: optiondialog.cpp:573 #, kde-format msgid "Font" msgstr "फोंट" -#: optiondialog.cpp:570 +#: optiondialog.cpp:575 #, kde-format msgid "Editor & Diff Output Font" msgstr "संपादक अउ डिफ आउटपुट फोंट" -#: optiondialog.cpp:589 +#: optiondialog.cpp:594 #, kde-format msgid "Application font" msgstr "" -#: optiondialog.cpp:594 +#: optiondialog.cpp:599 #, fuzzy, kde-format #| msgid "File Save Error" msgid "File view font" msgstr "फाइल सहेजे मं गलती" -#: optiondialog.cpp:613 +#: optiondialog.cpp:618 #, fuzzy, kde-format #| msgid "Color" msgctxt "Title for color settings page" msgid "Color" msgstr "रंग" -#: optiondialog.cpp:614 +#: optiondialog.cpp:619 #, kde-format msgid "Colors Settings" msgstr "रंग सेटिंग" -#: optiondialog.cpp:631 +#: optiondialog.cpp:644 #, kde-format msgid "Editor and Diff Views:" msgstr "" -#: optiondialog.cpp:639 +#: optiondialog.cpp:652 #, kde-format msgid "Foreground color:" msgstr "आगू तरफ के रंगः" -#: optiondialog.cpp:647 +#: optiondialog.cpp:660 #, kde-format msgid "Background color:" msgstr "पिछोत अंगना के रंगः" -#: optiondialog.cpp:657 +#: optiondialog.cpp:670 #, kde-format msgid "Diff background color:" msgstr "डिफ पिछोत अंगना रंगः" -#: optiondialog.cpp:666 +#: optiondialog.cpp:679 #, kde-format msgid "Color A:" msgstr "रंग अ:" -#: optiondialog.cpp:675 +#: optiondialog.cpp:688 #, kde-format msgid "Color B:" msgstr "रंग ब:" -#: optiondialog.cpp:684 +#: optiondialog.cpp:697 #, kde-format msgid "Color C:" msgstr "रंग स:" -#: optiondialog.cpp:692 +#: optiondialog.cpp:705 #, kde-format msgid "Conflict color:" msgstr "विरोधाभास बर रंग:" -#: optiondialog.cpp:701 +#: optiondialog.cpp:714 #, kde-format msgid "Current range background color:" msgstr "अभी हाल के सीमा पिछोत अंगना रंग:" -#: optiondialog.cpp:710 +#: optiondialog.cpp:723 #, kde-format msgid "Current range diff background color:" msgstr "अभी हाल के सीमा डिफ पिछोत अंगना रंग:" -#: optiondialog.cpp:718 +#: optiondialog.cpp:731 #, kde-format msgid "Color for manually aligned difference ranges:" msgstr "" -#: optiondialog.cpp:725 +#: optiondialog.cpp:738 #, kde-format msgid "Directory Comparison View:" msgstr "डिरेक्टरी तुलना दृस्य:" -#: optiondialog.cpp:731 +#: optiondialog.cpp:744 #, kde-format msgid "Newest file color:" msgstr "" -#: optiondialog.cpp:736 +#: optiondialog.cpp:749 #, kde-format msgid "" "Changing this color will only be effective when starting the next directory " "comparison." msgstr "" -#: optiondialog.cpp:741 +#: optiondialog.cpp:754 #, kde-format msgid "Oldest file color:" msgstr "" -#: optiondialog.cpp:750 +#: optiondialog.cpp:763 #, kde-format msgid "Middle age file color:" msgstr "" -#: optiondialog.cpp:759 +#: optiondialog.cpp:772 #, kde-format msgid "Color for missing files:" msgstr "" -#: optiondialog.cpp:773 +#: optiondialog.cpp:786 #, kde-format msgid "Editor" msgstr "संपादक" -#: optiondialog.cpp:774 +#: optiondialog.cpp:787 #, kde-format msgid "Editor Behavior" msgstr "संपादक व्यवहार" -#: optiondialog.cpp:787 +#: optiondialog.cpp:809 #, kde-format msgid "Tab inserts spaces" msgstr "टैब जगह भरव करथे " -#: optiondialog.cpp:791 +#: optiondialog.cpp:813 #, kde-format msgid "" "On: Pressing tab generates the appropriate number of spaces.\n" "Off: A tab character will be inserted." msgstr "" -#: optiondialog.cpp:796 +#: optiondialog.cpp:818 #, kde-format msgid "Tab size:" msgstr "टैब आकारः" -#: optiondialog.cpp:803 +#: optiondialog.cpp:825 #, kde-format msgid "Auto indentation" msgstr "अपने अपन हासिया छोड़ना" -#: optiondialog.cpp:807 +#: optiondialog.cpp:829 #, kde-format msgid "On: The indentation of the previous line is used for a new line.\n" msgstr "" -#: optiondialog.cpp:810 +#: optiondialog.cpp:832 #, kde-format msgid "Auto copy selection" msgstr "अपने अपन नकल चयन" -#: optiondialog.cpp:814 +#: optiondialog.cpp:836 #, kde-format msgid "" "On: Any selection is immediately written to the clipboard.\n" "Off: You must explicitly copy e.g. via Ctrl-C." msgstr "" -#: optiondialog.cpp:829 +#: optiondialog.cpp:851 #, kde-format msgid "" "Sets the line endings for when an edited file is saved.\n" "DOS/Windows: CR+LF; UNIX: LF; with CR=0D, LF=0A" msgstr "" -#: optiondialog.cpp:839 +#: optiondialog.cpp:861 #, kde-format msgid "Diff" msgstr "डिफ" -#: optiondialog.cpp:840 +#: optiondialog.cpp:862 #, kde-format msgid "Diff Settings" msgstr "डिफ सेटिंग" @@ -2180,13 +2191,13 @@ #. ); #. ++line; #. -#: optiondialog.cpp:865 +#: optiondialog.cpp:896 #, fuzzy, kde-format #| msgid "Treat as white space." msgid "Ignore numbers (treat as white space)" msgstr "सफेद जगह के रूप मं समझव." -#: optiondialog.cpp:869 +#: optiondialog.cpp:900 #, kde-format msgid "" "Ignore number characters during line matching phase. (Similar to Ignore " @@ -2194,68 +2205,68 @@ "Might help to compare files with numeric data." msgstr "" -#: optiondialog.cpp:873 +#: optiondialog.cpp:904 #, fuzzy, kde-format #| msgid "Treat C/C++ comments like white space." msgid "Ignore C/C++ comments (treat as white space)" msgstr "C/C++ कमेंट्स ल सफेद जगह के रूप मं समझव" -#: optiondialog.cpp:876 +#: optiondialog.cpp:907 #, kde-format msgid "Treat C/C++ comments like white space." msgstr "C/C++ कमेंट्स ल सफेद जगह के रूप मं समझव" -#: optiondialog.cpp:879 +#: optiondialog.cpp:910 #, fuzzy, kde-format #| msgid "Treat as white space." msgid "Ignore case (treat as white space)" msgstr "सफेद जगह के रूप मं समझव." -#: optiondialog.cpp:883 +#: optiondialog.cpp:914 #, kde-format msgid "Treat case differences like white space changes. ('a'<=>'A')" msgstr "केस डिफरेंसेस ल सफेद जगह बदले के रूप मं समझव. ('a'<=>'A')" -#: optiondialog.cpp:886 +#: optiondialog.cpp:917 #, kde-format msgid "Preprocessor command:" msgstr "प्री-प्रोसेसर कमांड:" -#: optiondialog.cpp:891 +#: optiondialog.cpp:922 #, kde-format msgid "User defined pre-processing. (See the docs for details.)" msgstr "कमइया परिभासित प्री-प्रोसेसिंग. (विवरन बर कागद देखव.)" -#: optiondialog.cpp:894 +#: optiondialog.cpp:925 #, kde-format msgid "Line-matching preprocessor command:" msgstr "लाइन-मैचिंग प्री-प्रोसेसर कमांड:" -#: optiondialog.cpp:899 +#: optiondialog.cpp:930 #, kde-format msgid "" "This pre-processor is only used during line matching.\n" "(See the docs for details.)" msgstr "" -#: optiondialog.cpp:902 +#: optiondialog.cpp:933 #, kde-format msgid "Try hard (slower)" msgstr "गंभीर कोसिस करव (धीमा)" -#: optiondialog.cpp:906 +#: optiondialog.cpp:937 #, kde-format msgid "" "Enables the --minimal option for the external diff.\n" "The analysis of big files will be much slower." msgstr "" -#: optiondialog.cpp:910 +#: optiondialog.cpp:941 #, kde-format msgid "Align B and C for 3 input files" msgstr "" -#: optiondialog.cpp:914 +#: optiondialog.cpp:945 #, kde-format msgid "" "Try to align B and C when comparing or merging three input files.\n" @@ -2263,66 +2274,73 @@ "(Default is off.)" msgstr "" -#: optiondialog.cpp:926 +#: optiondialog.cpp:956 +#, fuzzy, kde-format +#| msgid "Merge" +msgctxt "Settings page" +msgid "Merge" +msgstr "सम्मिलित करव" + +#: optiondialog.cpp:957 #, kde-format msgid "Merge Settings" msgstr "मिलाय के सेटिंग" -#: optiondialog.cpp:940 +#: optiondialog.cpp:980 #, kde-format msgid "Auto advance delay (ms):" msgstr "अपने अपन एडवान्स देरी (मि.से.):" -#: optiondialog.cpp:946 +#: optiondialog.cpp:986 #, kde-format 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 "" -#: optiondialog.cpp:950 +#: optiondialog.cpp:990 #, kde-format msgid "Show info dialogs" msgstr "जानकारी गोठ देखाव" -#: optiondialog.cpp:953 +#: optiondialog.cpp:993 #, kde-format msgid "Show a dialog with information about the number of conflicts." msgstr "" -#: optiondialog.cpp:956 +#: optiondialog.cpp:996 #, kde-format msgid "White space 2-file merge default:" msgstr "सफेद जगह 2-फाइल सम्मिलित डिफाल्ट:" -#: optiondialog.cpp:961 optiondialog.cpp:974 +#: optiondialog.cpp:1001 optiondialog.cpp:1014 #, kde-format msgid "Manual Choice" msgstr "हस्तचालित चुनाव" -#: optiondialog.cpp:965 optiondialog.cpp:979 +#: optiondialog.cpp:1005 optiondialog.cpp:1019 #, kde-format msgid "" "Allow the merge algorithm to automatically select an input for white-space-" "only changes." msgstr "" -#: optiondialog.cpp:969 +#: optiondialog.cpp:1009 #, kde-format msgid "White space 3-file merge default:" msgstr "सफेद जगह 3-फाइल सम्मिलित डिफाल्ट:" -#: optiondialog.cpp:983 +#: optiondialog.cpp:1023 #, kde-format msgid "Automatic Merge Regular Expression" msgstr "" -#: optiondialog.cpp:991 smalldialogs.cpp:449 +#: optiondialog.cpp:1031 smalldialogs.cpp:459 #, kde-format msgid "Auto merge regular expression:" msgstr "" -#: optiondialog.cpp:996 +#: optiondialog.cpp:1036 #, kde-format msgid "" "Regular expression for lines where KDiff3 should automatically choose one " @@ -2331,29 +2349,29 @@ "- if available - C, otherwise B will be chosen." msgstr "" -#: optiondialog.cpp:1002 +#: optiondialog.cpp:1042 #, kde-format msgid "Run regular expression auto merge on merge start" msgstr "" -#: optiondialog.cpp:1005 +#: optiondialog.cpp:1045 #, kde-format msgid "" "Run the merge for auto merge regular expressions\n" "immediately when a merge starts.\n" msgstr "" -#: optiondialog.cpp:1010 +#: optiondialog.cpp:1050 #, kde-format msgid "Version Control History Merging" msgstr "" -#: optiondialog.cpp:1018 smalldialogs.cpp:476 +#: optiondialog.cpp:1058 smalldialogs.cpp:486 #, kde-format msgid "History start regular expression:" msgstr "" -#: optiondialog.cpp:1023 +#: optiondialog.cpp:1063 #, kde-format msgid "" "Regular expression for the start of the version control history entry.\n" @@ -2361,12 +2379,12 @@ "Default value: \".*\\$Log.*\\$.*\"" msgstr "" -#: optiondialog.cpp:1029 smalldialogs.cpp:504 +#: optiondialog.cpp:1069 smalldialogs.cpp:514 #, kde-format msgid "History entry start regular expression:" msgstr "" -#: optiondialog.cpp:1042 +#: optiondialog.cpp:1082 #, kde-format msgid "" "A version control history entry consists of several lines.\n" @@ -2378,22 +2396,22 @@ "See the documentation for details." msgstr "" -#: optiondialog.cpp:1050 +#: optiondialog.cpp:1090 #, kde-format msgid "History merge sorting" msgstr "" -#: optiondialog.cpp:1053 +#: optiondialog.cpp:1093 #, kde-format msgid "Sort version control history by a key." msgstr "" -#: optiondialog.cpp:1063 +#: optiondialog.cpp:1103 #, kde-format msgid "History entry start sort key order:" msgstr "" -#: optiondialog.cpp:1068 +#: optiondialog.cpp:1108 #, kde-format msgid "" "Each pair of parentheses used in the regular expression for the history " @@ -2405,37 +2423,37 @@ "See the documentation for details." msgstr "" -#: optiondialog.cpp:1079 +#: optiondialog.cpp:1119 #, kde-format msgid "Merge version control history on merge start" msgstr "" -#: optiondialog.cpp:1082 +#: optiondialog.cpp:1122 #, kde-format msgid "Run version control history automerge on merge start." msgstr "" -#: optiondialog.cpp:1086 +#: optiondialog.cpp:1126 #, kde-format msgid "Max number of history entries:" msgstr "इतिहास प्रविस्टि के सबसे बड़े संख्या:" -#: optiondialog.cpp:1090 +#: optiondialog.cpp:1130 #, kde-format msgid "Cut off after specified number. Use -1 for infinite number of entries." msgstr "" -#: optiondialog.cpp:1094 +#: optiondialog.cpp:1134 #, kde-format msgid "Test your regular expressions" msgstr "" -#: optiondialog.cpp:1099 +#: optiondialog.cpp:1139 #, kde-format msgid "Irrelevant merge command:" msgstr "" -#: optiondialog.cpp:1104 +#: optiondialog.cpp:1144 #, kde-format msgid "" "If specified this script is run after automerge\n" @@ -2443,12 +2461,12 @@ "Called with the parameters: filename1 filename2 filename3" msgstr "" -#: optiondialog.cpp:1109 +#: optiondialog.cpp:1149 #, kde-format msgid "Auto save and quit on merge without conflicts" msgstr "" -#: optiondialog.cpp:1113 +#: optiondialog.cpp:1153 #, kde-format msgid "" "If KDiff3 was started for a file-merge from the command line and all\n" @@ -2457,27 +2475,27 @@ "(Similar to command line option \"--auto\".)" msgstr "" -#: optiondialog.cpp:1124 optiondialog.cpp:1125 +#: optiondialog.cpp:1164 optiondialog.cpp:1165 #, fuzzy, kde-format msgid "Directory" msgstr "डिरेक्टरी (&D)" -#: optiondialog.cpp:1137 +#: optiondialog.cpp:1185 #, kde-format msgid "Recursive directories" msgstr "डिरेक्टरीज रिकर्सिव करव" -#: optiondialog.cpp:1140 +#: optiondialog.cpp:1188 #, kde-format msgid "Whether to analyze subdirectories or not." msgstr "का सबडिरेक्टरीज ल विस्लेसन करना हे या नइ. " -#: optiondialog.cpp:1142 +#: optiondialog.cpp:1190 #, kde-format msgid "File pattern(s):" msgstr "फाइल पैटर्न:" -#: optiondialog.cpp:1148 +#: optiondialog.cpp:1196 #, kde-format msgid "" "Pattern(s) of files to be analyzed. \n" @@ -2485,12 +2503,12 @@ "Several Patterns can be specified by using the separator: ';'" msgstr "" -#: optiondialog.cpp:1153 +#: optiondialog.cpp:1201 #, kde-format msgid "File-anti-pattern(s):" msgstr "फाइल-एन्टी-पैटर्न:" -#: optiondialog.cpp:1159 +#: optiondialog.cpp:1207 #, kde-format msgid "" "Pattern(s) of files to be excluded from analysis. \n" @@ -2498,12 +2516,12 @@ "Several Patterns can be specified by using the separator: ';'" msgstr "" -#: optiondialog.cpp:1164 +#: optiondialog.cpp:1212 #, kde-format msgid "Dir-anti-pattern(s):" msgstr "डिर-एन्टी-पैटर्न:" -#: optiondialog.cpp:1170 +#: optiondialog.cpp:1218 #, kde-format msgid "" "Pattern(s) of directories to be excluded from analysis. \n" @@ -2511,59 +2529,59 @@ "Several Patterns can be specified by using the separator: ';'" msgstr "" -#: optiondialog.cpp:1175 +#: optiondialog.cpp:1223 #, kde-format msgid "Use .cvsignore" msgstr ".cvsignore के उपयोग करव" -#: optiondialog.cpp:1179 +#: optiondialog.cpp:1227 #, kde-format msgid "" "Extends the antipattern to anything that would be ignored by CVS.\n" "Via local \".cvsignore\" files this can be directory specific." msgstr "" -#: optiondialog.cpp:1183 +#: optiondialog.cpp:1231 #, kde-format msgid "Find hidden files and directories" msgstr "लुकाए फाइल मन ल अउ डिरेक्टरीज खोजव" -#: optiondialog.cpp:1186 +#: optiondialog.cpp:1234 #, fuzzy, kde-format #| msgid "Find hidden files and directories" msgid "Finds hidden files and directories." msgstr "लुकाए फाइल मन ल अउ डिरेक्टरीज खोजव" -#: optiondialog.cpp:1189 +#: optiondialog.cpp:1237 #, kde-format msgid "Follow file links" msgstr "फाइल संकली के अनुसरन करव" -#: optiondialog.cpp:1193 +#: optiondialog.cpp:1241 #, kde-format msgid "" "On: Compare the file the link points to.\n" "Off: Compare the links." msgstr "" -#: optiondialog.cpp:1197 +#: optiondialog.cpp:1245 #, kde-format msgid "Follow directory links" msgstr "डिरेक्टरी संकली के अनुसरन करव" -#: optiondialog.cpp:1201 +#: optiondialog.cpp:1249 #, kde-format msgid "" "On: Compare the directory the link points to.\n" "Off: Compare the links." msgstr "" -#: optiondialog.cpp:1210 +#: optiondialog.cpp:1258 #, kde-format msgid "Case sensitive filename comparison" msgstr "" -#: optiondialog.cpp:1214 +#: optiondialog.cpp:1262 #, kde-format msgid "" "The directory comparison will compare files or directories when their names " @@ -2572,64 +2590,64 @@ "off, otherwise on.)" msgstr "" -#: optiondialog.cpp:1218 +#: optiondialog.cpp:1266 #, fuzzy, kde-format #| msgid "Unfold All Subdirs" msgid "Unfold all subdirectories on load" msgstr "सब्बो सबडिरेक्टरीज अनफोल्ड करव" -#: optiondialog.cpp:1222 +#: optiondialog.cpp:1270 #, kde-format msgid "" "On: Unfold all subdirectories when starting a directory diff.\n" "Off: Leave subdirectories folded." msgstr "" -#: optiondialog.cpp:1226 +#: optiondialog.cpp:1274 #, kde-format msgid "Skip directory status report" msgstr "" -#: optiondialog.cpp:1230 +#: optiondialog.cpp:1278 #, kde-format msgid "" "On: Do not show the Directory Comparison Status.\n" "Off: Show the status dialog on start." msgstr "" -#: optiondialog.cpp:1234 +#: optiondialog.cpp:1282 #, kde-format msgid "File Comparison Mode" msgstr "फाइल तुलना मोड" -#: optiondialog.cpp:1239 +#: optiondialog.cpp:1287 #, kde-format msgid "Binary comparison" msgstr "बाइनरी तुलना" -#: optiondialog.cpp:1241 +#: optiondialog.cpp:1289 #, kde-format msgid "Binary comparison of each file. (Default)" msgstr "हर एक फाइल के बाइनरी तुलना. (डिफाल्ट)" -#: optiondialog.cpp:1244 +#: optiondialog.cpp:1292 #, kde-format msgid "Full analysis" msgstr "पूरा विस्लेसन" -#: optiondialog.cpp:1246 +#: optiondialog.cpp:1294 #, kde-format msgid "" "Do a full analysis and show statistics information in extra columns.\n" "(Slower than a binary comparison, much slower for binary files.)" msgstr "" -#: optiondialog.cpp:1250 +#: optiondialog.cpp:1298 #, kde-format msgid "Trust the size and modification date (unsafe)" msgstr "सुधारे के तारीक मं भरोसा करव (असुरक्छित)" -#: optiondialog.cpp:1252 +#: optiondialog.cpp:1300 #, kde-format msgid "" "Assume that files are equal if the modification date and file length are " @@ -2639,14 +2657,14 @@ "Useful for big directories or slow networks." msgstr "" -#: optiondialog.cpp:1257 +#: optiondialog.cpp:1305 #, fuzzy, kde-format msgid "" "Trust the size and date, but use binary comparison if date does not match " "(unsafe)" msgstr "सुधारे के तारीक मं भरोसा करव (असुरक्छित)" -#: optiondialog.cpp:1259 +#: optiondialog.cpp:1307 #, kde-format msgid "" "Assume that files are equal if the modification date and file length are " @@ -2655,12 +2673,12 @@ "Useful for big directories or slow networks." msgstr "" -#: optiondialog.cpp:1264 +#: optiondialog.cpp:1312 #, kde-format msgid "Trust the size (unsafe)" msgstr "आकार मं भरोसा करव (असुरक्छित)" -#: optiondialog.cpp:1266 +#: optiondialog.cpp:1314 #, kde-format msgid "" "Assume that files are equal if their file lengths are equal.\n" @@ -2668,12 +2686,12 @@ "download." msgstr "" -#: optiondialog.cpp:1273 +#: optiondialog.cpp:1321 #, kde-format msgid "Synchronize directories" msgstr "डिरेक्टरीज सिंक्रोनाइज करव" -#: optiondialog.cpp:1277 +#: optiondialog.cpp:1325 #, kde-format msgid "" "Offers to store files in both directories so that\n" @@ -2681,24 +2699,24 @@ "Works only when comparing two directories without specifying a destination." msgstr "" -#: optiondialog.cpp:1283 +#: optiondialog.cpp:1331 #, kde-format msgid "White space differences considered equal" msgstr "" -#: optiondialog.cpp:1287 +#: optiondialog.cpp:1335 #, kde-format msgid "" "If files differ only by white space consider them equal.\n" "This is only active when full analysis is chosen." msgstr "" -#: optiondialog.cpp:1293 +#: optiondialog.cpp:1341 #, kde-format msgid "Copy newer instead of merging (unsafe)" msgstr "सम्मिलित करे के बदला मा नवा के नकल करव (असुरक्छित)" -#: optiondialog.cpp:1297 +#: optiondialog.cpp:1345 #, kde-format msgid "" "Do not look inside, just take the newer file.\n" @@ -2706,47 +2724,47 @@ "Only effective when comparing two directories." msgstr "" -#: optiondialog.cpp:1302 +#: optiondialog.cpp:1350 #, kde-format msgid "Backup files (.orig)" msgstr "बैकअप फाइल मन ल (.orig)" -#: optiondialog.cpp:1306 +#: optiondialog.cpp:1354 #, kde-format msgid "" "If 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 "" -#: optiondialog.cpp:1382 optiondialog.cpp:1383 +#: optiondialog.cpp:1430 optiondialog.cpp:1431 #, kde-format msgid "Regional Settings" msgstr "छेत्रीय सेटिंग" -#: optiondialog.cpp:1397 +#: optiondialog.cpp:1454 #, kde-format msgid "Use the same encoding for everything:" msgstr "" -#: optiondialog.cpp:1401 +#: optiondialog.cpp:1458 #, kde-format msgid "" "Enable this allows to change all encodings by changing the first only.\n" "Disable this if different individual settings are needed." msgstr "" -#: optiondialog.cpp:1405 +#: optiondialog.cpp:1462 #, fuzzy, kde-format #| msgid "Note: Local Encoding is " msgid "Note: Local Encoding is \"%1\"" msgstr "टीप: लोकल एनकोडिंग हे" -#: optiondialog.cpp:1409 +#: optiondialog.cpp:1466 #, kde-format msgid "File Encoding for A:" msgstr "" -#: optiondialog.cpp:1416 +#: optiondialog.cpp:1473 #, kde-format msgid "" "If enabled then Unicode (UTF-16 or UTF-8) encoding will be detected.\n" @@ -2755,32 +2773,32 @@ "(Unicode detection depends on the first bytes of a file.)" msgstr "" -#: optiondialog.cpp:1419 optiondialog.cpp:1430 optiondialog.cpp:1441 +#: optiondialog.cpp:1476 optiondialog.cpp:1487 optiondialog.cpp:1498 #, kde-format msgid "Auto Detect Unicode" msgstr "" -#: optiondialog.cpp:1425 +#: optiondialog.cpp:1482 #, kde-format msgid "File Encoding for B:" msgstr "" -#: optiondialog.cpp:1436 +#: optiondialog.cpp:1493 #, kde-format msgid "File Encoding for C:" msgstr "" -#: optiondialog.cpp:1447 +#: optiondialog.cpp:1504 #, kde-format msgid "File Encoding for Merge Output and Saving:" msgstr "" -#: optiondialog.cpp:1452 +#: optiondialog.cpp:1509 #, kde-format msgid "Auto Select" msgstr "अपने आप चुनव" -#: optiondialog.cpp:1456 +#: optiondialog.cpp:1513 #, kde-format msgid "" "If enabled then the encoding from the input files is used.\n" @@ -2788,39 +2806,39 @@ "saving." msgstr "" -#: optiondialog.cpp:1459 +#: optiondialog.cpp:1516 #, kde-format msgid "File Encoding for Preprocessor Files:" msgstr "" -#: optiondialog.cpp:1471 +#: optiondialog.cpp:1528 #, kde-format msgid "Right To Left Language" msgstr "" -#: optiondialog.cpp:1475 +#: optiondialog.cpp:1532 #, kde-format msgid "" "Some languages are read from right to left.\n" "This setting will change the viewer and editor accordingly." msgstr "" -#: optiondialog.cpp:1485 +#: optiondialog.cpp:1542 #, kde-format msgid "Integration" msgstr "इंटीग्रेसन" -#: optiondialog.cpp:1486 +#: optiondialog.cpp:1543 #, kde-format msgid "Integration Settings" msgstr "इंटीग्रेसन सेटिंग" -#: optiondialog.cpp:1499 +#: optiondialog.cpp:1564 #, kde-format msgid "Command line options to ignore:" msgstr "" -#: optiondialog.cpp:1505 +#: optiondialog.cpp:1570 #, kde-format msgid "" "List of command line options that should be ignored when KDiff3 is used by " @@ -2829,19 +2847,19 @@ "This will suppress the \"Unknown option\" error." msgstr "" -#: optiondialog.cpp:1510 +#: optiondialog.cpp:1575 #, kde-format msgid "Quit also via Escape key" msgstr "" -#: optiondialog.cpp:1514 +#: optiondialog.cpp:1579 #, kde-format msgid "" "Fast method to exit.\n" "For those who are used to using the Escape key." msgstr "" -#: optiondialog.cpp:1598 +#: optiondialog.cpp:1653 #, kde-format msgid "This resets all options. Not only those of the current topic." msgstr "ये सब्बो विकल्प मन ल रीसेट करथे . सिरिफ उनको ही नइ जऊन अभी हाल के विसय मं हे. " @@ -2891,77 +2909,68 @@ msgid "Disable Unsafe Options" msgstr "असुरक्छित विकल्प अक्छम करव" -#: pdiff.cpp:158 +#: pdiff.cpp:160 #, kde-format msgid "Loading A" msgstr "अ लोड करत हे" -#: pdiff.cpp:167 -#, kde-format -msgid "Errors occurred during pre-processing of file A." -msgstr "" +#: pdiff.cpp:162 +#, fuzzy, kde-format +#| msgid "Loading A" +msgid "Loading A: %1" +msgstr "अ लोड करत हे" -#: pdiff.cpp:172 +#: pdiff.cpp:170 #, kde-format msgid "Loading B" msgstr "ब लोड करत हे" -#: pdiff.cpp:179 -#, kde-format -msgid "Errors occurred during pre-processing of file B." -msgstr "" - -#: pdiff.cpp:202 pdiff.cpp:241 +#: pdiff.cpp:201 pdiff.cpp:237 #, kde-format msgid "Diff: A <-> B" msgstr "डिफ: अ <-> ब" -#: pdiff.cpp:208 pdiff.cpp:279 pdiff.cpp:293 +#: pdiff.cpp:207 pdiff.cpp:275 pdiff.cpp:289 #, kde-format msgid "Linediff: A <-> B" msgstr "लाइनडिफ: अ <-> ब" -#: pdiff.cpp:225 +#: pdiff.cpp:224 #, kde-format msgid "Loading C" msgstr "स लोड करत हे" -#: pdiff.cpp:232 -#, kde-format -msgid "Errors occurred during pre-processing of file C." -msgstr "" - -#: pdiff.cpp:250 +#: pdiff.cpp:246 #, kde-format msgid "Diff: A <-> C" msgstr "डिफ: अ <-> स" -#: pdiff.cpp:261 +#: pdiff.cpp:257 #, kde-format msgid "Diff: B <-> C" msgstr "डिफ: ब <-> स" -#: pdiff.cpp:283 pdiff.cpp:297 +#: pdiff.cpp:279 pdiff.cpp:293 #, kde-format msgid "Linediff: B <-> C" msgstr "लाइनडिफ: ब <-> स" -#: pdiff.cpp:287 pdiff.cpp:301 +#: pdiff.cpp:283 pdiff.cpp:297 #, kde-format msgid "Linediff: A <-> C" msgstr "लाइनडिफ: अ <-> स" -#: pdiff.cpp:829 +#: pdiff.cpp:819 #, kde-format msgid "All input files contain the same text, but are not binary equal." msgstr "" -#: pdiff.cpp:835 pdiff.cpp:839 pdiff.cpp:843 +#: pdiff.cpp:825 pdiff.cpp:829 pdiff.cpp:833 #, kde-format msgid "Files %1 and %2 have equal text, but are not binary equal. \n" msgstr "" -#: pdiff.cpp:853 +#: pdiff.cpp:843 #, kde-format msgid "" "Some input files do not seem to be pure text files.\n" @@ -2969,17 +2978,17 @@ "Continue at your own risk." msgstr "" -#: pdiff.cpp:863 +#: pdiff.cpp:853 #, kde-format msgid ", B" msgstr "" -#: pdiff.cpp:865 +#: pdiff.cpp:855 #, kde-format msgid ", C" msgstr "" -#: pdiff.cpp:867 +#: pdiff.cpp:857 #, kde-format msgid "" "Some input characters could not be converted to valid unicode.\n" @@ -2988,77 +2997,72 @@ "Affected input files are in %1." msgstr "" -#: pdiff.cpp:1034 +#: pdiff.cpp:1032 #, kde-format msgid "Abort" msgstr "छोड़व" -#: pdiff.cpp:1040 pdiff.cpp:1130 +#: pdiff.cpp:1038 pdiff.cpp:1129 #, kde-format msgid "Opening files..." msgstr "फाइल मन ल खोलत हे..." -#: pdiff.cpp:1107 -#, kde-format -msgid "File open error" -msgstr "फाइल खोले मं गलती" - -#: pdiff.cpp:1202 +#: pdiff.cpp:1212 #, kde-format msgid "Cutting selection..." msgstr "चयन ल काटत हे..." -#: pdiff.cpp:1223 +#: pdiff.cpp:1233 #, kde-format msgid "Copying selection to clipboard..." msgstr "चुने हुए के नकल क्लिपबोर्ड मं बनात हे..." -#: pdiff.cpp:1239 +#: pdiff.cpp:1249 #, kde-format msgid "Inserting clipboard contents..." msgstr "क्लिपबोर्ड के चीज मन ल घुसात हे..." -#: pdiff.cpp:1695 +#: pdiff.cpp:1705 #, kde-format msgid "Word wrap (Cancel disables word wrap)" msgstr "" -#: pdiff.cpp:1696 +#: pdiff.cpp:1706 #, kde-format msgid "Calculating max width for horizontal scrollbar" msgstr "" -#: pdiff.cpp:1911 +#: pdiff.cpp:1921 #, kde-format msgid "Save && Continue" msgstr "सहेजव अउ जारी रखव" -#: pdiff.cpp:1912 +#: pdiff.cpp:1922 #, kde-format msgid "Continue Without Saving" msgstr "सहेजे बिना जारी रखव" -#: pdiff.cpp:2124 +#: pdiff.cpp:2134 #, kde-format msgid "Search complete." msgstr "ढूंढना पूरा" -#: pdiff.cpp:2124 +#: pdiff.cpp:2134 #, kde-format msgid "Search Complete" msgstr "ढूंढना पूरा" -#: pdiff.cpp:2375 +#: pdiff.cpp:2385 #, kde-format msgid "Nothing is selected in either diff input window." msgstr "" -#: pdiff.cpp:2375 +#: pdiff.cpp:2385 #, kde-format msgid "Error while adding manual diff range" msgstr "" -#: progress.cpp:59 progress.cpp:71 +#: progress.cpp:61 progress.cpp:73 #, kde-format msgid "&Cancel" msgstr "" @@ -3068,189 +3072,189 @@ msgid "A (Base):" msgstr "अ (बेस):" -#: smalldialogs.cpp:68 smalldialogs.cpp:85 smalldialogs.cpp:102 -#: smalldialogs.cpp:144 +#: smalldialogs.cpp:71 smalldialogs.cpp:90 smalldialogs.cpp:109 +#: smalldialogs.cpp:154 #, kde-format msgid "File..." msgstr "फाइल..." -#: smalldialogs.cpp:70 smalldialogs.cpp:87 smalldialogs.cpp:104 -#: smalldialogs.cpp:146 +#: smalldialogs.cpp:73 smalldialogs.cpp:92 smalldialogs.cpp:111 +#: smalldialogs.cpp:156 #, kde-format msgid "Dir..." msgstr "डिर.:" -#: smalldialogs.cpp:96 +#: smalldialogs.cpp:103 #, kde-format msgid "C (Optional):" msgstr "स (वैकल्पिक):" -#: smalldialogs.cpp:119 +#: smalldialogs.cpp:126 #, kde-format msgid "Swap/Copy Names..." msgstr "" -#: smalldialogs.cpp:124 smalldialogs.cpp:125 smalldialogs.cpp:126 +#: smalldialogs.cpp:131 smalldialogs.cpp:132 smalldialogs.cpp:133 #, kde-format msgid "Swap %1<->%2" msgstr "" -#: smalldialogs.cpp:127 smalldialogs.cpp:128 smalldialogs.cpp:129 +#: smalldialogs.cpp:134 smalldialogs.cpp:135 smalldialogs.cpp:136 #, kde-format msgid "Copy %1->Output" msgstr "" -#: smalldialogs.cpp:130 smalldialogs.cpp:131 smalldialogs.cpp:132 +#: smalldialogs.cpp:137 smalldialogs.cpp:138 smalldialogs.cpp:139 #, kde-format msgid "Swap %1<->Output" msgstr "" -#: smalldialogs.cpp:138 +#: smalldialogs.cpp:148 #, kde-format msgid "Output (optional):" msgstr "आउटपुट (वैकल्पिक):" -#: smalldialogs.cpp:168 +#: smalldialogs.cpp:178 #, kde-format msgid "Configure..." msgstr "कान्फिगर...." -#: smalldialogs.cpp:233 +#: smalldialogs.cpp:243 #, fuzzy, kde-format msgid "Open Directory" msgstr "डिरेक्टरी (&D)" -#: smalldialogs.cpp:234 +#: smalldialogs.cpp:244 #, kde-format msgid "Select Output File" msgstr "" -#: smalldialogs.cpp:393 +#: smalldialogs.cpp:403 #, kde-format msgid "Search text:" msgstr "पाठ खोजव:" -#: smalldialogs.cpp:400 +#: smalldialogs.cpp:410 #, kde-format msgid "Case sensitive" msgstr "केस सेंसिटिव" -#: smalldialogs.cpp:403 +#: smalldialogs.cpp:413 #, kde-format msgid "Search A" msgstr "खोजव अ" -#: smalldialogs.cpp:408 +#: smalldialogs.cpp:418 #, kde-format msgid "Search B" msgstr "खोजव ब" -#: smalldialogs.cpp:413 +#: smalldialogs.cpp:423 #, kde-format msgid "Search C" msgstr "खोजव स" -#: smalldialogs.cpp:418 +#: smalldialogs.cpp:428 #, kde-format msgid "Search output" msgstr "खोजे के बाद् आउटपुट" -#: smalldialogs.cpp:425 +#: smalldialogs.cpp:435 #, kde-format msgid "&Search" msgstr "खोजव (&S)" -#: smalldialogs.cpp:444 +#: smalldialogs.cpp:454 #, kde-format msgid "Regular Expression Tester" msgstr "रेगुलर एक्सप्रेसन जंचइया" -#: smalldialogs.cpp:457 +#: smalldialogs.cpp:467 #, kde-format msgid "Example auto merge line:" msgstr "" -#: smalldialogs.cpp:459 +#: smalldialogs.cpp:469 #, kde-format msgid "To test auto merge, copy a line as used in your files." msgstr "" -#: smalldialogs.cpp:465 smalldialogs.cpp:493 smalldialogs.cpp:529 +#: smalldialogs.cpp:475 smalldialogs.cpp:503 smalldialogs.cpp:539 #, kde-format msgid "Match result:" msgstr "" -#: smalldialogs.cpp:484 +#: smalldialogs.cpp:494 #, kde-format msgid "Example history start line (with leading comment):" msgstr "" -#: smalldialogs.cpp:486 +#: smalldialogs.cpp:496 #, kde-format msgid "" "Copy a history start line as used in your files,\n" "including the leading comment." msgstr "" -#: smalldialogs.cpp:512 +#: smalldialogs.cpp:522 #, kde-format msgid "History sort key order:" msgstr "" -#: smalldialogs.cpp:520 +#: smalldialogs.cpp:530 #, kde-format msgid "Example history entry start line (without leading comment):" msgstr "" -#: smalldialogs.cpp:522 +#: smalldialogs.cpp:532 #, kde-format msgid "" "Copy a history entry start line as used in your files,\n" "but omit the leading comment." msgstr "" -#: smalldialogs.cpp:536 +#: smalldialogs.cpp:546 #, kde-format msgid "Sort key result:" msgstr "छंटइया सूची परिनाम:" -#: smalldialogs.cpp:584 smalldialogs.cpp:594 smalldialogs.cpp:614 +#: smalldialogs.cpp:594 smalldialogs.cpp:604 smalldialogs.cpp:624 #, kde-format msgid "Match success." msgstr "" -#: smalldialogs.cpp:588 smalldialogs.cpp:598 smalldialogs.cpp:620 +#: smalldialogs.cpp:598 smalldialogs.cpp:608 smalldialogs.cpp:630 #, kde-format msgid "Match failed." msgstr "मैच फेल." -#: smalldialogs.cpp:605 +#: smalldialogs.cpp:615 #, kde-format msgid "Opening and closing parentheses do not match in regular expression." msgstr "" -#: SourceData.cpp:150 +#: SourceData.cpp:153 #, kde-format msgid "Writing clipboard data to temp file failed." msgstr "क्लिपबोर्ड डाटा ल अस्थाई फाइल मं लिखना फेल." -#: SourceData.cpp:154 +#: SourceData.cpp:157 #, kde-format msgid "From Clipboard" msgstr "क्लिपबोर्ड से" -#: SourceData.cpp:335 +#: SourceData.cpp:348 #, fuzzy, kde-format #| msgid "Mix of links and normal files." msgid "%1 is not a normal file." msgstr "संकली के मिलावटें अउ सामान्य फाइल मन ल." -#: SourceData.cpp:427 +#: SourceData.cpp:440 #, kde-format msgid " Temp file is: %1" msgstr "" -#: SourceData.cpp:432 +#: SourceData.cpp:445 #, kde-format msgid "" "Preprocessing possibly failed. Check this command:\n" @@ -3260,12 +3264,12 @@ "The preprocessing command will be disabled now." msgstr "" -#: SourceData.cpp:443 SourceData.cpp:512 +#: SourceData.cpp:456 SourceData.cpp:525 #, kde-format msgid "File %1 too large to process. Skipping." msgstr "" -#: SourceData.cpp:487 +#: SourceData.cpp:500 #, kde-format msgid "" "The line-matching-preprocessing possibly failed. Check this command:\n" diff -Nru kdiff3-1.8.01/po/hr/kdiff3.po kdiff3-1.8.3/po/hr/kdiff3.po --- kdiff3-1.8.01/po/hr/kdiff3.po 2019-05-18 01:02:03.000000000 +0000 +++ kdiff3-1.8.3/po/hr/kdiff3.po 2020-06-25 00:18:24.000000000 +0000 @@ -4,8 +4,8 @@ msgid "" msgstr "" "Project-Id-Version: \n" -"Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2019-04-18 08:02+0200\n" +"Report-Msgid-Bugs-To: https://bugs.kde.org\n" +"POT-Creation-Date: 2020-06-22 07:48+0200\n" "PO-Revision-Date: 2010-01-24 16:47+0100\n" "Last-Translator: Andrej Dundovic \n" "Language-Team: Croatian \n" @@ -30,333 +30,333 @@ msgid "Your emails" msgstr "" -#: difftextwindow.cpp:412 +#: difftextwindow.cpp:414 #, kde-format msgid "File %1: Line %2" msgstr "" -#: difftextwindow.cpp:414 +#: difftextwindow.cpp:416 #, kde-format msgid "File %1: Line not available" msgstr "" -#: difftextwindow.cpp:1780 +#: difftextwindow.cpp:1778 #, kde-format msgid "Encoding:" msgstr "" -#: difftextwindow.cpp:1782 mergeresultwindow.cpp:3138 optiondialog.cpp:818 +#: difftextwindow.cpp:1781 mergeresultwindow.cpp:3166 optiondialog.cpp:840 #, kde-format msgid "Line end style:" msgstr "" -#: difftextwindow.cpp:1810 directorymergewindow.cpp:382 -#: directorymergewindow.cpp:433 directorymergewindow.cpp:524 -#: directorymergewindow.cpp:3058 directorymergewindow.cpp:3189 -#: directorymergewindow.cpp:3417 mergeresultwindow.cpp:942 -#: mergeresultwindow.cpp:944 mergeresultwindow.cpp:946 -#: mergeresultwindow.cpp:948 mergeresultwindow.cpp:1814 -#: mergeresultwindow.cpp:3170 mergeresultwindow.cpp:3177 optiondialog.cpp:962 -#: optiondialog.cpp:975 pdiff.cpp:833 pdiff.cpp:835 pdiff.cpp:837 pdiff.cpp:839 -#: pdiff.cpp:861 smalldialogs.cpp:124 smalldialogs.cpp:126 smalldialogs.cpp:127 -#: smalldialogs.cpp:130 +#: difftextwindow.cpp:1809 directorymergewindow.cpp:383 +#: directorymergewindow.cpp:434 directorymergewindow.cpp:525 +#: directorymergewindow.cpp:3072 directorymergewindow.cpp:3203 +#: directorymergewindow.cpp:3431 mergeresultwindow.cpp:970 +#: mergeresultwindow.cpp:972 mergeresultwindow.cpp:974 +#: mergeresultwindow.cpp:976 mergeresultwindow.cpp:1842 +#: mergeresultwindow.cpp:3198 mergeresultwindow.cpp:3205 optiondialog.cpp:1002 +#: optiondialog.cpp:1015 pdiff.cpp:823 pdiff.cpp:825 pdiff.cpp:827 +#: pdiff.cpp:829 pdiff.cpp:851 smalldialogs.cpp:131 smalldialogs.cpp:133 +#: smalldialogs.cpp:134 smalldialogs.cpp:137 #, kde-format msgid "A" msgstr "" -#: difftextwindow.cpp:1810 directorymergewindow.cpp:384 -#: directorymergewindow.cpp:436 directorymergewindow.cpp:526 -#: directorymergewindow.cpp:3064 directorymergewindow.cpp:3190 -#: directorymergewindow.cpp:3418 mergeresultwindow.cpp:942 -#: mergeresultwindow.cpp:944 mergeresultwindow.cpp:950 -#: mergeresultwindow.cpp:952 mergeresultwindow.cpp:1816 -#: mergeresultwindow.cpp:3172 mergeresultwindow.cpp:3179 optiondialog.cpp:963 -#: optiondialog.cpp:976 pdiff.cpp:833 pdiff.cpp:835 pdiff.cpp:841 pdiff.cpp:843 -#: pdiff.cpp:863 smalldialogs.cpp:124 smalldialogs.cpp:125 smalldialogs.cpp:128 -#: smalldialogs.cpp:131 +#: difftextwindow.cpp:1809 directorymergewindow.cpp:385 +#: directorymergewindow.cpp:437 directorymergewindow.cpp:527 +#: directorymergewindow.cpp:3078 directorymergewindow.cpp:3204 +#: directorymergewindow.cpp:3432 mergeresultwindow.cpp:970 +#: mergeresultwindow.cpp:972 mergeresultwindow.cpp:978 +#: mergeresultwindow.cpp:980 mergeresultwindow.cpp:1844 +#: mergeresultwindow.cpp:3200 mergeresultwindow.cpp:3207 optiondialog.cpp:1003 +#: optiondialog.cpp:1016 pdiff.cpp:823 pdiff.cpp:825 pdiff.cpp:831 +#: pdiff.cpp:833 pdiff.cpp:853 smalldialogs.cpp:131 smalldialogs.cpp:132 +#: smalldialogs.cpp:135 smalldialogs.cpp:138 #, kde-format msgid "B" msgstr "" -#: difftextwindow.cpp:1810 directorymergewindow.cpp:386 -#: directorymergewindow.cpp:439 directorymergewindow.cpp:528 -#: directorymergewindow.cpp:3070 directorymergewindow.cpp:3191 -#: directorymergewindow.cpp:3419 mergeresultwindow.cpp:946 -#: mergeresultwindow.cpp:948 mergeresultwindow.cpp:950 -#: mergeresultwindow.cpp:952 mergeresultwindow.cpp:1818 -#: mergeresultwindow.cpp:3174 mergeresultwindow.cpp:3181 optiondialog.cpp:977 -#: pdiff.cpp:837 pdiff.cpp:839 pdiff.cpp:841 pdiff.cpp:843 pdiff.cpp:865 -#: smalldialogs.cpp:125 smalldialogs.cpp:126 smalldialogs.cpp:129 -#: smalldialogs.cpp:132 +#: difftextwindow.cpp:1809 directorymergewindow.cpp:387 +#: directorymergewindow.cpp:440 directorymergewindow.cpp:529 +#: directorymergewindow.cpp:3084 directorymergewindow.cpp:3205 +#: directorymergewindow.cpp:3433 mergeresultwindow.cpp:974 +#: mergeresultwindow.cpp:976 mergeresultwindow.cpp:978 +#: mergeresultwindow.cpp:980 mergeresultwindow.cpp:1846 +#: mergeresultwindow.cpp:3202 mergeresultwindow.cpp:3209 optiondialog.cpp:1017 +#: pdiff.cpp:827 pdiff.cpp:829 pdiff.cpp:831 pdiff.cpp:833 pdiff.cpp:855 +#: smalldialogs.cpp:132 smalldialogs.cpp:133 smalldialogs.cpp:136 +#: smalldialogs.cpp:139 #, kde-format msgid "C" msgstr "" -#: difftextwindow.cpp:1810 +#: difftextwindow.cpp:1809 #, kde-format msgid "A (Base)" msgstr "" -#: difftextwindow.cpp:1812 +#: difftextwindow.cpp:1811 #, kde-format msgid "Encoding: %1" msgstr "" -#: difftextwindow.cpp:1813 mergeresultwindow.cpp:3183 +#: difftextwindow.cpp:1812 mergeresultwindow.cpp:3211 #, kde-format msgid "Unix" msgstr "" -#: difftextwindow.cpp:1813 mergeresultwindow.cpp:3184 +#: difftextwindow.cpp:1812 mergeresultwindow.cpp:3212 #, kde-format msgid "DOS" msgstr "" -#: difftextwindow.cpp:1813 +#: difftextwindow.cpp:1812 #, kde-format msgid "Line end style: %1" msgstr "" -#: difftextwindow.cpp:1835 kdiff3.cpp:873 +#: difftextwindow.cpp:1834 kdiff3.cpp:874 #, kde-format msgid "Top line" msgstr "" -#: difftextwindow.cpp:1845 +#: difftextwindow.cpp:1843 #, kde-format msgid "End" msgstr "" -#: difftextwindow.cpp:1903 smalldialogs.cpp:235 +#: difftextwindow.cpp:1901 smalldialogs.cpp:245 #, kde-format msgid "Open File" msgstr "" -#: difftextwindow.cpp:1951 optiondialog.cpp:387 +#: difftextwindow.cpp:1943 optiondialog.cpp:389 #, kde-format msgid "Unicode, 8 bit" msgstr "" -#: difftextwindow.cpp:1966 +#: difftextwindow.cpp:1958 #, kde-format msgid "Other" msgstr "" -#: directorymergewindow.cpp:409 directorymergewindow.cpp:3424 +#: directorymergewindow.cpp:410 directorymergewindow.cpp:3438 #, kde-format msgid "Copy A to B" msgstr "" -#: directorymergewindow.cpp:412 directorymergewindow.cpp:3425 +#: directorymergewindow.cpp:413 directorymergewindow.cpp:3439 #, kde-format msgid "Copy B to A" msgstr "" -#: directorymergewindow.cpp:415 directorymergewindow.cpp:3426 +#: directorymergewindow.cpp:416 directorymergewindow.cpp:3440 #, kde-format msgid "Delete A" msgstr "" -#: directorymergewindow.cpp:418 directorymergewindow.cpp:3427 +#: directorymergewindow.cpp:419 directorymergewindow.cpp:3441 #, kde-format msgid "Delete B" msgstr "" -#: directorymergewindow.cpp:421 +#: directorymergewindow.cpp:422 #, kde-format msgid "Delete A & B" msgstr "" -#: directorymergewindow.cpp:424 directorymergewindow.cpp:3429 +#: directorymergewindow.cpp:425 directorymergewindow.cpp:3443 #, kde-format msgid "Merge to A" msgstr "" -#: directorymergewindow.cpp:427 directorymergewindow.cpp:3430 +#: directorymergewindow.cpp:428 directorymergewindow.cpp:3444 #, kde-format msgid "Merge to B" msgstr "" -#: directorymergewindow.cpp:430 +#: directorymergewindow.cpp:431 #, kde-format msgid "Merge to A & B" msgstr "" -#: directorymergewindow.cpp:442 directorymergewindow.cpp:3421 +#: directorymergewindow.cpp:443 directorymergewindow.cpp:3435 #, kde-format msgid "Delete (if exists)" msgstr "" -#: directorymergewindow.cpp:445 directorymergewindow.cpp:448 -#: directorymergewindow.cpp:3420 optiondialog.cpp:925 smalldialogs.cpp:113 +#: directorymergewindow.cpp:446 directorymergewindow.cpp:449 +#: directorymergewindow.cpp:3434 smalldialogs.cpp:120 #, kde-format msgid "Merge" msgstr "" -#: directorymergewindow.cpp:445 directorymergewindow.cpp:448 +#: directorymergewindow.cpp:446 directorymergewindow.cpp:449 #, kde-format msgid "Merge (manual)" msgstr "" -#: directorymergewindow.cpp:451 +#: directorymergewindow.cpp:452 #, kde-format msgid "Error: Conflicting File Types" msgstr "" -#: directorymergewindow.cpp:454 +#: directorymergewindow.cpp:455 #, kde-format msgid "Error: Changed and Deleted" msgstr "" -#: directorymergewindow.cpp:457 +#: directorymergewindow.cpp:458 #, kde-format msgid "Error: Dates are equal but files are not." msgstr "" -#: directorymergewindow.cpp:471 +#: directorymergewindow.cpp:472 #, kde-format msgid "Done" msgstr "" -#: directorymergewindow.cpp:473 +#: directorymergewindow.cpp:474 #, kde-format msgid "Error" msgstr "" -#: directorymergewindow.cpp:475 +#: directorymergewindow.cpp:476 #, kde-format msgid "Skipped." msgstr "" -#: directorymergewindow.cpp:477 +#: directorymergewindow.cpp:478 #, kde-format msgid "Not saved." msgstr "" -#: directorymergewindow.cpp:479 +#: directorymergewindow.cpp:480 #, kde-format msgid "In progress..." msgstr "" -#: directorymergewindow.cpp:481 +#: directorymergewindow.cpp:482 #, kde-format msgid "To do." msgstr "" -#: directorymergewindow.cpp:522 +#: directorymergewindow.cpp:523 #, kde-format msgid "Name" msgstr "" -#: directorymergewindow.cpp:530 +#: directorymergewindow.cpp:531 #, kde-format msgid "Operation" msgstr "" -#: directorymergewindow.cpp:532 +#: directorymergewindow.cpp:533 #, kde-format msgid "Status" msgstr "" -#: directorymergewindow.cpp:534 +#: directorymergewindow.cpp:535 #, kde-format msgid "Unsolved" msgstr "" -#: directorymergewindow.cpp:536 +#: directorymergewindow.cpp:537 #, kde-format msgid "Solved" msgstr "" -#: directorymergewindow.cpp:538 +#: directorymergewindow.cpp:539 #, kde-format msgid "Nonwhite" msgstr "" -#: directorymergewindow.cpp:540 +#: directorymergewindow.cpp:541 #, kde-format msgid "White" msgstr "Bijelo" -#: directorymergewindow.cpp:674 +#: directorymergewindow.cpp:676 #, kde-format msgid "Unable to compare non-normal file with normal file." msgstr "" -#: directorymergewindow.cpp:688 +#: directorymergewindow.cpp:690 #, kde-format msgid "Mix of links and normal files." msgstr "" -#: directorymergewindow.cpp:695 +#: directorymergewindow.cpp:697 #, kde-format msgid "Link: " msgstr "" -#: directorymergewindow.cpp:704 +#: directorymergewindow.cpp:706 #, kde-format msgid "Size. " msgstr "" -#: directorymergewindow.cpp:718 directorymergewindow.cpp:728 +#: directorymergewindow.cpp:720 directorymergewindow.cpp:730 #, kde-format msgid "Date & Size: " msgstr "" -#: directorymergewindow.cpp:748 +#: directorymergewindow.cpp:751 #, kde-format msgid "Comparing file..." msgstr "" -#: directorymergewindow.cpp:801 +#: directorymergewindow.cpp:813 #, kde-format msgid "" "You are currently doing a directory merge. Are you sure, you want to abort " "the merge and rescan the directory?" msgstr "" -#: directorymergewindow.cpp:802 kdiff3.cpp:698 kdiff3.cpp:708 kdiff3.cpp:720 -#: mergeresultwindow.cpp:372 pdiff.cpp:1033 pdiff.cpp:1910 pdiff.cpp:1920 +#: directorymergewindow.cpp:814 kdiff3.cpp:697 kdiff3.cpp:707 kdiff3.cpp:719 +#: mergeresultwindow.cpp:400 pdiff.cpp:1031 pdiff.cpp:1920 pdiff.cpp:1930 #, kde-format msgid "Warning" msgstr "" -#: directorymergewindow.cpp:803 directorymergewindow.cpp:3393 +#: directorymergewindow.cpp:815 directorymergewindow.cpp:3407 #, kde-format msgid "Rescan" msgstr "" -#: directorymergewindow.cpp:804 pdiff.cpp:1035 +#: directorymergewindow.cpp:816 pdiff.cpp:1033 #, kde-format msgid "Continue Merging" msgstr "" -#: directorymergewindow.cpp:971 +#: directorymergewindow.cpp:984 #, kde-format msgid "Opening of directories failed:" msgstr "" -#: directorymergewindow.cpp:975 +#: directorymergewindow.cpp:988 #, kde-format msgid "Dir A \"%1\" does not exist or is not a directory.\n" msgstr "" -#: directorymergewindow.cpp:980 +#: directorymergewindow.cpp:993 #, kde-format msgid "Dir B \"%1\" does not exist or is not a directory.\n" msgstr "" -#: directorymergewindow.cpp:985 +#: directorymergewindow.cpp:998 #, kde-format msgid "Dir C \"%1\" does not exist or is not a directory.\n" msgstr "" -#: directorymergewindow.cpp:988 +#: directorymergewindow.cpp:1001 #, kde-format msgid "Directory Open Error" msgstr "" -#: directorymergewindow.cpp:996 +#: directorymergewindow.cpp:1009 #, kde-format msgid "" "The destination directory must not be the same as A or B when three " @@ -364,49 +364,49 @@ "Check again before continuing." msgstr "" -#: directorymergewindow.cpp:998 +#: directorymergewindow.cpp:1011 #, kde-format msgid "Parameter Warning" msgstr "" -#: directorymergewindow.cpp:1003 +#: directorymergewindow.cpp:1016 #, kde-format msgid "Scanning directories..." msgstr "" -#: directorymergewindow.cpp:1029 +#: directorymergewindow.cpp:1042 #, kde-format msgid "Reading Directory A" msgstr "" -#: directorymergewindow.cpp:1038 +#: directorymergewindow.cpp:1051 #, kde-format msgid "Reading Directory B" msgstr "" -#: directorymergewindow.cpp:1048 +#: directorymergewindow.cpp:1061 #, kde-format msgid "Reading Directory C" msgstr "" -#: directorymergewindow.cpp:1064 +#: directorymergewindow.cpp:1077 #, kde-format msgid "Some subdirectories were not readable in" msgstr "" -#: directorymergewindow.cpp:1069 +#: directorymergewindow.cpp:1082 #, kde-format msgid "Check the permissions of the subdirectories." msgstr "" -#: directorymergewindow.cpp:1106 kdiff3.cpp:666 kdiff3.cpp:753 kdiff3.cpp:777 -#: kdiff3.cpp:1065 kdiff3.cpp:1086 pdiff.cpp:1116 pdiff.cpp:1170 pdiff.cpp:1218 -#: pdiff.cpp:1234 pdiff.cpp:1277 pdiff.cpp:1301 +#: directorymergewindow.cpp:1119 kdiff3.cpp:665 kdiff3.cpp:752 kdiff3.cpp:776 +#: kdiff3.cpp:1072 kdiff3.cpp:1093 pdiff.cpp:1115 pdiff.cpp:1178 pdiff.cpp:1228 +#: pdiff.cpp:1244 pdiff.cpp:1287 pdiff.cpp:1311 #, kde-format msgid "Ready." msgstr "" -#: directorymergewindow.cpp:1121 +#: directorymergewindow.cpp:1134 #, kde-format msgid "" "Directory Comparison Status\n" @@ -416,66 +416,66 @@ "Number of different files: %3" msgstr "" -#: directorymergewindow.cpp:1128 +#: directorymergewindow.cpp:1141 #, kde-format msgid "Number of manual merges: %1" msgstr "" -#: directorymergewindow.cpp:1394 +#: directorymergewindow.cpp:1407 #, kde-format msgid "This affects all merge operations." msgstr "" -#: directorymergewindow.cpp:1395 +#: directorymergewindow.cpp:1408 #, kde-format msgid "Changing All Merge Operations" msgstr "" -#: directorymergewindow.cpp:1695 +#: directorymergewindow.cpp:1708 #, kde-format msgid "" "Processing %1 / %2\n" "%3" msgstr "" -#: directorymergewindow.cpp:1738 directorymergewindow.cpp:1742 +#: directorymergewindow.cpp:1751 directorymergewindow.cpp:1755 #, kde-format msgid "Some files could not be processed." msgstr "" -#: directorymergewindow.cpp:2222 directorymergewindow.cpp:2247 -#: directorymergewindow.cpp:2271 +#: directorymergewindow.cpp:2235 directorymergewindow.cpp:2260 +#: directorymergewindow.cpp:2285 #, kde-format msgid "This operation is currently not possible." msgstr "" -#: directorymergewindow.cpp:2222 directorymergewindow.cpp:2247 -#: directorymergewindow.cpp:2271 directorymergewindow.cpp:2552 +#: directorymergewindow.cpp:2235 directorymergewindow.cpp:2260 +#: directorymergewindow.cpp:2285 directorymergewindow.cpp:2565 #, kde-format msgid "Operation Not Possible" msgstr "" -#: directorymergewindow.cpp:2318 +#: directorymergewindow.cpp:2332 #, kde-format msgid "An error occurred while copying." msgstr "" -#: directorymergewindow.cpp:2319 directorymergewindow.cpp:2759 +#: directorymergewindow.cpp:2333 directorymergewindow.cpp:2772 #, kde-format msgid "Merge Error" msgstr "" -#: directorymergewindow.cpp:2396 +#: directorymergewindow.cpp:2410 #, kde-format msgid "Unknown merge operation. (This must never happen!)" msgstr "" -#: directorymergewindow.cpp:2441 +#: directorymergewindow.cpp:2455 #, kde-format msgid "Unknown merge operation." msgstr "" -#: directorymergewindow.cpp:2454 +#: directorymergewindow.cpp:2468 #, kde-format msgid "" "The merge is about to begin.\n" @@ -488,50 +488,50 @@ "whatsoever! Make backups of your vital data!" msgstr "" -#: directorymergewindow.cpp:2459 +#: directorymergewindow.cpp:2473 #, kde-format msgid "Starting Merge" msgstr "" -#: directorymergewindow.cpp:2460 +#: directorymergewindow.cpp:2474 #, kde-format msgid "Do It" msgstr "" -#: directorymergewindow.cpp:2461 +#: directorymergewindow.cpp:2475 #, kde-format msgid "Simulate It" msgstr "" -#: directorymergewindow.cpp:2487 +#: directorymergewindow.cpp:2501 #, kde-format msgid "" "The highlighted item has a different type in the different directories. " "Select what to do." msgstr "" -#: directorymergewindow.cpp:2491 +#: directorymergewindow.cpp:2505 #, kde-format msgid "" "The modification dates of the file are equal but the files are not. Select " "what to do." msgstr "" -#: directorymergewindow.cpp:2495 +#: directorymergewindow.cpp:2509 #, kde-format msgid "" "The highlighted item was changed in one directory and deleted in the other. " "Select what to do." msgstr "" -#: directorymergewindow.cpp:2552 +#: directorymergewindow.cpp:2565 #, kde-format msgid "" "This operation is currently not possible because directory merge is " "currently running." msgstr "" -#: directorymergewindow.cpp:2609 +#: directorymergewindow.cpp:2622 #, kde-format msgid "" "There was an error in the last step.\n" @@ -539,968 +539,973 @@ "to skip this item?" msgstr "" -#: directorymergewindow.cpp:2611 +#: directorymergewindow.cpp:2624 #, kde-format msgid "Continue merge after an error" msgstr "" -#: directorymergewindow.cpp:2612 +#: directorymergewindow.cpp:2625 #, kde-format msgid "Continue With Last Item" msgstr "" -#: directorymergewindow.cpp:2613 +#: directorymergewindow.cpp:2626 #, kde-format msgid "Skip Item" msgstr "" -#: directorymergewindow.cpp:2709 +#: directorymergewindow.cpp:2722 #, kde-format msgid "Merge operation complete." msgstr "" -#: directorymergewindow.cpp:2709 directorymergewindow.cpp:2712 +#: directorymergewindow.cpp:2722 directorymergewindow.cpp:2725 #, kde-format msgid "Merge Complete" msgstr "" -#: directorymergewindow.cpp:2722 +#: directorymergewindow.cpp:2735 #, kde-format msgid "" "Simulated merge complete: Check if you agree with the proposed operations." msgstr "" -#: directorymergewindow.cpp:2758 +#: directorymergewindow.cpp:2771 #, kde-format msgid "An error occurred. Press OK to see detailed information." msgstr "" -#: directorymergewindow.cpp:2791 +#: directorymergewindow.cpp:2804 #, kde-format msgid "Error: While deleting %1: Creating backup failed." msgstr "" -#: directorymergewindow.cpp:2798 +#: directorymergewindow.cpp:2811 #, kde-format msgid "delete directory recursively( %1 )" msgstr "" -#: directorymergewindow.cpp:2800 +#: directorymergewindow.cpp:2813 #, kde-format msgid "delete( %1 )" msgstr "" -#: directorymergewindow.cpp:2815 +#: directorymergewindow.cpp:2828 #, kde-format msgid "Error: delete dir operation failed while trying to read the directory." msgstr "" -#: directorymergewindow.cpp:2834 +#: directorymergewindow.cpp:2847 #, kde-format msgid "Error: rmdir( %1 ) operation failed." msgstr "" -#: directorymergewindow.cpp:2844 +#: directorymergewindow.cpp:2857 #, kde-format msgid "Error: delete operation failed." msgstr "" -#: directorymergewindow.cpp:2870 +#: directorymergewindow.cpp:2884 #, kde-format msgid "manual merge( %1, %2, %3 -> %4)" msgstr "" -#: directorymergewindow.cpp:2873 +#: directorymergewindow.cpp:2887 #, kde-format msgid "" " Note: After a manual merge the user should continue by pressing F7." msgstr "" -#: directorymergewindow.cpp:2900 +#: directorymergewindow.cpp:2914 #, kde-format msgid "Error: copy( %1 -> %2 ) failed.Deleting existing destination failed." msgstr "" -#: directorymergewindow.cpp:2909 +#: directorymergewindow.cpp:2923 #, kde-format msgid "copyLink( %1 -> %2 )" msgstr "" -#: directorymergewindow.cpp:2918 +#: directorymergewindow.cpp:2932 #, kde-format msgid "Error: copyLink failed: Remote links are not yet supported." msgstr "" -#: directorymergewindow.cpp:2928 +#: directorymergewindow.cpp:2942 #, kde-format msgid "Error: copyLink failed." msgstr "" -#: directorymergewindow.cpp:2953 +#: directorymergewindow.cpp:2967 #, kde-format msgid "copy( %1 -> %2 )" msgstr "" -#: directorymergewindow.cpp:2979 +#: directorymergewindow.cpp:2993 #, kde-format msgid "Error during rename( %1 -> %2 ): Cannot delete existing destination." msgstr "" -#: directorymergewindow.cpp:2986 +#: directorymergewindow.cpp:3000 #, kde-format msgid "rename( %1 -> %2 )" msgstr "" -#: directorymergewindow.cpp:2995 +#: directorymergewindow.cpp:3009 #, kde-format msgid "Error: Rename failed." msgstr "" -#: directorymergewindow.cpp:3013 +#: directorymergewindow.cpp:3027 #, kde-format msgid "Error during makeDir of %1. Cannot delete existing file." msgstr "" -#: directorymergewindow.cpp:3030 +#: directorymergewindow.cpp:3044 #, kde-format msgid "makeDir( %1 )" msgstr "" -#: directorymergewindow.cpp:3040 +#: directorymergewindow.cpp:3054 #, kde-format msgid "Error while creating directory." msgstr "" -#: directorymergewindow.cpp:3076 directorymergewindow.cpp:3195 +#: directorymergewindow.cpp:3090 directorymergewindow.cpp:3209 #, kde-format msgid "Dest" msgstr "" -#: directorymergewindow.cpp:3084 directorymergewindow.cpp:3113 +#: directorymergewindow.cpp:3098 directorymergewindow.cpp:3127 #, kde-format msgid "Dir" msgstr "" -#: directorymergewindow.cpp:3084 +#: directorymergewindow.cpp:3098 #, kde-format msgid "Type" msgstr "" -#: directorymergewindow.cpp:3084 +#: directorymergewindow.cpp:3098 #, kde-format msgid "Size" msgstr "" -#: directorymergewindow.cpp:3085 +#: directorymergewindow.cpp:3099 #, kde-format msgid "Attr" msgstr "" -#: directorymergewindow.cpp:3085 +#: directorymergewindow.cpp:3099 #, kde-format msgid "Last Modification" msgstr "" -#: directorymergewindow.cpp:3085 +#: directorymergewindow.cpp:3099 #, kde-format msgid "Link-Destination" msgstr "" -#: directorymergewindow.cpp:3113 +#: directorymergewindow.cpp:3127 #, kde-format msgid "File" msgstr "" -#: directorymergewindow.cpp:3113 +#: directorymergewindow.cpp:3127 #, kde-format msgid "-Link" msgstr "" -#: directorymergewindow.cpp:3119 +#: directorymergewindow.cpp:3133 #, kde-format msgid "not available" msgstr "" -#: directorymergewindow.cpp:3137 +#: directorymergewindow.cpp:3151 #, kde-format msgid "A (Dest): " msgstr "" -#: directorymergewindow.cpp:3141 +#: directorymergewindow.cpp:3155 #, kde-format msgid "A: " msgstr "" -#: directorymergewindow.cpp:3141 +#: directorymergewindow.cpp:3155 #, kde-format msgid "A (Base): " msgstr "" -#: directorymergewindow.cpp:3147 +#: directorymergewindow.cpp:3161 #, kde-format msgid "B (Dest): " msgstr "" -#: directorymergewindow.cpp:3151 +#: directorymergewindow.cpp:3165 #, kde-format msgid "B: " msgstr "" -#: directorymergewindow.cpp:3156 +#: directorymergewindow.cpp:3170 #, kde-format msgid "C (Dest): " msgstr "" -#: directorymergewindow.cpp:3160 +#: directorymergewindow.cpp:3174 #, kde-format msgid "C: " msgstr "" -#: directorymergewindow.cpp:3163 +#: directorymergewindow.cpp:3177 #, kde-format msgid "Dest: " msgstr "" #. i18n("Saving Directory Merge State ...")); -#: directorymergewindow.cpp:3238 +#: directorymergewindow.cpp:3252 #, kde-format msgid "Save Directory Merge State As..." msgstr "" -#: directorymergewindow.cpp:3387 +#: directorymergewindow.cpp:3401 #, kde-format msgid "Start/Continue Directory Merge" msgstr "" -#: directorymergewindow.cpp:3388 +#: directorymergewindow.cpp:3402 #, kde-format msgid "Run Operation for Current Item" msgstr "" -#: directorymergewindow.cpp:3389 +#: directorymergewindow.cpp:3403 #, kde-format msgid "Compare Selected File" msgstr "" -#: directorymergewindow.cpp:3390 +#: directorymergewindow.cpp:3404 #, kde-format msgid "Merge Current File" msgstr "" -#: directorymergewindow.cpp:3390 +#: directorymergewindow.cpp:3404 #, kde-format msgid "" "Merge\n" "File" msgstr "" -#: directorymergewindow.cpp:3391 +#: directorymergewindow.cpp:3405 #, kde-format msgid "Fold All Subdirs" msgstr "" -#: directorymergewindow.cpp:3392 +#: directorymergewindow.cpp:3406 #, kde-format msgid "Unfold All Subdirs" msgstr "" #. i18n("Save Directory Merge State ..."), 0, this, &DirectoryMergeWindow::slotSaveMergeState, ac, "dir_save_merge_state"); #. i18n("Load Directory Merge State ..."), 0, this, &DirectoryMergeWindow::slotLoadMergeState, ac, "dir_load_merge_state"); -#: directorymergewindow.cpp:3396 +#: directorymergewindow.cpp:3410 #, kde-format msgid "Choose A for All Items" msgstr "" -#: directorymergewindow.cpp:3397 +#: directorymergewindow.cpp:3411 #, kde-format msgid "Choose B for All Items" msgstr "" -#: directorymergewindow.cpp:3398 +#: directorymergewindow.cpp:3412 #, kde-format msgid "Choose C for All Items" msgstr "" -#: directorymergewindow.cpp:3399 +#: directorymergewindow.cpp:3413 #, kde-format msgid "Auto-Choose Operation for All Items" msgstr "" -#: directorymergewindow.cpp:3400 +#: directorymergewindow.cpp:3414 #, kde-format msgid "No Operation for All Items" msgstr "" #. i18n("Synchronize Directories"), 0, this, &DirectoryMergeWindow::slotSynchronizeDirectories, ac, "dir_synchronize_directories"); #. d->m_pDirChooseNewerFiles = GuiUtils::createAction< KToggleAction >(i18n("Copy Newer Files Instead of Merging"), 0, this, &DirectoryMergeWindow::slotChooseNewerFiles, ac, "dir_choose_newer_files"); -#: directorymergewindow.cpp:3405 +#: directorymergewindow.cpp:3419 #, kde-format msgid "Show Identical Files" msgstr "" -#: directorymergewindow.cpp:3405 +#: directorymergewindow.cpp:3419 #, kde-format msgid "" "Identical\n" "Files" msgstr "" -#: directorymergewindow.cpp:3406 +#: directorymergewindow.cpp:3420 #, kde-format msgid "Show Different Files" msgstr "" -#: directorymergewindow.cpp:3407 +#: directorymergewindow.cpp:3421 #, kde-format msgid "Show Files only in A" msgstr "" -#: directorymergewindow.cpp:3407 +#: directorymergewindow.cpp:3421 #, kde-format msgid "" "Files\n" "only in A" msgstr "" -#: directorymergewindow.cpp:3408 +#: directorymergewindow.cpp:3422 #, kde-format msgid "Show Files only in B" msgstr "" -#: directorymergewindow.cpp:3408 +#: directorymergewindow.cpp:3422 #, kde-format msgid "" "Files\n" "only in B" msgstr "" -#: directorymergewindow.cpp:3409 +#: directorymergewindow.cpp:3423 #, kde-format msgid "Show Files only in C" msgstr "" -#: directorymergewindow.cpp:3409 +#: directorymergewindow.cpp:3423 #, kde-format msgid "" "Files\n" "only in C" msgstr "" -#: directorymergewindow.cpp:3413 +#: directorymergewindow.cpp:3427 #, kde-format msgid "Compare Explicitly Selected Files" msgstr "" -#: directorymergewindow.cpp:3414 +#: directorymergewindow.cpp:3428 #, kde-format msgid "Merge Explicitly Selected Files" msgstr "" -#: directorymergewindow.cpp:3416 directorymergewindow.cpp:3423 +#: directorymergewindow.cpp:3430 directorymergewindow.cpp:3437 #, kde-format msgid "Do Nothing" msgstr "" -#: directorymergewindow.cpp:3428 +#: directorymergewindow.cpp:3442 #, kde-format msgid "Delete A && B" msgstr "" -#: directorymergewindow.cpp:3431 +#: directorymergewindow.cpp:3445 #, kde-format msgid "Merge to A && B" msgstr "" -#: fileaccess.cpp:462 SourceData.cpp:493 +#: fileaccess.cpp:301 +#, kde-format +msgid "Unable to determine full url. No parent specified." +msgstr "" + +#: fileaccess.cpp:482 SourceData.cpp:506 #, kde-format msgid "Failed to read file: %1" msgstr "" -#: fileaccess.cpp:587 +#: fileaccess.cpp:624 #, kde-format msgid "Creating temp copy of %1 failed." msgstr "" -#: fileaccess.cpp:595 fileaccess.cpp:600 +#: fileaccess.cpp:632 fileaccess.cpp:637 #, kde-format msgid "Opening %1 failed. %2" msgstr "" -#: fileaccess.cpp:619 fileaccess.cpp:627 +#: fileaccess.cpp:656 fileaccess.cpp:664 #, kde-format msgid "Error reading from %1. %2" msgstr "" -#: fileaccess.cpp:751 +#: fileaccess.cpp:788 #, kde-format msgid "" "While trying to make a backup, deleting an older backup failed.\n" "Filename: %1" msgstr "" -#: fileaccess.cpp:758 +#: fileaccess.cpp:795 #, kde-format msgid "" "While trying to make a backup, renaming failed.\n" "Filenames: %1 -> %2" msgstr "" -#: fileaccess.cpp:828 +#: fileaccess.cpp:865 #, kde-format msgid "Getting file status: %1" msgstr "" -#: fileaccess.cpp:869 +#: fileaccess.cpp:906 #, kde-format msgid "Reading file: %1" msgstr "" -#: fileaccess.cpp:907 +#: fileaccess.cpp:944 #, kde-format msgid "Writing file: %1" msgstr "" -#: fileaccess.cpp:940 +#: fileaccess.cpp:977 #, kde-format msgid "Out of memory" msgstr "" -#: fileaccess.cpp:976 +#: fileaccess.cpp:1013 #, kde-format msgid "Making directory: %1" msgstr "" -#: fileaccess.cpp:997 +#: fileaccess.cpp:1034 #, kde-format msgid "Removing directory: %1" msgstr "" -#: fileaccess.cpp:1012 +#: fileaccess.cpp:1049 #, kde-format msgid "Removing file: %1" msgstr "" -#: fileaccess.cpp:1028 +#: fileaccess.cpp:1065 #, kde-format msgid "Creating symbolic link: %1 -> %2" msgstr "" -#: fileaccess.cpp:1052 +#: fileaccess.cpp:1089 #, kde-format msgid "Renaming file: %1 -> %2" msgstr "" -#: fileaccess.cpp:1086 +#: fileaccess.cpp:1123 #, kde-format msgid "Copying file: %1 -> %2" msgstr "" -#: fileaccess.cpp:1108 +#: fileaccess.cpp:1145 #, kde-format msgid "Reading directory: %1" msgstr "" -#: fileaccess.cpp:1162 +#: fileaccess.cpp:1202 #, kde-format msgid "Listing directory: %1" msgstr "" -#: kdiff3.cpp:181 +#: kdiff3.cpp:182 #, kde-format msgid "Current Configuration:" msgstr "" -#: kdiff3.cpp:186 +#: kdiff3.cpp:187 #, kde-format msgid "Config Option Error:" msgstr "" -#: kdiff3.cpp:240 +#: kdiff3.cpp:246 #, kde-format msgid "Option --auto used, but no output file specified." msgstr "" -#: kdiff3.cpp:416 +#: kdiff3.cpp:405 #, kde-format msgid "Option --auto ignored for directory comparison." msgstr "" -#: kdiff3.cpp:460 +#: kdiff3.cpp:449 #, kde-format msgid "Saving failed." msgstr "" -#: kdiff3.cpp:496 pdiff.cpp:1098 +#: kdiff3.cpp:494 pdiff.cpp:1096 #, kde-format msgid "Opening of these files failed:" msgstr "" -#: kdiff3.cpp:505 +#: kdiff3.cpp:503 pdiff.cpp:1105 #, kde-format -msgid "File Open Error" +msgid "File open error" msgstr "" -#: kdiff3.cpp:533 +#: kdiff3.cpp:532 #, kde-format msgid "Opens documents for comparison..." msgstr "" -#: kdiff3.cpp:535 +#: kdiff3.cpp:534 #, kde-format msgid "Reload" msgstr "" -#: kdiff3.cpp:538 +#: kdiff3.cpp:537 #, kde-format msgid "Saves the merge result. All conflicts must be solved!" msgstr "" -#: kdiff3.cpp:540 +#: kdiff3.cpp:539 #, kde-format msgid "Saves the current document as..." msgstr "" -#: kdiff3.cpp:543 +#: kdiff3.cpp:542 #, kde-format msgid "Print the differences" msgstr "" -#: kdiff3.cpp:546 +#: kdiff3.cpp:545 #, kde-format msgid "Quits the application" msgstr "" -#: kdiff3.cpp:549 +#: kdiff3.cpp:548 #, kde-format msgid "Cuts the selected section and puts it to the clipboard" msgstr "" -#: kdiff3.cpp:552 +#: kdiff3.cpp:551 #, kde-format msgid "Copies the selected section to the clipboard" msgstr "" -#: kdiff3.cpp:554 +#: kdiff3.cpp:553 #, kde-format msgid "Pastes the clipboard contents to current position" msgstr "" -#: kdiff3.cpp:557 +#: kdiff3.cpp:556 #, kde-format msgid "Select everything in current window" msgstr "" -#: kdiff3.cpp:560 +#: kdiff3.cpp:559 #, kde-format msgid "Search for a string" msgstr "" -#: kdiff3.cpp:562 +#: kdiff3.cpp:561 #, kde-format msgid "Search again for the string" msgstr "" -#: kdiff3.cpp:567 +#: kdiff3.cpp:566 #, kde-format msgid "Enables/disables the statusbar" msgstr "" -#: kdiff3.cpp:571 +#: kdiff3.cpp:570 #, kde-format msgid "Configure KDiff3..." msgstr "" -#: kdiff3.cpp:590 +#: kdiff3.cpp:589 #, kde-format msgid "Go to Current Delta" msgstr "" -#: kdiff3.cpp:590 +#: kdiff3.cpp:589 #, kde-format msgid "" "Current\n" "Delta" msgstr "" -#: kdiff3.cpp:592 +#: kdiff3.cpp:591 #, kde-format msgid "Go to First Delta" msgstr "" -#: kdiff3.cpp:592 +#: kdiff3.cpp:591 #, kde-format msgid "" "First\n" "Delta" msgstr "" -#: kdiff3.cpp:594 +#: kdiff3.cpp:593 #, kde-format msgid "Go to Last Delta" msgstr "" -#: kdiff3.cpp:594 +#: kdiff3.cpp:593 #, kde-format msgid "" "Last\n" "Delta" msgstr "" -#: kdiff3.cpp:596 +#: kdiff3.cpp:595 #, kde-format msgid "(Skips white space differences when \"Show White Space\" is disabled.)" msgstr "" -#: kdiff3.cpp:597 +#: kdiff3.cpp:596 #, kde-format msgid "" "(Does not skip white space differences even when \"Show White Space\" is " "disabled.)" msgstr "" -#: kdiff3.cpp:598 +#: kdiff3.cpp:597 #, kde-format msgid "Go to Previous Delta" msgstr "" -#: kdiff3.cpp:598 +#: kdiff3.cpp:597 #, kde-format msgid "" "Prev\n" "Delta" msgstr "" -#: kdiff3.cpp:600 +#: kdiff3.cpp:599 #, kde-format msgid "Go to Next Delta" msgstr "" -#: kdiff3.cpp:600 +#: kdiff3.cpp:599 #, kde-format msgid "" "Next\n" "Delta" msgstr "" -#: kdiff3.cpp:602 +#: kdiff3.cpp:601 #, kde-format msgid "Go to Previous Conflict" msgstr "" -#: kdiff3.cpp:602 +#: kdiff3.cpp:601 #, kde-format msgid "" "Prev\n" "Conflict" msgstr "" -#: kdiff3.cpp:604 +#: kdiff3.cpp:603 #, kde-format msgid "Go to Next Conflict" msgstr "" -#: kdiff3.cpp:604 +#: kdiff3.cpp:603 #, kde-format msgid "" "Next\n" "Conflict" msgstr "" -#: kdiff3.cpp:606 +#: kdiff3.cpp:605 #, kde-format msgid "Go to Previous Unsolved Conflict" msgstr "" -#: kdiff3.cpp:606 +#: kdiff3.cpp:605 #, kde-format msgid "" "Prev\n" "Unsolved" msgstr "" -#: kdiff3.cpp:608 +#: kdiff3.cpp:607 #, kde-format msgid "Go to Next Unsolved Conflict" msgstr "" -#: kdiff3.cpp:608 +#: kdiff3.cpp:607 #, kde-format msgid "" "Next\n" "Unsolved" msgstr "" -#: kdiff3.cpp:610 +#: kdiff3.cpp:609 #, kde-format msgid "Select Line(s) From A" msgstr "" -#: kdiff3.cpp:610 +#: kdiff3.cpp:609 #, kde-format msgid "" "Choose\n" "A" msgstr "" -#: kdiff3.cpp:611 +#: kdiff3.cpp:610 #, kde-format msgid "Select Line(s) From B" msgstr "" -#: kdiff3.cpp:611 +#: kdiff3.cpp:610 #, kde-format msgid "" "Choose\n" "B" msgstr "" -#: kdiff3.cpp:612 +#: kdiff3.cpp:611 #, kde-format msgid "Select Line(s) From C" msgstr "" -#: kdiff3.cpp:612 +#: kdiff3.cpp:611 #, kde-format msgid "" "Choose\n" "C" msgstr "" -#: kdiff3.cpp:613 +#: kdiff3.cpp:612 #, kde-format msgid "Automatically Go to Next Unsolved Conflict After Source Selection" msgstr "" -#: kdiff3.cpp:613 +#: kdiff3.cpp:612 #, kde-format msgid "" "Auto\n" "Next" msgstr "" -#: kdiff3.cpp:615 +#: kdiff3.cpp:614 #, kde-format msgid "Show Space && Tabulator Characters" msgstr "" -#: kdiff3.cpp:615 +#: kdiff3.cpp:614 #, kde-format msgid "" "White\n" "Characters" msgstr "" -#: kdiff3.cpp:616 +#: kdiff3.cpp:615 #, kde-format msgid "Show White Space" msgstr "" -#: kdiff3.cpp:616 +#: kdiff3.cpp:615 #, kde-format msgid "" "White\n" "Deltas" msgstr "" -#: kdiff3.cpp:618 +#: kdiff3.cpp:617 #, kde-format msgid "Show Line Numbers" msgstr "" -#: kdiff3.cpp:618 +#: kdiff3.cpp:617 #, kde-format msgid "" "Line\n" "Numbers" msgstr "" -#: kdiff3.cpp:620 +#: kdiff3.cpp:619 #, kde-format msgid "Automatically Solve Simple Conflicts" msgstr "" -#: kdiff3.cpp:621 +#: kdiff3.cpp:620 #, kde-format msgid "Set Deltas to Conflicts" msgstr "" -#: kdiff3.cpp:622 +#: kdiff3.cpp:621 #, kde-format msgid "Run Regular Expression Auto Merge" msgstr "" -#: kdiff3.cpp:623 +#: kdiff3.cpp:622 #, kde-format msgid "Automatically Solve History Conflicts" msgstr "" -#: kdiff3.cpp:624 +#: kdiff3.cpp:623 #, kde-format msgid "Split Diff At Selection" msgstr "" -#: kdiff3.cpp:625 +#: kdiff3.cpp:624 #, kde-format msgid "Join Selected Diffs" msgstr "" -#: kdiff3.cpp:627 +#: kdiff3.cpp:626 #, kde-format msgid "Show Window A" msgstr "" -#: kdiff3.cpp:628 +#: kdiff3.cpp:627 #, kde-format msgid "Show Window B" msgstr "" -#: kdiff3.cpp:629 +#: kdiff3.cpp:628 #, kde-format msgid "Show Window C" msgstr "" -#: kdiff3.cpp:631 +#: kdiff3.cpp:630 #, kde-format msgid "Normal Overview" msgstr "" -#: kdiff3.cpp:632 +#: kdiff3.cpp:631 #, kde-format msgid "A vs. B Overview" msgstr "" -#: kdiff3.cpp:633 +#: kdiff3.cpp:632 #, kde-format msgid "A vs. C Overview" msgstr "" -#: kdiff3.cpp:634 +#: kdiff3.cpp:633 #, kde-format msgid "B vs. C Overview" msgstr "" -#: kdiff3.cpp:635 +#: kdiff3.cpp:634 #, kde-format msgid "Word Wrap Diff Windows" msgstr "" -#: kdiff3.cpp:636 +#: kdiff3.cpp:635 #, kde-format msgid "Add Manual Diff Alignment" msgstr "" -#: kdiff3.cpp:637 +#: kdiff3.cpp:636 #, kde-format msgid "Clear All Manual Diff Alignments" msgstr "" -#: kdiff3.cpp:639 +#: kdiff3.cpp:638 #, kde-format msgid "Focus Next Window" msgstr "" -#: kdiff3.cpp:640 +#: kdiff3.cpp:639 #, kde-format msgid "Focus Prev Window" msgstr "" -#: kdiff3.cpp:641 +#: kdiff3.cpp:640 #, kde-format msgid "Toggle Split Orientation" msgstr "" -#: kdiff3.cpp:643 +#: kdiff3.cpp:642 #, kde-format msgid "Dir && Text Split Screen View" msgstr "" -#: kdiff3.cpp:645 +#: kdiff3.cpp:644 #, kde-format msgid "Toggle Between Dir && Text View" msgstr "" -#: kdiff3.cpp:697 pdiff.cpp:1909 +#: kdiff3.cpp:696 pdiff.cpp:1919 #, kde-format msgid "The merge result has not been saved." msgstr "" -#: kdiff3.cpp:699 +#: kdiff3.cpp:698 #, kde-format msgid "Save && Quit" msgstr "" -#: kdiff3.cpp:700 +#: kdiff3.cpp:699 #, kde-format msgid "Quit Without Saving" msgstr "" -#: kdiff3.cpp:708 pdiff.cpp:1920 +#: kdiff3.cpp:707 pdiff.cpp:1930 #, kde-format msgid "Saving the merge result failed." msgstr "" -#: kdiff3.cpp:719 pdiff.cpp:1032 +#: kdiff3.cpp:718 pdiff.cpp:1030 #, kde-format msgid "" "You are currently doing a directory merge. Are you sure, you want to abort?" msgstr "" -#: kdiff3.cpp:742 +#: kdiff3.cpp:741 #, kde-format msgid "Saving file..." msgstr "" -#: kdiff3.cpp:759 +#: kdiff3.cpp:758 #, kde-format msgid "Saving file with a new filename..." msgstr "" -#: kdiff3.cpp:761 +#: kdiff3.cpp:760 #, kde-format msgid "Save As..." msgstr "" -#: kdiff3.cpp:820 +#: kdiff3.cpp:819 #, kde-format msgid "Printing not implemented." msgstr "" -#: kdiff3.cpp:857 +#: kdiff3.cpp:858 #, kde-format msgid "Printing..." msgstr "" -#: kdiff3.cpp:943 +#: kdiff3.cpp:948 #, kde-format msgid "Printing page %1 of %2" msgstr "" -#: kdiff3.cpp:1000 +#: kdiff3.cpp:1006 #, kde-format msgid " (Selection)" msgstr "" -#: kdiff3.cpp:1027 +#: kdiff3.cpp:1034 #, kde-format msgid "Printing completed." msgstr "" -#: kdiff3.cpp:1031 +#: kdiff3.cpp:1038 #, kde-format msgid "Printing aborted." msgstr "" -#: kdiff3.cpp:1038 +#: kdiff3.cpp:1045 #, kde-format msgid "Exiting..." msgstr "" -#: kdiff3.cpp:1049 +#: kdiff3.cpp:1056 #, kde-format msgid "Toggling toolbar..." msgstr "" -#: kdiff3.cpp:1070 +#: kdiff3.cpp:1077 #, kde-format msgid "Toggle the statusbar..." msgstr "" @@ -1525,7 +1530,7 @@ msgid "Joachim Eibl" msgstr "" -#: kdiff3_part.cpp:173 kdiff3_part.cpp:254 +#: kdiff3_part.cpp:174 kdiff3_part.cpp:255 #, kde-format msgid "Could not find files for comparison." msgstr "" @@ -1543,7 +1548,7 @@ msgstr "" #. i18n: ectx: ToolBar (mainToolBar) -#: kdiff3_part.rc:16 main.cpp:88 +#: kdiff3_part.rc:16 main.cpp:89 #, kde-format msgid "KDiff3" msgstr "" @@ -1610,198 +1615,203 @@ msgid "Main Toolbar" msgstr "" -#: main.cpp:68 main.cpp:72 +#: main.cpp:69 main.cpp:73 #, kde-format msgid "Ignored. (User defined.)" msgstr "" -#: main.cpp:92 +#: main.cpp:93 #, kde-format msgid " (64 bit)" msgstr "" -#: main.cpp:94 +#: main.cpp:95 #, kde-format msgid " (32 bit)" msgstr "" -#: main.cpp:95 +#: main.cpp:96 #, kde-format msgid "Tool for Comparison and Merge of Files and Directories" msgstr "" -#: main.cpp:96 +#: main.cpp:97 #, kde-format msgid "(c) 2002-2014 Joachim Eibl, (c) 2017 Michael Reeves KF5/Qt5 port" msgstr "" -#: main.cpp:112 +#: main.cpp:113 #, kde-format msgid "Merge the input." msgstr "" -#: main.cpp:113 +#: main.cpp:114 #, kde-format msgid "Explicit base file. For compatibility with certain tools." msgstr "" -#: main.cpp:114 +#: main.cpp:115 #, kde-format msgid "Output file. Implies -m. E.g.: -o newfile.txt" msgstr "" -#: main.cpp:115 +#: main.cpp:116 #, kde-format msgid "Output file, again. (For compatibility with certain tools.)" msgstr "" -#: main.cpp:116 +#: main.cpp:118 #, kde-format msgid "No GUI if all conflicts are auto-solvable. (Needs -o file)" msgstr "" -#: main.cpp:117 +#: main.cpp:120 +#, kde-format +msgid "Ignored." +msgstr "" + +#: main.cpp:122 #, kde-format msgid "Do not solve conflicts automatically." msgstr "" -#: main.cpp:118 +#: main.cpp:123 #, kde-format msgid "Visible name replacement for input file 1 (base)." msgstr "" -#: main.cpp:119 +#: main.cpp:124 #, kde-format msgid "Visible name replacement for input file 2." msgstr "" -#: main.cpp:120 +#: main.cpp:125 #, kde-format msgid "Visible name replacement for input file 3." msgstr "" -#: main.cpp:121 +#: main.cpp:126 #, kde-format msgid "Alternative visible name replacement. Supply this once for every input." msgstr "" -#: main.cpp:122 +#: main.cpp:127 #, kde-format msgid "" "Override a config setting. Use once for every setting. E.g.: --cs " "\"AutoAdvance=1\"" msgstr "" -#: main.cpp:123 +#: main.cpp:128 #, kde-format msgid "Show list of config settings and current values." msgstr "" -#: main.cpp:124 +#: main.cpp:129 #, kde-format msgid "Use a different config file." msgstr "" -#: main.cpp:127 +#: main.cpp:132 #, kde-format msgid "file1 to open (base, if not specified via --base)" msgstr "" -#: main.cpp:128 +#: main.cpp:133 #, kde-format msgid "file2 to open" msgstr "" -#: main.cpp:129 +#: main.cpp:134 #, kde-format msgid "file3 to open" msgstr "" -#: main.cpp:153 +#: main.cpp:158 #, kde-format msgid "See kdiff3 --help for supported options." msgstr "" -#: mergeresultwindow.cpp:158 +#: mergeresultwindow.cpp:171 #, kde-format msgid "Choose A Everywhere" msgstr "" -#: mergeresultwindow.cpp:159 +#: mergeresultwindow.cpp:172 #, kde-format msgid "Choose B Everywhere" msgstr "" -#: mergeresultwindow.cpp:160 +#: mergeresultwindow.cpp:173 #, kde-format msgid "Choose C Everywhere" msgstr "" -#: mergeresultwindow.cpp:161 +#: mergeresultwindow.cpp:174 #, kde-format msgid "Choose A for All Unsolved Conflicts" msgstr "" -#: mergeresultwindow.cpp:162 +#: mergeresultwindow.cpp:175 #, kde-format msgid "Choose B for All Unsolved Conflicts" msgstr "" -#: mergeresultwindow.cpp:163 +#: mergeresultwindow.cpp:176 #, kde-format msgid "Choose C for All Unsolved Conflicts" msgstr "" -#: mergeresultwindow.cpp:164 +#: mergeresultwindow.cpp:177 #, kde-format msgid "Choose A for All Unsolved Whitespace Conflicts" msgstr "" -#: mergeresultwindow.cpp:165 +#: mergeresultwindow.cpp:178 #, kde-format msgid "Choose B for All Unsolved Whitespace Conflicts" msgstr "" -#: mergeresultwindow.cpp:166 +#: mergeresultwindow.cpp:179 #, kde-format msgid "Choose C for All Unsolved Whitespace Conflicts" msgstr "" -#: mergeresultwindow.cpp:176 +#: mergeresultwindow.cpp:204 #, kde-format msgid "Number of remaining unsolved conflicts: %1 (of which %2 are whitespace)" msgstr "" -#: mergeresultwindow.cpp:370 +#: mergeresultwindow.cpp:398 #, kde-format msgid "" "The output has been modified.\n" "If you continue your changes will be lost." msgstr "" -#: mergeresultwindow.cpp:936 pdiff.cpp:827 +#: mergeresultwindow.cpp:964 pdiff.cpp:817 #, kde-format msgid "All input files are binary equal." msgstr "" -#: mergeresultwindow.cpp:938 +#: mergeresultwindow.cpp:966 #, kde-format msgid "All input files contain the same text." msgstr "" -#: mergeresultwindow.cpp:942 mergeresultwindow.cpp:946 -#: mergeresultwindow.cpp:950 pdiff.cpp:833 pdiff.cpp:837 pdiff.cpp:841 +#: mergeresultwindow.cpp:970 mergeresultwindow.cpp:974 +#: mergeresultwindow.cpp:978 pdiff.cpp:823 pdiff.cpp:827 pdiff.cpp:831 #, kde-format msgid "Files %1 and %2 are binary equal.\n" msgstr "" -#: mergeresultwindow.cpp:944 mergeresultwindow.cpp:948 -#: mergeresultwindow.cpp:952 +#: mergeresultwindow.cpp:972 mergeresultwindow.cpp:976 +#: mergeresultwindow.cpp:980 #, kde-format msgid "Files %1 and %2 have equal text.\n" msgstr "" -#: mergeresultwindow.cpp:958 +#: mergeresultwindow.cpp:986 #, kde-format msgid "" "Total number of conflicts: %1\n" @@ -1810,39 +1820,39 @@ "%4" msgstr "" -#: mergeresultwindow.cpp:964 +#: mergeresultwindow.cpp:992 #, kde-format msgid "Conflicts" msgstr "" -#: mergeresultwindow.cpp:1873 +#: mergeresultwindow.cpp:1901 #, kde-format msgid "" msgstr "" -#: mergeresultwindow.cpp:1881 +#: mergeresultwindow.cpp:1909 #, kde-format msgid "" msgstr "" -#: mergeresultwindow.cpp:1883 mergeresultwindow.cpp:2755 +#: mergeresultwindow.cpp:1911 mergeresultwindow.cpp:2783 #, kde-format msgid "" msgstr "" -#: mergeresultwindow.cpp:2967 +#: mergeresultwindow.cpp:2995 #, kde-format msgid "" "Not all conflicts are solved yet.\n" "File not saved." msgstr "" -#: mergeresultwindow.cpp:2969 mergeresultwindow.cpp:2978 +#: mergeresultwindow.cpp:2997 mergeresultwindow.cpp:3006 #, kde-format msgid "Conflicts Left" msgstr "" -#: mergeresultwindow.cpp:2976 +#: mergeresultwindow.cpp:3004 #, kde-format msgid "" "There is a line end style conflict. Please choose the line end style " @@ -1850,7 +1860,7 @@ "File not saved." msgstr "" -#: mergeresultwindow.cpp:2990 +#: mergeresultwindow.cpp:3018 #, kde-format msgid "" "\n" @@ -1858,57 +1868,57 @@ "Creating backup failed. File not saved." msgstr "" -#: mergeresultwindow.cpp:2990 mergeresultwindow.cpp:3038 +#: mergeresultwindow.cpp:3018 mergeresultwindow.cpp:3066 #, kde-format msgid "File Save Error" msgstr "" -#: mergeresultwindow.cpp:3038 +#: mergeresultwindow.cpp:3066 #, kde-format msgid "Error while writing." msgstr "" -#: mergeresultwindow.cpp:3110 +#: mergeresultwindow.cpp:3138 #, kde-format msgid "Output:" msgstr "" -#: mergeresultwindow.cpp:3123 mergeresultwindow.cpp:3315 +#: mergeresultwindow.cpp:3151 mergeresultwindow.cpp:3343 #, kde-format msgid "[Modified]" msgstr "" -#: mergeresultwindow.cpp:3130 +#: mergeresultwindow.cpp:3158 #, kde-format msgid "Encoding for saving:" msgstr "" -#: mergeresultwindow.cpp:3230 +#: mergeresultwindow.cpp:3258 #, kde-format msgid "Conflict" msgstr "" -#: mergeresultwindow.cpp:3262 +#: mergeresultwindow.cpp:3290 #, kde-format msgid "Codec from A: %1" msgstr "" -#: mergeresultwindow.cpp:3264 +#: mergeresultwindow.cpp:3292 #, kde-format msgid "Codec from B: %1" msgstr "" -#: mergeresultwindow.cpp:3266 +#: mergeresultwindow.cpp:3294 #, kde-format msgid "Codec from C: %1" msgstr "" -#: optiondialog.cpp:119 +#: optiondialog.cpp:121 #, kde-format msgid "Change Font" msgstr "" -#: optiondialog.cpp:135 optiondialog.cpp:145 +#: optiondialog.cpp:137 optiondialog.cpp:147 #, kde-format msgid "" "Font: %1, %2, %3\n" @@ -1916,206 +1926,206 @@ "Example:" msgstr "" -#: optiondialog.cpp:388 +#: optiondialog.cpp:390 #, kde-format msgid "Unicode" msgstr "" -#: optiondialog.cpp:389 +#: optiondialog.cpp:391 #, kde-format msgid "Latin1" msgstr "" -#: optiondialog.cpp:408 +#: optiondialog.cpp:410 #, kde-format msgid "Change this if non-ASCII characters are not displayed correctly." msgstr "" -#: optiondialog.cpp:491 +#: optiondialog.cpp:495 #, kde-format msgid "Configure" msgstr "" -#: optiondialog.cpp:568 +#: optiondialog.cpp:573 #, kde-format msgid "Font" msgstr "" -#: optiondialog.cpp:570 +#: optiondialog.cpp:575 #, kde-format msgid "Editor & Diff Output Font" msgstr "" -#: optiondialog.cpp:589 +#: optiondialog.cpp:594 #, kde-format msgid "Application font" msgstr "" -#: optiondialog.cpp:594 +#: optiondialog.cpp:599 #, kde-format msgid "File view font" msgstr "" -#: optiondialog.cpp:613 +#: optiondialog.cpp:618 #, kde-format msgctxt "Title for color settings page" msgid "Color" msgstr "" -#: optiondialog.cpp:614 +#: optiondialog.cpp:619 #, kde-format msgid "Colors Settings" msgstr "" -#: optiondialog.cpp:631 +#: optiondialog.cpp:644 #, kde-format msgid "Editor and Diff Views:" msgstr "" -#: optiondialog.cpp:639 +#: optiondialog.cpp:652 #, kde-format msgid "Foreground color:" msgstr "" -#: optiondialog.cpp:647 +#: optiondialog.cpp:660 #, kde-format msgid "Background color:" msgstr "" -#: optiondialog.cpp:657 +#: optiondialog.cpp:670 #, kde-format msgid "Diff background color:" msgstr "" -#: optiondialog.cpp:666 +#: optiondialog.cpp:679 #, kde-format msgid "Color A:" msgstr "" -#: optiondialog.cpp:675 +#: optiondialog.cpp:688 #, kde-format msgid "Color B:" msgstr "" -#: optiondialog.cpp:684 +#: optiondialog.cpp:697 #, kde-format msgid "Color C:" msgstr "" -#: optiondialog.cpp:692 +#: optiondialog.cpp:705 #, kde-format msgid "Conflict color:" msgstr "" -#: optiondialog.cpp:701 +#: optiondialog.cpp:714 #, kde-format msgid "Current range background color:" msgstr "" -#: optiondialog.cpp:710 +#: optiondialog.cpp:723 #, kde-format msgid "Current range diff background color:" msgstr "" -#: optiondialog.cpp:718 +#: optiondialog.cpp:731 #, kde-format msgid "Color for manually aligned difference ranges:" msgstr "" -#: optiondialog.cpp:725 +#: optiondialog.cpp:738 #, kde-format msgid "Directory Comparison View:" msgstr "" -#: optiondialog.cpp:731 +#: optiondialog.cpp:744 #, kde-format msgid "Newest file color:" msgstr "" -#: optiondialog.cpp:736 +#: optiondialog.cpp:749 #, kde-format msgid "" "Changing this color will only be effective when starting the next directory " "comparison." msgstr "" -#: optiondialog.cpp:741 +#: optiondialog.cpp:754 #, kde-format msgid "Oldest file color:" msgstr "" -#: optiondialog.cpp:750 +#: optiondialog.cpp:763 #, kde-format msgid "Middle age file color:" msgstr "" -#: optiondialog.cpp:759 +#: optiondialog.cpp:772 #, kde-format msgid "Color for missing files:" msgstr "" -#: optiondialog.cpp:773 +#: optiondialog.cpp:786 #, kde-format msgid "Editor" msgstr "" -#: optiondialog.cpp:774 +#: optiondialog.cpp:787 #, kde-format msgid "Editor Behavior" msgstr "" -#: optiondialog.cpp:787 +#: optiondialog.cpp:809 #, kde-format msgid "Tab inserts spaces" msgstr "" -#: optiondialog.cpp:791 +#: optiondialog.cpp:813 #, kde-format msgid "" "On: Pressing tab generates the appropriate number of spaces.\n" "Off: A tab character will be inserted." msgstr "" -#: optiondialog.cpp:796 +#: optiondialog.cpp:818 #, kde-format msgid "Tab size:" msgstr "" -#: optiondialog.cpp:803 +#: optiondialog.cpp:825 #, kde-format msgid "Auto indentation" msgstr "" -#: optiondialog.cpp:807 +#: optiondialog.cpp:829 #, kde-format msgid "On: The indentation of the previous line is used for a new line.\n" msgstr "" -#: optiondialog.cpp:810 +#: optiondialog.cpp:832 #, kde-format msgid "Auto copy selection" msgstr "" -#: optiondialog.cpp:814 +#: optiondialog.cpp:836 #, kde-format msgid "" "On: Any selection is immediately written to the clipboard.\n" "Off: You must explicitly copy e.g. via Ctrl-C." msgstr "" -#: optiondialog.cpp:829 +#: optiondialog.cpp:851 #, kde-format msgid "" "Sets the line endings for when an edited file is saved.\n" "DOS/Windows: CR+LF; UNIX: LF; with CR=0D, LF=0A" msgstr "" -#: optiondialog.cpp:839 +#: optiondialog.cpp:861 #, kde-format msgid "Diff" msgstr "" -#: optiondialog.cpp:840 +#: optiondialog.cpp:862 #, kde-format msgid "Diff Settings" msgstr "" @@ -2129,12 +2139,12 @@ #. ); #. ++line; #. -#: optiondialog.cpp:865 +#: optiondialog.cpp:896 #, kde-format msgid "Ignore numbers (treat as white space)" msgstr "" -#: optiondialog.cpp:869 +#: optiondialog.cpp:900 #, kde-format msgid "" "Ignore number characters during line matching phase. (Similar to Ignore " @@ -2142,66 +2152,66 @@ "Might help to compare files with numeric data." msgstr "" -#: optiondialog.cpp:873 +#: optiondialog.cpp:904 #, kde-format msgid "Ignore C/C++ comments (treat as white space)" msgstr "" -#: optiondialog.cpp:876 +#: optiondialog.cpp:907 #, kde-format msgid "Treat C/C++ comments like white space." msgstr "" -#: optiondialog.cpp:879 +#: optiondialog.cpp:910 #, kde-format msgid "Ignore case (treat as white space)" msgstr "" -#: optiondialog.cpp:883 +#: optiondialog.cpp:914 #, kde-format msgid "Treat case differences like white space changes. ('a'<=>'A')" msgstr "" -#: optiondialog.cpp:886 +#: optiondialog.cpp:917 #, kde-format msgid "Preprocessor command:" msgstr "" -#: optiondialog.cpp:891 +#: optiondialog.cpp:922 #, kde-format msgid "User defined pre-processing. (See the docs for details.)" msgstr "" -#: optiondialog.cpp:894 +#: optiondialog.cpp:925 #, kde-format msgid "Line-matching preprocessor command:" msgstr "" -#: optiondialog.cpp:899 +#: optiondialog.cpp:930 #, kde-format msgid "" "This pre-processor is only used during line matching.\n" "(See the docs for details.)" msgstr "" -#: optiondialog.cpp:902 +#: optiondialog.cpp:933 #, kde-format msgid "Try hard (slower)" msgstr "" -#: optiondialog.cpp:906 +#: optiondialog.cpp:937 #, kde-format msgid "" "Enables the --minimal option for the external diff.\n" "The analysis of big files will be much slower." msgstr "" -#: optiondialog.cpp:910 +#: optiondialog.cpp:941 #, kde-format msgid "Align B and C for 3 input files" msgstr "" -#: optiondialog.cpp:914 +#: optiondialog.cpp:945 #, kde-format msgid "" "Try to align B and C when comparing or merging three input files.\n" @@ -2209,66 +2219,72 @@ "(Default is off.)" msgstr "" -#: optiondialog.cpp:926 +#: optiondialog.cpp:956 +#, kde-format +msgctxt "Settings page" +msgid "Merge" +msgstr "" + +#: optiondialog.cpp:957 #, kde-format msgid "Merge Settings" msgstr "" -#: optiondialog.cpp:940 +#: optiondialog.cpp:980 #, kde-format msgid "Auto advance delay (ms):" msgstr "" -#: optiondialog.cpp:946 +#: optiondialog.cpp:986 #, kde-format 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 "" -#: optiondialog.cpp:950 +#: optiondialog.cpp:990 #, kde-format msgid "Show info dialogs" msgstr "" -#: optiondialog.cpp:953 +#: optiondialog.cpp:993 #, kde-format msgid "Show a dialog with information about the number of conflicts." msgstr "" -#: optiondialog.cpp:956 +#: optiondialog.cpp:996 #, kde-format msgid "White space 2-file merge default:" msgstr "" -#: optiondialog.cpp:961 optiondialog.cpp:974 +#: optiondialog.cpp:1001 optiondialog.cpp:1014 #, kde-format msgid "Manual Choice" msgstr "" -#: optiondialog.cpp:965 optiondialog.cpp:979 +#: optiondialog.cpp:1005 optiondialog.cpp:1019 #, kde-format msgid "" "Allow the merge algorithm to automatically select an input for white-space-" "only changes." msgstr "" -#: optiondialog.cpp:969 +#: optiondialog.cpp:1009 #, kde-format msgid "White space 3-file merge default:" msgstr "" -#: optiondialog.cpp:983 +#: optiondialog.cpp:1023 #, kde-format msgid "Automatic Merge Regular Expression" msgstr "" -#: optiondialog.cpp:991 smalldialogs.cpp:449 +#: optiondialog.cpp:1031 smalldialogs.cpp:459 #, kde-format msgid "Auto merge regular expression:" msgstr "" -#: optiondialog.cpp:996 +#: optiondialog.cpp:1036 #, kde-format msgid "" "Regular expression for lines where KDiff3 should automatically choose one " @@ -2277,29 +2293,29 @@ "- if available - C, otherwise B will be chosen." msgstr "" -#: optiondialog.cpp:1002 +#: optiondialog.cpp:1042 #, kde-format msgid "Run regular expression auto merge on merge start" msgstr "" -#: optiondialog.cpp:1005 +#: optiondialog.cpp:1045 #, kde-format msgid "" "Run the merge for auto merge regular expressions\n" "immediately when a merge starts.\n" msgstr "" -#: optiondialog.cpp:1010 +#: optiondialog.cpp:1050 #, kde-format msgid "Version Control History Merging" msgstr "" -#: optiondialog.cpp:1018 smalldialogs.cpp:476 +#: optiondialog.cpp:1058 smalldialogs.cpp:486 #, kde-format msgid "History start regular expression:" msgstr "" -#: optiondialog.cpp:1023 +#: optiondialog.cpp:1063 #, kde-format msgid "" "Regular expression for the start of the version control history entry.\n" @@ -2307,12 +2323,12 @@ "Default value: \".*\\$Log.*\\$.*\"" msgstr "" -#: optiondialog.cpp:1029 smalldialogs.cpp:504 +#: optiondialog.cpp:1069 smalldialogs.cpp:514 #, kde-format msgid "History entry start regular expression:" msgstr "" -#: optiondialog.cpp:1042 +#: optiondialog.cpp:1082 #, kde-format msgid "" "A version control history entry consists of several lines.\n" @@ -2324,22 +2340,22 @@ "See the documentation for details." msgstr "" -#: optiondialog.cpp:1050 +#: optiondialog.cpp:1090 #, kde-format msgid "History merge sorting" msgstr "" -#: optiondialog.cpp:1053 +#: optiondialog.cpp:1093 #, kde-format msgid "Sort version control history by a key." msgstr "" -#: optiondialog.cpp:1063 +#: optiondialog.cpp:1103 #, kde-format msgid "History entry start sort key order:" msgstr "" -#: optiondialog.cpp:1068 +#: optiondialog.cpp:1108 #, kde-format msgid "" "Each pair of parentheses used in the regular expression for the history " @@ -2351,37 +2367,37 @@ "See the documentation for details." msgstr "" -#: optiondialog.cpp:1079 +#: optiondialog.cpp:1119 #, kde-format msgid "Merge version control history on merge start" msgstr "" -#: optiondialog.cpp:1082 +#: optiondialog.cpp:1122 #, kde-format msgid "Run version control history automerge on merge start." msgstr "" -#: optiondialog.cpp:1086 +#: optiondialog.cpp:1126 #, kde-format msgid "Max number of history entries:" msgstr "" -#: optiondialog.cpp:1090 +#: optiondialog.cpp:1130 #, kde-format msgid "Cut off after specified number. Use -1 for infinite number of entries." msgstr "" -#: optiondialog.cpp:1094 +#: optiondialog.cpp:1134 #, kde-format msgid "Test your regular expressions" msgstr "" -#: optiondialog.cpp:1099 +#: optiondialog.cpp:1139 #, kde-format msgid "Irrelevant merge command:" msgstr "" -#: optiondialog.cpp:1104 +#: optiondialog.cpp:1144 #, kde-format msgid "" "If specified this script is run after automerge\n" @@ -2389,12 +2405,12 @@ "Called with the parameters: filename1 filename2 filename3" msgstr "" -#: optiondialog.cpp:1109 +#: optiondialog.cpp:1149 #, kde-format msgid "Auto save and quit on merge without conflicts" msgstr "" -#: optiondialog.cpp:1113 +#: optiondialog.cpp:1153 #, kde-format msgid "" "If KDiff3 was started for a file-merge from the command line and all\n" @@ -2403,27 +2419,27 @@ "(Similar to command line option \"--auto\".)" msgstr "" -#: optiondialog.cpp:1124 optiondialog.cpp:1125 +#: optiondialog.cpp:1164 optiondialog.cpp:1165 #, kde-format msgid "Directory" msgstr "" -#: optiondialog.cpp:1137 +#: optiondialog.cpp:1185 #, kde-format msgid "Recursive directories" msgstr "" -#: optiondialog.cpp:1140 +#: optiondialog.cpp:1188 #, kde-format msgid "Whether to analyze subdirectories or not." msgstr "" -#: optiondialog.cpp:1142 +#: optiondialog.cpp:1190 #, kde-format msgid "File pattern(s):" msgstr "" -#: optiondialog.cpp:1148 +#: optiondialog.cpp:1196 #, kde-format msgid "" "Pattern(s) of files to be analyzed. \n" @@ -2431,12 +2447,12 @@ "Several Patterns can be specified by using the separator: ';'" msgstr "" -#: optiondialog.cpp:1153 +#: optiondialog.cpp:1201 #, kde-format msgid "File-anti-pattern(s):" msgstr "" -#: optiondialog.cpp:1159 +#: optiondialog.cpp:1207 #, kde-format msgid "" "Pattern(s) of files to be excluded from analysis. \n" @@ -2444,12 +2460,12 @@ "Several Patterns can be specified by using the separator: ';'" msgstr "" -#: optiondialog.cpp:1164 +#: optiondialog.cpp:1212 #, kde-format msgid "Dir-anti-pattern(s):" msgstr "" -#: optiondialog.cpp:1170 +#: optiondialog.cpp:1218 #, kde-format msgid "" "Pattern(s) of directories to be excluded from analysis. \n" @@ -2457,58 +2473,58 @@ "Several Patterns can be specified by using the separator: ';'" msgstr "" -#: optiondialog.cpp:1175 +#: optiondialog.cpp:1223 #, kde-format msgid "Use .cvsignore" msgstr "" -#: optiondialog.cpp:1179 +#: optiondialog.cpp:1227 #, kde-format msgid "" "Extends the antipattern to anything that would be ignored by CVS.\n" "Via local \".cvsignore\" files this can be directory specific." msgstr "" -#: optiondialog.cpp:1183 +#: optiondialog.cpp:1231 #, kde-format msgid "Find hidden files and directories" msgstr "" -#: optiondialog.cpp:1186 +#: optiondialog.cpp:1234 #, kde-format msgid "Finds hidden files and directories." msgstr "" -#: optiondialog.cpp:1189 +#: optiondialog.cpp:1237 #, kde-format msgid "Follow file links" msgstr "" -#: optiondialog.cpp:1193 +#: optiondialog.cpp:1241 #, kde-format msgid "" "On: Compare the file the link points to.\n" "Off: Compare the links." msgstr "" -#: optiondialog.cpp:1197 +#: optiondialog.cpp:1245 #, kde-format msgid "Follow directory links" msgstr "" -#: optiondialog.cpp:1201 +#: optiondialog.cpp:1249 #, kde-format msgid "" "On: Compare the directory the link points to.\n" "Off: Compare the links." msgstr "" -#: optiondialog.cpp:1210 +#: optiondialog.cpp:1258 #, kde-format msgid "Case sensitive filename comparison" msgstr "" -#: optiondialog.cpp:1214 +#: optiondialog.cpp:1262 #, kde-format msgid "" "The directory comparison will compare files or directories when their names " @@ -2517,63 +2533,63 @@ "off, otherwise on.)" msgstr "" -#: optiondialog.cpp:1218 +#: optiondialog.cpp:1266 #, kde-format msgid "Unfold all subdirectories on load" msgstr "" -#: optiondialog.cpp:1222 +#: optiondialog.cpp:1270 #, kde-format msgid "" "On: Unfold all subdirectories when starting a directory diff.\n" "Off: Leave subdirectories folded." msgstr "" -#: optiondialog.cpp:1226 +#: optiondialog.cpp:1274 #, kde-format msgid "Skip directory status report" msgstr "" -#: optiondialog.cpp:1230 +#: optiondialog.cpp:1278 #, kde-format msgid "" "On: Do not show the Directory Comparison Status.\n" "Off: Show the status dialog on start." msgstr "" -#: optiondialog.cpp:1234 +#: optiondialog.cpp:1282 #, kde-format msgid "File Comparison Mode" msgstr "" -#: optiondialog.cpp:1239 +#: optiondialog.cpp:1287 #, kde-format msgid "Binary comparison" msgstr "" -#: optiondialog.cpp:1241 +#: optiondialog.cpp:1289 #, kde-format msgid "Binary comparison of each file. (Default)" msgstr "" -#: optiondialog.cpp:1244 +#: optiondialog.cpp:1292 #, kde-format msgid "Full analysis" msgstr "" -#: optiondialog.cpp:1246 +#: optiondialog.cpp:1294 #, kde-format msgid "" "Do a full analysis and show statistics information in extra columns.\n" "(Slower than a binary comparison, much slower for binary files.)" msgstr "" -#: optiondialog.cpp:1250 +#: optiondialog.cpp:1298 #, kde-format msgid "Trust the size and modification date (unsafe)" msgstr "" -#: optiondialog.cpp:1252 +#: optiondialog.cpp:1300 #, kde-format msgid "" "Assume that files are equal if the modification date and file length are " @@ -2583,14 +2599,14 @@ "Useful for big directories or slow networks." msgstr "" -#: optiondialog.cpp:1257 +#: optiondialog.cpp:1305 #, kde-format msgid "" "Trust the size and date, but use binary comparison if date does not match " "(unsafe)" msgstr "" -#: optiondialog.cpp:1259 +#: optiondialog.cpp:1307 #, kde-format msgid "" "Assume that files are equal if the modification date and file length are " @@ -2599,12 +2615,12 @@ "Useful for big directories or slow networks." msgstr "" -#: optiondialog.cpp:1264 +#: optiondialog.cpp:1312 #, kde-format msgid "Trust the size (unsafe)" msgstr "" -#: optiondialog.cpp:1266 +#: optiondialog.cpp:1314 #, kde-format msgid "" "Assume that files are equal if their file lengths are equal.\n" @@ -2612,12 +2628,12 @@ "download." msgstr "" -#: optiondialog.cpp:1273 +#: optiondialog.cpp:1321 #, kde-format msgid "Synchronize directories" msgstr "" -#: optiondialog.cpp:1277 +#: optiondialog.cpp:1325 #, kde-format msgid "" "Offers to store files in both directories so that\n" @@ -2625,24 +2641,24 @@ "Works only when comparing two directories without specifying a destination." msgstr "" -#: optiondialog.cpp:1283 +#: optiondialog.cpp:1331 #, kde-format msgid "White space differences considered equal" msgstr "" -#: optiondialog.cpp:1287 +#: optiondialog.cpp:1335 #, kde-format msgid "" "If files differ only by white space consider them equal.\n" "This is only active when full analysis is chosen." msgstr "" -#: optiondialog.cpp:1293 +#: optiondialog.cpp:1341 #, kde-format msgid "Copy newer instead of merging (unsafe)" msgstr "" -#: optiondialog.cpp:1297 +#: optiondialog.cpp:1345 #, kde-format msgid "" "Do not look inside, just take the newer file.\n" @@ -2650,46 +2666,46 @@ "Only effective when comparing two directories." msgstr "" -#: optiondialog.cpp:1302 +#: optiondialog.cpp:1350 #, kde-format msgid "Backup files (.orig)" msgstr "" -#: optiondialog.cpp:1306 +#: optiondialog.cpp:1354 #, kde-format msgid "" "If 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 "" -#: optiondialog.cpp:1382 optiondialog.cpp:1383 +#: optiondialog.cpp:1430 optiondialog.cpp:1431 #, kde-format msgid "Regional Settings" msgstr "" -#: optiondialog.cpp:1397 +#: optiondialog.cpp:1454 #, kde-format msgid "Use the same encoding for everything:" msgstr "" -#: optiondialog.cpp:1401 +#: optiondialog.cpp:1458 #, kde-format msgid "" "Enable this allows to change all encodings by changing the first only.\n" "Disable this if different individual settings are needed." msgstr "" -#: optiondialog.cpp:1405 +#: optiondialog.cpp:1462 #, kde-format msgid "Note: Local Encoding is \"%1\"" msgstr "" -#: optiondialog.cpp:1409 +#: optiondialog.cpp:1466 #, kde-format msgid "File Encoding for A:" msgstr "" -#: optiondialog.cpp:1416 +#: optiondialog.cpp:1473 #, kde-format msgid "" "If enabled then Unicode (UTF-16 or UTF-8) encoding will be detected.\n" @@ -2698,32 +2714,32 @@ "(Unicode detection depends on the first bytes of a file.)" msgstr "" -#: optiondialog.cpp:1419 optiondialog.cpp:1430 optiondialog.cpp:1441 +#: optiondialog.cpp:1476 optiondialog.cpp:1487 optiondialog.cpp:1498 #, kde-format msgid "Auto Detect Unicode" msgstr "" -#: optiondialog.cpp:1425 +#: optiondialog.cpp:1482 #, kde-format msgid "File Encoding for B:" msgstr "" -#: optiondialog.cpp:1436 +#: optiondialog.cpp:1493 #, kde-format msgid "File Encoding for C:" msgstr "" -#: optiondialog.cpp:1447 +#: optiondialog.cpp:1504 #, kde-format msgid "File Encoding for Merge Output and Saving:" msgstr "" -#: optiondialog.cpp:1452 +#: optiondialog.cpp:1509 #, kde-format msgid "Auto Select" msgstr "" -#: optiondialog.cpp:1456 +#: optiondialog.cpp:1513 #, kde-format msgid "" "If enabled then the encoding from the input files is used.\n" @@ -2731,39 +2747,39 @@ "saving." msgstr "" -#: optiondialog.cpp:1459 +#: optiondialog.cpp:1516 #, kde-format msgid "File Encoding for Preprocessor Files:" msgstr "" -#: optiondialog.cpp:1471 +#: optiondialog.cpp:1528 #, kde-format msgid "Right To Left Language" msgstr "" -#: optiondialog.cpp:1475 +#: optiondialog.cpp:1532 #, kde-format msgid "" "Some languages are read from right to left.\n" "This setting will change the viewer and editor accordingly." msgstr "" -#: optiondialog.cpp:1485 +#: optiondialog.cpp:1542 #, kde-format msgid "Integration" msgstr "" -#: optiondialog.cpp:1486 +#: optiondialog.cpp:1543 #, kde-format msgid "Integration Settings" msgstr "" -#: optiondialog.cpp:1499 +#: optiondialog.cpp:1564 #, kde-format msgid "Command line options to ignore:" msgstr "" -#: optiondialog.cpp:1505 +#: optiondialog.cpp:1570 #, kde-format msgid "" "List of command line options that should be ignored when KDiff3 is used by " @@ -2772,19 +2788,19 @@ "This will suppress the \"Unknown option\" error." msgstr "" -#: optiondialog.cpp:1510 +#: optiondialog.cpp:1575 #, kde-format msgid "Quit also via Escape key" msgstr "" -#: optiondialog.cpp:1514 +#: optiondialog.cpp:1579 #, kde-format msgid "" "Fast method to exit.\n" "For those who are used to using the Escape key." msgstr "" -#: optiondialog.cpp:1598 +#: optiondialog.cpp:1653 #, kde-format msgid "This resets all options. Not only those of the current topic." msgstr "" @@ -2834,77 +2850,67 @@ msgid "Disable Unsafe Options" msgstr "" -#: pdiff.cpp:158 +#: pdiff.cpp:160 #, kde-format msgid "Loading A" msgstr "" -#: pdiff.cpp:167 +#: pdiff.cpp:162 #, kde-format -msgid "Errors occurred during pre-processing of file A." +msgid "Loading A: %1" msgstr "" -#: pdiff.cpp:172 +#: pdiff.cpp:170 #, kde-format msgid "Loading B" msgstr "" -#: pdiff.cpp:179 -#, kde-format -msgid "Errors occurred during pre-processing of file B." -msgstr "" - -#: pdiff.cpp:202 pdiff.cpp:241 +#: pdiff.cpp:201 pdiff.cpp:237 #, kde-format msgid "Diff: A <-> B" msgstr "" -#: pdiff.cpp:208 pdiff.cpp:279 pdiff.cpp:293 +#: pdiff.cpp:207 pdiff.cpp:275 pdiff.cpp:289 #, kde-format msgid "Linediff: A <-> B" msgstr "" -#: pdiff.cpp:225 +#: pdiff.cpp:224 #, kde-format msgid "Loading C" msgstr "" -#: pdiff.cpp:232 -#, kde-format -msgid "Errors occurred during pre-processing of file C." -msgstr "" - -#: pdiff.cpp:250 +#: pdiff.cpp:246 #, kde-format msgid "Diff: A <-> C" msgstr "" -#: pdiff.cpp:261 +#: pdiff.cpp:257 #, kde-format msgid "Diff: B <-> C" msgstr "" -#: pdiff.cpp:283 pdiff.cpp:297 +#: pdiff.cpp:279 pdiff.cpp:293 #, kde-format msgid "Linediff: B <-> C" msgstr "" -#: pdiff.cpp:287 pdiff.cpp:301 +#: pdiff.cpp:283 pdiff.cpp:297 #, kde-format msgid "Linediff: A <-> C" msgstr "" -#: pdiff.cpp:829 +#: pdiff.cpp:819 #, kde-format msgid "All input files contain the same text, but are not binary equal." msgstr "" -#: pdiff.cpp:835 pdiff.cpp:839 pdiff.cpp:843 +#: pdiff.cpp:825 pdiff.cpp:829 pdiff.cpp:833 #, kde-format msgid "Files %1 and %2 have equal text, but are not binary equal. \n" msgstr "" -#: pdiff.cpp:853 +#: pdiff.cpp:843 #, kde-format msgid "" "Some input files do not seem to be pure text files.\n" @@ -2912,17 +2918,17 @@ "Continue at your own risk." msgstr "" -#: pdiff.cpp:863 +#: pdiff.cpp:853 #, kde-format msgid ", B" msgstr "" -#: pdiff.cpp:865 +#: pdiff.cpp:855 #, kde-format msgid ", C" msgstr "" -#: pdiff.cpp:867 +#: pdiff.cpp:857 #, kde-format msgid "" "Some input characters could not be converted to valid unicode.\n" @@ -2931,77 +2937,72 @@ "Affected input files are in %1." msgstr "" -#: pdiff.cpp:1034 +#: pdiff.cpp:1032 #, kde-format msgid "Abort" msgstr "" -#: pdiff.cpp:1040 pdiff.cpp:1130 +#: pdiff.cpp:1038 pdiff.cpp:1129 #, kde-format msgid "Opening files..." msgstr "" -#: pdiff.cpp:1107 -#, kde-format -msgid "File open error" -msgstr "" - -#: pdiff.cpp:1202 +#: pdiff.cpp:1212 #, kde-format msgid "Cutting selection..." msgstr "" -#: pdiff.cpp:1223 +#: pdiff.cpp:1233 #, kde-format msgid "Copying selection to clipboard..." msgstr "" -#: pdiff.cpp:1239 +#: pdiff.cpp:1249 #, kde-format msgid "Inserting clipboard contents..." msgstr "" -#: pdiff.cpp:1695 +#: pdiff.cpp:1705 #, kde-format msgid "Word wrap (Cancel disables word wrap)" msgstr "" -#: pdiff.cpp:1696 +#: pdiff.cpp:1706 #, kde-format msgid "Calculating max width for horizontal scrollbar" msgstr "" -#: pdiff.cpp:1911 +#: pdiff.cpp:1921 #, kde-format msgid "Save && Continue" msgstr "" -#: pdiff.cpp:1912 +#: pdiff.cpp:1922 #, kde-format msgid "Continue Without Saving" msgstr "" -#: pdiff.cpp:2124 +#: pdiff.cpp:2134 #, kde-format msgid "Search complete." msgstr "" -#: pdiff.cpp:2124 +#: pdiff.cpp:2134 #, kde-format msgid "Search Complete" msgstr "" -#: pdiff.cpp:2375 +#: pdiff.cpp:2385 #, kde-format msgid "Nothing is selected in either diff input window." msgstr "" -#: pdiff.cpp:2375 +#: pdiff.cpp:2385 #, kde-format msgid "Error while adding manual diff range" msgstr "" -#: progress.cpp:59 progress.cpp:71 +#: progress.cpp:61 progress.cpp:73 #, kde-format msgid "&Cancel" msgstr "" @@ -3011,188 +3012,188 @@ msgid "A (Base):" msgstr "" -#: smalldialogs.cpp:68 smalldialogs.cpp:85 smalldialogs.cpp:102 -#: smalldialogs.cpp:144 +#: smalldialogs.cpp:71 smalldialogs.cpp:90 smalldialogs.cpp:109 +#: smalldialogs.cpp:154 #, kde-format msgid "File..." msgstr "" -#: smalldialogs.cpp:70 smalldialogs.cpp:87 smalldialogs.cpp:104 -#: smalldialogs.cpp:146 +#: smalldialogs.cpp:73 smalldialogs.cpp:92 smalldialogs.cpp:111 +#: smalldialogs.cpp:156 #, kde-format msgid "Dir..." msgstr "" -#: smalldialogs.cpp:96 +#: smalldialogs.cpp:103 #, kde-format msgid "C (Optional):" msgstr "" -#: smalldialogs.cpp:119 +#: smalldialogs.cpp:126 #, kde-format msgid "Swap/Copy Names..." msgstr "" -#: smalldialogs.cpp:124 smalldialogs.cpp:125 smalldialogs.cpp:126 +#: smalldialogs.cpp:131 smalldialogs.cpp:132 smalldialogs.cpp:133 #, kde-format msgid "Swap %1<->%2" msgstr "" -#: smalldialogs.cpp:127 smalldialogs.cpp:128 smalldialogs.cpp:129 +#: smalldialogs.cpp:134 smalldialogs.cpp:135 smalldialogs.cpp:136 #, kde-format msgid "Copy %1->Output" msgstr "" -#: smalldialogs.cpp:130 smalldialogs.cpp:131 smalldialogs.cpp:132 +#: smalldialogs.cpp:137 smalldialogs.cpp:138 smalldialogs.cpp:139 #, kde-format msgid "Swap %1<->Output" msgstr "" -#: smalldialogs.cpp:138 +#: smalldialogs.cpp:148 #, kde-format msgid "Output (optional):" msgstr "" -#: smalldialogs.cpp:168 +#: smalldialogs.cpp:178 #, kde-format msgid "Configure..." msgstr "" -#: smalldialogs.cpp:233 +#: smalldialogs.cpp:243 #, kde-format msgid "Open Directory" msgstr "" -#: smalldialogs.cpp:234 +#: smalldialogs.cpp:244 #, kde-format msgid "Select Output File" msgstr "" -#: smalldialogs.cpp:393 +#: smalldialogs.cpp:403 #, kde-format msgid "Search text:" msgstr "" -#: smalldialogs.cpp:400 +#: smalldialogs.cpp:410 #, kde-format msgid "Case sensitive" msgstr "" -#: smalldialogs.cpp:403 +#: smalldialogs.cpp:413 #, kde-format msgid "Search A" msgstr "" -#: smalldialogs.cpp:408 +#: smalldialogs.cpp:418 #, kde-format msgid "Search B" msgstr "" -#: smalldialogs.cpp:413 +#: smalldialogs.cpp:423 #, kde-format msgid "Search C" msgstr "" -#: smalldialogs.cpp:418 +#: smalldialogs.cpp:428 #, kde-format msgid "Search output" msgstr "" -#: smalldialogs.cpp:425 +#: smalldialogs.cpp:435 #, kde-format msgid "&Search" msgstr "" -#: smalldialogs.cpp:444 +#: smalldialogs.cpp:454 #, kde-format msgid "Regular Expression Tester" msgstr "" -#: smalldialogs.cpp:457 +#: smalldialogs.cpp:467 #, kde-format msgid "Example auto merge line:" msgstr "" -#: smalldialogs.cpp:459 +#: smalldialogs.cpp:469 #, kde-format msgid "To test auto merge, copy a line as used in your files." msgstr "" -#: smalldialogs.cpp:465 smalldialogs.cpp:493 smalldialogs.cpp:529 +#: smalldialogs.cpp:475 smalldialogs.cpp:503 smalldialogs.cpp:539 #, kde-format msgid "Match result:" msgstr "" -#: smalldialogs.cpp:484 +#: smalldialogs.cpp:494 #, kde-format msgid "Example history start line (with leading comment):" msgstr "" -#: smalldialogs.cpp:486 +#: smalldialogs.cpp:496 #, kde-format msgid "" "Copy a history start line as used in your files,\n" "including the leading comment." msgstr "" -#: smalldialogs.cpp:512 +#: smalldialogs.cpp:522 #, kde-format msgid "History sort key order:" msgstr "" -#: smalldialogs.cpp:520 +#: smalldialogs.cpp:530 #, kde-format msgid "Example history entry start line (without leading comment):" msgstr "" -#: smalldialogs.cpp:522 +#: smalldialogs.cpp:532 #, kde-format msgid "" "Copy a history entry start line as used in your files,\n" "but omit the leading comment." msgstr "" -#: smalldialogs.cpp:536 +#: smalldialogs.cpp:546 #, kde-format msgid "Sort key result:" msgstr "" -#: smalldialogs.cpp:584 smalldialogs.cpp:594 smalldialogs.cpp:614 +#: smalldialogs.cpp:594 smalldialogs.cpp:604 smalldialogs.cpp:624 #, kde-format msgid "Match success." msgstr "" -#: smalldialogs.cpp:588 smalldialogs.cpp:598 smalldialogs.cpp:620 +#: smalldialogs.cpp:598 smalldialogs.cpp:608 smalldialogs.cpp:630 #, kde-format msgid "Match failed." msgstr "" -#: smalldialogs.cpp:605 +#: smalldialogs.cpp:615 #, kde-format msgid "Opening and closing parentheses do not match in regular expression." msgstr "" -#: SourceData.cpp:150 +#: SourceData.cpp:153 #, kde-format msgid "Writing clipboard data to temp file failed." msgstr "" -#: SourceData.cpp:154 +#: SourceData.cpp:157 #, kde-format msgid "From Clipboard" msgstr "" -#: SourceData.cpp:335 +#: SourceData.cpp:348 #, kde-format msgid "%1 is not a normal file." msgstr "" -#: SourceData.cpp:427 +#: SourceData.cpp:440 #, kde-format msgid " Temp file is: %1" msgstr "" -#: SourceData.cpp:432 +#: SourceData.cpp:445 #, kde-format msgid "" "Preprocessing possibly failed. Check this command:\n" @@ -3202,12 +3203,12 @@ "The preprocessing command will be disabled now." msgstr "" -#: SourceData.cpp:443 SourceData.cpp:512 +#: SourceData.cpp:456 SourceData.cpp:525 #, kde-format msgid "File %1 too large to process. Skipping." msgstr "" -#: SourceData.cpp:487 +#: SourceData.cpp:500 #, kde-format msgid "" "The line-matching-preprocessing possibly failed. Check this command:\n" diff -Nru kdiff3-1.8.01/po/hu/kdiff3fileitemactionplugin.po kdiff3-1.8.3/po/hu/kdiff3fileitemactionplugin.po --- kdiff3-1.8.01/po/hu/kdiff3fileitemactionplugin.po 2019-05-18 01:02:05.000000000 +0000 +++ kdiff3-1.8.3/po/hu/kdiff3fileitemactionplugin.po 2020-06-25 00:18:24.000000000 +0000 @@ -5,8 +5,8 @@ msgid "" msgstr "" "Project-Id-Version: \n" -"Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2019-03-22 03:09+0100\n" +"Report-Msgid-Bugs-To: https://bugs.kde.org\n" +"POT-Creation-Date: 2019-08-30 07:40+0200\n" "PO-Revision-Date: 2012-06-28 18:34+0200\n" "Last-Translator: Balázs Úr \n" "Language-Team: Hungarian \n" diff -Nru kdiff3-1.8.01/po/hu/kdiff3.po kdiff3-1.8.3/po/hu/kdiff3.po --- kdiff3-1.8.01/po/hu/kdiff3.po 2019-05-18 01:02:05.000000000 +0000 +++ kdiff3-1.8.3/po/hu/kdiff3.po 2020-06-25 00:18:24.000000000 +0000 @@ -5,8 +5,8 @@ msgid "" msgstr "" "Project-Id-Version: KDE 3.2\n" -"Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2019-04-18 08:02+0200\n" +"Report-Msgid-Bugs-To: https://bugs.kde.org\n" +"POT-Creation-Date: 2020-06-22 07:48+0200\n" "PO-Revision-Date: 2013-07-13 11:52+0200\n" "Last-Translator: Balázs Úr \n" "Language-Team: Hungarian \n" @@ -27,291 +27,291 @@ msgid "Your emails" msgstr "urbalazs@gmail.com" -#: difftextwindow.cpp:412 +#: difftextwindow.cpp:414 #, kde-format msgid "File %1: Line %2" msgstr "" -#: difftextwindow.cpp:414 +#: difftextwindow.cpp:416 #, fuzzy, kde-format #| msgid "Line not available" msgid "File %1: Line not available" msgstr "A sor nem elérhető" -#: difftextwindow.cpp:1780 +#: difftextwindow.cpp:1778 #, kde-format msgid "Encoding:" msgstr "Kódolás:" -#: difftextwindow.cpp:1782 mergeresultwindow.cpp:3138 optiondialog.cpp:818 +#: difftextwindow.cpp:1781 mergeresultwindow.cpp:3166 optiondialog.cpp:840 #, kde-format msgid "Line end style:" msgstr "Sorvég stílus:" -#: difftextwindow.cpp:1810 directorymergewindow.cpp:382 -#: directorymergewindow.cpp:433 directorymergewindow.cpp:524 -#: directorymergewindow.cpp:3058 directorymergewindow.cpp:3189 -#: directorymergewindow.cpp:3417 mergeresultwindow.cpp:942 -#: mergeresultwindow.cpp:944 mergeresultwindow.cpp:946 -#: mergeresultwindow.cpp:948 mergeresultwindow.cpp:1814 -#: mergeresultwindow.cpp:3170 mergeresultwindow.cpp:3177 optiondialog.cpp:962 -#: optiondialog.cpp:975 pdiff.cpp:833 pdiff.cpp:835 pdiff.cpp:837 pdiff.cpp:839 -#: pdiff.cpp:861 smalldialogs.cpp:124 smalldialogs.cpp:126 smalldialogs.cpp:127 -#: smalldialogs.cpp:130 +#: difftextwindow.cpp:1809 directorymergewindow.cpp:383 +#: directorymergewindow.cpp:434 directorymergewindow.cpp:525 +#: directorymergewindow.cpp:3072 directorymergewindow.cpp:3203 +#: directorymergewindow.cpp:3431 mergeresultwindow.cpp:970 +#: mergeresultwindow.cpp:972 mergeresultwindow.cpp:974 +#: mergeresultwindow.cpp:976 mergeresultwindow.cpp:1842 +#: mergeresultwindow.cpp:3198 mergeresultwindow.cpp:3205 optiondialog.cpp:1002 +#: optiondialog.cpp:1015 pdiff.cpp:823 pdiff.cpp:825 pdiff.cpp:827 +#: pdiff.cpp:829 pdiff.cpp:851 smalldialogs.cpp:131 smalldialogs.cpp:133 +#: smalldialogs.cpp:134 smalldialogs.cpp:137 #, kde-format msgid "A" msgstr "A" -#: difftextwindow.cpp:1810 directorymergewindow.cpp:384 -#: directorymergewindow.cpp:436 directorymergewindow.cpp:526 -#: directorymergewindow.cpp:3064 directorymergewindow.cpp:3190 -#: directorymergewindow.cpp:3418 mergeresultwindow.cpp:942 -#: mergeresultwindow.cpp:944 mergeresultwindow.cpp:950 -#: mergeresultwindow.cpp:952 mergeresultwindow.cpp:1816 -#: mergeresultwindow.cpp:3172 mergeresultwindow.cpp:3179 optiondialog.cpp:963 -#: optiondialog.cpp:976 pdiff.cpp:833 pdiff.cpp:835 pdiff.cpp:841 pdiff.cpp:843 -#: pdiff.cpp:863 smalldialogs.cpp:124 smalldialogs.cpp:125 smalldialogs.cpp:128 -#: smalldialogs.cpp:131 +#: difftextwindow.cpp:1809 directorymergewindow.cpp:385 +#: directorymergewindow.cpp:437 directorymergewindow.cpp:527 +#: directorymergewindow.cpp:3078 directorymergewindow.cpp:3204 +#: directorymergewindow.cpp:3432 mergeresultwindow.cpp:970 +#: mergeresultwindow.cpp:972 mergeresultwindow.cpp:978 +#: mergeresultwindow.cpp:980 mergeresultwindow.cpp:1844 +#: mergeresultwindow.cpp:3200 mergeresultwindow.cpp:3207 optiondialog.cpp:1003 +#: optiondialog.cpp:1016 pdiff.cpp:823 pdiff.cpp:825 pdiff.cpp:831 +#: pdiff.cpp:833 pdiff.cpp:853 smalldialogs.cpp:131 smalldialogs.cpp:132 +#: smalldialogs.cpp:135 smalldialogs.cpp:138 #, kde-format msgid "B" msgstr "B" -#: difftextwindow.cpp:1810 directorymergewindow.cpp:386 -#: directorymergewindow.cpp:439 directorymergewindow.cpp:528 -#: directorymergewindow.cpp:3070 directorymergewindow.cpp:3191 -#: directorymergewindow.cpp:3419 mergeresultwindow.cpp:946 -#: mergeresultwindow.cpp:948 mergeresultwindow.cpp:950 -#: mergeresultwindow.cpp:952 mergeresultwindow.cpp:1818 -#: mergeresultwindow.cpp:3174 mergeresultwindow.cpp:3181 optiondialog.cpp:977 -#: pdiff.cpp:837 pdiff.cpp:839 pdiff.cpp:841 pdiff.cpp:843 pdiff.cpp:865 -#: smalldialogs.cpp:125 smalldialogs.cpp:126 smalldialogs.cpp:129 -#: smalldialogs.cpp:132 +#: difftextwindow.cpp:1809 directorymergewindow.cpp:387 +#: directorymergewindow.cpp:440 directorymergewindow.cpp:529 +#: directorymergewindow.cpp:3084 directorymergewindow.cpp:3205 +#: directorymergewindow.cpp:3433 mergeresultwindow.cpp:974 +#: mergeresultwindow.cpp:976 mergeresultwindow.cpp:978 +#: mergeresultwindow.cpp:980 mergeresultwindow.cpp:1846 +#: mergeresultwindow.cpp:3202 mergeresultwindow.cpp:3209 optiondialog.cpp:1017 +#: pdiff.cpp:827 pdiff.cpp:829 pdiff.cpp:831 pdiff.cpp:833 pdiff.cpp:855 +#: smalldialogs.cpp:132 smalldialogs.cpp:133 smalldialogs.cpp:136 +#: smalldialogs.cpp:139 #, kde-format msgid "C" msgstr "C" -#: difftextwindow.cpp:1810 +#: difftextwindow.cpp:1809 #, fuzzy, kde-format #| msgid "A (Base):" msgid "A (Base)" msgstr "A (alap):" -#: difftextwindow.cpp:1812 +#: difftextwindow.cpp:1811 #, fuzzy, kde-format #| msgid "Encoding:" msgid "Encoding: %1" msgstr "Kódolás:" -#: difftextwindow.cpp:1813 mergeresultwindow.cpp:3183 +#: difftextwindow.cpp:1812 mergeresultwindow.cpp:3211 #, kde-format msgid "Unix" msgstr "Unix" -#: difftextwindow.cpp:1813 mergeresultwindow.cpp:3184 +#: difftextwindow.cpp:1812 mergeresultwindow.cpp:3212 #, kde-format msgid "DOS" msgstr "DOS" -#: difftextwindow.cpp:1813 +#: difftextwindow.cpp:1812 #, fuzzy, kde-format #| msgid "Line end style:" msgid "Line end style: %1" msgstr "Sorvég stílus:" -#: difftextwindow.cpp:1835 kdiff3.cpp:873 +#: difftextwindow.cpp:1834 kdiff3.cpp:874 #, kde-format msgid "Top line" msgstr "Felső sor" -#: difftextwindow.cpp:1845 +#: difftextwindow.cpp:1843 #, kde-format msgid "End" msgstr "Vég" -#: difftextwindow.cpp:1903 smalldialogs.cpp:235 +#: difftextwindow.cpp:1901 smalldialogs.cpp:245 #, fuzzy, kde-format #| msgid "Opening files..." msgid "Open File" msgstr "Fájlok megnyitása..." -#: difftextwindow.cpp:1951 optiondialog.cpp:387 +#: difftextwindow.cpp:1943 optiondialog.cpp:389 #, kde-format msgid "Unicode, 8 bit" msgstr "Unicode, 8 bit" -#: difftextwindow.cpp:1966 +#: difftextwindow.cpp:1958 #, kde-format msgid "Other" msgstr "" -#: directorymergewindow.cpp:409 directorymergewindow.cpp:3424 +#: directorymergewindow.cpp:410 directorymergewindow.cpp:3438 #, kde-format msgid "Copy A to B" msgstr "A másolása B-be" -#: directorymergewindow.cpp:412 directorymergewindow.cpp:3425 +#: directorymergewindow.cpp:413 directorymergewindow.cpp:3439 #, kde-format msgid "Copy B to A" msgstr "B másolása A-ba" -#: directorymergewindow.cpp:415 directorymergewindow.cpp:3426 +#: directorymergewindow.cpp:416 directorymergewindow.cpp:3440 #, kde-format msgid "Delete A" msgstr "A törlése" -#: directorymergewindow.cpp:418 directorymergewindow.cpp:3427 +#: directorymergewindow.cpp:419 directorymergewindow.cpp:3441 #, kde-format msgid "Delete B" msgstr "B törlése" -#: directorymergewindow.cpp:421 +#: directorymergewindow.cpp:422 #, kde-format msgid "Delete A & B" msgstr "A és B törlése" -#: directorymergewindow.cpp:424 directorymergewindow.cpp:3429 +#: directorymergewindow.cpp:425 directorymergewindow.cpp:3443 #, kde-format msgid "Merge to A" msgstr "Beolvasztás A-ba" -#: directorymergewindow.cpp:427 directorymergewindow.cpp:3430 +#: directorymergewindow.cpp:428 directorymergewindow.cpp:3444 #, kde-format msgid "Merge to B" msgstr "Beolvasztás B-be" -#: directorymergewindow.cpp:430 +#: directorymergewindow.cpp:431 #, kde-format msgid "Merge to A & B" msgstr "Beolvasztás A és B-be" -#: directorymergewindow.cpp:442 directorymergewindow.cpp:3421 +#: directorymergewindow.cpp:443 directorymergewindow.cpp:3435 #, kde-format msgid "Delete (if exists)" msgstr "Törlés (ha létezik)" -#: directorymergewindow.cpp:445 directorymergewindow.cpp:448 -#: directorymergewindow.cpp:3420 optiondialog.cpp:925 smalldialogs.cpp:113 +#: directorymergewindow.cpp:446 directorymergewindow.cpp:449 +#: directorymergewindow.cpp:3434 smalldialogs.cpp:120 #, kde-format msgid "Merge" msgstr "Összeolvasztás" -#: directorymergewindow.cpp:445 directorymergewindow.cpp:448 +#: directorymergewindow.cpp:446 directorymergewindow.cpp:449 #, kde-format msgid "Merge (manual)" msgstr "Összeolvasztás (kézi)" -#: directorymergewindow.cpp:451 +#: directorymergewindow.cpp:452 #, kde-format msgid "Error: Conflicting File Types" msgstr "Hiba: ütköző fájltípusok" -#: directorymergewindow.cpp:454 +#: directorymergewindow.cpp:455 #, kde-format msgid "Error: Changed and Deleted" msgstr "Hiba: megváltozott és törölt" -#: directorymergewindow.cpp:457 +#: directorymergewindow.cpp:458 #, kde-format msgid "Error: Dates are equal but files are not." msgstr "Hiba: a dátumok megegyeznek, de a fájlok nem." -#: directorymergewindow.cpp:471 +#: directorymergewindow.cpp:472 #, fuzzy, kde-format #| msgid "Done." msgid "Done" msgstr "Kész." -#: directorymergewindow.cpp:473 +#: directorymergewindow.cpp:474 #, kde-format msgid "Error" msgstr "Hiba" -#: directorymergewindow.cpp:475 +#: directorymergewindow.cpp:476 #, kde-format msgid "Skipped." msgstr "Átlépve." -#: directorymergewindow.cpp:477 +#: directorymergewindow.cpp:478 #, kde-format msgid "Not saved." msgstr "Nincs elmentve." -#: directorymergewindow.cpp:479 +#: directorymergewindow.cpp:480 #, kde-format msgid "In progress..." msgstr "Folyamatban..." -#: directorymergewindow.cpp:481 +#: directorymergewindow.cpp:482 #, kde-format msgid "To do." msgstr "Feladat." -#: directorymergewindow.cpp:522 +#: directorymergewindow.cpp:523 #, kde-format msgid "Name" msgstr "Név" -#: directorymergewindow.cpp:530 +#: directorymergewindow.cpp:531 #, kde-format msgid "Operation" msgstr "Művelet" -#: directorymergewindow.cpp:532 +#: directorymergewindow.cpp:533 #, kde-format msgid "Status" msgstr "Állapot" -#: directorymergewindow.cpp:534 +#: directorymergewindow.cpp:535 #, kde-format msgid "Unsolved" msgstr "Megoldatlan" -#: directorymergewindow.cpp:536 +#: directorymergewindow.cpp:537 #, kde-format msgid "Solved" msgstr "Megoldott" -#: directorymergewindow.cpp:538 +#: directorymergewindow.cpp:539 #, kde-format msgid "Nonwhite" msgstr "Nem fehér" -#: directorymergewindow.cpp:540 +#: directorymergewindow.cpp:541 #, kde-format msgid "White" msgstr "Fehér" -#: directorymergewindow.cpp:674 +#: directorymergewindow.cpp:676 #, kde-format msgid "Unable to compare non-normal file with normal file." msgstr "" -#: directorymergewindow.cpp:688 +#: directorymergewindow.cpp:690 #, kde-format msgid "Mix of links and normal files." msgstr "Linkek és normál fájlok vegyesen." -#: directorymergewindow.cpp:695 +#: directorymergewindow.cpp:697 #, kde-format msgid "Link: " msgstr "Link: " -#: directorymergewindow.cpp:704 +#: directorymergewindow.cpp:706 #, kde-format msgid "Size. " msgstr "Méret. " -#: directorymergewindow.cpp:718 directorymergewindow.cpp:728 +#: directorymergewindow.cpp:720 directorymergewindow.cpp:730 #, kde-format msgid "Date & Size: " msgstr "Dátum és méret: " -#: directorymergewindow.cpp:748 +#: directorymergewindow.cpp:751 #, kde-format msgid "Comparing file..." msgstr "Fájl összehasonlítása…" -#: directorymergewindow.cpp:801 +#: directorymergewindow.cpp:813 #, kde-format msgid "" "You are currently doing a directory merge. Are you sure, you want to abort " @@ -320,48 +320,48 @@ "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:802 kdiff3.cpp:698 kdiff3.cpp:708 kdiff3.cpp:720 -#: mergeresultwindow.cpp:372 pdiff.cpp:1033 pdiff.cpp:1910 pdiff.cpp:1920 +#: directorymergewindow.cpp:814 kdiff3.cpp:697 kdiff3.cpp:707 kdiff3.cpp:719 +#: mergeresultwindow.cpp:400 pdiff.cpp:1031 pdiff.cpp:1920 pdiff.cpp:1930 #, kde-format msgid "Warning" msgstr "Figyelmeztetés" -#: directorymergewindow.cpp:803 directorymergewindow.cpp:3393 +#: directorymergewindow.cpp:815 directorymergewindow.cpp:3407 #, kde-format msgid "Rescan" msgstr "Újraolvasás" -#: directorymergewindow.cpp:804 pdiff.cpp:1035 +#: directorymergewindow.cpp:816 pdiff.cpp:1033 #, kde-format msgid "Continue Merging" msgstr "A művelet folytatása" -#: directorymergewindow.cpp:971 +#: directorymergewindow.cpp:984 #, kde-format msgid "Opening of directories failed:" msgstr "Nem sikerült beolvasni ezeket a könyvtárakat:" -#: directorymergewindow.cpp:975 +#: directorymergewindow.cpp:988 #, 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:980 +#: directorymergewindow.cpp:993 #, 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:985 +#: directorymergewindow.cpp:998 #, 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:988 +#: directorymergewindow.cpp:1001 #, kde-format msgid "Directory Open Error" msgstr "Könyvtármegnyitási hiba" -#: directorymergewindow.cpp:996 +#: directorymergewindow.cpp:1009 #, kde-format msgid "" "The destination directory must not be the same as A or B when three " @@ -372,49 +372,49 @@ "könyvtár lesz összeolvasztva.\n" "Továbblépés előtt ellenőrizze az értéket." -#: directorymergewindow.cpp:998 +#: directorymergewindow.cpp:1011 #, kde-format msgid "Parameter Warning" msgstr "Figyelmeztetés - paraméter" -#: directorymergewindow.cpp:1003 +#: directorymergewindow.cpp:1016 #, kde-format msgid "Scanning directories..." msgstr "Könyvtárak pásztázása…" -#: directorymergewindow.cpp:1029 +#: directorymergewindow.cpp:1042 #, kde-format msgid "Reading Directory A" msgstr "Az A könyvtár beolvasása" -#: directorymergewindow.cpp:1038 +#: directorymergewindow.cpp:1051 #, kde-format msgid "Reading Directory B" msgstr "A B könyvtár beolvasása" -#: directorymergewindow.cpp:1048 +#: directorymergewindow.cpp:1061 #, kde-format msgid "Reading Directory C" msgstr "A C könyvtár beolvasása" -#: directorymergewindow.cpp:1064 +#: directorymergewindow.cpp:1077 #, kde-format msgid "Some subdirectories were not readable in" msgstr "Néhány alkönyvtár beolvasása nem sikerült itt:" -#: directorymergewindow.cpp:1069 +#: directorymergewindow.cpp:1082 #, kde-format msgid "Check the permissions of the subdirectories." msgstr "Ellenőrizze az alkönyvtárak jogosultságait." -#: directorymergewindow.cpp:1106 kdiff3.cpp:666 kdiff3.cpp:753 kdiff3.cpp:777 -#: kdiff3.cpp:1065 kdiff3.cpp:1086 pdiff.cpp:1116 pdiff.cpp:1170 pdiff.cpp:1218 -#: pdiff.cpp:1234 pdiff.cpp:1277 pdiff.cpp:1301 +#: directorymergewindow.cpp:1119 kdiff3.cpp:665 kdiff3.cpp:752 kdiff3.cpp:776 +#: kdiff3.cpp:1072 kdiff3.cpp:1093 pdiff.cpp:1115 pdiff.cpp:1178 pdiff.cpp:1228 +#: pdiff.cpp:1244 pdiff.cpp:1287 pdiff.cpp:1311 #, kde-format msgid "Ready." msgstr "Kész." -#: directorymergewindow.cpp:1121 +#: directorymergewindow.cpp:1134 #, kde-format msgid "" "Directory Comparison Status\n" @@ -424,23 +424,23 @@ "Number of different files: %3" msgstr "" -#: directorymergewindow.cpp:1128 +#: directorymergewindow.cpp:1141 #, fuzzy, kde-format #| msgid "Number of manual merges:" msgid "Number of manual merges: %1" msgstr "A kézi összeolvasztások száma:" -#: directorymergewindow.cpp:1394 +#: directorymergewindow.cpp:1407 #, kde-format msgid "This affects all merge operations." msgstr "Ez minden összeolvasztási műveletet érint." -#: directorymergewindow.cpp:1395 +#: directorymergewindow.cpp:1408 #, kde-format msgid "Changing All Merge Operations" msgstr "Az összes összeolvasztási művelet megváltoztatása" -#: directorymergewindow.cpp:1695 +#: directorymergewindow.cpp:1708 #, fuzzy, kde-format #| msgid "Processing " msgid "" @@ -448,47 +448,47 @@ "%3" msgstr "Feldolgozás " -#: directorymergewindow.cpp:1738 directorymergewindow.cpp:1742 +#: directorymergewindow.cpp:1751 directorymergewindow.cpp:1755 #, kde-format msgid "Some files could not be processed." msgstr "" -#: directorymergewindow.cpp:2222 directorymergewindow.cpp:2247 -#: directorymergewindow.cpp:2271 +#: directorymergewindow.cpp:2235 directorymergewindow.cpp:2260 +#: directorymergewindow.cpp:2285 #, kde-format msgid "This operation is currently not possible." msgstr "Ez a művelet jelenleg nem lehetséges." -#: directorymergewindow.cpp:2222 directorymergewindow.cpp:2247 -#: directorymergewindow.cpp:2271 directorymergewindow.cpp:2552 +#: directorymergewindow.cpp:2235 directorymergewindow.cpp:2260 +#: directorymergewindow.cpp:2285 directorymergewindow.cpp:2565 #, kde-format msgid "Operation Not Possible" msgstr "A művelet nem lehetséges" -#: directorymergewindow.cpp:2318 +#: directorymergewindow.cpp:2332 #, fuzzy, kde-format #| msgid "An error occurred while copying.\n" msgid "An error occurred while copying." msgstr "Hiba történt másolás közben.\n" -#: directorymergewindow.cpp:2319 directorymergewindow.cpp:2759 +#: directorymergewindow.cpp:2333 directorymergewindow.cpp:2772 #, kde-format msgid "Merge Error" msgstr "Összeolvasztási hiba" -#: directorymergewindow.cpp:2396 +#: directorymergewindow.cpp:2410 #, kde-format 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:2441 +#: directorymergewindow.cpp:2455 #, kde-format msgid "Unknown merge operation." msgstr "Ismeretlen összeolvasztási művelet." -#: directorymergewindow.cpp:2454 +#: directorymergewindow.cpp:2468 #, kde-format msgid "" "The merge is about to begin.\n" @@ -509,22 +509,22 @@ "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:2459 +#: directorymergewindow.cpp:2473 #, kde-format msgid "Starting Merge" msgstr "Az összeolvasztás megkezdése" -#: directorymergewindow.cpp:2460 +#: directorymergewindow.cpp:2474 #, kde-format msgid "Do It" msgstr "Kezdődjön" -#: directorymergewindow.cpp:2461 +#: directorymergewindow.cpp:2475 #, kde-format msgid "Simulate It" msgstr "Szimuláció" -#: directorymergewindow.cpp:2487 +#: directorymergewindow.cpp:2501 #, kde-format msgid "" "The highlighted item has a different type in the different directories. " @@ -533,7 +533,7 @@ "A kijelölt elem típusa eltérő a könyvtárakban. Válassza ki, mit szeretne " "tenni." -#: directorymergewindow.cpp:2491 +#: directorymergewindow.cpp:2505 #, kde-format msgid "" "The modification dates of the file are equal but the files are not. Select " @@ -542,7 +542,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:2495 +#: directorymergewindow.cpp:2509 #, fuzzy, kde-format #| msgid "" #| "The highlighted item has a different type in the different directories. " @@ -554,7 +554,7 @@ "A kijelölt elem típusa eltérő a könyvtárakban. Válassza ki, mit szeretne " "tenni." -#: directorymergewindow.cpp:2552 +#: directorymergewindow.cpp:2565 #, kde-format msgid "" "This operation is currently not possible because directory merge is " @@ -563,7 +563,7 @@ "Ez a művelet most nem hajtható végre, mert folyamatban van egy könyvtár " "összeolvasztás." -#: directorymergewindow.cpp:2609 +#: directorymergewindow.cpp:2622 #, kde-format msgid "" "There was an error in the last step.\n" @@ -574,32 +574,32 @@ "Folytatni szeretné a műveletet a hiba ellenére vagy át szeretné ugrani a " "hibát okozó elemet?" -#: directorymergewindow.cpp:2611 +#: directorymergewindow.cpp:2624 #, kde-format msgid "Continue merge after an error" msgstr "Az összeolvasztás folytatása hiba esetén is" -#: directorymergewindow.cpp:2612 +#: directorymergewindow.cpp:2625 #, kde-format msgid "Continue With Last Item" msgstr "Folytatás az utolsó elemmel" -#: directorymergewindow.cpp:2613 +#: directorymergewindow.cpp:2626 #, kde-format msgid "Skip Item" msgstr "Az elem átlépése" -#: directorymergewindow.cpp:2709 +#: directorymergewindow.cpp:2722 #, kde-format msgid "Merge operation complete." msgstr "Az összeolvasztási művelet befejeződött." -#: directorymergewindow.cpp:2709 directorymergewindow.cpp:2712 +#: directorymergewindow.cpp:2722 directorymergewindow.cpp:2725 #, kde-format msgid "Merge Complete" msgstr "Az összeolvasztás befejeződött" -#: directorymergewindow.cpp:2722 +#: directorymergewindow.cpp:2735 #, kde-format msgid "" "Simulated merge complete: Check if you agree with the proposed operations." @@ -607,51 +607,51 @@ "A szimulált összeolvasztás befejeződött: ellenőrizze, hogy elfogadhatók-e a " "javasolt műveletek." -#: directorymergewindow.cpp:2758 +#: directorymergewindow.cpp:2771 #, fuzzy, kde-format #| msgid "An error occurred. Press OK to see detailed information.\n" msgid "An error occurred. Press OK to see detailed information." msgstr "Hiba történt. Kattintson az OK gombra részletes tájékoztatáshoz.\n" -#: directorymergewindow.cpp:2791 +#: directorymergewindow.cpp:2804 #, 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:2798 +#: directorymergewindow.cpp:2811 #, kde-format msgid "delete directory recursively( %1 )" msgstr "könyvtár (%1) törlése az alkönyvtárakkal együtt" -#: directorymergewindow.cpp:2800 +#: directorymergewindow.cpp:2813 #, kde-format msgid "delete( %1 )" msgstr "törlés (%1)" -#: directorymergewindow.cpp:2815 +#: directorymergewindow.cpp:2828 #, kde-format 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:2834 +#: directorymergewindow.cpp:2847 #, kde-format msgid "Error: rmdir( %1 ) operation failed." msgstr "Hiba: egy rmdir (%1) művelet nem sikerült." -#: directorymergewindow.cpp:2844 +#: directorymergewindow.cpp:2857 #, kde-format msgid "Error: delete operation failed." msgstr "Hiba történt: a törlési művelet nem sikerült." -#: directorymergewindow.cpp:2870 +#: directorymergewindow.cpp:2884 #, kde-format msgid "manual merge( %1, %2, %3 -> %4)" msgstr "kézi összeolvasztás (%1, %2, %3 -> %4)" -#: directorymergewindow.cpp:2873 +#: directorymergewindow.cpp:2887 #, kde-format msgid "" " Note: After a manual merge the user should continue by pressing F7." @@ -659,184 +659,184 @@ " Megjegyzés: kézi összeolvasztás esetén a felhasználónak az F7-tel kell " "továbblépnie." -#: directorymergewindow.cpp:2900 +#: directorymergewindow.cpp:2914 #, 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:2909 +#: directorymergewindow.cpp:2923 #, kde-format msgid "copyLink( %1 -> %2 )" msgstr "Link másolása (%1 -> %2)" -#: directorymergewindow.cpp:2918 +#: directorymergewindow.cpp:2932 #, kde-format 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:2928 +#: directorymergewindow.cpp:2942 #, kde-format msgid "Error: copyLink failed." msgstr "Hiba történt: egy link másolása nem sikerült." -#: directorymergewindow.cpp:2953 +#: directorymergewindow.cpp:2967 #, kde-format msgid "copy( %1 -> %2 )" msgstr "másolás (%1 -> %2)" -#: directorymergewindow.cpp:2979 +#: directorymergewindow.cpp:2993 #, 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:2986 +#: directorymergewindow.cpp:3000 #, kde-format msgid "rename( %1 -> %2 )" msgstr "átnevezés (%1 -> %2)" -#: directorymergewindow.cpp:2995 +#: directorymergewindow.cpp:3009 #, kde-format msgid "Error: Rename failed." msgstr "Hiba történt: egy átnevezés nem sikerült." -#: directorymergewindow.cpp:3013 +#: directorymergewindow.cpp:3027 #, 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:3030 +#: directorymergewindow.cpp:3044 #, kde-format msgid "makeDir( %1 )" msgstr "Könyvtár létrehozása (%1)" -#: directorymergewindow.cpp:3040 +#: directorymergewindow.cpp:3054 #, kde-format msgid "Error while creating directory." msgstr "Hiba történt egy könyvtár létrehozása közben." -#: directorymergewindow.cpp:3076 directorymergewindow.cpp:3195 +#: directorymergewindow.cpp:3090 directorymergewindow.cpp:3209 #, kde-format msgid "Dest" msgstr "Cél" -#: directorymergewindow.cpp:3084 directorymergewindow.cpp:3113 +#: directorymergewindow.cpp:3098 directorymergewindow.cpp:3127 #, kde-format msgid "Dir" msgstr "Könyvtár" -#: directorymergewindow.cpp:3084 +#: directorymergewindow.cpp:3098 #, kde-format msgid "Type" msgstr "Típus" -#: directorymergewindow.cpp:3084 +#: directorymergewindow.cpp:3098 #, kde-format msgid "Size" msgstr "Méret" -#: directorymergewindow.cpp:3085 +#: directorymergewindow.cpp:3099 #, kde-format msgid "Attr" msgstr "Attribútum" -#: directorymergewindow.cpp:3085 +#: directorymergewindow.cpp:3099 #, kde-format msgid "Last Modification" msgstr "Utolsó módosítás" -#: directorymergewindow.cpp:3085 +#: directorymergewindow.cpp:3099 #, kde-format msgid "Link-Destination" msgstr "Link-Cél" -#: directorymergewindow.cpp:3113 +#: directorymergewindow.cpp:3127 #, kde-format msgid "File" msgstr "Fájl" -#: directorymergewindow.cpp:3113 +#: directorymergewindow.cpp:3127 #, fuzzy, kde-format #| msgid "Link: " msgid "-Link" msgstr "Link: " -#: directorymergewindow.cpp:3119 +#: directorymergewindow.cpp:3133 #, kde-format msgid "not available" msgstr "nem áll rendelkezésre" -#: directorymergewindow.cpp:3137 +#: directorymergewindow.cpp:3151 #, kde-format msgid "A (Dest): " msgstr "A (cél): " -#: directorymergewindow.cpp:3141 +#: directorymergewindow.cpp:3155 #, kde-format msgid "A: " msgstr "" -#: directorymergewindow.cpp:3141 +#: directorymergewindow.cpp:3155 #, kde-format msgid "A (Base): " msgstr "A (alap): " -#: directorymergewindow.cpp:3147 +#: directorymergewindow.cpp:3161 #, kde-format msgid "B (Dest): " msgstr "B (cél): " -#: directorymergewindow.cpp:3151 +#: directorymergewindow.cpp:3165 #, kde-format msgid "B: " msgstr "" -#: directorymergewindow.cpp:3156 +#: directorymergewindow.cpp:3170 #, kde-format msgid "C (Dest): " msgstr "C (cél): " -#: directorymergewindow.cpp:3160 +#: directorymergewindow.cpp:3174 #, kde-format msgid "C: " msgstr "" -#: directorymergewindow.cpp:3163 +#: directorymergewindow.cpp:3177 #, kde-format msgid "Dest: " msgstr "Cél: " #. i18n("Saving Directory Merge State ...")); -#: directorymergewindow.cpp:3238 +#: directorymergewindow.cpp:3252 #, kde-format msgid "Save Directory Merge State As..." msgstr "Könyvtár összeolvasztás állapotának mentése másként…" -#: directorymergewindow.cpp:3387 +#: directorymergewindow.cpp:3401 #, kde-format msgid "Start/Continue Directory Merge" msgstr "A könyvtár összeolvasztás kezdése/folytatása" -#: directorymergewindow.cpp:3388 +#: directorymergewindow.cpp:3402 #, kde-format msgid "Run Operation for Current Item" msgstr "A művelet végrehajtása az aktuális elemen" -#: directorymergewindow.cpp:3389 +#: directorymergewindow.cpp:3403 #, kde-format msgid "Compare Selected File" msgstr "A kiválasztott fájl összehasonlítása" -#: directorymergewindow.cpp:3390 +#: directorymergewindow.cpp:3404 #, kde-format msgid "Merge Current File" msgstr "Az aktuális fájl összeolvasztása" -#: directorymergewindow.cpp:3390 +#: directorymergewindow.cpp:3404 #, kde-format msgid "" "Merge\n" @@ -845,51 +845,51 @@ "Egyesítés\n" "Fájl" -#: directorymergewindow.cpp:3391 +#: directorymergewindow.cpp:3405 #, kde-format msgid "Fold All Subdirs" msgstr "Az alkönyvtárak összecsukása" -#: directorymergewindow.cpp:3392 +#: directorymergewindow.cpp:3406 #, kde-format msgid "Unfold All Subdirs" msgstr "Az alkönyvtárak kibontása" #. i18n("Save Directory Merge State ..."), 0, this, &DirectoryMergeWindow::slotSaveMergeState, ac, "dir_save_merge_state"); #. i18n("Load Directory Merge State ..."), 0, this, &DirectoryMergeWindow::slotLoadMergeState, ac, "dir_load_merge_state"); -#: directorymergewindow.cpp:3396 +#: directorymergewindow.cpp:3410 #, kde-format msgid "Choose A for All Items" msgstr "Az 'A' kiválasztása az összes elemhez" -#: directorymergewindow.cpp:3397 +#: directorymergewindow.cpp:3411 #, kde-format msgid "Choose B for All Items" msgstr "A 'B' kiválasztása az összes elemhez" -#: directorymergewindow.cpp:3398 +#: directorymergewindow.cpp:3412 #, kde-format msgid "Choose C for All Items" msgstr "A 'C' kiválasztása az összes elemhez" -#: directorymergewindow.cpp:3399 +#: directorymergewindow.cpp:3413 #, kde-format msgid "Auto-Choose Operation for All Items" msgstr "Automatikus kiválasztás az összes elemnél" -#: directorymergewindow.cpp:3400 +#: directorymergewindow.cpp:3414 #, kde-format msgid "No Operation for All Items" msgstr "Nincs művelet az összes elemre" #. i18n("Synchronize Directories"), 0, this, &DirectoryMergeWindow::slotSynchronizeDirectories, ac, "dir_synchronize_directories"); #. d->m_pDirChooseNewerFiles = GuiUtils::createAction< KToggleAction >(i18n("Copy Newer Files Instead of Merging"), 0, this, &DirectoryMergeWindow::slotChooseNewerFiles, ac, "dir_choose_newer_files"); -#: directorymergewindow.cpp:3405 +#: directorymergewindow.cpp:3419 #, kde-format msgid "Show Identical Files" msgstr "Azonos fájlok megjelenítése" -#: directorymergewindow.cpp:3405 +#: directorymergewindow.cpp:3419 #, kde-format msgid "" "Identical\n" @@ -898,17 +898,17 @@ "Azonos\n" "fájlok" -#: directorymergewindow.cpp:3406 +#: directorymergewindow.cpp:3420 #, kde-format msgid "Show Different Files" msgstr "Eltérő fájlok megjelenítése" -#: directorymergewindow.cpp:3407 +#: directorymergewindow.cpp:3421 #, kde-format msgid "Show Files only in A" msgstr "Fájlok megjelenítése csak A-ban" -#: directorymergewindow.cpp:3407 +#: directorymergewindow.cpp:3421 #, kde-format msgid "" "Files\n" @@ -917,12 +917,12 @@ "Fájlok\n" "csak A-ban" -#: directorymergewindow.cpp:3408 +#: directorymergewindow.cpp:3422 #, kde-format msgid "Show Files only in B" msgstr "Fájlok megjelenítése csak B-ben" -#: directorymergewindow.cpp:3408 +#: directorymergewindow.cpp:3422 #, kde-format msgid "" "Files\n" @@ -931,12 +931,12 @@ "Fájlok\n" "csak B-ben" -#: directorymergewindow.cpp:3409 +#: directorymergewindow.cpp:3423 #, kde-format msgid "Show Files only in C" msgstr "Fájlok megjelenítése csak C-ben" -#: directorymergewindow.cpp:3409 +#: directorymergewindow.cpp:3423 #, kde-format msgid "" "Files\n" @@ -945,55 +945,60 @@ "Fájlok\n" "csak C-ben" -#: directorymergewindow.cpp:3413 +#: directorymergewindow.cpp:3427 #, fuzzy, kde-format msgid "Compare Explicitly Selected Files" msgstr "A kiválasztott fájl összehasonlítása" -#: directorymergewindow.cpp:3414 +#: directorymergewindow.cpp:3428 #, fuzzy, kde-format msgid "Merge Explicitly Selected Files" msgstr "A kiválasztott fájl összehasonlítása" -#: directorymergewindow.cpp:3416 directorymergewindow.cpp:3423 +#: directorymergewindow.cpp:3430 directorymergewindow.cpp:3437 #, kde-format msgid "Do Nothing" msgstr "Ne tegyen semmit" -#: directorymergewindow.cpp:3428 +#: directorymergewindow.cpp:3442 #, kde-format msgid "Delete A && B" msgstr "A és B törlése" -#: directorymergewindow.cpp:3431 +#: directorymergewindow.cpp:3445 #, kde-format msgid "Merge to A && B" msgstr "Beolvasztás A és B-be" -#: fileaccess.cpp:462 SourceData.cpp:493 +#: fileaccess.cpp:301 +#, kde-format +msgid "Unable to determine full url. No parent specified." +msgstr "" + +#: fileaccess.cpp:482 SourceData.cpp:506 #, fuzzy, kde-format #| msgid "Reading file: %1" msgid "Failed to read file: %1" msgstr "Fájl beolvasása: %1" -#: fileaccess.cpp:587 +#: fileaccess.cpp:624 #, 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." -#: fileaccess.cpp:595 fileaccess.cpp:600 +#: fileaccess.cpp:632 fileaccess.cpp:637 #, fuzzy, kde-format #| msgid "Opening %1 failed." msgid "Opening %1 failed. %2" msgstr "%1 megnyitása nem sikerült." -#: fileaccess.cpp:619 fileaccess.cpp:627 +#: fileaccess.cpp:656 fileaccess.cpp:664 #, fuzzy, kde-format #| msgid "Error reading from %1" msgid "Error reading from %1. %2" msgstr "%1 olvasása közben hiba történt" -#: fileaccess.cpp:751 +#: fileaccess.cpp:788 #, fuzzy, kde-format #| msgid "" #| "While trying to make a backup, deleting an older backup failed. \n" @@ -1006,7 +1011,7 @@ "sikerült törölni. \n" "Fájlnév: " -#: fileaccess.cpp:758 +#: fileaccess.cpp:795 #, fuzzy, kde-format #| msgid "" #| "While trying to make a backup, renaming failed. \n" @@ -1018,181 +1023,181 @@ "Biztonsági mentés készítése közben egy átnevezés nem sikerült. \n" "A fájlok nevei: " -#: fileaccess.cpp:828 +#: fileaccess.cpp:865 #, kde-format msgid "Getting file status: %1" msgstr "A fájlállapot lekérdezése: %1" -#: fileaccess.cpp:869 +#: fileaccess.cpp:906 #, kde-format msgid "Reading file: %1" msgstr "Fájl beolvasása: %1" -#: fileaccess.cpp:907 +#: fileaccess.cpp:944 #, kde-format msgid "Writing file: %1" msgstr "Fájl írása: %1" -#: fileaccess.cpp:940 +#: fileaccess.cpp:977 #, kde-format msgid "Out of memory" msgstr "Elfogyott a memória" -#: fileaccess.cpp:976 +#: fileaccess.cpp:1013 #, kde-format msgid "Making directory: %1" msgstr "Könyvtár létrehozása: %1" -#: fileaccess.cpp:997 +#: fileaccess.cpp:1034 #, kde-format msgid "Removing directory: %1" msgstr "Könyvtár törlése: %1" -#: fileaccess.cpp:1012 +#: fileaccess.cpp:1049 #, kde-format msgid "Removing file: %1" msgstr "Fájl törlése: %1" -#: fileaccess.cpp:1028 +#: fileaccess.cpp:1065 #, kde-format msgid "Creating symbolic link: %1 -> %2" msgstr "Szimbolikus link létrehozása: %1 -> %2" -#: fileaccess.cpp:1052 +#: fileaccess.cpp:1089 #, kde-format msgid "Renaming file: %1 -> %2" msgstr "Fájl átnevezése: %1 -> %2" -#: fileaccess.cpp:1086 +#: fileaccess.cpp:1123 #, kde-format msgid "Copying file: %1 -> %2" msgstr "Fájl másolása: %1 -> %2" -#: fileaccess.cpp:1108 +#: fileaccess.cpp:1145 #, fuzzy, kde-format #| msgid "Reading directory: " msgid "Reading directory: %1" msgstr "Könyvtár beolvasása: " -#: fileaccess.cpp:1162 +#: fileaccess.cpp:1202 #, kde-format msgid "Listing directory: %1" msgstr "Könyvtár kilistázása: %1" -#: kdiff3.cpp:181 +#: kdiff3.cpp:182 #, kde-format msgid "Current Configuration:" msgstr "Jelenlegi beállítás:" -#: kdiff3.cpp:186 +#: kdiff3.cpp:187 #, kde-format msgid "Config Option Error:" msgstr "Beállítási opció hiba:" -#: kdiff3.cpp:240 +#: kdiff3.cpp:246 #, kde-format 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:416 +#: kdiff3.cpp:405 #, kde-format 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:460 +#: kdiff3.cpp:449 #, kde-format msgid "Saving failed." msgstr "A mentés nem sikerült." -#: kdiff3.cpp:496 pdiff.cpp:1098 +#: kdiff3.cpp:494 pdiff.cpp:1096 #, kde-format msgid "Opening of these files failed:" msgstr "Nem sikerült megnyitni a következő fájlokat:" -#: kdiff3.cpp:505 +#: kdiff3.cpp:503 pdiff.cpp:1105 #, kde-format -msgid "File Open Error" +msgid "File open error" msgstr "Fájlmegnyitási hiba" -#: kdiff3.cpp:533 +#: kdiff3.cpp:532 #, kde-format msgid "Opens documents for comparison..." msgstr "Dokumentumok megnyitása összehasonlításhoz..." -#: kdiff3.cpp:535 +#: kdiff3.cpp:534 #, kde-format msgid "Reload" msgstr "Újratöltés" -#: kdiff3.cpp:538 +#: kdiff3.cpp:537 #, kde-format 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:540 +#: kdiff3.cpp:539 #, kde-format msgid "Saves the current document as..." msgstr "Az aktuális dokumentum mentése mint..." -#: kdiff3.cpp:543 +#: kdiff3.cpp:542 #, kde-format msgid "Print the differences" msgstr "Eltérések nyomtatása" -#: kdiff3.cpp:546 +#: kdiff3.cpp:545 #, kde-format msgid "Quits the application" msgstr "Kilépés az alkalmazásból" -#: kdiff3.cpp:549 +#: kdiff3.cpp:548 #, kde-format 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:552 +#: kdiff3.cpp:551 #, kde-format msgid "Copies the selected section to the clipboard" msgstr "Kimásolja a kijelölt részt és a vágólapra helyezi" -#: kdiff3.cpp:554 +#: kdiff3.cpp:553 #, kde-format msgid "Pastes the clipboard contents to current position" msgstr "A vágólap tartalmának beillesztése a jelenlegi pozíciónál" -#: kdiff3.cpp:557 +#: kdiff3.cpp:556 #, kde-format msgid "Select everything in current window" msgstr "Minden kijelölése a jelenlegi ablakban" -#: kdiff3.cpp:560 +#: kdiff3.cpp:559 #, kde-format msgid "Search for a string" msgstr "Karakterlánc keresése" -#: kdiff3.cpp:562 +#: kdiff3.cpp:561 #, kde-format msgid "Search again for the string" msgstr "A karakterlánc keresése újból" -#: kdiff3.cpp:567 +#: kdiff3.cpp:566 #, kde-format msgid "Enables/disables the statusbar" msgstr "Az állapotsor ki-be kapcsolása" -#: kdiff3.cpp:571 +#: kdiff3.cpp:570 #, kde-format msgid "Configure KDiff3..." msgstr "A KDiff3 beállításai…" -#: kdiff3.cpp:590 +#: kdiff3.cpp:589 #, kde-format msgid "Go to Current Delta" msgstr "Ugrás a jelenlegi deltára" -#: kdiff3.cpp:590 +#: kdiff3.cpp:589 #, kde-format msgid "" "Current\n" @@ -1201,12 +1206,12 @@ "Jelenlegi\n" "delta" -#: kdiff3.cpp:592 +#: kdiff3.cpp:591 #, kde-format msgid "Go to First Delta" msgstr "Ugrás az első deltára" -#: kdiff3.cpp:592 +#: kdiff3.cpp:591 #, kde-format msgid "" "First\n" @@ -1215,12 +1220,12 @@ "Első\n" "delta" -#: kdiff3.cpp:594 +#: kdiff3.cpp:593 #, kde-format msgid "Go to Last Delta" msgstr "Ugrás az utolsó deltára" -#: kdiff3.cpp:594 +#: kdiff3.cpp:593 #, kde-format msgid "" "Last\n" @@ -1229,24 +1234,24 @@ "Utolsó\n" "delta" -#: kdiff3.cpp:596 +#: kdiff3.cpp:595 #, kde-format msgid "(Skips white space differences when \"Show White Space\" is disabled.)" msgstr "" -#: kdiff3.cpp:597 +#: kdiff3.cpp:596 #, kde-format msgid "" "(Does not skip white space differences even when \"Show White Space\" is " "disabled.)" msgstr "" -#: kdiff3.cpp:598 +#: kdiff3.cpp:597 #, kde-format msgid "Go to Previous Delta" msgstr "Ugrás az előző deltára" -#: kdiff3.cpp:598 +#: kdiff3.cpp:597 #, kde-format msgid "" "Prev\n" @@ -1255,12 +1260,12 @@ "Előző\n" "delta" -#: kdiff3.cpp:600 +#: kdiff3.cpp:599 #, kde-format msgid "Go to Next Delta" msgstr "Ugrás a következő deltára" -#: kdiff3.cpp:600 +#: kdiff3.cpp:599 #, kde-format msgid "" "Next\n" @@ -1269,12 +1274,12 @@ "Következő\n" "delta" -#: kdiff3.cpp:602 +#: kdiff3.cpp:601 #, kde-format msgid "Go to Previous Conflict" msgstr "Ugrás az előző ütközésre" -#: kdiff3.cpp:602 +#: kdiff3.cpp:601 #, kde-format msgid "" "Prev\n" @@ -1283,12 +1288,12 @@ "Előző\n" "ütközés" -#: kdiff3.cpp:604 +#: kdiff3.cpp:603 #, kde-format msgid "Go to Next Conflict" msgstr "Ugrás a következő ütközésre" -#: kdiff3.cpp:604 +#: kdiff3.cpp:603 #, kde-format msgid "" "Next\n" @@ -1297,12 +1302,12 @@ "Következő\n" "ütközés" -#: kdiff3.cpp:606 +#: kdiff3.cpp:605 #, kde-format msgid "Go to Previous Unsolved Conflict" msgstr "Ugrás az előző feloldatlan ütközésre" -#: kdiff3.cpp:606 +#: kdiff3.cpp:605 #, kde-format msgid "" "Prev\n" @@ -1311,12 +1316,12 @@ "Előző\n" "Megoldatlan" -#: kdiff3.cpp:608 +#: kdiff3.cpp:607 #, kde-format msgid "Go to Next Unsolved Conflict" msgstr "Ugrás a következő feloldatlan ütközésre" -#: kdiff3.cpp:608 +#: kdiff3.cpp:607 #, kde-format msgid "" "Next\n" @@ -1325,12 +1330,12 @@ "Következő\n" "Megoldatlan" -#: kdiff3.cpp:610 +#: kdiff3.cpp:609 #, kde-format msgid "Select Line(s) From A" msgstr "Sor(ok) kiválasztása A-ból" -#: kdiff3.cpp:610 +#: kdiff3.cpp:609 #, kde-format msgid "" "Choose\n" @@ -1339,12 +1344,12 @@ "Választás:\n" "A" -#: kdiff3.cpp:611 +#: kdiff3.cpp:610 #, kde-format msgid "Select Line(s) From B" msgstr "Sor(ok) kiválasztása B-ből" -#: kdiff3.cpp:611 +#: kdiff3.cpp:610 #, kde-format msgid "" "Choose\n" @@ -1353,12 +1358,12 @@ "Választás:\n" "B" -#: kdiff3.cpp:612 +#: kdiff3.cpp:611 #, kde-format msgid "Select Line(s) From C" msgstr "Sor(ok) kiválasztása C-ből" -#: kdiff3.cpp:612 +#: kdiff3.cpp:611 #, kde-format msgid "" "Choose\n" @@ -1367,14 +1372,14 @@ "Választás:\n" "C" -#: kdiff3.cpp:613 +#: kdiff3.cpp:612 #, kde-format 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:613 +#: kdiff3.cpp:612 #, kde-format msgid "" "Auto\n" @@ -1383,37 +1388,37 @@ "Automatikus\n" "Következő" -#: kdiff3.cpp:615 +#: kdiff3.cpp:614 #, fuzzy, kde-format #| msgid "Show Space && Tabulator Characters for Differences" msgid "Show Space && Tabulator Characters" msgstr "A szóközök és tabulátorok megjelenítése eltéréseknél" -#: kdiff3.cpp:615 +#: kdiff3.cpp:614 #, kde-format msgid "" "White\n" "Characters" msgstr "" -#: kdiff3.cpp:616 +#: kdiff3.cpp:615 #, kde-format msgid "Show White Space" msgstr "Az üres karakterek megjelenítése" -#: kdiff3.cpp:616 +#: kdiff3.cpp:615 #, kde-format msgid "" "White\n" "Deltas" msgstr "" -#: kdiff3.cpp:618 +#: kdiff3.cpp:617 #, kde-format msgid "Show Line Numbers" msgstr "A sorszámok megjelenítése" -#: kdiff3.cpp:618 +#: kdiff3.cpp:617 #, kde-format msgid "" "Line\n" @@ -1422,133 +1427,133 @@ "Sor\n" "számok" -#: kdiff3.cpp:620 +#: kdiff3.cpp:619 #, kde-format msgid "Automatically Solve Simple Conflicts" msgstr "Az egyszerű ütközések automatikus feloldása" -#: kdiff3.cpp:621 +#: kdiff3.cpp:620 #, kde-format msgid "Set Deltas to Conflicts" msgstr "Delták beállítása az ütközésekhez" -#: kdiff3.cpp:622 +#: kdiff3.cpp:621 #, kde-format msgid "Run Regular Expression Auto Merge" msgstr "" -#: kdiff3.cpp:623 +#: kdiff3.cpp:622 #, fuzzy, kde-format msgid "Automatically Solve History Conflicts" msgstr "Az egyszerű ütközések automatikus feloldása" -#: kdiff3.cpp:624 +#: kdiff3.cpp:623 #, kde-format msgid "Split Diff At Selection" msgstr "" -#: kdiff3.cpp:625 +#: kdiff3.cpp:624 #, fuzzy, kde-format msgid "Join Selected Diffs" msgstr "A kiválasztott fájl összehasonlítása" -#: kdiff3.cpp:627 +#: kdiff3.cpp:626 #, kde-format msgid "Show Window A" msgstr "Az A ablak megjelenítése" -#: kdiff3.cpp:628 +#: kdiff3.cpp:627 #, kde-format msgid "Show Window B" msgstr "A B ablak megjelenítése" -#: kdiff3.cpp:629 +#: kdiff3.cpp:628 #, kde-format msgid "Show Window C" msgstr "A C ablak megjelenítése" -#: kdiff3.cpp:631 +#: kdiff3.cpp:630 #, kde-format msgid "Normal Overview" msgstr "Normál áttekintés" -#: kdiff3.cpp:632 +#: kdiff3.cpp:631 #, kde-format msgid "A vs. B Overview" msgstr "" -#: kdiff3.cpp:633 +#: kdiff3.cpp:632 #, kde-format msgid "A vs. C Overview" msgstr "" -#: kdiff3.cpp:634 +#: kdiff3.cpp:633 #, kde-format msgid "B vs. C Overview" msgstr "" -#: kdiff3.cpp:635 +#: kdiff3.cpp:634 #, kde-format msgid "Word Wrap Diff Windows" msgstr "" -#: kdiff3.cpp:636 +#: kdiff3.cpp:635 #, kde-format msgid "Add Manual Diff Alignment" msgstr "" -#: kdiff3.cpp:637 +#: kdiff3.cpp:636 #, kde-format msgid "Clear All Manual Diff Alignments" msgstr "" -#: kdiff3.cpp:639 +#: kdiff3.cpp:638 #, kde-format msgid "Focus Next Window" msgstr "Fókusz a következő ablakra" -#: kdiff3.cpp:640 +#: kdiff3.cpp:639 #, kde-format msgid "Focus Prev Window" msgstr "Fókusz az előző ablakra" -#: kdiff3.cpp:641 +#: kdiff3.cpp:640 #, kde-format msgid "Toggle Split Orientation" msgstr "A megosztás irányának megváltoztatása" -#: kdiff3.cpp:643 +#: kdiff3.cpp:642 #, kde-format msgid "Dir && Text Split Screen View" msgstr "Osztott nézet (könyvtár és szöveg)" -#: kdiff3.cpp:645 +#: kdiff3.cpp:644 #, kde-format msgid "Toggle Between Dir && Text View" msgstr "Váltás a könyvtár- és szöveges nézet között" -#: kdiff3.cpp:697 pdiff.cpp:1909 +#: kdiff3.cpp:696 pdiff.cpp:1919 #, fuzzy, kde-format #| msgid "The merge result hasn't been saved." msgid "The merge result has not been saved." msgstr "Az összeolvasztás eredménye még nincs elmentve." -#: kdiff3.cpp:699 +#: kdiff3.cpp:698 #, kde-format msgid "Save && Quit" msgstr "Mentés és kilépés" -#: kdiff3.cpp:700 +#: kdiff3.cpp:699 #, kde-format msgid "Quit Without Saving" msgstr "Kilépés mentés nélkül" -#: kdiff3.cpp:708 pdiff.cpp:1920 +#: kdiff3.cpp:707 pdiff.cpp:1930 #, kde-format msgid "Saving the merge result failed." msgstr "Az összeolvasztás eredményét nem sikerült elmenteni." -#: kdiff3.cpp:719 pdiff.cpp:1032 +#: kdiff3.cpp:718 pdiff.cpp:1030 #, kde-format msgid "" "You are currently doing a directory merge. Are you sure, you want to abort?" @@ -1556,63 +1561,63 @@ "Éppen folyamatban van egy könyvtárösszeolvasztás. Biztosan félbe szeretné " "szakítani a műveletet?" -#: kdiff3.cpp:742 +#: kdiff3.cpp:741 #, kde-format msgid "Saving file..." msgstr "A fájl mentése..." -#: kdiff3.cpp:759 +#: kdiff3.cpp:758 #, kde-format msgid "Saving file with a new filename..." msgstr "A fájl elmentése más néven..." -#: kdiff3.cpp:761 +#: kdiff3.cpp:760 #, kde-format msgid "Save As..." msgstr "Mentés másként…" -#: kdiff3.cpp:820 +#: kdiff3.cpp:819 #, kde-format msgid "Printing not implemented." msgstr "A nyomtatás nincs megvalósítva." -#: kdiff3.cpp:857 +#: kdiff3.cpp:858 #, kde-format msgid "Printing..." msgstr "Nyomtatás…" -#: kdiff3.cpp:943 +#: kdiff3.cpp:948 #, kde-format msgid "Printing page %1 of %2" msgstr "" -#: kdiff3.cpp:1000 +#: kdiff3.cpp:1006 #, fuzzy, kde-format #| msgid "Selection" msgid " (Selection)" msgstr "Kijelölés" -#: kdiff3.cpp:1027 +#: kdiff3.cpp:1034 #, kde-format msgid "Printing completed." msgstr "Nyomtatás kész." -#: kdiff3.cpp:1031 +#: kdiff3.cpp:1038 #, kde-format msgid "Printing aborted." msgstr "Nyomtatás félbeszakítva." -#: kdiff3.cpp:1038 +#: kdiff3.cpp:1045 #, kde-format msgid "Exiting..." msgstr "Kilépés..." -#: kdiff3.cpp:1049 +#: kdiff3.cpp:1056 #, kde-format msgid "Toggling toolbar..." msgstr "Az eszköztár átkapcsolása..." -#: kdiff3.cpp:1070 +#: kdiff3.cpp:1077 #, kde-format msgid "Toggle the statusbar..." msgstr "Az állapotsor átkapcsolása..." @@ -1638,7 +1643,7 @@ msgid "Joachim Eibl" msgstr "Joachim Eibl" -#: kdiff3_part.cpp:173 kdiff3_part.cpp:254 +#: kdiff3_part.cpp:174 kdiff3_part.cpp:255 #, fuzzy, kde-format #| msgid "Couldn't find files for comparison." msgid "Could not find files for comparison." @@ -1657,7 +1662,7 @@ msgstr "A KDiff3 beállításai" #. i18n: ectx: ToolBar (mainToolBar) -#: kdiff3_part.rc:16 main.cpp:88 +#: kdiff3_part.rc:16 main.cpp:89 #, kde-format msgid "KDiff3" msgstr "KDiff3" @@ -1733,60 +1738,66 @@ msgid "Main Toolbar" msgstr "Fő eszköztár" -#: main.cpp:68 main.cpp:72 +#: main.cpp:69 main.cpp:73 #, kde-format msgid "Ignored. (User defined.)" msgstr "" -#: main.cpp:92 +#: main.cpp:93 #, kde-format msgid " (64 bit)" msgstr "" -#: main.cpp:94 +#: main.cpp:95 #, kde-format msgid " (32 bit)" msgstr "" -#: main.cpp:95 +#: main.cpp:96 #, kde-format msgid "Tool for Comparison and Merge of Files and Directories" msgstr "" -#: main.cpp:96 +#: main.cpp:97 #, kde-format msgid "(c) 2002-2014 Joachim Eibl, (c) 2017 Michael Reeves KF5/Qt5 port" msgstr "" -#: main.cpp:112 +#: main.cpp:113 #, kde-format msgid "Merge the input." msgstr "Összeolvasztás a bemenettel." -#: main.cpp:113 +#: main.cpp:114 #, kde-format msgid "Explicit base file. For compatibility with certain tools." msgstr "Az alapfájl explicit kijelölése. Kompatibilitási célokat szolgál." -#: main.cpp:114 +#: main.cpp:115 #, kde-format msgid "Output file. Implies -m. E.g.: -o newfile.txt" msgstr "" "A kimeneti fájl neve. Maga után vonja a -m opciót. Például: -o újfájl.txt" -#: main.cpp:115 +#: main.cpp:116 #, kde-format msgid "Output file, again. (For compatibility with certain tools.)" msgstr "A kimeneti fájl neve, még egyszer. Kompatibilitási célokat szolgál." -#: main.cpp:116 +#: main.cpp:118 #, kde-format msgid "No GUI if all conflicts are auto-solvable. (Needs -o file)" msgstr "" "Nem jelenjen meg grafikus felület, ha az összes ütközés automatikusan " "feloldható. (A -o fájlnév opcióval használható.)" -#: main.cpp:117 +#: main.cpp:120 +#, fuzzy, kde-format +#| msgid "Ignore" +msgid "Ignored." +msgstr "Mellőzés" + +#: main.cpp:122 #, fuzzy, kde-format #| msgid "Don't solve conflicts automatically. (For compatibility...)" msgid "Do not solve conflicts automatically." @@ -1794,121 +1805,121 @@ "Az ütközések automatikus feloldásának kikapcsolása. Kompatibilitási célokat " "szolgál." -#: main.cpp:118 +#: main.cpp:123 #, fuzzy, kde-format msgid "Visible name replacement for input file 1 (base)." msgstr "" "A megjelenített név cseréje. Minden bemenethez csak egyszer kell megadni." -#: main.cpp:119 +#: main.cpp:124 #, fuzzy, kde-format msgid "Visible name replacement for input file 2." msgstr "" "A megjelenített név cseréje. Minden bemenethez csak egyszer kell megadni." -#: main.cpp:120 +#: main.cpp:125 #, fuzzy, kde-format msgid "Visible name replacement for input file 3." msgstr "" "A megjelenített név cseréje. Minden bemenethez csak egyszer kell megadni." -#: main.cpp:121 +#: main.cpp:126 #, fuzzy, kde-format msgid "Alternative visible name replacement. Supply this once for every input." msgstr "" "A megjelenített név cseréje. Minden bemenethez csak egyszer kell megadni." -#: main.cpp:122 +#: main.cpp:127 #, kde-format msgid "" "Override a config setting. Use once for every setting. E.g.: --cs " "\"AutoAdvance=1\"" msgstr "" -#: main.cpp:123 +#: main.cpp:128 #, kde-format msgid "Show list of config settings and current values." msgstr "" -#: main.cpp:124 +#: main.cpp:129 #, fuzzy, kde-format msgid "Use a different config file." msgstr "Az eltérő fájlok száma:" -#: main.cpp:127 +#: main.cpp:132 #, kde-format msgid "file1 to open (base, if not specified via --base)" msgstr "" "a megnyitandó fájl (1) - ez lesz az alap, ha nincs megadva a --base opció" -#: main.cpp:128 +#: main.cpp:133 #, kde-format msgid "file2 to open" msgstr "a megnyitandó fájl (2)" -#: main.cpp:129 +#: main.cpp:134 #, kde-format msgid "file3 to open" msgstr "a megnyitandó fájl (3)" -#: main.cpp:153 +#: main.cpp:158 #, kde-format msgid "See kdiff3 --help for supported options." msgstr "" -#: mergeresultwindow.cpp:158 +#: mergeresultwindow.cpp:171 #, kde-format msgid "Choose A Everywhere" msgstr "A kiválasztása mindenhol" -#: mergeresultwindow.cpp:159 +#: mergeresultwindow.cpp:172 #, kde-format msgid "Choose B Everywhere" msgstr "B kiválasztása mindenhol" -#: mergeresultwindow.cpp:160 +#: mergeresultwindow.cpp:173 #, kde-format msgid "Choose C Everywhere" msgstr "C kiválasztása mindenhol" -#: mergeresultwindow.cpp:161 +#: mergeresultwindow.cpp:174 #, fuzzy, kde-format msgid "Choose A for All Unsolved Conflicts" msgstr "A kiválasztása az összes feloldatlan ütközéshez" -#: mergeresultwindow.cpp:162 +#: mergeresultwindow.cpp:175 #, fuzzy, kde-format msgid "Choose B for All Unsolved Conflicts" msgstr "B kiválasztása az összes feloldatlan ütközéshez" -#: mergeresultwindow.cpp:163 +#: mergeresultwindow.cpp:176 #, fuzzy, kde-format msgid "Choose C for All Unsolved Conflicts" msgstr "C kiválasztása az összes feloldatlan ütközéshez" -#: mergeresultwindow.cpp:164 +#: mergeresultwindow.cpp:177 #, fuzzy, kde-format msgid "Choose A for All Unsolved Whitespace Conflicts" msgstr "A kiválasztása az összes feloldatlan elválasztókarakter-ütközéshez" -#: mergeresultwindow.cpp:165 +#: mergeresultwindow.cpp:178 #, fuzzy, kde-format msgid "Choose B for All Unsolved Whitespace Conflicts" msgstr "B kiválasztása az összes feloldatlan elválasztókarakter-ütközéshez" -#: mergeresultwindow.cpp:166 +#: mergeresultwindow.cpp:179 #, fuzzy, kde-format msgid "Choose C for All Unsolved Whitespace Conflicts" msgstr "C kiválasztása az összes feloldatlan elválasztókarakter-ütközéshez" -#: mergeresultwindow.cpp:176 +#: mergeresultwindow.cpp:204 #, fuzzy, kde-format msgid "Number of remaining unsolved conflicts: %1 (of which %2 are whitespace)" msgstr "" "\n" "A fel nem oldott ütközések száma: " -#: mergeresultwindow.cpp:370 +#: mergeresultwindow.cpp:398 #, kde-format msgid "" "The output has been modified.\n" @@ -1917,29 +1928,29 @@ "A kimenet megváltozott.\n" "Ha továbblép, a módosítások elvesznek." -#: mergeresultwindow.cpp:936 pdiff.cpp:827 +#: mergeresultwindow.cpp:964 pdiff.cpp:817 #, kde-format msgid "All input files are binary equal." msgstr "Az összes bemeneti fájl megegyezik (bináris módban)." -#: mergeresultwindow.cpp:938 +#: mergeresultwindow.cpp:966 #, kde-format msgid "All input files contain the same text." msgstr "Az összes bemeneti fájl megegyezik (szöveges módban)." -#: mergeresultwindow.cpp:942 mergeresultwindow.cpp:946 -#: mergeresultwindow.cpp:950 pdiff.cpp:833 pdiff.cpp:837 pdiff.cpp:841 +#: mergeresultwindow.cpp:970 mergeresultwindow.cpp:974 +#: mergeresultwindow.cpp:978 pdiff.cpp:823 pdiff.cpp:827 pdiff.cpp:831 #, fuzzy, kde-format msgid "Files %1 and %2 are binary equal.\n" msgstr "B és C binárisan megegyezik.\n" -#: mergeresultwindow.cpp:944 mergeresultwindow.cpp:948 -#: mergeresultwindow.cpp:952 +#: mergeresultwindow.cpp:972 mergeresultwindow.cpp:976 +#: mergeresultwindow.cpp:980 #, fuzzy, kde-format msgid "Files %1 and %2 have equal text.\n" msgstr "A és B szövege megegyezik.\n" -#: mergeresultwindow.cpp:958 +#: mergeresultwindow.cpp:986 #, kde-format msgid "" "Total number of conflicts: %1\n" @@ -1948,27 +1959,27 @@ "%4" msgstr "" -#: mergeresultwindow.cpp:964 +#: mergeresultwindow.cpp:992 #, kde-format msgid "Conflicts" msgstr "Ütközések" -#: mergeresultwindow.cpp:1873 +#: mergeresultwindow.cpp:1901 #, kde-format msgid "" msgstr "" -#: mergeresultwindow.cpp:1881 +#: mergeresultwindow.cpp:1909 #, kde-format msgid "" msgstr "<Összeolvasztási ütközés (Csak whitespace)>" -#: mergeresultwindow.cpp:1883 mergeresultwindow.cpp:2755 +#: mergeresultwindow.cpp:1911 mergeresultwindow.cpp:2783 #, kde-format msgid "" msgstr "<Összeolvasztási ütközés>" -#: mergeresultwindow.cpp:2967 +#: mergeresultwindow.cpp:2995 #, fuzzy, kde-format #| msgid "" #| "Not all conflicts are solved yet.\n" @@ -1980,12 +1991,12 @@ "Még nincs feloldva az összes ütközés.\n" "A fájl nem lesz elmentve.\n" -#: mergeresultwindow.cpp:2969 mergeresultwindow.cpp:2978 +#: mergeresultwindow.cpp:2997 mergeresultwindow.cpp:3006 #, kde-format msgid "Conflicts Left" msgstr "Megmaradt ütközések" -#: mergeresultwindow.cpp:2976 +#: mergeresultwindow.cpp:3004 #, kde-format msgid "" "There is a line end style conflict. Please choose the line end style " @@ -1993,7 +2004,7 @@ "File not saved." msgstr "" -#: mergeresultwindow.cpp:2990 +#: mergeresultwindow.cpp:3018 #, kde-format msgid "" "\n" @@ -2001,62 +2012,62 @@ "Creating backup failed. File not saved." msgstr "" -#: mergeresultwindow.cpp:2990 mergeresultwindow.cpp:3038 +#: mergeresultwindow.cpp:3018 mergeresultwindow.cpp:3066 #, kde-format msgid "File Save Error" msgstr "Fájlmentési hiba" -#: mergeresultwindow.cpp:3038 +#: mergeresultwindow.cpp:3066 #, kde-format msgid "Error while writing." msgstr "Hiba történt írás közben." -#: mergeresultwindow.cpp:3110 +#: mergeresultwindow.cpp:3138 #, fuzzy, kde-format #| msgid "Output" msgid "Output:" msgstr "Kimenet" -#: mergeresultwindow.cpp:3123 mergeresultwindow.cpp:3315 +#: mergeresultwindow.cpp:3151 mergeresultwindow.cpp:3343 #, kde-format msgid "[Modified]" msgstr "[Módosítva]" -#: mergeresultwindow.cpp:3130 +#: mergeresultwindow.cpp:3158 #, fuzzy, kde-format #| msgid "Encoding:" msgid "Encoding for saving:" msgstr "Kódolás:" -#: mergeresultwindow.cpp:3230 +#: mergeresultwindow.cpp:3258 #, kde-format msgid "Conflict" msgstr "Ütközés" -#: mergeresultwindow.cpp:3262 +#: mergeresultwindow.cpp:3290 #, fuzzy, kde-format #| msgid "Codec from" msgid "Codec from A: %1" msgstr "Kodek innen" -#: mergeresultwindow.cpp:3264 +#: mergeresultwindow.cpp:3292 #, fuzzy, kde-format #| msgid "Codec from" msgid "Codec from B: %1" msgstr "Kodek innen" -#: mergeresultwindow.cpp:3266 +#: mergeresultwindow.cpp:3294 #, fuzzy, kde-format #| msgid "Codec from" msgid "Codec from C: %1" msgstr "Kodek innen" -#: optiondialog.cpp:119 +#: optiondialog.cpp:121 #, kde-format msgid "Change Font" msgstr "" -#: optiondialog.cpp:135 optiondialog.cpp:145 +#: optiondialog.cpp:137 optiondialog.cpp:147 #, kde-format msgid "" "Font: %1, %2, %3\n" @@ -2064,164 +2075,164 @@ "Example:" msgstr "" -#: optiondialog.cpp:388 +#: optiondialog.cpp:390 #, kde-format msgid "Unicode" msgstr "Unicode" -#: optiondialog.cpp:389 +#: optiondialog.cpp:391 #, kde-format msgid "Latin1" msgstr "Latin1" -#: optiondialog.cpp:408 +#: optiondialog.cpp:410 #, fuzzy, kde-format msgid "Change this if non-ASCII characters are not displayed correctly." msgstr "" "Akkor kell esetleg bejelölni, ha a nem ASCII karakterek helytelenül jelennek " "meg." -#: optiondialog.cpp:491 +#: optiondialog.cpp:495 #, kde-format msgid "Configure" msgstr "Beállítás" -#: optiondialog.cpp:568 +#: optiondialog.cpp:573 #, kde-format msgid "Font" msgstr "Betűkészlet" -#: optiondialog.cpp:570 +#: optiondialog.cpp:575 #, kde-format msgid "Editor & Diff Output Font" msgstr "A szerkesztő és a diff-kimenet betűtípusa" -#: optiondialog.cpp:589 +#: optiondialog.cpp:594 #, kde-format msgid "Application font" msgstr "" -#: optiondialog.cpp:594 +#: optiondialog.cpp:599 #, fuzzy, kde-format #| msgid "File Save Error" msgid "File view font" msgstr "Fájlmentési hiba" -#: optiondialog.cpp:613 +#: optiondialog.cpp:618 #, fuzzy, kde-format #| msgid "Color" msgctxt "Title for color settings page" msgid "Color" msgstr "Szín" -#: optiondialog.cpp:614 +#: optiondialog.cpp:619 #, kde-format msgid "Colors Settings" msgstr "Színek beállításai" -#: optiondialog.cpp:631 +#: optiondialog.cpp:644 #, kde-format msgid "Editor and Diff Views:" msgstr "" -#: optiondialog.cpp:639 +#: optiondialog.cpp:652 #, kde-format msgid "Foreground color:" msgstr "Előtérszín:" -#: optiondialog.cpp:647 +#: optiondialog.cpp:660 #, kde-format msgid "Background color:" msgstr "Háttérszín:" -#: optiondialog.cpp:657 +#: optiondialog.cpp:670 #, kde-format msgid "Diff background color:" msgstr "A diff szöveg háttérszíne:" -#: optiondialog.cpp:666 +#: optiondialog.cpp:679 #, kde-format msgid "Color A:" msgstr "A szín:" -#: optiondialog.cpp:675 +#: optiondialog.cpp:688 #, kde-format msgid "Color B:" msgstr "B szín:" -#: optiondialog.cpp:684 +#: optiondialog.cpp:697 #, kde-format msgid "Color C:" msgstr "C szín:" -#: optiondialog.cpp:692 +#: optiondialog.cpp:705 #, kde-format msgid "Conflict color:" msgstr "Ütközési szín:" -#: optiondialog.cpp:701 +#: optiondialog.cpp:714 #, kde-format msgid "Current range background color:" msgstr "A jelenlegi tartomány háttérszíne:" -#: optiondialog.cpp:710 +#: optiondialog.cpp:723 #, kde-format msgid "Current range diff background color:" msgstr "A jelenlegi tartomány diff-jének háttérszíne:" -#: optiondialog.cpp:718 +#: optiondialog.cpp:731 #, kde-format msgid "Color for manually aligned difference ranges:" msgstr "" -#: optiondialog.cpp:725 +#: optiondialog.cpp:738 #, fuzzy, kde-format msgid "Directory Comparison View:" msgstr "A könyvtárak összehasonlítási állapota" -#: optiondialog.cpp:731 +#: optiondialog.cpp:744 #, kde-format msgid "Newest file color:" msgstr "Legújabb fájl színe:" -#: optiondialog.cpp:736 +#: optiondialog.cpp:749 #, kde-format msgid "" "Changing this color will only be effective when starting the next directory " "comparison." msgstr "" -#: optiondialog.cpp:741 +#: optiondialog.cpp:754 #, kde-format msgid "Oldest file color:" msgstr "Legrégibb fájl színe:" -#: optiondialog.cpp:750 +#: optiondialog.cpp:763 #, kde-format msgid "Middle age file color:" msgstr "" -#: optiondialog.cpp:759 +#: optiondialog.cpp:772 #, kde-format msgid "Color for missing files:" msgstr "Hiányzó fájlok színe:" -#: optiondialog.cpp:773 +#: optiondialog.cpp:786 #, kde-format msgid "Editor" msgstr "Szerkesztő" -#: optiondialog.cpp:774 +#: optiondialog.cpp:787 #, kde-format msgid "Editor Behavior" msgstr "Szerkesztő viselkedés" -#: optiondialog.cpp:787 +#: optiondialog.cpp:809 #, kde-format msgid "Tab inserts spaces" msgstr "A Tab billentyű szóközöket szúrjon be" -#: optiondialog.cpp:791 +#: optiondialog.cpp:813 #, fuzzy, kde-format #| msgid "" #| "On: Pressing tab generates the appropriate number of spaces.\n" @@ -2234,29 +2245,29 @@ "szövegbe.\n" "Ha nincs bejelölve: a Tab lenyomásakor Tab karakter kerül a szövegbe.." -#: optiondialog.cpp:796 +#: optiondialog.cpp:818 #, kde-format msgid "Tab size:" msgstr "Tabulátorméret:" -#: optiondialog.cpp:803 +#: optiondialog.cpp:825 #, kde-format msgid "Auto indentation" msgstr "A behúzás megőrzése" -#: optiondialog.cpp:807 +#: optiondialog.cpp:829 #, kde-format msgid "On: The indentation of the previous line is used for a new line.\n" msgstr "" "Ha be van jelölve: új sor kezdésekor az előző sor behúzását használja a " "program.\n" -#: optiondialog.cpp:810 +#: optiondialog.cpp:832 #, kde-format msgid "Auto copy selection" msgstr "A kijelölt adatok automatikus kimásolása a vágólapra" -#: optiondialog.cpp:814 +#: optiondialog.cpp:836 #, fuzzy, kde-format #| msgid "" #| "On: Any selection is immediately written to the clipboard.\n" @@ -2269,19 +2280,19 @@ "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:829 +#: optiondialog.cpp:851 #, kde-format msgid "" "Sets the line endings for when an edited file is saved.\n" "DOS/Windows: CR+LF; UNIX: LF; with CR=0D, LF=0A" msgstr "" -#: optiondialog.cpp:839 +#: optiondialog.cpp:861 #, kde-format msgid "Diff" msgstr "Diff" -#: optiondialog.cpp:840 +#: optiondialog.cpp:862 #, kde-format msgid "Diff Settings" msgstr "Diff-beállítások" @@ -2295,12 +2306,12 @@ #. ); #. ++line; #. -#: optiondialog.cpp:865 +#: optiondialog.cpp:896 #, fuzzy, kde-format msgid "Ignore numbers (treat as white space)" msgstr "A C/C++-megjegyzések üres helynek tekintése." -#: optiondialog.cpp:869 +#: optiondialog.cpp:900 #, kde-format msgid "" "Ignore number characters during line matching phase. (Similar to Ignore " @@ -2312,45 +2323,45 @@ "Néha szükség lehet erre az opcióra számadatokat tartalmazó fájlok " "összehasonlításánál." -#: optiondialog.cpp:873 +#: optiondialog.cpp:904 #, fuzzy, kde-format #| msgid "Treat C/C++ comments like white space." msgid "Ignore C/C++ comments (treat as white space)" msgstr "A C/C++-megjegyzések üres helynek tekintése." -#: optiondialog.cpp:876 +#: optiondialog.cpp:907 #, kde-format msgid "Treat C/C++ comments like white space." msgstr "A C/C++-megjegyzések üres helynek tekintése." -#: optiondialog.cpp:879 +#: optiondialog.cpp:910 #, fuzzy, kde-format msgid "Ignore case (treat as white space)" msgstr "A C/C++-megjegyzések üres helynek tekintése." -#: optiondialog.cpp:883 +#: optiondialog.cpp:914 #, kde-format msgid "Treat case differences like white space changes. ('a'<=>'A')" msgstr "" -#: optiondialog.cpp:886 +#: optiondialog.cpp:917 #, kde-format msgid "Preprocessor command:" msgstr "Előfeldolgozási parancs:" -#: optiondialog.cpp:891 +#: optiondialog.cpp:922 #, kde-format msgid "User defined pre-processing. (See the docs for details.)" msgstr "" "A felhasználó által megadott előfeldolgozás használata (a részletek a " "dokumentációban találhatók)." -#: optiondialog.cpp:894 +#: optiondialog.cpp:925 #, kde-format msgid "Line-matching preprocessor command:" msgstr "Sorösszehasonlítási előparancs:" -#: optiondialog.cpp:899 +#: optiondialog.cpp:930 #, kde-format msgid "" "This pre-processor is only used during line matching.\n" @@ -2359,12 +2370,12 @@ "Ezt a parancsot sorillesztésnél használja a program.\n" "(A részletek a dokumentációban találhatók.)" -#: optiondialog.cpp:902 +#: optiondialog.cpp:933 #, kde-format msgid "Try hard (slower)" msgstr "Alaposabb próbálkozás (lassabb)" -#: optiondialog.cpp:906 +#: optiondialog.cpp:937 #, kde-format msgid "" "Enables the --minimal option for the external diff.\n" @@ -2373,12 +2384,12 @@ "Bekapcsolja a --minimal opciót a külső diff programnál.\n" "Hatására a sebesség jelentősen lecsökkenhet nagy fájlok esetén." -#: optiondialog.cpp:910 +#: optiondialog.cpp:941 #, kde-format msgid "Align B and C for 3 input files" msgstr "" -#: optiondialog.cpp:914 +#: optiondialog.cpp:945 #, kde-format msgid "" "Try to align B and C when comparing or merging three input files.\n" @@ -2386,17 +2397,24 @@ "(Default is off.)" msgstr "" -#: optiondialog.cpp:926 +#: optiondialog.cpp:956 +#, fuzzy, kde-format +#| msgid "Merge" +msgctxt "Settings page" +msgid "Merge" +msgstr "Összeolvasztás" + +#: optiondialog.cpp:957 #, fuzzy, kde-format msgid "Merge Settings" msgstr "A diff és az összeolvasztás beállításai" -#: optiondialog.cpp:940 +#: optiondialog.cpp:980 #, kde-format msgid "Auto advance delay (ms):" msgstr "Automatikus léptetési késleltetés (ms):" -#: optiondialog.cpp:946 +#: optiondialog.cpp:986 #, kde-format msgid "" "When in Auto-Advance mode the result of the current selection is shown \n" @@ -2406,28 +2424,28 @@ "utána a program automatikusan a következő ütközésre lép. A megengedett " "értéktartomány: 0-2000 ms" -#: optiondialog.cpp:950 +#: optiondialog.cpp:990 #, fuzzy, kde-format #| msgid "Show Window A" msgid "Show info dialogs" msgstr "Az A ablak megjelenítése" -#: optiondialog.cpp:953 +#: optiondialog.cpp:993 #, kde-format msgid "Show a dialog with information about the number of conflicts." msgstr "" -#: optiondialog.cpp:956 +#: optiondialog.cpp:996 #, kde-format msgid "White space 2-file merge default:" msgstr "Üres karakterek 2 fájl összeolvasztásánál (alapértelmezés):" -#: optiondialog.cpp:961 optiondialog.cpp:974 +#: optiondialog.cpp:1001 optiondialog.cpp:1014 #, kde-format msgid "Manual Choice" msgstr "Kézi választás" -#: optiondialog.cpp:965 optiondialog.cpp:979 +#: optiondialog.cpp:1005 optiondialog.cpp:1019 #, kde-format msgid "" "Allow the merge algorithm to automatically select an input for white-space-" @@ -2436,22 +2454,22 @@ "Lehetővé teszi az összeolvasztási algoritmusnak, hogy automatikusan " "kiválassza a megfelelő bemenetet, ha az üres helyek megváltozását kell nézni." -#: optiondialog.cpp:969 +#: optiondialog.cpp:1009 #, kde-format msgid "White space 3-file merge default:" msgstr "Üres karakterek 2 fájl összeolvasztásánál (alapértelmezés):" -#: optiondialog.cpp:983 +#: optiondialog.cpp:1023 #, kde-format msgid "Automatic Merge Regular Expression" msgstr "" -#: optiondialog.cpp:991 smalldialogs.cpp:449 +#: optiondialog.cpp:1031 smalldialogs.cpp:459 #, kde-format msgid "Auto merge regular expression:" msgstr "" -#: optiondialog.cpp:996 +#: optiondialog.cpp:1036 #, kde-format msgid "" "Regular expression for lines where KDiff3 should automatically choose one " @@ -2460,29 +2478,29 @@ "- if available - C, otherwise B will be chosen." msgstr "" -#: optiondialog.cpp:1002 +#: optiondialog.cpp:1042 #, kde-format msgid "Run regular expression auto merge on merge start" msgstr "" -#: optiondialog.cpp:1005 +#: optiondialog.cpp:1045 #, kde-format msgid "" "Run the merge for auto merge regular expressions\n" "immediately when a merge starts.\n" msgstr "" -#: optiondialog.cpp:1010 +#: optiondialog.cpp:1050 #, kde-format msgid "Version Control History Merging" msgstr "" -#: optiondialog.cpp:1018 smalldialogs.cpp:476 +#: optiondialog.cpp:1058 smalldialogs.cpp:486 #, kde-format msgid "History start regular expression:" msgstr "" -#: optiondialog.cpp:1023 +#: optiondialog.cpp:1063 #, kde-format msgid "" "Regular expression for the start of the version control history entry.\n" @@ -2490,12 +2508,12 @@ "Default value: \".*\\$Log.*\\$.*\"" msgstr "" -#: optiondialog.cpp:1029 smalldialogs.cpp:504 +#: optiondialog.cpp:1069 smalldialogs.cpp:514 #, kde-format msgid "History entry start regular expression:" msgstr "" -#: optiondialog.cpp:1042 +#: optiondialog.cpp:1082 #, kde-format msgid "" "A version control history entry consists of several lines.\n" @@ -2507,22 +2525,22 @@ "See the documentation for details." msgstr "" -#: optiondialog.cpp:1050 +#: optiondialog.cpp:1090 #, kde-format msgid "History merge sorting" msgstr "" -#: optiondialog.cpp:1053 +#: optiondialog.cpp:1093 #, kde-format msgid "Sort version control history by a key." msgstr "" -#: optiondialog.cpp:1063 +#: optiondialog.cpp:1103 #, kde-format msgid "History entry start sort key order:" msgstr "" -#: optiondialog.cpp:1068 +#: optiondialog.cpp:1108 #, kde-format msgid "" "Each pair of parentheses used in the regular expression for the history " @@ -2534,37 +2552,37 @@ "See the documentation for details." msgstr "" -#: optiondialog.cpp:1079 +#: optiondialog.cpp:1119 #, kde-format msgid "Merge version control history on merge start" msgstr "" -#: optiondialog.cpp:1082 +#: optiondialog.cpp:1122 #, kde-format msgid "Run version control history automerge on merge start." msgstr "" -#: optiondialog.cpp:1086 +#: optiondialog.cpp:1126 #, fuzzy, kde-format msgid "Max number of history entries:" msgstr "Az alkönyvtárak száma:" -#: optiondialog.cpp:1090 +#: optiondialog.cpp:1130 #, kde-format msgid "Cut off after specified number. Use -1 for infinite number of entries." msgstr "" -#: optiondialog.cpp:1094 +#: optiondialog.cpp:1134 #, kde-format msgid "Test your regular expressions" msgstr "" -#: optiondialog.cpp:1099 +#: optiondialog.cpp:1139 #, kde-format msgid "Irrelevant merge command:" msgstr "" -#: optiondialog.cpp:1104 +#: optiondialog.cpp:1144 #, kde-format msgid "" "If specified this script is run after automerge\n" @@ -2572,12 +2590,12 @@ "Called with the parameters: filename1 filename2 filename3" msgstr "" -#: optiondialog.cpp:1109 +#: optiondialog.cpp:1149 #, kde-format msgid "Auto save and quit on merge without conflicts" msgstr "" -#: optiondialog.cpp:1113 +#: optiondialog.cpp:1153 #, kde-format msgid "" "If KDiff3 was started for a file-merge from the command line and all\n" @@ -2586,29 +2604,29 @@ "(Similar to command line option \"--auto\".)" msgstr "" -#: optiondialog.cpp:1124 optiondialog.cpp:1125 +#: optiondialog.cpp:1164 optiondialog.cpp:1165 #, kde-format msgid "Directory" msgstr "Könyvtár" -#: optiondialog.cpp:1137 +#: optiondialog.cpp:1185 #, kde-format msgid "Recursive directories" msgstr "Az alkönyvtárakban is" -#: optiondialog.cpp:1140 +#: optiondialog.cpp:1188 #, kde-format msgid "Whether to analyze subdirectories or not." msgstr "" "Itt lehet megadni, hogy az összehasonlítás az alkönyvtárak tartalmára is " "kiterjedjen-e." -#: optiondialog.cpp:1142 +#: optiondialog.cpp:1190 #, kde-format msgid "File pattern(s):" msgstr "Fájlminták:" -#: optiondialog.cpp:1148 +#: optiondialog.cpp:1196 #, kde-format msgid "" "Pattern(s) of files to be analyzed. \n" @@ -2619,12 +2637,12 @@ "Használható illesztési karakterek: '*' és '?'\n" "Több minta is megadható pontosvesszővel elválasztva." -#: optiondialog.cpp:1153 +#: optiondialog.cpp:1201 #, kde-format msgid "File-anti-pattern(s):" msgstr "Kizáró fájlminták:" -#: optiondialog.cpp:1159 +#: optiondialog.cpp:1207 #, kde-format msgid "" "Pattern(s) of files to be excluded from analysis. \n" @@ -2635,12 +2653,12 @@ "Használható illesztési karakterek: '*' és '?'\n" "Több minta is megadható pontosvesszővel elválasztva." -#: optiondialog.cpp:1164 +#: optiondialog.cpp:1212 #, kde-format msgid "Dir-anti-pattern(s):" msgstr "Kizáró könyvtárminták:" -#: optiondialog.cpp:1170 +#: optiondialog.cpp:1218 #, kde-format msgid "" "Pattern(s) of directories to be excluded from analysis. \n" @@ -2651,12 +2669,12 @@ "Használható illesztési karakterek: '*' és '?'\n" "Több minta is megadható pontosvesszővel elválasztva." -#: optiondialog.cpp:1175 +#: optiondialog.cpp:1223 #, kde-format msgid "Use .cvsignore" msgstr "A .cvsignore használata" -#: optiondialog.cpp:1179 +#: optiondialog.cpp:1227 #, fuzzy, kde-format #| msgid "" #| "Extends the antipattern to anything that would be ignored by CVS.\n" @@ -2668,23 +2686,23 @@ "A kizárási mintát kiterjeszti a CVS által figyelmen kívül hagyott fájlokra.\n" "A \".cvsignore\" fájlok segítségével ez minden könyvtárban külön megadható." -#: optiondialog.cpp:1183 +#: optiondialog.cpp:1231 #, kde-format msgid "Find hidden files and directories" msgstr "A keresések a rejtett fájlokra és könyvtárakra is terjedjenek ki" -#: optiondialog.cpp:1186 +#: optiondialog.cpp:1234 #, fuzzy, kde-format #| msgid "Find hidden files and directories" msgid "Finds hidden files and directories." msgstr "A keresések a rejtett fájlokra és könyvtárakra is terjedjenek ki" -#: optiondialog.cpp:1189 +#: optiondialog.cpp:1237 #, kde-format msgid "Follow file links" msgstr "A fájllinkek követése" -#: optiondialog.cpp:1193 +#: optiondialog.cpp:1241 #, kde-format msgid "" "On: Compare the file the link points to.\n" @@ -2693,12 +2711,12 @@ "Be: összehasonlítás a link által mutatott fájllal.\n" "Ki: a linkek összehasonlítása." -#: optiondialog.cpp:1197 +#: optiondialog.cpp:1245 #, kde-format msgid "Follow directory links" msgstr "A linkek követése" -#: optiondialog.cpp:1201 +#: optiondialog.cpp:1249 #, kde-format msgid "" "On: Compare the directory the link points to.\n" @@ -2708,12 +2726,12 @@ "összehasonlítva.\n" "Ha nincs bejelölve: maguk a linkek lesznek összehasonlítva." -#: optiondialog.cpp:1210 +#: optiondialog.cpp:1258 #, kde-format msgid "Case sensitive filename comparison" msgstr "" -#: optiondialog.cpp:1214 +#: optiondialog.cpp:1262 #, kde-format msgid "" "The directory comparison will compare files or directories when their names " @@ -2722,64 +2740,64 @@ "off, otherwise on.)" msgstr "" -#: optiondialog.cpp:1218 +#: optiondialog.cpp:1266 #, fuzzy, kde-format #| msgid "Unfold All Subdirs" msgid "Unfold all subdirectories on load" msgstr "Az alkönyvtárak kibontása" -#: optiondialog.cpp:1222 +#: optiondialog.cpp:1270 #, kde-format msgid "" "On: Unfold all subdirectories when starting a directory diff.\n" "Off: Leave subdirectories folded." msgstr "" -#: optiondialog.cpp:1226 +#: optiondialog.cpp:1274 #, kde-format msgid "Skip directory status report" msgstr "" -#: optiondialog.cpp:1230 +#: optiondialog.cpp:1278 #, kde-format msgid "" "On: Do not show the Directory Comparison Status.\n" "Off: Show the status dialog on start." msgstr "" -#: optiondialog.cpp:1234 +#: optiondialog.cpp:1282 #, kde-format msgid "File Comparison Mode" msgstr "Fájl összehasonlítási mód" -#: optiondialog.cpp:1239 +#: optiondialog.cpp:1287 #, kde-format msgid "Binary comparison" msgstr "Bináris összehasonlítás" -#: optiondialog.cpp:1241 +#: optiondialog.cpp:1289 #, kde-format msgid "Binary comparison of each file. (Default)" msgstr "Bináris összehasonlítás minden fájlra. (Alapértelmezett)" -#: optiondialog.cpp:1244 +#: optiondialog.cpp:1292 #, kde-format msgid "Full analysis" msgstr "Teljes elemzés" -#: optiondialog.cpp:1246 +#: optiondialog.cpp:1294 #, kde-format msgid "" "Do a full analysis and show statistics information in extra columns.\n" "(Slower than a binary comparison, much slower for binary files.)" msgstr "" -#: optiondialog.cpp:1250 +#: optiondialog.cpp:1298 #, fuzzy, kde-format msgid "Trust the size and modification date (unsafe)" msgstr "A módosítási dátum valósnak feltételezése (nem megbízható!)" -#: optiondialog.cpp:1252 +#: optiondialog.cpp:1300 #, fuzzy, kde-format msgid "" "Assume that files are equal if the modification date and file length are " @@ -2792,14 +2810,14 @@ "módosítás dátuma megegyezik.\n" "Nagy könyvtárak vagy lassú hálózat esetén lehet erre szükség." -#: optiondialog.cpp:1257 +#: optiondialog.cpp:1305 #, fuzzy, kde-format msgid "" "Trust the size and date, but use binary comparison if date does not match " "(unsafe)" msgstr "A módosítási dátum valósnak feltételezése (nem megbízható!)" -#: optiondialog.cpp:1259 +#: optiondialog.cpp:1307 #, fuzzy, kde-format msgid "" "Assume that files are equal if the modification date and file length are " @@ -2811,12 +2829,12 @@ "módosítás dátuma megegyezik.\n" "Nagy könyvtárak vagy lassú hálózat esetén lehet erre szükség." -#: optiondialog.cpp:1264 +#: optiondialog.cpp:1312 #, kde-format msgid "Trust the size (unsafe)" msgstr "A méret valósnak feltételezése (nem megbízható!)" -#: optiondialog.cpp:1266 +#: optiondialog.cpp:1314 #, kde-format msgid "" "Assume that files are equal if their file lengths are equal.\n" @@ -2827,12 +2845,12 @@ "Nagy könyvtárak vagy lassú hálózat esetén lehet erre szükség, ha letöltéskor " "a módosítási dátum megváltozik." -#: optiondialog.cpp:1273 +#: optiondialog.cpp:1321 #, kde-format msgid "Synchronize directories" msgstr "A könyvtárak szinkronizálása" -#: optiondialog.cpp:1277 +#: optiondialog.cpp:1325 #, kde-format msgid "" "Offers to store files in both directories so that\n" @@ -2843,24 +2861,24 @@ "összehasonlítás után a könyvtárak meg fognak egyezni.\n" "Csak akkor működik, ha az összehasonlításnál nincs megadva a cél." -#: optiondialog.cpp:1283 +#: optiondialog.cpp:1331 #, fuzzy, kde-format msgid "White space differences considered equal" msgstr "Üres karakterek 2 fájl összeolvasztásánál (alapértelmezés):" -#: optiondialog.cpp:1287 +#: optiondialog.cpp:1335 #, kde-format msgid "" "If files differ only by white space consider them equal.\n" "This is only active when full analysis is chosen." msgstr "" -#: optiondialog.cpp:1293 +#: optiondialog.cpp:1341 #, kde-format msgid "Copy newer instead of merging (unsafe)" msgstr "Az újabb másolása összeolvasztás helyett (nem megbízható!)." -#: optiondialog.cpp:1297 +#: optiondialog.cpp:1345 #, fuzzy, kde-format #| msgid "" #| "Don't look inside, just take the newer file.\n" @@ -2875,12 +2893,12 @@ "Csak akkor használja, ha tudja, milyen következményekkel jár ez a művelet!\n" "Az opciónak csak két könyvtár összehasonlításakor van hatása." -#: optiondialog.cpp:1302 +#: optiondialog.cpp:1350 #, kde-format msgid "Backup files (.orig)" msgstr "Biztonsági mentések (.orig)" -#: optiondialog.cpp:1306 +#: optiondialog.cpp:1354 #, fuzzy, kde-format #| msgid "" #| "When a file would be saved over an old file, then the old file\n" @@ -2892,35 +2910,35 @@ "Mielőtt a program egy régebbi fájlt felülírna az újabbal, a régi fájl\n" "legyen átnevezve '.orig' kiterjesztéssel (törlés helyett)." -#: optiondialog.cpp:1382 optiondialog.cpp:1383 +#: optiondialog.cpp:1430 optiondialog.cpp:1431 #, kde-format msgid "Regional Settings" msgstr "Területi beállítások" -#: optiondialog.cpp:1397 +#: optiondialog.cpp:1454 #, kde-format msgid "Use the same encoding for everything:" msgstr "" -#: optiondialog.cpp:1401 +#: optiondialog.cpp:1458 #, kde-format msgid "" "Enable this allows to change all encodings by changing the first only.\n" "Disable this if different individual settings are needed." msgstr "" -#: optiondialog.cpp:1405 +#: optiondialog.cpp:1462 #, fuzzy, kde-format #| msgid "Note: Local Encoding is " msgid "Note: Local Encoding is \"%1\"" msgstr "Megjegyzés: A helyi kódolás" -#: optiondialog.cpp:1409 +#: optiondialog.cpp:1466 #, kde-format msgid "File Encoding for A:" msgstr "" -#: optiondialog.cpp:1416 +#: optiondialog.cpp:1473 #, kde-format msgid "" "If enabled then Unicode (UTF-16 or UTF-8) encoding will be detected.\n" @@ -2929,32 +2947,32 @@ "(Unicode detection depends on the first bytes of a file.)" msgstr "" -#: optiondialog.cpp:1419 optiondialog.cpp:1430 optiondialog.cpp:1441 +#: optiondialog.cpp:1476 optiondialog.cpp:1487 optiondialog.cpp:1498 #, kde-format msgid "Auto Detect Unicode" msgstr "Automatikusan felismert Unicode" -#: optiondialog.cpp:1425 +#: optiondialog.cpp:1482 #, kde-format msgid "File Encoding for B:" msgstr "" -#: optiondialog.cpp:1436 +#: optiondialog.cpp:1493 #, kde-format msgid "File Encoding for C:" msgstr "" -#: optiondialog.cpp:1447 +#: optiondialog.cpp:1504 #, kde-format msgid "File Encoding for Merge Output and Saving:" msgstr "" -#: optiondialog.cpp:1452 +#: optiondialog.cpp:1509 #, kde-format msgid "Auto Select" msgstr "Automatikus kiválasztás" -#: optiondialog.cpp:1456 +#: optiondialog.cpp:1513 #, kde-format msgid "" "If enabled then the encoding from the input files is used.\n" @@ -2962,39 +2980,39 @@ "saving." msgstr "" -#: optiondialog.cpp:1459 +#: optiondialog.cpp:1516 #, kde-format msgid "File Encoding for Preprocessor Files:" msgstr "" -#: optiondialog.cpp:1471 +#: optiondialog.cpp:1528 #, kde-format msgid "Right To Left Language" msgstr "Jobbról balra nyelv" -#: optiondialog.cpp:1475 +#: optiondialog.cpp:1532 #, kde-format msgid "" "Some languages are read from right to left.\n" "This setting will change the viewer and editor accordingly." msgstr "" -#: optiondialog.cpp:1485 +#: optiondialog.cpp:1542 #, kde-format msgid "Integration" msgstr "Integráció" -#: optiondialog.cpp:1486 +#: optiondialog.cpp:1543 #, kde-format msgid "Integration Settings" msgstr "Integráció beállítások" -#: optiondialog.cpp:1499 +#: optiondialog.cpp:1564 #, kde-format msgid "Command line options to ignore:" msgstr "" -#: optiondialog.cpp:1505 +#: optiondialog.cpp:1570 #, kde-format msgid "" "List of command line options that should be ignored when KDiff3 is used by " @@ -3003,19 +3021,19 @@ "This will suppress the \"Unknown option\" error." msgstr "" -#: optiondialog.cpp:1510 +#: optiondialog.cpp:1575 #, kde-format msgid "Quit also via Escape key" msgstr "" -#: optiondialog.cpp:1514 +#: optiondialog.cpp:1579 #, kde-format msgid "" "Fast method to exit.\n" "For those who are used to using the Escape key." msgstr "" -#: optiondialog.cpp:1598 +#: optiondialog.cpp:1653 #, kde-format msgid "This resets all options. Not only those of the current topic." msgstr "" @@ -3068,77 +3086,68 @@ msgid "Disable Unsafe Options" msgstr "" -#: pdiff.cpp:158 +#: pdiff.cpp:160 #, kde-format msgid "Loading A" msgstr "A betöltése" -#: pdiff.cpp:167 -#, kde-format -msgid "Errors occurred during pre-processing of file A." -msgstr "" +#: pdiff.cpp:162 +#, fuzzy, kde-format +#| msgid "Loading A" +msgid "Loading A: %1" +msgstr "A betöltése" -#: pdiff.cpp:172 +#: pdiff.cpp:170 #, kde-format msgid "Loading B" msgstr "B betöltése" -#: pdiff.cpp:179 -#, kde-format -msgid "Errors occurred during pre-processing of file B." -msgstr "" - -#: pdiff.cpp:202 pdiff.cpp:241 +#: pdiff.cpp:201 pdiff.cpp:237 #, kde-format msgid "Diff: A <-> B" msgstr "Diff: A <-> B" -#: pdiff.cpp:208 pdiff.cpp:279 pdiff.cpp:293 +#: pdiff.cpp:207 pdiff.cpp:275 pdiff.cpp:289 #, kde-format msgid "Linediff: A <-> B" msgstr "Sordiff: A <-> B" -#: pdiff.cpp:225 +#: pdiff.cpp:224 #, kde-format msgid "Loading C" msgstr "C betöltése" -#: pdiff.cpp:232 -#, kde-format -msgid "Errors occurred during pre-processing of file C." -msgstr "" - -#: pdiff.cpp:250 +#: pdiff.cpp:246 #, kde-format msgid "Diff: A <-> C" msgstr "Diff: A <-> C" -#: pdiff.cpp:261 +#: pdiff.cpp:257 #, kde-format msgid "Diff: B <-> C" msgstr "Diff: B <-> C" -#: pdiff.cpp:283 pdiff.cpp:297 +#: pdiff.cpp:279 pdiff.cpp:293 #, kde-format msgid "Linediff: B <-> C" msgstr "Linediff: B <-> C" -#: pdiff.cpp:287 pdiff.cpp:301 +#: pdiff.cpp:283 pdiff.cpp:297 #, kde-format msgid "Linediff: A <-> C" msgstr "Linediff: A <-> C" -#: pdiff.cpp:829 +#: pdiff.cpp:819 #, fuzzy, kde-format 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:835 pdiff.cpp:839 pdiff.cpp:843 +#: pdiff.cpp:825 pdiff.cpp:829 pdiff.cpp:833 #, 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:853 +#: pdiff.cpp:843 #, fuzzy, kde-format #| msgid "" #| "Some inputfiles don't seem to be pure textfiles.\n" @@ -3153,17 +3162,17 @@ "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:863 +#: pdiff.cpp:853 #, kde-format msgid ", B" msgstr "" -#: pdiff.cpp:865 +#: pdiff.cpp:855 #, kde-format msgid ", C" msgstr "" -#: pdiff.cpp:867 +#: pdiff.cpp:857 #, kde-format msgid "" "Some input characters could not be converted to valid unicode.\n" @@ -3172,77 +3181,72 @@ "Affected input files are in %1." msgstr "" -#: pdiff.cpp:1034 +#: pdiff.cpp:1032 #, kde-format msgid "Abort" msgstr "Félbeszakítás" -#: pdiff.cpp:1040 pdiff.cpp:1130 +#: pdiff.cpp:1038 pdiff.cpp:1129 #, kde-format msgid "Opening files..." msgstr "Fájlok megnyitása..." -#: pdiff.cpp:1107 -#, kde-format -msgid "File open error" -msgstr "Fájlmegnyitási hiba" - -#: pdiff.cpp:1202 +#: pdiff.cpp:1212 #, kde-format msgid "Cutting selection..." msgstr "A kijelölt adatok kivágása..." -#: pdiff.cpp:1223 +#: pdiff.cpp:1233 #, kde-format msgid "Copying selection to clipboard..." msgstr "A kijelölt adatok másolása a vágólapra..." -#: pdiff.cpp:1239 +#: pdiff.cpp:1249 #, kde-format msgid "Inserting clipboard contents..." msgstr "A vágólap tartalmának beillesztése..." -#: pdiff.cpp:1695 +#: pdiff.cpp:1705 #, kde-format msgid "Word wrap (Cancel disables word wrap)" msgstr "" -#: pdiff.cpp:1696 +#: pdiff.cpp:1706 #, kde-format msgid "Calculating max width for horizontal scrollbar" msgstr "" -#: pdiff.cpp:1911 +#: pdiff.cpp:1921 #, kde-format msgid "Save && Continue" msgstr "Mentés és folytatás" -#: pdiff.cpp:1912 +#: pdiff.cpp:1922 #, kde-format msgid "Continue Without Saving" msgstr "Folytatás mentés nélkül" -#: pdiff.cpp:2124 +#: pdiff.cpp:2134 #, kde-format msgid "Search complete." msgstr "A keresés befejeződött." -#: pdiff.cpp:2124 +#: pdiff.cpp:2134 #, kde-format msgid "Search Complete" msgstr "A keresés befejeződött" -#: pdiff.cpp:2375 +#: pdiff.cpp:2385 #, kde-format msgid "Nothing is selected in either diff input window." msgstr "" -#: pdiff.cpp:2375 +#: pdiff.cpp:2385 #, fuzzy, kde-format msgid "Error while adding manual diff range" msgstr "Hiba történt egy könyvtár létrehozása közben." -#: progress.cpp:59 progress.cpp:71 +#: progress.cpp:61 progress.cpp:73 #, kde-format msgid "&Cancel" msgstr "&Mégsem" @@ -3252,191 +3256,191 @@ msgid "A (Base):" msgstr "A (alap):" -#: smalldialogs.cpp:68 smalldialogs.cpp:85 smalldialogs.cpp:102 -#: smalldialogs.cpp:144 +#: smalldialogs.cpp:71 smalldialogs.cpp:90 smalldialogs.cpp:109 +#: smalldialogs.cpp:154 #, kde-format msgid "File..." msgstr "Fájl…" -#: smalldialogs.cpp:70 smalldialogs.cpp:87 smalldialogs.cpp:104 -#: smalldialogs.cpp:146 +#: smalldialogs.cpp:73 smalldialogs.cpp:92 smalldialogs.cpp:111 +#: smalldialogs.cpp:156 #, kde-format msgid "Dir..." msgstr "Könyvtár…" -#: smalldialogs.cpp:96 +#: smalldialogs.cpp:103 #, kde-format msgid "C (Optional):" msgstr "C (opcionális):" -#: smalldialogs.cpp:119 +#: smalldialogs.cpp:126 #, fuzzy, kde-format #| msgid "Swap/Copy Names ..." msgid "Swap/Copy Names..." msgstr "Nevek cseréje/másolása …" -#: smalldialogs.cpp:124 smalldialogs.cpp:125 smalldialogs.cpp:126 +#: smalldialogs.cpp:131 smalldialogs.cpp:132 smalldialogs.cpp:133 #, kde-format msgid "Swap %1<->%2" msgstr "Csere: %1<->%2" -#: smalldialogs.cpp:127 smalldialogs.cpp:128 smalldialogs.cpp:129 +#: smalldialogs.cpp:134 smalldialogs.cpp:135 smalldialogs.cpp:136 #, kde-format msgid "Copy %1->Output" msgstr "Másolás: %1->Kimenet" -#: smalldialogs.cpp:130 smalldialogs.cpp:131 smalldialogs.cpp:132 +#: smalldialogs.cpp:137 smalldialogs.cpp:138 smalldialogs.cpp:139 #, kde-format msgid "Swap %1<->Output" msgstr "Csere: %1<->Kimenet" -#: smalldialogs.cpp:138 +#: smalldialogs.cpp:148 #, kde-format msgid "Output (optional):" msgstr "Kimenet (opcionális):" -#: smalldialogs.cpp:168 +#: smalldialogs.cpp:178 #, kde-format msgid "Configure..." msgstr "Beállítás…" -#: smalldialogs.cpp:233 +#: smalldialogs.cpp:243 #, fuzzy, kde-format #| msgid "Directory" msgid "Open Directory" msgstr "Könyvtár" -#: smalldialogs.cpp:234 +#: smalldialogs.cpp:244 #, kde-format msgid "Select Output File" msgstr "" -#: smalldialogs.cpp:393 +#: smalldialogs.cpp:403 #, kde-format msgid "Search text:" msgstr "Szöveg keresése:" -#: smalldialogs.cpp:400 +#: smalldialogs.cpp:410 #, kde-format msgid "Case sensitive" msgstr "Nagybetűérzékeny" -#: smalldialogs.cpp:403 +#: smalldialogs.cpp:413 #, kde-format msgid "Search A" msgstr "A keresése" -#: smalldialogs.cpp:408 +#: smalldialogs.cpp:418 #, kde-format msgid "Search B" msgstr "B keresése" -#: smalldialogs.cpp:413 +#: smalldialogs.cpp:423 #, kde-format msgid "Search C" msgstr "C keresése" -#: smalldialogs.cpp:418 +#: smalldialogs.cpp:428 #, kde-format msgid "Search output" msgstr "A keresés kimenete" -#: smalldialogs.cpp:425 +#: smalldialogs.cpp:435 #, kde-format msgid "&Search" msgstr "&Keresés" -#: smalldialogs.cpp:444 +#: smalldialogs.cpp:454 #, kde-format msgid "Regular Expression Tester" msgstr "Reguláris kifejezés tesztelő" -#: smalldialogs.cpp:457 +#: smalldialogs.cpp:467 #, kde-format msgid "Example auto merge line:" msgstr "" -#: smalldialogs.cpp:459 +#: smalldialogs.cpp:469 #, kde-format msgid "To test auto merge, copy a line as used in your files." msgstr "" -#: smalldialogs.cpp:465 smalldialogs.cpp:493 smalldialogs.cpp:529 +#: smalldialogs.cpp:475 smalldialogs.cpp:503 smalldialogs.cpp:539 #, kde-format msgid "Match result:" msgstr "" -#: smalldialogs.cpp:484 +#: smalldialogs.cpp:494 #, kde-format msgid "Example history start line (with leading comment):" msgstr "" -#: smalldialogs.cpp:486 +#: smalldialogs.cpp:496 #, kde-format msgid "" "Copy a history start line as used in your files,\n" "including the leading comment." msgstr "" -#: smalldialogs.cpp:512 +#: smalldialogs.cpp:522 #, kde-format msgid "History sort key order:" msgstr "" -#: smalldialogs.cpp:520 +#: smalldialogs.cpp:530 #, kde-format msgid "Example history entry start line (without leading comment):" msgstr "" -#: smalldialogs.cpp:522 +#: smalldialogs.cpp:532 #, kde-format msgid "" "Copy a history entry start line as used in your files,\n" "but omit the leading comment." msgstr "" -#: smalldialogs.cpp:536 +#: smalldialogs.cpp:546 #, kde-format msgid "Sort key result:" msgstr "" -#: smalldialogs.cpp:584 smalldialogs.cpp:594 smalldialogs.cpp:614 +#: smalldialogs.cpp:594 smalldialogs.cpp:604 smalldialogs.cpp:624 #, kde-format msgid "Match success." msgstr "" -#: smalldialogs.cpp:588 smalldialogs.cpp:598 smalldialogs.cpp:620 +#: smalldialogs.cpp:598 smalldialogs.cpp:608 smalldialogs.cpp:630 #, fuzzy, kde-format msgid "Match failed." msgstr "A mentés nem sikerült." -#: smalldialogs.cpp:605 +#: smalldialogs.cpp:615 #, kde-format msgid "Opening and closing parentheses do not match in regular expression." msgstr "" -#: SourceData.cpp:150 +#: SourceData.cpp:153 #, kde-format msgid "Writing clipboard data to temp file failed." msgstr "A vágólap adatának írása ideiglenes fájlba nem sikerült." -#: SourceData.cpp:154 +#: SourceData.cpp:157 #, kde-format msgid "From Clipboard" msgstr "A vágólapról" -#: SourceData.cpp:335 +#: SourceData.cpp:348 #, fuzzy, kde-format #| msgid "Mix of links and normal files." msgid "%1 is not a normal file." msgstr "Linkek és normál fájlok vegyesen." -#: SourceData.cpp:427 +#: SourceData.cpp:440 #, kde-format msgid " Temp file is: %1" msgstr "" -#: SourceData.cpp:432 +#: SourceData.cpp:445 #, kde-format msgid "" "Preprocessing possibly failed. Check this command:\n" @@ -3451,12 +3455,12 @@ "\n" "Az előfeldolgozási parancs most le lesz tiltva." -#: SourceData.cpp:443 SourceData.cpp:512 +#: SourceData.cpp:456 SourceData.cpp:525 #, kde-format msgid "File %1 too large to process. Skipping." msgstr "" -#: SourceData.cpp:487 +#: SourceData.cpp:500 #, kde-format msgid "" "The line-matching-preprocessing possibly failed. Check this command:\n" diff -Nru kdiff3-1.8.01/po/ia/diff_ext.po kdiff3-1.8.3/po/ia/diff_ext.po --- kdiff3-1.8.01/po/ia/diff_ext.po 1970-01-01 00:00:00.000000000 +0000 +++ kdiff3-1.8.3/po/ia/diff_ext.po 2020-06-25 00:18:26.000000000 +0000 @@ -0,0 +1,128 @@ +# Copyright (C) YEAR This file is copyright: +# This file is distributed under the same license as the kdiff3 package. +# +# giovanni , 2020. +msgid "" +msgstr "" +"Project-Id-Version: kdiff3\n" +"Report-Msgid-Bugs-To: https://bugs.kde.org\n" +"POT-Creation-Date: 2019-11-04 07:54+0100\n" +"PO-Revision-Date: 2020-02-06 22:24+0100\n" +"Last-Translator: Giovanni Sora \n" +"Language-Team: Interlingua \n" +"Language: ia\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=n != 1;\n" +"X-Generator: Lokalize 2.0\n" + +#: diff_ext.cpp:223 +#, kde-format +msgid "Compare with %1" +msgstr "Compara con %1" + +#: diff_ext.cpp:224 +#, kde-format +msgid "Merge with %1" +msgstr "Fusiona con %1" + +#: diff_ext.cpp:234 +#, kde-format +msgid "3-way merge with base" +msgstr "" + +#: diff_ext.cpp:237 +#, kde-format +msgid "Save '%1' for later" +msgstr "" + +#: diff_ext.cpp:251 +#, kde-format +msgid "Compare with ..." +msgstr "Compara con ..." + +#: diff_ext.cpp:254 +#, kde-format +msgid "Clear list" +msgstr "Netta lista" + +#: diff_ext.cpp:259 +#, kde-format +msgid "Compare" +msgstr "Compara" + +#: diff_ext.cpp:263 +#, kde-format +msgid "3 way comparison" +msgstr "" + +#: diff_ext.cpp:269 +#, kde-format +msgid "About Diff-Ext ..." +msgstr "" + +#: diff_ext.cpp:340 +#, kde-format +msgid "(32 Bit)" +msgstr "(32 Bit)" + +#: diff_ext.cpp:342 +#, kde-format +msgid "Diff-Ext Copyright (c) 2003-2006, Sergey Zorin. All rights reserved.\n" +msgstr "Diff-Ext Copyright (c) 2003-2006, Sergey Zorin. All rights reserved.\n" + +#: diff_ext.cpp:343 +#, kde-format +msgid "This software is distributable under the BSD-2-Clause license.\n" +msgstr "" + +#: diff_ext.cpp:344 +#, kde-format +msgid "Some extensions for KDiff3 (c) 2006-2013 by Joachim Eibl.\n" +msgstr "" + +#: diff_ext.cpp:345 +#, kde-format +msgid "Homepage for Diff-Ext: http://diff-ext.sourceforge.net\n" +msgstr "" + +#: diff_ext.cpp:346 +#, kde-format +msgid "About Diff-Ext for KDiff3 " +msgstr "A proposito de Diff-Ext per KDiff3 " + +#: diff_ext.cpp:375 +#, kde-format +msgid "Compare selected files" +msgstr "Compara files seligite" + +#: diff_ext.cpp:381 diff_ext.cpp:399 +#, kde-format +msgid "Compare '%1' with '%2'" +msgstr "Compara '%1' con '%2'" + +#: diff_ext.cpp:386 +#, kde-format +msgid "Save '%1' for later operation" +msgstr "" + +#: diff_ext.cpp:440 +#, kde-format +msgid "Could not start KDiff3. Please rerun KDiff3 installation." +msgstr "" + +#: diff_ext.cpp:441 +#, kde-format +msgid "Command" +msgstr "Commando" + +#: diff_ext.cpp:442 +#, kde-format +msgid "CommandLine" +msgstr "LineaDeCommando" + +#: diff_ext.cpp:443 +#, kde-format +msgid "Diff-Ext For KDiff3" +msgstr "" \ No newline at end of file diff -Nru kdiff3-1.8.01/po/ia/kdiff3fileitemactionplugin.po kdiff3-1.8.3/po/ia/kdiff3fileitemactionplugin.po --- kdiff3-1.8.01/po/ia/kdiff3fileitemactionplugin.po 1970-01-01 00:00:00.000000000 +0000 +++ kdiff3-1.8.3/po/ia/kdiff3fileitemactionplugin.po 2020-06-25 00:18:26.000000000 +0000 @@ -0,0 +1,92 @@ +# Copyright (C) YEAR This file is copyright: +# This file is distributed under the same license as the kdiff3 package. +# +# giovanni , 2020. +msgid "" +msgstr "" +"Project-Id-Version: kdiff3\n" +"Report-Msgid-Bugs-To: https://bugs.kde.org\n" +"POT-Creation-Date: 2019-08-30 07:40+0200\n" +"PO-Revision-Date: 2020-02-06 17:31+0100\n" +"Last-Translator: giovanni \n" +"Language-Team: Interlingua \n" +"Language: ia\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=n != 1;\n" +"X-Generator: Lokalize 18.12.3\n" + +#: kdiff3fileitemaction.cpp:92 +#, kde-format +msgid "KDiff3..." +msgstr "KDiff3..." + +#: kdiff3fileitemaction.cpp:124 +#, kde-format +msgid "Compare with %1" +msgstr "Compara con %1" + +#: kdiff3fileitemaction.cpp:130 +#, kde-format +msgid "Merge with %1" +msgstr "" + +#: kdiff3fileitemaction.cpp:136 +#, kde-format +msgid "Save '%1' for later" +msgstr "" + +#: kdiff3fileitemaction.cpp:142 +#, kde-format +msgid "3-way merge with base" +msgstr "" + +#: kdiff3fileitemaction.cpp:149 +#, kde-format +msgid "Compare with..." +msgstr "Compara con ..." + +#: kdiff3fileitemaction.cpp:161 +#, kde-format +msgid "Clear list" +msgstr "Netta lista" + +#: kdiff3fileitemaction.cpp:169 +#, kde-format +msgid "Compare" +msgstr "Compara" + +#: kdiff3fileitemaction.cpp:175 +#, kde-format +msgid "3 way comparison" +msgstr "" + +#: kdiff3fileitemaction.cpp:179 +#, kde-format +msgid "About KDiff3 menu plugin..." +msgstr "" + +#: kdiff3fileitemaction.cpp:287 +#, kde-format +msgid "KDiff3 File Item Action Plugin: Copyright (C) 2011 Joachim Eibl\n" +msgstr "" + +#: kdiff3fileitemaction.cpp:288 +#, kde-format +msgid "" +"Using the context menu extension:\n" +"For simple comparison of two selected 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 " +"the 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." +msgstr "" + +#: kdiff3fileitemaction.cpp:296 +#, kde-format +msgid "About KDiff3 File Item Action Plugin" +msgstr "" \ No newline at end of file diff -Nru kdiff3-1.8.01/po/ia/kdiff3.po kdiff3-1.8.3/po/ia/kdiff3.po --- kdiff3-1.8.01/po/ia/kdiff3.po 1970-01-01 00:00:00.000000000 +0000 +++ kdiff3-1.8.3/po/ia/kdiff3.po 2020-06-25 00:18:26.000000000 +0000 @@ -0,0 +1,3242 @@ +# Copyright (C) YEAR This file is copyright: +# This file is distributed under the same license as the kdiff3 package. +# +# giovanni , 2020. +msgid "" +msgstr "" +"Project-Id-Version: kdiff3\n" +"Report-Msgid-Bugs-To: https://bugs.kde.org\n" +"POT-Creation-Date: 2020-06-22 07:48+0200\n" +"PO-Revision-Date: 2020-02-08 22:21+0100\n" +"Last-Translator: Giovanni Sora \n" +"Language-Team: Interlingua \n" +"Language: ia\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=n != 1;\n" +"X-Generator: Lokalize 2.0\n" + +#, kde-format +msgctxt "NAME OF TRANSLATORS" +msgid "Your names" +msgstr "Giovanni Sora" + +#, kde-format +msgctxt "EMAIL OF TRANSLATORS" +msgid "Your emails" +msgstr "g.sora@tiscali.it" + +#: difftextwindow.cpp:414 +#, kde-format +msgid "File %1: Line %2" +msgstr "File %1: Linea %2" + +#: difftextwindow.cpp:416 +#, kde-format +msgid "File %1: Line not available" +msgstr "File %1: Linea non disponibile" + +#: difftextwindow.cpp:1778 +#, kde-format +msgid "Encoding:" +msgstr "Codifica:" + +#: difftextwindow.cpp:1781 mergeresultwindow.cpp:3166 optiondialog.cpp:840 +#, kde-format +msgid "Line end style:" +msgstr "Stilo de fin linea:" + +#: difftextwindow.cpp:1809 directorymergewindow.cpp:383 +#: directorymergewindow.cpp:434 directorymergewindow.cpp:525 +#: directorymergewindow.cpp:3072 directorymergewindow.cpp:3203 +#: directorymergewindow.cpp:3431 mergeresultwindow.cpp:970 +#: mergeresultwindow.cpp:972 mergeresultwindow.cpp:974 +#: mergeresultwindow.cpp:976 mergeresultwindow.cpp:1842 +#: mergeresultwindow.cpp:3198 mergeresultwindow.cpp:3205 optiondialog.cpp:1002 +#: optiondialog.cpp:1015 pdiff.cpp:823 pdiff.cpp:825 pdiff.cpp:827 +#: pdiff.cpp:829 pdiff.cpp:851 smalldialogs.cpp:131 smalldialogs.cpp:133 +#: smalldialogs.cpp:134 smalldialogs.cpp:137 +#, kde-format +msgid "A" +msgstr "A" + +#: difftextwindow.cpp:1809 directorymergewindow.cpp:385 +#: directorymergewindow.cpp:437 directorymergewindow.cpp:527 +#: directorymergewindow.cpp:3078 directorymergewindow.cpp:3204 +#: directorymergewindow.cpp:3432 mergeresultwindow.cpp:970 +#: mergeresultwindow.cpp:972 mergeresultwindow.cpp:978 +#: mergeresultwindow.cpp:980 mergeresultwindow.cpp:1844 +#: mergeresultwindow.cpp:3200 mergeresultwindow.cpp:3207 optiondialog.cpp:1003 +#: optiondialog.cpp:1016 pdiff.cpp:823 pdiff.cpp:825 pdiff.cpp:831 +#: pdiff.cpp:833 pdiff.cpp:853 smalldialogs.cpp:131 smalldialogs.cpp:132 +#: smalldialogs.cpp:135 smalldialogs.cpp:138 +#, kde-format +msgid "B" +msgstr "B" + +#: difftextwindow.cpp:1809 directorymergewindow.cpp:387 +#: directorymergewindow.cpp:440 directorymergewindow.cpp:529 +#: directorymergewindow.cpp:3084 directorymergewindow.cpp:3205 +#: directorymergewindow.cpp:3433 mergeresultwindow.cpp:974 +#: mergeresultwindow.cpp:976 mergeresultwindow.cpp:978 +#: mergeresultwindow.cpp:980 mergeresultwindow.cpp:1846 +#: mergeresultwindow.cpp:3202 mergeresultwindow.cpp:3209 optiondialog.cpp:1017 +#: pdiff.cpp:827 pdiff.cpp:829 pdiff.cpp:831 pdiff.cpp:833 pdiff.cpp:855 +#: smalldialogs.cpp:132 smalldialogs.cpp:133 smalldialogs.cpp:136 +#: smalldialogs.cpp:139 +#, kde-format +msgid "C" +msgstr "C" + +#: difftextwindow.cpp:1809 +#, kde-format +msgid "A (Base)" +msgstr "A (Base)" + +#: difftextwindow.cpp:1811 +#, kde-format +msgid "Encoding: %1" +msgstr "Codifica: %1" + +#: difftextwindow.cpp:1812 mergeresultwindow.cpp:3211 +#, kde-format +msgid "Unix" +msgstr "Unix" + +#: difftextwindow.cpp:1812 mergeresultwindow.cpp:3212 +#, kde-format +msgid "DOS" +msgstr "DOS" + +#: difftextwindow.cpp:1812 +#, kde-format +msgid "Line end style: %1" +msgstr "Stilo de fin linea: %1" + +#: difftextwindow.cpp:1834 kdiff3.cpp:874 +#, kde-format +msgid "Top line" +msgstr "Linea superior" + +#: difftextwindow.cpp:1843 +#, kde-format +msgid "End" +msgstr "Fin" + +#: difftextwindow.cpp:1901 smalldialogs.cpp:245 +#, kde-format +msgid "Open File" +msgstr "Aperi file" + +#: difftextwindow.cpp:1943 optiondialog.cpp:389 +#, kde-format +msgid "Unicode, 8 bit" +msgstr "Unicode, 8 bit" + +#: difftextwindow.cpp:1958 +#, kde-format +msgid "Other" +msgstr "Altere" + +#: directorymergewindow.cpp:410 directorymergewindow.cpp:3438 +#, kde-format +msgid "Copy A to B" +msgstr "Copia A in B" + +#: directorymergewindow.cpp:413 directorymergewindow.cpp:3439 +#, kde-format +msgid "Copy B to A" +msgstr "Copia B in A" + +#: directorymergewindow.cpp:416 directorymergewindow.cpp:3440 +#, kde-format +msgid "Delete A" +msgstr "Dele A" + +#: directorymergewindow.cpp:419 directorymergewindow.cpp:3441 +#, kde-format +msgid "Delete B" +msgstr "Dele B" + +#: directorymergewindow.cpp:422 +#, kde-format +msgid "Delete A & B" +msgstr "Dele A & B" + +#: directorymergewindow.cpp:425 directorymergewindow.cpp:3443 +#, kde-format +msgid "Merge to A" +msgstr "Fusiona in A" + +#: directorymergewindow.cpp:428 directorymergewindow.cpp:3444 +#, kde-format +msgid "Merge to B" +msgstr "Fusiona in B" + +#: directorymergewindow.cpp:431 +#, kde-format +msgid "Merge to A & B" +msgstr "Fusiona in A & B" + +#: directorymergewindow.cpp:443 directorymergewindow.cpp:3435 +#, kde-format +msgid "Delete (if exists)" +msgstr "Dele (si existe)" + +#: directorymergewindow.cpp:446 directorymergewindow.cpp:449 +#: directorymergewindow.cpp:3434 smalldialogs.cpp:120 +#, kde-format +msgid "Merge" +msgstr "Fusiona" + +#: directorymergewindow.cpp:446 directorymergewindow.cpp:449 +#, kde-format +msgid "Merge (manual)" +msgstr "Fusiona (manual)" + +#: directorymergewindow.cpp:452 +#, kde-format +msgid "Error: Conflicting File Types" +msgstr "" + +#: directorymergewindow.cpp:455 +#, kde-format +msgid "Error: Changed and Deleted" +msgstr "" + +#: directorymergewindow.cpp:458 +#, kde-format +msgid "Error: Dates are equal but files are not." +msgstr "" + +#: directorymergewindow.cpp:472 +#, kde-format +msgid "Done" +msgstr "Facite" + +#: directorymergewindow.cpp:474 +#, kde-format +msgid "Error" +msgstr "Error" + +#: directorymergewindow.cpp:476 +#, kde-format +msgid "Skipped." +msgstr "Saltate." + +#: directorymergewindow.cpp:478 +#, kde-format +msgid "Not saved." +msgstr "Non salveguardate." + +#: directorymergewindow.cpp:480 +#, kde-format +msgid "In progress..." +msgstr "In progresso..." + +#: directorymergewindow.cpp:482 +#, kde-format +msgid "To do." +msgstr "De facer." + +#: directorymergewindow.cpp:523 +#, kde-format +msgid "Name" +msgstr "Nomine" + +#: directorymergewindow.cpp:531 +#, kde-format +msgid "Operation" +msgstr "Operation" + +#: directorymergewindow.cpp:533 +#, kde-format +msgid "Status" +msgstr "Stato" + +#: directorymergewindow.cpp:535 +#, kde-format +msgid "Unsolved" +msgstr "Non resolvite" + +#: directorymergewindow.cpp:537 +#, kde-format +msgid "Solved" +msgstr "Resolvite" + +#: directorymergewindow.cpp:539 +#, kde-format +msgid "Nonwhite" +msgstr "" + +#: directorymergewindow.cpp:541 +#, kde-format +msgid "White" +msgstr "Blanco" + +#: directorymergewindow.cpp:676 +#, kde-format +msgid "Unable to compare non-normal file with normal file." +msgstr "" + +#: directorymergewindow.cpp:690 +#, kde-format +msgid "Mix of links and normal files." +msgstr "" + +#: directorymergewindow.cpp:697 +#, kde-format +msgid "Link: " +msgstr "Ligamine: " + +#: directorymergewindow.cpp:706 +#, kde-format +msgid "Size. " +msgstr "Dimension. " + +#: directorymergewindow.cpp:720 directorymergewindow.cpp:730 +#, kde-format +msgid "Date & Size: " +msgstr "Data & Grandor:" + +#: directorymergewindow.cpp:751 +#, kde-format +msgid "Comparing file..." +msgstr "Comparante file..." + +#: directorymergewindow.cpp:813 +#, kde-format +msgid "" +"You are currently doing a directory merge. Are you sure, you want to abort " +"the merge and rescan the directory?" +msgstr "" + +#: directorymergewindow.cpp:814 kdiff3.cpp:697 kdiff3.cpp:707 kdiff3.cpp:719 +#: mergeresultwindow.cpp:400 pdiff.cpp:1031 pdiff.cpp:1920 pdiff.cpp:1930 +#, kde-format +msgid "Warning" +msgstr "Aviso" + +#: directorymergewindow.cpp:815 directorymergewindow.cpp:3407 +#, kde-format +msgid "Rescan" +msgstr "Re-examina" + +#: directorymergewindow.cpp:816 pdiff.cpp:1033 +#, kde-format +msgid "Continue Merging" +msgstr "Continua fusionar" + +#: directorymergewindow.cpp:984 +#, kde-format +msgid "Opening of directories failed:" +msgstr "Il falleva aperir directorios:" + +#: directorymergewindow.cpp:988 +#, kde-format +msgid "Dir A \"%1\" does not exist or is not a directory.\n" +msgstr "Dir A \"%1\" non existe o non es un directorio.\n" + +#: directorymergewindow.cpp:993 +#, kde-format +msgid "Dir B \"%1\" does not exist or is not a directory.\n" +msgstr "Dir B \"%1\" non existe o non es un directorio.\n" + +#: directorymergewindow.cpp:998 +#, kde-format +msgid "Dir C \"%1\" does not exist or is not a directory.\n" +msgstr "Dir C \"%1\" non existe o non es un directorio.\n" + +#: directorymergewindow.cpp:1001 +#, kde-format +msgid "Directory Open Error" +msgstr "Error de aperir directorio" + +#: directorymergewindow.cpp:1009 +#, kde-format +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:1011 +#, kde-format +msgid "Parameter Warning" +msgstr "Aviso de parametro" + +#: directorymergewindow.cpp:1016 +#, kde-format +msgid "Scanning directories..." +msgstr "" + +#: directorymergewindow.cpp:1042 +#, kde-format +msgid "Reading Directory A" +msgstr "Legente directorio A" + +#: directorymergewindow.cpp:1051 +#, kde-format +msgid "Reading Directory B" +msgstr "Legente directorio B" + +#: directorymergewindow.cpp:1061 +#, kde-format +msgid "Reading Directory C" +msgstr "Legente directorio C" + +#: directorymergewindow.cpp:1077 +#, kde-format +msgid "Some subdirectories were not readable in" +msgstr "" + +#: directorymergewindow.cpp:1082 +#, kde-format +msgid "Check the permissions of the subdirectories." +msgstr "" + +#: directorymergewindow.cpp:1119 kdiff3.cpp:665 kdiff3.cpp:752 kdiff3.cpp:776 +#: kdiff3.cpp:1072 kdiff3.cpp:1093 pdiff.cpp:1115 pdiff.cpp:1178 pdiff.cpp:1228 +#: pdiff.cpp:1244 pdiff.cpp:1287 pdiff.cpp:1311 +#, kde-format +msgid "Ready." +msgstr "Preste." + +#: directorymergewindow.cpp:1134 +#, kde-format +msgid "" +"Directory Comparison Status\n" +"\n" +"Number of subdirectories: %1\n" +"Number of equal files: %2\n" +"Number of different files: %3" +msgstr "" + +#: directorymergewindow.cpp:1141 +#, kde-format +msgid "Number of manual merges: %1" +msgstr "" + +#: directorymergewindow.cpp:1407 +#, kde-format +msgid "This affects all merge operations." +msgstr "" + +#: directorymergewindow.cpp:1408 +#, kde-format +msgid "Changing All Merge Operations" +msgstr "" + +#: directorymergewindow.cpp:1708 +#, kde-format +msgid "" +"Processing %1 / %2\n" +"%3" +msgstr "" +"Processante %1 / %2\n" +"%3" + +#: directorymergewindow.cpp:1751 directorymergewindow.cpp:1755 +#, kde-format +msgid "Some files could not be processed." +msgstr "Alcun files non poteva esser processate." + +#: directorymergewindow.cpp:2235 directorymergewindow.cpp:2260 +#: directorymergewindow.cpp:2285 +#, kde-format +msgid "This operation is currently not possible." +msgstr "Iste operation actualmente non es possibile." + +#: directorymergewindow.cpp:2235 directorymergewindow.cpp:2260 +#: directorymergewindow.cpp:2285 directorymergewindow.cpp:2565 +#, kde-format +msgid "Operation Not Possible" +msgstr "Operation non possibile" + +#: directorymergewindow.cpp:2332 +#, kde-format +msgid "An error occurred while copying." +msgstr "Un error occurreva durante que on copiava." + +#: directorymergewindow.cpp:2333 directorymergewindow.cpp:2772 +#, kde-format +msgid "Merge Error" +msgstr "Fusiona error" + +#: directorymergewindow.cpp:2410 +#, kde-format +msgid "Unknown merge operation. (This must never happen!)" +msgstr "" + +#: directorymergewindow.cpp:2455 +#, kde-format +msgid "Unknown merge operation." +msgstr "Incognite operation de fusion." + +#: directorymergewindow.cpp:2468 +#, kde-format +msgid "" +"The merge is about to begin.\n" +"\n" +"Choose \"Do it\" if you have read the instructions and know what you are " +"doing.\n" +"Choosing \"Simulate it\" will tell you what would happen.\n" +"\n" +"Be aware that this program still has beta status and there is NO WARRANTY " +"whatsoever! Make backups of your vital data!" +msgstr "" + +#: directorymergewindow.cpp:2473 +#, kde-format +msgid "Starting Merge" +msgstr "Initiante fusion" + +#: directorymergewindow.cpp:2474 +#, kde-format +msgid "Do It" +msgstr "Face lo" + +#: directorymergewindow.cpp:2475 +#, kde-format +msgid "Simulate It" +msgstr "" + +#: directorymergewindow.cpp:2501 +#, kde-format +msgid "" +"The highlighted item has a different type in the different directories. " +"Select what to do." +msgstr "" + +#: directorymergewindow.cpp:2505 +#, kde-format +msgid "" +"The modification dates of the file are equal but the files are not. Select " +"what to do." +msgstr "" + +#: directorymergewindow.cpp:2509 +#, kde-format +msgid "" +"The highlighted item was changed in one directory and deleted in the other. " +"Select what to do." +msgstr "" + +#: directorymergewindow.cpp:2565 +#, kde-format +msgid "" +"This operation is currently not possible because directory merge is " +"currently running." +msgstr "" + +#: directorymergewindow.cpp:2622 +#, kde-format +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:2624 +#, kde-format +msgid "Continue merge after an error" +msgstr "Continua fusionar post un error" + +#: directorymergewindow.cpp:2625 +#, kde-format +msgid "Continue With Last Item" +msgstr "Continua con ultime elemento" + +#: directorymergewindow.cpp:2626 +#, kde-format +msgid "Skip Item" +msgstr "Salta elemento" + +#: directorymergewindow.cpp:2722 +#, kde-format +msgid "Merge operation complete." +msgstr "Operation de fusion complete." + +#: directorymergewindow.cpp:2722 directorymergewindow.cpp:2725 +#, kde-format +msgid "Merge Complete" +msgstr "Fusion complete" + +#: directorymergewindow.cpp:2735 +#, kde-format +msgid "" +"Simulated merge complete: Check if you agree with the proposed operations." +msgstr "" + +#: directorymergewindow.cpp:2771 +#, kde-format +msgid "An error occurred. Press OK to see detailed information." +msgstr "" + +#: directorymergewindow.cpp:2804 +#, kde-format +msgid "Error: While deleting %1: Creating backup failed." +msgstr "" + +#: directorymergewindow.cpp:2811 +#, kde-format +msgid "delete directory recursively( %1 )" +msgstr "" + +#: directorymergewindow.cpp:2813 +#, kde-format +msgid "delete( %1 )" +msgstr "Dele( %1 )" + +#: directorymergewindow.cpp:2828 +#, kde-format +msgid "Error: delete dir operation failed while trying to read the directory." +msgstr "" + +#: directorymergewindow.cpp:2847 +#, kde-format +msgid "Error: rmdir( %1 ) operation failed." +msgstr "" + +#: directorymergewindow.cpp:2857 +#, kde-format +msgid "Error: delete operation failed." +msgstr "" + +#: directorymergewindow.cpp:2884 +#, kde-format +msgid "manual merge( %1, %2, %3 -> %4)" +msgstr "fusion manual ( %1, %2, %3 -> %4)" + +#: directorymergewindow.cpp:2887 +#, kde-format +msgid "" +" Note: After a manual merge the user should continue by pressing F7." +msgstr "" + +#: directorymergewindow.cpp:2914 +#, kde-format +msgid "Error: copy( %1 -> %2 ) failed.Deleting existing destination failed." +msgstr "" + +#: directorymergewindow.cpp:2923 +#, kde-format +msgid "copyLink( %1 -> %2 )" +msgstr "copyLink( %1 -> %2 )" + +#: directorymergewindow.cpp:2932 +#, kde-format +msgid "Error: copyLink failed: Remote links are not yet supported." +msgstr "" + +#: directorymergewindow.cpp:2942 +#, kde-format +msgid "Error: copyLink failed." +msgstr "" + +#: directorymergewindow.cpp:2967 +#, kde-format +msgid "copy( %1 -> %2 )" +msgstr "Copia( %1 -> %2 )" + +#: directorymergewindow.cpp:2993 +#, kde-format +msgid "Error during rename( %1 -> %2 ): Cannot delete existing destination." +msgstr "" + +#: directorymergewindow.cpp:3000 +#, kde-format +msgid "rename( %1 -> %2 )" +msgstr "Renomina( %1 -> %2 )" + +#: directorymergewindow.cpp:3009 +#, kde-format +msgid "Error: Rename failed." +msgstr "Error: falleva a renominar." + +#: directorymergewindow.cpp:3027 +#, kde-format +msgid "Error during makeDir of %1. Cannot delete existing file." +msgstr "" + +#: directorymergewindow.cpp:3044 +#, kde-format +msgid "makeDir( %1 )" +msgstr "makeDir( %1 )" + +#: directorymergewindow.cpp:3054 +#, kde-format +msgid "Error while creating directory." +msgstr "Error quando creava directorio." + +#: directorymergewindow.cpp:3090 directorymergewindow.cpp:3209 +#, kde-format +msgid "Dest" +msgstr "Dest" + +#: directorymergewindow.cpp:3098 directorymergewindow.cpp:3127 +#, kde-format +msgid "Dir" +msgstr "Dir" + +#: directorymergewindow.cpp:3098 +#, kde-format +msgid "Type" +msgstr "Typo" + +#: directorymergewindow.cpp:3098 +#, kde-format +msgid "Size" +msgstr "Dimension" + +#: directorymergewindow.cpp:3099 +#, kde-format +msgid "Attr" +msgstr "Attr" + +#: directorymergewindow.cpp:3099 +#, kde-format +msgid "Last Modification" +msgstr "Ultime modification" + +#: directorymergewindow.cpp:3099 +#, kde-format +msgid "Link-Destination" +msgstr "Ligamine-Destination" + +#: directorymergewindow.cpp:3127 +#, kde-format +msgid "File" +msgstr "File" + +#: directorymergewindow.cpp:3127 +#, kde-format +msgid "-Link" +msgstr "-Ligamine" + +#: directorymergewindow.cpp:3133 +#, kde-format +msgid "not available" +msgstr "Non disponibile" + +#: directorymergewindow.cpp:3151 +#, kde-format +msgid "A (Dest): " +msgstr "A(Dest): " + +#: directorymergewindow.cpp:3155 +#, kde-format +msgid "A: " +msgstr "A: " + +#: directorymergewindow.cpp:3155 +#, kde-format +msgid "A (Base): " +msgstr "A (Base): " + +#: directorymergewindow.cpp:3161 +#, kde-format +msgid "B (Dest): " +msgstr "B (Dest): " + +#: directorymergewindow.cpp:3165 +#, kde-format +msgid "B: " +msgstr " B: " + +#: directorymergewindow.cpp:3170 +#, kde-format +msgid "C (Dest): " +msgstr "C (Dest): " + +#: directorymergewindow.cpp:3174 +#, kde-format +msgid "C: " +msgstr "C: " + +#: directorymergewindow.cpp:3177 +#, kde-format +msgid "Dest: " +msgstr "Dest: " + +#. i18n("Saving Directory Merge State ...")); +#: directorymergewindow.cpp:3252 +#, kde-format +msgid "Save Directory Merge State As..." +msgstr "" + +#: directorymergewindow.cpp:3401 +#, kde-format +msgid "Start/Continue Directory Merge" +msgstr "" + +#: directorymergewindow.cpp:3402 +#, kde-format +msgid "Run Operation for Current Item" +msgstr "" + +#: directorymergewindow.cpp:3403 +#, kde-format +msgid "Compare Selected File" +msgstr "Compara file seligite" + +#: directorymergewindow.cpp:3404 +#, kde-format +msgid "Merge Current File" +msgstr "Fusiona file currente" + +#: directorymergewindow.cpp:3404 +#, kde-format +msgid "" +"Merge\n" +"File" +msgstr "" +"Fusiona\n" +"File" + +#: directorymergewindow.cpp:3405 +#, kde-format +msgid "Fold All Subdirs" +msgstr "" + +#: directorymergewindow.cpp:3406 +#, kde-format +msgid "Unfold All Subdirs" +msgstr "" + +#. i18n("Save Directory Merge State ..."), 0, this, &DirectoryMergeWindow::slotSaveMergeState, ac, "dir_save_merge_state"); +#. i18n("Load Directory Merge State ..."), 0, this, &DirectoryMergeWindow::slotLoadMergeState, ac, "dir_load_merge_state"); +#: directorymergewindow.cpp:3410 +#, kde-format +msgid "Choose A for All Items" +msgstr "Selige A per omne elementos" + +#: directorymergewindow.cpp:3411 +#, kde-format +msgid "Choose B for All Items" +msgstr "Selige B per omne elementos" + +#: directorymergewindow.cpp:3412 +#, kde-format +msgid "Choose C for All Items" +msgstr "Selige C per omne elementos" + +#: directorymergewindow.cpp:3413 +#, kde-format +msgid "Auto-Choose Operation for All Items" +msgstr "" + +#: directorymergewindow.cpp:3414 +#, kde-format +msgid "No Operation for All Items" +msgstr "" + +#. i18n("Synchronize Directories"), 0, this, &DirectoryMergeWindow::slotSynchronizeDirectories, ac, "dir_synchronize_directories"); +#. d->m_pDirChooseNewerFiles = GuiUtils::createAction< KToggleAction >(i18n("Copy Newer Files Instead of Merging"), 0, this, &DirectoryMergeWindow::slotChooseNewerFiles, ac, "dir_choose_newer_files"); +#: directorymergewindow.cpp:3419 +#, kde-format +msgid "Show Identical Files" +msgstr "" + +#: directorymergewindow.cpp:3419 +#, kde-format +msgid "" +"Identical\n" +"Files" +msgstr "" + +#: directorymergewindow.cpp:3420 +#, kde-format +msgid "Show Different Files" +msgstr "" + +#: directorymergewindow.cpp:3421 +#, kde-format +msgid "Show Files only in A" +msgstr "" + +#: directorymergewindow.cpp:3421 +#, kde-format +msgid "" +"Files\n" +"only in A" +msgstr "" + +#: directorymergewindow.cpp:3422 +#, kde-format +msgid "Show Files only in B" +msgstr "" + +#: directorymergewindow.cpp:3422 +#, kde-format +msgid "" +"Files\n" +"only in B" +msgstr "" + +#: directorymergewindow.cpp:3423 +#, kde-format +msgid "Show Files only in C" +msgstr "" + +#: directorymergewindow.cpp:3423 +#, kde-format +msgid "" +"Files\n" +"only in C" +msgstr "" + +#: directorymergewindow.cpp:3427 +#, kde-format +msgid "Compare Explicitly Selected Files" +msgstr "" + +#: directorymergewindow.cpp:3428 +#, kde-format +msgid "Merge Explicitly Selected Files" +msgstr "" + +#: directorymergewindow.cpp:3430 directorymergewindow.cpp:3437 +#, kde-format +msgid "Do Nothing" +msgstr "Nihil Facer" + +#: directorymergewindow.cpp:3442 +#, kde-format +msgid "Delete A && B" +msgstr "Dele A && B" + +#: directorymergewindow.cpp:3445 +#, kde-format +msgid "Merge to A && B" +msgstr "Fusiona in A && B" + +#: fileaccess.cpp:301 +#, kde-format +msgid "Unable to determine full url. No parent specified." +msgstr "" + +#: fileaccess.cpp:482 SourceData.cpp:506 +#, kde-format +msgid "Failed to read file: %1" +msgstr "" + +#: fileaccess.cpp:624 +#, kde-format +msgid "Creating temp copy of %1 failed." +msgstr "" + +#: fileaccess.cpp:632 fileaccess.cpp:637 +#, kde-format +msgid "Opening %1 failed. %2" +msgstr "" + +#: fileaccess.cpp:656 fileaccess.cpp:664 +#, kde-format +msgid "Error reading from %1. %2" +msgstr "" + +#: fileaccess.cpp:788 +#, kde-format +msgid "" +"While trying to make a backup, deleting an older backup failed.\n" +"Filename: %1" +msgstr "" + +#: fileaccess.cpp:795 +#, kde-format +msgid "" +"While trying to make a backup, renaming failed.\n" +"Filenames: %1 -> %2" +msgstr "" + +#: fileaccess.cpp:865 +#, kde-format +msgid "Getting file status: %1" +msgstr "" + +#: fileaccess.cpp:906 +#, kde-format +msgid "Reading file: %1" +msgstr "" + +#: fileaccess.cpp:944 +#, kde-format +msgid "Writing file: %1" +msgstr "" + +#: fileaccess.cpp:977 +#, kde-format +msgid "Out of memory" +msgstr "Foras de Memoria" + +#: fileaccess.cpp:1013 +#, kde-format +msgid "Making directory: %1" +msgstr "" + +#: fileaccess.cpp:1034 +#, kde-format +msgid "Removing directory: %1" +msgstr "" + +#: fileaccess.cpp:1049 +#, kde-format +msgid "Removing file: %1" +msgstr "" + +#: fileaccess.cpp:1065 +#, kde-format +msgid "Creating symbolic link: %1 -> %2" +msgstr "" + +#: fileaccess.cpp:1089 +#, kde-format +msgid "Renaming file: %1 -> %2" +msgstr "" + +#: fileaccess.cpp:1123 +#, kde-format +msgid "Copying file: %1 -> %2" +msgstr "" + +#: fileaccess.cpp:1145 +#, kde-format +msgid "Reading directory: %1" +msgstr "" + +#: fileaccess.cpp:1202 +#, kde-format +msgid "Listing directory: %1" +msgstr "" + +#: kdiff3.cpp:182 +#, kde-format +msgid "Current Configuration:" +msgstr "" + +#: kdiff3.cpp:187 +#, kde-format +msgid "Config Option Error:" +msgstr "" + +#: kdiff3.cpp:246 +#, kde-format +msgid "Option --auto used, but no output file specified." +msgstr "" + +#: kdiff3.cpp:405 +#, kde-format +msgid "Option --auto ignored for directory comparison." +msgstr "" + +#: kdiff3.cpp:449 +#, kde-format +msgid "Saving failed." +msgstr "Il falleva a salveguardar." + +#: kdiff3.cpp:494 pdiff.cpp:1096 +#, fuzzy, kde-format +#| msgid "Opening of directories failed:" +msgid "Opening of these files failed:" +msgstr "Il falleva aperir directorios:" + +#: kdiff3.cpp:503 pdiff.cpp:1105 +#, fuzzy, kde-format +#| msgid "Directory Open Error" +msgid "File open error" +msgstr "Error de aperir directorio" + +#: kdiff3.cpp:532 +#, kde-format +msgid "Opens documents for comparison..." +msgstr "" + +#: kdiff3.cpp:534 +#, kde-format +msgid "Reload" +msgstr "Recarga" + +#: kdiff3.cpp:537 +#, kde-format +msgid "Saves the merge result. All conflicts must be solved!" +msgstr "" + +#: kdiff3.cpp:539 +#, kde-format +msgid "Saves the current document as..." +msgstr "" + +#: kdiff3.cpp:542 +#, kde-format +msgid "Print the differences" +msgstr "" + +#: kdiff3.cpp:545 +#, kde-format +msgid "Quits the application" +msgstr "Quita le application" + +#: kdiff3.cpp:548 +#, kde-format +msgid "Cuts the selected section and puts it to the clipboard" +msgstr "" + +#: kdiff3.cpp:551 +#, kde-format +msgid "Copies the selected section to the clipboard" +msgstr "" + +#: kdiff3.cpp:553 +#, kde-format +msgid "Pastes the clipboard contents to current position" +msgstr "Colla le contentos del area de transferentia al position currente" + +#: kdiff3.cpp:556 +#, kde-format +msgid "Select everything in current window" +msgstr "" + +#: kdiff3.cpp:559 +#, kde-format +msgid "Search for a string" +msgstr "" + +#: kdiff3.cpp:561 +#, kde-format +msgid "Search again for the string" +msgstr "" + +#: kdiff3.cpp:566 +#, kde-format +msgid "Enables/disables the statusbar" +msgstr "" + +#: kdiff3.cpp:570 +#, kde-format +msgid "Configure KDiff3..." +msgstr "" + +#: kdiff3.cpp:589 +#, kde-format +msgid "Go to Current Delta" +msgstr "" + +#: kdiff3.cpp:589 +#, kde-format +msgid "" +"Current\n" +"Delta" +msgstr "" + +#: kdiff3.cpp:591 +#, kde-format +msgid "Go to First Delta" +msgstr "" + +#: kdiff3.cpp:591 +#, kde-format +msgid "" +"First\n" +"Delta" +msgstr "" + +#: kdiff3.cpp:593 +#, kde-format +msgid "Go to Last Delta" +msgstr "" + +#: kdiff3.cpp:593 +#, kde-format +msgid "" +"Last\n" +"Delta" +msgstr "" + +#: kdiff3.cpp:595 +#, kde-format +msgid "(Skips white space differences when \"Show White Space\" is disabled.)" +msgstr "" + +#: kdiff3.cpp:596 +#, kde-format +msgid "" +"(Does not skip white space differences even when \"Show White Space\" is " +"disabled.)" +msgstr "" + +#: kdiff3.cpp:597 +#, kde-format +msgid "Go to Previous Delta" +msgstr "" + +#: kdiff3.cpp:597 +#, kde-format +msgid "" +"Prev\n" +"Delta" +msgstr "" + +#: kdiff3.cpp:599 +#, kde-format +msgid "Go to Next Delta" +msgstr "" + +#: kdiff3.cpp:599 +#, kde-format +msgid "" +"Next\n" +"Delta" +msgstr "" + +#: kdiff3.cpp:601 +#, kde-format +msgid "Go to Previous Conflict" +msgstr "" + +#: kdiff3.cpp:601 +#, kde-format +msgid "" +"Prev\n" +"Conflict" +msgstr "" + +#: kdiff3.cpp:603 +#, kde-format +msgid "Go to Next Conflict" +msgstr "" + +#: kdiff3.cpp:603 +#, kde-format +msgid "" +"Next\n" +"Conflict" +msgstr "" + +#: kdiff3.cpp:605 +#, kde-format +msgid "Go to Previous Unsolved Conflict" +msgstr "" + +#: kdiff3.cpp:605 +#, kde-format +msgid "" +"Prev\n" +"Unsolved" +msgstr "" + +#: kdiff3.cpp:607 +#, kde-format +msgid "Go to Next Unsolved Conflict" +msgstr "" + +#: kdiff3.cpp:607 +#, kde-format +msgid "" +"Next\n" +"Unsolved" +msgstr "" + +#: kdiff3.cpp:609 +#, kde-format +msgid "Select Line(s) From A" +msgstr "" + +#: kdiff3.cpp:609 +#, kde-format +msgid "" +"Choose\n" +"A" +msgstr "" + +#: kdiff3.cpp:610 +#, kde-format +msgid "Select Line(s) From B" +msgstr "" + +#: kdiff3.cpp:610 +#, kde-format +msgid "" +"Choose\n" +"B" +msgstr "" + +#: kdiff3.cpp:611 +#, kde-format +msgid "Select Line(s) From C" +msgstr "" + +#: kdiff3.cpp:611 +#, kde-format +msgid "" +"Choose\n" +"C" +msgstr "" + +#: kdiff3.cpp:612 +#, kde-format +msgid "Automatically Go to Next Unsolved Conflict After Source Selection" +msgstr "" + +#: kdiff3.cpp:612 +#, kde-format +msgid "" +"Auto\n" +"Next" +msgstr "" + +#: kdiff3.cpp:614 +#, kde-format +msgid "Show Space && Tabulator Characters" +msgstr "" + +#: kdiff3.cpp:614 +#, kde-format +msgid "" +"White\n" +"Characters" +msgstr "" + +#: kdiff3.cpp:615 +#, kde-format +msgid "Show White Space" +msgstr "" + +#: kdiff3.cpp:615 +#, kde-format +msgid "" +"White\n" +"Deltas" +msgstr "" + +#: kdiff3.cpp:617 +#, kde-format +msgid "Show Line Numbers" +msgstr "Monstra numeros de linea (rango)" + +#: kdiff3.cpp:617 +#, kde-format +msgid "" +"Line\n" +"Numbers" +msgstr "" + +#: kdiff3.cpp:619 +#, kde-format +msgid "Automatically Solve Simple Conflicts" +msgstr "" + +#: kdiff3.cpp:620 +#, kde-format +msgid "Set Deltas to Conflicts" +msgstr "" + +#: kdiff3.cpp:621 +#, kde-format +msgid "Run Regular Expression Auto Merge" +msgstr "" + +#: kdiff3.cpp:622 +#, kde-format +msgid "Automatically Solve History Conflicts" +msgstr "" + +#: kdiff3.cpp:623 +#, kde-format +msgid "Split Diff At Selection" +msgstr "" + +#: kdiff3.cpp:624 +#, kde-format +msgid "Join Selected Diffs" +msgstr "" + +#: kdiff3.cpp:626 +#, kde-format +msgid "Show Window A" +msgstr "" + +#: kdiff3.cpp:627 +#, kde-format +msgid "Show Window B" +msgstr "" + +#: kdiff3.cpp:628 +#, kde-format +msgid "Show Window C" +msgstr "" + +#: kdiff3.cpp:630 +#, kde-format +msgid "Normal Overview" +msgstr "" + +#: kdiff3.cpp:631 +#, kde-format +msgid "A vs. B Overview" +msgstr "" + +#: kdiff3.cpp:632 +#, kde-format +msgid "A vs. C Overview" +msgstr "" + +#: kdiff3.cpp:633 +#, kde-format +msgid "B vs. C Overview" +msgstr "" + +#: kdiff3.cpp:634 +#, kde-format +msgid "Word Wrap Diff Windows" +msgstr "" + +#: kdiff3.cpp:635 +#, kde-format +msgid "Add Manual Diff Alignment" +msgstr "" + +#: kdiff3.cpp:636 +#, kde-format +msgid "Clear All Manual Diff Alignments" +msgstr "" + +#: kdiff3.cpp:638 +#, kde-format +msgid "Focus Next Window" +msgstr "" + +#: kdiff3.cpp:639 +#, kde-format +msgid "Focus Prev Window" +msgstr "" + +#: kdiff3.cpp:640 +#, kde-format +msgid "Toggle Split Orientation" +msgstr "" + +#: kdiff3.cpp:642 +#, kde-format +msgid "Dir && Text Split Screen View" +msgstr "" + +#: kdiff3.cpp:644 +#, kde-format +msgid "Toggle Between Dir && Text View" +msgstr "" + +#: kdiff3.cpp:696 pdiff.cpp:1919 +#, kde-format +msgid "The merge result has not been saved." +msgstr "" + +#: kdiff3.cpp:698 +#, kde-format +msgid "Save && Quit" +msgstr "" + +#: kdiff3.cpp:699 +#, kde-format +msgid "Quit Without Saving" +msgstr "" + +#: kdiff3.cpp:707 pdiff.cpp:1930 +#, kde-format +msgid "Saving the merge result failed." +msgstr "" + +#: kdiff3.cpp:718 pdiff.cpp:1030 +#, kde-format +msgid "" +"You are currently doing a directory merge. Are you sure, you want to abort?" +msgstr "" + +#: kdiff3.cpp:741 +#, kde-format +msgid "Saving file..." +msgstr "Salvante file..." + +#: kdiff3.cpp:758 +#, kde-format +msgid "Saving file with a new filename..." +msgstr "Salveguardar file con un nove nomine de file..." + +#: kdiff3.cpp:760 +#, kde-format +msgid "Save As..." +msgstr "Salveguarda como..." + +#: kdiff3.cpp:819 +#, kde-format +msgid "Printing not implemented." +msgstr "" + +#: kdiff3.cpp:858 +#, kde-format +msgid "Printing..." +msgstr "Imprimente..." + +#: kdiff3.cpp:948 +#, kde-format +msgid "Printing page %1 of %2" +msgstr "" + +#: kdiff3.cpp:1006 +#, kde-format +msgid " (Selection)" +msgstr " (Selection)" + +#: kdiff3.cpp:1034 +#, kde-format +msgid "Printing completed." +msgstr "" + +#: kdiff3.cpp:1038 +#, kde-format +msgid "Printing aborted." +msgstr "" + +#: kdiff3.cpp:1045 +#, kde-format +msgid "Exiting..." +msgstr "Exiente..." + +#: kdiff3.cpp:1056 +#, kde-format +msgid "Toggling toolbar..." +msgstr "" + +#: kdiff3.cpp:1077 +#, kde-format +msgid "Toggle the statusbar..." +msgstr "" + +#: kdiff3_part.cpp:45 +#, kde-format +msgid "KDiff3 Part" +msgstr "KDiff3Part" + +#: kdiff3_part.cpp:46 +#, kde-format +msgid "A KPart to display SVG images" +msgstr "Un KPart pro monstrar imagines SVG" + +#: kdiff3_part.cpp:48 +#, kde-format +msgid "Copyright 2007, Aurélien Gâteau " +msgstr "Copyright 2007, Aurélien Gâteau " + +#: kdiff3_part.cpp:49 +#, kde-format +msgid "Joachim Eibl" +msgstr "" + +#: kdiff3_part.cpp:174 kdiff3_part.cpp:255 +#, kde-format +msgid "Could not find files for comparison." +msgstr "" + +#. i18n: ectx: Menu (movement) +#: kdiff3_part.rc:4 +#, kde-format +msgid "&KDiff3" +msgstr "&KDiff3" + +#. i18n: ectx: Menu (movement) +#: kdiff3_part.rc:13 +#, kde-format +msgid "Configure KDiff3" +msgstr "" + +#. i18n: ectx: ToolBar (mainToolBar) +#: kdiff3_part.rc:16 main.cpp:89 +#, kde-format +msgid "KDiff3" +msgstr "KDiff3" + +#: kdiff3_shell.cpp:74 +#, kde-format +msgid "" +"Could not initialize the KDiff3 part.\n" +"This usually happens due to an installation problem. Please read the README-" +"file in the source package for details." +msgstr "" + +#. i18n: ectx: Menu (file) +#: kdiff3_shell.rc:4 +#, kde-format +msgid "&File" +msgstr "&File" + +#. i18n: ectx: Menu (directory) +#: kdiff3_shell.rc:7 +#, kde-format +msgid "&Directory" +msgstr "&Directorio" + +#. i18n: ectx: Menu (dir_current_merge_menu) +#: kdiff3_shell.rc:30 +#, kde-format +msgid "Current Item Merge Operation" +msgstr "" + +#. i18n: ectx: Menu (dir_current_sync_menu) +#: kdiff3_shell.rc:38 +#, kde-format +msgid "Current Item Sync Operation" +msgstr "" + +#. i18n: ectx: Menu (movement) +#: kdiff3_shell.rc:50 +#, kde-format +msgid "M&ovement" +msgstr "Mo&vimento" + +#. i18n: ectx: Menu (diff) +#: kdiff3_shell.rc:61 +#, kde-format +msgid "D&iffview" +msgstr "" + +#. i18n: ectx: Menu (merge) +#: kdiff3_shell.rc:73 +#, kde-format +msgid "M&erge" +msgstr "Fu&siona" + +#. i18n: ectx: Menu (window) +#: kdiff3_shell.rc:95 +#, kde-format +msgid "&Window" +msgstr "&Fenestra" + +#. i18n: ectx: ToolBar (mainToolBar) +#: kdiff3_shell.rc:106 +#, kde-format +msgid "Main Toolbar" +msgstr "Barra de instrumento principal" + +#: main.cpp:69 main.cpp:73 +#, kde-format +msgid "Ignored. (User defined.)" +msgstr "" + +#: main.cpp:93 +#, kde-format +msgid " (64 bit)" +msgstr " (64 bit)" + +#: main.cpp:95 +#, kde-format +msgid " (32 bit)" +msgstr " (32 bit)" + +#: main.cpp:96 +#, kde-format +msgid "Tool for Comparison and Merge of Files and Directories" +msgstr "" + +#: main.cpp:97 +#, kde-format +msgid "(c) 2002-2014 Joachim Eibl, (c) 2017 Michael Reeves KF5/Qt5 port" +msgstr "" + +#: main.cpp:113 +#, kde-format +msgid "Merge the input." +msgstr "" + +#: main.cpp:114 +#, kde-format +msgid "Explicit base file. For compatibility with certain tools." +msgstr "" + +#: main.cpp:115 +#, kde-format +msgid "Output file. Implies -m. E.g.: -o newfile.txt" +msgstr "" + +#: main.cpp:116 +#, kde-format +msgid "Output file, again. (For compatibility with certain tools.)" +msgstr "" + +#: main.cpp:118 +#, kde-format +msgid "No GUI if all conflicts are auto-solvable. (Needs -o file)" +msgstr "" + +#: main.cpp:120 +#, kde-format +msgid "Ignored." +msgstr "Ignorate." + +#: main.cpp:122 +#, kde-format +msgid "Do not solve conflicts automatically." +msgstr "" + +#: main.cpp:123 +#, kde-format +msgid "Visible name replacement for input file 1 (base)." +msgstr "" + +#: main.cpp:124 +#, kde-format +msgid "Visible name replacement for input file 2." +msgstr "" + +#: main.cpp:125 +#, kde-format +msgid "Visible name replacement for input file 3." +msgstr "" + +#: main.cpp:126 +#, kde-format +msgid "Alternative visible name replacement. Supply this once for every input." +msgstr "" + +#: main.cpp:127 +#, kde-format +msgid "" +"Override a config setting. Use once for every setting. E.g.: --cs " +"\"AutoAdvance=1\"" +msgstr "" + +#: main.cpp:128 +#, kde-format +msgid "Show list of config settings and current values." +msgstr "" + +#: main.cpp:129 +#, kde-format +msgid "Use a different config file." +msgstr "" + +#: main.cpp:132 +#, kde-format +msgid "file1 to open (base, if not specified via --base)" +msgstr "" + +#: main.cpp:133 +#, kde-format +msgid "file2 to open" +msgstr "file2 de aperir" + +#: main.cpp:134 +#, kde-format +msgid "file3 to open" +msgstr "file3 de aperir" + +#: main.cpp:158 +#, kde-format +msgid "See kdiff3 --help for supported options." +msgstr "" + +#: mergeresultwindow.cpp:171 +#, kde-format +msgid "Choose A Everywhere" +msgstr "" + +#: mergeresultwindow.cpp:172 +#, kde-format +msgid "Choose B Everywhere" +msgstr "" + +#: mergeresultwindow.cpp:173 +#, kde-format +msgid "Choose C Everywhere" +msgstr "" + +#: mergeresultwindow.cpp:174 +#, kde-format +msgid "Choose A for All Unsolved Conflicts" +msgstr "" + +#: mergeresultwindow.cpp:175 +#, kde-format +msgid "Choose B for All Unsolved Conflicts" +msgstr "" + +#: mergeresultwindow.cpp:176 +#, kde-format +msgid "Choose C for All Unsolved Conflicts" +msgstr "" + +#: mergeresultwindow.cpp:177 +#, kde-format +msgid "Choose A for All Unsolved Whitespace Conflicts" +msgstr "" + +#: mergeresultwindow.cpp:178 +#, kde-format +msgid "Choose B for All Unsolved Whitespace Conflicts" +msgstr "" + +#: mergeresultwindow.cpp:179 +#, kde-format +msgid "Choose C for All Unsolved Whitespace Conflicts" +msgstr "" + +#: mergeresultwindow.cpp:204 +#, kde-format +msgid "Number of remaining unsolved conflicts: %1 (of which %2 are whitespace)" +msgstr "" + +#: mergeresultwindow.cpp:398 +#, kde-format +msgid "" +"The output has been modified.\n" +"If you continue your changes will be lost." +msgstr "" + +#: mergeresultwindow.cpp:964 pdiff.cpp:817 +#, kde-format +msgid "All input files are binary equal." +msgstr "" + +#: mergeresultwindow.cpp:966 +#, kde-format +msgid "All input files contain the same text." +msgstr "" + +#: mergeresultwindow.cpp:970 mergeresultwindow.cpp:974 +#: mergeresultwindow.cpp:978 pdiff.cpp:823 pdiff.cpp:827 pdiff.cpp:831 +#, kde-format +msgid "Files %1 and %2 are binary equal.\n" +msgstr "" + +#: mergeresultwindow.cpp:972 mergeresultwindow.cpp:976 +#: mergeresultwindow.cpp:980 +#, kde-format +msgid "Files %1 and %2 have equal text.\n" +msgstr "" + +#: mergeresultwindow.cpp:986 +#, kde-format +msgid "" +"Total number of conflicts: %1\n" +"Nr of automatically solved conflicts: %2\n" +"Nr of unsolved conflicts: %3\n" +"%4" +msgstr "" + +#: mergeresultwindow.cpp:992 +#, kde-format +msgid "Conflicts" +msgstr "Conflictos" + +#: mergeresultwindow.cpp:1901 +#, kde-format +msgid "" +msgstr "" + +#: mergeresultwindow.cpp:1909 +#, kde-format +msgid "" +msgstr "" + +#: mergeresultwindow.cpp:1911 mergeresultwindow.cpp:2783 +#, kde-format +msgid "" +msgstr "" + +#: mergeresultwindow.cpp:2995 +#, kde-format +msgid "" +"Not all conflicts are solved yet.\n" +"File not saved." +msgstr "" + +#: mergeresultwindow.cpp:2997 mergeresultwindow.cpp:3006 +#, kde-format +msgid "Conflicts Left" +msgstr "" + +#: mergeresultwindow.cpp:3004 +#, kde-format +msgid "" +"There is a line end style conflict. Please choose the line end style " +"manually.\n" +"File not saved." +msgstr "" + +#: mergeresultwindow.cpp:3018 +#, kde-format +msgid "" +"\n" +"\n" +"Creating backup failed. File not saved." +msgstr "" + +#: mergeresultwindow.cpp:3018 mergeresultwindow.cpp:3066 +#, kde-format +msgid "File Save Error" +msgstr "" + +#: mergeresultwindow.cpp:3066 +#, kde-format +msgid "Error while writing." +msgstr "" + +#: mergeresultwindow.cpp:3138 +#, kde-format +msgid "Output:" +msgstr "Egresso:" + +#: mergeresultwindow.cpp:3151 mergeresultwindow.cpp:3343 +#, kde-format +msgid "[Modified]" +msgstr "[Modificate]" + +#: mergeresultwindow.cpp:3158 +#, kde-format +msgid "Encoding for saving:" +msgstr "" + +#: mergeresultwindow.cpp:3258 +#, kde-format +msgid "Conflict" +msgstr "Conflicto" + +#: mergeresultwindow.cpp:3290 +#, kde-format +msgid "Codec from A: %1" +msgstr "" + +#: mergeresultwindow.cpp:3292 +#, kde-format +msgid "Codec from B: %1" +msgstr "" + +#: mergeresultwindow.cpp:3294 +#, kde-format +msgid "Codec from C: %1" +msgstr "" + +#: optiondialog.cpp:121 +#, kde-format +msgid "Change Font" +msgstr "Cambia font" + +#: optiondialog.cpp:137 optiondialog.cpp:147 +#, kde-format +msgid "" +"Font: %1, %2, %3\n" +"\n" +"Example:" +msgstr "" + +#: optiondialog.cpp:390 +#, kde-format +msgid "Unicode" +msgstr "Unicode" + +#: optiondialog.cpp:391 +#, kde-format +msgid "Latin1" +msgstr "Latin1" + +#: optiondialog.cpp:410 +#, kde-format +msgid "Change this if non-ASCII characters are not displayed correctly." +msgstr "" + +#: optiondialog.cpp:495 +#, kde-format +msgid "Configure" +msgstr "Configura" + +#: optiondialog.cpp:573 +#, kde-format +msgid "Font" +msgstr "Font" + +#: optiondialog.cpp:575 +#, kde-format +msgid "Editor & Diff Output Font" +msgstr "" + +#: optiondialog.cpp:594 +#, kde-format +msgid "Application font" +msgstr "" + +#: optiondialog.cpp:599 +#, kde-format +msgid "File view font" +msgstr "" + +#: optiondialog.cpp:618 +#, kde-format +msgctxt "Title for color settings page" +msgid "Color" +msgstr "Color" + +#: optiondialog.cpp:619 +#, kde-format +msgid "Colors Settings" +msgstr "" + +#: optiondialog.cpp:644 +#, kde-format +msgid "Editor and Diff Views:" +msgstr "" + +#: optiondialog.cpp:652 +#, kde-format +msgid "Foreground color:" +msgstr "Color de prime plano:" + +#: optiondialog.cpp:660 +#, kde-format +msgid "Background color:" +msgstr "Color de fundo:" + +#: optiondialog.cpp:670 +#, kde-format +msgid "Diff background color:" +msgstr "" + +#: optiondialog.cpp:679 +#, kde-format +msgid "Color A:" +msgstr "Color A:" + +#: optiondialog.cpp:688 +#, kde-format +msgid "Color B:" +msgstr "Color B:" + +#: optiondialog.cpp:697 +#, kde-format +msgid "Color C:" +msgstr "Color C:" + +#: optiondialog.cpp:705 +#, kde-format +msgid "Conflict color:" +msgstr "" + +#: optiondialog.cpp:714 +#, kde-format +msgid "Current range background color:" +msgstr "" + +#: optiondialog.cpp:723 +#, kde-format +msgid "Current range diff background color:" +msgstr "" + +#: optiondialog.cpp:731 +#, kde-format +msgid "Color for manually aligned difference ranges:" +msgstr "" + +#: optiondialog.cpp:738 +#, kde-format +msgid "Directory Comparison View:" +msgstr "" + +#: optiondialog.cpp:744 +#, kde-format +msgid "Newest file color:" +msgstr "" + +#: optiondialog.cpp:749 +#, kde-format +msgid "" +"Changing this color will only be effective when starting the next directory " +"comparison." +msgstr "" + +#: optiondialog.cpp:754 +#, kde-format +msgid "Oldest file color:" +msgstr "" + +#: optiondialog.cpp:763 +#, kde-format +msgid "Middle age file color:" +msgstr "" + +#: optiondialog.cpp:772 +#, kde-format +msgid "Color for missing files:" +msgstr "" + +#: optiondialog.cpp:786 +#, kde-format +msgid "Editor" +msgstr "Redactor (Editor)" + +#: optiondialog.cpp:787 +#, kde-format +msgid "Editor Behavior" +msgstr "" + +#: optiondialog.cpp:809 +#, kde-format +msgid "Tab inserts spaces" +msgstr "" + +#: optiondialog.cpp:813 +#, kde-format +msgid "" +"On: Pressing tab generates the appropriate number of spaces.\n" +"Off: A tab character will be inserted." +msgstr "" + +#: optiondialog.cpp:818 +#, kde-format +msgid "Tab size:" +msgstr "Grandor de tabulation:" + +#: optiondialog.cpp:825 +#, kde-format +msgid "Auto indentation" +msgstr "Auto indentation" + +#: optiondialog.cpp:829 +#, kde-format +msgid "On: The indentation of the previous line is used for a new line.\n" +msgstr "" + +#: optiondialog.cpp:832 +#, kde-format +msgid "Auto copy selection" +msgstr "" + +#: optiondialog.cpp:836 +#, kde-format +msgid "" +"On: Any selection is immediately written to the clipboard.\n" +"Off: You must explicitly copy e.g. via Ctrl-C." +msgstr "" + +#: optiondialog.cpp:851 +#, kde-format +msgid "" +"Sets the line endings for when an edited file is saved.\n" +"DOS/Windows: CR+LF; UNIX: LF; with CR=0D, LF=0A" +msgstr "" + +#: optiondialog.cpp:861 +#, kde-format +msgid "Diff" +msgstr "Diff" + +#: optiondialog.cpp:862 +#, kde-format +msgid "Diff Settings" +msgstr "" + +#. i18n("Preserve carriage return"), false, "PreserveCarriageReturn", &m_options.m_bPreserveCarriageReturn, page, this ); +#. addOptionItem(pPreserveCarriageReturn); +#. gbox->addWidget( pPreserveCarriageReturn, line, 0, 1, 2 ); +#. pPreserveCarriageReturn->setToolTip( i18n( +#. "Show carriage return characters '\\r' if they exist.\n" +#. "Helps to compare files that were modified under different operating systems.") +#. ); +#. ++line; +#. +#: optiondialog.cpp:896 +#, kde-format +msgid "Ignore numbers (treat as white space)" +msgstr "" + +#: optiondialog.cpp:900 +#, kde-format +msgid "" +"Ignore number characters during line matching phase. (Similar to Ignore " +"white space.)\n" +"Might help to compare files with numeric data." +msgstr "" + +#: optiondialog.cpp:904 +#, kde-format +msgid "Ignore C/C++ comments (treat as white space)" +msgstr "" + +#: optiondialog.cpp:907 +#, kde-format +msgid "Treat C/C++ comments like white space." +msgstr "" + +#: optiondialog.cpp:910 +#, kde-format +msgid "Ignore case (treat as white space)" +msgstr "" + +#: optiondialog.cpp:914 +#, kde-format +msgid "Treat case differences like white space changes. ('a'<=>'A')" +msgstr "" + +#: optiondialog.cpp:917 +#, kde-format +msgid "Preprocessor command:" +msgstr "" + +#: optiondialog.cpp:922 +#, kde-format +msgid "User defined pre-processing. (See the docs for details.)" +msgstr "" + +#: optiondialog.cpp:925 +#, kde-format +msgid "Line-matching preprocessor command:" +msgstr "" + +#: optiondialog.cpp:930 +#, kde-format +msgid "" +"This pre-processor is only used during line matching.\n" +"(See the docs for details.)" +msgstr "" + +#: optiondialog.cpp:933 +#, kde-format +msgid "Try hard (slower)" +msgstr "" + +#: optiondialog.cpp:937 +#, kde-format +msgid "" +"Enables the --minimal option for the external diff.\n" +"The analysis of big files will be much slower." +msgstr "" + +#: optiondialog.cpp:941 +#, kde-format +msgid "Align B and C for 3 input files" +msgstr "" + +#: optiondialog.cpp:945 +#, kde-format +msgid "" +"Try to align B and C when comparing or merging three input files.\n" +"Not recommended for merging because merge might get more complicated.\n" +"(Default is off.)" +msgstr "" + +#: optiondialog.cpp:956 +#, kde-format +msgctxt "Settings page" +msgid "Merge" +msgstr "Fusiona" + +#: optiondialog.cpp:957 +#, kde-format +msgid "Merge Settings" +msgstr "" + +#: optiondialog.cpp:980 +#, kde-format +msgid "Auto advance delay (ms):" +msgstr "" + +#: optiondialog.cpp:986 +#, kde-format +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 "" + +#: optiondialog.cpp:990 +#, kde-format +msgid "Show info dialogs" +msgstr "" + +#: optiondialog.cpp:993 +#, kde-format +msgid "Show a dialog with information about the number of conflicts." +msgstr "" + +#: optiondialog.cpp:996 +#, kde-format +msgid "White space 2-file merge default:" +msgstr "" + +#: optiondialog.cpp:1001 optiondialog.cpp:1014 +#, kde-format +msgid "Manual Choice" +msgstr "" + +#: optiondialog.cpp:1005 optiondialog.cpp:1019 +#, kde-format +msgid "" +"Allow the merge algorithm to automatically select an input for white-space-" +"only changes." +msgstr "" + +#: optiondialog.cpp:1009 +#, kde-format +msgid "White space 3-file merge default:" +msgstr "" + +#: optiondialog.cpp:1023 +#, kde-format +msgid "Automatic Merge Regular Expression" +msgstr "" + +#: optiondialog.cpp:1031 smalldialogs.cpp:459 +#, kde-format +msgid "Auto merge regular expression:" +msgstr "" + +#: optiondialog.cpp:1036 +#, kde-format +msgid "" +"Regular expression for lines where KDiff3 should automatically choose one " +"source.\n" +"When a line with a conflict matches the regular expression then\n" +"- if available - C, otherwise B will be chosen." +msgstr "" + +#: optiondialog.cpp:1042 +#, kde-format +msgid "Run regular expression auto merge on merge start" +msgstr "" + +#: optiondialog.cpp:1045 +#, kde-format +msgid "" +"Run the merge for auto merge regular expressions\n" +"immediately when a merge starts.\n" +msgstr "" + +#: optiondialog.cpp:1050 +#, kde-format +msgid "Version Control History Merging" +msgstr "" + +#: optiondialog.cpp:1058 smalldialogs.cpp:486 +#, kde-format +msgid "History start regular expression:" +msgstr "" + +#: optiondialog.cpp:1063 +#, kde-format +msgid "" +"Regular expression for the start of the version control history entry.\n" +"Usually this line contains the \"$Log$\" keyword.\n" +"Default value: \".*\\$Log.*\\$.*\"" +msgstr "" + +#: optiondialog.cpp:1069 smalldialogs.cpp:514 +#, kde-format +msgid "History entry start regular expression:" +msgstr "" + +#: optiondialog.cpp:1082 +#, kde-format +msgid "" +"A version control history entry consists of several lines.\n" +"Specify the regular expression to detect the first line (without the leading " +"comment).\n" +"Use parentheses to group the keys you want to use for sorting.\n" +"If left empty, then KDiff3 assumes that empty lines separate history " +"entries.\n" +"See the documentation for details." +msgstr "" + +#: optiondialog.cpp:1090 +#, kde-format +msgid "History merge sorting" +msgstr "" + +#: optiondialog.cpp:1093 +#, kde-format +msgid "Sort version control history by a key." +msgstr "" + +#: optiondialog.cpp:1103 +#, kde-format +msgid "History entry start sort key order:" +msgstr "" + +#: optiondialog.cpp:1108 +#, kde-format +msgid "" +"Each pair of parentheses used in the regular expression for the history " +"start entry\n" +"groups a key that can be used for sorting.\n" +"Specify the list of keys (that are numbered in order of occurrence\n" +"starting with 1) using ',' as separator (e.g. \"4,5,6,1,2,3,7\").\n" +"If left empty, then no sorting will be done.\n" +"See the documentation for details." +msgstr "" + +#: optiondialog.cpp:1119 +#, kde-format +msgid "Merge version control history on merge start" +msgstr "" + +#: optiondialog.cpp:1122 +#, kde-format +msgid "Run version control history automerge on merge start." +msgstr "" + +#: optiondialog.cpp:1126 +#, kde-format +msgid "Max number of history entries:" +msgstr "" + +#: optiondialog.cpp:1130 +#, kde-format +msgid "Cut off after specified number. Use -1 for infinite number of entries." +msgstr "" + +#: optiondialog.cpp:1134 +#, kde-format +msgid "Test your regular expressions" +msgstr "" + +#: optiondialog.cpp:1139 +#, kde-format +msgid "Irrelevant merge command:" +msgstr "" + +#: optiondialog.cpp:1144 +#, kde-format +msgid "" +"If specified this script is run after automerge\n" +"when no other relevant changes were detected.\n" +"Called with the parameters: filename1 filename2 filename3" +msgstr "" + +#: optiondialog.cpp:1149 +#, kde-format +msgid "Auto save and quit on merge without conflicts" +msgstr "" + +#: optiondialog.cpp:1153 +#, kde-format +msgid "" +"If KDiff3 was started for a file-merge from the command line and all\n" +"conflicts are solvable without user interaction then automatically save and " +"quit.\n" +"(Similar to command line option \"--auto\".)" +msgstr "" + +#: optiondialog.cpp:1164 optiondialog.cpp:1165 +#, kde-format +msgid "Directory" +msgstr "Directorio" + +#: optiondialog.cpp:1185 +#, kde-format +msgid "Recursive directories" +msgstr "" + +#: optiondialog.cpp:1188 +#, kde-format +msgid "Whether to analyze subdirectories or not." +msgstr "" + +#: optiondialog.cpp:1190 +#, kde-format +msgid "File pattern(s):" +msgstr "" + +#: optiondialog.cpp:1196 +#, kde-format +msgid "" +"Pattern(s) of files to be analyzed. \n" +"Wildcards: '*' and '?'\n" +"Several Patterns can be specified by using the separator: ';'" +msgstr "" + +#: optiondialog.cpp:1201 +#, kde-format +msgid "File-anti-pattern(s):" +msgstr "" + +#: optiondialog.cpp:1207 +#, kde-format +msgid "" +"Pattern(s) of files to be excluded from analysis. \n" +"Wildcards: '*' and '?'\n" +"Several Patterns can be specified by using the separator: ';'" +msgstr "" + +#: optiondialog.cpp:1212 +#, kde-format +msgid "Dir-anti-pattern(s):" +msgstr "" + +#: optiondialog.cpp:1218 +#, kde-format +msgid "" +"Pattern(s) of directories to be excluded from analysis. \n" +"Wildcards: '*' and '?'\n" +"Several Patterns can be specified by using the separator: ';'" +msgstr "" + +#: optiondialog.cpp:1223 +#, kde-format +msgid "Use .cvsignore" +msgstr "" + +#: optiondialog.cpp:1227 +#, kde-format +msgid "" +"Extends the antipattern to anything that would be ignored by CVS.\n" +"Via local \".cvsignore\" files this can be directory specific." +msgstr "" + +#: optiondialog.cpp:1231 +#, kde-format +msgid "Find hidden files and directories" +msgstr "" + +#: optiondialog.cpp:1234 +#, kde-format +msgid "Finds hidden files and directories." +msgstr "" + +#: optiondialog.cpp:1237 +#, kde-format +msgid "Follow file links" +msgstr "" + +#: optiondialog.cpp:1241 +#, kde-format +msgid "" +"On: Compare the file the link points to.\n" +"Off: Compare the links." +msgstr "" + +#: optiondialog.cpp:1245 +#, kde-format +msgid "Follow directory links" +msgstr "" + +#: optiondialog.cpp:1249 +#, kde-format +msgid "" +"On: Compare the directory the link points to.\n" +"Off: Compare the links." +msgstr "" + +#: optiondialog.cpp:1258 +#, kde-format +msgid "Case sensitive filename comparison" +msgstr "" + +#: optiondialog.cpp:1262 +#, kde-format +msgid "" +"The directory comparison will compare files or directories when their names " +"match.\n" +"Set this option if the case of the names must match. (Default for Windows is " +"off, otherwise on.)" +msgstr "" + +#: optiondialog.cpp:1266 +#, kde-format +msgid "Unfold all subdirectories on load" +msgstr "" + +#: optiondialog.cpp:1270 +#, kde-format +msgid "" +"On: Unfold all subdirectories when starting a directory diff.\n" +"Off: Leave subdirectories folded." +msgstr "" + +#: optiondialog.cpp:1274 +#, kde-format +msgid "Skip directory status report" +msgstr "" + +#: optiondialog.cpp:1278 +#, kde-format +msgid "" +"On: Do not show the Directory Comparison Status.\n" +"Off: Show the status dialog on start." +msgstr "" + +#: optiondialog.cpp:1282 +#, kde-format +msgid "File Comparison Mode" +msgstr "" + +#: optiondialog.cpp:1287 +#, kde-format +msgid "Binary comparison" +msgstr "" + +#: optiondialog.cpp:1289 +#, kde-format +msgid "Binary comparison of each file. (Default)" +msgstr "" + +#: optiondialog.cpp:1292 +#, kde-format +msgid "Full analysis" +msgstr "" + +#: optiondialog.cpp:1294 +#, kde-format +msgid "" +"Do a full analysis and show statistics information in extra columns.\n" +"(Slower than a binary comparison, much slower for binary files.)" +msgstr "" + +#: optiondialog.cpp:1298 +#, kde-format +msgid "Trust the size and modification date (unsafe)" +msgstr "" + +#: optiondialog.cpp:1300 +#, kde-format +msgid "" +"Assume that files are equal if the modification date and file length are " +"equal.\n" +"Files with equal contents but different modification dates will appear as " +"different.\n" +"Useful for big directories or slow networks." +msgstr "" + +#: optiondialog.cpp:1305 +#, kde-format +msgid "" +"Trust the size and date, but use binary comparison if date does not match " +"(unsafe)" +msgstr "" + +#: optiondialog.cpp:1307 +#, kde-format +msgid "" +"Assume that files are equal if the modification date and file length are " +"equal.\n" +"If the dates are not equal but the sizes are, use binary comparison.\n" +"Useful for big directories or slow networks." +msgstr "" + +#: optiondialog.cpp:1312 +#, kde-format +msgid "Trust the size (unsafe)" +msgstr "" + +#: optiondialog.cpp:1314 +#, kde-format +msgid "" +"Assume that files are equal if their file lengths are equal.\n" +"Useful for big directories or slow networks when the date is modified during " +"download." +msgstr "" + +#: optiondialog.cpp:1321 +#, kde-format +msgid "Synchronize directories" +msgstr "" + +#: optiondialog.cpp:1325 +#, kde-format +msgid "" +"Offers to store files in both directories so that\n" +"both directories are the same afterwards.\n" +"Works only when comparing two directories without specifying a destination." +msgstr "" + +#: optiondialog.cpp:1331 +#, kde-format +msgid "White space differences considered equal" +msgstr "" + +#: optiondialog.cpp:1335 +#, kde-format +msgid "" +"If files differ only by white space consider them equal.\n" +"This is only active when full analysis is chosen." +msgstr "" + +#: optiondialog.cpp:1341 +#, kde-format +msgid "Copy newer instead of merging (unsafe)" +msgstr "" + +#: optiondialog.cpp:1345 +#, kde-format +msgid "" +"Do not look inside, just take the newer file.\n" +"(Use this only if you know what you are doing!)\n" +"Only effective when comparing two directories." +msgstr "" + +#: optiondialog.cpp:1350 +#, kde-format +msgid "Backup files (.orig)" +msgstr "" + +#: optiondialog.cpp:1354 +#, kde-format +msgid "" +"If 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 "" + +#: optiondialog.cpp:1430 optiondialog.cpp:1431 +#, kde-format +msgid "Regional Settings" +msgstr "Preferentias de rete" + +#: optiondialog.cpp:1454 +#, kde-format +msgid "Use the same encoding for everything:" +msgstr "" + +#: optiondialog.cpp:1458 +#, kde-format +msgid "" +"Enable this allows to change all encodings by changing the first only.\n" +"Disable this if different individual settings are needed." +msgstr "" + +#: optiondialog.cpp:1462 +#, kde-format +msgid "Note: Local Encoding is \"%1\"" +msgstr "" + +#: optiondialog.cpp:1466 +#, kde-format +msgid "File Encoding for A:" +msgstr "" + +#: optiondialog.cpp:1473 +#, kde-format +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 "" + +#: optiondialog.cpp:1476 optiondialog.cpp:1487 optiondialog.cpp:1498 +#, kde-format +msgid "Auto Detect Unicode" +msgstr "" + +#: optiondialog.cpp:1482 +#, kde-format +msgid "File Encoding for B:" +msgstr "" + +#: optiondialog.cpp:1493 +#, kde-format +msgid "File Encoding for C:" +msgstr "" + +#: optiondialog.cpp:1504 +#, kde-format +msgid "File Encoding for Merge Output and Saving:" +msgstr "" + +#: optiondialog.cpp:1509 +#, kde-format +msgid "Auto Select" +msgstr "" + +#: optiondialog.cpp:1513 +#, kde-format +msgid "" +"If enabled then the encoding from the input files is used.\n" +"In ambiguous cases a dialog will ask the user to choose the encoding for " +"saving." +msgstr "" + +#: optiondialog.cpp:1516 +#, kde-format +msgid "File Encoding for Preprocessor Files:" +msgstr "" + +#: optiondialog.cpp:1528 +#, kde-format +msgid "Right To Left Language" +msgstr "" + +#: optiondialog.cpp:1532 +#, kde-format +msgid "" +"Some languages are read from right to left.\n" +"This setting will change the viewer and editor accordingly." +msgstr "" + +#: optiondialog.cpp:1542 +#, kde-format +msgid "Integration" +msgstr "Integration" + +#: optiondialog.cpp:1543 +#, kde-format +msgid "Integration Settings" +msgstr "" + +#: optiondialog.cpp:1564 +#, kde-format +msgid "Command line options to ignore:" +msgstr "" + +#: optiondialog.cpp:1570 +#, kde-format +msgid "" +"List of command line options that should be ignored when KDiff3 is used by " +"other tools.\n" +"Several values can be specified if separated via ';'\n" +"This will suppress the \"Unknown option\" error." +msgstr "" + +#: optiondialog.cpp:1575 +#, kde-format +msgid "Quit also via Escape key" +msgstr "" + +#: optiondialog.cpp:1579 +#, kde-format +msgid "" +"Fast method to exit.\n" +"For those who are used to using the Escape key." +msgstr "" + +#: optiondialog.cpp:1653 +#, kde-format +msgid "This resets all options. Not only those of the current topic." +msgstr "" + +#: pdiff.cpp:78 pdiff.cpp:92 +#, kde-format +msgid "" +"Data loss error:\n" +"If it is reproducible please contact the author.\n" +msgstr "" + +#: pdiff.cpp:80 pdiff.cpp:94 +#, kde-format +msgid "Severe Internal Error" +msgstr "" + +#: pdiff.cpp:122 +#, kde-format +msgid "PreprocessorCmd: " +msgstr "" + +#: pdiff.cpp:127 +#, kde-format +msgid "The following option(s) you selected might change data:\n" +msgstr "" + +#: pdiff.cpp:128 +#, kde-format +msgid "" +"\n" +"Most likely this is not wanted during a merge.\n" +"Do you want to disable these settings or continue with these settings active?" +msgstr "" + +#: pdiff.cpp:130 +#, kde-format +msgid "Option Unsafe for Merging" +msgstr "" + +#: pdiff.cpp:131 +#, kde-format +msgid "Use These Options During Merge" +msgstr "" + +#: pdiff.cpp:132 +#, kde-format +msgid "Disable Unsafe Options" +msgstr "" + +#: pdiff.cpp:160 +#, kde-format +msgid "Loading A" +msgstr "" + +#: pdiff.cpp:162 +#, kde-format +msgid "Loading A: %1" +msgstr "" + +#: pdiff.cpp:170 +#, kde-format +msgid "Loading B" +msgstr "" + +#: pdiff.cpp:201 pdiff.cpp:237 +#, kde-format +msgid "Diff: A <-> B" +msgstr "" + +#: pdiff.cpp:207 pdiff.cpp:275 pdiff.cpp:289 +#, kde-format +msgid "Linediff: A <-> B" +msgstr "" + +#: pdiff.cpp:224 +#, kde-format +msgid "Loading C" +msgstr "" + +#: pdiff.cpp:246 +#, kde-format +msgid "Diff: A <-> C" +msgstr "" + +#: pdiff.cpp:257 +#, kde-format +msgid "Diff: B <-> C" +msgstr "" + +#: pdiff.cpp:279 pdiff.cpp:293 +#, kde-format +msgid "Linediff: B <-> C" +msgstr "" + +#: pdiff.cpp:283 pdiff.cpp:297 +#, kde-format +msgid "Linediff: A <-> C" +msgstr "" + +#: pdiff.cpp:819 +#, kde-format +msgid "All input files contain the same text, but are not binary equal." +msgstr "" + +#: pdiff.cpp:825 pdiff.cpp:829 pdiff.cpp:833 +#, kde-format +msgid "Files %1 and %2 have equal text, but are not binary equal. \n" +msgstr "" + +#: pdiff.cpp:843 +#, kde-format +msgid "" +"Some input files do not seem to be pure text files.\n" +"Note that the KDiff3 merge was not meant for binary data.\n" +"Continue at your own risk." +msgstr "" + +#: pdiff.cpp:853 +#, kde-format +msgid ", B" +msgstr ", B" + +#: pdiff.cpp:855 +#, kde-format +msgid ", C" +msgstr ", C" + +#: pdiff.cpp:857 +#, kde-format +msgid "" +"Some input characters could not be converted to valid unicode.\n" +"You might be using the wrong codec. (e.g. UTF-8 for non UTF-8 files).\n" +"Do not save the result if unsure. Continue at your own risk.\n" +"Affected input files are in %1." +msgstr "" + +#: pdiff.cpp:1032 +#, kde-format +msgid "Abort" +msgstr "Aborta" + +#: pdiff.cpp:1038 pdiff.cpp:1129 +#, kde-format +msgid "Opening files..." +msgstr "" + +#: pdiff.cpp:1212 +#, kde-format +msgid "Cutting selection..." +msgstr "" + +#: pdiff.cpp:1233 +#, kde-format +msgid "Copying selection to clipboard..." +msgstr "" + +#: pdiff.cpp:1249 +#, kde-format +msgid "Inserting clipboard contents..." +msgstr "" + +#: pdiff.cpp:1705 +#, kde-format +msgid "Word wrap (Cancel disables word wrap)" +msgstr "" + +#: pdiff.cpp:1706 +#, kde-format +msgid "Calculating max width for horizontal scrollbar" +msgstr "" + +#: pdiff.cpp:1921 +#, kde-format +msgid "Save && Continue" +msgstr "" + +#: pdiff.cpp:1922 +#, kde-format +msgid "Continue Without Saving" +msgstr "" + +#: pdiff.cpp:2134 +#, kde-format +msgid "Search complete." +msgstr "Cerca complete." + +#: pdiff.cpp:2134 +#, kde-format +msgid "Search Complete" +msgstr "Cerca complete" + +#: pdiff.cpp:2385 +#, kde-format +msgid "Nothing is selected in either diff input window." +msgstr "" + +#: pdiff.cpp:2385 +#, kde-format +msgid "Error while adding manual diff range" +msgstr "" + +#: progress.cpp:61 progress.cpp:73 +#, kde-format +msgid "&Cancel" +msgstr "&Cancella" + +#: smalldialogs.cpp:61 +#, kde-format +msgid "A (Base):" +msgstr "A (Base):" + +#: smalldialogs.cpp:71 smalldialogs.cpp:90 smalldialogs.cpp:109 +#: smalldialogs.cpp:154 +#, kde-format +msgid "File..." +msgstr "File..." + +#: smalldialogs.cpp:73 smalldialogs.cpp:92 smalldialogs.cpp:111 +#: smalldialogs.cpp:156 +#, kde-format +msgid "Dir..." +msgstr "Dir..." + +#: smalldialogs.cpp:103 +#, kde-format +msgid "C (Optional):" +msgstr "" + +#: smalldialogs.cpp:126 +#, kde-format +msgid "Swap/Copy Names..." +msgstr "" + +#: smalldialogs.cpp:131 smalldialogs.cpp:132 smalldialogs.cpp:133 +#, kde-format +msgid "Swap %1<->%2" +msgstr "Swap %1<->%2" + +#: smalldialogs.cpp:134 smalldialogs.cpp:135 smalldialogs.cpp:136 +#, kde-format +msgid "Copy %1->Output" +msgstr "" + +#: smalldialogs.cpp:137 smalldialogs.cpp:138 smalldialogs.cpp:139 +#, kde-format +msgid "Swap %1<->Output" +msgstr "" + +#: smalldialogs.cpp:148 +#, kde-format +msgid "Output (optional):" +msgstr "" + +#: smalldialogs.cpp:178 +#, kde-format +msgid "Configure..." +msgstr "Configura..." + +#: smalldialogs.cpp:243 +#, kde-format +msgid "Open Directory" +msgstr "Aperi directorio" + +#: smalldialogs.cpp:244 +#, kde-format +msgid "Select Output File" +msgstr "" + +#: smalldialogs.cpp:403 +#, kde-format +msgid "Search text:" +msgstr "" + +#: smalldialogs.cpp:410 +#, kde-format +msgid "Case sensitive" +msgstr "Sensibile al differentia inter majusculas e minusculas" + +#: smalldialogs.cpp:413 +#, kde-format +msgid "Search A" +msgstr "" + +#: smalldialogs.cpp:418 +#, kde-format +msgid "Search B" +msgstr "" + +#: smalldialogs.cpp:423 +#, kde-format +msgid "Search C" +msgstr "" + +#: smalldialogs.cpp:428 +#, kde-format +msgid "Search output" +msgstr "" + +#: smalldialogs.cpp:435 +#, kde-format +msgid "&Search" +msgstr "&Cerca" + +#: smalldialogs.cpp:454 +#, kde-format +msgid "Regular Expression Tester" +msgstr "" + +#: smalldialogs.cpp:467 +#, kde-format +msgid "Example auto merge line:" +msgstr "" + +#: smalldialogs.cpp:469 +#, kde-format +msgid "To test auto merge, copy a line as used in your files." +msgstr "" + +#: smalldialogs.cpp:475 smalldialogs.cpp:503 smalldialogs.cpp:539 +#, kde-format +msgid "Match result:" +msgstr "" + +#: smalldialogs.cpp:494 +#, kde-format +msgid "Example history start line (with leading comment):" +msgstr "" + +#: smalldialogs.cpp:496 +#, kde-format +msgid "" +"Copy a history start line as used in your files,\n" +"including the leading comment." +msgstr "" + +#: smalldialogs.cpp:522 +#, kde-format +msgid "History sort key order:" +msgstr "" + +#: smalldialogs.cpp:530 +#, kde-format +msgid "Example history entry start line (without leading comment):" +msgstr "" + +#: smalldialogs.cpp:532 +#, kde-format +msgid "" +"Copy a history entry start line as used in your files,\n" +"but omit the leading comment." +msgstr "" + +#: smalldialogs.cpp:546 +#, kde-format +msgid "Sort key result:" +msgstr "" + +#: smalldialogs.cpp:594 smalldialogs.cpp:604 smalldialogs.cpp:624 +#, kde-format +msgid "Match success." +msgstr "" + +#: smalldialogs.cpp:598 smalldialogs.cpp:608 smalldialogs.cpp:630 +#, kde-format +msgid "Match failed." +msgstr "" + +#: smalldialogs.cpp:615 +#, kde-format +msgid "Opening and closing parentheses do not match in regular expression." +msgstr "" + +#: SourceData.cpp:153 +#, kde-format +msgid "Writing clipboard data to temp file failed." +msgstr "" + +#: SourceData.cpp:157 +#, kde-format +msgid "From Clipboard" +msgstr "Ex area de transferentia" + +#: SourceData.cpp:348 +#, kde-format +msgid "%1 is not a normal file." +msgstr "" + +#: SourceData.cpp:440 +#, kde-format +msgid " Temp file is: %1" +msgstr "" + +#: SourceData.cpp:445 +#, kde-format +msgid "" +"Preprocessing possibly failed. Check this command:\n" +"\n" +" %1\n" +"\n" +"The preprocessing command will be disabled now." +msgstr "" + +#: SourceData.cpp:456 SourceData.cpp:525 +#, kde-format +msgid "File %1 too large to process. Skipping." +msgstr "" + +#: SourceData.cpp:500 +#, kde-format +msgid "" +"The line-matching-preprocessing possibly failed. Check this command:\n" +"\n" +" %1\n" +"\n" +"The line-matching-preprocessing command will be disabled now." +msgstr "" + +#: Utils.cpp:77 +#, kde-format +msgid "Expecting space after closing quote." +msgstr "" + +#: Utils.cpp:80 +#, kde-format +msgid "Unmatched quote." +msgstr "" + +#: Utils.cpp:89 +#, kde-format +msgid "Unexpected quote character within argument." +msgstr "" + +#: Utils.cpp:96 +#, kde-format +msgid "No program specified." +msgstr "" \ No newline at end of file diff -Nru kdiff3-1.8.01/po/is/kdiff3.po kdiff3-1.8.3/po/is/kdiff3.po --- kdiff3-1.8.01/po/is/kdiff3.po 2019-05-18 01:02:05.000000000 +0000 +++ kdiff3-1.8.3/po/is/kdiff3.po 1970-01-01 00:00:00.000000000 +0000 @@ -1,3238 +0,0 @@ -# translation of kdiff3.po to icelandic -# Copyright (C) YEAR This_file_is_part_of_KDE -# This file is distributed under the same license as the PACKAGE package. -# -# Sveinn í Felli , 2009, 2015. -msgid "" -msgstr "" -"Project-Id-Version: kdiff3\n" -"Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2019-04-18 08:02+0200\n" -"PO-Revision-Date: 2015-01-29 09:07+0000\n" -"Last-Translator: Sveinn í Felli \n" -"Language-Team: Icelandic \n" -"Language: is\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"X-Generator: Lokalize 1.5\n" -"Plural-Forms: Plural-Forms: nplurals=2; plural=n != 1;\n" -"\n" -"\n" - -#, fuzzy, kde-format -msgctxt "NAME OF TRANSLATORS" -msgid "Your names" -msgstr "Sveinn í Felli" - -#, fuzzy, kde-format -msgctxt "EMAIL OF TRANSLATORS" -msgid "Your emails" -msgstr "sv1@fellsnet.is" - -#: difftextwindow.cpp:412 -#, kde-format -msgid "File %1: Line %2" -msgstr "" - -#: difftextwindow.cpp:414 -#, kde-format -msgid "File %1: Line not available" -msgstr "" - -#: difftextwindow.cpp:1780 -#, fuzzy, kde-format -msgid "Encoding:" -msgstr "Kóðun:" - -#: difftextwindow.cpp:1782 mergeresultwindow.cpp:3138 optiondialog.cpp:818 -#, kde-format -msgid "Line end style:" -msgstr "" - -#: difftextwindow.cpp:1810 directorymergewindow.cpp:382 -#: directorymergewindow.cpp:433 directorymergewindow.cpp:524 -#: directorymergewindow.cpp:3058 directorymergewindow.cpp:3189 -#: directorymergewindow.cpp:3417 mergeresultwindow.cpp:942 -#: mergeresultwindow.cpp:944 mergeresultwindow.cpp:946 -#: mergeresultwindow.cpp:948 mergeresultwindow.cpp:1814 -#: mergeresultwindow.cpp:3170 mergeresultwindow.cpp:3177 optiondialog.cpp:962 -#: optiondialog.cpp:975 pdiff.cpp:833 pdiff.cpp:835 pdiff.cpp:837 pdiff.cpp:839 -#: pdiff.cpp:861 smalldialogs.cpp:124 smalldialogs.cpp:126 smalldialogs.cpp:127 -#: smalldialogs.cpp:130 -#, fuzzy, kde-format -msgid "A" -msgstr "A" - -#: difftextwindow.cpp:1810 directorymergewindow.cpp:384 -#: directorymergewindow.cpp:436 directorymergewindow.cpp:526 -#: directorymergewindow.cpp:3064 directorymergewindow.cpp:3190 -#: directorymergewindow.cpp:3418 mergeresultwindow.cpp:942 -#: mergeresultwindow.cpp:944 mergeresultwindow.cpp:950 -#: mergeresultwindow.cpp:952 mergeresultwindow.cpp:1816 -#: mergeresultwindow.cpp:3172 mergeresultwindow.cpp:3179 optiondialog.cpp:963 -#: optiondialog.cpp:976 pdiff.cpp:833 pdiff.cpp:835 pdiff.cpp:841 pdiff.cpp:843 -#: pdiff.cpp:863 smalldialogs.cpp:124 smalldialogs.cpp:125 smalldialogs.cpp:128 -#: smalldialogs.cpp:131 -#, fuzzy, kde-format -msgid "B" -msgstr "B" - -#: difftextwindow.cpp:1810 directorymergewindow.cpp:386 -#: directorymergewindow.cpp:439 directorymergewindow.cpp:528 -#: directorymergewindow.cpp:3070 directorymergewindow.cpp:3191 -#: directorymergewindow.cpp:3419 mergeresultwindow.cpp:946 -#: mergeresultwindow.cpp:948 mergeresultwindow.cpp:950 -#: mergeresultwindow.cpp:952 mergeresultwindow.cpp:1818 -#: mergeresultwindow.cpp:3174 mergeresultwindow.cpp:3181 optiondialog.cpp:977 -#: pdiff.cpp:837 pdiff.cpp:839 pdiff.cpp:841 pdiff.cpp:843 pdiff.cpp:865 -#: smalldialogs.cpp:125 smalldialogs.cpp:126 smalldialogs.cpp:129 -#: smalldialogs.cpp:132 -#, fuzzy, kde-format -msgid "C" -msgstr "C" - -#: difftextwindow.cpp:1810 -#, kde-format -msgid "A (Base)" -msgstr "" - -#: difftextwindow.cpp:1812 -#, fuzzy, kde-format -msgid "Encoding: %1" -msgstr "Kóðun:" - -#: difftextwindow.cpp:1813 mergeresultwindow.cpp:3183 -#, kde-format -msgid "Unix" -msgstr "" - -#: difftextwindow.cpp:1813 mergeresultwindow.cpp:3184 -#, fuzzy, kde-format -msgid "DOS" -msgstr "DOS" - -#: difftextwindow.cpp:1813 -#, kde-format -msgid "Line end style: %1" -msgstr "" - -#: difftextwindow.cpp:1835 kdiff3.cpp:873 -#, kde-format -msgid "Top line" -msgstr "" - -#: difftextwindow.cpp:1845 -#, fuzzy, kde-format -msgid "End" -msgstr "Endir" - -#: difftextwindow.cpp:1903 smalldialogs.cpp:235 -#, fuzzy, kde-format -msgid "Open File" -msgstr "Skrá" - -#: difftextwindow.cpp:1951 optiondialog.cpp:387 -#, kde-format -msgid "Unicode, 8 bit" -msgstr "" - -#: difftextwindow.cpp:1966 -#, kde-format -msgid "Other" -msgstr "" - -#: directorymergewindow.cpp:409 directorymergewindow.cpp:3424 -#, kde-format -msgid "Copy A to B" -msgstr "" - -#: directorymergewindow.cpp:412 directorymergewindow.cpp:3425 -#, kde-format -msgid "Copy B to A" -msgstr "" - -#: directorymergewindow.cpp:415 directorymergewindow.cpp:3426 -#, kde-format -msgid "Delete A" -msgstr "" - -#: directorymergewindow.cpp:418 directorymergewindow.cpp:3427 -#, kde-format -msgid "Delete B" -msgstr "" - -#: directorymergewindow.cpp:421 -#, kde-format -msgid "Delete A & B" -msgstr "" - -#: directorymergewindow.cpp:424 directorymergewindow.cpp:3429 -#, kde-format -msgid "Merge to A" -msgstr "" - -#: directorymergewindow.cpp:427 directorymergewindow.cpp:3430 -#, kde-format -msgid "Merge to B" -msgstr "" - -#: directorymergewindow.cpp:430 -#, kde-format -msgid "Merge to A & B" -msgstr "" - -#: directorymergewindow.cpp:442 directorymergewindow.cpp:3421 -#, kde-format -msgid "Delete (if exists)" -msgstr "" - -#: directorymergewindow.cpp:445 directorymergewindow.cpp:448 -#: directorymergewindow.cpp:3420 optiondialog.cpp:925 smalldialogs.cpp:113 -#, fuzzy, kde-format -msgid "Merge" -msgstr "Sameina" - -#: directorymergewindow.cpp:445 directorymergewindow.cpp:448 -#, kde-format -msgid "Merge (manual)" -msgstr "" - -#: directorymergewindow.cpp:451 -#, kde-format -msgid "Error: Conflicting File Types" -msgstr "" - -#: directorymergewindow.cpp:454 -#, kde-format -msgid "Error: Changed and Deleted" -msgstr "" - -#: directorymergewindow.cpp:457 -#, kde-format -msgid "Error: Dates are equal but files are not." -msgstr "" - -#: directorymergewindow.cpp:471 -#, fuzzy, kde-format -msgid "Done" -msgstr "Lokið." - -#: directorymergewindow.cpp:473 -#, fuzzy, kde-format -msgid "Error" -msgstr "Villa" - -#: directorymergewindow.cpp:475 -#, fuzzy, kde-format -msgid "Skipped." -msgstr "Sleppt." - -#: directorymergewindow.cpp:477 -#, kde-format -msgid "Not saved." -msgstr "" - -#: directorymergewindow.cpp:479 -#, kde-format -msgid "In progress..." -msgstr "" - -#: directorymergewindow.cpp:481 -#, kde-format -msgid "To do." -msgstr "" - -#: directorymergewindow.cpp:522 -#, fuzzy, kde-format -msgid "Name" -msgstr "Nafn" - -#: directorymergewindow.cpp:530 -#, fuzzy, kde-format -msgid "Operation" -msgstr "Aðgerð" - -#: directorymergewindow.cpp:532 -#, fuzzy, kde-format -msgid "Status" -msgstr "Staða" - -#: directorymergewindow.cpp:534 -#, kde-format -msgid "Unsolved" -msgstr "" - -#: directorymergewindow.cpp:536 -#, kde-format -msgid "Solved" -msgstr "" - -#: directorymergewindow.cpp:538 -#, kde-format -msgid "Nonwhite" -msgstr "" - -#: directorymergewindow.cpp:540 -#, fuzzy, kde-format -msgid "White" -msgstr "Hvítur" - -#: directorymergewindow.cpp:674 -#, kde-format -msgid "Unable to compare non-normal file with normal file." -msgstr "" - -#: directorymergewindow.cpp:688 -#, kde-format -msgid "Mix of links and normal files." -msgstr "" - -#: directorymergewindow.cpp:695 -#, kde-format -msgid "Link: " -msgstr "" - -#: directorymergewindow.cpp:704 -#, kde-format -msgid "Size. " -msgstr "" - -#: directorymergewindow.cpp:718 directorymergewindow.cpp:728 -#, kde-format -msgid "Date & Size: " -msgstr "" - -#: directorymergewindow.cpp:748 -#, kde-format -msgid "Comparing file..." -msgstr "" - -#: directorymergewindow.cpp:801 -#, kde-format -msgid "" -"You are currently doing a directory merge. Are you sure, you want to abort " -"the merge and rescan the directory?" -msgstr "" - -#: directorymergewindow.cpp:802 kdiff3.cpp:698 kdiff3.cpp:708 kdiff3.cpp:720 -#: mergeresultwindow.cpp:372 pdiff.cpp:1033 pdiff.cpp:1910 pdiff.cpp:1920 -#, fuzzy, kde-format -msgid "Warning" -msgstr "Aðvörun" - -#: directorymergewindow.cpp:803 directorymergewindow.cpp:3393 -#, fuzzy, kde-format -msgid "Rescan" -msgstr "Skanna aftur" - -#: directorymergewindow.cpp:804 pdiff.cpp:1035 -#, kde-format -msgid "Continue Merging" -msgstr "" - -#: directorymergewindow.cpp:971 -#, kde-format -msgid "Opening of directories failed:" -msgstr "" - -#: directorymergewindow.cpp:975 -#, kde-format -msgid "Dir A \"%1\" does not exist or is not a directory.\n" -msgstr "" - -#: directorymergewindow.cpp:980 -#, kde-format -msgid "Dir B \"%1\" does not exist or is not a directory.\n" -msgstr "" - -#: directorymergewindow.cpp:985 -#, kde-format -msgid "Dir C \"%1\" does not exist or is not a directory.\n" -msgstr "" - -#: directorymergewindow.cpp:988 -#, kde-format -msgid "Directory Open Error" -msgstr "" - -#: directorymergewindow.cpp:996 -#, kde-format -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:998 -#, kde-format -msgid "Parameter Warning" -msgstr "" - -#: directorymergewindow.cpp:1003 -#, kde-format -msgid "Scanning directories..." -msgstr "" - -#: directorymergewindow.cpp:1029 -#, kde-format -msgid "Reading Directory A" -msgstr "" - -#: directorymergewindow.cpp:1038 -#, kde-format -msgid "Reading Directory B" -msgstr "" - -#: directorymergewindow.cpp:1048 -#, kde-format -msgid "Reading Directory C" -msgstr "" - -#: directorymergewindow.cpp:1064 -#, kde-format -msgid "Some subdirectories were not readable in" -msgstr "" - -#: directorymergewindow.cpp:1069 -#, kde-format -msgid "Check the permissions of the subdirectories." -msgstr "" - -#: directorymergewindow.cpp:1106 kdiff3.cpp:666 kdiff3.cpp:753 kdiff3.cpp:777 -#: kdiff3.cpp:1065 kdiff3.cpp:1086 pdiff.cpp:1116 pdiff.cpp:1170 pdiff.cpp:1218 -#: pdiff.cpp:1234 pdiff.cpp:1277 pdiff.cpp:1301 -#, fuzzy, kde-format -msgid "Ready." -msgstr "Tilbúin." - -#: directorymergewindow.cpp:1121 -#, kde-format -msgid "" -"Directory Comparison Status\n" -"\n" -"Number of subdirectories: %1\n" -"Number of equal files: %2\n" -"Number of different files: %3" -msgstr "" - -#: directorymergewindow.cpp:1128 -#, kde-format -msgid "Number of manual merges: %1" -msgstr "" - -#: directorymergewindow.cpp:1394 -#, kde-format -msgid "This affects all merge operations." -msgstr "" - -#: directorymergewindow.cpp:1395 -#, kde-format -msgid "Changing All Merge Operations" -msgstr "" - -#: directorymergewindow.cpp:1695 -#, kde-format -msgid "" -"Processing %1 / %2\n" -"%3" -msgstr "" - -#: directorymergewindow.cpp:1738 directorymergewindow.cpp:1742 -#, kde-format -msgid "Some files could not be processed." -msgstr "" - -#: directorymergewindow.cpp:2222 directorymergewindow.cpp:2247 -#: directorymergewindow.cpp:2271 -#, kde-format -msgid "This operation is currently not possible." -msgstr "" - -#: directorymergewindow.cpp:2222 directorymergewindow.cpp:2247 -#: directorymergewindow.cpp:2271 directorymergewindow.cpp:2552 -#, kde-format -msgid "Operation Not Possible" -msgstr "" - -#: directorymergewindow.cpp:2318 -#, kde-format -msgid "An error occurred while copying." -msgstr "" - -#: directorymergewindow.cpp:2319 directorymergewindow.cpp:2759 -#, kde-format -msgid "Merge Error" -msgstr "" - -#: directorymergewindow.cpp:2396 -#, kde-format -msgid "Unknown merge operation. (This must never happen!)" -msgstr "" - -#: directorymergewindow.cpp:2441 -#, kde-format -msgid "Unknown merge operation." -msgstr "" - -#: directorymergewindow.cpp:2454 -#, kde-format -msgid "" -"The merge is about to begin.\n" -"\n" -"Choose \"Do it\" if you have read the instructions and know what you are " -"doing.\n" -"Choosing \"Simulate it\" will tell you what would happen.\n" -"\n" -"Be aware that this program still has beta status and there is NO WARRANTY " -"whatsoever! Make backups of your vital data!" -msgstr "" - -#: directorymergewindow.cpp:2459 -#, kde-format -msgid "Starting Merge" -msgstr "" - -#: directorymergewindow.cpp:2460 -#, kde-format -msgid "Do It" -msgstr "" - -#: directorymergewindow.cpp:2461 -#, kde-format -msgid "Simulate It" -msgstr "" - -#: directorymergewindow.cpp:2487 -#, kde-format -msgid "" -"The highlighted item has a different type in the different directories. " -"Select what to do." -msgstr "" - -#: directorymergewindow.cpp:2491 -#, kde-format -msgid "" -"The modification dates of the file are equal but the files are not. Select " -"what to do." -msgstr "" - -#: directorymergewindow.cpp:2495 -#, kde-format -msgid "" -"The highlighted item was changed in one directory and deleted in the other. " -"Select what to do." -msgstr "" - -#: directorymergewindow.cpp:2552 -#, kde-format -msgid "" -"This operation is currently not possible because directory merge is " -"currently running." -msgstr "" - -#: directorymergewindow.cpp:2609 -#, kde-format -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:2611 -#, kde-format -msgid "Continue merge after an error" -msgstr "" - -#: directorymergewindow.cpp:2612 -#, kde-format -msgid "Continue With Last Item" -msgstr "" - -#: directorymergewindow.cpp:2613 -#, kde-format -msgid "Skip Item" -msgstr "" - -#: directorymergewindow.cpp:2709 -#, kde-format -msgid "Merge operation complete." -msgstr "" - -#: directorymergewindow.cpp:2709 directorymergewindow.cpp:2712 -#, kde-format -msgid "Merge Complete" -msgstr "" - -#: directorymergewindow.cpp:2722 -#, kde-format -msgid "" -"Simulated merge complete: Check if you agree with the proposed operations." -msgstr "" - -#: directorymergewindow.cpp:2758 -#, kde-format -msgid "An error occurred. Press OK to see detailed information." -msgstr "" - -#: directorymergewindow.cpp:2791 -#, kde-format -msgid "Error: While deleting %1: Creating backup failed." -msgstr "" - -#: directorymergewindow.cpp:2798 -#, kde-format -msgid "delete directory recursively( %1 )" -msgstr "" - -#: directorymergewindow.cpp:2800 -#, kde-format -msgid "delete( %1 )" -msgstr "" - -#: directorymergewindow.cpp:2815 -#, kde-format -msgid "Error: delete dir operation failed while trying to read the directory." -msgstr "" - -#: directorymergewindow.cpp:2834 -#, kde-format -msgid "Error: rmdir( %1 ) operation failed." -msgstr "" - -#: directorymergewindow.cpp:2844 -#, kde-format -msgid "Error: delete operation failed." -msgstr "" - -#: directorymergewindow.cpp:2870 -#, kde-format -msgid "manual merge( %1, %2, %3 -> %4)" -msgstr "" - -#: directorymergewindow.cpp:2873 -#, kde-format -msgid "" -" Note: After a manual merge the user should continue by pressing F7." -msgstr "" - -#: directorymergewindow.cpp:2900 -#, kde-format -msgid "Error: copy( %1 -> %2 ) failed.Deleting existing destination failed." -msgstr "" - -#: directorymergewindow.cpp:2909 -#, kde-format -msgid "copyLink( %1 -> %2 )" -msgstr "" - -#: directorymergewindow.cpp:2918 -#, kde-format -msgid "Error: copyLink failed: Remote links are not yet supported." -msgstr "" - -#: directorymergewindow.cpp:2928 -#, kde-format -msgid "Error: copyLink failed." -msgstr "" - -#: directorymergewindow.cpp:2953 -#, kde-format -msgid "copy( %1 -> %2 )" -msgstr "" - -#: directorymergewindow.cpp:2979 -#, kde-format -msgid "Error during rename( %1 -> %2 ): Cannot delete existing destination." -msgstr "" - -#: directorymergewindow.cpp:2986 -#, kde-format -msgid "rename( %1 -> %2 )" -msgstr "" - -#: directorymergewindow.cpp:2995 -#, kde-format -msgid "Error: Rename failed." -msgstr "" - -#: directorymergewindow.cpp:3013 -#, kde-format -msgid "Error during makeDir of %1. Cannot delete existing file." -msgstr "" - -#: directorymergewindow.cpp:3030 -#, kde-format -msgid "makeDir( %1 )" -msgstr "" - -#: directorymergewindow.cpp:3040 -#, kde-format -msgid "Error while creating directory." -msgstr "" - -#: directorymergewindow.cpp:3076 directorymergewindow.cpp:3195 -#, kde-format -msgid "Dest" -msgstr "" - -#: directorymergewindow.cpp:3084 directorymergewindow.cpp:3113 -#, kde-format -msgid "Dir" -msgstr "" - -#: directorymergewindow.cpp:3084 -#, fuzzy, kde-format -msgid "Type" -msgstr "Tegund" - -#: directorymergewindow.cpp:3084 -#, fuzzy, kde-format -msgid "Size" -msgstr "Stærð" - -#: directorymergewindow.cpp:3085 -#, kde-format -msgid "Attr" -msgstr "" - -#: directorymergewindow.cpp:3085 -#, kde-format -msgid "Last Modification" -msgstr "" - -#: directorymergewindow.cpp:3085 -#, kde-format -msgid "Link-Destination" -msgstr "" - -#: directorymergewindow.cpp:3113 -#, fuzzy, kde-format -msgid "File" -msgstr "Skrá" - -#: directorymergewindow.cpp:3113 -#, kde-format -msgid "-Link" -msgstr "" - -#: directorymergewindow.cpp:3119 -#, kde-format -msgid "not available" -msgstr "" - -#: directorymergewindow.cpp:3137 -#, kde-format -msgid "A (Dest): " -msgstr "" - -#: directorymergewindow.cpp:3141 -#, kde-format -msgid "A: " -msgstr "" - -#: directorymergewindow.cpp:3141 -#, kde-format -msgid "A (Base): " -msgstr "" - -#: directorymergewindow.cpp:3147 -#, kde-format -msgid "B (Dest): " -msgstr "" - -#: directorymergewindow.cpp:3151 -#, kde-format -msgid "B: " -msgstr "" - -#: directorymergewindow.cpp:3156 -#, kde-format -msgid "C (Dest): " -msgstr "" - -#: directorymergewindow.cpp:3160 -#, kde-format -msgid "C: " -msgstr "" - -#: directorymergewindow.cpp:3163 -#, kde-format -msgid "Dest: " -msgstr "" - -#. i18n("Saving Directory Merge State ...")); -#: directorymergewindow.cpp:3238 -#, kde-format -msgid "Save Directory Merge State As..." -msgstr "" - -#: directorymergewindow.cpp:3387 -#, kde-format -msgid "Start/Continue Directory Merge" -msgstr "" - -#: directorymergewindow.cpp:3388 -#, kde-format -msgid "Run Operation for Current Item" -msgstr "" - -#: directorymergewindow.cpp:3389 -#, kde-format -msgid "Compare Selected File" -msgstr "" - -#: directorymergewindow.cpp:3390 -#, kde-format -msgid "Merge Current File" -msgstr "" - -#: directorymergewindow.cpp:3390 -#, kde-format -msgid "" -"Merge\n" -"File" -msgstr "" - -#: directorymergewindow.cpp:3391 -#, kde-format -msgid "Fold All Subdirs" -msgstr "" - -#: directorymergewindow.cpp:3392 -#, kde-format -msgid "Unfold All Subdirs" -msgstr "" - -#. i18n("Save Directory Merge State ..."), 0, this, &DirectoryMergeWindow::slotSaveMergeState, ac, "dir_save_merge_state"); -#. i18n("Load Directory Merge State ..."), 0, this, &DirectoryMergeWindow::slotLoadMergeState, ac, "dir_load_merge_state"); -#: directorymergewindow.cpp:3396 -#, kde-format -msgid "Choose A for All Items" -msgstr "" - -#: directorymergewindow.cpp:3397 -#, kde-format -msgid "Choose B for All Items" -msgstr "" - -#: directorymergewindow.cpp:3398 -#, kde-format -msgid "Choose C for All Items" -msgstr "" - -#: directorymergewindow.cpp:3399 -#, kde-format -msgid "Auto-Choose Operation for All Items" -msgstr "" - -#: directorymergewindow.cpp:3400 -#, kde-format -msgid "No Operation for All Items" -msgstr "" - -#. i18n("Synchronize Directories"), 0, this, &DirectoryMergeWindow::slotSynchronizeDirectories, ac, "dir_synchronize_directories"); -#. d->m_pDirChooseNewerFiles = GuiUtils::createAction< KToggleAction >(i18n("Copy Newer Files Instead of Merging"), 0, this, &DirectoryMergeWindow::slotChooseNewerFiles, ac, "dir_choose_newer_files"); -#: directorymergewindow.cpp:3405 -#, kde-format -msgid "Show Identical Files" -msgstr "" - -#: directorymergewindow.cpp:3405 -#, kde-format -msgid "" -"Identical\n" -"Files" -msgstr "" - -#: directorymergewindow.cpp:3406 -#, kde-format -msgid "Show Different Files" -msgstr "" - -#: directorymergewindow.cpp:3407 -#, kde-format -msgid "Show Files only in A" -msgstr "" - -#: directorymergewindow.cpp:3407 -#, kde-format -msgid "" -"Files\n" -"only in A" -msgstr "" - -#: directorymergewindow.cpp:3408 -#, kde-format -msgid "Show Files only in B" -msgstr "" - -#: directorymergewindow.cpp:3408 -#, kde-format -msgid "" -"Files\n" -"only in B" -msgstr "" - -#: directorymergewindow.cpp:3409 -#, kde-format -msgid "Show Files only in C" -msgstr "" - -#: directorymergewindow.cpp:3409 -#, kde-format -msgid "" -"Files\n" -"only in C" -msgstr "" - -#: directorymergewindow.cpp:3413 -#, kde-format -msgid "Compare Explicitly Selected Files" -msgstr "" - -#: directorymergewindow.cpp:3414 -#, kde-format -msgid "Merge Explicitly Selected Files" -msgstr "" - -#: directorymergewindow.cpp:3416 directorymergewindow.cpp:3423 -#, fuzzy, kde-format -msgid "Do Nothing" -msgstr "Gera ekkert" - -#: directorymergewindow.cpp:3428 -#, kde-format -msgid "Delete A && B" -msgstr "" - -#: directorymergewindow.cpp:3431 -#, kde-format -msgid "Merge to A && B" -msgstr "" - -#: fileaccess.cpp:462 SourceData.cpp:493 -#, kde-format -msgid "Failed to read file: %1" -msgstr "" - -#: fileaccess.cpp:587 -#, kde-format -msgid "Creating temp copy of %1 failed." -msgstr "" - -#: fileaccess.cpp:595 fileaccess.cpp:600 -#, kde-format -msgid "Opening %1 failed. %2" -msgstr "" - -#: fileaccess.cpp:619 fileaccess.cpp:627 -#, kde-format -msgid "Error reading from %1. %2" -msgstr "" - -#: fileaccess.cpp:751 -#, kde-format -msgid "" -"While trying to make a backup, deleting an older backup failed.\n" -"Filename: %1" -msgstr "" - -#: fileaccess.cpp:758 -#, kde-format -msgid "" -"While trying to make a backup, renaming failed.\n" -"Filenames: %1 -> %2" -msgstr "" - -#: fileaccess.cpp:828 -#, kde-format -msgid "Getting file status: %1" -msgstr "" - -#: fileaccess.cpp:869 -#, kde-format -msgid "Reading file: %1" -msgstr "" - -#: fileaccess.cpp:907 -#, kde-format -msgid "Writing file: %1" -msgstr "" - -#: fileaccess.cpp:940 -#, fuzzy, kde-format -msgid "Out of memory" -msgstr "Ekkert minni eftir" - -#: fileaccess.cpp:976 -#, kde-format -msgid "Making directory: %1" -msgstr "" - -#: fileaccess.cpp:997 -#, kde-format -msgid "Removing directory: %1" -msgstr "" - -#: fileaccess.cpp:1012 -#, kde-format -msgid "Removing file: %1" -msgstr "" - -#: fileaccess.cpp:1028 -#, kde-format -msgid "Creating symbolic link: %1 -> %2" -msgstr "" - -#: fileaccess.cpp:1052 -#, kde-format -msgid "Renaming file: %1 -> %2" -msgstr "" - -#: fileaccess.cpp:1086 -#, kde-format -msgid "Copying file: %1 -> %2" -msgstr "" - -#: fileaccess.cpp:1108 -#, fuzzy, kde-format -msgid "Reading directory: %1" -msgstr "Mappa" - -#: fileaccess.cpp:1162 -#, kde-format -msgid "Listing directory: %1" -msgstr "" - -#: kdiff3.cpp:181 -#, kde-format -msgid "Current Configuration:" -msgstr "" - -#: kdiff3.cpp:186 -#, kde-format -msgid "Config Option Error:" -msgstr "" - -#: kdiff3.cpp:240 -#, kde-format -msgid "Option --auto used, but no output file specified." -msgstr "" - -#: kdiff3.cpp:416 -#, kde-format -msgid "Option --auto ignored for directory comparison." -msgstr "" - -#: kdiff3.cpp:460 -#, kde-format -msgid "Saving failed." -msgstr "" - -#: kdiff3.cpp:496 pdiff.cpp:1098 -#, kde-format -msgid "Opening of these files failed:" -msgstr "" - -#: kdiff3.cpp:505 -#, kde-format -msgid "File Open Error" -msgstr "" - -#: kdiff3.cpp:533 -#, kde-format -msgid "Opens documents for comparison..." -msgstr "" - -#: kdiff3.cpp:535 -#, fuzzy, kde-format -msgid "Reload" -msgstr "Endurlesa" - -#: kdiff3.cpp:538 -#, kde-format -msgid "Saves the merge result. All conflicts must be solved!" -msgstr "" - -#: kdiff3.cpp:540 -#, kde-format -msgid "Saves the current document as..." -msgstr "" - -#: kdiff3.cpp:543 -#, kde-format -msgid "Print the differences" -msgstr "" - -#: kdiff3.cpp:546 -#, fuzzy, kde-format -msgid "Quits the application" -msgstr "Hættir í forritinu" - -#: kdiff3.cpp:549 -#, fuzzy, kde-format -msgid "Cuts the selected section and puts it to the clipboard" -msgstr "klippir það sem nú er valið og bætir því við klemmuspjaldið" - -#: kdiff3.cpp:552 -#, fuzzy, kde-format -msgid "Copies the selected section to the clipboard" -msgstr "Afritar það sem nú er valið á klemmuspjaldið" - -#: kdiff3.cpp:554 -#, fuzzy, kde-format -msgid "Pastes the clipboard contents to current position" -msgstr "Límir innihaldi klemmuspjaldsins á núverandi stað" - -#: kdiff3.cpp:557 -#, kde-format -msgid "Select everything in current window" -msgstr "" - -#: kdiff3.cpp:560 -#, kde-format -msgid "Search for a string" -msgstr "" - -#: kdiff3.cpp:562 -#, kde-format -msgid "Search again for the string" -msgstr "" - -#: kdiff3.cpp:567 -#, fuzzy, kde-format -msgid "Enables/disables the statusbar" -msgstr "Virkja/slökkva á stöðustikunni" - -#: kdiff3.cpp:571 -#, kde-format -msgid "Configure KDiff3..." -msgstr "" - -#: kdiff3.cpp:590 -#, kde-format -msgid "Go to Current Delta" -msgstr "" - -#: kdiff3.cpp:590 -#, kde-format -msgid "" -"Current\n" -"Delta" -msgstr "" - -#: kdiff3.cpp:592 -#, kde-format -msgid "Go to First Delta" -msgstr "" - -#: kdiff3.cpp:592 -#, kde-format -msgid "" -"First\n" -"Delta" -msgstr "" - -#: kdiff3.cpp:594 -#, kde-format -msgid "Go to Last Delta" -msgstr "" - -#: kdiff3.cpp:594 -#, kde-format -msgid "" -"Last\n" -"Delta" -msgstr "" - -#: kdiff3.cpp:596 -#, kde-format -msgid "(Skips white space differences when \"Show White Space\" is disabled.)" -msgstr "" - -#: kdiff3.cpp:597 -#, kde-format -msgid "" -"(Does not skip white space differences even when \"Show White Space\" is " -"disabled.)" -msgstr "" - -#: kdiff3.cpp:598 -#, kde-format -msgid "Go to Previous Delta" -msgstr "" - -#: kdiff3.cpp:598 -#, kde-format -msgid "" -"Prev\n" -"Delta" -msgstr "" - -#: kdiff3.cpp:600 -#, kde-format -msgid "Go to Next Delta" -msgstr "" - -#: kdiff3.cpp:600 -#, kde-format -msgid "" -"Next\n" -"Delta" -msgstr "" - -#: kdiff3.cpp:602 -#, kde-format -msgid "Go to Previous Conflict" -msgstr "" - -#: kdiff3.cpp:602 -#, kde-format -msgid "" -"Prev\n" -"Conflict" -msgstr "" - -#: kdiff3.cpp:604 -#, kde-format -msgid "Go to Next Conflict" -msgstr "" - -#: kdiff3.cpp:604 -#, kde-format -msgid "" -"Next\n" -"Conflict" -msgstr "" - -#: kdiff3.cpp:606 -#, kde-format -msgid "Go to Previous Unsolved Conflict" -msgstr "" - -#: kdiff3.cpp:606 -#, kde-format -msgid "" -"Prev\n" -"Unsolved" -msgstr "" - -#: kdiff3.cpp:608 -#, kde-format -msgid "Go to Next Unsolved Conflict" -msgstr "" - -#: kdiff3.cpp:608 -#, kde-format -msgid "" -"Next\n" -"Unsolved" -msgstr "" - -#: kdiff3.cpp:610 -#, kde-format -msgid "Select Line(s) From A" -msgstr "" - -#: kdiff3.cpp:610 -#, kde-format -msgid "" -"Choose\n" -"A" -msgstr "" - -#: kdiff3.cpp:611 -#, kde-format -msgid "Select Line(s) From B" -msgstr "" - -#: kdiff3.cpp:611 -#, kde-format -msgid "" -"Choose\n" -"B" -msgstr "" - -#: kdiff3.cpp:612 -#, kde-format -msgid "Select Line(s) From C" -msgstr "" - -#: kdiff3.cpp:612 -#, kde-format -msgid "" -"Choose\n" -"C" -msgstr "" - -#: kdiff3.cpp:613 -#, kde-format -msgid "Automatically Go to Next Unsolved Conflict After Source Selection" -msgstr "" - -#: kdiff3.cpp:613 -#, kde-format -msgid "" -"Auto\n" -"Next" -msgstr "" - -#: kdiff3.cpp:615 -#, kde-format -msgid "Show Space && Tabulator Characters" -msgstr "" - -#: kdiff3.cpp:615 -#, kde-format -msgid "" -"White\n" -"Characters" -msgstr "" - -#: kdiff3.cpp:616 -#, kde-format -msgid "Show White Space" -msgstr "" - -#: kdiff3.cpp:616 -#, kde-format -msgid "" -"White\n" -"Deltas" -msgstr "" - -#: kdiff3.cpp:618 -#, kde-format -msgid "Show Line Numbers" -msgstr "" - -#: kdiff3.cpp:618 -#, kde-format -msgid "" -"Line\n" -"Numbers" -msgstr "" - -#: kdiff3.cpp:620 -#, kde-format -msgid "Automatically Solve Simple Conflicts" -msgstr "" - -#: kdiff3.cpp:621 -#, kde-format -msgid "Set Deltas to Conflicts" -msgstr "" - -#: kdiff3.cpp:622 -#, kde-format -msgid "Run Regular Expression Auto Merge" -msgstr "" - -#: kdiff3.cpp:623 -#, kde-format -msgid "Automatically Solve History Conflicts" -msgstr "" - -#: kdiff3.cpp:624 -#, kde-format -msgid "Split Diff At Selection" -msgstr "" - -#: kdiff3.cpp:625 -#, kde-format -msgid "Join Selected Diffs" -msgstr "" - -#: kdiff3.cpp:627 -#, kde-format -msgid "Show Window A" -msgstr "" - -#: kdiff3.cpp:628 -#, kde-format -msgid "Show Window B" -msgstr "" - -#: kdiff3.cpp:629 -#, kde-format -msgid "Show Window C" -msgstr "" - -#: kdiff3.cpp:631 -#, kde-format -msgid "Normal Overview" -msgstr "" - -#: kdiff3.cpp:632 -#, kde-format -msgid "A vs. B Overview" -msgstr "" - -#: kdiff3.cpp:633 -#, kde-format -msgid "A vs. C Overview" -msgstr "" - -#: kdiff3.cpp:634 -#, kde-format -msgid "B vs. C Overview" -msgstr "" - -#: kdiff3.cpp:635 -#, kde-format -msgid "Word Wrap Diff Windows" -msgstr "" - -#: kdiff3.cpp:636 -#, kde-format -msgid "Add Manual Diff Alignment" -msgstr "" - -#: kdiff3.cpp:637 -#, kde-format -msgid "Clear All Manual Diff Alignments" -msgstr "" - -#: kdiff3.cpp:639 -#, kde-format -msgid "Focus Next Window" -msgstr "" - -#: kdiff3.cpp:640 -#, kde-format -msgid "Focus Prev Window" -msgstr "" - -#: kdiff3.cpp:641 -#, kde-format -msgid "Toggle Split Orientation" -msgstr "" - -#: kdiff3.cpp:643 -#, kde-format -msgid "Dir && Text Split Screen View" -msgstr "" - -#: kdiff3.cpp:645 -#, kde-format -msgid "Toggle Between Dir && Text View" -msgstr "" - -#: kdiff3.cpp:697 pdiff.cpp:1909 -#, kde-format -msgid "The merge result has not been saved." -msgstr "" - -#: kdiff3.cpp:699 -#, kde-format -msgid "Save && Quit" -msgstr "" - -#: kdiff3.cpp:700 -#, kde-format -msgid "Quit Without Saving" -msgstr "" - -#: kdiff3.cpp:708 pdiff.cpp:1920 -#, kde-format -msgid "Saving the merge result failed." -msgstr "" - -#: kdiff3.cpp:719 pdiff.cpp:1032 -#, kde-format -msgid "" -"You are currently doing a directory merge. Are you sure, you want to abort?" -msgstr "" - -#: kdiff3.cpp:742 -#, fuzzy, kde-format -msgid "Saving file..." -msgstr "Vista skrá..." - -#: kdiff3.cpp:759 -#, fuzzy, kde-format -msgid "Saving file with a new filename..." -msgstr "Vista skrá með nýju skráarnafni..." - -#: kdiff3.cpp:761 -#, fuzzy, kde-format -msgid "Save As..." -msgstr "Vista sem..." - -#: kdiff3.cpp:820 -#, fuzzy, kde-format -msgid "Printing not implemented." -msgstr "Prentun stöðvuð." - -#: kdiff3.cpp:857 -#, fuzzy, kde-format -msgid "Printing..." -msgstr "Prenta..." - -#: kdiff3.cpp:943 -#, kde-format -msgid "Printing page %1 of %2" -msgstr "" - -#: kdiff3.cpp:1000 -#, fuzzy, kde-format -msgid " (Selection)" -msgstr "Val" - -#: kdiff3.cpp:1027 -#, kde-format -msgid "Printing completed." -msgstr "" - -#: kdiff3.cpp:1031 -#, fuzzy, kde-format -msgid "Printing aborted." -msgstr "Prentun stöðvuð." - -#: kdiff3.cpp:1038 -#, fuzzy, kde-format -msgid "Exiting..." -msgstr "Hætti..." - -#: kdiff3.cpp:1049 -#, fuzzy, kde-format -msgid "Toggling toolbar..." -msgstr "Birta/fela tækjaslá..." - -#: kdiff3.cpp:1070 -#, fuzzy, kde-format -msgid "Toggle the statusbar..." -msgstr "Birta/fela stöðuslá..." - -#: kdiff3_part.cpp:45 -#, fuzzy, kde-format -msgid "KDiff3 Part" -msgstr "Diff" - -#: kdiff3_part.cpp:46 -#, kde-format -msgid "A KPart to display SVG images" -msgstr "" - -#: kdiff3_part.cpp:48 -#, kde-format -msgid "Copyright 2007, Aurélien Gâteau " -msgstr "" - -#: kdiff3_part.cpp:49 -#, kde-format -msgid "Joachim Eibl" -msgstr "" - -#: kdiff3_part.cpp:173 kdiff3_part.cpp:254 -#, kde-format -msgid "Could not find files for comparison." -msgstr "" - -#. i18n: ectx: Menu (movement) -#: kdiff3_part.rc:4 -#, fuzzy, kde-format -msgid "&KDiff3" -msgstr "Diff" - -#. i18n: ectx: Menu (movement) -#: kdiff3_part.rc:13 -#, fuzzy, kde-format -msgid "Configure KDiff3" -msgstr "Stilla" - -#. i18n: ectx: ToolBar (mainToolBar) -#: kdiff3_part.rc:16 main.cpp:88 -#, fuzzy, kde-format -msgid "KDiff3" -msgstr "Diff" - -#: kdiff3_shell.cpp:74 -#, kde-format -msgid "" -"Could not initialize the KDiff3 part.\n" -"This usually happens due to an installation problem. Please read the README-" -"file in the source package for details." -msgstr "" - -#. i18n: ectx: Menu (file) -#: kdiff3_shell.rc:4 -#, fuzzy, kde-format -msgid "&File" -msgstr "&Skrá" - -#. i18n: ectx: Menu (directory) -#: kdiff3_shell.rc:7 -#, kde-format -msgid "&Directory" -msgstr "" - -#. i18n: ectx: Menu (dir_current_merge_menu) -#: kdiff3_shell.rc:30 -#, kde-format -msgid "Current Item Merge Operation" -msgstr "" - -#. i18n: ectx: Menu (dir_current_sync_menu) -#: kdiff3_shell.rc:38 -#, kde-format -msgid "Current Item Sync Operation" -msgstr "" - -#. i18n: ectx: Menu (movement) -#: kdiff3_shell.rc:50 -#, kde-format -msgid "M&ovement" -msgstr "" - -#. i18n: ectx: Menu (diff) -#: kdiff3_shell.rc:61 -#, kde-format -msgid "D&iffview" -msgstr "" - -#. i18n: ectx: Menu (merge) -#: kdiff3_shell.rc:73 -#, fuzzy, kde-format -msgid "M&erge" -msgstr "Sameina" - -#. i18n: ectx: Menu (window) -#: kdiff3_shell.rc:95 -#, fuzzy, kde-format -msgid "&Window" -msgstr "&Gluggi" - -#. i18n: ectx: ToolBar (mainToolBar) -#: kdiff3_shell.rc:106 -#, fuzzy, kde-format -msgid "Main Toolbar" -msgstr "Aðaltækjaslá" - -#: main.cpp:68 main.cpp:72 -#, kde-format -msgid "Ignored. (User defined.)" -msgstr "" - -#: main.cpp:92 -#, kde-format -msgid " (64 bit)" -msgstr "" - -#: main.cpp:94 -#, kde-format -msgid " (32 bit)" -msgstr "" - -#: main.cpp:95 -#, kde-format -msgid "Tool for Comparison and Merge of Files and Directories" -msgstr "" - -#: main.cpp:96 -#, kde-format -msgid "(c) 2002-2014 Joachim Eibl, (c) 2017 Michael Reeves KF5/Qt5 port" -msgstr "" - -#: main.cpp:112 -#, kde-format -msgid "Merge the input." -msgstr "" - -#: main.cpp:113 -#, kde-format -msgid "Explicit base file. For compatibility with certain tools." -msgstr "" - -#: main.cpp:114 -#, kde-format -msgid "Output file. Implies -m. E.g.: -o newfile.txt" -msgstr "" - -#: main.cpp:115 -#, kde-format -msgid "Output file, again. (For compatibility with certain tools.)" -msgstr "" - -#: main.cpp:116 -#, kde-format -msgid "No GUI if all conflicts are auto-solvable. (Needs -o file)" -msgstr "" - -#: main.cpp:117 -#, kde-format -msgid "Do not solve conflicts automatically." -msgstr "" - -#: main.cpp:118 -#, kde-format -msgid "Visible name replacement for input file 1 (base)." -msgstr "" - -#: main.cpp:119 -#, kde-format -msgid "Visible name replacement for input file 2." -msgstr "" - -#: main.cpp:120 -#, kde-format -msgid "Visible name replacement for input file 3." -msgstr "" - -#: main.cpp:121 -#, kde-format -msgid "Alternative visible name replacement. Supply this once for every input." -msgstr "" - -#: main.cpp:122 -#, kde-format -msgid "" -"Override a config setting. Use once for every setting. E.g.: --cs " -"\"AutoAdvance=1\"" -msgstr "" - -#: main.cpp:123 -#, kde-format -msgid "Show list of config settings and current values." -msgstr "" - -#: main.cpp:124 -#, kde-format -msgid "Use a different config file." -msgstr "" - -#: main.cpp:127 -#, kde-format -msgid "file1 to open (base, if not specified via --base)" -msgstr "" - -#: main.cpp:128 -#, kde-format -msgid "file2 to open" -msgstr "" - -#: main.cpp:129 -#, kde-format -msgid "file3 to open" -msgstr "" - -#: main.cpp:153 -#, kde-format -msgid "See kdiff3 --help for supported options." -msgstr "" - -#: mergeresultwindow.cpp:158 -#, kde-format -msgid "Choose A Everywhere" -msgstr "" - -#: mergeresultwindow.cpp:159 -#, kde-format -msgid "Choose B Everywhere" -msgstr "" - -#: mergeresultwindow.cpp:160 -#, kde-format -msgid "Choose C Everywhere" -msgstr "" - -#: mergeresultwindow.cpp:161 -#, kde-format -msgid "Choose A for All Unsolved Conflicts" -msgstr "" - -#: mergeresultwindow.cpp:162 -#, kde-format -msgid "Choose B for All Unsolved Conflicts" -msgstr "" - -#: mergeresultwindow.cpp:163 -#, kde-format -msgid "Choose C for All Unsolved Conflicts" -msgstr "" - -#: mergeresultwindow.cpp:164 -#, kde-format -msgid "Choose A for All Unsolved Whitespace Conflicts" -msgstr "" - -#: mergeresultwindow.cpp:165 -#, kde-format -msgid "Choose B for All Unsolved Whitespace Conflicts" -msgstr "" - -#: mergeresultwindow.cpp:166 -#, kde-format -msgid "Choose C for All Unsolved Whitespace Conflicts" -msgstr "" - -#: mergeresultwindow.cpp:176 -#, kde-format -msgid "Number of remaining unsolved conflicts: %1 (of which %2 are whitespace)" -msgstr "" - -#: mergeresultwindow.cpp:370 -#, kde-format -msgid "" -"The output has been modified.\n" -"If you continue your changes will be lost." -msgstr "" - -#: mergeresultwindow.cpp:936 pdiff.cpp:827 -#, kde-format -msgid "All input files are binary equal." -msgstr "" - -#: mergeresultwindow.cpp:938 -#, kde-format -msgid "All input files contain the same text." -msgstr "" - -#: mergeresultwindow.cpp:942 mergeresultwindow.cpp:946 -#: mergeresultwindow.cpp:950 pdiff.cpp:833 pdiff.cpp:837 pdiff.cpp:841 -#, kde-format -msgid "Files %1 and %2 are binary equal.\n" -msgstr "" - -#: mergeresultwindow.cpp:944 mergeresultwindow.cpp:948 -#: mergeresultwindow.cpp:952 -#, kde-format -msgid "Files %1 and %2 have equal text.\n" -msgstr "" - -#: mergeresultwindow.cpp:958 -#, kde-format -msgid "" -"Total number of conflicts: %1\n" -"Nr of automatically solved conflicts: %2\n" -"Nr of unsolved conflicts: %3\n" -"%4" -msgstr "" - -#: mergeresultwindow.cpp:964 -#, kde-format -msgid "Conflicts" -msgstr "" - -#: mergeresultwindow.cpp:1873 -#, kde-format -msgid "" -msgstr "" - -#: mergeresultwindow.cpp:1881 -#, kde-format -msgid "" -msgstr "" - -#: mergeresultwindow.cpp:1883 mergeresultwindow.cpp:2755 -#, kde-format -msgid "" -msgstr "" - -#: mergeresultwindow.cpp:2967 -#, kde-format -msgid "" -"Not all conflicts are solved yet.\n" -"File not saved." -msgstr "" - -#: mergeresultwindow.cpp:2969 mergeresultwindow.cpp:2978 -#, kde-format -msgid "Conflicts Left" -msgstr "" - -#: mergeresultwindow.cpp:2976 -#, kde-format -msgid "" -"There is a line end style conflict. Please choose the line end style " -"manually.\n" -"File not saved." -msgstr "" - -#: mergeresultwindow.cpp:2990 -#, kde-format -msgid "" -"\n" -"\n" -"Creating backup failed. File not saved." -msgstr "" - -#: mergeresultwindow.cpp:2990 mergeresultwindow.cpp:3038 -#, kde-format -msgid "File Save Error" -msgstr "" - -#: mergeresultwindow.cpp:3038 -#, kde-format -msgid "Error while writing." -msgstr "" - -#: mergeresultwindow.cpp:3110 -#, fuzzy, kde-format -msgid "Output:" -msgstr "Úttak" - -#: mergeresultwindow.cpp:3123 mergeresultwindow.cpp:3315 -#, kde-format -msgid "[Modified]" -msgstr "" - -#: mergeresultwindow.cpp:3130 -#, fuzzy, kde-format -msgid "Encoding for saving:" -msgstr "Kóðun:" - -#: mergeresultwindow.cpp:3230 -#, fuzzy, kde-format -msgid "Conflict" -msgstr "Árekstrar" - -#: mergeresultwindow.cpp:3262 -#, kde-format -msgid "Codec from A: %1" -msgstr "" - -#: mergeresultwindow.cpp:3264 -#, kde-format -msgid "Codec from B: %1" -msgstr "" - -#: mergeresultwindow.cpp:3266 -#, kde-format -msgid "Codec from C: %1" -msgstr "" - -#: optiondialog.cpp:119 -#, kde-format -msgid "Change Font" -msgstr "" - -#: optiondialog.cpp:135 optiondialog.cpp:145 -#, kde-format -msgid "" -"Font: %1, %2, %3\n" -"\n" -"Example:" -msgstr "" - -#: optiondialog.cpp:388 -#, fuzzy, kde-format -msgid "Unicode" -msgstr "Unicode" - -#: optiondialog.cpp:389 -#, fuzzy, kde-format -msgid "Latin1" -msgstr "Latin1" - -#: optiondialog.cpp:408 -#, kde-format -msgid "Change this if non-ASCII characters are not displayed correctly." -msgstr "" - -#: optiondialog.cpp:491 -#, fuzzy, kde-format -msgid "Configure" -msgstr "Stilla" - -#: optiondialog.cpp:568 -#, fuzzy, kde-format -msgid "Font" -msgstr "Letur" - -#: optiondialog.cpp:570 -#, kde-format -msgid "Editor & Diff Output Font" -msgstr "" - -#: optiondialog.cpp:589 -#, kde-format -msgid "Application font" -msgstr "" - -#: optiondialog.cpp:594 -#, kde-format -msgid "File view font" -msgstr "" - -#: optiondialog.cpp:613 -#, fuzzy, kde-format -msgctxt "Title for color settings page" -msgid "Color" -msgstr "Litur" - -#: optiondialog.cpp:614 -#, kde-format -msgid "Colors Settings" -msgstr "" - -#: optiondialog.cpp:631 -#, kde-format -msgid "Editor and Diff Views:" -msgstr "" - -#: optiondialog.cpp:639 -#, fuzzy, kde-format -msgid "Foreground color:" -msgstr "Litur forgrunns:" - -#: optiondialog.cpp:647 -#, fuzzy, kde-format -msgid "Background color:" -msgstr "Bakgrunnslitur:" - -#: optiondialog.cpp:657 -#, kde-format -msgid "Diff background color:" -msgstr "" - -#: optiondialog.cpp:666 -#, kde-format -msgid "Color A:" -msgstr "" - -#: optiondialog.cpp:675 -#, kde-format -msgid "Color B:" -msgstr "" - -#: optiondialog.cpp:684 -#, kde-format -msgid "Color C:" -msgstr "" - -#: optiondialog.cpp:692 -#, kde-format -msgid "Conflict color:" -msgstr "" - -#: optiondialog.cpp:701 -#, kde-format -msgid "Current range background color:" -msgstr "" - -#: optiondialog.cpp:710 -#, kde-format -msgid "Current range diff background color:" -msgstr "" - -#: optiondialog.cpp:718 -#, kde-format -msgid "Color for manually aligned difference ranges:" -msgstr "" - -#: optiondialog.cpp:725 -#, kde-format -msgid "Directory Comparison View:" -msgstr "" - -#: optiondialog.cpp:731 -#, kde-format -msgid "Newest file color:" -msgstr "" - -#: optiondialog.cpp:736 -#, kde-format -msgid "" -"Changing this color will only be effective when starting the next directory " -"comparison." -msgstr "" - -#: optiondialog.cpp:741 -#, kde-format -msgid "Oldest file color:" -msgstr "" - -#: optiondialog.cpp:750 -#, kde-format -msgid "Middle age file color:" -msgstr "" - -#: optiondialog.cpp:759 -#, kde-format -msgid "Color for missing files:" -msgstr "" - -#: optiondialog.cpp:773 -#, fuzzy, kde-format -msgid "Editor" -msgstr "Ritill" - -#: optiondialog.cpp:774 -#, kde-format -msgid "Editor Behavior" -msgstr "" - -#: optiondialog.cpp:787 -#, kde-format -msgid "Tab inserts spaces" -msgstr "" - -#: optiondialog.cpp:791 -#, kde-format -msgid "" -"On: Pressing tab generates the appropriate number of spaces.\n" -"Off: A tab character will be inserted." -msgstr "" - -#: optiondialog.cpp:796 -#, kde-format -msgid "Tab size:" -msgstr "" - -#: optiondialog.cpp:803 -#, kde-format -msgid "Auto indentation" -msgstr "" - -#: optiondialog.cpp:807 -#, kde-format -msgid "On: The indentation of the previous line is used for a new line.\n" -msgstr "" - -#: optiondialog.cpp:810 -#, kde-format -msgid "Auto copy selection" -msgstr "" - -#: optiondialog.cpp:814 -#, kde-format -msgid "" -"On: Any selection is immediately written to the clipboard.\n" -"Off: You must explicitly copy e.g. via Ctrl-C." -msgstr "" - -#: optiondialog.cpp:829 -#, kde-format -msgid "" -"Sets the line endings for when an edited file is saved.\n" -"DOS/Windows: CR+LF; UNIX: LF; with CR=0D, LF=0A" -msgstr "" - -#: optiondialog.cpp:839 -#, fuzzy, kde-format -msgid "Diff" -msgstr "Diff" - -#: optiondialog.cpp:840 -#, fuzzy, kde-format -msgid "Diff Settings" -msgstr "Stillingar diff" - -#. i18n("Preserve carriage return"), false, "PreserveCarriageReturn", &m_options.m_bPreserveCarriageReturn, page, this ); -#. addOptionItem(pPreserveCarriageReturn); -#. gbox->addWidget( pPreserveCarriageReturn, line, 0, 1, 2 ); -#. pPreserveCarriageReturn->setToolTip( i18n( -#. "Show carriage return characters '\\r' if they exist.\n" -#. "Helps to compare files that were modified under different operating systems.") -#. ); -#. ++line; -#. -#: optiondialog.cpp:865 -#, kde-format -msgid "Ignore numbers (treat as white space)" -msgstr "" - -#: optiondialog.cpp:869 -#, kde-format -msgid "" -"Ignore number characters during line matching phase. (Similar to Ignore " -"white space.)\n" -"Might help to compare files with numeric data." -msgstr "" - -#: optiondialog.cpp:873 -#, kde-format -msgid "Ignore C/C++ comments (treat as white space)" -msgstr "" - -#: optiondialog.cpp:876 -#, kde-format -msgid "Treat C/C++ comments like white space." -msgstr "" - -#: optiondialog.cpp:879 -#, kde-format -msgid "Ignore case (treat as white space)" -msgstr "" - -#: optiondialog.cpp:883 -#, kde-format -msgid "Treat case differences like white space changes. ('a'<=>'A')" -msgstr "" - -#: optiondialog.cpp:886 -#, kde-format -msgid "Preprocessor command:" -msgstr "" - -#: optiondialog.cpp:891 -#, kde-format -msgid "User defined pre-processing. (See the docs for details.)" -msgstr "" - -#: optiondialog.cpp:894 -#, kde-format -msgid "Line-matching preprocessor command:" -msgstr "" - -#: optiondialog.cpp:899 -#, kde-format -msgid "" -"This pre-processor is only used during line matching.\n" -"(See the docs for details.)" -msgstr "" - -#: optiondialog.cpp:902 -#, kde-format -msgid "Try hard (slower)" -msgstr "" - -#: optiondialog.cpp:906 -#, kde-format -msgid "" -"Enables the --minimal option for the external diff.\n" -"The analysis of big files will be much slower." -msgstr "" - -#: optiondialog.cpp:910 -#, kde-format -msgid "Align B and C for 3 input files" -msgstr "" - -#: optiondialog.cpp:914 -#, kde-format -msgid "" -"Try to align B and C when comparing or merging three input files.\n" -"Not recommended for merging because merge might get more complicated.\n" -"(Default is off.)" -msgstr "" - -#: optiondialog.cpp:926 -#, kde-format -msgid "Merge Settings" -msgstr "" - -#: optiondialog.cpp:940 -#, kde-format -msgid "Auto advance delay (ms):" -msgstr "" - -#: optiondialog.cpp:946 -#, kde-format -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 "" - -#: optiondialog.cpp:950 -#, kde-format -msgid "Show info dialogs" -msgstr "" - -#: optiondialog.cpp:953 -#, kde-format -msgid "Show a dialog with information about the number of conflicts." -msgstr "" - -#: optiondialog.cpp:956 -#, kde-format -msgid "White space 2-file merge default:" -msgstr "" - -#: optiondialog.cpp:961 optiondialog.cpp:974 -#, kde-format -msgid "Manual Choice" -msgstr "" - -#: optiondialog.cpp:965 optiondialog.cpp:979 -#, kde-format -msgid "" -"Allow the merge algorithm to automatically select an input for white-space-" -"only changes." -msgstr "" - -#: optiondialog.cpp:969 -#, kde-format -msgid "White space 3-file merge default:" -msgstr "" - -#: optiondialog.cpp:983 -#, kde-format -msgid "Automatic Merge Regular Expression" -msgstr "" - -#: optiondialog.cpp:991 smalldialogs.cpp:449 -#, kde-format -msgid "Auto merge regular expression:" -msgstr "" - -#: optiondialog.cpp:996 -#, kde-format -msgid "" -"Regular expression for lines where KDiff3 should automatically choose one " -"source.\n" -"When a line with a conflict matches the regular expression then\n" -"- if available - C, otherwise B will be chosen." -msgstr "" - -#: optiondialog.cpp:1002 -#, kde-format -msgid "Run regular expression auto merge on merge start" -msgstr "" - -#: optiondialog.cpp:1005 -#, kde-format -msgid "" -"Run the merge for auto merge regular expressions\n" -"immediately when a merge starts.\n" -msgstr "" - -#: optiondialog.cpp:1010 -#, kde-format -msgid "Version Control History Merging" -msgstr "" - -#: optiondialog.cpp:1018 smalldialogs.cpp:476 -#, kde-format -msgid "History start regular expression:" -msgstr "" - -#: optiondialog.cpp:1023 -#, kde-format -msgid "" -"Regular expression for the start of the version control history entry.\n" -"Usually this line contains the \"$Log$\" keyword.\n" -"Default value: \".*\\$Log.*\\$.*\"" -msgstr "" - -#: optiondialog.cpp:1029 smalldialogs.cpp:504 -#, kde-format -msgid "History entry start regular expression:" -msgstr "" - -#: optiondialog.cpp:1042 -#, kde-format -msgid "" -"A version control history entry consists of several lines.\n" -"Specify the regular expression to detect the first line (without the leading " -"comment).\n" -"Use parentheses to group the keys you want to use for sorting.\n" -"If left empty, then KDiff3 assumes that empty lines separate history " -"entries.\n" -"See the documentation for details." -msgstr "" - -#: optiondialog.cpp:1050 -#, kde-format -msgid "History merge sorting" -msgstr "" - -#: optiondialog.cpp:1053 -#, kde-format -msgid "Sort version control history by a key." -msgstr "" - -#: optiondialog.cpp:1063 -#, kde-format -msgid "History entry start sort key order:" -msgstr "" - -#: optiondialog.cpp:1068 -#, kde-format -msgid "" -"Each pair of parentheses used in the regular expression for the history " -"start entry\n" -"groups a key that can be used for sorting.\n" -"Specify the list of keys (that are numbered in order of occurrence\n" -"starting with 1) using ',' as separator (e.g. \"4,5,6,1,2,3,7\").\n" -"If left empty, then no sorting will be done.\n" -"See the documentation for details." -msgstr "" - -#: optiondialog.cpp:1079 -#, kde-format -msgid "Merge version control history on merge start" -msgstr "" - -#: optiondialog.cpp:1082 -#, kde-format -msgid "Run version control history automerge on merge start." -msgstr "" - -#: optiondialog.cpp:1086 -#, kde-format -msgid "Max number of history entries:" -msgstr "" - -#: optiondialog.cpp:1090 -#, kde-format -msgid "Cut off after specified number. Use -1 for infinite number of entries." -msgstr "" - -#: optiondialog.cpp:1094 -#, kde-format -msgid "Test your regular expressions" -msgstr "" - -#: optiondialog.cpp:1099 -#, kde-format -msgid "Irrelevant merge command:" -msgstr "" - -#: optiondialog.cpp:1104 -#, kde-format -msgid "" -"If specified this script is run after automerge\n" -"when no other relevant changes were detected.\n" -"Called with the parameters: filename1 filename2 filename3" -msgstr "" - -#: optiondialog.cpp:1109 -#, kde-format -msgid "Auto save and quit on merge without conflicts" -msgstr "" - -#: optiondialog.cpp:1113 -#, kde-format -msgid "" -"If KDiff3 was started for a file-merge from the command line and all\n" -"conflicts are solvable without user interaction then automatically save and " -"quit.\n" -"(Similar to command line option \"--auto\".)" -msgstr "" - -#: optiondialog.cpp:1124 optiondialog.cpp:1125 -#, fuzzy, kde-format -msgid "Directory" -msgstr "Mappa" - -#: optiondialog.cpp:1137 -#, kde-format -msgid "Recursive directories" -msgstr "" - -#: optiondialog.cpp:1140 -#, kde-format -msgid "Whether to analyze subdirectories or not." -msgstr "" - -#: optiondialog.cpp:1142 -#, kde-format -msgid "File pattern(s):" -msgstr "" - -#: optiondialog.cpp:1148 -#, kde-format -msgid "" -"Pattern(s) of files to be analyzed. \n" -"Wildcards: '*' and '?'\n" -"Several Patterns can be specified by using the separator: ';'" -msgstr "" - -#: optiondialog.cpp:1153 -#, kde-format -msgid "File-anti-pattern(s):" -msgstr "" - -#: optiondialog.cpp:1159 -#, kde-format -msgid "" -"Pattern(s) of files to be excluded from analysis. \n" -"Wildcards: '*' and '?'\n" -"Several Patterns can be specified by using the separator: ';'" -msgstr "" - -#: optiondialog.cpp:1164 -#, kde-format -msgid "Dir-anti-pattern(s):" -msgstr "" - -#: optiondialog.cpp:1170 -#, kde-format -msgid "" -"Pattern(s) of directories to be excluded from analysis. \n" -"Wildcards: '*' and '?'\n" -"Several Patterns can be specified by using the separator: ';'" -msgstr "" - -#: optiondialog.cpp:1175 -#, kde-format -msgid "Use .cvsignore" -msgstr "" - -#: optiondialog.cpp:1179 -#, kde-format -msgid "" -"Extends the antipattern to anything that would be ignored by CVS.\n" -"Via local \".cvsignore\" files this can be directory specific." -msgstr "" - -#: optiondialog.cpp:1183 -#, kde-format -msgid "Find hidden files and directories" -msgstr "" - -#: optiondialog.cpp:1186 -#, kde-format -msgid "Finds hidden files and directories." -msgstr "" - -#: optiondialog.cpp:1189 -#, kde-format -msgid "Follow file links" -msgstr "" - -#: optiondialog.cpp:1193 -#, kde-format -msgid "" -"On: Compare the file the link points to.\n" -"Off: Compare the links." -msgstr "" - -#: optiondialog.cpp:1197 -#, kde-format -msgid "Follow directory links" -msgstr "" - -#: optiondialog.cpp:1201 -#, kde-format -msgid "" -"On: Compare the directory the link points to.\n" -"Off: Compare the links." -msgstr "" - -#: optiondialog.cpp:1210 -#, kde-format -msgid "Case sensitive filename comparison" -msgstr "" - -#: optiondialog.cpp:1214 -#, kde-format -msgid "" -"The directory comparison will compare files or directories when their names " -"match.\n" -"Set this option if the case of the names must match. (Default for Windows is " -"off, otherwise on.)" -msgstr "" - -#: optiondialog.cpp:1218 -#, kde-format -msgid "Unfold all subdirectories on load" -msgstr "" - -#: optiondialog.cpp:1222 -#, kde-format -msgid "" -"On: Unfold all subdirectories when starting a directory diff.\n" -"Off: Leave subdirectories folded." -msgstr "" - -#: optiondialog.cpp:1226 -#, kde-format -msgid "Skip directory status report" -msgstr "" - -#: optiondialog.cpp:1230 -#, kde-format -msgid "" -"On: Do not show the Directory Comparison Status.\n" -"Off: Show the status dialog on start." -msgstr "" - -#: optiondialog.cpp:1234 -#, kde-format -msgid "File Comparison Mode" -msgstr "" - -#: optiondialog.cpp:1239 -#, kde-format -msgid "Binary comparison" -msgstr "" - -#: optiondialog.cpp:1241 -#, kde-format -msgid "Binary comparison of each file. (Default)" -msgstr "" - -#: optiondialog.cpp:1244 -#, kde-format -msgid "Full analysis" -msgstr "" - -#: optiondialog.cpp:1246 -#, kde-format -msgid "" -"Do a full analysis and show statistics information in extra columns.\n" -"(Slower than a binary comparison, much slower for binary files.)" -msgstr "" - -#: optiondialog.cpp:1250 -#, kde-format -msgid "Trust the size and modification date (unsafe)" -msgstr "" - -#: optiondialog.cpp:1252 -#, kde-format -msgid "" -"Assume that files are equal if the modification date and file length are " -"equal.\n" -"Files with equal contents but different modification dates will appear as " -"different.\n" -"Useful for big directories or slow networks." -msgstr "" - -#: optiondialog.cpp:1257 -#, kde-format -msgid "" -"Trust the size and date, but use binary comparison if date does not match " -"(unsafe)" -msgstr "" - -#: optiondialog.cpp:1259 -#, kde-format -msgid "" -"Assume that files are equal if the modification date and file length are " -"equal.\n" -"If the dates are not equal but the sizes are, use binary comparison.\n" -"Useful for big directories or slow networks." -msgstr "" - -#: optiondialog.cpp:1264 -#, kde-format -msgid "Trust the size (unsafe)" -msgstr "" - -#: optiondialog.cpp:1266 -#, kde-format -msgid "" -"Assume that files are equal if their file lengths are equal.\n" -"Useful for big directories or slow networks when the date is modified during " -"download." -msgstr "" - -#: optiondialog.cpp:1273 -#, kde-format -msgid "Synchronize directories" -msgstr "" - -#: optiondialog.cpp:1277 -#, kde-format -msgid "" -"Offers to store files in both directories so that\n" -"both directories are the same afterwards.\n" -"Works only when comparing two directories without specifying a destination." -msgstr "" - -#: optiondialog.cpp:1283 -#, kde-format -msgid "White space differences considered equal" -msgstr "" - -#: optiondialog.cpp:1287 -#, kde-format -msgid "" -"If files differ only by white space consider them equal.\n" -"This is only active when full analysis is chosen." -msgstr "" - -#: optiondialog.cpp:1293 -#, kde-format -msgid "Copy newer instead of merging (unsafe)" -msgstr "" - -#: optiondialog.cpp:1297 -#, kde-format -msgid "" -"Do not look inside, just take the newer file.\n" -"(Use this only if you know what you are doing!)\n" -"Only effective when comparing two directories." -msgstr "" - -#: optiondialog.cpp:1302 -#, kde-format -msgid "Backup files (.orig)" -msgstr "" - -#: optiondialog.cpp:1306 -#, kde-format -msgid "" -"If 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 "" - -#: optiondialog.cpp:1382 optiondialog.cpp:1383 -#, kde-format -msgid "Regional Settings" -msgstr "" - -#: optiondialog.cpp:1397 -#, kde-format -msgid "Use the same encoding for everything:" -msgstr "" - -#: optiondialog.cpp:1401 -#, kde-format -msgid "" -"Enable this allows to change all encodings by changing the first only.\n" -"Disable this if different individual settings are needed." -msgstr "" - -#: optiondialog.cpp:1405 -#, kde-format -msgid "Note: Local Encoding is \"%1\"" -msgstr "" - -#: optiondialog.cpp:1409 -#, kde-format -msgid "File Encoding for A:" -msgstr "" - -#: optiondialog.cpp:1416 -#, kde-format -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 "" - -#: optiondialog.cpp:1419 optiondialog.cpp:1430 optiondialog.cpp:1441 -#, kde-format -msgid "Auto Detect Unicode" -msgstr "" - -#: optiondialog.cpp:1425 -#, kde-format -msgid "File Encoding for B:" -msgstr "" - -#: optiondialog.cpp:1436 -#, kde-format -msgid "File Encoding for C:" -msgstr "" - -#: optiondialog.cpp:1447 -#, kde-format -msgid "File Encoding for Merge Output and Saving:" -msgstr "" - -#: optiondialog.cpp:1452 -#, fuzzy, kde-format -msgid "Auto Select" -msgstr "Velja sjálfvirkt" - -#: optiondialog.cpp:1456 -#, kde-format -msgid "" -"If enabled then the encoding from the input files is used.\n" -"In ambiguous cases a dialog will ask the user to choose the encoding for " -"saving." -msgstr "" - -#: optiondialog.cpp:1459 -#, kde-format -msgid "File Encoding for Preprocessor Files:" -msgstr "" - -#: optiondialog.cpp:1471 -#, kde-format -msgid "Right To Left Language" -msgstr "" - -#: optiondialog.cpp:1475 -#, kde-format -msgid "" -"Some languages are read from right to left.\n" -"This setting will change the viewer and editor accordingly." -msgstr "" - -#: optiondialog.cpp:1485 -#, kde-format -msgid "Integration" -msgstr "" - -#: optiondialog.cpp:1486 -#, kde-format -msgid "Integration Settings" -msgstr "" - -#: optiondialog.cpp:1499 -#, kde-format -msgid "Command line options to ignore:" -msgstr "" - -#: optiondialog.cpp:1505 -#, kde-format -msgid "" -"List of command line options that should be ignored when KDiff3 is used by " -"other tools.\n" -"Several values can be specified if separated via ';'\n" -"This will suppress the \"Unknown option\" error." -msgstr "" - -#: optiondialog.cpp:1510 -#, kde-format -msgid "Quit also via Escape key" -msgstr "" - -#: optiondialog.cpp:1514 -#, kde-format -msgid "" -"Fast method to exit.\n" -"For those who are used to using the Escape key." -msgstr "" - -#: optiondialog.cpp:1598 -#, kde-format -msgid "This resets all options. Not only those of the current topic." -msgstr "" - -#: pdiff.cpp:78 pdiff.cpp:92 -#, kde-format -msgid "" -"Data loss error:\n" -"If it is reproducible please contact the author.\n" -msgstr "" - -#: pdiff.cpp:80 pdiff.cpp:94 -#, kde-format -msgid "Severe Internal Error" -msgstr "" - -#: pdiff.cpp:122 -#, kde-format -msgid "PreprocessorCmd: " -msgstr "" - -#: pdiff.cpp:127 -#, kde-format -msgid "The following option(s) you selected might change data:\n" -msgstr "" - -#: pdiff.cpp:128 -#, kde-format -msgid "" -"\n" -"Most likely this is not wanted during a merge.\n" -"Do you want to disable these settings or continue with these settings active?" -msgstr "" - -#: pdiff.cpp:130 -#, kde-format -msgid "Option Unsafe for Merging" -msgstr "" - -#: pdiff.cpp:131 -#, kde-format -msgid "Use These Options During Merge" -msgstr "" - -#: pdiff.cpp:132 -#, kde-format -msgid "Disable Unsafe Options" -msgstr "" - -#: pdiff.cpp:158 -#, kde-format -msgid "Loading A" -msgstr "" - -#: pdiff.cpp:167 -#, kde-format -msgid "Errors occurred during pre-processing of file A." -msgstr "" - -#: pdiff.cpp:172 -#, kde-format -msgid "Loading B" -msgstr "" - -#: pdiff.cpp:179 -#, kde-format -msgid "Errors occurred during pre-processing of file B." -msgstr "" - -#: pdiff.cpp:202 pdiff.cpp:241 -#, kde-format -msgid "Diff: A <-> B" -msgstr "" - -#: pdiff.cpp:208 pdiff.cpp:279 pdiff.cpp:293 -#, kde-format -msgid "Linediff: A <-> B" -msgstr "" - -#: pdiff.cpp:225 -#, kde-format -msgid "Loading C" -msgstr "" - -#: pdiff.cpp:232 -#, kde-format -msgid "Errors occurred during pre-processing of file C." -msgstr "" - -#: pdiff.cpp:250 -#, kde-format -msgid "Diff: A <-> C" -msgstr "" - -#: pdiff.cpp:261 -#, kde-format -msgid "Diff: B <-> C" -msgstr "" - -#: pdiff.cpp:283 pdiff.cpp:297 -#, kde-format -msgid "Linediff: B <-> C" -msgstr "" - -#: pdiff.cpp:287 pdiff.cpp:301 -#, kde-format -msgid "Linediff: A <-> C" -msgstr "" - -#: pdiff.cpp:829 -#, kde-format -msgid "All input files contain the same text, but are not binary equal." -msgstr "" - -#: pdiff.cpp:835 pdiff.cpp:839 pdiff.cpp:843 -#, kde-format -msgid "Files %1 and %2 have equal text, but are not binary equal. \n" -msgstr "" - -#: pdiff.cpp:853 -#, kde-format -msgid "" -"Some input files do not seem to be pure text files.\n" -"Note that the KDiff3 merge was not meant for binary data.\n" -"Continue at your own risk." -msgstr "" - -#: pdiff.cpp:863 -#, kde-format -msgid ", B" -msgstr "" - -#: pdiff.cpp:865 -#, kde-format -msgid ", C" -msgstr "" - -#: pdiff.cpp:867 -#, kde-format -msgid "" -"Some input characters could not be converted to valid unicode.\n" -"You might be using the wrong codec. (e.g. UTF-8 for non UTF-8 files).\n" -"Do not save the result if unsure. Continue at your own risk.\n" -"Affected input files are in %1." -msgstr "" - -#: pdiff.cpp:1034 -#, fuzzy, kde-format -msgid "Abort" -msgstr "Hætta við" - -#: pdiff.cpp:1040 pdiff.cpp:1130 -#, kde-format -msgid "Opening files..." -msgstr "" - -#: pdiff.cpp:1107 -#, kde-format -msgid "File open error" -msgstr "" - -#: pdiff.cpp:1202 -#, fuzzy, kde-format -msgid "Cutting selection..." -msgstr "Klippi val..." - -#: pdiff.cpp:1223 -#, fuzzy, kde-format -msgid "Copying selection to clipboard..." -msgstr "Afrita val á klemmuspjald..." - -#: pdiff.cpp:1239 -#, fuzzy, kde-format -msgid "Inserting clipboard contents..." -msgstr "Tek af klemmuspjaldi..." - -#: pdiff.cpp:1695 -#, kde-format -msgid "Word wrap (Cancel disables word wrap)" -msgstr "" - -#: pdiff.cpp:1696 -#, kde-format -msgid "Calculating max width for horizontal scrollbar" -msgstr "" - -#: pdiff.cpp:1911 -#, kde-format -msgid "Save && Continue" -msgstr "" - -#: pdiff.cpp:1912 -#, kde-format -msgid "Continue Without Saving" -msgstr "" - -#: pdiff.cpp:2124 -#, kde-format -msgid "Search complete." -msgstr "" - -#: pdiff.cpp:2124 -#, kde-format -msgid "Search Complete" -msgstr "" - -#: pdiff.cpp:2375 -#, kde-format -msgid "Nothing is selected in either diff input window." -msgstr "" - -#: pdiff.cpp:2375 -#, kde-format -msgid "Error while adding manual diff range" -msgstr "" - -#: progress.cpp:59 progress.cpp:71 -#, fuzzy, kde-format -msgid "&Cancel" -msgstr "&Hætta við" - -#: smalldialogs.cpp:61 -#, kde-format -msgid "A (Base):" -msgstr "" - -#: smalldialogs.cpp:68 smalldialogs.cpp:85 smalldialogs.cpp:102 -#: smalldialogs.cpp:144 -#, fuzzy, kde-format -msgid "File..." -msgstr "Skrá..." - -#: smalldialogs.cpp:70 smalldialogs.cpp:87 smalldialogs.cpp:104 -#: smalldialogs.cpp:146 -#, kde-format -msgid "Dir..." -msgstr "" - -#: smalldialogs.cpp:96 -#, kde-format -msgid "C (Optional):" -msgstr "" - -#: smalldialogs.cpp:119 -#, kde-format -msgid "Swap/Copy Names..." -msgstr "" - -#: smalldialogs.cpp:124 smalldialogs.cpp:125 smalldialogs.cpp:126 -#, kde-format -msgid "Swap %1<->%2" -msgstr "" - -#: smalldialogs.cpp:127 smalldialogs.cpp:128 smalldialogs.cpp:129 -#, kde-format -msgid "Copy %1->Output" -msgstr "" - -#: smalldialogs.cpp:130 smalldialogs.cpp:131 smalldialogs.cpp:132 -#, kde-format -msgid "Swap %1<->Output" -msgstr "" - -#: smalldialogs.cpp:138 -#, kde-format -msgid "Output (optional):" -msgstr "" - -#: smalldialogs.cpp:168 -#, fuzzy, kde-format -msgid "Configure..." -msgstr "Stilla..." - -#: smalldialogs.cpp:233 -#, fuzzy, kde-format -msgid "Open Directory" -msgstr "Mappa" - -#: smalldialogs.cpp:234 -#, kde-format -msgid "Select Output File" -msgstr "" - -#: smalldialogs.cpp:393 -#, kde-format -msgid "Search text:" -msgstr "" - -#: smalldialogs.cpp:400 -#, fuzzy, kde-format -msgid "Case sensitive" -msgstr "Háð há/lágstöfum" - -#: smalldialogs.cpp:403 -#, kde-format -msgid "Search A" -msgstr "" - -#: smalldialogs.cpp:408 -#, kde-format -msgid "Search B" -msgstr "" - -#: smalldialogs.cpp:413 -#, kde-format -msgid "Search C" -msgstr "" - -#: smalldialogs.cpp:418 -#, kde-format -msgid "Search output" -msgstr "" - -#: smalldialogs.cpp:425 -#, fuzzy, kde-format -msgid "&Search" -msgstr "&Leita" - -#: smalldialogs.cpp:444 -#, kde-format -msgid "Regular Expression Tester" -msgstr "" - -#: smalldialogs.cpp:457 -#, kde-format -msgid "Example auto merge line:" -msgstr "" - -#: smalldialogs.cpp:459 -#, kde-format -msgid "To test auto merge, copy a line as used in your files." -msgstr "" - -#: smalldialogs.cpp:465 smalldialogs.cpp:493 smalldialogs.cpp:529 -#, kde-format -msgid "Match result:" -msgstr "" - -#: smalldialogs.cpp:484 -#, kde-format -msgid "Example history start line (with leading comment):" -msgstr "" - -#: smalldialogs.cpp:486 -#, kde-format -msgid "" -"Copy a history start line as used in your files,\n" -"including the leading comment." -msgstr "" - -#: smalldialogs.cpp:512 -#, kde-format -msgid "History sort key order:" -msgstr "" - -#: smalldialogs.cpp:520 -#, kde-format -msgid "Example history entry start line (without leading comment):" -msgstr "" - -#: smalldialogs.cpp:522 -#, kde-format -msgid "" -"Copy a history entry start line as used in your files,\n" -"but omit the leading comment." -msgstr "" - -#: smalldialogs.cpp:536 -#, kde-format -msgid "Sort key result:" -msgstr "" - -#: smalldialogs.cpp:584 smalldialogs.cpp:594 smalldialogs.cpp:614 -#, kde-format -msgid "Match success." -msgstr "" - -#: smalldialogs.cpp:588 smalldialogs.cpp:598 smalldialogs.cpp:620 -#, kde-format -msgid "Match failed." -msgstr "" - -#: smalldialogs.cpp:605 -#, kde-format -msgid "Opening and closing parentheses do not match in regular expression." -msgstr "" - -#: SourceData.cpp:150 -#, kde-format -msgid "Writing clipboard data to temp file failed." -msgstr "" - -#: SourceData.cpp:154 -#, kde-format -msgid "From Clipboard" -msgstr "" - -#: SourceData.cpp:335 -#, kde-format -msgid "%1 is not a normal file." -msgstr "" - -#: SourceData.cpp:427 -#, kde-format -msgid " Temp file is: %1" -msgstr "" - -#: SourceData.cpp:432 -#, kde-format -msgid "" -"Preprocessing possibly failed. Check this command:\n" -"\n" -" %1\n" -"\n" -"The preprocessing command will be disabled now." -msgstr "" - -#: SourceData.cpp:443 SourceData.cpp:512 -#, kde-format -msgid "File %1 too large to process. Skipping." -msgstr "" - -#: SourceData.cpp:487 -#, kde-format -msgid "" -"The line-matching-preprocessing possibly failed. Check this command:\n" -"\n" -" %1\n" -"\n" -"The line-matching-preprocessing command will be disabled now." -msgstr "" - -#: Utils.cpp:77 -#, kde-format -msgid "Expecting space after closing quote." -msgstr "" - -#: Utils.cpp:80 -#, kde-format -msgid "Unmatched quote." -msgstr "" - -#: Utils.cpp:89 -#, kde-format -msgid "Unexpected quote character within argument." -msgstr "" - -#: Utils.cpp:96 -#, kde-format -msgid "No program specified." -msgstr "" \ No newline at end of file diff -Nru kdiff3-1.8.01/po/it/diff_ext.po kdiff3-1.8.3/po/it/diff_ext.po --- kdiff3-1.8.01/po/it/diff_ext.po 2019-05-18 01:02:06.000000000 +0000 +++ kdiff3-1.8.3/po/it/diff_ext.po 2020-06-25 00:18:28.000000000 +0000 @@ -5,8 +5,8 @@ msgid "" msgstr "" "Project-Id-Version: kdiff3\n" -"Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2019-03-22 03:09+0100\n" +"Report-Msgid-Bugs-To: https://bugs.kde.org\n" +"POT-Creation-Date: 2019-11-04 07:54+0100\n" "PO-Revision-Date: 2018-09-30 07:57+0100\n" "Last-Translator: Paolo Zamponi \n" "Language-Team: Italian \n" @@ -17,119 +17,114 @@ "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Lokalize 2.0\n" -#: diff_ext.cpp:391 +#: diff_ext.cpp:223 #, kde-format msgid "Compare with %1" msgstr "Confronta con %1" -#: diff_ext.cpp:392 +#: diff_ext.cpp:224 #, kde-format msgid "Merge with %1" msgstr "Fondi con %1" -#: diff_ext.cpp:408 +#: diff_ext.cpp:234 #, kde-format msgid "3-way merge with base" msgstr "Fusione a tre con base" -#: diff_ext.cpp:411 +#: diff_ext.cpp:237 #, kde-format msgid "Save '%1' for later" msgstr "Salva «%1» per dopo" -#: diff_ext.cpp:426 +#: diff_ext.cpp:251 #, kde-format msgid "Compare with ..." msgstr "Confronta con ..." -#: diff_ext.cpp:429 +#: diff_ext.cpp:254 #, kde-format msgid "Clear list" msgstr "Svuota l'elenco" -#: diff_ext.cpp:434 +#: diff_ext.cpp:259 #, kde-format msgid "Compare" msgstr "Confronta" -#: diff_ext.cpp:438 +#: diff_ext.cpp:263 #, kde-format msgid "3 way comparison" msgstr "Confronto a 3" -#: diff_ext.cpp:444 +#: diff_ext.cpp:269 #, kde-format msgid "About Diff-Ext ..." msgstr "Informazioni su Diff-Ext ..." -#: diff_ext.cpp:515 +#: diff_ext.cpp:340 #, kde-format msgid "(32 Bit)" msgstr "(32 Bit)" -#: diff_ext.cpp:517 -#, kde-format -msgid "(64 Bit)" -msgstr "(64 Bit)" - -#: diff_ext.cpp:518 +#: diff_ext.cpp:342 #, kde-format msgid "Diff-Ext Copyright (c) 2003-2006, Sergey Zorin. All rights reserved.\n" msgstr "" "Copyright (c) di Diff-Ext 2003-2006, Sergey Zorin. Tutti i diritti " "riservati.\n" -#: diff_ext.cpp:519 +#: diff_ext.cpp:343 #, kde-format msgid "This software is distributable under the BSD-2-Clause license.\n" msgstr "Questo software è distribuibile con licenza BSD-2-Clause.\n" -#: diff_ext.cpp:520 +#: diff_ext.cpp:344 #, kde-format msgid "Some extensions for KDiff3 (c) 2006-2013 by Joachim Eibl.\n" msgstr "Alcune estensioni per KDiff3 (c) 2006-2013 create da Joachim Eibl.\n" -#: diff_ext.cpp:521 +#: diff_ext.cpp:345 #, kde-format msgid "Homepage for Diff-Ext: http://diff-ext.sourceforge.net\n" msgstr "Pagine home di Diff-Ext: http://diff-ext.sourceforge.net\n" -#: diff_ext.cpp:522 +#: diff_ext.cpp:346 #, kde-format msgid "About Diff-Ext for KDiff3 " msgstr "Informazioni su Diff-Ext per KDiff3 " -#: diff_ext.cpp:551 +#: diff_ext.cpp:375 #, kde-format msgid "Compare selected files" msgstr "Confronta i file selezionati" -#: diff_ext.cpp:557 diff_ext.cpp:577 +#: diff_ext.cpp:381 diff_ext.cpp:399 #, kde-format msgid "Compare '%1' with '%2'" msgstr "Confronta «%1» con «%2»" -#: diff_ext.cpp:563 +#: diff_ext.cpp:386 #, kde-format msgid "Save '%1' for later operation" msgstr "Salva «%1» per operazioni successive" -#: diff_ext.cpp:619 +#: diff_ext.cpp:440 #, kde-format msgid "Could not start KDiff3. Please rerun KDiff3 installation." msgstr "Impossibile avviare KDiff3. Riavvia l'installazione di KDiff3." -#: diff_ext.cpp:620 +#: diff_ext.cpp:441 #, kde-format msgid "Command" msgstr "Comando" -#: diff_ext.cpp:621 +#: diff_ext.cpp:442 #, kde-format msgid "CommandLine" msgstr "Riga di comando" -#: diff_ext.cpp:622 +#: diff_ext.cpp:443 #, kde-format msgid "Diff-Ext For KDiff3" msgstr "Diff-Ext per KDiff3" \ No newline at end of file diff -Nru kdiff3-1.8.01/po/it/docs/kdiff3/index.docbook kdiff3-1.8.3/po/it/docs/kdiff3/index.docbook --- kdiff3-1.8.01/po/it/docs/kdiff3/index.docbook 2019-05-18 01:02:48.000000000 +0000 +++ kdiff3-1.8.3/po/it/docs/kdiff3/index.docbook 2020-06-25 00:19:19.000000000 +0000 @@ -118,7 +118,7 @@ 2019-02-22 1.08.00 +>1.08.02 @@ -690,11 +690,11 @@ >Colonna di sommarioColonna di riepilogoA sinistra di ogni testo c'è la «colonna di sommario». Se ci sono differenze su una riga, la colonna di sommario ne mostrerà il colore corrispondente. Nel sommario le differenze di soli spazi saranno evidenziate con una griglia. Per i linguaggi di programmazione in cui gli spazi non sono importanti è molto utile notare a colpo d'occhio se è stato cambiato qualcosa di importante (in C e C++ gli spazi sono importanti solamente dentro a stringhe, commenti, istruzioni di preprocesso e solo in altre situazioni molto particolari). A sinistra di ogni testo c'è la «colonna di sommario». Se ci sono differenze su una riga, la colonna di sommario ne mostrerà il colore corrispondente. Nel sommario le differenze di soli spazi saranno evidenziate con una griglia. Per i linguaggi di programmazione in cui gli spazi non sono importanti è molto utile notare a colpo d'occhio se è stato cambiato qualcosa di importante (in C e C++ gli spazi sono importanti solamente dentro a stringhe, commenti, direttive al preprocessore solo in altre situazioni molto particolari). La linea verticale che separa la colonna di sommario e il testo è interrotta se il file di ingresso non presenta righe in questo punto. Quando è attivato il ritorno a capo, questa linea verticale sarà punteggiata in corrispondenza delle righe mandate a capo. La linea verticale che separa la colonna di riepilogo e il testo è interrotta se il file di ingresso non presenta righe in questo punto. Quando è attivato il ritorno a capo, questa linea verticale sarà punteggiata in corrispondenza delle righe mandate a capo. </sect2 ><sect2 id="manualdiffhelp" ><title ->Allineare le righe manualmenteAllineare manualmente le righeA volte l'algoritmo affianca le linee sbagliate. Oppure vuoi confrontare un estratto di testo con del testo in una posizione completamente diversa nell'altro file. Per queste situazioni puoi ordinare manualmente a &kdiff3; di allineare certe righe. Seleziona il testo per il quale vuoi migliorare l'allineamento con il mouse, come se volessi copiare e incollare nella prima vista delle differenze, e quindi scegli Aggiungi allineamento manuale delle differenzeSelezione, Copia ed Incolla +>Selezione, Copia e Incolla La finestre dell'ingresso non hanno un cursore, quindi le selezioni vanno fatte con il &LMB; partendo dall'inizio, tenendolo premuto e spostandolo fino alla fine della selezione, dove lo rilasci. È possibile selezionare una singola parola facendo doppio clic. Nella finestra del risultato di fusione puoi anche selezionare con la tastiera, tenendo premuto il tasto &Shift; e navigando con i tasti a freccia. Trovare le stringhe +>Ricerca delle stringhe Puoi cercare una stringa in ogni finestra di testo di &kdiff3;. Il comando TrovaStampare +>Stampa &kdiff3; supporta la stampa delle differenze dei file di testo. Il comando StampaAttuale:Stampa una pagina partendo dalla prima riga visibile nella finestra. Sui sistemi senza questa opzione, essa è ottenibile chiedendo di stampare il numero di pagina 10000.Stampa una pagina partendo dalla prima riga visibile nella finestra. Sui sistemi senza questa opzione, essa è ottenibile chiedendo di stampare il numero di pagina 10000. Colore per gli intervalli delle differenze selezionate manualmente:Colore per intervalli di differenze selezionati manualmente:Davanti al selettore di codec appare una nota che ti dice quale è la codifica locale. Non è modificabile, serve solo a ricordarti quale è la codifica locale nel caso che tu non lo sapessi già. Tuttavia devi selezionarla. Davanti ai selettori di codifica appare una nota che ti dice qual è la codifica locale. Non è modificabile, serve solo a ricordarti la codifica locale nel caso che tu non lo sapessi già, ma avessi bisogno di selezionarla. Quando definisci un preprocessore questo deve essere in grado di operare sulla codifica in uso. Ad esempio i tuoi file sono 16-bit-unicode e il tuo preprocessore può operare solo su file 8-bit-ascii. Con questa opzione puoi definire la codifica del risultato del preprocessore. Quando definisci un preprocessore questo deve essere in grado di operare sulla codifica in uso (ad esempio, i tuoi file sono Unicode a 16 bit e il tuo preprocessore può operare solo su file &ASCII; a 8 bit). Con questa opzione puoi definire la codifica del risultato del preprocessore. Varie Queste opzioni ed azioni sono disponibili nei menu o nelle barre dei pulsanti. +>Queste opzioni e azioni sono disponibili nei menu o nelle barre dei pulsanti. Basi del <command +>Concetti di base del <command >sed</command > pagina Info di CVS). Tutte queste seguono lo schema $KEYWORD testo generato$. A questo punto serve un comando di preprocesso che rimuova solo il testo generato: +>. A questo punto serve un comando di preprocessore che rimuova solo il testo generato: sed 's/\$\(Revision\|Author\|Log\|Header\|Date\).*\$/\$\1\$/' @@ -2160,7 +2158,7 @@ >Ignorare i numeri Per ignorare i numeri, in realtà, c'è un'opzione interna. Però, come ulteriore esempio, ecco come funzionerebbe con un comando preprocesso. +>Per ignorare i numeri, in realtà, c'è un'opzione interna. Però, come ulteriore esempio, ecco come apparirebbe come comando di preprocessore per trovare una riga corrispondente. sed 's/[0123456789.-]//g' @@ -2174,7 +2172,7 @@ >Ignorare alcune colonne A volte un testo è formattato molto rigorosamente, e contiene delle colonne da ignorare sempre, mentre ci sono altre colonne da tenere e analizzare. Nell'esempio seguente, le prime cinque colonne (cioè caratteri) verranno ignorate, le prossime dieci vengono salvate, ne vengono ignorate altre cinque, il resto della riga viene tenuto. +>A volte un testo è formattato molto rigorosamente, e contiene delle colonne da ignorare sempre, mentre ci sono altre colonne da tenere e analizzare. Nell'esempio seguente, le prime cinque colonne (cioè caratteri) verranno ignorate, le dieci successive vengono salvate, ne vengono ignorate altre cinque, il resto della riga viene tenuto. sed 's/.....\(..........\).....\(.*\)/\1\2/' @@ -2274,7 +2272,7 @@ > Ignorare le lettere maiuscole (conversione in maiuscolo),Ignora le lettere maiuscole (conversione in maiuscolo), Ignorare gli spaziIgnora gli spazi L'idea di questo schema di colorazione l'ho avuta da dirdiff. I colori sembrano i colori di una foglia, che è verde quando è nuova, successivamente ingiallisce diventa rossa quando è vecchia. +>. I colori sembrano i colori di una foglia, che è verde quando è nuova, successivamente ingiallisce e diventa rossa quando è vecchia. La colonna <guilabel ->stato</guilabel +>Stato</guilabel > Durante la fusione i file saranno elaborati uno per volta. La colonna di stato indicherà Domande e risposte -&reporting.bugs; &updating.documentation; +>Domande e risposte&reporting.bugs; &updating.documentation; Comincia la selezione come al solito (fai clic e tieni premuto il &RMB;). Quindi usa i tasti di navigazione (Per esempio Comincia la selezione come al solito (fai clic e tieni premuto il &LMB;). Quindi usa i tasti di navigazione (Per esempio Pag↑ e Pag↓) tenendo premuto il &RMB;. Vedi anche la sezione ) tenendo premuto il &LMB;. Vedi anche la sezione seleziona, copia e incolla. Sei pregato di inviarmi la tua domanda. Ogni commento sarà apprezzato. Inviami la tua domanda. Ogni commento sarà apprezzato. @@ -3861,15 +3859,18 @@ > Aggiornamento e revisione della traduzione (2009), attuale responsabile: Federico Zenith Aggiornamento e revisione della traduzione (2020), attuale responsabile: Valter Mura valtermura@gmail.com Aggiornamento e revisione della traduzione (2009): Federico Zenith federico.zenith@member.fsf.org Aggiornamento e revisione della traduzione (2005): Andrea Celli Traduzione 2004: Stelvio Rosset -&underFDL; &underGPL; +> &underFDL; &underGPL; &documentation.index; diff -Nru kdiff3-1.8.01/po/it/kdiff3fileitemactionplugin.po kdiff3-1.8.3/po/it/kdiff3fileitemactionplugin.po --- kdiff3-1.8.01/po/it/kdiff3fileitemactionplugin.po 2019-05-18 01:02:06.000000000 +0000 +++ kdiff3-1.8.3/po/it/kdiff3fileitemactionplugin.po 2020-06-25 00:18:28.000000000 +0000 @@ -1,14 +1,14 @@ # Copyright (C) YEAR This_file_is_part_of_KDE # This file is distributed under the same license as the kdiff3 package. # Federico Zenith , 2011. -# Valter Mura , 2018. +# Valter Mura , 2018, 2019, 2020. # msgid "" msgstr "" "Project-Id-Version: kdiff3fileitemactionplugin\n" -"Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2019-03-22 03:09+0100\n" -"PO-Revision-Date: 2018-08-16 21:04+0100\n" +"Report-Msgid-Bugs-To: https://bugs.kde.org\n" +"POT-Creation-Date: 2019-08-30 07:40+0200\n" +"PO-Revision-Date: 2019-05-15 21:46+0200\n" "Last-Translator: Valter Mura \n" "Language-Team: Italian \n" "Language: it\n" @@ -16,7 +16,7 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: Lokalize 2.0\n" +"X-Generator: Lokalize 19.12.3\n" #: kdiff3fileitemaction.cpp:92 #, kde-format @@ -69,16 +69,10 @@ msgstr "Informazioni sull'estensione KDiff3 per menu..." #: kdiff3fileitemaction.cpp:287 -#, fuzzy, kde-format -#| msgid "" -#| "KDiff3 File Item Action Plugin: Copyright (C) 2011 Joachim Eibl\n" -#| "KDiff3 homepage: http://kdiff3.sourceforge.net\n" -#| "\n" +#, kde-format msgid "KDiff3 File Item Action Plugin: Copyright (C) 2011 Joachim Eibl\n" msgstr "" -"Estensione KDiff3 per azioni su file: copyright 2011 di Joachim Eibl\n" -"Pagina Web di KDiff3: http://kdiff3.sourceforge.net\n" -"\n" +"Estensione KDiff3 per azioni su file: copyright (C) 2011 di Joachim Eibl\n" #: kdiff3fileitemaction.cpp:288 #, kde-format diff -Nru kdiff3-1.8.01/po/it/kdiff3.po kdiff3-1.8.3/po/it/kdiff3.po --- kdiff3-1.8.01/po/it/kdiff3.po 2019-05-18 01:02:06.000000000 +0000 +++ kdiff3-1.8.3/po/it/kdiff3.po 2020-06-25 00:18:28.000000000 +0000 @@ -4,14 +4,14 @@ # Marcello Anni , 2006, 2007. # Giovanni Venturi , 2006. # Federico Zenith , 2009, 2010, 2011. -# Valter Mura , 2018, 2019. +# Valter Mura , 2018, 2019, 2020. # msgid "" msgstr "" "Project-Id-Version: kdiff3\n" -"Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2019-04-18 08:02+0200\n" -"PO-Revision-Date: 2019-03-24 11:42+0100\n" +"Report-Msgid-Bugs-To: https://bugs.kde.org\n" +"POT-Creation-Date: 2020-06-22 07:48+0200\n" +"PO-Revision-Date: 2020-01-26 19:50+0100\n" "Last-Translator: Valter Mura \n" "Language-Team: Italian \n" "Language: it\n" @@ -19,7 +19,7 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: Lokalize 19.03.80\n" +"X-Generator: Lokalize 20.04.2\n" #, kde-format msgctxt "NAME OF TRANSLATORS" @@ -31,285 +31,285 @@ msgid "Your emails" msgstr "valtermura@gmail.com,,," -#: difftextwindow.cpp:412 +#: difftextwindow.cpp:414 #, kde-format msgid "File %1: Line %2" msgstr "File %1: riga %2" -#: difftextwindow.cpp:414 +#: difftextwindow.cpp:416 #, kde-format msgid "File %1: Line not available" msgstr "File %1: riga non disponibile" -#: difftextwindow.cpp:1780 +#: difftextwindow.cpp:1778 #, kde-format msgid "Encoding:" msgstr "Codifica:" -#: difftextwindow.cpp:1782 mergeresultwindow.cpp:3138 optiondialog.cpp:818 +#: difftextwindow.cpp:1781 mergeresultwindow.cpp:3166 optiondialog.cpp:840 #, kde-format msgid "Line end style:" msgstr "Tipo di fine riga:" -#: difftextwindow.cpp:1810 directorymergewindow.cpp:382 -#: directorymergewindow.cpp:433 directorymergewindow.cpp:524 -#: directorymergewindow.cpp:3058 directorymergewindow.cpp:3189 -#: directorymergewindow.cpp:3417 mergeresultwindow.cpp:942 -#: mergeresultwindow.cpp:944 mergeresultwindow.cpp:946 -#: mergeresultwindow.cpp:948 mergeresultwindow.cpp:1814 -#: mergeresultwindow.cpp:3170 mergeresultwindow.cpp:3177 optiondialog.cpp:962 -#: optiondialog.cpp:975 pdiff.cpp:833 pdiff.cpp:835 pdiff.cpp:837 pdiff.cpp:839 -#: pdiff.cpp:861 smalldialogs.cpp:124 smalldialogs.cpp:126 smalldialogs.cpp:127 -#: smalldialogs.cpp:130 +#: difftextwindow.cpp:1809 directorymergewindow.cpp:383 +#: directorymergewindow.cpp:434 directorymergewindow.cpp:525 +#: directorymergewindow.cpp:3072 directorymergewindow.cpp:3203 +#: directorymergewindow.cpp:3431 mergeresultwindow.cpp:970 +#: mergeresultwindow.cpp:972 mergeresultwindow.cpp:974 +#: mergeresultwindow.cpp:976 mergeresultwindow.cpp:1842 +#: mergeresultwindow.cpp:3198 mergeresultwindow.cpp:3205 optiondialog.cpp:1002 +#: optiondialog.cpp:1015 pdiff.cpp:823 pdiff.cpp:825 pdiff.cpp:827 +#: pdiff.cpp:829 pdiff.cpp:851 smalldialogs.cpp:131 smalldialogs.cpp:133 +#: smalldialogs.cpp:134 smalldialogs.cpp:137 #, kde-format msgid "A" msgstr "A" -#: difftextwindow.cpp:1810 directorymergewindow.cpp:384 -#: directorymergewindow.cpp:436 directorymergewindow.cpp:526 -#: directorymergewindow.cpp:3064 directorymergewindow.cpp:3190 -#: directorymergewindow.cpp:3418 mergeresultwindow.cpp:942 -#: mergeresultwindow.cpp:944 mergeresultwindow.cpp:950 -#: mergeresultwindow.cpp:952 mergeresultwindow.cpp:1816 -#: mergeresultwindow.cpp:3172 mergeresultwindow.cpp:3179 optiondialog.cpp:963 -#: optiondialog.cpp:976 pdiff.cpp:833 pdiff.cpp:835 pdiff.cpp:841 pdiff.cpp:843 -#: pdiff.cpp:863 smalldialogs.cpp:124 smalldialogs.cpp:125 smalldialogs.cpp:128 -#: smalldialogs.cpp:131 +#: difftextwindow.cpp:1809 directorymergewindow.cpp:385 +#: directorymergewindow.cpp:437 directorymergewindow.cpp:527 +#: directorymergewindow.cpp:3078 directorymergewindow.cpp:3204 +#: directorymergewindow.cpp:3432 mergeresultwindow.cpp:970 +#: mergeresultwindow.cpp:972 mergeresultwindow.cpp:978 +#: mergeresultwindow.cpp:980 mergeresultwindow.cpp:1844 +#: mergeresultwindow.cpp:3200 mergeresultwindow.cpp:3207 optiondialog.cpp:1003 +#: optiondialog.cpp:1016 pdiff.cpp:823 pdiff.cpp:825 pdiff.cpp:831 +#: pdiff.cpp:833 pdiff.cpp:853 smalldialogs.cpp:131 smalldialogs.cpp:132 +#: smalldialogs.cpp:135 smalldialogs.cpp:138 #, kde-format msgid "B" msgstr "B" -#: difftextwindow.cpp:1810 directorymergewindow.cpp:386 -#: directorymergewindow.cpp:439 directorymergewindow.cpp:528 -#: directorymergewindow.cpp:3070 directorymergewindow.cpp:3191 -#: directorymergewindow.cpp:3419 mergeresultwindow.cpp:946 -#: mergeresultwindow.cpp:948 mergeresultwindow.cpp:950 -#: mergeresultwindow.cpp:952 mergeresultwindow.cpp:1818 -#: mergeresultwindow.cpp:3174 mergeresultwindow.cpp:3181 optiondialog.cpp:977 -#: pdiff.cpp:837 pdiff.cpp:839 pdiff.cpp:841 pdiff.cpp:843 pdiff.cpp:865 -#: smalldialogs.cpp:125 smalldialogs.cpp:126 smalldialogs.cpp:129 -#: smalldialogs.cpp:132 +#: difftextwindow.cpp:1809 directorymergewindow.cpp:387 +#: directorymergewindow.cpp:440 directorymergewindow.cpp:529 +#: directorymergewindow.cpp:3084 directorymergewindow.cpp:3205 +#: directorymergewindow.cpp:3433 mergeresultwindow.cpp:974 +#: mergeresultwindow.cpp:976 mergeresultwindow.cpp:978 +#: mergeresultwindow.cpp:980 mergeresultwindow.cpp:1846 +#: mergeresultwindow.cpp:3202 mergeresultwindow.cpp:3209 optiondialog.cpp:1017 +#: pdiff.cpp:827 pdiff.cpp:829 pdiff.cpp:831 pdiff.cpp:833 pdiff.cpp:855 +#: smalldialogs.cpp:132 smalldialogs.cpp:133 smalldialogs.cpp:136 +#: smalldialogs.cpp:139 #, kde-format msgid "C" msgstr "C" -#: difftextwindow.cpp:1810 +#: difftextwindow.cpp:1809 #, kde-format msgid "A (Base)" msgstr "A (Base)" -#: difftextwindow.cpp:1812 +#: difftextwindow.cpp:1811 #, kde-format msgid "Encoding: %1" msgstr "Codifica: %1" -#: difftextwindow.cpp:1813 mergeresultwindow.cpp:3183 +#: difftextwindow.cpp:1812 mergeresultwindow.cpp:3211 #, kde-format msgid "Unix" msgstr "Unix" -#: difftextwindow.cpp:1813 mergeresultwindow.cpp:3184 +#: difftextwindow.cpp:1812 mergeresultwindow.cpp:3212 #, kde-format msgid "DOS" msgstr "DOS" -#: difftextwindow.cpp:1813 +#: difftextwindow.cpp:1812 #, kde-format msgid "Line end style: %1" msgstr "Tipo di fine riga: %1" -#: difftextwindow.cpp:1835 kdiff3.cpp:873 +#: difftextwindow.cpp:1834 kdiff3.cpp:874 #, kde-format msgid "Top line" msgstr "Riga superiore" -#: difftextwindow.cpp:1845 +#: difftextwindow.cpp:1843 #, kde-format msgid "End" msgstr "Fine" -#: difftextwindow.cpp:1903 smalldialogs.cpp:235 +#: difftextwindow.cpp:1901 smalldialogs.cpp:245 #, kde-format msgid "Open File" msgstr "Apri file" -#: difftextwindow.cpp:1951 optiondialog.cpp:387 +#: difftextwindow.cpp:1943 optiondialog.cpp:389 #, kde-format msgid "Unicode, 8 bit" msgstr "Unicode, 8 bit" -#: difftextwindow.cpp:1966 +#: difftextwindow.cpp:1958 #, kde-format msgid "Other" msgstr "Altro" -#: directorymergewindow.cpp:409 directorymergewindow.cpp:3424 +#: directorymergewindow.cpp:410 directorymergewindow.cpp:3438 #, kde-format msgid "Copy A to B" msgstr "Copia A su B" -#: directorymergewindow.cpp:412 directorymergewindow.cpp:3425 +#: directorymergewindow.cpp:413 directorymergewindow.cpp:3439 #, kde-format msgid "Copy B to A" msgstr "Copia B su A" -#: directorymergewindow.cpp:415 directorymergewindow.cpp:3426 +#: directorymergewindow.cpp:416 directorymergewindow.cpp:3440 #, kde-format msgid "Delete A" msgstr "Elimina A" -#: directorymergewindow.cpp:418 directorymergewindow.cpp:3427 +#: directorymergewindow.cpp:419 directorymergewindow.cpp:3441 #, kde-format msgid "Delete B" msgstr "Elimina B" -#: directorymergewindow.cpp:421 +#: directorymergewindow.cpp:422 #, kde-format msgid "Delete A & B" msgstr "Elimina A e B" -#: directorymergewindow.cpp:424 directorymergewindow.cpp:3429 +#: directorymergewindow.cpp:425 directorymergewindow.cpp:3443 #, kde-format msgid "Merge to A" msgstr "Fondi con A" -#: directorymergewindow.cpp:427 directorymergewindow.cpp:3430 +#: directorymergewindow.cpp:428 directorymergewindow.cpp:3444 #, kde-format msgid "Merge to B" msgstr "Fondi con B" -#: directorymergewindow.cpp:430 +#: directorymergewindow.cpp:431 #, kde-format msgid "Merge to A & B" msgstr "Fondi con A e B" -#: directorymergewindow.cpp:442 directorymergewindow.cpp:3421 +#: directorymergewindow.cpp:443 directorymergewindow.cpp:3435 #, kde-format msgid "Delete (if exists)" msgstr "Elimina (se esiste)" -#: directorymergewindow.cpp:445 directorymergewindow.cpp:448 -#: directorymergewindow.cpp:3420 optiondialog.cpp:925 smalldialogs.cpp:113 +#: directorymergewindow.cpp:446 directorymergewindow.cpp:449 +#: directorymergewindow.cpp:3434 smalldialogs.cpp:120 #, kde-format msgid "Merge" msgstr "Fondi" -#: directorymergewindow.cpp:445 directorymergewindow.cpp:448 +#: directorymergewindow.cpp:446 directorymergewindow.cpp:449 #, kde-format msgid "Merge (manual)" msgstr "Fondi (manuale)" -#: directorymergewindow.cpp:451 +#: directorymergewindow.cpp:452 #, kde-format msgid "Error: Conflicting File Types" msgstr "Errore: tipi di file in conflitto" -#: directorymergewindow.cpp:454 +#: directorymergewindow.cpp:455 #, kde-format msgid "Error: Changed and Deleted" msgstr "Errore: modificato ed eliminato." -#: directorymergewindow.cpp:457 +#: directorymergewindow.cpp:458 #, kde-format msgid "Error: Dates are equal but files are not." msgstr "Errore: le date coincidono ma i file sono diversi." -#: directorymergewindow.cpp:471 +#: directorymergewindow.cpp:472 #, kde-format msgid "Done" msgstr "Fatto" -#: directorymergewindow.cpp:473 +#: directorymergewindow.cpp:474 #, kde-format msgid "Error" msgstr "Errore" -#: directorymergewindow.cpp:475 +#: directorymergewindow.cpp:476 #, kde-format msgid "Skipped." msgstr "Saltato." -#: directorymergewindow.cpp:477 +#: directorymergewindow.cpp:478 #, kde-format msgid "Not saved." msgstr "Non salvato." -#: directorymergewindow.cpp:479 +#: directorymergewindow.cpp:480 #, kde-format msgid "In progress..." msgstr "In esecuzione..." -#: directorymergewindow.cpp:481 +#: directorymergewindow.cpp:482 #, kde-format msgid "To do." msgstr "Da fare." -#: directorymergewindow.cpp:522 +#: directorymergewindow.cpp:523 #, kde-format msgid "Name" msgstr "Nome" -#: directorymergewindow.cpp:530 +#: directorymergewindow.cpp:531 #, kde-format msgid "Operation" msgstr "Operazione" -#: directorymergewindow.cpp:532 +#: directorymergewindow.cpp:533 #, kde-format msgid "Status" msgstr "Stato" -#: directorymergewindow.cpp:534 +#: directorymergewindow.cpp:535 #, kde-format msgid "Unsolved" msgstr "Non risolto" -#: directorymergewindow.cpp:536 +#: directorymergewindow.cpp:537 #, kde-format msgid "Solved" msgstr "Risolto" -#: directorymergewindow.cpp:538 +#: directorymergewindow.cpp:539 #, kde-format msgid "Nonwhite" msgstr "Non vuoto" -#: directorymergewindow.cpp:540 +#: directorymergewindow.cpp:541 #, kde-format msgid "White" msgstr "Vuoto" -#: directorymergewindow.cpp:674 +#: directorymergewindow.cpp:676 #, kde-format msgid "Unable to compare non-normal file with normal file." msgstr "Impossibile confrontare un file non normale con un file normale." -#: directorymergewindow.cpp:688 +#: directorymergewindow.cpp:690 #, kde-format msgid "Mix of links and normal files." msgstr "Insieme di collegamenti e file normali." -#: directorymergewindow.cpp:695 +#: directorymergewindow.cpp:697 #, kde-format msgid "Link: " msgstr "Collegamento: " -#: directorymergewindow.cpp:704 +#: directorymergewindow.cpp:706 #, kde-format msgid "Size. " msgstr "Dimensione. " -#: directorymergewindow.cpp:718 directorymergewindow.cpp:728 +#: directorymergewindow.cpp:720 directorymergewindow.cpp:730 #, kde-format msgid "Date & Size: " msgstr "Data e dimensione: " -#: directorymergewindow.cpp:748 +#: directorymergewindow.cpp:751 #, kde-format msgid "Comparing file..." msgstr "Confronto del file..." -#: directorymergewindow.cpp:801 +#: directorymergewindow.cpp:813 #, kde-format msgid "" "You are currently doing a directory merge. Are you sure, you want to abort " @@ -318,50 +318,48 @@ "Stai fondendo delle cartelle. Sei sicuro di voler interrompere la fusione e " "riesaminare la cartella?" -#: directorymergewindow.cpp:802 kdiff3.cpp:698 kdiff3.cpp:708 kdiff3.cpp:720 -#: mergeresultwindow.cpp:372 pdiff.cpp:1033 pdiff.cpp:1910 pdiff.cpp:1920 +#: directorymergewindow.cpp:814 kdiff3.cpp:697 kdiff3.cpp:707 kdiff3.cpp:719 +#: mergeresultwindow.cpp:400 pdiff.cpp:1031 pdiff.cpp:1920 pdiff.cpp:1930 #, kde-format msgid "Warning" msgstr "Avviso" -#: directorymergewindow.cpp:803 directorymergewindow.cpp:3393 +#: directorymergewindow.cpp:815 directorymergewindow.cpp:3407 #, kde-format msgid "Rescan" msgstr "Riesamina" -#: directorymergewindow.cpp:804 pdiff.cpp:1035 +#: directorymergewindow.cpp:816 pdiff.cpp:1033 #, kde-format msgid "Continue Merging" msgstr "Continua la fusione" -#: directorymergewindow.cpp:971 +#: directorymergewindow.cpp:984 #, kde-format msgid "Opening of directories failed:" msgstr "Apertura di cartelle non riuscita:" -#: directorymergewindow.cpp:975 +#: directorymergewindow.cpp:988 #, kde-format msgid "Dir A \"%1\" does not exist or is not a directory.\n" msgstr "La cartella A «%1» non esiste o non è una cartella.\n" -#: directorymergewindow.cpp:980 +#: directorymergewindow.cpp:993 #, kde-format msgid "Dir B \"%1\" does not exist or is not a directory.\n" -msgstr "" -"La cartella B «%1» non esiste o non è una cartella.\n" -".\n" +msgstr "La cartella B «%1» non esiste o non è una cartella.\n" -#: directorymergewindow.cpp:985 +#: directorymergewindow.cpp:998 #, kde-format msgid "Dir C \"%1\" does not exist or is not a directory.\n" msgstr "La cartella C «%1» non esiste o non è una cartella.\n" -#: directorymergewindow.cpp:988 +#: directorymergewindow.cpp:1001 #, kde-format msgid "Directory Open Error" msgstr "Errore nell'apertura di una cartella" -#: directorymergewindow.cpp:996 +#: directorymergewindow.cpp:1009 #, kde-format msgid "" "The destination directory must not be the same as A or B when three " @@ -372,49 +370,49 @@ "fondono tre cartelle.\n" "Ricontrolla prima di continuare." -#: directorymergewindow.cpp:998 +#: directorymergewindow.cpp:1011 #, kde-format msgid "Parameter Warning" msgstr "Attenzione ai parametri" -#: directorymergewindow.cpp:1003 +#: directorymergewindow.cpp:1016 #, kde-format msgid "Scanning directories..." msgstr "Esame delle cartelle..." -#: directorymergewindow.cpp:1029 +#: directorymergewindow.cpp:1042 #, kde-format msgid "Reading Directory A" msgstr "Lettura della cartella A" -#: directorymergewindow.cpp:1038 +#: directorymergewindow.cpp:1051 #, kde-format msgid "Reading Directory B" msgstr "Lettura della cartella B" -#: directorymergewindow.cpp:1048 +#: directorymergewindow.cpp:1061 #, kde-format msgid "Reading Directory C" msgstr "Lettura della cartella C" -#: directorymergewindow.cpp:1064 +#: directorymergewindow.cpp:1077 #, kde-format msgid "Some subdirectories were not readable in" msgstr "Alcune sottocartelle non erano leggibili" -#: directorymergewindow.cpp:1069 +#: directorymergewindow.cpp:1082 #, kde-format msgid "Check the permissions of the subdirectories." msgstr "Controlla i permessi per le sottocartelle." -#: directorymergewindow.cpp:1106 kdiff3.cpp:666 kdiff3.cpp:753 kdiff3.cpp:777 -#: kdiff3.cpp:1065 kdiff3.cpp:1086 pdiff.cpp:1116 pdiff.cpp:1170 pdiff.cpp:1218 -#: pdiff.cpp:1234 pdiff.cpp:1277 pdiff.cpp:1301 +#: directorymergewindow.cpp:1119 kdiff3.cpp:665 kdiff3.cpp:752 kdiff3.cpp:776 +#: kdiff3.cpp:1072 kdiff3.cpp:1093 pdiff.cpp:1115 pdiff.cpp:1178 pdiff.cpp:1228 +#: pdiff.cpp:1244 pdiff.cpp:1287 pdiff.cpp:1311 #, kde-format msgid "Ready." msgstr "Pronto." -#: directorymergewindow.cpp:1121 +#: directorymergewindow.cpp:1134 #, kde-format msgid "" "Directory Comparison Status\n" @@ -429,22 +427,22 @@ "Numero di file uguali: %2\n" "Numero di file diversi: %3" -#: directorymergewindow.cpp:1128 +#: directorymergewindow.cpp:1141 #, kde-format msgid "Number of manual merges: %1" msgstr "Numero di fusioni manuali: %1" -#: directorymergewindow.cpp:1394 +#: directorymergewindow.cpp:1407 #, kde-format msgid "This affects all merge operations." msgstr "Questo riguarda tutte le operazioni di fusione." -#: directorymergewindow.cpp:1395 +#: directorymergewindow.cpp:1408 #, kde-format msgid "Changing All Merge Operations" msgstr "Modifica di tutte le operazioni di fusione" -#: directorymergewindow.cpp:1695 +#: directorymergewindow.cpp:1708 #, kde-format msgid "" "Processing %1 / %2\n" @@ -453,44 +451,44 @@ "Elaborazione di %1 / %2\n" "%3" -#: directorymergewindow.cpp:1738 directorymergewindow.cpp:1742 +#: directorymergewindow.cpp:1751 directorymergewindow.cpp:1755 #, kde-format msgid "Some files could not be processed." msgstr "Non è stato possibile elaborare alcuni file." -#: directorymergewindow.cpp:2222 directorymergewindow.cpp:2247 -#: directorymergewindow.cpp:2271 +#: directorymergewindow.cpp:2235 directorymergewindow.cpp:2260 +#: directorymergewindow.cpp:2285 #, kde-format msgid "This operation is currently not possible." msgstr "Questa operazione non è attualmente possibile." -#: directorymergewindow.cpp:2222 directorymergewindow.cpp:2247 -#: directorymergewindow.cpp:2271 directorymergewindow.cpp:2552 +#: directorymergewindow.cpp:2235 directorymergewindow.cpp:2260 +#: directorymergewindow.cpp:2285 directorymergewindow.cpp:2565 #, kde-format msgid "Operation Not Possible" msgstr "Operazione non possibile" -#: directorymergewindow.cpp:2318 +#: directorymergewindow.cpp:2332 #, kde-format msgid "An error occurred while copying." msgstr "Si è verificato un errore durante la copia." -#: directorymergewindow.cpp:2319 directorymergewindow.cpp:2759 +#: directorymergewindow.cpp:2333 directorymergewindow.cpp:2772 #, kde-format msgid "Merge Error" msgstr "Errore di fusione" -#: directorymergewindow.cpp:2396 +#: directorymergewindow.cpp:2410 #, kde-format msgid "Unknown merge operation. (This must never happen!)" msgstr "Operazione di fusione sconosciuta (non deve mai succedere)." -#: directorymergewindow.cpp:2441 +#: directorymergewindow.cpp:2455 #, kde-format msgid "Unknown merge operation." msgstr "Operazione di fusione sconosciuta." -#: directorymergewindow.cpp:2454 +#: directorymergewindow.cpp:2468 #, kde-format msgid "" "The merge is about to begin.\n" @@ -512,22 +510,22 @@ "nessuna garanzia che funzioni! Fai una copia di sicurezza dei tuoi " "dati importanti!" -#: directorymergewindow.cpp:2459 +#: directorymergewindow.cpp:2473 #, kde-format msgid "Starting Merge" msgstr "Inizio della fusione" -#: directorymergewindow.cpp:2460 +#: directorymergewindow.cpp:2474 #, kde-format msgid "Do It" msgstr "Procedi" -#: directorymergewindow.cpp:2461 +#: directorymergewindow.cpp:2475 #, kde-format msgid "Simulate It" msgstr "Simula" -#: directorymergewindow.cpp:2487 +#: directorymergewindow.cpp:2501 #, kde-format msgid "" "The highlighted item has a different type in the different directories. " @@ -536,7 +534,7 @@ "L'elemento evidenziato è di diverso tipo nelle diverse cartelle. Scegli cosa " "fare." -#: directorymergewindow.cpp:2491 +#: directorymergewindow.cpp:2505 #, kde-format msgid "" "The modification dates of the file are equal but the files are not. Select " @@ -545,7 +543,7 @@ "Le date di modifica dei file sono uguali ma i file sono diversi. Scegli cosa " "fare." -#: directorymergewindow.cpp:2495 +#: directorymergewindow.cpp:2509 #, kde-format msgid "" "The highlighted item was changed in one directory and deleted in the other. " @@ -554,7 +552,7 @@ "L'elemento evidenziato è stato modificato in una cartella ed eliminato " "nell'altra. Scegli cosa fare." -#: directorymergewindow.cpp:2552 +#: directorymergewindow.cpp:2565 #, kde-format msgid "" "This operation is currently not possible because directory merge is " @@ -563,7 +561,7 @@ "Attualmente non si può effettuare questa operazione perché è in corso una " "fusione tra cartelle." -#: directorymergewindow.cpp:2609 +#: directorymergewindow.cpp:2622 #, kde-format msgid "" "There was an error in the last step.\n" @@ -573,32 +571,32 @@ "Si è verificato un errore nell'ultimo passaggio.\n" "Vuoi continuare con l'elemento che ha provocato l'errore o vuoi saltarlo?" -#: directorymergewindow.cpp:2611 +#: directorymergewindow.cpp:2624 #, kde-format msgid "Continue merge after an error" msgstr "Continua la fusione dopo un errore" -#: directorymergewindow.cpp:2612 +#: directorymergewindow.cpp:2625 #, kde-format msgid "Continue With Last Item" msgstr "Continua con l'ultimo" -#: directorymergewindow.cpp:2613 +#: directorymergewindow.cpp:2626 #, kde-format msgid "Skip Item" msgstr "Saltalo" -#: directorymergewindow.cpp:2709 +#: directorymergewindow.cpp:2722 #, kde-format msgid "Merge operation complete." msgstr "Operazione di fusione completata." -#: directorymergewindow.cpp:2709 directorymergewindow.cpp:2712 +#: directorymergewindow.cpp:2722 directorymergewindow.cpp:2725 #, kde-format msgid "Merge Complete" msgstr "Fusione completata" -#: directorymergewindow.cpp:2722 +#: directorymergewindow.cpp:2735 #, kde-format msgid "" "Simulated merge complete: Check if you agree with the proposed operations." @@ -606,48 +604,48 @@ "Fusione simulata completata: controlla se ti vanno bene le operazioni " "proposte." -#: directorymergewindow.cpp:2758 +#: directorymergewindow.cpp:2771 #, kde-format msgid "An error occurred. Press OK to see detailed information." msgstr "Si è verificato un errore. Premi OK per maggiori informazioni." -#: directorymergewindow.cpp:2791 +#: directorymergewindow.cpp:2804 #, kde-format msgid "Error: While deleting %1: Creating backup failed." msgstr "Errore: nell'eliminare %1: impossibile creare una copia di sicurezza." -#: directorymergewindow.cpp:2798 +#: directorymergewindow.cpp:2811 #, kde-format msgid "delete directory recursively( %1 )" msgstr "elimina cartella ricorsivamente (%1)" -#: directorymergewindow.cpp:2800 +#: directorymergewindow.cpp:2813 #, kde-format msgid "delete( %1 )" msgstr "elimina (%1)" -#: directorymergewindow.cpp:2815 +#: directorymergewindow.cpp:2828 #, kde-format msgid "Error: delete dir operation failed while trying to read the directory." msgstr "" "Errore: eliminazione della cartella non riuscita durante la sua lettura." -#: directorymergewindow.cpp:2834 +#: directorymergewindow.cpp:2847 #, kde-format msgid "Error: rmdir( %1 ) operation failed." msgstr "Errore: operazione di rimozione di una cartella (%1) non riuscita." -#: directorymergewindow.cpp:2844 +#: directorymergewindow.cpp:2857 #, kde-format msgid "Error: delete operation failed." msgstr "Errore: eliminazione non riuscita." -#: directorymergewindow.cpp:2870 +#: directorymergewindow.cpp:2884 #, kde-format msgid "manual merge( %1, %2, %3 -> %4)" msgstr "fusione manuale (%1, %2,%3 -> %4)" -#: directorymergewindow.cpp:2873 +#: directorymergewindow.cpp:2887 #, kde-format msgid "" " Note: After a manual merge the user should continue by pressing F7." @@ -655,186 +653,186 @@ " Nota: dopo una fusione manuale l'utente dovrebbe premere F7 per " "continuare." -#: directorymergewindow.cpp:2900 +#: directorymergewindow.cpp:2914 #, kde-format msgid "Error: copy( %1 -> %2 ) failed.Deleting existing destination failed." msgstr "" "Errore: copia (%1 -> %2) non riuscita. Eliminazione della destinazione " "esistente non riuscita." -#: directorymergewindow.cpp:2909 +#: directorymergewindow.cpp:2923 #, kde-format msgid "copyLink( %1 -> %2 )" msgstr "copia collegamento (%1 -> %2)" -#: directorymergewindow.cpp:2918 +#: directorymergewindow.cpp:2932 #, kde-format msgid "Error: copyLink failed: Remote links are not yet supported." msgstr "" "Errore: copia di collegamento non riuscita: i collegamenti remoti non sono " "ancora supportati." -#: directorymergewindow.cpp:2928 +#: directorymergewindow.cpp:2942 #, kde-format msgid "Error: copyLink failed." msgstr "Errore: copia di collegamento non riuscita." -#: directorymergewindow.cpp:2953 +#: directorymergewindow.cpp:2967 #, kde-format msgid "copy( %1 -> %2 )" msgstr "copia (%1 -> %2)" -#: directorymergewindow.cpp:2979 +#: directorymergewindow.cpp:2993 #, kde-format msgid "Error during rename( %1 -> %2 ): Cannot delete existing destination." msgstr "" "Errore nella rinomina (%1 -> %2): impossibile eliminare la destinazione " "esistente." -#: directorymergewindow.cpp:2986 +#: directorymergewindow.cpp:3000 #, kde-format msgid "rename( %1 -> %2 )" msgstr "rinomina (%1 -> %2)" -#: directorymergewindow.cpp:2995 +#: directorymergewindow.cpp:3009 #, kde-format msgid "Error: Rename failed." msgstr "Errore: rinomina non riuscita." -#: directorymergewindow.cpp:3013 +#: directorymergewindow.cpp:3027 #, kde-format msgid "Error during makeDir of %1. Cannot delete existing file." msgstr "" "Errore durante la creazione della cartella %1. Impossibile eliminare un file " "esistente." -#: directorymergewindow.cpp:3030 +#: directorymergewindow.cpp:3044 #, kde-format msgid "makeDir( %1 )" msgstr "crea cartella (%1)" -#: directorymergewindow.cpp:3040 +#: directorymergewindow.cpp:3054 #, kde-format msgid "Error while creating directory." msgstr "Errore nella creazione di una cartella." -#: directorymergewindow.cpp:3076 directorymergewindow.cpp:3195 +#: directorymergewindow.cpp:3090 directorymergewindow.cpp:3209 #, kde-format msgid "Dest" msgstr "Destinazione" -#: directorymergewindow.cpp:3084 directorymergewindow.cpp:3113 +#: directorymergewindow.cpp:3098 directorymergewindow.cpp:3127 #, kde-format msgid "Dir" msgstr "Cartella" -#: directorymergewindow.cpp:3084 +#: directorymergewindow.cpp:3098 #, kde-format msgid "Type" msgstr "Tipo" -#: directorymergewindow.cpp:3084 +#: directorymergewindow.cpp:3098 #, kde-format msgid "Size" msgstr "Dimensione" -#: directorymergewindow.cpp:3085 +#: directorymergewindow.cpp:3099 #, kde-format msgid "Attr" msgstr "Attributo" -#: directorymergewindow.cpp:3085 +#: directorymergewindow.cpp:3099 #, kde-format msgid "Last Modification" msgstr "Ultima modifica" -#: directorymergewindow.cpp:3085 +#: directorymergewindow.cpp:3099 #, kde-format msgid "Link-Destination" msgstr "Destinazione del collegamento" -#: directorymergewindow.cpp:3113 +#: directorymergewindow.cpp:3127 #, kde-format msgid "File" msgstr "File" -#: directorymergewindow.cpp:3113 +#: directorymergewindow.cpp:3127 #, kde-format msgid "-Link" msgstr "-Collegamento" -#: directorymergewindow.cpp:3119 +#: directorymergewindow.cpp:3133 #, kde-format msgid "not available" msgstr "non disponibile" -#: directorymergewindow.cpp:3137 +#: directorymergewindow.cpp:3151 #, kde-format msgid "A (Dest): " msgstr "A (destinazione): " -#: directorymergewindow.cpp:3141 +#: directorymergewindow.cpp:3155 #, kde-format msgid "A: " msgstr "A: " -#: directorymergewindow.cpp:3141 +#: directorymergewindow.cpp:3155 #, kde-format msgid "A (Base): " msgstr "A (base): " -#: directorymergewindow.cpp:3147 +#: directorymergewindow.cpp:3161 #, kde-format msgid "B (Dest): " msgstr "B (destinazione): " -#: directorymergewindow.cpp:3151 +#: directorymergewindow.cpp:3165 #, kde-format msgid "B: " msgstr "B: " -#: directorymergewindow.cpp:3156 +#: directorymergewindow.cpp:3170 #, kde-format msgid "C (Dest): " msgstr "C (destinazione): " -#: directorymergewindow.cpp:3160 +#: directorymergewindow.cpp:3174 #, kde-format msgid "C: " msgstr "C: " -#: directorymergewindow.cpp:3163 +#: directorymergewindow.cpp:3177 #, kde-format msgid "Dest: " msgstr "Destinazione: " #. i18n("Saving Directory Merge State ...")); -#: directorymergewindow.cpp:3238 +#: directorymergewindow.cpp:3252 #, kde-format msgid "Save Directory Merge State As..." msgstr "Salva lo stato di fusione tra cartelle come..." -#: directorymergewindow.cpp:3387 +#: directorymergewindow.cpp:3401 #, kde-format msgid "Start/Continue Directory Merge" msgstr "Avvia o continua fusione tra cartelle" -#: directorymergewindow.cpp:3388 +#: directorymergewindow.cpp:3402 #, kde-format msgid "Run Operation for Current Item" msgstr "Esegui operazione sull'elemento attuale" -#: directorymergewindow.cpp:3389 +#: directorymergewindow.cpp:3403 #, kde-format msgid "Compare Selected File" msgstr "Confronta il file selezionato" -#: directorymergewindow.cpp:3390 +#: directorymergewindow.cpp:3404 #, kde-format msgid "Merge Current File" msgstr "Fondi il file attuale" -#: directorymergewindow.cpp:3390 +#: directorymergewindow.cpp:3404 #, kde-format msgid "" "Merge\n" @@ -843,51 +841,51 @@ "Fondi\n" "file" -#: directorymergewindow.cpp:3391 +#: directorymergewindow.cpp:3405 #, kde-format msgid "Fold All Subdirs" msgstr "Chiudi tutte le sottocartelle" -#: directorymergewindow.cpp:3392 +#: directorymergewindow.cpp:3406 #, kde-format msgid "Unfold All Subdirs" msgstr "Apri tutte le sottocartelle" #. i18n("Save Directory Merge State ..."), 0, this, &DirectoryMergeWindow::slotSaveMergeState, ac, "dir_save_merge_state"); #. i18n("Load Directory Merge State ..."), 0, this, &DirectoryMergeWindow::slotLoadMergeState, ac, "dir_load_merge_state"); -#: directorymergewindow.cpp:3396 +#: directorymergewindow.cpp:3410 #, kde-format msgid "Choose A for All Items" msgstr "Scegli A per tutti gli elementi" -#: directorymergewindow.cpp:3397 +#: directorymergewindow.cpp:3411 #, kde-format msgid "Choose B for All Items" msgstr "Scegli B per tutti gli elementi" -#: directorymergewindow.cpp:3398 +#: directorymergewindow.cpp:3412 #, kde-format msgid "Choose C for All Items" msgstr "Scegli C per tutti gli elementi" -#: directorymergewindow.cpp:3399 +#: directorymergewindow.cpp:3413 #, kde-format msgid "Auto-Choose Operation for All Items" msgstr "Operazione di scelta automatica per tutti gli elementi" -#: directorymergewindow.cpp:3400 +#: directorymergewindow.cpp:3414 #, kde-format msgid "No Operation for All Items" msgstr "Nessuna operazione per tutti gli elementi" #. i18n("Synchronize Directories"), 0, this, &DirectoryMergeWindow::slotSynchronizeDirectories, ac, "dir_synchronize_directories"); #. d->m_pDirChooseNewerFiles = GuiUtils::createAction< KToggleAction >(i18n("Copy Newer Files Instead of Merging"), 0, this, &DirectoryMergeWindow::slotChooseNewerFiles, ac, "dir_choose_newer_files"); -#: directorymergewindow.cpp:3405 +#: directorymergewindow.cpp:3419 #, kde-format msgid "Show Identical Files" msgstr "Mostra file identici" -#: directorymergewindow.cpp:3405 +#: directorymergewindow.cpp:3419 #, kde-format msgid "" "Identical\n" @@ -896,17 +894,17 @@ "File\n" "identici" -#: directorymergewindow.cpp:3406 +#: directorymergewindow.cpp:3420 #, kde-format msgid "Show Different Files" msgstr "Mostra file diversi" -#: directorymergewindow.cpp:3407 +#: directorymergewindow.cpp:3421 #, kde-format msgid "Show Files only in A" msgstr "Mostra file solo in A" -#: directorymergewindow.cpp:3407 +#: directorymergewindow.cpp:3421 #, kde-format msgid "" "Files\n" @@ -915,12 +913,12 @@ "File\n" "solo in A" -#: directorymergewindow.cpp:3408 +#: directorymergewindow.cpp:3422 #, kde-format msgid "Show Files only in B" msgstr "Mostra file solo in B" -#: directorymergewindow.cpp:3408 +#: directorymergewindow.cpp:3422 #, kde-format msgid "" "Files\n" @@ -929,12 +927,12 @@ "File\n" "solo in B" -#: directorymergewindow.cpp:3409 +#: directorymergewindow.cpp:3423 #, kde-format msgid "Show Files only in C" msgstr "Mostra file solo in C" -#: directorymergewindow.cpp:3409 +#: directorymergewindow.cpp:3423 #, kde-format msgid "" "Files\n" @@ -943,52 +941,58 @@ "File\n" "solo in C" -#: directorymergewindow.cpp:3413 +#: directorymergewindow.cpp:3427 #, kde-format msgid "Compare Explicitly Selected Files" msgstr "Confronta file selezionati esplicitamente" -#: directorymergewindow.cpp:3414 +#: directorymergewindow.cpp:3428 #, kde-format msgid "Merge Explicitly Selected Files" msgstr "Fondi file selezionati esplicitamente" -#: directorymergewindow.cpp:3416 directorymergewindow.cpp:3423 +#: directorymergewindow.cpp:3430 directorymergewindow.cpp:3437 #, kde-format msgid "Do Nothing" msgstr "Non fare nulla" -#: directorymergewindow.cpp:3428 +#: directorymergewindow.cpp:3442 #, kde-format msgid "Delete A && B" msgstr "Elimina A e B" -#: directorymergewindow.cpp:3431 +#: directorymergewindow.cpp:3445 #, kde-format msgid "Merge to A && B" msgstr "Fondi con A e B" -#: fileaccess.cpp:462 SourceData.cpp:493 +#: fileaccess.cpp:301 +#, kde-format +msgid "Unable to determine full url. No parent specified." +msgstr "" +"Impossibile individuare l'URL completo. Nessun percorso genitore specificato." + +#: fileaccess.cpp:482 SourceData.cpp:506 #, kde-format msgid "Failed to read file: %1" msgstr "Lettura del file non riuscita: %1" -#: fileaccess.cpp:587 +#: fileaccess.cpp:624 #, kde-format msgid "Creating temp copy of %1 failed." msgstr "Creazione di una copia temporanea di %1 non riuscita." -#: fileaccess.cpp:595 fileaccess.cpp:600 +#: fileaccess.cpp:632 fileaccess.cpp:637 #, kde-format msgid "Opening %1 failed. %2" msgstr "Apertura di %1 non riuscita. %2" -#: fileaccess.cpp:619 fileaccess.cpp:627 +#: fileaccess.cpp:656 fileaccess.cpp:664 #, kde-format msgid "Error reading from %1. %2" msgstr "Errore nella lettura di %1. %2" -#: fileaccess.cpp:751 +#: fileaccess.cpp:788 #, kde-format msgid "" "While trying to make a backup, deleting an older backup failed.\n" @@ -998,7 +1002,7 @@ "una precedente.\n" "Nome del file: %1" -#: fileaccess.cpp:758 +#: fileaccess.cpp:795 #, kde-format msgid "" "While trying to make a backup, renaming failed.\n" @@ -1007,178 +1011,178 @@ "Cercando di creare una copia di sicurezza, non è riuscita la rinomina.\n" "Nomi dei file: %1 -> %2" -#: fileaccess.cpp:828 +#: fileaccess.cpp:865 #, kde-format msgid "Getting file status: %1" msgstr "Recupero informazioni sullo stato del file: %1" -#: fileaccess.cpp:869 +#: fileaccess.cpp:906 #, kde-format msgid "Reading file: %1" msgstr "Lettura del file: %1" -#: fileaccess.cpp:907 +#: fileaccess.cpp:944 #, kde-format msgid "Writing file: %1" msgstr "Scrittura del file: %1" -#: fileaccess.cpp:940 +#: fileaccess.cpp:977 #, kde-format msgid "Out of memory" msgstr "Memoria esaurita" -#: fileaccess.cpp:976 +#: fileaccess.cpp:1013 #, kde-format msgid "Making directory: %1" msgstr "Creazione della cartella: %1" -#: fileaccess.cpp:997 +#: fileaccess.cpp:1034 #, kde-format msgid "Removing directory: %1" msgstr "Rimozione della cartella: %1" -#: fileaccess.cpp:1012 +#: fileaccess.cpp:1049 #, kde-format msgid "Removing file: %1" msgstr "Rimozione del file: %1" -#: fileaccess.cpp:1028 +#: fileaccess.cpp:1065 #, kde-format msgid "Creating symbolic link: %1 -> %2" msgstr "Creazione del collegamento simbolico: %1 -> %2" -#: fileaccess.cpp:1052 +#: fileaccess.cpp:1089 #, kde-format msgid "Renaming file: %1 -> %2" msgstr "Rinomina del file: %1 -> %2" -#: fileaccess.cpp:1086 +#: fileaccess.cpp:1123 #, kde-format msgid "Copying file: %1 -> %2" msgstr "Copia del file: %1 -> %2" -#: fileaccess.cpp:1108 +#: fileaccess.cpp:1145 #, kde-format msgid "Reading directory: %1" msgstr "Lettura della cartella: %1" -#: fileaccess.cpp:1162 +#: fileaccess.cpp:1202 #, kde-format msgid "Listing directory: %1" msgstr "Elenco della cartella: %1" -#: kdiff3.cpp:181 +#: kdiff3.cpp:182 #, kde-format msgid "Current Configuration:" msgstr "Configurazione attuale:" -#: kdiff3.cpp:186 +#: kdiff3.cpp:187 #, kde-format msgid "Config Option Error:" msgstr "Errore nelle opzioni di configurazione:" -#: kdiff3.cpp:240 +#: kdiff3.cpp:246 #, kde-format msgid "Option --auto used, but no output file specified." msgstr "" "Opzione --auto inserita, ma non è stato indicato nessun del file di uscita." -#: kdiff3.cpp:416 +#: kdiff3.cpp:405 #, kde-format msgid "Option --auto ignored for directory comparison." msgstr "Opzione --auto ignorata nel confronto di cartelle." -#: kdiff3.cpp:460 +#: kdiff3.cpp:449 #, kde-format msgid "Saving failed." msgstr "Salvataggio non riuscito." -#: kdiff3.cpp:496 pdiff.cpp:1098 +#: kdiff3.cpp:494 pdiff.cpp:1096 #, kde-format msgid "Opening of these files failed:" msgstr "Apertura di questi file non riuscita:" -#: kdiff3.cpp:505 +#: kdiff3.cpp:503 pdiff.cpp:1105 #, kde-format -msgid "File Open Error" -msgstr "Errore nell'apertura di un file" +msgid "File open error" +msgstr "Errore nell'apertura del file" -#: kdiff3.cpp:533 +#: kdiff3.cpp:532 #, kde-format msgid "Opens documents for comparison..." msgstr "Apre documenti per confrontarli..." -#: kdiff3.cpp:535 +#: kdiff3.cpp:534 #, kde-format msgid "Reload" msgstr "Ricarica" -#: kdiff3.cpp:538 +#: kdiff3.cpp:537 #, kde-format msgid "Saves the merge result. All conflicts must be solved!" msgstr "Salva il risultato della fusione. Tutti i conflitti vanno risolti!" -#: kdiff3.cpp:540 +#: kdiff3.cpp:539 #, kde-format msgid "Saves the current document as..." msgstr "Salva il documento attuale come..." -#: kdiff3.cpp:543 +#: kdiff3.cpp:542 #, kde-format msgid "Print the differences" msgstr "Stampa le differenze" -#: kdiff3.cpp:546 +#: kdiff3.cpp:545 #, kde-format msgid "Quits the application" msgstr "Esce dall'applicazione" -#: kdiff3.cpp:549 +#: kdiff3.cpp:548 #, kde-format msgid "Cuts the selected section and puts it to the clipboard" msgstr "Taglia la sezione selezionata e la mette negli appunti" -#: kdiff3.cpp:552 +#: kdiff3.cpp:551 #, kde-format msgid "Copies the selected section to the clipboard" msgstr "Copia la sezione selezionata negli appunti" -#: kdiff3.cpp:554 +#: kdiff3.cpp:553 #, kde-format msgid "Pastes the clipboard contents to current position" msgstr "Incolla il contenuto degli appunti nella posizione attuale" -#: kdiff3.cpp:557 +#: kdiff3.cpp:556 #, kde-format msgid "Select everything in current window" msgstr "Seleziona tutto nella finestra attuale" -#: kdiff3.cpp:560 +#: kdiff3.cpp:559 #, kde-format msgid "Search for a string" msgstr "Cerca una stringa" -#: kdiff3.cpp:562 +#: kdiff3.cpp:561 #, kde-format msgid "Search again for the string" msgstr "Cerca di nuovo la stringa" -#: kdiff3.cpp:567 +#: kdiff3.cpp:566 #, kde-format msgid "Enables/disables the statusbar" msgstr "Abilita o disabilita la barra di stato" -#: kdiff3.cpp:571 +#: kdiff3.cpp:570 #, kde-format msgid "Configure KDiff3..." msgstr "Configura KDiff3..." -#: kdiff3.cpp:590 +#: kdiff3.cpp:589 #, kde-format msgid "Go to Current Delta" msgstr "Vai alla differenza attuale" -#: kdiff3.cpp:590 +#: kdiff3.cpp:589 #, kde-format msgid "" "Current\n" @@ -1187,12 +1191,12 @@ "Differenza\n" "attuale" -#: kdiff3.cpp:592 +#: kdiff3.cpp:591 #, kde-format msgid "Go to First Delta" msgstr "Vai alla prima differenza" -#: kdiff3.cpp:592 +#: kdiff3.cpp:591 #, kde-format msgid "" "First\n" @@ -1201,12 +1205,12 @@ "Prima\n" "differenza" -#: kdiff3.cpp:594 +#: kdiff3.cpp:593 #, kde-format msgid "Go to Last Delta" msgstr "Vai all'ultima differenza" -#: kdiff3.cpp:594 +#: kdiff3.cpp:593 #, kde-format msgid "" "Last\n" @@ -1215,13 +1219,13 @@ "Ultima\n" "differenza" -#: kdiff3.cpp:596 +#: kdiff3.cpp:595 #, kde-format msgid "(Skips white space differences when \"Show White Space\" is disabled.)" msgstr "" "(Ignora le differenze di soli spazi quando «Mostra spazi» è disattivato)" -#: kdiff3.cpp:597 +#: kdiff3.cpp:596 #, kde-format msgid "" "(Does not skip white space differences even when \"Show White Space\" is " @@ -1230,12 +1234,12 @@ "(Non salta le differenze di soli spazi bianchi anche quando «Mostra spazi» è " "disattivato)" -#: kdiff3.cpp:598 +#: kdiff3.cpp:597 #, kde-format msgid "Go to Previous Delta" msgstr "Vai alla differenza precedente" -#: kdiff3.cpp:598 +#: kdiff3.cpp:597 #, kde-format msgid "" "Prev\n" @@ -1244,12 +1248,12 @@ "Differenza\n" "precedente" -#: kdiff3.cpp:600 +#: kdiff3.cpp:599 #, kde-format msgid "Go to Next Delta" msgstr "Vai alla differenza successiva" -#: kdiff3.cpp:600 +#: kdiff3.cpp:599 #, kde-format msgid "" "Next\n" @@ -1258,12 +1262,12 @@ "Differenza\n" "successiva" -#: kdiff3.cpp:602 +#: kdiff3.cpp:601 #, kde-format msgid "Go to Previous Conflict" msgstr "Vai al conflitto precedente" -#: kdiff3.cpp:602 +#: kdiff3.cpp:601 #, kde-format msgid "" "Prev\n" @@ -1272,12 +1276,12 @@ "Conflitto\n" "precedente" -#: kdiff3.cpp:604 +#: kdiff3.cpp:603 #, kde-format msgid "Go to Next Conflict" msgstr "Vai al conflitto successivo" -#: kdiff3.cpp:604 +#: kdiff3.cpp:603 #, kde-format msgid "" "Next\n" @@ -1286,12 +1290,12 @@ "Conflitto\n" "successivo" -#: kdiff3.cpp:606 +#: kdiff3.cpp:605 #, kde-format msgid "Go to Previous Unsolved Conflict" msgstr "Vai al conflitto non risolto precedente" -#: kdiff3.cpp:606 +#: kdiff3.cpp:605 #, kde-format msgid "" "Prev\n" @@ -1300,12 +1304,12 @@ "Non risolto\n" "precedente" -#: kdiff3.cpp:608 +#: kdiff3.cpp:607 #, kde-format msgid "Go to Next Unsolved Conflict" msgstr "Vai al conflitto non risolto successivo" -#: kdiff3.cpp:608 +#: kdiff3.cpp:607 #, kde-format msgid "" "Next\n" @@ -1314,12 +1318,12 @@ "Non risolto\n" "successivo" -#: kdiff3.cpp:610 +#: kdiff3.cpp:609 #, kde-format msgid "Select Line(s) From A" msgstr "Seleziona righe da A" -#: kdiff3.cpp:610 +#: kdiff3.cpp:609 #, kde-format msgid "" "Choose\n" @@ -1328,12 +1332,12 @@ "Scegli\n" "A" -#: kdiff3.cpp:611 +#: kdiff3.cpp:610 #, kde-format msgid "Select Line(s) From B" msgstr "Seleziona righe da B" -#: kdiff3.cpp:611 +#: kdiff3.cpp:610 #, kde-format msgid "" "Choose\n" @@ -1342,12 +1346,12 @@ "Scegli\n" "B" -#: kdiff3.cpp:612 +#: kdiff3.cpp:611 #, kde-format msgid "Select Line(s) From C" msgstr "Seleziona righe da C" -#: kdiff3.cpp:612 +#: kdiff3.cpp:611 #, kde-format msgid "" "Choose\n" @@ -1356,14 +1360,14 @@ "Scegli\n" "C" -#: kdiff3.cpp:613 +#: kdiff3.cpp:612 #, kde-format msgid "Automatically Go to Next Unsolved Conflict After Source Selection" msgstr "" "Vai automaticamente al conflitto non risolto successivo dopo aver " "selezionato la fonte" -#: kdiff3.cpp:613 +#: kdiff3.cpp:612 #, kde-format msgid "" "Auto\n" @@ -1372,24 +1376,24 @@ "Successivo\n" "automatico" -#: kdiff3.cpp:615 +#: kdiff3.cpp:614 #, kde-format msgid "Show Space && Tabulator Characters" msgstr "Mostra spazi e tabulazioni" -#: kdiff3.cpp:615 +#: kdiff3.cpp:614 #, kde-format msgid "" "White\n" "Characters" msgstr "Spazi" -#: kdiff3.cpp:616 +#: kdiff3.cpp:615 #, kde-format msgid "Show White Space" msgstr "Mostra spazi" -#: kdiff3.cpp:616 +#: kdiff3.cpp:615 #, kde-format msgid "" "White\n" @@ -1398,12 +1402,12 @@ "Differenze\n" "di spazi" -#: kdiff3.cpp:618 +#: kdiff3.cpp:617 #, kde-format msgid "Show Line Numbers" msgstr "Mostra numeri di riga" -#: kdiff3.cpp:618 +#: kdiff3.cpp:617 #, kde-format msgid "" "Line\n" @@ -1412,193 +1416,193 @@ "Numeri\n" "di riga" -#: kdiff3.cpp:620 +#: kdiff3.cpp:619 #, kde-format msgid "Automatically Solve Simple Conflicts" msgstr "Risolvi automaticamente i conflitti semplici" -#: kdiff3.cpp:621 +#: kdiff3.cpp:620 #, kde-format msgid "Set Deltas to Conflicts" msgstr "Imposta le differenze a conflitti" -#: kdiff3.cpp:622 +#: kdiff3.cpp:621 #, kde-format msgid "Run Regular Expression Auto Merge" msgstr "Esegui la fusione automatica con espressioni regolari" -#: kdiff3.cpp:623 +#: kdiff3.cpp:622 #, kde-format msgid "Automatically Solve History Conflicts" msgstr "Risolvi automaticamente i conflitti di cronologia" -#: kdiff3.cpp:624 +#: kdiff3.cpp:623 #, kde-format msgid "Split Diff At Selection" msgstr "Dividi differenze alla selezione" -#: kdiff3.cpp:625 +#: kdiff3.cpp:624 #, kde-format msgid "Join Selected Diffs" msgstr "Unisci le differenze selezionate" -#: kdiff3.cpp:627 +#: kdiff3.cpp:626 #, kde-format msgid "Show Window A" msgstr "Mostra finestra A" -#: kdiff3.cpp:628 +#: kdiff3.cpp:627 #, kde-format msgid "Show Window B" msgstr "Mostra finestra B" -#: kdiff3.cpp:629 +#: kdiff3.cpp:628 #, kde-format msgid "Show Window C" msgstr "Mostra finestra C" -#: kdiff3.cpp:631 +#: kdiff3.cpp:630 #, kde-format msgid "Normal Overview" msgstr "Riassunto normale" -#: kdiff3.cpp:632 +#: kdiff3.cpp:631 #, kde-format msgid "A vs. B Overview" msgstr "Riassunto tra A e B" -#: kdiff3.cpp:633 +#: kdiff3.cpp:632 #, kde-format msgid "A vs. C Overview" msgstr "Riassunto tra A e C" -#: kdiff3.cpp:634 +#: kdiff3.cpp:633 #, kde-format msgid "B vs. C Overview" msgstr "Riassunto tra B e C" -#: kdiff3.cpp:635 +#: kdiff3.cpp:634 #, kde-format msgid "Word Wrap Diff Windows" msgstr "A capo automatico nelle finestre delle differenze" -#: kdiff3.cpp:636 +#: kdiff3.cpp:635 #, kde-format msgid "Add Manual Diff Alignment" msgstr "Aggiungi allineamento manuale delle differenze" -#: kdiff3.cpp:637 +#: kdiff3.cpp:636 #, kde-format msgid "Clear All Manual Diff Alignments" msgstr "Cancella tutti gli allineamenti manuali delle differenze" -#: kdiff3.cpp:639 +#: kdiff3.cpp:638 #, kde-format msgid "Focus Next Window" msgstr "Attiva la finestra successiva" -#: kdiff3.cpp:640 +#: kdiff3.cpp:639 #, kde-format msgid "Focus Prev Window" msgstr "Attiva la finestra precedente" -#: kdiff3.cpp:641 +#: kdiff3.cpp:640 #, kde-format msgid "Toggle Split Orientation" msgstr "Inverti l'orientamento di divisione" -#: kdiff3.cpp:643 +#: kdiff3.cpp:642 #, kde-format msgid "Dir && Text Split Screen View" msgstr "Vista separata di cartelle e testi" -#: kdiff3.cpp:645 +#: kdiff3.cpp:644 #, kde-format msgid "Toggle Between Dir && Text View" msgstr "Cambia tra vista di testi e di cartelle" -#: kdiff3.cpp:697 pdiff.cpp:1909 +#: kdiff3.cpp:696 pdiff.cpp:1919 #, kde-format msgid "The merge result has not been saved." msgstr "Il risultato della fusione non è stato salvato." -#: kdiff3.cpp:699 +#: kdiff3.cpp:698 #, kde-format msgid "Save && Quit" msgstr "Salva ed esci" -#: kdiff3.cpp:700 +#: kdiff3.cpp:699 #, kde-format msgid "Quit Without Saving" msgstr "Esci senza salvare" -#: kdiff3.cpp:708 pdiff.cpp:1920 +#: kdiff3.cpp:707 pdiff.cpp:1930 #, kde-format msgid "Saving the merge result failed." msgstr "Il salvataggio della fusione non è riuscito." -#: kdiff3.cpp:719 pdiff.cpp:1032 +#: kdiff3.cpp:718 pdiff.cpp:1030 #, kde-format msgid "" "You are currently doing a directory merge. Are you sure, you want to abort?" msgstr "È in corso una fusione di cartelle. Sei sicuro di voler interrompere?" -#: kdiff3.cpp:742 +#: kdiff3.cpp:741 #, kde-format msgid "Saving file..." msgstr "Salvataggio del file..." -#: kdiff3.cpp:759 +#: kdiff3.cpp:758 #, kde-format msgid "Saving file with a new filename..." msgstr "Salvataggio del file con un nuovo nome..." -#: kdiff3.cpp:761 +#: kdiff3.cpp:760 #, kde-format msgid "Save As..." msgstr "Salva come..." -#: kdiff3.cpp:820 +#: kdiff3.cpp:819 #, kde-format msgid "Printing not implemented." msgstr "Stampa non implementata." -#: kdiff3.cpp:857 +#: kdiff3.cpp:858 #, kde-format msgid "Printing..." msgstr "Stampa..." -#: kdiff3.cpp:943 +#: kdiff3.cpp:948 #, kde-format msgid "Printing page %1 of %2" msgstr "Stampa della pagina %1 di %2" -#: kdiff3.cpp:1000 +#: kdiff3.cpp:1006 #, kde-format msgid " (Selection)" msgstr " (Selezione)" -#: kdiff3.cpp:1027 +#: kdiff3.cpp:1034 #, kde-format msgid "Printing completed." msgstr "Stampa completata." -#: kdiff3.cpp:1031 +#: kdiff3.cpp:1038 #, kde-format msgid "Printing aborted." msgstr "Stampa interrotta." -#: kdiff3.cpp:1038 +#: kdiff3.cpp:1045 #, kde-format msgid "Exiting..." msgstr "Uscita..." -#: kdiff3.cpp:1049 +#: kdiff3.cpp:1056 #, kde-format msgid "Toggling toolbar..." msgstr "Commutazione della barra degli strumenti..." -#: kdiff3.cpp:1070 +#: kdiff3.cpp:1077 #, kde-format msgid "Toggle the statusbar..." msgstr "Commutazione della barra di stato..." @@ -1623,7 +1627,7 @@ msgid "Joachim Eibl" msgstr "Joachim Eibl" -#: kdiff3_part.cpp:173 kdiff3_part.cpp:254 +#: kdiff3_part.cpp:174 kdiff3_part.cpp:255 #, kde-format msgid "Could not find files for comparison." msgstr "Impossibile trovare i file da confrontare." @@ -1641,7 +1645,7 @@ msgstr "Configura KDiff3" #. i18n: ectx: ToolBar (mainToolBar) -#: kdiff3_part.rc:16 main.cpp:88 +#: kdiff3_part.rc:16 main.cpp:89 #, kde-format msgid "KDiff3" msgstr "KDiff3" @@ -1711,87 +1715,92 @@ msgid "Main Toolbar" msgstr "Barra degli strumenti principale" -#: main.cpp:68 main.cpp:72 +#: main.cpp:69 main.cpp:73 #, kde-format msgid "Ignored. (User defined.)" msgstr "Ignorato (definito dall'utente)." -#: main.cpp:92 +#: main.cpp:93 #, kde-format msgid " (64 bit)" msgstr " (64 bit)" -#: main.cpp:94 +#: main.cpp:95 #, kde-format msgid " (32 bit)" msgstr " (32 bit)" -#: main.cpp:95 +#: main.cpp:96 #, kde-format msgid "Tool for Comparison and Merge of Files and Directories" msgstr "Strumento per il confronto e la fusione di file e cartelle" -#: main.cpp:96 +#: main.cpp:97 #, kde-format msgid "(c) 2002-2014 Joachim Eibl, (c) 2017 Michael Reeves KF5/Qt5 port" msgstr "" "(c) 2002-2014 Joachim Eibl, (c) 2017 Michael Reeves Conversione a KF5/Qt5" -#: main.cpp:112 +#: main.cpp:113 #, kde-format msgid "Merge the input." msgstr "Fondi l'ingresso." -#: main.cpp:113 +#: main.cpp:114 #, kde-format msgid "Explicit base file. For compatibility with certain tools." msgstr "File di base esplicito. Per compatibilità con certi programmi." -#: main.cpp:114 +#: main.cpp:115 #, kde-format msgid "Output file. Implies -m. E.g.: -o newfile.txt" msgstr "File di uscita. Implica «-m». Per esempio: -o file_nuovo.txt" -#: main.cpp:115 +#: main.cpp:116 #, kde-format msgid "Output file, again. (For compatibility with certain tools.)" msgstr "File di uscita, di nuovo. Per compatibilità con certi programmi." -#: main.cpp:116 +#: main.cpp:118 #, kde-format msgid "No GUI if all conflicts are auto-solvable. (Needs -o file)" msgstr "" "Senza interfaccia se ogni conflitto è risolvibile automaticamente. Serve «-o " "file»." -#: main.cpp:117 +#: main.cpp:120 +#, kde-format +msgid "Ignored." +msgstr "Ignorato." + +#: main.cpp:122 #, kde-format msgid "Do not solve conflicts automatically." msgstr "Non risolvere i conflitti automaticamente." -#: main.cpp:118 +#: main.cpp:123 #, kde-format msgid "Visible name replacement for input file 1 (base)." msgstr "Mostra sostituzione del nome per il file di ingresso 1 (base)." -#: main.cpp:119 +#: main.cpp:124 #, kde-format msgid "Visible name replacement for input file 2." msgstr "Mostra sostituzione del nome per il file di ingresso 2." -#: main.cpp:120 +#: main.cpp:125 #, kde-format msgid "Visible name replacement for input file 3." msgstr "Mostra sostituzione del nome per il file di ingresso 3." -#: main.cpp:121 +#: main.cpp:126 #, kde-format msgid "Alternative visible name replacement. Supply this once for every input." msgstr "" "Sostituzione del nome visibile alternativo. Da specificare una volta per " "ogni ingresso." -#: main.cpp:122 +#: main.cpp:127 #, kde-format msgid "" "Override a config setting. Use once for every setting. E.g.: --cs " @@ -1800,88 +1809,88 @@ "Ignora un'impostazione di configurazione. Usa una volta per ogni " "impostazione. Per esempio: «--cs \"AutoAdvance=1\"»" -#: main.cpp:123 +#: main.cpp:128 #, kde-format msgid "Show list of config settings and current values." msgstr "" "Mostra la lista delle impostazioni di configurazione e i valori attuali." -#: main.cpp:124 +#: main.cpp:129 #, kde-format msgid "Use a different config file." msgstr "Usa un file di configurazione diverso." -#: main.cpp:127 +#: main.cpp:132 #, kde-format msgid "file1 to open (base, if not specified via --base)" msgstr "File1 da aprire (base, se non specificato con «--base»)" -#: main.cpp:128 +#: main.cpp:133 #, kde-format msgid "file2 to open" msgstr "File2 da aprire" -#: main.cpp:129 +#: main.cpp:134 #, kde-format msgid "file3 to open" msgstr "File3 da aprire" -#: main.cpp:153 +#: main.cpp:158 #, kde-format msgid "See kdiff3 --help for supported options." msgstr "Vedi kdiff3 --help per le opzioni supportate." -#: mergeresultwindow.cpp:158 +#: mergeresultwindow.cpp:171 #, kde-format msgid "Choose A Everywhere" msgstr "Scegli A ovunque" -#: mergeresultwindow.cpp:159 +#: mergeresultwindow.cpp:172 #, kde-format msgid "Choose B Everywhere" msgstr "Scegli B ovunque" -#: mergeresultwindow.cpp:160 +#: mergeresultwindow.cpp:173 #, kde-format msgid "Choose C Everywhere" msgstr "Scegli C ovunque" -#: mergeresultwindow.cpp:161 +#: mergeresultwindow.cpp:174 #, kde-format msgid "Choose A for All Unsolved Conflicts" msgstr "Scegli A per tutti i conflitti non risolti" -#: mergeresultwindow.cpp:162 +#: mergeresultwindow.cpp:175 #, kde-format msgid "Choose B for All Unsolved Conflicts" msgstr "Scegli B per tutti i conflitti non risolti" -#: mergeresultwindow.cpp:163 +#: mergeresultwindow.cpp:176 #, kde-format msgid "Choose C for All Unsolved Conflicts" msgstr "Scegli C per tutti i conflitti non risolti" -#: mergeresultwindow.cpp:164 +#: mergeresultwindow.cpp:177 #, kde-format msgid "Choose A for All Unsolved Whitespace Conflicts" msgstr "Scegli A per tutti i conflitti di spazi non risolti" -#: mergeresultwindow.cpp:165 +#: mergeresultwindow.cpp:178 #, kde-format msgid "Choose B for All Unsolved Whitespace Conflicts" msgstr "Scegli B per tutti i conflitti di spazi non risolti" -#: mergeresultwindow.cpp:166 +#: mergeresultwindow.cpp:179 #, kde-format msgid "Choose C for All Unsolved Whitespace Conflicts" msgstr "Scegli C per tutti i conflitti di spazi non risolti" -#: mergeresultwindow.cpp:176 +#: mergeresultwindow.cpp:204 #, 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 sono di spazi)" -#: mergeresultwindow.cpp:370 +#: mergeresultwindow.cpp:398 #, kde-format msgid "" "The output has been modified.\n" @@ -1890,29 +1899,29 @@ "L'uscita è stata modificata.\n" "Se continui le modifiche andranno perse." -#: mergeresultwindow.cpp:936 pdiff.cpp:827 +#: mergeresultwindow.cpp:964 pdiff.cpp:817 #, kde-format msgid "All input files are binary equal." msgstr "Tutti i file di ingresso sono uguali a livello binario." -#: mergeresultwindow.cpp:938 +#: mergeresultwindow.cpp:966 #, kde-format msgid "All input files contain the same text." msgstr "Tutti i file di ingresso contengono lo stesso testo." -#: mergeresultwindow.cpp:942 mergeresultwindow.cpp:946 -#: mergeresultwindow.cpp:950 pdiff.cpp:833 pdiff.cpp:837 pdiff.cpp:841 +#: mergeresultwindow.cpp:970 mergeresultwindow.cpp:974 +#: mergeresultwindow.cpp:978 pdiff.cpp:823 pdiff.cpp:827 pdiff.cpp:831 #, kde-format msgid "Files %1 and %2 are binary equal.\n" msgstr "I file %1 e %2 sono uguali a livello binario.\n" -#: mergeresultwindow.cpp:944 mergeresultwindow.cpp:948 -#: mergeresultwindow.cpp:952 +#: mergeresultwindow.cpp:972 mergeresultwindow.cpp:976 +#: mergeresultwindow.cpp:980 #, kde-format msgid "Files %1 and %2 have equal text.\n" msgstr "I file %1 e %2 hanno lo stesso testo.\n" -#: mergeresultwindow.cpp:958 +#: mergeresultwindow.cpp:986 #, kde-format msgid "" "Total number of conflicts: %1\n" @@ -1925,27 +1934,27 @@ "N. di conflitti non risolti: %3\n" "%4" -#: mergeresultwindow.cpp:964 +#: mergeresultwindow.cpp:992 #, kde-format msgid "Conflicts" msgstr "Conflitti" -#: mergeresultwindow.cpp:1873 +#: mergeresultwindow.cpp:1901 #, kde-format msgid "" msgstr "" -#: mergeresultwindow.cpp:1881 +#: mergeresultwindow.cpp:1909 #, kde-format msgid "" msgstr "" -#: mergeresultwindow.cpp:1883 mergeresultwindow.cpp:2755 +#: mergeresultwindow.cpp:1911 mergeresultwindow.cpp:2783 #, kde-format msgid "" msgstr "" -#: mergeresultwindow.cpp:2967 +#: mergeresultwindow.cpp:2995 #, kde-format msgid "" "Not all conflicts are solved yet.\n" @@ -1954,12 +1963,12 @@ "Non sono ancora risolti tutti i conflitti.\n" "File non salvato." -#: mergeresultwindow.cpp:2969 mergeresultwindow.cpp:2978 +#: mergeresultwindow.cpp:2997 mergeresultwindow.cpp:3006 #, kde-format msgid "Conflicts Left" msgstr "Conflitti rimanenti" -#: mergeresultwindow.cpp:2976 +#: mergeresultwindow.cpp:3004 #, kde-format msgid "" "There is a line end style conflict. Please choose the line end style " @@ -1969,7 +1978,7 @@ "C'è un conflitto di stili di fine riga. Seleziona manualmente lo stile.\n" "File non salvato." -#: mergeresultwindow.cpp:2990 +#: mergeresultwindow.cpp:3018 #, kde-format msgid "" "\n" @@ -1980,57 +1989,57 @@ "\n" "Creazione della copia di sicurezza non riuscita. File non salvato." -#: mergeresultwindow.cpp:2990 mergeresultwindow.cpp:3038 +#: mergeresultwindow.cpp:3018 mergeresultwindow.cpp:3066 #, kde-format msgid "File Save Error" msgstr "Errore nel salvataggio del file" -#: mergeresultwindow.cpp:3038 +#: mergeresultwindow.cpp:3066 #, kde-format msgid "Error while writing." msgstr "Errore in scrittura." -#: mergeresultwindow.cpp:3110 +#: mergeresultwindow.cpp:3138 #, kde-format msgid "Output:" msgstr "Risultato:" -#: mergeresultwindow.cpp:3123 mergeresultwindow.cpp:3315 +#: mergeresultwindow.cpp:3151 mergeresultwindow.cpp:3343 #, kde-format msgid "[Modified]" msgstr "[Modificato]" -#: mergeresultwindow.cpp:3130 +#: mergeresultwindow.cpp:3158 #, kde-format msgid "Encoding for saving:" msgstr "Codifica per il salvataggio:" -#: mergeresultwindow.cpp:3230 +#: mergeresultwindow.cpp:3258 #, kde-format msgid "Conflict" msgstr "Conflitto" -#: mergeresultwindow.cpp:3262 +#: mergeresultwindow.cpp:3290 #, kde-format msgid "Codec from A: %1" msgstr "Codec da A: %1" -#: mergeresultwindow.cpp:3264 +#: mergeresultwindow.cpp:3292 #, kde-format msgid "Codec from B: %1" msgstr "Codec da B: %1" -#: mergeresultwindow.cpp:3266 +#: mergeresultwindow.cpp:3294 #, kde-format msgid "Codec from C: %1" msgstr "Codec da C: %1" -#: optiondialog.cpp:119 +#: optiondialog.cpp:121 #, kde-format msgid "Change Font" msgstr "Cambia tipo di carattere" -#: optiondialog.cpp:135 optiondialog.cpp:145 +#: optiondialog.cpp:137 optiondialog.cpp:147 #, kde-format msgid "" "Font: %1, %2, %3\n" @@ -2041,123 +2050,123 @@ "\n" "Esempio:" -#: optiondialog.cpp:388 +#: optiondialog.cpp:390 #, kde-format msgid "Unicode" msgstr "Unicode" -#: optiondialog.cpp:389 +#: optiondialog.cpp:391 #, kde-format msgid "Latin1" msgstr "Latin1" -#: optiondialog.cpp:408 +#: optiondialog.cpp:410 #, kde-format msgid "Change this if non-ASCII characters are not displayed correctly." msgstr "Cambialo se i caratteri non-ASCII non vengono mostrati correttamente." -#: optiondialog.cpp:491 +#: optiondialog.cpp:495 #, kde-format msgid "Configure" msgstr "Configura" -#: optiondialog.cpp:568 +#: optiondialog.cpp:573 #, kde-format msgid "Font" msgstr "Carattere" -#: optiondialog.cpp:570 +#: optiondialog.cpp:575 #, kde-format msgid "Editor & Diff Output Font" msgstr "Carattere per l'editor e per l'uscita delle differenze" -#: optiondialog.cpp:589 +#: optiondialog.cpp:594 #, kde-format msgid "Application font" msgstr "Carattere applicazione" -#: optiondialog.cpp:594 +#: optiondialog.cpp:599 #, kde-format msgid "File view font" msgstr "Carattere vista file" -#: optiondialog.cpp:613 +#: optiondialog.cpp:618 #, kde-format msgctxt "Title for color settings page" msgid "Color" msgstr "Colore" -#: optiondialog.cpp:614 +#: optiondialog.cpp:619 #, kde-format msgid "Colors Settings" msgstr "Impostazioni dei colori" -#: optiondialog.cpp:631 +#: optiondialog.cpp:644 #, kde-format msgid "Editor and Diff Views:" msgstr "Editor e visore delle differenze:" -#: optiondialog.cpp:639 +#: optiondialog.cpp:652 #, kde-format msgid "Foreground color:" msgstr "Colore di primo piano:" -#: optiondialog.cpp:647 +#: optiondialog.cpp:660 #, kde-format msgid "Background color:" msgstr "Colore di sfondo:" -#: optiondialog.cpp:657 +#: optiondialog.cpp:670 #, kde-format msgid "Diff background color:" msgstr "Colore di sfondo per le differenze:" -#: optiondialog.cpp:666 +#: optiondialog.cpp:679 #, kde-format msgid "Color A:" msgstr "Colore per A:" -#: optiondialog.cpp:675 +#: optiondialog.cpp:688 #, kde-format msgid "Color B:" msgstr "Colore per B:" -#: optiondialog.cpp:684 +#: optiondialog.cpp:697 #, kde-format msgid "Color C:" msgstr "Colore per C:" -#: optiondialog.cpp:692 +#: optiondialog.cpp:705 #, kde-format msgid "Conflict color:" msgstr "Colore per i conflitti:" -#: optiondialog.cpp:701 +#: optiondialog.cpp:714 #, kde-format msgid "Current range background color:" msgstr "Colore di sfondo per l'intervallo attuale:" -#: optiondialog.cpp:710 +#: optiondialog.cpp:723 #, kde-format msgid "Current range diff background color:" msgstr "Colore di sfondo per le differenze dell'intervallo attuale:" -#: optiondialog.cpp:718 +#: optiondialog.cpp:731 #, kde-format msgid "Color for manually aligned difference ranges:" msgstr "Colore per intervalli di differenze allineate manualmente:" -#: optiondialog.cpp:725 +#: optiondialog.cpp:738 #, kde-format msgid "Directory Comparison View:" msgstr "Vista di confronto delle cartelle:" -#: optiondialog.cpp:731 +#: optiondialog.cpp:744 #, kde-format msgid "Newest file color:" msgstr "Colore del file più recente:" -#: optiondialog.cpp:736 +#: optiondialog.cpp:749 #, kde-format msgid "" "Changing this color will only be effective when starting the next directory " @@ -2166,37 +2175,37 @@ "Il cambiamento di questo colore sarà effettivo quando si avvierà un nuovo " "confronto tra cartelle." -#: optiondialog.cpp:741 +#: optiondialog.cpp:754 #, kde-format msgid "Oldest file color:" msgstr "Colore del file più vecchio:" -#: optiondialog.cpp:750 +#: optiondialog.cpp:763 #, kde-format msgid "Middle age file color:" msgstr "Colore del file di età media:" -#: optiondialog.cpp:759 +#: optiondialog.cpp:772 #, kde-format msgid "Color for missing files:" msgstr "Colore per file mancanti:" -#: optiondialog.cpp:773 +#: optiondialog.cpp:786 #, kde-format msgid "Editor" msgstr "Editor" -#: optiondialog.cpp:774 +#: optiondialog.cpp:787 #, kde-format msgid "Editor Behavior" msgstr "Comportamento dell'editor" -#: optiondialog.cpp:787 +#: optiondialog.cpp:809 #, kde-format msgid "Tab inserts spaces" msgstr "Il tabulatore inserisce spazi" -#: optiondialog.cpp:791 +#: optiondialog.cpp:813 #, kde-format msgid "" "On: Pressing tab generates the appropriate number of spaces.\n" @@ -2206,27 +2215,27 @@ "spazi.\n" "Non attivo: viene inserito un carattere di tabulazione." -#: optiondialog.cpp:796 +#: optiondialog.cpp:818 #, kde-format msgid "Tab size:" msgstr "Dimensione della tabulazione:" -#: optiondialog.cpp:803 +#: optiondialog.cpp:825 #, kde-format msgid "Auto indentation" msgstr "Rientro automatico" -#: optiondialog.cpp:807 +#: optiondialog.cpp:829 #, kde-format msgid "On: The indentation of the previous line is used for a new line.\n" msgstr "Attivo: la nuova riga avrà lo stesso rientro della riga precedente.\n" -#: optiondialog.cpp:810 +#: optiondialog.cpp:832 #, kde-format msgid "Auto copy selection" msgstr "Copia automaticamente la selezione" -#: optiondialog.cpp:814 +#: optiondialog.cpp:836 #, kde-format msgid "" "On: Any selection is immediately written to the clipboard.\n" @@ -2235,7 +2244,7 @@ "Attivo: ogni selezione è immediatamente copiata negli appunti.\n" "Non attivo: devi esplicitamente copiarla, per esempio con Ctrl-C." -#: optiondialog.cpp:829 +#: optiondialog.cpp:851 #, kde-format msgid "" "Sets the line endings for when an edited file is saved.\n" @@ -2244,12 +2253,12 @@ "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:839 +#: optiondialog.cpp:861 #, kde-format msgid "Diff" msgstr "Differenze" -#: optiondialog.cpp:840 +#: optiondialog.cpp:862 #, kde-format msgid "Diff Settings" msgstr "Impostazioni delle differenze" @@ -2263,12 +2272,12 @@ #. ); #. ++line; #. -#: optiondialog.cpp:865 +#: optiondialog.cpp:896 #, kde-format msgid "Ignore numbers (treat as white space)" msgstr "Ignora i numeri (tratta come spazio)" -#: optiondialog.cpp:869 +#: optiondialog.cpp:900 #, kde-format msgid "" "Ignore number characters during line matching phase. (Similar to Ignore " @@ -2278,45 +2287,45 @@ "Ignora i caratteri numerici durante il confronto (simile a «Ignora spazi»).\n" "Può essere utile per confrontare file con dati numerici." -#: optiondialog.cpp:873 +#: optiondialog.cpp:904 #, kde-format msgid "Ignore C/C++ comments (treat as white space)" msgstr "Ignora i commenti C e C++ (tratta come spazio)" -#: optiondialog.cpp:876 +#: optiondialog.cpp:907 #, kde-format msgid "Treat C/C++ comments like white space." msgstr "Tratta i commenti C e C++ come spazi." -#: optiondialog.cpp:879 +#: optiondialog.cpp:910 #, kde-format msgid "Ignore case (treat as white space)" msgstr "Ignora maiuscole/minuscole (tratta come spazio)" -#: optiondialog.cpp:883 +#: optiondialog.cpp:914 #, kde-format msgid "Treat case differences like white space changes. ('a'<=>'A')" msgstr "" "Tratta le differenze tra maiuscole e minuscole come modifiche di spazi " "(«a»<=>«A»)." -#: optiondialog.cpp:886 +#: optiondialog.cpp:917 #, kde-format msgid "Preprocessor command:" msgstr "Comando per il preprocessore:" -#: optiondialog.cpp:891 +#: optiondialog.cpp:922 #, kde-format msgid "User defined pre-processing. (See the docs for details.)" msgstr "" "Preprocessore definito dall'utente; vedi il manuale per maggiori dettagli." -#: optiondialog.cpp:894 +#: optiondialog.cpp:925 #, kde-format msgid "Line-matching preprocessor command:" msgstr "Preprocessore per il confronto di righe:" -#: optiondialog.cpp:899 +#: optiondialog.cpp:930 #, kde-format msgid "" "This pre-processor is only used during line matching.\n" @@ -2326,12 +2335,12 @@ "per verificare la corrispondenza di righe;\n" "vedi il manuale per maggiori dettagli." -#: optiondialog.cpp:902 +#: optiondialog.cpp:933 #, kde-format msgid "Try hard (slower)" msgstr "Ricerca approfondita (lenta)" -#: optiondialog.cpp:906 +#: optiondialog.cpp:937 #, kde-format msgid "" "Enables the --minimal option for the external diff.\n" @@ -2340,12 +2349,12 @@ "Abilita l'opzione --minimal del comando «diff» esterno.\n" "L'analisi di grandi file sarà molto più lenta." -#: optiondialog.cpp:910 +#: optiondialog.cpp:941 #, kde-format msgid "Align B and C for 3 input files" msgstr "Allinea B e C per tre file di ingresso" -#: optiondialog.cpp:914 +#: optiondialog.cpp:945 #, kde-format msgid "" "Try to align B and C when comparing or merging three input files.\n" @@ -2357,17 +2366,23 @@ "Non è raccomandato per la fusione perché potrebbe divenire più complicata.\n" "Come impostazione predefinita è disattivato." -#: optiondialog.cpp:926 +#: optiondialog.cpp:956 +#, kde-format +msgctxt "Settings page" +msgid "Merge" +msgstr "Fondi" + +#: optiondialog.cpp:957 #, kde-format msgid "Merge Settings" msgstr "Impostazioni di fusione" -#: optiondialog.cpp:940 +#: optiondialog.cpp:980 #, kde-format msgid "Auto advance delay (ms):" msgstr "Ritardo nell'avanzamento automatico (ms):" -#: optiondialog.cpp:946 +#: optiondialog.cpp:986 #, kde-format msgid "" "When in Auto-Advance mode the result of the current selection is shown \n" @@ -2377,27 +2392,27 @@ "selezione attuale viene mostrato per il tempo specificato, prima di\n" "passare al conflitto successivo. Valori ammessi: 0-2000 ms." -#: optiondialog.cpp:950 +#: optiondialog.cpp:990 #, kde-format msgid "Show info dialogs" msgstr "Mostra finestre informative" -#: optiondialog.cpp:953 +#: optiondialog.cpp:993 #, kde-format msgid "Show a dialog with information about the number of conflicts." msgstr "Mostra una finestra con informazioni sul numero di conflitti." -#: optiondialog.cpp:956 +#: optiondialog.cpp:996 #, kde-format msgid "White space 2-file merge default:" msgstr "Trattamento predefinito degli spazi nel fondere due file:" -#: optiondialog.cpp:961 optiondialog.cpp:974 +#: optiondialog.cpp:1001 optiondialog.cpp:1014 #, kde-format msgid "Manual Choice" msgstr "Scelta manuale" -#: optiondialog.cpp:965 optiondialog.cpp:979 +#: optiondialog.cpp:1005 optiondialog.cpp:1019 #, kde-format msgid "" "Allow the merge algorithm to automatically select an input for white-space-" @@ -2406,22 +2421,22 @@ "Consenti all'algoritmo di fusione di selezionare automaticamente un ingresso " "per le modifiche di soli spazi." -#: optiondialog.cpp:969 +#: optiondialog.cpp:1009 #, kde-format msgid "White space 3-file merge default:" msgstr "Trattamento predefinito degli spazi nel fondere tre file:" -#: optiondialog.cpp:983 +#: optiondialog.cpp:1023 #, kde-format msgid "Automatic Merge Regular Expression" msgstr "Espressione regolare di fusione automatica" -#: optiondialog.cpp:991 smalldialogs.cpp:449 +#: optiondialog.cpp:1031 smalldialogs.cpp:459 #, kde-format msgid "Auto merge regular expression:" msgstr "Espressione regolare di fusione automatica:" -#: optiondialog.cpp:996 +#: optiondialog.cpp:1036 #, kde-format msgid "" "Regular expression for lines where KDiff3 should automatically choose one " @@ -2434,13 +2449,13 @@ "Quando una riga con un conflitto corrisponde all'espressione regolare,\n" "sarà scelto (se disponibile) C, altrimenti B." -#: optiondialog.cpp:1002 +#: optiondialog.cpp:1042 #, kde-format msgid "Run regular expression auto merge on merge start" msgstr "" "Esegui la fusione automatica con espressioni regolari all'avvio della fusione" -#: optiondialog.cpp:1005 +#: optiondialog.cpp:1045 #, kde-format msgid "" "Run the merge for auto merge regular expressions\n" @@ -2449,17 +2464,17 @@ "Esegui la fusione per le espressioni regolari di fusione\n" "automatica all'avvio dell'operazione.\n" -#: optiondialog.cpp:1010 +#: optiondialog.cpp:1050 #, kde-format msgid "Version Control History Merging" msgstr "Fusione della cronologia del controllo di versione" -#: optiondialog.cpp:1018 smalldialogs.cpp:476 +#: optiondialog.cpp:1058 smalldialogs.cpp:486 #, kde-format msgid "History start regular expression:" msgstr "Espressione regolare dell'inizio di cronologia:" -#: optiondialog.cpp:1023 +#: optiondialog.cpp:1063 #, kde-format msgid "" "Regular expression for the start of the version control history entry.\n" @@ -2471,12 +2486,12 @@ "Di solito questa riga contiene la parola chiave «$Log$».\n" "Valore predefinito: «.*\\$Log.*\\$.*»." -#: optiondialog.cpp:1029 smalldialogs.cpp:504 +#: optiondialog.cpp:1069 smalldialogs.cpp:514 #, kde-format msgid "History entry start regular expression:" msgstr "Espressione regolare di inizio dell'elemento di cronologia:" -#: optiondialog.cpp:1042 +#: optiondialog.cpp:1082 #, kde-format msgid "" "A version control history entry consists of several lines.\n" @@ -2497,23 +2512,23 @@ "separare gli elementi della cronologia.\n" "Vedi la documentazione per i dettagli." -#: optiondialog.cpp:1050 +#: optiondialog.cpp:1090 #, kde-format msgid "History merge sorting" msgstr "Ordinamento della fusione della cronologia" -#: optiondialog.cpp:1053 +#: optiondialog.cpp:1093 #, kde-format msgid "Sort version control history by a key." msgstr "Ordina la cronologia del controllo di versione secondo una chiave." -#: optiondialog.cpp:1063 +#: optiondialog.cpp:1103 #, kde-format msgid "History entry start sort key order:" msgstr "" "Ordine della chiave d'ordinamento d'inizio degli elementi della cronologia:" -#: optiondialog.cpp:1068 +#: optiondialog.cpp:1108 #, kde-format msgid "" "Each pair of parentheses used in the regular expression for the history " @@ -2533,39 +2548,39 @@ "Se viene lasciato vuoto, non verrà effettuato nessun ordinamento.\n" "Consulta la documentazione per i ulteriori dettagli." -#: optiondialog.cpp:1079 +#: optiondialog.cpp:1119 #, kde-format msgid "Merge version control history on merge start" msgstr "Fondi la cronologia del controllo di versione all'inizio della fusione" -#: optiondialog.cpp:1082 +#: optiondialog.cpp:1122 #, kde-format msgid "Run version control history automerge on merge start." msgstr "" "Esegui la fusione automatica della cronologia del controllo di versione " "all'inizio della fusione." -#: optiondialog.cpp:1086 +#: optiondialog.cpp:1126 #, kde-format msgid "Max number of history entries:" msgstr "Numero massimo di elementi nella cronologia:" -#: optiondialog.cpp:1090 +#: optiondialog.cpp:1130 #, kde-format msgid "Cut off after specified number. Use -1 for infinite number of entries." msgstr "Taglia al numero specificato. Usa -1 per un numero infinito di voci." -#: optiondialog.cpp:1094 +#: optiondialog.cpp:1134 #, kde-format msgid "Test your regular expressions" msgstr "Prova le espressioni regolari" -#: optiondialog.cpp:1099 +#: optiondialog.cpp:1139 #, kde-format msgid "Irrelevant merge command:" msgstr "Comando di fusione irrilevante:" -#: optiondialog.cpp:1104 +#: optiondialog.cpp:1144 #, kde-format msgid "" "If specified this script is run after automerge\n" @@ -2576,12 +2591,12 @@ "automatica quando non sono rilevati altri cambiamenti rilevanti.\n" "Chiamato con i parametri: nome_file1 nome_file2 nome_file3" -#: optiondialog.cpp:1109 +#: optiondialog.cpp:1149 #, kde-format msgid "Auto save and quit on merge without conflicts" msgstr "Salvataggio automatico e uscita in caso di fusione senza conflitti" -#: optiondialog.cpp:1113 +#: optiondialog.cpp:1153 #, kde-format msgid "" "If KDiff3 was started for a file-merge from the command line and all\n" @@ -2594,27 +2609,27 @@ "salva automaticamente ed esci.\n" "È simile all'opzione da riga di comando «--auto»." -#: optiondialog.cpp:1124 optiondialog.cpp:1125 +#: optiondialog.cpp:1164 optiondialog.cpp:1165 #, kde-format msgid "Directory" msgstr "Cartella" -#: optiondialog.cpp:1137 +#: optiondialog.cpp:1185 #, kde-format msgid "Recursive directories" msgstr "Cartelle ricorsive" -#: optiondialog.cpp:1140 +#: optiondialog.cpp:1188 #, kde-format msgid "Whether to analyze subdirectories or not." msgstr "Se analizzare o meno anche le sottocartelle." -#: optiondialog.cpp:1142 +#: optiondialog.cpp:1190 #, kde-format msgid "File pattern(s):" msgstr "Schemi di file:" -#: optiondialog.cpp:1148 +#: optiondialog.cpp:1196 #, kde-format msgid "" "Pattern(s) of files to be analyzed. \n" @@ -2625,12 +2640,12 @@ "Caratteri jolly: «*» e «?».\n" "Si possono specificare più schemi con il separatore «;»." -#: optiondialog.cpp:1153 +#: optiondialog.cpp:1201 #, kde-format msgid "File-anti-pattern(s):" msgstr "Schemi di file da escludere:" -#: optiondialog.cpp:1159 +#: optiondialog.cpp:1207 #, kde-format msgid "" "Pattern(s) of files to be excluded from analysis. \n" @@ -2641,12 +2656,12 @@ "Caratteri jolly: «*» e «?».\n" "Si possono specificare più schemi con il separatore «;»." -#: optiondialog.cpp:1164 +#: optiondialog.cpp:1212 #, kde-format msgid "Dir-anti-pattern(s):" msgstr "Schemi di cartelle da escludere:" -#: optiondialog.cpp:1170 +#: optiondialog.cpp:1218 #, kde-format msgid "" "Pattern(s) of directories to be excluded from analysis. \n" @@ -2657,12 +2672,12 @@ "Caratteri jolly: «*» e «?».\n" "Si possono specificare più schemi con il separatore «;»." -#: optiondialog.cpp:1175 +#: optiondialog.cpp:1223 #, kde-format msgid "Use .cvsignore" msgstr "Usa .cvsignore" -#: optiondialog.cpp:1179 +#: optiondialog.cpp:1227 #, kde-format msgid "" "Extends the antipattern to anything that would be ignored by CVS.\n" @@ -2671,22 +2686,22 @@ "Estendi l'esclusione a tutto quello che sarebbe ignorato da CVS.\n" "Si possono usare dei file «.cvsignore» diversi per ogni cartella." -#: optiondialog.cpp:1183 +#: optiondialog.cpp:1231 #, kde-format msgid "Find hidden files and directories" msgstr "Trova file e cartelle nascosti" -#: optiondialog.cpp:1186 +#: optiondialog.cpp:1234 #, kde-format msgid "Finds hidden files and directories." msgstr "Trova file e cartelle nascosti." -#: optiondialog.cpp:1189 +#: optiondialog.cpp:1237 #, kde-format msgid "Follow file links" msgstr "Segui i collegamenti dei file" -#: optiondialog.cpp:1193 +#: optiondialog.cpp:1241 #, kde-format msgid "" "On: Compare the file the link points to.\n" @@ -2695,12 +2710,12 @@ "Attivo: confronta il file a cui punta il collegamento.\n" "Non attivo: confronta i collegamenti." -#: optiondialog.cpp:1197 +#: optiondialog.cpp:1245 #, kde-format msgid "Follow directory links" msgstr "Segui i collegamenti delle cartelle" -#: optiondialog.cpp:1201 +#: optiondialog.cpp:1249 #, kde-format msgid "" "On: Compare the directory the link points to.\n" @@ -2709,12 +2724,12 @@ "Attivo: confronta la cartella a cui punta il collegamento.\n" "Non attivo: confronta i collegamenti." -#: optiondialog.cpp:1210 +#: optiondialog.cpp:1258 #, kde-format msgid "Case sensitive filename comparison" msgstr "Distingui le maiuscole nel confronto dei nomi dei file" -#: optiondialog.cpp:1214 +#: optiondialog.cpp:1262 #, kde-format msgid "" "The directory comparison will compare files or directories when their names " @@ -2728,12 +2743,12 @@ "considerate diverse. L'opzione predefinita per Windows è disattivo, " "altrimenti è attivo." -#: optiondialog.cpp:1218 +#: optiondialog.cpp:1266 #, kde-format msgid "Unfold all subdirectories on load" msgstr "Apri tutte le sottocartelle al caricamento" -#: optiondialog.cpp:1222 +#: optiondialog.cpp:1270 #, kde-format msgid "" "On: Unfold all subdirectories when starting a directory diff.\n" @@ -2742,12 +2757,12 @@ "Attivo: apre tutte le sottocartelle quando avvii una diff tra cartelle.\n" "Disattivo: lascia chiuse le sottocartelle." -#: optiondialog.cpp:1226 +#: optiondialog.cpp:1274 #, kde-format msgid "Skip directory status report" msgstr "Salta rapporto dello stato della cartella" -#: optiondialog.cpp:1230 +#: optiondialog.cpp:1278 #, kde-format msgid "" "On: Do not show the Directory Comparison Status.\n" @@ -2756,27 +2771,27 @@ "Attivo: non mostra lo stato del confronto tra le cartelle.\n" "Disattivo: mostra la finestra di dialogo dello stato all'avvio." -#: optiondialog.cpp:1234 +#: optiondialog.cpp:1282 #, kde-format msgid "File Comparison Mode" msgstr "Modalità di confronto dei file" -#: optiondialog.cpp:1239 +#: optiondialog.cpp:1287 #, kde-format msgid "Binary comparison" msgstr "Confronto binario" -#: optiondialog.cpp:1241 +#: optiondialog.cpp:1289 #, kde-format msgid "Binary comparison of each file. (Default)" msgstr "Confronto binario per ogni file (predefinito)." -#: optiondialog.cpp:1244 +#: optiondialog.cpp:1292 #, kde-format msgid "Full analysis" msgstr "Analisi completa" -#: optiondialog.cpp:1246 +#: optiondialog.cpp:1294 #, kde-format msgid "" "Do a full analysis and show statistics information in extra columns.\n" @@ -2785,12 +2800,12 @@ "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:1250 +#: optiondialog.cpp:1298 #, kde-format msgid "Trust the size and modification date (unsafe)" msgstr "Fidati della grandezza e della data di modifica (non sicuro)" -#: optiondialog.cpp:1252 +#: optiondialog.cpp:1300 #, kde-format msgid "" "Assume that files are equal if the modification date and file length are " @@ -2805,7 +2820,7 @@ "diversi.\n" "Utile per confrontare cartelle grandi o per connessioni lente." -#: optiondialog.cpp:1257 +#: optiondialog.cpp:1305 #, kde-format msgid "" "Trust the size and date, but use binary comparison if date does not match " @@ -2814,7 +2829,7 @@ "Fidati della grandezza e della data, ma usa il confronto binario se la data " "non corrisponde (non sicuro)" -#: optiondialog.cpp:1259 +#: optiondialog.cpp:1307 #, kde-format msgid "" "Assume that files are equal if the modification date and file length are " @@ -2827,12 +2842,12 @@ "Se le date non sono uguali ma la dimensione sì, usa il confronto binario.\n" "Utile per confrontare cartelle grandi o per connessioni lente." -#: optiondialog.cpp:1264 +#: optiondialog.cpp:1312 #, kde-format msgid "Trust the size (unsafe)" msgstr "Fidati della dimensione (non sicuro)" -#: optiondialog.cpp:1266 +#: optiondialog.cpp:1314 #, kde-format msgid "" "Assume that files are equal if their file lengths are equal.\n" @@ -2843,12 +2858,12 @@ "Utile per confrontare cartelle grandi o per connessioni lente,\n" "dove la data viene modificata nello scaricamento." -#: optiondialog.cpp:1273 +#: optiondialog.cpp:1321 #, kde-format msgid "Synchronize directories" msgstr "Sincronizza cartelle" -#: optiondialog.cpp:1277 +#: optiondialog.cpp:1325 #, kde-format msgid "" "Offers to store files in both directories so that\n" @@ -2860,12 +2875,12 @@ "Funziona solo quando si confrontano due cartelle\n" "senza specificare una destinazione." -#: optiondialog.cpp:1283 +#: optiondialog.cpp:1331 #, kde-format msgid "White space differences considered equal" msgstr "Differenze di spazi considerate uguali" -#: optiondialog.cpp:1287 +#: optiondialog.cpp:1335 #, kde-format msgid "" "If files differ only by white space consider them equal.\n" @@ -2874,12 +2889,12 @@ "Se i file differiscono solo per degli spazi, considerali uguali.\n" "Funziona solo quando si effettua un'analisi completa." -#: optiondialog.cpp:1293 +#: optiondialog.cpp:1341 #, kde-format msgid "Copy newer instead of merging (unsafe)" msgstr "Copia il più recente invece di fondere (non sicuro)" -#: optiondialog.cpp:1297 +#: optiondialog.cpp:1345 #, kde-format msgid "" "Do not look inside, just take the newer file.\n" @@ -2890,12 +2905,12 @@ "Usalo solo se sai quello che stai facendo.\n" "Funziona solo quando si confrontano due cartelle." -#: optiondialog.cpp:1302 +#: optiondialog.cpp:1350 #, kde-format msgid "Backup files (.orig)" msgstr "Copie di sicurezza (.orig)" -#: optiondialog.cpp:1306 +#: optiondialog.cpp:1354 #, kde-format msgid "" "If a file would be saved over an old file, then the old file\n" @@ -2905,17 +2920,17 @@ "quest'ultimo verrà rinominato con l'estensione «.orig» invece di\n" "essere cancellato." -#: optiondialog.cpp:1382 optiondialog.cpp:1383 +#: optiondialog.cpp:1430 optiondialog.cpp:1431 #, kde-format msgid "Regional Settings" msgstr "Impostazioni locali" -#: optiondialog.cpp:1397 +#: optiondialog.cpp:1454 #, kde-format msgid "Use the same encoding for everything:" msgstr "Usa la stessa codifica per tutto:" -#: optiondialog.cpp:1401 +#: optiondialog.cpp:1458 #, kde-format msgid "" "Enable this allows to change all encodings by changing the first only.\n" @@ -2924,17 +2939,17 @@ "Permette di cambiare tutte le codifiche cambiando solo la prima.\n" "Disattivala se servono impostazioni differenziate." -#: optiondialog.cpp:1405 +#: optiondialog.cpp:1462 #, kde-format msgid "Note: Local Encoding is \"%1\"" msgstr "Nota: la codifica locale è «%1»" -#: optiondialog.cpp:1409 +#: optiondialog.cpp:1466 #, kde-format msgid "File Encoding for A:" msgstr "Codifica per il file A:" -#: optiondialog.cpp:1416 +#: optiondialog.cpp:1473 #, kde-format msgid "" "If enabled then Unicode (UTF-16 or UTF-8) encoding will be detected.\n" @@ -2947,32 +2962,32 @@ "ripiego.\n" "La rilevazione di Unicode dipende dai primi byte di un file." -#: optiondialog.cpp:1419 optiondialog.cpp:1430 optiondialog.cpp:1441 +#: optiondialog.cpp:1476 optiondialog.cpp:1487 optiondialog.cpp:1498 #, kde-format msgid "Auto Detect Unicode" msgstr "Rileva Unicode automaticamente" -#: optiondialog.cpp:1425 +#: optiondialog.cpp:1482 #, kde-format msgid "File Encoding for B:" msgstr "Codifica per il file B:" -#: optiondialog.cpp:1436 +#: optiondialog.cpp:1493 #, kde-format msgid "File Encoding for C:" msgstr "Codifica per il file C:" -#: optiondialog.cpp:1447 +#: optiondialog.cpp:1504 #, kde-format msgid "File Encoding for Merge Output and Saving:" msgstr "Codifica per il file fuso e il salvataggio:" -#: optiondialog.cpp:1452 +#: optiondialog.cpp:1509 #, kde-format msgid "Auto Select" msgstr "Seleziona automaticamente" -#: optiondialog.cpp:1456 +#: optiondialog.cpp:1513 #, kde-format msgid "" "If enabled then the encoding from the input files is used.\n" @@ -2983,17 +2998,17 @@ "Nei casi ambigui una finestra chiederà all'utente di scegliere la codifica " "per il salvataggio." -#: optiondialog.cpp:1459 +#: optiondialog.cpp:1516 #, kde-format msgid "File Encoding for Preprocessor Files:" msgstr "Codifica per i file del preprocessore:" -#: optiondialog.cpp:1471 +#: optiondialog.cpp:1528 #, kde-format msgid "Right To Left Language" msgstr "Lingue scritte da destra a sinistra" -#: optiondialog.cpp:1475 +#: optiondialog.cpp:1532 #, kde-format msgid "" "Some languages are read from right to left.\n" @@ -3002,22 +3017,22 @@ "Alcune lingue si leggono da destra a sinistra.\n" "Questa opzione cambia in tal senso l'editor e la visualizzazione." -#: optiondialog.cpp:1485 +#: optiondialog.cpp:1542 #, kde-format msgid "Integration" msgstr "Integrazione" -#: optiondialog.cpp:1486 +#: optiondialog.cpp:1543 #, kde-format msgid "Integration Settings" msgstr "Impostazioni di integrazione" -#: optiondialog.cpp:1499 +#: optiondialog.cpp:1564 #, kde-format msgid "Command line options to ignore:" msgstr "Opzioni da riga di comando da ignorare:" -#: optiondialog.cpp:1505 +#: optiondialog.cpp:1570 #, kde-format msgid "" "List of command line options that should be ignored when KDiff3 is used by " @@ -3030,12 +3045,12 @@ "Si possono specificare diversi valori se separati con «;»\n" "Questo eliminerà l'errore «Opzione sconosciuta»." -#: optiondialog.cpp:1510 +#: optiondialog.cpp:1575 #, kde-format msgid "Quit also via Escape key" msgstr "Esci anche con il tasto Esc" -#: optiondialog.cpp:1514 +#: optiondialog.cpp:1579 #, kde-format msgid "" "Fast method to exit.\n" @@ -3044,7 +3059,7 @@ "Metodo di uscita veloce.\n" "Per chi è abituato a usare il tasto Esc." -#: optiondialog.cpp:1598 +#: optiondialog.cpp:1653 #, kde-format msgid "This resets all options. Not only those of the current topic." msgstr "" @@ -3101,81 +3116,71 @@ msgid "Disable Unsafe Options" msgstr "Disattiva le opzioni non sicure" -#: pdiff.cpp:158 +#: pdiff.cpp:160 #, kde-format msgid "Loading A" msgstr "Caricamento di A" -#: pdiff.cpp:167 +#: pdiff.cpp:162 #, kde-format -msgid "Errors occurred during pre-processing of file A." -msgstr "Errori verificatisi durante la pre-elaborazione del file A." +msgid "Loading A: %1" +msgstr "Caricamento di A: %1" -#: pdiff.cpp:172 +#: pdiff.cpp:170 #, kde-format msgid "Loading B" msgstr "Caricamento di B" -#: pdiff.cpp:179 -#, kde-format -msgid "Errors occurred during pre-processing of file B." -msgstr "Errori verificatisi durante la pre-elaborazione del file B." - -#: pdiff.cpp:202 pdiff.cpp:241 +#: pdiff.cpp:201 pdiff.cpp:237 #, kde-format msgid "Diff: A <-> B" msgstr "Differenze: A <-> B" -#: pdiff.cpp:208 pdiff.cpp:279 pdiff.cpp:293 +#: pdiff.cpp:207 pdiff.cpp:275 pdiff.cpp:289 #, kde-format msgid "Linediff: A <-> B" msgstr "Differenze per righe: A <-> B" -#: pdiff.cpp:225 +#: pdiff.cpp:224 #, kde-format msgid "Loading C" msgstr "Caricamento di C" -#: pdiff.cpp:232 -#, kde-format -msgid "Errors occurred during pre-processing of file C." -msgstr "Errori verificatisi durante la pre-elaborazione del file C." - -#: pdiff.cpp:250 +#: pdiff.cpp:246 #, kde-format msgid "Diff: A <-> C" msgstr "Differenze: A <-> C" -#: pdiff.cpp:261 +#: pdiff.cpp:257 #, kde-format msgid "Diff: B <-> C" msgstr "Differenze: B <-> C" -#: pdiff.cpp:283 pdiff.cpp:297 +#: pdiff.cpp:279 pdiff.cpp:293 #, kde-format msgid "Linediff: B <-> C" msgstr "Differenze per righe: B <-> C" -#: pdiff.cpp:287 pdiff.cpp:301 +#: pdiff.cpp:283 pdiff.cpp:297 #, kde-format msgid "Linediff: A <-> C" msgstr "Differenze per righe: A <-> C" -#: pdiff.cpp:829 +#: pdiff.cpp:819 #, kde-format msgid "All input files contain the same text, but are not binary equal." msgstr "" "Tutti i file di ingresso contengono lo stesso testo, ma non sono uguali a " "livello binario." -#: pdiff.cpp:835 pdiff.cpp:839 pdiff.cpp:843 +#: pdiff.cpp:825 pdiff.cpp:829 pdiff.cpp:833 #, 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:853 +#: pdiff.cpp:843 #, kde-format msgid "" "Some input files do not seem to be pure text files.\n" @@ -3186,17 +3191,17 @@ "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:863 +#: pdiff.cpp:853 #, kde-format msgid ", B" msgstr ", B" -#: pdiff.cpp:865 +#: pdiff.cpp:855 #, kde-format msgid ", C" msgstr ", C" -#: pdiff.cpp:867 +#: pdiff.cpp:857 #, kde-format msgid "" "Some input characters could not be converted to valid unicode.\n" @@ -3210,80 +3215,75 @@ "pericolo.\n" "I file di ingresso in questione sono in %1." -#: pdiff.cpp:1034 +#: pdiff.cpp:1032 #, kde-format msgid "Abort" msgstr "Interrompi" -#: pdiff.cpp:1040 pdiff.cpp:1130 +#: pdiff.cpp:1038 pdiff.cpp:1129 #, kde-format msgid "Opening files..." msgstr "Apertura dei file..." -#: pdiff.cpp:1107 -#, kde-format -msgid "File open error" -msgstr "Errore nell'apertura del file" - -#: pdiff.cpp:1202 +#: pdiff.cpp:1212 #, kde-format msgid "Cutting selection..." msgstr "Taglio della selezione..." -#: pdiff.cpp:1223 +#: pdiff.cpp:1233 #, kde-format msgid "Copying selection to clipboard..." msgstr "Copia della selezione negli appunti..." -#: pdiff.cpp:1239 +#: pdiff.cpp:1249 #, kde-format msgid "Inserting clipboard contents..." msgstr "Inserimento dei contenuti degli appunti..." -#: pdiff.cpp:1695 +#: pdiff.cpp:1705 #, kde-format msgid "Word wrap (Cancel disables word wrap)" msgstr "A capo automatico (il comando Annulla lo disabilita)" -#: pdiff.cpp:1696 +#: pdiff.cpp:1706 #, kde-format msgid "Calculating max width for horizontal scrollbar" msgstr "" "Calcolo della massima larghezza per la barra di scorrimento orizzontale" -#: pdiff.cpp:1911 +#: pdiff.cpp:1921 #, kde-format msgid "Save && Continue" msgstr "Salva e continua" -#: pdiff.cpp:1912 +#: pdiff.cpp:1922 #, kde-format msgid "Continue Without Saving" msgstr "Continua senza salvare" -#: pdiff.cpp:2124 +#: pdiff.cpp:2134 #, kde-format msgid "Search complete." msgstr "Ricerca completata." -#: pdiff.cpp:2124 +#: pdiff.cpp:2134 #, kde-format msgid "Search Complete" msgstr "Ricerca completata" -#: pdiff.cpp:2375 +#: pdiff.cpp:2385 #, kde-format msgid "Nothing is selected in either diff input window." msgstr "" "Non è selezionato niente in nessuna delle finestre di ingresso delle " "differenze." -#: pdiff.cpp:2375 +#: pdiff.cpp:2385 #, kde-format msgid "Error while adding manual diff range" msgstr "Errore nell'aggiunta di intervalli di differenze manuali" -#: progress.cpp:59 progress.cpp:71 +#: progress.cpp:61 progress.cpp:73 #, kde-format msgid "&Cancel" msgstr "&Annulla" @@ -3293,124 +3293,124 @@ msgid "A (Base):" msgstr "A (Base):" -#: smalldialogs.cpp:68 smalldialogs.cpp:85 smalldialogs.cpp:102 -#: smalldialogs.cpp:144 +#: smalldialogs.cpp:71 smalldialogs.cpp:90 smalldialogs.cpp:109 +#: smalldialogs.cpp:154 #, kde-format msgid "File..." msgstr "File..." -#: smalldialogs.cpp:70 smalldialogs.cpp:87 smalldialogs.cpp:104 -#: smalldialogs.cpp:146 +#: smalldialogs.cpp:73 smalldialogs.cpp:92 smalldialogs.cpp:111 +#: smalldialogs.cpp:156 #, kde-format msgid "Dir..." msgstr "Cartella..." -#: smalldialogs.cpp:96 +#: smalldialogs.cpp:103 #, kde-format msgid "C (Optional):" msgstr "C (Opzionale):" -#: smalldialogs.cpp:119 +#: smalldialogs.cpp:126 #, kde-format msgid "Swap/Copy Names..." msgstr "Scambia e copia nomi..." -#: smalldialogs.cpp:124 smalldialogs.cpp:125 smalldialogs.cpp:126 +#: smalldialogs.cpp:131 smalldialogs.cpp:132 smalldialogs.cpp:133 #, kde-format msgid "Swap %1<->%2" msgstr "Scambia %1<->%2" -#: smalldialogs.cpp:127 smalldialogs.cpp:128 smalldialogs.cpp:129 +#: smalldialogs.cpp:134 smalldialogs.cpp:135 smalldialogs.cpp:136 #, kde-format msgid "Copy %1->Output" msgstr "Copia %1->Uscita" -#: smalldialogs.cpp:130 smalldialogs.cpp:131 smalldialogs.cpp:132 +#: smalldialogs.cpp:137 smalldialogs.cpp:138 smalldialogs.cpp:139 #, kde-format msgid "Swap %1<->Output" msgstr "Scambia %1<->Uscita" -#: smalldialogs.cpp:138 +#: smalldialogs.cpp:148 #, kde-format msgid "Output (optional):" msgstr "Uscita (opzionale):" -#: smalldialogs.cpp:168 +#: smalldialogs.cpp:178 #, kde-format msgid "Configure..." msgstr "Configura..." -#: smalldialogs.cpp:233 +#: smalldialogs.cpp:243 #, kde-format msgid "Open Directory" msgstr "Apri cartella" -#: smalldialogs.cpp:234 +#: smalldialogs.cpp:244 #, kde-format msgid "Select Output File" msgstr "Seleziona il nome del file di uscita" -#: smalldialogs.cpp:393 +#: smalldialogs.cpp:403 #, kde-format msgid "Search text:" msgstr "Testo da cercare:" -#: smalldialogs.cpp:400 +#: smalldialogs.cpp:410 #, kde-format msgid "Case sensitive" msgstr "Distingui le maiuscole" -#: smalldialogs.cpp:403 +#: smalldialogs.cpp:413 #, kde-format msgid "Search A" msgstr "Cerca in A" -#: smalldialogs.cpp:408 +#: smalldialogs.cpp:418 #, kde-format msgid "Search B" msgstr "Cerca in B" -#: smalldialogs.cpp:413 +#: smalldialogs.cpp:423 #, kde-format msgid "Search C" msgstr "Cerca in C" -#: smalldialogs.cpp:418 +#: smalldialogs.cpp:428 #, kde-format msgid "Search output" msgstr "Cerca nell'uscita" -#: smalldialogs.cpp:425 +#: smalldialogs.cpp:435 #, kde-format msgid "&Search" msgstr "&Cerca" -#: smalldialogs.cpp:444 +#: smalldialogs.cpp:454 #, kde-format msgid "Regular Expression Tester" msgstr "Tester delle espressioni regolari" -#: smalldialogs.cpp:457 +#: smalldialogs.cpp:467 #, kde-format msgid "Example auto merge line:" msgstr "Esempio di riga di fusione automatica:" -#: smalldialogs.cpp:459 +#: smalldialogs.cpp:469 #, kde-format msgid "To test auto merge, copy a line as used in your files." msgstr "Per provare la fusione automatica, copia una riga così com'è nei file." -#: smalldialogs.cpp:465 smalldialogs.cpp:493 smalldialogs.cpp:529 +#: smalldialogs.cpp:475 smalldialogs.cpp:503 smalldialogs.cpp:539 #, kde-format msgid "Match result:" msgstr "Risultato di corrispondenza:" -#: smalldialogs.cpp:484 +#: smalldialogs.cpp:494 #, kde-format msgid "Example history start line (with leading comment):" msgstr "Esempio di riga di inizio di cronologia (con commento iniziale):" -#: smalldialogs.cpp:486 +#: smalldialogs.cpp:496 #, kde-format msgid "" "Copy a history start line as used in your files,\n" @@ -3419,19 +3419,19 @@ "Copia una riga di inizio di cronologia così com'è nei file,\n" "incluso il commento iniziale." -#: smalldialogs.cpp:512 +#: smalldialogs.cpp:522 #, kde-format msgid "History sort key order:" msgstr "Ordine della chiave d'ordinamento cronologico:" -#: smalldialogs.cpp:520 +#: smalldialogs.cpp:530 #, kde-format msgid "Example history entry start line (without leading comment):" msgstr "" "Esempio di riga di inizio di un elemento di cronologia (senza commento " "iniziale):" -#: smalldialogs.cpp:522 +#: smalldialogs.cpp:532 #, kde-format msgid "" "Copy a history entry start line as used in your files,\n" @@ -3440,48 +3440,48 @@ "Copia una riga di inizio di un elemento di cronologia così com'è nei file,\n" "ma ometti il commento iniziale." -#: smalldialogs.cpp:536 +#: smalldialogs.cpp:546 #, kde-format msgid "Sort key result:" msgstr "Risultato della chiave di ordinamento:" -#: smalldialogs.cpp:584 smalldialogs.cpp:594 smalldialogs.cpp:614 +#: smalldialogs.cpp:594 smalldialogs.cpp:604 smalldialogs.cpp:624 #, kde-format msgid "Match success." msgstr "Confronto riuscito." -#: smalldialogs.cpp:588 smalldialogs.cpp:598 smalldialogs.cpp:620 +#: smalldialogs.cpp:598 smalldialogs.cpp:608 smalldialogs.cpp:630 #, kde-format msgid "Match failed." msgstr "Confronto non riuscito." -#: smalldialogs.cpp:605 +#: smalldialogs.cpp:615 #, kde-format msgid "Opening and closing parentheses do not match in regular expression." msgstr "" "Le parentesi aperte e chiuse nell'espressione regolare non corrispondono." -#: SourceData.cpp:150 +#: SourceData.cpp:153 #, kde-format msgid "Writing clipboard data to temp file failed." msgstr "La copia da appunti a file temporaneo non è riuscita." -#: SourceData.cpp:154 +#: SourceData.cpp:157 #, kde-format msgid "From Clipboard" msgstr "Dagli appunti" -#: SourceData.cpp:335 +#: SourceData.cpp:348 #, kde-format msgid "%1 is not a normal file." msgstr "%1 non è un file normale." -#: SourceData.cpp:427 +#: SourceData.cpp:440 #, kde-format msgid " Temp file is: %1" msgstr " Il file temporaneo è: %1" -#: SourceData.cpp:432 +#: SourceData.cpp:445 #, kde-format msgid "" "Preprocessing possibly failed. Check this command:\n" @@ -3496,12 +3496,12 @@ "\n" "Il comando di pre-elaborazione verrà ora disabilitato." -#: SourceData.cpp:443 SourceData.cpp:512 +#: SourceData.cpp:456 SourceData.cpp:525 #, kde-format msgid "File %1 too large to process. Skipping." msgstr "File %1 troppo grande da elaborare. Verrà saltato." -#: SourceData.cpp:487 +#: SourceData.cpp:500 #, kde-format msgid "" "The line-matching-preprocessing possibly failed. Check this command:\n" diff -Nru kdiff3-1.8.01/po/ja/diff_ext.po kdiff3-1.8.3/po/ja/diff_ext.po --- kdiff3-1.8.01/po/ja/diff_ext.po 2019-05-18 01:02:07.000000000 +0000 +++ kdiff3-1.8.3/po/ja/diff_ext.po 2020-06-25 00:18:28.000000000 +0000 @@ -1,8 +1,8 @@ msgid "" msgstr "" "Project-Id-Version: diff_ext\n" -"Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2019-03-22 03:09+0100\n" +"Report-Msgid-Bugs-To: https://bugs.kde.org\n" +"POT-Creation-Date: 2019-11-04 07:54+0100\n" "PO-Revision-Date: 2018-08-07 21:05-0700\n" "Last-Translator: Japanese KDE translation team \n" "Language-Team: Japanese \n" @@ -14,117 +14,112 @@ "X-Accelerator-Marker: &\n" "X-Text-Markup: kde4\n" -#: diff_ext.cpp:391 +#: diff_ext.cpp:223 #, kde-format msgid "Compare with %1" msgstr "" -#: diff_ext.cpp:392 +#: diff_ext.cpp:224 #, kde-format msgid "Merge with %1" msgstr "" -#: diff_ext.cpp:408 +#: diff_ext.cpp:234 #, kde-format msgid "3-way merge with base" msgstr "" -#: diff_ext.cpp:411 +#: diff_ext.cpp:237 #, kde-format msgid "Save '%1' for later" msgstr "" -#: diff_ext.cpp:426 +#: diff_ext.cpp:251 #, kde-format msgid "Compare with ..." msgstr "" -#: diff_ext.cpp:429 +#: diff_ext.cpp:254 #, kde-format msgid "Clear list" msgstr "" -#: diff_ext.cpp:434 +#: diff_ext.cpp:259 #, kde-format msgid "Compare" msgstr "" -#: diff_ext.cpp:438 +#: diff_ext.cpp:263 #, kde-format msgid "3 way comparison" msgstr "" -#: diff_ext.cpp:444 +#: diff_ext.cpp:269 #, kde-format msgid "About Diff-Ext ..." msgstr "" -#: diff_ext.cpp:515 +#: diff_ext.cpp:340 #, kde-format msgid "(32 Bit)" msgstr "" -#: diff_ext.cpp:517 -#, kde-format -msgid "(64 Bit)" -msgstr "" - -#: diff_ext.cpp:518 +#: diff_ext.cpp:342 #, kde-format msgid "Diff-Ext Copyright (c) 2003-2006, Sergey Zorin. All rights reserved.\n" msgstr "" -#: diff_ext.cpp:519 +#: diff_ext.cpp:343 #, kde-format msgid "This software is distributable under the BSD-2-Clause license.\n" msgstr "" -#: diff_ext.cpp:520 +#: diff_ext.cpp:344 #, kde-format msgid "Some extensions for KDiff3 (c) 2006-2013 by Joachim Eibl.\n" msgstr "" -#: diff_ext.cpp:521 +#: diff_ext.cpp:345 #, kde-format msgid "Homepage for Diff-Ext: http://diff-ext.sourceforge.net\n" msgstr "" -#: diff_ext.cpp:522 +#: diff_ext.cpp:346 #, kde-format msgid "About Diff-Ext for KDiff3 " msgstr "" -#: diff_ext.cpp:551 +#: diff_ext.cpp:375 #, kde-format msgid "Compare selected files" msgstr "" -#: diff_ext.cpp:557 diff_ext.cpp:577 +#: diff_ext.cpp:381 diff_ext.cpp:399 #, kde-format msgid "Compare '%1' with '%2'" msgstr "" -#: diff_ext.cpp:563 +#: diff_ext.cpp:386 #, kde-format msgid "Save '%1' for later operation" msgstr "" -#: diff_ext.cpp:619 +#: diff_ext.cpp:440 #, kde-format msgid "Could not start KDiff3. Please rerun KDiff3 installation." msgstr "" -#: diff_ext.cpp:620 +#: diff_ext.cpp:441 #, kde-format msgid "Command" msgstr "" -#: diff_ext.cpp:621 +#: diff_ext.cpp:442 #, kde-format msgid "CommandLine" msgstr "" -#: diff_ext.cpp:622 +#: diff_ext.cpp:443 #, kde-format msgid "Diff-Ext For KDiff3" msgstr "" \ No newline at end of file diff -Nru kdiff3-1.8.01/po/ja/kdiff3fileitemactionplugin.po kdiff3-1.8.3/po/ja/kdiff3fileitemactionplugin.po --- kdiff3-1.8.01/po/ja/kdiff3fileitemactionplugin.po 2019-05-18 01:02:07.000000000 +0000 +++ kdiff3-1.8.3/po/ja/kdiff3fileitemactionplugin.po 2020-06-25 00:18:28.000000000 +0000 @@ -1,8 +1,8 @@ msgid "" msgstr "" "Project-Id-Version: kdiff3fileitemactionplugin\n" -"Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2019-03-22 03:09+0100\n" +"Report-Msgid-Bugs-To: https://bugs.kde.org\n" +"POT-Creation-Date: 2019-08-30 07:40+0200\n" "PO-Revision-Date: 2011-05-06 23:50-0700\n" "Last-Translator: Japanese KDE translation team \n" "Language-Team: Japanese \n" diff -Nru kdiff3-1.8.01/po/ja/kdiff3.po kdiff3-1.8.3/po/ja/kdiff3.po --- kdiff3-1.8.01/po/ja/kdiff3.po 2019-05-18 01:02:07.000000000 +0000 +++ kdiff3-1.8.3/po/ja/kdiff3.po 2020-06-25 00:18:28.000000000 +0000 @@ -5,8 +5,8 @@ msgid "" msgstr "" "Project-Id-Version: kdiff3\n" -"Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2019-04-18 08:02+0200\n" +"Report-Msgid-Bugs-To: https://bugs.kde.org\n" +"POT-Creation-Date: 2020-06-22 07:48+0200\n" "PO-Revision-Date: 2010-10-03 21:09-0700\n" "Last-Translator: Fumiaki Okushi \n" "Language-Team: Japanese \n" @@ -28,291 +28,291 @@ msgid "Your emails" msgstr "ss@kde.gr.jp,ybando@k6.dion.ne.jp" -#: difftextwindow.cpp:412 +#: difftextwindow.cpp:414 #, kde-format msgid "File %1: Line %2" msgstr "" -#: difftextwindow.cpp:414 +#: difftextwindow.cpp:416 #, fuzzy, kde-format #| msgid "Line not available" msgid "File %1: Line not available" msgstr "行がありません" -#: difftextwindow.cpp:1780 +#: difftextwindow.cpp:1778 #, kde-format msgid "Encoding:" msgstr "エンコーディング:" -#: difftextwindow.cpp:1782 mergeresultwindow.cpp:3138 optiondialog.cpp:818 +#: difftextwindow.cpp:1781 mergeresultwindow.cpp:3166 optiondialog.cpp:840 #, kde-format msgid "Line end style:" msgstr "改行コード:" -#: difftextwindow.cpp:1810 directorymergewindow.cpp:382 -#: directorymergewindow.cpp:433 directorymergewindow.cpp:524 -#: directorymergewindow.cpp:3058 directorymergewindow.cpp:3189 -#: directorymergewindow.cpp:3417 mergeresultwindow.cpp:942 -#: mergeresultwindow.cpp:944 mergeresultwindow.cpp:946 -#: mergeresultwindow.cpp:948 mergeresultwindow.cpp:1814 -#: mergeresultwindow.cpp:3170 mergeresultwindow.cpp:3177 optiondialog.cpp:962 -#: optiondialog.cpp:975 pdiff.cpp:833 pdiff.cpp:835 pdiff.cpp:837 pdiff.cpp:839 -#: pdiff.cpp:861 smalldialogs.cpp:124 smalldialogs.cpp:126 smalldialogs.cpp:127 -#: smalldialogs.cpp:130 +#: difftextwindow.cpp:1809 directorymergewindow.cpp:383 +#: directorymergewindow.cpp:434 directorymergewindow.cpp:525 +#: directorymergewindow.cpp:3072 directorymergewindow.cpp:3203 +#: directorymergewindow.cpp:3431 mergeresultwindow.cpp:970 +#: mergeresultwindow.cpp:972 mergeresultwindow.cpp:974 +#: mergeresultwindow.cpp:976 mergeresultwindow.cpp:1842 +#: mergeresultwindow.cpp:3198 mergeresultwindow.cpp:3205 optiondialog.cpp:1002 +#: optiondialog.cpp:1015 pdiff.cpp:823 pdiff.cpp:825 pdiff.cpp:827 +#: pdiff.cpp:829 pdiff.cpp:851 smalldialogs.cpp:131 smalldialogs.cpp:133 +#: smalldialogs.cpp:134 smalldialogs.cpp:137 #, kde-format msgid "A" msgstr "A" -#: difftextwindow.cpp:1810 directorymergewindow.cpp:384 -#: directorymergewindow.cpp:436 directorymergewindow.cpp:526 -#: directorymergewindow.cpp:3064 directorymergewindow.cpp:3190 -#: directorymergewindow.cpp:3418 mergeresultwindow.cpp:942 -#: mergeresultwindow.cpp:944 mergeresultwindow.cpp:950 -#: mergeresultwindow.cpp:952 mergeresultwindow.cpp:1816 -#: mergeresultwindow.cpp:3172 mergeresultwindow.cpp:3179 optiondialog.cpp:963 -#: optiondialog.cpp:976 pdiff.cpp:833 pdiff.cpp:835 pdiff.cpp:841 pdiff.cpp:843 -#: pdiff.cpp:863 smalldialogs.cpp:124 smalldialogs.cpp:125 smalldialogs.cpp:128 -#: smalldialogs.cpp:131 +#: difftextwindow.cpp:1809 directorymergewindow.cpp:385 +#: directorymergewindow.cpp:437 directorymergewindow.cpp:527 +#: directorymergewindow.cpp:3078 directorymergewindow.cpp:3204 +#: directorymergewindow.cpp:3432 mergeresultwindow.cpp:970 +#: mergeresultwindow.cpp:972 mergeresultwindow.cpp:978 +#: mergeresultwindow.cpp:980 mergeresultwindow.cpp:1844 +#: mergeresultwindow.cpp:3200 mergeresultwindow.cpp:3207 optiondialog.cpp:1003 +#: optiondialog.cpp:1016 pdiff.cpp:823 pdiff.cpp:825 pdiff.cpp:831 +#: pdiff.cpp:833 pdiff.cpp:853 smalldialogs.cpp:131 smalldialogs.cpp:132 +#: smalldialogs.cpp:135 smalldialogs.cpp:138 #, kde-format msgid "B" msgstr "B" -#: difftextwindow.cpp:1810 directorymergewindow.cpp:386 -#: directorymergewindow.cpp:439 directorymergewindow.cpp:528 -#: directorymergewindow.cpp:3070 directorymergewindow.cpp:3191 -#: directorymergewindow.cpp:3419 mergeresultwindow.cpp:946 -#: mergeresultwindow.cpp:948 mergeresultwindow.cpp:950 -#: mergeresultwindow.cpp:952 mergeresultwindow.cpp:1818 -#: mergeresultwindow.cpp:3174 mergeresultwindow.cpp:3181 optiondialog.cpp:977 -#: pdiff.cpp:837 pdiff.cpp:839 pdiff.cpp:841 pdiff.cpp:843 pdiff.cpp:865 -#: smalldialogs.cpp:125 smalldialogs.cpp:126 smalldialogs.cpp:129 -#: smalldialogs.cpp:132 +#: difftextwindow.cpp:1809 directorymergewindow.cpp:387 +#: directorymergewindow.cpp:440 directorymergewindow.cpp:529 +#: directorymergewindow.cpp:3084 directorymergewindow.cpp:3205 +#: directorymergewindow.cpp:3433 mergeresultwindow.cpp:974 +#: mergeresultwindow.cpp:976 mergeresultwindow.cpp:978 +#: mergeresultwindow.cpp:980 mergeresultwindow.cpp:1846 +#: mergeresultwindow.cpp:3202 mergeresultwindow.cpp:3209 optiondialog.cpp:1017 +#: pdiff.cpp:827 pdiff.cpp:829 pdiff.cpp:831 pdiff.cpp:833 pdiff.cpp:855 +#: smalldialogs.cpp:132 smalldialogs.cpp:133 smalldialogs.cpp:136 +#: smalldialogs.cpp:139 #, kde-format msgid "C" msgstr "C" -#: difftextwindow.cpp:1810 +#: difftextwindow.cpp:1809 #, fuzzy, kde-format #| msgid "A (Base):" msgid "A (Base)" msgstr "A (ベース):" -#: difftextwindow.cpp:1812 +#: difftextwindow.cpp:1811 #, fuzzy, kde-format #| msgid "Encoding:" msgid "Encoding: %1" msgstr "エンコーディング:" -#: difftextwindow.cpp:1813 mergeresultwindow.cpp:3183 +#: difftextwindow.cpp:1812 mergeresultwindow.cpp:3211 #, kde-format msgid "Unix" msgstr "Unix" -#: difftextwindow.cpp:1813 mergeresultwindow.cpp:3184 +#: difftextwindow.cpp:1812 mergeresultwindow.cpp:3212 #, kde-format msgid "DOS" msgstr "DOS" -#: difftextwindow.cpp:1813 +#: difftextwindow.cpp:1812 #, fuzzy, kde-format #| msgid "Line end style:" msgid "Line end style: %1" msgstr "改行コード:" -#: difftextwindow.cpp:1835 kdiff3.cpp:873 +#: difftextwindow.cpp:1834 kdiff3.cpp:874 #, kde-format msgid "Top line" msgstr "上部行" -#: difftextwindow.cpp:1845 +#: difftextwindow.cpp:1843 #, kde-format msgid "End" msgstr "最後" -#: difftextwindow.cpp:1903 smalldialogs.cpp:235 +#: difftextwindow.cpp:1901 smalldialogs.cpp:245 #, fuzzy, kde-format #| msgid "Opening files..." msgid "Open File" msgstr "ファイルを開いています..." -#: difftextwindow.cpp:1951 optiondialog.cpp:387 +#: difftextwindow.cpp:1943 optiondialog.cpp:389 #, kde-format msgid "Unicode, 8 bit" msgstr "Unicode, 8 ビット" -#: difftextwindow.cpp:1966 +#: difftextwindow.cpp:1958 #, kde-format msgid "Other" msgstr "" -#: directorymergewindow.cpp:409 directorymergewindow.cpp:3424 +#: directorymergewindow.cpp:410 directorymergewindow.cpp:3438 #, kde-format msgid "Copy A to B" msgstr "A を B にコピー" -#: directorymergewindow.cpp:412 directorymergewindow.cpp:3425 +#: directorymergewindow.cpp:413 directorymergewindow.cpp:3439 #, kde-format msgid "Copy B to A" msgstr "B を A にコピー" -#: directorymergewindow.cpp:415 directorymergewindow.cpp:3426 +#: directorymergewindow.cpp:416 directorymergewindow.cpp:3440 #, kde-format msgid "Delete A" msgstr "A を削除" -#: directorymergewindow.cpp:418 directorymergewindow.cpp:3427 +#: directorymergewindow.cpp:419 directorymergewindow.cpp:3441 #, kde-format msgid "Delete B" msgstr "B を削除" -#: directorymergewindow.cpp:421 +#: directorymergewindow.cpp:422 #, kde-format msgid "Delete A & B" msgstr "A と B を削除" -#: directorymergewindow.cpp:424 directorymergewindow.cpp:3429 +#: directorymergewindow.cpp:425 directorymergewindow.cpp:3443 #, kde-format msgid "Merge to A" msgstr "A にマージ" -#: directorymergewindow.cpp:427 directorymergewindow.cpp:3430 +#: directorymergewindow.cpp:428 directorymergewindow.cpp:3444 #, kde-format msgid "Merge to B" msgstr "B にマージ" -#: directorymergewindow.cpp:430 +#: directorymergewindow.cpp:431 #, kde-format msgid "Merge to A & B" msgstr "A と B にマージ" -#: directorymergewindow.cpp:442 directorymergewindow.cpp:3421 +#: directorymergewindow.cpp:443 directorymergewindow.cpp:3435 #, kde-format msgid "Delete (if exists)" msgstr "(存在すれば) 削除" -#: directorymergewindow.cpp:445 directorymergewindow.cpp:448 -#: directorymergewindow.cpp:3420 optiondialog.cpp:925 smalldialogs.cpp:113 +#: directorymergewindow.cpp:446 directorymergewindow.cpp:449 +#: directorymergewindow.cpp:3434 smalldialogs.cpp:120 #, kde-format msgid "Merge" msgstr "マージ" -#: directorymergewindow.cpp:445 directorymergewindow.cpp:448 +#: directorymergewindow.cpp:446 directorymergewindow.cpp:449 #, kde-format msgid "Merge (manual)" msgstr "マージ (手作業)" -#: directorymergewindow.cpp:451 +#: directorymergewindow.cpp:452 #, kde-format msgid "Error: Conflicting File Types" msgstr "エラー: ファイルタイプが衝突しています" -#: directorymergewindow.cpp:454 +#: directorymergewindow.cpp:455 #, kde-format msgid "Error: Changed and Deleted" msgstr "" -#: directorymergewindow.cpp:457 +#: directorymergewindow.cpp:458 #, kde-format msgid "Error: Dates are equal but files are not." msgstr "エラー: 日付は同じですが、ファイルは等しくありません。" -#: directorymergewindow.cpp:471 +#: directorymergewindow.cpp:472 #, fuzzy, kde-format #| msgid "Done." msgid "Done" msgstr "完了" -#: directorymergewindow.cpp:473 +#: directorymergewindow.cpp:474 #, kde-format msgid "Error" msgstr "エラー" -#: directorymergewindow.cpp:475 +#: directorymergewindow.cpp:476 #, kde-format msgid "Skipped." msgstr "スキップしました。" -#: directorymergewindow.cpp:477 +#: directorymergewindow.cpp:478 #, kde-format msgid "Not saved." msgstr "未保存" -#: directorymergewindow.cpp:479 +#: directorymergewindow.cpp:480 #, kde-format msgid "In progress..." msgstr "進行中..." -#: directorymergewindow.cpp:481 +#: directorymergewindow.cpp:482 #, fuzzy, kde-format msgid "To do." msgstr "To do." -#: directorymergewindow.cpp:522 +#: directorymergewindow.cpp:523 #, kde-format msgid "Name" msgstr "名前" -#: directorymergewindow.cpp:530 +#: directorymergewindow.cpp:531 #, kde-format msgid "Operation" msgstr "操作" -#: directorymergewindow.cpp:532 +#: directorymergewindow.cpp:533 #, kde-format msgid "Status" msgstr "状態" -#: directorymergewindow.cpp:534 +#: directorymergewindow.cpp:535 #, kde-format msgid "Unsolved" msgstr "未解決" -#: directorymergewindow.cpp:536 +#: directorymergewindow.cpp:537 #, kde-format msgid "Solved" msgstr "解決済み" -#: directorymergewindow.cpp:538 +#: directorymergewindow.cpp:539 #, kde-format msgid "Nonwhite" msgstr "ホワイトスペース以外" -#: directorymergewindow.cpp:540 +#: directorymergewindow.cpp:541 #, kde-format msgid "White" msgstr "ホワイトスペース" -#: directorymergewindow.cpp:674 +#: directorymergewindow.cpp:676 #, kde-format msgid "Unable to compare non-normal file with normal file." msgstr "" -#: directorymergewindow.cpp:688 +#: directorymergewindow.cpp:690 #, kde-format msgid "Mix of links and normal files." msgstr "リンクと普通のファイルが混在しています。" -#: directorymergewindow.cpp:695 +#: directorymergewindow.cpp:697 #, kde-format msgid "Link: " msgstr "リンク: " -#: directorymergewindow.cpp:704 +#: directorymergewindow.cpp:706 #, kde-format msgid "Size. " msgstr "サイズ" -#: directorymergewindow.cpp:718 directorymergewindow.cpp:728 +#: directorymergewindow.cpp:720 directorymergewindow.cpp:730 #, kde-format msgid "Date & Size: " msgstr "日付とサイズ: " -#: directorymergewindow.cpp:748 +#: directorymergewindow.cpp:751 #, kde-format msgid "Comparing file..." msgstr "ファイルを比較中..." -#: directorymergewindow.cpp:801 +#: directorymergewindow.cpp:813 #, kde-format msgid "" "You are currently doing a directory merge. Are you sure, you want to abort " @@ -321,48 +321,48 @@ "ディレクトリマージを実行中です。本当にマージを中止し、ディレクトリを再スキャ" "ンしますか？" -#: directorymergewindow.cpp:802 kdiff3.cpp:698 kdiff3.cpp:708 kdiff3.cpp:720 -#: mergeresultwindow.cpp:372 pdiff.cpp:1033 pdiff.cpp:1910 pdiff.cpp:1920 +#: directorymergewindow.cpp:814 kdiff3.cpp:697 kdiff3.cpp:707 kdiff3.cpp:719 +#: mergeresultwindow.cpp:400 pdiff.cpp:1031 pdiff.cpp:1920 pdiff.cpp:1930 #, kde-format msgid "Warning" msgstr "警告" -#: directorymergewindow.cpp:803 directorymergewindow.cpp:3393 +#: directorymergewindow.cpp:815 directorymergewindow.cpp:3407 #, kde-format msgid "Rescan" msgstr "再スキャン" -#: directorymergewindow.cpp:804 pdiff.cpp:1035 +#: directorymergewindow.cpp:816 pdiff.cpp:1033 #, kde-format msgid "Continue Merging" msgstr "マージを続行" -#: directorymergewindow.cpp:971 +#: directorymergewindow.cpp:984 #, kde-format msgid "Opening of directories failed:" msgstr "ディレクトリを開けませんでした:" -#: directorymergewindow.cpp:975 +#: directorymergewindow.cpp:988 #, kde-format msgid "Dir A \"%1\" does not exist or is not a directory.\n" msgstr "ディレクトリ A ‘%1’ は存在しないか、ディレクトリではありません。\n" -#: directorymergewindow.cpp:980 +#: directorymergewindow.cpp:993 #, kde-format msgid "Dir B \"%1\" does not exist or is not a directory.\n" msgstr "ディレクトリ B ‘%1’ は存在しないか、ディレクトリではありません。\n" -#: directorymergewindow.cpp:985 +#: directorymergewindow.cpp:998 #, kde-format msgid "Dir C \"%1\" does not exist or is not a directory.\n" msgstr "ディレクトリ C ‘%1’ は存在しないか、ディレクトリではありません。\n" -#: directorymergewindow.cpp:988 +#: directorymergewindow.cpp:1001 #, kde-format msgid "Directory Open Error" msgstr "ディレクトリのオープンエラー" -#: directorymergewindow.cpp:996 +#: directorymergewindow.cpp:1009 #, kde-format msgid "" "The destination directory must not be the same as A or B when three " @@ -373,49 +373,49 @@ "あってはいけません。\n" "続行する前にもう一度確認してください。" -#: directorymergewindow.cpp:998 +#: directorymergewindow.cpp:1011 #, kde-format msgid "Parameter Warning" msgstr "パラメータ警告" -#: directorymergewindow.cpp:1003 +#: directorymergewindow.cpp:1016 #, kde-format msgid "Scanning directories..." msgstr "ディレクトリをスキャン中..." -#: directorymergewindow.cpp:1029 +#: directorymergewindow.cpp:1042 #, kde-format msgid "Reading Directory A" msgstr "ディレクトリ A を読み込み中" -#: directorymergewindow.cpp:1038 +#: directorymergewindow.cpp:1051 #, kde-format msgid "Reading Directory B" msgstr "ディレクトリ B を読み込み中" -#: directorymergewindow.cpp:1048 +#: directorymergewindow.cpp:1061 #, kde-format msgid "Reading Directory C" msgstr "ディレクトリ C を読み込み中" -#: directorymergewindow.cpp:1064 +#: directorymergewindow.cpp:1077 #, kde-format msgid "Some subdirectories were not readable in" msgstr "いくつかのサブディレクトリが読み込み不可でした" -#: directorymergewindow.cpp:1069 +#: directorymergewindow.cpp:1082 #, kde-format msgid "Check the permissions of the subdirectories." msgstr "サブディレクトリのパーミッションを確認してください。" -#: directorymergewindow.cpp:1106 kdiff3.cpp:666 kdiff3.cpp:753 kdiff3.cpp:777 -#: kdiff3.cpp:1065 kdiff3.cpp:1086 pdiff.cpp:1116 pdiff.cpp:1170 pdiff.cpp:1218 -#: pdiff.cpp:1234 pdiff.cpp:1277 pdiff.cpp:1301 +#: directorymergewindow.cpp:1119 kdiff3.cpp:665 kdiff3.cpp:752 kdiff3.cpp:776 +#: kdiff3.cpp:1072 kdiff3.cpp:1093 pdiff.cpp:1115 pdiff.cpp:1178 pdiff.cpp:1228 +#: pdiff.cpp:1244 pdiff.cpp:1287 pdiff.cpp:1311 #, kde-format msgid "Ready." msgstr "準備完了。" -#: directorymergewindow.cpp:1121 +#: directorymergewindow.cpp:1134 #, kde-format msgid "" "Directory Comparison Status\n" @@ -425,23 +425,23 @@ "Number of different files: %3" msgstr "" -#: directorymergewindow.cpp:1128 +#: directorymergewindow.cpp:1141 #, fuzzy, kde-format #| msgid "Number of manual merges:" msgid "Number of manual merges: %1" msgstr "手作業でのマージ数:" -#: directorymergewindow.cpp:1394 +#: directorymergewindow.cpp:1407 #, kde-format msgid "This affects all merge operations." msgstr "これはすべてのマージ操作に影響します。" -#: directorymergewindow.cpp:1395 +#: directorymergewindow.cpp:1408 #, kde-format msgid "Changing All Merge Operations" msgstr "すべてのマージ操作を更新中" -#: directorymergewindow.cpp:1695 +#: directorymergewindow.cpp:1708 #, fuzzy, kde-format #| msgid "Processing " msgid "" @@ -449,45 +449,45 @@ "%3" msgstr "処理中" -#: directorymergewindow.cpp:1738 directorymergewindow.cpp:1742 +#: directorymergewindow.cpp:1751 directorymergewindow.cpp:1755 #, kde-format msgid "Some files could not be processed." msgstr "" -#: directorymergewindow.cpp:2222 directorymergewindow.cpp:2247 -#: directorymergewindow.cpp:2271 +#: directorymergewindow.cpp:2235 directorymergewindow.cpp:2260 +#: directorymergewindow.cpp:2285 #, kde-format msgid "This operation is currently not possible." msgstr "この操作は今はできません。" -#: directorymergewindow.cpp:2222 directorymergewindow.cpp:2247 -#: directorymergewindow.cpp:2271 directorymergewindow.cpp:2552 +#: directorymergewindow.cpp:2235 directorymergewindow.cpp:2260 +#: directorymergewindow.cpp:2285 directorymergewindow.cpp:2565 #, kde-format msgid "Operation Not Possible" msgstr "操作不可" -#: directorymergewindow.cpp:2318 +#: directorymergewindow.cpp:2332 #, fuzzy, kde-format #| msgid "An error occurred while copying.\n" msgid "An error occurred while copying." msgstr "コピー中にエラーが発生しました。\n" -#: directorymergewindow.cpp:2319 directorymergewindow.cpp:2759 +#: directorymergewindow.cpp:2333 directorymergewindow.cpp:2772 #, kde-format msgid "Merge Error" msgstr "マージエラー" -#: directorymergewindow.cpp:2396 +#: directorymergewindow.cpp:2410 #, kde-format msgid "Unknown merge operation. (This must never happen!)" msgstr "不明なマージ操作 (これは起きてはならないことです)" -#: directorymergewindow.cpp:2441 +#: directorymergewindow.cpp:2455 #, kde-format msgid "Unknown merge operation." msgstr "不明なマージ操作です。" -#: directorymergewindow.cpp:2454 +#: directorymergewindow.cpp:2468 #, kde-format msgid "" "The merge is about to begin.\n" @@ -508,22 +508,22 @@ "このプログラムはまだベータ段階で何が起きても無保証だということに注意してくだ" "さい!重要なデータはバックアップを取ってください!" -#: directorymergewindow.cpp:2459 +#: directorymergewindow.cpp:2473 #, kde-format msgid "Starting Merge" msgstr "マージ開始" -#: directorymergewindow.cpp:2460 +#: directorymergewindow.cpp:2474 #, kde-format msgid "Do It" msgstr "実行" -#: directorymergewindow.cpp:2461 +#: directorymergewindow.cpp:2475 #, kde-format msgid "Simulate It" msgstr "試行" -#: directorymergewindow.cpp:2487 +#: directorymergewindow.cpp:2501 #, kde-format msgid "" "The highlighted item has a different type in the different directories. " @@ -532,7 +532,7 @@ "強調表示された項目はディレクトリによってタイプが違います。どうするか選択して" "ください。" -#: directorymergewindow.cpp:2491 +#: directorymergewindow.cpp:2505 #, kde-format msgid "" "The modification dates of the file are equal but the files are not. Select " @@ -541,7 +541,7 @@ "ファイルの更新日時は同じですが、ファイルは等しくありません。どうするか選択し" "てください。" -#: directorymergewindow.cpp:2495 +#: directorymergewindow.cpp:2509 #, kde-format msgid "" "The highlighted item was changed in one directory and deleted in the other. " @@ -550,14 +550,14 @@ "強調表示された項目は一方のディレクトリで変更され、他方のディレクトリで削除さ" "れました。どうするか選択してください。" -#: directorymergewindow.cpp:2552 +#: directorymergewindow.cpp:2565 #, kde-format msgid "" "This operation is currently not possible because directory merge is " "currently running." msgstr "ディレクトリマージ中なのでこの操作を実行することはできません。" -#: directorymergewindow.cpp:2609 +#: directorymergewindow.cpp:2622 #, kde-format msgid "" "There was an error in the last step.\n" @@ -568,262 +568,262 @@ "エラーを起した項目について続行しますか？それともスキップしますか？" # @title:window? -#: directorymergewindow.cpp:2611 +#: directorymergewindow.cpp:2624 #, kde-format msgid "Continue merge after an error" msgstr "エラー後のマージ続行" -#: directorymergewindow.cpp:2612 +#: directorymergewindow.cpp:2625 #, kde-format msgid "Continue With Last Item" msgstr "最後の項目について続行" -#: directorymergewindow.cpp:2613 +#: directorymergewindow.cpp:2626 #, kde-format msgid "Skip Item" msgstr "項目をスキップ" -#: directorymergewindow.cpp:2709 +#: directorymergewindow.cpp:2722 #, kde-format msgid "Merge operation complete." msgstr "マージ操作が完了しました。" -#: directorymergewindow.cpp:2709 directorymergewindow.cpp:2712 +#: directorymergewindow.cpp:2722 directorymergewindow.cpp:2725 #, kde-format msgid "Merge Complete" msgstr "マージ完了" -#: directorymergewindow.cpp:2722 +#: directorymergewindow.cpp:2735 #, kde-format msgid "" "Simulated merge complete: Check if you agree with the proposed operations." msgstr "マージ試行完了: この操作をしてもよいか確認してください。" -#: directorymergewindow.cpp:2758 +#: directorymergewindow.cpp:2771 #, fuzzy, kde-format #| msgid "An error occurred. Press OK to see detailed information.\n" msgid "An error occurred. Press OK to see detailed information." msgstr "" "エラーが発生しました。詳細情報を見るには「OK」をクリックしてください。\n" -#: directorymergewindow.cpp:2791 +#: directorymergewindow.cpp:2804 #, kde-format msgid "Error: While deleting %1: Creating backup failed." msgstr "エラー: %1 の削除中にバックアップファイルを作成できませんでした。" -#: directorymergewindow.cpp:2798 +#: directorymergewindow.cpp:2811 #, kde-format msgid "delete directory recursively( %1 )" msgstr "再帰的にディレクトリを削除 (%1)" -#: directorymergewindow.cpp:2800 +#: directorymergewindow.cpp:2813 #, kde-format msgid "delete( %1 )" msgstr "削除 (%1)" -#: directorymergewindow.cpp:2815 +#: directorymergewindow.cpp:2828 #, kde-format msgid "Error: delete dir operation failed while trying to read the directory." msgstr "エラー: ディレクトリの削除がディレクトリの読み込み中に失敗しました。" -#: directorymergewindow.cpp:2834 +#: directorymergewindow.cpp:2847 #, kde-format msgid "Error: rmdir( %1 ) operation failed." msgstr "エラー: ディレクトリの削除 (%1) に失敗しました。" -#: directorymergewindow.cpp:2844 +#: directorymergewindow.cpp:2857 #, kde-format msgid "Error: delete operation failed." msgstr "エラー: 削除に失敗しました。" -#: directorymergewindow.cpp:2870 +#: directorymergewindow.cpp:2884 #, kde-format msgid "manual merge( %1, %2, %3 -> %4)" msgstr "手作業でのマージ (%1, %2, %3 -> %4)" -#: directorymergewindow.cpp:2873 +#: directorymergewindow.cpp:2887 #, kde-format msgid "" " Note: After a manual merge the user should continue by pressing F7." msgstr "【注】 手作業でのマージ後に続行するには F7 を押してください。" -#: directorymergewindow.cpp:2900 +#: directorymergewindow.cpp:2914 #, kde-format msgid "Error: copy( %1 -> %2 ) failed.Deleting existing destination failed." msgstr "" "エラー: コピー (%1 -> %2) に失敗しました。既存のコピー先を削除できませんでし" "た。" -#: directorymergewindow.cpp:2909 +#: directorymergewindow.cpp:2923 #, kde-format msgid "copyLink( %1 -> %2 )" msgstr "リンクをコピー (%1 -> %2)" -#: directorymergewindow.cpp:2918 +#: directorymergewindow.cpp:2932 #, kde-format msgid "Error: copyLink failed: Remote links are not yet supported." msgstr "エラー: リンクのコピーに失敗しました。リモートリンクは未サポートです。" -#: directorymergewindow.cpp:2928 +#: directorymergewindow.cpp:2942 #, kde-format msgid "Error: copyLink failed." msgstr "エラー: リンクのコピーに失敗しました。" -#: directorymergewindow.cpp:2953 +#: directorymergewindow.cpp:2967 #, kde-format msgid "copy( %1 -> %2 )" msgstr "コピー (%1 -> %2)" -#: directorymergewindow.cpp:2979 +#: directorymergewindow.cpp:2993 #, kde-format msgid "Error during rename( %1 -> %2 ): Cannot delete existing destination." msgstr "名前変更 (%1 -> %2) 中にエラー: 既存のコピー先を削除できません。" -#: directorymergewindow.cpp:2986 +#: directorymergewindow.cpp:3000 #, kde-format msgid "rename( %1 -> %2 )" msgstr "名前変更 (%1 -> %2)" -#: directorymergewindow.cpp:2995 +#: directorymergewindow.cpp:3009 #, kde-format msgid "Error: Rename failed." msgstr "エラー: 名前変更に失敗しました。" -#: directorymergewindow.cpp:3013 +#: directorymergewindow.cpp:3027 #, kde-format msgid "Error during makeDir of %1. Cannot delete existing file." msgstr "" "ディレクトリの作成 (%1) 中にエラーが発生しました。既存のファイルを削除できま" "せん。" -#: directorymergewindow.cpp:3030 +#: directorymergewindow.cpp:3044 #, kde-format msgid "makeDir( %1 )" msgstr "ディレクトリを作成 (%1)" -#: directorymergewindow.cpp:3040 +#: directorymergewindow.cpp:3054 #, kde-format msgid "Error while creating directory." msgstr "ディレクトリの作成中にエラーが発生しました。" -#: directorymergewindow.cpp:3076 directorymergewindow.cpp:3195 +#: directorymergewindow.cpp:3090 directorymergewindow.cpp:3209 #, kde-format msgid "Dest" msgstr "先" -#: directorymergewindow.cpp:3084 directorymergewindow.cpp:3113 +#: directorymergewindow.cpp:3098 directorymergewindow.cpp:3127 #, kde-format msgid "Dir" msgstr "ディレクトリ" -#: directorymergewindow.cpp:3084 +#: directorymergewindow.cpp:3098 #, kde-format msgid "Type" msgstr "タイプ" -#: directorymergewindow.cpp:3084 +#: directorymergewindow.cpp:3098 #, kde-format msgid "Size" msgstr "サイズ" -#: directorymergewindow.cpp:3085 +#: directorymergewindow.cpp:3099 #, kde-format msgid "Attr" msgstr "属性" -#: directorymergewindow.cpp:3085 +#: directorymergewindow.cpp:3099 #, kde-format msgid "Last Modification" msgstr "最終更新" -#: directorymergewindow.cpp:3085 +#: directorymergewindow.cpp:3099 #, kde-format msgid "Link-Destination" msgstr "リンク先" -#: directorymergewindow.cpp:3113 +#: directorymergewindow.cpp:3127 #, kde-format msgid "File" msgstr "ファイル" -#: directorymergewindow.cpp:3113 +#: directorymergewindow.cpp:3127 #, fuzzy, kde-format #| msgid "Link: " msgid "-Link" msgstr "リンク: " -#: directorymergewindow.cpp:3119 +#: directorymergewindow.cpp:3133 #, kde-format msgid "not available" msgstr "利用不可" -#: directorymergewindow.cpp:3137 +#: directorymergewindow.cpp:3151 #, kde-format msgid "A (Dest): " msgstr "A (先): " -#: directorymergewindow.cpp:3141 +#: directorymergewindow.cpp:3155 #, kde-format msgid "A: " msgstr "" -#: directorymergewindow.cpp:3141 +#: directorymergewindow.cpp:3155 #, kde-format msgid "A (Base): " msgstr "A (元): " -#: directorymergewindow.cpp:3147 +#: directorymergewindow.cpp:3161 #, kde-format msgid "B (Dest): " msgstr "B (先): " -#: directorymergewindow.cpp:3151 +#: directorymergewindow.cpp:3165 #, kde-format msgid "B: " msgstr "" -#: directorymergewindow.cpp:3156 +#: directorymergewindow.cpp:3170 #, kde-format msgid "C (Dest): " msgstr "C (先): " -#: directorymergewindow.cpp:3160 +#: directorymergewindow.cpp:3174 #, kde-format msgid "C: " msgstr "" -#: directorymergewindow.cpp:3163 +#: directorymergewindow.cpp:3177 #, kde-format msgid "Dest: " msgstr "先: " #. i18n("Saving Directory Merge State ...")); -#: directorymergewindow.cpp:3238 +#: directorymergewindow.cpp:3252 #, kde-format msgid "Save Directory Merge State As..." msgstr "ディレクトリマージの状態を保存..." -#: directorymergewindow.cpp:3387 +#: directorymergewindow.cpp:3401 #, kde-format msgid "Start/Continue Directory Merge" msgstr "ディレクトリマージを開始/続行" -#: directorymergewindow.cpp:3388 +#: directorymergewindow.cpp:3402 #, kde-format msgid "Run Operation for Current Item" msgstr "現在の項目について操作を実行" -#: directorymergewindow.cpp:3389 +#: directorymergewindow.cpp:3403 #, kde-format msgid "Compare Selected File" msgstr "選択ファイルを比較 " -#: directorymergewindow.cpp:3390 +#: directorymergewindow.cpp:3404 #, kde-format msgid "Merge Current File" msgstr "現在のファイルをマージ " -#: directorymergewindow.cpp:3390 +#: directorymergewindow.cpp:3404 #, kde-format msgid "" "Merge\n" @@ -832,51 +832,51 @@ "ファイル\n" "をマージ" -#: directorymergewindow.cpp:3391 +#: directorymergewindow.cpp:3405 #, kde-format msgid "Fold All Subdirs" msgstr "すべてのサブディレクトリをたたむ" -#: directorymergewindow.cpp:3392 +#: directorymergewindow.cpp:3406 #, kde-format msgid "Unfold All Subdirs" msgstr "すべてのサブディレクトリを展開" #. i18n("Save Directory Merge State ..."), 0, this, &DirectoryMergeWindow::slotSaveMergeState, ac, "dir_save_merge_state"); #. i18n("Load Directory Merge State ..."), 0, this, &DirectoryMergeWindow::slotLoadMergeState, ac, "dir_load_merge_state"); -#: directorymergewindow.cpp:3396 +#: directorymergewindow.cpp:3410 #, kde-format msgid "Choose A for All Items" msgstr "すべての項目について A を選択" -#: directorymergewindow.cpp:3397 +#: directorymergewindow.cpp:3411 #, kde-format msgid "Choose B for All Items" msgstr "すべての項目について B を選択" -#: directorymergewindow.cpp:3398 +#: directorymergewindow.cpp:3412 #, kde-format msgid "Choose C for All Items" msgstr "すべての項目について C を選択" -#: directorymergewindow.cpp:3399 +#: directorymergewindow.cpp:3413 #, kde-format msgid "Auto-Choose Operation for All Items" msgstr "すべての項目について自動選択" -#: directorymergewindow.cpp:3400 +#: directorymergewindow.cpp:3414 #, kde-format msgid "No Operation for All Items" msgstr "すべての項目について操作なし" #. i18n("Synchronize Directories"), 0, this, &DirectoryMergeWindow::slotSynchronizeDirectories, ac, "dir_synchronize_directories"); #. d->m_pDirChooseNewerFiles = GuiUtils::createAction< KToggleAction >(i18n("Copy Newer Files Instead of Merging"), 0, this, &DirectoryMergeWindow::slotChooseNewerFiles, ac, "dir_choose_newer_files"); -#: directorymergewindow.cpp:3405 +#: directorymergewindow.cpp:3419 #, kde-format msgid "Show Identical Files" msgstr "等しいファイルを表示" -#: directorymergewindow.cpp:3405 +#: directorymergewindow.cpp:3419 #, kde-format msgid "" "Identical\n" @@ -885,17 +885,17 @@ "等しい\n" "ファイル" -#: directorymergewindow.cpp:3406 +#: directorymergewindow.cpp:3420 #, kde-format msgid "Show Different Files" msgstr "異なるファイルを表示" -#: directorymergewindow.cpp:3407 +#: directorymergewindow.cpp:3421 #, kde-format msgid "Show Files only in A" msgstr "A にのみ存在するファイルを表示" -#: directorymergewindow.cpp:3407 +#: directorymergewindow.cpp:3421 #, kde-format msgid "" "Files\n" @@ -904,12 +904,12 @@ "A にのみ存在\n" "するファイル" -#: directorymergewindow.cpp:3408 +#: directorymergewindow.cpp:3422 #, kde-format msgid "Show Files only in B" msgstr "B にのみ存在するファイルを表示" -#: directorymergewindow.cpp:3408 +#: directorymergewindow.cpp:3422 #, kde-format msgid "" "Files\n" @@ -918,12 +918,12 @@ "B にのみ存在\n" "するファイル" -#: directorymergewindow.cpp:3409 +#: directorymergewindow.cpp:3423 #, kde-format msgid "Show Files only in C" msgstr "C にのみ存在するファイルを表示" -#: directorymergewindow.cpp:3409 +#: directorymergewindow.cpp:3423 #, kde-format msgid "" "Files\n" @@ -932,55 +932,60 @@ "C にのみ存在\n" "するファイル" -#: directorymergewindow.cpp:3413 +#: directorymergewindow.cpp:3427 #, kde-format msgid "Compare Explicitly Selected Files" msgstr "明示的に選択したファイルを比較" -#: directorymergewindow.cpp:3414 +#: directorymergewindow.cpp:3428 #, kde-format msgid "Merge Explicitly Selected Files" msgstr "明示的に選択したファイルをマージ" -#: directorymergewindow.cpp:3416 directorymergewindow.cpp:3423 +#: directorymergewindow.cpp:3430 directorymergewindow.cpp:3437 #, kde-format msgid "Do Nothing" msgstr "何もしない" -#: directorymergewindow.cpp:3428 +#: directorymergewindow.cpp:3442 #, kde-format msgid "Delete A && B" msgstr "A と B を削除" -#: directorymergewindow.cpp:3431 +#: directorymergewindow.cpp:3445 #, kde-format msgid "Merge to A && B" msgstr "A と B にマージ" -#: fileaccess.cpp:462 SourceData.cpp:493 +#: fileaccess.cpp:301 +#, kde-format +msgid "Unable to determine full url. No parent specified." +msgstr "" + +#: fileaccess.cpp:482 SourceData.cpp:506 #, fuzzy, kde-format #| msgid "Reading file: %1" msgid "Failed to read file: %1" msgstr "ファイルを読み込み中: %1" -#: fileaccess.cpp:587 +#: fileaccess.cpp:624 #, kde-format msgid "Creating temp copy of %1 failed." msgstr "%1 の一時コピーの作成に失敗しました。" -#: fileaccess.cpp:595 fileaccess.cpp:600 +#: fileaccess.cpp:632 fileaccess.cpp:637 #, fuzzy, kde-format #| msgid "Opening %1 failed." msgid "Opening %1 failed. %2" msgstr "%1 を開けませんでした。" -#: fileaccess.cpp:619 fileaccess.cpp:627 +#: fileaccess.cpp:656 fileaccess.cpp:664 #, fuzzy, kde-format #| msgid "Error reading from %1" msgid "Error reading from %1. %2" msgstr "%1 からの読み込みエラー" -#: fileaccess.cpp:751 +#: fileaccess.cpp:788 #, fuzzy, kde-format #| msgid "" #| "While trying to make a backup, deleting an older backup failed. \n" @@ -992,7 +997,7 @@ "バックアップの作成中に古いバックアップを削除できませんでした。\n" "ファイル名: " -#: fileaccess.cpp:758 +#: fileaccess.cpp:795 #, fuzzy, kde-format #| msgid "" #| "While trying to make a backup, renaming failed. \n" @@ -1004,181 +1009,181 @@ "バックアップの作成中に名前変更に失敗しました。\n" "ファイル名: " -#: fileaccess.cpp:828 +#: fileaccess.cpp:865 #, kde-format msgid "Getting file status: %1" msgstr "ファイルの状態を取得中: %1" -#: fileaccess.cpp:869 +#: fileaccess.cpp:906 #, kde-format msgid "Reading file: %1" msgstr "ファイルを読み込み中: %1" -#: fileaccess.cpp:907 +#: fileaccess.cpp:944 #, kde-format msgid "Writing file: %1" msgstr "ファイルに書き込み中: %1" -#: fileaccess.cpp:940 +#: fileaccess.cpp:977 #, kde-format msgid "Out of memory" msgstr "メモリが足りません" -#: fileaccess.cpp:976 +#: fileaccess.cpp:1013 #, kde-format msgid "Making directory: %1" msgstr "ディレクトリを作成中: %1" -#: fileaccess.cpp:997 +#: fileaccess.cpp:1034 #, kde-format msgid "Removing directory: %1" msgstr "ディレクトリを削除中: %1" -#: fileaccess.cpp:1012 +#: fileaccess.cpp:1049 #, kde-format msgid "Removing file: %1" msgstr "ファイルを削除中: %1" -#: fileaccess.cpp:1028 +#: fileaccess.cpp:1065 #, kde-format msgid "Creating symbolic link: %1 -> %2" msgstr "シンボリックリンクを作成中: %1 -> %2" -#: fileaccess.cpp:1052 +#: fileaccess.cpp:1089 #, kde-format msgid "Renaming file: %1 -> %2" msgstr "ファイル名を変更中: %1 -> %2" -#: fileaccess.cpp:1086 +#: fileaccess.cpp:1123 #, kde-format msgid "Copying file: %1 -> %2" msgstr "ファイルをコピー中: %1 -> %2" -#: fileaccess.cpp:1108 +#: fileaccess.cpp:1145 #, fuzzy, kde-format #| msgid "Reading directory: " msgid "Reading directory: %1" msgstr "ディレクトリを読み込み中: " -#: fileaccess.cpp:1162 +#: fileaccess.cpp:1202 #, kde-format msgid "Listing directory: %1" msgstr "ディレクトリの内容一覧を作成中: %1" -#: kdiff3.cpp:181 +#: kdiff3.cpp:182 #, kde-format msgid "Current Configuration:" msgstr "現在の設定:" -#: kdiff3.cpp:186 +#: kdiff3.cpp:187 #, kde-format msgid "Config Option Error:" msgstr "設定オプションのエラー:" -#: kdiff3.cpp:240 +#: kdiff3.cpp:246 #, kde-format msgid "Option --auto used, but no output file specified." msgstr "" "オプション --auto を使用していますが、出力ファイルが指定されていません。" -#: kdiff3.cpp:416 +#: kdiff3.cpp:405 #, kde-format msgid "Option --auto ignored for directory comparison." msgstr "オプション --auto はディレクトリ比較時には無視されます。" -#: kdiff3.cpp:460 +#: kdiff3.cpp:449 #, kde-format msgid "Saving failed." msgstr "保存に失敗しました。" -#: kdiff3.cpp:496 pdiff.cpp:1098 +#: kdiff3.cpp:494 pdiff.cpp:1096 #, kde-format msgid "Opening of these files failed:" msgstr "以下のファイルを開けませんでした:" -#: kdiff3.cpp:505 +#: kdiff3.cpp:503 pdiff.cpp:1105 #, kde-format -msgid "File Open Error" +msgid "File open error" msgstr "ファイルのオープンエラー" -#: kdiff3.cpp:533 +#: kdiff3.cpp:532 #, kde-format msgid "Opens documents for comparison..." msgstr "比較のために文書を開きます..." -#: kdiff3.cpp:535 +#: kdiff3.cpp:534 #, kde-format msgid "Reload" msgstr "再読み込み" -#: kdiff3.cpp:538 +#: kdiff3.cpp:537 #, kde-format msgid "Saves the merge result. All conflicts must be solved!" msgstr "マージ結果を保存します。すべての衝突を解決しなければなりません。" -#: kdiff3.cpp:540 +#: kdiff3.cpp:539 #, kde-format msgid "Saves the current document as..." msgstr "現在の文書を別名で保存します..." -#: kdiff3.cpp:543 +#: kdiff3.cpp:542 #, kde-format msgid "Print the differences" msgstr "差異を印刷します" -#: kdiff3.cpp:546 +#: kdiff3.cpp:545 #, kde-format msgid "Quits the application" msgstr "アプリケーションを終了します" -#: kdiff3.cpp:549 +#: kdiff3.cpp:548 #, kde-format msgid "Cuts the selected section and puts it to the clipboard" msgstr "選択範囲を切り取り、クリップボードに格納します" -#: kdiff3.cpp:552 +#: kdiff3.cpp:551 #, kde-format msgid "Copies the selected section to the clipboard" msgstr "選択範囲をコピーし、クリップボードに格納します" -#: kdiff3.cpp:554 +#: kdiff3.cpp:553 #, fuzzy, kde-format #| msgid "Pastes the clipboard contents to actual position" msgid "Pastes the clipboard contents to current position" msgstr "クリップボードの内容を現在の位置に貼り付けます" -#: kdiff3.cpp:557 +#: kdiff3.cpp:556 #, kde-format msgid "Select everything in current window" msgstr "現在のウィンドウのすべてを選択します" -#: kdiff3.cpp:560 +#: kdiff3.cpp:559 #, kde-format msgid "Search for a string" msgstr "文字列を検索します" # StatusTip for FindNext -#: kdiff3.cpp:562 +#: kdiff3.cpp:561 #, kde-format msgid "Search again for the string" msgstr "文字列の次のマッチを検索します" -#: kdiff3.cpp:567 +#: kdiff3.cpp:566 #, kde-format msgid "Enables/disables the statusbar" msgstr "ステータスバーの表示/非表示を切り替えます" -#: kdiff3.cpp:571 +#: kdiff3.cpp:570 #, kde-format msgid "Configure KDiff3..." msgstr "KDiff3 を設定..." -#: kdiff3.cpp:590 +#: kdiff3.cpp:589 #, kde-format msgid "Go to Current Delta" msgstr "現在の異なる部分に移動" -#: kdiff3.cpp:590 +#: kdiff3.cpp:589 #, kde-format msgid "" "Current\n" @@ -1187,12 +1192,12 @@ "現在の\n" "異なる部分" -#: kdiff3.cpp:592 +#: kdiff3.cpp:591 #, kde-format msgid "Go to First Delta" msgstr "最初の異なる部分に移動" -#: kdiff3.cpp:592 +#: kdiff3.cpp:591 #, kde-format msgid "" "First\n" @@ -1201,12 +1206,12 @@ "最初の\n" "異なる部分" -#: kdiff3.cpp:594 +#: kdiff3.cpp:593 #, kde-format msgid "Go to Last Delta" msgstr "最後の異なる部分に移動" -#: kdiff3.cpp:594 +#: kdiff3.cpp:593 #, kde-format msgid "" "Last\n" @@ -1215,13 +1220,13 @@ "最後の\n" "異なる部分" -#: kdiff3.cpp:596 +#: kdiff3.cpp:595 #, kde-format msgid "(Skips white space differences when \"Show White Space\" is disabled.)" msgstr "" "(ホワイトスペースの表示が無効なときはホワイトスペースの差異をスキップする)" -#: kdiff3.cpp:597 +#: kdiff3.cpp:596 #, kde-format msgid "" "(Does not skip white space differences even when \"Show White Space\" is " @@ -1229,12 +1234,12 @@ msgstr "" "(ホワイトスペースの表示が無効なときもホワイトスペースの差異をスキップしない)" -#: kdiff3.cpp:598 +#: kdiff3.cpp:597 #, kde-format msgid "Go to Previous Delta" msgstr "前の異なる部分に移動" -#: kdiff3.cpp:598 +#: kdiff3.cpp:597 #, kde-format msgid "" "Prev\n" @@ -1243,12 +1248,12 @@ "前の\n" "異なる部分" -#: kdiff3.cpp:600 +#: kdiff3.cpp:599 #, kde-format msgid "Go to Next Delta" msgstr "次の異なる部分に移動" -#: kdiff3.cpp:600 +#: kdiff3.cpp:599 #, kde-format msgid "" "Next\n" @@ -1257,12 +1262,12 @@ "次の\n" "異なる部分" -#: kdiff3.cpp:602 +#: kdiff3.cpp:601 #, kde-format msgid "Go to Previous Conflict" msgstr "前の衝突に移動" -#: kdiff3.cpp:602 +#: kdiff3.cpp:601 #, kde-format msgid "" "Prev\n" @@ -1271,12 +1276,12 @@ "前の\n" "衝突" -#: kdiff3.cpp:604 +#: kdiff3.cpp:603 #, kde-format msgid "Go to Next Conflict" msgstr "次の衝突に移動" -#: kdiff3.cpp:604 +#: kdiff3.cpp:603 #, kde-format msgid "" "Next\n" @@ -1285,12 +1290,12 @@ "次の\n" "衝突" -#: kdiff3.cpp:606 +#: kdiff3.cpp:605 #, kde-format msgid "Go to Previous Unsolved Conflict" msgstr "前の未解決の衝突に移動" -#: kdiff3.cpp:606 +#: kdiff3.cpp:605 #, kde-format msgid "" "Prev\n" @@ -1299,12 +1304,12 @@ "前の\n" "未解決" -#: kdiff3.cpp:608 +#: kdiff3.cpp:607 #, kde-format msgid "Go to Next Unsolved Conflict" msgstr "次の未解決の衝突に移動" -#: kdiff3.cpp:608 +#: kdiff3.cpp:607 #, kde-format msgid "" "Next\n" @@ -1313,12 +1318,12 @@ "次の\n" "未解決" -#: kdiff3.cpp:610 +#: kdiff3.cpp:609 #, kde-format msgid "Select Line(s) From A" msgstr "A からの選択行" -#: kdiff3.cpp:610 +#: kdiff3.cpp:609 #, kde-format msgid "" "Choose\n" @@ -1327,12 +1332,12 @@ "選択\n" "A" -#: kdiff3.cpp:611 +#: kdiff3.cpp:610 #, kde-format msgid "Select Line(s) From B" msgstr "B からの選択行" -#: kdiff3.cpp:611 +#: kdiff3.cpp:610 #, kde-format msgid "" "Choose\n" @@ -1341,12 +1346,12 @@ "選択\n" "B" -#: kdiff3.cpp:612 +#: kdiff3.cpp:611 #, kde-format msgid "Select Line(s) From C" msgstr "C からの選択行" -#: kdiff3.cpp:612 +#: kdiff3.cpp:611 #, kde-format msgid "" "Choose\n" @@ -1355,25 +1360,25 @@ "選択\n" "C" -#: kdiff3.cpp:613 +#: kdiff3.cpp:612 #, kde-format msgid "Automatically Go to Next Unsolved Conflict After Source Selection" msgstr "ソース選択後に自動的に次の未解決の衝突に移動" -#: kdiff3.cpp:613 +#: kdiff3.cpp:612 #, kde-format msgid "" "Auto\n" "Next" msgstr "自動" -#: kdiff3.cpp:615 +#: kdiff3.cpp:614 #, fuzzy, kde-format #| msgid "Show Space && Tabulator Characters for Differences" msgid "Show Space && Tabulator Characters" msgstr "スペースとタブ文字を表示" -#: kdiff3.cpp:615 +#: kdiff3.cpp:614 #, kde-format msgid "" "White\n" @@ -1382,12 +1387,12 @@ "ホワイト\n" "スペース文字" -#: kdiff3.cpp:616 +#: kdiff3.cpp:615 #, kde-format msgid "Show White Space" msgstr "ホワイトスペースを表示" -#: kdiff3.cpp:616 +#: kdiff3.cpp:615 #, kde-format msgid "" "White\n" @@ -1396,208 +1401,208 @@ "ホワイト\n" "スペース" -#: kdiff3.cpp:618 +#: kdiff3.cpp:617 #, kde-format msgid "Show Line Numbers" msgstr "行番号を表示" -#: kdiff3.cpp:618 +#: kdiff3.cpp:617 #, kde-format msgid "" "Line\n" "Numbers" msgstr "行番号" -#: kdiff3.cpp:620 +#: kdiff3.cpp:619 #, kde-format msgid "Automatically Solve Simple Conflicts" msgstr "単純な衝突を自動的に解決" -#: kdiff3.cpp:621 +#: kdiff3.cpp:620 #, kde-format msgid "Set Deltas to Conflicts" msgstr "異なる部分を衝突として設定" -#: kdiff3.cpp:622 +#: kdiff3.cpp:621 #, kde-format msgid "Run Regular Expression Auto Merge" msgstr "正規表現による自動マージを実行" -#: kdiff3.cpp:623 +#: kdiff3.cpp:622 #, kde-format msgid "Automatically Solve History Conflicts" msgstr "履歴の衝突を自動的に解決" -#: kdiff3.cpp:624 +#: kdiff3.cpp:623 #, kde-format msgid "Split Diff At Selection" msgstr "選択した差異を分離" -#: kdiff3.cpp:625 +#: kdiff3.cpp:624 #, kde-format msgid "Join Selected Diffs" msgstr "選択した差異を結合" -#: kdiff3.cpp:627 +#: kdiff3.cpp:626 #, kde-format msgid "Show Window A" msgstr "ウィンドウ A を表示" -#: kdiff3.cpp:628 +#: kdiff3.cpp:627 #, kde-format msgid "Show Window B" msgstr "ウィンドウ B を表示" -#: kdiff3.cpp:629 +#: kdiff3.cpp:628 #, kde-format msgid "Show Window C" msgstr "ウィンドウ C を表示" -#: kdiff3.cpp:631 +#: kdiff3.cpp:630 #, kde-format msgid "Normal Overview" msgstr "すべて比較 (標準)" -#: kdiff3.cpp:632 +#: kdiff3.cpp:631 #, kde-format msgid "A vs. B Overview" msgstr "A と B を比較" -#: kdiff3.cpp:633 +#: kdiff3.cpp:632 #, kde-format msgid "A vs. C Overview" msgstr "A と C を比較" -#: kdiff3.cpp:634 +#: kdiff3.cpp:633 #, kde-format msgid "B vs. C Overview" msgstr "B と C を比較" -#: kdiff3.cpp:635 +#: kdiff3.cpp:634 #, kde-format msgid "Word Wrap Diff Windows" msgstr "Diff ウィンドウで行を折り返す" -#: kdiff3.cpp:636 +#: kdiff3.cpp:635 #, kde-format msgid "Add Manual Diff Alignment" msgstr "" -#: kdiff3.cpp:637 +#: kdiff3.cpp:636 #, kde-format msgid "Clear All Manual Diff Alignments" msgstr "" -#: kdiff3.cpp:639 +#: kdiff3.cpp:638 #, kde-format msgid "Focus Next Window" msgstr "次のウィンドウにフォーカス" -#: kdiff3.cpp:640 +#: kdiff3.cpp:639 #, kde-format msgid "Focus Prev Window" msgstr "前のウィンドウにフォーカス" -#: kdiff3.cpp:641 +#: kdiff3.cpp:640 #, kde-format msgid "Toggle Split Orientation" msgstr "分割方向を切り替え" -#: kdiff3.cpp:643 +#: kdiff3.cpp:642 #, kde-format msgid "Dir && Text Split Screen View" msgstr "ディレクトリ/テキスト分割画面表示" -#: kdiff3.cpp:645 +#: kdiff3.cpp:644 #, kde-format msgid "Toggle Between Dir && Text View" msgstr "ディレクトリ表示/テキスト表示を切り替え" -#: kdiff3.cpp:697 pdiff.cpp:1909 +#: kdiff3.cpp:696 pdiff.cpp:1919 #, fuzzy, kde-format #| msgid "The merge result hasn't been saved." msgid "The merge result has not been saved." msgstr "マージ結果は保存されていません。" -#: kdiff3.cpp:699 +#: kdiff3.cpp:698 #, kde-format msgid "Save && Quit" msgstr "保存/終了" -#: kdiff3.cpp:700 +#: kdiff3.cpp:699 #, kde-format msgid "Quit Without Saving" msgstr "保存せずに終了" -#: kdiff3.cpp:708 pdiff.cpp:1920 +#: kdiff3.cpp:707 pdiff.cpp:1930 #, kde-format msgid "Saving the merge result failed." msgstr "マージ結果の保存に失敗しました。" -#: kdiff3.cpp:719 pdiff.cpp:1032 +#: kdiff3.cpp:718 pdiff.cpp:1030 #, kde-format msgid "" "You are currently doing a directory merge. Are you sure, you want to abort?" msgstr "ディレクトリマージを実行中です。本当に中止しますか？" -#: kdiff3.cpp:742 +#: kdiff3.cpp:741 #, kde-format msgid "Saving file..." msgstr "ファイルを保存中..." -#: kdiff3.cpp:759 +#: kdiff3.cpp:758 #, kde-format msgid "Saving file with a new filename..." msgstr "名前を付けてファイルを保存中..." -#: kdiff3.cpp:761 +#: kdiff3.cpp:760 #, kde-format msgid "Save As..." msgstr "名前を付けて保存..." -#: kdiff3.cpp:820 +#: kdiff3.cpp:819 #, fuzzy, kde-format #| msgid "Printing completed." msgid "Printing not implemented." msgstr "印刷完了。" -#: kdiff3.cpp:857 +#: kdiff3.cpp:858 #, kde-format msgid "Printing..." msgstr "印刷中..." -#: kdiff3.cpp:943 +#: kdiff3.cpp:948 #, kde-format msgid "Printing page %1 of %2" msgstr "" -#: kdiff3.cpp:1000 +#: kdiff3.cpp:1006 #, fuzzy, kde-format #| msgid "Selection" msgid " (Selection)" msgstr "選択" -#: kdiff3.cpp:1027 +#: kdiff3.cpp:1034 #, kde-format msgid "Printing completed." msgstr "印刷完了。" -#: kdiff3.cpp:1031 +#: kdiff3.cpp:1038 #, kde-format msgid "Printing aborted." msgstr "印刷中止。" -#: kdiff3.cpp:1038 +#: kdiff3.cpp:1045 #, kde-format msgid "Exiting..." msgstr "終了中..." -#: kdiff3.cpp:1049 +#: kdiff3.cpp:1056 #, kde-format msgid "Toggling toolbar..." msgstr "ツールバーの表示/非表示を切り替え中..." -#: kdiff3.cpp:1070 +#: kdiff3.cpp:1077 #, kde-format msgid "Toggle the statusbar..." msgstr "ステータスバーの表示/非表示を切り替え中..." @@ -1623,7 +1628,7 @@ msgid "Joachim Eibl" msgstr "Joachim Eibl" -#: kdiff3_part.cpp:173 kdiff3_part.cpp:254 +#: kdiff3_part.cpp:174 kdiff3_part.cpp:255 #, fuzzy, kde-format #| msgid "Couldn't find files for comparison." msgid "Could not find files for comparison." @@ -1642,7 +1647,7 @@ msgstr "KDiff3 を設定" #. i18n: ectx: ToolBar (mainToolBar) -#: kdiff3_part.rc:16 main.cpp:88 +#: kdiff3_part.rc:16 main.cpp:89 #, kde-format msgid "KDiff3" msgstr "KDiff3" @@ -1718,170 +1723,175 @@ msgid "Main Toolbar" msgstr "メインツールバー" -#: main.cpp:68 main.cpp:72 +#: main.cpp:69 main.cpp:73 #, kde-format msgid "Ignored. (User defined.)" msgstr "" -#: main.cpp:92 +#: main.cpp:93 #, kde-format msgid " (64 bit)" msgstr "" -#: main.cpp:94 +#: main.cpp:95 #, kde-format msgid " (32 bit)" msgstr "" -#: main.cpp:95 +#: main.cpp:96 #, kde-format msgid "Tool for Comparison and Merge of Files and Directories" msgstr "ファイルとディレクトリを比較/マージするためのツール" -#: main.cpp:96 +#: main.cpp:97 #, kde-format msgid "(c) 2002-2014 Joachim Eibl, (c) 2017 Michael Reeves KF5/Qt5 port" msgstr "" -#: main.cpp:112 +#: main.cpp:113 #, kde-format msgid "Merge the input." msgstr "入力をマージ" -#: main.cpp:113 +#: main.cpp:114 #, kde-format msgid "Explicit base file. For compatibility with certain tools." msgstr "明示的にベースファイルを指定 (一部のツールとの互換性のため)" -#: main.cpp:114 +#: main.cpp:115 #, kde-format msgid "Output file. Implies -m. E.g.: -o newfile.txt" msgstr "出力ファイルを指定。暗示的に -m を指定。例: -o newfile.txt" -#: main.cpp:115 +#: main.cpp:116 #, kde-format msgid "Output file, again. (For compatibility with certain tools.)" msgstr "出力ファイルを指定 (一部のツールとの互換性のため)" -#: main.cpp:116 +#: main.cpp:118 #, kde-format msgid "No GUI if all conflicts are auto-solvable. (Needs -o file)" msgstr "すべての衝突を自動解決できる場合は GUI を使用しない (-o file が必要)" -#: main.cpp:117 +#: main.cpp:120 +#, kde-format +msgid "Ignored." +msgstr "" + +#: main.cpp:122 #, fuzzy, kde-format #| msgid "Don't solve conflicts automatically. (For compatibility...)" msgid "Do not solve conflicts automatically." msgstr "衝突を自動解決しない (互換性のため)" -#: main.cpp:118 +#: main.cpp:123 #, kde-format msgid "Visible name replacement for input file 1 (base)." msgstr "入力ファイル 1 (ベース) の代替表示名" -#: main.cpp:119 +#: main.cpp:124 #, kde-format msgid "Visible name replacement for input file 2." msgstr "入力ファイル 2 の代替表示名" -#: main.cpp:120 +#: main.cpp:125 #, kde-format msgid "Visible name replacement for input file 3." msgstr "入力ファイル 3 の代替表示名" -#: main.cpp:121 +#: main.cpp:126 #, kde-format msgid "Alternative visible name replacement. Supply this once for every input." msgstr "代替表示名。一度設定するとすべての入力に適用されます。" -#: main.cpp:122 +#: main.cpp:127 #, kde-format msgid "" "Override a config setting. Use once for every setting. E.g.: --cs " "\"AutoAdvance=1\"" msgstr "" -#: main.cpp:123 +#: main.cpp:128 #, kde-format msgid "Show list of config settings and current values." msgstr "設定項目と現在の値を一覧表示" -#: main.cpp:124 +#: main.cpp:129 #, kde-format msgid "Use a different config file." msgstr "使用する設定ファイルを指定" -#: main.cpp:127 +#: main.cpp:132 #, kde-format msgid "file1 to open (base, if not specified via --base)" msgstr "開く file1 (ベース, --base が未指定の場合)" -#: main.cpp:128 +#: main.cpp:133 #, kde-format msgid "file2 to open" msgstr "開く file2" -#: main.cpp:129 +#: main.cpp:134 #, kde-format msgid "file3 to open" msgstr "開く file3" -#: main.cpp:153 +#: main.cpp:158 #, kde-format msgid "See kdiff3 --help for supported options." msgstr "" -#: mergeresultwindow.cpp:158 +#: mergeresultwindow.cpp:171 #, kde-format msgid "Choose A Everywhere" msgstr "常に A を選択" -#: mergeresultwindow.cpp:159 +#: mergeresultwindow.cpp:172 #, kde-format msgid "Choose B Everywhere" msgstr "常に B を選択" -#: mergeresultwindow.cpp:160 +#: mergeresultwindow.cpp:173 #, kde-format msgid "Choose C Everywhere" msgstr "常に C を選択" -#: mergeresultwindow.cpp:161 +#: mergeresultwindow.cpp:174 #, kde-format msgid "Choose A for All Unsolved Conflicts" msgstr "未解決の衝突について常に A を選択" -#: mergeresultwindow.cpp:162 +#: mergeresultwindow.cpp:175 #, kde-format msgid "Choose B for All Unsolved Conflicts" msgstr "未解決の衝突について常に B を選択" -#: mergeresultwindow.cpp:163 +#: mergeresultwindow.cpp:176 #, kde-format msgid "Choose C for All Unsolved Conflicts" msgstr "未解決の衝突について常に C を選択" -#: mergeresultwindow.cpp:164 +#: mergeresultwindow.cpp:177 #, kde-format msgid "Choose A for All Unsolved Whitespace Conflicts" msgstr "未解決のホワイトスペースの衝突について常に A を選択" -#: mergeresultwindow.cpp:165 +#: mergeresultwindow.cpp:178 #, kde-format msgid "Choose B for All Unsolved Whitespace Conflicts" msgstr "未解決のホワイトスペースの衝突について常に B を選択" -#: mergeresultwindow.cpp:166 +#: mergeresultwindow.cpp:179 #, kde-format msgid "Choose C for All Unsolved Whitespace Conflicts" msgstr "未解決のホワイトスペースの衝突について常に C を選択" -#: mergeresultwindow.cpp:176 +#: mergeresultwindow.cpp:204 #, kde-format msgid "Number of remaining unsolved conflicts: %1 (of which %2 are whitespace)" msgstr "未解決の衝突の数: %1 (内 %2 はホワイトスペース)" -#: mergeresultwindow.cpp:370 +#: mergeresultwindow.cpp:398 #, kde-format msgid "" "The output has been modified.\n" @@ -1890,29 +1900,29 @@ "出力が更新されました。\n" "続行すると更新内容は失われます。" -#: mergeresultwindow.cpp:936 pdiff.cpp:827 +#: mergeresultwindow.cpp:964 pdiff.cpp:817 #, kde-format msgid "All input files are binary equal." msgstr "すべての入力ファイルはバイナリ的に同じです。" -#: mergeresultwindow.cpp:938 +#: mergeresultwindow.cpp:966 #, kde-format msgid "All input files contain the same text." msgstr "すべての入力ファイルのテキストは同じです。" -#: mergeresultwindow.cpp:942 mergeresultwindow.cpp:946 -#: mergeresultwindow.cpp:950 pdiff.cpp:833 pdiff.cpp:837 pdiff.cpp:841 +#: mergeresultwindow.cpp:970 mergeresultwindow.cpp:974 +#: mergeresultwindow.cpp:978 pdiff.cpp:823 pdiff.cpp:827 pdiff.cpp:831 #, kde-format msgid "Files %1 and %2 are binary equal.\n" msgstr "ファイル %1 と %2 はバイナリ的に同じです。\n" -#: mergeresultwindow.cpp:944 mergeresultwindow.cpp:948 -#: mergeresultwindow.cpp:952 +#: mergeresultwindow.cpp:972 mergeresultwindow.cpp:976 +#: mergeresultwindow.cpp:980 #, kde-format msgid "Files %1 and %2 have equal text.\n" msgstr "ファイル %1 と %2 のテキストは同じです。\n" -#: mergeresultwindow.cpp:958 +#: mergeresultwindow.cpp:986 #, kde-format msgid "" "Total number of conflicts: %1\n" @@ -1921,27 +1931,27 @@ "%4" msgstr "" -#: mergeresultwindow.cpp:964 +#: mergeresultwindow.cpp:992 #, kde-format msgid "Conflicts" msgstr "衝突" -#: mergeresultwindow.cpp:1873 +#: mergeresultwindow.cpp:1901 #, kde-format msgid "" msgstr "<ソース行なし>" -#: mergeresultwindow.cpp:1881 +#: mergeresultwindow.cpp:1909 #, kde-format msgid "" msgstr "<マージ衝突 (ホワイトスペースのみ)>" -#: mergeresultwindow.cpp:1883 mergeresultwindow.cpp:2755 +#: mergeresultwindow.cpp:1911 mergeresultwindow.cpp:2783 #, kde-format msgid "" msgstr "<マージ衝突>" -#: mergeresultwindow.cpp:2967 +#: mergeresultwindow.cpp:2995 #, fuzzy, kde-format #| msgid "" #| "Not all conflicts are solved yet.\n" @@ -1953,12 +1963,12 @@ "未解決の衝突がまだ残っています。\n" "ファイルは保存されていません。\n" -#: mergeresultwindow.cpp:2969 mergeresultwindow.cpp:2978 +#: mergeresultwindow.cpp:2997 mergeresultwindow.cpp:3006 #, kde-format msgid "Conflicts Left" msgstr "未解決の衝突があります" -#: mergeresultwindow.cpp:2976 +#: mergeresultwindow.cpp:3004 #, kde-format msgid "" "There is a line end style conflict. Please choose the line end style " @@ -1966,7 +1976,7 @@ "File not saved." msgstr "" -#: mergeresultwindow.cpp:2990 +#: mergeresultwindow.cpp:3018 #, kde-format msgid "" "\n" @@ -1977,59 +1987,59 @@ "\n" "バックアップファイルの作成に失敗しました。ファイルは保存されていません。" -#: mergeresultwindow.cpp:2990 mergeresultwindow.cpp:3038 +#: mergeresultwindow.cpp:3018 mergeresultwindow.cpp:3066 #, kde-format msgid "File Save Error" msgstr "ファイルの保存エラー" -#: mergeresultwindow.cpp:3038 +#: mergeresultwindow.cpp:3066 #, kde-format msgid "Error while writing." msgstr "書き込み中にエラーが発生しました。" -#: mergeresultwindow.cpp:3110 +#: mergeresultwindow.cpp:3138 #, fuzzy, kde-format #| msgid "Output" msgid "Output:" msgstr "出力" -#: mergeresultwindow.cpp:3123 mergeresultwindow.cpp:3315 +#: mergeresultwindow.cpp:3151 mergeresultwindow.cpp:3343 #, kde-format msgid "[Modified]" msgstr "[更新]" -#: mergeresultwindow.cpp:3130 +#: mergeresultwindow.cpp:3158 #, fuzzy, kde-format #| msgid "Encoding for saving" msgid "Encoding for saving:" msgstr "保存時のエンコーディング" -#: mergeresultwindow.cpp:3230 +#: mergeresultwindow.cpp:3258 #, kde-format msgid "Conflict" msgstr "衝突" -#: mergeresultwindow.cpp:3262 +#: mergeresultwindow.cpp:3290 #, kde-format msgid "Codec from A: %1" msgstr "" -#: mergeresultwindow.cpp:3264 +#: mergeresultwindow.cpp:3292 #, kde-format msgid "Codec from B: %1" msgstr "" -#: mergeresultwindow.cpp:3266 +#: mergeresultwindow.cpp:3294 #, kde-format msgid "Codec from C: %1" msgstr "" -#: optiondialog.cpp:119 +#: optiondialog.cpp:121 #, kde-format msgid "Change Font" msgstr "" -#: optiondialog.cpp:135 optiondialog.cpp:145 +#: optiondialog.cpp:137 optiondialog.cpp:147 #, kde-format msgid "" "Font: %1, %2, %3\n" @@ -2037,162 +2047,162 @@ "Example:" msgstr "" -#: optiondialog.cpp:388 +#: optiondialog.cpp:390 #, kde-format msgid "Unicode" msgstr "Unicode" -#: optiondialog.cpp:389 +#: optiondialog.cpp:391 #, kde-format msgid "Latin1" msgstr "Latin1" -#: optiondialog.cpp:408 +#: optiondialog.cpp:410 #, kde-format msgid "Change this if non-ASCII characters are not displayed correctly." msgstr "ASCII 以外の文字が適切に表示されなければ、これを変更してください。" -#: optiondialog.cpp:491 +#: optiondialog.cpp:495 #, kde-format msgid "Configure" msgstr "設定" -#: optiondialog.cpp:568 +#: optiondialog.cpp:573 #, kde-format msgid "Font" msgstr "フォント" -#: optiondialog.cpp:570 +#: optiondialog.cpp:575 #, kde-format msgid "Editor & Diff Output Font" msgstr "エディタ/Diff 出力のフォント" -#: optiondialog.cpp:589 +#: optiondialog.cpp:594 #, kde-format msgid "Application font" msgstr "" -#: optiondialog.cpp:594 +#: optiondialog.cpp:599 #, fuzzy, kde-format #| msgid "File Save Error" msgid "File view font" msgstr "ファイルの保存エラー" -#: optiondialog.cpp:613 +#: optiondialog.cpp:618 #, fuzzy, kde-format #| msgid "Color" msgctxt "Title for color settings page" msgid "Color" msgstr "色" -#: optiondialog.cpp:614 +#: optiondialog.cpp:619 #, kde-format msgid "Colors Settings" msgstr "色の設定" -#: optiondialog.cpp:631 +#: optiondialog.cpp:644 #, kde-format msgid "Editor and Diff Views:" msgstr "エディタ/Diff ビュー:" -#: optiondialog.cpp:639 +#: optiondialog.cpp:652 #, kde-format msgid "Foreground color:" msgstr "前景色:" -#: optiondialog.cpp:647 +#: optiondialog.cpp:660 #, kde-format msgid "Background color:" msgstr "背景色:" -#: optiondialog.cpp:657 +#: optiondialog.cpp:670 #, kde-format msgid "Diff background color:" msgstr "Diff 背景色:" -#: optiondialog.cpp:666 +#: optiondialog.cpp:679 #, kde-format msgid "Color A:" msgstr "色 (A):" -#: optiondialog.cpp:675 +#: optiondialog.cpp:688 #, kde-format msgid "Color B:" msgstr "色 (B):" -#: optiondialog.cpp:684 +#: optiondialog.cpp:697 #, kde-format msgid "Color C:" msgstr "色 (C):" -#: optiondialog.cpp:692 +#: optiondialog.cpp:705 #, kde-format msgid "Conflict color:" msgstr "色 (衝突):" -#: optiondialog.cpp:701 +#: optiondialog.cpp:714 #, kde-format msgid "Current range background color:" msgstr "現在の範囲の背景色:" -#: optiondialog.cpp:710 +#: optiondialog.cpp:723 #, kde-format msgid "Current range diff background color:" msgstr "現在の範囲の diff 背景色:" -#: optiondialog.cpp:718 +#: optiondialog.cpp:731 #, kde-format msgid "Color for manually aligned difference ranges:" msgstr "" -#: optiondialog.cpp:725 +#: optiondialog.cpp:738 #, kde-format msgid "Directory Comparison View:" msgstr "ディレクトリ比較ビュー:" -#: optiondialog.cpp:731 +#: optiondialog.cpp:744 #, kde-format msgid "Newest file color:" msgstr "最も新しいファイルの色:" -#: optiondialog.cpp:736 +#: optiondialog.cpp:749 #, kde-format msgid "" "Changing this color will only be effective when starting the next directory " "comparison." msgstr "色の変更は次回ディレクトリ比較を開始したときに有効になります。" -#: optiondialog.cpp:741 +#: optiondialog.cpp:754 #, kde-format msgid "Oldest file color:" msgstr "最も古いファイルの色:" -#: optiondialog.cpp:750 +#: optiondialog.cpp:763 #, kde-format msgid "Middle age file color:" msgstr "中間のファイルの色:" -#: optiondialog.cpp:759 +#: optiondialog.cpp:772 #, kde-format msgid "Color for missing files:" msgstr "欠落したファイルの色:" -#: optiondialog.cpp:773 +#: optiondialog.cpp:786 #, kde-format msgid "Editor" msgstr "エディタ" -#: optiondialog.cpp:774 +#: optiondialog.cpp:787 #, kde-format msgid "Editor Behavior" msgstr "エディタの挙動" -#: optiondialog.cpp:787 +#: optiondialog.cpp:809 #, kde-format msgid "Tab inserts spaces" msgstr "タブでスペースを挿入する" -#: optiondialog.cpp:791 +#: optiondialog.cpp:813 #, kde-format msgid "" "On: Pressing tab generates the appropriate number of spaces.\n" @@ -2201,27 +2211,27 @@ "オン: タブを押すと適切な数のスペースが挿入されます。\n" "オフ: タブ文字が挿入されます。" -#: optiondialog.cpp:796 +#: optiondialog.cpp:818 #, kde-format msgid "Tab size:" msgstr "タブサイズ:" -#: optiondialog.cpp:803 +#: optiondialog.cpp:825 #, kde-format msgid "Auto indentation" msgstr "自動字下げ" -#: optiondialog.cpp:807 +#: optiondialog.cpp:829 #, kde-format msgid "On: The indentation of the previous line is used for a new line.\n" msgstr "オン: 新しい改行に前の行の字下げを使います。\n" -#: optiondialog.cpp:810 +#: optiondialog.cpp:832 #, kde-format msgid "Auto copy selection" msgstr "選択を自動的にコピーする" -#: optiondialog.cpp:814 +#: optiondialog.cpp:836 #, fuzzy, kde-format #| msgid "" #| "On: Any selection is immediately written to the clipboard.\n" @@ -2233,7 +2243,7 @@ "オン: すべての選択は直ちにクリップボードに格納されます。\n" "オフ: Ctrl+C などで明示的にコピーする必要があります。" -#: optiondialog.cpp:829 +#: optiondialog.cpp:851 #, kde-format msgid "" "Sets the line endings for when an edited file is saved.\n" @@ -2242,12 +2252,12 @@ "編集したファイルの保存時に使用する改行コードを設定します。\n" "DOS/Windows: CR+LF; UNIX: LF; with CR=0D, LF=0A" -#: optiondialog.cpp:839 +#: optiondialog.cpp:861 #, kde-format msgid "Diff" msgstr "Diff" -#: optiondialog.cpp:840 +#: optiondialog.cpp:862 #, kde-format msgid "Diff Settings" msgstr "Diff の設定" @@ -2262,13 +2272,13 @@ #. ); #. ++line; #. -#: optiondialog.cpp:865 +#: optiondialog.cpp:896 #, fuzzy, kde-format #| msgid "Treat as white space." msgid "Ignore numbers (treat as white space)" msgstr "ホワイトスペースとして扱う" -#: optiondialog.cpp:869 +#: optiondialog.cpp:900 #, kde-format msgid "" "Ignore number characters during line matching phase. (Similar to Ignore " @@ -2278,46 +2288,46 @@ "行マッチ時に数字の違いを無視します。(ホワイトスペースの違いを無視に類似)\n" "数字データファイルを比較する際に有効です。" -#: optiondialog.cpp:873 +#: optiondialog.cpp:904 #, fuzzy, kde-format #| msgid "Treat C/C++ comments like white space." msgid "Ignore C/C++ comments (treat as white space)" msgstr "C/C++ コメントをホワイトスペースとして扱います。" -#: optiondialog.cpp:876 +#: optiondialog.cpp:907 #, kde-format msgid "Treat C/C++ comments like white space." msgstr "C/C++ コメントをホワイトスペースとして扱います。" # 「...を無視する」オプションの補足説明として括弧内に表示される -#: optiondialog.cpp:879 +#: optiondialog.cpp:910 #, fuzzy, kde-format #| msgid "Treat as white space." msgid "Ignore case (treat as white space)" msgstr "ホワイトスペースとして扱う" -#: optiondialog.cpp:883 +#: optiondialog.cpp:914 #, kde-format msgid "Treat case differences like white space changes. ('a'<=>'A')" msgstr "" "大文字と小文字の違いをホワイトスペースの違いと同様に扱います。('a'<=>'A')" -#: optiondialog.cpp:886 +#: optiondialog.cpp:917 #, kde-format msgid "Preprocessor command:" msgstr "プリプロセッサコマンド:" -#: optiondialog.cpp:891 +#: optiondialog.cpp:922 #, kde-format msgid "User defined pre-processing. (See the docs for details.)" msgstr "ユーザ定義プリプロセッサ (詳細についてはドキュメントを参照)" -#: optiondialog.cpp:894 +#: optiondialog.cpp:925 #, kde-format msgid "Line-matching preprocessor command:" msgstr "行マッチプリプロセッサコマンド:" -#: optiondialog.cpp:899 +#: optiondialog.cpp:930 #, kde-format msgid "" "This pre-processor is only used during line matching.\n" @@ -2326,12 +2336,12 @@ "このプリプロセッサは行マッチ時にだけ使われます。\n" "(詳細についてはドキュメントを参照)" -#: optiondialog.cpp:902 +#: optiondialog.cpp:933 #, kde-format msgid "Try hard (slower)" msgstr "より小さい差分を見つける (遅い)" -#: optiondialog.cpp:906 +#: optiondialog.cpp:937 #, kde-format msgid "" "Enables the --minimal option for the external diff.\n" @@ -2340,12 +2350,12 @@ "外部 diff コマンドについて --minimal オプションを有効にします。\n" "大きなファイルでは処理速度が非常に遅くなります。" -#: optiondialog.cpp:910 +#: optiondialog.cpp:941 #, kde-format msgid "Align B and C for 3 input files" msgstr "" -#: optiondialog.cpp:914 +#: optiondialog.cpp:945 #, kde-format msgid "" "Try to align B and C when comparing or merging three input files.\n" @@ -2353,17 +2363,24 @@ "(Default is off.)" msgstr "" -#: optiondialog.cpp:926 +#: optiondialog.cpp:956 +#, fuzzy, kde-format +#| msgid "Merge" +msgctxt "Settings page" +msgid "Merge" +msgstr "マージ" + +#: optiondialog.cpp:957 #, kde-format msgid "Merge Settings" msgstr "マージの設定" -#: optiondialog.cpp:940 +#: optiondialog.cpp:980 #, kde-format msgid "Auto advance delay (ms):" msgstr "自動前進の遅延 (ミリ秒):" -#: optiondialog.cpp:946 +#: optiondialog.cpp:986 #, kde-format msgid "" "When in Auto-Advance mode the result of the current selection is shown \n" @@ -2372,27 +2389,27 @@ "自動前進モードでは、指定した時間 (0-2000 ミリ秒) ごとに自動的に次の衝突に移動" "します。" -#: optiondialog.cpp:950 +#: optiondialog.cpp:990 #, kde-format msgid "Show info dialogs" msgstr "情報ダイアログを表示" -#: optiondialog.cpp:953 +#: optiondialog.cpp:993 #, kde-format msgid "Show a dialog with information about the number of conflicts." msgstr "" -#: optiondialog.cpp:956 +#: optiondialog.cpp:996 #, kde-format msgid "White space 2-file merge default:" msgstr "ホワイトスペース 2 ファイルマージのデフォルト:" -#: optiondialog.cpp:961 optiondialog.cpp:974 +#: optiondialog.cpp:1001 optiondialog.cpp:1014 #, kde-format msgid "Manual Choice" msgstr "手作業で選択" -#: optiondialog.cpp:965 optiondialog.cpp:979 +#: optiondialog.cpp:1005 optiondialog.cpp:1019 #, kde-format msgid "" "Allow the merge algorithm to automatically select an input for white-space-" @@ -2401,22 +2418,22 @@ "差異がホワイトスペースのみの場合にマージアルゴリズムが自動的に入力を選択する" "ようにできます。" -#: optiondialog.cpp:969 +#: optiondialog.cpp:1009 #, kde-format msgid "White space 3-file merge default:" msgstr "ホワイトスペース 3 ファイルマージのデフォルト:" -#: optiondialog.cpp:983 +#: optiondialog.cpp:1023 #, kde-format msgid "Automatic Merge Regular Expression" msgstr "自動マージの正規表現" -#: optiondialog.cpp:991 smalldialogs.cpp:449 +#: optiondialog.cpp:1031 smalldialogs.cpp:459 #, kde-format msgid "Auto merge regular expression:" msgstr "自動マージの正規表現:" -#: optiondialog.cpp:996 +#: optiondialog.cpp:1036 #, kde-format msgid "" "Regular expression for lines where KDiff3 should automatically choose one " @@ -2428,29 +2445,29 @@ "正規表現にマッチした行に衝突がある場合、\n" "C があれば C が、C がなければ B が選択されます。" -#: optiondialog.cpp:1002 +#: optiondialog.cpp:1042 #, kde-format msgid "Run regular expression auto merge on merge start" msgstr "マージ開始時に正規表現による自動マージを実行する" -#: optiondialog.cpp:1005 +#: optiondialog.cpp:1045 #, kde-format msgid "" "Run the merge for auto merge regular expressions\n" "immediately when a merge starts.\n" msgstr "マージ開始時に正規表現による自動マージを実行します。\n" -#: optiondialog.cpp:1010 +#: optiondialog.cpp:1050 #, kde-format msgid "Version Control History Merging" msgstr "バージョンコントロール履歴マージ" -#: optiondialog.cpp:1018 smalldialogs.cpp:476 +#: optiondialog.cpp:1058 smalldialogs.cpp:486 #, kde-format msgid "History start regular expression:" msgstr "履歴開始の正規表現:" -#: optiondialog.cpp:1023 +#: optiondialog.cpp:1063 #, kde-format msgid "" "Regular expression for the start of the version control history entry.\n" @@ -2461,12 +2478,12 @@ "通常、開始行には \"$Log$\" キーワードが含まれています。\n" "標準設定の値: \".*\\$Log.*\\$.*\"" -#: optiondialog.cpp:1029 smalldialogs.cpp:504 +#: optiondialog.cpp:1069 smalldialogs.cpp:514 #, kde-format msgid "History entry start regular expression:" msgstr "履歴エントリ開始の正規表現:" -#: optiondialog.cpp:1042 +#: optiondialog.cpp:1082 #, kde-format msgid "" "A version control history entry consists of several lines.\n" @@ -2484,22 +2501,22 @@ "ます。\n" "詳細についてはドキュメントを参照してください。" -#: optiondialog.cpp:1050 +#: optiondialog.cpp:1090 #, kde-format msgid "History merge sorting" msgstr "履歴マージのソート" -#: optiondialog.cpp:1053 +#: optiondialog.cpp:1093 #, kde-format msgid "Sort version control history by a key." msgstr "バージョンコントロール履歴をキーでソートします。" -#: optiondialog.cpp:1063 +#: optiondialog.cpp:1103 #, kde-format msgid "History entry start sort key order:" msgstr "" -#: optiondialog.cpp:1068 +#: optiondialog.cpp:1108 #, kde-format msgid "" "Each pair of parentheses used in the regular expression for the history " @@ -2511,39 +2528,39 @@ "See the documentation for details." msgstr "" -#: optiondialog.cpp:1079 +#: optiondialog.cpp:1119 #, kde-format msgid "Merge version control history on merge start" msgstr "マージ開始時にバージョン履歴をマージする" -#: optiondialog.cpp:1082 +#: optiondialog.cpp:1122 #, kde-format msgid "Run version control history automerge on merge start." msgstr "マージ開始時に自動的にバージョン履歴をマージします。" -#: optiondialog.cpp:1086 +#: optiondialog.cpp:1126 #, kde-format msgid "Max number of history entries:" msgstr "履歴の最大エントリ数:" -#: optiondialog.cpp:1090 +#: optiondialog.cpp:1130 #, kde-format msgid "Cut off after specified number. Use -1 for infinite number of entries." msgstr "" "指定した数以降のエントリは削除されます。数を制限しない場合は -1 に設定してく" "ださい。" -#: optiondialog.cpp:1094 +#: optiondialog.cpp:1134 #, kde-format msgid "Test your regular expressions" msgstr "正規表現をテスト" -#: optiondialog.cpp:1099 +#: optiondialog.cpp:1139 #, kde-format msgid "Irrelevant merge command:" msgstr "" -#: optiondialog.cpp:1104 +#: optiondialog.cpp:1144 #, kde-format msgid "" "If specified this script is run after automerge\n" @@ -2551,12 +2568,12 @@ "Called with the parameters: filename1 filename2 filename3" msgstr "" -#: optiondialog.cpp:1109 +#: optiondialog.cpp:1149 #, kde-format msgid "Auto save and quit on merge without conflicts" msgstr "衝突がなければマージ後に自動的に保存して終了する" -#: optiondialog.cpp:1113 +#: optiondialog.cpp:1153 #, kde-format msgid "" "If KDiff3 was started for a file-merge from the command line and all\n" @@ -2568,27 +2585,27 @@ "すべての衝突が自動解決できるときは、自動的に保存して終了します。\n" "(コマンドラインオプションの --auto に類似)" -#: optiondialog.cpp:1124 optiondialog.cpp:1125 +#: optiondialog.cpp:1164 optiondialog.cpp:1165 #, kde-format msgid "Directory" msgstr "ディレクトリ" -#: optiondialog.cpp:1137 +#: optiondialog.cpp:1185 #, kde-format msgid "Recursive directories" msgstr "ディレクトリを再帰的に解析する" -#: optiondialog.cpp:1140 +#: optiondialog.cpp:1188 #, kde-format msgid "Whether to analyze subdirectories or not." msgstr "サブディレクトリを解析するかどうかを指定します。" -#: optiondialog.cpp:1142 +#: optiondialog.cpp:1190 #, kde-format msgid "File pattern(s):" msgstr "ファイルパターン:" -#: optiondialog.cpp:1148 +#: optiondialog.cpp:1196 #, kde-format msgid "" "Pattern(s) of files to be analyzed. \n" @@ -2599,12 +2616,12 @@ "ワイルドカード: アスタリスク (*) とクエスチョンマーク (?)\n" "複数のパターンを指定する場合はセミコロン (;) で区切ります。" -#: optiondialog.cpp:1153 +#: optiondialog.cpp:1201 #, kde-format msgid "File-anti-pattern(s):" msgstr "ファイル否定パターン:" -#: optiondialog.cpp:1159 +#: optiondialog.cpp:1207 #, kde-format msgid "" "Pattern(s) of files to be excluded from analysis. \n" @@ -2615,12 +2632,12 @@ "ワイルドカード: アスタリスク (*) とクエスチョンマーク (?)\n" "複数のパターンを指定する場合はセミコロン (;) で区切ります。" -#: optiondialog.cpp:1164 +#: optiondialog.cpp:1212 #, kde-format msgid "Dir-anti-pattern(s):" msgstr "ディレクトリ否定パターン:" -#: optiondialog.cpp:1170 +#: optiondialog.cpp:1218 #, kde-format msgid "" "Pattern(s) of directories to be excluded from analysis. \n" @@ -2631,12 +2648,12 @@ "ワイルドカード: アスタリスク (*) とクエスチョンマーク (?)\n" "複数のパターンを指定する場合はセミコロン (;) で区切ります。" -#: optiondialog.cpp:1175 +#: optiondialog.cpp:1223 #, kde-format msgid "Use .cvsignore" msgstr ".cvsignore を使う" -#: optiondialog.cpp:1179 +#: optiondialog.cpp:1227 #, kde-format msgid "" "Extends the antipattern to anything that would be ignored by CVS.\n" @@ -2645,23 +2662,23 @@ "CVS で無視されるすべてについて否定パターンを拡張します。\n" "ローカルの ‘.cvsignore’ ファイルによってディレクトリ固有に利用できます。" -#: optiondialog.cpp:1183 +#: optiondialog.cpp:1231 #, kde-format msgid "Find hidden files and directories" msgstr "隠しファイル/ディレクトリを検索する" -#: optiondialog.cpp:1186 +#: optiondialog.cpp:1234 #, fuzzy, kde-format #| msgid "Find hidden files and directories" msgid "Finds hidden files and directories." msgstr "隠しファイル/ディレクトリを検索する" -#: optiondialog.cpp:1189 +#: optiondialog.cpp:1237 #, kde-format msgid "Follow file links" msgstr "ファイルリンクを追跡する" -#: optiondialog.cpp:1193 +#: optiondialog.cpp:1241 #, kde-format msgid "" "On: Compare the file the link points to.\n" @@ -2670,12 +2687,12 @@ "オン: リンク先のファイルを比較します。\n" "オフ: リンクを比較します。" -#: optiondialog.cpp:1197 +#: optiondialog.cpp:1245 #, kde-format msgid "Follow directory links" msgstr "ディレクトリリンクを追跡" -#: optiondialog.cpp:1201 +#: optiondialog.cpp:1249 #, kde-format msgid "" "On: Compare the directory the link points to.\n" @@ -2684,12 +2701,12 @@ "オン: リンク先のディレクトリを比較します。\n" "オフ: リンクを比較します。" -#: optiondialog.cpp:1210 +#: optiondialog.cpp:1258 #, kde-format msgid "Case sensitive filename comparison" msgstr "大文字と小文字を区別してファイル名を比較する" -#: optiondialog.cpp:1214 +#: optiondialog.cpp:1262 #, kde-format msgid "" "The directory comparison will compare files or directories when their names " @@ -2702,52 +2719,52 @@ "ください。\n" "(Windows の標準はオフ、その他ではオンです)" -#: optiondialog.cpp:1218 +#: optiondialog.cpp:1266 #, fuzzy, kde-format #| msgid "Unfold All Subdirs" msgid "Unfold all subdirectories on load" msgstr "すべてのサブディレクトリを展開" -#: optiondialog.cpp:1222 +#: optiondialog.cpp:1270 #, kde-format msgid "" "On: Unfold all subdirectories when starting a directory diff.\n" "Off: Leave subdirectories folded." msgstr "" -#: optiondialog.cpp:1226 +#: optiondialog.cpp:1274 #, kde-format msgid "Skip directory status report" msgstr "" -#: optiondialog.cpp:1230 +#: optiondialog.cpp:1278 #, kde-format msgid "" "On: Do not show the Directory Comparison Status.\n" "Off: Show the status dialog on start." msgstr "" -#: optiondialog.cpp:1234 +#: optiondialog.cpp:1282 #, kde-format msgid "File Comparison Mode" msgstr "ファイル比較モード" -#: optiondialog.cpp:1239 +#: optiondialog.cpp:1287 #, kde-format msgid "Binary comparison" msgstr "バイナリ比較" -#: optiondialog.cpp:1241 +#: optiondialog.cpp:1289 #, kde-format msgid "Binary comparison of each file. (Default)" msgstr "それぞれのファイルをバイナリ比較します。(標準)" -#: optiondialog.cpp:1244 +#: optiondialog.cpp:1292 #, kde-format msgid "Full analysis" msgstr "完全分析" -#: optiondialog.cpp:1246 +#: optiondialog.cpp:1294 #, kde-format msgid "" "Do a full analysis and show statistics information in extra columns.\n" @@ -2756,12 +2773,12 @@ "完全な比較を実行し、統計情報を別のカラムに表示します。\n" "(バイナリ比較より遅く、バイナリファイルの場合は非常に時間がかかります)" -#: optiondialog.cpp:1250 +#: optiondialog.cpp:1298 #, kde-format msgid "Trust the size and modification date (unsafe)" msgstr "サイズと更新日時を信用する (危険)" -#: optiondialog.cpp:1252 +#: optiondialog.cpp:1300 #, kde-format msgid "" "Assume that files are equal if the modification date and file length are " @@ -2774,14 +2791,14 @@ "内容が同じで更新日時が異なるファイルは、異なるファイルとして示されます。\n" "大きなディレクトリや遅いネットワークで有用です。" -#: optiondialog.cpp:1257 +#: optiondialog.cpp:1305 #, kde-format msgid "" "Trust the size and date, but use binary comparison if date does not match " "(unsafe)" msgstr "サイズと更新日時を信用し、日時が異なる場合はバイナリ比較する (危険)" -#: optiondialog.cpp:1259 +#: optiondialog.cpp:1307 #, kde-format msgid "" "Assume that files are equal if the modification date and file length are " @@ -2793,12 +2810,12 @@ "サイズが同じで日時が異なる場合は、バイナリ比較を行います。\n" "大きなディレクトリや遅いネットワークで有用です。" -#: optiondialog.cpp:1264 +#: optiondialog.cpp:1312 #, kde-format msgid "Trust the size (unsafe)" msgstr "サイズを信用する (危険)" -#: optiondialog.cpp:1266 +#: optiondialog.cpp:1314 #, kde-format msgid "" "Assume that files are equal if their file lengths are equal.\n" @@ -2809,12 +2826,12 @@ "大きなディレクトリやダウンロード中に更新日時が変わってしまうような遅いネット" "ワークで有用です。" -#: optiondialog.cpp:1273 +#: optiondialog.cpp:1321 #, kde-format msgid "Synchronize directories" msgstr "ディレクトリを同期する" -#: optiondialog.cpp:1277 +#: optiondialog.cpp:1325 #, kde-format msgid "" "Offers to store files in both directories so that\n" @@ -2824,12 +2841,12 @@ "両方のディレクトリが同じになるようにファイルを配置します。\n" "方向を指定せずに二つのディレクトリをマージする場合にのみ機能します。" -#: optiondialog.cpp:1283 +#: optiondialog.cpp:1331 #, kde-format msgid "White space differences considered equal" msgstr "ホワイトスペースの違いを無視する" -#: optiondialog.cpp:1287 +#: optiondialog.cpp:1335 #, kde-format msgid "" "If files differ only by white space consider them equal.\n" @@ -2838,12 +2855,12 @@ "ファイルの差異がホワイトスペースだけの場合は等しいものと見なします。\n" "このオプションは完全分析が選択されているときにのみアクティブになります。" -#: optiondialog.cpp:1293 +#: optiondialog.cpp:1341 #, kde-format msgid "Copy newer instead of merging (unsafe)" msgstr "マージではなく、より新しいものをコピー (危険)" -#: optiondialog.cpp:1297 +#: optiondialog.cpp:1345 #, fuzzy, kde-format #| msgid "" #| "Don't look inside, just take the newer file.\n" @@ -2858,12 +2875,12 @@ "(何をしているのか分かっている場合にのみ使用してください)\n" "二つのディレクトリを比較しているときのみ有効です。" -#: optiondialog.cpp:1302 +#: optiondialog.cpp:1350 #, kde-format msgid "Backup files (.orig)" msgstr "バックアップファイル (.orig) を残す" -#: optiondialog.cpp:1306 +#: optiondialog.cpp:1354 #, kde-format msgid "" "If a file would be saved over an old file, then the old file\n" @@ -2871,17 +2888,17 @@ msgstr "" "ファイルを上書き保存する際に、‘.orig’ 拡張子を付けて元のファイルを残します。" -#: optiondialog.cpp:1382 optiondialog.cpp:1383 +#: optiondialog.cpp:1430 optiondialog.cpp:1431 #, kde-format msgid "Regional Settings" msgstr "言語の設定" -#: optiondialog.cpp:1397 +#: optiondialog.cpp:1454 #, kde-format msgid "Use the same encoding for everything:" msgstr "すべてに同じエンコーディングを使う:" -#: optiondialog.cpp:1401 +#: optiondialog.cpp:1458 #, kde-format msgid "" "Enable this allows to change all encodings by changing the first only.\n" @@ -2891,18 +2908,18 @@ "同時に変更できます。\n" "それぞれに個別に設定する必要がある場合は、無効にしてください。" -#: optiondialog.cpp:1405 +#: optiondialog.cpp:1462 #, fuzzy, kde-format #| msgid "Note: Local Encoding is " msgid "Note: Local Encoding is \"%1\"" msgstr "現在のロカールエンコーディング: " -#: optiondialog.cpp:1409 +#: optiondialog.cpp:1466 #, kde-format msgid "File Encoding for A:" msgstr "A のファイルのエンコーディング:" -#: optiondialog.cpp:1416 +#: optiondialog.cpp:1473 #, kde-format msgid "" "If enabled then Unicode (UTF-16 or UTF-8) encoding will be detected.\n" @@ -2915,32 +2932,32 @@ "を使います。\n" "(Unicode 自動検出はファイルの最初の数バイトを調べます)" -#: optiondialog.cpp:1419 optiondialog.cpp:1430 optiondialog.cpp:1441 +#: optiondialog.cpp:1476 optiondialog.cpp:1487 optiondialog.cpp:1498 #, kde-format msgid "Auto Detect Unicode" msgstr "Unicode 自動検出" -#: optiondialog.cpp:1425 +#: optiondialog.cpp:1482 #, kde-format msgid "File Encoding for B:" msgstr "B のファイルのエンコーディング:" -#: optiondialog.cpp:1436 +#: optiondialog.cpp:1493 #, kde-format msgid "File Encoding for C:" msgstr "C のファイルのエンコーディング:" -#: optiondialog.cpp:1447 +#: optiondialog.cpp:1504 #, kde-format msgid "File Encoding for Merge Output and Saving:" msgstr "マージ出力と保存時のエンコーディング:" -#: optiondialog.cpp:1452 +#: optiondialog.cpp:1509 #, kde-format msgid "Auto Select" msgstr "自動選択" -#: optiondialog.cpp:1456 +#: optiondialog.cpp:1513 #, kde-format msgid "" "If enabled then the encoding from the input files is used.\n" @@ -2951,17 +2968,17 @@ "不確かな場合はダイアログが表示され、保存時のエンコーディングを選択するよう促" "されます。" -#: optiondialog.cpp:1459 +#: optiondialog.cpp:1516 #, kde-format msgid "File Encoding for Preprocessor Files:" msgstr "プリプロセッサファイルのエンコーディング:" -#: optiondialog.cpp:1471 +#: optiondialog.cpp:1528 #, kde-format msgid "Right To Left Language" msgstr "右から左に読む言語" -#: optiondialog.cpp:1475 +#: optiondialog.cpp:1532 #, kde-format msgid "" "Some languages are read from right to left.\n" @@ -2970,22 +2987,22 @@ "右から左に読む言語で有効にします。\n" "この設定によってビューアとエディタの表示が変わります。" -#: optiondialog.cpp:1485 +#: optiondialog.cpp:1542 #, kde-format msgid "Integration" msgstr "統合" -#: optiondialog.cpp:1486 +#: optiondialog.cpp:1543 #, kde-format msgid "Integration Settings" msgstr "統合の設定" -#: optiondialog.cpp:1499 +#: optiondialog.cpp:1564 #, kde-format msgid "Command line options to ignore:" msgstr "無視するコマンドラインオプション:" -#: optiondialog.cpp:1505 +#: optiondialog.cpp:1570 #, kde-format msgid "" "List of command line options that should be ignored when KDiff3 is used by " @@ -2998,19 +3015,19 @@ "複数のオプションはセミコロン (;) で区切って指定してください。\n" "これによって \"不明なオプション\" エラーを抑制できます。" -#: optiondialog.cpp:1510 +#: optiondialog.cpp:1575 #, kde-format msgid "Quit also via Escape key" msgstr "" -#: optiondialog.cpp:1514 +#: optiondialog.cpp:1579 #, kde-format msgid "" "Fast method to exit.\n" "For those who are used to using the Escape key." msgstr "" -#: optiondialog.cpp:1598 +#: optiondialog.cpp:1653 #, kde-format msgid "This resets all options. Not only those of the current topic." msgstr "" @@ -3066,79 +3083,70 @@ msgid "Disable Unsafe Options" msgstr "危険なオプションを無効にする" -#: pdiff.cpp:158 +#: pdiff.cpp:160 #, kde-format msgid "Loading A" msgstr "A を読み込み中" -#: pdiff.cpp:167 -#, kde-format -msgid "Errors occurred during pre-processing of file A." -msgstr "" +#: pdiff.cpp:162 +#, fuzzy, kde-format +#| msgid "Loading A" +msgid "Loading A: %1" +msgstr "A を読み込み中" -#: pdiff.cpp:172 +#: pdiff.cpp:170 #, kde-format msgid "Loading B" msgstr "B を読み込み中" -#: pdiff.cpp:179 -#, kde-format -msgid "Errors occurred during pre-processing of file B." -msgstr "" - -#: pdiff.cpp:202 pdiff.cpp:241 +#: pdiff.cpp:201 pdiff.cpp:237 #, kde-format msgid "Diff: A <-> B" msgstr "Diff: A <-> B" -#: pdiff.cpp:208 pdiff.cpp:279 pdiff.cpp:293 +#: pdiff.cpp:207 pdiff.cpp:275 pdiff.cpp:289 #, kde-format msgid "Linediff: A <-> B" msgstr "Linediff: A <-> B" -#: pdiff.cpp:225 +#: pdiff.cpp:224 #, kde-format msgid "Loading C" msgstr "C を読み込み中" -#: pdiff.cpp:232 -#, kde-format -msgid "Errors occurred during pre-processing of file C." -msgstr "" - -#: pdiff.cpp:250 +#: pdiff.cpp:246 #, kde-format msgid "Diff: A <-> C" msgstr "Diff: A <-> C" -#: pdiff.cpp:261 +#: pdiff.cpp:257 #, kde-format msgid "Diff: B <-> C" msgstr "Diff: B <-> C" -#: pdiff.cpp:283 pdiff.cpp:297 +#: pdiff.cpp:279 pdiff.cpp:293 #, kde-format msgid "Linediff: B <-> C" msgstr "Linediff: B <-> C" -#: pdiff.cpp:287 pdiff.cpp:301 +#: pdiff.cpp:283 pdiff.cpp:297 #, kde-format msgid "Linediff: A <-> C" msgstr "Linediff: A <-> C" -#: pdiff.cpp:829 +#: pdiff.cpp:819 #, kde-format msgid "All input files contain the same text, but are not binary equal." msgstr "" "すべての入力ファイルのテキストは同じですが、バイナリ的に等しくありません。" -#: pdiff.cpp:835 pdiff.cpp:839 pdiff.cpp:843 +#: pdiff.cpp:825 pdiff.cpp:829 pdiff.cpp:833 #, kde-format msgid "Files %1 and %2 have equal text, but are not binary equal. \n" msgstr "" "ファイル %1 と %2 のテキストは同じですが、バイナリ的に等しくありません。\n" -#: pdiff.cpp:853 +#: pdiff.cpp:843 #, fuzzy, kde-format #| msgid "" #| "Some inputfiles don't seem to be pure textfiles.\n" @@ -3153,17 +3161,17 @@ "KDiff3 のマージはバイナリデータでの使用を想定していません。\n" "自己責任で続行してください。" -#: pdiff.cpp:863 +#: pdiff.cpp:853 #, kde-format msgid ", B" msgstr "" -#: pdiff.cpp:865 +#: pdiff.cpp:855 #, kde-format msgid ", C" msgstr "" -#: pdiff.cpp:867 +#: pdiff.cpp:857 #, kde-format msgid "" "Some input characters could not be converted to valid unicode.\n" @@ -3172,77 +3180,72 @@ "Affected input files are in %1." msgstr "" -#: pdiff.cpp:1034 +#: pdiff.cpp:1032 #, kde-format msgid "Abort" msgstr "中止" -#: pdiff.cpp:1040 pdiff.cpp:1130 +#: pdiff.cpp:1038 pdiff.cpp:1129 #, kde-format msgid "Opening files..." msgstr "ファイルを開いています..." -#: pdiff.cpp:1107 -#, kde-format -msgid "File open error" -msgstr "ファイルのオープンエラー" - -#: pdiff.cpp:1202 +#: pdiff.cpp:1212 #, kde-format msgid "Cutting selection..." msgstr "選択範囲を切り取り..." -#: pdiff.cpp:1223 +#: pdiff.cpp:1233 #, kde-format msgid "Copying selection to clipboard..." msgstr "選択範囲をクリップボードにコピー..." -#: pdiff.cpp:1239 +#: pdiff.cpp:1249 #, kde-format msgid "Inserting clipboard contents..." msgstr "クリップボードの内容を挿入..." -#: pdiff.cpp:1695 +#: pdiff.cpp:1705 #, kde-format msgid "Word wrap (Cancel disables word wrap)" msgstr "" -#: pdiff.cpp:1696 +#: pdiff.cpp:1706 #, kde-format msgid "Calculating max width for horizontal scrollbar" msgstr "" -#: pdiff.cpp:1911 +#: pdiff.cpp:1921 #, kde-format msgid "Save && Continue" msgstr "保存/続行" -#: pdiff.cpp:1912 +#: pdiff.cpp:1922 #, kde-format msgid "Continue Without Saving" msgstr "保存せずに続行" -#: pdiff.cpp:2124 +#: pdiff.cpp:2134 #, kde-format msgid "Search complete." msgstr "検索が完了しました。" -#: pdiff.cpp:2124 +#: pdiff.cpp:2134 #, kde-format msgid "Search Complete" msgstr "検索完了" -#: pdiff.cpp:2375 +#: pdiff.cpp:2385 #, kde-format msgid "Nothing is selected in either diff input window." msgstr "" -#: pdiff.cpp:2375 +#: pdiff.cpp:2385 #, fuzzy, kde-format msgid "Error while adding manual diff range" msgstr "ディレクトリ作成中にエラー" -#: progress.cpp:59 progress.cpp:71 +#: progress.cpp:61 progress.cpp:73 #, kde-format msgid "&Cancel" msgstr "キャンセル(&C)" @@ -3252,143 +3255,143 @@ msgid "A (Base):" msgstr "A (ベース):" -#: smalldialogs.cpp:68 smalldialogs.cpp:85 smalldialogs.cpp:102 -#: smalldialogs.cpp:144 +#: smalldialogs.cpp:71 smalldialogs.cpp:90 smalldialogs.cpp:109 +#: smalldialogs.cpp:154 #, kde-format msgid "File..." msgstr "ファイル..." -#: smalldialogs.cpp:70 smalldialogs.cpp:87 smalldialogs.cpp:104 -#: smalldialogs.cpp:146 +#: smalldialogs.cpp:73 smalldialogs.cpp:92 smalldialogs.cpp:111 +#: smalldialogs.cpp:156 #, kde-format msgid "Dir..." msgstr "ディレクトリ..." -#: smalldialogs.cpp:96 +#: smalldialogs.cpp:103 #, kde-format msgid "C (Optional):" msgstr "C (オプション):" -#: smalldialogs.cpp:119 +#: smalldialogs.cpp:126 #, fuzzy, kde-format #| msgid "Swap/Copy Names ..." msgid "Swap/Copy Names..." msgstr "名前を交換/コピー..." -#: smalldialogs.cpp:124 smalldialogs.cpp:125 smalldialogs.cpp:126 +#: smalldialogs.cpp:131 smalldialogs.cpp:132 smalldialogs.cpp:133 #, kde-format msgid "Swap %1<->%2" msgstr "交換 %1<->%2" -#: smalldialogs.cpp:127 smalldialogs.cpp:128 smalldialogs.cpp:129 +#: smalldialogs.cpp:134 smalldialogs.cpp:135 smalldialogs.cpp:136 #, kde-format msgid "Copy %1->Output" msgstr "コピー %1->出力" -#: smalldialogs.cpp:130 smalldialogs.cpp:131 smalldialogs.cpp:132 +#: smalldialogs.cpp:137 smalldialogs.cpp:138 smalldialogs.cpp:139 #, kde-format msgid "Swap %1<->Output" msgstr "交換 %1<->出力" -#: smalldialogs.cpp:138 +#: smalldialogs.cpp:148 #, kde-format msgid "Output (optional):" msgstr "出力 (オプション):" -#: smalldialogs.cpp:168 +#: smalldialogs.cpp:178 #, kde-format msgid "Configure..." msgstr "設定..." -#: smalldialogs.cpp:233 +#: smalldialogs.cpp:243 #, fuzzy, kde-format #| msgid "Directory" msgid "Open Directory" msgstr "ディレクトリ" -#: smalldialogs.cpp:234 +#: smalldialogs.cpp:244 #, kde-format msgid "Select Output File" msgstr "" -#: smalldialogs.cpp:393 +#: smalldialogs.cpp:403 #, kde-format msgid "Search text:" msgstr "検索テキスト:" -#: smalldialogs.cpp:400 +#: smalldialogs.cpp:410 #, kde-format msgid "Case sensitive" msgstr "大文字と小文字を区別する" -#: smalldialogs.cpp:403 +#: smalldialogs.cpp:413 #, kde-format msgid "Search A" msgstr "A を検索" -#: smalldialogs.cpp:408 +#: smalldialogs.cpp:418 #, kde-format msgid "Search B" msgstr "B を検索" -#: smalldialogs.cpp:413 +#: smalldialogs.cpp:423 #, kde-format msgid "Search C" msgstr "C を検索" -#: smalldialogs.cpp:418 +#: smalldialogs.cpp:428 #, kde-format msgid "Search output" msgstr "出力を検索" -#: smalldialogs.cpp:425 +#: smalldialogs.cpp:435 #, kde-format msgid "&Search" msgstr "検索(&S)" -#: smalldialogs.cpp:444 +#: smalldialogs.cpp:454 #, kde-format msgid "Regular Expression Tester" msgstr "正規表現テスター" -#: smalldialogs.cpp:457 +#: smalldialogs.cpp:467 #, kde-format msgid "Example auto merge line:" msgstr "自動マージのテスト行:" -#: smalldialogs.cpp:459 +#: smalldialogs.cpp:469 #, kde-format msgid "To test auto merge, copy a line as used in your files." msgstr "自動マージをテストするために、既存のファイルから 1 行コピーします。" -#: smalldialogs.cpp:465 smalldialogs.cpp:493 smalldialogs.cpp:529 +#: smalldialogs.cpp:475 smalldialogs.cpp:503 smalldialogs.cpp:539 #, kde-format msgid "Match result:" msgstr "マッチ結果:" -#: smalldialogs.cpp:484 +#: smalldialogs.cpp:494 #, kde-format msgid "Example history start line (with leading comment):" msgstr "履歴開始行の例 (先行するコメントを含めて):" -#: smalldialogs.cpp:486 +#: smalldialogs.cpp:496 #, kde-format msgid "" "Copy a history start line as used in your files,\n" "including the leading comment." msgstr "履歴の開始行を先行するコメントを含めて既存のファイルからコピーします。" -#: smalldialogs.cpp:512 +#: smalldialogs.cpp:522 #, kde-format msgid "History sort key order:" msgstr "履歴ソートキーの順序:" -#: smalldialogs.cpp:520 +#: smalldialogs.cpp:530 #, kde-format msgid "Example history entry start line (without leading comment):" msgstr "履歴エントリ開始行の例 (先行するコメントを含めずに):" -#: smalldialogs.cpp:522 +#: smalldialogs.cpp:532 #, kde-format msgid "" "Copy a history entry start line as used in your files,\n" @@ -3397,48 +3400,48 @@ "履歴エントリの開始行を先行するコメントを含めずに既存のファイルからコピーしま" "す。" -#: smalldialogs.cpp:536 +#: smalldialogs.cpp:546 #, kde-format msgid "Sort key result:" msgstr "ソートキーの結果:" -#: smalldialogs.cpp:584 smalldialogs.cpp:594 smalldialogs.cpp:614 +#: smalldialogs.cpp:594 smalldialogs.cpp:604 smalldialogs.cpp:624 #, kde-format msgid "Match success." msgstr "マッチ成功" -#: smalldialogs.cpp:588 smalldialogs.cpp:598 smalldialogs.cpp:620 +#: smalldialogs.cpp:598 smalldialogs.cpp:608 smalldialogs.cpp:630 #, kde-format msgid "Match failed." msgstr "マッチ失敗" -#: smalldialogs.cpp:605 +#: smalldialogs.cpp:615 #, kde-format msgid "Opening and closing parentheses do not match in regular expression." msgstr "正規表現中の左右の括弧が一致していません。" -#: SourceData.cpp:150 +#: SourceData.cpp:153 #, kde-format msgid "Writing clipboard data to temp file failed." msgstr "クリップボードのデータを一時ファイルに書き込めませんでした。" -#: SourceData.cpp:154 +#: SourceData.cpp:157 #, kde-format msgid "From Clipboard" msgstr "クリップボードから" -#: SourceData.cpp:335 +#: SourceData.cpp:348 #, fuzzy, kde-format #| msgid "Mix of links and normal files." msgid "%1 is not a normal file." msgstr "リンクと普通のファイルが混在しています。" -#: SourceData.cpp:427 +#: SourceData.cpp:440 #, kde-format msgid " Temp file is: %1" msgstr "" -#: SourceData.cpp:432 +#: SourceData.cpp:445 #, kde-format msgid "" "Preprocessing possibly failed. Check this command:\n" @@ -3448,12 +3451,12 @@ "The preprocessing command will be disabled now." msgstr "" -#: SourceData.cpp:443 SourceData.cpp:512 +#: SourceData.cpp:456 SourceData.cpp:525 #, kde-format msgid "File %1 too large to process. Skipping." msgstr "" -#: SourceData.cpp:487 +#: SourceData.cpp:500 #, kde-format msgid "" "The line-matching-preprocessing possibly failed. Check this command:\n" diff -Nru kdiff3-1.8.01/po/ka/kdiff3.po kdiff3-1.8.3/po/ka/kdiff3.po --- kdiff3-1.8.01/po/ka/kdiff3.po 2019-05-18 01:02:07.000000000 +0000 +++ kdiff3-1.8.3/po/ka/kdiff3.po 2020-06-25 00:18:30.000000000 +0000 @@ -5,8 +5,8 @@ msgid "" msgstr "" "Project-Id-Version: kdiff3\n" -"Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2019-04-18 08:02+0200\n" +"Report-Msgid-Bugs-To: https://bugs.kde.org\n" +"POT-Creation-Date: 2020-06-22 07:48+0200\n" "PO-Revision-Date: 2006-03-28 01:44+0400\n" "Last-Translator: Giasher \n" "Language-Team: \n" @@ -27,293 +27,293 @@ msgid "Your emails" msgstr "" -#: difftextwindow.cpp:412 +#: difftextwindow.cpp:414 #, kde-format msgid "File %1: Line %2" msgstr "" -#: difftextwindow.cpp:414 +#: difftextwindow.cpp:416 #, fuzzy, kde-format #| msgid "not available" msgid "File %1: Line not available" msgstr "ხელმიუწვდომელია" -#: difftextwindow.cpp:1780 +#: difftextwindow.cpp:1778 #, fuzzy, kde-format #| msgid "File Encoding for A:" msgid "Encoding:" msgstr "ფაილის კოდირება A-თვის:" -#: difftextwindow.cpp:1782 mergeresultwindow.cpp:3138 optiondialog.cpp:818 +#: difftextwindow.cpp:1781 mergeresultwindow.cpp:3166 optiondialog.cpp:840 #, kde-format msgid "Line end style:" msgstr "ხაზის დასარულის სტილი:" -#: difftextwindow.cpp:1810 directorymergewindow.cpp:382 -#: directorymergewindow.cpp:433 directorymergewindow.cpp:524 -#: directorymergewindow.cpp:3058 directorymergewindow.cpp:3189 -#: directorymergewindow.cpp:3417 mergeresultwindow.cpp:942 -#: mergeresultwindow.cpp:944 mergeresultwindow.cpp:946 -#: mergeresultwindow.cpp:948 mergeresultwindow.cpp:1814 -#: mergeresultwindow.cpp:3170 mergeresultwindow.cpp:3177 optiondialog.cpp:962 -#: optiondialog.cpp:975 pdiff.cpp:833 pdiff.cpp:835 pdiff.cpp:837 pdiff.cpp:839 -#: pdiff.cpp:861 smalldialogs.cpp:124 smalldialogs.cpp:126 smalldialogs.cpp:127 -#: smalldialogs.cpp:130 +#: difftextwindow.cpp:1809 directorymergewindow.cpp:383 +#: directorymergewindow.cpp:434 directorymergewindow.cpp:525 +#: directorymergewindow.cpp:3072 directorymergewindow.cpp:3203 +#: directorymergewindow.cpp:3431 mergeresultwindow.cpp:970 +#: mergeresultwindow.cpp:972 mergeresultwindow.cpp:974 +#: mergeresultwindow.cpp:976 mergeresultwindow.cpp:1842 +#: mergeresultwindow.cpp:3198 mergeresultwindow.cpp:3205 optiondialog.cpp:1002 +#: optiondialog.cpp:1015 pdiff.cpp:823 pdiff.cpp:825 pdiff.cpp:827 +#: pdiff.cpp:829 pdiff.cpp:851 smalldialogs.cpp:131 smalldialogs.cpp:133 +#: smalldialogs.cpp:134 smalldialogs.cpp:137 #, kde-format msgid "A" msgstr "A" -#: difftextwindow.cpp:1810 directorymergewindow.cpp:384 -#: directorymergewindow.cpp:436 directorymergewindow.cpp:526 -#: directorymergewindow.cpp:3064 directorymergewindow.cpp:3190 -#: directorymergewindow.cpp:3418 mergeresultwindow.cpp:942 -#: mergeresultwindow.cpp:944 mergeresultwindow.cpp:950 -#: mergeresultwindow.cpp:952 mergeresultwindow.cpp:1816 -#: mergeresultwindow.cpp:3172 mergeresultwindow.cpp:3179 optiondialog.cpp:963 -#: optiondialog.cpp:976 pdiff.cpp:833 pdiff.cpp:835 pdiff.cpp:841 pdiff.cpp:843 -#: pdiff.cpp:863 smalldialogs.cpp:124 smalldialogs.cpp:125 smalldialogs.cpp:128 -#: smalldialogs.cpp:131 +#: difftextwindow.cpp:1809 directorymergewindow.cpp:385 +#: directorymergewindow.cpp:437 directorymergewindow.cpp:527 +#: directorymergewindow.cpp:3078 directorymergewindow.cpp:3204 +#: directorymergewindow.cpp:3432 mergeresultwindow.cpp:970 +#: mergeresultwindow.cpp:972 mergeresultwindow.cpp:978 +#: mergeresultwindow.cpp:980 mergeresultwindow.cpp:1844 +#: mergeresultwindow.cpp:3200 mergeresultwindow.cpp:3207 optiondialog.cpp:1003 +#: optiondialog.cpp:1016 pdiff.cpp:823 pdiff.cpp:825 pdiff.cpp:831 +#: pdiff.cpp:833 pdiff.cpp:853 smalldialogs.cpp:131 smalldialogs.cpp:132 +#: smalldialogs.cpp:135 smalldialogs.cpp:138 #, kde-format msgid "B" msgstr "B" -#: difftextwindow.cpp:1810 directorymergewindow.cpp:386 -#: directorymergewindow.cpp:439 directorymergewindow.cpp:528 -#: directorymergewindow.cpp:3070 directorymergewindow.cpp:3191 -#: directorymergewindow.cpp:3419 mergeresultwindow.cpp:946 -#: mergeresultwindow.cpp:948 mergeresultwindow.cpp:950 -#: mergeresultwindow.cpp:952 mergeresultwindow.cpp:1818 -#: mergeresultwindow.cpp:3174 mergeresultwindow.cpp:3181 optiondialog.cpp:977 -#: pdiff.cpp:837 pdiff.cpp:839 pdiff.cpp:841 pdiff.cpp:843 pdiff.cpp:865 -#: smalldialogs.cpp:125 smalldialogs.cpp:126 smalldialogs.cpp:129 -#: smalldialogs.cpp:132 +#: difftextwindow.cpp:1809 directorymergewindow.cpp:387 +#: directorymergewindow.cpp:440 directorymergewindow.cpp:529 +#: directorymergewindow.cpp:3084 directorymergewindow.cpp:3205 +#: directorymergewindow.cpp:3433 mergeresultwindow.cpp:974 +#: mergeresultwindow.cpp:976 mergeresultwindow.cpp:978 +#: mergeresultwindow.cpp:980 mergeresultwindow.cpp:1846 +#: mergeresultwindow.cpp:3202 mergeresultwindow.cpp:3209 optiondialog.cpp:1017 +#: pdiff.cpp:827 pdiff.cpp:829 pdiff.cpp:831 pdiff.cpp:833 pdiff.cpp:855 +#: smalldialogs.cpp:132 smalldialogs.cpp:133 smalldialogs.cpp:136 +#: smalldialogs.cpp:139 #, kde-format msgid "C" msgstr "C" -#: difftextwindow.cpp:1810 +#: difftextwindow.cpp:1809 #, fuzzy, kde-format #| msgid "A (Base):" msgid "A (Base)" msgstr "A (ფუძე):" -#: difftextwindow.cpp:1812 +#: difftextwindow.cpp:1811 #, fuzzy, kde-format #| msgid "File Encoding for A:" msgid "Encoding: %1" msgstr "ფაილის კოდირება A-თვის:" -#: difftextwindow.cpp:1813 mergeresultwindow.cpp:3183 +#: difftextwindow.cpp:1812 mergeresultwindow.cpp:3211 #, kde-format msgid "Unix" msgstr "" -#: difftextwindow.cpp:1813 mergeresultwindow.cpp:3184 +#: difftextwindow.cpp:1812 mergeresultwindow.cpp:3212 #, kde-format msgid "DOS" msgstr "" -#: difftextwindow.cpp:1813 +#: difftextwindow.cpp:1812 #, fuzzy, kde-format #| msgid "Line end style:" msgid "Line end style: %1" msgstr "ხაზის დასარულის სტილი:" -#: difftextwindow.cpp:1835 kdiff3.cpp:873 +#: difftextwindow.cpp:1834 kdiff3.cpp:874 #, fuzzy, kde-format msgid "Top line" msgstr "ზედა ხაზი %1" -#: difftextwindow.cpp:1845 +#: difftextwindow.cpp:1843 #, kde-format msgid "End" msgstr "დასასრული" -#: difftextwindow.cpp:1903 smalldialogs.cpp:235 +#: difftextwindow.cpp:1901 smalldialogs.cpp:245 #, fuzzy, kde-format #| msgid "Opening files..." msgid "Open File" msgstr "ფაილთა გახსნა..." -#: difftextwindow.cpp:1951 optiondialog.cpp:387 +#: difftextwindow.cpp:1943 optiondialog.cpp:389 #, kde-format msgid "Unicode, 8 bit" msgstr "უნიკოდი, 8 bit" -#: difftextwindow.cpp:1966 +#: difftextwindow.cpp:1958 #, kde-format msgid "Other" msgstr "" -#: directorymergewindow.cpp:409 directorymergewindow.cpp:3424 +#: directorymergewindow.cpp:410 directorymergewindow.cpp:3438 #, kde-format msgid "Copy A to B" msgstr "A-ს ასლი B-ში" -#: directorymergewindow.cpp:412 directorymergewindow.cpp:3425 +#: directorymergewindow.cpp:413 directorymergewindow.cpp:3439 #, kde-format msgid "Copy B to A" msgstr "B-ს ასლი A-ში" -#: directorymergewindow.cpp:415 directorymergewindow.cpp:3426 +#: directorymergewindow.cpp:416 directorymergewindow.cpp:3440 #, kde-format msgid "Delete A" msgstr "A-ს წაშლა" -#: directorymergewindow.cpp:418 directorymergewindow.cpp:3427 +#: directorymergewindow.cpp:419 directorymergewindow.cpp:3441 #, kde-format msgid "Delete B" msgstr "B-ს წაშლა" -#: directorymergewindow.cpp:421 +#: directorymergewindow.cpp:422 #, kde-format msgid "Delete A & B" msgstr "A და B-ს წაშლა" -#: directorymergewindow.cpp:424 directorymergewindow.cpp:3429 +#: directorymergewindow.cpp:425 directorymergewindow.cpp:3443 #, kde-format msgid "Merge to A" msgstr "შერწყმა A-სკენ" -#: directorymergewindow.cpp:427 directorymergewindow.cpp:3430 +#: directorymergewindow.cpp:428 directorymergewindow.cpp:3444 #, kde-format msgid "Merge to B" msgstr "შერწყმა B-სკენ" -#: directorymergewindow.cpp:430 +#: directorymergewindow.cpp:431 #, kde-format msgid "Merge to A & B" msgstr "შერწყმა A და B-სკენ" -#: directorymergewindow.cpp:442 directorymergewindow.cpp:3421 +#: directorymergewindow.cpp:443 directorymergewindow.cpp:3435 #, kde-format msgid "Delete (if exists)" msgstr "წაშლა (თუ არსებობს)" -#: directorymergewindow.cpp:445 directorymergewindow.cpp:448 -#: directorymergewindow.cpp:3420 optiondialog.cpp:925 smalldialogs.cpp:113 +#: directorymergewindow.cpp:446 directorymergewindow.cpp:449 +#: directorymergewindow.cpp:3434 smalldialogs.cpp:120 #, kde-format msgid "Merge" msgstr "შერწყმა" -#: directorymergewindow.cpp:445 directorymergewindow.cpp:448 +#: directorymergewindow.cpp:446 directorymergewindow.cpp:449 #, kde-format msgid "Merge (manual)" msgstr "შერწყმა (ხელით)" -#: directorymergewindow.cpp:451 +#: directorymergewindow.cpp:452 #, kde-format msgid "Error: Conflicting File Types" msgstr "შეცდომა: კონფლიქტურ ფაილთა ტიპები" -#: directorymergewindow.cpp:454 +#: directorymergewindow.cpp:455 #, kde-format msgid "Error: Changed and Deleted" msgstr "" -#: directorymergewindow.cpp:457 +#: directorymergewindow.cpp:458 #, kde-format msgid "Error: Dates are equal but files are not." msgstr "შეცდომა: თარიღები იდენტურია, მარა ფაილები არა." -#: directorymergewindow.cpp:471 +#: directorymergewindow.cpp:472 #, fuzzy, kde-format #| msgid "Done." msgid "Done" msgstr "შესრულებულია." -#: directorymergewindow.cpp:473 +#: directorymergewindow.cpp:474 #, fuzzy, kde-format #| msgid "Error." msgid "Error" msgstr "შეცდომა." -#: directorymergewindow.cpp:475 +#: directorymergewindow.cpp:476 #, kde-format msgid "Skipped." msgstr "გაცდენილია." -#: directorymergewindow.cpp:477 +#: directorymergewindow.cpp:478 #, kde-format msgid "Not saved." msgstr "არაა შენახული." -#: directorymergewindow.cpp:479 +#: directorymergewindow.cpp:480 #, kde-format msgid "In progress..." msgstr "მიმდინარეობს..." -#: directorymergewindow.cpp:481 +#: directorymergewindow.cpp:482 #, kde-format msgid "To do." msgstr "გასაკეთებელი." -#: directorymergewindow.cpp:522 +#: directorymergewindow.cpp:523 #, kde-format msgid "Name" msgstr "სახელი" -#: directorymergewindow.cpp:530 +#: directorymergewindow.cpp:531 #, kde-format msgid "Operation" msgstr "ოპერაცია" -#: directorymergewindow.cpp:532 +#: directorymergewindow.cpp:533 #, kde-format msgid "Status" msgstr "სტატუსი" -#: directorymergewindow.cpp:534 +#: directorymergewindow.cpp:535 #, kde-format msgid "Unsolved" msgstr "გადაუჭრელი" -#: directorymergewindow.cpp:536 +#: directorymergewindow.cpp:537 #, kde-format msgid "Solved" msgstr "გადაჭრილი" -#: directorymergewindow.cpp:538 +#: directorymergewindow.cpp:539 #, kde-format msgid "Nonwhite" msgstr "არათეთრი" -#: directorymergewindow.cpp:540 +#: directorymergewindow.cpp:541 #, kde-format msgid "White" msgstr "თეთრი" -#: directorymergewindow.cpp:674 +#: directorymergewindow.cpp:676 #, kde-format msgid "Unable to compare non-normal file with normal file." msgstr "" -#: directorymergewindow.cpp:688 +#: directorymergewindow.cpp:690 #, kde-format msgid "Mix of links and normal files." msgstr "ბმულების და ჩოულებრივი ფაილების ნარევი." -#: directorymergewindow.cpp:695 +#: directorymergewindow.cpp:697 #, kde-format msgid "Link: " msgstr "ბმული: " -#: directorymergewindow.cpp:704 +#: directorymergewindow.cpp:706 #, kde-format msgid "Size. " msgstr "ზომა. " -#: directorymergewindow.cpp:718 directorymergewindow.cpp:728 +#: directorymergewindow.cpp:720 directorymergewindow.cpp:730 #, kde-format msgid "Date & Size: " msgstr "თარიღი და ზომა: " -#: directorymergewindow.cpp:748 +#: directorymergewindow.cpp:751 #, kde-format msgid "Comparing file..." msgstr "ფაილების შედარება..." -#: directorymergewindow.cpp:801 +#: directorymergewindow.cpp:813 #, kde-format msgid "" "You are currently doing a directory merge. Are you sure, you want to abort " @@ -322,48 +322,48 @@ "თქვენ ახლა დირექტორიების შერწყმას ახორციელებთ.დარწმუნებული ხართ რომ გსურთ " "შერწყმის შეწყვეტა და დირექტორიის თავიდან სკანირება?" -#: directorymergewindow.cpp:802 kdiff3.cpp:698 kdiff3.cpp:708 kdiff3.cpp:720 -#: mergeresultwindow.cpp:372 pdiff.cpp:1033 pdiff.cpp:1910 pdiff.cpp:1920 +#: directorymergewindow.cpp:814 kdiff3.cpp:697 kdiff3.cpp:707 kdiff3.cpp:719 +#: mergeresultwindow.cpp:400 pdiff.cpp:1031 pdiff.cpp:1920 pdiff.cpp:1930 #, kde-format msgid "Warning" msgstr "" -#: directorymergewindow.cpp:803 directorymergewindow.cpp:3393 +#: directorymergewindow.cpp:815 directorymergewindow.cpp:3407 #, kde-format msgid "Rescan" msgstr "თავიდან სკანირება" -#: directorymergewindow.cpp:804 pdiff.cpp:1035 +#: directorymergewindow.cpp:816 pdiff.cpp:1033 #, kde-format msgid "Continue Merging" msgstr "შერწყმის გაგრძელება" -#: directorymergewindow.cpp:971 +#: directorymergewindow.cpp:984 #, kde-format msgid "Opening of directories failed:" msgstr "დირექტორიის გახსნა ვერ შედგა:" -#: directorymergewindow.cpp:975 +#: directorymergewindow.cpp:988 #, kde-format msgid "Dir A \"%1\" does not exist or is not a directory.\n" msgstr "Dir A \"%1\" არ არსებობს ან არ არის დირექტორია.\n" -#: directorymergewindow.cpp:980 +#: directorymergewindow.cpp:993 #, kde-format msgid "Dir B \"%1\" does not exist or is not a directory.\n" msgstr "Dir B \"%1\" არ არსებობს ან არ არის დირექტორია.\n" -#: directorymergewindow.cpp:985 +#: directorymergewindow.cpp:998 #, kde-format msgid "Dir C \"%1\" does not exist or is not a directory.\n" msgstr "Dir C \"%1\" არ არსებობს ან არ არის დირექტორია.\n" -#: directorymergewindow.cpp:988 +#: directorymergewindow.cpp:1001 #, kde-format msgid "Directory Open Error" msgstr "დირექტორიის გახსნის შეცდომა" -#: directorymergewindow.cpp:996 +#: directorymergewindow.cpp:1009 #, kde-format msgid "" "The destination directory must not be the same as A or B when three " @@ -374,49 +374,49 @@ "დირექტორიის შერწყმა.\n" "გაგრძელებამდე კიდევ შეამოწმეთ." -#: directorymergewindow.cpp:998 +#: directorymergewindow.cpp:1011 #, kde-format msgid "Parameter Warning" msgstr "გაფრთხილების პარამეტრი" -#: directorymergewindow.cpp:1003 +#: directorymergewindow.cpp:1016 #, kde-format msgid "Scanning directories..." msgstr "დირექტორიების სკანირება..." -#: directorymergewindow.cpp:1029 +#: directorymergewindow.cpp:1042 #, kde-format msgid "Reading Directory A" msgstr "დირექტორია A-ს წაკითხვა" -#: directorymergewindow.cpp:1038 +#: directorymergewindow.cpp:1051 #, kde-format msgid "Reading Directory B" msgstr "დირექტორია B-ს წაკითხვა" -#: directorymergewindow.cpp:1048 +#: directorymergewindow.cpp:1061 #, kde-format msgid "Reading Directory C" msgstr "დირექტორია C-ს წაკითხვა" -#: directorymergewindow.cpp:1064 +#: directorymergewindow.cpp:1077 #, kde-format msgid "Some subdirectories were not readable in" msgstr "ზოგიერთი ქვედირექტორიის წაკითხვა ვერ განხორციელდა" -#: directorymergewindow.cpp:1069 +#: directorymergewindow.cpp:1082 #, kde-format msgid "Check the permissions of the subdirectories." msgstr "ქვედირექტორიების უფლებების შემოწმება." -#: directorymergewindow.cpp:1106 kdiff3.cpp:666 kdiff3.cpp:753 kdiff3.cpp:777 -#: kdiff3.cpp:1065 kdiff3.cpp:1086 pdiff.cpp:1116 pdiff.cpp:1170 pdiff.cpp:1218 -#: pdiff.cpp:1234 pdiff.cpp:1277 pdiff.cpp:1301 +#: directorymergewindow.cpp:1119 kdiff3.cpp:665 kdiff3.cpp:752 kdiff3.cpp:776 +#: kdiff3.cpp:1072 kdiff3.cpp:1093 pdiff.cpp:1115 pdiff.cpp:1178 pdiff.cpp:1228 +#: pdiff.cpp:1244 pdiff.cpp:1287 pdiff.cpp:1311 #, kde-format msgid "Ready." msgstr "მზად." -#: directorymergewindow.cpp:1121 +#: directorymergewindow.cpp:1134 #, kde-format msgid "" "Directory Comparison Status\n" @@ -426,23 +426,23 @@ "Number of different files: %3" msgstr "" -#: directorymergewindow.cpp:1128 +#: directorymergewindow.cpp:1141 #, fuzzy, kde-format #| msgid "Number of manual merges:" msgid "Number of manual merges: %1" msgstr "ხელით შერწყმების რაოდენობა:" -#: directorymergewindow.cpp:1394 +#: directorymergewindow.cpp:1407 #, kde-format msgid "This affects all merge operations." msgstr "ეს მოსდის ყველა შერწყმის ოპერაციას." -#: directorymergewindow.cpp:1395 +#: directorymergewindow.cpp:1408 #, kde-format msgid "Changing All Merge Operations" msgstr "ყველა შერწყმის ოპერაციების შეცვლა" -#: directorymergewindow.cpp:1695 +#: directorymergewindow.cpp:1708 #, fuzzy, kde-format #| msgid "Processing " msgid "" @@ -450,45 +450,45 @@ "%3" msgstr "მიმდინარეობა " -#: directorymergewindow.cpp:1738 directorymergewindow.cpp:1742 +#: directorymergewindow.cpp:1751 directorymergewindow.cpp:1755 #, kde-format msgid "Some files could not be processed." msgstr "" -#: directorymergewindow.cpp:2222 directorymergewindow.cpp:2247 -#: directorymergewindow.cpp:2271 +#: directorymergewindow.cpp:2235 directorymergewindow.cpp:2260 +#: directorymergewindow.cpp:2285 #, kde-format msgid "This operation is currently not possible." msgstr "ეს ოპერაცია ახლა შეუძლებელია." -#: directorymergewindow.cpp:2222 directorymergewindow.cpp:2247 -#: directorymergewindow.cpp:2271 directorymergewindow.cpp:2552 +#: directorymergewindow.cpp:2235 directorymergewindow.cpp:2260 +#: directorymergewindow.cpp:2285 directorymergewindow.cpp:2565 #, kde-format msgid "Operation Not Possible" msgstr "ოპერაცია შეუძლებელია" -#: directorymergewindow.cpp:2318 +#: directorymergewindow.cpp:2332 #, fuzzy, kde-format #| msgid "An error occurred while copying.\n" msgid "An error occurred while copying." msgstr "ასლის გაკეთებისას შეცდომა მოხდა.\n" -#: directorymergewindow.cpp:2319 directorymergewindow.cpp:2759 +#: directorymergewindow.cpp:2333 directorymergewindow.cpp:2772 #, kde-format msgid "Merge Error" msgstr "შერწმის შეცდომა" -#: directorymergewindow.cpp:2396 +#: directorymergewindow.cpp:2410 #, kde-format msgid "Unknown merge operation. (This must never happen!)" msgstr "შერწყმის უცნობი ოპერაცია. (ეს არასდროს არ უნდა მომხდარიყო!)" -#: directorymergewindow.cpp:2441 +#: directorymergewindow.cpp:2455 #, kde-format msgid "Unknown merge operation." msgstr "შერწყმის უცნობი ოპერაცია." -#: directorymergewindow.cpp:2454 +#: directorymergewindow.cpp:2468 #, kde-format msgid "" "The merge is about to begin.\n" @@ -508,22 +508,22 @@ "გაითვალისწინეთ ეს პროგრამა ჯერ კიდევ ბეტაა და არანაერი გარანტია არ არსებობს! " "სასიცოცხლო მნიშვნელობის მონაცემების სარეზერვო ასლები გააკეთეთ!" -#: directorymergewindow.cpp:2459 +#: directorymergewindow.cpp:2473 #, kde-format msgid "Starting Merge" msgstr "შერწყმის დაწყება" -#: directorymergewindow.cpp:2460 +#: directorymergewindow.cpp:2474 #, kde-format msgid "Do It" msgstr "გააკეთე" -#: directorymergewindow.cpp:2461 +#: directorymergewindow.cpp:2475 #, kde-format msgid "Simulate It" msgstr "სიმულაცია" -#: directorymergewindow.cpp:2487 +#: directorymergewindow.cpp:2501 #, kde-format msgid "" "The highlighted item has a different type in the different directories. " @@ -531,7 +531,7 @@ msgstr "" "მარკირებული ელემენტი სხვადასხვა დირექტორიებში სხვადასხვაა. აირჩიეთ რა ქნათ." -#: directorymergewindow.cpp:2491 +#: directorymergewindow.cpp:2505 #, kde-format msgid "" "The modification dates of the file are equal but the files are not. Select " @@ -539,7 +539,7 @@ msgstr "" "ფაილის მოდიფიკაციის თარიღები იდენტურია მარა ფაილები არა. აირჩიეთ რა გააკეთოთ." -#: directorymergewindow.cpp:2495 +#: directorymergewindow.cpp:2509 #, fuzzy, kde-format #| msgid "" #| "The highlighted item has a different type in the different directories. " @@ -550,7 +550,7 @@ msgstr "" "მარკირებული ელემენტი სხვადასხვა დირექტორიებში სხვადასხვაა. აირჩიეთ რა ქნათ." -#: directorymergewindow.cpp:2552 +#: directorymergewindow.cpp:2565 #, kde-format msgid "" "This operation is currently not possible because directory merge is " @@ -558,7 +558,7 @@ msgstr "" "ოპერაცია ახლა შეუძლებელია, რადგან დირექტორიათა შერწყმა უკვე გაშვებულია." -#: directorymergewindow.cpp:2609 +#: directorymergewindow.cpp:2622 #, kde-format msgid "" "There was an error in the last step.\n" @@ -569,32 +569,32 @@ "გსურთ ამ ელემენტით გაგრძელება, რომლის გამოც გდება შეცდომა, თუ გსურთ " "გადაახტეთ მას?" -#: directorymergewindow.cpp:2611 +#: directorymergewindow.cpp:2624 #, kde-format msgid "Continue merge after an error" msgstr "შეცდომის შემდეგ შერწმის გაგრძელება" -#: directorymergewindow.cpp:2612 +#: directorymergewindow.cpp:2625 #, kde-format msgid "Continue With Last Item" msgstr "უკანასკნელი ელემენტით გაგრძელება" -#: directorymergewindow.cpp:2613 +#: directorymergewindow.cpp:2626 #, kde-format msgid "Skip Item" msgstr "ელემენტის გაცდენა" -#: directorymergewindow.cpp:2709 +#: directorymergewindow.cpp:2722 #, kde-format msgid "Merge operation complete." msgstr "შერწყმის ოპერაცია დასრულდა." -#: directorymergewindow.cpp:2709 directorymergewindow.cpp:2712 +#: directorymergewindow.cpp:2722 directorymergewindow.cpp:2725 #, kde-format msgid "Merge Complete" msgstr "შერწყმა დასრულდა" -#: directorymergewindow.cpp:2722 +#: directorymergewindow.cpp:2735 #, kde-format msgid "" "Simulated merge complete: Check if you agree with the proposed operations." @@ -602,48 +602,48 @@ "შერწყმის სიმულაცია დასრულდა: შეამოწმეთ თუ ეთანხმებით შემოთავაზებულ " "ოპერაციებს." -#: directorymergewindow.cpp:2758 +#: directorymergewindow.cpp:2771 #, fuzzy, kde-format #| msgid "An error occurred. Press OK to see detailed information.\n" msgid "An error occurred. Press OK to see detailed information." msgstr "შეცდომა მოხდა. დააწკაპუნეთ OK დეტალური ცნობების სანახავად.\n" -#: directorymergewindow.cpp:2791 +#: directorymergewindow.cpp:2804 #, kde-format msgid "Error: While deleting %1: Creating backup failed." msgstr "შეცდომა: %1-ს წასლის დროს: სარეზერვო ასლის შექმნა ვერ შედგა." -#: directorymergewindow.cpp:2798 +#: directorymergewindow.cpp:2811 #, kde-format msgid "delete directory recursively( %1 )" msgstr "დირექტორიის რეკურსიულად წაშლა( %1 )" -#: directorymergewindow.cpp:2800 +#: directorymergewindow.cpp:2813 #, kde-format msgid "delete( %1 )" msgstr "წაშლა( %1 )" -#: directorymergewindow.cpp:2815 +#: directorymergewindow.cpp:2828 #, kde-format msgid "Error: delete dir operation failed while trying to read the directory." msgstr "შეცდომა: დირექტორიის წაშლის ოპერაცია ვერ შედგა წაკითხვის მცდელობისას." -#: directorymergewindow.cpp:2834 +#: directorymergewindow.cpp:2847 #, kde-format msgid "Error: rmdir( %1 ) operation failed." msgstr "შეცდომა: rmdir( %1 ) ოპერაცია ვერ შედგა." -#: directorymergewindow.cpp:2844 +#: directorymergewindow.cpp:2857 #, kde-format msgid "Error: delete operation failed." msgstr "შეცდომა: წაშლის ოპპერაცია ვერ შედგა." -#: directorymergewindow.cpp:2870 +#: directorymergewindow.cpp:2884 #, kde-format msgid "manual merge( %1, %2, %3 -> %4)" msgstr "ხელით შერწყმა( %1, %2, %3 -> %4)" -#: directorymergewindow.cpp:2873 +#: directorymergewindow.cpp:2887 #, kde-format msgid "" " Note: After a manual merge the user should continue by pressing F7." @@ -651,185 +651,185 @@ " გაითვალისწინეთ: ხელით შერწყმის შემდეგ მომხმარებელმა უნდა გააგრძელოს F7-" "ის დაჭერით." -#: directorymergewindow.cpp:2900 +#: directorymergewindow.cpp:2914 #, kde-format msgid "Error: copy( %1 -> %2 ) failed.Deleting existing destination failed." msgstr "" "შეცდომა: ასლი( %1 -> %2 ) ვერ შედგა.არსებული დანიშნულების ფაილის წაშლა ვერ " "შედგა." -#: directorymergewindow.cpp:2909 +#: directorymergewindow.cpp:2923 #, kde-format msgid "copyLink( %1 -> %2 )" msgstr "copyLink( %1 -> %2 )" -#: directorymergewindow.cpp:2918 +#: directorymergewindow.cpp:2932 #, kde-format msgid "Error: copyLink failed: Remote links are not yet supported." msgstr "" "შეცდომა copyLink ვერ შედგა: დაშორებული ბმულები ჯერ არ არის მხარდაჭერილი." -#: directorymergewindow.cpp:2928 +#: directorymergewindow.cpp:2942 #, kde-format msgid "Error: copyLink failed." msgstr "შეცდომა: copyLink ვერ შედგა." -#: directorymergewindow.cpp:2953 +#: directorymergewindow.cpp:2967 #, kde-format msgid "copy( %1 -> %2 )" msgstr "ასლი( %1 -> %2 )" -#: directorymergewindow.cpp:2979 +#: directorymergewindow.cpp:2993 #, kde-format msgid "Error during rename( %1 -> %2 ): Cannot delete existing destination." msgstr "" "შეცდომა სახელის გადარქმევისას( %1 -> %2 ): არსებული დანიშნულების წაშლა " "შეუძლებელია." -#: directorymergewindow.cpp:2986 +#: directorymergewindow.cpp:3000 #, kde-format msgid "rename( %1 -> %2 )" msgstr "rename( %1 -> %2 )" -#: directorymergewindow.cpp:2995 +#: directorymergewindow.cpp:3009 #, kde-format msgid "Error: Rename failed." msgstr "შეცდომა: სახელის გადარქმევა ვერ შედგა." -#: directorymergewindow.cpp:3013 +#: directorymergewindow.cpp:3027 #, kde-format msgid "Error during makeDir of %1. Cannot delete existing file." msgstr "შეცდომა %1-ს makeDir-ის დროს. არსებული ფაილის წაშლა შეუძლებელია," -#: directorymergewindow.cpp:3030 +#: directorymergewindow.cpp:3044 #, kde-format msgid "makeDir( %1 )" msgstr "makeDir( %1 )" -#: directorymergewindow.cpp:3040 +#: directorymergewindow.cpp:3054 #, kde-format msgid "Error while creating directory." msgstr "დირექტორიის შექმნისას შეცდომა." -#: directorymergewindow.cpp:3076 directorymergewindow.cpp:3195 +#: directorymergewindow.cpp:3090 directorymergewindow.cpp:3209 #, kde-format msgid "Dest" msgstr "Dest" -#: directorymergewindow.cpp:3084 directorymergewindow.cpp:3113 +#: directorymergewindow.cpp:3098 directorymergewindow.cpp:3127 #, kde-format msgid "Dir" msgstr "Dir" -#: directorymergewindow.cpp:3084 +#: directorymergewindow.cpp:3098 #, kde-format msgid "Type" msgstr "ტიპი" -#: directorymergewindow.cpp:3084 +#: directorymergewindow.cpp:3098 #, kde-format msgid "Size" msgstr "ზომა" -#: directorymergewindow.cpp:3085 +#: directorymergewindow.cpp:3099 #, kde-format msgid "Attr" msgstr "Attr" -#: directorymergewindow.cpp:3085 +#: directorymergewindow.cpp:3099 #, kde-format msgid "Last Modification" msgstr "უკანასკნელად ჩასწორებულია" -#: directorymergewindow.cpp:3085 +#: directorymergewindow.cpp:3099 #, kde-format msgid "Link-Destination" msgstr "ბმულის დანიშნულება" -#: directorymergewindow.cpp:3113 +#: directorymergewindow.cpp:3127 #, fuzzy, kde-format #| msgid "File..." msgid "File" msgstr "ფაილი..." -#: directorymergewindow.cpp:3113 +#: directorymergewindow.cpp:3127 #, fuzzy, kde-format #| msgid "Link: " msgid "-Link" msgstr "ბმული: " -#: directorymergewindow.cpp:3119 +#: directorymergewindow.cpp:3133 #, kde-format msgid "not available" msgstr "ხელმიუწვდომელია" -#: directorymergewindow.cpp:3137 +#: directorymergewindow.cpp:3151 #, kde-format msgid "A (Dest): " msgstr "A (Dest): " -#: directorymergewindow.cpp:3141 +#: directorymergewindow.cpp:3155 #, kde-format msgid "A: " msgstr "" -#: directorymergewindow.cpp:3141 +#: directorymergewindow.cpp:3155 #, kde-format msgid "A (Base): " msgstr "A (ფუძე): " -#: directorymergewindow.cpp:3147 +#: directorymergewindow.cpp:3161 #, kde-format msgid "B (Dest): " msgstr "B (Dest): " -#: directorymergewindow.cpp:3151 +#: directorymergewindow.cpp:3165 #, kde-format msgid "B: " msgstr "" -#: directorymergewindow.cpp:3156 +#: directorymergewindow.cpp:3170 #, kde-format msgid "C (Dest): " msgstr "C (Dest): " -#: directorymergewindow.cpp:3160 +#: directorymergewindow.cpp:3174 #, kde-format msgid "C: " msgstr "" -#: directorymergewindow.cpp:3163 +#: directorymergewindow.cpp:3177 #, kde-format msgid "Dest: " msgstr "Dest:" #. i18n("Saving Directory Merge State ...")); -#: directorymergewindow.cpp:3238 +#: directorymergewindow.cpp:3252 #, fuzzy, kde-format msgid "Save Directory Merge State As..." msgstr "დირექტორიათა შერწყმა" -#: directorymergewindow.cpp:3387 +#: directorymergewindow.cpp:3401 #, kde-format msgid "Start/Continue Directory Merge" msgstr "დირექტორიის შერწყმის დაწყება/გაგრძელება" -#: directorymergewindow.cpp:3388 +#: directorymergewindow.cpp:3402 #, kde-format msgid "Run Operation for Current Item" msgstr "მიმდინარე ელემენტიდან ოპერაციის გაშვება" -#: directorymergewindow.cpp:3389 +#: directorymergewindow.cpp:3403 #, kde-format msgid "Compare Selected File" msgstr "მონიშნული ფაილების შედარება" -#: directorymergewindow.cpp:3390 +#: directorymergewindow.cpp:3404 #, kde-format msgid "Merge Current File" msgstr "მიმდინარე ფაილის შერწყმა" -#: directorymergewindow.cpp:3390 +#: directorymergewindow.cpp:3404 #, fuzzy, kde-format #| msgid "Merge" msgid "" @@ -837,147 +837,152 @@ "File" msgstr "შერწყმა" -#: directorymergewindow.cpp:3391 +#: directorymergewindow.cpp:3405 #, kde-format msgid "Fold All Subdirs" msgstr "ყველა ქვედირექტორიის ჩაკეცვა" -#: directorymergewindow.cpp:3392 +#: directorymergewindow.cpp:3406 #, kde-format msgid "Unfold All Subdirs" msgstr "ყველა ქვედირექტორიის არჩაკეცვა" #. i18n("Save Directory Merge State ..."), 0, this, &DirectoryMergeWindow::slotSaveMergeState, ac, "dir_save_merge_state"); #. i18n("Load Directory Merge State ..."), 0, this, &DirectoryMergeWindow::slotLoadMergeState, ac, "dir_load_merge_state"); -#: directorymergewindow.cpp:3396 +#: directorymergewindow.cpp:3410 #, kde-format msgid "Choose A for All Items" msgstr "A -თვის ყველა ელემენტების არჩევა" -#: directorymergewindow.cpp:3397 +#: directorymergewindow.cpp:3411 #, kde-format msgid "Choose B for All Items" msgstr "B -თვის ყველა ელემენტების არჩევა" -#: directorymergewindow.cpp:3398 +#: directorymergewindow.cpp:3412 #, kde-format msgid "Choose C for All Items" msgstr "C -თვის ყველა ელემენტების არჩევა" -#: directorymergewindow.cpp:3399 +#: directorymergewindow.cpp:3413 #, kde-format msgid "Auto-Choose Operation for All Items" msgstr "ყველა ელემენტების ოპერაციების ავტო-არჩევა" -#: directorymergewindow.cpp:3400 +#: directorymergewindow.cpp:3414 #, kde-format msgid "No Operation for All Items" msgstr "ყველა ელემენტისთვის არავითარი ოპერაცია" #. i18n("Synchronize Directories"), 0, this, &DirectoryMergeWindow::slotSynchronizeDirectories, ac, "dir_synchronize_directories"); #. d->m_pDirChooseNewerFiles = GuiUtils::createAction< KToggleAction >(i18n("Copy Newer Files Instead of Merging"), 0, this, &DirectoryMergeWindow::slotChooseNewerFiles, ac, "dir_choose_newer_files"); -#: directorymergewindow.cpp:3405 +#: directorymergewindow.cpp:3419 #, kde-format msgid "Show Identical Files" msgstr "" -#: directorymergewindow.cpp:3405 +#: directorymergewindow.cpp:3419 #, kde-format msgid "" "Identical\n" "Files" msgstr "" -#: directorymergewindow.cpp:3406 +#: directorymergewindow.cpp:3420 #, fuzzy, kde-format msgid "Show Different Files" msgstr "განსხვავებული ფაილების რაოდენობა:" -#: directorymergewindow.cpp:3407 +#: directorymergewindow.cpp:3421 #, kde-format msgid "Show Files only in A" msgstr "" -#: directorymergewindow.cpp:3407 +#: directorymergewindow.cpp:3421 #, kde-format msgid "" "Files\n" "only in A" msgstr "" -#: directorymergewindow.cpp:3408 +#: directorymergewindow.cpp:3422 #, kde-format msgid "Show Files only in B" msgstr "" -#: directorymergewindow.cpp:3408 +#: directorymergewindow.cpp:3422 #, kde-format msgid "" "Files\n" "only in B" msgstr "" -#: directorymergewindow.cpp:3409 +#: directorymergewindow.cpp:3423 #, kde-format msgid "Show Files only in C" msgstr "" -#: directorymergewindow.cpp:3409 +#: directorymergewindow.cpp:3423 #, kde-format msgid "" "Files\n" "only in C" msgstr "" -#: directorymergewindow.cpp:3413 +#: directorymergewindow.cpp:3427 #, fuzzy, kde-format msgid "Compare Explicitly Selected Files" msgstr "მონიშნული ფაილების შედარება" -#: directorymergewindow.cpp:3414 +#: directorymergewindow.cpp:3428 #, fuzzy, kde-format msgid "Merge Explicitly Selected Files" msgstr "მონიშნული ფაილების შედარება" -#: directorymergewindow.cpp:3416 directorymergewindow.cpp:3423 +#: directorymergewindow.cpp:3430 directorymergewindow.cpp:3437 #, kde-format msgid "Do Nothing" msgstr "არაფრის არ გაკეთება" -#: directorymergewindow.cpp:3428 +#: directorymergewindow.cpp:3442 #, kde-format msgid "Delete A && B" msgstr "A და B წაშლა" -#: directorymergewindow.cpp:3431 +#: directorymergewindow.cpp:3445 #, kde-format msgid "Merge to A && B" msgstr "შერწყმა A და B-სკენ" -#: fileaccess.cpp:462 SourceData.cpp:493 +#: fileaccess.cpp:301 +#, kde-format +msgid "Unable to determine full url. No parent specified." +msgstr "" + +#: fileaccess.cpp:482 SourceData.cpp:506 #, fuzzy, kde-format #| msgid "Reading file: %1" msgid "Failed to read file: %1" msgstr "ფაილის წაკითხვა: %1" -#: fileaccess.cpp:587 +#: fileaccess.cpp:624 #, kde-format msgid "Creating temp copy of %1 failed." msgstr "%1-ს დროებითი ასლის შექმნა ვერ შედგა." -#: fileaccess.cpp:595 fileaccess.cpp:600 +#: fileaccess.cpp:632 fileaccess.cpp:637 #, fuzzy, kde-format #| msgid "Opening %1 failed." msgid "Opening %1 failed. %2" msgstr "%1-ს გახსნა ვერ შედგა." -#: fileaccess.cpp:619 fileaccess.cpp:627 +#: fileaccess.cpp:656 fileaccess.cpp:664 #, fuzzy, kde-format #| msgid "Error reading from %1" msgid "Error reading from %1. %2" msgstr "%1-ს წაკითხვის შეცდომა" -#: fileaccess.cpp:751 +#: fileaccess.cpp:788 #, fuzzy, kde-format #| msgid "" #| "While trying to make a backup, deleting an older backup failed. \n" @@ -990,7 +995,7 @@ "შედგა. \n" "ფაილის სახელი: " -#: fileaccess.cpp:758 +#: fileaccess.cpp:795 #, fuzzy, kde-format #| msgid "" #| "While trying to make a backup, renaming failed. \n" @@ -1002,181 +1007,181 @@ "სარეზერვო ასლის გაკეთების მცდელობისას, სახელის გადარქმევა ვერ შედგა. \n" "ფაილის სახელები: " -#: fileaccess.cpp:828 +#: fileaccess.cpp:865 #, kde-format msgid "Getting file status: %1" msgstr "ფაილის მდგომარეობის მიღება: %1" -#: fileaccess.cpp:869 +#: fileaccess.cpp:906 #, kde-format msgid "Reading file: %1" msgstr "ფაილის წაკითხვა: %1" -#: fileaccess.cpp:907 +#: fileaccess.cpp:944 #, kde-format msgid "Writing file: %1" msgstr "ფაილის ჩაწერა: %1" -#: fileaccess.cpp:940 +#: fileaccess.cpp:977 #, kde-format msgid "Out of memory" msgstr "მეხსიერება არაა საკმარისი" -#: fileaccess.cpp:976 +#: fileaccess.cpp:1013 #, kde-format msgid "Making directory: %1" msgstr "დირექტორიის შექმნა: %1" -#: fileaccess.cpp:997 +#: fileaccess.cpp:1034 #, kde-format msgid "Removing directory: %1" msgstr "დირექტორიის წაშლა: %1" -#: fileaccess.cpp:1012 +#: fileaccess.cpp:1049 #, kde-format msgid "Removing file: %1" msgstr "ფაილის წაშლა: %1" -#: fileaccess.cpp:1028 +#: fileaccess.cpp:1065 #, kde-format msgid "Creating symbolic link: %1 -> %2" msgstr "სიმბოლური ბმულის შექმნა: %1 -> %2" -#: fileaccess.cpp:1052 +#: fileaccess.cpp:1089 #, kde-format msgid "Renaming file: %1 -> %2" msgstr "ფაილის სახელის გადარქმევა: %1 -> %2" -#: fileaccess.cpp:1086 +#: fileaccess.cpp:1123 #, kde-format msgid "Copying file: %1 -> %2" msgstr "ფაილის ასლი: %1 -> %2" -#: fileaccess.cpp:1108 +#: fileaccess.cpp:1145 #, fuzzy, kde-format #| msgid "Reading directory: " msgid "Reading directory: %1" msgstr "დირექტორიის წაკითხვა:" -#: fileaccess.cpp:1162 +#: fileaccess.cpp:1202 #, kde-format msgid "Listing directory: %1" msgstr "დირექტორიის სია: %1" -#: kdiff3.cpp:181 +#: kdiff3.cpp:182 #, fuzzy, kde-format msgid "Current Configuration:" msgstr "მიმდინარე ელემენტის სინქრონიზაციის ოპერაცია" -#: kdiff3.cpp:186 +#: kdiff3.cpp:187 #, fuzzy, kde-format msgid "Config Option Error:" msgstr "ფაილის გახსნის შეცდომა" -#: kdiff3.cpp:240 +#: kdiff3.cpp:246 #, kde-format msgid "Option --auto used, but no output file specified." msgstr "" "პარამეტრი --auto გამოყენებულია, მაგრამ გამონატანი ფაილი არაა მითითებული." -#: kdiff3.cpp:416 +#: kdiff3.cpp:405 #, kde-format msgid "Option --auto ignored for directory comparison." msgstr "პარამეტრი --auto დირექტორიების შედარებისთვის იგნორირებულია." -#: kdiff3.cpp:460 +#: kdiff3.cpp:449 #, kde-format msgid "Saving failed." msgstr "შენახვა ვერ შედგა." -#: kdiff3.cpp:496 pdiff.cpp:1098 +#: kdiff3.cpp:494 pdiff.cpp:1096 #, kde-format msgid "Opening of these files failed:" msgstr "ამ ფაილების გახსნა ვერ შედგა:" -#: kdiff3.cpp:505 +#: kdiff3.cpp:503 pdiff.cpp:1105 #, kde-format -msgid "File Open Error" +msgid "File open error" msgstr "ფაილის გახსნის შეცდომა" -#: kdiff3.cpp:533 +#: kdiff3.cpp:532 #, kde-format msgid "Opens documents for comparison..." msgstr "ხსნის დოკუმენტებს შესადარებლად..." -#: kdiff3.cpp:535 +#: kdiff3.cpp:534 #, fuzzy, kde-format #| msgid "Ready." msgid "Reload" msgstr "მზად." -#: kdiff3.cpp:538 +#: kdiff3.cpp:537 #, kde-format msgid "Saves the merge result. All conflicts must be solved!" msgstr "ინახავს შერწყმის შედეგებს. ყველა კონფლიქტი უნდა გადაიჭრას!" -#: kdiff3.cpp:540 +#: kdiff3.cpp:539 #, kde-format msgid "Saves the current document as..." msgstr "მიმდინარე დოკუმენტს ინახავს როგორც..." -#: kdiff3.cpp:543 +#: kdiff3.cpp:542 #, kde-format msgid "Print the differences" msgstr "" -#: kdiff3.cpp:546 +#: kdiff3.cpp:545 #, kde-format msgid "Quits the application" msgstr "პროგრამის დახურვა" -#: kdiff3.cpp:549 +#: kdiff3.cpp:548 #, kde-format msgid "Cuts the selected section and puts it to the clipboard" msgstr "ჭრის მონიშნულ სექციას და გაცვლით ბუფერში ათავსებს" -#: kdiff3.cpp:552 +#: kdiff3.cpp:551 #, kde-format msgid "Copies the selected section to the clipboard" msgstr "მონიშნულ სექციის ასლს ქმნის გაცვლით ბუფერში" -#: kdiff3.cpp:554 +#: kdiff3.cpp:553 #, fuzzy, kde-format #| msgid "Pastes the clipboard contents to actual position" msgid "Pastes the clipboard contents to current position" msgstr "გაცვლის ბუფერის შემადგენლობას სვამს მიმდინარე პოზიციაზე" -#: kdiff3.cpp:557 +#: kdiff3.cpp:556 #, kde-format msgid "Select everything in current window" msgstr "" -#: kdiff3.cpp:560 +#: kdiff3.cpp:559 #, kde-format msgid "Search for a string" msgstr "სტრიქონის ძიება" -#: kdiff3.cpp:562 +#: kdiff3.cpp:561 #, kde-format msgid "Search again for the string" msgstr "სტრიქონის თავიდან ძიება" -#: kdiff3.cpp:567 +#: kdiff3.cpp:566 #, kde-format msgid "Enables/disables the statusbar" msgstr "სტატუსის ველს რთავს" -#: kdiff3.cpp:571 +#: kdiff3.cpp:570 #, kde-format msgid "Configure KDiff3..." msgstr "KDiff3 კონფიგურაცია..." -#: kdiff3.cpp:590 +#: kdiff3.cpp:589 #, kde-format msgid "Go to Current Delta" msgstr "მიმდინარე დელტაზე გადასვლა" -#: kdiff3.cpp:590 +#: kdiff3.cpp:589 #, fuzzy, kde-format #| msgid "Go to Current Delta" msgid "" @@ -1184,12 +1189,12 @@ "Delta" msgstr "მიმდინარე დელტაზე გადასვლა" -#: kdiff3.cpp:592 +#: kdiff3.cpp:591 #, kde-format msgid "Go to First Delta" msgstr "პირველ დელტაზე გადასვლა" -#: kdiff3.cpp:592 +#: kdiff3.cpp:591 #, fuzzy, kde-format #| msgid "Go to First Delta" msgid "" @@ -1197,12 +1202,12 @@ "Delta" msgstr "პირველ დელტაზე გადასვლა" -#: kdiff3.cpp:594 +#: kdiff3.cpp:593 #, kde-format msgid "Go to Last Delta" msgstr "უკანასკნელ დელტაზე გადასვლა" -#: kdiff3.cpp:594 +#: kdiff3.cpp:593 #, fuzzy, kde-format #| msgid "Go to Last Delta" msgid "" @@ -1210,24 +1215,24 @@ "Delta" msgstr "უკანასკნელ დელტაზე გადასვლა" -#: kdiff3.cpp:596 +#: kdiff3.cpp:595 #, kde-format msgid "(Skips white space differences when \"Show White Space\" is disabled.)" msgstr "" -#: kdiff3.cpp:597 +#: kdiff3.cpp:596 #, kde-format msgid "" "(Does not skip white space differences even when \"Show White Space\" is " "disabled.)" msgstr "" -#: kdiff3.cpp:598 +#: kdiff3.cpp:597 #, kde-format msgid "Go to Previous Delta" msgstr "წინა დელტაზე გადასვლა" -#: kdiff3.cpp:598 +#: kdiff3.cpp:597 #, fuzzy, kde-format #| msgid "Go to Previous Delta" msgid "" @@ -1235,12 +1240,12 @@ "Delta" msgstr "წინა დელტაზე გადასვლა" -#: kdiff3.cpp:600 +#: kdiff3.cpp:599 #, kde-format msgid "Go to Next Delta" msgstr "შემდეგ დელტაზე გადასვლა" -#: kdiff3.cpp:600 +#: kdiff3.cpp:599 #, fuzzy, kde-format #| msgid "Go to Next Delta" msgid "" @@ -1248,12 +1253,12 @@ "Delta" msgstr "შემდეგ დელტაზე გადასვლა" -#: kdiff3.cpp:602 +#: kdiff3.cpp:601 #, kde-format msgid "Go to Previous Conflict" msgstr "წინა კონფლიქტზე გადასვლა" -#: kdiff3.cpp:602 +#: kdiff3.cpp:601 #, fuzzy, kde-format #| msgid "Conflicts" msgid "" @@ -1261,12 +1266,12 @@ "Conflict" msgstr "კონფლიქტები" -#: kdiff3.cpp:604 +#: kdiff3.cpp:603 #, kde-format msgid "Go to Next Conflict" msgstr "შემდეგ კონფლიქტზე გადასვლა" -#: kdiff3.cpp:604 +#: kdiff3.cpp:603 #, fuzzy, kde-format #| msgid "Go to Next Conflict" msgid "" @@ -1274,12 +1279,12 @@ "Conflict" msgstr "შემდეგ კონფლიქტზე გადასვლა" -#: kdiff3.cpp:606 +#: kdiff3.cpp:605 #, kde-format msgid "Go to Previous Unsolved Conflict" msgstr "წინა გადაუჭრელ კონფლიქტზე გადასვლა" -#: kdiff3.cpp:606 +#: kdiff3.cpp:605 #, fuzzy, kde-format #| msgid "Unsolved" msgid "" @@ -1287,12 +1292,12 @@ "Unsolved" msgstr "გადაუჭრელი" -#: kdiff3.cpp:608 +#: kdiff3.cpp:607 #, kde-format msgid "Go to Next Unsolved Conflict" msgstr "შემდეგ გადაუჭრელ კონფლიქტზე გადასვლა" -#: kdiff3.cpp:608 +#: kdiff3.cpp:607 #, fuzzy, kde-format #| msgid "Unsolved" msgid "" @@ -1300,85 +1305,85 @@ "Unsolved" msgstr "გადაუჭრელი" -#: kdiff3.cpp:610 +#: kdiff3.cpp:609 #, kde-format msgid "Select Line(s) From A" msgstr "აირჩიეთ ხაზ(ებ)ი A-დან" -#: kdiff3.cpp:610 +#: kdiff3.cpp:609 #, kde-format msgid "" "Choose\n" "A" msgstr "" -#: kdiff3.cpp:611 +#: kdiff3.cpp:610 #, kde-format msgid "Select Line(s) From B" msgstr "აირჩიეთ ხაზ(ებ)ი B-დან" -#: kdiff3.cpp:611 +#: kdiff3.cpp:610 #, kde-format msgid "" "Choose\n" "B" msgstr "" -#: kdiff3.cpp:612 +#: kdiff3.cpp:611 #, kde-format msgid "Select Line(s) From C" msgstr "აირჩიეთ ხაზ(ებ)ი C-დან" -#: kdiff3.cpp:612 +#: kdiff3.cpp:611 #, kde-format msgid "" "Choose\n" "C" msgstr "" -#: kdiff3.cpp:613 +#: kdiff3.cpp:612 #, kde-format msgid "Automatically Go to Next Unsolved Conflict After Source Selection" msgstr "წყაროს არჩევისას ავტომატურად გადასვლა შემდეგ გადაუჭრელ კონფლიკტზე" -#: kdiff3.cpp:613 +#: kdiff3.cpp:612 #, fuzzy, kde-format msgid "" "Auto\n" "Next" msgstr "მონიშვნის ავტო ასლი" -#: kdiff3.cpp:615 +#: kdiff3.cpp:614 #, fuzzy, kde-format #| msgid "Show Space && Tabulator Characters for Differences" msgid "Show Space && Tabulator Characters" msgstr "ღარების ჩვენება და ტაბულაციის სიმბოლოების განსხვავებისთვის" -#: kdiff3.cpp:615 +#: kdiff3.cpp:614 #, kde-format msgid "" "White\n" "Characters" msgstr "" -#: kdiff3.cpp:616 +#: kdiff3.cpp:615 #, kde-format msgid "Show White Space" msgstr "" -#: kdiff3.cpp:616 +#: kdiff3.cpp:615 #, kde-format msgid "" "White\n" "Deltas" msgstr "" -#: kdiff3.cpp:618 +#: kdiff3.cpp:617 #, kde-format msgid "Show Line Numbers" msgstr "ხაზების ნომრების ჩვენება" -#: kdiff3.cpp:618 +#: kdiff3.cpp:617 #, fuzzy, kde-format #| msgid "Show Line Numbers" msgid "" @@ -1386,195 +1391,195 @@ "Numbers" msgstr "ხაზების ნომრების ჩვენება" -#: kdiff3.cpp:620 +#: kdiff3.cpp:619 #, kde-format msgid "Automatically Solve Simple Conflicts" msgstr "მარტივი კონფლიქტების ავრომატურად გადაჭრა" -#: kdiff3.cpp:621 +#: kdiff3.cpp:620 #, kde-format msgid "Set Deltas to Conflicts" msgstr "კონფლიქტებისთვის დელტას მინიჭება" -#: kdiff3.cpp:622 +#: kdiff3.cpp:621 #, kde-format msgid "Run Regular Expression Auto Merge" msgstr "" -#: kdiff3.cpp:623 +#: kdiff3.cpp:622 #, fuzzy, kde-format msgid "Automatically Solve History Conflicts" msgstr "მარტივი კონფლიქტების ავრომატურად გადაჭრა" -#: kdiff3.cpp:624 +#: kdiff3.cpp:623 #, kde-format msgid "Split Diff At Selection" msgstr "" -#: kdiff3.cpp:625 +#: kdiff3.cpp:624 #, fuzzy, kde-format msgid "Join Selected Diffs" msgstr "მონიშნული ფაილების შედარება" -#: kdiff3.cpp:627 +#: kdiff3.cpp:626 #, kde-format msgid "Show Window A" msgstr "ფანჯარა A-ს ჩვენება " -#: kdiff3.cpp:628 +#: kdiff3.cpp:627 #, kde-format msgid "Show Window B" msgstr "ფანჯარა B-ს ჩვენება" -#: kdiff3.cpp:629 +#: kdiff3.cpp:628 #, kde-format msgid "Show Window C" msgstr "ფანჯარა C-ს ჩვენება" -#: kdiff3.cpp:631 +#: kdiff3.cpp:630 #, kde-format msgid "Normal Overview" msgstr "ჩვეულებრივი გადახედვა" -#: kdiff3.cpp:632 +#: kdiff3.cpp:631 #, kde-format msgid "A vs. B Overview" msgstr "A წინააღმდეგ B გადახედვა" -#: kdiff3.cpp:633 +#: kdiff3.cpp:632 #, kde-format msgid "A vs. C Overview" msgstr "A წინააღმდეგ C გადახედვა" -#: kdiff3.cpp:634 +#: kdiff3.cpp:633 #, kde-format msgid "B vs. C Overview" msgstr "B წინააღმდეგ C გადახედვა" -#: kdiff3.cpp:635 +#: kdiff3.cpp:634 #, kde-format msgid "Word Wrap Diff Windows" msgstr "Word Wrap Diff ფანჯრები" -#: kdiff3.cpp:636 +#: kdiff3.cpp:635 #, kde-format msgid "Add Manual Diff Alignment" msgstr "" -#: kdiff3.cpp:637 +#: kdiff3.cpp:636 #, kde-format msgid "Clear All Manual Diff Alignments" msgstr "" -#: kdiff3.cpp:639 +#: kdiff3.cpp:638 #, kde-format msgid "Focus Next Window" msgstr "ფოკუსი შემდეგ ფანჯარაზე" -#: kdiff3.cpp:640 +#: kdiff3.cpp:639 #, kde-format msgid "Focus Prev Window" msgstr "ფოკუსი წინა ფანჯარაზე" -#: kdiff3.cpp:641 +#: kdiff3.cpp:640 #, kde-format msgid "Toggle Split Orientation" msgstr "გახლეჩვის ორიენტაციის გადართვა" -#: kdiff3.cpp:643 +#: kdiff3.cpp:642 #, kde-format msgid "Dir && Text Split Screen View" msgstr "დირექტორიისა და ტექსტი განლაგების ეკრანის ხედი" -#: kdiff3.cpp:645 +#: kdiff3.cpp:644 #, kde-format msgid "Toggle Between Dir && Text View" msgstr "დირექტორიათა და ტექსტის ხედებს შორის გადართვა" -#: kdiff3.cpp:697 pdiff.cpp:1909 +#: kdiff3.cpp:696 pdiff.cpp:1919 #, fuzzy, kde-format #| msgid "The merge result hasn't been saved." msgid "The merge result has not been saved." msgstr "შერწყმის შედეგები არ იყო შენახული." -#: kdiff3.cpp:699 +#: kdiff3.cpp:698 #, kde-format msgid "Save && Quit" msgstr "შენახვა და გასვლა" -#: kdiff3.cpp:700 +#: kdiff3.cpp:699 #, kde-format msgid "Quit Without Saving" msgstr "გასვლა შენახვის გარეშე" -#: kdiff3.cpp:708 pdiff.cpp:1920 +#: kdiff3.cpp:707 pdiff.cpp:1930 #, kde-format msgid "Saving the merge result failed." msgstr "შერწყმის შედეგების შენახვა ვერ შედგა." -#: kdiff3.cpp:719 pdiff.cpp:1032 +#: kdiff3.cpp:718 pdiff.cpp:1030 #, kde-format msgid "" "You are currently doing a directory merge. Are you sure, you want to abort?" msgstr "თქვენ ახლა დირექტორიათა შერწყმას აკეთებთ. ნამდვილად გსურთ შეწყვეტა?" -#: kdiff3.cpp:742 +#: kdiff3.cpp:741 #, kde-format msgid "Saving file..." msgstr "ფაილის შენახვა..." -#: kdiff3.cpp:759 +#: kdiff3.cpp:758 #, kde-format msgid "Saving file with a new filename..." msgstr "ფაილის ახალი სახელით შენახვა..." -#: kdiff3.cpp:761 +#: kdiff3.cpp:760 #, kde-format msgid "Save As..." msgstr "" -#: kdiff3.cpp:820 +#: kdiff3.cpp:819 #, fuzzy, kde-format msgid "Printing not implemented." msgstr "შერწყმის ოპერაცია დასრულდა." -#: kdiff3.cpp:857 +#: kdiff3.cpp:858 #, fuzzy, kde-format msgid "Printing..." msgstr "გამოსვლა..." -#: kdiff3.cpp:943 +#: kdiff3.cpp:948 #, kde-format msgid "Printing page %1 of %2" msgstr "" -#: kdiff3.cpp:1000 +#: kdiff3.cpp:1006 #, fuzzy, kde-format #| msgid "Select Another Font" msgid " (Selection)" msgstr "სხვა შრიფტის ამორჩევა" -#: kdiff3.cpp:1027 +#: kdiff3.cpp:1034 #, fuzzy, kde-format msgid "Printing completed." msgstr "შერწყმის ოპერაცია დასრულდა." -#: kdiff3.cpp:1031 +#: kdiff3.cpp:1038 #, fuzzy, kde-format msgid "Printing aborted." msgstr "შერწყმის ოპერაცია დასრულდა." -#: kdiff3.cpp:1038 +#: kdiff3.cpp:1045 #, kde-format msgid "Exiting..." msgstr "გამოსვლა..." -#: kdiff3.cpp:1049 +#: kdiff3.cpp:1056 #, kde-format msgid "Toggling toolbar..." msgstr "ხელსაწყოთა პანელის გადართვა..." -#: kdiff3.cpp:1070 +#: kdiff3.cpp:1077 #, kde-format msgid "Toggle the statusbar..." msgstr "სტატუსის ზოლის გადართვა..." @@ -1600,7 +1605,7 @@ msgid "Joachim Eibl" msgstr "" -#: kdiff3_part.cpp:173 kdiff3_part.cpp:254 +#: kdiff3_part.cpp:174 kdiff3_part.cpp:255 #, fuzzy, kde-format #| msgid "Couldn't find files for comparison." msgid "Could not find files for comparison." @@ -1619,7 +1624,7 @@ msgstr "KDiff3 კონფიგურაცია" #. i18n: ectx: ToolBar (mainToolBar) -#: kdiff3_part.rc:16 main.cpp:88 +#: kdiff3_part.rc:16 main.cpp:89 #, kde-format msgid "KDiff3" msgstr "KDiff3" @@ -1696,173 +1701,179 @@ msgid "Main Toolbar" msgstr "" -#: main.cpp:68 main.cpp:72 +#: main.cpp:69 main.cpp:73 #, kde-format msgid "Ignored. (User defined.)" msgstr "" -#: main.cpp:92 +#: main.cpp:93 #, kde-format msgid " (64 bit)" msgstr "" -#: main.cpp:94 +#: main.cpp:95 #, kde-format msgid " (32 bit)" msgstr "" -#: main.cpp:95 +#: main.cpp:96 #, kde-format msgid "Tool for Comparison and Merge of Files and Directories" msgstr "ფაილების და საქაღალდეების შედარების და შერწყმის ხელსაწყოები" -#: main.cpp:96 +#: main.cpp:97 #, kde-format msgid "(c) 2002-2014 Joachim Eibl, (c) 2017 Michael Reeves KF5/Qt5 port" msgstr "" -#: main.cpp:112 +#: main.cpp:113 #, kde-format msgid "Merge the input." msgstr "შეტანის შერწყმა." -#: main.cpp:113 +#: main.cpp:114 #, kde-format msgid "Explicit base file. For compatibility with certain tools." msgstr "" -#: main.cpp:114 +#: main.cpp:115 #, kde-format msgid "Output file. Implies -m. E.g.: -o newfile.txt" msgstr "გამონატანის ფაილი. Implies -m. E.g.: -o newfile.txt" -#: main.cpp:115 +#: main.cpp:116 #, kde-format msgid "Output file, again. (For compatibility with certain tools.)" msgstr "" "გამონატანის ფაილი, თავიდან. (განსაზღვრულ ხელსაწყოსთან თავსებადობისთვის.)" -#: main.cpp:116 +#: main.cpp:118 #, kde-format msgid "No GUI if all conflicts are auto-solvable. (Needs -o file)" msgstr "GUI-ს გარეშე თუ ყველა კონფლიქტო გადაჭრადია. (სსაჭიროებს -o ფაილს)" -#: main.cpp:117 +#: main.cpp:120 +#, fuzzy, kde-format +#| msgid "Ignore case" +msgid "Ignored." +msgstr "რეგისტრის იგნორირება" + +#: main.cpp:122 #, fuzzy, kde-format #| msgid "Don't solve conflicts automatically. (For compatibility...)" msgid "Do not solve conflicts automatically." msgstr "კონფლიქტების ავტომატურად არ გადაჭრა. (თავსებადობისთვის...)" -#: main.cpp:118 +#: main.cpp:123 #, kde-format msgid "Visible name replacement for input file 1 (base)." msgstr "ხილული სახელის ჩანაცვლება 1 ფაილისთვის (საბაზისო)." -#: main.cpp:119 +#: main.cpp:124 #, kde-format msgid "Visible name replacement for input file 2." msgstr "ხილული სახელის ჩანაცვლება 2 ფაილისთვის." -#: main.cpp:120 +#: main.cpp:125 #, kde-format msgid "Visible name replacement for input file 3." msgstr "ხილული სახელის ჩანაცვლება 3 ფაილისთვის." -#: main.cpp:121 +#: main.cpp:126 #, kde-format msgid "Alternative visible name replacement. Supply this once for every input." msgstr "" "ალტერნატიული ხილული სახელის ჩანაცვლება. მიუთითეთ ერთხელ ყოველი შეყვანისთვის." -#: main.cpp:122 +#: main.cpp:127 #, kde-format msgid "" "Override a config setting. Use once for every setting. E.g.: --cs " "\"AutoAdvance=1\"" msgstr "" -#: main.cpp:123 +#: main.cpp:128 #, kde-format msgid "Show list of config settings and current values." msgstr "" -#: main.cpp:124 +#: main.cpp:129 #, fuzzy, kde-format msgid "Use a different config file." msgstr "განსხვავებული ფაილების რაოდენობა:" -#: main.cpp:127 +#: main.cpp:132 #, kde-format msgid "file1 to open (base, if not specified via --base)" msgstr "ფაილი3-ის გახსნა (საფუძველი, თუ არაა მითითებული --base)" -#: main.cpp:128 +#: main.cpp:133 #, kde-format msgid "file2 to open" msgstr "ფაილი2-ის გახსნა" -#: main.cpp:129 +#: main.cpp:134 #, kde-format msgid "file3 to open" msgstr "ფაილი3-ის გახსნა" -#: main.cpp:153 +#: main.cpp:158 #, kde-format msgid "See kdiff3 --help for supported options." msgstr "" -#: mergeresultwindow.cpp:158 +#: mergeresultwindow.cpp:171 #, kde-format msgid "Choose A Everywhere" msgstr "ყველგან A-ს არჩევა" -#: mergeresultwindow.cpp:159 +#: mergeresultwindow.cpp:172 #, kde-format msgid "Choose B Everywhere" msgstr "ყველგან B-ს არჩევა" -#: mergeresultwindow.cpp:160 +#: mergeresultwindow.cpp:173 #, kde-format msgid "Choose C Everywhere" msgstr "ყველგან C-ს არჩევა" -#: mergeresultwindow.cpp:161 +#: mergeresultwindow.cpp:174 #, kde-format msgid "Choose A for All Unsolved Conflicts" msgstr "A-ს არჩევა ყველა გადაუჭრელი კონფლიქტისთვის" -#: mergeresultwindow.cpp:162 +#: mergeresultwindow.cpp:175 #, kde-format msgid "Choose B for All Unsolved Conflicts" msgstr "B-ს არჩევა ყველა გადაუჭრელი კონფლიქტისთვის" -#: mergeresultwindow.cpp:163 +#: mergeresultwindow.cpp:176 #, kde-format msgid "Choose C for All Unsolved Conflicts" msgstr "C-ს არჩევა ყველა გადაუჭრელი კონფლიქტისთვის" -#: mergeresultwindow.cpp:164 +#: mergeresultwindow.cpp:177 #, kde-format msgid "Choose A for All Unsolved Whitespace Conflicts" msgstr "" -#: mergeresultwindow.cpp:165 +#: mergeresultwindow.cpp:178 #, kde-format msgid "Choose B for All Unsolved Whitespace Conflicts" msgstr "" -#: mergeresultwindow.cpp:166 +#: mergeresultwindow.cpp:179 #, kde-format msgid "Choose C for All Unsolved Whitespace Conflicts" msgstr "" -#: mergeresultwindow.cpp:176 +#: mergeresultwindow.cpp:204 #, kde-format msgid "Number of remaining unsolved conflicts: %1 (of which %2 are whitespace)" msgstr "" "დარჩენილი გადაუჭრელი კონფლიქტების რაოდენობა: %1 (საიდანაც %2 არის ღარი)" -#: mergeresultwindow.cpp:370 +#: mergeresultwindow.cpp:398 #, kde-format msgid "" "The output has been modified.\n" @@ -1871,29 +1882,29 @@ "გამონატანი ჩასწორებულია.\n" "თუ გააგრძელებთ ცვლილებები დაგეკარგებათ." -#: mergeresultwindow.cpp:936 pdiff.cpp:827 +#: mergeresultwindow.cpp:964 pdiff.cpp:817 #, kde-format msgid "All input files are binary equal." msgstr "ყველა შეტანილი ბაილის ბინარი ტოლია." -#: mergeresultwindow.cpp:938 +#: mergeresultwindow.cpp:966 #, kde-format msgid "All input files contain the same text." msgstr "ყველა შეტანილი ფაილის შეიცავს ერთიდაიგივე ტექსტი." -#: mergeresultwindow.cpp:942 mergeresultwindow.cpp:946 -#: mergeresultwindow.cpp:950 pdiff.cpp:833 pdiff.cpp:837 pdiff.cpp:841 +#: mergeresultwindow.cpp:970 mergeresultwindow.cpp:974 +#: mergeresultwindow.cpp:978 pdiff.cpp:823 pdiff.cpp:827 pdiff.cpp:831 #, fuzzy, kde-format msgid "Files %1 and %2 are binary equal.\n" msgstr "B და C ბინარულად ტოლია.\n" -#: mergeresultwindow.cpp:944 mergeresultwindow.cpp:948 -#: mergeresultwindow.cpp:952 +#: mergeresultwindow.cpp:972 mergeresultwindow.cpp:976 +#: mergeresultwindow.cpp:980 #, fuzzy, kde-format msgid "Files %1 and %2 have equal text.\n" msgstr "A და B აქვთ ერთიდაიგივე ტექსტი. \n" -#: mergeresultwindow.cpp:958 +#: mergeresultwindow.cpp:986 #, kde-format msgid "" "Total number of conflicts: %1\n" @@ -1902,27 +1913,27 @@ "%4" msgstr "" -#: mergeresultwindow.cpp:964 +#: mergeresultwindow.cpp:992 #, kde-format msgid "Conflicts" msgstr "კონფლიქტები" -#: mergeresultwindow.cpp:1873 +#: mergeresultwindow.cpp:1901 #, kde-format msgid "" msgstr "" -#: mergeresultwindow.cpp:1881 +#: mergeresultwindow.cpp:1909 #, kde-format msgid "" msgstr "" -#: mergeresultwindow.cpp:1883 mergeresultwindow.cpp:2755 +#: mergeresultwindow.cpp:1911 mergeresultwindow.cpp:2783 #, kde-format msgid "" msgstr "" -#: mergeresultwindow.cpp:2967 +#: mergeresultwindow.cpp:2995 #, fuzzy, kde-format #| msgid "" #| "Not all conflicts are solved yet.\n" @@ -1934,12 +1945,12 @@ "ყველა კონფლიქტი ჯერ არაა გადაჭრილი.\n" "ფაილი არაა შენახული.\n" -#: mergeresultwindow.cpp:2969 mergeresultwindow.cpp:2978 +#: mergeresultwindow.cpp:2997 mergeresultwindow.cpp:3006 #, kde-format msgid "Conflicts Left" msgstr "დარჩენილი კონფლიქტები" -#: mergeresultwindow.cpp:2976 +#: mergeresultwindow.cpp:3004 #, kde-format msgid "" "There is a line end style conflict. Please choose the line end style " @@ -1947,7 +1958,7 @@ "File not saved." msgstr "" -#: mergeresultwindow.cpp:2990 +#: mergeresultwindow.cpp:3018 #, kde-format msgid "" "\n" @@ -1958,59 +1969,59 @@ "\n" "სარეზერვო ასლის შექმნა ვერ შედგა. ფაილი არაა შენახული." -#: mergeresultwindow.cpp:2990 mergeresultwindow.cpp:3038 +#: mergeresultwindow.cpp:3018 mergeresultwindow.cpp:3066 #, kde-format msgid "File Save Error" msgstr "ფაილის შენახვის შეცდომა" -#: mergeresultwindow.cpp:3038 +#: mergeresultwindow.cpp:3066 #, kde-format msgid "Error while writing." msgstr "ჩაწერისას შეცდომა." -#: mergeresultwindow.cpp:3110 +#: mergeresultwindow.cpp:3138 #, fuzzy, kde-format #| msgid "Output" msgid "Output:" msgstr "გამონატანი" -#: mergeresultwindow.cpp:3123 mergeresultwindow.cpp:3315 +#: mergeresultwindow.cpp:3151 mergeresultwindow.cpp:3343 #, kde-format msgid "[Modified]" msgstr "[ჩასწორებულია]" -#: mergeresultwindow.cpp:3130 +#: mergeresultwindow.cpp:3158 #, fuzzy, kde-format msgid "Encoding for saving:" msgstr "ფაილის კოდირება C-თვის:" -#: mergeresultwindow.cpp:3230 +#: mergeresultwindow.cpp:3258 #, fuzzy, kde-format #| msgid "Conflicts" msgid "Conflict" msgstr "კონფლიქტები" -#: mergeresultwindow.cpp:3262 +#: mergeresultwindow.cpp:3290 #, kde-format msgid "Codec from A: %1" msgstr "" -#: mergeresultwindow.cpp:3264 +#: mergeresultwindow.cpp:3292 #, kde-format msgid "Codec from B: %1" msgstr "" -#: mergeresultwindow.cpp:3266 +#: mergeresultwindow.cpp:3294 #, kde-format msgid "Codec from C: %1" msgstr "" -#: optiondialog.cpp:119 +#: optiondialog.cpp:121 #, kde-format msgid "Change Font" msgstr "" -#: optiondialog.cpp:135 optiondialog.cpp:145 +#: optiondialog.cpp:137 optiondialog.cpp:147 #, kde-format msgid "" "Font: %1, %2, %3\n" @@ -2018,163 +2029,163 @@ "Example:" msgstr "" -#: optiondialog.cpp:388 +#: optiondialog.cpp:390 #, kde-format msgid "Unicode" msgstr "უნიკოდი" -#: optiondialog.cpp:389 +#: optiondialog.cpp:391 #, kde-format msgid "Latin1" msgstr "Latin1" -#: optiondialog.cpp:408 +#: optiondialog.cpp:410 #, kde-format msgid "Change this if non-ASCII characters are not displayed correctly." msgstr "შეცვალე თუ არა ASCII სიმბოლოები არ აისახება მართებულად." -#: optiondialog.cpp:491 +#: optiondialog.cpp:495 #, fuzzy, kde-format #| msgid "Configure..." msgid "Configure" msgstr "კონფიგურაცია..." -#: optiondialog.cpp:568 +#: optiondialog.cpp:573 #, kde-format msgid "Font" msgstr "" -#: optiondialog.cpp:570 +#: optiondialog.cpp:575 #, kde-format msgid "Editor & Diff Output Font" msgstr "რედაქტორი და Diff გამონატანის შრიფტი" -#: optiondialog.cpp:589 +#: optiondialog.cpp:594 #, kde-format msgid "Application font" msgstr "" -#: optiondialog.cpp:594 +#: optiondialog.cpp:599 #, fuzzy, kde-format #| msgid "File Save Error" msgid "File view font" msgstr "ფაილის შენახვის შეცდომა" -#: optiondialog.cpp:613 +#: optiondialog.cpp:618 #, fuzzy, kde-format #| msgid "Color" msgctxt "Title for color settings page" msgid "Color" msgstr "ფერი" -#: optiondialog.cpp:614 +#: optiondialog.cpp:619 #, fuzzy, kde-format msgid "Colors Settings" msgstr "რეგიონალური პარამეტრები" -#: optiondialog.cpp:631 +#: optiondialog.cpp:644 #, kde-format msgid "Editor and Diff Views:" msgstr "" -#: optiondialog.cpp:639 +#: optiondialog.cpp:652 #, kde-format msgid "Foreground color:" msgstr "ზედაპირის ფერი:" -#: optiondialog.cpp:647 +#: optiondialog.cpp:660 #, kde-format msgid "Background color:" msgstr "ფონის ფერი:" -#: optiondialog.cpp:657 +#: optiondialog.cpp:670 #, kde-format msgid "Diff background color:" msgstr "Diff ფონის ფერი:" -#: optiondialog.cpp:666 +#: optiondialog.cpp:679 #, kde-format msgid "Color A:" msgstr "ფერი A:" -#: optiondialog.cpp:675 +#: optiondialog.cpp:688 #, kde-format msgid "Color B:" msgstr "ფერი B:" -#: optiondialog.cpp:684 +#: optiondialog.cpp:697 #, kde-format msgid "Color C:" msgstr "ფერი C:" -#: optiondialog.cpp:692 +#: optiondialog.cpp:705 #, kde-format msgid "Conflict color:" msgstr "კონფლიქტის ფერი:" -#: optiondialog.cpp:701 +#: optiondialog.cpp:714 #, kde-format msgid "Current range background color:" msgstr "მიმდინარე შუალედის ფონის ფერი:" -#: optiondialog.cpp:710 +#: optiondialog.cpp:723 #, kde-format msgid "Current range diff background color:" msgstr "მიმდინარე შუალედის diff ფონის ფერი:" -#: optiondialog.cpp:718 +#: optiondialog.cpp:731 #, kde-format msgid "Color for manually aligned difference ranges:" msgstr "" -#: optiondialog.cpp:725 +#: optiondialog.cpp:738 #, fuzzy, kde-format msgid "Directory Comparison View:" msgstr "დირექტორიის შედარების სტატუსი" -#: optiondialog.cpp:731 +#: optiondialog.cpp:744 #, kde-format msgid "Newest file color:" msgstr "" -#: optiondialog.cpp:736 +#: optiondialog.cpp:749 #, kde-format msgid "" "Changing this color will only be effective when starting the next directory " "comparison." msgstr "" -#: optiondialog.cpp:741 +#: optiondialog.cpp:754 #, kde-format msgid "Oldest file color:" msgstr "" -#: optiondialog.cpp:750 +#: optiondialog.cpp:763 #, kde-format msgid "Middle age file color:" msgstr "" -#: optiondialog.cpp:759 +#: optiondialog.cpp:772 #, kde-format msgid "Color for missing files:" msgstr "" -#: optiondialog.cpp:773 +#: optiondialog.cpp:786 #, kde-format msgid "Editor" msgstr "რედაქტორი" -#: optiondialog.cpp:774 +#: optiondialog.cpp:787 #, kde-format msgid "Editor Behavior" msgstr "რედაქტორის ქცევა" -#: optiondialog.cpp:787 +#: optiondialog.cpp:809 #, kde-format msgid "Tab inserts spaces" msgstr "Tab სვავს ღარებს" -#: optiondialog.cpp:791 +#: optiondialog.cpp:813 #, fuzzy, kde-format #| msgid "" #| "On: Pressing tab generates the appropriate number of spaces.\n" @@ -2186,27 +2197,27 @@ "ჩართულია: tab-ის დაჭერა აგენერირებს ღარების განსაზღვრულ რაოდენობას.\n" "გამორთულია: ტაბულაციის სიმბოლო იქნება ჩასმული." -#: optiondialog.cpp:796 +#: optiondialog.cpp:818 #, kde-format msgid "Tab size:" msgstr "ჩანართის ზომა:" -#: optiondialog.cpp:803 +#: optiondialog.cpp:825 #, kde-format msgid "Auto indentation" msgstr "ავტო შეწევა" -#: optiondialog.cpp:807 +#: optiondialog.cpp:829 #, kde-format msgid "On: The indentation of the previous line is used for a new line.\n" msgstr "ჩართულია: წინა ხაზის შეწევა გამოიყენება ახალი ხაზისთვის.\n" -#: optiondialog.cpp:810 +#: optiondialog.cpp:832 #, kde-format msgid "Auto copy selection" msgstr "მონიშვნის ავტო ასლი" -#: optiondialog.cpp:814 +#: optiondialog.cpp:836 #, fuzzy, kde-format #| msgid "" #| "On: Any selection is immediately written to the clipboard.\n" @@ -2218,7 +2229,7 @@ "ჩართულია: ნებისმიერი მონიშვნა ჯდება გაცვლის ბუფერში.\n" "გამორთულია: თქვენ ასლი უნდა გააკეთოთ მაგ. Ctrl-C." -#: optiondialog.cpp:829 +#: optiondialog.cpp:851 #, kde-format msgid "" "Sets the line endings for when an edited file is saved.\n" @@ -2227,12 +2238,12 @@ "აყენებს ხაზის ბოლოს როდესაც რედაქტურებული ფაილი ინახება.\n" "DOS/Windows: CR+LF; UNIX: LF; with CR=0D, LF=0A" -#: optiondialog.cpp:839 +#: optiondialog.cpp:861 #, fuzzy, kde-format msgid "Diff" msgstr "KDiff3" -#: optiondialog.cpp:840 +#: optiondialog.cpp:862 #, fuzzy, kde-format msgid "Diff Settings" msgstr "Diff & შერწყმის პარამეტრები" @@ -2246,12 +2257,12 @@ #. ); #. ++line; #. -#: optiondialog.cpp:865 +#: optiondialog.cpp:896 #, fuzzy, kde-format msgid "Ignore numbers (treat as white space)" msgstr "C/C++ კომენტარების ღარებად განხილვა." -#: optiondialog.cpp:869 +#: optiondialog.cpp:900 #, kde-format msgid "" "Ignore number characters during line matching phase. (Similar to Ignore " @@ -2262,56 +2273,56 @@ "იგნორირება.)\n" "შეიძლება დაგეხმაროთ ციფრული მონაცემებით ფაილების შედარებისას." -#: optiondialog.cpp:873 +#: optiondialog.cpp:904 #, fuzzy, kde-format #| msgid "Treat C/C++ comments like white space." msgid "Ignore C/C++ comments (treat as white space)" msgstr "C/C++ კომენტარების ღარებად განხილვა." -#: optiondialog.cpp:876 +#: optiondialog.cpp:907 #, kde-format msgid "Treat C/C++ comments like white space." msgstr "C/C++ კომენტარების ღარებად განხილვა." -#: optiondialog.cpp:879 +#: optiondialog.cpp:910 #, fuzzy, kde-format msgid "Ignore case (treat as white space)" msgstr "C/C++ კომენტარების ღარებად განხილვა." -#: optiondialog.cpp:883 +#: optiondialog.cpp:914 #, kde-format msgid "Treat case differences like white space changes. ('a'<=>'A')" msgstr "რეგისტრის სხვაობის ღარებად განხილვა. ('a'<=>'A')" -#: optiondialog.cpp:886 +#: optiondialog.cpp:917 #, kde-format msgid "Preprocessor command:" msgstr "Preprocessor ბრძანება:" -#: optiondialog.cpp:891 +#: optiondialog.cpp:922 #, kde-format msgid "User defined pre-processing. (See the docs for details.)" msgstr "" "მომხმარებლის მიერ განსაზღვრული processing. (დეტალებისთვის იხ. დოკუმენტაცია.)" -#: optiondialog.cpp:894 +#: optiondialog.cpp:925 #, kde-format msgid "Line-matching preprocessor command:" msgstr "ხაზის დამთხვევის preprocessor ბრძანება:" -#: optiondialog.cpp:899 +#: optiondialog.cpp:930 #, kde-format msgid "" "This pre-processor is only used during line matching.\n" "(See the docs for details.)" msgstr "" -#: optiondialog.cpp:902 +#: optiondialog.cpp:933 #, kde-format msgid "Try hard (slower)" msgstr "მაგრად ცდა (ნელია)" -#: optiondialog.cpp:906 +#: optiondialog.cpp:937 #, kde-format msgid "" "Enables the --minimal option for the external diff.\n" @@ -2320,12 +2331,12 @@ "გარე diff-სთვის რთავს --minimal პარამეტრს.\n" "დიდი ფაილების ანალიზი ბევრად შენელდება." -#: optiondialog.cpp:910 +#: optiondialog.cpp:941 #, kde-format msgid "Align B and C for 3 input files" msgstr "" -#: optiondialog.cpp:914 +#: optiondialog.cpp:945 #, kde-format msgid "" "Try to align B and C when comparing or merging three input files.\n" @@ -2333,67 +2344,74 @@ "(Default is off.)" msgstr "" -#: optiondialog.cpp:926 +#: optiondialog.cpp:956 +#, fuzzy, kde-format +#| msgid "Merge" +msgctxt "Settings page" +msgid "Merge" +msgstr "შერწყმა" + +#: optiondialog.cpp:957 #, fuzzy, kde-format msgid "Merge Settings" msgstr "Diff & შერწყმის პარამეტრები" -#: optiondialog.cpp:940 +#: optiondialog.cpp:980 #, kde-format msgid "Auto advance delay (ms):" msgstr "" -#: optiondialog.cpp:946 +#: optiondialog.cpp:986 #, kde-format 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 "" -#: optiondialog.cpp:950 +#: optiondialog.cpp:990 #, fuzzy, kde-format #| msgid "Show Window A" msgid "Show info dialogs" msgstr "ფანჯარა A-ს ჩვენება " -#: optiondialog.cpp:953 +#: optiondialog.cpp:993 #, kde-format msgid "Show a dialog with information about the number of conflicts." msgstr "" -#: optiondialog.cpp:956 +#: optiondialog.cpp:996 #, kde-format msgid "White space 2-file merge default:" msgstr "" -#: optiondialog.cpp:961 optiondialog.cpp:974 +#: optiondialog.cpp:1001 optiondialog.cpp:1014 #, kde-format msgid "Manual Choice" msgstr "ხელით არჩევა" -#: optiondialog.cpp:965 optiondialog.cpp:979 +#: optiondialog.cpp:1005 optiondialog.cpp:1019 #, kde-format msgid "" "Allow the merge algorithm to automatically select an input for white-space-" "only changes." msgstr "" -#: optiondialog.cpp:969 +#: optiondialog.cpp:1009 #, kde-format msgid "White space 3-file merge default:" msgstr "" -#: optiondialog.cpp:983 +#: optiondialog.cpp:1023 #, kde-format msgid "Automatic Merge Regular Expression" msgstr "" -#: optiondialog.cpp:991 smalldialogs.cpp:449 +#: optiondialog.cpp:1031 smalldialogs.cpp:459 #, kde-format msgid "Auto merge regular expression:" msgstr "" -#: optiondialog.cpp:996 +#: optiondialog.cpp:1036 #, kde-format msgid "" "Regular expression for lines where KDiff3 should automatically choose one " @@ -2402,29 +2420,29 @@ "- if available - C, otherwise B will be chosen." msgstr "" -#: optiondialog.cpp:1002 +#: optiondialog.cpp:1042 #, kde-format msgid "Run regular expression auto merge on merge start" msgstr "" -#: optiondialog.cpp:1005 +#: optiondialog.cpp:1045 #, kde-format msgid "" "Run the merge for auto merge regular expressions\n" "immediately when a merge starts.\n" msgstr "" -#: optiondialog.cpp:1010 +#: optiondialog.cpp:1050 #, kde-format msgid "Version Control History Merging" msgstr "" -#: optiondialog.cpp:1018 smalldialogs.cpp:476 +#: optiondialog.cpp:1058 smalldialogs.cpp:486 #, kde-format msgid "History start regular expression:" msgstr "" -#: optiondialog.cpp:1023 +#: optiondialog.cpp:1063 #, kde-format msgid "" "Regular expression for the start of the version control history entry.\n" @@ -2432,12 +2450,12 @@ "Default value: \".*\\$Log.*\\$.*\"" msgstr "" -#: optiondialog.cpp:1029 smalldialogs.cpp:504 +#: optiondialog.cpp:1069 smalldialogs.cpp:514 #, kde-format msgid "History entry start regular expression:" msgstr "" -#: optiondialog.cpp:1042 +#: optiondialog.cpp:1082 #, kde-format msgid "" "A version control history entry consists of several lines.\n" @@ -2449,22 +2467,22 @@ "See the documentation for details." msgstr "" -#: optiondialog.cpp:1050 +#: optiondialog.cpp:1090 #, kde-format msgid "History merge sorting" msgstr "" -#: optiondialog.cpp:1053 +#: optiondialog.cpp:1093 #, kde-format msgid "Sort version control history by a key." msgstr "" -#: optiondialog.cpp:1063 +#: optiondialog.cpp:1103 #, kde-format msgid "History entry start sort key order:" msgstr "" -#: optiondialog.cpp:1068 +#: optiondialog.cpp:1108 #, kde-format msgid "" "Each pair of parentheses used in the regular expression for the history " @@ -2476,37 +2494,37 @@ "See the documentation for details." msgstr "" -#: optiondialog.cpp:1079 +#: optiondialog.cpp:1119 #, kde-format msgid "Merge version control history on merge start" msgstr "" -#: optiondialog.cpp:1082 +#: optiondialog.cpp:1122 #, kde-format msgid "Run version control history automerge on merge start." msgstr "" -#: optiondialog.cpp:1086 +#: optiondialog.cpp:1126 #, fuzzy, kde-format msgid "Max number of history entries:" msgstr "ქვედირექტორიების რაოდენობა:" -#: optiondialog.cpp:1090 +#: optiondialog.cpp:1130 #, kde-format msgid "Cut off after specified number. Use -1 for infinite number of entries." msgstr "" -#: optiondialog.cpp:1094 +#: optiondialog.cpp:1134 #, kde-format msgid "Test your regular expressions" msgstr "" -#: optiondialog.cpp:1099 +#: optiondialog.cpp:1139 #, kde-format msgid "Irrelevant merge command:" msgstr "" -#: optiondialog.cpp:1104 +#: optiondialog.cpp:1144 #, kde-format msgid "" "If specified this script is run after automerge\n" @@ -2514,12 +2532,12 @@ "Called with the parameters: filename1 filename2 filename3" msgstr "" -#: optiondialog.cpp:1109 +#: optiondialog.cpp:1149 #, kde-format msgid "Auto save and quit on merge without conflicts" msgstr "" -#: optiondialog.cpp:1113 +#: optiondialog.cpp:1153 #, kde-format msgid "" "If KDiff3 was started for a file-merge from the command line and all\n" @@ -2528,28 +2546,28 @@ "(Similar to command line option \"--auto\".)" msgstr "" -#: optiondialog.cpp:1124 optiondialog.cpp:1125 +#: optiondialog.cpp:1164 optiondialog.cpp:1165 #, fuzzy, kde-format #| msgid "&Directory" msgid "Directory" msgstr "&დირექტორია" -#: optiondialog.cpp:1137 +#: optiondialog.cpp:1185 #, kde-format msgid "Recursive directories" msgstr "დირექტორიათა რეკურსია" -#: optiondialog.cpp:1140 +#: optiondialog.cpp:1188 #, kde-format msgid "Whether to analyze subdirectories or not." msgstr "ქვესაქაღალდეები გაანალიზდეს თუ არა." -#: optiondialog.cpp:1142 +#: optiondialog.cpp:1190 #, kde-format msgid "File pattern(s):" msgstr "ფაილის შაბლონ(ებ)ი:" -#: optiondialog.cpp:1148 +#: optiondialog.cpp:1196 #, kde-format msgid "" "Pattern(s) of files to be analyzed. \n" @@ -2560,12 +2578,12 @@ "Wildcards: '*' და '?'\n" "რამდენიმე შაბლონის მითითება შეიძლება ';' გამყოფით" -#: optiondialog.cpp:1153 +#: optiondialog.cpp:1201 #, kde-format msgid "File-anti-pattern(s):" msgstr "ფაილის-ანტი-შაბლონ(ებ)ი:" -#: optiondialog.cpp:1159 +#: optiondialog.cpp:1207 #, kde-format msgid "" "Pattern(s) of files to be excluded from analysis. \n" @@ -2576,12 +2594,12 @@ "Wildcards: '*' და '?'\n" "რამდენიმე შაბლონის მითითება შეიძლება ';' გამყოფით" -#: optiondialog.cpp:1164 +#: optiondialog.cpp:1212 #, kde-format msgid "Dir-anti-pattern(s):" msgstr "Dir-ანტი-შაბლონ(ებ)ი:" -#: optiondialog.cpp:1170 +#: optiondialog.cpp:1218 #, kde-format msgid "" "Pattern(s) of directories to be excluded from analysis. \n" @@ -2592,35 +2610,35 @@ "Wildcards: '*' და '?'\n" "რამდენიმე შაბლონის მითითება შეიძლება ';' გამყოფით" -#: optiondialog.cpp:1175 +#: optiondialog.cpp:1223 #, kde-format msgid "Use .cvsignore" msgstr ".cvsignore-ის გამოყენება" -#: optiondialog.cpp:1179 +#: optiondialog.cpp:1227 #, kde-format msgid "" "Extends the antipattern to anything that would be ignored by CVS.\n" "Via local \".cvsignore\" files this can be directory specific." msgstr "" -#: optiondialog.cpp:1183 +#: optiondialog.cpp:1231 #, kde-format msgid "Find hidden files and directories" msgstr "დამალული ფაილების და დირექტორიების ძიება" -#: optiondialog.cpp:1186 +#: optiondialog.cpp:1234 #, fuzzy, kde-format #| msgid "Find hidden files and directories" msgid "Finds hidden files and directories." msgstr "დამალული ფაილების და დირექტორიების ძიება" -#: optiondialog.cpp:1189 +#: optiondialog.cpp:1237 #, kde-format msgid "Follow file links" msgstr "ფაილთა ბმულზე გადასვლა" -#: optiondialog.cpp:1193 +#: optiondialog.cpp:1241 #, kde-format msgid "" "On: Compare the file the link points to.\n" @@ -2629,12 +2647,12 @@ "ჩართულია: იმ ფაილთა შედარება რაზეც მიუთითებს ბმული.\n" "გამორთულია: ბმულების შედარება." -#: optiondialog.cpp:1197 +#: optiondialog.cpp:1245 #, kde-format msgid "Follow directory links" msgstr "დირექტორიათა ბმულზე გადასვლა" -#: optiondialog.cpp:1201 +#: optiondialog.cpp:1249 #, kde-format msgid "" "On: Compare the directory the link points to.\n" @@ -2643,12 +2661,12 @@ "ჩართულია: იმ დირექტორიათა შედარება რაზეც მიუთითებს ბმული.\n" "გამორთულია: ბმულების შედარება." -#: optiondialog.cpp:1210 +#: optiondialog.cpp:1258 #, kde-format msgid "Case sensitive filename comparison" msgstr "" -#: optiondialog.cpp:1214 +#: optiondialog.cpp:1262 #, kde-format msgid "" "The directory comparison will compare files or directories when their names " @@ -2657,52 +2675,52 @@ "off, otherwise on.)" msgstr "" -#: optiondialog.cpp:1218 +#: optiondialog.cpp:1266 #, fuzzy, kde-format #| msgid "Unfold All Subdirs" msgid "Unfold all subdirectories on load" msgstr "ყველა ქვედირექტორიის არჩაკეცვა" -#: optiondialog.cpp:1222 +#: optiondialog.cpp:1270 #, kde-format msgid "" "On: Unfold all subdirectories when starting a directory diff.\n" "Off: Leave subdirectories folded." msgstr "" -#: optiondialog.cpp:1226 +#: optiondialog.cpp:1274 #, kde-format msgid "Skip directory status report" msgstr "" -#: optiondialog.cpp:1230 +#: optiondialog.cpp:1278 #, kde-format msgid "" "On: Do not show the Directory Comparison Status.\n" "Off: Show the status dialog on start." msgstr "" -#: optiondialog.cpp:1234 +#: optiondialog.cpp:1282 #, kde-format msgid "File Comparison Mode" msgstr "ფაილთა შედარების რეჟიმი" -#: optiondialog.cpp:1239 +#: optiondialog.cpp:1287 #, kde-format msgid "Binary comparison" msgstr "ორობითი შედარება" -#: optiondialog.cpp:1241 +#: optiondialog.cpp:1289 #, kde-format msgid "Binary comparison of each file. (Default)" msgstr "ყოველი ფაილის ორობითი შედარება. (ნაგულისხმები)" -#: optiondialog.cpp:1244 +#: optiondialog.cpp:1292 #, kde-format msgid "Full analysis" msgstr "სრული ანალიზი" -#: optiondialog.cpp:1246 +#: optiondialog.cpp:1294 #, kde-format msgid "" "Do a full analysis and show statistics information in extra columns.\n" @@ -2711,12 +2729,12 @@ "სრული ანალიზის გაკეთება და სტატისტიკური ინფორმაციის ექსტრა სვეტში ასახვა.\n" "(უფრო ნელია ვიდრე ბინარული შედარება, ბევრად ნელი ბინარული ფაილებისთვის.)" -#: optiondialog.cpp:1250 +#: optiondialog.cpp:1298 #, fuzzy, kde-format msgid "Trust the size and modification date (unsafe)" msgstr "მოდიფიცირების თარიღი ნდობა (არაა სანდო)" -#: optiondialog.cpp:1252 +#: optiondialog.cpp:1300 #, fuzzy, kde-format msgid "" "Assume that files are equal if the modification date and file length are " @@ -2728,14 +2746,14 @@ "თუ მოდიფიცირების თარიღი და ფაილის ზომა ტოლია, მათ იდენტურად მიჩნევა.\n" "კარგია დიდი დირექტორიებისთვის და ნელი ქსელებისთვის." -#: optiondialog.cpp:1257 +#: optiondialog.cpp:1305 #, fuzzy, kde-format msgid "" "Trust the size and date, but use binary comparison if date does not match " "(unsafe)" msgstr "მოდიფიცირების თარიღი ნდობა (არაა სანდო)" -#: optiondialog.cpp:1259 +#: optiondialog.cpp:1307 #, fuzzy, kde-format msgid "" "Assume that files are equal if the modification date and file length are " @@ -2746,12 +2764,12 @@ "თუ მოდიფიცირების თარიღი და ფაილის ზომა ტოლია, მათ იდენტურად მიჩნევა.\n" "კარგია დიდი დირექტორიებისთვის და ნელი ქსელებისთვის." -#: optiondialog.cpp:1264 +#: optiondialog.cpp:1312 #, kde-format msgid "Trust the size (unsafe)" msgstr "ზომის ნდობა (არაა სანდო)" -#: optiondialog.cpp:1266 +#: optiondialog.cpp:1314 #, kde-format msgid "" "Assume that files are equal if their file lengths are equal.\n" @@ -2762,12 +2780,12 @@ "კარგია დიდი დირექტორიებისთვის და ნელი ქსელებისთვის, როდესაც მოდიფიკაციის დრო " "ჩამოქაჩვისას იცვლება." -#: optiondialog.cpp:1273 +#: optiondialog.cpp:1321 #, kde-format msgid "Synchronize directories" msgstr "დირექტორიების სინქრონიზაცია" -#: optiondialog.cpp:1277 +#: optiondialog.cpp:1325 #, kde-format msgid "" "Offers to store files in both directories so that\n" @@ -2775,12 +2793,12 @@ "Works only when comparing two directories without specifying a destination." msgstr "" -#: optiondialog.cpp:1283 +#: optiondialog.cpp:1331 #, kde-format msgid "White space differences considered equal" msgstr "ინტერვალების სხვაობის ტოლად ჩათვლა" -#: optiondialog.cpp:1287 +#: optiondialog.cpp:1335 #, kde-format msgid "" "If files differ only by white space consider them equal.\n" @@ -2789,12 +2807,12 @@ "თუ ფაილები მხოლოდ ინტერვალებით განსხვავდება, მათი ტოლად ჩათთვლა.\n" "ეს აქტიურია მხოლოდ თუ სრული ანალიზია არჩეული." -#: optiondialog.cpp:1293 +#: optiondialog.cpp:1341 #, kde-format msgid "Copy newer instead of merging (unsafe)" msgstr "შერწმის ნაცვლად ახლის ასლი (სახიფათო)" -#: optiondialog.cpp:1297 +#: optiondialog.cpp:1345 #, fuzzy, kde-format #| msgid "" #| "Don't look inside, just take the newer file.\n" @@ -2809,12 +2827,12 @@ "(გამოიყენეთ ეს მარტო მაშინ თუ იცით რას აკეთებთ!)\n" "მაშინაა ეფექტური, როდესაც ორ დირექტორიას ადარებთ." -#: optiondialog.cpp:1302 +#: optiondialog.cpp:1350 #, kde-format msgid "Backup files (.orig)" msgstr "სარეზერვო ასლის ფაილი (.orig)" -#: optiondialog.cpp:1306 +#: optiondialog.cpp:1354 #, fuzzy, kde-format #| msgid "" #| "When a file would be saved over an old file, then the old file\n" @@ -2826,17 +2844,17 @@ "როდესაც ფაილი ძველ ფაილზე უნდა იქნას შენახული, მაშინ ძველ ფაილს\n" "სახელი გადაერქმევა '.orig' გაფართოვებით იმის მაგივრად რომ წაიშალოს." -#: optiondialog.cpp:1382 optiondialog.cpp:1383 +#: optiondialog.cpp:1430 optiondialog.cpp:1431 #, kde-format msgid "Regional Settings" msgstr "რეგიონალური პარამეტრები" -#: optiondialog.cpp:1397 +#: optiondialog.cpp:1454 #, kde-format msgid "Use the same encoding for everything:" msgstr "ყველასთვის იგივე კოდირების გამოყენება:" -#: optiondialog.cpp:1401 +#: optiondialog.cpp:1458 #, kde-format msgid "" "Enable this allows to change all encodings by changing the first only.\n" @@ -2846,18 +2864,18 @@ "შეცვლით.\n" "გამორთეთ ეს თუ განსხვავებული ინდივიდუალურუი პარამეტრებია საჭირო." -#: optiondialog.cpp:1405 +#: optiondialog.cpp:1462 #, fuzzy, kde-format #| msgid "Note: Local Encoding is " msgid "Note: Local Encoding is \"%1\"" msgstr "შენიშვნა: ლოკალური კოდირება არის" -#: optiondialog.cpp:1409 +#: optiondialog.cpp:1466 #, kde-format msgid "File Encoding for A:" msgstr "ფაილის კოდირება A-თვის:" -#: optiondialog.cpp:1416 +#: optiondialog.cpp:1473 #, kde-format msgid "" "If enabled then Unicode (UTF-16 or UTF-8) encoding will be detected.\n" @@ -2866,32 +2884,32 @@ "(Unicode detection depends on the first bytes of a file.)" msgstr "" -#: optiondialog.cpp:1419 optiondialog.cpp:1430 optiondialog.cpp:1441 +#: optiondialog.cpp:1476 optiondialog.cpp:1487 optiondialog.cpp:1498 #, kde-format msgid "Auto Detect Unicode" msgstr "" -#: optiondialog.cpp:1425 +#: optiondialog.cpp:1482 #, kde-format msgid "File Encoding for B:" msgstr "ფაილის კოდირება B-თვის:" -#: optiondialog.cpp:1436 +#: optiondialog.cpp:1493 #, kde-format msgid "File Encoding for C:" msgstr "ფაილის კოდირება C-თვის:" -#: optiondialog.cpp:1447 +#: optiondialog.cpp:1504 #, kde-format msgid "File Encoding for Merge Output and Saving:" msgstr "ფაილის კოდირება გამონატანის შერწყმისა და შენახვისთვის:" -#: optiondialog.cpp:1452 +#: optiondialog.cpp:1509 #, fuzzy, kde-format msgid "Auto Select" msgstr "მონიშვნის ავტო ასლი" -#: optiondialog.cpp:1456 +#: optiondialog.cpp:1513 #, kde-format msgid "" "If enabled then the encoding from the input files is used.\n" @@ -2899,17 +2917,17 @@ "saving." msgstr "" -#: optiondialog.cpp:1459 +#: optiondialog.cpp:1516 #, kde-format msgid "File Encoding for Preprocessor Files:" msgstr "ფაილის კოდირება -პრეპროცესორის ფაილებისთვის:" -#: optiondialog.cpp:1471 +#: optiondialog.cpp:1528 #, kde-format msgid "Right To Left Language" msgstr "მარჯვნიდან მარცხნივ ენა" -#: optiondialog.cpp:1475 +#: optiondialog.cpp:1532 #, kde-format msgid "" "Some languages are read from right to left.\n" @@ -2918,22 +2936,22 @@ "ზოგი ენა მარჯვნიდან მარცხნივ იკითხება.\n" "ეს პარამეტრი შეცვლის ხედს და რედაქტორს." -#: optiondialog.cpp:1485 +#: optiondialog.cpp:1542 #, fuzzy, kde-format msgid "Integration" msgstr "ოპერაცია" -#: optiondialog.cpp:1486 +#: optiondialog.cpp:1543 #, fuzzy, kde-format msgid "Integration Settings" msgstr "რეგიონალური პარამეტრები" -#: optiondialog.cpp:1499 +#: optiondialog.cpp:1564 #, kde-format msgid "Command line options to ignore:" msgstr "" -#: optiondialog.cpp:1505 +#: optiondialog.cpp:1570 #, kde-format msgid "" "List of command line options that should be ignored when KDiff3 is used by " @@ -2942,19 +2960,19 @@ "This will suppress the \"Unknown option\" error." msgstr "" -#: optiondialog.cpp:1510 +#: optiondialog.cpp:1575 #, kde-format msgid "Quit also via Escape key" msgstr "" -#: optiondialog.cpp:1514 +#: optiondialog.cpp:1579 #, kde-format msgid "" "Fast method to exit.\n" "For those who are used to using the Escape key." msgstr "" -#: optiondialog.cpp:1598 +#: optiondialog.cpp:1653 #, kde-format msgid "This resets all options. Not only those of the current topic." msgstr "" @@ -3015,77 +3033,68 @@ msgid "Disable Unsafe Options" msgstr "სახიფათო პარამეტრების გამორთვა" -#: pdiff.cpp:158 +#: pdiff.cpp:160 #, kde-format msgid "Loading A" msgstr "იტვირთება A" -#: pdiff.cpp:167 -#, kde-format -msgid "Errors occurred during pre-processing of file A." -msgstr "" +#: pdiff.cpp:162 +#, fuzzy, kde-format +#| msgid "Loading A" +msgid "Loading A: %1" +msgstr "იტვირთება A" -#: pdiff.cpp:172 +#: pdiff.cpp:170 #, kde-format msgid "Loading B" msgstr "იტვირთება B" -#: pdiff.cpp:179 -#, kde-format -msgid "Errors occurred during pre-processing of file B." -msgstr "" - -#: pdiff.cpp:202 pdiff.cpp:241 +#: pdiff.cpp:201 pdiff.cpp:237 #, kde-format msgid "Diff: A <-> B" msgstr "Diff: A <-> B" -#: pdiff.cpp:208 pdiff.cpp:279 pdiff.cpp:293 +#: pdiff.cpp:207 pdiff.cpp:275 pdiff.cpp:289 #, kde-format msgid "Linediff: A <-> B" msgstr "Linediff: A <-> B" -#: pdiff.cpp:225 +#: pdiff.cpp:224 #, kde-format msgid "Loading C" msgstr "იტვირთება C" -#: pdiff.cpp:232 -#, kde-format -msgid "Errors occurred during pre-processing of file C." -msgstr "" - -#: pdiff.cpp:250 +#: pdiff.cpp:246 #, kde-format msgid "Diff: A <-> C" msgstr "Diff: A <-> C" -#: pdiff.cpp:261 +#: pdiff.cpp:257 #, kde-format msgid "Diff: B <-> C" msgstr "Diff: B <-> C" -#: pdiff.cpp:283 pdiff.cpp:297 +#: pdiff.cpp:279 pdiff.cpp:293 #, kde-format msgid "Linediff: B <-> C" msgstr "Linediff: B <-> C" -#: pdiff.cpp:287 pdiff.cpp:301 +#: pdiff.cpp:283 pdiff.cpp:297 #, kde-format msgid "Linediff: A <-> C" msgstr "Linediff: A <-> C" -#: pdiff.cpp:829 +#: pdiff.cpp:819 #, fuzzy, kde-format msgid "All input files contain the same text, but are not binary equal." msgstr "ყველა შეტანილი ფაილის შეიცავს ერთიდაიგივე ტექსტი." -#: pdiff.cpp:835 pdiff.cpp:839 pdiff.cpp:843 +#: pdiff.cpp:825 pdiff.cpp:829 pdiff.cpp:833 #, fuzzy, kde-format msgid "Files %1 and %2 have equal text, but are not binary equal. \n" msgstr "A და B ბინარულად ტოლია.\n" -#: pdiff.cpp:853 +#: pdiff.cpp:843 #, fuzzy, kde-format #| msgid "" #| "Some inputfiles don't seem to be pure textfiles.\n" @@ -3100,17 +3109,17 @@ "გაითვალისწინეთ რომ KDiff3-შერწყმა არ გულისხმობს ბინარულ მონაცემებს.\n" "გააგრძელეთ საკუთარი თავის იმედათ." -#: pdiff.cpp:863 +#: pdiff.cpp:853 #, kde-format msgid ", B" msgstr "" -#: pdiff.cpp:865 +#: pdiff.cpp:855 #, kde-format msgid ", C" msgstr "" -#: pdiff.cpp:867 +#: pdiff.cpp:857 #, kde-format msgid "" "Some input characters could not be converted to valid unicode.\n" @@ -3119,77 +3128,72 @@ "Affected input files are in %1." msgstr "" -#: pdiff.cpp:1034 +#: pdiff.cpp:1032 #, kde-format msgid "Abort" msgstr "შეწყვეტა" -#: pdiff.cpp:1040 pdiff.cpp:1130 +#: pdiff.cpp:1038 pdiff.cpp:1129 #, kde-format msgid "Opening files..." msgstr "ფაილთა გახსნა..." -#: pdiff.cpp:1107 -#, kde-format -msgid "File open error" -msgstr "ფაილის გახსნის შეცდომა" - -#: pdiff.cpp:1202 +#: pdiff.cpp:1212 #, kde-format msgid "Cutting selection..." msgstr "მონიშნული ფრაგმენტის მოჭრა..." -#: pdiff.cpp:1223 +#: pdiff.cpp:1233 #, kde-format msgid "Copying selection to clipboard..." msgstr "მონიშნულის გაცვლით ბიფერში განთავსება..." -#: pdiff.cpp:1239 +#: pdiff.cpp:1249 #, kde-format msgid "Inserting clipboard contents..." msgstr "გაცვლის ბუფერის შიგთავსის ჩასმა..." -#: pdiff.cpp:1695 +#: pdiff.cpp:1705 #, kde-format msgid "Word wrap (Cancel disables word wrap)" msgstr "" -#: pdiff.cpp:1696 +#: pdiff.cpp:1706 #, kde-format msgid "Calculating max width for horizontal scrollbar" msgstr "" -#: pdiff.cpp:1911 +#: pdiff.cpp:1921 #, kde-format msgid "Save && Continue" msgstr "შენახვა და გაგრძელება" -#: pdiff.cpp:1912 +#: pdiff.cpp:1922 #, kde-format msgid "Continue Without Saving" msgstr "შენახვის გარეშე გაგრძელება" -#: pdiff.cpp:2124 +#: pdiff.cpp:2134 #, kde-format msgid "Search complete." msgstr "ძიება დასრულდა." -#: pdiff.cpp:2124 +#: pdiff.cpp:2134 #, kde-format msgid "Search Complete" msgstr "ძიება დასრულდა" -#: pdiff.cpp:2375 +#: pdiff.cpp:2385 #, kde-format msgid "Nothing is selected in either diff input window." msgstr "" -#: pdiff.cpp:2375 +#: pdiff.cpp:2385 #, fuzzy, kde-format msgid "Error while adding manual diff range" msgstr "დირექტორიის შექმნისას შეცდომა." -#: progress.cpp:59 progress.cpp:71 +#: progress.cpp:61 progress.cpp:73 #, kde-format msgid "&Cancel" msgstr "" @@ -3199,190 +3203,190 @@ msgid "A (Base):" msgstr "A (ფუძე):" -#: smalldialogs.cpp:68 smalldialogs.cpp:85 smalldialogs.cpp:102 -#: smalldialogs.cpp:144 +#: smalldialogs.cpp:71 smalldialogs.cpp:90 smalldialogs.cpp:109 +#: smalldialogs.cpp:154 #, kde-format msgid "File..." msgstr "ფაილი..." -#: smalldialogs.cpp:70 smalldialogs.cpp:87 smalldialogs.cpp:104 -#: smalldialogs.cpp:146 +#: smalldialogs.cpp:73 smalldialogs.cpp:92 smalldialogs.cpp:111 +#: smalldialogs.cpp:156 #, kde-format msgid "Dir..." msgstr "Dir..." -#: smalldialogs.cpp:96 +#: smalldialogs.cpp:103 #, kde-format msgid "C (Optional):" msgstr "C (არასავალდებულო_:" -#: smalldialogs.cpp:119 +#: smalldialogs.cpp:126 #, kde-format msgid "Swap/Copy Names..." msgstr "" -#: smalldialogs.cpp:124 smalldialogs.cpp:125 smalldialogs.cpp:126 +#: smalldialogs.cpp:131 smalldialogs.cpp:132 smalldialogs.cpp:133 #, kde-format msgid "Swap %1<->%2" msgstr "" -#: smalldialogs.cpp:127 smalldialogs.cpp:128 smalldialogs.cpp:129 +#: smalldialogs.cpp:134 smalldialogs.cpp:135 smalldialogs.cpp:136 #, kde-format msgid "Copy %1->Output" msgstr "" -#: smalldialogs.cpp:130 smalldialogs.cpp:131 smalldialogs.cpp:132 +#: smalldialogs.cpp:137 smalldialogs.cpp:138 smalldialogs.cpp:139 #, kde-format msgid "Swap %1<->Output" msgstr "" -#: smalldialogs.cpp:138 +#: smalldialogs.cpp:148 #, kde-format msgid "Output (optional):" msgstr "გამონატანი (არასავალდებულო):" -#: smalldialogs.cpp:168 +#: smalldialogs.cpp:178 #, kde-format msgid "Configure..." msgstr "კონფიგურაცია..." -#: smalldialogs.cpp:233 +#: smalldialogs.cpp:243 #, fuzzy, kde-format #| msgid "&Directory" msgid "Open Directory" msgstr "&დირექტორია" -#: smalldialogs.cpp:234 +#: smalldialogs.cpp:244 #, kde-format msgid "Select Output File" msgstr "" -#: smalldialogs.cpp:393 +#: smalldialogs.cpp:403 #, kde-format msgid "Search text:" msgstr "ტექსტის ძიება:" -#: smalldialogs.cpp:400 +#: smalldialogs.cpp:410 #, kde-format msgid "Case sensitive" msgstr "რეგისტრისადმი მგძნობიარე" -#: smalldialogs.cpp:403 +#: smalldialogs.cpp:413 #, kde-format msgid "Search A" msgstr "ძიება A" -#: smalldialogs.cpp:408 +#: smalldialogs.cpp:418 #, kde-format msgid "Search B" msgstr "ძიება B" -#: smalldialogs.cpp:413 +#: smalldialogs.cpp:423 #, kde-format msgid "Search C" msgstr "ძიება C" -#: smalldialogs.cpp:418 +#: smalldialogs.cpp:428 #, kde-format msgid "Search output" msgstr "გამონატანის ძიება" -#: smalldialogs.cpp:425 +#: smalldialogs.cpp:435 #, kde-format msgid "&Search" msgstr "ძიე&ბა" -#: smalldialogs.cpp:444 +#: smalldialogs.cpp:454 #, kde-format msgid "Regular Expression Tester" msgstr "" -#: smalldialogs.cpp:457 +#: smalldialogs.cpp:467 #, kde-format msgid "Example auto merge line:" msgstr "" -#: smalldialogs.cpp:459 +#: smalldialogs.cpp:469 #, kde-format msgid "To test auto merge, copy a line as used in your files." msgstr "" -#: smalldialogs.cpp:465 smalldialogs.cpp:493 smalldialogs.cpp:529 +#: smalldialogs.cpp:475 smalldialogs.cpp:503 smalldialogs.cpp:539 #, kde-format msgid "Match result:" msgstr "" -#: smalldialogs.cpp:484 +#: smalldialogs.cpp:494 #, kde-format msgid "Example history start line (with leading comment):" msgstr "" -#: smalldialogs.cpp:486 +#: smalldialogs.cpp:496 #, kde-format msgid "" "Copy a history start line as used in your files,\n" "including the leading comment." msgstr "" -#: smalldialogs.cpp:512 +#: smalldialogs.cpp:522 #, kde-format msgid "History sort key order:" msgstr "" -#: smalldialogs.cpp:520 +#: smalldialogs.cpp:530 #, kde-format msgid "Example history entry start line (without leading comment):" msgstr "" -#: smalldialogs.cpp:522 +#: smalldialogs.cpp:532 #, kde-format msgid "" "Copy a history entry start line as used in your files,\n" "but omit the leading comment." msgstr "" -#: smalldialogs.cpp:536 +#: smalldialogs.cpp:546 #, kde-format msgid "Sort key result:" msgstr "" -#: smalldialogs.cpp:584 smalldialogs.cpp:594 smalldialogs.cpp:614 +#: smalldialogs.cpp:594 smalldialogs.cpp:604 smalldialogs.cpp:624 #, kde-format msgid "Match success." msgstr "" -#: smalldialogs.cpp:588 smalldialogs.cpp:598 smalldialogs.cpp:620 +#: smalldialogs.cpp:598 smalldialogs.cpp:608 smalldialogs.cpp:630 #, fuzzy, kde-format msgid "Match failed." msgstr "შენახვა ვერ შედგა." -#: smalldialogs.cpp:605 +#: smalldialogs.cpp:615 #, kde-format msgid "Opening and closing parentheses do not match in regular expression." msgstr "" -#: SourceData.cpp:150 +#: SourceData.cpp:153 #, kde-format msgid "Writing clipboard data to temp file failed." msgstr "ბუფერის მონაცემის დროებით ფაილში ჩაწერა ვერ შედგა." -#: SourceData.cpp:154 +#: SourceData.cpp:157 #, kde-format msgid "From Clipboard" msgstr "გაცვლის ბუფერიდან " -#: SourceData.cpp:335 +#: SourceData.cpp:348 #, fuzzy, kde-format #| msgid "Mix of links and normal files." msgid "%1 is not a normal file." msgstr "ბმულების და ჩოულებრივი ფაილების ნარევი." -#: SourceData.cpp:427 +#: SourceData.cpp:440 #, kde-format msgid " Temp file is: %1" msgstr "" -#: SourceData.cpp:432 +#: SourceData.cpp:445 #, kde-format msgid "" "Preprocessing possibly failed. Check this command:\n" @@ -3397,12 +3401,12 @@ "\n" "გაგრძელების ბრძანება ახლა გამოირთვება." -#: SourceData.cpp:443 SourceData.cpp:512 +#: SourceData.cpp:456 SourceData.cpp:525 #, kde-format msgid "File %1 too large to process. Skipping." msgstr "" -#: SourceData.cpp:487 +#: SourceData.cpp:500 #, kde-format msgid "" "The line-matching-preprocessing possibly failed. Check this command:\n" diff -Nru kdiff3-1.8.01/po/ko/diff_ext.po kdiff3-1.8.3/po/ko/diff_ext.po --- kdiff3-1.8.01/po/ko/diff_ext.po 2019-05-18 01:02:10.000000000 +0000 +++ kdiff3-1.8.3/po/ko/diff_ext.po 2020-06-25 00:18:32.000000000 +0000 @@ -1,13 +1,13 @@ # Copyright (C) YEAR This file is copyright: # This file is distributed under the same license as the kdiff3 package. -# Shinjo Park , 2019. +# Shinjo Park , 2019, 2020. # msgid "" msgstr "" "Project-Id-Version: kdiff3\n" -"Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2019-03-22 03:09+0100\n" -"PO-Revision-Date: 2019-04-11 23:54+0100\n" +"Report-Msgid-Bugs-To: https://bugs.kde.org\n" +"POT-Creation-Date: 2019-11-04 07:54+0100\n" +"PO-Revision-Date: 2020-04-05 01:41+0200\n" "Last-Translator: Shinjo Park \n" "Language-Team: Korean \n" "Language: ko\n" @@ -15,119 +15,114 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -"X-Generator: Lokalize 2.0\n" +"X-Generator: Lokalize 19.04.3\n" -#: diff_ext.cpp:391 +#: diff_ext.cpp:223 #, kde-format msgid "Compare with %1" -msgstr "%1과(와) 비교하기" +msgstr "%1와(과) 비교하기" -#: diff_ext.cpp:392 +#: diff_ext.cpp:224 #, kde-format msgid "Merge with %1" -msgstr "%1과(와) 합치기" +msgstr "%1와(과) 합치기" -#: diff_ext.cpp:408 +#: diff_ext.cpp:234 #, kde-format msgid "3-way merge with base" msgstr "기반이 있는 3중 결합" -#: diff_ext.cpp:411 +#: diff_ext.cpp:237 #, kde-format msgid "Save '%1' for later" -msgstr "나중을 위하여 '%1' 저장" +msgstr "나중에 사용하려고 '%1' 저장" -#: diff_ext.cpp:426 +#: diff_ext.cpp:251 #, kde-format msgid "Compare with ..." msgstr "다음과 비교..." -#: diff_ext.cpp:429 +#: diff_ext.cpp:254 #, kde-format msgid "Clear list" msgstr "목록 비우기" -#: diff_ext.cpp:434 +#: diff_ext.cpp:259 #, kde-format msgid "Compare" msgstr "비교" -#: diff_ext.cpp:438 +#: diff_ext.cpp:263 #, kde-format msgid "3 way comparison" msgstr "3중 비교" -#: diff_ext.cpp:444 +#: diff_ext.cpp:269 #, kde-format msgid "About Diff-Ext ..." msgstr "Diff-Ext 정보..." -#: diff_ext.cpp:515 +#: diff_ext.cpp:340 #, kde-format msgid "(32 Bit)" msgstr "(32비트)" -#: diff_ext.cpp:517 -#, kde-format -msgid "(64 Bit)" -msgstr "(64비트)" - -#: diff_ext.cpp:518 +#: diff_ext.cpp:342 #, kde-format msgid "Diff-Ext Copyright (c) 2003-2006, Sergey Zorin. All rights reserved.\n" msgstr "Diff-Ext Copyright (c) 2003-2006, Sergey Zorin. All rights reserved.\n" -#: diff_ext.cpp:519 +#: diff_ext.cpp:343 #, kde-format msgid "This software is distributable under the BSD-2-Clause license.\n" msgstr "This software is distributable under the BSD-2-Clause license.\n" -#: diff_ext.cpp:520 +#: diff_ext.cpp:344 #, kde-format msgid "Some extensions for KDiff3 (c) 2006-2013 by Joachim Eibl.\n" msgstr "Some extensions for KDiff3 (c) 2006-2013 by Joachim Eibl.\n" -#: diff_ext.cpp:521 +#: diff_ext.cpp:345 #, kde-format msgid "Homepage for Diff-Ext: http://diff-ext.sourceforge.net\n" msgstr "Diff-Ext 홈페이지: http://diff-ext.sourceforge.net\n" -#: diff_ext.cpp:522 +#: diff_ext.cpp:346 #, kde-format msgid "About Diff-Ext for KDiff3 " msgstr "KDiff3 Diff-Ext 정보" -#: diff_ext.cpp:551 +#: diff_ext.cpp:375 #, kde-format msgid "Compare selected files" msgstr "선택한 파일 비교" -#: diff_ext.cpp:557 diff_ext.cpp:577 +#: diff_ext.cpp:381 diff_ext.cpp:399 #, kde-format msgid "Compare '%1' with '%2'" msgstr "'%1'과(와) '%2' 비교하기" -#: diff_ext.cpp:563 +#: diff_ext.cpp:386 #, kde-format msgid "Save '%1' for later operation" -msgstr "나중에 사용하기 위해 '%1' 저장" +msgstr "나중에 사용하려고 '%1' 저장" -#: diff_ext.cpp:619 +#: diff_ext.cpp:440 #, kde-format msgid "Could not start KDiff3. Please rerun KDiff3 installation." msgstr "KDiff3을 시작할 수 없습니다. KDiff3을 다시 설치하십시오." -#: diff_ext.cpp:620 +#: diff_ext.cpp:441 #, kde-format msgid "Command" msgstr "명령" -#: diff_ext.cpp:621 +#: diff_ext.cpp:442 #, kde-format msgid "CommandLine" -msgstr "명령줄" +msgstr "명령행" -#: diff_ext.cpp:622 +#: diff_ext.cpp:443 #, kde-format msgid "Diff-Ext For KDiff3" msgstr "KDiff3용 Diff-Ext" \ No newline at end of file diff -Nru kdiff3-1.8.01/po/ko/kdiff3fileitemactionplugin.po kdiff3-1.8.3/po/ko/kdiff3fileitemactionplugin.po --- kdiff3-1.8.01/po/ko/kdiff3fileitemactionplugin.po 2019-05-18 01:02:10.000000000 +0000 +++ kdiff3-1.8.3/po/ko/kdiff3fileitemactionplugin.po 2020-06-25 00:18:32.000000000 +0000 @@ -1,13 +1,13 @@ # Copyright (C) YEAR This_file_is_part_of_KDE # This file is distributed under the same license as the PACKAGE package. +# Shinjo Park , 2014, 2019, 2020. # -# Shinjo Park , 2014. msgid "" msgstr "" "Project-Id-Version: \n" -"Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2019-03-22 03:09+0100\n" -"PO-Revision-Date: 2014-03-03 04:04+0900\n" +"Report-Msgid-Bugs-To: https://bugs.kde.org\n" +"POT-Creation-Date: 2019-08-30 07:40+0200\n" +"PO-Revision-Date: 2020-04-05 01:42+0200\n" "Last-Translator: Shinjo Park \n" "Language-Team: Korean \n" "Language: ko\n" @@ -15,27 +15,27 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" +"X-Generator: Lokalize 19.04.3\n" #: kdiff3fileitemaction.cpp:92 -#, fuzzy, kde-format -#| msgid "KDiff3 ..." +#, kde-format msgid "KDiff3..." -msgstr "KDiff3 ..." +msgstr "KDiff3..." #: kdiff3fileitemaction.cpp:124 #, kde-format msgid "Compare with %1" -msgstr "%1과(와) 비교하기" +msgstr "%1와(과) 비교하기" #: kdiff3fileitemaction.cpp:130 #, kde-format msgid "Merge with %1" -msgstr "%1과(와) 합치기" +msgstr "%1와(과) 합치기" #: kdiff3fileitemaction.cpp:136 #, kde-format msgid "Save '%1' for later" -msgstr "나중을 위하여 '%1' 저장" +msgstr "나중에 사용하려고 '%1' 저장" #: kdiff3fileitemaction.cpp:142 #, kde-format @@ -43,8 +43,7 @@ msgstr "기반이 있는 3중 결합" #: kdiff3fileitemaction.cpp:149 -#, fuzzy, kde-format -#| msgid "Compare with ..." +#, kde-format msgid "Compare with..." msgstr "다음과 비교..." @@ -64,35 +63,17 @@ msgstr "3중 비교" #: kdiff3fileitemaction.cpp:179 -#, fuzzy, kde-format -#| msgid "About KDiff3 menu plugin ..." +#, kde-format msgid "About KDiff3 menu plugin..." msgstr "KDiff3 메뉴 플러그인 정보..." #: kdiff3fileitemaction.cpp:287 -#, fuzzy, kde-format -#| msgid "" -#| "KDiff3 File Item Action Plugin: Copyright (C) 2011 Joachim Eibl\n" -#| "KDiff3 homepage: http://kdiff3.sourceforge.net\n" -#| "\n" +#, kde-format msgid "KDiff3 File Item Action Plugin: Copyright (C) 2011 Joachim Eibl\n" -msgstr "" -"KDiff3 파일 항목 동작 플러그인: Copyright (C) 2011 Joachim Eibl\n" -"KDiff3 홈페이지: http://kdiff3.sourceforge.net\n" -"\n" +msgstr "KDiff3 파일 항목 동작 플러그인: Copyright (C) 2011 Joachim Eibl\n" #: kdiff3fileitemaction.cpp:288 -#, fuzzy, kde-format -#| msgid "" -#| "Using the contextmenu extension:\n" -#| "For simple comparison of two selected 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." +#, kde-format msgid "" "Using the context menu extension:\n" "For simple comparison of two selected files choose \"Compare\".\n" @@ -104,7 +85,7 @@ "destination.\n" "Same also applies to directory comparison and merge." msgstr "" -"컨텍스트 메뉴 확장 기능 사용 방법:\n" +"콘텍스트 메뉴 확장 기능 사용 방법:\n" "두 선택된 파일을 단순히 비교하려면 \"비교\"를 누르십시오.\n" "다른 파일이 다른 곳에 있으면 \"저장\"을 눌러서 파일을 기억해 두십시오. \"다음" "과 비교...\" 하위 메뉴에 나타납니다. 그 다음 \"다음과 비교\"를 두 번째 파일에" diff -Nru kdiff3-1.8.01/po/ko/kdiff3.po kdiff3-1.8.3/po/ko/kdiff3.po --- kdiff3-1.8.01/po/ko/kdiff3.po 2019-05-18 01:02:10.000000000 +0000 +++ kdiff3-1.8.3/po/ko/kdiff3.po 2020-06-25 00:18:32.000000000 +0000 @@ -1,13 +1,14 @@ # Copyright (C) YEAR This_file_is_part_of_KDE # This file is distributed under the same license as the PACKAGE package. -# Shinjo Park , 2014, 2015. +# Shinjo Park , 2014, 2015, 2019, 2020. +# JungHee Lee , 2019. # msgid "" msgstr "" "Project-Id-Version: \n" -"Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2019-04-18 08:02+0200\n" -"PO-Revision-Date: 2015-01-18 01:02+0900\n" +"Report-Msgid-Bugs-To: https://bugs.kde.org\n" +"POT-Creation-Date: 2020-06-22 07:48+0200\n" +"PO-Revision-Date: 2020-04-21 00:23+0200\n" "Last-Translator: Shinjo Park \n" "Language-Team: Korean \n" "Language: ko\n" @@ -15,303 +16,297 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -"X-Generator: Lokalize 1.5\n" +"X-Generator: Lokalize 19.04.3\n" #, kde-format msgctxt "NAME OF TRANSLATORS" msgid "Your names" -msgstr "Shinjo Park" +msgstr "박신조,이정희" #, kde-format msgctxt "EMAIL OF TRANSLATORS" msgid "Your emails" -msgstr "kde@peremen.name" +msgstr "kde@peremen.name,daemul72@gmail.com" -#: difftextwindow.cpp:412 +#: difftextwindow.cpp:414 #, kde-format msgid "File %1: Line %2" -msgstr "" +msgstr "파일 %1: 줄 %2" -#: difftextwindow.cpp:414 -#, fuzzy, kde-format -#| msgid "Line not available" +#: difftextwindow.cpp:416 +#, kde-format msgid "File %1: Line not available" -msgstr "줄을 사용할 수 없음" +msgstr "파일 %1: 줄을 사용할 수 없음" -#: difftextwindow.cpp:1780 +#: difftextwindow.cpp:1778 #, kde-format msgid "Encoding:" msgstr "인코딩:" -#: difftextwindow.cpp:1782 mergeresultwindow.cpp:3138 optiondialog.cpp:818 +#: difftextwindow.cpp:1781 mergeresultwindow.cpp:3166 optiondialog.cpp:840 #, kde-format msgid "Line end style:" msgstr "줄 끝 스타일:" -#: difftextwindow.cpp:1810 directorymergewindow.cpp:382 -#: directorymergewindow.cpp:433 directorymergewindow.cpp:524 -#: directorymergewindow.cpp:3058 directorymergewindow.cpp:3189 -#: directorymergewindow.cpp:3417 mergeresultwindow.cpp:942 -#: mergeresultwindow.cpp:944 mergeresultwindow.cpp:946 -#: mergeresultwindow.cpp:948 mergeresultwindow.cpp:1814 -#: mergeresultwindow.cpp:3170 mergeresultwindow.cpp:3177 optiondialog.cpp:962 -#: optiondialog.cpp:975 pdiff.cpp:833 pdiff.cpp:835 pdiff.cpp:837 pdiff.cpp:839 -#: pdiff.cpp:861 smalldialogs.cpp:124 smalldialogs.cpp:126 smalldialogs.cpp:127 -#: smalldialogs.cpp:130 +#: difftextwindow.cpp:1809 directorymergewindow.cpp:383 +#: directorymergewindow.cpp:434 directorymergewindow.cpp:525 +#: directorymergewindow.cpp:3072 directorymergewindow.cpp:3203 +#: directorymergewindow.cpp:3431 mergeresultwindow.cpp:970 +#: mergeresultwindow.cpp:972 mergeresultwindow.cpp:974 +#: mergeresultwindow.cpp:976 mergeresultwindow.cpp:1842 +#: mergeresultwindow.cpp:3198 mergeresultwindow.cpp:3205 optiondialog.cpp:1002 +#: optiondialog.cpp:1015 pdiff.cpp:823 pdiff.cpp:825 pdiff.cpp:827 +#: pdiff.cpp:829 pdiff.cpp:851 smalldialogs.cpp:131 smalldialogs.cpp:133 +#: smalldialogs.cpp:134 smalldialogs.cpp:137 #, kde-format msgid "A" msgstr "A" -#: difftextwindow.cpp:1810 directorymergewindow.cpp:384 -#: directorymergewindow.cpp:436 directorymergewindow.cpp:526 -#: directorymergewindow.cpp:3064 directorymergewindow.cpp:3190 -#: directorymergewindow.cpp:3418 mergeresultwindow.cpp:942 -#: mergeresultwindow.cpp:944 mergeresultwindow.cpp:950 -#: mergeresultwindow.cpp:952 mergeresultwindow.cpp:1816 -#: mergeresultwindow.cpp:3172 mergeresultwindow.cpp:3179 optiondialog.cpp:963 -#: optiondialog.cpp:976 pdiff.cpp:833 pdiff.cpp:835 pdiff.cpp:841 pdiff.cpp:843 -#: pdiff.cpp:863 smalldialogs.cpp:124 smalldialogs.cpp:125 smalldialogs.cpp:128 -#: smalldialogs.cpp:131 +#: difftextwindow.cpp:1809 directorymergewindow.cpp:385 +#: directorymergewindow.cpp:437 directorymergewindow.cpp:527 +#: directorymergewindow.cpp:3078 directorymergewindow.cpp:3204 +#: directorymergewindow.cpp:3432 mergeresultwindow.cpp:970 +#: mergeresultwindow.cpp:972 mergeresultwindow.cpp:978 +#: mergeresultwindow.cpp:980 mergeresultwindow.cpp:1844 +#: mergeresultwindow.cpp:3200 mergeresultwindow.cpp:3207 optiondialog.cpp:1003 +#: optiondialog.cpp:1016 pdiff.cpp:823 pdiff.cpp:825 pdiff.cpp:831 +#: pdiff.cpp:833 pdiff.cpp:853 smalldialogs.cpp:131 smalldialogs.cpp:132 +#: smalldialogs.cpp:135 smalldialogs.cpp:138 #, kde-format msgid "B" msgstr "B" -#: difftextwindow.cpp:1810 directorymergewindow.cpp:386 -#: directorymergewindow.cpp:439 directorymergewindow.cpp:528 -#: directorymergewindow.cpp:3070 directorymergewindow.cpp:3191 -#: directorymergewindow.cpp:3419 mergeresultwindow.cpp:946 -#: mergeresultwindow.cpp:948 mergeresultwindow.cpp:950 -#: mergeresultwindow.cpp:952 mergeresultwindow.cpp:1818 -#: mergeresultwindow.cpp:3174 mergeresultwindow.cpp:3181 optiondialog.cpp:977 -#: pdiff.cpp:837 pdiff.cpp:839 pdiff.cpp:841 pdiff.cpp:843 pdiff.cpp:865 -#: smalldialogs.cpp:125 smalldialogs.cpp:126 smalldialogs.cpp:129 -#: smalldialogs.cpp:132 +#: difftextwindow.cpp:1809 directorymergewindow.cpp:387 +#: directorymergewindow.cpp:440 directorymergewindow.cpp:529 +#: directorymergewindow.cpp:3084 directorymergewindow.cpp:3205 +#: directorymergewindow.cpp:3433 mergeresultwindow.cpp:974 +#: mergeresultwindow.cpp:976 mergeresultwindow.cpp:978 +#: mergeresultwindow.cpp:980 mergeresultwindow.cpp:1846 +#: mergeresultwindow.cpp:3202 mergeresultwindow.cpp:3209 optiondialog.cpp:1017 +#: pdiff.cpp:827 pdiff.cpp:829 pdiff.cpp:831 pdiff.cpp:833 pdiff.cpp:855 +#: smalldialogs.cpp:132 smalldialogs.cpp:133 smalldialogs.cpp:136 +#: smalldialogs.cpp:139 #, kde-format msgid "C" msgstr "C" -#: difftextwindow.cpp:1810 -#, fuzzy, kde-format -#| msgid "A (Base):" +#: difftextwindow.cpp:1809 +#, kde-format msgid "A (Base)" -msgstr "A(기반):" +msgstr "A(기반)" -#: difftextwindow.cpp:1812 -#, fuzzy, kde-format -#| msgid "Encoding:" +#: difftextwindow.cpp:1811 +#, kde-format msgid "Encoding: %1" -msgstr "인코딩:" +msgstr "인코딩: %1" -#: difftextwindow.cpp:1813 mergeresultwindow.cpp:3183 +#: difftextwindow.cpp:1812 mergeresultwindow.cpp:3211 #, kde-format msgid "Unix" msgstr "유닉스" -#: difftextwindow.cpp:1813 mergeresultwindow.cpp:3184 +#: difftextwindow.cpp:1812 mergeresultwindow.cpp:3212 #, kde-format msgid "DOS" msgstr "DOS" -#: difftextwindow.cpp:1813 -#, fuzzy, kde-format -#| msgid "Line end style:" +#: difftextwindow.cpp:1812 +#, kde-format msgid "Line end style: %1" -msgstr "줄 끝 스타일:" +msgstr "줄 끝 스타일: %1" -#: difftextwindow.cpp:1835 kdiff3.cpp:873 +#: difftextwindow.cpp:1834 kdiff3.cpp:874 #, kde-format msgid "Top line" msgstr "맨 첫 줄" -#: difftextwindow.cpp:1845 +#: difftextwindow.cpp:1843 #, kde-format msgid "End" msgstr "끝" -#: difftextwindow.cpp:1903 smalldialogs.cpp:235 -#, fuzzy, kde-format -#| msgid "Opening files..." +#: difftextwindow.cpp:1901 smalldialogs.cpp:245 +#, kde-format msgid "Open File" -msgstr "파일 여는 중..." +msgstr "파일 열기" -#: difftextwindow.cpp:1951 optiondialog.cpp:387 +#: difftextwindow.cpp:1943 optiondialog.cpp:389 #, kde-format msgid "Unicode, 8 bit" msgstr "유니코드, 8비트" -#: difftextwindow.cpp:1966 +#: difftextwindow.cpp:1958 #, kde-format msgid "Other" -msgstr "" +msgstr "기타" -#: directorymergewindow.cpp:409 directorymergewindow.cpp:3424 +#: directorymergewindow.cpp:410 directorymergewindow.cpp:3438 #, kde-format msgid "Copy A to B" msgstr "A를 B로 복사" -#: directorymergewindow.cpp:412 directorymergewindow.cpp:3425 +#: directorymergewindow.cpp:413 directorymergewindow.cpp:3439 #, kde-format msgid "Copy B to A" msgstr "B를 A로 복사" -#: directorymergewindow.cpp:415 directorymergewindow.cpp:3426 +#: directorymergewindow.cpp:416 directorymergewindow.cpp:3440 #, kde-format msgid "Delete A" msgstr "A 삭제" -#: directorymergewindow.cpp:418 directorymergewindow.cpp:3427 +#: directorymergewindow.cpp:419 directorymergewindow.cpp:3441 #, kde-format msgid "Delete B" msgstr "B 삭제" -#: directorymergewindow.cpp:421 +#: directorymergewindow.cpp:422 #, kde-format msgid "Delete A & B" msgstr "A와 B 삭제" -#: directorymergewindow.cpp:424 directorymergewindow.cpp:3429 +#: directorymergewindow.cpp:425 directorymergewindow.cpp:3443 #, kde-format msgid "Merge to A" msgstr "A로 합치기" -#: directorymergewindow.cpp:427 directorymergewindow.cpp:3430 +#: directorymergewindow.cpp:428 directorymergewindow.cpp:3444 #, kde-format msgid "Merge to B" msgstr "B로 합치기" -#: directorymergewindow.cpp:430 +#: directorymergewindow.cpp:431 #, kde-format msgid "Merge to A & B" msgstr "A와 B로 합치기" -#: directorymergewindow.cpp:442 directorymergewindow.cpp:3421 +#: directorymergewindow.cpp:443 directorymergewindow.cpp:3435 #, kde-format msgid "Delete (if exists)" msgstr "삭제(존재하는 경우)" -#: directorymergewindow.cpp:445 directorymergewindow.cpp:448 -#: directorymergewindow.cpp:3420 optiondialog.cpp:925 smalldialogs.cpp:113 +#: directorymergewindow.cpp:446 directorymergewindow.cpp:449 +#: directorymergewindow.cpp:3434 smalldialogs.cpp:120 #, kde-format msgid "Merge" msgstr "합치기" -#: directorymergewindow.cpp:445 directorymergewindow.cpp:448 +#: directorymergewindow.cpp:446 directorymergewindow.cpp:449 #, kde-format msgid "Merge (manual)" msgstr "합치기(수동)" -#: directorymergewindow.cpp:451 +#: directorymergewindow.cpp:452 #, kde-format msgid "Error: Conflicting File Types" msgstr "오류: 일치하지 않는 파일 형식" -#: directorymergewindow.cpp:454 +#: directorymergewindow.cpp:455 #, kde-format msgid "Error: Changed and Deleted" msgstr "오류: 변경 및 삭제됨" -#: directorymergewindow.cpp:457 +#: directorymergewindow.cpp:458 #, kde-format msgid "Error: Dates are equal but files are not." msgstr "오류: 날짜가 일치하지만 파일이 일치하지 않습니다." -#: directorymergewindow.cpp:471 -#, fuzzy, kde-format -#| msgid "Done." +#: directorymergewindow.cpp:472 +#, kde-format msgid "Done" -msgstr "완료." +msgstr "완료" -#: directorymergewindow.cpp:473 +#: directorymergewindow.cpp:474 #, kde-format msgid "Error" msgstr "오류" -#: directorymergewindow.cpp:475 +#: directorymergewindow.cpp:476 #, kde-format msgid "Skipped." -msgstr "건너뜀." +msgstr "건너뜁니다." -#: directorymergewindow.cpp:477 +#: directorymergewindow.cpp:478 #, kde-format msgid "Not saved." -msgstr "저장되지 않음." +msgstr "저장되지 않았습니다." -#: directorymergewindow.cpp:479 +#: directorymergewindow.cpp:480 #, kde-format msgid "In progress..." msgstr "진행 중..." -#: directorymergewindow.cpp:481 +#: directorymergewindow.cpp:482 #, kde-format msgid "To do." msgstr "할 일입니다." -#: directorymergewindow.cpp:522 +#: directorymergewindow.cpp:523 #, kde-format msgid "Name" msgstr "이름" -#: directorymergewindow.cpp:530 +#: directorymergewindow.cpp:531 #, kde-format msgid "Operation" msgstr "작업" -#: directorymergewindow.cpp:532 +#: directorymergewindow.cpp:533 #, kde-format msgid "Status" msgstr "상태" -#: directorymergewindow.cpp:534 +#: directorymergewindow.cpp:535 #, kde-format msgid "Unsolved" msgstr "해결되지 않음" -#: directorymergewindow.cpp:536 +#: directorymergewindow.cpp:537 #, kde-format msgid "Solved" msgstr "해결됨" -#: directorymergewindow.cpp:538 +#: directorymergewindow.cpp:539 #, kde-format msgid "Nonwhite" msgstr "공백 아님" -#: directorymergewindow.cpp:540 +#: directorymergewindow.cpp:541 #, kde-format msgid "White" msgstr "공백" -#: directorymergewindow.cpp:674 +#: directorymergewindow.cpp:676 #, kde-format msgid "Unable to compare non-normal file with normal file." -msgstr "" +msgstr "비정상 파일과 정상 파일을 비교할 수 없습니다." -#: directorymergewindow.cpp:688 +#: directorymergewindow.cpp:690 #, kde-format msgid "Mix of links and normal files." -msgstr "링크와 일반 파일의 혼합입니다." +msgstr "링크와 일반 파일의 혼합." -#: directorymergewindow.cpp:695 +#: directorymergewindow.cpp:697 #, kde-format msgid "Link: " msgstr "링크: " -#: directorymergewindow.cpp:704 +#: directorymergewindow.cpp:706 #, kde-format msgid "Size. " msgstr "크기: " -#: directorymergewindow.cpp:718 directorymergewindow.cpp:728 +#: directorymergewindow.cpp:720 directorymergewindow.cpp:730 #, kde-format msgid "Date & Size: " msgstr "날짜와 크기: " -#: directorymergewindow.cpp:748 +#: directorymergewindow.cpp:751 #, kde-format msgid "Comparing file..." msgstr "파일 비교 중..." -#: directorymergewindow.cpp:801 +#: directorymergewindow.cpp:813 #, kde-format msgid "" "You are currently doing a directory merge. Are you sure, you want to abort " @@ -320,100 +315,100 @@ "디렉터리를 합치고 있습니다. 합치기 작업을 중단하고 디렉터리를 다시 탐색하시겠" "습니까?" -#: directorymergewindow.cpp:802 kdiff3.cpp:698 kdiff3.cpp:708 kdiff3.cpp:720 -#: mergeresultwindow.cpp:372 pdiff.cpp:1033 pdiff.cpp:1910 pdiff.cpp:1920 +#: directorymergewindow.cpp:814 kdiff3.cpp:697 kdiff3.cpp:707 kdiff3.cpp:719 +#: mergeresultwindow.cpp:400 pdiff.cpp:1031 pdiff.cpp:1920 pdiff.cpp:1930 #, kde-format msgid "Warning" msgstr "경고" -#: directorymergewindow.cpp:803 directorymergewindow.cpp:3393 +#: directorymergewindow.cpp:815 directorymergewindow.cpp:3407 #, kde-format msgid "Rescan" msgstr "재탐색" -#: directorymergewindow.cpp:804 pdiff.cpp:1035 +#: directorymergewindow.cpp:816 pdiff.cpp:1033 #, kde-format msgid "Continue Merging" msgstr "계속 합치기" -#: directorymergewindow.cpp:971 +#: directorymergewindow.cpp:984 #, kde-format msgid "Opening of directories failed:" msgstr "디렉터리를 열 수 없음:" -#: directorymergewindow.cpp:975 +#: directorymergewindow.cpp:988 #, kde-format msgid "Dir A \"%1\" does not exist or is not a directory.\n" -msgstr "디렉터리 A \"%1\"이(가) 존재하지 않거나 디렉터리가 아닙니다.\n" +msgstr "디렉터리 A \"%1\"이(가) 없거나 디렉터리가 아닙니다.\n" -#: directorymergewindow.cpp:980 +#: directorymergewindow.cpp:993 #, kde-format msgid "Dir B \"%1\" does not exist or is not a directory.\n" -msgstr "디렉터리 B \"%1\"이(가) 존재하지 않거나 디렉터리가 아닙니다.\n" +msgstr "디렉터리 B \"%1\"이(가) 없거나 디렉터리가 아닙니다.\n" -#: directorymergewindow.cpp:985 +#: directorymergewindow.cpp:998 #, kde-format msgid "Dir C \"%1\" does not exist or is not a directory.\n" -msgstr "디렉터리 C \"%1\"이(가) 존재하지 않거나 디렉터리가 아닙니다.\n" +msgstr "디렉터리 C \"%1\"이(가) 없거나 디렉터리가 아닙니다.\n" -#: directorymergewindow.cpp:988 +#: directorymergewindow.cpp:1001 #, kde-format msgid "Directory Open Error" msgstr "디렉터리 열기 오류" -#: directorymergewindow.cpp:996 +#: directorymergewindow.cpp:1009 #, kde-format 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와 달라야 합니다.\n" +"디렉터리 세 개를 합칠 때에는 대상 디렉터리가 A, B와 달라야 합니다.\n" "계속하기 전에 확인하십시오." -#: directorymergewindow.cpp:998 +#: directorymergewindow.cpp:1011 #, kde-format msgid "Parameter Warning" msgstr "인자 경고" -#: directorymergewindow.cpp:1003 +#: directorymergewindow.cpp:1016 #, kde-format msgid "Scanning directories..." msgstr "디렉터리 검사 중..." -#: directorymergewindow.cpp:1029 +#: directorymergewindow.cpp:1042 #, kde-format msgid "Reading Directory A" msgstr "디렉터리 A 읽는 중" -#: directorymergewindow.cpp:1038 +#: directorymergewindow.cpp:1051 #, kde-format msgid "Reading Directory B" msgstr "디렉터리 B 읽는 중" -#: directorymergewindow.cpp:1048 +#: directorymergewindow.cpp:1061 #, kde-format msgid "Reading Directory C" msgstr "디렉터리 C 읽는 중" -#: directorymergewindow.cpp:1064 +#: directorymergewindow.cpp:1077 #, kde-format msgid "Some subdirectories were not readable in" msgstr "다음의 일부 하위 디렉터리를 읽을 수 없음:" -#: directorymergewindow.cpp:1069 +#: directorymergewindow.cpp:1082 #, kde-format msgid "Check the permissions of the subdirectories." -msgstr "하위 디렉터리의 권한을 확인하십시오" +msgstr "하위 디렉터리의 권한을 확인하십시오." -#: directorymergewindow.cpp:1106 kdiff3.cpp:666 kdiff3.cpp:753 kdiff3.cpp:777 -#: kdiff3.cpp:1065 kdiff3.cpp:1086 pdiff.cpp:1116 pdiff.cpp:1170 pdiff.cpp:1218 -#: pdiff.cpp:1234 pdiff.cpp:1277 pdiff.cpp:1301 +#: directorymergewindow.cpp:1119 kdiff3.cpp:665 kdiff3.cpp:752 kdiff3.cpp:776 +#: kdiff3.cpp:1072 kdiff3.cpp:1093 pdiff.cpp:1115 pdiff.cpp:1178 pdiff.cpp:1228 +#: pdiff.cpp:1244 pdiff.cpp:1287 pdiff.cpp:1311 #, kde-format msgid "Ready." msgstr "준비." -#: directorymergewindow.cpp:1121 +#: directorymergewindow.cpp:1134 #, kde-format msgid "" "Directory Comparison Status\n" @@ -422,70 +417,74 @@ "Number of equal files: %2\n" "Number of different files: %3" msgstr "" +"디렉터리 비교 상태\n" +"\n" +"하위 디렉터리 수: %1\n" +"동일한 파일 수: %2\n" +"다른 파일 수: %3" -#: directorymergewindow.cpp:1128 -#, fuzzy, kde-format -#| msgid "Number of manual merges:" +#: directorymergewindow.cpp:1141 +#, kde-format msgid "Number of manual merges: %1" -msgstr "수동 합침 개수:" +msgstr "수동 합침 개수: %1" -#: directorymergewindow.cpp:1394 +#: directorymergewindow.cpp:1407 #, kde-format msgid "This affects all merge operations." msgstr "모든 합치기 동작에 영향을 줍니다." -#: directorymergewindow.cpp:1395 +#: directorymergewindow.cpp:1408 #, kde-format msgid "Changing All Merge Operations" msgstr "모든 합치기 동작 변경 중" -#: directorymergewindow.cpp:1695 -#, fuzzy, kde-format -#| msgid "Processing " +#: directorymergewindow.cpp:1708 +#, kde-format msgid "" "Processing %1 / %2\n" "%3" -msgstr "처리 중 " +msgstr "" +"%1 / %2 처리 중\n" +"%3" -#: directorymergewindow.cpp:1738 directorymergewindow.cpp:1742 +#: directorymergewindow.cpp:1751 directorymergewindow.cpp:1755 #, kde-format msgid "Some files could not be processed." -msgstr "" +msgstr "일부 파일을 처리할 수 없습니다." -#: directorymergewindow.cpp:2222 directorymergewindow.cpp:2247 -#: directorymergewindow.cpp:2271 +#: directorymergewindow.cpp:2235 directorymergewindow.cpp:2260 +#: directorymergewindow.cpp:2285 #, kde-format msgid "This operation is currently not possible." msgstr "이 작업을 진행할 수 없습니다." -#: directorymergewindow.cpp:2222 directorymergewindow.cpp:2247 -#: directorymergewindow.cpp:2271 directorymergewindow.cpp:2552 +#: directorymergewindow.cpp:2235 directorymergewindow.cpp:2260 +#: directorymergewindow.cpp:2285 directorymergewindow.cpp:2565 #, kde-format msgid "Operation Not Possible" msgstr "작업을 진행할 수 없음" -#: directorymergewindow.cpp:2318 -#, fuzzy, kde-format -#| msgid "An error occurred while copying.\n" +#: directorymergewindow.cpp:2332 +#, kde-format msgid "An error occurred while copying." -msgstr "복사하는 중 오류가 발생했습니다.\n" +msgstr "복사하는 동안 오류가 발생했습니다." -#: directorymergewindow.cpp:2319 directorymergewindow.cpp:2759 +#: directorymergewindow.cpp:2333 directorymergewindow.cpp:2772 #, kde-format msgid "Merge Error" msgstr "합치기 오류" -#: directorymergewindow.cpp:2396 +#: directorymergewindow.cpp:2410 #, kde-format msgid "Unknown merge operation. (This must never happen!)" -msgstr "알 수 없는 합치기 작업.(일어나서는 안 됨!)" +msgstr "알 수 없는 합치기 작업입니다(일어나서는 안 됨!)." -#: directorymergewindow.cpp:2441 +#: directorymergewindow.cpp:2455 #, kde-format msgid "Unknown merge operation." -msgstr "알 수 없는 합치기 작업." +msgstr "알 수 없는 합치기 작업입니다." -#: directorymergewindow.cpp:2454 +#: directorymergewindow.cpp:2468 #, kde-format msgid "" "The merge is about to begin.\n" @@ -499,28 +498,28 @@ msgstr "" "이제 합치기를 시작합니다.\n" "\n" -"무엇을 하는 지 알고 있고 지시 사항을 읽으셨으면 \"진행\"을 누르십시오.\n" -"어떤 일이 일어나는지 알고 싶으면 \"시뮬레이션\"을 누르십시오.\n" +"무엇을 하는지 알고 있고 지시 사항을 읽으셨으면 \"진행\"을 누르십시오.\n" +"어떤 일이 일어나는지 알고 싶으면 \"시험\"을 누르십시오.\n" "\n" "이 프로그램은 베타 상태에 있으며 데이터 손실에 대하여 책임지지 않습니다! 중요" "한 데이터는 백업 후 시작하십시오!" -#: directorymergewindow.cpp:2459 +#: directorymergewindow.cpp:2473 #, kde-format msgid "Starting Merge" msgstr "합치기 시작" -#: directorymergewindow.cpp:2460 +#: directorymergewindow.cpp:2474 #, kde-format msgid "Do It" msgstr "진행" -#: directorymergewindow.cpp:2461 +#: directorymergewindow.cpp:2475 #, kde-format msgid "Simulate It" -msgstr "시뮬레이션" +msgstr "시험" -#: directorymergewindow.cpp:2487 +#: directorymergewindow.cpp:2501 #, kde-format msgid "" "The highlighted item has a different type in the different directories. " @@ -529,7 +528,7 @@ "강조한 항목은 다른 디렉터리에서 서로 다른 형식을 가지고 있습니다. 할 일을 선" "택하십시오." -#: directorymergewindow.cpp:2491 +#: directorymergewindow.cpp:2505 #, kde-format msgid "" "The modification dates of the file are equal but the files are not. Select " @@ -538,7 +537,7 @@ "파일의 수정한 날짜가 일치하지만 파일이 일치하지 않습니다. 할 일을 선택하십시" "오." -#: directorymergewindow.cpp:2495 +#: directorymergewindow.cpp:2509 #, kde-format msgid "" "The highlighted item was changed in one directory and deleted in the other. " @@ -547,14 +546,14 @@ "강조한 항목은 한 쪽 디렉터리에서 변경되었고 다른 쪽에서 삭제되었습니다. 할 일" "을 선택하십시오." -#: directorymergewindow.cpp:2552 +#: directorymergewindow.cpp:2565 #, kde-format msgid "" "This operation is currently not possible because directory merge is " "currently running." msgstr "디렉터리 합치기 작업이 진행 중이므로 이 작업을 사용할 수 없습니다." -#: directorymergewindow.cpp:2609 +#: directorymergewindow.cpp:2622 #, kde-format msgid "" "There was an error in the last step.\n" @@ -565,260 +564,258 @@ "오류가 발생한 항목에서 계속 진행하시겠습니까? 아니면 이 항목을 건너뛰겠습니" "까?" -#: directorymergewindow.cpp:2611 +#: directorymergewindow.cpp:2624 #, kde-format msgid "Continue merge after an error" msgstr "오류 발생 후 합치기 계속 진행" -#: directorymergewindow.cpp:2612 +#: directorymergewindow.cpp:2625 #, kde-format msgid "Continue With Last Item" msgstr "마지막 항목에서 진행" -#: directorymergewindow.cpp:2613 +#: directorymergewindow.cpp:2626 #, kde-format msgid "Skip Item" msgstr "항목 건너뛰기" -#: directorymergewindow.cpp:2709 +#: directorymergewindow.cpp:2722 #, kde-format msgid "Merge operation complete." -msgstr "합치기 작업 완료." +msgstr "합치기 작업이 완료되었습니다." -#: directorymergewindow.cpp:2709 directorymergewindow.cpp:2712 +#: directorymergewindow.cpp:2722 directorymergewindow.cpp:2725 #, kde-format msgid "Merge Complete" msgstr "합치기 완료됨" -#: directorymergewindow.cpp:2722 +#: directorymergewindow.cpp:2735 #, kde-format msgid "" "Simulated merge complete: Check if you agree with the proposed operations." -msgstr "합치기 시뮬레이션 완료됨: 제안하는 변경 사항이 올바르면 선택하십시오." +msgstr "합치기 시험 완료됨: 제안하는 변경 사항이 올바르면 선택하십시오." -#: directorymergewindow.cpp:2758 -#, fuzzy, kde-format -#| msgid "An error occurred. Press OK to see detailed information.\n" +#: directorymergewindow.cpp:2771 +#, kde-format msgid "An error occurred. Press OK to see detailed information." -msgstr "오류가 발생했습니다. 확인을 누르면 자세한 정보를 볼 수 있습니다.\n" +msgstr "오류가 발생했습니다. 자세한 정보를 보려면 확인을 누르십시오." -#: directorymergewindow.cpp:2791 +#: directorymergewindow.cpp:2804 #, kde-format msgid "Error: While deleting %1: Creating backup failed." msgstr "%1 삭제 중 오류: 백업을 만들 수 없습니다." -#: directorymergewindow.cpp:2798 +#: directorymergewindow.cpp:2811 #, kde-format msgid "delete directory recursively( %1 )" msgstr "디렉터리를 재귀적으로 삭제(%1)" -#: directorymergewindow.cpp:2800 +#: directorymergewindow.cpp:2813 #, kde-format msgid "delete( %1 )" msgstr "삭제(%1)" -#: directorymergewindow.cpp:2815 +#: directorymergewindow.cpp:2828 #, kde-format msgid "Error: delete dir operation failed while trying to read the directory." -msgstr "오류: 디렉터리를 삭제하기 위해서 읽는 중 오류가 발생했습니다." +msgstr "오류: 폴더를 삭제하려고 읽는 중 오류가 발생했습니다." -#: directorymergewindow.cpp:2834 +#: directorymergewindow.cpp:2847 #, kde-format msgid "Error: rmdir( %1 ) operation failed." msgstr "오류: rmdir(%1) 작업이 실패했습니다." -#: directorymergewindow.cpp:2844 +#: directorymergewindow.cpp:2857 #, kde-format msgid "Error: delete operation failed." msgstr "오류: 삭제 작업이 실패했습니다." -#: directorymergewindow.cpp:2870 +#: directorymergewindow.cpp:2884 #, kde-format msgid "manual merge( %1, %2, %3 -> %4)" msgstr "수동 합치기(%1, %2, %3 -> %4)" -#: directorymergewindow.cpp:2873 +#: directorymergewindow.cpp:2887 #, kde-format msgid "" " Note: After a manual merge the user should continue by pressing F7." msgstr " 메모: 수동 합치기 이후 계속 진행하려면 F7 키를 누르십시오." -#: directorymergewindow.cpp:2900 +#: directorymergewindow.cpp:2914 #, kde-format msgid "Error: copy( %1 -> %2 ) failed.Deleting existing destination failed." msgstr "" "오류: copy(%1 -> %2) 작업이 실패했습니다. 존재하는 대상을 삭제할 수 없습니다." -#: directorymergewindow.cpp:2909 +#: directorymergewindow.cpp:2923 #, kde-format msgid "copyLink( %1 -> %2 )" -msgstr "copyLink( %1 -> %2 )" +msgstr "copyLink(%1 -> %2)" -#: directorymergewindow.cpp:2918 +#: directorymergewindow.cpp:2932 #, kde-format msgid "Error: copyLink failed: Remote links are not yet supported." msgstr "오류: copyLink 작업이 실패했습니다. 원격 링크는 지원하지 않습니다." -#: directorymergewindow.cpp:2928 +#: directorymergewindow.cpp:2942 #, kde-format msgid "Error: copyLink failed." msgstr "오류: copyLink 작업이 실패했습니다." -#: directorymergewindow.cpp:2953 +#: directorymergewindow.cpp:2967 #, kde-format msgid "copy( %1 -> %2 )" -msgstr "copy( %1 -> %2 )" +msgstr "copy(%1 -> %2)" -#: directorymergewindow.cpp:2979 +#: directorymergewindow.cpp:2993 #, kde-format msgid "Error during rename( %1 -> %2 ): Cannot delete existing destination." msgstr "" "rename(%1 -> %2) 작업 중 오류 발생: 존재하는 대상을 삭제할 수 없습니다." -#: directorymergewindow.cpp:2986 +#: directorymergewindow.cpp:3000 #, kde-format msgid "rename( %1 -> %2 )" msgstr "rename(%1 -> %2)" -#: directorymergewindow.cpp:2995 +#: directorymergewindow.cpp:3009 #, kde-format msgid "Error: Rename failed." msgstr "오류: 이름 변경이 실패했습니다." -#: directorymergewindow.cpp:3013 +#: directorymergewindow.cpp:3027 #, kde-format msgid "Error during makeDir of %1. Cannot delete existing file." msgstr "" "makeDir %1 작업 중 오류가 발생했습니다. 존재하는 파일은 삭제할 수 없습니다." -#: directorymergewindow.cpp:3030 +#: directorymergewindow.cpp:3044 #, kde-format msgid "makeDir( %1 )" msgstr "makeDir(%1)" -#: directorymergewindow.cpp:3040 +#: directorymergewindow.cpp:3054 #, kde-format msgid "Error while creating directory." msgstr "디렉터리를 만드는 중 오류가 발생했습니다." -#: directorymergewindow.cpp:3076 directorymergewindow.cpp:3195 +#: directorymergewindow.cpp:3090 directorymergewindow.cpp:3209 #, kde-format msgid "Dest" msgstr "대상" -#: directorymergewindow.cpp:3084 directorymergewindow.cpp:3113 +#: directorymergewindow.cpp:3098 directorymergewindow.cpp:3127 #, kde-format msgid "Dir" msgstr "디렉터리" -#: directorymergewindow.cpp:3084 +#: directorymergewindow.cpp:3098 #, kde-format msgid "Type" msgstr "종류" -#: directorymergewindow.cpp:3084 +#: directorymergewindow.cpp:3098 #, kde-format msgid "Size" msgstr "크기" -#: directorymergewindow.cpp:3085 +#: directorymergewindow.cpp:3099 #, kde-format msgid "Attr" msgstr "속성" -#: directorymergewindow.cpp:3085 +#: directorymergewindow.cpp:3099 #, kde-format msgid "Last Modification" msgstr "마지막 수정" -#: directorymergewindow.cpp:3085 +#: directorymergewindow.cpp:3099 #, kde-format msgid "Link-Destination" msgstr "링크 대상" -#: directorymergewindow.cpp:3113 +#: directorymergewindow.cpp:3127 #, kde-format msgid "File" msgstr "파일" -#: directorymergewindow.cpp:3113 -#, fuzzy, kde-format -#| msgid "Link: " +#: directorymergewindow.cpp:3127 +#, kde-format msgid "-Link" -msgstr "링크: " +msgstr "-링크" -#: directorymergewindow.cpp:3119 +#: directorymergewindow.cpp:3133 #, kde-format msgid "not available" msgstr "사용할 수 없음" -#: directorymergewindow.cpp:3137 +#: directorymergewindow.cpp:3151 #, kde-format msgid "A (Dest): " -msgstr "A (대상): " +msgstr "A(대상): " -#: directorymergewindow.cpp:3141 +#: directorymergewindow.cpp:3155 #, kde-format msgid "A: " -msgstr "" +msgstr "A: " -#: directorymergewindow.cpp:3141 +#: directorymergewindow.cpp:3155 #, kde-format msgid "A (Base): " -msgstr "A (기반): " +msgstr "A(기반): " -#: directorymergewindow.cpp:3147 +#: directorymergewindow.cpp:3161 #, kde-format msgid "B (Dest): " -msgstr "B (대상): " +msgstr "B(대상): " -#: directorymergewindow.cpp:3151 +#: directorymergewindow.cpp:3165 #, kde-format msgid "B: " -msgstr "" +msgstr "B: " -#: directorymergewindow.cpp:3156 +#: directorymergewindow.cpp:3170 #, kde-format msgid "C (Dest): " -msgstr "C (대상): " +msgstr "C(대상): " -#: directorymergewindow.cpp:3160 +#: directorymergewindow.cpp:3174 #, kde-format msgid "C: " -msgstr "" +msgstr "C: " -#: directorymergewindow.cpp:3163 +#: directorymergewindow.cpp:3177 #, kde-format msgid "Dest: " msgstr "대상: " #. i18n("Saving Directory Merge State ...")); -#: directorymergewindow.cpp:3238 +#: directorymergewindow.cpp:3252 #, kde-format msgid "Save Directory Merge State As..." msgstr "디렉터리 합치기 상태를 다른 이름으로 저장..." -#: directorymergewindow.cpp:3387 +#: directorymergewindow.cpp:3401 #, kde-format msgid "Start/Continue Directory Merge" msgstr "디렉터리 합치기 시작/계속 진행" -#: directorymergewindow.cpp:3388 +#: directorymergewindow.cpp:3402 #, kde-format msgid "Run Operation for Current Item" msgstr "현재 항목의 작업 실행" -#: directorymergewindow.cpp:3389 +#: directorymergewindow.cpp:3403 #, kde-format msgid "Compare Selected File" msgstr "선택한 파일 비교" -#: directorymergewindow.cpp:3390 +#: directorymergewindow.cpp:3404 #, kde-format msgid "Merge Current File" msgstr "현재 파일 합치기" -#: directorymergewindow.cpp:3390 +#: directorymergewindow.cpp:3404 #, kde-format msgid "" "Merge\n" @@ -827,51 +824,51 @@ "파일\n" "합치기" -#: directorymergewindow.cpp:3391 +#: directorymergewindow.cpp:3405 #, kde-format msgid "Fold All Subdirs" msgstr "모든 하위 디렉터리 접기" -#: directorymergewindow.cpp:3392 +#: directorymergewindow.cpp:3406 #, kde-format msgid "Unfold All Subdirs" -msgstr "모든 하위 디렉터리 풀기" +msgstr "모든 하위 디렉터리 펼치기" #. i18n("Save Directory Merge State ..."), 0, this, &DirectoryMergeWindow::slotSaveMergeState, ac, "dir_save_merge_state"); #. i18n("Load Directory Merge State ..."), 0, this, &DirectoryMergeWindow::slotLoadMergeState, ac, "dir_load_merge_state"); -#: directorymergewindow.cpp:3396 +#: directorymergewindow.cpp:3410 #, kde-format msgid "Choose A for All Items" msgstr "모든 항목에서 A 선택" -#: directorymergewindow.cpp:3397 +#: directorymergewindow.cpp:3411 #, kde-format msgid "Choose B for All Items" msgstr "모든 항목에서 B 선택" -#: directorymergewindow.cpp:3398 +#: directorymergewindow.cpp:3412 #, kde-format msgid "Choose C for All Items" msgstr "모든 항목에서 C 선택" -#: directorymergewindow.cpp:3399 +#: directorymergewindow.cpp:3413 #, kde-format msgid "Auto-Choose Operation for All Items" msgstr "모든 항목에서 작업 자동 선택" -#: directorymergewindow.cpp:3400 +#: directorymergewindow.cpp:3414 #, kde-format msgid "No Operation for All Items" msgstr "모든 항목에서 작업 진행하지 않음" #. i18n("Synchronize Directories"), 0, this, &DirectoryMergeWindow::slotSynchronizeDirectories, ac, "dir_synchronize_directories"); #. d->m_pDirChooseNewerFiles = GuiUtils::createAction< KToggleAction >(i18n("Copy Newer Files Instead of Merging"), 0, this, &DirectoryMergeWindow::slotChooseNewerFiles, ac, "dir_choose_newer_files"); -#: directorymergewindow.cpp:3405 +#: directorymergewindow.cpp:3419 #, kde-format msgid "Show Identical Files" -msgstr "같은 파일 보이기" +msgstr "같은 파일 표시" -#: directorymergewindow.cpp:3405 +#: directorymergewindow.cpp:3419 #, kde-format msgid "" "Identical\n" @@ -880,17 +877,17 @@ "같은\n" "파일" -#: directorymergewindow.cpp:3406 +#: directorymergewindow.cpp:3420 #, kde-format msgid "Show Different Files" -msgstr "다른 파일 보이기" +msgstr "다른 파일 표시" -#: directorymergewindow.cpp:3407 +#: directorymergewindow.cpp:3421 #, kde-format msgid "Show Files only in A" -msgstr "A에만 있는 파일 보이기" +msgstr "A에만 있는 파일 표시" -#: directorymergewindow.cpp:3407 +#: directorymergewindow.cpp:3421 #, kde-format msgid "" "Files\n" @@ -899,12 +896,12 @@ "A에만 있는\n" "파일" -#: directorymergewindow.cpp:3408 +#: directorymergewindow.cpp:3422 #, kde-format msgid "Show Files only in B" -msgstr "B에만 있는 파일" +msgstr "B에만 있는 파일 표시" -#: directorymergewindow.cpp:3408 +#: directorymergewindow.cpp:3422 #, kde-format msgid "" "Files\n" @@ -913,12 +910,12 @@ "B에만 있는\n" "파일" -#: directorymergewindow.cpp:3409 +#: directorymergewindow.cpp:3423 #, kde-format msgid "Show Files only in C" -msgstr "C에만 있는 파일 보이기" +msgstr "C에만 있는 파일 표시" -#: directorymergewindow.cpp:3409 +#: directorymergewindow.cpp:3423 #, kde-format msgid "" "Files\n" @@ -927,250 +924,245 @@ "C에만 있는\n" "파일" -#: directorymergewindow.cpp:3413 +#: directorymergewindow.cpp:3427 #, kde-format msgid "Compare Explicitly Selected Files" msgstr "명시적으로 선택한 파일만 비교" -#: directorymergewindow.cpp:3414 +#: directorymergewindow.cpp:3428 #, kde-format msgid "Merge Explicitly Selected Files" msgstr "명시적으로 선택한 파일만 합치기" -#: directorymergewindow.cpp:3416 directorymergewindow.cpp:3423 +#: directorymergewindow.cpp:3430 directorymergewindow.cpp:3437 #, kde-format msgid "Do Nothing" msgstr "아무것도 하지 않음" -#: directorymergewindow.cpp:3428 +#: directorymergewindow.cpp:3442 #, kde-format msgid "Delete A && B" msgstr "A와 B 삭제" -#: directorymergewindow.cpp:3431 +#: directorymergewindow.cpp:3445 #, kde-format msgid "Merge to A && B" msgstr "A와 B로 합치기" -#: fileaccess.cpp:462 SourceData.cpp:493 -#, fuzzy, kde-format -#| msgid "Reading file: %1" +#: fileaccess.cpp:301 +#, kde-format +msgid "Unable to determine full url. No parent specified." +msgstr "전체 URL을 결정할 수 없습니다. 부모를 지정하지 않았습니다." + +#: fileaccess.cpp:482 SourceData.cpp:506 +#, kde-format msgid "Failed to read file: %1" -msgstr "파일 읽는 중: %1" +msgstr "파일을 읽을 수 없음: %1" -#: fileaccess.cpp:587 +#: fileaccess.cpp:624 #, kde-format msgid "Creating temp copy of %1 failed." -msgstr "%1의 임시 복사본을 만들 수 없습니다." +msgstr "%1의 임시 복사본을 만들지 못했습니다." -#: fileaccess.cpp:595 fileaccess.cpp:600 -#, fuzzy, kde-format -#| msgid "Opening %1 failed." +#: fileaccess.cpp:632 fileaccess.cpp:637 +#, kde-format msgid "Opening %1 failed. %2" -msgstr "%1을(를) 열 수 없습니다." +msgstr "%1을(를) 열 수 없습니다. %2" -#: fileaccess.cpp:619 fileaccess.cpp:627 -#, fuzzy, kde-format -#| msgid "Error reading from %1" +#: fileaccess.cpp:656 fileaccess.cpp:664 +#, kde-format msgid "Error reading from %1. %2" -msgstr "%1에서 읽는 중 오류 발생" +msgstr "%1에서 읽는 중 오류가 발생했습니다. %2" -#: fileaccess.cpp:751 -#, fuzzy, kde-format -#| msgid "" -#| "While trying to make a backup, deleting an older backup failed. \n" -#| "Filename: " +#: fileaccess.cpp:788 +#, kde-format msgid "" "While trying to make a backup, deleting an older backup failed.\n" "Filename: %1" msgstr "" -"백업을 만드는 중 기존 백업을 삭제할 수 없습니다.\n" -"파일 이름: " +"백업을 만드는 동안 이전 백업을 삭제하지 못했습니다.\n" +"파일 이름: %1" -#: fileaccess.cpp:758 -#, fuzzy, kde-format -#| msgid "" -#| "While trying to make a backup, renaming failed. \n" -#| "Filenames: " +#: fileaccess.cpp:795 +#, kde-format msgid "" "While trying to make a backup, renaming failed.\n" "Filenames: %1 -> %2" msgstr "" -"백업을 만드는 중 기존 백업을 삭제할 수 없습니다.\n" -"파일 이름: " +"백업을 만드는 동안 이름을 변경하지 못했습니다.\n" +"파일 이름: %1 -> %2" -#: fileaccess.cpp:828 +#: fileaccess.cpp:865 #, kde-format msgid "Getting file status: %1" msgstr "파일 상태 가져오는 중: %1" -#: fileaccess.cpp:869 +#: fileaccess.cpp:906 #, kde-format msgid "Reading file: %1" msgstr "파일 읽는 중: %1" -#: fileaccess.cpp:907 +#: fileaccess.cpp:944 #, kde-format msgid "Writing file: %1" msgstr "파일에 쓰는 중: %1" -#: fileaccess.cpp:940 +#: fileaccess.cpp:977 #, kde-format msgid "Out of memory" msgstr "메모리 부족" -#: fileaccess.cpp:976 +#: fileaccess.cpp:1013 #, kde-format msgid "Making directory: %1" msgstr "디렉터리 만드는 중: %1" -#: fileaccess.cpp:997 +#: fileaccess.cpp:1034 #, kde-format msgid "Removing directory: %1" msgstr "디렉터리 삭제 중: %1" -#: fileaccess.cpp:1012 +#: fileaccess.cpp:1049 #, kde-format msgid "Removing file: %1" msgstr "파일 삭제 중: %1" -#: fileaccess.cpp:1028 +#: fileaccess.cpp:1065 #, kde-format msgid "Creating symbolic link: %1 -> %2" msgstr "심볼릭 링크 만드는 중: %1 -> %2" -#: fileaccess.cpp:1052 +#: fileaccess.cpp:1089 #, kde-format msgid "Renaming file: %1 -> %2" msgstr "파일 이름 변경 중: %1 -> %2" -#: fileaccess.cpp:1086 +#: fileaccess.cpp:1123 #, kde-format msgid "Copying file: %1 -> %2" msgstr "파일 복사 중: %1 -> %2" -#: fileaccess.cpp:1108 -#, fuzzy, kde-format -#| msgid "Reading directory: " +#: fileaccess.cpp:1145 +#, kde-format msgid "Reading directory: %1" -msgstr "디렉터리 읽는 중: " +msgstr "디렉터리 읽는 중: %1" -#: fileaccess.cpp:1162 +#: fileaccess.cpp:1202 #, kde-format msgid "Listing directory: %1" msgstr "디렉터리 항목 가져오는 중: %1" -#: kdiff3.cpp:181 +#: kdiff3.cpp:182 #, kde-format msgid "Current Configuration:" msgstr "현재 설정:" -#: kdiff3.cpp:186 +#: kdiff3.cpp:187 #, kde-format msgid "Config Option Error:" msgstr "설정 옵션 오류:" -#: kdiff3.cpp:240 +#: kdiff3.cpp:246 #, kde-format msgid "Option --auto used, but no output file specified." msgstr "--auto 옵션을 지정했지만 출력 파일을 지정하지 않았습니다." -#: kdiff3.cpp:416 +#: kdiff3.cpp:405 #, kde-format msgid "Option --auto ignored for directory comparison." -msgstr "디렉터리 비교 시 --auto 옵션을 무시합니다." +msgstr "폴더 비교 시 --auto 옵션을 무시합니다." -#: kdiff3.cpp:460 +#: kdiff3.cpp:449 #, kde-format msgid "Saving failed." msgstr "저장 실패." -#: kdiff3.cpp:496 pdiff.cpp:1098 +#: kdiff3.cpp:494 pdiff.cpp:1096 #, kde-format msgid "Opening of these files failed:" msgstr "다음 파일을 여는 데 실패했습니다:" -#: kdiff3.cpp:505 +#: kdiff3.cpp:503 pdiff.cpp:1105 #, kde-format -msgid "File Open Error" +msgid "File open error" msgstr "파일 열기 오류" -#: kdiff3.cpp:533 +#: kdiff3.cpp:532 #, kde-format msgid "Opens documents for comparison..." msgstr "비교할 문서 열기..." -#: kdiff3.cpp:535 +#: kdiff3.cpp:534 #, kde-format msgid "Reload" msgstr "새로 고침" -#: kdiff3.cpp:538 +#: kdiff3.cpp:537 #, kde-format msgid "Saves the merge result. All conflicts must be solved!" msgstr "합친 결과를 저장합니다. 모든 충돌 사항을 해결해야 합니다!" -#: kdiff3.cpp:540 +#: kdiff3.cpp:539 #, kde-format msgid "Saves the current document as..." msgstr "현재 문서를 다른 이름으로 저장..." -#: kdiff3.cpp:543 +#: kdiff3.cpp:542 #, kde-format msgid "Print the differences" msgstr "차이점 인쇄" -#: kdiff3.cpp:546 +#: kdiff3.cpp:545 #, kde-format msgid "Quits the application" msgstr "프로그램 종료" -#: kdiff3.cpp:549 +#: kdiff3.cpp:548 #, kde-format msgid "Cuts the selected section and puts it to the clipboard" msgstr "선택한 부분을 잘라내고 클립보드에 저장" -#: kdiff3.cpp:552 +#: kdiff3.cpp:551 #, kde-format msgid "Copies the selected section to the clipboard" msgstr "선택한 부분을 클립보드에 복사" -#: kdiff3.cpp:554 +#: kdiff3.cpp:553 #, kde-format msgid "Pastes the clipboard contents to current position" msgstr "현재 위치에 클립보드 내용 붙여넣기" -#: kdiff3.cpp:557 +#: kdiff3.cpp:556 #, kde-format msgid "Select everything in current window" msgstr "현재 창의 모든 내용 선택" -#: kdiff3.cpp:560 +#: kdiff3.cpp:559 #, kde-format msgid "Search for a string" msgstr "문자열 찾기" -#: kdiff3.cpp:562 +#: kdiff3.cpp:561 #, kde-format msgid "Search again for the string" msgstr "문자열 다시 찾기" -#: kdiff3.cpp:567 +#: kdiff3.cpp:566 #, kde-format msgid "Enables/disables the statusbar" -msgstr "상태 표시줄 보이기/숨기기" +msgstr "상태 표시줄 표시/숨기기" -#: kdiff3.cpp:571 +#: kdiff3.cpp:570 #, kde-format msgid "Configure KDiff3..." msgstr "KDiff3 설정..." -#: kdiff3.cpp:590 +#: kdiff3.cpp:589 #, kde-format msgid "Go to Current Delta" msgstr "현재 차이점으로 이동" -#: kdiff3.cpp:590 +#: kdiff3.cpp:589 #, kde-format msgid "" "Current\n" @@ -1179,12 +1171,12 @@ "현재\n" "차이점" -#: kdiff3.cpp:592 +#: kdiff3.cpp:591 #, kde-format msgid "Go to First Delta" msgstr "첫 차이점으로 이동" -#: kdiff3.cpp:592 +#: kdiff3.cpp:591 #, kde-format msgid "" "First\n" @@ -1193,12 +1185,12 @@ "첫\n" "차이점" -#: kdiff3.cpp:594 +#: kdiff3.cpp:593 #, kde-format msgid "Go to Last Delta" msgstr "마지막 차이점으로 이동" -#: kdiff3.cpp:594 +#: kdiff3.cpp:593 #, kde-format msgid "" "Last\n" @@ -1207,24 +1199,24 @@ "마지막\n" "차이점" -#: kdiff3.cpp:596 +#: kdiff3.cpp:595 #, kde-format msgid "(Skips white space differences when \"Show White Space\" is disabled.)" msgstr "(\"공백 문자 표시\" 설정을 사용하지 않으면 공백을 건너뜁니다.)" -#: kdiff3.cpp:597 +#: kdiff3.cpp:596 #, kde-format msgid "" "(Does not skip white space differences even when \"Show White Space\" is " "disabled.)" msgstr "(\"공백 문자 표시\" 설정을 사용하지 않아도 공백을 건너뛰지 않습니다.)" -#: kdiff3.cpp:598 +#: kdiff3.cpp:597 #, kde-format msgid "Go to Previous Delta" msgstr "이전 차이점으로 이동" -#: kdiff3.cpp:598 +#: kdiff3.cpp:597 #, kde-format msgid "" "Prev\n" @@ -1233,12 +1225,12 @@ "이전\n" "차이점" -#: kdiff3.cpp:600 +#: kdiff3.cpp:599 #, kde-format msgid "Go to Next Delta" msgstr "다음 차이점으로 이동" -#: kdiff3.cpp:600 +#: kdiff3.cpp:599 #, kde-format msgid "" "Next\n" @@ -1247,12 +1239,12 @@ "다음\n" "차이점" -#: kdiff3.cpp:602 +#: kdiff3.cpp:601 #, kde-format msgid "Go to Previous Conflict" msgstr "이전 충돌 항목으로 이동" -#: kdiff3.cpp:602 +#: kdiff3.cpp:601 #, kde-format msgid "" "Prev\n" @@ -1261,12 +1253,12 @@ "이전\n" "충돌" -#: kdiff3.cpp:604 +#: kdiff3.cpp:603 #, kde-format msgid "Go to Next Conflict" msgstr "다음 충돌 항목으로 이동" -#: kdiff3.cpp:604 +#: kdiff3.cpp:603 #, kde-format msgid "" "Next\n" @@ -1275,12 +1267,12 @@ "다음\n" "충돌" -#: kdiff3.cpp:606 +#: kdiff3.cpp:605 #, kde-format msgid "Go to Previous Unsolved Conflict" msgstr "이전 해결하지 않은 충돌 항목으로 이동" -#: kdiff3.cpp:606 +#: kdiff3.cpp:605 #, kde-format msgid "" "Prev\n" @@ -1289,12 +1281,12 @@ "이전\n" "미해결" -#: kdiff3.cpp:608 +#: kdiff3.cpp:607 #, kde-format msgid "Go to Next Unsolved Conflict" msgstr "다음 해결하지 않은 충돌 항목으로 이동" -#: kdiff3.cpp:608 +#: kdiff3.cpp:607 #, kde-format msgid "" "Next\n" @@ -1303,12 +1295,12 @@ "다음\n" "미해결" -#: kdiff3.cpp:610 +#: kdiff3.cpp:609 #, kde-format msgid "Select Line(s) From A" msgstr "A에서 줄 선택" -#: kdiff3.cpp:610 +#: kdiff3.cpp:609 #, kde-format msgid "" "Choose\n" @@ -1317,12 +1309,12 @@ "A\n" "선택" -#: kdiff3.cpp:611 +#: kdiff3.cpp:610 #, kde-format msgid "Select Line(s) From B" msgstr "B에서 줄 선택" -#: kdiff3.cpp:611 +#: kdiff3.cpp:610 #, kde-format msgid "" "Choose\n" @@ -1331,12 +1323,12 @@ "B\n" "선택" -#: kdiff3.cpp:612 +#: kdiff3.cpp:611 #, kde-format msgid "Select Line(s) From C" msgstr "C에서 줄 선택" -#: kdiff3.cpp:612 +#: kdiff3.cpp:611 #, kde-format msgid "" "Choose\n" @@ -1345,12 +1337,12 @@ "C\n" "선택" -#: kdiff3.cpp:613 +#: kdiff3.cpp:612 #, kde-format msgid "Automatically Go to Next Unsolved Conflict After Source Selection" -msgstr "원본 선택 후 자동으로 해결되지 않은 충돌 항목으로 이동" +msgstr "원본 선택 후 자동으로 다음 해결되지 않은 충돌 항목으로 이동" -#: kdiff3.cpp:613 +#: kdiff3.cpp:612 #, kde-format msgid "" "Auto\n" @@ -1359,13 +1351,12 @@ "자동\n" "다음" -#: kdiff3.cpp:615 -#, fuzzy, kde-format -#| msgid "Show Space && Tabulator Characters for Differences" +#: kdiff3.cpp:614 +#, kde-format msgid "Show Space && Tabulator Characters" -msgstr "공백 및 탭 문자 차이점 보기" +msgstr "공백 및 탭 문자 표시" -#: kdiff3.cpp:615 +#: kdiff3.cpp:614 #, kde-format msgid "" "White\n" @@ -1374,26 +1365,26 @@ "공백\n" "문자" -#: kdiff3.cpp:616 +#: kdiff3.cpp:615 #, kde-format msgid "Show White Space" msgstr "공백 문자 표시" -#: kdiff3.cpp:616 +#: kdiff3.cpp:615 #, kde-format msgid "" "White\n" "Deltas" msgstr "" "공백\n" -"차이점" +"차이" -#: kdiff3.cpp:618 +#: kdiff3.cpp:617 #, kde-format msgid "Show Line Numbers" msgstr "줄 번호 표시" -#: kdiff3.cpp:618 +#: kdiff3.cpp:617 #, kde-format msgid "" "Line\n" @@ -1402,223 +1393,219 @@ "줄\n" "번호" -#: kdiff3.cpp:620 +#: kdiff3.cpp:619 #, kde-format msgid "Automatically Solve Simple Conflicts" msgstr "간단한 충돌 자동으로 해결" -#: kdiff3.cpp:621 +#: kdiff3.cpp:620 #, kde-format msgid "Set Deltas to Conflicts" msgstr "충돌 항목의 차이점 설정" -#: kdiff3.cpp:622 +#: kdiff3.cpp:621 #, kde-format msgid "Run Regular Expression Auto Merge" msgstr "정규 표현식 자동 합치기 실행" -#: kdiff3.cpp:623 +#: kdiff3.cpp:622 #, kde-format msgid "Automatically Solve History Conflicts" msgstr "과거에 해결했던 충돌 자동으로 해결" -#: kdiff3.cpp:624 +#: kdiff3.cpp:623 #, kde-format msgid "Split Diff At Selection" msgstr "선택 항목에서 차이점 나누기" -#: kdiff3.cpp:625 +#: kdiff3.cpp:624 #, kde-format msgid "Join Selected Diffs" msgstr "선택한 변경 사항 합치기" -#: kdiff3.cpp:627 +#: kdiff3.cpp:626 #, kde-format msgid "Show Window A" msgstr "창 A 표시" -#: kdiff3.cpp:628 +#: kdiff3.cpp:627 #, kde-format msgid "Show Window B" msgstr "창 B 표시" -#: kdiff3.cpp:629 +#: kdiff3.cpp:628 #, kde-format msgid "Show Window C" msgstr "창 C 표시" -#: kdiff3.cpp:631 +#: kdiff3.cpp:630 #, kde-format msgid "Normal Overview" msgstr "일반 요약 보기" -#: kdiff3.cpp:632 +#: kdiff3.cpp:631 #, kde-format msgid "A vs. B Overview" msgstr "A 대 B 요약 보기" -#: kdiff3.cpp:633 +#: kdiff3.cpp:632 #, kde-format msgid "A vs. C Overview" msgstr "A 대 C 요약 보기" -#: kdiff3.cpp:634 +#: kdiff3.cpp:633 #, kde-format msgid "B vs. C Overview" msgstr "B 대 C 요약 보기" -#: kdiff3.cpp:635 +#: kdiff3.cpp:634 #, kde-format msgid "Word Wrap Diff Windows" -msgstr "차이점 창 워드랩 사용" +msgstr "차이점 창 자동 줄 바꿈 사용" -#: kdiff3.cpp:636 +#: kdiff3.cpp:635 #, kde-format msgid "Add Manual Diff Alignment" msgstr "수동 Diff 정렬 추가" -#: kdiff3.cpp:637 +#: kdiff3.cpp:636 #, kde-format msgid "Clear All Manual Diff Alignments" msgstr "모든 수동 Diff 정렬 삭제" -#: kdiff3.cpp:639 +#: kdiff3.cpp:638 #, kde-format msgid "Focus Next Window" msgstr "다음 창에 초점 맞추기" -#: kdiff3.cpp:640 +#: kdiff3.cpp:639 #, kde-format msgid "Focus Prev Window" msgstr "이전 창에 초점 맞추기" -#: kdiff3.cpp:641 +#: kdiff3.cpp:640 #, kde-format msgid "Toggle Split Orientation" msgstr "나누기 방향 전환" -#: kdiff3.cpp:643 +#: kdiff3.cpp:642 #, kde-format msgid "Dir && Text Split Screen View" msgstr "디렉터리와 텍스트로 화면 나누어 보기" -#: kdiff3.cpp:645 +#: kdiff3.cpp:644 #, kde-format msgid "Toggle Between Dir && Text View" msgstr "디렉터리와 텍스트 보기 간 전환" -#: kdiff3.cpp:697 pdiff.cpp:1909 -#, fuzzy, kde-format -#| msgid "The merge result hasn't been saved." +#: kdiff3.cpp:696 pdiff.cpp:1919 +#, kde-format msgid "The merge result has not been saved." -msgstr "합친 결과를 저장하지 않았습니다." +msgstr "합친 결과가 저장되지 않았습니다." -#: kdiff3.cpp:699 +#: kdiff3.cpp:698 #, kde-format msgid "Save && Quit" msgstr "저장하고 끝내기" -#: kdiff3.cpp:700 +#: kdiff3.cpp:699 #, kde-format msgid "Quit Without Saving" msgstr "저장하지 않고 끝내기" -#: kdiff3.cpp:708 pdiff.cpp:1920 +#: kdiff3.cpp:707 pdiff.cpp:1930 #, kde-format msgid "Saving the merge result failed." msgstr "합친 결과를 저장할 수 없습니다." -#: kdiff3.cpp:719 pdiff.cpp:1032 +#: kdiff3.cpp:718 pdiff.cpp:1030 #, kde-format msgid "" "You are currently doing a directory merge. Are you sure, you want to abort?" msgstr "디렉터리를 합치고 있습니다. 이대로 중단하시겠습니까?" -#: kdiff3.cpp:742 +#: kdiff3.cpp:741 #, kde-format msgid "Saving file..." msgstr "파일 저장하는 중..." -#: kdiff3.cpp:759 +#: kdiff3.cpp:758 #, kde-format msgid "Saving file with a new filename..." -msgstr "새 파일이름으로 파일 저장하는 중..." +msgstr "새 이름으로 파일 저장하는 중..." -#: kdiff3.cpp:761 +#: kdiff3.cpp:760 #, kde-format msgid "Save As..." msgstr "다른 이름으로 저장..." -#: kdiff3.cpp:820 +#: kdiff3.cpp:819 #, kde-format msgid "Printing not implemented." msgstr "인쇄는 구현되지 않았습니다." -#: kdiff3.cpp:857 +#: kdiff3.cpp:858 #, kde-format msgid "Printing..." msgstr "인쇄 중..." -#: kdiff3.cpp:943 +#: kdiff3.cpp:948 #, kde-format msgid "Printing page %1 of %2" -msgstr "" +msgstr "%2 중 %1쪽 인쇄 중" -#: kdiff3.cpp:1000 -#, fuzzy, kde-format -#| msgid "Selection" +#: kdiff3.cpp:1006 +#, kde-format msgid " (Selection)" -msgstr "선택" +msgstr " (선택)" -#: kdiff3.cpp:1027 +#: kdiff3.cpp:1034 #, kde-format msgid "Printing completed." msgstr "인쇄가 완료되었습니다." -#: kdiff3.cpp:1031 +#: kdiff3.cpp:1038 #, kde-format msgid "Printing aborted." msgstr "인쇄가 중단되었습니다." -#: kdiff3.cpp:1038 +#: kdiff3.cpp:1045 #, kde-format msgid "Exiting..." msgstr "종료 중..." -#: kdiff3.cpp:1049 +#: kdiff3.cpp:1056 #, kde-format msgid "Toggling toolbar..." msgstr "도구 모음 전환 중..." -#: kdiff3.cpp:1070 +#: kdiff3.cpp:1077 #, kde-format msgid "Toggle the statusbar..." msgstr "상태 표시줄 전환 중..." #: kdiff3_part.cpp:45 -#, fuzzy, kde-format -#| msgid "KDiff3Part" +#, kde-format msgid "KDiff3 Part" -msgstr "KDiff3Part" +msgstr "KDiff3 파트" #: kdiff3_part.cpp:46 #, kde-format msgid "A KPart to display SVG images" -msgstr "" +msgstr "SVG 이미지를 표시하는 KPart" #: kdiff3_part.cpp:48 #, kde-format msgid "Copyright 2007, Aurélien Gâteau " -msgstr "" +msgstr "Copyright 2007, Aurélien Gâteau " #: kdiff3_part.cpp:49 #, kde-format msgid "Joachim Eibl" msgstr "Joachim Eibl" -#: kdiff3_part.cpp:173 kdiff3_part.cpp:254 -#, fuzzy, kde-format -#| msgid "Couldn't find files for comparison." +#: kdiff3_part.cpp:174 kdiff3_part.cpp:255 +#, kde-format msgid "Could not find files for comparison." msgstr "비교할 파일을 찾을 수 없습니다." @@ -1635,7 +1622,7 @@ msgstr "KDiff3 설정" #. i18n: ectx: ToolBar (mainToolBar) -#: kdiff3_part.rc:16 main.cpp:88 +#: kdiff3_part.rc:16 main.cpp:89 #, kde-format msgid "KDiff3" msgstr "KDiff3" @@ -1648,7 +1635,7 @@ "file in the source package for details." msgstr "" "KDiff3 부분을 초기화할 수 없습니다.\n" -"설치 문제일 수도 있습니다. 원본 코드 패키지의 README 파일을 참고하십시오." +"설치 문제일 수도 있습니다. 소스 코드 패키지의 README 파일을 참고하십시오." #. i18n: ectx: Menu (file) #: kdiff3_shell.rc:4 @@ -1676,10 +1663,9 @@ #. i18n: ectx: Menu (movement) #: kdiff3_shell.rc:50 -#, fuzzy, kde-format -#| msgid "&Movement" +#, kde-format msgid "M&ovement" -msgstr "이동(&M)" +msgstr "이동(&O)" #. i18n: ectx: Menu (diff) #: kdiff3_shell.rc:61 @@ -1689,10 +1675,9 @@ #. i18n: ectx: Menu (merge) #: kdiff3_shell.rc:73 -#, fuzzy, kde-format -#| msgid "Merge" +#, kde-format msgid "M&erge" -msgstr "합치기" +msgstr "합치기(&E)" #. i18n: ectx: Menu (window) #: kdiff3_shell.rc:95 @@ -1706,84 +1691,88 @@ msgid "Main Toolbar" msgstr "주 도구 모음" -#: main.cpp:68 main.cpp:72 +#: main.cpp:69 main.cpp:73 #, kde-format msgid "Ignored. (User defined.)" -msgstr "무시함.(사용자 지정)" +msgstr "무시함.(사용자 정의)" -#: main.cpp:92 +#: main.cpp:93 #, kde-format msgid " (64 bit)" -msgstr "" +msgstr " (64비트)" -#: main.cpp:94 +#: main.cpp:95 #, kde-format msgid " (32 bit)" -msgstr "" +msgstr " (32비트)" -#: main.cpp:95 +#: main.cpp:96 #, kde-format msgid "Tool for Comparison and Merge of Files and Directories" msgstr "파일과 디렉터리를 비교하고 합치는 도구" -#: main.cpp:96 +#: main.cpp:97 #, kde-format msgid "(c) 2002-2014 Joachim Eibl, (c) 2017 Michael Reeves KF5/Qt5 port" -msgstr "" +msgstr "(c) 2002-2014 Joachim Eibl, (c) 2017 Michael Reeves KF5/Qt5 port" -#: main.cpp:112 +#: main.cpp:113 #, kde-format msgid "Merge the input." msgstr "입력을 합칩니다." -#: main.cpp:113 +#: main.cpp:114 #, kde-format msgid "Explicit base file. For compatibility with certain tools." -msgstr "명시적인 기반 파일. 일부 도구와 호환성을 위해 사용합니다." +msgstr "명시적인 기반 파일. 일부 도구와 호환성 때문에 사용합니다." -#: main.cpp:114 +#: main.cpp:115 #, kde-format msgid "Output file. Implies -m. E.g.: -o newfile.txt" msgstr "출력 파일. -m을 암시합니다. 예: -o newfile.txt" -#: main.cpp:115 +#: main.cpp:116 #, kde-format msgid "Output file, again. (For compatibility with certain tools.)" -msgstr "출력 파일, 또 다시.(일부 도구와 호환성을 위해 사용합니다.)" +msgstr "출력 파일, 또 다시.(일부 도구와 호환성 때문에 사용합니다.)" -#: main.cpp:116 +#: main.cpp:118 #, kde-format msgid "No GUI if all conflicts are auto-solvable. (Needs -o file)" msgstr "" "모든 충돌 사항을 자동적으로 해결할 수 있는 경우 GUI 사용 안 함(-o file 필요)" -#: main.cpp:117 -#, fuzzy, kde-format -#| msgid "Don't solve conflicts automatically. (For compatibility...)" +#: main.cpp:120 +#, kde-format +msgid "Ignored." +msgstr "무시됨." + +#: main.cpp:122 +#, kde-format msgid "Do not solve conflicts automatically." -msgstr "충돌 사항을 자동으로 해결하지 않습니다.(호환성 옵션)" +msgstr "충돌을 자동으로 해결하지 마십시오." -#: main.cpp:118 +#: main.cpp:123 #, kde-format msgid "Visible name replacement for input file 1 (base)." msgstr "입력 파일 1(기반)에 대한 표시 이름 대체입니다." -#: main.cpp:119 +#: main.cpp:124 #, kde-format msgid "Visible name replacement for input file 2." msgstr "입력 파일 2에 대한 표시 이름 대체입니다." -#: main.cpp:120 +#: main.cpp:125 #, kde-format msgid "Visible name replacement for input file 3." msgstr "입력 파일 3에 대한 표시 이름 대체입니다." -#: main.cpp:121 +#: main.cpp:126 #, kde-format msgid "Alternative visible name replacement. Supply this once for every input." msgstr "대안 표시 이름 대체입니다. 입력 파일마다 하나씩 지정하십시오." -#: main.cpp:122 +#: main.cpp:127 #, kde-format msgid "" "Override a config setting. Use once for every setting. E.g.: --cs " @@ -1792,87 +1781,87 @@ "설정 옵션을 재정의합니다. 설정마다 하나씩 사용하십시오. 예: --cs " "\"AutoAdvance=1\"" -#: main.cpp:123 +#: main.cpp:128 #, kde-format msgid "Show list of config settings and current values." msgstr "설정 옵션과 현재 값을 표시합니다." -#: main.cpp:124 +#: main.cpp:129 #, kde-format msgid "Use a different config file." msgstr "다른 설정 파일을 사용합니다." -#: main.cpp:127 +#: main.cpp:132 #, kde-format msgid "file1 to open (base, if not specified via --base)" msgstr "열 파일 1(--base로 지정하지 않은 경우의 기반)" -#: main.cpp:128 +#: main.cpp:133 #, kde-format msgid "file2 to open" msgstr "열 파일 2" -#: main.cpp:129 +#: main.cpp:134 #, kde-format msgid "file3 to open" msgstr "열 파일 3" -#: main.cpp:153 +#: main.cpp:158 #, kde-format msgid "See kdiff3 --help for supported options." -msgstr "" +msgstr "지원되는 옵션은 kdiff3 --help 명령을 참조하십시오." -#: mergeresultwindow.cpp:158 +#: mergeresultwindow.cpp:171 #, kde-format msgid "Choose A Everywhere" msgstr "항상 A 선택" -#: mergeresultwindow.cpp:159 +#: mergeresultwindow.cpp:172 #, kde-format msgid "Choose B Everywhere" msgstr "항상 B 선택" -#: mergeresultwindow.cpp:160 +#: mergeresultwindow.cpp:173 #, kde-format msgid "Choose C Everywhere" msgstr "항상 C 선택" -#: mergeresultwindow.cpp:161 +#: mergeresultwindow.cpp:174 #, kde-format msgid "Choose A for All Unsolved Conflicts" msgstr "모든 해결하지 않은 충돌 항목에서 A 선택" -#: mergeresultwindow.cpp:162 +#: mergeresultwindow.cpp:175 #, kde-format msgid "Choose B for All Unsolved Conflicts" msgstr "모든 해결하지 않은 충돌 항목에서 B 선택" -#: mergeresultwindow.cpp:163 +#: mergeresultwindow.cpp:176 #, kde-format msgid "Choose C for All Unsolved Conflicts" msgstr "모든 해결하지 않은 충돌 항목에서 C 선택" -#: mergeresultwindow.cpp:164 +#: mergeresultwindow.cpp:177 #, kde-format msgid "Choose A for All Unsolved Whitespace Conflicts" msgstr "모든 해결하지 않은 공백 문자 충돌 항목에서 A 선택" -#: mergeresultwindow.cpp:165 +#: mergeresultwindow.cpp:178 #, kde-format msgid "Choose B for All Unsolved Whitespace Conflicts" msgstr "모든 해결하지 않은 공백 문자 충돌 항목에서 B 선택" -#: mergeresultwindow.cpp:166 +#: mergeresultwindow.cpp:179 #, kde-format msgid "Choose C for All Unsolved Whitespace Conflicts" msgstr "모든 해결하지 않은 공백 문자 충돌 항목에서 C 선택" -#: mergeresultwindow.cpp:176 +#: mergeresultwindow.cpp:204 #, kde-format msgid "Number of remaining unsolved conflicts: %1 (of which %2 are whitespace)" msgstr "남은 해결하지 않은 충돌 항목: %1(공백 %2개 포함)" -#: mergeresultwindow.cpp:370 +#: mergeresultwindow.cpp:398 #, kde-format msgid "" "The output has been modified.\n" @@ -1881,29 +1870,29 @@ "출력 파일이 수정되었습니다.\n" "계속 진행하면 변경 사항을 저장하지 않습니다." -#: mergeresultwindow.cpp:936 pdiff.cpp:827 +#: mergeresultwindow.cpp:964 pdiff.cpp:817 #, kde-format msgid "All input files are binary equal." msgstr "모든 입력 파일의 바이너리가 같습니다." -#: mergeresultwindow.cpp:938 +#: mergeresultwindow.cpp:966 #, kde-format msgid "All input files contain the same text." msgstr "모든 입력 파일의 텍스트가 같습니다." -#: mergeresultwindow.cpp:942 mergeresultwindow.cpp:946 -#: mergeresultwindow.cpp:950 pdiff.cpp:833 pdiff.cpp:837 pdiff.cpp:841 +#: mergeresultwindow.cpp:970 mergeresultwindow.cpp:974 +#: mergeresultwindow.cpp:978 pdiff.cpp:823 pdiff.cpp:827 pdiff.cpp:831 #, kde-format msgid "Files %1 and %2 are binary equal.\n" msgstr "파일 %1와(과) %2의 바이너리가 동일합니다.\n" -#: mergeresultwindow.cpp:944 mergeresultwindow.cpp:948 -#: mergeresultwindow.cpp:952 +#: mergeresultwindow.cpp:972 mergeresultwindow.cpp:976 +#: mergeresultwindow.cpp:980 #, kde-format msgid "Files %1 and %2 have equal text.\n" msgstr "파일 %1와(과) %2의 텍스트가 동일합니다.\n" -#: mergeresultwindow.cpp:958 +#: mergeresultwindow.cpp:986 #, kde-format msgid "" "Total number of conflicts: %1\n" @@ -1911,59 +1900,56 @@ "Nr of unsolved conflicts: %3\n" "%4" msgstr "" +"총 충돌 수: %1\n" +"자동으로 해결된 충돌의 Nr: %2\n" +"해결되지 않은 충돌의 Nr: %3\n" +"%4" -#: mergeresultwindow.cpp:964 +#: mergeresultwindow.cpp:992 #, kde-format msgid "Conflicts" msgstr "충돌" -#: mergeresultwindow.cpp:1873 +#: mergeresultwindow.cpp:1901 #, kde-format msgid "" msgstr "<원본 줄 없음>" -#: mergeresultwindow.cpp:1881 +#: mergeresultwindow.cpp:1909 #, kde-format msgid "" msgstr "<충돌 합치기(공백만>" -#: mergeresultwindow.cpp:1883 mergeresultwindow.cpp:2755 +#: mergeresultwindow.cpp:1911 mergeresultwindow.cpp:2783 #, kde-format msgid "" msgstr "<충돌 합치기>" -#: mergeresultwindow.cpp:2967 -#, fuzzy, kde-format -#| msgid "" -#| "Not all conflicts are solved yet.\n" -#| "File not saved.\n" +#: mergeresultwindow.cpp:2995 +#, kde-format msgid "" "Not all conflicts are solved yet.\n" "File not saved." msgstr "" "모든 충돌 사항을 해결하지 않았습니다.\n" -"파일을 저장하지 않았습니다.\n" +"파일이 저장되지 않았습니다." -#: mergeresultwindow.cpp:2969 mergeresultwindow.cpp:2978 +#: mergeresultwindow.cpp:2997 mergeresultwindow.cpp:3006 #, kde-format msgid "Conflicts Left" msgstr "충돌 사항 남음" -#: mergeresultwindow.cpp:2976 -#, fuzzy, kde-format -#| msgid "" -#| "There is a line end style conflict. Please choose the line end style " -#| "manually.\n" -#| "File not saved.\n" +#: mergeresultwindow.cpp:3004 +#, kde-format msgid "" "There is a line end style conflict. Please choose the line end style " "manually.\n" "File not saved." msgstr "" "줄 끝 스타일이 충돌합니다. 줄 끝 스타일을 직접 선택하십시오.\n" -"파일을 저장하지 않았습니다.\n" +"파일이 저장되지 않았습니다." -#: mergeresultwindow.cpp:2990 +#: mergeresultwindow.cpp:3018 #, kde-format msgid "" "\n" @@ -1974,266 +1960,259 @@ "\n" "백업을 만들 수 없습니다. 파일을 저장하지 않았습니다." -#: mergeresultwindow.cpp:2990 mergeresultwindow.cpp:3038 +#: mergeresultwindow.cpp:3018 mergeresultwindow.cpp:3066 #, kde-format msgid "File Save Error" msgstr "파일 저장 오류" -#: mergeresultwindow.cpp:3038 +#: mergeresultwindow.cpp:3066 #, kde-format msgid "Error while writing." msgstr "쓰는 중 오류가 발생했습니다." -#: mergeresultwindow.cpp:3110 -#, fuzzy, kde-format -#| msgid "Output" +#: mergeresultwindow.cpp:3138 +#, kde-format msgid "Output:" -msgstr "출력" +msgstr "출력:" -#: mergeresultwindow.cpp:3123 mergeresultwindow.cpp:3315 +#: mergeresultwindow.cpp:3151 mergeresultwindow.cpp:3343 #, kde-format msgid "[Modified]" msgstr "[수정됨]" -#: mergeresultwindow.cpp:3130 -#, fuzzy, kde-format -#| msgid "Encoding for saving" +#: mergeresultwindow.cpp:3158 +#, kde-format msgid "Encoding for saving:" -msgstr "저장 인코딩" +msgstr "저장용 인코딩:" -#: mergeresultwindow.cpp:3230 +#: mergeresultwindow.cpp:3258 #, kde-format msgid "Conflict" msgstr "충돌" -#: mergeresultwindow.cpp:3262 -#, fuzzy, kde-format -#| msgid "Codec from" +#: mergeresultwindow.cpp:3290 +#, kde-format msgid "Codec from A: %1" -msgstr "다음의 코덱" +msgstr "A의 코덱: %1" -#: mergeresultwindow.cpp:3264 -#, fuzzy, kde-format -#| msgid "Codec from" +#: mergeresultwindow.cpp:3292 +#, kde-format msgid "Codec from B: %1" -msgstr "다음의 코덱" +msgstr "B의 코덱: %1" -#: mergeresultwindow.cpp:3266 -#, fuzzy, kde-format -#| msgid "Codec from" +#: mergeresultwindow.cpp:3294 +#, kde-format msgid "Codec from C: %1" -msgstr "다음의 코덱" +msgstr "C의 코덱: %1" -#: optiondialog.cpp:119 +#: optiondialog.cpp:121 #, kde-format msgid "Change Font" -msgstr "" +msgstr "글꼴 변경" -#: optiondialog.cpp:135 optiondialog.cpp:145 +#: optiondialog.cpp:137 optiondialog.cpp:147 #, kde-format msgid "" "Font: %1, %2, %3\n" "\n" "Example:" msgstr "" +"글꼴: %1, %2, %3\n" +"\n" +"예:" -#: optiondialog.cpp:388 +#: optiondialog.cpp:390 #, kde-format msgid "Unicode" msgstr "유니코드" -#: optiondialog.cpp:389 +#: optiondialog.cpp:391 #, kde-format msgid "Latin1" msgstr "Latin1" -#: optiondialog.cpp:408 +#: optiondialog.cpp:410 #, kde-format msgid "Change this if non-ASCII characters are not displayed correctly." msgstr "비 ASCII 문자가 올바르게 보이지 않으면 변경하십시오." -#: optiondialog.cpp:491 +#: optiondialog.cpp:495 #, kde-format msgid "Configure" msgstr "설정" -#: optiondialog.cpp:568 +#: optiondialog.cpp:573 #, kde-format msgid "Font" msgstr "글꼴" -#: optiondialog.cpp:570 +#: optiondialog.cpp:575 #, kde-format msgid "Editor & Diff Output Font" msgstr "편집기와 Diff 출력 글꼴" -#: optiondialog.cpp:589 +#: optiondialog.cpp:594 #, kde-format msgid "Application font" -msgstr "" +msgstr "프로그램 글꼴" -#: optiondialog.cpp:594 -#, fuzzy, kde-format -#| msgid "File Save Error" +#: optiondialog.cpp:599 +#, kde-format msgid "File view font" -msgstr "파일 저장 오류" +msgstr "파일 보기 글꼴" -#: optiondialog.cpp:613 -#, fuzzy, kde-format -#| msgid "Color" +#: optiondialog.cpp:618 +#, kde-format msgctxt "Title for color settings page" msgid "Color" msgstr "색" -#: optiondialog.cpp:614 +#: optiondialog.cpp:619 #, kde-format msgid "Colors Settings" msgstr "색 설정" -#: optiondialog.cpp:631 +#: optiondialog.cpp:644 #, kde-format msgid "Editor and Diff Views:" msgstr "편집기와 차이점 보기:" -#: optiondialog.cpp:639 +#: optiondialog.cpp:652 #, kde-format msgid "Foreground color:" msgstr "글자색:" -#: optiondialog.cpp:647 +#: optiondialog.cpp:660 #, kde-format msgid "Background color:" msgstr "배경색:" -#: optiondialog.cpp:657 +#: optiondialog.cpp:670 #, kde-format msgid "Diff background color:" msgstr "Diff 배경색:" -#: optiondialog.cpp:666 +#: optiondialog.cpp:679 #, kde-format msgid "Color A:" msgstr "색 A:" -#: optiondialog.cpp:675 +#: optiondialog.cpp:688 #, kde-format msgid "Color B:" msgstr "색 B:" -#: optiondialog.cpp:684 +#: optiondialog.cpp:697 #, kde-format msgid "Color C:" msgstr "색 C:" -#: optiondialog.cpp:692 +#: optiondialog.cpp:705 #, kde-format msgid "Conflict color:" msgstr "충돌 색:" -#: optiondialog.cpp:701 +#: optiondialog.cpp:714 #, kde-format msgid "Current range background color:" msgstr "현재 범위 배경색:" -#: optiondialog.cpp:710 +#: optiondialog.cpp:723 #, kde-format msgid "Current range diff background color:" msgstr "현재 범위 Diff 배경색:" -#: optiondialog.cpp:718 +#: optiondialog.cpp:731 #, kde-format msgid "Color for manually aligned difference ranges:" msgstr "수동으로 정렬한 차이점 범위 색:" -#: optiondialog.cpp:725 +#: optiondialog.cpp:738 #, kde-format msgid "Directory Comparison View:" msgstr "디렉터리 비교 보기:" -#: optiondialog.cpp:731 +#: optiondialog.cpp:744 #, kde-format msgid "Newest file color:" msgstr "가장 새로운 파일 색:" -#: optiondialog.cpp:736 +#: optiondialog.cpp:749 #, kde-format msgid "" "Changing this color will only be effective when starting the next directory " "comparison." msgstr "이 색을 변경하면 다음 디렉터리 비교부터 적용됩니다." -#: optiondialog.cpp:741 +#: optiondialog.cpp:754 #, kde-format msgid "Oldest file color:" msgstr "가장 오래된 파일 색:" -#: optiondialog.cpp:750 +#: optiondialog.cpp:763 #, kde-format msgid "Middle age file color:" msgstr "보통 시기 파일 색:" -#: optiondialog.cpp:759 +#: optiondialog.cpp:772 #, kde-format msgid "Color for missing files:" msgstr "없는 파일 색:" -#: optiondialog.cpp:773 +#: optiondialog.cpp:786 #, kde-format msgid "Editor" msgstr "편집기" -#: optiondialog.cpp:774 +#: optiondialog.cpp:787 #, kde-format msgid "Editor Behavior" msgstr "편집기 행동" -#: optiondialog.cpp:787 +#: optiondialog.cpp:809 #, kde-format msgid "Tab inserts spaces" msgstr "탭을 눌렀을 때 공백 삽입" -#: optiondialog.cpp:791 +#: optiondialog.cpp:813 #, kde-format msgid "" "On: Pressing tab generates the appropriate number of spaces.\n" "Off: A tab character will be inserted." msgstr "" -"사용: 탭을 누르면 해당하는 만큼 공백을 삽입합니다.\n" -"사용 안 함: 탭 문자를 삽입합니다." +"켜짐: 탭을 누르면 해당하는 만큼 공백을 삽입합니다.\n" +"꺼짐: 탭 문자를 삽입합니다." -#: optiondialog.cpp:796 +#: optiondialog.cpp:818 #, kde-format msgid "Tab size:" msgstr "탭 크기:" -#: optiondialog.cpp:803 +#: optiondialog.cpp:825 #, kde-format msgid "Auto indentation" msgstr "자동 들여쓰기" -#: optiondialog.cpp:807 +#: optiondialog.cpp:829 #, kde-format msgid "On: The indentation of the previous line is used for a new line.\n" -msgstr "사용: 이전 줄의 들여쓰기를 새 줄에도 적용합니다.\n" +msgstr "켜짐: 이전 줄의 들여쓰기를 새 줄에도 적용합니다.\n" -#: optiondialog.cpp:810 +#: optiondialog.cpp:832 #, kde-format msgid "Auto copy selection" msgstr "자동 선택 복사" -#: optiondialog.cpp:814 -#, fuzzy, kde-format -#| msgid "" -#| "On: Any selection is immediately written to the clipboard.\n" -#| "Off: You must explicitely copy e.g. via Ctrl-C." +#: optiondialog.cpp:836 +#, kde-format msgid "" "On: Any selection is immediately written to the clipboard.\n" "Off: You must explicitly copy e.g. via Ctrl-C." msgstr "" -"사용: 선택한 항목을 자동으로 클립보드에 복사합니다.\n" -"사용 안 함: Ctrl-C 키를 누르는 것과 같이 명시적으로 복사해야 합니다." +"켜짐: 모든 선택 내용이 클립보드에 즉시 기록됩니다.\n" +"꺼짐: 예를 들어 Ctrl-C를 통해 명시적으로 복사해야 합니다." -#: optiondialog.cpp:829 +#: optiondialog.cpp:851 #, kde-format msgid "" "Sets the line endings for when an edited file is saved.\n" @@ -2242,12 +2221,12 @@ "편집한 파일을 저장할 때 줄 끝을 지정합니다.\n" "DOS/Windows: CR+LF, UNIX: LF. CR=0D, LF=0A" -#: optiondialog.cpp:839 +#: optiondialog.cpp:861 #, kde-format msgid "Diff" msgstr "Diff" -#: optiondialog.cpp:840 +#: optiondialog.cpp:862 #, kde-format msgid "Diff Settings" msgstr "Diff 설정" @@ -2261,13 +2240,12 @@ #. ); #. ++line; #. -#: optiondialog.cpp:865 -#, fuzzy, kde-format -#| msgid "Treat as white space." +#: optiondialog.cpp:896 +#, kde-format msgid "Ignore numbers (treat as white space)" -msgstr "공백으로 취급합니다." +msgstr "숫자 무시(공백으로 처리)" -#: optiondialog.cpp:869 +#: optiondialog.cpp:900 #, kde-format msgid "" "Ignore number characters during line matching phase. (Similar to Ignore " @@ -2275,46 +2253,44 @@ "Might help to compare files with numeric data." msgstr "" "줄 일치 과정에서 숫자에 해당하는 문자를 무시합니다.(공백 무시와 비슷함)\n" -"숫자 데이터가 포함된 파일을 비교할 때 사용할 수 있습니다." +"숫자 데이터가 들어 있는 파일을 비교할 때 사용할 수 있습니다." -#: optiondialog.cpp:873 -#, fuzzy, kde-format -#| msgid "Treat C/C++ comments like white space." +#: optiondialog.cpp:904 +#, kde-format msgid "Ignore C/C++ comments (treat as white space)" -msgstr "C/C++ 주석을 공백으로 취급합니다." +msgstr "C/C++ 주석 무시(공백으로 처리)" -#: optiondialog.cpp:876 +#: optiondialog.cpp:907 #, kde-format msgid "Treat C/C++ comments like white space." msgstr "C/C++ 주석을 공백으로 취급합니다." -#: optiondialog.cpp:879 -#, fuzzy, kde-format -#| msgid "Treat as white space." +#: optiondialog.cpp:910 +#, kde-format msgid "Ignore case (treat as white space)" -msgstr "공백으로 취급합니다." +msgstr "대소문자 무시(공백으로 처리)" -#: optiondialog.cpp:883 +#: optiondialog.cpp:914 #, kde-format msgid "Treat case differences like white space changes. ('a'<=>'A')" msgstr "대소문자 차이를 공백 차이로 취급합니다.('a'<=>'A')" -#: optiondialog.cpp:886 +#: optiondialog.cpp:917 #, kde-format msgid "Preprocessor command:" msgstr "전처리기 명령:" -#: optiondialog.cpp:891 +#: optiondialog.cpp:922 #, kde-format msgid "User defined pre-processing. (See the docs for details.)" -msgstr "사용자 지정 전처리입니다.(자세한 사항은 문서를 참고하십시오)" +msgstr "사용자 정의 전처리입니다.(자세한 사항은 문서를 참고하십시오)" -#: optiondialog.cpp:894 +#: optiondialog.cpp:925 #, kde-format msgid "Line-matching preprocessor command:" msgstr "줄 일치 전처리 명령:" -#: optiondialog.cpp:899 +#: optiondialog.cpp:930 #, kde-format msgid "" "This pre-processor is only used during line matching.\n" @@ -2323,12 +2299,12 @@ "이 전처리기는 줄 일치에만 사용합니다.\n" "(자세한 사항은 문서를 참고하십시오.)" -#: optiondialog.cpp:902 +#: optiondialog.cpp:933 #, kde-format msgid "Try hard (slower)" msgstr "더 자세히 비교(느림)" -#: optiondialog.cpp:906 +#: optiondialog.cpp:937 #, kde-format msgid "" "Enables the --minimal option for the external diff.\n" @@ -2337,33 +2313,39 @@ "외부 diff 실행 시 --minimal 옵션을 사용합니다.\n" "큰 파일 비교가 느려질 수 있습니다." -#: optiondialog.cpp:910 +#: optiondialog.cpp:941 #, kde-format msgid "Align B and C for 3 input files" msgstr "입력 파일이 3개일 때 B와 C 정렬" -#: optiondialog.cpp:914 +#: optiondialog.cpp:945 #, kde-format msgid "" "Try to align B and C when comparing or merging three input files.\n" "Not recommended for merging because merge might get more complicated.\n" "(Default is off.)" msgstr "" -"세 개의 입력 파일을 비교하거나 합칠 때 B와 C로 정렬을 시도합니다.\n" +"입력 파일 세 개를 비교하거나 합칠 때 B와 C로 정렬을 시도합니다.\n" "합칠 때에는 더 복잡해질 수 있으므로 합칠 때에는 추천하지 않습니다.\n" "(기본값으로 비활성화됨.)" -#: optiondialog.cpp:926 +#: optiondialog.cpp:956 +#, kde-format +msgctxt "Settings page" +msgid "Merge" +msgstr "합치기" + +#: optiondialog.cpp:957 #, kde-format msgid "Merge Settings" msgstr "합치기 설정" -#: optiondialog.cpp:940 +#: optiondialog.cpp:980 #, kde-format msgid "Auto advance delay (ms):" msgstr "자동 진행 지연 시간(ms):" -#: optiondialog.cpp:946 +#: optiondialog.cpp:986 #, kde-format msgid "" "When in Auto-Advance mode the result of the current selection is shown \n" @@ -2372,27 +2354,27 @@ "자동 진행 모드에서는 현재 선택 결과를 지정한 시간 동안 표시한 다음\n" "다음 충돌 항목으로 이동합니다. 범위: 0-2000ms" -#: optiondialog.cpp:950 +#: optiondialog.cpp:990 #, kde-format msgid "Show info dialogs" -msgstr "정보 대화 상자 보이기" +msgstr "정보 대화 상자 표시" -#: optiondialog.cpp:953 +#: optiondialog.cpp:993 #, kde-format msgid "Show a dialog with information about the number of conflicts." msgstr "충돌 개수 정보 대화 상자를 표시합니다." -#: optiondialog.cpp:956 +#: optiondialog.cpp:996 #, kde-format msgid "White space 2-file merge default:" msgstr "공백만 변경되었을 때 2개 파일 합치기 기본값:" -#: optiondialog.cpp:961 optiondialog.cpp:974 +#: optiondialog.cpp:1001 optiondialog.cpp:1014 #, kde-format msgid "Manual Choice" msgstr "수동 선택" -#: optiondialog.cpp:965 optiondialog.cpp:979 +#: optiondialog.cpp:1005 optiondialog.cpp:1019 #, kde-format msgid "" "Allow the merge algorithm to automatically select an input for white-space-" @@ -2401,22 +2383,22 @@ "공백만 변경되었을 때 합치기 알고리즘에서 입력을 자동으로 선택하도록 허용합니" "다." -#: optiondialog.cpp:969 +#: optiondialog.cpp:1009 #, kde-format msgid "White space 3-file merge default:" msgstr "공백만 변경되었을 때 3개 파일 합치기 기본값:" -#: optiondialog.cpp:983 +#: optiondialog.cpp:1023 #, kde-format msgid "Automatic Merge Regular Expression" msgstr "자동 합치기 정규 표현식" -#: optiondialog.cpp:991 smalldialogs.cpp:449 +#: optiondialog.cpp:1031 smalldialogs.cpp:459 #, kde-format msgid "Auto merge regular expression:" msgstr "자동 합치기 정규 표현식:" -#: optiondialog.cpp:996 +#: optiondialog.cpp:1036 #, kde-format msgid "" "Regular expression for lines where KDiff3 should automatically choose one " @@ -2428,12 +2410,12 @@ "충돌이 발생한 줄이 정규 표현식과 일치하는 경우\n" "C를 선택하고, 그렇지 않으면 B를 선택합니다." -#: optiondialog.cpp:1002 +#: optiondialog.cpp:1042 #, kde-format msgid "Run regular expression auto merge on merge start" msgstr "합치기를 시작할 때 정규 표현식 실행" -#: optiondialog.cpp:1005 +#: optiondialog.cpp:1045 #, kde-format msgid "" "Run the merge for auto merge regular expressions\n" @@ -2442,17 +2424,17 @@ "합치기 작업을 시작할 때 자동 합치기\n" "정규 표현식으로 합치기를 실행합니다.\n" -#: optiondialog.cpp:1010 +#: optiondialog.cpp:1050 #, kde-format msgid "Version Control History Merging" msgstr "버전 관리 역사 합치기" -#: optiondialog.cpp:1018 smalldialogs.cpp:476 +#: optiondialog.cpp:1058 smalldialogs.cpp:486 #, kde-format msgid "History start regular expression:" msgstr "역사 시작 정규 표현식:" -#: optiondialog.cpp:1023 +#: optiondialog.cpp:1063 #, kde-format msgid "" "Regular expression for the start of the version control history entry.\n" @@ -2460,15 +2442,15 @@ "Default value: \".*\\$Log.*\\$.*\"" msgstr "" "버전 관리 역사 항목의 시작을 나타내는 정규 표현식입니다.\n" -"대개 이 줄은 \"$Log$\" 키워드를 포함합니다.\n" +"대개 이 줄에는 \"$Log$\" 키워드가 들어 있습니다.\n" "기본값: \".*\\$Log.*\\$.*\"" -#: optiondialog.cpp:1029 smalldialogs.cpp:504 +#: optiondialog.cpp:1069 smalldialogs.cpp:514 #, kde-format msgid "History entry start regular expression:" msgstr "역사 항목 시작 정규 표현식:" -#: optiondialog.cpp:1042 +#: optiondialog.cpp:1082 #, kde-format msgid "" "A version control history entry consists of several lines.\n" @@ -2480,27 +2462,27 @@ "See the documentation for details." msgstr "" "버전 관리 역사 항목은 여러 줄로 이루어져 있습니다.\n" -"시작 주석이 없는 첫 번째 항목을 확인하기 위한 정규 표현식을 지정하십시오.\n" +"시작 주석이 없는 첫 번째 항목을 확인할 정규 표현식을 지정하십시오.\n" "정렬에 사용할 키 그룹은 괄호로 지정하십시오.\n" "비어 있으면 KDiff3은 빈 줄로 역사 항목을 구분하는 것으로 간주합니다.\n" "자세한 사항은 문서를 참고하십시오." -#: optiondialog.cpp:1050 +#: optiondialog.cpp:1090 #, kde-format msgid "History merge sorting" msgstr "역사 합치기 정렬" -#: optiondialog.cpp:1053 +#: optiondialog.cpp:1093 #, kde-format msgid "Sort version control history by a key." msgstr "버전 관리 역사를 키를 기준으로 정렬합니다." -#: optiondialog.cpp:1063 +#: optiondialog.cpp:1103 #, kde-format msgid "History entry start sort key order:" msgstr "버전 관리 시작 정렬 키 순서:" -#: optiondialog.cpp:1068 +#: optiondialog.cpp:1108 #, kde-format msgid "" "Each pair of parentheses used in the regular expression for the history " @@ -2518,37 +2500,37 @@ "비어 있으면 정렬하지 않습니다.\n" "자세한 사항은 문서를 참고하십시오." -#: optiondialog.cpp:1079 +#: optiondialog.cpp:1119 #, kde-format msgid "Merge version control history on merge start" msgstr "합치기를 시작할 때 버전 관리 역사 합치기" -#: optiondialog.cpp:1082 +#: optiondialog.cpp:1122 #, kde-format msgid "Run version control history automerge on merge start." msgstr "합치기를 시작할 때 자동으로 버전 관리 역사를 합칩니다." -#: optiondialog.cpp:1086 +#: optiondialog.cpp:1126 #, kde-format msgid "Max number of history entries:" msgstr "최대 역사 항목 수:" -#: optiondialog.cpp:1090 +#: optiondialog.cpp:1130 #, kde-format msgid "Cut off after specified number. Use -1 for infinite number of entries." msgstr "지정한 개수를 초과하는 항목은 잘라냅니다. -1은 제한을 두지 않습니다." -#: optiondialog.cpp:1094 +#: optiondialog.cpp:1134 #, kde-format msgid "Test your regular expressions" msgstr "정규 표현식을 시험해 보십시오" -#: optiondialog.cpp:1099 +#: optiondialog.cpp:1139 #, kde-format msgid "Irrelevant merge command:" msgstr "관계 없는 합침 명령:" -#: optiondialog.cpp:1104 +#: optiondialog.cpp:1144 #, kde-format msgid "" "If specified this script is run after automerge\n" @@ -2556,15 +2538,15 @@ "Called with the parameters: filename1 filename2 filename3" msgstr "" "자동 합치기가 끝난 후 합칠 항목이\n" -"더 이상 존재하지 않으면 지정한 스크립트를 실행합니다.\n" +"더 이상 없으면 지정한 스크립트를 실행합니다.\n" "다음 인자로 호출합니다: filename1 filename2 filename3" -#: optiondialog.cpp:1109 +#: optiondialog.cpp:1149 #, kde-format msgid "Auto save and quit on merge without conflicts" msgstr "충돌하지 않고 합쳐졌을 때 자동으로 저장하고 끝내기" -#: optiondialog.cpp:1113 +#: optiondialog.cpp:1153 #, kde-format msgid "" "If KDiff3 was started for a file-merge from the command line and all\n" @@ -2576,27 +2558,27 @@ "변경 사항이 사용자 확인 없이 진행 가능하면 자동으로 저장하고 끝냅니다.\n" "(명령행 옵션 \"--auto\"와 비슷합니다.)" -#: optiondialog.cpp:1124 optiondialog.cpp:1125 +#: optiondialog.cpp:1164 optiondialog.cpp:1165 #, kde-format msgid "Directory" msgstr "디렉터리" -#: optiondialog.cpp:1137 +#: optiondialog.cpp:1185 #, kde-format msgid "Recursive directories" msgstr "재귀적 디렉터리" -#: optiondialog.cpp:1140 +#: optiondialog.cpp:1188 #, kde-format msgid "Whether to analyze subdirectories or not." msgstr "하위 디렉터리를 분석할지 여부입니다." -#: optiondialog.cpp:1142 +#: optiondialog.cpp:1190 #, kde-format msgid "File pattern(s):" msgstr "파일 패턴:" -#: optiondialog.cpp:1148 +#: optiondialog.cpp:1196 #, kde-format msgid "" "Pattern(s) of files to be analyzed. \n" @@ -2605,14 +2587,14 @@ msgstr "" "분석할 파일 패턴입니다.\n" "와일드카드: '*', '?'\n" -"쌍반점(';')을 사용하여 여러 개의 패턴을 지정할 수 있습니다." +"쌍반점(';')을 사용하여 패턴 여러 개를 지정할 수 있습니다." -#: optiondialog.cpp:1153 +#: optiondialog.cpp:1201 #, kde-format msgid "File-anti-pattern(s):" msgstr "파일 제외 패턴:" -#: optiondialog.cpp:1159 +#: optiondialog.cpp:1207 #, kde-format msgid "" "Pattern(s) of files to be excluded from analysis. \n" @@ -2621,14 +2603,14 @@ msgstr "" "분석할 파일에서 제외할 패턴입니다.\n" "와일드카드: '*', '?'\n" -"쌍반점(';')을 사용하여 여러 개의 패턴을 지정할 수 있습니다." +"쌍반점(';')을 사용하여 패턴 여러 개를 지정할 수 있습니다." -#: optiondialog.cpp:1164 +#: optiondialog.cpp:1212 #, kde-format msgid "Dir-anti-pattern(s):" msgstr "디렉터리 제외 패턴:" -#: optiondialog.cpp:1170 +#: optiondialog.cpp:1218 #, kde-format msgid "" "Pattern(s) of directories to be excluded from analysis. \n" @@ -2637,14 +2619,14 @@ msgstr "" "분석할 디렉터리에서 제외할 패턴입니다.\n" "와일드카드: '*', '?'\n" -"쌍반점(';')을 사용하여 여러 개의 패턴을 지정할 수 있습니다." +"쌍반점(';')을 사용하여 패턴 여러 개를 지정할 수 있습니다." -#: optiondialog.cpp:1175 +#: optiondialog.cpp:1223 #, kde-format msgid "Use .cvsignore" msgstr ".cvsisnore 사용" -#: optiondialog.cpp:1179 +#: optiondialog.cpp:1227 #, kde-format msgid "" "Extends the antipattern to anything that would be ignored by CVS.\n" @@ -2653,51 +2635,50 @@ "CVS에서 무시하는 파일을 제외합니다.\n" "디렉터리별로 \".cvsignore\" 파일을 다르게 지정할 수 있습니다." -#: optiondialog.cpp:1183 +#: optiondialog.cpp:1231 #, kde-format msgid "Find hidden files and directories" -msgstr "숨은 파일과 디렉터리 찾기" +msgstr "숨김 파일과 디렉터리 찾기" -#: optiondialog.cpp:1186 -#, fuzzy, kde-format -#| msgid "Find hidden files and directories" +#: optiondialog.cpp:1234 +#, kde-format msgid "Finds hidden files and directories." -msgstr "숨은 파일과 디렉터리 찾기" +msgstr "숨김 파일과 디렉터리를 찾습니다." -#: optiondialog.cpp:1189 +#: optiondialog.cpp:1237 #, kde-format msgid "Follow file links" msgstr "파일 링크 따라가기" -#: optiondialog.cpp:1193 +#: optiondialog.cpp:1241 #, kde-format msgid "" "On: Compare the file the link points to.\n" "Off: Compare the links." msgstr "" -"사용: 링크가 가리키는 곳의 파일을 따라갑니다.\n" -"사용 안 함: 링크 자체를 비교합니다." +"켜짐: 링크가 가리키는 곳의 파일을 따라갑니다.\n" +"꺼짐: 링크 자체를 비교합니다." -#: optiondialog.cpp:1197 +#: optiondialog.cpp:1245 #, kde-format msgid "Follow directory links" msgstr "디렉터리 링크 따라가기" -#: optiondialog.cpp:1201 +#: optiondialog.cpp:1249 #, kde-format msgid "" "On: Compare the directory the link points to.\n" "Off: Compare the links." msgstr "" -"사용: 링크가 가리키는 곳의 디렉터리를 따라갑니다.\n" -"사용 안 함: 링크 자체를 비교합니다." +"켜짐: 링크가 가리키는 곳의 디렉터리를 따라갑니다.\n" +"꺼짐: 링크 자체를 비교합니다." -#: optiondialog.cpp:1210 +#: optiondialog.cpp:1258 #, kde-format msgid "Case sensitive filename comparison" msgstr "파일 이름 비교 시 대소문자 구분" -#: optiondialog.cpp:1214 +#: optiondialog.cpp:1262 #, kde-format msgid "" "The directory comparison will compare files or directories when their names " @@ -2706,55 +2687,58 @@ "off, otherwise on.)" msgstr "" "디렉터리 비교 기능은 이름이 일치하는 파일과 디렉터리를 비교합니다.\n" -"이름의 대소문자가 반드시 일치해야 하면 이 옵션을 선택하십시오. (Windows에서" -"는 꺼짐, 기타 플랫폼에서는 켜짐)" +"이름의 대소문자가 반드시 일치해야 하면 이 옵션을 선택하십시오(Windows에서는 " +"꺼짐, 기타 플랫폼에서는 켜짐)." -#: optiondialog.cpp:1218 -#, fuzzy, kde-format -#| msgid "Unfold All Subdirs" +#: optiondialog.cpp:1266 +#, kde-format msgid "Unfold all subdirectories on load" -msgstr "모든 하위 디렉터리 풀기" +msgstr "불러올 때 모든 하위 디렉터리 펼치기" -#: optiondialog.cpp:1222 +#: optiondialog.cpp:1270 #, kde-format msgid "" "On: Unfold all subdirectories when starting a directory diff.\n" "Off: Leave subdirectories folded." msgstr "" +"켜짐: 디렉터리 Diff를 시작할 때 모든 하위 디렉터리를 펼칩니다.\n" +"꺼짐: 하위 디렉터리를 접힌 상태로 둡니다." -#: optiondialog.cpp:1226 +#: optiondialog.cpp:1274 #, kde-format msgid "Skip directory status report" -msgstr "" +msgstr "디렉터리 상태 보고서 건너 뛰기" -#: optiondialog.cpp:1230 +#: optiondialog.cpp:1278 #, kde-format msgid "" "On: Do not show the Directory Comparison Status.\n" "Off: Show the status dialog on start." msgstr "" +"켜짐: 디렉터리 비교 상태를 표시하지 않습니다.\n" +"꺼짐: 시작 시 상태 대화 상자를 표시합니다." -#: optiondialog.cpp:1234 +#: optiondialog.cpp:1282 #, kde-format msgid "File Comparison Mode" msgstr "파일 비교 모드" -#: optiondialog.cpp:1239 +#: optiondialog.cpp:1287 #, kde-format msgid "Binary comparison" msgstr "바이너리 비교" -#: optiondialog.cpp:1241 +#: optiondialog.cpp:1289 #, kde-format msgid "Binary comparison of each file. (Default)" msgstr "각각 파일의 바이너리 비교를 수행합니다.(기본값)" -#: optiondialog.cpp:1244 +#: optiondialog.cpp:1292 #, kde-format msgid "Full analysis" msgstr "완전 분석" -#: optiondialog.cpp:1246 +#: optiondialog.cpp:1294 #, kde-format msgid "" "Do a full analysis and show statistics information in extra columns.\n" @@ -2763,12 +2747,12 @@ "완전 분석을 수행하여 추가 열에 통계 정보를 표시합니다.\n" "(바이너리 비교보다 느리며 바이너리 파일에서는 더 느립니다)" -#: optiondialog.cpp:1250 +#: optiondialog.cpp:1298 #, kde-format msgid "Trust the size and modification date (unsafe)" msgstr "크기와 수정한 날짜 무시하기(안전하지 않음)" -#: optiondialog.cpp:1252 +#: optiondialog.cpp:1300 #, kde-format msgid "" "Assume that files are equal if the modification date and file length are " @@ -2781,7 +2765,7 @@ "내용이 같지만 수정한 날짜가 다른 파일은 다른 파일로 나타납니다.\n" "큰 디렉터리나 느린 네트워크에서 유용합니다." -#: optiondialog.cpp:1257 +#: optiondialog.cpp:1305 #, kde-format msgid "" "Trust the size and date, but use binary comparison if date does not match " @@ -2790,7 +2774,7 @@ "크기와 수정한 날짜를 무시하지만 날짜가 다르면 바이너리 비교 사용(안전하지 않" "음)" -#: optiondialog.cpp:1259 +#: optiondialog.cpp:1307 #, kde-format msgid "" "Assume that files are equal if the modification date and file length are " @@ -2802,12 +2786,12 @@ "수정한 날짜가 다른 파일은 바이너리 비교를 수행합니다.\n" "큰 디렉터리나 느린 네트워크에서 유용합니다." -#: optiondialog.cpp:1264 +#: optiondialog.cpp:1312 #, kde-format msgid "Trust the size (unsafe)" msgstr "크기 건너뛰기(안전하지 않음)" -#: optiondialog.cpp:1266 +#: optiondialog.cpp:1314 #, kde-format msgid "" "Assume that files are equal if their file lengths are equal.\n" @@ -2817,12 +2801,12 @@ "파일 크기가 같은 파일은 같은 파일로 취급합니다.\n" "날짜가 다운로드 중 수정된 큰 디렉터리나 느린 네트워크에서 유용합니다." -#: optiondialog.cpp:1273 +#: optiondialog.cpp:1321 #, kde-format msgid "Synchronize directories" msgstr "디렉터리 동기화" -#: optiondialog.cpp:1277 +#: optiondialog.cpp:1325 #, kde-format msgid "" "Offers to store files in both directories so that\n" @@ -2833,12 +2817,12 @@ "작업 이후 디렉터리의 내용을 동일하게 유지합니다.\n" "대상을 지정하지 않고 두 디렉터리를 비교할 때만 작동합니다." -#: optiondialog.cpp:1283 +#: optiondialog.cpp:1331 #, kde-format msgid "White space differences considered equal" msgstr "공백 문자 변경을 같은 것으로 취급" -#: optiondialog.cpp:1287 +#: optiondialog.cpp:1335 #, kde-format msgid "" "If files differ only by white space consider them equal.\n" @@ -2847,32 +2831,28 @@ "파일이 공백 문자만 다르면 같은 것으로 취급합니다.\n" "완전 분석을 선택했을 때만 사용합니다." -#: optiondialog.cpp:1293 +#: optiondialog.cpp:1341 #, kde-format msgid "Copy newer instead of merging (unsafe)" msgstr "합치는 대신 새 파일 복사(안전하지 않음)" -#: optiondialog.cpp:1297 -#, fuzzy, kde-format -#| msgid "" -#| "Don't look inside, just take the newer file.\n" -#| "(Use this only if you know what you are doing!)\n" -#| "Only effective when comparing two directories." +#: optiondialog.cpp:1345 +#, kde-format msgid "" "Do not look inside, just take the newer file.\n" "(Use this only if you know what you are doing!)\n" "Only effective when comparing two directories." msgstr "" -"파일의 내용을 보지 않고 새 파일을 복사합니다.\n" -"(하고 있는 일이 무엇인지 알 때만 사용하십시오!)\n" -"두 디렉터리를 비교할 때만 사용합니다." +"파일의 내용과 관계 없이 새로운 파일을 선택합니다.\n" +"(무엇을 하는지 알고 있는 경우에만 이 옵션을 사용하십시오!)\n" +"두 디렉터리를 비교할 때에만 사용합니다." -#: optiondialog.cpp:1302 +#: optiondialog.cpp:1350 #, kde-format msgid "Backup files (.orig)" msgstr "파일 백업(.orig)" -#: optiondialog.cpp:1306 +#: optiondialog.cpp:1354 #, kde-format msgid "" "If a file would be saved over an old file, then the old file\n" @@ -2881,37 +2861,36 @@ "기존 파일의 내용을 변경하여 저장하는 경우, 기존 파일은\n" "삭제되지 않고 '.orig' 확장자가 추가되어 저장됩니다." -#: optiondialog.cpp:1382 optiondialog.cpp:1383 +#: optiondialog.cpp:1430 optiondialog.cpp:1431 #, kde-format msgid "Regional Settings" msgstr "지역 설정" -#: optiondialog.cpp:1397 +#: optiondialog.cpp:1454 #, kde-format msgid "Use the same encoding for everything:" -msgstr "모든 것에 동일한 인코딩 사용:" +msgstr "모든 항목에 동일한 인코딩 사용:" -#: optiondialog.cpp:1401 +#: optiondialog.cpp:1458 #, kde-format msgid "" "Enable this allows to change all encodings by changing the first only.\n" "Disable this if different individual settings are needed." msgstr "" "이 옵션을 사용하면 첫 인코딩을 변경했을 때 모든 인코딩을 변경합니다.\n" -"개별 설정이 필요하면 비활성화 시키십시오." +"개별 설정이 필요하면 비활성화하십시오." -#: optiondialog.cpp:1405 -#, fuzzy, kde-format -#| msgid "Note: Local Encoding is " +#: optiondialog.cpp:1462 +#, kde-format msgid "Note: Local Encoding is \"%1\"" -msgstr "메모: 현재 로컬 인코딩: " +msgstr "메모: 로컬 인코딩은 \"%1\"입니다" -#: optiondialog.cpp:1409 +#: optiondialog.cpp:1466 #, kde-format msgid "File Encoding for A:" -msgstr "파일 A 인코딩:" +msgstr "A 파일 인코딩:" -#: optiondialog.cpp:1416 +#: optiondialog.cpp:1473 #, kde-format msgid "" "If enabled then Unicode (UTF-16 or UTF-8) encoding will be detected.\n" @@ -2923,32 +2902,32 @@ "파일이 유니코드가 아닌 경우 선택한 인코딩을 폴백으로 사용합니다.\n" "(유니코드 감지는 파일의 첫 바이트를 봅니다.)" -#: optiondialog.cpp:1419 optiondialog.cpp:1430 optiondialog.cpp:1441 +#: optiondialog.cpp:1476 optiondialog.cpp:1487 optiondialog.cpp:1498 #, kde-format msgid "Auto Detect Unicode" msgstr "유니코드 자동 감지" -#: optiondialog.cpp:1425 +#: optiondialog.cpp:1482 #, kde-format msgid "File Encoding for B:" -msgstr "파일 B 인코딩:" +msgstr "B 파일 인코딩:" -#: optiondialog.cpp:1436 +#: optiondialog.cpp:1493 #, kde-format msgid "File Encoding for C:" -msgstr "파일 C 인코딩:" +msgstr "C 파일 인코딩:" -#: optiondialog.cpp:1447 +#: optiondialog.cpp:1504 #, kde-format msgid "File Encoding for Merge Output and Saving:" msgstr "합치기 출력과 저장 인코딩:" -#: optiondialog.cpp:1452 +#: optiondialog.cpp:1509 #, kde-format msgid "Auto Select" msgstr "자동 선택" -#: optiondialog.cpp:1456 +#: optiondialog.cpp:1513 #, kde-format msgid "" "If enabled then the encoding from the input files is used.\n" @@ -2958,17 +2937,17 @@ "이 옵션을 사용하면 입력 파일의 인코딩을 사용합니다.\n" "모호한 경우 사용자에게 저장할 인코딩을 물어 보는 대화 상자를 엽니다." -#: optiondialog.cpp:1459 +#: optiondialog.cpp:1516 #, kde-format msgid "File Encoding for Preprocessor Files:" msgstr "전처리 파일 인코딩:" -#: optiondialog.cpp:1471 +#: optiondialog.cpp:1528 #, kde-format msgid "Right To Left Language" msgstr "오른쪽에서 왼쪽으로 쓰는 언어" -#: optiondialog.cpp:1475 +#: optiondialog.cpp:1532 #, kde-format msgid "" "Some languages are read from right to left.\n" @@ -2977,22 +2956,22 @@ "일부 언어는 오른쪽에서 왼쪽으로 씁니다.\n" "이 설정은 뷰어와 편집기의 설정을 변경합니다." -#: optiondialog.cpp:1485 +#: optiondialog.cpp:1542 #, kde-format msgid "Integration" msgstr "통합" -#: optiondialog.cpp:1486 +#: optiondialog.cpp:1543 #, kde-format msgid "Integration Settings" msgstr "통합 설정" -#: optiondialog.cpp:1499 +#: optiondialog.cpp:1564 #, kde-format msgid "Command line options to ignore:" msgstr "무시할 명령행 옵션:" -#: optiondialog.cpp:1505 +#: optiondialog.cpp:1570 #, kde-format msgid "" "List of command line options that should be ignored when KDiff3 is used by " @@ -3004,21 +2983,21 @@ "여러 항목을 구분하려면 쌍반점(';')을 사용하십시오.\n" "이 옵션은 \"알 수 없는 옵션\" 오류를 비활성화합니다." -#: optiondialog.cpp:1510 +#: optiondialog.cpp:1575 #, kde-format msgid "Quit also via Escape key" msgstr "Esc 키로도 끝내기" -#: optiondialog.cpp:1514 +#: optiondialog.cpp:1579 #, kde-format msgid "" "Fast method to exit.\n" "For those who are used to using the Escape key." msgstr "" -"끝내기 위한 빠른 방법입니다.\n" +"끝내는 빠른 방법입니다.\n" "Esc 키로 끝내기에 익숙한 사람을 위한 방법입니다." -#: optiondialog.cpp:1598 +#: optiondialog.cpp:1653 #, kde-format msgid "This resets all options. Not only those of the current topic." msgstr "현재 항목 뿐만 아니라 모든 옵션을 초기화합니다." @@ -3073,108 +3052,89 @@ msgid "Disable Unsafe Options" msgstr "안전하지 않은 옵션 비활성화" -#: pdiff.cpp:158 +#: pdiff.cpp:160 #, kde-format msgid "Loading A" msgstr "A 불러오는 중" -#: pdiff.cpp:167 +#: pdiff.cpp:162 #, kde-format -msgid "Errors occurred during pre-processing of file A." -msgstr "" +msgid "Loading A: %1" +msgstr "A 불러오는 중: %1" -#: pdiff.cpp:172 +#: pdiff.cpp:170 #, kde-format msgid "Loading B" msgstr "B 불러오는 중" -#: pdiff.cpp:179 -#, kde-format -msgid "Errors occurred during pre-processing of file B." -msgstr "" - -#: pdiff.cpp:202 pdiff.cpp:241 +#: pdiff.cpp:201 pdiff.cpp:237 #, kde-format msgid "Diff: A <-> B" msgstr "Diff: A <-> B" -#: pdiff.cpp:208 pdiff.cpp:279 pdiff.cpp:293 +#: pdiff.cpp:207 pdiff.cpp:275 pdiff.cpp:289 #, kde-format msgid "Linediff: A <-> B" msgstr "줄 Diff: A <-> B" -#: pdiff.cpp:225 +#: pdiff.cpp:224 #, kde-format msgid "Loading C" msgstr "C 불러오는 중" -#: pdiff.cpp:232 -#, kde-format -msgid "Errors occurred during pre-processing of file C." -msgstr "" - -#: pdiff.cpp:250 +#: pdiff.cpp:246 #, kde-format msgid "Diff: A <-> C" msgstr "Diff: A <-> C" -#: pdiff.cpp:261 +#: pdiff.cpp:257 #, kde-format msgid "Diff: B <-> C" msgstr "Diff: B <-> C" -#: pdiff.cpp:283 pdiff.cpp:297 +#: pdiff.cpp:279 pdiff.cpp:293 #, kde-format msgid "Linediff: B <-> C" msgstr "줄 Diff: B <-> C" -#: pdiff.cpp:287 pdiff.cpp:301 +#: pdiff.cpp:283 pdiff.cpp:297 #, kde-format msgid "Linediff: A <-> C" msgstr "줄 Diff: A <-> C" -#: pdiff.cpp:829 +#: pdiff.cpp:819 #, kde-format msgid "All input files contain the same text, but are not binary equal." msgstr "모든 입력 파일의 텍스트가 같지만 바이너리는 같지 않습니다." -#: pdiff.cpp:835 pdiff.cpp:839 pdiff.cpp:843 +#: pdiff.cpp:825 pdiff.cpp:829 pdiff.cpp:833 #, kde-format msgid "Files %1 and %2 have equal text, but are not binary equal. \n" msgstr "파일 %1와(과) %2의 텍스트가 같지만 바이너리는 같지 않습니다.\n" -#: pdiff.cpp:853 -#, fuzzy, kde-format -#| 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." +#: pdiff.cpp:843 +#, kde-format msgid "" "Some input files do not seem to be pure text files.\n" "Note that the KDiff3 merge was not meant for binary data.\n" "Continue at your own risk." msgstr "" -"일부 입력 파일은 완전한 텍스트 파일이 아는 것 같습니다.\n" +"일부 입력 파일은 일반 텍스트 파일이 아닌 것 같습니다\n" "KDiff3의 합치기 기능은 바이너리 데이터에 적합하지 않습니다.\n" "본인 책임 하에 계속 진행하십시오." -#: pdiff.cpp:863 +#: pdiff.cpp:853 #, kde-format msgid ", B" -msgstr "" +msgstr ", B" -#: pdiff.cpp:865 +#: pdiff.cpp:855 #, kde-format msgid ", C" -msgstr "" +msgstr ", C" -#: pdiff.cpp:867 -#, fuzzy, kde-format -#| msgid "" -#| "Some input characters could not be converted to valid unicode.\n" -#| "You might be using the wrong codec. (e.g. UTF-8 for non UTF-8 files).\n" -#| "Don't save the result if unsure. Continue at your own risk.\n" -#| "Affected input files are in %1." +#: pdiff.cpp:857 +#, kde-format msgid "" "Some input characters could not be converted to valid unicode.\n" "You might be using the wrong codec. (e.g. UTF-8 for non UTF-8 files).\n" @@ -3187,77 +3147,72 @@ "오.\n" "영향 받는 입력 파일은 %1에 있습니다." -#: pdiff.cpp:1034 +#: pdiff.cpp:1032 #, kde-format msgid "Abort" msgstr "중단" -#: pdiff.cpp:1040 pdiff.cpp:1130 +#: pdiff.cpp:1038 pdiff.cpp:1129 #, kde-format msgid "Opening files..." msgstr "파일 여는 중..." -#: pdiff.cpp:1107 -#, kde-format -msgid "File open error" -msgstr "파일 열기 오류" - -#: pdiff.cpp:1202 +#: pdiff.cpp:1212 #, kde-format msgid "Cutting selection..." msgstr "선택 영역 잘라내는 중..." -#: pdiff.cpp:1223 +#: pdiff.cpp:1233 #, kde-format msgid "Copying selection to clipboard..." msgstr "선택 영역 클립보드에 복사하는 중..." -#: pdiff.cpp:1239 +#: pdiff.cpp:1249 #, kde-format msgid "Inserting clipboard contents..." msgstr "클립보드 내용 삽입 중..." -#: pdiff.cpp:1695 +#: pdiff.cpp:1705 #, kde-format msgid "Word wrap (Cancel disables word wrap)" -msgstr "" +msgstr "자동 줄 바꿈(취소하면 자동으로 줄 바꾸지 않음)" -#: pdiff.cpp:1696 +#: pdiff.cpp:1706 #, kde-format msgid "Calculating max width for horizontal scrollbar" -msgstr "" +msgstr "가로 스크롤 막대의 최대 너비 계산" -#: pdiff.cpp:1911 +#: pdiff.cpp:1921 #, kde-format msgid "Save && Continue" msgstr "저장하고 계속" -#: pdiff.cpp:1912 +#: pdiff.cpp:1922 #, kde-format msgid "Continue Without Saving" msgstr "저장하지 않고 계속" -#: pdiff.cpp:2124 +#: pdiff.cpp:2134 #, kde-format msgid "Search complete." -msgstr "검색 완료." +msgstr "검색이 완료되었습니다." -#: pdiff.cpp:2124 +#: pdiff.cpp:2134 #, kde-format msgid "Search Complete" msgstr "검색 완료" -#: pdiff.cpp:2375 +#: pdiff.cpp:2385 #, kde-format msgid "Nothing is selected in either diff input window." msgstr "Diff 입력 창에서 아무것도 선택하지 않았습니다." -#: pdiff.cpp:2375 +#: pdiff.cpp:2385 #, kde-format msgid "Error while adding manual diff range" msgstr "수동 Diff 범위 추가 중 오류 발생" -#: progress.cpp:59 progress.cpp:71 +#: progress.cpp:61 progress.cpp:73 #, kde-format msgid "&Cancel" msgstr "취소(&C)" @@ -3267,145 +3222,143 @@ msgid "A (Base):" msgstr "A(기반):" -#: smalldialogs.cpp:68 smalldialogs.cpp:85 smalldialogs.cpp:102 -#: smalldialogs.cpp:144 +#: smalldialogs.cpp:71 smalldialogs.cpp:90 smalldialogs.cpp:109 +#: smalldialogs.cpp:154 #, kde-format msgid "File..." msgstr "파일..." -#: smalldialogs.cpp:70 smalldialogs.cpp:87 smalldialogs.cpp:104 -#: smalldialogs.cpp:146 +#: smalldialogs.cpp:73 smalldialogs.cpp:92 smalldialogs.cpp:111 +#: smalldialogs.cpp:156 #, kde-format msgid "Dir..." msgstr "디렉터리..." -#: smalldialogs.cpp:96 +#: smalldialogs.cpp:103 #, kde-format msgid "C (Optional):" msgstr "C(선택 사항):" -#: smalldialogs.cpp:119 -#, fuzzy, kde-format -#| msgid "Swap/Copy Names ..." +#: smalldialogs.cpp:126 +#, kde-format msgid "Swap/Copy Names..." msgstr "이름 전환/복사..." -#: smalldialogs.cpp:124 smalldialogs.cpp:125 smalldialogs.cpp:126 +#: smalldialogs.cpp:131 smalldialogs.cpp:132 smalldialogs.cpp:133 #, kde-format msgid "Swap %1<->%2" msgstr "%1<->%2 전환" -#: smalldialogs.cpp:127 smalldialogs.cpp:128 smalldialogs.cpp:129 +#: smalldialogs.cpp:134 smalldialogs.cpp:135 smalldialogs.cpp:136 #, kde-format msgid "Copy %1->Output" msgstr "%1->출력으로 복사" -#: smalldialogs.cpp:130 smalldialogs.cpp:131 smalldialogs.cpp:132 +#: smalldialogs.cpp:137 smalldialogs.cpp:138 smalldialogs.cpp:139 #, kde-format msgid "Swap %1<->Output" msgstr "%1<->출력 전환" -#: smalldialogs.cpp:138 +#: smalldialogs.cpp:148 #, kde-format msgid "Output (optional):" msgstr "출력(선택 사항):" -#: smalldialogs.cpp:168 +#: smalldialogs.cpp:178 #, kde-format msgid "Configure..." msgstr "설정..." -#: smalldialogs.cpp:233 -#, fuzzy, kde-format -#| msgid "Directory" +#: smalldialogs.cpp:243 +#, kde-format msgid "Open Directory" -msgstr "디렉터리" +msgstr "디렉터리 열기" -#: smalldialogs.cpp:234 +#: smalldialogs.cpp:244 #, kde-format msgid "Select Output File" -msgstr "" +msgstr "출력 파일 선택" -#: smalldialogs.cpp:393 +#: smalldialogs.cpp:403 #, kde-format msgid "Search text:" -msgstr "찾을 텍스트:" +msgstr "찾을 문자열:" -#: smalldialogs.cpp:400 +#: smalldialogs.cpp:410 #, kde-format msgid "Case sensitive" msgstr "대소문자 구분" -#: smalldialogs.cpp:403 +#: smalldialogs.cpp:413 #, kde-format msgid "Search A" msgstr "A 검색" -#: smalldialogs.cpp:408 +#: smalldialogs.cpp:418 #, kde-format msgid "Search B" msgstr "B 검색" -#: smalldialogs.cpp:413 +#: smalldialogs.cpp:423 #, kde-format msgid "Search C" msgstr "C 검색" -#: smalldialogs.cpp:418 +#: smalldialogs.cpp:428 #, kde-format msgid "Search output" msgstr "출력 검색" -#: smalldialogs.cpp:425 +#: smalldialogs.cpp:435 #, kde-format msgid "&Search" msgstr "찾기(&S)" -#: smalldialogs.cpp:444 +#: smalldialogs.cpp:454 #, kde-format msgid "Regular Expression Tester" msgstr "정규 표현식 시험 도구" -#: smalldialogs.cpp:457 +#: smalldialogs.cpp:467 #, kde-format msgid "Example auto merge line:" msgstr "자동으로 합칠 줄 예제:" -#: smalldialogs.cpp:459 +#: smalldialogs.cpp:469 #, kde-format msgid "To test auto merge, copy a line as used in your files." msgstr "자동 합치기를 사용하려면 파일에 있는 줄을 그대로 복사하십시오." -#: smalldialogs.cpp:465 smalldialogs.cpp:493 smalldialogs.cpp:529 +#: smalldialogs.cpp:475 smalldialogs.cpp:503 smalldialogs.cpp:539 #, kde-format msgid "Match result:" msgstr "일치 결과:" -#: smalldialogs.cpp:484 +#: smalldialogs.cpp:494 #, kde-format msgid "Example history start line (with leading comment):" msgstr "예제 기록 시작 줄(도입부 주석 포함):" -#: smalldialogs.cpp:486 +#: smalldialogs.cpp:496 #, kde-format msgid "" "Copy a history start line as used in your files,\n" "including the leading comment." msgstr "" -"도입부 주석을 포함하여\n" -"과거 기록 시작 줄을 파일에 있는 대로 복사하십시오." +"도입부 주석과 같이\n" +"과거 기록 시작 줄을 파일에 있는 대로 복사합니다." -#: smalldialogs.cpp:512 +#: smalldialogs.cpp:522 #, kde-format msgid "History sort key order:" msgstr "과거 기록 정렬 키 순서:" -#: smalldialogs.cpp:520 +#: smalldialogs.cpp:530 #, kde-format msgid "Example history entry start line (without leading comment):" msgstr "예제 기록 항목 시작 줄(도입부 주석 포함):" -#: smalldialogs.cpp:522 +#: smalldialogs.cpp:532 #, kde-format msgid "" "Copy a history entry start line as used in your files,\n" @@ -3414,48 +3367,47 @@ "도입부 주석을 제외하여\n" "과거 기록 항목 시작 줄을 파일에 있는 대로 복사하십시오." -#: smalldialogs.cpp:536 +#: smalldialogs.cpp:546 #, kde-format msgid "Sort key result:" msgstr "정렬 키 결과:" -#: smalldialogs.cpp:584 smalldialogs.cpp:594 smalldialogs.cpp:614 +#: smalldialogs.cpp:594 smalldialogs.cpp:604 smalldialogs.cpp:624 #, kde-format msgid "Match success." msgstr "일치 성공." -#: smalldialogs.cpp:588 smalldialogs.cpp:598 smalldialogs.cpp:620 +#: smalldialogs.cpp:598 smalldialogs.cpp:608 smalldialogs.cpp:630 #, kde-format msgid "Match failed." msgstr "일치 실패." -#: smalldialogs.cpp:605 +#: smalldialogs.cpp:615 #, kde-format msgid "Opening and closing parentheses do not match in regular expression." msgstr "정규 표현식의 열고 닫는 괄호가 일치하지 않습니다." -#: SourceData.cpp:150 +#: SourceData.cpp:153 #, kde-format msgid "Writing clipboard data to temp file failed." msgstr "클립보드 데이터를 임시 파일로 저장할 수 없습니다." -#: SourceData.cpp:154 +#: SourceData.cpp:157 #, kde-format msgid "From Clipboard" msgstr "클립보드에서" -#: SourceData.cpp:335 -#, fuzzy, kde-format -#| msgid "Mix of links and normal files." +#: SourceData.cpp:348 +#, kde-format msgid "%1 is not a normal file." -msgstr "링크와 일반 파일의 혼합입니다." +msgstr "%1은(는) 일반 파일이 아닙니다." -#: SourceData.cpp:427 +#: SourceData.cpp:440 #, kde-format msgid " Temp file is: %1" -msgstr "" +msgstr " 임시 파일: %1" -#: SourceData.cpp:432 +#: SourceData.cpp:445 #, kde-format msgid "" "Preprocessing possibly failed. Check this command:\n" @@ -3470,12 +3422,12 @@ "\n" "전처리 명령을 비활성화합니다." -#: SourceData.cpp:443 SourceData.cpp:512 +#: SourceData.cpp:456 SourceData.cpp:525 #, kde-format msgid "File %1 too large to process. Skipping." -msgstr "" +msgstr "%1 파일이 너무 커서 처리할 수 없습니다. 건너뜁니다." -#: SourceData.cpp:487 +#: SourceData.cpp:500 #, kde-format msgid "" "The line-matching-preprocessing possibly failed. Check this command:\n" @@ -3491,19 +3443,17 @@ "줄 일치 전처리 명령을 비활성화합니다." #: Utils.cpp:77 -#, fuzzy, kde-format -#| msgid "Expecting space after closing apostroph." +#, kde-format msgid "Expecting space after closing quote." -msgstr "닫는 따옴표 다음에 공백이 나올 것을 예상했습니다." +msgstr "닫는 따옴표 다음에 공백 문자가 필요합니다." #: Utils.cpp:80 #, kde-format msgid "Unmatched quote." -msgstr "" +msgstr "따옴표 짝이 맞지 않습니다." #: Utils.cpp:89 -#, fuzzy, kde-format -#| msgid "Unexpected apostroph within argument." +#, kde-format msgid "Unexpected quote character within argument." msgstr "인자 내에 예상하지 못한 따옴표가 있습니다." diff -Nru kdiff3-1.8.01/po/lt/kdiff3fileitemactionplugin.po kdiff3-1.8.3/po/lt/kdiff3fileitemactionplugin.po --- kdiff3-1.8.01/po/lt/kdiff3fileitemactionplugin.po 2019-05-18 01:02:10.000000000 +0000 +++ kdiff3-1.8.3/po/lt/kdiff3fileitemactionplugin.po 2020-06-25 00:18:33.000000000 +0000 @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: kdiff3fileitemactionplugin\n" -"Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2019-03-22 03:09+0100\n" +"Report-Msgid-Bugs-To: https://bugs.kde.org\n" +"POT-Creation-Date: 2019-08-30 07:40+0200\n" "PO-Revision-Date: 2011-08-02 05:07+0200\n" "Last-Translator: Automatically generated\n" "Language-Team: none\n" diff -Nru kdiff3-1.8.01/po/lt/kdiff3.po kdiff3-1.8.3/po/lt/kdiff3.po --- kdiff3-1.8.01/po/lt/kdiff3.po 2019-05-18 01:02:10.000000000 +0000 +++ kdiff3-1.8.3/po/lt/kdiff3.po 2020-06-25 00:18:33.000000000 +0000 @@ -4,8 +4,8 @@ msgid "" msgstr "" "Project-Id-Version: kdiff3\n" -"Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2019-04-18 08:02+0200\n" +"Report-Msgid-Bugs-To: https://bugs.kde.org\n" +"POT-Creation-Date: 2020-06-22 07:48+0200\n" "PO-Revision-Date: 2011-07-28 19:13+0300\n" "Last-Translator: Remigijus Jarmalavičius \n" "Language-Team: Lithuanian \n" @@ -27,336 +27,336 @@ msgid "Your emails" msgstr "andrius@stikonas.eu" -#: difftextwindow.cpp:412 +#: difftextwindow.cpp:414 #, kde-format msgid "File %1: Line %2" msgstr "" -#: difftextwindow.cpp:414 +#: difftextwindow.cpp:416 #, kde-format msgid "File %1: Line not available" msgstr "" -#: difftextwindow.cpp:1780 +#: difftextwindow.cpp:1778 #, kde-format msgid "Encoding:" msgstr "" -#: difftextwindow.cpp:1782 mergeresultwindow.cpp:3138 optiondialog.cpp:818 +#: difftextwindow.cpp:1781 mergeresultwindow.cpp:3166 optiondialog.cpp:840 #, kde-format msgid "Line end style:" msgstr "Eilutės pabaigos stilius:" -#: difftextwindow.cpp:1810 directorymergewindow.cpp:382 -#: directorymergewindow.cpp:433 directorymergewindow.cpp:524 -#: directorymergewindow.cpp:3058 directorymergewindow.cpp:3189 -#: directorymergewindow.cpp:3417 mergeresultwindow.cpp:942 -#: mergeresultwindow.cpp:944 mergeresultwindow.cpp:946 -#: mergeresultwindow.cpp:948 mergeresultwindow.cpp:1814 -#: mergeresultwindow.cpp:3170 mergeresultwindow.cpp:3177 optiondialog.cpp:962 -#: optiondialog.cpp:975 pdiff.cpp:833 pdiff.cpp:835 pdiff.cpp:837 pdiff.cpp:839 -#: pdiff.cpp:861 smalldialogs.cpp:124 smalldialogs.cpp:126 smalldialogs.cpp:127 -#: smalldialogs.cpp:130 +#: difftextwindow.cpp:1809 directorymergewindow.cpp:383 +#: directorymergewindow.cpp:434 directorymergewindow.cpp:525 +#: directorymergewindow.cpp:3072 directorymergewindow.cpp:3203 +#: directorymergewindow.cpp:3431 mergeresultwindow.cpp:970 +#: mergeresultwindow.cpp:972 mergeresultwindow.cpp:974 +#: mergeresultwindow.cpp:976 mergeresultwindow.cpp:1842 +#: mergeresultwindow.cpp:3198 mergeresultwindow.cpp:3205 optiondialog.cpp:1002 +#: optiondialog.cpp:1015 pdiff.cpp:823 pdiff.cpp:825 pdiff.cpp:827 +#: pdiff.cpp:829 pdiff.cpp:851 smalldialogs.cpp:131 smalldialogs.cpp:133 +#: smalldialogs.cpp:134 smalldialogs.cpp:137 #, kde-format msgid "A" msgstr "A" -#: difftextwindow.cpp:1810 directorymergewindow.cpp:384 -#: directorymergewindow.cpp:436 directorymergewindow.cpp:526 -#: directorymergewindow.cpp:3064 directorymergewindow.cpp:3190 -#: directorymergewindow.cpp:3418 mergeresultwindow.cpp:942 -#: mergeresultwindow.cpp:944 mergeresultwindow.cpp:950 -#: mergeresultwindow.cpp:952 mergeresultwindow.cpp:1816 -#: mergeresultwindow.cpp:3172 mergeresultwindow.cpp:3179 optiondialog.cpp:963 -#: optiondialog.cpp:976 pdiff.cpp:833 pdiff.cpp:835 pdiff.cpp:841 pdiff.cpp:843 -#: pdiff.cpp:863 smalldialogs.cpp:124 smalldialogs.cpp:125 smalldialogs.cpp:128 -#: smalldialogs.cpp:131 +#: difftextwindow.cpp:1809 directorymergewindow.cpp:385 +#: directorymergewindow.cpp:437 directorymergewindow.cpp:527 +#: directorymergewindow.cpp:3078 directorymergewindow.cpp:3204 +#: directorymergewindow.cpp:3432 mergeresultwindow.cpp:970 +#: mergeresultwindow.cpp:972 mergeresultwindow.cpp:978 +#: mergeresultwindow.cpp:980 mergeresultwindow.cpp:1844 +#: mergeresultwindow.cpp:3200 mergeresultwindow.cpp:3207 optiondialog.cpp:1003 +#: optiondialog.cpp:1016 pdiff.cpp:823 pdiff.cpp:825 pdiff.cpp:831 +#: pdiff.cpp:833 pdiff.cpp:853 smalldialogs.cpp:131 smalldialogs.cpp:132 +#: smalldialogs.cpp:135 smalldialogs.cpp:138 #, kde-format msgid "B" msgstr "B" -#: difftextwindow.cpp:1810 directorymergewindow.cpp:386 -#: directorymergewindow.cpp:439 directorymergewindow.cpp:528 -#: directorymergewindow.cpp:3070 directorymergewindow.cpp:3191 -#: directorymergewindow.cpp:3419 mergeresultwindow.cpp:946 -#: mergeresultwindow.cpp:948 mergeresultwindow.cpp:950 -#: mergeresultwindow.cpp:952 mergeresultwindow.cpp:1818 -#: mergeresultwindow.cpp:3174 mergeresultwindow.cpp:3181 optiondialog.cpp:977 -#: pdiff.cpp:837 pdiff.cpp:839 pdiff.cpp:841 pdiff.cpp:843 pdiff.cpp:865 -#: smalldialogs.cpp:125 smalldialogs.cpp:126 smalldialogs.cpp:129 -#: smalldialogs.cpp:132 +#: difftextwindow.cpp:1809 directorymergewindow.cpp:387 +#: directorymergewindow.cpp:440 directorymergewindow.cpp:529 +#: directorymergewindow.cpp:3084 directorymergewindow.cpp:3205 +#: directorymergewindow.cpp:3433 mergeresultwindow.cpp:974 +#: mergeresultwindow.cpp:976 mergeresultwindow.cpp:978 +#: mergeresultwindow.cpp:980 mergeresultwindow.cpp:1846 +#: mergeresultwindow.cpp:3202 mergeresultwindow.cpp:3209 optiondialog.cpp:1017 +#: pdiff.cpp:827 pdiff.cpp:829 pdiff.cpp:831 pdiff.cpp:833 pdiff.cpp:855 +#: smalldialogs.cpp:132 smalldialogs.cpp:133 smalldialogs.cpp:136 +#: smalldialogs.cpp:139 #, kde-format msgid "C" msgstr "C" -#: difftextwindow.cpp:1810 +#: difftextwindow.cpp:1809 #, kde-format msgid "A (Base)" msgstr "" -#: difftextwindow.cpp:1812 +#: difftextwindow.cpp:1811 #, kde-format msgid "Encoding: %1" msgstr "" -#: difftextwindow.cpp:1813 mergeresultwindow.cpp:3183 +#: difftextwindow.cpp:1812 mergeresultwindow.cpp:3211 #, kde-format msgid "Unix" msgstr "Unix" -#: difftextwindow.cpp:1813 mergeresultwindow.cpp:3184 +#: difftextwindow.cpp:1812 mergeresultwindow.cpp:3212 #, kde-format msgid "DOS" msgstr "DOS" -#: difftextwindow.cpp:1813 +#: difftextwindow.cpp:1812 #, fuzzy, kde-format #| msgid "Line end style:" msgid "Line end style: %1" msgstr "Eilutės pabaigos stilius:" -#: difftextwindow.cpp:1835 kdiff3.cpp:873 +#: difftextwindow.cpp:1834 kdiff3.cpp:874 #, kde-format msgid "Top line" msgstr "Viršutinė eilutė" -#: difftextwindow.cpp:1845 +#: difftextwindow.cpp:1843 #, kde-format msgid "End" msgstr "Pab" -#: difftextwindow.cpp:1903 smalldialogs.cpp:235 +#: difftextwindow.cpp:1901 smalldialogs.cpp:245 #, fuzzy, kde-format #| msgid "Opening files..." msgid "Open File" msgstr "Atveriami failai..." -#: difftextwindow.cpp:1951 optiondialog.cpp:387 +#: difftextwindow.cpp:1943 optiondialog.cpp:389 #, kde-format msgid "Unicode, 8 bit" msgstr "" -#: difftextwindow.cpp:1966 +#: difftextwindow.cpp:1958 #, kde-format msgid "Other" msgstr "" -#: directorymergewindow.cpp:409 directorymergewindow.cpp:3424 +#: directorymergewindow.cpp:410 directorymergewindow.cpp:3438 #, kde-format msgid "Copy A to B" msgstr "" -#: directorymergewindow.cpp:412 directorymergewindow.cpp:3425 +#: directorymergewindow.cpp:413 directorymergewindow.cpp:3439 #, kde-format msgid "Copy B to A" msgstr "" -#: directorymergewindow.cpp:415 directorymergewindow.cpp:3426 +#: directorymergewindow.cpp:416 directorymergewindow.cpp:3440 #, kde-format msgid "Delete A" msgstr "" -#: directorymergewindow.cpp:418 directorymergewindow.cpp:3427 +#: directorymergewindow.cpp:419 directorymergewindow.cpp:3441 #, kde-format msgid "Delete B" msgstr "" -#: directorymergewindow.cpp:421 +#: directorymergewindow.cpp:422 #, kde-format msgid "Delete A & B" msgstr "" -#: directorymergewindow.cpp:424 directorymergewindow.cpp:3429 +#: directorymergewindow.cpp:425 directorymergewindow.cpp:3443 #, kde-format msgid "Merge to A" msgstr "" -#: directorymergewindow.cpp:427 directorymergewindow.cpp:3430 +#: directorymergewindow.cpp:428 directorymergewindow.cpp:3444 #, kde-format msgid "Merge to B" msgstr "" -#: directorymergewindow.cpp:430 +#: directorymergewindow.cpp:431 #, kde-format msgid "Merge to A & B" msgstr "" -#: directorymergewindow.cpp:442 directorymergewindow.cpp:3421 +#: directorymergewindow.cpp:443 directorymergewindow.cpp:3435 #, kde-format msgid "Delete (if exists)" msgstr "" -#: directorymergewindow.cpp:445 directorymergewindow.cpp:448 -#: directorymergewindow.cpp:3420 optiondialog.cpp:925 smalldialogs.cpp:113 +#: directorymergewindow.cpp:446 directorymergewindow.cpp:449 +#: directorymergewindow.cpp:3434 smalldialogs.cpp:120 #, kde-format msgid "Merge" msgstr "Apjungti" -#: directorymergewindow.cpp:445 directorymergewindow.cpp:448 +#: directorymergewindow.cpp:446 directorymergewindow.cpp:449 #, kde-format msgid "Merge (manual)" msgstr "" -#: directorymergewindow.cpp:451 +#: directorymergewindow.cpp:452 #, kde-format msgid "Error: Conflicting File Types" msgstr "" -#: directorymergewindow.cpp:454 +#: directorymergewindow.cpp:455 #, kde-format msgid "Error: Changed and Deleted" msgstr "" -#: directorymergewindow.cpp:457 +#: directorymergewindow.cpp:458 #, kde-format msgid "Error: Dates are equal but files are not." msgstr "" -#: directorymergewindow.cpp:471 +#: directorymergewindow.cpp:472 #, fuzzy, kde-format #| msgid "Done." msgid "Done" msgstr "Baigta." -#: directorymergewindow.cpp:473 +#: directorymergewindow.cpp:474 #, kde-format msgid "Error" msgstr "Klaida" -#: directorymergewindow.cpp:475 +#: directorymergewindow.cpp:476 #, kde-format msgid "Skipped." msgstr "" -#: directorymergewindow.cpp:477 +#: directorymergewindow.cpp:478 #, kde-format msgid "Not saved." msgstr "" -#: directorymergewindow.cpp:479 +#: directorymergewindow.cpp:480 #, kde-format msgid "In progress..." msgstr "" -#: directorymergewindow.cpp:481 +#: directorymergewindow.cpp:482 #, kde-format msgid "To do." msgstr "" -#: directorymergewindow.cpp:522 +#: directorymergewindow.cpp:523 #, kde-format msgid "Name" msgstr "Pavadinimas" -#: directorymergewindow.cpp:530 +#: directorymergewindow.cpp:531 #, kde-format msgid "Operation" msgstr "Operacija" -#: directorymergewindow.cpp:532 +#: directorymergewindow.cpp:533 #, kde-format msgid "Status" msgstr "Būsena" -#: directorymergewindow.cpp:534 +#: directorymergewindow.cpp:535 #, kde-format msgid "Unsolved" msgstr "" -#: directorymergewindow.cpp:536 +#: directorymergewindow.cpp:537 #, kde-format msgid "Solved" msgstr "" -#: directorymergewindow.cpp:538 +#: directorymergewindow.cpp:539 #, kde-format msgid "Nonwhite" msgstr "" -#: directorymergewindow.cpp:540 +#: directorymergewindow.cpp:541 #, kde-format msgid "White" msgstr "" -#: directorymergewindow.cpp:674 +#: directorymergewindow.cpp:676 #, kde-format msgid "Unable to compare non-normal file with normal file." msgstr "" -#: directorymergewindow.cpp:688 +#: directorymergewindow.cpp:690 #, kde-format msgid "Mix of links and normal files." msgstr "" -#: directorymergewindow.cpp:695 +#: directorymergewindow.cpp:697 #, kde-format msgid "Link: " msgstr "" -#: directorymergewindow.cpp:704 +#: directorymergewindow.cpp:706 #, kde-format msgid "Size. " msgstr "Dydis. " -#: directorymergewindow.cpp:718 directorymergewindow.cpp:728 +#: directorymergewindow.cpp:720 directorymergewindow.cpp:730 #, kde-format msgid "Date & Size: " msgstr "" -#: directorymergewindow.cpp:748 +#: directorymergewindow.cpp:751 #, kde-format msgid "Comparing file..." msgstr "" -#: directorymergewindow.cpp:801 +#: directorymergewindow.cpp:813 #, kde-format msgid "" "You are currently doing a directory merge. Are you sure, you want to abort " "the merge and rescan the directory?" msgstr "" -#: directorymergewindow.cpp:802 kdiff3.cpp:698 kdiff3.cpp:708 kdiff3.cpp:720 -#: mergeresultwindow.cpp:372 pdiff.cpp:1033 pdiff.cpp:1910 pdiff.cpp:1920 +#: directorymergewindow.cpp:814 kdiff3.cpp:697 kdiff3.cpp:707 kdiff3.cpp:719 +#: mergeresultwindow.cpp:400 pdiff.cpp:1031 pdiff.cpp:1920 pdiff.cpp:1930 #, kde-format msgid "Warning" msgstr "Dėmesio" -#: directorymergewindow.cpp:803 directorymergewindow.cpp:3393 +#: directorymergewindow.cpp:815 directorymergewindow.cpp:3407 #, kde-format msgid "Rescan" msgstr "" -#: directorymergewindow.cpp:804 pdiff.cpp:1035 +#: directorymergewindow.cpp:816 pdiff.cpp:1033 #, kde-format msgid "Continue Merging" msgstr "" -#: directorymergewindow.cpp:971 +#: directorymergewindow.cpp:984 #, kde-format msgid "Opening of directories failed:" msgstr "" -#: directorymergewindow.cpp:975 +#: directorymergewindow.cpp:988 #, kde-format msgid "Dir A \"%1\" does not exist or is not a directory.\n" msgstr "" -#: directorymergewindow.cpp:980 +#: directorymergewindow.cpp:993 #, kde-format msgid "Dir B \"%1\" does not exist or is not a directory.\n" msgstr "" -#: directorymergewindow.cpp:985 +#: directorymergewindow.cpp:998 #, kde-format msgid "Dir C \"%1\" does not exist or is not a directory.\n" msgstr "" -#: directorymergewindow.cpp:988 +#: directorymergewindow.cpp:1001 #, kde-format msgid "Directory Open Error" msgstr "" -#: directorymergewindow.cpp:996 +#: directorymergewindow.cpp:1009 #, kde-format msgid "" "The destination directory must not be the same as A or B when three " @@ -364,44 +364,44 @@ "Check again before continuing." msgstr "" -#: directorymergewindow.cpp:998 +#: directorymergewindow.cpp:1011 #, kde-format msgid "Parameter Warning" msgstr "" -#: directorymergewindow.cpp:1003 +#: directorymergewindow.cpp:1016 #, kde-format msgid "Scanning directories..." msgstr "" -#: directorymergewindow.cpp:1029 +#: directorymergewindow.cpp:1042 #, kde-format msgid "Reading Directory A" msgstr "" -#: directorymergewindow.cpp:1038 +#: directorymergewindow.cpp:1051 #, kde-format msgid "Reading Directory B" msgstr "" -#: directorymergewindow.cpp:1048 +#: directorymergewindow.cpp:1061 #, kde-format msgid "Reading Directory C" msgstr "" -#: directorymergewindow.cpp:1064 +#: directorymergewindow.cpp:1077 #, kde-format msgid "Some subdirectories were not readable in" msgstr "" -#: directorymergewindow.cpp:1069 +#: directorymergewindow.cpp:1082 #, kde-format msgid "Check the permissions of the subdirectories." msgstr "" -#: directorymergewindow.cpp:1106 kdiff3.cpp:666 kdiff3.cpp:753 kdiff3.cpp:777 -#: kdiff3.cpp:1065 kdiff3.cpp:1086 pdiff.cpp:1116 pdiff.cpp:1170 pdiff.cpp:1218 -#: pdiff.cpp:1234 pdiff.cpp:1277 pdiff.cpp:1301 +#: directorymergewindow.cpp:1119 kdiff3.cpp:665 kdiff3.cpp:752 kdiff3.cpp:776 +#: kdiff3.cpp:1072 kdiff3.cpp:1093 pdiff.cpp:1115 pdiff.cpp:1178 pdiff.cpp:1228 +#: pdiff.cpp:1244 pdiff.cpp:1287 pdiff.cpp:1311 #, fuzzy, kde-format msgid "Ready." msgstr "" @@ -436,7 +436,7 @@ "#-#-#-#-# kopete.po (kopete) #-#-#-#-#\n" "Pasirengęs." -#: directorymergewindow.cpp:1121 +#: directorymergewindow.cpp:1134 #, kde-format msgid "" "Directory Comparison Status\n" @@ -446,66 +446,66 @@ "Number of different files: %3" msgstr "" -#: directorymergewindow.cpp:1128 +#: directorymergewindow.cpp:1141 #, kde-format msgid "Number of manual merges: %1" msgstr "" -#: directorymergewindow.cpp:1394 +#: directorymergewindow.cpp:1407 #, kde-format msgid "This affects all merge operations." msgstr "" -#: directorymergewindow.cpp:1395 +#: directorymergewindow.cpp:1408 #, kde-format msgid "Changing All Merge Operations" msgstr "" -#: directorymergewindow.cpp:1695 +#: directorymergewindow.cpp:1708 #, kde-format msgid "" "Processing %1 / %2\n" "%3" msgstr "" -#: directorymergewindow.cpp:1738 directorymergewindow.cpp:1742 +#: directorymergewindow.cpp:1751 directorymergewindow.cpp:1755 #, kde-format msgid "Some files could not be processed." msgstr "" -#: directorymergewindow.cpp:2222 directorymergewindow.cpp:2247 -#: directorymergewindow.cpp:2271 +#: directorymergewindow.cpp:2235 directorymergewindow.cpp:2260 +#: directorymergewindow.cpp:2285 #, kde-format msgid "This operation is currently not possible." msgstr "" -#: directorymergewindow.cpp:2222 directorymergewindow.cpp:2247 -#: directorymergewindow.cpp:2271 directorymergewindow.cpp:2552 +#: directorymergewindow.cpp:2235 directorymergewindow.cpp:2260 +#: directorymergewindow.cpp:2285 directorymergewindow.cpp:2565 #, kde-format msgid "Operation Not Possible" msgstr "" -#: directorymergewindow.cpp:2318 +#: directorymergewindow.cpp:2332 #, kde-format msgid "An error occurred while copying." msgstr "" -#: directorymergewindow.cpp:2319 directorymergewindow.cpp:2759 +#: directorymergewindow.cpp:2333 directorymergewindow.cpp:2772 #, kde-format msgid "Merge Error" msgstr "" -#: directorymergewindow.cpp:2396 +#: directorymergewindow.cpp:2410 #, kde-format msgid "Unknown merge operation. (This must never happen!)" msgstr "" -#: directorymergewindow.cpp:2441 +#: directorymergewindow.cpp:2455 #, kde-format msgid "Unknown merge operation." msgstr "" -#: directorymergewindow.cpp:2454 +#: directorymergewindow.cpp:2468 #, kde-format msgid "" "The merge is about to begin.\n" @@ -518,50 +518,50 @@ "whatsoever! Make backups of your vital data!" msgstr "" -#: directorymergewindow.cpp:2459 +#: directorymergewindow.cpp:2473 #, kde-format msgid "Starting Merge" msgstr "" -#: directorymergewindow.cpp:2460 +#: directorymergewindow.cpp:2474 #, kde-format msgid "Do It" msgstr "" -#: directorymergewindow.cpp:2461 +#: directorymergewindow.cpp:2475 #, kde-format msgid "Simulate It" msgstr "" -#: directorymergewindow.cpp:2487 +#: directorymergewindow.cpp:2501 #, kde-format msgid "" "The highlighted item has a different type in the different directories. " "Select what to do." msgstr "" -#: directorymergewindow.cpp:2491 +#: directorymergewindow.cpp:2505 #, kde-format msgid "" "The modification dates of the file are equal but the files are not. Select " "what to do." msgstr "" -#: directorymergewindow.cpp:2495 +#: directorymergewindow.cpp:2509 #, kde-format msgid "" "The highlighted item was changed in one directory and deleted in the other. " "Select what to do." msgstr "" -#: directorymergewindow.cpp:2552 +#: directorymergewindow.cpp:2565 #, kde-format msgid "" "This operation is currently not possible because directory merge is " "currently running." msgstr "" -#: directorymergewindow.cpp:2609 +#: directorymergewindow.cpp:2622 #, kde-format msgid "" "There was an error in the last step.\n" @@ -569,516 +569,521 @@ "to skip this item?" msgstr "" -#: directorymergewindow.cpp:2611 +#: directorymergewindow.cpp:2624 #, kde-format msgid "Continue merge after an error" msgstr "" -#: directorymergewindow.cpp:2612 +#: directorymergewindow.cpp:2625 #, kde-format msgid "Continue With Last Item" msgstr "" -#: directorymergewindow.cpp:2613 +#: directorymergewindow.cpp:2626 #, kde-format msgid "Skip Item" msgstr "" -#: directorymergewindow.cpp:2709 +#: directorymergewindow.cpp:2722 #, kde-format msgid "Merge operation complete." msgstr "" -#: directorymergewindow.cpp:2709 directorymergewindow.cpp:2712 +#: directorymergewindow.cpp:2722 directorymergewindow.cpp:2725 #, kde-format msgid "Merge Complete" msgstr "" -#: directorymergewindow.cpp:2722 +#: directorymergewindow.cpp:2735 #, kde-format msgid "" "Simulated merge complete: Check if you agree with the proposed operations." msgstr "" -#: directorymergewindow.cpp:2758 +#: directorymergewindow.cpp:2771 #, kde-format msgid "An error occurred. Press OK to see detailed information." msgstr "" -#: directorymergewindow.cpp:2791 +#: directorymergewindow.cpp:2804 #, kde-format msgid "Error: While deleting %1: Creating backup failed." msgstr "" -#: directorymergewindow.cpp:2798 +#: directorymergewindow.cpp:2811 #, kde-format msgid "delete directory recursively( %1 )" msgstr "" -#: directorymergewindow.cpp:2800 +#: directorymergewindow.cpp:2813 #, kde-format msgid "delete( %1 )" msgstr "" -#: directorymergewindow.cpp:2815 +#: directorymergewindow.cpp:2828 #, kde-format msgid "Error: delete dir operation failed while trying to read the directory." msgstr "" -#: directorymergewindow.cpp:2834 +#: directorymergewindow.cpp:2847 #, kde-format msgid "Error: rmdir( %1 ) operation failed." msgstr "" -#: directorymergewindow.cpp:2844 +#: directorymergewindow.cpp:2857 #, kde-format msgid "Error: delete operation failed." msgstr "" -#: directorymergewindow.cpp:2870 +#: directorymergewindow.cpp:2884 #, kde-format msgid "manual merge( %1, %2, %3 -> %4)" msgstr "" -#: directorymergewindow.cpp:2873 +#: directorymergewindow.cpp:2887 #, kde-format msgid "" " Note: After a manual merge the user should continue by pressing F7." msgstr "" -#: directorymergewindow.cpp:2900 +#: directorymergewindow.cpp:2914 #, kde-format msgid "Error: copy( %1 -> %2 ) failed.Deleting existing destination failed." msgstr "" -#: directorymergewindow.cpp:2909 +#: directorymergewindow.cpp:2923 #, kde-format msgid "copyLink( %1 -> %2 )" msgstr "" -#: directorymergewindow.cpp:2918 +#: directorymergewindow.cpp:2932 #, kde-format msgid "Error: copyLink failed: Remote links are not yet supported." msgstr "" -#: directorymergewindow.cpp:2928 +#: directorymergewindow.cpp:2942 #, kde-format msgid "Error: copyLink failed." msgstr "" -#: directorymergewindow.cpp:2953 +#: directorymergewindow.cpp:2967 #, kde-format msgid "copy( %1 -> %2 )" msgstr "" -#: directorymergewindow.cpp:2979 +#: directorymergewindow.cpp:2993 #, kde-format msgid "Error during rename( %1 -> %2 ): Cannot delete existing destination." msgstr "" -#: directorymergewindow.cpp:2986 +#: directorymergewindow.cpp:3000 #, kde-format msgid "rename( %1 -> %2 )" msgstr "" -#: directorymergewindow.cpp:2995 +#: directorymergewindow.cpp:3009 #, kde-format msgid "Error: Rename failed." msgstr "" -#: directorymergewindow.cpp:3013 +#: directorymergewindow.cpp:3027 #, kde-format msgid "Error during makeDir of %1. Cannot delete existing file." msgstr "" -#: directorymergewindow.cpp:3030 +#: directorymergewindow.cpp:3044 #, kde-format msgid "makeDir( %1 )" msgstr "" -#: directorymergewindow.cpp:3040 +#: directorymergewindow.cpp:3054 #, kde-format msgid "Error while creating directory." msgstr "" -#: directorymergewindow.cpp:3076 directorymergewindow.cpp:3195 +#: directorymergewindow.cpp:3090 directorymergewindow.cpp:3209 #, kde-format msgid "Dest" msgstr "" -#: directorymergewindow.cpp:3084 directorymergewindow.cpp:3113 +#: directorymergewindow.cpp:3098 directorymergewindow.cpp:3127 #, kde-format msgid "Dir" msgstr "" -#: directorymergewindow.cpp:3084 +#: directorymergewindow.cpp:3098 #, kde-format msgid "Type" msgstr "Tipas" -#: directorymergewindow.cpp:3084 +#: directorymergewindow.cpp:3098 #, kde-format msgid "Size" msgstr "Dydis" -#: directorymergewindow.cpp:3085 +#: directorymergewindow.cpp:3099 #, kde-format msgid "Attr" msgstr "" -#: directorymergewindow.cpp:3085 +#: directorymergewindow.cpp:3099 #, kde-format msgid "Last Modification" msgstr "" -#: directorymergewindow.cpp:3085 +#: directorymergewindow.cpp:3099 #, kde-format msgid "Link-Destination" msgstr "" -#: directorymergewindow.cpp:3113 +#: directorymergewindow.cpp:3127 #, kde-format msgid "File" msgstr "Failas" -#: directorymergewindow.cpp:3113 +#: directorymergewindow.cpp:3127 #, kde-format msgid "-Link" msgstr "" -#: directorymergewindow.cpp:3119 +#: directorymergewindow.cpp:3133 #, kde-format msgid "not available" msgstr "" -#: directorymergewindow.cpp:3137 +#: directorymergewindow.cpp:3151 #, kde-format msgid "A (Dest): " msgstr "" -#: directorymergewindow.cpp:3141 +#: directorymergewindow.cpp:3155 #, kde-format msgid "A: " msgstr "" -#: directorymergewindow.cpp:3141 +#: directorymergewindow.cpp:3155 #, kde-format msgid "A (Base): " msgstr "" -#: directorymergewindow.cpp:3147 +#: directorymergewindow.cpp:3161 #, kde-format msgid "B (Dest): " msgstr "" -#: directorymergewindow.cpp:3151 +#: directorymergewindow.cpp:3165 #, kde-format msgid "B: " msgstr "" -#: directorymergewindow.cpp:3156 +#: directorymergewindow.cpp:3170 #, kde-format msgid "C (Dest): " msgstr "" -#: directorymergewindow.cpp:3160 +#: directorymergewindow.cpp:3174 #, kde-format msgid "C: " msgstr "" -#: directorymergewindow.cpp:3163 +#: directorymergewindow.cpp:3177 #, kde-format msgid "Dest: " msgstr "" #. i18n("Saving Directory Merge State ...")); -#: directorymergewindow.cpp:3238 +#: directorymergewindow.cpp:3252 #, kde-format msgid "Save Directory Merge State As..." msgstr "" -#: directorymergewindow.cpp:3387 +#: directorymergewindow.cpp:3401 #, kde-format msgid "Start/Continue Directory Merge" msgstr "" -#: directorymergewindow.cpp:3388 +#: directorymergewindow.cpp:3402 #, kde-format msgid "Run Operation for Current Item" msgstr "" -#: directorymergewindow.cpp:3389 +#: directorymergewindow.cpp:3403 #, kde-format msgid "Compare Selected File" msgstr "" -#: directorymergewindow.cpp:3390 +#: directorymergewindow.cpp:3404 #, kde-format msgid "Merge Current File" msgstr "" -#: directorymergewindow.cpp:3390 +#: directorymergewindow.cpp:3404 #, kde-format msgid "" "Merge\n" "File" msgstr "" -#: directorymergewindow.cpp:3391 +#: directorymergewindow.cpp:3405 #, kde-format msgid "Fold All Subdirs" msgstr "" -#: directorymergewindow.cpp:3392 +#: directorymergewindow.cpp:3406 #, kde-format msgid "Unfold All Subdirs" msgstr "" #. i18n("Save Directory Merge State ..."), 0, this, &DirectoryMergeWindow::slotSaveMergeState, ac, "dir_save_merge_state"); #. i18n("Load Directory Merge State ..."), 0, this, &DirectoryMergeWindow::slotLoadMergeState, ac, "dir_load_merge_state"); -#: directorymergewindow.cpp:3396 +#: directorymergewindow.cpp:3410 #, kde-format msgid "Choose A for All Items" msgstr "" -#: directorymergewindow.cpp:3397 +#: directorymergewindow.cpp:3411 #, kde-format msgid "Choose B for All Items" msgstr "" -#: directorymergewindow.cpp:3398 +#: directorymergewindow.cpp:3412 #, kde-format msgid "Choose C for All Items" msgstr "" -#: directorymergewindow.cpp:3399 +#: directorymergewindow.cpp:3413 #, kde-format msgid "Auto-Choose Operation for All Items" msgstr "" -#: directorymergewindow.cpp:3400 +#: directorymergewindow.cpp:3414 #, kde-format msgid "No Operation for All Items" msgstr "" #. i18n("Synchronize Directories"), 0, this, &DirectoryMergeWindow::slotSynchronizeDirectories, ac, "dir_synchronize_directories"); #. d->m_pDirChooseNewerFiles = GuiUtils::createAction< KToggleAction >(i18n("Copy Newer Files Instead of Merging"), 0, this, &DirectoryMergeWindow::slotChooseNewerFiles, ac, "dir_choose_newer_files"); -#: directorymergewindow.cpp:3405 +#: directorymergewindow.cpp:3419 #, kde-format msgid "Show Identical Files" msgstr "" -#: directorymergewindow.cpp:3405 +#: directorymergewindow.cpp:3419 #, kde-format msgid "" "Identical\n" "Files" msgstr "" -#: directorymergewindow.cpp:3406 +#: directorymergewindow.cpp:3420 #, kde-format msgid "Show Different Files" msgstr "" -#: directorymergewindow.cpp:3407 +#: directorymergewindow.cpp:3421 #, kde-format msgid "Show Files only in A" msgstr "" -#: directorymergewindow.cpp:3407 +#: directorymergewindow.cpp:3421 #, kde-format msgid "" "Files\n" "only in A" msgstr "" -#: directorymergewindow.cpp:3408 +#: directorymergewindow.cpp:3422 #, kde-format msgid "Show Files only in B" msgstr "" -#: directorymergewindow.cpp:3408 +#: directorymergewindow.cpp:3422 #, kde-format msgid "" "Files\n" "only in B" msgstr "" -#: directorymergewindow.cpp:3409 +#: directorymergewindow.cpp:3423 #, kde-format msgid "Show Files only in C" msgstr "" -#: directorymergewindow.cpp:3409 +#: directorymergewindow.cpp:3423 #, kde-format msgid "" "Files\n" "only in C" msgstr "" -#: directorymergewindow.cpp:3413 +#: directorymergewindow.cpp:3427 #, kde-format msgid "Compare Explicitly Selected Files" msgstr "" -#: directorymergewindow.cpp:3414 +#: directorymergewindow.cpp:3428 #, kde-format msgid "Merge Explicitly Selected Files" msgstr "" -#: directorymergewindow.cpp:3416 directorymergewindow.cpp:3423 +#: directorymergewindow.cpp:3430 directorymergewindow.cpp:3437 #, kde-format msgid "Do Nothing" msgstr "Nieko nedaryti" -#: directorymergewindow.cpp:3428 +#: directorymergewindow.cpp:3442 #, kde-format msgid "Delete A && B" msgstr "Trinti A ir B" -#: directorymergewindow.cpp:3431 +#: directorymergewindow.cpp:3445 #, kde-format msgid "Merge to A && B" msgstr "" -#: fileaccess.cpp:462 SourceData.cpp:493 +#: fileaccess.cpp:301 +#, kde-format +msgid "Unable to determine full url. No parent specified." +msgstr "" + +#: fileaccess.cpp:482 SourceData.cpp:506 #, fuzzy, kde-format #| msgid "Reading file: %1" msgid "Failed to read file: %1" msgstr "Skaitomas failas: %1" -#: fileaccess.cpp:587 +#: fileaccess.cpp:624 #, kde-format msgid "Creating temp copy of %1 failed." msgstr "" -#: fileaccess.cpp:595 fileaccess.cpp:600 +#: fileaccess.cpp:632 fileaccess.cpp:637 #, fuzzy, kde-format #| msgid "Opening files..." msgid "Opening %1 failed. %2" msgstr "Atveriami failai..." -#: fileaccess.cpp:619 fileaccess.cpp:627 +#: fileaccess.cpp:656 fileaccess.cpp:664 #, kde-format msgid "Error reading from %1. %2" msgstr "" -#: fileaccess.cpp:751 +#: fileaccess.cpp:788 #, kde-format msgid "" "While trying to make a backup, deleting an older backup failed.\n" "Filename: %1" msgstr "" -#: fileaccess.cpp:758 +#: fileaccess.cpp:795 #, kde-format msgid "" "While trying to make a backup, renaming failed.\n" "Filenames: %1 -> %2" msgstr "" -#: fileaccess.cpp:828 +#: fileaccess.cpp:865 #, kde-format msgid "Getting file status: %1" msgstr "" -#: fileaccess.cpp:869 +#: fileaccess.cpp:906 #, kde-format msgid "Reading file: %1" msgstr "Skaitomas failas: %1" -#: fileaccess.cpp:907 +#: fileaccess.cpp:944 #, kde-format msgid "Writing file: %1" msgstr "Rašomas failas: %1" -#: fileaccess.cpp:940 +#: fileaccess.cpp:977 #, kde-format msgid "Out of memory" msgstr "Nepakanka atminties" -#: fileaccess.cpp:976 +#: fileaccess.cpp:1013 #, kde-format msgid "Making directory: %1" msgstr "Kuriamas aplankas: %1" -#: fileaccess.cpp:997 +#: fileaccess.cpp:1034 #, kde-format msgid "Removing directory: %1" msgstr "Šalinamas aplankas: %1" -#: fileaccess.cpp:1012 +#: fileaccess.cpp:1049 #, kde-format msgid "Removing file: %1" msgstr "Šalinamas failas: %1" -#: fileaccess.cpp:1028 +#: fileaccess.cpp:1065 #, kde-format msgid "Creating symbolic link: %1 -> %2" msgstr "Kuriama simbolinė nuoroda: %1 -> %2" -#: fileaccess.cpp:1052 +#: fileaccess.cpp:1089 #, kde-format msgid "Renaming file: %1 -> %2" msgstr "Pervadinamas failas: %1 -> %2" -#: fileaccess.cpp:1086 +#: fileaccess.cpp:1123 #, kde-format msgid "Copying file: %1 -> %2" msgstr "Kopijuojamas failas: %1 -> %2" -#: fileaccess.cpp:1108 +#: fileaccess.cpp:1145 #, fuzzy, kde-format #| msgid "Reading directory: " msgid "Reading directory: %1" msgstr "Skaitomas aplankas:" -#: fileaccess.cpp:1162 +#: fileaccess.cpp:1202 #, kde-format msgid "Listing directory: %1" msgstr "" -#: kdiff3.cpp:181 +#: kdiff3.cpp:182 #, kde-format msgid "Current Configuration:" msgstr "Dabartinė konfigūracija:" -#: kdiff3.cpp:186 +#: kdiff3.cpp:187 #, kde-format msgid "Config Option Error:" msgstr "" -#: kdiff3.cpp:240 +#: kdiff3.cpp:246 #, kde-format msgid "Option --auto used, but no output file specified." msgstr "" -#: kdiff3.cpp:416 +#: kdiff3.cpp:405 #, kde-format msgid "Option --auto ignored for directory comparison." msgstr "" -#: kdiff3.cpp:460 +#: kdiff3.cpp:449 #, kde-format msgid "Saving failed." msgstr "Išsaugojimas nepavyko." -#: kdiff3.cpp:496 pdiff.cpp:1098 +#: kdiff3.cpp:494 pdiff.cpp:1096 #, kde-format msgid "Opening of these files failed:" msgstr "" -#: kdiff3.cpp:505 +#: kdiff3.cpp:503 pdiff.cpp:1105 #, kde-format -msgid "File Open Error" -msgstr "Failo atvėrimo klaida" +msgid "File open error" +msgstr "Klaida atveriant bylą" -#: kdiff3.cpp:533 +#: kdiff3.cpp:532 #, kde-format msgid "Opens documents for comparison..." msgstr "" -#: kdiff3.cpp:535 +#: kdiff3.cpp:534 #, fuzzy, kde-format msgid "Reload" msgstr "" @@ -1113,22 +1118,22 @@ "#-#-#-#-# kopete.po (kopete) #-#-#-#-#\n" "Pasirengęs." -#: kdiff3.cpp:538 +#: kdiff3.cpp:537 #, kde-format msgid "Saves the merge result. All conflicts must be solved!" msgstr "" -#: kdiff3.cpp:540 +#: kdiff3.cpp:539 #, kde-format msgid "Saves the current document as..." msgstr "" -#: kdiff3.cpp:543 +#: kdiff3.cpp:542 #, kde-format msgid "Print the differences" msgstr "" -#: kdiff3.cpp:546 +#: kdiff3.cpp:545 #, fuzzy, kde-format msgid "Quits the application" msgstr "" @@ -1145,125 +1150,125 @@ "#-#-#-#-# umbrello.po (umbrello) #-#-#-#-#\n" "Baigs programos darbą" -#: kdiff3.cpp:549 +#: kdiff3.cpp:548 #, kde-format msgid "Cuts the selected section and puts it to the clipboard" msgstr "Iškirps pažymėtą sritį ir padės į talpyklą" -#: kdiff3.cpp:552 +#: kdiff3.cpp:551 #, kde-format msgid "Copies the selected section to the clipboard" msgstr "Nukopijuos pažymėtą sritį į talpyklą" -#: kdiff3.cpp:554 +#: kdiff3.cpp:553 #, fuzzy, kde-format #| msgid "Pastes the clipboard contents to actual position" msgid "Pastes the clipboard contents to current position" msgstr "Padės talpyklės turinį dabartinėje pozicijoje" -#: kdiff3.cpp:557 +#: kdiff3.cpp:556 #, kde-format msgid "Select everything in current window" msgstr "" -#: kdiff3.cpp:560 +#: kdiff3.cpp:559 #, kde-format msgid "Search for a string" msgstr "" -#: kdiff3.cpp:562 +#: kdiff3.cpp:561 #, kde-format msgid "Search again for the string" msgstr "" -#: kdiff3.cpp:567 +#: kdiff3.cpp:566 #, kde-format msgid "Enables/disables the statusbar" msgstr "Įjungs arba išjungs būsenos juostą" -#: kdiff3.cpp:571 +#: kdiff3.cpp:570 #, kde-format msgid "Configure KDiff3..." msgstr "Konfigūruoti KDiff3..." -#: kdiff3.cpp:590 +#: kdiff3.cpp:589 #, kde-format msgid "Go to Current Delta" msgstr "" -#: kdiff3.cpp:590 +#: kdiff3.cpp:589 #, kde-format msgid "" "Current\n" "Delta" msgstr "" -#: kdiff3.cpp:592 +#: kdiff3.cpp:591 #, kde-format msgid "Go to First Delta" msgstr "" -#: kdiff3.cpp:592 +#: kdiff3.cpp:591 #, kde-format msgid "" "First\n" "Delta" msgstr "" -#: kdiff3.cpp:594 +#: kdiff3.cpp:593 #, kde-format msgid "Go to Last Delta" msgstr "" -#: kdiff3.cpp:594 +#: kdiff3.cpp:593 #, kde-format msgid "" "Last\n" "Delta" msgstr "" -#: kdiff3.cpp:596 +#: kdiff3.cpp:595 #, kde-format msgid "(Skips white space differences when \"Show White Space\" is disabled.)" msgstr "" -#: kdiff3.cpp:597 +#: kdiff3.cpp:596 #, kde-format msgid "" "(Does not skip white space differences even when \"Show White Space\" is " "disabled.)" msgstr "" -#: kdiff3.cpp:598 +#: kdiff3.cpp:597 #, kde-format msgid "Go to Previous Delta" msgstr "" -#: kdiff3.cpp:598 +#: kdiff3.cpp:597 #, kde-format msgid "" "Prev\n" "Delta" msgstr "" -#: kdiff3.cpp:600 +#: kdiff3.cpp:599 #, kde-format msgid "Go to Next Delta" msgstr "" -#: kdiff3.cpp:600 +#: kdiff3.cpp:599 #, kde-format msgid "" "Next\n" "Delta" msgstr "" -#: kdiff3.cpp:602 +#: kdiff3.cpp:601 #, kde-format msgid "Go to Previous Conflict" msgstr "Eiti į ankstesnį konfliktą" -#: kdiff3.cpp:602 +#: kdiff3.cpp:601 #, kde-format msgid "" "Prev\n" @@ -1272,12 +1277,12 @@ "Ankstesnis\n" "konfliktas" -#: kdiff3.cpp:604 +#: kdiff3.cpp:603 #, kde-format msgid "Go to Next Conflict" msgstr "Eiti į kitą konfliktą" -#: kdiff3.cpp:604 +#: kdiff3.cpp:603 #, kde-format msgid "" "Next\n" @@ -1286,36 +1291,36 @@ "Kitas\n" "konfliktas" -#: kdiff3.cpp:606 +#: kdiff3.cpp:605 #, kde-format msgid "Go to Previous Unsolved Conflict" msgstr "" -#: kdiff3.cpp:606 +#: kdiff3.cpp:605 #, kde-format msgid "" "Prev\n" "Unsolved" msgstr "" -#: kdiff3.cpp:608 +#: kdiff3.cpp:607 #, kde-format msgid "Go to Next Unsolved Conflict" msgstr "" -#: kdiff3.cpp:608 +#: kdiff3.cpp:607 #, kde-format msgid "" "Next\n" "Unsolved" msgstr "" -#: kdiff3.cpp:610 +#: kdiff3.cpp:609 #, kde-format msgid "Select Line(s) From A" msgstr "" -#: kdiff3.cpp:610 +#: kdiff3.cpp:609 #, kde-format msgid "" "Choose\n" @@ -1324,12 +1329,12 @@ "Pasirinkti\n" "A" -#: kdiff3.cpp:611 +#: kdiff3.cpp:610 #, kde-format msgid "Select Line(s) From B" msgstr "" -#: kdiff3.cpp:611 +#: kdiff3.cpp:610 #, kde-format msgid "" "Choose\n" @@ -1338,12 +1343,12 @@ "Pasirinkti\n" "B" -#: kdiff3.cpp:612 +#: kdiff3.cpp:611 #, kde-format msgid "Select Line(s) From C" msgstr "" -#: kdiff3.cpp:612 +#: kdiff3.cpp:611 #, kde-format msgid "" "Choose\n" @@ -1352,243 +1357,243 @@ "Pasirinkti\n" "C" -#: kdiff3.cpp:613 +#: kdiff3.cpp:612 #, kde-format msgid "Automatically Go to Next Unsolved Conflict After Source Selection" msgstr "" -#: kdiff3.cpp:613 +#: kdiff3.cpp:612 #, fuzzy, kde-format msgid "" "Auto\n" "Next" msgstr "Iškerpamas žymėjimas..." -#: kdiff3.cpp:615 +#: kdiff3.cpp:614 #, kde-format msgid "Show Space && Tabulator Characters" msgstr "" -#: kdiff3.cpp:615 +#: kdiff3.cpp:614 #, kde-format msgid "" "White\n" "Characters" msgstr "" -#: kdiff3.cpp:616 +#: kdiff3.cpp:615 #, kde-format msgid "Show White Space" msgstr "" -#: kdiff3.cpp:616 +#: kdiff3.cpp:615 #, kde-format msgid "" "White\n" "Deltas" msgstr "" -#: kdiff3.cpp:618 +#: kdiff3.cpp:617 #, kde-format msgid "Show Line Numbers" msgstr "" -#: kdiff3.cpp:618 +#: kdiff3.cpp:617 #, kde-format msgid "" "Line\n" "Numbers" msgstr "" -#: kdiff3.cpp:620 +#: kdiff3.cpp:619 #, kde-format msgid "Automatically Solve Simple Conflicts" msgstr "" -#: kdiff3.cpp:621 +#: kdiff3.cpp:620 #, kde-format msgid "Set Deltas to Conflicts" msgstr "" -#: kdiff3.cpp:622 +#: kdiff3.cpp:621 #, kde-format msgid "Run Regular Expression Auto Merge" msgstr "" -#: kdiff3.cpp:623 +#: kdiff3.cpp:622 #, kde-format msgid "Automatically Solve History Conflicts" msgstr "" -#: kdiff3.cpp:624 +#: kdiff3.cpp:623 #, kde-format msgid "Split Diff At Selection" msgstr "" -#: kdiff3.cpp:625 +#: kdiff3.cpp:624 #, kde-format msgid "Join Selected Diffs" msgstr "" -#: kdiff3.cpp:627 +#: kdiff3.cpp:626 #, kde-format msgid "Show Window A" msgstr "" -#: kdiff3.cpp:628 +#: kdiff3.cpp:627 #, kde-format msgid "Show Window B" msgstr "" -#: kdiff3.cpp:629 +#: kdiff3.cpp:628 #, kde-format msgid "Show Window C" msgstr "" -#: kdiff3.cpp:631 +#: kdiff3.cpp:630 #, kde-format msgid "Normal Overview" msgstr "" -#: kdiff3.cpp:632 +#: kdiff3.cpp:631 #, kde-format msgid "A vs. B Overview" msgstr "" -#: kdiff3.cpp:633 +#: kdiff3.cpp:632 #, kde-format msgid "A vs. C Overview" msgstr "" -#: kdiff3.cpp:634 +#: kdiff3.cpp:633 #, kde-format msgid "B vs. C Overview" msgstr "" -#: kdiff3.cpp:635 +#: kdiff3.cpp:634 #, kde-format msgid "Word Wrap Diff Windows" msgstr "" -#: kdiff3.cpp:636 +#: kdiff3.cpp:635 #, kde-format msgid "Add Manual Diff Alignment" msgstr "" -#: kdiff3.cpp:637 +#: kdiff3.cpp:636 #, kde-format msgid "Clear All Manual Diff Alignments" msgstr "" -#: kdiff3.cpp:639 +#: kdiff3.cpp:638 #, kde-format msgid "Focus Next Window" msgstr "" -#: kdiff3.cpp:640 +#: kdiff3.cpp:639 #, kde-format msgid "Focus Prev Window" msgstr "" -#: kdiff3.cpp:641 +#: kdiff3.cpp:640 #, kde-format msgid "Toggle Split Orientation" msgstr "" -#: kdiff3.cpp:643 +#: kdiff3.cpp:642 #, kde-format msgid "Dir && Text Split Screen View" msgstr "" -#: kdiff3.cpp:645 +#: kdiff3.cpp:644 #, kde-format msgid "Toggle Between Dir && Text View" msgstr "" -#: kdiff3.cpp:697 pdiff.cpp:1909 +#: kdiff3.cpp:696 pdiff.cpp:1919 #, kde-format msgid "The merge result has not been saved." msgstr "" -#: kdiff3.cpp:699 +#: kdiff3.cpp:698 #, kde-format msgid "Save && Quit" msgstr "" -#: kdiff3.cpp:700 +#: kdiff3.cpp:699 #, kde-format msgid "Quit Without Saving" msgstr "" -#: kdiff3.cpp:708 pdiff.cpp:1920 +#: kdiff3.cpp:707 pdiff.cpp:1930 #, kde-format msgid "Saving the merge result failed." msgstr "" -#: kdiff3.cpp:719 pdiff.cpp:1032 +#: kdiff3.cpp:718 pdiff.cpp:1030 #, kde-format msgid "" "You are currently doing a directory merge. Are you sure, you want to abort?" msgstr "" -#: kdiff3.cpp:742 +#: kdiff3.cpp:741 #, kde-format msgid "Saving file..." msgstr "Išsaugomas failas..." -#: kdiff3.cpp:759 +#: kdiff3.cpp:758 #, kde-format msgid "Saving file with a new filename..." msgstr "Failas įrašomas nauju pavadinimu..." -#: kdiff3.cpp:761 +#: kdiff3.cpp:760 #, kde-format msgid "Save As..." msgstr "Įrašyti kaip..." -#: kdiff3.cpp:820 +#: kdiff3.cpp:819 #, fuzzy, kde-format #| msgid "Printing completed." msgid "Printing not implemented." msgstr "Spausdinimas baigtas." -#: kdiff3.cpp:857 +#: kdiff3.cpp:858 #, kde-format msgid "Printing..." msgstr "Spausdinama..." -#: kdiff3.cpp:943 +#: kdiff3.cpp:948 #, kde-format msgid "Printing page %1 of %2" msgstr "" -#: kdiff3.cpp:1000 +#: kdiff3.cpp:1006 #, fuzzy, kde-format #| msgid "Selection" msgid " (Selection)" msgstr "Pažymėjimas" -#: kdiff3.cpp:1027 +#: kdiff3.cpp:1034 #, kde-format msgid "Printing completed." msgstr "Spausdinimas baigtas." -#: kdiff3.cpp:1031 +#: kdiff3.cpp:1038 #, kde-format msgid "Printing aborted." msgstr "Spausdinimas nutrauktas." -#: kdiff3.cpp:1038 +#: kdiff3.cpp:1045 #, kde-format msgid "Exiting..." msgstr "Išeinama..." -#: kdiff3.cpp:1049 +#: kdiff3.cpp:1056 #, kde-format msgid "Toggling toolbar..." msgstr "" -#: kdiff3.cpp:1070 +#: kdiff3.cpp:1077 #, kde-format msgid "Toggle the statusbar..." msgstr "Perjungti būsenos juostą..." @@ -1614,7 +1619,7 @@ msgid "Joachim Eibl" msgstr "Joachim Eibl" -#: kdiff3_part.cpp:173 kdiff3_part.cpp:254 +#: kdiff3_part.cpp:174 kdiff3_part.cpp:255 #, kde-format msgid "Could not find files for comparison." msgstr "" @@ -1632,7 +1637,7 @@ msgstr "Konfigūruoti KDiff3" #. i18n: ectx: ToolBar (mainToolBar) -#: kdiff3_part.rc:16 main.cpp:88 +#: kdiff3_part.rc:16 main.cpp:89 #, kde-format msgid "KDiff3" msgstr "KDiff3" @@ -1700,198 +1705,204 @@ msgid "Main Toolbar" msgstr "Pagrindinė įrankinė" -#: main.cpp:68 main.cpp:72 +#: main.cpp:69 main.cpp:73 #, kde-format msgid "Ignored. (User defined.)" msgstr "" -#: main.cpp:92 +#: main.cpp:93 #, kde-format msgid " (64 bit)" msgstr "" -#: main.cpp:94 +#: main.cpp:95 #, kde-format msgid " (32 bit)" msgstr "" -#: main.cpp:95 +#: main.cpp:96 #, kde-format msgid "Tool for Comparison and Merge of Files and Directories" msgstr "" -#: main.cpp:96 +#: main.cpp:97 #, kde-format msgid "(c) 2002-2014 Joachim Eibl, (c) 2017 Michael Reeves KF5/Qt5 port" msgstr "" -#: main.cpp:112 +#: main.cpp:113 #, kde-format msgid "Merge the input." msgstr "" -#: main.cpp:113 +#: main.cpp:114 #, kde-format msgid "Explicit base file. For compatibility with certain tools." msgstr "" -#: main.cpp:114 +#: main.cpp:115 #, kde-format msgid "Output file. Implies -m. E.g.: -o newfile.txt" msgstr "" -#: main.cpp:115 +#: main.cpp:116 #, kde-format msgid "Output file, again. (For compatibility with certain tools.)" msgstr "" -#: main.cpp:116 +#: main.cpp:118 #, kde-format msgid "No GUI if all conflicts are auto-solvable. (Needs -o file)" msgstr "" -#: main.cpp:117 +#: main.cpp:120 +#, fuzzy, kde-format +#| msgid "Ignore" +msgid "Ignored." +msgstr "Ignoruoti" + +#: main.cpp:122 #, kde-format msgid "Do not solve conflicts automatically." msgstr "" -#: main.cpp:118 +#: main.cpp:123 #, kde-format msgid "Visible name replacement for input file 1 (base)." msgstr "" -#: main.cpp:119 +#: main.cpp:124 #, kde-format msgid "Visible name replacement for input file 2." msgstr "" -#: main.cpp:120 +#: main.cpp:125 #, kde-format msgid "Visible name replacement for input file 3." msgstr "" -#: main.cpp:121 +#: main.cpp:126 #, kde-format msgid "Alternative visible name replacement. Supply this once for every input." msgstr "" -#: main.cpp:122 +#: main.cpp:127 #, kde-format msgid "" "Override a config setting. Use once for every setting. E.g.: --cs " "\"AutoAdvance=1\"" msgstr "" -#: main.cpp:123 +#: main.cpp:128 #, kde-format msgid "Show list of config settings and current values." msgstr "" -#: main.cpp:124 +#: main.cpp:129 #, kde-format msgid "Use a different config file." msgstr "" -#: main.cpp:127 +#: main.cpp:132 #, kde-format msgid "file1 to open (base, if not specified via --base)" msgstr "" -#: main.cpp:128 +#: main.cpp:133 #, kde-format msgid "file2 to open" msgstr "" -#: main.cpp:129 +#: main.cpp:134 #, kde-format msgid "file3 to open" msgstr "" -#: main.cpp:153 +#: main.cpp:158 #, kde-format msgid "See kdiff3 --help for supported options." msgstr "" -#: mergeresultwindow.cpp:158 +#: mergeresultwindow.cpp:171 #, kde-format msgid "Choose A Everywhere" msgstr "" -#: mergeresultwindow.cpp:159 +#: mergeresultwindow.cpp:172 #, kde-format msgid "Choose B Everywhere" msgstr "" -#: mergeresultwindow.cpp:160 +#: mergeresultwindow.cpp:173 #, kde-format msgid "Choose C Everywhere" msgstr "" -#: mergeresultwindow.cpp:161 +#: mergeresultwindow.cpp:174 #, kde-format msgid "Choose A for All Unsolved Conflicts" msgstr "" -#: mergeresultwindow.cpp:162 +#: mergeresultwindow.cpp:175 #, kde-format msgid "Choose B for All Unsolved Conflicts" msgstr "" -#: mergeresultwindow.cpp:163 +#: mergeresultwindow.cpp:176 #, kde-format msgid "Choose C for All Unsolved Conflicts" msgstr "" -#: mergeresultwindow.cpp:164 +#: mergeresultwindow.cpp:177 #, kde-format msgid "Choose A for All Unsolved Whitespace Conflicts" msgstr "" -#: mergeresultwindow.cpp:165 +#: mergeresultwindow.cpp:178 #, kde-format msgid "Choose B for All Unsolved Whitespace Conflicts" msgstr "" -#: mergeresultwindow.cpp:166 +#: mergeresultwindow.cpp:179 #, kde-format msgid "Choose C for All Unsolved Whitespace Conflicts" msgstr "" -#: mergeresultwindow.cpp:176 +#: mergeresultwindow.cpp:204 #, kde-format msgid "Number of remaining unsolved conflicts: %1 (of which %2 are whitespace)" msgstr "" -#: mergeresultwindow.cpp:370 +#: mergeresultwindow.cpp:398 #, kde-format msgid "" "The output has been modified.\n" "If you continue your changes will be lost." msgstr "" -#: mergeresultwindow.cpp:936 pdiff.cpp:827 +#: mergeresultwindow.cpp:964 pdiff.cpp:817 #, kde-format msgid "All input files are binary equal." msgstr "" -#: mergeresultwindow.cpp:938 +#: mergeresultwindow.cpp:966 #, kde-format msgid "All input files contain the same text." msgstr "" -#: mergeresultwindow.cpp:942 mergeresultwindow.cpp:946 -#: mergeresultwindow.cpp:950 pdiff.cpp:833 pdiff.cpp:837 pdiff.cpp:841 +#: mergeresultwindow.cpp:970 mergeresultwindow.cpp:974 +#: mergeresultwindow.cpp:978 pdiff.cpp:823 pdiff.cpp:827 pdiff.cpp:831 #, kde-format msgid "Files %1 and %2 are binary equal.\n" msgstr "" -#: mergeresultwindow.cpp:944 mergeresultwindow.cpp:948 -#: mergeresultwindow.cpp:952 +#: mergeresultwindow.cpp:972 mergeresultwindow.cpp:976 +#: mergeresultwindow.cpp:980 #, kde-format msgid "Files %1 and %2 have equal text.\n" msgstr "" -#: mergeresultwindow.cpp:958 +#: mergeresultwindow.cpp:986 #, kde-format msgid "" "Total number of conflicts: %1\n" @@ -1900,39 +1911,39 @@ "%4" msgstr "" -#: mergeresultwindow.cpp:964 +#: mergeresultwindow.cpp:992 #, kde-format msgid "Conflicts" msgstr "Konfliktai" -#: mergeresultwindow.cpp:1873 +#: mergeresultwindow.cpp:1901 #, kde-format msgid "" msgstr "" -#: mergeresultwindow.cpp:1881 +#: mergeresultwindow.cpp:1909 #, kde-format msgid "" msgstr "" -#: mergeresultwindow.cpp:1883 mergeresultwindow.cpp:2755 +#: mergeresultwindow.cpp:1911 mergeresultwindow.cpp:2783 #, kde-format msgid "" msgstr "" -#: mergeresultwindow.cpp:2967 +#: mergeresultwindow.cpp:2995 #, kde-format msgid "" "Not all conflicts are solved yet.\n" "File not saved." msgstr "" -#: mergeresultwindow.cpp:2969 mergeresultwindow.cpp:2978 +#: mergeresultwindow.cpp:2997 mergeresultwindow.cpp:3006 #, kde-format msgid "Conflicts Left" msgstr "" -#: mergeresultwindow.cpp:2976 +#: mergeresultwindow.cpp:3004 #, kde-format msgid "" "There is a line end style conflict. Please choose the line end style " @@ -1940,7 +1951,7 @@ "File not saved." msgstr "" -#: mergeresultwindow.cpp:2990 +#: mergeresultwindow.cpp:3018 #, kde-format msgid "" "\n" @@ -1948,58 +1959,58 @@ "Creating backup failed. File not saved." msgstr "" -#: mergeresultwindow.cpp:2990 mergeresultwindow.cpp:3038 +#: mergeresultwindow.cpp:3018 mergeresultwindow.cpp:3066 #, kde-format msgid "File Save Error" msgstr "Failo išsaugojimo klaida" -#: mergeresultwindow.cpp:3038 +#: mergeresultwindow.cpp:3066 #, kde-format msgid "Error while writing." msgstr "" -#: mergeresultwindow.cpp:3110 +#: mergeresultwindow.cpp:3138 #, fuzzy, kde-format #| msgid "Output" msgid "Output:" msgstr "Išvestis" -#: mergeresultwindow.cpp:3123 mergeresultwindow.cpp:3315 +#: mergeresultwindow.cpp:3151 mergeresultwindow.cpp:3343 #, kde-format msgid "[Modified]" msgstr "" -#: mergeresultwindow.cpp:3130 +#: mergeresultwindow.cpp:3158 #, kde-format msgid "Encoding for saving:" msgstr "" -#: mergeresultwindow.cpp:3230 +#: mergeresultwindow.cpp:3258 #, kde-format msgid "Conflict" msgstr "Konfliktas" -#: mergeresultwindow.cpp:3262 +#: mergeresultwindow.cpp:3290 #, kde-format msgid "Codec from A: %1" msgstr "" -#: mergeresultwindow.cpp:3264 +#: mergeresultwindow.cpp:3292 #, kde-format msgid "Codec from B: %1" msgstr "" -#: mergeresultwindow.cpp:3266 +#: mergeresultwindow.cpp:3294 #, kde-format msgid "Codec from C: %1" msgstr "" -#: optiondialog.cpp:119 +#: optiondialog.cpp:121 #, kde-format msgid "Change Font" msgstr "" -#: optiondialog.cpp:135 optiondialog.cpp:145 +#: optiondialog.cpp:137 optiondialog.cpp:147 #, kde-format msgid "" "Font: %1, %2, %3\n" @@ -2007,208 +2018,208 @@ "Example:" msgstr "" -#: optiondialog.cpp:388 +#: optiondialog.cpp:390 #, kde-format msgid "Unicode" msgstr "Unikodas" -#: optiondialog.cpp:389 +#: optiondialog.cpp:391 #, kde-format msgid "Latin1" msgstr "Latin1" -#: optiondialog.cpp:408 +#: optiondialog.cpp:410 #, kde-format msgid "Change this if non-ASCII characters are not displayed correctly." msgstr "" -#: optiondialog.cpp:491 +#: optiondialog.cpp:495 #, kde-format msgid "Configure" msgstr "Konfigūruoti" -#: optiondialog.cpp:568 +#: optiondialog.cpp:573 #, kde-format msgid "Font" msgstr "Šriftas" -#: optiondialog.cpp:570 +#: optiondialog.cpp:575 #, kde-format msgid "Editor & Diff Output Font" msgstr "" -#: optiondialog.cpp:589 +#: optiondialog.cpp:594 #, kde-format msgid "Application font" msgstr "" -#: optiondialog.cpp:594 +#: optiondialog.cpp:599 #, fuzzy, kde-format #| msgid "File Save Error" msgid "File view font" msgstr "Failo išsaugojimo klaida" -#: optiondialog.cpp:613 +#: optiondialog.cpp:618 #, fuzzy, kde-format #| msgid "Color" msgctxt "Title for color settings page" msgid "Color" msgstr "Spalva" -#: optiondialog.cpp:614 +#: optiondialog.cpp:619 #, kde-format msgid "Colors Settings" msgstr "Spalvų nustatymai" -#: optiondialog.cpp:631 +#: optiondialog.cpp:644 #, kde-format msgid "Editor and Diff Views:" msgstr "" -#: optiondialog.cpp:639 +#: optiondialog.cpp:652 #, kde-format msgid "Foreground color:" msgstr "Priekinio plano spalva:" -#: optiondialog.cpp:647 +#: optiondialog.cpp:660 #, kde-format msgid "Background color:" msgstr "Fono spalva:" -#: optiondialog.cpp:657 +#: optiondialog.cpp:670 #, kde-format msgid "Diff background color:" msgstr "" -#: optiondialog.cpp:666 +#: optiondialog.cpp:679 #, kde-format msgid "Color A:" msgstr "Spalva A:" -#: optiondialog.cpp:675 +#: optiondialog.cpp:688 #, kde-format msgid "Color B:" msgstr "Spalva B:" -#: optiondialog.cpp:684 +#: optiondialog.cpp:697 #, kde-format msgid "Color C:" msgstr "Spalva C:" -#: optiondialog.cpp:692 +#: optiondialog.cpp:705 #, kde-format msgid "Conflict color:" msgstr "Konflikto spalva:" -#: optiondialog.cpp:701 +#: optiondialog.cpp:714 #, kde-format msgid "Current range background color:" msgstr "" -#: optiondialog.cpp:710 +#: optiondialog.cpp:723 #, kde-format msgid "Current range diff background color:" msgstr "" -#: optiondialog.cpp:718 +#: optiondialog.cpp:731 #, kde-format msgid "Color for manually aligned difference ranges:" msgstr "" -#: optiondialog.cpp:725 +#: optiondialog.cpp:738 #, kde-format msgid "Directory Comparison View:" msgstr "" -#: optiondialog.cpp:731 +#: optiondialog.cpp:744 #, kde-format msgid "Newest file color:" msgstr "" -#: optiondialog.cpp:736 +#: optiondialog.cpp:749 #, kde-format msgid "" "Changing this color will only be effective when starting the next directory " "comparison." msgstr "" -#: optiondialog.cpp:741 +#: optiondialog.cpp:754 #, kde-format msgid "Oldest file color:" msgstr "" -#: optiondialog.cpp:750 +#: optiondialog.cpp:763 #, kde-format msgid "Middle age file color:" msgstr "" -#: optiondialog.cpp:759 +#: optiondialog.cpp:772 #, kde-format msgid "Color for missing files:" msgstr "" -#: optiondialog.cpp:773 +#: optiondialog.cpp:786 #, kde-format msgid "Editor" msgstr "Redaktorius" -#: optiondialog.cpp:774 +#: optiondialog.cpp:787 #, kde-format msgid "Editor Behavior" msgstr "" -#: optiondialog.cpp:787 +#: optiondialog.cpp:809 #, kde-format msgid "Tab inserts spaces" msgstr "" -#: optiondialog.cpp:791 +#: optiondialog.cpp:813 #, kde-format msgid "" "On: Pressing tab generates the appropriate number of spaces.\n" "Off: A tab character will be inserted." msgstr "" -#: optiondialog.cpp:796 +#: optiondialog.cpp:818 #, kde-format msgid "Tab size:" msgstr "" -#: optiondialog.cpp:803 +#: optiondialog.cpp:825 #, kde-format msgid "Auto indentation" msgstr "" -#: optiondialog.cpp:807 +#: optiondialog.cpp:829 #, kde-format msgid "On: The indentation of the previous line is used for a new line.\n" msgstr "" -#: optiondialog.cpp:810 +#: optiondialog.cpp:832 #, kde-format msgid "Auto copy selection" msgstr "" -#: optiondialog.cpp:814 +#: optiondialog.cpp:836 #, kde-format msgid "" "On: Any selection is immediately written to the clipboard.\n" "Off: You must explicitly copy e.g. via Ctrl-C." msgstr "" -#: optiondialog.cpp:829 +#: optiondialog.cpp:851 #, kde-format msgid "" "Sets the line endings for when an edited file is saved.\n" "DOS/Windows: CR+LF; UNIX: LF; with CR=0D, LF=0A" msgstr "" -#: optiondialog.cpp:839 +#: optiondialog.cpp:861 #, kde-format msgid "Diff" msgstr "" -#: optiondialog.cpp:840 +#: optiondialog.cpp:862 #, kde-format msgid "Diff Settings" msgstr "" @@ -2222,12 +2233,12 @@ #. ); #. ++line; #. -#: optiondialog.cpp:865 +#: optiondialog.cpp:896 #, kde-format msgid "Ignore numbers (treat as white space)" msgstr "" -#: optiondialog.cpp:869 +#: optiondialog.cpp:900 #, kde-format msgid "" "Ignore number characters during line matching phase. (Similar to Ignore " @@ -2235,67 +2246,67 @@ "Might help to compare files with numeric data." msgstr "" -#: optiondialog.cpp:873 +#: optiondialog.cpp:904 #, fuzzy, kde-format #| msgid "Ignore C/C++ comments" msgid "Ignore C/C++ comments (treat as white space)" msgstr "Ignoruoti C/C++ komentarus" -#: optiondialog.cpp:876 +#: optiondialog.cpp:907 #, kde-format msgid "Treat C/C++ comments like white space." msgstr "" -#: optiondialog.cpp:879 +#: optiondialog.cpp:910 #, kde-format msgid "Ignore case (treat as white space)" msgstr "" -#: optiondialog.cpp:883 +#: optiondialog.cpp:914 #, kde-format msgid "Treat case differences like white space changes. ('a'<=>'A')" msgstr "" -#: optiondialog.cpp:886 +#: optiondialog.cpp:917 #, kde-format msgid "Preprocessor command:" msgstr "" -#: optiondialog.cpp:891 +#: optiondialog.cpp:922 #, kde-format msgid "User defined pre-processing. (See the docs for details.)" msgstr "" -#: optiondialog.cpp:894 +#: optiondialog.cpp:925 #, kde-format msgid "Line-matching preprocessor command:" msgstr "" -#: optiondialog.cpp:899 +#: optiondialog.cpp:930 #, kde-format msgid "" "This pre-processor is only used during line matching.\n" "(See the docs for details.)" msgstr "" -#: optiondialog.cpp:902 +#: optiondialog.cpp:933 #, kde-format msgid "Try hard (slower)" msgstr "" -#: optiondialog.cpp:906 +#: optiondialog.cpp:937 #, kde-format msgid "" "Enables the --minimal option for the external diff.\n" "The analysis of big files will be much slower." msgstr "" -#: optiondialog.cpp:910 +#: optiondialog.cpp:941 #, kde-format msgid "Align B and C for 3 input files" msgstr "" -#: optiondialog.cpp:914 +#: optiondialog.cpp:945 #, kde-format msgid "" "Try to align B and C when comparing or merging three input files.\n" @@ -2303,66 +2314,73 @@ "(Default is off.)" msgstr "" -#: optiondialog.cpp:926 +#: optiondialog.cpp:956 +#, fuzzy, kde-format +#| msgid "Merge" +msgctxt "Settings page" +msgid "Merge" +msgstr "Apjungti" + +#: optiondialog.cpp:957 #, kde-format msgid "Merge Settings" msgstr "" -#: optiondialog.cpp:940 +#: optiondialog.cpp:980 #, kde-format msgid "Auto advance delay (ms):" msgstr "" -#: optiondialog.cpp:946 +#: optiondialog.cpp:986 #, kde-format 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 "" -#: optiondialog.cpp:950 +#: optiondialog.cpp:990 #, kde-format msgid "Show info dialogs" msgstr "" -#: optiondialog.cpp:953 +#: optiondialog.cpp:993 #, kde-format msgid "Show a dialog with information about the number of conflicts." msgstr "" -#: optiondialog.cpp:956 +#: optiondialog.cpp:996 #, kde-format msgid "White space 2-file merge default:" msgstr "" -#: optiondialog.cpp:961 optiondialog.cpp:974 +#: optiondialog.cpp:1001 optiondialog.cpp:1014 #, kde-format msgid "Manual Choice" msgstr "" -#: optiondialog.cpp:965 optiondialog.cpp:979 +#: optiondialog.cpp:1005 optiondialog.cpp:1019 #, kde-format msgid "" "Allow the merge algorithm to automatically select an input for white-space-" "only changes." msgstr "" -#: optiondialog.cpp:969 +#: optiondialog.cpp:1009 #, kde-format msgid "White space 3-file merge default:" msgstr "" -#: optiondialog.cpp:983 +#: optiondialog.cpp:1023 #, kde-format msgid "Automatic Merge Regular Expression" msgstr "" -#: optiondialog.cpp:991 smalldialogs.cpp:449 +#: optiondialog.cpp:1031 smalldialogs.cpp:459 #, kde-format msgid "Auto merge regular expression:" msgstr "" -#: optiondialog.cpp:996 +#: optiondialog.cpp:1036 #, kde-format msgid "" "Regular expression for lines where KDiff3 should automatically choose one " @@ -2371,29 +2389,29 @@ "- if available - C, otherwise B will be chosen." msgstr "" -#: optiondialog.cpp:1002 +#: optiondialog.cpp:1042 #, kde-format msgid "Run regular expression auto merge on merge start" msgstr "" -#: optiondialog.cpp:1005 +#: optiondialog.cpp:1045 #, kde-format msgid "" "Run the merge for auto merge regular expressions\n" "immediately when a merge starts.\n" msgstr "" -#: optiondialog.cpp:1010 +#: optiondialog.cpp:1050 #, kde-format msgid "Version Control History Merging" msgstr "" -#: optiondialog.cpp:1018 smalldialogs.cpp:476 +#: optiondialog.cpp:1058 smalldialogs.cpp:486 #, kde-format msgid "History start regular expression:" msgstr "" -#: optiondialog.cpp:1023 +#: optiondialog.cpp:1063 #, kde-format msgid "" "Regular expression for the start of the version control history entry.\n" @@ -2401,12 +2419,12 @@ "Default value: \".*\\$Log.*\\$.*\"" msgstr "" -#: optiondialog.cpp:1029 smalldialogs.cpp:504 +#: optiondialog.cpp:1069 smalldialogs.cpp:514 #, kde-format msgid "History entry start regular expression:" msgstr "" -#: optiondialog.cpp:1042 +#: optiondialog.cpp:1082 #, kde-format msgid "" "A version control history entry consists of several lines.\n" @@ -2418,22 +2436,22 @@ "See the documentation for details." msgstr "" -#: optiondialog.cpp:1050 +#: optiondialog.cpp:1090 #, kde-format msgid "History merge sorting" msgstr "" -#: optiondialog.cpp:1053 +#: optiondialog.cpp:1093 #, kde-format msgid "Sort version control history by a key." msgstr "" -#: optiondialog.cpp:1063 +#: optiondialog.cpp:1103 #, kde-format msgid "History entry start sort key order:" msgstr "" -#: optiondialog.cpp:1068 +#: optiondialog.cpp:1108 #, kde-format msgid "" "Each pair of parentheses used in the regular expression for the history " @@ -2445,37 +2463,37 @@ "See the documentation for details." msgstr "" -#: optiondialog.cpp:1079 +#: optiondialog.cpp:1119 #, kde-format msgid "Merge version control history on merge start" msgstr "" -#: optiondialog.cpp:1082 +#: optiondialog.cpp:1122 #, kde-format msgid "Run version control history automerge on merge start." msgstr "" -#: optiondialog.cpp:1086 +#: optiondialog.cpp:1126 #, kde-format msgid "Max number of history entries:" msgstr "" -#: optiondialog.cpp:1090 +#: optiondialog.cpp:1130 #, kde-format msgid "Cut off after specified number. Use -1 for infinite number of entries." msgstr "" -#: optiondialog.cpp:1094 +#: optiondialog.cpp:1134 #, kde-format msgid "Test your regular expressions" msgstr "" -#: optiondialog.cpp:1099 +#: optiondialog.cpp:1139 #, kde-format msgid "Irrelevant merge command:" msgstr "" -#: optiondialog.cpp:1104 +#: optiondialog.cpp:1144 #, kde-format msgid "" "If specified this script is run after automerge\n" @@ -2483,12 +2501,12 @@ "Called with the parameters: filename1 filename2 filename3" msgstr "" -#: optiondialog.cpp:1109 +#: optiondialog.cpp:1149 #, kde-format msgid "Auto save and quit on merge without conflicts" msgstr "" -#: optiondialog.cpp:1113 +#: optiondialog.cpp:1153 #, kde-format msgid "" "If KDiff3 was started for a file-merge from the command line and all\n" @@ -2497,27 +2515,27 @@ "(Similar to command line option \"--auto\".)" msgstr "" -#: optiondialog.cpp:1124 optiondialog.cpp:1125 +#: optiondialog.cpp:1164 optiondialog.cpp:1165 #, kde-format msgid "Directory" msgstr "Aplankas" -#: optiondialog.cpp:1137 +#: optiondialog.cpp:1185 #, kde-format msgid "Recursive directories" msgstr "" -#: optiondialog.cpp:1140 +#: optiondialog.cpp:1188 #, kde-format msgid "Whether to analyze subdirectories or not." msgstr "" -#: optiondialog.cpp:1142 +#: optiondialog.cpp:1190 #, kde-format msgid "File pattern(s):" msgstr "" -#: optiondialog.cpp:1148 +#: optiondialog.cpp:1196 #, kde-format msgid "" "Pattern(s) of files to be analyzed. \n" @@ -2525,12 +2543,12 @@ "Several Patterns can be specified by using the separator: ';'" msgstr "" -#: optiondialog.cpp:1153 +#: optiondialog.cpp:1201 #, kde-format msgid "File-anti-pattern(s):" msgstr "" -#: optiondialog.cpp:1159 +#: optiondialog.cpp:1207 #, kde-format msgid "" "Pattern(s) of files to be excluded from analysis. \n" @@ -2538,12 +2556,12 @@ "Several Patterns can be specified by using the separator: ';'" msgstr "" -#: optiondialog.cpp:1164 +#: optiondialog.cpp:1212 #, kde-format msgid "Dir-anti-pattern(s):" msgstr "" -#: optiondialog.cpp:1170 +#: optiondialog.cpp:1218 #, kde-format msgid "" "Pattern(s) of directories to be excluded from analysis. \n" @@ -2551,58 +2569,58 @@ "Several Patterns can be specified by using the separator: ';'" msgstr "" -#: optiondialog.cpp:1175 +#: optiondialog.cpp:1223 #, kde-format msgid "Use .cvsignore" msgstr "" -#: optiondialog.cpp:1179 +#: optiondialog.cpp:1227 #, kde-format msgid "" "Extends the antipattern to anything that would be ignored by CVS.\n" "Via local \".cvsignore\" files this can be directory specific." msgstr "" -#: optiondialog.cpp:1183 +#: optiondialog.cpp:1231 #, kde-format msgid "Find hidden files and directories" msgstr "" -#: optiondialog.cpp:1186 +#: optiondialog.cpp:1234 #, kde-format msgid "Finds hidden files and directories." msgstr "" -#: optiondialog.cpp:1189 +#: optiondialog.cpp:1237 #, kde-format msgid "Follow file links" msgstr "" -#: optiondialog.cpp:1193 +#: optiondialog.cpp:1241 #, kde-format msgid "" "On: Compare the file the link points to.\n" "Off: Compare the links." msgstr "" -#: optiondialog.cpp:1197 +#: optiondialog.cpp:1245 #, kde-format msgid "Follow directory links" msgstr "" -#: optiondialog.cpp:1201 +#: optiondialog.cpp:1249 #, kde-format msgid "" "On: Compare the directory the link points to.\n" "Off: Compare the links." msgstr "" -#: optiondialog.cpp:1210 +#: optiondialog.cpp:1258 #, kde-format msgid "Case sensitive filename comparison" msgstr "" -#: optiondialog.cpp:1214 +#: optiondialog.cpp:1262 #, kde-format msgid "" "The directory comparison will compare files or directories when their names " @@ -2611,63 +2629,63 @@ "off, otherwise on.)" msgstr "" -#: optiondialog.cpp:1218 +#: optiondialog.cpp:1266 #, kde-format msgid "Unfold all subdirectories on load" msgstr "" -#: optiondialog.cpp:1222 +#: optiondialog.cpp:1270 #, kde-format msgid "" "On: Unfold all subdirectories when starting a directory diff.\n" "Off: Leave subdirectories folded." msgstr "" -#: optiondialog.cpp:1226 +#: optiondialog.cpp:1274 #, kde-format msgid "Skip directory status report" msgstr "" -#: optiondialog.cpp:1230 +#: optiondialog.cpp:1278 #, kde-format msgid "" "On: Do not show the Directory Comparison Status.\n" "Off: Show the status dialog on start." msgstr "" -#: optiondialog.cpp:1234 +#: optiondialog.cpp:1282 #, kde-format msgid "File Comparison Mode" msgstr "" -#: optiondialog.cpp:1239 +#: optiondialog.cpp:1287 #, kde-format msgid "Binary comparison" msgstr "" -#: optiondialog.cpp:1241 +#: optiondialog.cpp:1289 #, kde-format msgid "Binary comparison of each file. (Default)" msgstr "" -#: optiondialog.cpp:1244 +#: optiondialog.cpp:1292 #, kde-format msgid "Full analysis" msgstr "" -#: optiondialog.cpp:1246 +#: optiondialog.cpp:1294 #, kde-format msgid "" "Do a full analysis and show statistics information in extra columns.\n" "(Slower than a binary comparison, much slower for binary files.)" msgstr "" -#: optiondialog.cpp:1250 +#: optiondialog.cpp:1298 #, kde-format msgid "Trust the size and modification date (unsafe)" msgstr "" -#: optiondialog.cpp:1252 +#: optiondialog.cpp:1300 #, kde-format msgid "" "Assume that files are equal if the modification date and file length are " @@ -2677,14 +2695,14 @@ "Useful for big directories or slow networks." msgstr "" -#: optiondialog.cpp:1257 +#: optiondialog.cpp:1305 #, kde-format msgid "" "Trust the size and date, but use binary comparison if date does not match " "(unsafe)" msgstr "" -#: optiondialog.cpp:1259 +#: optiondialog.cpp:1307 #, kde-format msgid "" "Assume that files are equal if the modification date and file length are " @@ -2693,12 +2711,12 @@ "Useful for big directories or slow networks." msgstr "" -#: optiondialog.cpp:1264 +#: optiondialog.cpp:1312 #, kde-format msgid "Trust the size (unsafe)" msgstr "" -#: optiondialog.cpp:1266 +#: optiondialog.cpp:1314 #, kde-format msgid "" "Assume that files are equal if their file lengths are equal.\n" @@ -2706,12 +2724,12 @@ "download." msgstr "" -#: optiondialog.cpp:1273 +#: optiondialog.cpp:1321 #, kde-format msgid "Synchronize directories" msgstr "Sinchronizuoti aplankus" -#: optiondialog.cpp:1277 +#: optiondialog.cpp:1325 #, kde-format msgid "" "Offers to store files in both directories so that\n" @@ -2719,24 +2737,24 @@ "Works only when comparing two directories without specifying a destination." msgstr "" -#: optiondialog.cpp:1283 +#: optiondialog.cpp:1331 #, kde-format msgid "White space differences considered equal" msgstr "" -#: optiondialog.cpp:1287 +#: optiondialog.cpp:1335 #, kde-format msgid "" "If files differ only by white space consider them equal.\n" "This is only active when full analysis is chosen." msgstr "" -#: optiondialog.cpp:1293 +#: optiondialog.cpp:1341 #, kde-format msgid "Copy newer instead of merging (unsafe)" msgstr "" -#: optiondialog.cpp:1297 +#: optiondialog.cpp:1345 #, kde-format msgid "" "Do not look inside, just take the newer file.\n" @@ -2744,46 +2762,46 @@ "Only effective when comparing two directories." msgstr "" -#: optiondialog.cpp:1302 +#: optiondialog.cpp:1350 #, kde-format msgid "Backup files (.orig)" msgstr "" -#: optiondialog.cpp:1306 +#: optiondialog.cpp:1354 #, kde-format msgid "" "If 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 "" -#: optiondialog.cpp:1382 optiondialog.cpp:1383 +#: optiondialog.cpp:1430 optiondialog.cpp:1431 #, kde-format msgid "Regional Settings" msgstr "" -#: optiondialog.cpp:1397 +#: optiondialog.cpp:1454 #, kde-format msgid "Use the same encoding for everything:" msgstr "" -#: optiondialog.cpp:1401 +#: optiondialog.cpp:1458 #, kde-format msgid "" "Enable this allows to change all encodings by changing the first only.\n" "Disable this if different individual settings are needed." msgstr "" -#: optiondialog.cpp:1405 +#: optiondialog.cpp:1462 #, kde-format msgid "Note: Local Encoding is \"%1\"" msgstr "" -#: optiondialog.cpp:1409 +#: optiondialog.cpp:1466 #, kde-format msgid "File Encoding for A:" msgstr "" -#: optiondialog.cpp:1416 +#: optiondialog.cpp:1473 #, kde-format msgid "" "If enabled then Unicode (UTF-16 or UTF-8) encoding will be detected.\n" @@ -2792,32 +2810,32 @@ "(Unicode detection depends on the first bytes of a file.)" msgstr "" -#: optiondialog.cpp:1419 optiondialog.cpp:1430 optiondialog.cpp:1441 +#: optiondialog.cpp:1476 optiondialog.cpp:1487 optiondialog.cpp:1498 #, kde-format msgid "Auto Detect Unicode" msgstr "" -#: optiondialog.cpp:1425 +#: optiondialog.cpp:1482 #, kde-format msgid "File Encoding for B:" msgstr "" -#: optiondialog.cpp:1436 +#: optiondialog.cpp:1493 #, kde-format msgid "File Encoding for C:" msgstr "" -#: optiondialog.cpp:1447 +#: optiondialog.cpp:1504 #, kde-format msgid "File Encoding for Merge Output and Saving:" msgstr "" -#: optiondialog.cpp:1452 +#: optiondialog.cpp:1509 #, fuzzy, kde-format msgid "Auto Select" msgstr "Iškerpamas žymėjimas..." -#: optiondialog.cpp:1456 +#: optiondialog.cpp:1513 #, kde-format msgid "" "If enabled then the encoding from the input files is used.\n" @@ -2825,39 +2843,39 @@ "saving." msgstr "" -#: optiondialog.cpp:1459 +#: optiondialog.cpp:1516 #, kde-format msgid "File Encoding for Preprocessor Files:" msgstr "" -#: optiondialog.cpp:1471 +#: optiondialog.cpp:1528 #, kde-format msgid "Right To Left Language" msgstr "" -#: optiondialog.cpp:1475 +#: optiondialog.cpp:1532 #, kde-format msgid "" "Some languages are read from right to left.\n" "This setting will change the viewer and editor accordingly." msgstr "" -#: optiondialog.cpp:1485 +#: optiondialog.cpp:1542 #, fuzzy, kde-format msgid "Integration" msgstr "Operacija" -#: optiondialog.cpp:1486 +#: optiondialog.cpp:1543 #, kde-format msgid "Integration Settings" msgstr "" -#: optiondialog.cpp:1499 +#: optiondialog.cpp:1564 #, kde-format msgid "Command line options to ignore:" msgstr "" -#: optiondialog.cpp:1505 +#: optiondialog.cpp:1570 #, kde-format msgid "" "List of command line options that should be ignored when KDiff3 is used by " @@ -2866,19 +2884,19 @@ "This will suppress the \"Unknown option\" error." msgstr "" -#: optiondialog.cpp:1510 +#: optiondialog.cpp:1575 #, kde-format msgid "Quit also via Escape key" msgstr "" -#: optiondialog.cpp:1514 +#: optiondialog.cpp:1579 #, kde-format msgid "" "Fast method to exit.\n" "For those who are used to using the Escape key." msgstr "" -#: optiondialog.cpp:1598 +#: optiondialog.cpp:1653 #, kde-format msgid "This resets all options. Not only those of the current topic." msgstr "" @@ -2928,77 +2946,68 @@ msgid "Disable Unsafe Options" msgstr "" -#: pdiff.cpp:158 +#: pdiff.cpp:160 #, kde-format msgid "Loading A" msgstr "" -#: pdiff.cpp:167 -#, kde-format -msgid "Errors occurred during pre-processing of file A." -msgstr "" +#: pdiff.cpp:162 +#, fuzzy, kde-format +#| msgid "Reading file: %1" +msgid "Loading A: %1" +msgstr "Skaitomas failas: %1" -#: pdiff.cpp:172 +#: pdiff.cpp:170 #, kde-format msgid "Loading B" msgstr "" -#: pdiff.cpp:179 -#, kde-format -msgid "Errors occurred during pre-processing of file B." -msgstr "" - -#: pdiff.cpp:202 pdiff.cpp:241 +#: pdiff.cpp:201 pdiff.cpp:237 #, kde-format msgid "Diff: A <-> B" msgstr "" -#: pdiff.cpp:208 pdiff.cpp:279 pdiff.cpp:293 +#: pdiff.cpp:207 pdiff.cpp:275 pdiff.cpp:289 #, kde-format msgid "Linediff: A <-> B" msgstr "" -#: pdiff.cpp:225 +#: pdiff.cpp:224 #, kde-format msgid "Loading C" msgstr "" -#: pdiff.cpp:232 -#, kde-format -msgid "Errors occurred during pre-processing of file C." -msgstr "" - -#: pdiff.cpp:250 +#: pdiff.cpp:246 #, kde-format msgid "Diff: A <-> C" msgstr "" -#: pdiff.cpp:261 +#: pdiff.cpp:257 #, kde-format msgid "Diff: B <-> C" msgstr "" -#: pdiff.cpp:283 pdiff.cpp:297 +#: pdiff.cpp:279 pdiff.cpp:293 #, kde-format msgid "Linediff: B <-> C" msgstr "" -#: pdiff.cpp:287 pdiff.cpp:301 +#: pdiff.cpp:283 pdiff.cpp:297 #, kde-format msgid "Linediff: A <-> C" msgstr "" -#: pdiff.cpp:829 +#: pdiff.cpp:819 #, kde-format msgid "All input files contain the same text, but are not binary equal." msgstr "" -#: pdiff.cpp:835 pdiff.cpp:839 pdiff.cpp:843 +#: pdiff.cpp:825 pdiff.cpp:829 pdiff.cpp:833 #, kde-format msgid "Files %1 and %2 have equal text, but are not binary equal. \n" msgstr "" -#: pdiff.cpp:853 +#: pdiff.cpp:843 #, kde-format msgid "" "Some input files do not seem to be pure text files.\n" @@ -3006,17 +3015,17 @@ "Continue at your own risk." msgstr "" -#: pdiff.cpp:863 +#: pdiff.cpp:853 #, kde-format msgid ", B" msgstr "" -#: pdiff.cpp:865 +#: pdiff.cpp:855 #, kde-format msgid ", C" msgstr "" -#: pdiff.cpp:867 +#: pdiff.cpp:857 #, kde-format msgid "" "Some input characters could not be converted to valid unicode.\n" @@ -3025,77 +3034,72 @@ "Affected input files are in %1." msgstr "" -#: pdiff.cpp:1034 +#: pdiff.cpp:1032 #, kde-format msgid "Abort" msgstr "Nutraukti" -#: pdiff.cpp:1040 pdiff.cpp:1130 +#: pdiff.cpp:1038 pdiff.cpp:1129 #, kde-format msgid "Opening files..." msgstr "Atveriami failai..." -#: pdiff.cpp:1107 -#, kde-format -msgid "File open error" -msgstr "Klaida atveriant bylą" - -#: pdiff.cpp:1202 +#: pdiff.cpp:1212 #, kde-format msgid "Cutting selection..." msgstr "Iškerpamas žymėjimas..." -#: pdiff.cpp:1223 +#: pdiff.cpp:1233 #, kde-format msgid "Copying selection to clipboard..." msgstr "Kopijuojama pažymėtą vietą į talpyklę..." -#: pdiff.cpp:1239 +#: pdiff.cpp:1249 #, kde-format msgid "Inserting clipboard contents..." msgstr "Įterpiamas talpyklės turinys..." -#: pdiff.cpp:1695 +#: pdiff.cpp:1705 #, kde-format msgid "Word wrap (Cancel disables word wrap)" msgstr "" -#: pdiff.cpp:1696 +#: pdiff.cpp:1706 #, kde-format msgid "Calculating max width for horizontal scrollbar" msgstr "" -#: pdiff.cpp:1911 +#: pdiff.cpp:1921 #, kde-format msgid "Save && Continue" msgstr "" -#: pdiff.cpp:1912 +#: pdiff.cpp:1922 #, kde-format msgid "Continue Without Saving" msgstr "" -#: pdiff.cpp:2124 +#: pdiff.cpp:2134 #, kde-format msgid "Search complete." msgstr "" -#: pdiff.cpp:2124 +#: pdiff.cpp:2134 #, kde-format msgid "Search Complete" msgstr "" -#: pdiff.cpp:2375 +#: pdiff.cpp:2385 #, kde-format msgid "Nothing is selected in either diff input window." msgstr "" -#: pdiff.cpp:2375 +#: pdiff.cpp:2385 #, kde-format msgid "Error while adding manual diff range" msgstr "" -#: progress.cpp:59 progress.cpp:71 +#: progress.cpp:61 progress.cpp:73 #, kde-format msgid "&Cancel" msgstr "&Atšaukti" @@ -3105,70 +3109,70 @@ msgid "A (Base):" msgstr "" -#: smalldialogs.cpp:68 smalldialogs.cpp:85 smalldialogs.cpp:102 -#: smalldialogs.cpp:144 +#: smalldialogs.cpp:71 smalldialogs.cpp:90 smalldialogs.cpp:109 +#: smalldialogs.cpp:154 #, kde-format msgid "File..." msgstr "Failas..." -#: smalldialogs.cpp:70 smalldialogs.cpp:87 smalldialogs.cpp:104 -#: smalldialogs.cpp:146 +#: smalldialogs.cpp:73 smalldialogs.cpp:92 smalldialogs.cpp:111 +#: smalldialogs.cpp:156 #, kde-format msgid "Dir..." msgstr "" -#: smalldialogs.cpp:96 +#: smalldialogs.cpp:103 #, kde-format msgid "C (Optional):" msgstr "" -#: smalldialogs.cpp:119 +#: smalldialogs.cpp:126 #, kde-format msgid "Swap/Copy Names..." msgstr "" -#: smalldialogs.cpp:124 smalldialogs.cpp:125 smalldialogs.cpp:126 +#: smalldialogs.cpp:131 smalldialogs.cpp:132 smalldialogs.cpp:133 #, kde-format msgid "Swap %1<->%2" msgstr "" -#: smalldialogs.cpp:127 smalldialogs.cpp:128 smalldialogs.cpp:129 +#: smalldialogs.cpp:134 smalldialogs.cpp:135 smalldialogs.cpp:136 #, kde-format msgid "Copy %1->Output" msgstr "" -#: smalldialogs.cpp:130 smalldialogs.cpp:131 smalldialogs.cpp:132 +#: smalldialogs.cpp:137 smalldialogs.cpp:138 smalldialogs.cpp:139 #, kde-format msgid "Swap %1<->Output" msgstr "" -#: smalldialogs.cpp:138 +#: smalldialogs.cpp:148 #, kde-format msgid "Output (optional):" msgstr "" -#: smalldialogs.cpp:168 +#: smalldialogs.cpp:178 #, kde-format msgid "Configure..." msgstr "Konfigūruoti..." -#: smalldialogs.cpp:233 +#: smalldialogs.cpp:243 #, fuzzy, kde-format #| msgid "Directory" msgid "Open Directory" msgstr "Aplankas" -#: smalldialogs.cpp:234 +#: smalldialogs.cpp:244 #, kde-format msgid "Select Output File" msgstr "" -#: smalldialogs.cpp:393 +#: smalldialogs.cpp:403 #, kde-format msgid "Search text:" msgstr "" -#: smalldialogs.cpp:400 +#: smalldialogs.cpp:410 #, fuzzy, kde-format msgid "Case sensitive" msgstr "" @@ -3183,121 +3187,121 @@ "#-#-#-#-# kopete.po (kopete) #-#-#-#-#\n" "Skirti raidžių dydį" -#: smalldialogs.cpp:403 +#: smalldialogs.cpp:413 #, kde-format msgid "Search A" msgstr "" -#: smalldialogs.cpp:408 +#: smalldialogs.cpp:418 #, kde-format msgid "Search B" msgstr "" -#: smalldialogs.cpp:413 +#: smalldialogs.cpp:423 #, kde-format msgid "Search C" msgstr "" -#: smalldialogs.cpp:418 +#: smalldialogs.cpp:428 #, kde-format msgid "Search output" msgstr "" -#: smalldialogs.cpp:425 +#: smalldialogs.cpp:435 #, kde-format msgid "&Search" msgstr "&Ieškoti" -#: smalldialogs.cpp:444 +#: smalldialogs.cpp:454 #, kde-format msgid "Regular Expression Tester" msgstr "" -#: smalldialogs.cpp:457 +#: smalldialogs.cpp:467 #, kde-format msgid "Example auto merge line:" msgstr "" -#: smalldialogs.cpp:459 +#: smalldialogs.cpp:469 #, kde-format msgid "To test auto merge, copy a line as used in your files." msgstr "" -#: smalldialogs.cpp:465 smalldialogs.cpp:493 smalldialogs.cpp:529 +#: smalldialogs.cpp:475 smalldialogs.cpp:503 smalldialogs.cpp:539 #, kde-format msgid "Match result:" msgstr "" -#: smalldialogs.cpp:484 +#: smalldialogs.cpp:494 #, kde-format msgid "Example history start line (with leading comment):" msgstr "" -#: smalldialogs.cpp:486 +#: smalldialogs.cpp:496 #, kde-format msgid "" "Copy a history start line as used in your files,\n" "including the leading comment." msgstr "" -#: smalldialogs.cpp:512 +#: smalldialogs.cpp:522 #, kde-format msgid "History sort key order:" msgstr "" -#: smalldialogs.cpp:520 +#: smalldialogs.cpp:530 #, kde-format msgid "Example history entry start line (without leading comment):" msgstr "" -#: smalldialogs.cpp:522 +#: smalldialogs.cpp:532 #, kde-format msgid "" "Copy a history entry start line as used in your files,\n" "but omit the leading comment." msgstr "" -#: smalldialogs.cpp:536 +#: smalldialogs.cpp:546 #, kde-format msgid "Sort key result:" msgstr "" -#: smalldialogs.cpp:584 smalldialogs.cpp:594 smalldialogs.cpp:614 +#: smalldialogs.cpp:594 smalldialogs.cpp:604 smalldialogs.cpp:624 #, kde-format msgid "Match success." msgstr "" -#: smalldialogs.cpp:588 smalldialogs.cpp:598 smalldialogs.cpp:620 +#: smalldialogs.cpp:598 smalldialogs.cpp:608 smalldialogs.cpp:630 #, kde-format msgid "Match failed." msgstr "" -#: smalldialogs.cpp:605 +#: smalldialogs.cpp:615 #, kde-format msgid "Opening and closing parentheses do not match in regular expression." msgstr "" -#: SourceData.cpp:150 +#: SourceData.cpp:153 #, kde-format msgid "Writing clipboard data to temp file failed." msgstr "" -#: SourceData.cpp:154 +#: SourceData.cpp:157 #, kde-format msgid "From Clipboard" msgstr "Iš iškarpinės" -#: SourceData.cpp:335 +#: SourceData.cpp:348 #, kde-format msgid "%1 is not a normal file." msgstr "" -#: SourceData.cpp:427 +#: SourceData.cpp:440 #, kde-format msgid " Temp file is: %1" msgstr "" -#: SourceData.cpp:432 +#: SourceData.cpp:445 #, kde-format msgid "" "Preprocessing possibly failed. Check this command:\n" @@ -3307,12 +3311,12 @@ "The preprocessing command will be disabled now." msgstr "" -#: SourceData.cpp:443 SourceData.cpp:512 +#: SourceData.cpp:456 SourceData.cpp:525 #, kde-format msgid "File %1 too large to process. Skipping." msgstr "" -#: SourceData.cpp:487 +#: SourceData.cpp:500 #, kde-format msgid "" "The line-matching-preprocessing possibly failed. Check this command:\n" diff -Nru kdiff3-1.8.01/po/mai/kdiff3.po kdiff3-1.8.3/po/mai/kdiff3.po --- kdiff3-1.8.01/po/mai/kdiff3.po 2019-05-18 01:02:11.000000000 +0000 +++ kdiff3-1.8.3/po/mai/kdiff3.po 2020-06-25 00:18:35.000000000 +0000 @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: kdiff3\n" -"Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2019-04-18 08:02+0200\n" +"Report-Msgid-Bugs-To: https://bugs.kde.org\n" +"POT-Creation-Date: 2020-06-22 07:48+0200\n" "PO-Revision-Date: 2010-09-24 20:11+0530\n" "Last-Translator: Rajesh Ranjan \n" "Language-Team: Maithili \n" @@ -29,337 +29,337 @@ msgid "Your emails" msgstr "sangeeta09@gmail.com" -#: difftextwindow.cpp:412 +#: difftextwindow.cpp:414 #, kde-format msgid "File %1: Line %2" msgstr "" -#: difftextwindow.cpp:414 +#: difftextwindow.cpp:416 #, fuzzy, kde-format #| msgid "not available" msgid "File %1: Line not available" msgstr "उपलब्ध नहि" -#: difftextwindow.cpp:1780 +#: difftextwindow.cpp:1778 #, kde-format msgid "Encoding:" msgstr "एनकोडिंग:" -#: difftextwindow.cpp:1782 mergeresultwindow.cpp:3138 optiondialog.cpp:818 +#: difftextwindow.cpp:1781 mergeresultwindow.cpp:3166 optiondialog.cpp:840 #, kde-format msgid "Line end style:" msgstr "" -#: difftextwindow.cpp:1810 directorymergewindow.cpp:382 -#: directorymergewindow.cpp:433 directorymergewindow.cpp:524 -#: directorymergewindow.cpp:3058 directorymergewindow.cpp:3189 -#: directorymergewindow.cpp:3417 mergeresultwindow.cpp:942 -#: mergeresultwindow.cpp:944 mergeresultwindow.cpp:946 -#: mergeresultwindow.cpp:948 mergeresultwindow.cpp:1814 -#: mergeresultwindow.cpp:3170 mergeresultwindow.cpp:3177 optiondialog.cpp:962 -#: optiondialog.cpp:975 pdiff.cpp:833 pdiff.cpp:835 pdiff.cpp:837 pdiff.cpp:839 -#: pdiff.cpp:861 smalldialogs.cpp:124 smalldialogs.cpp:126 smalldialogs.cpp:127 -#: smalldialogs.cpp:130 +#: difftextwindow.cpp:1809 directorymergewindow.cpp:383 +#: directorymergewindow.cpp:434 directorymergewindow.cpp:525 +#: directorymergewindow.cpp:3072 directorymergewindow.cpp:3203 +#: directorymergewindow.cpp:3431 mergeresultwindow.cpp:970 +#: mergeresultwindow.cpp:972 mergeresultwindow.cpp:974 +#: mergeresultwindow.cpp:976 mergeresultwindow.cpp:1842 +#: mergeresultwindow.cpp:3198 mergeresultwindow.cpp:3205 optiondialog.cpp:1002 +#: optiondialog.cpp:1015 pdiff.cpp:823 pdiff.cpp:825 pdiff.cpp:827 +#: pdiff.cpp:829 pdiff.cpp:851 smalldialogs.cpp:131 smalldialogs.cpp:133 +#: smalldialogs.cpp:134 smalldialogs.cpp:137 #, kde-format msgid "A" msgstr "A" -#: difftextwindow.cpp:1810 directorymergewindow.cpp:384 -#: directorymergewindow.cpp:436 directorymergewindow.cpp:526 -#: directorymergewindow.cpp:3064 directorymergewindow.cpp:3190 -#: directorymergewindow.cpp:3418 mergeresultwindow.cpp:942 -#: mergeresultwindow.cpp:944 mergeresultwindow.cpp:950 -#: mergeresultwindow.cpp:952 mergeresultwindow.cpp:1816 -#: mergeresultwindow.cpp:3172 mergeresultwindow.cpp:3179 optiondialog.cpp:963 -#: optiondialog.cpp:976 pdiff.cpp:833 pdiff.cpp:835 pdiff.cpp:841 pdiff.cpp:843 -#: pdiff.cpp:863 smalldialogs.cpp:124 smalldialogs.cpp:125 smalldialogs.cpp:128 -#: smalldialogs.cpp:131 +#: difftextwindow.cpp:1809 directorymergewindow.cpp:385 +#: directorymergewindow.cpp:437 directorymergewindow.cpp:527 +#: directorymergewindow.cpp:3078 directorymergewindow.cpp:3204 +#: directorymergewindow.cpp:3432 mergeresultwindow.cpp:970 +#: mergeresultwindow.cpp:972 mergeresultwindow.cpp:978 +#: mergeresultwindow.cpp:980 mergeresultwindow.cpp:1844 +#: mergeresultwindow.cpp:3200 mergeresultwindow.cpp:3207 optiondialog.cpp:1003 +#: optiondialog.cpp:1016 pdiff.cpp:823 pdiff.cpp:825 pdiff.cpp:831 +#: pdiff.cpp:833 pdiff.cpp:853 smalldialogs.cpp:131 smalldialogs.cpp:132 +#: smalldialogs.cpp:135 smalldialogs.cpp:138 #, kde-format msgid "B" msgstr "B" -#: difftextwindow.cpp:1810 directorymergewindow.cpp:386 -#: directorymergewindow.cpp:439 directorymergewindow.cpp:528 -#: directorymergewindow.cpp:3070 directorymergewindow.cpp:3191 -#: directorymergewindow.cpp:3419 mergeresultwindow.cpp:946 -#: mergeresultwindow.cpp:948 mergeresultwindow.cpp:950 -#: mergeresultwindow.cpp:952 mergeresultwindow.cpp:1818 -#: mergeresultwindow.cpp:3174 mergeresultwindow.cpp:3181 optiondialog.cpp:977 -#: pdiff.cpp:837 pdiff.cpp:839 pdiff.cpp:841 pdiff.cpp:843 pdiff.cpp:865 -#: smalldialogs.cpp:125 smalldialogs.cpp:126 smalldialogs.cpp:129 -#: smalldialogs.cpp:132 +#: difftextwindow.cpp:1809 directorymergewindow.cpp:387 +#: directorymergewindow.cpp:440 directorymergewindow.cpp:529 +#: directorymergewindow.cpp:3084 directorymergewindow.cpp:3205 +#: directorymergewindow.cpp:3433 mergeresultwindow.cpp:974 +#: mergeresultwindow.cpp:976 mergeresultwindow.cpp:978 +#: mergeresultwindow.cpp:980 mergeresultwindow.cpp:1846 +#: mergeresultwindow.cpp:3202 mergeresultwindow.cpp:3209 optiondialog.cpp:1017 +#: pdiff.cpp:827 pdiff.cpp:829 pdiff.cpp:831 pdiff.cpp:833 pdiff.cpp:855 +#: smalldialogs.cpp:132 smalldialogs.cpp:133 smalldialogs.cpp:136 +#: smalldialogs.cpp:139 #, kde-format msgid "C" msgstr "C" -#: difftextwindow.cpp:1810 +#: difftextwindow.cpp:1809 #, kde-format msgid "A (Base)" msgstr "" -#: difftextwindow.cpp:1812 +#: difftextwindow.cpp:1811 #, fuzzy, kde-format #| msgid "Encoding:" msgid "Encoding: %1" msgstr "एनकोडिंग:" -#: difftextwindow.cpp:1813 mergeresultwindow.cpp:3183 +#: difftextwindow.cpp:1812 mergeresultwindow.cpp:3211 #, kde-format msgid "Unix" msgstr "" -#: difftextwindow.cpp:1813 mergeresultwindow.cpp:3184 +#: difftextwindow.cpp:1812 mergeresultwindow.cpp:3212 #, kde-format msgid "DOS" msgstr "" -#: difftextwindow.cpp:1813 +#: difftextwindow.cpp:1812 #, kde-format msgid "Line end style: %1" msgstr "" -#: difftextwindow.cpp:1835 kdiff3.cpp:873 +#: difftextwindow.cpp:1834 kdiff3.cpp:874 #, kde-format msgid "Top line" msgstr "" -#: difftextwindow.cpp:1845 +#: difftextwindow.cpp:1843 #, kde-format msgid "End" msgstr "अंत" -#: difftextwindow.cpp:1903 smalldialogs.cpp:235 +#: difftextwindow.cpp:1901 smalldialogs.cpp:245 #, fuzzy, kde-format #| msgid "File" msgid "Open File" msgstr "फाइल" -#: difftextwindow.cpp:1951 optiondialog.cpp:387 +#: difftextwindow.cpp:1943 optiondialog.cpp:389 #, kde-format msgid "Unicode, 8 bit" msgstr "" -#: difftextwindow.cpp:1966 +#: difftextwindow.cpp:1958 #, kde-format msgid "Other" msgstr "" -#: directorymergewindow.cpp:409 directorymergewindow.cpp:3424 +#: directorymergewindow.cpp:410 directorymergewindow.cpp:3438 #, kde-format msgid "Copy A to B" msgstr "" -#: directorymergewindow.cpp:412 directorymergewindow.cpp:3425 +#: directorymergewindow.cpp:413 directorymergewindow.cpp:3439 #, kde-format msgid "Copy B to A" msgstr "" -#: directorymergewindow.cpp:415 directorymergewindow.cpp:3426 +#: directorymergewindow.cpp:416 directorymergewindow.cpp:3440 #, kde-format msgid "Delete A" msgstr "" -#: directorymergewindow.cpp:418 directorymergewindow.cpp:3427 +#: directorymergewindow.cpp:419 directorymergewindow.cpp:3441 #, kde-format msgid "Delete B" msgstr "" -#: directorymergewindow.cpp:421 +#: directorymergewindow.cpp:422 #, kde-format msgid "Delete A & B" msgstr "" -#: directorymergewindow.cpp:424 directorymergewindow.cpp:3429 +#: directorymergewindow.cpp:425 directorymergewindow.cpp:3443 #, kde-format msgid "Merge to A" msgstr "" -#: directorymergewindow.cpp:427 directorymergewindow.cpp:3430 +#: directorymergewindow.cpp:428 directorymergewindow.cpp:3444 #, kde-format msgid "Merge to B" msgstr "" -#: directorymergewindow.cpp:430 +#: directorymergewindow.cpp:431 #, kde-format msgid "Merge to A & B" msgstr "" -#: directorymergewindow.cpp:442 directorymergewindow.cpp:3421 +#: directorymergewindow.cpp:443 directorymergewindow.cpp:3435 #, kde-format msgid "Delete (if exists)" msgstr "" -#: directorymergewindow.cpp:445 directorymergewindow.cpp:448 -#: directorymergewindow.cpp:3420 optiondialog.cpp:925 smalldialogs.cpp:113 +#: directorymergewindow.cpp:446 directorymergewindow.cpp:449 +#: directorymergewindow.cpp:3434 smalldialogs.cpp:120 #, kde-format msgid "Merge" msgstr "मिलाबू" -#: directorymergewindow.cpp:445 directorymergewindow.cpp:448 +#: directorymergewindow.cpp:446 directorymergewindow.cpp:449 #, kde-format msgid "Merge (manual)" msgstr "" -#: directorymergewindow.cpp:451 +#: directorymergewindow.cpp:452 #, kde-format msgid "Error: Conflicting File Types" msgstr "" -#: directorymergewindow.cpp:454 +#: directorymergewindow.cpp:455 #, kde-format msgid "Error: Changed and Deleted" msgstr "" -#: directorymergewindow.cpp:457 +#: directorymergewindow.cpp:458 #, kde-format msgid "Error: Dates are equal but files are not." msgstr "" -#: directorymergewindow.cpp:471 +#: directorymergewindow.cpp:472 #, fuzzy, kde-format #| msgid "Done." msgid "Done" msgstr "सम्पन्न" -#: directorymergewindow.cpp:473 +#: directorymergewindow.cpp:474 #, kde-format msgid "Error" msgstr "त्रुटि" -#: directorymergewindow.cpp:475 +#: directorymergewindow.cpp:476 #, kde-format msgid "Skipped." msgstr "" -#: directorymergewindow.cpp:477 +#: directorymergewindow.cpp:478 #, kde-format msgid "Not saved." msgstr "" -#: directorymergewindow.cpp:479 +#: directorymergewindow.cpp:480 #, kde-format msgid "In progress..." msgstr "" -#: directorymergewindow.cpp:481 +#: directorymergewindow.cpp:482 #, kde-format msgid "To do." msgstr "" -#: directorymergewindow.cpp:522 +#: directorymergewindow.cpp:523 #, kde-format msgid "Name" msgstr "नाम" -#: directorymergewindow.cpp:530 +#: directorymergewindow.cpp:531 #, kde-format msgid "Operation" msgstr "सँक्रिया" -#: directorymergewindow.cpp:532 +#: directorymergewindow.cpp:533 #, kde-format msgid "Status" msgstr "स्थिति" -#: directorymergewindow.cpp:534 +#: directorymergewindow.cpp:535 #, kde-format msgid "Unsolved" msgstr "" -#: directorymergewindow.cpp:536 +#: directorymergewindow.cpp:537 #, kde-format msgid "Solved" msgstr "" -#: directorymergewindow.cpp:538 +#: directorymergewindow.cpp:539 #, kde-format msgid "Nonwhite" msgstr "" -#: directorymergewindow.cpp:540 +#: directorymergewindow.cpp:541 #, kde-format msgid "White" msgstr "उज्जर" -#: directorymergewindow.cpp:674 +#: directorymergewindow.cpp:676 #, kde-format msgid "Unable to compare non-normal file with normal file." msgstr "" -#: directorymergewindow.cpp:688 +#: directorymergewindow.cpp:690 #, kde-format msgid "Mix of links and normal files." msgstr "" -#: directorymergewindow.cpp:695 +#: directorymergewindow.cpp:697 #, kde-format msgid "Link: " msgstr "" -#: directorymergewindow.cpp:704 +#: directorymergewindow.cpp:706 #, kde-format msgid "Size. " msgstr "" -#: directorymergewindow.cpp:718 directorymergewindow.cpp:728 +#: directorymergewindow.cpp:720 directorymergewindow.cpp:730 #, kde-format msgid "Date & Size: " msgstr "" -#: directorymergewindow.cpp:748 +#: directorymergewindow.cpp:751 #, kde-format msgid "Comparing file..." msgstr "" -#: directorymergewindow.cpp:801 +#: directorymergewindow.cpp:813 #, kde-format msgid "" "You are currently doing a directory merge. Are you sure, you want to abort " "the merge and rescan the directory?" msgstr "" -#: directorymergewindow.cpp:802 kdiff3.cpp:698 kdiff3.cpp:708 kdiff3.cpp:720 -#: mergeresultwindow.cpp:372 pdiff.cpp:1033 pdiff.cpp:1910 pdiff.cpp:1920 +#: directorymergewindow.cpp:814 kdiff3.cpp:697 kdiff3.cpp:707 kdiff3.cpp:719 +#: mergeresultwindow.cpp:400 pdiff.cpp:1031 pdiff.cpp:1920 pdiff.cpp:1930 #, kde-format msgid "Warning" msgstr "चेतावनी" -#: directorymergewindow.cpp:803 directorymergewindow.cpp:3393 +#: directorymergewindow.cpp:815 directorymergewindow.cpp:3407 #, kde-format msgid "Rescan" msgstr "" -#: directorymergewindow.cpp:804 pdiff.cpp:1035 +#: directorymergewindow.cpp:816 pdiff.cpp:1033 #, kde-format msgid "Continue Merging" msgstr "" -#: directorymergewindow.cpp:971 +#: directorymergewindow.cpp:984 #, kde-format msgid "Opening of directories failed:" msgstr "" -#: directorymergewindow.cpp:975 +#: directorymergewindow.cpp:988 #, kde-format msgid "Dir A \"%1\" does not exist or is not a directory.\n" msgstr "" -#: directorymergewindow.cpp:980 +#: directorymergewindow.cpp:993 #, kde-format msgid "Dir B \"%1\" does not exist or is not a directory.\n" msgstr "" -#: directorymergewindow.cpp:985 +#: directorymergewindow.cpp:998 #, kde-format msgid "Dir C \"%1\" does not exist or is not a directory.\n" msgstr "" -#: directorymergewindow.cpp:988 +#: directorymergewindow.cpp:1001 #, kde-format msgid "Directory Open Error" msgstr "" -#: directorymergewindow.cpp:996 +#: directorymergewindow.cpp:1009 #, kde-format msgid "" "The destination directory must not be the same as A or B when three " @@ -367,49 +367,49 @@ "Check again before continuing." msgstr "" -#: directorymergewindow.cpp:998 +#: directorymergewindow.cpp:1011 #, kde-format msgid "Parameter Warning" msgstr "" -#: directorymergewindow.cpp:1003 +#: directorymergewindow.cpp:1016 #, kde-format msgid "Scanning directories..." msgstr "" -#: directorymergewindow.cpp:1029 +#: directorymergewindow.cpp:1042 #, kde-format msgid "Reading Directory A" msgstr "" -#: directorymergewindow.cpp:1038 +#: directorymergewindow.cpp:1051 #, kde-format msgid "Reading Directory B" msgstr "" -#: directorymergewindow.cpp:1048 +#: directorymergewindow.cpp:1061 #, kde-format msgid "Reading Directory C" msgstr "" -#: directorymergewindow.cpp:1064 +#: directorymergewindow.cpp:1077 #, kde-format msgid "Some subdirectories were not readable in" msgstr "" -#: directorymergewindow.cpp:1069 +#: directorymergewindow.cpp:1082 #, kde-format msgid "Check the permissions of the subdirectories." msgstr "" -#: directorymergewindow.cpp:1106 kdiff3.cpp:666 kdiff3.cpp:753 kdiff3.cpp:777 -#: kdiff3.cpp:1065 kdiff3.cpp:1086 pdiff.cpp:1116 pdiff.cpp:1170 pdiff.cpp:1218 -#: pdiff.cpp:1234 pdiff.cpp:1277 pdiff.cpp:1301 +#: directorymergewindow.cpp:1119 kdiff3.cpp:665 kdiff3.cpp:752 kdiff3.cpp:776 +#: kdiff3.cpp:1072 kdiff3.cpp:1093 pdiff.cpp:1115 pdiff.cpp:1178 pdiff.cpp:1228 +#: pdiff.cpp:1244 pdiff.cpp:1287 pdiff.cpp:1311 #, kde-format msgid "Ready." msgstr "" -#: directorymergewindow.cpp:1121 +#: directorymergewindow.cpp:1134 #, kde-format msgid "" "Directory Comparison Status\n" @@ -419,66 +419,66 @@ "Number of different files: %3" msgstr "" -#: directorymergewindow.cpp:1128 +#: directorymergewindow.cpp:1141 #, kde-format msgid "Number of manual merges: %1" msgstr "" -#: directorymergewindow.cpp:1394 +#: directorymergewindow.cpp:1407 #, kde-format msgid "This affects all merge operations." msgstr "" -#: directorymergewindow.cpp:1395 +#: directorymergewindow.cpp:1408 #, kde-format msgid "Changing All Merge Operations" msgstr "" -#: directorymergewindow.cpp:1695 +#: directorymergewindow.cpp:1708 #, kde-format msgid "" "Processing %1 / %2\n" "%3" msgstr "" -#: directorymergewindow.cpp:1738 directorymergewindow.cpp:1742 +#: directorymergewindow.cpp:1751 directorymergewindow.cpp:1755 #, kde-format msgid "Some files could not be processed." msgstr "" -#: directorymergewindow.cpp:2222 directorymergewindow.cpp:2247 -#: directorymergewindow.cpp:2271 +#: directorymergewindow.cpp:2235 directorymergewindow.cpp:2260 +#: directorymergewindow.cpp:2285 #, kde-format msgid "This operation is currently not possible." msgstr "" -#: directorymergewindow.cpp:2222 directorymergewindow.cpp:2247 -#: directorymergewindow.cpp:2271 directorymergewindow.cpp:2552 +#: directorymergewindow.cpp:2235 directorymergewindow.cpp:2260 +#: directorymergewindow.cpp:2285 directorymergewindow.cpp:2565 #, kde-format msgid "Operation Not Possible" msgstr "" -#: directorymergewindow.cpp:2318 +#: directorymergewindow.cpp:2332 #, kde-format msgid "An error occurred while copying." msgstr "" -#: directorymergewindow.cpp:2319 directorymergewindow.cpp:2759 +#: directorymergewindow.cpp:2333 directorymergewindow.cpp:2772 #, kde-format msgid "Merge Error" msgstr "" -#: directorymergewindow.cpp:2396 +#: directorymergewindow.cpp:2410 #, kde-format msgid "Unknown merge operation. (This must never happen!)" msgstr "" -#: directorymergewindow.cpp:2441 +#: directorymergewindow.cpp:2455 #, kde-format msgid "Unknown merge operation." msgstr "" -#: directorymergewindow.cpp:2454 +#: directorymergewindow.cpp:2468 #, kde-format msgid "" "The merge is about to begin.\n" @@ -491,50 +491,50 @@ "whatsoever! Make backups of your vital data!" msgstr "" -#: directorymergewindow.cpp:2459 +#: directorymergewindow.cpp:2473 #, kde-format msgid "Starting Merge" msgstr "" -#: directorymergewindow.cpp:2460 +#: directorymergewindow.cpp:2474 #, kde-format msgid "Do It" msgstr "" -#: directorymergewindow.cpp:2461 +#: directorymergewindow.cpp:2475 #, kde-format msgid "Simulate It" msgstr "" -#: directorymergewindow.cpp:2487 +#: directorymergewindow.cpp:2501 #, kde-format msgid "" "The highlighted item has a different type in the different directories. " "Select what to do." msgstr "" -#: directorymergewindow.cpp:2491 +#: directorymergewindow.cpp:2505 #, kde-format msgid "" "The modification dates of the file are equal but the files are not. Select " "what to do." msgstr "" -#: directorymergewindow.cpp:2495 +#: directorymergewindow.cpp:2509 #, kde-format msgid "" "The highlighted item was changed in one directory and deleted in the other. " "Select what to do." msgstr "" -#: directorymergewindow.cpp:2552 +#: directorymergewindow.cpp:2565 #, kde-format msgid "" "This operation is currently not possible because directory merge is " "currently running." msgstr "" -#: directorymergewindow.cpp:2609 +#: directorymergewindow.cpp:2622 #, kde-format msgid "" "There was an error in the last step.\n" @@ -542,970 +542,975 @@ "to skip this item?" msgstr "" -#: directorymergewindow.cpp:2611 +#: directorymergewindow.cpp:2624 #, kde-format msgid "Continue merge after an error" msgstr "" -#: directorymergewindow.cpp:2612 +#: directorymergewindow.cpp:2625 #, kde-format msgid "Continue With Last Item" msgstr "" -#: directorymergewindow.cpp:2613 +#: directorymergewindow.cpp:2626 #, kde-format msgid "Skip Item" msgstr "" -#: directorymergewindow.cpp:2709 +#: directorymergewindow.cpp:2722 #, kde-format msgid "Merge operation complete." msgstr "" -#: directorymergewindow.cpp:2709 directorymergewindow.cpp:2712 +#: directorymergewindow.cpp:2722 directorymergewindow.cpp:2725 #, kde-format msgid "Merge Complete" msgstr "" -#: directorymergewindow.cpp:2722 +#: directorymergewindow.cpp:2735 #, kde-format msgid "" "Simulated merge complete: Check if you agree with the proposed operations." msgstr "" -#: directorymergewindow.cpp:2758 +#: directorymergewindow.cpp:2771 #, kde-format msgid "An error occurred. Press OK to see detailed information." msgstr "" -#: directorymergewindow.cpp:2791 +#: directorymergewindow.cpp:2804 #, kde-format msgid "Error: While deleting %1: Creating backup failed." msgstr "" -#: directorymergewindow.cpp:2798 +#: directorymergewindow.cpp:2811 #, kde-format msgid "delete directory recursively( %1 )" msgstr "" -#: directorymergewindow.cpp:2800 +#: directorymergewindow.cpp:2813 #, kde-format msgid "delete( %1 )" msgstr "" -#: directorymergewindow.cpp:2815 +#: directorymergewindow.cpp:2828 #, kde-format msgid "Error: delete dir operation failed while trying to read the directory." msgstr "" -#: directorymergewindow.cpp:2834 +#: directorymergewindow.cpp:2847 #, kde-format msgid "Error: rmdir( %1 ) operation failed." msgstr "" -#: directorymergewindow.cpp:2844 +#: directorymergewindow.cpp:2857 #, kde-format msgid "Error: delete operation failed." msgstr "" -#: directorymergewindow.cpp:2870 +#: directorymergewindow.cpp:2884 #, kde-format msgid "manual merge( %1, %2, %3 -> %4)" msgstr "" -#: directorymergewindow.cpp:2873 +#: directorymergewindow.cpp:2887 #, kde-format msgid "" " Note: After a manual merge the user should continue by pressing F7." msgstr "" -#: directorymergewindow.cpp:2900 +#: directorymergewindow.cpp:2914 #, kde-format msgid "Error: copy( %1 -> %2 ) failed.Deleting existing destination failed." msgstr "" -#: directorymergewindow.cpp:2909 +#: directorymergewindow.cpp:2923 #, kde-format msgid "copyLink( %1 -> %2 )" msgstr "" -#: directorymergewindow.cpp:2918 +#: directorymergewindow.cpp:2932 #, kde-format msgid "Error: copyLink failed: Remote links are not yet supported." msgstr "" -#: directorymergewindow.cpp:2928 +#: directorymergewindow.cpp:2942 #, kde-format msgid "Error: copyLink failed." msgstr "" -#: directorymergewindow.cpp:2953 +#: directorymergewindow.cpp:2967 #, kde-format msgid "copy( %1 -> %2 )" msgstr "" -#: directorymergewindow.cpp:2979 +#: directorymergewindow.cpp:2993 #, kde-format msgid "Error during rename( %1 -> %2 ): Cannot delete existing destination." msgstr "" -#: directorymergewindow.cpp:2986 +#: directorymergewindow.cpp:3000 #, kde-format msgid "rename( %1 -> %2 )" msgstr "" -#: directorymergewindow.cpp:2995 +#: directorymergewindow.cpp:3009 #, kde-format msgid "Error: Rename failed." msgstr "" -#: directorymergewindow.cpp:3013 +#: directorymergewindow.cpp:3027 #, kde-format msgid "Error during makeDir of %1. Cannot delete existing file." msgstr "" -#: directorymergewindow.cpp:3030 +#: directorymergewindow.cpp:3044 #, kde-format msgid "makeDir( %1 )" msgstr "" -#: directorymergewindow.cpp:3040 +#: directorymergewindow.cpp:3054 #, kde-format msgid "Error while creating directory." msgstr "" -#: directorymergewindow.cpp:3076 directorymergewindow.cpp:3195 +#: directorymergewindow.cpp:3090 directorymergewindow.cpp:3209 #, kde-format msgid "Dest" msgstr "" -#: directorymergewindow.cpp:3084 directorymergewindow.cpp:3113 +#: directorymergewindow.cpp:3098 directorymergewindow.cpp:3127 #, kde-format msgid "Dir" msgstr "निर्देशिका" -#: directorymergewindow.cpp:3084 +#: directorymergewindow.cpp:3098 #, kde-format msgid "Type" msgstr "प्रकार" -#: directorymergewindow.cpp:3084 +#: directorymergewindow.cpp:3098 #, kde-format msgid "Size" msgstr "आकार" -#: directorymergewindow.cpp:3085 +#: directorymergewindow.cpp:3099 #, kde-format msgid "Attr" msgstr "" -#: directorymergewindow.cpp:3085 +#: directorymergewindow.cpp:3099 #, kde-format msgid "Last Modification" msgstr "" -#: directorymergewindow.cpp:3085 +#: directorymergewindow.cpp:3099 #, kde-format msgid "Link-Destination" msgstr "" -#: directorymergewindow.cpp:3113 +#: directorymergewindow.cpp:3127 #, kde-format msgid "File" msgstr "फाइल" -#: directorymergewindow.cpp:3113 +#: directorymergewindow.cpp:3127 #, kde-format msgid "-Link" msgstr "" -#: directorymergewindow.cpp:3119 +#: directorymergewindow.cpp:3133 #, kde-format msgid "not available" msgstr "उपलब्ध नहि" -#: directorymergewindow.cpp:3137 +#: directorymergewindow.cpp:3151 #, kde-format msgid "A (Dest): " msgstr "" -#: directorymergewindow.cpp:3141 +#: directorymergewindow.cpp:3155 #, kde-format msgid "A: " msgstr "" -#: directorymergewindow.cpp:3141 +#: directorymergewindow.cpp:3155 #, kde-format msgid "A (Base): " msgstr "" -#: directorymergewindow.cpp:3147 +#: directorymergewindow.cpp:3161 #, kde-format msgid "B (Dest): " msgstr "" -#: directorymergewindow.cpp:3151 +#: directorymergewindow.cpp:3165 #, kde-format msgid "B: " msgstr "" -#: directorymergewindow.cpp:3156 +#: directorymergewindow.cpp:3170 #, kde-format msgid "C (Dest): " msgstr "" -#: directorymergewindow.cpp:3160 +#: directorymergewindow.cpp:3174 #, kde-format msgid "C: " msgstr "" -#: directorymergewindow.cpp:3163 +#: directorymergewindow.cpp:3177 #, kde-format msgid "Dest: " msgstr "" #. i18n("Saving Directory Merge State ...")); -#: directorymergewindow.cpp:3238 +#: directorymergewindow.cpp:3252 #, kde-format msgid "Save Directory Merge State As..." msgstr "" -#: directorymergewindow.cpp:3387 +#: directorymergewindow.cpp:3401 #, kde-format msgid "Start/Continue Directory Merge" msgstr "" -#: directorymergewindow.cpp:3388 +#: directorymergewindow.cpp:3402 #, kde-format msgid "Run Operation for Current Item" msgstr "" -#: directorymergewindow.cpp:3389 +#: directorymergewindow.cpp:3403 #, kde-format msgid "Compare Selected File" msgstr "" -#: directorymergewindow.cpp:3390 +#: directorymergewindow.cpp:3404 #, kde-format msgid "Merge Current File" msgstr "" -#: directorymergewindow.cpp:3390 +#: directorymergewindow.cpp:3404 #, kde-format msgid "" "Merge\n" "File" msgstr "" -#: directorymergewindow.cpp:3391 +#: directorymergewindow.cpp:3405 #, kde-format msgid "Fold All Subdirs" msgstr "" -#: directorymergewindow.cpp:3392 +#: directorymergewindow.cpp:3406 #, kde-format msgid "Unfold All Subdirs" msgstr "" #. i18n("Save Directory Merge State ..."), 0, this, &DirectoryMergeWindow::slotSaveMergeState, ac, "dir_save_merge_state"); #. i18n("Load Directory Merge State ..."), 0, this, &DirectoryMergeWindow::slotLoadMergeState, ac, "dir_load_merge_state"); -#: directorymergewindow.cpp:3396 +#: directorymergewindow.cpp:3410 #, kde-format msgid "Choose A for All Items" msgstr "" -#: directorymergewindow.cpp:3397 +#: directorymergewindow.cpp:3411 #, kde-format msgid "Choose B for All Items" msgstr "" -#: directorymergewindow.cpp:3398 +#: directorymergewindow.cpp:3412 #, kde-format msgid "Choose C for All Items" msgstr "" -#: directorymergewindow.cpp:3399 +#: directorymergewindow.cpp:3413 #, kde-format msgid "Auto-Choose Operation for All Items" msgstr "" -#: directorymergewindow.cpp:3400 +#: directorymergewindow.cpp:3414 #, kde-format msgid "No Operation for All Items" msgstr "" #. i18n("Synchronize Directories"), 0, this, &DirectoryMergeWindow::slotSynchronizeDirectories, ac, "dir_synchronize_directories"); #. d->m_pDirChooseNewerFiles = GuiUtils::createAction< KToggleAction >(i18n("Copy Newer Files Instead of Merging"), 0, this, &DirectoryMergeWindow::slotChooseNewerFiles, ac, "dir_choose_newer_files"); -#: directorymergewindow.cpp:3405 +#: directorymergewindow.cpp:3419 #, kde-format msgid "Show Identical Files" msgstr "" -#: directorymergewindow.cpp:3405 +#: directorymergewindow.cpp:3419 #, kde-format msgid "" "Identical\n" "Files" msgstr "" -#: directorymergewindow.cpp:3406 +#: directorymergewindow.cpp:3420 #, kde-format msgid "Show Different Files" msgstr "" -#: directorymergewindow.cpp:3407 +#: directorymergewindow.cpp:3421 #, kde-format msgid "Show Files only in A" msgstr "" -#: directorymergewindow.cpp:3407 +#: directorymergewindow.cpp:3421 #, kde-format msgid "" "Files\n" "only in A" msgstr "" -#: directorymergewindow.cpp:3408 +#: directorymergewindow.cpp:3422 #, kde-format msgid "Show Files only in B" msgstr "" -#: directorymergewindow.cpp:3408 +#: directorymergewindow.cpp:3422 #, kde-format msgid "" "Files\n" "only in B" msgstr "" -#: directorymergewindow.cpp:3409 +#: directorymergewindow.cpp:3423 #, kde-format msgid "Show Files only in C" msgstr "" -#: directorymergewindow.cpp:3409 +#: directorymergewindow.cpp:3423 #, kde-format msgid "" "Files\n" "only in C" msgstr "" -#: directorymergewindow.cpp:3413 +#: directorymergewindow.cpp:3427 #, kde-format msgid "Compare Explicitly Selected Files" msgstr "" -#: directorymergewindow.cpp:3414 +#: directorymergewindow.cpp:3428 #, kde-format msgid "Merge Explicitly Selected Files" msgstr "" -#: directorymergewindow.cpp:3416 directorymergewindow.cpp:3423 +#: directorymergewindow.cpp:3430 directorymergewindow.cpp:3437 #, kde-format msgid "Do Nothing" msgstr "किछु नहि करू" -#: directorymergewindow.cpp:3428 +#: directorymergewindow.cpp:3442 #, kde-format msgid "Delete A && B" msgstr "" -#: directorymergewindow.cpp:3431 +#: directorymergewindow.cpp:3445 #, kde-format msgid "Merge to A && B" msgstr "" -#: fileaccess.cpp:462 SourceData.cpp:493 +#: fileaccess.cpp:301 +#, kde-format +msgid "Unable to determine full url. No parent specified." +msgstr "" + +#: fileaccess.cpp:482 SourceData.cpp:506 #, kde-format msgid "Failed to read file: %1" msgstr "" -#: fileaccess.cpp:587 +#: fileaccess.cpp:624 #, kde-format msgid "Creating temp copy of %1 failed." msgstr "" -#: fileaccess.cpp:595 fileaccess.cpp:600 +#: fileaccess.cpp:632 fileaccess.cpp:637 #, kde-format msgid "Opening %1 failed. %2" msgstr "" -#: fileaccess.cpp:619 fileaccess.cpp:627 +#: fileaccess.cpp:656 fileaccess.cpp:664 #, kde-format msgid "Error reading from %1. %2" msgstr "" -#: fileaccess.cpp:751 +#: fileaccess.cpp:788 #, kde-format msgid "" "While trying to make a backup, deleting an older backup failed.\n" "Filename: %1" msgstr "" -#: fileaccess.cpp:758 +#: fileaccess.cpp:795 #, kde-format msgid "" "While trying to make a backup, renaming failed.\n" "Filenames: %1 -> %2" msgstr "" -#: fileaccess.cpp:828 +#: fileaccess.cpp:865 #, kde-format msgid "Getting file status: %1" msgstr "" -#: fileaccess.cpp:869 +#: fileaccess.cpp:906 #, kde-format msgid "Reading file: %1" msgstr "" -#: fileaccess.cpp:907 +#: fileaccess.cpp:944 #, kde-format msgid "Writing file: %1" msgstr "" -#: fileaccess.cpp:940 +#: fileaccess.cpp:977 #, kde-format msgid "Out of memory" msgstr "स्मृति सँ बाहर" -#: fileaccess.cpp:976 +#: fileaccess.cpp:1013 #, kde-format msgid "Making directory: %1" msgstr "" -#: fileaccess.cpp:997 +#: fileaccess.cpp:1034 #, kde-format msgid "Removing directory: %1" msgstr "" -#: fileaccess.cpp:1012 +#: fileaccess.cpp:1049 #, kde-format msgid "Removing file: %1" msgstr "" -#: fileaccess.cpp:1028 +#: fileaccess.cpp:1065 #, kde-format msgid "Creating symbolic link: %1 -> %2" msgstr "" -#: fileaccess.cpp:1052 +#: fileaccess.cpp:1089 #, kde-format msgid "Renaming file: %1 -> %2" msgstr "" -#: fileaccess.cpp:1086 +#: fileaccess.cpp:1123 #, kde-format msgid "Copying file: %1 -> %2" msgstr "" -#: fileaccess.cpp:1108 +#: fileaccess.cpp:1145 #, fuzzy, kde-format #| msgid "Directory" msgid "Reading directory: %1" msgstr "निर्देशिका" -#: fileaccess.cpp:1162 +#: fileaccess.cpp:1202 #, kde-format msgid "Listing directory: %1" msgstr "" -#: kdiff3.cpp:181 +#: kdiff3.cpp:182 #, kde-format msgid "Current Configuration:" msgstr "" -#: kdiff3.cpp:186 +#: kdiff3.cpp:187 #, kde-format msgid "Config Option Error:" msgstr "" -#: kdiff3.cpp:240 +#: kdiff3.cpp:246 #, kde-format msgid "Option --auto used, but no output file specified." msgstr "" -#: kdiff3.cpp:416 +#: kdiff3.cpp:405 #, kde-format msgid "Option --auto ignored for directory comparison." msgstr "" -#: kdiff3.cpp:460 +#: kdiff3.cpp:449 #, kde-format msgid "Saving failed." msgstr "" -#: kdiff3.cpp:496 pdiff.cpp:1098 +#: kdiff3.cpp:494 pdiff.cpp:1096 #, kde-format msgid "Opening of these files failed:" msgstr "" -#: kdiff3.cpp:505 +#: kdiff3.cpp:503 pdiff.cpp:1105 #, kde-format -msgid "File Open Error" +msgid "File open error" msgstr "" -#: kdiff3.cpp:533 +#: kdiff3.cpp:532 #, kde-format msgid "Opens documents for comparison..." msgstr "" -#: kdiff3.cpp:535 +#: kdiff3.cpp:534 #, kde-format msgid "Reload" msgstr "पुनः लोड करू" -#: kdiff3.cpp:538 +#: kdiff3.cpp:537 #, kde-format msgid "Saves the merge result. All conflicts must be solved!" msgstr "" -#: kdiff3.cpp:540 +#: kdiff3.cpp:539 #, kde-format msgid "Saves the current document as..." msgstr "" -#: kdiff3.cpp:543 +#: kdiff3.cpp:542 #, kde-format msgid "Print the differences" msgstr "" -#: kdiff3.cpp:546 +#: kdiff3.cpp:545 #, kde-format msgid "Quits the application" msgstr "" -#: kdiff3.cpp:549 +#: kdiff3.cpp:548 #, kde-format msgid "Cuts the selected section and puts it to the clipboard" msgstr "" -#: kdiff3.cpp:552 +#: kdiff3.cpp:551 #, kde-format msgid "Copies the selected section to the clipboard" msgstr "" -#: kdiff3.cpp:554 +#: kdiff3.cpp:553 #, kde-format msgid "Pastes the clipboard contents to current position" msgstr "" -#: kdiff3.cpp:557 +#: kdiff3.cpp:556 #, kde-format msgid "Select everything in current window" msgstr "" -#: kdiff3.cpp:560 +#: kdiff3.cpp:559 #, kde-format msgid "Search for a string" msgstr "स्ट्रिंग लेल ढूँढू" -#: kdiff3.cpp:562 +#: kdiff3.cpp:561 #, kde-format msgid "Search again for the string" msgstr "" -#: kdiff3.cpp:567 +#: kdiff3.cpp:566 #, kde-format msgid "Enables/disables the statusbar" msgstr "" -#: kdiff3.cpp:571 +#: kdiff3.cpp:570 #, kde-format msgid "Configure KDiff3..." msgstr "" -#: kdiff3.cpp:590 +#: kdiff3.cpp:589 #, kde-format msgid "Go to Current Delta" msgstr "" -#: kdiff3.cpp:590 +#: kdiff3.cpp:589 #, kde-format msgid "" "Current\n" "Delta" msgstr "" -#: kdiff3.cpp:592 +#: kdiff3.cpp:591 #, kde-format msgid "Go to First Delta" msgstr "" -#: kdiff3.cpp:592 +#: kdiff3.cpp:591 #, kde-format msgid "" "First\n" "Delta" msgstr "" -#: kdiff3.cpp:594 +#: kdiff3.cpp:593 #, kde-format msgid "Go to Last Delta" msgstr "" -#: kdiff3.cpp:594 +#: kdiff3.cpp:593 #, kde-format msgid "" "Last\n" "Delta" msgstr "" -#: kdiff3.cpp:596 +#: kdiff3.cpp:595 #, kde-format msgid "(Skips white space differences when \"Show White Space\" is disabled.)" msgstr "" -#: kdiff3.cpp:597 +#: kdiff3.cpp:596 #, kde-format msgid "" "(Does not skip white space differences even when \"Show White Space\" is " "disabled.)" msgstr "" -#: kdiff3.cpp:598 +#: kdiff3.cpp:597 #, kde-format msgid "Go to Previous Delta" msgstr "" -#: kdiff3.cpp:598 +#: kdiff3.cpp:597 #, kde-format msgid "" "Prev\n" "Delta" msgstr "" -#: kdiff3.cpp:600 +#: kdiff3.cpp:599 #, kde-format msgid "Go to Next Delta" msgstr "" -#: kdiff3.cpp:600 +#: kdiff3.cpp:599 #, kde-format msgid "" "Next\n" "Delta" msgstr "" -#: kdiff3.cpp:602 +#: kdiff3.cpp:601 #, kde-format msgid "Go to Previous Conflict" msgstr "" -#: kdiff3.cpp:602 +#: kdiff3.cpp:601 #, kde-format msgid "" "Prev\n" "Conflict" msgstr "" -#: kdiff3.cpp:604 +#: kdiff3.cpp:603 #, kde-format msgid "Go to Next Conflict" msgstr "" -#: kdiff3.cpp:604 +#: kdiff3.cpp:603 #, kde-format msgid "" "Next\n" "Conflict" msgstr "" -#: kdiff3.cpp:606 +#: kdiff3.cpp:605 #, kde-format msgid "Go to Previous Unsolved Conflict" msgstr "" -#: kdiff3.cpp:606 +#: kdiff3.cpp:605 #, kde-format msgid "" "Prev\n" "Unsolved" msgstr "" -#: kdiff3.cpp:608 +#: kdiff3.cpp:607 #, kde-format msgid "Go to Next Unsolved Conflict" msgstr "" -#: kdiff3.cpp:608 +#: kdiff3.cpp:607 #, kde-format msgid "" "Next\n" "Unsolved" msgstr "" -#: kdiff3.cpp:610 +#: kdiff3.cpp:609 #, kde-format msgid "Select Line(s) From A" msgstr "" -#: kdiff3.cpp:610 +#: kdiff3.cpp:609 #, kde-format msgid "" "Choose\n" "A" msgstr "" -#: kdiff3.cpp:611 +#: kdiff3.cpp:610 #, kde-format msgid "Select Line(s) From B" msgstr "" -#: kdiff3.cpp:611 +#: kdiff3.cpp:610 #, kde-format msgid "" "Choose\n" "B" msgstr "" -#: kdiff3.cpp:612 +#: kdiff3.cpp:611 #, kde-format msgid "Select Line(s) From C" msgstr "" -#: kdiff3.cpp:612 +#: kdiff3.cpp:611 #, kde-format msgid "" "Choose\n" "C" msgstr "" -#: kdiff3.cpp:613 +#: kdiff3.cpp:612 #, kde-format msgid "Automatically Go to Next Unsolved Conflict After Source Selection" msgstr "" -#: kdiff3.cpp:613 +#: kdiff3.cpp:612 #, kde-format msgid "" "Auto\n" "Next" msgstr "" -#: kdiff3.cpp:615 +#: kdiff3.cpp:614 #, kde-format msgid "Show Space && Tabulator Characters" msgstr "" -#: kdiff3.cpp:615 +#: kdiff3.cpp:614 #, kde-format msgid "" "White\n" "Characters" msgstr "" -#: kdiff3.cpp:616 +#: kdiff3.cpp:615 #, kde-format msgid "Show White Space" msgstr "" -#: kdiff3.cpp:616 +#: kdiff3.cpp:615 #, kde-format msgid "" "White\n" "Deltas" msgstr "" -#: kdiff3.cpp:618 +#: kdiff3.cpp:617 #, kde-format msgid "Show Line Numbers" msgstr "पंक्ति सँख्यासभ देखाबू" -#: kdiff3.cpp:618 +#: kdiff3.cpp:617 #, kde-format msgid "" "Line\n" "Numbers" msgstr "" -#: kdiff3.cpp:620 +#: kdiff3.cpp:619 #, kde-format msgid "Automatically Solve Simple Conflicts" msgstr "" -#: kdiff3.cpp:621 +#: kdiff3.cpp:620 #, kde-format msgid "Set Deltas to Conflicts" msgstr "" -#: kdiff3.cpp:622 +#: kdiff3.cpp:621 #, kde-format msgid "Run Regular Expression Auto Merge" msgstr "" -#: kdiff3.cpp:623 +#: kdiff3.cpp:622 #, kde-format msgid "Automatically Solve History Conflicts" msgstr "" -#: kdiff3.cpp:624 +#: kdiff3.cpp:623 #, kde-format msgid "Split Diff At Selection" msgstr "" -#: kdiff3.cpp:625 +#: kdiff3.cpp:624 #, kde-format msgid "Join Selected Diffs" msgstr "" -#: kdiff3.cpp:627 +#: kdiff3.cpp:626 #, kde-format msgid "Show Window A" msgstr "" -#: kdiff3.cpp:628 +#: kdiff3.cpp:627 #, kde-format msgid "Show Window B" msgstr "" -#: kdiff3.cpp:629 +#: kdiff3.cpp:628 #, kde-format msgid "Show Window C" msgstr "" -#: kdiff3.cpp:631 +#: kdiff3.cpp:630 #, kde-format msgid "Normal Overview" msgstr "" -#: kdiff3.cpp:632 +#: kdiff3.cpp:631 #, kde-format msgid "A vs. B Overview" msgstr "" -#: kdiff3.cpp:633 +#: kdiff3.cpp:632 #, kde-format msgid "A vs. C Overview" msgstr "" -#: kdiff3.cpp:634 +#: kdiff3.cpp:633 #, kde-format msgid "B vs. C Overview" msgstr "" -#: kdiff3.cpp:635 +#: kdiff3.cpp:634 #, kde-format msgid "Word Wrap Diff Windows" msgstr "" -#: kdiff3.cpp:636 +#: kdiff3.cpp:635 #, kde-format msgid "Add Manual Diff Alignment" msgstr "" -#: kdiff3.cpp:637 +#: kdiff3.cpp:636 #, kde-format msgid "Clear All Manual Diff Alignments" msgstr "" -#: kdiff3.cpp:639 +#: kdiff3.cpp:638 #, kde-format msgid "Focus Next Window" msgstr "" -#: kdiff3.cpp:640 +#: kdiff3.cpp:639 #, kde-format msgid "Focus Prev Window" msgstr "" -#: kdiff3.cpp:641 +#: kdiff3.cpp:640 #, kde-format msgid "Toggle Split Orientation" msgstr "" -#: kdiff3.cpp:643 +#: kdiff3.cpp:642 #, kde-format msgid "Dir && Text Split Screen View" msgstr "" -#: kdiff3.cpp:645 +#: kdiff3.cpp:644 #, kde-format msgid "Toggle Between Dir && Text View" msgstr "" -#: kdiff3.cpp:697 pdiff.cpp:1909 +#: kdiff3.cpp:696 pdiff.cpp:1919 #, kde-format msgid "The merge result has not been saved." msgstr "" -#: kdiff3.cpp:699 +#: kdiff3.cpp:698 #, kde-format msgid "Save && Quit" msgstr "" -#: kdiff3.cpp:700 +#: kdiff3.cpp:699 #, kde-format msgid "Quit Without Saving" msgstr "" -#: kdiff3.cpp:708 pdiff.cpp:1920 +#: kdiff3.cpp:707 pdiff.cpp:1930 #, kde-format msgid "Saving the merge result failed." msgstr "" -#: kdiff3.cpp:719 pdiff.cpp:1032 +#: kdiff3.cpp:718 pdiff.cpp:1030 #, kde-format msgid "" "You are currently doing a directory merge. Are you sure, you want to abort?" msgstr "" -#: kdiff3.cpp:742 +#: kdiff3.cpp:741 #, kde-format msgid "Saving file..." msgstr "" -#: kdiff3.cpp:759 +#: kdiff3.cpp:758 #, kde-format msgid "Saving file with a new filename..." msgstr "" -#: kdiff3.cpp:761 +#: kdiff3.cpp:760 #, kde-format msgid "Save As..." msgstr "एहन सहेजू..." -#: kdiff3.cpp:820 +#: kdiff3.cpp:819 #, kde-format msgid "Printing not implemented." msgstr "" -#: kdiff3.cpp:857 +#: kdiff3.cpp:858 #, kde-format msgid "Printing..." msgstr "छपाइ भए रहल अछि..." -#: kdiff3.cpp:943 +#: kdiff3.cpp:948 #, kde-format msgid "Printing page %1 of %2" msgstr "" -#: kdiff3.cpp:1000 +#: kdiff3.cpp:1006 #, fuzzy, kde-format #| msgid "Selection" msgid " (Selection)" msgstr "चुनाव" -#: kdiff3.cpp:1027 +#: kdiff3.cpp:1034 #, kde-format msgid "Printing completed." msgstr "" -#: kdiff3.cpp:1031 +#: kdiff3.cpp:1038 #, kde-format msgid "Printing aborted." msgstr "" -#: kdiff3.cpp:1038 +#: kdiff3.cpp:1045 #, kde-format msgid "Exiting..." msgstr "" -#: kdiff3.cpp:1049 +#: kdiff3.cpp:1056 #, kde-format msgid "Toggling toolbar..." msgstr "" -#: kdiff3.cpp:1070 +#: kdiff3.cpp:1077 #, kde-format msgid "Toggle the statusbar..." msgstr "" @@ -1531,7 +1536,7 @@ msgid "Joachim Eibl" msgstr "" -#: kdiff3_part.cpp:173 kdiff3_part.cpp:254 +#: kdiff3_part.cpp:174 kdiff3_part.cpp:255 #, kde-format msgid "Could not find files for comparison." msgstr "" @@ -1551,7 +1556,7 @@ msgstr "बिन्यस्त करू" #. i18n: ectx: ToolBar (mainToolBar) -#: kdiff3_part.rc:16 main.cpp:88 +#: kdiff3_part.rc:16 main.cpp:89 #, fuzzy, kde-format #| msgid "Diff" msgid "KDiff3" @@ -1620,198 +1625,204 @@ msgid "Main Toolbar" msgstr "मुख्य अओजार पट्टी" -#: main.cpp:68 main.cpp:72 +#: main.cpp:69 main.cpp:73 #, kde-format msgid "Ignored. (User defined.)" msgstr "" -#: main.cpp:92 +#: main.cpp:93 #, kde-format msgid " (64 bit)" msgstr "" -#: main.cpp:94 +#: main.cpp:95 #, kde-format msgid " (32 bit)" msgstr "" -#: main.cpp:95 +#: main.cpp:96 #, kde-format msgid "Tool for Comparison and Merge of Files and Directories" msgstr "" -#: main.cpp:96 +#: main.cpp:97 #, kde-format msgid "(c) 2002-2014 Joachim Eibl, (c) 2017 Michael Reeves KF5/Qt5 port" msgstr "" -#: main.cpp:112 +#: main.cpp:113 #, kde-format msgid "Merge the input." msgstr "" -#: main.cpp:113 +#: main.cpp:114 #, kde-format msgid "Explicit base file. For compatibility with certain tools." msgstr "" -#: main.cpp:114 +#: main.cpp:115 #, kde-format msgid "Output file. Implies -m. E.g.: -o newfile.txt" msgstr "" -#: main.cpp:115 +#: main.cpp:116 #, kde-format msgid "Output file, again. (For compatibility with certain tools.)" msgstr "" -#: main.cpp:116 +#: main.cpp:118 #, kde-format msgid "No GUI if all conflicts are auto-solvable. (Needs -o file)" msgstr "" -#: main.cpp:117 +#: main.cpp:120 +#, fuzzy, kde-format +#| msgid "Ignore" +msgid "Ignored." +msgstr "उपेक्षा" + +#: main.cpp:122 #, kde-format msgid "Do not solve conflicts automatically." msgstr "" -#: main.cpp:118 +#: main.cpp:123 #, kde-format msgid "Visible name replacement for input file 1 (base)." msgstr "" -#: main.cpp:119 +#: main.cpp:124 #, kde-format msgid "Visible name replacement for input file 2." msgstr "" -#: main.cpp:120 +#: main.cpp:125 #, kde-format msgid "Visible name replacement for input file 3." msgstr "" -#: main.cpp:121 +#: main.cpp:126 #, kde-format msgid "Alternative visible name replacement. Supply this once for every input." msgstr "" -#: main.cpp:122 +#: main.cpp:127 #, kde-format msgid "" "Override a config setting. Use once for every setting. E.g.: --cs " "\"AutoAdvance=1\"" msgstr "" -#: main.cpp:123 +#: main.cpp:128 #, kde-format msgid "Show list of config settings and current values." msgstr "" -#: main.cpp:124 +#: main.cpp:129 #, kde-format msgid "Use a different config file." msgstr "" -#: main.cpp:127 +#: main.cpp:132 #, kde-format msgid "file1 to open (base, if not specified via --base)" msgstr "" -#: main.cpp:128 +#: main.cpp:133 #, kde-format msgid "file2 to open" msgstr "" -#: main.cpp:129 +#: main.cpp:134 #, kde-format msgid "file3 to open" msgstr "" -#: main.cpp:153 +#: main.cpp:158 #, kde-format msgid "See kdiff3 --help for supported options." msgstr "" -#: mergeresultwindow.cpp:158 +#: mergeresultwindow.cpp:171 #, kde-format msgid "Choose A Everywhere" msgstr "" -#: mergeresultwindow.cpp:159 +#: mergeresultwindow.cpp:172 #, kde-format msgid "Choose B Everywhere" msgstr "" -#: mergeresultwindow.cpp:160 +#: mergeresultwindow.cpp:173 #, kde-format msgid "Choose C Everywhere" msgstr "" -#: mergeresultwindow.cpp:161 +#: mergeresultwindow.cpp:174 #, kde-format msgid "Choose A for All Unsolved Conflicts" msgstr "" -#: mergeresultwindow.cpp:162 +#: mergeresultwindow.cpp:175 #, kde-format msgid "Choose B for All Unsolved Conflicts" msgstr "" -#: mergeresultwindow.cpp:163 +#: mergeresultwindow.cpp:176 #, kde-format msgid "Choose C for All Unsolved Conflicts" msgstr "" -#: mergeresultwindow.cpp:164 +#: mergeresultwindow.cpp:177 #, kde-format msgid "Choose A for All Unsolved Whitespace Conflicts" msgstr "" -#: mergeresultwindow.cpp:165 +#: mergeresultwindow.cpp:178 #, kde-format msgid "Choose B for All Unsolved Whitespace Conflicts" msgstr "" -#: mergeresultwindow.cpp:166 +#: mergeresultwindow.cpp:179 #, kde-format msgid "Choose C for All Unsolved Whitespace Conflicts" msgstr "" -#: mergeresultwindow.cpp:176 +#: mergeresultwindow.cpp:204 #, kde-format msgid "Number of remaining unsolved conflicts: %1 (of which %2 are whitespace)" msgstr "" -#: mergeresultwindow.cpp:370 +#: mergeresultwindow.cpp:398 #, kde-format msgid "" "The output has been modified.\n" "If you continue your changes will be lost." msgstr "" -#: mergeresultwindow.cpp:936 pdiff.cpp:827 +#: mergeresultwindow.cpp:964 pdiff.cpp:817 #, kde-format msgid "All input files are binary equal." msgstr "" -#: mergeresultwindow.cpp:938 +#: mergeresultwindow.cpp:966 #, kde-format msgid "All input files contain the same text." msgstr "" -#: mergeresultwindow.cpp:942 mergeresultwindow.cpp:946 -#: mergeresultwindow.cpp:950 pdiff.cpp:833 pdiff.cpp:837 pdiff.cpp:841 +#: mergeresultwindow.cpp:970 mergeresultwindow.cpp:974 +#: mergeresultwindow.cpp:978 pdiff.cpp:823 pdiff.cpp:827 pdiff.cpp:831 #, kde-format msgid "Files %1 and %2 are binary equal.\n" msgstr "" -#: mergeresultwindow.cpp:944 mergeresultwindow.cpp:948 -#: mergeresultwindow.cpp:952 +#: mergeresultwindow.cpp:972 mergeresultwindow.cpp:976 +#: mergeresultwindow.cpp:980 #, kde-format msgid "Files %1 and %2 have equal text.\n" msgstr "" -#: mergeresultwindow.cpp:958 +#: mergeresultwindow.cpp:986 #, kde-format msgid "" "Total number of conflicts: %1\n" @@ -1820,39 +1831,39 @@ "%4" msgstr "" -#: mergeresultwindow.cpp:964 +#: mergeresultwindow.cpp:992 #, kde-format msgid "Conflicts" msgstr "संघर्ष" -#: mergeresultwindow.cpp:1873 +#: mergeresultwindow.cpp:1901 #, kde-format msgid "" msgstr "" -#: mergeresultwindow.cpp:1881 +#: mergeresultwindow.cpp:1909 #, kde-format msgid "" msgstr "" -#: mergeresultwindow.cpp:1883 mergeresultwindow.cpp:2755 +#: mergeresultwindow.cpp:1911 mergeresultwindow.cpp:2783 #, kde-format msgid "" msgstr "" -#: mergeresultwindow.cpp:2967 +#: mergeresultwindow.cpp:2995 #, kde-format msgid "" "Not all conflicts are solved yet.\n" "File not saved." msgstr "" -#: mergeresultwindow.cpp:2969 mergeresultwindow.cpp:2978 +#: mergeresultwindow.cpp:2997 mergeresultwindow.cpp:3006 #, kde-format msgid "Conflicts Left" msgstr "" -#: mergeresultwindow.cpp:2976 +#: mergeresultwindow.cpp:3004 #, kde-format msgid "" "There is a line end style conflict. Please choose the line end style " @@ -1860,7 +1871,7 @@ "File not saved." msgstr "" -#: mergeresultwindow.cpp:2990 +#: mergeresultwindow.cpp:3018 #, kde-format msgid "" "\n" @@ -1868,59 +1879,59 @@ "Creating backup failed. File not saved." msgstr "" -#: mergeresultwindow.cpp:2990 mergeresultwindow.cpp:3038 +#: mergeresultwindow.cpp:3018 mergeresultwindow.cpp:3066 #, kde-format msgid "File Save Error" msgstr "" -#: mergeresultwindow.cpp:3038 +#: mergeresultwindow.cpp:3066 #, kde-format msgid "Error while writing." msgstr "" -#: mergeresultwindow.cpp:3110 +#: mergeresultwindow.cpp:3138 #, fuzzy, kde-format #| msgid "Output" msgid "Output:" msgstr "आउटपुट" -#: mergeresultwindow.cpp:3123 mergeresultwindow.cpp:3315 +#: mergeresultwindow.cpp:3151 mergeresultwindow.cpp:3343 #, kde-format msgid "[Modified]" msgstr "" -#: mergeresultwindow.cpp:3130 +#: mergeresultwindow.cpp:3158 #, fuzzy, kde-format #| msgid "Encoding:" msgid "Encoding for saving:" msgstr "एनकोडिंग:" -#: mergeresultwindow.cpp:3230 +#: mergeresultwindow.cpp:3258 #, kde-format msgid "Conflict" msgstr "विरोध" -#: mergeresultwindow.cpp:3262 +#: mergeresultwindow.cpp:3290 #, kde-format msgid "Codec from A: %1" msgstr "" -#: mergeresultwindow.cpp:3264 +#: mergeresultwindow.cpp:3292 #, kde-format msgid "Codec from B: %1" msgstr "" -#: mergeresultwindow.cpp:3266 +#: mergeresultwindow.cpp:3294 #, kde-format msgid "Codec from C: %1" msgstr "" -#: optiondialog.cpp:119 +#: optiondialog.cpp:121 #, kde-format msgid "Change Font" msgstr "" -#: optiondialog.cpp:135 optiondialog.cpp:145 +#: optiondialog.cpp:137 optiondialog.cpp:147 #, kde-format msgid "" "Font: %1, %2, %3\n" @@ -1928,207 +1939,207 @@ "Example:" msgstr "" -#: optiondialog.cpp:388 +#: optiondialog.cpp:390 #, kde-format msgid "Unicode" msgstr "यूनिकोड" -#: optiondialog.cpp:389 +#: optiondialog.cpp:391 #, kde-format msgid "Latin1" msgstr "" -#: optiondialog.cpp:408 +#: optiondialog.cpp:410 #, kde-format msgid "Change this if non-ASCII characters are not displayed correctly." msgstr "" -#: optiondialog.cpp:491 +#: optiondialog.cpp:495 #, kde-format msgid "Configure" msgstr "बिन्यस्त करू" -#: optiondialog.cpp:568 +#: optiondialog.cpp:573 #, kde-format msgid "Font" msgstr "फोन्ट" -#: optiondialog.cpp:570 +#: optiondialog.cpp:575 #, kde-format msgid "Editor & Diff Output Font" msgstr "" -#: optiondialog.cpp:589 +#: optiondialog.cpp:594 #, kde-format msgid "Application font" msgstr "" -#: optiondialog.cpp:594 +#: optiondialog.cpp:599 #, kde-format msgid "File view font" msgstr "" -#: optiondialog.cpp:613 +#: optiondialog.cpp:618 #, fuzzy, kde-format #| msgid "Color" msgctxt "Title for color settings page" msgid "Color" msgstr "रंग" -#: optiondialog.cpp:614 +#: optiondialog.cpp:619 #, kde-format msgid "Colors Settings" msgstr "" -#: optiondialog.cpp:631 +#: optiondialog.cpp:644 #, kde-format msgid "Editor and Diff Views:" msgstr "" -#: optiondialog.cpp:639 +#: optiondialog.cpp:652 #, kde-format msgid "Foreground color:" msgstr "अग्रभूमि क' रंगः" -#: optiondialog.cpp:647 +#: optiondialog.cpp:660 #, kde-format msgid "Background color:" msgstr "पृष्ठभूमि क' रंगः" -#: optiondialog.cpp:657 +#: optiondialog.cpp:670 #, kde-format msgid "Diff background color:" msgstr "" -#: optiondialog.cpp:666 +#: optiondialog.cpp:679 #, kde-format msgid "Color A:" msgstr "" -#: optiondialog.cpp:675 +#: optiondialog.cpp:688 #, kde-format msgid "Color B:" msgstr "" -#: optiondialog.cpp:684 +#: optiondialog.cpp:697 #, kde-format msgid "Color C:" msgstr "" -#: optiondialog.cpp:692 +#: optiondialog.cpp:705 #, kde-format msgid "Conflict color:" msgstr "" -#: optiondialog.cpp:701 +#: optiondialog.cpp:714 #, kde-format msgid "Current range background color:" msgstr "" -#: optiondialog.cpp:710 +#: optiondialog.cpp:723 #, kde-format msgid "Current range diff background color:" msgstr "" -#: optiondialog.cpp:718 +#: optiondialog.cpp:731 #, kde-format msgid "Color for manually aligned difference ranges:" msgstr "" -#: optiondialog.cpp:725 +#: optiondialog.cpp:738 #, kde-format msgid "Directory Comparison View:" msgstr "" -#: optiondialog.cpp:731 +#: optiondialog.cpp:744 #, kde-format msgid "Newest file color:" msgstr "" -#: optiondialog.cpp:736 +#: optiondialog.cpp:749 #, kde-format msgid "" "Changing this color will only be effective when starting the next directory " "comparison." msgstr "" -#: optiondialog.cpp:741 +#: optiondialog.cpp:754 #, kde-format msgid "Oldest file color:" msgstr "" -#: optiondialog.cpp:750 +#: optiondialog.cpp:763 #, kde-format msgid "Middle age file color:" msgstr "" -#: optiondialog.cpp:759 +#: optiondialog.cpp:772 #, kde-format msgid "Color for missing files:" msgstr "" -#: optiondialog.cpp:773 +#: optiondialog.cpp:786 #, kde-format msgid "Editor" msgstr "संपादक" -#: optiondialog.cpp:774 +#: optiondialog.cpp:787 #, kde-format msgid "Editor Behavior" msgstr "" -#: optiondialog.cpp:787 +#: optiondialog.cpp:809 #, kde-format msgid "Tab inserts spaces" msgstr "" -#: optiondialog.cpp:791 +#: optiondialog.cpp:813 #, kde-format msgid "" "On: Pressing tab generates the appropriate number of spaces.\n" "Off: A tab character will be inserted." msgstr "" -#: optiondialog.cpp:796 +#: optiondialog.cpp:818 #, kde-format msgid "Tab size:" msgstr "" -#: optiondialog.cpp:803 +#: optiondialog.cpp:825 #, kde-format msgid "Auto indentation" msgstr "" -#: optiondialog.cpp:807 +#: optiondialog.cpp:829 #, kde-format msgid "On: The indentation of the previous line is used for a new line.\n" msgstr "" -#: optiondialog.cpp:810 +#: optiondialog.cpp:832 #, kde-format msgid "Auto copy selection" msgstr "" -#: optiondialog.cpp:814 +#: optiondialog.cpp:836 #, kde-format msgid "" "On: Any selection is immediately written to the clipboard.\n" "Off: You must explicitly copy e.g. via Ctrl-C." msgstr "" -#: optiondialog.cpp:829 +#: optiondialog.cpp:851 #, kde-format msgid "" "Sets the line endings for when an edited file is saved.\n" "DOS/Windows: CR+LF; UNIX: LF; with CR=0D, LF=0A" msgstr "" -#: optiondialog.cpp:839 +#: optiondialog.cpp:861 #, kde-format msgid "Diff" msgstr "Diff" -#: optiondialog.cpp:840 +#: optiondialog.cpp:862 #, kde-format msgid "Diff Settings" msgstr "" @@ -2142,12 +2153,12 @@ #. ); #. ++line; #. -#: optiondialog.cpp:865 +#: optiondialog.cpp:896 #, kde-format msgid "Ignore numbers (treat as white space)" msgstr "" -#: optiondialog.cpp:869 +#: optiondialog.cpp:900 #, kde-format msgid "" "Ignore number characters during line matching phase. (Similar to Ignore " @@ -2155,66 +2166,66 @@ "Might help to compare files with numeric data." msgstr "" -#: optiondialog.cpp:873 +#: optiondialog.cpp:904 #, kde-format msgid "Ignore C/C++ comments (treat as white space)" msgstr "" -#: optiondialog.cpp:876 +#: optiondialog.cpp:907 #, kde-format msgid "Treat C/C++ comments like white space." msgstr "" -#: optiondialog.cpp:879 +#: optiondialog.cpp:910 #, kde-format msgid "Ignore case (treat as white space)" msgstr "" -#: optiondialog.cpp:883 +#: optiondialog.cpp:914 #, kde-format msgid "Treat case differences like white space changes. ('a'<=>'A')" msgstr "" -#: optiondialog.cpp:886 +#: optiondialog.cpp:917 #, kde-format msgid "Preprocessor command:" msgstr "" -#: optiondialog.cpp:891 +#: optiondialog.cpp:922 #, kde-format msgid "User defined pre-processing. (See the docs for details.)" msgstr "" -#: optiondialog.cpp:894 +#: optiondialog.cpp:925 #, kde-format msgid "Line-matching preprocessor command:" msgstr "" -#: optiondialog.cpp:899 +#: optiondialog.cpp:930 #, kde-format msgid "" "This pre-processor is only used during line matching.\n" "(See the docs for details.)" msgstr "" -#: optiondialog.cpp:902 +#: optiondialog.cpp:933 #, kde-format msgid "Try hard (slower)" msgstr "" -#: optiondialog.cpp:906 +#: optiondialog.cpp:937 #, kde-format msgid "" "Enables the --minimal option for the external diff.\n" "The analysis of big files will be much slower." msgstr "" -#: optiondialog.cpp:910 +#: optiondialog.cpp:941 #, kde-format msgid "Align B and C for 3 input files" msgstr "" -#: optiondialog.cpp:914 +#: optiondialog.cpp:945 #, kde-format msgid "" "Try to align B and C when comparing or merging three input files.\n" @@ -2222,66 +2233,73 @@ "(Default is off.)" msgstr "" -#: optiondialog.cpp:926 +#: optiondialog.cpp:956 +#, fuzzy, kde-format +#| msgid "Merge" +msgctxt "Settings page" +msgid "Merge" +msgstr "मिलाबू" + +#: optiondialog.cpp:957 #, kde-format msgid "Merge Settings" msgstr "" -#: optiondialog.cpp:940 +#: optiondialog.cpp:980 #, kde-format msgid "Auto advance delay (ms):" msgstr "" -#: optiondialog.cpp:946 +#: optiondialog.cpp:986 #, kde-format 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 "" -#: optiondialog.cpp:950 +#: optiondialog.cpp:990 #, kde-format msgid "Show info dialogs" msgstr "" -#: optiondialog.cpp:953 +#: optiondialog.cpp:993 #, kde-format msgid "Show a dialog with information about the number of conflicts." msgstr "" -#: optiondialog.cpp:956 +#: optiondialog.cpp:996 #, kde-format msgid "White space 2-file merge default:" msgstr "" -#: optiondialog.cpp:961 optiondialog.cpp:974 +#: optiondialog.cpp:1001 optiondialog.cpp:1014 #, kde-format msgid "Manual Choice" msgstr "" -#: optiondialog.cpp:965 optiondialog.cpp:979 +#: optiondialog.cpp:1005 optiondialog.cpp:1019 #, kde-format msgid "" "Allow the merge algorithm to automatically select an input for white-space-" "only changes." msgstr "" -#: optiondialog.cpp:969 +#: optiondialog.cpp:1009 #, kde-format msgid "White space 3-file merge default:" msgstr "" -#: optiondialog.cpp:983 +#: optiondialog.cpp:1023 #, kde-format msgid "Automatic Merge Regular Expression" msgstr "" -#: optiondialog.cpp:991 smalldialogs.cpp:449 +#: optiondialog.cpp:1031 smalldialogs.cpp:459 #, kde-format msgid "Auto merge regular expression:" msgstr "" -#: optiondialog.cpp:996 +#: optiondialog.cpp:1036 #, kde-format msgid "" "Regular expression for lines where KDiff3 should automatically choose one " @@ -2290,29 +2308,29 @@ "- if available - C, otherwise B will be chosen." msgstr "" -#: optiondialog.cpp:1002 +#: optiondialog.cpp:1042 #, kde-format msgid "Run regular expression auto merge on merge start" msgstr "" -#: optiondialog.cpp:1005 +#: optiondialog.cpp:1045 #, kde-format msgid "" "Run the merge for auto merge regular expressions\n" "immediately when a merge starts.\n" msgstr "" -#: optiondialog.cpp:1010 +#: optiondialog.cpp:1050 #, kde-format msgid "Version Control History Merging" msgstr "" -#: optiondialog.cpp:1018 smalldialogs.cpp:476 +#: optiondialog.cpp:1058 smalldialogs.cpp:486 #, kde-format msgid "History start regular expression:" msgstr "" -#: optiondialog.cpp:1023 +#: optiondialog.cpp:1063 #, kde-format msgid "" "Regular expression for the start of the version control history entry.\n" @@ -2320,12 +2338,12 @@ "Default value: \".*\\$Log.*\\$.*\"" msgstr "" -#: optiondialog.cpp:1029 smalldialogs.cpp:504 +#: optiondialog.cpp:1069 smalldialogs.cpp:514 #, kde-format msgid "History entry start regular expression:" msgstr "" -#: optiondialog.cpp:1042 +#: optiondialog.cpp:1082 #, kde-format msgid "" "A version control history entry consists of several lines.\n" @@ -2337,22 +2355,22 @@ "See the documentation for details." msgstr "" -#: optiondialog.cpp:1050 +#: optiondialog.cpp:1090 #, kde-format msgid "History merge sorting" msgstr "" -#: optiondialog.cpp:1053 +#: optiondialog.cpp:1093 #, kde-format msgid "Sort version control history by a key." msgstr "" -#: optiondialog.cpp:1063 +#: optiondialog.cpp:1103 #, kde-format msgid "History entry start sort key order:" msgstr "" -#: optiondialog.cpp:1068 +#: optiondialog.cpp:1108 #, kde-format msgid "" "Each pair of parentheses used in the regular expression for the history " @@ -2364,37 +2382,37 @@ "See the documentation for details." msgstr "" -#: optiondialog.cpp:1079 +#: optiondialog.cpp:1119 #, kde-format msgid "Merge version control history on merge start" msgstr "" -#: optiondialog.cpp:1082 +#: optiondialog.cpp:1122 #, kde-format msgid "Run version control history automerge on merge start." msgstr "" -#: optiondialog.cpp:1086 +#: optiondialog.cpp:1126 #, kde-format msgid "Max number of history entries:" msgstr "" -#: optiondialog.cpp:1090 +#: optiondialog.cpp:1130 #, kde-format msgid "Cut off after specified number. Use -1 for infinite number of entries." msgstr "" -#: optiondialog.cpp:1094 +#: optiondialog.cpp:1134 #, kde-format msgid "Test your regular expressions" msgstr "" -#: optiondialog.cpp:1099 +#: optiondialog.cpp:1139 #, kde-format msgid "Irrelevant merge command:" msgstr "" -#: optiondialog.cpp:1104 +#: optiondialog.cpp:1144 #, kde-format msgid "" "If specified this script is run after automerge\n" @@ -2402,12 +2420,12 @@ "Called with the parameters: filename1 filename2 filename3" msgstr "" -#: optiondialog.cpp:1109 +#: optiondialog.cpp:1149 #, kde-format msgid "Auto save and quit on merge without conflicts" msgstr "" -#: optiondialog.cpp:1113 +#: optiondialog.cpp:1153 #, kde-format msgid "" "If KDiff3 was started for a file-merge from the command line and all\n" @@ -2416,27 +2434,27 @@ "(Similar to command line option \"--auto\".)" msgstr "" -#: optiondialog.cpp:1124 optiondialog.cpp:1125 +#: optiondialog.cpp:1164 optiondialog.cpp:1165 #, kde-format msgid "Directory" msgstr "निर्देशिका" -#: optiondialog.cpp:1137 +#: optiondialog.cpp:1185 #, kde-format msgid "Recursive directories" msgstr "" -#: optiondialog.cpp:1140 +#: optiondialog.cpp:1188 #, kde-format msgid "Whether to analyze subdirectories or not." msgstr "" -#: optiondialog.cpp:1142 +#: optiondialog.cpp:1190 #, kde-format msgid "File pattern(s):" msgstr "" -#: optiondialog.cpp:1148 +#: optiondialog.cpp:1196 #, kde-format msgid "" "Pattern(s) of files to be analyzed. \n" @@ -2444,12 +2462,12 @@ "Several Patterns can be specified by using the separator: ';'" msgstr "" -#: optiondialog.cpp:1153 +#: optiondialog.cpp:1201 #, kde-format msgid "File-anti-pattern(s):" msgstr "" -#: optiondialog.cpp:1159 +#: optiondialog.cpp:1207 #, kde-format msgid "" "Pattern(s) of files to be excluded from analysis. \n" @@ -2457,12 +2475,12 @@ "Several Patterns can be specified by using the separator: ';'" msgstr "" -#: optiondialog.cpp:1164 +#: optiondialog.cpp:1212 #, kde-format msgid "Dir-anti-pattern(s):" msgstr "" -#: optiondialog.cpp:1170 +#: optiondialog.cpp:1218 #, kde-format msgid "" "Pattern(s) of directories to be excluded from analysis. \n" @@ -2470,58 +2488,58 @@ "Several Patterns can be specified by using the separator: ';'" msgstr "" -#: optiondialog.cpp:1175 +#: optiondialog.cpp:1223 #, kde-format msgid "Use .cvsignore" msgstr "" -#: optiondialog.cpp:1179 +#: optiondialog.cpp:1227 #, kde-format msgid "" "Extends the antipattern to anything that would be ignored by CVS.\n" "Via local \".cvsignore\" files this can be directory specific." msgstr "" -#: optiondialog.cpp:1183 +#: optiondialog.cpp:1231 #, kde-format msgid "Find hidden files and directories" msgstr "" -#: optiondialog.cpp:1186 +#: optiondialog.cpp:1234 #, kde-format msgid "Finds hidden files and directories." msgstr "" -#: optiondialog.cpp:1189 +#: optiondialog.cpp:1237 #, kde-format msgid "Follow file links" msgstr "" -#: optiondialog.cpp:1193 +#: optiondialog.cpp:1241 #, kde-format msgid "" "On: Compare the file the link points to.\n" "Off: Compare the links." msgstr "" -#: optiondialog.cpp:1197 +#: optiondialog.cpp:1245 #, kde-format msgid "Follow directory links" msgstr "" -#: optiondialog.cpp:1201 +#: optiondialog.cpp:1249 #, kde-format msgid "" "On: Compare the directory the link points to.\n" "Off: Compare the links." msgstr "" -#: optiondialog.cpp:1210 +#: optiondialog.cpp:1258 #, kde-format msgid "Case sensitive filename comparison" msgstr "" -#: optiondialog.cpp:1214 +#: optiondialog.cpp:1262 #, kde-format msgid "" "The directory comparison will compare files or directories when their names " @@ -2530,63 +2548,63 @@ "off, otherwise on.)" msgstr "" -#: optiondialog.cpp:1218 +#: optiondialog.cpp:1266 #, kde-format msgid "Unfold all subdirectories on load" msgstr "" -#: optiondialog.cpp:1222 +#: optiondialog.cpp:1270 #, kde-format msgid "" "On: Unfold all subdirectories when starting a directory diff.\n" "Off: Leave subdirectories folded." msgstr "" -#: optiondialog.cpp:1226 +#: optiondialog.cpp:1274 #, kde-format msgid "Skip directory status report" msgstr "" -#: optiondialog.cpp:1230 +#: optiondialog.cpp:1278 #, kde-format msgid "" "On: Do not show the Directory Comparison Status.\n" "Off: Show the status dialog on start." msgstr "" -#: optiondialog.cpp:1234 +#: optiondialog.cpp:1282 #, kde-format msgid "File Comparison Mode" msgstr "" -#: optiondialog.cpp:1239 +#: optiondialog.cpp:1287 #, kde-format msgid "Binary comparison" msgstr "" -#: optiondialog.cpp:1241 +#: optiondialog.cpp:1289 #, kde-format msgid "Binary comparison of each file. (Default)" msgstr "" -#: optiondialog.cpp:1244 +#: optiondialog.cpp:1292 #, kde-format msgid "Full analysis" msgstr "" -#: optiondialog.cpp:1246 +#: optiondialog.cpp:1294 #, kde-format msgid "" "Do a full analysis and show statistics information in extra columns.\n" "(Slower than a binary comparison, much slower for binary files.)" msgstr "" -#: optiondialog.cpp:1250 +#: optiondialog.cpp:1298 #, kde-format msgid "Trust the size and modification date (unsafe)" msgstr "" -#: optiondialog.cpp:1252 +#: optiondialog.cpp:1300 #, kde-format msgid "" "Assume that files are equal if the modification date and file length are " @@ -2596,14 +2614,14 @@ "Useful for big directories or slow networks." msgstr "" -#: optiondialog.cpp:1257 +#: optiondialog.cpp:1305 #, kde-format msgid "" "Trust the size and date, but use binary comparison if date does not match " "(unsafe)" msgstr "" -#: optiondialog.cpp:1259 +#: optiondialog.cpp:1307 #, kde-format msgid "" "Assume that files are equal if the modification date and file length are " @@ -2612,12 +2630,12 @@ "Useful for big directories or slow networks." msgstr "" -#: optiondialog.cpp:1264 +#: optiondialog.cpp:1312 #, kde-format msgid "Trust the size (unsafe)" msgstr "" -#: optiondialog.cpp:1266 +#: optiondialog.cpp:1314 #, kde-format msgid "" "Assume that files are equal if their file lengths are equal.\n" @@ -2625,12 +2643,12 @@ "download." msgstr "" -#: optiondialog.cpp:1273 +#: optiondialog.cpp:1321 #, kde-format msgid "Synchronize directories" msgstr "" -#: optiondialog.cpp:1277 +#: optiondialog.cpp:1325 #, kde-format msgid "" "Offers to store files in both directories so that\n" @@ -2638,24 +2656,24 @@ "Works only when comparing two directories without specifying a destination." msgstr "" -#: optiondialog.cpp:1283 +#: optiondialog.cpp:1331 #, kde-format msgid "White space differences considered equal" msgstr "" -#: optiondialog.cpp:1287 +#: optiondialog.cpp:1335 #, kde-format msgid "" "If files differ only by white space consider them equal.\n" "This is only active when full analysis is chosen." msgstr "" -#: optiondialog.cpp:1293 +#: optiondialog.cpp:1341 #, kde-format msgid "Copy newer instead of merging (unsafe)" msgstr "" -#: optiondialog.cpp:1297 +#: optiondialog.cpp:1345 #, kde-format msgid "" "Do not look inside, just take the newer file.\n" @@ -2663,46 +2681,46 @@ "Only effective when comparing two directories." msgstr "" -#: optiondialog.cpp:1302 +#: optiondialog.cpp:1350 #, kde-format msgid "Backup files (.orig)" msgstr "" -#: optiondialog.cpp:1306 +#: optiondialog.cpp:1354 #, kde-format msgid "" "If 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 "" -#: optiondialog.cpp:1382 optiondialog.cpp:1383 +#: optiondialog.cpp:1430 optiondialog.cpp:1431 #, kde-format msgid "Regional Settings" msgstr "" -#: optiondialog.cpp:1397 +#: optiondialog.cpp:1454 #, kde-format msgid "Use the same encoding for everything:" msgstr "" -#: optiondialog.cpp:1401 +#: optiondialog.cpp:1458 #, kde-format msgid "" "Enable this allows to change all encodings by changing the first only.\n" "Disable this if different individual settings are needed." msgstr "" -#: optiondialog.cpp:1405 +#: optiondialog.cpp:1462 #, kde-format msgid "Note: Local Encoding is \"%1\"" msgstr "" -#: optiondialog.cpp:1409 +#: optiondialog.cpp:1466 #, kde-format msgid "File Encoding for A:" msgstr "" -#: optiondialog.cpp:1416 +#: optiondialog.cpp:1473 #, kde-format msgid "" "If enabled then Unicode (UTF-16 or UTF-8) encoding will be detected.\n" @@ -2711,32 +2729,32 @@ "(Unicode detection depends on the first bytes of a file.)" msgstr "" -#: optiondialog.cpp:1419 optiondialog.cpp:1430 optiondialog.cpp:1441 +#: optiondialog.cpp:1476 optiondialog.cpp:1487 optiondialog.cpp:1498 #, kde-format msgid "Auto Detect Unicode" msgstr "" -#: optiondialog.cpp:1425 +#: optiondialog.cpp:1482 #, kde-format msgid "File Encoding for B:" msgstr "" -#: optiondialog.cpp:1436 +#: optiondialog.cpp:1493 #, kde-format msgid "File Encoding for C:" msgstr "" -#: optiondialog.cpp:1447 +#: optiondialog.cpp:1504 #, kde-format msgid "File Encoding for Merge Output and Saving:" msgstr "" -#: optiondialog.cpp:1452 +#: optiondialog.cpp:1509 #, kde-format msgid "Auto Select" msgstr "स्वतः चुनू" -#: optiondialog.cpp:1456 +#: optiondialog.cpp:1513 #, kde-format msgid "" "If enabled then the encoding from the input files is used.\n" @@ -2744,39 +2762,39 @@ "saving." msgstr "" -#: optiondialog.cpp:1459 +#: optiondialog.cpp:1516 #, kde-format msgid "File Encoding for Preprocessor Files:" msgstr "" -#: optiondialog.cpp:1471 +#: optiondialog.cpp:1528 #, kde-format msgid "Right To Left Language" msgstr "" -#: optiondialog.cpp:1475 +#: optiondialog.cpp:1532 #, kde-format msgid "" "Some languages are read from right to left.\n" "This setting will change the viewer and editor accordingly." msgstr "" -#: optiondialog.cpp:1485 +#: optiondialog.cpp:1542 #, kde-format msgid "Integration" msgstr "संयोजन" -#: optiondialog.cpp:1486 +#: optiondialog.cpp:1543 #, kde-format msgid "Integration Settings" msgstr "" -#: optiondialog.cpp:1499 +#: optiondialog.cpp:1564 #, kde-format msgid "Command line options to ignore:" msgstr "" -#: optiondialog.cpp:1505 +#: optiondialog.cpp:1570 #, kde-format msgid "" "List of command line options that should be ignored when KDiff3 is used by " @@ -2785,19 +2803,19 @@ "This will suppress the \"Unknown option\" error." msgstr "" -#: optiondialog.cpp:1510 +#: optiondialog.cpp:1575 #, kde-format msgid "Quit also via Escape key" msgstr "" -#: optiondialog.cpp:1514 +#: optiondialog.cpp:1579 #, kde-format msgid "" "Fast method to exit.\n" "For those who are used to using the Escape key." msgstr "" -#: optiondialog.cpp:1598 +#: optiondialog.cpp:1653 #, kde-format msgid "This resets all options. Not only those of the current topic." msgstr "" @@ -2847,77 +2865,68 @@ msgid "Disable Unsafe Options" msgstr "" -#: pdiff.cpp:158 +#: pdiff.cpp:160 #, kde-format msgid "Loading A" msgstr "" -#: pdiff.cpp:167 -#, kde-format -msgid "Errors occurred during pre-processing of file A." -msgstr "" +#: pdiff.cpp:162 +#, fuzzy, kde-format +#| msgid "Encoding:" +msgid "Loading A: %1" +msgstr "एनकोडिंग:" -#: pdiff.cpp:172 +#: pdiff.cpp:170 #, kde-format msgid "Loading B" msgstr "" -#: pdiff.cpp:179 -#, kde-format -msgid "Errors occurred during pre-processing of file B." -msgstr "" - -#: pdiff.cpp:202 pdiff.cpp:241 +#: pdiff.cpp:201 pdiff.cpp:237 #, kde-format msgid "Diff: A <-> B" msgstr "" -#: pdiff.cpp:208 pdiff.cpp:279 pdiff.cpp:293 +#: pdiff.cpp:207 pdiff.cpp:275 pdiff.cpp:289 #, kde-format msgid "Linediff: A <-> B" msgstr "" -#: pdiff.cpp:225 +#: pdiff.cpp:224 #, kde-format msgid "Loading C" msgstr "" -#: pdiff.cpp:232 -#, kde-format -msgid "Errors occurred during pre-processing of file C." -msgstr "" - -#: pdiff.cpp:250 +#: pdiff.cpp:246 #, kde-format msgid "Diff: A <-> C" msgstr "" -#: pdiff.cpp:261 +#: pdiff.cpp:257 #, kde-format msgid "Diff: B <-> C" msgstr "" -#: pdiff.cpp:283 pdiff.cpp:297 +#: pdiff.cpp:279 pdiff.cpp:293 #, kde-format msgid "Linediff: B <-> C" msgstr "" -#: pdiff.cpp:287 pdiff.cpp:301 +#: pdiff.cpp:283 pdiff.cpp:297 #, kde-format msgid "Linediff: A <-> C" msgstr "" -#: pdiff.cpp:829 +#: pdiff.cpp:819 #, kde-format msgid "All input files contain the same text, but are not binary equal." msgstr "" -#: pdiff.cpp:835 pdiff.cpp:839 pdiff.cpp:843 +#: pdiff.cpp:825 pdiff.cpp:829 pdiff.cpp:833 #, kde-format msgid "Files %1 and %2 have equal text, but are not binary equal. \n" msgstr "" -#: pdiff.cpp:853 +#: pdiff.cpp:843 #, kde-format msgid "" "Some input files do not seem to be pure text files.\n" @@ -2925,17 +2934,17 @@ "Continue at your own risk." msgstr "" -#: pdiff.cpp:863 +#: pdiff.cpp:853 #, kde-format msgid ", B" msgstr "" -#: pdiff.cpp:865 +#: pdiff.cpp:855 #, kde-format msgid ", C" msgstr "" -#: pdiff.cpp:867 +#: pdiff.cpp:857 #, kde-format msgid "" "Some input characters could not be converted to valid unicode.\n" @@ -2944,77 +2953,72 @@ "Affected input files are in %1." msgstr "" -#: pdiff.cpp:1034 +#: pdiff.cpp:1032 #, kde-format msgid "Abort" msgstr "छोड़ू" -#: pdiff.cpp:1040 pdiff.cpp:1130 +#: pdiff.cpp:1038 pdiff.cpp:1129 #, kde-format msgid "Opening files..." msgstr "" -#: pdiff.cpp:1107 -#, kde-format -msgid "File open error" -msgstr "" - -#: pdiff.cpp:1202 +#: pdiff.cpp:1212 #, kde-format msgid "Cutting selection..." msgstr "" -#: pdiff.cpp:1223 +#: pdiff.cpp:1233 #, kde-format msgid "Copying selection to clipboard..." msgstr "" -#: pdiff.cpp:1239 +#: pdiff.cpp:1249 #, kde-format msgid "Inserting clipboard contents..." msgstr "" -#: pdiff.cpp:1695 +#: pdiff.cpp:1705 #, kde-format msgid "Word wrap (Cancel disables word wrap)" msgstr "" -#: pdiff.cpp:1696 +#: pdiff.cpp:1706 #, kde-format msgid "Calculating max width for horizontal scrollbar" msgstr "" -#: pdiff.cpp:1911 +#: pdiff.cpp:1921 #, kde-format msgid "Save && Continue" msgstr "" -#: pdiff.cpp:1912 +#: pdiff.cpp:1922 #, kde-format msgid "Continue Without Saving" msgstr "" -#: pdiff.cpp:2124 +#: pdiff.cpp:2134 #, kde-format msgid "Search complete." msgstr "खोज पूर्ण भेल." -#: pdiff.cpp:2124 +#: pdiff.cpp:2134 #, kde-format msgid "Search Complete" msgstr "" -#: pdiff.cpp:2375 +#: pdiff.cpp:2385 #, kde-format msgid "Nothing is selected in either diff input window." msgstr "" -#: pdiff.cpp:2375 +#: pdiff.cpp:2385 #, kde-format msgid "Error while adding manual diff range" msgstr "" -#: progress.cpp:59 progress.cpp:71 +#: progress.cpp:61 progress.cpp:73 #, kde-format msgid "&Cancel" msgstr "रद्द करू (&C)" @@ -3024,189 +3028,189 @@ msgid "A (Base):" msgstr "" -#: smalldialogs.cpp:68 smalldialogs.cpp:85 smalldialogs.cpp:102 -#: smalldialogs.cpp:144 +#: smalldialogs.cpp:71 smalldialogs.cpp:90 smalldialogs.cpp:109 +#: smalldialogs.cpp:154 #, kde-format msgid "File..." msgstr "" -#: smalldialogs.cpp:70 smalldialogs.cpp:87 smalldialogs.cpp:104 -#: smalldialogs.cpp:146 +#: smalldialogs.cpp:73 smalldialogs.cpp:92 smalldialogs.cpp:111 +#: smalldialogs.cpp:156 #, kde-format msgid "Dir..." msgstr "" -#: smalldialogs.cpp:96 +#: smalldialogs.cpp:103 #, kde-format msgid "C (Optional):" msgstr "" -#: smalldialogs.cpp:119 +#: smalldialogs.cpp:126 #, kde-format msgid "Swap/Copy Names..." msgstr "" -#: smalldialogs.cpp:124 smalldialogs.cpp:125 smalldialogs.cpp:126 +#: smalldialogs.cpp:131 smalldialogs.cpp:132 smalldialogs.cpp:133 #, kde-format msgid "Swap %1<->%2" msgstr "" -#: smalldialogs.cpp:127 smalldialogs.cpp:128 smalldialogs.cpp:129 +#: smalldialogs.cpp:134 smalldialogs.cpp:135 smalldialogs.cpp:136 #, kde-format msgid "Copy %1->Output" msgstr "" -#: smalldialogs.cpp:130 smalldialogs.cpp:131 smalldialogs.cpp:132 +#: smalldialogs.cpp:137 smalldialogs.cpp:138 smalldialogs.cpp:139 #, kde-format msgid "Swap %1<->Output" msgstr "" -#: smalldialogs.cpp:138 +#: smalldialogs.cpp:148 #, kde-format msgid "Output (optional):" msgstr "" -#: smalldialogs.cpp:168 +#: smalldialogs.cpp:178 #, kde-format msgid "Configure..." msgstr "कान्फिगर..." -#: smalldialogs.cpp:233 +#: smalldialogs.cpp:243 #, fuzzy, kde-format #| msgid "Directory" msgid "Open Directory" msgstr "निर्देशिका" -#: smalldialogs.cpp:234 +#: smalldialogs.cpp:244 #, kde-format msgid "Select Output File" msgstr "" -#: smalldialogs.cpp:393 +#: smalldialogs.cpp:403 #, kde-format msgid "Search text:" msgstr "" -#: smalldialogs.cpp:400 +#: smalldialogs.cpp:410 #, kde-format msgid "Case sensitive" msgstr "स्थितिक प्रति संवेदनशील" -#: smalldialogs.cpp:403 +#: smalldialogs.cpp:413 #, kde-format msgid "Search A" msgstr "" -#: smalldialogs.cpp:408 +#: smalldialogs.cpp:418 #, kde-format msgid "Search B" msgstr "" -#: smalldialogs.cpp:413 +#: smalldialogs.cpp:423 #, kde-format msgid "Search C" msgstr "" -#: smalldialogs.cpp:418 +#: smalldialogs.cpp:428 #, kde-format msgid "Search output" msgstr "" -#: smalldialogs.cpp:425 +#: smalldialogs.cpp:435 #, kde-format msgid "&Search" msgstr "खोज (&S)" -#: smalldialogs.cpp:444 +#: smalldialogs.cpp:454 #, kde-format msgid "Regular Expression Tester" msgstr "" -#: smalldialogs.cpp:457 +#: smalldialogs.cpp:467 #, kde-format msgid "Example auto merge line:" msgstr "" -#: smalldialogs.cpp:459 +#: smalldialogs.cpp:469 #, kde-format msgid "To test auto merge, copy a line as used in your files." msgstr "" -#: smalldialogs.cpp:465 smalldialogs.cpp:493 smalldialogs.cpp:529 +#: smalldialogs.cpp:475 smalldialogs.cpp:503 smalldialogs.cpp:539 #, kde-format msgid "Match result:" msgstr "" -#: smalldialogs.cpp:484 +#: smalldialogs.cpp:494 #, kde-format msgid "Example history start line (with leading comment):" msgstr "" -#: smalldialogs.cpp:486 +#: smalldialogs.cpp:496 #, kde-format msgid "" "Copy a history start line as used in your files,\n" "including the leading comment." msgstr "" -#: smalldialogs.cpp:512 +#: smalldialogs.cpp:522 #, kde-format msgid "History sort key order:" msgstr "" -#: smalldialogs.cpp:520 +#: smalldialogs.cpp:530 #, kde-format msgid "Example history entry start line (without leading comment):" msgstr "" -#: smalldialogs.cpp:522 +#: smalldialogs.cpp:532 #, kde-format msgid "" "Copy a history entry start line as used in your files,\n" "but omit the leading comment." msgstr "" -#: smalldialogs.cpp:536 +#: smalldialogs.cpp:546 #, kde-format msgid "Sort key result:" msgstr "" -#: smalldialogs.cpp:584 smalldialogs.cpp:594 smalldialogs.cpp:614 +#: smalldialogs.cpp:594 smalldialogs.cpp:604 smalldialogs.cpp:624 #, kde-format msgid "Match success." msgstr "" -#: smalldialogs.cpp:588 smalldialogs.cpp:598 smalldialogs.cpp:620 +#: smalldialogs.cpp:598 smalldialogs.cpp:608 smalldialogs.cpp:630 #, kde-format msgid "Match failed." msgstr "" -#: smalldialogs.cpp:605 +#: smalldialogs.cpp:615 #, kde-format msgid "Opening and closing parentheses do not match in regular expression." msgstr "" -#: SourceData.cpp:150 +#: SourceData.cpp:153 #, kde-format msgid "Writing clipboard data to temp file failed." msgstr "" -#: SourceData.cpp:154 +#: SourceData.cpp:157 #, kde-format msgid "From Clipboard" msgstr "क्लिपबोर्ड सँ" -#: SourceData.cpp:335 +#: SourceData.cpp:348 #, kde-format msgid "%1 is not a normal file." msgstr "" -#: SourceData.cpp:427 +#: SourceData.cpp:440 #, kde-format msgid " Temp file is: %1" msgstr "" -#: SourceData.cpp:432 +#: SourceData.cpp:445 #, kde-format msgid "" "Preprocessing possibly failed. Check this command:\n" @@ -3216,12 +3220,12 @@ "The preprocessing command will be disabled now." msgstr "" -#: SourceData.cpp:443 SourceData.cpp:512 +#: SourceData.cpp:456 SourceData.cpp:525 #, kde-format msgid "File %1 too large to process. Skipping." msgstr "" -#: SourceData.cpp:487 +#: SourceData.cpp:500 #, kde-format msgid "" "The line-matching-preprocessing possibly failed. Check this command:\n" diff -Nru kdiff3-1.8.01/po/ml/kdiff3.po kdiff3-1.8.3/po/ml/kdiff3.po --- kdiff3-1.8.01/po/ml/kdiff3.po 2019-05-18 01:02:12.000000000 +0000 +++ kdiff3-1.8.3/po/ml/kdiff3.po 2020-06-25 00:18:35.000000000 +0000 @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: kdiff3\n" -"Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2019-04-18 08:02+0200\n" +"Report-Msgid-Bugs-To: https://bugs.kde.org\n" +"POT-Creation-Date: 2020-06-22 07:48+0200\n" "PO-Revision-Date: 2009-01-19 HO:MI+ZONE\n" "Last-Translator: SANKARANARAYANAN | ശങ്കരനാരായണന്‍ \n" "Language-Team: MALAYALAM | മലയാളം \n" @@ -27,336 +27,336 @@ msgid "Your emails" msgstr "snalledam@dataone.in, pravi.a@gmail.com" -#: difftextwindow.cpp:412 +#: difftextwindow.cpp:414 #, kde-format msgid "File %1: Line %2" msgstr "" -#: difftextwindow.cpp:414 +#: difftextwindow.cpp:416 #, kde-format msgid "File %1: Line not available" msgstr "" -#: difftextwindow.cpp:1780 +#: difftextwindow.cpp:1778 #, kde-format msgid "Encoding:" msgstr "" -#: difftextwindow.cpp:1782 mergeresultwindow.cpp:3138 optiondialog.cpp:818 +#: difftextwindow.cpp:1781 mergeresultwindow.cpp:3166 optiondialog.cpp:840 #, kde-format msgid "Line end style:" msgstr "വരി അവസാനിക്കുന്ന രീതി:" -#: difftextwindow.cpp:1810 directorymergewindow.cpp:382 -#: directorymergewindow.cpp:433 directorymergewindow.cpp:524 -#: directorymergewindow.cpp:3058 directorymergewindow.cpp:3189 -#: directorymergewindow.cpp:3417 mergeresultwindow.cpp:942 -#: mergeresultwindow.cpp:944 mergeresultwindow.cpp:946 -#: mergeresultwindow.cpp:948 mergeresultwindow.cpp:1814 -#: mergeresultwindow.cpp:3170 mergeresultwindow.cpp:3177 optiondialog.cpp:962 -#: optiondialog.cpp:975 pdiff.cpp:833 pdiff.cpp:835 pdiff.cpp:837 pdiff.cpp:839 -#: pdiff.cpp:861 smalldialogs.cpp:124 smalldialogs.cpp:126 smalldialogs.cpp:127 -#: smalldialogs.cpp:130 +#: difftextwindow.cpp:1809 directorymergewindow.cpp:383 +#: directorymergewindow.cpp:434 directorymergewindow.cpp:525 +#: directorymergewindow.cpp:3072 directorymergewindow.cpp:3203 +#: directorymergewindow.cpp:3431 mergeresultwindow.cpp:970 +#: mergeresultwindow.cpp:972 mergeresultwindow.cpp:974 +#: mergeresultwindow.cpp:976 mergeresultwindow.cpp:1842 +#: mergeresultwindow.cpp:3198 mergeresultwindow.cpp:3205 optiondialog.cpp:1002 +#: optiondialog.cpp:1015 pdiff.cpp:823 pdiff.cpp:825 pdiff.cpp:827 +#: pdiff.cpp:829 pdiff.cpp:851 smalldialogs.cpp:131 smalldialogs.cpp:133 +#: smalldialogs.cpp:134 smalldialogs.cpp:137 #, kde-format msgid "A" msgstr "" -#: difftextwindow.cpp:1810 directorymergewindow.cpp:384 -#: directorymergewindow.cpp:436 directorymergewindow.cpp:526 -#: directorymergewindow.cpp:3064 directorymergewindow.cpp:3190 -#: directorymergewindow.cpp:3418 mergeresultwindow.cpp:942 -#: mergeresultwindow.cpp:944 mergeresultwindow.cpp:950 -#: mergeresultwindow.cpp:952 mergeresultwindow.cpp:1816 -#: mergeresultwindow.cpp:3172 mergeresultwindow.cpp:3179 optiondialog.cpp:963 -#: optiondialog.cpp:976 pdiff.cpp:833 pdiff.cpp:835 pdiff.cpp:841 pdiff.cpp:843 -#: pdiff.cpp:863 smalldialogs.cpp:124 smalldialogs.cpp:125 smalldialogs.cpp:128 -#: smalldialogs.cpp:131 +#: difftextwindow.cpp:1809 directorymergewindow.cpp:385 +#: directorymergewindow.cpp:437 directorymergewindow.cpp:527 +#: directorymergewindow.cpp:3078 directorymergewindow.cpp:3204 +#: directorymergewindow.cpp:3432 mergeresultwindow.cpp:970 +#: mergeresultwindow.cpp:972 mergeresultwindow.cpp:978 +#: mergeresultwindow.cpp:980 mergeresultwindow.cpp:1844 +#: mergeresultwindow.cpp:3200 mergeresultwindow.cpp:3207 optiondialog.cpp:1003 +#: optiondialog.cpp:1016 pdiff.cpp:823 pdiff.cpp:825 pdiff.cpp:831 +#: pdiff.cpp:833 pdiff.cpp:853 smalldialogs.cpp:131 smalldialogs.cpp:132 +#: smalldialogs.cpp:135 smalldialogs.cpp:138 #, kde-format msgid "B" msgstr "" -#: difftextwindow.cpp:1810 directorymergewindow.cpp:386 -#: directorymergewindow.cpp:439 directorymergewindow.cpp:528 -#: directorymergewindow.cpp:3070 directorymergewindow.cpp:3191 -#: directorymergewindow.cpp:3419 mergeresultwindow.cpp:946 -#: mergeresultwindow.cpp:948 mergeresultwindow.cpp:950 -#: mergeresultwindow.cpp:952 mergeresultwindow.cpp:1818 -#: mergeresultwindow.cpp:3174 mergeresultwindow.cpp:3181 optiondialog.cpp:977 -#: pdiff.cpp:837 pdiff.cpp:839 pdiff.cpp:841 pdiff.cpp:843 pdiff.cpp:865 -#: smalldialogs.cpp:125 smalldialogs.cpp:126 smalldialogs.cpp:129 -#: smalldialogs.cpp:132 +#: difftextwindow.cpp:1809 directorymergewindow.cpp:387 +#: directorymergewindow.cpp:440 directorymergewindow.cpp:529 +#: directorymergewindow.cpp:3084 directorymergewindow.cpp:3205 +#: directorymergewindow.cpp:3433 mergeresultwindow.cpp:974 +#: mergeresultwindow.cpp:976 mergeresultwindow.cpp:978 +#: mergeresultwindow.cpp:980 mergeresultwindow.cpp:1846 +#: mergeresultwindow.cpp:3202 mergeresultwindow.cpp:3209 optiondialog.cpp:1017 +#: pdiff.cpp:827 pdiff.cpp:829 pdiff.cpp:831 pdiff.cpp:833 pdiff.cpp:855 +#: smalldialogs.cpp:132 smalldialogs.cpp:133 smalldialogs.cpp:136 +#: smalldialogs.cpp:139 #, kde-format msgid "C" msgstr "" -#: difftextwindow.cpp:1810 +#: difftextwindow.cpp:1809 #, fuzzy, kde-format #| msgid "A (Base):" msgid "A (Base)" msgstr "ഏ (അടിസ്ഥാനം)" -#: difftextwindow.cpp:1812 +#: difftextwindow.cpp:1811 #, kde-format msgid "Encoding: %1" msgstr "" -#: difftextwindow.cpp:1813 mergeresultwindow.cpp:3183 +#: difftextwindow.cpp:1812 mergeresultwindow.cpp:3211 #, kde-format msgid "Unix" msgstr "" -#: difftextwindow.cpp:1813 mergeresultwindow.cpp:3184 +#: difftextwindow.cpp:1812 mergeresultwindow.cpp:3212 #, kde-format msgid "DOS" msgstr "" -#: difftextwindow.cpp:1813 +#: difftextwindow.cpp:1812 #, fuzzy, kde-format #| msgid "Line end style:" msgid "Line end style: %1" msgstr "വരി അവസാനിക്കുന്ന രീതി:" -#: difftextwindow.cpp:1835 kdiff3.cpp:873 +#: difftextwindow.cpp:1834 kdiff3.cpp:874 #, kde-format msgid "Top line" msgstr "മുകളിലെ വരി" -#: difftextwindow.cpp:1845 +#: difftextwindow.cpp:1843 #, kde-format msgid "End" msgstr "" -#: difftextwindow.cpp:1903 smalldialogs.cpp:235 +#: difftextwindow.cpp:1901 smalldialogs.cpp:245 #, fuzzy, kde-format #| msgid "Open" msgid "Open File" msgstr "തുറക്കുക" -#: difftextwindow.cpp:1951 optiondialog.cpp:387 +#: difftextwindow.cpp:1943 optiondialog.cpp:389 #, kde-format msgid "Unicode, 8 bit" msgstr "യൂണിക്കോഡ്, 8ബിറ്റ്" -#: difftextwindow.cpp:1966 +#: difftextwindow.cpp:1958 #, kde-format msgid "Other" msgstr "" -#: directorymergewindow.cpp:409 directorymergewindow.cpp:3424 +#: directorymergewindow.cpp:410 directorymergewindow.cpp:3438 #, kde-format msgid "Copy A to B" msgstr "" -#: directorymergewindow.cpp:412 directorymergewindow.cpp:3425 +#: directorymergewindow.cpp:413 directorymergewindow.cpp:3439 #, kde-format msgid "Copy B to A" msgstr "" -#: directorymergewindow.cpp:415 directorymergewindow.cpp:3426 +#: directorymergewindow.cpp:416 directorymergewindow.cpp:3440 #, kde-format msgid "Delete A" msgstr "" -#: directorymergewindow.cpp:418 directorymergewindow.cpp:3427 +#: directorymergewindow.cpp:419 directorymergewindow.cpp:3441 #, kde-format msgid "Delete B" msgstr "" -#: directorymergewindow.cpp:421 +#: directorymergewindow.cpp:422 #, kde-format msgid "Delete A & B" msgstr "" -#: directorymergewindow.cpp:424 directorymergewindow.cpp:3429 +#: directorymergewindow.cpp:425 directorymergewindow.cpp:3443 #, kde-format msgid "Merge to A" msgstr "" -#: directorymergewindow.cpp:427 directorymergewindow.cpp:3430 +#: directorymergewindow.cpp:428 directorymergewindow.cpp:3444 #, kde-format msgid "Merge to B" msgstr "" -#: directorymergewindow.cpp:430 +#: directorymergewindow.cpp:431 #, kde-format msgid "Merge to A & B" msgstr "" -#: directorymergewindow.cpp:442 directorymergewindow.cpp:3421 +#: directorymergewindow.cpp:443 directorymergewindow.cpp:3435 #, kde-format msgid "Delete (if exists)" msgstr "" -#: directorymergewindow.cpp:445 directorymergewindow.cpp:448 -#: directorymergewindow.cpp:3420 optiondialog.cpp:925 smalldialogs.cpp:113 +#: directorymergewindow.cpp:446 directorymergewindow.cpp:449 +#: directorymergewindow.cpp:3434 smalldialogs.cpp:120 #, kde-format msgid "Merge" msgstr "ലയിപ്പിക്കുക" -#: directorymergewindow.cpp:445 directorymergewindow.cpp:448 +#: directorymergewindow.cpp:446 directorymergewindow.cpp:449 #, kde-format msgid "Merge (manual)" msgstr "" -#: directorymergewindow.cpp:451 +#: directorymergewindow.cpp:452 #, kde-format msgid "Error: Conflicting File Types" msgstr "" -#: directorymergewindow.cpp:454 +#: directorymergewindow.cpp:455 #, kde-format msgid "Error: Changed and Deleted" msgstr "" -#: directorymergewindow.cpp:457 +#: directorymergewindow.cpp:458 #, kde-format msgid "Error: Dates are equal but files are not." msgstr "" -#: directorymergewindow.cpp:471 +#: directorymergewindow.cpp:472 #, kde-format msgid "Done" msgstr "" -#: directorymergewindow.cpp:473 +#: directorymergewindow.cpp:474 #, kde-format msgid "Error" msgstr "" -#: directorymergewindow.cpp:475 +#: directorymergewindow.cpp:476 #, kde-format msgid "Skipped." msgstr "" -#: directorymergewindow.cpp:477 +#: directorymergewindow.cpp:478 #, kde-format msgid "Not saved." msgstr "" -#: directorymergewindow.cpp:479 +#: directorymergewindow.cpp:480 #, kde-format msgid "In progress..." msgstr "" -#: directorymergewindow.cpp:481 +#: directorymergewindow.cpp:482 #, kde-format msgid "To do." msgstr "" -#: directorymergewindow.cpp:522 +#: directorymergewindow.cpp:523 #, kde-format msgid "Name" msgstr "" -#: directorymergewindow.cpp:530 +#: directorymergewindow.cpp:531 #, kde-format msgid "Operation" msgstr "" -#: directorymergewindow.cpp:532 +#: directorymergewindow.cpp:533 #, kde-format msgid "Status" msgstr "" -#: directorymergewindow.cpp:534 +#: directorymergewindow.cpp:535 #, kde-format msgid "Unsolved" msgstr "" -#: directorymergewindow.cpp:536 +#: directorymergewindow.cpp:537 #, kde-format msgid "Solved" msgstr "" -#: directorymergewindow.cpp:538 +#: directorymergewindow.cpp:539 #, kde-format msgid "Nonwhite" msgstr "" -#: directorymergewindow.cpp:540 +#: directorymergewindow.cpp:541 #, kde-format msgid "White" msgstr "" -#: directorymergewindow.cpp:674 +#: directorymergewindow.cpp:676 #, kde-format msgid "Unable to compare non-normal file with normal file." msgstr "" -#: directorymergewindow.cpp:688 +#: directorymergewindow.cpp:690 #, kde-format msgid "Mix of links and normal files." msgstr "" -#: directorymergewindow.cpp:695 +#: directorymergewindow.cpp:697 #, kde-format msgid "Link: " msgstr "" -#: directorymergewindow.cpp:704 +#: directorymergewindow.cpp:706 #, kde-format msgid "Size. " msgstr "" -#: directorymergewindow.cpp:718 directorymergewindow.cpp:728 +#: directorymergewindow.cpp:720 directorymergewindow.cpp:730 #, kde-format msgid "Date & Size: " msgstr "" -#: directorymergewindow.cpp:748 +#: directorymergewindow.cpp:751 #, kde-format msgid "Comparing file..." msgstr "" -#: directorymergewindow.cpp:801 +#: directorymergewindow.cpp:813 #, kde-format msgid "" "You are currently doing a directory merge. Are you sure, you want to abort " "the merge and rescan the directory?" msgstr "" -#: directorymergewindow.cpp:802 kdiff3.cpp:698 kdiff3.cpp:708 kdiff3.cpp:720 -#: mergeresultwindow.cpp:372 pdiff.cpp:1033 pdiff.cpp:1910 pdiff.cpp:1920 +#: directorymergewindow.cpp:814 kdiff3.cpp:697 kdiff3.cpp:707 kdiff3.cpp:719 +#: mergeresultwindow.cpp:400 pdiff.cpp:1031 pdiff.cpp:1920 pdiff.cpp:1930 #, kde-format msgid "Warning" msgstr "മുന്നറിയിപ്പ്" -#: directorymergewindow.cpp:803 directorymergewindow.cpp:3393 +#: directorymergewindow.cpp:815 directorymergewindow.cpp:3407 #, kde-format msgid "Rescan" msgstr "" -#: directorymergewindow.cpp:804 pdiff.cpp:1035 +#: directorymergewindow.cpp:816 pdiff.cpp:1033 #, kde-format msgid "Continue Merging" msgstr "" -#: directorymergewindow.cpp:971 +#: directorymergewindow.cpp:984 #, kde-format msgid "Opening of directories failed:" msgstr "" -#: directorymergewindow.cpp:975 +#: directorymergewindow.cpp:988 #, kde-format msgid "Dir A \"%1\" does not exist or is not a directory.\n" msgstr "" -#: directorymergewindow.cpp:980 +#: directorymergewindow.cpp:993 #, kde-format msgid "Dir B \"%1\" does not exist or is not a directory.\n" msgstr "" -#: directorymergewindow.cpp:985 +#: directorymergewindow.cpp:998 #, kde-format msgid "Dir C \"%1\" does not exist or is not a directory.\n" msgstr "" -#: directorymergewindow.cpp:988 +#: directorymergewindow.cpp:1001 #, kde-format msgid "Directory Open Error" msgstr "" -#: directorymergewindow.cpp:996 +#: directorymergewindow.cpp:1009 #, kde-format msgid "" "The destination directory must not be the same as A or B when three " @@ -364,49 +364,49 @@ "Check again before continuing." msgstr "" -#: directorymergewindow.cpp:998 +#: directorymergewindow.cpp:1011 #, kde-format msgid "Parameter Warning" msgstr "" -#: directorymergewindow.cpp:1003 +#: directorymergewindow.cpp:1016 #, kde-format msgid "Scanning directories..." msgstr "" -#: directorymergewindow.cpp:1029 +#: directorymergewindow.cpp:1042 #, kde-format msgid "Reading Directory A" msgstr "" -#: directorymergewindow.cpp:1038 +#: directorymergewindow.cpp:1051 #, kde-format msgid "Reading Directory B" msgstr "" -#: directorymergewindow.cpp:1048 +#: directorymergewindow.cpp:1061 #, kde-format msgid "Reading Directory C" msgstr "" -#: directorymergewindow.cpp:1064 +#: directorymergewindow.cpp:1077 #, kde-format msgid "Some subdirectories were not readable in" msgstr "" -#: directorymergewindow.cpp:1069 +#: directorymergewindow.cpp:1082 #, kde-format msgid "Check the permissions of the subdirectories." msgstr "" -#: directorymergewindow.cpp:1106 kdiff3.cpp:666 kdiff3.cpp:753 kdiff3.cpp:777 -#: kdiff3.cpp:1065 kdiff3.cpp:1086 pdiff.cpp:1116 pdiff.cpp:1170 pdiff.cpp:1218 -#: pdiff.cpp:1234 pdiff.cpp:1277 pdiff.cpp:1301 +#: directorymergewindow.cpp:1119 kdiff3.cpp:665 kdiff3.cpp:752 kdiff3.cpp:776 +#: kdiff3.cpp:1072 kdiff3.cpp:1093 pdiff.cpp:1115 pdiff.cpp:1178 pdiff.cpp:1228 +#: pdiff.cpp:1244 pdiff.cpp:1287 pdiff.cpp:1311 #, kde-format msgid "Ready." msgstr "തയ്യാര്‍" -#: directorymergewindow.cpp:1121 +#: directorymergewindow.cpp:1134 #, kde-format msgid "" "Directory Comparison Status\n" @@ -416,66 +416,66 @@ "Number of different files: %3" msgstr "" -#: directorymergewindow.cpp:1128 +#: directorymergewindow.cpp:1141 #, kde-format msgid "Number of manual merges: %1" msgstr "" -#: directorymergewindow.cpp:1394 +#: directorymergewindow.cpp:1407 #, kde-format msgid "This affects all merge operations." msgstr "" -#: directorymergewindow.cpp:1395 +#: directorymergewindow.cpp:1408 #, kde-format msgid "Changing All Merge Operations" msgstr "" -#: directorymergewindow.cpp:1695 +#: directorymergewindow.cpp:1708 #, kde-format msgid "" "Processing %1 / %2\n" "%3" msgstr "" -#: directorymergewindow.cpp:1738 directorymergewindow.cpp:1742 +#: directorymergewindow.cpp:1751 directorymergewindow.cpp:1755 #, kde-format msgid "Some files could not be processed." msgstr "" -#: directorymergewindow.cpp:2222 directorymergewindow.cpp:2247 -#: directorymergewindow.cpp:2271 +#: directorymergewindow.cpp:2235 directorymergewindow.cpp:2260 +#: directorymergewindow.cpp:2285 #, kde-format msgid "This operation is currently not possible." msgstr "" -#: directorymergewindow.cpp:2222 directorymergewindow.cpp:2247 -#: directorymergewindow.cpp:2271 directorymergewindow.cpp:2552 +#: directorymergewindow.cpp:2235 directorymergewindow.cpp:2260 +#: directorymergewindow.cpp:2285 directorymergewindow.cpp:2565 #, kde-format msgid "Operation Not Possible" msgstr "" -#: directorymergewindow.cpp:2318 +#: directorymergewindow.cpp:2332 #, kde-format msgid "An error occurred while copying." msgstr "" -#: directorymergewindow.cpp:2319 directorymergewindow.cpp:2759 +#: directorymergewindow.cpp:2333 directorymergewindow.cpp:2772 #, kde-format msgid "Merge Error" msgstr "" -#: directorymergewindow.cpp:2396 +#: directorymergewindow.cpp:2410 #, kde-format msgid "Unknown merge operation. (This must never happen!)" msgstr "" -#: directorymergewindow.cpp:2441 +#: directorymergewindow.cpp:2455 #, kde-format msgid "Unknown merge operation." msgstr "" -#: directorymergewindow.cpp:2454 +#: directorymergewindow.cpp:2468 #, kde-format msgid "" "The merge is about to begin.\n" @@ -488,50 +488,50 @@ "whatsoever! Make backups of your vital data!" msgstr "" -#: directorymergewindow.cpp:2459 +#: directorymergewindow.cpp:2473 #, kde-format msgid "Starting Merge" msgstr "" -#: directorymergewindow.cpp:2460 +#: directorymergewindow.cpp:2474 #, kde-format msgid "Do It" msgstr "" -#: directorymergewindow.cpp:2461 +#: directorymergewindow.cpp:2475 #, kde-format msgid "Simulate It" msgstr "" -#: directorymergewindow.cpp:2487 +#: directorymergewindow.cpp:2501 #, kde-format msgid "" "The highlighted item has a different type in the different directories. " "Select what to do." msgstr "" -#: directorymergewindow.cpp:2491 +#: directorymergewindow.cpp:2505 #, kde-format msgid "" "The modification dates of the file are equal but the files are not. Select " "what to do." msgstr "" -#: directorymergewindow.cpp:2495 +#: directorymergewindow.cpp:2509 #, kde-format msgid "" "The highlighted item was changed in one directory and deleted in the other. " "Select what to do." msgstr "" -#: directorymergewindow.cpp:2552 +#: directorymergewindow.cpp:2565 #, kde-format msgid "" "This operation is currently not possible because directory merge is " "currently running." msgstr "" -#: directorymergewindow.cpp:2609 +#: directorymergewindow.cpp:2622 #, kde-format msgid "" "There was an error in the last step.\n" @@ -539,401 +539,406 @@ "to skip this item?" msgstr "" -#: directorymergewindow.cpp:2611 +#: directorymergewindow.cpp:2624 #, kde-format msgid "Continue merge after an error" msgstr "" -#: directorymergewindow.cpp:2612 +#: directorymergewindow.cpp:2625 #, kde-format msgid "Continue With Last Item" msgstr "" -#: directorymergewindow.cpp:2613 +#: directorymergewindow.cpp:2626 #, kde-format msgid "Skip Item" msgstr "" -#: directorymergewindow.cpp:2709 +#: directorymergewindow.cpp:2722 #, kde-format msgid "Merge operation complete." msgstr "" -#: directorymergewindow.cpp:2709 directorymergewindow.cpp:2712 +#: directorymergewindow.cpp:2722 directorymergewindow.cpp:2725 #, kde-format msgid "Merge Complete" msgstr "" -#: directorymergewindow.cpp:2722 +#: directorymergewindow.cpp:2735 #, kde-format msgid "" "Simulated merge complete: Check if you agree with the proposed operations." msgstr "" -#: directorymergewindow.cpp:2758 +#: directorymergewindow.cpp:2771 #, kde-format msgid "An error occurred. Press OK to see detailed information." msgstr "" -#: directorymergewindow.cpp:2791 +#: directorymergewindow.cpp:2804 #, kde-format msgid "Error: While deleting %1: Creating backup failed." msgstr "" -#: directorymergewindow.cpp:2798 +#: directorymergewindow.cpp:2811 #, kde-format msgid "delete directory recursively( %1 )" msgstr "" -#: directorymergewindow.cpp:2800 +#: directorymergewindow.cpp:2813 #, kde-format msgid "delete( %1 )" msgstr "" -#: directorymergewindow.cpp:2815 +#: directorymergewindow.cpp:2828 #, kde-format msgid "Error: delete dir operation failed while trying to read the directory." msgstr "" -#: directorymergewindow.cpp:2834 +#: directorymergewindow.cpp:2847 #, kde-format msgid "Error: rmdir( %1 ) operation failed." msgstr "" -#: directorymergewindow.cpp:2844 +#: directorymergewindow.cpp:2857 #, kde-format msgid "Error: delete operation failed." msgstr "" -#: directorymergewindow.cpp:2870 +#: directorymergewindow.cpp:2884 #, kde-format msgid "manual merge( %1, %2, %3 -> %4)" msgstr "" -#: directorymergewindow.cpp:2873 +#: directorymergewindow.cpp:2887 #, kde-format msgid "" " Note: After a manual merge the user should continue by pressing F7." msgstr "" -#: directorymergewindow.cpp:2900 +#: directorymergewindow.cpp:2914 #, kde-format msgid "Error: copy( %1 -> %2 ) failed.Deleting existing destination failed." msgstr "" -#: directorymergewindow.cpp:2909 +#: directorymergewindow.cpp:2923 #, kde-format msgid "copyLink( %1 -> %2 )" msgstr "" -#: directorymergewindow.cpp:2918 +#: directorymergewindow.cpp:2932 #, kde-format msgid "Error: copyLink failed: Remote links are not yet supported." msgstr "" -#: directorymergewindow.cpp:2928 +#: directorymergewindow.cpp:2942 #, kde-format msgid "Error: copyLink failed." msgstr "" -#: directorymergewindow.cpp:2953 +#: directorymergewindow.cpp:2967 #, kde-format msgid "copy( %1 -> %2 )" msgstr "" -#: directorymergewindow.cpp:2979 +#: directorymergewindow.cpp:2993 #, kde-format msgid "Error during rename( %1 -> %2 ): Cannot delete existing destination." msgstr "" -#: directorymergewindow.cpp:2986 +#: directorymergewindow.cpp:3000 #, kde-format msgid "rename( %1 -> %2 )" msgstr "" -#: directorymergewindow.cpp:2995 +#: directorymergewindow.cpp:3009 #, kde-format msgid "Error: Rename failed." msgstr "" -#: directorymergewindow.cpp:3013 +#: directorymergewindow.cpp:3027 #, kde-format msgid "Error during makeDir of %1. Cannot delete existing file." msgstr "" -#: directorymergewindow.cpp:3030 +#: directorymergewindow.cpp:3044 #, kde-format msgid "makeDir( %1 )" msgstr "" -#: directorymergewindow.cpp:3040 +#: directorymergewindow.cpp:3054 #, kde-format msgid "Error while creating directory." msgstr "" -#: directorymergewindow.cpp:3076 directorymergewindow.cpp:3195 +#: directorymergewindow.cpp:3090 directorymergewindow.cpp:3209 #, kde-format msgid "Dest" msgstr "" -#: directorymergewindow.cpp:3084 directorymergewindow.cpp:3113 +#: directorymergewindow.cpp:3098 directorymergewindow.cpp:3127 #, kde-format msgid "Dir" msgstr "" -#: directorymergewindow.cpp:3084 +#: directorymergewindow.cpp:3098 #, kde-format msgid "Type" msgstr "" -#: directorymergewindow.cpp:3084 +#: directorymergewindow.cpp:3098 #, kde-format msgid "Size" msgstr "" -#: directorymergewindow.cpp:3085 +#: directorymergewindow.cpp:3099 #, kde-format msgid "Attr" msgstr "" -#: directorymergewindow.cpp:3085 +#: directorymergewindow.cpp:3099 #, kde-format msgid "Last Modification" msgstr "" -#: directorymergewindow.cpp:3085 +#: directorymergewindow.cpp:3099 #, kde-format msgid "Link-Destination" msgstr "" -#: directorymergewindow.cpp:3113 +#: directorymergewindow.cpp:3127 #, kde-format msgid "File" msgstr "" -#: directorymergewindow.cpp:3113 +#: directorymergewindow.cpp:3127 #, kde-format msgid "-Link" msgstr "" -#: directorymergewindow.cpp:3119 +#: directorymergewindow.cpp:3133 #, kde-format msgid "not available" msgstr "" -#: directorymergewindow.cpp:3137 +#: directorymergewindow.cpp:3151 #, kde-format msgid "A (Dest): " msgstr "" -#: directorymergewindow.cpp:3141 +#: directorymergewindow.cpp:3155 #, kde-format msgid "A: " msgstr "" -#: directorymergewindow.cpp:3141 +#: directorymergewindow.cpp:3155 #, kde-format msgid "A (Base): " msgstr "" -#: directorymergewindow.cpp:3147 +#: directorymergewindow.cpp:3161 #, kde-format msgid "B (Dest): " msgstr "" -#: directorymergewindow.cpp:3151 +#: directorymergewindow.cpp:3165 #, kde-format msgid "B: " msgstr "" -#: directorymergewindow.cpp:3156 +#: directorymergewindow.cpp:3170 #, kde-format msgid "C (Dest): " msgstr "" -#: directorymergewindow.cpp:3160 +#: directorymergewindow.cpp:3174 #, kde-format msgid "C: " msgstr "" -#: directorymergewindow.cpp:3163 +#: directorymergewindow.cpp:3177 #, kde-format msgid "Dest: " msgstr "" #. i18n("Saving Directory Merge State ...")); -#: directorymergewindow.cpp:3238 +#: directorymergewindow.cpp:3252 #, kde-format msgid "Save Directory Merge State As..." msgstr "" -#: directorymergewindow.cpp:3387 +#: directorymergewindow.cpp:3401 #, kde-format msgid "Start/Continue Directory Merge" msgstr "" -#: directorymergewindow.cpp:3388 +#: directorymergewindow.cpp:3402 #, kde-format msgid "Run Operation for Current Item" msgstr "" -#: directorymergewindow.cpp:3389 +#: directorymergewindow.cpp:3403 #, kde-format msgid "Compare Selected File" msgstr "" -#: directorymergewindow.cpp:3390 +#: directorymergewindow.cpp:3404 #, kde-format msgid "Merge Current File" msgstr "" -#: directorymergewindow.cpp:3390 +#: directorymergewindow.cpp:3404 #, kde-format msgid "" "Merge\n" "File" msgstr "" -#: directorymergewindow.cpp:3391 +#: directorymergewindow.cpp:3405 #, kde-format msgid "Fold All Subdirs" msgstr "" -#: directorymergewindow.cpp:3392 +#: directorymergewindow.cpp:3406 #, kde-format msgid "Unfold All Subdirs" msgstr "" #. i18n("Save Directory Merge State ..."), 0, this, &DirectoryMergeWindow::slotSaveMergeState, ac, "dir_save_merge_state"); #. i18n("Load Directory Merge State ..."), 0, this, &DirectoryMergeWindow::slotLoadMergeState, ac, "dir_load_merge_state"); -#: directorymergewindow.cpp:3396 +#: directorymergewindow.cpp:3410 #, kde-format msgid "Choose A for All Items" msgstr "" -#: directorymergewindow.cpp:3397 +#: directorymergewindow.cpp:3411 #, kde-format msgid "Choose B for All Items" msgstr "" -#: directorymergewindow.cpp:3398 +#: directorymergewindow.cpp:3412 #, kde-format msgid "Choose C for All Items" msgstr "" -#: directorymergewindow.cpp:3399 +#: directorymergewindow.cpp:3413 #, kde-format msgid "Auto-Choose Operation for All Items" msgstr "" -#: directorymergewindow.cpp:3400 +#: directorymergewindow.cpp:3414 #, kde-format msgid "No Operation for All Items" msgstr "" #. i18n("Synchronize Directories"), 0, this, &DirectoryMergeWindow::slotSynchronizeDirectories, ac, "dir_synchronize_directories"); #. d->m_pDirChooseNewerFiles = GuiUtils::createAction< KToggleAction >(i18n("Copy Newer Files Instead of Merging"), 0, this, &DirectoryMergeWindow::slotChooseNewerFiles, ac, "dir_choose_newer_files"); -#: directorymergewindow.cpp:3405 +#: directorymergewindow.cpp:3419 #, kde-format msgid "Show Identical Files" msgstr "" -#: directorymergewindow.cpp:3405 +#: directorymergewindow.cpp:3419 #, kde-format msgid "" "Identical\n" "Files" msgstr "" -#: directorymergewindow.cpp:3406 +#: directorymergewindow.cpp:3420 #, kde-format msgid "Show Different Files" msgstr "" -#: directorymergewindow.cpp:3407 +#: directorymergewindow.cpp:3421 #, kde-format msgid "Show Files only in A" msgstr "" -#: directorymergewindow.cpp:3407 +#: directorymergewindow.cpp:3421 #, kde-format msgid "" "Files\n" "only in A" msgstr "" -#: directorymergewindow.cpp:3408 +#: directorymergewindow.cpp:3422 #, kde-format msgid "Show Files only in B" msgstr "" -#: directorymergewindow.cpp:3408 +#: directorymergewindow.cpp:3422 #, kde-format msgid "" "Files\n" "only in B" msgstr "" -#: directorymergewindow.cpp:3409 +#: directorymergewindow.cpp:3423 #, kde-format msgid "Show Files only in C" msgstr "" -#: directorymergewindow.cpp:3409 +#: directorymergewindow.cpp:3423 #, kde-format msgid "" "Files\n" "only in C" msgstr "" -#: directorymergewindow.cpp:3413 +#: directorymergewindow.cpp:3427 #, kde-format msgid "Compare Explicitly Selected Files" msgstr "" -#: directorymergewindow.cpp:3414 +#: directorymergewindow.cpp:3428 #, kde-format msgid "Merge Explicitly Selected Files" msgstr "" -#: directorymergewindow.cpp:3416 directorymergewindow.cpp:3423 +#: directorymergewindow.cpp:3430 directorymergewindow.cpp:3437 #, kde-format msgid "Do Nothing" msgstr "" -#: directorymergewindow.cpp:3428 +#: directorymergewindow.cpp:3442 #, kde-format msgid "Delete A && B" msgstr "" -#: directorymergewindow.cpp:3431 +#: directorymergewindow.cpp:3445 #, kde-format msgid "Merge to A && B" msgstr "" -#: fileaccess.cpp:462 SourceData.cpp:493 +#: fileaccess.cpp:301 +#, kde-format +msgid "Unable to determine full url. No parent specified." +msgstr "" + +#: fileaccess.cpp:482 SourceData.cpp:506 #, fuzzy, kde-format #| msgid "Reading file: %1" msgid "Failed to read file: %1" msgstr "ഫയല്‍ വായിക്കുന്നു: %1" -#: fileaccess.cpp:587 +#: fileaccess.cpp:624 #, kde-format msgid "Creating temp copy of %1 failed." msgstr "" -#: fileaccess.cpp:595 fileaccess.cpp:600 +#: fileaccess.cpp:632 fileaccess.cpp:637 #, fuzzy, kde-format #| msgid "Saving failed." msgid "Opening %1 failed. %2" msgstr "സൂക്ഷിക്കുന്നതു് പരാജയപ്പെട്ടു." -#: fileaccess.cpp:619 fileaccess.cpp:627 +#: fileaccess.cpp:656 fileaccess.cpp:664 #, kde-format msgid "Error reading from %1. %2" msgstr "" -#: fileaccess.cpp:751 +#: fileaccess.cpp:788 #, fuzzy, kde-format #| msgid "" #| "While trying to make a backup, deleting an older backup failed. \n" @@ -945,7 +950,7 @@ "ഭാവിയിലേക്കായി കരുതാന്‍ ശ്രമിക്കുമ്പോള്‍ പഴയ കരുതല്‍ മായ്ക്കുന്നത് പരാജയപ്പെട്ടു.\n" "ഫയല്‍നാമം: " -#: fileaccess.cpp:758 +#: fileaccess.cpp:795 #, fuzzy, kde-format #| msgid "" #| "While trying to make a backup, renaming failed. \n" @@ -957,179 +962,180 @@ "ഭാവിയിലേക്കായി കരുതാന്‍ ശ്രമിക്കുമ്പോള്‍ പുഅര്നാമകരണം പരാജയപ്പെട്ടു.\n" " ഫയല്‍നാമം: " -#: fileaccess.cpp:828 +#: fileaccess.cpp:865 #, kde-format msgid "Getting file status: %1" msgstr "ഫയല്‍ നിലവാരം എടുക്കുന്നു: %1" -#: fileaccess.cpp:869 +#: fileaccess.cpp:906 #, kde-format msgid "Reading file: %1" msgstr "ഫയല്‍ വായിക്കുന്നു: %1" -#: fileaccess.cpp:907 +#: fileaccess.cpp:944 #, kde-format msgid "Writing file: %1" msgstr "ഫയലില്‍ എഴുതി ചേര്ക്കുന്നു: %1" -#: fileaccess.cpp:940 +#: fileaccess.cpp:977 #, kde-format msgid "Out of memory" msgstr "ഓര്മ്മക്ക് പുറത്താണ്" -#: fileaccess.cpp:976 +#: fileaccess.cpp:1013 #, kde-format msgid "Making directory: %1" msgstr "തട്ട് പണിയുന്നു: %1" -#: fileaccess.cpp:997 +#: fileaccess.cpp:1034 #, kde-format msgid "Removing directory: %1" msgstr "തട്ട് നീക്കം ചെയ്യുന്നു: %1" -#: fileaccess.cpp:1012 +#: fileaccess.cpp:1049 #, kde-format msgid "Removing file: %1" msgstr "ഫയല്‍ നീക്കം ചെയ്യുന്നു: %1" -#: fileaccess.cpp:1028 +#: fileaccess.cpp:1065 #, kde-format msgid "Creating symbolic link: %1 -> %2" msgstr "പ്രതീകാത്മക കണ്ണി സൃഷ്ടിക്കുന്നു: %1->%2" -#: fileaccess.cpp:1052 +#: fileaccess.cpp:1089 #, kde-format msgid "Renaming file: %1 -> %2" msgstr "ഫയല്‍ പുനര്നാമകരണം ചെയ്യുന്നു: %1->%2 " -#: fileaccess.cpp:1086 +#: fileaccess.cpp:1123 #, kde-format msgid "Copying file: %1 -> %2" msgstr "ഫയല്‍ പകര്ത്തുന്നു: %1->%2" -#: fileaccess.cpp:1108 +#: fileaccess.cpp:1145 #, fuzzy, kde-format #| msgid "Reading directory: " msgid "Reading directory: %1" msgstr "തട്ട് വായിക്കുന്നു:" -#: fileaccess.cpp:1162 +#: fileaccess.cpp:1202 #, kde-format msgid "Listing directory: %1" msgstr "തട്ട് പട്ടികയാക്കുന്നു:%1" -#: kdiff3.cpp:181 +#: kdiff3.cpp:182 #, kde-format msgid "Current Configuration:" msgstr "നിലവിലുള്ള ക്രമീകരണം:" -#: kdiff3.cpp:186 +#: kdiff3.cpp:187 #, kde-format msgid "Config Option Error:" msgstr "ക്രമീകരണ ഐച്ഛികത്തിലെ പിശക്:" -#: kdiff3.cpp:240 +#: kdiff3.cpp:246 #, kde-format msgid "Option --auto used, but no output file specified." msgstr "--auto ഐച്ഛികം ഉപയോഗിച്ചിച്ചുണ്ടെങ്കിലും, ഉല്പന്ന ഫയല്‍ നിര്‍ദ്ദേശിച്ചിട്ടില്ല." -#: kdiff3.cpp:416 +#: kdiff3.cpp:405 #, kde-format msgid "Option --auto ignored for directory comparison." msgstr "--auto ഐച്ഛികം തട്ടുകളുടെ താരതമ്യ‌‌ത്തിനു് അവഗണിച്ചു." -#: kdiff3.cpp:460 +#: kdiff3.cpp:449 #, kde-format msgid "Saving failed." msgstr "സൂക്ഷിക്കുന്നതു് പരാജയപ്പെട്ടു." -#: kdiff3.cpp:496 pdiff.cpp:1098 +#: kdiff3.cpp:494 pdiff.cpp:1096 #, kde-format msgid "Opening of these files failed:" msgstr "ഈ ഫയലുകള്‍ തുറക്കുന്നത് പരാജയപ്പെട്ടു:" -#: kdiff3.cpp:505 -#, kde-format -msgid "File Open Error" +#: kdiff3.cpp:503 pdiff.cpp:1105 +#, fuzzy, kde-format +#| msgid "File Open Error" +msgid "File open error" msgstr "ഫയല്‍ തുറക്കുന്നതില്‍ പിശക്" -#: kdiff3.cpp:533 +#: kdiff3.cpp:532 #, kde-format msgid "Opens documents for comparison..." msgstr "താരതമ്യ‌‌ത്തിനായി പ്രമാണങ്ങള്‍ തുറക്കുന്നു..." -#: kdiff3.cpp:535 +#: kdiff3.cpp:534 #, kde-format msgid "Reload" msgstr "വീണ്ടും കയറ്റുക" -#: kdiff3.cpp:538 +#: kdiff3.cpp:537 #, kde-format msgid "Saves the merge result. All conflicts must be solved!" msgstr "ലയനഫലം സൂക്ഷിയ്ക്കുന്നു. എല്ലാ വൈരുദ്ധ്യ‌ങ്ങളും പരിഹരിക്കപ്പെടണം!" -#: kdiff3.cpp:540 +#: kdiff3.cpp:539 #, kde-format msgid "Saves the current document as..." msgstr "നിലവിലുള്ള പ്രമാണങ്ങള്‍ ഇങ്ങനെ സൂക്ഷിയ്ക്കുന്നു..." -#: kdiff3.cpp:543 +#: kdiff3.cpp:542 #, kde-format msgid "Print the differences" msgstr "വ്യ‌‌ത്യാ‌‌സങ്ങള്‍ അച്ചടിയ്ക്കുക" -#: kdiff3.cpp:546 +#: kdiff3.cpp:545 #, kde-format msgid "Quits the application" msgstr "പ്രയോഗം വിട്ടുപോകുന്നു" -#: kdiff3.cpp:549 +#: kdiff3.cpp:548 #, kde-format msgid "Cuts the selected section and puts it to the clipboard" msgstr "തെരഞ്ഞെടുത്ത ഭാഗം മുറിച്ചെടുത്ത് ഓര്‍മ്മച്ചെപ്പില്‍ വെയ്ക്കുന്നു" -#: kdiff3.cpp:552 +#: kdiff3.cpp:551 #, kde-format msgid "Copies the selected section to the clipboard" msgstr "തെരഞ്ഞെടുത്ത ഭാഗം പകര്‍ത്തെടുത്ത് ഓര്‍മ്മച്ചെപ്പില്‍ വെയ്ക്കുന്നു" -#: kdiff3.cpp:554 +#: kdiff3.cpp:553 #, fuzzy, kde-format #| msgid "Pastes the clipboard contents to actual position" msgid "Pastes the clipboard contents to current position" msgstr "ഓര്‍മ്മച്ചെപ്പിലെ ഉള്ളടക്കം യഥാസ്ഥാനത്ത് പതിക്കുന്നു" -#: kdiff3.cpp:557 +#: kdiff3.cpp:556 #, kde-format msgid "Select everything in current window" msgstr "നിലവിലുള്ള ജാലകത്തിലെ എല്ലാം തെരഞ്ഞെടുക്കുക" -#: kdiff3.cpp:560 +#: kdiff3.cpp:559 #, kde-format msgid "Search for a string" msgstr "ഒരു അക്ഷരനിര പരതുന്നു" -#: kdiff3.cpp:562 +#: kdiff3.cpp:561 #, kde-format msgid "Search again for the string" msgstr "വീണ്ടും ആ അക്ഷരനിര പരതുന്നു" -#: kdiff3.cpp:567 +#: kdiff3.cpp:566 #, kde-format msgid "Enables/disables the statusbar" msgstr "നിലവാരപ്പട്ട പ്രാവര്‍ത്തികമാക്കുന്നു/പ്രവര്‍ത്തനരഹിതമാക്കുന്നു" -#: kdiff3.cpp:571 +#: kdiff3.cpp:570 #, kde-format msgid "Configure KDiff3..." msgstr "കെഡിഫ്3 ക്രമീകരിക്കാം..." -#: kdiff3.cpp:590 +#: kdiff3.cpp:589 #, kde-format msgid "Go to Current Delta" msgstr "നിലവിലുള്ള ഡെല്‍ട്ടയിലേക്ക് പോകുക" -#: kdiff3.cpp:590 +#: kdiff3.cpp:589 #, kde-format msgid "" "Current\n" @@ -1138,12 +1144,12 @@ "നിലവിലുള്ള\n" "ഡെല്‍ട്ട" -#: kdiff3.cpp:592 +#: kdiff3.cpp:591 #, kde-format msgid "Go to First Delta" msgstr "ആദ്യ ഡെല്‍ട്ടയിലേക്ക് പോകുക" -#: kdiff3.cpp:592 +#: kdiff3.cpp:591 #, kde-format msgid "" "First\n" @@ -1152,12 +1158,12 @@ "ആദ്യ‌‌ത്തെ\n" "ഡെല്‍ട്ട" -#: kdiff3.cpp:594 +#: kdiff3.cpp:593 #, kde-format msgid "Go to Last Delta" msgstr "അവസാന ഡെല്‍ട്ടയിലേക്ക് പോകുക" -#: kdiff3.cpp:594 +#: kdiff3.cpp:593 #, kde-format msgid "" "Last\n" @@ -1166,14 +1172,14 @@ "അവസാന\n" "ഡെല്‍ട്ട" -#: kdiff3.cpp:596 +#: kdiff3.cpp:595 #, kde-format msgid "(Skips white space differences when \"Show White Space\" is disabled.)" msgstr "" "(\"ഒഴിഞ്ഞ ഇടങ്ങള്‍ കാണിയ്ക്കുക\" പ്രവര്‍ത്തമരഹിതമാക്കിയാല്‍ ഒഴിഞ്ഞ ഇടങ്ങളിലെ വ്യ‌‌ത്യാ‌‌സങ്ങള്‍ " "ഒഴിവാക്കുന്നു.)" -#: kdiff3.cpp:597 +#: kdiff3.cpp:596 #, kde-format msgid "" "(Does not skip white space differences even when \"Show White Space\" is " @@ -1182,12 +1188,12 @@ "( \"ഒഴിഞ്ഞ ഇടങ്ങള്‍ കാണിയ്ക്കുക\" പ്രവര്‍ത്തമരഹിതമാക്കിയാലും ഒഴിഞ്ഞ ഇടങ്ങളുടെ വ്യ‌‌ത്യാ‌‌സങ്ങള്‍ " "ഒഴിവാക്കുന്നില്ല.)" -#: kdiff3.cpp:598 +#: kdiff3.cpp:597 #, kde-format msgid "Go to Previous Delta" msgstr "മുന്‍ ഡെല്‍ട്ടയിലേക്ക് പോകുക" -#: kdiff3.cpp:598 +#: kdiff3.cpp:597 #, kde-format msgid "" "Prev\n" @@ -1196,12 +1202,12 @@ "മുന്‍\n" "ഡെല്‍ട്ട" -#: kdiff3.cpp:600 +#: kdiff3.cpp:599 #, kde-format msgid "Go to Next Delta" msgstr "അടുത്ത ഡെല്‍ട്ടയിലേക്ക് പോകുക" -#: kdiff3.cpp:600 +#: kdiff3.cpp:599 #, kde-format msgid "" "Next\n" @@ -1210,12 +1216,12 @@ "അടുത്ത\n" "ഡെല്‍ട്ട" -#: kdiff3.cpp:602 +#: kdiff3.cpp:601 #, kde-format msgid "Go to Previous Conflict" msgstr "മുന്‍ വൈരുദ്ധ്യത്തിലേക്ക് പോകുക" -#: kdiff3.cpp:602 +#: kdiff3.cpp:601 #, kde-format msgid "" "Prev\n" @@ -1224,12 +1230,12 @@ "മുന്‍\n" "വൈരുദ്ധ്യം" -#: kdiff3.cpp:604 +#: kdiff3.cpp:603 #, kde-format msgid "Go to Next Conflict" msgstr "അടുത്ത വൈരുദ്ധ്യത്തിലേക്ക് പോകുക" -#: kdiff3.cpp:604 +#: kdiff3.cpp:603 #, kde-format msgid "" "Next\n" @@ -1238,12 +1244,12 @@ "അടുത്ത\n" "വൈരുദ്ധ്യം" -#: kdiff3.cpp:606 +#: kdiff3.cpp:605 #, kde-format msgid "Go to Previous Unsolved Conflict" msgstr "പരിഹരിക്കപ്പെടാത്ത മുന്‍ വൈരുദ്ധ്യത്തിലേക്ക് പോകുക" -#: kdiff3.cpp:606 +#: kdiff3.cpp:605 #, kde-format msgid "" "Prev\n" @@ -1252,12 +1258,12 @@ "മുന്‍\n" "പരിഹരിക്കപ്പെടാത്ത" -#: kdiff3.cpp:608 +#: kdiff3.cpp:607 #, kde-format msgid "Go to Next Unsolved Conflict" msgstr "പരിഹരിക്കപ്പെടാത്ത അടുത്ത വൈരുദ്ധ്യത്തിലേക്ക് പോകുക" -#: kdiff3.cpp:608 +#: kdiff3.cpp:607 #, kde-format msgid "" "Next\n" @@ -1266,12 +1272,12 @@ "അടുത്ത\n" "പരിഹരിക്കപ്പെടാത്ത" -#: kdiff3.cpp:610 +#: kdiff3.cpp:609 #, kde-format msgid "Select Line(s) From A" msgstr "A യില്‍നിന്നു വരി (കള്‍) തെരഞ്ഞെടുക്കുക" -#: kdiff3.cpp:610 +#: kdiff3.cpp:609 #, kde-format msgid "" "Choose\n" @@ -1280,12 +1286,12 @@ "A\n" "തെരഞ്ഞെടുക്കുക" -#: kdiff3.cpp:611 +#: kdiff3.cpp:610 #, kde-format msgid "Select Line(s) From B" msgstr "B യില്‍നിന്നു വരി (കള്‍) തെരഞ്ഞെടുക്കുക" -#: kdiff3.cpp:611 +#: kdiff3.cpp:610 #, kde-format msgid "" "Choose\n" @@ -1294,12 +1300,12 @@ "B\n" "തെരഞ്ഞെടുക്കുക" -#: kdiff3.cpp:612 +#: kdiff3.cpp:611 #, kde-format msgid "Select Line(s) From C" msgstr "C യില്‍നിന്നു വരി (കള്‍) തെരഞ്ഞെടുക്കുക" -#: kdiff3.cpp:612 +#: kdiff3.cpp:611 #, kde-format msgid "" "Choose\n" @@ -1308,12 +1314,12 @@ "C\n" "തെരഞ്ഞെടുക്കുക" -#: kdiff3.cpp:613 +#: kdiff3.cpp:612 #, kde-format msgid "Automatically Go to Next Unsolved Conflict After Source Selection" msgstr "സ്രോതസ്സ് തെരഞ്ഞെടുത്താല്‍ സ്വയം അടുത്ത പരിഹരിക്കപ്പെടാത്ത വൈരുദ്ധ്യ‌ത്തിലേക്ക് പോകുക" -#: kdiff3.cpp:613 +#: kdiff3.cpp:612 #, kde-format msgid "" "Auto\n" @@ -1322,13 +1328,13 @@ "സ്വയം\n" "അടുത്ത" -#: kdiff3.cpp:615 +#: kdiff3.cpp:614 #, fuzzy, kde-format #| msgid "Show Space && Tabulator Characters for Differences" msgid "Show Space && Tabulator Characters" msgstr "വ്യ‌‌ത്യാ‌‌സങ്ങള്‍ക്കായി ഇടവും പട്ടികയുടെ ചിഹ്നങ്ങളും കാണിക്കുക" -#: kdiff3.cpp:615 +#: kdiff3.cpp:614 #, kde-format msgid "" "White\n" @@ -1337,12 +1343,12 @@ "ഒഴിഞ്ഞ\n" "അക്ഷരങ്ങള്‍" -#: kdiff3.cpp:616 +#: kdiff3.cpp:615 #, kde-format msgid "Show White Space" msgstr "ശുഭ്രസ്ഥാനങ്ങള്‍ കാണിക്കുക" -#: kdiff3.cpp:616 +#: kdiff3.cpp:615 #, kde-format msgid "" "White\n" @@ -1351,12 +1357,12 @@ "എഴുതുക\n" "ഡെല്‍റ്റാസ്" -#: kdiff3.cpp:618 +#: kdiff3.cpp:617 #, kde-format msgid "Show Line Numbers" msgstr "വരികളുടെ നമ്പര്‍ കാണിക്കുക" -#: kdiff3.cpp:618 +#: kdiff3.cpp:617 #, kde-format msgid "" "Line\n" @@ -1365,196 +1371,196 @@ "വരി\n" "നമ്പര്‍" -#: kdiff3.cpp:620 +#: kdiff3.cpp:619 #, kde-format msgid "Automatically Solve Simple Conflicts" msgstr "നിസ്സാര വൈരുദ്ധ്യ‌ങ്ങള്‍ സ്വയം പരിഹരിക്കുക" -#: kdiff3.cpp:621 +#: kdiff3.cpp:620 #, kde-format msgid "Set Deltas to Conflicts" msgstr "വൈരുദ്ധ്യ‌ങ്ങള്‍ക്ക് ഡെല്‍റ്റകളെ തയ്യാറാക്കുക" -#: kdiff3.cpp:622 +#: kdiff3.cpp:621 #, kde-format msgid "Run Regular Expression Auto Merge" msgstr "റെഗുലര്‍ എക്സ്പ്രഷന്റെ യാന്ത്രികലയനം പ്രവര്‍ത്തിപ്പിക്കുക" -#: kdiff3.cpp:623 +#: kdiff3.cpp:622 #, kde-format msgid "Automatically Solve History Conflicts" msgstr "നാള്‍വഴി വൈരുദ്ധ്യ‌ങ്ങള്‍ സ്വയം പരിഹരിക്കുക" -#: kdiff3.cpp:624 +#: kdiff3.cpp:623 #, kde-format msgid "Split Diff At Selection" msgstr "തെരഞ്ഞെടുക്കുന്ന സമയത്ത് diff പിളര്ത്തുക" -#: kdiff3.cpp:625 +#: kdiff3.cpp:624 #, kde-format msgid "Join Selected Diffs" msgstr "തെരഞ്ഞെടുത്ത diff യോജിപ്പിക്കുക" -#: kdiff3.cpp:627 +#: kdiff3.cpp:626 #, kde-format msgid "Show Window A" msgstr "ജാലകം A കാണിക്കുക" -#: kdiff3.cpp:628 +#: kdiff3.cpp:627 #, kde-format msgid "Show Window B" msgstr "ജാലകം B കാണിക്കുക" -#: kdiff3.cpp:629 +#: kdiff3.cpp:628 #, kde-format msgid "Show Window C" msgstr "ജാലകം Cകാണിക്കുക" -#: kdiff3.cpp:631 +#: kdiff3.cpp:630 #, kde-format msgid "Normal Overview" msgstr "സാധാരണ ചെറുവിവരണം" -#: kdiff3.cpp:632 +#: kdiff3.cpp:631 #, kde-format msgid "A vs. B Overview" msgstr "A ക്കും Bക്കും പൊതുവായ ചെറുവിവരണം" -#: kdiff3.cpp:633 +#: kdiff3.cpp:632 #, kde-format msgid "A vs. C Overview" msgstr "A ക്കും Cക്കും പൊതുവായ ചെറുവിവരണം" -#: kdiff3.cpp:634 +#: kdiff3.cpp:633 #, kde-format msgid "B vs. C Overview" msgstr " Bക്കും Cക്കും പൊതുവായ ചെറുവിവരണം" -#: kdiff3.cpp:635 +#: kdiff3.cpp:634 #, kde-format msgid "Word Wrap Diff Windows" msgstr "ഡിഫ് ജാലകങ്ങളിലെ വാക്കുകള്‍ ഒതുക്കുക" -#: kdiff3.cpp:636 +#: kdiff3.cpp:635 #, kde-format msgid "Add Manual Diff Alignment" msgstr "ഡിഫില്‍ മാനവികമായി നിര ഒപ്പിക്കല്‍ ചേര്‍ക്കുക" -#: kdiff3.cpp:637 +#: kdiff3.cpp:636 #, kde-format msgid "Clear All Manual Diff Alignments" msgstr "ഡിഫിലെ എല്ലാ‍ മാനവികമായ നിര ഒപ്പിക്കലും നീക്കം ചെയ്യുക" -#: kdiff3.cpp:639 +#: kdiff3.cpp:638 #, kde-format msgid "Focus Next Window" msgstr "അടുത്ത ജാലകത്തില്‍ കേന്ദ്രീകരിക്കുക" -#: kdiff3.cpp:640 +#: kdiff3.cpp:639 #, kde-format msgid "Focus Prev Window" msgstr "പിന്നിട്ട ജാലകത്തില്‍ കേന്ദ്രീകരിക്കുക" -#: kdiff3.cpp:641 +#: kdiff3.cpp:640 #, kde-format msgid "Toggle Split Orientation" msgstr "പിളര്ന്ന ഘടന മാറ്റുക" -#: kdiff3.cpp:643 +#: kdiff3.cpp:642 #, kde-format msgid "Dir && Text Split Screen View" msgstr "അറയും &പാഠങ്ങളും പിളര്ന്ന യവനികാദൃശ്യം" -#: kdiff3.cpp:645 +#: kdiff3.cpp:644 #, kde-format msgid "Toggle Between Dir && Text View" msgstr "അറയുടേയും പാഠങ്ങളുടേയും കാഴ്ചകള്‍ തമ്മില്‍ മാറ്റുക" -#: kdiff3.cpp:697 pdiff.cpp:1909 +#: kdiff3.cpp:696 pdiff.cpp:1919 #, fuzzy, kde-format #| msgid "The merge result hasn't been saved." msgid "The merge result has not been saved." msgstr "ലയനഫലം സംരക്ഷിച്ചിട്ടില്ല." -#: kdiff3.cpp:699 +#: kdiff3.cpp:698 #, kde-format msgid "Save && Quit" msgstr "സംരക്ഷിച്ച് &&വിട്ടുപോകുക" -#: kdiff3.cpp:700 +#: kdiff3.cpp:699 #, kde-format msgid "Quit Without Saving" msgstr "സംരക്ഷിക്കാതെ വിട്ടുപോകുക" -#: kdiff3.cpp:708 pdiff.cpp:1920 +#: kdiff3.cpp:707 pdiff.cpp:1930 #, kde-format msgid "Saving the merge result failed." msgstr "ലയനഫലം സൂക്ഷിയ്ക്കുന്നതില്‍ പരാജയം" -#: kdiff3.cpp:719 pdiff.cpp:1032 +#: kdiff3.cpp:718 pdiff.cpp:1030 #, kde-format msgid "" "You are currently doing a directory merge. Are you sure, you want to abort?" msgstr "ഇപ്പോള്‍ നിങ്ങള്‍ ഒരു തട്ട് ലയിപ്പിച്ചുകൊണ്ടിരിക്കുകയാണ്. അലസിപ്പിക്കണമെന്ന് ഉറപ്പാണോ?" -#: kdiff3.cpp:742 +#: kdiff3.cpp:741 #, kde-format msgid "Saving file..." msgstr "ഫയല്‍ സൂക്ഷിയ്ക്കുന്നു..." -#: kdiff3.cpp:759 +#: kdiff3.cpp:758 #, kde-format msgid "Saving file with a new filename..." msgstr "ഫയല്‍ ഒരു പുതിയ ഫയല്‍നാമത്തില്‍ സൂക്ഷിയ്ക്കുന്നു..." -#: kdiff3.cpp:761 +#: kdiff3.cpp:760 #, kde-format msgid "Save As..." msgstr "...ആയി സൂക്ഷിയ്ക്കുക" -#: kdiff3.cpp:820 +#: kdiff3.cpp:819 #, fuzzy, kde-format #| msgid "Printing completed." msgid "Printing not implemented." msgstr "അച്ചടി മുഴുവനായി" -#: kdiff3.cpp:857 +#: kdiff3.cpp:858 #, kde-format msgid "Printing..." msgstr "അച്ചടിക്കുന്നു" -#: kdiff3.cpp:943 +#: kdiff3.cpp:948 #, kde-format msgid "Printing page %1 of %2" msgstr "" -#: kdiff3.cpp:1000 +#: kdiff3.cpp:1006 #, fuzzy, kde-format #| msgid "Selection" msgid " (Selection)" msgstr "തെരഞ്ഞെടുക്കല്‍" -#: kdiff3.cpp:1027 +#: kdiff3.cpp:1034 #, kde-format msgid "Printing completed." msgstr "അച്ചടി മുഴുവനായി" -#: kdiff3.cpp:1031 +#: kdiff3.cpp:1038 #, kde-format msgid "Printing aborted." msgstr "അച്ചടി അലസി." -#: kdiff3.cpp:1038 +#: kdiff3.cpp:1045 #, kde-format msgid "Exiting..." msgstr "വിട്ടു പോകുന്നു..." -#: kdiff3.cpp:1049 +#: kdiff3.cpp:1056 #, kde-format msgid "Toggling toolbar..." msgstr "ഉപകരണപ്പട്ട മാറ്റുന്നു..." -#: kdiff3.cpp:1070 +#: kdiff3.cpp:1077 #, kde-format msgid "Toggle the statusbar..." msgstr "നിലവാരപ്പട്ട മാറ്റുക" @@ -1580,7 +1586,7 @@ msgid "Joachim Eibl" msgstr "" -#: kdiff3_part.cpp:173 kdiff3_part.cpp:254 +#: kdiff3_part.cpp:174 kdiff3_part.cpp:255 #, fuzzy, kde-format #| msgid "Opens documents for comparison..." msgid "Could not find files for comparison." @@ -1599,7 +1605,7 @@ msgstr "കെഡിഫ്3 ക്രമീകരിയ്ക്കുക" #. i18n: ectx: ToolBar (mainToolBar) -#: kdiff3_part.rc:16 main.cpp:88 +#: kdiff3_part.rc:16 main.cpp:89 #, kde-format msgid "KDiff3" msgstr "കെഡിഫ്3" @@ -1668,198 +1674,204 @@ msgid "Main Toolbar" msgstr "പ്രധാന ഉപകരണപ്പട്ട" -#: main.cpp:68 main.cpp:72 +#: main.cpp:69 main.cpp:73 #, kde-format msgid "Ignored. (User defined.)" msgstr "" -#: main.cpp:92 +#: main.cpp:93 #, kde-format msgid " (64 bit)" msgstr "" -#: main.cpp:94 +#: main.cpp:95 #, kde-format msgid " (32 bit)" msgstr "" -#: main.cpp:95 +#: main.cpp:96 #, kde-format msgid "Tool for Comparison and Merge of Files and Directories" msgstr "" -#: main.cpp:96 +#: main.cpp:97 #, kde-format msgid "(c) 2002-2014 Joachim Eibl, (c) 2017 Michael Reeves KF5/Qt5 port" msgstr "" -#: main.cpp:112 +#: main.cpp:113 #, kde-format msgid "Merge the input." msgstr "" -#: main.cpp:113 +#: main.cpp:114 #, kde-format msgid "Explicit base file. For compatibility with certain tools." msgstr "" -#: main.cpp:114 +#: main.cpp:115 #, kde-format msgid "Output file. Implies -m. E.g.: -o newfile.txt" msgstr "" -#: main.cpp:115 +#: main.cpp:116 #, kde-format msgid "Output file, again. (For compatibility with certain tools.)" msgstr "" -#: main.cpp:116 +#: main.cpp:118 #, kde-format msgid "No GUI if all conflicts are auto-solvable. (Needs -o file)" msgstr "" -#: main.cpp:117 +#: main.cpp:120 +#, fuzzy, kde-format +#| msgid "Ignore" +msgid "Ignored." +msgstr "അവഗണിയ്ക്കുക" + +#: main.cpp:122 #, kde-format msgid "Do not solve conflicts automatically." msgstr "" -#: main.cpp:118 +#: main.cpp:123 #, kde-format msgid "Visible name replacement for input file 1 (base)." msgstr "" -#: main.cpp:119 +#: main.cpp:124 #, kde-format msgid "Visible name replacement for input file 2." msgstr "" -#: main.cpp:120 +#: main.cpp:125 #, kde-format msgid "Visible name replacement for input file 3." msgstr "" -#: main.cpp:121 +#: main.cpp:126 #, kde-format msgid "Alternative visible name replacement. Supply this once for every input." msgstr "" -#: main.cpp:122 +#: main.cpp:127 #, kde-format msgid "" "Override a config setting. Use once for every setting. E.g.: --cs " "\"AutoAdvance=1\"" msgstr "" -#: main.cpp:123 +#: main.cpp:128 #, kde-format msgid "Show list of config settings and current values." msgstr "" -#: main.cpp:124 +#: main.cpp:129 #, kde-format msgid "Use a different config file." msgstr "" -#: main.cpp:127 +#: main.cpp:132 #, kde-format msgid "file1 to open (base, if not specified via --base)" msgstr "" -#: main.cpp:128 +#: main.cpp:133 #, kde-format msgid "file2 to open" msgstr "" -#: main.cpp:129 +#: main.cpp:134 #, kde-format msgid "file3 to open" msgstr "" -#: main.cpp:153 +#: main.cpp:158 #, kde-format msgid "See kdiff3 --help for supported options." msgstr "" -#: mergeresultwindow.cpp:158 +#: mergeresultwindow.cpp:171 #, kde-format msgid "Choose A Everywhere" msgstr "എല്ലായിടത്തും A തെരഞ്ഞെടുക്കുക" -#: mergeresultwindow.cpp:159 +#: mergeresultwindow.cpp:172 #, kde-format msgid "Choose B Everywhere" msgstr "എല്ലായിടത്തും B തെരഞ്ഞെടുക്കുക" -#: mergeresultwindow.cpp:160 +#: mergeresultwindow.cpp:173 #, kde-format msgid "Choose C Everywhere" msgstr "എല്ലായിടത്തും C തെരഞ്ഞെടുക്കുക" -#: mergeresultwindow.cpp:161 +#: mergeresultwindow.cpp:174 #, kde-format msgid "Choose A for All Unsolved Conflicts" msgstr "പരിഹരിക്കപ്പെടാത്ത എല്ലാ വൈരുദ്ധ്യ‌ങ്ങള്‍ക്കും A തെരഞ്ഞെടുക്കുക" -#: mergeresultwindow.cpp:162 +#: mergeresultwindow.cpp:175 #, kde-format msgid "Choose B for All Unsolved Conflicts" msgstr "പരിഹരിക്കപ്പെടാത്ത എല്ലാ വൈരുദ്ധ്യ‌ങ്ങള്‍ക്കും B തെരഞ്ഞെടുക്കുക" -#: mergeresultwindow.cpp:163 +#: mergeresultwindow.cpp:176 #, kde-format msgid "Choose C for All Unsolved Conflicts" msgstr "പരിഹരിക്കപ്പെടാത്ത എല്ലാ വൈരുദ്ധ്യ‌ങ്ങള്‍ക്കും C തെരഞ്ഞെടുക്കുക" -#: mergeresultwindow.cpp:164 +#: mergeresultwindow.cpp:177 #, kde-format msgid "Choose A for All Unsolved Whitespace Conflicts" msgstr "പരിഹരിക്കപ്പെടാത്ത എല്ലാ ശുഭ്രസ്ഥാനങ്ങള്‍ക്കും A തെരഞ്ഞെടുക്കുക" -#: mergeresultwindow.cpp:165 +#: mergeresultwindow.cpp:178 #, kde-format msgid "Choose B for All Unsolved Whitespace Conflicts" msgstr "പരിഹരിക്കപ്പെടാത്ത എല്ലാ ശുഭ്രസ്ഥാനങ്ങള്‍ക്കും B തെരഞ്ഞെടുക്കുക" -#: mergeresultwindow.cpp:166 +#: mergeresultwindow.cpp:179 #, kde-format msgid "Choose C for All Unsolved Whitespace Conflicts" msgstr "പരിഹരിക്കപ്പെടാത്ത എല്ലാ ശുഭ്രസ്ഥാനങ്ങള്‍ക്കും C തെരഞ്ഞെടുക്കുക" -#: mergeresultwindow.cpp:176 +#: mergeresultwindow.cpp:204 #, kde-format msgid "Number of remaining unsolved conflicts: %1 (of which %2 are whitespace)" msgstr "" -#: mergeresultwindow.cpp:370 +#: mergeresultwindow.cpp:398 #, kde-format msgid "" "The output has been modified.\n" "If you continue your changes will be lost." msgstr "" -#: mergeresultwindow.cpp:936 pdiff.cpp:827 +#: mergeresultwindow.cpp:964 pdiff.cpp:817 #, kde-format msgid "All input files are binary equal." msgstr "" -#: mergeresultwindow.cpp:938 +#: mergeresultwindow.cpp:966 #, kde-format msgid "All input files contain the same text." msgstr "" -#: mergeresultwindow.cpp:942 mergeresultwindow.cpp:946 -#: mergeresultwindow.cpp:950 pdiff.cpp:833 pdiff.cpp:837 pdiff.cpp:841 +#: mergeresultwindow.cpp:970 mergeresultwindow.cpp:974 +#: mergeresultwindow.cpp:978 pdiff.cpp:823 pdiff.cpp:827 pdiff.cpp:831 #, kde-format msgid "Files %1 and %2 are binary equal.\n" msgstr "" -#: mergeresultwindow.cpp:944 mergeresultwindow.cpp:948 -#: mergeresultwindow.cpp:952 +#: mergeresultwindow.cpp:972 mergeresultwindow.cpp:976 +#: mergeresultwindow.cpp:980 #, kde-format msgid "Files %1 and %2 have equal text.\n" msgstr "" -#: mergeresultwindow.cpp:958 +#: mergeresultwindow.cpp:986 #, kde-format msgid "" "Total number of conflicts: %1\n" @@ -1868,39 +1880,39 @@ "%4" msgstr "" -#: mergeresultwindow.cpp:964 +#: mergeresultwindow.cpp:992 #, kde-format msgid "Conflicts" msgstr "വൈരുദ്ധ്യങ്ങള്‍" -#: mergeresultwindow.cpp:1873 +#: mergeresultwindow.cpp:1901 #, kde-format msgid "" msgstr "<സ്രോതസ്സില്‍ വരിയില്ല>" -#: mergeresultwindow.cpp:1881 +#: mergeresultwindow.cpp:1909 #, kde-format msgid "" msgstr "<ലയനത്തില്‍ വൈരുദ്ധ്യം (ഒഴിഞ്ഞ സ്ഥലം മാത്രം)>" -#: mergeresultwindow.cpp:1883 mergeresultwindow.cpp:2755 +#: mergeresultwindow.cpp:1911 mergeresultwindow.cpp:2783 #, kde-format msgid "" msgstr "<ലയനത്തില്‍ വൈരുദ്ധ്യം>" -#: mergeresultwindow.cpp:2967 +#: mergeresultwindow.cpp:2995 #, kde-format msgid "" "Not all conflicts are solved yet.\n" "File not saved." msgstr "" -#: mergeresultwindow.cpp:2969 mergeresultwindow.cpp:2978 +#: mergeresultwindow.cpp:2997 mergeresultwindow.cpp:3006 #, kde-format msgid "Conflicts Left" msgstr "ബാക്കിയുള്ള വൈരുദ്ധ്യങ്ങള്‍" -#: mergeresultwindow.cpp:2976 +#: mergeresultwindow.cpp:3004 #, kde-format msgid "" "There is a line end style conflict. Please choose the line end style " @@ -1908,7 +1920,7 @@ "File not saved." msgstr "" -#: mergeresultwindow.cpp:2990 +#: mergeresultwindow.cpp:3018 #, kde-format msgid "" "\n" @@ -1916,57 +1928,57 @@ "Creating backup failed. File not saved." msgstr "" -#: mergeresultwindow.cpp:2990 mergeresultwindow.cpp:3038 +#: mergeresultwindow.cpp:3018 mergeresultwindow.cpp:3066 #, kde-format msgid "File Save Error" msgstr "" -#: mergeresultwindow.cpp:3038 +#: mergeresultwindow.cpp:3066 #, kde-format msgid "Error while writing." msgstr "" -#: mergeresultwindow.cpp:3110 +#: mergeresultwindow.cpp:3138 #, kde-format msgid "Output:" msgstr "" -#: mergeresultwindow.cpp:3123 mergeresultwindow.cpp:3315 +#: mergeresultwindow.cpp:3151 mergeresultwindow.cpp:3343 #, kde-format msgid "[Modified]" msgstr "" -#: mergeresultwindow.cpp:3130 +#: mergeresultwindow.cpp:3158 #, kde-format msgid "Encoding for saving:" msgstr "" -#: mergeresultwindow.cpp:3230 +#: mergeresultwindow.cpp:3258 #, kde-format msgid "Conflict" msgstr "വൈരുദ്ധ്യം" -#: mergeresultwindow.cpp:3262 +#: mergeresultwindow.cpp:3290 #, kde-format msgid "Codec from A: %1" msgstr "" -#: mergeresultwindow.cpp:3264 +#: mergeresultwindow.cpp:3292 #, kde-format msgid "Codec from B: %1" msgstr "" -#: mergeresultwindow.cpp:3266 +#: mergeresultwindow.cpp:3294 #, kde-format msgid "Codec from C: %1" msgstr "" -#: optiondialog.cpp:119 +#: optiondialog.cpp:121 #, kde-format msgid "Change Font" msgstr "" -#: optiondialog.cpp:135 optiondialog.cpp:145 +#: optiondialog.cpp:137 optiondialog.cpp:147 #, kde-format msgid "" "Font: %1, %2, %3\n" @@ -1974,161 +1986,161 @@ "Example:" msgstr "" -#: optiondialog.cpp:388 +#: optiondialog.cpp:390 #, kde-format msgid "Unicode" msgstr "യൂണിക്കോഡ്" -#: optiondialog.cpp:389 +#: optiondialog.cpp:391 #, kde-format msgid "Latin1" msgstr "ലാറ്റിന്‍1" -#: optiondialog.cpp:408 +#: optiondialog.cpp:410 #, kde-format msgid "Change this if non-ASCII characters are not displayed correctly." msgstr "ASCII അല്ലാത്ത ചിഹ്നങ്ങള്‍ ശരിയായി പ്രദര്ശിപ്പിക്കപ്പെടുന്നില്ലെങ്കില്‍ അത് മാറ്റുക" -#: optiondialog.cpp:491 +#: optiondialog.cpp:495 #, kde-format msgid "Configure" msgstr "ക്രമീകരിക്കുക" -#: optiondialog.cpp:568 +#: optiondialog.cpp:573 #, kde-format msgid "Font" msgstr "അക്ഷരരൂപം" -#: optiondialog.cpp:570 +#: optiondialog.cpp:575 #, kde-format msgid "Editor & Diff Output Font" msgstr "ഗ്രന്ധ പരിശോധകനും ഡിഫ് പുറത്ത് വിടുന്നതിന്റെ അക്ഷരരൂപവും" -#: optiondialog.cpp:589 +#: optiondialog.cpp:594 #, kde-format msgid "Application font" msgstr "" -#: optiondialog.cpp:594 +#: optiondialog.cpp:599 #, kde-format msgid "File view font" msgstr "" -#: optiondialog.cpp:613 +#: optiondialog.cpp:618 #, fuzzy, kde-format #| msgid "Color" msgctxt "Title for color settings page" msgid "Color" msgstr "വര്‍ണ്ണം" -#: optiondialog.cpp:614 +#: optiondialog.cpp:619 #, kde-format msgid "Colors Settings" msgstr "വര്‍ണ്ണങ്ങള്‍ ഉറപ്പിക്കല്‍ " -#: optiondialog.cpp:631 +#: optiondialog.cpp:644 #, kde-format msgid "Editor and Diff Views:" msgstr "ഗ്രന്ധപരിശോധകനും ഡിഫ് വീക്ഷണവും" -#: optiondialog.cpp:639 +#: optiondialog.cpp:652 #, kde-format msgid "Foreground color:" msgstr "പുരോതല വര്ണ്ണം:" -#: optiondialog.cpp:647 +#: optiondialog.cpp:660 #, kde-format msgid "Background color:" msgstr "പശ്ചാത്തല വര്‍ണ്ണം:" -#: optiondialog.cpp:657 +#: optiondialog.cpp:670 #, kde-format msgid "Diff background color:" msgstr "ഡിഫ് പശ്ചാത്തല വര്‍ണ്ണം:" -#: optiondialog.cpp:666 +#: optiondialog.cpp:679 #, kde-format msgid "Color A:" msgstr "വര്ണ്ണം ഏ:" -#: optiondialog.cpp:675 +#: optiondialog.cpp:688 #, kde-format msgid "Color B:" msgstr "വര്ണ്ണം ബി" -#: optiondialog.cpp:684 +#: optiondialog.cpp:697 #, kde-format msgid "Color C:" msgstr "വര്ണ്ണം സി" -#: optiondialog.cpp:692 +#: optiondialog.cpp:705 #, kde-format msgid "Conflict color:" msgstr "വര്ണ്ണ വൈരുദ്ധ്യം:" -#: optiondialog.cpp:701 +#: optiondialog.cpp:714 #, kde-format msgid "Current range background color:" msgstr "നടപ്പിലുള്ള റേഞ്ചിന്റെ പശ്ചാത്തല വര്ണ്ണം:" -#: optiondialog.cpp:710 +#: optiondialog.cpp:723 #, kde-format msgid "Current range diff background color:" msgstr "നടപ്പിലുള്ള റേഞ്ചിന്റെ ഡിഫ് പശ്ചാത്തല വര്ണ്ണം:" -#: optiondialog.cpp:718 +#: optiondialog.cpp:731 #, kde-format msgid "Color for manually aligned difference ranges:" msgstr "മാനവികമായി വരിയാക്കിയ വ്യ‌‌ത്യാ‌സ പരിധികളുടെ വര്ണ്ണം:" -#: optiondialog.cpp:725 +#: optiondialog.cpp:738 #, kde-format msgid "Directory Comparison View:" msgstr "അറകളുടെ താരതമ്യ‌‌വീക്ഷണം" -#: optiondialog.cpp:731 +#: optiondialog.cpp:744 #, kde-format msgid "Newest file color:" msgstr "ഏറ്റവും പുതിയ ഫയലിന്റെ വര്ണ്ണം" -#: optiondialog.cpp:736 +#: optiondialog.cpp:749 #, kde-format msgid "" "Changing this color will only be effective when starting the next directory " "comparison." msgstr "ഈ വര്ണ്ണം മാറുന്നത് മാത്രമേ അടുത്ത അറകളുടെ താരതമ്യം തുടങ്ങുമ്പോള്‍ഫലപ്രദമാകൂ." -#: optiondialog.cpp:741 +#: optiondialog.cpp:754 #, kde-format msgid "Oldest file color:" msgstr "ഏറ്റവും പഴയ ഫയലിന്റെ നിറം:" -#: optiondialog.cpp:750 +#: optiondialog.cpp:763 #, kde-format msgid "Middle age file color:" msgstr "മദ്ധ്യ‌‌കാല ഫയലിന്റെ നിറം:" -#: optiondialog.cpp:759 +#: optiondialog.cpp:772 #, kde-format msgid "Color for missing files:" msgstr "കാണാതെപോയ ഫയലിന്റെ നിറം" -#: optiondialog.cpp:773 +#: optiondialog.cpp:786 #, kde-format msgid "Editor" msgstr "ഗ്രന്ഥ പരിശോധകന്‍" -#: optiondialog.cpp:774 +#: optiondialog.cpp:787 #, kde-format msgid "Editor Behavior" msgstr "ഗ്രന്ഥ പരിശോധകന്റെ പെരുമാറ്റം" -#: optiondialog.cpp:787 +#: optiondialog.cpp:809 #, kde-format msgid "Tab inserts spaces" msgstr "തൊങ്ങല്‍ ഇടയ്ക്ക് സ്ഥലം ഇടുന്നു" -#: optiondialog.cpp:791 +#: optiondialog.cpp:813 #, fuzzy, kde-format msgid "" "On: Pressing tab generates the appropriate number of spaces.\n" @@ -2137,27 +2149,27 @@ "ഓണ്‍: ടാബ് കീ അമര്ത്തിയാല്‍ ആവശ്യ‌‌ത്തിനുള്ള അച്ചകലം സൃഷ്ടിക്കും.\n" "ഓഫ്: ഒരു ടാബ് ചിഹ്നം പതിക്കും." -#: optiondialog.cpp:796 +#: optiondialog.cpp:818 #, kde-format msgid "Tab size:" msgstr "ടാബ് അളവ്:" -#: optiondialog.cpp:803 +#: optiondialog.cpp:825 #, kde-format msgid "Auto indentation" msgstr "യാന്ത്രികമായി സ്ഥലം ഒഴിച്ചുവിടല്‍ " -#: optiondialog.cpp:807 +#: optiondialog.cpp:829 #, kde-format msgid "On: The indentation of the previous line is used for a new line.\n" msgstr "ഓണ്‍: മുന്‍ വരിയില്‍ സ്ഥലം ഒഴിച്ചു വിട്ടത് പുതിയ വരി തുടങ്ങാന്‍ ഉപയോഗിച്ചു.\n" -#: optiondialog.cpp:810 +#: optiondialog.cpp:832 #, kde-format msgid "Auto copy selection" msgstr "യാന്ത്രിക പകര്പ്പ് തെരഞ്ഞെടുക്കുക" -#: optiondialog.cpp:814 +#: optiondialog.cpp:836 #, fuzzy, kde-format #| msgid "" #| "On: Any selection is immediately written to the clipboard.\n" @@ -2169,7 +2181,7 @@ "ഓണ്‍: തെരഞ്ഞെടുത്തതെന്തും ഉടനടി ഓര്‍മ്മച്ചെപ്പില്‍ എഴുതപ്പെടും.\n" "ഓഫ്: നിങ്ങള്‍ നിസ്സംശയം പകര്‍പ്പെടുക്കണം. ഉദാഹരണമായി Ctrl+C വഴി." -#: optiondialog.cpp:829 +#: optiondialog.cpp:851 #, kde-format msgid "" "Sets the line endings for when an edited file is saved.\n" @@ -2178,12 +2190,12 @@ "ചിട്ടപ്പെടുത്തിക്കഴിഞ്ഞ ഒരു ഫയല്‍ സം‌രക്ഷിക്കുമ്പോള്‍ വരിയുടെ അവസാനം ഉറപ്പിക്കുന്നു.ഡോസ്/വിന്‍ഡോസ്: " "CR=0D, LF=0A നോട് ചേര്‍ത്ത് CR+LF; UNIX: LF" -#: optiondialog.cpp:839 +#: optiondialog.cpp:861 #, kde-format msgid "Diff" msgstr "ഡിഫ്" -#: optiondialog.cpp:840 +#: optiondialog.cpp:862 #, kde-format msgid "Diff Settings" msgstr "ഡിഫ് സജ്ജീകരണങ്ങള്‍" @@ -2197,13 +2209,13 @@ #. ); #. ++line; #. -#: optiondialog.cpp:865 +#: optiondialog.cpp:896 #, fuzzy, kde-format #| msgid "Treat as white space." msgid "Ignore numbers (treat as white space)" msgstr "വെളുത്ത അച്ചകലമായി കണക്കാക്കുക" -#: optiondialog.cpp:869 +#: optiondialog.cpp:900 #, kde-format msgid "" "Ignore number characters during line matching phase. (Similar to Ignore " @@ -2214,44 +2226,44 @@ "വിഗണിച്ചപോലെ.)\n" "ഫയലുകള്‍ സാംഖ്യ‌‌‌‌വിവരങ്ങളുമായി താരതമ്യം ചെയ്യാന്‍ സഹായിച്ചേയ്ക്കും." -#: optiondialog.cpp:873 +#: optiondialog.cpp:904 #, fuzzy, kde-format #| msgid "Treat C/C++ comments like white space." msgid "Ignore C/C++ comments (treat as white space)" msgstr "സി/സി++ വിശദീകരണം വെള്ള അച്ചകലമായി കണക്കാക്കുക." -#: optiondialog.cpp:876 +#: optiondialog.cpp:907 #, kde-format msgid "Treat C/C++ comments like white space." msgstr "സി/സി++ വിശദീകരണം വെള്ള അച്ചകലമായി കണക്കാക്കുക." -#: optiondialog.cpp:879 +#: optiondialog.cpp:910 #, fuzzy, kde-format #| msgid "Treat as white space." msgid "Ignore case (treat as white space)" msgstr "വെളുത്ത അച്ചകലമായി കണക്കാക്കുക" -#: optiondialog.cpp:883 +#: optiondialog.cpp:914 #, kde-format msgid "Treat case differences like white space changes. ('a'<=>'A')" msgstr "അക്ഷരങ്ങളുടെ അവസ്ഥാന്തരങ്ങള്‍ ‍വെള്ള അച്ചകലമായി കണക്കാക്കുക ('a'<=>'A'" -#: optiondialog.cpp:886 +#: optiondialog.cpp:917 #, kde-format msgid "Preprocessor command:" msgstr "പൂര്‍വ്വ പ്രക്രിയയ്ക്കുള്ള ആജ്ഞ:" -#: optiondialog.cpp:891 +#: optiondialog.cpp:922 #, kde-format msgid "User defined pre-processing. (See the docs for details.)" msgstr "ഉപയോക്താവ് നിര്‍വ്വചിയ്ക്കുന്ന പൂര്‍വ്വ -പ്രക്രിയ. ( വിശദീകരണങ്ങള്ക്ക് പ്രമാണപത്രം നോക്കുക.)" -#: optiondialog.cpp:894 +#: optiondialog.cpp:925 #, kde-format msgid "Line-matching preprocessor command:" msgstr "വരികളുടെ-ചേര്‍ച്ച നോക്കുന്ന പൂര്‍വ്വ പ്രക്രിയയ്ക്കുള്ള ആജ്ഞ:" -#: optiondialog.cpp:899 +#: optiondialog.cpp:930 #, kde-format msgid "" "This pre-processor is only used during line matching.\n" @@ -2260,12 +2272,12 @@ "വരികളുടെ ചേര്‍ച്ച നോക്കുമ്പോള്‍ മാത്രമേ ഈ പൂര്‍വ്വപ്രക്രിയ ഉപയോഗിക്കൂ.\n" "(വിശദീകരണങ്ങള്ക്ക് പ്രമാണപത്രം നോക്കുക.)" -#: optiondialog.cpp:902 +#: optiondialog.cpp:933 #, kde-format msgid "Try hard (slower)" msgstr "കഠിനമായി യത്നിക്കുക (സാവകാശം)" -#: optiondialog.cpp:906 +#: optiondialog.cpp:937 #, kde-format msgid "" "Enables the --minimal option for the external diff.\n" @@ -2274,12 +2286,12 @@ "പുറം ഡിഫിനായി --ഏറ്റവും കുറഞ്ഞ ഐച്ഛികങ്ങള്‍ സജീവമാക്കുന്നു.\n" "വളരെ വലിയ ഫയലുകളുടെ വിശകലനം വളരെ സാവധാനത്തിലായിരിക്കും." -#: optiondialog.cpp:910 +#: optiondialog.cpp:941 #, kde-format msgid "Align B and C for 3 input files" msgstr "3 അകത്തുവിടാനുള്ള ഫയലുകള്‍ക്കായി ബിയും സിയും നിര ഒപ്പിക്കുക." -#: optiondialog.cpp:914 +#: optiondialog.cpp:945 #, kde-format msgid "" "Try to align B and C when comparing or merging three input files.\n" @@ -2291,17 +2303,24 @@ "കൂടുതല്‍ കുഴപ്പം പിടിച്ചതായതുകൊണ്ട് ലയനത്തിന്റെ കാര്യ‌‌ത്തില്‍ അത് ശുപാര്‍ശ ചെയ്തിട്ടില്ല.\n" "(ഓഫ് ആണ് സഹജം.)" -#: optiondialog.cpp:926 +#: optiondialog.cpp:956 +#, fuzzy, kde-format +#| msgid "Merge" +msgctxt "Settings page" +msgid "Merge" +msgstr "ലയിപ്പിക്കുക" + +#: optiondialog.cpp:957 #, kde-format msgid "Merge Settings" msgstr "ഒരുക്കങ്ങള്‍ ലയിപ്പിക്കുക" -#: optiondialog.cpp:940 +#: optiondialog.cpp:980 #, kde-format msgid "Auto advance delay (ms):" msgstr "യാന്ത്രികമായ മുന്‍കൂര്‍ വിളംബം (മിസെ):" -#: optiondialog.cpp:946 +#: optiondialog.cpp:986 #, kde-format msgid "" "When in Auto-Advance mode the result of the current selection is shown \n" @@ -2311,27 +2330,27 @@ "തെരഞ്ഞെടുത്തതിന്റെ ഫലം നിര്‍ദ്ദേശിക്കപ്പെട്ടസമയത്തേയ്ക്ക് കാണിക്കും \n" "ദൈര്‍ഘ്യം: 0-2000മിസെ" -#: optiondialog.cpp:950 +#: optiondialog.cpp:990 #, kde-format msgid "Show info dialogs" msgstr "വിവരങ്ങളുടെ സംവാദ ജാലകം കാണിക്കുക" -#: optiondialog.cpp:953 +#: optiondialog.cpp:993 #, kde-format msgid "Show a dialog with information about the number of conflicts." msgstr "സംഘട്ടനങ്ങളുടെ എണ്ണത്തെ സംബന്ധിക്കുന്ന വിവരം ഒരു സംവാദജാലകത്തില്‍ കാണിക്കുക." -#: optiondialog.cpp:956 +#: optiondialog.cpp:996 #, kde-format msgid "White space 2-file merge default:" msgstr "ശുഭ്രസ്ഥാനം 2-ഫയല്‍ ലയനം സഹജം:" -#: optiondialog.cpp:961 optiondialog.cpp:974 +#: optiondialog.cpp:1001 optiondialog.cpp:1014 #, kde-format msgid "Manual Choice" msgstr "മാനവിക അവസരം" -#: optiondialog.cpp:965 optiondialog.cpp:979 +#: optiondialog.cpp:1005 optiondialog.cpp:1019 #, kde-format msgid "" "Allow the merge algorithm to automatically select an input for white-space-" @@ -2340,22 +2359,22 @@ "ശുഭ്ര-സ്ഥാനത്തിന്-മാത്രം വേണ്ടി സ്വയം നിക്ഷേപം തെരഞ്ഞെടുക്കാന്‍ ലയനത്തിനായുള്ള ആജ്ഞാസംഹിതക്ക് " "മാറ്റങ്ങള്‍ അനുവദിക്കുക" -#: optiondialog.cpp:969 +#: optiondialog.cpp:1009 #, kde-format msgid "White space 3-file merge default:" msgstr "ശുഭ്രസ്ഥാനം 3-ഫയല്‍ ലയനം സഹജം:" -#: optiondialog.cpp:983 +#: optiondialog.cpp:1023 #, kde-format msgid "Automatic Merge Regular Expression" msgstr "നിത്യഭാവം സ്വയമേവ ലയിപ്പിക്കുക" -#: optiondialog.cpp:991 smalldialogs.cpp:449 +#: optiondialog.cpp:1031 smalldialogs.cpp:459 #, kde-format msgid "Auto merge regular expression:" msgstr "നിത്യഭാവം സ്വയം ലയിപ്പിക്കുക:" -#: optiondialog.cpp:996 +#: optiondialog.cpp:1036 #, kde-format msgid "" "Regular expression for lines where KDiff3 should automatically choose one " @@ -2367,12 +2386,12 @@ "സംഘട്ടനമുള്ള വരി ചേര്‍ന്നുവരുമ്പോള്‍ അതിന്റെ നിത്യ‌‌ഭാവം\n" "-സി ഉണ്ടെങ്കില്‍ അത്, അല്ലെങ്കില്‍ ബി തെരഞ്ഞെടുക്കപ്പെടും." -#: optiondialog.cpp:1002 +#: optiondialog.cpp:1042 #, kde-format msgid "Run regular expression auto merge on merge start" msgstr "ലയനം തുടങ്ങുമ്പോള്‍ നിത്യ‌‌ഭാവത്തിന്റെ യാന്ത്രികലയനം പ്രവര്‍ത്തിപ്പിക്കുക" -#: optiondialog.cpp:1005 +#: optiondialog.cpp:1045 #, kde-format msgid "" "Run the merge for auto merge regular expressions\n" @@ -2381,17 +2400,17 @@ "ഒരു ലയനം തുടങ്ങുമ്പോള്‍ ഉടനെത്തന്നെ നിത്യഭാവത്തിന്റെ സ്വയം ലയനത്തിന്\n" " വേണ്ടി ലയനം പ്രവര്‍ത്തിപ്പിക്കുക.\n" -#: optiondialog.cpp:1010 +#: optiondialog.cpp:1050 #, kde-format msgid "Version Control History Merging" msgstr "ഭാഷാന്തര നിയന്ത്രണത്തിന്റെ നാള്‍വഴി ലയിപ്പിക്കല്‍" -#: optiondialog.cpp:1018 smalldialogs.cpp:476 +#: optiondialog.cpp:1058 smalldialogs.cpp:486 #, kde-format msgid "History start regular expression:" msgstr "നാള്‍വഴി നിത്യ‌‌ഭാവം തുടങ്ങുക:" -#: optiondialog.cpp:1023 +#: optiondialog.cpp:1063 #, fuzzy, kde-format msgid "" "Regular expression for the start of the version control history entry.\n" @@ -2403,12 +2422,12 @@ " ഉള്‍ക്കൊണ്ടിരിക്കും.\n" "തനത് മൂല്യം:\".*\\$Log.*\\$.*\"" -#: optiondialog.cpp:1029 smalldialogs.cpp:504 +#: optiondialog.cpp:1069 smalldialogs.cpp:514 #, kde-format msgid "History entry start regular expression:" msgstr "നാള്‍വഴി ചേര്‍ക്കുന്നത് നിത്യ‌‌ഭാവം തുടങ്ങും:" -#: optiondialog.cpp:1042 +#: optiondialog.cpp:1082 #, kde-format msgid "" "A version control history entry consists of several lines.\n" @@ -2422,26 +2441,26 @@ "ഒരു ഭാഷാന്തര നിയന്ത്രണത്തിന്റെ നാള്‍വഴി ചേര്‍ക്കുന്നതില്‍ പല വരികളുണ്ടാകും.\n" "ആദ്യ‌‌ത്തെ വരി കണ്ടുപിടിക്കാനുള്ള നിത്യ‌‌ഭാവം നിര്‍ദ്ദേശിക്കുക (മുന്നിലെ വിശദീകരണം കൂടാതെ).\n" "ഇനം തിരിക്കാനുപയോഗിക്കുന്ന കീകളെ ഒന്നിച്ചാക്കാന്‍ ബ്രാക്കറ്റുകള്‍ ഉപയോഗിക്കുക.\n" -"ഒഴിച്ചു വിട്ടാല്‍ ഒഴിഞ്ഞ വരികള്‍ നാള്‍വഴിയിലെ വിവരങ്ങള്‍ വേര്‍തിരിക്കാനാണെന്ന് കെഡിഫ്3 " -"സങ്കല്‍പ്പിയ്ക്കും.\n" +"ഒഴിച്ചു വിട്ടാല്‍ ഒഴിഞ്ഞ വരികള്‍ നാള്‍വഴിയിലെ വിവരങ്ങള്‍ വേര്‍തിരിക്കാനാണെന്ന് കെഡിഫ്3 സങ്കല്‍" +"പ്പിയ്ക്കും.\n" "വിശദീകരണങ്ങള്‍ക്ക് പ്രമാണപത്രം കാണുക." -#: optiondialog.cpp:1050 +#: optiondialog.cpp:1090 #, kde-format msgid "History merge sorting" msgstr "തരം തിരിക്കുന്നതിനെ നാള്‍വഴി ലയിപ്പിക്കുന്നു" -#: optiondialog.cpp:1053 +#: optiondialog.cpp:1093 #, kde-format msgid "Sort version control history by a key." msgstr "ഭാഷാന്തര നിയന്ത്രണ നാള്‍വഴി ഒരു കീ ഉപയോഗിച്ച് തരം തിരിക്കുക." -#: optiondialog.cpp:1063 +#: optiondialog.cpp:1103 #, kde-format msgid "History entry start sort key order:" msgstr "നാള്‍വഴി ചേര്‍ത്തത് കീകളുടെ ക്രമം തരം തിരിക്കാന്‍ തുടങ്ങുന്നു." -#: optiondialog.cpp:1068 +#: optiondialog.cpp:1108 #, kde-format msgid "" "Each pair of parentheses used in the regular expression for the history " @@ -2453,37 +2472,37 @@ "See the documentation for details." msgstr "" -#: optiondialog.cpp:1079 +#: optiondialog.cpp:1119 #, kde-format msgid "Merge version control history on merge start" msgstr "" -#: optiondialog.cpp:1082 +#: optiondialog.cpp:1122 #, kde-format msgid "Run version control history automerge on merge start." msgstr "" -#: optiondialog.cpp:1086 +#: optiondialog.cpp:1126 #, kde-format msgid "Max number of history entries:" msgstr "" -#: optiondialog.cpp:1090 +#: optiondialog.cpp:1130 #, kde-format msgid "Cut off after specified number. Use -1 for infinite number of entries." msgstr "" -#: optiondialog.cpp:1094 +#: optiondialog.cpp:1134 #, kde-format msgid "Test your regular expressions" msgstr "" -#: optiondialog.cpp:1099 +#: optiondialog.cpp:1139 #, kde-format msgid "Irrelevant merge command:" msgstr "" -#: optiondialog.cpp:1104 +#: optiondialog.cpp:1144 #, kde-format msgid "" "If specified this script is run after automerge\n" @@ -2491,12 +2510,12 @@ "Called with the parameters: filename1 filename2 filename3" msgstr "" -#: optiondialog.cpp:1109 +#: optiondialog.cpp:1149 #, kde-format msgid "Auto save and quit on merge without conflicts" msgstr "" -#: optiondialog.cpp:1113 +#: optiondialog.cpp:1153 #, kde-format msgid "" "If KDiff3 was started for a file-merge from the command line and all\n" @@ -2505,27 +2524,27 @@ "(Similar to command line option \"--auto\".)" msgstr "" -#: optiondialog.cpp:1124 optiondialog.cpp:1125 +#: optiondialog.cpp:1164 optiondialog.cpp:1165 #, kde-format msgid "Directory" msgstr "തട്ടു്" -#: optiondialog.cpp:1137 +#: optiondialog.cpp:1185 #, kde-format msgid "Recursive directories" msgstr "തട്ടിനുള്ളിലെ തട്ടുകള്‍ കൂടി" -#: optiondialog.cpp:1140 +#: optiondialog.cpp:1188 #, kde-format msgid "Whether to analyze subdirectories or not." msgstr "തട്ടിനുള്ളിലെ തട്ടുകള്‍ കൂടി വിശകലനം ചെയ്യണോ വേണ്ടയോ എന്നു്." -#: optiondialog.cpp:1142 +#: optiondialog.cpp:1190 #, kde-format msgid "File pattern(s):" msgstr "" -#: optiondialog.cpp:1148 +#: optiondialog.cpp:1196 #, kde-format msgid "" "Pattern(s) of files to be analyzed. \n" @@ -2533,12 +2552,12 @@ "Several Patterns can be specified by using the separator: ';'" msgstr "" -#: optiondialog.cpp:1153 +#: optiondialog.cpp:1201 #, kde-format msgid "File-anti-pattern(s):" msgstr "" -#: optiondialog.cpp:1159 +#: optiondialog.cpp:1207 #, kde-format msgid "" "Pattern(s) of files to be excluded from analysis. \n" @@ -2546,12 +2565,12 @@ "Several Patterns can be specified by using the separator: ';'" msgstr "" -#: optiondialog.cpp:1164 +#: optiondialog.cpp:1212 #, kde-format msgid "Dir-anti-pattern(s):" msgstr "" -#: optiondialog.cpp:1170 +#: optiondialog.cpp:1218 #, kde-format msgid "" "Pattern(s) of directories to be excluded from analysis. \n" @@ -2559,58 +2578,58 @@ "Several Patterns can be specified by using the separator: ';'" msgstr "" -#: optiondialog.cpp:1175 +#: optiondialog.cpp:1223 #, kde-format msgid "Use .cvsignore" msgstr "" -#: optiondialog.cpp:1179 +#: optiondialog.cpp:1227 #, kde-format msgid "" "Extends the antipattern to anything that would be ignored by CVS.\n" "Via local \".cvsignore\" files this can be directory specific." msgstr "" -#: optiondialog.cpp:1183 +#: optiondialog.cpp:1231 #, kde-format msgid "Find hidden files and directories" msgstr "" -#: optiondialog.cpp:1186 +#: optiondialog.cpp:1234 #, kde-format msgid "Finds hidden files and directories." msgstr "" -#: optiondialog.cpp:1189 +#: optiondialog.cpp:1237 #, kde-format msgid "Follow file links" msgstr "" -#: optiondialog.cpp:1193 +#: optiondialog.cpp:1241 #, kde-format msgid "" "On: Compare the file the link points to.\n" "Off: Compare the links." msgstr "" -#: optiondialog.cpp:1197 +#: optiondialog.cpp:1245 #, kde-format msgid "Follow directory links" msgstr "" -#: optiondialog.cpp:1201 +#: optiondialog.cpp:1249 #, kde-format msgid "" "On: Compare the directory the link points to.\n" "Off: Compare the links." msgstr "" -#: optiondialog.cpp:1210 +#: optiondialog.cpp:1258 #, kde-format msgid "Case sensitive filename comparison" msgstr "" -#: optiondialog.cpp:1214 +#: optiondialog.cpp:1262 #, kde-format msgid "" "The directory comparison will compare files or directories when their names " @@ -2619,64 +2638,64 @@ "off, otherwise on.)" msgstr "" -#: optiondialog.cpp:1218 +#: optiondialog.cpp:1266 #, fuzzy, kde-format #| msgid "Whether to analyze subdirectories or not." msgid "Unfold all subdirectories on load" msgstr "തട്ടിനുള്ളിലെ തട്ടുകള്‍ കൂടി വിശകലനം ചെയ്യണോ വേണ്ടയോ എന്നു്." -#: optiondialog.cpp:1222 +#: optiondialog.cpp:1270 #, kde-format msgid "" "On: Unfold all subdirectories when starting a directory diff.\n" "Off: Leave subdirectories folded." msgstr "" -#: optiondialog.cpp:1226 +#: optiondialog.cpp:1274 #, kde-format msgid "Skip directory status report" msgstr "" -#: optiondialog.cpp:1230 +#: optiondialog.cpp:1278 #, kde-format msgid "" "On: Do not show the Directory Comparison Status.\n" "Off: Show the status dialog on start." msgstr "" -#: optiondialog.cpp:1234 +#: optiondialog.cpp:1282 #, kde-format msgid "File Comparison Mode" msgstr "" -#: optiondialog.cpp:1239 +#: optiondialog.cpp:1287 #, kde-format msgid "Binary comparison" msgstr "" -#: optiondialog.cpp:1241 +#: optiondialog.cpp:1289 #, kde-format msgid "Binary comparison of each file. (Default)" msgstr "" -#: optiondialog.cpp:1244 +#: optiondialog.cpp:1292 #, kde-format msgid "Full analysis" msgstr "" -#: optiondialog.cpp:1246 +#: optiondialog.cpp:1294 #, kde-format msgid "" "Do a full analysis and show statistics information in extra columns.\n" "(Slower than a binary comparison, much slower for binary files.)" msgstr "" -#: optiondialog.cpp:1250 +#: optiondialog.cpp:1298 #, kde-format msgid "Trust the size and modification date (unsafe)" msgstr "" -#: optiondialog.cpp:1252 +#: optiondialog.cpp:1300 #, kde-format msgid "" "Assume that files are equal if the modification date and file length are " @@ -2686,14 +2705,14 @@ "Useful for big directories or slow networks." msgstr "" -#: optiondialog.cpp:1257 +#: optiondialog.cpp:1305 #, kde-format msgid "" "Trust the size and date, but use binary comparison if date does not match " "(unsafe)" msgstr "" -#: optiondialog.cpp:1259 +#: optiondialog.cpp:1307 #, kde-format msgid "" "Assume that files are equal if the modification date and file length are " @@ -2702,12 +2721,12 @@ "Useful for big directories or slow networks." msgstr "" -#: optiondialog.cpp:1264 +#: optiondialog.cpp:1312 #, kde-format msgid "Trust the size (unsafe)" msgstr "" -#: optiondialog.cpp:1266 +#: optiondialog.cpp:1314 #, kde-format msgid "" "Assume that files are equal if their file lengths are equal.\n" @@ -2715,12 +2734,12 @@ "download." msgstr "" -#: optiondialog.cpp:1273 +#: optiondialog.cpp:1321 #, kde-format msgid "Synchronize directories" msgstr "" -#: optiondialog.cpp:1277 +#: optiondialog.cpp:1325 #, kde-format msgid "" "Offers to store files in both directories so that\n" @@ -2728,24 +2747,24 @@ "Works only when comparing two directories without specifying a destination." msgstr "" -#: optiondialog.cpp:1283 +#: optiondialog.cpp:1331 #, kde-format msgid "White space differences considered equal" msgstr "" -#: optiondialog.cpp:1287 +#: optiondialog.cpp:1335 #, kde-format msgid "" "If files differ only by white space consider them equal.\n" "This is only active when full analysis is chosen." msgstr "" -#: optiondialog.cpp:1293 +#: optiondialog.cpp:1341 #, kde-format msgid "Copy newer instead of merging (unsafe)" msgstr "" -#: optiondialog.cpp:1297 +#: optiondialog.cpp:1345 #, kde-format msgid "" "Do not look inside, just take the newer file.\n" @@ -2753,46 +2772,46 @@ "Only effective when comparing two directories." msgstr "" -#: optiondialog.cpp:1302 +#: optiondialog.cpp:1350 #, kde-format msgid "Backup files (.orig)" msgstr "" -#: optiondialog.cpp:1306 +#: optiondialog.cpp:1354 #, kde-format msgid "" "If 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 "" -#: optiondialog.cpp:1382 optiondialog.cpp:1383 +#: optiondialog.cpp:1430 optiondialog.cpp:1431 #, kde-format msgid "Regional Settings" msgstr "" -#: optiondialog.cpp:1397 +#: optiondialog.cpp:1454 #, kde-format msgid "Use the same encoding for everything:" msgstr "" -#: optiondialog.cpp:1401 +#: optiondialog.cpp:1458 #, kde-format msgid "" "Enable this allows to change all encodings by changing the first only.\n" "Disable this if different individual settings are needed." msgstr "" -#: optiondialog.cpp:1405 +#: optiondialog.cpp:1462 #, kde-format msgid "Note: Local Encoding is \"%1\"" msgstr "" -#: optiondialog.cpp:1409 +#: optiondialog.cpp:1466 #, kde-format msgid "File Encoding for A:" msgstr "" -#: optiondialog.cpp:1416 +#: optiondialog.cpp:1473 #, kde-format msgid "" "If enabled then Unicode (UTF-16 or UTF-8) encoding will be detected.\n" @@ -2801,32 +2820,32 @@ "(Unicode detection depends on the first bytes of a file.)" msgstr "" -#: optiondialog.cpp:1419 optiondialog.cpp:1430 optiondialog.cpp:1441 +#: optiondialog.cpp:1476 optiondialog.cpp:1487 optiondialog.cpp:1498 #, kde-format msgid "Auto Detect Unicode" msgstr "" -#: optiondialog.cpp:1425 +#: optiondialog.cpp:1482 #, kde-format msgid "File Encoding for B:" msgstr "" -#: optiondialog.cpp:1436 +#: optiondialog.cpp:1493 #, kde-format msgid "File Encoding for C:" msgstr "" -#: optiondialog.cpp:1447 +#: optiondialog.cpp:1504 #, kde-format msgid "File Encoding for Merge Output and Saving:" msgstr "" -#: optiondialog.cpp:1452 +#: optiondialog.cpp:1509 #, kde-format msgid "Auto Select" msgstr "" -#: optiondialog.cpp:1456 +#: optiondialog.cpp:1513 #, kde-format msgid "" "If enabled then the encoding from the input files is used.\n" @@ -2834,39 +2853,39 @@ "saving." msgstr "" -#: optiondialog.cpp:1459 +#: optiondialog.cpp:1516 #, kde-format msgid "File Encoding for Preprocessor Files:" msgstr "" -#: optiondialog.cpp:1471 +#: optiondialog.cpp:1528 #, kde-format msgid "Right To Left Language" msgstr "" -#: optiondialog.cpp:1475 +#: optiondialog.cpp:1532 #, kde-format msgid "" "Some languages are read from right to left.\n" "This setting will change the viewer and editor accordingly." msgstr "" -#: optiondialog.cpp:1485 +#: optiondialog.cpp:1542 #, kde-format msgid "Integration" msgstr "" -#: optiondialog.cpp:1486 +#: optiondialog.cpp:1543 #, kde-format msgid "Integration Settings" msgstr "" -#: optiondialog.cpp:1499 +#: optiondialog.cpp:1564 #, kde-format msgid "Command line options to ignore:" msgstr "" -#: optiondialog.cpp:1505 +#: optiondialog.cpp:1570 #, kde-format msgid "" "List of command line options that should be ignored when KDiff3 is used by " @@ -2875,19 +2894,19 @@ "This will suppress the \"Unknown option\" error." msgstr "" -#: optiondialog.cpp:1510 +#: optiondialog.cpp:1575 #, kde-format msgid "Quit also via Escape key" msgstr "" -#: optiondialog.cpp:1514 +#: optiondialog.cpp:1579 #, kde-format msgid "" "Fast method to exit.\n" "For those who are used to using the Escape key." msgstr "" -#: optiondialog.cpp:1598 +#: optiondialog.cpp:1653 #, kde-format msgid "This resets all options. Not only those of the current topic." msgstr "" @@ -2942,77 +2961,68 @@ msgid "Disable Unsafe Options" msgstr "" -#: pdiff.cpp:158 +#: pdiff.cpp:160 #, kde-format msgid "Loading A" msgstr "" -#: pdiff.cpp:167 -#, kde-format -msgid "Errors occurred during pre-processing of file A." -msgstr "" +#: pdiff.cpp:162 +#, fuzzy, kde-format +#| msgid "Reading file: %1" +msgid "Loading A: %1" +msgstr "ഫയല്‍ വായിക്കുന്നു: %1" -#: pdiff.cpp:172 +#: pdiff.cpp:170 #, kde-format msgid "Loading B" msgstr "" -#: pdiff.cpp:179 -#, kde-format -msgid "Errors occurred during pre-processing of file B." -msgstr "" - -#: pdiff.cpp:202 pdiff.cpp:241 +#: pdiff.cpp:201 pdiff.cpp:237 #, kde-format msgid "Diff: A <-> B" msgstr "" -#: pdiff.cpp:208 pdiff.cpp:279 pdiff.cpp:293 +#: pdiff.cpp:207 pdiff.cpp:275 pdiff.cpp:289 #, kde-format msgid "Linediff: A <-> B" msgstr "" -#: pdiff.cpp:225 +#: pdiff.cpp:224 #, kde-format msgid "Loading C" msgstr "" -#: pdiff.cpp:232 -#, kde-format -msgid "Errors occurred during pre-processing of file C." -msgstr "" - -#: pdiff.cpp:250 +#: pdiff.cpp:246 #, kde-format msgid "Diff: A <-> C" msgstr "" -#: pdiff.cpp:261 +#: pdiff.cpp:257 #, kde-format msgid "Diff: B <-> C" msgstr "" -#: pdiff.cpp:283 pdiff.cpp:297 +#: pdiff.cpp:279 pdiff.cpp:293 #, kde-format msgid "Linediff: B <-> C" msgstr "" -#: pdiff.cpp:287 pdiff.cpp:301 +#: pdiff.cpp:283 pdiff.cpp:297 #, kde-format msgid "Linediff: A <-> C" msgstr "" -#: pdiff.cpp:829 +#: pdiff.cpp:819 #, kde-format msgid "All input files contain the same text, but are not binary equal." msgstr "" -#: pdiff.cpp:835 pdiff.cpp:839 pdiff.cpp:843 +#: pdiff.cpp:825 pdiff.cpp:829 pdiff.cpp:833 #, kde-format msgid "Files %1 and %2 have equal text, but are not binary equal. \n" msgstr "" -#: pdiff.cpp:853 +#: pdiff.cpp:843 #, kde-format msgid "" "Some input files do not seem to be pure text files.\n" @@ -3020,17 +3030,17 @@ "Continue at your own risk." msgstr "" -#: pdiff.cpp:863 +#: pdiff.cpp:853 #, kde-format msgid ", B" msgstr "" -#: pdiff.cpp:865 +#: pdiff.cpp:855 #, kde-format msgid ", C" msgstr "" -#: pdiff.cpp:867 +#: pdiff.cpp:857 #, kde-format msgid "" "Some input characters could not be converted to valid unicode.\n" @@ -3039,77 +3049,72 @@ "Affected input files are in %1." msgstr "" -#: pdiff.cpp:1034 +#: pdiff.cpp:1032 #, kde-format msgid "Abort" msgstr "" -#: pdiff.cpp:1040 pdiff.cpp:1130 +#: pdiff.cpp:1038 pdiff.cpp:1129 #, kde-format msgid "Opening files..." msgstr "" -#: pdiff.cpp:1107 -#, kde-format -msgid "File open error" -msgstr "" - -#: pdiff.cpp:1202 +#: pdiff.cpp:1212 #, kde-format msgid "Cutting selection..." msgstr "" -#: pdiff.cpp:1223 +#: pdiff.cpp:1233 #, kde-format msgid "Copying selection to clipboard..." msgstr "" -#: pdiff.cpp:1239 +#: pdiff.cpp:1249 #, kde-format msgid "Inserting clipboard contents..." msgstr "" -#: pdiff.cpp:1695 +#: pdiff.cpp:1705 #, kde-format msgid "Word wrap (Cancel disables word wrap)" msgstr "" -#: pdiff.cpp:1696 +#: pdiff.cpp:1706 #, kde-format msgid "Calculating max width for horizontal scrollbar" msgstr "" -#: pdiff.cpp:1911 +#: pdiff.cpp:1921 #, kde-format msgid "Save && Continue" msgstr "" -#: pdiff.cpp:1912 +#: pdiff.cpp:1922 #, kde-format msgid "Continue Without Saving" msgstr "" -#: pdiff.cpp:2124 +#: pdiff.cpp:2134 #, kde-format msgid "Search complete." msgstr "" -#: pdiff.cpp:2124 +#: pdiff.cpp:2134 #, kde-format msgid "Search Complete" msgstr "" -#: pdiff.cpp:2375 +#: pdiff.cpp:2385 #, kde-format msgid "Nothing is selected in either diff input window." msgstr "" -#: pdiff.cpp:2375 +#: pdiff.cpp:2385 #, kde-format msgid "Error while adding manual diff range" msgstr "" -#: progress.cpp:59 progress.cpp:71 +#: progress.cpp:61 progress.cpp:73 #, kde-format msgid "&Cancel" msgstr "&റദ്ദു ചെയ്യുക" @@ -3119,143 +3124,143 @@ msgid "A (Base):" msgstr "ഏ (അടിസ്ഥാനം)" -#: smalldialogs.cpp:68 smalldialogs.cpp:85 smalldialogs.cpp:102 -#: smalldialogs.cpp:144 +#: smalldialogs.cpp:71 smalldialogs.cpp:90 smalldialogs.cpp:109 +#: smalldialogs.cpp:154 #, kde-format msgid "File..." msgstr "ഫയല്‍..." -#: smalldialogs.cpp:70 smalldialogs.cpp:87 smalldialogs.cpp:104 -#: smalldialogs.cpp:146 +#: smalldialogs.cpp:73 smalldialogs.cpp:92 smalldialogs.cpp:111 +#: smalldialogs.cpp:156 #, kde-format msgid "Dir..." msgstr "തട്ട്..." -#: smalldialogs.cpp:96 +#: smalldialogs.cpp:103 #, kde-format msgid "C (Optional):" msgstr "സി (ഐച്ഛികം):" -#: smalldialogs.cpp:119 +#: smalldialogs.cpp:126 #, fuzzy, kde-format #| msgid "Swap/Copy Names ..." msgid "Swap/Copy Names..." msgstr "വെച്ചുമാറല്‍/പേരുകള്‍ ‍പകര്‍ത്തല്‍..." -#: smalldialogs.cpp:124 smalldialogs.cpp:125 smalldialogs.cpp:126 +#: smalldialogs.cpp:131 smalldialogs.cpp:132 smalldialogs.cpp:133 #, kde-format msgid "Swap %1<->%2" msgstr "വെച്ചുമാറല്‍ %1->%2" -#: smalldialogs.cpp:127 smalldialogs.cpp:128 smalldialogs.cpp:129 +#: smalldialogs.cpp:134 smalldialogs.cpp:135 smalldialogs.cpp:136 #, kde-format msgid "Copy %1->Output" msgstr "പകര്‍പ്പ് %1-> ഉത്പന്നം" -#: smalldialogs.cpp:130 smalldialogs.cpp:131 smalldialogs.cpp:132 +#: smalldialogs.cpp:137 smalldialogs.cpp:138 smalldialogs.cpp:139 #, kde-format msgid "Swap %1<->Output" msgstr "വെച്ചുമാറല്‍ %1->ഉത്പന്നം" -#: smalldialogs.cpp:138 +#: smalldialogs.cpp:148 #, kde-format msgid "Output (optional):" msgstr "ഉത്പന്നം (ഐച്ഛികം):" -#: smalldialogs.cpp:168 +#: smalldialogs.cpp:178 #, kde-format msgid "Configure..." msgstr "ക്രമീകരിക്കുക..." -#: smalldialogs.cpp:233 +#: smalldialogs.cpp:243 #, fuzzy, kde-format #| msgid "Directory" msgid "Open Directory" msgstr "തട്ടു്" -#: smalldialogs.cpp:234 +#: smalldialogs.cpp:244 #, kde-format msgid "Select Output File" msgstr "" -#: smalldialogs.cpp:393 +#: smalldialogs.cpp:403 #, kde-format msgid "Search text:" msgstr "പാഠം പരതുക:" -#: smalldialogs.cpp:400 +#: smalldialogs.cpp:410 #, kde-format msgid "Case sensitive" msgstr "അവസ്ഥ സൂക്ഷ്മവേദ്യ‌‌മായ" -#: smalldialogs.cpp:403 +#: smalldialogs.cpp:413 #, kde-format msgid "Search A" msgstr "ഏ പരതുക" -#: smalldialogs.cpp:408 +#: smalldialogs.cpp:418 #, kde-format msgid "Search B" msgstr "ബി പരതുക" -#: smalldialogs.cpp:413 +#: smalldialogs.cpp:423 #, kde-format msgid "Search C" msgstr "സി പരതുക" -#: smalldialogs.cpp:418 +#: smalldialogs.cpp:428 #, kde-format msgid "Search output" msgstr "ഉത്പന്നം പരതുക" -#: smalldialogs.cpp:425 +#: smalldialogs.cpp:435 #, kde-format msgid "&Search" msgstr "&പരതുക" -#: smalldialogs.cpp:444 +#: smalldialogs.cpp:454 #, kde-format msgid "Regular Expression Tester" msgstr "നിത്യഭാവ പരിശോധകന്‍" -#: smalldialogs.cpp:457 +#: smalldialogs.cpp:467 #, kde-format msgid "Example auto merge line:" msgstr "വരി സ്വയം ലയിപ്പിക്കുക ഉദാഹരണം:" -#: smalldialogs.cpp:459 +#: smalldialogs.cpp:469 #, fuzzy, kde-format msgid "To test auto merge, copy a line as used in your files." msgstr "സ്വയം ലയിപ്പിക്കുവാന്‍ നിങ്ങളുടെ ഫയലിലെ ഒരു വരി പരീക്ഷണ പകര്‍ത്തല്‍ നടത്തുക." -#: smalldialogs.cpp:465 smalldialogs.cpp:493 smalldialogs.cpp:529 +#: smalldialogs.cpp:475 smalldialogs.cpp:503 smalldialogs.cpp:539 #, kde-format msgid "Match result:" msgstr "ചേര്ച്ചയുടെ ഫലം:" -#: smalldialogs.cpp:484 +#: smalldialogs.cpp:494 #, kde-format msgid "Example history start line (with leading comment):" msgstr "നാള്‍വഴി ഉദാഹരണം തുടങ്ങുന്ന വരി (വ്യാഖ്യാ‌‌നം മുന്നിലായി):" -#: smalldialogs.cpp:486 +#: smalldialogs.cpp:496 #, kde-format msgid "" "Copy a history start line as used in your files,\n" "including the leading comment." msgstr "നിങ്ങളുടെ ഫയലില്‍ ഉള്ള പോലെ നാള്‍വഴി തുടങ്ങുന്ന വരിമുന്നിലെ വ്യാഖ്യാ‌‌നത്തോടെ പകര്‍ത്തുക." -#: smalldialogs.cpp:512 +#: smalldialogs.cpp:522 #, kde-format msgid "History sort key order:" msgstr "നാള്‍വഴി തരം തിരിക്കുന്ന കീയുടെ ക്രമം:" -#: smalldialogs.cpp:520 +#: smalldialogs.cpp:530 #, kde-format msgid "Example history entry start line (without leading comment):" msgstr "ഉദാഹരണത്തിന് നാള്‍വഴി ചേര്‍ക്കുന്നത് തുടങ്ങുന്ന വരി (മുന്നിലെ വ്യാ‌‌ഖ്യാ‌‌നം കൂടാതെ):" -#: smalldialogs.cpp:522 +#: smalldialogs.cpp:532 #, kde-format msgid "" "Copy a history entry start line as used in your files,\n" @@ -3264,47 +3269,47 @@ "നിങ്ങളുടെ ഫയലിലുപയോഗിക്കുന്ന വിധത്തില്‍ നാള്‍വഴി ചേര്ക്കുന്നത് തുടങ്ങുന്ന വരി പകര്‍ത്തുക,\n" "എന്നാല്‍ മുന്നിലെ വ്യാ‌‌ഖ്യാ‌‌നം ഒഴിവാക്കണം." -#: smalldialogs.cpp:536 +#: smalldialogs.cpp:546 #, kde-format msgid "Sort key result:" msgstr "പ്രധാനപ്പെട്ട ഫലങ്ങള്‍ തരം തിരിക്കുക:" -#: smalldialogs.cpp:584 smalldialogs.cpp:594 smalldialogs.cpp:614 +#: smalldialogs.cpp:594 smalldialogs.cpp:604 smalldialogs.cpp:624 #, kde-format msgid "Match success." msgstr "ചേര്‍ച്ച വിജയം." -#: smalldialogs.cpp:588 smalldialogs.cpp:598 smalldialogs.cpp:620 +#: smalldialogs.cpp:598 smalldialogs.cpp:608 smalldialogs.cpp:630 #, kde-format msgid "Match failed." msgstr "ചേര്‍ച്ച പരാജയപ്പെട്ടു." -#: smalldialogs.cpp:605 +#: smalldialogs.cpp:615 #, fuzzy, kde-format msgid "Opening and closing parentheses do not match in regular expression." msgstr "നിത്യഭാവത്തില്‍ തുടങ്ങുന്നതും അവസാനിക്കുന്നതുമായ ബ്രാക്കറ്റുകള്‍ യോജിക്കുന്നില്ല." -#: SourceData.cpp:150 +#: SourceData.cpp:153 #, kde-format msgid "Writing clipboard data to temp file failed." msgstr "ഓര്‍മ്മച്ചെപ്പിലെ വിവരങ്ങള്‍ താല്‍ക്കാലിക ഫയലില്‍ എഴുതി ചേര്ക്കുന്നു." -#: SourceData.cpp:154 +#: SourceData.cpp:157 #, kde-format msgid "From Clipboard" msgstr "ഓര്മ്മച്ചറ്റയില്‍നിന്ന്" -#: SourceData.cpp:335 +#: SourceData.cpp:348 #, kde-format msgid "%1 is not a normal file." msgstr "" -#: SourceData.cpp:427 +#: SourceData.cpp:440 #, kde-format msgid " Temp file is: %1" msgstr "" -#: SourceData.cpp:432 +#: SourceData.cpp:445 #, kde-format msgid "" "Preprocessing possibly failed. Check this command:\n" @@ -3319,12 +3324,12 @@ "\n" "മുന്‍‌കൂര്‍ നടപടിക്കുള്ല ആജ്ഞ ഇപ്പോള്‍ പ്രവര്‍ത്തനരഹിതമാക്കും." -#: SourceData.cpp:443 SourceData.cpp:512 +#: SourceData.cpp:456 SourceData.cpp:525 #, kde-format msgid "File %1 too large to process. Skipping." msgstr "" -#: SourceData.cpp:487 +#: SourceData.cpp:500 #, kde-format msgid "" "The line-matching-preprocessing possibly failed. Check this command:\n" diff -Nru kdiff3-1.8.01/po/mr/kdiff3fileitemactionplugin.po kdiff3-1.8.3/po/mr/kdiff3fileitemactionplugin.po --- kdiff3-1.8.01/po/mr/kdiff3fileitemactionplugin.po 2019-05-18 01:02:13.000000000 +0000 +++ kdiff3-1.8.3/po/mr/kdiff3fileitemactionplugin.po 2020-06-25 00:18:36.000000000 +0000 @@ -5,8 +5,8 @@ msgid "" msgstr "" "Project-Id-Version: \n" -"Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2019-03-22 03:09+0100\n" +"Report-Msgid-Bugs-To: https://bugs.kde.org\n" +"POT-Creation-Date: 2019-08-30 07:40+0200\n" "PO-Revision-Date: 2013-03-26 15:38+0530\n" "Last-Translator: Chetan Khona \n" "Language-Team: Marathi \n" diff -Nru kdiff3-1.8.01/po/mr/kdiff3.po kdiff3-1.8.3/po/mr/kdiff3.po --- kdiff3-1.8.01/po/mr/kdiff3.po 2019-05-18 01:02:13.000000000 +0000 +++ kdiff3-1.8.3/po/mr/kdiff3.po 2020-06-25 00:18:36.000000000 +0000 @@ -5,8 +5,8 @@ msgid "" msgstr "" "Project-Id-Version: \n" -"Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2019-04-18 08:02+0200\n" +"Report-Msgid-Bugs-To: https://bugs.kde.org\n" +"POT-Creation-Date: 2020-06-22 07:48+0200\n" "PO-Revision-Date: 2013-03-06 18:02+0530\n" "Last-Translator: Chetan Khona \n" "Language-Team: Marathi \n" @@ -27,336 +27,336 @@ msgid "Your emails" msgstr "chetan@kompkin.com" -#: difftextwindow.cpp:412 +#: difftextwindow.cpp:414 #, kde-format msgid "File %1: Line %2" msgstr "" -#: difftextwindow.cpp:414 +#: difftextwindow.cpp:416 #, fuzzy, kde-format msgid "File %1: Line not available" msgstr "उपलब्ध नाही" -#: difftextwindow.cpp:1780 +#: difftextwindow.cpp:1778 #, kde-format msgid "Encoding:" msgstr "एन्कोडिंग :" -#: difftextwindow.cpp:1782 mergeresultwindow.cpp:3138 optiondialog.cpp:818 +#: difftextwindow.cpp:1781 mergeresultwindow.cpp:3166 optiondialog.cpp:840 #, kde-format msgid "Line end style:" msgstr "" -#: difftextwindow.cpp:1810 directorymergewindow.cpp:382 -#: directorymergewindow.cpp:433 directorymergewindow.cpp:524 -#: directorymergewindow.cpp:3058 directorymergewindow.cpp:3189 -#: directorymergewindow.cpp:3417 mergeresultwindow.cpp:942 -#: mergeresultwindow.cpp:944 mergeresultwindow.cpp:946 -#: mergeresultwindow.cpp:948 mergeresultwindow.cpp:1814 -#: mergeresultwindow.cpp:3170 mergeresultwindow.cpp:3177 optiondialog.cpp:962 -#: optiondialog.cpp:975 pdiff.cpp:833 pdiff.cpp:835 pdiff.cpp:837 pdiff.cpp:839 -#: pdiff.cpp:861 smalldialogs.cpp:124 smalldialogs.cpp:126 smalldialogs.cpp:127 -#: smalldialogs.cpp:130 +#: difftextwindow.cpp:1809 directorymergewindow.cpp:383 +#: directorymergewindow.cpp:434 directorymergewindow.cpp:525 +#: directorymergewindow.cpp:3072 directorymergewindow.cpp:3203 +#: directorymergewindow.cpp:3431 mergeresultwindow.cpp:970 +#: mergeresultwindow.cpp:972 mergeresultwindow.cpp:974 +#: mergeresultwindow.cpp:976 mergeresultwindow.cpp:1842 +#: mergeresultwindow.cpp:3198 mergeresultwindow.cpp:3205 optiondialog.cpp:1002 +#: optiondialog.cpp:1015 pdiff.cpp:823 pdiff.cpp:825 pdiff.cpp:827 +#: pdiff.cpp:829 pdiff.cpp:851 smalldialogs.cpp:131 smalldialogs.cpp:133 +#: smalldialogs.cpp:134 smalldialogs.cpp:137 #, fuzzy, kde-format msgid "A" msgstr "A" -#: difftextwindow.cpp:1810 directorymergewindow.cpp:384 -#: directorymergewindow.cpp:436 directorymergewindow.cpp:526 -#: directorymergewindow.cpp:3064 directorymergewindow.cpp:3190 -#: directorymergewindow.cpp:3418 mergeresultwindow.cpp:942 -#: mergeresultwindow.cpp:944 mergeresultwindow.cpp:950 -#: mergeresultwindow.cpp:952 mergeresultwindow.cpp:1816 -#: mergeresultwindow.cpp:3172 mergeresultwindow.cpp:3179 optiondialog.cpp:963 -#: optiondialog.cpp:976 pdiff.cpp:833 pdiff.cpp:835 pdiff.cpp:841 pdiff.cpp:843 -#: pdiff.cpp:863 smalldialogs.cpp:124 smalldialogs.cpp:125 smalldialogs.cpp:128 -#: smalldialogs.cpp:131 +#: difftextwindow.cpp:1809 directorymergewindow.cpp:385 +#: directorymergewindow.cpp:437 directorymergewindow.cpp:527 +#: directorymergewindow.cpp:3078 directorymergewindow.cpp:3204 +#: directorymergewindow.cpp:3432 mergeresultwindow.cpp:970 +#: mergeresultwindow.cpp:972 mergeresultwindow.cpp:978 +#: mergeresultwindow.cpp:980 mergeresultwindow.cpp:1844 +#: mergeresultwindow.cpp:3200 mergeresultwindow.cpp:3207 optiondialog.cpp:1003 +#: optiondialog.cpp:1016 pdiff.cpp:823 pdiff.cpp:825 pdiff.cpp:831 +#: pdiff.cpp:833 pdiff.cpp:853 smalldialogs.cpp:131 smalldialogs.cpp:132 +#: smalldialogs.cpp:135 smalldialogs.cpp:138 #, fuzzy, kde-format msgid "B" msgstr "B" -#: difftextwindow.cpp:1810 directorymergewindow.cpp:386 -#: directorymergewindow.cpp:439 directorymergewindow.cpp:528 -#: directorymergewindow.cpp:3070 directorymergewindow.cpp:3191 -#: directorymergewindow.cpp:3419 mergeresultwindow.cpp:946 -#: mergeresultwindow.cpp:948 mergeresultwindow.cpp:950 -#: mergeresultwindow.cpp:952 mergeresultwindow.cpp:1818 -#: mergeresultwindow.cpp:3174 mergeresultwindow.cpp:3181 optiondialog.cpp:977 -#: pdiff.cpp:837 pdiff.cpp:839 pdiff.cpp:841 pdiff.cpp:843 pdiff.cpp:865 -#: smalldialogs.cpp:125 smalldialogs.cpp:126 smalldialogs.cpp:129 -#: smalldialogs.cpp:132 +#: difftextwindow.cpp:1809 directorymergewindow.cpp:387 +#: directorymergewindow.cpp:440 directorymergewindow.cpp:529 +#: directorymergewindow.cpp:3084 directorymergewindow.cpp:3205 +#: directorymergewindow.cpp:3433 mergeresultwindow.cpp:974 +#: mergeresultwindow.cpp:976 mergeresultwindow.cpp:978 +#: mergeresultwindow.cpp:980 mergeresultwindow.cpp:1846 +#: mergeresultwindow.cpp:3202 mergeresultwindow.cpp:3209 optiondialog.cpp:1017 +#: pdiff.cpp:827 pdiff.cpp:829 pdiff.cpp:831 pdiff.cpp:833 pdiff.cpp:855 +#: smalldialogs.cpp:132 smalldialogs.cpp:133 smalldialogs.cpp:136 +#: smalldialogs.cpp:139 #, fuzzy, kde-format msgid "C" msgstr "C" -#: difftextwindow.cpp:1810 +#: difftextwindow.cpp:1809 #, kde-format msgid "A (Base)" msgstr "" -#: difftextwindow.cpp:1812 +#: difftextwindow.cpp:1811 #, fuzzy, kde-format #| msgid "Encoding:" msgid "Encoding: %1" msgstr "एन्कोडिंग :" -#: difftextwindow.cpp:1813 mergeresultwindow.cpp:3183 +#: difftextwindow.cpp:1812 mergeresultwindow.cpp:3211 #, kde-format msgid "Unix" msgstr "" -#: difftextwindow.cpp:1813 mergeresultwindow.cpp:3184 +#: difftextwindow.cpp:1812 mergeresultwindow.cpp:3212 #, kde-format msgid "DOS" msgstr "" -#: difftextwindow.cpp:1813 +#: difftextwindow.cpp:1812 #, kde-format msgid "Line end style: %1" msgstr "" -#: difftextwindow.cpp:1835 kdiff3.cpp:873 +#: difftextwindow.cpp:1834 kdiff3.cpp:874 #, kde-format msgid "Top line" msgstr "" -#: difftextwindow.cpp:1845 +#: difftextwindow.cpp:1843 #, fuzzy, kde-format msgid "End" msgstr "समाप्त" -#: difftextwindow.cpp:1903 smalldialogs.cpp:235 +#: difftextwindow.cpp:1901 smalldialogs.cpp:245 #, fuzzy, kde-format #| msgid "File" msgid "Open File" msgstr "फाईल" -#: difftextwindow.cpp:1951 optiondialog.cpp:387 +#: difftextwindow.cpp:1943 optiondialog.cpp:389 #, kde-format msgid "Unicode, 8 bit" msgstr "" -#: difftextwindow.cpp:1966 +#: difftextwindow.cpp:1958 #, kde-format msgid "Other" msgstr "" -#: directorymergewindow.cpp:409 directorymergewindow.cpp:3424 +#: directorymergewindow.cpp:410 directorymergewindow.cpp:3438 #, kde-format msgid "Copy A to B" msgstr "" -#: directorymergewindow.cpp:412 directorymergewindow.cpp:3425 +#: directorymergewindow.cpp:413 directorymergewindow.cpp:3439 #, kde-format msgid "Copy B to A" msgstr "" -#: directorymergewindow.cpp:415 directorymergewindow.cpp:3426 +#: directorymergewindow.cpp:416 directorymergewindow.cpp:3440 #, kde-format msgid "Delete A" msgstr "" -#: directorymergewindow.cpp:418 directorymergewindow.cpp:3427 +#: directorymergewindow.cpp:419 directorymergewindow.cpp:3441 #, kde-format msgid "Delete B" msgstr "" -#: directorymergewindow.cpp:421 +#: directorymergewindow.cpp:422 #, kde-format msgid "Delete A & B" msgstr "" -#: directorymergewindow.cpp:424 directorymergewindow.cpp:3429 +#: directorymergewindow.cpp:425 directorymergewindow.cpp:3443 #, kde-format msgid "Merge to A" msgstr "" -#: directorymergewindow.cpp:427 directorymergewindow.cpp:3430 +#: directorymergewindow.cpp:428 directorymergewindow.cpp:3444 #, kde-format msgid "Merge to B" msgstr "" -#: directorymergewindow.cpp:430 +#: directorymergewindow.cpp:431 #, kde-format msgid "Merge to A & B" msgstr "" -#: directorymergewindow.cpp:442 directorymergewindow.cpp:3421 +#: directorymergewindow.cpp:443 directorymergewindow.cpp:3435 #, kde-format msgid "Delete (if exists)" msgstr "" -#: directorymergewindow.cpp:445 directorymergewindow.cpp:448 -#: directorymergewindow.cpp:3420 optiondialog.cpp:925 smalldialogs.cpp:113 +#: directorymergewindow.cpp:446 directorymergewindow.cpp:449 +#: directorymergewindow.cpp:3434 smalldialogs.cpp:120 #, kde-format msgid "Merge" msgstr "" -#: directorymergewindow.cpp:445 directorymergewindow.cpp:448 +#: directorymergewindow.cpp:446 directorymergewindow.cpp:449 #, kde-format msgid "Merge (manual)" msgstr "" -#: directorymergewindow.cpp:451 +#: directorymergewindow.cpp:452 #, kde-format msgid "Error: Conflicting File Types" msgstr "" -#: directorymergewindow.cpp:454 +#: directorymergewindow.cpp:455 #, kde-format msgid "Error: Changed and Deleted" msgstr "" -#: directorymergewindow.cpp:457 +#: directorymergewindow.cpp:458 #, kde-format msgid "Error: Dates are equal but files are not." msgstr "" -#: directorymergewindow.cpp:471 +#: directorymergewindow.cpp:472 #, fuzzy, kde-format #| msgid "Done." msgid "Done" msgstr "संपन्न." -#: directorymergewindow.cpp:473 +#: directorymergewindow.cpp:474 #, kde-format msgid "Error" msgstr "त्रुटी" -#: directorymergewindow.cpp:475 +#: directorymergewindow.cpp:476 #, kde-format msgid "Skipped." msgstr "" -#: directorymergewindow.cpp:477 +#: directorymergewindow.cpp:478 #, kde-format msgid "Not saved." msgstr "" -#: directorymergewindow.cpp:479 +#: directorymergewindow.cpp:480 #, fuzzy, kde-format msgid "In progress..." msgstr "प्रगतीपथावर आहे/चालू आहे" -#: directorymergewindow.cpp:481 +#: directorymergewindow.cpp:482 #, kde-format msgid "To do." msgstr "" -#: directorymergewindow.cpp:522 +#: directorymergewindow.cpp:523 #, kde-format msgid "Name" msgstr "नाव" -#: directorymergewindow.cpp:530 +#: directorymergewindow.cpp:531 #, kde-format msgid "Operation" msgstr "क्रिया" -#: directorymergewindow.cpp:532 +#: directorymergewindow.cpp:533 #, kde-format msgid "Status" msgstr "स्थिती" -#: directorymergewindow.cpp:534 +#: directorymergewindow.cpp:535 #, kde-format msgid "Unsolved" msgstr "" -#: directorymergewindow.cpp:536 +#: directorymergewindow.cpp:537 #, kde-format msgid "Solved" msgstr "" -#: directorymergewindow.cpp:538 +#: directorymergewindow.cpp:539 #, kde-format msgid "Nonwhite" msgstr "" -#: directorymergewindow.cpp:540 +#: directorymergewindow.cpp:541 #, kde-format msgid "White" msgstr "पांढरा" -#: directorymergewindow.cpp:674 +#: directorymergewindow.cpp:676 #, kde-format msgid "Unable to compare non-normal file with normal file." msgstr "" -#: directorymergewindow.cpp:688 +#: directorymergewindow.cpp:690 #, kde-format msgid "Mix of links and normal files." msgstr "" -#: directorymergewindow.cpp:695 +#: directorymergewindow.cpp:697 #, fuzzy, kde-format msgid "Link: " msgstr "लिंक" -#: directorymergewindow.cpp:704 +#: directorymergewindow.cpp:706 #, fuzzy, kde-format msgid "Size. " msgstr "आकार" -#: directorymergewindow.cpp:718 directorymergewindow.cpp:728 +#: directorymergewindow.cpp:720 directorymergewindow.cpp:730 #, kde-format msgid "Date & Size: " msgstr "" -#: directorymergewindow.cpp:748 +#: directorymergewindow.cpp:751 #, kde-format msgid "Comparing file..." msgstr "" -#: directorymergewindow.cpp:801 +#: directorymergewindow.cpp:813 #, kde-format msgid "" "You are currently doing a directory merge. Are you sure, you want to abort " "the merge and rescan the directory?" msgstr "" -#: directorymergewindow.cpp:802 kdiff3.cpp:698 kdiff3.cpp:708 kdiff3.cpp:720 -#: mergeresultwindow.cpp:372 pdiff.cpp:1033 pdiff.cpp:1910 pdiff.cpp:1920 +#: directorymergewindow.cpp:814 kdiff3.cpp:697 kdiff3.cpp:707 kdiff3.cpp:719 +#: mergeresultwindow.cpp:400 pdiff.cpp:1031 pdiff.cpp:1920 pdiff.cpp:1930 #, fuzzy, kde-format msgid "Warning" msgstr "इशारा" -#: directorymergewindow.cpp:803 directorymergewindow.cpp:3393 +#: directorymergewindow.cpp:815 directorymergewindow.cpp:3407 #, kde-format msgid "Rescan" msgstr "" -#: directorymergewindow.cpp:804 pdiff.cpp:1035 +#: directorymergewindow.cpp:816 pdiff.cpp:1033 #, kde-format msgid "Continue Merging" msgstr "" -#: directorymergewindow.cpp:971 +#: directorymergewindow.cpp:984 #, kde-format msgid "Opening of directories failed:" msgstr "" -#: directorymergewindow.cpp:975 +#: directorymergewindow.cpp:988 #, kde-format msgid "Dir A \"%1\" does not exist or is not a directory.\n" msgstr "" -#: directorymergewindow.cpp:980 +#: directorymergewindow.cpp:993 #, kde-format msgid "Dir B \"%1\" does not exist or is not a directory.\n" msgstr "" -#: directorymergewindow.cpp:985 +#: directorymergewindow.cpp:998 #, kde-format msgid "Dir C \"%1\" does not exist or is not a directory.\n" msgstr "" -#: directorymergewindow.cpp:988 +#: directorymergewindow.cpp:1001 #, kde-format msgid "Directory Open Error" msgstr "" -#: directorymergewindow.cpp:996 +#: directorymergewindow.cpp:1009 #, kde-format msgid "" "The destination directory must not be the same as A or B when three " @@ -364,49 +364,49 @@ "Check again before continuing." msgstr "" -#: directorymergewindow.cpp:998 +#: directorymergewindow.cpp:1011 #, kde-format msgid "Parameter Warning" msgstr "" -#: directorymergewindow.cpp:1003 +#: directorymergewindow.cpp:1016 #, kde-format msgid "Scanning directories..." msgstr "" -#: directorymergewindow.cpp:1029 +#: directorymergewindow.cpp:1042 #, kde-format msgid "Reading Directory A" msgstr "" -#: directorymergewindow.cpp:1038 +#: directorymergewindow.cpp:1051 #, kde-format msgid "Reading Directory B" msgstr "" -#: directorymergewindow.cpp:1048 +#: directorymergewindow.cpp:1061 #, kde-format msgid "Reading Directory C" msgstr "" -#: directorymergewindow.cpp:1064 +#: directorymergewindow.cpp:1077 #, kde-format msgid "Some subdirectories were not readable in" msgstr "" -#: directorymergewindow.cpp:1069 +#: directorymergewindow.cpp:1082 #, kde-format msgid "Check the permissions of the subdirectories." msgstr "" -#: directorymergewindow.cpp:1106 kdiff3.cpp:666 kdiff3.cpp:753 kdiff3.cpp:777 -#: kdiff3.cpp:1065 kdiff3.cpp:1086 pdiff.cpp:1116 pdiff.cpp:1170 pdiff.cpp:1218 -#: pdiff.cpp:1234 pdiff.cpp:1277 pdiff.cpp:1301 +#: directorymergewindow.cpp:1119 kdiff3.cpp:665 kdiff3.cpp:752 kdiff3.cpp:776 +#: kdiff3.cpp:1072 kdiff3.cpp:1093 pdiff.cpp:1115 pdiff.cpp:1178 pdiff.cpp:1228 +#: pdiff.cpp:1244 pdiff.cpp:1287 pdiff.cpp:1311 #, kde-format msgid "Ready." msgstr "तयार." -#: directorymergewindow.cpp:1121 +#: directorymergewindow.cpp:1134 #, kde-format msgid "" "Directory Comparison Status\n" @@ -416,66 +416,66 @@ "Number of different files: %3" msgstr "" -#: directorymergewindow.cpp:1128 +#: directorymergewindow.cpp:1141 #, kde-format msgid "Number of manual merges: %1" msgstr "" -#: directorymergewindow.cpp:1394 +#: directorymergewindow.cpp:1407 #, kde-format msgid "This affects all merge operations." msgstr "" -#: directorymergewindow.cpp:1395 +#: directorymergewindow.cpp:1408 #, kde-format msgid "Changing All Merge Operations" msgstr "" -#: directorymergewindow.cpp:1695 +#: directorymergewindow.cpp:1708 #, kde-format msgid "" "Processing %1 / %2\n" "%3" msgstr "" -#: directorymergewindow.cpp:1738 directorymergewindow.cpp:1742 +#: directorymergewindow.cpp:1751 directorymergewindow.cpp:1755 #, kde-format msgid "Some files could not be processed." msgstr "" -#: directorymergewindow.cpp:2222 directorymergewindow.cpp:2247 -#: directorymergewindow.cpp:2271 +#: directorymergewindow.cpp:2235 directorymergewindow.cpp:2260 +#: directorymergewindow.cpp:2285 #, kde-format msgid "This operation is currently not possible." msgstr "" -#: directorymergewindow.cpp:2222 directorymergewindow.cpp:2247 -#: directorymergewindow.cpp:2271 directorymergewindow.cpp:2552 +#: directorymergewindow.cpp:2235 directorymergewindow.cpp:2260 +#: directorymergewindow.cpp:2285 directorymergewindow.cpp:2565 #, kde-format msgid "Operation Not Possible" msgstr "" -#: directorymergewindow.cpp:2318 +#: directorymergewindow.cpp:2332 #, kde-format msgid "An error occurred while copying." msgstr "" -#: directorymergewindow.cpp:2319 directorymergewindow.cpp:2759 +#: directorymergewindow.cpp:2333 directorymergewindow.cpp:2772 #, kde-format msgid "Merge Error" msgstr "" -#: directorymergewindow.cpp:2396 +#: directorymergewindow.cpp:2410 #, kde-format msgid "Unknown merge operation. (This must never happen!)" msgstr "" -#: directorymergewindow.cpp:2441 +#: directorymergewindow.cpp:2455 #, kde-format msgid "Unknown merge operation." msgstr "" -#: directorymergewindow.cpp:2454 +#: directorymergewindow.cpp:2468 #, kde-format msgid "" "The merge is about to begin.\n" @@ -488,50 +488,50 @@ "whatsoever! Make backups of your vital data!" msgstr "" -#: directorymergewindow.cpp:2459 +#: directorymergewindow.cpp:2473 #, kde-format msgid "Starting Merge" msgstr "" -#: directorymergewindow.cpp:2460 +#: directorymergewindow.cpp:2474 #, kde-format msgid "Do It" msgstr "" -#: directorymergewindow.cpp:2461 +#: directorymergewindow.cpp:2475 #, kde-format msgid "Simulate It" msgstr "" -#: directorymergewindow.cpp:2487 +#: directorymergewindow.cpp:2501 #, kde-format msgid "" "The highlighted item has a different type in the different directories. " "Select what to do." msgstr "" -#: directorymergewindow.cpp:2491 +#: directorymergewindow.cpp:2505 #, kde-format msgid "" "The modification dates of the file are equal but the files are not. Select " "what to do." msgstr "" -#: directorymergewindow.cpp:2495 +#: directorymergewindow.cpp:2509 #, kde-format msgid "" "The highlighted item was changed in one directory and deleted in the other. " "Select what to do." msgstr "" -#: directorymergewindow.cpp:2552 +#: directorymergewindow.cpp:2565 #, kde-format msgid "" "This operation is currently not possible because directory merge is " "currently running." msgstr "" -#: directorymergewindow.cpp:2609 +#: directorymergewindow.cpp:2622 #, kde-format msgid "" "There was an error in the last step.\n" @@ -539,970 +539,975 @@ "to skip this item?" msgstr "" -#: directorymergewindow.cpp:2611 +#: directorymergewindow.cpp:2624 #, kde-format msgid "Continue merge after an error" msgstr "" -#: directorymergewindow.cpp:2612 +#: directorymergewindow.cpp:2625 #, kde-format msgid "Continue With Last Item" msgstr "" -#: directorymergewindow.cpp:2613 +#: directorymergewindow.cpp:2626 #, kde-format msgid "Skip Item" msgstr "" -#: directorymergewindow.cpp:2709 +#: directorymergewindow.cpp:2722 #, kde-format msgid "Merge operation complete." msgstr "" -#: directorymergewindow.cpp:2709 directorymergewindow.cpp:2712 +#: directorymergewindow.cpp:2722 directorymergewindow.cpp:2725 #, kde-format msgid "Merge Complete" msgstr "" -#: directorymergewindow.cpp:2722 +#: directorymergewindow.cpp:2735 #, kde-format msgid "" "Simulated merge complete: Check if you agree with the proposed operations." msgstr "" -#: directorymergewindow.cpp:2758 +#: directorymergewindow.cpp:2771 #, kde-format msgid "An error occurred. Press OK to see detailed information." msgstr "" -#: directorymergewindow.cpp:2791 +#: directorymergewindow.cpp:2804 #, kde-format msgid "Error: While deleting %1: Creating backup failed." msgstr "" -#: directorymergewindow.cpp:2798 +#: directorymergewindow.cpp:2811 #, kde-format msgid "delete directory recursively( %1 )" msgstr "" -#: directorymergewindow.cpp:2800 +#: directorymergewindow.cpp:2813 #, fuzzy, kde-format msgid "delete( %1 )" msgstr "काढून टाका" -#: directorymergewindow.cpp:2815 +#: directorymergewindow.cpp:2828 #, kde-format msgid "Error: delete dir operation failed while trying to read the directory." msgstr "" -#: directorymergewindow.cpp:2834 +#: directorymergewindow.cpp:2847 #, kde-format msgid "Error: rmdir( %1 ) operation failed." msgstr "" -#: directorymergewindow.cpp:2844 +#: directorymergewindow.cpp:2857 #, kde-format msgid "Error: delete operation failed." msgstr "" -#: directorymergewindow.cpp:2870 +#: directorymergewindow.cpp:2884 #, kde-format msgid "manual merge( %1, %2, %3 -> %4)" msgstr "" -#: directorymergewindow.cpp:2873 +#: directorymergewindow.cpp:2887 #, kde-format msgid "" " Note: After a manual merge the user should continue by pressing F7." msgstr "" -#: directorymergewindow.cpp:2900 +#: directorymergewindow.cpp:2914 #, kde-format msgid "Error: copy( %1 -> %2 ) failed.Deleting existing destination failed." msgstr "" -#: directorymergewindow.cpp:2909 +#: directorymergewindow.cpp:2923 #, kde-format msgid "copyLink( %1 -> %2 )" msgstr "" -#: directorymergewindow.cpp:2918 +#: directorymergewindow.cpp:2932 #, kde-format msgid "Error: copyLink failed: Remote links are not yet supported." msgstr "" -#: directorymergewindow.cpp:2928 +#: directorymergewindow.cpp:2942 #, kde-format msgid "Error: copyLink failed." msgstr "" -#: directorymergewindow.cpp:2953 +#: directorymergewindow.cpp:2967 #, fuzzy, kde-format msgid "copy( %1 -> %2 )" msgstr "प्रत करा" -#: directorymergewindow.cpp:2979 +#: directorymergewindow.cpp:2993 #, kde-format msgid "Error during rename( %1 -> %2 ): Cannot delete existing destination." msgstr "" -#: directorymergewindow.cpp:2986 +#: directorymergewindow.cpp:3000 #, fuzzy, kde-format msgid "rename( %1 -> %2 )" msgstr "नाव बदला" -#: directorymergewindow.cpp:2995 +#: directorymergewindow.cpp:3009 #, kde-format msgid "Error: Rename failed." msgstr "" -#: directorymergewindow.cpp:3013 +#: directorymergewindow.cpp:3027 #, kde-format msgid "Error during makeDir of %1. Cannot delete existing file." msgstr "" -#: directorymergewindow.cpp:3030 +#: directorymergewindow.cpp:3044 #, kde-format msgid "makeDir( %1 )" msgstr "" -#: directorymergewindow.cpp:3040 +#: directorymergewindow.cpp:3054 #, kde-format msgid "Error while creating directory." msgstr "" -#: directorymergewindow.cpp:3076 directorymergewindow.cpp:3195 +#: directorymergewindow.cpp:3090 directorymergewindow.cpp:3209 #, kde-format msgid "Dest" msgstr "" -#: directorymergewindow.cpp:3084 directorymergewindow.cpp:3113 +#: directorymergewindow.cpp:3098 directorymergewindow.cpp:3127 #, kde-format msgid "Dir" msgstr "" -#: directorymergewindow.cpp:3084 +#: directorymergewindow.cpp:3098 #, kde-format msgid "Type" msgstr "प्रकार" -#: directorymergewindow.cpp:3084 +#: directorymergewindow.cpp:3098 #, kde-format msgid "Size" msgstr "आकार" -#: directorymergewindow.cpp:3085 +#: directorymergewindow.cpp:3099 #, kde-format msgid "Attr" msgstr "" -#: directorymergewindow.cpp:3085 +#: directorymergewindow.cpp:3099 #, kde-format msgid "Last Modification" msgstr "" -#: directorymergewindow.cpp:3085 +#: directorymergewindow.cpp:3099 #, fuzzy, kde-format msgid "Link-Destination" msgstr "लक्ष्य लिंक करा" -#: directorymergewindow.cpp:3113 +#: directorymergewindow.cpp:3127 #, kde-format msgid "File" msgstr "फाईल" -#: directorymergewindow.cpp:3113 +#: directorymergewindow.cpp:3127 #, fuzzy, kde-format msgid "-Link" msgstr "लिंक" -#: directorymergewindow.cpp:3119 +#: directorymergewindow.cpp:3133 #, fuzzy, kde-format msgid "not available" msgstr "उपलब्ध नाही" -#: directorymergewindow.cpp:3137 +#: directorymergewindow.cpp:3151 #, kde-format msgid "A (Dest): " msgstr "" -#: directorymergewindow.cpp:3141 +#: directorymergewindow.cpp:3155 #, kde-format msgid "A: " msgstr "" -#: directorymergewindow.cpp:3141 +#: directorymergewindow.cpp:3155 #, kde-format msgid "A (Base): " msgstr "" -#: directorymergewindow.cpp:3147 +#: directorymergewindow.cpp:3161 #, kde-format msgid "B (Dest): " msgstr "" -#: directorymergewindow.cpp:3151 +#: directorymergewindow.cpp:3165 #, kde-format msgid "B: " msgstr "" -#: directorymergewindow.cpp:3156 +#: directorymergewindow.cpp:3170 #, kde-format msgid "C (Dest): " msgstr "" -#: directorymergewindow.cpp:3160 +#: directorymergewindow.cpp:3174 #, kde-format msgid "C: " msgstr "" -#: directorymergewindow.cpp:3163 +#: directorymergewindow.cpp:3177 #, kde-format msgid "Dest: " msgstr "" #. i18n("Saving Directory Merge State ...")); -#: directorymergewindow.cpp:3238 +#: directorymergewindow.cpp:3252 #, kde-format msgid "Save Directory Merge State As..." msgstr "" -#: directorymergewindow.cpp:3387 +#: directorymergewindow.cpp:3401 #, kde-format msgid "Start/Continue Directory Merge" msgstr "" -#: directorymergewindow.cpp:3388 +#: directorymergewindow.cpp:3402 #, kde-format msgid "Run Operation for Current Item" msgstr "" -#: directorymergewindow.cpp:3389 +#: directorymergewindow.cpp:3403 #, kde-format msgid "Compare Selected File" msgstr "" -#: directorymergewindow.cpp:3390 +#: directorymergewindow.cpp:3404 #, kde-format msgid "Merge Current File" msgstr "" -#: directorymergewindow.cpp:3390 +#: directorymergewindow.cpp:3404 #, kde-format msgid "" "Merge\n" "File" msgstr "" -#: directorymergewindow.cpp:3391 +#: directorymergewindow.cpp:3405 #, kde-format msgid "Fold All Subdirs" msgstr "" -#: directorymergewindow.cpp:3392 +#: directorymergewindow.cpp:3406 #, kde-format msgid "Unfold All Subdirs" msgstr "" #. i18n("Save Directory Merge State ..."), 0, this, &DirectoryMergeWindow::slotSaveMergeState, ac, "dir_save_merge_state"); #. i18n("Load Directory Merge State ..."), 0, this, &DirectoryMergeWindow::slotLoadMergeState, ac, "dir_load_merge_state"); -#: directorymergewindow.cpp:3396 +#: directorymergewindow.cpp:3410 #, kde-format msgid "Choose A for All Items" msgstr "" -#: directorymergewindow.cpp:3397 +#: directorymergewindow.cpp:3411 #, kde-format msgid "Choose B for All Items" msgstr "" -#: directorymergewindow.cpp:3398 +#: directorymergewindow.cpp:3412 #, kde-format msgid "Choose C for All Items" msgstr "" -#: directorymergewindow.cpp:3399 +#: directorymergewindow.cpp:3413 #, kde-format msgid "Auto-Choose Operation for All Items" msgstr "" -#: directorymergewindow.cpp:3400 +#: directorymergewindow.cpp:3414 #, kde-format msgid "No Operation for All Items" msgstr "" #. i18n("Synchronize Directories"), 0, this, &DirectoryMergeWindow::slotSynchronizeDirectories, ac, "dir_synchronize_directories"); #. d->m_pDirChooseNewerFiles = GuiUtils::createAction< KToggleAction >(i18n("Copy Newer Files Instead of Merging"), 0, this, &DirectoryMergeWindow::slotChooseNewerFiles, ac, "dir_choose_newer_files"); -#: directorymergewindow.cpp:3405 +#: directorymergewindow.cpp:3419 #, kde-format msgid "Show Identical Files" msgstr "" -#: directorymergewindow.cpp:3405 +#: directorymergewindow.cpp:3419 #, kde-format msgid "" "Identical\n" "Files" msgstr "" -#: directorymergewindow.cpp:3406 +#: directorymergewindow.cpp:3420 #, kde-format msgid "Show Different Files" msgstr "" -#: directorymergewindow.cpp:3407 +#: directorymergewindow.cpp:3421 #, kde-format msgid "Show Files only in A" msgstr "" -#: directorymergewindow.cpp:3407 +#: directorymergewindow.cpp:3421 #, kde-format msgid "" "Files\n" "only in A" msgstr "" -#: directorymergewindow.cpp:3408 +#: directorymergewindow.cpp:3422 #, kde-format msgid "Show Files only in B" msgstr "" -#: directorymergewindow.cpp:3408 +#: directorymergewindow.cpp:3422 #, kde-format msgid "" "Files\n" "only in B" msgstr "" -#: directorymergewindow.cpp:3409 +#: directorymergewindow.cpp:3423 #, kde-format msgid "Show Files only in C" msgstr "" -#: directorymergewindow.cpp:3409 +#: directorymergewindow.cpp:3423 #, kde-format msgid "" "Files\n" "only in C" msgstr "" -#: directorymergewindow.cpp:3413 +#: directorymergewindow.cpp:3427 #, kde-format msgid "Compare Explicitly Selected Files" msgstr "" -#: directorymergewindow.cpp:3414 +#: directorymergewindow.cpp:3428 #, kde-format msgid "Merge Explicitly Selected Files" msgstr "" -#: directorymergewindow.cpp:3416 directorymergewindow.cpp:3423 +#: directorymergewindow.cpp:3430 directorymergewindow.cpp:3437 #, kde-format msgid "Do Nothing" msgstr "काही करू नका" -#: directorymergewindow.cpp:3428 +#: directorymergewindow.cpp:3442 #, kde-format msgid "Delete A && B" msgstr "" -#: directorymergewindow.cpp:3431 +#: directorymergewindow.cpp:3445 #, kde-format msgid "Merge to A && B" msgstr "" -#: fileaccess.cpp:462 SourceData.cpp:493 +#: fileaccess.cpp:301 +#, kde-format +msgid "Unable to determine full url. No parent specified." +msgstr "" + +#: fileaccess.cpp:482 SourceData.cpp:506 #, kde-format msgid "Failed to read file: %1" msgstr "" -#: fileaccess.cpp:587 +#: fileaccess.cpp:624 #, kde-format msgid "Creating temp copy of %1 failed." msgstr "" -#: fileaccess.cpp:595 fileaccess.cpp:600 +#: fileaccess.cpp:632 fileaccess.cpp:637 #, fuzzy, kde-format msgid "Opening %1 failed. %2" msgstr "%1 साठवणे अयशस्वी झाले :
%2" -#: fileaccess.cpp:619 fileaccess.cpp:627 +#: fileaccess.cpp:656 fileaccess.cpp:664 #, kde-format msgid "Error reading from %1. %2" msgstr "" -#: fileaccess.cpp:751 +#: fileaccess.cpp:788 #, kde-format msgid "" "While trying to make a backup, deleting an older backup failed.\n" "Filename: %1" msgstr "" -#: fileaccess.cpp:758 +#: fileaccess.cpp:795 #, kde-format msgid "" "While trying to make a backup, renaming failed.\n" "Filenames: %1 -> %2" msgstr "" -#: fileaccess.cpp:828 +#: fileaccess.cpp:865 #, kde-format msgid "Getting file status: %1" msgstr "" -#: fileaccess.cpp:869 +#: fileaccess.cpp:906 #, kde-format msgid "Reading file: %1" msgstr "" -#: fileaccess.cpp:907 +#: fileaccess.cpp:944 #, kde-format msgid "Writing file: %1" msgstr "" -#: fileaccess.cpp:940 +#: fileaccess.cpp:977 #, kde-format msgid "Out of memory" msgstr "स्मृती कमी पडली" -#: fileaccess.cpp:976 +#: fileaccess.cpp:1013 #, kde-format msgid "Making directory: %1" msgstr "" -#: fileaccess.cpp:997 +#: fileaccess.cpp:1034 #, kde-format msgid "Removing directory: %1" msgstr "" -#: fileaccess.cpp:1012 +#: fileaccess.cpp:1049 #, kde-format msgid "Removing file: %1" msgstr "" -#: fileaccess.cpp:1028 +#: fileaccess.cpp:1065 #, kde-format msgid "Creating symbolic link: %1 -> %2" msgstr "" -#: fileaccess.cpp:1052 +#: fileaccess.cpp:1089 #, kde-format msgid "Renaming file: %1 -> %2" msgstr "" -#: fileaccess.cpp:1086 +#: fileaccess.cpp:1123 #, kde-format msgid "Copying file: %1 -> %2" msgstr "" -#: fileaccess.cpp:1108 +#: fileaccess.cpp:1145 #, fuzzy, kde-format #| msgid "Directory" msgid "Reading directory: %1" msgstr "संचयीका" -#: fileaccess.cpp:1162 +#: fileaccess.cpp:1202 #, kde-format msgid "Listing directory: %1" msgstr "" -#: kdiff3.cpp:181 +#: kdiff3.cpp:182 #, kde-format msgid "Current Configuration:" msgstr "" -#: kdiff3.cpp:186 +#: kdiff3.cpp:187 #, kde-format msgid "Config Option Error:" msgstr "" -#: kdiff3.cpp:240 +#: kdiff3.cpp:246 #, kde-format msgid "Option --auto used, but no output file specified." msgstr "" -#: kdiff3.cpp:416 +#: kdiff3.cpp:405 #, kde-format msgid "Option --auto ignored for directory comparison." msgstr "" -#: kdiff3.cpp:460 +#: kdiff3.cpp:449 #, fuzzy, kde-format msgid "Saving failed." msgstr "%1 साठवणे अयशस्वी झाले :
%2" -#: kdiff3.cpp:496 pdiff.cpp:1098 +#: kdiff3.cpp:494 pdiff.cpp:1096 #, kde-format msgid "Opening of these files failed:" msgstr "" -#: kdiff3.cpp:505 +#: kdiff3.cpp:503 pdiff.cpp:1105 #, kde-format -msgid "File Open Error" +msgid "File open error" msgstr "" -#: kdiff3.cpp:533 +#: kdiff3.cpp:532 #, kde-format msgid "Opens documents for comparison..." msgstr "" -#: kdiff3.cpp:535 +#: kdiff3.cpp:534 #, fuzzy, kde-format msgid "Reload" msgstr "पुन्हा दाखल करा" -#: kdiff3.cpp:538 +#: kdiff3.cpp:537 #, kde-format msgid "Saves the merge result. All conflicts must be solved!" msgstr "" -#: kdiff3.cpp:540 +#: kdiff3.cpp:539 #, kde-format msgid "Saves the current document as..." msgstr "" -#: kdiff3.cpp:543 +#: kdiff3.cpp:542 #, kde-format msgid "Print the differences" msgstr "" -#: kdiff3.cpp:546 +#: kdiff3.cpp:545 #, kde-format msgid "Quits the application" msgstr "" -#: kdiff3.cpp:549 +#: kdiff3.cpp:548 #, kde-format msgid "Cuts the selected section and puts it to the clipboard" msgstr "" -#: kdiff3.cpp:552 +#: kdiff3.cpp:551 #, kde-format msgid "Copies the selected section to the clipboard" msgstr "" -#: kdiff3.cpp:554 +#: kdiff3.cpp:553 #, kde-format msgid "Pastes the clipboard contents to current position" msgstr "" -#: kdiff3.cpp:557 +#: kdiff3.cpp:556 #, kde-format msgid "Select everything in current window" msgstr "" -#: kdiff3.cpp:560 +#: kdiff3.cpp:559 #, kde-format msgid "Search for a string" msgstr "" -#: kdiff3.cpp:562 +#: kdiff3.cpp:561 #, kde-format msgid "Search again for the string" msgstr "" -#: kdiff3.cpp:567 +#: kdiff3.cpp:566 #, kde-format msgid "Enables/disables the statusbar" msgstr "" -#: kdiff3.cpp:571 +#: kdiff3.cpp:570 #, kde-format msgid "Configure KDiff3..." msgstr "" -#: kdiff3.cpp:590 +#: kdiff3.cpp:589 #, kde-format msgid "Go to Current Delta" msgstr "" -#: kdiff3.cpp:590 +#: kdiff3.cpp:589 #, kde-format msgid "" "Current\n" "Delta" msgstr "" -#: kdiff3.cpp:592 +#: kdiff3.cpp:591 #, kde-format msgid "Go to First Delta" msgstr "" -#: kdiff3.cpp:592 +#: kdiff3.cpp:591 #, kde-format msgid "" "First\n" "Delta" msgstr "" -#: kdiff3.cpp:594 +#: kdiff3.cpp:593 #, kde-format msgid "Go to Last Delta" msgstr "" -#: kdiff3.cpp:594 +#: kdiff3.cpp:593 #, kde-format msgid "" "Last\n" "Delta" msgstr "" -#: kdiff3.cpp:596 +#: kdiff3.cpp:595 #, kde-format msgid "(Skips white space differences when \"Show White Space\" is disabled.)" msgstr "" -#: kdiff3.cpp:597 +#: kdiff3.cpp:596 #, kde-format msgid "" "(Does not skip white space differences even when \"Show White Space\" is " "disabled.)" msgstr "" -#: kdiff3.cpp:598 +#: kdiff3.cpp:597 #, kde-format msgid "Go to Previous Delta" msgstr "" -#: kdiff3.cpp:598 +#: kdiff3.cpp:597 #, kde-format msgid "" "Prev\n" "Delta" msgstr "" -#: kdiff3.cpp:600 +#: kdiff3.cpp:599 #, kde-format msgid "Go to Next Delta" msgstr "" -#: kdiff3.cpp:600 +#: kdiff3.cpp:599 #, kde-format msgid "" "Next\n" "Delta" msgstr "" -#: kdiff3.cpp:602 +#: kdiff3.cpp:601 #, kde-format msgid "Go to Previous Conflict" msgstr "" -#: kdiff3.cpp:602 +#: kdiff3.cpp:601 #, kde-format msgid "" "Prev\n" "Conflict" msgstr "" -#: kdiff3.cpp:604 +#: kdiff3.cpp:603 #, kde-format msgid "Go to Next Conflict" msgstr "" -#: kdiff3.cpp:604 +#: kdiff3.cpp:603 #, kde-format msgid "" "Next\n" "Conflict" msgstr "" -#: kdiff3.cpp:606 +#: kdiff3.cpp:605 #, kde-format msgid "Go to Previous Unsolved Conflict" msgstr "" -#: kdiff3.cpp:606 +#: kdiff3.cpp:605 #, kde-format msgid "" "Prev\n" "Unsolved" msgstr "" -#: kdiff3.cpp:608 +#: kdiff3.cpp:607 #, kde-format msgid "Go to Next Unsolved Conflict" msgstr "" -#: kdiff3.cpp:608 +#: kdiff3.cpp:607 #, kde-format msgid "" "Next\n" "Unsolved" msgstr "" -#: kdiff3.cpp:610 +#: kdiff3.cpp:609 #, kde-format msgid "Select Line(s) From A" msgstr "" -#: kdiff3.cpp:610 +#: kdiff3.cpp:609 #, kde-format msgid "" "Choose\n" "A" msgstr "" -#: kdiff3.cpp:611 +#: kdiff3.cpp:610 #, kde-format msgid "Select Line(s) From B" msgstr "" -#: kdiff3.cpp:611 +#: kdiff3.cpp:610 #, kde-format msgid "" "Choose\n" "B" msgstr "" -#: kdiff3.cpp:612 +#: kdiff3.cpp:611 #, kde-format msgid "Select Line(s) From C" msgstr "" -#: kdiff3.cpp:612 +#: kdiff3.cpp:611 #, kde-format msgid "" "Choose\n" "C" msgstr "" -#: kdiff3.cpp:613 +#: kdiff3.cpp:612 #, kde-format msgid "Automatically Go to Next Unsolved Conflict After Source Selection" msgstr "" -#: kdiff3.cpp:613 +#: kdiff3.cpp:612 #, kde-format msgid "" "Auto\n" "Next" msgstr "" -#: kdiff3.cpp:615 +#: kdiff3.cpp:614 #, kde-format msgid "Show Space && Tabulator Characters" msgstr "" -#: kdiff3.cpp:615 +#: kdiff3.cpp:614 #, kde-format msgid "" "White\n" "Characters" msgstr "" -#: kdiff3.cpp:616 +#: kdiff3.cpp:615 #, kde-format msgid "Show White Space" msgstr "" -#: kdiff3.cpp:616 +#: kdiff3.cpp:615 #, kde-format msgid "" "White\n" "Deltas" msgstr "" -#: kdiff3.cpp:618 +#: kdiff3.cpp:617 #, fuzzy, kde-format msgid "Show Line Numbers" msgstr "ओळ क्रमांक दर्शवा (&L)" -#: kdiff3.cpp:618 +#: kdiff3.cpp:617 #, kde-format msgid "" "Line\n" "Numbers" msgstr "" -#: kdiff3.cpp:620 +#: kdiff3.cpp:619 #, kde-format msgid "Automatically Solve Simple Conflicts" msgstr "" -#: kdiff3.cpp:621 +#: kdiff3.cpp:620 #, kde-format msgid "Set Deltas to Conflicts" msgstr "" -#: kdiff3.cpp:622 +#: kdiff3.cpp:621 #, kde-format msgid "Run Regular Expression Auto Merge" msgstr "" -#: kdiff3.cpp:623 +#: kdiff3.cpp:622 #, kde-format msgid "Automatically Solve History Conflicts" msgstr "" -#: kdiff3.cpp:624 +#: kdiff3.cpp:623 #, kde-format msgid "Split Diff At Selection" msgstr "" -#: kdiff3.cpp:625 +#: kdiff3.cpp:624 #, kde-format msgid "Join Selected Diffs" msgstr "" -#: kdiff3.cpp:627 +#: kdiff3.cpp:626 #, kde-format msgid "Show Window A" msgstr "" -#: kdiff3.cpp:628 +#: kdiff3.cpp:627 #, kde-format msgid "Show Window B" msgstr "" -#: kdiff3.cpp:629 +#: kdiff3.cpp:628 #, kde-format msgid "Show Window C" msgstr "" -#: kdiff3.cpp:631 +#: kdiff3.cpp:630 #, kde-format msgid "Normal Overview" msgstr "" -#: kdiff3.cpp:632 +#: kdiff3.cpp:631 #, kde-format msgid "A vs. B Overview" msgstr "" -#: kdiff3.cpp:633 +#: kdiff3.cpp:632 #, kde-format msgid "A vs. C Overview" msgstr "" -#: kdiff3.cpp:634 +#: kdiff3.cpp:633 #, kde-format msgid "B vs. C Overview" msgstr "" -#: kdiff3.cpp:635 +#: kdiff3.cpp:634 #, kde-format msgid "Word Wrap Diff Windows" msgstr "" -#: kdiff3.cpp:636 +#: kdiff3.cpp:635 #, kde-format msgid "Add Manual Diff Alignment" msgstr "" -#: kdiff3.cpp:637 +#: kdiff3.cpp:636 #, kde-format msgid "Clear All Manual Diff Alignments" msgstr "" -#: kdiff3.cpp:639 +#: kdiff3.cpp:638 #, kde-format msgid "Focus Next Window" msgstr "" -#: kdiff3.cpp:640 +#: kdiff3.cpp:639 #, kde-format msgid "Focus Prev Window" msgstr "" -#: kdiff3.cpp:641 +#: kdiff3.cpp:640 #, kde-format msgid "Toggle Split Orientation" msgstr "" -#: kdiff3.cpp:643 +#: kdiff3.cpp:642 #, kde-format msgid "Dir && Text Split Screen View" msgstr "" -#: kdiff3.cpp:645 +#: kdiff3.cpp:644 #, kde-format msgid "Toggle Between Dir && Text View" msgstr "" -#: kdiff3.cpp:697 pdiff.cpp:1909 +#: kdiff3.cpp:696 pdiff.cpp:1919 #, kde-format msgid "The merge result has not been saved." msgstr "" -#: kdiff3.cpp:699 +#: kdiff3.cpp:698 #, kde-format msgid "Save && Quit" msgstr "" -#: kdiff3.cpp:700 +#: kdiff3.cpp:699 #, kde-format msgid "Quit Without Saving" msgstr "" -#: kdiff3.cpp:708 pdiff.cpp:1920 +#: kdiff3.cpp:707 pdiff.cpp:1930 #, kde-format msgid "Saving the merge result failed." msgstr "" -#: kdiff3.cpp:719 pdiff.cpp:1032 +#: kdiff3.cpp:718 pdiff.cpp:1030 #, kde-format msgid "" "You are currently doing a directory merge. Are you sure, you want to abort?" msgstr "" -#: kdiff3.cpp:742 +#: kdiff3.cpp:741 #, kde-format msgid "Saving file..." msgstr "" -#: kdiff3.cpp:759 +#: kdiff3.cpp:758 #, kde-format msgid "Saving file with a new filename..." msgstr "" -#: kdiff3.cpp:761 +#: kdiff3.cpp:760 #, kde-format msgid "Save As..." msgstr "असे साठवा..." -#: kdiff3.cpp:820 +#: kdiff3.cpp:819 #, kde-format msgid "Printing not implemented." msgstr "" -#: kdiff3.cpp:857 +#: kdiff3.cpp:858 #, kde-format msgid "Printing..." msgstr "छपाई..." -#: kdiff3.cpp:943 +#: kdiff3.cpp:948 #, kde-format msgid "Printing page %1 of %2" msgstr "" -#: kdiff3.cpp:1000 +#: kdiff3.cpp:1006 #, fuzzy, kde-format #| msgid "Selection" msgid " (Selection)" msgstr "निवड" -#: kdiff3.cpp:1027 +#: kdiff3.cpp:1034 #, kde-format msgid "Printing completed." msgstr "" -#: kdiff3.cpp:1031 +#: kdiff3.cpp:1038 #, kde-format msgid "Printing aborted." msgstr "" -#: kdiff3.cpp:1038 +#: kdiff3.cpp:1045 #, kde-format msgid "Exiting..." msgstr "" -#: kdiff3.cpp:1049 +#: kdiff3.cpp:1056 #, kde-format msgid "Toggling toolbar..." msgstr "" -#: kdiff3.cpp:1070 +#: kdiff3.cpp:1077 #, kde-format msgid "Toggle the statusbar..." msgstr "" @@ -1527,7 +1532,7 @@ msgid "Joachim Eibl" msgstr "" -#: kdiff3_part.cpp:173 kdiff3_part.cpp:254 +#: kdiff3_part.cpp:174 kdiff3_part.cpp:255 #, kde-format msgid "Could not find files for comparison." msgstr "" @@ -1545,7 +1550,7 @@ msgstr "" #. i18n: ectx: ToolBar (mainToolBar) -#: kdiff3_part.rc:16 main.cpp:88 +#: kdiff3_part.rc:16 main.cpp:89 #, kde-format msgid "KDiff3" msgstr "" @@ -1612,198 +1617,203 @@ msgid "Main Toolbar" msgstr "मुख्य साधनपट्टी" -#: main.cpp:68 main.cpp:72 +#: main.cpp:69 main.cpp:73 #, kde-format msgid "Ignored. (User defined.)" msgstr "" -#: main.cpp:92 +#: main.cpp:93 #, kde-format msgid " (64 bit)" msgstr "" -#: main.cpp:94 +#: main.cpp:95 #, kde-format msgid " (32 bit)" msgstr "" -#: main.cpp:95 +#: main.cpp:96 #, kde-format msgid "Tool for Comparison and Merge of Files and Directories" msgstr "" -#: main.cpp:96 +#: main.cpp:97 #, kde-format msgid "(c) 2002-2014 Joachim Eibl, (c) 2017 Michael Reeves KF5/Qt5 port" msgstr "" -#: main.cpp:112 +#: main.cpp:113 #, kde-format msgid "Merge the input." msgstr "" -#: main.cpp:113 +#: main.cpp:114 #, kde-format msgid "Explicit base file. For compatibility with certain tools." msgstr "" -#: main.cpp:114 +#: main.cpp:115 #, kde-format msgid "Output file. Implies -m. E.g.: -o newfile.txt" msgstr "" -#: main.cpp:115 +#: main.cpp:116 #, kde-format msgid "Output file, again. (For compatibility with certain tools.)" msgstr "" -#: main.cpp:116 +#: main.cpp:118 #, kde-format msgid "No GUI if all conflicts are auto-solvable. (Needs -o file)" msgstr "" -#: main.cpp:117 +#: main.cpp:120 +#, fuzzy, kde-format +msgid "Ignored." +msgstr "दुर्लक्ष करा" + +#: main.cpp:122 #, kde-format msgid "Do not solve conflicts automatically." msgstr "" -#: main.cpp:118 +#: main.cpp:123 #, kde-format msgid "Visible name replacement for input file 1 (base)." msgstr "" -#: main.cpp:119 +#: main.cpp:124 #, kde-format msgid "Visible name replacement for input file 2." msgstr "" -#: main.cpp:120 +#: main.cpp:125 #, kde-format msgid "Visible name replacement for input file 3." msgstr "" -#: main.cpp:121 +#: main.cpp:126 #, kde-format msgid "Alternative visible name replacement. Supply this once for every input." msgstr "" -#: main.cpp:122 +#: main.cpp:127 #, kde-format msgid "" "Override a config setting. Use once for every setting. E.g.: --cs " "\"AutoAdvance=1\"" msgstr "" -#: main.cpp:123 +#: main.cpp:128 #, kde-format msgid "Show list of config settings and current values." msgstr "" -#: main.cpp:124 +#: main.cpp:129 #, kde-format msgid "Use a different config file." msgstr "" -#: main.cpp:127 +#: main.cpp:132 #, kde-format msgid "file1 to open (base, if not specified via --base)" msgstr "" -#: main.cpp:128 +#: main.cpp:133 #, fuzzy, kde-format msgid "file2 to open" msgstr "उघडावयाची फाईल" -#: main.cpp:129 +#: main.cpp:134 #, fuzzy, kde-format msgid "file3 to open" msgstr "उघडावयाची फाईल" -#: main.cpp:153 +#: main.cpp:158 #, kde-format msgid "See kdiff3 --help for supported options." msgstr "" -#: mergeresultwindow.cpp:158 +#: mergeresultwindow.cpp:171 #, kde-format msgid "Choose A Everywhere" msgstr "" -#: mergeresultwindow.cpp:159 +#: mergeresultwindow.cpp:172 #, kde-format msgid "Choose B Everywhere" msgstr "" -#: mergeresultwindow.cpp:160 +#: mergeresultwindow.cpp:173 #, kde-format msgid "Choose C Everywhere" msgstr "" -#: mergeresultwindow.cpp:161 +#: mergeresultwindow.cpp:174 #, kde-format msgid "Choose A for All Unsolved Conflicts" msgstr "" -#: mergeresultwindow.cpp:162 +#: mergeresultwindow.cpp:175 #, kde-format msgid "Choose B for All Unsolved Conflicts" msgstr "" -#: mergeresultwindow.cpp:163 +#: mergeresultwindow.cpp:176 #, kde-format msgid "Choose C for All Unsolved Conflicts" msgstr "" -#: mergeresultwindow.cpp:164 +#: mergeresultwindow.cpp:177 #, kde-format msgid "Choose A for All Unsolved Whitespace Conflicts" msgstr "" -#: mergeresultwindow.cpp:165 +#: mergeresultwindow.cpp:178 #, kde-format msgid "Choose B for All Unsolved Whitespace Conflicts" msgstr "" -#: mergeresultwindow.cpp:166 +#: mergeresultwindow.cpp:179 #, kde-format msgid "Choose C for All Unsolved Whitespace Conflicts" msgstr "" -#: mergeresultwindow.cpp:176 +#: mergeresultwindow.cpp:204 #, kde-format msgid "Number of remaining unsolved conflicts: %1 (of which %2 are whitespace)" msgstr "" -#: mergeresultwindow.cpp:370 +#: mergeresultwindow.cpp:398 #, kde-format msgid "" "The output has been modified.\n" "If you continue your changes will be lost." msgstr "" -#: mergeresultwindow.cpp:936 pdiff.cpp:827 +#: mergeresultwindow.cpp:964 pdiff.cpp:817 #, kde-format msgid "All input files are binary equal." msgstr "" -#: mergeresultwindow.cpp:938 +#: mergeresultwindow.cpp:966 #, kde-format msgid "All input files contain the same text." msgstr "" -#: mergeresultwindow.cpp:942 mergeresultwindow.cpp:946 -#: mergeresultwindow.cpp:950 pdiff.cpp:833 pdiff.cpp:837 pdiff.cpp:841 +#: mergeresultwindow.cpp:970 mergeresultwindow.cpp:974 +#: mergeresultwindow.cpp:978 pdiff.cpp:823 pdiff.cpp:827 pdiff.cpp:831 #, kde-format msgid "Files %1 and %2 are binary equal.\n" msgstr "" -#: mergeresultwindow.cpp:944 mergeresultwindow.cpp:948 -#: mergeresultwindow.cpp:952 +#: mergeresultwindow.cpp:972 mergeresultwindow.cpp:976 +#: mergeresultwindow.cpp:980 #, kde-format msgid "Files %1 and %2 have equal text.\n" msgstr "" -#: mergeresultwindow.cpp:958 +#: mergeresultwindow.cpp:986 #, kde-format msgid "" "Total number of conflicts: %1\n" @@ -1812,39 +1822,39 @@ "%4" msgstr "" -#: mergeresultwindow.cpp:964 +#: mergeresultwindow.cpp:992 #, kde-format msgid "Conflicts" msgstr "" -#: mergeresultwindow.cpp:1873 +#: mergeresultwindow.cpp:1901 #, kde-format msgid "" msgstr "" -#: mergeresultwindow.cpp:1881 +#: mergeresultwindow.cpp:1909 #, kde-format msgid "" msgstr "" -#: mergeresultwindow.cpp:1883 mergeresultwindow.cpp:2755 +#: mergeresultwindow.cpp:1911 mergeresultwindow.cpp:2783 #, kde-format msgid "" msgstr "" -#: mergeresultwindow.cpp:2967 +#: mergeresultwindow.cpp:2995 #, kde-format msgid "" "Not all conflicts are solved yet.\n" "File not saved." msgstr "" -#: mergeresultwindow.cpp:2969 mergeresultwindow.cpp:2978 +#: mergeresultwindow.cpp:2997 mergeresultwindow.cpp:3006 #, kde-format msgid "Conflicts Left" msgstr "" -#: mergeresultwindow.cpp:2976 +#: mergeresultwindow.cpp:3004 #, kde-format msgid "" "There is a line end style conflict. Please choose the line end style " @@ -1852,7 +1862,7 @@ "File not saved." msgstr "" -#: mergeresultwindow.cpp:2990 +#: mergeresultwindow.cpp:3018 #, kde-format msgid "" "\n" @@ -1860,58 +1870,58 @@ "Creating backup failed. File not saved." msgstr "" -#: mergeresultwindow.cpp:2990 mergeresultwindow.cpp:3038 +#: mergeresultwindow.cpp:3018 mergeresultwindow.cpp:3066 #, kde-format msgid "File Save Error" msgstr "" -#: mergeresultwindow.cpp:3038 +#: mergeresultwindow.cpp:3066 #, kde-format msgid "Error while writing." msgstr "" -#: mergeresultwindow.cpp:3110 +#: mergeresultwindow.cpp:3138 #, fuzzy, kde-format msgid "Output:" msgstr "आउटपुट" -#: mergeresultwindow.cpp:3123 mergeresultwindow.cpp:3315 +#: mergeresultwindow.cpp:3151 mergeresultwindow.cpp:3343 #, fuzzy, kde-format msgid "[Modified]" msgstr "सुधारले" -#: mergeresultwindow.cpp:3130 +#: mergeresultwindow.cpp:3158 #, fuzzy, kde-format #| msgid "Encoding:" msgid "Encoding for saving:" msgstr "एन्कोडिंग :" -#: mergeresultwindow.cpp:3230 +#: mergeresultwindow.cpp:3258 #, kde-format msgid "Conflict" msgstr "" -#: mergeresultwindow.cpp:3262 +#: mergeresultwindow.cpp:3290 #, kde-format msgid "Codec from A: %1" msgstr "" -#: mergeresultwindow.cpp:3264 +#: mergeresultwindow.cpp:3292 #, kde-format msgid "Codec from B: %1" msgstr "" -#: mergeresultwindow.cpp:3266 +#: mergeresultwindow.cpp:3294 #, kde-format msgid "Codec from C: %1" msgstr "" -#: optiondialog.cpp:119 +#: optiondialog.cpp:121 #, kde-format msgid "Change Font" msgstr "" -#: optiondialog.cpp:135 optiondialog.cpp:145 +#: optiondialog.cpp:137 optiondialog.cpp:147 #, kde-format msgid "" "Font: %1, %2, %3\n" @@ -1919,207 +1929,207 @@ "Example:" msgstr "" -#: optiondialog.cpp:388 +#: optiondialog.cpp:390 #, kde-format msgid "Unicode" msgstr "युनिकोड" -#: optiondialog.cpp:389 +#: optiondialog.cpp:391 #, fuzzy, kde-format msgid "Latin1" msgstr "लॅटिन" -#: optiondialog.cpp:408 +#: optiondialog.cpp:410 #, kde-format msgid "Change this if non-ASCII characters are not displayed correctly." msgstr "" -#: optiondialog.cpp:491 +#: optiondialog.cpp:495 #, fuzzy, kde-format msgid "Configure" msgstr "संयोजीत करा" -#: optiondialog.cpp:568 +#: optiondialog.cpp:573 #, kde-format msgid "Font" msgstr "फॉन्ट" -#: optiondialog.cpp:570 +#: optiondialog.cpp:575 #, kde-format msgid "Editor & Diff Output Font" msgstr "" -#: optiondialog.cpp:589 +#: optiondialog.cpp:594 #, kde-format msgid "Application font" msgstr "" -#: optiondialog.cpp:594 +#: optiondialog.cpp:599 #, kde-format msgid "File view font" msgstr "" -#: optiondialog.cpp:613 +#: optiondialog.cpp:618 #, fuzzy, kde-format #| msgid "Color" msgctxt "Title for color settings page" msgid "Color" msgstr "रंग" -#: optiondialog.cpp:614 +#: optiondialog.cpp:619 #, kde-format msgid "Colors Settings" msgstr "" -#: optiondialog.cpp:631 +#: optiondialog.cpp:644 #, kde-format msgid "Editor and Diff Views:" msgstr "" -#: optiondialog.cpp:639 +#: optiondialog.cpp:652 #, kde-format msgid "Foreground color:" msgstr "पृष्ठभूमी रंग :" -#: optiondialog.cpp:647 +#: optiondialog.cpp:660 #, fuzzy, kde-format msgid "Background color:" msgstr "पार्श्वभूमी रंग :" -#: optiondialog.cpp:657 +#: optiondialog.cpp:670 #, kde-format msgid "Diff background color:" msgstr "" -#: optiondialog.cpp:666 +#: optiondialog.cpp:679 #, kde-format msgid "Color A:" msgstr "" -#: optiondialog.cpp:675 +#: optiondialog.cpp:688 #, kde-format msgid "Color B:" msgstr "" -#: optiondialog.cpp:684 +#: optiondialog.cpp:697 #, kde-format msgid "Color C:" msgstr "" -#: optiondialog.cpp:692 +#: optiondialog.cpp:705 #, kde-format msgid "Conflict color:" msgstr "" -#: optiondialog.cpp:701 +#: optiondialog.cpp:714 #, kde-format msgid "Current range background color:" msgstr "" -#: optiondialog.cpp:710 +#: optiondialog.cpp:723 #, kde-format msgid "Current range diff background color:" msgstr "" -#: optiondialog.cpp:718 +#: optiondialog.cpp:731 #, kde-format msgid "Color for manually aligned difference ranges:" msgstr "" -#: optiondialog.cpp:725 +#: optiondialog.cpp:738 #, kde-format msgid "Directory Comparison View:" msgstr "" -#: optiondialog.cpp:731 +#: optiondialog.cpp:744 #, kde-format msgid "Newest file color:" msgstr "" -#: optiondialog.cpp:736 +#: optiondialog.cpp:749 #, kde-format msgid "" "Changing this color will only be effective when starting the next directory " "comparison." msgstr "" -#: optiondialog.cpp:741 +#: optiondialog.cpp:754 #, kde-format msgid "Oldest file color:" msgstr "" -#: optiondialog.cpp:750 +#: optiondialog.cpp:763 #, kde-format msgid "Middle age file color:" msgstr "" -#: optiondialog.cpp:759 +#: optiondialog.cpp:772 #, kde-format msgid "Color for missing files:" msgstr "" -#: optiondialog.cpp:773 +#: optiondialog.cpp:786 #, kde-format msgid "Editor" msgstr "संपादक" -#: optiondialog.cpp:774 +#: optiondialog.cpp:787 #, kde-format msgid "Editor Behavior" msgstr "" -#: optiondialog.cpp:787 +#: optiondialog.cpp:809 #, kde-format msgid "Tab inserts spaces" msgstr "" -#: optiondialog.cpp:791 +#: optiondialog.cpp:813 #, kde-format msgid "" "On: Pressing tab generates the appropriate number of spaces.\n" "Off: A tab character will be inserted." msgstr "" -#: optiondialog.cpp:796 +#: optiondialog.cpp:818 #, kde-format msgid "Tab size:" msgstr "" -#: optiondialog.cpp:803 +#: optiondialog.cpp:825 #, kde-format msgid "Auto indentation" msgstr "" -#: optiondialog.cpp:807 +#: optiondialog.cpp:829 #, kde-format msgid "On: The indentation of the previous line is used for a new line.\n" msgstr "" -#: optiondialog.cpp:810 +#: optiondialog.cpp:832 #, kde-format msgid "Auto copy selection" msgstr "" -#: optiondialog.cpp:814 +#: optiondialog.cpp:836 #, kde-format msgid "" "On: Any selection is immediately written to the clipboard.\n" "Off: You must explicitly copy e.g. via Ctrl-C." msgstr "" -#: optiondialog.cpp:829 +#: optiondialog.cpp:851 #, kde-format msgid "" "Sets the line endings for when an edited file is saved.\n" "DOS/Windows: CR+LF; UNIX: LF; with CR=0D, LF=0A" msgstr "" -#: optiondialog.cpp:839 +#: optiondialog.cpp:861 #, kde-format msgid "Diff" msgstr "Diff" -#: optiondialog.cpp:840 +#: optiondialog.cpp:862 #, kde-format msgid "Diff Settings" msgstr "" @@ -2133,12 +2143,12 @@ #. ); #. ++line; #. -#: optiondialog.cpp:865 +#: optiondialog.cpp:896 #, kde-format msgid "Ignore numbers (treat as white space)" msgstr "" -#: optiondialog.cpp:869 +#: optiondialog.cpp:900 #, kde-format msgid "" "Ignore number characters during line matching phase. (Similar to Ignore " @@ -2146,66 +2156,66 @@ "Might help to compare files with numeric data." msgstr "" -#: optiondialog.cpp:873 +#: optiondialog.cpp:904 #, kde-format msgid "Ignore C/C++ comments (treat as white space)" msgstr "" -#: optiondialog.cpp:876 +#: optiondialog.cpp:907 #, kde-format msgid "Treat C/C++ comments like white space." msgstr "" -#: optiondialog.cpp:879 +#: optiondialog.cpp:910 #, kde-format msgid "Ignore case (treat as white space)" msgstr "" -#: optiondialog.cpp:883 +#: optiondialog.cpp:914 #, kde-format msgid "Treat case differences like white space changes. ('a'<=>'A')" msgstr "" -#: optiondialog.cpp:886 +#: optiondialog.cpp:917 #, kde-format msgid "Preprocessor command:" msgstr "" -#: optiondialog.cpp:891 +#: optiondialog.cpp:922 #, kde-format msgid "User defined pre-processing. (See the docs for details.)" msgstr "" -#: optiondialog.cpp:894 +#: optiondialog.cpp:925 #, kde-format msgid "Line-matching preprocessor command:" msgstr "" -#: optiondialog.cpp:899 +#: optiondialog.cpp:930 #, kde-format msgid "" "This pre-processor is only used during line matching.\n" "(See the docs for details.)" msgstr "" -#: optiondialog.cpp:902 +#: optiondialog.cpp:933 #, kde-format msgid "Try hard (slower)" msgstr "" -#: optiondialog.cpp:906 +#: optiondialog.cpp:937 #, kde-format msgid "" "Enables the --minimal option for the external diff.\n" "The analysis of big files will be much slower." msgstr "" -#: optiondialog.cpp:910 +#: optiondialog.cpp:941 #, kde-format msgid "Align B and C for 3 input files" msgstr "" -#: optiondialog.cpp:914 +#: optiondialog.cpp:945 #, kde-format msgid "" "Try to align B and C when comparing or merging three input files.\n" @@ -2213,66 +2223,72 @@ "(Default is off.)" msgstr "" -#: optiondialog.cpp:926 +#: optiondialog.cpp:956 +#, kde-format +msgctxt "Settings page" +msgid "Merge" +msgstr "" + +#: optiondialog.cpp:957 #, kde-format msgid "Merge Settings" msgstr "" -#: optiondialog.cpp:940 +#: optiondialog.cpp:980 #, kde-format msgid "Auto advance delay (ms):" msgstr "" -#: optiondialog.cpp:946 +#: optiondialog.cpp:986 #, kde-format 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 "" -#: optiondialog.cpp:950 +#: optiondialog.cpp:990 #, kde-format msgid "Show info dialogs" msgstr "" -#: optiondialog.cpp:953 +#: optiondialog.cpp:993 #, kde-format msgid "Show a dialog with information about the number of conflicts." msgstr "" -#: optiondialog.cpp:956 +#: optiondialog.cpp:996 #, kde-format msgid "White space 2-file merge default:" msgstr "" -#: optiondialog.cpp:961 optiondialog.cpp:974 +#: optiondialog.cpp:1001 optiondialog.cpp:1014 #, kde-format msgid "Manual Choice" msgstr "" -#: optiondialog.cpp:965 optiondialog.cpp:979 +#: optiondialog.cpp:1005 optiondialog.cpp:1019 #, kde-format msgid "" "Allow the merge algorithm to automatically select an input for white-space-" "only changes." msgstr "" -#: optiondialog.cpp:969 +#: optiondialog.cpp:1009 #, kde-format msgid "White space 3-file merge default:" msgstr "" -#: optiondialog.cpp:983 +#: optiondialog.cpp:1023 #, kde-format msgid "Automatic Merge Regular Expression" msgstr "" -#: optiondialog.cpp:991 smalldialogs.cpp:449 +#: optiondialog.cpp:1031 smalldialogs.cpp:459 #, kde-format msgid "Auto merge regular expression:" msgstr "" -#: optiondialog.cpp:996 +#: optiondialog.cpp:1036 #, kde-format msgid "" "Regular expression for lines where KDiff3 should automatically choose one " @@ -2281,29 +2297,29 @@ "- if available - C, otherwise B will be chosen." msgstr "" -#: optiondialog.cpp:1002 +#: optiondialog.cpp:1042 #, kde-format msgid "Run regular expression auto merge on merge start" msgstr "" -#: optiondialog.cpp:1005 +#: optiondialog.cpp:1045 #, kde-format msgid "" "Run the merge for auto merge regular expressions\n" "immediately when a merge starts.\n" msgstr "" -#: optiondialog.cpp:1010 +#: optiondialog.cpp:1050 #, kde-format msgid "Version Control History Merging" msgstr "" -#: optiondialog.cpp:1018 smalldialogs.cpp:476 +#: optiondialog.cpp:1058 smalldialogs.cpp:486 #, kde-format msgid "History start regular expression:" msgstr "" -#: optiondialog.cpp:1023 +#: optiondialog.cpp:1063 #, kde-format msgid "" "Regular expression for the start of the version control history entry.\n" @@ -2311,12 +2327,12 @@ "Default value: \".*\\$Log.*\\$.*\"" msgstr "" -#: optiondialog.cpp:1029 smalldialogs.cpp:504 +#: optiondialog.cpp:1069 smalldialogs.cpp:514 #, kde-format msgid "History entry start regular expression:" msgstr "" -#: optiondialog.cpp:1042 +#: optiondialog.cpp:1082 #, kde-format msgid "" "A version control history entry consists of several lines.\n" @@ -2328,22 +2344,22 @@ "See the documentation for details." msgstr "" -#: optiondialog.cpp:1050 +#: optiondialog.cpp:1090 #, kde-format msgid "History merge sorting" msgstr "" -#: optiondialog.cpp:1053 +#: optiondialog.cpp:1093 #, kde-format msgid "Sort version control history by a key." msgstr "" -#: optiondialog.cpp:1063 +#: optiondialog.cpp:1103 #, kde-format msgid "History entry start sort key order:" msgstr "" -#: optiondialog.cpp:1068 +#: optiondialog.cpp:1108 #, kde-format msgid "" "Each pair of parentheses used in the regular expression for the history " @@ -2355,37 +2371,37 @@ "See the documentation for details." msgstr "" -#: optiondialog.cpp:1079 +#: optiondialog.cpp:1119 #, kde-format msgid "Merge version control history on merge start" msgstr "" -#: optiondialog.cpp:1082 +#: optiondialog.cpp:1122 #, kde-format msgid "Run version control history automerge on merge start." msgstr "" -#: optiondialog.cpp:1086 +#: optiondialog.cpp:1126 #, kde-format msgid "Max number of history entries:" msgstr "" -#: optiondialog.cpp:1090 +#: optiondialog.cpp:1130 #, kde-format msgid "Cut off after specified number. Use -1 for infinite number of entries." msgstr "" -#: optiondialog.cpp:1094 +#: optiondialog.cpp:1134 #, kde-format msgid "Test your regular expressions" msgstr "" -#: optiondialog.cpp:1099 +#: optiondialog.cpp:1139 #, kde-format msgid "Irrelevant merge command:" msgstr "" -#: optiondialog.cpp:1104 +#: optiondialog.cpp:1144 #, kde-format msgid "" "If specified this script is run after automerge\n" @@ -2393,12 +2409,12 @@ "Called with the parameters: filename1 filename2 filename3" msgstr "" -#: optiondialog.cpp:1109 +#: optiondialog.cpp:1149 #, kde-format msgid "Auto save and quit on merge without conflicts" msgstr "" -#: optiondialog.cpp:1113 +#: optiondialog.cpp:1153 #, kde-format msgid "" "If KDiff3 was started for a file-merge from the command line and all\n" @@ -2407,27 +2423,27 @@ "(Similar to command line option \"--auto\".)" msgstr "" -#: optiondialog.cpp:1124 optiondialog.cpp:1125 +#: optiondialog.cpp:1164 optiondialog.cpp:1165 #, kde-format msgid "Directory" msgstr "संचयीका" -#: optiondialog.cpp:1137 +#: optiondialog.cpp:1185 #, kde-format msgid "Recursive directories" msgstr "" -#: optiondialog.cpp:1140 +#: optiondialog.cpp:1188 #, kde-format msgid "Whether to analyze subdirectories or not." msgstr "" -#: optiondialog.cpp:1142 +#: optiondialog.cpp:1190 #, kde-format msgid "File pattern(s):" msgstr "" -#: optiondialog.cpp:1148 +#: optiondialog.cpp:1196 #, kde-format msgid "" "Pattern(s) of files to be analyzed. \n" @@ -2435,12 +2451,12 @@ "Several Patterns can be specified by using the separator: ';'" msgstr "" -#: optiondialog.cpp:1153 +#: optiondialog.cpp:1201 #, kde-format msgid "File-anti-pattern(s):" msgstr "" -#: optiondialog.cpp:1159 +#: optiondialog.cpp:1207 #, kde-format msgid "" "Pattern(s) of files to be excluded from analysis. \n" @@ -2448,12 +2464,12 @@ "Several Patterns can be specified by using the separator: ';'" msgstr "" -#: optiondialog.cpp:1164 +#: optiondialog.cpp:1212 #, kde-format msgid "Dir-anti-pattern(s):" msgstr "" -#: optiondialog.cpp:1170 +#: optiondialog.cpp:1218 #, kde-format msgid "" "Pattern(s) of directories to be excluded from analysis. \n" @@ -2461,58 +2477,58 @@ "Several Patterns can be specified by using the separator: ';'" msgstr "" -#: optiondialog.cpp:1175 +#: optiondialog.cpp:1223 #, kde-format msgid "Use .cvsignore" msgstr "" -#: optiondialog.cpp:1179 +#: optiondialog.cpp:1227 #, kde-format msgid "" "Extends the antipattern to anything that would be ignored by CVS.\n" "Via local \".cvsignore\" files this can be directory specific." msgstr "" -#: optiondialog.cpp:1183 +#: optiondialog.cpp:1231 #, kde-format msgid "Find hidden files and directories" msgstr "" -#: optiondialog.cpp:1186 +#: optiondialog.cpp:1234 #, kde-format msgid "Finds hidden files and directories." msgstr "" -#: optiondialog.cpp:1189 +#: optiondialog.cpp:1237 #, kde-format msgid "Follow file links" msgstr "" -#: optiondialog.cpp:1193 +#: optiondialog.cpp:1241 #, kde-format msgid "" "On: Compare the file the link points to.\n" "Off: Compare the links." msgstr "" -#: optiondialog.cpp:1197 +#: optiondialog.cpp:1245 #, kde-format msgid "Follow directory links" msgstr "" -#: optiondialog.cpp:1201 +#: optiondialog.cpp:1249 #, kde-format msgid "" "On: Compare the directory the link points to.\n" "Off: Compare the links." msgstr "" -#: optiondialog.cpp:1210 +#: optiondialog.cpp:1258 #, kde-format msgid "Case sensitive filename comparison" msgstr "" -#: optiondialog.cpp:1214 +#: optiondialog.cpp:1262 #, kde-format msgid "" "The directory comparison will compare files or directories when their names " @@ -2521,63 +2537,63 @@ "off, otherwise on.)" msgstr "" -#: optiondialog.cpp:1218 +#: optiondialog.cpp:1266 #, kde-format msgid "Unfold all subdirectories on load" msgstr "" -#: optiondialog.cpp:1222 +#: optiondialog.cpp:1270 #, kde-format msgid "" "On: Unfold all subdirectories when starting a directory diff.\n" "Off: Leave subdirectories folded." msgstr "" -#: optiondialog.cpp:1226 +#: optiondialog.cpp:1274 #, kde-format msgid "Skip directory status report" msgstr "" -#: optiondialog.cpp:1230 +#: optiondialog.cpp:1278 #, kde-format msgid "" "On: Do not show the Directory Comparison Status.\n" "Off: Show the status dialog on start." msgstr "" -#: optiondialog.cpp:1234 +#: optiondialog.cpp:1282 #, kde-format msgid "File Comparison Mode" msgstr "" -#: optiondialog.cpp:1239 +#: optiondialog.cpp:1287 #, kde-format msgid "Binary comparison" msgstr "" -#: optiondialog.cpp:1241 +#: optiondialog.cpp:1289 #, kde-format msgid "Binary comparison of each file. (Default)" msgstr "" -#: optiondialog.cpp:1244 +#: optiondialog.cpp:1292 #, kde-format msgid "Full analysis" msgstr "" -#: optiondialog.cpp:1246 +#: optiondialog.cpp:1294 #, kde-format msgid "" "Do a full analysis and show statistics information in extra columns.\n" "(Slower than a binary comparison, much slower for binary files.)" msgstr "" -#: optiondialog.cpp:1250 +#: optiondialog.cpp:1298 #, kde-format msgid "Trust the size and modification date (unsafe)" msgstr "" -#: optiondialog.cpp:1252 +#: optiondialog.cpp:1300 #, kde-format msgid "" "Assume that files are equal if the modification date and file length are " @@ -2587,14 +2603,14 @@ "Useful for big directories or slow networks." msgstr "" -#: optiondialog.cpp:1257 +#: optiondialog.cpp:1305 #, kde-format msgid "" "Trust the size and date, but use binary comparison if date does not match " "(unsafe)" msgstr "" -#: optiondialog.cpp:1259 +#: optiondialog.cpp:1307 #, kde-format msgid "" "Assume that files are equal if the modification date and file length are " @@ -2603,12 +2619,12 @@ "Useful for big directories or slow networks." msgstr "" -#: optiondialog.cpp:1264 +#: optiondialog.cpp:1312 #, kde-format msgid "Trust the size (unsafe)" msgstr "" -#: optiondialog.cpp:1266 +#: optiondialog.cpp:1314 #, kde-format msgid "" "Assume that files are equal if their file lengths are equal.\n" @@ -2616,12 +2632,12 @@ "download." msgstr "" -#: optiondialog.cpp:1273 +#: optiondialog.cpp:1321 #, kde-format msgid "Synchronize directories" msgstr "" -#: optiondialog.cpp:1277 +#: optiondialog.cpp:1325 #, kde-format msgid "" "Offers to store files in both directories so that\n" @@ -2629,24 +2645,24 @@ "Works only when comparing two directories without specifying a destination." msgstr "" -#: optiondialog.cpp:1283 +#: optiondialog.cpp:1331 #, kde-format msgid "White space differences considered equal" msgstr "" -#: optiondialog.cpp:1287 +#: optiondialog.cpp:1335 #, kde-format msgid "" "If files differ only by white space consider them equal.\n" "This is only active when full analysis is chosen." msgstr "" -#: optiondialog.cpp:1293 +#: optiondialog.cpp:1341 #, kde-format msgid "Copy newer instead of merging (unsafe)" msgstr "" -#: optiondialog.cpp:1297 +#: optiondialog.cpp:1345 #, kde-format msgid "" "Do not look inside, just take the newer file.\n" @@ -2654,46 +2670,46 @@ "Only effective when comparing two directories." msgstr "" -#: optiondialog.cpp:1302 +#: optiondialog.cpp:1350 #, kde-format msgid "Backup files (.orig)" msgstr "" -#: optiondialog.cpp:1306 +#: optiondialog.cpp:1354 #, kde-format msgid "" "If 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 "" -#: optiondialog.cpp:1382 optiondialog.cpp:1383 +#: optiondialog.cpp:1430 optiondialog.cpp:1431 #, kde-format msgid "Regional Settings" msgstr "" -#: optiondialog.cpp:1397 +#: optiondialog.cpp:1454 #, kde-format msgid "Use the same encoding for everything:" msgstr "" -#: optiondialog.cpp:1401 +#: optiondialog.cpp:1458 #, kde-format msgid "" "Enable this allows to change all encodings by changing the first only.\n" "Disable this if different individual settings are needed." msgstr "" -#: optiondialog.cpp:1405 +#: optiondialog.cpp:1462 #, kde-format msgid "Note: Local Encoding is \"%1\"" msgstr "" -#: optiondialog.cpp:1409 +#: optiondialog.cpp:1466 #, kde-format msgid "File Encoding for A:" msgstr "" -#: optiondialog.cpp:1416 +#: optiondialog.cpp:1473 #, kde-format msgid "" "If enabled then Unicode (UTF-16 or UTF-8) encoding will be detected.\n" @@ -2702,32 +2718,32 @@ "(Unicode detection depends on the first bytes of a file.)" msgstr "" -#: optiondialog.cpp:1419 optiondialog.cpp:1430 optiondialog.cpp:1441 +#: optiondialog.cpp:1476 optiondialog.cpp:1487 optiondialog.cpp:1498 #, kde-format msgid "Auto Detect Unicode" msgstr "" -#: optiondialog.cpp:1425 +#: optiondialog.cpp:1482 #, kde-format msgid "File Encoding for B:" msgstr "" -#: optiondialog.cpp:1436 +#: optiondialog.cpp:1493 #, kde-format msgid "File Encoding for C:" msgstr "" -#: optiondialog.cpp:1447 +#: optiondialog.cpp:1504 #, kde-format msgid "File Encoding for Merge Output and Saving:" msgstr "" -#: optiondialog.cpp:1452 +#: optiondialog.cpp:1509 #, kde-format msgid "Auto Select" msgstr "स्वयंचलित निवड" -#: optiondialog.cpp:1456 +#: optiondialog.cpp:1513 #, kde-format msgid "" "If enabled then the encoding from the input files is used.\n" @@ -2735,39 +2751,39 @@ "saving." msgstr "" -#: optiondialog.cpp:1459 +#: optiondialog.cpp:1516 #, kde-format msgid "File Encoding for Preprocessor Files:" msgstr "" -#: optiondialog.cpp:1471 +#: optiondialog.cpp:1528 #, kde-format msgid "Right To Left Language" msgstr "" -#: optiondialog.cpp:1475 +#: optiondialog.cpp:1532 #, kde-format msgid "" "Some languages are read from right to left.\n" "This setting will change the viewer and editor accordingly." msgstr "" -#: optiondialog.cpp:1485 +#: optiondialog.cpp:1542 #, kde-format msgid "Integration" msgstr "" -#: optiondialog.cpp:1486 +#: optiondialog.cpp:1543 #, kde-format msgid "Integration Settings" msgstr "" -#: optiondialog.cpp:1499 +#: optiondialog.cpp:1564 #, kde-format msgid "Command line options to ignore:" msgstr "" -#: optiondialog.cpp:1505 +#: optiondialog.cpp:1570 #, kde-format msgid "" "List of command line options that should be ignored when KDiff3 is used by " @@ -2776,19 +2792,19 @@ "This will suppress the \"Unknown option\" error." msgstr "" -#: optiondialog.cpp:1510 +#: optiondialog.cpp:1575 #, kde-format msgid "Quit also via Escape key" msgstr "" -#: optiondialog.cpp:1514 +#: optiondialog.cpp:1579 #, kde-format msgid "" "Fast method to exit.\n" "For those who are used to using the Escape key." msgstr "" -#: optiondialog.cpp:1598 +#: optiondialog.cpp:1653 #, kde-format msgid "This resets all options. Not only those of the current topic." msgstr "" @@ -2838,77 +2854,68 @@ msgid "Disable Unsafe Options" msgstr "" -#: pdiff.cpp:158 +#: pdiff.cpp:160 #, kde-format msgid "Loading A" msgstr "" -#: pdiff.cpp:167 -#, kde-format -msgid "Errors occurred during pre-processing of file A." -msgstr "" +#: pdiff.cpp:162 +#, fuzzy, kde-format +#| msgid "Encoding:" +msgid "Loading A: %1" +msgstr "एन्कोडिंग :" -#: pdiff.cpp:172 +#: pdiff.cpp:170 #, kde-format msgid "Loading B" msgstr "" -#: pdiff.cpp:179 -#, kde-format -msgid "Errors occurred during pre-processing of file B." -msgstr "" - -#: pdiff.cpp:202 pdiff.cpp:241 +#: pdiff.cpp:201 pdiff.cpp:237 #, kde-format msgid "Diff: A <-> B" msgstr "" -#: pdiff.cpp:208 pdiff.cpp:279 pdiff.cpp:293 +#: pdiff.cpp:207 pdiff.cpp:275 pdiff.cpp:289 #, kde-format msgid "Linediff: A <-> B" msgstr "" -#: pdiff.cpp:225 +#: pdiff.cpp:224 #, kde-format msgid "Loading C" msgstr "" -#: pdiff.cpp:232 -#, kde-format -msgid "Errors occurred during pre-processing of file C." -msgstr "" - -#: pdiff.cpp:250 +#: pdiff.cpp:246 #, kde-format msgid "Diff: A <-> C" msgstr "" -#: pdiff.cpp:261 +#: pdiff.cpp:257 #, kde-format msgid "Diff: B <-> C" msgstr "" -#: pdiff.cpp:283 pdiff.cpp:297 +#: pdiff.cpp:279 pdiff.cpp:293 #, kde-format msgid "Linediff: B <-> C" msgstr "" -#: pdiff.cpp:287 pdiff.cpp:301 +#: pdiff.cpp:283 pdiff.cpp:297 #, kde-format msgid "Linediff: A <-> C" msgstr "" -#: pdiff.cpp:829 +#: pdiff.cpp:819 #, kde-format msgid "All input files contain the same text, but are not binary equal." msgstr "" -#: pdiff.cpp:835 pdiff.cpp:839 pdiff.cpp:843 +#: pdiff.cpp:825 pdiff.cpp:829 pdiff.cpp:833 #, kde-format msgid "Files %1 and %2 have equal text, but are not binary equal. \n" msgstr "" -#: pdiff.cpp:853 +#: pdiff.cpp:843 #, kde-format msgid "" "Some input files do not seem to be pure text files.\n" @@ -2916,17 +2923,17 @@ "Continue at your own risk." msgstr "" -#: pdiff.cpp:863 +#: pdiff.cpp:853 #, kde-format msgid ", B" msgstr "" -#: pdiff.cpp:865 +#: pdiff.cpp:855 #, kde-format msgid ", C" msgstr "" -#: pdiff.cpp:867 +#: pdiff.cpp:857 #, kde-format msgid "" "Some input characters could not be converted to valid unicode.\n" @@ -2935,77 +2942,72 @@ "Affected input files are in %1." msgstr "" -#: pdiff.cpp:1034 +#: pdiff.cpp:1032 #, kde-format msgid "Abort" msgstr "" -#: pdiff.cpp:1040 pdiff.cpp:1130 +#: pdiff.cpp:1038 pdiff.cpp:1129 #, kde-format msgid "Opening files..." msgstr "" -#: pdiff.cpp:1107 -#, kde-format -msgid "File open error" -msgstr "" - -#: pdiff.cpp:1202 +#: pdiff.cpp:1212 #, kde-format msgid "Cutting selection..." msgstr "" -#: pdiff.cpp:1223 +#: pdiff.cpp:1233 #, kde-format msgid "Copying selection to clipboard..." msgstr "" -#: pdiff.cpp:1239 +#: pdiff.cpp:1249 #, kde-format msgid "Inserting clipboard contents..." msgstr "" -#: pdiff.cpp:1695 +#: pdiff.cpp:1705 #, kde-format msgid "Word wrap (Cancel disables word wrap)" msgstr "" -#: pdiff.cpp:1696 +#: pdiff.cpp:1706 #, kde-format msgid "Calculating max width for horizontal scrollbar" msgstr "" -#: pdiff.cpp:1911 +#: pdiff.cpp:1921 #, kde-format msgid "Save && Continue" msgstr "" -#: pdiff.cpp:1912 +#: pdiff.cpp:1922 #, kde-format msgid "Continue Without Saving" msgstr "" -#: pdiff.cpp:2124 +#: pdiff.cpp:2134 #, kde-format msgid "Search complete." msgstr "" -#: pdiff.cpp:2124 +#: pdiff.cpp:2134 #, kde-format msgid "Search Complete" msgstr "" -#: pdiff.cpp:2375 +#: pdiff.cpp:2385 #, kde-format msgid "Nothing is selected in either diff input window." msgstr "" -#: pdiff.cpp:2375 +#: pdiff.cpp:2385 #, kde-format msgid "Error while adding manual diff range" msgstr "" -#: progress.cpp:59 progress.cpp:71 +#: progress.cpp:61 progress.cpp:73 #, kde-format msgid "&Cancel" msgstr "रद्द करा (&C)" @@ -3015,189 +3017,189 @@ msgid "A (Base):" msgstr "" -#: smalldialogs.cpp:68 smalldialogs.cpp:85 smalldialogs.cpp:102 -#: smalldialogs.cpp:144 +#: smalldialogs.cpp:71 smalldialogs.cpp:90 smalldialogs.cpp:109 +#: smalldialogs.cpp:154 #, fuzzy, kde-format msgid "File..." msgstr "फाईल" -#: smalldialogs.cpp:70 smalldialogs.cpp:87 smalldialogs.cpp:104 -#: smalldialogs.cpp:146 +#: smalldialogs.cpp:73 smalldialogs.cpp:92 smalldialogs.cpp:111 +#: smalldialogs.cpp:156 #, kde-format msgid "Dir..." msgstr "" -#: smalldialogs.cpp:96 +#: smalldialogs.cpp:103 #, kde-format msgid "C (Optional):" msgstr "" -#: smalldialogs.cpp:119 +#: smalldialogs.cpp:126 #, kde-format msgid "Swap/Copy Names..." msgstr "" -#: smalldialogs.cpp:124 smalldialogs.cpp:125 smalldialogs.cpp:126 +#: smalldialogs.cpp:131 smalldialogs.cpp:132 smalldialogs.cpp:133 #, fuzzy, kde-format msgid "Swap %1<->%2" msgstr "स्वॅप" -#: smalldialogs.cpp:127 smalldialogs.cpp:128 smalldialogs.cpp:129 +#: smalldialogs.cpp:134 smalldialogs.cpp:135 smalldialogs.cpp:136 #, kde-format msgid "Copy %1->Output" msgstr "" -#: smalldialogs.cpp:130 smalldialogs.cpp:131 smalldialogs.cpp:132 +#: smalldialogs.cpp:137 smalldialogs.cpp:138 smalldialogs.cpp:139 #, kde-format msgid "Swap %1<->Output" msgstr "" -#: smalldialogs.cpp:138 +#: smalldialogs.cpp:148 #, kde-format msgid "Output (optional):" msgstr "" -#: smalldialogs.cpp:168 +#: smalldialogs.cpp:178 #, kde-format msgid "Configure..." msgstr "संयोजीत करा..." -#: smalldialogs.cpp:233 +#: smalldialogs.cpp:243 #, fuzzy, kde-format #| msgid "Directory" msgid "Open Directory" msgstr "संचयीका" -#: smalldialogs.cpp:234 +#: smalldialogs.cpp:244 #, kde-format msgid "Select Output File" msgstr "" -#: smalldialogs.cpp:393 +#: smalldialogs.cpp:403 #, kde-format msgid "Search text:" msgstr "" -#: smalldialogs.cpp:400 +#: smalldialogs.cpp:410 #, fuzzy, kde-format msgid "Case sensitive" msgstr "अक्षर आकार संवेदनशील" -#: smalldialogs.cpp:403 +#: smalldialogs.cpp:413 #, kde-format msgid "Search A" msgstr "" -#: smalldialogs.cpp:408 +#: smalldialogs.cpp:418 #, kde-format msgid "Search B" msgstr "" -#: smalldialogs.cpp:413 +#: smalldialogs.cpp:423 #, kde-format msgid "Search C" msgstr "" -#: smalldialogs.cpp:418 +#: smalldialogs.cpp:428 #, kde-format msgid "Search output" msgstr "" -#: smalldialogs.cpp:425 +#: smalldialogs.cpp:435 #, kde-format msgid "&Search" msgstr "शोध (&S)" -#: smalldialogs.cpp:444 +#: smalldialogs.cpp:454 #, kde-format msgid "Regular Expression Tester" msgstr "" -#: smalldialogs.cpp:457 +#: smalldialogs.cpp:467 #, kde-format msgid "Example auto merge line:" msgstr "" -#: smalldialogs.cpp:459 +#: smalldialogs.cpp:469 #, kde-format msgid "To test auto merge, copy a line as used in your files." msgstr "" -#: smalldialogs.cpp:465 smalldialogs.cpp:493 smalldialogs.cpp:529 +#: smalldialogs.cpp:475 smalldialogs.cpp:503 smalldialogs.cpp:539 #, kde-format msgid "Match result:" msgstr "" -#: smalldialogs.cpp:484 +#: smalldialogs.cpp:494 #, kde-format msgid "Example history start line (with leading comment):" msgstr "" -#: smalldialogs.cpp:486 +#: smalldialogs.cpp:496 #, kde-format msgid "" "Copy a history start line as used in your files,\n" "including the leading comment." msgstr "" -#: smalldialogs.cpp:512 +#: smalldialogs.cpp:522 #, kde-format msgid "History sort key order:" msgstr "" -#: smalldialogs.cpp:520 +#: smalldialogs.cpp:530 #, kde-format msgid "Example history entry start line (without leading comment):" msgstr "" -#: smalldialogs.cpp:522 +#: smalldialogs.cpp:532 #, kde-format msgid "" "Copy a history entry start line as used in your files,\n" "but omit the leading comment." msgstr "" -#: smalldialogs.cpp:536 +#: smalldialogs.cpp:546 #, kde-format msgid "Sort key result:" msgstr "" -#: smalldialogs.cpp:584 smalldialogs.cpp:594 smalldialogs.cpp:614 +#: smalldialogs.cpp:594 smalldialogs.cpp:604 smalldialogs.cpp:624 #, kde-format msgid "Match success." msgstr "" -#: smalldialogs.cpp:588 smalldialogs.cpp:598 smalldialogs.cpp:620 +#: smalldialogs.cpp:598 smalldialogs.cpp:608 smalldialogs.cpp:630 #, kde-format msgid "Match failed." msgstr "" -#: smalldialogs.cpp:605 +#: smalldialogs.cpp:615 #, kde-format msgid "Opening and closing parentheses do not match in regular expression." msgstr "" -#: SourceData.cpp:150 +#: SourceData.cpp:153 #, kde-format msgid "Writing clipboard data to temp file failed." msgstr "" -#: SourceData.cpp:154 +#: SourceData.cpp:157 #, kde-format msgid "From Clipboard" msgstr "" -#: SourceData.cpp:335 +#: SourceData.cpp:348 #, kde-format msgid "%1 is not a normal file." msgstr "" -#: SourceData.cpp:427 +#: SourceData.cpp:440 #, kde-format msgid " Temp file is: %1" msgstr "" -#: SourceData.cpp:432 +#: SourceData.cpp:445 #, kde-format msgid "" "Preprocessing possibly failed. Check this command:\n" @@ -3207,12 +3209,12 @@ "The preprocessing command will be disabled now." msgstr "" -#: SourceData.cpp:443 SourceData.cpp:512 +#: SourceData.cpp:456 SourceData.cpp:525 #, kde-format msgid "File %1 too large to process. Skipping." msgstr "" -#: SourceData.cpp:487 +#: SourceData.cpp:500 #, kde-format msgid "" "The line-matching-preprocessing possibly failed. Check this command:\n" diff -Nru kdiff3-1.8.01/po/nb/kdiff3fileitemactionplugin.po kdiff3-1.8.3/po/nb/kdiff3fileitemactionplugin.po --- kdiff3-1.8.01/po/nb/kdiff3fileitemactionplugin.po 2019-05-18 01:02:14.000000000 +0000 +++ kdiff3-1.8.3/po/nb/kdiff3fileitemactionplugin.po 2020-06-25 00:18:38.000000000 +0000 @@ -4,11 +4,11 @@ msgid "" msgstr "" "Project-Id-Version: \n" -"Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2019-03-22 03:09+0100\n" +"Report-Msgid-Bugs-To: https://bugs.kde.org\n" +"POT-Creation-Date: 2019-08-30 07:40+0200\n" "PO-Revision-Date: 2011-05-07 15:03+0200\n" "Last-Translator: Bjørn Steensrud \n" -"Language-Team: Norwegian Bokmål \n" +"Language-Team: Norwegian Bokmål \n" "Language: nb\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" diff -Nru kdiff3-1.8.01/po/nb/kdiff3.po kdiff3-1.8.3/po/nb/kdiff3.po --- kdiff3-1.8.01/po/nb/kdiff3.po 2019-05-18 01:02:14.000000000 +0000 +++ kdiff3-1.8.3/po/nb/kdiff3.po 2020-06-25 00:18:38.000000000 +0000 @@ -5,11 +5,11 @@ msgid "" msgstr "" "Project-Id-Version: kdiff3\n" -"Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2019-04-18 08:02+0200\n" +"Report-Msgid-Bugs-To: https://bugs.kde.org\n" +"POT-Creation-Date: 2020-06-15 06:48+0200\n" "PO-Revision-Date: 2011-09-04 22:27+0200\n" "Last-Translator: Bjørn Steensrud \n" -"Language-Team: Norwegian Bokmål \n" +"Language-Team: Norwegian Bokmål \n" "Language: nb\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -30,285 +30,285 @@ msgid "Your emails" msgstr "klaus@skolelinux.no" -#: difftextwindow.cpp:412 +#: difftextwindow.cpp:414 #, kde-format msgid "File %1: Line %2" msgstr "" -#: difftextwindow.cpp:414 +#: difftextwindow.cpp:416 #, kde-format msgid "File %1: Line not available" msgstr "" -#: difftextwindow.cpp:1780 +#: difftextwindow.cpp:1778 #, kde-format msgid "Encoding:" msgstr "Tegnkoding:" -#: difftextwindow.cpp:1782 mergeresultwindow.cpp:3138 optiondialog.cpp:818 +#: difftextwindow.cpp:1781 mergeresultwindow.cpp:3166 optiondialog.cpp:840 #, kde-format msgid "Line end style:" msgstr "Linjeavslutning:" -#: difftextwindow.cpp:1810 directorymergewindow.cpp:382 -#: directorymergewindow.cpp:433 directorymergewindow.cpp:524 -#: directorymergewindow.cpp:3058 directorymergewindow.cpp:3189 -#: directorymergewindow.cpp:3417 mergeresultwindow.cpp:942 -#: mergeresultwindow.cpp:944 mergeresultwindow.cpp:946 -#: mergeresultwindow.cpp:948 mergeresultwindow.cpp:1814 -#: mergeresultwindow.cpp:3170 mergeresultwindow.cpp:3177 optiondialog.cpp:962 -#: optiondialog.cpp:975 pdiff.cpp:833 pdiff.cpp:835 pdiff.cpp:837 pdiff.cpp:839 -#: pdiff.cpp:861 smalldialogs.cpp:124 smalldialogs.cpp:126 smalldialogs.cpp:127 -#: smalldialogs.cpp:130 +#: difftextwindow.cpp:1809 directorymergewindow.cpp:383 +#: directorymergewindow.cpp:434 directorymergewindow.cpp:525 +#: directorymergewindow.cpp:3069 directorymergewindow.cpp:3200 +#: directorymergewindow.cpp:3428 mergeresultwindow.cpp:970 +#: mergeresultwindow.cpp:972 mergeresultwindow.cpp:974 +#: mergeresultwindow.cpp:976 mergeresultwindow.cpp:1842 +#: mergeresultwindow.cpp:3198 mergeresultwindow.cpp:3205 optiondialog.cpp:1002 +#: optiondialog.cpp:1015 pdiff.cpp:844 pdiff.cpp:846 pdiff.cpp:848 +#: pdiff.cpp:850 pdiff.cpp:872 smalldialogs.cpp:131 smalldialogs.cpp:133 +#: smalldialogs.cpp:134 smalldialogs.cpp:137 #, kde-format msgid "A" msgstr "A" -#: difftextwindow.cpp:1810 directorymergewindow.cpp:384 -#: directorymergewindow.cpp:436 directorymergewindow.cpp:526 -#: directorymergewindow.cpp:3064 directorymergewindow.cpp:3190 -#: directorymergewindow.cpp:3418 mergeresultwindow.cpp:942 -#: mergeresultwindow.cpp:944 mergeresultwindow.cpp:950 -#: mergeresultwindow.cpp:952 mergeresultwindow.cpp:1816 -#: mergeresultwindow.cpp:3172 mergeresultwindow.cpp:3179 optiondialog.cpp:963 -#: optiondialog.cpp:976 pdiff.cpp:833 pdiff.cpp:835 pdiff.cpp:841 pdiff.cpp:843 -#: pdiff.cpp:863 smalldialogs.cpp:124 smalldialogs.cpp:125 smalldialogs.cpp:128 -#: smalldialogs.cpp:131 +#: difftextwindow.cpp:1809 directorymergewindow.cpp:385 +#: directorymergewindow.cpp:437 directorymergewindow.cpp:527 +#: directorymergewindow.cpp:3075 directorymergewindow.cpp:3201 +#: directorymergewindow.cpp:3429 mergeresultwindow.cpp:970 +#: mergeresultwindow.cpp:972 mergeresultwindow.cpp:978 +#: mergeresultwindow.cpp:980 mergeresultwindow.cpp:1844 +#: mergeresultwindow.cpp:3200 mergeresultwindow.cpp:3207 optiondialog.cpp:1003 +#: optiondialog.cpp:1016 pdiff.cpp:844 pdiff.cpp:846 pdiff.cpp:852 +#: pdiff.cpp:854 pdiff.cpp:874 smalldialogs.cpp:131 smalldialogs.cpp:132 +#: smalldialogs.cpp:135 smalldialogs.cpp:138 #, kde-format msgid "B" msgstr "B" -#: difftextwindow.cpp:1810 directorymergewindow.cpp:386 -#: directorymergewindow.cpp:439 directorymergewindow.cpp:528 -#: directorymergewindow.cpp:3070 directorymergewindow.cpp:3191 -#: directorymergewindow.cpp:3419 mergeresultwindow.cpp:946 -#: mergeresultwindow.cpp:948 mergeresultwindow.cpp:950 -#: mergeresultwindow.cpp:952 mergeresultwindow.cpp:1818 -#: mergeresultwindow.cpp:3174 mergeresultwindow.cpp:3181 optiondialog.cpp:977 -#: pdiff.cpp:837 pdiff.cpp:839 pdiff.cpp:841 pdiff.cpp:843 pdiff.cpp:865 -#: smalldialogs.cpp:125 smalldialogs.cpp:126 smalldialogs.cpp:129 -#: smalldialogs.cpp:132 +#: difftextwindow.cpp:1809 directorymergewindow.cpp:387 +#: directorymergewindow.cpp:440 directorymergewindow.cpp:529 +#: directorymergewindow.cpp:3081 directorymergewindow.cpp:3202 +#: directorymergewindow.cpp:3430 mergeresultwindow.cpp:974 +#: mergeresultwindow.cpp:976 mergeresultwindow.cpp:978 +#: mergeresultwindow.cpp:980 mergeresultwindow.cpp:1846 +#: mergeresultwindow.cpp:3202 mergeresultwindow.cpp:3209 optiondialog.cpp:1017 +#: pdiff.cpp:848 pdiff.cpp:850 pdiff.cpp:852 pdiff.cpp:854 pdiff.cpp:876 +#: smalldialogs.cpp:132 smalldialogs.cpp:133 smalldialogs.cpp:136 +#: smalldialogs.cpp:139 #, kde-format msgid "C" msgstr "C" -#: difftextwindow.cpp:1810 +#: difftextwindow.cpp:1809 #, kde-format msgid "A (Base)" msgstr "" -#: difftextwindow.cpp:1812 +#: difftextwindow.cpp:1811 #, kde-format msgid "Encoding: %1" msgstr "" -#: difftextwindow.cpp:1813 mergeresultwindow.cpp:3183 +#: difftextwindow.cpp:1812 mergeresultwindow.cpp:3211 #, kde-format msgid "Unix" msgstr "Unix" -#: difftextwindow.cpp:1813 mergeresultwindow.cpp:3184 +#: difftextwindow.cpp:1812 mergeresultwindow.cpp:3212 #, kde-format msgid "DOS" msgstr "DOS" -#: difftextwindow.cpp:1813 +#: difftextwindow.cpp:1812 #, kde-format msgid "Line end style: %1" msgstr "" -#: difftextwindow.cpp:1835 kdiff3.cpp:873 +#: difftextwindow.cpp:1834 kdiff3.cpp:874 #, kde-format msgid "Top line" msgstr "Øverste linje" -#: difftextwindow.cpp:1845 +#: difftextwindow.cpp:1843 #, kde-format msgid "End" msgstr "Slutt" -#: difftextwindow.cpp:1903 smalldialogs.cpp:235 +#: difftextwindow.cpp:1901 smalldialogs.cpp:245 #, kde-format msgid "Open File" msgstr "" -#: difftextwindow.cpp:1951 optiondialog.cpp:387 +#: difftextwindow.cpp:1943 optiondialog.cpp:389 #, kde-format msgid "Unicode, 8 bit" msgstr "Unicode, 8 bit" -#: difftextwindow.cpp:1966 +#: difftextwindow.cpp:1958 #, kde-format msgid "Other" msgstr "" -#: directorymergewindow.cpp:409 directorymergewindow.cpp:3424 +#: directorymergewindow.cpp:410 directorymergewindow.cpp:3435 #, kde-format msgid "Copy A to B" msgstr "Kopier A til B" -#: directorymergewindow.cpp:412 directorymergewindow.cpp:3425 +#: directorymergewindow.cpp:413 directorymergewindow.cpp:3436 #, kde-format msgid "Copy B to A" msgstr "Kopier B til A" -#: directorymergewindow.cpp:415 directorymergewindow.cpp:3426 +#: directorymergewindow.cpp:416 directorymergewindow.cpp:3437 #, kde-format msgid "Delete A" msgstr "Slett A" -#: directorymergewindow.cpp:418 directorymergewindow.cpp:3427 +#: directorymergewindow.cpp:419 directorymergewindow.cpp:3438 #, kde-format msgid "Delete B" msgstr "Slett B" -#: directorymergewindow.cpp:421 +#: directorymergewindow.cpp:422 #, kde-format msgid "Delete A & B" msgstr "Slett A & B" -#: directorymergewindow.cpp:424 directorymergewindow.cpp:3429 +#: directorymergewindow.cpp:425 directorymergewindow.cpp:3440 #, kde-format msgid "Merge to A" msgstr "Flett til A" -#: directorymergewindow.cpp:427 directorymergewindow.cpp:3430 +#: directorymergewindow.cpp:428 directorymergewindow.cpp:3441 #, kde-format msgid "Merge to B" msgstr "Flett til B" -#: directorymergewindow.cpp:430 +#: directorymergewindow.cpp:431 #, kde-format msgid "Merge to A & B" msgstr "Flett til A & B" -#: directorymergewindow.cpp:442 directorymergewindow.cpp:3421 +#: directorymergewindow.cpp:443 directorymergewindow.cpp:3432 #, kde-format msgid "Delete (if exists)" msgstr "Slett (hvis det finnes)" -#: directorymergewindow.cpp:445 directorymergewindow.cpp:448 -#: directorymergewindow.cpp:3420 optiondialog.cpp:925 smalldialogs.cpp:113 +#: directorymergewindow.cpp:446 directorymergewindow.cpp:449 +#: directorymergewindow.cpp:3431 smalldialogs.cpp:120 #, kde-format msgid "Merge" msgstr "Flett sammen" -#: directorymergewindow.cpp:445 directorymergewindow.cpp:448 +#: directorymergewindow.cpp:446 directorymergewindow.cpp:449 #, kde-format msgid "Merge (manual)" msgstr "Flett (manuelt)" -#: directorymergewindow.cpp:451 +#: directorymergewindow.cpp:452 #, kde-format msgid "Error: Conflicting File Types" msgstr "Feil: Konflikt mellom filtyper" -#: directorymergewindow.cpp:454 +#: directorymergewindow.cpp:455 #, kde-format msgid "Error: Changed and Deleted" msgstr "Feil: Endret og slettet" -#: directorymergewindow.cpp:457 +#: directorymergewindow.cpp:458 #, kde-format msgid "Error: Dates are equal but files are not." msgstr "Feil: Datoene er like, men ikke filene." -#: directorymergewindow.cpp:471 +#: directorymergewindow.cpp:472 #, kde-format msgid "Done" msgstr "" -#: directorymergewindow.cpp:473 +#: directorymergewindow.cpp:474 #, kde-format msgid "Error" msgstr "Feil" -#: directorymergewindow.cpp:475 +#: directorymergewindow.cpp:476 #, kde-format msgid "Skipped." msgstr "Hoppet over." -#: directorymergewindow.cpp:477 +#: directorymergewindow.cpp:478 #, kde-format msgid "Not saved." msgstr "Ikke lagret." -#: directorymergewindow.cpp:479 +#: directorymergewindow.cpp:480 #, kde-format msgid "In progress..." msgstr "Pågår …" -#: directorymergewindow.cpp:481 +#: directorymergewindow.cpp:482 #, kde-format msgid "To do." msgstr "Gjenstår." -#: directorymergewindow.cpp:522 +#: directorymergewindow.cpp:523 #, kde-format msgid "Name" msgstr "Navn" -#: directorymergewindow.cpp:530 +#: directorymergewindow.cpp:531 #, kde-format msgid "Operation" msgstr "Handling" -#: directorymergewindow.cpp:532 +#: directorymergewindow.cpp:533 #, kde-format msgid "Status" msgstr "Status" -#: directorymergewindow.cpp:534 +#: directorymergewindow.cpp:535 #, kde-format msgid "Unsolved" msgstr "Uløst" -#: directorymergewindow.cpp:536 +#: directorymergewindow.cpp:537 #, kde-format msgid "Solved" msgstr "Løst" -#: directorymergewindow.cpp:538 +#: directorymergewindow.cpp:539 #, kde-format msgid "Nonwhite" msgstr "Ikkehvitt" -#: directorymergewindow.cpp:540 +#: directorymergewindow.cpp:541 #, kde-format msgid "White" msgstr "Hvitt" -#: directorymergewindow.cpp:674 +#: directorymergewindow.cpp:676 #, kde-format msgid "Unable to compare non-normal file with normal file." msgstr "" -#: directorymergewindow.cpp:688 +#: directorymergewindow.cpp:690 #, kde-format msgid "Mix of links and normal files." msgstr "Blanding av lenker og normale filer." -#: directorymergewindow.cpp:695 +#: directorymergewindow.cpp:697 #, kde-format msgid "Link: " msgstr "Lenke: " -#: directorymergewindow.cpp:704 +#: directorymergewindow.cpp:706 #, kde-format msgid "Size. " msgstr "Størrelse: " -#: directorymergewindow.cpp:718 directorymergewindow.cpp:728 +#: directorymergewindow.cpp:720 directorymergewindow.cpp:730 #, kde-format msgid "Date & Size: " msgstr "Dato og størrelse: " -#: directorymergewindow.cpp:748 +#: directorymergewindow.cpp:751 #, kde-format msgid "Comparing file..." msgstr "Sammenlikner fil …" -#: directorymergewindow.cpp:801 +#: directorymergewindow.cpp:813 #, kde-format msgid "" "You are currently doing a directory merge. Are you sure, you want to abort " @@ -317,48 +317,48 @@ "Nå utfører du en mappefletting. Er du sikker på at du vil avbryte flettingen " "og lese gjennom mappa på nytt?" -#: directorymergewindow.cpp:802 kdiff3.cpp:698 kdiff3.cpp:708 kdiff3.cpp:720 -#: mergeresultwindow.cpp:372 pdiff.cpp:1033 pdiff.cpp:1910 pdiff.cpp:1920 +#: directorymergewindow.cpp:814 kdiff3.cpp:697 kdiff3.cpp:707 kdiff3.cpp:719 +#: mergeresultwindow.cpp:400 pdiff.cpp:1052 pdiff.cpp:1930 pdiff.cpp:1940 #, kde-format msgid "Warning" msgstr "Advarsel" -#: directorymergewindow.cpp:803 directorymergewindow.cpp:3393 +#: directorymergewindow.cpp:815 directorymergewindow.cpp:3404 #, kde-format msgid "Rescan" msgstr "Les på nytt" -#: directorymergewindow.cpp:804 pdiff.cpp:1035 +#: directorymergewindow.cpp:816 pdiff.cpp:1054 #, kde-format msgid "Continue Merging" msgstr "Fortsett fletting" -#: directorymergewindow.cpp:971 +#: directorymergewindow.cpp:983 #, kde-format msgid "Opening of directories failed:" msgstr "Klarte ikke åpne mapper:" -#: directorymergewindow.cpp:975 +#: directorymergewindow.cpp:987 #, 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:980 +#: directorymergewindow.cpp:992 #, 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:985 +#: directorymergewindow.cpp:997 #, 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:988 +#: directorymergewindow.cpp:1000 #, kde-format msgid "Directory Open Error" msgstr "Feil ved åpning av mappe" -#: directorymergewindow.cpp:996 +#: directorymergewindow.cpp:1008 #, kde-format msgid "" "The destination directory must not be the same as A or B when three " @@ -368,49 +368,49 @@ "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:998 +#: directorymergewindow.cpp:1010 #, kde-format msgid "Parameter Warning" msgstr "Parameter-advarsel" -#: directorymergewindow.cpp:1003 +#: directorymergewindow.cpp:1015 #, kde-format msgid "Scanning directories..." msgstr "Leser mapper …" -#: directorymergewindow.cpp:1029 +#: directorymergewindow.cpp:1041 #, kde-format msgid "Reading Directory A" msgstr "Leser mappe A" -#: directorymergewindow.cpp:1038 +#: directorymergewindow.cpp:1050 #, kde-format msgid "Reading Directory B" msgstr "Leser mappe B" -#: directorymergewindow.cpp:1048 +#: directorymergewindow.cpp:1060 #, kde-format msgid "Reading Directory C" msgstr "Leser mappe C" -#: directorymergewindow.cpp:1064 +#: directorymergewindow.cpp:1076 #, kde-format msgid "Some subdirectories were not readable in" msgstr "Noen undermapper var ikke lesbare i" -#: directorymergewindow.cpp:1069 +#: directorymergewindow.cpp:1081 #, kde-format msgid "Check the permissions of the subdirectories." msgstr "Kontroller rettigheter på undermappene." -#: directorymergewindow.cpp:1106 kdiff3.cpp:666 kdiff3.cpp:753 kdiff3.cpp:777 -#: kdiff3.cpp:1065 kdiff3.cpp:1086 pdiff.cpp:1116 pdiff.cpp:1170 pdiff.cpp:1218 -#: pdiff.cpp:1234 pdiff.cpp:1277 pdiff.cpp:1301 +#: directorymergewindow.cpp:1118 kdiff3.cpp:665 kdiff3.cpp:752 kdiff3.cpp:776 +#: kdiff3.cpp:1072 kdiff3.cpp:1093 pdiff.cpp:1136 pdiff.cpp:1190 pdiff.cpp:1238 +#: pdiff.cpp:1254 pdiff.cpp:1297 pdiff.cpp:1321 #, kde-format msgid "Ready." msgstr "Klar." -#: directorymergewindow.cpp:1121 +#: directorymergewindow.cpp:1133 #, kde-format msgid "" "Directory Comparison Status\n" @@ -420,66 +420,66 @@ "Number of different files: %3" msgstr "" -#: directorymergewindow.cpp:1128 +#: directorymergewindow.cpp:1140 #, kde-format msgid "Number of manual merges: %1" msgstr "" -#: directorymergewindow.cpp:1394 +#: directorymergewindow.cpp:1406 #, kde-format msgid "This affects all merge operations." msgstr "Dette påvirker alle flettehandlinger." -#: directorymergewindow.cpp:1395 +#: directorymergewindow.cpp:1407 #, kde-format msgid "Changing All Merge Operations" msgstr "Endre alle flette-handlinger" -#: directorymergewindow.cpp:1695 +#: directorymergewindow.cpp:1707 #, kde-format msgid "" "Processing %1 / %2\n" "%3" msgstr "" -#: directorymergewindow.cpp:1738 directorymergewindow.cpp:1742 +#: directorymergewindow.cpp:1750 directorymergewindow.cpp:1754 #, kde-format msgid "Some files could not be processed." msgstr "" -#: directorymergewindow.cpp:2222 directorymergewindow.cpp:2247 -#: directorymergewindow.cpp:2271 +#: directorymergewindow.cpp:2234 directorymergewindow.cpp:2259 +#: directorymergewindow.cpp:2283 #, kde-format msgid "This operation is currently not possible." msgstr "Denne handlinga er ikke mulig nå." -#: directorymergewindow.cpp:2222 directorymergewindow.cpp:2247 -#: directorymergewindow.cpp:2271 directorymergewindow.cpp:2552 +#: directorymergewindow.cpp:2234 directorymergewindow.cpp:2259 +#: directorymergewindow.cpp:2283 directorymergewindow.cpp:2563 #, kde-format msgid "Operation Not Possible" msgstr "Handling ikke mulig" -#: directorymergewindow.cpp:2318 +#: directorymergewindow.cpp:2330 #, kde-format msgid "An error occurred while copying." msgstr "" -#: directorymergewindow.cpp:2319 directorymergewindow.cpp:2759 +#: directorymergewindow.cpp:2331 directorymergewindow.cpp:2770 #, kde-format msgid "Merge Error" msgstr "Flettefeil" -#: directorymergewindow.cpp:2396 +#: directorymergewindow.cpp:2408 #, kde-format msgid "Unknown merge operation. (This must never happen!)" msgstr "Ukjent flettehandling. (Dette må aldri skje!)" -#: directorymergewindow.cpp:2441 +#: directorymergewindow.cpp:2453 #, kde-format msgid "Unknown merge operation." msgstr "Ukjent flettehandling." -#: directorymergewindow.cpp:2454 +#: directorymergewindow.cpp:2466 #, kde-format msgid "" "The merge is about to begin.\n" @@ -499,22 +499,22 @@ "Vær oppmerksom på at dette programmet er i beta-status og det er OVERHODET " "INGEN GARANTI! Ta sikkerhetskopi av vitale data!" -#: directorymergewindow.cpp:2459 +#: directorymergewindow.cpp:2471 #, kde-format msgid "Starting Merge" msgstr "Starter fletting" -#: directorymergewindow.cpp:2460 +#: directorymergewindow.cpp:2472 #, kde-format msgid "Do It" msgstr "Gjør det" -#: directorymergewindow.cpp:2461 +#: directorymergewindow.cpp:2473 #, kde-format msgid "Simulate It" msgstr "Simuler det" -#: directorymergewindow.cpp:2487 +#: directorymergewindow.cpp:2499 #, kde-format msgid "" "The highlighted item has a different type in the different directories. " @@ -523,7 +523,7 @@ "Det markerte elementet har forskjellig type i de forskjellige mappene. Velg " "hva som skal gjøres." -#: directorymergewindow.cpp:2491 +#: directorymergewindow.cpp:2503 #, kde-format msgid "" "The modification dates of the file are equal but the files are not. Select " @@ -532,7 +532,7 @@ "Filene er ulike men har samme dato for siste endring. Velg hva som skal " "gjøres." -#: directorymergewindow.cpp:2495 +#: directorymergewindow.cpp:2507 #, kde-format msgid "" "The highlighted item was changed in one directory and deleted in the other. " @@ -541,14 +541,14 @@ "Det markerte elementet ble endret i en mappe og slettet i en annen. Velg hva " "som skal gjøres." -#: directorymergewindow.cpp:2552 +#: directorymergewindow.cpp:2563 #, kde-format 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:2609 +#: directorymergewindow.cpp:2620 #, kde-format msgid "" "There was an error in the last step.\n" @@ -558,32 +558,32 @@ "Det var en feil i siste steg.\n" "Vil du fortsette med elementet som ga feil, eller hoppe over det?" -#: directorymergewindow.cpp:2611 +#: directorymergewindow.cpp:2622 #, kde-format msgid "Continue merge after an error" msgstr "Fortsett fletting etter feil" -#: directorymergewindow.cpp:2612 +#: directorymergewindow.cpp:2623 #, kde-format msgid "Continue With Last Item" msgstr "Fortsett med siste element" -#: directorymergewindow.cpp:2613 +#: directorymergewindow.cpp:2624 #, kde-format msgid "Skip Item" msgstr "Hopp over element" -#: directorymergewindow.cpp:2709 +#: directorymergewindow.cpp:2720 #, kde-format msgid "Merge operation complete." msgstr "Flettehandling fullført." -#: directorymergewindow.cpp:2709 directorymergewindow.cpp:2712 +#: directorymergewindow.cpp:2720 directorymergewindow.cpp:2723 #, kde-format msgid "Merge Complete" msgstr "Fletting fullført" -#: directorymergewindow.cpp:2722 +#: directorymergewindow.cpp:2733 #, kde-format msgid "" "Simulated merge complete: Check if you agree with the proposed operations." @@ -591,226 +591,226 @@ "Simulert fletting fullført. Se etter om du er enig i de foreslåtte " "handlingene." -#: directorymergewindow.cpp:2758 +#: directorymergewindow.cpp:2769 #, kde-format msgid "An error occurred. Press OK to see detailed information." msgstr "" -#: directorymergewindow.cpp:2791 +#: directorymergewindow.cpp:2802 #, kde-format msgid "Error: While deleting %1: Creating backup failed." msgstr "Feil: Under sletting av %1: oppretting av sikkerhetskopi mislyktes." -#: directorymergewindow.cpp:2798 +#: directorymergewindow.cpp:2809 #, kde-format msgid "delete directory recursively( %1 )" msgstr "slett mappe rekursivt( %1 )" -#: directorymergewindow.cpp:2800 +#: directorymergewindow.cpp:2811 #, kde-format msgid "delete( %1 )" msgstr "slett ( %1 )" -#: directorymergewindow.cpp:2815 +#: directorymergewindow.cpp:2826 #, kde-format msgid "Error: delete dir operation failed while trying to read the directory." msgstr "Feil: mappesletting mislyktes under forsøk på å lese mappa." -#: directorymergewindow.cpp:2834 +#: directorymergewindow.cpp:2845 #, kde-format msgid "Error: rmdir( %1 ) operation failed." msgstr "Feil: rmdir( %1 ) mislyktes." -#: directorymergewindow.cpp:2844 +#: directorymergewindow.cpp:2855 #, kde-format msgid "Error: delete operation failed." msgstr "Feil: sletting mislyktes." -#: directorymergewindow.cpp:2870 +#: directorymergewindow.cpp:2881 #, kde-format msgid "manual merge( %1, %2, %3 -> %4)" msgstr "manuell fletting( %1, %2, %3 → %4)" -#: directorymergewindow.cpp:2873 +#: directorymergewindow.cpp:2884 #, kde-format 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:2900 +#: directorymergewindow.cpp:2911 #, 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:2909 +#: directorymergewindow.cpp:2920 #, kde-format msgid "copyLink( %1 -> %2 )" msgstr "copyLink( %1 → %2 )" -#: directorymergewindow.cpp:2918 +#: directorymergewindow.cpp:2929 #, kde-format msgid "Error: copyLink failed: Remote links are not yet supported." msgstr "Feil: copyLink mislyktes. Det er ikke støtte for nettverkslenker ennå." -#: directorymergewindow.cpp:2928 +#: directorymergewindow.cpp:2939 #, kde-format msgid "Error: copyLink failed." msgstr "Feil: copyLink mislyktes." -#: directorymergewindow.cpp:2953 +#: directorymergewindow.cpp:2964 #, kde-format msgid "copy( %1 -> %2 )" msgstr "kopier(%1 → %2 )" -#: directorymergewindow.cpp:2979 +#: directorymergewindow.cpp:2990 #, 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:2986 +#: directorymergewindow.cpp:2997 #, kde-format msgid "rename( %1 -> %2 )" msgstr "endre navn ( %1 → %2 )" -#: directorymergewindow.cpp:2995 +#: directorymergewindow.cpp:3006 #, kde-format msgid "Error: Rename failed." msgstr "Feil: navneendring mislyktes." -#: directorymergewindow.cpp:3013 +#: directorymergewindow.cpp:3024 #, 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:3030 +#: directorymergewindow.cpp:3041 #, kde-format msgid "makeDir( %1 )" msgstr "Lag mappe( %1 )" -#: directorymergewindow.cpp:3040 +#: directorymergewindow.cpp:3051 #, kde-format msgid "Error while creating directory." msgstr "Feil under oppretting av mappe." -#: directorymergewindow.cpp:3076 directorymergewindow.cpp:3195 +#: directorymergewindow.cpp:3087 directorymergewindow.cpp:3206 #, kde-format msgid "Dest" msgstr "Mål" -#: directorymergewindow.cpp:3084 directorymergewindow.cpp:3113 +#: directorymergewindow.cpp:3095 directorymergewindow.cpp:3124 #, kde-format msgid "Dir" msgstr "Mappe" -#: directorymergewindow.cpp:3084 +#: directorymergewindow.cpp:3095 #, kde-format msgid "Type" msgstr "Type" -#: directorymergewindow.cpp:3084 +#: directorymergewindow.cpp:3095 #, kde-format msgid "Size" msgstr "Størrelse" -#: directorymergewindow.cpp:3085 +#: directorymergewindow.cpp:3096 #, kde-format msgid "Attr" msgstr "Attr" -#: directorymergewindow.cpp:3085 +#: directorymergewindow.cpp:3096 #, kde-format msgid "Last Modification" msgstr "Siste endring" -#: directorymergewindow.cpp:3085 +#: directorymergewindow.cpp:3096 #, kde-format msgid "Link-Destination" msgstr "Lenkemål" -#: directorymergewindow.cpp:3113 +#: directorymergewindow.cpp:3124 #, kde-format msgid "File" msgstr "Fil" -#: directorymergewindow.cpp:3113 +#: directorymergewindow.cpp:3124 #, kde-format msgid "-Link" msgstr "" -#: directorymergewindow.cpp:3119 +#: directorymergewindow.cpp:3130 #, kde-format msgid "not available" msgstr "ikke tilgjengelig" -#: directorymergewindow.cpp:3137 +#: directorymergewindow.cpp:3148 #, kde-format msgid "A (Dest): " msgstr "A (mål): " -#: directorymergewindow.cpp:3141 +#: directorymergewindow.cpp:3152 #, kde-format msgid "A: " msgstr "" -#: directorymergewindow.cpp:3141 +#: directorymergewindow.cpp:3152 #, kde-format msgid "A (Base): " msgstr "A (basis): " -#: directorymergewindow.cpp:3147 +#: directorymergewindow.cpp:3158 #, kde-format msgid "B (Dest): " msgstr "B (mål): " -#: directorymergewindow.cpp:3151 +#: directorymergewindow.cpp:3162 #, kde-format msgid "B: " msgstr "" -#: directorymergewindow.cpp:3156 +#: directorymergewindow.cpp:3167 #, kde-format msgid "C (Dest): " msgstr "C (mål) :" -#: directorymergewindow.cpp:3160 +#: directorymergewindow.cpp:3171 #, kde-format msgid "C: " msgstr "" -#: directorymergewindow.cpp:3163 +#: directorymergewindow.cpp:3174 #, kde-format msgid "Dest: " msgstr "Mål: " #. i18n("Saving Directory Merge State ...")); -#: directorymergewindow.cpp:3238 +#: directorymergewindow.cpp:3249 #, kde-format msgid "Save Directory Merge State As..." msgstr "Lagre status for mappefletting som …" -#: directorymergewindow.cpp:3387 +#: directorymergewindow.cpp:3398 #, kde-format msgid "Start/Continue Directory Merge" msgstr "Start/fortsett mappefletting" -#: directorymergewindow.cpp:3388 +#: directorymergewindow.cpp:3399 #, kde-format msgid "Run Operation for Current Item" msgstr "Kjør handling for gjeldende element" -#: directorymergewindow.cpp:3389 +#: directorymergewindow.cpp:3400 #, kde-format msgid "Compare Selected File" msgstr "Sammenlikne valgt fil" -#: directorymergewindow.cpp:3390 +#: directorymergewindow.cpp:3401 #, kde-format msgid "Merge Current File" msgstr "Flett gjeldende fil" -#: directorymergewindow.cpp:3390 +#: directorymergewindow.cpp:3401 #, kde-format msgid "" "Merge\n" @@ -819,51 +819,51 @@ "Flett\n" "Fil" -#: directorymergewindow.cpp:3391 +#: directorymergewindow.cpp:3402 #, kde-format msgid "Fold All Subdirs" msgstr "Brett sammen alle undermapper" -#: directorymergewindow.cpp:3392 +#: directorymergewindow.cpp:3403 #, kde-format msgid "Unfold All Subdirs" msgstr "Fold ut alle undermapper" #. i18n("Save Directory Merge State ..."), 0, this, &DirectoryMergeWindow::slotSaveMergeState, ac, "dir_save_merge_state"); #. i18n("Load Directory Merge State ..."), 0, this, &DirectoryMergeWindow::slotLoadMergeState, ac, "dir_load_merge_state"); -#: directorymergewindow.cpp:3396 +#: directorymergewindow.cpp:3407 #, kde-format msgid "Choose A for All Items" msgstr "Velg A for alle elementer" -#: directorymergewindow.cpp:3397 +#: directorymergewindow.cpp:3408 #, kde-format msgid "Choose B for All Items" msgstr "Velg B for alle elementer" -#: directorymergewindow.cpp:3398 +#: directorymergewindow.cpp:3409 #, kde-format msgid "Choose C for All Items" msgstr "Velg C for alle elementer" -#: directorymergewindow.cpp:3399 +#: directorymergewindow.cpp:3410 #, kde-format msgid "Auto-Choose Operation for All Items" msgstr "Auto-velg handling for alle elementer" -#: directorymergewindow.cpp:3400 +#: directorymergewindow.cpp:3411 #, kde-format msgid "No Operation for All Items" msgstr "Ingen handling for alle elementer" #. i18n("Synchronize Directories"), 0, this, &DirectoryMergeWindow::slotSynchronizeDirectories, ac, "dir_synchronize_directories"); #. d->m_pDirChooseNewerFiles = GuiUtils::createAction< KToggleAction >(i18n("Copy Newer Files Instead of Merging"), 0, this, &DirectoryMergeWindow::slotChooseNewerFiles, ac, "dir_choose_newer_files"); -#: directorymergewindow.cpp:3405 +#: directorymergewindow.cpp:3416 #, kde-format msgid "Show Identical Files" msgstr "Vis identiske filer" -#: directorymergewindow.cpp:3405 +#: directorymergewindow.cpp:3416 #, kde-format msgid "" "Identical\n" @@ -872,17 +872,17 @@ "Identiske\n" "filer" -#: directorymergewindow.cpp:3406 +#: directorymergewindow.cpp:3417 #, kde-format msgid "Show Different Files" msgstr "Vis forskjellige filer" -#: directorymergewindow.cpp:3407 +#: directorymergewindow.cpp:3418 #, kde-format msgid "Show Files only in A" msgstr "Vis filer bare i A" -#: directorymergewindow.cpp:3407 +#: directorymergewindow.cpp:3418 #, kde-format msgid "" "Files\n" @@ -891,12 +891,12 @@ "Filer \n" "bare i A" -#: directorymergewindow.cpp:3408 +#: directorymergewindow.cpp:3419 #, kde-format msgid "Show Files only in B" msgstr "Vis filer bare i B" -#: directorymergewindow.cpp:3408 +#: directorymergewindow.cpp:3419 #, kde-format msgid "" "Files\n" @@ -905,12 +905,12 @@ "Filer \n" "bare i B" -#: directorymergewindow.cpp:3409 +#: directorymergewindow.cpp:3420 #, kde-format msgid "Show Files only in C" msgstr "Vis filer bare i C" -#: directorymergewindow.cpp:3409 +#: directorymergewindow.cpp:3420 #, kde-format msgid "" "Files\n" @@ -919,236 +919,241 @@ "Filer \n" "bare i C" -#: directorymergewindow.cpp:3413 +#: directorymergewindow.cpp:3424 #, kde-format msgid "Compare Explicitly Selected Files" msgstr "Sammenlikne uttrykkelig valgte filer" -#: directorymergewindow.cpp:3414 +#: directorymergewindow.cpp:3425 #, kde-format msgid "Merge Explicitly Selected Files" msgstr "Flett uttrykkelig valgte filer" -#: directorymergewindow.cpp:3416 directorymergewindow.cpp:3423 +#: directorymergewindow.cpp:3427 directorymergewindow.cpp:3434 #, kde-format msgid "Do Nothing" msgstr "Ikke gjør noe" -#: directorymergewindow.cpp:3428 +#: directorymergewindow.cpp:3439 #, kde-format msgid "Delete A && B" msgstr "Slett A && B" -#: directorymergewindow.cpp:3431 +#: directorymergewindow.cpp:3442 #, kde-format msgid "Merge to A && B" msgstr "Flett til A && B" -#: fileaccess.cpp:462 SourceData.cpp:493 +#: fileaccess.cpp:301 +#, kde-format +msgid "Unable to determine full url. No parent specified." +msgstr "" + +#: fileaccess.cpp:482 SourceData.cpp:506 #, kde-format msgid "Failed to read file: %1" msgstr "" -#: fileaccess.cpp:587 +#: fileaccess.cpp:624 #, kde-format msgid "Creating temp copy of %1 failed." msgstr "Klarte ikke opprette midlertidig kopi av %1." -#: fileaccess.cpp:595 fileaccess.cpp:600 +#: fileaccess.cpp:632 fileaccess.cpp:637 #, kde-format msgid "Opening %1 failed. %2" msgstr "" -#: fileaccess.cpp:619 fileaccess.cpp:627 +#: fileaccess.cpp:656 fileaccess.cpp:664 #, kde-format msgid "Error reading from %1. %2" msgstr "" -#: fileaccess.cpp:751 +#: fileaccess.cpp:788 #, kde-format msgid "" "While trying to make a backup, deleting an older backup failed.\n" "Filename: %1" msgstr "" -#: fileaccess.cpp:758 +#: fileaccess.cpp:795 #, kde-format msgid "" "While trying to make a backup, renaming failed.\n" "Filenames: %1 -> %2" msgstr "" -#: fileaccess.cpp:828 +#: fileaccess.cpp:865 #, kde-format msgid "Getting file status: %1" msgstr "Henter filstatus: %1" -#: fileaccess.cpp:869 +#: fileaccess.cpp:906 #, kde-format msgid "Reading file: %1" msgstr "Leser fil: %1" -#: fileaccess.cpp:907 +#: fileaccess.cpp:944 #, kde-format msgid "Writing file: %1" msgstr "Skriver fil: %1" -#: fileaccess.cpp:940 +#: fileaccess.cpp:977 #, kde-format msgid "Out of memory" msgstr "Slapp opp for minne" -#: fileaccess.cpp:976 +#: fileaccess.cpp:1013 #, kde-format msgid "Making directory: %1" msgstr "Lager mappe: %1" -#: fileaccess.cpp:997 +#: fileaccess.cpp:1034 #, kde-format msgid "Removing directory: %1" msgstr "Fjerner mappe: %1" -#: fileaccess.cpp:1012 +#: fileaccess.cpp:1049 #, kde-format msgid "Removing file: %1" msgstr "Fjerner fil: %1" -#: fileaccess.cpp:1028 +#: fileaccess.cpp:1065 #, kde-format msgid "Creating symbolic link: %1 -> %2" msgstr "Oppretter symbolsk lenke: %1 → %2" -#: fileaccess.cpp:1052 +#: fileaccess.cpp:1089 #, kde-format msgid "Renaming file: %1 -> %2" msgstr "Endrer navn på fil: %1 → %2" -#: fileaccess.cpp:1086 +#: fileaccess.cpp:1123 #, kde-format msgid "Copying file: %1 -> %2" msgstr "Kopierer fil: %1 → %2" -#: fileaccess.cpp:1108 +#: fileaccess.cpp:1145 #, kde-format msgid "Reading directory: %1" msgstr "" -#: fileaccess.cpp:1162 +#: fileaccess.cpp:1202 #, kde-format msgid "Listing directory: %1" msgstr "Lister mappe: %1" -#: kdiff3.cpp:181 +#: kdiff3.cpp:182 #, kde-format msgid "Current Configuration:" msgstr "Gjeldende oppsett:" -#: kdiff3.cpp:186 +#: kdiff3.cpp:187 #, kde-format msgid "Config Option Error:" msgstr "Feil i oppsett:" -#: kdiff3.cpp:240 +#: kdiff3.cpp:246 #, kde-format msgid "Option --auto used, but no output file specified." msgstr "--auto brukt, men ingen utdatafil er oppgitt." -#: kdiff3.cpp:416 +#: kdiff3.cpp:405 #, kde-format msgid "Option --auto ignored for directory comparison." msgstr "--auto ignorert for mappesammelikning." -#: kdiff3.cpp:460 +#: kdiff3.cpp:449 #, kde-format msgid "Saving failed." msgstr "Lagring mislyktes." -#: kdiff3.cpp:496 pdiff.cpp:1098 +#: kdiff3.cpp:494 pdiff.cpp:395 pdiff.cpp:1117 #, kde-format msgid "Opening of these files failed:" msgstr "Klarte ikke åpne disse filene:" -#: kdiff3.cpp:505 +#: kdiff3.cpp:503 pdiff.cpp:404 pdiff.cpp:1126 #, kde-format -msgid "File Open Error" -msgstr "Feil ved åpning av fil" +msgid "File open error" +msgstr "Feil ved filåpning" -#: kdiff3.cpp:533 +#: kdiff3.cpp:532 #, kde-format msgid "Opens documents for comparison..." msgstr "Åpner dokumentere for sammenlikning …" -#: kdiff3.cpp:535 +#: kdiff3.cpp:534 #, kde-format msgid "Reload" msgstr "Last på nytt" -#: kdiff3.cpp:538 +#: kdiff3.cpp:537 #, kde-format msgid "Saves the merge result. All conflicts must be solved!" msgstr "Lagrer fletteresultatet. Alle konflikter må løses!" -#: kdiff3.cpp:540 +#: kdiff3.cpp:539 #, kde-format msgid "Saves the current document as..." msgstr "Lagrer gjeldende dokument som …" -#: kdiff3.cpp:543 +#: kdiff3.cpp:542 #, kde-format msgid "Print the differences" msgstr "Skriv ut forskjellene" -#: kdiff3.cpp:546 +#: kdiff3.cpp:545 #, kde-format msgid "Quits the application" msgstr "Avslutter programmet" -#: kdiff3.cpp:549 +#: kdiff3.cpp:548 #, kde-format msgid "Cuts the selected section and puts it to the clipboard" msgstr "Klipper ut det markerte og legger det på utklippstavla" -#: kdiff3.cpp:552 +#: kdiff3.cpp:551 #, kde-format msgid "Copies the selected section to the clipboard" msgstr "Kopierer det markerte til utklippstavla" -#: kdiff3.cpp:554 +#: kdiff3.cpp:553 #, kde-format msgid "Pastes the clipboard contents to current position" msgstr "Limer inn innhold fra utklippstavla til gjeldende posisjon" -#: kdiff3.cpp:557 +#: kdiff3.cpp:556 #, kde-format msgid "Select everything in current window" msgstr "Velg alt i gjeldende vindu" -#: kdiff3.cpp:560 +#: kdiff3.cpp:559 #, kde-format msgid "Search for a string" msgstr "Søk etter en streng" -#: kdiff3.cpp:562 +#: kdiff3.cpp:561 #, kde-format msgid "Search again for the string" msgstr "Søk igjen etter strengen" -#: kdiff3.cpp:567 +#: kdiff3.cpp:566 #, kde-format msgid "Enables/disables the statusbar" msgstr "Slår statuslinja av/på" -#: kdiff3.cpp:571 +#: kdiff3.cpp:570 #, kde-format msgid "Configure KDiff3..." msgstr "Sett opp KDiff3 …" -#: kdiff3.cpp:590 +#: kdiff3.cpp:589 #, kde-format msgid "Go to Current Delta" msgstr "Gå til gjeldende Delta" -#: kdiff3.cpp:590 +#: kdiff3.cpp:589 #, kde-format msgid "" "Current\n" @@ -1157,12 +1162,12 @@ "Gjeldende\n" "Delta" -#: kdiff3.cpp:592 +#: kdiff3.cpp:591 #, kde-format msgid "Go to First Delta" msgstr "Gå til første Delta" -#: kdiff3.cpp:592 +#: kdiff3.cpp:591 #, kde-format msgid "" "First\n" @@ -1171,12 +1176,12 @@ "Første\n" "Delta" -#: kdiff3.cpp:594 +#: kdiff3.cpp:593 #, kde-format msgid "Go to Last Delta" msgstr "Gå til siste Delta" -#: kdiff3.cpp:594 +#: kdiff3.cpp:593 #, kde-format msgid "" "Last\n" @@ -1185,12 +1190,12 @@ "Siste\n" "Delta" -#: kdiff3.cpp:596 +#: kdiff3.cpp:595 #, kde-format 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:597 +#: kdiff3.cpp:596 #, kde-format msgid "" "(Does not skip white space differences even when \"Show White Space\" is " @@ -1198,12 +1203,12 @@ msgstr "" "(Hopper ikkeover forskjeller i tomrom selv når «Vis tomrom» er slått av.)" -#: kdiff3.cpp:598 +#: kdiff3.cpp:597 #, kde-format msgid "Go to Previous Delta" msgstr "Gå til forrige Delta" -#: kdiff3.cpp:598 +#: kdiff3.cpp:597 #, kde-format msgid "" "Prev\n" @@ -1212,12 +1217,12 @@ "Forrige\n" "Delta" -#: kdiff3.cpp:600 +#: kdiff3.cpp:599 #, kde-format msgid "Go to Next Delta" msgstr "Gå til neste Delta" -#: kdiff3.cpp:600 +#: kdiff3.cpp:599 #, kde-format msgid "" "Next\n" @@ -1226,12 +1231,12 @@ "Neste\n" "Delta" -#: kdiff3.cpp:602 +#: kdiff3.cpp:601 #, kde-format msgid "Go to Previous Conflict" msgstr "Gå til forrige konflikt" -#: kdiff3.cpp:602 +#: kdiff3.cpp:601 #, kde-format msgid "" "Prev\n" @@ -1240,12 +1245,12 @@ "Forrige\n" "lonflikt" -#: kdiff3.cpp:604 +#: kdiff3.cpp:603 #, kde-format msgid "Go to Next Conflict" msgstr "Gå til neste konflikt" -#: kdiff3.cpp:604 +#: kdiff3.cpp:603 #, kde-format msgid "" "Next\n" @@ -1254,12 +1259,12 @@ "Neste\n" "konflikt" -#: kdiff3.cpp:606 +#: kdiff3.cpp:605 #, kde-format msgid "Go to Previous Unsolved Conflict" msgstr "Gå til forrige uløste konflikt" -#: kdiff3.cpp:606 +#: kdiff3.cpp:605 #, kde-format msgid "" "Prev\n" @@ -1268,12 +1273,12 @@ "Forrige\n" "uløste" -#: kdiff3.cpp:608 +#: kdiff3.cpp:607 #, kde-format msgid "Go to Next Unsolved Conflict" msgstr "Gå til neste uløste konflikt" -#: kdiff3.cpp:608 +#: kdiff3.cpp:607 #, kde-format msgid "" "Next\n" @@ -1282,12 +1287,12 @@ "Neste\n" "uløste" -#: kdiff3.cpp:610 +#: kdiff3.cpp:609 #, kde-format msgid "Select Line(s) From A" msgstr "Velg linje(r) fra A" -#: kdiff3.cpp:610 +#: kdiff3.cpp:609 #, kde-format msgid "" "Choose\n" @@ -1296,12 +1301,12 @@ "Velg\n" "A" -#: kdiff3.cpp:611 +#: kdiff3.cpp:610 #, kde-format msgid "Select Line(s) From B" msgstr "Velg linje(r) fra B" -#: kdiff3.cpp:611 +#: kdiff3.cpp:610 #, kde-format msgid "" "Choose\n" @@ -1310,12 +1315,12 @@ "Velg\n" "B" -#: kdiff3.cpp:612 +#: kdiff3.cpp:611 #, kde-format msgid "Select Line(s) From C" msgstr "Velg linje(r) fra C" -#: kdiff3.cpp:612 +#: kdiff3.cpp:611 #, kde-format msgid "" "Choose\n" @@ -1324,12 +1329,12 @@ "Velg\n" "C" -#: kdiff3.cpp:613 +#: kdiff3.cpp:612 #, kde-format 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:613 +#: kdiff3.cpp:612 #, kde-format msgid "" "Auto\n" @@ -1338,12 +1343,12 @@ "Auto\n" "neste" -#: kdiff3.cpp:615 +#: kdiff3.cpp:614 #, kde-format msgid "Show Space && Tabulator Characters" msgstr "" -#: kdiff3.cpp:615 +#: kdiff3.cpp:614 #, kde-format msgid "" "White\n" @@ -1352,12 +1357,12 @@ "Tomroms\n" "tegn" -#: kdiff3.cpp:616 +#: kdiff3.cpp:615 #, kde-format msgid "Show White Space" msgstr "Vis tomrom" -#: kdiff3.cpp:616 +#: kdiff3.cpp:615 #, kde-format msgid "" "White\n" @@ -1366,12 +1371,12 @@ "Tomroms\n" "deltaer" -#: kdiff3.cpp:618 +#: kdiff3.cpp:617 #, kde-format msgid "Show Line Numbers" msgstr "Vis linjenumre" -#: kdiff3.cpp:618 +#: kdiff3.cpp:617 #, kde-format msgid "" "Line\n" @@ -1380,193 +1385,193 @@ "Linje\n" "numre" -#: kdiff3.cpp:620 +#: kdiff3.cpp:619 #, kde-format msgid "Automatically Solve Simple Conflicts" msgstr "Løs enkle konflikter automatisk" -#: kdiff3.cpp:621 +#: kdiff3.cpp:620 #, kde-format msgid "Set Deltas to Conflicts" msgstr "Sett deltaer til konflikter" -#: kdiff3.cpp:622 +#: kdiff3.cpp:621 #, kde-format msgid "Run Regular Expression Auto Merge" msgstr "Kjør autofletting med regulære uttrykk" -#: kdiff3.cpp:623 +#: kdiff3.cpp:622 #, kde-format msgid "Automatically Solve History Conflicts" msgstr "Løs opp historiekonflikter automatisk" -#: kdiff3.cpp:624 +#: kdiff3.cpp:623 #, kde-format msgid "Split Diff At Selection" msgstr "Splitt differansen ved utvalget" -#: kdiff3.cpp:625 +#: kdiff3.cpp:624 #, kde-format msgid "Join Selected Diffs" msgstr "Slå sammen valgte differ" -#: kdiff3.cpp:627 +#: kdiff3.cpp:626 #, kde-format msgid "Show Window A" msgstr "Vis vindu A" -#: kdiff3.cpp:628 +#: kdiff3.cpp:627 #, kde-format msgid "Show Window B" msgstr "Vis vindu B" -#: kdiff3.cpp:629 +#: kdiff3.cpp:628 #, kde-format msgid "Show Window C" msgstr "Vis vindu C" -#: kdiff3.cpp:631 +#: kdiff3.cpp:630 #, kde-format msgid "Normal Overview" msgstr "Normal oversikt" -#: kdiff3.cpp:632 +#: kdiff3.cpp:631 #, kde-format msgid "A vs. B Overview" msgstr "Oversikt A mot B" -#: kdiff3.cpp:633 +#: kdiff3.cpp:632 #, kde-format msgid "A vs. C Overview" msgstr "Oversikt A mot C" -#: kdiff3.cpp:634 +#: kdiff3.cpp:633 #, kde-format msgid "B vs. C Overview" msgstr "Oversikt B mot C" -#: kdiff3.cpp:635 +#: kdiff3.cpp:634 #, kde-format msgid "Word Wrap Diff Windows" msgstr "Ordbryt i diff-vinduer" -#: kdiff3.cpp:636 +#: kdiff3.cpp:635 #, kde-format msgid "Add Manual Diff Alignment" msgstr "Legg til manuell diff-innretting" -#: kdiff3.cpp:637 +#: kdiff3.cpp:636 #, kde-format msgid "Clear All Manual Diff Alignments" msgstr "Tilbakestill all manuell diff-innretting" -#: kdiff3.cpp:639 +#: kdiff3.cpp:638 #, kde-format msgid "Focus Next Window" msgstr "Fokus på neste vindu" -#: kdiff3.cpp:640 +#: kdiff3.cpp:639 #, kde-format msgid "Focus Prev Window" msgstr "Fokus på forrige vindu" -#: kdiff3.cpp:641 +#: kdiff3.cpp:640 #, kde-format msgid "Toggle Split Orientation" msgstr "Bytt om splitt-orientering" -#: kdiff3.cpp:643 +#: kdiff3.cpp:642 #, kde-format msgid "Dir && Text Split Screen View" msgstr "Mappe og tekst delt visning" -#: kdiff3.cpp:645 +#: kdiff3.cpp:644 #, kde-format msgid "Toggle Between Dir && Text View" msgstr "Bytt mellom mappe- og tekstvisning" -#: kdiff3.cpp:697 pdiff.cpp:1909 +#: kdiff3.cpp:696 pdiff.cpp:1929 #, kde-format msgid "The merge result has not been saved." msgstr "" -#: kdiff3.cpp:699 +#: kdiff3.cpp:698 #, kde-format msgid "Save && Quit" msgstr "Lagre og avslutt" -#: kdiff3.cpp:700 +#: kdiff3.cpp:699 #, kde-format msgid "Quit Without Saving" msgstr "Avslutt uten lagring" -#: kdiff3.cpp:708 pdiff.cpp:1920 +#: kdiff3.cpp:707 pdiff.cpp:1940 #, kde-format msgid "Saving the merge result failed." msgstr "Fletteresultatet kunne ikke lagres." -#: kdiff3.cpp:719 pdiff.cpp:1032 +#: kdiff3.cpp:718 pdiff.cpp:1051 #, kde-format 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:742 +#: kdiff3.cpp:741 #, kde-format msgid "Saving file..." msgstr "Lagrer fil …" -#: kdiff3.cpp:759 +#: kdiff3.cpp:758 #, kde-format msgid "Saving file with a new filename..." msgstr "Lagrer fil med nytt filnavn …" -#: kdiff3.cpp:761 +#: kdiff3.cpp:760 #, kde-format msgid "Save As..." msgstr "Lagre som …" -#: kdiff3.cpp:820 +#: kdiff3.cpp:819 #, kde-format msgid "Printing not implemented." msgstr "Utskrift er ikke implementert." -#: kdiff3.cpp:857 +#: kdiff3.cpp:858 #, kde-format msgid "Printing..." msgstr "Skriver ut …" -#: kdiff3.cpp:943 +#: kdiff3.cpp:948 #, kde-format msgid "Printing page %1 of %2" msgstr "" -#: kdiff3.cpp:1000 +#: kdiff3.cpp:1006 #, kde-format msgid " (Selection)" msgstr "" -#: kdiff3.cpp:1027 +#: kdiff3.cpp:1034 #, kde-format msgid "Printing completed." msgstr "Utskrift fullført." -#: kdiff3.cpp:1031 +#: kdiff3.cpp:1038 #, kde-format msgid "Printing aborted." msgstr "Utskrift avbrutt." -#: kdiff3.cpp:1038 +#: kdiff3.cpp:1045 #, kde-format msgid "Exiting..." msgstr "Avslutter …" -#: kdiff3.cpp:1049 +#: kdiff3.cpp:1056 #, kde-format msgid "Toggling toolbar..." msgstr "Slår verktøylinje av/på …" -#: kdiff3.cpp:1070 +#: kdiff3.cpp:1077 #, kde-format msgid "Toggle the statusbar..." msgstr "Slå statuslinje av/på …" @@ -1591,7 +1596,7 @@ msgid "Joachim Eibl" msgstr "Joachim Eibl" -#: kdiff3_part.cpp:173 kdiff3_part.cpp:254 +#: kdiff3_part.cpp:172 kdiff3_part.cpp:253 #, kde-format msgid "Could not find files for comparison." msgstr "" @@ -1609,7 +1614,7 @@ msgstr "Sett opp KDiff3" #. i18n: ectx: ToolBar (mainToolBar) -#: kdiff3_part.rc:16 main.cpp:88 +#: kdiff3_part.rc:16 main.cpp:89 #, kde-format msgid "KDiff3" msgstr "KDiff3" @@ -1679,82 +1684,87 @@ msgid "Main Toolbar" msgstr "Hovedverktøylinje" -#: main.cpp:68 main.cpp:72 +#: main.cpp:69 main.cpp:73 #, kde-format msgid "Ignored. (User defined.)" msgstr "Ignorert. (Selvvalgt.)" -#: main.cpp:92 +#: main.cpp:93 #, kde-format msgid " (64 bit)" msgstr "" -#: main.cpp:94 +#: main.cpp:95 #, kde-format msgid " (32 bit)" msgstr "" -#: main.cpp:95 +#: main.cpp:96 #, kde-format msgid "Tool for Comparison and Merge of Files and Directories" msgstr "Verktøy for sammenlikning og fletting av filer og mapper" -#: main.cpp:96 +#: main.cpp:97 #, kde-format msgid "(c) 2002-2014 Joachim Eibl, (c) 2017 Michael Reeves KF5/Qt5 port" msgstr "" -#: main.cpp:112 +#: main.cpp:113 #, kde-format msgid "Merge the input." msgstr "Flett inn-data." -#: main.cpp:113 +#: main.cpp:114 #, kde-format msgid "Explicit base file. For compatibility with certain tools." msgstr "Uttrykkelig angitt basefil. For kompatibilitet med visse verktøy." -#: main.cpp:114 +#: main.cpp:115 #, kde-format msgid "Output file. Implies -m. E.g.: -o newfile.txt" msgstr "Utdata-fil. Impliserer -m. F.eks: -o nyfil.txt" -#: main.cpp:115 +#: main.cpp:116 #, kde-format msgid "Output file, again. (For compatibility with certain tools.)" msgstr "Utdata-fil, igjen. (For kompatibilitet med visse verktøy)." -#: main.cpp:116 +#: main.cpp:118 #, kde-format msgid "No GUI if all conflicts are auto-solvable. (Needs -o file)" msgstr "Ingen GUI hvis alle konflikter kan auto-løses. (Trenger -o fil)" -#: main.cpp:117 +#: main.cpp:120 +#, kde-format +msgid "Ignored." +msgstr "" + +#: main.cpp:122 #, kde-format msgid "Do not solve conflicts automatically." msgstr "" -#: main.cpp:118 +#: main.cpp:123 #, kde-format msgid "Visible name replacement for input file 1 (base)." msgstr "Synlig navnerstatning for inn-fil 1 (basis)." -#: main.cpp:119 +#: main.cpp:124 #, kde-format msgid "Visible name replacement for input file 2." msgstr "Synlig navnerstatning for inn-fil 2." -#: main.cpp:120 +#: main.cpp:125 #, kde-format msgid "Visible name replacement for input file 3." msgstr "Synlig navnerstatning for inn-fil 3." -#: main.cpp:121 +#: main.cpp:126 #, kde-format msgid "Alternative visible name replacement. Supply this once for every input." msgstr "Alternativ synlig navnerstatning. Angi en gang for hver inngang." -#: main.cpp:122 +#: main.cpp:127 #, kde-format msgid "" "Override a config setting. Use once for every setting. E.g.: --cs " @@ -1763,87 +1773,87 @@ "Overstyr en innstilling. Bruk en gang for hver innstilling. F.eks.: --cs " "\"AutoAdvance=1\"" -#: main.cpp:123 +#: main.cpp:128 #, kde-format msgid "Show list of config settings and current values." msgstr "Vis liste over oppsettsinnstillinger og gjeldende verdier." -#: main.cpp:124 +#: main.cpp:129 #, kde-format msgid "Use a different config file." msgstr "Bruk en annen oppsettsfil." -#: main.cpp:127 +#: main.cpp:132 #, kde-format msgid "file1 to open (base, if not specified via --base)" msgstr "fil 1 som skal åpnes (basis, hvis ikke oppgitt via --base)" -#: main.cpp:128 +#: main.cpp:133 #, kde-format msgid "file2 to open" msgstr "fil 2 som skal åpnes" -#: main.cpp:129 +#: main.cpp:134 #, kde-format msgid "file3 to open" msgstr "fil 3 som skal åpnes" -#: main.cpp:153 +#: main.cpp:158 #, kde-format msgid "See kdiff3 --help for supported options." msgstr "" -#: mergeresultwindow.cpp:158 +#: mergeresultwindow.cpp:171 #, kde-format msgid "Choose A Everywhere" msgstr "Velg A overalt" -#: mergeresultwindow.cpp:159 +#: mergeresultwindow.cpp:172 #, kde-format msgid "Choose B Everywhere" msgstr "Velg B overalt" -#: mergeresultwindow.cpp:160 +#: mergeresultwindow.cpp:173 #, kde-format msgid "Choose C Everywhere" msgstr "Velg C overalt" -#: mergeresultwindow.cpp:161 +#: mergeresultwindow.cpp:174 #, kde-format msgid "Choose A for All Unsolved Conflicts" msgstr "Velg A for alle uløste konflikter" -#: mergeresultwindow.cpp:162 +#: mergeresultwindow.cpp:175 #, kde-format msgid "Choose B for All Unsolved Conflicts" msgstr "Velg B for alle uløste konflikter" -#: mergeresultwindow.cpp:163 +#: mergeresultwindow.cpp:176 #, kde-format msgid "Choose C for All Unsolved Conflicts" msgstr "Velg C for alle uløste konflikter" -#: mergeresultwindow.cpp:164 +#: mergeresultwindow.cpp:177 #, kde-format msgid "Choose A for All Unsolved Whitespace Conflicts" msgstr "Velg A for alle uløste tomromkonflikter" -#: mergeresultwindow.cpp:165 +#: mergeresultwindow.cpp:178 #, kde-format msgid "Choose B for All Unsolved Whitespace Conflicts" msgstr "Velg B for alle uløste tomromkonflikter" -#: mergeresultwindow.cpp:166 +#: mergeresultwindow.cpp:179 #, kde-format msgid "Choose C for All Unsolved Whitespace Conflicts" msgstr "Velg C for alle uløste tomromkonflikter" -#: mergeresultwindow.cpp:176 +#: mergeresultwindow.cpp:204 #, kde-format msgid "Number of remaining unsolved conflicts: %1 (of which %2 are whitespace)" msgstr "Antall uløste konflikter som gjenstår: %1 ( herav %2 tomrom )" -#: mergeresultwindow.cpp:370 +#: mergeresultwindow.cpp:398 #, kde-format msgid "" "The output has been modified.\n" @@ -1852,29 +1862,29 @@ "Utdata er blitt endret.\n" "Hvis du fortsetter mister du endringene dine." -#: mergeresultwindow.cpp:936 pdiff.cpp:827 +#: mergeresultwindow.cpp:964 pdiff.cpp:838 #, kde-format msgid "All input files are binary equal." msgstr "Alle inn-filer er binært like." -#: mergeresultwindow.cpp:938 +#: mergeresultwindow.cpp:966 #, kde-format msgid "All input files contain the same text." msgstr "Alle inn-filer inneholder samme tekst." -#: mergeresultwindow.cpp:942 mergeresultwindow.cpp:946 -#: mergeresultwindow.cpp:950 pdiff.cpp:833 pdiff.cpp:837 pdiff.cpp:841 +#: mergeresultwindow.cpp:970 mergeresultwindow.cpp:974 +#: mergeresultwindow.cpp:978 pdiff.cpp:844 pdiff.cpp:848 pdiff.cpp:852 #, kde-format msgid "Files %1 and %2 are binary equal.\n" msgstr "Filene %1 og %2 er binært like.\n" -#: mergeresultwindow.cpp:944 mergeresultwindow.cpp:948 -#: mergeresultwindow.cpp:952 +#: mergeresultwindow.cpp:972 mergeresultwindow.cpp:976 +#: mergeresultwindow.cpp:980 #, kde-format msgid "Files %1 and %2 have equal text.\n" msgstr "Filer %1 og %2 har lik tekst. \n" -#: mergeresultwindow.cpp:958 +#: mergeresultwindow.cpp:986 #, kde-format msgid "" "Total number of conflicts: %1\n" @@ -1883,39 +1893,39 @@ "%4" msgstr "" -#: mergeresultwindow.cpp:964 +#: mergeresultwindow.cpp:992 #, kde-format msgid "Conflicts" msgstr "Konflikter" -#: mergeresultwindow.cpp:1873 +#: mergeresultwindow.cpp:1901 #, kde-format msgid "" msgstr "" -#: mergeresultwindow.cpp:1881 +#: mergeresultwindow.cpp:1909 #, kde-format msgid "" msgstr "" -#: mergeresultwindow.cpp:1883 mergeresultwindow.cpp:2755 +#: mergeresultwindow.cpp:1911 mergeresultwindow.cpp:2783 #, kde-format msgid "" msgstr "" -#: mergeresultwindow.cpp:2967 +#: mergeresultwindow.cpp:2995 #, kde-format msgid "" "Not all conflicts are solved yet.\n" "File not saved." msgstr "" -#: mergeresultwindow.cpp:2969 mergeresultwindow.cpp:2978 +#: mergeresultwindow.cpp:2997 mergeresultwindow.cpp:3006 #, kde-format msgid "Conflicts Left" msgstr "Gjenstående konflikter" -#: mergeresultwindow.cpp:2976 +#: mergeresultwindow.cpp:3004 #, kde-format msgid "" "There is a line end style conflict. Please choose the line end style " @@ -1923,7 +1933,7 @@ "File not saved." msgstr "" -#: mergeresultwindow.cpp:2990 +#: mergeresultwindow.cpp:3018 #, kde-format msgid "" "\n" @@ -1934,57 +1944,57 @@ "\n" "Det lyktes ikke å lage sikkerhetskopi. Fila er ikke lagret." -#: mergeresultwindow.cpp:2990 mergeresultwindow.cpp:3038 +#: mergeresultwindow.cpp:3018 mergeresultwindow.cpp:3066 #, kde-format msgid "File Save Error" msgstr "Feil ved fillagring" -#: mergeresultwindow.cpp:3038 +#: mergeresultwindow.cpp:3066 #, kde-format msgid "Error while writing." msgstr "Feil ved skriving." -#: mergeresultwindow.cpp:3110 +#: mergeresultwindow.cpp:3138 #, kde-format msgid "Output:" msgstr "Utdata:" -#: mergeresultwindow.cpp:3123 mergeresultwindow.cpp:3315 +#: mergeresultwindow.cpp:3151 mergeresultwindow.cpp:3343 #, kde-format msgid "[Modified]" msgstr "[Endret]" -#: mergeresultwindow.cpp:3130 +#: mergeresultwindow.cpp:3158 #, kde-format msgid "Encoding for saving:" msgstr "" -#: mergeresultwindow.cpp:3230 +#: mergeresultwindow.cpp:3258 #, kde-format msgid "Conflict" msgstr "Konflikt" -#: mergeresultwindow.cpp:3262 +#: mergeresultwindow.cpp:3290 #, kde-format msgid "Codec from A: %1" msgstr "" -#: mergeresultwindow.cpp:3264 +#: mergeresultwindow.cpp:3292 #, kde-format msgid "Codec from B: %1" msgstr "" -#: mergeresultwindow.cpp:3266 +#: mergeresultwindow.cpp:3294 #, kde-format msgid "Codec from C: %1" msgstr "" -#: optiondialog.cpp:119 +#: optiondialog.cpp:121 #, kde-format msgid "Change Font" msgstr "" -#: optiondialog.cpp:135 optiondialog.cpp:145 +#: optiondialog.cpp:137 optiondialog.cpp:147 #, kde-format msgid "" "Font: %1, %2, %3\n" @@ -1992,123 +2002,123 @@ "Example:" msgstr "" -#: optiondialog.cpp:388 +#: optiondialog.cpp:390 #, kde-format msgid "Unicode" msgstr "Unicode" -#: optiondialog.cpp:389 +#: optiondialog.cpp:391 #, kde-format msgid "Latin1" msgstr "Latin1" -#: optiondialog.cpp:408 +#: optiondialog.cpp:410 #, kde-format msgid "Change this if non-ASCII characters are not displayed correctly." msgstr "Endre dette hvis tegn som ikke er i ASCII ikke blir vist riktig." -#: optiondialog.cpp:491 +#: optiondialog.cpp:495 #, kde-format msgid "Configure" msgstr "Sett opp" -#: optiondialog.cpp:568 +#: optiondialog.cpp:573 #, kde-format msgid "Font" msgstr "Skrift" -#: optiondialog.cpp:570 +#: optiondialog.cpp:575 #, kde-format msgid "Editor & Diff Output Font" msgstr "Skrift for redigering og utdata" -#: optiondialog.cpp:589 +#: optiondialog.cpp:594 #, kde-format msgid "Application font" msgstr "" -#: optiondialog.cpp:594 +#: optiondialog.cpp:599 #, kde-format msgid "File view font" msgstr "" -#: optiondialog.cpp:613 +#: optiondialog.cpp:618 #, kde-format msgctxt "Title for color settings page" msgid "Color" msgstr "" -#: optiondialog.cpp:614 +#: optiondialog.cpp:619 #, kde-format msgid "Colors Settings" msgstr "Fargeinnstillinger" -#: optiondialog.cpp:631 +#: optiondialog.cpp:644 #, kde-format msgid "Editor and Diff Views:" msgstr "Redigering og forskjellsvisning:" -#: optiondialog.cpp:639 +#: optiondialog.cpp:652 #, kde-format msgid "Foreground color:" msgstr "Forgrunnsfarge:" -#: optiondialog.cpp:647 +#: optiondialog.cpp:660 #, kde-format msgid "Background color:" msgstr "Bakgrunnsfarge:" -#: optiondialog.cpp:657 +#: optiondialog.cpp:670 #, kde-format msgid "Diff background color:" msgstr "Bakgrunnsfarge for forskjell:" -#: optiondialog.cpp:666 +#: optiondialog.cpp:679 #, kde-format msgid "Color A:" msgstr "Farge A:" -#: optiondialog.cpp:675 +#: optiondialog.cpp:688 #, kde-format msgid "Color B:" msgstr "Farge B:" -#: optiondialog.cpp:684 +#: optiondialog.cpp:697 #, kde-format msgid "Color C:" msgstr "Farge C:" -#: optiondialog.cpp:692 +#: optiondialog.cpp:705 #, kde-format msgid "Conflict color:" msgstr "Konfliktfarge:" -#: optiondialog.cpp:701 +#: optiondialog.cpp:714 #, kde-format msgid "Current range background color:" msgstr "Bakgrunnsfarge for gjeldende område:" -#: optiondialog.cpp:710 +#: optiondialog.cpp:723 #, kde-format msgid "Current range diff background color:" msgstr "Bakgrunnsfarge for gjeldende forskjellsområde:" -#: optiondialog.cpp:718 +#: optiondialog.cpp:731 #, kde-format msgid "Color for manually aligned difference ranges:" msgstr "Farge for manuelt innrettede forskjellsområder:" -#: optiondialog.cpp:725 +#: optiondialog.cpp:738 #, kde-format msgid "Directory Comparison View:" msgstr "Mappesammenlikning:" -#: optiondialog.cpp:731 +#: optiondialog.cpp:744 #, kde-format msgid "Newest file color:" msgstr "Farge for nyeste fil:" -#: optiondialog.cpp:736 +#: optiondialog.cpp:749 #, kde-format msgid "" "Changing this color will only be effective when starting the next directory " @@ -2117,37 +2127,37 @@ "Endring av denne fargen får bare virkning når neste mappe-sammenlikning " "utføres." -#: optiondialog.cpp:741 +#: optiondialog.cpp:754 #, kde-format msgid "Oldest file color:" msgstr "Farge for eldste fil:" -#: optiondialog.cpp:750 +#: optiondialog.cpp:763 #, kde-format msgid "Middle age file color:" msgstr "Farge for filer med midlere alder:" -#: optiondialog.cpp:759 +#: optiondialog.cpp:772 #, kde-format msgid "Color for missing files:" msgstr "Farge for manglende filer:" -#: optiondialog.cpp:773 +#: optiondialog.cpp:786 #, kde-format msgid "Editor" msgstr "Redigerer" -#: optiondialog.cpp:774 +#: optiondialog.cpp:787 #, kde-format msgid "Editor Behavior" msgstr "Redigeringsoppsett" -#: optiondialog.cpp:787 +#: optiondialog.cpp:809 #, kde-format msgid "Tab inserts spaces" msgstr "TAB setter inn mellomrom" -#: optiondialog.cpp:791 +#: optiondialog.cpp:813 #, kde-format msgid "" "On: Pressing tab generates the appropriate number of spaces.\n" @@ -2156,34 +2166,34 @@ "På: tab-tasten setter inn passende antall mellomrom.\n" "Av: Et tab-tegn settes inn." -#: optiondialog.cpp:796 +#: optiondialog.cpp:818 #, kde-format msgid "Tab size:" msgstr "TAB-størrelse:" -#: optiondialog.cpp:803 +#: optiondialog.cpp:825 #, kde-format msgid "Auto indentation" msgstr "Automatisk innrykk" -#: optiondialog.cpp:807 +#: optiondialog.cpp:829 #, kde-format msgid "On: The indentation of the previous line is used for a new line.\n" msgstr "På: Innrykket for forrige linje brukes for en ny linje.\n" -#: optiondialog.cpp:810 +#: optiondialog.cpp:832 #, kde-format msgid "Auto copy selection" msgstr "Autokopier utvalg" -#: optiondialog.cpp:814 +#: optiondialog.cpp:836 #, kde-format msgid "" "On: Any selection is immediately written to the clipboard.\n" "Off: You must explicitly copy e.g. via Ctrl-C." msgstr "" -#: optiondialog.cpp:829 +#: optiondialog.cpp:851 #, kde-format msgid "" "Sets the line endings for when an edited file is saved.\n" @@ -2192,12 +2202,12 @@ "Bestemmer tegn for slutt på linja når en fil lagres.\n" "DOS/Windows: CR+LF; UNIX: LF; med CR=0D, LF=0A" -#: optiondialog.cpp:839 +#: optiondialog.cpp:861 #, kde-format msgid "Diff" msgstr "Diff" -#: optiondialog.cpp:840 +#: optiondialog.cpp:862 #, kde-format msgid "Diff Settings" msgstr "Innstillinger for Diff" @@ -2211,12 +2221,12 @@ #. ); #. ++line; #. -#: optiondialog.cpp:865 +#: optiondialog.cpp:896 #, kde-format msgid "Ignore numbers (treat as white space)" msgstr "" -#: optiondialog.cpp:869 +#: optiondialog.cpp:900 #, kde-format msgid "" "Ignore number characters during line matching phase. (Similar to Ignore " @@ -2226,42 +2236,42 @@ "Ignorer sifre når linjene søkes opp. (Likner Ignorer tomrom)\n" "Kan hjelpe til å sammenlikne filer med numeriske data." -#: optiondialog.cpp:873 +#: optiondialog.cpp:904 #, kde-format msgid "Ignore C/C++ comments (treat as white space)" msgstr "" -#: optiondialog.cpp:876 +#: optiondialog.cpp:907 #, kde-format msgid "Treat C/C++ comments like white space." msgstr "Behandle kommentarer i C/C++ som tomrom." -#: optiondialog.cpp:879 +#: optiondialog.cpp:910 #, kde-format msgid "Ignore case (treat as white space)" msgstr "" -#: optiondialog.cpp:883 +#: optiondialog.cpp:914 #, kde-format msgid "Treat case differences like white space changes. ('a'<=>'A')" msgstr "Behandle endringer små/store som endring i tomrom («a»<=>«A»)" -#: optiondialog.cpp:886 +#: optiondialog.cpp:917 #, kde-format msgid "Preprocessor command:" msgstr "Forarbeide-kommando:" -#: optiondialog.cpp:891 +#: optiondialog.cpp:922 #, kde-format msgid "User defined pre-processing. (See the docs for details.)" msgstr "Selvvalgt forarbeide. (Detaljer finnes i dokumentasjonen)" -#: optiondialog.cpp:894 +#: optiondialog.cpp:925 #, kde-format msgid "Line-matching preprocessor command:" msgstr "Linjesøkende forarbeide, kommando:" -#: optiondialog.cpp:899 +#: optiondialog.cpp:930 #, kde-format msgid "" "This pre-processor is only used during line matching.\n" @@ -2270,12 +2280,12 @@ "Denne forbehandleren brukes bare når linjer søkes.\n" "(Detaljer i dokumentasjonen)." -#: optiondialog.cpp:902 +#: optiondialog.cpp:933 #, kde-format msgid "Try hard (slower)" msgstr "Grundig (langsommere)" -#: optiondialog.cpp:906 +#: optiondialog.cpp:937 #, kde-format msgid "" "Enables the --minimal option for the external diff.\n" @@ -2284,12 +2294,12 @@ "Slår på --minimal for det eksterne diff-programmet.\n" "Analyse av store filer blir mye langsommere." -#: optiondialog.cpp:910 +#: optiondialog.cpp:941 #, kde-format msgid "Align B and C for 3 input files" msgstr "Innrett B og C for 3 inn-filer" -#: optiondialog.cpp:914 +#: optiondialog.cpp:945 #, kde-format msgid "" "Try to align B and C when comparing or merging three input files.\n" @@ -2300,17 +2310,23 @@ "Ikke anbefalt for fletting fordi fletting kan bli mer komplisert.\\ " "(Standard er av.)" -#: optiondialog.cpp:926 +#: optiondialog.cpp:956 +#, kde-format +msgctxt "Settings page" +msgid "Merge" +msgstr "" + +#: optiondialog.cpp:957 #, kde-format msgid "Merge Settings" msgstr "Innstillinger for fletting" -#: optiondialog.cpp:940 +#: optiondialog.cpp:980 #, kde-format msgid "Auto advance delay (ms):" msgstr "Forsinkelse for auto-avansering (ms):" -#: optiondialog.cpp:946 +#: optiondialog.cpp:986 #, kde-format msgid "" "When in Auto-Advance mode the result of the current selection is shown \n" @@ -2319,27 +2335,27 @@ "Når det brukes auto-avansering vises resultatet av gjeldende utvalg \n" "i oppgitt tid, før det hoppes til neste konflikt. Verdiområde fra 0-2000 ms" -#: optiondialog.cpp:950 +#: optiondialog.cpp:990 #, kde-format msgid "Show info dialogs" msgstr "Vis informasjonsdialoger" -#: optiondialog.cpp:953 +#: optiondialog.cpp:993 #, kde-format msgid "Show a dialog with information about the number of conflicts." msgstr "Vis en dialog med informasjon om antall konflikter." -#: optiondialog.cpp:956 +#: optiondialog.cpp:996 #, kde-format msgid "White space 2-file merge default:" msgstr "Standard for 2-fils tomromsfletting:" -#: optiondialog.cpp:961 optiondialog.cpp:974 +#: optiondialog.cpp:1001 optiondialog.cpp:1014 #, kde-format msgid "Manual Choice" msgstr "Manuelt valg" -#: optiondialog.cpp:965 optiondialog.cpp:979 +#: optiondialog.cpp:1005 optiondialog.cpp:1019 #, kde-format msgid "" "Allow the merge algorithm to automatically select an input for white-space-" @@ -2348,22 +2364,22 @@ "Tillat flettealgoritmen å velge inn-data automatisk for endringer som bare " "gjelder tomrom." -#: optiondialog.cpp:969 +#: optiondialog.cpp:1009 #, kde-format msgid "White space 3-file merge default:" msgstr "Standard for 3-fils tomromsfletting:" -#: optiondialog.cpp:983 +#: optiondialog.cpp:1023 #, kde-format msgid "Automatic Merge Regular Expression" msgstr "Automatisk fletting med regulært uttrykk" -#: optiondialog.cpp:991 smalldialogs.cpp:449 +#: optiondialog.cpp:1031 smalldialogs.cpp:459 #, kde-format msgid "Auto merge regular expression:" msgstr "Regulært uttrykk for automatisk fletting:" -#: optiondialog.cpp:996 +#: optiondialog.cpp:1036 #, kde-format msgid "" "Regular expression for lines where KDiff3 should automatically choose one " @@ -2375,12 +2391,12 @@ "Når en linje med konflikt stemmer med det regulære uttrykket, så \n" "velges C hvis tilgjengelig, ellers B." -#: optiondialog.cpp:1002 +#: optiondialog.cpp:1042 #, kde-format msgid "Run regular expression auto merge on merge start" msgstr "Kjør autofletting med regulære uttrykk ved flettestart" -#: optiondialog.cpp:1005 +#: optiondialog.cpp:1045 #, kde-format msgid "" "Run the merge for auto merge regular expressions\n" @@ -2389,17 +2405,17 @@ "Kjør autoflettingen med regulære uttrykk med en\n" "gang når en fletting begynner.\n" -#: optiondialog.cpp:1010 +#: optiondialog.cpp:1050 #, kde-format msgid "Version Control History Merging" msgstr "Fletting av historien fra versjonskontroll" -#: optiondialog.cpp:1018 smalldialogs.cpp:476 +#: optiondialog.cpp:1058 smalldialogs.cpp:486 #, kde-format msgid "History start regular expression:" msgstr "Regulært uttrykk for start på historien:" -#: optiondialog.cpp:1023 +#: optiondialog.cpp:1063 #, kde-format msgid "" "Regular expression for the start of the version control history entry.\n" @@ -2410,12 +2426,12 @@ "Denne linja inneholder som regel nøkkelordet \"$Log$\".\n" "Standard: \".*\\$Log.*\\$.*\"" -#: optiondialog.cpp:1029 smalldialogs.cpp:504 +#: optiondialog.cpp:1069 smalldialogs.cpp:514 #, kde-format msgid "History entry start regular expression:" msgstr "Regulært uttrykk for start på historieoppføring:" -#: optiondialog.cpp:1042 +#: optiondialog.cpp:1082 #, kde-format msgid "" "A version control history entry consists of several lines.\n" @@ -2433,22 +2449,22 @@ "historieoppføringene.\n" "Se i dokumentasjonen etter detaljer." -#: optiondialog.cpp:1050 +#: optiondialog.cpp:1090 #, kde-format msgid "History merge sorting" msgstr "Flettesortering av historien" -#: optiondialog.cpp:1053 +#: optiondialog.cpp:1093 #, kde-format msgid "Sort version control history by a key." msgstr "Sorter versjonskontroll-historien etter en nøkkel." -#: optiondialog.cpp:1063 +#: optiondialog.cpp:1103 #, kde-format msgid "History entry start sort key order:" msgstr "Nøkkelrekkefølge for sortering av historiestart:" -#: optiondialog.cpp:1068 +#: optiondialog.cpp:1108 #, kde-format msgid "" "Each pair of parentheses used in the regular expression for the history " @@ -2467,38 +2483,38 @@ "Står dette tomt blir det ikke sortert.\n" "Detaljer finnes i dokumentasjonen." -#: optiondialog.cpp:1079 +#: optiondialog.cpp:1119 #, kde-format msgid "Merge version control history on merge start" msgstr "Flett versjonshistorien når flettingen begynner" -#: optiondialog.cpp:1082 +#: optiondialog.cpp:1122 #, kde-format msgid "Run version control history automerge on merge start." msgstr "Kjør autofletting på versjonshistorien når fletting begynner." -#: optiondialog.cpp:1086 +#: optiondialog.cpp:1126 #, kde-format msgid "Max number of history entries:" msgstr "Maks antall oppføringer i historien:" -#: optiondialog.cpp:1090 +#: optiondialog.cpp:1130 #, kde-format msgid "Cut off after specified number. Use -1 for infinite number of entries." msgstr "" "Stopp etter det oppgitte antallet. Bruk -1 for ubegrenset antall oppføringer." -#: optiondialog.cpp:1094 +#: optiondialog.cpp:1134 #, kde-format msgid "Test your regular expressions" msgstr "Test de regulære uttrykkene" -#: optiondialog.cpp:1099 +#: optiondialog.cpp:1139 #, kde-format msgid "Irrelevant merge command:" msgstr "Irrelevant flettekommando:" -#: optiondialog.cpp:1104 +#: optiondialog.cpp:1144 #, kde-format msgid "" "If specified this script is run after automerge\n" @@ -2509,12 +2525,12 @@ "autofletting når ingen andre relevante endringer \n" "ble funnet. Kalles med parametre filnavn1 filnavn2 filnavn3" -#: optiondialog.cpp:1109 +#: optiondialog.cpp:1149 #, kde-format msgid "Auto save and quit on merge without conflicts" msgstr "Automatisk lagring og avslutting etter fletting uten konflikter" -#: optiondialog.cpp:1113 +#: optiondialog.cpp:1153 #, kde-format msgid "" "If KDiff3 was started for a file-merge from the command line and all\n" @@ -2527,27 +2543,27 @@ "kan løses uten å spørre brukeren, så lagre og avslutt automatisk.\n" "(Likner kommandolinjevalget «--auto»." -#: optiondialog.cpp:1124 optiondialog.cpp:1125 +#: optiondialog.cpp:1164 optiondialog.cpp:1165 #, kde-format msgid "Directory" msgstr "Mappe" -#: optiondialog.cpp:1137 +#: optiondialog.cpp:1185 #, kde-format msgid "Recursive directories" msgstr "Rekursive mapper" -#: optiondialog.cpp:1140 +#: optiondialog.cpp:1188 #, kde-format msgid "Whether to analyze subdirectories or not." msgstr "Om undermapper skal analyseres eller ikke." -#: optiondialog.cpp:1142 +#: optiondialog.cpp:1190 #, kde-format msgid "File pattern(s):" msgstr "Filmønster(e):" -#: optiondialog.cpp:1148 +#: optiondialog.cpp:1196 #, kde-format msgid "" "Pattern(s) of files to be analyzed. \n" @@ -2558,12 +2574,12 @@ "Jokertegn: «*» og «?»\n" "Flere mønstre kan oppgis med «;» som skilletegn" -#: optiondialog.cpp:1153 +#: optiondialog.cpp:1201 #, kde-format msgid "File-anti-pattern(s):" msgstr "Fil-antimønster(e):" -#: optiondialog.cpp:1159 +#: optiondialog.cpp:1207 #, kde-format msgid "" "Pattern(s) of files to be excluded from analysis. \n" @@ -2574,12 +2590,12 @@ "Jokertegn: «*» og «?»\n" "Flere mønstre kan oppgis med «;» som skilletegn" -#: optiondialog.cpp:1164 +#: optiondialog.cpp:1212 #, kde-format msgid "Dir-anti-pattern(s):" msgstr "Mappe-antimønster(e) :" -#: optiondialog.cpp:1170 +#: optiondialog.cpp:1218 #, kde-format msgid "" "Pattern(s) of directories to be excluded from analysis. \n" @@ -2590,12 +2606,12 @@ "Jokertegn: «*» og «?»\n" "Flere mønstre kan oppgis med «;» som skilletegn" -#: optiondialog.cpp:1175 +#: optiondialog.cpp:1223 #, kde-format msgid "Use .cvsignore" msgstr "Bruk .cvsignore" -#: optiondialog.cpp:1179 +#: optiondialog.cpp:1227 #, kde-format msgid "" "Extends the antipattern to anything that would be ignored by CVS.\n" @@ -2604,22 +2620,22 @@ "Utvider antimønsteret til alt som CVS ville ignorere.\n" "Dette kan gjøres pr. mappe med lokale «.cvsignore»-filer." -#: optiondialog.cpp:1183 +#: optiondialog.cpp:1231 #, kde-format msgid "Find hidden files and directories" msgstr "Finn skjulte filer og mapper" -#: optiondialog.cpp:1186 +#: optiondialog.cpp:1234 #, kde-format msgid "Finds hidden files and directories." msgstr "" -#: optiondialog.cpp:1189 +#: optiondialog.cpp:1237 #, kde-format msgid "Follow file links" msgstr "Følg fil-lenker" -#: optiondialog.cpp:1193 +#: optiondialog.cpp:1241 #, kde-format msgid "" "On: Compare the file the link points to.\n" @@ -2628,12 +2644,12 @@ "På: Sammenlikne filer som lenkene peker på.\n" "Av: Sammenlikne lenkene." -#: optiondialog.cpp:1197 +#: optiondialog.cpp:1245 #, kde-format msgid "Follow directory links" msgstr "Følg mappelenker" -#: optiondialog.cpp:1201 +#: optiondialog.cpp:1249 #, kde-format msgid "" "On: Compare the directory the link points to.\n" @@ -2642,12 +2658,12 @@ "På: Sammenlikne mapper lenkene peker på.\n" "Av: Sammenlikne lenkene." -#: optiondialog.cpp:1210 +#: optiondialog.cpp:1258 #, kde-format msgid "Case sensitive filename comparison" msgstr "Store/små bokstaver i filnavn" -#: optiondialog.cpp:1214 +#: optiondialog.cpp:1262 #, kde-format msgid "" "The directory comparison will compare files or directories when their names " @@ -2659,51 +2675,51 @@ "Slå på dette hvis navnene er versalvâre – dvs store/små bokstaver må være " "like. (Standard for Windows er av, ellers på.)v" -#: optiondialog.cpp:1218 +#: optiondialog.cpp:1266 #, kde-format msgid "Unfold all subdirectories on load" msgstr "" -#: optiondialog.cpp:1222 +#: optiondialog.cpp:1270 #, kde-format msgid "" "On: Unfold all subdirectories when starting a directory diff.\n" "Off: Leave subdirectories folded." msgstr "" -#: optiondialog.cpp:1226 +#: optiondialog.cpp:1274 #, kde-format msgid "Skip directory status report" msgstr "" -#: optiondialog.cpp:1230 +#: optiondialog.cpp:1278 #, kde-format msgid "" "On: Do not show the Directory Comparison Status.\n" "Off: Show the status dialog on start." msgstr "" -#: optiondialog.cpp:1234 +#: optiondialog.cpp:1282 #, kde-format msgid "File Comparison Mode" msgstr "Hvordan filer sammenliknes" -#: optiondialog.cpp:1239 +#: optiondialog.cpp:1287 #, kde-format msgid "Binary comparison" msgstr "Binær sammenlikning" -#: optiondialog.cpp:1241 +#: optiondialog.cpp:1289 #, kde-format msgid "Binary comparison of each file. (Default)" msgstr "Binær sammenlikning av hver fil. (Standard)" -#: optiondialog.cpp:1244 +#: optiondialog.cpp:1292 #, kde-format msgid "Full analysis" msgstr "Full analyse" -#: optiondialog.cpp:1246 +#: optiondialog.cpp:1294 #, kde-format msgid "" "Do a full analysis and show statistics information in extra columns.\n" @@ -2712,12 +2728,12 @@ "Gjør en full analyse og vis statistikk i ekstra kolonner.\n" "(Langsommere enn binær sammenlikning, mye langsommere for binære filer.)" -#: optiondialog.cpp:1250 +#: optiondialog.cpp:1298 #, kde-format msgid "Trust the size and modification date (unsafe)" msgstr "Stol på størrelsen og endringsdatoen (utrygt)" -#: optiondialog.cpp:1252 +#: optiondialog.cpp:1300 #, kde-format msgid "" "Assume that files are equal if the modification date and file length are " @@ -2731,7 +2747,7 @@ "forskjellige.\n" "Nyttig for store mapper eller langsomme nett." -#: optiondialog.cpp:1257 +#: optiondialog.cpp:1305 #, kde-format msgid "" "Trust the size and date, but use binary comparison if date does not match " @@ -2740,7 +2756,7 @@ "Stol på størrelse og dato, men bruk binær sammenlikning hvis datoen ikke " "stemmer (utrygt)" -#: optiondialog.cpp:1259 +#: optiondialog.cpp:1307 #, kde-format msgid "" "Assume that files are equal if the modification date and file length are " @@ -2752,12 +2768,12 @@ "Hvis datoene ikke er like, men størrelsene er like, så bruk binær " "sammenlikning.Nyttig for store mapper eller langsomme nett." -#: optiondialog.cpp:1264 +#: optiondialog.cpp:1312 #, kde-format msgid "Trust the size (unsafe)" msgstr "Stol på størrelsen (utrygt)" -#: optiondialog.cpp:1266 +#: optiondialog.cpp:1314 #, kde-format msgid "" "Assume that files are equal if their file lengths are equal.\n" @@ -2768,12 +2784,12 @@ "Nyttig for store mapper eller langsomme nett når datoen endres under " "nedlasting." -#: optiondialog.cpp:1273 +#: optiondialog.cpp:1321 #, kde-format msgid "Synchronize directories" msgstr "Synkroniser mapper" -#: optiondialog.cpp:1277 +#: optiondialog.cpp:1325 #, kde-format msgid "" "Offers to store files in both directories so that\n" @@ -2784,12 +2800,12 @@ "mappene er like etterpå. Dette virker bare hvis\n" "to mapper sammenliknes uten å oppgi et mål." -#: optiondialog.cpp:1283 +#: optiondialog.cpp:1331 #, kde-format msgid "White space differences considered equal" msgstr "Tomromsforskjeller betraktes som like" -#: optiondialog.cpp:1287 +#: optiondialog.cpp:1335 #, kde-format msgid "" "If files differ only by white space consider them equal.\n" @@ -2798,12 +2814,12 @@ "Hvis filer er forskjellige bare i tomrom, betrakt dem som\n" "like. Dette er bare aktivt når det kjøres full analyse." -#: optiondialog.cpp:1293 +#: optiondialog.cpp:1341 #, kde-format msgid "Copy newer instead of merging (unsafe)" msgstr "Kopier den nyeste i stedet for å flette (utrygt)" -#: optiondialog.cpp:1297 +#: optiondialog.cpp:1345 #, kde-format msgid "" "Do not look inside, just take the newer file.\n" @@ -2811,12 +2827,12 @@ "Only effective when comparing two directories." msgstr "" -#: optiondialog.cpp:1302 +#: optiondialog.cpp:1350 #, kde-format msgid "Backup files (.orig)" msgstr "Ta sikkerhetskopi av filer (.orig)" -#: optiondialog.cpp:1306 +#: optiondialog.cpp:1354 #, kde-format msgid "" "If a file would be saved over an old file, then the old file\n" @@ -2825,17 +2841,17 @@ "Hvis en ny fil ville bli lagret oppå en gammel, så får den gamle\n" "fila nytt navn med «.orig» til slutt i stedet for å bli slettet." -#: optiondialog.cpp:1382 optiondialog.cpp:1383 +#: optiondialog.cpp:1430 optiondialog.cpp:1431 #, kde-format msgid "Regional Settings" msgstr "Regionale innstillinger" -#: optiondialog.cpp:1397 +#: optiondialog.cpp:1454 #, kde-format msgid "Use the same encoding for everything:" msgstr "Bruk samme koding for alt:" -#: optiondialog.cpp:1401 +#: optiondialog.cpp:1458 #, kde-format msgid "" "Enable this allows to change all encodings by changing the first only.\n" @@ -2845,17 +2861,17 @@ "første.\n" "Slå av hvis det trengs separate innstillinger." -#: optiondialog.cpp:1405 +#: optiondialog.cpp:1462 #, kde-format msgid "Note: Local Encoding is \"%1\"" msgstr "" -#: optiondialog.cpp:1409 +#: optiondialog.cpp:1466 #, kde-format msgid "File Encoding for A:" msgstr "Filkoding for A :" -#: optiondialog.cpp:1416 +#: optiondialog.cpp:1473 #, kde-format msgid "" "If enabled then Unicode (UTF-16 or UTF-8) encoding will be detected.\n" @@ -2867,32 +2883,32 @@ "Hvis fila ikke er i Unicode, så blir den valgte kodingen brukt som reserve.\n" "(Unicode oppdages avhengig av de første tegnene i en fil.)" -#: optiondialog.cpp:1419 optiondialog.cpp:1430 optiondialog.cpp:1441 +#: optiondialog.cpp:1476 optiondialog.cpp:1487 optiondialog.cpp:1498 #, kde-format msgid "Auto Detect Unicode" msgstr "Auto-oppdag Unicode" -#: optiondialog.cpp:1425 +#: optiondialog.cpp:1482 #, kde-format msgid "File Encoding for B:" msgstr "Filkoding for B :" -#: optiondialog.cpp:1436 +#: optiondialog.cpp:1493 #, kde-format msgid "File Encoding for C:" msgstr "Filkoding for C :" -#: optiondialog.cpp:1447 +#: optiondialog.cpp:1504 #, kde-format msgid "File Encoding for Merge Output and Saving:" msgstr "Filkoding for flettet resultat og lagring:" -#: optiondialog.cpp:1452 +#: optiondialog.cpp:1509 #, kde-format msgid "Auto Select" msgstr "Autovalg" -#: optiondialog.cpp:1456 +#: optiondialog.cpp:1513 #, kde-format msgid "" "If enabled then the encoding from the input files is used.\n" @@ -2903,17 +2919,17 @@ "Hvis en entydig koding ikke kan bestemmes, vil et dialogvindu be brukeren " "velge en koding for lagring." -#: optiondialog.cpp:1459 +#: optiondialog.cpp:1516 #, kde-format msgid "File Encoding for Preprocessor Files:" msgstr "Filkoding for forbehandlingsfiler:" -#: optiondialog.cpp:1471 +#: optiondialog.cpp:1528 #, kde-format msgid "Right To Left Language" msgstr "Høyre mot venstre-språk" -#: optiondialog.cpp:1475 +#: optiondialog.cpp:1532 #, kde-format msgid "" "Some languages are read from right to left.\n" @@ -2922,22 +2938,22 @@ "Noen språk leses fra høyre mot venstre.\n" "Denne innstillinga endrer visning og redigering tilsvarende." -#: optiondialog.cpp:1485 +#: optiondialog.cpp:1542 #, kde-format msgid "Integration" msgstr "Integrasjon" -#: optiondialog.cpp:1486 +#: optiondialog.cpp:1543 #, kde-format msgid "Integration Settings" msgstr "Integrasjonsinnstillinger" -#: optiondialog.cpp:1499 +#: optiondialog.cpp:1564 #, kde-format msgid "Command line options to ignore:" msgstr "Kommandolinjeparametre som skal ignoreres:" -#: optiondialog.cpp:1505 +#: optiondialog.cpp:1570 #, kde-format msgid "" "List of command line options that should be ignored when KDiff3 is used by " @@ -2950,12 +2966,12 @@ "Flere verdier kan oppgis atskilt med «;»\n" "Da forsvinner feilmeldinga «Ukjent parameter»." -#: optiondialog.cpp:1510 +#: optiondialog.cpp:1575 #, kde-format msgid "Quit also via Escape key" msgstr "Avslutt også med Escape-tasten" -#: optiondialog.cpp:1514 +#: optiondialog.cpp:1579 #, kde-format msgid "" "Fast method to exit.\n" @@ -2964,7 +2980,7 @@ "Rask måte å avslutte på.\n" "For de som er vant til å bruke Escape-tasten." -#: optiondialog.cpp:1598 +#: optiondialog.cpp:1653 #, kde-format msgid "This resets all options. Not only those of the current topic." msgstr "Dette tilbakestiller alle valg, ikke bare dem i dette emnet." @@ -3019,77 +3035,67 @@ msgid "Disable Unsafe Options" msgstr "Slå av utrygge innstillinger" -#: pdiff.cpp:158 +#: pdiff.cpp:160 #, kde-format msgid "Loading A" msgstr "Laster A" -#: pdiff.cpp:167 +#: pdiff.cpp:162 #, kde-format -msgid "Errors occurred during pre-processing of file A." +msgid "Loading A: %1" msgstr "" -#: pdiff.cpp:172 +#: pdiff.cpp:170 #, kde-format msgid "Loading B" msgstr "Laster B" -#: pdiff.cpp:179 -#, kde-format -msgid "Errors occurred during pre-processing of file B." -msgstr "" - -#: pdiff.cpp:202 pdiff.cpp:241 +#: pdiff.cpp:201 pdiff.cpp:237 #, kde-format msgid "Diff: A <-> B" msgstr "Diff: A <-> B" -#: pdiff.cpp:208 pdiff.cpp:279 pdiff.cpp:293 +#: pdiff.cpp:207 pdiff.cpp:275 pdiff.cpp:289 #, kde-format msgid "Linediff: A <-> B" msgstr "Linjediff A <-> B" -#: pdiff.cpp:225 +#: pdiff.cpp:224 #, kde-format msgid "Loading C" msgstr "Laster C" -#: pdiff.cpp:232 -#, kde-format -msgid "Errors occurred during pre-processing of file C." -msgstr "" - -#: pdiff.cpp:250 +#: pdiff.cpp:246 #, kde-format msgid "Diff: A <-> C" msgstr "Diff: A <-> C" -#: pdiff.cpp:261 +#: pdiff.cpp:257 #, kde-format msgid "Diff: B <-> C" msgstr "Diff: B <-> C" -#: pdiff.cpp:283 pdiff.cpp:297 +#: pdiff.cpp:279 pdiff.cpp:293 #, kde-format msgid "Linediff: B <-> C" msgstr "Linjediff B <-> C" -#: pdiff.cpp:287 pdiff.cpp:301 +#: pdiff.cpp:283 pdiff.cpp:297 #, kde-format msgid "Linediff: A <-> C" msgstr "Linjediff A <-> C" -#: pdiff.cpp:829 +#: pdiff.cpp:840 #, kde-format 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:835 pdiff.cpp:839 pdiff.cpp:843 +#: pdiff.cpp:846 pdiff.cpp:850 pdiff.cpp:854 #, 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:853 +#: pdiff.cpp:864 #, kde-format msgid "" "Some input files do not seem to be pure text files.\n" @@ -3097,17 +3103,17 @@ "Continue at your own risk." msgstr "" -#: pdiff.cpp:863 +#: pdiff.cpp:874 #, kde-format msgid ", B" msgstr "" -#: pdiff.cpp:865 +#: pdiff.cpp:876 #, kde-format msgid ", C" msgstr "" -#: pdiff.cpp:867 +#: pdiff.cpp:878 #, kde-format msgid "" "Some input characters could not be converted to valid unicode.\n" @@ -3116,77 +3122,72 @@ "Affected input files are in %1." msgstr "" -#: pdiff.cpp:1034 +#: pdiff.cpp:1053 #, kde-format msgid "Abort" msgstr "Avbryt" -#: pdiff.cpp:1040 pdiff.cpp:1130 +#: pdiff.cpp:1059 pdiff.cpp:1150 #, kde-format msgid "Opening files..." msgstr "Åpner filer …" -#: pdiff.cpp:1107 -#, kde-format -msgid "File open error" -msgstr "Feil ved filåpning" - -#: pdiff.cpp:1202 +#: pdiff.cpp:1222 #, kde-format msgid "Cutting selection..." msgstr "Klipper ut utvalget …" -#: pdiff.cpp:1223 +#: pdiff.cpp:1243 #, kde-format msgid "Copying selection to clipboard..." msgstr "Kopierer utvalg til utklippstavla …" -#: pdiff.cpp:1239 +#: pdiff.cpp:1259 #, kde-format msgid "Inserting clipboard contents..." msgstr "Setter inn fra utklippstavla …" -#: pdiff.cpp:1695 +#: pdiff.cpp:1715 #, kde-format msgid "Word wrap (Cancel disables word wrap)" msgstr "" -#: pdiff.cpp:1696 +#: pdiff.cpp:1716 #, kde-format msgid "Calculating max width for horizontal scrollbar" msgstr "" -#: pdiff.cpp:1911 +#: pdiff.cpp:1931 #, kde-format msgid "Save && Continue" msgstr "Lagre og fortsett" -#: pdiff.cpp:1912 +#: pdiff.cpp:1932 #, kde-format msgid "Continue Without Saving" msgstr "Fortsett uten lagring" -#: pdiff.cpp:2124 +#: pdiff.cpp:2144 #, kde-format msgid "Search complete." msgstr "Søk fullført." -#: pdiff.cpp:2124 +#: pdiff.cpp:2144 #, kde-format msgid "Search Complete" msgstr "Søk fullført" -#: pdiff.cpp:2375 +#: pdiff.cpp:2395 #, kde-format msgid "Nothing is selected in either diff input window." msgstr "Ingenting er valgt i noe av inndata-vinduene." -#: pdiff.cpp:2375 +#: pdiff.cpp:2395 #, kde-format msgid "Error while adding manual diff range" msgstr "Feil oppsto ved tillegg av manuelt diff-område" -#: progress.cpp:59 progress.cpp:71 +#: progress.cpp:61 progress.cpp:73 #, kde-format msgid "&Cancel" msgstr "&Avbryt" @@ -3196,125 +3197,125 @@ msgid "A (Base):" msgstr "A (Basis):" -#: smalldialogs.cpp:68 smalldialogs.cpp:85 smalldialogs.cpp:102 -#: smalldialogs.cpp:144 +#: smalldialogs.cpp:71 smalldialogs.cpp:90 smalldialogs.cpp:109 +#: smalldialogs.cpp:154 #, kde-format msgid "File..." msgstr "Fil …" -#: smalldialogs.cpp:70 smalldialogs.cpp:87 smalldialogs.cpp:104 -#: smalldialogs.cpp:146 +#: smalldialogs.cpp:73 smalldialogs.cpp:92 smalldialogs.cpp:111 +#: smalldialogs.cpp:156 #, kde-format msgid "Dir..." msgstr "Mappe …" -#: smalldialogs.cpp:96 +#: smalldialogs.cpp:103 #, kde-format msgid "C (Optional):" msgstr "C (valgfri):" -#: smalldialogs.cpp:119 +#: smalldialogs.cpp:126 #, kde-format msgid "Swap/Copy Names..." msgstr "" -#: smalldialogs.cpp:124 smalldialogs.cpp:125 smalldialogs.cpp:126 +#: smalldialogs.cpp:131 smalldialogs.cpp:132 smalldialogs.cpp:133 #, kde-format msgid "Swap %1<->%2" msgstr "Bytt om %1<->%2" -#: smalldialogs.cpp:127 smalldialogs.cpp:128 smalldialogs.cpp:129 +#: smalldialogs.cpp:134 smalldialogs.cpp:135 smalldialogs.cpp:136 #, kde-format msgid "Copy %1->Output" msgstr "Kopier %1->Utdata" -#: smalldialogs.cpp:130 smalldialogs.cpp:131 smalldialogs.cpp:132 +#: smalldialogs.cpp:137 smalldialogs.cpp:138 smalldialogs.cpp:139 #, kde-format msgid "Swap %1<->Output" msgstr "Bytt om %1<->utdata" -#: smalldialogs.cpp:138 +#: smalldialogs.cpp:148 #, kde-format msgid "Output (optional):" msgstr "Utdata (valgfri):" -#: smalldialogs.cpp:168 +#: smalldialogs.cpp:178 #, kde-format msgid "Configure..." msgstr "Sett opp …" -#: smalldialogs.cpp:233 +#: smalldialogs.cpp:243 #, kde-format msgid "Open Directory" msgstr "Åpne mappe" -#: smalldialogs.cpp:234 +#: smalldialogs.cpp:244 #, kde-format msgid "Select Output File" msgstr "" -#: smalldialogs.cpp:393 +#: smalldialogs.cpp:403 #, kde-format msgid "Search text:" msgstr "Søketekst:" -#: smalldialogs.cpp:400 +#: smalldialogs.cpp:410 #, kde-format msgid "Case sensitive" msgstr "Skill mellom store og små bokstaver" -#: smalldialogs.cpp:403 +#: smalldialogs.cpp:413 #, kde-format msgid "Search A" msgstr "Søk i A" -#: smalldialogs.cpp:408 +#: smalldialogs.cpp:418 #, kde-format msgid "Search B" msgstr "Søk i B" -#: smalldialogs.cpp:413 +#: smalldialogs.cpp:423 #, kde-format msgid "Search C" msgstr "Søk i C" -#: smalldialogs.cpp:418 +#: smalldialogs.cpp:428 #, kde-format msgid "Search output" msgstr "Utdata fra søk" -#: smalldialogs.cpp:425 +#: smalldialogs.cpp:435 #, kde-format msgid "&Search" msgstr "&Søk" -#: smalldialogs.cpp:444 +#: smalldialogs.cpp:454 #, kde-format msgid "Regular Expression Tester" msgstr "Prøv ut regulært uttrykk" -#: smalldialogs.cpp:457 +#: smalldialogs.cpp:467 #, kde-format msgid "Example auto merge line:" msgstr "Eksempel på autoflette-linje:" -#: smalldialogs.cpp:459 +#: smalldialogs.cpp:469 #, kde-format msgid "To test auto merge, copy a line as used in your files." msgstr "" "Kopier hit en linje slik som brukt i filene dine, for å teste autofletting." -#: smalldialogs.cpp:465 smalldialogs.cpp:493 smalldialogs.cpp:529 +#: smalldialogs.cpp:475 smalldialogs.cpp:503 smalldialogs.cpp:539 #, kde-format msgid "Match result:" msgstr "Resultat av søk:" -#: smalldialogs.cpp:484 +#: smalldialogs.cpp:494 #, kde-format msgid "Example history start line (with leading comment):" msgstr "Eksempel på startlinje for historie (med innledende kommentar):" -#: smalldialogs.cpp:486 +#: smalldialogs.cpp:496 #, kde-format msgid "" "Copy a history start line as used in your files,\n" @@ -3323,18 +3324,18 @@ "Kopier en historie-startlinje fra en av filene dine,\n" "ta med den innledende kommentaren." -#: smalldialogs.cpp:512 +#: smalldialogs.cpp:522 #, kde-format msgid "History sort key order:" msgstr "Sorteringsrekkefølge for historienøkler:" -#: smalldialogs.cpp:520 +#: smalldialogs.cpp:530 #, kde-format msgid "Example history entry start line (without leading comment):" msgstr "" "Eksempel på startlinje for historieoppføring (uten innledende kommentar):" -#: smalldialogs.cpp:522 +#: smalldialogs.cpp:532 #, kde-format msgid "" "Copy a history entry start line as used in your files,\n" @@ -3343,47 +3344,47 @@ "Kopier en startlinje for historieoppføring fra en av filene dine,\n" "men ta bort den innledende kommentaren." -#: smalldialogs.cpp:536 +#: smalldialogs.cpp:546 #, kde-format msgid "Sort key result:" msgstr "Resulterende sorteringsnøkler:" -#: smalldialogs.cpp:584 smalldialogs.cpp:594 smalldialogs.cpp:614 +#: smalldialogs.cpp:594 smalldialogs.cpp:604 smalldialogs.cpp:624 #, kde-format msgid "Match success." msgstr "Tilslag." -#: smalldialogs.cpp:588 smalldialogs.cpp:598 smalldialogs.cpp:620 +#: smalldialogs.cpp:598 smalldialogs.cpp:608 smalldialogs.cpp:630 #, kde-format msgid "Match failed." msgstr "Ikke tilslag." -#: smalldialogs.cpp:605 +#: smalldialogs.cpp:615 #, kde-format msgid "Opening and closing parentheses do not match in regular expression." msgstr "Begynn- og sluttparenteser stemmer ikke overens i regulært uttrykk." -#: SourceData.cpp:150 +#: SourceData.cpp:153 #, kde-format msgid "Writing clipboard data to temp file failed." msgstr "Klarte ikke å skrive fra utklippstavla til midlertidig fil." -#: SourceData.cpp:154 +#: SourceData.cpp:157 #, kde-format msgid "From Clipboard" msgstr "Fra utklippstavla" -#: SourceData.cpp:335 +#: SourceData.cpp:348 #, kde-format msgid "%1 is not a normal file." msgstr "" -#: SourceData.cpp:427 +#: SourceData.cpp:440 #, kde-format msgid " Temp file is: %1" msgstr "" -#: SourceData.cpp:432 +#: SourceData.cpp:445 #, kde-format msgid "" "Preprocessing possibly failed. Check this command:\n" @@ -3398,12 +3399,12 @@ "\n" "Kommandoen for forarbeide blir nå slått av." -#: SourceData.cpp:443 SourceData.cpp:512 +#: SourceData.cpp:456 SourceData.cpp:525 #, kde-format msgid "File %1 too large to process. Skipping." msgstr "" -#: SourceData.cpp:487 +#: SourceData.cpp:500 #, kde-format msgid "" "The line-matching-preprocessing possibly failed. Check this command:\n" diff -Nru kdiff3-1.8.01/po/nds/kdiff3fileitemactionplugin.po kdiff3-1.8.3/po/nds/kdiff3fileitemactionplugin.po --- kdiff3-1.8.01/po/nds/kdiff3fileitemactionplugin.po 2019-05-18 01:02:16.000000000 +0000 +++ kdiff3-1.8.3/po/nds/kdiff3fileitemactionplugin.po 2020-06-25 00:18:39.000000000 +0000 @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: kdiff3fileitemactionplugin\n" -"Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2019-03-22 03:09+0100\n" +"Report-Msgid-Bugs-To: https://bugs.kde.org\n" +"POT-Creation-Date: 2019-08-30 07:40+0200\n" "PO-Revision-Date: 2011-09-21 07:00+0200\n" "Last-Translator: Manfred Wiese \n" "Language-Team: Low Saxon \n" diff -Nru kdiff3-1.8.01/po/nds/kdiff3.po kdiff3-1.8.3/po/nds/kdiff3.po --- kdiff3-1.8.01/po/nds/kdiff3.po 2019-05-18 01:02:16.000000000 +0000 +++ kdiff3-1.8.3/po/nds/kdiff3.po 2020-06-25 00:18:39.000000000 +0000 @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: kdiff3\n" -"Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2019-04-18 08:02+0200\n" +"Report-Msgid-Bugs-To: https://bugs.kde.org\n" +"POT-Creation-Date: 2020-06-22 07:48+0200\n" "PO-Revision-Date: 2011-10-09 21:25+0200\n" "Last-Translator: Manfred Wiese \n" "Language-Team: Low Saxon \n" @@ -28,291 +28,291 @@ msgid "Your emails" msgstr "s_dibbern@web.de" -#: difftextwindow.cpp:412 +#: difftextwindow.cpp:414 #, kde-format msgid "File %1: Line %2" msgstr "" -#: difftextwindow.cpp:414 +#: difftextwindow.cpp:416 #, fuzzy, kde-format #| msgid "Line not available" msgid "File %1: Line not available" msgstr "Reeg nich verföögbor" -#: difftextwindow.cpp:1780 +#: difftextwindow.cpp:1778 #, kde-format msgid "Encoding:" msgstr "Koderen:" -#: difftextwindow.cpp:1782 mergeresultwindow.cpp:3138 optiondialog.cpp:818 +#: difftextwindow.cpp:1781 mergeresultwindow.cpp:3166 optiondialog.cpp:840 #, kde-format msgid "Line end style:" msgstr "Reegenn-Stil:" -#: difftextwindow.cpp:1810 directorymergewindow.cpp:382 -#: directorymergewindow.cpp:433 directorymergewindow.cpp:524 -#: directorymergewindow.cpp:3058 directorymergewindow.cpp:3189 -#: directorymergewindow.cpp:3417 mergeresultwindow.cpp:942 -#: mergeresultwindow.cpp:944 mergeresultwindow.cpp:946 -#: mergeresultwindow.cpp:948 mergeresultwindow.cpp:1814 -#: mergeresultwindow.cpp:3170 mergeresultwindow.cpp:3177 optiondialog.cpp:962 -#: optiondialog.cpp:975 pdiff.cpp:833 pdiff.cpp:835 pdiff.cpp:837 pdiff.cpp:839 -#: pdiff.cpp:861 smalldialogs.cpp:124 smalldialogs.cpp:126 smalldialogs.cpp:127 -#: smalldialogs.cpp:130 +#: difftextwindow.cpp:1809 directorymergewindow.cpp:383 +#: directorymergewindow.cpp:434 directorymergewindow.cpp:525 +#: directorymergewindow.cpp:3072 directorymergewindow.cpp:3203 +#: directorymergewindow.cpp:3431 mergeresultwindow.cpp:970 +#: mergeresultwindow.cpp:972 mergeresultwindow.cpp:974 +#: mergeresultwindow.cpp:976 mergeresultwindow.cpp:1842 +#: mergeresultwindow.cpp:3198 mergeresultwindow.cpp:3205 optiondialog.cpp:1002 +#: optiondialog.cpp:1015 pdiff.cpp:823 pdiff.cpp:825 pdiff.cpp:827 +#: pdiff.cpp:829 pdiff.cpp:851 smalldialogs.cpp:131 smalldialogs.cpp:133 +#: smalldialogs.cpp:134 smalldialogs.cpp:137 #, kde-format msgid "A" msgstr "A" -#: difftextwindow.cpp:1810 directorymergewindow.cpp:384 -#: directorymergewindow.cpp:436 directorymergewindow.cpp:526 -#: directorymergewindow.cpp:3064 directorymergewindow.cpp:3190 -#: directorymergewindow.cpp:3418 mergeresultwindow.cpp:942 -#: mergeresultwindow.cpp:944 mergeresultwindow.cpp:950 -#: mergeresultwindow.cpp:952 mergeresultwindow.cpp:1816 -#: mergeresultwindow.cpp:3172 mergeresultwindow.cpp:3179 optiondialog.cpp:963 -#: optiondialog.cpp:976 pdiff.cpp:833 pdiff.cpp:835 pdiff.cpp:841 pdiff.cpp:843 -#: pdiff.cpp:863 smalldialogs.cpp:124 smalldialogs.cpp:125 smalldialogs.cpp:128 -#: smalldialogs.cpp:131 +#: difftextwindow.cpp:1809 directorymergewindow.cpp:385 +#: directorymergewindow.cpp:437 directorymergewindow.cpp:527 +#: directorymergewindow.cpp:3078 directorymergewindow.cpp:3204 +#: directorymergewindow.cpp:3432 mergeresultwindow.cpp:970 +#: mergeresultwindow.cpp:972 mergeresultwindow.cpp:978 +#: mergeresultwindow.cpp:980 mergeresultwindow.cpp:1844 +#: mergeresultwindow.cpp:3200 mergeresultwindow.cpp:3207 optiondialog.cpp:1003 +#: optiondialog.cpp:1016 pdiff.cpp:823 pdiff.cpp:825 pdiff.cpp:831 +#: pdiff.cpp:833 pdiff.cpp:853 smalldialogs.cpp:131 smalldialogs.cpp:132 +#: smalldialogs.cpp:135 smalldialogs.cpp:138 #, kde-format msgid "B" msgstr "B" -#: difftextwindow.cpp:1810 directorymergewindow.cpp:386 -#: directorymergewindow.cpp:439 directorymergewindow.cpp:528 -#: directorymergewindow.cpp:3070 directorymergewindow.cpp:3191 -#: directorymergewindow.cpp:3419 mergeresultwindow.cpp:946 -#: mergeresultwindow.cpp:948 mergeresultwindow.cpp:950 -#: mergeresultwindow.cpp:952 mergeresultwindow.cpp:1818 -#: mergeresultwindow.cpp:3174 mergeresultwindow.cpp:3181 optiondialog.cpp:977 -#: pdiff.cpp:837 pdiff.cpp:839 pdiff.cpp:841 pdiff.cpp:843 pdiff.cpp:865 -#: smalldialogs.cpp:125 smalldialogs.cpp:126 smalldialogs.cpp:129 -#: smalldialogs.cpp:132 +#: difftextwindow.cpp:1809 directorymergewindow.cpp:387 +#: directorymergewindow.cpp:440 directorymergewindow.cpp:529 +#: directorymergewindow.cpp:3084 directorymergewindow.cpp:3205 +#: directorymergewindow.cpp:3433 mergeresultwindow.cpp:974 +#: mergeresultwindow.cpp:976 mergeresultwindow.cpp:978 +#: mergeresultwindow.cpp:980 mergeresultwindow.cpp:1846 +#: mergeresultwindow.cpp:3202 mergeresultwindow.cpp:3209 optiondialog.cpp:1017 +#: pdiff.cpp:827 pdiff.cpp:829 pdiff.cpp:831 pdiff.cpp:833 pdiff.cpp:855 +#: smalldialogs.cpp:132 smalldialogs.cpp:133 smalldialogs.cpp:136 +#: smalldialogs.cpp:139 #, kde-format msgid "C" msgstr "C" -#: difftextwindow.cpp:1810 +#: difftextwindow.cpp:1809 #, fuzzy, kde-format #| msgid "A (Base):" msgid "A (Base)" msgstr "A (Basis):" -#: difftextwindow.cpp:1812 +#: difftextwindow.cpp:1811 #, fuzzy, kde-format #| msgid "Encoding:" msgid "Encoding: %1" msgstr "Koderen:" -#: difftextwindow.cpp:1813 mergeresultwindow.cpp:3183 +#: difftextwindow.cpp:1812 mergeresultwindow.cpp:3211 #, kde-format msgid "Unix" msgstr "Unix" -#: difftextwindow.cpp:1813 mergeresultwindow.cpp:3184 +#: difftextwindow.cpp:1812 mergeresultwindow.cpp:3212 #, kde-format msgid "DOS" msgstr "DOS" -#: difftextwindow.cpp:1813 +#: difftextwindow.cpp:1812 #, fuzzy, kde-format #| msgid "Line end style:" msgid "Line end style: %1" msgstr "Reegenn-Stil:" -#: difftextwindow.cpp:1835 kdiff3.cpp:873 +#: difftextwindow.cpp:1834 kdiff3.cpp:874 #, kde-format msgid "Top line" msgstr "Böverst Reeg" -#: difftextwindow.cpp:1845 +#: difftextwindow.cpp:1843 #, kde-format msgid "End" msgstr "Enn" -#: difftextwindow.cpp:1903 smalldialogs.cpp:235 +#: difftextwindow.cpp:1901 smalldialogs.cpp:245 #, fuzzy, kde-format #| msgid "Opening files..." msgid "Open File" msgstr "Dateien warrt opmaakt..." -#: difftextwindow.cpp:1951 optiondialog.cpp:387 +#: difftextwindow.cpp:1943 optiondialog.cpp:389 #, kde-format msgid "Unicode, 8 bit" msgstr "Unicode, 8 Bit" -#: difftextwindow.cpp:1966 +#: difftextwindow.cpp:1958 #, kde-format msgid "Other" msgstr "" -#: directorymergewindow.cpp:409 directorymergewindow.cpp:3424 +#: directorymergewindow.cpp:410 directorymergewindow.cpp:3438 #, kde-format msgid "Copy A to B" msgstr "A op B koperen" -#: directorymergewindow.cpp:412 directorymergewindow.cpp:3425 +#: directorymergewindow.cpp:413 directorymergewindow.cpp:3439 #, kde-format msgid "Copy B to A" msgstr "B op A koperen" -#: directorymergewindow.cpp:415 directorymergewindow.cpp:3426 +#: directorymergewindow.cpp:416 directorymergewindow.cpp:3440 #, kde-format msgid "Delete A" msgstr "A wegdoon" -#: directorymergewindow.cpp:418 directorymergewindow.cpp:3427 +#: directorymergewindow.cpp:419 directorymergewindow.cpp:3441 #, kde-format msgid "Delete B" msgstr "B wegdoon" -#: directorymergewindow.cpp:421 +#: directorymergewindow.cpp:422 #, kde-format msgid "Delete A & B" msgstr "A un B wegdoon" -#: directorymergewindow.cpp:424 directorymergewindow.cpp:3429 +#: directorymergewindow.cpp:425 directorymergewindow.cpp:3443 #, kde-format msgid "Merge to A" msgstr "Mit A tosamenföhren" -#: directorymergewindow.cpp:427 directorymergewindow.cpp:3430 +#: directorymergewindow.cpp:428 directorymergewindow.cpp:3444 #, kde-format msgid "Merge to B" msgstr "Mit B tosamenföhren" -#: directorymergewindow.cpp:430 +#: directorymergewindow.cpp:431 #, kde-format msgid "Merge to A & B" msgstr "Mit A un B tosamenföhren" -#: directorymergewindow.cpp:442 directorymergewindow.cpp:3421 +#: directorymergewindow.cpp:443 directorymergewindow.cpp:3435 #, kde-format msgid "Delete (if exists)" msgstr "Wegdoon (wenn vörhannen)" -#: directorymergewindow.cpp:445 directorymergewindow.cpp:448 -#: directorymergewindow.cpp:3420 optiondialog.cpp:925 smalldialogs.cpp:113 +#: directorymergewindow.cpp:446 directorymergewindow.cpp:449 +#: directorymergewindow.cpp:3434 smalldialogs.cpp:120 #, kde-format msgid "Merge" msgstr "Tosamenföhren" -#: directorymergewindow.cpp:445 directorymergewindow.cpp:448 +#: directorymergewindow.cpp:446 directorymergewindow.cpp:449 #, kde-format msgid "Merge (manual)" msgstr "Tosamenföhren (vun Hand)" -#: directorymergewindow.cpp:451 +#: directorymergewindow.cpp:452 #, kde-format msgid "Error: Conflicting File Types" msgstr "Fehler: Inkompatibel Dateitypen" -#: directorymergewindow.cpp:454 +#: directorymergewindow.cpp:455 #, kde-format msgid "Error: Changed and Deleted" msgstr "Fehler: Ännert un wegdaan" -#: directorymergewindow.cpp:457 +#: directorymergewindow.cpp:458 #, kde-format msgid "Error: Dates are equal but files are not." msgstr "Fehler: De Daten sünd liek, man de Dateien nich." -#: directorymergewindow.cpp:471 +#: directorymergewindow.cpp:472 #, fuzzy, kde-format #| msgid "Done." msgid "Done" msgstr "Afslaten." -#: directorymergewindow.cpp:473 +#: directorymergewindow.cpp:474 #, kde-format msgid "Error" msgstr "Fehler" -#: directorymergewindow.cpp:475 +#: directorymergewindow.cpp:476 #, kde-format msgid "Skipped." msgstr "Utlaten." -#: directorymergewindow.cpp:477 +#: directorymergewindow.cpp:478 #, kde-format msgid "Not saved." msgstr "Nich sekert" -#: directorymergewindow.cpp:479 +#: directorymergewindow.cpp:480 #, kde-format msgid "In progress..." msgstr "In de Maak..." -#: directorymergewindow.cpp:481 +#: directorymergewindow.cpp:482 #, kde-format msgid "To do." msgstr "Opgaav" -#: directorymergewindow.cpp:522 +#: directorymergewindow.cpp:523 #, kde-format msgid "Name" msgstr "Naam" -#: directorymergewindow.cpp:530 +#: directorymergewindow.cpp:531 #, kde-format msgid "Operation" msgstr "Akschoon" -#: directorymergewindow.cpp:532 +#: directorymergewindow.cpp:533 #, kde-format msgid "Status" msgstr "Status" -#: directorymergewindow.cpp:534 +#: directorymergewindow.cpp:535 #, kde-format msgid "Unsolved" msgstr "Nich oplööst" -#: directorymergewindow.cpp:536 +#: directorymergewindow.cpp:537 #, kde-format msgid "Solved" msgstr "Oplööst" -#: directorymergewindow.cpp:538 +#: directorymergewindow.cpp:539 #, kde-format msgid "Nonwhite" msgstr "Nichfree" -#: directorymergewindow.cpp:540 +#: directorymergewindow.cpp:541 #, kde-format msgid "White" msgstr "Free" -#: directorymergewindow.cpp:674 +#: directorymergewindow.cpp:676 #, kde-format msgid "Unable to compare non-normal file with normal file." msgstr "" -#: directorymergewindow.cpp:688 +#: directorymergewindow.cpp:690 #, kde-format msgid "Mix of links and normal files." msgstr "Mischen vun Links un normaal Dateien" -#: directorymergewindow.cpp:695 +#: directorymergewindow.cpp:697 #, kde-format msgid "Link: " msgstr "Link: " -#: directorymergewindow.cpp:704 +#: directorymergewindow.cpp:706 #, kde-format msgid "Size. " msgstr "Grött: " -#: directorymergewindow.cpp:718 directorymergewindow.cpp:728 +#: directorymergewindow.cpp:720 directorymergewindow.cpp:730 #, kde-format msgid "Date & Size: " msgstr "Datum un Grött: " -#: directorymergewindow.cpp:748 +#: directorymergewindow.cpp:751 #, kde-format msgid "Comparing file..." msgstr "Datei warrt vergleken..." -#: directorymergewindow.cpp:801 +#: directorymergewindow.cpp:813 #, kde-format msgid "" "You are currently doing a directory merge. Are you sure, you want to abort " @@ -321,48 +321,48 @@ "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:802 kdiff3.cpp:698 kdiff3.cpp:708 kdiff3.cpp:720 -#: mergeresultwindow.cpp:372 pdiff.cpp:1033 pdiff.cpp:1910 pdiff.cpp:1920 +#: directorymergewindow.cpp:814 kdiff3.cpp:697 kdiff3.cpp:707 kdiff3.cpp:719 +#: mergeresultwindow.cpp:400 pdiff.cpp:1031 pdiff.cpp:1920 pdiff.cpp:1930 #, kde-format msgid "Warning" msgstr "Wohrschoen" -#: directorymergewindow.cpp:803 directorymergewindow.cpp:3393 +#: directorymergewindow.cpp:815 directorymergewindow.cpp:3407 #, kde-format msgid "Rescan" msgstr "Nieg dörkieken" -#: directorymergewindow.cpp:804 pdiff.cpp:1035 +#: directorymergewindow.cpp:816 pdiff.cpp:1033 #, kde-format msgid "Continue Merging" msgstr "Tosamenföhren wiedermaken" -#: directorymergewindow.cpp:971 +#: directorymergewindow.cpp:984 #, kde-format msgid "Opening of directories failed:" msgstr "Opmaken vun Ornern fehlslaan:" -#: directorymergewindow.cpp:975 +#: directorymergewindow.cpp:988 #, 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:980 +#: directorymergewindow.cpp:993 #, 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:985 +#: directorymergewindow.cpp:998 #, 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:988 +#: directorymergewindow.cpp:1001 #, kde-format msgid "Directory Open Error" msgstr "Fehler bi't Ornern-Opmaken" -#: directorymergewindow.cpp:996 +#: directorymergewindow.cpp:1009 #, kde-format msgid "" "The destination directory must not be the same as A or B when three " @@ -374,49 +374,49 @@ "\n" "Prööv dat bitte, ehr Du wiedermaakst." -#: directorymergewindow.cpp:998 +#: directorymergewindow.cpp:1011 #, kde-format msgid "Parameter Warning" msgstr "Parameter-Wohrschoen" -#: directorymergewindow.cpp:1003 +#: directorymergewindow.cpp:1016 #, kde-format msgid "Scanning directories..." msgstr "Ornern warrt dörkeken..." -#: directorymergewindow.cpp:1029 +#: directorymergewindow.cpp:1042 #, kde-format msgid "Reading Directory A" msgstr "Orner A warrt leest" -#: directorymergewindow.cpp:1038 +#: directorymergewindow.cpp:1051 #, kde-format msgid "Reading Directory B" msgstr "Orner B warrt leest" -#: directorymergewindow.cpp:1048 +#: directorymergewindow.cpp:1061 #, kde-format msgid "Reading Directory C" msgstr "Orner C warrt leest" -#: directorymergewindow.cpp:1064 +#: directorymergewindow.cpp:1077 #, kde-format msgid "Some subdirectories were not readable in" msgstr "En Reeg Ünnerornern lett sik nich lesen binnen" -#: directorymergewindow.cpp:1069 +#: directorymergewindow.cpp:1082 #, kde-format msgid "Check the permissions of the subdirectories." msgstr "Prööv bitte de Verlöven vun de Ünnerornern." -#: directorymergewindow.cpp:1106 kdiff3.cpp:666 kdiff3.cpp:753 kdiff3.cpp:777 -#: kdiff3.cpp:1065 kdiff3.cpp:1086 pdiff.cpp:1116 pdiff.cpp:1170 pdiff.cpp:1218 -#: pdiff.cpp:1234 pdiff.cpp:1277 pdiff.cpp:1301 +#: directorymergewindow.cpp:1119 kdiff3.cpp:665 kdiff3.cpp:752 kdiff3.cpp:776 +#: kdiff3.cpp:1072 kdiff3.cpp:1093 pdiff.cpp:1115 pdiff.cpp:1178 pdiff.cpp:1228 +#: pdiff.cpp:1244 pdiff.cpp:1287 pdiff.cpp:1311 #, kde-format msgid "Ready." msgstr "Praat." -#: directorymergewindow.cpp:1121 +#: directorymergewindow.cpp:1134 #, kde-format msgid "" "Directory Comparison Status\n" @@ -426,23 +426,23 @@ "Number of different files: %3" msgstr "" -#: directorymergewindow.cpp:1128 +#: directorymergewindow.cpp:1141 #, fuzzy, kde-format #| msgid "Number of manual merges:" msgid "Number of manual merges: %1" msgstr "Tall vun Tosamenföhren vun Hand:" -#: directorymergewindow.cpp:1394 +#: directorymergewindow.cpp:1407 #, kde-format msgid "This affects all merge operations." msgstr "Dit bedröppt all Tosamenföhr-Akschonen" -#: directorymergewindow.cpp:1395 +#: directorymergewindow.cpp:1408 #, kde-format msgid "Changing All Merge Operations" msgstr "All Tosamenföhr-Akschonen ännern" -#: directorymergewindow.cpp:1695 +#: directorymergewindow.cpp:1708 #, fuzzy, kde-format #| msgid "Processing " msgid "" @@ -450,45 +450,45 @@ "%3" msgstr "Bi to verarbeiden: " -#: directorymergewindow.cpp:1738 directorymergewindow.cpp:1742 +#: directorymergewindow.cpp:1751 directorymergewindow.cpp:1755 #, kde-format msgid "Some files could not be processed." msgstr "" -#: directorymergewindow.cpp:2222 directorymergewindow.cpp:2247 -#: directorymergewindow.cpp:2271 +#: directorymergewindow.cpp:2235 directorymergewindow.cpp:2260 +#: directorymergewindow.cpp:2285 #, kde-format msgid "This operation is currently not possible." msgstr "Disse Akschoon is opstunns nich mööglich." -#: directorymergewindow.cpp:2222 directorymergewindow.cpp:2247 -#: directorymergewindow.cpp:2271 directorymergewindow.cpp:2552 +#: directorymergewindow.cpp:2235 directorymergewindow.cpp:2260 +#: directorymergewindow.cpp:2285 directorymergewindow.cpp:2565 #, kde-format msgid "Operation Not Possible" msgstr "Akschoon nich mööglich" -#: directorymergewindow.cpp:2318 +#: directorymergewindow.cpp:2332 #, fuzzy, kde-format #| msgid "An error occurred while copying.\n" msgid "An error occurred while copying." msgstr "Dat geev en Fehler bi't Koperen.\n" -#: directorymergewindow.cpp:2319 directorymergewindow.cpp:2759 +#: directorymergewindow.cpp:2333 directorymergewindow.cpp:2772 #, kde-format msgid "Merge Error" msgstr "Tosamenföhr-Fehler" -#: directorymergewindow.cpp:2396 +#: directorymergewindow.cpp:2410 #, kde-format msgid "Unknown merge operation. (This must never happen!)" msgstr "Nich begäng Tosamenföhrakschoon (Dit mutt nienich vörkamen!)" -#: directorymergewindow.cpp:2441 +#: directorymergewindow.cpp:2455 #, kde-format msgid "Unknown merge operation." msgstr "Nich begäng Tosamenföhrakschoon" -#: directorymergewindow.cpp:2454 +#: directorymergewindow.cpp:2468 #, kde-format msgid "" "The merge is about to begin.\n" @@ -509,22 +509,22 @@ "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:2459 +#: directorymergewindow.cpp:2473 #, kde-format msgid "Starting Merge" msgstr "Tosamenföhren starten" -#: directorymergewindow.cpp:2460 +#: directorymergewindow.cpp:2474 #, kde-format msgid "Do It" msgstr "Doon" -#: directorymergewindow.cpp:2461 +#: directorymergewindow.cpp:2475 #, kde-format msgid "Simulate It" msgstr "Simuleren" -#: directorymergewindow.cpp:2487 +#: directorymergewindow.cpp:2501 #, kde-format msgid "" "The highlighted item has a different type in the different directories. " @@ -533,7 +533,7 @@ "De rutheevte Indrag hett binnen de verscheden Ornern verscheden Typen. Wat " "wullt Du doon?" -#: directorymergewindow.cpp:2491 +#: directorymergewindow.cpp:2505 #, kde-format msgid "" "The modification dates of the file are equal but the files are not. Select " @@ -542,7 +542,7 @@ "De Ännerdaten vun de Dateien sünd liek, man de Dateien sünd dat nich. Wat " "wullt Du doon?" -#: directorymergewindow.cpp:2495 +#: directorymergewindow.cpp:2509 #, kde-format msgid "" "The highlighted item was changed in one directory and deleted in the other. " @@ -551,7 +551,7 @@ "De rutheevte Indrag wöör binnen een Orner ännert un ut den anner wegdaan. " "Wat wullt Du doon?" -#: directorymergewindow.cpp:2552 +#: directorymergewindow.cpp:2565 #, kde-format msgid "" "This operation is currently not possible because directory merge is " @@ -560,7 +560,7 @@ "Disse Akschoon lett sik opstunns nich utföhren, dor löppt en Orner-" "Tosamenföhren." -#: directorymergewindow.cpp:2609 +#: directorymergewindow.cpp:2622 #, kde-format msgid "" "There was an error in the last step.\n" @@ -571,32 +571,32 @@ "Wullt Du mit dat Element wiedermaken, dat den Fehler utlööst hett, oder " "wullt Du dat utlaten?" -#: directorymergewindow.cpp:2611 +#: directorymergewindow.cpp:2624 #, kde-format msgid "Continue merge after an error" msgstr "Tosamenföhren na Fehler wiedermaken" -#: directorymergewindow.cpp:2612 +#: directorymergewindow.cpp:2625 #, kde-format msgid "Continue With Last Item" msgstr "Mit verleden Element wiedermaken" -#: directorymergewindow.cpp:2613 +#: directorymergewindow.cpp:2626 #, kde-format msgid "Skip Item" msgstr "Element utlaten" -#: directorymergewindow.cpp:2709 +#: directorymergewindow.cpp:2722 #, kde-format msgid "Merge operation complete." msgstr "Tosamenföhren afslaten." -#: directorymergewindow.cpp:2709 directorymergewindow.cpp:2712 +#: directorymergewindow.cpp:2722 directorymergewindow.cpp:2725 #, kde-format msgid "Merge Complete" msgstr "Tosamenföhren afslaten" -#: directorymergewindow.cpp:2722 +#: directorymergewindow.cpp:2735 #, kde-format msgid "" "Simulated merge complete: Check if you agree with the proposed operations." @@ -604,7 +604,7 @@ "Dat simuleerte Tosamensmölten is afslaten Kiek, wat Du de vörslaan Akschonen " "utföhren wullt." -#: directorymergewindow.cpp:2758 +#: directorymergewindow.cpp:2771 #, fuzzy, kde-format #| msgid "An error occurred. Press OK to see detailed information.\n" msgid "An error occurred. Press OK to see detailed information." @@ -612,43 +612,43 @@ "Dat hett en Fehler geven. Klick op OK, wenn Du de Enkelheiten ankieken " "wullt.\n" -#: directorymergewindow.cpp:2791 +#: directorymergewindow.cpp:2804 #, kde-format msgid "Error: While deleting %1: Creating backup failed." msgstr "" "Fehler bi't Wegdoon vun \"%1\": Opstellen vun Sekerheitkopie fehlslaan." -#: directorymergewindow.cpp:2798 +#: directorymergewindow.cpp:2811 #, kde-format msgid "delete directory recursively( %1 )" msgstr "Orner un Ünnerornern wegdoon (%1)" -#: directorymergewindow.cpp:2800 +#: directorymergewindow.cpp:2813 #, kde-format msgid "delete( %1 )" msgstr "wegdoon (%1)" -#: directorymergewindow.cpp:2815 +#: directorymergewindow.cpp:2828 #, kde-format 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:2834 +#: directorymergewindow.cpp:2847 #, kde-format msgid "Error: rmdir( %1 ) operation failed." msgstr "Fehler: rmdir-Akschoon (%1) fehlslaan." -#: directorymergewindow.cpp:2844 +#: directorymergewindow.cpp:2857 #, kde-format msgid "Error: delete operation failed." msgstr "Fehler: Wegdoon fehlslaan." -#: directorymergewindow.cpp:2870 +#: directorymergewindow.cpp:2884 #, kde-format msgid "manual merge( %1, %2, %3 -> %4)" msgstr "Vun Hand tosamenföhren (%1, %2, %3 -> %4)" -#: directorymergewindow.cpp:2873 +#: directorymergewindow.cpp:2887 #, kde-format msgid "" " Note: After a manual merge the user should continue by pressing F7." @@ -656,183 +656,183 @@ " Beacht bitte: Na't Tosamenföhren vun Hand schull de Bruker mit F7 " "wiedermaken" -#: directorymergewindow.cpp:2900 +#: directorymergewindow.cpp:2914 #, 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:2909 +#: directorymergewindow.cpp:2923 #, kde-format msgid "copyLink( %1 -> %2 )" msgstr "Link koperen (%1 -> %2)" -#: directorymergewindow.cpp:2918 +#: directorymergewindow.cpp:2932 #, kde-format 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:2928 +#: directorymergewindow.cpp:2942 #, kde-format msgid "Error: copyLink failed." msgstr "Fehler: Koperen vun Link fehlslaan." -#: directorymergewindow.cpp:2953 +#: directorymergewindow.cpp:2967 #, kde-format msgid "copy( %1 -> %2 )" msgstr "Koperen (%1 -> %2)" -#: directorymergewindow.cpp:2979 +#: directorymergewindow.cpp:2993 #, 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:2986 +#: directorymergewindow.cpp:3000 #, kde-format msgid "rename( %1 -> %2 )" msgstr "Ümnömen (%1 -> %2)" -#: directorymergewindow.cpp:2995 +#: directorymergewindow.cpp:3009 #, kde-format msgid "Error: Rename failed." msgstr "Fehler: Ümnömen fehlslaan." -#: directorymergewindow.cpp:3013 +#: directorymergewindow.cpp:3027 #, 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:3030 +#: directorymergewindow.cpp:3044 #, kde-format msgid "makeDir( %1 )" msgstr "Orner opstellen (%1)" -#: directorymergewindow.cpp:3040 +#: directorymergewindow.cpp:3054 #, kde-format msgid "Error while creating directory." msgstr "Fehler bi't Opstellen vun Orner." -#: directorymergewindow.cpp:3076 directorymergewindow.cpp:3195 +#: directorymergewindow.cpp:3090 directorymergewindow.cpp:3209 #, kde-format msgid "Dest" msgstr "Teel" -#: directorymergewindow.cpp:3084 directorymergewindow.cpp:3113 +#: directorymergewindow.cpp:3098 directorymergewindow.cpp:3127 #, kde-format msgid "Dir" msgstr "Orner" -#: directorymergewindow.cpp:3084 +#: directorymergewindow.cpp:3098 #, kde-format msgid "Type" msgstr "Typ" -#: directorymergewindow.cpp:3084 +#: directorymergewindow.cpp:3098 #, kde-format msgid "Size" msgstr "Grött" -#: directorymergewindow.cpp:3085 +#: directorymergewindow.cpp:3099 #, kde-format msgid "Attr" msgstr "Attr" -#: directorymergewindow.cpp:3085 +#: directorymergewindow.cpp:3099 #, kde-format msgid "Last Modification" msgstr "Verleden Ännern" -#: directorymergewindow.cpp:3085 +#: directorymergewindow.cpp:3099 #, kde-format msgid "Link-Destination" msgstr "Link-Teel" -#: directorymergewindow.cpp:3113 +#: directorymergewindow.cpp:3127 #, kde-format msgid "File" msgstr "Datei" -#: directorymergewindow.cpp:3113 +#: directorymergewindow.cpp:3127 #, fuzzy, kde-format #| msgid "Link: " msgid "-Link" msgstr "Link: " -#: directorymergewindow.cpp:3119 +#: directorymergewindow.cpp:3133 #, kde-format msgid "not available" msgstr "nich verföögbor" -#: directorymergewindow.cpp:3137 +#: directorymergewindow.cpp:3151 #, kde-format msgid "A (Dest): " msgstr "A (Teel): " -#: directorymergewindow.cpp:3141 +#: directorymergewindow.cpp:3155 #, kde-format msgid "A: " msgstr "" -#: directorymergewindow.cpp:3141 +#: directorymergewindow.cpp:3155 #, kde-format msgid "A (Base): " msgstr "B (Grundl.): " -#: directorymergewindow.cpp:3147 +#: directorymergewindow.cpp:3161 #, kde-format msgid "B (Dest): " msgstr "B (Teel): " -#: directorymergewindow.cpp:3151 +#: directorymergewindow.cpp:3165 #, kde-format msgid "B: " msgstr "" -#: directorymergewindow.cpp:3156 +#: directorymergewindow.cpp:3170 #, kde-format msgid "C (Dest): " msgstr "C (Teel): " -#: directorymergewindow.cpp:3160 +#: directorymergewindow.cpp:3174 #, kde-format msgid "C: " msgstr "" -#: directorymergewindow.cpp:3163 +#: directorymergewindow.cpp:3177 #, kde-format msgid "Dest: " msgstr "Teel: " #. i18n("Saving Directory Merge State ...")); -#: directorymergewindow.cpp:3238 +#: directorymergewindow.cpp:3252 #, kde-format msgid "Save Directory Merge State As..." msgstr "Orner-Tosamenföhrstatus sekern as..." -#: directorymergewindow.cpp:3387 +#: directorymergewindow.cpp:3401 #, kde-format msgid "Start/Continue Directory Merge" msgstr "Orner-Tosamenföhren starten/wiedermaken" -#: directorymergewindow.cpp:3388 +#: directorymergewindow.cpp:3402 #, kde-format msgid "Run Operation for Current Item" msgstr "Akschoon mit aktuell Element utföhren" -#: directorymergewindow.cpp:3389 +#: directorymergewindow.cpp:3403 #, kde-format msgid "Compare Selected File" msgstr "Utsöcht Datei verglieken" -#: directorymergewindow.cpp:3390 +#: directorymergewindow.cpp:3404 #, kde-format msgid "Merge Current File" msgstr "Aktuell Datei tosamenföhren" -#: directorymergewindow.cpp:3390 +#: directorymergewindow.cpp:3404 #, kde-format msgid "" "Merge\n" @@ -841,51 +841,51 @@ "Datei\n" "tosamenföhren" -#: directorymergewindow.cpp:3391 +#: directorymergewindow.cpp:3405 #, kde-format msgid "Fold All Subdirs" msgstr "All Ünnerornern infoolden" -#: directorymergewindow.cpp:3392 +#: directorymergewindow.cpp:3406 #, kde-format msgid "Unfold All Subdirs" msgstr "All Ünnerornern utfoolden" #. i18n("Save Directory Merge State ..."), 0, this, &DirectoryMergeWindow::slotSaveMergeState, ac, "dir_save_merge_state"); #. i18n("Load Directory Merge State ..."), 0, this, &DirectoryMergeWindow::slotLoadMergeState, ac, "dir_load_merge_state"); -#: directorymergewindow.cpp:3396 +#: directorymergewindow.cpp:3410 #, kde-format msgid "Choose A for All Items" msgstr "A bi all Indrääg utsöken" -#: directorymergewindow.cpp:3397 +#: directorymergewindow.cpp:3411 #, kde-format msgid "Choose B for All Items" msgstr "B bi all Indrääg utsöken" -#: directorymergewindow.cpp:3398 +#: directorymergewindow.cpp:3412 #, kde-format msgid "Choose C for All Items" msgstr "C bi all Indrääg utsöken" -#: directorymergewindow.cpp:3399 +#: directorymergewindow.cpp:3413 #, kde-format msgid "Auto-Choose Operation for All Items" msgstr "Akschoon bi all Indrääg automaatsch utsöken" -#: directorymergewindow.cpp:3400 +#: directorymergewindow.cpp:3414 #, kde-format msgid "No Operation for All Items" msgstr "Keen Akschoon för all Indrääg" #. i18n("Synchronize Directories"), 0, this, &DirectoryMergeWindow::slotSynchronizeDirectories, ac, "dir_synchronize_directories"); #. d->m_pDirChooseNewerFiles = GuiUtils::createAction< KToggleAction >(i18n("Copy Newer Files Instead of Merging"), 0, this, &DirectoryMergeWindow::slotChooseNewerFiles, ac, "dir_choose_newer_files"); -#: directorymergewindow.cpp:3405 +#: directorymergewindow.cpp:3419 #, kde-format msgid "Show Identical Files" msgstr "Liek Dateien wiesen" -#: directorymergewindow.cpp:3405 +#: directorymergewindow.cpp:3419 #, kde-format msgid "" "Identical\n" @@ -894,17 +894,17 @@ "Liek\n" "Dateien" -#: directorymergewindow.cpp:3406 +#: directorymergewindow.cpp:3420 #, kde-format msgid "Show Different Files" msgstr "Verscheden Dateien wiesen" -#: directorymergewindow.cpp:3407 +#: directorymergewindow.cpp:3421 #, kde-format msgid "Show Files only in A" msgstr "Dateien bloots in A wiesen" -#: directorymergewindow.cpp:3407 +#: directorymergewindow.cpp:3421 #, kde-format msgid "" "Files\n" @@ -913,12 +913,12 @@ "Dateien\n" "bloots in A" -#: directorymergewindow.cpp:3408 +#: directorymergewindow.cpp:3422 #, kde-format msgid "Show Files only in B" msgstr "Dateien bloots in B wiesen" -#: directorymergewindow.cpp:3408 +#: directorymergewindow.cpp:3422 #, kde-format msgid "" "Files\n" @@ -927,12 +927,12 @@ "Dateien\n" "bloots in B" -#: directorymergewindow.cpp:3409 +#: directorymergewindow.cpp:3423 #, kde-format msgid "Show Files only in C" msgstr "Dateien bloots in C wiesen" -#: directorymergewindow.cpp:3409 +#: directorymergewindow.cpp:3423 #, kde-format msgid "" "Files\n" @@ -941,55 +941,60 @@ "Dateien\n" "bloots in C" -#: directorymergewindow.cpp:3413 +#: directorymergewindow.cpp:3427 #, kde-format msgid "Compare Explicitly Selected Files" msgstr "Utsöcht Dateien verglieken" -#: directorymergewindow.cpp:3414 +#: directorymergewindow.cpp:3428 #, kde-format msgid "Merge Explicitly Selected Files" msgstr "Utsöcht Dateien tosamenföhren" -#: directorymergewindow.cpp:3416 directorymergewindow.cpp:3423 +#: directorymergewindow.cpp:3430 directorymergewindow.cpp:3437 #, kde-format msgid "Do Nothing" msgstr "Nix doon" -#: directorymergewindow.cpp:3428 +#: directorymergewindow.cpp:3442 #, kde-format msgid "Delete A && B" msgstr "A un B wegdoon" -#: directorymergewindow.cpp:3431 +#: directorymergewindow.cpp:3445 #, kde-format msgid "Merge to A && B" msgstr "Na A un B tosamenföhren" -#: fileaccess.cpp:462 SourceData.cpp:493 +#: fileaccess.cpp:301 +#, kde-format +msgid "Unable to determine full url. No parent specified." +msgstr "" + +#: fileaccess.cpp:482 SourceData.cpp:506 #, fuzzy, kde-format #| msgid "Reading file: %1" msgid "Failed to read file: %1" msgstr "Datei warrt leest: %1" -#: fileaccess.cpp:587 +#: fileaccess.cpp:624 #, kde-format msgid "Creating temp copy of %1 failed." msgstr "Temporeerkopie vun \"%1\" lett sik nich opstellen" -#: fileaccess.cpp:595 fileaccess.cpp:600 +#: fileaccess.cpp:632 fileaccess.cpp:637 #, fuzzy, kde-format #| msgid "Opening %1 failed." msgid "Opening %1 failed. %2" msgstr "\"%1\" lett sik nich opmaken" -#: fileaccess.cpp:619 fileaccess.cpp:627 +#: fileaccess.cpp:656 fileaccess.cpp:664 #, fuzzy, kde-format #| msgid "Error reading from %1" msgid "Error reading from %1. %2" msgstr "\"%1\" lett sik nich lesen" -#: fileaccess.cpp:751 +#: fileaccess.cpp:788 #, fuzzy, kde-format #| msgid "" #| "While trying to make a backup, deleting an older backup failed. \n" @@ -1002,7 +1007,7 @@ "wegdoon.\n" "Dateinaam: " -#: fileaccess.cpp:758 +#: fileaccess.cpp:795 #, fuzzy, kde-format #| msgid "" #| "While trying to make a backup, renaming failed. \n" @@ -1014,179 +1019,179 @@ "Bi't Opstellen vun en Sekerheitkopie lett sik en Datei nich ümnömen.\n" "Dateinaams: " -#: fileaccess.cpp:828 +#: fileaccess.cpp:865 #, kde-format msgid "Getting file status: %1" msgstr "Dateistatus warrt leest: %1" -#: fileaccess.cpp:869 +#: fileaccess.cpp:906 #, kde-format msgid "Reading file: %1" msgstr "Datei warrt leest: %1" -#: fileaccess.cpp:907 +#: fileaccess.cpp:944 #, kde-format msgid "Writing file: %1" msgstr "Datei warrt schreven: %1" -#: fileaccess.cpp:940 +#: fileaccess.cpp:977 #, kde-format msgid "Out of memory" msgstr "Nich noog Spieker" -#: fileaccess.cpp:976 +#: fileaccess.cpp:1013 #, kde-format msgid "Making directory: %1" msgstr "Orner warrt opstellt: %1" -#: fileaccess.cpp:997 +#: fileaccess.cpp:1034 #, kde-format msgid "Removing directory: %1" msgstr "Orner warrt wegmaakt: %1" -#: fileaccess.cpp:1012 +#: fileaccess.cpp:1049 #, kde-format msgid "Removing file: %1" msgstr "Datei warrt wegmaakt: %1" -#: fileaccess.cpp:1028 +#: fileaccess.cpp:1065 #, kde-format msgid "Creating symbolic link: %1 -> %2" msgstr "Symboolsch Link warrt opstellt: %1 -> %2" -#: fileaccess.cpp:1052 +#: fileaccess.cpp:1089 #, kde-format msgid "Renaming file: %1 -> %2" msgstr "Datei warrt ümnöömt: %1 -> %2" -#: fileaccess.cpp:1086 +#: fileaccess.cpp:1123 #, kde-format msgid "Copying file: %1 -> %2" msgstr "Datei warrt kopeert: %1 -> %2" -#: fileaccess.cpp:1108 +#: fileaccess.cpp:1145 #, fuzzy, kde-format #| msgid "Reading directory: " msgid "Reading directory: %1" msgstr "Orner warrt leest: " -#: fileaccess.cpp:1162 +#: fileaccess.cpp:1202 #, kde-format msgid "Listing directory: %1" msgstr "Orner warrt oplist: %1" -#: kdiff3.cpp:181 +#: kdiff3.cpp:182 #, kde-format msgid "Current Configuration:" msgstr "Aktuell Instellen:" -#: kdiff3.cpp:186 +#: kdiff3.cpp:187 #, kde-format msgid "Config Option Error:" msgstr "Fehler binnen de Instellen:" -#: kdiff3.cpp:240 +#: kdiff3.cpp:246 #, kde-format msgid "Option --auto used, but no output file specified." msgstr "Optschoon \"--auto\" bruukt, man keen Utgaavdatei angeven." -#: kdiff3.cpp:416 +#: kdiff3.cpp:405 #, kde-format msgid "Option --auto ignored for directory comparison." msgstr "Optschoon \"--auto\" warrt bi't Verglieken vun Ornern övergahn." -#: kdiff3.cpp:460 +#: kdiff3.cpp:449 #, kde-format msgid "Saving failed." msgstr "Sekern fehlslaan." -#: kdiff3.cpp:496 pdiff.cpp:1098 +#: kdiff3.cpp:494 pdiff.cpp:1096 #, kde-format msgid "Opening of these files failed:" msgstr "Disse Dateien laat sik nich opmaken:" -#: kdiff3.cpp:505 +#: kdiff3.cpp:503 pdiff.cpp:1105 #, kde-format -msgid "File Open Error" -msgstr "Fehler bi't Opmaken" +msgid "File open error" +msgstr "Fehler bi't Datei-Opmaken" -#: kdiff3.cpp:533 +#: kdiff3.cpp:532 #, kde-format msgid "Opens documents for comparison..." msgstr "Dokmenten warrt för't Verglieken opmaakt..." -#: kdiff3.cpp:535 +#: kdiff3.cpp:534 #, kde-format msgid "Reload" msgstr "Nieg laden" -#: kdiff3.cpp:538 +#: kdiff3.cpp:537 #, kde-format 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:540 +#: kdiff3.cpp:539 #, kde-format msgid "Saves the current document as..." msgstr "Sekert dat aktuelle Dokment as..." -#: kdiff3.cpp:543 +#: kdiff3.cpp:542 #, kde-format msgid "Print the differences" msgstr "Verscheel drucken" -#: kdiff3.cpp:546 +#: kdiff3.cpp:545 #, kde-format msgid "Quits the application" msgstr "Maakt dat Programm ut" -#: kdiff3.cpp:549 +#: kdiff3.cpp:548 #, kde-format 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:552 +#: kdiff3.cpp:551 #, kde-format msgid "Copies the selected section to the clipboard" msgstr "Kopeert den utsöchten Afsnitt na de Twischenaflaag" -#: kdiff3.cpp:554 +#: kdiff3.cpp:553 #, kde-format msgid "Pastes the clipboard contents to current position" msgstr "Föögt de Twischenaflaag ehr Inholt bi de aktuelle Steed in." -#: kdiff3.cpp:557 +#: kdiff3.cpp:556 #, kde-format msgid "Select everything in current window" msgstr "Allens binnen dat aktuelle Finster utsöken" -#: kdiff3.cpp:560 +#: kdiff3.cpp:559 #, kde-format msgid "Search for a string" msgstr "Na en Tekenkeed söken" -#: kdiff3.cpp:562 +#: kdiff3.cpp:561 #, kde-format msgid "Search again for the string" msgstr "Nochmaal na en Tekenkeed söken" -#: kdiff3.cpp:567 +#: kdiff3.cpp:566 #, kde-format msgid "Enables/disables the statusbar" msgstr "Maakt den Statusbalken an oder ut" -#: kdiff3.cpp:571 +#: kdiff3.cpp:570 #, kde-format msgid "Configure KDiff3..." msgstr "KDiff3 instellen..." -#: kdiff3.cpp:590 +#: kdiff3.cpp:589 #, kde-format msgid "Go to Current Delta" msgstr "Na aktuellen Verscheel gahn" -#: kdiff3.cpp:590 +#: kdiff3.cpp:589 #, kde-format msgid "" "Current\n" @@ -1195,12 +1200,12 @@ "Aktuell\n" "Verscheel" -#: kdiff3.cpp:592 +#: kdiff3.cpp:591 #, kde-format msgid "Go to First Delta" msgstr "Na eersten Verscheel gahn" -#: kdiff3.cpp:592 +#: kdiff3.cpp:591 #, kde-format msgid "" "First\n" @@ -1209,12 +1214,12 @@ "Eerst\n" "Verscheel" -#: kdiff3.cpp:594 +#: kdiff3.cpp:593 #, kde-format msgid "Go to Last Delta" msgstr "Na lesten Verscheel gahn" -#: kdiff3.cpp:594 +#: kdiff3.cpp:593 #, kde-format msgid "" "Last\n" @@ -1223,12 +1228,12 @@ "Lest\n" "Verscheel" -#: kdiff3.cpp:596 +#: kdiff3.cpp:595 #, kde-format msgid "(Skips white space differences when \"Show White Space\" is disabled.)" msgstr "(Övergeiht Freeruum-Verschelen, wenn \"Freerüüm wiesen\" utmaakt is.)" -#: kdiff3.cpp:597 +#: kdiff3.cpp:596 #, kde-format msgid "" "(Does not skip white space differences even when \"Show White Space\" is " @@ -1236,12 +1241,12 @@ msgstr "" "(Övergeiht Freeruum-Verschelen nich, ok wenn \"Freerüüm wiesen\" utmaakt is.)" -#: kdiff3.cpp:598 +#: kdiff3.cpp:597 #, kde-format msgid "Go to Previous Delta" msgstr "Na verleden Verscheel gahn" -#: kdiff3.cpp:598 +#: kdiff3.cpp:597 #, kde-format msgid "" "Prev\n" @@ -1250,12 +1255,12 @@ "Verleden\n" "Verscheel" -#: kdiff3.cpp:600 +#: kdiff3.cpp:599 #, kde-format msgid "Go to Next Delta" msgstr "Na nakamen Verscheel gahn" -#: kdiff3.cpp:600 +#: kdiff3.cpp:599 #, kde-format msgid "" "Next\n" @@ -1264,12 +1269,12 @@ "Nakamen\n" "Verscheel" -#: kdiff3.cpp:602 +#: kdiff3.cpp:601 #, kde-format msgid "Go to Previous Conflict" msgstr "Na verleden Konflikt gahn" -#: kdiff3.cpp:602 +#: kdiff3.cpp:601 #, kde-format msgid "" "Prev\n" @@ -1278,12 +1283,12 @@ "Verleden\n" "Konflikt" -#: kdiff3.cpp:604 +#: kdiff3.cpp:603 #, kde-format msgid "Go to Next Conflict" msgstr "Na nakamen Konflikt gahn" -#: kdiff3.cpp:604 +#: kdiff3.cpp:603 #, kde-format msgid "" "Next\n" @@ -1292,12 +1297,12 @@ "Nakamen\n" "Konflikt" -#: kdiff3.cpp:606 +#: kdiff3.cpp:605 #, kde-format msgid "Go to Previous Unsolved Conflict" msgstr "Na verleden Konflikt gahn, de nich oplööst is" -#: kdiff3.cpp:606 +#: kdiff3.cpp:605 #, kde-format msgid "" "Prev\n" @@ -1306,12 +1311,12 @@ "Verleden\n" "n. oplööst" -#: kdiff3.cpp:608 +#: kdiff3.cpp:607 #, kde-format msgid "Go to Next Unsolved Conflict" msgstr "Na nakamen Konflikt gahn, de nich oplööst is" -#: kdiff3.cpp:608 +#: kdiff3.cpp:607 #, kde-format msgid "" "Next\n" @@ -1320,12 +1325,12 @@ "Nakamen\n" "n. oplööst" -#: kdiff3.cpp:610 +#: kdiff3.cpp:609 #, kde-format msgid "Select Line(s) From A" msgstr "Reeg ut A bruken" -#: kdiff3.cpp:610 +#: kdiff3.cpp:609 #, kde-format msgid "" "Choose\n" @@ -1334,12 +1339,12 @@ "A\n" "bruken" -#: kdiff3.cpp:611 +#: kdiff3.cpp:610 #, kde-format msgid "Select Line(s) From B" msgstr "Reeg ut B bruken" -#: kdiff3.cpp:611 +#: kdiff3.cpp:610 #, kde-format msgid "" "Choose\n" @@ -1348,12 +1353,12 @@ "B\n" "bruken" -#: kdiff3.cpp:612 +#: kdiff3.cpp:611 #, kde-format msgid "Select Line(s) From C" msgstr "Reeg ut C bruken" -#: kdiff3.cpp:612 +#: kdiff3.cpp:611 #, kde-format msgid "" "Choose\n" @@ -1362,12 +1367,12 @@ "C\n" "bruken" -#: kdiff3.cpp:613 +#: kdiff3.cpp:612 #, kde-format msgid "Automatically Go to Next Unsolved Conflict After Source Selection" msgstr "Na Bornköör automaatsch na nakamen nich oplöösten Konflikt gahn" -#: kdiff3.cpp:613 +#: kdiff3.cpp:612 #, kde-format msgid "" "Auto\n" @@ -1376,25 +1381,25 @@ "Autom.\n" "Nakamen" -#: kdiff3.cpp:615 +#: kdiff3.cpp:614 #, fuzzy, kde-format #| msgid "Show Space && Tabulator Characters for Differences" msgid "Show Space && Tabulator Characters" msgstr "Free- un Tab-Tekens as Verscheel wiesen" -#: kdiff3.cpp:615 +#: kdiff3.cpp:614 #, kde-format msgid "" "White\n" "Characters" msgstr "Freerüüm" -#: kdiff3.cpp:616 +#: kdiff3.cpp:615 #, kde-format msgid "Show White Space" msgstr "Freerüüm wiesen" -#: kdiff3.cpp:616 +#: kdiff3.cpp:615 #, kde-format msgid "" "White\n" @@ -1403,12 +1408,12 @@ "Freeruum-\n" "Verschelen" -#: kdiff3.cpp:618 +#: kdiff3.cpp:617 #, kde-format msgid "Show Line Numbers" msgstr "Reegnummern wiesen" -#: kdiff3.cpp:618 +#: kdiff3.cpp:617 #, kde-format msgid "" "Line\n" @@ -1417,195 +1422,195 @@ "Reeg-\n" "nummern" -#: kdiff3.cpp:620 +#: kdiff3.cpp:619 #, kde-format msgid "Automatically Solve Simple Conflicts" msgstr "Eenfach Konflikten automaatsch oplösen" -#: kdiff3.cpp:621 +#: kdiff3.cpp:620 #, kde-format msgid "Set Deltas to Conflicts" msgstr "All Verschelen as Konflikten markeren" -#: kdiff3.cpp:622 +#: kdiff3.cpp:621 #, kde-format msgid "Run Regular Expression Auto Merge" msgstr "Automaatsch Tosamenföhren mit reguleer Utdruck" -#: kdiff3.cpp:623 +#: kdiff3.cpp:622 #, kde-format msgid "Automatically Solve History Conflicts" msgstr "Vörgeschicht-Konflikten automaatsch oplösen" -#: kdiff3.cpp:624 +#: kdiff3.cpp:623 #, kde-format msgid "Split Diff At Selection" msgstr "Verscheel bi Köör delen" -#: kdiff3.cpp:625 +#: kdiff3.cpp:624 #, kde-format msgid "Join Selected Diffs" msgstr "Utsöcht Verschelen tosamenstellen" -#: kdiff3.cpp:627 +#: kdiff3.cpp:626 #, kde-format msgid "Show Window A" msgstr "Finster A wiesen" -#: kdiff3.cpp:628 +#: kdiff3.cpp:627 #, kde-format msgid "Show Window B" msgstr "Finster B wiesen" -#: kdiff3.cpp:629 +#: kdiff3.cpp:628 #, kde-format msgid "Show Window C" msgstr "Finster C wiesen" -#: kdiff3.cpp:631 +#: kdiff3.cpp:630 #, kde-format msgid "Normal Overview" msgstr "Normaal Översicht" -#: kdiff3.cpp:632 +#: kdiff3.cpp:631 #, kde-format msgid "A vs. B Overview" msgstr "A-B-Översicht" -#: kdiff3.cpp:633 +#: kdiff3.cpp:632 #, kde-format msgid "A vs. C Overview" msgstr "A-C-Översicht" -#: kdiff3.cpp:634 +#: kdiff3.cpp:633 #, kde-format msgid "B vs. C Overview" msgstr "B-C-Översicht" -#: kdiff3.cpp:635 +#: kdiff3.cpp:634 #, kde-format msgid "Word Wrap Diff Windows" msgstr "Regen ümbreken" -#: kdiff3.cpp:636 +#: kdiff3.cpp:635 #, kde-format msgid "Add Manual Diff Alignment" msgstr "Verscheel-Utrichten vun Hand tofögen" -#: kdiff3.cpp:637 +#: kdiff3.cpp:636 #, kde-format msgid "Clear All Manual Diff Alignments" msgstr "All Vun-Hand-Utrichten wegmaken" -#: kdiff3.cpp:639 +#: kdiff3.cpp:638 #, kde-format msgid "Focus Next Window" msgstr "Nakamen Finster anmaken" -#: kdiff3.cpp:640 +#: kdiff3.cpp:639 #, kde-format msgid "Focus Prev Window" msgstr "Verleden Finster anmaken" -#: kdiff3.cpp:641 +#: kdiff3.cpp:640 #, kde-format msgid "Toggle Split Orientation" msgstr "Deelricht wesseln" -#: kdiff3.cpp:643 +#: kdiff3.cpp:642 #, kde-format msgid "Dir && Text Split Screen View" msgstr "Deelt Ansicht för Orner un Text" -#: kdiff3.cpp:645 +#: kdiff3.cpp:644 #, kde-format msgid "Toggle Between Dir && Text View" msgstr "Orner- un Text-Ansicht wesseln" -#: kdiff3.cpp:697 pdiff.cpp:1909 +#: kdiff3.cpp:696 pdiff.cpp:1919 #, fuzzy, kde-format #| msgid "The merge result hasn't been saved." msgid "The merge result has not been saved." msgstr "Tosamenföhr-Resultaat wöör nich sekert" -#: kdiff3.cpp:699 +#: kdiff3.cpp:698 #, kde-format msgid "Save && Quit" msgstr "Sekern && Utmaken" -#: kdiff3.cpp:700 +#: kdiff3.cpp:699 #, kde-format msgid "Quit Without Saving" msgstr "Utmaken un nich Sekern" -#: kdiff3.cpp:708 pdiff.cpp:1920 +#: kdiff3.cpp:707 pdiff.cpp:1930 #, kde-format msgid "Saving the merge result failed." msgstr "Tosamenföhr-Resultaat lett sik nich sekern" -#: kdiff3.cpp:719 pdiff.cpp:1032 +#: kdiff3.cpp:718 pdiff.cpp:1030 #, kde-format 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:742 +#: kdiff3.cpp:741 #, kde-format msgid "Saving file..." msgstr "Datei warrt sekert..." -#: kdiff3.cpp:759 +#: kdiff3.cpp:758 #, kde-format msgid "Saving file with a new filename..." msgstr "Datei warrt mit en nieg Dateinaam sekert..." -#: kdiff3.cpp:761 +#: kdiff3.cpp:760 #, kde-format msgid "Save As..." msgstr "Sekern as..." -#: kdiff3.cpp:820 +#: kdiff3.cpp:819 #, kde-format msgid "Printing not implemented." msgstr "Drucken nich inbuut" -#: kdiff3.cpp:857 +#: kdiff3.cpp:858 #, kde-format msgid "Printing..." msgstr "An't Drucken..." -#: kdiff3.cpp:943 +#: kdiff3.cpp:948 #, kde-format msgid "Printing page %1 of %2" msgstr "" -#: kdiff3.cpp:1000 +#: kdiff3.cpp:1006 #, fuzzy, kde-format #| msgid "Selection" msgid " (Selection)" msgstr "Köör" -#: kdiff3.cpp:1027 +#: kdiff3.cpp:1034 #, kde-format msgid "Printing completed." msgstr "Drucken afslaten." -#: kdiff3.cpp:1031 +#: kdiff3.cpp:1038 #, kde-format msgid "Printing aborted." msgstr "Drucken afbraken." -#: kdiff3.cpp:1038 +#: kdiff3.cpp:1045 #, kde-format msgid "Exiting..." msgstr "Bi to utstiegen..." -#: kdiff3.cpp:1049 +#: kdiff3.cpp:1056 #, kde-format msgid "Toggling toolbar..." msgstr "Warktüüchbalken warrt an-/utmaakt..." -#: kdiff3.cpp:1070 +#: kdiff3.cpp:1077 #, kde-format msgid "Toggle the statusbar..." msgstr "Statusbalken an-/utmaken..." @@ -1631,7 +1636,7 @@ msgid "Joachim Eibl" msgstr "Joachim Eibl" -#: kdiff3_part.cpp:173 kdiff3_part.cpp:254 +#: kdiff3_part.cpp:174 kdiff3_part.cpp:255 #, fuzzy, kde-format #| msgid "Couldn't find files for comparison." msgid "Could not find files for comparison." @@ -1650,7 +1655,7 @@ msgstr "KDiff3 instellen" #. i18n: ectx: ToolBar (mainToolBar) -#: kdiff3_part.rc:16 main.cpp:88 +#: kdiff3_part.rc:16 main.cpp:89 #, kde-format msgid "KDiff3" msgstr "KDiff3" @@ -1722,85 +1727,91 @@ msgid "Main Toolbar" msgstr "Hööft-Warktüüchbalken" -#: main.cpp:68 main.cpp:72 +#: main.cpp:69 main.cpp:73 #, kde-format msgid "Ignored. (User defined.)" msgstr "Övergahn. (Vun'n Bruker fastleggt.)" -#: main.cpp:92 +#: main.cpp:93 #, kde-format msgid " (64 bit)" msgstr "" -#: main.cpp:94 +#: main.cpp:95 #, kde-format msgid " (32 bit)" msgstr "" -#: main.cpp:95 +#: main.cpp:96 #, kde-format msgid "Tool for Comparison and Merge of Files and Directories" msgstr "Tosamenföhr-Warktüüch för Dateien un Ornern" -#: main.cpp:96 +#: main.cpp:97 #, kde-format msgid "(c) 2002-2014 Joachim Eibl, (c) 2017 Michael Reeves KF5/Qt5 port" msgstr "" -#: main.cpp:112 +#: main.cpp:113 #, kde-format msgid "Merge the input." msgstr "De Ingaav tosamenföhren" -#: main.cpp:113 +#: main.cpp:114 #, kde-format msgid "Explicit base file. For compatibility with certain tools." msgstr "Utspraken Basisdatei. För de Kompatibiliteet mit anner Warktüüch." -#: main.cpp:114 +#: main.cpp:115 #, kde-format msgid "Output file. Implies -m. E.g.: -o newfile.txt" msgstr "Utgaavdatei. Slutt \"-m\" in. Bispill: -o niegdatei.txt" -#: main.cpp:115 +#: main.cpp:116 #, kde-format msgid "Output file, again. (For compatibility with certain tools.)" msgstr "Utgaavdatei, nochmaal. (För de Kompatibiliteet mit anner Warktüüch.)" -#: main.cpp:116 +#: main.cpp:118 #, kde-format msgid "No GUI if all conflicts are auto-solvable. (Needs -o file)" msgstr "" "Keen Böversiet, wenn sik all Konflikten automaatsch oplösen laat (\"-o " "Utgaavdatei\" nödig)" -#: main.cpp:117 +#: main.cpp:120 +#, fuzzy, kde-format +#| msgid "Ignore" +msgid "Ignored." +msgstr "Övergahn" + +#: main.cpp:122 #, fuzzy, kde-format #| msgid "Don't solve conflicts automatically. (For compatibility...)" msgid "Do not solve conflicts automatically." msgstr "Konflikt nich automaatsch oplösen. (För de Kompatibiliteet...)" -#: main.cpp:118 +#: main.cpp:123 #, kde-format msgid "Visible name replacement for input file 1 (base)." msgstr "Sichtbor Tuuschnaam för Ingaavdatei 1 (Grundlaag)." -#: main.cpp:119 +#: main.cpp:124 #, kde-format msgid "Visible name replacement for input file 2." msgstr "Sichtbor Tuuschnaam för Ingaavdatei 2." -#: main.cpp:120 +#: main.cpp:125 #, kde-format msgid "Visible name replacement for input file 3." msgstr "Sichtbor Tuuschnaam för Ingaavdatei 3." -#: main.cpp:121 +#: main.cpp:126 #, kde-format msgid "Alternative visible name replacement. Supply this once for every input." msgstr "Anner sichtbor Tuuschnaam. Eenmaal för elkeen Ingaavdatei angeven." -#: main.cpp:122 +#: main.cpp:127 #, kde-format msgid "" "Override a config setting. Use once for every setting. E.g.: --cs " @@ -1809,91 +1820,91 @@ "En Instellen överschrieven. Eenmaal för elkeen Instellen bruken, a.B.: »--cs " "\"AutoAdvance=1\"«" -#: main.cpp:123 +#: main.cpp:128 #, kde-format msgid "Show list of config settings and current values." msgstr "List vun Instellenoptschonen un Weerten wiesen" -#: main.cpp:124 +#: main.cpp:129 #, kde-format msgid "Use a different config file." msgstr "En anner Instellendatei bruken" -#: main.cpp:127 +#: main.cpp:132 #, kde-format msgid "file1 to open (base, if not specified via --base)" msgstr "" "Eerste Datei, de Du opmaken wullt (Grundlaag, wenn nich mit \"--base\" " "angeven)" -#: main.cpp:128 +#: main.cpp:133 #, kde-format msgid "file2 to open" msgstr "Twete Datei, de Du opmaken wullt" -#: main.cpp:129 +#: main.cpp:134 #, kde-format msgid "file3 to open" msgstr "Drüdde Datei, de Du opmaken wullt" -#: main.cpp:153 +#: main.cpp:158 #, kde-format msgid "See kdiff3 --help for supported options." msgstr "" -#: mergeresultwindow.cpp:158 +#: mergeresultwindow.cpp:171 #, kde-format msgid "Choose A Everywhere" msgstr "Jümmers A bruken" -#: mergeresultwindow.cpp:159 +#: mergeresultwindow.cpp:172 #, kde-format msgid "Choose B Everywhere" msgstr "Jümmers B bruken" -#: mergeresultwindow.cpp:160 +#: mergeresultwindow.cpp:173 #, kde-format msgid "Choose C Everywhere" msgstr "Jümmers C bruken" -#: mergeresultwindow.cpp:161 +#: mergeresultwindow.cpp:174 #, kde-format msgid "Choose A for All Unsolved Conflicts" msgstr "A för all nich oplööst Konflikten bruken" -#: mergeresultwindow.cpp:162 +#: mergeresultwindow.cpp:175 #, kde-format msgid "Choose B for All Unsolved Conflicts" msgstr "B för all nich oplööst Konflikten bruken" -#: mergeresultwindow.cpp:163 +#: mergeresultwindow.cpp:176 #, kde-format msgid "Choose C for All Unsolved Conflicts" msgstr "C för all nich oplööst Konflikten bruken" -#: mergeresultwindow.cpp:164 +#: mergeresultwindow.cpp:177 #, kde-format msgid "Choose A for All Unsolved Whitespace Conflicts" msgstr "A för all nich oplööst Freeruum-Konflikten bruken" -#: mergeresultwindow.cpp:165 +#: mergeresultwindow.cpp:178 #, kde-format msgid "Choose B for All Unsolved Whitespace Conflicts" msgstr "B för all nich oplööst Freeruum-Konflikten bruken" -#: mergeresultwindow.cpp:166 +#: mergeresultwindow.cpp:179 #, kde-format msgid "Choose C for All Unsolved Whitespace Conflicts" msgstr "C för all nich oplööst Freeruum-Konflikten bruken" -#: mergeresultwindow.cpp:176 +#: mergeresultwindow.cpp:204 #, kde-format msgid "Number of remaining unsolved conflicts: %1 (of which %2 are whitespace)" msgstr "" "Tall vun överbleven nich oplööst Konflikten: %1 (dor sünd %2 vun Freeruum-" "Konflikten)" -#: mergeresultwindow.cpp:370 +#: mergeresultwindow.cpp:398 #, kde-format msgid "" "The output has been modified.\n" @@ -1902,29 +1913,29 @@ "Du hest de Utgaav ännert.\n" "Maakst Du wieder, kaamt Dien Ännern weg." -#: mergeresultwindow.cpp:936 pdiff.cpp:827 +#: mergeresultwindow.cpp:964 pdiff.cpp:817 #, kde-format msgid "All input files are binary equal." msgstr "All Ingaavdateien sünd bineer liek." -#: mergeresultwindow.cpp:938 +#: mergeresultwindow.cpp:966 #, kde-format msgid "All input files contain the same text." msgstr "All Ingaavdateien bargt den sülven Text." -#: mergeresultwindow.cpp:942 mergeresultwindow.cpp:946 -#: mergeresultwindow.cpp:950 pdiff.cpp:833 pdiff.cpp:837 pdiff.cpp:841 +#: mergeresultwindow.cpp:970 mergeresultwindow.cpp:974 +#: mergeresultwindow.cpp:978 pdiff.cpp:823 pdiff.cpp:827 pdiff.cpp:831 #, kde-format msgid "Files %1 and %2 are binary equal.\n" msgstr "De Dateien %1 un %2 sünd bineer liek.\n" -#: mergeresultwindow.cpp:944 mergeresultwindow.cpp:948 -#: mergeresultwindow.cpp:952 +#: mergeresultwindow.cpp:972 mergeresultwindow.cpp:976 +#: mergeresultwindow.cpp:980 #, kde-format msgid "Files %1 and %2 have equal text.\n" msgstr "De Dateien %1 un %2 bargt den sülven Text.\n" -#: mergeresultwindow.cpp:958 +#: mergeresultwindow.cpp:986 #, kde-format msgid "" "Total number of conflicts: %1\n" @@ -1933,27 +1944,27 @@ "%4" msgstr "" -#: mergeresultwindow.cpp:964 +#: mergeresultwindow.cpp:992 #, kde-format msgid "Conflicts" msgstr "Konflikten" -#: mergeresultwindow.cpp:1873 +#: mergeresultwindow.cpp:1901 #, kde-format msgid "" msgstr "" -#: mergeresultwindow.cpp:1881 +#: mergeresultwindow.cpp:1909 #, kde-format msgid "" msgstr "" -#: mergeresultwindow.cpp:1883 mergeresultwindow.cpp:2755 +#: mergeresultwindow.cpp:1911 mergeresultwindow.cpp:2783 #, kde-format msgid "" msgstr "" -#: mergeresultwindow.cpp:2967 +#: mergeresultwindow.cpp:2995 #, fuzzy, kde-format #| msgid "" #| "Not all conflicts are solved yet.\n" @@ -1965,12 +1976,12 @@ "Noch sünd nich all Konflikten oplööst.\n" "Datei nich sekert.\n" -#: mergeresultwindow.cpp:2969 mergeresultwindow.cpp:2978 +#: mergeresultwindow.cpp:2997 mergeresultwindow.cpp:3006 #, kde-format msgid "Conflicts Left" msgstr "Konflikten na" -#: mergeresultwindow.cpp:2976 +#: mergeresultwindow.cpp:3004 #, fuzzy, kde-format #| msgid "" #| "There is a line end style conflict. Please choose the line end style " @@ -1985,7 +1996,7 @@ "Hand ut.\n" "Datei nich sekert.\n" -#: mergeresultwindow.cpp:2990 +#: mergeresultwindow.cpp:3018 #, kde-format msgid "" "\n" @@ -1996,62 +2007,62 @@ "\n" "Sekerheitkopie lett sik nich opstellen. Datei nich sekert." -#: mergeresultwindow.cpp:2990 mergeresultwindow.cpp:3038 +#: mergeresultwindow.cpp:3018 mergeresultwindow.cpp:3066 #, kde-format msgid "File Save Error" msgstr "Fehler bi't Sekern" -#: mergeresultwindow.cpp:3038 +#: mergeresultwindow.cpp:3066 #, kde-format msgid "Error while writing." msgstr "Fehler bi't Schrieven" -#: mergeresultwindow.cpp:3110 +#: mergeresultwindow.cpp:3138 #, fuzzy, kde-format #| msgid "Output" msgid "Output:" msgstr "Utgaav" -#: mergeresultwindow.cpp:3123 mergeresultwindow.cpp:3315 +#: mergeresultwindow.cpp:3151 mergeresultwindow.cpp:3343 #, kde-format msgid "[Modified]" msgstr "[Ännert]" -#: mergeresultwindow.cpp:3130 +#: mergeresultwindow.cpp:3158 #, fuzzy, kde-format #| msgid "Encoding for saving" msgid "Encoding for saving:" msgstr "Koderen bi't Sekern" -#: mergeresultwindow.cpp:3230 +#: mergeresultwindow.cpp:3258 #, kde-format msgid "Conflict" msgstr "Konflikt" -#: mergeresultwindow.cpp:3262 +#: mergeresultwindow.cpp:3290 #, fuzzy, kde-format #| msgid "Codec from" msgid "Codec from A: %1" msgstr "Koderen vun" -#: mergeresultwindow.cpp:3264 +#: mergeresultwindow.cpp:3292 #, fuzzy, kde-format #| msgid "Codec from" msgid "Codec from B: %1" msgstr "Koderen vun" -#: mergeresultwindow.cpp:3266 +#: mergeresultwindow.cpp:3294 #, fuzzy, kde-format #| msgid "Codec from" msgid "Codec from C: %1" msgstr "Koderen vun" -#: optiondialog.cpp:119 +#: optiondialog.cpp:121 #, kde-format msgid "Change Font" msgstr "" -#: optiondialog.cpp:135 optiondialog.cpp:145 +#: optiondialog.cpp:137 optiondialog.cpp:147 #, kde-format msgid "" "Font: %1, %2, %3\n" @@ -2059,126 +2070,126 @@ "Example:" msgstr "" -#: optiondialog.cpp:388 +#: optiondialog.cpp:390 #, kde-format msgid "Unicode" msgstr "Unicode" -#: optiondialog.cpp:389 +#: optiondialog.cpp:391 #, kde-format msgid "Latin1" msgstr "Latin1" -#: optiondialog.cpp:408 +#: optiondialog.cpp:410 #, kde-format msgid "Change this if non-ASCII characters are not displayed correctly." msgstr "" "Änner dit, wenn Tekens buten dat ASCII-Rebeet nich propper wiest warrt." -#: optiondialog.cpp:491 +#: optiondialog.cpp:495 #, kde-format msgid "Configure" msgstr "Instellen" -#: optiondialog.cpp:568 +#: optiondialog.cpp:573 #, kde-format msgid "Font" msgstr "Schriftoort" -#: optiondialog.cpp:570 +#: optiondialog.cpp:575 #, kde-format msgid "Editor & Diff Output Font" msgstr "Editor- un Verscheel-Schriftoort" -#: optiondialog.cpp:589 +#: optiondialog.cpp:594 #, kde-format msgid "Application font" msgstr "" -#: optiondialog.cpp:594 +#: optiondialog.cpp:599 #, fuzzy, kde-format #| msgid "File Save Error" msgid "File view font" msgstr "Fehler bi't Sekern" -#: optiondialog.cpp:613 +#: optiondialog.cpp:618 #, fuzzy, kde-format #| msgid "Color" msgctxt "Title for color settings page" msgid "Color" msgstr "Klöör" -#: optiondialog.cpp:614 +#: optiondialog.cpp:619 #, kde-format msgid "Colors Settings" msgstr "Klören instellen" -#: optiondialog.cpp:631 +#: optiondialog.cpp:644 #, kde-format msgid "Editor and Diff Views:" msgstr "Editor- un Verscheel-Ansichten:" -#: optiondialog.cpp:639 +#: optiondialog.cpp:652 #, kde-format msgid "Foreground color:" msgstr "Vörgrundklöör:" -#: optiondialog.cpp:647 +#: optiondialog.cpp:660 #, kde-format msgid "Background color:" msgstr "Achtergrundklöör:" -#: optiondialog.cpp:657 +#: optiondialog.cpp:670 #, kde-format msgid "Diff background color:" msgstr "Verscheel-Achtergrundklöör:" -#: optiondialog.cpp:666 +#: optiondialog.cpp:679 #, kde-format msgid "Color A:" msgstr "Klöör A:" -#: optiondialog.cpp:675 +#: optiondialog.cpp:688 #, kde-format msgid "Color B:" msgstr "Klöör B:" -#: optiondialog.cpp:684 +#: optiondialog.cpp:697 #, kde-format msgid "Color C:" msgstr "Klöör C:" -#: optiondialog.cpp:692 +#: optiondialog.cpp:705 #, kde-format msgid "Conflict color:" msgstr "Konflikt-Klöör:" -#: optiondialog.cpp:701 +#: optiondialog.cpp:714 #, kde-format msgid "Current range background color:" msgstr "Achtergrundklöör för aktuell Rebeet:" -#: optiondialog.cpp:710 +#: optiondialog.cpp:723 #, kde-format msgid "Current range diff background color:" msgstr "Verscheel-Achtergrundklöör för aktuell Rebeet:" -#: optiondialog.cpp:718 +#: optiondialog.cpp:731 #, kde-format msgid "Color for manually aligned difference ranges:" msgstr "Klöör för vun Hand utricht Verscheelrebeden:" -#: optiondialog.cpp:725 +#: optiondialog.cpp:738 #, kde-format msgid "Directory Comparison View:" msgstr "Ornerverscheel-Ansicht:" -#: optiondialog.cpp:731 +#: optiondialog.cpp:744 #, kde-format msgid "Newest file color:" msgstr "Klöör för niegst Datei:" -#: optiondialog.cpp:736 +#: optiondialog.cpp:749 #, kde-format msgid "" "Changing this color will only be effective when starting the next directory " @@ -2186,37 +2197,37 @@ msgstr "" "Ännern an disse Klöör warrt eerst bi't nakamen Verglieken vun Ornern bruukt." -#: optiondialog.cpp:741 +#: optiondialog.cpp:754 #, kde-format msgid "Oldest file color:" msgstr "Klöör för öllst Datei:" -#: optiondialog.cpp:750 +#: optiondialog.cpp:763 #, kde-format msgid "Middle age file color:" msgstr "Klöör för en middeloolt Datei:" -#: optiondialog.cpp:759 +#: optiondialog.cpp:772 #, kde-format msgid "Color for missing files:" msgstr "Klöör för fehlen Dateien:" -#: optiondialog.cpp:773 +#: optiondialog.cpp:786 #, kde-format msgid "Editor" msgstr "Editor" -#: optiondialog.cpp:774 +#: optiondialog.cpp:787 #, kde-format msgid "Editor Behavior" msgstr "Editor-Bedregen" -#: optiondialog.cpp:787 +#: optiondialog.cpp:809 #, kde-format msgid "Tab inserts spaces" msgstr "Tabtast föögt Freetekens in" -#: optiondialog.cpp:791 +#: optiondialog.cpp:813 #, kde-format msgid "" "On: Pressing tab generates the appropriate number of spaces.\n" @@ -2225,27 +2236,27 @@ "An: De Tabtast föögt en propper Tall vun Freetekens in.\n" "Ut: De Tabtast föögt en Tabteken in." -#: optiondialog.cpp:796 +#: optiondialog.cpp:818 #, kde-format msgid "Tab size:" msgstr "Tab-Breed:" -#: optiondialog.cpp:803 +#: optiondialog.cpp:825 #, kde-format msgid "Auto indentation" msgstr "Autom. inrücken" -#: optiondialog.cpp:807 +#: optiondialog.cpp:829 #, kde-format msgid "On: The indentation of the previous line is used for a new line.\n" msgstr "An: De Inrückdeepde ut de verleden Reeg warrt för de niege bruukt.\n" -#: optiondialog.cpp:810 +#: optiondialog.cpp:832 #, kde-format msgid "Auto copy selection" msgstr "Köör autom. koperen" -#: optiondialog.cpp:814 +#: optiondialog.cpp:836 #, fuzzy, kde-format #| msgid "" #| "On: Any selection is immediately written to the clipboard.\n" @@ -2257,7 +2268,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:829 +#: optiondialog.cpp:851 #, kde-format msgid "" "Sets the line endings for when an edited file is saved.\n" @@ -2266,12 +2277,12 @@ "Leggt de Tekens fast, de bi't Sekern för Reegennen bruukt warrt.\n" "DOS/Windows: CR+LF, UNIX: LF (CR = 0D, LF = 0A)" -#: optiondialog.cpp:839 +#: optiondialog.cpp:861 #, kde-format msgid "Diff" msgstr "Verscheel" -#: optiondialog.cpp:840 +#: optiondialog.cpp:862 #, kde-format msgid "Diff Settings" msgstr "Verscheel-Instellen" @@ -2285,13 +2296,13 @@ #. ); #. ++line; #. -#: optiondialog.cpp:865 +#: optiondialog.cpp:896 #, fuzzy, kde-format #| msgid "Treat as white space." msgid "Ignore numbers (treat as white space)" msgstr "As Freeruum hanteren" -#: optiondialog.cpp:869 +#: optiondialog.cpp:900 #, kde-format msgid "" "Ignore number characters during line matching phase. (Similar to Ignore " @@ -2301,46 +2312,46 @@ "Talltekens bi't Regenutrichten övergahn (liek to \"Freerüüm övergahn\").\n" "Mag bi't Verglieken vun Dateien mit Tallen beter Resultaten geven." -#: optiondialog.cpp:873 +#: optiondialog.cpp:904 #, fuzzy, kde-format #| msgid "Treat C/C++ comments like white space." msgid "Ignore C/C++ comments (treat as white space)" msgstr "C/C++-Kommentaren liek as Freerüüm hanteren." -#: optiondialog.cpp:876 +#: optiondialog.cpp:907 #, kde-format msgid "Treat C/C++ comments like white space." msgstr "C/C++-Kommentaren liek as Freerüüm hanteren." -#: optiondialog.cpp:879 +#: optiondialog.cpp:910 #, fuzzy, kde-format #| msgid "Treat as white space." msgid "Ignore case (treat as white space)" msgstr "As Freeruum hanteren" -#: optiondialog.cpp:883 +#: optiondialog.cpp:914 #, kde-format msgid "Treat case differences like white space changes. ('a'<=>'A')" msgstr "" "Verschelen in Groot- un Lüttschrieven liek as Freerüüm-Verschelen hanteren." -#: optiondialog.cpp:886 +#: optiondialog.cpp:917 #, kde-format msgid "Preprocessor command:" msgstr "Vörverarbeid-Befehl:" -#: optiondialog.cpp:891 +#: optiondialog.cpp:922 #, kde-format msgid "User defined pre-processing. (See the docs for details.)" msgstr "" "Vun Bruker fastleggt Vörverarbeiden (Enkelheiten binnen de Dokmentatschoon)." -#: optiondialog.cpp:894 +#: optiondialog.cpp:925 #, kde-format msgid "Line-matching preprocessor command:" msgstr "Vörverarbeid-Befehl för't Regenutrichten:" -#: optiondialog.cpp:899 +#: optiondialog.cpp:930 #, kde-format msgid "" "This pre-processor is only used during line matching.\n" @@ -2349,12 +2360,12 @@ "Disse Vörverarbeiden warrt bloots bi't Regenutrichten bruukt.\n" "(Enkelheiten binnen de Dokmentatschoon)" -#: optiondialog.cpp:902 +#: optiondialog.cpp:933 #, kde-format msgid "Try hard (slower)" msgstr "In't Tüüch leggen (langsamer)" -#: optiondialog.cpp:906 +#: optiondialog.cpp:937 #, kde-format msgid "" "Enables the --minimal option for the external diff.\n" @@ -2363,12 +2374,12 @@ "Bruukt de Optschoon \"--minimal\" vun't Diff-Programm.\n" "Dat Dörkieken vun groot Dateien warrt denn bannig wat langsamer." -#: optiondialog.cpp:910 +#: optiondialog.cpp:941 #, kde-format msgid "Align B and C for 3 input files" msgstr "B un C för 3 Ingaavdateien utrichten" -#: optiondialog.cpp:914 +#: optiondialog.cpp:945 #, kde-format msgid "" "Try to align B and C when comparing or merging three input files.\n" @@ -2380,17 +2391,24 @@ "Bi't Tosamenföhren nich anraadt, dat mag to vigeliensch warrn.\n" "(Standard is Ut.)" -#: optiondialog.cpp:926 +#: optiondialog.cpp:956 +#, fuzzy, kde-format +#| msgid "Merge" +msgctxt "Settings page" +msgid "Merge" +msgstr "Tosamenföhren" + +#: optiondialog.cpp:957 #, kde-format msgid "Merge Settings" msgstr "Tosamenföhr-Instellen" -#: optiondialog.cpp:940 +#: optiondialog.cpp:980 #, kde-format msgid "Auto advance delay (ms):" msgstr "Töövtiet för't autom. Wiedergahn (ms):" -#: optiondialog.cpp:946 +#: optiondialog.cpp:986 #, kde-format msgid "" "When in Auto-Advance mode the result of the current selection is shown \n" @@ -2401,27 +2419,27 @@ "för de angeven Tiet wiest, ehr dat Programm na den nakamen Konflikt jumpt. " "Weerten: 0 - 2000 ms." -#: optiondialog.cpp:950 +#: optiondialog.cpp:990 #, kde-format msgid "Show info dialogs" msgstr "Infodialogen wiesen" -#: optiondialog.cpp:953 +#: optiondialog.cpp:993 #, kde-format msgid "Show a dialog with information about the number of conflicts." msgstr "En Dialoog mit de Tall vun Konflikten wiesen" -#: optiondialog.cpp:956 +#: optiondialog.cpp:996 #, kde-format msgid "White space 2-file merge default:" msgstr "Freeruum-Standard bi 2-Dateien-Tosamenföhren:" -#: optiondialog.cpp:961 optiondialog.cpp:974 +#: optiondialog.cpp:1001 optiondialog.cpp:1014 #, kde-format msgid "Manual Choice" msgstr "Köör vun Hand" -#: optiondialog.cpp:965 optiondialog.cpp:979 +#: optiondialog.cpp:1005 optiondialog.cpp:1019 #, kde-format msgid "" "Allow the merge algorithm to automatically select an input for white-space-" @@ -2430,22 +2448,22 @@ "Den Tosamenföhr-Algoritmus bi Freeruum-Konflikten automaatsch en Born " "utsöken laten" -#: optiondialog.cpp:969 +#: optiondialog.cpp:1009 #, kde-format msgid "White space 3-file merge default:" msgstr "Freeruum-Standard bi 3-Dateien-Tosamenföhren:" -#: optiondialog.cpp:983 +#: optiondialog.cpp:1023 #, kde-format msgid "Automatic Merge Regular Expression" msgstr "Reguleer Utdruck för't autom. Tosamenföhren" -#: optiondialog.cpp:991 smalldialogs.cpp:449 +#: optiondialog.cpp:1031 smalldialogs.cpp:459 #, kde-format msgid "Auto merge regular expression:" msgstr "Reguleer Utdruck för't autom. Tosamenföhren:" -#: optiondialog.cpp:996 +#: optiondialog.cpp:1036 #, kde-format msgid "" "Regular expression for lines where KDiff3 should automatically choose one " @@ -2459,14 +2477,14 @@ "Reeg\n" "ut Born C, sünst de Reeg ut Born B bruukt." -#: optiondialog.cpp:1002 +#: optiondialog.cpp:1042 #, kde-format msgid "Run regular expression auto merge on merge start" msgstr "" "Bi't Starten vun't Tosamenföhren automaatsch na reguleer Utdruck " "tosamenföhren" -#: optiondialog.cpp:1005 +#: optiondialog.cpp:1045 #, kde-format msgid "" "Run the merge for auto merge regular expressions\n" @@ -2476,17 +2494,17 @@ "Utdrück för't automaatsche Tosamenföhren direktemang\n" "utföhren, wenn dat Tosamenföhren anfangt.\n" -#: optiondialog.cpp:1010 +#: optiondialog.cpp:1050 #, kde-format msgid "Version Control History Merging" msgstr "Tosamenföhren mit Verschoonkuntrull-Vörgeschicht" -#: optiondialog.cpp:1018 smalldialogs.cpp:476 +#: optiondialog.cpp:1058 smalldialogs.cpp:486 #, kde-format msgid "History start regular expression:" msgstr "Reguleer Utdruck för Vörgeschicht-Anfang:" -#: optiondialog.cpp:1023 +#: optiondialog.cpp:1063 #, kde-format msgid "" "Regular expression for the start of the version control history entry.\n" @@ -2498,12 +2516,12 @@ "Normalerwies bargt disse Reeg dat Slötelwoort \"$Log$\".\n" "Standardweert: \".*\\$Log.*\\$.*\"" -#: optiondialog.cpp:1029 smalldialogs.cpp:504 +#: optiondialog.cpp:1069 smalldialogs.cpp:514 #, kde-format msgid "History entry start regular expression:" msgstr "Reguleer Utdruck för Vörgeschichtindrag-Anfang:" -#: optiondialog.cpp:1042 +#: optiondialog.cpp:1082 #, kde-format msgid "" "A version control history entry consists of several lines.\n" @@ -2522,22 +2540,22 @@ "Vörgeschichtindrääg staht.\n" "De Enkelheiten staht binnen de Dokmentatschoon." -#: optiondialog.cpp:1050 +#: optiondialog.cpp:1090 #, kde-format msgid "History merge sorting" msgstr "Sorteren bi Vörgeschicht-Tosamenföhren" -#: optiondialog.cpp:1053 +#: optiondialog.cpp:1093 #, kde-format msgid "Sort version control history by a key." msgstr "Verschoonkuntrull-Vörgeschicht na Slötel sorteren" -#: optiondialog.cpp:1063 +#: optiondialog.cpp:1103 #, kde-format msgid "History entry start sort key order:" msgstr "Sorteerreeg för Vörgeschichtindrag-Anfang:" -#: optiondialog.cpp:1068 +#: optiondialog.cpp:1108 #, kde-format msgid "" "Each pair of parentheses used in the regular expression for the history " @@ -2558,40 +2576,40 @@ "Lettst Du dat leddig, warrt nich sorteert.\n" "De Enkelheiten staht binnen de Dokmentatschoon." -#: optiondialog.cpp:1079 +#: optiondialog.cpp:1119 #, kde-format msgid "Merge version control history on merge start" msgstr "" "Verschoonkuntrull-Vörgeschicht bi't Starten vun't Tosamenföhren tosamenföhren" -#: optiondialog.cpp:1082 +#: optiondialog.cpp:1122 #, kde-format msgid "Run version control history automerge on merge start." msgstr "" "Bi't Starten vun't Tosamenföhren automaatsch Verschoonkuntrull-Vörgeschicht " "tosamenföhren" -#: optiondialog.cpp:1086 +#: optiondialog.cpp:1126 #, kde-format msgid "Max number of history entries:" msgstr "Hööchsttall vun Vörgeschichtindrääg:" -#: optiondialog.cpp:1090 +#: optiondialog.cpp:1130 #, kde-format msgid "Cut off after specified number. Use -1 for infinite number of entries." msgstr "Na angeven Tall ophollen. Bi -1 nich ophollen." -#: optiondialog.cpp:1094 +#: optiondialog.cpp:1134 #, kde-format msgid "Test your regular expressions" msgstr "Regulere Utdrück utproberen" -#: optiondialog.cpp:1099 +#: optiondialog.cpp:1139 #, kde-format msgid "Irrelevant merge command:" msgstr "Tosamenföhr-Befehl bi fehlen Ännern:" -#: optiondialog.cpp:1104 +#: optiondialog.cpp:1144 #, kde-format msgid "" "If specified this script is run after automerge\n" @@ -2602,12 +2620,12 @@ "Tosamenföhren opropen, wenn dat sünst keen Ännern geven hett.\n" "Warrt mit disse Parameters opropen: Dateinaam1 Dateinaam2 Dateinaam3" -#: optiondialog.cpp:1109 +#: optiondialog.cpp:1149 #, kde-format msgid "Auto save and quit on merge without conflicts" msgstr "Na't Tosamenföhren ahn Konflikten autom. sekern un utmaken" -#: optiondialog.cpp:1113 +#: optiondialog.cpp:1153 #, kde-format msgid "" "If KDiff3 was started for a file-merge from the command line and all\n" @@ -2620,27 +2638,27 @@ "dat Resultaat automaatsch sekern un dat Programm utmaken.\n" "(Liek to de Befehlsreegoptschoon \"--auto\".)" -#: optiondialog.cpp:1124 optiondialog.cpp:1125 +#: optiondialog.cpp:1164 optiondialog.cpp:1165 #, kde-format msgid "Directory" msgstr "Orner" -#: optiondialog.cpp:1137 +#: optiondialog.cpp:1185 #, kde-format msgid "Recursive directories" msgstr "Rekursiev" -#: optiondialog.cpp:1140 +#: optiondialog.cpp:1188 #, kde-format msgid "Whether to analyze subdirectories or not." msgstr "Leggt fast, wat ok Ünnerornern dörkeken warrt." -#: optiondialog.cpp:1142 +#: optiondialog.cpp:1190 #, kde-format msgid "File pattern(s):" msgstr "Dateimuster(n):" -#: optiondialog.cpp:1148 +#: optiondialog.cpp:1196 #, kde-format msgid "" "Pattern(s) of files to be analyzed. \n" @@ -2651,12 +2669,12 @@ "Platzholltekens: \"*\" un \"?\"\n" "Trennteken twischen Mustern: \";\"" -#: optiondialog.cpp:1153 +#: optiondialog.cpp:1201 #, kde-format msgid "File-anti-pattern(s):" msgstr "Datei-Utsluutmuster(n):" -#: optiondialog.cpp:1159 +#: optiondialog.cpp:1207 #, kde-format msgid "" "Pattern(s) of files to be excluded from analysis. \n" @@ -2667,12 +2685,12 @@ "Platzholltekens: \"*\" un \"?\"\n" "Trennteken twischen Mustern: \";\"" -#: optiondialog.cpp:1164 +#: optiondialog.cpp:1212 #, kde-format msgid "Dir-anti-pattern(s):" msgstr "Orner-Utsluutmuster(n):" -#: optiondialog.cpp:1170 +#: optiondialog.cpp:1218 #, kde-format msgid "" "Pattern(s) of directories to be excluded from analysis. \n" @@ -2683,12 +2701,12 @@ "Platzholltekens: \"*\" un \"?\"\n" "Trennteken twischen Mustern: \";\"" -#: optiondialog.cpp:1175 +#: optiondialog.cpp:1223 #, kde-format msgid "Use .cvsignore" msgstr "\".cvsignore\" bruken" -#: optiondialog.cpp:1179 +#: optiondialog.cpp:1227 #, kde-format msgid "" "Extends the antipattern to anything that would be ignored by CVS.\n" @@ -2697,23 +2715,23 @@ "Verwiedert dat Utsluutmuster op allens, wat CVS övergahn dee.\n" "Bi lokaal \".cvsignore\"-Dateien kann dat vun den Orner afhangen." -#: optiondialog.cpp:1183 +#: optiondialog.cpp:1231 #, kde-format msgid "Find hidden files and directories" msgstr "Versteken Dateien un Ornern bekieken" -#: optiondialog.cpp:1186 +#: optiondialog.cpp:1234 #, fuzzy, kde-format #| msgid "Find hidden files and directories" msgid "Finds hidden files and directories." msgstr "Versteken Dateien un Ornern bekieken" -#: optiondialog.cpp:1189 +#: optiondialog.cpp:1237 #, kde-format msgid "Follow file links" msgstr "Dateilinks nagahn" -#: optiondialog.cpp:1193 +#: optiondialog.cpp:1241 #, kde-format msgid "" "On: Compare the file the link points to.\n" @@ -2722,12 +2740,12 @@ "An: De Datei verglieken, op de de Link wiest.\n" "Ut: De Links verglieken." -#: optiondialog.cpp:1197 +#: optiondialog.cpp:1245 #, kde-format msgid "Follow directory links" msgstr "Ornerlinks nagahn" -#: optiondialog.cpp:1201 +#: optiondialog.cpp:1249 #, kde-format msgid "" "On: Compare the directory the link points to.\n" @@ -2736,12 +2754,12 @@ "An: Den Orner verglieken, op den de Link wiest.\n" "Ut: De Links verglieken." -#: optiondialog.cpp:1210 +#: optiondialog.cpp:1258 #, kde-format msgid "Case sensitive filename comparison" msgstr "Bi Dateinaam-Vergliek op Groot- un Lüttschrieven kieken" -#: optiondialog.cpp:1214 +#: optiondialog.cpp:1262 #, kde-format msgid "" "The directory comparison will compare files or directories when their names " @@ -2753,52 +2771,52 @@ "Maakt dit an, wenn de Groot-/Lüttschrieven liek wesen mutt. (Op Windows " "standardwies ut, sünst an)." -#: optiondialog.cpp:1218 +#: optiondialog.cpp:1266 #, fuzzy, kde-format #| msgid "Unfold All Subdirs" msgid "Unfold all subdirectories on load" msgstr "All Ünnerornern utfoolden" -#: optiondialog.cpp:1222 +#: optiondialog.cpp:1270 #, kde-format msgid "" "On: Unfold all subdirectories when starting a directory diff.\n" "Off: Leave subdirectories folded." msgstr "" -#: optiondialog.cpp:1226 +#: optiondialog.cpp:1274 #, kde-format msgid "Skip directory status report" msgstr "" -#: optiondialog.cpp:1230 +#: optiondialog.cpp:1278 #, kde-format msgid "" "On: Do not show the Directory Comparison Status.\n" "Off: Show the status dialog on start." msgstr "" -#: optiondialog.cpp:1234 +#: optiondialog.cpp:1282 #, kde-format msgid "File Comparison Mode" msgstr "Dateivergliek-Bedriefoort" -#: optiondialog.cpp:1239 +#: optiondialog.cpp:1287 #, kde-format msgid "Binary comparison" msgstr "Bineervergliek" -#: optiondialog.cpp:1241 +#: optiondialog.cpp:1289 #, kde-format msgid "Binary comparison of each file. (Default)" msgstr "Bineervergliek bi all Dateien (Standard)" -#: optiondialog.cpp:1244 +#: optiondialog.cpp:1292 #, kde-format msgid "Full analysis" msgstr "Heel Dörkiek" -#: optiondialog.cpp:1246 +#: optiondialog.cpp:1294 #, kde-format msgid "" "Do a full analysis and show statistics information in extra columns.\n" @@ -2807,12 +2825,12 @@ "En heel Dörkiek doon un bito Statistik binnen besünner Striepen wiesen.\n" "(Langsamer as en Bineervergliek, veel langsamer bi Bineerdateien.)" -#: optiondialog.cpp:1250 +#: optiondialog.cpp:1298 #, kde-format msgid "Trust the size and modification date (unsafe)" msgstr "Grött un Ännerdatum bruken (nich seker)" -#: optiondialog.cpp:1252 +#: optiondialog.cpp:1300 #, kde-format msgid "" "Assume that files are equal if the modification date and file length are " @@ -2826,7 +2844,7 @@ "wiest.\n" "Goot bi groot Ornern oder binnen langsam Nettwarken." -#: optiondialog.cpp:1257 +#: optiondialog.cpp:1305 #, kde-format msgid "" "Trust the size and date, but use binary comparison if date does not match " @@ -2835,7 +2853,7 @@ "Grött un Ännerdatum bruken, man bi nich liek Datum bineer verglieken (nich " "seker)" -#: optiondialog.cpp:1259 +#: optiondialog.cpp:1307 #, kde-format msgid "" "Assume that files are equal if the modification date and file length are " @@ -2847,12 +2865,12 @@ "Is de Grött liek, man dat Datum nich, de Dateien bineer verglieken.\n" "Goot bi groot Ornern oder binnen langsam Nettwarken." -#: optiondialog.cpp:1264 +#: optiondialog.cpp:1312 #, kde-format msgid "Trust the size (unsafe)" msgstr "Grött bruken (nich seker)" -#: optiondialog.cpp:1266 +#: optiondialog.cpp:1314 #, kde-format msgid "" "Assume that files are equal if their file lengths are equal.\n" @@ -2863,12 +2881,12 @@ "Goot bi groot Ornern oder binnen langsam Nettwarken, wenn sik dat Datum bi't " "Daalladen ännert." -#: optiondialog.cpp:1273 +#: optiondialog.cpp:1321 #, kde-format msgid "Synchronize directories" msgstr "Ornern synkroniseren" -#: optiondialog.cpp:1277 +#: optiondialog.cpp:1325 #, kde-format msgid "" "Offers to store files in both directories so that\n" @@ -2880,12 +2898,12 @@ "Funkscheneert bloots bi't Verglieken vun twee Ornern, un wenn keen Teel " "angeven is." -#: optiondialog.cpp:1283 +#: optiondialog.cpp:1331 #, kde-format msgid "White space differences considered equal" msgstr "Freeruum-Verschelen as liek hanteren" -#: optiondialog.cpp:1287 +#: optiondialog.cpp:1335 #, kde-format msgid "" "If files differ only by white space consider them equal.\n" @@ -2894,12 +2912,12 @@ "Dateien as liek hanteren, wenn se bloots in de Freerüüm verscheden sünd.\n" "Dit is bloots anmaakt, wenn Du \"Heel Dörkiek\" utsöcht hest." -#: optiondialog.cpp:1293 +#: optiondialog.cpp:1341 #, kde-format msgid "Copy newer instead of merging (unsafe)" msgstr "Nieger Datei koperen, nich tosamenföhren (nich seker)" -#: optiondialog.cpp:1297 +#: optiondialog.cpp:1345 #, fuzzy, kde-format #| msgid "" #| "Don't look inside, just take the newer file.\n" @@ -2914,12 +2932,12 @@ "(Bruuk dit bloots, wenn Du nau weetst, wat Du dor deist!)\n" "Funkscheneert bloots bi't Verglieken vun twee Ornern." -#: optiondialog.cpp:1302 +#: optiondialog.cpp:1350 #, kde-format msgid "Backup files (.orig)" msgstr "Sekerheitkopie (.orig) opstellen" -#: optiondialog.cpp:1306 +#: optiondialog.cpp:1354 #, kde-format msgid "" "If a file would be saved over an old file, then the old file\n" @@ -2928,17 +2946,17 @@ "Schull en Datei över en öller Datei schreven warrn, denn warrt de\n" "öllere Datei ümnöömt un \".orig\" na ehr Naam anhangt." -#: optiondialog.cpp:1382 optiondialog.cpp:1383 +#: optiondialog.cpp:1430 optiondialog.cpp:1431 #, kde-format msgid "Regional Settings" msgstr "Regiooninstellen" -#: optiondialog.cpp:1397 +#: optiondialog.cpp:1454 #, kde-format msgid "Use the same encoding for everything:" msgstr "De sülve Koderen för allens bruken:" -#: optiondialog.cpp:1401 +#: optiondialog.cpp:1458 #, kde-format msgid "" "Enable this allows to change all encodings by changing the first only.\n" @@ -2947,18 +2965,18 @@ "Is dit anmaakt, kannst Du all Koderen över de eerste ännern.\n" "Maak dit ut, wenn verscheden Instellen för de Dateien nödig sünd." -#: optiondialog.cpp:1405 +#: optiondialog.cpp:1462 #, fuzzy, kde-format #| msgid "Note: Local Encoding is " msgid "Note: Local Encoding is \"%1\"" msgstr "Beacht: De lokale Koderen is " -#: optiondialog.cpp:1409 +#: optiondialog.cpp:1466 #, kde-format msgid "File Encoding for A:" msgstr "Koderen för Datei A:" -#: optiondialog.cpp:1416 +#: optiondialog.cpp:1473 #, kde-format msgid "" "If enabled then Unicode (UTF-16 or UTF-8) encoding will be detected.\n" @@ -2970,32 +2988,32 @@ "Is de Datei nich in Unicode, warrt de utsöchte Koderen bruukt.\n" "(Dat Opdecken vun Unicode hangt vun de eersten Bytes vun en Datei af.)" -#: optiondialog.cpp:1419 optiondialog.cpp:1430 optiondialog.cpp:1441 +#: optiondialog.cpp:1476 optiondialog.cpp:1487 optiondialog.cpp:1498 #, kde-format msgid "Auto Detect Unicode" msgstr "Unicode automaatsch opdecken" -#: optiondialog.cpp:1425 +#: optiondialog.cpp:1482 #, kde-format msgid "File Encoding for B:" msgstr "Koderen för Datei B:" -#: optiondialog.cpp:1436 +#: optiondialog.cpp:1493 #, kde-format msgid "File Encoding for C:" msgstr "Koderen för Datei C:" -#: optiondialog.cpp:1447 +#: optiondialog.cpp:1504 #, kde-format msgid "File Encoding for Merge Output and Saving:" msgstr "Koderen för't Tosamenföhren un Sekern:" -#: optiondialog.cpp:1452 +#: optiondialog.cpp:1509 #, kde-format msgid "Auto Select" msgstr "Autom. Köör" -#: optiondialog.cpp:1456 +#: optiondialog.cpp:1513 #, kde-format msgid "" "If enabled then the encoding from the input files is used.\n" @@ -3005,17 +3023,17 @@ "Wenn anmaakt, warrt de Koderen vun de Ingaavdateien bruukt.\n" "Is dat nich eenkennig, warrt de Bruker na de Koderen för't Sekern fraagt." -#: optiondialog.cpp:1459 +#: optiondialog.cpp:1516 #, kde-format msgid "File Encoding for Preprocessor Files:" msgstr "Koderen för de Vörverarbeid-Dateien:" -#: optiondialog.cpp:1471 +#: optiondialog.cpp:1528 #, kde-format msgid "Right To Left Language" msgstr "Rechts-Na-Links-Spraak" -#: optiondialog.cpp:1475 +#: optiondialog.cpp:1532 #, kde-format msgid "" "Some languages are read from right to left.\n" @@ -3024,22 +3042,22 @@ "En Reeg Schriften warrt vun rechts na links leest.\n" "Disse Optschoon passt dor de Ansicht un den Editor op to." -#: optiondialog.cpp:1485 +#: optiondialog.cpp:1542 #, kde-format msgid "Integration" msgstr "Inbinnen" -#: optiondialog.cpp:1486 +#: optiondialog.cpp:1543 #, kde-format msgid "Integration Settings" msgstr "Inbinnen instellen" -#: optiondialog.cpp:1499 +#: optiondialog.cpp:1564 #, kde-format msgid "Command line options to ignore:" msgstr "Befehlsreeg-Optschonen, de övergahn warrt:" -#: optiondialog.cpp:1505 +#: optiondialog.cpp:1570 #, kde-format msgid "" "List of command line options that should be ignored when KDiff3 is used by " @@ -3052,12 +3070,12 @@ "Du kannst mehr Weerten angeven, wenn dor twischen en \";\" steiht.\n" "Dit verhöödt den \"Nich begäng Optschoon\"-Fehler." -#: optiondialog.cpp:1510 +#: optiondialog.cpp:1575 #, kde-format msgid "Quit also via Escape key" msgstr "Ok mit ESC-Tast utmaken" -#: optiondialog.cpp:1514 +#: optiondialog.cpp:1579 #, kde-format msgid "" "Fast method to exit.\n" @@ -3066,7 +3084,7 @@ "Gau Metood för't Utmaken.\n" "För de Lüüd, de de ESC-Tast anworrn sünd." -#: optiondialog.cpp:1598 +#: optiondialog.cpp:1653 #, kde-format msgid "This resets all options. Not only those of the current topic." msgstr "" @@ -3123,78 +3141,69 @@ msgid "Disable Unsafe Options" msgstr "Nich seker Optschonen utmaken" -#: pdiff.cpp:158 +#: pdiff.cpp:160 #, kde-format msgid "Loading A" msgstr "A warrt laadt" -#: pdiff.cpp:167 -#, kde-format -msgid "Errors occurred during pre-processing of file A." -msgstr "" +#: pdiff.cpp:162 +#, fuzzy, kde-format +#| msgid "Loading A" +msgid "Loading A: %1" +msgstr "A warrt laadt" -#: pdiff.cpp:172 +#: pdiff.cpp:170 #, kde-format msgid "Loading B" msgstr "B warrt laadt" -#: pdiff.cpp:179 -#, kde-format -msgid "Errors occurred during pre-processing of file B." -msgstr "" - -#: pdiff.cpp:202 pdiff.cpp:241 +#: pdiff.cpp:201 pdiff.cpp:237 #, kde-format msgid "Diff: A <-> B" msgstr "Verscheel: A <-> B" -#: pdiff.cpp:208 pdiff.cpp:279 pdiff.cpp:293 +#: pdiff.cpp:207 pdiff.cpp:275 pdiff.cpp:289 #, kde-format msgid "Linediff: A <-> B" msgstr "Reegverscheel: A <-> B" -#: pdiff.cpp:225 +#: pdiff.cpp:224 #, kde-format msgid "Loading C" msgstr "C warrt laadt" -#: pdiff.cpp:232 -#, kde-format -msgid "Errors occurred during pre-processing of file C." -msgstr "" - -#: pdiff.cpp:250 +#: pdiff.cpp:246 #, kde-format msgid "Diff: A <-> C" msgstr "Verscheel: A <-> C" -#: pdiff.cpp:261 +#: pdiff.cpp:257 #, kde-format msgid "Diff: B <-> C" msgstr "Verscheel: B <-> C" -#: pdiff.cpp:283 pdiff.cpp:297 +#: pdiff.cpp:279 pdiff.cpp:293 #, kde-format msgid "Linediff: B <-> C" msgstr "Reegverscheel: B <-> C" -#: pdiff.cpp:287 pdiff.cpp:301 +#: pdiff.cpp:283 pdiff.cpp:297 #, kde-format msgid "Linediff: A <-> C" msgstr "Reegverscheel: A <-> C" -#: pdiff.cpp:829 +#: pdiff.cpp:819 #, kde-format 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:835 pdiff.cpp:839 pdiff.cpp:843 +#: pdiff.cpp:825 pdiff.cpp:829 pdiff.cpp:833 #, 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:853 +#: pdiff.cpp:843 #, fuzzy, kde-format #| msgid "" #| "Some inputfiles don't seem to be pure textfiles.\n" @@ -3209,17 +3218,17 @@ "Beacht, KDiff3 is nich för't Tosamenföhren vun Bineerdaten maakt.\n" "Maak man op Dien egen Riskanz wieder." -#: pdiff.cpp:863 +#: pdiff.cpp:853 #, kde-format msgid ", B" msgstr "" -#: pdiff.cpp:865 +#: pdiff.cpp:855 #, kde-format msgid ", C" msgstr "" -#: pdiff.cpp:867 +#: pdiff.cpp:857 #, fuzzy, kde-format #| msgid "" #| "Some input characters could not be converted to valid unicode.\n" @@ -3239,77 +3248,72 @@ "Dien egen Riskanz wiedermaken.\n" "De bedrapen Ingaavdateien liggt in %1." -#: pdiff.cpp:1034 +#: pdiff.cpp:1032 #, kde-format msgid "Abort" msgstr "Afbreken" -#: pdiff.cpp:1040 pdiff.cpp:1130 +#: pdiff.cpp:1038 pdiff.cpp:1129 #, kde-format msgid "Opening files..." msgstr "Dateien warrt opmaakt..." -#: pdiff.cpp:1107 -#, kde-format -msgid "File open error" -msgstr "Fehler bi't Datei-Opmaken" - -#: pdiff.cpp:1202 +#: pdiff.cpp:1212 #, kde-format msgid "Cutting selection..." msgstr "Köör warrt knippt..." -#: pdiff.cpp:1223 +#: pdiff.cpp:1233 #, kde-format msgid "Copying selection to clipboard..." msgstr "Köör warrt na de Twischenaflaag kopeert..." -#: pdiff.cpp:1239 +#: pdiff.cpp:1249 #, kde-format msgid "Inserting clipboard contents..." msgstr "Twischenaflaag-Inholt warrt inföögt..." -#: pdiff.cpp:1695 +#: pdiff.cpp:1705 #, kde-format msgid "Word wrap (Cancel disables word wrap)" msgstr "" -#: pdiff.cpp:1696 +#: pdiff.cpp:1706 #, kde-format msgid "Calculating max width for horizontal scrollbar" msgstr "" -#: pdiff.cpp:1911 +#: pdiff.cpp:1921 #, kde-format msgid "Save && Continue" msgstr "Sekern un wiedermaken" -#: pdiff.cpp:1912 +#: pdiff.cpp:1922 #, kde-format msgid "Continue Without Saving" msgstr "Ahn Sekern wiedermaken" -#: pdiff.cpp:2124 +#: pdiff.cpp:2134 #, kde-format msgid "Search complete." msgstr "Söök afslaten." -#: pdiff.cpp:2124 +#: pdiff.cpp:2134 #, kde-format msgid "Search Complete" msgstr "Söök afslaten" -#: pdiff.cpp:2375 +#: pdiff.cpp:2385 #, kde-format msgid "Nothing is selected in either diff input window." msgstr "Binnen keen Verscheel-Ingaavfinster is wat utsöcht." -#: pdiff.cpp:2375 +#: pdiff.cpp:2385 #, kde-format msgid "Error while adding manual diff range" msgstr "Fehler bi't Tofögen vun en Verscheelrebeet vun Hand" -#: progress.cpp:59 progress.cpp:71 +#: progress.cpp:61 progress.cpp:73 #, kde-format msgid "&Cancel" msgstr "&Afbreken" @@ -3319,128 +3323,128 @@ msgid "A (Base):" msgstr "A (Basis):" -#: smalldialogs.cpp:68 smalldialogs.cpp:85 smalldialogs.cpp:102 -#: smalldialogs.cpp:144 +#: smalldialogs.cpp:71 smalldialogs.cpp:90 smalldialogs.cpp:109 +#: smalldialogs.cpp:154 #, kde-format msgid "File..." msgstr "Datei..." -#: smalldialogs.cpp:70 smalldialogs.cpp:87 smalldialogs.cpp:104 -#: smalldialogs.cpp:146 +#: smalldialogs.cpp:73 smalldialogs.cpp:92 smalldialogs.cpp:111 +#: smalldialogs.cpp:156 #, kde-format msgid "Dir..." msgstr "Orner..." -#: smalldialogs.cpp:96 +#: smalldialogs.cpp:103 #, kde-format msgid "C (Optional):" msgstr "C (köörwies):" -#: smalldialogs.cpp:119 +#: smalldialogs.cpp:126 #, fuzzy, kde-format #| msgid "Swap/Copy Names ..." msgid "Swap/Copy Names..." msgstr "Naams tuschen/koperen..." -#: smalldialogs.cpp:124 smalldialogs.cpp:125 smalldialogs.cpp:126 +#: smalldialogs.cpp:131 smalldialogs.cpp:132 smalldialogs.cpp:133 #, kde-format msgid "Swap %1<->%2" msgstr "%1<->%2 tuschen" -#: smalldialogs.cpp:127 smalldialogs.cpp:128 smalldialogs.cpp:129 +#: smalldialogs.cpp:134 smalldialogs.cpp:135 smalldialogs.cpp:136 #, kde-format msgid "Copy %1->Output" msgstr "%1 -> Utgaav koperen" -#: smalldialogs.cpp:130 smalldialogs.cpp:131 smalldialogs.cpp:132 +#: smalldialogs.cpp:137 smalldialogs.cpp:138 smalldialogs.cpp:139 #, kde-format msgid "Swap %1<->Output" msgstr "%1 <-> Utgaav tuschen" -#: smalldialogs.cpp:138 +#: smalldialogs.cpp:148 #, kde-format msgid "Output (optional):" msgstr "Utgaav (köörwies):" -#: smalldialogs.cpp:168 +#: smalldialogs.cpp:178 #, kde-format msgid "Configure..." msgstr "Instellen..." -#: smalldialogs.cpp:233 +#: smalldialogs.cpp:243 #, fuzzy, kde-format #| msgid "Directory" msgid "Open Directory" msgstr "Orner" -#: smalldialogs.cpp:234 +#: smalldialogs.cpp:244 #, kde-format msgid "Select Output File" msgstr "" -#: smalldialogs.cpp:393 +#: smalldialogs.cpp:403 #, kde-format msgid "Search text:" msgstr "Sööktext:" -#: smalldialogs.cpp:400 +#: smalldialogs.cpp:410 #, kde-format msgid "Case sensitive" msgstr "Op Groot-/Lüttschrieven kieken" -#: smalldialogs.cpp:403 +#: smalldialogs.cpp:413 #, kde-format msgid "Search A" msgstr "A dörkieken" -#: smalldialogs.cpp:408 +#: smalldialogs.cpp:418 #, kde-format msgid "Search B" msgstr "B dörkieken" -#: smalldialogs.cpp:413 +#: smalldialogs.cpp:423 #, kde-format msgid "Search C" msgstr "C dörkieken" -#: smalldialogs.cpp:418 +#: smalldialogs.cpp:428 #, kde-format msgid "Search output" msgstr "Utgaav dörkieken" -#: smalldialogs.cpp:425 +#: smalldialogs.cpp:435 #, kde-format msgid "&Search" msgstr "&Söken" -#: smalldialogs.cpp:444 +#: smalldialogs.cpp:454 #, kde-format msgid "Regular Expression Tester" msgstr "Reguleer Utdrück utproberen" -#: smalldialogs.cpp:457 +#: smalldialogs.cpp:467 #, kde-format msgid "Example auto merge line:" msgstr "Bispillreeg för't autom. Tosamenföhren:" -#: smalldialogs.cpp:459 +#: smalldialogs.cpp:469 #, kde-format msgid "To test auto merge, copy a line as used in your files." msgstr "" "Kopeer en Reeg, as se binnen Dien Dateien vörkamen kann, wenn Du dat autom. " "Tosamenföhren utproberen wullt." -#: smalldialogs.cpp:465 smalldialogs.cpp:493 smalldialogs.cpp:529 +#: smalldialogs.cpp:475 smalldialogs.cpp:503 smalldialogs.cpp:539 #, kde-format msgid "Match result:" msgstr "Passen Resultaat:" -#: smalldialogs.cpp:484 +#: smalldialogs.cpp:494 #, kde-format msgid "Example history start line (with leading comment):" msgstr "Bispillreeg för en Vörgeschicht-Anfang (mit vöranstellt Kommentar):" -#: smalldialogs.cpp:486 +#: smalldialogs.cpp:496 #, kde-format msgid "" "Copy a history start line as used in your files,\n" @@ -3450,18 +3454,18 @@ "Dien Dateien vörkamen kann, un ok den vöranstellten\n" "Kommentar." -#: smalldialogs.cpp:512 +#: smalldialogs.cpp:522 #, kde-format msgid "History sort key order:" msgstr "Vörgeschicht-Sorteerreeg:" -#: smalldialogs.cpp:520 +#: smalldialogs.cpp:530 #, kde-format msgid "Example history entry start line (without leading comment):" msgstr "" "Bispillreeg för en Vörgeschichtindrag-Anfang (ahn vöranstellt Kommentar):" -#: smalldialogs.cpp:522 +#: smalldialogs.cpp:532 #, kde-format msgid "" "Copy a history entry start line as used in your files,\n" @@ -3471,49 +3475,49 @@ "binnen Dien Dateien vörkamen kann, man nich den\n" "vöranstellten Kommentar." -#: smalldialogs.cpp:536 +#: smalldialogs.cpp:546 #, kde-format msgid "Sort key result:" msgstr "Sorteerresultaat:" -#: smalldialogs.cpp:584 smalldialogs.cpp:594 smalldialogs.cpp:614 +#: smalldialogs.cpp:594 smalldialogs.cpp:604 smalldialogs.cpp:624 #, kde-format msgid "Match success." msgstr "Dreper funnen." -#: smalldialogs.cpp:588 smalldialogs.cpp:598 smalldialogs.cpp:620 +#: smalldialogs.cpp:598 smalldialogs.cpp:608 smalldialogs.cpp:630 #, kde-format msgid "Match failed." msgstr "Keen Dreper funnen." -#: smalldialogs.cpp:605 +#: smalldialogs.cpp:615 #, kde-format msgid "Opening and closing parentheses do not match in regular expression." msgstr "" "Binnen den reguleren Utdruck passt de linken un rechten Klemmen nich tosamen." -#: SourceData.cpp:150 +#: SourceData.cpp:153 #, kde-format msgid "Writing clipboard data to temp file failed." msgstr "Twischenaflaag-Daten laat sik nich as Temporeerdatei sekern." -#: SourceData.cpp:154 +#: SourceData.cpp:157 #, kde-format msgid "From Clipboard" msgstr "Ut Twischenaflaag" -#: SourceData.cpp:335 +#: SourceData.cpp:348 #, fuzzy, kde-format #| msgid "Mix of links and normal files." msgid "%1 is not a normal file." msgstr "Mischen vun Links un normaal Dateien" -#: SourceData.cpp:427 +#: SourceData.cpp:440 #, kde-format msgid " Temp file is: %1" msgstr "" -#: SourceData.cpp:432 +#: SourceData.cpp:445 #, kde-format msgid "" "Preprocessing possibly failed. Check this command:\n" @@ -3528,12 +3532,12 @@ "\n" "De Vörverarbeid-Befehl warrt nu utmaakt." -#: SourceData.cpp:443 SourceData.cpp:512 +#: SourceData.cpp:456 SourceData.cpp:525 #, kde-format msgid "File %1 too large to process. Skipping." msgstr "" -#: SourceData.cpp:487 +#: SourceData.cpp:500 #, kde-format msgid "" "The line-matching-preprocessing possibly failed. Check this command:\n" diff -Nru kdiff3-1.8.01/po/nl/diff_ext.po kdiff3-1.8.3/po/nl/diff_ext.po --- kdiff3-1.8.01/po/nl/diff_ext.po 2019-05-18 01:02:16.000000000 +0000 +++ kdiff3-1.8.3/po/nl/diff_ext.po 2020-06-25 00:18:39.000000000 +0000 @@ -5,8 +5,8 @@ msgid "" msgstr "" "Project-Id-Version: \n" -"Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2019-03-22 03:09+0100\n" +"Report-Msgid-Bugs-To: https://bugs.kde.org\n" +"POT-Creation-Date: 2019-11-04 07:54+0100\n" "PO-Revision-Date: 2018-08-08 15:57+0100\n" "Last-Translator: Freek de Kruijf \n" "Language-Team: Dutch \n" @@ -17,119 +17,114 @@ "Plural-Forms: nplurals=2; plural=n != 1;\n" "X-Generator: Lokalize 2.0\n" -#: diff_ext.cpp:391 +#: diff_ext.cpp:223 #, kde-format msgid "Compare with %1" msgstr "Vergelijken met %1" -#: diff_ext.cpp:392 +#: diff_ext.cpp:224 #, kde-format msgid "Merge with %1" msgstr "Samenvoegen met %1" -#: diff_ext.cpp:408 +#: diff_ext.cpp:234 #, kde-format msgid "3-way merge with base" msgstr "3-weg samenvoeging met basis" -#: diff_ext.cpp:411 +#: diff_ext.cpp:237 #, kde-format msgid "Save '%1' for later" msgstr "'%1' voor later gebruik opslaan" -#: diff_ext.cpp:426 +#: diff_ext.cpp:251 #, kde-format msgid "Compare with ..." msgstr "Vergelijken met..." -#: diff_ext.cpp:429 +#: diff_ext.cpp:254 #, kde-format msgid "Clear list" msgstr "Lijst wissen" -#: diff_ext.cpp:434 +#: diff_ext.cpp:259 #, kde-format msgid "Compare" msgstr "Vergelijken" -#: diff_ext.cpp:438 +#: diff_ext.cpp:263 #, kde-format msgid "3 way comparison" msgstr "3-weg vergelijking" -#: diff_ext.cpp:444 +#: diff_ext.cpp:269 #, kde-format msgid "About Diff-Ext ..." msgstr "Info over Diff-Ext ..." -#: diff_ext.cpp:515 +#: diff_ext.cpp:340 #, kde-format msgid "(32 Bit)" msgstr "(32 Bit)" -#: diff_ext.cpp:517 -#, kde-format -msgid "(64 Bit)" -msgstr "(64 Bit)" - -#: diff_ext.cpp:518 +#: diff_ext.cpp:342 #, kde-format msgid "Diff-Ext Copyright (c) 2003-2006, Sergey Zorin. All rights reserved.\n" msgstr "" "Diff-Ext Copyright (c) 2003-2006, Sergey Zorin. Alle rechten voorbehouden.\n" -#: diff_ext.cpp:519 +#: diff_ext.cpp:343 #, kde-format msgid "This software is distributable under the BSD-2-Clause license.\n" msgstr "" "Deze software mag gedistribueerd worden onder de BSD-2-Clause licentie.\n" -#: diff_ext.cpp:520 +#: diff_ext.cpp:344 #, kde-format msgid "Some extensions for KDiff3 (c) 2006-2013 by Joachim Eibl.\n" msgstr "Enige extensies voor KDiff3 (c) 2006-2013 door Joachim Eibl.\n" -#: diff_ext.cpp:521 +#: diff_ext.cpp:345 #, kde-format msgid "Homepage for Diff-Ext: http://diff-ext.sourceforge.net\n" msgstr "Homepagina voor Diff-Ext: http://diff-ext.sourceforge.net\n" -#: diff_ext.cpp:522 +#: diff_ext.cpp:346 #, kde-format msgid "About Diff-Ext for KDiff3 " msgstr "Info over Diff-Ext voor KDiff3 " -#: diff_ext.cpp:551 +#: diff_ext.cpp:375 #, kde-format msgid "Compare selected files" msgstr "Geselecteerde bestanden vergelijken" -#: diff_ext.cpp:557 diff_ext.cpp:577 +#: diff_ext.cpp:381 diff_ext.cpp:399 #, kde-format msgid "Compare '%1' with '%2'" msgstr "'%1' vergelijken met '%2'" -#: diff_ext.cpp:563 +#: diff_ext.cpp:386 #, kde-format msgid "Save '%1' for later operation" msgstr "'%1' voor latere bewerking opslaan" -#: diff_ext.cpp:619 +#: diff_ext.cpp:440 #, kde-format msgid "Could not start KDiff3. Please rerun KDiff3 installation." msgstr "Kon KDiff3 niet starten. Doe de installatie van KDiff3 opnieuw." -#: diff_ext.cpp:620 +#: diff_ext.cpp:441 #, kde-format msgid "Command" msgstr "Commando" -#: diff_ext.cpp:621 +#: diff_ext.cpp:442 #, kde-format msgid "CommandLine" msgstr "CommandoRegel" -#: diff_ext.cpp:622 +#: diff_ext.cpp:443 #, kde-format msgid "Diff-Ext For KDiff3" msgstr "Diff-Ext voor KDiff3" \ No newline at end of file diff -Nru kdiff3-1.8.01/po/nl/docs/kdiff3/index.docbook kdiff3-1.8.3/po/nl/docs/kdiff3/index.docbook --- kdiff3-1.8.01/po/nl/docs/kdiff3/index.docbook 2019-05-18 01:02:51.000000000 +0000 +++ kdiff3-1.8.3/po/nl/docs/kdiff3/index.docbook 2020-06-25 00:19:23.000000000 +0000 @@ -70,7 +70,7 @@ 2019-02-22 1.08.00 +>1.08.02 @@ -2711,8 +2711,8 @@ Vraag en antwoord -&reporting.bugs; &updating.documentation; +>Vraag en antwoord&reporting.bugs; &updating.documentation; joachim.eibl at gmx.de -&meld.fouten;&vertaling.sander;&vertaling.freek; -&underFDL; &underGPL; +&meld.fouten;&vertaling.sander;&vertaling.freek; &underFDL; &underGPL; &documentation.index; diff -Nru kdiff3-1.8.01/po/nl/kdiff3fileitemactionplugin.po kdiff3-1.8.3/po/nl/kdiff3fileitemactionplugin.po --- kdiff3-1.8.01/po/nl/kdiff3fileitemactionplugin.po 2019-05-18 01:02:16.000000000 +0000 +++ kdiff3-1.8.3/po/nl/kdiff3fileitemactionplugin.po 2020-06-25 00:18:39.000000000 +0000 @@ -5,8 +5,8 @@ msgid "" msgstr "" "Project-Id-Version: \n" -"Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2019-03-22 03:09+0100\n" +"Report-Msgid-Bugs-To: https://bugs.kde.org\n" +"POT-Creation-Date: 2019-08-30 07:40+0200\n" "PO-Revision-Date: 2019-03-22 11:08+0100\n" "Last-Translator: Freek de Kruijf \n" "Language-Team: Dutch \n" diff -Nru kdiff3-1.8.01/po/nl/kdiff3.po kdiff3-1.8.3/po/nl/kdiff3.po --- kdiff3-1.8.01/po/nl/kdiff3.po 2019-05-18 01:02:16.000000000 +0000 +++ kdiff3-1.8.3/po/nl/kdiff3.po 2020-06-25 00:18:39.000000000 +0000 @@ -1,13 +1,13 @@ # Copyright (C) YEAR This_file_is_part_of_KDE # This file is distributed under the same license as the PACKAGE package. # -# Freek de Kruijf , 2018, 2019. +# Freek de Kruijf , 2018, 2019, 2020. msgid "" msgstr "" "Project-Id-Version: \n" -"Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2019-04-18 08:02+0200\n" -"PO-Revision-Date: 2019-03-09 12:16+0100\n" +"Report-Msgid-Bugs-To: https://bugs.kde.org\n" +"POT-Creation-Date: 2020-06-22 07:48+0200\n" +"PO-Revision-Date: 2020-02-08 21:30+0100\n" "Last-Translator: Freek de Kruijf \n" "Language-Team: Dutch \n" "Language: nl\n" @@ -15,297 +15,297 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Generator: Lokalize 18.12.2\n" +"X-Generator: Lokalize 19.12.1\n" #, kde-format msgctxt "NAME OF TRANSLATORS" msgid "Your names" -msgstr "Freek de Kruijf - t/m 2019" +msgstr "Freek de Kruijf - t/m 2020" #, kde-format msgctxt "EMAIL OF TRANSLATORS" msgid "Your emails" msgstr "freekdekruijf@kde.nl" -#: difftextwindow.cpp:412 +#: difftextwindow.cpp:414 #, kde-format msgid "File %1: Line %2" msgstr "Bestand %1: regel %2" -#: difftextwindow.cpp:414 +#: difftextwindow.cpp:416 #, kde-format msgid "File %1: Line not available" msgstr "Bestand %1: regel niet beschikbaar" -#: difftextwindow.cpp:1780 +#: difftextwindow.cpp:1778 #, kde-format msgid "Encoding:" msgstr "Codering:" -#: difftextwindow.cpp:1782 mergeresultwindow.cpp:3138 optiondialog.cpp:818 +#: difftextwindow.cpp:1781 mergeresultwindow.cpp:3166 optiondialog.cpp:840 #, kde-format msgid "Line end style:" msgstr "Regeleinde:" -#: difftextwindow.cpp:1810 directorymergewindow.cpp:382 -#: directorymergewindow.cpp:433 directorymergewindow.cpp:524 -#: directorymergewindow.cpp:3058 directorymergewindow.cpp:3189 -#: directorymergewindow.cpp:3417 mergeresultwindow.cpp:942 -#: mergeresultwindow.cpp:944 mergeresultwindow.cpp:946 -#: mergeresultwindow.cpp:948 mergeresultwindow.cpp:1814 -#: mergeresultwindow.cpp:3170 mergeresultwindow.cpp:3177 optiondialog.cpp:962 -#: optiondialog.cpp:975 pdiff.cpp:833 pdiff.cpp:835 pdiff.cpp:837 pdiff.cpp:839 -#: pdiff.cpp:861 smalldialogs.cpp:124 smalldialogs.cpp:126 smalldialogs.cpp:127 -#: smalldialogs.cpp:130 +#: difftextwindow.cpp:1809 directorymergewindow.cpp:383 +#: directorymergewindow.cpp:434 directorymergewindow.cpp:525 +#: directorymergewindow.cpp:3072 directorymergewindow.cpp:3203 +#: directorymergewindow.cpp:3431 mergeresultwindow.cpp:970 +#: mergeresultwindow.cpp:972 mergeresultwindow.cpp:974 +#: mergeresultwindow.cpp:976 mergeresultwindow.cpp:1842 +#: mergeresultwindow.cpp:3198 mergeresultwindow.cpp:3205 optiondialog.cpp:1002 +#: optiondialog.cpp:1015 pdiff.cpp:823 pdiff.cpp:825 pdiff.cpp:827 +#: pdiff.cpp:829 pdiff.cpp:851 smalldialogs.cpp:131 smalldialogs.cpp:133 +#: smalldialogs.cpp:134 smalldialogs.cpp:137 #, kde-format msgid "A" msgstr "A" -#: difftextwindow.cpp:1810 directorymergewindow.cpp:384 -#: directorymergewindow.cpp:436 directorymergewindow.cpp:526 -#: directorymergewindow.cpp:3064 directorymergewindow.cpp:3190 -#: directorymergewindow.cpp:3418 mergeresultwindow.cpp:942 -#: mergeresultwindow.cpp:944 mergeresultwindow.cpp:950 -#: mergeresultwindow.cpp:952 mergeresultwindow.cpp:1816 -#: mergeresultwindow.cpp:3172 mergeresultwindow.cpp:3179 optiondialog.cpp:963 -#: optiondialog.cpp:976 pdiff.cpp:833 pdiff.cpp:835 pdiff.cpp:841 pdiff.cpp:843 -#: pdiff.cpp:863 smalldialogs.cpp:124 smalldialogs.cpp:125 smalldialogs.cpp:128 -#: smalldialogs.cpp:131 +#: difftextwindow.cpp:1809 directorymergewindow.cpp:385 +#: directorymergewindow.cpp:437 directorymergewindow.cpp:527 +#: directorymergewindow.cpp:3078 directorymergewindow.cpp:3204 +#: directorymergewindow.cpp:3432 mergeresultwindow.cpp:970 +#: mergeresultwindow.cpp:972 mergeresultwindow.cpp:978 +#: mergeresultwindow.cpp:980 mergeresultwindow.cpp:1844 +#: mergeresultwindow.cpp:3200 mergeresultwindow.cpp:3207 optiondialog.cpp:1003 +#: optiondialog.cpp:1016 pdiff.cpp:823 pdiff.cpp:825 pdiff.cpp:831 +#: pdiff.cpp:833 pdiff.cpp:853 smalldialogs.cpp:131 smalldialogs.cpp:132 +#: smalldialogs.cpp:135 smalldialogs.cpp:138 #, kde-format msgid "B" msgstr "B" -#: difftextwindow.cpp:1810 directorymergewindow.cpp:386 -#: directorymergewindow.cpp:439 directorymergewindow.cpp:528 -#: directorymergewindow.cpp:3070 directorymergewindow.cpp:3191 -#: directorymergewindow.cpp:3419 mergeresultwindow.cpp:946 -#: mergeresultwindow.cpp:948 mergeresultwindow.cpp:950 -#: mergeresultwindow.cpp:952 mergeresultwindow.cpp:1818 -#: mergeresultwindow.cpp:3174 mergeresultwindow.cpp:3181 optiondialog.cpp:977 -#: pdiff.cpp:837 pdiff.cpp:839 pdiff.cpp:841 pdiff.cpp:843 pdiff.cpp:865 -#: smalldialogs.cpp:125 smalldialogs.cpp:126 smalldialogs.cpp:129 -#: smalldialogs.cpp:132 +#: difftextwindow.cpp:1809 directorymergewindow.cpp:387 +#: directorymergewindow.cpp:440 directorymergewindow.cpp:529 +#: directorymergewindow.cpp:3084 directorymergewindow.cpp:3205 +#: directorymergewindow.cpp:3433 mergeresultwindow.cpp:974 +#: mergeresultwindow.cpp:976 mergeresultwindow.cpp:978 +#: mergeresultwindow.cpp:980 mergeresultwindow.cpp:1846 +#: mergeresultwindow.cpp:3202 mergeresultwindow.cpp:3209 optiondialog.cpp:1017 +#: pdiff.cpp:827 pdiff.cpp:829 pdiff.cpp:831 pdiff.cpp:833 pdiff.cpp:855 +#: smalldialogs.cpp:132 smalldialogs.cpp:133 smalldialogs.cpp:136 +#: smalldialogs.cpp:139 #, kde-format msgid "C" msgstr "C" -#: difftextwindow.cpp:1810 +#: difftextwindow.cpp:1809 #, kde-format msgid "A (Base)" msgstr "A (basis)" -#: difftextwindow.cpp:1812 +#: difftextwindow.cpp:1811 #, kde-format msgid "Encoding: %1" msgstr "Codering: %1" -#: difftextwindow.cpp:1813 mergeresultwindow.cpp:3183 +#: difftextwindow.cpp:1812 mergeresultwindow.cpp:3211 #, kde-format msgid "Unix" msgstr "Unix" -#: difftextwindow.cpp:1813 mergeresultwindow.cpp:3184 +#: difftextwindow.cpp:1812 mergeresultwindow.cpp:3212 #, kde-format msgid "DOS" msgstr "DOS" -#: difftextwindow.cpp:1813 +#: difftextwindow.cpp:1812 #, kde-format msgid "Line end style: %1" msgstr "Stijl regeleinde: %1" -#: difftextwindow.cpp:1835 kdiff3.cpp:873 +#: difftextwindow.cpp:1834 kdiff3.cpp:874 #, kde-format msgid "Top line" msgstr "Bovenste regel" -#: difftextwindow.cpp:1845 +#: difftextwindow.cpp:1843 #, kde-format msgid "End" msgstr "Einde" -#: difftextwindow.cpp:1903 smalldialogs.cpp:235 +#: difftextwindow.cpp:1901 smalldialogs.cpp:245 #, kde-format msgid "Open File" msgstr "Bestand openen" -#: difftextwindow.cpp:1951 optiondialog.cpp:387 +#: difftextwindow.cpp:1943 optiondialog.cpp:389 #, kde-format msgid "Unicode, 8 bit" msgstr "Unicode, 8 bit" -#: difftextwindow.cpp:1966 +#: difftextwindow.cpp:1958 #, kde-format msgid "Other" msgstr "Overig" -#: directorymergewindow.cpp:409 directorymergewindow.cpp:3424 +#: directorymergewindow.cpp:410 directorymergewindow.cpp:3438 #, kde-format msgid "Copy A to B" msgstr "A naar B kopiëren" -#: directorymergewindow.cpp:412 directorymergewindow.cpp:3425 +#: directorymergewindow.cpp:413 directorymergewindow.cpp:3439 #, kde-format msgid "Copy B to A" msgstr "B naar A kopiëren" -#: directorymergewindow.cpp:415 directorymergewindow.cpp:3426 +#: directorymergewindow.cpp:416 directorymergewindow.cpp:3440 #, kde-format msgid "Delete A" msgstr "A verwijderen" -#: directorymergewindow.cpp:418 directorymergewindow.cpp:3427 +#: directorymergewindow.cpp:419 directorymergewindow.cpp:3441 #, kde-format msgid "Delete B" msgstr "B verwijderen" -#: directorymergewindow.cpp:421 +#: directorymergewindow.cpp:422 #, kde-format msgid "Delete A & B" msgstr "A & B verwijderen" -#: directorymergewindow.cpp:424 directorymergewindow.cpp:3429 +#: directorymergewindow.cpp:425 directorymergewindow.cpp:3443 #, kde-format msgid "Merge to A" msgstr "Samenvoegen met A" -#: directorymergewindow.cpp:427 directorymergewindow.cpp:3430 +#: directorymergewindow.cpp:428 directorymergewindow.cpp:3444 #, kde-format msgid "Merge to B" msgstr "Samenvoegen met B" -#: directorymergewindow.cpp:430 +#: directorymergewindow.cpp:431 #, kde-format msgid "Merge to A & B" msgstr "Samenvoegen met A & B" -#: directorymergewindow.cpp:442 directorymergewindow.cpp:3421 +#: directorymergewindow.cpp:443 directorymergewindow.cpp:3435 #, kde-format msgid "Delete (if exists)" msgstr "Verwijderen (indien voorhanden)" -#: directorymergewindow.cpp:445 directorymergewindow.cpp:448 -#: directorymergewindow.cpp:3420 optiondialog.cpp:925 smalldialogs.cpp:113 +#: directorymergewindow.cpp:446 directorymergewindow.cpp:449 +#: directorymergewindow.cpp:3434 smalldialogs.cpp:120 #, kde-format msgid "Merge" msgstr "Samenvoegen" -#: directorymergewindow.cpp:445 directorymergewindow.cpp:448 +#: directorymergewindow.cpp:446 directorymergewindow.cpp:449 #, kde-format msgid "Merge (manual)" msgstr "Samenvoegen (handmatig)" -#: directorymergewindow.cpp:451 +#: directorymergewindow.cpp:452 #, kde-format msgid "Error: Conflicting File Types" msgstr "Fout: botsende bestandstypen" -#: directorymergewindow.cpp:454 +#: directorymergewindow.cpp:455 #, kde-format msgid "Error: Changed and Deleted" msgstr "Fout: gewijzigd en verwijderd" -#: directorymergewindow.cpp:457 +#: directorymergewindow.cpp:458 #, kde-format msgid "Error: Dates are equal but files are not." msgstr "Fout: de datums zijn hetzelfde, maar de bestanden niet." -#: directorymergewindow.cpp:471 +#: directorymergewindow.cpp:472 #, kde-format msgid "Done" msgstr "Gereed" -#: directorymergewindow.cpp:473 +#: directorymergewindow.cpp:474 #, kde-format msgid "Error" msgstr "Fout" -#: directorymergewindow.cpp:475 +#: directorymergewindow.cpp:476 #, kde-format msgid "Skipped." msgstr "Overgeslagen." -#: directorymergewindow.cpp:477 +#: directorymergewindow.cpp:478 #, kde-format msgid "Not saved." msgstr "Niet opgeslagen." -#: directorymergewindow.cpp:479 +#: directorymergewindow.cpp:480 #, kde-format msgid "In progress..." msgstr "In uitvoering..." -#: directorymergewindow.cpp:481 +#: directorymergewindow.cpp:482 #, kde-format msgid "To do." msgstr "Onvoltooid." -#: directorymergewindow.cpp:522 +#: directorymergewindow.cpp:523 #, kde-format msgid "Name" msgstr "Naam" -#: directorymergewindow.cpp:530 +#: directorymergewindow.cpp:531 #, kde-format msgid "Operation" msgstr "Bewerking" -#: directorymergewindow.cpp:532 +#: directorymergewindow.cpp:533 #, kde-format msgid "Status" msgstr "Status" -#: directorymergewindow.cpp:534 +#: directorymergewindow.cpp:535 #, kde-format msgid "Unsolved" msgstr "Niet opgelost" -#: directorymergewindow.cpp:536 +#: directorymergewindow.cpp:537 #, kde-format msgid "Solved" msgstr "Opgelost" -#: directorymergewindow.cpp:538 +#: directorymergewindow.cpp:539 #, kde-format msgid "Nonwhite" msgstr "Niet-wit" -#: directorymergewindow.cpp:540 +#: directorymergewindow.cpp:541 #, kde-format msgid "White" msgstr "Wit" -#: directorymergewindow.cpp:674 +#: directorymergewindow.cpp:676 #, kde-format msgid "Unable to compare non-normal file with normal file." msgstr "Kan niet-normaal bestand niet vergelijken met normaal bestand." -#: directorymergewindow.cpp:688 +#: directorymergewindow.cpp:690 #, kde-format msgid "Mix of links and normal files." msgstr "Mix van koppelingen en bestanden." -#: directorymergewindow.cpp:695 +#: directorymergewindow.cpp:697 #, kde-format msgid "Link: " msgstr "Koppeling: " -#: directorymergewindow.cpp:704 +#: directorymergewindow.cpp:706 #, kde-format msgid "Size. " msgstr "Grootte: " -#: directorymergewindow.cpp:718 directorymergewindow.cpp:728 +#: directorymergewindow.cpp:720 directorymergewindow.cpp:730 #, kde-format msgid "Date & Size: " msgstr "Datum en grootte: " -#: directorymergewindow.cpp:748 +#: directorymergewindow.cpp:751 #, kde-format msgid "Comparing file..." msgstr "Bestand wordt vergeleken..." -#: directorymergewindow.cpp:801 +#: directorymergewindow.cpp:813 #, kde-format msgid "" "You are currently doing a directory merge. Are you sure, you want to abort " @@ -314,48 +314,48 @@ "U bent momenteel bezig met het samenvoegen van een map. Wilt u dat, of wilt " "u het samenvoegen afbreken en de map opnieuw inlezen?" -#: directorymergewindow.cpp:802 kdiff3.cpp:698 kdiff3.cpp:708 kdiff3.cpp:720 -#: mergeresultwindow.cpp:372 pdiff.cpp:1033 pdiff.cpp:1910 pdiff.cpp:1920 +#: directorymergewindow.cpp:814 kdiff3.cpp:697 kdiff3.cpp:707 kdiff3.cpp:719 +#: mergeresultwindow.cpp:400 pdiff.cpp:1031 pdiff.cpp:1920 pdiff.cpp:1930 #, kde-format msgid "Warning" msgstr "Waarschuwing" -#: directorymergewindow.cpp:803 directorymergewindow.cpp:3393 +#: directorymergewindow.cpp:815 directorymergewindow.cpp:3407 #, kde-format msgid "Rescan" msgstr "Opnieuw scannen" -#: directorymergewindow.cpp:804 pdiff.cpp:1035 +#: directorymergewindow.cpp:816 pdiff.cpp:1033 #, kde-format msgid "Continue Merging" msgstr "Doorgaan met samenvoegen" -#: directorymergewindow.cpp:971 +#: directorymergewindow.cpp:984 #, kde-format msgid "Opening of directories failed:" msgstr "Het openen van de mappen is mislukt:" -#: directorymergewindow.cpp:975 +#: directorymergewindow.cpp:988 #, kde-format msgid "Dir A \"%1\" does not exist or is not a directory.\n" msgstr "Map A \"%1\" bestaat niet of is geen map.\n" -#: directorymergewindow.cpp:980 +#: directorymergewindow.cpp:993 #, kde-format msgid "Dir B \"%1\" does not exist or is not a directory.\n" msgstr "Map B \"%1\" bestaat niet of is geen map.\n" -#: directorymergewindow.cpp:985 +#: directorymergewindow.cpp:998 #, kde-format msgid "Dir C \"%1\" does not exist or is not a directory.\n" msgstr "Map C \"%1\" bestaat niet of is geen map.\n" -#: directorymergewindow.cpp:988 +#: directorymergewindow.cpp:1001 #, kde-format msgid "Directory Open Error" msgstr "Fout bij openen van map" -#: directorymergewindow.cpp:996 +#: directorymergewindow.cpp:1009 #, kde-format msgid "" "The destination directory must not be the same as A or B when three " @@ -366,49 +366,49 @@ "samengevoegd.\n" "Controleer dit opnieuw voordat u doorgaat." -#: directorymergewindow.cpp:998 +#: directorymergewindow.cpp:1011 #, kde-format msgid "Parameter Warning" msgstr "Parameter-waarschuwing" -#: directorymergewindow.cpp:1003 +#: directorymergewindow.cpp:1016 #, kde-format msgid "Scanning directories..." msgstr "Scannen van mappen..." -#: directorymergewindow.cpp:1029 +#: directorymergewindow.cpp:1042 #, kde-format msgid "Reading Directory A" msgstr "Inlezen van map A" -#: directorymergewindow.cpp:1038 +#: directorymergewindow.cpp:1051 #, kde-format msgid "Reading Directory B" msgstr "Inlezen van map B" -#: directorymergewindow.cpp:1048 +#: directorymergewindow.cpp:1061 #, kde-format msgid "Reading Directory C" msgstr "Inlezen van map C" -#: directorymergewindow.cpp:1064 +#: directorymergewindow.cpp:1077 #, kde-format msgid "Some subdirectories were not readable in" msgstr "Sommige submappen zijn niet ingelezen" -#: directorymergewindow.cpp:1069 +#: directorymergewindow.cpp:1082 #, kde-format msgid "Check the permissions of the subdirectories." msgstr "Controleer de toegangsrechten van de submappen." -#: directorymergewindow.cpp:1106 kdiff3.cpp:666 kdiff3.cpp:753 kdiff3.cpp:777 -#: kdiff3.cpp:1065 kdiff3.cpp:1086 pdiff.cpp:1116 pdiff.cpp:1170 pdiff.cpp:1218 -#: pdiff.cpp:1234 pdiff.cpp:1277 pdiff.cpp:1301 +#: directorymergewindow.cpp:1119 kdiff3.cpp:665 kdiff3.cpp:752 kdiff3.cpp:776 +#: kdiff3.cpp:1072 kdiff3.cpp:1093 pdiff.cpp:1115 pdiff.cpp:1178 pdiff.cpp:1228 +#: pdiff.cpp:1244 pdiff.cpp:1287 pdiff.cpp:1311 #, kde-format msgid "Ready." msgstr "Gereed." -#: directorymergewindow.cpp:1121 +#: directorymergewindow.cpp:1134 #, kde-format msgid "" "Directory Comparison Status\n" @@ -423,22 +423,22 @@ "Aantal gelijke bestanden: %2\n" "Aantal verschillende bestanden: %3" -#: directorymergewindow.cpp:1128 +#: directorymergewindow.cpp:1141 #, kde-format msgid "Number of manual merges: %1" msgstr "Aantal handmatige samenvoegingen: %1" -#: directorymergewindow.cpp:1394 +#: directorymergewindow.cpp:1407 #, kde-format msgid "This affects all merge operations." msgstr "Dit heeft effect op alle samenvoegingen." -#: directorymergewindow.cpp:1395 +#: directorymergewindow.cpp:1408 #, kde-format msgid "Changing All Merge Operations" msgstr "Verandering van alle samenvoegingen" -#: directorymergewindow.cpp:1695 +#: directorymergewindow.cpp:1708 #, kde-format msgid "" "Processing %1 / %2\n" @@ -447,44 +447,44 @@ "Bezig met verwerken %1 / %2\n" "%3" -#: directorymergewindow.cpp:1738 directorymergewindow.cpp:1742 +#: directorymergewindow.cpp:1751 directorymergewindow.cpp:1755 #, kde-format msgid "Some files could not be processed." msgstr "Enkele bestanden konden niet verwerkt worden." -#: directorymergewindow.cpp:2222 directorymergewindow.cpp:2247 -#: directorymergewindow.cpp:2271 +#: directorymergewindow.cpp:2235 directorymergewindow.cpp:2260 +#: directorymergewindow.cpp:2285 #, kde-format msgid "This operation is currently not possible." msgstr "Deze handeling is momenteel niet beschikbaar." -#: directorymergewindow.cpp:2222 directorymergewindow.cpp:2247 -#: directorymergewindow.cpp:2271 directorymergewindow.cpp:2552 +#: directorymergewindow.cpp:2235 directorymergewindow.cpp:2260 +#: directorymergewindow.cpp:2285 directorymergewindow.cpp:2565 #, kde-format msgid "Operation Not Possible" msgstr "Handeling niet mogelijk" -#: directorymergewindow.cpp:2318 +#: directorymergewindow.cpp:2332 #, kde-format msgid "An error occurred while copying." msgstr "Er deed zich een fout voor tijdens het kopiëren." -#: directorymergewindow.cpp:2319 directorymergewindow.cpp:2759 +#: directorymergewindow.cpp:2333 directorymergewindow.cpp:2772 #, kde-format msgid "Merge Error" msgstr "Fout bij samenvoegen" -#: directorymergewindow.cpp:2396 +#: directorymergewindow.cpp:2410 #, kde-format msgid "Unknown merge operation. (This must never happen!)" msgstr "Onbekende samenvoeging. (Dit mag niet voorkomen!)" -#: directorymergewindow.cpp:2441 +#: directorymergewindow.cpp:2455 #, kde-format msgid "Unknown merge operation." msgstr "Onbekende samenvoeging." -#: directorymergewindow.cpp:2454 +#: directorymergewindow.cpp:2468 #, kde-format msgid "" "The merge is about to begin.\n" @@ -506,22 +506,22 @@ "GEEN ENKELE GARANTIE dat het programma naar behoren zal werken. Maak " "reservekopieën van uw vitale gegevens!" -#: directorymergewindow.cpp:2459 +#: directorymergewindow.cpp:2473 #, kde-format msgid "Starting Merge" msgstr "Samenvoeging starten" -#: directorymergewindow.cpp:2460 +#: directorymergewindow.cpp:2474 #, kde-format msgid "Do It" msgstr "Doe het" -#: directorymergewindow.cpp:2461 +#: directorymergewindow.cpp:2475 #, kde-format msgid "Simulate It" msgstr "Simuleren" -#: directorymergewindow.cpp:2487 +#: directorymergewindow.cpp:2501 #, kde-format msgid "" "The highlighted item has a different type in the different directories. " @@ -530,7 +530,7 @@ "Het gemarkeerde item is van een verschillend type in de verschillende " "mappen. Kies wat er moet gebeuren." -#: directorymergewindow.cpp:2491 +#: directorymergewindow.cpp:2505 #, kde-format msgid "" "The modification dates of the file are equal but the files are not. Select " @@ -539,7 +539,7 @@ "De wijzigingsdatums van het bestanden zijn gelijk, maar de bestanden niet. " "Kies wat er moet gebeuren." -#: directorymergewindow.cpp:2495 +#: directorymergewindow.cpp:2509 #, kde-format msgid "" "The highlighted item was changed in one directory and deleted in the other. " @@ -548,7 +548,7 @@ "Het gemarkeerde item is gewijzigd in één map en verwijderd in de andere. " "Kies wat er moet gebeuren." -#: directorymergewindow.cpp:2552 +#: directorymergewindow.cpp:2565 #, kde-format msgid "" "This operation is currently not possible because directory merge is " @@ -557,7 +557,7 @@ "Deze handeling is niet mogelijk omdat er momenteel een map wordt " "samengevoegd." -#: directorymergewindow.cpp:2609 +#: directorymergewindow.cpp:2622 #, kde-format msgid "" "There was an error in the last step.\n" @@ -568,32 +568,32 @@ "Wilt u doorgaan met het item dat de fout veroorzaakte of wilt u dit item " "overslaan?" -#: directorymergewindow.cpp:2611 +#: directorymergewindow.cpp:2624 #, kde-format msgid "Continue merge after an error" msgstr "Samenvoegen voortzetten na een foutmelding" -#: directorymergewindow.cpp:2612 +#: directorymergewindow.cpp:2625 #, kde-format msgid "Continue With Last Item" msgstr "Verdergaan met het laatste item" -#: directorymergewindow.cpp:2613 +#: directorymergewindow.cpp:2626 #, kde-format msgid "Skip Item" msgstr "Item overslaan" -#: directorymergewindow.cpp:2709 +#: directorymergewindow.cpp:2722 #, kde-format msgid "Merge operation complete." msgstr "De samenvoeging is voltooid." -#: directorymergewindow.cpp:2709 directorymergewindow.cpp:2712 +#: directorymergewindow.cpp:2722 directorymergewindow.cpp:2725 #, kde-format msgid "Merge Complete" msgstr "Samenvoeging voltooid" -#: directorymergewindow.cpp:2722 +#: directorymergewindow.cpp:2735 #, kde-format msgid "" "Simulated merge complete: Check if you agree with the proposed operations." @@ -601,48 +601,48 @@ "Samenvoegsimulatie is voltooid. Controleer of u akkoord kunt gaan met de " "voorgestelde handelingen." -#: directorymergewindow.cpp:2758 +#: directorymergewindow.cpp:2771 #, kde-format msgid "An error occurred. Press OK to see detailed information." msgstr "Er deed zich een fout voor. Klik op OK voor meer details." -#: directorymergewindow.cpp:2791 +#: directorymergewindow.cpp:2804 #, kde-format msgid "Error: While deleting %1: Creating backup failed." msgstr "Fout tijdens het wissen van %1: reservekopie aanmaken is mislukt." -#: directorymergewindow.cpp:2798 +#: directorymergewindow.cpp:2811 #, kde-format msgid "delete directory recursively( %1 )" msgstr "map ( %1 ) recursief wissen" -#: directorymergewindow.cpp:2800 +#: directorymergewindow.cpp:2813 #, kde-format msgid "delete( %1 )" msgstr "verwijderen( %1 )" -#: directorymergewindow.cpp:2815 +#: directorymergewindow.cpp:2828 #, kde-format msgid "Error: delete dir operation failed while trying to read the directory." msgstr "" "Fout: het wissen van de map is mislukt omdat de map niet kon worden geopend." -#: directorymergewindow.cpp:2834 +#: directorymergewindow.cpp:2847 #, kde-format msgid "Error: rmdir( %1 ) operation failed." msgstr "Fout: handeling voor map verwijderen( %1 ) is mislukt." -#: directorymergewindow.cpp:2844 +#: directorymergewindow.cpp:2857 #, kde-format msgid "Error: delete operation failed." msgstr "Fout: wissen is mislukt." -#: directorymergewindow.cpp:2870 +#: directorymergewindow.cpp:2884 #, kde-format msgid "manual merge( %1, %2, %3 -> %4)" msgstr "handmatig samenvoegen ( %1, %2, %3 -> %4)" -#: directorymergewindow.cpp:2873 +#: directorymergewindow.cpp:2887 #, kde-format msgid "" " Note: After a manual merge the user should continue by pressing F7." @@ -650,186 +650,186 @@ " Opmerking: na een handmatige samenvoeging dient de gebruiker verder te " "gaan via F7." -#: directorymergewindow.cpp:2900 +#: directorymergewindow.cpp:2914 #, 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:2909 +#: directorymergewindow.cpp:2923 #, kde-format msgid "copyLink( %1 -> %2 )" msgstr "Koppeling kopiëren ( %1 -> %2 )" -#: directorymergewindow.cpp:2918 +#: directorymergewindow.cpp:2932 #, kde-format 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:2928 +#: directorymergewindow.cpp:2942 #, kde-format msgid "Error: copyLink failed." msgstr "Fout: koppeling kopiëren is mislukt." -#: directorymergewindow.cpp:2953 +#: directorymergewindow.cpp:2967 #, kde-format msgid "copy( %1 -> %2 )" msgstr "kopiëren( %1 -> %2 )" -#: directorymergewindow.cpp:2979 +#: directorymergewindow.cpp:2993 #, 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:2986 +#: directorymergewindow.cpp:3000 #, kde-format msgid "rename( %1 -> %2 )" msgstr "hernoemen( %1 -> %2 )" -#: directorymergewindow.cpp:2995 +#: directorymergewindow.cpp:3009 #, kde-format msgid "Error: Rename failed." msgstr "Fout: hernoemen is mislukt." -#: directorymergewindow.cpp:3013 +#: directorymergewindow.cpp:3027 #, kde-format msgid "Error during makeDir of %1. Cannot delete existing file." msgstr "" "Fout tijdens het aanmaken van de map %1. Bestaand bestand kan niet worden " "gewist." -#: directorymergewindow.cpp:3030 +#: directorymergewindow.cpp:3044 #, kde-format msgid "makeDir( %1 )" msgstr "Directory aanmaken( %1 )" -#: directorymergewindow.cpp:3040 +#: directorymergewindow.cpp:3054 #, kde-format msgid "Error while creating directory." msgstr "Fout bij het aanmaken van de map." -#: directorymergewindow.cpp:3076 directorymergewindow.cpp:3195 +#: directorymergewindow.cpp:3090 directorymergewindow.cpp:3209 #, kde-format msgid "Dest" msgstr "Doel" -#: directorymergewindow.cpp:3084 directorymergewindow.cpp:3113 +#: directorymergewindow.cpp:3098 directorymergewindow.cpp:3127 #, kde-format msgid "Dir" msgstr "Directory" -#: directorymergewindow.cpp:3084 +#: directorymergewindow.cpp:3098 #, kde-format msgid "Type" msgstr "Type" -#: directorymergewindow.cpp:3084 +#: directorymergewindow.cpp:3098 #, kde-format msgid "Size" msgstr "Grootte" -#: directorymergewindow.cpp:3085 +#: directorymergewindow.cpp:3099 #, kde-format msgid "Attr" msgstr "Attr" -#: directorymergewindow.cpp:3085 +#: directorymergewindow.cpp:3099 #, kde-format msgid "Last Modification" msgstr "Laatste wijziging" -#: directorymergewindow.cpp:3085 +#: directorymergewindow.cpp:3099 #, kde-format msgid "Link-Destination" msgstr "Koppelingsbestemming" -#: directorymergewindow.cpp:3113 +#: directorymergewindow.cpp:3127 #, kde-format msgid "File" msgstr "Bestand" -#: directorymergewindow.cpp:3113 +#: directorymergewindow.cpp:3127 #, kde-format msgid "-Link" msgstr "-Link" -#: directorymergewindow.cpp:3119 +#: directorymergewindow.cpp:3133 #, kde-format msgid "not available" msgstr "niet beschikbaar" -#: directorymergewindow.cpp:3137 +#: directorymergewindow.cpp:3151 #, kde-format msgid "A (Dest): " msgstr "A (doel): " -#: directorymergewindow.cpp:3141 +#: directorymergewindow.cpp:3155 #, kde-format msgid "A: " msgstr "A: " -#: directorymergewindow.cpp:3141 +#: directorymergewindow.cpp:3155 #, kde-format msgid "A (Base): " msgstr "A (basis): " -#: directorymergewindow.cpp:3147 +#: directorymergewindow.cpp:3161 #, kde-format msgid "B (Dest): " msgstr "B (doel): " -#: directorymergewindow.cpp:3151 +#: directorymergewindow.cpp:3165 #, kde-format msgid "B: " msgstr "B: " -#: directorymergewindow.cpp:3156 +#: directorymergewindow.cpp:3170 #, kde-format msgid "C (Dest): " msgstr "C (doel): " -#: directorymergewindow.cpp:3160 +#: directorymergewindow.cpp:3174 #, kde-format msgid "C: " msgstr "C: " -#: directorymergewindow.cpp:3163 +#: directorymergewindow.cpp:3177 #, kde-format msgid "Dest: " msgstr "Doel: " #. i18n("Saving Directory Merge State ...")); -#: directorymergewindow.cpp:3238 +#: directorymergewindow.cpp:3252 #, kde-format msgid "Save Directory Merge State As..." msgstr "Staat van mappen samenvoegen opslaan als..." -#: directorymergewindow.cpp:3387 +#: directorymergewindow.cpp:3401 #, kde-format msgid "Start/Continue Directory Merge" msgstr "Directorysamenvoeging starten/voortzetten" -#: directorymergewindow.cpp:3388 +#: directorymergewindow.cpp:3402 #, kde-format msgid "Run Operation for Current Item" msgstr "Handeling uitvoeren voor huidig item" -#: directorymergewindow.cpp:3389 +#: directorymergewindow.cpp:3403 #, kde-format msgid "Compare Selected File" msgstr "Geselecteerde bestand vergelijken" -#: directorymergewindow.cpp:3390 +#: directorymergewindow.cpp:3404 #, kde-format msgid "Merge Current File" msgstr "Huidig bestand samenvoegen" -#: directorymergewindow.cpp:3390 +#: directorymergewindow.cpp:3404 #, kde-format msgid "" "Merge\n" @@ -838,51 +838,51 @@ "Samenvoegen\n" "Bestand" -#: directorymergewindow.cpp:3391 +#: directorymergewindow.cpp:3405 #, kde-format msgid "Fold All Subdirs" msgstr "Alle submappen invouwen" -#: directorymergewindow.cpp:3392 +#: directorymergewindow.cpp:3406 #, kde-format msgid "Unfold All Subdirs" msgstr "Alle submappen uitvouwen" #. i18n("Save Directory Merge State ..."), 0, this, &DirectoryMergeWindow::slotSaveMergeState, ac, "dir_save_merge_state"); #. i18n("Load Directory Merge State ..."), 0, this, &DirectoryMergeWindow::slotLoadMergeState, ac, "dir_load_merge_state"); -#: directorymergewindow.cpp:3396 +#: directorymergewindow.cpp:3410 #, kde-format msgid "Choose A for All Items" msgstr "Voor alle items A kiezen" -#: directorymergewindow.cpp:3397 +#: directorymergewindow.cpp:3411 #, kde-format msgid "Choose B for All Items" msgstr "Voor alle items B kiezen" -#: directorymergewindow.cpp:3398 +#: directorymergewindow.cpp:3412 #, kde-format msgid "Choose C for All Items" msgstr "Voor alle items C kiezen" -#: directorymergewindow.cpp:3399 +#: directorymergewindow.cpp:3413 #, kde-format msgid "Auto-Choose Operation for All Items" msgstr "Handeling voor alle items automatisch kiezen" -#: directorymergewindow.cpp:3400 +#: directorymergewindow.cpp:3414 #, kde-format msgid "No Operation for All Items" msgstr "Geen handeling voor alle items" #. i18n("Synchronize Directories"), 0, this, &DirectoryMergeWindow::slotSynchronizeDirectories, ac, "dir_synchronize_directories"); #. d->m_pDirChooseNewerFiles = GuiUtils::createAction< KToggleAction >(i18n("Copy Newer Files Instead of Merging"), 0, this, &DirectoryMergeWindow::slotChooseNewerFiles, ac, "dir_choose_newer_files"); -#: directorymergewindow.cpp:3405 +#: directorymergewindow.cpp:3419 #, kde-format msgid "Show Identical Files" msgstr "Identieke bestanden tonen" -#: directorymergewindow.cpp:3405 +#: directorymergewindow.cpp:3419 #, kde-format msgid "" "Identical\n" @@ -891,17 +891,17 @@ "Identieke\n" "Bestanden" -#: directorymergewindow.cpp:3406 +#: directorymergewindow.cpp:3420 #, kde-format msgid "Show Different Files" msgstr "Verschillende bestanden tonen" -#: directorymergewindow.cpp:3407 +#: directorymergewindow.cpp:3421 #, kde-format msgid "Show Files only in A" msgstr "Bestanden alleen in A tonen" -#: directorymergewindow.cpp:3407 +#: directorymergewindow.cpp:3421 #, kde-format msgid "" "Files\n" @@ -910,12 +910,12 @@ "Bestanden\n" "alleen in A" -#: directorymergewindow.cpp:3408 +#: directorymergewindow.cpp:3422 #, kde-format msgid "Show Files only in B" msgstr "Bestanden alleen in B tonen" -#: directorymergewindow.cpp:3408 +#: directorymergewindow.cpp:3422 #, kde-format msgid "" "Files\n" @@ -924,12 +924,12 @@ "Bestanden\n" "alleen in B" -#: directorymergewindow.cpp:3409 +#: directorymergewindow.cpp:3423 #, kde-format msgid "Show Files only in C" msgstr "Bestanden alleen in C tonen" -#: directorymergewindow.cpp:3409 +#: directorymergewindow.cpp:3423 #, kde-format msgid "" "Files\n" @@ -938,52 +938,57 @@ "Bestanden\n" "alleen in C" -#: directorymergewindow.cpp:3413 +#: directorymergewindow.cpp:3427 #, kde-format msgid "Compare Explicitly Selected Files" msgstr "Expliciet geselecteerde bestand vergelijken" -#: directorymergewindow.cpp:3414 +#: directorymergewindow.cpp:3428 #, kde-format msgid "Merge Explicitly Selected Files" msgstr "Expliciet geselecteerde bestanden samenvoegen" -#: directorymergewindow.cpp:3416 directorymergewindow.cpp:3423 +#: directorymergewindow.cpp:3430 directorymergewindow.cpp:3437 #, kde-format msgid "Do Nothing" msgstr "Niets doen" -#: directorymergewindow.cpp:3428 +#: directorymergewindow.cpp:3442 #, kde-format msgid "Delete A && B" msgstr "A && B verwijderen" -#: directorymergewindow.cpp:3431 +#: directorymergewindow.cpp:3445 #, kde-format msgid "Merge to A && B" msgstr "Samenvoegen met A && B" -#: fileaccess.cpp:462 SourceData.cpp:493 +#: fileaccess.cpp:301 +#, kde-format +msgid "Unable to determine full url. No parent specified." +msgstr "Kan volledige url niet bepalen. Geen ouder gespecificeerd." + +#: fileaccess.cpp:482 SourceData.cpp:506 #, kde-format msgid "Failed to read file: %1" msgstr "Bestand lezen is mislukt: %1" -#: fileaccess.cpp:587 +#: fileaccess.cpp:624 #, kde-format msgid "Creating temp copy of %1 failed." msgstr "Het aanmaken van de tijdelijke kopie van %1 is mislukt." -#: fileaccess.cpp:595 fileaccess.cpp:600 +#: fileaccess.cpp:632 fileaccess.cpp:637 #, kde-format msgid "Opening %1 failed. %2" msgstr "Het openen van %1 is mislukt. %2" -#: fileaccess.cpp:619 fileaccess.cpp:627 +#: fileaccess.cpp:656 fileaccess.cpp:664 #, kde-format msgid "Error reading from %1. %2" msgstr "Fout bij het lezen van %1. %2" -#: fileaccess.cpp:751 +#: fileaccess.cpp:788 #, kde-format msgid "" "While trying to make a backup, deleting an older backup failed.\n" @@ -993,7 +998,7 @@ "de nieuwe reservekopie.\n" "Bestandsnaam: %1" -#: fileaccess.cpp:758 +#: fileaccess.cpp:795 #, kde-format msgid "" "While trying to make a backup, renaming failed.\n" @@ -1002,178 +1007,178 @@ "Tijdens het aanmaken van een reservekopie is het hernoemen mislukt.\n" "Bestandsnamen: %1 -> %2" -#: fileaccess.cpp:828 +#: fileaccess.cpp:865 #, kde-format msgid "Getting file status: %1" msgstr "Bestandstatus opvragen: %1" -#: fileaccess.cpp:869 +#: fileaccess.cpp:906 #, kde-format msgid "Reading file: %1" msgstr "Bestand lezen: %1" -#: fileaccess.cpp:907 +#: fileaccess.cpp:944 #, kde-format msgid "Writing file: %1" msgstr "Bestand schrijven: %1" -#: fileaccess.cpp:940 +#: fileaccess.cpp:977 #, kde-format msgid "Out of memory" msgstr "Onvoldoende geheugen" -#: fileaccess.cpp:976 +#: fileaccess.cpp:1013 #, kde-format msgid "Making directory: %1" msgstr "Directory aanmaken: %1" -#: fileaccess.cpp:997 +#: fileaccess.cpp:1034 #, kde-format msgid "Removing directory: %1" msgstr "Directory verwijderen: %1" -#: fileaccess.cpp:1012 +#: fileaccess.cpp:1049 #, kde-format msgid "Removing file: %1" msgstr "Bestand verwijderen: %1" -#: fileaccess.cpp:1028 +#: fileaccess.cpp:1065 #, kde-format msgid "Creating symbolic link: %1 -> %2" msgstr "Symbolische koppeling aanmaken: %1 -> %2" -#: fileaccess.cpp:1052 +#: fileaccess.cpp:1089 #, kde-format msgid "Renaming file: %1 -> %2" msgstr "Bestand hernoemen: %1 -> %2" -#: fileaccess.cpp:1086 +#: fileaccess.cpp:1123 #, kde-format msgid "Copying file: %1 -> %2" msgstr "Bestand kopiëren: %1 -> %2" -#: fileaccess.cpp:1108 +#: fileaccess.cpp:1145 #, kde-format msgid "Reading directory: %1" msgstr "Map lezen: %1" -#: fileaccess.cpp:1162 +#: fileaccess.cpp:1202 #, kde-format msgid "Listing directory: %1" msgstr "Directory inlezen: %1" -#: kdiff3.cpp:181 +#: kdiff3.cpp:182 #, kde-format msgid "Current Configuration:" msgstr "Huidige configuratie:" -#: kdiff3.cpp:186 +#: kdiff3.cpp:187 #, kde-format msgid "Config Option Error:" msgstr "Fout bij configuratie-optie:" -#: kdiff3.cpp:240 +#: kdiff3.cpp:246 #, kde-format msgid "Option --auto used, but no output file specified." msgstr "Optie '--auto' is gebruikt, maar er is geen uitvoerbestand opgegeven." -#: kdiff3.cpp:416 +#: kdiff3.cpp:405 #, kde-format msgid "Option --auto ignored for directory comparison." msgstr "Optie '--auto' is genegeerd voor mappenvergelijking." -#: kdiff3.cpp:460 +#: kdiff3.cpp:449 #, kde-format msgid "Saving failed." msgstr "Opslag is mislukt." -#: kdiff3.cpp:496 pdiff.cpp:1098 +#: kdiff3.cpp:494 pdiff.cpp:1096 #, kde-format msgid "Opening of these files failed:" msgstr "Het openen van deze bestanden is mislukt:" -#: kdiff3.cpp:505 +#: kdiff3.cpp:503 pdiff.cpp:1105 #, kde-format -msgid "File Open Error" -msgstr "Fout bij bestanden openen" +msgid "File open error" +msgstr "Fout bij openen van bestand" -#: kdiff3.cpp:533 +#: kdiff3.cpp:532 #, kde-format msgid "Opens documents for comparison..." msgstr "Opent documenten voor vergelijking..." -#: kdiff3.cpp:535 +#: kdiff3.cpp:534 #, kde-format msgid "Reload" msgstr "Herladen" -#: kdiff3.cpp:538 +#: kdiff3.cpp:537 #, kde-format msgid "Saves the merge result. All conflicts must be solved!" msgstr "" "Slaat het samenvoegresultaat op. Alle conflicten dienen te worden opgelost!" -#: kdiff3.cpp:540 +#: kdiff3.cpp:539 #, kde-format msgid "Saves the current document as..." msgstr "Slaat het huidige document op als..." -#: kdiff3.cpp:543 +#: kdiff3.cpp:542 #, kde-format msgid "Print the differences" msgstr "Verschillen afdrukken" -#: kdiff3.cpp:546 +#: kdiff3.cpp:545 #, kde-format msgid "Quits the application" msgstr "Sluit de toepassing af" -#: kdiff3.cpp:549 +#: kdiff3.cpp:548 #, kde-format msgid "Cuts the selected section and puts it to the clipboard" msgstr "Knipt de geselecteerde sectie en plaatst deze op het klembord" -#: kdiff3.cpp:552 +#: kdiff3.cpp:551 #, kde-format msgid "Copies the selected section to the clipboard" msgstr "Kopieert de geselecteerde sectie naar het klembord" -#: kdiff3.cpp:554 +#: kdiff3.cpp:553 #, kde-format msgid "Pastes the clipboard contents to current position" msgstr "Plakt de inhoud van het klembord op de huidige positie" -#: kdiff3.cpp:557 +#: kdiff3.cpp:556 #, kde-format msgid "Select everything in current window" msgstr "Alles in huidig venster selecteren" -#: kdiff3.cpp:560 +#: kdiff3.cpp:559 #, kde-format msgid "Search for a string" msgstr "Tekst opzoeken" -#: kdiff3.cpp:562 +#: kdiff3.cpp:561 #, kde-format msgid "Search again for the string" msgstr "Opnieuw zoeken" -#: kdiff3.cpp:567 +#: kdiff3.cpp:566 #, kde-format msgid "Enables/disables the statusbar" msgstr "Activeert/deactiveert de statusbalk" -#: kdiff3.cpp:571 +#: kdiff3.cpp:570 #, kde-format msgid "Configure KDiff3..." msgstr "KDiff3 instellen..." -#: kdiff3.cpp:590 +#: kdiff3.cpp:589 #, kde-format msgid "Go to Current Delta" msgstr "Ga naar huidig verschil" -#: kdiff3.cpp:590 +#: kdiff3.cpp:589 #, kde-format msgid "" "Current\n" @@ -1182,24 +1187,24 @@ "Huidig\n" "Verschil" -#: kdiff3.cpp:592 +#: kdiff3.cpp:591 #, kde-format msgid "Go to First Delta" msgstr "Ga naar eerste verschil" -#: kdiff3.cpp:592 +#: kdiff3.cpp:591 #, kde-format msgid "" "First\n" "Delta" msgstr "Ga naar eerste verschil" -#: kdiff3.cpp:594 +#: kdiff3.cpp:593 #, kde-format msgid "Go to Last Delta" msgstr "Ga naar laatste verschil" -#: kdiff3.cpp:594 +#: kdiff3.cpp:593 #, kde-format msgid "" "Last\n" @@ -1208,13 +1213,13 @@ "Laatste\n" "Verschil" -#: kdiff3.cpp:596 +#: kdiff3.cpp:595 #, kde-format msgid "(Skips white space differences when \"Show White Space\" is disabled.)" msgstr "" "(Slaat witruimteverschillen over als \"Witruimte tonen\" is uitgeschakeld.)" -#: kdiff3.cpp:597 +#: kdiff3.cpp:596 #, kde-format msgid "" "(Does not skip white space differences even when \"Show White Space\" is " @@ -1223,12 +1228,12 @@ "(Slaat witruimteverschillen niet over, zelfs als \"Witruimte tonen\" is " "uitgeschakeld.)" -#: kdiff3.cpp:598 +#: kdiff3.cpp:597 #, kde-format msgid "Go to Previous Delta" msgstr "Ga naar vorig verschil" -#: kdiff3.cpp:598 +#: kdiff3.cpp:597 #, kde-format msgid "" "Prev\n" @@ -1237,12 +1242,12 @@ "Voorgaand\n" "Verschil" -#: kdiff3.cpp:600 +#: kdiff3.cpp:599 #, kde-format msgid "Go to Next Delta" msgstr "Ga naar volgend verschil" -#: kdiff3.cpp:600 +#: kdiff3.cpp:599 #, kde-format msgid "" "Next\n" @@ -1251,12 +1256,12 @@ "Volgende\n" "Verschil" -#: kdiff3.cpp:602 +#: kdiff3.cpp:601 #, kde-format msgid "Go to Previous Conflict" msgstr "Ga naar vorig conflict" -#: kdiff3.cpp:602 +#: kdiff3.cpp:601 #, kde-format msgid "" "Prev\n" @@ -1265,12 +1270,12 @@ "Vorig\n" "Conflict" -#: kdiff3.cpp:604 +#: kdiff3.cpp:603 #, kde-format msgid "Go to Next Conflict" msgstr "Ga naar volgend conflict" -#: kdiff3.cpp:604 +#: kdiff3.cpp:603 #, kde-format msgid "" "Next\n" @@ -1279,12 +1284,12 @@ "Volgend\n" "Conflict" -#: kdiff3.cpp:606 +#: kdiff3.cpp:605 #, kde-format msgid "Go to Previous Unsolved Conflict" msgstr "Ga naar vorig onopgelost conflict" -#: kdiff3.cpp:606 +#: kdiff3.cpp:605 #, kde-format msgid "" "Prev\n" @@ -1293,12 +1298,12 @@ "Voorgaand\n" "Niet opgelost" -#: kdiff3.cpp:608 +#: kdiff3.cpp:607 #, kde-format msgid "Go to Next Unsolved Conflict" msgstr "Ga naar volgend onopgelost conflict" -#: kdiff3.cpp:608 +#: kdiff3.cpp:607 #, kde-format msgid "" "Next\n" @@ -1307,12 +1312,12 @@ "Volgend\n" "Niet opgelost" -#: kdiff3.cpp:610 +#: kdiff3.cpp:609 #, kde-format msgid "Select Line(s) From A" msgstr "Regel(s) van A selecteren" -#: kdiff3.cpp:610 +#: kdiff3.cpp:609 #, kde-format msgid "" "Choose\n" @@ -1321,12 +1326,12 @@ "Kies\n" "A" -#: kdiff3.cpp:611 +#: kdiff3.cpp:610 #, kde-format msgid "Select Line(s) From B" msgstr "Regel(s) van B selecteren" -#: kdiff3.cpp:611 +#: kdiff3.cpp:610 #, kde-format msgid "" "Choose\n" @@ -1335,12 +1340,12 @@ "Kies\n" "B" -#: kdiff3.cpp:612 +#: kdiff3.cpp:611 #, kde-format msgid "Select Line(s) From C" msgstr "Regel(s) van C selecteren" -#: kdiff3.cpp:612 +#: kdiff3.cpp:611 #, kde-format msgid "" "Choose\n" @@ -1349,13 +1354,13 @@ "Kies\n" "C" -#: kdiff3.cpp:613 +#: kdiff3.cpp:612 #, kde-format msgid "Automatically Go to Next Unsolved Conflict After Source Selection" msgstr "" "Automatisch naar het volgende onopgeloste conflict gaan na bronselectie" -#: kdiff3.cpp:613 +#: kdiff3.cpp:612 #, kde-format msgid "" "Auto\n" @@ -1364,12 +1369,12 @@ "Automatisch\n" "Volgende" -#: kdiff3.cpp:615 +#: kdiff3.cpp:614 #, kde-format msgid "Show Space && Tabulator Characters" msgstr "Spaties && tabulator-tekens tonen" -#: kdiff3.cpp:615 +#: kdiff3.cpp:614 #, kde-format msgid "" "White\n" @@ -1378,12 +1383,12 @@ "Witruimte\n" "Tekens" -#: kdiff3.cpp:616 +#: kdiff3.cpp:615 #, kde-format msgid "Show White Space" msgstr "Witruimte tonen" -#: kdiff3.cpp:616 +#: kdiff3.cpp:615 #, kde-format msgid "" "White\n" @@ -1392,12 +1397,12 @@ "Witruimte\n" "Verschil" -#: kdiff3.cpp:618 +#: kdiff3.cpp:617 #, kde-format msgid "Show Line Numbers" msgstr "Regelnummering tonen" -#: kdiff3.cpp:618 +#: kdiff3.cpp:617 #, kde-format msgid "" "Line\n" @@ -1406,194 +1411,194 @@ "Regel\n" "nummers" -#: kdiff3.cpp:620 +#: kdiff3.cpp:619 #, kde-format msgid "Automatically Solve Simple Conflicts" msgstr "Automatisch eenvoudige conflicten oplossen" -#: kdiff3.cpp:621 +#: kdiff3.cpp:620 #, kde-format msgid "Set Deltas to Conflicts" msgstr "Elk onderscheid maken bij conflicten" -#: kdiff3.cpp:622 +#: kdiff3.cpp:621 #, kde-format msgid "Run Regular Expression Auto Merge" msgstr "Automatisch samenvoegen d.m.v. reguliere expressie uitvoeren" -#: kdiff3.cpp:623 +#: kdiff3.cpp:622 #, kde-format msgid "Automatically Solve History Conflicts" msgstr "Automatisch geschiedenisconflicten oplossen" -#: kdiff3.cpp:624 +#: kdiff3.cpp:623 #, kde-format msgid "Split Diff At Selection" msgstr "Vergelijking bij selectie splitsen" -#: kdiff3.cpp:625 +#: kdiff3.cpp:624 #, kde-format msgid "Join Selected Diffs" msgstr "Geselecteerde verschillen samenvoegen" -#: kdiff3.cpp:627 +#: kdiff3.cpp:626 #, kde-format msgid "Show Window A" msgstr "Venster A tonen" -#: kdiff3.cpp:628 +#: kdiff3.cpp:627 #, kde-format msgid "Show Window B" msgstr "Venster B tonen" -#: kdiff3.cpp:629 +#: kdiff3.cpp:628 #, kde-format msgid "Show Window C" msgstr "Venster C tonen" -#: kdiff3.cpp:631 +#: kdiff3.cpp:630 #, kde-format msgid "Normal Overview" msgstr "Normaal overzicht" -#: kdiff3.cpp:632 +#: kdiff3.cpp:631 #, kde-format msgid "A vs. B Overview" msgstr "A vs B overzicht" -#: kdiff3.cpp:633 +#: kdiff3.cpp:632 #, kde-format msgid "A vs. C Overview" msgstr "A vs C overzicht" -#: kdiff3.cpp:634 +#: kdiff3.cpp:633 #, kde-format msgid "B vs. C Overview" msgstr "B vs C overzicht" -#: kdiff3.cpp:635 +#: kdiff3.cpp:634 #, kde-format msgid "Word Wrap Diff Windows" msgstr "Regels afbreken in vensters met verschillen" -#: kdiff3.cpp:636 +#: kdiff3.cpp:635 #, kde-format msgid "Add Manual Diff Alignment" msgstr "Handmatige uitlijning van vergelijking toevoegen" -#: kdiff3.cpp:637 +#: kdiff3.cpp:636 #, kde-format msgid "Clear All Manual Diff Alignments" msgstr "Alle handmatige uitlijningen van vergelijkingen wissen" -#: kdiff3.cpp:639 +#: kdiff3.cpp:638 #, kde-format msgid "Focus Next Window" msgstr "Focus op volgend venster zetten" -#: kdiff3.cpp:640 +#: kdiff3.cpp:639 #, kde-format msgid "Focus Prev Window" msgstr "Focus op vorig venster zetten" -#: kdiff3.cpp:641 +#: kdiff3.cpp:640 #, kde-format msgid "Toggle Split Orientation" msgstr "Splitsen van vensters omschakelen" -#: kdiff3.cpp:643 +#: kdiff3.cpp:642 #, kde-format msgid "Dir && Text Split Screen View" msgstr "Directory- en tekstweergave splitsen in hoofdvenster" -#: kdiff3.cpp:645 +#: kdiff3.cpp:644 #, kde-format msgid "Toggle Between Dir && Text View" msgstr "Tussen map- en tekstweergave wisselen" -#: kdiff3.cpp:697 pdiff.cpp:1909 +#: kdiff3.cpp:696 pdiff.cpp:1919 #, kde-format msgid "The merge result has not been saved." msgstr "Het resultaat van de samenvoeging is niet opgeslagen." -#: kdiff3.cpp:699 +#: kdiff3.cpp:698 #, kde-format msgid "Save && Quit" msgstr "Opslaan && afsluiten" -#: kdiff3.cpp:700 +#: kdiff3.cpp:699 #, kde-format msgid "Quit Without Saving" msgstr "Afsluiten zonder opslag" -#: kdiff3.cpp:708 pdiff.cpp:1920 +#: kdiff3.cpp:707 pdiff.cpp:1930 #, kde-format msgid "Saving the merge result failed." msgstr "De opslag van het resultaat van de samenvoeging is mislukt." -#: kdiff3.cpp:719 pdiff.cpp:1032 +#: kdiff3.cpp:718 pdiff.cpp:1030 #, kde-format msgid "" "You are currently doing a directory merge. Are you sure, you want to abort?" msgstr "" "U bent momenteel bezig met het samenvoegen van mappen. Wilt u toch afbreken?" -#: kdiff3.cpp:742 +#: kdiff3.cpp:741 #, kde-format msgid "Saving file..." msgstr "Bestand wordt opgeslagen..." -#: kdiff3.cpp:759 +#: kdiff3.cpp:758 #, kde-format msgid "Saving file with a new filename..." msgstr "Bestand wordt opgeslagen onder een nieuwe naam..." -#: kdiff3.cpp:761 +#: kdiff3.cpp:760 #, kde-format msgid "Save As..." msgstr "Opslaan als..." -#: kdiff3.cpp:820 +#: kdiff3.cpp:819 #, kde-format msgid "Printing not implemented." msgstr "Afdrukken niet geïmplementeerd." -#: kdiff3.cpp:857 +#: kdiff3.cpp:858 #, kde-format msgid "Printing..." msgstr "Bezig met afdrukken..." -#: kdiff3.cpp:943 +#: kdiff3.cpp:948 #, kde-format msgid "Printing page %1 of %2" msgstr "Pagina %1 van %2 wordt afgedrukt" -#: kdiff3.cpp:1000 +#: kdiff3.cpp:1006 #, kde-format msgid " (Selection)" msgstr " (Selectie)" -#: kdiff3.cpp:1027 +#: kdiff3.cpp:1034 #, kde-format msgid "Printing completed." msgstr "Afdrukken is voltooid." -#: kdiff3.cpp:1031 +#: kdiff3.cpp:1038 #, kde-format msgid "Printing aborted." msgstr "Afdrukken is afgebroken." -#: kdiff3.cpp:1038 +#: kdiff3.cpp:1045 #, kde-format msgid "Exiting..." msgstr "Bezig met beëindigen..." -#: kdiff3.cpp:1049 +#: kdiff3.cpp:1056 #, kde-format msgid "Toggling toolbar..." msgstr "Werkbalk omschakelen..." -#: kdiff3.cpp:1070 +#: kdiff3.cpp:1077 #, kde-format msgid "Toggle the statusbar..." msgstr "De statusbalk aan- of uitzetten..." @@ -1618,7 +1623,7 @@ msgid "Joachim Eibl" msgstr "Joachim Eibl" -#: kdiff3_part.cpp:173 kdiff3_part.cpp:254 +#: kdiff3_part.cpp:174 kdiff3_part.cpp:255 #, kde-format msgid "Could not find files for comparison." msgstr "De bestanden om te vergelijken zijn niet gevonden." @@ -1636,7 +1641,7 @@ msgstr "KDiff3 instellen" #. i18n: ectx: ToolBar (mainToolBar) -#: kdiff3_part.rc:16 main.cpp:88 +#: kdiff3_part.rc:16 main.cpp:89 #, kde-format msgid "KDiff3" msgstr "KDiff3" @@ -1706,88 +1711,93 @@ msgid "Main Toolbar" msgstr "Hoofdwerkbalk" -#: main.cpp:68 main.cpp:72 +#: main.cpp:69 main.cpp:73 #, kde-format msgid "Ignored. (User defined.)" msgstr "Genegeerd. (Gebruiker gedefinieerd)." -#: main.cpp:92 +#: main.cpp:93 #, kde-format msgid " (64 bit)" msgstr " (64 bit)" -#: main.cpp:94 +#: main.cpp:95 #, kde-format msgid " (32 bit)" msgstr " (32 bit)" -#: main.cpp:95 +#: main.cpp:96 #, kde-format msgid "Tool for Comparison and Merge of Files and Directories" msgstr "Hulpmiddel voor het vergelijken en samenvoegen van bestanden en mappen" -#: main.cpp:96 +#: main.cpp:97 #, kde-format msgid "(c) 2002-2014 Joachim Eibl, (c) 2017 Michael Reeves KF5/Qt5 port" msgstr "" "(c) 2002-2014 Joachim Eibl, (c) 2017 Michael Reeves naar KF5/Qt5 overgezet" -#: main.cpp:112 +#: main.cpp:113 #, kde-format msgid "Merge the input." msgstr "Invoer samenvoegen." -#: main.cpp:113 +#: main.cpp:114 #, kde-format msgid "Explicit base file. For compatibility with certain tools." msgstr "" "Expliciet basisbestand. Voor compatibiliteit met sommige hulpprogramma's." -#: main.cpp:114 +#: main.cpp:115 #, kde-format msgid "Output file. Implies -m. E.g.: -o newfile.txt" msgstr "Uitvoerbestand. -m is inbegrepen. Bijv.: -o nieuwbestand.txt" -#: main.cpp:115 +#: main.cpp:116 #, kde-format msgid "Output file, again. (For compatibility with certain tools.)" msgstr "" "Uitvoerbestand, opnieuw (voor compatibiliteit met sommige hulpprogramma's)." -#: main.cpp:116 +#: main.cpp:118 #, kde-format msgid "No GUI if all conflicts are auto-solvable. (Needs -o file)" msgstr "" "Geen grafisch venster als alle conflicten automatisch oplosbaar zijn ('-o " "bestand' is nodig)." -#: main.cpp:117 +#: main.cpp:120 +#, kde-format +msgid "Ignored." +msgstr "Genegeerd." + +#: main.cpp:122 #, kde-format msgid "Do not solve conflicts automatically." msgstr "Conflicten niet automatisch oplossen." -#: main.cpp:118 +#: main.cpp:123 #, kde-format msgid "Visible name replacement for input file 1 (base)." msgstr "Zichtbare naamvervanging voor invoerbestand 1 (basis)." -#: main.cpp:119 +#: main.cpp:124 #, kde-format msgid "Visible name replacement for input file 2." msgstr "Zichtbare naamvervanging voor invoerbestand 2." -#: main.cpp:120 +#: main.cpp:125 #, kde-format msgid "Visible name replacement for input file 3." msgstr "Zichtbare naamvervanging voor invoerbestand 3." -#: main.cpp:121 +#: main.cpp:126 #, kde-format msgid "Alternative visible name replacement. Supply this once for every input." msgstr "" "Alternatieve zichtbare naamvervanging. Ditmaal voor elke invoer opgeven." -#: main.cpp:122 +#: main.cpp:127 #, kde-format msgid "" "Override a config setting. Use once for every setting. E.g.: --cs " @@ -1796,89 +1806,89 @@ "Omzeil een instelling. Gebruik dit eenmalig voor elke instelling. Bijv. --cs " "\"AutoAdvance=1\"" -#: main.cpp:123 +#: main.cpp:128 #, kde-format msgid "Show list of config settings and current values." msgstr "Een lijst tonen met instellingen en huidige waarden." -#: main.cpp:124 +#: main.cpp:129 #, kde-format msgid "Use a different config file." msgstr "Een ander configuratiebestand gebruiken." -#: main.cpp:127 +#: main.cpp:132 #, kde-format msgid "file1 to open (base, if not specified via --base)" msgstr "" "Eerste bestand om te openen (basis, indien niet opgegeven met '--base')." -#: main.cpp:128 +#: main.cpp:133 #, kde-format msgid "file2 to open" msgstr "Tweede bestand om te openen" -#: main.cpp:129 +#: main.cpp:134 #, kde-format msgid "file3 to open" msgstr "Derde bestand om te openen" -#: main.cpp:153 +#: main.cpp:158 #, kde-format msgid "See kdiff3 --help for supported options." msgstr "Zie kdiff3 --help voor ondersteunde opties." -#: mergeresultwindow.cpp:158 +#: mergeresultwindow.cpp:171 #, kde-format msgid "Choose A Everywhere" msgstr "A overal kiezen" -#: mergeresultwindow.cpp:159 +#: mergeresultwindow.cpp:172 #, kde-format msgid "Choose B Everywhere" msgstr "B overal kiezen" -#: mergeresultwindow.cpp:160 +#: mergeresultwindow.cpp:173 #, kde-format msgid "Choose C Everywhere" msgstr "C overal kiezen" -#: mergeresultwindow.cpp:161 +#: mergeresultwindow.cpp:174 #, kde-format msgid "Choose A for All Unsolved Conflicts" msgstr "A voor alle onopgeloste conflicten kiezen" -#: mergeresultwindow.cpp:162 +#: mergeresultwindow.cpp:175 #, kde-format msgid "Choose B for All Unsolved Conflicts" msgstr "B voor alle onopgeloste conflicten kiezen" -#: mergeresultwindow.cpp:163 +#: mergeresultwindow.cpp:176 #, kde-format msgid "Choose C for All Unsolved Conflicts" msgstr "C voor alle onopgeloste conflicten kiezen" -#: mergeresultwindow.cpp:164 +#: mergeresultwindow.cpp:177 #, kde-format msgid "Choose A for All Unsolved Whitespace Conflicts" msgstr "A voor alle onopgeloste witruimteconflicten kiezen" -#: mergeresultwindow.cpp:165 +#: mergeresultwindow.cpp:178 #, kde-format msgid "Choose B for All Unsolved Whitespace Conflicts" msgstr "B voor alle onopgeloste witruimteconflicten kiezen" -#: mergeresultwindow.cpp:166 +#: mergeresultwindow.cpp:179 #, kde-format msgid "Choose C for All Unsolved Whitespace Conflicts" msgstr "C voor alle onopgeloste witruimteconflicten kiezen" -#: mergeresultwindow.cpp:176 +#: mergeresultwindow.cpp:204 #, kde-format msgid "Number of remaining unsolved conflicts: %1 (of which %2 are whitespace)" msgstr "" "Aantal overgebleven onopgeloste conflicten: %1 (waarvan %2 witruimtes zijn)" -#: mergeresultwindow.cpp:370 +#: mergeresultwindow.cpp:398 #, kde-format msgid "" "The output has been modified.\n" @@ -1887,29 +1897,29 @@ "De uitvoer is gewijzigd.\n" "Als u verder gaat zullen uw wijzigingen verloren gaan." -#: mergeresultwindow.cpp:936 pdiff.cpp:827 +#: mergeresultwindow.cpp:964 pdiff.cpp:817 #, kde-format msgid "All input files are binary equal." msgstr "Alle invoerbestanden zijn binair gelijk." -#: mergeresultwindow.cpp:938 +#: mergeresultwindow.cpp:966 #, kde-format msgid "All input files contain the same text." msgstr "Alle invoerbestanden bevatten dezelfde tekst." -#: mergeresultwindow.cpp:942 mergeresultwindow.cpp:946 -#: mergeresultwindow.cpp:950 pdiff.cpp:833 pdiff.cpp:837 pdiff.cpp:841 +#: mergeresultwindow.cpp:970 mergeresultwindow.cpp:974 +#: mergeresultwindow.cpp:978 pdiff.cpp:823 pdiff.cpp:827 pdiff.cpp:831 #, kde-format msgid "Files %1 and %2 are binary equal.\n" msgstr "Bestanden %1 en %2 zijn binair gelijk.\n" -#: mergeresultwindow.cpp:944 mergeresultwindow.cpp:948 -#: mergeresultwindow.cpp:952 +#: mergeresultwindow.cpp:972 mergeresultwindow.cpp:976 +#: mergeresultwindow.cpp:980 #, kde-format msgid "Files %1 and %2 have equal text.\n" msgstr "Bestanden %1 en %2 hebben dezelfde tekst.\n" -#: mergeresultwindow.cpp:958 +#: mergeresultwindow.cpp:986 #, kde-format msgid "" "Total number of conflicts: %1\n" @@ -1922,27 +1932,27 @@ "Aantal niet opgeloste conflicten: %3\n" "%4" -#: mergeresultwindow.cpp:964 +#: mergeresultwindow.cpp:992 #, kde-format msgid "Conflicts" msgstr "Conflicten" -#: mergeresultwindow.cpp:1873 +#: mergeresultwindow.cpp:1901 #, kde-format msgid "" msgstr "" -#: mergeresultwindow.cpp:1881 +#: mergeresultwindow.cpp:1909 #, kde-format msgid "" msgstr "" -#: mergeresultwindow.cpp:1883 mergeresultwindow.cpp:2755 +#: mergeresultwindow.cpp:1911 mergeresultwindow.cpp:2783 #, kde-format msgid "" msgstr "" -#: mergeresultwindow.cpp:2967 +#: mergeresultwindow.cpp:2995 #, kde-format msgid "" "Not all conflicts are solved yet.\n" @@ -1951,12 +1961,12 @@ "Nog niet alle conflicten zijn opgelost.\n" "Bestand is niet opgeslagen." -#: mergeresultwindow.cpp:2969 mergeresultwindow.cpp:2978 +#: mergeresultwindow.cpp:2997 mergeresultwindow.cpp:3006 #, kde-format msgid "Conflicts Left" msgstr "Er zijn nog onopgeloste conflicten" -#: mergeresultwindow.cpp:2976 +#: mergeresultwindow.cpp:3004 #, kde-format msgid "" "There is a line end style conflict. Please choose the line end style " @@ -1967,7 +1977,7 @@ "handmatig.\n" "Bestand is niet opgeslagen." -#: mergeresultwindow.cpp:2990 +#: mergeresultwindow.cpp:3018 #, kde-format msgid "" "\n" @@ -1978,57 +1988,57 @@ "\n" "Het aanmaken van de reservekopie is mislukt. Het bestand is niet opgeslagen." -#: mergeresultwindow.cpp:2990 mergeresultwindow.cpp:3038 +#: mergeresultwindow.cpp:3018 mergeresultwindow.cpp:3066 #, kde-format msgid "File Save Error" msgstr "Fout bij opslaan van het bestand" -#: mergeresultwindow.cpp:3038 +#: mergeresultwindow.cpp:3066 #, kde-format msgid "Error while writing." msgstr "Fout bij het opslaan." -#: mergeresultwindow.cpp:3110 +#: mergeresultwindow.cpp:3138 #, kde-format msgid "Output:" msgstr "Uitvoer:" -#: mergeresultwindow.cpp:3123 mergeresultwindow.cpp:3315 +#: mergeresultwindow.cpp:3151 mergeresultwindow.cpp:3343 #, kde-format msgid "[Modified]" msgstr "[Gewijzigd]" -#: mergeresultwindow.cpp:3130 +#: mergeresultwindow.cpp:3158 #, kde-format msgid "Encoding for saving:" msgstr "Codering voor opslaan:" -#: mergeresultwindow.cpp:3230 +#: mergeresultwindow.cpp:3258 #, kde-format msgid "Conflict" msgstr "Conflict" -#: mergeresultwindow.cpp:3262 +#: mergeresultwindow.cpp:3290 #, kde-format msgid "Codec from A: %1" msgstr "Codec van A: %1" -#: mergeresultwindow.cpp:3264 +#: mergeresultwindow.cpp:3292 #, kde-format msgid "Codec from B: %1" msgstr "Codec van B: %1" -#: mergeresultwindow.cpp:3266 +#: mergeresultwindow.cpp:3294 #, kde-format msgid "Codec from C: %1" msgstr "Codec van C: %1" -#: optiondialog.cpp:119 +#: optiondialog.cpp:121 #, kde-format msgid "Change Font" msgstr "Lettertype wijzigen" -#: optiondialog.cpp:135 optiondialog.cpp:145 +#: optiondialog.cpp:137 optiondialog.cpp:147 #, kde-format msgid "" "Font: %1, %2, %3\n" @@ -2039,123 +2049,123 @@ "\n" "Voorbeeld:" -#: optiondialog.cpp:388 +#: optiondialog.cpp:390 #, kde-format msgid "Unicode" msgstr "Unicode" -#: optiondialog.cpp:389 +#: optiondialog.cpp:391 #, kde-format msgid "Latin1" msgstr "Latin1" -#: optiondialog.cpp:408 +#: optiondialog.cpp:410 #, kde-format msgid "Change this if non-ASCII characters are not displayed correctly." msgstr "Verander dit indien niet-ascii tekens niet juist weergegeven worden." -#: optiondialog.cpp:491 +#: optiondialog.cpp:495 #, kde-format msgid "Configure" msgstr "Configureren" -#: optiondialog.cpp:568 +#: optiondialog.cpp:573 #, kde-format msgid "Font" msgstr "Lettertype" -#: optiondialog.cpp:570 +#: optiondialog.cpp:575 #, kde-format msgid "Editor & Diff Output Font" msgstr "Lettertype voor editor & vergelijkingsvenster" -#: optiondialog.cpp:589 +#: optiondialog.cpp:594 #, kde-format msgid "Application font" msgstr "Lettertype van toepassing" -#: optiondialog.cpp:594 +#: optiondialog.cpp:599 #, kde-format msgid "File view font" msgstr "Lettertype van bestandsweergave" -#: optiondialog.cpp:613 +#: optiondialog.cpp:618 #, kde-format msgctxt "Title for color settings page" msgid "Color" msgstr "Kleur" -#: optiondialog.cpp:614 +#: optiondialog.cpp:619 #, kde-format msgid "Colors Settings" msgstr "Kleurinstellingen" -#: optiondialog.cpp:631 +#: optiondialog.cpp:644 #, kde-format msgid "Editor and Diff Views:" msgstr "Weergaven voor editor en vergelijkingen:" -#: optiondialog.cpp:639 +#: optiondialog.cpp:652 #, kde-format msgid "Foreground color:" msgstr "Voorgrondkleur:" -#: optiondialog.cpp:647 +#: optiondialog.cpp:660 #, kde-format msgid "Background color:" msgstr "Achtergrondkleur:" -#: optiondialog.cpp:657 +#: optiondialog.cpp:670 #, kde-format msgid "Diff background color:" msgstr "Achtergrondkleur bij verschillen:" -#: optiondialog.cpp:666 +#: optiondialog.cpp:679 #, kde-format msgid "Color A:" msgstr "Kleur voor A:" -#: optiondialog.cpp:675 +#: optiondialog.cpp:688 #, kde-format msgid "Color B:" msgstr "Kleur voor B:" -#: optiondialog.cpp:684 +#: optiondialog.cpp:697 #, kde-format msgid "Color C:" msgstr "Kleur voor C:" -#: optiondialog.cpp:692 +#: optiondialog.cpp:705 #, kde-format msgid "Conflict color:" msgstr "Kleur voor conflicten:" -#: optiondialog.cpp:701 +#: optiondialog.cpp:714 #, kde-format msgid "Current range background color:" msgstr "Achtergrondkleur voor huidig bereik:" -#: optiondialog.cpp:710 +#: optiondialog.cpp:723 #, kde-format msgid "Current range diff background color:" msgstr "Achtergrondkleur voor verschillen in huidig bereik:" -#: optiondialog.cpp:718 +#: optiondialog.cpp:731 #, kde-format msgid "Color for manually aligned difference ranges:" msgstr "Kleur voor handmatig uitgelijnde verschilbereiken:" -#: optiondialog.cpp:725 +#: optiondialog.cpp:738 #, kde-format msgid "Directory Comparison View:" msgstr "Weergave mappenvergelijking:" -#: optiondialog.cpp:731 +#: optiondialog.cpp:744 #, kde-format msgid "Newest file color:" msgstr "Kleur nieuwste bestand:" -#: optiondialog.cpp:736 +#: optiondialog.cpp:749 #, kde-format msgid "" "Changing this color will only be effective when starting the next directory " @@ -2164,37 +2174,37 @@ "Het wijzigen van deze kleur is pas van kracht als u de volgende " "mappenvergelijking start." -#: optiondialog.cpp:741 +#: optiondialog.cpp:754 #, kde-format msgid "Oldest file color:" msgstr "Kleur oudste bestand:" -#: optiondialog.cpp:750 +#: optiondialog.cpp:763 #, kde-format msgid "Middle age file color:" msgstr "Kleur bestand met gemiddelde leeftijd:" -#: optiondialog.cpp:759 +#: optiondialog.cpp:772 #, kde-format msgid "Color for missing files:" msgstr "Kleur voor ontbrekende bestanden:" -#: optiondialog.cpp:773 +#: optiondialog.cpp:786 #, kde-format msgid "Editor" msgstr "Bewerker" -#: optiondialog.cpp:774 +#: optiondialog.cpp:787 #, kde-format msgid "Editor Behavior" msgstr "Editorgedrag" -#: optiondialog.cpp:787 +#: optiondialog.cpp:809 #, kde-format msgid "Tab inserts spaces" msgstr "Tab voegt spaties in" -#: optiondialog.cpp:791 +#: optiondialog.cpp:813 #, kde-format msgid "" "On: Pressing tab generates the appropriate number of spaces.\n" @@ -2203,28 +2213,28 @@ "Aan: de Tab-toets voegt het passende aantal spaties in.\n" "Uit: een tabulatorteken zal ingevoegd worden." -#: optiondialog.cpp:796 +#: optiondialog.cpp:818 #, kde-format msgid "Tab size:" msgstr "Tabgrootte:" -#: optiondialog.cpp:803 +#: optiondialog.cpp:825 #, kde-format msgid "Auto indentation" msgstr "Automatisch inspringen" -#: optiondialog.cpp:807 +#: optiondialog.cpp:829 #, kde-format msgid "On: The indentation of the previous line is used for a new line.\n" msgstr "" "Aan: de insprong van de vorige regel wordt gebruikt voor een nieuwe regel.\n" -#: optiondialog.cpp:810 +#: optiondialog.cpp:832 #, kde-format msgid "Auto copy selection" msgstr "Automatische kopieerselectie" -#: optiondialog.cpp:814 +#: optiondialog.cpp:836 #, kde-format msgid "" "On: Any selection is immediately written to the clipboard.\n" @@ -2233,7 +2243,7 @@ "Aan: elke selectie zal onmiddellijk op het klembord geplaatst worden.\n" "Uit: kopiëren gebeurt expliciet, bijvoorbeeld via Ctrl-C." -#: optiondialog.cpp:829 +#: optiondialog.cpp:851 #, kde-format msgid "" "Sets the line endings for when an edited file is saved.\n" @@ -2242,12 +2252,12 @@ "Stelt de regeleinden in voor als een bewerkt bestand wordt opgeslagen.\n" "DOS/Windows: CR+LF' UNIX: LF; met CR=0, LF=A" -#: optiondialog.cpp:839 +#: optiondialog.cpp:861 #, kde-format msgid "Diff" msgstr "Diff" -#: optiondialog.cpp:840 +#: optiondialog.cpp:862 #, kde-format msgid "Diff Settings" msgstr "Diff-instellingen" @@ -2261,12 +2271,12 @@ #. ); #. ++line; #. -#: optiondialog.cpp:865 +#: optiondialog.cpp:896 #, kde-format msgid "Ignore numbers (treat as white space)" msgstr "Getallen negeren (als witruimte behandelen)" -#: optiondialog.cpp:869 +#: optiondialog.cpp:900 #, kde-format msgid "" "Ignore number characters during line matching phase. (Similar to Ignore " @@ -2277,45 +2287,45 @@ "negeren.)\n" "Kan helpen bij het vergelijken van bestanden met numerieke gegevens." -#: optiondialog.cpp:873 +#: optiondialog.cpp:904 #, kde-format msgid "Ignore C/C++ comments (treat as white space)" msgstr "C/C++ commentaar negeren (als witruimte behandelen)" -#: optiondialog.cpp:876 +#: optiondialog.cpp:907 #, kde-format msgid "Treat C/C++ comments like white space." msgstr "C/C++ commentaar als witruimtes behandelen." -#: optiondialog.cpp:879 +#: optiondialog.cpp:910 #, kde-format msgid "Ignore case (treat as white space)" msgstr "Hoofd-/kleine letter negeren (als witruimte behandelen)" -#: optiondialog.cpp:883 +#: optiondialog.cpp:914 #, kde-format msgid "Treat case differences like white space changes. ('a'<=>'A')" msgstr "" "Verschil in hoofd-/kleine letters behandelen als witruimteverschillen ('a' " "<=> 'A')" -#: optiondialog.cpp:886 +#: optiondialog.cpp:917 #, kde-format msgid "Preprocessor command:" msgstr "Preprocessorcommando:" -#: optiondialog.cpp:891 +#: optiondialog.cpp:922 #, kde-format msgid "User defined pre-processing. (See the docs for details.)" msgstr "" "Gebruikergedefinieerde voorbehandeling (zie documentatie voor meer details.)" -#: optiondialog.cpp:894 +#: optiondialog.cpp:925 #, kde-format msgid "Line-matching preprocessor command:" msgstr "Preprocessor-commando alleen voor regelcontroles:" -#: optiondialog.cpp:899 +#: optiondialog.cpp:930 #, kde-format msgid "" "This pre-processor is only used during line matching.\n" @@ -2324,12 +2334,12 @@ "Deze preprocessor wordt alleen gebruikt bij regelcontroles.\n" "(Zie documentatie voor meer details)" -#: optiondialog.cpp:902 +#: optiondialog.cpp:933 #, kde-format msgid "Try hard (slower)" msgstr "Grondig zoeken (trager)" -#: optiondialog.cpp:906 +#: optiondialog.cpp:937 #, kde-format msgid "" "Enables the --minimal option for the external diff.\n" @@ -2338,12 +2348,12 @@ "Activeert de optie '--minimal' voor een externe vergelijking.\n" "De analyse van grote bestanden zal veel trager zijn." -#: optiondialog.cpp:910 +#: optiondialog.cpp:941 #, kde-format msgid "Align B and C for 3 input files" msgstr "Lijn B en C uit voor 3 invoerbestanden" -#: optiondialog.cpp:914 +#: optiondialog.cpp:945 #, kde-format msgid "" "Try to align B and C when comparing or merging three input files.\n" @@ -2355,17 +2365,23 @@ "Niet aanbevolen voor samenvoegen omdat dit veel gecompliceerder kan worden.\n" "(Standaard is uit.)" -#: optiondialog.cpp:926 +#: optiondialog.cpp:956 +#, kde-format +msgctxt "Settings page" +msgid "Merge" +msgstr "Samenvoegen" + +#: optiondialog.cpp:957 #, kde-format msgid "Merge Settings" msgstr "Instellingen samenvoegen" -#: optiondialog.cpp:940 +#: optiondialog.cpp:980 #, kde-format msgid "Auto advance delay (ms):" msgstr "Vertraging voor automatisch doorgaan (ms):" -#: optiondialog.cpp:946 +#: optiondialog.cpp:986 #, kde-format msgid "" "When in Auto-Advance mode the result of the current selection is shown \n" @@ -2376,27 +2392,27 @@ "conflict springt.\n" "Bereik: 0-2000 ms" -#: optiondialog.cpp:950 +#: optiondialog.cpp:990 #, kde-format msgid "Show info dialogs" msgstr "Toon informatievensters" -#: optiondialog.cpp:953 +#: optiondialog.cpp:993 #, kde-format msgid "Show a dialog with information about the number of conflicts." msgstr "Toon een venster met informatie over het aantal conflicten." -#: optiondialog.cpp:956 +#: optiondialog.cpp:996 #, kde-format msgid "White space 2-file merge default:" msgstr "Standaardsamenvoeging van witruimtes bij 2 bestanden:" -#: optiondialog.cpp:961 optiondialog.cpp:974 +#: optiondialog.cpp:1001 optiondialog.cpp:1014 #, kde-format msgid "Manual Choice" msgstr "Handmatige keuze" -#: optiondialog.cpp:965 optiondialog.cpp:979 +#: optiondialog.cpp:1005 optiondialog.cpp:1019 #, kde-format msgid "" "Allow the merge algorithm to automatically select an input for white-space-" @@ -2405,22 +2421,22 @@ "Bij het samenvoegen van bestanden toestaan dat er automatisch een oplossing " "gekozen wordt voor witruimteconflicten." -#: optiondialog.cpp:969 +#: optiondialog.cpp:1009 #, kde-format msgid "White space 3-file merge default:" msgstr "Standaardsamenvoeging van witruimtes bij 3 bestanden:" -#: optiondialog.cpp:983 +#: optiondialog.cpp:1023 #, kde-format msgid "Automatic Merge Regular Expression" msgstr "Reguliere expressie voor automatisch samenvoegen" -#: optiondialog.cpp:991 smalldialogs.cpp:449 +#: optiondialog.cpp:1031 smalldialogs.cpp:459 #, kde-format msgid "Auto merge regular expression:" msgstr "Reguliere expressie voor automatisch samenvoegen:" -#: optiondialog.cpp:996 +#: optiondialog.cpp:1036 #, kde-format msgid "" "Regular expression for lines where KDiff3 should automatically choose one " @@ -2433,12 +2449,12 @@ "Als een regel met een conflict overeenkomt met de reguliere expressie, dan\n" " - indien beschikbaar - C, anders wordt B gekozen." -#: optiondialog.cpp:1002 +#: optiondialog.cpp:1042 #, kde-format msgid "Run regular expression auto merge on merge start" msgstr "Bij starten van samenvoegen automatisch reguliere expressie gebruiken" -#: optiondialog.cpp:1005 +#: optiondialog.cpp:1045 #, kde-format msgid "" "Run the merge for auto merge regular expressions\n" @@ -2447,17 +2463,17 @@ "Onmiddellijk het automatisch samenvoegen beginnen aan de hand\n" "van reguliere expressies als een samenvoeging wordt gestart.\n" -#: optiondialog.cpp:1010 +#: optiondialog.cpp:1050 #, kde-format msgid "Version Control History Merging" msgstr "amenvoegen aan de hand van versiebeheergeschiedenis" -#: optiondialog.cpp:1018 smalldialogs.cpp:476 +#: optiondialog.cpp:1058 smalldialogs.cpp:486 #, kde-format msgid "History start regular expression:" msgstr "Reguliere expressie voor begin van geschiedenis:" -#: optiondialog.cpp:1023 +#: optiondialog.cpp:1063 #, kde-format msgid "" "Regular expression for the start of the version control history entry.\n" @@ -2468,12 +2484,12 @@ "Normaal gesproken bevat deze regel het trefwoord \"$Log$\".\n" "Standaard waarde: \".*\\$Log.*\\$.*\"" -#: optiondialog.cpp:1029 smalldialogs.cpp:504 +#: optiondialog.cpp:1069 smalldialogs.cpp:514 #, kde-format msgid "History entry start regular expression:" msgstr "Reguliere expressie voor begin van geschiedenisitem:" -#: optiondialog.cpp:1042 +#: optiondialog.cpp:1082 #, kde-format msgid "" "A version control history entry consists of several lines.\n" @@ -2493,22 +2509,22 @@ "geschiedenisitems scheidt.\n" "Raadpleeg de documentatie voor meer details." -#: optiondialog.cpp:1050 +#: optiondialog.cpp:1090 #, kde-format msgid "History merge sorting" msgstr "Geschiedenis samenvoegend sorteren" -#: optiondialog.cpp:1053 +#: optiondialog.cpp:1093 #, kde-format msgid "Sort version control history by a key." msgstr "Geschiedenis versiebeheer sorteren met een sleutel." -#: optiondialog.cpp:1063 +#: optiondialog.cpp:1103 #, kde-format msgid "History entry start sort key order:" msgstr "Sorteervolgorde van begin van geschiedenisitems:" -#: optiondialog.cpp:1068 +#: optiondialog.cpp:1108 #, kde-format msgid "" "Each pair of parentheses used in the regular expression for the history " @@ -2528,41 +2544,41 @@ "Wanneer dit wordt leeg gelaten zal er niet gesorteerd worden.\n" "Raadpleeg de documentatie voor meer details." -#: optiondialog.cpp:1079 +#: optiondialog.cpp:1119 #, kde-format msgid "Merge version control history on merge start" msgstr "Geschiedenis versiebeheer samenvoegen bij aanvang van samenvoegen" -#: optiondialog.cpp:1082 +#: optiondialog.cpp:1122 #, kde-format msgid "Run version control history automerge on merge start." msgstr "" "Automatisch samenvoegen van geschiedenis versiebeheer bij aanvang " "samenvoegen." -#: optiondialog.cpp:1086 +#: optiondialog.cpp:1126 #, kde-format msgid "Max number of history entries:" msgstr "Max. aantal items in geschiedenis:" -#: optiondialog.cpp:1090 +#: optiondialog.cpp:1130 #, kde-format msgid "Cut off after specified number. Use -1 for infinite number of entries." msgstr "" "Afknippen vanaf het opgegeven getal. Gebruik -1 voor een onbeperkt aantal " "items." -#: optiondialog.cpp:1094 +#: optiondialog.cpp:1134 #, kde-format msgid "Test your regular expressions" msgstr "Uw reguliere expressies testen" -#: optiondialog.cpp:1099 +#: optiondialog.cpp:1139 #, kde-format msgid "Irrelevant merge command:" msgstr "Irrelevant samenvoegcommando:" -#: optiondialog.cpp:1104 +#: optiondialog.cpp:1144 #, kde-format msgid "" "If specified this script is run after automerge\n" @@ -2573,12 +2589,12 @@ "wanneer geen andere relevante wijzigingen zijn gedetecteerd.\n" "Aangeroepen met de parameters: bestandsnaam1 bestandsnaam2 bestandsnaam3" -#: optiondialog.cpp:1109 +#: optiondialog.cpp:1149 #, kde-format msgid "Auto save and quit on merge without conflicts" msgstr "Automatisch opslaan en afsluiten bij samenvoegingen zonder conflicten" -#: optiondialog.cpp:1113 +#: optiondialog.cpp:1153 #, kde-format msgid "" "If KDiff3 was started for a file-merge from the command line and all\n" @@ -2591,27 +2607,27 @@ "nodig was, sla het resultaat dan op en sluit het programma af.\n" "(Vergelijkbaar met de commandoregeloptie \"--auto\")." -#: optiondialog.cpp:1124 optiondialog.cpp:1125 +#: optiondialog.cpp:1164 optiondialog.cpp:1165 #, kde-format msgid "Directory" msgstr "Map" -#: optiondialog.cpp:1137 +#: optiondialog.cpp:1185 #, kde-format msgid "Recursive directories" msgstr "Recursieve mappen" -#: optiondialog.cpp:1140 +#: optiondialog.cpp:1188 #, kde-format msgid "Whether to analyze subdirectories or not." msgstr "Bepaalt of submappen wel of niet worden ingelezen." -#: optiondialog.cpp:1142 +#: optiondialog.cpp:1190 #, kde-format msgid "File pattern(s):" msgstr "Bestandspatroon(en):" -#: optiondialog.cpp:1148 +#: optiondialog.cpp:1196 #, kde-format msgid "" "Pattern(s) of files to be analyzed. \n" @@ -2622,12 +2638,12 @@ "Jokers: '*' en '?'\n" "Meerdere patronen kunnen opgegeven worden d.m.v. het scheidingsteken ';'" -#: optiondialog.cpp:1153 +#: optiondialog.cpp:1201 #, kde-format msgid "File-anti-pattern(s):" msgstr "Bestand antipatroon(en):" -#: optiondialog.cpp:1159 +#: optiondialog.cpp:1207 #, kde-format msgid "" "Pattern(s) of files to be excluded from analysis. \n" @@ -2638,12 +2654,12 @@ "Jokers: '*' en '?'\n" "Meerdere patronen kunnen opgegeven worden d.m.v. het scheidingsteken ';'" -#: optiondialog.cpp:1164 +#: optiondialog.cpp:1212 #, kde-format msgid "Dir-anti-pattern(s):" msgstr "Directory antipatroon(en):" -#: optiondialog.cpp:1170 +#: optiondialog.cpp:1218 #, kde-format msgid "" "Pattern(s) of directories to be excluded from analysis. \n" @@ -2654,12 +2670,12 @@ "Jokers: '*' en '?'\n" "Meerdere patronen kunnen opgegeven worden d.m.v. het scheidingsteken: ';'" -#: optiondialog.cpp:1175 +#: optiondialog.cpp:1223 #, kde-format msgid "Use .cvsignore" msgstr ".cvsignore gebruiken" -#: optiondialog.cpp:1179 +#: optiondialog.cpp:1227 #, kde-format msgid "" "Extends the antipattern to anything that would be ignored by CVS.\n" @@ -2668,22 +2684,22 @@ "Breidt het antipatroon uit met alles dat genegeerd zou worden door CVS.\n" "Via lokale \".cvsignore\"-bestanden kan dit mapspecifiek zijn." -#: optiondialog.cpp:1183 +#: optiondialog.cpp:1231 #, kde-format msgid "Find hidden files and directories" msgstr "Verborgen bestanden en mappen zoeken" -#: optiondialog.cpp:1186 +#: optiondialog.cpp:1234 #, kde-format msgid "Finds hidden files and directories." msgstr "Vindt verborgen bestanden en mappen" -#: optiondialog.cpp:1189 +#: optiondialog.cpp:1237 #, kde-format msgid "Follow file links" msgstr "Bestandskoppelingen volgen" -#: optiondialog.cpp:1193 +#: optiondialog.cpp:1241 #, kde-format msgid "" "On: Compare the file the link points to.\n" @@ -2692,12 +2708,12 @@ "Aan: vergelijk het bestand naarwaar de koppeling verwijst.\n" "Uit: vergelijk de koppelingen." -#: optiondialog.cpp:1197 +#: optiondialog.cpp:1245 #, kde-format msgid "Follow directory links" msgstr "Directorykoppelingen volgen" -#: optiondialog.cpp:1201 +#: optiondialog.cpp:1249 #, kde-format msgid "" "On: Compare the directory the link points to.\n" @@ -2706,12 +2722,12 @@ "Aan: vergelijk de map waarnaar de koppeling verwijst.\n" "Uit: vergelijk de koppelingen." -#: optiondialog.cpp:1210 +#: optiondialog.cpp:1258 #, kde-format msgid "Case sensitive filename comparison" msgstr "Hoofdlettergevoelige bestandsnaamvergelijking" -#: optiondialog.cpp:1214 +#: optiondialog.cpp:1262 #, kde-format msgid "" "The directory comparison will compare files or directories when their names " @@ -2724,12 +2740,12 @@ "Schakel deze optie in als ook het gebruik van hoofd-/kleine letters overeen " "moet komen. (Standaard voor Windows is uit, anders aan.)" -#: optiondialog.cpp:1218 +#: optiondialog.cpp:1266 #, kde-format msgid "Unfold all subdirectories on load" msgstr "Alle submappen uitvouwen bij laden" -#: optiondialog.cpp:1222 +#: optiondialog.cpp:1270 #, kde-format msgid "" "On: Unfold all subdirectories when starting a directory diff.\n" @@ -2738,12 +2754,12 @@ "Aan: alle submappen uitvouwen bij starten van een mappen-diff.\n" "Uit: submappen ingevouwen laten." -#: optiondialog.cpp:1226 +#: optiondialog.cpp:1274 #, kde-format msgid "Skip directory status report" msgstr "Rapport mappenstatus overslaan" -#: optiondialog.cpp:1230 +#: optiondialog.cpp:1278 #, kde-format msgid "" "On: Do not show the Directory Comparison Status.\n" @@ -2752,27 +2768,27 @@ "Aan: status van vergelijking van mappen niet tonen.\n" "Uit: de statusdialoog bij starten tonen." -#: optiondialog.cpp:1234 +#: optiondialog.cpp:1282 #, kde-format msgid "File Comparison Mode" msgstr "Bestandsvergelijkingsmodus" -#: optiondialog.cpp:1239 +#: optiondialog.cpp:1287 #, kde-format msgid "Binary comparison" msgstr "Binaire vergelijking" -#: optiondialog.cpp:1241 +#: optiondialog.cpp:1289 #, kde-format msgid "Binary comparison of each file. (Default)" msgstr "Binaire vergelijking van elk bestand (standaard)" -#: optiondialog.cpp:1244 +#: optiondialog.cpp:1292 #, kde-format msgid "Full analysis" msgstr "Volledige analyse" -#: optiondialog.cpp:1246 +#: optiondialog.cpp:1294 #, kde-format msgid "" "Do a full analysis and show statistics information in extra columns.\n" @@ -2781,12 +2797,12 @@ "Doe een volledige analyse en toon de statistieken in extra kolommen.\n" "(Trager dan een binaire vergelijking, veel trager bij binaire bestanden.)" -#: optiondialog.cpp:1250 +#: optiondialog.cpp:1298 #, kde-format msgid "Trust the size and modification date (unsafe)" msgstr "Grootte en wijzigingsdatum vertrouwen (onveilig)" -#: optiondialog.cpp:1252 +#: optiondialog.cpp:1300 #, kde-format msgid "" "Assume that files are equal if the modification date and file length are " @@ -2801,7 +2817,7 @@ "verschillend worden aangemerkt.\n" "Nuttig voor grote mappen en trage netwerken." -#: optiondialog.cpp:1257 +#: optiondialog.cpp:1305 #, kde-format msgid "" "Trust the size and date, but use binary comparison if date does not match " @@ -2810,7 +2826,7 @@ "Vertrouw de grootte en de datum, maar gebruik binaire vergelijking als de " "datums niet overeen komen (onveilig)" -#: optiondialog.cpp:1259 +#: optiondialog.cpp:1307 #, kde-format msgid "" "Assume that files are equal if the modification date and file length are " @@ -2824,12 +2840,12 @@ "vergelijking toegepast.\n" "Nuttig voor grote mappen of trage netwerken." -#: optiondialog.cpp:1264 +#: optiondialog.cpp:1312 #, kde-format msgid "Trust the size (unsafe)" msgstr "Grootte vertrouwen (onveilig)" -#: optiondialog.cpp:1266 +#: optiondialog.cpp:1314 #, kde-format msgid "" "Assume that files are equal if their file lengths are equal.\n" @@ -2841,12 +2857,12 @@ "Nuttig voor grote mappen en trage netwerken wanneer de datum verandert " "tijdens een download." -#: optiondialog.cpp:1273 +#: optiondialog.cpp:1321 #, kde-format msgid "Synchronize directories" msgstr "Directorypen synchroniseren" -#: optiondialog.cpp:1277 +#: optiondialog.cpp:1325 #, kde-format msgid "" "Offers to store files in both directories so that\n" @@ -2858,12 +2874,12 @@ "Werkt alleen wanneer twee mappen vergeleken worden zonder dat er een " "bestemming is opgegeven." -#: optiondialog.cpp:1283 +#: optiondialog.cpp:1331 #, kde-format msgid "White space differences considered equal" msgstr "Witruimteverschillen worden als gelijk beschouwd" -#: optiondialog.cpp:1287 +#: optiondialog.cpp:1335 #, kde-format msgid "" "If files differ only by white space consider them equal.\n" @@ -2873,12 +2889,12 @@ "gelijk beschouwd.\n" "Dit is alleen actief als volledige analyse is gekozen." -#: optiondialog.cpp:1293 +#: optiondialog.cpp:1341 #, kde-format msgid "Copy newer instead of merging (unsafe)" msgstr "Nieuwere bestanden kopiëren in plaats van samenvoegen (onveilig)" -#: optiondialog.cpp:1297 +#: optiondialog.cpp:1345 #, kde-format msgid "" "Do not look inside, just take the newer file.\n" @@ -2889,12 +2905,12 @@ "(Gebruik dit enkel als u weet wat u doet!)\n" "Alleen effectief wanneer men twee mappen met elkaar vergelijkt." -#: optiondialog.cpp:1302 +#: optiondialog.cpp:1350 #, kde-format msgid "Backup files (.orig)" msgstr "Reservekopie aanmaken (.orig)" -#: optiondialog.cpp:1306 +#: optiondialog.cpp:1354 #, kde-format msgid "" "If a file would be saved over an old file, then the old file\n" @@ -2904,17 +2920,17 @@ "oude bestand worden hernoemd met als extensie '.orig', i.p.v. gewist te " "worden." -#: optiondialog.cpp:1382 optiondialog.cpp:1383 +#: optiondialog.cpp:1430 optiondialog.cpp:1431 #, kde-format msgid "Regional Settings" msgstr "Regionale instellingen" -#: optiondialog.cpp:1397 +#: optiondialog.cpp:1454 #, kde-format msgid "Use the same encoding for everything:" msgstr "Dezelfde codering gebruiken voor alles:" -#: optiondialog.cpp:1401 +#: optiondialog.cpp:1458 #, kde-format msgid "" "Enable this allows to change all encodings by changing the first only.\n" @@ -2924,17 +2940,17 @@ "te passen.\n" "Schakel dit uit als er verschillende individuele instellingen nodig zijn." -#: optiondialog.cpp:1405 +#: optiondialog.cpp:1462 #, kde-format msgid "Note: Local Encoding is \"%1\"" msgstr "Opmerking: lokale codering is \"%1\"" -#: optiondialog.cpp:1409 +#: optiondialog.cpp:1466 #, kde-format msgid "File Encoding for A:" msgstr "Bestandscodering voor A:" -#: optiondialog.cpp:1416 +#: optiondialog.cpp:1473 #, kde-format msgid "" "If enabled then Unicode (UTF-16 or UTF-8) encoding will be detected.\n" @@ -2948,32 +2964,32 @@ "codering worden gebruikt om op terug te vallen.\n" "(Unicode-detectie is afhankelijk van de eerste bytes in een bestand.)" -#: optiondialog.cpp:1419 optiondialog.cpp:1430 optiondialog.cpp:1441 +#: optiondialog.cpp:1476 optiondialog.cpp:1487 optiondialog.cpp:1498 #, kde-format msgid "Auto Detect Unicode" msgstr "Unicode autodetecteren" -#: optiondialog.cpp:1425 +#: optiondialog.cpp:1482 #, kde-format msgid "File Encoding for B:" msgstr "Bestandscodering voor B:" -#: optiondialog.cpp:1436 +#: optiondialog.cpp:1493 #, kde-format msgid "File Encoding for C:" msgstr "Bestandscodering voor C:" -#: optiondialog.cpp:1447 +#: optiondialog.cpp:1504 #, kde-format msgid "File Encoding for Merge Output and Saving:" msgstr "Bestandscodering voor samenvoeguitvoer en opslag:" -#: optiondialog.cpp:1452 +#: optiondialog.cpp:1509 #, kde-format msgid "Auto Select" msgstr "Autoselect" -#: optiondialog.cpp:1456 +#: optiondialog.cpp:1513 #, kde-format msgid "" "If enabled then the encoding from the input files is used.\n" @@ -2984,17 +3000,17 @@ "Bij twijfelgevallen zult u gevraagd worden welke codering er voor het " "opslaan gebruikt moet worden." -#: optiondialog.cpp:1459 +#: optiondialog.cpp:1516 #, kde-format msgid "File Encoding for Preprocessor Files:" msgstr "Bestandscodering voor preprocessorbestanden:" -#: optiondialog.cpp:1471 +#: optiondialog.cpp:1528 #, kde-format msgid "Right To Left Language" msgstr "Rechts-naar-links-taal" -#: optiondialog.cpp:1475 +#: optiondialog.cpp:1532 #, kde-format msgid "" "Some languages are read from right to left.\n" @@ -3003,22 +3019,22 @@ "Sommige talen worden van rechts naar links gelezen.\n" "Deze instelling zal de viewer en editor hierop aanpassen." -#: optiondialog.cpp:1485 +#: optiondialog.cpp:1542 #, kde-format msgid "Integration" msgstr "Integratie" -#: optiondialog.cpp:1486 +#: optiondialog.cpp:1543 #, kde-format msgid "Integration Settings" msgstr "Integratie-instellingen" -#: optiondialog.cpp:1499 +#: optiondialog.cpp:1564 #, kde-format msgid "Command line options to ignore:" msgstr "Te negeren commandoregelopties:" -#: optiondialog.cpp:1505 +#: optiondialog.cpp:1570 #, kde-format msgid "" "List of command line options that should be ignored when KDiff3 is used by " @@ -3032,12 +3048,12 @@ "';'\n" "Dit onderdrukt de foutmelding \"Onbekende optie\"." -#: optiondialog.cpp:1510 +#: optiondialog.cpp:1575 #, kde-format msgid "Quit also via Escape key" msgstr "Stoppen kan ook via de Escape-toets" -#: optiondialog.cpp:1514 +#: optiondialog.cpp:1579 #, kde-format msgid "" "Fast method to exit.\n" @@ -3046,7 +3062,7 @@ "Snelle methode om te eindigen.\n" "Voor hen die het gewoon zijn om de Escape-toets te gebruiken." -#: optiondialog.cpp:1598 +#: optiondialog.cpp:1653 #, kde-format msgid "This resets all options. Not only those of the current topic." msgstr "Dit zet alle opties terug, niet alleen die van het huidige onderwerp." @@ -3102,80 +3118,70 @@ msgid "Disable Unsafe Options" msgstr "Onveilige opties uitschakelen" -#: pdiff.cpp:158 +#: pdiff.cpp:160 #, kde-format msgid "Loading A" msgstr "A laden" -#: pdiff.cpp:167 +#: pdiff.cpp:162 #, kde-format -msgid "Errors occurred during pre-processing of file A." -msgstr "Er deden zich fouten voor tijdens het pre-processen van bestand A." +msgid "Loading A: %1" +msgstr "A wordt geladen: %1" -#: pdiff.cpp:172 +#: pdiff.cpp:170 #, kde-format msgid "Loading B" msgstr "B laden" -#: pdiff.cpp:179 -#, kde-format -msgid "Errors occurred during pre-processing of file B." -msgstr "Er deden zich fouten voor tijdens het pre-processen van bestand B." - -#: pdiff.cpp:202 pdiff.cpp:241 +#: pdiff.cpp:201 pdiff.cpp:237 #, kde-format msgid "Diff: A <-> B" msgstr "Vergelijking: A <-> B" -#: pdiff.cpp:208 pdiff.cpp:279 pdiff.cpp:293 +#: pdiff.cpp:207 pdiff.cpp:275 pdiff.cpp:289 #, kde-format msgid "Linediff: A <-> B" msgstr "Regelvergelijking: A <-> B" -#: pdiff.cpp:225 +#: pdiff.cpp:224 #, kde-format msgid "Loading C" msgstr "C laden" -#: pdiff.cpp:232 -#, kde-format -msgid "Errors occurred during pre-processing of file C." -msgstr "Er deden zich fouten voor tijdens het pre-processen van bestand C." - -#: pdiff.cpp:250 +#: pdiff.cpp:246 #, kde-format msgid "Diff: A <-> C" msgstr "Vergelijking: A <-> C" -#: pdiff.cpp:261 +#: pdiff.cpp:257 #, kde-format msgid "Diff: B <-> C" msgstr "Vergelijking: B <-> C" -#: pdiff.cpp:283 pdiff.cpp:297 +#: pdiff.cpp:279 pdiff.cpp:293 #, kde-format msgid "Linediff: B <-> C" msgstr "Regelvergelijking: B <-> C" -#: pdiff.cpp:287 pdiff.cpp:301 +#: pdiff.cpp:283 pdiff.cpp:297 #, kde-format msgid "Linediff: A <-> C" msgstr "Regelvergelijking: A <-> C" -#: pdiff.cpp:829 +#: pdiff.cpp:819 #, kde-format 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:835 pdiff.cpp:839 pdiff.cpp:843 +#: pdiff.cpp:825 pdiff.cpp:829 pdiff.cpp:833 #, 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:853 +#: pdiff.cpp:843 #, kde-format msgid "" "Some input files do not seem to be pure text files.\n" @@ -3186,17 +3192,17 @@ "Merk op dat KDiff3 is niet bedoeld voor binaire gegevens.\n" "U kunt verder gaan op eigen risico." -#: pdiff.cpp:863 +#: pdiff.cpp:853 #, kde-format msgid ", B" msgstr ", B" -#: pdiff.cpp:865 +#: pdiff.cpp:855 #, kde-format msgid ", C" msgstr ", C" -#: pdiff.cpp:867 +#: pdiff.cpp:857 #, kde-format msgid "" "Some input characters could not be converted to valid unicode.\n" @@ -3210,77 +3216,72 @@ "Sla het resultaat niet op als u niet zeker bent. Doorgaan op eigen risico.\n" "Betrokken invoerbestanden zitten in %1." -#: pdiff.cpp:1034 +#: pdiff.cpp:1032 #, kde-format msgid "Abort" msgstr "Afbreken" -#: pdiff.cpp:1040 pdiff.cpp:1130 +#: pdiff.cpp:1038 pdiff.cpp:1129 #, kde-format msgid "Opening files..." msgstr "Bestanden openen..." -#: pdiff.cpp:1107 -#, kde-format -msgid "File open error" -msgstr "Fout bij openen van bestand" - -#: pdiff.cpp:1202 +#: pdiff.cpp:1212 #, kde-format msgid "Cutting selection..." msgstr "Selectie wordt geknipt..." -#: pdiff.cpp:1223 +#: pdiff.cpp:1233 #, kde-format msgid "Copying selection to clipboard..." msgstr "Selectie wordt naar het klembord gekopieerd..." -#: pdiff.cpp:1239 +#: pdiff.cpp:1249 #, kde-format msgid "Inserting clipboard contents..." msgstr "Inhoud klembord wordt ingevoegd..." -#: pdiff.cpp:1695 +#: pdiff.cpp:1705 #, kde-format msgid "Word wrap (Cancel disables word wrap)" msgstr "Regelafbreking (Annuleren schakelt regelafbreking uit)" -#: pdiff.cpp:1696 +#: pdiff.cpp:1706 #, kde-format msgid "Calculating max width for horizontal scrollbar" msgstr "Maximale breedte voor horizontale schuifbalk wordt berekend" -#: pdiff.cpp:1911 +#: pdiff.cpp:1921 #, kde-format msgid "Save && Continue" msgstr "Opslaan && doorgaan" -#: pdiff.cpp:1912 +#: pdiff.cpp:1922 #, kde-format msgid "Continue Without Saving" msgstr "Doorgaan zonder opslaan" -#: pdiff.cpp:2124 +#: pdiff.cpp:2134 #, kde-format msgid "Search complete." msgstr "Zoeken voltooid." -#: pdiff.cpp:2124 +#: pdiff.cpp:2134 #, kde-format msgid "Search Complete" msgstr "Zoeken voltooid" -#: pdiff.cpp:2375 +#: pdiff.cpp:2385 #, kde-format msgid "Nothing is selected in either diff input window." msgstr "Er is niets geselecteerd in beide invoervensters voor de vergelijking." -#: pdiff.cpp:2375 +#: pdiff.cpp:2385 #, kde-format msgid "Error while adding manual diff range" msgstr "Fout bij het toevoegen van handmatig vergelijkingsbereik" -#: progress.cpp:59 progress.cpp:71 +#: progress.cpp:61 progress.cpp:73 #, kde-format msgid "&Cancel" msgstr "&Annuleren" @@ -3290,126 +3291,126 @@ msgid "A (Base):" msgstr "A (basis):" -#: smalldialogs.cpp:68 smalldialogs.cpp:85 smalldialogs.cpp:102 -#: smalldialogs.cpp:144 +#: smalldialogs.cpp:71 smalldialogs.cpp:90 smalldialogs.cpp:109 +#: smalldialogs.cpp:154 #, kde-format msgid "File..." msgstr "Bestand..." -#: smalldialogs.cpp:70 smalldialogs.cpp:87 smalldialogs.cpp:104 -#: smalldialogs.cpp:146 +#: smalldialogs.cpp:73 smalldialogs.cpp:92 smalldialogs.cpp:111 +#: smalldialogs.cpp:156 #, kde-format msgid "Dir..." msgstr "Directory..." -#: smalldialogs.cpp:96 +#: smalldialogs.cpp:103 #, kde-format msgid "C (Optional):" msgstr "C (optioneel):" -#: smalldialogs.cpp:119 +#: smalldialogs.cpp:126 #, kde-format msgid "Swap/Copy Names..." msgstr "Namen kopiëren/omwisselen..." -#: smalldialogs.cpp:124 smalldialogs.cpp:125 smalldialogs.cpp:126 +#: smalldialogs.cpp:131 smalldialogs.cpp:132 smalldialogs.cpp:133 #, kde-format msgid "Swap %1<->%2" msgstr "%1<->%2 omwisselen" -#: smalldialogs.cpp:127 smalldialogs.cpp:128 smalldialogs.cpp:129 +#: smalldialogs.cpp:134 smalldialogs.cpp:135 smalldialogs.cpp:136 #, kde-format msgid "Copy %1->Output" msgstr "%1->uitvoer kopiëren" -#: smalldialogs.cpp:130 smalldialogs.cpp:131 smalldialogs.cpp:132 +#: smalldialogs.cpp:137 smalldialogs.cpp:138 smalldialogs.cpp:139 #, kde-format msgid "Swap %1<->Output" msgstr "%1<->uitvoer omwisselen" -#: smalldialogs.cpp:138 +#: smalldialogs.cpp:148 #, kde-format msgid "Output (optional):" msgstr "Uitvoer (optioneel):" -#: smalldialogs.cpp:168 +#: smalldialogs.cpp:178 #, kde-format msgid "Configure..." msgstr "Configureren..." -#: smalldialogs.cpp:233 +#: smalldialogs.cpp:243 #, kde-format msgid "Open Directory" msgstr "Map openen" -#: smalldialogs.cpp:234 +#: smalldialogs.cpp:244 #, kde-format msgid "Select Output File" msgstr "Uitvoerbestand selecteren" -#: smalldialogs.cpp:393 +#: smalldialogs.cpp:403 #, kde-format msgid "Search text:" msgstr "Zoektekst:" -#: smalldialogs.cpp:400 +#: smalldialogs.cpp:410 #, kde-format msgid "Case sensitive" msgstr "Hoofdlettergevoelig" -#: smalldialogs.cpp:403 +#: smalldialogs.cpp:413 #, kde-format msgid "Search A" msgstr "Zoeken in A" -#: smalldialogs.cpp:408 +#: smalldialogs.cpp:418 #, kde-format msgid "Search B" msgstr "Zoeken in B" -#: smalldialogs.cpp:413 +#: smalldialogs.cpp:423 #, kde-format msgid "Search C" msgstr "Zoeken in C" -#: smalldialogs.cpp:418 +#: smalldialogs.cpp:428 #, kde-format msgid "Search output" msgstr "Zoeken in uitvoer" -#: smalldialogs.cpp:425 +#: smalldialogs.cpp:435 #, kde-format msgid "&Search" msgstr "&Zoeken" -#: smalldialogs.cpp:444 +#: smalldialogs.cpp:454 #, kde-format msgid "Regular Expression Tester" msgstr "Reguliere expressies testen" -#: smalldialogs.cpp:457 +#: smalldialogs.cpp:467 #, kde-format msgid "Example auto merge line:" msgstr "Voorbeeld autosamenvoegregel:" -#: smalldialogs.cpp:459 +#: smalldialogs.cpp:469 #, kde-format msgid "To test auto merge, copy a line as used in your files." msgstr "" "Voor het testen van automatisch samenvoegen, kopieer een regel die in uw " "bestanden wordt gebruikt." -#: smalldialogs.cpp:465 smalldialogs.cpp:493 smalldialogs.cpp:529 +#: smalldialogs.cpp:475 smalldialogs.cpp:503 smalldialogs.cpp:539 #, kde-format msgid "Match result:" msgstr "Resultaat van overeenkomsten:" -#: smalldialogs.cpp:484 +#: smalldialogs.cpp:494 #, kde-format msgid "Example history start line (with leading comment):" msgstr "Voorbeeld geschiedenisbeginregel (met bijhorend commentaar):" -#: smalldialogs.cpp:486 +#: smalldialogs.cpp:496 #, kde-format msgid "" "Copy a history start line as used in your files,\n" @@ -3418,19 +3419,19 @@ "Kopieer een geschiedenisbeginregel die u in uw bestanden gebruikt,\n" "inclusief een voorafgaand commentaar." -#: smalldialogs.cpp:512 +#: smalldialogs.cpp:522 #, kde-format msgid "History sort key order:" msgstr "Sorteervolgorde geschiedenis:" -#: smalldialogs.cpp:520 +#: smalldialogs.cpp:530 #, kde-format msgid "Example history entry start line (without leading comment):" msgstr "" "Voorbeeld van beginregel van geschiedenisitem (zonder voorafgaand " "commentaar):" -#: smalldialogs.cpp:522 +#: smalldialogs.cpp:532 #, kde-format msgid "" "Copy a history entry start line as used in your files,\n" @@ -3440,49 +3441,49 @@ "wordt gebruikt.\n" "Voeg echter geen voorafgaand commentaar bij." -#: smalldialogs.cpp:536 +#: smalldialogs.cpp:546 #, kde-format msgid "Sort key result:" msgstr "Resulterende sorteersleutel:" -#: smalldialogs.cpp:584 smalldialogs.cpp:594 smalldialogs.cpp:614 +#: smalldialogs.cpp:594 smalldialogs.cpp:604 smalldialogs.cpp:624 #, kde-format msgid "Match success." msgstr "Overeenkomst succesvol" -#: smalldialogs.cpp:588 smalldialogs.cpp:598 smalldialogs.cpp:620 +#: smalldialogs.cpp:598 smalldialogs.cpp:608 smalldialogs.cpp:630 #, kde-format msgid "Match failed." msgstr "Overeenkomst mislukt." -#: smalldialogs.cpp:605 +#: smalldialogs.cpp:615 #, kde-format msgid "Opening and closing parentheses do not match in regular expression." msgstr "" "Er zijn niet evenveel openings- als sluitingshaakjes in de reguliere " "expressie." -#: SourceData.cpp:150 +#: SourceData.cpp:153 #, kde-format msgid "Writing clipboard data to temp file failed." msgstr "Het opslaan van de klembordinhoud in een tijdelijk bestand is mislukt." -#: SourceData.cpp:154 +#: SourceData.cpp:157 #, kde-format msgid "From Clipboard" msgstr "Van klembord" -#: SourceData.cpp:335 +#: SourceData.cpp:348 #, kde-format msgid "%1 is not a normal file." msgstr "%1 is geen normaal bestand." -#: SourceData.cpp:427 +#: SourceData.cpp:440 #, kde-format msgid " Temp file is: %1" msgstr " Tijdelijk bestand is: %1" -#: SourceData.cpp:432 +#: SourceData.cpp:445 #, kde-format msgid "" "Preprocessing possibly failed. Check this command:\n" @@ -3497,12 +3498,12 @@ "\n" "Dit commando zal nu worden uitgeschakeld." -#: SourceData.cpp:443 SourceData.cpp:512 +#: SourceData.cpp:456 SourceData.cpp:525 #, kde-format msgid "File %1 too large to process. Skipping." msgstr "Bestand %1 is te groot om te verwerken. Wordt overgeslagen." -#: SourceData.cpp:487 +#: SourceData.cpp:500 #, kde-format msgid "" "The line-matching-preprocessing possibly failed. Check this command:\n" diff -Nru kdiff3-1.8.01/po/nn/kdiff3fileitemactionplugin.po kdiff3-1.8.3/po/nn/kdiff3fileitemactionplugin.po --- kdiff3-1.8.01/po/nn/kdiff3fileitemactionplugin.po 1970-01-01 00:00:00.000000000 +0000 +++ kdiff3-1.8.3/po/nn/kdiff3fileitemactionplugin.po 2020-06-25 00:18:40.000000000 +0000 @@ -0,0 +1,94 @@ +# Translation of kdiff3fileitemactionplugin to Norwegian Nynorsk +# +# Karl Ove Hufthammer , 2020. +msgid "" +msgstr "" +"Project-Id-Version: kdiff3\n" +"Report-Msgid-Bugs-To: https://bugs.kde.org\n" +"POT-Creation-Date: 2019-08-30 07:40+0200\n" +"PO-Revision-Date: 2020-04-30 23:10+0200\n" +"Last-Translator: Karl Ove Hufthammer \n" +"Language-Team: Norwegian Nynorsk \n" +"Language: nn\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=n != 1;\n" +"X-Generator: Lokalize 19.12.3\n" +"X-Environment: kde\n" +"X-Accelerator-Marker: &\n" +"X-Text-Markup: kde4\n" + +#: kdiff3fileitemaction.cpp:92 +#, kde-format +msgid "KDiff3..." +msgstr "KDiff3 …" + +#: kdiff3fileitemaction.cpp:124 +#, kde-format +msgid "Compare with %1" +msgstr "Samanlikna med %1" + +#: kdiff3fileitemaction.cpp:130 +#, kde-format +msgid "Merge with %1" +msgstr "Flett med %1" + +#: kdiff3fileitemaction.cpp:136 +#, kde-format +msgid "Save '%1' for later" +msgstr "Lagra «%1» til seinare" + +#: kdiff3fileitemaction.cpp:142 +#, kde-format +msgid "3-way merge with base" +msgstr "3-vegsfletting med grunnfil" + +#: kdiff3fileitemaction.cpp:149 +#, kde-format +msgid "Compare with..." +msgstr "Samanlikna med …" + +#: kdiff3fileitemaction.cpp:161 +#, kde-format +msgid "Clear list" +msgstr "Tøm lista" + +#: kdiff3fileitemaction.cpp:169 +#, kde-format +msgid "Compare" +msgstr "Samanlikna" + +#: kdiff3fileitemaction.cpp:175 +#, kde-format +msgid "3 way comparison" +msgstr "3-vegssamanlikning" + +#: kdiff3fileitemaction.cpp:179 +#, kde-format +msgid "About KDiff3 menu plugin..." +msgstr "Om KDiff3-menytillegg …" + +#: kdiff3fileitemaction.cpp:287 +#, kde-format +msgid "KDiff3 File Item Action Plugin: Copyright (C) 2011 Joachim Eibl\n" +msgstr "KDiff3-filhandlingstillegg: © 2011 Joachim Eibl\n" + +#: kdiff3fileitemaction.cpp:288 +#, kde-format +msgid "" +"Using the context menu extension:\n" +"For simple comparison of two selected 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 " +"the 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." +msgstr "" + +#: kdiff3fileitemaction.cpp:296 +#, kde-format +msgid "About KDiff3 File Item Action Plugin" +msgstr "Om Kdiff3-filhandlingstillegget" \ No newline at end of file diff -Nru kdiff3-1.8.01/po/nn/kdiff3.po kdiff3-1.8.3/po/nn/kdiff3.po --- kdiff3-1.8.01/po/nn/kdiff3.po 2019-05-18 01:02:16.000000000 +0000 +++ kdiff3-1.8.3/po/nn/kdiff3.po 2020-06-25 00:18:40.000000000 +0000 @@ -1,13 +1,14 @@ # Translation of kdiff3 to Norwegian Nynorsk # +# Karl Ove Hufthammer , 2020. msgid "" msgstr "" "Project-Id-Version: KDE 4\n" -"Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2019-04-18 08:02+0200\n" -"PO-Revision-Date: 2008-11-26 17:46+0100\n" +"Report-Msgid-Bugs-To: https://bugs.kde.org\n" +"POT-Creation-Date: 2020-06-22 07:48+0200\n" +"PO-Revision-Date: 2020-05-10 12:21+0200\n" "Last-Translator: Karl Ove Hufthammer \n" -"Language-Team: Norwegian Nynorsk \n" +"Language-Team: Norwegian Nynorsk \n" "Language: nn\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -16,344 +17,345 @@ "X-Environment: kde\n" "X-Accelerator-Marker: &\n" "X-Text-Markup: kde4\n" +"X-Generator: Lokalize 20.04.0\n" #, kde-format msgctxt "NAME OF TRANSLATORS" msgid "Your names" -msgstr "" +msgstr "Karl Ove Hufthammer" #, kde-format msgctxt "EMAIL OF TRANSLATORS" msgid "Your emails" -msgstr "" +msgstr "karl@huftis.org" -#: difftextwindow.cpp:412 +#: difftextwindow.cpp:414 #, kde-format msgid "File %1: Line %2" -msgstr "" +msgstr "Fil %1: Linje %2" -#: difftextwindow.cpp:414 +#: difftextwindow.cpp:416 #, kde-format msgid "File %1: Line not available" -msgstr "" +msgstr "Fil %1: Linja er ikkje tilgjengeleg" -#: difftextwindow.cpp:1780 +#: difftextwindow.cpp:1778 #, kde-format msgid "Encoding:" -msgstr "" +msgstr "Teiknkoding:" -#: difftextwindow.cpp:1782 mergeresultwindow.cpp:3138 optiondialog.cpp:818 +#: difftextwindow.cpp:1781 mergeresultwindow.cpp:3166 optiondialog.cpp:840 #, kde-format msgid "Line end style:" -msgstr "" +msgstr "Linjeskift-stil:" -#: difftextwindow.cpp:1810 directorymergewindow.cpp:382 -#: directorymergewindow.cpp:433 directorymergewindow.cpp:524 -#: directorymergewindow.cpp:3058 directorymergewindow.cpp:3189 -#: directorymergewindow.cpp:3417 mergeresultwindow.cpp:942 -#: mergeresultwindow.cpp:944 mergeresultwindow.cpp:946 -#: mergeresultwindow.cpp:948 mergeresultwindow.cpp:1814 -#: mergeresultwindow.cpp:3170 mergeresultwindow.cpp:3177 optiondialog.cpp:962 -#: optiondialog.cpp:975 pdiff.cpp:833 pdiff.cpp:835 pdiff.cpp:837 pdiff.cpp:839 -#: pdiff.cpp:861 smalldialogs.cpp:124 smalldialogs.cpp:126 smalldialogs.cpp:127 -#: smalldialogs.cpp:130 +#: difftextwindow.cpp:1809 directorymergewindow.cpp:383 +#: directorymergewindow.cpp:434 directorymergewindow.cpp:525 +#: directorymergewindow.cpp:3072 directorymergewindow.cpp:3203 +#: directorymergewindow.cpp:3431 mergeresultwindow.cpp:970 +#: mergeresultwindow.cpp:972 mergeresultwindow.cpp:974 +#: mergeresultwindow.cpp:976 mergeresultwindow.cpp:1842 +#: mergeresultwindow.cpp:3198 mergeresultwindow.cpp:3205 optiondialog.cpp:1002 +#: optiondialog.cpp:1015 pdiff.cpp:823 pdiff.cpp:825 pdiff.cpp:827 +#: pdiff.cpp:829 pdiff.cpp:851 smalldialogs.cpp:131 smalldialogs.cpp:133 +#: smalldialogs.cpp:134 smalldialogs.cpp:137 #, kde-format msgid "A" -msgstr "" +msgstr "A" -#: difftextwindow.cpp:1810 directorymergewindow.cpp:384 -#: directorymergewindow.cpp:436 directorymergewindow.cpp:526 -#: directorymergewindow.cpp:3064 directorymergewindow.cpp:3190 -#: directorymergewindow.cpp:3418 mergeresultwindow.cpp:942 -#: mergeresultwindow.cpp:944 mergeresultwindow.cpp:950 -#: mergeresultwindow.cpp:952 mergeresultwindow.cpp:1816 -#: mergeresultwindow.cpp:3172 mergeresultwindow.cpp:3179 optiondialog.cpp:963 -#: optiondialog.cpp:976 pdiff.cpp:833 pdiff.cpp:835 pdiff.cpp:841 pdiff.cpp:843 -#: pdiff.cpp:863 smalldialogs.cpp:124 smalldialogs.cpp:125 smalldialogs.cpp:128 -#: smalldialogs.cpp:131 +#: difftextwindow.cpp:1809 directorymergewindow.cpp:385 +#: directorymergewindow.cpp:437 directorymergewindow.cpp:527 +#: directorymergewindow.cpp:3078 directorymergewindow.cpp:3204 +#: directorymergewindow.cpp:3432 mergeresultwindow.cpp:970 +#: mergeresultwindow.cpp:972 mergeresultwindow.cpp:978 +#: mergeresultwindow.cpp:980 mergeresultwindow.cpp:1844 +#: mergeresultwindow.cpp:3200 mergeresultwindow.cpp:3207 optiondialog.cpp:1003 +#: optiondialog.cpp:1016 pdiff.cpp:823 pdiff.cpp:825 pdiff.cpp:831 +#: pdiff.cpp:833 pdiff.cpp:853 smalldialogs.cpp:131 smalldialogs.cpp:132 +#: smalldialogs.cpp:135 smalldialogs.cpp:138 #, kde-format msgid "B" -msgstr "" +msgstr "B" -#: difftextwindow.cpp:1810 directorymergewindow.cpp:386 -#: directorymergewindow.cpp:439 directorymergewindow.cpp:528 -#: directorymergewindow.cpp:3070 directorymergewindow.cpp:3191 -#: directorymergewindow.cpp:3419 mergeresultwindow.cpp:946 -#: mergeresultwindow.cpp:948 mergeresultwindow.cpp:950 -#: mergeresultwindow.cpp:952 mergeresultwindow.cpp:1818 -#: mergeresultwindow.cpp:3174 mergeresultwindow.cpp:3181 optiondialog.cpp:977 -#: pdiff.cpp:837 pdiff.cpp:839 pdiff.cpp:841 pdiff.cpp:843 pdiff.cpp:865 -#: smalldialogs.cpp:125 smalldialogs.cpp:126 smalldialogs.cpp:129 -#: smalldialogs.cpp:132 +#: difftextwindow.cpp:1809 directorymergewindow.cpp:387 +#: directorymergewindow.cpp:440 directorymergewindow.cpp:529 +#: directorymergewindow.cpp:3084 directorymergewindow.cpp:3205 +#: directorymergewindow.cpp:3433 mergeresultwindow.cpp:974 +#: mergeresultwindow.cpp:976 mergeresultwindow.cpp:978 +#: mergeresultwindow.cpp:980 mergeresultwindow.cpp:1846 +#: mergeresultwindow.cpp:3202 mergeresultwindow.cpp:3209 optiondialog.cpp:1017 +#: pdiff.cpp:827 pdiff.cpp:829 pdiff.cpp:831 pdiff.cpp:833 pdiff.cpp:855 +#: smalldialogs.cpp:132 smalldialogs.cpp:133 smalldialogs.cpp:136 +#: smalldialogs.cpp:139 #, kde-format msgid "C" -msgstr "" +msgstr "C" -#: difftextwindow.cpp:1810 +#: difftextwindow.cpp:1809 #, kde-format msgid "A (Base)" -msgstr "" +msgstr "A (base)" -#: difftextwindow.cpp:1812 +#: difftextwindow.cpp:1811 #, kde-format msgid "Encoding: %1" -msgstr "" +msgstr "Teiknkoding: %1" -#: difftextwindow.cpp:1813 mergeresultwindow.cpp:3183 +#: difftextwindow.cpp:1812 mergeresultwindow.cpp:3211 #, kde-format msgid "Unix" -msgstr "" +msgstr "Unix" -#: difftextwindow.cpp:1813 mergeresultwindow.cpp:3184 +#: difftextwindow.cpp:1812 mergeresultwindow.cpp:3212 #, kde-format msgid "DOS" -msgstr "" +msgstr "DOS" -#: difftextwindow.cpp:1813 +#: difftextwindow.cpp:1812 #, kde-format msgid "Line end style: %1" -msgstr "" +msgstr "Linjeskift-stil: %1" -#: difftextwindow.cpp:1835 kdiff3.cpp:873 +#: difftextwindow.cpp:1834 kdiff3.cpp:874 #, kde-format msgid "Top line" -msgstr "" +msgstr "Øvste linje" -#: difftextwindow.cpp:1845 +#: difftextwindow.cpp:1843 #, kde-format msgid "End" msgstr "" -#: difftextwindow.cpp:1903 smalldialogs.cpp:235 +#: difftextwindow.cpp:1901 smalldialogs.cpp:245 #, kde-format msgid "Open File" msgstr "Opna fil" -#: difftextwindow.cpp:1951 optiondialog.cpp:387 +#: difftextwindow.cpp:1943 optiondialog.cpp:389 #, kde-format msgid "Unicode, 8 bit" -msgstr "" +msgstr "Unicode, 8-bit" -#: difftextwindow.cpp:1966 +#: difftextwindow.cpp:1958 #, kde-format msgid "Other" -msgstr "" +msgstr "Anna" -#: directorymergewindow.cpp:409 directorymergewindow.cpp:3424 +#: directorymergewindow.cpp:410 directorymergewindow.cpp:3438 #, kde-format msgid "Copy A to B" -msgstr "" +msgstr "Kopier A til B" -#: directorymergewindow.cpp:412 directorymergewindow.cpp:3425 +#: directorymergewindow.cpp:413 directorymergewindow.cpp:3439 #, kde-format msgid "Copy B to A" -msgstr "" +msgstr "Kopier B til A" -#: directorymergewindow.cpp:415 directorymergewindow.cpp:3426 +#: directorymergewindow.cpp:416 directorymergewindow.cpp:3440 #, kde-format msgid "Delete A" -msgstr "" +msgstr "Slett A" -#: directorymergewindow.cpp:418 directorymergewindow.cpp:3427 +#: directorymergewindow.cpp:419 directorymergewindow.cpp:3441 #, kde-format msgid "Delete B" -msgstr "" +msgstr "Slett B" -#: directorymergewindow.cpp:421 +#: directorymergewindow.cpp:422 #, kde-format msgid "Delete A & B" -msgstr "" +msgstr "Slett A og B" -#: directorymergewindow.cpp:424 directorymergewindow.cpp:3429 +#: directorymergewindow.cpp:425 directorymergewindow.cpp:3443 #, kde-format msgid "Merge to A" -msgstr "" +msgstr "Flett til A" -#: directorymergewindow.cpp:427 directorymergewindow.cpp:3430 +#: directorymergewindow.cpp:428 directorymergewindow.cpp:3444 #, kde-format msgid "Merge to B" -msgstr "" +msgstr "Flett til B" -#: directorymergewindow.cpp:430 +#: directorymergewindow.cpp:431 #, kde-format msgid "Merge to A & B" -msgstr "" +msgstr "Flett til A og B" -#: directorymergewindow.cpp:442 directorymergewindow.cpp:3421 +#: directorymergewindow.cpp:443 directorymergewindow.cpp:3435 #, kde-format msgid "Delete (if exists)" -msgstr "" +msgstr "Slett (viss det finst)" -#: directorymergewindow.cpp:445 directorymergewindow.cpp:448 -#: directorymergewindow.cpp:3420 optiondialog.cpp:925 smalldialogs.cpp:113 +#: directorymergewindow.cpp:446 directorymergewindow.cpp:449 +#: directorymergewindow.cpp:3434 smalldialogs.cpp:120 #, kde-format msgid "Merge" -msgstr "" +msgstr "Flett" -#: directorymergewindow.cpp:445 directorymergewindow.cpp:448 +#: directorymergewindow.cpp:446 directorymergewindow.cpp:449 #, kde-format msgid "Merge (manual)" -msgstr "" +msgstr "Flett (manuelt)" -#: directorymergewindow.cpp:451 +#: directorymergewindow.cpp:452 #, kde-format msgid "Error: Conflicting File Types" msgstr "" -#: directorymergewindow.cpp:454 +#: directorymergewindow.cpp:455 #, kde-format msgid "Error: Changed and Deleted" msgstr "" -#: directorymergewindow.cpp:457 +#: directorymergewindow.cpp:458 #, kde-format msgid "Error: Dates are equal but files are not." msgstr "" -#: directorymergewindow.cpp:471 +#: directorymergewindow.cpp:472 #, kde-format msgid "Done" -msgstr "" +msgstr "Fullført" -#: directorymergewindow.cpp:473 +#: directorymergewindow.cpp:474 #, kde-format msgid "Error" -msgstr "" +msgstr "Feil" -#: directorymergewindow.cpp:475 +#: directorymergewindow.cpp:476 #, kde-format msgid "Skipped." -msgstr "" +msgstr "Hoppa over." -#: directorymergewindow.cpp:477 +#: directorymergewindow.cpp:478 #, kde-format msgid "Not saved." -msgstr "" +msgstr "Ikkje lagra." -#: directorymergewindow.cpp:479 +#: directorymergewindow.cpp:480 #, kde-format msgid "In progress..." -msgstr "" +msgstr "I gang …" -#: directorymergewindow.cpp:481 +#: directorymergewindow.cpp:482 #, kde-format msgid "To do." msgstr "" -#: directorymergewindow.cpp:522 +#: directorymergewindow.cpp:523 #, kde-format msgid "Name" -msgstr "" +msgstr "Namn" -#: directorymergewindow.cpp:530 +#: directorymergewindow.cpp:531 #, kde-format msgid "Operation" -msgstr "" +msgstr "Handling" -#: directorymergewindow.cpp:532 +#: directorymergewindow.cpp:533 #, kde-format msgid "Status" -msgstr "" +msgstr "Status" -#: directorymergewindow.cpp:534 +#: directorymergewindow.cpp:535 #, kde-format msgid "Unsolved" -msgstr "" +msgstr "Ikkje løyst" -#: directorymergewindow.cpp:536 +#: directorymergewindow.cpp:537 #, kde-format msgid "Solved" -msgstr "" +msgstr "Løyst" -#: directorymergewindow.cpp:538 +#: directorymergewindow.cpp:539 #, kde-format msgid "Nonwhite" -msgstr "" +msgstr "Ikkje-blankteikn" -#: directorymergewindow.cpp:540 +#: directorymergewindow.cpp:541 #, kde-format msgid "White" -msgstr "" +msgstr "Blankteikn" -#: directorymergewindow.cpp:674 +#: directorymergewindow.cpp:676 #, kde-format msgid "Unable to compare non-normal file with normal file." msgstr "" -#: directorymergewindow.cpp:688 +#: directorymergewindow.cpp:690 #, kde-format msgid "Mix of links and normal files." msgstr "" -#: directorymergewindow.cpp:695 +#: directorymergewindow.cpp:697 #, kde-format msgid "Link: " msgstr "" -#: directorymergewindow.cpp:704 +#: directorymergewindow.cpp:706 #, kde-format msgid "Size. " msgstr "" -#: directorymergewindow.cpp:718 directorymergewindow.cpp:728 +#: directorymergewindow.cpp:720 directorymergewindow.cpp:730 #, kde-format msgid "Date & Size: " msgstr "" -#: directorymergewindow.cpp:748 +#: directorymergewindow.cpp:751 #, kde-format msgid "Comparing file..." msgstr "" -#: directorymergewindow.cpp:801 +#: directorymergewindow.cpp:813 #, kde-format msgid "" "You are currently doing a directory merge. Are you sure, you want to abort " "the merge and rescan the directory?" msgstr "" -#: directorymergewindow.cpp:802 kdiff3.cpp:698 kdiff3.cpp:708 kdiff3.cpp:720 -#: mergeresultwindow.cpp:372 pdiff.cpp:1033 pdiff.cpp:1910 pdiff.cpp:1920 +#: directorymergewindow.cpp:814 kdiff3.cpp:697 kdiff3.cpp:707 kdiff3.cpp:719 +#: mergeresultwindow.cpp:400 pdiff.cpp:1031 pdiff.cpp:1920 pdiff.cpp:1930 #, kde-format msgid "Warning" -msgstr "" +msgstr "Åtvaring" -#: directorymergewindow.cpp:803 directorymergewindow.cpp:3393 +#: directorymergewindow.cpp:815 directorymergewindow.cpp:3407 #, kde-format msgid "Rescan" -msgstr "" +msgstr "Skann på nytt" -#: directorymergewindow.cpp:804 pdiff.cpp:1035 +#: directorymergewindow.cpp:816 pdiff.cpp:1033 #, kde-format msgid "Continue Merging" -msgstr "" +msgstr "Hald fram fletting" -#: directorymergewindow.cpp:971 +#: directorymergewindow.cpp:984 #, kde-format msgid "Opening of directories failed:" msgstr "" -#: directorymergewindow.cpp:975 +#: directorymergewindow.cpp:988 #, kde-format msgid "Dir A \"%1\" does not exist or is not a directory.\n" msgstr "" -#: directorymergewindow.cpp:980 +#: directorymergewindow.cpp:993 #, kde-format msgid "Dir B \"%1\" does not exist or is not a directory.\n" msgstr "" -#: directorymergewindow.cpp:985 +#: directorymergewindow.cpp:998 #, kde-format msgid "Dir C \"%1\" does not exist or is not a directory.\n" msgstr "" -#: directorymergewindow.cpp:988 +#: directorymergewindow.cpp:1001 #, kde-format msgid "Directory Open Error" msgstr "" -#: directorymergewindow.cpp:996 +#: directorymergewindow.cpp:1009 #, kde-format msgid "" "The destination directory must not be the same as A or B when three " @@ -361,49 +363,49 @@ "Check again before continuing." msgstr "" -#: directorymergewindow.cpp:998 +#: directorymergewindow.cpp:1011 #, kde-format msgid "Parameter Warning" msgstr "" -#: directorymergewindow.cpp:1003 +#: directorymergewindow.cpp:1016 #, kde-format msgid "Scanning directories..." msgstr "" -#: directorymergewindow.cpp:1029 +#: directorymergewindow.cpp:1042 #, kde-format msgid "Reading Directory A" msgstr "" -#: directorymergewindow.cpp:1038 +#: directorymergewindow.cpp:1051 #, kde-format msgid "Reading Directory B" msgstr "" -#: directorymergewindow.cpp:1048 +#: directorymergewindow.cpp:1061 #, kde-format msgid "Reading Directory C" msgstr "" -#: directorymergewindow.cpp:1064 +#: directorymergewindow.cpp:1077 #, kde-format msgid "Some subdirectories were not readable in" msgstr "" -#: directorymergewindow.cpp:1069 +#: directorymergewindow.cpp:1082 #, kde-format msgid "Check the permissions of the subdirectories." msgstr "" -#: directorymergewindow.cpp:1106 kdiff3.cpp:666 kdiff3.cpp:753 kdiff3.cpp:777 -#: kdiff3.cpp:1065 kdiff3.cpp:1086 pdiff.cpp:1116 pdiff.cpp:1170 pdiff.cpp:1218 -#: pdiff.cpp:1234 pdiff.cpp:1277 pdiff.cpp:1301 +#: directorymergewindow.cpp:1119 kdiff3.cpp:665 kdiff3.cpp:752 kdiff3.cpp:776 +#: kdiff3.cpp:1072 kdiff3.cpp:1093 pdiff.cpp:1115 pdiff.cpp:1178 pdiff.cpp:1228 +#: pdiff.cpp:1244 pdiff.cpp:1287 pdiff.cpp:1311 #, kde-format msgid "Ready." msgstr "" -#: directorymergewindow.cpp:1121 +#: directorymergewindow.cpp:1134 #, kde-format msgid "" "Directory Comparison Status\n" @@ -413,66 +415,66 @@ "Number of different files: %3" msgstr "" -#: directorymergewindow.cpp:1128 +#: directorymergewindow.cpp:1141 #, kde-format msgid "Number of manual merges: %1" msgstr "" -#: directorymergewindow.cpp:1394 +#: directorymergewindow.cpp:1407 #, kde-format msgid "This affects all merge operations." msgstr "" -#: directorymergewindow.cpp:1395 +#: directorymergewindow.cpp:1408 #, kde-format msgid "Changing All Merge Operations" msgstr "" -#: directorymergewindow.cpp:1695 +#: directorymergewindow.cpp:1708 #, kde-format msgid "" "Processing %1 / %2\n" "%3" msgstr "" -#: directorymergewindow.cpp:1738 directorymergewindow.cpp:1742 +#: directorymergewindow.cpp:1751 directorymergewindow.cpp:1755 #, kde-format msgid "Some files could not be processed." msgstr "" -#: directorymergewindow.cpp:2222 directorymergewindow.cpp:2247 -#: directorymergewindow.cpp:2271 +#: directorymergewindow.cpp:2235 directorymergewindow.cpp:2260 +#: directorymergewindow.cpp:2285 #, kde-format msgid "This operation is currently not possible." msgstr "" -#: directorymergewindow.cpp:2222 directorymergewindow.cpp:2247 -#: directorymergewindow.cpp:2271 directorymergewindow.cpp:2552 +#: directorymergewindow.cpp:2235 directorymergewindow.cpp:2260 +#: directorymergewindow.cpp:2285 directorymergewindow.cpp:2565 #, kde-format msgid "Operation Not Possible" msgstr "" -#: directorymergewindow.cpp:2318 +#: directorymergewindow.cpp:2332 #, kde-format msgid "An error occurred while copying." msgstr "" -#: directorymergewindow.cpp:2319 directorymergewindow.cpp:2759 +#: directorymergewindow.cpp:2333 directorymergewindow.cpp:2772 #, kde-format msgid "Merge Error" msgstr "" -#: directorymergewindow.cpp:2396 +#: directorymergewindow.cpp:2410 #, kde-format msgid "Unknown merge operation. (This must never happen!)" msgstr "" -#: directorymergewindow.cpp:2441 +#: directorymergewindow.cpp:2455 #, kde-format msgid "Unknown merge operation." msgstr "" -#: directorymergewindow.cpp:2454 +#: directorymergewindow.cpp:2468 #, kde-format msgid "" "The merge is about to begin.\n" @@ -485,50 +487,50 @@ "whatsoever! Make backups of your vital data!" msgstr "" -#: directorymergewindow.cpp:2459 +#: directorymergewindow.cpp:2473 #, kde-format msgid "Starting Merge" msgstr "" -#: directorymergewindow.cpp:2460 +#: directorymergewindow.cpp:2474 #, kde-format msgid "Do It" msgstr "" -#: directorymergewindow.cpp:2461 +#: directorymergewindow.cpp:2475 #, kde-format msgid "Simulate It" msgstr "" -#: directorymergewindow.cpp:2487 +#: directorymergewindow.cpp:2501 #, kde-format msgid "" "The highlighted item has a different type in the different directories. " "Select what to do." msgstr "" -#: directorymergewindow.cpp:2491 +#: directorymergewindow.cpp:2505 #, kde-format msgid "" "The modification dates of the file are equal but the files are not. Select " "what to do." msgstr "" -#: directorymergewindow.cpp:2495 +#: directorymergewindow.cpp:2509 #, kde-format msgid "" "The highlighted item was changed in one directory and deleted in the other. " "Select what to do." msgstr "" -#: directorymergewindow.cpp:2552 +#: directorymergewindow.cpp:2565 #, kde-format msgid "" "This operation is currently not possible because directory merge is " "currently running." msgstr "" -#: directorymergewindow.cpp:2609 +#: directorymergewindow.cpp:2622 #, kde-format msgid "" "There was an error in the last step.\n" @@ -536,968 +538,981 @@ "to skip this item?" msgstr "" -#: directorymergewindow.cpp:2611 +#: directorymergewindow.cpp:2624 #, kde-format msgid "Continue merge after an error" msgstr "" -#: directorymergewindow.cpp:2612 +#: directorymergewindow.cpp:2625 #, kde-format msgid "Continue With Last Item" msgstr "" -#: directorymergewindow.cpp:2613 +#: directorymergewindow.cpp:2626 #, kde-format msgid "Skip Item" msgstr "" -#: directorymergewindow.cpp:2709 +#: directorymergewindow.cpp:2722 #, kde-format msgid "Merge operation complete." msgstr "" -#: directorymergewindow.cpp:2709 directorymergewindow.cpp:2712 +#: directorymergewindow.cpp:2722 directorymergewindow.cpp:2725 #, kde-format msgid "Merge Complete" msgstr "" -#: directorymergewindow.cpp:2722 +#: directorymergewindow.cpp:2735 #, kde-format msgid "" "Simulated merge complete: Check if you agree with the proposed operations." msgstr "" -#: directorymergewindow.cpp:2758 +#: directorymergewindow.cpp:2771 #, kde-format msgid "An error occurred. Press OK to see detailed information." msgstr "" -#: directorymergewindow.cpp:2791 +#: directorymergewindow.cpp:2804 #, kde-format msgid "Error: While deleting %1: Creating backup failed." msgstr "" -#: directorymergewindow.cpp:2798 +#: directorymergewindow.cpp:2811 #, kde-format msgid "delete directory recursively( %1 )" msgstr "" -#: directorymergewindow.cpp:2800 +#: directorymergewindow.cpp:2813 #, kde-format msgid "delete( %1 )" msgstr "" -#: directorymergewindow.cpp:2815 +#: directorymergewindow.cpp:2828 #, kde-format msgid "Error: delete dir operation failed while trying to read the directory." msgstr "" -#: directorymergewindow.cpp:2834 +#: directorymergewindow.cpp:2847 #, kde-format msgid "Error: rmdir( %1 ) operation failed." msgstr "" -#: directorymergewindow.cpp:2844 +#: directorymergewindow.cpp:2857 #, kde-format msgid "Error: delete operation failed." msgstr "" -#: directorymergewindow.cpp:2870 +#: directorymergewindow.cpp:2884 #, kde-format msgid "manual merge( %1, %2, %3 -> %4)" msgstr "" -#: directorymergewindow.cpp:2873 +#: directorymergewindow.cpp:2887 #, kde-format msgid "" " Note: After a manual merge the user should continue by pressing F7." msgstr "" -#: directorymergewindow.cpp:2900 +#: directorymergewindow.cpp:2914 #, kde-format msgid "Error: copy( %1 -> %2 ) failed.Deleting existing destination failed." msgstr "" -#: directorymergewindow.cpp:2909 +#: directorymergewindow.cpp:2923 #, kde-format msgid "copyLink( %1 -> %2 )" msgstr "" -#: directorymergewindow.cpp:2918 +#: directorymergewindow.cpp:2932 #, kde-format msgid "Error: copyLink failed: Remote links are not yet supported." msgstr "" -#: directorymergewindow.cpp:2928 +#: directorymergewindow.cpp:2942 #, kde-format msgid "Error: copyLink failed." msgstr "" -#: directorymergewindow.cpp:2953 +#: directorymergewindow.cpp:2967 #, kde-format msgid "copy( %1 -> %2 )" msgstr "" -#: directorymergewindow.cpp:2979 +#: directorymergewindow.cpp:2993 #, kde-format msgid "Error during rename( %1 -> %2 ): Cannot delete existing destination." msgstr "" -#: directorymergewindow.cpp:2986 +#: directorymergewindow.cpp:3000 #, kde-format msgid "rename( %1 -> %2 )" msgstr "" -#: directorymergewindow.cpp:2995 +#: directorymergewindow.cpp:3009 #, kde-format msgid "Error: Rename failed." msgstr "" -#: directorymergewindow.cpp:3013 +#: directorymergewindow.cpp:3027 #, kde-format msgid "Error during makeDir of %1. Cannot delete existing file." msgstr "" -#: directorymergewindow.cpp:3030 +#: directorymergewindow.cpp:3044 #, kde-format msgid "makeDir( %1 )" msgstr "" -#: directorymergewindow.cpp:3040 +#: directorymergewindow.cpp:3054 #, kde-format msgid "Error while creating directory." msgstr "" -#: directorymergewindow.cpp:3076 directorymergewindow.cpp:3195 +#: directorymergewindow.cpp:3090 directorymergewindow.cpp:3209 #, kde-format msgid "Dest" -msgstr "" +msgstr "Mål" -#: directorymergewindow.cpp:3084 directorymergewindow.cpp:3113 +#: directorymergewindow.cpp:3098 directorymergewindow.cpp:3127 #, kde-format msgid "Dir" msgstr "" -#: directorymergewindow.cpp:3084 +#: directorymergewindow.cpp:3098 #, kde-format msgid "Type" -msgstr "" +msgstr "Type" -#: directorymergewindow.cpp:3084 +#: directorymergewindow.cpp:3098 #, kde-format msgid "Size" -msgstr "" +msgstr "Storleik" -#: directorymergewindow.cpp:3085 +#: directorymergewindow.cpp:3099 #, kde-format msgid "Attr" -msgstr "" +msgstr "Attributt" -#: directorymergewindow.cpp:3085 +#: directorymergewindow.cpp:3099 #, kde-format msgid "Last Modification" -msgstr "" +msgstr "Sist endra" -#: directorymergewindow.cpp:3085 +#: directorymergewindow.cpp:3099 #, kde-format msgid "Link-Destination" -msgstr "" +msgstr "Lenkjemål" -#: directorymergewindow.cpp:3113 +#: directorymergewindow.cpp:3127 #, kde-format msgid "File" -msgstr "" +msgstr "Fil" -#: directorymergewindow.cpp:3113 +#: directorymergewindow.cpp:3127 #, kde-format msgid "-Link" -msgstr "" +msgstr "-lenkje" -#: directorymergewindow.cpp:3119 +#: directorymergewindow.cpp:3133 #, kde-format msgid "not available" -msgstr "" +msgstr "ikkje tilgjengeleg" -#: directorymergewindow.cpp:3137 +#: directorymergewindow.cpp:3151 #, kde-format msgid "A (Dest): " -msgstr "" +msgstr "A (mål): " -#: directorymergewindow.cpp:3141 +#: directorymergewindow.cpp:3155 #, kde-format msgid "A: " -msgstr "" +msgstr "A: " -#: directorymergewindow.cpp:3141 +#: directorymergewindow.cpp:3155 #, kde-format msgid "A (Base): " -msgstr "" +msgstr "A (base): " -#: directorymergewindow.cpp:3147 +#: directorymergewindow.cpp:3161 #, kde-format msgid "B (Dest): " -msgstr "" +msgstr "B (mål): " -#: directorymergewindow.cpp:3151 +#: directorymergewindow.cpp:3165 #, kde-format msgid "B: " -msgstr "" +msgstr "B: " -#: directorymergewindow.cpp:3156 +#: directorymergewindow.cpp:3170 #, kde-format msgid "C (Dest): " -msgstr "" +msgstr "C (mål): " -#: directorymergewindow.cpp:3160 +#: directorymergewindow.cpp:3174 #, kde-format msgid "C: " -msgstr "" +msgstr "C: " -#: directorymergewindow.cpp:3163 +#: directorymergewindow.cpp:3177 #, kde-format msgid "Dest: " -msgstr "" +msgstr "Mål: " #. i18n("Saving Directory Merge State ...")); -#: directorymergewindow.cpp:3238 +#: directorymergewindow.cpp:3252 #, kde-format msgid "Save Directory Merge State As..." msgstr "" -#: directorymergewindow.cpp:3387 +#: directorymergewindow.cpp:3401 #, kde-format msgid "Start/Continue Directory Merge" msgstr "" -#: directorymergewindow.cpp:3388 +#: directorymergewindow.cpp:3402 #, kde-format msgid "Run Operation for Current Item" msgstr "" -#: directorymergewindow.cpp:3389 +#: directorymergewindow.cpp:3403 #, kde-format msgid "Compare Selected File" -msgstr "" +msgstr "Samanlikna vald fil" -#: directorymergewindow.cpp:3390 +#: directorymergewindow.cpp:3404 #, kde-format msgid "Merge Current File" -msgstr "" +msgstr "Flett gjeldande fil" -#: directorymergewindow.cpp:3390 +#: directorymergewindow.cpp:3404 #, kde-format msgid "" "Merge\n" "File" msgstr "" +"Flett\n" +"Fil" -#: directorymergewindow.cpp:3391 +#: directorymergewindow.cpp:3405 #, kde-format msgid "Fold All Subdirs" msgstr "" -#: directorymergewindow.cpp:3392 +#: directorymergewindow.cpp:3406 #, kde-format msgid "Unfold All Subdirs" msgstr "" #. i18n("Save Directory Merge State ..."), 0, this, &DirectoryMergeWindow::slotSaveMergeState, ac, "dir_save_merge_state"); #. i18n("Load Directory Merge State ..."), 0, this, &DirectoryMergeWindow::slotLoadMergeState, ac, "dir_load_merge_state"); -#: directorymergewindow.cpp:3396 +#: directorymergewindow.cpp:3410 #, kde-format msgid "Choose A for All Items" msgstr "" -#: directorymergewindow.cpp:3397 +#: directorymergewindow.cpp:3411 #, kde-format msgid "Choose B for All Items" msgstr "" -#: directorymergewindow.cpp:3398 +#: directorymergewindow.cpp:3412 #, kde-format msgid "Choose C for All Items" msgstr "" -#: directorymergewindow.cpp:3399 +#: directorymergewindow.cpp:3413 #, kde-format msgid "Auto-Choose Operation for All Items" msgstr "" -#: directorymergewindow.cpp:3400 +#: directorymergewindow.cpp:3414 #, kde-format msgid "No Operation for All Items" msgstr "" #. i18n("Synchronize Directories"), 0, this, &DirectoryMergeWindow::slotSynchronizeDirectories, ac, "dir_synchronize_directories"); #. d->m_pDirChooseNewerFiles = GuiUtils::createAction< KToggleAction >(i18n("Copy Newer Files Instead of Merging"), 0, this, &DirectoryMergeWindow::slotChooseNewerFiles, ac, "dir_choose_newer_files"); -#: directorymergewindow.cpp:3405 +#: directorymergewindow.cpp:3419 #, kde-format msgid "Show Identical Files" msgstr "" -#: directorymergewindow.cpp:3405 +#: directorymergewindow.cpp:3419 #, kde-format msgid "" "Identical\n" "Files" msgstr "" -#: directorymergewindow.cpp:3406 +#: directorymergewindow.cpp:3420 #, kde-format msgid "Show Different Files" msgstr "" -#: directorymergewindow.cpp:3407 +#: directorymergewindow.cpp:3421 #, kde-format msgid "Show Files only in A" msgstr "" -#: directorymergewindow.cpp:3407 +#: directorymergewindow.cpp:3421 #, kde-format msgid "" "Files\n" "only in A" msgstr "" -#: directorymergewindow.cpp:3408 +#: directorymergewindow.cpp:3422 #, kde-format msgid "Show Files only in B" msgstr "" -#: directorymergewindow.cpp:3408 +#: directorymergewindow.cpp:3422 #, kde-format msgid "" "Files\n" "only in B" msgstr "" -#: directorymergewindow.cpp:3409 +#: directorymergewindow.cpp:3423 #, kde-format msgid "Show Files only in C" msgstr "" -#: directorymergewindow.cpp:3409 +#: directorymergewindow.cpp:3423 #, kde-format msgid "" "Files\n" "only in C" msgstr "" -#: directorymergewindow.cpp:3413 +#: directorymergewindow.cpp:3427 #, kde-format msgid "Compare Explicitly Selected Files" msgstr "" -#: directorymergewindow.cpp:3414 +#: directorymergewindow.cpp:3428 #, kde-format msgid "Merge Explicitly Selected Files" msgstr "" -#: directorymergewindow.cpp:3416 directorymergewindow.cpp:3423 +#: directorymergewindow.cpp:3430 directorymergewindow.cpp:3437 #, kde-format msgid "Do Nothing" -msgstr "" +msgstr "Ikkje gjer noko" -#: directorymergewindow.cpp:3428 +#: directorymergewindow.cpp:3442 #, kde-format msgid "Delete A && B" -msgstr "" +msgstr "Slett A og B" -#: directorymergewindow.cpp:3431 +#: directorymergewindow.cpp:3445 #, kde-format msgid "Merge to A && B" +msgstr "Flett til A og B" + +#: fileaccess.cpp:301 +#, kde-format +msgid "Unable to determine full url. No parent specified." msgstr "" -#: fileaccess.cpp:462 SourceData.cpp:493 +#: fileaccess.cpp:482 SourceData.cpp:506 #, kde-format msgid "Failed to read file: %1" msgstr "" -#: fileaccess.cpp:587 +#: fileaccess.cpp:624 #, kde-format msgid "Creating temp copy of %1 failed." msgstr "" -#: fileaccess.cpp:595 fileaccess.cpp:600 +#: fileaccess.cpp:632 fileaccess.cpp:637 #, kde-format msgid "Opening %1 failed. %2" msgstr "" -#: fileaccess.cpp:619 fileaccess.cpp:627 +#: fileaccess.cpp:656 fileaccess.cpp:664 #, kde-format msgid "Error reading from %1. %2" msgstr "" -#: fileaccess.cpp:751 +#: fileaccess.cpp:788 #, kde-format msgid "" "While trying to make a backup, deleting an older backup failed.\n" "Filename: %1" msgstr "" -#: fileaccess.cpp:758 +#: fileaccess.cpp:795 #, kde-format msgid "" "While trying to make a backup, renaming failed.\n" "Filenames: %1 -> %2" msgstr "" -#: fileaccess.cpp:828 +#: fileaccess.cpp:865 #, kde-format msgid "Getting file status: %1" msgstr "" -#: fileaccess.cpp:869 +#: fileaccess.cpp:906 #, kde-format msgid "Reading file: %1" -msgstr "" +msgstr "Les fil: %1" -#: fileaccess.cpp:907 +#: fileaccess.cpp:944 #, kde-format msgid "Writing file: %1" -msgstr "" +msgstr "Lagrar fil: %1" -#: fileaccess.cpp:940 +#: fileaccess.cpp:977 #, kde-format msgid "Out of memory" -msgstr "" +msgstr "Ikkje nok minne" -#: fileaccess.cpp:976 +#: fileaccess.cpp:1013 #, kde-format msgid "Making directory: %1" -msgstr "" +msgstr "Lagar ny mappe: %1" -#: fileaccess.cpp:997 +#: fileaccess.cpp:1034 #, kde-format msgid "Removing directory: %1" -msgstr "" +msgstr "Slettar mappe: %1" -#: fileaccess.cpp:1012 +#: fileaccess.cpp:1049 #, kde-format msgid "Removing file: %1" -msgstr "" +msgstr "Slettar fil: %1" -#: fileaccess.cpp:1028 +#: fileaccess.cpp:1065 #, kde-format msgid "Creating symbolic link: %1 -> %2" -msgstr "" +msgstr "Lagar symbolsk lenkje: %1 → %2" -#: fileaccess.cpp:1052 +#: fileaccess.cpp:1089 #, kde-format msgid "Renaming file: %1 -> %2" -msgstr "" +msgstr "Endrar namn på fil: %1 → %2" -#: fileaccess.cpp:1086 +#: fileaccess.cpp:1123 #, kde-format msgid "Copying file: %1 -> %2" -msgstr "" +msgstr "Kopierer fil: %1 → %2" -#: fileaccess.cpp:1108 +#: fileaccess.cpp:1145 #, kde-format msgid "Reading directory: %1" -msgstr "" +msgstr "Les mappe: %1" -#: fileaccess.cpp:1162 +#: fileaccess.cpp:1202 #, kde-format msgid "Listing directory: %1" -msgstr "" +msgstr "Hentar mappeinnhald: %1" -#: kdiff3.cpp:181 +#: kdiff3.cpp:182 #, kde-format msgid "Current Configuration:" -msgstr "" +msgstr "Gjeldande oppsett:" -#: kdiff3.cpp:186 +#: kdiff3.cpp:187 #, kde-format msgid "Config Option Error:" msgstr "" -#: kdiff3.cpp:240 +#: kdiff3.cpp:246 #, kde-format msgid "Option --auto used, but no output file specified." msgstr "" -#: kdiff3.cpp:416 +#: kdiff3.cpp:405 #, kde-format msgid "Option --auto ignored for directory comparison." msgstr "" -#: kdiff3.cpp:460 +#: kdiff3.cpp:449 #, kde-format msgid "Saving failed." msgstr "" -#: kdiff3.cpp:496 pdiff.cpp:1098 +#: kdiff3.cpp:494 pdiff.cpp:1096 #, kde-format msgid "Opening of these files failed:" msgstr "" -#: kdiff3.cpp:505 +#: kdiff3.cpp:503 pdiff.cpp:1105 #, kde-format -msgid "File Open Error" +msgid "File open error" msgstr "" -#: kdiff3.cpp:533 +#: kdiff3.cpp:532 #, kde-format msgid "Opens documents for comparison..." msgstr "" -#: kdiff3.cpp:535 +#: kdiff3.cpp:534 #, kde-format msgid "Reload" -msgstr "" +msgstr "Last om att" -#: kdiff3.cpp:538 +#: kdiff3.cpp:537 #, kde-format msgid "Saves the merge result. All conflicts must be solved!" msgstr "" -#: kdiff3.cpp:540 +#: kdiff3.cpp:539 #, kde-format msgid "Saves the current document as..." msgstr "" -#: kdiff3.cpp:543 +#: kdiff3.cpp:542 #, kde-format msgid "Print the differences" msgstr "" -#: kdiff3.cpp:546 +#: kdiff3.cpp:545 #, kde-format msgid "Quits the application" -msgstr "" +msgstr "Avsluttar programmet" -#: kdiff3.cpp:549 +#: kdiff3.cpp:548 #, kde-format msgid "Cuts the selected section and puts it to the clipboard" msgstr "" -#: kdiff3.cpp:552 +#: kdiff3.cpp:551 #, kde-format msgid "Copies the selected section to the clipboard" msgstr "" -#: kdiff3.cpp:554 +#: kdiff3.cpp:553 #, kde-format msgid "Pastes the clipboard contents to current position" msgstr "" -#: kdiff3.cpp:557 +#: kdiff3.cpp:556 #, kde-format msgid "Select everything in current window" msgstr "" -#: kdiff3.cpp:560 +#: kdiff3.cpp:559 #, kde-format msgid "Search for a string" msgstr "" -#: kdiff3.cpp:562 +#: kdiff3.cpp:561 #, kde-format msgid "Search again for the string" msgstr "" -#: kdiff3.cpp:567 +#: kdiff3.cpp:566 #, kde-format msgid "Enables/disables the statusbar" msgstr "" -#: kdiff3.cpp:571 +#: kdiff3.cpp:570 #, kde-format msgid "Configure KDiff3..." -msgstr "" +msgstr "Sett opp KDiff3 …" -#: kdiff3.cpp:590 +#: kdiff3.cpp:589 #, kde-format msgid "Go to Current Delta" -msgstr "" +msgstr "Gå til gjeldande delta" -#: kdiff3.cpp:590 +#: kdiff3.cpp:589 #, kde-format msgid "" "Current\n" "Delta" msgstr "" +"Gjeldande\n" +"delta" -#: kdiff3.cpp:592 +#: kdiff3.cpp:591 #, kde-format msgid "Go to First Delta" -msgstr "" +msgstr "Gå til første delta" -#: kdiff3.cpp:592 +#: kdiff3.cpp:591 #, kde-format msgid "" "First\n" "Delta" msgstr "" +"Første\n" +"delta" -#: kdiff3.cpp:594 +#: kdiff3.cpp:593 #, kde-format msgid "Go to Last Delta" -msgstr "" +msgstr "Gå til siste delta" -#: kdiff3.cpp:594 +#: kdiff3.cpp:593 #, kde-format msgid "" "Last\n" "Delta" msgstr "" +"Siste\n" +"delta" -#: kdiff3.cpp:596 +#: kdiff3.cpp:595 #, kde-format msgid "(Skips white space differences when \"Show White Space\" is disabled.)" msgstr "" -#: kdiff3.cpp:597 +#: kdiff3.cpp:596 #, kde-format msgid "" "(Does not skip white space differences even when \"Show White Space\" is " "disabled.)" msgstr "" -#: kdiff3.cpp:598 +#: kdiff3.cpp:597 #, kde-format msgid "Go to Previous Delta" msgstr "" -#: kdiff3.cpp:598 +#: kdiff3.cpp:597 #, kde-format msgid "" "Prev\n" "Delta" msgstr "" -#: kdiff3.cpp:600 +#: kdiff3.cpp:599 #, kde-format msgid "Go to Next Delta" msgstr "" -#: kdiff3.cpp:600 +#: kdiff3.cpp:599 #, kde-format msgid "" "Next\n" "Delta" msgstr "" -#: kdiff3.cpp:602 +#: kdiff3.cpp:601 #, kde-format msgid "Go to Previous Conflict" msgstr "" -#: kdiff3.cpp:602 +#: kdiff3.cpp:601 #, kde-format msgid "" "Prev\n" "Conflict" msgstr "" -#: kdiff3.cpp:604 +#: kdiff3.cpp:603 #, kde-format msgid "Go to Next Conflict" msgstr "" -#: kdiff3.cpp:604 +#: kdiff3.cpp:603 #, kde-format msgid "" "Next\n" "Conflict" msgstr "" -#: kdiff3.cpp:606 +#: kdiff3.cpp:605 #, kde-format msgid "Go to Previous Unsolved Conflict" msgstr "" -#: kdiff3.cpp:606 +#: kdiff3.cpp:605 #, kde-format msgid "" "Prev\n" "Unsolved" msgstr "" -#: kdiff3.cpp:608 +#: kdiff3.cpp:607 #, kde-format msgid "Go to Next Unsolved Conflict" msgstr "" -#: kdiff3.cpp:608 +#: kdiff3.cpp:607 #, kde-format msgid "" "Next\n" "Unsolved" msgstr "" -#: kdiff3.cpp:610 +#: kdiff3.cpp:609 #, kde-format msgid "Select Line(s) From A" msgstr "" -#: kdiff3.cpp:610 +#: kdiff3.cpp:609 #, kde-format msgid "" "Choose\n" "A" msgstr "" -#: kdiff3.cpp:611 +#: kdiff3.cpp:610 #, kde-format msgid "Select Line(s) From B" msgstr "" -#: kdiff3.cpp:611 +#: kdiff3.cpp:610 #, kde-format msgid "" "Choose\n" "B" msgstr "" -#: kdiff3.cpp:612 +#: kdiff3.cpp:611 #, kde-format msgid "Select Line(s) From C" msgstr "" -#: kdiff3.cpp:612 +#: kdiff3.cpp:611 #, kde-format msgid "" "Choose\n" "C" msgstr "" -#: kdiff3.cpp:613 +#: kdiff3.cpp:612 #, kde-format msgid "Automatically Go to Next Unsolved Conflict After Source Selection" msgstr "" -#: kdiff3.cpp:613 +#: kdiff3.cpp:612 #, kde-format msgid "" "Auto\n" "Next" msgstr "" -#: kdiff3.cpp:615 +#: kdiff3.cpp:614 #, kde-format msgid "Show Space && Tabulator Characters" msgstr "" -#: kdiff3.cpp:615 +#: kdiff3.cpp:614 #, kde-format msgid "" "White\n" "Characters" msgstr "" -#: kdiff3.cpp:616 +#: kdiff3.cpp:615 #, kde-format msgid "Show White Space" msgstr "" -#: kdiff3.cpp:616 +#: kdiff3.cpp:615 #, kde-format msgid "" "White\n" "Deltas" msgstr "" -#: kdiff3.cpp:618 +#: kdiff3.cpp:617 #, kde-format msgid "Show Line Numbers" msgstr "" -#: kdiff3.cpp:618 +#: kdiff3.cpp:617 #, kde-format msgid "" "Line\n" "Numbers" msgstr "" -#: kdiff3.cpp:620 +#: kdiff3.cpp:619 #, kde-format msgid "Automatically Solve Simple Conflicts" msgstr "" -#: kdiff3.cpp:621 +#: kdiff3.cpp:620 #, kde-format msgid "Set Deltas to Conflicts" msgstr "" -#: kdiff3.cpp:622 +#: kdiff3.cpp:621 #, kde-format msgid "Run Regular Expression Auto Merge" msgstr "" -#: kdiff3.cpp:623 +#: kdiff3.cpp:622 #, kde-format msgid "Automatically Solve History Conflicts" msgstr "" -#: kdiff3.cpp:624 +#: kdiff3.cpp:623 #, kde-format msgid "Split Diff At Selection" msgstr "" -#: kdiff3.cpp:625 +#: kdiff3.cpp:624 #, kde-format msgid "Join Selected Diffs" msgstr "" -#: kdiff3.cpp:627 +#: kdiff3.cpp:626 #, kde-format msgid "Show Window A" msgstr "" -#: kdiff3.cpp:628 +#: kdiff3.cpp:627 #, kde-format msgid "Show Window B" msgstr "" -#: kdiff3.cpp:629 +#: kdiff3.cpp:628 #, kde-format msgid "Show Window C" msgstr "" -#: kdiff3.cpp:631 +#: kdiff3.cpp:630 #, kde-format msgid "Normal Overview" msgstr "" -#: kdiff3.cpp:632 +#: kdiff3.cpp:631 #, kde-format msgid "A vs. B Overview" msgstr "" -#: kdiff3.cpp:633 +#: kdiff3.cpp:632 #, kde-format msgid "A vs. C Overview" msgstr "" -#: kdiff3.cpp:634 +#: kdiff3.cpp:633 #, kde-format msgid "B vs. C Overview" msgstr "" -#: kdiff3.cpp:635 +#: kdiff3.cpp:634 #, kde-format msgid "Word Wrap Diff Windows" msgstr "" -#: kdiff3.cpp:636 +#: kdiff3.cpp:635 #, kde-format msgid "Add Manual Diff Alignment" msgstr "" -#: kdiff3.cpp:637 +#: kdiff3.cpp:636 #, kde-format msgid "Clear All Manual Diff Alignments" msgstr "" -#: kdiff3.cpp:639 +#: kdiff3.cpp:638 #, kde-format msgid "Focus Next Window" msgstr "" -#: kdiff3.cpp:640 +#: kdiff3.cpp:639 #, kde-format msgid "Focus Prev Window" msgstr "" -#: kdiff3.cpp:641 +#: kdiff3.cpp:640 #, kde-format msgid "Toggle Split Orientation" msgstr "" -#: kdiff3.cpp:643 +#: kdiff3.cpp:642 #, kde-format msgid "Dir && Text Split Screen View" msgstr "" -#: kdiff3.cpp:645 +#: kdiff3.cpp:644 #, kde-format msgid "Toggle Between Dir && Text View" msgstr "" -#: kdiff3.cpp:697 pdiff.cpp:1909 +#: kdiff3.cpp:696 pdiff.cpp:1919 #, kde-format msgid "The merge result has not been saved." msgstr "" -#: kdiff3.cpp:699 +#: kdiff3.cpp:698 #, kde-format msgid "Save && Quit" msgstr "" -#: kdiff3.cpp:700 +#: kdiff3.cpp:699 #, kde-format msgid "Quit Without Saving" msgstr "" -#: kdiff3.cpp:708 pdiff.cpp:1920 +#: kdiff3.cpp:707 pdiff.cpp:1930 #, kde-format msgid "Saving the merge result failed." msgstr "" -#: kdiff3.cpp:719 pdiff.cpp:1032 +#: kdiff3.cpp:718 pdiff.cpp:1030 #, kde-format msgid "" "You are currently doing a directory merge. Are you sure, you want to abort?" msgstr "" -#: kdiff3.cpp:742 +#: kdiff3.cpp:741 #, kde-format msgid "Saving file..." msgstr "" -#: kdiff3.cpp:759 +#: kdiff3.cpp:758 #, kde-format msgid "Saving file with a new filename..." msgstr "" -#: kdiff3.cpp:761 +#: kdiff3.cpp:760 #, kde-format msgid "Save As..." msgstr "" -#: kdiff3.cpp:820 +#: kdiff3.cpp:819 #, kde-format msgid "Printing not implemented." msgstr "" -#: kdiff3.cpp:857 +#: kdiff3.cpp:858 #, kde-format msgid "Printing..." msgstr "" -#: kdiff3.cpp:943 +#: kdiff3.cpp:948 #, kde-format msgid "Printing page %1 of %2" msgstr "" -#: kdiff3.cpp:1000 +#: kdiff3.cpp:1006 #, kde-format msgid " (Selection)" msgstr "" -#: kdiff3.cpp:1027 +#: kdiff3.cpp:1034 #, kde-format msgid "Printing completed." msgstr "" -#: kdiff3.cpp:1031 +#: kdiff3.cpp:1038 #, kde-format msgid "Printing aborted." msgstr "" -#: kdiff3.cpp:1038 +#: kdiff3.cpp:1045 #, kde-format msgid "Exiting..." msgstr "" -#: kdiff3.cpp:1049 +#: kdiff3.cpp:1056 #, kde-format msgid "Toggling toolbar..." msgstr "" -#: kdiff3.cpp:1070 +#: kdiff3.cpp:1077 #, kde-format msgid "Toggle the statusbar..." msgstr "" @@ -1522,7 +1537,7 @@ msgid "Joachim Eibl" msgstr "" -#: kdiff3_part.cpp:173 kdiff3_part.cpp:254 +#: kdiff3_part.cpp:174 kdiff3_part.cpp:255 #, kde-format msgid "Could not find files for comparison." msgstr "" @@ -1540,7 +1555,7 @@ msgstr "" #. i18n: ectx: ToolBar (mainToolBar) -#: kdiff3_part.rc:16 main.cpp:88 +#: kdiff3_part.rc:16 main.cpp:89 #, kde-format msgid "KDiff3" msgstr "" @@ -1607,198 +1622,203 @@ msgid "Main Toolbar" msgstr "" -#: main.cpp:68 main.cpp:72 +#: main.cpp:69 main.cpp:73 #, kde-format msgid "Ignored. (User defined.)" msgstr "" -#: main.cpp:92 +#: main.cpp:93 #, kde-format msgid " (64 bit)" msgstr "" -#: main.cpp:94 +#: main.cpp:95 #, kde-format msgid " (32 bit)" msgstr "" -#: main.cpp:95 +#: main.cpp:96 #, kde-format msgid "Tool for Comparison and Merge of Files and Directories" msgstr "" -#: main.cpp:96 +#: main.cpp:97 #, kde-format msgid "(c) 2002-2014 Joachim Eibl, (c) 2017 Michael Reeves KF5/Qt5 port" msgstr "" -#: main.cpp:112 +#: main.cpp:113 #, kde-format msgid "Merge the input." msgstr "" -#: main.cpp:113 +#: main.cpp:114 #, kde-format msgid "Explicit base file. For compatibility with certain tools." msgstr "" -#: main.cpp:114 +#: main.cpp:115 #, kde-format msgid "Output file. Implies -m. E.g.: -o newfile.txt" msgstr "" -#: main.cpp:115 +#: main.cpp:116 #, kde-format msgid "Output file, again. (For compatibility with certain tools.)" msgstr "" -#: main.cpp:116 +#: main.cpp:118 #, kde-format msgid "No GUI if all conflicts are auto-solvable. (Needs -o file)" msgstr "" -#: main.cpp:117 +#: main.cpp:120 +#, kde-format +msgid "Ignored." +msgstr "" + +#: main.cpp:122 #, kde-format msgid "Do not solve conflicts automatically." msgstr "" -#: main.cpp:118 +#: main.cpp:123 #, kde-format msgid "Visible name replacement for input file 1 (base)." msgstr "" -#: main.cpp:119 +#: main.cpp:124 #, kde-format msgid "Visible name replacement for input file 2." msgstr "" -#: main.cpp:120 +#: main.cpp:125 #, kde-format msgid "Visible name replacement for input file 3." msgstr "" -#: main.cpp:121 +#: main.cpp:126 #, kde-format msgid "Alternative visible name replacement. Supply this once for every input." msgstr "" -#: main.cpp:122 +#: main.cpp:127 #, kde-format msgid "" "Override a config setting. Use once for every setting. E.g.: --cs " "\"AutoAdvance=1\"" msgstr "" -#: main.cpp:123 +#: main.cpp:128 #, kde-format msgid "Show list of config settings and current values." msgstr "" -#: main.cpp:124 +#: main.cpp:129 #, kde-format msgid "Use a different config file." msgstr "" -#: main.cpp:127 +#: main.cpp:132 #, kde-format msgid "file1 to open (base, if not specified via --base)" msgstr "" -#: main.cpp:128 +#: main.cpp:133 #, kde-format msgid "file2 to open" msgstr "" -#: main.cpp:129 +#: main.cpp:134 #, kde-format msgid "file3 to open" msgstr "" -#: main.cpp:153 +#: main.cpp:158 #, kde-format msgid "See kdiff3 --help for supported options." msgstr "" -#: mergeresultwindow.cpp:158 +#: mergeresultwindow.cpp:171 #, kde-format msgid "Choose A Everywhere" msgstr "" -#: mergeresultwindow.cpp:159 +#: mergeresultwindow.cpp:172 #, kde-format msgid "Choose B Everywhere" msgstr "" -#: mergeresultwindow.cpp:160 +#: mergeresultwindow.cpp:173 #, kde-format msgid "Choose C Everywhere" msgstr "" -#: mergeresultwindow.cpp:161 +#: mergeresultwindow.cpp:174 #, kde-format msgid "Choose A for All Unsolved Conflicts" msgstr "" -#: mergeresultwindow.cpp:162 +#: mergeresultwindow.cpp:175 #, kde-format msgid "Choose B for All Unsolved Conflicts" msgstr "" -#: mergeresultwindow.cpp:163 +#: mergeresultwindow.cpp:176 #, kde-format msgid "Choose C for All Unsolved Conflicts" msgstr "" -#: mergeresultwindow.cpp:164 +#: mergeresultwindow.cpp:177 #, kde-format msgid "Choose A for All Unsolved Whitespace Conflicts" msgstr "" -#: mergeresultwindow.cpp:165 +#: mergeresultwindow.cpp:178 #, kde-format msgid "Choose B for All Unsolved Whitespace Conflicts" msgstr "" -#: mergeresultwindow.cpp:166 +#: mergeresultwindow.cpp:179 #, kde-format msgid "Choose C for All Unsolved Whitespace Conflicts" msgstr "" -#: mergeresultwindow.cpp:176 +#: mergeresultwindow.cpp:204 #, kde-format msgid "Number of remaining unsolved conflicts: %1 (of which %2 are whitespace)" msgstr "" -#: mergeresultwindow.cpp:370 +#: mergeresultwindow.cpp:398 #, kde-format msgid "" "The output has been modified.\n" "If you continue your changes will be lost." msgstr "" -#: mergeresultwindow.cpp:936 pdiff.cpp:827 +#: mergeresultwindow.cpp:964 pdiff.cpp:817 #, kde-format msgid "All input files are binary equal." msgstr "" -#: mergeresultwindow.cpp:938 +#: mergeresultwindow.cpp:966 #, kde-format msgid "All input files contain the same text." msgstr "" -#: mergeresultwindow.cpp:942 mergeresultwindow.cpp:946 -#: mergeresultwindow.cpp:950 pdiff.cpp:833 pdiff.cpp:837 pdiff.cpp:841 +#: mergeresultwindow.cpp:970 mergeresultwindow.cpp:974 +#: mergeresultwindow.cpp:978 pdiff.cpp:823 pdiff.cpp:827 pdiff.cpp:831 #, kde-format msgid "Files %1 and %2 are binary equal.\n" msgstr "" -#: mergeresultwindow.cpp:944 mergeresultwindow.cpp:948 -#: mergeresultwindow.cpp:952 +#: mergeresultwindow.cpp:972 mergeresultwindow.cpp:976 +#: mergeresultwindow.cpp:980 #, kde-format msgid "Files %1 and %2 have equal text.\n" msgstr "" -#: mergeresultwindow.cpp:958 +#: mergeresultwindow.cpp:986 #, kde-format msgid "" "Total number of conflicts: %1\n" @@ -1807,39 +1827,39 @@ "%4" msgstr "" -#: mergeresultwindow.cpp:964 +#: mergeresultwindow.cpp:992 #, kde-format msgid "Conflicts" msgstr "" -#: mergeresultwindow.cpp:1873 +#: mergeresultwindow.cpp:1901 #, kde-format msgid "" msgstr "" -#: mergeresultwindow.cpp:1881 +#: mergeresultwindow.cpp:1909 #, kde-format msgid "" msgstr "" -#: mergeresultwindow.cpp:1883 mergeresultwindow.cpp:2755 +#: mergeresultwindow.cpp:1911 mergeresultwindow.cpp:2783 #, kde-format msgid "" msgstr "" -#: mergeresultwindow.cpp:2967 +#: mergeresultwindow.cpp:2995 #, kde-format msgid "" "Not all conflicts are solved yet.\n" "File not saved." msgstr "" -#: mergeresultwindow.cpp:2969 mergeresultwindow.cpp:2978 +#: mergeresultwindow.cpp:2997 mergeresultwindow.cpp:3006 #, kde-format msgid "Conflicts Left" msgstr "" -#: mergeresultwindow.cpp:2976 +#: mergeresultwindow.cpp:3004 #, kde-format msgid "" "There is a line end style conflict. Please choose the line end style " @@ -1847,7 +1867,7 @@ "File not saved." msgstr "" -#: mergeresultwindow.cpp:2990 +#: mergeresultwindow.cpp:3018 #, kde-format msgid "" "\n" @@ -1855,57 +1875,57 @@ "Creating backup failed. File not saved." msgstr "" -#: mergeresultwindow.cpp:2990 mergeresultwindow.cpp:3038 +#: mergeresultwindow.cpp:3018 mergeresultwindow.cpp:3066 #, kde-format msgid "File Save Error" msgstr "" -#: mergeresultwindow.cpp:3038 +#: mergeresultwindow.cpp:3066 #, kde-format msgid "Error while writing." msgstr "" -#: mergeresultwindow.cpp:3110 +#: mergeresultwindow.cpp:3138 #, kde-format msgid "Output:" msgstr "" -#: mergeresultwindow.cpp:3123 mergeresultwindow.cpp:3315 +#: mergeresultwindow.cpp:3151 mergeresultwindow.cpp:3343 #, kde-format msgid "[Modified]" msgstr "" -#: mergeresultwindow.cpp:3130 +#: mergeresultwindow.cpp:3158 #, kde-format msgid "Encoding for saving:" msgstr "" -#: mergeresultwindow.cpp:3230 +#: mergeresultwindow.cpp:3258 #, kde-format msgid "Conflict" msgstr "" -#: mergeresultwindow.cpp:3262 +#: mergeresultwindow.cpp:3290 #, kde-format msgid "Codec from A: %1" msgstr "" -#: mergeresultwindow.cpp:3264 +#: mergeresultwindow.cpp:3292 #, kde-format msgid "Codec from B: %1" msgstr "" -#: mergeresultwindow.cpp:3266 +#: mergeresultwindow.cpp:3294 #, kde-format msgid "Codec from C: %1" msgstr "" -#: optiondialog.cpp:119 +#: optiondialog.cpp:121 #, kde-format msgid "Change Font" msgstr "" -#: optiondialog.cpp:135 optiondialog.cpp:145 +#: optiondialog.cpp:137 optiondialog.cpp:147 #, kde-format msgid "" "Font: %1, %2, %3\n" @@ -1913,206 +1933,206 @@ "Example:" msgstr "" -#: optiondialog.cpp:388 +#: optiondialog.cpp:390 #, kde-format msgid "Unicode" msgstr "" -#: optiondialog.cpp:389 +#: optiondialog.cpp:391 #, kde-format msgid "Latin1" msgstr "" -#: optiondialog.cpp:408 +#: optiondialog.cpp:410 #, kde-format msgid "Change this if non-ASCII characters are not displayed correctly." msgstr "" -#: optiondialog.cpp:491 +#: optiondialog.cpp:495 #, kde-format msgid "Configure" msgstr "" -#: optiondialog.cpp:568 +#: optiondialog.cpp:573 #, kde-format msgid "Font" msgstr "" -#: optiondialog.cpp:570 +#: optiondialog.cpp:575 #, kde-format msgid "Editor & Diff Output Font" msgstr "" -#: optiondialog.cpp:589 +#: optiondialog.cpp:594 #, kde-format msgid "Application font" msgstr "" -#: optiondialog.cpp:594 +#: optiondialog.cpp:599 #, kde-format msgid "File view font" msgstr "" -#: optiondialog.cpp:613 +#: optiondialog.cpp:618 #, kde-format msgctxt "Title for color settings page" msgid "Color" msgstr "" -#: optiondialog.cpp:614 +#: optiondialog.cpp:619 #, kde-format msgid "Colors Settings" msgstr "" -#: optiondialog.cpp:631 +#: optiondialog.cpp:644 #, kde-format msgid "Editor and Diff Views:" msgstr "" -#: optiondialog.cpp:639 +#: optiondialog.cpp:652 #, kde-format msgid "Foreground color:" msgstr "" -#: optiondialog.cpp:647 +#: optiondialog.cpp:660 #, kde-format msgid "Background color:" msgstr "" -#: optiondialog.cpp:657 +#: optiondialog.cpp:670 #, kde-format msgid "Diff background color:" msgstr "" -#: optiondialog.cpp:666 +#: optiondialog.cpp:679 #, kde-format msgid "Color A:" msgstr "" -#: optiondialog.cpp:675 +#: optiondialog.cpp:688 #, kde-format msgid "Color B:" msgstr "" -#: optiondialog.cpp:684 +#: optiondialog.cpp:697 #, kde-format msgid "Color C:" msgstr "" -#: optiondialog.cpp:692 +#: optiondialog.cpp:705 #, kde-format msgid "Conflict color:" msgstr "" -#: optiondialog.cpp:701 +#: optiondialog.cpp:714 #, kde-format msgid "Current range background color:" msgstr "" -#: optiondialog.cpp:710 +#: optiondialog.cpp:723 #, kde-format msgid "Current range diff background color:" msgstr "" -#: optiondialog.cpp:718 +#: optiondialog.cpp:731 #, kde-format msgid "Color for manually aligned difference ranges:" msgstr "" -#: optiondialog.cpp:725 +#: optiondialog.cpp:738 #, kde-format msgid "Directory Comparison View:" msgstr "" -#: optiondialog.cpp:731 +#: optiondialog.cpp:744 #, kde-format msgid "Newest file color:" msgstr "" -#: optiondialog.cpp:736 +#: optiondialog.cpp:749 #, kde-format msgid "" "Changing this color will only be effective when starting the next directory " "comparison." msgstr "" -#: optiondialog.cpp:741 +#: optiondialog.cpp:754 #, kde-format msgid "Oldest file color:" msgstr "" -#: optiondialog.cpp:750 +#: optiondialog.cpp:763 #, kde-format msgid "Middle age file color:" msgstr "" -#: optiondialog.cpp:759 +#: optiondialog.cpp:772 #, kde-format msgid "Color for missing files:" msgstr "" -#: optiondialog.cpp:773 +#: optiondialog.cpp:786 #, kde-format msgid "Editor" msgstr "" -#: optiondialog.cpp:774 +#: optiondialog.cpp:787 #, kde-format msgid "Editor Behavior" msgstr "" -#: optiondialog.cpp:787 +#: optiondialog.cpp:809 #, kde-format msgid "Tab inserts spaces" msgstr "" -#: optiondialog.cpp:791 +#: optiondialog.cpp:813 #, kde-format msgid "" "On: Pressing tab generates the appropriate number of spaces.\n" "Off: A tab character will be inserted." msgstr "" -#: optiondialog.cpp:796 +#: optiondialog.cpp:818 #, kde-format msgid "Tab size:" msgstr "" -#: optiondialog.cpp:803 +#: optiondialog.cpp:825 #, kde-format msgid "Auto indentation" msgstr "" -#: optiondialog.cpp:807 +#: optiondialog.cpp:829 #, kde-format msgid "On: The indentation of the previous line is used for a new line.\n" msgstr "" -#: optiondialog.cpp:810 +#: optiondialog.cpp:832 #, kde-format msgid "Auto copy selection" msgstr "" -#: optiondialog.cpp:814 +#: optiondialog.cpp:836 #, kde-format msgid "" "On: Any selection is immediately written to the clipboard.\n" "Off: You must explicitly copy e.g. via Ctrl-C." msgstr "" -#: optiondialog.cpp:829 +#: optiondialog.cpp:851 #, kde-format msgid "" "Sets the line endings for when an edited file is saved.\n" "DOS/Windows: CR+LF; UNIX: LF; with CR=0D, LF=0A" msgstr "" -#: optiondialog.cpp:839 +#: optiondialog.cpp:861 #, kde-format msgid "Diff" msgstr "" -#: optiondialog.cpp:840 +#: optiondialog.cpp:862 #, kde-format msgid "Diff Settings" msgstr "" @@ -2126,12 +2146,12 @@ #. ); #. ++line; #. -#: optiondialog.cpp:865 +#: optiondialog.cpp:896 #, kde-format msgid "Ignore numbers (treat as white space)" msgstr "" -#: optiondialog.cpp:869 +#: optiondialog.cpp:900 #, kde-format msgid "" "Ignore number characters during line matching phase. (Similar to Ignore " @@ -2139,66 +2159,66 @@ "Might help to compare files with numeric data." msgstr "" -#: optiondialog.cpp:873 +#: optiondialog.cpp:904 #, kde-format msgid "Ignore C/C++ comments (treat as white space)" msgstr "" -#: optiondialog.cpp:876 +#: optiondialog.cpp:907 #, kde-format msgid "Treat C/C++ comments like white space." msgstr "" -#: optiondialog.cpp:879 +#: optiondialog.cpp:910 #, kde-format msgid "Ignore case (treat as white space)" msgstr "" -#: optiondialog.cpp:883 +#: optiondialog.cpp:914 #, kde-format msgid "Treat case differences like white space changes. ('a'<=>'A')" msgstr "" -#: optiondialog.cpp:886 +#: optiondialog.cpp:917 #, kde-format msgid "Preprocessor command:" msgstr "" -#: optiondialog.cpp:891 +#: optiondialog.cpp:922 #, kde-format msgid "User defined pre-processing. (See the docs for details.)" msgstr "" -#: optiondialog.cpp:894 +#: optiondialog.cpp:925 #, kde-format msgid "Line-matching preprocessor command:" msgstr "" -#: optiondialog.cpp:899 +#: optiondialog.cpp:930 #, kde-format msgid "" "This pre-processor is only used during line matching.\n" "(See the docs for details.)" msgstr "" -#: optiondialog.cpp:902 +#: optiondialog.cpp:933 #, kde-format msgid "Try hard (slower)" msgstr "" -#: optiondialog.cpp:906 +#: optiondialog.cpp:937 #, kde-format msgid "" "Enables the --minimal option for the external diff.\n" "The analysis of big files will be much slower." msgstr "" -#: optiondialog.cpp:910 +#: optiondialog.cpp:941 #, kde-format msgid "Align B and C for 3 input files" msgstr "" -#: optiondialog.cpp:914 +#: optiondialog.cpp:945 #, kde-format msgid "" "Try to align B and C when comparing or merging three input files.\n" @@ -2206,66 +2226,72 @@ "(Default is off.)" msgstr "" -#: optiondialog.cpp:926 +#: optiondialog.cpp:956 +#, kde-format +msgctxt "Settings page" +msgid "Merge" +msgstr "" + +#: optiondialog.cpp:957 #, kde-format msgid "Merge Settings" msgstr "" -#: optiondialog.cpp:940 +#: optiondialog.cpp:980 #, kde-format msgid "Auto advance delay (ms):" msgstr "" -#: optiondialog.cpp:946 +#: optiondialog.cpp:986 #, kde-format 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 "" -#: optiondialog.cpp:950 +#: optiondialog.cpp:990 #, kde-format msgid "Show info dialogs" msgstr "" -#: optiondialog.cpp:953 +#: optiondialog.cpp:993 #, kde-format msgid "Show a dialog with information about the number of conflicts." msgstr "" -#: optiondialog.cpp:956 +#: optiondialog.cpp:996 #, kde-format msgid "White space 2-file merge default:" msgstr "" -#: optiondialog.cpp:961 optiondialog.cpp:974 +#: optiondialog.cpp:1001 optiondialog.cpp:1014 #, kde-format msgid "Manual Choice" msgstr "" -#: optiondialog.cpp:965 optiondialog.cpp:979 +#: optiondialog.cpp:1005 optiondialog.cpp:1019 #, kde-format msgid "" "Allow the merge algorithm to automatically select an input for white-space-" "only changes." msgstr "" -#: optiondialog.cpp:969 +#: optiondialog.cpp:1009 #, kde-format msgid "White space 3-file merge default:" msgstr "" -#: optiondialog.cpp:983 +#: optiondialog.cpp:1023 #, kde-format msgid "Automatic Merge Regular Expression" msgstr "" -#: optiondialog.cpp:991 smalldialogs.cpp:449 +#: optiondialog.cpp:1031 smalldialogs.cpp:459 #, kde-format msgid "Auto merge regular expression:" msgstr "" -#: optiondialog.cpp:996 +#: optiondialog.cpp:1036 #, kde-format msgid "" "Regular expression for lines where KDiff3 should automatically choose one " @@ -2274,29 +2300,29 @@ "- if available - C, otherwise B will be chosen." msgstr "" -#: optiondialog.cpp:1002 +#: optiondialog.cpp:1042 #, kde-format msgid "Run regular expression auto merge on merge start" msgstr "" -#: optiondialog.cpp:1005 +#: optiondialog.cpp:1045 #, kde-format msgid "" "Run the merge for auto merge regular expressions\n" "immediately when a merge starts.\n" msgstr "" -#: optiondialog.cpp:1010 +#: optiondialog.cpp:1050 #, kde-format msgid "Version Control History Merging" msgstr "" -#: optiondialog.cpp:1018 smalldialogs.cpp:476 +#: optiondialog.cpp:1058 smalldialogs.cpp:486 #, kde-format msgid "History start regular expression:" msgstr "" -#: optiondialog.cpp:1023 +#: optiondialog.cpp:1063 #, kde-format msgid "" "Regular expression for the start of the version control history entry.\n" @@ -2304,12 +2330,12 @@ "Default value: \".*\\$Log.*\\$.*\"" msgstr "" -#: optiondialog.cpp:1029 smalldialogs.cpp:504 +#: optiondialog.cpp:1069 smalldialogs.cpp:514 #, kde-format msgid "History entry start regular expression:" msgstr "" -#: optiondialog.cpp:1042 +#: optiondialog.cpp:1082 #, kde-format msgid "" "A version control history entry consists of several lines.\n" @@ -2321,22 +2347,22 @@ "See the documentation for details." msgstr "" -#: optiondialog.cpp:1050 +#: optiondialog.cpp:1090 #, kde-format msgid "History merge sorting" msgstr "" -#: optiondialog.cpp:1053 +#: optiondialog.cpp:1093 #, kde-format msgid "Sort version control history by a key." msgstr "" -#: optiondialog.cpp:1063 +#: optiondialog.cpp:1103 #, kde-format msgid "History entry start sort key order:" msgstr "" -#: optiondialog.cpp:1068 +#: optiondialog.cpp:1108 #, kde-format msgid "" "Each pair of parentheses used in the regular expression for the history " @@ -2348,37 +2374,37 @@ "See the documentation for details." msgstr "" -#: optiondialog.cpp:1079 +#: optiondialog.cpp:1119 #, kde-format msgid "Merge version control history on merge start" msgstr "" -#: optiondialog.cpp:1082 +#: optiondialog.cpp:1122 #, kde-format msgid "Run version control history automerge on merge start." msgstr "" -#: optiondialog.cpp:1086 +#: optiondialog.cpp:1126 #, kde-format msgid "Max number of history entries:" msgstr "" -#: optiondialog.cpp:1090 +#: optiondialog.cpp:1130 #, kde-format msgid "Cut off after specified number. Use -1 for infinite number of entries." msgstr "" -#: optiondialog.cpp:1094 +#: optiondialog.cpp:1134 #, kde-format msgid "Test your regular expressions" msgstr "" -#: optiondialog.cpp:1099 +#: optiondialog.cpp:1139 #, kde-format msgid "Irrelevant merge command:" msgstr "" -#: optiondialog.cpp:1104 +#: optiondialog.cpp:1144 #, kde-format msgid "" "If specified this script is run after automerge\n" @@ -2386,12 +2412,12 @@ "Called with the parameters: filename1 filename2 filename3" msgstr "" -#: optiondialog.cpp:1109 +#: optiondialog.cpp:1149 #, kde-format msgid "Auto save and quit on merge without conflicts" msgstr "" -#: optiondialog.cpp:1113 +#: optiondialog.cpp:1153 #, kde-format msgid "" "If KDiff3 was started for a file-merge from the command line and all\n" @@ -2400,27 +2426,27 @@ "(Similar to command line option \"--auto\".)" msgstr "" -#: optiondialog.cpp:1124 optiondialog.cpp:1125 +#: optiondialog.cpp:1164 optiondialog.cpp:1165 #, kde-format msgid "Directory" msgstr "" -#: optiondialog.cpp:1137 +#: optiondialog.cpp:1185 #, kde-format msgid "Recursive directories" msgstr "" -#: optiondialog.cpp:1140 +#: optiondialog.cpp:1188 #, kde-format msgid "Whether to analyze subdirectories or not." msgstr "" -#: optiondialog.cpp:1142 +#: optiondialog.cpp:1190 #, kde-format msgid "File pattern(s):" msgstr "" -#: optiondialog.cpp:1148 +#: optiondialog.cpp:1196 #, kde-format msgid "" "Pattern(s) of files to be analyzed. \n" @@ -2428,12 +2454,12 @@ "Several Patterns can be specified by using the separator: ';'" msgstr "" -#: optiondialog.cpp:1153 +#: optiondialog.cpp:1201 #, kde-format msgid "File-anti-pattern(s):" msgstr "" -#: optiondialog.cpp:1159 +#: optiondialog.cpp:1207 #, kde-format msgid "" "Pattern(s) of files to be excluded from analysis. \n" @@ -2441,12 +2467,12 @@ "Several Patterns can be specified by using the separator: ';'" msgstr "" -#: optiondialog.cpp:1164 +#: optiondialog.cpp:1212 #, kde-format msgid "Dir-anti-pattern(s):" msgstr "" -#: optiondialog.cpp:1170 +#: optiondialog.cpp:1218 #, kde-format msgid "" "Pattern(s) of directories to be excluded from analysis. \n" @@ -2454,58 +2480,58 @@ "Several Patterns can be specified by using the separator: ';'" msgstr "" -#: optiondialog.cpp:1175 +#: optiondialog.cpp:1223 #, kde-format msgid "Use .cvsignore" msgstr "" -#: optiondialog.cpp:1179 +#: optiondialog.cpp:1227 #, kde-format msgid "" "Extends the antipattern to anything that would be ignored by CVS.\n" "Via local \".cvsignore\" files this can be directory specific." msgstr "" -#: optiondialog.cpp:1183 +#: optiondialog.cpp:1231 #, kde-format msgid "Find hidden files and directories" msgstr "" -#: optiondialog.cpp:1186 +#: optiondialog.cpp:1234 #, kde-format msgid "Finds hidden files and directories." msgstr "" -#: optiondialog.cpp:1189 +#: optiondialog.cpp:1237 #, kde-format msgid "Follow file links" msgstr "" -#: optiondialog.cpp:1193 +#: optiondialog.cpp:1241 #, kde-format msgid "" "On: Compare the file the link points to.\n" "Off: Compare the links." msgstr "" -#: optiondialog.cpp:1197 +#: optiondialog.cpp:1245 #, kde-format msgid "Follow directory links" msgstr "" -#: optiondialog.cpp:1201 +#: optiondialog.cpp:1249 #, kde-format msgid "" "On: Compare the directory the link points to.\n" "Off: Compare the links." msgstr "" -#: optiondialog.cpp:1210 +#: optiondialog.cpp:1258 #, kde-format msgid "Case sensitive filename comparison" msgstr "" -#: optiondialog.cpp:1214 +#: optiondialog.cpp:1262 #, kde-format msgid "" "The directory comparison will compare files or directories when their names " @@ -2514,63 +2540,63 @@ "off, otherwise on.)" msgstr "" -#: optiondialog.cpp:1218 +#: optiondialog.cpp:1266 #, kde-format msgid "Unfold all subdirectories on load" msgstr "" -#: optiondialog.cpp:1222 +#: optiondialog.cpp:1270 #, kde-format msgid "" "On: Unfold all subdirectories when starting a directory diff.\n" "Off: Leave subdirectories folded." msgstr "" -#: optiondialog.cpp:1226 +#: optiondialog.cpp:1274 #, kde-format msgid "Skip directory status report" msgstr "" -#: optiondialog.cpp:1230 +#: optiondialog.cpp:1278 #, kde-format msgid "" "On: Do not show the Directory Comparison Status.\n" "Off: Show the status dialog on start." msgstr "" -#: optiondialog.cpp:1234 +#: optiondialog.cpp:1282 #, kde-format msgid "File Comparison Mode" msgstr "" -#: optiondialog.cpp:1239 +#: optiondialog.cpp:1287 #, kde-format msgid "Binary comparison" msgstr "" -#: optiondialog.cpp:1241 +#: optiondialog.cpp:1289 #, kde-format msgid "Binary comparison of each file. (Default)" msgstr "" -#: optiondialog.cpp:1244 +#: optiondialog.cpp:1292 #, kde-format msgid "Full analysis" msgstr "" -#: optiondialog.cpp:1246 +#: optiondialog.cpp:1294 #, kde-format msgid "" "Do a full analysis and show statistics information in extra columns.\n" "(Slower than a binary comparison, much slower for binary files.)" msgstr "" -#: optiondialog.cpp:1250 +#: optiondialog.cpp:1298 #, kde-format msgid "Trust the size and modification date (unsafe)" msgstr "" -#: optiondialog.cpp:1252 +#: optiondialog.cpp:1300 #, kde-format msgid "" "Assume that files are equal if the modification date and file length are " @@ -2580,14 +2606,14 @@ "Useful for big directories or slow networks." msgstr "" -#: optiondialog.cpp:1257 +#: optiondialog.cpp:1305 #, kde-format msgid "" "Trust the size and date, but use binary comparison if date does not match " "(unsafe)" msgstr "" -#: optiondialog.cpp:1259 +#: optiondialog.cpp:1307 #, kde-format msgid "" "Assume that files are equal if the modification date and file length are " @@ -2596,12 +2622,12 @@ "Useful for big directories or slow networks." msgstr "" -#: optiondialog.cpp:1264 +#: optiondialog.cpp:1312 #, kde-format msgid "Trust the size (unsafe)" msgstr "" -#: optiondialog.cpp:1266 +#: optiondialog.cpp:1314 #, kde-format msgid "" "Assume that files are equal if their file lengths are equal.\n" @@ -2609,12 +2635,12 @@ "download." msgstr "" -#: optiondialog.cpp:1273 +#: optiondialog.cpp:1321 #, kde-format msgid "Synchronize directories" msgstr "" -#: optiondialog.cpp:1277 +#: optiondialog.cpp:1325 #, kde-format msgid "" "Offers to store files in both directories so that\n" @@ -2622,24 +2648,24 @@ "Works only when comparing two directories without specifying a destination." msgstr "" -#: optiondialog.cpp:1283 +#: optiondialog.cpp:1331 #, kde-format msgid "White space differences considered equal" msgstr "" -#: optiondialog.cpp:1287 +#: optiondialog.cpp:1335 #, kde-format msgid "" "If files differ only by white space consider them equal.\n" "This is only active when full analysis is chosen." msgstr "" -#: optiondialog.cpp:1293 +#: optiondialog.cpp:1341 #, kde-format msgid "Copy newer instead of merging (unsafe)" msgstr "" -#: optiondialog.cpp:1297 +#: optiondialog.cpp:1345 #, kde-format msgid "" "Do not look inside, just take the newer file.\n" @@ -2647,46 +2673,46 @@ "Only effective when comparing two directories." msgstr "" -#: optiondialog.cpp:1302 +#: optiondialog.cpp:1350 #, kde-format msgid "Backup files (.orig)" msgstr "" -#: optiondialog.cpp:1306 +#: optiondialog.cpp:1354 #, kde-format msgid "" "If 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 "" -#: optiondialog.cpp:1382 optiondialog.cpp:1383 +#: optiondialog.cpp:1430 optiondialog.cpp:1431 #, kde-format msgid "Regional Settings" msgstr "" -#: optiondialog.cpp:1397 +#: optiondialog.cpp:1454 #, kde-format msgid "Use the same encoding for everything:" msgstr "" -#: optiondialog.cpp:1401 +#: optiondialog.cpp:1458 #, kde-format msgid "" "Enable this allows to change all encodings by changing the first only.\n" "Disable this if different individual settings are needed." msgstr "" -#: optiondialog.cpp:1405 +#: optiondialog.cpp:1462 #, kde-format msgid "Note: Local Encoding is \"%1\"" msgstr "" -#: optiondialog.cpp:1409 +#: optiondialog.cpp:1466 #, kde-format msgid "File Encoding for A:" msgstr "" -#: optiondialog.cpp:1416 +#: optiondialog.cpp:1473 #, kde-format msgid "" "If enabled then Unicode (UTF-16 or UTF-8) encoding will be detected.\n" @@ -2695,32 +2721,32 @@ "(Unicode detection depends on the first bytes of a file.)" msgstr "" -#: optiondialog.cpp:1419 optiondialog.cpp:1430 optiondialog.cpp:1441 +#: optiondialog.cpp:1476 optiondialog.cpp:1487 optiondialog.cpp:1498 #, kde-format msgid "Auto Detect Unicode" msgstr "" -#: optiondialog.cpp:1425 +#: optiondialog.cpp:1482 #, kde-format msgid "File Encoding for B:" msgstr "" -#: optiondialog.cpp:1436 +#: optiondialog.cpp:1493 #, kde-format msgid "File Encoding for C:" msgstr "" -#: optiondialog.cpp:1447 +#: optiondialog.cpp:1504 #, kde-format msgid "File Encoding for Merge Output and Saving:" msgstr "" -#: optiondialog.cpp:1452 +#: optiondialog.cpp:1509 #, kde-format msgid "Auto Select" msgstr "" -#: optiondialog.cpp:1456 +#: optiondialog.cpp:1513 #, kde-format msgid "" "If enabled then the encoding from the input files is used.\n" @@ -2728,39 +2754,39 @@ "saving." msgstr "" -#: optiondialog.cpp:1459 +#: optiondialog.cpp:1516 #, kde-format msgid "File Encoding for Preprocessor Files:" msgstr "" -#: optiondialog.cpp:1471 +#: optiondialog.cpp:1528 #, kde-format msgid "Right To Left Language" msgstr "" -#: optiondialog.cpp:1475 +#: optiondialog.cpp:1532 #, kde-format msgid "" "Some languages are read from right to left.\n" "This setting will change the viewer and editor accordingly." msgstr "" -#: optiondialog.cpp:1485 +#: optiondialog.cpp:1542 #, kde-format msgid "Integration" msgstr "" -#: optiondialog.cpp:1486 +#: optiondialog.cpp:1543 #, kde-format msgid "Integration Settings" msgstr "" -#: optiondialog.cpp:1499 +#: optiondialog.cpp:1564 #, kde-format msgid "Command line options to ignore:" msgstr "" -#: optiondialog.cpp:1505 +#: optiondialog.cpp:1570 #, kde-format msgid "" "List of command line options that should be ignored when KDiff3 is used by " @@ -2769,19 +2795,19 @@ "This will suppress the \"Unknown option\" error." msgstr "" -#: optiondialog.cpp:1510 +#: optiondialog.cpp:1575 #, kde-format msgid "Quit also via Escape key" msgstr "" -#: optiondialog.cpp:1514 +#: optiondialog.cpp:1579 #, kde-format msgid "" "Fast method to exit.\n" "For those who are used to using the Escape key." msgstr "" -#: optiondialog.cpp:1598 +#: optiondialog.cpp:1653 #, kde-format msgid "This resets all options. Not only those of the current topic." msgstr "" @@ -2796,7 +2822,7 @@ #: pdiff.cpp:80 pdiff.cpp:94 #, kde-format msgid "Severe Internal Error" -msgstr "" +msgstr "Kritisk intern feil" #: pdiff.cpp:122 #, kde-format @@ -2831,77 +2857,67 @@ msgid "Disable Unsafe Options" msgstr "" -#: pdiff.cpp:158 +#: pdiff.cpp:160 #, kde-format msgid "Loading A" msgstr "" -#: pdiff.cpp:167 +#: pdiff.cpp:162 #, kde-format -msgid "Errors occurred during pre-processing of file A." +msgid "Loading A: %1" msgstr "" -#: pdiff.cpp:172 +#: pdiff.cpp:170 #, kde-format msgid "Loading B" msgstr "" -#: pdiff.cpp:179 -#, kde-format -msgid "Errors occurred during pre-processing of file B." -msgstr "" - -#: pdiff.cpp:202 pdiff.cpp:241 +#: pdiff.cpp:201 pdiff.cpp:237 #, kde-format msgid "Diff: A <-> B" msgstr "" -#: pdiff.cpp:208 pdiff.cpp:279 pdiff.cpp:293 +#: pdiff.cpp:207 pdiff.cpp:275 pdiff.cpp:289 #, kde-format msgid "Linediff: A <-> B" msgstr "" -#: pdiff.cpp:225 +#: pdiff.cpp:224 #, kde-format msgid "Loading C" msgstr "" -#: pdiff.cpp:232 -#, kde-format -msgid "Errors occurred during pre-processing of file C." -msgstr "" - -#: pdiff.cpp:250 +#: pdiff.cpp:246 #, kde-format msgid "Diff: A <-> C" msgstr "" -#: pdiff.cpp:261 +#: pdiff.cpp:257 #, kde-format msgid "Diff: B <-> C" msgstr "" -#: pdiff.cpp:283 pdiff.cpp:297 +#: pdiff.cpp:279 pdiff.cpp:293 #, kde-format msgid "Linediff: B <-> C" msgstr "" -#: pdiff.cpp:287 pdiff.cpp:301 +#: pdiff.cpp:283 pdiff.cpp:297 #, kde-format msgid "Linediff: A <-> C" msgstr "" -#: pdiff.cpp:829 +#: pdiff.cpp:819 #, kde-format msgid "All input files contain the same text, but are not binary equal." msgstr "" -#: pdiff.cpp:835 pdiff.cpp:839 pdiff.cpp:843 +#: pdiff.cpp:825 pdiff.cpp:829 pdiff.cpp:833 #, kde-format msgid "Files %1 and %2 have equal text, but are not binary equal. \n" msgstr "" -#: pdiff.cpp:853 +#: pdiff.cpp:843 #, kde-format msgid "" "Some input files do not seem to be pure text files.\n" @@ -2909,17 +2925,17 @@ "Continue at your own risk." msgstr "" -#: pdiff.cpp:863 +#: pdiff.cpp:853 #, kde-format msgid ", B" msgstr "" -#: pdiff.cpp:865 +#: pdiff.cpp:855 #, kde-format msgid ", C" msgstr "" -#: pdiff.cpp:867 +#: pdiff.cpp:857 #, kde-format msgid "" "Some input characters could not be converted to valid unicode.\n" @@ -2928,77 +2944,72 @@ "Affected input files are in %1." msgstr "" -#: pdiff.cpp:1034 +#: pdiff.cpp:1032 #, kde-format msgid "Abort" msgstr "" -#: pdiff.cpp:1040 pdiff.cpp:1130 +#: pdiff.cpp:1038 pdiff.cpp:1129 #, kde-format msgid "Opening files..." msgstr "" -#: pdiff.cpp:1107 -#, kde-format -msgid "File open error" -msgstr "" - -#: pdiff.cpp:1202 +#: pdiff.cpp:1212 #, kde-format msgid "Cutting selection..." msgstr "" -#: pdiff.cpp:1223 +#: pdiff.cpp:1233 #, kde-format msgid "Copying selection to clipboard..." msgstr "" -#: pdiff.cpp:1239 +#: pdiff.cpp:1249 #, kde-format msgid "Inserting clipboard contents..." msgstr "" -#: pdiff.cpp:1695 +#: pdiff.cpp:1705 #, kde-format msgid "Word wrap (Cancel disables word wrap)" msgstr "" -#: pdiff.cpp:1696 +#: pdiff.cpp:1706 #, kde-format msgid "Calculating max width for horizontal scrollbar" msgstr "" -#: pdiff.cpp:1911 +#: pdiff.cpp:1921 #, kde-format msgid "Save && Continue" msgstr "" -#: pdiff.cpp:1912 +#: pdiff.cpp:1922 #, kde-format msgid "Continue Without Saving" msgstr "" -#: pdiff.cpp:2124 +#: pdiff.cpp:2134 #, kde-format msgid "Search complete." msgstr "" -#: pdiff.cpp:2124 +#: pdiff.cpp:2134 #, kde-format msgid "Search Complete" msgstr "" -#: pdiff.cpp:2375 +#: pdiff.cpp:2385 #, kde-format msgid "Nothing is selected in either diff input window." msgstr "" -#: pdiff.cpp:2375 +#: pdiff.cpp:2385 #, kde-format msgid "Error while adding manual diff range" msgstr "" -#: progress.cpp:59 progress.cpp:71 +#: progress.cpp:61 progress.cpp:73 #, kde-format msgid "&Cancel" msgstr "" @@ -3008,188 +3019,188 @@ msgid "A (Base):" msgstr "" -#: smalldialogs.cpp:68 smalldialogs.cpp:85 smalldialogs.cpp:102 -#: smalldialogs.cpp:144 +#: smalldialogs.cpp:71 smalldialogs.cpp:90 smalldialogs.cpp:109 +#: smalldialogs.cpp:154 #, kde-format msgid "File..." msgstr "" -#: smalldialogs.cpp:70 smalldialogs.cpp:87 smalldialogs.cpp:104 -#: smalldialogs.cpp:146 +#: smalldialogs.cpp:73 smalldialogs.cpp:92 smalldialogs.cpp:111 +#: smalldialogs.cpp:156 #, kde-format msgid "Dir..." msgstr "" -#: smalldialogs.cpp:96 +#: smalldialogs.cpp:103 #, kde-format msgid "C (Optional):" msgstr "" -#: smalldialogs.cpp:119 +#: smalldialogs.cpp:126 #, kde-format msgid "Swap/Copy Names..." msgstr "" -#: smalldialogs.cpp:124 smalldialogs.cpp:125 smalldialogs.cpp:126 +#: smalldialogs.cpp:131 smalldialogs.cpp:132 smalldialogs.cpp:133 #, kde-format msgid "Swap %1<->%2" msgstr "" -#: smalldialogs.cpp:127 smalldialogs.cpp:128 smalldialogs.cpp:129 +#: smalldialogs.cpp:134 smalldialogs.cpp:135 smalldialogs.cpp:136 #, kde-format msgid "Copy %1->Output" msgstr "" -#: smalldialogs.cpp:130 smalldialogs.cpp:131 smalldialogs.cpp:132 +#: smalldialogs.cpp:137 smalldialogs.cpp:138 smalldialogs.cpp:139 #, kde-format msgid "Swap %1<->Output" msgstr "" -#: smalldialogs.cpp:138 +#: smalldialogs.cpp:148 #, kde-format msgid "Output (optional):" msgstr "" -#: smalldialogs.cpp:168 +#: smalldialogs.cpp:178 #, kde-format msgid "Configure..." msgstr "" -#: smalldialogs.cpp:233 +#: smalldialogs.cpp:243 #, kde-format msgid "Open Directory" msgstr "Opna mappe" -#: smalldialogs.cpp:234 +#: smalldialogs.cpp:244 #, kde-format msgid "Select Output File" msgstr "" -#: smalldialogs.cpp:393 +#: smalldialogs.cpp:403 #, kde-format msgid "Search text:" msgstr "" -#: smalldialogs.cpp:400 +#: smalldialogs.cpp:410 #, kde-format msgid "Case sensitive" msgstr "" -#: smalldialogs.cpp:403 +#: smalldialogs.cpp:413 #, kde-format msgid "Search A" msgstr "" -#: smalldialogs.cpp:408 +#: smalldialogs.cpp:418 #, kde-format msgid "Search B" msgstr "" -#: smalldialogs.cpp:413 +#: smalldialogs.cpp:423 #, kde-format msgid "Search C" msgstr "" -#: smalldialogs.cpp:418 +#: smalldialogs.cpp:428 #, kde-format msgid "Search output" msgstr "" -#: smalldialogs.cpp:425 +#: smalldialogs.cpp:435 #, kde-format msgid "&Search" msgstr "" -#: smalldialogs.cpp:444 +#: smalldialogs.cpp:454 #, kde-format msgid "Regular Expression Tester" msgstr "" -#: smalldialogs.cpp:457 +#: smalldialogs.cpp:467 #, kde-format msgid "Example auto merge line:" msgstr "" -#: smalldialogs.cpp:459 +#: smalldialogs.cpp:469 #, kde-format msgid "To test auto merge, copy a line as used in your files." msgstr "" -#: smalldialogs.cpp:465 smalldialogs.cpp:493 smalldialogs.cpp:529 +#: smalldialogs.cpp:475 smalldialogs.cpp:503 smalldialogs.cpp:539 #, kde-format msgid "Match result:" msgstr "" -#: smalldialogs.cpp:484 +#: smalldialogs.cpp:494 #, kde-format msgid "Example history start line (with leading comment):" msgstr "" -#: smalldialogs.cpp:486 +#: smalldialogs.cpp:496 #, kde-format msgid "" "Copy a history start line as used in your files,\n" "including the leading comment." msgstr "" -#: smalldialogs.cpp:512 +#: smalldialogs.cpp:522 #, kde-format msgid "History sort key order:" msgstr "" -#: smalldialogs.cpp:520 +#: smalldialogs.cpp:530 #, kde-format msgid "Example history entry start line (without leading comment):" msgstr "" -#: smalldialogs.cpp:522 +#: smalldialogs.cpp:532 #, kde-format msgid "" "Copy a history entry start line as used in your files,\n" "but omit the leading comment." msgstr "" -#: smalldialogs.cpp:536 +#: smalldialogs.cpp:546 #, kde-format msgid "Sort key result:" msgstr "" -#: smalldialogs.cpp:584 smalldialogs.cpp:594 smalldialogs.cpp:614 +#: smalldialogs.cpp:594 smalldialogs.cpp:604 smalldialogs.cpp:624 #, kde-format msgid "Match success." msgstr "" -#: smalldialogs.cpp:588 smalldialogs.cpp:598 smalldialogs.cpp:620 +#: smalldialogs.cpp:598 smalldialogs.cpp:608 smalldialogs.cpp:630 #, kde-format msgid "Match failed." msgstr "" -#: smalldialogs.cpp:605 +#: smalldialogs.cpp:615 #, kde-format msgid "Opening and closing parentheses do not match in regular expression." msgstr "" -#: SourceData.cpp:150 +#: SourceData.cpp:153 #, kde-format msgid "Writing clipboard data to temp file failed." msgstr "" -#: SourceData.cpp:154 +#: SourceData.cpp:157 #, kde-format msgid "From Clipboard" msgstr "" -#: SourceData.cpp:335 +#: SourceData.cpp:348 #, kde-format msgid "%1 is not a normal file." msgstr "" -#: SourceData.cpp:427 +#: SourceData.cpp:440 #, kde-format msgid " Temp file is: %1" msgstr "" -#: SourceData.cpp:432 +#: SourceData.cpp:445 #, kde-format msgid "" "Preprocessing possibly failed. Check this command:\n" @@ -3199,12 +3210,12 @@ "The preprocessing command will be disabled now." msgstr "" -#: SourceData.cpp:443 SourceData.cpp:512 +#: SourceData.cpp:456 SourceData.cpp:525 #, kde-format msgid "File %1 too large to process. Skipping." msgstr "" -#: SourceData.cpp:487 +#: SourceData.cpp:500 #, kde-format msgid "" "The line-matching-preprocessing possibly failed. Check this command:\n" diff -Nru kdiff3-1.8.01/po/pl/diff_ext.po kdiff3-1.8.3/po/pl/diff_ext.po --- kdiff3-1.8.01/po/pl/diff_ext.po 2019-05-18 01:02:19.000000000 +0000 +++ kdiff3-1.8.3/po/pl/diff_ext.po 2020-06-25 00:18:43.000000000 +0000 @@ -5,8 +5,8 @@ msgid "" msgstr "" "Project-Id-Version: kdiff3\n" -"Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2019-03-22 03:09+0100\n" +"Report-Msgid-Bugs-To: https://bugs.kde.org\n" +"POT-Creation-Date: 2019-11-04 07:54+0100\n" "PO-Revision-Date: 2019-01-27 10:34+0100\n" "Last-Translator: Łukasz Wojniłowicz \n" "Language-Team: Polish \n" @@ -18,118 +18,113 @@ "|| n%100>=20) ? 1 : 2);\n" "X-Generator: Lokalize 19.03.70\n" -#: diff_ext.cpp:391 +#: diff_ext.cpp:223 #, kde-format msgid "Compare with %1" msgstr "Porównaj z %1" -#: diff_ext.cpp:392 +#: diff_ext.cpp:224 #, kde-format msgid "Merge with %1" msgstr "Scal z %1" -#: diff_ext.cpp:408 +#: diff_ext.cpp:234 #, kde-format msgid "3-way merge with base" msgstr "Trójstronne scalenie z podstawą" -#: diff_ext.cpp:411 +#: diff_ext.cpp:237 #, kde-format msgid "Save '%1' for later" msgstr "Zapisz '%1' na później" -#: diff_ext.cpp:426 +#: diff_ext.cpp:251 #, kde-format msgid "Compare with ..." msgstr "Porównaj z ..." -#: diff_ext.cpp:429 +#: diff_ext.cpp:254 #, kde-format msgid "Clear list" msgstr "Wyczyść listę" -#: diff_ext.cpp:434 +#: diff_ext.cpp:259 #, kde-format msgid "Compare" msgstr "Porównaj" -#: diff_ext.cpp:438 +#: diff_ext.cpp:263 #, kde-format msgid "3 way comparison" msgstr "Trójstronne porównanie" -#: diff_ext.cpp:444 +#: diff_ext.cpp:269 #, kde-format msgid "About Diff-Ext ..." msgstr "O Diff-Ext ..." -#: diff_ext.cpp:515 +#: diff_ext.cpp:340 #, kde-format msgid "(32 Bit)" msgstr "(32 Bity)" -#: diff_ext.cpp:517 -#, kde-format -msgid "(64 Bit)" -msgstr "(64 Bity)" - -#: diff_ext.cpp:518 +#: diff_ext.cpp:342 #, kde-format msgid "Diff-Ext Copyright (c) 2003-2006, Sergey Zorin. All rights reserved.\n" msgstr "Diff-Ext Copyright (c) 2003-2006, Sergey Zorin. All rights reserved.\n" -#: diff_ext.cpp:519 +#: diff_ext.cpp:343 #, kde-format msgid "This software is distributable under the BSD-2-Clause license.\n" msgstr "To oprogramowanie jest rozpowszechniane na licencji BSD-2-Clause.\n" -#: diff_ext.cpp:520 +#: diff_ext.cpp:344 #, kde-format msgid "Some extensions for KDiff3 (c) 2006-2013 by Joachim Eibl.\n" msgstr "" "Niektóre z rozszerzeń dla KDiff3 (c) 2006-2013 autorstwa Joachim Eibl.\n" -#: diff_ext.cpp:521 +#: diff_ext.cpp:345 #, kde-format msgid "Homepage for Diff-Ext: http://diff-ext.sourceforge.net\n" msgstr "Strona domowa dla Diff-Ext: http://diff-ext.sourceforge.net\n" -#: diff_ext.cpp:522 +#: diff_ext.cpp:346 #, kde-format msgid "About Diff-Ext for KDiff3 " msgstr "O Diff-Ext dla KDiff3 " -#: diff_ext.cpp:551 +#: diff_ext.cpp:375 #, kde-format msgid "Compare selected files" msgstr "Porównaj zaznaczone pliki" -#: diff_ext.cpp:557 diff_ext.cpp:577 +#: diff_ext.cpp:381 diff_ext.cpp:399 #, kde-format msgid "Compare '%1' with '%2'" msgstr "Porównaj '%1' z '%2'" -#: diff_ext.cpp:563 +#: diff_ext.cpp:386 #, kde-format msgid "Save '%1' for later operation" msgstr "Zapisz '%1' do późniejszego działania" -#: diff_ext.cpp:619 +#: diff_ext.cpp:440 #, kde-format msgid "Could not start KDiff3. Please rerun KDiff3 installation." msgstr "Nie można uruchomić KDiff3. Wgraj KDiff3 ponownie." -#: diff_ext.cpp:620 +#: diff_ext.cpp:441 #, kde-format msgid "Command" msgstr "Polecenie" -#: diff_ext.cpp:621 +#: diff_ext.cpp:442 #, kde-format msgid "CommandLine" msgstr "Wiersz poleceń" -#: diff_ext.cpp:622 +#: diff_ext.cpp:443 #, kde-format msgid "Diff-Ext For KDiff3" msgstr "Diff-Ext dla KDiff3" \ No newline at end of file diff -Nru kdiff3-1.8.01/po/pl/kdiff3fileitemactionplugin.po kdiff3-1.8.3/po/pl/kdiff3fileitemactionplugin.po --- kdiff3-1.8.01/po/pl/kdiff3fileitemactionplugin.po 2019-05-18 01:02:19.000000000 +0000 +++ kdiff3-1.8.3/po/pl/kdiff3fileitemactionplugin.po 2020-06-25 00:18:43.000000000 +0000 @@ -5,8 +5,8 @@ msgid "" msgstr "" "Project-Id-Version: \n" -"Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2019-03-22 03:09+0100\n" +"Report-Msgid-Bugs-To: https://bugs.kde.org\n" +"POT-Creation-Date: 2019-08-30 07:40+0200\n" "PO-Revision-Date: 2019-05-11 06:06+0200\n" "Last-Translator: Łukasz Wojniłowicz \n" "Language-Team: Polish \n" diff -Nru kdiff3-1.8.01/po/pl/kdiff3.po kdiff3-1.8.3/po/pl/kdiff3.po --- kdiff3-1.8.01/po/pl/kdiff3.po 2019-05-18 01:02:19.000000000 +0000 +++ kdiff3-1.8.3/po/pl/kdiff3.po 2020-06-25 00:18:43.000000000 +0000 @@ -9,20 +9,20 @@ # Krzysztof Lichota , 2005. # Robert Gomulka , 2005. # Michał Smoczyk , 2009, 2010, 2011. -# Łukasz Wojniłowicz , 2011, 2014, 2016, 2018, 2019. +# Łukasz Wojniłowicz , 2011, 2014, 2016, 2018, 2019, 2020. msgid "" msgstr "" "Project-Id-Version: kdiff3\n" -"Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2019-04-18 08:02+0200\n" -"PO-Revision-Date: 2019-05-11 06:06+0200\n" +"Report-Msgid-Bugs-To: https://bugs.kde.org\n" +"POT-Creation-Date: 2020-06-22 07:48+0200\n" +"PO-Revision-Date: 2020-05-16 08:59+0200\n" "Last-Translator: Łukasz Wojniłowicz \n" "Language-Team: Polish \n" "Language: pl\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: Lokalize 19.07.70\n" +"X-Generator: Lokalize 20.07.70\n" "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 " "|| n%100>=20) ? 1 : 2);\n" @@ -40,285 +40,285 @@ "tom@w.pl, mrudolf@kdewebdev.org, mboksz@bcig.pl, lichota@mimuw.edu.pl, " "rgom@o2.pl, msmoczyk@wp.pl, lukasz.wojnilowicz@gmail.com" -#: difftextwindow.cpp:412 +#: difftextwindow.cpp:414 #, kde-format msgid "File %1: Line %2" msgstr "Plik %1: Wiersz %2" -#: difftextwindow.cpp:414 +#: difftextwindow.cpp:416 #, kde-format msgid "File %1: Line not available" msgstr "Plik %1: Wiersz jest niedostępny" -#: difftextwindow.cpp:1780 +#: difftextwindow.cpp:1778 #, kde-format msgid "Encoding:" msgstr "Kodowanie:" -#: difftextwindow.cpp:1782 mergeresultwindow.cpp:3138 optiondialog.cpp:818 +#: difftextwindow.cpp:1781 mergeresultwindow.cpp:3166 optiondialog.cpp:840 #, kde-format msgid "Line end style:" msgstr "Wygląd końca wiersza:" -#: difftextwindow.cpp:1810 directorymergewindow.cpp:382 -#: directorymergewindow.cpp:433 directorymergewindow.cpp:524 -#: directorymergewindow.cpp:3058 directorymergewindow.cpp:3189 -#: directorymergewindow.cpp:3417 mergeresultwindow.cpp:942 -#: mergeresultwindow.cpp:944 mergeresultwindow.cpp:946 -#: mergeresultwindow.cpp:948 mergeresultwindow.cpp:1814 -#: mergeresultwindow.cpp:3170 mergeresultwindow.cpp:3177 optiondialog.cpp:962 -#: optiondialog.cpp:975 pdiff.cpp:833 pdiff.cpp:835 pdiff.cpp:837 pdiff.cpp:839 -#: pdiff.cpp:861 smalldialogs.cpp:124 smalldialogs.cpp:126 smalldialogs.cpp:127 -#: smalldialogs.cpp:130 +#: difftextwindow.cpp:1809 directorymergewindow.cpp:383 +#: directorymergewindow.cpp:434 directorymergewindow.cpp:525 +#: directorymergewindow.cpp:3072 directorymergewindow.cpp:3203 +#: directorymergewindow.cpp:3431 mergeresultwindow.cpp:970 +#: mergeresultwindow.cpp:972 mergeresultwindow.cpp:974 +#: mergeresultwindow.cpp:976 mergeresultwindow.cpp:1842 +#: mergeresultwindow.cpp:3198 mergeresultwindow.cpp:3205 optiondialog.cpp:1002 +#: optiondialog.cpp:1015 pdiff.cpp:823 pdiff.cpp:825 pdiff.cpp:827 +#: pdiff.cpp:829 pdiff.cpp:851 smalldialogs.cpp:131 smalldialogs.cpp:133 +#: smalldialogs.cpp:134 smalldialogs.cpp:137 #, kde-format msgid "A" msgstr "A" -#: difftextwindow.cpp:1810 directorymergewindow.cpp:384 -#: directorymergewindow.cpp:436 directorymergewindow.cpp:526 -#: directorymergewindow.cpp:3064 directorymergewindow.cpp:3190 -#: directorymergewindow.cpp:3418 mergeresultwindow.cpp:942 -#: mergeresultwindow.cpp:944 mergeresultwindow.cpp:950 -#: mergeresultwindow.cpp:952 mergeresultwindow.cpp:1816 -#: mergeresultwindow.cpp:3172 mergeresultwindow.cpp:3179 optiondialog.cpp:963 -#: optiondialog.cpp:976 pdiff.cpp:833 pdiff.cpp:835 pdiff.cpp:841 pdiff.cpp:843 -#: pdiff.cpp:863 smalldialogs.cpp:124 smalldialogs.cpp:125 smalldialogs.cpp:128 -#: smalldialogs.cpp:131 +#: difftextwindow.cpp:1809 directorymergewindow.cpp:385 +#: directorymergewindow.cpp:437 directorymergewindow.cpp:527 +#: directorymergewindow.cpp:3078 directorymergewindow.cpp:3204 +#: directorymergewindow.cpp:3432 mergeresultwindow.cpp:970 +#: mergeresultwindow.cpp:972 mergeresultwindow.cpp:978 +#: mergeresultwindow.cpp:980 mergeresultwindow.cpp:1844 +#: mergeresultwindow.cpp:3200 mergeresultwindow.cpp:3207 optiondialog.cpp:1003 +#: optiondialog.cpp:1016 pdiff.cpp:823 pdiff.cpp:825 pdiff.cpp:831 +#: pdiff.cpp:833 pdiff.cpp:853 smalldialogs.cpp:131 smalldialogs.cpp:132 +#: smalldialogs.cpp:135 smalldialogs.cpp:138 #, kde-format msgid "B" msgstr "B" -#: difftextwindow.cpp:1810 directorymergewindow.cpp:386 -#: directorymergewindow.cpp:439 directorymergewindow.cpp:528 -#: directorymergewindow.cpp:3070 directorymergewindow.cpp:3191 -#: directorymergewindow.cpp:3419 mergeresultwindow.cpp:946 -#: mergeresultwindow.cpp:948 mergeresultwindow.cpp:950 -#: mergeresultwindow.cpp:952 mergeresultwindow.cpp:1818 -#: mergeresultwindow.cpp:3174 mergeresultwindow.cpp:3181 optiondialog.cpp:977 -#: pdiff.cpp:837 pdiff.cpp:839 pdiff.cpp:841 pdiff.cpp:843 pdiff.cpp:865 -#: smalldialogs.cpp:125 smalldialogs.cpp:126 smalldialogs.cpp:129 -#: smalldialogs.cpp:132 +#: difftextwindow.cpp:1809 directorymergewindow.cpp:387 +#: directorymergewindow.cpp:440 directorymergewindow.cpp:529 +#: directorymergewindow.cpp:3084 directorymergewindow.cpp:3205 +#: directorymergewindow.cpp:3433 mergeresultwindow.cpp:974 +#: mergeresultwindow.cpp:976 mergeresultwindow.cpp:978 +#: mergeresultwindow.cpp:980 mergeresultwindow.cpp:1846 +#: mergeresultwindow.cpp:3202 mergeresultwindow.cpp:3209 optiondialog.cpp:1017 +#: pdiff.cpp:827 pdiff.cpp:829 pdiff.cpp:831 pdiff.cpp:833 pdiff.cpp:855 +#: smalldialogs.cpp:132 smalldialogs.cpp:133 smalldialogs.cpp:136 +#: smalldialogs.cpp:139 #, kde-format msgid "C" msgstr "C" -#: difftextwindow.cpp:1810 +#: difftextwindow.cpp:1809 #, kde-format msgid "A (Base)" msgstr "A (podstawa)" -#: difftextwindow.cpp:1812 +#: difftextwindow.cpp:1811 #, kde-format msgid "Encoding: %1" msgstr "Kodowanie: %1" -#: difftextwindow.cpp:1813 mergeresultwindow.cpp:3183 +#: difftextwindow.cpp:1812 mergeresultwindow.cpp:3211 #, kde-format msgid "Unix" msgstr "Unix" -#: difftextwindow.cpp:1813 mergeresultwindow.cpp:3184 +#: difftextwindow.cpp:1812 mergeresultwindow.cpp:3212 #, kde-format msgid "DOS" msgstr "DOS" -#: difftextwindow.cpp:1813 +#: difftextwindow.cpp:1812 #, kde-format msgid "Line end style: %1" msgstr "Wygląd końca wiersza: %1" -#: difftextwindow.cpp:1835 kdiff3.cpp:873 +#: difftextwindow.cpp:1834 kdiff3.cpp:874 #, kde-format msgid "Top line" msgstr "Szczytowy wiersz" -#: difftextwindow.cpp:1845 +#: difftextwindow.cpp:1843 #, kde-format msgid "End" msgstr "Koniec" -#: difftextwindow.cpp:1903 smalldialogs.cpp:235 +#: difftextwindow.cpp:1901 smalldialogs.cpp:245 #, kde-format msgid "Open File" msgstr "Otwórz plik" -#: difftextwindow.cpp:1951 optiondialog.cpp:387 +#: difftextwindow.cpp:1943 optiondialog.cpp:389 #, kde-format msgid "Unicode, 8 bit" msgstr "Unikod, 8-bitowy" -#: difftextwindow.cpp:1966 +#: difftextwindow.cpp:1958 #, kde-format msgid "Other" msgstr "Inne" -#: directorymergewindow.cpp:409 directorymergewindow.cpp:3424 +#: directorymergewindow.cpp:410 directorymergewindow.cpp:3438 #, kde-format msgid "Copy A to B" -msgstr "Kopiuj A do B" +msgstr "Skopiuj A do B" -#: directorymergewindow.cpp:412 directorymergewindow.cpp:3425 +#: directorymergewindow.cpp:413 directorymergewindow.cpp:3439 #, kde-format msgid "Copy B to A" -msgstr "Kopiuj B do A" +msgstr "Skopiuj B do A" -#: directorymergewindow.cpp:415 directorymergewindow.cpp:3426 +#: directorymergewindow.cpp:416 directorymergewindow.cpp:3440 #, kde-format msgid "Delete A" msgstr "Usuń A" -#: directorymergewindow.cpp:418 directorymergewindow.cpp:3427 +#: directorymergewindow.cpp:419 directorymergewindow.cpp:3441 #, kde-format msgid "Delete B" msgstr "Usuń B" -#: directorymergewindow.cpp:421 +#: directorymergewindow.cpp:422 #, kde-format msgid "Delete A & B" msgstr "Usuń A i B" -#: directorymergewindow.cpp:424 directorymergewindow.cpp:3429 +#: directorymergewindow.cpp:425 directorymergewindow.cpp:3443 #, kde-format msgid "Merge to A" msgstr "Scal z A" -#: directorymergewindow.cpp:427 directorymergewindow.cpp:3430 +#: directorymergewindow.cpp:428 directorymergewindow.cpp:3444 #, kde-format msgid "Merge to B" msgstr "Scal z B" -#: directorymergewindow.cpp:430 +#: directorymergewindow.cpp:431 #, kde-format msgid "Merge to A & B" msgstr "Scal z A i B" -#: directorymergewindow.cpp:442 directorymergewindow.cpp:3421 +#: directorymergewindow.cpp:443 directorymergewindow.cpp:3435 #, kde-format msgid "Delete (if exists)" msgstr "Usuń (jeśli istnieje)" -#: directorymergewindow.cpp:445 directorymergewindow.cpp:448 -#: directorymergewindow.cpp:3420 optiondialog.cpp:925 smalldialogs.cpp:113 +#: directorymergewindow.cpp:446 directorymergewindow.cpp:449 +#: directorymergewindow.cpp:3434 smalldialogs.cpp:120 #, kde-format msgid "Merge" msgstr "Scal" -#: directorymergewindow.cpp:445 directorymergewindow.cpp:448 +#: directorymergewindow.cpp:446 directorymergewindow.cpp:449 #, kde-format msgid "Merge (manual)" msgstr "Scal (ręcznie)" -#: directorymergewindow.cpp:451 +#: directorymergewindow.cpp:452 #, kde-format msgid "Error: Conflicting File Types" msgstr "Błąd: Sprzeczne rodzaje plików" -#: directorymergewindow.cpp:454 +#: directorymergewindow.cpp:455 #, kde-format msgid "Error: Changed and Deleted" msgstr "Błąd: Zmieniony i usunięty" -#: directorymergewindow.cpp:457 +#: directorymergewindow.cpp:458 #, kde-format msgid "Error: Dates are equal but files are not." msgstr "Błąd: Daty są takie same, ale pliki nie." -#: directorymergewindow.cpp:471 +#: directorymergewindow.cpp:472 #, kde-format msgid "Done" msgstr "Gotowe" -#: directorymergewindow.cpp:473 +#: directorymergewindow.cpp:474 #, kde-format msgid "Error" msgstr "Błąd" -#: directorymergewindow.cpp:475 +#: directorymergewindow.cpp:476 #, kde-format msgid "Skipped." msgstr "Pominięto." -#: directorymergewindow.cpp:477 +#: directorymergewindow.cpp:478 #, kde-format msgid "Not saved." msgstr "Niezapisane." -#: directorymergewindow.cpp:479 +#: directorymergewindow.cpp:480 #, kde-format msgid "In progress..." msgstr "W trakcie..." -#: directorymergewindow.cpp:481 +#: directorymergewindow.cpp:482 #, kde-format msgid "To do." msgstr "Do zrobienia." -#: directorymergewindow.cpp:522 +#: directorymergewindow.cpp:523 #, kde-format msgid "Name" msgstr "Nazwa" -#: directorymergewindow.cpp:530 +#: directorymergewindow.cpp:531 #, kde-format msgid "Operation" msgstr "Działanie" -#: directorymergewindow.cpp:532 +#: directorymergewindow.cpp:533 #, kde-format msgid "Status" msgstr "Stan" -#: directorymergewindow.cpp:534 +#: directorymergewindow.cpp:535 #, kde-format msgid "Unsolved" msgstr "Nierozwiązane" -#: directorymergewindow.cpp:536 +#: directorymergewindow.cpp:537 #, kde-format msgid "Solved" msgstr "Rozwiązane" -#: directorymergewindow.cpp:538 +#: directorymergewindow.cpp:539 #, kde-format msgid "Nonwhite" msgstr "Niebiały" -#: directorymergewindow.cpp:540 +#: directorymergewindow.cpp:541 #, kde-format msgid "White" msgstr "Biały" -#: directorymergewindow.cpp:674 +#: directorymergewindow.cpp:676 #, kde-format msgid "Unable to compare non-normal file with normal file." msgstr "Nie można porównać niezwyczajnego pliku ze zwyczajnym." -#: directorymergewindow.cpp:688 +#: directorymergewindow.cpp:690 #, kde-format msgid "Mix of links and normal files." msgstr "Pomieszane dowiązania i normalne pliki." -#: directorymergewindow.cpp:695 +#: directorymergewindow.cpp:697 #, kde-format msgid "Link: " msgstr "Dowiązanie: " -#: directorymergewindow.cpp:704 +#: directorymergewindow.cpp:706 #, kde-format msgid "Size. " msgstr "Rozmiar. " -#: directorymergewindow.cpp:718 directorymergewindow.cpp:728 +#: directorymergewindow.cpp:720 directorymergewindow.cpp:730 #, kde-format msgid "Date & Size: " msgstr "Data & Rozmiar: " -#: directorymergewindow.cpp:748 +#: directorymergewindow.cpp:751 #, kde-format msgid "Comparing file..." msgstr "Porównywanie pliku..." -#: directorymergewindow.cpp:801 +#: directorymergewindow.cpp:813 #, kde-format msgid "" "You are currently doing a directory merge. Are you sure, you want to abort " @@ -327,48 +327,48 @@ "Obecnie wykonywane jest scalanie katalogów. Jesteś pewny że chcesz przerwać " "to działanie i ponownie przeszukać katalog?" -#: directorymergewindow.cpp:802 kdiff3.cpp:698 kdiff3.cpp:708 kdiff3.cpp:720 -#: mergeresultwindow.cpp:372 pdiff.cpp:1033 pdiff.cpp:1910 pdiff.cpp:1920 +#: directorymergewindow.cpp:814 kdiff3.cpp:697 kdiff3.cpp:707 kdiff3.cpp:719 +#: mergeresultwindow.cpp:400 pdiff.cpp:1031 pdiff.cpp:1920 pdiff.cpp:1930 #, kde-format msgid "Warning" msgstr "Ostrzeżenie" -#: directorymergewindow.cpp:803 directorymergewindow.cpp:3393 +#: directorymergewindow.cpp:815 directorymergewindow.cpp:3407 #, kde-format msgid "Rescan" msgstr "Przeszukaj ponownie" -#: directorymergewindow.cpp:804 pdiff.cpp:1035 +#: directorymergewindow.cpp:816 pdiff.cpp:1033 #, kde-format msgid "Continue Merging" msgstr "Wznów scalanie" -#: directorymergewindow.cpp:971 +#: directorymergewindow.cpp:984 #, kde-format msgid "Opening of directories failed:" msgstr "Otwieranie katalogów nie powiodło się:" -#: directorymergewindow.cpp:975 +#: directorymergewindow.cpp:988 #, 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:980 +#: directorymergewindow.cpp:993 #, 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:985 +#: directorymergewindow.cpp:998 #, 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:988 +#: directorymergewindow.cpp:1001 #, kde-format msgid "Directory Open Error" msgstr "Błąd otwierania katalogu" -#: directorymergewindow.cpp:996 +#: directorymergewindow.cpp:1009 #, kde-format msgid "" "The destination directory must not be the same as A or B when three " @@ -379,49 +379,49 @@ "katalogi.\n" "Sprawdź ponownie zanim będziesz kontynuować." -#: directorymergewindow.cpp:998 +#: directorymergewindow.cpp:1011 #, kde-format msgid "Parameter Warning" msgstr "Ostrzeżenie co do parametru" -#: directorymergewindow.cpp:1003 +#: directorymergewindow.cpp:1016 #, kde-format msgid "Scanning directories..." msgstr "Przeszukiwanie katalogów..." -#: directorymergewindow.cpp:1029 +#: directorymergewindow.cpp:1042 #, kde-format msgid "Reading Directory A" msgstr "Czytanie katalogu A" -#: directorymergewindow.cpp:1038 +#: directorymergewindow.cpp:1051 #, kde-format msgid "Reading Directory B" msgstr "Czytanie katalogu B" -#: directorymergewindow.cpp:1048 +#: directorymergewindow.cpp:1061 #, kde-format msgid "Reading Directory C" msgstr "Czytanie katalogu C" -#: directorymergewindow.cpp:1064 +#: directorymergewindow.cpp:1077 #, kde-format msgid "Some subdirectories were not readable in" msgstr "Niektóre podkatalogi są nie do odczytu w" -#: directorymergewindow.cpp:1069 +#: directorymergewindow.cpp:1082 #, kde-format msgid "Check the permissions of the subdirectories." msgstr "Sprawdź prawa dostępu do podkatalogów." -#: directorymergewindow.cpp:1106 kdiff3.cpp:666 kdiff3.cpp:753 kdiff3.cpp:777 -#: kdiff3.cpp:1065 kdiff3.cpp:1086 pdiff.cpp:1116 pdiff.cpp:1170 pdiff.cpp:1218 -#: pdiff.cpp:1234 pdiff.cpp:1277 pdiff.cpp:1301 +#: directorymergewindow.cpp:1119 kdiff3.cpp:665 kdiff3.cpp:752 kdiff3.cpp:776 +#: kdiff3.cpp:1072 kdiff3.cpp:1093 pdiff.cpp:1115 pdiff.cpp:1178 pdiff.cpp:1228 +#: pdiff.cpp:1244 pdiff.cpp:1287 pdiff.cpp:1311 #, kde-format msgid "Ready." msgstr "Gotowe." -#: directorymergewindow.cpp:1121 +#: directorymergewindow.cpp:1134 #, kde-format msgid "" "Directory Comparison Status\n" @@ -436,22 +436,22 @@ "Liczba równych plików: %2\n" "Liczba różnych plików: %3" -#: directorymergewindow.cpp:1128 +#: directorymergewindow.cpp:1141 #, kde-format msgid "Number of manual merges: %1" msgstr "Liczba ręcznych scaleń: %1" -#: directorymergewindow.cpp:1394 +#: directorymergewindow.cpp:1407 #, kde-format msgid "This affects all merge operations." msgstr "To wpłynie na wszystkie działania scalania." -#: directorymergewindow.cpp:1395 +#: directorymergewindow.cpp:1408 #, kde-format msgid "Changing All Merge Operations" msgstr "Zmiana wszystkich działań scalania" -#: directorymergewindow.cpp:1695 +#: directorymergewindow.cpp:1708 #, kde-format msgid "" "Processing %1 / %2\n" @@ -460,44 +460,44 @@ "Przetwarzanie %1 / %2\n" "%3" -#: directorymergewindow.cpp:1738 directorymergewindow.cpp:1742 +#: directorymergewindow.cpp:1751 directorymergewindow.cpp:1755 #, kde-format msgid "Some files could not be processed." msgstr "Niektórych plików nie można było przetworzyć." -#: directorymergewindow.cpp:2222 directorymergewindow.cpp:2247 -#: directorymergewindow.cpp:2271 +#: directorymergewindow.cpp:2235 directorymergewindow.cpp:2260 +#: directorymergewindow.cpp:2285 #, kde-format msgid "This operation is currently not possible." msgstr "To działanie jest w tej chwili niemożliwe." -#: directorymergewindow.cpp:2222 directorymergewindow.cpp:2247 -#: directorymergewindow.cpp:2271 directorymergewindow.cpp:2552 +#: directorymergewindow.cpp:2235 directorymergewindow.cpp:2260 +#: directorymergewindow.cpp:2285 directorymergewindow.cpp:2565 #, kde-format msgid "Operation Not Possible" msgstr "Działanie jest niemożliwe" -#: directorymergewindow.cpp:2318 +#: directorymergewindow.cpp:2332 #, kde-format msgid "An error occurred while copying." msgstr "Wystąpił błąd podczas kopiowania." -#: directorymergewindow.cpp:2319 directorymergewindow.cpp:2759 +#: directorymergewindow.cpp:2333 directorymergewindow.cpp:2772 #, kde-format msgid "Merge Error" msgstr "Błąd scalania" -#: directorymergewindow.cpp:2396 +#: directorymergewindow.cpp:2410 #, kde-format msgid "Unknown merge operation. (This must never happen!)" msgstr "Nieznane działanie scalania. (To się nigdy nie powinno wydarzyć!)" -#: directorymergewindow.cpp:2441 +#: directorymergewindow.cpp:2455 #, kde-format msgid "Unknown merge operation." msgstr "Nieznane działanie scalania." -#: directorymergewindow.cpp:2454 +#: directorymergewindow.cpp:2468 #, kde-format msgid "" "The merge is about to begin.\n" @@ -517,22 +517,22 @@ "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:2459 +#: directorymergewindow.cpp:2473 #, kde-format msgid "Starting Merge" msgstr "Rozpoczynanie scalania" -#: directorymergewindow.cpp:2460 +#: directorymergewindow.cpp:2474 #, kde-format msgid "Do It" msgstr "Wykonaj" -#: directorymergewindow.cpp:2461 +#: directorymergewindow.cpp:2475 #, kde-format msgid "Simulate It" msgstr "Symuluj" -#: directorymergewindow.cpp:2487 +#: directorymergewindow.cpp:2501 #, kde-format msgid "" "The highlighted item has a different type in the different directories. " @@ -540,14 +540,14 @@ msgstr "" "Podświetlony element jest innego rodzaju w innym katalogu. Wybierz co zrobić." -#: directorymergewindow.cpp:2491 +#: directorymergewindow.cpp:2505 #, kde-format msgid "" "The modification dates of the file are equal but the files are not. Select " "what to do." msgstr "Data zmiany plików jest taka sama ale pliki nie. Wybierz co zrobić." -#: directorymergewindow.cpp:2495 +#: directorymergewindow.cpp:2509 #, kde-format msgid "" "The highlighted item was changed in one directory and deleted in the other. " @@ -556,7 +556,7 @@ "Podświetlony element uległ zmianie w jednym katalogu, a usunięty w innym. " "Wybierz co zrobić." -#: directorymergewindow.cpp:2552 +#: directorymergewindow.cpp:2565 #, kde-format msgid "" "This operation is currently not possible because directory merge is " @@ -565,7 +565,7 @@ "Ta działanie jest nie możliwe do wykonania w tej chwili gdyż obecnie " "wykonywane jest działanie scalania katalogów." -#: directorymergewindow.cpp:2609 +#: directorymergewindow.cpp:2622 #, kde-format msgid "" "There was an error in the last step.\n" @@ -575,32 +575,32 @@ "W ostatnim kroku wystąpił błąd.\n" "Chcesz kontynuować z elementem, który powoduje błąd, czy go pominąć?" -#: directorymergewindow.cpp:2611 +#: directorymergewindow.cpp:2624 #, kde-format msgid "Continue merge after an error" msgstr "Kontynuuj scalanie po błędzie" -#: directorymergewindow.cpp:2612 +#: directorymergewindow.cpp:2625 #, kde-format msgid "Continue With Last Item" msgstr "Kontynuuj z ostatnim elementem" -#: directorymergewindow.cpp:2613 +#: directorymergewindow.cpp:2626 #, kde-format msgid "Skip Item" msgstr "Pomiń element" -#: directorymergewindow.cpp:2709 +#: directorymergewindow.cpp:2722 #, kde-format msgid "Merge operation complete." msgstr "Działanie scalania zakończone." -#: directorymergewindow.cpp:2709 directorymergewindow.cpp:2712 +#: directorymergewindow.cpp:2722 directorymergewindow.cpp:2725 #, kde-format msgid "Merge Complete" msgstr "Scalanie zakończone" -#: directorymergewindow.cpp:2722 +#: directorymergewindow.cpp:2735 #, kde-format msgid "" "Simulated merge complete: Check if you agree with the proposed operations." @@ -608,230 +608,230 @@ "Symulacja scalania zakończona. Sprawdź czy zgadzasz się na zaproponowane " "działania." -#: directorymergewindow.cpp:2758 +#: directorymergewindow.cpp:2771 #, kde-format msgid "An error occurred. Press OK to see detailed information." msgstr "Wystąpił błąd. Naciśnij OK, aby zobaczyć szczegóły." -#: directorymergewindow.cpp:2791 +#: directorymergewindow.cpp:2804 #, kde-format msgid "Error: While deleting %1: Creating backup failed." msgstr "Błąd: Podczas usuwania %1: Tworzenie kopii zapasowej nie powiodło się." -#: directorymergewindow.cpp:2798 +#: directorymergewindow.cpp:2811 #, kde-format msgid "delete directory recursively( %1 )" msgstr "usuwaj katalogi rekursywnie( %1 )" -#: directorymergewindow.cpp:2800 +#: directorymergewindow.cpp:2813 #, kde-format msgid "delete( %1 )" msgstr "usuń( %1 )" -#: directorymergewindow.cpp:2815 +#: directorymergewindow.cpp:2828 #, kde-format 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:2834 +#: directorymergewindow.cpp:2847 #, kde-format msgid "Error: rmdir( %1 ) operation failed." msgstr "Błąd: rmdir( %1 ) działanie nieudane." -#: directorymergewindow.cpp:2844 +#: directorymergewindow.cpp:2857 #, kde-format msgid "Error: delete operation failed." msgstr "Błąd: Nieudane działanie usuwania." -#: directorymergewindow.cpp:2870 +#: directorymergewindow.cpp:2884 #, kde-format msgid "manual merge( %1, %2, %3 -> %4)" msgstr "ręczne scalanie( %1, %2, %3 -> %4)" -#: directorymergewindow.cpp:2873 +#: directorymergewindow.cpp:2887 #, kde-format msgid "" " Note: After a manual merge the user should continue by pressing F7." msgstr "" " Uwaga: Po ręcznym scalaniu użytkownik powinien kontynuować wciskając F7." -#: directorymergewindow.cpp:2900 +#: directorymergewindow.cpp:2914 #, 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:2909 +#: directorymergewindow.cpp:2923 #, kde-format msgid "copyLink( %1 -> %2 )" msgstr "copyLink( %1 -> %2 )" -#: directorymergewindow.cpp:2918 +#: directorymergewindow.cpp:2932 #, kde-format msgid "Error: copyLink failed: Remote links are not yet supported." msgstr "" "Błąd: Nie udane copyLink, zdalne dowiązania nie są jeszcze obsługiwane." -#: directorymergewindow.cpp:2928 +#: directorymergewindow.cpp:2942 #, kde-format msgid "Error: copyLink failed." msgstr "Błąd: Nieudane copyLink." -#: directorymergewindow.cpp:2953 +#: directorymergewindow.cpp:2967 #, kde-format msgid "copy( %1 -> %2 )" msgstr "kopiowanie( %1 -> %2 )" -#: directorymergewindow.cpp:2979 +#: directorymergewindow.cpp:2993 #, 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:2986 +#: directorymergewindow.cpp:3000 #, kde-format msgid "rename( %1 -> %2 )" msgstr "zmiana nazwy( %1 -> %2 )" -#: directorymergewindow.cpp:2995 +#: directorymergewindow.cpp:3009 #, kde-format msgid "Error: Rename failed." msgstr "Błąd: Nieudana zmiana nazwy." -#: directorymergewindow.cpp:3013 +#: directorymergewindow.cpp:3027 #, kde-format msgid "Error during makeDir of %1. Cannot delete existing file." msgstr "Błąd podczas makeDir %1. Nie można usunąć istniejącego pliku." -#: directorymergewindow.cpp:3030 +#: directorymergewindow.cpp:3044 #, kde-format msgid "makeDir( %1 )" msgstr "makeDir( %1 )" -#: directorymergewindow.cpp:3040 +#: directorymergewindow.cpp:3054 #, kde-format msgid "Error while creating directory." msgstr "Błąd podczas tworzenia katalogu." -#: directorymergewindow.cpp:3076 directorymergewindow.cpp:3195 +#: directorymergewindow.cpp:3090 directorymergewindow.cpp:3209 #, kde-format msgid "Dest" msgstr "Docelowy" -#: directorymergewindow.cpp:3084 directorymergewindow.cpp:3113 +#: directorymergewindow.cpp:3098 directorymergewindow.cpp:3127 #, kde-format msgid "Dir" msgstr "Katalog" -#: directorymergewindow.cpp:3084 +#: directorymergewindow.cpp:3098 #, kde-format msgid "Type" msgstr "Rodzaj" -#: directorymergewindow.cpp:3084 +#: directorymergewindow.cpp:3098 #, kde-format msgid "Size" msgstr "Rozmiar" -#: directorymergewindow.cpp:3085 +#: directorymergewindow.cpp:3099 #, kde-format msgid "Attr" msgstr "Atrybuty" -#: directorymergewindow.cpp:3085 +#: directorymergewindow.cpp:3099 #, kde-format msgid "Last Modification" msgstr "Ostatnia zmiana" -#: directorymergewindow.cpp:3085 +#: directorymergewindow.cpp:3099 #, kde-format msgid "Link-Destination" msgstr "Dowiązanie do pliku" -#: directorymergewindow.cpp:3113 +#: directorymergewindow.cpp:3127 #, kde-format msgid "File" msgstr "Plik" -#: directorymergewindow.cpp:3113 +#: directorymergewindow.cpp:3127 #, kde-format msgid "-Link" msgstr "-Odsyłacz" -#: directorymergewindow.cpp:3119 +#: directorymergewindow.cpp:3133 #, kde-format msgid "not available" msgstr "niedostępny" -#: directorymergewindow.cpp:3137 +#: directorymergewindow.cpp:3151 #, kde-format msgid "A (Dest): " msgstr "A (docelowy): " -#: directorymergewindow.cpp:3141 +#: directorymergewindow.cpp:3155 #, kde-format msgid "A: " msgstr "A: " -#: directorymergewindow.cpp:3141 +#: directorymergewindow.cpp:3155 #, kde-format msgid "A (Base): " msgstr "A (podstawa): " -#: directorymergewindow.cpp:3147 +#: directorymergewindow.cpp:3161 #, kde-format msgid "B (Dest): " msgstr "B (docelowy): " -#: directorymergewindow.cpp:3151 +#: directorymergewindow.cpp:3165 #, kde-format msgid "B: " msgstr "B: " -#: directorymergewindow.cpp:3156 +#: directorymergewindow.cpp:3170 #, kde-format msgid "C (Dest): " msgstr "C (docelowy): " -#: directorymergewindow.cpp:3160 +#: directorymergewindow.cpp:3174 #, kde-format msgid "C: " msgstr "C: " -#: directorymergewindow.cpp:3163 +#: directorymergewindow.cpp:3177 #, kde-format msgid "Dest: " msgstr "Docelowy: " #. i18n("Saving Directory Merge State ...")); -#: directorymergewindow.cpp:3238 +#: directorymergewindow.cpp:3252 #, kde-format msgid "Save Directory Merge State As..." msgstr "Zapisz stan scalania katalogów jako..." -#: directorymergewindow.cpp:3387 +#: directorymergewindow.cpp:3401 #, kde-format msgid "Start/Continue Directory Merge" msgstr "Rozpocznij/Kontynuuj scalanie katalogów " -#: directorymergewindow.cpp:3388 +#: directorymergewindow.cpp:3402 #, kde-format msgid "Run Operation for Current Item" msgstr "Wykonaj działanie na bieżącym elemencie" -#: directorymergewindow.cpp:3389 +#: directorymergewindow.cpp:3403 #, kde-format msgid "Compare Selected File" msgstr "Porównaj zaznaczone pliki" -#: directorymergewindow.cpp:3390 +#: directorymergewindow.cpp:3404 #, kde-format msgid "Merge Current File" msgstr "Scal bieżący plik" -#: directorymergewindow.cpp:3390 +#: directorymergewindow.cpp:3404 #, kde-format msgid "" "Merge\n" @@ -840,51 +840,51 @@ "Scal\n" "plik" -#: directorymergewindow.cpp:3391 +#: directorymergewindow.cpp:3405 #, kde-format msgid "Fold All Subdirs" msgstr "Zwiń wszystkie podkatalogi" -#: directorymergewindow.cpp:3392 +#: directorymergewindow.cpp:3406 #, kde-format msgid "Unfold All Subdirs" msgstr "Rozwiń wszystkie podkatalogi" #. i18n("Save Directory Merge State ..."), 0, this, &DirectoryMergeWindow::slotSaveMergeState, ac, "dir_save_merge_state"); #. i18n("Load Directory Merge State ..."), 0, this, &DirectoryMergeWindow::slotLoadMergeState, ac, "dir_load_merge_state"); -#: directorymergewindow.cpp:3396 +#: directorymergewindow.cpp:3410 #, kde-format msgid "Choose A for All Items" msgstr "Wybierz A dla wszystkich elementów" -#: directorymergewindow.cpp:3397 +#: directorymergewindow.cpp:3411 #, kde-format msgid "Choose B for All Items" msgstr "Wybierz B dla wszystkich elementów" -#: directorymergewindow.cpp:3398 +#: directorymergewindow.cpp:3412 #, kde-format msgid "Choose C for All Items" msgstr "Wybierz C dla wszystkich elementów" -#: directorymergewindow.cpp:3399 +#: directorymergewindow.cpp:3413 #, kde-format msgid "Auto-Choose Operation for All Items" msgstr "Sam wybierz działanie dla wszystkich elementów" -#: directorymergewindow.cpp:3400 +#: directorymergewindow.cpp:3414 #, kde-format msgid "No Operation for All Items" msgstr "Brak działania dla wszystkich elementów" #. i18n("Synchronize Directories"), 0, this, &DirectoryMergeWindow::slotSynchronizeDirectories, ac, "dir_synchronize_directories"); #. d->m_pDirChooseNewerFiles = GuiUtils::createAction< KToggleAction >(i18n("Copy Newer Files Instead of Merging"), 0, this, &DirectoryMergeWindow::slotChooseNewerFiles, ac, "dir_choose_newer_files"); -#: directorymergewindow.cpp:3405 +#: directorymergewindow.cpp:3419 #, kde-format msgid "Show Identical Files" msgstr "Pokaż takie same pliki" -#: directorymergewindow.cpp:3405 +#: directorymergewindow.cpp:3419 #, kde-format msgid "" "Identical\n" @@ -893,17 +893,17 @@ "Takie same\n" "pliki" -#: directorymergewindow.cpp:3406 +#: directorymergewindow.cpp:3420 #, kde-format msgid "Show Different Files" msgstr "Pokaż różniące się pliki" -#: directorymergewindow.cpp:3407 +#: directorymergewindow.cpp:3421 #, kde-format msgid "Show Files only in A" msgstr "Pokaż pliki tylko w A" -#: directorymergewindow.cpp:3407 +#: directorymergewindow.cpp:3421 #, kde-format msgid "" "Files\n" @@ -912,12 +912,12 @@ "Pliki\n" "tylko w A" -#: directorymergewindow.cpp:3408 +#: directorymergewindow.cpp:3422 #, kde-format msgid "Show Files only in B" msgstr "Pokaż pliki tylko w B" -#: directorymergewindow.cpp:3408 +#: directorymergewindow.cpp:3422 #, kde-format msgid "" "Files\n" @@ -926,12 +926,12 @@ "Pliki\n" "tylko w B" -#: directorymergewindow.cpp:3409 +#: directorymergewindow.cpp:3423 #, kde-format msgid "Show Files only in C" msgstr "Pokaż pliki tylko w C" -#: directorymergewindow.cpp:3409 +#: directorymergewindow.cpp:3423 #, kde-format msgid "" "Files\n" @@ -940,52 +940,58 @@ "Pliki\n" "tylko w C" -#: directorymergewindow.cpp:3413 +#: directorymergewindow.cpp:3427 #, kde-format msgid "Compare Explicitly Selected Files" msgstr "Porównaj bezpośrednio zaznaczone pliki" -#: directorymergewindow.cpp:3414 +#: directorymergewindow.cpp:3428 #, kde-format msgid "Merge Explicitly Selected Files" msgstr "Scal bezpośrednio zaznaczone pliki" -#: directorymergewindow.cpp:3416 directorymergewindow.cpp:3423 +#: directorymergewindow.cpp:3430 directorymergewindow.cpp:3437 #, kde-format msgid "Do Nothing" msgstr "Nic nie rób" -#: directorymergewindow.cpp:3428 +#: directorymergewindow.cpp:3442 #, kde-format msgid "Delete A && B" msgstr "Usuń A i B" -#: directorymergewindow.cpp:3431 +#: directorymergewindow.cpp:3445 #, kde-format msgid "Merge to A && B" msgstr "Scal z A i B" -#: fileaccess.cpp:462 SourceData.cpp:493 +#: fileaccess.cpp:301 +#, kde-format +msgid "Unable to determine full url. No parent specified." +msgstr "" +"Nie można określić pełnego adresu URL. Nie podano elementu nadrzędnego." + +#: fileaccess.cpp:482 SourceData.cpp:506 #, kde-format msgid "Failed to read file: %1" msgstr "Nie udało się odczytać pliku: %1 " -#: fileaccess.cpp:587 +#: fileaccess.cpp:624 #, kde-format msgid "Creating temp copy of %1 failed." msgstr "Tworzenie tymczasowej kopii %1 nieudane." -#: fileaccess.cpp:595 fileaccess.cpp:600 +#: fileaccess.cpp:632 fileaccess.cpp:637 #, kde-format msgid "Opening %1 failed. %2" msgstr "Nie udało się otworzyć %1. %2" -#: fileaccess.cpp:619 fileaccess.cpp:627 +#: fileaccess.cpp:656 fileaccess.cpp:664 #, kde-format msgid "Error reading from %1. %2" msgstr "Błąd czytania z %1. %2" -#: fileaccess.cpp:751 +#: fileaccess.cpp:788 #, kde-format msgid "" "While trying to make a backup, deleting an older backup failed.\n" @@ -995,7 +1001,7 @@ "zapasowej. \n" "Nazwa pliku: %1" -#: fileaccess.cpp:758 +#: fileaccess.cpp:795 #, kde-format msgid "" "While trying to make a backup, renaming failed.\n" @@ -1004,177 +1010,177 @@ "Podczas tworzenia kopii zapasowej, nie udało się zmienić nazwy. \n" "Nazwy plików: %1 -> %2" -#: fileaccess.cpp:828 +#: fileaccess.cpp:865 #, kde-format msgid "Getting file status: %1" msgstr "Pobranie stanu pliku: %1" -#: fileaccess.cpp:869 +#: fileaccess.cpp:906 #, kde-format msgid "Reading file: %1" msgstr "Czytanie pliku: %1" -#: fileaccess.cpp:907 +#: fileaccess.cpp:944 #, kde-format msgid "Writing file: %1" msgstr "Zapisywanie pliku: %1" -#: fileaccess.cpp:940 +#: fileaccess.cpp:977 #, kde-format msgid "Out of memory" msgstr "Brak pamięci" -#: fileaccess.cpp:976 +#: fileaccess.cpp:1013 #, kde-format msgid "Making directory: %1" msgstr "Tworzenie katalogu: %1" -#: fileaccess.cpp:997 +#: fileaccess.cpp:1034 #, kde-format msgid "Removing directory: %1" msgstr "Usuwanie katalogu: %1" -#: fileaccess.cpp:1012 +#: fileaccess.cpp:1049 #, kde-format msgid "Removing file: %1" msgstr "Usuwanie pliku: %1" -#: fileaccess.cpp:1028 +#: fileaccess.cpp:1065 #, kde-format msgid "Creating symbolic link: %1 -> %2" msgstr "Tworzenie dowiązania symbolicznego:%1 -> %2" -#: fileaccess.cpp:1052 +#: fileaccess.cpp:1089 #, kde-format msgid "Renaming file: %1 -> %2" msgstr "Zmiana nazwy pliku: %1 -> %2" -#: fileaccess.cpp:1086 +#: fileaccess.cpp:1123 #, kde-format msgid "Copying file: %1 -> %2" msgstr "Kopiowanie pliku: %1 -> %2" -#: fileaccess.cpp:1108 +#: fileaccess.cpp:1145 #, kde-format msgid "Reading directory: %1" msgstr "Czytanie katalogu: %1" -#: fileaccess.cpp:1162 +#: fileaccess.cpp:1202 #, kde-format msgid "Listing directory: %1" msgstr "Wyświetlenie zawartości katalogu: %1" -#: kdiff3.cpp:181 +#: kdiff3.cpp:182 #, kde-format msgid "Current Configuration:" msgstr "Bieżące ustawienia:" -#: kdiff3.cpp:186 +#: kdiff3.cpp:187 #, kde-format msgid "Config Option Error:" msgstr "Błąd parametru ustawień:" -#: kdiff3.cpp:240 +#: kdiff3.cpp:246 #, kde-format msgid "Option --auto used, but no output file specified." msgstr "Użyta została opcja --auto, ale nie określono pliku wyjściowego." -#: kdiff3.cpp:416 +#: kdiff3.cpp:405 #, kde-format msgid "Option --auto ignored for directory comparison." msgstr "Pominięto opcję --auto przy porównywaniu katalogów." -#: kdiff3.cpp:460 +#: kdiff3.cpp:449 #, kde-format msgid "Saving failed." msgstr "Nieudany zapis." -#: kdiff3.cpp:496 pdiff.cpp:1098 +#: kdiff3.cpp:494 pdiff.cpp:1096 #, kde-format msgid "Opening of these files failed:" msgstr "Nieudane otwarcie następujących plików:" -#: kdiff3.cpp:505 +#: kdiff3.cpp:503 pdiff.cpp:1105 #, kde-format -msgid "File Open Error" +msgid "File open error" msgstr "Błąd otwarcia pliku" -#: kdiff3.cpp:533 +#: kdiff3.cpp:532 #, kde-format msgid "Opens documents for comparison..." msgstr "Otwieranie dokumentów do porównania..." -#: kdiff3.cpp:535 +#: kdiff3.cpp:534 #, kde-format msgid "Reload" msgstr "Wczytaj ponownie" -#: kdiff3.cpp:538 +#: kdiff3.cpp:537 #, kde-format msgid "Saves the merge result. All conflicts must be solved!" msgstr "Zapisuje wynik scalania. Należy rozwiązać wszystkie sprzeczności!" -#: kdiff3.cpp:540 +#: kdiff3.cpp:539 #, kde-format msgid "Saves the current document as..." msgstr "Zapisywanie bieżącego dokumentu jako..." -#: kdiff3.cpp:543 +#: kdiff3.cpp:542 #, kde-format msgid "Print the differences" msgstr "Drukowanie różnic" -#: kdiff3.cpp:546 +#: kdiff3.cpp:545 #, kde-format msgid "Quits the application" msgstr "Wyjście z programu" -#: kdiff3.cpp:549 +#: kdiff3.cpp:548 #, kde-format msgid "Cuts the selected section and puts it to the clipboard" msgstr "Wycina zaznaczony fragment i umieszcza go w schowku" -#: kdiff3.cpp:552 +#: kdiff3.cpp:551 #, kde-format msgid "Copies the selected section to the clipboard" msgstr "Kopiuje zaznaczony fragment do schowka" -#: kdiff3.cpp:554 +#: kdiff3.cpp:553 #, kde-format msgid "Pastes the clipboard contents to current position" msgstr "Wkleja zawartość schowka w bieżącym miejscu" -#: kdiff3.cpp:557 +#: kdiff3.cpp:556 #, kde-format msgid "Select everything in current window" msgstr "Zaznacza wszystko w bieżącym oknie" -#: kdiff3.cpp:560 +#: kdiff3.cpp:559 #, kde-format msgid "Search for a string" msgstr "Znajdź tekst" -#: kdiff3.cpp:562 +#: kdiff3.cpp:561 #, kde-format msgid "Search again for the string" msgstr "Szukaj ponownie tekstu" -#: kdiff3.cpp:567 +#: kdiff3.cpp:566 #, kde-format msgid "Enables/disables the statusbar" msgstr "Włącza/wyłącza pasek stanu" -#: kdiff3.cpp:571 +#: kdiff3.cpp:570 #, kde-format msgid "Configure KDiff3..." msgstr "Ustawienia KDiff3..." -#: kdiff3.cpp:590 +#: kdiff3.cpp:589 #, kde-format msgid "Go to Current Delta" msgstr "Przejdź do bieżącej różnicy" -#: kdiff3.cpp:590 +#: kdiff3.cpp:589 #, kde-format msgid "" "Current\n" @@ -1183,12 +1189,12 @@ "Bieżąca\n" "różnica" -#: kdiff3.cpp:592 +#: kdiff3.cpp:591 #, kde-format msgid "Go to First Delta" msgstr "Przejdź do pierwszej różnicy" -#: kdiff3.cpp:592 +#: kdiff3.cpp:591 #, kde-format msgid "" "First\n" @@ -1197,12 +1203,12 @@ "Pierwsza\n" "różnica" -#: kdiff3.cpp:594 +#: kdiff3.cpp:593 #, kde-format msgid "Go to Last Delta" msgstr "Przejdź do ostatniej różnicy" -#: kdiff3.cpp:594 +#: kdiff3.cpp:593 #, kde-format msgid "" "Last\n" @@ -1211,14 +1217,14 @@ "Ostatnia\n" "różnica" -#: kdiff3.cpp:596 +#: kdiff3.cpp:595 #, kde-format 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:597 +#: kdiff3.cpp:596 #, kde-format msgid "" "(Does not skip white space differences even when \"Show White Space\" is " @@ -1227,12 +1233,12 @@ "(Nie pomija różnic w znakach odstępu gdy opcja \"Pokaż znaki odstępu\" jest " "wyłączona)" -#: kdiff3.cpp:598 +#: kdiff3.cpp:597 #, kde-format msgid "Go to Previous Delta" msgstr "Przejdź do poprzedniej różnicy" -#: kdiff3.cpp:598 +#: kdiff3.cpp:597 #, kde-format msgid "" "Prev\n" @@ -1241,12 +1247,12 @@ "Poprzednia\n" "różnica" -#: kdiff3.cpp:600 +#: kdiff3.cpp:599 #, kde-format msgid "Go to Next Delta" msgstr "Przejdź do następnej różnicy" -#: kdiff3.cpp:600 +#: kdiff3.cpp:599 #, kde-format msgid "" "Next\n" @@ -1255,12 +1261,12 @@ "Następna\n" "różnica" -#: kdiff3.cpp:602 +#: kdiff3.cpp:601 #, kde-format msgid "Go to Previous Conflict" msgstr "Przejdź do poprzedniej sprzeczności" -#: kdiff3.cpp:602 +#: kdiff3.cpp:601 #, kde-format msgid "" "Prev\n" @@ -1269,12 +1275,12 @@ "Poprzedni\n" "sprzeczność" -#: kdiff3.cpp:604 +#: kdiff3.cpp:603 #, kde-format msgid "Go to Next Conflict" msgstr "Przejdź do następnej sprzeczności" -#: kdiff3.cpp:604 +#: kdiff3.cpp:603 #, kde-format msgid "" "Next\n" @@ -1283,12 +1289,12 @@ "Następny\n" "sprzeczność" -#: kdiff3.cpp:606 +#: kdiff3.cpp:605 #, kde-format msgid "Go to Previous Unsolved Conflict" msgstr "Przejdź do poprzedniej nierozwiązanej sprzeczności" -#: kdiff3.cpp:606 +#: kdiff3.cpp:605 #, kde-format msgid "" "Prev\n" @@ -1297,12 +1303,12 @@ "Poprzedni\n" "nierozwiązany" -#: kdiff3.cpp:608 +#: kdiff3.cpp:607 #, kde-format msgid "Go to Next Unsolved Conflict" msgstr "Przejdź do następnej nierozwiązanej sprzeczności" -#: kdiff3.cpp:608 +#: kdiff3.cpp:607 #, kde-format msgid "" "Next\n" @@ -1311,12 +1317,12 @@ "Następny\n" "nierozwiązany" -#: kdiff3.cpp:610 +#: kdiff3.cpp:609 #, kde-format msgid "Select Line(s) From A" msgstr "Wybierz wiersz(e) z A" -#: kdiff3.cpp:610 +#: kdiff3.cpp:609 #, kde-format msgid "" "Choose\n" @@ -1325,12 +1331,12 @@ "Wybierz\n" "A" -#: kdiff3.cpp:611 +#: kdiff3.cpp:610 #, kde-format msgid "Select Line(s) From B" msgstr "Wybierz wiersz(e) z B" -#: kdiff3.cpp:611 +#: kdiff3.cpp:610 #, kde-format msgid "" "Choose\n" @@ -1339,12 +1345,12 @@ "Wybierz\n" "B" -#: kdiff3.cpp:612 +#: kdiff3.cpp:611 #, kde-format msgid "Select Line(s) From C" msgstr "Wybierz wiersz(e) z C" -#: kdiff3.cpp:612 +#: kdiff3.cpp:611 #, kde-format msgid "" "Choose\n" @@ -1353,13 +1359,13 @@ "Wybierz\n" "C" -#: kdiff3.cpp:613 +#: kdiff3.cpp:612 #, kde-format msgid "Automatically Go to Next Unsolved Conflict After Source Selection" msgstr "" "Sam przejdź do następnej nierozwiązanej sprzeczności po wybraniu źródła" -#: kdiff3.cpp:613 +#: kdiff3.cpp:612 #, kde-format msgid "" "Auto\n" @@ -1368,12 +1374,12 @@ "Automat.\n" "następny" -#: kdiff3.cpp:615 +#: kdiff3.cpp:614 #, kde-format msgid "Show Space && Tabulator Characters" msgstr "Pokaż znaki odstępów i tabulację" -#: kdiff3.cpp:615 +#: kdiff3.cpp:614 #, kde-format msgid "" "White\n" @@ -1382,12 +1388,12 @@ "Białe\n" "znaki" -#: kdiff3.cpp:616 +#: kdiff3.cpp:615 #, kde-format msgid "Show White Space" msgstr "Pokaż białe znaki" -#: kdiff3.cpp:616 +#: kdiff3.cpp:615 #, kde-format msgid "" "White\n" @@ -1396,12 +1402,12 @@ "Białe\n" "różnice" -#: kdiff3.cpp:618 +#: kdiff3.cpp:617 #, kde-format msgid "Show Line Numbers" msgstr "Pokaż numery wierszy" -#: kdiff3.cpp:618 +#: kdiff3.cpp:617 #, kde-format msgid "" "Line\n" @@ -1410,194 +1416,194 @@ "Numery\n" "wierszy" -#: kdiff3.cpp:620 +#: kdiff3.cpp:619 #, kde-format msgid "Automatically Solve Simple Conflicts" msgstr "Sam rozwiąż proste sprzeczności" -#: kdiff3.cpp:621 +#: kdiff3.cpp:620 #, kde-format msgid "Set Deltas to Conflicts" msgstr "Ustaw różnice na sprzecznościach" -#: kdiff3.cpp:622 +#: kdiff3.cpp:621 #, kde-format msgid "Run Regular Expression Auto Merge" msgstr "Rozpocznij scalanie wyrażeniem regularnym" -#: kdiff3.cpp:623 +#: kdiff3.cpp:622 #, kde-format msgid "Automatically Solve History Conflicts" msgstr "Sam rozwiąż sprzeczności historii" -#: kdiff3.cpp:624 +#: kdiff3.cpp:623 #, kde-format msgid "Split Diff At Selection" msgstr "Podziel różnice w zaznaczeniu" -#: kdiff3.cpp:625 +#: kdiff3.cpp:624 #, kde-format msgid "Join Selected Diffs" msgstr "Scal zaznaczone różnice" -#: kdiff3.cpp:627 +#: kdiff3.cpp:626 #, kde-format msgid "Show Window A" msgstr "Pokaż okno A" -#: kdiff3.cpp:628 +#: kdiff3.cpp:627 #, kde-format msgid "Show Window B" msgstr "Pokaż okno B" -#: kdiff3.cpp:629 +#: kdiff3.cpp:628 #, kde-format msgid "Show Window C" msgstr "Pokaz okno C" -#: kdiff3.cpp:631 +#: kdiff3.cpp:630 #, kde-format msgid "Normal Overview" msgstr "Normalne przeglądanie" -#: kdiff3.cpp:632 +#: kdiff3.cpp:631 #, kde-format msgid "A vs. B Overview" msgstr "Przeglądanie różnic między A i B" -#: kdiff3.cpp:633 +#: kdiff3.cpp:632 #, kde-format msgid "A vs. C Overview" msgstr "Przeglądanie różnic między A i C" -#: kdiff3.cpp:634 +#: kdiff3.cpp:633 #, kde-format msgid "B vs. C Overview" msgstr "Przeglądanie różnic między B i C" -#: kdiff3.cpp:635 +#: kdiff3.cpp:634 #, kde-format msgid "Word Wrap Diff Windows" msgstr "Zawijaj słowa w oknach różnic" -#: kdiff3.cpp:636 +#: kdiff3.cpp:635 #, kde-format msgid "Add Manual Diff Alignment" msgstr "Dodawaj ręczne wyrównanie różnic" -#: kdiff3.cpp:637 +#: kdiff3.cpp:636 #, kde-format msgid "Clear All Manual Diff Alignments" msgstr "Wyczyść wszystkie ręczne wyrównania różnic" -#: kdiff3.cpp:639 +#: kdiff3.cpp:638 #, kde-format msgid "Focus Next Window" msgstr "Uaktywnij następne okno" -#: kdiff3.cpp:640 +#: kdiff3.cpp:639 #, kde-format msgid "Focus Prev Window" msgstr "Uaktywnij poprzednie okno" -#: kdiff3.cpp:641 +#: kdiff3.cpp:640 #, kde-format msgid "Toggle Split Orientation" msgstr "Przełącz kierunek podziału okien" -#: kdiff3.cpp:643 +#: kdiff3.cpp:642 #, kde-format msgid "Dir && Text Split Screen View" msgstr "Widok dzielony katalogu i tekstu" -#: kdiff3.cpp:645 +#: kdiff3.cpp:644 #, kde-format msgid "Toggle Between Dir && Text View" msgstr "Przełącz między widokiem katalogów i tekstu" -#: kdiff3.cpp:697 pdiff.cpp:1909 +#: kdiff3.cpp:696 pdiff.cpp:1919 #, kde-format msgid "The merge result has not been saved." msgstr "Wynik scalania nie został zapisany." -#: kdiff3.cpp:699 +#: kdiff3.cpp:698 #, kde-format msgid "Save && Quit" msgstr "Zapisz i wyjdź" -#: kdiff3.cpp:700 +#: kdiff3.cpp:699 #, kde-format msgid "Quit Without Saving" msgstr "Zakończ bez zapisywania" -#: kdiff3.cpp:708 pdiff.cpp:1920 +#: kdiff3.cpp:707 pdiff.cpp:1930 #, kde-format msgid "Saving the merge result failed." msgstr "Nieudany zapis wyniku scalania." -#: kdiff3.cpp:719 pdiff.cpp:1032 +#: kdiff3.cpp:718 pdiff.cpp:1030 #, kde-format msgid "" "You are currently doing a directory merge. Are you sure, you want to abort?" msgstr "" "Obecnie wykonujesz scalanie katalogów. Jesteś pewny że chcesz przerwać?" -#: kdiff3.cpp:742 +#: kdiff3.cpp:741 #, kde-format msgid "Saving file..." msgstr "Zapisywanie pliku..." -#: kdiff3.cpp:759 +#: kdiff3.cpp:758 #, kde-format msgid "Saving file with a new filename..." msgstr "Zapisywanie pliku pod nową nazwą..." -#: kdiff3.cpp:761 +#: kdiff3.cpp:760 #, kde-format msgid "Save As..." msgstr "Zapisz jako..." -#: kdiff3.cpp:820 +#: kdiff3.cpp:819 #, kde-format msgid "Printing not implemented." msgstr "Drukowanie niezaimplementowane." -#: kdiff3.cpp:857 +#: kdiff3.cpp:858 #, kde-format msgid "Printing..." msgstr "Drukowanie..." -#: kdiff3.cpp:943 +#: kdiff3.cpp:948 #, kde-format msgid "Printing page %1 of %2" msgstr "Drukowanie strony %1 z %2" -#: kdiff3.cpp:1000 +#: kdiff3.cpp:1006 #, kde-format msgid " (Selection)" msgstr " (Zaznaczenie)" -#: kdiff3.cpp:1027 +#: kdiff3.cpp:1034 #, kde-format msgid "Printing completed." msgstr "Drukowanie zakończone." -#: kdiff3.cpp:1031 +#: kdiff3.cpp:1038 #, kde-format msgid "Printing aborted." msgstr "Drukowanie przerwane." -#: kdiff3.cpp:1038 +#: kdiff3.cpp:1045 #, kde-format msgid "Exiting..." msgstr "Kończenie..." -#: kdiff3.cpp:1049 +#: kdiff3.cpp:1056 #, kde-format msgid "Toggling toolbar..." msgstr "Przełączanie paska narzędzi..." -#: kdiff3.cpp:1070 +#: kdiff3.cpp:1077 #, kde-format msgid "Toggle the statusbar..." msgstr "Przełącz pasek stanu..." @@ -1622,7 +1628,7 @@ msgid "Joachim Eibl" msgstr "Joachim Eibl" -#: kdiff3_part.cpp:173 kdiff3_part.cpp:254 +#: kdiff3_part.cpp:174 kdiff3_part.cpp:255 #, kde-format msgid "Could not find files for comparison." msgstr "Nie można znaleźć plików do porównania." @@ -1640,7 +1646,7 @@ msgstr "Ustawienia KDiff3" #. i18n: ectx: ToolBar (mainToolBar) -#: kdiff3_part.rc:16 main.cpp:88 +#: kdiff3_part.rc:16 main.cpp:89 #, kde-format msgid "KDiff3" msgstr "KDiff3" @@ -1710,89 +1716,94 @@ msgid "Main Toolbar" msgstr "Główny pasek narzędzi" -#: main.cpp:68 main.cpp:72 +#: main.cpp:69 main.cpp:73 #, kde-format msgid "Ignored. (User defined.)" msgstr "Pomijane. (Określone przez użytkownika.)" -#: main.cpp:92 +#: main.cpp:93 #, kde-format msgid " (64 bit)" msgstr " (64 bity)" -#: main.cpp:94 +#: main.cpp:95 #, kde-format msgid " (32 bit)" msgstr " (32 bity)" -#: main.cpp:95 +#: main.cpp:96 #, kde-format msgid "Tool for Comparison and Merge of Files and Directories" msgstr "Narzędzie do porównywania, a także scalania plików i katalogów" -#: main.cpp:96 +#: main.cpp:97 #, kde-format msgid "(c) 2002-2014 Joachim Eibl, (c) 2017 Michael Reeves KF5/Qt5 port" msgstr "(c) 2002-2014 Joachim Eibl, (c) 2017 Michael Reeves KF5/Qt5 port" -#: main.cpp:112 +#: main.cpp:113 #, kde-format msgid "Merge the input." msgstr "Scal pliki wejściowe." -#: main.cpp:113 +#: main.cpp:114 #, kde-format msgid "Explicit base file. For compatibility with certain tools." msgstr "" "Bezpośrednio podany plik odniesienia - w celu zgodności z niektórymi " "narzędziami." -#: main.cpp:114 +#: main.cpp:115 #, kde-format msgid "Output file. Implies -m. E.g.: -o newfile.txt" msgstr "Plik wyjściowy. Implikuje opcję -m. Przykład: -o nowyplik.txt" -#: main.cpp:115 +#: main.cpp:116 #, kde-format msgid "Output file, again. (For compatibility with certain tools.)" msgstr "" "Plik wyjściowy, ponownie (w celu zapewnienia zgodności z niektórymi " "narzędziami)" -#: main.cpp:116 +#: main.cpp:118 #, kde-format msgid "No GUI if all conflicts are auto-solvable. (Needs -o file)" msgstr "" "Brak GUI jeśli wszystkie sprzeczności mogą być rozwiązane. (Wymaga pliku -o)" -#: main.cpp:117 +#: main.cpp:120 +#, kde-format +msgid "Ignored." +msgstr "Pominięte." + +#: main.cpp:122 #, kde-format msgid "Do not solve conflicts automatically." msgstr "Nie rozwiązuj sprzeczności sam." -#: main.cpp:118 +#: main.cpp:123 #, kde-format msgid "Visible name replacement for input file 1 (base)." msgstr "Widoczna nazwa dla pliku 1 (podstawowego)." -#: main.cpp:119 +#: main.cpp:124 #, kde-format msgid "Visible name replacement for input file 2." msgstr "Widoczna nazwa dla pliku 2." -#: main.cpp:120 +#: main.cpp:125 #, kde-format msgid "Visible name replacement for input file 3." msgstr "Widoczna nazwa dla pliku 3." -#: main.cpp:121 +#: main.cpp:126 #, kde-format msgid "Alternative visible name replacement. Supply this once for every input." msgstr "" "Alternatywna widoczna nazwa zastępcza. Proszę podać jedną dla każdego pliku " "wejściowego." -#: main.cpp:122 +#: main.cpp:127 #, kde-format msgid "" "Override a config setting. Use once for every setting. E.g.: --cs " @@ -1801,89 +1812,89 @@ "Nadpisz ustawienia. Użyj raz dla każdego ustawienia, np. --cs " "\"AutoAdvance=1\"" -#: main.cpp:123 +#: main.cpp:128 #, kde-format msgid "Show list of config settings and current values." msgstr "Pokaż listę ustawień i bieżące wartości." -#: main.cpp:124 +#: main.cpp:129 #, kde-format msgid "Use a different config file." msgstr "Użyj innego pliku ustawień." -#: main.cpp:127 +#: main.cpp:132 #, kde-format msgid "file1 to open (base, if not specified via --base)" msgstr "Otwórz plik 1 (podstawowy, jeśli nie określono poprzez --base)" -#: main.cpp:128 +#: main.cpp:133 #, kde-format msgid "file2 to open" msgstr "Otwórz plik 2 " -#: main.cpp:129 +#: main.cpp:134 #, kde-format msgid "file3 to open" msgstr "Otwórz plik 3" -#: main.cpp:153 +#: main.cpp:158 #, kde-format msgid "See kdiff3 --help for supported options." msgstr "Zobacz kdiff3 --help po obsługiwane opcje." -#: mergeresultwindow.cpp:158 +#: mergeresultwindow.cpp:171 #, kde-format msgid "Choose A Everywhere" msgstr "Wybierz wszędzie A" -#: mergeresultwindow.cpp:159 +#: mergeresultwindow.cpp:172 #, kde-format msgid "Choose B Everywhere" msgstr "Wybierz wszędzie B" -#: mergeresultwindow.cpp:160 +#: mergeresultwindow.cpp:173 #, kde-format msgid "Choose C Everywhere" msgstr "Wybierz wszędzie C" -#: mergeresultwindow.cpp:161 +#: mergeresultwindow.cpp:174 #, kde-format msgid "Choose A for All Unsolved Conflicts" msgstr "Wybierz A dla wszystkich nierozwiązanych sprzeczności" -#: mergeresultwindow.cpp:162 +#: mergeresultwindow.cpp:175 #, kde-format msgid "Choose B for All Unsolved Conflicts" msgstr "Wybierz B dla wszystkich nierozwiązanych sprzeczności" -#: mergeresultwindow.cpp:163 +#: mergeresultwindow.cpp:176 #, kde-format msgid "Choose C for All Unsolved Conflicts" msgstr "Wybierz C dla wszystkich nierozwiązanych sprzeczności" -#: mergeresultwindow.cpp:164 +#: mergeresultwindow.cpp:177 #, kde-format msgid "Choose A for All Unsolved Whitespace Conflicts" msgstr "Wybierz A dla wszystkich nierozwiązanych sprzeczności białych znaków" -#: mergeresultwindow.cpp:165 +#: mergeresultwindow.cpp:178 #, kde-format msgid "Choose B for All Unsolved Whitespace Conflicts" msgstr "Wybierz B dla wszystkich nierozwiązanych sprzeczności białych znaków" -#: mergeresultwindow.cpp:166 +#: mergeresultwindow.cpp:179 #, kde-format msgid "Choose C for All Unsolved Whitespace Conflicts" msgstr "Wybierz C dla wszystkich nierozwiązanych sprzeczności białych znaków" -#: mergeresultwindow.cpp:176 +#: mergeresultwindow.cpp:204 #, kde-format msgid "Number of remaining unsolved conflicts: %1 (of which %2 are whitespace)" msgstr "" "Liczba pozostałych nierozwiązanych sprzeczności: %1 (z których %2 dotyczy " "znaków odstępu)" -#: mergeresultwindow.cpp:370 +#: mergeresultwindow.cpp:398 #, kde-format msgid "" "The output has been modified.\n" @@ -1892,29 +1903,29 @@ "Plik wyjściowy został zmieniony.\n" "Jeśli będziesz kontynuować zmiany zostaną utracone." -#: mergeresultwindow.cpp:936 pdiff.cpp:827 +#: mergeresultwindow.cpp:964 pdiff.cpp:817 #, kde-format msgid "All input files are binary equal." msgstr "Wszystkie pliki wejściowe są dwójkowo takie same." -#: mergeresultwindow.cpp:938 +#: mergeresultwindow.cpp:966 #, kde-format msgid "All input files contain the same text." msgstr "Wszystkie wejściowe pliki zawierając ten sam tekst." -#: mergeresultwindow.cpp:942 mergeresultwindow.cpp:946 -#: mergeresultwindow.cpp:950 pdiff.cpp:833 pdiff.cpp:837 pdiff.cpp:841 +#: mergeresultwindow.cpp:970 mergeresultwindow.cpp:974 +#: mergeresultwindow.cpp:978 pdiff.cpp:823 pdiff.cpp:827 pdiff.cpp:831 #, kde-format msgid "Files %1 and %2 are binary equal.\n" msgstr "Pliki %1 i %2 są dwójkowo takie same.\n" -#: mergeresultwindow.cpp:944 mergeresultwindow.cpp:948 -#: mergeresultwindow.cpp:952 +#: mergeresultwindow.cpp:972 mergeresultwindow.cpp:976 +#: mergeresultwindow.cpp:980 #, kde-format msgid "Files %1 and %2 have equal text.\n" msgstr "Pliki %1 i %2 mają ten sam tekst.\n" -#: mergeresultwindow.cpp:958 +#: mergeresultwindow.cpp:986 #, kde-format msgid "" "Total number of conflicts: %1\n" @@ -1927,27 +1938,27 @@ "Liczba nierozwiązanych sprzeczności: %3\n" "%4" -#: mergeresultwindow.cpp:964 +#: mergeresultwindow.cpp:992 #, kde-format msgid "Conflicts" msgstr "Sprzeczności" -#: mergeresultwindow.cpp:1873 +#: mergeresultwindow.cpp:1901 #, kde-format msgid "" msgstr "" -#: mergeresultwindow.cpp:1881 +#: mergeresultwindow.cpp:1909 #, kde-format msgid "" msgstr "" -#: mergeresultwindow.cpp:1883 mergeresultwindow.cpp:2755 +#: mergeresultwindow.cpp:1911 mergeresultwindow.cpp:2783 #, kde-format msgid "" msgstr "" -#: mergeresultwindow.cpp:2967 +#: mergeresultwindow.cpp:2995 #, kde-format msgid "" "Not all conflicts are solved yet.\n" @@ -1956,12 +1967,12 @@ "Nie rozwiązano wszystkich sprzeczności.\n" "Plik nie został zapisany." -#: mergeresultwindow.cpp:2969 mergeresultwindow.cpp:2978 +#: mergeresultwindow.cpp:2997 mergeresultwindow.cpp:3006 #, kde-format msgid "Conflicts Left" msgstr "Pozostałe sprzeczności" -#: mergeresultwindow.cpp:2976 +#: mergeresultwindow.cpp:3004 #, kde-format msgid "" "There is a line end style conflict. Please choose the line end style " @@ -1972,7 +1983,7 @@ "ręcznie.\n" "Plik nie został zapisany." -#: mergeresultwindow.cpp:2990 +#: mergeresultwindow.cpp:3018 #, kde-format msgid "" "\n" @@ -1983,57 +1994,57 @@ "\n" "Tworzenie pliku zapasowego nie powiodło się. Plik nie został zapisany." -#: mergeresultwindow.cpp:2990 mergeresultwindow.cpp:3038 +#: mergeresultwindow.cpp:3018 mergeresultwindow.cpp:3066 #, kde-format msgid "File Save Error" msgstr "Błąd zapisu pliku" -#: mergeresultwindow.cpp:3038 +#: mergeresultwindow.cpp:3066 #, kde-format msgid "Error while writing." msgstr "Błąd w czasie zapisu." -#: mergeresultwindow.cpp:3110 +#: mergeresultwindow.cpp:3138 #, kde-format msgid "Output:" msgstr "Wyjście:" -#: mergeresultwindow.cpp:3123 mergeresultwindow.cpp:3315 +#: mergeresultwindow.cpp:3151 mergeresultwindow.cpp:3343 #, kde-format msgid "[Modified]" msgstr "[zmieniony]" -#: mergeresultwindow.cpp:3130 +#: mergeresultwindow.cpp:3158 #, kde-format msgid "Encoding for saving:" msgstr "Kodowanie dla zapisu:" -#: mergeresultwindow.cpp:3230 +#: mergeresultwindow.cpp:3258 #, kde-format msgid "Conflict" msgstr "Sprzeczność" -#: mergeresultwindow.cpp:3262 +#: mergeresultwindow.cpp:3290 #, kde-format msgid "Codec from A: %1" msgstr "Kodek z A: %1" -#: mergeresultwindow.cpp:3264 +#: mergeresultwindow.cpp:3292 #, kde-format msgid "Codec from B: %1" msgstr "Kodek z B: %1" -#: mergeresultwindow.cpp:3266 +#: mergeresultwindow.cpp:3294 #, kde-format msgid "Codec from C: %1" msgstr "Kodek z C: %1" -#: optiondialog.cpp:119 +#: optiondialog.cpp:121 #, kde-format msgid "Change Font" msgstr "Zmień czcionkę" -#: optiondialog.cpp:135 optiondialog.cpp:145 +#: optiondialog.cpp:137 optiondialog.cpp:147 #, kde-format msgid "" "Font: %1, %2, %3\n" @@ -2044,123 +2055,123 @@ "\n" "Przykład:" -#: optiondialog.cpp:388 +#: optiondialog.cpp:390 #, kde-format msgid "Unicode" msgstr "Unikod" -#: optiondialog.cpp:389 +#: optiondialog.cpp:391 #, kde-format msgid "Latin1" msgstr "Latin1" -#: optiondialog.cpp:408 +#: optiondialog.cpp:410 #, kde-format msgid "Change this if non-ASCII characters are not displayed correctly." msgstr "Zmień to jeśli znaki nie-ascii są wyświetlane niepoprawnie." -#: optiondialog.cpp:491 +#: optiondialog.cpp:495 #, kde-format msgid "Configure" msgstr "Ustawienia" -#: optiondialog.cpp:568 +#: optiondialog.cpp:573 #, kde-format msgid "Font" msgstr "Czcionka" -#: optiondialog.cpp:570 +#: optiondialog.cpp:575 #, kde-format msgid "Editor & Diff Output Font" msgstr "Czcionka edytora i różnicy" -#: optiondialog.cpp:589 +#: optiondialog.cpp:594 #, kde-format msgid "Application font" msgstr "Czcionka aplikacji" -#: optiondialog.cpp:594 +#: optiondialog.cpp:599 #, kde-format msgid "File view font" msgstr "Czcionka widoku pliku" -#: optiondialog.cpp:613 +#: optiondialog.cpp:618 #, kde-format msgctxt "Title for color settings page" msgid "Color" msgstr "Kolor" -#: optiondialog.cpp:614 +#: optiondialog.cpp:619 #, kde-format msgid "Colors Settings" msgstr "Ustawienia kolorów" -#: optiondialog.cpp:631 +#: optiondialog.cpp:644 #, kde-format msgid "Editor and Diff Views:" msgstr "Widoki edytora i różnic:" -#: optiondialog.cpp:639 +#: optiondialog.cpp:652 #, kde-format msgid "Foreground color:" msgstr "Kolor pierwszoplanowy:" -#: optiondialog.cpp:647 +#: optiondialog.cpp:660 #, kde-format msgid "Background color:" msgstr "Kolor tła:" -#: optiondialog.cpp:657 +#: optiondialog.cpp:670 #, kde-format msgid "Diff background color:" msgstr "Kolor tła dla różnic:" -#: optiondialog.cpp:666 +#: optiondialog.cpp:679 #, kde-format msgid "Color A:" msgstr "Kolor A:" -#: optiondialog.cpp:675 +#: optiondialog.cpp:688 #, kde-format msgid "Color B:" msgstr "Kolor B:" -#: optiondialog.cpp:684 +#: optiondialog.cpp:697 #, kde-format msgid "Color C:" msgstr "Kolor C:" -#: optiondialog.cpp:692 +#: optiondialog.cpp:705 #, kde-format msgid "Conflict color:" msgstr "Kolor dla sprzeczności:" -#: optiondialog.cpp:701 +#: optiondialog.cpp:714 #, kde-format msgid "Current range background color:" msgstr "Kolor tła zaznaczonego bloku:" -#: optiondialog.cpp:710 +#: optiondialog.cpp:723 #, kde-format msgid "Current range diff background color:" msgstr "Kolor tła różnic w bloku:" -#: optiondialog.cpp:718 +#: optiondialog.cpp:731 #, kde-format msgid "Color for manually aligned difference ranges:" msgstr "Kolor dla ręcznie wyrównanych zakresów różnic:" -#: optiondialog.cpp:725 +#: optiondialog.cpp:738 #, kde-format msgid "Directory Comparison View:" msgstr "Widok porównywania katalogów:" -#: optiondialog.cpp:731 +#: optiondialog.cpp:744 #, kde-format msgid "Newest file color:" msgstr "Kolor najnowszego pliku:" -#: optiondialog.cpp:736 +#: optiondialog.cpp:749 #, kde-format msgid "" "Changing this color will only be effective when starting the next directory " @@ -2169,37 +2180,37 @@ "Zmiana tego koloru będzie nastąpi po rozpoczęciu następnego porównania " "katalogów." -#: optiondialog.cpp:741 +#: optiondialog.cpp:754 #, kde-format msgid "Oldest file color:" msgstr "Kolor najstarszego pliku:" -#: optiondialog.cpp:750 +#: optiondialog.cpp:763 #, kde-format msgid "Middle age file color:" msgstr "Kolor dla plików w średnim wieku:" -#: optiondialog.cpp:759 +#: optiondialog.cpp:772 #, kde-format msgid "Color for missing files:" msgstr "Kolor brakujących plików:" -#: optiondialog.cpp:773 +#: optiondialog.cpp:786 #, kde-format msgid "Editor" msgstr "Edytor" -#: optiondialog.cpp:774 +#: optiondialog.cpp:787 #, kde-format msgid "Editor Behavior" msgstr "Zachowanie edytora" -#: optiondialog.cpp:787 +#: optiondialog.cpp:809 #, kde-format msgid "Tab inserts spaces" msgstr "Tab wstawia odstępy" -#: optiondialog.cpp:791 +#: optiondialog.cpp:813 #, kde-format msgid "" "On: Pressing tab generates the appropriate number of spaces.\n" @@ -2208,27 +2219,27 @@ "Wł: Wciśnięcie tabulacji wstawi określoną liczbę odstępów.\n" "Wył: Zostanie wprowadzony znak tabulacji." -#: optiondialog.cpp:796 +#: optiondialog.cpp:818 #, kde-format msgid "Tab size:" msgstr "Szerokość tabulacji:" -#: optiondialog.cpp:803 +#: optiondialog.cpp:825 #, kde-format msgid "Auto indentation" msgstr "Wcinaj tekst" -#: optiondialog.cpp:807 +#: optiondialog.cpp:829 #, kde-format msgid "On: The indentation of the previous line is used for a new line.\n" msgstr "Wł: Wcięcie poprzedniego wiersza będzie użyte w nowym wierszu.\n" -#: optiondialog.cpp:810 +#: optiondialog.cpp:832 #, kde-format msgid "Auto copy selection" -msgstr "Kopiuj zaznaczenie do schowka" +msgstr "Skopiuj zaznaczenie do schowka" -#: optiondialog.cpp:814 +#: optiondialog.cpp:836 #, kde-format msgid "" "On: Any selection is immediately written to the clipboard.\n" @@ -2237,7 +2248,7 @@ "Wł: Jakiekolwiek zaznaczenie powoduje natychmiastowy zapis do schowka.\n" "Wył: Musisz jawnie skopiować np. poprzez Ctrl-C." -#: optiondialog.cpp:829 +#: optiondialog.cpp:851 #, kde-format msgid "" "Sets the line endings for when an edited file is saved.\n" @@ -2246,12 +2257,12 @@ "Ustawia wygląd końca wiersza, jaki będzie używany podczas zapisywania pliku\n" "DOS/Windows: CR+LF; Unix: LF; gdzie CR=0x0D; LF=0x0A" -#: optiondialog.cpp:839 +#: optiondialog.cpp:861 #, kde-format msgid "Diff" msgstr "Różnica" -#: optiondialog.cpp:840 +#: optiondialog.cpp:862 #, kde-format msgid "Diff Settings" msgstr "Ustawienia różnic" @@ -2265,12 +2276,12 @@ #. ); #. ++line; #. -#: optiondialog.cpp:865 +#: optiondialog.cpp:896 #, kde-format msgid "Ignore numbers (treat as white space)" msgstr "Pomijaj liczby (postępuj jak z białymi znakami)" -#: optiondialog.cpp:869 +#: optiondialog.cpp:900 #, kde-format msgid "" "Ignore number characters during line matching phase. (Similar to Ignore " @@ -2280,44 +2291,44 @@ "Pomijaj liczby podczas sprawdzania (podobne do Pomijaj białe znaki)\n" "Może być pomocne przy porównywania plików z danymi liczbowymi." -#: optiondialog.cpp:873 +#: optiondialog.cpp:904 #, kde-format msgid "Ignore C/C++ comments (treat as white space)" msgstr "Pomijaj komentarze C/C++ (postępuj jak z białymi znakami)" -#: optiondialog.cpp:876 +#: optiondialog.cpp:907 #, kde-format msgid "Treat C/C++ comments like white space." msgstr "Traktuj komentarze C/C++ jako białe znaki." -#: optiondialog.cpp:879 +#: optiondialog.cpp:910 #, kde-format msgid "Ignore case (treat as white space)" msgstr "Nie rozróżniaj wielkości liter (postępuj jak z białymi znakami)" -#: optiondialog.cpp:883 +#: optiondialog.cpp:914 #, kde-format msgid "Treat case differences like white space changes. ('a'<=>'A')" msgstr "" "Różnice wielkości liter traktuj jak zmiany znaków odstępu (\"a\"<=>\"A\")" -#: optiondialog.cpp:886 +#: optiondialog.cpp:917 #, kde-format msgid "Preprocessor command:" msgstr "Polecenie preprocesora:" -#: optiondialog.cpp:891 +#: optiondialog.cpp:922 #, kde-format msgid "User defined pre-processing. (See the docs for details.)" msgstr "" "Zdefiniowany przez użytkownika pre-proces. (Zobacz szczegóły w dokumentacji.)" -#: optiondialog.cpp:894 +#: optiondialog.cpp:925 #, kde-format msgid "Line-matching preprocessor command:" msgstr "Polecenie preprocesora do dopasowywania wierszy:" -#: optiondialog.cpp:899 +#: optiondialog.cpp:930 #, kde-format msgid "" "This pre-processor is only used during line matching.\n" @@ -2326,12 +2337,12 @@ "Tego polecenia można użyć tylko z wiersza poleceń.\n" "(Aby uzyskać szczegóły zobacz dokumentację.)" -#: optiondialog.cpp:902 +#: optiondialog.cpp:933 #, kde-format msgid "Try hard (slower)" msgstr "Próbuj bardziej (wolniejsze)" -#: optiondialog.cpp:906 +#: optiondialog.cpp:937 #, kde-format msgid "" "Enables the --minimal option for the external diff.\n" @@ -2340,12 +2351,12 @@ "Udostępnia opcję --minimal dla zewnętrznego porównania.\n" "Analizowanie dużych plików będzie znacznie wolniejsze." -#: optiondialog.cpp:910 +#: optiondialog.cpp:941 #, kde-format msgid "Align B and C for 3 input files" msgstr "Wyrównaj B i C dla 3 plików wejściowych" -#: optiondialog.cpp:914 +#: optiondialog.cpp:945 #, kde-format msgid "" "Try to align B and C when comparing or merging three input files.\n" @@ -2357,17 +2368,24 @@ "działanie.\n" "Domyślnie ta opcja jest wyłączona." -#: optiondialog.cpp:926 +#: optiondialog.cpp:956 +#, fuzzy, kde-format +#| msgid "Merge" +msgctxt "Settings page" +msgid "Merge" +msgstr "Scal" + +#: optiondialog.cpp:957 #, kde-format msgid "Merge Settings" msgstr "Ustawienia scaleń" -#: optiondialog.cpp:940 +#: optiondialog.cpp:980 #, kde-format msgid "Auto advance delay (ms):" msgstr "Okres przechodzenia dalej (ms):" -#: optiondialog.cpp:946 +#: optiondialog.cpp:986 #, kde-format msgid "" "When in Auto-Advance mode the result of the current selection is shown \n" @@ -2377,27 +2395,27 @@ "jest pokazywany przez podany czas zanim nastąpi przejście do następnej \n" "sprzeczności. Zakres: 0-2000 ms" -#: optiondialog.cpp:950 +#: optiondialog.cpp:990 #, kde-format msgid "Show info dialogs" msgstr "Pokaż okno informacyjne" -#: optiondialog.cpp:953 +#: optiondialog.cpp:993 #, kde-format msgid "Show a dialog with information about the number of conflicts." msgstr "Pokaż okno z liczbą sprzeczności." -#: optiondialog.cpp:956 +#: optiondialog.cpp:996 #, kde-format msgid "White space 2-file merge default:" msgstr "Domyślne scalanie białych znaków przy 2 plikach:" -#: optiondialog.cpp:961 optiondialog.cpp:974 +#: optiondialog.cpp:1001 optiondialog.cpp:1014 #, kde-format msgid "Manual Choice" msgstr "Wybieraj ręcznie" -#: optiondialog.cpp:965 optiondialog.cpp:979 +#: optiondialog.cpp:1005 optiondialog.cpp:1019 #, kde-format msgid "" "Allow the merge algorithm to automatically select an input for white-space-" @@ -2406,22 +2424,22 @@ "Pozwól algorytmowi scalania samemu dokonać wyboru przy zmianach wynikających " "tylko z białych znaków." -#: optiondialog.cpp:969 +#: optiondialog.cpp:1009 #, kde-format msgid "White space 3-file merge default:" msgstr "Domyślne scalanie białych znaków przy 3 plikach:" -#: optiondialog.cpp:983 +#: optiondialog.cpp:1023 #, kde-format msgid "Automatic Merge Regular Expression" msgstr "Wyrażenie regularne samoczynnego scalania" -#: optiondialog.cpp:991 smalldialogs.cpp:449 +#: optiondialog.cpp:1031 smalldialogs.cpp:459 #, kde-format msgid "Auto merge regular expression:" msgstr "Wyrażenie regularne samoczynnego scalania:" -#: optiondialog.cpp:996 +#: optiondialog.cpp:1036 #, kde-format msgid "" "Regular expression for lines where KDiff3 should automatically choose one " @@ -2434,12 +2452,12 @@ "Kiedy wiersz ze sprzecznością pasuje do wyrażenia regularnego, wtedy\n" "(jeśli dostępne) zostanie wybrane C, w innym przypadku zostanie wybrane B." -#: optiondialog.cpp:1002 +#: optiondialog.cpp:1042 #, kde-format msgid "Run regular expression auto merge on merge start" msgstr "Rozpocznij scalanie wyrażeniem regularnym po rozpoczęciu scalania" -#: optiondialog.cpp:1005 +#: optiondialog.cpp:1045 #, kde-format msgid "" "Run the merge for auto merge regular expressions\n" @@ -2448,17 +2466,17 @@ "Uruchom scalanie dla wyrażenia regularnego samoczynnego scalania\n" "zaraz po rozpoczęciu scalania.\n" -#: optiondialog.cpp:1010 +#: optiondialog.cpp:1050 #, kde-format msgid "Version Control History Merging" msgstr "Łączenie historii kontroli wersji" -#: optiondialog.cpp:1018 smalldialogs.cpp:476 +#: optiondialog.cpp:1058 smalldialogs.cpp:486 #, kde-format msgid "History start regular expression:" msgstr "Wyrażenie regularne dla początku historii:" -#: optiondialog.cpp:1023 +#: optiondialog.cpp:1063 #, kde-format msgid "" "Regular expression for the start of the version control history entry.\n" @@ -2469,12 +2487,12 @@ "Zwykle wiersz taki zawiera słowo kluczowe \"$Log$\".\n" "Domyślna wartość: \".*\\$Log.*\\$.*\"" -#: optiondialog.cpp:1029 smalldialogs.cpp:504 +#: optiondialog.cpp:1069 smalldialogs.cpp:514 #, kde-format msgid "History entry start regular expression:" msgstr "Wyrażenie regularne dla początku wpisu historii:" -#: optiondialog.cpp:1042 +#: optiondialog.cpp:1082 #, kde-format msgid "" "A version control history entry consists of several lines.\n" @@ -2493,22 +2511,22 @@ "historii.\n" "Zajrzyj do dokumentacji aby uzyskać szczegółowe informacje." -#: optiondialog.cpp:1050 +#: optiondialog.cpp:1090 #, kde-format msgid "History merge sorting" msgstr "Sortowanie historii scalania" -#: optiondialog.cpp:1053 +#: optiondialog.cpp:1093 #, kde-format msgid "Sort version control history by a key." msgstr "Sortowanie historii kontroli wersji za pomocą podanego klucza." -#: optiondialog.cpp:1063 +#: optiondialog.cpp:1103 #, kde-format msgid "History entry start sort key order:" msgstr "Porządek sortowania wpisów historii:" -#: optiondialog.cpp:1068 +#: optiondialog.cpp:1108 #, kde-format msgid "" "Each pair of parentheses used in the regular expression for the history " @@ -2526,39 +2544,39 @@ "Jeśli pole pozostanie puste, nie zostanie wykonane żadne sortowanie.\n" "Zajrzyj do dokumentacji, aby uzyskać szczegółowe informacje." -#: optiondialog.cpp:1079 +#: optiondialog.cpp:1119 #, kde-format msgid "Merge version control history on merge start" msgstr "Scal historię zarządzania wersji po rozpoczęciu scalania" -#: optiondialog.cpp:1082 +#: optiondialog.cpp:1122 #, kde-format msgid "Run version control history automerge on merge start." msgstr "" "Rozpocznij scalanie historii zarządzania wersjami po rozpoczęciu scalania." -#: optiondialog.cpp:1086 +#: optiondialog.cpp:1126 #, kde-format msgid "Max number of history entries:" msgstr "Maksymalna liczba wpisów historii:" -#: optiondialog.cpp:1090 +#: optiondialog.cpp:1130 #, kde-format msgid "Cut off after specified number. Use -1 for infinite number of entries." msgstr "" "Obcina po podanej liczbie wpisów. Użyj -1 dla nieskończonej liczy wpisów." -#: optiondialog.cpp:1094 +#: optiondialog.cpp:1134 #, kde-format msgid "Test your regular expressions" msgstr "Sprawdzanie wyrażeń regularnych" -#: optiondialog.cpp:1099 +#: optiondialog.cpp:1139 #, kde-format msgid "Irrelevant merge command:" msgstr "Niezwiązane polecenie scalania:" -#: optiondialog.cpp:1104 +#: optiondialog.cpp:1144 #, kde-format msgid "" "If specified this script is run after automerge\n" @@ -2569,12 +2587,12 @@ "jeśli nie wykryto żadnych innych istotnych zmian.\n" "Wywoływany z parametrami: nazwapliku1 nazwapliku2 nazwapliku3" -#: optiondialog.cpp:1109 +#: optiondialog.cpp:1149 #, kde-format msgid "Auto save and quit on merge without conflicts" msgstr "Sam zapisz i zakończ po scaleniu bez sprzeczności" -#: optiondialog.cpp:1113 +#: optiondialog.cpp:1153 #, kde-format msgid "" "If KDiff3 was started for a file-merge from the command line and all\n" @@ -2589,27 +2607,27 @@ "zapisuje i kończy działanie programu.\n" "Działanie jest podobne do opcji wiersza poleceń \"--auto\"." -#: optiondialog.cpp:1124 optiondialog.cpp:1125 +#: optiondialog.cpp:1164 optiondialog.cpp:1165 #, kde-format msgid "Directory" msgstr "Katalog" -#: optiondialog.cpp:1137 +#: optiondialog.cpp:1185 #, kde-format msgid "Recursive directories" msgstr "Przeszukuj katalogi rekursywnie" -#: optiondialog.cpp:1140 +#: optiondialog.cpp:1188 #, kde-format msgid "Whether to analyze subdirectories or not." msgstr "Określa czy mają być analizowane podkatalogi." -#: optiondialog.cpp:1142 +#: optiondialog.cpp:1190 #, kde-format msgid "File pattern(s):" msgstr "Wzorzec plików:" -#: optiondialog.cpp:1148 +#: optiondialog.cpp:1196 #, kde-format msgid "" "Pattern(s) of files to be analyzed. \n" @@ -2620,12 +2638,12 @@ "Symbole wieloznaczne: \"*\" i \"?\"\n" "Można określić kilka wzorców poprzez użycie separatora: \";\"" -#: optiondialog.cpp:1153 +#: optiondialog.cpp:1201 #, kde-format msgid "File-anti-pattern(s):" msgstr "Anty-wzorzec plików:" -#: optiondialog.cpp:1159 +#: optiondialog.cpp:1207 #, kde-format msgid "" "Pattern(s) of files to be excluded from analysis. \n" @@ -2636,12 +2654,12 @@ "Znaki szablonowe (wildcards): \"*\" i \"?\"\n" "Możesz określić kilka wzorców używając separatora: \";\"" -#: optiondialog.cpp:1164 +#: optiondialog.cpp:1212 #, kde-format msgid "Dir-anti-pattern(s):" msgstr "Anty-wzorzec katalogów:" -#: optiondialog.cpp:1170 +#: optiondialog.cpp:1218 #, kde-format msgid "" "Pattern(s) of directories to be excluded from analysis. \n" @@ -2652,12 +2670,12 @@ "Znaki szablonowe (wildcards): \"*\" and \"?\"\n" "Możesz użyć kilku wzorców poprzez użycie separatora: \";\"" -#: optiondialog.cpp:1175 +#: optiondialog.cpp:1223 #, kde-format msgid "Use .cvsignore" msgstr "Użyj .cvsignore" -#: optiondialog.cpp:1179 +#: optiondialog.cpp:1227 #, kde-format msgid "" "Extends the antipattern to anything that would be ignored by CVS.\n" @@ -2666,22 +2684,22 @@ "Rozszerz anty-wzorzec na wszystko, co będzie pomijane przez CVS. \n" "Lokalne pliki \".cvsignore\" mogą być wyjątkowe dla katalogów." -#: optiondialog.cpp:1183 +#: optiondialog.cpp:1231 #, kde-format msgid "Find hidden files and directories" msgstr "Szukaj ukrytych plików i katalogów" -#: optiondialog.cpp:1186 +#: optiondialog.cpp:1234 #, kde-format msgid "Finds hidden files and directories." msgstr "Znajduje ukryte pliki i katalogi." -#: optiondialog.cpp:1189 +#: optiondialog.cpp:1237 #, kde-format msgid "Follow file links" msgstr "Podążaj za dowiązaniami" -#: optiondialog.cpp:1193 +#: optiondialog.cpp:1241 #, kde-format msgid "" "On: Compare the file the link points to.\n" @@ -2690,12 +2708,12 @@ "Wł: Porównuj pliki na które wskazuje dowiązanie.\n" "Wył: Porównuj dowiązania." -#: optiondialog.cpp:1197 +#: optiondialog.cpp:1245 #, kde-format msgid "Follow directory links" msgstr "Podążaj za dowiązaniami katalogów" -#: optiondialog.cpp:1201 +#: optiondialog.cpp:1249 #, kde-format msgid "" "On: Compare the directory the link points to.\n" @@ -2704,12 +2722,12 @@ "Wł: Porównuj katalogi na które wskazuje dowiązanie. \n" "Wył: Porównuj dowiązania." -#: optiondialog.cpp:1210 +#: optiondialog.cpp:1258 #, kde-format msgid "Case sensitive filename comparison" msgstr "Rozróżniaj wielkość liter przy porównaniu nazw plików" -#: optiondialog.cpp:1214 +#: optiondialog.cpp:1262 #, kde-format msgid "" "The directory comparison will compare files or directories when their names " @@ -2723,12 +2741,12 @@ "Dla systemu Windows opcja ta jest domyślne wyłączona, w innych przypadkach " "włączona." -#: optiondialog.cpp:1218 +#: optiondialog.cpp:1266 #, kde-format msgid "Unfold all subdirectories on load" msgstr "Rozwiń wszystkie podkatalogi po wczytaniu" -#: optiondialog.cpp:1222 +#: optiondialog.cpp:1270 #, kde-format msgid "" "On: Unfold all subdirectories when starting a directory diff.\n" @@ -2738,12 +2756,12 @@ "katalogami.\n" "Wył: Pozostaw podkatalogi zwinięte." -#: optiondialog.cpp:1226 +#: optiondialog.cpp:1274 #, kde-format msgid "Skip directory status report" msgstr "Nie zgłaszaj wyniku różnicy pomiędzy katalogami" -#: optiondialog.cpp:1230 +#: optiondialog.cpp:1278 #, kde-format msgid "" "On: Do not show the Directory Comparison Status.\n" @@ -2752,27 +2770,27 @@ "Wł: Nie pokazuj wyniku porównywania katalogów.\n" "Wył: Pokaż okno dialogowe wyniku na początku." -#: optiondialog.cpp:1234 +#: optiondialog.cpp:1282 #, kde-format msgid "File Comparison Mode" msgstr "Tryb porównywania plików" -#: optiondialog.cpp:1239 +#: optiondialog.cpp:1287 #, kde-format msgid "Binary comparison" msgstr "Porównywanie dwójkowe" -#: optiondialog.cpp:1241 +#: optiondialog.cpp:1289 #, kde-format msgid "Binary comparison of each file. (Default)" msgstr "Dwójkowe porównanie dla każdego pliku (domyślne)" -#: optiondialog.cpp:1244 +#: optiondialog.cpp:1292 #, kde-format msgid "Full analysis" msgstr "Pełne porównywanie" -#: optiondialog.cpp:1246 +#: optiondialog.cpp:1294 #, kde-format msgid "" "Do a full analysis and show statistics information in extra columns.\n" @@ -2782,12 +2800,12 @@ "(Wolniejsze niż porównanie dwójkowe i znacznie wolniejsze dla plików " "dwójkowych.)" -#: optiondialog.cpp:1250 +#: optiondialog.cpp:1298 #, kde-format msgid "Trust the size and modification date (unsafe)" msgstr "Ufaj rozmiarowi i dacie zmiany (niebezpieczne)" -#: optiondialog.cpp:1252 +#: optiondialog.cpp:1300 #, kde-format msgid "" "Assume that files are equal if the modification date and file length are " @@ -2801,7 +2819,7 @@ "Pliki z jednakową zawartością ale inną datą zmiany zostaną uznane za różne.\n" "Jest to użyteczne przy dużych katalogach lub wolnych połączeniach sieciowych." -#: optiondialog.cpp:1257 +#: optiondialog.cpp:1305 #, kde-format msgid "" "Trust the size and date, but use binary comparison if date does not match " @@ -2810,7 +2828,7 @@ "Ufaj rozmiarowi i dacie, ale użyj porównania dwójkowego jeśli data się nie " "zgadza (niebezpieczne)" -#: optiondialog.cpp:1259 +#: optiondialog.cpp:1307 #, kde-format msgid "" "Assume that files are equal if the modification date and file length are " @@ -2824,12 +2842,12 @@ "porównania dwójkowego.\n" "Jest to użyteczne przy dużych katalogach lub wolnych połączeniach sieciowych." -#: optiondialog.cpp:1264 +#: optiondialog.cpp:1312 #, kde-format msgid "Trust the size (unsafe)" msgstr "Ufaj rozmiarowi (niebezpieczne)" -#: optiondialog.cpp:1266 +#: optiondialog.cpp:1314 #, kde-format msgid "" "Assume that files are equal if their file lengths are equal.\n" @@ -2840,12 +2858,12 @@ "Użyteczne przy dużych katalogach lub wolnych połączeniach sieciowych, gdzie " "data jest zmieniana w trakcie pobierania." -#: optiondialog.cpp:1273 +#: optiondialog.cpp:1321 #, kde-format msgid "Synchronize directories" msgstr "Synchronizuj katalogi" -#: optiondialog.cpp:1277 +#: optiondialog.cpp:1325 #, kde-format msgid "" "Offers to store files in both directories so that\n" @@ -2857,12 +2875,12 @@ "Działa tylko przy porównywaniu dwóch katalogów \n" "bez określonego miejsca docelowego." -#: optiondialog.cpp:1283 +#: optiondialog.cpp:1331 #, kde-format msgid "White space differences considered equal" msgstr "Nie zgłaszaj różnic w białych znakach" -#: optiondialog.cpp:1287 +#: optiondialog.cpp:1335 #, kde-format msgid "" "If files differ only by white space consider them equal.\n" @@ -2871,12 +2889,12 @@ "Jeśli pliki różnią się tylko białymi znakami, to uznaj je za takie same.\n" "Opcja możliwa tylko w przypadku pełnego porównywania." -#: optiondialog.cpp:1293 +#: optiondialog.cpp:1341 #, kde-format msgid "Copy newer instead of merging (unsafe)" -msgstr "Kopiuj nowsze zamiast scalać (niebezpieczne)" +msgstr "Skopiuj nowsze zamiast scalać (niebezpieczne)" -#: optiondialog.cpp:1297 +#: optiondialog.cpp:1345 #, kde-format msgid "" "Do not look inside, just take the newer file.\n" @@ -2887,12 +2905,12 @@ "(Użyj tego tylko jeśli wiesz co robisz!)\n" "Jest to efektywne tylko przy porównywaniu dwóch katalogów." -#: optiondialog.cpp:1302 +#: optiondialog.cpp:1350 #, kde-format msgid "Backup files (.orig)" msgstr "Twórz kopie zapasowe (.orig)" -#: optiondialog.cpp:1306 +#: optiondialog.cpp:1354 #, kde-format msgid "" "If a file would be saved over an old file, then the old file\n" @@ -2902,17 +2920,17 @@ "zmieni nazwę (dodane zostanie rozszerzenie \".orig\"), zamiast zostać " "usuniętym." -#: optiondialog.cpp:1382 optiondialog.cpp:1383 +#: optiondialog.cpp:1430 optiondialog.cpp:1431 #, kde-format msgid "Regional Settings" msgstr "Ustawienia regionalne" -#: optiondialog.cpp:1397 +#: optiondialog.cpp:1454 #, kde-format msgid "Use the same encoding for everything:" msgstr "Używanie tego samego kodowania dla wszystkiego:" -#: optiondialog.cpp:1401 +#: optiondialog.cpp:1458 #, kde-format msgid "" "Enable this allows to change all encodings by changing the first only.\n" @@ -2922,17 +2940,17 @@ "pierwsze.\n" "Wyłącz, jeśli potrzebne są różne osobne ustawienia." -#: optiondialog.cpp:1405 +#: optiondialog.cpp:1462 #, kde-format msgid "Note: Local Encoding is \"%1\"" msgstr "Uwaga: Lokalne kodowanie to \"%1\"" -#: optiondialog.cpp:1409 +#: optiondialog.cpp:1466 #, kde-format msgid "File Encoding for A:" msgstr "Kodowanie pliku A:" -#: optiondialog.cpp:1416 +#: optiondialog.cpp:1473 #, kde-format msgid "" "If enabled then Unicode (UTF-16 or UTF-8) encoding will be detected.\n" @@ -2945,32 +2963,32 @@ "użyte z powrotem.\n" "(Wykrywanie Unikodu odbywa się na podstawie pierwszych bajtów pliku.)" -#: optiondialog.cpp:1419 optiondialog.cpp:1430 optiondialog.cpp:1441 +#: optiondialog.cpp:1476 optiondialog.cpp:1487 optiondialog.cpp:1498 #, kde-format msgid "Auto Detect Unicode" msgstr "Wykryj Unicode" -#: optiondialog.cpp:1425 +#: optiondialog.cpp:1482 #, kde-format msgid "File Encoding for B:" msgstr "Kodowanie pliku B:" -#: optiondialog.cpp:1436 +#: optiondialog.cpp:1493 #, kde-format msgid "File Encoding for C:" msgstr "Kodowanie pliku C:" -#: optiondialog.cpp:1447 +#: optiondialog.cpp:1504 #, kde-format msgid "File Encoding for Merge Output and Saving:" msgstr "Kodowanie pliku wynikowego i przy zapisywaniu:" -#: optiondialog.cpp:1452 +#: optiondialog.cpp:1509 #, kde-format msgid "Auto Select" msgstr "Wybieraj sam" -#: optiondialog.cpp:1456 +#: optiondialog.cpp:1513 #, kde-format msgid "" "If enabled then the encoding from the input files is used.\n" @@ -2981,17 +2999,17 @@ "W przypadkach wątpliwych pojawi się okno, gdzie użytkownik będzie mógł " "wybrać kodowanie dla zapisu." -#: optiondialog.cpp:1459 +#: optiondialog.cpp:1516 #, kde-format msgid "File Encoding for Preprocessor Files:" msgstr "Kodowanie plików preprocesora:" -#: optiondialog.cpp:1471 +#: optiondialog.cpp:1528 #, kde-format msgid "Right To Left Language" msgstr "Język od-prawej-do-lewej" -#: optiondialog.cpp:1475 +#: optiondialog.cpp:1532 #, kde-format msgid "" "Some languages are read from right to left.\n" @@ -3000,22 +3018,22 @@ "Niektóre języki są czytane od prawej strony do lewej.\n" "Ustawienie to zmieni odpowiednio zarówno przeglądarkę jak i edytor." -#: optiondialog.cpp:1485 +#: optiondialog.cpp:1542 #, kde-format msgid "Integration" msgstr "Integracja" -#: optiondialog.cpp:1486 +#: optiondialog.cpp:1543 #, kde-format msgid "Integration Settings" msgstr "Ustawienia integracji" -#: optiondialog.cpp:1499 +#: optiondialog.cpp:1564 #, kde-format msgid "Command line options to ignore:" msgstr "Pomijane opcje wiersza poleceń:" -#: optiondialog.cpp:1505 +#: optiondialog.cpp:1570 #, kde-format msgid "" "List of command line options that should be ignored when KDiff3 is used by " @@ -3028,12 +3046,12 @@ "Można podać kilka opcji oddzielając je za pomocą \";\"\n" "Użycie tej opcji zablokuje błąd \"Nieznana opcja\"." -#: optiondialog.cpp:1510 +#: optiondialog.cpp:1575 #, kde-format msgid "Quit also via Escape key" msgstr "Klawisz Escape także powoduje wyjście" -#: optiondialog.cpp:1514 +#: optiondialog.cpp:1579 #, kde-format msgid "" "Fast method to exit.\n" @@ -3042,7 +3060,7 @@ "Szybka metoda zakończenia.\n" "Użyteczne dla tych którzy są przyzwyczajenia do używania klawisza Escape." -#: optiondialog.cpp:1598 +#: optiondialog.cpp:1653 #, kde-format msgid "This resets all options. Not only those of the current topic." msgstr "Kasuje wszystkie ustawienia. Działa nie tylko na bieżącej zakładce." @@ -3097,80 +3115,70 @@ msgid "Disable Unsafe Options" msgstr "Wyłącz niebezpieczne opcje" -#: pdiff.cpp:158 +#: pdiff.cpp:160 #, kde-format msgid "Loading A" msgstr "Wczytywanie A" -#: pdiff.cpp:167 +#: pdiff.cpp:162 #, kde-format -msgid "Errors occurred during pre-processing of file A." -msgstr "Wystąpiły błędy podczas wstępnego przetwarzania pliku A." +msgid "Loading A: %1" +msgstr "Wczytywanie A: %1" -#: pdiff.cpp:172 +#: pdiff.cpp:170 #, kde-format msgid "Loading B" msgstr "Wczytywanie B" -#: pdiff.cpp:179 -#, kde-format -msgid "Errors occurred during pre-processing of file B." -msgstr "Wystąpiły błędy podczas wstępnego przetwarzania pliku B." - -#: pdiff.cpp:202 pdiff.cpp:241 +#: pdiff.cpp:201 pdiff.cpp:237 #, kde-format msgid "Diff: A <-> B" msgstr "Różnica: A <-> B" -#: pdiff.cpp:208 pdiff.cpp:279 pdiff.cpp:293 +#: pdiff.cpp:207 pdiff.cpp:275 pdiff.cpp:289 #, kde-format msgid "Linediff: A <-> B" msgstr "Różnica: A <-> B" -#: pdiff.cpp:225 +#: pdiff.cpp:224 #, kde-format msgid "Loading C" msgstr "Wczytywanie C" -#: pdiff.cpp:232 -#, kde-format -msgid "Errors occurred during pre-processing of file C." -msgstr "Wystąpiły błędy podczas wstępnego przetwarzania pliku C." - -#: pdiff.cpp:250 +#: pdiff.cpp:246 #, kde-format msgid "Diff: A <-> C" msgstr "Różnica: A <-> C" -#: pdiff.cpp:261 +#: pdiff.cpp:257 #, kde-format msgid "Diff: B <-> C" msgstr "Różnica: B <-> C" -#: pdiff.cpp:283 pdiff.cpp:297 +#: pdiff.cpp:279 pdiff.cpp:293 #, kde-format msgid "Linediff: B <-> C" msgstr "Różnica: B <-> C" -#: pdiff.cpp:287 pdiff.cpp:301 +#: pdiff.cpp:283 pdiff.cpp:297 #, kde-format msgid "Linediff: A <-> C" msgstr "Różnica: A <-> C" -#: pdiff.cpp:829 +#: pdiff.cpp:819 #, kde-format msgid "All input files contain the same text, but are not binary equal." msgstr "" "Wszystkie pliki wejściowe zawierają ten sam tekst, ale nie są dwójkowo takie " "same." -#: pdiff.cpp:835 pdiff.cpp:839 pdiff.cpp:843 +#: pdiff.cpp:825 pdiff.cpp:829 pdiff.cpp:833 #, kde-format msgid "Files %1 and %2 have equal text, but are not binary equal. \n" msgstr "" "Pliki %1 i %2 zawierają ten sam tekst, ale nie są dwójkowo takie same.\n" -#: pdiff.cpp:853 +#: pdiff.cpp:843 #, kde-format msgid "" "Some input files do not seem to be pure text files.\n" @@ -3181,17 +3189,17 @@ "Zauważ że KDiff3 nie nadaje się do danych dwójkowych.\n" "Kontynuuj na własne ryzyko." -#: pdiff.cpp:863 +#: pdiff.cpp:853 #, kde-format msgid ", B" msgstr ", B" -#: pdiff.cpp:865 +#: pdiff.cpp:855 #, kde-format msgid ", C" msgstr ", C" -#: pdiff.cpp:867 +#: pdiff.cpp:857 #, kde-format msgid "" "Some input characters could not be converted to valid unicode.\n" @@ -3205,205 +3213,200 @@ "Nie zapisuj wyników, jeśli jesteś niepewny(a). Kontynuuj na własne ryzyko.\n" "Pliki wejściowe, których to dotyczy to %1." -#: pdiff.cpp:1034 +#: pdiff.cpp:1032 #, kde-format msgid "Abort" msgstr "O programie" -#: pdiff.cpp:1040 pdiff.cpp:1130 +#: pdiff.cpp:1038 pdiff.cpp:1129 #, kde-format msgid "Opening files..." msgstr "Otwieranie plików..." -#: pdiff.cpp:1107 -#, kde-format -msgid "File open error" -msgstr "Błąd otwarcia pliku" - -#: pdiff.cpp:1202 +#: pdiff.cpp:1212 #, kde-format msgid "Cutting selection..." msgstr "Wytnij zaznaczenie..." -#: pdiff.cpp:1223 +#: pdiff.cpp:1233 #, kde-format msgid "Copying selection to clipboard..." -msgstr "Kopiuj zaznaczony fragment do schowka..." +msgstr "Skopiuj zaznaczony fragment do schowka..." -#: pdiff.cpp:1239 +#: pdiff.cpp:1249 #, kde-format msgid "Inserting clipboard contents..." msgstr "Wkleja zawartość schowka..." -#: pdiff.cpp:1695 +#: pdiff.cpp:1705 #, kde-format msgid "Word wrap (Cancel disables word wrap)" msgstr "Zawijanie słów (Anulowanie wyłącza zawijanie słów)" -#: pdiff.cpp:1696 +#: pdiff.cpp:1706 #, kde-format msgid "Calculating max width for horizontal scrollbar" msgstr "Obliczanie największej szerokości dla poziomego paska przewijania" -#: pdiff.cpp:1911 +#: pdiff.cpp:1921 #, kde-format msgid "Save && Continue" msgstr "Zapisz i Kontynuuj" -#: pdiff.cpp:1912 +#: pdiff.cpp:1922 #, kde-format msgid "Continue Without Saving" msgstr "Zakończ bez zapisywania" -#: pdiff.cpp:2124 +#: pdiff.cpp:2134 #, kde-format msgid "Search complete." msgstr "Wynik szukania." -#: pdiff.cpp:2124 +#: pdiff.cpp:2134 #, kde-format msgid "Search Complete" msgstr "Wyszukiwanie zakończone" -#: pdiff.cpp:2375 +#: pdiff.cpp:2385 #, kde-format msgid "Nothing is selected in either diff input window." msgstr "Nic nie wybrano w żadnym oknie wejściowym różnicy." -#: pdiff.cpp:2375 +#: pdiff.cpp:2385 #, kde-format msgid "Error while adding manual diff range" msgstr "Błąd podczas dodawania ręcznego zakresu różnic" -#: progress.cpp:59 progress.cpp:71 +#: progress.cpp:61 progress.cpp:73 #, kde-format msgid "&Cancel" -msgstr "Z&aniechaj" +msgstr "&Anuluj" #: smalldialogs.cpp:61 #, kde-format msgid "A (Base):" msgstr "A (podstawa):" -#: smalldialogs.cpp:68 smalldialogs.cpp:85 smalldialogs.cpp:102 -#: smalldialogs.cpp:144 +#: smalldialogs.cpp:71 smalldialogs.cpp:90 smalldialogs.cpp:109 +#: smalldialogs.cpp:154 #, kde-format msgid "File..." msgstr "Plik..." -#: smalldialogs.cpp:70 smalldialogs.cpp:87 smalldialogs.cpp:104 -#: smalldialogs.cpp:146 +#: smalldialogs.cpp:73 smalldialogs.cpp:92 smalldialogs.cpp:111 +#: smalldialogs.cpp:156 #, kde-format msgid "Dir..." msgstr "Katalog..." -#: smalldialogs.cpp:96 +#: smalldialogs.cpp:103 #, kde-format msgid "C (Optional):" msgstr "C (opcjonalnie):" -#: smalldialogs.cpp:119 +#: smalldialogs.cpp:126 #, kde-format msgid "Swap/Copy Names..." msgstr "Zamiana/Kopiowanie nazw..." -#: smalldialogs.cpp:124 smalldialogs.cpp:125 smalldialogs.cpp:126 +#: smalldialogs.cpp:131 smalldialogs.cpp:132 smalldialogs.cpp:133 #, kde-format msgid "Swap %1<->%2" msgstr "Zamiana %1<->%2" -#: smalldialogs.cpp:127 smalldialogs.cpp:128 smalldialogs.cpp:129 +#: smalldialogs.cpp:134 smalldialogs.cpp:135 smalldialogs.cpp:136 #, kde-format msgid "Copy %1->Output" msgstr "Skopiuj %1->Wyjście" -#: smalldialogs.cpp:130 smalldialogs.cpp:131 smalldialogs.cpp:132 +#: smalldialogs.cpp:137 smalldialogs.cpp:138 smalldialogs.cpp:139 #, kde-format msgid "Swap %1<->Output" msgstr "Zamiana %1 <-> Wynik" -#: smalldialogs.cpp:138 +#: smalldialogs.cpp:148 #, kde-format msgid "Output (optional):" msgstr "Wynik (opcjonalnie):" -#: smalldialogs.cpp:168 +#: smalldialogs.cpp:178 #, kde-format msgid "Configure..." msgstr "Ustawienia..." -#: smalldialogs.cpp:233 +#: smalldialogs.cpp:243 #, kde-format msgid "Open Directory" msgstr "Otwórz katalog" -#: smalldialogs.cpp:234 +#: smalldialogs.cpp:244 #, kde-format msgid "Select Output File" msgstr "Wybierz plik wyjściowy" -#: smalldialogs.cpp:393 +#: smalldialogs.cpp:403 #, kde-format msgid "Search text:" msgstr "Szukaj tekstu:" -#: smalldialogs.cpp:400 +#: smalldialogs.cpp:410 #, kde-format msgid "Case sensitive" msgstr "Rozróżniaj wielkość liter" -#: smalldialogs.cpp:403 +#: smalldialogs.cpp:413 #, kde-format msgid "Search A" msgstr "Przeszukaj A" -#: smalldialogs.cpp:408 +#: smalldialogs.cpp:418 #, kde-format msgid "Search B" msgstr "Przeszukaj B" -#: smalldialogs.cpp:413 +#: smalldialogs.cpp:423 #, kde-format msgid "Search C" msgstr "Przeszukaj C" -#: smalldialogs.cpp:418 +#: smalldialogs.cpp:428 #, kde-format msgid "Search output" msgstr "Przeszukaj wynik" -#: smalldialogs.cpp:425 +#: smalldialogs.cpp:435 #, kde-format msgid "&Search" msgstr "&Szukaj" -#: smalldialogs.cpp:444 +#: smalldialogs.cpp:454 #, kde-format msgid "Regular Expression Tester" msgstr "Test wyrażeń regularnych" -#: smalldialogs.cpp:457 +#: smalldialogs.cpp:467 #, kde-format msgid "Example auto merge line:" msgstr "Przykładowy wiersz samoczynnego scalania:" -#: smalldialogs.cpp:459 +#: smalldialogs.cpp:469 #, kde-format msgid "To test auto merge, copy a line as used in your files." msgstr "" "Aby sprawdzić samoczynne scalanie, skopiuj wiersz używany w twoich plikach." -#: smalldialogs.cpp:465 smalldialogs.cpp:493 smalldialogs.cpp:529 +#: smalldialogs.cpp:475 smalldialogs.cpp:503 smalldialogs.cpp:539 #, kde-format msgid "Match result:" msgstr "Pasujący wynik:" -#: smalldialogs.cpp:484 +#: smalldialogs.cpp:494 #, kde-format msgid "Example history start line (with leading comment):" msgstr "Przykładowy wiersz początkowy historii (z poprzedzającym komentarzem):" -#: smalldialogs.cpp:486 +#: smalldialogs.cpp:496 #, kde-format msgid "" "Copy a history start line as used in your files,\n" @@ -3413,18 +3416,18 @@ "plikach,\n" "włącznie z poprzedzającym go komentarzem." -#: smalldialogs.cpp:512 +#: smalldialogs.cpp:522 #, kde-format msgid "History sort key order:" msgstr "Porządek sortowania historii:" -#: smalldialogs.cpp:520 +#: smalldialogs.cpp:530 #, kde-format msgid "Example history entry start line (without leading comment):" msgstr "" "Przykładowy wiersz początkowy historii (bez poprzedzającego komentarza):" -#: smalldialogs.cpp:522 +#: smalldialogs.cpp:532 #, kde-format msgid "" "Copy a history entry start line as used in your files,\n" @@ -3434,48 +3437,48 @@ "plikach,\n" "ale bez poprzedzającego go komentarza." -#: smalldialogs.cpp:536 +#: smalldialogs.cpp:546 #, kde-format msgid "Sort key result:" msgstr "Wynik sortowania kluczy:" -#: smalldialogs.cpp:584 smalldialogs.cpp:594 smalldialogs.cpp:614 +#: smalldialogs.cpp:594 smalldialogs.cpp:604 smalldialogs.cpp:624 #, kde-format msgid "Match success." msgstr "Znaleziono pasujące wyrażenie." -#: smalldialogs.cpp:588 smalldialogs.cpp:598 smalldialogs.cpp:620 +#: smalldialogs.cpp:598 smalldialogs.cpp:608 smalldialogs.cpp:630 #, kde-format msgid "Match failed." msgstr "Nie znaleziono pasującego wyrażenia." -#: smalldialogs.cpp:605 +#: smalldialogs.cpp:615 #, kde-format msgid "Opening and closing parentheses do not match in regular expression." msgstr "" "Nawiasy otwierające i zamykające nie zgadzają się w wyrażeniu regularnym." -#: SourceData.cpp:150 +#: SourceData.cpp:153 #, kde-format msgid "Writing clipboard data to temp file failed." msgstr "Błąd zapisu zawartości schowka do pliku tymczasowego." -#: SourceData.cpp:154 +#: SourceData.cpp:157 #, kde-format msgid "From Clipboard" msgstr "ze schowka" -#: SourceData.cpp:335 +#: SourceData.cpp:348 #, kde-format msgid "%1 is not a normal file." msgstr "%1 nie jest zwyczajnym plikiem." -#: SourceData.cpp:427 +#: SourceData.cpp:440 #, kde-format msgid " Temp file is: %1" msgstr " Plik tymczasowy to: %1" -#: SourceData.cpp:432 +#: SourceData.cpp:445 #, kde-format msgid "" "Preprocessing possibly failed. Check this command:\n" @@ -3491,12 +3494,12 @@ "\n" "Polecenie przetwarzania wstępnego zostanie wyłączone." -#: SourceData.cpp:443 SourceData.cpp:512 +#: SourceData.cpp:456 SourceData.cpp:525 #, kde-format msgid "File %1 too large to process. Skipping." msgstr "Plik %1 jest zbyt duży do przetworzenia. Pominięto go." -#: SourceData.cpp:487 +#: SourceData.cpp:500 #, kde-format msgid "" "The line-matching-preprocessing possibly failed. Check this command:\n" diff -Nru kdiff3-1.8.01/po/pt/diff_ext.po kdiff3-1.8.3/po/pt/diff_ext.po --- kdiff3-1.8.01/po/pt/diff_ext.po 2019-05-18 01:02:19.000000000 +0000 +++ kdiff3-1.8.3/po/pt/diff_ext.po 2020-06-25 00:18:45.000000000 +0000 @@ -6,135 +6,130 @@ msgid "" msgstr "" "Project-Id-Version: diff_ext\n" -"Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2019-03-22 03:09+0100\n" +"Report-Msgid-Bugs-To: https://bugs.kde.org\n" +"POT-Creation-Date: 2019-11-04 07:54+0100\n" "PO-Revision-Date: 2018-08-06 11:25+0100\n" "Last-Translator: José Nuno Coelho Pires \n" "Language-Team: Portuguese \n" -"Language: \n" +"Language: pt\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "X-POFile-SpellExtra: Zorin Joachim Sergey Ext Eibl Diff KDiff\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -#: diff_ext.cpp:391 +#: diff_ext.cpp:223 #, kde-format msgid "Compare with %1" msgstr "Comparar com %1" -#: diff_ext.cpp:392 +#: diff_ext.cpp:224 #, kde-format msgid "Merge with %1" msgstr "Reunir com %1" -#: diff_ext.cpp:408 +#: diff_ext.cpp:234 #, kde-format msgid "3-way merge with base" msgstr "Reunião a 3-níveis com a base" -#: diff_ext.cpp:411 +#: diff_ext.cpp:237 #, kde-format msgid "Save '%1' for later" msgstr "Gravar '%1' para a posteridade" -#: diff_ext.cpp:426 +#: diff_ext.cpp:251 #, kde-format msgid "Compare with ..." msgstr "Comparar com ..." -#: diff_ext.cpp:429 +#: diff_ext.cpp:254 #, kde-format msgid "Clear list" msgstr "Limpar a lista" -#: diff_ext.cpp:434 +#: diff_ext.cpp:259 #, kde-format msgid "Compare" msgstr "Comparar" -#: diff_ext.cpp:438 +#: diff_ext.cpp:263 #, kde-format msgid "3 way comparison" msgstr "Comparação a 3 níveis" -#: diff_ext.cpp:444 +#: diff_ext.cpp:269 #, kde-format msgid "About Diff-Ext ..." msgstr "Acerca do Diff-Ext ..." -#: diff_ext.cpp:515 +#: diff_ext.cpp:340 #, kde-format msgid "(32 Bit)" msgstr "(32 Bits)" -#: diff_ext.cpp:517 -#, kde-format -msgid "(64 Bit)" -msgstr "(64 Bits)" - -#: diff_ext.cpp:518 +#: diff_ext.cpp:342 #, kde-format msgid "Diff-Ext Copyright (c) 2003-2006, Sergey Zorin. All rights reserved.\n" msgstr "" "Diff-Ext Copyright (c) 2003-2006, Sergey Zorin. Todos os direitos " "reservados.\n" -#: diff_ext.cpp:519 +#: diff_ext.cpp:343 #, kde-format msgid "This software is distributable under the BSD-2-Clause license.\n" msgstr "" "Este 'software' pode ser distribuído de acordo com a licença BSD de 2-" "Cláusulas.\n" -#: diff_ext.cpp:520 +#: diff_ext.cpp:344 #, kde-format msgid "Some extensions for KDiff3 (c) 2006-2013 by Joachim Eibl.\n" msgstr "Algumas extensões para o KDiff3 (c) 2006-2013 de Joachim Eibl.\n" -#: diff_ext.cpp:521 +#: diff_ext.cpp:345 #, kde-format msgid "Homepage for Diff-Ext: http://diff-ext.sourceforge.net\n" msgstr "Página Web do Diff-Ext: http://diff-ext.sourceforge.net\n" -#: diff_ext.cpp:522 +#: diff_ext.cpp:346 #, kde-format msgid "About Diff-Ext for KDiff3 " msgstr "Acerca da Diff-Ext para o KDiff3 " -#: diff_ext.cpp:551 +#: diff_ext.cpp:375 #, kde-format msgid "Compare selected files" msgstr "Comparar os ficheiros seleccionados" -#: diff_ext.cpp:557 diff_ext.cpp:577 +#: diff_ext.cpp:381 diff_ext.cpp:399 #, kde-format msgid "Compare '%1' with '%2'" msgstr "Comparar o '%1' com o '%2'" -#: diff_ext.cpp:563 +#: diff_ext.cpp:386 #, kde-format msgid "Save '%1' for later operation" msgstr "Gravar o '%1' para a posteridade" -#: diff_ext.cpp:619 +#: diff_ext.cpp:440 #, kde-format msgid "Could not start KDiff3. Please rerun KDiff3 installation." msgstr "" "Não foi possível iniciar o KDiff3. Execute por favor a instalação do KDiff3 " "de novo." -#: diff_ext.cpp:620 +#: diff_ext.cpp:441 #, kde-format msgid "Command" msgstr "Comando" -#: diff_ext.cpp:621 +#: diff_ext.cpp:442 #, kde-format msgid "CommandLine" msgstr "Linha de Comandos" -#: diff_ext.cpp:622 +#: diff_ext.cpp:443 #, kde-format msgid "Diff-Ext For KDiff3" msgstr "Diff-Ext para o KDiff3" \ No newline at end of file diff -Nru kdiff3-1.8.01/po/pt/kdiff3fileitemactionplugin.po kdiff3-1.8.3/po/pt/kdiff3fileitemactionplugin.po --- kdiff3-1.8.01/po/pt/kdiff3fileitemactionplugin.po 2019-05-18 01:02:19.000000000 +0000 +++ kdiff3-1.8.3/po/pt/kdiff3fileitemactionplugin.po 2020-06-25 00:18:45.000000000 +0000 @@ -1,8 +1,8 @@ msgid "" msgstr "" "Project-Id-Version: kdiff3fileitemactionplugin\n" -"Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2019-03-22 03:09+0100\n" +"Report-Msgid-Bugs-To: https://bugs.kde.org\n" +"POT-Creation-Date: 2019-08-30 07:40+0200\n" "PO-Revision-Date: 2018-06-10 18:56+0100\n" "Last-Translator: José Nuno Coelho Pires \n" "Language-Team: Portuguese \n" diff -Nru kdiff3-1.8.01/po/pt/kdiff3.po kdiff3-1.8.3/po/pt/kdiff3.po --- kdiff3-1.8.01/po/pt/kdiff3.po 2019-05-18 01:02:19.000000000 +0000 +++ kdiff3-1.8.3/po/pt/kdiff3.po 2020-06-25 00:18:45.000000000 +0000 @@ -1,9 +1,9 @@ msgid "" msgstr "" "Project-Id-Version: kdiff3\n" -"Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2019-04-18 08:02+0200\n" -"PO-Revision-Date: 2019-01-26 15:29+0000\n" +"Report-Msgid-Bugs-To: https://bugs.kde.org\n" +"POT-Creation-Date: 2020-06-22 07:48+0200\n" +"PO-Revision-Date: 2020-02-10 13:11+0000\n" "Last-Translator: Pedro Morais \n" "Language-Team: pt \n" "Language: pt\n" @@ -41,285 +41,285 @@ msgid "Your emails" msgstr "zepires@gmail.com" -#: difftextwindow.cpp:412 +#: difftextwindow.cpp:414 #, kde-format msgid "File %1: Line %2" msgstr "Ficheiro %1: Linha %2" -#: difftextwindow.cpp:414 +#: difftextwindow.cpp:416 #, kde-format msgid "File %1: Line not available" msgstr "Ficheiro %1: Linha não disponível" -#: difftextwindow.cpp:1780 +#: difftextwindow.cpp:1778 #, kde-format msgid "Encoding:" msgstr "Codificação:" -#: difftextwindow.cpp:1782 mergeresultwindow.cpp:3138 optiondialog.cpp:818 +#: difftextwindow.cpp:1781 mergeresultwindow.cpp:3166 optiondialog.cpp:840 #, kde-format msgid "Line end style:" msgstr "Estilo de fim de linha:" -#: difftextwindow.cpp:1810 directorymergewindow.cpp:382 -#: directorymergewindow.cpp:433 directorymergewindow.cpp:524 -#: directorymergewindow.cpp:3058 directorymergewindow.cpp:3189 -#: directorymergewindow.cpp:3417 mergeresultwindow.cpp:942 -#: mergeresultwindow.cpp:944 mergeresultwindow.cpp:946 -#: mergeresultwindow.cpp:948 mergeresultwindow.cpp:1814 -#: mergeresultwindow.cpp:3170 mergeresultwindow.cpp:3177 optiondialog.cpp:962 -#: optiondialog.cpp:975 pdiff.cpp:833 pdiff.cpp:835 pdiff.cpp:837 pdiff.cpp:839 -#: pdiff.cpp:861 smalldialogs.cpp:124 smalldialogs.cpp:126 smalldialogs.cpp:127 -#: smalldialogs.cpp:130 +#: difftextwindow.cpp:1809 directorymergewindow.cpp:383 +#: directorymergewindow.cpp:434 directorymergewindow.cpp:525 +#: directorymergewindow.cpp:3072 directorymergewindow.cpp:3203 +#: directorymergewindow.cpp:3431 mergeresultwindow.cpp:970 +#: mergeresultwindow.cpp:972 mergeresultwindow.cpp:974 +#: mergeresultwindow.cpp:976 mergeresultwindow.cpp:1842 +#: mergeresultwindow.cpp:3198 mergeresultwindow.cpp:3205 optiondialog.cpp:1002 +#: optiondialog.cpp:1015 pdiff.cpp:823 pdiff.cpp:825 pdiff.cpp:827 +#: pdiff.cpp:829 pdiff.cpp:851 smalldialogs.cpp:131 smalldialogs.cpp:133 +#: smalldialogs.cpp:134 smalldialogs.cpp:137 #, kde-format msgid "A" msgstr "A" -#: difftextwindow.cpp:1810 directorymergewindow.cpp:384 -#: directorymergewindow.cpp:436 directorymergewindow.cpp:526 -#: directorymergewindow.cpp:3064 directorymergewindow.cpp:3190 -#: directorymergewindow.cpp:3418 mergeresultwindow.cpp:942 -#: mergeresultwindow.cpp:944 mergeresultwindow.cpp:950 -#: mergeresultwindow.cpp:952 mergeresultwindow.cpp:1816 -#: mergeresultwindow.cpp:3172 mergeresultwindow.cpp:3179 optiondialog.cpp:963 -#: optiondialog.cpp:976 pdiff.cpp:833 pdiff.cpp:835 pdiff.cpp:841 pdiff.cpp:843 -#: pdiff.cpp:863 smalldialogs.cpp:124 smalldialogs.cpp:125 smalldialogs.cpp:128 -#: smalldialogs.cpp:131 +#: difftextwindow.cpp:1809 directorymergewindow.cpp:385 +#: directorymergewindow.cpp:437 directorymergewindow.cpp:527 +#: directorymergewindow.cpp:3078 directorymergewindow.cpp:3204 +#: directorymergewindow.cpp:3432 mergeresultwindow.cpp:970 +#: mergeresultwindow.cpp:972 mergeresultwindow.cpp:978 +#: mergeresultwindow.cpp:980 mergeresultwindow.cpp:1844 +#: mergeresultwindow.cpp:3200 mergeresultwindow.cpp:3207 optiondialog.cpp:1003 +#: optiondialog.cpp:1016 pdiff.cpp:823 pdiff.cpp:825 pdiff.cpp:831 +#: pdiff.cpp:833 pdiff.cpp:853 smalldialogs.cpp:131 smalldialogs.cpp:132 +#: smalldialogs.cpp:135 smalldialogs.cpp:138 #, kde-format msgid "B" msgstr "B" -#: difftextwindow.cpp:1810 directorymergewindow.cpp:386 -#: directorymergewindow.cpp:439 directorymergewindow.cpp:528 -#: directorymergewindow.cpp:3070 directorymergewindow.cpp:3191 -#: directorymergewindow.cpp:3419 mergeresultwindow.cpp:946 -#: mergeresultwindow.cpp:948 mergeresultwindow.cpp:950 -#: mergeresultwindow.cpp:952 mergeresultwindow.cpp:1818 -#: mergeresultwindow.cpp:3174 mergeresultwindow.cpp:3181 optiondialog.cpp:977 -#: pdiff.cpp:837 pdiff.cpp:839 pdiff.cpp:841 pdiff.cpp:843 pdiff.cpp:865 -#: smalldialogs.cpp:125 smalldialogs.cpp:126 smalldialogs.cpp:129 -#: smalldialogs.cpp:132 +#: difftextwindow.cpp:1809 directorymergewindow.cpp:387 +#: directorymergewindow.cpp:440 directorymergewindow.cpp:529 +#: directorymergewindow.cpp:3084 directorymergewindow.cpp:3205 +#: directorymergewindow.cpp:3433 mergeresultwindow.cpp:974 +#: mergeresultwindow.cpp:976 mergeresultwindow.cpp:978 +#: mergeresultwindow.cpp:980 mergeresultwindow.cpp:1846 +#: mergeresultwindow.cpp:3202 mergeresultwindow.cpp:3209 optiondialog.cpp:1017 +#: pdiff.cpp:827 pdiff.cpp:829 pdiff.cpp:831 pdiff.cpp:833 pdiff.cpp:855 +#: smalldialogs.cpp:132 smalldialogs.cpp:133 smalldialogs.cpp:136 +#: smalldialogs.cpp:139 #, kde-format msgid "C" msgstr "C" -#: difftextwindow.cpp:1810 +#: difftextwindow.cpp:1809 #, kde-format msgid "A (Base)" msgstr "A (Base)" -#: difftextwindow.cpp:1812 +#: difftextwindow.cpp:1811 #, kde-format msgid "Encoding: %1" msgstr "Codificação: %1" -#: difftextwindow.cpp:1813 mergeresultwindow.cpp:3183 +#: difftextwindow.cpp:1812 mergeresultwindow.cpp:3211 #, kde-format msgid "Unix" msgstr "Unix" -#: difftextwindow.cpp:1813 mergeresultwindow.cpp:3184 +#: difftextwindow.cpp:1812 mergeresultwindow.cpp:3212 #, kde-format msgid "DOS" msgstr "DOS" -#: difftextwindow.cpp:1813 +#: difftextwindow.cpp:1812 #, kde-format msgid "Line end style: %1" msgstr "Estilo de fim de linha: %1" -#: difftextwindow.cpp:1835 kdiff3.cpp:873 +#: difftextwindow.cpp:1834 kdiff3.cpp:874 #, kde-format msgid "Top line" msgstr "Linha de topo" -#: difftextwindow.cpp:1845 +#: difftextwindow.cpp:1843 #, kde-format msgid "End" msgstr "Fim" -#: difftextwindow.cpp:1903 smalldialogs.cpp:235 +#: difftextwindow.cpp:1901 smalldialogs.cpp:245 #, kde-format msgid "Open File" msgstr "Abrir um Ficheiro" -#: difftextwindow.cpp:1951 optiondialog.cpp:387 +#: difftextwindow.cpp:1943 optiondialog.cpp:389 #, kde-format msgid "Unicode, 8 bit" msgstr "Unicode, 8 bit" -#: difftextwindow.cpp:1966 +#: difftextwindow.cpp:1958 #, kde-format msgid "Other" msgstr "Outro" -#: directorymergewindow.cpp:409 directorymergewindow.cpp:3424 +#: directorymergewindow.cpp:410 directorymergewindow.cpp:3438 #, kde-format msgid "Copy A to B" msgstr "Copiar A para B" -#: directorymergewindow.cpp:412 directorymergewindow.cpp:3425 +#: directorymergewindow.cpp:413 directorymergewindow.cpp:3439 #, kde-format msgid "Copy B to A" msgstr "Copiar B para A" -#: directorymergewindow.cpp:415 directorymergewindow.cpp:3426 +#: directorymergewindow.cpp:416 directorymergewindow.cpp:3440 #, kde-format msgid "Delete A" msgstr "Apagar A" -#: directorymergewindow.cpp:418 directorymergewindow.cpp:3427 +#: directorymergewindow.cpp:419 directorymergewindow.cpp:3441 #, kde-format msgid "Delete B" msgstr "Apagar B" -#: directorymergewindow.cpp:421 +#: directorymergewindow.cpp:422 #, kde-format msgid "Delete A & B" msgstr "Apagar A e B" -#: directorymergewindow.cpp:424 directorymergewindow.cpp:3429 +#: directorymergewindow.cpp:425 directorymergewindow.cpp:3443 #, kde-format msgid "Merge to A" msgstr "Juntar a A" -#: directorymergewindow.cpp:427 directorymergewindow.cpp:3430 +#: directorymergewindow.cpp:428 directorymergewindow.cpp:3444 #, kde-format msgid "Merge to B" msgstr "Juntar a B" -#: directorymergewindow.cpp:430 +#: directorymergewindow.cpp:431 #, kde-format msgid "Merge to A & B" msgstr "Juntar a A e B" -#: directorymergewindow.cpp:442 directorymergewindow.cpp:3421 +#: directorymergewindow.cpp:443 directorymergewindow.cpp:3435 #, kde-format msgid "Delete (if exists)" msgstr "Apagar (se existir)" -#: directorymergewindow.cpp:445 directorymergewindow.cpp:448 -#: directorymergewindow.cpp:3420 optiondialog.cpp:925 smalldialogs.cpp:113 +#: directorymergewindow.cpp:446 directorymergewindow.cpp:449 +#: directorymergewindow.cpp:3434 smalldialogs.cpp:120 #, kde-format msgid "Merge" msgstr "Reunir" -#: directorymergewindow.cpp:445 directorymergewindow.cpp:448 +#: directorymergewindow.cpp:446 directorymergewindow.cpp:449 #, kde-format msgid "Merge (manual)" msgstr "Juntar (manual)" -#: directorymergewindow.cpp:451 +#: directorymergewindow.cpp:452 #, kde-format msgid "Error: Conflicting File Types" msgstr "Erro: Tipos de Ficheiros em Conflito" -#: directorymergewindow.cpp:454 +#: directorymergewindow.cpp:455 #, kde-format msgid "Error: Changed and Deleted" msgstr "Erro: Alterado e Apagado" -#: directorymergewindow.cpp:457 +#: directorymergewindow.cpp:458 #, kde-format msgid "Error: Dates are equal but files are not." msgstr "Erro: As datas são iguais mas os ficheiros não." -#: directorymergewindow.cpp:471 +#: directorymergewindow.cpp:472 #, kde-format msgid "Done" msgstr "Concluído" -#: directorymergewindow.cpp:473 +#: directorymergewindow.cpp:474 #, kde-format msgid "Error" msgstr "Erro" -#: directorymergewindow.cpp:475 +#: directorymergewindow.cpp:476 #, kde-format msgid "Skipped." msgstr "Ignorado." -#: directorymergewindow.cpp:477 +#: directorymergewindow.cpp:478 #, kde-format msgid "Not saved." msgstr "Não gravado." -#: directorymergewindow.cpp:479 +#: directorymergewindow.cpp:480 #, kde-format msgid "In progress..." msgstr "Em progresso..." -#: directorymergewindow.cpp:481 +#: directorymergewindow.cpp:482 #, kde-format msgid "To do." msgstr "A fazer." -#: directorymergewindow.cpp:522 +#: directorymergewindow.cpp:523 #, kde-format msgid "Name" msgstr "Nome" -#: directorymergewindow.cpp:530 +#: directorymergewindow.cpp:531 #, kde-format msgid "Operation" msgstr "Operação" -#: directorymergewindow.cpp:532 +#: directorymergewindow.cpp:533 #, kde-format msgid "Status" msgstr "Estado" -#: directorymergewindow.cpp:534 +#: directorymergewindow.cpp:535 #, kde-format msgid "Unsolved" msgstr "Não resolvido" -#: directorymergewindow.cpp:536 +#: directorymergewindow.cpp:537 #, kde-format msgid "Solved" msgstr "Resolvido" -#: directorymergewindow.cpp:538 +#: directorymergewindow.cpp:539 #, kde-format msgid "Nonwhite" msgstr "Não vazio" -#: directorymergewindow.cpp:540 +#: directorymergewindow.cpp:541 #, kde-format msgid "White" msgstr "Vazio" -#: directorymergewindow.cpp:674 +#: directorymergewindow.cpp:676 #, kde-format msgid "Unable to compare non-normal file with normal file." msgstr "Não é possível comparar um ficheiro não-normal com um normal." -#: directorymergewindow.cpp:688 +#: directorymergewindow.cpp:690 #, kde-format msgid "Mix of links and normal files." msgstr "Mistura de ligações e ficheiros normais." -#: directorymergewindow.cpp:695 +#: directorymergewindow.cpp:697 #, kde-format msgid "Link: " msgstr "Ligação: " -#: directorymergewindow.cpp:704 +#: directorymergewindow.cpp:706 #, kde-format msgid "Size. " msgstr "Tamanho. " -#: directorymergewindow.cpp:718 directorymergewindow.cpp:728 +#: directorymergewindow.cpp:720 directorymergewindow.cpp:730 #, kde-format msgid "Date & Size: " msgstr "Data e Tamanho: " -#: directorymergewindow.cpp:748 +#: directorymergewindow.cpp:751 #, kde-format msgid "Comparing file..." msgstr "A comparar o ficheiro..." -#: directorymergewindow.cpp:801 +#: directorymergewindow.cpp:813 #, kde-format msgid "" "You are currently doing a directory merge. Are you sure, you want to abort " @@ -328,48 +328,48 @@ "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:802 kdiff3.cpp:698 kdiff3.cpp:708 kdiff3.cpp:720 -#: mergeresultwindow.cpp:372 pdiff.cpp:1033 pdiff.cpp:1910 pdiff.cpp:1920 +#: directorymergewindow.cpp:814 kdiff3.cpp:697 kdiff3.cpp:707 kdiff3.cpp:719 +#: mergeresultwindow.cpp:400 pdiff.cpp:1031 pdiff.cpp:1920 pdiff.cpp:1930 #, kde-format msgid "Warning" msgstr "Aviso" -#: directorymergewindow.cpp:803 directorymergewindow.cpp:3393 +#: directorymergewindow.cpp:815 directorymergewindow.cpp:3407 #, kde-format msgid "Rescan" msgstr "Pesquisar de Novo" -#: directorymergewindow.cpp:804 pdiff.cpp:1035 +#: directorymergewindow.cpp:816 pdiff.cpp:1033 #, kde-format msgid "Continue Merging" msgstr "Continuar a Junção" -#: directorymergewindow.cpp:971 +#: directorymergewindow.cpp:984 #, kde-format msgid "Opening of directories failed:" msgstr "O acesso às pastas foi mal-sucedido:" -#: directorymergewindow.cpp:975 +#: directorymergewindow.cpp:988 #, 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:980 +#: directorymergewindow.cpp:993 #, 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:985 +#: directorymergewindow.cpp:998 #, 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:988 +#: directorymergewindow.cpp:1001 #, kde-format msgid "Directory Open Error" msgstr "Erro de Acesso à Pasta" -#: directorymergewindow.cpp:996 +#: directorymergewindow.cpp:1009 #, kde-format msgid "" "The destination directory must not be the same as A or B when three " @@ -380,49 +380,49 @@ "três pastas.\n" "Verifique de novo antes de continuar." -#: directorymergewindow.cpp:998 +#: directorymergewindow.cpp:1011 #, kde-format msgid "Parameter Warning" msgstr "Aviso do Parâmetro" -#: directorymergewindow.cpp:1003 +#: directorymergewindow.cpp:1016 #, kde-format msgid "Scanning directories..." msgstr "A pesquisar as pastas..." -#: directorymergewindow.cpp:1029 +#: directorymergewindow.cpp:1042 #, kde-format msgid "Reading Directory A" msgstr "A Ler a Pasta A" -#: directorymergewindow.cpp:1038 +#: directorymergewindow.cpp:1051 #, kde-format msgid "Reading Directory B" msgstr "A Ler a Pasta B" -#: directorymergewindow.cpp:1048 +#: directorymergewindow.cpp:1061 #, kde-format msgid "Reading Directory C" msgstr "A Ler a Pasta C" -#: directorymergewindow.cpp:1064 +#: directorymergewindow.cpp:1077 #, kde-format msgid "Some subdirectories were not readable in" msgstr "Algumas das sub-pastas não eram legíveis" -#: directorymergewindow.cpp:1069 +#: directorymergewindow.cpp:1082 #, kde-format msgid "Check the permissions of the subdirectories." msgstr "Verifique as permissões das sub-pastas." -#: directorymergewindow.cpp:1106 kdiff3.cpp:666 kdiff3.cpp:753 kdiff3.cpp:777 -#: kdiff3.cpp:1065 kdiff3.cpp:1086 pdiff.cpp:1116 pdiff.cpp:1170 pdiff.cpp:1218 -#: pdiff.cpp:1234 pdiff.cpp:1277 pdiff.cpp:1301 +#: directorymergewindow.cpp:1119 kdiff3.cpp:665 kdiff3.cpp:752 kdiff3.cpp:776 +#: kdiff3.cpp:1072 kdiff3.cpp:1093 pdiff.cpp:1115 pdiff.cpp:1178 pdiff.cpp:1228 +#: pdiff.cpp:1244 pdiff.cpp:1287 pdiff.cpp:1311 #, kde-format msgid "Ready." msgstr "Pronto." -#: directorymergewindow.cpp:1121 +#: directorymergewindow.cpp:1134 #, kde-format msgid "" "Directory Comparison Status\n" @@ -437,22 +437,22 @@ "Número de ficheiros iguais: %2\n" "Número de ficheiros diferentes: %3" -#: directorymergewindow.cpp:1128 +#: directorymergewindow.cpp:1141 #, kde-format msgid "Number of manual merges: %1" msgstr "Número de junções manuais: %1" -#: directorymergewindow.cpp:1394 +#: directorymergewindow.cpp:1407 #, kde-format msgid "This affects all merge operations." msgstr "Isto afecta todas as operações de junção." -#: directorymergewindow.cpp:1395 +#: directorymergewindow.cpp:1408 #, kde-format msgid "Changing All Merge Operations" msgstr "A Mudar Todas as Operações de Junção" -#: directorymergewindow.cpp:1695 +#: directorymergewindow.cpp:1708 #, kde-format msgid "" "Processing %1 / %2\n" @@ -461,44 +461,44 @@ "A processar o %1 / %2\n" "%3" -#: directorymergewindow.cpp:1738 directorymergewindow.cpp:1742 +#: directorymergewindow.cpp:1751 directorymergewindow.cpp:1755 #, kde-format msgid "Some files could not be processed." msgstr "Não foi possível processar alguns ficheiros." -#: directorymergewindow.cpp:2222 directorymergewindow.cpp:2247 -#: directorymergewindow.cpp:2271 +#: directorymergewindow.cpp:2235 directorymergewindow.cpp:2260 +#: directorymergewindow.cpp:2285 #, kde-format msgid "This operation is currently not possible." msgstr "Esta operação não é possível de momento." -#: directorymergewindow.cpp:2222 directorymergewindow.cpp:2247 -#: directorymergewindow.cpp:2271 directorymergewindow.cpp:2552 +#: directorymergewindow.cpp:2235 directorymergewindow.cpp:2260 +#: directorymergewindow.cpp:2285 directorymergewindow.cpp:2565 #, kde-format msgid "Operation Not Possible" msgstr "Operação Não Possível" -#: directorymergewindow.cpp:2318 +#: directorymergewindow.cpp:2332 #, kde-format msgid "An error occurred while copying." msgstr "Ocorreu um erro ao copiar." -#: directorymergewindow.cpp:2319 directorymergewindow.cpp:2759 +#: directorymergewindow.cpp:2333 directorymergewindow.cpp:2772 #, kde-format msgid "Merge Error" msgstr "Erro na Junção" -#: directorymergewindow.cpp:2396 +#: directorymergewindow.cpp:2410 #, kde-format msgid "Unknown merge operation. (This must never happen!)" msgstr "Operação de junção desconhecida. (Isto nunca deve acontecer!)" -#: directorymergewindow.cpp:2441 +#: directorymergewindow.cpp:2455 #, kde-format msgid "Unknown merge operation." msgstr "Operação de junção desconhecida." -#: directorymergewindow.cpp:2454 +#: directorymergewindow.cpp:2468 #, kde-format msgid "" "The merge is about to begin.\n" @@ -518,22 +518,22 @@ "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:2459 +#: directorymergewindow.cpp:2473 #, kde-format msgid "Starting Merge" msgstr "A Iniciar a Junção" -#: directorymergewindow.cpp:2460 +#: directorymergewindow.cpp:2474 #, kde-format msgid "Do It" msgstr "Fazê-lo" -#: directorymergewindow.cpp:2461 +#: directorymergewindow.cpp:2475 #, kde-format msgid "Simulate It" msgstr "Simulá-lo" -#: directorymergewindow.cpp:2487 +#: directorymergewindow.cpp:2501 #, kde-format msgid "" "The highlighted item has a different type in the different directories. " @@ -542,7 +542,7 @@ "O item realçado tem um tipo diferente nas várias pastas. Seleccione o que " "fazer." -#: directorymergewindow.cpp:2491 +#: directorymergewindow.cpp:2505 #, kde-format msgid "" "The modification dates of the file are equal but the files are not. Select " @@ -551,7 +551,7 @@ "As datas de modificação dos ficheiros são iguais mas estes não o são. " "Seleccione o que fazer." -#: directorymergewindow.cpp:2495 +#: directorymergewindow.cpp:2509 #, kde-format msgid "" "The highlighted item was changed in one directory and deleted in the other. " @@ -560,7 +560,7 @@ "O item realçado foi alterado numa pasta e modificado na outra. Seleccione o " "que fazer." -#: directorymergewindow.cpp:2552 +#: directorymergewindow.cpp:2565 #, kde-format msgid "" "This operation is currently not possible because directory merge is " @@ -569,7 +569,7 @@ "Esta operação não é possível de momento que a junção da pasta está a " "decorrer." -#: directorymergewindow.cpp:2609 +#: directorymergewindow.cpp:2622 #, kde-format msgid "" "There was an error in the last step.\n" @@ -579,32 +579,32 @@ "Ocorreu um erro no último passo.\n" "Deseja continuar com o item que causou o erro ou deseja saltar este item?" -#: directorymergewindow.cpp:2611 +#: directorymergewindow.cpp:2624 #, kde-format msgid "Continue merge after an error" msgstr "Continuar a junção após um erro" -#: directorymergewindow.cpp:2612 +#: directorymergewindow.cpp:2625 #, kde-format msgid "Continue With Last Item" msgstr "Continuar com o Último Item" -#: directorymergewindow.cpp:2613 +#: directorymergewindow.cpp:2626 #, kde-format msgid "Skip Item" msgstr "Saltar o Item" -#: directorymergewindow.cpp:2709 +#: directorymergewindow.cpp:2722 #, kde-format msgid "Merge operation complete." msgstr "A operação de junção terminou." -#: directorymergewindow.cpp:2709 directorymergewindow.cpp:2712 +#: directorymergewindow.cpp:2722 directorymergewindow.cpp:2725 #, kde-format msgid "Merge Complete" msgstr "Junção Completa" -#: directorymergewindow.cpp:2722 +#: directorymergewindow.cpp:2735 #, kde-format msgid "" "Simulated merge complete: Check if you agree with the proposed operations." @@ -612,229 +612,229 @@ "A simulação da junção terminou: Verifique se concorda com as operações " "propostas." -#: directorymergewindow.cpp:2758 +#: directorymergewindow.cpp:2771 #, kde-format msgid "An error occurred. Press OK to see detailed information." msgstr "Ocorreu um erro. Carregue em OK para ver a informação detalhada." -#: directorymergewindow.cpp:2791 +#: directorymergewindow.cpp:2804 #, 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:2798 +#: directorymergewindow.cpp:2811 #, kde-format msgid "delete directory recursively( %1 )" msgstr "apagar recursivamente as pastas( %1 )" -#: directorymergewindow.cpp:2800 +#: directorymergewindow.cpp:2813 #, kde-format msgid "delete( %1 )" msgstr "delete( %1 )" -#: directorymergewindow.cpp:2815 +#: directorymergewindow.cpp:2828 #, kde-format 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:2834 +#: directorymergewindow.cpp:2847 #, kde-format msgid "Error: rmdir( %1 ) operation failed." msgstr "Erro: a operação rmdir( %1 ) falhou." -#: directorymergewindow.cpp:2844 +#: directorymergewindow.cpp:2857 #, kde-format msgid "Error: delete operation failed." msgstr "Erro: a operação de remoção falhou." -#: directorymergewindow.cpp:2870 +#: directorymergewindow.cpp:2884 #, kde-format msgid "manual merge( %1, %2, %3 -> %4)" msgstr "junção manual( %1, %2, %3 -> %4)" -#: directorymergewindow.cpp:2873 +#: directorymergewindow.cpp:2887 #, kde-format 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:2900 +#: directorymergewindow.cpp:2914 #, 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:2909 +#: directorymergewindow.cpp:2923 #, kde-format msgid "copyLink( %1 -> %2 )" msgstr "copyLink( %1 -> %2 )" -#: directorymergewindow.cpp:2918 +#: directorymergewindow.cpp:2932 #, kde-format 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:2928 +#: directorymergewindow.cpp:2942 #, kde-format msgid "Error: copyLink failed." msgstr "Erro: o copyLink falhou." -#: directorymergewindow.cpp:2953 +#: directorymergewindow.cpp:2967 #, kde-format msgid "copy( %1 -> %2 )" msgstr "cópia( %1 -> %2 )" -#: directorymergewindow.cpp:2979 +#: directorymergewindow.cpp:2993 #, 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:2986 +#: directorymergewindow.cpp:3000 #, kde-format msgid "rename( %1 -> %2 )" msgstr "rename( %1 -> %2 )" -#: directorymergewindow.cpp:2995 +#: directorymergewindow.cpp:3009 #, kde-format msgid "Error: Rename failed." msgstr "Erro: A mudança de nome falhou." -#: directorymergewindow.cpp:3013 +#: directorymergewindow.cpp:3027 #, 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:3030 +#: directorymergewindow.cpp:3044 #, kde-format msgid "makeDir( %1 )" msgstr "makeDir( %1 )" -#: directorymergewindow.cpp:3040 +#: directorymergewindow.cpp:3054 #, kde-format msgid "Error while creating directory." msgstr "Erro ao criar a pasta." -#: directorymergewindow.cpp:3076 directorymergewindow.cpp:3195 +#: directorymergewindow.cpp:3090 directorymergewindow.cpp:3209 #, kde-format msgid "Dest" msgstr "Dest" -#: directorymergewindow.cpp:3084 directorymergewindow.cpp:3113 +#: directorymergewindow.cpp:3098 directorymergewindow.cpp:3127 #, kde-format msgid "Dir" msgstr "Dir" -#: directorymergewindow.cpp:3084 +#: directorymergewindow.cpp:3098 #, kde-format msgid "Type" msgstr "Tipo" -#: directorymergewindow.cpp:3084 +#: directorymergewindow.cpp:3098 #, kde-format msgid "Size" msgstr "Tamanho" -#: directorymergewindow.cpp:3085 +#: directorymergewindow.cpp:3099 #, kde-format msgid "Attr" msgstr "Atrib" -#: directorymergewindow.cpp:3085 +#: directorymergewindow.cpp:3099 #, kde-format msgid "Last Modification" msgstr "Última Modificação" -#: directorymergewindow.cpp:3085 +#: directorymergewindow.cpp:3099 #, kde-format msgid "Link-Destination" msgstr "Ligação-Destino" -#: directorymergewindow.cpp:3113 +#: directorymergewindow.cpp:3127 #, kde-format msgid "File" msgstr "Ficheiro" -#: directorymergewindow.cpp:3113 +#: directorymergewindow.cpp:3127 #, kde-format msgid "-Link" msgstr "-Ligação" -#: directorymergewindow.cpp:3119 +#: directorymergewindow.cpp:3133 #, kde-format msgid "not available" msgstr "não disponível" -#: directorymergewindow.cpp:3137 +#: directorymergewindow.cpp:3151 #, kde-format msgid "A (Dest): " msgstr "A (Dest): " -#: directorymergewindow.cpp:3141 +#: directorymergewindow.cpp:3155 #, kde-format msgid "A: " msgstr "A: " -#: directorymergewindow.cpp:3141 +#: directorymergewindow.cpp:3155 #, kde-format msgid "A (Base): " msgstr "A (Base): " -#: directorymergewindow.cpp:3147 +#: directorymergewindow.cpp:3161 #, kde-format msgid "B (Dest): " msgstr "B (Dest): " -#: directorymergewindow.cpp:3151 +#: directorymergewindow.cpp:3165 #, kde-format msgid "B: " msgstr "B: " -#: directorymergewindow.cpp:3156 +#: directorymergewindow.cpp:3170 #, kde-format msgid "C (Dest): " msgstr "C (Dest): " -#: directorymergewindow.cpp:3160 +#: directorymergewindow.cpp:3174 #, kde-format msgid "C: " msgstr "C: " -#: directorymergewindow.cpp:3163 +#: directorymergewindow.cpp:3177 #, kde-format msgid "Dest: " msgstr "Dest: " #. i18n("Saving Directory Merge State ...")); -#: directorymergewindow.cpp:3238 +#: directorymergewindow.cpp:3252 #, kde-format msgid "Save Directory Merge State As..." msgstr "Gravar o Estado da Junção de Pastas Como..." -#: directorymergewindow.cpp:3387 +#: directorymergewindow.cpp:3401 #, kde-format msgid "Start/Continue Directory Merge" msgstr "Iniciar/Continuar a Junção da Pasta" -#: directorymergewindow.cpp:3388 +#: directorymergewindow.cpp:3402 #, kde-format msgid "Run Operation for Current Item" msgstr "Executar a Operação no Item Actual" -#: directorymergewindow.cpp:3389 +#: directorymergewindow.cpp:3403 #, kde-format msgid "Compare Selected File" msgstr "Comparar o Ficheiro Seleccionado" -#: directorymergewindow.cpp:3390 +#: directorymergewindow.cpp:3404 #, kde-format msgid "Merge Current File" msgstr "Juntar o Ficheiro Actual" -#: directorymergewindow.cpp:3390 +#: directorymergewindow.cpp:3404 #, kde-format msgid "" "Merge\n" @@ -843,51 +843,51 @@ "Reunir o\n" "Ficheiro" -#: directorymergewindow.cpp:3391 +#: directorymergewindow.cpp:3405 #, kde-format msgid "Fold All Subdirs" msgstr "Fechar Todas as Sub-Pasta" -#: directorymergewindow.cpp:3392 +#: directorymergewindow.cpp:3406 #, kde-format msgid "Unfold All Subdirs" msgstr "Expandir Todas as Sub-Pastas" #. i18n("Save Directory Merge State ..."), 0, this, &DirectoryMergeWindow::slotSaveMergeState, ac, "dir_save_merge_state"); #. i18n("Load Directory Merge State ..."), 0, this, &DirectoryMergeWindow::slotLoadMergeState, ac, "dir_load_merge_state"); -#: directorymergewindow.cpp:3396 +#: directorymergewindow.cpp:3410 #, kde-format msgid "Choose A for All Items" msgstr "Seleccionar Todos os Itens do A" -#: directorymergewindow.cpp:3397 +#: directorymergewindow.cpp:3411 #, kde-format msgid "Choose B for All Items" msgstr "Seleccionar Todos os Itens do B" -#: directorymergewindow.cpp:3398 +#: directorymergewindow.cpp:3412 #, kde-format msgid "Choose C for All Items" msgstr "Seleccionar Todos os Itens do C" -#: directorymergewindow.cpp:3399 +#: directorymergewindow.cpp:3413 #, kde-format msgid "Auto-Choose Operation for All Items" msgstr "Escolher Automaticamente a Operação para Todos os Itens" -#: directorymergewindow.cpp:3400 +#: directorymergewindow.cpp:3414 #, kde-format msgid "No Operation for All Items" msgstr "Nenhuma Operação para Todos os Itens" #. i18n("Synchronize Directories"), 0, this, &DirectoryMergeWindow::slotSynchronizeDirectories, ac, "dir_synchronize_directories"); #. d->m_pDirChooseNewerFiles = GuiUtils::createAction< KToggleAction >(i18n("Copy Newer Files Instead of Merging"), 0, this, &DirectoryMergeWindow::slotChooseNewerFiles, ac, "dir_choose_newer_files"); -#: directorymergewindow.cpp:3405 +#: directorymergewindow.cpp:3419 #, kde-format msgid "Show Identical Files" msgstr "Mostrar os Ficheiros Idênticos" -#: directorymergewindow.cpp:3405 +#: directorymergewindow.cpp:3419 #, kde-format msgid "" "Identical\n" @@ -896,17 +896,17 @@ "Ficheiros\n" "Idênticos" -#: directorymergewindow.cpp:3406 +#: directorymergewindow.cpp:3420 #, kde-format msgid "Show Different Files" msgstr "Mostrar os Ficheiros Diferentes" -#: directorymergewindow.cpp:3407 +#: directorymergewindow.cpp:3421 #, kde-format msgid "Show Files only in A" msgstr "Mostrar os Ficheiros Apenas no A" -#: directorymergewindow.cpp:3407 +#: directorymergewindow.cpp:3421 #, kde-format msgid "" "Files\n" @@ -915,12 +915,12 @@ "Ficheiros \n" "Apenas no A" -#: directorymergewindow.cpp:3408 +#: directorymergewindow.cpp:3422 #, kde-format msgid "Show Files only in B" msgstr "Mostrar os Ficheiros Apenas no B" -#: directorymergewindow.cpp:3408 +#: directorymergewindow.cpp:3422 #, kde-format msgid "" "Files\n" @@ -929,12 +929,12 @@ "Ficheiros\n" "Apenas no B" -#: directorymergewindow.cpp:3409 +#: directorymergewindow.cpp:3423 #, kde-format msgid "Show Files only in C" msgstr "Mostrar os Ficheiros Apenas no C" -#: directorymergewindow.cpp:3409 +#: directorymergewindow.cpp:3423 #, kde-format msgid "" "Files\n" @@ -943,52 +943,58 @@ "Ficheiros\n" "Apenas no C" -#: directorymergewindow.cpp:3413 +#: directorymergewindow.cpp:3427 #, kde-format msgid "Compare Explicitly Selected Files" msgstr "Comparar os Ficheiros Seleccionados Explicitamente" -#: directorymergewindow.cpp:3414 +#: directorymergewindow.cpp:3428 #, kde-format msgid "Merge Explicitly Selected Files" msgstr "Juntar os Ficheiros Seleccionados Explicitamente" -#: directorymergewindow.cpp:3416 directorymergewindow.cpp:3423 +#: directorymergewindow.cpp:3430 directorymergewindow.cpp:3437 #, kde-format msgid "Do Nothing" msgstr "Não Fazer Nada" -#: directorymergewindow.cpp:3428 +#: directorymergewindow.cpp:3442 #, kde-format msgid "Delete A && B" msgstr "Apagar A e B" -#: directorymergewindow.cpp:3431 +#: directorymergewindow.cpp:3445 #, kde-format msgid "Merge to A && B" msgstr "Juntar a A e B" -#: fileaccess.cpp:462 SourceData.cpp:493 +#: fileaccess.cpp:301 +#, kde-format +msgid "Unable to determine full url. No parent specified." +msgstr "" +"Não foi possível determinar o URL completo. Não foi indicado o URL-pai." + +#: fileaccess.cpp:482 SourceData.cpp:506 #, kde-format msgid "Failed to read file: %1" msgstr "Não foi possível ler o ficheiro: %1" -#: fileaccess.cpp:587 +#: fileaccess.cpp:624 #, kde-format msgid "Creating temp copy of %1 failed." msgstr "A criação da cópia temporária do %1 falhou." -#: fileaccess.cpp:595 fileaccess.cpp:600 +#: fileaccess.cpp:632 fileaccess.cpp:637 #, kde-format msgid "Opening %1 failed. %2" msgstr "O acesso ao %1 foi mal-sucedido. %2" -#: fileaccess.cpp:619 fileaccess.cpp:627 +#: fileaccess.cpp:656 fileaccess.cpp:664 #, kde-format msgid "Error reading from %1. %2" msgstr "Erro ao ler de %1. %2" -#: fileaccess.cpp:751 +#: fileaccess.cpp:788 #, kde-format msgid "" "While trying to make a backup, deleting an older backup failed.\n" @@ -998,7 +1004,7 @@ "falhou.\n" "Ficheiro: %1" -#: fileaccess.cpp:758 +#: fileaccess.cpp:795 #, kde-format msgid "" "While trying to make a backup, renaming failed.\n" @@ -1007,180 +1013,180 @@ "Ao tentar fazer uma cópia de segurança, a mudança de nome falhou.\n" "Ficheiros: %1 -> %2" -#: fileaccess.cpp:828 +#: fileaccess.cpp:865 #, kde-format msgid "Getting file status: %1" msgstr "A obter o estado do ficheiro: %1" -#: fileaccess.cpp:869 +#: fileaccess.cpp:906 #, kde-format msgid "Reading file: %1" msgstr "A ler o ficheiro: %1" -#: fileaccess.cpp:907 +#: fileaccess.cpp:944 #, kde-format msgid "Writing file: %1" msgstr "A escrever o ficheiro: %1" -#: fileaccess.cpp:940 +#: fileaccess.cpp:977 #, kde-format msgid "Out of memory" msgstr "Sem memória" -#: fileaccess.cpp:976 +#: fileaccess.cpp:1013 #, kde-format msgid "Making directory: %1" msgstr "A criar a pasta: %1" -#: fileaccess.cpp:997 +#: fileaccess.cpp:1034 #, kde-format msgid "Removing directory: %1" msgstr "A remover a pasta: %1" -#: fileaccess.cpp:1012 +#: fileaccess.cpp:1049 #, kde-format msgid "Removing file: %1" msgstr "A remover o ficheiro. %1" -#: fileaccess.cpp:1028 +#: fileaccess.cpp:1065 #, kde-format msgid "Creating symbolic link: %1 -> %2" msgstr "A criar a ligação simbólica: %1 -> %2" -#: fileaccess.cpp:1052 +#: fileaccess.cpp:1089 #, kde-format msgid "Renaming file: %1 -> %2" msgstr "A mudar o nome do ficheiro: %1 -> %2" -#: fileaccess.cpp:1086 +#: fileaccess.cpp:1123 #, kde-format msgid "Copying file: %1 -> %2" msgstr "A copiar o ficheiro: %1 -> %2" -#: fileaccess.cpp:1108 +#: fileaccess.cpp:1145 #, kde-format msgid "Reading directory: %1" msgstr "A ler a pasta: %1" -#: fileaccess.cpp:1162 +#: fileaccess.cpp:1202 #, kde-format msgid "Listing directory: %1" msgstr "A analisar a pasta: %1" -#: kdiff3.cpp:181 +#: kdiff3.cpp:182 #, kde-format msgid "Current Configuration:" msgstr "Configuração Actual:" -#: kdiff3.cpp:186 +#: kdiff3.cpp:187 #, kde-format msgid "Config Option Error:" msgstr "Erro da Opção de Configuração:" -#: kdiff3.cpp:240 +#: kdiff3.cpp:246 #, kde-format 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:416 +#: kdiff3.cpp:405 #, kde-format msgid "Option --auto ignored for directory comparison." msgstr "A opção --auto é ignorada para a comparação de pastas." -#: kdiff3.cpp:460 +#: kdiff3.cpp:449 #, kde-format msgid "Saving failed." msgstr "A gravação falhou." -#: kdiff3.cpp:496 pdiff.cpp:1098 +#: kdiff3.cpp:494 pdiff.cpp:1096 #, kde-format msgid "Opening of these files failed:" msgstr "O acesso a estes ficheiros falhou:" -#: kdiff3.cpp:505 +#: kdiff3.cpp:503 pdiff.cpp:1105 #, kde-format -msgid "File Open Error" -msgstr "Erro de Acesso ao Ficheiro" +msgid "File open error" +msgstr "Erro ao abrir o ficheiro" -#: kdiff3.cpp:533 +#: kdiff3.cpp:532 #, kde-format msgid "Opens documents for comparison..." msgstr "Abre os documentos para os comparar..." -#: kdiff3.cpp:535 +#: kdiff3.cpp:534 #, kde-format msgid "Reload" msgstr "Actualizar" -#: kdiff3.cpp:538 +#: kdiff3.cpp:537 #, kde-format 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:540 +#: kdiff3.cpp:539 #, kde-format msgid "Saves the current document as..." msgstr "Grava o documento actual como..." -#: kdiff3.cpp:543 +#: kdiff3.cpp:542 #, kde-format msgid "Print the differences" msgstr "Imprimir as diferenças" -#: kdiff3.cpp:546 +#: kdiff3.cpp:545 #, kde-format msgid "Quits the application" msgstr "Sai da aplicação" -#: kdiff3.cpp:549 +#: kdiff3.cpp:548 #, kde-format 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:552 +#: kdiff3.cpp:551 #, kde-format msgid "Copies the selected section to the clipboard" msgstr "Copia a secção seleccionada para a área de transferência" -#: kdiff3.cpp:554 +#: kdiff3.cpp:553 #, kde-format msgid "Pastes the clipboard contents to current position" msgstr "Cola o conteúdo da área de transferência na posição actual" -#: kdiff3.cpp:557 +#: kdiff3.cpp:556 #, kde-format msgid "Select everything in current window" msgstr "Selecciona tudo na janela actual" -#: kdiff3.cpp:560 +#: kdiff3.cpp:559 #, kde-format msgid "Search for a string" msgstr "Procura por um texto" -#: kdiff3.cpp:562 +#: kdiff3.cpp:561 #, kde-format msgid "Search again for the string" msgstr "Procura de novo pelo texto" -#: kdiff3.cpp:567 +#: kdiff3.cpp:566 #, kde-format msgid "Enables/disables the statusbar" msgstr "Activa/desactiva a barra de estado" -#: kdiff3.cpp:571 +#: kdiff3.cpp:570 #, kde-format msgid "Configure KDiff3..." msgstr "Configurar o KDiff3..." -#: kdiff3.cpp:590 +#: kdiff3.cpp:589 #, kde-format msgid "Go to Current Delta" msgstr "Ir para o Delta Actual" -#: kdiff3.cpp:590 +#: kdiff3.cpp:589 #, kde-format msgid "" "Current\n" @@ -1189,12 +1195,12 @@ "Delta\n" "Actual" -#: kdiff3.cpp:592 +#: kdiff3.cpp:591 #, kde-format msgid "Go to First Delta" msgstr "Ir para o Primeiro Delta" -#: kdiff3.cpp:592 +#: kdiff3.cpp:591 #, kde-format msgid "" "First\n" @@ -1203,12 +1209,12 @@ "Primeiro\n" "Delta" -#: kdiff3.cpp:594 +#: kdiff3.cpp:593 #, kde-format msgid "Go to Last Delta" msgstr "Ir para o Último Delta" -#: kdiff3.cpp:594 +#: kdiff3.cpp:593 #, kde-format msgid "" "Last\n" @@ -1217,14 +1223,14 @@ "Último\n" "Delta" -#: kdiff3.cpp:596 +#: kdiff3.cpp:595 #, kde-format 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:597 +#: kdiff3.cpp:596 #, kde-format msgid "" "(Does not skip white space differences even when \"Show White Space\" is " @@ -1233,12 +1239,12 @@ "(Não ignora as diferenças de espaço em branco mesmo quando \"Mostrar os " "Espaços em Branco\" está desactivado.)" -#: kdiff3.cpp:598 +#: kdiff3.cpp:597 #, kde-format msgid "Go to Previous Delta" msgstr "Ir para o Delta Anterior" -#: kdiff3.cpp:598 +#: kdiff3.cpp:597 #, kde-format msgid "" "Prev\n" @@ -1247,12 +1253,12 @@ "Delta\n" "Anterior" -#: kdiff3.cpp:600 +#: kdiff3.cpp:599 #, kde-format msgid "Go to Next Delta" msgstr "Ir para o Próximo Delta" -#: kdiff3.cpp:600 +#: kdiff3.cpp:599 #, kde-format msgid "" "Next\n" @@ -1261,12 +1267,12 @@ "Delta\n" "Seguinte" -#: kdiff3.cpp:602 +#: kdiff3.cpp:601 #, kde-format msgid "Go to Previous Conflict" msgstr "Ir para o Conflito Anterior" -#: kdiff3.cpp:602 +#: kdiff3.cpp:601 #, kde-format msgid "" "Prev\n" @@ -1275,12 +1281,12 @@ "Conflito\n" "Anterior" -#: kdiff3.cpp:604 +#: kdiff3.cpp:603 #, kde-format msgid "Go to Next Conflict" msgstr "Ir para o Próximo Conflito" -#: kdiff3.cpp:604 +#: kdiff3.cpp:603 #, kde-format msgid "" "Next\n" @@ -1289,12 +1295,12 @@ "Conflito\n" "Seguinte" -#: kdiff3.cpp:606 +#: kdiff3.cpp:605 #, kde-format msgid "Go to Previous Unsolved Conflict" msgstr "Ir para o Conflito por Resolver Anterior" -#: kdiff3.cpp:606 +#: kdiff3.cpp:605 #, kde-format msgid "" "Prev\n" @@ -1303,12 +1309,12 @@ "Não Resolvido\n" "Anterior" -#: kdiff3.cpp:608 +#: kdiff3.cpp:607 #, kde-format msgid "Go to Next Unsolved Conflict" msgstr "Ir para o Conflito por Resolver Seguinte" -#: kdiff3.cpp:608 +#: kdiff3.cpp:607 #, kde-format msgid "" "Next\n" @@ -1317,12 +1323,12 @@ "Não Resolvido\n" "Seguinte" -#: kdiff3.cpp:610 +#: kdiff3.cpp:609 #, kde-format msgid "Select Line(s) From A" msgstr "Seleccionar as Linhas do A" -#: kdiff3.cpp:610 +#: kdiff3.cpp:609 #, kde-format msgid "" "Choose\n" @@ -1331,12 +1337,12 @@ "Escolher\n" "o A" -#: kdiff3.cpp:611 +#: kdiff3.cpp:610 #, kde-format msgid "Select Line(s) From B" msgstr "Seleccionar as Linhas do B" -#: kdiff3.cpp:611 +#: kdiff3.cpp:610 #, kde-format msgid "" "Choose\n" @@ -1345,12 +1351,12 @@ "Escolher\n" "o B" -#: kdiff3.cpp:612 +#: kdiff3.cpp:611 #, kde-format msgid "Select Line(s) From C" msgstr "Seleccionar as Linhas do C" -#: kdiff3.cpp:612 +#: kdiff3.cpp:611 #, kde-format msgid "" "Choose\n" @@ -1359,14 +1365,14 @@ "Escolher\n" "o C" -#: kdiff3.cpp:613 +#: kdiff3.cpp:612 #, kde-format 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:613 +#: kdiff3.cpp:612 #, kde-format msgid "" "Auto\n" @@ -1375,12 +1381,12 @@ "Seguinte\n" "Automático" -#: kdiff3.cpp:615 +#: kdiff3.cpp:614 #, kde-format msgid "Show Space && Tabulator Characters" msgstr "Mostrar as Diferenças de Espaços && Tabulações" -#: kdiff3.cpp:615 +#: kdiff3.cpp:614 #, kde-format msgid "" "White\n" @@ -1389,12 +1395,12 @@ "Espaços\n" "em Branco" -#: kdiff3.cpp:616 +#: kdiff3.cpp:615 #, kde-format msgid "Show White Space" msgstr "Mostrar os Espaços em Branco" -#: kdiff3.cpp:616 +#: kdiff3.cpp:615 #, kde-format msgid "" "White\n" @@ -1403,12 +1409,12 @@ "Diferenças\n" "em Branco" -#: kdiff3.cpp:618 +#: kdiff3.cpp:617 #, kde-format msgid "Show Line Numbers" msgstr "Mostrar os Números de Linha" -#: kdiff3.cpp:618 +#: kdiff3.cpp:617 #, kde-format msgid "" "Line\n" @@ -1417,132 +1423,132 @@ "Números\n" "de Linha" -#: kdiff3.cpp:620 +#: kdiff3.cpp:619 #, kde-format msgid "Automatically Solve Simple Conflicts" msgstr "Resolver Automaticamente os Conflitos Simples" -#: kdiff3.cpp:621 +#: kdiff3.cpp:620 #, kde-format msgid "Set Deltas to Conflicts" msgstr "Passar os Deltas para Conflitos" -#: kdiff3.cpp:622 +#: kdiff3.cpp:621 #, kde-format msgid "Run Regular Expression Auto Merge" msgstr "Executar a Junção Automática de Expressões Regulares" -#: kdiff3.cpp:623 +#: kdiff3.cpp:622 #, kde-format msgid "Automatically Solve History Conflicts" msgstr "Resolver Automaticamente os Conflitos do Histórico" -#: kdiff3.cpp:624 +#: kdiff3.cpp:623 #, kde-format msgid "Split Diff At Selection" msgstr "Dividir a Diferença na Selecção" -#: kdiff3.cpp:625 +#: kdiff3.cpp:624 #, kde-format msgid "Join Selected Diffs" msgstr "Juntar as Diferenças Seleccionadas" -#: kdiff3.cpp:627 +#: kdiff3.cpp:626 #, kde-format msgid "Show Window A" msgstr "Mostrar a Janela A" -#: kdiff3.cpp:628 +#: kdiff3.cpp:627 #, kde-format msgid "Show Window B" msgstr "Mostrar a Janela B" -#: kdiff3.cpp:629 +#: kdiff3.cpp:628 #, kde-format msgid "Show Window C" msgstr "Mostrar a Janela C" -#: kdiff3.cpp:631 +#: kdiff3.cpp:630 #, kde-format msgid "Normal Overview" msgstr "Vista Normal" -#: kdiff3.cpp:632 +#: kdiff3.cpp:631 #, kde-format msgid "A vs. B Overview" msgstr "Vista A vs. B" -#: kdiff3.cpp:633 +#: kdiff3.cpp:632 #, kde-format msgid "A vs. C Overview" msgstr "Vista A vs. C" -#: kdiff3.cpp:634 +#: kdiff3.cpp:633 #, kde-format msgid "B vs. C Overview" msgstr "Vista B vs. C" -#: kdiff3.cpp:635 +#: kdiff3.cpp:634 #, kde-format msgid "Word Wrap Diff Windows" msgstr "Quebrar Linha nas Janelas de Diferenças" -#: kdiff3.cpp:636 +#: kdiff3.cpp:635 #, kde-format msgid "Add Manual Diff Alignment" msgstr "Adicionar o Alinhamento Manual das Diferenças" -#: kdiff3.cpp:637 +#: kdiff3.cpp:636 #, kde-format msgid "Clear All Manual Diff Alignments" msgstr "Limpar Todos os Alinhamentos de Diferenças Manuais" -#: kdiff3.cpp:639 +#: kdiff3.cpp:638 #, kde-format msgid "Focus Next Window" msgstr "Foco na Próxima Janela" -#: kdiff3.cpp:640 +#: kdiff3.cpp:639 #, kde-format msgid "Focus Prev Window" msgstr "Foco na Janela Anterior" -#: kdiff3.cpp:641 +#: kdiff3.cpp:640 #, kde-format msgid "Toggle Split Orientation" msgstr "Comutar a Orientação da Repartição" -#: kdiff3.cpp:643 +#: kdiff3.cpp:642 #, kde-format msgid "Dir && Text Split Screen View" msgstr "Janela Repartida de Pastas e Texto" -#: kdiff3.cpp:645 +#: kdiff3.cpp:644 #, kde-format msgid "Toggle Between Dir && Text View" msgstr "Mudar Entre a Janela de Pastas e de Texto" -#: kdiff3.cpp:697 pdiff.cpp:1909 +#: kdiff3.cpp:696 pdiff.cpp:1919 #, kde-format msgid "The merge result has not been saved." msgstr "O resultado da junção não foi ainda gravado." -#: kdiff3.cpp:699 +#: kdiff3.cpp:698 #, kde-format msgid "Save && Quit" msgstr "Gravar e Sair" -#: kdiff3.cpp:700 +#: kdiff3.cpp:699 #, kde-format msgid "Quit Without Saving" msgstr "Sair sem Gravar" -#: kdiff3.cpp:708 pdiff.cpp:1920 +#: kdiff3.cpp:707 pdiff.cpp:1930 #, kde-format msgid "Saving the merge result failed." msgstr "A gravação do resultado da junção falhou." -#: kdiff3.cpp:719 pdiff.cpp:1032 +#: kdiff3.cpp:718 pdiff.cpp:1030 #, kde-format msgid "" "You are currently doing a directory merge. Are you sure, you want to abort?" @@ -1550,62 +1556,62 @@ "Você está a fazer uma junção de pastas de momento. Tem a certeza que quer " "interromper?" -#: kdiff3.cpp:742 +#: kdiff3.cpp:741 #, kde-format msgid "Saving file..." msgstr "A gravar o ficheiro..." -#: kdiff3.cpp:759 +#: kdiff3.cpp:758 #, kde-format msgid "Saving file with a new filename..." msgstr "A gravar o ficheiro com um novo nome..." -#: kdiff3.cpp:761 +#: kdiff3.cpp:760 #, kde-format msgid "Save As..." msgstr "Gravar Como..." -#: kdiff3.cpp:820 +#: kdiff3.cpp:819 #, kde-format msgid "Printing not implemented." msgstr "A impressão não está implementada." -#: kdiff3.cpp:857 +#: kdiff3.cpp:858 #, kde-format msgid "Printing..." msgstr "A imprimir..." -#: kdiff3.cpp:943 +#: kdiff3.cpp:948 #, kde-format msgid "Printing page %1 of %2" msgstr "A imprimir a página %1 de %2" -#: kdiff3.cpp:1000 +#: kdiff3.cpp:1006 #, kde-format msgid " (Selection)" msgstr " (Selecção)" -#: kdiff3.cpp:1027 +#: kdiff3.cpp:1034 #, kde-format msgid "Printing completed." msgstr "A impressão terminou." -#: kdiff3.cpp:1031 +#: kdiff3.cpp:1038 #, kde-format msgid "Printing aborted." msgstr "A impressão foi interrompida." -#: kdiff3.cpp:1038 +#: kdiff3.cpp:1045 #, kde-format msgid "Exiting..." msgstr "A sair..." -#: kdiff3.cpp:1049 +#: kdiff3.cpp:1056 #, kde-format msgid "Toggling toolbar..." msgstr "A comutar a barra de ferramentas..." -#: kdiff3.cpp:1070 +#: kdiff3.cpp:1077 #, kde-format msgid "Toggle the statusbar..." msgstr "Comutar a barra de estado..." @@ -1630,7 +1636,7 @@ msgid "Joachim Eibl" msgstr "Joachim Eibl" -#: kdiff3_part.cpp:173 kdiff3_part.cpp:254 +#: kdiff3_part.cpp:174 kdiff3_part.cpp:255 #, kde-format msgid "Could not find files for comparison." msgstr "Não foi possível encontrar os ficheiros a comparar." @@ -1648,7 +1654,7 @@ msgstr "Configurar o KDiff3" #. i18n: ectx: ToolBar (mainToolBar) -#: kdiff3_part.rc:16 main.cpp:88 +#: kdiff3_part.rc:16 main.cpp:89 #, kde-format msgid "KDiff3" msgstr "KDiff3" @@ -1718,88 +1724,93 @@ msgid "Main Toolbar" msgstr "Barra Principal" -#: main.cpp:68 main.cpp:72 +#: main.cpp:69 main.cpp:73 #, kde-format msgid "Ignored. (User defined.)" msgstr "Ignorado. (Definido pelo utilizador.)" -#: main.cpp:92 +#: main.cpp:93 #, kde-format msgid " (64 bit)" msgstr " (64 bits)" -#: main.cpp:94 +#: main.cpp:95 #, kde-format msgid " (32 bit)" msgstr " (32 bits)" -#: main.cpp:95 +#: main.cpp:96 #, kde-format msgid "Tool for Comparison and Merge of Files and Directories" msgstr "Ferramenta para Comparação e Junção de Ficheiros e Pastas" -#: main.cpp:96 +#: main.cpp:97 #, kde-format msgid "(c) 2002-2014 Joachim Eibl, (c) 2017 Michael Reeves KF5/Qt5 port" msgstr "" "(c) 2002-2014 Joachim Eibl, (c) 2017 Michael Reeves - Migração para o KF5/Qt5" -#: main.cpp:112 +#: main.cpp:113 #, kde-format msgid "Merge the input." msgstr "Juntar a entrada." -#: main.cpp:113 +#: main.cpp:114 #, kde-format msgid "Explicit base file. For compatibility with certain tools." msgstr "" "Ficheiro de base explícito. Para a compatibilidade com certas ferramentas." -#: main.cpp:114 +#: main.cpp:115 #, kde-format msgid "Output file. Implies -m. E.g.: -o newfile.txt" msgstr "Ficheiro de saída. Implica o -m. P.ex.: -o novoficheiro.txt" -#: main.cpp:115 +#: main.cpp:116 #, kde-format msgid "Output file, again. (For compatibility with certain tools.)" msgstr "" "Ficheiro de saída, de novo. (para a compatibilidade com certas ferramentas)" -#: main.cpp:116 +#: main.cpp:118 #, kde-format msgid "No GUI if all conflicts are auto-solvable. (Needs -o file)" msgstr "" "Sem interface se todos os conflitos são resolvidos automaticamente (precisa " "do -o ficheiro)" -#: main.cpp:117 +#: main.cpp:120 +#, kde-format +msgid "Ignored." +msgstr "Ignorado." + +#: main.cpp:122 #, kde-format msgid "Do not solve conflicts automatically." msgstr "Não resolver os conflitos automaticamente." -#: main.cpp:118 +#: main.cpp:123 #, kde-format msgid "Visible name replacement for input file 1 (base)." msgstr "Substituição do nome visível para o ficheiro de entrada 1 (base)." -#: main.cpp:119 +#: main.cpp:124 #, kde-format msgid "Visible name replacement for input file 2." msgstr "Substituição do nome visível para o ficheiro de entrada 2." -#: main.cpp:120 +#: main.cpp:125 #, kde-format msgid "Visible name replacement for input file 3." msgstr "Substituição do nome visível para o ficheiro de entrada 3." -#: main.cpp:121 +#: main.cpp:126 #, kde-format msgid "Alternative visible name replacement. Supply this once for every input." msgstr "" "Substituição alternativa do nome visível. Indique isto para cada entrada." -#: main.cpp:122 +#: main.cpp:127 #, kde-format msgid "" "Override a config setting. Use once for every setting. E.g.: --cs " @@ -1808,88 +1819,88 @@ "Substitui uma opção de configuração. Use uma vez para todas as opções. P." "ex.: --cs \"AutoAdvance=1\"" -#: main.cpp:123 +#: main.cpp:128 #, kde-format msgid "Show list of config settings and current values." msgstr "Mostra uma lista das opções de configuração e os valores actuais." -#: main.cpp:124 +#: main.cpp:129 #, kde-format msgid "Use a different config file." msgstr "Usar um ficheiro de configuração diferente." -#: main.cpp:127 +#: main.cpp:132 #, kde-format msgid "file1 to open (base, if not specified via --base)" msgstr "o ficheiro 1 a abrir (base, se não for indicado através do --base)" -#: main.cpp:128 +#: main.cpp:133 #, kde-format msgid "file2 to open" msgstr "o ficheiro 2 a abrir" -#: main.cpp:129 +#: main.cpp:134 #, kde-format msgid "file3 to open" msgstr "o ficheiro 3 a abrir" -#: main.cpp:153 +#: main.cpp:158 #, kde-format msgid "See kdiff3 --help for supported options." msgstr "Veja as opções suportadas em 'kdiff3 --help'." -#: mergeresultwindow.cpp:158 +#: mergeresultwindow.cpp:171 #, kde-format msgid "Choose A Everywhere" msgstr "Escolher o A em Todo o Lado" -#: mergeresultwindow.cpp:159 +#: mergeresultwindow.cpp:172 #, kde-format msgid "Choose B Everywhere" msgstr "Escolher o B em Todo o Lado" -#: mergeresultwindow.cpp:160 +#: mergeresultwindow.cpp:173 #, kde-format msgid "Choose C Everywhere" msgstr "Escolher o C em Todo o Lado" -#: mergeresultwindow.cpp:161 +#: mergeresultwindow.cpp:174 #, kde-format msgid "Choose A for All Unsolved Conflicts" msgstr "Escolher A em Todos os Conflitos por Resolver" -#: mergeresultwindow.cpp:162 +#: mergeresultwindow.cpp:175 #, kde-format msgid "Choose B for All Unsolved Conflicts" msgstr "Escolher B em Todos os Conflitos por Resolver" -#: mergeresultwindow.cpp:163 +#: mergeresultwindow.cpp:176 #, kde-format msgid "Choose C for All Unsolved Conflicts" msgstr "Escolher C em Todos os Conflitos por Resolver" -#: mergeresultwindow.cpp:164 +#: mergeresultwindow.cpp:177 #, kde-format msgid "Choose A for All Unsolved Whitespace Conflicts" msgstr "Escolher A em Todos os Conflitos de Espaço em Branco por Resolver" -#: mergeresultwindow.cpp:165 +#: mergeresultwindow.cpp:178 #, kde-format msgid "Choose B for All Unsolved Whitespace Conflicts" msgstr "Escolher B em Todos os Conflitos de Espaço em Branco por Resolver" -#: mergeresultwindow.cpp:166 +#: mergeresultwindow.cpp:179 #, kde-format msgid "Choose C for All Unsolved Whitespace Conflicts" msgstr "Escolher C em Todos os Conflitos de Espaço em Branco por Resolver" -#: mergeresultwindow.cpp:176 +#: mergeresultwindow.cpp:204 #, kde-format msgid "Number of remaining unsolved conflicts: %1 (of which %2 are whitespace)" msgstr "" "Número de conflitos por resolver: %1 (dos quais %2 são espaço em branco)" -#: mergeresultwindow.cpp:370 +#: mergeresultwindow.cpp:398 #, kde-format msgid "" "The output has been modified.\n" @@ -1898,29 +1909,29 @@ "O resultado foi modificado.\n" "Se você continuar as suas alterações serão perdidas." -#: mergeresultwindow.cpp:936 pdiff.cpp:827 +#: mergeresultwindow.cpp:964 pdiff.cpp:817 #, kde-format msgid "All input files are binary equal." msgstr "Todos os ficheiros de entrada são iguais a nível binário." -#: mergeresultwindow.cpp:938 +#: mergeresultwindow.cpp:966 #, kde-format msgid "All input files contain the same text." msgstr "Todos os ficheiros de entrada contêm o mesmo texto." -#: mergeresultwindow.cpp:942 mergeresultwindow.cpp:946 -#: mergeresultwindow.cpp:950 pdiff.cpp:833 pdiff.cpp:837 pdiff.cpp:841 +#: mergeresultwindow.cpp:970 mergeresultwindow.cpp:974 +#: mergeresultwindow.cpp:978 pdiff.cpp:823 pdiff.cpp:827 pdiff.cpp:831 #, 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" -#: mergeresultwindow.cpp:944 mergeresultwindow.cpp:948 -#: mergeresultwindow.cpp:952 +#: mergeresultwindow.cpp:972 mergeresultwindow.cpp:976 +#: mergeresultwindow.cpp:980 #, kde-format msgid "Files %1 and %2 have equal text.\n" msgstr "Os ficheiros %1 e %2 têm texto igual.\n" -#: mergeresultwindow.cpp:958 +#: mergeresultwindow.cpp:986 #, kde-format msgid "" "Total number of conflicts: %1\n" @@ -1933,27 +1944,27 @@ "Nº de conflitos não resolvidos: %3\n" "%4" -#: mergeresultwindow.cpp:964 +#: mergeresultwindow.cpp:992 #, kde-format msgid "Conflicts" msgstr "Conflitos" -#: mergeresultwindow.cpp:1873 +#: mergeresultwindow.cpp:1901 #, kde-format msgid "" msgstr "" -#: mergeresultwindow.cpp:1881 +#: mergeresultwindow.cpp:1909 #, kde-format msgid "" msgstr "" -#: mergeresultwindow.cpp:1883 mergeresultwindow.cpp:2755 +#: mergeresultwindow.cpp:1911 mergeresultwindow.cpp:2783 #, kde-format msgid "" msgstr "" -#: mergeresultwindow.cpp:2967 +#: mergeresultwindow.cpp:2995 #, kde-format msgid "" "Not all conflicts are solved yet.\n" @@ -1962,12 +1973,12 @@ "Nem todos os conflitos estão ainda resolvidos.\n" "O ficheiro não foi gravado." -#: mergeresultwindow.cpp:2969 mergeresultwindow.cpp:2978 +#: mergeresultwindow.cpp:2997 mergeresultwindow.cpp:3006 #, kde-format msgid "Conflicts Left" msgstr "Conflitos Restantes" -#: mergeresultwindow.cpp:2976 +#: mergeresultwindow.cpp:3004 #, kde-format msgid "" "There is a line end style conflict. Please choose the line end style " @@ -1978,7 +1989,7 @@ "manualmente.\n" "O ficheiro não foi gravado." -#: mergeresultwindow.cpp:2990 +#: mergeresultwindow.cpp:3018 #, kde-format msgid "" "\n" @@ -1989,57 +2000,57 @@ "\n" "A criação de salvaguarda falhou. Ficheiro não gravado." -#: mergeresultwindow.cpp:2990 mergeresultwindow.cpp:3038 +#: mergeresultwindow.cpp:3018 mergeresultwindow.cpp:3066 #, kde-format msgid "File Save Error" msgstr "Erro na Gravação do Ficheiro" -#: mergeresultwindow.cpp:3038 +#: mergeresultwindow.cpp:3066 #, kde-format msgid "Error while writing." msgstr "Erro ao gravar." -#: mergeresultwindow.cpp:3110 +#: mergeresultwindow.cpp:3138 #, kde-format msgid "Output:" msgstr "Resultado:" -#: mergeresultwindow.cpp:3123 mergeresultwindow.cpp:3315 +#: mergeresultwindow.cpp:3151 mergeresultwindow.cpp:3343 #, kde-format msgid "[Modified]" msgstr "[Modificado]" -#: mergeresultwindow.cpp:3130 +#: mergeresultwindow.cpp:3158 #, kde-format msgid "Encoding for saving:" msgstr "Codificação da gravação:" -#: mergeresultwindow.cpp:3230 +#: mergeresultwindow.cpp:3258 #, kde-format msgid "Conflict" msgstr "Conflito" -#: mergeresultwindow.cpp:3262 +#: mergeresultwindow.cpp:3290 #, kde-format msgid "Codec from A: %1" msgstr "Codificação de A: %1" -#: mergeresultwindow.cpp:3264 +#: mergeresultwindow.cpp:3292 #, kde-format msgid "Codec from B: %1" msgstr "Codificação de B: %1" -#: mergeresultwindow.cpp:3266 +#: mergeresultwindow.cpp:3294 #, kde-format msgid "Codec from C: %1" msgstr "Codificação de C: %1" -#: optiondialog.cpp:119 +#: optiondialog.cpp:121 #, kde-format msgid "Change Font" msgstr "Modificar o Tipo de Letra" -#: optiondialog.cpp:135 optiondialog.cpp:145 +#: optiondialog.cpp:137 optiondialog.cpp:147 #, kde-format msgid "" "Font: %1, %2, %3\n" @@ -2050,124 +2061,124 @@ "\n" "Exemplo:" -#: optiondialog.cpp:388 +#: optiondialog.cpp:390 #, kde-format msgid "Unicode" msgstr "Unicode" -#: optiondialog.cpp:389 +#: optiondialog.cpp:391 #, kde-format msgid "Latin1" msgstr "Latin1" -#: optiondialog.cpp:408 +#: optiondialog.cpp:410 #, kde-format msgid "Change this if non-ASCII characters are not displayed correctly." msgstr "" "Altere isto se os caracteres não-ASCII não são mostrados correctamente." -#: optiondialog.cpp:491 +#: optiondialog.cpp:495 #, kde-format msgid "Configure" msgstr "Configurar" -#: optiondialog.cpp:568 +#: optiondialog.cpp:573 #, kde-format msgid "Font" msgstr "Tipo de Letra" -#: optiondialog.cpp:570 +#: optiondialog.cpp:575 #, kde-format msgid "Editor & Diff Output Font" msgstr "Tipo de Letra do Resultado do Diff e do Editor" -#: optiondialog.cpp:589 +#: optiondialog.cpp:594 #, kde-format msgid "Application font" msgstr "Tipo de letra da aplicação" -#: optiondialog.cpp:594 +#: optiondialog.cpp:599 #, kde-format msgid "File view font" msgstr "Tipo de letra da área de ficheiros" -#: optiondialog.cpp:613 +#: optiondialog.cpp:618 #, kde-format msgctxt "Title for color settings page" msgid "Color" msgstr "Cor" -#: optiondialog.cpp:614 +#: optiondialog.cpp:619 #, kde-format msgid "Colors Settings" msgstr "Configuração das Cores" -#: optiondialog.cpp:631 +#: optiondialog.cpp:644 #, kde-format msgid "Editor and Diff Views:" msgstr "Áreas do Editor e das Diferenças:" -#: optiondialog.cpp:639 +#: optiondialog.cpp:652 #, kde-format msgid "Foreground color:" msgstr "Cor principal:" -#: optiondialog.cpp:647 +#: optiondialog.cpp:660 #, kde-format msgid "Background color:" msgstr "Cor de fundo:" -#: optiondialog.cpp:657 +#: optiondialog.cpp:670 #, kde-format msgid "Diff background color:" msgstr "Cor de fundo das diferenças:" -#: optiondialog.cpp:666 +#: optiondialog.cpp:679 #, kde-format msgid "Color A:" msgstr "Cor A:" -#: optiondialog.cpp:675 +#: optiondialog.cpp:688 #, kde-format msgid "Color B:" msgstr "Cor B:" -#: optiondialog.cpp:684 +#: optiondialog.cpp:697 #, kde-format msgid "Color C:" msgstr "Cor C:" -#: optiondialog.cpp:692 +#: optiondialog.cpp:705 #, kde-format msgid "Conflict color:" msgstr "Cor do conflito:" -#: optiondialog.cpp:701 +#: optiondialog.cpp:714 #, kde-format msgid "Current range background color:" msgstr "Cor de fundo do intervalo actual:" -#: optiondialog.cpp:710 +#: optiondialog.cpp:723 #, kde-format msgid "Current range diff background color:" msgstr "Cor de fundo da diferença do intervalo actual:" -#: optiondialog.cpp:718 +#: optiondialog.cpp:731 #, kde-format msgid "Color for manually aligned difference ranges:" msgstr "Cor dos intervalos de diferenças alinhados manualmente:" -#: optiondialog.cpp:725 +#: optiondialog.cpp:738 #, kde-format msgid "Directory Comparison View:" msgstr "Área de Comparação das Pastas:" -#: optiondialog.cpp:731 +#: optiondialog.cpp:744 #, kde-format msgid "Newest file color:" msgstr "Cor do ficheiro mais recente:" -#: optiondialog.cpp:736 +#: optiondialog.cpp:749 #, kde-format msgid "" "Changing this color will only be effective when starting the next directory " @@ -2175,37 +2186,37 @@ msgstr "" "Se mudar esta cor, só fará efeito ao iniciar a próxima comparação de pastas." -#: optiondialog.cpp:741 +#: optiondialog.cpp:754 #, kde-format msgid "Oldest file color:" msgstr "Cor do ficheiro mais antigo:" -#: optiondialog.cpp:750 +#: optiondialog.cpp:763 #, kde-format msgid "Middle age file color:" msgstr "Cor dos ficheiros intermédios:" -#: optiondialog.cpp:759 +#: optiondialog.cpp:772 #, kde-format msgid "Color for missing files:" msgstr "Cor dos ficheiros em falta:" -#: optiondialog.cpp:773 +#: optiondialog.cpp:786 #, kde-format msgid "Editor" msgstr "Editor" -#: optiondialog.cpp:774 +#: optiondialog.cpp:787 #, kde-format msgid "Editor Behavior" msgstr "Comportamento do Editor" -#: optiondialog.cpp:787 +#: optiondialog.cpp:809 #, kde-format msgid "Tab inserts spaces" msgstr "O Tab insere espaços" -#: optiondialog.cpp:791 +#: optiondialog.cpp:813 #, kde-format msgid "" "On: Pressing tab generates the appropriate number of spaces.\n" @@ -2214,27 +2225,27 @@ "Ligado: se carregar no Tab gera o número apropriado de espaços.\n" "Desligado: será introduzido um carácter Tab." -#: optiondialog.cpp:796 +#: optiondialog.cpp:818 #, kde-format msgid "Tab size:" msgstr "Tamanho das tabulações:" -#: optiondialog.cpp:803 +#: optiondialog.cpp:825 #, kde-format msgid "Auto indentation" msgstr "Indentação automática" -#: optiondialog.cpp:807 +#: optiondialog.cpp:829 #, kde-format msgid "On: The indentation of the previous line is used for a new line.\n" msgstr "Ligado: A indentação da linha anterior é usada para uma nova linha.\n" -#: optiondialog.cpp:810 +#: optiondialog.cpp:832 #, kde-format msgid "Auto copy selection" msgstr "Copiar automaticamente a selecção" -#: optiondialog.cpp:814 +#: optiondialog.cpp:836 #, kde-format msgid "" "On: Any selection is immediately written to the clipboard.\n" @@ -2243,7 +2254,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:829 +#: optiondialog.cpp:851 #, kde-format msgid "" "Sets the line endings for when an edited file is saved.\n" @@ -2252,12 +2263,12 @@ "Escolhe os fins de linha para quando um ficheiro editado é gravado.\n" "DOS/Windows: CR+LF; UNIX: LF; com CR=0D, LF=0A" -#: optiondialog.cpp:839 +#: optiondialog.cpp:861 #, kde-format msgid "Diff" msgstr "Diferenças" -#: optiondialog.cpp:840 +#: optiondialog.cpp:862 #, kde-format msgid "Diff Settings" msgstr "Configuração das Diferenças" @@ -2271,12 +2282,12 @@ #. ); #. ++line; #. -#: optiondialog.cpp:865 +#: optiondialog.cpp:896 #, kde-format msgid "Ignore numbers (treat as white space)" msgstr "Ignorar os números (tratar como espaços em branco)" -#: optiondialog.cpp:869 +#: optiondialog.cpp:900 #, kde-format msgid "" "Ignore number characters during line matching phase. (Similar to Ignore " @@ -2287,46 +2298,46 @@ "(Semelhante ao Ignorar os Espaços).\n" "Pode ajudar a comparar os ficheiros com dados numéricos." -#: optiondialog.cpp:873 +#: optiondialog.cpp:904 #, kde-format msgid "Ignore C/C++ comments (treat as white space)" msgstr "Ignorar os comentários de C/C++ (tratar como espaços em branco)" -#: optiondialog.cpp:876 +#: optiondialog.cpp:907 #, kde-format msgid "Treat C/C++ comments like white space." msgstr "Tratar os comentários de C/C++ como espaço em branco." -#: optiondialog.cpp:879 +#: optiondialog.cpp:910 #, kde-format msgid "Ignore case (treat as white space)" msgstr "Ignorar a capitalização (tratar como espaços em branco)" -#: optiondialog.cpp:883 +#: optiondialog.cpp:914 #, kde-format msgid "Treat case differences like white space changes. ('a'<=>'A')" msgstr "" "Tratar diferenças de capitalização como mudanças de espaço em branco. " "('a'<=>'A')" -#: optiondialog.cpp:886 +#: optiondialog.cpp:917 #, kde-format msgid "Preprocessor command:" msgstr "Comando do pré-processador:" -#: optiondialog.cpp:891 +#: optiondialog.cpp:922 #, kde-format msgid "User defined pre-processing. (See the docs for details.)" msgstr "" "Pré-processamento definido pelo utilizador. (Veja a documentação para mais " "detalhes)." -#: optiondialog.cpp:894 +#: optiondialog.cpp:925 #, kde-format msgid "Line-matching preprocessor command:" msgstr "Comando do pré-processador para a correspondência de linhas:" -#: optiondialog.cpp:899 +#: optiondialog.cpp:930 #, kde-format msgid "" "This pre-processor is only used during line matching.\n" @@ -2335,12 +2346,12 @@ "Este pré-processador só é usado na correspondência das linhas.\n" "(Veja a documentação para mais detalhes)." -#: optiondialog.cpp:902 +#: optiondialog.cpp:933 #, kde-format msgid "Try hard (slower)" msgstr "Tentar com persistência (lento)" -#: optiondialog.cpp:906 +#: optiondialog.cpp:937 #, kde-format msgid "" "Enables the --minimal option for the external diff.\n" @@ -2349,12 +2360,12 @@ "Activa a opção --minimal do 'diff' externo.\n" "A análise dos ficheiros grandes será muito mais lenta." -#: optiondialog.cpp:910 +#: optiondialog.cpp:941 #, kde-format msgid "Align B and C for 3 input files" msgstr "Alinhar o B e o C para 3 ficheiros de entrada" -#: optiondialog.cpp:914 +#: optiondialog.cpp:945 #, kde-format msgid "" "Try to align B and C when comparing or merging three input files.\n" @@ -2366,17 +2377,23 @@ "complicada.\n" "(Por omissão está desligada.)" -#: optiondialog.cpp:926 +#: optiondialog.cpp:956 +#, kde-format +msgctxt "Settings page" +msgid "Merge" +msgstr "Junção" + +#: optiondialog.cpp:957 #, kde-format msgid "Merge Settings" msgstr "Configuração da Junção" -#: optiondialog.cpp:940 +#: optiondialog.cpp:980 #, kde-format msgid "Auto advance delay (ms):" msgstr "Atraso no avanço automático (ms):" -#: optiondialog.cpp:946 +#: optiondialog.cpp:986 #, kde-format msgid "" "When in Auto-Advance mode the result of the current selection is shown \n" @@ -2386,27 +2403,27 @@ "é mostrado durante o período indicado, antes de saltar para o próximo " "conflito. Intervalo: 0-2000 ms" -#: optiondialog.cpp:950 +#: optiondialog.cpp:990 #, kde-format msgid "Show info dialogs" msgstr "Mostrar as janelas informativas" -#: optiondialog.cpp:953 +#: optiondialog.cpp:993 #, kde-format msgid "Show a dialog with information about the number of conflicts." msgstr "Mostrar uma janela com informações sobre o número de conflitos." -#: optiondialog.cpp:956 +#: optiondialog.cpp:996 #, kde-format msgid "White space 2-file merge default:" msgstr "Junção de espaço em branco com 2 ficheiros:" -#: optiondialog.cpp:961 optiondialog.cpp:974 +#: optiondialog.cpp:1001 optiondialog.cpp:1014 #, kde-format msgid "Manual Choice" msgstr "Escolha Manual" -#: optiondialog.cpp:965 optiondialog.cpp:979 +#: optiondialog.cpp:1005 optiondialog.cpp:1019 #, kde-format msgid "" "Allow the merge algorithm to automatically select an input for white-space-" @@ -2415,22 +2432,22 @@ "Permite ao algoritmo de junção escolher automaticamente o ficheiro a " "utilizar para as alterações de apenas espaço em branco." -#: optiondialog.cpp:969 +#: optiondialog.cpp:1009 #, kde-format msgid "White space 3-file merge default:" msgstr "Junção de espaço em branco com 3 ficheiros:" -#: optiondialog.cpp:983 +#: optiondialog.cpp:1023 #, kde-format msgid "Automatic Merge Regular Expression" msgstr "Expressão Regular de Junção Automática" -#: optiondialog.cpp:991 smalldialogs.cpp:449 +#: optiondialog.cpp:1031 smalldialogs.cpp:459 #, kde-format msgid "Auto merge regular expression:" msgstr "Expressão regular de junção automática:" -#: optiondialog.cpp:996 +#: optiondialog.cpp:1036 #, kde-format msgid "" "Regular expression for lines where KDiff3 should automatically choose one " @@ -2444,12 +2461,12 @@ "-\n" "se disponível - o C, caso contrário será escolhido o B." -#: optiondialog.cpp:1002 +#: optiondialog.cpp:1042 #, kde-format msgid "Run regular expression auto merge on merge start" msgstr "Executar a junção automática da expressão regular ao iniciar a junção" -#: optiondialog.cpp:1005 +#: optiondialog.cpp:1045 #, kde-format msgid "" "Run the merge for auto merge regular expressions\n" @@ -2458,17 +2475,17 @@ "Executa a junção para as expressões regulares de junção automática\n" "imediatamente após o início de uma junção.\n" -#: optiondialog.cpp:1010 +#: optiondialog.cpp:1050 #, kde-format msgid "Version Control History Merging" msgstr "Junção do Histórico do Controlo de Versões" -#: optiondialog.cpp:1018 smalldialogs.cpp:476 +#: optiondialog.cpp:1058 smalldialogs.cpp:486 #, kde-format msgid "History start regular expression:" msgstr "Expressão regular do início do histórico:" -#: optiondialog.cpp:1023 +#: optiondialog.cpp:1063 #, kde-format msgid "" "Regular expression for the start of the version control history entry.\n" @@ -2479,12 +2496,12 @@ "Normalmente, este valor contém a palavra-chave \"$Log$\".\n" "Valor por omissão: \".*\\$Log.*\\$.*\"" -#: optiondialog.cpp:1029 smalldialogs.cpp:504 +#: optiondialog.cpp:1069 smalldialogs.cpp:514 #, kde-format msgid "History entry start regular expression:" msgstr "Expressão regular do início do item de histórico:" -#: optiondialog.cpp:1042 +#: optiondialog.cpp:1082 #, kde-format msgid "" "A version control history entry consists of several lines.\n" @@ -2503,22 +2520,22 @@ "itens de histórico.\n" "Veja a documentação para saber mais detalhes." -#: optiondialog.cpp:1050 +#: optiondialog.cpp:1090 #, kde-format msgid "History merge sorting" msgstr "Ordenação da junção do histórico" -#: optiondialog.cpp:1053 +#: optiondialog.cpp:1093 #, kde-format msgid "Sort version control history by a key." msgstr "Ordenar o histórico do controlo de versões por uma chave." -#: optiondialog.cpp:1063 +#: optiondialog.cpp:1103 #, kde-format msgid "History entry start sort key order:" msgstr "Ordem da chave de ordenação do início do item de histórico:" -#: optiondialog.cpp:1068 +#: optiondialog.cpp:1108 #, kde-format msgid "" "Each pair of parentheses used in the regular expression for the history " @@ -2537,41 +2554,41 @@ "Se for deixado em branco, não será feita nenhuma ordenação.\n" "Veja a documentação para saber mais detalhes." -#: optiondialog.cpp:1079 +#: optiondialog.cpp:1119 #, kde-format msgid "Merge version control history on merge start" msgstr "Juntar o histórico do controlo de versões ao iniciar a junção" -#: optiondialog.cpp:1082 +#: optiondialog.cpp:1122 #, kde-format msgid "Run version control history automerge on merge start." msgstr "" "Executar a junção automática do histórico do controlo de versões ao iniciar " "a junção." -#: optiondialog.cpp:1086 +#: optiondialog.cpp:1126 #, kde-format msgid "Max number of history entries:" msgstr "Número máximo de itens do histórico:" -#: optiondialog.cpp:1090 +#: optiondialog.cpp:1130 #, kde-format msgid "Cut off after specified number. Use -1 for infinite number of entries." msgstr "" "Cortar ao fim do número indicado. Usar o -1 para um número infinito de " "elementos." -#: optiondialog.cpp:1094 +#: optiondialog.cpp:1134 #, kde-format msgid "Test your regular expressions" msgstr "Testar as suas expressões regulares" -#: optiondialog.cpp:1099 +#: optiondialog.cpp:1139 #, kde-format msgid "Irrelevant merge command:" msgstr "Comando de junção irrelevante:" -#: optiondialog.cpp:1104 +#: optiondialog.cpp:1144 #, kde-format msgid "" "If specified this script is run after automerge\n" @@ -2582,12 +2599,12 @@ "quando não forem detectadas mais alterações relevantes.\n" "É invocado com os parâmetros: ficheiro1 ficheiro2 ficheiro3" -#: optiondialog.cpp:1109 +#: optiondialog.cpp:1149 #, kde-format msgid "Auto save and quit on merge without conflicts" msgstr "Gravar automaticamente e sair na junção sem conflitos" -#: optiondialog.cpp:1113 +#: optiondialog.cpp:1153 #, kde-format msgid "" "If KDiff3 was started for a file-merge from the command line and all\n" @@ -2600,27 +2617,27 @@ "utilizador, então grava e sair automaticamente.\n" "(Semelhante à opção da linha de comandos \"--auto\".)" -#: optiondialog.cpp:1124 optiondialog.cpp:1125 +#: optiondialog.cpp:1164 optiondialog.cpp:1165 #, kde-format msgid "Directory" msgstr "Pasta" -#: optiondialog.cpp:1137 +#: optiondialog.cpp:1185 #, kde-format msgid "Recursive directories" msgstr "Pastas recursivas" -#: optiondialog.cpp:1140 +#: optiondialog.cpp:1188 #, kde-format msgid "Whether to analyze subdirectories or not." msgstr "Se se analisam as sub-pastas ou não." -#: optiondialog.cpp:1142 +#: optiondialog.cpp:1190 #, kde-format msgid "File pattern(s):" msgstr "Padrões de ficheiros:" -#: optiondialog.cpp:1148 +#: optiondialog.cpp:1196 #, kde-format msgid "" "Pattern(s) of files to be analyzed. \n" @@ -2631,12 +2648,12 @@ "Caracteres especiais: '*' e '?'\n" "Podem ser indicados vários padrões usando o separador: ';'" -#: optiondialog.cpp:1153 +#: optiondialog.cpp:1201 #, kde-format msgid "File-anti-pattern(s):" msgstr "Anti-padrões de ficheiros:" -#: optiondialog.cpp:1159 +#: optiondialog.cpp:1207 #, kde-format msgid "" "Pattern(s) of files to be excluded from analysis. \n" @@ -2647,12 +2664,12 @@ "Caracteres especiais: '*' e '?'\n" "Podem ser indicados vários padrões usando o separador: ';'" -#: optiondialog.cpp:1164 +#: optiondialog.cpp:1212 #, kde-format msgid "Dir-anti-pattern(s):" msgstr "Anti-padrões de pastas:" -#: optiondialog.cpp:1170 +#: optiondialog.cpp:1218 #, kde-format msgid "" "Pattern(s) of directories to be excluded from analysis. \n" @@ -2663,12 +2680,12 @@ "Caracteres especiais: '*' e '?'\n" "Podem ser indicados vários padrões usando o separador: ';'" -#: optiondialog.cpp:1175 +#: optiondialog.cpp:1223 #, kde-format msgid "Use .cvsignore" msgstr "Usar o .cvsignore" -#: optiondialog.cpp:1179 +#: optiondialog.cpp:1227 #, kde-format msgid "" "Extends the antipattern to anything that would be ignored by CVS.\n" @@ -2678,22 +2695,22 @@ "Isto pode ser específico para cada pasta, através dos ficheiros '.cvsignore' " "locais." -#: optiondialog.cpp:1183 +#: optiondialog.cpp:1231 #, kde-format msgid "Find hidden files and directories" msgstr "Procurar os ficheiros e pastas escondidos" -#: optiondialog.cpp:1186 +#: optiondialog.cpp:1234 #, kde-format msgid "Finds hidden files and directories." msgstr "Procura os ficheiros e pastas escondidos." -#: optiondialog.cpp:1189 +#: optiondialog.cpp:1237 #, kde-format msgid "Follow file links" msgstr "Seguir as ligações de ficheiros" -#: optiondialog.cpp:1193 +#: optiondialog.cpp:1241 #, kde-format msgid "" "On: Compare the file the link points to.\n" @@ -2702,12 +2719,12 @@ "Ligado: Compara o ficheiro para o qual a ligação aponta.\n" "Desligado: Compara as ligações." -#: optiondialog.cpp:1197 +#: optiondialog.cpp:1245 #, kde-format msgid "Follow directory links" msgstr "Seguir as ligações de pastas" -#: optiondialog.cpp:1201 +#: optiondialog.cpp:1249 #, kde-format msgid "" "On: Compare the directory the link points to.\n" @@ -2716,12 +2733,12 @@ "Ligado: Compara a pastas para a qual a ligação aponta.\n" "Desligado: Compara as ligações." -#: optiondialog.cpp:1210 +#: optiondialog.cpp:1258 #, kde-format msgid "Case sensitive filename comparison" msgstr "Comparação de nomes de ficheiros com distinção de maiúsculas" -#: optiondialog.cpp:1214 +#: optiondialog.cpp:1262 #, kde-format msgid "" "The directory comparison will compare files or directories when their names " @@ -2734,12 +2751,12 @@ "Configure esta opção, no caso de os nomes terem mesmo de corresponder. (Por " "omissão, no Windows, está desligada; caso contrário, está ligada.)" -#: optiondialog.cpp:1218 +#: optiondialog.cpp:1266 #, kde-format msgid "Unfold all subdirectories on load" msgstr "Expandir todas as sub-pastas ao carregar" -#: optiondialog.cpp:1222 +#: optiondialog.cpp:1270 #, kde-format msgid "" "On: Unfold all subdirectories when starting a directory diff.\n" @@ -2748,12 +2765,12 @@ "Ligado: Expandir todas as sub-pastas ao iniciar uma diferença de pastas.\n" "Desligado: Deixar as sub-pastas fechadas." -#: optiondialog.cpp:1226 +#: optiondialog.cpp:1274 #, kde-format msgid "Skip directory status report" msgstr "Ignorar o relatório de estado da pasta" -#: optiondialog.cpp:1230 +#: optiondialog.cpp:1278 #, kde-format msgid "" "On: Do not show the Directory Comparison Status.\n" @@ -2762,27 +2779,27 @@ "Ligado: Não mostrar o Estado da Comparação de Pastas.\n" "Desligado: Mostrar a janela de estado no início." -#: optiondialog.cpp:1234 +#: optiondialog.cpp:1282 #, kde-format msgid "File Comparison Mode" msgstr "Modo de Comparação de Ficheiros" -#: optiondialog.cpp:1239 +#: optiondialog.cpp:1287 #, kde-format msgid "Binary comparison" msgstr "Comparação binária" -#: optiondialog.cpp:1241 +#: optiondialog.cpp:1289 #, kde-format msgid "Binary comparison of each file. (Default)" msgstr "Comparação binária de cada ficheiro. (Por omissão)" -#: optiondialog.cpp:1244 +#: optiondialog.cpp:1292 #, kde-format msgid "Full analysis" msgstr "Análise completa" -#: optiondialog.cpp:1246 +#: optiondialog.cpp:1294 #, kde-format msgid "" "Do a full analysis and show statistics information in extra columns.\n" @@ -2793,12 +2810,12 @@ "(Mais lento que a comparação binária, muito mais lento para ficheiros " "binários.)" -#: optiondialog.cpp:1250 +#: optiondialog.cpp:1298 #, kde-format msgid "Trust the size and modification date (unsafe)" msgstr "Confiar no tamanho e data de modificação (inseguro)" -#: optiondialog.cpp:1252 +#: optiondialog.cpp:1300 #, kde-format msgid "" "Assume that files are equal if the modification date and file length are " @@ -2813,7 +2830,7 @@ "aparecer como diferentes.\n" "Útil para as pastas grandes ou para redes lentas." -#: optiondialog.cpp:1257 +#: optiondialog.cpp:1305 #, kde-format msgid "" "Trust the size and date, but use binary comparison if date does not match " @@ -2822,7 +2839,7 @@ "Confiar na data e tamanho, mas usar uma comparação binária se a data não " "corresponder (inseguro)" -#: optiondialog.cpp:1259 +#: optiondialog.cpp:1307 #, kde-format msgid "" "Assume that files are equal if the modification date and file length are " @@ -2836,12 +2853,12 @@ "binária.\n" "Útil para as pastas grandes ou para redes lentas." -#: optiondialog.cpp:1264 +#: optiondialog.cpp:1312 #, kde-format msgid "Trust the size (unsafe)" msgstr "Confiar no tamanho (inseguro)" -#: optiondialog.cpp:1266 +#: optiondialog.cpp:1314 #, kde-format msgid "" "Assume that files are equal if their file lengths are equal.\n" @@ -2851,12 +2868,12 @@ "Assumir que os ficheiros são iguais se o seu tamanho é igual.\n" "Útil para as pastas grandes ou para redes lentas." -#: optiondialog.cpp:1273 +#: optiondialog.cpp:1321 #, kde-format msgid "Synchronize directories" msgstr "Sincronizar as pastas" -#: optiondialog.cpp:1277 +#: optiondialog.cpp:1325 #, kde-format msgid "" "Offers to store files in both directories so that\n" @@ -2867,12 +2884,12 @@ "de modo a que ambas as pastas fiquem iguais no fim.\n" "Funciona apenas ao comparar duas pastas sem indicar um destino." -#: optiondialog.cpp:1283 +#: optiondialog.cpp:1331 #, kde-format msgid "White space differences considered equal" msgstr "Diferenças de espaço em branco consideradas iguais" -#: optiondialog.cpp:1287 +#: optiondialog.cpp:1335 #, kde-format msgid "" "If files differ only by white space consider them equal.\n" @@ -2881,12 +2898,12 @@ "Se os ficheiros apenas diferem em espaço em branco considerá-los iguais.\n" "Isto está activo apenas quando é escolhida a análise completa." -#: optiondialog.cpp:1293 +#: optiondialog.cpp:1341 #, kde-format msgid "Copy newer instead of merging (unsafe)" msgstr "Copiar o mais recente em vez de juntar (inseguro)" -#: optiondialog.cpp:1297 +#: optiondialog.cpp:1345 #, kde-format msgid "" "Do not look inside, just take the newer file.\n" @@ -2897,12 +2914,12 @@ "(Use isto apenas se souber o que está a fazer!)\n" "Só faz efeito ao comparar duas pastas." -#: optiondialog.cpp:1302 +#: optiondialog.cpp:1350 #, kde-format msgid "Backup files (.orig)" msgstr "Salvaguarda dos ficheiros (.orig)" -#: optiondialog.cpp:1306 +#: optiondialog.cpp:1354 #, kde-format msgid "" "If a file would be saved over an old file, then the old file\n" @@ -2911,17 +2928,17 @@ "Quando um ficheiro for gravado por cima de um anterior, então o ficheiro\n" "antigo será renomeado para uma extensão '.orig' em vez de ser removido." -#: optiondialog.cpp:1382 optiondialog.cpp:1383 +#: optiondialog.cpp:1430 optiondialog.cpp:1431 #, kde-format msgid "Regional Settings" msgstr "Configuração Regional" -#: optiondialog.cpp:1397 +#: optiondialog.cpp:1454 #, kde-format msgid "Use the same encoding for everything:" msgstr "Utilizar a mesma codificação para tudo:" -#: optiondialog.cpp:1401 +#: optiondialog.cpp:1458 #, kde-format msgid "" "Enable this allows to change all encodings by changing the first only.\n" @@ -2931,17 +2948,17 @@ "primeira.\n" "Torne inactivo se forem necessárias opções individuais." -#: optiondialog.cpp:1405 +#: optiondialog.cpp:1462 #, kde-format msgid "Note: Local Encoding is \"%1\"" msgstr "Nota: A Codificação Local é \"%1\"" -#: optiondialog.cpp:1409 +#: optiondialog.cpp:1466 #, kde-format msgid "File Encoding for A:" msgstr "Codificação do Ficheiro A:" -#: optiondialog.cpp:1416 +#: optiondialog.cpp:1473 #, kde-format msgid "" "If enabled then Unicode (UTF-16 or UTF-8) encoding will be detected.\n" @@ -2955,32 +2972,32 @@ "codificação seleccionada como alternativa.\n" "(A detecção de Unicode depende dos primeiros 'bytes' de um ficheiro.)" -#: optiondialog.cpp:1419 optiondialog.cpp:1430 optiondialog.cpp:1441 +#: optiondialog.cpp:1476 optiondialog.cpp:1487 optiondialog.cpp:1498 #, kde-format msgid "Auto Detect Unicode" msgstr "Auto-Detectar o Unicode" -#: optiondialog.cpp:1425 +#: optiondialog.cpp:1482 #, kde-format msgid "File Encoding for B:" msgstr "Codificação do Ficheiro B:" -#: optiondialog.cpp:1436 +#: optiondialog.cpp:1493 #, kde-format msgid "File Encoding for C:" msgstr "Codificação do Ficheiro C:" -#: optiondialog.cpp:1447 +#: optiondialog.cpp:1504 #, kde-format msgid "File Encoding for Merge Output and Saving:" msgstr "Codificação do Ficheiro para Junção de Resultado e Gravação:" -#: optiondialog.cpp:1452 +#: optiondialog.cpp:1509 #, kde-format msgid "Auto Select" msgstr "Selecção Automática" -#: optiondialog.cpp:1456 +#: optiondialog.cpp:1513 #, kde-format msgid "" "If enabled then the encoding from the input files is used.\n" @@ -2992,17 +3009,17 @@ "Nos casos ambíguos, irá aparecer uma janela a perguntar ao utilizador qual a " "codificação com que deseja gravar." -#: optiondialog.cpp:1459 +#: optiondialog.cpp:1516 #, kde-format msgid "File Encoding for Preprocessor Files:" msgstr "Codificação do Ficheiro dos Ficheiros de Pré-processador:" -#: optiondialog.cpp:1471 +#: optiondialog.cpp:1528 #, kde-format msgid "Right To Left Language" msgstr "Língua da Direita para a Esquerda" -#: optiondialog.cpp:1475 +#: optiondialog.cpp:1532 #, kde-format msgid "" "Some languages are read from right to left.\n" @@ -3011,22 +3028,22 @@ "Algumas línguas são lidas da direita para esquerda.\n" "Esta opção muda o visualizador e editor de acordo com elas." -#: optiondialog.cpp:1485 +#: optiondialog.cpp:1542 #, kde-format msgid "Integration" msgstr "Integração" -#: optiondialog.cpp:1486 +#: optiondialog.cpp:1543 #, kde-format msgid "Integration Settings" msgstr "Configuração da Integração" -#: optiondialog.cpp:1499 +#: optiondialog.cpp:1564 #, kde-format msgid "Command line options to ignore:" msgstr "Opções da linha de comandos a ignorar:" -#: optiondialog.cpp:1505 +#: optiondialog.cpp:1570 #, kde-format msgid "" "List of command line options that should be ignored when KDiff3 is used by " @@ -3039,12 +3056,12 @@ "Se desejar indicar vários valores, separe-os por ';'\n" "Isto irá eliminar o erro de \"Opção desconhecida\"." -#: optiondialog.cpp:1510 +#: optiondialog.cpp:1575 #, kde-format msgid "Quit also via Escape key" msgstr "Sair também com a tecla Escape" -#: optiondialog.cpp:1514 +#: optiondialog.cpp:1579 #, kde-format msgid "" "Fast method to exit.\n" @@ -3053,7 +3070,7 @@ "Um método rápido para sair.\n" "Para os que estão habituados a usar a tecla Escape." -#: optiondialog.cpp:1598 +#: optiondialog.cpp:1653 #, kde-format msgid "This resets all options. Not only those of the current topic." msgstr "Isto repõe todas as opções, não só as do tópico actual." @@ -3109,80 +3126,70 @@ msgid "Disable Unsafe Options" msgstr "Desactivar Opções Inseguras" -#: pdiff.cpp:158 +#: pdiff.cpp:160 #, kde-format msgid "Loading A" msgstr "A Carregar o A" -#: pdiff.cpp:167 +#: pdiff.cpp:162 #, kde-format -msgid "Errors occurred during pre-processing of file A." -msgstr "Ocorreram erros no pré-processamento do ficheiro A." +msgid "Loading A: %1" +msgstr "A Carregar o A: %1" -#: pdiff.cpp:172 +#: pdiff.cpp:170 #, kde-format msgid "Loading B" msgstr "A Carregar o B" -#: pdiff.cpp:179 -#, kde-format -msgid "Errors occurred during pre-processing of file B." -msgstr "Ocorreram erros no pré-processamento do ficheiro B." - -#: pdiff.cpp:202 pdiff.cpp:241 +#: pdiff.cpp:201 pdiff.cpp:237 #, kde-format msgid "Diff: A <-> B" msgstr "Diferenças: A <-> B" -#: pdiff.cpp:208 pdiff.cpp:279 pdiff.cpp:293 +#: pdiff.cpp:207 pdiff.cpp:275 pdiff.cpp:289 #, kde-format msgid "Linediff: A <-> B" msgstr "Dif. Linhas: A <-> B" -#: pdiff.cpp:225 +#: pdiff.cpp:224 #, kde-format msgid "Loading C" msgstr "A Carregar o C" -#: pdiff.cpp:232 -#, kde-format -msgid "Errors occurred during pre-processing of file C." -msgstr "Ocorreram erros no pré-processamento do ficheiro C." - -#: pdiff.cpp:250 +#: pdiff.cpp:246 #, kde-format msgid "Diff: A <-> C" msgstr "Diferenças: A <-> C" -#: pdiff.cpp:261 +#: pdiff.cpp:257 #, kde-format msgid "Diff: B <-> C" msgstr "Diferenças: B <-> C" -#: pdiff.cpp:283 pdiff.cpp:297 +#: pdiff.cpp:279 pdiff.cpp:293 #, kde-format msgid "Linediff: B <-> C" msgstr "Dif. Linhas: B <-> C" -#: pdiff.cpp:287 pdiff.cpp:301 +#: pdiff.cpp:283 pdiff.cpp:297 #, kde-format msgid "Linediff: A <-> C" msgstr "Dif. Linhas: A <-> C" -#: pdiff.cpp:829 +#: pdiff.cpp:819 #, kde-format 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:835 pdiff.cpp:839 pdiff.cpp:843 +#: pdiff.cpp:825 pdiff.cpp:829 pdiff.cpp:833 #, 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:853 +#: pdiff.cpp:843 #, kde-format msgid "" "Some input files do not seem to be pure text files.\n" @@ -3193,17 +3200,17 @@ "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:863 +#: pdiff.cpp:853 #, kde-format msgid ", B" msgstr ", B" -#: pdiff.cpp:865 +#: pdiff.cpp:855 #, kde-format msgid ", C" msgstr ", C" -#: pdiff.cpp:867 +#: pdiff.cpp:857 #, kde-format msgid "" "Some input characters could not be converted to valid unicode.\n" @@ -3219,78 +3226,73 @@ "risco.\n" "Os ficheiros de entrada afectados estão em %1." -#: pdiff.cpp:1034 +#: pdiff.cpp:1032 #, kde-format msgid "Abort" msgstr "Interromper" -#: pdiff.cpp:1040 pdiff.cpp:1130 +#: pdiff.cpp:1038 pdiff.cpp:1129 #, kde-format msgid "Opening files..." -msgstr "A aceder aos ficheiros..." - -#: pdiff.cpp:1107 -#, kde-format -msgid "File open error" -msgstr "Erro ao abrir o ficheiro" +msgstr "A abrir os ficheiros..." -#: pdiff.cpp:1202 +#: pdiff.cpp:1212 #, kde-format msgid "Cutting selection..." msgstr "A cortar a selecção..." -#: pdiff.cpp:1223 +#: pdiff.cpp:1233 #, kde-format msgid "Copying selection to clipboard..." msgstr "A copiar a selecção para a área de transferência..." -#: pdiff.cpp:1239 +#: pdiff.cpp:1249 #, kde-format msgid "Inserting clipboard contents..." msgstr "A inserir o conteúdo da área de transferência..." -#: pdiff.cpp:1695 +#: pdiff.cpp:1705 #, kde-format msgid "Word wrap (Cancel disables word wrap)" msgstr "Mudança de linha (o Cancelar desactiva a mudança de linha)" -#: pdiff.cpp:1696 +#: pdiff.cpp:1706 #, kde-format msgid "Calculating max width for horizontal scrollbar" msgstr "A calcular a largura máxima para a barra de deslocamento horizontal" -#: pdiff.cpp:1911 +#: pdiff.cpp:1921 #, kde-format msgid "Save && Continue" msgstr "Gravar e Continuar" -#: pdiff.cpp:1912 +#: pdiff.cpp:1922 #, kde-format msgid "Continue Without Saving" msgstr "Continuar sem Gravar" -#: pdiff.cpp:2124 +#: pdiff.cpp:2134 #, kde-format msgid "Search complete." msgstr "Procura terminada." -#: pdiff.cpp:2124 +#: pdiff.cpp:2134 #, kde-format msgid "Search Complete" msgstr "Procura Terminada" -#: pdiff.cpp:2375 +#: pdiff.cpp:2385 #, kde-format 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:2375 +#: pdiff.cpp:2385 #, kde-format msgid "Error while adding manual diff range" msgstr "Erro ao adicionar o intervalo manual de diferenças" -#: progress.cpp:59 progress.cpp:71 +#: progress.cpp:61 progress.cpp:73 #, kde-format msgid "&Cancel" msgstr "&Cancelar" @@ -3300,125 +3302,125 @@ msgid "A (Base):" msgstr "A (Base):" -#: smalldialogs.cpp:68 smalldialogs.cpp:85 smalldialogs.cpp:102 -#: smalldialogs.cpp:144 +#: smalldialogs.cpp:71 smalldialogs.cpp:90 smalldialogs.cpp:109 +#: smalldialogs.cpp:154 #, kde-format msgid "File..." msgstr "Ficheiro..." -#: smalldialogs.cpp:70 smalldialogs.cpp:87 smalldialogs.cpp:104 -#: smalldialogs.cpp:146 +#: smalldialogs.cpp:73 smalldialogs.cpp:92 smalldialogs.cpp:111 +#: smalldialogs.cpp:156 #, kde-format msgid "Dir..." msgstr "Pasta..." -#: smalldialogs.cpp:96 +#: smalldialogs.cpp:103 #, kde-format msgid "C (Optional):" msgstr "C (Opcional):" -#: smalldialogs.cpp:119 +#: smalldialogs.cpp:126 #, kde-format msgid "Swap/Copy Names..." msgstr "Trocar/Copiar os Nomes..." -#: smalldialogs.cpp:124 smalldialogs.cpp:125 smalldialogs.cpp:126 +#: smalldialogs.cpp:131 smalldialogs.cpp:132 smalldialogs.cpp:133 #, kde-format msgid "Swap %1<->%2" msgstr "Trocar o %1<->%2" -#: smalldialogs.cpp:127 smalldialogs.cpp:128 smalldialogs.cpp:129 +#: smalldialogs.cpp:134 smalldialogs.cpp:135 smalldialogs.cpp:136 #, kde-format msgid "Copy %1->Output" msgstr "Copiar o %1->Resultado" -#: smalldialogs.cpp:130 smalldialogs.cpp:131 smalldialogs.cpp:132 +#: smalldialogs.cpp:137 smalldialogs.cpp:138 smalldialogs.cpp:139 #, kde-format msgid "Swap %1<->Output" msgstr "Trocar o %1<->Resultado" -#: smalldialogs.cpp:138 +#: smalldialogs.cpp:148 #, kde-format msgid "Output (optional):" msgstr "Resultado (opcional):" -#: smalldialogs.cpp:168 +#: smalldialogs.cpp:178 #, kde-format msgid "Configure..." msgstr "Configurar..." -#: smalldialogs.cpp:233 +#: smalldialogs.cpp:243 #, kde-format msgid "Open Directory" msgstr "Abrir uma Pasta" -#: smalldialogs.cpp:234 +#: smalldialogs.cpp:244 #, kde-format msgid "Select Output File" msgstr "Seleccionar o Ficheiro de Resultado" -#: smalldialogs.cpp:393 +#: smalldialogs.cpp:403 #, kde-format msgid "Search text:" msgstr "Texto da procura:" -#: smalldialogs.cpp:400 +#: smalldialogs.cpp:410 #, kde-format msgid "Case sensitive" msgstr "Distinguir capitalização" -#: smalldialogs.cpp:403 +#: smalldialogs.cpp:413 #, kde-format msgid "Search A" msgstr "Procurar A" -#: smalldialogs.cpp:408 +#: smalldialogs.cpp:418 #, kde-format msgid "Search B" msgstr "Procurar B" -#: smalldialogs.cpp:413 +#: smalldialogs.cpp:423 #, kde-format msgid "Search C" msgstr "Procurar C" -#: smalldialogs.cpp:418 +#: smalldialogs.cpp:428 #, kde-format msgid "Search output" msgstr "Resultado da procura" -#: smalldialogs.cpp:425 +#: smalldialogs.cpp:435 #, kde-format msgid "&Search" msgstr "&Procurar" -#: smalldialogs.cpp:444 +#: smalldialogs.cpp:454 #, kde-format msgid "Regular Expression Tester" msgstr "Teste de Expressões Regulares" -#: smalldialogs.cpp:457 +#: smalldialogs.cpp:467 #, kde-format msgid "Example auto merge line:" msgstr "Linha de junção automática do exemplo:" -#: smalldialogs.cpp:459 +#: smalldialogs.cpp:469 #, kde-format msgid "To test auto merge, copy a line as used in your files." msgstr "" "Para um teste da junção automática, copie uma linha usada nos seus ficheiros." -#: smalldialogs.cpp:465 smalldialogs.cpp:493 smalldialogs.cpp:529 +#: smalldialogs.cpp:475 smalldialogs.cpp:503 smalldialogs.cpp:539 #, kde-format msgid "Match result:" msgstr "Resultado correspondente:" -#: smalldialogs.cpp:484 +#: smalldialogs.cpp:494 #, kde-format msgid "Example history start line (with leading comment):" msgstr "Linha inicial do histórico do exemplo (com o comentário inicial):" -#: smalldialogs.cpp:486 +#: smalldialogs.cpp:496 #, kde-format msgid "" "Copy a history start line as used in your files,\n" @@ -3427,18 +3429,18 @@ "Copie uma linha inicial do histórico, como a usada nos seus ficheiros,\n" "incluindo o comentário inicial." -#: smalldialogs.cpp:512 +#: smalldialogs.cpp:522 #, kde-format msgid "History sort key order:" msgstr "Ordem da chave do histórico:" -#: smalldialogs.cpp:520 +#: smalldialogs.cpp:530 #, kde-format msgid "Example history entry start line (without leading comment):" msgstr "" "Linha inicial do item do histórico do exemplo (sem o comentário inicial):" -#: smalldialogs.cpp:522 +#: smalldialogs.cpp:532 #, kde-format msgid "" "Copy a history entry start line as used in your files,\n" @@ -3448,50 +3450,50 @@ "ficheiros,\n" "mas omita o comentário inicial." -#: smalldialogs.cpp:536 +#: smalldialogs.cpp:546 #, kde-format msgid "Sort key result:" msgstr "Resultado da chave de ordenação:" -#: smalldialogs.cpp:584 smalldialogs.cpp:594 smalldialogs.cpp:614 +#: smalldialogs.cpp:594 smalldialogs.cpp:604 smalldialogs.cpp:624 #, kde-format msgid "Match success." msgstr "Sucesso da correspondência." -#: smalldialogs.cpp:588 smalldialogs.cpp:598 smalldialogs.cpp:620 +#: smalldialogs.cpp:598 smalldialogs.cpp:608 smalldialogs.cpp:630 #, kde-format msgid "Match failed." msgstr "A correspondência falhou." -#: smalldialogs.cpp:605 +#: smalldialogs.cpp:615 #, kde-format msgid "Opening and closing parentheses do not match in regular expression." msgstr "" "Os parêntesis de abertura e fecho não correspondem na expressão regular." -#: SourceData.cpp:150 +#: SourceData.cpp:153 #, kde-format msgid "Writing clipboard data to temp file failed." msgstr "" "A escrita de dados da área de transferência para o ficheiro temporário " "falhou." -#: SourceData.cpp:154 +#: SourceData.cpp:157 #, kde-format msgid "From Clipboard" msgstr "Da Área de Transferência" -#: SourceData.cpp:335 +#: SourceData.cpp:348 #, kde-format msgid "%1 is not a normal file." msgstr "O %1 não é um ficheiro normal." -#: SourceData.cpp:427 +#: SourceData.cpp:440 #, kde-format msgid " Temp file is: %1" msgstr " O ficheiro temporário é: %1" -#: SourceData.cpp:432 +#: SourceData.cpp:445 #, kde-format msgid "" "Preprocessing possibly failed. Check this command:\n" @@ -3504,12 +3506,12 @@ " %1\n" "O comando de pré-processamento vai ser desactivado." -#: SourceData.cpp:443 SourceData.cpp:512 +#: SourceData.cpp:456 SourceData.cpp:525 #, kde-format msgid "File %1 too large to process. Skipping." msgstr "O ficheiro %1 é demasiado grande para ser processado. Será ignorado." -#: SourceData.cpp:487 +#: SourceData.cpp:500 #, kde-format msgid "" "The line-matching-preprocessing possibly failed. Check this command:\n" diff -Nru kdiff3-1.8.01/po/pt_BR/diff_ext.po kdiff3-1.8.3/po/pt_BR/diff_ext.po --- kdiff3-1.8.01/po/pt_BR/diff_ext.po 2019-05-18 01:02:20.000000000 +0000 +++ kdiff3-1.8.3/po/pt_BR/diff_ext.po 2020-06-25 00:18:45.000000000 +0000 @@ -5,8 +5,8 @@ msgid "" msgstr "" "Project-Id-Version: kdiff3\n" -"Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2019-03-22 03:09+0100\n" +"Report-Msgid-Bugs-To: https://bugs.kde.org\n" +"POT-Creation-Date: 2019-11-04 07:54+0100\n" "PO-Revision-Date: 2019-02-01 16:37-0200\n" "Last-Translator: Luiz Fernando Ranghetti \n" "Language-Team: Portuguese \n" @@ -17,119 +17,114 @@ "Plural-Forms: nplurals=2; plural=(n > 1);\n" "X-Generator: Lokalize 18.12.1\n" -#: diff_ext.cpp:391 +#: diff_ext.cpp:223 #, kde-format msgid "Compare with %1" msgstr "Comparar com %1" -#: diff_ext.cpp:392 +#: diff_ext.cpp:224 #, kde-format msgid "Merge with %1" msgstr "Mesclar com %1" -#: diff_ext.cpp:408 +#: diff_ext.cpp:234 #, kde-format msgid "3-way merge with base" msgstr "Mesclar 3 níveis com a base" -#: diff_ext.cpp:411 +#: diff_ext.cpp:237 #, kde-format msgid "Save '%1' for later" msgstr "Salvar '%1' para mais tarde" -#: diff_ext.cpp:426 +#: diff_ext.cpp:251 #, kde-format msgid "Compare with ..." msgstr "Comparar com..." -#: diff_ext.cpp:429 +#: diff_ext.cpp:254 #, kde-format msgid "Clear list" msgstr "Limpar lista" -#: diff_ext.cpp:434 +#: diff_ext.cpp:259 #, kde-format msgid "Compare" msgstr "Comparar" -#: diff_ext.cpp:438 +#: diff_ext.cpp:263 #, kde-format msgid "3 way comparison" msgstr "Comparação em 3 níveis" -#: diff_ext.cpp:444 +#: diff_ext.cpp:269 #, kde-format msgid "About Diff-Ext ..." msgstr "Sobre o Diff-Ext ..." -#: diff_ext.cpp:515 +#: diff_ext.cpp:340 #, kde-format msgid "(32 Bit)" msgstr "(32 Bit)" -#: diff_ext.cpp:517 -#, kde-format -msgid "(64 Bit)" -msgstr "(64 Bit)" - -#: diff_ext.cpp:518 +#: diff_ext.cpp:342 #, kde-format msgid "Diff-Ext Copyright (c) 2003-2006, Sergey Zorin. All rights reserved.\n" msgstr "" "Diff-Ext Copyright (c) 2003-2006, Sergey Zorin. Todos os direitos " "reservados.\n" -#: diff_ext.cpp:519 +#: diff_ext.cpp:343 #, kde-format msgid "This software is distributable under the BSD-2-Clause license.\n" msgstr "Este software é distribuído sob a licença BSD-2-Clause.\n" -#: diff_ext.cpp:520 +#: diff_ext.cpp:344 #, kde-format msgid "Some extensions for KDiff3 (c) 2006-2013 by Joachim Eibl.\n" msgstr "Algumas extensões para o KDiff3 (c) 2006-2013 por Joachim Eibl.\n" -#: diff_ext.cpp:521 +#: diff_ext.cpp:345 #, kde-format msgid "Homepage for Diff-Ext: http://diff-ext.sourceforge.net\n" msgstr "Site do Diff-Ext: http://diff-ext.sourceforge.net\n" -#: diff_ext.cpp:522 +#: diff_ext.cpp:346 #, kde-format msgid "About Diff-Ext for KDiff3 " msgstr "Sobre o Diff-Ext para KDiff3 " -#: diff_ext.cpp:551 +#: diff_ext.cpp:375 #, kde-format msgid "Compare selected files" msgstr "Comparar arquivos selecionados" -#: diff_ext.cpp:557 diff_ext.cpp:577 +#: diff_ext.cpp:381 diff_ext.cpp:399 #, kde-format msgid "Compare '%1' with '%2'" msgstr "Comparar '%1' com '%2'" -#: diff_ext.cpp:563 +#: diff_ext.cpp:386 #, kde-format msgid "Save '%1' for later operation" msgstr "Salvar '%1' para operação futura" -#: diff_ext.cpp:619 +#: diff_ext.cpp:440 #, kde-format msgid "Could not start KDiff3. Please rerun KDiff3 installation." msgstr "Não foi possível iniciar o KDiff3. Reinstale o KDiff3." -#: diff_ext.cpp:620 +#: diff_ext.cpp:441 #, kde-format msgid "Command" msgstr "Comando" -#: diff_ext.cpp:621 +#: diff_ext.cpp:442 #, kde-format msgid "CommandLine" msgstr "Linha de comando" -#: diff_ext.cpp:622 +#: diff_ext.cpp:443 #, kde-format msgid "Diff-Ext For KDiff3" msgstr "Diff-Ext para KDiff3" \ No newline at end of file diff -Nru kdiff3-1.8.01/po/pt_BR/kdiff3fileitemactionplugin.po kdiff3-1.8.3/po/pt_BR/kdiff3fileitemactionplugin.po --- kdiff3-1.8.01/po/pt_BR/kdiff3fileitemactionplugin.po 2019-05-18 01:02:20.000000000 +0000 +++ kdiff3-1.8.3/po/pt_BR/kdiff3fileitemactionplugin.po 2020-06-25 00:18:45.000000000 +0000 @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: \n" -"Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2019-03-22 03:09+0100\n" +"Report-Msgid-Bugs-To: https://bugs.kde.org\n" +"POT-Creation-Date: 2019-08-30 07:40+0200\n" "PO-Revision-Date: 2019-04-09 11:42-0300\n" "Last-Translator: Luiz Fernando Ranghetti \n" "Language-Team: Portuguese \n" diff -Nru kdiff3-1.8.01/po/pt_BR/kdiff3.po kdiff3-1.8.3/po/pt_BR/kdiff3.po --- kdiff3-1.8.01/po/pt_BR/kdiff3.po 2019-05-18 01:02:20.000000000 +0000 +++ kdiff3-1.8.3/po/pt_BR/kdiff3.po 2020-06-25 00:18:45.000000000 +0000 @@ -6,315 +6,319 @@ # Lisiane Sztoltz Teixeira , 2004. # Diniz Fernando Bortolotto Ferreira , 2006. # Diniz Bortolotto , 2006, 2007, 2008. -# André Marcelo Alvarenga , 2008, 2009, 2010, 2011, 2012, 2013, 2015. -# Luiz Fernando Ranghetti , 2009, 2018, 2019. +# André Marcelo Alvarenga , 2008, 2009, 2010, 2011, 2012, 2013, 2015, 2019. +# Luiz Fernando Ranghetti , 2009, 2018, 2019, 2020. # Marcus Gama , 2011. # Frederico Gonçalves Guimarães , 2019. msgid "" msgstr "" "Project-Id-Version: kdiff3\n" -"Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2019-04-18 08:02+0200\n" -"PO-Revision-Date: 2019-04-09 22:56-0300\n" -"Last-Translator: Frederico Gonçalves Guimarães \n" -"Language-Team: Portuguese \n" +"Report-Msgid-Bugs-To: https://bugs.kde.org\n" +"POT-Creation-Date: 2020-06-22 07:48+0200\n" +"PO-Revision-Date: 2020-02-10 14:28-0300\n" +"Last-Translator: Luiz Fernando Ranghetti \n" +"Language-Team: Portuguese \n" "Language: pt_BR\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" -"X-Generator: Lokalize 2.0\n" +"X-Generator: Lokalize 19.12.1\n" #, kde-format msgctxt "NAME OF TRANSLATORS" msgid "Your names" -msgstr "Diniz Bortolotto, Frederico Gonçalves Guimarães" +msgstr "" +"Diniz Bortolotto, Frederico Gonçalves Guimarães, André Marcelo Alvarenga, " +"Luiz Fernando Ranghetti" #, kde-format msgctxt "EMAIL OF TRANSLATORS" msgid "Your emails" -msgstr "diniz.bortolotto@gmail.com, frederico@teia.bio.br" +msgstr "" +"diniz.bortolotto@gmail.com, frederico@teia.bio.br, alvarenga@kde.org, " +"elchevive@opensuse.org" -#: difftextwindow.cpp:412 +#: difftextwindow.cpp:414 #, kde-format msgid "File %1: Line %2" msgstr "Arquivo %1: Linha %2" -#: difftextwindow.cpp:414 +#: difftextwindow.cpp:416 #, kde-format msgid "File %1: Line not available" msgstr "Arquivo %1: Linha não disponível" -#: difftextwindow.cpp:1780 +#: difftextwindow.cpp:1778 #, kde-format msgid "Encoding:" msgstr "Codificação:" -#: difftextwindow.cpp:1782 mergeresultwindow.cpp:3138 optiondialog.cpp:818 +#: difftextwindow.cpp:1781 mergeresultwindow.cpp:3166 optiondialog.cpp:840 #, kde-format msgid "Line end style:" msgstr "Estilo de fim de linha:" -#: difftextwindow.cpp:1810 directorymergewindow.cpp:382 -#: directorymergewindow.cpp:433 directorymergewindow.cpp:524 -#: directorymergewindow.cpp:3058 directorymergewindow.cpp:3189 -#: directorymergewindow.cpp:3417 mergeresultwindow.cpp:942 -#: mergeresultwindow.cpp:944 mergeresultwindow.cpp:946 -#: mergeresultwindow.cpp:948 mergeresultwindow.cpp:1814 -#: mergeresultwindow.cpp:3170 mergeresultwindow.cpp:3177 optiondialog.cpp:962 -#: optiondialog.cpp:975 pdiff.cpp:833 pdiff.cpp:835 pdiff.cpp:837 pdiff.cpp:839 -#: pdiff.cpp:861 smalldialogs.cpp:124 smalldialogs.cpp:126 smalldialogs.cpp:127 -#: smalldialogs.cpp:130 +#: difftextwindow.cpp:1809 directorymergewindow.cpp:383 +#: directorymergewindow.cpp:434 directorymergewindow.cpp:525 +#: directorymergewindow.cpp:3072 directorymergewindow.cpp:3203 +#: directorymergewindow.cpp:3431 mergeresultwindow.cpp:970 +#: mergeresultwindow.cpp:972 mergeresultwindow.cpp:974 +#: mergeresultwindow.cpp:976 mergeresultwindow.cpp:1842 +#: mergeresultwindow.cpp:3198 mergeresultwindow.cpp:3205 optiondialog.cpp:1002 +#: optiondialog.cpp:1015 pdiff.cpp:823 pdiff.cpp:825 pdiff.cpp:827 +#: pdiff.cpp:829 pdiff.cpp:851 smalldialogs.cpp:131 smalldialogs.cpp:133 +#: smalldialogs.cpp:134 smalldialogs.cpp:137 #, kde-format msgid "A" msgstr "A" -#: difftextwindow.cpp:1810 directorymergewindow.cpp:384 -#: directorymergewindow.cpp:436 directorymergewindow.cpp:526 -#: directorymergewindow.cpp:3064 directorymergewindow.cpp:3190 -#: directorymergewindow.cpp:3418 mergeresultwindow.cpp:942 -#: mergeresultwindow.cpp:944 mergeresultwindow.cpp:950 -#: mergeresultwindow.cpp:952 mergeresultwindow.cpp:1816 -#: mergeresultwindow.cpp:3172 mergeresultwindow.cpp:3179 optiondialog.cpp:963 -#: optiondialog.cpp:976 pdiff.cpp:833 pdiff.cpp:835 pdiff.cpp:841 pdiff.cpp:843 -#: pdiff.cpp:863 smalldialogs.cpp:124 smalldialogs.cpp:125 smalldialogs.cpp:128 -#: smalldialogs.cpp:131 +#: difftextwindow.cpp:1809 directorymergewindow.cpp:385 +#: directorymergewindow.cpp:437 directorymergewindow.cpp:527 +#: directorymergewindow.cpp:3078 directorymergewindow.cpp:3204 +#: directorymergewindow.cpp:3432 mergeresultwindow.cpp:970 +#: mergeresultwindow.cpp:972 mergeresultwindow.cpp:978 +#: mergeresultwindow.cpp:980 mergeresultwindow.cpp:1844 +#: mergeresultwindow.cpp:3200 mergeresultwindow.cpp:3207 optiondialog.cpp:1003 +#: optiondialog.cpp:1016 pdiff.cpp:823 pdiff.cpp:825 pdiff.cpp:831 +#: pdiff.cpp:833 pdiff.cpp:853 smalldialogs.cpp:131 smalldialogs.cpp:132 +#: smalldialogs.cpp:135 smalldialogs.cpp:138 #, kde-format msgid "B" msgstr "B" -#: difftextwindow.cpp:1810 directorymergewindow.cpp:386 -#: directorymergewindow.cpp:439 directorymergewindow.cpp:528 -#: directorymergewindow.cpp:3070 directorymergewindow.cpp:3191 -#: directorymergewindow.cpp:3419 mergeresultwindow.cpp:946 -#: mergeresultwindow.cpp:948 mergeresultwindow.cpp:950 -#: mergeresultwindow.cpp:952 mergeresultwindow.cpp:1818 -#: mergeresultwindow.cpp:3174 mergeresultwindow.cpp:3181 optiondialog.cpp:977 -#: pdiff.cpp:837 pdiff.cpp:839 pdiff.cpp:841 pdiff.cpp:843 pdiff.cpp:865 -#: smalldialogs.cpp:125 smalldialogs.cpp:126 smalldialogs.cpp:129 -#: smalldialogs.cpp:132 +#: difftextwindow.cpp:1809 directorymergewindow.cpp:387 +#: directorymergewindow.cpp:440 directorymergewindow.cpp:529 +#: directorymergewindow.cpp:3084 directorymergewindow.cpp:3205 +#: directorymergewindow.cpp:3433 mergeresultwindow.cpp:974 +#: mergeresultwindow.cpp:976 mergeresultwindow.cpp:978 +#: mergeresultwindow.cpp:980 mergeresultwindow.cpp:1846 +#: mergeresultwindow.cpp:3202 mergeresultwindow.cpp:3209 optiondialog.cpp:1017 +#: pdiff.cpp:827 pdiff.cpp:829 pdiff.cpp:831 pdiff.cpp:833 pdiff.cpp:855 +#: smalldialogs.cpp:132 smalldialogs.cpp:133 smalldialogs.cpp:136 +#: smalldialogs.cpp:139 #, kde-format msgid "C" msgstr "C" -#: difftextwindow.cpp:1810 +#: difftextwindow.cpp:1809 #, kde-format msgid "A (Base)" -msgstr "A (Base)" +msgstr "A (base)" -#: difftextwindow.cpp:1812 +#: difftextwindow.cpp:1811 #, kde-format msgid "Encoding: %1" msgstr "Codificação: %1" -#: difftextwindow.cpp:1813 mergeresultwindow.cpp:3183 +#: difftextwindow.cpp:1812 mergeresultwindow.cpp:3211 #, kde-format msgid "Unix" msgstr "Unix" -#: difftextwindow.cpp:1813 mergeresultwindow.cpp:3184 +#: difftextwindow.cpp:1812 mergeresultwindow.cpp:3212 #, kde-format msgid "DOS" msgstr "DOS" -#: difftextwindow.cpp:1813 +#: difftextwindow.cpp:1812 #, kde-format msgid "Line end style: %1" msgstr "Estilo de fim de linha: %1" -#: difftextwindow.cpp:1835 kdiff3.cpp:873 +#: difftextwindow.cpp:1834 kdiff3.cpp:874 #, kde-format msgid "Top line" msgstr "Linha superior" -#: difftextwindow.cpp:1845 +#: difftextwindow.cpp:1843 #, kde-format msgid "End" msgstr "Fim" -#: difftextwindow.cpp:1903 smalldialogs.cpp:235 +#: difftextwindow.cpp:1901 smalldialogs.cpp:245 #, kde-format msgid "Open File" msgstr "Abrir arquivo" -#: difftextwindow.cpp:1951 optiondialog.cpp:387 +#: difftextwindow.cpp:1943 optiondialog.cpp:389 #, kde-format msgid "Unicode, 8 bit" msgstr "Unicode, 8 bit" -#: difftextwindow.cpp:1966 +#: difftextwindow.cpp:1958 #, kde-format msgid "Other" msgstr "Outro" -#: directorymergewindow.cpp:409 directorymergewindow.cpp:3424 +#: directorymergewindow.cpp:410 directorymergewindow.cpp:3438 #, kde-format msgid "Copy A to B" msgstr "Copiar A para B" -#: directorymergewindow.cpp:412 directorymergewindow.cpp:3425 +#: directorymergewindow.cpp:413 directorymergewindow.cpp:3439 #, kde-format msgid "Copy B to A" msgstr "Copiar B para A" -#: directorymergewindow.cpp:415 directorymergewindow.cpp:3426 +#: directorymergewindow.cpp:416 directorymergewindow.cpp:3440 #, kde-format msgid "Delete A" msgstr "Excluir A" -#: directorymergewindow.cpp:418 directorymergewindow.cpp:3427 +#: directorymergewindow.cpp:419 directorymergewindow.cpp:3441 #, kde-format msgid "Delete B" msgstr "Excluir B" -#: directorymergewindow.cpp:421 +#: directorymergewindow.cpp:422 #, kde-format msgid "Delete A & B" -msgstr "Excluir A & B" +msgstr "Excluir A e B" -#: directorymergewindow.cpp:424 directorymergewindow.cpp:3429 +#: directorymergewindow.cpp:425 directorymergewindow.cpp:3443 #, kde-format msgid "Merge to A" msgstr "Mesclar com A" -#: directorymergewindow.cpp:427 directorymergewindow.cpp:3430 +#: directorymergewindow.cpp:428 directorymergewindow.cpp:3444 #, kde-format msgid "Merge to B" msgstr "Mesclar com B" -#: directorymergewindow.cpp:430 +#: directorymergewindow.cpp:431 #, kde-format msgid "Merge to A & B" -msgstr "Mesclar com A & B" +msgstr "Mesclar com A e B" -#: directorymergewindow.cpp:442 directorymergewindow.cpp:3421 +#: directorymergewindow.cpp:443 directorymergewindow.cpp:3435 #, kde-format msgid "Delete (if exists)" msgstr "Excluir (se existir)" -#: directorymergewindow.cpp:445 directorymergewindow.cpp:448 -#: directorymergewindow.cpp:3420 optiondialog.cpp:925 smalldialogs.cpp:113 +#: directorymergewindow.cpp:446 directorymergewindow.cpp:449 +#: directorymergewindow.cpp:3434 smalldialogs.cpp:120 #, kde-format msgid "Merge" msgstr "Mesclar" -#: directorymergewindow.cpp:445 directorymergewindow.cpp:448 +#: directorymergewindow.cpp:446 directorymergewindow.cpp:449 #, kde-format msgid "Merge (manual)" msgstr "Mesclar (manual)" -#: directorymergewindow.cpp:451 +#: directorymergewindow.cpp:452 #, kde-format msgid "Error: Conflicting File Types" msgstr "Erro: Tipos de arquivos conflitantes" -#: directorymergewindow.cpp:454 +#: directorymergewindow.cpp:455 #, kde-format msgid "Error: Changed and Deleted" msgstr "Erro: Alterado e excluído" -#: directorymergewindow.cpp:457 +#: directorymergewindow.cpp:458 #, kde-format msgid "Error: Dates are equal but files are not." msgstr "Erro: As datas são iguais, mas os arquivos não." -#: directorymergewindow.cpp:471 +#: directorymergewindow.cpp:472 #, kde-format msgid "Done" msgstr "Concluído" -#: directorymergewindow.cpp:473 +#: directorymergewindow.cpp:474 #, kde-format msgid "Error" msgstr "Erro" -#: directorymergewindow.cpp:475 +#: directorymergewindow.cpp:476 #, kde-format msgid "Skipped." msgstr "Ignorado." -#: directorymergewindow.cpp:477 +#: directorymergewindow.cpp:478 #, kde-format msgid "Not saved." msgstr "Não salvo." -#: directorymergewindow.cpp:479 +#: directorymergewindow.cpp:480 #, kde-format msgid "In progress..." msgstr "Em progresso..." -#: directorymergewindow.cpp:481 +#: directorymergewindow.cpp:482 #, kde-format msgid "To do." msgstr "A fazer." -#: directorymergewindow.cpp:522 +#: directorymergewindow.cpp:523 #, kde-format msgid "Name" msgstr "Nome" -#: directorymergewindow.cpp:530 +#: directorymergewindow.cpp:531 #, kde-format msgid "Operation" msgstr "Operação" -#: directorymergewindow.cpp:532 +#: directorymergewindow.cpp:533 #, kde-format msgid "Status" msgstr "Status" -#: directorymergewindow.cpp:534 +#: directorymergewindow.cpp:535 #, kde-format msgid "Unsolved" msgstr "Não resolvido" -#: directorymergewindow.cpp:536 +#: directorymergewindow.cpp:537 #, kde-format msgid "Solved" msgstr "Resolvido" -#: directorymergewindow.cpp:538 +#: directorymergewindow.cpp:539 #, kde-format msgid "Nonwhite" msgstr "Não em branco" -#: directorymergewindow.cpp:540 +#: directorymergewindow.cpp:541 #, kde-format msgid "White" msgstr "Em branco" -#: directorymergewindow.cpp:674 +#: directorymergewindow.cpp:676 #, kde-format msgid "Unable to compare non-normal file with normal file." msgstr "" "Não é possível comparar um arquivo fora do normal com um arquivo normal." -#: directorymergewindow.cpp:688 +#: directorymergewindow.cpp:690 #, kde-format msgid "Mix of links and normal files." msgstr "Mistura de links e arquivos normais." -#: directorymergewindow.cpp:695 +#: directorymergewindow.cpp:697 #, kde-format msgid "Link: " msgstr "Link: " -#: directorymergewindow.cpp:704 +#: directorymergewindow.cpp:706 #, kde-format msgid "Size. " msgstr "Tamanho. " -#: directorymergewindow.cpp:718 directorymergewindow.cpp:728 +#: directorymergewindow.cpp:720 directorymergewindow.cpp:730 #, kde-format msgid "Date & Size: " -msgstr "Data e Tamanho: " +msgstr "Data e tamanho: " -#: directorymergewindow.cpp:748 +#: directorymergewindow.cpp:751 #, kde-format msgid "Comparing file..." msgstr "Comparando arquivo..." -#: directorymergewindow.cpp:801 +#: directorymergewindow.cpp:813 #, kde-format msgid "" "You are currently doing a directory merge. Are you sure, you want to abort " @@ -323,48 +327,48 @@ "Você está neste momento fazendo uma mesclagem de diretórios. Tem certeza que " "deseja interromper a mesclagem e reexaminar o diretório?" -#: directorymergewindow.cpp:802 kdiff3.cpp:698 kdiff3.cpp:708 kdiff3.cpp:720 -#: mergeresultwindow.cpp:372 pdiff.cpp:1033 pdiff.cpp:1910 pdiff.cpp:1920 +#: directorymergewindow.cpp:814 kdiff3.cpp:697 kdiff3.cpp:707 kdiff3.cpp:719 +#: mergeresultwindow.cpp:400 pdiff.cpp:1031 pdiff.cpp:1920 pdiff.cpp:1930 #, kde-format msgid "Warning" msgstr "Aviso" -#: directorymergewindow.cpp:803 directorymergewindow.cpp:3393 +#: directorymergewindow.cpp:815 directorymergewindow.cpp:3407 #, kde-format msgid "Rescan" msgstr "Reexaminar" -#: directorymergewindow.cpp:804 pdiff.cpp:1035 +#: directorymergewindow.cpp:816 pdiff.cpp:1033 #, kde-format msgid "Continue Merging" msgstr "Continuar mesclando" -#: directorymergewindow.cpp:971 +#: directorymergewindow.cpp:984 #, kde-format msgid "Opening of directories failed:" msgstr "Não foi possível abrir os diretórios:" -#: directorymergewindow.cpp:975 +#: directorymergewindow.cpp:988 #, 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:980 +#: directorymergewindow.cpp:993 #, 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:985 +#: directorymergewindow.cpp:998 #, 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:988 +#: directorymergewindow.cpp:1001 #, kde-format msgid "Directory Open Error" msgstr "Erro na abertura do diretório" -#: directorymergewindow.cpp:996 +#: directorymergewindow.cpp:1009 #, kde-format msgid "" "The destination directory must not be the same as A or B when three " @@ -375,49 +379,49 @@ "diretórios são mesclados.\n" "Verifique novamente antes de continuar." -#: directorymergewindow.cpp:998 +#: directorymergewindow.cpp:1011 #, kde-format msgid "Parameter Warning" msgstr "Aviso de parâmetro" -#: directorymergewindow.cpp:1003 +#: directorymergewindow.cpp:1016 #, kde-format msgid "Scanning directories..." msgstr "Pesquisando diretórios..." -#: directorymergewindow.cpp:1029 +#: directorymergewindow.cpp:1042 #, kde-format msgid "Reading Directory A" msgstr "Lendo o diretório A" -#: directorymergewindow.cpp:1038 +#: directorymergewindow.cpp:1051 #, kde-format msgid "Reading Directory B" msgstr "Lendo o diretório B" -#: directorymergewindow.cpp:1048 +#: directorymergewindow.cpp:1061 #, kde-format msgid "Reading Directory C" msgstr "Lendo o diretório C" -#: directorymergewindow.cpp:1064 +#: directorymergewindow.cpp:1077 #, kde-format msgid "Some subdirectories were not readable in" msgstr "Alguns subdiretórios não eram legíveis" -#: directorymergewindow.cpp:1069 +#: directorymergewindow.cpp:1082 #, kde-format msgid "Check the permissions of the subdirectories." msgstr "Verifique as permissões dos subdiretórios." -#: directorymergewindow.cpp:1106 kdiff3.cpp:666 kdiff3.cpp:753 kdiff3.cpp:777 -#: kdiff3.cpp:1065 kdiff3.cpp:1086 pdiff.cpp:1116 pdiff.cpp:1170 pdiff.cpp:1218 -#: pdiff.cpp:1234 pdiff.cpp:1277 pdiff.cpp:1301 +#: directorymergewindow.cpp:1119 kdiff3.cpp:665 kdiff3.cpp:752 kdiff3.cpp:776 +#: kdiff3.cpp:1072 kdiff3.cpp:1093 pdiff.cpp:1115 pdiff.cpp:1178 pdiff.cpp:1228 +#: pdiff.cpp:1244 pdiff.cpp:1287 pdiff.cpp:1311 #, kde-format msgid "Ready." msgstr "Pronto." -#: directorymergewindow.cpp:1121 +#: directorymergewindow.cpp:1134 #, kde-format msgid "" "Directory Comparison Status\n" @@ -432,22 +436,22 @@ "Número de arquivos iguais: %2\n" "Número de arquivos diferentes: %3" -#: directorymergewindow.cpp:1128 +#: directorymergewindow.cpp:1141 #, kde-format msgid "Number of manual merges: %1" msgstr "Número de mesclagens manuais: %1" -#: directorymergewindow.cpp:1394 +#: directorymergewindow.cpp:1407 #, kde-format msgid "This affects all merge operations." msgstr "Isto afeta todas as operações de mesclagem." -#: directorymergewindow.cpp:1395 +#: directorymergewindow.cpp:1408 #, kde-format msgid "Changing All Merge Operations" msgstr "Alterando todas as operações de mesclagem" -#: directorymergewindow.cpp:1695 +#: directorymergewindow.cpp:1708 #, kde-format msgid "" "Processing %1 / %2\n" @@ -456,44 +460,44 @@ "Processando %1 / %2\n" "%3" -#: directorymergewindow.cpp:1738 directorymergewindow.cpp:1742 +#: directorymergewindow.cpp:1751 directorymergewindow.cpp:1755 #, kde-format msgid "Some files could not be processed." msgstr "Não foi possível processar alguns arquivos." -#: directorymergewindow.cpp:2222 directorymergewindow.cpp:2247 -#: directorymergewindow.cpp:2271 +#: directorymergewindow.cpp:2235 directorymergewindow.cpp:2260 +#: directorymergewindow.cpp:2285 #, kde-format msgid "This operation is currently not possible." msgstr "Esta operação não é possível no momento." -#: directorymergewindow.cpp:2222 directorymergewindow.cpp:2247 -#: directorymergewindow.cpp:2271 directorymergewindow.cpp:2552 +#: directorymergewindow.cpp:2235 directorymergewindow.cpp:2260 +#: directorymergewindow.cpp:2285 directorymergewindow.cpp:2565 #, kde-format msgid "Operation Not Possible" msgstr "Operação impossível" -#: directorymergewindow.cpp:2318 +#: directorymergewindow.cpp:2332 #, kde-format msgid "An error occurred while copying." msgstr "Ocorreu um erro durante a cópia." -#: directorymergewindow.cpp:2319 directorymergewindow.cpp:2759 +#: directorymergewindow.cpp:2333 directorymergewindow.cpp:2772 #, kde-format msgid "Merge Error" msgstr "Erro na mesclagem" -#: directorymergewindow.cpp:2396 +#: directorymergewindow.cpp:2410 #, kde-format msgid "Unknown merge operation. (This must never happen!)" msgstr "Operação de mesclagem desconhecida. (Isto nunca deveria acontecer!)" -#: directorymergewindow.cpp:2441 +#: directorymergewindow.cpp:2455 #, kde-format msgid "Unknown merge operation." msgstr "Operação de mesclagem desconhecida." -#: directorymergewindow.cpp:2454 +#: directorymergewindow.cpp:2468 #, kde-format msgid "" "The merge is about to begin.\n" @@ -513,22 +517,22 @@ "Saiba que esse programa ainda está em fase beta, e NÃO HÁ GARANTIA alguma! " "Faça backups dos seus dados!" -#: directorymergewindow.cpp:2459 +#: directorymergewindow.cpp:2473 #, kde-format msgid "Starting Merge" -msgstr "Iniciando a mesclagem" +msgstr "Iniciando mesclagem" -#: directorymergewindow.cpp:2460 +#: directorymergewindow.cpp:2474 #, kde-format msgid "Do It" msgstr "Fazer" -#: directorymergewindow.cpp:2461 +#: directorymergewindow.cpp:2475 #, kde-format msgid "Simulate It" msgstr "Simular" -#: directorymergewindow.cpp:2487 +#: directorymergewindow.cpp:2501 #, kde-format msgid "" "The highlighted item has a different type in the different directories. " @@ -537,7 +541,7 @@ "O item selecionado tem um tipo diferente nos diferentes diretórios. " "Selecione o que fazer." -#: directorymergewindow.cpp:2491 +#: directorymergewindow.cpp:2505 #, kde-format msgid "" "The modification dates of the file are equal but the files are not. Select " @@ -546,7 +550,7 @@ "As datas de modificação do arquivo são iguais, mas os arquivos não. " "Selecione o que fazer." -#: directorymergewindow.cpp:2495 +#: directorymergewindow.cpp:2509 #, kde-format msgid "" "The highlighted item was changed in one directory and deleted in the other. " @@ -555,7 +559,7 @@ "O item selecionado foi alterado em um diretório e excluído no outro. " "Selecione o que fazer." -#: directorymergewindow.cpp:2552 +#: directorymergewindow.cpp:2565 #, kde-format msgid "" "This operation is currently not possible because directory merge is " @@ -564,7 +568,7 @@ "Esta operação não é possível no momento porque está ocorrendo uma mesclagem " "de diretório." -#: directorymergewindow.cpp:2609 +#: directorymergewindow.cpp:2622 #, kde-format msgid "" "There was an error in the last step.\n" @@ -574,32 +578,32 @@ "Ocorreu um erro no último passo.\n" "Você quer continuar com o item que causou o erro ou prefere ignorá-lo?" -#: directorymergewindow.cpp:2611 +#: directorymergewindow.cpp:2624 #, kde-format msgid "Continue merge after an error" -msgstr "Continuar a mesclagem após um erro" +msgstr "Continuar mesclagem após um erro" -#: directorymergewindow.cpp:2612 +#: directorymergewindow.cpp:2625 #, kde-format msgid "Continue With Last Item" msgstr "Continuar com o último item" -#: directorymergewindow.cpp:2613 +#: directorymergewindow.cpp:2626 #, kde-format msgid "Skip Item" -msgstr "Ignorar o item" +msgstr "Ignorar item" -#: directorymergewindow.cpp:2709 +#: directorymergewindow.cpp:2722 #, kde-format msgid "Merge operation complete." msgstr "Operação de mesclagem completa." -#: directorymergewindow.cpp:2709 directorymergewindow.cpp:2712 +#: directorymergewindow.cpp:2722 directorymergewindow.cpp:2725 #, kde-format msgid "Merge Complete" msgstr "Mesclagem completa" -#: directorymergewindow.cpp:2722 +#: directorymergewindow.cpp:2735 #, kde-format msgid "" "Simulated merge complete: Check if you agree with the proposed operations." @@ -607,49 +611,49 @@ "A simulação de mesclagem está completa: Verifique se concorda com as " "operações propostas." -#: directorymergewindow.cpp:2758 +#: directorymergewindow.cpp:2771 #, kde-format msgid "An error occurred. Press OK to see detailed information." msgstr "Ocorreu um erro. Pressione OK para ver informações detalhadas." -#: directorymergewindow.cpp:2791 +#: directorymergewindow.cpp:2804 #, kde-format msgid "Error: While deleting %1: Creating backup failed." msgstr "Erro ao tentar excluir %1: Não foi possível criar o backup." -#: directorymergewindow.cpp:2798 +#: directorymergewindow.cpp:2811 #, kde-format msgid "delete directory recursively( %1 )" msgstr "excluir o diretório recursivamente( %1 )" -#: directorymergewindow.cpp:2800 +#: directorymergewindow.cpp:2813 #, kde-format msgid "delete( %1 )" msgstr "excluir( %1 )" -#: directorymergewindow.cpp:2815 +#: directorymergewindow.cpp:2828 #, kde-format msgid "Error: delete dir operation failed while trying to read the directory." msgstr "" "Erro: a operação de exclusão do diretório falhou durante a tentativa de ler " "o diretório." -#: directorymergewindow.cpp:2834 +#: directorymergewindow.cpp:2847 #, kde-format msgid "Error: rmdir( %1 ) operation failed." -msgstr "Erro: não foi possível efetuar a operação rmdir( %1 )." +msgstr "Erro: Não foi possível efetuar a operação rmdir( %1 )." -#: directorymergewindow.cpp:2844 +#: directorymergewindow.cpp:2857 #, kde-format msgid "Error: delete operation failed." -msgstr "Erro: não foi possível efetuar a exclusão." +msgstr "Erro: Não foi possível efetuar a exclusão." -#: directorymergewindow.cpp:2870 +#: directorymergewindow.cpp:2884 #, kde-format msgid "manual merge( %1, %2, %3 -> %4)" msgstr "mesclagem manual( %1, %2, %3 -> %4)" -#: directorymergewindow.cpp:2873 +#: directorymergewindow.cpp:2887 #, kde-format msgid "" " Note: After a manual merge the user should continue by pressing F7." @@ -657,185 +661,185 @@ " Nota: Após uma mesclagem manual o usuário deve continuar, pressionando " "F7." -#: directorymergewindow.cpp:2900 +#: directorymergewindow.cpp:2914 #, kde-format msgid "Error: copy( %1 -> %2 ) failed.Deleting existing destination failed." msgstr "" -"Erro: não foi possível copiar( %1 -> %2 ). Não foi possível excluir o " +"Erro: Não foi possível copiar( %1 -> %2 ). Não foi possível excluir o " "destino existente." -#: directorymergewindow.cpp:2909 +#: directorymergewindow.cpp:2923 #, kde-format msgid "copyLink( %1 -> %2 )" msgstr "copyLink( %1 -> %2 )" -#: directorymergewindow.cpp:2918 +#: directorymergewindow.cpp:2932 #, kde-format msgid "Error: copyLink failed: Remote links are not yet supported." msgstr "" -"Erro: não foi possível efetuar o copyLink: Links remotas ainda não são " +"Erro: Não foi possível efetuar o copyLink: Links remotas ainda não são " "suportadas." -#: directorymergewindow.cpp:2928 +#: directorymergewindow.cpp:2942 #, kde-format msgid "Error: copyLink failed." -msgstr "Erro: não foi possível efetuar o copyLink." +msgstr "Erro: Não foi possível efetuar o copyLink." -#: directorymergewindow.cpp:2953 +#: directorymergewindow.cpp:2967 #, kde-format msgid "copy( %1 -> %2 )" msgstr "copiar( %1 -> %2 )" -#: directorymergewindow.cpp:2979 +#: directorymergewindow.cpp:2993 #, kde-format msgid "Error during rename( %1 -> %2 ): Cannot delete existing destination." msgstr "" "Erro durante a renomeação( %1 -> %2 ): Não foi possível excluir o destino " "existente." -#: directorymergewindow.cpp:2986 +#: directorymergewindow.cpp:3000 #, kde-format msgid "rename( %1 -> %2 )" msgstr "renomear( %1 -> %2 )" -#: directorymergewindow.cpp:2995 +#: directorymergewindow.cpp:3009 #, kde-format msgid "Error: Rename failed." -msgstr "Erro: não foi possível renomear." +msgstr "Erro: Não foi possível renomear." -#: directorymergewindow.cpp:3013 +#: directorymergewindow.cpp:3027 #, kde-format msgid "Error during makeDir of %1. Cannot delete existing file." msgstr "" "Erro durante makeDir de %1. Não foi possível excluir o arquivo existente." -#: directorymergewindow.cpp:3030 +#: directorymergewindow.cpp:3044 #, kde-format msgid "makeDir( %1 )" msgstr "makeDir( %1 )" -#: directorymergewindow.cpp:3040 +#: directorymergewindow.cpp:3054 #, kde-format msgid "Error while creating directory." msgstr "Erro durante a criação do diretório." -#: directorymergewindow.cpp:3076 directorymergewindow.cpp:3195 +#: directorymergewindow.cpp:3090 directorymergewindow.cpp:3209 #, kde-format msgid "Dest" msgstr "Dest" -#: directorymergewindow.cpp:3084 directorymergewindow.cpp:3113 +#: directorymergewindow.cpp:3098 directorymergewindow.cpp:3127 #, kde-format msgid "Dir" msgstr "Dir." -#: directorymergewindow.cpp:3084 +#: directorymergewindow.cpp:3098 #, kde-format msgid "Type" msgstr "Tipo" -#: directorymergewindow.cpp:3084 +#: directorymergewindow.cpp:3098 #, kde-format msgid "Size" msgstr "Tam." -#: directorymergewindow.cpp:3085 +#: directorymergewindow.cpp:3099 #, kde-format msgid "Attr" msgstr "Atrib." -#: directorymergewindow.cpp:3085 +#: directorymergewindow.cpp:3099 #, kde-format msgid "Last Modification" msgstr "Última modificação" -#: directorymergewindow.cpp:3085 +#: directorymergewindow.cpp:3099 #, kde-format msgid "Link-Destination" msgstr "Destino-Link" -#: directorymergewindow.cpp:3113 +#: directorymergewindow.cpp:3127 #, kde-format msgid "File" msgstr "Arquivo" -#: directorymergewindow.cpp:3113 +#: directorymergewindow.cpp:3127 #, kde-format msgid "-Link" msgstr "-Link" -#: directorymergewindow.cpp:3119 +#: directorymergewindow.cpp:3133 #, kde-format msgid "not available" msgstr "não disponível" -#: directorymergewindow.cpp:3137 +#: directorymergewindow.cpp:3151 #, kde-format msgid "A (Dest): " msgstr "A (Dest.): " -#: directorymergewindow.cpp:3141 +#: directorymergewindow.cpp:3155 #, kde-format msgid "A: " msgstr "A: " -#: directorymergewindow.cpp:3141 +#: directorymergewindow.cpp:3155 #, kde-format msgid "A (Base): " -msgstr "A (Base): " +msgstr "A (base): " -#: directorymergewindow.cpp:3147 +#: directorymergewindow.cpp:3161 #, kde-format msgid "B (Dest): " msgstr "B (Dest.): " -#: directorymergewindow.cpp:3151 +#: directorymergewindow.cpp:3165 #, kde-format msgid "B: " msgstr "B: " -#: directorymergewindow.cpp:3156 +#: directorymergewindow.cpp:3170 #, kde-format msgid "C (Dest): " msgstr "C (Dest.): " -#: directorymergewindow.cpp:3160 +#: directorymergewindow.cpp:3174 #, kde-format msgid "C: " msgstr "C: " -#: directorymergewindow.cpp:3163 +#: directorymergewindow.cpp:3177 #, kde-format msgid "Dest: " msgstr "Dest.: " #. i18n("Saving Directory Merge State ...")); -#: directorymergewindow.cpp:3238 +#: directorymergewindow.cpp:3252 #, kde-format msgid "Save Directory Merge State As..." msgstr "Salvar o estado da mesclagem de diretório como..." -#: directorymergewindow.cpp:3387 +#: directorymergewindow.cpp:3401 #, kde-format msgid "Start/Continue Directory Merge" msgstr "Iniciar/Continuar a mesclagem de diretório" -#: directorymergewindow.cpp:3388 +#: directorymergewindow.cpp:3402 #, kde-format msgid "Run Operation for Current Item" msgstr "Executar operação para o item atual" -#: directorymergewindow.cpp:3389 +#: directorymergewindow.cpp:3403 #, kde-format msgid "Compare Selected File" -msgstr "Comparar o arquivo selecionado" +msgstr "Comparar arquivo selecionado" -#: directorymergewindow.cpp:3390 +#: directorymergewindow.cpp:3404 #, kde-format msgid "Merge Current File" -msgstr "Mesclar o arquivo atual" +msgstr "Mesclar arquivo atual" -#: directorymergewindow.cpp:3390 +#: directorymergewindow.cpp:3404 #, kde-format msgid "" "Merge\n" @@ -844,51 +848,51 @@ "Mesclar\n" "arquivo" -#: directorymergewindow.cpp:3391 +#: directorymergewindow.cpp:3405 #, kde-format msgid "Fold All Subdirs" msgstr "Contrair todos os subdiretórios" -#: directorymergewindow.cpp:3392 +#: directorymergewindow.cpp:3406 #, kde-format msgid "Unfold All Subdirs" msgstr "Expandir todos os subdiretórios" #. i18n("Save Directory Merge State ..."), 0, this, &DirectoryMergeWindow::slotSaveMergeState, ac, "dir_save_merge_state"); #. i18n("Load Directory Merge State ..."), 0, this, &DirectoryMergeWindow::slotLoadMergeState, ac, "dir_load_merge_state"); -#: directorymergewindow.cpp:3396 +#: directorymergewindow.cpp:3410 #, kde-format msgid "Choose A for All Items" msgstr "Selecionar A para todos os itens" -#: directorymergewindow.cpp:3397 +#: directorymergewindow.cpp:3411 #, kde-format msgid "Choose B for All Items" msgstr "Selecionar B para todos os itens" -#: directorymergewindow.cpp:3398 +#: directorymergewindow.cpp:3412 #, kde-format msgid "Choose C for All Items" msgstr "Selecionar C para todos os itens" -#: directorymergewindow.cpp:3399 +#: directorymergewindow.cpp:3413 #, kde-format msgid "Auto-Choose Operation for All Items" msgstr "Escolher automaticamente a operação para todos os itens" -#: directorymergewindow.cpp:3400 +#: directorymergewindow.cpp:3414 #, kde-format msgid "No Operation for All Items" msgstr "Nenhuma operação para todos os itens" #. i18n("Synchronize Directories"), 0, this, &DirectoryMergeWindow::slotSynchronizeDirectories, ac, "dir_synchronize_directories"); #. d->m_pDirChooseNewerFiles = GuiUtils::createAction< KToggleAction >(i18n("Copy Newer Files Instead of Merging"), 0, this, &DirectoryMergeWindow::slotChooseNewerFiles, ac, "dir_choose_newer_files"); -#: directorymergewindow.cpp:3405 +#: directorymergewindow.cpp:3419 #, kde-format msgid "Show Identical Files" -msgstr "Exibir os arquivos idênticos" +msgstr "Exibir arquivos idênticos" -#: directorymergewindow.cpp:3405 +#: directorymergewindow.cpp:3419 #, kde-format msgid "" "Identical\n" @@ -897,17 +901,17 @@ "Arquivos\n" "idênticos" -#: directorymergewindow.cpp:3406 +#: directorymergewindow.cpp:3420 #, kde-format msgid "Show Different Files" -msgstr "Exibir os arquivos diferentes" +msgstr "Exibir arquivos diferentes" -#: directorymergewindow.cpp:3407 +#: directorymergewindow.cpp:3421 #, kde-format msgid "Show Files only in A" -msgstr "Mostrar os arquivos somente em A" +msgstr "Mostrar arquivos somente em A" -#: directorymergewindow.cpp:3407 +#: directorymergewindow.cpp:3421 #, kde-format msgid "" "Files\n" @@ -916,12 +920,12 @@ "Arquivos\n" "somente em A" -#: directorymergewindow.cpp:3408 +#: directorymergewindow.cpp:3422 #, kde-format msgid "Show Files only in B" -msgstr "Mostrar os arquivos somente em B" +msgstr "Mostrar arquivos somente em B" -#: directorymergewindow.cpp:3408 +#: directorymergewindow.cpp:3422 #, kde-format msgid "" "Files\n" @@ -930,12 +934,12 @@ "Arquivos\n" "somente em B" -#: directorymergewindow.cpp:3409 +#: directorymergewindow.cpp:3423 #, kde-format msgid "Show Files only in C" -msgstr "Mostrar os arquivos somente em C" +msgstr "Mostrar arquivos somente em C" -#: directorymergewindow.cpp:3409 +#: directorymergewindow.cpp:3423 #, kde-format msgid "" "Files\n" @@ -944,52 +948,58 @@ "Arquivos\n" "somente em C" -#: directorymergewindow.cpp:3413 +#: directorymergewindow.cpp:3427 #, kde-format msgid "Compare Explicitly Selected Files" -msgstr "Comparar os arquivos selecionados explicitamente" +msgstr "Comparar arquivos selecionados explicitamente" -#: directorymergewindow.cpp:3414 +#: directorymergewindow.cpp:3428 #, kde-format msgid "Merge Explicitly Selected Files" -msgstr "Mesclar os arquivos selecionados explicitamente" +msgstr "Mesclar arquivos selecionados explicitamente" -#: directorymergewindow.cpp:3416 directorymergewindow.cpp:3423 +#: directorymergewindow.cpp:3430 directorymergewindow.cpp:3437 #, kde-format msgid "Do Nothing" msgstr "Não fazer nada" -#: directorymergewindow.cpp:3428 +#: directorymergewindow.cpp:3442 #, kde-format msgid "Delete A && B" -msgstr "Excluir A && B" +msgstr "Excluir A e B" -#: directorymergewindow.cpp:3431 +#: directorymergewindow.cpp:3445 #, kde-format msgid "Merge to A && B" -msgstr "Mesclar com A && B" +msgstr "Mesclar com A e B" + +#: fileaccess.cpp:301 +#, kde-format +msgid "Unable to determine full url. No parent specified." +msgstr "" +"Não foi possível determinar a URL completa. Não foi indicada a URL-mãe." -#: fileaccess.cpp:462 SourceData.cpp:493 +#: fileaccess.cpp:482 SourceData.cpp:506 #, kde-format msgid "Failed to read file: %1" msgstr "Não foi possível ler o arquivo: %1" -#: fileaccess.cpp:587 +#: fileaccess.cpp:624 #, kde-format msgid "Creating temp copy of %1 failed." msgstr "Não foi possível criar a cópia temporária de %1." -#: fileaccess.cpp:595 fileaccess.cpp:600 +#: fileaccess.cpp:632 fileaccess.cpp:637 #, kde-format msgid "Opening %1 failed. %2" msgstr "Não foi possível acessar %1. %2" -#: fileaccess.cpp:619 fileaccess.cpp:627 +#: fileaccess.cpp:656 fileaccess.cpp:664 #, kde-format msgid "Error reading from %1. %2" msgstr "Erro durante a leitura de %1. %2" -#: fileaccess.cpp:751 +#: fileaccess.cpp:788 #, kde-format msgid "" "While trying to make a backup, deleting an older backup failed.\n" @@ -998,7 +1008,7 @@ "Ao tentar fazer o backup, não foi possível excluir um backup anterior.\n" "Nome do arquivo: %1" -#: fileaccess.cpp:758 +#: fileaccess.cpp:795 #, kde-format msgid "" "While trying to make a backup, renaming failed.\n" @@ -1007,179 +1017,179 @@ "Ao tentar fazer o backup, não foi possível renomear.\n" "Nomes dos arquivos: %1 -> %2" -#: fileaccess.cpp:828 +#: fileaccess.cpp:865 #, kde-format msgid "Getting file status: %1" msgstr "Obtendo o status do arquivo: %1" -#: fileaccess.cpp:869 +#: fileaccess.cpp:906 #, kde-format msgid "Reading file: %1" msgstr "Lendo o arquivo: %1" -#: fileaccess.cpp:907 +#: fileaccess.cpp:944 #, kde-format msgid "Writing file: %1" msgstr "Gravando o arquivo: %1" -#: fileaccess.cpp:940 +#: fileaccess.cpp:977 #, kde-format msgid "Out of memory" msgstr "Memória insuficiente" -#: fileaccess.cpp:976 +#: fileaccess.cpp:1013 #, kde-format msgid "Making directory: %1" msgstr "Criando o diretório: %1" -#: fileaccess.cpp:997 +#: fileaccess.cpp:1034 #, kde-format msgid "Removing directory: %1" msgstr "Removendo o diretório: %1" -#: fileaccess.cpp:1012 +#: fileaccess.cpp:1049 #, kde-format msgid "Removing file: %1" msgstr "Removendo o arquivo: %1" -#: fileaccess.cpp:1028 +#: fileaccess.cpp:1065 #, kde-format msgid "Creating symbolic link: %1 -> %2" msgstr "Criando o link simbólico: %1 -> %2" -#: fileaccess.cpp:1052 +#: fileaccess.cpp:1089 #, kde-format msgid "Renaming file: %1 -> %2" msgstr "Renomeando o arquivo: %1 -> %2" -#: fileaccess.cpp:1086 +#: fileaccess.cpp:1123 #, kde-format msgid "Copying file: %1 -> %2" msgstr "Copiando o arquivo: %1 -> %2" -#: fileaccess.cpp:1108 +#: fileaccess.cpp:1145 #, kde-format msgid "Reading directory: %1" msgstr "Lendo o diretório: %1" -#: fileaccess.cpp:1162 +#: fileaccess.cpp:1202 #, kde-format msgid "Listing directory: %1" msgstr "Listando o diretório: %1" -#: kdiff3.cpp:181 +#: kdiff3.cpp:182 #, kde-format msgid "Current Configuration:" msgstr "Configuração atual:" -#: kdiff3.cpp:186 +#: kdiff3.cpp:187 #, kde-format msgid "Config Option Error:" msgstr "Erro na opção de configuração:" -#: kdiff3.cpp:240 +#: kdiff3.cpp:246 #, kde-format msgid "Option --auto used, but no output file specified." msgstr "" "A opção --auto foi usada, mas não foi especificado nenhum arquivo de saída." -#: kdiff3.cpp:416 +#: kdiff3.cpp:405 #, kde-format msgid "Option --auto ignored for directory comparison." msgstr "Opção --auto ignorada para comparação de diretórios." -#: kdiff3.cpp:460 +#: kdiff3.cpp:449 #, kde-format msgid "Saving failed." msgstr "Não foi possível salvar." -#: kdiff3.cpp:496 pdiff.cpp:1098 +#: kdiff3.cpp:494 pdiff.cpp:1096 #, kde-format msgid "Opening of these files failed:" msgstr "Não foi possível abrir esses arquivos:" -#: kdiff3.cpp:505 +#: kdiff3.cpp:503 pdiff.cpp:1105 #, kde-format -msgid "File Open Error" -msgstr "Erro na abertura do arquivo" +msgid "File open error" +msgstr "Erro ao abrir o arquivo" -#: kdiff3.cpp:533 +#: kdiff3.cpp:532 #, kde-format msgid "Opens documents for comparison..." msgstr "Abre documentos para comparação..." -#: kdiff3.cpp:535 +#: kdiff3.cpp:534 #, kde-format msgid "Reload" msgstr "Recarregar" -#: kdiff3.cpp:538 +#: kdiff3.cpp:537 #, kde-format msgid "Saves the merge result. All conflicts must be solved!" msgstr "" "Salvar o resultado da mesclagem. Todos os conflitos precisam ser resolvidos!" -#: kdiff3.cpp:540 +#: kdiff3.cpp:539 #, kde-format msgid "Saves the current document as..." msgstr "Salvar o documento atual como..." -#: kdiff3.cpp:543 +#: kdiff3.cpp:542 #, kde-format msgid "Print the differences" msgstr "Imprimir as diferenças" -#: kdiff3.cpp:546 +#: kdiff3.cpp:545 #, kde-format msgid "Quits the application" msgstr "Sair do aplicativo" -#: kdiff3.cpp:549 +#: kdiff3.cpp:548 #, kde-format msgid "Cuts the selected section and puts it to the clipboard" msgstr "Corta a seção selecionada e a coloca na área de transferência" -#: kdiff3.cpp:552 +#: kdiff3.cpp:551 #, kde-format msgid "Copies the selected section to the clipboard" msgstr "Copia a seção selecionada para a área de transferência" -#: kdiff3.cpp:554 +#: kdiff3.cpp:553 #, kde-format msgid "Pastes the clipboard contents to current position" msgstr "Cola o conteúdo da área de transferência na posição atual" -#: kdiff3.cpp:557 +#: kdiff3.cpp:556 #, kde-format msgid "Select everything in current window" msgstr "Seleciona tudo na janela atual" -#: kdiff3.cpp:560 +#: kdiff3.cpp:559 #, kde-format msgid "Search for a string" msgstr "Pesquisa um texto" -#: kdiff3.cpp:562 +#: kdiff3.cpp:561 #, kde-format msgid "Search again for the string" msgstr "Pesquisa novamente o texto" -#: kdiff3.cpp:567 +#: kdiff3.cpp:566 #, kde-format msgid "Enables/disables the statusbar" msgstr "Habilita/desabilita a barra de status" -#: kdiff3.cpp:571 +#: kdiff3.cpp:570 #, kde-format msgid "Configure KDiff3..." msgstr "Configurar o KDiff3..." -#: kdiff3.cpp:590 +#: kdiff3.cpp:589 #, kde-format msgid "Go to Current Delta" msgstr "Ir para o delta atual" -#: kdiff3.cpp:590 +#: kdiff3.cpp:589 #, kde-format msgid "" "Current\n" @@ -1188,12 +1198,12 @@ "Delta\n" "atual" -#: kdiff3.cpp:592 +#: kdiff3.cpp:591 #, kde-format msgid "Go to First Delta" -msgstr "Ir para o Primeiro Delta" +msgstr "Ir para o primeiro delta" -#: kdiff3.cpp:592 +#: kdiff3.cpp:591 #, kde-format msgid "" "First\n" @@ -1202,12 +1212,12 @@ "Primeiro\n" "delta" -#: kdiff3.cpp:594 +#: kdiff3.cpp:593 #, kde-format msgid "Go to Last Delta" msgstr "Ir para o último delta" -#: kdiff3.cpp:594 +#: kdiff3.cpp:593 #, kde-format msgid "" "Last\n" @@ -1216,14 +1226,14 @@ "Último\n" "delta" -#: kdiff3.cpp:596 +#: kdiff3.cpp:595 #, kde-format msgid "(Skips white space differences when \"Show White Space\" is disabled.)" msgstr "" "(Ignora as diferenças de espaço em branco quando \"Mostrar espaços em branco" "\" está desativado.)" -#: kdiff3.cpp:597 +#: kdiff3.cpp:596 #, kde-format msgid "" "(Does not skip white space differences even when \"Show White Space\" is " @@ -1232,12 +1242,12 @@ "(Não ignora as diferenças de espaço em branco quando \"Mostrar espaços em " "branco\" está desativado.)" -#: kdiff3.cpp:598 +#: kdiff3.cpp:597 #, kde-format msgid "Go to Previous Delta" msgstr "Ir para o delta anterior" -#: kdiff3.cpp:598 +#: kdiff3.cpp:597 #, kde-format msgid "" "Prev\n" @@ -1246,12 +1256,12 @@ "Delta\n" "anterior" -#: kdiff3.cpp:600 +#: kdiff3.cpp:599 #, kde-format msgid "Go to Next Delta" msgstr "Ir para o próximo delta" -#: kdiff3.cpp:600 +#: kdiff3.cpp:599 #, kde-format msgid "" "Next\n" @@ -1260,12 +1270,12 @@ "Próximo\n" "delta" -#: kdiff3.cpp:602 +#: kdiff3.cpp:601 #, kde-format msgid "Go to Previous Conflict" msgstr "Ir para o conflito anterior" -#: kdiff3.cpp:602 +#: kdiff3.cpp:601 #, kde-format msgid "" "Prev\n" @@ -1274,12 +1284,12 @@ "Conflito\n" "anterior" -#: kdiff3.cpp:604 +#: kdiff3.cpp:603 #, kde-format msgid "Go to Next Conflict" msgstr "Ir para o próximo conflito" -#: kdiff3.cpp:604 +#: kdiff3.cpp:603 #, kde-format msgid "" "Next\n" @@ -1288,12 +1298,12 @@ "Próximo\n" "conflito" -#: kdiff3.cpp:606 +#: kdiff3.cpp:605 #, kde-format msgid "Go to Previous Unsolved Conflict" msgstr "Ir para o conflito não resolvido anterior" -#: kdiff3.cpp:606 +#: kdiff3.cpp:605 #, kde-format msgid "" "Prev\n" @@ -1302,12 +1312,12 @@ "Não resolvido\n" "anterior" -#: kdiff3.cpp:608 +#: kdiff3.cpp:607 #, kde-format msgid "Go to Next Unsolved Conflict" msgstr "Ir para o próximo conflito não resolvido" -#: kdiff3.cpp:608 +#: kdiff3.cpp:607 #, kde-format msgid "" "Next\n" @@ -1316,12 +1326,12 @@ "Próximo\n" "não resolvido" -#: kdiff3.cpp:610 +#: kdiff3.cpp:609 #, kde-format msgid "Select Line(s) From A" msgstr "Selecionar linha(s) de A" -#: kdiff3.cpp:610 +#: kdiff3.cpp:609 #, kde-format msgid "" "Choose\n" @@ -1330,12 +1340,12 @@ "Escolher\n" "A" -#: kdiff3.cpp:611 +#: kdiff3.cpp:610 #, kde-format msgid "Select Line(s) From B" msgstr "Selecionar linha(s) de B" -#: kdiff3.cpp:611 +#: kdiff3.cpp:610 #, kde-format msgid "" "Choose\n" @@ -1344,12 +1354,12 @@ "Escolher\n" "B" -#: kdiff3.cpp:612 +#: kdiff3.cpp:611 #, kde-format msgid "Select Line(s) From C" msgstr "Selecione linha(s) de C" -#: kdiff3.cpp:612 +#: kdiff3.cpp:611 #, kde-format msgid "" "Choose\n" @@ -1358,14 +1368,14 @@ "Escolher\n" "C" -#: kdiff3.cpp:613 +#: kdiff3.cpp:612 #, kde-format msgid "Automatically Go to Next Unsolved Conflict After Source Selection" msgstr "" "Ir automaticamente para o próximo conflito não resolvido após seleção da " "fonte" -#: kdiff3.cpp:613 +#: kdiff3.cpp:612 #, kde-format msgid "" "Auto\n" @@ -1374,12 +1384,12 @@ "Próximo\n" "automático" -#: kdiff3.cpp:615 +#: kdiff3.cpp:614 #, kde-format msgid "Show Space && Tabulator Characters" msgstr "Exibir caracteres de espaço e tabulação" -#: kdiff3.cpp:615 +#: kdiff3.cpp:614 #, kde-format msgid "" "White\n" @@ -1388,12 +1398,12 @@ "Caracteres\n" "em branco" -#: kdiff3.cpp:616 +#: kdiff3.cpp:615 #, kde-format msgid "Show White Space" msgstr "Exibir espaço em branco" -#: kdiff3.cpp:616 +#: kdiff3.cpp:615 #, kde-format msgid "" "White\n" @@ -1402,12 +1412,12 @@ "Deltas\n" "em branco" -#: kdiff3.cpp:618 +#: kdiff3.cpp:617 #, kde-format msgid "Show Line Numbers" msgstr "Exibir números de linha" -#: kdiff3.cpp:618 +#: kdiff3.cpp:617 #, kde-format msgid "" "Line\n" @@ -1416,132 +1426,132 @@ "Números\n" "de linha" -#: kdiff3.cpp:620 +#: kdiff3.cpp:619 #, kde-format msgid "Automatically Solve Simple Conflicts" msgstr "Resolver conflitos simples automaticamente" -#: kdiff3.cpp:621 +#: kdiff3.cpp:620 #, kde-format msgid "Set Deltas to Conflicts" -msgstr "Definir Deltas para conflitos" +msgstr "Definir deltas para conflitos" -#: kdiff3.cpp:622 +#: kdiff3.cpp:621 #, kde-format msgid "Run Regular Expression Auto Merge" -msgstr "Executar a mesclagem automática com expressões regulares" +msgstr "Executar mesclagem automática com expressões regulares" -#: kdiff3.cpp:623 +#: kdiff3.cpp:622 #, kde-format msgid "Automatically Solve History Conflicts" msgstr "Resolver conflitos de histórico automaticamente" -#: kdiff3.cpp:624 +#: kdiff3.cpp:623 #, kde-format msgid "Split Diff At Selection" msgstr "Separar diferenças ao selecionar" -#: kdiff3.cpp:625 +#: kdiff3.cpp:624 #, kde-format msgid "Join Selected Diffs" msgstr "Reunir diferenças selecionadas" -#: kdiff3.cpp:627 +#: kdiff3.cpp:626 #, kde-format msgid "Show Window A" msgstr "Exibir janela A" -#: kdiff3.cpp:628 +#: kdiff3.cpp:627 #, kde-format msgid "Show Window B" msgstr "Exibir janela B" -#: kdiff3.cpp:629 +#: kdiff3.cpp:628 #, kde-format msgid "Show Window C" msgstr "Exibir janela C" -#: kdiff3.cpp:631 +#: kdiff3.cpp:630 #, kde-format msgid "Normal Overview" msgstr "Visão normal" -#: kdiff3.cpp:632 +#: kdiff3.cpp:631 #, kde-format msgid "A vs. B Overview" msgstr "Visão A vs. B" -#: kdiff3.cpp:633 +#: kdiff3.cpp:632 #, kde-format msgid "A vs. C Overview" msgstr "Visão A vs. C" -#: kdiff3.cpp:634 +#: kdiff3.cpp:633 #, kde-format msgid "B vs. C Overview" msgstr "Visão B vs. C" -#: kdiff3.cpp:635 +#: kdiff3.cpp:634 #, kde-format msgid "Word Wrap Diff Windows" msgstr "Quebrar linhas nas exibições de diferenças" -#: kdiff3.cpp:636 +#: kdiff3.cpp:635 #, kde-format msgid "Add Manual Diff Alignment" msgstr "Adicionar alinhamento manual de diferenças" -#: kdiff3.cpp:637 +#: kdiff3.cpp:636 #, kde-format msgid "Clear All Manual Diff Alignments" msgstr "Limpar todos os alinhamentos manuais de diferenças" -#: kdiff3.cpp:639 +#: kdiff3.cpp:638 #, kde-format msgid "Focus Next Window" msgstr "Focar na próxima janela" -#: kdiff3.cpp:640 +#: kdiff3.cpp:639 #, kde-format msgid "Focus Prev Window" msgstr "Focar na janela anterior" -#: kdiff3.cpp:641 +#: kdiff3.cpp:640 #, kde-format msgid "Toggle Split Orientation" msgstr "Alternar a orientação da separação" -#: kdiff3.cpp:643 +#: kdiff3.cpp:642 #, kde-format msgid "Dir && Text Split Screen View" msgstr "Visão de tela dividida de diretório e texto" -#: kdiff3.cpp:645 +#: kdiff3.cpp:644 #, kde-format msgid "Toggle Between Dir && Text View" msgstr "Alternar entre visão de diretório e texto" -#: kdiff3.cpp:697 pdiff.cpp:1909 +#: kdiff3.cpp:696 pdiff.cpp:1919 #, kde-format msgid "The merge result has not been saved." msgstr "O resultado da mesclagem não foi salvo." -#: kdiff3.cpp:699 +#: kdiff3.cpp:698 #, kde-format msgid "Save && Quit" msgstr "Salvar e sair" -#: kdiff3.cpp:700 +#: kdiff3.cpp:699 #, kde-format msgid "Quit Without Saving" msgstr "Sair sem salvar" -#: kdiff3.cpp:708 pdiff.cpp:1920 +#: kdiff3.cpp:707 pdiff.cpp:1930 #, kde-format msgid "Saving the merge result failed." msgstr "Não foi possível salvar o resultado da mesclagem." -#: kdiff3.cpp:719 pdiff.cpp:1032 +#: kdiff3.cpp:718 pdiff.cpp:1030 #, kde-format msgid "" "You are currently doing a directory merge. Are you sure, you want to abort?" @@ -1549,65 +1559,65 @@ "Você está fazendo uma mesclagem de diretórios. Tem certeza de que deseja " "cancelar?" -#: kdiff3.cpp:742 +#: kdiff3.cpp:741 #, kde-format msgid "Saving file..." msgstr "Salvando o arquivo..." -#: kdiff3.cpp:759 +#: kdiff3.cpp:758 #, kde-format msgid "Saving file with a new filename..." -msgstr "Salvando o arquivo com um novo nome..." +msgstr "Salvando arquivo com um novo nome..." -#: kdiff3.cpp:761 +#: kdiff3.cpp:760 #, kde-format msgid "Save As..." msgstr "Salvar como..." -#: kdiff3.cpp:820 +#: kdiff3.cpp:819 #, kde-format msgid "Printing not implemented." msgstr "A impressão não está implementada." -#: kdiff3.cpp:857 +#: kdiff3.cpp:858 #, kde-format msgid "Printing..." msgstr "Imprimindo..." -#: kdiff3.cpp:943 +#: kdiff3.cpp:948 #, kde-format msgid "Printing page %1 of %2" -msgstr "Imprimindo a página %1 de %2" +msgstr "Imprimindo página %1 de %2" -#: kdiff3.cpp:1000 +#: kdiff3.cpp:1006 #, kde-format msgid " (Selection)" -msgstr " (Seleção)" +msgstr " (seleção)" -#: kdiff3.cpp:1027 +#: kdiff3.cpp:1034 #, kde-format msgid "Printing completed." msgstr "Impressão concluída." -#: kdiff3.cpp:1031 +#: kdiff3.cpp:1038 #, kde-format msgid "Printing aborted." msgstr "Impressão cancelada." -#: kdiff3.cpp:1038 +#: kdiff3.cpp:1045 #, kde-format msgid "Exiting..." msgstr "Saindo..." -#: kdiff3.cpp:1049 +#: kdiff3.cpp:1056 #, kde-format msgid "Toggling toolbar..." -msgstr "Alternando a barra de ferramentas..." +msgstr "Alternando barra de ferramentas..." -#: kdiff3.cpp:1070 +#: kdiff3.cpp:1077 #, kde-format msgid "Toggle the statusbar..." -msgstr "Alternar a barra de status..." +msgstr "Alternar barra de status..." #: kdiff3_part.cpp:45 #, kde-format @@ -1629,7 +1639,7 @@ msgid "Joachim Eibl" msgstr "Joachim Eibl" -#: kdiff3_part.cpp:173 kdiff3_part.cpp:254 +#: kdiff3_part.cpp:174 kdiff3_part.cpp:255 #, kde-format msgid "Could not find files for comparison." msgstr "Não foi possível encontrar arquivos para comparação." @@ -1647,7 +1657,7 @@ msgstr "Configurar o KDiff3" #. i18n: ectx: ToolBar (mainToolBar) -#: kdiff3_part.rc:16 main.cpp:88 +#: kdiff3_part.rc:16 main.cpp:89 #, kde-format msgid "KDiff3" msgstr "KDiff3" @@ -1660,8 +1670,8 @@ "file in the source package for details." msgstr "" "Não foi possível inicializar o componente KDiff3.\n" -"Isso normalmente acontece devido a um problema na instalação. Por favor, " -"leia o arquivo README no pacote de fontes para detalhes." +"Isso normalmente acontece devido a um problema na instalação. Leia o arquivo " +"README no pacote de fontes para detalhes." #. i18n: ectx: Menu (file) #: kdiff3_shell.rc:4 @@ -1717,87 +1727,92 @@ msgid "Main Toolbar" msgstr "Barra de ferramentas principal" -#: main.cpp:68 main.cpp:72 +#: main.cpp:69 main.cpp:73 #, kde-format msgid "Ignored. (User defined.)" msgstr "Ignorado. (Definido pelo usuário.)" -#: main.cpp:92 +#: main.cpp:93 #, kde-format msgid " (64 bit)" msgstr " (64 bit)" -#: main.cpp:94 +#: main.cpp:95 #, kde-format msgid " (32 bit)" msgstr " (32 bit)" -#: main.cpp:95 +#: main.cpp:96 #, kde-format msgid "Tool for Comparison and Merge of Files and Directories" msgstr "Ferramenta para comparação e mesclagem de arquivos e diretórios" -#: main.cpp:96 +#: main.cpp:97 #, kde-format msgid "(c) 2002-2014 Joachim Eibl, (c) 2017 Michael Reeves KF5/Qt5 port" msgstr "" "(c) 2002-2014 Joachim Eibl, (c) 2017 Michael Reeves Conversão para KF5/Qt5" -#: main.cpp:112 +#: main.cpp:113 #, kde-format msgid "Merge the input." msgstr "Mesclar a entrada." -#: main.cpp:113 +#: main.cpp:114 #, kde-format msgid "Explicit base file. For compatibility with certain tools." msgstr "Arquivo base explícito. Para compatibilidade com certas ferramentas." -#: main.cpp:114 +#: main.cpp:115 #, kde-format msgid "Output file. Implies -m. E.g.: -o newfile.txt" -msgstr "Arquivo de Saída. Implica -m. Ex.: -o novoarquivo.txt" +msgstr "Arquivo de saída. Implica -m. Ex.: -o novoarquivo.txt" -#: main.cpp:115 +#: main.cpp:116 #, kde-format msgid "Output file, again. (For compatibility with certain tools.)" msgstr "" "Arquivo de saída, novamente. (Para compatibilidade com certas ferramentas.)" -#: main.cpp:116 +#: main.cpp:118 #, kde-format msgid "No GUI if all conflicts are auto-solvable. (Needs -o file)" msgstr "" "Sem interface se todos os conflitos são resolvidos automaticamente. " "(Necessita -o arquivo)" -#: main.cpp:117 +#: main.cpp:120 +#, kde-format +msgid "Ignored." +msgstr "Ignorado." + +#: main.cpp:122 #, kde-format msgid "Do not solve conflicts automatically." msgstr "Não resolver conflitos automaticamente." -#: main.cpp:118 +#: main.cpp:123 #, kde-format msgid "Visible name replacement for input file 1 (base)." msgstr "Substituição do nome visível para o arquivo de entrada 1 (base)." -#: main.cpp:119 +#: main.cpp:124 #, kde-format msgid "Visible name replacement for input file 2." msgstr "Substituição do nome visível para o arquivo de entrada 2." -#: main.cpp:120 +#: main.cpp:125 #, kde-format msgid "Visible name replacement for input file 3." msgstr "Substituição do nome visível para o arquivo de entrada 3." -#: main.cpp:121 +#: main.cpp:126 #, kde-format msgid "Alternative visible name replacement. Supply this once for every input." msgstr "" "Substituição alternativa do nome visível. Forneça um para cada entrada." -#: main.cpp:122 +#: main.cpp:127 #, kde-format msgid "" "Override a config setting. Use once for every setting. E.g.: --cs " @@ -1806,89 +1821,89 @@ "Substitui uma opção de configuração. Use uma vez para cada opção. Ex.: --cs " "\"AutoAdvance=1\"" -#: main.cpp:123 +#: main.cpp:128 #, kde-format msgid "Show list of config settings and current values." msgstr "Mostra uma lista das opções de configuração e os valores atuais." -#: main.cpp:124 +#: main.cpp:129 #, kde-format msgid "Use a different config file." msgstr "Usar um arquivo de configuração diferente." -#: main.cpp:127 +#: main.cpp:132 #, kde-format msgid "file1 to open (base, if not specified via --base)" msgstr "arquivo 1 a abrir (base, se não especificado via --base)" -#: main.cpp:128 +#: main.cpp:133 #, kde-format msgid "file2 to open" msgstr "arquivo 2 a abrir" -#: main.cpp:129 +#: main.cpp:134 #, kde-format msgid "file3 to open" msgstr "arquivo 3 a abrir" -#: main.cpp:153 +#: main.cpp:158 #, kde-format msgid "See kdiff3 --help for supported options." msgstr "Veja kdiff3 --help para opções suportadas." -#: mergeresultwindow.cpp:158 +#: mergeresultwindow.cpp:171 #, kde-format msgid "Choose A Everywhere" msgstr "Escolher A para tudo" -#: mergeresultwindow.cpp:159 +#: mergeresultwindow.cpp:172 #, kde-format msgid "Choose B Everywhere" msgstr "Escolher B para tudo" -#: mergeresultwindow.cpp:160 +#: mergeresultwindow.cpp:173 #, kde-format msgid "Choose C Everywhere" msgstr "Escolher C para tudo" -#: mergeresultwindow.cpp:161 +#: mergeresultwindow.cpp:174 #, kde-format msgid "Choose A for All Unsolved Conflicts" msgstr "Escolha A em todos os conflitos não resolvidos" -#: mergeresultwindow.cpp:162 +#: mergeresultwindow.cpp:175 #, kde-format msgid "Choose B for All Unsolved Conflicts" msgstr "Escolha B em todos os conflitos não resolvidos" -#: mergeresultwindow.cpp:163 +#: mergeresultwindow.cpp:176 #, kde-format msgid "Choose C for All Unsolved Conflicts" msgstr "Escolha C em todos os conflitos não resolvidos" -#: mergeresultwindow.cpp:164 +#: mergeresultwindow.cpp:177 #, kde-format msgid "Choose A for All Unsolved Whitespace Conflicts" msgstr "Escolha A em todos os conflitos de espaço em branco não resolvidos" -#: mergeresultwindow.cpp:165 +#: mergeresultwindow.cpp:178 #, kde-format msgid "Choose B for All Unsolved Whitespace Conflicts" msgstr "Escolha B em todos os conflitos de espaço em branco não resolvidos" -#: mergeresultwindow.cpp:166 +#: mergeresultwindow.cpp:179 #, kde-format msgid "Choose C for All Unsolved Whitespace Conflicts" msgstr "Escolha C em todos os conflitos de espaço em branco não resolvidos" -#: mergeresultwindow.cpp:176 +#: mergeresultwindow.cpp:204 #, kde-format msgid "Number of remaining unsolved conflicts: %1 (of which %2 are whitespace)" msgstr "" "Número de conflitos ainda não resolvidos: %1 (dos quais %2 são espaços em " "branco)" -#: mergeresultwindow.cpp:370 +#: mergeresultwindow.cpp:398 #, kde-format msgid "" "The output has been modified.\n" @@ -1897,29 +1912,29 @@ "A saída foi modificada.\n" "Se você continuar suas alterações serão perdidas." -#: mergeresultwindow.cpp:936 pdiff.cpp:827 +#: mergeresultwindow.cpp:964 pdiff.cpp:817 #, kde-format msgid "All input files are binary equal." msgstr "Todos os arquivos de entrada são iguais em nível binário." -#: mergeresultwindow.cpp:938 +#: mergeresultwindow.cpp:966 #, kde-format msgid "All input files contain the same text." msgstr "Todos os arquivos de entrada contém o mesmo texto." -#: mergeresultwindow.cpp:942 mergeresultwindow.cpp:946 -#: mergeresultwindow.cpp:950 pdiff.cpp:833 pdiff.cpp:837 pdiff.cpp:841 +#: mergeresultwindow.cpp:970 mergeresultwindow.cpp:974 +#: mergeresultwindow.cpp:978 pdiff.cpp:823 pdiff.cpp:827 pdiff.cpp:831 #, 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" -#: mergeresultwindow.cpp:944 mergeresultwindow.cpp:948 -#: mergeresultwindow.cpp:952 +#: mergeresultwindow.cpp:972 mergeresultwindow.cpp:976 +#: mergeresultwindow.cpp:980 #, kde-format msgid "Files %1 and %2 have equal text.\n" msgstr "Arquivos %1 e %2 possuem texto igual.\n" -#: mergeresultwindow.cpp:958 +#: mergeresultwindow.cpp:986 #, kde-format msgid "" "Total number of conflicts: %1\n" @@ -1932,27 +1947,27 @@ "Nº de conflitos não resolvidos: %3\n" "%4" -#: mergeresultwindow.cpp:964 +#: mergeresultwindow.cpp:992 #, kde-format msgid "Conflicts" msgstr "Conflitos" -#: mergeresultwindow.cpp:1873 +#: mergeresultwindow.cpp:1901 #, kde-format msgid "" msgstr "" -#: mergeresultwindow.cpp:1881 +#: mergeresultwindow.cpp:1909 #, kde-format msgid "" msgstr "" -#: mergeresultwindow.cpp:1883 mergeresultwindow.cpp:2755 +#: mergeresultwindow.cpp:1911 mergeresultwindow.cpp:2783 #, kde-format msgid "" msgstr "" -#: mergeresultwindow.cpp:2967 +#: mergeresultwindow.cpp:2995 #, kde-format msgid "" "Not all conflicts are solved yet.\n" @@ -1961,12 +1976,12 @@ "Nem todos os conflitos foram resolvidos.\n" "O arquivo não foi salvo." -#: mergeresultwindow.cpp:2969 mergeresultwindow.cpp:2978 +#: mergeresultwindow.cpp:2997 mergeresultwindow.cpp:3006 #, kde-format msgid "Conflicts Left" msgstr "Conflitos restantes" -#: mergeresultwindow.cpp:2976 +#: mergeresultwindow.cpp:3004 #, kde-format msgid "" "There is a line end style conflict. Please choose the line end style " @@ -1976,7 +1991,7 @@ "Existe um conflito de estilo de fim de linha. Escolha o estilo manualmente.\n" "O arquivo não foi salvo." -#: mergeresultwindow.cpp:2990 +#: mergeresultwindow.cpp:3018 #, kde-format msgid "" "\n" @@ -1987,57 +2002,57 @@ "\n" "Não foi possível criar o backup. O arquivo não foi salvo." -#: mergeresultwindow.cpp:2990 mergeresultwindow.cpp:3038 +#: mergeresultwindow.cpp:3018 mergeresultwindow.cpp:3066 #, kde-format msgid "File Save Error" msgstr "Erro ao salvar o arquivo" -#: mergeresultwindow.cpp:3038 +#: mergeresultwindow.cpp:3066 #, kde-format msgid "Error while writing." msgstr "Erro durante a escrita." -#: mergeresultwindow.cpp:3110 +#: mergeresultwindow.cpp:3138 #, kde-format msgid "Output:" msgstr "Saída:" -#: mergeresultwindow.cpp:3123 mergeresultwindow.cpp:3315 +#: mergeresultwindow.cpp:3151 mergeresultwindow.cpp:3343 #, kde-format msgid "[Modified]" -msgstr "[Modificado]" +msgstr "[modificado]" -#: mergeresultwindow.cpp:3130 +#: mergeresultwindow.cpp:3158 #, kde-format msgid "Encoding for saving:" msgstr "Codificação para o salvamento:" -#: mergeresultwindow.cpp:3230 +#: mergeresultwindow.cpp:3258 #, kde-format msgid "Conflict" msgstr "Conflito" -#: mergeresultwindow.cpp:3262 +#: mergeresultwindow.cpp:3290 #, kde-format msgid "Codec from A: %1" msgstr "Codificação de A: %1" -#: mergeresultwindow.cpp:3264 +#: mergeresultwindow.cpp:3292 #, kde-format msgid "Codec from B: %1" msgstr "Codificação de B: %1" -#: mergeresultwindow.cpp:3266 +#: mergeresultwindow.cpp:3294 #, kde-format msgid "Codec from C: %1" msgstr "Codificação de C: %1" -#: optiondialog.cpp:119 +#: optiondialog.cpp:121 #, kde-format msgid "Change Font" msgstr "Alterar fonte" -#: optiondialog.cpp:135 optiondialog.cpp:145 +#: optiondialog.cpp:137 optiondialog.cpp:147 #, kde-format msgid "" "Font: %1, %2, %3\n" @@ -2048,124 +2063,124 @@ "\n" "Exemplo:" -#: optiondialog.cpp:388 +#: optiondialog.cpp:390 #, kde-format msgid "Unicode" msgstr "Unicode" -#: optiondialog.cpp:389 +#: optiondialog.cpp:391 #, kde-format msgid "Latin1" msgstr "Latin1" -#: optiondialog.cpp:408 +#: optiondialog.cpp:410 #, kde-format msgid "Change this if non-ASCII characters are not displayed correctly." msgstr "" "Altere isso se caracteres não ASCII estiverem sendo exibidos incorretamente." -#: optiondialog.cpp:491 +#: optiondialog.cpp:495 #, kde-format msgid "Configure" msgstr "Configurar" -#: optiondialog.cpp:568 +#: optiondialog.cpp:573 #, kde-format msgid "Font" msgstr "Fonte" -#: optiondialog.cpp:570 +#: optiondialog.cpp:575 #, kde-format msgid "Editor & Diff Output Font" msgstr "Fonte do editor e do resultado das diferenças" -#: optiondialog.cpp:589 +#: optiondialog.cpp:594 #, kde-format msgid "Application font" -msgstr "Fonte da aplicação" +msgstr "Fonte do aplicativo" -#: optiondialog.cpp:594 +#: optiondialog.cpp:599 #, kde-format msgid "File view font" msgstr "Fonte da visualização de arquivo" -#: optiondialog.cpp:613 +#: optiondialog.cpp:618 #, kde-format msgctxt "Title for color settings page" msgid "Color" msgstr "Cor" -#: optiondialog.cpp:614 +#: optiondialog.cpp:619 #, kde-format msgid "Colors Settings" msgstr "Configuração das cores" -#: optiondialog.cpp:631 +#: optiondialog.cpp:644 #, kde-format msgid "Editor and Diff Views:" msgstr "Editor e visualização das diferenças:" -#: optiondialog.cpp:639 +#: optiondialog.cpp:652 #, kde-format msgid "Foreground color:" msgstr "Cor do primeiro plano:" -#: optiondialog.cpp:647 +#: optiondialog.cpp:660 #, kde-format msgid "Background color:" msgstr "Cor do plano de fundo:" -#: optiondialog.cpp:657 +#: optiondialog.cpp:670 #, kde-format msgid "Diff background color:" msgstr "Cor do plano de fundo das diferenças:" -#: optiondialog.cpp:666 +#: optiondialog.cpp:679 #, kde-format msgid "Color A:" msgstr "Cor A:" -#: optiondialog.cpp:675 +#: optiondialog.cpp:688 #, kde-format msgid "Color B:" msgstr "Cor B:" -#: optiondialog.cpp:684 +#: optiondialog.cpp:697 #, kde-format msgid "Color C:" msgstr "Cor C:" -#: optiondialog.cpp:692 +#: optiondialog.cpp:705 #, kde-format msgid "Conflict color:" msgstr "Cor do conflito:" -#: optiondialog.cpp:701 +#: optiondialog.cpp:714 #, kde-format msgid "Current range background color:" msgstr "Cor de fundo do intervalo atual:" -#: optiondialog.cpp:710 +#: optiondialog.cpp:723 #, kde-format msgid "Current range diff background color:" msgstr "Cor de fundo do intervalo de diferença atual:" -#: optiondialog.cpp:718 +#: optiondialog.cpp:731 #, kde-format msgid "Color for manually aligned difference ranges:" msgstr "Cor dos intervalos de diferenças alinhados manualmente:" -#: optiondialog.cpp:725 +#: optiondialog.cpp:738 #, kde-format msgid "Directory Comparison View:" msgstr "Visualização da comparação de diretório:" -#: optiondialog.cpp:731 +#: optiondialog.cpp:744 #, kde-format msgid "Newest file color:" msgstr "Cor do arquivo mais recente:" -#: optiondialog.cpp:736 +#: optiondialog.cpp:749 #, kde-format msgid "" "Changing this color will only be effective when starting the next directory " @@ -2174,37 +2189,37 @@ "Alterar esta cor só terá efeito quando iniciar a próxima comparação de " "diretório." -#: optiondialog.cpp:741 +#: optiondialog.cpp:754 #, kde-format msgid "Oldest file color:" msgstr "Cor do arquivo mais antigo:" -#: optiondialog.cpp:750 +#: optiondialog.cpp:763 #, kde-format msgid "Middle age file color:" msgstr "Cor dos arquivos de tempo intermediário:" -#: optiondialog.cpp:759 +#: optiondialog.cpp:772 #, kde-format msgid "Color for missing files:" msgstr "Cor dos arquivos faltantes:" -#: optiondialog.cpp:773 +#: optiondialog.cpp:786 #, kde-format msgid "Editor" msgstr "Editor" -#: optiondialog.cpp:774 +#: optiondialog.cpp:787 #, kde-format msgid "Editor Behavior" msgstr "Comportamento do editor" -#: optiondialog.cpp:787 +#: optiondialog.cpp:809 #, kde-format msgid "Tab inserts spaces" msgstr "Tab insere espaços" -#: optiondialog.cpp:791 +#: optiondialog.cpp:813 #, kde-format msgid "" "On: Pressing tab generates the appropriate number of spaces.\n" @@ -2213,27 +2228,27 @@ "Ligado: Ao pressionar Tab será gerado o número apropriado de espaços.\n" "Desligado: Será inserido um caractere de Tab." -#: optiondialog.cpp:796 +#: optiondialog.cpp:818 #, kde-format msgid "Tab size:" msgstr "Tamanho da tabulação:" -#: optiondialog.cpp:803 +#: optiondialog.cpp:825 #, kde-format msgid "Auto indentation" msgstr "Endentação automática" -#: optiondialog.cpp:807 +#: optiondialog.cpp:829 #, kde-format msgid "On: The indentation of the previous line is used for a new line.\n" msgstr "Ligado: A endentação da linha anterior é usada para uma nova linha.\n" -#: optiondialog.cpp:810 +#: optiondialog.cpp:832 #, kde-format msgid "Auto copy selection" msgstr "Copiar a seleção automaticamente" -#: optiondialog.cpp:814 +#: optiondialog.cpp:836 #, kde-format msgid "" "On: Any selection is immediately written to the clipboard.\n" @@ -2243,7 +2258,7 @@ "Transferência.\n" "Desligado: Você deve copiar explicitamente, por exemplo, via Ctrl-C." -#: optiondialog.cpp:829 +#: optiondialog.cpp:851 #, kde-format msgid "" "Sets the line endings for when an edited file is saved.\n" @@ -2252,12 +2267,12 @@ "Define os finais de linha para quando um arquivo editado for salvo.\n" "DOS/Windows: CR+LF; Unix: LF; com CR=0D, LF=0A" -#: optiondialog.cpp:839 +#: optiondialog.cpp:861 #, kde-format msgid "Diff" msgstr "Diff" -#: optiondialog.cpp:840 +#: optiondialog.cpp:862 #, kde-format msgid "Diff Settings" msgstr "Configurações do Diff" @@ -2271,12 +2286,12 @@ #. ); #. ++line; #. -#: optiondialog.cpp:865 +#: optiondialog.cpp:896 #, kde-format msgid "Ignore numbers (treat as white space)" msgstr "Ignorar números (tratar como espaço em branco)" -#: optiondialog.cpp:869 +#: optiondialog.cpp:900 #, kde-format msgid "" "Ignore number characters during line matching phase. (Similar to Ignore " @@ -2287,45 +2302,45 @@ "(similar a ignorar espaços em branco).\n" "Pode ajudar a comparar arquivos com dados numéricos." -#: optiondialog.cpp:873 +#: optiondialog.cpp:904 #, kde-format msgid "Ignore C/C++ comments (treat as white space)" msgstr "Ignorar comentários C/C++ (tratar como espaço em branco)" -#: optiondialog.cpp:876 +#: optiondialog.cpp:907 #, kde-format msgid "Treat C/C++ comments like white space." msgstr "Trata comentários C/C++ como espaços em branco." -#: optiondialog.cpp:879 +#: optiondialog.cpp:910 #, kde-format msgid "Ignore case (treat as white space)" msgstr "Ignorar maiúsculas/minúsculas (tratar como espaço em branco)" -#: optiondialog.cpp:883 +#: optiondialog.cpp:914 #, kde-format msgid "Treat case differences like white space changes. ('a'<=>'A')" msgstr "" "Trata diferenças entre maiúsculas/minúsculas como alterações de espaço em " "branco ('a'<=>'A')" -#: optiondialog.cpp:886 +#: optiondialog.cpp:917 #, kde-format msgid "Preprocessor command:" msgstr "Comando do pré-processamento:" -#: optiondialog.cpp:891 +#: optiondialog.cpp:922 #, kde-format msgid "User defined pre-processing. (See the docs for details.)" msgstr "" "Pré-processamento definido pelo usuário. (Veja a documentação para detalhes)." -#: optiondialog.cpp:894 +#: optiondialog.cpp:925 #, kde-format msgid "Line-matching preprocessor command:" msgstr "Comando de pré-processamento para correspondência de linhas:" -#: optiondialog.cpp:899 +#: optiondialog.cpp:930 #, kde-format msgid "" "This pre-processor is only used during line matching.\n" @@ -2334,12 +2349,12 @@ "Esse pré-processamento é usado somente durante correspondência de linhas.\n" "(Veja a documentação para detalhes)." -#: optiondialog.cpp:902 +#: optiondialog.cpp:933 #, kde-format msgid "Try hard (slower)" msgstr "Tentar com persistência (lento)" -#: optiondialog.cpp:906 +#: optiondialog.cpp:937 #, kde-format msgid "" "Enables the --minimal option for the external diff.\n" @@ -2348,12 +2363,12 @@ "Habilita a opção --minimal para o diff externo.\n" "A análise dos arquivos grandes será muito mais lenta." -#: optiondialog.cpp:910 +#: optiondialog.cpp:941 #, kde-format msgid "Align B and C for 3 input files" msgstr "Alinhar B e C para 3 arquivos de entrada" -#: optiondialog.cpp:914 +#: optiondialog.cpp:945 #, kde-format msgid "" "Try to align B and C when comparing or merging three input files.\n" @@ -2364,17 +2379,23 @@ "Não é recomendado para mesclar porque isto pode ser mais complicado.\n" "(Desativado por padrão)." -#: optiondialog.cpp:926 +#: optiondialog.cpp:956 +#, kde-format +msgctxt "Settings page" +msgid "Merge" +msgstr "Mesclar" + +#: optiondialog.cpp:957 #, kde-format msgid "Merge Settings" msgstr "Configurações de mesclagem" -#: optiondialog.cpp:940 +#: optiondialog.cpp:980 #, kde-format msgid "Auto advance delay (ms):" msgstr "Atraso no avanço automático (ms):" -#: optiondialog.cpp:946 +#: optiondialog.cpp:986 #, kde-format msgid "" "When in Auto-Advance mode the result of the current selection is shown \n" @@ -2385,27 +2406,27 @@ "durante o período indicado, antes de avançar para o próximo conflito. " "Intervalo: 0-2000 ms" -#: optiondialog.cpp:950 +#: optiondialog.cpp:990 #, kde-format msgid "Show info dialogs" msgstr "Exibir janela de informação" -#: optiondialog.cpp:953 +#: optiondialog.cpp:993 #, kde-format msgid "Show a dialog with information about the number of conflicts." msgstr "Exibe uma janela com informações sobre o número de conflitos." -#: optiondialog.cpp:956 +#: optiondialog.cpp:996 #, kde-format msgid "White space 2-file merge default:" msgstr "Mesclagem padrão de 2 arquivos com espaços em branco:" -#: optiondialog.cpp:961 optiondialog.cpp:974 +#: optiondialog.cpp:1001 optiondialog.cpp:1014 #, kde-format msgid "Manual Choice" -msgstr "Escolha Manual" +msgstr "Escolha manual" -#: optiondialog.cpp:965 optiondialog.cpp:979 +#: optiondialog.cpp:1005 optiondialog.cpp:1019 #, kde-format msgid "" "Allow the merge algorithm to automatically select an input for white-space-" @@ -2414,22 +2435,22 @@ "Permite que o algoritmo de mesclagem selecione automaticamente uma entrada " "para alterações somente em espaços em branco." -#: optiondialog.cpp:969 +#: optiondialog.cpp:1009 #, kde-format msgid "White space 3-file merge default:" msgstr "Mesclagem padrão de 3 arquivos com espaços em branco:" -#: optiondialog.cpp:983 +#: optiondialog.cpp:1023 #, kde-format msgid "Automatic Merge Regular Expression" msgstr "Expressão regular de mesclagem automática" -#: optiondialog.cpp:991 smalldialogs.cpp:449 +#: optiondialog.cpp:1031 smalldialogs.cpp:459 #, kde-format msgid "Auto merge regular expression:" msgstr "Expressão regular de mesclagem automática:" -#: optiondialog.cpp:996 +#: optiondialog.cpp:1036 #, kde-format msgid "" "Regular expression for lines where KDiff3 should automatically choose one " @@ -2442,13 +2463,13 @@ "Quando uma linha com um conflito corresponder à expressão regular então\n" "- se possível - será C, caso contrário B será escolhido." -#: optiondialog.cpp:1002 +#: optiondialog.cpp:1042 #, kde-format msgid "Run regular expression auto merge on merge start" msgstr "" "Executar a mesclagem automática via expressão regular ao iniciar a mesclagem" -#: optiondialog.cpp:1005 +#: optiondialog.cpp:1045 #, kde-format msgid "" "Run the merge for auto merge regular expressions\n" @@ -2457,17 +2478,17 @@ "Executa a mesclagem automática usando expressões regulares\n" "imediatamente após o início da mesclagem.\n" -#: optiondialog.cpp:1010 +#: optiondialog.cpp:1050 #, kde-format msgid "Version Control History Merging" msgstr "Mesclagem do histórico de controle de versões" -#: optiondialog.cpp:1018 smalldialogs.cpp:476 +#: optiondialog.cpp:1058 smalldialogs.cpp:486 #, kde-format msgid "History start regular expression:" msgstr "Expressão regular do início do histórico:" -#: optiondialog.cpp:1023 +#: optiondialog.cpp:1063 #, kde-format msgid "" "Regular expression for the start of the version control history entry.\n" @@ -2479,12 +2500,12 @@ "Normalmente este valor contém a palavra-chave \"$Log$\".\n" "Valor padrão: \".*\\$Log.*\\$.*\"" -#: optiondialog.cpp:1029 smalldialogs.cpp:504 +#: optiondialog.cpp:1069 smalldialogs.cpp:514 #, kde-format msgid "History entry start regular expression:" msgstr "Expressão regular do início da entrada do histórico:" -#: optiondialog.cpp:1042 +#: optiondialog.cpp:1082 #, kde-format msgid "" "A version control history entry consists of several lines.\n" @@ -2503,22 +2524,22 @@ "entradas do histórico.\n" "Veja a documentação para detalhes." -#: optiondialog.cpp:1050 +#: optiondialog.cpp:1090 #, kde-format msgid "History merge sorting" msgstr "Ordenação da mesclagem do histórico" -#: optiondialog.cpp:1053 +#: optiondialog.cpp:1093 #, kde-format msgid "Sort version control history by a key." msgstr "Ordena o histórico do controle de versões por uma chave." -#: optiondialog.cpp:1063 +#: optiondialog.cpp:1103 #, kde-format msgid "History entry start sort key order:" msgstr "Ordem da chave de ordenação do início da entrada do histórico:" -#: optiondialog.cpp:1068 +#: optiondialog.cpp:1108 #, kde-format msgid "" "Each pair of parentheses used in the regular expression for the history " @@ -2536,40 +2557,40 @@ "Se deixado em branco, nenhuma ordenação será efetuada.\n" "Veja a documentação para detalhes." -#: optiondialog.cpp:1079 +#: optiondialog.cpp:1119 #, kde-format msgid "Merge version control history on merge start" msgstr "Mesclar o histórico do controle de versões ao iniciar a mesclagem" -#: optiondialog.cpp:1082 +#: optiondialog.cpp:1122 #, kde-format msgid "Run version control history automerge on merge start." msgstr "" "Executa a mesclagem automática do histórico de controle de versões ao " "iniciar a mesclagem." -#: optiondialog.cpp:1086 +#: optiondialog.cpp:1126 #, kde-format msgid "Max number of history entries:" msgstr "Número máximo de entradas do histórico:" -#: optiondialog.cpp:1090 +#: optiondialog.cpp:1130 #, kde-format msgid "Cut off after specified number. Use -1 for infinite number of entries." msgstr "" "Remove após o número indicado. Usar -1 para um número infinito de entradas." -#: optiondialog.cpp:1094 +#: optiondialog.cpp:1134 #, kde-format msgid "Test your regular expressions" msgstr "Testar suas expressões regulares" -#: optiondialog.cpp:1099 +#: optiondialog.cpp:1139 #, kde-format msgid "Irrelevant merge command:" msgstr "Comando de mesclagem irrelevante:" -#: optiondialog.cpp:1104 +#: optiondialog.cpp:1144 #, kde-format msgid "" "If specified this script is run after automerge\n" @@ -2580,12 +2601,12 @@ "automática quando nenhuma outra alteração relevante for detectada.\n" "É executado com os parâmetros: arquivo1 arquivo2 arquivo3" -#: optiondialog.cpp:1109 +#: optiondialog.cpp:1149 #, kde-format msgid "Auto save and quit on merge without conflicts" msgstr "Salvar e sair automaticamente na mesclagem sem conflitos" -#: optiondialog.cpp:1113 +#: optiondialog.cpp:1153 #, kde-format msgid "" "If KDiff3 was started for a file-merge from the command line and all\n" @@ -2598,27 +2619,27 @@ "usuário, então o arquivo será automaticamente salve e o programa encerrado.\n" "(Semelhante à opção de linha de comando \"--auto\")." -#: optiondialog.cpp:1124 optiondialog.cpp:1125 +#: optiondialog.cpp:1164 optiondialog.cpp:1165 #, kde-format msgid "Directory" msgstr "Diretório" -#: optiondialog.cpp:1137 +#: optiondialog.cpp:1185 #, kde-format msgid "Recursive directories" msgstr "Diretórios recursivos" -#: optiondialog.cpp:1140 +#: optiondialog.cpp:1188 #, kde-format msgid "Whether to analyze subdirectories or not." msgstr "Se os subdiretórios devem ou não ser analisados." -#: optiondialog.cpp:1142 +#: optiondialog.cpp:1190 #, kde-format msgid "File pattern(s):" msgstr "Padrão(ões) de arquivos:" -#: optiondialog.cpp:1148 +#: optiondialog.cpp:1196 #, kde-format msgid "" "Pattern(s) of files to be analyzed. \n" @@ -2629,12 +2650,12 @@ "Caracteres curinga: '*' e '?'\n" "Vários padrões podem ser especificados usando o separador: ';'" -#: optiondialog.cpp:1153 +#: optiondialog.cpp:1201 #, kde-format msgid "File-anti-pattern(s):" msgstr "Anti-padrão(ões) de arquivos:" -#: optiondialog.cpp:1159 +#: optiondialog.cpp:1207 #, kde-format msgid "" "Pattern(s) of files to be excluded from analysis. \n" @@ -2645,12 +2666,12 @@ "Caracteres curinga: '*' e '?'\n" "Vários padrões podem ser especificados usando o separador: ';'" -#: optiondialog.cpp:1164 +#: optiondialog.cpp:1212 #, kde-format msgid "Dir-anti-pattern(s):" msgstr "Anti-padrão(ões) de diretório:" -#: optiondialog.cpp:1170 +#: optiondialog.cpp:1218 #, kde-format msgid "" "Pattern(s) of directories to be excluded from analysis. \n" @@ -2661,12 +2682,12 @@ "Caracteres curinga: '*' e '?'\n" "Vários padrões podem ser especificados usando o separador: ';'" -#: optiondialog.cpp:1175 +#: optiondialog.cpp:1223 #, kde-format msgid "Use .cvsignore" msgstr "Usar .cvsignore" -#: optiondialog.cpp:1179 +#: optiondialog.cpp:1227 #, kde-format msgid "" "Extends the antipattern to anything that would be ignored by CVS.\n" @@ -2675,22 +2696,22 @@ "Estende o anti-padrão para qualquer coisa que possa ser ignorada pelo CVS.\n" "Isso pode ser especificado por diretório, via arquivos \".cvsignore\" locais." -#: optiondialog.cpp:1183 +#: optiondialog.cpp:1231 #, kde-format msgid "Find hidden files and directories" msgstr "Encontrar arquivos e diretórios ocultos" -#: optiondialog.cpp:1186 +#: optiondialog.cpp:1234 #, kde-format msgid "Finds hidden files and directories." msgstr "Encontra arquivos e diretórios ocultos." -#: optiondialog.cpp:1189 +#: optiondialog.cpp:1237 #, kde-format msgid "Follow file links" msgstr "Seguir os links dos arquivos" -#: optiondialog.cpp:1193 +#: optiondialog.cpp:1241 #, kde-format msgid "" "On: Compare the file the link points to.\n" @@ -2699,12 +2720,12 @@ "Ligado: Compara o arquivo para o qual o link aponta.\n" "Desligado: Compara os links." -#: optiondialog.cpp:1197 +#: optiondialog.cpp:1245 #, kde-format msgid "Follow directory links" msgstr "Seguir os links de diretório" -#: optiondialog.cpp:1201 +#: optiondialog.cpp:1249 #, kde-format msgid "" "On: Compare the directory the link points to.\n" @@ -2713,12 +2734,12 @@ "Ligado: Compara o diretório para o qual o link aponta.\n" "Desligado: Compara os links." -#: optiondialog.cpp:1210 +#: optiondialog.cpp:1258 #, kde-format msgid "Case sensitive filename comparison" msgstr "Distinguir maiúsculas/minúsculas na comparação de nomes de arquivos" -#: optiondialog.cpp:1214 +#: optiondialog.cpp:1262 #, kde-format msgid "" "The directory comparison will compare files or directories when their names " @@ -2731,12 +2752,12 @@ "Configure esta opção se a caixa dos nomes também deve corresponder. (O " "padrão para Windows é desligada; caso contrário ligada.)" -#: optiondialog.cpp:1218 +#: optiondialog.cpp:1266 #, kde-format msgid "Unfold all subdirectories on load" msgstr "Expandir todos os subdiretórios ao carregar" -#: optiondialog.cpp:1222 +#: optiondialog.cpp:1270 #, kde-format msgid "" "On: Unfold all subdirectories when starting a directory diff.\n" @@ -2745,12 +2766,12 @@ "Ligado: Expande todos os subdiretórios ao iniciar um diff de diretórios.\n" "Desligado: Deixa os diretórios contraídos." -#: optiondialog.cpp:1226 +#: optiondialog.cpp:1274 #, kde-format msgid "Skip directory status report" msgstr "Ignorar o relatório de status do diretório" -#: optiondialog.cpp:1230 +#: optiondialog.cpp:1278 #, kde-format msgid "" "On: Do not show the Directory Comparison Status.\n" @@ -2759,27 +2780,27 @@ "Ligado: Não exibe o status de comparação de diretório\n" "Desligado: Exite a janela de status ao iniciar." -#: optiondialog.cpp:1234 +#: optiondialog.cpp:1282 #, kde-format msgid "File Comparison Mode" msgstr "Modo de comparação de arquivo" -#: optiondialog.cpp:1239 +#: optiondialog.cpp:1287 #, kde-format msgid "Binary comparison" msgstr "Comparação binária" -#: optiondialog.cpp:1241 +#: optiondialog.cpp:1289 #, kde-format msgid "Binary comparison of each file. (Default)" msgstr "Comparação binária de cada arquivo. (Padrão)" -#: optiondialog.cpp:1244 +#: optiondialog.cpp:1292 #, kde-format msgid "Full analysis" msgstr "Análise completa" -#: optiondialog.cpp:1246 +#: optiondialog.cpp:1294 #, kde-format msgid "" "Do a full analysis and show statistics information in extra columns.\n" @@ -2789,12 +2810,12 @@ "(Mais lento que a comparação binária, muito mais lento para arquivos " "binários.)" -#: optiondialog.cpp:1250 +#: optiondialog.cpp:1298 #, kde-format msgid "Trust the size and modification date (unsafe)" msgstr "Confiar no tamanho e na data de modificação (inseguro)" -#: optiondialog.cpp:1252 +#: optiondialog.cpp:1300 #, kde-format msgid "" "Assume that files are equal if the modification date and file length are " @@ -2809,7 +2830,7 @@ "aparecerão como diferentes.\n" "Útil para diretórios grandes ou redes lentas." -#: optiondialog.cpp:1257 +#: optiondialog.cpp:1305 #, kde-format msgid "" "Trust the size and date, but use binary comparison if date does not match " @@ -2818,7 +2839,7 @@ "Confiar no tamanho e na data, mas usar comparação binária se a data não " "corresponder (inseguro)" -#: optiondialog.cpp:1259 +#: optiondialog.cpp:1307 #, kde-format msgid "" "Assume that files are equal if the modification date and file length are " @@ -2831,12 +2852,12 @@ "Se a data não for igual, mas os tamanhos sim, usa a comparação binária.\n" "Útil para diretórios grandes ou redes lentas." -#: optiondialog.cpp:1264 +#: optiondialog.cpp:1312 #, kde-format msgid "Trust the size (unsafe)" msgstr "Confiar no tamanho (inseguro)" -#: optiondialog.cpp:1266 +#: optiondialog.cpp:1314 #, kde-format msgid "" "Assume that files are equal if their file lengths are equal.\n" @@ -2847,12 +2868,12 @@ "Útil para diretórios grandes ou para redes lentas, quando a data é " "modificada durante o download." -#: optiondialog.cpp:1273 +#: optiondialog.cpp:1321 #, kde-format msgid "Synchronize directories" msgstr "Sincronizar diretórios" -#: optiondialog.cpp:1277 +#: optiondialog.cpp:1325 #, kde-format msgid "" "Offers to store files in both directories so that\n" @@ -2863,12 +2884,12 @@ "de modo que ambos fiquem iguais ao final.\n" "Funciona apenas ao comparar dois diretórios sem indicar um destino." -#: optiondialog.cpp:1283 +#: optiondialog.cpp:1331 #, kde-format msgid "White space differences considered equal" msgstr "Considerar iguais as diferenças por espaço em branco" -#: optiondialog.cpp:1287 +#: optiondialog.cpp:1335 #, kde-format msgid "" "If files differ only by white space consider them equal.\n" @@ -2877,12 +2898,12 @@ "Considera iguais os arquivos que diferem apenas por espaço em branco.\n" "Isto está ativo somente quando é escolhida a análise completa." -#: optiondialog.cpp:1293 +#: optiondialog.cpp:1341 #, kde-format msgid "Copy newer instead of merging (unsafe)" msgstr "Copiar o mais novo ao invés de mesclar (inseguro)" -#: optiondialog.cpp:1297 +#: optiondialog.cpp:1345 #, kde-format msgid "" "Do not look inside, just take the newer file.\n" @@ -2893,12 +2914,12 @@ "(Use somente se você souber o que está fazendo!)\n" "Só é efetivo ao comparar dois diretórios." -#: optiondialog.cpp:1302 +#: optiondialog.cpp:1350 #, kde-format msgid "Backup files (.orig)" msgstr "Fazer backup dos arquivos (.orig)" -#: optiondialog.cpp:1306 +#: optiondialog.cpp:1354 #, kde-format msgid "" "If a file would be saved over an old file, then the old file\n" @@ -2907,17 +2928,17 @@ "Se for salvar um arquivo sobre um mais antigo, o arquivo antigo\n" "será renomeado com uma extensão '.orig' ao invés de ser excluído." -#: optiondialog.cpp:1382 optiondialog.cpp:1383 +#: optiondialog.cpp:1430 optiondialog.cpp:1431 #, kde-format msgid "Regional Settings" msgstr "Configurações regionais" -#: optiondialog.cpp:1397 +#: optiondialog.cpp:1454 #, kde-format msgid "Use the same encoding for everything:" msgstr "Utilizar a mesma codificação para tudo:" -#: optiondialog.cpp:1401 +#: optiondialog.cpp:1458 #, kde-format msgid "" "Enable this allows to change all encodings by changing the first only.\n" @@ -2927,17 +2948,17 @@ "primeira.\n" "Desative se forem necessárias configurações individuais." -#: optiondialog.cpp:1405 +#: optiondialog.cpp:1462 #, kde-format msgid "Note: Local Encoding is \"%1\"" msgstr "Nota: A codificação local é \"%1\"" -#: optiondialog.cpp:1409 +#: optiondialog.cpp:1466 #, kde-format msgid "File Encoding for A:" msgstr "Codificação de arquivo para A:" -#: optiondialog.cpp:1416 +#: optiondialog.cpp:1473 #, kde-format msgid "" "If enabled then Unicode (UTF-16 or UTF-8) encoding will be detected.\n" @@ -2950,32 +2971,32 @@ "alternativa.\n" "(A detecção de Unicode depende dos primeiros bytes de um arquivo)." -#: optiondialog.cpp:1419 optiondialog.cpp:1430 optiondialog.cpp:1441 +#: optiondialog.cpp:1476 optiondialog.cpp:1487 optiondialog.cpp:1498 #, kde-format msgid "Auto Detect Unicode" -msgstr "Autodetectar o unicode" +msgstr "Detectar automaticamente o unicode" -#: optiondialog.cpp:1425 +#: optiondialog.cpp:1482 #, kde-format msgid "File Encoding for B:" msgstr "Codificação de arquivo para B:" -#: optiondialog.cpp:1436 +#: optiondialog.cpp:1493 #, kde-format msgid "File Encoding for C:" msgstr "Codificação de arquivo para C:" -#: optiondialog.cpp:1447 +#: optiondialog.cpp:1504 #, kde-format msgid "File Encoding for Merge Output and Saving:" msgstr "Codificação de arquivo para saída e salvamento da mesclagem:" -#: optiondialog.cpp:1452 +#: optiondialog.cpp:1509 #, kde-format msgid "Auto Select" msgstr "Seleção automática" -#: optiondialog.cpp:1456 +#: optiondialog.cpp:1513 #, kde-format msgid "" "If enabled then the encoding from the input files is used.\n" @@ -2986,17 +3007,17 @@ "Em casos ambíguos, será pedido ao usuário que escolha a codificação para " "salvamento." -#: optiondialog.cpp:1459 +#: optiondialog.cpp:1516 #, kde-format msgid "File Encoding for Preprocessor Files:" msgstr "Codificação dos arquivos de pré-processamento:" -#: optiondialog.cpp:1471 +#: optiondialog.cpp:1528 #, kde-format msgid "Right To Left Language" msgstr "Idioma da direita para a esquerda" -#: optiondialog.cpp:1475 +#: optiondialog.cpp:1532 #, kde-format msgid "" "Some languages are read from right to left.\n" @@ -3005,22 +3026,22 @@ "Alguns idiomas são lidos da direita para esquerda.\n" "Esta opção muda o visualizador e editor apropriadamente." -#: optiondialog.cpp:1485 +#: optiondialog.cpp:1542 #, kde-format msgid "Integration" msgstr "Integração" -#: optiondialog.cpp:1486 +#: optiondialog.cpp:1543 #, kde-format msgid "Integration Settings" msgstr "Configuração de integração" -#: optiondialog.cpp:1499 +#: optiondialog.cpp:1564 #, kde-format msgid "Command line options to ignore:" msgstr "Opções da linha de comando a ignorar:" -#: optiondialog.cpp:1505 +#: optiondialog.cpp:1570 #, kde-format msgid "" "List of command line options that should be ignored when KDiff3 is used by " @@ -3033,12 +3054,12 @@ "Se desejar indicar vários valores, separe-os por ';'\n" "Isto irá eliminar o erro de \"Opção desconhecida\"." -#: optiondialog.cpp:1510 +#: optiondialog.cpp:1575 #, kde-format msgid "Quit also via Escape key" msgstr "Sair também com a tecla ESC" -#: optiondialog.cpp:1514 +#: optiondialog.cpp:1579 #, kde-format msgid "" "Fast method to exit.\n" @@ -3047,7 +3068,7 @@ "Um método rápido para sair.\n" "Para os que estão acostumados a usar a tecla ESC." -#: optiondialog.cpp:1598 +#: optiondialog.cpp:1653 #, kde-format msgid "This resets all options. Not only those of the current topic." msgstr "Reinicia todas as opções. Não somente as desse tópico." @@ -3069,7 +3090,7 @@ #: pdiff.cpp:122 #, kde-format msgid "PreprocessorCmd: " -msgstr "PreprocessorCmd: " +msgstr "Comando do pré-processador: " #: pdiff.cpp:127 #, kde-format @@ -3103,81 +3124,71 @@ msgid "Disable Unsafe Options" msgstr "Desativar opções inseguras" -#: pdiff.cpp:158 +#: pdiff.cpp:160 #, kde-format msgid "Loading A" msgstr "Carregando A" -#: pdiff.cpp:167 +#: pdiff.cpp:162 #, kde-format -msgid "Errors occurred during pre-processing of file A." -msgstr "Ocorreram erros durante o pré-processamento do arquivo A." +msgid "Loading A: %1" +msgstr "Carregando A: %1" -#: pdiff.cpp:172 +#: pdiff.cpp:170 #, kde-format msgid "Loading B" msgstr "Carregando B" -#: pdiff.cpp:179 -#, kde-format -msgid "Errors occurred during pre-processing of file B." -msgstr "Ocorreram erros durante o pré-processamento do arquivo B." - -#: pdiff.cpp:202 pdiff.cpp:241 +#: pdiff.cpp:201 pdiff.cpp:237 #, kde-format msgid "Diff: A <-> B" msgstr "Diff: A <-> B" -#: pdiff.cpp:208 pdiff.cpp:279 pdiff.cpp:293 +#: pdiff.cpp:207 pdiff.cpp:275 pdiff.cpp:289 #, kde-format msgid "Linediff: A <-> B" msgstr "LineDiff: A <-> B" -#: pdiff.cpp:225 +#: pdiff.cpp:224 #, kde-format msgid "Loading C" msgstr "Carregando C" -#: pdiff.cpp:232 -#, kde-format -msgid "Errors occurred during pre-processing of file C." -msgstr "Ocorreram erros durante o pré-processamento do arquivo C." - -#: pdiff.cpp:250 +#: pdiff.cpp:246 #, kde-format msgid "Diff: A <-> C" msgstr "Diff: A <-> C" -#: pdiff.cpp:261 +#: pdiff.cpp:257 #, kde-format msgid "Diff: B <-> C" msgstr "Diff: B <-> C" -#: pdiff.cpp:283 pdiff.cpp:297 +#: pdiff.cpp:279 pdiff.cpp:293 #, kde-format msgid "Linediff: B <-> C" msgstr "LineDiff: B <-> C" -#: pdiff.cpp:287 pdiff.cpp:301 +#: pdiff.cpp:283 pdiff.cpp:297 #, kde-format msgid "Linediff: A <-> C" msgstr "LineDiff: A <-> C" -#: pdiff.cpp:829 +#: pdiff.cpp:819 #, kde-format 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:835 pdiff.cpp:839 pdiff.cpp:843 +#: pdiff.cpp:825 pdiff.cpp:829 pdiff.cpp:833 #, kde-format msgid "Files %1 and %2 have equal text, but are not binary equal. \n" msgstr "" "Os arquivos %1 e %2 contém o mesmo texto, mas não são iguais em nível " "binário.\n" -#: pdiff.cpp:853 +#: pdiff.cpp:843 #, kde-format msgid "" "Some input files do not seem to be pure text files.\n" @@ -3188,17 +3199,17 @@ "Note que a mesclagem do KDiff3 não foi pensada para dados binários.\n" "Continue por sua conta e risco." -#: pdiff.cpp:863 +#: pdiff.cpp:853 #, kde-format msgid ", B" msgstr ", B" -#: pdiff.cpp:865 +#: pdiff.cpp:855 #, kde-format msgid ", C" msgstr ", C" -#: pdiff.cpp:867 +#: pdiff.cpp:857 #, kde-format msgid "" "Some input characters could not be converted to valid unicode.\n" @@ -3213,77 +3224,72 @@ "Não salve o resultado se não tiver certeza. Continue por sua conta e risco.\n" "Os arquivos de entrada afetados estão em %1." -#: pdiff.cpp:1034 +#: pdiff.cpp:1032 #, kde-format msgid "Abort" msgstr "Cancelar" -#: pdiff.cpp:1040 pdiff.cpp:1130 +#: pdiff.cpp:1038 pdiff.cpp:1129 #, kde-format msgid "Opening files..." msgstr "Abrindo arquivos..." -#: pdiff.cpp:1107 -#, kde-format -msgid "File open error" -msgstr "Erro ao abrir o arquivo" - -#: pdiff.cpp:1202 +#: pdiff.cpp:1212 #, kde-format msgid "Cutting selection..." msgstr "Recortando a seleção..." -#: pdiff.cpp:1223 +#: pdiff.cpp:1233 #, kde-format msgid "Copying selection to clipboard..." msgstr "Copiando a seleção para a área de transferência..." -#: pdiff.cpp:1239 +#: pdiff.cpp:1249 #, kde-format msgid "Inserting clipboard contents..." msgstr "Inserindo o conteúdo da área de transferência..." -#: pdiff.cpp:1695 +#: pdiff.cpp:1705 #, kde-format msgid "Word wrap (Cancel disables word wrap)" msgstr "Quebra de palavra (Cancelar desabilita a quebra de palavra)" -#: pdiff.cpp:1696 +#: pdiff.cpp:1706 #, kde-format msgid "Calculating max width for horizontal scrollbar" msgstr "Calculando a largura máxima para a barra de rolagem" -#: pdiff.cpp:1911 +#: pdiff.cpp:1921 #, kde-format msgid "Save && Continue" msgstr "Salvar && Continuar" -#: pdiff.cpp:1912 +#: pdiff.cpp:1922 #, kde-format msgid "Continue Without Saving" msgstr "Continuar sem salvar" -#: pdiff.cpp:2124 +#: pdiff.cpp:2134 #, kde-format msgid "Search complete." msgstr "Pesquisa finalizada." -#: pdiff.cpp:2124 +#: pdiff.cpp:2134 #, kde-format msgid "Search Complete" msgstr "Pesquisa finalizada" -#: pdiff.cpp:2375 +#: pdiff.cpp:2385 #, kde-format msgid "Nothing is selected in either diff input window." msgstr "Nada foi selecionado em nenhuma janela de entrada de diferenças." -#: pdiff.cpp:2375 +#: pdiff.cpp:2385 #, kde-format msgid "Error while adding manual diff range" msgstr "Erro ao adicionar o intervalo manual de diferenças" -#: progress.cpp:59 progress.cpp:71 +#: progress.cpp:61 progress.cpp:73 #, kde-format msgid "&Cancel" msgstr "&Cancelar" @@ -3291,127 +3297,127 @@ #: smalldialogs.cpp:61 #, kde-format msgid "A (Base):" -msgstr "A (Base):" +msgstr "A (base):" -#: smalldialogs.cpp:68 smalldialogs.cpp:85 smalldialogs.cpp:102 -#: smalldialogs.cpp:144 +#: smalldialogs.cpp:71 smalldialogs.cpp:90 smalldialogs.cpp:109 +#: smalldialogs.cpp:154 #, kde-format msgid "File..." msgstr "Arquivo..." -#: smalldialogs.cpp:70 smalldialogs.cpp:87 smalldialogs.cpp:104 -#: smalldialogs.cpp:146 +#: smalldialogs.cpp:73 smalldialogs.cpp:92 smalldialogs.cpp:111 +#: smalldialogs.cpp:156 #, kde-format msgid "Dir..." msgstr "Diretório..." -#: smalldialogs.cpp:96 +#: smalldialogs.cpp:103 #, kde-format msgid "C (Optional):" -msgstr "C (Opcional):" +msgstr "C (opcional):" -#: smalldialogs.cpp:119 +#: smalldialogs.cpp:126 #, kde-format msgid "Swap/Copy Names..." msgstr "Trocar/copiar nomes..." -#: smalldialogs.cpp:124 smalldialogs.cpp:125 smalldialogs.cpp:126 +#: smalldialogs.cpp:131 smalldialogs.cpp:132 smalldialogs.cpp:133 #, kde-format msgid "Swap %1<->%2" msgstr "Trocar %1<->%2" -#: smalldialogs.cpp:127 smalldialogs.cpp:128 smalldialogs.cpp:129 +#: smalldialogs.cpp:134 smalldialogs.cpp:135 smalldialogs.cpp:136 #, kde-format msgid "Copy %1->Output" -msgstr "Copiar %1->Saída" +msgstr "Copiar %1->saída" -#: smalldialogs.cpp:130 smalldialogs.cpp:131 smalldialogs.cpp:132 +#: smalldialogs.cpp:137 smalldialogs.cpp:138 smalldialogs.cpp:139 #, kde-format msgid "Swap %1<->Output" -msgstr "Trocar %1<->Saída" +msgstr "Trocar %1<->saída" -#: smalldialogs.cpp:138 +#: smalldialogs.cpp:148 #, kde-format msgid "Output (optional):" msgstr "Saída (opcional):" -#: smalldialogs.cpp:168 +#: smalldialogs.cpp:178 #, kde-format msgid "Configure..." msgstr "Configurar..." -#: smalldialogs.cpp:233 +#: smalldialogs.cpp:243 #, kde-format msgid "Open Directory" msgstr "Abrir diretório" -#: smalldialogs.cpp:234 +#: smalldialogs.cpp:244 #, kde-format msgid "Select Output File" -msgstr "Selecionar o arquivo de saída" +msgstr "Selecionar arquivo de saída" -#: smalldialogs.cpp:393 +#: smalldialogs.cpp:403 #, kde-format msgid "Search text:" msgstr "Pesquisar texto:" -#: smalldialogs.cpp:400 +#: smalldialogs.cpp:410 #, kde-format msgid "Case sensitive" msgstr "Diferenciar maiúsculas de minúsculas" -#: smalldialogs.cpp:403 +#: smalldialogs.cpp:413 #, kde-format msgid "Search A" msgstr "Pesquisar A" -#: smalldialogs.cpp:408 +#: smalldialogs.cpp:418 #, kde-format msgid "Search B" msgstr "Pesquisar B" -#: smalldialogs.cpp:413 +#: smalldialogs.cpp:423 #, kde-format msgid "Search C" msgstr "Pesquisar C" -#: smalldialogs.cpp:418 +#: smalldialogs.cpp:428 #, kde-format msgid "Search output" msgstr "Resultado da pesquisa" -#: smalldialogs.cpp:425 +#: smalldialogs.cpp:435 #, kde-format msgid "&Search" msgstr "&Pesquisar" -#: smalldialogs.cpp:444 +#: smalldialogs.cpp:454 #, kde-format msgid "Regular Expression Tester" msgstr "Testador de expressões regulares" -#: smalldialogs.cpp:457 +#: smalldialogs.cpp:467 #, kde-format msgid "Example auto merge line:" msgstr "Exemplo de linha de mesclagem automática:" -#: smalldialogs.cpp:459 +#: smalldialogs.cpp:469 #, kde-format msgid "To test auto merge, copy a line as used in your files." msgstr "" "Para testar a mesclagem automática, copie uma linha usada nos seus arquivos." -#: smalldialogs.cpp:465 smalldialogs.cpp:493 smalldialogs.cpp:529 +#: smalldialogs.cpp:475 smalldialogs.cpp:503 smalldialogs.cpp:539 #, kde-format msgid "Match result:" msgstr "Resultado correspondente:" -#: smalldialogs.cpp:484 +#: smalldialogs.cpp:494 #, kde-format msgid "Example history start line (with leading comment):" msgstr "Exemplo de linha inicial do histórico (com o comentário inicial):" -#: smalldialogs.cpp:486 +#: smalldialogs.cpp:496 #, kde-format msgid "" "Copy a history start line as used in your files,\n" @@ -3420,18 +3426,18 @@ "Copie uma linha inicial do histórico, como a usada nos seus arquivos,\n" "incluindo o comentário inicial." -#: smalldialogs.cpp:512 +#: smalldialogs.cpp:522 #, kde-format msgid "History sort key order:" msgstr "Ordem da chave de ordenação do histórico:" -#: smalldialogs.cpp:520 +#: smalldialogs.cpp:530 #, kde-format msgid "Example history entry start line (without leading comment):" msgstr "" "Exemplo da linha inicial da entrada do histórico (sem o comentário inicial):" -#: smalldialogs.cpp:522 +#: smalldialogs.cpp:532 #, kde-format msgid "" "Copy a history entry start line as used in your files,\n" @@ -3441,50 +3447,50 @@ "arquivos,\n" "mas omita o comentário inicial." -#: smalldialogs.cpp:536 +#: smalldialogs.cpp:546 #, kde-format msgid "Sort key result:" msgstr "Resultado da chave de ordenação:" -#: smalldialogs.cpp:584 smalldialogs.cpp:594 smalldialogs.cpp:614 +#: smalldialogs.cpp:594 smalldialogs.cpp:604 smalldialogs.cpp:624 #, kde-format msgid "Match success." msgstr "Sucesso na correspondência." -#: smalldialogs.cpp:588 smalldialogs.cpp:598 smalldialogs.cpp:620 +#: smalldialogs.cpp:598 smalldialogs.cpp:608 smalldialogs.cpp:630 #, kde-format msgid "Match failed." msgstr "Falha na correspondência." -#: smalldialogs.cpp:605 +#: smalldialogs.cpp:615 #, kde-format msgid "Opening and closing parentheses do not match in regular expression." msgstr "" "Os parênteses de abertura e fechamento não correspondem na expressão regular." -#: SourceData.cpp:150 +#: SourceData.cpp:153 #, kde-format msgid "Writing clipboard data to temp file failed." msgstr "" "Não foi possível gravar os dados da área de transferência para o arquivo " "temporário." -#: SourceData.cpp:154 +#: SourceData.cpp:157 #, kde-format msgid "From Clipboard" -msgstr "Da area de transferência" +msgstr "Da área de transferência" -#: SourceData.cpp:335 +#: SourceData.cpp:348 #, kde-format msgid "%1 is not a normal file." msgstr "%1 não é um arquivo normal." -#: SourceData.cpp:427 +#: SourceData.cpp:440 #, kde-format msgid " Temp file is: %1" msgstr " O arquivo temporário é: %1" -#: SourceData.cpp:432 +#: SourceData.cpp:445 #, kde-format msgid "" "Preprocessing possibly failed. Check this command:\n" @@ -3499,12 +3505,12 @@ "\n" "O comando de pré-processamento será desabilitado agora." -#: SourceData.cpp:443 SourceData.cpp:512 +#: SourceData.cpp:456 SourceData.cpp:525 #, kde-format msgid "File %1 too large to process. Skipping." msgstr "O arquivo %1 é muito grande pra ser processado. Ignorando-o." -#: SourceData.cpp:487 +#: SourceData.cpp:500 #, kde-format msgid "" "The line-matching-preprocessing possibly failed. Check this command:\n" @@ -3514,7 +3520,7 @@ "The line-matching-preprocessing command will be disabled now." msgstr "" "O pré-processamento de correspondência de linhas possivelmente falhou. " -"Verifique esee comando:\n" +"Verifique esse comando:\n" "\n" " %1\n" "\n" diff -Nru kdiff3-1.8.01/po/ro/kdiff3fileitemactionplugin.po kdiff3-1.8.3/po/ro/kdiff3fileitemactionplugin.po --- kdiff3-1.8.01/po/ro/kdiff3fileitemactionplugin.po 2019-05-18 01:02:20.000000000 +0000 +++ kdiff3-1.8.3/po/ro/kdiff3fileitemactionplugin.po 2020-06-25 00:18:45.000000000 +0000 @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: \n" -"Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2019-03-22 03:09+0100\n" +"Report-Msgid-Bugs-To: https://bugs.kde.org\n" +"POT-Creation-Date: 2019-08-30 07:40+0200\n" "PO-Revision-Date: 2017-08-04 00:36+0200\n" "Last-Translator: Ovidiu-Florin Bogdan \n" "Language-Team: Romanian \n" diff -Nru kdiff3-1.8.01/po/ro/kdiff3.po kdiff3-1.8.3/po/ro/kdiff3.po --- kdiff3-1.8.01/po/ro/kdiff3.po 2019-05-18 01:02:20.000000000 +0000 +++ kdiff3-1.8.3/po/ro/kdiff3.po 2020-06-25 00:18:45.000000000 +0000 @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: @PACKAGE\n" -"Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2019-04-18 08:02+0200\n" +"Report-Msgid-Bugs-To: https://bugs.kde.org\n" +"POT-Creation-Date: 2020-06-22 07:48+0200\n" "PO-Revision-Date: 2017-08-04 00:47+0200\n" "Last-Translator: Ovidiu-Florin Bogdan \n" "Language-Team: Romanian \n" @@ -30,337 +30,337 @@ msgid "Your emails" msgstr "sergiu@ase.md ovidiu.b13@gmail.com" -#: difftextwindow.cpp:412 +#: difftextwindow.cpp:414 #, kde-format msgid "File %1: Line %2" msgstr "" -#: difftextwindow.cpp:414 +#: difftextwindow.cpp:416 #, fuzzy, kde-format #| msgid "not available" msgid "File %1: Line not available" msgstr "indisponibil" -#: difftextwindow.cpp:1780 +#: difftextwindow.cpp:1778 #, kde-format msgid "Encoding:" msgstr "" -#: difftextwindow.cpp:1782 mergeresultwindow.cpp:3138 optiondialog.cpp:818 +#: difftextwindow.cpp:1781 mergeresultwindow.cpp:3166 optiondialog.cpp:840 #, kde-format msgid "Line end style:" msgstr "" -#: difftextwindow.cpp:1810 directorymergewindow.cpp:382 -#: directorymergewindow.cpp:433 directorymergewindow.cpp:524 -#: directorymergewindow.cpp:3058 directorymergewindow.cpp:3189 -#: directorymergewindow.cpp:3417 mergeresultwindow.cpp:942 -#: mergeresultwindow.cpp:944 mergeresultwindow.cpp:946 -#: mergeresultwindow.cpp:948 mergeresultwindow.cpp:1814 -#: mergeresultwindow.cpp:3170 mergeresultwindow.cpp:3177 optiondialog.cpp:962 -#: optiondialog.cpp:975 pdiff.cpp:833 pdiff.cpp:835 pdiff.cpp:837 pdiff.cpp:839 -#: pdiff.cpp:861 smalldialogs.cpp:124 smalldialogs.cpp:126 smalldialogs.cpp:127 -#: smalldialogs.cpp:130 +#: difftextwindow.cpp:1809 directorymergewindow.cpp:383 +#: directorymergewindow.cpp:434 directorymergewindow.cpp:525 +#: directorymergewindow.cpp:3072 directorymergewindow.cpp:3203 +#: directorymergewindow.cpp:3431 mergeresultwindow.cpp:970 +#: mergeresultwindow.cpp:972 mergeresultwindow.cpp:974 +#: mergeresultwindow.cpp:976 mergeresultwindow.cpp:1842 +#: mergeresultwindow.cpp:3198 mergeresultwindow.cpp:3205 optiondialog.cpp:1002 +#: optiondialog.cpp:1015 pdiff.cpp:823 pdiff.cpp:825 pdiff.cpp:827 +#: pdiff.cpp:829 pdiff.cpp:851 smalldialogs.cpp:131 smalldialogs.cpp:133 +#: smalldialogs.cpp:134 smalldialogs.cpp:137 #, kde-format msgid "A" msgstr "A" -#: difftextwindow.cpp:1810 directorymergewindow.cpp:384 -#: directorymergewindow.cpp:436 directorymergewindow.cpp:526 -#: directorymergewindow.cpp:3064 directorymergewindow.cpp:3190 -#: directorymergewindow.cpp:3418 mergeresultwindow.cpp:942 -#: mergeresultwindow.cpp:944 mergeresultwindow.cpp:950 -#: mergeresultwindow.cpp:952 mergeresultwindow.cpp:1816 -#: mergeresultwindow.cpp:3172 mergeresultwindow.cpp:3179 optiondialog.cpp:963 -#: optiondialog.cpp:976 pdiff.cpp:833 pdiff.cpp:835 pdiff.cpp:841 pdiff.cpp:843 -#: pdiff.cpp:863 smalldialogs.cpp:124 smalldialogs.cpp:125 smalldialogs.cpp:128 -#: smalldialogs.cpp:131 +#: difftextwindow.cpp:1809 directorymergewindow.cpp:385 +#: directorymergewindow.cpp:437 directorymergewindow.cpp:527 +#: directorymergewindow.cpp:3078 directorymergewindow.cpp:3204 +#: directorymergewindow.cpp:3432 mergeresultwindow.cpp:970 +#: mergeresultwindow.cpp:972 mergeresultwindow.cpp:978 +#: mergeresultwindow.cpp:980 mergeresultwindow.cpp:1844 +#: mergeresultwindow.cpp:3200 mergeresultwindow.cpp:3207 optiondialog.cpp:1003 +#: optiondialog.cpp:1016 pdiff.cpp:823 pdiff.cpp:825 pdiff.cpp:831 +#: pdiff.cpp:833 pdiff.cpp:853 smalldialogs.cpp:131 smalldialogs.cpp:132 +#: smalldialogs.cpp:135 smalldialogs.cpp:138 #, kde-format msgid "B" msgstr "B" -#: difftextwindow.cpp:1810 directorymergewindow.cpp:386 -#: directorymergewindow.cpp:439 directorymergewindow.cpp:528 -#: directorymergewindow.cpp:3070 directorymergewindow.cpp:3191 -#: directorymergewindow.cpp:3419 mergeresultwindow.cpp:946 -#: mergeresultwindow.cpp:948 mergeresultwindow.cpp:950 -#: mergeresultwindow.cpp:952 mergeresultwindow.cpp:1818 -#: mergeresultwindow.cpp:3174 mergeresultwindow.cpp:3181 optiondialog.cpp:977 -#: pdiff.cpp:837 pdiff.cpp:839 pdiff.cpp:841 pdiff.cpp:843 pdiff.cpp:865 -#: smalldialogs.cpp:125 smalldialogs.cpp:126 smalldialogs.cpp:129 -#: smalldialogs.cpp:132 +#: difftextwindow.cpp:1809 directorymergewindow.cpp:387 +#: directorymergewindow.cpp:440 directorymergewindow.cpp:529 +#: directorymergewindow.cpp:3084 directorymergewindow.cpp:3205 +#: directorymergewindow.cpp:3433 mergeresultwindow.cpp:974 +#: mergeresultwindow.cpp:976 mergeresultwindow.cpp:978 +#: mergeresultwindow.cpp:980 mergeresultwindow.cpp:1846 +#: mergeresultwindow.cpp:3202 mergeresultwindow.cpp:3209 optiondialog.cpp:1017 +#: pdiff.cpp:827 pdiff.cpp:829 pdiff.cpp:831 pdiff.cpp:833 pdiff.cpp:855 +#: smalldialogs.cpp:132 smalldialogs.cpp:133 smalldialogs.cpp:136 +#: smalldialogs.cpp:139 #, kde-format msgid "C" msgstr "C" -#: difftextwindow.cpp:1810 +#: difftextwindow.cpp:1809 #, fuzzy, kde-format #| msgid "A (Base): " msgid "A (Base)" msgstr "A (Bază): " -#: difftextwindow.cpp:1812 +#: difftextwindow.cpp:1811 #, kde-format msgid "Encoding: %1" msgstr "" -#: difftextwindow.cpp:1813 mergeresultwindow.cpp:3183 +#: difftextwindow.cpp:1812 mergeresultwindow.cpp:3211 #, kde-format msgid "Unix" msgstr "" -#: difftextwindow.cpp:1813 mergeresultwindow.cpp:3184 +#: difftextwindow.cpp:1812 mergeresultwindow.cpp:3212 #, kde-format msgid "DOS" msgstr "" -#: difftextwindow.cpp:1813 +#: difftextwindow.cpp:1812 #, kde-format msgid "Line end style: %1" msgstr "" -#: difftextwindow.cpp:1835 kdiff3.cpp:873 +#: difftextwindow.cpp:1834 kdiff3.cpp:874 #, kde-format msgid "Top line" msgstr "Linia de vîrf" -#: difftextwindow.cpp:1845 +#: difftextwindow.cpp:1843 #, kde-format msgid "End" msgstr "Sfîrșit" -#: difftextwindow.cpp:1903 smalldialogs.cpp:235 +#: difftextwindow.cpp:1901 smalldialogs.cpp:245 #, fuzzy, kde-format #| msgid "File" msgid "Open File" msgstr "Fișier" -#: difftextwindow.cpp:1951 optiondialog.cpp:387 +#: difftextwindow.cpp:1943 optiondialog.cpp:389 #, kde-format msgid "Unicode, 8 bit" msgstr "" -#: difftextwindow.cpp:1966 +#: difftextwindow.cpp:1958 #, kde-format msgid "Other" msgstr "" -#: directorymergewindow.cpp:409 directorymergewindow.cpp:3424 +#: directorymergewindow.cpp:410 directorymergewindow.cpp:3438 #, kde-format msgid "Copy A to B" msgstr "Copiază A în B" -#: directorymergewindow.cpp:412 directorymergewindow.cpp:3425 +#: directorymergewindow.cpp:413 directorymergewindow.cpp:3439 #, kde-format msgid "Copy B to A" msgstr "Copiază B în A" -#: directorymergewindow.cpp:415 directorymergewindow.cpp:3426 +#: directorymergewindow.cpp:416 directorymergewindow.cpp:3440 #, kde-format msgid "Delete A" msgstr "Șterge A" -#: directorymergewindow.cpp:418 directorymergewindow.cpp:3427 +#: directorymergewindow.cpp:419 directorymergewindow.cpp:3441 #, kde-format msgid "Delete B" msgstr "Șterge B" -#: directorymergewindow.cpp:421 +#: directorymergewindow.cpp:422 #, kde-format msgid "Delete A & B" msgstr "Șterge A și B" -#: directorymergewindow.cpp:424 directorymergewindow.cpp:3429 +#: directorymergewindow.cpp:425 directorymergewindow.cpp:3443 #, kde-format msgid "Merge to A" msgstr "Îmbină cu A" -#: directorymergewindow.cpp:427 directorymergewindow.cpp:3430 +#: directorymergewindow.cpp:428 directorymergewindow.cpp:3444 #, kde-format msgid "Merge to B" msgstr "Îmbină cu B" -#: directorymergewindow.cpp:430 +#: directorymergewindow.cpp:431 #, kde-format msgid "Merge to A & B" msgstr "Îmbină cu A & B" -#: directorymergewindow.cpp:442 directorymergewindow.cpp:3421 +#: directorymergewindow.cpp:443 directorymergewindow.cpp:3435 #, kde-format msgid "Delete (if exists)" msgstr "Șterge (dacă există)" -#: directorymergewindow.cpp:445 directorymergewindow.cpp:448 -#: directorymergewindow.cpp:3420 optiondialog.cpp:925 smalldialogs.cpp:113 +#: directorymergewindow.cpp:446 directorymergewindow.cpp:449 +#: directorymergewindow.cpp:3434 smalldialogs.cpp:120 #, kde-format msgid "Merge" msgstr "Îmbină" -#: directorymergewindow.cpp:445 directorymergewindow.cpp:448 +#: directorymergewindow.cpp:446 directorymergewindow.cpp:449 #, kde-format msgid "Merge (manual)" msgstr "Îmbină (manual)" -#: directorymergewindow.cpp:451 +#: directorymergewindow.cpp:452 #, kde-format msgid "Error: Conflicting File Types" msgstr "" -#: directorymergewindow.cpp:454 +#: directorymergewindow.cpp:455 #, kde-format msgid "Error: Changed and Deleted" msgstr "" -#: directorymergewindow.cpp:457 +#: directorymergewindow.cpp:458 #, kde-format msgid "Error: Dates are equal but files are not." msgstr "" -#: directorymergewindow.cpp:471 +#: directorymergewindow.cpp:472 #, fuzzy, kde-format #| msgid "Done." msgid "Done" msgstr "Gata." -#: directorymergewindow.cpp:473 +#: directorymergewindow.cpp:474 #, kde-format msgid "Error" msgstr "Eroare" -#: directorymergewindow.cpp:475 +#: directorymergewindow.cpp:476 #, kde-format msgid "Skipped." msgstr "" -#: directorymergewindow.cpp:477 +#: directorymergewindow.cpp:478 #, kde-format msgid "Not saved." msgstr "Nesalvat." -#: directorymergewindow.cpp:479 +#: directorymergewindow.cpp:480 #, kde-format msgid "In progress..." msgstr "În curs..." -#: directorymergewindow.cpp:481 +#: directorymergewindow.cpp:482 #, kde-format msgid "To do." msgstr "De făcut." -#: directorymergewindow.cpp:522 +#: directorymergewindow.cpp:523 #, kde-format msgid "Name" msgstr "Denumire" -#: directorymergewindow.cpp:530 +#: directorymergewindow.cpp:531 #, kde-format msgid "Operation" msgstr "Operație" -#: directorymergewindow.cpp:532 +#: directorymergewindow.cpp:533 #, kde-format msgid "Status" msgstr "Stare" -#: directorymergewindow.cpp:534 +#: directorymergewindow.cpp:535 #, kde-format msgid "Unsolved" msgstr "Nesoluționat" -#: directorymergewindow.cpp:536 +#: directorymergewindow.cpp:537 #, kde-format msgid "Solved" msgstr "Soluționat" -#: directorymergewindow.cpp:538 +#: directorymergewindow.cpp:539 #, kde-format msgid "Nonwhite" msgstr "" -#: directorymergewindow.cpp:540 +#: directorymergewindow.cpp:541 #, kde-format msgid "White" msgstr "Alb" -#: directorymergewindow.cpp:674 +#: directorymergewindow.cpp:676 #, kde-format msgid "Unable to compare non-normal file with normal file." msgstr "" -#: directorymergewindow.cpp:688 +#: directorymergewindow.cpp:690 #, kde-format msgid "Mix of links and normal files." msgstr "" -#: directorymergewindow.cpp:695 +#: directorymergewindow.cpp:697 #, fuzzy, kde-format msgid "Link: " msgstr "Legătură" -#: directorymergewindow.cpp:704 +#: directorymergewindow.cpp:706 #, fuzzy, kde-format msgid "Size. " msgstr "Mărime " -#: directorymergewindow.cpp:718 directorymergewindow.cpp:728 +#: directorymergewindow.cpp:720 directorymergewindow.cpp:730 #, kde-format msgid "Date & Size: " msgstr "" -#: directorymergewindow.cpp:748 +#: directorymergewindow.cpp:751 #, kde-format msgid "Comparing file..." msgstr "" -#: directorymergewindow.cpp:801 +#: directorymergewindow.cpp:813 #, kde-format msgid "" "You are currently doing a directory merge. Are you sure, you want to abort " "the merge and rescan the directory?" msgstr "" -#: directorymergewindow.cpp:802 kdiff3.cpp:698 kdiff3.cpp:708 kdiff3.cpp:720 -#: mergeresultwindow.cpp:372 pdiff.cpp:1033 pdiff.cpp:1910 pdiff.cpp:1920 +#: directorymergewindow.cpp:814 kdiff3.cpp:697 kdiff3.cpp:707 kdiff3.cpp:719 +#: mergeresultwindow.cpp:400 pdiff.cpp:1031 pdiff.cpp:1920 pdiff.cpp:1930 #, kde-format msgid "Warning" msgstr "Avertisment" -#: directorymergewindow.cpp:803 directorymergewindow.cpp:3393 +#: directorymergewindow.cpp:815 directorymergewindow.cpp:3407 #, kde-format msgid "Rescan" msgstr "Recitire" -#: directorymergewindow.cpp:804 pdiff.cpp:1035 +#: directorymergewindow.cpp:816 pdiff.cpp:1033 #, kde-format msgid "Continue Merging" msgstr "" -#: directorymergewindow.cpp:971 +#: directorymergewindow.cpp:984 #, kde-format msgid "Opening of directories failed:" msgstr "Deschiderea directoarelor a eșuat:" -#: directorymergewindow.cpp:975 +#: directorymergewindow.cpp:988 #, 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:980 +#: directorymergewindow.cpp:993 #, 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:985 +#: directorymergewindow.cpp:998 #, 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:988 +#: directorymergewindow.cpp:1001 #, kde-format msgid "Directory Open Error" msgstr "Eroare la deschiderea directorului" -#: directorymergewindow.cpp:996 +#: directorymergewindow.cpp:1009 #, kde-format msgid "" "The destination directory must not be the same as A or B when three " @@ -368,49 +368,49 @@ "Check again before continuing." msgstr "" -#: directorymergewindow.cpp:998 +#: directorymergewindow.cpp:1011 #, kde-format msgid "Parameter Warning" msgstr "Avertizare parametru" -#: directorymergewindow.cpp:1003 +#: directorymergewindow.cpp:1016 #, kde-format msgid "Scanning directories..." msgstr "Scanare directoare..." -#: directorymergewindow.cpp:1029 +#: directorymergewindow.cpp:1042 #, kde-format msgid "Reading Directory A" msgstr "Citire director A" -#: directorymergewindow.cpp:1038 +#: directorymergewindow.cpp:1051 #, kde-format msgid "Reading Directory B" msgstr "Citire director B" -#: directorymergewindow.cpp:1048 +#: directorymergewindow.cpp:1061 #, kde-format msgid "Reading Directory C" msgstr "Citire director C" -#: directorymergewindow.cpp:1064 +#: directorymergewindow.cpp:1077 #, kde-format msgid "Some subdirectories were not readable in" msgstr "" -#: directorymergewindow.cpp:1069 +#: directorymergewindow.cpp:1082 #, kde-format msgid "Check the permissions of the subdirectories." msgstr "Verificați permisiunile subdirectoarelor." -#: directorymergewindow.cpp:1106 kdiff3.cpp:666 kdiff3.cpp:753 kdiff3.cpp:777 -#: kdiff3.cpp:1065 kdiff3.cpp:1086 pdiff.cpp:1116 pdiff.cpp:1170 pdiff.cpp:1218 -#: pdiff.cpp:1234 pdiff.cpp:1277 pdiff.cpp:1301 +#: directorymergewindow.cpp:1119 kdiff3.cpp:665 kdiff3.cpp:752 kdiff3.cpp:776 +#: kdiff3.cpp:1072 kdiff3.cpp:1093 pdiff.cpp:1115 pdiff.cpp:1178 pdiff.cpp:1228 +#: pdiff.cpp:1244 pdiff.cpp:1287 pdiff.cpp:1311 #, kde-format msgid "Ready." msgstr "Gata." -#: directorymergewindow.cpp:1121 +#: directorymergewindow.cpp:1134 #, kde-format msgid "" "Directory Comparison Status\n" @@ -420,23 +420,23 @@ "Number of different files: %3" msgstr "" -#: directorymergewindow.cpp:1128 +#: directorymergewindow.cpp:1141 #, fuzzy, kde-format #| msgid "Number of manual merges:" msgid "Number of manual merges: %1" msgstr "Numărul de îmbinări manuale:" -#: directorymergewindow.cpp:1394 +#: directorymergewindow.cpp:1407 #, kde-format msgid "This affects all merge operations." msgstr "Aceasta afectează toate operațiile de îmbinare." -#: directorymergewindow.cpp:1395 +#: directorymergewindow.cpp:1408 #, kde-format msgid "Changing All Merge Operations" msgstr "" -#: directorymergewindow.cpp:1695 +#: directorymergewindow.cpp:1708 #, fuzzy, kde-format #| msgid "Processing " msgid "" @@ -444,45 +444,45 @@ "%3" msgstr "Procesare " -#: directorymergewindow.cpp:1738 directorymergewindow.cpp:1742 +#: directorymergewindow.cpp:1751 directorymergewindow.cpp:1755 #, kde-format msgid "Some files could not be processed." msgstr "" -#: directorymergewindow.cpp:2222 directorymergewindow.cpp:2247 -#: directorymergewindow.cpp:2271 +#: directorymergewindow.cpp:2235 directorymergewindow.cpp:2260 +#: directorymergewindow.cpp:2285 #, kde-format msgid "This operation is currently not possible." msgstr "Această operație nu este posibilă momentan." -#: directorymergewindow.cpp:2222 directorymergewindow.cpp:2247 -#: directorymergewindow.cpp:2271 directorymergewindow.cpp:2552 +#: directorymergewindow.cpp:2235 directorymergewindow.cpp:2260 +#: directorymergewindow.cpp:2285 directorymergewindow.cpp:2565 #, kde-format msgid "Operation Not Possible" msgstr "Operație imposibilă" -#: directorymergewindow.cpp:2318 +#: directorymergewindow.cpp:2332 #, fuzzy, kde-format #| msgid "An error occurred while copying.\n" msgid "An error occurred while copying." msgstr "A intervenit o eroare în timpul copierii.\n" -#: directorymergewindow.cpp:2319 directorymergewindow.cpp:2759 +#: directorymergewindow.cpp:2333 directorymergewindow.cpp:2772 #, kde-format msgid "Merge Error" msgstr "Eroare de îmbinare" -#: directorymergewindow.cpp:2396 +#: directorymergewindow.cpp:2410 #, kde-format msgid "Unknown merge operation. (This must never happen!)" msgstr "" -#: directorymergewindow.cpp:2441 +#: directorymergewindow.cpp:2455 #, kde-format msgid "Unknown merge operation." msgstr "" -#: directorymergewindow.cpp:2454 +#: directorymergewindow.cpp:2468 #, kde-format msgid "" "The merge is about to begin.\n" @@ -495,50 +495,50 @@ "whatsoever! Make backups of your vital data!" msgstr "" -#: directorymergewindow.cpp:2459 +#: directorymergewindow.cpp:2473 #, kde-format msgid "Starting Merge" msgstr "" -#: directorymergewindow.cpp:2460 +#: directorymergewindow.cpp:2474 #, kde-format msgid "Do It" msgstr "Execută" -#: directorymergewindow.cpp:2461 +#: directorymergewindow.cpp:2475 #, kde-format msgid "Simulate It" msgstr "Simulează" -#: directorymergewindow.cpp:2487 +#: directorymergewindow.cpp:2501 #, kde-format msgid "" "The highlighted item has a different type in the different directories. " "Select what to do." msgstr "" -#: directorymergewindow.cpp:2491 +#: directorymergewindow.cpp:2505 #, kde-format msgid "" "The modification dates of the file are equal but the files are not. Select " "what to do." msgstr "" -#: directorymergewindow.cpp:2495 +#: directorymergewindow.cpp:2509 #, kde-format msgid "" "The highlighted item was changed in one directory and deleted in the other. " "Select what to do." msgstr "" -#: directorymergewindow.cpp:2552 +#: directorymergewindow.cpp:2565 #, kde-format msgid "" "This operation is currently not possible because directory merge is " "currently running." msgstr "" -#: directorymergewindow.cpp:2609 +#: directorymergewindow.cpp:2622 #, kde-format msgid "" "There was an error in the last step.\n" @@ -546,306 +546,306 @@ "to skip this item?" msgstr "" -#: directorymergewindow.cpp:2611 +#: directorymergewindow.cpp:2624 #, kde-format msgid "Continue merge after an error" msgstr "" -#: directorymergewindow.cpp:2612 +#: directorymergewindow.cpp:2625 #, kde-format msgid "Continue With Last Item" msgstr "" -#: directorymergewindow.cpp:2613 +#: directorymergewindow.cpp:2626 #, kde-format msgid "Skip Item" msgstr "" -#: directorymergewindow.cpp:2709 +#: directorymergewindow.cpp:2722 #, kde-format msgid "Merge operation complete." msgstr "" -#: directorymergewindow.cpp:2709 directorymergewindow.cpp:2712 +#: directorymergewindow.cpp:2722 directorymergewindow.cpp:2725 #, kde-format msgid "Merge Complete" msgstr "" -#: directorymergewindow.cpp:2722 +#: directorymergewindow.cpp:2735 #, kde-format msgid "" "Simulated merge complete: Check if you agree with the proposed operations." msgstr "" -#: directorymergewindow.cpp:2758 +#: directorymergewindow.cpp:2771 #, kde-format msgid "An error occurred. Press OK to see detailed information." msgstr "" -#: directorymergewindow.cpp:2791 +#: directorymergewindow.cpp:2804 #, kde-format msgid "Error: While deleting %1: Creating backup failed." msgstr "" -#: directorymergewindow.cpp:2798 +#: directorymergewindow.cpp:2811 #, kde-format msgid "delete directory recursively( %1 )" msgstr "" -#: directorymergewindow.cpp:2800 +#: directorymergewindow.cpp:2813 #, fuzzy, kde-format msgid "delete( %1 )" msgstr "Ș&terge" -#: directorymergewindow.cpp:2815 +#: directorymergewindow.cpp:2828 #, kde-format msgid "Error: delete dir operation failed while trying to read the directory." msgstr "" -#: directorymergewindow.cpp:2834 +#: directorymergewindow.cpp:2847 #, kde-format msgid "Error: rmdir( %1 ) operation failed." msgstr "" -#: directorymergewindow.cpp:2844 +#: directorymergewindow.cpp:2857 #, kde-format msgid "Error: delete operation failed." msgstr "" -#: directorymergewindow.cpp:2870 +#: directorymergewindow.cpp:2884 #, kde-format msgid "manual merge( %1, %2, %3 -> %4)" msgstr "" -#: directorymergewindow.cpp:2873 +#: directorymergewindow.cpp:2887 #, kde-format msgid "" " Note: After a manual merge the user should continue by pressing F7." msgstr "" -#: directorymergewindow.cpp:2900 +#: directorymergewindow.cpp:2914 #, kde-format msgid "Error: copy( %1 -> %2 ) failed.Deleting existing destination failed." msgstr "" -#: directorymergewindow.cpp:2909 +#: directorymergewindow.cpp:2923 #, kde-format msgid "copyLink( %1 -> %2 )" msgstr "" -#: directorymergewindow.cpp:2918 +#: directorymergewindow.cpp:2932 #, kde-format msgid "Error: copyLink failed: Remote links are not yet supported." msgstr "" -#: directorymergewindow.cpp:2928 +#: directorymergewindow.cpp:2942 #, kde-format msgid "Error: copyLink failed." msgstr "" -#: directorymergewindow.cpp:2953 +#: directorymergewindow.cpp:2967 #, fuzzy, kde-format msgid "copy( %1 -> %2 )" msgstr "C&opiază" -#: directorymergewindow.cpp:2979 +#: directorymergewindow.cpp:2993 #, kde-format msgid "Error during rename( %1 -> %2 ): Cannot delete existing destination." msgstr "" -#: directorymergewindow.cpp:2986 +#: directorymergewindow.cpp:3000 #, fuzzy, kde-format msgid "rename( %1 -> %2 )" msgstr "&Redenumire" -#: directorymergewindow.cpp:2995 +#: directorymergewindow.cpp:3009 #, kde-format msgid "Error: Rename failed." msgstr "" -#: directorymergewindow.cpp:3013 +#: directorymergewindow.cpp:3027 #, kde-format msgid "Error during makeDir of %1. Cannot delete existing file." msgstr "" -#: directorymergewindow.cpp:3030 +#: directorymergewindow.cpp:3044 #, kde-format msgid "makeDir( %1 )" msgstr "" -#: directorymergewindow.cpp:3040 +#: directorymergewindow.cpp:3054 #, kde-format msgid "Error while creating directory." msgstr "Eroare la crearea directorului." -#: directorymergewindow.cpp:3076 directorymergewindow.cpp:3195 +#: directorymergewindow.cpp:3090 directorymergewindow.cpp:3209 #, kde-format msgid "Dest" msgstr "Dest" -#: directorymergewindow.cpp:3084 directorymergewindow.cpp:3113 +#: directorymergewindow.cpp:3098 directorymergewindow.cpp:3127 #, kde-format msgid "Dir" msgstr "Dir" -#: directorymergewindow.cpp:3084 +#: directorymergewindow.cpp:3098 #, kde-format msgid "Type" msgstr "Tip" -#: directorymergewindow.cpp:3084 +#: directorymergewindow.cpp:3098 #, kde-format msgid "Size" msgstr "Dimensiune" -#: directorymergewindow.cpp:3085 +#: directorymergewindow.cpp:3099 #, kde-format msgid "Attr" msgstr "Atrib" -#: directorymergewindow.cpp:3085 +#: directorymergewindow.cpp:3099 #, kde-format msgid "Last Modification" msgstr "Ultima modificare" -#: directorymergewindow.cpp:3085 +#: directorymergewindow.cpp:3099 #, kde-format msgid "Link-Destination" msgstr "Destinație-legătură" -#: directorymergewindow.cpp:3113 +#: directorymergewindow.cpp:3127 #, kde-format msgid "File" msgstr "Fișier" -#: directorymergewindow.cpp:3113 +#: directorymergewindow.cpp:3127 #, fuzzy, kde-format msgid "-Link" msgstr "Legătură" -#: directorymergewindow.cpp:3119 +#: directorymergewindow.cpp:3133 #, kde-format msgid "not available" msgstr "indisponibil" -#: directorymergewindow.cpp:3137 +#: directorymergewindow.cpp:3151 #, kde-format msgid "A (Dest): " msgstr "A (Dest): " -#: directorymergewindow.cpp:3141 +#: directorymergewindow.cpp:3155 #, kde-format msgid "A: " msgstr "" -#: directorymergewindow.cpp:3141 +#: directorymergewindow.cpp:3155 #, kde-format msgid "A (Base): " msgstr "A (Bază): " -#: directorymergewindow.cpp:3147 +#: directorymergewindow.cpp:3161 #, kde-format msgid "B (Dest): " msgstr "B (Dest): " -#: directorymergewindow.cpp:3151 +#: directorymergewindow.cpp:3165 #, kde-format msgid "B: " msgstr "" -#: directorymergewindow.cpp:3156 +#: directorymergewindow.cpp:3170 #, kde-format msgid "C (Dest): " msgstr "C (Dest): " -#: directorymergewindow.cpp:3160 +#: directorymergewindow.cpp:3174 #, kde-format msgid "C: " msgstr "" -#: directorymergewindow.cpp:3163 +#: directorymergewindow.cpp:3177 #, kde-format msgid "Dest: " msgstr "Dest: " #. i18n("Saving Directory Merge State ...")); -#: directorymergewindow.cpp:3238 +#: directorymergewindow.cpp:3252 #, kde-format msgid "Save Directory Merge State As..." msgstr "" -#: directorymergewindow.cpp:3387 +#: directorymergewindow.cpp:3401 #, kde-format msgid "Start/Continue Directory Merge" msgstr "" -#: directorymergewindow.cpp:3388 +#: directorymergewindow.cpp:3402 #, kde-format msgid "Run Operation for Current Item" msgstr "" -#: directorymergewindow.cpp:3389 +#: directorymergewindow.cpp:3403 #, kde-format msgid "Compare Selected File" msgstr "Compară fișierul ales" -#: directorymergewindow.cpp:3390 +#: directorymergewindow.cpp:3404 #, kde-format msgid "Merge Current File" msgstr "" -#: directorymergewindow.cpp:3390 +#: directorymergewindow.cpp:3404 #, kde-format msgid "" "Merge\n" "File" msgstr "" -#: directorymergewindow.cpp:3391 +#: directorymergewindow.cpp:3405 #, kde-format msgid "Fold All Subdirs" msgstr "" -#: directorymergewindow.cpp:3392 +#: directorymergewindow.cpp:3406 #, kde-format msgid "Unfold All Subdirs" msgstr "" #. i18n("Save Directory Merge State ..."), 0, this, &DirectoryMergeWindow::slotSaveMergeState, ac, "dir_save_merge_state"); #. i18n("Load Directory Merge State ..."), 0, this, &DirectoryMergeWindow::slotLoadMergeState, ac, "dir_load_merge_state"); -#: directorymergewindow.cpp:3396 +#: directorymergewindow.cpp:3410 #, kde-format msgid "Choose A for All Items" msgstr "" -#: directorymergewindow.cpp:3397 +#: directorymergewindow.cpp:3411 #, kde-format msgid "Choose B for All Items" msgstr "" -#: directorymergewindow.cpp:3398 +#: directorymergewindow.cpp:3412 #, kde-format msgid "Choose C for All Items" msgstr "" -#: directorymergewindow.cpp:3399 +#: directorymergewindow.cpp:3413 #, kde-format msgid "Auto-Choose Operation for All Items" msgstr "" -#: directorymergewindow.cpp:3400 +#: directorymergewindow.cpp:3414 #, kde-format msgid "No Operation for All Items" msgstr "" #. i18n("Synchronize Directories"), 0, this, &DirectoryMergeWindow::slotSynchronizeDirectories, ac, "dir_synchronize_directories"); #. d->m_pDirChooseNewerFiles = GuiUtils::createAction< KToggleAction >(i18n("Copy Newer Files Instead of Merging"), 0, this, &DirectoryMergeWindow::slotChooseNewerFiles, ac, "dir_choose_newer_files"); -#: directorymergewindow.cpp:3405 +#: directorymergewindow.cpp:3419 #, kde-format msgid "Show Identical Files" msgstr "Arată fișiere identice" -#: directorymergewindow.cpp:3405 +#: directorymergewindow.cpp:3419 #, kde-format msgid "" "Identical\n" @@ -854,282 +854,287 @@ "Fișiere\n" "identice" -#: directorymergewindow.cpp:3406 +#: directorymergewindow.cpp:3420 #, kde-format msgid "Show Different Files" msgstr "Arată fișiere diferite" -#: directorymergewindow.cpp:3407 +#: directorymergewindow.cpp:3421 #, kde-format msgid "Show Files only in A" msgstr "" -#: directorymergewindow.cpp:3407 +#: directorymergewindow.cpp:3421 #, kde-format msgid "" "Files\n" "only in A" msgstr "" -#: directorymergewindow.cpp:3408 +#: directorymergewindow.cpp:3422 #, kde-format msgid "Show Files only in B" msgstr "" -#: directorymergewindow.cpp:3408 +#: directorymergewindow.cpp:3422 #, kde-format msgid "" "Files\n" "only in B" msgstr "" -#: directorymergewindow.cpp:3409 +#: directorymergewindow.cpp:3423 #, kde-format msgid "Show Files only in C" msgstr "" -#: directorymergewindow.cpp:3409 +#: directorymergewindow.cpp:3423 #, kde-format msgid "" "Files\n" "only in C" msgstr "" -#: directorymergewindow.cpp:3413 +#: directorymergewindow.cpp:3427 #, kde-format msgid "Compare Explicitly Selected Files" msgstr "" -#: directorymergewindow.cpp:3414 +#: directorymergewindow.cpp:3428 #, kde-format msgid "Merge Explicitly Selected Files" msgstr "" -#: directorymergewindow.cpp:3416 directorymergewindow.cpp:3423 +#: directorymergewindow.cpp:3430 directorymergewindow.cpp:3437 #, kde-format msgid "Do Nothing" msgstr "Nu fă nimic" -#: directorymergewindow.cpp:3428 +#: directorymergewindow.cpp:3442 #, kde-format msgid "Delete A && B" msgstr "" -#: directorymergewindow.cpp:3431 +#: directorymergewindow.cpp:3445 #, kde-format msgid "Merge to A && B" msgstr "" -#: fileaccess.cpp:462 SourceData.cpp:493 +#: fileaccess.cpp:301 +#, kde-format +msgid "Unable to determine full url. No parent specified." +msgstr "" + +#: fileaccess.cpp:482 SourceData.cpp:506 #, fuzzy, kde-format #| msgid "Reading file: %1" msgid "Failed to read file: %1" msgstr "Se citește fișierul: %1" -#: fileaccess.cpp:587 +#: fileaccess.cpp:624 #, kde-format msgid "Creating temp copy of %1 failed." msgstr "" -#: fileaccess.cpp:595 fileaccess.cpp:600 +#: fileaccess.cpp:632 fileaccess.cpp:637 #, fuzzy, kde-format #| msgid "Saving failed." msgid "Opening %1 failed. %2" msgstr "Salvarea a eșuat." -#: fileaccess.cpp:619 fileaccess.cpp:627 +#: fileaccess.cpp:656 fileaccess.cpp:664 #, fuzzy, kde-format #| msgid "Error reading from %1" msgid "Error reading from %1. %2" msgstr "Eroare la citirea din %1" -#: fileaccess.cpp:751 +#: fileaccess.cpp:788 #, kde-format msgid "" "While trying to make a backup, deleting an older backup failed.\n" "Filename: %1" msgstr "" -#: fileaccess.cpp:758 +#: fileaccess.cpp:795 #, kde-format msgid "" "While trying to make a backup, renaming failed.\n" "Filenames: %1 -> %2" msgstr "" -#: fileaccess.cpp:828 +#: fileaccess.cpp:865 #, kde-format msgid "Getting file status: %1" msgstr "Se obține starea fișierului: %1" -#: fileaccess.cpp:869 +#: fileaccess.cpp:906 #, kde-format msgid "Reading file: %1" msgstr "Se citește fișierul: %1" -#: fileaccess.cpp:907 +#: fileaccess.cpp:944 #, kde-format msgid "Writing file: %1" msgstr "Se scrie fișierul: %1" -#: fileaccess.cpp:940 +#: fileaccess.cpp:977 #, kde-format msgid "Out of memory" msgstr "Memorie insuficientă" -#: fileaccess.cpp:976 +#: fileaccess.cpp:1013 #, kde-format msgid "Making directory: %1" msgstr "Se creează dosarul: %1" -#: fileaccess.cpp:997 +#: fileaccess.cpp:1034 #, kde-format msgid "Removing directory: %1" msgstr "Se elimină dosarul: %1" -#: fileaccess.cpp:1012 +#: fileaccess.cpp:1049 #, kde-format msgid "Removing file: %1" msgstr "Se elimină fișierul: %1" -#: fileaccess.cpp:1028 +#: fileaccess.cpp:1065 #, kde-format msgid "Creating symbolic link: %1 -> %2" msgstr "Se creează legătura simbolică: %1 -> %2" -#: fileaccess.cpp:1052 +#: fileaccess.cpp:1089 #, kde-format msgid "Renaming file: %1 -> %2" msgstr "Se redenumește fișierul: %1 -> %2" -#: fileaccess.cpp:1086 +#: fileaccess.cpp:1123 #, kde-format msgid "Copying file: %1 -> %2" msgstr "Se copiază fișierul: %1 -> %2" -#: fileaccess.cpp:1108 +#: fileaccess.cpp:1145 #, fuzzy, kde-format #| msgid "Reading directory: " msgid "Reading directory: %1" msgstr "Se citește dosarul: " -#: fileaccess.cpp:1162 +#: fileaccess.cpp:1202 #, kde-format msgid "Listing directory: %1" msgstr "Se enumeră dosarul: %1" -#: kdiff3.cpp:181 +#: kdiff3.cpp:182 #, kde-format msgid "Current Configuration:" msgstr "Configurație actuală:" -#: kdiff3.cpp:186 +#: kdiff3.cpp:187 #, kde-format msgid "Config Option Error:" msgstr "Eroare opțiune de configurare:" -#: kdiff3.cpp:240 +#: kdiff3.cpp:246 #, kde-format msgid "Option --auto used, but no output file specified." msgstr "Opțiunea --auto utilizată, dar niciun fișier de ieșire specificat." -#: kdiff3.cpp:416 +#: kdiff3.cpp:405 #, kde-format msgid "Option --auto ignored for directory comparison." msgstr "Opțiunea --auto ignorată pentru compararea directoarelor." -#: kdiff3.cpp:460 +#: kdiff3.cpp:449 #, kde-format msgid "Saving failed." msgstr "Salvarea a eșuat." -#: kdiff3.cpp:496 pdiff.cpp:1098 +#: kdiff3.cpp:494 pdiff.cpp:1096 #, kde-format msgid "Opening of these files failed:" msgstr "Deschiderea acestor fișiere a eșuat:" -#: kdiff3.cpp:505 -#, kde-format -msgid "File Open Error" +#: kdiff3.cpp:503 pdiff.cpp:1105 +#, fuzzy, kde-format +msgid "File open error" msgstr "Eroare la deschiderea fișierului" -#: kdiff3.cpp:533 +#: kdiff3.cpp:532 #, kde-format msgid "Opens documents for comparison..." msgstr "Deschide documente pentru comparare..." -#: kdiff3.cpp:535 +#: kdiff3.cpp:534 #, kde-format msgid "Reload" msgstr "Reîncarcă" -#: kdiff3.cpp:538 +#: kdiff3.cpp:537 #, kde-format msgid "Saves the merge result. All conflicts must be solved!" msgstr "Salvează rezultatul îmbinării. Toate conflictele trebuiesc rezolvate!" -#: kdiff3.cpp:540 +#: kdiff3.cpp:539 #, kde-format msgid "Saves the current document as..." msgstr "Salvează documentul actual ca..." -#: kdiff3.cpp:543 +#: kdiff3.cpp:542 #, kde-format msgid "Print the differences" msgstr "Tipărește diferențele" -#: kdiff3.cpp:546 +#: kdiff3.cpp:545 #, kde-format msgid "Quits the application" msgstr "Iese din aplicație" -#: kdiff3.cpp:549 +#: kdiff3.cpp:548 #, kde-format msgid "Cuts the selected section and puts it to the clipboard" msgstr "Taie secțiunea selectată și o pune în clipboard" -#: kdiff3.cpp:552 +#: kdiff3.cpp:551 #, kde-format msgid "Copies the selected section to the clipboard" msgstr "Copiază secțiunea selectată în clipboard" -#: kdiff3.cpp:554 +#: kdiff3.cpp:553 #, fuzzy, kde-format #| msgid "Pastes the clipboard contents to actual position" msgid "Pastes the clipboard contents to current position" msgstr "Lipește conținutul clipboard-ului la poziția curentă" -#: kdiff3.cpp:557 +#: kdiff3.cpp:556 #, kde-format msgid "Select everything in current window" msgstr "Selectează tot din fereastra curentă" -#: kdiff3.cpp:560 +#: kdiff3.cpp:559 #, kde-format msgid "Search for a string" msgstr "Caută un șir" -#: kdiff3.cpp:562 +#: kdiff3.cpp:561 #, kde-format msgid "Search again for the string" msgstr "" -#: kdiff3.cpp:567 +#: kdiff3.cpp:566 #, kde-format msgid "Enables/disables the statusbar" msgstr "Activează/dezactivează bara de stare" -#: kdiff3.cpp:571 +#: kdiff3.cpp:570 #, kde-format msgid "Configure KDiff3..." msgstr "Configurare KDiff3..." -#: kdiff3.cpp:590 +#: kdiff3.cpp:589 #, kde-format msgid "Go to Current Delta" msgstr "" -#: kdiff3.cpp:590 +#: kdiff3.cpp:589 #, kde-format msgid "" "Current\n" @@ -1138,12 +1143,12 @@ "Delta\n" "actuală" -#: kdiff3.cpp:592 +#: kdiff3.cpp:591 #, kde-format msgid "Go to First Delta" msgstr "Mergi la prima delta" -#: kdiff3.cpp:592 +#: kdiff3.cpp:591 #, kde-format msgid "" "First\n" @@ -1152,12 +1157,12 @@ "Prima\n" "delta" -#: kdiff3.cpp:594 +#: kdiff3.cpp:593 #, kde-format msgid "Go to Last Delta" msgstr "Mergi la ultima delta" -#: kdiff3.cpp:594 +#: kdiff3.cpp:593 #, kde-format msgid "" "Last\n" @@ -1166,24 +1171,24 @@ "Ultima\n" "delta" -#: kdiff3.cpp:596 +#: kdiff3.cpp:595 #, kde-format msgid "(Skips white space differences when \"Show White Space\" is disabled.)" msgstr "" -#: kdiff3.cpp:597 +#: kdiff3.cpp:596 #, kde-format msgid "" "(Does not skip white space differences even when \"Show White Space\" is " "disabled.)" msgstr "" -#: kdiff3.cpp:598 +#: kdiff3.cpp:597 #, kde-format msgid "Go to Previous Delta" msgstr "Mergi la delta precedentă" -#: kdiff3.cpp:598 +#: kdiff3.cpp:597 #, kde-format msgid "" "Prev\n" @@ -1192,12 +1197,12 @@ "Delta\n" "prec." -#: kdiff3.cpp:600 +#: kdiff3.cpp:599 #, kde-format msgid "Go to Next Delta" msgstr "Mergi la delta următoare" -#: kdiff3.cpp:600 +#: kdiff3.cpp:599 #, kde-format msgid "" "Next\n" @@ -1206,12 +1211,12 @@ "Delta\n" "următ." -#: kdiff3.cpp:602 +#: kdiff3.cpp:601 #, kde-format msgid "Go to Previous Conflict" msgstr "Mergi la conflictul precedent" -#: kdiff3.cpp:602 +#: kdiff3.cpp:601 #, kde-format msgid "" "Prev\n" @@ -1220,12 +1225,12 @@ "Conflict\n" "precedent" -#: kdiff3.cpp:604 +#: kdiff3.cpp:603 #, kde-format msgid "Go to Next Conflict" msgstr "Mergi la conflictul următor" -#: kdiff3.cpp:604 +#: kdiff3.cpp:603 #, kde-format msgid "" "Next\n" @@ -1234,12 +1239,12 @@ "Conflict\n" "următor" -#: kdiff3.cpp:606 +#: kdiff3.cpp:605 #, kde-format msgid "Go to Previous Unsolved Conflict" msgstr "Mergi la conflictul nerezolvat precedent" -#: kdiff3.cpp:606 +#: kdiff3.cpp:605 #, kde-format msgid "" "Prev\n" @@ -1248,12 +1253,12 @@ "Nerezolvat\n" "precedent" -#: kdiff3.cpp:608 +#: kdiff3.cpp:607 #, kde-format msgid "Go to Next Unsolved Conflict" msgstr "Mergi la conflictul nerezolvat următor" -#: kdiff3.cpp:608 +#: kdiff3.cpp:607 #, kde-format msgid "" "Next\n" @@ -1262,12 +1267,12 @@ "Nerezolvat\n" "următor" -#: kdiff3.cpp:610 +#: kdiff3.cpp:609 #, kde-format msgid "Select Line(s) From A" msgstr "Alege liniile din A" -#: kdiff3.cpp:610 +#: kdiff3.cpp:609 #, kde-format msgid "" "Choose\n" @@ -1276,12 +1281,12 @@ "Alege\n" "A" -#: kdiff3.cpp:611 +#: kdiff3.cpp:610 #, kde-format msgid "Select Line(s) From B" msgstr "Alege liniile din B" -#: kdiff3.cpp:611 +#: kdiff3.cpp:610 #, kde-format msgid "" "Choose\n" @@ -1290,12 +1295,12 @@ "Alege\n" "B" -#: kdiff3.cpp:612 +#: kdiff3.cpp:611 #, kde-format msgid "Select Line(s) From C" msgstr "Alege liniile din C" -#: kdiff3.cpp:612 +#: kdiff3.cpp:611 #, kde-format msgid "" "Choose\n" @@ -1304,12 +1309,12 @@ "Alege\n" "C" -#: kdiff3.cpp:613 +#: kdiff3.cpp:612 #, kde-format msgid "Automatically Go to Next Unsolved Conflict After Source Selection" msgstr "Mergi automat la următorul conflict nerezolvat după alegerea sursei" -#: kdiff3.cpp:613 +#: kdiff3.cpp:612 #, kde-format msgid "" "Auto\n" @@ -1318,13 +1323,13 @@ "Următor\n" "automat" -#: kdiff3.cpp:615 +#: kdiff3.cpp:614 #, fuzzy, kde-format #| msgid "Show Space && Tabulator Characters for Differences" msgid "Show Space && Tabulator Characters" msgstr "Arată caracterele de spațiere și tabulare pentru diferențe" -#: kdiff3.cpp:615 +#: kdiff3.cpp:614 #, kde-format msgid "" "White\n" @@ -1333,12 +1338,12 @@ "Caractere\n" "albe" -#: kdiff3.cpp:616 +#: kdiff3.cpp:615 #, kde-format msgid "Show White Space" msgstr "Arată spațiile albe" -#: kdiff3.cpp:616 +#: kdiff3.cpp:615 #, kde-format msgid "" "White\n" @@ -1347,12 +1352,12 @@ "Delta\n" "albe" -#: kdiff3.cpp:618 +#: kdiff3.cpp:617 #, kde-format msgid "Show Line Numbers" msgstr "Arată numerele liniilor" -#: kdiff3.cpp:618 +#: kdiff3.cpp:617 #, kde-format msgid "" "Line\n" @@ -1361,196 +1366,196 @@ "Numere\n" "de linii" -#: kdiff3.cpp:620 +#: kdiff3.cpp:619 #, kde-format msgid "Automatically Solve Simple Conflicts" msgstr "Rezolvă automat conflictele simple" -#: kdiff3.cpp:621 +#: kdiff3.cpp:620 #, kde-format msgid "Set Deltas to Conflicts" msgstr "Stabilește deltele la conflicte" -#: kdiff3.cpp:622 +#: kdiff3.cpp:621 #, kde-format msgid "Run Regular Expression Auto Merge" msgstr "" -#: kdiff3.cpp:623 +#: kdiff3.cpp:622 #, kde-format msgid "Automatically Solve History Conflicts" msgstr "" -#: kdiff3.cpp:624 +#: kdiff3.cpp:623 #, kde-format msgid "Split Diff At Selection" msgstr "Desparte Diff la selecție" -#: kdiff3.cpp:625 +#: kdiff3.cpp:624 #, kde-format msgid "Join Selected Diffs" msgstr "" -#: kdiff3.cpp:627 +#: kdiff3.cpp:626 #, kde-format msgid "Show Window A" msgstr "Arată fereastra A" -#: kdiff3.cpp:628 +#: kdiff3.cpp:627 #, kde-format msgid "Show Window B" msgstr "Arată fereastra B" -#: kdiff3.cpp:629 +#: kdiff3.cpp:628 #, kde-format msgid "Show Window C" msgstr "Arată fereastra C" -#: kdiff3.cpp:631 +#: kdiff3.cpp:630 #, kde-format msgid "Normal Overview" msgstr "Sumar normal" -#: kdiff3.cpp:632 +#: kdiff3.cpp:631 #, kde-format msgid "A vs. B Overview" msgstr "Sumar A vs. B" -#: kdiff3.cpp:633 +#: kdiff3.cpp:632 #, kde-format msgid "A vs. C Overview" msgstr "Sumar A vs. C" -#: kdiff3.cpp:634 +#: kdiff3.cpp:633 #, kde-format msgid "B vs. C Overview" msgstr "Sumar B vs. C" -#: kdiff3.cpp:635 +#: kdiff3.cpp:634 #, kde-format msgid "Word Wrap Diff Windows" msgstr "" -#: kdiff3.cpp:636 +#: kdiff3.cpp:635 #, kde-format msgid "Add Manual Diff Alignment" msgstr "" -#: kdiff3.cpp:637 +#: kdiff3.cpp:636 #, kde-format msgid "Clear All Manual Diff Alignments" msgstr "" -#: kdiff3.cpp:639 +#: kdiff3.cpp:638 #, kde-format msgid "Focus Next Window" msgstr "Focalizează fereastra următoare" -#: kdiff3.cpp:640 +#: kdiff3.cpp:639 #, kde-format msgid "Focus Prev Window" msgstr "Focalizează fereastra precedentă" -#: kdiff3.cpp:641 +#: kdiff3.cpp:640 #, kde-format msgid "Toggle Split Orientation" msgstr "Comută orientarea despărțirii" -#: kdiff3.cpp:643 +#: kdiff3.cpp:642 #, kde-format msgid "Dir && Text Split Screen View" msgstr "" -#: kdiff3.cpp:645 +#: kdiff3.cpp:644 #, kde-format msgid "Toggle Between Dir && Text View" msgstr "" -#: kdiff3.cpp:697 pdiff.cpp:1909 +#: kdiff3.cpp:696 pdiff.cpp:1919 #, fuzzy, kde-format #| msgid "The merge result hasn't been saved." msgid "The merge result has not been saved." msgstr "Rezultatul îmbinării nu a fost salvat." -#: kdiff3.cpp:699 +#: kdiff3.cpp:698 #, kde-format msgid "Save && Quit" msgstr "Salvează și ieși" -#: kdiff3.cpp:700 +#: kdiff3.cpp:699 #, kde-format msgid "Quit Without Saving" msgstr "Ieși fără a salva" -#: kdiff3.cpp:708 pdiff.cpp:1920 +#: kdiff3.cpp:707 pdiff.cpp:1930 #, kde-format msgid "Saving the merge result failed." msgstr "Salvarea rezultatului îmbinării a eșuat." -#: kdiff3.cpp:719 pdiff.cpp:1032 +#: kdiff3.cpp:718 pdiff.cpp:1030 #, kde-format msgid "" "You are currently doing a directory merge. Are you sure, you want to abort?" msgstr "" -#: kdiff3.cpp:742 +#: kdiff3.cpp:741 #, kde-format msgid "Saving file..." msgstr "Salvare fișier..." -#: kdiff3.cpp:759 +#: kdiff3.cpp:758 #, kde-format msgid "Saving file with a new filename..." msgstr "Se salvează fișierul cu un nume nou..." -#: kdiff3.cpp:761 +#: kdiff3.cpp:760 #, kde-format msgid "Save As..." msgstr "Salvare ca..." -#: kdiff3.cpp:820 +#: kdiff3.cpp:819 #, fuzzy, kde-format #| msgid "Printing completed." msgid "Printing not implemented." msgstr "Tipărire încheiată" -#: kdiff3.cpp:857 +#: kdiff3.cpp:858 #, kde-format msgid "Printing..." msgstr "Se tipărește..." -#: kdiff3.cpp:943 +#: kdiff3.cpp:948 #, kde-format msgid "Printing page %1 of %2" msgstr "" -#: kdiff3.cpp:1000 +#: kdiff3.cpp:1006 #, fuzzy, kde-format #| msgid "Selection" msgid " (Selection)" msgstr "Selecție" -#: kdiff3.cpp:1027 +#: kdiff3.cpp:1034 #, kde-format msgid "Printing completed." msgstr "Tipărire încheiată" -#: kdiff3.cpp:1031 +#: kdiff3.cpp:1038 #, kde-format msgid "Printing aborted." msgstr "Tipărire abandonată." -#: kdiff3.cpp:1038 +#: kdiff3.cpp:1045 #, kde-format msgid "Exiting..." msgstr "Ieșire..." -#: kdiff3.cpp:1049 +#: kdiff3.cpp:1056 #, kde-format msgid "Toggling toolbar..." msgstr "Se comută bara de unelte..." -#: kdiff3.cpp:1070 +#: kdiff3.cpp:1077 #, kde-format msgid "Toggle the statusbar..." msgstr "Se comută bara de stare..." @@ -1576,7 +1581,7 @@ msgid "Joachim Eibl" msgstr "" -#: kdiff3_part.cpp:173 kdiff3_part.cpp:254 +#: kdiff3_part.cpp:174 kdiff3_part.cpp:255 #, fuzzy, kde-format #| msgid "Opens documents for comparison..." msgid "Could not find files for comparison." @@ -1596,7 +1601,7 @@ msgstr "Configurare KDiff3..." #. i18n: ectx: ToolBar (mainToolBar) -#: kdiff3_part.rc:16 main.cpp:88 +#: kdiff3_part.rc:16 main.cpp:89 #, kde-format msgid "KDiff3" msgstr "KDiff3" @@ -1664,198 +1669,203 @@ msgid "Main Toolbar" msgstr "Bara de unelte principală" -#: main.cpp:68 main.cpp:72 +#: main.cpp:69 main.cpp:73 #, kde-format msgid "Ignored. (User defined.)" msgstr "" -#: main.cpp:92 +#: main.cpp:93 #, kde-format msgid " (64 bit)" msgstr "" -#: main.cpp:94 +#: main.cpp:95 #, kde-format msgid " (32 bit)" msgstr "" -#: main.cpp:95 +#: main.cpp:96 #, kde-format msgid "Tool for Comparison and Merge of Files and Directories" msgstr "" -#: main.cpp:96 +#: main.cpp:97 #, kde-format msgid "(c) 2002-2014 Joachim Eibl, (c) 2017 Michael Reeves KF5/Qt5 port" msgstr "" -#: main.cpp:112 +#: main.cpp:113 #, kde-format msgid "Merge the input." msgstr "" -#: main.cpp:113 +#: main.cpp:114 #, kde-format msgid "Explicit base file. For compatibility with certain tools." msgstr "" -#: main.cpp:114 +#: main.cpp:115 #, kde-format msgid "Output file. Implies -m. E.g.: -o newfile.txt" msgstr "" -#: main.cpp:115 +#: main.cpp:116 #, kde-format msgid "Output file, again. (For compatibility with certain tools.)" msgstr "" -#: main.cpp:116 +#: main.cpp:118 #, kde-format msgid "No GUI if all conflicts are auto-solvable. (Needs -o file)" msgstr "" -#: main.cpp:117 +#: main.cpp:120 +#, fuzzy, kde-format +msgid "Ignored." +msgstr "Ignorat" + +#: main.cpp:122 #, kde-format msgid "Do not solve conflicts automatically." msgstr "" -#: main.cpp:118 +#: main.cpp:123 #, kde-format msgid "Visible name replacement for input file 1 (base)." msgstr "" -#: main.cpp:119 +#: main.cpp:124 #, kde-format msgid "Visible name replacement for input file 2." msgstr "" -#: main.cpp:120 +#: main.cpp:125 #, kde-format msgid "Visible name replacement for input file 3." msgstr "" -#: main.cpp:121 +#: main.cpp:126 #, kde-format msgid "Alternative visible name replacement. Supply this once for every input." msgstr "" -#: main.cpp:122 +#: main.cpp:127 #, kde-format msgid "" "Override a config setting. Use once for every setting. E.g.: --cs " "\"AutoAdvance=1\"" msgstr "" -#: main.cpp:123 +#: main.cpp:128 #, kde-format msgid "Show list of config settings and current values." msgstr "" -#: main.cpp:124 +#: main.cpp:129 #, kde-format msgid "Use a different config file." msgstr "" -#: main.cpp:127 +#: main.cpp:132 #, kde-format msgid "file1 to open (base, if not specified via --base)" msgstr "" -#: main.cpp:128 +#: main.cpp:133 #, kde-format msgid "file2 to open" msgstr "fișier2 de deschis" -#: main.cpp:129 +#: main.cpp:134 #, kde-format msgid "file3 to open" msgstr "fișier3 de deschis" -#: main.cpp:153 +#: main.cpp:158 #, kde-format msgid "See kdiff3 --help for supported options." msgstr "" -#: mergeresultwindow.cpp:158 +#: mergeresultwindow.cpp:171 #, kde-format msgid "Choose A Everywhere" msgstr "Alege A peste tot" -#: mergeresultwindow.cpp:159 +#: mergeresultwindow.cpp:172 #, kde-format msgid "Choose B Everywhere" msgstr "Alege B peste tot" -#: mergeresultwindow.cpp:160 +#: mergeresultwindow.cpp:173 #, kde-format msgid "Choose C Everywhere" msgstr "Alege C peste tot" -#: mergeresultwindow.cpp:161 +#: mergeresultwindow.cpp:174 #, kde-format msgid "Choose A for All Unsolved Conflicts" msgstr "Alege A pentru toate conflictele nerezolvate" -#: mergeresultwindow.cpp:162 +#: mergeresultwindow.cpp:175 #, kde-format msgid "Choose B for All Unsolved Conflicts" msgstr "Alege B pentru toate conflictele nerezolvate" -#: mergeresultwindow.cpp:163 +#: mergeresultwindow.cpp:176 #, kde-format msgid "Choose C for All Unsolved Conflicts" msgstr "Alege C pentru toate conflictele nerezolvate" -#: mergeresultwindow.cpp:164 +#: mergeresultwindow.cpp:177 #, kde-format msgid "Choose A for All Unsolved Whitespace Conflicts" msgstr "Alege A pentru toate conflictele de spațiu alb nerezolvate" -#: mergeresultwindow.cpp:165 +#: mergeresultwindow.cpp:178 #, kde-format msgid "Choose B for All Unsolved Whitespace Conflicts" msgstr "Alege B pentru toate conflictele de spațiu alb nerezolvate" -#: mergeresultwindow.cpp:166 +#: mergeresultwindow.cpp:179 #, kde-format msgid "Choose C for All Unsolved Whitespace Conflicts" msgstr "Alege C pentru toate conflictele de spațiu alb nerezolvate" -#: mergeresultwindow.cpp:176 +#: mergeresultwindow.cpp:204 #, kde-format msgid "Number of remaining unsolved conflicts: %1 (of which %2 are whitespace)" msgstr "" -#: mergeresultwindow.cpp:370 +#: mergeresultwindow.cpp:398 #, kde-format msgid "" "The output has been modified.\n" "If you continue your changes will be lost." msgstr "" -#: mergeresultwindow.cpp:936 pdiff.cpp:827 +#: mergeresultwindow.cpp:964 pdiff.cpp:817 #, kde-format msgid "All input files are binary equal." msgstr "" -#: mergeresultwindow.cpp:938 +#: mergeresultwindow.cpp:966 #, kde-format msgid "All input files contain the same text." msgstr "" -#: mergeresultwindow.cpp:942 mergeresultwindow.cpp:946 -#: mergeresultwindow.cpp:950 pdiff.cpp:833 pdiff.cpp:837 pdiff.cpp:841 +#: mergeresultwindow.cpp:970 mergeresultwindow.cpp:974 +#: mergeresultwindow.cpp:978 pdiff.cpp:823 pdiff.cpp:827 pdiff.cpp:831 #, kde-format msgid "Files %1 and %2 are binary equal.\n" msgstr "" -#: mergeresultwindow.cpp:944 mergeresultwindow.cpp:948 -#: mergeresultwindow.cpp:952 +#: mergeresultwindow.cpp:972 mergeresultwindow.cpp:976 +#: mergeresultwindow.cpp:980 #, kde-format msgid "Files %1 and %2 have equal text.\n" msgstr "" -#: mergeresultwindow.cpp:958 +#: mergeresultwindow.cpp:986 #, kde-format msgid "" "Total number of conflicts: %1\n" @@ -1864,39 +1874,39 @@ "%4" msgstr "" -#: mergeresultwindow.cpp:964 +#: mergeresultwindow.cpp:992 #, fuzzy, kde-format msgid "Conflicts" msgstr "conflicte" -#: mergeresultwindow.cpp:1873 +#: mergeresultwindow.cpp:1901 #, kde-format msgid "" msgstr "" -#: mergeresultwindow.cpp:1881 +#: mergeresultwindow.cpp:1909 #, kde-format msgid "" msgstr "" -#: mergeresultwindow.cpp:1883 mergeresultwindow.cpp:2755 +#: mergeresultwindow.cpp:1911 mergeresultwindow.cpp:2783 #, kde-format msgid "" msgstr "" -#: mergeresultwindow.cpp:2967 +#: mergeresultwindow.cpp:2995 #, kde-format msgid "" "Not all conflicts are solved yet.\n" "File not saved." msgstr "" -#: mergeresultwindow.cpp:2969 mergeresultwindow.cpp:2978 +#: mergeresultwindow.cpp:2997 mergeresultwindow.cpp:3006 #, kde-format msgid "Conflicts Left" msgstr "" -#: mergeresultwindow.cpp:2976 +#: mergeresultwindow.cpp:3004 #, kde-format msgid "" "There is a line end style conflict. Please choose the line end style " @@ -1904,7 +1914,7 @@ "File not saved." msgstr "" -#: mergeresultwindow.cpp:2990 +#: mergeresultwindow.cpp:3018 #, kde-format msgid "" "\n" @@ -1912,57 +1922,57 @@ "Creating backup failed. File not saved." msgstr "" -#: mergeresultwindow.cpp:2990 mergeresultwindow.cpp:3038 +#: mergeresultwindow.cpp:3018 mergeresultwindow.cpp:3066 #, kde-format msgid "File Save Error" msgstr "" -#: mergeresultwindow.cpp:3038 +#: mergeresultwindow.cpp:3066 #, kde-format msgid "Error while writing." msgstr "" -#: mergeresultwindow.cpp:3110 +#: mergeresultwindow.cpp:3138 #, fuzzy, kde-format msgid "Output:" msgstr "Rezultat" -#: mergeresultwindow.cpp:3123 mergeresultwindow.cpp:3315 +#: mergeresultwindow.cpp:3151 mergeresultwindow.cpp:3343 #, fuzzy, kde-format msgid "[Modified]" msgstr "Modificat" -#: mergeresultwindow.cpp:3130 +#: mergeresultwindow.cpp:3158 #, kde-format msgid "Encoding for saving:" msgstr "" -#: mergeresultwindow.cpp:3230 +#: mergeresultwindow.cpp:3258 #, fuzzy, kde-format msgid "Conflict" msgstr "conflicte" -#: mergeresultwindow.cpp:3262 +#: mergeresultwindow.cpp:3290 #, kde-format msgid "Codec from A: %1" msgstr "" -#: mergeresultwindow.cpp:3264 +#: mergeresultwindow.cpp:3292 #, kde-format msgid "Codec from B: %1" msgstr "" -#: mergeresultwindow.cpp:3266 +#: mergeresultwindow.cpp:3294 #, kde-format msgid "Codec from C: %1" msgstr "" -#: optiondialog.cpp:119 +#: optiondialog.cpp:121 #, kde-format msgid "Change Font" msgstr "" -#: optiondialog.cpp:135 optiondialog.cpp:145 +#: optiondialog.cpp:137 optiondialog.cpp:147 #, kde-format msgid "" "Font: %1, %2, %3\n" @@ -1970,207 +1980,207 @@ "Example:" msgstr "" -#: optiondialog.cpp:388 +#: optiondialog.cpp:390 #, kde-format msgid "Unicode" msgstr "Unicod" -#: optiondialog.cpp:389 +#: optiondialog.cpp:391 #, kde-format msgid "Latin1" msgstr "Latin1" -#: optiondialog.cpp:408 +#: optiondialog.cpp:410 #, kde-format msgid "Change this if non-ASCII characters are not displayed correctly." msgstr "" -#: optiondialog.cpp:491 +#: optiondialog.cpp:495 #, kde-format msgid "Configure" msgstr "Configurează" -#: optiondialog.cpp:568 +#: optiondialog.cpp:573 #, kde-format msgid "Font" msgstr "Font" -#: optiondialog.cpp:570 +#: optiondialog.cpp:575 #, kde-format msgid "Editor & Diff Output Font" msgstr "" -#: optiondialog.cpp:589 +#: optiondialog.cpp:594 #, kde-format msgid "Application font" msgstr "" -#: optiondialog.cpp:594 +#: optiondialog.cpp:599 #, kde-format msgid "File view font" msgstr "" -#: optiondialog.cpp:613 +#: optiondialog.cpp:618 #, fuzzy, kde-format #| msgid "Color" msgctxt "Title for color settings page" msgid "Color" msgstr "Culoare" -#: optiondialog.cpp:614 +#: optiondialog.cpp:619 #, kde-format msgid "Colors Settings" msgstr "" -#: optiondialog.cpp:631 +#: optiondialog.cpp:644 #, kde-format msgid "Editor and Diff Views:" msgstr "" -#: optiondialog.cpp:639 +#: optiondialog.cpp:652 #, kde-format msgid "Foreground color:" msgstr "Culoare prim-plan:" -#: optiondialog.cpp:647 +#: optiondialog.cpp:660 #, kde-format msgid "Background color:" msgstr "Culoare fundal:" -#: optiondialog.cpp:657 +#: optiondialog.cpp:670 #, kde-format msgid "Diff background color:" msgstr "" -#: optiondialog.cpp:666 +#: optiondialog.cpp:679 #, kde-format msgid "Color A:" msgstr "Culoare A:" -#: optiondialog.cpp:675 +#: optiondialog.cpp:688 #, kde-format msgid "Color B:" msgstr "Culoare B:" -#: optiondialog.cpp:684 +#: optiondialog.cpp:697 #, kde-format msgid "Color C:" msgstr "Culoare C:" -#: optiondialog.cpp:692 +#: optiondialog.cpp:705 #, kde-format msgid "Conflict color:" msgstr "Culoare conflict:" -#: optiondialog.cpp:701 +#: optiondialog.cpp:714 #, kde-format msgid "Current range background color:" msgstr "" -#: optiondialog.cpp:710 +#: optiondialog.cpp:723 #, kde-format msgid "Current range diff background color:" msgstr "" -#: optiondialog.cpp:718 +#: optiondialog.cpp:731 #, kde-format msgid "Color for manually aligned difference ranges:" msgstr "" -#: optiondialog.cpp:725 +#: optiondialog.cpp:738 #, kde-format msgid "Directory Comparison View:" msgstr "" -#: optiondialog.cpp:731 +#: optiondialog.cpp:744 #, kde-format msgid "Newest file color:" msgstr "" -#: optiondialog.cpp:736 +#: optiondialog.cpp:749 #, kde-format msgid "" "Changing this color will only be effective when starting the next directory " "comparison." msgstr "" -#: optiondialog.cpp:741 +#: optiondialog.cpp:754 #, kde-format msgid "Oldest file color:" msgstr "" -#: optiondialog.cpp:750 +#: optiondialog.cpp:763 #, kde-format msgid "Middle age file color:" msgstr "" -#: optiondialog.cpp:759 +#: optiondialog.cpp:772 #, kde-format msgid "Color for missing files:" msgstr "" -#: optiondialog.cpp:773 +#: optiondialog.cpp:786 #, kde-format msgid "Editor" msgstr "Editor" -#: optiondialog.cpp:774 +#: optiondialog.cpp:787 #, kde-format msgid "Editor Behavior" msgstr "Comportament editor" -#: optiondialog.cpp:787 +#: optiondialog.cpp:809 #, kde-format msgid "Tab inserts spaces" msgstr "" -#: optiondialog.cpp:791 +#: optiondialog.cpp:813 #, kde-format msgid "" "On: Pressing tab generates the appropriate number of spaces.\n" "Off: A tab character will be inserted." msgstr "" -#: optiondialog.cpp:796 +#: optiondialog.cpp:818 #, fuzzy, kde-format msgid "Tab size:" msgstr "Mărime &TAB:" -#: optiondialog.cpp:803 +#: optiondialog.cpp:825 #, kde-format msgid "Auto indentation" msgstr "" -#: optiondialog.cpp:807 +#: optiondialog.cpp:829 #, kde-format msgid "On: The indentation of the previous line is used for a new line.\n" msgstr "" -#: optiondialog.cpp:810 +#: optiondialog.cpp:832 #, kde-format msgid "Auto copy selection" msgstr "" -#: optiondialog.cpp:814 +#: optiondialog.cpp:836 #, kde-format msgid "" "On: Any selection is immediately written to the clipboard.\n" "Off: You must explicitly copy e.g. via Ctrl-C." msgstr "" -#: optiondialog.cpp:829 +#: optiondialog.cpp:851 #, kde-format msgid "" "Sets the line endings for when an edited file is saved.\n" "DOS/Windows: CR+LF; UNIX: LF; with CR=0D, LF=0A" msgstr "" -#: optiondialog.cpp:839 +#: optiondialog.cpp:861 #, kde-format msgid "Diff" msgstr "Diff" -#: optiondialog.cpp:840 +#: optiondialog.cpp:862 #, kde-format msgid "Diff Settings" msgstr "" @@ -2184,12 +2194,12 @@ #. ); #. ++line; #. -#: optiondialog.cpp:865 +#: optiondialog.cpp:896 #, kde-format msgid "Ignore numbers (treat as white space)" msgstr "" -#: optiondialog.cpp:869 +#: optiondialog.cpp:900 #, kde-format msgid "" "Ignore number characters during line matching phase. (Similar to Ignore " @@ -2197,66 +2207,66 @@ "Might help to compare files with numeric data." msgstr "" -#: optiondialog.cpp:873 +#: optiondialog.cpp:904 #, kde-format msgid "Ignore C/C++ comments (treat as white space)" msgstr "" -#: optiondialog.cpp:876 +#: optiondialog.cpp:907 #, kde-format msgid "Treat C/C++ comments like white space." msgstr "" -#: optiondialog.cpp:879 +#: optiondialog.cpp:910 #, kde-format msgid "Ignore case (treat as white space)" msgstr "" -#: optiondialog.cpp:883 +#: optiondialog.cpp:914 #, kde-format msgid "Treat case differences like white space changes. ('a'<=>'A')" msgstr "" -#: optiondialog.cpp:886 +#: optiondialog.cpp:917 #, kde-format msgid "Preprocessor command:" msgstr "" -#: optiondialog.cpp:891 +#: optiondialog.cpp:922 #, kde-format msgid "User defined pre-processing. (See the docs for details.)" msgstr "" -#: optiondialog.cpp:894 +#: optiondialog.cpp:925 #, kde-format msgid "Line-matching preprocessor command:" msgstr "" -#: optiondialog.cpp:899 +#: optiondialog.cpp:930 #, kde-format msgid "" "This pre-processor is only used during line matching.\n" "(See the docs for details.)" msgstr "" -#: optiondialog.cpp:902 +#: optiondialog.cpp:933 #, kde-format msgid "Try hard (slower)" msgstr "" -#: optiondialog.cpp:906 +#: optiondialog.cpp:937 #, kde-format msgid "" "Enables the --minimal option for the external diff.\n" "The analysis of big files will be much slower." msgstr "" -#: optiondialog.cpp:910 +#: optiondialog.cpp:941 #, kde-format msgid "Align B and C for 3 input files" msgstr "" -#: optiondialog.cpp:914 +#: optiondialog.cpp:945 #, kde-format msgid "" "Try to align B and C when comparing or merging three input files.\n" @@ -2264,66 +2274,73 @@ "(Default is off.)" msgstr "" -#: optiondialog.cpp:926 +#: optiondialog.cpp:956 +#, fuzzy, kde-format +#| msgid "Merge" +msgctxt "Settings page" +msgid "Merge" +msgstr "Îmbină" + +#: optiondialog.cpp:957 #, kde-format msgid "Merge Settings" msgstr "" -#: optiondialog.cpp:940 +#: optiondialog.cpp:980 #, kde-format msgid "Auto advance delay (ms):" msgstr "" -#: optiondialog.cpp:946 +#: optiondialog.cpp:986 #, kde-format 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 "" -#: optiondialog.cpp:950 +#: optiondialog.cpp:990 #, kde-format msgid "Show info dialogs" msgstr "" -#: optiondialog.cpp:953 +#: optiondialog.cpp:993 #, kde-format msgid "Show a dialog with information about the number of conflicts." msgstr "" -#: optiondialog.cpp:956 +#: optiondialog.cpp:996 #, kde-format msgid "White space 2-file merge default:" msgstr "" -#: optiondialog.cpp:961 optiondialog.cpp:974 +#: optiondialog.cpp:1001 optiondialog.cpp:1014 #, kde-format msgid "Manual Choice" msgstr "Alegere manuală" -#: optiondialog.cpp:965 optiondialog.cpp:979 +#: optiondialog.cpp:1005 optiondialog.cpp:1019 #, kde-format msgid "" "Allow the merge algorithm to automatically select an input for white-space-" "only changes." msgstr "" -#: optiondialog.cpp:969 +#: optiondialog.cpp:1009 #, kde-format msgid "White space 3-file merge default:" msgstr "" -#: optiondialog.cpp:983 +#: optiondialog.cpp:1023 #, kde-format msgid "Automatic Merge Regular Expression" msgstr "" -#: optiondialog.cpp:991 smalldialogs.cpp:449 +#: optiondialog.cpp:1031 smalldialogs.cpp:459 #, kde-format msgid "Auto merge regular expression:" msgstr "" -#: optiondialog.cpp:996 +#: optiondialog.cpp:1036 #, kde-format msgid "" "Regular expression for lines where KDiff3 should automatically choose one " @@ -2332,29 +2349,29 @@ "- if available - C, otherwise B will be chosen." msgstr "" -#: optiondialog.cpp:1002 +#: optiondialog.cpp:1042 #, kde-format msgid "Run regular expression auto merge on merge start" msgstr "" -#: optiondialog.cpp:1005 +#: optiondialog.cpp:1045 #, kde-format msgid "" "Run the merge for auto merge regular expressions\n" "immediately when a merge starts.\n" msgstr "" -#: optiondialog.cpp:1010 +#: optiondialog.cpp:1050 #, kde-format msgid "Version Control History Merging" msgstr "" -#: optiondialog.cpp:1018 smalldialogs.cpp:476 +#: optiondialog.cpp:1058 smalldialogs.cpp:486 #, kde-format msgid "History start regular expression:" msgstr "" -#: optiondialog.cpp:1023 +#: optiondialog.cpp:1063 #, kde-format msgid "" "Regular expression for the start of the version control history entry.\n" @@ -2362,12 +2379,12 @@ "Default value: \".*\\$Log.*\\$.*\"" msgstr "" -#: optiondialog.cpp:1029 smalldialogs.cpp:504 +#: optiondialog.cpp:1069 smalldialogs.cpp:514 #, kde-format msgid "History entry start regular expression:" msgstr "" -#: optiondialog.cpp:1042 +#: optiondialog.cpp:1082 #, kde-format msgid "" "A version control history entry consists of several lines.\n" @@ -2379,22 +2396,22 @@ "See the documentation for details." msgstr "" -#: optiondialog.cpp:1050 +#: optiondialog.cpp:1090 #, kde-format msgid "History merge sorting" msgstr "" -#: optiondialog.cpp:1053 +#: optiondialog.cpp:1093 #, kde-format msgid "Sort version control history by a key." msgstr "" -#: optiondialog.cpp:1063 +#: optiondialog.cpp:1103 #, kde-format msgid "History entry start sort key order:" msgstr "" -#: optiondialog.cpp:1068 +#: optiondialog.cpp:1108 #, kde-format msgid "" "Each pair of parentheses used in the regular expression for the history " @@ -2406,37 +2423,37 @@ "See the documentation for details." msgstr "" -#: optiondialog.cpp:1079 +#: optiondialog.cpp:1119 #, kde-format msgid "Merge version control history on merge start" msgstr "" -#: optiondialog.cpp:1082 +#: optiondialog.cpp:1122 #, kde-format msgid "Run version control history automerge on merge start." msgstr "" -#: optiondialog.cpp:1086 +#: optiondialog.cpp:1126 #, kde-format msgid "Max number of history entries:" msgstr "" -#: optiondialog.cpp:1090 +#: optiondialog.cpp:1130 #, kde-format msgid "Cut off after specified number. Use -1 for infinite number of entries." msgstr "" -#: optiondialog.cpp:1094 +#: optiondialog.cpp:1134 #, kde-format msgid "Test your regular expressions" msgstr "" -#: optiondialog.cpp:1099 +#: optiondialog.cpp:1139 #, kde-format msgid "Irrelevant merge command:" msgstr "" -#: optiondialog.cpp:1104 +#: optiondialog.cpp:1144 #, kde-format msgid "" "If specified this script is run after automerge\n" @@ -2444,12 +2461,12 @@ "Called with the parameters: filename1 filename2 filename3" msgstr "" -#: optiondialog.cpp:1109 +#: optiondialog.cpp:1149 #, kde-format msgid "Auto save and quit on merge without conflicts" msgstr "" -#: optiondialog.cpp:1113 +#: optiondialog.cpp:1153 #, kde-format msgid "" "If KDiff3 was started for a file-merge from the command line and all\n" @@ -2458,27 +2475,27 @@ "(Similar to command line option \"--auto\".)" msgstr "" -#: optiondialog.cpp:1124 optiondialog.cpp:1125 +#: optiondialog.cpp:1164 optiondialog.cpp:1165 #, fuzzy, kde-format msgid "Directory" msgstr "Director" -#: optiondialog.cpp:1137 +#: optiondialog.cpp:1185 #, kde-format msgid "Recursive directories" msgstr "" -#: optiondialog.cpp:1140 +#: optiondialog.cpp:1188 #, kde-format msgid "Whether to analyze subdirectories or not." msgstr "" -#: optiondialog.cpp:1142 +#: optiondialog.cpp:1190 #, kde-format msgid "File pattern(s):" msgstr "" -#: optiondialog.cpp:1148 +#: optiondialog.cpp:1196 #, kde-format msgid "" "Pattern(s) of files to be analyzed. \n" @@ -2486,12 +2503,12 @@ "Several Patterns can be specified by using the separator: ';'" msgstr "" -#: optiondialog.cpp:1153 +#: optiondialog.cpp:1201 #, kde-format msgid "File-anti-pattern(s):" msgstr "" -#: optiondialog.cpp:1159 +#: optiondialog.cpp:1207 #, kde-format msgid "" "Pattern(s) of files to be excluded from analysis. \n" @@ -2499,12 +2516,12 @@ "Several Patterns can be specified by using the separator: ';'" msgstr "" -#: optiondialog.cpp:1164 +#: optiondialog.cpp:1212 #, kde-format msgid "Dir-anti-pattern(s):" msgstr "" -#: optiondialog.cpp:1170 +#: optiondialog.cpp:1218 #, kde-format msgid "" "Pattern(s) of directories to be excluded from analysis. \n" @@ -2512,58 +2529,58 @@ "Several Patterns can be specified by using the separator: ';'" msgstr "" -#: optiondialog.cpp:1175 +#: optiondialog.cpp:1223 #, kde-format msgid "Use .cvsignore" msgstr "" -#: optiondialog.cpp:1179 +#: optiondialog.cpp:1227 #, kde-format msgid "" "Extends the antipattern to anything that would be ignored by CVS.\n" "Via local \".cvsignore\" files this can be directory specific." msgstr "" -#: optiondialog.cpp:1183 +#: optiondialog.cpp:1231 #, kde-format msgid "Find hidden files and directories" msgstr "" -#: optiondialog.cpp:1186 +#: optiondialog.cpp:1234 #, kde-format msgid "Finds hidden files and directories." msgstr "" -#: optiondialog.cpp:1189 +#: optiondialog.cpp:1237 #, kde-format msgid "Follow file links" msgstr "" -#: optiondialog.cpp:1193 +#: optiondialog.cpp:1241 #, kde-format msgid "" "On: Compare the file the link points to.\n" "Off: Compare the links." msgstr "" -#: optiondialog.cpp:1197 +#: optiondialog.cpp:1245 #, kde-format msgid "Follow directory links" msgstr "" -#: optiondialog.cpp:1201 +#: optiondialog.cpp:1249 #, kde-format msgid "" "On: Compare the directory the link points to.\n" "Off: Compare the links." msgstr "" -#: optiondialog.cpp:1210 +#: optiondialog.cpp:1258 #, kde-format msgid "Case sensitive filename comparison" msgstr "" -#: optiondialog.cpp:1214 +#: optiondialog.cpp:1262 #, kde-format msgid "" "The directory comparison will compare files or directories when their names " @@ -2572,63 +2589,63 @@ "off, otherwise on.)" msgstr "" -#: optiondialog.cpp:1218 +#: optiondialog.cpp:1266 #, kde-format msgid "Unfold all subdirectories on load" msgstr "" -#: optiondialog.cpp:1222 +#: optiondialog.cpp:1270 #, kde-format msgid "" "On: Unfold all subdirectories when starting a directory diff.\n" "Off: Leave subdirectories folded." msgstr "" -#: optiondialog.cpp:1226 +#: optiondialog.cpp:1274 #, kde-format msgid "Skip directory status report" msgstr "" -#: optiondialog.cpp:1230 +#: optiondialog.cpp:1278 #, kde-format msgid "" "On: Do not show the Directory Comparison Status.\n" "Off: Show the status dialog on start." msgstr "" -#: optiondialog.cpp:1234 +#: optiondialog.cpp:1282 #, kde-format msgid "File Comparison Mode" msgstr "" -#: optiondialog.cpp:1239 +#: optiondialog.cpp:1287 #, kde-format msgid "Binary comparison" msgstr "" -#: optiondialog.cpp:1241 +#: optiondialog.cpp:1289 #, kde-format msgid "Binary comparison of each file. (Default)" msgstr "" -#: optiondialog.cpp:1244 +#: optiondialog.cpp:1292 #, kde-format msgid "Full analysis" msgstr "" -#: optiondialog.cpp:1246 +#: optiondialog.cpp:1294 #, kde-format msgid "" "Do a full analysis and show statistics information in extra columns.\n" "(Slower than a binary comparison, much slower for binary files.)" msgstr "" -#: optiondialog.cpp:1250 +#: optiondialog.cpp:1298 #, kde-format msgid "Trust the size and modification date (unsafe)" msgstr "" -#: optiondialog.cpp:1252 +#: optiondialog.cpp:1300 #, kde-format msgid "" "Assume that files are equal if the modification date and file length are " @@ -2638,14 +2655,14 @@ "Useful for big directories or slow networks." msgstr "" -#: optiondialog.cpp:1257 +#: optiondialog.cpp:1305 #, kde-format msgid "" "Trust the size and date, but use binary comparison if date does not match " "(unsafe)" msgstr "" -#: optiondialog.cpp:1259 +#: optiondialog.cpp:1307 #, kde-format msgid "" "Assume that files are equal if the modification date and file length are " @@ -2654,12 +2671,12 @@ "Useful for big directories or slow networks." msgstr "" -#: optiondialog.cpp:1264 +#: optiondialog.cpp:1312 #, kde-format msgid "Trust the size (unsafe)" msgstr "" -#: optiondialog.cpp:1266 +#: optiondialog.cpp:1314 #, kde-format msgid "" "Assume that files are equal if their file lengths are equal.\n" @@ -2667,12 +2684,12 @@ "download." msgstr "" -#: optiondialog.cpp:1273 +#: optiondialog.cpp:1321 #, kde-format msgid "Synchronize directories" msgstr "Sincronizează dosare" -#: optiondialog.cpp:1277 +#: optiondialog.cpp:1325 #, kde-format msgid "" "Offers to store files in both directories so that\n" @@ -2680,24 +2697,24 @@ "Works only when comparing two directories without specifying a destination." msgstr "" -#: optiondialog.cpp:1283 +#: optiondialog.cpp:1331 #, kde-format msgid "White space differences considered equal" msgstr "" -#: optiondialog.cpp:1287 +#: optiondialog.cpp:1335 #, kde-format msgid "" "If files differ only by white space consider them equal.\n" "This is only active when full analysis is chosen." msgstr "" -#: optiondialog.cpp:1293 +#: optiondialog.cpp:1341 #, kde-format msgid "Copy newer instead of merging (unsafe)" msgstr "" -#: optiondialog.cpp:1297 +#: optiondialog.cpp:1345 #, kde-format msgid "" "Do not look inside, just take the newer file.\n" @@ -2705,46 +2722,46 @@ "Only effective when comparing two directories." msgstr "" -#: optiondialog.cpp:1302 +#: optiondialog.cpp:1350 #, kde-format msgid "Backup files (.orig)" msgstr "" -#: optiondialog.cpp:1306 +#: optiondialog.cpp:1354 #, kde-format msgid "" "If 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 "" -#: optiondialog.cpp:1382 optiondialog.cpp:1383 +#: optiondialog.cpp:1430 optiondialog.cpp:1431 #, kde-format msgid "Regional Settings" msgstr "Configurări regionale" -#: optiondialog.cpp:1397 +#: optiondialog.cpp:1454 #, kde-format msgid "Use the same encoding for everything:" msgstr "" -#: optiondialog.cpp:1401 +#: optiondialog.cpp:1458 #, kde-format msgid "" "Enable this allows to change all encodings by changing the first only.\n" "Disable this if different individual settings are needed." msgstr "" -#: optiondialog.cpp:1405 +#: optiondialog.cpp:1462 #, kde-format msgid "Note: Local Encoding is \"%1\"" msgstr "" -#: optiondialog.cpp:1409 +#: optiondialog.cpp:1466 #, kde-format msgid "File Encoding for A:" msgstr "" -#: optiondialog.cpp:1416 +#: optiondialog.cpp:1473 #, kde-format msgid "" "If enabled then Unicode (UTF-16 or UTF-8) encoding will be detected.\n" @@ -2753,32 +2770,32 @@ "(Unicode detection depends on the first bytes of a file.)" msgstr "" -#: optiondialog.cpp:1419 optiondialog.cpp:1430 optiondialog.cpp:1441 +#: optiondialog.cpp:1476 optiondialog.cpp:1487 optiondialog.cpp:1498 #, kde-format msgid "Auto Detect Unicode" msgstr "" -#: optiondialog.cpp:1425 +#: optiondialog.cpp:1482 #, kde-format msgid "File Encoding for B:" msgstr "" -#: optiondialog.cpp:1436 +#: optiondialog.cpp:1493 #, kde-format msgid "File Encoding for C:" msgstr "" -#: optiondialog.cpp:1447 +#: optiondialog.cpp:1504 #, kde-format msgid "File Encoding for Merge Output and Saving:" msgstr "" -#: optiondialog.cpp:1452 +#: optiondialog.cpp:1509 #, kde-format msgid "Auto Select" msgstr "Selectare automată" -#: optiondialog.cpp:1456 +#: optiondialog.cpp:1513 #, kde-format msgid "" "If enabled then the encoding from the input files is used.\n" @@ -2786,39 +2803,39 @@ "saving." msgstr "" -#: optiondialog.cpp:1459 +#: optiondialog.cpp:1516 #, kde-format msgid "File Encoding for Preprocessor Files:" msgstr "" -#: optiondialog.cpp:1471 +#: optiondialog.cpp:1528 #, kde-format msgid "Right To Left Language" msgstr "" -#: optiondialog.cpp:1475 +#: optiondialog.cpp:1532 #, kde-format msgid "" "Some languages are read from right to left.\n" "This setting will change the viewer and editor accordingly." msgstr "" -#: optiondialog.cpp:1485 +#: optiondialog.cpp:1542 #, kde-format msgid "Integration" msgstr "" -#: optiondialog.cpp:1486 +#: optiondialog.cpp:1543 #, kde-format msgid "Integration Settings" msgstr "" -#: optiondialog.cpp:1499 +#: optiondialog.cpp:1564 #, kde-format msgid "Command line options to ignore:" msgstr "" -#: optiondialog.cpp:1505 +#: optiondialog.cpp:1570 #, kde-format msgid "" "List of command line options that should be ignored when KDiff3 is used by " @@ -2827,19 +2844,19 @@ "This will suppress the \"Unknown option\" error." msgstr "" -#: optiondialog.cpp:1510 +#: optiondialog.cpp:1575 #, kde-format msgid "Quit also via Escape key" msgstr "" -#: optiondialog.cpp:1514 +#: optiondialog.cpp:1579 #, kde-format msgid "" "Fast method to exit.\n" "For those who are used to using the Escape key." msgstr "" -#: optiondialog.cpp:1598 +#: optiondialog.cpp:1653 #, kde-format msgid "This resets all options. Not only those of the current topic." msgstr "" @@ -2891,77 +2908,68 @@ msgid "Disable Unsafe Options" msgstr "" -#: pdiff.cpp:158 +#: pdiff.cpp:160 #, kde-format msgid "Loading A" msgstr "" -#: pdiff.cpp:167 -#, kde-format -msgid "Errors occurred during pre-processing of file A." -msgstr "" +#: pdiff.cpp:162 +#, fuzzy, kde-format +#| msgid "Reading file: %1" +msgid "Loading A: %1" +msgstr "Se citește fișierul: %1" -#: pdiff.cpp:172 +#: pdiff.cpp:170 #, kde-format msgid "Loading B" msgstr "" -#: pdiff.cpp:179 -#, kde-format -msgid "Errors occurred during pre-processing of file B." -msgstr "" - -#: pdiff.cpp:202 pdiff.cpp:241 +#: pdiff.cpp:201 pdiff.cpp:237 #, kde-format msgid "Diff: A <-> B" msgstr "" -#: pdiff.cpp:208 pdiff.cpp:279 pdiff.cpp:293 +#: pdiff.cpp:207 pdiff.cpp:275 pdiff.cpp:289 #, kde-format msgid "Linediff: A <-> B" msgstr "" -#: pdiff.cpp:225 +#: pdiff.cpp:224 #, kde-format msgid "Loading C" msgstr "" -#: pdiff.cpp:232 -#, kde-format -msgid "Errors occurred during pre-processing of file C." -msgstr "" - -#: pdiff.cpp:250 +#: pdiff.cpp:246 #, kde-format msgid "Diff: A <-> C" msgstr "" -#: pdiff.cpp:261 +#: pdiff.cpp:257 #, kde-format msgid "Diff: B <-> C" msgstr "" -#: pdiff.cpp:283 pdiff.cpp:297 +#: pdiff.cpp:279 pdiff.cpp:293 #, kde-format msgid "Linediff: B <-> C" msgstr "" -#: pdiff.cpp:287 pdiff.cpp:301 +#: pdiff.cpp:283 pdiff.cpp:297 #, kde-format msgid "Linediff: A <-> C" msgstr "" -#: pdiff.cpp:829 +#: pdiff.cpp:819 #, kde-format msgid "All input files contain the same text, but are not binary equal." msgstr "" -#: pdiff.cpp:835 pdiff.cpp:839 pdiff.cpp:843 +#: pdiff.cpp:825 pdiff.cpp:829 pdiff.cpp:833 #, kde-format msgid "Files %1 and %2 have equal text, but are not binary equal. \n" msgstr "" -#: pdiff.cpp:853 +#: pdiff.cpp:843 #, kde-format msgid "" "Some input files do not seem to be pure text files.\n" @@ -2969,17 +2977,17 @@ "Continue at your own risk." msgstr "" -#: pdiff.cpp:863 +#: pdiff.cpp:853 #, kde-format msgid ", B" msgstr "" -#: pdiff.cpp:865 +#: pdiff.cpp:855 #, kde-format msgid ", C" msgstr "" -#: pdiff.cpp:867 +#: pdiff.cpp:857 #, kde-format msgid "" "Some input characters could not be converted to valid unicode.\n" @@ -2988,77 +2996,72 @@ "Affected input files are in %1." msgstr "" -#: pdiff.cpp:1034 +#: pdiff.cpp:1032 #, kde-format msgid "Abort" msgstr "Abandonează" -#: pdiff.cpp:1040 pdiff.cpp:1130 +#: pdiff.cpp:1038 pdiff.cpp:1129 #, kde-format msgid "Opening files..." msgstr "" -#: pdiff.cpp:1107 -#, fuzzy, kde-format -msgid "File open error" -msgstr "Eroare la deschiderea fișierului" - -#: pdiff.cpp:1202 +#: pdiff.cpp:1212 #, kde-format msgid "Cutting selection..." msgstr "Tai selecția..." -#: pdiff.cpp:1223 +#: pdiff.cpp:1233 #, kde-format msgid "Copying selection to clipboard..." msgstr "Copiez selecția în clipboard..." -#: pdiff.cpp:1239 +#: pdiff.cpp:1249 #, kde-format msgid "Inserting clipboard contents..." msgstr "Inserez conținutul clipboard-ului..." -#: pdiff.cpp:1695 +#: pdiff.cpp:1705 #, kde-format msgid "Word wrap (Cancel disables word wrap)" msgstr "" -#: pdiff.cpp:1696 +#: pdiff.cpp:1706 #, kde-format msgid "Calculating max width for horizontal scrollbar" msgstr "" -#: pdiff.cpp:1911 +#: pdiff.cpp:1921 #, kde-format msgid "Save && Continue" msgstr "" -#: pdiff.cpp:1912 +#: pdiff.cpp:1922 #, kde-format msgid "Continue Without Saving" msgstr "" -#: pdiff.cpp:2124 +#: pdiff.cpp:2134 #, kde-format msgid "Search complete." msgstr "" -#: pdiff.cpp:2124 +#: pdiff.cpp:2134 #, kde-format msgid "Search Complete" msgstr "" -#: pdiff.cpp:2375 +#: pdiff.cpp:2385 #, kde-format msgid "Nothing is selected in either diff input window." msgstr "" -#: pdiff.cpp:2375 +#: pdiff.cpp:2385 #, kde-format msgid "Error while adding manual diff range" msgstr "" -#: progress.cpp:59 progress.cpp:71 +#: progress.cpp:61 progress.cpp:73 #, kde-format msgid "&Cancel" msgstr "&Renunță" @@ -3068,188 +3071,188 @@ msgid "A (Base):" msgstr "" -#: smalldialogs.cpp:68 smalldialogs.cpp:85 smalldialogs.cpp:102 -#: smalldialogs.cpp:144 +#: smalldialogs.cpp:71 smalldialogs.cpp:90 smalldialogs.cpp:109 +#: smalldialogs.cpp:154 #, kde-format msgid "File..." msgstr "Fișier..." -#: smalldialogs.cpp:70 smalldialogs.cpp:87 smalldialogs.cpp:104 -#: smalldialogs.cpp:146 +#: smalldialogs.cpp:73 smalldialogs.cpp:92 smalldialogs.cpp:111 +#: smalldialogs.cpp:156 #, kde-format msgid "Dir..." msgstr "" -#: smalldialogs.cpp:96 +#: smalldialogs.cpp:103 #, kde-format msgid "C (Optional):" msgstr "" -#: smalldialogs.cpp:119 +#: smalldialogs.cpp:126 #, kde-format msgid "Swap/Copy Names..." msgstr "" -#: smalldialogs.cpp:124 smalldialogs.cpp:125 smalldialogs.cpp:126 +#: smalldialogs.cpp:131 smalldialogs.cpp:132 smalldialogs.cpp:133 #, fuzzy, kde-format msgid "Swap %1<->%2" msgstr " Swap: %1 / %2 " -#: smalldialogs.cpp:127 smalldialogs.cpp:128 smalldialogs.cpp:129 +#: smalldialogs.cpp:134 smalldialogs.cpp:135 smalldialogs.cpp:136 #, kde-format msgid "Copy %1->Output" msgstr "" -#: smalldialogs.cpp:130 smalldialogs.cpp:131 smalldialogs.cpp:132 +#: smalldialogs.cpp:137 smalldialogs.cpp:138 smalldialogs.cpp:139 #, kde-format msgid "Swap %1<->Output" msgstr "" -#: smalldialogs.cpp:138 +#: smalldialogs.cpp:148 #, kde-format msgid "Output (optional):" msgstr "" -#: smalldialogs.cpp:168 +#: smalldialogs.cpp:178 #, kde-format msgid "Configure..." msgstr "Configurare..." -#: smalldialogs.cpp:233 +#: smalldialogs.cpp:243 #, fuzzy, kde-format msgid "Open Directory" msgstr "Director" -#: smalldialogs.cpp:234 +#: smalldialogs.cpp:244 #, kde-format msgid "Select Output File" msgstr "" -#: smalldialogs.cpp:393 +#: smalldialogs.cpp:403 #, kde-format msgid "Search text:" msgstr "Căutare text:" -#: smalldialogs.cpp:400 +#: smalldialogs.cpp:410 #, kde-format msgid "Case sensitive" msgstr "Sensibil la registru" -#: smalldialogs.cpp:403 +#: smalldialogs.cpp:413 #, kde-format msgid "Search A" msgstr "Caută A" -#: smalldialogs.cpp:408 +#: smalldialogs.cpp:418 #, kde-format msgid "Search B" msgstr "Caută B" -#: smalldialogs.cpp:413 +#: smalldialogs.cpp:423 #, kde-format msgid "Search C" msgstr "Caută C" -#: smalldialogs.cpp:418 +#: smalldialogs.cpp:428 #, kde-format msgid "Search output" msgstr "Caută în ieșire" -#: smalldialogs.cpp:425 +#: smalldialogs.cpp:435 #, kde-format msgid "&Search" msgstr "&Caută" -#: smalldialogs.cpp:444 +#: smalldialogs.cpp:454 #, kde-format msgid "Regular Expression Tester" msgstr "" -#: smalldialogs.cpp:457 +#: smalldialogs.cpp:467 #, kde-format msgid "Example auto merge line:" msgstr "" -#: smalldialogs.cpp:459 +#: smalldialogs.cpp:469 #, kde-format msgid "To test auto merge, copy a line as used in your files." msgstr "" -#: smalldialogs.cpp:465 smalldialogs.cpp:493 smalldialogs.cpp:529 +#: smalldialogs.cpp:475 smalldialogs.cpp:503 smalldialogs.cpp:539 #, kde-format msgid "Match result:" msgstr "" -#: smalldialogs.cpp:484 +#: smalldialogs.cpp:494 #, kde-format msgid "Example history start line (with leading comment):" msgstr "" -#: smalldialogs.cpp:486 +#: smalldialogs.cpp:496 #, kde-format msgid "" "Copy a history start line as used in your files,\n" "including the leading comment." msgstr "" -#: smalldialogs.cpp:512 +#: smalldialogs.cpp:522 #, kde-format msgid "History sort key order:" msgstr "" -#: smalldialogs.cpp:520 +#: smalldialogs.cpp:530 #, kde-format msgid "Example history entry start line (without leading comment):" msgstr "" -#: smalldialogs.cpp:522 +#: smalldialogs.cpp:532 #, kde-format msgid "" "Copy a history entry start line as used in your files,\n" "but omit the leading comment." msgstr "" -#: smalldialogs.cpp:536 +#: smalldialogs.cpp:546 #, kde-format msgid "Sort key result:" msgstr "" -#: smalldialogs.cpp:584 smalldialogs.cpp:594 smalldialogs.cpp:614 +#: smalldialogs.cpp:594 smalldialogs.cpp:604 smalldialogs.cpp:624 #, kde-format msgid "Match success." msgstr "" -#: smalldialogs.cpp:588 smalldialogs.cpp:598 smalldialogs.cpp:620 +#: smalldialogs.cpp:598 smalldialogs.cpp:608 smalldialogs.cpp:630 #, kde-format msgid "Match failed." msgstr "" -#: smalldialogs.cpp:605 +#: smalldialogs.cpp:615 #, kde-format msgid "Opening and closing parentheses do not match in regular expression." msgstr "" -#: SourceData.cpp:150 +#: SourceData.cpp:153 #, kde-format msgid "Writing clipboard data to temp file failed." msgstr "Scrierea datelor din clipboard în fișierul temporar a eșuat." -#: SourceData.cpp:154 +#: SourceData.cpp:157 #, kde-format msgid "From Clipboard" msgstr "Din clipboard" -#: SourceData.cpp:335 +#: SourceData.cpp:348 #, kde-format msgid "%1 is not a normal file." msgstr "" -#: SourceData.cpp:427 +#: SourceData.cpp:440 #, kde-format msgid " Temp file is: %1" msgstr "" -#: SourceData.cpp:432 +#: SourceData.cpp:445 #, kde-format msgid "" "Preprocessing possibly failed. Check this command:\n" @@ -3264,12 +3267,12 @@ "\n" "Comanda de preprocesare va fi dezactivată acum." -#: SourceData.cpp:443 SourceData.cpp:512 +#: SourceData.cpp:456 SourceData.cpp:525 #, kde-format msgid "File %1 too large to process. Skipping." msgstr "" -#: SourceData.cpp:487 +#: SourceData.cpp:500 #, kde-format msgid "" "The line-matching-preprocessing possibly failed. Check this command:\n" diff -Nru kdiff3-1.8.01/po/ru/diff_ext.po kdiff3-1.8.3/po/ru/diff_ext.po --- kdiff3-1.8.01/po/ru/diff_ext.po 1970-01-01 00:00:00.000000000 +0000 +++ kdiff3-1.8.3/po/ru/diff_ext.po 2020-06-25 00:18:46.000000000 +0000 @@ -0,0 +1,129 @@ +# Copyright (C) YEAR This file is copyright: +# This file is distributed under the same license as the kdiff3 package. +# +# Alexander Yavorsky , 2020. +msgid "" +msgstr "" +"Project-Id-Version: kdiff3\n" +"Report-Msgid-Bugs-To: https://bugs.kde.org\n" +"POT-Creation-Date: 2019-11-04 07:54+0100\n" +"PO-Revision-Date: 2020-04-29 11:18+0300\n" +"Last-Translator: Alexander Yavorsky \n" +"Language-Team: Russian \n" +"Language: ru\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=4; plural=n==1 ? 3 : n%10==1 && n%100!=11 ? 0 : n" +"%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" +"X-Generator: Lokalize 20.04.0\n" + +#: diff_ext.cpp:223 +#, kde-format +msgid "Compare with %1" +msgstr "Сравнить с %1" + +#: diff_ext.cpp:224 +#, kde-format +msgid "Merge with %1" +msgstr "Объединить с %1" + +#: diff_ext.cpp:234 +#, kde-format +msgid "3-way merge with base" +msgstr "Трёхстороннее объединение с основным файлом" + +#: diff_ext.cpp:237 +#, kde-format +msgid "Save '%1' for later" +msgstr "Отложить на потом «%1»" + +#: diff_ext.cpp:251 +#, kde-format +msgid "Compare with ..." +msgstr "Сравнить с..." + +#: diff_ext.cpp:254 +#, kde-format +msgid "Clear list" +msgstr "Очистить список" + +#: diff_ext.cpp:259 +#, kde-format +msgid "Compare" +msgstr "" + +#: diff_ext.cpp:263 +#, kde-format +msgid "3 way comparison" +msgstr "Трёхстороннее сравнение" + +#: diff_ext.cpp:269 +#, kde-format +msgid "About Diff-Ext ..." +msgstr "" + +#: diff_ext.cpp:340 +#, kde-format +msgid "(32 Bit)" +msgstr "" + +#: diff_ext.cpp:342 +#, kde-format +msgid "Diff-Ext Copyright (c) 2003-2006, Sergey Zorin. All rights reserved.\n" +msgstr "" + +#: diff_ext.cpp:343 +#, kde-format +msgid "This software is distributable under the BSD-2-Clause license.\n" +msgstr "" + +#: diff_ext.cpp:344 +#, kde-format +msgid "Some extensions for KDiff3 (c) 2006-2013 by Joachim Eibl.\n" +msgstr "" + +#: diff_ext.cpp:345 +#, kde-format +msgid "Homepage for Diff-Ext: http://diff-ext.sourceforge.net\n" +msgstr "" + +#: diff_ext.cpp:346 +#, kde-format +msgid "About Diff-Ext for KDiff3 " +msgstr "" + +#: diff_ext.cpp:375 +#, kde-format +msgid "Compare selected files" +msgstr "" + +#: diff_ext.cpp:381 diff_ext.cpp:399 +#, kde-format +msgid "Compare '%1' with '%2'" +msgstr "" + +#: diff_ext.cpp:386 +#, kde-format +msgid "Save '%1' for later operation" +msgstr "" + +#: diff_ext.cpp:440 +#, kde-format +msgid "Could not start KDiff3. Please rerun KDiff3 installation." +msgstr "" + +#: diff_ext.cpp:441 +#, kde-format +msgid "Command" +msgstr "" + +#: diff_ext.cpp:442 +#, kde-format +msgid "CommandLine" +msgstr "" + +#: diff_ext.cpp:443 +#, kde-format +msgid "Diff-Ext For KDiff3" +msgstr "" \ No newline at end of file diff -Nru kdiff3-1.8.01/po/ru/kdiff3fileitemactionplugin.po kdiff3-1.8.3/po/ru/kdiff3fileitemactionplugin.po --- kdiff3-1.8.01/po/ru/kdiff3fileitemactionplugin.po 2019-05-18 01:02:21.000000000 +0000 +++ kdiff3-1.8.3/po/ru/kdiff3fileitemactionplugin.po 2020-06-25 00:18:46.000000000 +0000 @@ -2,20 +2,20 @@ # This file is distributed under the same license as the PACKAGE package. # # Yuri Efremov , 2011. -# Alexander Potashev , 2011. +# Alexander Potashev , 2011, 2019. msgid "" msgstr "" "Project-Id-Version: \n" -"Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2019-03-22 03:09+0100\n" -"PO-Revision-Date: 2011-05-08 10:53+0400\n" +"Report-Msgid-Bugs-To: https://bugs.kde.org\n" +"POT-Creation-Date: 2019-08-30 07:40+0200\n" +"PO-Revision-Date: 2019-10-05 01:33+0300\n" "Last-Translator: Alexander Potashev \n" "Language-Team: Russian \n" "Language: ru\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: Lokalize 1.2\n" +"X-Generator: Lokalize 19.07.70\n" "Plural-Forms: nplurals=4; plural=n==1 ? 3 : n%10==1 && n%100!=11 ? 0 : n" "%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" "X-Environment: kde\n" @@ -23,10 +23,9 @@ "X-Text-Markup: kde4\n" #: kdiff3fileitemaction.cpp:92 -#, fuzzy, kde-format -#| msgid "KDiff3 ..." +#, kde-format msgid "KDiff3..." -msgstr "KDiff3" +msgstr "KDiff3..." #: kdiff3fileitemaction.cpp:124 #, kde-format @@ -46,11 +45,10 @@ #: kdiff3fileitemaction.cpp:142 #, kde-format msgid "3-way merge with base" -msgstr "Трёхстороннее объединение c основным файлом" +msgstr "Трёхстороннее объединение с основным файлом" #: kdiff3fileitemaction.cpp:149 -#, fuzzy, kde-format -#| msgid "Compare with ..." +#, kde-format msgid "Compare with..." msgstr "Сравнить с..." @@ -70,35 +68,17 @@ msgstr "Трёхстороннее сравнение" #: kdiff3fileitemaction.cpp:179 -#, fuzzy, kde-format -#| msgid "About KDiff3 menu plugin ..." +#, kde-format msgid "About KDiff3 menu plugin..." msgstr "О модуле меню KDiff3..." #: kdiff3fileitemaction.cpp:287 -#, fuzzy, kde-format -#| msgid "" -#| "KDiff3 File Item Action Plugin: Copyright (C) 2011 Joachim Eibl\n" -#| "KDiff3 homepage: http://kdiff3.sourceforge.net\n" -#| "\n" +#, kde-format msgid "KDiff3 File Item Action Plugin: Copyright (C) 2011 Joachim Eibl\n" -msgstr "" -"Модуль меню действий с файлами KDiff3: © Joachim Eibl, 2011\n" -"Домашняя страница KDiff3: http://kdiff3.sourceforge.net\n" -"\n" +msgstr "Модуль меню действий с файлами KDiff3: © Joachim Eibl, 2011\n" #: kdiff3fileitemaction.cpp:288 -#, fuzzy, kde-format -#| msgid "" -#| "Using the contextmenu extension:\n" -#| "For simple comparison of two selected 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." +#, kde-format msgid "" "Using the context menu extension:\n" "For simple comparison of two selected files choose \"Compare\".\n" diff -Nru kdiff3-1.8.01/po/ru/kdiff3.po kdiff3-1.8.3/po/ru/kdiff3.po --- kdiff3-1.8.01/po/ru/kdiff3.po 2019-05-18 01:02:21.000000000 +0000 +++ kdiff3-1.8.3/po/ru/kdiff3.po 2020-06-25 00:18:46.000000000 +0000 @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: kdiff3\n" -"Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2019-04-18 08:02+0200\n" +"Report-Msgid-Bugs-To: https://bugs.kde.org\n" +"POT-Creation-Date: 2020-06-22 07:48+0200\n" "PO-Revision-Date: 2018-08-24 03:46+0300\n" "Last-Translator: Alexander Potashev \n" "Language-Team: Russian \n" @@ -33,291 +33,291 @@ msgid "Your emails" msgstr "irk.translator@gmail.com" -#: difftextwindow.cpp:412 +#: difftextwindow.cpp:414 #, kde-format msgid "File %1: Line %2" msgstr "" -#: difftextwindow.cpp:414 +#: difftextwindow.cpp:416 #, fuzzy, kde-format #| msgid "Line not available" msgid "File %1: Line not available" msgstr "Строка недоступна" -#: difftextwindow.cpp:1780 +#: difftextwindow.cpp:1778 #, kde-format msgid "Encoding:" msgstr "Кодировка:" -#: difftextwindow.cpp:1782 mergeresultwindow.cpp:3138 optiondialog.cpp:818 +#: difftextwindow.cpp:1781 mergeresultwindow.cpp:3166 optiondialog.cpp:840 #, kde-format msgid "Line end style:" msgstr "Тип перевода строки:" -#: difftextwindow.cpp:1810 directorymergewindow.cpp:382 -#: directorymergewindow.cpp:433 directorymergewindow.cpp:524 -#: directorymergewindow.cpp:3058 directorymergewindow.cpp:3189 -#: directorymergewindow.cpp:3417 mergeresultwindow.cpp:942 -#: mergeresultwindow.cpp:944 mergeresultwindow.cpp:946 -#: mergeresultwindow.cpp:948 mergeresultwindow.cpp:1814 -#: mergeresultwindow.cpp:3170 mergeresultwindow.cpp:3177 optiondialog.cpp:962 -#: optiondialog.cpp:975 pdiff.cpp:833 pdiff.cpp:835 pdiff.cpp:837 pdiff.cpp:839 -#: pdiff.cpp:861 smalldialogs.cpp:124 smalldialogs.cpp:126 smalldialogs.cpp:127 -#: smalldialogs.cpp:130 +#: difftextwindow.cpp:1809 directorymergewindow.cpp:383 +#: directorymergewindow.cpp:434 directorymergewindow.cpp:525 +#: directorymergewindow.cpp:3072 directorymergewindow.cpp:3203 +#: directorymergewindow.cpp:3431 mergeresultwindow.cpp:970 +#: mergeresultwindow.cpp:972 mergeresultwindow.cpp:974 +#: mergeresultwindow.cpp:976 mergeresultwindow.cpp:1842 +#: mergeresultwindow.cpp:3198 mergeresultwindow.cpp:3205 optiondialog.cpp:1002 +#: optiondialog.cpp:1015 pdiff.cpp:823 pdiff.cpp:825 pdiff.cpp:827 +#: pdiff.cpp:829 pdiff.cpp:851 smalldialogs.cpp:131 smalldialogs.cpp:133 +#: smalldialogs.cpp:134 smalldialogs.cpp:137 #, kde-format msgid "A" msgstr "A" -#: difftextwindow.cpp:1810 directorymergewindow.cpp:384 -#: directorymergewindow.cpp:436 directorymergewindow.cpp:526 -#: directorymergewindow.cpp:3064 directorymergewindow.cpp:3190 -#: directorymergewindow.cpp:3418 mergeresultwindow.cpp:942 -#: mergeresultwindow.cpp:944 mergeresultwindow.cpp:950 -#: mergeresultwindow.cpp:952 mergeresultwindow.cpp:1816 -#: mergeresultwindow.cpp:3172 mergeresultwindow.cpp:3179 optiondialog.cpp:963 -#: optiondialog.cpp:976 pdiff.cpp:833 pdiff.cpp:835 pdiff.cpp:841 pdiff.cpp:843 -#: pdiff.cpp:863 smalldialogs.cpp:124 smalldialogs.cpp:125 smalldialogs.cpp:128 -#: smalldialogs.cpp:131 +#: difftextwindow.cpp:1809 directorymergewindow.cpp:385 +#: directorymergewindow.cpp:437 directorymergewindow.cpp:527 +#: directorymergewindow.cpp:3078 directorymergewindow.cpp:3204 +#: directorymergewindow.cpp:3432 mergeresultwindow.cpp:970 +#: mergeresultwindow.cpp:972 mergeresultwindow.cpp:978 +#: mergeresultwindow.cpp:980 mergeresultwindow.cpp:1844 +#: mergeresultwindow.cpp:3200 mergeresultwindow.cpp:3207 optiondialog.cpp:1003 +#: optiondialog.cpp:1016 pdiff.cpp:823 pdiff.cpp:825 pdiff.cpp:831 +#: pdiff.cpp:833 pdiff.cpp:853 smalldialogs.cpp:131 smalldialogs.cpp:132 +#: smalldialogs.cpp:135 smalldialogs.cpp:138 #, kde-format msgid "B" msgstr "B" -#: difftextwindow.cpp:1810 directorymergewindow.cpp:386 -#: directorymergewindow.cpp:439 directorymergewindow.cpp:528 -#: directorymergewindow.cpp:3070 directorymergewindow.cpp:3191 -#: directorymergewindow.cpp:3419 mergeresultwindow.cpp:946 -#: mergeresultwindow.cpp:948 mergeresultwindow.cpp:950 -#: mergeresultwindow.cpp:952 mergeresultwindow.cpp:1818 -#: mergeresultwindow.cpp:3174 mergeresultwindow.cpp:3181 optiondialog.cpp:977 -#: pdiff.cpp:837 pdiff.cpp:839 pdiff.cpp:841 pdiff.cpp:843 pdiff.cpp:865 -#: smalldialogs.cpp:125 smalldialogs.cpp:126 smalldialogs.cpp:129 -#: smalldialogs.cpp:132 +#: difftextwindow.cpp:1809 directorymergewindow.cpp:387 +#: directorymergewindow.cpp:440 directorymergewindow.cpp:529 +#: directorymergewindow.cpp:3084 directorymergewindow.cpp:3205 +#: directorymergewindow.cpp:3433 mergeresultwindow.cpp:974 +#: mergeresultwindow.cpp:976 mergeresultwindow.cpp:978 +#: mergeresultwindow.cpp:980 mergeresultwindow.cpp:1846 +#: mergeresultwindow.cpp:3202 mergeresultwindow.cpp:3209 optiondialog.cpp:1017 +#: pdiff.cpp:827 pdiff.cpp:829 pdiff.cpp:831 pdiff.cpp:833 pdiff.cpp:855 +#: smalldialogs.cpp:132 smalldialogs.cpp:133 smalldialogs.cpp:136 +#: smalldialogs.cpp:139 #, kde-format msgid "C" msgstr "C" -#: difftextwindow.cpp:1810 +#: difftextwindow.cpp:1809 #, fuzzy, kde-format #| msgid "A (Base):" msgid "A (Base)" msgstr "A (исходное):" -#: difftextwindow.cpp:1812 +#: difftextwindow.cpp:1811 #, fuzzy, kde-format #| msgid "Encoding:" msgid "Encoding: %1" msgstr "Кодировка:" -#: difftextwindow.cpp:1813 mergeresultwindow.cpp:3183 +#: difftextwindow.cpp:1812 mergeresultwindow.cpp:3211 #, kde-format msgid "Unix" msgstr "Unix" -#: difftextwindow.cpp:1813 mergeresultwindow.cpp:3184 +#: difftextwindow.cpp:1812 mergeresultwindow.cpp:3212 #, kde-format msgid "DOS" msgstr "DOS" -#: difftextwindow.cpp:1813 +#: difftextwindow.cpp:1812 #, fuzzy, kde-format #| msgid "Line end style:" msgid "Line end style: %1" msgstr "Тип перевода строки:" -#: difftextwindow.cpp:1835 kdiff3.cpp:873 +#: difftextwindow.cpp:1834 kdiff3.cpp:874 #, kde-format msgid "Top line" msgstr "Первая строка" -#: difftextwindow.cpp:1845 +#: difftextwindow.cpp:1843 #, kde-format msgid "End" msgstr "Конец" -#: difftextwindow.cpp:1903 smalldialogs.cpp:235 +#: difftextwindow.cpp:1901 smalldialogs.cpp:245 #, fuzzy, kde-format #| msgid "Opening files..." msgid "Open File" msgstr "Открытие файлов..." -#: difftextwindow.cpp:1951 optiondialog.cpp:387 +#: difftextwindow.cpp:1943 optiondialog.cpp:389 #, kde-format msgid "Unicode, 8 bit" msgstr "Unicode, 8 бит" -#: difftextwindow.cpp:1966 +#: difftextwindow.cpp:1958 #, kde-format msgid "Other" msgstr "" -#: directorymergewindow.cpp:409 directorymergewindow.cpp:3424 +#: directorymergewindow.cpp:410 directorymergewindow.cpp:3438 #, kde-format msgid "Copy A to B" msgstr "Копировать A в B" -#: directorymergewindow.cpp:412 directorymergewindow.cpp:3425 +#: directorymergewindow.cpp:413 directorymergewindow.cpp:3439 #, kde-format msgid "Copy B to A" msgstr "Копировать B в A" -#: directorymergewindow.cpp:415 directorymergewindow.cpp:3426 +#: directorymergewindow.cpp:416 directorymergewindow.cpp:3440 #, kde-format msgid "Delete A" msgstr "Удалить A" -#: directorymergewindow.cpp:418 directorymergewindow.cpp:3427 +#: directorymergewindow.cpp:419 directorymergewindow.cpp:3441 #, kde-format msgid "Delete B" msgstr "Удалить B" -#: directorymergewindow.cpp:421 +#: directorymergewindow.cpp:422 #, kde-format msgid "Delete A & B" msgstr "Удалить A и B" -#: directorymergewindow.cpp:424 directorymergewindow.cpp:3429 +#: directorymergewindow.cpp:425 directorymergewindow.cpp:3443 #, kde-format msgid "Merge to A" msgstr "Объединить в A" -#: directorymergewindow.cpp:427 directorymergewindow.cpp:3430 +#: directorymergewindow.cpp:428 directorymergewindow.cpp:3444 #, kde-format msgid "Merge to B" msgstr "Объединить в B" -#: directorymergewindow.cpp:430 +#: directorymergewindow.cpp:431 #, kde-format msgid "Merge to A & B" msgstr "Объединить в A & B" -#: directorymergewindow.cpp:442 directorymergewindow.cpp:3421 +#: directorymergewindow.cpp:443 directorymergewindow.cpp:3435 #, kde-format msgid "Delete (if exists)" msgstr "Удалить (если существует)" -#: directorymergewindow.cpp:445 directorymergewindow.cpp:448 -#: directorymergewindow.cpp:3420 optiondialog.cpp:925 smalldialogs.cpp:113 +#: directorymergewindow.cpp:446 directorymergewindow.cpp:449 +#: directorymergewindow.cpp:3434 smalldialogs.cpp:120 #, kde-format msgid "Merge" msgstr "Объединить" -#: directorymergewindow.cpp:445 directorymergewindow.cpp:448 +#: directorymergewindow.cpp:446 directorymergewindow.cpp:449 #, kde-format msgid "Merge (manual)" msgstr "Объединить (вручную)" -#: directorymergewindow.cpp:451 +#: directorymergewindow.cpp:452 #, kde-format msgid "Error: Conflicting File Types" msgstr "Ошибка: несовместимые типы файлов" -#: directorymergewindow.cpp:454 +#: directorymergewindow.cpp:455 #, kde-format msgid "Error: Changed and Deleted" msgstr "Ошибка: изменено или удалено" -#: directorymergewindow.cpp:457 +#: directorymergewindow.cpp:458 #, kde-format msgid "Error: Dates are equal but files are not." msgstr "Ошибка: время совпадает, а содержимое файлов — нет." -#: directorymergewindow.cpp:471 +#: directorymergewindow.cpp:472 #, fuzzy, kde-format #| msgid "Done." msgid "Done" msgstr "Готово." -#: directorymergewindow.cpp:473 +#: directorymergewindow.cpp:474 #, kde-format msgid "Error" msgstr "Ошибка" -#: directorymergewindow.cpp:475 +#: directorymergewindow.cpp:476 #, kde-format msgid "Skipped." msgstr "Пропущено." -#: directorymergewindow.cpp:477 +#: directorymergewindow.cpp:478 #, kde-format msgid "Not saved." msgstr "Не сохранено." -#: directorymergewindow.cpp:479 +#: directorymergewindow.cpp:480 #, kde-format msgid "In progress..." msgstr "Идёт работа..." -#: directorymergewindow.cpp:481 +#: directorymergewindow.cpp:482 #, kde-format msgid "To do." msgstr "Осталось сделать." -#: directorymergewindow.cpp:522 +#: directorymergewindow.cpp:523 #, kde-format msgid "Name" msgstr "Имя" -#: directorymergewindow.cpp:530 +#: directorymergewindow.cpp:531 #, kde-format msgid "Operation" msgstr "Действие" -#: directorymergewindow.cpp:532 +#: directorymergewindow.cpp:533 #, kde-format msgid "Status" msgstr "Состояние" -#: directorymergewindow.cpp:534 +#: directorymergewindow.cpp:535 #, kde-format msgid "Unsolved" msgstr "Неразрешённый" -#: directorymergewindow.cpp:536 +#: directorymergewindow.cpp:537 #, kde-format msgid "Solved" msgstr "Разрешённый" -#: directorymergewindow.cpp:538 +#: directorymergewindow.cpp:539 #, kde-format msgid "Nonwhite" msgstr "Чёрный" -#: directorymergewindow.cpp:540 +#: directorymergewindow.cpp:541 #, kde-format msgid "White" msgstr "Белый" -#: directorymergewindow.cpp:674 +#: directorymergewindow.cpp:676 #, kde-format msgid "Unable to compare non-normal file with normal file." msgstr "" -#: directorymergewindow.cpp:688 +#: directorymergewindow.cpp:690 #, kde-format msgid "Mix of links and normal files." msgstr "Совмещение ссылок и обычных файлов" -#: directorymergewindow.cpp:695 +#: directorymergewindow.cpp:697 #, kde-format msgid "Link: " msgstr "Ссылка: " -#: directorymergewindow.cpp:704 +#: directorymergewindow.cpp:706 #, kde-format msgid "Size. " msgstr "Размер. " -#: directorymergewindow.cpp:718 directorymergewindow.cpp:728 +#: directorymergewindow.cpp:720 directorymergewindow.cpp:730 #, kde-format msgid "Date & Size: " msgstr "Дата и размер: " -#: directorymergewindow.cpp:748 +#: directorymergewindow.cpp:751 #, kde-format msgid "Comparing file..." msgstr "Сравнивание файла..." -#: directorymergewindow.cpp:801 +#: directorymergewindow.cpp:813 #, kde-format msgid "" "You are currently doing a directory merge. Are you sure, you want to abort " @@ -326,48 +326,48 @@ "Сейчас программа работает в режиме объединения папок. Вы действительно " "хотите отменить все изменения и обновить содержание папок?" -#: directorymergewindow.cpp:802 kdiff3.cpp:698 kdiff3.cpp:708 kdiff3.cpp:720 -#: mergeresultwindow.cpp:372 pdiff.cpp:1033 pdiff.cpp:1910 pdiff.cpp:1920 +#: directorymergewindow.cpp:814 kdiff3.cpp:697 kdiff3.cpp:707 kdiff3.cpp:719 +#: mergeresultwindow.cpp:400 pdiff.cpp:1031 pdiff.cpp:1920 pdiff.cpp:1930 #, kde-format msgid "Warning" msgstr "Предупреждение" -#: directorymergewindow.cpp:803 directorymergewindow.cpp:3393 +#: directorymergewindow.cpp:815 directorymergewindow.cpp:3407 #, kde-format msgid "Rescan" msgstr "Обновить" -#: directorymergewindow.cpp:804 pdiff.cpp:1035 +#: directorymergewindow.cpp:816 pdiff.cpp:1033 #, kde-format msgid "Continue Merging" msgstr "Продолжить" -#: directorymergewindow.cpp:971 +#: directorymergewindow.cpp:984 #, kde-format msgid "Opening of directories failed:" msgstr "Не удалось открыть папки:" -#: directorymergewindow.cpp:975 +#: directorymergewindow.cpp:988 #, kde-format msgid "Dir A \"%1\" does not exist or is not a directory.\n" msgstr "Папка A «%1» не существует или это не папка.\n" -#: directorymergewindow.cpp:980 +#: directorymergewindow.cpp:993 #, kde-format msgid "Dir B \"%1\" does not exist or is not a directory.\n" msgstr "Папка B «%1» не существует или это не папка.\n" -#: directorymergewindow.cpp:985 +#: directorymergewindow.cpp:998 #, kde-format msgid "Dir C \"%1\" does not exist or is not a directory.\n" msgstr "Папка C «%1» не существует или это не папка.\n" -#: directorymergewindow.cpp:988 +#: directorymergewindow.cpp:1001 #, kde-format msgid "Directory Open Error" msgstr "Ошибка чтения папки" -#: directorymergewindow.cpp:996 +#: directorymergewindow.cpp:1009 #, kde-format msgid "" "The destination directory must not be the same as A or B when three " @@ -378,49 +378,49 @@ "папок.\n" "Проверьте снова, прежде чем продолжить." -#: directorymergewindow.cpp:998 +#: directorymergewindow.cpp:1011 #, kde-format msgid "Parameter Warning" msgstr "Неправильный параметр" -#: directorymergewindow.cpp:1003 +#: directorymergewindow.cpp:1016 #, kde-format msgid "Scanning directories..." msgstr "Сканирование папок..." -#: directorymergewindow.cpp:1029 +#: directorymergewindow.cpp:1042 #, kde-format msgid "Reading Directory A" msgstr "Чтение папки A" -#: directorymergewindow.cpp:1038 +#: directorymergewindow.cpp:1051 #, kde-format msgid "Reading Directory B" msgstr "Чтение папки B" -#: directorymergewindow.cpp:1048 +#: directorymergewindow.cpp:1061 #, kde-format msgid "Reading Directory C" msgstr "Чтение папки C" -#: directorymergewindow.cpp:1064 +#: directorymergewindow.cpp:1077 #, kde-format msgid "Some subdirectories were not readable in" msgstr "Не удалось прочитать некоторые подпапки в" -#: directorymergewindow.cpp:1069 +#: directorymergewindow.cpp:1082 #, kde-format msgid "Check the permissions of the subdirectories." msgstr "Проверьте права доступа к этим подпапкам." -#: directorymergewindow.cpp:1106 kdiff3.cpp:666 kdiff3.cpp:753 kdiff3.cpp:777 -#: kdiff3.cpp:1065 kdiff3.cpp:1086 pdiff.cpp:1116 pdiff.cpp:1170 pdiff.cpp:1218 -#: pdiff.cpp:1234 pdiff.cpp:1277 pdiff.cpp:1301 +#: directorymergewindow.cpp:1119 kdiff3.cpp:665 kdiff3.cpp:752 kdiff3.cpp:776 +#: kdiff3.cpp:1072 kdiff3.cpp:1093 pdiff.cpp:1115 pdiff.cpp:1178 pdiff.cpp:1228 +#: pdiff.cpp:1244 pdiff.cpp:1287 pdiff.cpp:1311 #, kde-format msgid "Ready." msgstr "Готово." -#: directorymergewindow.cpp:1121 +#: directorymergewindow.cpp:1134 #, kde-format msgid "" "Directory Comparison Status\n" @@ -430,23 +430,23 @@ "Number of different files: %3" msgstr "" -#: directorymergewindow.cpp:1128 +#: directorymergewindow.cpp:1141 #, fuzzy, kde-format #| msgid "Number of manual merges:" msgid "Number of manual merges: %1" msgstr "Количество объединений вручную:" -#: directorymergewindow.cpp:1394 +#: directorymergewindow.cpp:1407 #, kde-format msgid "This affects all merge operations." msgstr "Это влияет на все объединения" -#: directorymergewindow.cpp:1395 +#: directorymergewindow.cpp:1408 #, kde-format msgid "Changing All Merge Operations" msgstr "Изменение всех объединений" -#: directorymergewindow.cpp:1695 +#: directorymergewindow.cpp:1708 #, fuzzy, kde-format #| msgid "Processing " msgid "" @@ -454,45 +454,45 @@ "%3" msgstr "Обработка " -#: directorymergewindow.cpp:1738 directorymergewindow.cpp:1742 +#: directorymergewindow.cpp:1751 directorymergewindow.cpp:1755 #, kde-format msgid "Some files could not be processed." msgstr "" -#: directorymergewindow.cpp:2222 directorymergewindow.cpp:2247 -#: directorymergewindow.cpp:2271 +#: directorymergewindow.cpp:2235 directorymergewindow.cpp:2260 +#: directorymergewindow.cpp:2285 #, kde-format msgid "This operation is currently not possible." msgstr "Эта операция сейчас недоступна." -#: directorymergewindow.cpp:2222 directorymergewindow.cpp:2247 -#: directorymergewindow.cpp:2271 directorymergewindow.cpp:2552 +#: directorymergewindow.cpp:2235 directorymergewindow.cpp:2260 +#: directorymergewindow.cpp:2285 directorymergewindow.cpp:2565 #, kde-format msgid "Operation Not Possible" msgstr "Операция недоступна" -#: directorymergewindow.cpp:2318 +#: directorymergewindow.cpp:2332 #, fuzzy, kde-format #| msgid "An error occurred while copying.\n" msgid "An error occurred while copying." msgstr "Ошибка копирования.\n" -#: directorymergewindow.cpp:2319 directorymergewindow.cpp:2759 +#: directorymergewindow.cpp:2333 directorymergewindow.cpp:2772 #, kde-format msgid "Merge Error" msgstr "Ошибка объединения" -#: directorymergewindow.cpp:2396 +#: directorymergewindow.cpp:2410 #, kde-format msgid "Unknown merge operation. (This must never happen!)" msgstr "Неизвестное объединение. (Этого не должно быть!)" -#: directorymergewindow.cpp:2441 +#: directorymergewindow.cpp:2455 #, kde-format msgid "Unknown merge operation." msgstr "Неизвестное объединение." -#: directorymergewindow.cpp:2454 +#: directorymergewindow.cpp:2468 #, kde-format msgid "" "The merge is about to begin.\n" @@ -512,22 +512,22 @@ "Мы предупреждаем, что эта программа всё ещё имеет бета статус и не " "предоставляем никаких ГАРАНТИЙ! Делайте резервные копии ваших важных данных!" -#: directorymergewindow.cpp:2459 +#: directorymergewindow.cpp:2473 #, kde-format msgid "Starting Merge" msgstr "Начало объединения" -#: directorymergewindow.cpp:2460 +#: directorymergewindow.cpp:2474 #, kde-format msgid "Do It" msgstr "Выполнить" -#: directorymergewindow.cpp:2461 +#: directorymergewindow.cpp:2475 #, kde-format msgid "Simulate It" msgstr "Имитировать" -#: directorymergewindow.cpp:2487 +#: directorymergewindow.cpp:2501 #, kde-format msgid "" "The highlighted item has a different type in the different directories. " @@ -535,7 +535,7 @@ msgstr "" "Выделенный объект имеет разные типы в разных папках. Выберите, что делать." -#: directorymergewindow.cpp:2491 +#: directorymergewindow.cpp:2505 #, kde-format msgid "" "The modification dates of the file are equal but the files are not. Select " @@ -544,7 +544,7 @@ "Даты последнего изменения файлов одинаковы, но содержимое — нет. Выберите, " "что делать." -#: directorymergewindow.cpp:2495 +#: directorymergewindow.cpp:2509 #, kde-format msgid "" "The highlighted item was changed in one directory and deleted in the other. " @@ -553,7 +553,7 @@ "Выделенный файл был изменён в одной папке и удалён в другой. Выберите, что " "делать." -#: directorymergewindow.cpp:2552 +#: directorymergewindow.cpp:2565 #, kde-format msgid "" "This operation is currently not possible because directory merge is " @@ -561,7 +561,7 @@ msgstr "" "Эта операция сейчас недоступна, поскольку выполняется объединение папок." -#: directorymergewindow.cpp:2609 +#: directorymergewindow.cpp:2622 #, kde-format msgid "" "There was an error in the last step.\n" @@ -572,264 +572,264 @@ "Вы хотите продолжить с объектом, который вызвал ошибку, или пропустить этот " "объект?" -#: directorymergewindow.cpp:2611 +#: directorymergewindow.cpp:2624 #, kde-format msgid "Continue merge after an error" msgstr "Продолжить объединение после ошибки" -#: directorymergewindow.cpp:2612 +#: directorymergewindow.cpp:2625 #, kde-format msgid "Continue With Last Item" msgstr "Продолжить с последнего объекта" -#: directorymergewindow.cpp:2613 +#: directorymergewindow.cpp:2626 #, kde-format msgid "Skip Item" msgstr "Пропустить объект" -#: directorymergewindow.cpp:2709 +#: directorymergewindow.cpp:2722 #, kde-format msgid "Merge operation complete." msgstr "Объединение завершено." -#: directorymergewindow.cpp:2709 directorymergewindow.cpp:2712 +#: directorymergewindow.cpp:2722 directorymergewindow.cpp:2725 #, kde-format msgid "Merge Complete" msgstr "Объединение завершено" -#: directorymergewindow.cpp:2722 +#: directorymergewindow.cpp:2735 #, kde-format msgid "" "Simulated merge complete: Check if you agree with the proposed operations." msgstr "" "Имитирование объединение завершено. Вы согласны с предлагаемыми изменениями?" -#: directorymergewindow.cpp:2758 +#: directorymergewindow.cpp:2771 #, fuzzy, kde-format #| msgid "An error occurred. Press OK to see detailed information.\n" msgid "An error occurred. Press OK to see detailed information." msgstr "Произошла ошибка. Нажмите OK для подробностей.\n" -#: directorymergewindow.cpp:2791 +#: directorymergewindow.cpp:2804 #, kde-format msgid "Error: While deleting %1: Creating backup failed." msgstr "Ошибка: удаление %1: не удалось создать резервную копию." -#: directorymergewindow.cpp:2798 +#: directorymergewindow.cpp:2811 #, kde-format msgid "delete directory recursively( %1 )" msgstr "удалить папку рекурсивно (%1)" -#: directorymergewindow.cpp:2800 +#: directorymergewindow.cpp:2813 #, kde-format msgid "delete( %1 )" msgstr "удалить( %1 )" -#: directorymergewindow.cpp:2815 +#: directorymergewindow.cpp:2828 #, kde-format msgid "Error: delete dir operation failed while trying to read the directory." msgstr "Ошибка: не удалось удалить папку при попытке прочитать эту папку." -#: directorymergewindow.cpp:2834 +#: directorymergewindow.cpp:2847 #, kde-format msgid "Error: rmdir( %1 ) operation failed." msgstr "Ошибка: операция rmdir( %1 ) завершилась с ошибкой." -#: directorymergewindow.cpp:2844 +#: directorymergewindow.cpp:2857 #, kde-format msgid "Error: delete operation failed." msgstr "Ошибка: не удалось удалить." -#: directorymergewindow.cpp:2870 +#: directorymergewindow.cpp:2884 #, kde-format msgid "manual merge( %1, %2, %3 -> %4)" msgstr "объединение вручную( %1, %2, %3 -> %4)" -#: directorymergewindow.cpp:2873 +#: directorymergewindow.cpp:2887 #, kde-format msgid "" " Note: After a manual merge the user should continue by pressing F7." msgstr " После завершения объединения вручную нажмите F7." -#: directorymergewindow.cpp:2900 +#: directorymergewindow.cpp:2914 #, kde-format msgid "Error: copy( %1 -> %2 ) failed.Deleting existing destination failed." msgstr "" "Ошибка: операция copy(%1 -> %2) завершилась с ошибкой. Не удалось удалить " "существующее назначение." -#: directorymergewindow.cpp:2909 +#: directorymergewindow.cpp:2923 #, kde-format msgid "copyLink( %1 -> %2 )" msgstr "copyLink( %1 -> %2 ) скопировать ссылку" -#: directorymergewindow.cpp:2918 +#: directorymergewindow.cpp:2932 #, kde-format msgid "Error: copyLink failed: Remote links are not yet supported." msgstr "" "Ошибка: операция copyLink завершилась с ошибкой: удалённые ссылки не " "поддерживаются." -#: directorymergewindow.cpp:2928 +#: directorymergewindow.cpp:2942 #, kde-format msgid "Error: copyLink failed." msgstr "Ошибка операция copyLink (копирование ссылки) завершилась с ошибкой." -#: directorymergewindow.cpp:2953 +#: directorymergewindow.cpp:2967 #, kde-format msgid "copy( %1 -> %2 )" msgstr "copy( %1 -> %2 )" -#: directorymergewindow.cpp:2979 +#: directorymergewindow.cpp:2993 #, kde-format msgid "Error during rename( %1 -> %2 ): Cannot delete existing destination." msgstr "" "Ошибка при выполнении rename( %1 -> %2 ). Не удалось удалить существующее " "назначение." -#: directorymergewindow.cpp:2986 +#: directorymergewindow.cpp:3000 #, kde-format msgid "rename( %1 -> %2 )" msgstr "rename( %1 -> %2 )" -#: directorymergewindow.cpp:2995 +#: directorymergewindow.cpp:3009 #, kde-format msgid "Error: Rename failed." msgstr "Ошибка: не удалось переименовать." -#: directorymergewindow.cpp:3013 +#: directorymergewindow.cpp:3027 #, kde-format msgid "Error during makeDir of %1. Cannot delete existing file." msgstr "Не удалось создать папку %1. Не удалось удалить существующий файл." -#: directorymergewindow.cpp:3030 +#: directorymergewindow.cpp:3044 #, kde-format msgid "makeDir( %1 )" msgstr "makeDir( %1 )" -#: directorymergewindow.cpp:3040 +#: directorymergewindow.cpp:3054 #, kde-format msgid "Error while creating directory." msgstr "Не удалось создать папку." -#: directorymergewindow.cpp:3076 directorymergewindow.cpp:3195 +#: directorymergewindow.cpp:3090 directorymergewindow.cpp:3209 #, kde-format msgid "Dest" msgstr "Назначение" -#: directorymergewindow.cpp:3084 directorymergewindow.cpp:3113 +#: directorymergewindow.cpp:3098 directorymergewindow.cpp:3127 #, kde-format msgid "Dir" msgstr "Папка" -#: directorymergewindow.cpp:3084 +#: directorymergewindow.cpp:3098 #, kde-format msgid "Type" msgstr "Тип" -#: directorymergewindow.cpp:3084 +#: directorymergewindow.cpp:3098 #, kde-format msgid "Size" msgstr "Размер" -#: directorymergewindow.cpp:3085 +#: directorymergewindow.cpp:3099 #, kde-format msgid "Attr" msgstr "Атрибуты" -#: directorymergewindow.cpp:3085 +#: directorymergewindow.cpp:3099 #, kde-format msgid "Last Modification" msgstr "Последнее изменение" -#: directorymergewindow.cpp:3085 +#: directorymergewindow.cpp:3099 #, kde-format msgid "Link-Destination" msgstr "Объект ссылки" -#: directorymergewindow.cpp:3113 +#: directorymergewindow.cpp:3127 #, kde-format msgid "File" msgstr "Файл" -#: directorymergewindow.cpp:3113 +#: directorymergewindow.cpp:3127 #, fuzzy, kde-format #| msgid "Link: " msgid "-Link" msgstr "Ссылка: " -#: directorymergewindow.cpp:3119 +#: directorymergewindow.cpp:3133 #, kde-format msgid "not available" msgstr "недоступно" -#: directorymergewindow.cpp:3137 +#: directorymergewindow.cpp:3151 #, kde-format msgid "A (Dest): " msgstr "A (назначение): " -#: directorymergewindow.cpp:3141 +#: directorymergewindow.cpp:3155 #, kde-format msgid "A: " msgstr "" -#: directorymergewindow.cpp:3141 +#: directorymergewindow.cpp:3155 #, kde-format msgid "A (Base): " msgstr "A (исходное): " -#: directorymergewindow.cpp:3147 +#: directorymergewindow.cpp:3161 #, kde-format msgid "B (Dest): " msgstr "B (назначение): " -#: directorymergewindow.cpp:3151 +#: directorymergewindow.cpp:3165 #, kde-format msgid "B: " msgstr "" -#: directorymergewindow.cpp:3156 +#: directorymergewindow.cpp:3170 #, kde-format msgid "C (Dest): " msgstr "C (назначение): " -#: directorymergewindow.cpp:3160 +#: directorymergewindow.cpp:3174 #, kde-format msgid "C: " msgstr "" -#: directorymergewindow.cpp:3163 +#: directorymergewindow.cpp:3177 #, kde-format msgid "Dest: " msgstr "Назначение: " #. i18n("Saving Directory Merge State ...")); -#: directorymergewindow.cpp:3238 +#: directorymergewindow.cpp:3252 #, kde-format msgid "Save Directory Merge State As..." msgstr "Сохранить состояние объединения папок как..." -#: directorymergewindow.cpp:3387 +#: directorymergewindow.cpp:3401 #, kde-format msgid "Start/Continue Directory Merge" msgstr "Начать/продолжить объединение папок" -#: directorymergewindow.cpp:3388 +#: directorymergewindow.cpp:3402 #, kde-format msgid "Run Operation for Current Item" msgstr "Выполнить операцию для выбранного объекта" -#: directorymergewindow.cpp:3389 +#: directorymergewindow.cpp:3403 #, kde-format msgid "Compare Selected File" msgstr "Сравнить выделенный файл" -#: directorymergewindow.cpp:3390 +#: directorymergewindow.cpp:3404 #, kde-format msgid "Merge Current File" msgstr "Объединить текущий файл" -#: directorymergewindow.cpp:3390 +#: directorymergewindow.cpp:3404 #, kde-format msgid "" "Merge\n" @@ -838,51 +838,51 @@ "Объединить\n" "файл" -#: directorymergewindow.cpp:3391 +#: directorymergewindow.cpp:3405 #, kde-format msgid "Fold All Subdirs" msgstr "Свернуть все подпапки" -#: directorymergewindow.cpp:3392 +#: directorymergewindow.cpp:3406 #, kde-format msgid "Unfold All Subdirs" msgstr "Развернуть все подпапки" #. i18n("Save Directory Merge State ..."), 0, this, &DirectoryMergeWindow::slotSaveMergeState, ac, "dir_save_merge_state"); #. i18n("Load Directory Merge State ..."), 0, this, &DirectoryMergeWindow::slotLoadMergeState, ac, "dir_load_merge_state"); -#: directorymergewindow.cpp:3396 +#: directorymergewindow.cpp:3410 #, kde-format msgid "Choose A for All Items" msgstr "Выбрать A для всех" -#: directorymergewindow.cpp:3397 +#: directorymergewindow.cpp:3411 #, kde-format msgid "Choose B for All Items" msgstr "Выбрать B для всех" -#: directorymergewindow.cpp:3398 +#: directorymergewindow.cpp:3412 #, kde-format msgid "Choose C for All Items" msgstr "Выбрать C для всех" -#: directorymergewindow.cpp:3399 +#: directorymergewindow.cpp:3413 #, kde-format msgid "Auto-Choose Operation for All Items" msgstr "Автоматически выбирать тип действия для всех" -#: directorymergewindow.cpp:3400 +#: directorymergewindow.cpp:3414 #, kde-format msgid "No Operation for All Items" msgstr "Убрать действия для всех" #. i18n("Synchronize Directories"), 0, this, &DirectoryMergeWindow::slotSynchronizeDirectories, ac, "dir_synchronize_directories"); #. d->m_pDirChooseNewerFiles = GuiUtils::createAction< KToggleAction >(i18n("Copy Newer Files Instead of Merging"), 0, this, &DirectoryMergeWindow::slotChooseNewerFiles, ac, "dir_choose_newer_files"); -#: directorymergewindow.cpp:3405 +#: directorymergewindow.cpp:3419 #, kde-format msgid "Show Identical Files" msgstr "Показать идентичные файлы" -#: directorymergewindow.cpp:3405 +#: directorymergewindow.cpp:3419 #, kde-format msgid "" "Identical\n" @@ -891,17 +891,17 @@ "Идентичные\n" "файлы" -#: directorymergewindow.cpp:3406 +#: directorymergewindow.cpp:3420 #, kde-format msgid "Show Different Files" msgstr "Показать разные файлы" -#: directorymergewindow.cpp:3407 +#: directorymergewindow.cpp:3421 #, kde-format msgid "Show Files only in A" msgstr "Показать файлы только в A" -#: directorymergewindow.cpp:3407 +#: directorymergewindow.cpp:3421 #, kde-format msgid "" "Files\n" @@ -910,12 +910,12 @@ "Файлы\n" "только в A" -#: directorymergewindow.cpp:3408 +#: directorymergewindow.cpp:3422 #, kde-format msgid "Show Files only in B" msgstr "Показать файлы только в B" -#: directorymergewindow.cpp:3408 +#: directorymergewindow.cpp:3422 #, kde-format msgid "" "Files\n" @@ -924,12 +924,12 @@ "Файлы\n" "только в B" -#: directorymergewindow.cpp:3409 +#: directorymergewindow.cpp:3423 #, kde-format msgid "Show Files only in C" msgstr "Показать файлы только в C" -#: directorymergewindow.cpp:3409 +#: directorymergewindow.cpp:3423 #, kde-format msgid "" "Files\n" @@ -938,55 +938,60 @@ "Файлы\n" "только в C" -#: directorymergewindow.cpp:3413 +#: directorymergewindow.cpp:3427 #, kde-format msgid "Compare Explicitly Selected Files" msgstr "Сравнить только выделенные файлы" -#: directorymergewindow.cpp:3414 +#: directorymergewindow.cpp:3428 #, kde-format msgid "Merge Explicitly Selected Files" msgstr "Объединить только выделенные файлы" -#: directorymergewindow.cpp:3416 directorymergewindow.cpp:3423 +#: directorymergewindow.cpp:3430 directorymergewindow.cpp:3437 #, kde-format msgid "Do Nothing" msgstr "Ничего" -#: directorymergewindow.cpp:3428 +#: directorymergewindow.cpp:3442 #, kde-format msgid "Delete A && B" msgstr "Удалить A и B" -#: directorymergewindow.cpp:3431 +#: directorymergewindow.cpp:3445 #, kde-format msgid "Merge to A && B" msgstr "Объединить в A и B" -#: fileaccess.cpp:462 SourceData.cpp:493 +#: fileaccess.cpp:301 +#, kde-format +msgid "Unable to determine full url. No parent specified." +msgstr "" + +#: fileaccess.cpp:482 SourceData.cpp:506 #, fuzzy, kde-format #| msgid "Reading file: %1" msgid "Failed to read file: %1" msgstr "Чтение файла: %1" -#: fileaccess.cpp:587 +#: fileaccess.cpp:624 #, kde-format msgid "Creating temp copy of %1 failed." msgstr "Не удалось создать временную копию %1." -#: fileaccess.cpp:595 fileaccess.cpp:600 +#: fileaccess.cpp:632 fileaccess.cpp:637 #, fuzzy, kde-format #| msgid "Opening %1 failed." msgid "Opening %1 failed. %2" msgstr "Не удалось открыть %1." -#: fileaccess.cpp:619 fileaccess.cpp:627 +#: fileaccess.cpp:656 fileaccess.cpp:664 #, fuzzy, kde-format #| msgid "Error reading from %1" msgid "Error reading from %1. %2" msgstr "Ошибка чтения из %1" -#: fileaccess.cpp:751 +#: fileaccess.cpp:788 #, fuzzy, kde-format #| msgid "" #| "While trying to make a backup, deleting an older backup failed. \n" @@ -998,7 +1003,7 @@ "Не удалось удалить старую резервную копию. \n" "Файл: " -#: fileaccess.cpp:758 +#: fileaccess.cpp:795 #, fuzzy, kde-format #| msgid "" #| "While trying to make a backup, renaming failed. \n" @@ -1010,177 +1015,177 @@ "Не удалось выполнить переименование. \n" "Файлы: " -#: fileaccess.cpp:828 +#: fileaccess.cpp:865 #, kde-format msgid "Getting file status: %1" msgstr "Получение состояния файла: %1" -#: fileaccess.cpp:869 +#: fileaccess.cpp:906 #, kde-format msgid "Reading file: %1" msgstr "Чтение файла: %1" -#: fileaccess.cpp:907 +#: fileaccess.cpp:944 #, kde-format msgid "Writing file: %1" msgstr "Запись в файл: %1" -#: fileaccess.cpp:940 +#: fileaccess.cpp:977 #, kde-format msgid "Out of memory" msgstr "Не хватает памяти" -#: fileaccess.cpp:976 +#: fileaccess.cpp:1013 #, kde-format msgid "Making directory: %1" msgstr "Создание папки: %1" -#: fileaccess.cpp:997 +#: fileaccess.cpp:1034 #, kde-format msgid "Removing directory: %1" msgstr "Удаление папки: %1" -#: fileaccess.cpp:1012 +#: fileaccess.cpp:1049 #, kde-format msgid "Removing file: %1" msgstr "Удаление файла: %1" -#: fileaccess.cpp:1028 +#: fileaccess.cpp:1065 #, kde-format msgid "Creating symbolic link: %1 -> %2" msgstr "Создание символической ссылки: %1 -> %2" -#: fileaccess.cpp:1052 +#: fileaccess.cpp:1089 #, kde-format msgid "Renaming file: %1 -> %2" msgstr "Переименование файла: %1 -> %2" -#: fileaccess.cpp:1086 +#: fileaccess.cpp:1123 #, kde-format msgid "Copying file: %1 -> %2" msgstr "Копирование файла: %1 -> %2" -#: fileaccess.cpp:1108 +#: fileaccess.cpp:1145 #, kde-format msgid "Reading directory: %1" msgstr "Чтение папки: %1" -#: fileaccess.cpp:1162 +#: fileaccess.cpp:1202 #, kde-format msgid "Listing directory: %1" msgstr "Вывод содержимого папки: %1" -#: kdiff3.cpp:181 +#: kdiff3.cpp:182 #, kde-format msgid "Current Configuration:" msgstr "Текущие настройки:" -#: kdiff3.cpp:186 +#: kdiff3.cpp:187 #, kde-format msgid "Config Option Error:" msgstr "Ошибка параметра настройки:" -#: kdiff3.cpp:240 +#: kdiff3.cpp:246 #, kde-format msgid "Option --auto used, but no output file specified." msgstr "Ключ --auto использован, но не указаны выходные файлы." -#: kdiff3.cpp:416 +#: kdiff3.cpp:405 #, kde-format msgid "Option --auto ignored for directory comparison." msgstr "Ключ --auto игнорируется при сравнении папок." -#: kdiff3.cpp:460 +#: kdiff3.cpp:449 #, kde-format msgid "Saving failed." msgstr "Не удалось произвести сохранение." -#: kdiff3.cpp:496 pdiff.cpp:1098 +#: kdiff3.cpp:494 pdiff.cpp:1096 #, kde-format msgid "Opening of these files failed:" msgstr "Не удалось открыть файлы:" -#: kdiff3.cpp:505 +#: kdiff3.cpp:503 pdiff.cpp:1105 #, kde-format -msgid "File Open Error" -msgstr "Ошибка открытия файлов" +msgid "File open error" +msgstr "Ошибка открытия файла" -#: kdiff3.cpp:533 +#: kdiff3.cpp:532 #, kde-format msgid "Opens documents for comparison..." msgstr "Открыть файлы для сравнения..." -#: kdiff3.cpp:535 +#: kdiff3.cpp:534 #, kde-format msgid "Reload" msgstr "Обновить" -#: kdiff3.cpp:538 +#: kdiff3.cpp:537 #, kde-format msgid "Saves the merge result. All conflicts must be solved!" msgstr "Сохранить результат объединения. Все конфликты должны быть разрешены!" -#: kdiff3.cpp:540 +#: kdiff3.cpp:539 #, kde-format msgid "Saves the current document as..." msgstr "Сохранить с другим именем..." -#: kdiff3.cpp:543 +#: kdiff3.cpp:542 #, kde-format msgid "Print the differences" msgstr "Распечатать отличия" -#: kdiff3.cpp:546 +#: kdiff3.cpp:545 #, kde-format msgid "Quits the application" msgstr "Выйти" -#: kdiff3.cpp:549 +#: kdiff3.cpp:548 #, kde-format msgid "Cuts the selected section and puts it to the clipboard" msgstr "Вырезать в буфер обмена" -#: kdiff3.cpp:552 +#: kdiff3.cpp:551 #, kde-format msgid "Copies the selected section to the clipboard" msgstr "Скопировать в буфер обмена" -#: kdiff3.cpp:554 +#: kdiff3.cpp:553 #, kde-format msgid "Pastes the clipboard contents to current position" msgstr "Вставить из буфера обмена" -#: kdiff3.cpp:557 +#: kdiff3.cpp:556 #, kde-format msgid "Select everything in current window" msgstr "Выделить всё в текущем окне" -#: kdiff3.cpp:560 +#: kdiff3.cpp:559 #, kde-format msgid "Search for a string" msgstr "Искать текст" -#: kdiff3.cpp:562 +#: kdiff3.cpp:561 #, kde-format msgid "Search again for the string" msgstr "Продолжить поиск текста" -#: kdiff3.cpp:567 +#: kdiff3.cpp:566 #, kde-format msgid "Enables/disables the statusbar" msgstr "Отобразить/скрыть панель состояния" -#: kdiff3.cpp:571 +#: kdiff3.cpp:570 #, kde-format msgid "Configure KDiff3..." msgstr "Настроить KDiff3..." -#: kdiff3.cpp:590 +#: kdiff3.cpp:589 #, kde-format msgid "Go to Current Delta" msgstr "Перейти к текущему различию" -#: kdiff3.cpp:590 +#: kdiff3.cpp:589 #, kde-format msgid "" "Current\n" @@ -1189,12 +1194,12 @@ "Текущее\n" "различие" -#: kdiff3.cpp:592 +#: kdiff3.cpp:591 #, kde-format msgid "Go to First Delta" msgstr "Перейти к первому различию" -#: kdiff3.cpp:592 +#: kdiff3.cpp:591 #, kde-format msgid "" "First\n" @@ -1203,12 +1208,12 @@ "Первое\n" "различие" -#: kdiff3.cpp:594 +#: kdiff3.cpp:593 #, kde-format msgid "Go to Last Delta" msgstr "Перейти к последнему различию" -#: kdiff3.cpp:594 +#: kdiff3.cpp:593 #, kde-format msgid "" "Last\n" @@ -1217,14 +1222,14 @@ "Последнее\n" "различие" -#: kdiff3.cpp:596 +#: kdiff3.cpp:595 #, kde-format msgid "(Skips white space differences when \"Show White Space\" is disabled.)" msgstr "" "(Пропускать отличия в пустых промежутках, когда «Отображать пустые " "промежутки» выключено.)" -#: kdiff3.cpp:597 +#: kdiff3.cpp:596 #, kde-format msgid "" "(Does not skip white space differences even when \"Show White Space\" is " @@ -1233,12 +1238,12 @@ "(Не пропускать отличия в пустых промежутках, даже когда «Отображать пустые " "промежутки» выключено.)" -#: kdiff3.cpp:598 +#: kdiff3.cpp:597 #, kde-format msgid "Go to Previous Delta" msgstr "Перейти к предыдущему различию" -#: kdiff3.cpp:598 +#: kdiff3.cpp:597 #, kde-format msgid "" "Prev\n" @@ -1247,12 +1252,12 @@ "Предыдущее\n" "различие" -#: kdiff3.cpp:600 +#: kdiff3.cpp:599 #, kde-format msgid "Go to Next Delta" msgstr "Перейти к следующему различию" -#: kdiff3.cpp:600 +#: kdiff3.cpp:599 #, kde-format msgid "" "Next\n" @@ -1261,12 +1266,12 @@ "Следующее\n" "различие" -#: kdiff3.cpp:602 +#: kdiff3.cpp:601 #, kde-format msgid "Go to Previous Conflict" msgstr "Перейти к предыдущему конфликту" -#: kdiff3.cpp:602 +#: kdiff3.cpp:601 #, kde-format msgid "" "Prev\n" @@ -1275,12 +1280,12 @@ "Предыдущий\n" "конфликт" -#: kdiff3.cpp:604 +#: kdiff3.cpp:603 #, kde-format msgid "Go to Next Conflict" msgstr "Перейти к следующему конфликту" -#: kdiff3.cpp:604 +#: kdiff3.cpp:603 #, kde-format msgid "" "Next\n" @@ -1289,12 +1294,12 @@ "Следующий\n" "конфликт" -#: kdiff3.cpp:606 +#: kdiff3.cpp:605 #, kde-format msgid "Go to Previous Unsolved Conflict" msgstr "Перейти к предыдущему неразрешённому конфликту" -#: kdiff3.cpp:606 +#: kdiff3.cpp:605 #, kde-format msgid "" "Prev\n" @@ -1303,12 +1308,12 @@ "Предыдущий\n" "неразрешённый" -#: kdiff3.cpp:608 +#: kdiff3.cpp:607 #, kde-format msgid "Go to Next Unsolved Conflict" msgstr "Перейти к следующему неразрешённому конфликту" -#: kdiff3.cpp:608 +#: kdiff3.cpp:607 #, kde-format msgid "" "Next\n" @@ -1317,12 +1322,12 @@ "Следующий\n" "неразрешённый" -#: kdiff3.cpp:610 +#: kdiff3.cpp:609 #, kde-format msgid "Select Line(s) From A" msgstr "Выбрать строки из A" -#: kdiff3.cpp:610 +#: kdiff3.cpp:609 #, kde-format msgid "" "Choose\n" @@ -1331,12 +1336,12 @@ "Выбрать\n" "A" -#: kdiff3.cpp:611 +#: kdiff3.cpp:610 #, kde-format msgid "Select Line(s) From B" msgstr "Выбрать строки из B" -#: kdiff3.cpp:611 +#: kdiff3.cpp:610 #, kde-format msgid "" "Choose\n" @@ -1345,12 +1350,12 @@ "Выбрать\n" "B" -#: kdiff3.cpp:612 +#: kdiff3.cpp:611 #, kde-format msgid "Select Line(s) From C" msgstr "Выбрать строки из C" -#: kdiff3.cpp:612 +#: kdiff3.cpp:611 #, kde-format msgid "" "Choose\n" @@ -1359,13 +1364,13 @@ "Выбрать\n" "C" -#: kdiff3.cpp:613 +#: kdiff3.cpp:612 #, kde-format msgid "Automatically Go to Next Unsolved Conflict After Source Selection" msgstr "" "Переходить к следующему неразрешённому конфликту после выделения исходника" -#: kdiff3.cpp:613 +#: kdiff3.cpp:612 #, kde-format msgid "" "Auto\n" @@ -1374,13 +1379,13 @@ "Автоматически\n" "следующий" -#: kdiff3.cpp:615 +#: kdiff3.cpp:614 #, fuzzy, kde-format #| msgid "Show Space && Tabulator Characters for Differences" msgid "Show Space && Tabulator Characters" msgstr "Отображать пробелы и табуляции в различиях" -#: kdiff3.cpp:615 +#: kdiff3.cpp:614 #, kde-format msgid "" "White\n" @@ -1389,12 +1394,12 @@ "Пустые\n" "промежутки" -#: kdiff3.cpp:616 +#: kdiff3.cpp:615 #, kde-format msgid "Show White Space" msgstr "Отображать пустые промежутки" -#: kdiff3.cpp:616 +#: kdiff3.cpp:615 #, kde-format msgid "" "White\n" @@ -1403,12 +1408,12 @@ "Пустые\n" "различия" -#: kdiff3.cpp:618 +#: kdiff3.cpp:617 #, kde-format msgid "Show Line Numbers" msgstr "Отображать номера строк" -#: kdiff3.cpp:618 +#: kdiff3.cpp:617 #, kde-format msgid "" "Line\n" @@ -1417,195 +1422,195 @@ "Номера\n" "строк" -#: kdiff3.cpp:620 +#: kdiff3.cpp:619 #, kde-format msgid "Automatically Solve Simple Conflicts" msgstr "Разрешать простые конфликты автоматически" -#: kdiff3.cpp:621 +#: kdiff3.cpp:620 #, kde-format msgid "Set Deltas to Conflicts" msgstr "Определить различия как конфликты" -#: kdiff3.cpp:622 +#: kdiff3.cpp:621 #, kde-format msgid "Run Regular Expression Auto Merge" msgstr "Запустить автоматическое объединение на основе регулярного выражения" -#: kdiff3.cpp:623 +#: kdiff3.cpp:622 #, kde-format msgid "Automatically Solve History Conflicts" msgstr "Разрешать конфликты истории автоматически" -#: kdiff3.cpp:624 +#: kdiff3.cpp:623 #, kde-format msgid "Split Diff At Selection" msgstr "Разделить Diff по выделению" -#: kdiff3.cpp:625 +#: kdiff3.cpp:624 #, kde-format msgid "Join Selected Diffs" msgstr "Сгруппировать выделенные Diff" -#: kdiff3.cpp:627 +#: kdiff3.cpp:626 #, kde-format msgid "Show Window A" msgstr "Отобразить окно A" -#: kdiff3.cpp:628 +#: kdiff3.cpp:627 #, kde-format msgid "Show Window B" msgstr "Отобразить окно B" -#: kdiff3.cpp:629 +#: kdiff3.cpp:628 #, kde-format msgid "Show Window C" msgstr "Отобразить окно C" -#: kdiff3.cpp:631 +#: kdiff3.cpp:630 #, kde-format msgid "Normal Overview" msgstr "Обычный обзор " -#: kdiff3.cpp:632 +#: kdiff3.cpp:631 #, kde-format msgid "A vs. B Overview" msgstr "Обзор A vs. B" -#: kdiff3.cpp:633 +#: kdiff3.cpp:632 #, kde-format msgid "A vs. C Overview" msgstr "Обзор A vs. C " -#: kdiff3.cpp:634 +#: kdiff3.cpp:633 #, kde-format msgid "B vs. C Overview" msgstr "Обзор B vs. C" -#: kdiff3.cpp:635 +#: kdiff3.cpp:634 #, kde-format msgid "Word Wrap Diff Windows" msgstr "Перенос по словам в окнах Diff" -#: kdiff3.cpp:636 +#: kdiff3.cpp:635 #, kde-format msgid "Add Manual Diff Alignment" msgstr "Добавить вручную выравнивание Diff" -#: kdiff3.cpp:637 +#: kdiff3.cpp:636 #, kde-format msgid "Clear All Manual Diff Alignments" msgstr "Убрать все выравнивания Diff" -#: kdiff3.cpp:639 +#: kdiff3.cpp:638 #, kde-format msgid "Focus Next Window" msgstr "Активировать следующее окно" -#: kdiff3.cpp:640 +#: kdiff3.cpp:639 #, kde-format msgid "Focus Prev Window" msgstr "Активировать предыдущее окно" -#: kdiff3.cpp:641 +#: kdiff3.cpp:640 #, kde-format msgid "Toggle Split Orientation" msgstr "Поменять ориентация разделения" -#: kdiff3.cpp:643 +#: kdiff3.cpp:642 #, kde-format msgid "Dir && Text Split Screen View" msgstr "Режим папки/текст" -#: kdiff3.cpp:645 +#: kdiff3.cpp:644 #, kde-format msgid "Toggle Between Dir && Text View" msgstr "Папки/текст" -#: kdiff3.cpp:697 pdiff.cpp:1909 +#: kdiff3.cpp:696 pdiff.cpp:1919 #, fuzzy, kde-format #| msgid "The merge result hasn't been saved." msgid "The merge result has not been saved." msgstr "Результат объединения не сохранён" -#: kdiff3.cpp:699 +#: kdiff3.cpp:698 #, kde-format msgid "Save && Quit" msgstr "Сохранить и выйти" -#: kdiff3.cpp:700 +#: kdiff3.cpp:699 #, kde-format msgid "Quit Without Saving" msgstr "Выйти без сохранения" -#: kdiff3.cpp:708 pdiff.cpp:1920 +#: kdiff3.cpp:707 pdiff.cpp:1930 #, kde-format msgid "Saving the merge result failed." msgstr "Не удалось сохранить результат объединения" -#: kdiff3.cpp:719 pdiff.cpp:1032 +#: kdiff3.cpp:718 pdiff.cpp:1030 #, kde-format msgid "" "You are currently doing a directory merge. Are you sure, you want to abort?" msgstr "Остановить объединение папок?" -#: kdiff3.cpp:742 +#: kdiff3.cpp:741 #, kde-format msgid "Saving file..." msgstr "Сохранение файла..." -#: kdiff3.cpp:759 +#: kdiff3.cpp:758 #, kde-format msgid "Saving file with a new filename..." msgstr "Сохранение файла с новым именем..." -#: kdiff3.cpp:761 +#: kdiff3.cpp:760 #, kde-format msgid "Save As..." msgstr "Сохранить как..." -#: kdiff3.cpp:820 +#: kdiff3.cpp:819 #, kde-format msgid "Printing not implemented." msgstr "Печать не поддерживается." -#: kdiff3.cpp:857 +#: kdiff3.cpp:858 #, kde-format msgid "Printing..." msgstr "Печать..." -#: kdiff3.cpp:943 +#: kdiff3.cpp:948 #, kde-format msgid "Printing page %1 of %2" msgstr "" -#: kdiff3.cpp:1000 +#: kdiff3.cpp:1006 #, fuzzy, kde-format #| msgid "Selection" msgid " (Selection)" msgstr "Выбор" -#: kdiff3.cpp:1027 +#: kdiff3.cpp:1034 #, kde-format msgid "Printing completed." msgstr "Печать завершена." -#: kdiff3.cpp:1031 +#: kdiff3.cpp:1038 #, kde-format msgid "Printing aborted." msgstr "Печать прервана." -#: kdiff3.cpp:1038 +#: kdiff3.cpp:1045 #, kde-format msgid "Exiting..." msgstr "Выход..." -#: kdiff3.cpp:1049 +#: kdiff3.cpp:1056 #, kde-format msgid "Toggling toolbar..." msgstr "Отображение/скрытие панели инструментов..." -#: kdiff3.cpp:1070 +#: kdiff3.cpp:1077 #, kde-format msgid "Toggle the statusbar..." msgstr "Отображение/скрытие панели состояния..." @@ -1631,7 +1636,7 @@ msgid "Joachim Eibl" msgstr "Joachim Eibl" -#: kdiff3_part.cpp:173 kdiff3_part.cpp:254 +#: kdiff3_part.cpp:174 kdiff3_part.cpp:255 #, fuzzy, kde-format #| msgid "Couldn't find files for comparison." msgid "Could not find files for comparison." @@ -1650,7 +1655,7 @@ msgstr "Настроить KDiff3" #. i18n: ectx: ToolBar (mainToolBar) -#: kdiff3_part.rc:16 main.cpp:88 +#: kdiff3_part.rc:16 main.cpp:89 #, kde-format msgid "KDiff3" msgstr "KDiff3" @@ -1726,87 +1731,93 @@ msgid "Main Toolbar" msgstr "Главная панель инструментов" -#: main.cpp:68 main.cpp:72 +#: main.cpp:69 main.cpp:73 #, kde-format msgid "Ignored. (User defined.)" msgstr "Пропущено. (Определено пользователем.)" -#: main.cpp:92 +#: main.cpp:93 #, kde-format msgid " (64 bit)" msgstr "" -#: main.cpp:94 +#: main.cpp:95 #, kde-format msgid " (32 bit)" msgstr "" -#: main.cpp:95 +#: main.cpp:96 #, kde-format msgid "Tool for Comparison and Merge of Files and Directories" msgstr "Инструмент для сравнения и объединения файлов и папок" -#: main.cpp:96 +#: main.cpp:97 #, kde-format msgid "(c) 2002-2014 Joachim Eibl, (c) 2017 Michael Reeves KF5/Qt5 port" msgstr "" -#: main.cpp:112 +#: main.cpp:113 #, kde-format msgid "Merge the input." msgstr "Объединить ввод." -#: main.cpp:113 +#: main.cpp:114 #, kde-format msgid "Explicit base file. For compatibility with certain tools." msgstr "Явный основной файл. Для совместимости с некоторыми программами." -#: main.cpp:114 +#: main.cpp:115 #, kde-format msgid "Output file. Implies -m. E.g.: -o newfile.txt" msgstr "Выходной файл. Подразумевает наличие -m. Например: -o newfile.txt" -#: main.cpp:115 +#: main.cpp:116 #, kde-format msgid "Output file, again. (For compatibility with certain tools.)" msgstr "Выходной файл, снова. (Для совместимости с некоторыми программами.)" -#: main.cpp:116 +#: main.cpp:118 #, kde-format msgid "No GUI if all conflicts are auto-solvable. (Needs -o file)" msgstr "" "Не выводить графический интерфейс если все конфликты удалось разрешить " "автоматически. (требуется -o файл)" -#: main.cpp:117 +#: main.cpp:120 +#, fuzzy, kde-format +#| msgid "Ignore" +msgid "Ignored." +msgstr "Игнорировать" + +#: main.cpp:122 #, fuzzy, kde-format #| msgid "Don't solve conflicts automatically. (For compatibility...)" msgid "Do not solve conflicts automatically." msgstr "Не разрешать конфликты автоматически (для совместимости...)" -#: main.cpp:118 +#: main.cpp:123 #, kde-format msgid "Visible name replacement for input file 1 (base)." msgstr "Замена видимого названия для входного файла 1 (основной)." -#: main.cpp:119 +#: main.cpp:124 #, kde-format msgid "Visible name replacement for input file 2." msgstr "Замена видимого названия для входного файла 2." -#: main.cpp:120 +#: main.cpp:125 #, kde-format msgid "Visible name replacement for input file 3." msgstr "Замена видимого названия для входного файла 3." -#: main.cpp:121 +#: main.cpp:126 #, kde-format msgid "Alternative visible name replacement. Supply this once for every input." msgstr "" "Альтернативная замена видимого названия. Использовать для каждого входного " "файла." -#: main.cpp:122 +#: main.cpp:127 #, kde-format msgid "" "Override a config setting. Use once for every setting. E.g.: --cs " @@ -1815,89 +1826,89 @@ "Перезаписать настраиваемый параметр. Использовать один раз для любого " "параметра. Например: --cs \"autoAdvance=1\"" -#: main.cpp:123 +#: main.cpp:128 #, kde-format msgid "Show list of config settings and current values." msgstr "Показать список настраиваемых параметров и их текущие значения." -#: main.cpp:124 +#: main.cpp:129 #, kde-format msgid "Use a different config file." msgstr "Использовать другой файл настроек." -#: main.cpp:127 +#: main.cpp:132 #, kde-format msgid "file1 to open (base, if not specified via --base)" msgstr "файл1 открыть (основной, если не указан посредством --base)" -#: main.cpp:128 +#: main.cpp:133 #, kde-format msgid "file2 to open" msgstr "файл2 открыть" -#: main.cpp:129 +#: main.cpp:134 #, kde-format msgid "file3 to open" msgstr "файл3 открыть" -#: main.cpp:153 +#: main.cpp:158 #, kde-format msgid "See kdiff3 --help for supported options." msgstr "" -#: mergeresultwindow.cpp:158 +#: mergeresultwindow.cpp:171 #, kde-format msgid "Choose A Everywhere" msgstr "Выбрать A везде" -#: mergeresultwindow.cpp:159 +#: mergeresultwindow.cpp:172 #, kde-format msgid "Choose B Everywhere" msgstr "Выбрать B везде" -#: mergeresultwindow.cpp:160 +#: mergeresultwindow.cpp:173 #, kde-format msgid "Choose C Everywhere" msgstr "Выбрать C везде" -#: mergeresultwindow.cpp:161 +#: mergeresultwindow.cpp:174 #, kde-format msgid "Choose A for All Unsolved Conflicts" msgstr "Выбрать A для всех неразрешённых конфликтов" -#: mergeresultwindow.cpp:162 +#: mergeresultwindow.cpp:175 #, kde-format msgid "Choose B for All Unsolved Conflicts" msgstr "Выбрать B для всех неразрешённых конфликтов" -#: mergeresultwindow.cpp:163 +#: mergeresultwindow.cpp:176 #, kde-format msgid "Choose C for All Unsolved Conflicts" msgstr "Выбрать C для всех неразрешённых конфликтов" -#: mergeresultwindow.cpp:164 +#: mergeresultwindow.cpp:177 #, kde-format msgid "Choose A for All Unsolved Whitespace Conflicts" msgstr "Выбрать A для всех неразрешённых конфликтов пустых промежутков" -#: mergeresultwindow.cpp:165 +#: mergeresultwindow.cpp:178 #, kde-format msgid "Choose B for All Unsolved Whitespace Conflicts" msgstr "Выбрать B для всех неразрешённых конфликтов пустых промежутков" -#: mergeresultwindow.cpp:166 +#: mergeresultwindow.cpp:179 #, kde-format msgid "Choose C for All Unsolved Whitespace Conflicts" msgstr "Выбрать C для всех неразрешённых конфликтов пустых промежутков" -#: mergeresultwindow.cpp:176 +#: mergeresultwindow.cpp:204 #, kde-format msgid "Number of remaining unsolved conflicts: %1 (of which %2 are whitespace)" msgstr "" "Осталось неразрешённых конфликтов: %1 (%2 из которых — конфликты пустых " "промежутков)" -#: mergeresultwindow.cpp:370 +#: mergeresultwindow.cpp:398 #, kde-format msgid "" "The output has been modified.\n" @@ -1906,29 +1917,29 @@ "Вывод был изменён.\n" "Если вы продолжите, изменения будут утеряны." -#: mergeresultwindow.cpp:936 pdiff.cpp:827 +#: mergeresultwindow.cpp:964 pdiff.cpp:817 #, kde-format msgid "All input files are binary equal." msgstr "Все входные файлы одинаковы на двоичном уровне." -#: mergeresultwindow.cpp:938 +#: mergeresultwindow.cpp:966 #, kde-format msgid "All input files contain the same text." msgstr "Все входные файлы содержат одинаковый текст." -#: mergeresultwindow.cpp:942 mergeresultwindow.cpp:946 -#: mergeresultwindow.cpp:950 pdiff.cpp:833 pdiff.cpp:837 pdiff.cpp:841 +#: mergeresultwindow.cpp:970 mergeresultwindow.cpp:974 +#: mergeresultwindow.cpp:978 pdiff.cpp:823 pdiff.cpp:827 pdiff.cpp:831 #, kde-format msgid "Files %1 and %2 are binary equal.\n" msgstr "Файлы %1 и %2 одинаковы на двоичном уровне.\n" -#: mergeresultwindow.cpp:944 mergeresultwindow.cpp:948 -#: mergeresultwindow.cpp:952 +#: mergeresultwindow.cpp:972 mergeresultwindow.cpp:976 +#: mergeresultwindow.cpp:980 #, kde-format msgid "Files %1 and %2 have equal text.\n" msgstr "Файлы %1 и %2 содержат одинаковый текст. \n" -#: mergeresultwindow.cpp:958 +#: mergeresultwindow.cpp:986 #, kde-format msgid "" "Total number of conflicts: %1\n" @@ -1937,27 +1948,27 @@ "%4" msgstr "" -#: mergeresultwindow.cpp:964 +#: mergeresultwindow.cpp:992 #, kde-format msgid "Conflicts" msgstr "Конфликты" -#: mergeresultwindow.cpp:1873 +#: mergeresultwindow.cpp:1901 #, kde-format msgid "" msgstr "<Нет строки>" -#: mergeresultwindow.cpp:1881 +#: mergeresultwindow.cpp:1909 #, kde-format msgid "" msgstr "<Конфликт объединения (пустые промежутки)>" -#: mergeresultwindow.cpp:1883 mergeresultwindow.cpp:2755 +#: mergeresultwindow.cpp:1911 mergeresultwindow.cpp:2783 #, kde-format msgid "" msgstr "<Конфликт объединения>" -#: mergeresultwindow.cpp:2967 +#: mergeresultwindow.cpp:2995 #, fuzzy, kde-format #| msgid "" #| "Not all conflicts are solved yet.\n" @@ -1969,12 +1980,12 @@ "Не все конфликты разрешены.\n" "Файл не сохранён.\n" -#: mergeresultwindow.cpp:2969 mergeresultwindow.cpp:2978 +#: mergeresultwindow.cpp:2997 mergeresultwindow.cpp:3006 #, kde-format msgid "Conflicts Left" msgstr "Осталось конфликтов" -#: mergeresultwindow.cpp:2976 +#: mergeresultwindow.cpp:3004 #, fuzzy, kde-format #| msgid "" #| "There is a line end style conflict. Please choose the line end style " @@ -1989,7 +2000,7 @@ "вручную.\n" "Файл не сохранён.\n" -#: mergeresultwindow.cpp:2990 +#: mergeresultwindow.cpp:3018 #, kde-format msgid "" "\n" @@ -2000,62 +2011,62 @@ "\n" "Не удалось создать резервную копию. Файл не сохранён." -#: mergeresultwindow.cpp:2990 mergeresultwindow.cpp:3038 +#: mergeresultwindow.cpp:3018 mergeresultwindow.cpp:3066 #, kde-format msgid "File Save Error" msgstr "Ошибка сохранения файла" -#: mergeresultwindow.cpp:3038 +#: mergeresultwindow.cpp:3066 #, kde-format msgid "Error while writing." msgstr "Ошибка записи" -#: mergeresultwindow.cpp:3110 +#: mergeresultwindow.cpp:3138 #, fuzzy, kde-format #| msgid "Output" msgid "Output:" msgstr "Вывод" -#: mergeresultwindow.cpp:3123 mergeresultwindow.cpp:3315 +#: mergeresultwindow.cpp:3151 mergeresultwindow.cpp:3343 #, kde-format msgid "[Modified]" msgstr "[Изменён]" -#: mergeresultwindow.cpp:3130 +#: mergeresultwindow.cpp:3158 #, fuzzy, kde-format #| msgid "Encoding for saving" msgid "Encoding for saving:" msgstr "Кодировка для сохранения" -#: mergeresultwindow.cpp:3230 +#: mergeresultwindow.cpp:3258 #, kde-format msgid "Conflict" msgstr "Конфликт" -#: mergeresultwindow.cpp:3262 +#: mergeresultwindow.cpp:3290 #, fuzzy, kde-format #| msgid "Codec from" msgid "Codec from A: %1" msgstr "Кодировать из" -#: mergeresultwindow.cpp:3264 +#: mergeresultwindow.cpp:3292 #, fuzzy, kde-format #| msgid "Codec from" msgid "Codec from B: %1" msgstr "Кодировать из" -#: mergeresultwindow.cpp:3266 +#: mergeresultwindow.cpp:3294 #, fuzzy, kde-format #| msgid "Codec from" msgid "Codec from C: %1" msgstr "Кодировать из" -#: optiondialog.cpp:119 +#: optiondialog.cpp:121 #, kde-format msgid "Change Font" msgstr "" -#: optiondialog.cpp:135 optiondialog.cpp:145 +#: optiondialog.cpp:137 optiondialog.cpp:147 #, kde-format msgid "" "Font: %1, %2, %3\n" @@ -2063,125 +2074,125 @@ "Example:" msgstr "" -#: optiondialog.cpp:388 +#: optiondialog.cpp:390 #, kde-format msgid "Unicode" msgstr "Unicode" -#: optiondialog.cpp:389 +#: optiondialog.cpp:391 #, kde-format msgid "Latin1" msgstr "Latin1" -#: optiondialog.cpp:408 +#: optiondialog.cpp:410 #, kde-format msgid "Change this if non-ASCII characters are not displayed correctly." msgstr "Измените кодировку, если не ASCII символы не отображаются корректно." -#: optiondialog.cpp:491 +#: optiondialog.cpp:495 #, kde-format msgid "Configure" msgstr "Настроить" -#: optiondialog.cpp:568 +#: optiondialog.cpp:573 #, kde-format msgid "Font" msgstr "Шрифт" -#: optiondialog.cpp:570 +#: optiondialog.cpp:575 #, kde-format msgid "Editor & Diff Output Font" msgstr "Шрифт редактора и вывода различий" -#: optiondialog.cpp:589 +#: optiondialog.cpp:594 #, kde-format msgid "Application font" msgstr "" -#: optiondialog.cpp:594 +#: optiondialog.cpp:599 #, fuzzy, kde-format #| msgid "File Save Error" msgid "File view font" msgstr "Ошибка сохранения файла" -#: optiondialog.cpp:613 +#: optiondialog.cpp:618 #, fuzzy, kde-format #| msgid "Color" msgctxt "Title for color settings page" msgid "Color" msgstr "Цвет" -#: optiondialog.cpp:614 +#: optiondialog.cpp:619 #, kde-format msgid "Colors Settings" msgstr "Настройки цвета" -#: optiondialog.cpp:631 +#: optiondialog.cpp:644 #, kde-format msgid "Editor and Diff Views:" msgstr "Вид окна редактора и различий" -#: optiondialog.cpp:639 +#: optiondialog.cpp:652 #, kde-format msgid "Foreground color:" msgstr "Цвет текста:" -#: optiondialog.cpp:647 +#: optiondialog.cpp:660 #, kde-format msgid "Background color:" msgstr "Цвет фона:" -#: optiondialog.cpp:657 +#: optiondialog.cpp:670 #, kde-format msgid "Diff background color:" msgstr "Цвет фона различий:" -#: optiondialog.cpp:666 +#: optiondialog.cpp:679 #, kde-format msgid "Color A:" msgstr "Цвет A:" -#: optiondialog.cpp:675 +#: optiondialog.cpp:688 #, kde-format msgid "Color B:" msgstr "Цвет B:" -#: optiondialog.cpp:684 +#: optiondialog.cpp:697 #, kde-format msgid "Color C:" msgstr "Цвет C:" -#: optiondialog.cpp:692 +#: optiondialog.cpp:705 #, kde-format msgid "Conflict color:" msgstr "Цвет конфликтов:" -#: optiondialog.cpp:701 +#: optiondialog.cpp:714 #, kde-format msgid "Current range background color:" msgstr "Текущий промежуток цветов фона:" -#: optiondialog.cpp:710 +#: optiondialog.cpp:723 #, kde-format msgid "Current range diff background color:" msgstr "Текущий промежуток цветов цветов фона различий:" -#: optiondialog.cpp:718 +#: optiondialog.cpp:731 #, kde-format msgid "Color for manually aligned difference ranges:" msgstr "Цвет для вручную выравненных промежутков различий:" -#: optiondialog.cpp:725 +#: optiondialog.cpp:738 #, kde-format msgid "Directory Comparison View:" msgstr "Вид окна сравнения папок:" -#: optiondialog.cpp:731 +#: optiondialog.cpp:744 #, kde-format msgid "Newest file color:" msgstr "Цвет самых новых файлов:" -#: optiondialog.cpp:736 +#: optiondialog.cpp:749 #, kde-format msgid "" "Changing this color will only be effective when starting the next directory " @@ -2190,37 +2201,37 @@ "Изменение этого цвета будет иметь силу, только когда начнётся следующее " "сравнение папок." -#: optiondialog.cpp:741 +#: optiondialog.cpp:754 #, kde-format msgid "Oldest file color:" msgstr "Цвет самых старых файлов:" -#: optiondialog.cpp:750 +#: optiondialog.cpp:763 #, kde-format msgid "Middle age file color:" msgstr "Цвет файлов среднего возраста:" -#: optiondialog.cpp:759 +#: optiondialog.cpp:772 #, kde-format msgid "Color for missing files:" msgstr "Цвет для отсутствующих файлов:" -#: optiondialog.cpp:773 +#: optiondialog.cpp:786 #, kde-format msgid "Editor" msgstr "Редактор" -#: optiondialog.cpp:774 +#: optiondialog.cpp:787 #, kde-format msgid "Editor Behavior" msgstr "Поведение редактора" -#: optiondialog.cpp:787 +#: optiondialog.cpp:809 #, kde-format msgid "Tab inserts spaces" msgstr "Заменять табуляцию пробелами" -#: optiondialog.cpp:791 +#: optiondialog.cpp:813 #, kde-format msgid "" "On: Pressing tab generates the appropriate number of spaces.\n" @@ -2229,27 +2240,27 @@ "Вкл: нажатие Tab вставляет необходимое количество пробелов.\n" "Выкл: будет вставлен символ Tab." -#: optiondialog.cpp:796 +#: optiondialog.cpp:818 #, kde-format msgid "Tab size:" msgstr "Табуляция:" -#: optiondialog.cpp:803 +#: optiondialog.cpp:825 #, kde-format msgid "Auto indentation" msgstr "Проставлять отступы автоматически" -#: optiondialog.cpp:807 +#: optiondialog.cpp:829 #, kde-format msgid "On: The indentation of the previous line is used for a new line.\n" msgstr "Вкл: отступы предыдущей строки будут использованы для новой строки.\n" -#: optiondialog.cpp:810 +#: optiondialog.cpp:832 #, kde-format msgid "Auto copy selection" msgstr "Копировать выделение в буфер обмена автоматически" -#: optiondialog.cpp:814 +#: optiondialog.cpp:836 #, fuzzy, kde-format #| msgid "" #| "On: Any selection is immediately written to the clipboard.\n" @@ -2261,7 +2272,7 @@ "Вкл: любое выделение сразу же записывается в буфер обмена.\n" "Выкл: вы должны явно скопировать, например, с помощью Ctrl-C." -#: optiondialog.cpp:829 +#: optiondialog.cpp:851 #, kde-format msgid "" "Sets the line endings for when an edited file is saved.\n" @@ -2270,12 +2281,12 @@ "Устанавливает перевод строки при сохранении редактируемого файла.\n" "DOS/Windows: CR+LF; UNIX: LF; здесь CR=0D, LF=0A" -#: optiondialog.cpp:839 +#: optiondialog.cpp:861 #, kde-format msgid "Diff" msgstr "Diff" -#: optiondialog.cpp:840 +#: optiondialog.cpp:862 #, kde-format msgid "Diff Settings" msgstr "Настройки сравнения и объединения" @@ -2289,13 +2300,13 @@ #. ); #. ++line; #. -#: optiondialog.cpp:865 +#: optiondialog.cpp:896 #, fuzzy, kde-format #| msgid "Treat as white space." msgid "Ignore numbers (treat as white space)" msgstr "Обрабатывать как пробелы." -#: optiondialog.cpp:869 +#: optiondialog.cpp:900 #, kde-format msgid "" "Ignore number characters during line matching phase. (Similar to Ignore " @@ -2306,46 +2317,46 @@ "пробелы.)\n" "Может помочь при сравнении файлов с численными данными." -#: optiondialog.cpp:873 +#: optiondialog.cpp:904 #, fuzzy, kde-format #| msgid "Treat C/C++ comments like white space." msgid "Ignore C/C++ comments (treat as white space)" msgstr "Обрабатывать комментарии C/C++ как пробелы." -#: optiondialog.cpp:876 +#: optiondialog.cpp:907 #, kde-format msgid "Treat C/C++ comments like white space." msgstr "Обрабатывать комментарии C/C++ как пробелы." -#: optiondialog.cpp:879 +#: optiondialog.cpp:910 #, fuzzy, kde-format #| msgid "Treat as white space." msgid "Ignore case (treat as white space)" msgstr "Обрабатывать как пробелы." -#: optiondialog.cpp:883 +#: optiondialog.cpp:914 #, kde-format msgid "Treat case differences like white space changes. ('a'<=>'A')" msgstr "Обрабатывать различие в регистре как изменения в пробелах. («a»<=>«A»)" -#: optiondialog.cpp:886 +#: optiondialog.cpp:917 #, kde-format msgid "Preprocessor command:" msgstr "Предварительная команда:" -#: optiondialog.cpp:891 +#: optiondialog.cpp:922 #, kde-format msgid "User defined pre-processing. (See the docs for details.)" msgstr "" "Предварительная обработка, определяемая пользователем (для подробностей см. " "документацию)." -#: optiondialog.cpp:894 +#: optiondialog.cpp:925 #, kde-format msgid "Line-matching preprocessor command:" msgstr "Предварительная команда для сравнения строк:" -#: optiondialog.cpp:899 +#: optiondialog.cpp:930 #, kde-format msgid "" "This pre-processor is only used during line matching.\n" @@ -2355,12 +2366,12 @@ "строк.\n" "(Подробности см. в документации)" -#: optiondialog.cpp:902 +#: optiondialog.cpp:933 #, kde-format msgid "Try hard (slower)" msgstr "Задействовать все алгоритмы (медленно)" -#: optiondialog.cpp:906 +#: optiondialog.cpp:937 #, kde-format msgid "" "Enables the --minimal option for the external diff.\n" @@ -2369,12 +2380,12 @@ "Включить опцию --minimal для внешних программ diff.\n" "Анализ больших файлов будет намного медленнее." -#: optiondialog.cpp:910 +#: optiondialog.cpp:941 #, kde-format msgid "Align B and C for 3 input files" msgstr "Выравнять B и C для 3 входных файлов" -#: optiondialog.cpp:914 +#: optiondialog.cpp:945 #, kde-format msgid "" "Try to align B and C when comparing or merging three input files.\n" @@ -2386,17 +2397,24 @@ "Не рекомендуется для объединения, поскольку может усложнить процесс.\n" "(По умолчанию выключено)" -#: optiondialog.cpp:926 +#: optiondialog.cpp:956 +#, fuzzy, kde-format +#| msgid "Merge" +msgctxt "Settings page" +msgid "Merge" +msgstr "Объединить" + +#: optiondialog.cpp:957 #, kde-format msgid "Merge Settings" msgstr "Настройки объединения" -#: optiondialog.cpp:940 +#: optiondialog.cpp:980 #, kde-format msgid "Auto advance delay (ms):" msgstr "Задержка перед переходом, мс:" -#: optiondialog.cpp:946 +#: optiondialog.cpp:986 #, kde-format msgid "" "When in Auto-Advance mode the result of the current selection is shown \n" @@ -2405,27 +2423,27 @@ "Показывать результат текущего выбора на некоторое время, а затем переходить " "к следующему конфликту. Диапазон: 0..2000 мс" -#: optiondialog.cpp:950 +#: optiondialog.cpp:990 #, kde-format msgid "Show info dialogs" msgstr "Отображать информационные окна" -#: optiondialog.cpp:953 +#: optiondialog.cpp:993 #, kde-format msgid "Show a dialog with information about the number of conflicts." msgstr "Отображать окно с информацией о количестве конфликтов." -#: optiondialog.cpp:956 +#: optiondialog.cpp:996 #, kde-format msgid "White space 2-file merge default:" msgstr "Пустые промежутки при объединении двух файлов:" -#: optiondialog.cpp:961 optiondialog.cpp:974 +#: optiondialog.cpp:1001 optiondialog.cpp:1014 #, kde-format msgid "Manual Choice" msgstr "Выбор вручную" -#: optiondialog.cpp:965 optiondialog.cpp:979 +#: optiondialog.cpp:1005 optiondialog.cpp:1019 #, kde-format msgid "" "Allow the merge algorithm to automatically select an input for white-space-" @@ -2434,22 +2452,22 @@ "Позволить алгоритму объединения автоматически выбирать входной для изменений " "только с пробелами." -#: optiondialog.cpp:969 +#: optiondialog.cpp:1009 #, kde-format msgid "White space 3-file merge default:" msgstr "Пустые промежутки при объединении трёх файлов:" -#: optiondialog.cpp:983 +#: optiondialog.cpp:1023 #, kde-format msgid "Automatic Merge Regular Expression" msgstr "Регулярное выражение автоматического объединения" -#: optiondialog.cpp:991 smalldialogs.cpp:449 +#: optiondialog.cpp:1031 smalldialogs.cpp:459 #, kde-format msgid "Auto merge regular expression:" msgstr "Регулярное выражения автоматического объединения:" -#: optiondialog.cpp:996 +#: optiondialog.cpp:1036 #, kde-format msgid "" "Regular expression for lines where KDiff3 should automatically choose one " @@ -2462,14 +2480,14 @@ "Когда строка с конфликтом соответствует регулярному выражению, тогда,\n" "если доступно, будет выбрано C, иначе — B." -#: optiondialog.cpp:1002 +#: optiondialog.cpp:1042 #, kde-format msgid "Run regular expression auto merge on merge start" msgstr "" "Запустить автоматическое объединение по регулярному выражению в начале " "процесса объединения" -#: optiondialog.cpp:1005 +#: optiondialog.cpp:1045 #, kde-format msgid "" "Run the merge for auto merge regular expressions\n" @@ -2478,17 +2496,17 @@ "Запустить объединение для автоматически объединяемых регулярных выражений\n" "сразу же после начала процесса объединения.\n" -#: optiondialog.cpp:1010 +#: optiondialog.cpp:1050 #, kde-format msgid "Version Control History Merging" msgstr "Объединение истории системы контроля версий" -#: optiondialog.cpp:1018 smalldialogs.cpp:476 +#: optiondialog.cpp:1058 smalldialogs.cpp:486 #, kde-format msgid "History start regular expression:" msgstr "Регулярное выражения начала истории:" -#: optiondialog.cpp:1023 +#: optiondialog.cpp:1063 #, kde-format msgid "" "Regular expression for the start of the version control history entry.\n" @@ -2499,12 +2517,12 @@ "Обычно эта строка содержит ключевое слово «$Log$».\n" "Значение по умолчанию: «.*\\$Log.*\\$.*»" -#: optiondialog.cpp:1029 smalldialogs.cpp:504 +#: optiondialog.cpp:1069 smalldialogs.cpp:514 #, kde-format msgid "History entry start regular expression:" msgstr "Регулярное выражения начала пункта истории." -#: optiondialog.cpp:1042 +#: optiondialog.cpp:1082 #, kde-format msgid "" "A version control history entry consists of several lines.\n" @@ -2524,22 +2542,22 @@ "пункты истории.\n" "Подробности см. в документации." -#: optiondialog.cpp:1050 +#: optiondialog.cpp:1090 #, kde-format msgid "History merge sorting" msgstr "Сортировка объединения истории" -#: optiondialog.cpp:1053 +#: optiondialog.cpp:1093 #, kde-format msgid "Sort version control history by a key." msgstr "Сортировать историю системы контроля версий по ключу." -#: optiondialog.cpp:1063 +#: optiondialog.cpp:1103 #, kde-format msgid "History entry start sort key order:" msgstr "Порядок ключей сортировки начала пункта истории" -#: optiondialog.cpp:1068 +#: optiondialog.cpp:1108 #, kde-format msgid "" "Each pair of parentheses used in the regular expression for the history " @@ -2557,41 +2575,41 @@ "Если оставить пустым, то сортировка производится не будет.\n" "Подробности см. в документации." -#: optiondialog.cpp:1079 +#: optiondialog.cpp:1119 #, kde-format msgid "Merge version control history on merge start" msgstr "" "Объединить историю системы контроля версий в начале процесса объединения." -#: optiondialog.cpp:1082 +#: optiondialog.cpp:1122 #, kde-format msgid "Run version control history automerge on merge start." msgstr "" "Запустить автоматическое объединение истории системы контроля версий в " "начале процесса объединения." -#: optiondialog.cpp:1086 +#: optiondialog.cpp:1126 #, kde-format msgid "Max number of history entries:" msgstr "Максимальное количество пунктов истории:" -#: optiondialog.cpp:1090 +#: optiondialog.cpp:1130 #, kde-format msgid "Cut off after specified number. Use -1 for infinite number of entries." msgstr "" "Вырезать начиная с указанного числа. Используйте -1 для всех пунктов истории." -#: optiondialog.cpp:1094 +#: optiondialog.cpp:1134 #, kde-format msgid "Test your regular expressions" msgstr "Проверка ваших регулярных выражений" -#: optiondialog.cpp:1099 +#: optiondialog.cpp:1139 #, kde-format msgid "Irrelevant merge command:" msgstr "Ошибочная команда объединения:" -#: optiondialog.cpp:1104 +#: optiondialog.cpp:1144 #, kde-format msgid "" "If specified this script is run after automerge\n" @@ -2602,12 +2620,12 @@ "когда не обнаружены другие относящие к делу изменения.\n" "Запускается с параметрами: файл1 файл2 файл3" -#: optiondialog.cpp:1109 +#: optiondialog.cpp:1149 #, kde-format msgid "Auto save and quit on merge without conflicts" msgstr "Автоматически сохранить и выйти, при объединении без конфликтов" -#: optiondialog.cpp:1113 +#: optiondialog.cpp:1153 #, kde-format msgid "" "If KDiff3 was started for a file-merge from the command line and all\n" @@ -2620,27 +2638,27 @@ "и выйти.\n" "(Подобно опции командной строки «--auto».)" -#: optiondialog.cpp:1124 optiondialog.cpp:1125 +#: optiondialog.cpp:1164 optiondialog.cpp:1165 #, kde-format msgid "Directory" msgstr "Папка" -#: optiondialog.cpp:1137 +#: optiondialog.cpp:1185 #, kde-format msgid "Recursive directories" msgstr "Рекурсивно по папкам" -#: optiondialog.cpp:1140 +#: optiondialog.cpp:1188 #, kde-format msgid "Whether to analyze subdirectories or not." msgstr "Нужно ли анализировать подпапки." -#: optiondialog.cpp:1142 +#: optiondialog.cpp:1190 #, kde-format msgid "File pattern(s):" msgstr "Маски файлов:" -#: optiondialog.cpp:1148 +#: optiondialog.cpp:1196 #, kde-format msgid "" "Pattern(s) of files to be analyzed. \n" @@ -2651,12 +2669,12 @@ "Шаблоны: «*» и «?»\n" "Несколько масок можно указать, используя разделитель: «;»" -#: optiondialog.cpp:1153 +#: optiondialog.cpp:1201 #, kde-format msgid "File-anti-pattern(s):" msgstr "Пропускать файлы по маске:" -#: optiondialog.cpp:1159 +#: optiondialog.cpp:1207 #, kde-format msgid "" "Pattern(s) of files to be excluded from analysis. \n" @@ -2667,12 +2685,12 @@ "Шаблоны: «*» и «?»\n" "Несколько масок можно указать, используя разделитель «;»" -#: optiondialog.cpp:1164 +#: optiondialog.cpp:1212 #, kde-format msgid "Dir-anti-pattern(s):" msgstr "Пропускать папки по маске:" -#: optiondialog.cpp:1170 +#: optiondialog.cpp:1218 #, kde-format msgid "" "Pattern(s) of directories to be excluded from analysis. \n" @@ -2683,12 +2701,12 @@ "Шаблоны: «*» и «?»\n" "Несколько масок можно указать, используя разделитель «;»" -#: optiondialog.cpp:1175 +#: optiondialog.cpp:1223 #, kde-format msgid "Use .cvsignore" msgstr "Использовать .cvsignore" -#: optiondialog.cpp:1179 +#: optiondialog.cpp:1227 #, kde-format msgid "" "Extends the antipattern to anything that would be ignored by CVS.\n" @@ -2698,23 +2716,23 @@ "Посредством локальных файлов «.cvsignore», правила могут меняться от папки к " "папке." -#: optiondialog.cpp:1183 +#: optiondialog.cpp:1231 #, kde-format msgid "Find hidden files and directories" msgstr "Учитывать скрытые файлы и папки" -#: optiondialog.cpp:1186 +#: optiondialog.cpp:1234 #, fuzzy, kde-format #| msgid "Find hidden files and directories" msgid "Finds hidden files and directories." msgstr "Учитывать скрытые файлы и папки" -#: optiondialog.cpp:1189 +#: optiondialog.cpp:1237 #, kde-format msgid "Follow file links" msgstr "Следовать по ссылкам на файлы" -#: optiondialog.cpp:1193 +#: optiondialog.cpp:1241 #, kde-format msgid "" "On: Compare the file the link points to.\n" @@ -2723,12 +2741,12 @@ "Вкл: Сравнивать файл, на который ссылка указывает.\n" "Выкл: Сравнивать ссылки." -#: optiondialog.cpp:1197 +#: optiondialog.cpp:1245 #, kde-format msgid "Follow directory links" msgstr "Следовать по ссылкам на папки" -#: optiondialog.cpp:1201 +#: optiondialog.cpp:1249 #, kde-format msgid "" "On: Compare the directory the link points to.\n" @@ -2737,12 +2755,12 @@ "Вкл: Сравнивать папку, на которую указывает ссылка.\n" "Выкл: Сравнивать ссылки." -#: optiondialog.cpp:1210 +#: optiondialog.cpp:1258 #, kde-format msgid "Case sensitive filename comparison" msgstr "Сравнение имён файлов и учётом регистра" -#: optiondialog.cpp:1214 +#: optiondialog.cpp:1262 #, kde-format msgid "" "The directory comparison will compare files or directories when their names " @@ -2754,52 +2772,52 @@ "Включите этот параметр, если регистр названий должен соответствовать. (По " "умолчанию на Windows Выкл, иначе Вкл.)" -#: optiondialog.cpp:1218 +#: optiondialog.cpp:1266 #, fuzzy, kde-format #| msgid "Unfold All Subdirs" msgid "Unfold all subdirectories on load" msgstr "Исключая все подкаталоги" -#: optiondialog.cpp:1222 +#: optiondialog.cpp:1270 #, kde-format msgid "" "On: Unfold all subdirectories when starting a directory diff.\n" "Off: Leave subdirectories folded." msgstr "" -#: optiondialog.cpp:1226 +#: optiondialog.cpp:1274 #, kde-format msgid "Skip directory status report" msgstr "" -#: optiondialog.cpp:1230 +#: optiondialog.cpp:1278 #, kde-format msgid "" "On: Do not show the Directory Comparison Status.\n" "Off: Show the status dialog on start." msgstr "" -#: optiondialog.cpp:1234 +#: optiondialog.cpp:1282 #, kde-format msgid "File Comparison Mode" msgstr "Режим сравнивания файлов" -#: optiondialog.cpp:1239 +#: optiondialog.cpp:1287 #, kde-format msgid "Binary comparison" msgstr "Бинарное сравнение" -#: optiondialog.cpp:1241 +#: optiondialog.cpp:1289 #, kde-format msgid "Binary comparison of each file. (Default)" msgstr "Бинарное сравнение каждого файла (по умолчанию)" -#: optiondialog.cpp:1244 +#: optiondialog.cpp:1292 #, kde-format msgid "Full analysis" msgstr "Полный анализ" -#: optiondialog.cpp:1246 +#: optiondialog.cpp:1294 #, kde-format msgid "" "Do a full analysis and show statistics information in extra columns.\n" @@ -2809,12 +2827,12 @@ "столбцах.\n" "(Медленнее чем двоичное сравнение, намного медленнее для двоичных файлов.)" -#: optiondialog.cpp:1250 +#: optiondialog.cpp:1298 #, kde-format msgid "Trust the size and modification date (unsafe)" msgstr "Сравнивать по размеру и дате изменения (неточно)" -#: optiondialog.cpp:1252 +#: optiondialog.cpp:1300 #, kde-format msgid "" "Assume that files are equal if the modification date and file length are " @@ -2828,7 +2846,7 @@ "отображаться как разные.\n" "Полезно для больших папок или медленных сетей." -#: optiondialog.cpp:1257 +#: optiondialog.cpp:1305 #, kde-format msgid "" "Trust the size and date, but use binary comparison if date does not match " @@ -2837,7 +2855,7 @@ "Сравнивать по размеру и дате, но использовать двоичное сравнение, если даты " "не совпадают (неточно)" -#: optiondialog.cpp:1259 +#: optiondialog.cpp:1307 #, kde-format msgid "" "Assume that files are equal if the modification date and file length are " @@ -2850,12 +2868,12 @@ "сравнение.\n" "Полезно для больших папок или медленных сетей." -#: optiondialog.cpp:1264 +#: optiondialog.cpp:1312 #, kde-format msgid "Trust the size (unsafe)" msgstr "Сравнивать по размеру (неточно)" -#: optiondialog.cpp:1266 +#: optiondialog.cpp:1314 #, kde-format msgid "" "Assume that files are equal if their file lengths are equal.\n" @@ -2866,12 +2884,12 @@ "Полезно для больших папок или медленных сетей, когда дата изменяется во " "время скачивания." -#: optiondialog.cpp:1273 +#: optiondialog.cpp:1321 #, kde-format msgid "Synchronize directories" msgstr "Синхронизировать папки" -#: optiondialog.cpp:1277 +#: optiondialog.cpp:1325 #, kde-format msgid "" "Offers to store files in both directories so that\n" @@ -2882,12 +2900,12 @@ "обе папки будут одинаковы.\n" "Работает только при сравнении двух папок без указания назначения." -#: optiondialog.cpp:1283 +#: optiondialog.cpp:1331 #, kde-format msgid "White space differences considered equal" msgstr "Отличия в пробелах рассматриваются одинаково" -#: optiondialog.cpp:1287 +#: optiondialog.cpp:1335 #, kde-format msgid "" "If files differ only by white space consider them equal.\n" @@ -2896,12 +2914,12 @@ "Если файлы отличаются только пробелами, рассматривать их как одинаковые.\n" "Эта опция Вкл только если выбран полный анализ." -#: optiondialog.cpp:1293 +#: optiondialog.cpp:1341 #, kde-format msgid "Copy newer instead of merging (unsafe)" msgstr "Принимать сразу новые файлы вместо объединения (небезопасно)" -#: optiondialog.cpp:1297 +#: optiondialog.cpp:1345 #, fuzzy, kde-format #| msgid "" #| "Don't look inside, just take the newer file.\n" @@ -2916,12 +2934,12 @@ "(Используйте только если вы знаете, что вы делаете!)\n" "Имеет силу при сравнении двух каталогов." -#: optiondialog.cpp:1302 +#: optiondialog.cpp:1350 #, kde-format msgid "Backup files (.orig)" msgstr "Сохранить резервные копии (.orig)" -#: optiondialog.cpp:1306 +#: optiondialog.cpp:1354 #, kde-format msgid "" "If a file would be saved over an old file, then the old file\n" @@ -2930,17 +2948,17 @@ "Если файл будет сохранён поверх старого, то старых файл\n" "будет переименован с расширением «.orig» вместо его удаления." -#: optiondialog.cpp:1382 optiondialog.cpp:1383 +#: optiondialog.cpp:1430 optiondialog.cpp:1431 #, kde-format msgid "Regional Settings" msgstr "Региональные настройки" -#: optiondialog.cpp:1397 +#: optiondialog.cpp:1454 #, kde-format msgid "Use the same encoding for everything:" msgstr "Использовать ту же самую кодировку для остальных:" -#: optiondialog.cpp:1401 +#: optiondialog.cpp:1458 #, kde-format msgid "" "Enable this allows to change all encodings by changing the first only.\n" @@ -2949,18 +2967,18 @@ "Включая эту опцию позволяет изменить все кодировки изменяя только первую.\n" "Выключите эту опцию, если нужны различные индивидуальные настройки." -#: optiondialog.cpp:1405 +#: optiondialog.cpp:1462 #, fuzzy, kde-format #| msgid "Note: Local Encoding is " msgid "Note: Local Encoding is \"%1\"" msgstr "Примечание: локальная кодировка — " -#: optiondialog.cpp:1409 +#: optiondialog.cpp:1466 #, kde-format msgid "File Encoding for A:" msgstr "Кодировка файла A:" -#: optiondialog.cpp:1416 +#: optiondialog.cpp:1473 #, kde-format msgid "" "If enabled then Unicode (UTF-16 or UTF-8) encoding will be detected.\n" @@ -2973,32 +2991,32 @@ "кодировка по умолчанию.\n" "(Определение Unicode зависит от первых байтов файла.)" -#: optiondialog.cpp:1419 optiondialog.cpp:1430 optiondialog.cpp:1441 +#: optiondialog.cpp:1476 optiondialog.cpp:1487 optiondialog.cpp:1498 #, kde-format msgid "Auto Detect Unicode" msgstr "Автоматическое обнаружение Unicode" -#: optiondialog.cpp:1425 +#: optiondialog.cpp:1482 #, kde-format msgid "File Encoding for B:" msgstr "Кодировка файла B:" -#: optiondialog.cpp:1436 +#: optiondialog.cpp:1493 #, kde-format msgid "File Encoding for C:" msgstr "Кодировка файла C:" -#: optiondialog.cpp:1447 +#: optiondialog.cpp:1504 #, kde-format msgid "File Encoding for Merge Output and Saving:" msgstr "Кодировка для объединения и сохранения:" -#: optiondialog.cpp:1452 +#: optiondialog.cpp:1509 #, kde-format msgid "Auto Select" msgstr "Копировать выделение в буфер обмена автоматически" -#: optiondialog.cpp:1456 +#: optiondialog.cpp:1513 #, kde-format msgid "" "If enabled then the encoding from the input files is used.\n" @@ -3008,17 +3026,17 @@ "Если опция включена, то используется кодировка из входных файлов.\n" "В случаях затруднений появится окно с выбором кодировки для сохранения." -#: optiondialog.cpp:1459 +#: optiondialog.cpp:1516 #, kde-format msgid "File Encoding for Preprocessor Files:" msgstr "Кодировка препроцессора:" -#: optiondialog.cpp:1471 +#: optiondialog.cpp:1528 #, kde-format msgid "Right To Left Language" msgstr "Язык справа налево" -#: optiondialog.cpp:1475 +#: optiondialog.cpp:1532 #, kde-format msgid "" "Some languages are read from right to left.\n" @@ -3027,22 +3045,22 @@ "Некоторые языки читаются справа налево.\n" "Эта опция изменяет просмотр и редактор соответственно." -#: optiondialog.cpp:1485 +#: optiondialog.cpp:1542 #, kde-format msgid "Integration" msgstr "Действие" -#: optiondialog.cpp:1486 +#: optiondialog.cpp:1543 #, kde-format msgid "Integration Settings" msgstr "Региональные настройки" -#: optiondialog.cpp:1499 +#: optiondialog.cpp:1564 #, kde-format msgid "Command line options to ignore:" msgstr "Пропускаемые опции командной строки:" -#: optiondialog.cpp:1505 +#: optiondialog.cpp:1570 #, kde-format msgid "" "List of command line options that should be ignored when KDiff3 is used by " @@ -3055,12 +3073,12 @@ "Можно указать несколько значений, разделив символом «;»\n" "Эта опция будет подавлять ошибку «Неизвестная опция»." -#: optiondialog.cpp:1510 +#: optiondialog.cpp:1575 #, kde-format msgid "Quit also via Escape key" msgstr "Выход также по клавише Escape" -#: optiondialog.cpp:1514 +#: optiondialog.cpp:1579 #, kde-format msgid "" "Fast method to exit.\n" @@ -3069,7 +3087,7 @@ "Быстрый способ выйти.\n" "Для тех, что привык использовать клавишу Escape." -#: optiondialog.cpp:1598 +#: optiondialog.cpp:1653 #, kde-format msgid "This resets all options. Not only those of the current topic." msgstr "Это сбросит абсолютно все параметры, а не только текущей вкладки." @@ -3125,77 +3143,68 @@ msgid "Disable Unsafe Options" msgstr "Отключить небезопасные" -#: pdiff.cpp:158 +#: pdiff.cpp:160 #, kde-format msgid "Loading A" msgstr "Загрузка A" -#: pdiff.cpp:167 -#, kde-format -msgid "Errors occurred during pre-processing of file A." -msgstr "" +#: pdiff.cpp:162 +#, fuzzy, kde-format +#| msgid "Loading A" +msgid "Loading A: %1" +msgstr "Загрузка A" -#: pdiff.cpp:172 +#: pdiff.cpp:170 #, kde-format msgid "Loading B" msgstr "Загрузка B" -#: pdiff.cpp:179 -#, kde-format -msgid "Errors occurred during pre-processing of file B." -msgstr "" - -#: pdiff.cpp:202 pdiff.cpp:241 +#: pdiff.cpp:201 pdiff.cpp:237 #, kde-format msgid "Diff: A <-> B" msgstr "Различие: A <-> B" -#: pdiff.cpp:208 pdiff.cpp:279 pdiff.cpp:293 +#: pdiff.cpp:207 pdiff.cpp:275 pdiff.cpp:289 #, kde-format msgid "Linediff: A <-> B" msgstr "Построчное сравнение: A <-> B" -#: pdiff.cpp:225 +#: pdiff.cpp:224 #, kde-format msgid "Loading C" msgstr "Загрузка C" -#: pdiff.cpp:232 -#, kde-format -msgid "Errors occurred during pre-processing of file C." -msgstr "" - -#: pdiff.cpp:250 +#: pdiff.cpp:246 #, kde-format msgid "Diff: A <-> C" msgstr "Различие: A <-> C" -#: pdiff.cpp:261 +#: pdiff.cpp:257 #, kde-format msgid "Diff: B <-> C" msgstr "Различие: B <-> C" -#: pdiff.cpp:283 pdiff.cpp:297 +#: pdiff.cpp:279 pdiff.cpp:293 #, kde-format msgid "Linediff: B <-> C" msgstr "Построчное сравнение: B <-> C" -#: pdiff.cpp:287 pdiff.cpp:301 +#: pdiff.cpp:283 pdiff.cpp:297 #, kde-format msgid "Linediff: A <-> C" msgstr "Построчное сравнение: A <-> C" -#: pdiff.cpp:829 +#: pdiff.cpp:819 #, kde-format msgid "All input files contain the same text, but are not binary equal." msgstr "Все входные файлы содержат одинаковый текст, но двоично не совпадают." -#: pdiff.cpp:835 pdiff.cpp:839 pdiff.cpp:843 +#: pdiff.cpp:825 pdiff.cpp:829 pdiff.cpp:833 #, kde-format msgid "Files %1 and %2 have equal text, but are not binary equal. \n" msgstr "Файлы %1 и %2 имеют одинаковый текст, но двоично не совпадают.\n" -#: pdiff.cpp:853 +#: pdiff.cpp:843 #, fuzzy, kde-format #| msgid "" #| "Some inputfiles don't seem to be pure textfiles.\n" @@ -3210,17 +3219,17 @@ "Заметим, что объединение в KDiff3 не предназначено для двоичных данных.\n" "Продолжайте на свой страх и риск." -#: pdiff.cpp:863 +#: pdiff.cpp:853 #, kde-format msgid ", B" msgstr "" -#: pdiff.cpp:865 +#: pdiff.cpp:855 #, kde-format msgid ", C" msgstr "" -#: pdiff.cpp:867 +#: pdiff.cpp:857 #, fuzzy, kde-format #| msgid "" #| "Some input characters could not be converted to valid unicode.\n" @@ -3240,77 +3249,72 @@ "Не сохраняйте результат, если не уверены. Продолжайте на свой страх и риск.\n" "Сообщение касается файлов в %1." -#: pdiff.cpp:1034 +#: pdiff.cpp:1032 #, kde-format msgid "Abort" msgstr "Стоп" -#: pdiff.cpp:1040 pdiff.cpp:1130 +#: pdiff.cpp:1038 pdiff.cpp:1129 #, kde-format msgid "Opening files..." msgstr "Открытие файлов..." -#: pdiff.cpp:1107 -#, kde-format -msgid "File open error" -msgstr "Ошибка открытия файла" - -#: pdiff.cpp:1202 +#: pdiff.cpp:1212 #, kde-format msgid "Cutting selection..." msgstr "Вырезание в буфер обмена..." -#: pdiff.cpp:1223 +#: pdiff.cpp:1233 #, kde-format msgid "Copying selection to clipboard..." msgstr "Копирование в буфер обмена..." -#: pdiff.cpp:1239 +#: pdiff.cpp:1249 #, kde-format msgid "Inserting clipboard contents..." msgstr "Вставка из буфера обмена..." -#: pdiff.cpp:1695 +#: pdiff.cpp:1705 #, kde-format msgid "Word wrap (Cancel disables word wrap)" msgstr "" -#: pdiff.cpp:1696 +#: pdiff.cpp:1706 #, kde-format msgid "Calculating max width for horizontal scrollbar" msgstr "" -#: pdiff.cpp:1911 +#: pdiff.cpp:1921 #, kde-format msgid "Save && Continue" msgstr "Сохранить и продолжить" -#: pdiff.cpp:1912 +#: pdiff.cpp:1922 #, kde-format msgid "Continue Without Saving" msgstr "Продолжить без сохранения" -#: pdiff.cpp:2124 +#: pdiff.cpp:2134 #, kde-format msgid "Search complete." msgstr "Поиск завершён." -#: pdiff.cpp:2124 +#: pdiff.cpp:2134 #, kde-format msgid "Search Complete" msgstr "Поиск завершён" -#: pdiff.cpp:2375 +#: pdiff.cpp:2385 #, kde-format msgid "Nothing is selected in either diff input window." msgstr "Ничего не выбрано ни в одном из входных окон diff." -#: pdiff.cpp:2375 +#: pdiff.cpp:2385 #, kde-format msgid "Error while adding manual diff range" msgstr "Ошибка при добавлении вручную заданной области diff" -#: progress.cpp:59 progress.cpp:71 +#: progress.cpp:61 progress.cpp:73 #, kde-format msgid "&Cancel" msgstr "&Отмена" @@ -3320,127 +3324,127 @@ msgid "A (Base):" msgstr "A (исходное):" -#: smalldialogs.cpp:68 smalldialogs.cpp:85 smalldialogs.cpp:102 -#: smalldialogs.cpp:144 +#: smalldialogs.cpp:71 smalldialogs.cpp:90 smalldialogs.cpp:109 +#: smalldialogs.cpp:154 #, kde-format msgid "File..." msgstr "Файл..." -#: smalldialogs.cpp:70 smalldialogs.cpp:87 smalldialogs.cpp:104 -#: smalldialogs.cpp:146 +#: smalldialogs.cpp:73 smalldialogs.cpp:92 smalldialogs.cpp:111 +#: smalldialogs.cpp:156 #, kde-format msgid "Dir..." msgstr "Папка..." -#: smalldialogs.cpp:96 +#: smalldialogs.cpp:103 #, kde-format msgid "C (Optional):" msgstr "С (необязательно):" -#: smalldialogs.cpp:119 +#: smalldialogs.cpp:126 #, fuzzy, kde-format #| msgid "Swap/Copy Names ..." msgid "Swap/Copy Names..." msgstr "Поменять/копировать названия ..." -#: smalldialogs.cpp:124 smalldialogs.cpp:125 smalldialogs.cpp:126 +#: smalldialogs.cpp:131 smalldialogs.cpp:132 smalldialogs.cpp:133 #, kde-format msgid "Swap %1<->%2" msgstr "Поменять %1<->%2" -#: smalldialogs.cpp:127 smalldialogs.cpp:128 smalldialogs.cpp:129 +#: smalldialogs.cpp:134 smalldialogs.cpp:135 smalldialogs.cpp:136 #, kde-format msgid "Copy %1->Output" msgstr "Копировать %1->Вывод" -#: smalldialogs.cpp:130 smalldialogs.cpp:131 smalldialogs.cpp:132 +#: smalldialogs.cpp:137 smalldialogs.cpp:138 smalldialogs.cpp:139 #, kde-format msgid "Swap %1<->Output" msgstr "Поменять %1<->Вывод" -#: smalldialogs.cpp:138 +#: smalldialogs.cpp:148 #, kde-format msgid "Output (optional):" msgstr "Вывод (необязательно):" -#: smalldialogs.cpp:168 +#: smalldialogs.cpp:178 #, kde-format msgid "Configure..." msgstr "Настроить..." -#: smalldialogs.cpp:233 +#: smalldialogs.cpp:243 #, kde-format msgid "Open Directory" msgstr "Выбор папки" -#: smalldialogs.cpp:234 +#: smalldialogs.cpp:244 #, kde-format msgid "Select Output File" msgstr "" -#: smalldialogs.cpp:393 +#: smalldialogs.cpp:403 #, kde-format msgid "Search text:" msgstr "Найти:" -#: smalldialogs.cpp:400 +#: smalldialogs.cpp:410 #, kde-format msgid "Case sensitive" msgstr "С учётом регистра" -#: smalldialogs.cpp:403 +#: smalldialogs.cpp:413 #, kde-format msgid "Search A" msgstr "Поиск в A" -#: smalldialogs.cpp:408 +#: smalldialogs.cpp:418 #, kde-format msgid "Search B" msgstr "Поиск в B" -#: smalldialogs.cpp:413 +#: smalldialogs.cpp:423 #, kde-format msgid "Search C" msgstr "Поиск в C" -#: smalldialogs.cpp:418 +#: smalldialogs.cpp:428 #, kde-format msgid "Search output" msgstr "Поиск в выводе" -#: smalldialogs.cpp:425 +#: smalldialogs.cpp:435 #, kde-format msgid "&Search" msgstr "&Искать" -#: smalldialogs.cpp:444 +#: smalldialogs.cpp:454 #, kde-format msgid "Regular Expression Tester" msgstr "Проверка регулярного выражения" -#: smalldialogs.cpp:457 +#: smalldialogs.cpp:467 #, kde-format msgid "Example auto merge line:" msgstr "Образец автоматически объединяемая строка:" -#: smalldialogs.cpp:459 +#: smalldialogs.cpp:469 #, kde-format msgid "To test auto merge, copy a line as used in your files." msgstr "" "Чтобы опробовать автоматическое объединение, скопируйте строку из ваших " "файлов." -#: smalldialogs.cpp:465 smalldialogs.cpp:493 smalldialogs.cpp:529 +#: smalldialogs.cpp:475 smalldialogs.cpp:503 smalldialogs.cpp:539 #, kde-format msgid "Match result:" msgstr "Результат соответствия:" -#: smalldialogs.cpp:484 +#: smalldialogs.cpp:494 #, kde-format msgid "Example history start line (with leading comment):" msgstr "Образец строка начала истории (с комментарием в начале):" -#: smalldialogs.cpp:486 +#: smalldialogs.cpp:496 #, kde-format msgid "" "Copy a history start line as used in your files,\n" @@ -3449,17 +3453,17 @@ "Скопируйте строку начала истории из ваших файлов,\n" "включая комментарий в начале." -#: smalldialogs.cpp:512 +#: smalldialogs.cpp:522 #, kde-format msgid "History sort key order:" msgstr "Порядок сортировки ключей истории:" -#: smalldialogs.cpp:520 +#: smalldialogs.cpp:530 #, kde-format msgid "Example history entry start line (without leading comment):" msgstr "Образец начало строки пункта истории (без комментария в начале):" -#: smalldialogs.cpp:522 +#: smalldialogs.cpp:532 #, kde-format msgid "" "Copy a history entry start line as used in your files,\n" @@ -3468,48 +3472,48 @@ "Скопируйте начало строки пункта истории из ваших файлов, но без комментария " "в начале." -#: smalldialogs.cpp:536 +#: smalldialogs.cpp:546 #, kde-format msgid "Sort key result:" msgstr "Результат сортировки ключей:" -#: smalldialogs.cpp:584 smalldialogs.cpp:594 smalldialogs.cpp:614 +#: smalldialogs.cpp:594 smalldialogs.cpp:604 smalldialogs.cpp:624 #, kde-format msgid "Match success." msgstr "Соответствие найдено." -#: smalldialogs.cpp:588 smalldialogs.cpp:598 smalldialogs.cpp:620 +#: smalldialogs.cpp:598 smalldialogs.cpp:608 smalldialogs.cpp:630 #, kde-format msgid "Match failed." msgstr "Соответствие не найдено." -#: smalldialogs.cpp:605 +#: smalldialogs.cpp:615 #, kde-format msgid "Opening and closing parentheses do not match in regular expression." msgstr "Открывающие и закрывающие скобки не парные в регулярном выражении." -#: SourceData.cpp:150 +#: SourceData.cpp:153 #, kde-format msgid "Writing clipboard data to temp file failed." msgstr "Не удалось записать данные из буфера обмена во временный файл." -#: SourceData.cpp:154 +#: SourceData.cpp:157 #, kde-format msgid "From Clipboard" msgstr "Из буфера обмена" -#: SourceData.cpp:335 +#: SourceData.cpp:348 #, fuzzy, kde-format #| msgid "Mix of links and normal files." msgid "%1 is not a normal file." msgstr "Совмещение ссылок и обычных файлов" -#: SourceData.cpp:427 +#: SourceData.cpp:440 #, kde-format msgid " Temp file is: %1" msgstr "" -#: SourceData.cpp:432 +#: SourceData.cpp:445 #, kde-format msgid "" "Preprocessing possibly failed. Check this command:\n" @@ -3524,12 +3528,12 @@ "\n" "Команда предобработки будет отключена." -#: SourceData.cpp:443 SourceData.cpp:512 +#: SourceData.cpp:456 SourceData.cpp:525 #, kde-format msgid "File %1 too large to process. Skipping." msgstr "" -#: SourceData.cpp:487 +#: SourceData.cpp:500 #, kde-format msgid "" "The line-matching-preprocessing possibly failed. Check this command:\n" diff -Nru kdiff3-1.8.01/po/rw/kdiff3.po kdiff3-1.8.3/po/rw/kdiff3.po --- kdiff3-1.8.01/po/rw/kdiff3.po 2019-05-18 01:02:21.000000000 +0000 +++ kdiff3-1.8.3/po/rw/kdiff3.po 2020-06-25 00:18:47.000000000 +0000 @@ -15,8 +15,8 @@ msgid "" msgstr "" "Project-Id-Version: kdiff3 3.4\n" -"Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2019-04-18 08:02+0200\n" +"Report-Msgid-Bugs-To: https://bugs.kde.org\n" +"POT-Creation-Date: 2020-06-22 07:48+0200\n" "PO-Revision-Date: 2005-05-25 18:07-0600\n" "Last-Translator: Steve Murphy \n" "Language-Team: Kinyarwanda \n" @@ -35,335 +35,335 @@ msgid "Your emails" msgstr "" -#: difftextwindow.cpp:412 +#: difftextwindow.cpp:414 #, kde-format msgid "File %1: Line %2" msgstr "" -#: difftextwindow.cpp:414 +#: difftextwindow.cpp:416 #, fuzzy, kde-format msgid "File %1: Line not available" msgstr "Ntibonetse" -#: difftextwindow.cpp:1780 +#: difftextwindow.cpp:1778 #, fuzzy, kde-format msgid "Encoding:" msgstr "Idosiye ya: A : " -#: difftextwindow.cpp:1782 mergeresultwindow.cpp:3138 optiondialog.cpp:818 +#: difftextwindow.cpp:1781 mergeresultwindow.cpp:3166 optiondialog.cpp:840 #, fuzzy, kde-format msgid "Line end style:" msgstr "Impera Imisusire : " -#: difftextwindow.cpp:1810 directorymergewindow.cpp:382 -#: directorymergewindow.cpp:433 directorymergewindow.cpp:524 -#: directorymergewindow.cpp:3058 directorymergewindow.cpp:3189 -#: directorymergewindow.cpp:3417 mergeresultwindow.cpp:942 -#: mergeresultwindow.cpp:944 mergeresultwindow.cpp:946 -#: mergeresultwindow.cpp:948 mergeresultwindow.cpp:1814 -#: mergeresultwindow.cpp:3170 mergeresultwindow.cpp:3177 optiondialog.cpp:962 -#: optiondialog.cpp:975 pdiff.cpp:833 pdiff.cpp:835 pdiff.cpp:837 pdiff.cpp:839 -#: pdiff.cpp:861 smalldialogs.cpp:124 smalldialogs.cpp:126 smalldialogs.cpp:127 -#: smalldialogs.cpp:130 +#: difftextwindow.cpp:1809 directorymergewindow.cpp:383 +#: directorymergewindow.cpp:434 directorymergewindow.cpp:525 +#: directorymergewindow.cpp:3072 directorymergewindow.cpp:3203 +#: directorymergewindow.cpp:3431 mergeresultwindow.cpp:970 +#: mergeresultwindow.cpp:972 mergeresultwindow.cpp:974 +#: mergeresultwindow.cpp:976 mergeresultwindow.cpp:1842 +#: mergeresultwindow.cpp:3198 mergeresultwindow.cpp:3205 optiondialog.cpp:1002 +#: optiondialog.cpp:1015 pdiff.cpp:823 pdiff.cpp:825 pdiff.cpp:827 +#: pdiff.cpp:829 pdiff.cpp:851 smalldialogs.cpp:131 smalldialogs.cpp:133 +#: smalldialogs.cpp:134 smalldialogs.cpp:137 #, kde-format msgid "A" msgstr "A" -#: difftextwindow.cpp:1810 directorymergewindow.cpp:384 -#: directorymergewindow.cpp:436 directorymergewindow.cpp:526 -#: directorymergewindow.cpp:3064 directorymergewindow.cpp:3190 -#: directorymergewindow.cpp:3418 mergeresultwindow.cpp:942 -#: mergeresultwindow.cpp:944 mergeresultwindow.cpp:950 -#: mergeresultwindow.cpp:952 mergeresultwindow.cpp:1816 -#: mergeresultwindow.cpp:3172 mergeresultwindow.cpp:3179 optiondialog.cpp:963 -#: optiondialog.cpp:976 pdiff.cpp:833 pdiff.cpp:835 pdiff.cpp:841 pdiff.cpp:843 -#: pdiff.cpp:863 smalldialogs.cpp:124 smalldialogs.cpp:125 smalldialogs.cpp:128 -#: smalldialogs.cpp:131 +#: difftextwindow.cpp:1809 directorymergewindow.cpp:385 +#: directorymergewindow.cpp:437 directorymergewindow.cpp:527 +#: directorymergewindow.cpp:3078 directorymergewindow.cpp:3204 +#: directorymergewindow.cpp:3432 mergeresultwindow.cpp:970 +#: mergeresultwindow.cpp:972 mergeresultwindow.cpp:978 +#: mergeresultwindow.cpp:980 mergeresultwindow.cpp:1844 +#: mergeresultwindow.cpp:3200 mergeresultwindow.cpp:3207 optiondialog.cpp:1003 +#: optiondialog.cpp:1016 pdiff.cpp:823 pdiff.cpp:825 pdiff.cpp:831 +#: pdiff.cpp:833 pdiff.cpp:853 smalldialogs.cpp:131 smalldialogs.cpp:132 +#: smalldialogs.cpp:135 smalldialogs.cpp:138 #, kde-format msgid "B" msgstr "B" -#: difftextwindow.cpp:1810 directorymergewindow.cpp:386 -#: directorymergewindow.cpp:439 directorymergewindow.cpp:528 -#: directorymergewindow.cpp:3070 directorymergewindow.cpp:3191 -#: directorymergewindow.cpp:3419 mergeresultwindow.cpp:946 -#: mergeresultwindow.cpp:948 mergeresultwindow.cpp:950 -#: mergeresultwindow.cpp:952 mergeresultwindow.cpp:1818 -#: mergeresultwindow.cpp:3174 mergeresultwindow.cpp:3181 optiondialog.cpp:977 -#: pdiff.cpp:837 pdiff.cpp:839 pdiff.cpp:841 pdiff.cpp:843 pdiff.cpp:865 -#: smalldialogs.cpp:125 smalldialogs.cpp:126 smalldialogs.cpp:129 -#: smalldialogs.cpp:132 +#: difftextwindow.cpp:1809 directorymergewindow.cpp:387 +#: directorymergewindow.cpp:440 directorymergewindow.cpp:529 +#: directorymergewindow.cpp:3084 directorymergewindow.cpp:3205 +#: directorymergewindow.cpp:3433 mergeresultwindow.cpp:974 +#: mergeresultwindow.cpp:976 mergeresultwindow.cpp:978 +#: mergeresultwindow.cpp:980 mergeresultwindow.cpp:1846 +#: mergeresultwindow.cpp:3202 mergeresultwindow.cpp:3209 optiondialog.cpp:1017 +#: pdiff.cpp:827 pdiff.cpp:829 pdiff.cpp:831 pdiff.cpp:833 pdiff.cpp:855 +#: smalldialogs.cpp:132 smalldialogs.cpp:133 smalldialogs.cpp:136 +#: smalldialogs.cpp:139 #, kde-format msgid "C" msgstr "C" -#: difftextwindow.cpp:1810 +#: difftextwindow.cpp:1809 #, fuzzy, kde-format msgid "A (Base)" msgstr "A ( Base ) : " -#: difftextwindow.cpp:1812 +#: difftextwindow.cpp:1811 #, fuzzy, kde-format msgid "Encoding: %1" msgstr "Idosiye ya: A : " -#: difftextwindow.cpp:1813 mergeresultwindow.cpp:3183 +#: difftextwindow.cpp:1812 mergeresultwindow.cpp:3211 #, kde-format msgid "Unix" msgstr "" -#: difftextwindow.cpp:1813 mergeresultwindow.cpp:3184 +#: difftextwindow.cpp:1812 mergeresultwindow.cpp:3212 #, kde-format msgid "DOS" msgstr "" -#: difftextwindow.cpp:1813 +#: difftextwindow.cpp:1812 #, fuzzy, kde-format msgid "Line end style: %1" msgstr "Impera Imisusire : " -#: difftextwindow.cpp:1835 kdiff3.cpp:873 +#: difftextwindow.cpp:1834 kdiff3.cpp:874 #, fuzzy, kde-format msgid "Top line" msgstr "Umurongo: %1 " -#: difftextwindow.cpp:1845 +#: difftextwindow.cpp:1843 #, kde-format msgid "End" msgstr "Impera" -#: difftextwindow.cpp:1903 smalldialogs.cpp:235 +#: difftextwindow.cpp:1901 smalldialogs.cpp:245 #, fuzzy, kde-format msgid "Open File" msgstr "Mu Gufungura dosiye" -#: difftextwindow.cpp:1951 optiondialog.cpp:387 +#: difftextwindow.cpp:1943 optiondialog.cpp:389 #, fuzzy, kde-format msgid "Unicode, 8 bit" msgstr ", 8 " -#: difftextwindow.cpp:1966 +#: difftextwindow.cpp:1958 #, kde-format msgid "Other" msgstr "" -#: directorymergewindow.cpp:409 directorymergewindow.cpp:3424 +#: directorymergewindow.cpp:410 directorymergewindow.cpp:3438 #, fuzzy, kde-format msgid "Copy A to B" msgstr "A Kuri " -#: directorymergewindow.cpp:412 directorymergewindow.cpp:3425 +#: directorymergewindow.cpp:413 directorymergewindow.cpp:3439 #, fuzzy, kde-format msgid "Copy B to A" msgstr "Kuri A " -#: directorymergewindow.cpp:415 directorymergewindow.cpp:3426 +#: directorymergewindow.cpp:416 directorymergewindow.cpp:3440 #, fuzzy, kde-format msgid "Delete A" msgstr "A " -#: directorymergewindow.cpp:418 directorymergewindow.cpp:3427 +#: directorymergewindow.cpp:419 directorymergewindow.cpp:3441 #, fuzzy, kde-format msgid "Delete B" msgstr "Gusiba #" -#: directorymergewindow.cpp:421 +#: directorymergewindow.cpp:422 #, fuzzy, kde-format msgid "Delete A & B" msgstr "A & " -#: directorymergewindow.cpp:424 directorymergewindow.cpp:3429 +#: directorymergewindow.cpp:425 directorymergewindow.cpp:3443 #, fuzzy, kde-format msgid "Merge to A" msgstr "Kuri A " -#: directorymergewindow.cpp:427 directorymergewindow.cpp:3430 +#: directorymergewindow.cpp:428 directorymergewindow.cpp:3444 #, fuzzy, kde-format msgid "Merge to B" msgstr "Kuri " -#: directorymergewindow.cpp:430 +#: directorymergewindow.cpp:431 #, fuzzy, kde-format msgid "Merge to A & B" msgstr "Kuri A & " -#: directorymergewindow.cpp:442 directorymergewindow.cpp:3421 +#: directorymergewindow.cpp:443 directorymergewindow.cpp:3435 #, fuzzy, kde-format msgid "Delete (if exists)" msgstr "( NIBA ) " -#: directorymergewindow.cpp:445 directorymergewindow.cpp:448 -#: directorymergewindow.cpp:3420 optiondialog.cpp:925 smalldialogs.cpp:113 +#: directorymergewindow.cpp:446 directorymergewindow.cpp:449 +#: directorymergewindow.cpp:3434 smalldialogs.cpp:120 #, kde-format msgid "Merge" msgstr "Gukomatanya" -#: directorymergewindow.cpp:445 directorymergewindow.cpp:448 +#: directorymergewindow.cpp:446 directorymergewindow.cpp:449 #, fuzzy, kde-format msgid "Merge (manual)" msgstr "( Bikorwa ) " -#: directorymergewindow.cpp:451 +#: directorymergewindow.cpp:452 #, fuzzy, kde-format msgid "Error: Conflicting File Types" msgstr "Ikosa : Idosiye " -#: directorymergewindow.cpp:454 +#: directorymergewindow.cpp:455 #, kde-format msgid "Error: Changed and Deleted" msgstr "" -#: directorymergewindow.cpp:457 +#: directorymergewindow.cpp:458 #, fuzzy, kde-format msgid "Error: Dates are equal but files are not." msgstr "Ikosa : bingana Idosiye OYA . " -#: directorymergewindow.cpp:471 +#: directorymergewindow.cpp:472 #, fuzzy, kde-format #| msgid "Done." msgid "Done" msgstr "Byakozwe." -#: directorymergewindow.cpp:473 +#: directorymergewindow.cpp:474 #, fuzzy, kde-format #| msgid "Error." msgid "Error" msgstr "Ikosa." -#: directorymergewindow.cpp:475 +#: directorymergewindow.cpp:476 #, fuzzy, kde-format msgid "Skipped." msgstr "Byoherejwe ku" -#: directorymergewindow.cpp:477 +#: directorymergewindow.cpp:478 #, fuzzy, kde-format msgid "Not saved." msgstr "Bidasangiwe" -#: directorymergewindow.cpp:479 +#: directorymergewindow.cpp:480 #, fuzzy, kde-format msgid "In progress..." msgstr "Aho bigeze: ... " -#: directorymergewindow.cpp:481 +#: directorymergewindow.cpp:482 #, fuzzy, kde-format msgid "To do." msgstr "Gukora" -#: directorymergewindow.cpp:522 +#: directorymergewindow.cpp:523 #, kde-format msgid "Name" msgstr "Izina" -#: directorymergewindow.cpp:530 +#: directorymergewindow.cpp:531 #, kde-format msgid "Operation" msgstr "Igikorwa" -#: directorymergewindow.cpp:532 +#: directorymergewindow.cpp:533 #, kde-format msgid "Status" msgstr "Imimerere" -#: directorymergewindow.cpp:534 +#: directorymergewindow.cpp:535 #, fuzzy, kde-format msgid "Unsolved" msgstr "Kidakoreshwa" -#: directorymergewindow.cpp:536 +#: directorymergewindow.cpp:537 #, fuzzy, kde-format msgid "Solved" msgstr "Gikomeye" -#: directorymergewindow.cpp:538 +#: directorymergewindow.cpp:539 #, fuzzy, kde-format msgid "Nonwhite" msgstr "Nta na kimwe" -#: directorymergewindow.cpp:540 +#: directorymergewindow.cpp:541 #, kde-format msgid "White" msgstr "Umweru" -#: directorymergewindow.cpp:674 +#: directorymergewindow.cpp:676 #, kde-format msgid "Unable to compare non-normal file with normal file." msgstr "" -#: directorymergewindow.cpp:688 +#: directorymergewindow.cpp:690 #, fuzzy, kde-format msgid "Mix of links and normal files." msgstr "Bya amahuza na Bisanzwe Idosiye . " -#: directorymergewindow.cpp:695 +#: directorymergewindow.cpp:697 #, fuzzy, kde-format msgid "Link: " msgstr "Ihuza..." -#: directorymergewindow.cpp:704 +#: directorymergewindow.cpp:706 #, fuzzy, kde-format msgid "Size. " msgstr "Ingano:" -#: directorymergewindow.cpp:718 directorymergewindow.cpp:728 +#: directorymergewindow.cpp:720 directorymergewindow.cpp:730 #, fuzzy, kde-format msgid "Date & Size: " msgstr "Itariki & Igihe" -#: directorymergewindow.cpp:748 +#: directorymergewindow.cpp:751 #, fuzzy, kde-format msgid "Comparing file..." msgstr "Idosiye ... " -#: directorymergewindow.cpp:801 +#: directorymergewindow.cpp:813 #, fuzzy, kde-format 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:802 kdiff3.cpp:698 kdiff3.cpp:708 kdiff3.cpp:720 -#: mergeresultwindow.cpp:372 pdiff.cpp:1033 pdiff.cpp:1910 pdiff.cpp:1920 +#: directorymergewindow.cpp:814 kdiff3.cpp:697 kdiff3.cpp:707 kdiff3.cpp:719 +#: mergeresultwindow.cpp:400 pdiff.cpp:1031 pdiff.cpp:1920 pdiff.cpp:1930 #, kde-format msgid "Warning" msgstr "" -#: directorymergewindow.cpp:803 directorymergewindow.cpp:3393 +#: directorymergewindow.cpp:815 directorymergewindow.cpp:3407 #, fuzzy, kde-format msgid "Rescan" msgstr "Urukiramende" -#: directorymergewindow.cpp:804 pdiff.cpp:1035 +#: directorymergewindow.cpp:816 pdiff.cpp:1033 #, fuzzy, kde-format msgid "Continue Merging" msgstr "Gukomeza " -#: directorymergewindow.cpp:971 +#: directorymergewindow.cpp:984 #, fuzzy, kde-format msgid "Opening of directories failed:" msgstr "Bya ububiko bw'amaderese Byanze : " -#: directorymergewindow.cpp:975 +#: directorymergewindow.cpp:988 #, 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:980 +#: directorymergewindow.cpp:993 #, 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:985 +#: directorymergewindow.cpp:998 #, 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:988 +#: directorymergewindow.cpp:1001 #, fuzzy, kde-format msgid "Directory Open Error" msgstr "Gufungura Ikosa " -#: directorymergewindow.cpp:996 +#: directorymergewindow.cpp:1009 #, fuzzy, kde-format msgid "" "The destination directory must not be the same as A or B when three " @@ -373,49 +373,49 @@ "Ishyika: Ububiko OYA i Nka A Cyangwa Ryari: ububiko bw'amaderese . \n" "Nanone Mbere . " -#: directorymergewindow.cpp:998 +#: directorymergewindow.cpp:1011 #, fuzzy, kde-format msgid "Parameter Warning" msgstr "Kuburira bijyanye na mucapyi" -#: directorymergewindow.cpp:1003 +#: directorymergewindow.cpp:1016 #, fuzzy, kde-format msgid "Scanning directories..." msgstr "ububiko bw'amaderese ... " -#: directorymergewindow.cpp:1029 +#: directorymergewindow.cpp:1042 #, fuzzy, kde-format msgid "Reading Directory A" msgstr "A " -#: directorymergewindow.cpp:1038 +#: directorymergewindow.cpp:1051 #, fuzzy, kde-format msgid "Reading Directory B" msgstr "Guhanga ububiko " -#: directorymergewindow.cpp:1048 +#: directorymergewindow.cpp:1061 #, fuzzy, kde-format msgid "Reading Directory C" msgstr "Guhanga ububiko " -#: directorymergewindow.cpp:1064 +#: directorymergewindow.cpp:1077 #, fuzzy, kde-format msgid "Some subdirectories were not readable in" msgstr "Ububiko bwungirije OYA in " -#: directorymergewindow.cpp:1069 +#: directorymergewindow.cpp:1082 #, fuzzy, kde-format msgid "Check the permissions of the subdirectories." msgstr "i Uruhushya Bya i Ububiko bwungirije . " -#: directorymergewindow.cpp:1106 kdiff3.cpp:666 kdiff3.cpp:753 kdiff3.cpp:777 -#: kdiff3.cpp:1065 kdiff3.cpp:1086 pdiff.cpp:1116 pdiff.cpp:1170 pdiff.cpp:1218 -#: pdiff.cpp:1234 pdiff.cpp:1277 pdiff.cpp:1301 +#: directorymergewindow.cpp:1119 kdiff3.cpp:665 kdiff3.cpp:752 kdiff3.cpp:776 +#: kdiff3.cpp:1072 kdiff3.cpp:1093 pdiff.cpp:1115 pdiff.cpp:1178 pdiff.cpp:1228 +#: pdiff.cpp:1244 pdiff.cpp:1287 pdiff.cpp:1311 #, kde-format msgid "Ready." msgstr "Cyiteguye." -#: directorymergewindow.cpp:1121 +#: directorymergewindow.cpp:1134 #, kde-format msgid "" "Directory Comparison Status\n" @@ -425,66 +425,66 @@ "Number of different files: %3" msgstr "" -#: directorymergewindow.cpp:1128 +#: directorymergewindow.cpp:1141 #, fuzzy, kde-format msgid "Number of manual merges: %1" msgstr "Bya Bikorwa : " -#: directorymergewindow.cpp:1394 +#: directorymergewindow.cpp:1407 #, fuzzy, kde-format msgid "This affects all merge operations." msgstr "Byose Gukomatanya Ibikorwa: . " -#: directorymergewindow.cpp:1395 +#: directorymergewindow.cpp:1408 #, fuzzy, kde-format msgid "Changing All Merge Operations" msgstr "Ibikorerwa Ishusho" -#: directorymergewindow.cpp:1695 +#: directorymergewindow.cpp:1708 #, fuzzy, kde-format msgid "" "Processing %1 / %2\n" "%3" msgstr "Inonosora" -#: directorymergewindow.cpp:1738 directorymergewindow.cpp:1742 +#: directorymergewindow.cpp:1751 directorymergewindow.cpp:1755 #, kde-format msgid "Some files could not be processed." msgstr "" -#: directorymergewindow.cpp:2222 directorymergewindow.cpp:2247 -#: directorymergewindow.cpp:2271 +#: directorymergewindow.cpp:2235 directorymergewindow.cpp:2260 +#: directorymergewindow.cpp:2285 #, fuzzy, kde-format msgid "This operation is currently not possible." msgstr "Igikorwa ni OYA . " -#: directorymergewindow.cpp:2222 directorymergewindow.cpp:2247 -#: directorymergewindow.cpp:2271 directorymergewindow.cpp:2552 +#: directorymergewindow.cpp:2235 directorymergewindow.cpp:2260 +#: directorymergewindow.cpp:2285 directorymergewindow.cpp:2565 #, fuzzy, kde-format msgid "Operation Not Possible" msgstr "Igikorwa nticyashobotse" -#: directorymergewindow.cpp:2318 +#: directorymergewindow.cpp:2332 #, fuzzy, kde-format msgid "An error occurred while copying." msgstr "Ikosa Gukoporora . \n" -#: directorymergewindow.cpp:2319 directorymergewindow.cpp:2759 +#: directorymergewindow.cpp:2333 directorymergewindow.cpp:2772 #, fuzzy, kde-format msgid "Merge Error" msgstr "Ikosa " -#: directorymergewindow.cpp:2396 +#: directorymergewindow.cpp:2410 #, fuzzy, kde-format msgid "Unknown merge operation. (This must never happen!)" msgstr "Gukomatanya Igikorwa . ( Nta na rimwe ! ) " -#: directorymergewindow.cpp:2441 +#: directorymergewindow.cpp:2455 #, fuzzy, kde-format msgid "Unknown merge operation." msgstr "Gukomatanya Igikorwa . " -#: directorymergewindow.cpp:2454 +#: directorymergewindow.cpp:2468 #, fuzzy, kde-format msgid "" "The merge is about to begin.\n" @@ -503,50 +503,50 @@ "\n" "iyi Porogaramu beta Imimerere na ni ! Ibyashyinguwe Bya Ibyatanzwe ! " -#: directorymergewindow.cpp:2459 +#: directorymergewindow.cpp:2473 #, fuzzy, kde-format msgid "Starting Merge" msgstr "Gutangiza serivise" -#: directorymergewindow.cpp:2460 +#: directorymergewindow.cpp:2474 #, fuzzy, kde-format msgid "Do It" msgstr "Akadomo" -#: directorymergewindow.cpp:2461 +#: directorymergewindow.cpp:2475 #, fuzzy, kde-format msgid "Simulate It" msgstr "Kwigana Igaragaza" -#: directorymergewindow.cpp:2487 +#: directorymergewindow.cpp:2501 #, fuzzy, kde-format 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:2491 +#: directorymergewindow.cpp:2505 #, fuzzy, kde-format 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:2495 +#: directorymergewindow.cpp:2509 #, fuzzy, kde-format msgid "" "The highlighted item was changed in one directory and deleted in the other. " "Select what to do." msgstr "Ikintu A Ubwoko: in i ububiko bw'amaderese . Kuri . " -#: directorymergewindow.cpp:2552 +#: directorymergewindow.cpp:2565 #, fuzzy, kde-format msgid "" "This operation is currently not possible because directory merge is " "currently running." msgstr "Igikorwa ni OYA Ububiko Gukomatanya ni . " -#: directorymergewindow.cpp:2609 +#: directorymergewindow.cpp:2622 #, fuzzy, kde-format msgid "" "There was an error in the last step.\n" @@ -556,255 +556,255 @@ "Ikosa in i Iheruka Intera . \n" "Kuri Gukomeza Na: i Ikintu i Ikosa Cyangwa Kuri Gusimbuka iyi Ikintu ? " -#: directorymergewindow.cpp:2611 +#: directorymergewindow.cpp:2624 #, fuzzy, kde-format msgid "Continue merge after an error" msgstr "Gukomeza Gukomatanya Nyuma Ikosa " -#: directorymergewindow.cpp:2612 +#: directorymergewindow.cpp:2625 #, fuzzy, kde-format msgid "Continue With Last Item" msgstr "Gukomeza " -#: directorymergewindow.cpp:2613 +#: directorymergewindow.cpp:2626 #, fuzzy, kde-format msgid "Skip Item" msgstr "Ibigize by'ilisiti" -#: directorymergewindow.cpp:2709 +#: directorymergewindow.cpp:2722 #, fuzzy, kde-format msgid "Merge operation complete." msgstr "Igikorwa Byuzuye . " -#: directorymergewindow.cpp:2709 directorymergewindow.cpp:2712 +#: directorymergewindow.cpp:2722 directorymergewindow.cpp:2725 #, fuzzy, kde-format msgid "Merge Complete" msgstr "Gushyira ku gihe byarangiye" -#: directorymergewindow.cpp:2722 +#: directorymergewindow.cpp:2735 #, fuzzy, kde-format msgid "" "Simulated merge complete: Check if you agree with the proposed operations." msgstr "Gukomatanya Byuzuye : NIBA Na: i Ibikorwa: . " -#: directorymergewindow.cpp:2758 +#: directorymergewindow.cpp:2771 #, fuzzy, kde-format msgid "An error occurred. Press OK to see detailed information." msgstr "Habayemoikosa." -#: directorymergewindow.cpp:2791 +#: directorymergewindow.cpp:2804 #, fuzzy, kde-format msgid "Error: While deleting %1: Creating backup failed." msgstr "Ikosa : Gusiba %1 : Inyibutsa Byanze . " -#: directorymergewindow.cpp:2798 +#: directorymergewindow.cpp:2811 #, fuzzy, kde-format msgid "delete directory recursively( %1 )" msgstr "Gusiba Ububiko ( %1 ) " -#: directorymergewindow.cpp:2800 +#: directorymergewindow.cpp:2813 #, fuzzy, kde-format msgid "delete( %1 )" msgstr "Gusiba" -#: directorymergewindow.cpp:2815 +#: directorymergewindow.cpp:2828 #, fuzzy, kde-format msgid "Error: delete dir operation failed while trying to read the directory." msgstr "Ikosa : Gusiba Igikorwa Byanze Kuri Soma i Ububiko . " -#: directorymergewindow.cpp:2834 +#: directorymergewindow.cpp:2847 #, fuzzy, kde-format msgid "Error: rmdir( %1 ) operation failed." msgstr "Ikosa : ( %1 ) Igikorwa Byanze . " -#: directorymergewindow.cpp:2844 +#: directorymergewindow.cpp:2857 #, fuzzy, kde-format msgid "Error: delete operation failed." msgstr "Ikosa : Gusiba Igikorwa Byanze . " -#: directorymergewindow.cpp:2870 +#: directorymergewindow.cpp:2884 #, fuzzy, kde-format msgid "manual merge( %1, %2, %3 -> %4)" msgstr "Bikorwa Gukomatanya ( %1 , %2 , %3 - > %4 ) " -#: directorymergewindow.cpp:2873 +#: directorymergewindow.cpp:2887 #, fuzzy, kde-format msgid "" " Note: After a manual merge the user should continue by pressing F7." msgstr "icyitonderwa : A Bikorwa Gukomatanya i Umukoresha Gukomeza ku . " -#: directorymergewindow.cpp:2900 +#: directorymergewindow.cpp:2914 #, fuzzy, kde-format msgid "Error: copy( %1 -> %2 ) failed.Deleting existing destination failed." msgstr "Ikosa : Gukoporora ( %1 - > %2 ) Byanze . Ishyika: Byanze . " -#: directorymergewindow.cpp:2909 +#: directorymergewindow.cpp:2923 #, fuzzy, kde-format msgid "copyLink( %1 -> %2 )" msgstr "Ihuza ku %1 (%2)" -#: directorymergewindow.cpp:2918 +#: directorymergewindow.cpp:2932 #, fuzzy, kde-format msgid "Error: copyLink failed: Remote links are not yet supported." msgstr "Ikosa : Byanze : amahuza OYA . " -#: directorymergewindow.cpp:2928 +#: directorymergewindow.cpp:2942 #, fuzzy, kde-format msgid "Error: copyLink failed." msgstr "Ikosa : Byanze . " -#: directorymergewindow.cpp:2953 +#: directorymergewindow.cpp:2967 #, fuzzy, kde-format msgid "copy( %1 -> %2 )" msgstr "Gukoporora" -#: directorymergewindow.cpp:2979 +#: directorymergewindow.cpp:2993 #, fuzzy, kde-format msgid "Error during rename( %1 -> %2 ): Cannot delete existing destination." msgstr "Ikosa Guhindura izina ( %1 - > %2 ) : Gusiba Ishyika: . " -#: directorymergewindow.cpp:2986 +#: directorymergewindow.cpp:3000 #, fuzzy, kde-format msgid "rename( %1 -> %2 )" msgstr "Guhindura izina" -#: directorymergewindow.cpp:2995 +#: directorymergewindow.cpp:3009 #, fuzzy, kde-format msgid "Error: Rename failed." msgstr "Ikosa : Byanze . " -#: directorymergewindow.cpp:3013 +#: directorymergewindow.cpp:3027 #, fuzzy, kde-format msgid "Error during makeDir of %1. Cannot delete existing file." msgstr "Ikosa Bya %1 . Gusiba Idosiye . " -#: directorymergewindow.cpp:3030 +#: directorymergewindow.cpp:3044 #, kde-format msgid "makeDir( %1 )" msgstr "" -#: directorymergewindow.cpp:3040 +#: directorymergewindow.cpp:3054 #, fuzzy, kde-format msgid "Error while creating directory." msgstr "Ikosa Kurema Ububiko . " -#: directorymergewindow.cpp:3076 directorymergewindow.cpp:3195 +#: directorymergewindow.cpp:3090 directorymergewindow.cpp:3209 #, fuzzy, kde-format msgid "Dest" msgstr "Kugogora" -#: directorymergewindow.cpp:3084 directorymergewindow.cpp:3113 +#: directorymergewindow.cpp:3098 directorymergewindow.cpp:3127 #, fuzzy, kde-format msgid "Dir" msgstr "Muhamagazatelefoni" -#: directorymergewindow.cpp:3084 +#: directorymergewindow.cpp:3098 #, kde-format msgid "Type" msgstr "Ubwoko" -#: directorymergewindow.cpp:3084 +#: directorymergewindow.cpp:3098 #, kde-format msgid "Size" msgstr "Ingano" -#: directorymergewindow.cpp:3085 +#: directorymergewindow.cpp:3099 #, fuzzy, kde-format msgid "Attr" msgstr "Nyuma" -#: directorymergewindow.cpp:3085 +#: directorymergewindow.cpp:3099 #, fuzzy, kde-format msgid "Last Modification" msgstr "Iherutse guhindurwa" -#: directorymergewindow.cpp:3085 +#: directorymergewindow.cpp:3099 #, fuzzy, kde-format msgid "Link-Destination" msgstr "Ishyika" -#: directorymergewindow.cpp:3113 +#: directorymergewindow.cpp:3127 #, fuzzy, kde-format msgid "File" msgstr "Idosiye..." -#: directorymergewindow.cpp:3113 +#: directorymergewindow.cpp:3127 #, fuzzy, kde-format msgid "-Link" msgstr "Ihuza..." -#: directorymergewindow.cpp:3119 +#: directorymergewindow.cpp:3133 #, fuzzy, kde-format msgid "not available" msgstr "Ntibonetse" -#: directorymergewindow.cpp:3137 +#: directorymergewindow.cpp:3151 #, fuzzy, kde-format msgid "A (Dest): " msgstr "A ( ) : " -#: directorymergewindow.cpp:3141 +#: directorymergewindow.cpp:3155 #, kde-format msgid "A: " msgstr "" -#: directorymergewindow.cpp:3141 +#: directorymergewindow.cpp:3155 #, fuzzy, kde-format msgid "A (Base): " msgstr "A ( Base ) : " -#: directorymergewindow.cpp:3147 +#: directorymergewindow.cpp:3161 #, kde-format msgid "B (Dest): " msgstr "" -#: directorymergewindow.cpp:3151 +#: directorymergewindow.cpp:3165 #, kde-format msgid "B: " msgstr "" -#: directorymergewindow.cpp:3156 +#: directorymergewindow.cpp:3170 #, kde-format msgid "C (Dest): " msgstr "" -#: directorymergewindow.cpp:3160 +#: directorymergewindow.cpp:3174 #, kde-format msgid "C: " msgstr "" -#: directorymergewindow.cpp:3163 +#: directorymergewindow.cpp:3177 #, fuzzy, kde-format msgid "Dest: " msgstr "Ibiro: %1" #. i18n("Saving Directory Merge State ...")); -#: directorymergewindow.cpp:3238 +#: directorymergewindow.cpp:3252 #, fuzzy, kde-format msgid "Save Directory Merge State As..." msgstr "Seriveri y'ububiko:" -#: directorymergewindow.cpp:3387 +#: directorymergewindow.cpp:3401 #, fuzzy, kde-format msgid "Start/Continue Directory Merge" msgstr "Gutangira /Gukomeza " -#: directorymergewindow.cpp:3388 +#: directorymergewindow.cpp:3402 #, fuzzy, kde-format msgid "Run Operation for Current Item" msgstr "ya: " -#: directorymergewindow.cpp:3389 +#: directorymergewindow.cpp:3403 #, fuzzy, kde-format msgid "Compare Selected File" msgstr "Idosiye " -#: directorymergewindow.cpp:3390 +#: directorymergewindow.cpp:3404 #, fuzzy, kde-format msgid "Merge Current File" msgstr "Idosiye " -#: directorymergewindow.cpp:3390 +#: directorymergewindow.cpp:3404 #, fuzzy, kde-format #| msgid "Merge" msgid "" @@ -812,144 +812,149 @@ "File" msgstr "Gukomatanya" -#: directorymergewindow.cpp:3391 +#: directorymergewindow.cpp:3405 #, fuzzy, kde-format msgid "Fold All Subdirs" msgstr "Amajwi Yose" -#: directorymergewindow.cpp:3392 +#: directorymergewindow.cpp:3406 #, kde-format msgid "Unfold All Subdirs" msgstr "" #. i18n("Save Directory Merge State ..."), 0, this, &DirectoryMergeWindow::slotSaveMergeState, ac, "dir_save_merge_state"); #. i18n("Load Directory Merge State ..."), 0, this, &DirectoryMergeWindow::slotLoadMergeState, ac, "dir_load_merge_state"); -#: directorymergewindow.cpp:3396 +#: directorymergewindow.cpp:3410 #, fuzzy, kde-format msgid "Choose A for All Items" msgstr "A ya: " -#: directorymergewindow.cpp:3397 +#: directorymergewindow.cpp:3411 #, fuzzy, kde-format msgid "Choose B for All Items" msgstr "ya: " -#: directorymergewindow.cpp:3398 +#: directorymergewindow.cpp:3412 #, fuzzy, kde-format msgid "Choose C for All Items" msgstr "ya: " -#: directorymergewindow.cpp:3399 +#: directorymergewindow.cpp:3413 #, fuzzy, kde-format msgid "Auto-Choose Operation for All Items" msgstr "- ya: " -#: directorymergewindow.cpp:3400 +#: directorymergewindow.cpp:3414 #, fuzzy, kde-format msgid "No Operation for All Items" msgstr "ya: " #. i18n("Synchronize Directories"), 0, this, &DirectoryMergeWindow::slotSynchronizeDirectories, ac, "dir_synchronize_directories"); #. d->m_pDirChooseNewerFiles = GuiUtils::createAction< KToggleAction >(i18n("Copy Newer Files Instead of Merging"), 0, this, &DirectoryMergeWindow::slotChooseNewerFiles, ac, "dir_choose_newer_files"); -#: directorymergewindow.cpp:3405 +#: directorymergewindow.cpp:3419 #, kde-format msgid "Show Identical Files" msgstr "" -#: directorymergewindow.cpp:3405 +#: directorymergewindow.cpp:3419 #, kde-format msgid "" "Identical\n" "Files" msgstr "" -#: directorymergewindow.cpp:3406 +#: directorymergewindow.cpp:3420 #, fuzzy, kde-format msgid "Show Different Files" msgstr "Bya Idosiye : " -#: directorymergewindow.cpp:3407 +#: directorymergewindow.cpp:3421 #, kde-format msgid "Show Files only in A" msgstr "" -#: directorymergewindow.cpp:3407 +#: directorymergewindow.cpp:3421 #, kde-format msgid "" "Files\n" "only in A" msgstr "" -#: directorymergewindow.cpp:3408 +#: directorymergewindow.cpp:3422 #, kde-format msgid "Show Files only in B" msgstr "" -#: directorymergewindow.cpp:3408 +#: directorymergewindow.cpp:3422 #, kde-format msgid "" "Files\n" "only in B" msgstr "" -#: directorymergewindow.cpp:3409 +#: directorymergewindow.cpp:3423 #, kde-format msgid "Show Files only in C" msgstr "" -#: directorymergewindow.cpp:3409 +#: directorymergewindow.cpp:3423 #, kde-format msgid "" "Files\n" "only in C" msgstr "" -#: directorymergewindow.cpp:3413 +#: directorymergewindow.cpp:3427 #, fuzzy, kde-format msgid "Compare Explicitly Selected Files" msgstr "Idosiye " -#: directorymergewindow.cpp:3414 +#: directorymergewindow.cpp:3428 #, fuzzy, kde-format msgid "Merge Explicitly Selected Files" msgstr "Idosiye " -#: directorymergewindow.cpp:3416 directorymergewindow.cpp:3423 +#: directorymergewindow.cpp:3430 directorymergewindow.cpp:3437 #, kde-format msgid "Do Nothing" msgstr "Ntugire icyo Ukora" -#: directorymergewindow.cpp:3428 +#: directorymergewindow.cpp:3442 #, fuzzy, kde-format msgid "Delete A && B" msgstr "A & & " -#: directorymergewindow.cpp:3431 +#: directorymergewindow.cpp:3445 #, fuzzy, kde-format msgid "Merge to A && B" msgstr "Kuri A & & " -#: fileaccess.cpp:462 SourceData.cpp:493 +#: fileaccess.cpp:301 +#, kde-format +msgid "Unable to determine full url. No parent specified." +msgstr "" + +#: fileaccess.cpp:482 SourceData.cpp:506 #, fuzzy, kde-format msgid "Failed to read file: %1" msgstr "Idosiye : %1 " -#: fileaccess.cpp:587 +#: fileaccess.cpp:624 #, fuzzy, kde-format msgid "Creating temp copy of %1 failed." msgstr "Gukoporora Bya %1 Byanze . " -#: fileaccess.cpp:595 fileaccess.cpp:600 +#: fileaccess.cpp:632 fileaccess.cpp:637 #, fuzzy, kde-format msgid "Opening %1 failed. %2" msgstr "%1 Byanze . " -#: fileaccess.cpp:619 fileaccess.cpp:627 +#: fileaccess.cpp:656 fileaccess.cpp:664 #, fuzzy, kde-format msgid "Error reading from %1. %2" msgstr "Ikosa Kuva: %1 " -#: fileaccess.cpp:751 +#: fileaccess.cpp:788 #, fuzzy, kde-format msgid "" "While trying to make a backup, deleting an older backup failed.\n" @@ -958,7 +963,7 @@ "Kuri Ubwoko A Inyibutsa , Gusiba Inyibutsa Byanze . \n" ": " -#: fileaccess.cpp:758 +#: fileaccess.cpp:795 #, fuzzy, kde-format msgid "" "While trying to make a backup, renaming failed.\n" @@ -967,214 +972,214 @@ "Kuri Ubwoko A Inyibutsa , Guhindura izina Byanze . \n" ": " -#: fileaccess.cpp:828 +#: fileaccess.cpp:865 #, fuzzy, kde-format msgid "Getting file status: %1" msgstr "Idosiye Imimerere : %1 " -#: fileaccess.cpp:869 +#: fileaccess.cpp:906 #, fuzzy, kde-format msgid "Reading file: %1" msgstr "Idosiye : %1 " -#: fileaccess.cpp:907 +#: fileaccess.cpp:944 #, fuzzy, kde-format msgid "Writing file: %1" msgstr "Idosiye : %1 " -#: fileaccess.cpp:940 +#: fileaccess.cpp:977 #, kde-format msgid "Out of memory" msgstr "Ububiko bwarenzwe" -#: fileaccess.cpp:976 +#: fileaccess.cpp:1013 #, fuzzy, kde-format msgid "Making directory: %1" msgstr "Ububiko : %1 " -#: fileaccess.cpp:997 +#: fileaccess.cpp:1034 #, fuzzy, kde-format msgid "Removing directory: %1" msgstr "Ububiko : %1 " -#: fileaccess.cpp:1012 +#: fileaccess.cpp:1049 #, fuzzy, kde-format msgid "Removing file: %1" msgstr "Idosiye : %1 " -#: fileaccess.cpp:1028 +#: fileaccess.cpp:1065 #, fuzzy, kde-format msgid "Creating symbolic link: %1 -> %2" msgstr "Ihuza : %1 - > %2 " -#: fileaccess.cpp:1052 +#: fileaccess.cpp:1089 #, fuzzy, kde-format msgid "Renaming file: %1 -> %2" msgstr "Idosiye : %1 - > %2 " -#: fileaccess.cpp:1086 +#: fileaccess.cpp:1123 #, fuzzy, kde-format msgid "Copying file: %1 -> %2" msgstr "Idosiye : %1 - > %2 " -#: fileaccess.cpp:1108 +#: fileaccess.cpp:1145 #, fuzzy, kde-format msgid "Reading directory: %1" msgstr "Ububiko : " -#: fileaccess.cpp:1162 +#: fileaccess.cpp:1202 #, fuzzy, kde-format msgid "Listing directory: %1" msgstr "Ububiko : %1 " -#: kdiff3.cpp:181 +#: kdiff3.cpp:182 #, fuzzy, kde-format msgid "Current Configuration:" msgstr "Iki cyiciro" -#: kdiff3.cpp:186 +#: kdiff3.cpp:187 #, fuzzy, kde-format msgid "Config Option Error:" msgstr "Ikosa gufungura idosiye" -#: kdiff3.cpp:240 +#: kdiff3.cpp:246 #, fuzzy, kde-format msgid "Option --auto used, but no output file specified." msgstr "- - Ikiyega Byakoreshejwe , Oya Ibisohoka Idosiye . " -#: kdiff3.cpp:416 +#: kdiff3.cpp:405 #, fuzzy, kde-format msgid "Option --auto ignored for directory comparison." msgstr "- - Ikiyega ya: Ububiko . " -#: kdiff3.cpp:460 +#: kdiff3.cpp:449 #, fuzzy, kde-format msgid "Saving failed." msgstr "Byanze . " -#: kdiff3.cpp:496 pdiff.cpp:1098 +#: kdiff3.cpp:494 pdiff.cpp:1096 #, fuzzy, kde-format msgid "Opening of these files failed:" msgstr "Bya Idosiye Byanze : " -#: kdiff3.cpp:505 -#, fuzzy, kde-format -msgid "File Open Error" +#: kdiff3.cpp:503 pdiff.cpp:1105 +#, kde-format +msgid "File open error" msgstr "Ikosa gufungura idosiye" -#: kdiff3.cpp:533 +#: kdiff3.cpp:532 #, fuzzy, kde-format msgid "Opens documents for comparison..." msgstr "Inyandiko ya: ... " -#: kdiff3.cpp:535 +#: kdiff3.cpp:534 #, fuzzy, kde-format #| msgid "Ready." msgid "Reload" msgstr "Cyiteguye." -#: kdiff3.cpp:538 +#: kdiff3.cpp:537 #, fuzzy, kde-format msgid "Saves the merge result. All conflicts must be solved!" msgstr "i Gukomatanya Igisubizo . ! " -#: kdiff3.cpp:540 +#: kdiff3.cpp:539 #, fuzzy, kde-format msgid "Saves the current document as..." msgstr "i KIGEZWEHO Inyandiko Nka ... " -#: kdiff3.cpp:543 +#: kdiff3.cpp:542 #, kde-format msgid "Print the differences" msgstr "" -#: kdiff3.cpp:546 +#: kdiff3.cpp:545 #, fuzzy, kde-format msgid "Quits the application" msgstr "i Porogaramu " -#: kdiff3.cpp:549 +#: kdiff3.cpp:548 #, fuzzy, kde-format msgid "Cuts the selected section and puts it to the clipboard" msgstr "i Byahiswemo Icyiciro na Kuri i Ububikokoporora " -#: kdiff3.cpp:552 +#: kdiff3.cpp:551 #, fuzzy, kde-format msgid "Copies the selected section to the clipboard" msgstr "i Byahiswemo Icyiciro Kuri i Ububikokoporora " -#: kdiff3.cpp:554 +#: kdiff3.cpp:553 #, fuzzy, kde-format msgid "Pastes the clipboard contents to current position" msgstr "i Ububikokoporora Ibigize Kuri Ibirindiro: " -#: kdiff3.cpp:557 +#: kdiff3.cpp:556 #, kde-format msgid "Select everything in current window" msgstr "" -#: kdiff3.cpp:560 +#: kdiff3.cpp:559 #, fuzzy, kde-format msgid "Search for a string" msgstr "ya: A Ikurikiranyanyuguti " -#: kdiff3.cpp:562 +#: kdiff3.cpp:561 #, fuzzy, kde-format msgid "Search again for the string" msgstr "Nanone ya: i Ikurikiranyanyuguti " -#: kdiff3.cpp:567 +#: kdiff3.cpp:566 #, fuzzy, kde-format msgid "Enables/disables the statusbar" msgstr "/i Umurongomiterere " -#: kdiff3.cpp:571 +#: kdiff3.cpp:570 #, fuzzy, kde-format msgid "Configure KDiff3..." msgstr "Kugena imiterere..." -#: kdiff3.cpp:590 +#: kdiff3.cpp:589 #, fuzzy, kde-format msgid "Go to Current Delta" msgstr "Kuri " -#: kdiff3.cpp:590 +#: kdiff3.cpp:589 #, fuzzy, kde-format msgid "" "Current\n" "Delta" msgstr "Kuri " -#: kdiff3.cpp:592 +#: kdiff3.cpp:591 #, fuzzy, kde-format msgid "Go to First Delta" msgstr "Kuri " -#: kdiff3.cpp:592 +#: kdiff3.cpp:591 #, fuzzy, kde-format msgid "" "First\n" "Delta" msgstr "Kuri " -#: kdiff3.cpp:594 +#: kdiff3.cpp:593 #, fuzzy, kde-format msgid "Go to Last Delta" msgstr "Kuri " -#: kdiff3.cpp:594 +#: kdiff3.cpp:593 #, fuzzy, kde-format msgid "" "Last\n" "Delta" msgstr "Kuri " -#: kdiff3.cpp:596 +#: kdiff3.cpp:595 #, fuzzy, kde-format msgid "(Skips white space differences when \"Show White Space\" is disabled.)" msgstr "( Umweru Umwanya Ibinyuranyo Ryari: \" \" ni Yahagaritswe . ) " -#: kdiff3.cpp:597 +#: kdiff3.cpp:596 #, fuzzy, kde-format msgid "" "(Does not skip white space differences even when \"Show White Space\" is " @@ -1183,349 +1188,349 @@ "( OYA Gusimbuka Umweru Umwanya Ibinyuranyo ATARIIGIHARWE Ryari: \" \" ni " "Yahagaritswe . ) " -#: kdiff3.cpp:598 +#: kdiff3.cpp:597 #, fuzzy, kde-format msgid "Go to Previous Delta" msgstr "Kuri " -#: kdiff3.cpp:598 +#: kdiff3.cpp:597 #, fuzzy, kde-format msgid "" "Prev\n" "Delta" msgstr "Kuri " -#: kdiff3.cpp:600 +#: kdiff3.cpp:599 #, fuzzy, kde-format msgid "Go to Next Delta" msgstr "Kuri " -#: kdiff3.cpp:600 +#: kdiff3.cpp:599 #, fuzzy, kde-format msgid "" "Next\n" "Delta" msgstr "Kuri " -#: kdiff3.cpp:602 +#: kdiff3.cpp:601 #, fuzzy, kde-format msgid "Go to Previous Conflict" msgstr "Kuri " -#: kdiff3.cpp:602 +#: kdiff3.cpp:601 #, fuzzy, kde-format msgid "" "Prev\n" "Conflict" msgstr "Ishyamirana ry'ingenzi" -#: kdiff3.cpp:604 +#: kdiff3.cpp:603 #, fuzzy, kde-format msgid "Go to Next Conflict" msgstr "Kuri " -#: kdiff3.cpp:604 +#: kdiff3.cpp:603 #, fuzzy, kde-format msgid "" "Next\n" "Conflict" msgstr "Kuri " -#: kdiff3.cpp:606 +#: kdiff3.cpp:605 #, fuzzy, kde-format msgid "Go to Previous Unsolved Conflict" msgstr "Kuri " -#: kdiff3.cpp:606 +#: kdiff3.cpp:605 #, fuzzy, kde-format msgid "" "Prev\n" "Unsolved" msgstr "Kidakoreshwa" -#: kdiff3.cpp:608 +#: kdiff3.cpp:607 #, fuzzy, kde-format msgid "Go to Next Unsolved Conflict" msgstr "Kuri " -#: kdiff3.cpp:608 +#: kdiff3.cpp:607 #, fuzzy, kde-format msgid "" "Next\n" "Unsolved" msgstr "Kidakoreshwa" -#: kdiff3.cpp:610 +#: kdiff3.cpp:609 #, fuzzy, kde-format msgid "Select Line(s) From A" msgstr "( S ) A " -#: kdiff3.cpp:610 +#: kdiff3.cpp:609 #, kde-format msgid "" "Choose\n" "A" msgstr "" -#: kdiff3.cpp:611 +#: kdiff3.cpp:610 #, fuzzy, kde-format msgid "Select Line(s) From B" msgstr "( S ) " -#: kdiff3.cpp:611 +#: kdiff3.cpp:610 #, kde-format msgid "" "Choose\n" "B" msgstr "" -#: kdiff3.cpp:612 +#: kdiff3.cpp:611 #, fuzzy, kde-format msgid "Select Line(s) From C" msgstr "( S ) " -#: kdiff3.cpp:612 +#: kdiff3.cpp:611 #, kde-format msgid "" "Choose\n" "C" msgstr "" -#: kdiff3.cpp:613 +#: kdiff3.cpp:612 #, fuzzy, kde-format msgid "Automatically Go to Next Unsolved Conflict After Source Selection" msgstr "Kuri " -#: kdiff3.cpp:613 +#: kdiff3.cpp:612 #, fuzzy, kde-format msgid "" "Auto\n" "Next" msgstr "Gukoporora Ihitamo " -#: kdiff3.cpp:615 +#: kdiff3.cpp:614 #, fuzzy, kde-format msgid "Show Space && Tabulator Characters" msgstr "& & ya: " -#: kdiff3.cpp:615 +#: kdiff3.cpp:614 #, kde-format msgid "" "White\n" "Characters" msgstr "" -#: kdiff3.cpp:616 +#: kdiff3.cpp:615 #, fuzzy, kde-format msgid "Show White Space" msgstr "Umwanya w'Umweru" -#: kdiff3.cpp:616 +#: kdiff3.cpp:615 #, kde-format msgid "" "White\n" "Deltas" msgstr "" -#: kdiff3.cpp:618 +#: kdiff3.cpp:617 #, fuzzy, kde-format msgid "Show Line Numbers" msgstr "Kwerekana nomero z'umurongo" -#: kdiff3.cpp:618 +#: kdiff3.cpp:617 #, fuzzy, kde-format msgid "" "Line\n" "Numbers" msgstr "Kwerekana nomero z'umurongo" -#: kdiff3.cpp:620 +#: kdiff3.cpp:619 #, fuzzy, kde-format msgid "Automatically Solve Simple Conflicts" msgstr "Gufunga mu buryo bwikoresha impago zidakoreshwa" -#: kdiff3.cpp:621 +#: kdiff3.cpp:620 #, fuzzy, kde-format msgid "Set Deltas to Conflicts" msgstr "Kuri " -#: kdiff3.cpp:622 +#: kdiff3.cpp:621 #, kde-format msgid "Run Regular Expression Auto Merge" msgstr "" -#: kdiff3.cpp:623 +#: kdiff3.cpp:622 #, fuzzy, kde-format msgid "Automatically Solve History Conflicts" msgstr "Gufunga mu buryo bwikoresha impago zidakoreshwa" -#: kdiff3.cpp:624 +#: kdiff3.cpp:623 #, kde-format msgid "Split Diff At Selection" msgstr "" -#: kdiff3.cpp:625 +#: kdiff3.cpp:624 #, fuzzy, kde-format msgid "Join Selected Diffs" msgstr "Idosiye " -#: kdiff3.cpp:627 +#: kdiff3.cpp:626 #, fuzzy, kde-format msgid "Show Window A" msgstr "A " -#: kdiff3.cpp:628 +#: kdiff3.cpp:627 #, fuzzy, kde-format msgid "Show Window B" msgstr "Kwerekana Ilisiti y'Amadirishya" -#: kdiff3.cpp:629 +#: kdiff3.cpp:628 #, fuzzy, kde-format msgid "Show Window C" msgstr "Kwerekana Ilisiti y'Amadirishya" -#: kdiff3.cpp:631 +#: kdiff3.cpp:630 #, fuzzy, kde-format msgid "Normal Overview" msgstr "Gahunda-Nyamwaka" -#: kdiff3.cpp:632 +#: kdiff3.cpp:631 #, fuzzy, kde-format msgid "A vs. B Overview" msgstr "A . " -#: kdiff3.cpp:633 +#: kdiff3.cpp:632 #, fuzzy, kde-format msgid "A vs. C Overview" msgstr "A . " -#: kdiff3.cpp:634 +#: kdiff3.cpp:633 #, fuzzy, kde-format msgid "B vs. C Overview" msgstr "Incamake" -#: kdiff3.cpp:635 +#: kdiff3.cpp:634 #, kde-format msgid "Word Wrap Diff Windows" msgstr "" -#: kdiff3.cpp:636 +#: kdiff3.cpp:635 #, kde-format msgid "Add Manual Diff Alignment" msgstr "" -#: kdiff3.cpp:637 +#: kdiff3.cpp:636 #, kde-format msgid "Clear All Manual Diff Alignments" msgstr "" -#: kdiff3.cpp:639 +#: kdiff3.cpp:638 #, fuzzy, kde-format msgid "Focus Next Window" msgstr "idirishya rikurikira" -#: kdiff3.cpp:640 +#: kdiff3.cpp:639 #, fuzzy, kde-format msgid "Focus Prev Window" msgstr "Kwerekeza ku idirishya: " -#: kdiff3.cpp:641 +#: kdiff3.cpp:640 #, fuzzy, kde-format msgid "Toggle Split Orientation" msgstr "Icyerekezo mwandiko" -#: kdiff3.cpp:643 +#: kdiff3.cpp:642 #, kde-format msgid "Dir && Text Split Screen View" msgstr "" -#: kdiff3.cpp:645 +#: kdiff3.cpp:644 #, kde-format msgid "Toggle Between Dir && Text View" msgstr "" -#: kdiff3.cpp:697 pdiff.cpp:1909 +#: kdiff3.cpp:696 pdiff.cpp:1919 #, fuzzy, kde-format msgid "The merge result has not been saved." msgstr "Gukomatanya Igisubizo . " -#: kdiff3.cpp:699 +#: kdiff3.cpp:698 #, fuzzy, kde-format msgid "Save && Quit" msgstr "Kubika & & " -#: kdiff3.cpp:700 +#: kdiff3.cpp:699 #, fuzzy, kde-format msgid "Quit Without Saving" msgstr "Komeka utahinduye imiterere" -#: kdiff3.cpp:708 pdiff.cpp:1920 +#: kdiff3.cpp:707 pdiff.cpp:1930 #, fuzzy, kde-format msgid "Saving the merge result failed." msgstr "i Gukomatanya Igisubizo Byanze . " -#: kdiff3.cpp:719 pdiff.cpp:1032 +#: kdiff3.cpp:718 pdiff.cpp:1030 #, fuzzy, kde-format msgid "" "You are currently doing a directory merge. Are you sure, you want to abort?" msgstr "A Ububiko Gukomatanya . , Kuri Kureka ? " -#: kdiff3.cpp:742 +#: kdiff3.cpp:741 #, fuzzy, kde-format msgid "Saving file..." msgstr "Idosiye ... " -#: kdiff3.cpp:759 +#: kdiff3.cpp:758 #, fuzzy, kde-format msgid "Saving file with a new filename..." msgstr "Idosiye Na: A Gishya Izina ry'idosiye: ... " -#: kdiff3.cpp:761 +#: kdiff3.cpp:760 #, kde-format msgid "Save As..." msgstr "" -#: kdiff3.cpp:820 +#: kdiff3.cpp:819 #, fuzzy, kde-format msgid "Printing not implemented." msgstr "Igikorwa Byuzuye . " -#: kdiff3.cpp:857 +#: kdiff3.cpp:858 #, fuzzy, kde-format msgid "Printing..." msgstr "Tegereza..." -#: kdiff3.cpp:943 +#: kdiff3.cpp:948 #, kde-format msgid "Printing page %1 of %2" msgstr "" -#: kdiff3.cpp:1000 +#: kdiff3.cpp:1006 #, fuzzy, kde-format msgid " (Selection)" msgstr "Gutoranya imyandikire" -#: kdiff3.cpp:1027 +#: kdiff3.cpp:1034 #, fuzzy, kde-format msgid "Printing completed." msgstr "Igikorwa Byuzuye . " -#: kdiff3.cpp:1031 +#: kdiff3.cpp:1038 #, fuzzy, kde-format msgid "Printing aborted." msgstr "Igikorwa Byuzuye . " -#: kdiff3.cpp:1038 +#: kdiff3.cpp:1045 #, fuzzy, kde-format msgid "Exiting..." msgstr "Tegereza..." -#: kdiff3.cpp:1049 +#: kdiff3.cpp:1056 #, fuzzy, kde-format msgid "Toggling toolbar..." msgstr "Umwanyabikoresho ... " -#: kdiff3.cpp:1070 +#: kdiff3.cpp:1077 #, fuzzy, kde-format msgid "Toggle the statusbar..." msgstr "i Umurongomiterere ... " @@ -1550,7 +1555,7 @@ msgid "Joachim Eibl" msgstr "" -#: kdiff3_part.cpp:173 kdiff3_part.cpp:254 +#: kdiff3_part.cpp:174 kdiff3_part.cpp:255 #, fuzzy, kde-format msgid "Could not find files for comparison." msgstr "Gushaka Idosiye ya: . " @@ -1568,7 +1573,7 @@ msgstr "Kuboneza Gucapa na KDE" #. i18n: ectx: ToolBar (mainToolBar) -#: kdiff3_part.rc:16 main.cpp:88 +#: kdiff3_part.rc:16 main.cpp:89 #, fuzzy, kde-format msgid "KDiff3" msgstr "Igabanya" @@ -1639,169 +1644,174 @@ msgid "Main Toolbar" msgstr "" -#: main.cpp:68 main.cpp:72 +#: main.cpp:69 main.cpp:73 #, kde-format msgid "Ignored. (User defined.)" msgstr "" -#: main.cpp:92 +#: main.cpp:93 #, kde-format msgid " (64 bit)" msgstr "" -#: main.cpp:94 +#: main.cpp:95 #, kde-format msgid " (32 bit)" msgstr "" -#: main.cpp:95 +#: main.cpp:96 #, fuzzy, kde-format msgid "Tool for Comparison and Merge of Files and Directories" msgstr "ya: na Bya na " -#: main.cpp:96 +#: main.cpp:97 #, kde-format msgid "(c) 2002-2014 Joachim Eibl, (c) 2017 Michael Reeves KF5/Qt5 port" msgstr "" -#: main.cpp:112 +#: main.cpp:113 #, fuzzy, kde-format msgid "Merge the input." msgstr "i Iyinjiza . " -#: main.cpp:113 +#: main.cpp:114 #, fuzzy, kde-format msgid "Explicit base file. For compatibility with certain tools." msgstr "SHINGIRO Idosiye . Bihuye neza Na: Ibikoresho . " -#: main.cpp:114 +#: main.cpp:115 #, fuzzy, kde-format msgid "Output file. Implies -m. E.g.: -o newfile.txt" msgstr "E. G." -#: main.cpp:115 +#: main.cpp:116 #, fuzzy, kde-format msgid "Output file, again. (For compatibility with certain tools.)" msgstr "Idosiye , Nanone . ( Bihuye neza Na: Ibikoresho . ) " -#: main.cpp:116 +#: main.cpp:118 #, fuzzy, kde-format msgid "No GUI if all conflicts are auto-solvable. (Needs -o file)" msgstr "NIBA Byose Ikiyega - . ( - o Idosiye ) " -#: main.cpp:117 +#: main.cpp:120 +#, fuzzy, kde-format +msgid "Ignored." +msgstr "Kwirengagiza Inshuro Imwe" + +#: main.cpp:122 #, fuzzy, kde-format msgid "Do not solve conflicts automatically." msgstr "mu buryo bwikora: . ( Bihuye neza ... ) " -#: main.cpp:118 +#: main.cpp:123 #, fuzzy, kde-format msgid "Visible name replacement for input file 1 (base)." msgstr "Izina: ya: Iyinjiza Idosiye 1 ( SHINGIRO ) . " -#: main.cpp:119 +#: main.cpp:124 #, fuzzy, kde-format msgid "Visible name replacement for input file 2." msgstr "Izina: ya: Iyinjiza Idosiye 2 . " -#: main.cpp:120 +#: main.cpp:125 #, fuzzy, kde-format msgid "Visible name replacement for input file 3." msgstr "Izina: ya: Iyinjiza Idosiye 3 . " -#: main.cpp:121 +#: main.cpp:126 #, fuzzy, kde-format msgid "Alternative visible name replacement. Supply this once for every input." msgstr "Kigaragara Izina: . iyi Rimwe ya: buri Iyinjiza . " -#: main.cpp:122 +#: main.cpp:127 #, kde-format msgid "" "Override a config setting. Use once for every setting. E.g.: --cs " "\"AutoAdvance=1\"" msgstr "" -#: main.cpp:123 +#: main.cpp:128 #, kde-format msgid "Show list of config settings and current values." msgstr "" -#: main.cpp:124 +#: main.cpp:129 #, fuzzy, kde-format msgid "Use a different config file." msgstr "Bya Idosiye : " -#: main.cpp:127 +#: main.cpp:132 #, fuzzy, kde-format msgid "file1 to open (base, if not specified via --base)" msgstr "Kuri Gufungura ( SHINGIRO , NIBA OYA Biturutse - - SHINGIRO ) " -#: main.cpp:128 +#: main.cpp:133 #, fuzzy, kde-format msgid "file2 to open" msgstr "Kuri Gufungura " -#: main.cpp:129 +#: main.cpp:134 #, fuzzy, kde-format msgid "file3 to open" msgstr "Kuri Gufungura " -#: main.cpp:153 +#: main.cpp:158 #, kde-format msgid "See kdiff3 --help for supported options." msgstr "" -#: mergeresultwindow.cpp:158 +#: mergeresultwindow.cpp:171 #, fuzzy, kde-format msgid "Choose A Everywhere" msgstr "A " -#: mergeresultwindow.cpp:159 +#: mergeresultwindow.cpp:172 #, fuzzy, kde-format msgid "Choose B Everywhere" msgstr "Hitamo darayiva" -#: mergeresultwindow.cpp:160 +#: mergeresultwindow.cpp:173 #, fuzzy, kde-format msgid "Choose C Everywhere" msgstr "Hitamo darayiva" -#: mergeresultwindow.cpp:161 +#: mergeresultwindow.cpp:174 #, fuzzy, kde-format msgid "Choose A for All Unsolved Conflicts" msgstr "A ya: " -#: mergeresultwindow.cpp:162 +#: mergeresultwindow.cpp:175 #, fuzzy, kde-format msgid "Choose B for All Unsolved Conflicts" msgstr "ya: " -#: mergeresultwindow.cpp:163 +#: mergeresultwindow.cpp:176 #, fuzzy, kde-format msgid "Choose C for All Unsolved Conflicts" msgstr "ya: " -#: mergeresultwindow.cpp:164 +#: mergeresultwindow.cpp:177 #, fuzzy, kde-format msgid "Choose A for All Unsolved Whitespace Conflicts" msgstr "A ya: " -#: mergeresultwindow.cpp:165 +#: mergeresultwindow.cpp:178 #, fuzzy, kde-format msgid "Choose B for All Unsolved Whitespace Conflicts" msgstr "ya: " -#: mergeresultwindow.cpp:166 +#: mergeresultwindow.cpp:179 #, fuzzy, kde-format msgid "Choose C for All Unsolved Whitespace Conflicts" msgstr "ya: " -#: mergeresultwindow.cpp:176 +#: mergeresultwindow.cpp:204 #, fuzzy, kde-format msgid "Number of remaining unsolved conflicts: %1 (of which %2 are whitespace)" msgstr "Bya : %1 ( Bya %2 ) " -#: mergeresultwindow.cpp:370 +#: mergeresultwindow.cpp:398 #, fuzzy, kde-format msgid "" "The output has been modified.\n" @@ -1810,29 +1820,29 @@ "Ibisohoka Byahinduwe: . \n" "Gukomeza Amahinduka . " -#: mergeresultwindow.cpp:936 pdiff.cpp:827 +#: mergeresultwindow.cpp:964 pdiff.cpp:817 #, fuzzy, kde-format msgid "All input files are binary equal." msgstr "Iyinjiza Idosiye Nyabibiri bingana . " -#: mergeresultwindow.cpp:938 +#: mergeresultwindow.cpp:966 #, fuzzy, kde-format msgid "All input files contain the same text." msgstr "Iyinjiza Idosiye i Umwandiko . " -#: mergeresultwindow.cpp:942 mergeresultwindow.cpp:946 -#: mergeresultwindow.cpp:950 pdiff.cpp:833 pdiff.cpp:837 pdiff.cpp:841 +#: mergeresultwindow.cpp:970 mergeresultwindow.cpp:974 +#: mergeresultwindow.cpp:978 pdiff.cpp:823 pdiff.cpp:827 pdiff.cpp:831 #, fuzzy, kde-format msgid "Files %1 and %2 are binary equal.\n" msgstr "na Nyabibiri bingana . \n" -#: mergeresultwindow.cpp:944 mergeresultwindow.cpp:948 -#: mergeresultwindow.cpp:952 +#: mergeresultwindow.cpp:972 mergeresultwindow.cpp:976 +#: mergeresultwindow.cpp:980 #, fuzzy, kde-format msgid "Files %1 and %2 have equal text.\n" msgstr "A na bingana Umwandiko . \n" -#: mergeresultwindow.cpp:958 +#: mergeresultwindow.cpp:986 #, kde-format msgid "" "Total number of conflicts: %1\n" @@ -1841,27 +1851,27 @@ "%4" msgstr "" -#: mergeresultwindow.cpp:964 +#: mergeresultwindow.cpp:992 #, fuzzy, kde-format msgid "Conflicts" msgstr "Ishyamirana ry'ingenzi" -#: mergeresultwindow.cpp:1873 +#: mergeresultwindow.cpp:1901 #, fuzzy, kde-format msgid "" msgstr "< Umurongo: > " -#: mergeresultwindow.cpp:1881 +#: mergeresultwindow.cpp:1909 #, kde-format msgid "" msgstr "" -#: mergeresultwindow.cpp:1883 mergeresultwindow.cpp:2755 +#: mergeresultwindow.cpp:1911 mergeresultwindow.cpp:2783 #, fuzzy, kde-format msgid "" msgstr "Ishyamirana ry'ingenzi" -#: mergeresultwindow.cpp:2967 +#: mergeresultwindow.cpp:2995 #, fuzzy, kde-format msgid "" "Not all conflicts are solved yet.\n" @@ -1870,12 +1880,12 @@ "Byose . \n" "Idosiye OYA . \n" -#: mergeresultwindow.cpp:2969 mergeresultwindow.cpp:2978 +#: mergeresultwindow.cpp:2997 mergeresultwindow.cpp:3006 #, fuzzy, kde-format msgid "Conflicts Left" msgstr "Guhitamo Ibumoso" -#: mergeresultwindow.cpp:2976 +#: mergeresultwindow.cpp:3004 #, kde-format msgid "" "There is a line end style conflict. Please choose the line end style " @@ -1883,7 +1893,7 @@ "File not saved." msgstr "" -#: mergeresultwindow.cpp:2990 +#: mergeresultwindow.cpp:3018 #, fuzzy, kde-format msgid "" "\n" @@ -1894,58 +1904,58 @@ "\n" "Inyibutsa Byanze . Idosiye OYA . " -#: mergeresultwindow.cpp:2990 mergeresultwindow.cpp:3038 +#: mergeresultwindow.cpp:3018 mergeresultwindow.cpp:3066 #, fuzzy, kde-format msgid "File Save Error" msgstr "Idosiye Kubika Ikosa " -#: mergeresultwindow.cpp:3038 +#: mergeresultwindow.cpp:3066 #, fuzzy, kde-format msgid "Error while writing." msgstr "Ikosa . " -#: mergeresultwindow.cpp:3110 +#: mergeresultwindow.cpp:3138 #, fuzzy, kde-format #| msgid "Output" msgid "Output:" msgstr "Ibisohoka" -#: mergeresultwindow.cpp:3123 mergeresultwindow.cpp:3315 +#: mergeresultwindow.cpp:3151 mergeresultwindow.cpp:3343 #, fuzzy, kde-format msgid "[Modified]" msgstr "Byahinduwe" -#: mergeresultwindow.cpp:3130 +#: mergeresultwindow.cpp:3158 #, fuzzy, kde-format msgid "Encoding for saving:" msgstr "Idosiye ya: : " -#: mergeresultwindow.cpp:3230 +#: mergeresultwindow.cpp:3258 #, fuzzy, kde-format msgid "Conflict" msgstr "Ishyamirana ry'ingenzi" -#: mergeresultwindow.cpp:3262 +#: mergeresultwindow.cpp:3290 #, kde-format msgid "Codec from A: %1" msgstr "" -#: mergeresultwindow.cpp:3264 +#: mergeresultwindow.cpp:3292 #, kde-format msgid "Codec from B: %1" msgstr "" -#: mergeresultwindow.cpp:3266 +#: mergeresultwindow.cpp:3294 #, kde-format msgid "Codec from C: %1" msgstr "" -#: optiondialog.cpp:119 +#: optiondialog.cpp:121 #, kde-format msgid "Change Font" msgstr "" -#: optiondialog.cpp:135 optiondialog.cpp:145 +#: optiondialog.cpp:137 optiondialog.cpp:147 #, kde-format msgid "" "Font: %1, %2, %3\n" @@ -1953,162 +1963,162 @@ "Example:" msgstr "" -#: optiondialog.cpp:388 +#: optiondialog.cpp:390 #, kde-format msgid "Unicode" msgstr "Inikode" -#: optiondialog.cpp:389 +#: optiondialog.cpp:391 #, fuzzy, kde-format msgid "Latin1" msgstr "Ikilatini-1" -#: optiondialog.cpp:408 +#: optiondialog.cpp:410 #, fuzzy, kde-format msgid "Change this if non-ASCII characters are not displayed correctly." msgstr "iyi NIBA - Inyuguti OYA . " -#: optiondialog.cpp:491 +#: optiondialog.cpp:495 #, fuzzy, kde-format #| msgid "Configure..." msgid "Configure" msgstr "Kugena imiterere..." -#: optiondialog.cpp:568 +#: optiondialog.cpp:573 #, kde-format msgid "Font" msgstr "" -#: optiondialog.cpp:570 +#: optiondialog.cpp:575 #, kde-format msgid "Editor & Diff Output Font" msgstr "" -#: optiondialog.cpp:589 +#: optiondialog.cpp:594 #, kde-format msgid "Application font" msgstr "" -#: optiondialog.cpp:594 +#: optiondialog.cpp:599 #, fuzzy, kde-format msgid "File view font" msgstr "Idosiye Kubika Ikosa " -#: optiondialog.cpp:613 +#: optiondialog.cpp:618 #, fuzzy, kde-format #| msgid "Color" msgctxt "Title for color settings page" msgid "Color" msgstr "Ibara" -#: optiondialog.cpp:614 +#: optiondialog.cpp:619 #, fuzzy, kde-format msgid "Colors Settings" msgstr "Amagenamiterere y'Akarere" -#: optiondialog.cpp:631 +#: optiondialog.cpp:644 #, kde-format msgid "Editor and Diff Views:" msgstr "" -#: optiondialog.cpp:639 +#: optiondialog.cpp:652 #, kde-format msgid "Foreground color:" msgstr "Ibara ry'imbugambanza:" -#: optiondialog.cpp:647 +#: optiondialog.cpp:660 #, kde-format msgid "Background color:" msgstr "Ibara ry'imbuganyuma:" -#: optiondialog.cpp:657 +#: optiondialog.cpp:670 #, fuzzy, kde-format msgid "Diff background color:" msgstr "Mbuganyuma Ibara: : " -#: optiondialog.cpp:666 +#: optiondialog.cpp:679 #, fuzzy, kde-format msgid "Color A:" msgstr "A : " -#: optiondialog.cpp:675 +#: optiondialog.cpp:688 #, fuzzy, kde-format msgid "Color B:" msgstr "Ibara:" -#: optiondialog.cpp:684 +#: optiondialog.cpp:697 #, fuzzy, kde-format msgid "Color C:" msgstr "Ibara:" -#: optiondialog.cpp:692 +#: optiondialog.cpp:705 #, fuzzy, kde-format msgid "Conflict color:" msgstr "Ibara: : " -#: optiondialog.cpp:701 +#: optiondialog.cpp:714 #, fuzzy, kde-format msgid "Current range background color:" msgstr "Urutonde Mbuganyuma Ibara: : " -#: optiondialog.cpp:710 +#: optiondialog.cpp:723 #, fuzzy, kde-format msgid "Current range diff background color:" msgstr "Urutonde Mbuganyuma Ibara: : " -#: optiondialog.cpp:718 +#: optiondialog.cpp:731 #, kde-format msgid "Color for manually aligned difference ranges:" msgstr "" -#: optiondialog.cpp:725 +#: optiondialog.cpp:738 #, fuzzy, kde-format msgid "Directory Comparison View:" msgstr "Inzira y'ububiko" -#: optiondialog.cpp:731 +#: optiondialog.cpp:744 #, kde-format msgid "Newest file color:" msgstr "" -#: optiondialog.cpp:736 +#: optiondialog.cpp:749 #, kde-format msgid "" "Changing this color will only be effective when starting the next directory " "comparison." msgstr "" -#: optiondialog.cpp:741 +#: optiondialog.cpp:754 #, kde-format msgid "Oldest file color:" msgstr "" -#: optiondialog.cpp:750 +#: optiondialog.cpp:763 #, kde-format msgid "Middle age file color:" msgstr "" -#: optiondialog.cpp:759 +#: optiondialog.cpp:772 #, kde-format msgid "Color for missing files:" msgstr "" -#: optiondialog.cpp:773 +#: optiondialog.cpp:786 #, kde-format msgid "Editor" msgstr "Muhinduzi" -#: optiondialog.cpp:774 +#: optiondialog.cpp:787 #, fuzzy, kde-format msgid "Editor Behavior" msgstr "imyitwarire" -#: optiondialog.cpp:787 +#: optiondialog.cpp:809 #, fuzzy, kde-format msgid "Tab inserts spaces" msgstr "Imyanya " -#: optiondialog.cpp:791 +#: optiondialog.cpp:813 #, fuzzy, kde-format msgid "" "On: Pressing tab generates the appropriate number of spaces.\n" @@ -2117,36 +2127,36 @@ ": tab i Umubare Bya Imyanya . \n" ": A - Inyuguti: Byinjijwemo . " -#: optiondialog.cpp:796 +#: optiondialog.cpp:818 #, fuzzy, kde-format msgid "Tab size:" msgstr "Ingano: : " -#: optiondialog.cpp:803 +#: optiondialog.cpp:825 #, fuzzy, kde-format msgid "Auto indentation" msgstr "Isunika " -#: optiondialog.cpp:807 +#: optiondialog.cpp:829 #, fuzzy, kde-format msgid "On: The indentation of the previous line is used for a new line.\n" msgstr "" ": Isunika Bya i Ibanjirije Umurongo: ni Byakoreshejwe ya: A Gishya " "Umurongo: . \n" -#: optiondialog.cpp:810 +#: optiondialog.cpp:832 #, fuzzy, kde-format msgid "Auto copy selection" msgstr "Gukoporora Ihitamo " -#: optiondialog.cpp:814 +#: optiondialog.cpp:836 #, fuzzy, kde-format msgid "" "On: Any selection is immediately written to the clipboard.\n" "Off: You must explicitly copy e.g. via Ctrl-C." msgstr "G." -#: optiondialog.cpp:829 +#: optiondialog.cpp:851 #, fuzzy, kde-format msgid "" "Sets the line endings for when an edited file is saved.\n" @@ -2155,12 +2165,12 @@ "i Umurongo: ya: Ryari: Idosiye ni . \n" "/: + ; : ; Na: = , = " -#: optiondialog.cpp:839 +#: optiondialog.cpp:861 #, fuzzy, kde-format msgid "Diff" msgstr "Igabanya" -#: optiondialog.cpp:840 +#: optiondialog.cpp:862 #, fuzzy, kde-format msgid "Diff Settings" msgstr "Iganamiterere rya musomyi" @@ -2174,12 +2184,12 @@ #. ); #. ++line; #. -#: optiondialog.cpp:865 +#: optiondialog.cpp:896 #, fuzzy, kde-format msgid "Ignore numbers (treat as white space)" msgstr "/+ + Ibisobanuro nka Umweru Umwanya . " -#: optiondialog.cpp:869 +#: optiondialog.cpp:900 #, fuzzy, kde-format msgid "" "Ignore number characters during line matching phase. (Similar to Ignore " @@ -2189,42 +2199,42 @@ "Umubare Inyuguti Umurongo: . ( Kuri Umweru Umwanya . ) \n" "Ifashayobora Kuri Kugereranya # Idosiye Na: Bikurikije umubare Ibyatanzwe . " -#: optiondialog.cpp:873 +#: optiondialog.cpp:904 #, fuzzy, kde-format msgid "Ignore C/C++ comments (treat as white space)" msgstr "/+ + Ibisobanuro nka Umweru Umwanya . " -#: optiondialog.cpp:876 +#: optiondialog.cpp:907 #, fuzzy, kde-format msgid "Treat C/C++ comments like white space." msgstr "/+ + Ibisobanuro nka Umweru Umwanya . " -#: optiondialog.cpp:879 +#: optiondialog.cpp:910 #, fuzzy, kde-format msgid "Ignore case (treat as white space)" msgstr "/+ + Ibisobanuro nka Umweru Umwanya . " -#: optiondialog.cpp:883 +#: optiondialog.cpp:914 #, fuzzy, kde-format msgid "Treat case differences like white space changes. ('a'<=>'A')" msgstr "Ibinyuranyo nka Umweru Umwanya Amahinduka . ( ' < = > ' ) " -#: optiondialog.cpp:886 +#: optiondialog.cpp:917 #, fuzzy, kde-format msgid "Preprocessor command:" msgstr "command : " -#: optiondialog.cpp:891 +#: optiondialog.cpp:922 #, fuzzy, kde-format msgid "User defined pre-processing. (See the docs for details.)" msgstr "Byahawe imiterere mbere - Inonosora . ( i ya: Birambuye . ) " -#: optiondialog.cpp:894 +#: optiondialog.cpp:925 #, fuzzy, kde-format msgid "Line-matching preprocessor command:" msgstr "- command : " -#: optiondialog.cpp:899 +#: optiondialog.cpp:930 #, fuzzy, kde-format msgid "" "This pre-processor is only used during line matching.\n" @@ -2233,12 +2243,12 @@ "Byahawe imiterere mbere - ni Byakoreshejwe Umurongo: . \n" "( i ya: Birambuye . ) " -#: optiondialog.cpp:902 +#: optiondialog.cpp:933 #, fuzzy, kde-format msgid "Try hard (slower)" msgstr "Ikomeye ( ) " -#: optiondialog.cpp:906 +#: optiondialog.cpp:937 #, fuzzy, kde-format msgid "" "Enables the --minimal option for the external diff.\n" @@ -2247,12 +2257,12 @@ "i - - Ihitamo ya: i external . \n" "Bya Idosiye . " -#: optiondialog.cpp:910 +#: optiondialog.cpp:941 #, kde-format msgid "Align B and C for 3 input files" msgstr "" -#: optiondialog.cpp:914 +#: optiondialog.cpp:945 #, kde-format msgid "" "Try to align B and C when comparing or merging three input files.\n" @@ -2260,17 +2270,24 @@ "(Default is off.)" msgstr "" -#: optiondialog.cpp:926 +#: optiondialog.cpp:956 +#, fuzzy, kde-format +#| msgid "Merge" +msgctxt "Settings page" +msgid "Merge" +msgstr "Gukomatanya" + +#: optiondialog.cpp:957 #, fuzzy, kde-format msgid "Merge Settings" msgstr "Iganamiterere rya musomyi" -#: optiondialog.cpp:940 +#: optiondialog.cpp:980 #, fuzzy, kde-format msgid "Auto advance delay (ms):" msgstr "Gutinda ( Madamu ) : " -#: optiondialog.cpp:946 +#: optiondialog.cpp:986 #, fuzzy, kde-format msgid "" "When in Auto-Advance mode the result of the current selection is shown \n" @@ -2279,27 +2296,27 @@ "in - Ubwoko i Igisubizo Bya i KIGEZWEHO Ihitamo ni \n" "ya: i Igihe , Mbere Kuri i Ibikurikira > . : 0 %S - Madamu " -#: optiondialog.cpp:950 +#: optiondialog.cpp:990 #, fuzzy, kde-format msgid "Show info dialogs" msgstr "A " -#: optiondialog.cpp:953 +#: optiondialog.cpp:993 #, kde-format msgid "Show a dialog with information about the number of conflicts." msgstr "" -#: optiondialog.cpp:956 +#: optiondialog.cpp:996 #, fuzzy, kde-format msgid "White space 2-file merge default:" msgstr "Umwanya 2 - Idosiye Gukomatanya Mburabuzi : " -#: optiondialog.cpp:961 optiondialog.cpp:974 +#: optiondialog.cpp:1001 optiondialog.cpp:1014 #, fuzzy, kde-format msgid "Manual Choice" msgstr "Ibishushanyo by'Intoki" -#: optiondialog.cpp:965 optiondialog.cpp:979 +#: optiondialog.cpp:1005 optiondialog.cpp:1019 #, fuzzy, kde-format msgid "" "Allow the merge algorithm to automatically select an input for white-space-" @@ -2308,22 +2325,22 @@ "i Gukomatanya Kuri mu buryo bwikora: Guhitamo Iyinjiza ya: Umweru - Umwanya " "- Amahinduka . " -#: optiondialog.cpp:969 +#: optiondialog.cpp:1009 #, fuzzy, kde-format msgid "White space 3-file merge default:" msgstr "Umwanya 3 - Idosiye Gukomatanya Mburabuzi : " -#: optiondialog.cpp:983 +#: optiondialog.cpp:1023 #, kde-format msgid "Automatic Merge Regular Expression" msgstr "" -#: optiondialog.cpp:991 smalldialogs.cpp:449 +#: optiondialog.cpp:1031 smalldialogs.cpp:459 #, kde-format msgid "Auto merge regular expression:" msgstr "" -#: optiondialog.cpp:996 +#: optiondialog.cpp:1036 #, kde-format msgid "" "Regular expression for lines where KDiff3 should automatically choose one " @@ -2332,29 +2349,29 @@ "- if available - C, otherwise B will be chosen." msgstr "" -#: optiondialog.cpp:1002 +#: optiondialog.cpp:1042 #, kde-format msgid "Run regular expression auto merge on merge start" msgstr "" -#: optiondialog.cpp:1005 +#: optiondialog.cpp:1045 #, kde-format msgid "" "Run the merge for auto merge regular expressions\n" "immediately when a merge starts.\n" msgstr "" -#: optiondialog.cpp:1010 +#: optiondialog.cpp:1050 #, kde-format msgid "Version Control History Merging" msgstr "" -#: optiondialog.cpp:1018 smalldialogs.cpp:476 +#: optiondialog.cpp:1058 smalldialogs.cpp:486 #, kde-format msgid "History start regular expression:" msgstr "" -#: optiondialog.cpp:1023 +#: optiondialog.cpp:1063 #, kde-format msgid "" "Regular expression for the start of the version control history entry.\n" @@ -2362,12 +2379,12 @@ "Default value: \".*\\$Log.*\\$.*\"" msgstr "" -#: optiondialog.cpp:1029 smalldialogs.cpp:504 +#: optiondialog.cpp:1069 smalldialogs.cpp:514 #, kde-format msgid "History entry start regular expression:" msgstr "" -#: optiondialog.cpp:1042 +#: optiondialog.cpp:1082 #, kde-format msgid "" "A version control history entry consists of several lines.\n" @@ -2379,22 +2396,22 @@ "See the documentation for details." msgstr "" -#: optiondialog.cpp:1050 +#: optiondialog.cpp:1090 #, kde-format msgid "History merge sorting" msgstr "" -#: optiondialog.cpp:1053 +#: optiondialog.cpp:1093 #, kde-format msgid "Sort version control history by a key." msgstr "" -#: optiondialog.cpp:1063 +#: optiondialog.cpp:1103 #, kde-format msgid "History entry start sort key order:" msgstr "" -#: optiondialog.cpp:1068 +#: optiondialog.cpp:1108 #, kde-format msgid "" "Each pair of parentheses used in the regular expression for the history " @@ -2406,37 +2423,37 @@ "See the documentation for details." msgstr "" -#: optiondialog.cpp:1079 +#: optiondialog.cpp:1119 #, kde-format msgid "Merge version control history on merge start" msgstr "" -#: optiondialog.cpp:1082 +#: optiondialog.cpp:1122 #, kde-format msgid "Run version control history automerge on merge start." msgstr "" -#: optiondialog.cpp:1086 +#: optiondialog.cpp:1126 #, fuzzy, kde-format msgid "Max number of history entries:" msgstr "Bya Ububiko bwungirije : " -#: optiondialog.cpp:1090 +#: optiondialog.cpp:1130 #, kde-format msgid "Cut off after specified number. Use -1 for infinite number of entries." msgstr "" -#: optiondialog.cpp:1094 +#: optiondialog.cpp:1134 #, kde-format msgid "Test your regular expressions" msgstr "" -#: optiondialog.cpp:1099 +#: optiondialog.cpp:1139 #, kde-format msgid "Irrelevant merge command:" msgstr "" -#: optiondialog.cpp:1104 +#: optiondialog.cpp:1144 #, kde-format msgid "" "If specified this script is run after automerge\n" @@ -2444,12 +2461,12 @@ "Called with the parameters: filename1 filename2 filename3" msgstr "" -#: optiondialog.cpp:1109 +#: optiondialog.cpp:1149 #, kde-format msgid "Auto save and quit on merge without conflicts" msgstr "" -#: optiondialog.cpp:1113 +#: optiondialog.cpp:1153 #, kde-format msgid "" "If KDiff3 was started for a file-merge from the command line and all\n" @@ -2458,27 +2475,27 @@ "(Similar to command line option \"--auto\".)" msgstr "" -#: optiondialog.cpp:1124 optiondialog.cpp:1125 +#: optiondialog.cpp:1164 optiondialog.cpp:1165 #, fuzzy, kde-format msgid "Directory" msgstr "Ububiko" -#: optiondialog.cpp:1137 +#: optiondialog.cpp:1185 #, fuzzy, kde-format msgid "Recursive directories" msgstr "ububiko bw'amaderese " -#: optiondialog.cpp:1140 +#: optiondialog.cpp:1188 #, fuzzy, kde-format msgid "Whether to analyze subdirectories or not." msgstr "Kuri Ububiko bwungirije Cyangwa OYA . " -#: optiondialog.cpp:1142 +#: optiondialog.cpp:1190 #, fuzzy, kde-format msgid "File pattern(s):" msgstr "Idosiye Ishusho ( S ) : " -#: optiondialog.cpp:1148 +#: optiondialog.cpp:1196 #, fuzzy, kde-format msgid "" "Pattern(s) of files to be analyzed. \n" @@ -2489,12 +2506,12 @@ ": ' * ' na ' ? ' \n" "ku ikoresha i Mutandukanya : ' ; ' " -#: optiondialog.cpp:1153 +#: optiondialog.cpp:1201 #, fuzzy, kde-format msgid "File-anti-pattern(s):" msgstr "Idosiye - - Ishusho ( S ) : " -#: optiondialog.cpp:1159 +#: optiondialog.cpp:1207 #, fuzzy, kde-format msgid "" "Pattern(s) of files to be excluded from analysis. \n" @@ -2505,12 +2522,12 @@ ": ' * ' na ' ? ' \n" "ku ikoresha i Mutandukanya : ' ; ' " -#: optiondialog.cpp:1164 +#: optiondialog.cpp:1212 #, fuzzy, kde-format msgid "Dir-anti-pattern(s):" msgstr "- - Ishusho ( S ) : " -#: optiondialog.cpp:1170 +#: optiondialog.cpp:1218 #, fuzzy, kde-format msgid "" "Pattern(s) of directories to be excluded from analysis. \n" @@ -2521,12 +2538,12 @@ ": ' * ' na ' ? ' \n" "ku ikoresha i Mutandukanya : ' " -#: optiondialog.cpp:1175 +#: optiondialog.cpp:1223 #, kde-format msgid "Use .cvsignore" msgstr "" -#: optiondialog.cpp:1179 +#: optiondialog.cpp:1227 #, fuzzy, kde-format msgid "" "Extends the antipattern to anything that would be ignored by CVS.\n" @@ -2535,22 +2552,22 @@ "i Kuri ku . \n" "Bya hafi \" . \" - Idosiye iyi Ububiko . " -#: optiondialog.cpp:1183 +#: optiondialog.cpp:1231 #, fuzzy, kde-format msgid "Find hidden files and directories" msgstr "Birahishe Idosiye na ububiko bw'amaderese " -#: optiondialog.cpp:1186 +#: optiondialog.cpp:1234 #, fuzzy, kde-format msgid "Finds hidden files and directories." msgstr "Birahishe Idosiye na ububiko bw'amaderese " -#: optiondialog.cpp:1189 +#: optiondialog.cpp:1237 #, fuzzy, kde-format msgid "Follow file links" msgstr "Idosiye amahuza " -#: optiondialog.cpp:1193 +#: optiondialog.cpp:1241 #, fuzzy, kde-format msgid "" "On: Compare the file the link points to.\n" @@ -2559,12 +2576,12 @@ ": i Idosiye i Ihuza Utudomo Kuri . \n" ": i amahuza . " -#: optiondialog.cpp:1197 +#: optiondialog.cpp:1245 #, fuzzy, kde-format msgid "Follow directory links" msgstr "Ububiko amahuza " -#: optiondialog.cpp:1201 +#: optiondialog.cpp:1249 #, fuzzy, kde-format msgid "" "On: Compare the directory the link points to.\n" @@ -2573,12 +2590,12 @@ ": i Ububiko i Ihuza Utudomo Kuri . \n" ": i amahuza . " -#: optiondialog.cpp:1210 +#: optiondialog.cpp:1258 #, kde-format msgid "Case sensitive filename comparison" msgstr "" -#: optiondialog.cpp:1214 +#: optiondialog.cpp:1262 #, kde-format msgid "" "The directory comparison will compare files or directories when their names " @@ -2587,51 +2604,51 @@ "off, otherwise on.)" msgstr "" -#: optiondialog.cpp:1218 +#: optiondialog.cpp:1266 #, fuzzy, kde-format msgid "Unfold all subdirectories on load" msgstr "Kuri Ububiko bwungirije Cyangwa OYA . " -#: optiondialog.cpp:1222 +#: optiondialog.cpp:1270 #, kde-format msgid "" "On: Unfold all subdirectories when starting a directory diff.\n" "Off: Leave subdirectories folded." msgstr "" -#: optiondialog.cpp:1226 +#: optiondialog.cpp:1274 #, kde-format msgid "Skip directory status report" msgstr "" -#: optiondialog.cpp:1230 +#: optiondialog.cpp:1278 #, kde-format msgid "" "On: Do not show the Directory Comparison Status.\n" "Off: Show the status dialog on start." msgstr "" -#: optiondialog.cpp:1234 +#: optiondialog.cpp:1282 #, fuzzy, kde-format msgid "File Comparison Mode" msgstr "Idosiye " -#: optiondialog.cpp:1239 +#: optiondialog.cpp:1287 #, kde-format msgid "Binary comparison" msgstr "" -#: optiondialog.cpp:1241 +#: optiondialog.cpp:1289 #, fuzzy, kde-format msgid "Binary comparison of each file. (Default)" msgstr "Bya Idosiye . ( ) " -#: optiondialog.cpp:1244 +#: optiondialog.cpp:1292 #, fuzzy, kde-format msgid "Full analysis" msgstr "Kwikaraga hose" -#: optiondialog.cpp:1246 +#: optiondialog.cpp:1294 #, fuzzy, kde-format msgid "" "Do a full analysis and show statistics information in extra columns.\n" @@ -2640,12 +2657,12 @@ "A Cyuzuye na Herekana %S Sitatisitiki Ibisobanuro: in Birenga Inkingi: . \n" "( A Nyabibiri , ya: Nyabibiri Idosiye . ) " -#: optiondialog.cpp:1250 +#: optiondialog.cpp:1298 #, fuzzy, kde-format msgid "Trust the size and modification date (unsafe)" msgstr "i Itariki: ( ) " -#: optiondialog.cpp:1252 +#: optiondialog.cpp:1300 #, fuzzy, kde-format msgid "" "Assume that files are equal if the modification date and file length are " @@ -2657,14 +2674,14 @@ "Idosiye bingana NIBA i Itariki: na Idosiye Uburebure bingana . \n" "ya: ububiko bw'amaderese Cyangwa Buhoro . " -#: optiondialog.cpp:1257 +#: optiondialog.cpp:1305 #, fuzzy, kde-format msgid "" "Trust the size and date, but use binary comparison if date does not match " "(unsafe)" msgstr "i Itariki: ( ) " -#: optiondialog.cpp:1259 +#: optiondialog.cpp:1307 #, fuzzy, kde-format msgid "" "Assume that files are equal if the modification date and file length are " @@ -2675,12 +2692,12 @@ "Idosiye bingana NIBA i Itariki: na Idosiye Uburebure bingana . \n" "ya: ububiko bw'amaderese Cyangwa Buhoro . " -#: optiondialog.cpp:1264 +#: optiondialog.cpp:1312 #, fuzzy, kde-format msgid "Trust the size (unsafe)" msgstr "i Ingano: ( ) " -#: optiondialog.cpp:1266 +#: optiondialog.cpp:1314 #, fuzzy, kde-format msgid "" "Assume that files are equal if their file lengths are equal.\n" @@ -2691,12 +2708,12 @@ "ya: ububiko bw'amaderese Cyangwa Buhoro Ryari: i Itariki: ni Byahinduwe: " "Iyimura . " -#: optiondialog.cpp:1273 +#: optiondialog.cpp:1321 #, fuzzy, kde-format msgid "Synchronize directories" msgstr "ububiko bw'amaderese " -#: optiondialog.cpp:1277 +#: optiondialog.cpp:1325 #, fuzzy, kde-format msgid "" "Offers to store files in both directories so that\n" @@ -2706,12 +2723,12 @@ "Kuri Idosiye in Byombi ububiko bw'amaderese ububiko bw'amaderese i . \n" "Ryari: Kabiri ububiko bw'amaderese A Ishyika: . " -#: optiondialog.cpp:1283 +#: optiondialog.cpp:1331 #, fuzzy, kde-format msgid "White space differences considered equal" msgstr "Umwanya Ibinyuranyo bingana " -#: optiondialog.cpp:1287 +#: optiondialog.cpp:1335 #, fuzzy, kde-format msgid "" "If files differ only by white space consider them equal.\n" @@ -2720,12 +2737,12 @@ "Idosiye ku Umweru Umwanya bingana . \n" "ni Gikora Ryari: Cyuzuye ni . " -#: optiondialog.cpp:1293 +#: optiondialog.cpp:1341 #, fuzzy, kde-format msgid "Copy newer instead of merging (unsafe)" msgstr "Bya ( ) " -#: optiondialog.cpp:1297 +#: optiondialog.cpp:1345 #, fuzzy, kde-format msgid "" "Do not look inside, just take the newer file.\n" @@ -2736,12 +2753,12 @@ "( iyi NIBA ! ) \n" "CYUZUYE Ryari: Kabiri ububiko bw'amaderese . " -#: optiondialog.cpp:1302 +#: optiondialog.cpp:1350 #, fuzzy, kde-format msgid "Backup files (.orig)" msgstr "Idosiye ( . ) " -#: optiondialog.cpp:1306 +#: optiondialog.cpp:1354 #, fuzzy, kde-format msgid "" "If a file would be saved over an old file, then the old file\n" @@ -2750,17 +2767,17 @@ "A Idosiye KURI ki/bishaje Idosiye , Hanyuma i ki/bishaje Na: A ' . - " "Umugereka: Bya Kyasibwe: %S . " -#: optiondialog.cpp:1382 optiondialog.cpp:1383 +#: optiondialog.cpp:1430 optiondialog.cpp:1431 #, fuzzy, kde-format msgid "Regional Settings" msgstr "Amagenamiterere y'Akarere" -#: optiondialog.cpp:1397 +#: optiondialog.cpp:1454 #, fuzzy, kde-format msgid "Use the same encoding for everything:" msgstr "i Imisobekere: ya: : " -#: optiondialog.cpp:1401 +#: optiondialog.cpp:1458 #, fuzzy, kde-format msgid "" "Enable this allows to change all encodings by changing the first only.\n" @@ -2769,17 +2786,17 @@ "iyi Kuri Guhindura... Byose ku i Itangira . \n" "iyi NIBA Igenamiterere . " -#: optiondialog.cpp:1405 +#: optiondialog.cpp:1462 #, fuzzy, kde-format msgid "Note: Local Encoding is \"%1\"" msgstr "icyitonderwa : ni " -#: optiondialog.cpp:1409 +#: optiondialog.cpp:1466 #, fuzzy, kde-format msgid "File Encoding for A:" msgstr "Idosiye ya: A : " -#: optiondialog.cpp:1416 +#: optiondialog.cpp:1473 #, kde-format msgid "" "If enabled then Unicode (UTF-16 or UTF-8) encoding will be detected.\n" @@ -2788,32 +2805,32 @@ "(Unicode detection depends on the first bytes of a file.)" msgstr "" -#: optiondialog.cpp:1419 optiondialog.cpp:1430 optiondialog.cpp:1441 +#: optiondialog.cpp:1476 optiondialog.cpp:1487 optiondialog.cpp:1498 #, kde-format msgid "Auto Detect Unicode" msgstr "" -#: optiondialog.cpp:1425 +#: optiondialog.cpp:1482 #, fuzzy, kde-format msgid "File Encoding for B:" msgstr "Idosiye ya: : " -#: optiondialog.cpp:1436 +#: optiondialog.cpp:1493 #, fuzzy, kde-format msgid "File Encoding for C:" msgstr "Idosiye ya: : " -#: optiondialog.cpp:1447 +#: optiondialog.cpp:1504 #, fuzzy, kde-format msgid "File Encoding for Merge Output and Saving:" msgstr "Idosiye ya: na : " -#: optiondialog.cpp:1452 +#: optiondialog.cpp:1509 #, fuzzy, kde-format msgid "Auto Select" msgstr "Gukoporora Ihitamo " -#: optiondialog.cpp:1456 +#: optiondialog.cpp:1513 #, kde-format msgid "" "If enabled then the encoding from the input files is used.\n" @@ -2821,17 +2838,17 @@ "saving." msgstr "" -#: optiondialog.cpp:1459 +#: optiondialog.cpp:1516 #, fuzzy, kde-format msgid "File Encoding for Preprocessor Files:" msgstr "Idosiye ya: : " -#: optiondialog.cpp:1471 +#: optiondialog.cpp:1528 #, fuzzy, kde-format msgid "Right To Left Language" msgstr "Iburyo ku ibumoso" -#: optiondialog.cpp:1475 +#: optiondialog.cpp:1532 #, fuzzy, kde-format msgid "" "Some languages are read from right to left.\n" @@ -2840,22 +2857,22 @@ "Indimi Soma Kuva: Iburyo: Kuri Ibumoso: . \n" "Igenamiterere Guhindura... i na Muhinduzi . " -#: optiondialog.cpp:1485 +#: optiondialog.cpp:1542 #, fuzzy, kde-format msgid "Integration" msgstr "Igikorwa" -#: optiondialog.cpp:1486 +#: optiondialog.cpp:1543 #, fuzzy, kde-format msgid "Integration Settings" msgstr "Amagenamiterere y'Akarere" -#: optiondialog.cpp:1499 +#: optiondialog.cpp:1564 #, kde-format msgid "Command line options to ignore:" msgstr "" -#: optiondialog.cpp:1505 +#: optiondialog.cpp:1570 #, kde-format msgid "" "List of command line options that should be ignored when KDiff3 is used by " @@ -2864,19 +2881,19 @@ "This will suppress the \"Unknown option\" error." msgstr "" -#: optiondialog.cpp:1510 +#: optiondialog.cpp:1575 #, kde-format msgid "Quit also via Escape key" msgstr "" -#: optiondialog.cpp:1514 +#: optiondialog.cpp:1579 #, kde-format msgid "" "Fast method to exit.\n" "For those who are used to using the Escape key." msgstr "" -#: optiondialog.cpp:1598 +#: optiondialog.cpp:1653 #, fuzzy, kde-format msgid "This resets all options. Not only those of the current topic." msgstr "Byose Amahitamo . Bya i KIGEZWEHO . " @@ -2931,77 +2948,67 @@ msgid "Disable Unsafe Options" msgstr "Anga amahitamo y'ishakisha y'urwego rwo hejuru" -#: pdiff.cpp:158 +#: pdiff.cpp:160 #, fuzzy, kde-format msgid "Loading A" msgstr "A " -#: pdiff.cpp:167 -#, kde-format -msgid "Errors occurred during pre-processing of file A." -msgstr "" +#: pdiff.cpp:162 +#, fuzzy, kde-format +msgid "Loading A: %1" +msgstr "A " -#: pdiff.cpp:172 +#: pdiff.cpp:170 #, fuzzy, kde-format msgid "Loading B" msgstr "Ifungura" -#: pdiff.cpp:179 -#, kde-format -msgid "Errors occurred during pre-processing of file B." -msgstr "" - -#: pdiff.cpp:202 pdiff.cpp:241 +#: pdiff.cpp:201 pdiff.cpp:237 #, fuzzy, kde-format msgid "Diff: A <-> B" msgstr ": A < - > " -#: pdiff.cpp:208 pdiff.cpp:279 pdiff.cpp:293 +#: pdiff.cpp:207 pdiff.cpp:275 pdiff.cpp:289 #, fuzzy, kde-format msgid "Linediff: A <-> B" msgstr ": A < - > " -#: pdiff.cpp:225 +#: pdiff.cpp:224 #, fuzzy, kde-format msgid "Loading C" msgstr "Ifungura" -#: pdiff.cpp:232 -#, kde-format -msgid "Errors occurred during pre-processing of file C." -msgstr "" - -#: pdiff.cpp:250 +#: pdiff.cpp:246 #, fuzzy, kde-format msgid "Diff: A <-> C" msgstr ": A < - > " -#: pdiff.cpp:261 +#: pdiff.cpp:257 #, kde-format msgid "Diff: B <-> C" msgstr "" -#: pdiff.cpp:283 pdiff.cpp:297 +#: pdiff.cpp:279 pdiff.cpp:293 #, kde-format msgid "Linediff: B <-> C" msgstr "" -#: pdiff.cpp:287 pdiff.cpp:301 +#: pdiff.cpp:283 pdiff.cpp:297 #, fuzzy, kde-format msgid "Linediff: A <-> C" msgstr ": A < - > " -#: pdiff.cpp:829 +#: pdiff.cpp:819 #, fuzzy, kde-format msgid "All input files contain the same text, but are not binary equal." msgstr "Iyinjiza Idosiye i Umwandiko . " -#: pdiff.cpp:835 pdiff.cpp:839 pdiff.cpp:843 +#: pdiff.cpp:825 pdiff.cpp:829 pdiff.cpp:833 #, 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:853 +#: pdiff.cpp:843 #, fuzzy, kde-format msgid "" "Some input files do not seem to be pure text files.\n" @@ -3012,17 +3019,17 @@ "icyitonderwa i - Gukomatanya OYA ya: Nyabibiri Ibyatanzwe . \n" "Gukomeza Ku . " -#: pdiff.cpp:863 +#: pdiff.cpp:853 #, kde-format msgid ", B" msgstr "" -#: pdiff.cpp:865 +#: pdiff.cpp:855 #, kde-format msgid ", C" msgstr "" -#: pdiff.cpp:867 +#: pdiff.cpp:857 #, kde-format msgid "" "Some input characters could not be converted to valid unicode.\n" @@ -3031,77 +3038,72 @@ "Affected input files are in %1." msgstr "" -#: pdiff.cpp:1034 +#: pdiff.cpp:1032 #, kde-format msgid "Abort" msgstr "Ntibyakunze" -#: pdiff.cpp:1040 pdiff.cpp:1130 +#: pdiff.cpp:1038 pdiff.cpp:1129 #, fuzzy, kde-format msgid "Opening files..." msgstr "Mu Gufungura dosiye" -#: pdiff.cpp:1107 -#, kde-format -msgid "File open error" -msgstr "Ikosa gufungura idosiye" - -#: pdiff.cpp:1202 +#: pdiff.cpp:1212 #, fuzzy, kde-format msgid "Cutting selection..." msgstr "Ihitamo ... " -#: pdiff.cpp:1223 +#: pdiff.cpp:1233 #, fuzzy, kde-format msgid "Copying selection to clipboard..." msgstr "Ihitamo Kuri Ububikokoporora ... " -#: pdiff.cpp:1239 +#: pdiff.cpp:1249 #, fuzzy, kde-format msgid "Inserting clipboard contents..." msgstr "Ububikokoporora Ibigize ... " -#: pdiff.cpp:1695 +#: pdiff.cpp:1705 #, kde-format msgid "Word wrap (Cancel disables word wrap)" msgstr "" -#: pdiff.cpp:1696 +#: pdiff.cpp:1706 #, kde-format msgid "Calculating max width for horizontal scrollbar" msgstr "" -#: pdiff.cpp:1911 +#: pdiff.cpp:1921 #, fuzzy, kde-format msgid "Save && Continue" msgstr "Kubika & & Gukomeza " -#: pdiff.cpp:1912 +#: pdiff.cpp:1922 #, fuzzy, kde-format msgid "Continue Without Saving" msgstr "Gukomeza " -#: pdiff.cpp:2124 +#: pdiff.cpp:2134 #, fuzzy, kde-format msgid "Search complete." msgstr "Byuzuye . " -#: pdiff.cpp:2124 +#: pdiff.cpp:2134 #, fuzzy, kde-format msgid "Search Complete" msgstr "Igishushanyombonera cy'Ishakisha" -#: pdiff.cpp:2375 +#: pdiff.cpp:2385 #, kde-format msgid "Nothing is selected in either diff input window." msgstr "" -#: pdiff.cpp:2375 +#: pdiff.cpp:2385 #, fuzzy, kde-format msgid "Error while adding manual diff range" msgstr "Ikosa Kurema Ububiko . " -#: progress.cpp:59 progress.cpp:71 +#: progress.cpp:61 progress.cpp:73 #, kde-format msgid "&Cancel" msgstr "" @@ -3111,188 +3113,188 @@ msgid "A (Base):" msgstr "A ( Base ) : " -#: smalldialogs.cpp:68 smalldialogs.cpp:85 smalldialogs.cpp:102 -#: smalldialogs.cpp:144 +#: smalldialogs.cpp:71 smalldialogs.cpp:90 smalldialogs.cpp:109 +#: smalldialogs.cpp:154 #, fuzzy, kde-format msgid "File..." msgstr "Idosiye..." -#: smalldialogs.cpp:70 smalldialogs.cpp:87 smalldialogs.cpp:104 -#: smalldialogs.cpp:146 +#: smalldialogs.cpp:73 smalldialogs.cpp:92 smalldialogs.cpp:111 +#: smalldialogs.cpp:156 #, fuzzy, kde-format msgid "Dir..." msgstr "..." -#: smalldialogs.cpp:96 +#: smalldialogs.cpp:103 #, fuzzy, kde-format msgid "C (Optional):" msgstr "(bitari ngombwa)" -#: smalldialogs.cpp:119 +#: smalldialogs.cpp:126 #, kde-format msgid "Swap/Copy Names..." msgstr "" -#: smalldialogs.cpp:124 smalldialogs.cpp:125 smalldialogs.cpp:126 +#: smalldialogs.cpp:131 smalldialogs.cpp:132 smalldialogs.cpp:133 #, kde-format msgid "Swap %1<->%2" msgstr "" -#: smalldialogs.cpp:127 smalldialogs.cpp:128 smalldialogs.cpp:129 +#: smalldialogs.cpp:134 smalldialogs.cpp:135 smalldialogs.cpp:136 #, kde-format msgid "Copy %1->Output" msgstr "" -#: smalldialogs.cpp:130 smalldialogs.cpp:131 smalldialogs.cpp:132 +#: smalldialogs.cpp:137 smalldialogs.cpp:138 smalldialogs.cpp:139 #, kde-format msgid "Swap %1<->Output" msgstr "" -#: smalldialogs.cpp:138 +#: smalldialogs.cpp:148 #, fuzzy, kde-format msgid "Output (optional):" msgstr "( Bitari ngombwa ) : " -#: smalldialogs.cpp:168 +#: smalldialogs.cpp:178 #, kde-format msgid "Configure..." msgstr "Kugena imiterere..." -#: smalldialogs.cpp:233 +#: smalldialogs.cpp:243 #, fuzzy, kde-format msgid "Open Directory" msgstr "Ububiko" -#: smalldialogs.cpp:234 +#: smalldialogs.cpp:244 #, kde-format msgid "Select Output File" msgstr "" -#: smalldialogs.cpp:393 +#: smalldialogs.cpp:403 #, fuzzy, kde-format msgid "Search text:" msgstr "Umwandiko : " -#: smalldialogs.cpp:400 +#: smalldialogs.cpp:410 #, kde-format msgid "Case sensitive" msgstr "Imyandikire y'inyuguti nkuru/nto" -#: smalldialogs.cpp:403 +#: smalldialogs.cpp:413 #, fuzzy, kde-format msgid "Search A" msgstr "A " -#: smalldialogs.cpp:408 +#: smalldialogs.cpp:418 #, fuzzy, kde-format msgid "Search B" msgstr "Gushaka" -#: smalldialogs.cpp:413 +#: smalldialogs.cpp:423 #, fuzzy, kde-format msgid "Search C" msgstr "Gushaka" -#: smalldialogs.cpp:418 +#: smalldialogs.cpp:428 #, fuzzy, kde-format msgid "Search output" msgstr "Ibisohoka " -#: smalldialogs.cpp:425 +#: smalldialogs.cpp:435 #, kde-format msgid "&Search" msgstr "Shakisha" -#: smalldialogs.cpp:444 +#: smalldialogs.cpp:454 #, kde-format msgid "Regular Expression Tester" msgstr "" -#: smalldialogs.cpp:457 +#: smalldialogs.cpp:467 #, kde-format msgid "Example auto merge line:" msgstr "" -#: smalldialogs.cpp:459 +#: smalldialogs.cpp:469 #, kde-format msgid "To test auto merge, copy a line as used in your files." msgstr "" -#: smalldialogs.cpp:465 smalldialogs.cpp:493 smalldialogs.cpp:529 +#: smalldialogs.cpp:475 smalldialogs.cpp:503 smalldialogs.cpp:539 #, kde-format msgid "Match result:" msgstr "" -#: smalldialogs.cpp:484 +#: smalldialogs.cpp:494 #, kde-format msgid "Example history start line (with leading comment):" msgstr "" -#: smalldialogs.cpp:486 +#: smalldialogs.cpp:496 #, kde-format msgid "" "Copy a history start line as used in your files,\n" "including the leading comment." msgstr "" -#: smalldialogs.cpp:512 +#: smalldialogs.cpp:522 #, kde-format msgid "History sort key order:" msgstr "" -#: smalldialogs.cpp:520 +#: smalldialogs.cpp:530 #, kde-format msgid "Example history entry start line (without leading comment):" msgstr "" -#: smalldialogs.cpp:522 +#: smalldialogs.cpp:532 #, kde-format msgid "" "Copy a history entry start line as used in your files,\n" "but omit the leading comment." msgstr "" -#: smalldialogs.cpp:536 +#: smalldialogs.cpp:546 #, kde-format msgid "Sort key result:" msgstr "" -#: smalldialogs.cpp:584 smalldialogs.cpp:594 smalldialogs.cpp:614 +#: smalldialogs.cpp:594 smalldialogs.cpp:604 smalldialogs.cpp:624 #, kde-format msgid "Match success." msgstr "" -#: smalldialogs.cpp:588 smalldialogs.cpp:598 smalldialogs.cpp:620 +#: smalldialogs.cpp:598 smalldialogs.cpp:608 smalldialogs.cpp:630 #, fuzzy, kde-format msgid "Match failed." msgstr "Byanze . " -#: smalldialogs.cpp:605 +#: smalldialogs.cpp:615 #, kde-format msgid "Opening and closing parentheses do not match in regular expression." msgstr "" -#: SourceData.cpp:150 +#: SourceData.cpp:153 #, fuzzy, kde-format msgid "Writing clipboard data to temp file failed." msgstr "Ububikokoporora Ibyatanzwe Kuri Idosiye Byanze . " -#: SourceData.cpp:154 +#: SourceData.cpp:157 #, fuzzy, kde-format msgid "From Clipboard" msgstr "Ububikokoporora" -#: SourceData.cpp:335 +#: SourceData.cpp:348 #, fuzzy, kde-format msgid "%1 is not a normal file." msgstr "Bya amahuza na Bisanzwe Idosiye . " -#: SourceData.cpp:427 +#: SourceData.cpp:440 #, kde-format msgid " Temp file is: %1" msgstr "" -#: SourceData.cpp:432 +#: SourceData.cpp:445 #, fuzzy, kde-format msgid "" "Preprocessing possibly failed. Check this command:\n" @@ -3307,12 +3309,12 @@ "\n" "command Yahagaritswe NONEAHA . " -#: SourceData.cpp:443 SourceData.cpp:512 +#: SourceData.cpp:456 SourceData.cpp:525 #, kde-format msgid "File %1 too large to process. Skipping." msgstr "" -#: SourceData.cpp:487 +#: SourceData.cpp:500 #, fuzzy, kde-format msgid "" "The line-matching-preprocessing possibly failed. Check this command:\n" diff -Nru kdiff3-1.8.01/po/sk/diff_ext.po kdiff3-1.8.3/po/sk/diff_ext.po --- kdiff3-1.8.01/po/sk/diff_ext.po 2019-05-18 01:02:24.000000000 +0000 +++ kdiff3-1.8.3/po/sk/diff_ext.po 2020-06-25 00:18:49.000000000 +0000 @@ -1,131 +1,127 @@ # translation of diff_ext.po to Slovak -# Roman Paholik , 2018. +# Roman Paholik , 2018, 2019. msgid "" msgstr "" "Project-Id-Version: diff_ext\n" -"Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2019-03-22 03:09+0100\n" -"PO-Revision-Date: 2018-08-16 20:37+0100\n" +"Report-Msgid-Bugs-To: https://bugs.kde.org\n" +"POT-Creation-Date: 2019-11-04 07:54+0100\n" +"PO-Revision-Date: 2019-09-02 19:45+0200\n" "Last-Translator: Roman Paholík \n" "Language-Team: Slovak \n" "Language: sk\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: Lokalize 2.0\n" +"X-Generator: Lokalize 18.12.3\n" "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" -#: diff_ext.cpp:391 +#: diff_ext.cpp:223 #, kde-format msgid "Compare with %1" msgstr "Porovnať s %1" -#: diff_ext.cpp:392 +#: diff_ext.cpp:224 #, kde-format msgid "Merge with %1" msgstr "Zlúčiť s %1" -#: diff_ext.cpp:408 +#: diff_ext.cpp:234 #, kde-format msgid "3-way merge with base" msgstr "3-cestné zlúčenie so základom" -#: diff_ext.cpp:411 +#: diff_ext.cpp:237 #, kde-format msgid "Save '%1' for later" msgstr "Uložiť '%1' na neskôr" -#: diff_ext.cpp:426 +#: diff_ext.cpp:251 #, kde-format msgid "Compare with ..." msgstr "Porovnať s..." -#: diff_ext.cpp:429 +#: diff_ext.cpp:254 #, kde-format msgid "Clear list" msgstr "Vyčistiť zoznam" -#: diff_ext.cpp:434 +#: diff_ext.cpp:259 #, kde-format msgid "Compare" msgstr "Porovnať" -#: diff_ext.cpp:438 +#: diff_ext.cpp:263 #, kde-format msgid "3 way comparison" msgstr "3 cestné porovnanie" -#: diff_ext.cpp:444 +#: diff_ext.cpp:269 #, kde-format msgid "About Diff-Ext ..." -msgstr "" +msgstr "O Diff-Ext ..." -#: diff_ext.cpp:515 +#: diff_ext.cpp:340 #, kde-format msgid "(32 Bit)" msgstr "(32 Bit)" -#: diff_ext.cpp:517 -#, kde-format -msgid "(64 Bit)" -msgstr "(64 Bit)" - -#: diff_ext.cpp:518 +#: diff_ext.cpp:342 #, kde-format msgid "Diff-Ext Copyright (c) 2003-2006, Sergey Zorin. All rights reserved.\n" msgstr "" +"Diff-Ext Copyright (c) 2003-2006, Sergey Zorin. Všetky práva vyhradené.\n" -#: diff_ext.cpp:519 +#: diff_ext.cpp:343 #, kde-format msgid "This software is distributable under the BSD-2-Clause license.\n" -msgstr "" +msgstr "Tento softvér je distribuovateľný pod licenciou BSD-2-Clause.\n" -#: diff_ext.cpp:520 +#: diff_ext.cpp:344 #, kde-format msgid "Some extensions for KDiff3 (c) 2006-2013 by Joachim Eibl.\n" -msgstr "" +msgstr "Niektoré rozšírenia pre KDiff3 (c) 2006-2013 od Joachim Eibl.\n" -#: diff_ext.cpp:521 +#: diff_ext.cpp:345 #, kde-format msgid "Homepage for Diff-Ext: http://diff-ext.sourceforge.net\n" -msgstr "" +msgstr "Webová stránka pre Diff-Ext: http://diff-ext.sourceforge.net\n" -#: diff_ext.cpp:522 +#: diff_ext.cpp:346 #, kde-format msgid "About Diff-Ext for KDiff3 " -msgstr "" +msgstr "P Diff-Ext pre KDiff3 " -#: diff_ext.cpp:551 +#: diff_ext.cpp:375 #, kde-format msgid "Compare selected files" -msgstr "" +msgstr "Porovnať vybrané súbory" -#: diff_ext.cpp:557 diff_ext.cpp:577 +#: diff_ext.cpp:381 diff_ext.cpp:399 #, kde-format msgid "Compare '%1' with '%2'" msgstr "Porovnať '%1' s '%2'" -#: diff_ext.cpp:563 +#: diff_ext.cpp:386 #, kde-format msgid "Save '%1' for later operation" -msgstr "" +msgstr "Uložiť '%1' na neskôr" -#: diff_ext.cpp:619 +#: diff_ext.cpp:440 #, kde-format msgid "Could not start KDiff3. Please rerun KDiff3 installation." -msgstr "" +msgstr "Nemôžem spustiť KDiff3. Prosím, znovu spustite inštaláciu KDiff3." -#: diff_ext.cpp:620 +#: diff_ext.cpp:441 #, kde-format msgid "Command" msgstr "Príkaz" -#: diff_ext.cpp:621 +#: diff_ext.cpp:442 #, kde-format msgid "CommandLine" -msgstr "" +msgstr "Príkazový riadok" -#: diff_ext.cpp:622 +#: diff_ext.cpp:443 #, kde-format msgid "Diff-Ext For KDiff3" -msgstr "" \ No newline at end of file +msgstr "Diff-Ext pre KDiff3" \ No newline at end of file diff -Nru kdiff3-1.8.01/po/sk/kdiff3fileitemactionplugin.po kdiff3-1.8.3/po/sk/kdiff3fileitemactionplugin.po --- kdiff3-1.8.01/po/sk/kdiff3fileitemactionplugin.po 2019-05-18 01:02:24.000000000 +0000 +++ kdiff3-1.8.3/po/sk/kdiff3fileitemactionplugin.po 2020-06-25 00:18:49.000000000 +0000 @@ -1,26 +1,25 @@ # translation of kdiff3fileitemactionplugin.po to Slovak # Richard Fric , 2011. -# Roman Paholík , 2012, 2013, 2014. +# Roman Paholík , 2012, 2013, 2014, 2019. msgid "" msgstr "" "Project-Id-Version: kdiff3fileitemactionplugin\n" -"Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2019-03-22 03:09+0100\n" -"PO-Revision-Date: 2014-02-18 19:11+0100\n" +"Report-Msgid-Bugs-To: https://bugs.kde.org\n" +"POT-Creation-Date: 2019-08-30 07:40+0200\n" +"PO-Revision-Date: 2019-08-30 21:06+0200\n" "Last-Translator: Roman Paholík \n" "Language-Team: Slovak \n" "Language: sk\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: Lokalize 1.5\n" +"X-Generator: Lokalize 18.12.3\n" "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" #: kdiff3fileitemaction.cpp:92 -#, fuzzy, kde-format -#| msgid "KDiff3 ..." +#, kde-format msgid "KDiff3..." -msgstr "KDiff3 ..." +msgstr "KDiff3..." #: kdiff3fileitemaction.cpp:124 #, kde-format @@ -43,8 +42,7 @@ msgstr "3-cestné zlúčenie so základom" #: kdiff3fileitemaction.cpp:149 -#, fuzzy, kde-format -#| msgid "Compare with ..." +#, kde-format msgid "Compare with..." msgstr "Porovnať s..." @@ -64,35 +62,17 @@ msgstr "3 cestné porovnanie" #: kdiff3fileitemaction.cpp:179 -#, fuzzy, kde-format -#| msgid "About KDiff3 menu plugin ..." +#, kde-format msgid "About KDiff3 menu plugin..." msgstr "O plugine ponuky KDiff3..." #: kdiff3fileitemaction.cpp:287 -#, fuzzy, kde-format -#| msgid "" -#| "KDiff3 File Item Action Plugin: Copyright (C) 2011 Joachim Eibl\n" -#| "KDiff3 homepage: http://kdiff3.sourceforge.net\n" -#| "\n" +#, kde-format msgid "KDiff3 File Item Action Plugin: Copyright (C) 2011 Joachim Eibl\n" -msgstr "" -"Plugin ponuky súboru KDiff3: Copyright (C) 2011 Joachim Eibl\n" -"Domovská stránka KDiff3: http://kdiff3.sourceforge.net\n" -"\n" +msgstr "Plugin ponuky súboru KDiff3: Copyright (C) 2011 Joachim Eibl\n" #: kdiff3fileitemaction.cpp:288 -#, fuzzy, kde-format -#| msgid "" -#| "Using the contextmenu extension:\n" -#| "For simple comparison of two selected 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." +#, kde-format msgid "" "Using the context menu extension:\n" "For simple comparison of two selected files choose \"Compare\".\n" diff -Nru kdiff3-1.8.01/po/sk/kdiff3.po kdiff3-1.8.3/po/sk/kdiff3.po --- kdiff3-1.8.01/po/sk/kdiff3.po 2019-05-18 01:02:24.000000000 +0000 +++ kdiff3-1.8.3/po/sk/kdiff3.po 2020-06-25 00:18:49.000000000 +0000 @@ -1,20 +1,20 @@ # translation of kdiff3.po to Slovak # Richard Fric , 2006, 2009. -# Roman Paholík , 2012, 2013, 2014. +# Roman Paholík , 2012, 2013, 2014, 2019, 2020. # Ferdinand Galko , 2015. msgid "" msgstr "" "Project-Id-Version: kdiff3\n" -"Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2019-04-18 08:02+0200\n" -"PO-Revision-Date: 2015-02-28 17:50+0100\n" -"Last-Translator: Ferdinand Galko \n" -"Language-Team: Slovak \n" +"Report-Msgid-Bugs-To: https://bugs.kde.org\n" +"POT-Creation-Date: 2020-06-22 07:48+0200\n" +"PO-Revision-Date: 2020-03-22 20:16+0100\n" +"Last-Translator: Roman Paholik \n" +"Language-Team: \n" "Language: sk\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: Lokalize 1.5\n" +"X-Generator: Lokalize 19.12.3\n" "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" #, kde-format @@ -27,291 +27,285 @@ msgid "Your emails" msgstr "wizzardsk@gmail.com,galko.ferdinand@gmail.com" -#: difftextwindow.cpp:412 +#: difftextwindow.cpp:414 #, kde-format msgid "File %1: Line %2" -msgstr "" +msgstr "Súbor %1: Riadok %2" -#: difftextwindow.cpp:414 -#, fuzzy, kde-format -#| msgid "Line not available" +#: difftextwindow.cpp:416 +#, kde-format msgid "File %1: Line not available" -msgstr "Riadok nie je dostupný" +msgstr "Súbor %1: Riadok nie je dostupný" -#: difftextwindow.cpp:1780 +#: difftextwindow.cpp:1778 #, kde-format msgid "Encoding:" msgstr "Kódovanie:" -#: difftextwindow.cpp:1782 mergeresultwindow.cpp:3138 optiondialog.cpp:818 +#: difftextwindow.cpp:1781 mergeresultwindow.cpp:3166 optiondialog.cpp:840 #, kde-format msgid "Line end style:" msgstr "Spôsob ukončenia riadka:" -#: difftextwindow.cpp:1810 directorymergewindow.cpp:382 -#: directorymergewindow.cpp:433 directorymergewindow.cpp:524 -#: directorymergewindow.cpp:3058 directorymergewindow.cpp:3189 -#: directorymergewindow.cpp:3417 mergeresultwindow.cpp:942 -#: mergeresultwindow.cpp:944 mergeresultwindow.cpp:946 -#: mergeresultwindow.cpp:948 mergeresultwindow.cpp:1814 -#: mergeresultwindow.cpp:3170 mergeresultwindow.cpp:3177 optiondialog.cpp:962 -#: optiondialog.cpp:975 pdiff.cpp:833 pdiff.cpp:835 pdiff.cpp:837 pdiff.cpp:839 -#: pdiff.cpp:861 smalldialogs.cpp:124 smalldialogs.cpp:126 smalldialogs.cpp:127 -#: smalldialogs.cpp:130 +#: difftextwindow.cpp:1809 directorymergewindow.cpp:383 +#: directorymergewindow.cpp:434 directorymergewindow.cpp:525 +#: directorymergewindow.cpp:3072 directorymergewindow.cpp:3203 +#: directorymergewindow.cpp:3431 mergeresultwindow.cpp:970 +#: mergeresultwindow.cpp:972 mergeresultwindow.cpp:974 +#: mergeresultwindow.cpp:976 mergeresultwindow.cpp:1842 +#: mergeresultwindow.cpp:3198 mergeresultwindow.cpp:3205 optiondialog.cpp:1002 +#: optiondialog.cpp:1015 pdiff.cpp:823 pdiff.cpp:825 pdiff.cpp:827 +#: pdiff.cpp:829 pdiff.cpp:851 smalldialogs.cpp:131 smalldialogs.cpp:133 +#: smalldialogs.cpp:134 smalldialogs.cpp:137 #, kde-format msgid "A" msgstr "A" -#: difftextwindow.cpp:1810 directorymergewindow.cpp:384 -#: directorymergewindow.cpp:436 directorymergewindow.cpp:526 -#: directorymergewindow.cpp:3064 directorymergewindow.cpp:3190 -#: directorymergewindow.cpp:3418 mergeresultwindow.cpp:942 -#: mergeresultwindow.cpp:944 mergeresultwindow.cpp:950 -#: mergeresultwindow.cpp:952 mergeresultwindow.cpp:1816 -#: mergeresultwindow.cpp:3172 mergeresultwindow.cpp:3179 optiondialog.cpp:963 -#: optiondialog.cpp:976 pdiff.cpp:833 pdiff.cpp:835 pdiff.cpp:841 pdiff.cpp:843 -#: pdiff.cpp:863 smalldialogs.cpp:124 smalldialogs.cpp:125 smalldialogs.cpp:128 -#: smalldialogs.cpp:131 +#: difftextwindow.cpp:1809 directorymergewindow.cpp:385 +#: directorymergewindow.cpp:437 directorymergewindow.cpp:527 +#: directorymergewindow.cpp:3078 directorymergewindow.cpp:3204 +#: directorymergewindow.cpp:3432 mergeresultwindow.cpp:970 +#: mergeresultwindow.cpp:972 mergeresultwindow.cpp:978 +#: mergeresultwindow.cpp:980 mergeresultwindow.cpp:1844 +#: mergeresultwindow.cpp:3200 mergeresultwindow.cpp:3207 optiondialog.cpp:1003 +#: optiondialog.cpp:1016 pdiff.cpp:823 pdiff.cpp:825 pdiff.cpp:831 +#: pdiff.cpp:833 pdiff.cpp:853 smalldialogs.cpp:131 smalldialogs.cpp:132 +#: smalldialogs.cpp:135 smalldialogs.cpp:138 #, kde-format msgid "B" msgstr "B" -#: difftextwindow.cpp:1810 directorymergewindow.cpp:386 -#: directorymergewindow.cpp:439 directorymergewindow.cpp:528 -#: directorymergewindow.cpp:3070 directorymergewindow.cpp:3191 -#: directorymergewindow.cpp:3419 mergeresultwindow.cpp:946 -#: mergeresultwindow.cpp:948 mergeresultwindow.cpp:950 -#: mergeresultwindow.cpp:952 mergeresultwindow.cpp:1818 -#: mergeresultwindow.cpp:3174 mergeresultwindow.cpp:3181 optiondialog.cpp:977 -#: pdiff.cpp:837 pdiff.cpp:839 pdiff.cpp:841 pdiff.cpp:843 pdiff.cpp:865 -#: smalldialogs.cpp:125 smalldialogs.cpp:126 smalldialogs.cpp:129 -#: smalldialogs.cpp:132 +#: difftextwindow.cpp:1809 directorymergewindow.cpp:387 +#: directorymergewindow.cpp:440 directorymergewindow.cpp:529 +#: directorymergewindow.cpp:3084 directorymergewindow.cpp:3205 +#: directorymergewindow.cpp:3433 mergeresultwindow.cpp:974 +#: mergeresultwindow.cpp:976 mergeresultwindow.cpp:978 +#: mergeresultwindow.cpp:980 mergeresultwindow.cpp:1846 +#: mergeresultwindow.cpp:3202 mergeresultwindow.cpp:3209 optiondialog.cpp:1017 +#: pdiff.cpp:827 pdiff.cpp:829 pdiff.cpp:831 pdiff.cpp:833 pdiff.cpp:855 +#: smalldialogs.cpp:132 smalldialogs.cpp:133 smalldialogs.cpp:136 +#: smalldialogs.cpp:139 #, kde-format msgid "C" msgstr "C" -#: difftextwindow.cpp:1810 -#, fuzzy, kde-format -#| msgid "A (Base):" +#: difftextwindow.cpp:1809 +#, kde-format msgid "A (Base)" -msgstr "A (základ):" +msgstr "A (základ)" -#: difftextwindow.cpp:1812 -#, fuzzy, kde-format -#| msgid "Encoding:" +#: difftextwindow.cpp:1811 +#, kde-format msgid "Encoding: %1" -msgstr "Kódovanie:" +msgstr "Kódovanie: %1" -#: difftextwindow.cpp:1813 mergeresultwindow.cpp:3183 +#: difftextwindow.cpp:1812 mergeresultwindow.cpp:3211 #, kde-format msgid "Unix" msgstr "Unix" -#: difftextwindow.cpp:1813 mergeresultwindow.cpp:3184 +#: difftextwindow.cpp:1812 mergeresultwindow.cpp:3212 #, kde-format msgid "DOS" msgstr "DOS" -#: difftextwindow.cpp:1813 -#, fuzzy, kde-format -#| msgid "Line end style:" +#: difftextwindow.cpp:1812 +#, kde-format msgid "Line end style: %1" -msgstr "Spôsob ukončenia riadka:" +msgstr "Spôsob ukončenia riadka: %1" -#: difftextwindow.cpp:1835 kdiff3.cpp:873 +#: difftextwindow.cpp:1834 kdiff3.cpp:874 #, kde-format msgid "Top line" msgstr "Vrchný riadok" -#: difftextwindow.cpp:1845 +#: difftextwindow.cpp:1843 #, kde-format msgid "End" msgstr "Koniec" -#: difftextwindow.cpp:1903 smalldialogs.cpp:235 -#, fuzzy, kde-format -#| msgid "Opening files..." +#: difftextwindow.cpp:1901 smalldialogs.cpp:245 +#, kde-format msgid "Open File" -msgstr "Otváram súbory..." +msgstr "Otvoriť súbor" -#: difftextwindow.cpp:1951 optiondialog.cpp:387 +#: difftextwindow.cpp:1943 optiondialog.cpp:389 #, kde-format msgid "Unicode, 8 bit" msgstr "Unicode, 8 bit" -#: difftextwindow.cpp:1966 +#: difftextwindow.cpp:1958 #, kde-format msgid "Other" -msgstr "" +msgstr "Iné" -#: directorymergewindow.cpp:409 directorymergewindow.cpp:3424 +#: directorymergewindow.cpp:410 directorymergewindow.cpp:3438 #, kde-format msgid "Copy A to B" msgstr "Kopírovať A do B" -#: directorymergewindow.cpp:412 directorymergewindow.cpp:3425 +#: directorymergewindow.cpp:413 directorymergewindow.cpp:3439 #, kde-format msgid "Copy B to A" msgstr "Kopírovať B do A" -#: directorymergewindow.cpp:415 directorymergewindow.cpp:3426 +#: directorymergewindow.cpp:416 directorymergewindow.cpp:3440 #, kde-format msgid "Delete A" msgstr "Vymazať A" -#: directorymergewindow.cpp:418 directorymergewindow.cpp:3427 +#: directorymergewindow.cpp:419 directorymergewindow.cpp:3441 #, kde-format msgid "Delete B" msgstr "Vymazať B" -#: directorymergewindow.cpp:421 +#: directorymergewindow.cpp:422 #, kde-format msgid "Delete A & B" msgstr "Vymazať A & B" -#: directorymergewindow.cpp:424 directorymergewindow.cpp:3429 +#: directorymergewindow.cpp:425 directorymergewindow.cpp:3443 #, kde-format msgid "Merge to A" msgstr "Zlúčiť do A" -#: directorymergewindow.cpp:427 directorymergewindow.cpp:3430 +#: directorymergewindow.cpp:428 directorymergewindow.cpp:3444 #, kde-format msgid "Merge to B" msgstr "Zlúčiť do B" -#: directorymergewindow.cpp:430 +#: directorymergewindow.cpp:431 #, kde-format msgid "Merge to A & B" msgstr "Zlúčiť do A & B" -#: directorymergewindow.cpp:442 directorymergewindow.cpp:3421 +#: directorymergewindow.cpp:443 directorymergewindow.cpp:3435 #, kde-format msgid "Delete (if exists)" msgstr "Vymazať (ak existuje)" -#: directorymergewindow.cpp:445 directorymergewindow.cpp:448 -#: directorymergewindow.cpp:3420 optiondialog.cpp:925 smalldialogs.cpp:113 +#: directorymergewindow.cpp:446 directorymergewindow.cpp:449 +#: directorymergewindow.cpp:3434 smalldialogs.cpp:120 #, kde-format msgid "Merge" msgstr "Zlúčiť" -#: directorymergewindow.cpp:445 directorymergewindow.cpp:448 +#: directorymergewindow.cpp:446 directorymergewindow.cpp:449 #, kde-format msgid "Merge (manual)" msgstr "Zlúčiť (ručne)" -#: directorymergewindow.cpp:451 +#: directorymergewindow.cpp:452 #, kde-format msgid "Error: Conflicting File Types" msgstr "Chyba: Nezhodné typy súborov" -#: directorymergewindow.cpp:454 +#: directorymergewindow.cpp:455 #, kde-format msgid "Error: Changed and Deleted" msgstr "Chyba: Zmenené a vymazané" -#: directorymergewindow.cpp:457 +#: directorymergewindow.cpp:458 #, kde-format msgid "Error: Dates are equal but files are not." msgstr "Chyba: Dátumy sú rovnaké, ale súbory nie." -#: directorymergewindow.cpp:471 -#, fuzzy, kde-format -#| msgid "Done." +#: directorymergewindow.cpp:472 +#, kde-format msgid "Done" -msgstr "Hotovo." +msgstr "Hotovo" -#: directorymergewindow.cpp:473 +#: directorymergewindow.cpp:474 #, kde-format msgid "Error" msgstr "Chyba" -#: directorymergewindow.cpp:475 +#: directorymergewindow.cpp:476 #, kde-format msgid "Skipped." msgstr "Preskočené." -#: directorymergewindow.cpp:477 +#: directorymergewindow.cpp:478 #, kde-format msgid "Not saved." msgstr "Neuložené." -#: directorymergewindow.cpp:479 +#: directorymergewindow.cpp:480 #, kde-format msgid "In progress..." msgstr "Prebieha..." -#: directorymergewindow.cpp:481 +#: directorymergewindow.cpp:482 #, kde-format msgid "To do." msgstr "Úloha." -#: directorymergewindow.cpp:522 +#: directorymergewindow.cpp:523 #, kde-format msgid "Name" msgstr "Názov" -#: directorymergewindow.cpp:530 +#: directorymergewindow.cpp:531 #, kde-format msgid "Operation" msgstr "Operácia" -#: directorymergewindow.cpp:532 +#: directorymergewindow.cpp:533 #, kde-format msgid "Status" msgstr "Stav" -#: directorymergewindow.cpp:534 +#: directorymergewindow.cpp:535 #, kde-format msgid "Unsolved" msgstr "Nevyriešené" -#: directorymergewindow.cpp:536 +#: directorymergewindow.cpp:537 #, kde-format msgid "Solved" msgstr "Vyriešené" -#: directorymergewindow.cpp:538 +#: directorymergewindow.cpp:539 #, kde-format msgid "Nonwhite" msgstr "Nebiele" -#: directorymergewindow.cpp:540 +#: directorymergewindow.cpp:541 #, kde-format msgid "White" msgstr "Biela" -#: directorymergewindow.cpp:674 +#: directorymergewindow.cpp:676 #, kde-format msgid "Unable to compare non-normal file with normal file." -msgstr "" +msgstr "Nemôžem porovnať nenormálny súbor s normálnym súborom." -#: directorymergewindow.cpp:688 +#: directorymergewindow.cpp:690 #, kde-format msgid "Mix of links and normal files." msgstr "Mix odkazov a normálnych súborov." -#: directorymergewindow.cpp:695 +#: directorymergewindow.cpp:697 #, kde-format msgid "Link: " msgstr "Odkaz:" -#: directorymergewindow.cpp:704 +#: directorymergewindow.cpp:706 #, kde-format msgid "Size. " msgstr "Veľkosť." -#: directorymergewindow.cpp:718 directorymergewindow.cpp:728 +#: directorymergewindow.cpp:720 directorymergewindow.cpp:730 #, kde-format msgid "Date & Size: " msgstr "Dátum & veľkosť: " -#: directorymergewindow.cpp:748 +#: directorymergewindow.cpp:751 #, kde-format msgid "Comparing file..." msgstr "Porovnávanie súboru..." -#: directorymergewindow.cpp:801 +#: directorymergewindow.cpp:813 #, kde-format msgid "" "You are currently doing a directory merge. Are you sure, you want to abort " @@ -320,48 +314,48 @@ "V súčasnej dobe robíte adresárové zlúčenie. Ste si istí, že chcete prerušiť " "zlučovanie a opätovné prehľadanie adresára?" -#: directorymergewindow.cpp:802 kdiff3.cpp:698 kdiff3.cpp:708 kdiff3.cpp:720 -#: mergeresultwindow.cpp:372 pdiff.cpp:1033 pdiff.cpp:1910 pdiff.cpp:1920 +#: directorymergewindow.cpp:814 kdiff3.cpp:697 kdiff3.cpp:707 kdiff3.cpp:719 +#: mergeresultwindow.cpp:400 pdiff.cpp:1031 pdiff.cpp:1920 pdiff.cpp:1930 #, kde-format msgid "Warning" msgstr "Varovanie" -#: directorymergewindow.cpp:803 directorymergewindow.cpp:3393 +#: directorymergewindow.cpp:815 directorymergewindow.cpp:3407 #, kde-format msgid "Rescan" msgstr "Znovu prehľadať" -#: directorymergewindow.cpp:804 pdiff.cpp:1035 +#: directorymergewindow.cpp:816 pdiff.cpp:1033 #, kde-format msgid "Continue Merging" msgstr "Pokračovať v zlučovaní" -#: directorymergewindow.cpp:971 +#: directorymergewindow.cpp:984 #, kde-format msgid "Opening of directories failed:" msgstr "Otváranie adresárov zlyhalo." -#: directorymergewindow.cpp:975 +#: directorymergewindow.cpp:988 #, kde-format msgid "Dir A \"%1\" does not exist or is not a directory.\n" msgstr "Adresár A \"%1\" neexistuje alebo nie je adresár.\n" -#: directorymergewindow.cpp:980 +#: directorymergewindow.cpp:993 #, kde-format msgid "Dir B \"%1\" does not exist or is not a directory.\n" msgstr "Adresár B \"%1\" neexistuje alebo nie je adresár.\n" -#: directorymergewindow.cpp:985 +#: directorymergewindow.cpp:998 #, kde-format msgid "Dir C \"%1\" does not exist or is not a directory.\n" msgstr "Adresár C \"%1\" neexistuje alebo nie je adresár.\n" -#: directorymergewindow.cpp:988 +#: directorymergewindow.cpp:1001 #, kde-format msgid "Directory Open Error" msgstr "Chyba otvorenia adresára" -#: directorymergewindow.cpp:996 +#: directorymergewindow.cpp:1009 #, kde-format msgid "" "The destination directory must not be the same as A or B when three " @@ -372,49 +366,49 @@ "zlúčené.\n" "Skontrolovať znova pred pokračovaním." -#: directorymergewindow.cpp:998 +#: directorymergewindow.cpp:1011 #, kde-format msgid "Parameter Warning" msgstr "Varovanie parametra" -#: directorymergewindow.cpp:1003 +#: directorymergewindow.cpp:1016 #, kde-format msgid "Scanning directories..." msgstr "Prezeranie adresárov... " -#: directorymergewindow.cpp:1029 +#: directorymergewindow.cpp:1042 #, kde-format msgid "Reading Directory A" msgstr "Načítavam adresár A" -#: directorymergewindow.cpp:1038 +#: directorymergewindow.cpp:1051 #, kde-format msgid "Reading Directory B" msgstr "Načítavam adresár B" -#: directorymergewindow.cpp:1048 +#: directorymergewindow.cpp:1061 #, kde-format msgid "Reading Directory C" msgstr "Načítavam adresár C" -#: directorymergewindow.cpp:1064 +#: directorymergewindow.cpp:1077 #, kde-format msgid "Some subdirectories were not readable in" msgstr "Niektoré podadresáre neboli čitateľné v" -#: directorymergewindow.cpp:1069 +#: directorymergewindow.cpp:1082 #, kde-format msgid "Check the permissions of the subdirectories." msgstr "Skontrolovať prístupové práva podadresárov." -#: directorymergewindow.cpp:1106 kdiff3.cpp:666 kdiff3.cpp:753 kdiff3.cpp:777 -#: kdiff3.cpp:1065 kdiff3.cpp:1086 pdiff.cpp:1116 pdiff.cpp:1170 pdiff.cpp:1218 -#: pdiff.cpp:1234 pdiff.cpp:1277 pdiff.cpp:1301 +#: directorymergewindow.cpp:1119 kdiff3.cpp:665 kdiff3.cpp:752 kdiff3.cpp:776 +#: kdiff3.cpp:1072 kdiff3.cpp:1093 pdiff.cpp:1115 pdiff.cpp:1178 pdiff.cpp:1228 +#: pdiff.cpp:1244 pdiff.cpp:1287 pdiff.cpp:1311 #, kde-format msgid "Ready." msgstr "Pripravený." -#: directorymergewindow.cpp:1121 +#: directorymergewindow.cpp:1134 #, kde-format msgid "" "Directory Comparison Status\n" @@ -423,70 +417,74 @@ "Number of equal files: %2\n" "Number of different files: %3" msgstr "" +"Stav porovnania adresárov\n" +"\n" +"Počet podadresárov: %1\n" +"Počet rovnakých súborov: %2\n" +"Počet rôznych súborov: %3" -#: directorymergewindow.cpp:1128 -#, fuzzy, kde-format -#| msgid "Number of manual merges:" +#: directorymergewindow.cpp:1141 +#, kde-format msgid "Number of manual merges: %1" -msgstr "Počet ručných zlúčení:" +msgstr "Počet ručných zlúčení: %1" -#: directorymergewindow.cpp:1394 +#: directorymergewindow.cpp:1407 #, kde-format msgid "This affects all merge operations." msgstr "Toto ovplyvňuje všetky operácie zlúčenia." -#: directorymergewindow.cpp:1395 +#: directorymergewindow.cpp:1408 #, kde-format msgid "Changing All Merge Operations" msgstr "Zmenenie všetkých operácií zlúčenia" -#: directorymergewindow.cpp:1695 -#, fuzzy, kde-format -#| msgid "Processing " +#: directorymergewindow.cpp:1708 +#, kde-format msgid "" "Processing %1 / %2\n" "%3" -msgstr "Spracúva sa" +msgstr "" +"Spracúva sa %1 / %2\n" +"%3" -#: directorymergewindow.cpp:1738 directorymergewindow.cpp:1742 +#: directorymergewindow.cpp:1751 directorymergewindow.cpp:1755 #, kde-format msgid "Some files could not be processed." -msgstr "" +msgstr "Niektoré súbory nemohli byť spracované." -#: directorymergewindow.cpp:2222 directorymergewindow.cpp:2247 -#: directorymergewindow.cpp:2271 +#: directorymergewindow.cpp:2235 directorymergewindow.cpp:2260 +#: directorymergewindow.cpp:2285 #, kde-format msgid "This operation is currently not possible." msgstr "Táto operácia nie je v súčasnej dobe možná." -#: directorymergewindow.cpp:2222 directorymergewindow.cpp:2247 -#: directorymergewindow.cpp:2271 directorymergewindow.cpp:2552 +#: directorymergewindow.cpp:2235 directorymergewindow.cpp:2260 +#: directorymergewindow.cpp:2285 directorymergewindow.cpp:2565 #, kde-format msgid "Operation Not Possible" msgstr "Operácia nie je možná" -#: directorymergewindow.cpp:2318 -#, fuzzy, kde-format -#| msgid "An error occurred while copying.\n" +#: directorymergewindow.cpp:2332 +#, kde-format msgid "An error occurred while copying." -msgstr "Nastala chyba počas kopírovania.\n" +msgstr "Nastala chyba počas kopírovania." -#: directorymergewindow.cpp:2319 directorymergewindow.cpp:2759 +#: directorymergewindow.cpp:2333 directorymergewindow.cpp:2772 #, kde-format msgid "Merge Error" msgstr "Chyba zlúčenia" -#: directorymergewindow.cpp:2396 +#: directorymergewindow.cpp:2410 #, kde-format msgid "Unknown merge operation. (This must never happen!)" msgstr "Neznáma operácia zlúčenia. (To sa nikdy nesmie stať!)" -#: directorymergewindow.cpp:2441 +#: directorymergewindow.cpp:2455 #, kde-format msgid "Unknown merge operation." msgstr "Neznáma operácia zlúčenia." -#: directorymergewindow.cpp:2454 +#: directorymergewindow.cpp:2468 #, kde-format msgid "" "The merge is about to begin.\n" @@ -506,22 +504,22 @@ "Uvedomte si, že tento program je stále v stave beta a nie je tu žiadna " "záruka! Vykonajte zálohovanie vašich dôležitých dát!" -#: directorymergewindow.cpp:2459 +#: directorymergewindow.cpp:2473 #, kde-format msgid "Starting Merge" msgstr "Spúšťam zlúčenie" -#: directorymergewindow.cpp:2460 +#: directorymergewindow.cpp:2474 #, kde-format msgid "Do It" msgstr "Urobiť to" -#: directorymergewindow.cpp:2461 +#: directorymergewindow.cpp:2475 #, kde-format msgid "Simulate It" msgstr "Simulovať to" -#: directorymergewindow.cpp:2487 +#: directorymergewindow.cpp:2501 #, kde-format msgid "" "The highlighted item has a different type in the different directories. " @@ -529,7 +527,7 @@ msgstr "" "Zvýraznená položka má iný typ v rôznych adresároch. Vybrať, čo sa má robiť." -#: directorymergewindow.cpp:2491 +#: directorymergewindow.cpp:2505 #, kde-format msgid "" "The modification dates of the file are equal but the files are not. Select " @@ -537,7 +535,7 @@ msgstr "" "Dátumy zmeny súboru sú rovnaké, ale súbory nie sú. Vybrať, čo sa má robiť." -#: directorymergewindow.cpp:2495 +#: directorymergewindow.cpp:2509 #, kde-format msgid "" "The highlighted item was changed in one directory and deleted in the other. " @@ -546,7 +544,7 @@ "Zvýraznená položka bola zmenená v jednom adresári a odstránená v druhom. " "Vybrať, čo sa má robiť." -#: directorymergewindow.cpp:2552 +#: directorymergewindow.cpp:2565 #, kde-format msgid "" "This operation is currently not possible because directory merge is " @@ -555,7 +553,7 @@ "Táto operácia v súčasnej dobe nie je možná, pretože v súčasnej dobe prebieha " "adresárové zlúčenie." -#: directorymergewindow.cpp:2609 +#: directorymergewindow.cpp:2622 #, kde-format msgid "" "There was an error in the last step.\n" @@ -566,32 +564,32 @@ "Ak chcete pokračovať v položke, ktorá spôsobila chybu, alebo budete chcieť " "preskočiť túto položku?" -#: directorymergewindow.cpp:2611 +#: directorymergewindow.cpp:2624 #, kde-format msgid "Continue merge after an error" msgstr "Pokračovať v zlúčení po chybe" -#: directorymergewindow.cpp:2612 +#: directorymergewindow.cpp:2625 #, kde-format msgid "Continue With Last Item" msgstr "Pokračovať s poslednou položkou" -#: directorymergewindow.cpp:2613 +#: directorymergewindow.cpp:2626 #, kde-format msgid "Skip Item" msgstr "Preskočiť položku" -#: directorymergewindow.cpp:2709 +#: directorymergewindow.cpp:2722 #, kde-format msgid "Merge operation complete." msgstr "Operácia zlúčenia dokončená." -#: directorymergewindow.cpp:2709 directorymergewindow.cpp:2712 +#: directorymergewindow.cpp:2722 directorymergewindow.cpp:2725 #, kde-format msgid "Merge Complete" msgstr "Zlúčenie hotové" -#: directorymergewindow.cpp:2722 +#: directorymergewindow.cpp:2735 #, kde-format msgid "" "Simulated merge complete: Check if you agree with the proposed operations." @@ -599,231 +597,229 @@ "Simulované zlúčenie dokončené: Skontrolujte, či súhlasíte s navrhovanými " "operáciami." -#: directorymergewindow.cpp:2758 -#, fuzzy, kde-format -#| msgid "An error occurred. Press OK to see detailed information.\n" +#: directorymergewindow.cpp:2771 +#, kde-format msgid "An error occurred. Press OK to see detailed information." -msgstr "Nastala chyba. Stlačením OK sa zobrazia podrobnejšie informácie.\n" +msgstr "Nastala chyba. Stlačením OK sa zobrazia podrobnejšie informácie." -#: directorymergewindow.cpp:2791 +#: directorymergewindow.cpp:2804 #, kde-format msgid "Error: While deleting %1: Creating backup failed." msgstr "Chyba: Počas vymazávania %1: Vytváranie zálohy zlyhalo." -#: directorymergewindow.cpp:2798 +#: directorymergewindow.cpp:2811 #, kde-format msgid "delete directory recursively( %1 )" msgstr "vymazať adresár rekurzívne( %1 )" -#: directorymergewindow.cpp:2800 +#: directorymergewindow.cpp:2813 #, kde-format msgid "delete( %1 )" msgstr "vymazať( %1 )" -#: directorymergewindow.cpp:2815 +#: directorymergewindow.cpp:2828 #, kde-format msgid "Error: delete dir operation failed while trying to read the directory." msgstr "" "Chyba: operácia vymazávania adresára zlyhala pri pokuse o čítanie adresára." -#: directorymergewindow.cpp:2834 +#: directorymergewindow.cpp:2847 #, kde-format msgid "Error: rmdir( %1 ) operation failed." msgstr "Chyba: zlyhala operácia rmdir( %1 )" -#: directorymergewindow.cpp:2844 +#: directorymergewindow.cpp:2857 #, kde-format msgid "Error: delete operation failed." msgstr "Chyba: zlyhala operácia vymazávania" -#: directorymergewindow.cpp:2870 +#: directorymergewindow.cpp:2884 #, kde-format msgid "manual merge( %1, %2, %3 -> %4)" msgstr "ručné zlúčenie( %1, %2, %3 -> %4)" -#: directorymergewindow.cpp:2873 +#: directorymergewindow.cpp:2887 #, kde-format msgid "" " Note: After a manual merge the user should continue by pressing F7." msgstr "" " Poznámka: Po ručnom zlúčení by mal používateľ pokračovať stlačením F7." -#: directorymergewindow.cpp:2900 +#: directorymergewindow.cpp:2914 #, kde-format msgid "Error: copy( %1 -> %2 ) failed.Deleting existing destination failed." msgstr "" "Chyba: kopírovanie( %1 -> %2 ) zlyhalo. Vymazávanie existujúceho cieľa " "zlyhalo." -#: directorymergewindow.cpp:2909 +#: directorymergewindow.cpp:2923 #, kde-format msgid "copyLink( %1 -> %2 )" msgstr "copyLink( %1 -> %2 )" -#: directorymergewindow.cpp:2918 +#: directorymergewindow.cpp:2932 #, kde-format msgid "Error: copyLink failed: Remote links are not yet supported." msgstr "Chyba: copyLink zlyhalo: Vzdialené odkazy ešte nie sú podporované." -#: directorymergewindow.cpp:2928 +#: directorymergewindow.cpp:2942 #, kde-format msgid "Error: copyLink failed." msgstr "Chyba: copyLink zlyhalo." -#: directorymergewindow.cpp:2953 +#: directorymergewindow.cpp:2967 #, kde-format msgid "copy( %1 -> %2 )" msgstr "kopírovať( %1 -> %2 )" -#: directorymergewindow.cpp:2979 +#: directorymergewindow.cpp:2993 #, kde-format msgid "Error during rename( %1 -> %2 ): Cannot delete existing destination." msgstr "" "Chyba pri premenovaní( %1 -> %2 ): Nie je možné vymazať existujúci cieľ." -#: directorymergewindow.cpp:2986 +#: directorymergewindow.cpp:3000 #, kde-format msgid "rename( %1 -> %2 )" msgstr "premenovať( %1 -> %2 )" -#: directorymergewindow.cpp:2995 +#: directorymergewindow.cpp:3009 #, kde-format msgid "Error: Rename failed." msgstr "Chyba: Premenovanie zlyhalo." -#: directorymergewindow.cpp:3013 +#: directorymergewindow.cpp:3027 #, kde-format msgid "Error during makeDir of %1. Cannot delete existing file." msgstr "Error pri makeDir pre %1. Nie je možné vymazať existujúci súbor." -#: directorymergewindow.cpp:3030 +#: directorymergewindow.cpp:3044 #, kde-format msgid "makeDir( %1 )" msgstr "makeDir( %1 )" -#: directorymergewindow.cpp:3040 +#: directorymergewindow.cpp:3054 #, kde-format msgid "Error while creating directory." msgstr "Chyba počas vytvárania adresára." -#: directorymergewindow.cpp:3076 directorymergewindow.cpp:3195 +#: directorymergewindow.cpp:3090 directorymergewindow.cpp:3209 #, kde-format msgid "Dest" msgstr "Cieľ" -#: directorymergewindow.cpp:3084 directorymergewindow.cpp:3113 +#: directorymergewindow.cpp:3098 directorymergewindow.cpp:3127 #, kde-format msgid "Dir" msgstr "Adresár" -#: directorymergewindow.cpp:3084 +#: directorymergewindow.cpp:3098 #, kde-format msgid "Type" msgstr "Typ" -#: directorymergewindow.cpp:3084 +#: directorymergewindow.cpp:3098 #, kde-format msgid "Size" msgstr "Veľkosť" -#: directorymergewindow.cpp:3085 +#: directorymergewindow.cpp:3099 #, kde-format msgid "Attr" msgstr "Atr" -#: directorymergewindow.cpp:3085 +#: directorymergewindow.cpp:3099 #, kde-format msgid "Last Modification" msgstr "Posledná zmena" -#: directorymergewindow.cpp:3085 +#: directorymergewindow.cpp:3099 #, kde-format msgid "Link-Destination" msgstr "Cieľ odkazu" -#: directorymergewindow.cpp:3113 +#: directorymergewindow.cpp:3127 #, kde-format msgid "File" msgstr "Súbor" -#: directorymergewindow.cpp:3113 -#, fuzzy, kde-format -#| msgid "Link: " +#: directorymergewindow.cpp:3127 +#, kde-format msgid "-Link" -msgstr "Odkaz:" +msgstr "-Odkaz" -#: directorymergewindow.cpp:3119 +#: directorymergewindow.cpp:3133 #, kde-format msgid "not available" msgstr "nedostupné" -#: directorymergewindow.cpp:3137 +#: directorymergewindow.cpp:3151 #, kde-format msgid "A (Dest): " msgstr "A (cieľ): " -#: directorymergewindow.cpp:3141 +#: directorymergewindow.cpp:3155 #, kde-format msgid "A: " -msgstr "" +msgstr "A: " -#: directorymergewindow.cpp:3141 +#: directorymergewindow.cpp:3155 #, kde-format msgid "A (Base): " msgstr "A (základ): " -#: directorymergewindow.cpp:3147 +#: directorymergewindow.cpp:3161 #, kde-format msgid "B (Dest): " msgstr "B (cieľ): " -#: directorymergewindow.cpp:3151 +#: directorymergewindow.cpp:3165 #, kde-format msgid "B: " -msgstr "" +msgstr "B: " -#: directorymergewindow.cpp:3156 +#: directorymergewindow.cpp:3170 #, kde-format msgid "C (Dest): " msgstr "C (cieľ): " -#: directorymergewindow.cpp:3160 +#: directorymergewindow.cpp:3174 #, kde-format msgid "C: " -msgstr "" +msgstr "C: " -#: directorymergewindow.cpp:3163 +#: directorymergewindow.cpp:3177 #, kde-format msgid "Dest: " msgstr "Cieľ:" #. i18n("Saving Directory Merge State ...")); -#: directorymergewindow.cpp:3238 +#: directorymergewindow.cpp:3252 #, kde-format msgid "Save Directory Merge State As..." msgstr "Uložiť stav adresárového zlúčenia ako..." -#: directorymergewindow.cpp:3387 +#: directorymergewindow.cpp:3401 #, kde-format msgid "Start/Continue Directory Merge" msgstr "Spustiť/Pokračovať v adresárovom zlúčení" -#: directorymergewindow.cpp:3388 +#: directorymergewindow.cpp:3402 #, kde-format msgid "Run Operation for Current Item" msgstr "Spustiť operáciu pre aktuálnu položku" -#: directorymergewindow.cpp:3389 +#: directorymergewindow.cpp:3403 #, kde-format msgid "Compare Selected File" msgstr "Porovnať vybraný súbor" -#: directorymergewindow.cpp:3390 +#: directorymergewindow.cpp:3404 #, kde-format msgid "Merge Current File" msgstr "Zlúčiť aktuálny súbor" -#: directorymergewindow.cpp:3390 +#: directorymergewindow.cpp:3404 #, kde-format msgid "" "Merge\n" @@ -832,51 +828,51 @@ "Zlúčiť\n" "súbor" -#: directorymergewindow.cpp:3391 +#: directorymergewindow.cpp:3405 #, kde-format msgid "Fold All Subdirs" msgstr "Zbaliť všetky podadresáre" -#: directorymergewindow.cpp:3392 +#: directorymergewindow.cpp:3406 #, kde-format msgid "Unfold All Subdirs" msgstr "Rozbaliť všetky podadresáre" #. i18n("Save Directory Merge State ..."), 0, this, &DirectoryMergeWindow::slotSaveMergeState, ac, "dir_save_merge_state"); #. i18n("Load Directory Merge State ..."), 0, this, &DirectoryMergeWindow::slotLoadMergeState, ac, "dir_load_merge_state"); -#: directorymergewindow.cpp:3396 +#: directorymergewindow.cpp:3410 #, kde-format msgid "Choose A for All Items" msgstr "Zvoliť A pre všetky položky" -#: directorymergewindow.cpp:3397 +#: directorymergewindow.cpp:3411 #, kde-format msgid "Choose B for All Items" msgstr "Zvoliť B pre všetky položky" -#: directorymergewindow.cpp:3398 +#: directorymergewindow.cpp:3412 #, kde-format msgid "Choose C for All Items" msgstr "Zvoliť C pre všetky položky" -#: directorymergewindow.cpp:3399 +#: directorymergewindow.cpp:3413 #, kde-format msgid "Auto-Choose Operation for All Items" msgstr "Automaticky zvolená operácia pre všetky položky" -#: directorymergewindow.cpp:3400 +#: directorymergewindow.cpp:3414 #, kde-format msgid "No Operation for All Items" msgstr "Žiadna operácia pre všetky položky" #. i18n("Synchronize Directories"), 0, this, &DirectoryMergeWindow::slotSynchronizeDirectories, ac, "dir_synchronize_directories"); #. d->m_pDirChooseNewerFiles = GuiUtils::createAction< KToggleAction >(i18n("Copy Newer Files Instead of Merging"), 0, this, &DirectoryMergeWindow::slotChooseNewerFiles, ac, "dir_choose_newer_files"); -#: directorymergewindow.cpp:3405 +#: directorymergewindow.cpp:3419 #, kde-format msgid "Show Identical Files" msgstr "Ukázať zhodné súbory" -#: directorymergewindow.cpp:3405 +#: directorymergewindow.cpp:3419 #, kde-format msgid "" "Identical\n" @@ -885,17 +881,17 @@ "Zhodné\n" "súbory" -#: directorymergewindow.cpp:3406 +#: directorymergewindow.cpp:3420 #, kde-format msgid "Show Different Files" msgstr "Ukázať rôzne súbory" -#: directorymergewindow.cpp:3407 +#: directorymergewindow.cpp:3421 #, kde-format msgid "Show Files only in A" msgstr "Ukázať súbory iba v A" -#: directorymergewindow.cpp:3407 +#: directorymergewindow.cpp:3421 #, kde-format msgid "" "Files\n" @@ -904,12 +900,12 @@ "Súbory\n" "iba v A" -#: directorymergewindow.cpp:3408 +#: directorymergewindow.cpp:3422 #, kde-format msgid "Show Files only in B" msgstr "Ukázať súbory iba v B" -#: directorymergewindow.cpp:3408 +#: directorymergewindow.cpp:3422 #, kde-format msgid "" "Files\n" @@ -918,12 +914,12 @@ "Súbory\n" "iba v B" -#: directorymergewindow.cpp:3409 +#: directorymergewindow.cpp:3423 #, kde-format msgid "Show Files only in C" msgstr "Ukázať súbory iba v C" -#: directorymergewindow.cpp:3409 +#: directorymergewindow.cpp:3423 #, kde-format msgid "" "Files\n" @@ -932,250 +928,245 @@ "Súbory\n" "iba v C" -#: directorymergewindow.cpp:3413 +#: directorymergewindow.cpp:3427 #, kde-format msgid "Compare Explicitly Selected Files" msgstr "Porovnať explicitne vybrané súbory" -#: directorymergewindow.cpp:3414 +#: directorymergewindow.cpp:3428 #, kde-format msgid "Merge Explicitly Selected Files" msgstr "Zlúčiť explicitne vybrané súbory" -#: directorymergewindow.cpp:3416 directorymergewindow.cpp:3423 +#: directorymergewindow.cpp:3430 directorymergewindow.cpp:3437 #, kde-format msgid "Do Nothing" msgstr "Nerobiť nič" -#: directorymergewindow.cpp:3428 +#: directorymergewindow.cpp:3442 #, kde-format msgid "Delete A && B" msgstr "Vymazať A && B" -#: directorymergewindow.cpp:3431 +#: directorymergewindow.cpp:3445 #, kde-format msgid "Merge to A && B" msgstr "Zlúčiť do A && B" -#: fileaccess.cpp:462 SourceData.cpp:493 -#, fuzzy, kde-format -#| msgid "Reading file: %1" +#: fileaccess.cpp:301 +#, kde-format +msgid "Unable to determine full url. No parent specified." +msgstr "Nemôžem určiť celé URL. Nebol učený predok." + +#: fileaccess.cpp:482 SourceData.cpp:506 +#, kde-format msgid "Failed to read file: %1" -msgstr "Čítam súbor: %1" +msgstr "Zlyhalo načítanie súboru: %1" -#: fileaccess.cpp:587 +#: fileaccess.cpp:624 #, kde-format msgid "Creating temp copy of %1 failed." msgstr "Vytvorenie dočasnej kópie %1 zlyhalo." -#: fileaccess.cpp:595 fileaccess.cpp:600 -#, fuzzy, kde-format -#| msgid "Opening %1 failed." +#: fileaccess.cpp:632 fileaccess.cpp:637 +#, kde-format msgid "Opening %1 failed. %2" -msgstr "Otvorenie %1 zlyhalo." +msgstr "Otvorenie %1 zlyhalo. %2" -#: fileaccess.cpp:619 fileaccess.cpp:627 -#, fuzzy, kde-format -#| msgid "Error reading from %1" +#: fileaccess.cpp:656 fileaccess.cpp:664 +#, kde-format msgid "Error reading from %1. %2" -msgstr "Chyba pri čítaní z %1" +msgstr "Chyba pri čítaní z %1. %2" -#: fileaccess.cpp:751 -#, fuzzy, kde-format -#| msgid "" -#| "While trying to make a backup, deleting an older backup failed. \n" -#| "Filename: " +#: fileaccess.cpp:788 +#, kde-format msgid "" "While trying to make a backup, deleting an older backup failed.\n" "Filename: %1" msgstr "" "Pri pokuse o vytvorenie zálohy, zlyhalo vymazávanie staršej zálohy. \n" -"Názov súboru: " +"Názov súboru: %1" -#: fileaccess.cpp:758 -#, fuzzy, kde-format -#| msgid "" -#| "While trying to make a backup, renaming failed. \n" -#| "Filenames: " +#: fileaccess.cpp:795 +#, kde-format msgid "" "While trying to make a backup, renaming failed.\n" "Filenames: %1 -> %2" msgstr "" "Pri pokuse o vytvorenie zálohy, zlyhalo premenovanie. \n" -"Názov súborov: " +"Názov súborov: %1 -> %2" -#: fileaccess.cpp:828 +#: fileaccess.cpp:865 #, kde-format msgid "Getting file status: %1" msgstr "Získavanie stavu súboru: %1" -#: fileaccess.cpp:869 +#: fileaccess.cpp:906 #, kde-format msgid "Reading file: %1" msgstr "Čítam súbor: %1" -#: fileaccess.cpp:907 +#: fileaccess.cpp:944 #, kde-format msgid "Writing file: %1" msgstr "Zapisujem súbor: %1" -#: fileaccess.cpp:940 +#: fileaccess.cpp:977 #, kde-format msgid "Out of memory" msgstr "Nedostatok pamäte" -#: fileaccess.cpp:976 +#: fileaccess.cpp:1013 #, kde-format msgid "Making directory: %1" msgstr "Vytváram adresár: %1" -#: fileaccess.cpp:997 +#: fileaccess.cpp:1034 #, kde-format msgid "Removing directory: %1" msgstr "Odstraňovanie adresára: %1" -#: fileaccess.cpp:1012 +#: fileaccess.cpp:1049 #, kde-format msgid "Removing file: %1" msgstr "Odstraňuje sa súbor: %1" -#: fileaccess.cpp:1028 +#: fileaccess.cpp:1065 #, kde-format msgid "Creating symbolic link: %1 -> %2" msgstr "Vytváranie symbolického odkazu: %1 -> %2" -#: fileaccess.cpp:1052 +#: fileaccess.cpp:1089 #, kde-format msgid "Renaming file: %1 -> %2" msgstr "Premenúvam súbor: %1 -> %2" -#: fileaccess.cpp:1086 +#: fileaccess.cpp:1123 #, kde-format msgid "Copying file: %1 -> %2" msgstr "Kopíruje sa súbor: %1 -> %2" -#: fileaccess.cpp:1108 -#, fuzzy, kde-format -#| msgid "Reading directory: " +#: fileaccess.cpp:1145 +#, kde-format msgid "Reading directory: %1" -msgstr "Načítavam adresár: " +msgstr "Načítavam adresár: %1" -#: fileaccess.cpp:1162 +#: fileaccess.cpp:1202 #, kde-format msgid "Listing directory: %1" msgstr "Vypisujem adresár: %1" -#: kdiff3.cpp:181 +#: kdiff3.cpp:182 #, kde-format msgid "Current Configuration:" msgstr "Aktuálne nastavenie:" -#: kdiff3.cpp:186 +#: kdiff3.cpp:187 #, kde-format msgid "Config Option Error:" msgstr "Chyba konfiguračnej možnosti:" -#: kdiff3.cpp:240 +#: kdiff3.cpp:246 #, kde-format msgid "Option --auto used, but no output file specified." msgstr "Použitá voľba --auto, ale nie je zadaný výstupný súbor." -#: kdiff3.cpp:416 +#: kdiff3.cpp:405 #, kde-format msgid "Option --auto ignored for directory comparison." msgstr "Voľba --auto ignorovaná pre adresárové porovnanie." -#: kdiff3.cpp:460 +#: kdiff3.cpp:449 #, kde-format msgid "Saving failed." msgstr "Uloženie zlyhalo." -#: kdiff3.cpp:496 pdiff.cpp:1098 +#: kdiff3.cpp:494 pdiff.cpp:1096 #, kde-format msgid "Opening of these files failed:" msgstr "Otváranie týchto súborov zlyhalo:" -#: kdiff3.cpp:505 +#: kdiff3.cpp:503 pdiff.cpp:1105 #, kde-format -msgid "File Open Error" +msgid "File open error" msgstr "Chyba pri otváraní súboru" -#: kdiff3.cpp:533 +#: kdiff3.cpp:532 #, kde-format msgid "Opens documents for comparison..." msgstr "Otvára dokumenty pre porovnanie..." -#: kdiff3.cpp:535 +#: kdiff3.cpp:534 #, kde-format msgid "Reload" msgstr "Znovu načítať" -#: kdiff3.cpp:538 +#: kdiff3.cpp:537 #, kde-format msgid "Saves the merge result. All conflicts must be solved!" msgstr "Uloží výsledok zlúčenia. Všetky nezhody musia byť vyriešené!" -#: kdiff3.cpp:540 +#: kdiff3.cpp:539 #, kde-format msgid "Saves the current document as..." msgstr "Uloží súčasný dokument ako..." -#: kdiff3.cpp:543 +#: kdiff3.cpp:542 #, kde-format msgid "Print the differences" msgstr "Tlačiť rozdiely" -#: kdiff3.cpp:546 +#: kdiff3.cpp:545 #, kde-format msgid "Quits the application" msgstr "Ukončí aplikáciu" -#: kdiff3.cpp:549 +#: kdiff3.cpp:548 #, kde-format msgid "Cuts the selected section and puts it to the clipboard" msgstr "Vystrihne vybranú oblasť a uloží ju do schránky" -#: kdiff3.cpp:552 +#: kdiff3.cpp:551 #, kde-format msgid "Copies the selected section to the clipboard" msgstr "Kopíruje vybranú oblasť do schránky" -#: kdiff3.cpp:554 +#: kdiff3.cpp:553 #, kde-format msgid "Pastes the clipboard contents to current position" msgstr "Vloží obsah schránky na aktuálnu pozíciu" -#: kdiff3.cpp:557 +#: kdiff3.cpp:556 #, kde-format msgid "Select everything in current window" msgstr "Vybrať všetko v aktuálnom okne" -#: kdiff3.cpp:560 +#: kdiff3.cpp:559 #, kde-format msgid "Search for a string" msgstr "Hľadanie reťazca" -#: kdiff3.cpp:562 +#: kdiff3.cpp:561 #, kde-format msgid "Search again for the string" msgstr "Hľadať znovu reťazec" -#: kdiff3.cpp:567 +#: kdiff3.cpp:566 #, kde-format msgid "Enables/disables the statusbar" msgstr "Povolí/zakáže stavový riadok" -#: kdiff3.cpp:571 +#: kdiff3.cpp:570 #, kde-format msgid "Configure KDiff3..." msgstr "Nastaviť KDiff3..." -#: kdiff3.cpp:590 +#: kdiff3.cpp:589 #, kde-format msgid "Go to Current Delta" msgstr "Prejsť na aktuálnu položku delta" -#: kdiff3.cpp:590 +#: kdiff3.cpp:589 #, kde-format msgid "" "Current\n" @@ -1184,12 +1175,12 @@ "Aktuálna\n" "delta" -#: kdiff3.cpp:592 +#: kdiff3.cpp:591 #, kde-format msgid "Go to First Delta" msgstr "Prejsť na prvú položku delta" -#: kdiff3.cpp:592 +#: kdiff3.cpp:591 #, kde-format msgid "" "First\n" @@ -1198,12 +1189,12 @@ "Prvá\n" "delta" -#: kdiff3.cpp:594 +#: kdiff3.cpp:593 #, kde-format msgid "Go to Last Delta" msgstr "Prejsť na poslednú položku delta" -#: kdiff3.cpp:594 +#: kdiff3.cpp:593 #, kde-format msgid "" "Last\n" @@ -1212,12 +1203,12 @@ "Posledná\n" "delta" -#: kdiff3.cpp:596 +#: kdiff3.cpp:595 #, kde-format msgid "(Skips white space differences when \"Show White Space\" is disabled.)" msgstr "(Preskočí rozdiely medzier, keď je zakázané \"Ukazovať medzery\".)" -#: kdiff3.cpp:597 +#: kdiff3.cpp:596 #, kde-format msgid "" "(Does not skip white space differences even when \"Show White Space\" is " @@ -1225,12 +1216,12 @@ msgstr "" "(Nepreskočí rozdiely medzier, aj keď je zakázané \"Ukazovať medzery\".)" -#: kdiff3.cpp:598 +#: kdiff3.cpp:597 #, kde-format msgid "Go to Previous Delta" msgstr "Prejsť na predchádzajúcu položku delta" -#: kdiff3.cpp:598 +#: kdiff3.cpp:597 #, kde-format msgid "" "Prev\n" @@ -1239,12 +1230,12 @@ "Predchádzajúca\n" "delta" -#: kdiff3.cpp:600 +#: kdiff3.cpp:599 #, kde-format msgid "Go to Next Delta" msgstr "Prejsť na nasledujúcu položku delta" -#: kdiff3.cpp:600 +#: kdiff3.cpp:599 #, kde-format msgid "" "Next\n" @@ -1253,12 +1244,12 @@ "Nasledujúca\n" "delta" -#: kdiff3.cpp:602 +#: kdiff3.cpp:601 #, kde-format msgid "Go to Previous Conflict" msgstr "Prejsť na predchádzajúcu nezhodu" -#: kdiff3.cpp:602 +#: kdiff3.cpp:601 #, kde-format msgid "" "Prev\n" @@ -1267,12 +1258,12 @@ "Predchádzajúca\n" "nezhoda" -#: kdiff3.cpp:604 +#: kdiff3.cpp:603 #, kde-format msgid "Go to Next Conflict" msgstr "Prejsť na nasledujúcu nezhodu" -#: kdiff3.cpp:604 +#: kdiff3.cpp:603 #, kde-format msgid "" "Next\n" @@ -1281,12 +1272,12 @@ "Nasledujúca\n" "nezhoda" -#: kdiff3.cpp:606 +#: kdiff3.cpp:605 #, kde-format msgid "Go to Previous Unsolved Conflict" msgstr "Prejsť na predchádzajúcu nevyriešenú nezhodu" -#: kdiff3.cpp:606 +#: kdiff3.cpp:605 #, kde-format msgid "" "Prev\n" @@ -1295,12 +1286,12 @@ "Predchádzajúca\n" "Nevyriešená" -#: kdiff3.cpp:608 +#: kdiff3.cpp:607 #, kde-format msgid "Go to Next Unsolved Conflict" msgstr "Prejsť na nasledujúcu nevyriešenú nezhodu" -#: kdiff3.cpp:608 +#: kdiff3.cpp:607 #, kde-format msgid "" "Next\n" @@ -1309,12 +1300,12 @@ "Nasledujúca\n" "Nevyriešená" -#: kdiff3.cpp:610 +#: kdiff3.cpp:609 #, kde-format msgid "Select Line(s) From A" msgstr "Vybrať riadok(y) z A" -#: kdiff3.cpp:610 +#: kdiff3.cpp:609 #, kde-format msgid "" "Choose\n" @@ -1323,12 +1314,12 @@ "Vyberte\n" "A" -#: kdiff3.cpp:611 +#: kdiff3.cpp:610 #, kde-format msgid "Select Line(s) From B" msgstr "Vybrať riadok(y) z B" -#: kdiff3.cpp:611 +#: kdiff3.cpp:610 #, kde-format msgid "" "Choose\n" @@ -1337,12 +1328,12 @@ "Vyberte\n" "B" -#: kdiff3.cpp:612 +#: kdiff3.cpp:611 #, kde-format msgid "Select Line(s) From C" msgstr "Vybrať riadok(y) z C" -#: kdiff3.cpp:612 +#: kdiff3.cpp:611 #, kde-format msgid "" "Choose\n" @@ -1351,12 +1342,12 @@ "Vyberte\n" "C" -#: kdiff3.cpp:613 +#: kdiff3.cpp:612 #, kde-format msgid "Automatically Go to Next Unsolved Conflict After Source Selection" msgstr "Automaticky prejsť na nasledujúcu nevyriešenú nezhodu po výbere zdroja" -#: kdiff3.cpp:613 +#: kdiff3.cpp:612 #, kde-format msgid "" "Auto\n" @@ -1365,13 +1356,12 @@ "Automaticky\n" "Ďalej" -#: kdiff3.cpp:615 -#, fuzzy, kde-format -#| msgid "Show Space && Tabulator Characters for Differences" +#: kdiff3.cpp:614 +#, kde-format msgid "Show Space && Tabulator Characters" msgstr "Ukázať znaky medzier && tabulátorov pre rozdiely" -#: kdiff3.cpp:615 +#: kdiff3.cpp:614 #, kde-format msgid "" "White\n" @@ -1380,12 +1370,12 @@ "Biele\n" "znaky" -#: kdiff3.cpp:616 +#: kdiff3.cpp:615 #, kde-format msgid "Show White Space" msgstr "Ukazovať medzery" -#: kdiff3.cpp:616 +#: kdiff3.cpp:615 #, kde-format msgid "" "White\n" @@ -1394,12 +1384,12 @@ "Biele\n" "položky delta" -#: kdiff3.cpp:618 +#: kdiff3.cpp:617 #, kde-format msgid "Show Line Numbers" msgstr "Zobraziť čísla riadkov" -#: kdiff3.cpp:618 +#: kdiff3.cpp:617 #, kde-format msgid "" "Line\n" @@ -1408,133 +1398,132 @@ "Riadky\n" "Čísla" -#: kdiff3.cpp:620 +#: kdiff3.cpp:619 #, kde-format msgid "Automatically Solve Simple Conflicts" msgstr "Automaticky riešiť jednoduché nezhody" -#: kdiff3.cpp:621 +#: kdiff3.cpp:620 #, kde-format msgid "Set Deltas to Conflicts" msgstr "Nastaviť delta položky pre nezhody" -#: kdiff3.cpp:622 +#: kdiff3.cpp:621 #, kde-format msgid "Run Regular Expression Auto Merge" msgstr "Spustiť automatické zlúčenie regulárnych výrazov" -#: kdiff3.cpp:623 +#: kdiff3.cpp:622 #, kde-format msgid "Automatically Solve History Conflicts" msgstr "Automaticky riešiť nezhody histórie" -#: kdiff3.cpp:624 +#: kdiff3.cpp:623 #, kde-format msgid "Split Diff At Selection" msgstr "Rozdeliť diff vo výbere" -#: kdiff3.cpp:625 +#: kdiff3.cpp:624 #, kde-format msgid "Join Selected Diffs" msgstr "Pripojiť vybrané rozdiely" -#: kdiff3.cpp:627 +#: kdiff3.cpp:626 #, kde-format msgid "Show Window A" msgstr "Zobraziť okno A" -#: kdiff3.cpp:628 +#: kdiff3.cpp:627 #, kde-format msgid "Show Window B" msgstr "Zobraziť okno B" -#: kdiff3.cpp:629 +#: kdiff3.cpp:628 #, kde-format msgid "Show Window C" msgstr "Zobraziť okno C" -#: kdiff3.cpp:631 +#: kdiff3.cpp:630 #, kde-format msgid "Normal Overview" msgstr "Normálny prehľad" -#: kdiff3.cpp:632 +#: kdiff3.cpp:631 #, kde-format msgid "A vs. B Overview" msgstr "Prehľad A vs. B" -#: kdiff3.cpp:633 +#: kdiff3.cpp:632 #, kde-format msgid "A vs. C Overview" msgstr "Prehľad A vs. C" -#: kdiff3.cpp:634 +#: kdiff3.cpp:633 #, kde-format msgid "B vs. C Overview" msgstr "Prehľad B vs. C" -#: kdiff3.cpp:635 +#: kdiff3.cpp:634 #, kde-format msgid "Word Wrap Diff Windows" msgstr "Word Wrap Diff Windows" -#: kdiff3.cpp:636 +#: kdiff3.cpp:635 #, kde-format msgid "Add Manual Diff Alignment" msgstr "Pridať ručné usporiadanie rozdielu" -#: kdiff3.cpp:637 +#: kdiff3.cpp:636 #, kde-format msgid "Clear All Manual Diff Alignments" msgstr "Vyčistiť všetky ručne usporiadania rozdielov" -#: kdiff3.cpp:639 +#: kdiff3.cpp:638 #, kde-format msgid "Focus Next Window" msgstr "Zamerať nasledujúce okno" -#: kdiff3.cpp:640 +#: kdiff3.cpp:639 #, kde-format msgid "Focus Prev Window" msgstr "Zamerať predchádzajúce okno" -#: kdiff3.cpp:641 +#: kdiff3.cpp:640 #, kde-format msgid "Toggle Split Orientation" msgstr "Prepnúť orientáciu rozdelenia" -#: kdiff3.cpp:643 +#: kdiff3.cpp:642 #, kde-format msgid "Dir && Text Split Screen View" msgstr "Pohľad obrazovky rozdelenia adresára a textu" -#: kdiff3.cpp:645 +#: kdiff3.cpp:644 #, kde-format msgid "Toggle Between Dir && Text View" msgstr "Prepnúť medzi pohľadom adresára a textu" -#: kdiff3.cpp:697 pdiff.cpp:1909 -#, fuzzy, kde-format -#| msgid "The merge result hasn't been saved." +#: kdiff3.cpp:696 pdiff.cpp:1919 +#, kde-format msgid "The merge result has not been saved." msgstr "Výsledok zlúčenia nebol uložený." -#: kdiff3.cpp:699 +#: kdiff3.cpp:698 #, kde-format msgid "Save && Quit" msgstr "Uložiť && koniec" -#: kdiff3.cpp:700 +#: kdiff3.cpp:699 #, kde-format msgid "Quit Without Saving" msgstr "Ukončiť bez uloženia" -#: kdiff3.cpp:708 pdiff.cpp:1920 +#: kdiff3.cpp:707 pdiff.cpp:1930 #, kde-format msgid "Saving the merge result failed." msgstr "Uloženie výsledku zlúčenia zlyhalo." -#: kdiff3.cpp:719 pdiff.cpp:1032 +#: kdiff3.cpp:718 pdiff.cpp:1030 #, kde-format msgid "" "You are currently doing a directory merge. Are you sure, you want to abort?" @@ -1542,91 +1531,88 @@ "V súčasnej dobe robíte adresárové zlúčenie. Ste si istí, že chcete ho " "prerušiť?" -#: kdiff3.cpp:742 +#: kdiff3.cpp:741 #, kde-format msgid "Saving file..." msgstr "Ukladá sa súbor..." -#: kdiff3.cpp:759 +#: kdiff3.cpp:758 #, kde-format msgid "Saving file with a new filename..." msgstr "Ukladá sa súbor pod novým menom..." -#: kdiff3.cpp:761 +#: kdiff3.cpp:760 #, kde-format msgid "Save As..." msgstr "Uložiť ako..." -#: kdiff3.cpp:820 +#: kdiff3.cpp:819 #, kde-format msgid "Printing not implemented." msgstr "Tlačenie nie je implementované." -#: kdiff3.cpp:857 +#: kdiff3.cpp:858 #, kde-format msgid "Printing..." msgstr "Tlač..." -#: kdiff3.cpp:943 +#: kdiff3.cpp:948 #, kde-format msgid "Printing page %1 of %2" -msgstr "" +msgstr "Tlačím stranu %1 z %2" -#: kdiff3.cpp:1000 -#, fuzzy, kde-format -#| msgid "Selection" +#: kdiff3.cpp:1006 +#, kde-format msgid " (Selection)" -msgstr "Výber" +msgstr " (Výber)" -#: kdiff3.cpp:1027 +#: kdiff3.cpp:1034 #, kde-format msgid "Printing completed." msgstr "Tlač bola dokončená." -#: kdiff3.cpp:1031 +#: kdiff3.cpp:1038 #, kde-format msgid "Printing aborted." msgstr "Tlač bola prerušená." -#: kdiff3.cpp:1038 +#: kdiff3.cpp:1045 #, kde-format msgid "Exiting..." msgstr "Ukončujem..." -#: kdiff3.cpp:1049 +#: kdiff3.cpp:1056 #, kde-format msgid "Toggling toolbar..." msgstr "Prepínam panel nástrojov..." -#: kdiff3.cpp:1070 +#: kdiff3.cpp:1077 #, kde-format msgid "Toggle the statusbar..." msgstr "Prepnúť stavový riadok..." #: kdiff3_part.cpp:45 -#, fuzzy, kde-format -#| msgid "KDiff3Part" +#, kde-format msgid "KDiff3 Part" -msgstr "KDiff3Part" +msgstr "KDiff3 Part" #: kdiff3_part.cpp:46 #, kde-format msgid "A KPart to display SVG images" -msgstr "" +msgstr "Komponent na zobrazenie SVG obrázkov" #: kdiff3_part.cpp:48 #, kde-format msgid "Copyright 2007, Aurélien Gâteau " -msgstr "" +msgstr "Copyright 2007, Aurélien Gâteau " #: kdiff3_part.cpp:49 #, kde-format msgid "Joachim Eibl" msgstr "Joachim Eibl" -#: kdiff3_part.cpp:173 kdiff3_part.cpp:254 -#, fuzzy, kde-format -#| msgid "Couldn't find files for comparison." +#: kdiff3_part.cpp:174 kdiff3_part.cpp:255 +#, kde-format msgid "Could not find files for comparison." msgstr "Nebolo možné nájsť súbory pre porovnanie." @@ -1643,7 +1629,7 @@ msgstr "Nastaviť KDiff3" #. i18n: ectx: ToolBar (mainToolBar) -#: kdiff3_part.rc:16 main.cpp:88 +#: kdiff3_part.rc:16 main.cpp:89 #, kde-format msgid "KDiff3" msgstr "KDiff3" @@ -1685,8 +1671,7 @@ #. i18n: ectx: Menu (movement) #: kdiff3_shell.rc:50 -#, fuzzy, kde-format -#| msgid "&Movement" +#, kde-format msgid "M&ovement" msgstr "Presun" @@ -1698,8 +1683,7 @@ #. i18n: ectx: Menu (merge) #: kdiff3_shell.rc:73 -#, fuzzy, kde-format -#| msgid "Merge" +#, kde-format msgid "M&erge" msgstr "Zlúčiť" @@ -1715,85 +1699,89 @@ msgid "Main Toolbar" msgstr "Hlavný panel nástrojov" -#: main.cpp:68 main.cpp:72 +#: main.cpp:69 main.cpp:73 #, kde-format msgid "Ignored. (User defined.)" msgstr "Ignorované. (Používateľom definované.)" -#: main.cpp:92 +#: main.cpp:93 #, kde-format msgid " (64 bit)" -msgstr "" +msgstr " (64 bit)" -#: main.cpp:94 +#: main.cpp:95 #, kde-format msgid " (32 bit)" -msgstr "" +msgstr " (32 bit)" -#: main.cpp:95 +#: main.cpp:96 #, kde-format msgid "Tool for Comparison and Merge of Files and Directories" msgstr "Nástroj pre porovnanie a zlúčenie súborov a adresárov" -#: main.cpp:96 +#: main.cpp:97 #, kde-format msgid "(c) 2002-2014 Joachim Eibl, (c) 2017 Michael Reeves KF5/Qt5 port" -msgstr "" +msgstr "(c) 2002-2014 Joachim Eibl, (c) 2017 Michael Reeves KF5/Qt5 port" -#: main.cpp:112 +#: main.cpp:113 #, kde-format msgid "Merge the input." msgstr "Zlúčiť vstup." -#: main.cpp:113 +#: main.cpp:114 #, kde-format msgid "Explicit base file. For compatibility with certain tools." msgstr "Explicitný základný súbor. Pre kompatibilitu s niektorými nástrojmi." -#: main.cpp:114 +#: main.cpp:115 #, kde-format msgid "Output file. Implies -m. E.g.: -o newfile.txt" msgstr "Výstupný súbor. Implikuje -m. Napr.: -o newfile.txt" -#: main.cpp:115 +#: main.cpp:116 #, kde-format msgid "Output file, again. (For compatibility with certain tools.)" msgstr "Výstupný súbor, znova. (Pre kompatibilitu s niektorými nástrojmi.)" -#: main.cpp:116 +#: main.cpp:118 #, kde-format msgid "No GUI if all conflicts are auto-solvable. (Needs -o file)" msgstr "" "Žiadne grafické rozhranie, ak sú všetky konflikty automaticky riešiteľné. " "(Potrebuje -o súbor)" -#: main.cpp:117 -#, fuzzy, kde-format -#| msgid "Don't solve conflicts automatically. (For compatibility...)" +#: main.cpp:120 +#, kde-format +msgid "Ignored." +msgstr "Ignorované." + +#: main.cpp:122 +#, kde-format msgid "Do not solve conflicts automatically." -msgstr "Neriešiť nezhody automaticky. (Pre kompatibilitu...)" +msgstr "Neriešiť nezhody automaticky." -#: main.cpp:118 +#: main.cpp:123 #, kde-format msgid "Visible name replacement for input file 1 (base)." msgstr "Náhrada viditeľného názvu pre vstupný súbor 1 (základ)." -#: main.cpp:119 +#: main.cpp:124 #, kde-format msgid "Visible name replacement for input file 2." msgstr "Náhrada viditeľného názvu pre vstupný súbor 2." -#: main.cpp:120 +#: main.cpp:125 #, kde-format msgid "Visible name replacement for input file 3." msgstr "Náhrada viditeľného názvu pre vstupný súbor 3." -#: main.cpp:121 +#: main.cpp:126 #, kde-format msgid "Alternative visible name replacement. Supply this once for every input." msgstr "Alternatívna náhrada viditeľného názvu. Zadať ho raz pre každý vstup." -#: main.cpp:122 +#: main.cpp:127 #, kde-format msgid "" "Override a config setting. Use once for every setting. E.g.: --cs " @@ -1802,87 +1790,87 @@ "Prepísať konfiguračné nastavenie. Použiť raz pre každé nastavenie. Napr.: --" "cs \"AutoAdvance=1\"" -#: main.cpp:123 +#: main.cpp:128 #, kde-format msgid "Show list of config settings and current values." msgstr "Ukázať zoznam konfiguračných nastavení a súčasných hodnôt." -#: main.cpp:124 +#: main.cpp:129 #, kde-format msgid "Use a different config file." msgstr "Použiť rozdielny konfiguračný súbor." -#: main.cpp:127 +#: main.cpp:132 #, kde-format msgid "file1 to open (base, if not specified via --base)" msgstr "súbor1 na otvorenie (základ, ak nie je uvedené cez --base)" -#: main.cpp:128 +#: main.cpp:133 #, kde-format msgid "file2 to open" msgstr "súbor2 na otvorenie" -#: main.cpp:129 +#: main.cpp:134 #, kde-format msgid "file3 to open" msgstr "súbor3 na otvorenie" -#: main.cpp:153 +#: main.cpp:158 #, kde-format msgid "See kdiff3 --help for supported options." -msgstr "" +msgstr "Pozrite kdiff3 --help pre podporované voľby." -#: mergeresultwindow.cpp:158 +#: mergeresultwindow.cpp:171 #, kde-format msgid "Choose A Everywhere" msgstr "Zvoliť A všade" -#: mergeresultwindow.cpp:159 +#: mergeresultwindow.cpp:172 #, kde-format msgid "Choose B Everywhere" msgstr "Zvoliť B všade" -#: mergeresultwindow.cpp:160 +#: mergeresultwindow.cpp:173 #, kde-format msgid "Choose C Everywhere" msgstr "Zvoliť C všade" -#: mergeresultwindow.cpp:161 +#: mergeresultwindow.cpp:174 #, kde-format msgid "Choose A for All Unsolved Conflicts" msgstr "Zvoliť A pre všetky nevyriešené nezhody" -#: mergeresultwindow.cpp:162 +#: mergeresultwindow.cpp:175 #, kde-format msgid "Choose B for All Unsolved Conflicts" msgstr "Zvoliť B pre všetky nevyriešené nezhody" -#: mergeresultwindow.cpp:163 +#: mergeresultwindow.cpp:176 #, kde-format msgid "Choose C for All Unsolved Conflicts" msgstr "Zvoliť C pre všetky nevyriešené nezhody" -#: mergeresultwindow.cpp:164 +#: mergeresultwindow.cpp:177 #, kde-format msgid "Choose A for All Unsolved Whitespace Conflicts" msgstr "Zvoliť A pre všetky nevyriešené nezhody medzier" -#: mergeresultwindow.cpp:165 +#: mergeresultwindow.cpp:178 #, kde-format msgid "Choose B for All Unsolved Whitespace Conflicts" msgstr "Zvoliť B pre všetky nevyriešené nezhody medzier" -#: mergeresultwindow.cpp:166 +#: mergeresultwindow.cpp:179 #, kde-format msgid "Choose C for All Unsolved Whitespace Conflicts" msgstr "Zvoliť C pre všetky nevyriešené nezhody medzier" -#: mergeresultwindow.cpp:176 +#: mergeresultwindow.cpp:204 #, kde-format msgid "Number of remaining unsolved conflicts: %1 (of which %2 are whitespace)" msgstr "Počet zostávajúcich nevyriešených nezhôd: %1 (z ktorých %2 sú medzery)" -#: mergeresultwindow.cpp:370 +#: mergeresultwindow.cpp:398 #, kde-format msgid "" "The output has been modified.\n" @@ -1891,29 +1879,29 @@ "Výstup bol zmenený.\n" "Ak budete pokračovať, vaše zmeny sa stratia." -#: mergeresultwindow.cpp:936 pdiff.cpp:827 +#: mergeresultwindow.cpp:964 pdiff.cpp:817 #, kde-format msgid "All input files are binary equal." msgstr "Všetky vstupné súbory sú binárne rovnaké." -#: mergeresultwindow.cpp:938 +#: mergeresultwindow.cpp:966 #, kde-format msgid "All input files contain the same text." msgstr "Všetky vstupné súbory obsahujú rovnaký text." -#: mergeresultwindow.cpp:942 mergeresultwindow.cpp:946 -#: mergeresultwindow.cpp:950 pdiff.cpp:833 pdiff.cpp:837 pdiff.cpp:841 +#: mergeresultwindow.cpp:970 mergeresultwindow.cpp:974 +#: mergeresultwindow.cpp:978 pdiff.cpp:823 pdiff.cpp:827 pdiff.cpp:831 #, kde-format msgid "Files %1 and %2 are binary equal.\n" msgstr "Súbory %1 a %2 sú binárne rovnaké.\n" -#: mergeresultwindow.cpp:944 mergeresultwindow.cpp:948 -#: mergeresultwindow.cpp:952 +#: mergeresultwindow.cpp:972 mergeresultwindow.cpp:976 +#: mergeresultwindow.cpp:980 #, kde-format msgid "Files %1 and %2 have equal text.\n" msgstr "Súbory %1 a %2 majú rovnaký text.\n" -#: mergeresultwindow.cpp:958 +#: mergeresultwindow.cpp:986 #, kde-format msgid "" "Total number of conflicts: %1\n" @@ -1921,50 +1909,47 @@ "Nr of unsolved conflicts: %3\n" "%4" msgstr "" +"Celkový počet konfliktov: %1\n" +"Počet automaticky vyriešených konfliktov: %2\n" +"Počet nevyriešených konfliktov: %3\n" +"%4" -#: mergeresultwindow.cpp:964 +#: mergeresultwindow.cpp:992 #, kde-format msgid "Conflicts" msgstr "Nezhody" -#: mergeresultwindow.cpp:1873 +#: mergeresultwindow.cpp:1901 #, kde-format msgid "" msgstr "<Žiadny zdrojový riadok>" -#: mergeresultwindow.cpp:1881 +#: mergeresultwindow.cpp:1909 #, kde-format msgid "" msgstr "" -#: mergeresultwindow.cpp:1883 mergeresultwindow.cpp:2755 +#: mergeresultwindow.cpp:1911 mergeresultwindow.cpp:2783 #, kde-format msgid "" msgstr "" -#: mergeresultwindow.cpp:2967 -#, fuzzy, kde-format -#| msgid "" -#| "Not all conflicts are solved yet.\n" -#| "File not saved.\n" +#: mergeresultwindow.cpp:2995 +#, kde-format msgid "" "Not all conflicts are solved yet.\n" "File not saved." msgstr "" "Nie všetky konflikty sú už vyriešené.\n" -"Súbor nie je uložený.\n" +"Súbor nie je uložený." -#: mergeresultwindow.cpp:2969 mergeresultwindow.cpp:2978 +#: mergeresultwindow.cpp:2997 mergeresultwindow.cpp:3006 #, kde-format msgid "Conflicts Left" msgstr "Zostávajúce nezhody" -#: mergeresultwindow.cpp:2976 -#, fuzzy, kde-format -#| msgid "" -#| "There is a line end style conflict. Please choose the line end style " -#| "manually.\n" -#| "File not saved.\n" +#: mergeresultwindow.cpp:3004 +#, kde-format msgid "" "There is a line end style conflict. Please choose the line end style " "manually.\n" @@ -1972,9 +1957,9 @@ msgstr "" "Existuje nezhoda v spôsobe ukončenia riadka. Prosím, zvoľte spôsob ukončenia " "riadka ručne.\n" -"Súbor nie je uložený.\n" +"Súbor nie je uložený." -#: mergeresultwindow.cpp:2990 +#: mergeresultwindow.cpp:3018 #, kde-format msgid "" "\n" @@ -1985,188 +1970,184 @@ "\n" "Vytvorenie zálohy zlyhalo. Súbor neuložený." -#: mergeresultwindow.cpp:2990 mergeresultwindow.cpp:3038 +#: mergeresultwindow.cpp:3018 mergeresultwindow.cpp:3066 #, kde-format msgid "File Save Error" msgstr "Chyba ukladania súboru" -#: mergeresultwindow.cpp:3038 +#: mergeresultwindow.cpp:3066 #, kde-format msgid "Error while writing." msgstr "Chyba počas zapisovania." -#: mergeresultwindow.cpp:3110 -#, fuzzy, kde-format -#| msgid "Output" +#: mergeresultwindow.cpp:3138 +#, kde-format msgid "Output:" -msgstr "Výstup" +msgstr "Výstup:" -#: mergeresultwindow.cpp:3123 mergeresultwindow.cpp:3315 +#: mergeresultwindow.cpp:3151 mergeresultwindow.cpp:3343 #, kde-format msgid "[Modified]" msgstr "[Zmenené]" -#: mergeresultwindow.cpp:3130 -#, fuzzy, kde-format -#| msgid "Encoding for saving" +#: mergeresultwindow.cpp:3158 +#, kde-format msgid "Encoding for saving:" -msgstr "Kódovanie pre uloženie" +msgstr "Kódovanie pre uloženie:" -#: mergeresultwindow.cpp:3230 +#: mergeresultwindow.cpp:3258 #, kde-format msgid "Conflict" msgstr "Nezhoda" -#: mergeresultwindow.cpp:3262 -#, fuzzy, kde-format -#| msgid "Codec from" +#: mergeresultwindow.cpp:3290 +#, kde-format msgid "Codec from A: %1" -msgstr "Kodek z" +msgstr "Kodek z A: %1" -#: mergeresultwindow.cpp:3264 -#, fuzzy, kde-format -#| msgid "Codec from" +#: mergeresultwindow.cpp:3292 +#, kde-format msgid "Codec from B: %1" -msgstr "Kodek z" +msgstr "Kodek z B: %1" -#: mergeresultwindow.cpp:3266 -#, fuzzy, kde-format -#| msgid "Codec from" +#: mergeresultwindow.cpp:3294 +#, kde-format msgid "Codec from C: %1" -msgstr "Kodek z" +msgstr "Kodek z C: %1" -#: optiondialog.cpp:119 +#: optiondialog.cpp:121 #, kde-format msgid "Change Font" -msgstr "" +msgstr "Zmeniť písmo" -#: optiondialog.cpp:135 optiondialog.cpp:145 +#: optiondialog.cpp:137 optiondialog.cpp:147 #, kde-format msgid "" "Font: %1, %2, %3\n" "\n" "Example:" msgstr "" +"Písmo: %1, %2, %3\n" +"\n" +"Príklad:" -#: optiondialog.cpp:388 +#: optiondialog.cpp:390 #, kde-format msgid "Unicode" msgstr "Unicode" -#: optiondialog.cpp:389 +#: optiondialog.cpp:391 #, kde-format msgid "Latin1" msgstr "Latin1" -#: optiondialog.cpp:408 +#: optiondialog.cpp:410 #, kde-format msgid "Change this if non-ASCII characters are not displayed correctly." msgstr "Toto zmeniť, ak sa znaky, ktoré nie sú ASCII, sa nezobrazujú správne." -#: optiondialog.cpp:491 +#: optiondialog.cpp:495 #, kde-format msgid "Configure" msgstr "Konfigurovať" -#: optiondialog.cpp:568 +#: optiondialog.cpp:573 #, kde-format msgid "Font" msgstr "Písmo" -#: optiondialog.cpp:570 +#: optiondialog.cpp:575 #, kde-format msgid "Editor & Diff Output Font" msgstr "Písmo výstupu editora a diff" -#: optiondialog.cpp:589 +#: optiondialog.cpp:594 #, kde-format msgid "Application font" -msgstr "" +msgstr "Font aplikácie" -#: optiondialog.cpp:594 -#, fuzzy, kde-format -#| msgid "File Save Error" +#: optiondialog.cpp:599 +#, kde-format msgid "File view font" -msgstr "Chyba ukladania súboru" +msgstr "Písmo zobrazenia súboru" -#: optiondialog.cpp:613 -#, fuzzy, kde-format -#| msgid "Color" +#: optiondialog.cpp:618 +#, kde-format msgctxt "Title for color settings page" msgid "Color" msgstr "Farba" -#: optiondialog.cpp:614 +#: optiondialog.cpp:619 #, kde-format msgid "Colors Settings" msgstr "Nastavenie farieb" -#: optiondialog.cpp:631 +#: optiondialog.cpp:644 #, kde-format msgid "Editor and Diff Views:" msgstr "Pohľad editora a diff" -#: optiondialog.cpp:639 +#: optiondialog.cpp:652 #, kde-format msgid "Foreground color:" msgstr "Farba popredia:" -#: optiondialog.cpp:647 +#: optiondialog.cpp:660 #, kde-format msgid "Background color:" msgstr "Farba pozadia:" -#: optiondialog.cpp:657 +#: optiondialog.cpp:670 #, kde-format msgid "Diff background color:" msgstr "Farba pozadia diff:" -#: optiondialog.cpp:666 +#: optiondialog.cpp:679 #, kde-format msgid "Color A:" msgstr "Farba A:" -#: optiondialog.cpp:675 +#: optiondialog.cpp:688 #, kde-format msgid "Color B:" msgstr "Farba B:" -#: optiondialog.cpp:684 +#: optiondialog.cpp:697 #, kde-format msgid "Color C:" msgstr "Farba C:" -#: optiondialog.cpp:692 +#: optiondialog.cpp:705 #, kde-format msgid "Conflict color:" msgstr "Farba nezhody:" -#: optiondialog.cpp:701 +#: optiondialog.cpp:714 #, kde-format msgid "Current range background color:" msgstr "Farba aktuálneho rozsahu pozadia:" -#: optiondialog.cpp:710 +#: optiondialog.cpp:723 #, kde-format msgid "Current range diff background color:" msgstr "Farba aktuálneho rozsahu farby pozadia diff:" -#: optiondialog.cpp:718 +#: optiondialog.cpp:731 #, kde-format msgid "Color for manually aligned difference ranges:" msgstr "Farba pre rozsahy ručne usporiadaného rozdielu:" -#: optiondialog.cpp:725 +#: optiondialog.cpp:738 #, kde-format msgid "Directory Comparison View:" msgstr "Pohľad adresárového porovnania:" -#: optiondialog.cpp:731 +#: optiondialog.cpp:744 #, kde-format msgid "Newest file color:" msgstr "Farba najnovšieho súboru:" -#: optiondialog.cpp:736 +#: optiondialog.cpp:749 #, kde-format msgid "" "Changing this color will only be effective when starting the next directory " @@ -2175,37 +2156,37 @@ "Zmena tejto farby bude účinné až pri spustení nasledujúceho porovnania " "adresára." -#: optiondialog.cpp:741 +#: optiondialog.cpp:754 #, kde-format msgid "Oldest file color:" msgstr "Farba najstaršieho súboru:" -#: optiondialog.cpp:750 +#: optiondialog.cpp:763 #, kde-format msgid "Middle age file color:" msgstr "Farba strednodobého súboru:" -#: optiondialog.cpp:759 +#: optiondialog.cpp:772 #, kde-format msgid "Color for missing files:" msgstr "Farba pre chýbajúce súbory:" -#: optiondialog.cpp:773 +#: optiondialog.cpp:786 #, kde-format msgid "Editor" msgstr "Editor" -#: optiondialog.cpp:774 +#: optiondialog.cpp:787 #, kde-format msgid "Editor Behavior" msgstr "Správanie editora" -#: optiondialog.cpp:787 +#: optiondialog.cpp:809 #, kde-format msgid "Tab inserts spaces" msgstr "Tabulátor vloží medzery" -#: optiondialog.cpp:791 +#: optiondialog.cpp:813 #, kde-format msgid "" "On: Pressing tab generates the appropriate number of spaces.\n" @@ -2214,32 +2195,29 @@ "Zapnuté: Stlačením tabulátora generuje zodpovedajúci počet medzier.\n" "Vypnuté: Bude vložený znak tabulátora." -#: optiondialog.cpp:796 +#: optiondialog.cpp:818 #, kde-format msgid "Tab size:" msgstr "Veľkosť tabulátora:" -#: optiondialog.cpp:803 +#: optiondialog.cpp:825 #, kde-format msgid "Auto indentation" msgstr "Automatické odsadzovanie" -#: optiondialog.cpp:807 +#: optiondialog.cpp:829 #, kde-format msgid "On: The indentation of the previous line is used for a new line.\n" msgstr "" "Zapnuté : Odsadenie predchádzajúceho riadka sa použije pre nový riadok.\n" -#: optiondialog.cpp:810 +#: optiondialog.cpp:832 #, kde-format msgid "Auto copy selection" msgstr "Automatický výber kopírovania" -#: optiondialog.cpp:814 -#, fuzzy, kde-format -#| msgid "" -#| "On: Any selection is immediately written to the clipboard.\n" -#| "Off: You must explicitely copy e.g. via Ctrl-C." +#: optiondialog.cpp:836 +#, kde-format msgid "" "On: Any selection is immediately written to the clipboard.\n" "Off: You must explicitly copy e.g. via Ctrl-C." @@ -2247,7 +2225,7 @@ "Zapnuté: Každý výber je okamžite zapísaný do schránky.\n" "Vypnuté: Je nutné explicitne kopírovať napr. cez Ctrl-C." -#: optiondialog.cpp:829 +#: optiondialog.cpp:851 #, kde-format msgid "" "Sets the line endings for when an edited file is saved.\n" @@ -2256,12 +2234,12 @@ "Nastaví konce riadkov, keď je upravený súbor uložený.\n" "DOS/Windows: CR+LF; UNIX: LF; s CR=0D, LF=0A" -#: optiondialog.cpp:839 +#: optiondialog.cpp:861 #, kde-format msgid "Diff" msgstr "Diff" -#: optiondialog.cpp:840 +#: optiondialog.cpp:862 #, kde-format msgid "Diff Settings" msgstr "Nastavenie Diff" @@ -2275,13 +2253,12 @@ #. ); #. ++line; #. -#: optiondialog.cpp:865 -#, fuzzy, kde-format -#| msgid "Treat as white space." +#: optiondialog.cpp:896 +#, kde-format msgid "Ignore numbers (treat as white space)" -msgstr "Zaobchádzať ako s medzerou." +msgstr "Ignorovať čísla (zaobchádzať ako s medzerou)" -#: optiondialog.cpp:869 +#: optiondialog.cpp:900 #, kde-format msgid "" "Ignore number characters during line matching phase. (Similar to Ignore " @@ -2292,48 +2269,46 @@ "ignorovanie medzier).\n" "Možno pomôže porovnať súbory s číselnými údajmi." -#: optiondialog.cpp:873 -#, fuzzy, kde-format -#| msgid "Treat C/C++ comments like white space." +#: optiondialog.cpp:904 +#, kde-format msgid "Ignore C/C++ comments (treat as white space)" -msgstr "Zaobchádzať s komentármi C/C++ ako s medzerou." +msgstr "Ignorovať komentáre C/C++ (zaobchádzať ako s medzerou)" -#: optiondialog.cpp:876 +#: optiondialog.cpp:907 #, kde-format msgid "Treat C/C++ comments like white space." msgstr "Zaobchádzať s komentármi C/C++ ako s medzerou." -#: optiondialog.cpp:879 -#, fuzzy, kde-format -#| msgid "Treat as white space." +#: optiondialog.cpp:910 +#, kde-format msgid "Ignore case (treat as white space)" -msgstr "Zaobchádzať ako s medzerou." +msgstr "Ignorovať veľkosť (zaobchádzať ako s medzerou)" -#: optiondialog.cpp:883 +#: optiondialog.cpp:914 #, kde-format msgid "Treat case differences like white space changes. ('a'<=>'A')" msgstr "" "Zaobchádzať s rozdielmi vo veľkosti písmen ako so zmenami v medzerách." "('a'<=>'A')" -#: optiondialog.cpp:886 +#: optiondialog.cpp:917 #, kde-format msgid "Preprocessor command:" msgstr "Príkaz preprocesora:" -#: optiondialog.cpp:891 +#: optiondialog.cpp:922 #, kde-format msgid "User defined pre-processing. (See the docs for details.)" msgstr "" "Používateľom definovaná činnosť preprocesora. (Kvôli podrobnostiam pozrieť " "dokumentáciu.)" -#: optiondialog.cpp:894 +#: optiondialog.cpp:925 #, kde-format msgid "Line-matching preprocessor command:" msgstr "Príkaz porovnávanie riadkov preprocesora:" -#: optiondialog.cpp:899 +#: optiondialog.cpp:930 #, kde-format msgid "" "This pre-processor is only used during line matching.\n" @@ -2342,12 +2317,12 @@ "Tento preprocesor je použitý iba pri porovnávaní riadkov.\n" "(Kvôli podrobnostiam pozrieť dokumentáciu.)" -#: optiondialog.cpp:902 +#: optiondialog.cpp:933 #, kde-format msgid "Try hard (slower)" msgstr "Snažiť sa (pomalšie)" -#: optiondialog.cpp:906 +#: optiondialog.cpp:937 #, kde-format msgid "" "Enables the --minimal option for the external diff.\n" @@ -2356,12 +2331,12 @@ "Povolí voľbu --minimal pre externé diff.\n" "Analýza veľkých súborov bude oveľa pomalšia." -#: optiondialog.cpp:910 +#: optiondialog.cpp:941 #, kde-format msgid "Align B and C for 3 input files" msgstr "Usporiadať B a C pre 3 vstupné súbory" -#: optiondialog.cpp:914 +#: optiondialog.cpp:945 #, kde-format msgid "" "Try to align B and C when comparing or merging three input files.\n" @@ -2374,17 +2349,23 @@ "zložitejším.\n" "(V predvolenom nastavení je vypnuté)." -#: optiondialog.cpp:926 +#: optiondialog.cpp:956 +#, kde-format +msgctxt "Settings page" +msgid "Merge" +msgstr "Zlúčiť" + +#: optiondialog.cpp:957 #, kde-format msgid "Merge Settings" msgstr "Nastavenia zlúčenia" -#: optiondialog.cpp:940 +#: optiondialog.cpp:980 #, kde-format msgid "Auto advance delay (ms):" msgstr "Automatické oneskorenie postupu (ms):" -#: optiondialog.cpp:946 +#: optiondialog.cpp:986 #, kde-format msgid "" "When in Auto-Advance mode the result of the current selection is shown \n" @@ -2393,27 +2374,27 @@ "V režime automatického postupu je zobrazený výsledok aktuálneho výberu\n" "po stanovenú dobu pred skokom na nasledujúcu nezhodu. Rozsah: 0 až 2000 ms" -#: optiondialog.cpp:950 +#: optiondialog.cpp:990 #, kde-format msgid "Show info dialogs" msgstr "Ukazovať informačné dialógy" -#: optiondialog.cpp:953 +#: optiondialog.cpp:993 #, kde-format msgid "Show a dialog with information about the number of conflicts." msgstr "Ukazovať dialóg s informáciou o počte nezhôd." -#: optiondialog.cpp:956 +#: optiondialog.cpp:996 #, kde-format msgid "White space 2-file merge default:" msgstr "Predvolené nastavenie zlúčenia medzier 2 súborov:" -#: optiondialog.cpp:961 optiondialog.cpp:974 +#: optiondialog.cpp:1001 optiondialog.cpp:1014 #, kde-format msgid "Manual Choice" msgstr "Ručná voľba" -#: optiondialog.cpp:965 optiondialog.cpp:979 +#: optiondialog.cpp:1005 optiondialog.cpp:1019 #, kde-format msgid "" "Allow the merge algorithm to automatically select an input for white-space-" @@ -2421,22 +2402,22 @@ msgstr "" "Umožniť algoritmu zlúčenia automaticky vybrať vstup iba pre zmeny medzier." -#: optiondialog.cpp:969 +#: optiondialog.cpp:1009 #, kde-format msgid "White space 3-file merge default:" msgstr "Predvolené nastavenie zlúčenia medzier 3 súborov:" -#: optiondialog.cpp:983 +#: optiondialog.cpp:1023 #, kde-format msgid "Automatic Merge Regular Expression" msgstr "Regulárny výraz automatického zlúčenia" -#: optiondialog.cpp:991 smalldialogs.cpp:449 +#: optiondialog.cpp:1031 smalldialogs.cpp:459 #, kde-format msgid "Auto merge regular expression:" msgstr "Regulárny výraz automatického zlúčenia:" -#: optiondialog.cpp:996 +#: optiondialog.cpp:1036 #, kde-format msgid "" "Regular expression for lines where KDiff3 should automatically choose one " @@ -2449,12 +2430,12 @@ "Keď riadok s nezhodou zodpovedá regulárnemu výrazu, potom\n" "- ak je k dispozícii - C, inak bude vybrané B." -#: optiondialog.cpp:1002 +#: optiondialog.cpp:1042 #, kde-format msgid "Run regular expression auto merge on merge start" msgstr "Spustiť automatické zlúčenie regulárnych výrazov na začiatku zlúčenia" -#: optiondialog.cpp:1005 +#: optiondialog.cpp:1045 #, kde-format msgid "" "Run the merge for auto merge regular expressions\n" @@ -2463,17 +2444,17 @@ "Spustiť zlúčenie pre regulárne výrazy automatického zlúčenia\n" "hneď pri začatí zlúčenia.\n" -#: optiondialog.cpp:1010 +#: optiondialog.cpp:1050 #, kde-format msgid "Version Control History Merging" msgstr "Zlučovanie histórie správy verzií" -#: optiondialog.cpp:1018 smalldialogs.cpp:476 +#: optiondialog.cpp:1058 smalldialogs.cpp:486 #, kde-format msgid "History start regular expression:" msgstr "Regulárny výraz historického začiatku:" -#: optiondialog.cpp:1023 +#: optiondialog.cpp:1063 #, kde-format msgid "" "Regular expression for the start of the version control history entry.\n" @@ -2484,12 +2465,12 @@ "Obvykle tento riadok obsahuje kľúčové slovo \"$Log$\".\n" "Predvolená hodnota: \".*\\$Log.*\\$.*\"" -#: optiondialog.cpp:1029 smalldialogs.cpp:504 +#: optiondialog.cpp:1069 smalldialogs.cpp:514 #, kde-format msgid "History entry start regular expression:" msgstr "Regulárny výraz začiatku historickej položky:" -#: optiondialog.cpp:1042 +#: optiondialog.cpp:1082 #, kde-format msgid "" "A version control history entry consists of several lines.\n" @@ -2507,22 +2488,22 @@ "historické položky.\n" "Kvôli podrobnostiam pozrieť dokumentáciu." -#: optiondialog.cpp:1050 +#: optiondialog.cpp:1090 #, kde-format msgid "History merge sorting" msgstr "Triedenie histórie zlúčenia" -#: optiondialog.cpp:1053 +#: optiondialog.cpp:1093 #, kde-format msgid "Sort version control history by a key." msgstr "Roztriediť históriu správy verzií podľa kľúča." -#: optiondialog.cpp:1063 +#: optiondialog.cpp:1103 #, kde-format msgid "History entry start sort key order:" msgstr "Poradie triediaceho kľúča začiatku historickej položky:" -#: optiondialog.cpp:1068 +#: optiondialog.cpp:1108 #, kde-format msgid "" "Each pair of parentheses used in the regular expression for the history " @@ -2541,38 +2522,38 @@ "Ak sa ponechá prázdne, potom nebude urobené triedenie.\n" "Kvôli podrobnostiam pozrieť dokumentáciu." -#: optiondialog.cpp:1079 +#: optiondialog.cpp:1119 #, kde-format msgid "Merge version control history on merge start" msgstr "Zlúčiť históriu správy verzií na začiatku zlúčenia" -#: optiondialog.cpp:1082 +#: optiondialog.cpp:1122 #, kde-format msgid "Run version control history automerge on merge start." msgstr "" "Spustiť automatické zlúčenie histórie správy verzií na začiatku zlúčenia." -#: optiondialog.cpp:1086 +#: optiondialog.cpp:1126 #, kde-format msgid "Max number of history entries:" msgstr "Maximálny počet historických položiek:" -#: optiondialog.cpp:1090 +#: optiondialog.cpp:1130 #, kde-format msgid "Cut off after specified number. Use -1 for infinite number of entries." msgstr "Odrezať po zadanom počte. Použiť -1 pre nekonečný počet položiek." -#: optiondialog.cpp:1094 +#: optiondialog.cpp:1134 #, kde-format msgid "Test your regular expressions" msgstr "Otestujte vaše regulárne výrazy" -#: optiondialog.cpp:1099 +#: optiondialog.cpp:1139 #, kde-format msgid "Irrelevant merge command:" msgstr "Irelevantný príkaz zlúčenia:" -#: optiondialog.cpp:1104 +#: optiondialog.cpp:1144 #, kde-format msgid "" "If specified this script is run after automerge\n" @@ -2583,12 +2564,12 @@ "keď neboli zistené žiadne iné významné zmeny.\n" "Volaný s parametrami: filename1 filename2 filename3" -#: optiondialog.cpp:1109 +#: optiondialog.cpp:1149 #, kde-format msgid "Auto save and quit on merge without conflicts" msgstr "Automaticky uložiť a ukončiť pri zlúčení bez nezhôd" -#: optiondialog.cpp:1113 +#: optiondialog.cpp:1153 #, kde-format msgid "" "If KDiff3 was started for a file-merge from the command line and all\n" @@ -2602,27 +2583,27 @@ "uloženie a ukončenie programu.\n" "(Podobne ako voľba príkazového riadka \"--auto\".)" -#: optiondialog.cpp:1124 optiondialog.cpp:1125 +#: optiondialog.cpp:1164 optiondialog.cpp:1165 #, kde-format msgid "Directory" msgstr "Adresár" -#: optiondialog.cpp:1137 +#: optiondialog.cpp:1185 #, kde-format msgid "Recursive directories" msgstr "Rekurzívne adresáre" -#: optiondialog.cpp:1140 +#: optiondialog.cpp:1188 #, kde-format msgid "Whether to analyze subdirectories or not." msgstr "Či analyzovať podadresáre alebo nie." -#: optiondialog.cpp:1142 +#: optiondialog.cpp:1190 #, kde-format msgid "File pattern(s):" msgstr "Súborový vzor(y):" -#: optiondialog.cpp:1148 +#: optiondialog.cpp:1196 #, kde-format msgid "" "Pattern(s) of files to be analyzed. \n" @@ -2633,12 +2614,12 @@ "Zástupné znaky: '*' and '?'\n" "Niekoľko vzorov možno zadať pomocou oddeľovača: ';'" -#: optiondialog.cpp:1153 +#: optiondialog.cpp:1201 #, kde-format msgid "File-anti-pattern(s):" msgstr "Súborový protivzor(y):" -#: optiondialog.cpp:1159 +#: optiondialog.cpp:1207 #, kde-format msgid "" "Pattern(s) of files to be excluded from analysis. \n" @@ -2649,12 +2630,12 @@ "Zástupné znaky: '*' and '?'\n" "Niekoľko vzorov možno zadať pomocou oddeľovača: ';'" -#: optiondialog.cpp:1164 +#: optiondialog.cpp:1212 #, kde-format msgid "Dir-anti-pattern(s):" msgstr "Adresárový protivzor(y):" -#: optiondialog.cpp:1170 +#: optiondialog.cpp:1218 #, kde-format msgid "" "Pattern(s) of directories to be excluded from analysis. \n" @@ -2665,12 +2646,12 @@ "Zástupné znaky: '*' and '?'\n" "Niekoľko vzorov možno zadať pomocou oddeľovača: ';'" -#: optiondialog.cpp:1175 +#: optiondialog.cpp:1223 #, kde-format msgid "Use .cvsignore" msgstr "Použiť .cvsignore" -#: optiondialog.cpp:1179 +#: optiondialog.cpp:1227 #, kde-format msgid "" "Extends the antipattern to anything that would be ignored by CVS.\n" @@ -2679,23 +2660,22 @@ "Rozširuje protivzor na čokoľvek, čo by bolo ignorované CVS.\n" "Cez lokálne súbory \".cvsignore\" to môže byť špecifické pre adresár." -#: optiondialog.cpp:1183 +#: optiondialog.cpp:1231 #, kde-format msgid "Find hidden files and directories" msgstr "Nájsť skryté súbory a adresáre" -#: optiondialog.cpp:1186 -#, fuzzy, kde-format -#| msgid "Find hidden files and directories" +#: optiondialog.cpp:1234 +#, kde-format msgid "Finds hidden files and directories." -msgstr "Nájsť skryté súbory a adresáre" +msgstr "Nájde skryté súbory a adresáre." -#: optiondialog.cpp:1189 +#: optiondialog.cpp:1237 #, kde-format msgid "Follow file links" msgstr "Nasledovať súborové odkazy" -#: optiondialog.cpp:1193 +#: optiondialog.cpp:1241 #, kde-format msgid "" "On: Compare the file the link points to.\n" @@ -2704,12 +2684,12 @@ "Zapnuté: Porovnať súbor, na ktorý ukazuje odkaz.\n" "Vypnuté: Porovnať odkazy." -#: optiondialog.cpp:1197 +#: optiondialog.cpp:1245 #, kde-format msgid "Follow directory links" msgstr "Nasledovať adresárové odkazy" -#: optiondialog.cpp:1201 +#: optiondialog.cpp:1249 #, kde-format msgid "" "On: Compare the directory the link points to.\n" @@ -2718,12 +2698,12 @@ "Zapnuté: Porovnať adresár, na ktorý ukazuje odkaz.\n" "Vypnuté: Porovnať odkazy." -#: optiondialog.cpp:1210 +#: optiondialog.cpp:1258 #, kde-format msgid "Case sensitive filename comparison" msgstr "Porovnanie názvov súborov s rozlišovaním veľkosti písmen" -#: optiondialog.cpp:1214 +#: optiondialog.cpp:1262 #, kde-format msgid "" "The directory comparison will compare files or directories when their names " @@ -2736,52 +2716,55 @@ "Nastaviť túto voľbu, ak sa názvy musia zhodovať. (Predvolené nastavenie pre " "Windows je \tvypnuté, inak zapnuté)." -#: optiondialog.cpp:1218 -#, fuzzy, kde-format -#| msgid "Unfold All Subdirs" +#: optiondialog.cpp:1266 +#, kde-format msgid "Unfold all subdirectories on load" -msgstr "Rozbaliť všetky podadresáre" +msgstr "Rozbaliť všetky podadresáre pri načítaní" -#: optiondialog.cpp:1222 +#: optiondialog.cpp:1270 #, kde-format msgid "" "On: Unfold all subdirectories when starting a directory diff.\n" "Off: Leave subdirectories folded." msgstr "" +"Zapnuté: Rozvinúť podadresáre pri spustení porovnania adresára.\n" +"Vypnuté: Nechať podadresáre zvinuté." -#: optiondialog.cpp:1226 +#: optiondialog.cpp:1274 #, kde-format msgid "Skip directory status report" -msgstr "" +msgstr "Preskočiť správu o stave adresárov" -#: optiondialog.cpp:1230 +#: optiondialog.cpp:1278 #, kde-format msgid "" "On: Do not show the Directory Comparison Status.\n" "Off: Show the status dialog on start." msgstr "" +"Zapnuté: Nezobrazovať stav porovnania adresárov.\n" +"Vypnuté: Zobraziť stavový dialóg pri spustení." -#: optiondialog.cpp:1234 +#: optiondialog.cpp:1282 #, kde-format msgid "File Comparison Mode" msgstr "Režim porovnania súborov" -#: optiondialog.cpp:1239 +#: optiondialog.cpp:1287 #, kde-format msgid "Binary comparison" msgstr "Binárne porovnanie" -#: optiondialog.cpp:1241 +#: optiondialog.cpp:1289 #, kde-format msgid "Binary comparison of each file. (Default)" msgstr "Binárne porovnanie každého súboru. (Predvolené)" -#: optiondialog.cpp:1244 +#: optiondialog.cpp:1292 #, kde-format msgid "Full analysis" msgstr "Plná analýza" -#: optiondialog.cpp:1246 +#: optiondialog.cpp:1294 #, kde-format msgid "" "Do a full analysis and show statistics information in extra columns.\n" @@ -2790,12 +2773,12 @@ "Urobiť úplnú analýzu a ukázať štatistické informácie v ďalších stĺpcoch.\n" "(Pomalšie než binárne porovnanie, oveľa pomalšie pre binárne súbory.)" -#: optiondialog.cpp:1250 +#: optiondialog.cpp:1298 #, kde-format msgid "Trust the size and modification date (unsafe)" msgstr "Dôverovať veľkosti a dátumu zmeny (nebezpečné)" -#: optiondialog.cpp:1252 +#: optiondialog.cpp:1300 #, kde-format msgid "" "Assume that files are equal if the modification date and file length are " @@ -2810,7 +2793,7 @@ "rozdielne.\n" "Vhodné pre veľké adresáre alebo pomalé siete." -#: optiondialog.cpp:1257 +#: optiondialog.cpp:1305 #, kde-format msgid "" "Trust the size and date, but use binary comparison if date does not match " @@ -2819,7 +2802,7 @@ "Dôverovať veľkosti a dátumu, ale použiť binárne porovnanie, ak dátum " "nezodpovedá (nebezpečné)" -#: optiondialog.cpp:1259 +#: optiondialog.cpp:1307 #, kde-format msgid "" "Assume that files are equal if the modification date and file length are " @@ -2832,12 +2815,12 @@ "Ak dátumy nie sú rovnaké, ale veľkosti sú, použiť binárne porovnanie.\n" "Vhodné pre veľké adresáre alebo pomalé siete." -#: optiondialog.cpp:1264 +#: optiondialog.cpp:1312 #, kde-format msgid "Trust the size (unsafe)" msgstr "Dôverovať veľkosti (nebezpečné)" -#: optiondialog.cpp:1266 +#: optiondialog.cpp:1314 #, kde-format msgid "" "Assume that files are equal if their file lengths are equal.\n" @@ -2848,12 +2831,12 @@ "Vhodné pre veľké adresáre alebo pomalé siete,kedy je dátum zmenený v " "priebehu sťahovania." -#: optiondialog.cpp:1273 +#: optiondialog.cpp:1321 #, kde-format msgid "Synchronize directories" msgstr "Synchronizovať adresáre" -#: optiondialog.cpp:1277 +#: optiondialog.cpp:1325 #, kde-format msgid "" "Offers to store files in both directories so that\n" @@ -2864,12 +2847,12 @@ "obaja adresáre sú potom rovnaké.\n" "Funguje iba pri porovnávaní dvoch adresárov bez určenia cieľa." -#: optiondialog.cpp:1283 +#: optiondialog.cpp:1331 #, kde-format msgid "White space differences considered equal" msgstr "Rozdiely medzier považované za rovnaké" -#: optiondialog.cpp:1287 +#: optiondialog.cpp:1335 #, kde-format msgid "" "If files differ only by white space consider them equal.\n" @@ -2878,17 +2861,13 @@ "Ak sa súbory líšia iba medzerou, považujú za rovnaké.\n" "Toto je aktívne iba vtedy, keď je zvolená úplná analýza." -#: optiondialog.cpp:1293 +#: optiondialog.cpp:1341 #, kde-format msgid "Copy newer instead of merging (unsafe)" msgstr "Kopírovať novšie miesto zlučovania (nebezpečné)" -#: optiondialog.cpp:1297 -#, fuzzy, kde-format -#| msgid "" -#| "Don't look inside, just take the newer file.\n" -#| "(Use this only if you know what you are doing!)\n" -#| "Only effective when comparing two directories." +#: optiondialog.cpp:1345 +#, kde-format msgid "" "Do not look inside, just take the newer file.\n" "(Use this only if you know what you are doing!)\n" @@ -2898,12 +2877,12 @@ "(Použite iba vtedy, ak viete, čo robíte!)\n" "Účinná iba pri porovnávaní iba dvoch adresárov." -#: optiondialog.cpp:1302 +#: optiondialog.cpp:1350 #, kde-format msgid "Backup files (.orig)" msgstr "Záložné súbory (.orig)" -#: optiondialog.cpp:1306 +#: optiondialog.cpp:1354 #, kde-format msgid "" "If a file would be saved over an old file, then the old file\n" @@ -2912,17 +2891,17 @@ "Ak by mal byť súbor uložený cez starý súbor, potom bude starý súbor\n" "premenovaný s príponou \".orig\" miesto vymazania." -#: optiondialog.cpp:1382 optiondialog.cpp:1383 +#: optiondialog.cpp:1430 optiondialog.cpp:1431 #, kde-format msgid "Regional Settings" msgstr "Miestne nastavenia" -#: optiondialog.cpp:1397 +#: optiondialog.cpp:1454 #, kde-format msgid "Use the same encoding for everything:" msgstr "Použiť rovnaké kódovanie pre všetko:" -#: optiondialog.cpp:1401 +#: optiondialog.cpp:1458 #, kde-format msgid "" "Enable this allows to change all encodings by changing the first only.\n" @@ -2931,18 +2910,17 @@ "Aktivácia tohoto umožňuje zmeniť všetky kódovania zmenou iba prvého.\n" "Zakázať toto, ak sú potrebné rôzna individuálne nastavenia." -#: optiondialog.cpp:1405 -#, fuzzy, kde-format -#| msgid "Note: Local Encoding is " +#: optiondialog.cpp:1462 +#, kde-format msgid "Note: Local Encoding is \"%1\"" -msgstr "Poznámka: Lokálne kódovanie je " +msgstr "Poznámka: Lokálne kódovanie je \"%1\"" -#: optiondialog.cpp:1409 +#: optiondialog.cpp:1466 #, kde-format msgid "File Encoding for A:" msgstr "Kódovanie súboru pre A:" -#: optiondialog.cpp:1416 +#: optiondialog.cpp:1473 #, kde-format msgid "" "If enabled then Unicode (UTF-16 or UTF-8) encoding will be detected.\n" @@ -2955,32 +2933,32 @@ "núdzové.\n" "(Detekcia Unicode závisí na prvých bajtov súboru.)" -#: optiondialog.cpp:1419 optiondialog.cpp:1430 optiondialog.cpp:1441 +#: optiondialog.cpp:1476 optiondialog.cpp:1487 optiondialog.cpp:1498 #, kde-format msgid "Auto Detect Unicode" msgstr "Automaticky detegovať Unicode" -#: optiondialog.cpp:1425 +#: optiondialog.cpp:1482 #, kde-format msgid "File Encoding for B:" msgstr "Kódovanie súboru pre B:" -#: optiondialog.cpp:1436 +#: optiondialog.cpp:1493 #, kde-format msgid "File Encoding for C:" msgstr "Kódovanie súboru pre C:" -#: optiondialog.cpp:1447 +#: optiondialog.cpp:1504 #, kde-format msgid "File Encoding for Merge Output and Saving:" msgstr "Kódovanie súboru pre výstup zlúčenia a uloženie:" -#: optiondialog.cpp:1452 +#: optiondialog.cpp:1509 #, kde-format msgid "Auto Select" msgstr "Automatický výber" -#: optiondialog.cpp:1456 +#: optiondialog.cpp:1513 #, kde-format msgid "" "If enabled then the encoding from the input files is used.\n" @@ -2991,17 +2969,17 @@ "V nejednoznačných prípadoch dialóg vyzve používateľa, aby si zvolil " "kódovanie pre uloženie." -#: optiondialog.cpp:1459 +#: optiondialog.cpp:1516 #, kde-format msgid "File Encoding for Preprocessor Files:" msgstr "Súborové kódovanie pre súbory preprocesora:" -#: optiondialog.cpp:1471 +#: optiondialog.cpp:1528 #, kde-format msgid "Right To Left Language" msgstr "Jazyk sprava doľava" -#: optiondialog.cpp:1475 +#: optiondialog.cpp:1532 #, kde-format msgid "" "Some languages are read from right to left.\n" @@ -3010,22 +2988,22 @@ "Niektoré jazyky sa čítajú sprava doľava.\n" "Toto nastavenie podľa toho zmení prehliadač a editor." -#: optiondialog.cpp:1485 +#: optiondialog.cpp:1542 #, kde-format msgid "Integration" msgstr "Integrácia" -#: optiondialog.cpp:1486 +#: optiondialog.cpp:1543 #, kde-format msgid "Integration Settings" msgstr "Nastavenia integrácie" -#: optiondialog.cpp:1499 +#: optiondialog.cpp:1564 #, kde-format msgid "Command line options to ignore:" msgstr "Voľby príkazového riadka, ktoré sa ignorujú:" -#: optiondialog.cpp:1505 +#: optiondialog.cpp:1570 #, kde-format msgid "" "List of command line options that should be ignored when KDiff3 is used by " @@ -3038,12 +3016,12 @@ "Niekoľko hodnoty možno zadať, ak sa oddelia s ';'\n" "Toto potlačí chybu \"Neznáma voľba\"." -#: optiondialog.cpp:1510 +#: optiondialog.cpp:1575 #, kde-format msgid "Quit also via Escape key" msgstr "Ukončiť tiež pomocou klávesy Escape" -#: optiondialog.cpp:1514 +#: optiondialog.cpp:1579 #, kde-format msgid "" "Fast method to exit.\n" @@ -3052,7 +3030,7 @@ "Rýchly spôsob ukončenia.\n" "Pre tých, ktorí sú zvyknutí používať klávesu Escape." -#: optiondialog.cpp:1598 +#: optiondialog.cpp:1653 #, kde-format msgid "This resets all options. Not only those of the current topic." msgstr "Toto obnoví všetky voľby. Nielen tie zo súčasnej témy." @@ -3108,83 +3086,69 @@ msgid "Disable Unsafe Options" msgstr "Zakázať nebezpečné voľby" -#: pdiff.cpp:158 +#: pdiff.cpp:160 #, kde-format msgid "Loading A" msgstr "Načítavam A" -#: pdiff.cpp:167 +#: pdiff.cpp:162 #, kde-format -msgid "Errors occurred during pre-processing of file A." -msgstr "" +msgid "Loading A: %1" +msgstr "Načítavam A: %1" -#: pdiff.cpp:172 +#: pdiff.cpp:170 #, kde-format msgid "Loading B" msgstr "Načítavam B" -#: pdiff.cpp:179 -#, kde-format -msgid "Errors occurred during pre-processing of file B." -msgstr "" - -#: pdiff.cpp:202 pdiff.cpp:241 +#: pdiff.cpp:201 pdiff.cpp:237 #, kde-format msgid "Diff: A <-> B" msgstr "Diff: A <-> B" -#: pdiff.cpp:208 pdiff.cpp:279 pdiff.cpp:293 +#: pdiff.cpp:207 pdiff.cpp:275 pdiff.cpp:289 #, kde-format msgid "Linediff: A <-> B" msgstr "Linediff: A <-> B" -#: pdiff.cpp:225 +#: pdiff.cpp:224 #, kde-format msgid "Loading C" msgstr "Načítavam C" -#: pdiff.cpp:232 -#, kde-format -msgid "Errors occurred during pre-processing of file C." -msgstr "" - -#: pdiff.cpp:250 +#: pdiff.cpp:246 #, kde-format msgid "Diff: A <-> C" msgstr "Diff: A <-> C" -#: pdiff.cpp:261 +#: pdiff.cpp:257 #, kde-format msgid "Diff: B <-> C" msgstr "Diff: B <-> C" -#: pdiff.cpp:283 pdiff.cpp:297 +#: pdiff.cpp:279 pdiff.cpp:293 #, kde-format msgid "Linediff: B <-> C" msgstr "Linediff: B <-> C" -#: pdiff.cpp:287 pdiff.cpp:301 +#: pdiff.cpp:283 pdiff.cpp:297 #, kde-format msgid "Linediff: A <-> C" msgstr "Linediff: A <-> C" -#: pdiff.cpp:829 +#: pdiff.cpp:819 #, kde-format msgid "All input files contain the same text, but are not binary equal." msgstr "" "Všetky vstupné súbory obsahujú rovnaký text, ale nie sú binárne rovnaké." -#: pdiff.cpp:835 pdiff.cpp:839 pdiff.cpp:843 +#: pdiff.cpp:825 pdiff.cpp:829 pdiff.cpp:833 #, kde-format msgid "Files %1 and %2 have equal text, but are not binary equal. \n" msgstr "Súbory %1 a %2 majú rovnaký text, ale nie sú binárne rovnaké.\n" -#: pdiff.cpp:853 -#, fuzzy, kde-format -#| 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." +#: pdiff.cpp:843 +#, kde-format msgid "" "Some input files do not seem to be pure text files.\n" "Note that the KDiff3 merge was not meant for binary data.\n" @@ -3194,23 +3158,18 @@ "Zlúčenie KDiff3 nebolo určené pre binárne dáta.\n" "Pokračujte na vlastné riziko." -#: pdiff.cpp:863 +#: pdiff.cpp:853 #, kde-format msgid ", B" -msgstr "" +msgstr ", B" -#: pdiff.cpp:865 +#: pdiff.cpp:855 #, kde-format msgid ", C" -msgstr "" +msgstr ", C" -#: pdiff.cpp:867 -#, fuzzy, kde-format -#| msgid "" -#| "Some input characters could not be converted to valid unicode.\n" -#| "You might be using the wrong codec. (e.g. UTF-8 for non UTF-8 files).\n" -#| "Don't save the result if unsure. Continue at your own risk.\n" -#| "Affected input files are in %1." +#: pdiff.cpp:857 +#, kde-format msgid "" "Some input characters could not be converted to valid unicode.\n" "You might be using the wrong codec. (e.g. UTF-8 for non UTF-8 files).\n" @@ -3222,77 +3181,72 @@ "Neukladajte výsledok, ak si nie ste istí. Pokračujte na vlastné riziko.\n" "Ovplyvnené vstupné súbory sú v %1." -#: pdiff.cpp:1034 +#: pdiff.cpp:1032 #, kde-format msgid "Abort" msgstr "Prerušiť" -#: pdiff.cpp:1040 pdiff.cpp:1130 +#: pdiff.cpp:1038 pdiff.cpp:1129 #, kde-format msgid "Opening files..." msgstr "Otváram súbory..." -#: pdiff.cpp:1107 -#, kde-format -msgid "File open error" -msgstr "Chyba pri otváraní súboru" - -#: pdiff.cpp:1202 +#: pdiff.cpp:1212 #, kde-format msgid "Cutting selection..." msgstr "Vystrihávam výber..." -#: pdiff.cpp:1223 +#: pdiff.cpp:1233 #, kde-format msgid "Copying selection to clipboard..." msgstr "Kopírujem výber do schránky..." -#: pdiff.cpp:1239 +#: pdiff.cpp:1249 #, kde-format msgid "Inserting clipboard contents..." msgstr "Vkladá sa obsah schránky..." -#: pdiff.cpp:1695 +#: pdiff.cpp:1705 #, kde-format msgid "Word wrap (Cancel disables word wrap)" -msgstr "" +msgstr "Zalomenie slov (Zrušiť zakáže zalomenie slov)" -#: pdiff.cpp:1696 +#: pdiff.cpp:1706 #, kde-format msgid "Calculating max width for horizontal scrollbar" -msgstr "" +msgstr "Vypočítavam maximálnu šírku pre vodorovný posuvník" -#: pdiff.cpp:1911 +#: pdiff.cpp:1921 #, kde-format msgid "Save && Continue" msgstr "Uložiť && pokračovať" -#: pdiff.cpp:1912 +#: pdiff.cpp:1922 #, kde-format msgid "Continue Without Saving" msgstr "Pokračovať bez uloženia" -#: pdiff.cpp:2124 +#: pdiff.cpp:2134 #, kde-format msgid "Search complete." msgstr "Hľadanie ukončené." -#: pdiff.cpp:2124 +#: pdiff.cpp:2134 #, kde-format msgid "Search Complete" msgstr "Hľadanie ukončené" -#: pdiff.cpp:2375 +#: pdiff.cpp:2385 #, kde-format msgid "Nothing is selected in either diff input window." msgstr "Nič nie je vybrané ani vo vstupnom okne diff." -#: pdiff.cpp:2375 +#: pdiff.cpp:2385 #, kde-format msgid "Error while adding manual diff range" msgstr "Chyba pri pridávaní ručného diff rozsahu" -#: progress.cpp:59 progress.cpp:71 +#: progress.cpp:61 progress.cpp:73 #, kde-format msgid "&Cancel" msgstr "&Zrušiť" @@ -3302,128 +3256,126 @@ msgid "A (Base):" msgstr "A (základ):" -#: smalldialogs.cpp:68 smalldialogs.cpp:85 smalldialogs.cpp:102 -#: smalldialogs.cpp:144 +#: smalldialogs.cpp:71 smalldialogs.cpp:90 smalldialogs.cpp:109 +#: smalldialogs.cpp:154 #, kde-format msgid "File..." msgstr "Súbor..." -#: smalldialogs.cpp:70 smalldialogs.cpp:87 smalldialogs.cpp:104 -#: smalldialogs.cpp:146 +#: smalldialogs.cpp:73 smalldialogs.cpp:92 smalldialogs.cpp:111 +#: smalldialogs.cpp:156 #, kde-format msgid "Dir..." msgstr "Adresár..." -#: smalldialogs.cpp:96 +#: smalldialogs.cpp:103 #, kde-format msgid "C (Optional):" msgstr "C (voliteľné):" -#: smalldialogs.cpp:119 -#, fuzzy, kde-format -#| msgid "Swap/Copy Names ..." +#: smalldialogs.cpp:126 +#, kde-format msgid "Swap/Copy Names..." msgstr "Vymeniť/Kopírovať názvy ..." -#: smalldialogs.cpp:124 smalldialogs.cpp:125 smalldialogs.cpp:126 +#: smalldialogs.cpp:131 smalldialogs.cpp:132 smalldialogs.cpp:133 #, kde-format msgid "Swap %1<->%2" msgstr "Swap %1<->%2" -#: smalldialogs.cpp:127 smalldialogs.cpp:128 smalldialogs.cpp:129 +#: smalldialogs.cpp:134 smalldialogs.cpp:135 smalldialogs.cpp:136 #, kde-format msgid "Copy %1->Output" msgstr "Kopírovať %1->Výstup" -#: smalldialogs.cpp:130 smalldialogs.cpp:131 smalldialogs.cpp:132 +#: smalldialogs.cpp:137 smalldialogs.cpp:138 smalldialogs.cpp:139 #, kde-format msgid "Swap %1<->Output" msgstr "Vymeniť %1<->Výstup" -#: smalldialogs.cpp:138 +#: smalldialogs.cpp:148 #, kde-format msgid "Output (optional):" msgstr "Výstup (voliteľný):" -#: smalldialogs.cpp:168 +#: smalldialogs.cpp:178 #, kde-format msgid "Configure..." msgstr "Nastaviť..." -#: smalldialogs.cpp:233 -#, fuzzy, kde-format -#| msgid "Directory" +#: smalldialogs.cpp:243 +#, kde-format msgid "Open Directory" -msgstr "Adresár" +msgstr "Otvoriť adresár" -#: smalldialogs.cpp:234 +#: smalldialogs.cpp:244 #, kde-format msgid "Select Output File" -msgstr "" +msgstr "Vybrať výstupný súbor" -#: smalldialogs.cpp:393 +#: smalldialogs.cpp:403 #, kde-format msgid "Search text:" msgstr "Hľadať text:" -#: smalldialogs.cpp:400 +#: smalldialogs.cpp:410 #, kde-format msgid "Case sensitive" msgstr "Rozlišovať veľkosť písmen" -#: smalldialogs.cpp:403 +#: smalldialogs.cpp:413 #, kde-format msgid "Search A" msgstr "Hľadať A" -#: smalldialogs.cpp:408 +#: smalldialogs.cpp:418 #, kde-format msgid "Search B" msgstr "Hľadať B" -#: smalldialogs.cpp:413 +#: smalldialogs.cpp:423 #, kde-format msgid "Search C" msgstr "Hľadať C" -#: smalldialogs.cpp:418 +#: smalldialogs.cpp:428 #, kde-format msgid "Search output" msgstr "Výstup hľadania" -#: smalldialogs.cpp:425 +#: smalldialogs.cpp:435 #, kde-format msgid "&Search" msgstr "&Hľadať" -#: smalldialogs.cpp:444 +#: smalldialogs.cpp:454 #, kde-format msgid "Regular Expression Tester" msgstr "Tester regulárneho výrazu" -#: smalldialogs.cpp:457 +#: smalldialogs.cpp:467 #, kde-format msgid "Example auto merge line:" msgstr "Riadok príkladu automatického zlúčenia:" -#: smalldialogs.cpp:459 +#: smalldialogs.cpp:469 #, kde-format msgid "To test auto merge, copy a line as used in your files." msgstr "" "Pre vyskúšanie automatického zlúčenia, skopírovať riadok, ako je použitý v " "súboroch." -#: smalldialogs.cpp:465 smalldialogs.cpp:493 smalldialogs.cpp:529 +#: smalldialogs.cpp:475 smalldialogs.cpp:503 smalldialogs.cpp:539 #, kde-format msgid "Match result:" msgstr "Výsledok zosúladenia:" -#: smalldialogs.cpp:484 +#: smalldialogs.cpp:494 #, kde-format msgid "Example history start line (with leading comment):" msgstr "Riadok historického začiatku príkladu (s úvodným komentárom):" -#: smalldialogs.cpp:486 +#: smalldialogs.cpp:496 #, kde-format msgid "" "Copy a history start line as used in your files,\n" @@ -3433,17 +3385,17 @@ "súboroch,\n" "vrátane úvodného komentára." -#: smalldialogs.cpp:512 +#: smalldialogs.cpp:522 #, kde-format msgid "History sort key order:" msgstr "Poradie triediaceho kľúča histórie:" -#: smalldialogs.cpp:520 +#: smalldialogs.cpp:530 #, kde-format msgid "Example history entry start line (without leading comment):" msgstr "Riadok začiatku historickej položky príkladu (bez úvodného komentára):" -#: smalldialogs.cpp:522 +#: smalldialogs.cpp:532 #, kde-format msgid "" "Copy a history entry start line as used in your files,\n" @@ -3453,48 +3405,47 @@ "súboroch,\n" "ale vynechať úvodný komentár." -#: smalldialogs.cpp:536 +#: smalldialogs.cpp:546 #, kde-format msgid "Sort key result:" msgstr "Výsledok triediaceho kľúča:" -#: smalldialogs.cpp:584 smalldialogs.cpp:594 smalldialogs.cpp:614 +#: smalldialogs.cpp:594 smalldialogs.cpp:604 smalldialogs.cpp:624 #, kde-format msgid "Match success." msgstr "Zosúladenie úspešné." -#: smalldialogs.cpp:588 smalldialogs.cpp:598 smalldialogs.cpp:620 +#: smalldialogs.cpp:598 smalldialogs.cpp:608 smalldialogs.cpp:630 #, kde-format msgid "Match failed." msgstr "Zosúladenie zlyhalo." -#: smalldialogs.cpp:605 +#: smalldialogs.cpp:615 #, kde-format msgid "Opening and closing parentheses do not match in regular expression." msgstr "Otváracie a zatváracie zátvorky sa nezhodujú v regulárnych výrazoch." -#: SourceData.cpp:150 +#: SourceData.cpp:153 #, kde-format msgid "Writing clipboard data to temp file failed." msgstr "Zapisovanie dát zo schránky do dočasný súboru zlyhalo." -#: SourceData.cpp:154 +#: SourceData.cpp:157 #, kde-format msgid "From Clipboard" msgstr "Zo schránky" -#: SourceData.cpp:335 -#, fuzzy, kde-format -#| msgid "Mix of links and normal files." +#: SourceData.cpp:348 +#, kde-format msgid "%1 is not a normal file." -msgstr "Mix odkazov a normálnych súborov." +msgstr "%1 nie je normálny súbor." -#: SourceData.cpp:427 +#: SourceData.cpp:440 #, kde-format msgid " Temp file is: %1" -msgstr "" +msgstr "Dočasný súbor je: %1" -#: SourceData.cpp:432 +#: SourceData.cpp:445 #, kde-format msgid "" "Preprocessing possibly failed. Check this command:\n" @@ -3509,12 +3460,12 @@ "\n" "Príkaz činnosti preprocesora sa teraz zakáže." -#: SourceData.cpp:443 SourceData.cpp:512 +#: SourceData.cpp:456 SourceData.cpp:525 #, kde-format msgid "File %1 too large to process. Skipping." -msgstr "" +msgstr "Súbor %1 je príliš veľký na spracovanie. Preskočím." -#: SourceData.cpp:487 +#: SourceData.cpp:500 #, kde-format msgid "" "The line-matching-preprocessing possibly failed. Check this command:\n" @@ -3530,19 +3481,17 @@ "Príkaz porovnávanie riadkov preprocesora sa teraz zakáže." #: Utils.cpp:77 -#, fuzzy, kde-format -#| msgid "Expecting space after closing apostroph." +#, kde-format msgid "Expecting space after closing quote." -msgstr "Očakávanie miesta po uzatvorení apostrofom." +msgstr "Očakávanie medzery po uzatvorení apostrofom." #: Utils.cpp:80 #, kde-format msgid "Unmatched quote." -msgstr "" +msgstr "Nenájdená úvodzovka." #: Utils.cpp:89 -#, fuzzy, kde-format -#| msgid "Unexpected apostroph within argument." +#, kde-format msgid "Unexpected quote character within argument." msgstr "Neočakávaný apostrof v argumente." diff -Nru kdiff3-1.8.01/po/sl/kdiff3fileitemactionplugin.po kdiff3-1.8.3/po/sl/kdiff3fileitemactionplugin.po --- kdiff3-1.8.01/po/sl/kdiff3fileitemactionplugin.po 2019-05-18 01:02:25.000000000 +0000 +++ kdiff3-1.8.3/po/sl/kdiff3fileitemactionplugin.po 2020-06-25 00:18:49.000000000 +0000 @@ -5,8 +5,8 @@ msgid "" msgstr "" "Project-Id-Version: \n" -"Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2019-03-22 03:09+0100\n" +"Report-Msgid-Bugs-To: https://bugs.kde.org\n" +"POT-Creation-Date: 2019-08-30 07:40+0200\n" "PO-Revision-Date: 2012-10-26 16:59+0200\n" "Last-Translator: Andrej Mernik \n" "Language-Team: Slovenian \n" diff -Nru kdiff3-1.8.01/po/sl/kdiff3.po kdiff3-1.8.3/po/sl/kdiff3.po --- kdiff3-1.8.01/po/sl/kdiff3.po 2019-05-18 01:02:25.000000000 +0000 +++ kdiff3-1.8.3/po/sl/kdiff3.po 2020-06-25 00:18:49.000000000 +0000 @@ -5,8 +5,8 @@ msgid "" msgstr "" "Project-Id-Version: \n" -"Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2019-04-18 08:02+0200\n" +"Report-Msgid-Bugs-To: https://bugs.kde.org\n" +"POT-Creation-Date: 2020-06-22 07:48+0200\n" "PO-Revision-Date: 2014-11-29 18:01+0100\n" "Last-Translator: Andrej Mernik \n" "Language-Team: Slovenian \n" @@ -28,291 +28,291 @@ msgid "Your emails" msgstr "andrejm@ubuntu.si" -#: difftextwindow.cpp:412 +#: difftextwindow.cpp:414 #, kde-format msgid "File %1: Line %2" msgstr "" -#: difftextwindow.cpp:414 +#: difftextwindow.cpp:416 #, fuzzy, kde-format #| msgid "Line not available" msgid "File %1: Line not available" msgstr "Vrstica ni na voljo" -#: difftextwindow.cpp:1780 +#: difftextwindow.cpp:1778 #, kde-format msgid "Encoding:" msgstr "Kodiranje:" -#: difftextwindow.cpp:1782 mergeresultwindow.cpp:3138 optiondialog.cpp:818 +#: difftextwindow.cpp:1781 mergeresultwindow.cpp:3166 optiondialog.cpp:840 #, kde-format msgid "Line end style:" msgstr "Slog konca vrstice:" -#: difftextwindow.cpp:1810 directorymergewindow.cpp:382 -#: directorymergewindow.cpp:433 directorymergewindow.cpp:524 -#: directorymergewindow.cpp:3058 directorymergewindow.cpp:3189 -#: directorymergewindow.cpp:3417 mergeresultwindow.cpp:942 -#: mergeresultwindow.cpp:944 mergeresultwindow.cpp:946 -#: mergeresultwindow.cpp:948 mergeresultwindow.cpp:1814 -#: mergeresultwindow.cpp:3170 mergeresultwindow.cpp:3177 optiondialog.cpp:962 -#: optiondialog.cpp:975 pdiff.cpp:833 pdiff.cpp:835 pdiff.cpp:837 pdiff.cpp:839 -#: pdiff.cpp:861 smalldialogs.cpp:124 smalldialogs.cpp:126 smalldialogs.cpp:127 -#: smalldialogs.cpp:130 +#: difftextwindow.cpp:1809 directorymergewindow.cpp:383 +#: directorymergewindow.cpp:434 directorymergewindow.cpp:525 +#: directorymergewindow.cpp:3072 directorymergewindow.cpp:3203 +#: directorymergewindow.cpp:3431 mergeresultwindow.cpp:970 +#: mergeresultwindow.cpp:972 mergeresultwindow.cpp:974 +#: mergeresultwindow.cpp:976 mergeresultwindow.cpp:1842 +#: mergeresultwindow.cpp:3198 mergeresultwindow.cpp:3205 optiondialog.cpp:1002 +#: optiondialog.cpp:1015 pdiff.cpp:823 pdiff.cpp:825 pdiff.cpp:827 +#: pdiff.cpp:829 pdiff.cpp:851 smalldialogs.cpp:131 smalldialogs.cpp:133 +#: smalldialogs.cpp:134 smalldialogs.cpp:137 #, kde-format msgid "A" msgstr "A" -#: difftextwindow.cpp:1810 directorymergewindow.cpp:384 -#: directorymergewindow.cpp:436 directorymergewindow.cpp:526 -#: directorymergewindow.cpp:3064 directorymergewindow.cpp:3190 -#: directorymergewindow.cpp:3418 mergeresultwindow.cpp:942 -#: mergeresultwindow.cpp:944 mergeresultwindow.cpp:950 -#: mergeresultwindow.cpp:952 mergeresultwindow.cpp:1816 -#: mergeresultwindow.cpp:3172 mergeresultwindow.cpp:3179 optiondialog.cpp:963 -#: optiondialog.cpp:976 pdiff.cpp:833 pdiff.cpp:835 pdiff.cpp:841 pdiff.cpp:843 -#: pdiff.cpp:863 smalldialogs.cpp:124 smalldialogs.cpp:125 smalldialogs.cpp:128 -#: smalldialogs.cpp:131 +#: difftextwindow.cpp:1809 directorymergewindow.cpp:385 +#: directorymergewindow.cpp:437 directorymergewindow.cpp:527 +#: directorymergewindow.cpp:3078 directorymergewindow.cpp:3204 +#: directorymergewindow.cpp:3432 mergeresultwindow.cpp:970 +#: mergeresultwindow.cpp:972 mergeresultwindow.cpp:978 +#: mergeresultwindow.cpp:980 mergeresultwindow.cpp:1844 +#: mergeresultwindow.cpp:3200 mergeresultwindow.cpp:3207 optiondialog.cpp:1003 +#: optiondialog.cpp:1016 pdiff.cpp:823 pdiff.cpp:825 pdiff.cpp:831 +#: pdiff.cpp:833 pdiff.cpp:853 smalldialogs.cpp:131 smalldialogs.cpp:132 +#: smalldialogs.cpp:135 smalldialogs.cpp:138 #, kde-format msgid "B" msgstr "B" -#: difftextwindow.cpp:1810 directorymergewindow.cpp:386 -#: directorymergewindow.cpp:439 directorymergewindow.cpp:528 -#: directorymergewindow.cpp:3070 directorymergewindow.cpp:3191 -#: directorymergewindow.cpp:3419 mergeresultwindow.cpp:946 -#: mergeresultwindow.cpp:948 mergeresultwindow.cpp:950 -#: mergeresultwindow.cpp:952 mergeresultwindow.cpp:1818 -#: mergeresultwindow.cpp:3174 mergeresultwindow.cpp:3181 optiondialog.cpp:977 -#: pdiff.cpp:837 pdiff.cpp:839 pdiff.cpp:841 pdiff.cpp:843 pdiff.cpp:865 -#: smalldialogs.cpp:125 smalldialogs.cpp:126 smalldialogs.cpp:129 -#: smalldialogs.cpp:132 +#: difftextwindow.cpp:1809 directorymergewindow.cpp:387 +#: directorymergewindow.cpp:440 directorymergewindow.cpp:529 +#: directorymergewindow.cpp:3084 directorymergewindow.cpp:3205 +#: directorymergewindow.cpp:3433 mergeresultwindow.cpp:974 +#: mergeresultwindow.cpp:976 mergeresultwindow.cpp:978 +#: mergeresultwindow.cpp:980 mergeresultwindow.cpp:1846 +#: mergeresultwindow.cpp:3202 mergeresultwindow.cpp:3209 optiondialog.cpp:1017 +#: pdiff.cpp:827 pdiff.cpp:829 pdiff.cpp:831 pdiff.cpp:833 pdiff.cpp:855 +#: smalldialogs.cpp:132 smalldialogs.cpp:133 smalldialogs.cpp:136 +#: smalldialogs.cpp:139 #, kde-format msgid "C" msgstr "C" -#: difftextwindow.cpp:1810 +#: difftextwindow.cpp:1809 #, fuzzy, kde-format #| msgid "A (Base):" msgid "A (Base)" msgstr "A (osnova):" -#: difftextwindow.cpp:1812 +#: difftextwindow.cpp:1811 #, fuzzy, kde-format #| msgid "Encoding:" msgid "Encoding: %1" msgstr "Kodiranje:" -#: difftextwindow.cpp:1813 mergeresultwindow.cpp:3183 +#: difftextwindow.cpp:1812 mergeresultwindow.cpp:3211 #, kde-format msgid "Unix" msgstr "Unix" -#: difftextwindow.cpp:1813 mergeresultwindow.cpp:3184 +#: difftextwindow.cpp:1812 mergeresultwindow.cpp:3212 #, kde-format msgid "DOS" msgstr "DOS" -#: difftextwindow.cpp:1813 +#: difftextwindow.cpp:1812 #, fuzzy, kde-format #| msgid "Line end style:" msgid "Line end style: %1" msgstr "Slog konca vrstice:" -#: difftextwindow.cpp:1835 kdiff3.cpp:873 +#: difftextwindow.cpp:1834 kdiff3.cpp:874 #, kde-format msgid "Top line" msgstr "Zgornja vrstica" -#: difftextwindow.cpp:1845 +#: difftextwindow.cpp:1843 #, kde-format msgid "End" msgstr "Konec" -#: difftextwindow.cpp:1903 smalldialogs.cpp:235 +#: difftextwindow.cpp:1901 smalldialogs.cpp:245 #, fuzzy, kde-format #| msgid "Opening files..." msgid "Open File" msgstr "Odpiranje datotek ..." -#: difftextwindow.cpp:1951 optiondialog.cpp:387 +#: difftextwindow.cpp:1943 optiondialog.cpp:389 #, kde-format msgid "Unicode, 8 bit" msgstr "Unicode, 8 bit" -#: difftextwindow.cpp:1966 +#: difftextwindow.cpp:1958 #, kde-format msgid "Other" msgstr "" -#: directorymergewindow.cpp:409 directorymergewindow.cpp:3424 +#: directorymergewindow.cpp:410 directorymergewindow.cpp:3438 #, kde-format msgid "Copy A to B" msgstr "Kopiraj A v B" -#: directorymergewindow.cpp:412 directorymergewindow.cpp:3425 +#: directorymergewindow.cpp:413 directorymergewindow.cpp:3439 #, kde-format msgid "Copy B to A" msgstr "Kopiraj B v A" -#: directorymergewindow.cpp:415 directorymergewindow.cpp:3426 +#: directorymergewindow.cpp:416 directorymergewindow.cpp:3440 #, kde-format msgid "Delete A" msgstr "Izbriši A" -#: directorymergewindow.cpp:418 directorymergewindow.cpp:3427 +#: directorymergewindow.cpp:419 directorymergewindow.cpp:3441 #, kde-format msgid "Delete B" msgstr "Izbriši B" -#: directorymergewindow.cpp:421 +#: directorymergewindow.cpp:422 #, kde-format msgid "Delete A & B" msgstr "Izbriši A in B" -#: directorymergewindow.cpp:424 directorymergewindow.cpp:3429 +#: directorymergewindow.cpp:425 directorymergewindow.cpp:3443 #, kde-format msgid "Merge to A" msgstr "Združi v A" -#: directorymergewindow.cpp:427 directorymergewindow.cpp:3430 +#: directorymergewindow.cpp:428 directorymergewindow.cpp:3444 #, kde-format msgid "Merge to B" msgstr "Združi v B" -#: directorymergewindow.cpp:430 +#: directorymergewindow.cpp:431 #, kde-format msgid "Merge to A & B" msgstr "Združi v A in B" -#: directorymergewindow.cpp:442 directorymergewindow.cpp:3421 +#: directorymergewindow.cpp:443 directorymergewindow.cpp:3435 #, kde-format msgid "Delete (if exists)" msgstr "Izbriši (če obstaja)" -#: directorymergewindow.cpp:445 directorymergewindow.cpp:448 -#: directorymergewindow.cpp:3420 optiondialog.cpp:925 smalldialogs.cpp:113 +#: directorymergewindow.cpp:446 directorymergewindow.cpp:449 +#: directorymergewindow.cpp:3434 smalldialogs.cpp:120 #, kde-format msgid "Merge" msgstr "Združi" -#: directorymergewindow.cpp:445 directorymergewindow.cpp:448 +#: directorymergewindow.cpp:446 directorymergewindow.cpp:449 #, kde-format msgid "Merge (manual)" msgstr "Združi (ročno)" -#: directorymergewindow.cpp:451 +#: directorymergewindow.cpp:452 #, kde-format msgid "Error: Conflicting File Types" msgstr "Napaka: spori vrst datotek" -#: directorymergewindow.cpp:454 +#: directorymergewindow.cpp:455 #, kde-format msgid "Error: Changed and Deleted" msgstr "Napaka: spremenjeno in izbrisano" -#: directorymergewindow.cpp:457 +#: directorymergewindow.cpp:458 #, kde-format msgid "Error: Dates are equal but files are not." msgstr "Napaka: datumi so enaki, datoteke pa ne." -#: directorymergewindow.cpp:471 +#: directorymergewindow.cpp:472 #, fuzzy, kde-format #| msgid "Done." msgid "Done" msgstr "Končano." -#: directorymergewindow.cpp:473 +#: directorymergewindow.cpp:474 #, kde-format msgid "Error" msgstr "Napaka" -#: directorymergewindow.cpp:475 +#: directorymergewindow.cpp:476 #, kde-format msgid "Skipped." msgstr "Preskočeno." -#: directorymergewindow.cpp:477 +#: directorymergewindow.cpp:478 #, kde-format msgid "Not saved." msgstr "Ni shranjeno." -#: directorymergewindow.cpp:479 +#: directorymergewindow.cpp:480 #, kde-format msgid "In progress..." msgstr "V teku ..." -#: directorymergewindow.cpp:481 +#: directorymergewindow.cpp:482 #, kde-format msgid "To do." msgstr "Za narediti." -#: directorymergewindow.cpp:522 +#: directorymergewindow.cpp:523 #, kde-format msgid "Name" msgstr "Ime" -#: directorymergewindow.cpp:530 +#: directorymergewindow.cpp:531 #, kde-format msgid "Operation" msgstr "Dejanje" -#: directorymergewindow.cpp:532 +#: directorymergewindow.cpp:533 #, kde-format msgid "Status" msgstr "Stanje" -#: directorymergewindow.cpp:534 +#: directorymergewindow.cpp:535 #, kde-format msgid "Unsolved" msgstr "Nerešeno" -#: directorymergewindow.cpp:536 +#: directorymergewindow.cpp:537 #, kde-format msgid "Solved" msgstr "Rešeno" -#: directorymergewindow.cpp:538 +#: directorymergewindow.cpp:539 #, kde-format msgid "Nonwhite" msgstr "Niso presledni" -#: directorymergewindow.cpp:540 +#: directorymergewindow.cpp:541 #, kde-format msgid "White" msgstr "Presledni" -#: directorymergewindow.cpp:674 +#: directorymergewindow.cpp:676 #, kde-format msgid "Unable to compare non-normal file with normal file." msgstr "" -#: directorymergewindow.cpp:688 +#: directorymergewindow.cpp:690 #, kde-format msgid "Mix of links and normal files." msgstr "Mešanica povezav in običajnih datotek." -#: directorymergewindow.cpp:695 +#: directorymergewindow.cpp:697 #, kde-format msgid "Link: " msgstr "Povezava: " -#: directorymergewindow.cpp:704 +#: directorymergewindow.cpp:706 #, kde-format msgid "Size. " msgstr "Velikost. " -#: directorymergewindow.cpp:718 directorymergewindow.cpp:728 +#: directorymergewindow.cpp:720 directorymergewindow.cpp:730 #, kde-format msgid "Date & Size: " msgstr "Datum in velikost: " -#: directorymergewindow.cpp:748 +#: directorymergewindow.cpp:751 #, kde-format msgid "Comparing file..." msgstr "Primerjava datotek ..." -#: directorymergewindow.cpp:801 +#: directorymergewindow.cpp:813 #, kde-format msgid "" "You are currently doing a directory merge. Are you sure, you want to abort " @@ -321,48 +321,48 @@ "Trenutno združujete mape. Ali ste prepričani, da želite prekiniti " "združevanje in ponovno preiskati mapo?" -#: directorymergewindow.cpp:802 kdiff3.cpp:698 kdiff3.cpp:708 kdiff3.cpp:720 -#: mergeresultwindow.cpp:372 pdiff.cpp:1033 pdiff.cpp:1910 pdiff.cpp:1920 +#: directorymergewindow.cpp:814 kdiff3.cpp:697 kdiff3.cpp:707 kdiff3.cpp:719 +#: mergeresultwindow.cpp:400 pdiff.cpp:1031 pdiff.cpp:1920 pdiff.cpp:1930 #, kde-format msgid "Warning" msgstr "Opozorilo" -#: directorymergewindow.cpp:803 directorymergewindow.cpp:3393 +#: directorymergewindow.cpp:815 directorymergewindow.cpp:3407 #, kde-format msgid "Rescan" msgstr "Znova preišči" -#: directorymergewindow.cpp:804 pdiff.cpp:1035 +#: directorymergewindow.cpp:816 pdiff.cpp:1033 #, kde-format msgid "Continue Merging" msgstr "Nadaljuj z združevanjem" -#: directorymergewindow.cpp:971 +#: directorymergewindow.cpp:984 #, kde-format msgid "Opening of directories failed:" msgstr "Odpiranje map je spodletelo:" -#: directorymergewindow.cpp:975 +#: directorymergewindow.cpp:988 #, kde-format msgid "Dir A \"%1\" does not exist or is not a directory.\n" msgstr "Mapa A \"%1\" ne obstaja ali pa ni mapa.\n" -#: directorymergewindow.cpp:980 +#: directorymergewindow.cpp:993 #, kde-format msgid "Dir B \"%1\" does not exist or is not a directory.\n" msgstr "Mapa B \"%1\" ne obstaja ali pa ni mapa.\n" -#: directorymergewindow.cpp:985 +#: directorymergewindow.cpp:998 #, kde-format msgid "Dir C \"%1\" does not exist or is not a directory.\n" msgstr "Mapa C \"%1\" ne obstaja ali pa ni mapa.\n" -#: directorymergewindow.cpp:988 +#: directorymergewindow.cpp:1001 #, kde-format msgid "Directory Open Error" msgstr "Napaka med opiranjem mape" -#: directorymergewindow.cpp:996 +#: directorymergewindow.cpp:1009 #, kde-format msgid "" "The destination directory must not be the same as A or B when three " @@ -372,49 +372,49 @@ "Ciljna mapa ne sme biti enaka A ali B, ko se izvaja združevanje treh map.\n" "Preverite znova preden nadaljujete." -#: directorymergewindow.cpp:998 +#: directorymergewindow.cpp:1011 #, kde-format msgid "Parameter Warning" msgstr "Opozorilo parametra" -#: directorymergewindow.cpp:1003 +#: directorymergewindow.cpp:1016 #, kde-format msgid "Scanning directories..." msgstr "Preiskovanje map ..." -#: directorymergewindow.cpp:1029 +#: directorymergewindow.cpp:1042 #, kde-format msgid "Reading Directory A" msgstr "Branje mape A" -#: directorymergewindow.cpp:1038 +#: directorymergewindow.cpp:1051 #, kde-format msgid "Reading Directory B" msgstr "Branje mape B" -#: directorymergewindow.cpp:1048 +#: directorymergewindow.cpp:1061 #, kde-format msgid "Reading Directory C" msgstr "Branje mape C" -#: directorymergewindow.cpp:1064 +#: directorymergewindow.cpp:1077 #, kde-format msgid "Some subdirectories were not readable in" msgstr "Nekatere podmape niso bile berljive v" -#: directorymergewindow.cpp:1069 +#: directorymergewindow.cpp:1082 #, kde-format msgid "Check the permissions of the subdirectories." msgstr "Preverite dovoljenja podmap." -#: directorymergewindow.cpp:1106 kdiff3.cpp:666 kdiff3.cpp:753 kdiff3.cpp:777 -#: kdiff3.cpp:1065 kdiff3.cpp:1086 pdiff.cpp:1116 pdiff.cpp:1170 pdiff.cpp:1218 -#: pdiff.cpp:1234 pdiff.cpp:1277 pdiff.cpp:1301 +#: directorymergewindow.cpp:1119 kdiff3.cpp:665 kdiff3.cpp:752 kdiff3.cpp:776 +#: kdiff3.cpp:1072 kdiff3.cpp:1093 pdiff.cpp:1115 pdiff.cpp:1178 pdiff.cpp:1228 +#: pdiff.cpp:1244 pdiff.cpp:1287 pdiff.cpp:1311 #, kde-format msgid "Ready." msgstr "Pripravljen." -#: directorymergewindow.cpp:1121 +#: directorymergewindow.cpp:1134 #, kde-format msgid "" "Directory Comparison Status\n" @@ -424,23 +424,23 @@ "Number of different files: %3" msgstr "" -#: directorymergewindow.cpp:1128 +#: directorymergewindow.cpp:1141 #, fuzzy, kde-format #| msgid "Number of manual merges:" msgid "Number of manual merges: %1" msgstr "Število ročnih združitev:" -#: directorymergewindow.cpp:1394 +#: directorymergewindow.cpp:1407 #, kde-format msgid "This affects all merge operations." msgstr "To vpliva na vsa dejanja združevanja." -#: directorymergewindow.cpp:1395 +#: directorymergewindow.cpp:1408 #, kde-format msgid "Changing All Merge Operations" msgstr "Spreminjanje vseh dejanj združevanja" -#: directorymergewindow.cpp:1695 +#: directorymergewindow.cpp:1708 #, fuzzy, kde-format #| msgid "Processing " msgid "" @@ -448,45 +448,45 @@ "%3" msgstr "Obdelovanje " -#: directorymergewindow.cpp:1738 directorymergewindow.cpp:1742 +#: directorymergewindow.cpp:1751 directorymergewindow.cpp:1755 #, kde-format msgid "Some files could not be processed." msgstr "" -#: directorymergewindow.cpp:2222 directorymergewindow.cpp:2247 -#: directorymergewindow.cpp:2271 +#: directorymergewindow.cpp:2235 directorymergewindow.cpp:2260 +#: directorymergewindow.cpp:2285 #, kde-format msgid "This operation is currently not possible." msgstr "To dejanje trenutno ni mogoče." -#: directorymergewindow.cpp:2222 directorymergewindow.cpp:2247 -#: directorymergewindow.cpp:2271 directorymergewindow.cpp:2552 +#: directorymergewindow.cpp:2235 directorymergewindow.cpp:2260 +#: directorymergewindow.cpp:2285 directorymergewindow.cpp:2565 #, kde-format msgid "Operation Not Possible" msgstr "Dejanje ni mogoče" -#: directorymergewindow.cpp:2318 +#: directorymergewindow.cpp:2332 #, fuzzy, kde-format #| msgid "An error occurred while copying.\n" msgid "An error occurred while copying." msgstr "Med kopiranjem je prišlo do napake.\n" -#: directorymergewindow.cpp:2319 directorymergewindow.cpp:2759 +#: directorymergewindow.cpp:2333 directorymergewindow.cpp:2772 #, kde-format msgid "Merge Error" msgstr "Napaka združevanja" -#: directorymergewindow.cpp:2396 +#: directorymergewindow.cpp:2410 #, kde-format msgid "Unknown merge operation. (This must never happen!)" msgstr "Neznano dejanje združevanja. (To se ne sme nikoli zgoditi!)" -#: directorymergewindow.cpp:2441 +#: directorymergewindow.cpp:2455 #, kde-format msgid "Unknown merge operation." msgstr "Neznano dejanje združevanja." -#: directorymergewindow.cpp:2454 +#: directorymergewindow.cpp:2468 #, kde-format msgid "" "The merge is about to begin.\n" @@ -506,22 +506,22 @@ "Ta program je še v stanju beta in zanj ne obstaja NOBENE GARANCIJE! " "Napravite varnostne kopije vaših pomembnih podatkov!" -#: directorymergewindow.cpp:2459 +#: directorymergewindow.cpp:2473 #, kde-format msgid "Starting Merge" msgstr "Začenjanje združevanja" -#: directorymergewindow.cpp:2460 +#: directorymergewindow.cpp:2474 #, kde-format msgid "Do It" msgstr "Izvedi" -#: directorymergewindow.cpp:2461 +#: directorymergewindow.cpp:2475 #, kde-format msgid "Simulate It" msgstr "Simuliraj" -#: directorymergewindow.cpp:2487 +#: directorymergewindow.cpp:2501 #, kde-format msgid "" "The highlighted item has a different type in the different directories. " @@ -530,7 +530,7 @@ "Poudarjen predmet ima različno vrsto v različnih mapah. Izberite kaj želite " "narediti." -#: directorymergewindow.cpp:2491 +#: directorymergewindow.cpp:2505 #, kde-format msgid "" "The modification dates of the file are equal but the files are not. Select " @@ -539,7 +539,7 @@ "Datumi spremembe datoteke so enaki, ampak datoteke niso. Izberite kaj želite " "narediti." -#: directorymergewindow.cpp:2495 +#: directorymergewindow.cpp:2509 #, kde-format msgid "" "The highlighted item was changed in one directory and deleted in the other. " @@ -548,14 +548,14 @@ "Poudarjen predmet je bil spremenjen v eni mapi in izbrisan v drugi. Izberite " "kaj želite narediti." -#: directorymergewindow.cpp:2552 +#: directorymergewindow.cpp:2565 #, kde-format msgid "" "This operation is currently not possible because directory merge is " "currently running." msgstr "To dejanje trenutno ni mogoče, saj teče združevanje map." -#: directorymergewindow.cpp:2609 +#: directorymergewindow.cpp:2622 #, kde-format msgid "" "There was an error in the last step.\n" @@ -566,32 +566,32 @@ "Ali želite nadaljevati s predmetom, ki je povzročil napako ali želite " "preskočiti ta predmet?" -#: directorymergewindow.cpp:2611 +#: directorymergewindow.cpp:2624 #, kde-format msgid "Continue merge after an error" msgstr "Nadaljuj z združevanjem po napaki" -#: directorymergewindow.cpp:2612 +#: directorymergewindow.cpp:2625 #, kde-format msgid "Continue With Last Item" msgstr "Nadaljuj z zadnjim predmetom" -#: directorymergewindow.cpp:2613 +#: directorymergewindow.cpp:2626 #, kde-format msgid "Skip Item" msgstr "Preskoči predmet" -#: directorymergewindow.cpp:2709 +#: directorymergewindow.cpp:2722 #, kde-format msgid "Merge operation complete." msgstr "Dejanje združevanja je končano." -#: directorymergewindow.cpp:2709 directorymergewindow.cpp:2712 +#: directorymergewindow.cpp:2722 directorymergewindow.cpp:2725 #, kde-format msgid "Merge Complete" msgstr "Združevanje končano" -#: directorymergewindow.cpp:2722 +#: directorymergewindow.cpp:2735 #, kde-format msgid "" "Simulated merge complete: Check if you agree with the proposed operations." @@ -599,48 +599,48 @@ "Simulacija združevanja je končana: preverite, če se strinjate s predlaganimi " "dejanji." -#: directorymergewindow.cpp:2758 +#: directorymergewindow.cpp:2771 #, fuzzy, kde-format #| msgid "An error occurred. Press OK to see detailed information.\n" msgid "An error occurred. Press OK to see detailed information." msgstr "Prišlo je do napake. Kliknite V redu, da vidite več podrobnosti.\n" -#: directorymergewindow.cpp:2791 +#: directorymergewindow.cpp:2804 #, kde-format msgid "Error: While deleting %1: Creating backup failed." msgstr "Napaka med brisanjem %1: ustvarjanje varnostne kopije je spodletelo." -#: directorymergewindow.cpp:2798 +#: directorymergewindow.cpp:2811 #, kde-format msgid "delete directory recursively( %1 )" msgstr "rekurzivno izbriši mapo ( %1 )" -#: directorymergewindow.cpp:2800 +#: directorymergewindow.cpp:2813 #, kde-format msgid "delete( %1 )" msgstr "izbriši ( %1 )" -#: directorymergewindow.cpp:2815 +#: directorymergewindow.cpp:2828 #, kde-format msgid "Error: delete dir operation failed while trying to read the directory." msgstr "Napaka: dejanje brisanja map je spodletelo med branjem mape." -#: directorymergewindow.cpp:2834 +#: directorymergewindow.cpp:2847 #, kde-format msgid "Error: rmdir( %1 ) operation failed." msgstr "Napaka: dejanje odstrani mapo ( %1 ) je spodletelo." -#: directorymergewindow.cpp:2844 +#: directorymergewindow.cpp:2857 #, kde-format msgid "Error: delete operation failed." msgstr "Napaka: dejanje brisanja je spodletelo." -#: directorymergewindow.cpp:2870 +#: directorymergewindow.cpp:2884 #, kde-format msgid "manual merge( %1, %2, %3 -> %4)" msgstr "ročno združevanje ( %1, %2, %3 -> %4)" -#: directorymergewindow.cpp:2873 +#: directorymergewindow.cpp:2887 #, kde-format msgid "" " Note: After a manual merge the user should continue by pressing F7." @@ -648,185 +648,185 @@ " Opomba: po ročnem združevanju mora uporabnik nadaljevati s pritiskom " "tipke F7." -#: directorymergewindow.cpp:2900 +#: directorymergewindow.cpp:2914 #, kde-format msgid "Error: copy( %1 -> %2 ) failed.Deleting existing destination failed." msgstr "" "Napaka: kopiranje ( %1 -> %2 ) je spodletelo. Brisanje obstoječega cilja je " "spodletelo." -#: directorymergewindow.cpp:2909 +#: directorymergewindow.cpp:2923 #, kde-format msgid "copyLink( %1 -> %2 )" msgstr "kopiraj povezavo ( %1 -> %2 )" -#: directorymergewindow.cpp:2918 +#: directorymergewindow.cpp:2932 #, kde-format msgid "Error: copyLink failed: Remote links are not yet supported." msgstr "" "Napaka: kopiraj povezavo je spodletelo: oddaljene povezane še niso podprte." -#: directorymergewindow.cpp:2928 +#: directorymergewindow.cpp:2942 #, kde-format msgid "Error: copyLink failed." msgstr "Napaka: kopiraj povezavo je spodletel." -#: directorymergewindow.cpp:2953 +#: directorymergewindow.cpp:2967 #, kde-format msgid "copy( %1 -> %2 )" msgstr "kopiraj ( %1 -> %2 )" -#: directorymergewindow.cpp:2979 +#: directorymergewindow.cpp:2993 #, kde-format msgid "Error during rename( %1 -> %2 ): Cannot delete existing destination." msgstr "" "Napaka med preimenovanjem ( %1 -> %2 ): ni mogoče izbrisati obstoječega " "cilja." -#: directorymergewindow.cpp:2986 +#: directorymergewindow.cpp:3000 #, kde-format msgid "rename( %1 -> %2 )" msgstr "preimenuj ( %1 -> %2 )" -#: directorymergewindow.cpp:2995 +#: directorymergewindow.cpp:3009 #, kde-format msgid "Error: Rename failed." msgstr "Napaka: preimenovanje je spodletelo" -#: directorymergewindow.cpp:3013 +#: directorymergewindow.cpp:3027 #, kde-format msgid "Error during makeDir of %1. Cannot delete existing file." msgstr "" "Napaka med ustvarjanjem mape %1. Ni mogoče izbrisati obstoječe datoteke." -#: directorymergewindow.cpp:3030 +#: directorymergewindow.cpp:3044 #, kde-format msgid "makeDir( %1 )" msgstr "ustvari mapo ( %1 )" -#: directorymergewindow.cpp:3040 +#: directorymergewindow.cpp:3054 #, kde-format msgid "Error while creating directory." msgstr "Napaka med ustvarjanjem mape." -#: directorymergewindow.cpp:3076 directorymergewindow.cpp:3195 +#: directorymergewindow.cpp:3090 directorymergewindow.cpp:3209 #, kde-format msgid "Dest" msgstr "Cilj" -#: directorymergewindow.cpp:3084 directorymergewindow.cpp:3113 +#: directorymergewindow.cpp:3098 directorymergewindow.cpp:3127 #, kde-format msgid "Dir" msgstr "Mapa" -#: directorymergewindow.cpp:3084 +#: directorymergewindow.cpp:3098 #, kde-format msgid "Type" msgstr "Vrsta" -#: directorymergewindow.cpp:3084 +#: directorymergewindow.cpp:3098 #, kde-format msgid "Size" msgstr "Velikost" -#: directorymergewindow.cpp:3085 +#: directorymergewindow.cpp:3099 #, kde-format msgid "Attr" msgstr "Atrib." -#: directorymergewindow.cpp:3085 +#: directorymergewindow.cpp:3099 #, kde-format msgid "Last Modification" msgstr "Zadnja sprememba" -#: directorymergewindow.cpp:3085 +#: directorymergewindow.cpp:3099 #, kde-format msgid "Link-Destination" msgstr "Cilj povezave" -#: directorymergewindow.cpp:3113 +#: directorymergewindow.cpp:3127 #, kde-format msgid "File" msgstr "Datoteka" -#: directorymergewindow.cpp:3113 +#: directorymergewindow.cpp:3127 #, fuzzy, kde-format #| msgid "Link: " msgid "-Link" msgstr "Povezava: " -#: directorymergewindow.cpp:3119 +#: directorymergewindow.cpp:3133 #, kde-format msgid "not available" msgstr "ni na voljo" -#: directorymergewindow.cpp:3137 +#: directorymergewindow.cpp:3151 #, kde-format msgid "A (Dest): " msgstr "A (cilj): " -#: directorymergewindow.cpp:3141 +#: directorymergewindow.cpp:3155 #, kde-format msgid "A: " msgstr "" -#: directorymergewindow.cpp:3141 +#: directorymergewindow.cpp:3155 #, kde-format msgid "A (Base): " msgstr "A (osnova): " -#: directorymergewindow.cpp:3147 +#: directorymergewindow.cpp:3161 #, kde-format msgid "B (Dest): " msgstr "B (cilj): " -#: directorymergewindow.cpp:3151 +#: directorymergewindow.cpp:3165 #, kde-format msgid "B: " msgstr "" -#: directorymergewindow.cpp:3156 +#: directorymergewindow.cpp:3170 #, kde-format msgid "C (Dest): " msgstr "C (cilj): " -#: directorymergewindow.cpp:3160 +#: directorymergewindow.cpp:3174 #, kde-format msgid "C: " msgstr "" -#: directorymergewindow.cpp:3163 +#: directorymergewindow.cpp:3177 #, kde-format msgid "Dest: " msgstr "Cilj: " #. i18n("Saving Directory Merge State ...")); -#: directorymergewindow.cpp:3238 +#: directorymergewindow.cpp:3252 #, kde-format msgid "Save Directory Merge State As..." msgstr "Shrani stanje združevanja map kot ..." -#: directorymergewindow.cpp:3387 +#: directorymergewindow.cpp:3401 #, kde-format msgid "Start/Continue Directory Merge" msgstr "Začni/nadaljuj združevanje map" -#: directorymergewindow.cpp:3388 +#: directorymergewindow.cpp:3402 #, kde-format msgid "Run Operation for Current Item" msgstr "Zaženi dejanje za trenuten predmet" -#: directorymergewindow.cpp:3389 +#: directorymergewindow.cpp:3403 #, kde-format msgid "Compare Selected File" msgstr "Primerjaj izbrano datoteko" -#: directorymergewindow.cpp:3390 +#: directorymergewindow.cpp:3404 #, kde-format msgid "Merge Current File" msgstr "Združi trenutno datoteko" -#: directorymergewindow.cpp:3390 +#: directorymergewindow.cpp:3404 #, kde-format msgid "" "Merge\n" @@ -835,51 +835,51 @@ "Združi\n" "datoteko" -#: directorymergewindow.cpp:3391 +#: directorymergewindow.cpp:3405 #, kde-format msgid "Fold All Subdirs" msgstr "Zloži vse podmape" -#: directorymergewindow.cpp:3392 +#: directorymergewindow.cpp:3406 #, kde-format msgid "Unfold All Subdirs" msgstr "Razširi vse podmape" #. i18n("Save Directory Merge State ..."), 0, this, &DirectoryMergeWindow::slotSaveMergeState, ac, "dir_save_merge_state"); #. i18n("Load Directory Merge State ..."), 0, this, &DirectoryMergeWindow::slotLoadMergeState, ac, "dir_load_merge_state"); -#: directorymergewindow.cpp:3396 +#: directorymergewindow.cpp:3410 #, kde-format msgid "Choose A for All Items" msgstr "Izberi A za vse predmete" -#: directorymergewindow.cpp:3397 +#: directorymergewindow.cpp:3411 #, kde-format msgid "Choose B for All Items" msgstr "Izberi B za vse predmete" -#: directorymergewindow.cpp:3398 +#: directorymergewindow.cpp:3412 #, kde-format msgid "Choose C for All Items" msgstr "Izberi C za vse predmete" -#: directorymergewindow.cpp:3399 +#: directorymergewindow.cpp:3413 #, kde-format msgid "Auto-Choose Operation for All Items" msgstr "Samodejno izberi dejanje za vse predmete" -#: directorymergewindow.cpp:3400 +#: directorymergewindow.cpp:3414 #, kde-format msgid "No Operation for All Items" msgstr "Ni dejanja za vse predmete" #. i18n("Synchronize Directories"), 0, this, &DirectoryMergeWindow::slotSynchronizeDirectories, ac, "dir_synchronize_directories"); #. d->m_pDirChooseNewerFiles = GuiUtils::createAction< KToggleAction >(i18n("Copy Newer Files Instead of Merging"), 0, this, &DirectoryMergeWindow::slotChooseNewerFiles, ac, "dir_choose_newer_files"); -#: directorymergewindow.cpp:3405 +#: directorymergewindow.cpp:3419 #, kde-format msgid "Show Identical Files" msgstr "Pokaži enake datoteke" -#: directorymergewindow.cpp:3405 +#: directorymergewindow.cpp:3419 #, kde-format msgid "" "Identical\n" @@ -888,17 +888,17 @@ "Enake\n" "datoteke" -#: directorymergewindow.cpp:3406 +#: directorymergewindow.cpp:3420 #, kde-format msgid "Show Different Files" msgstr "Pokaži različne datoteke" -#: directorymergewindow.cpp:3407 +#: directorymergewindow.cpp:3421 #, kde-format msgid "Show Files only in A" msgstr "Pokaži samo datoteke v A" -#: directorymergewindow.cpp:3407 +#: directorymergewindow.cpp:3421 #, kde-format msgid "" "Files\n" @@ -907,12 +907,12 @@ "Datoteke\n" "samo v A" -#: directorymergewindow.cpp:3408 +#: directorymergewindow.cpp:3422 #, kde-format msgid "Show Files only in B" msgstr "Pokaži samo datoteke v B" -#: directorymergewindow.cpp:3408 +#: directorymergewindow.cpp:3422 #, kde-format msgid "" "Files\n" @@ -921,12 +921,12 @@ "Datoteke\n" "samo v B" -#: directorymergewindow.cpp:3409 +#: directorymergewindow.cpp:3423 #, kde-format msgid "Show Files only in C" msgstr "Pokaži samo datoteke v C" -#: directorymergewindow.cpp:3409 +#: directorymergewindow.cpp:3423 #, kde-format msgid "" "Files\n" @@ -935,55 +935,60 @@ "Datoteke\n" "samo v C" -#: directorymergewindow.cpp:3413 +#: directorymergewindow.cpp:3427 #, kde-format msgid "Compare Explicitly Selected Files" msgstr "Primerjaj izrecno izbrane datoteke" -#: directorymergewindow.cpp:3414 +#: directorymergewindow.cpp:3428 #, kde-format msgid "Merge Explicitly Selected Files" msgstr "Združi izrecno izbrane datoteke" -#: directorymergewindow.cpp:3416 directorymergewindow.cpp:3423 +#: directorymergewindow.cpp:3430 directorymergewindow.cpp:3437 #, kde-format msgid "Do Nothing" msgstr "Ne naredi ničesar" -#: directorymergewindow.cpp:3428 +#: directorymergewindow.cpp:3442 #, kde-format msgid "Delete A && B" msgstr "Izbriši A in B" -#: directorymergewindow.cpp:3431 +#: directorymergewindow.cpp:3445 #, kde-format msgid "Merge to A && B" msgstr "Združi v A in B" -#: fileaccess.cpp:462 SourceData.cpp:493 +#: fileaccess.cpp:301 +#, kde-format +msgid "Unable to determine full url. No parent specified." +msgstr "" + +#: fileaccess.cpp:482 SourceData.cpp:506 #, fuzzy, kde-format #| msgid "Reading file: %1" msgid "Failed to read file: %1" msgstr "Branje datoteke: %1 " -#: fileaccess.cpp:587 +#: fileaccess.cpp:624 #, kde-format msgid "Creating temp copy of %1 failed." msgstr "Ustvarjanje začasne kopije %1 je spodletelo." -#: fileaccess.cpp:595 fileaccess.cpp:600 +#: fileaccess.cpp:632 fileaccess.cpp:637 #, fuzzy, kde-format #| msgid "Opening %1 failed." msgid "Opening %1 failed. %2" msgstr "Odpiranje %1 je spodletelo." -#: fileaccess.cpp:619 fileaccess.cpp:627 +#: fileaccess.cpp:656 fileaccess.cpp:664 #, fuzzy, kde-format #| msgid "Error reading from %1" msgid "Error reading from %1. %2" msgstr "Napaka med branjem iz %1" -#: fileaccess.cpp:751 +#: fileaccess.cpp:788 #, fuzzy, kde-format #| msgid "" #| "While trying to make a backup, deleting an older backup failed. \n" @@ -996,7 +1001,7 @@ "kopije.\n" "Ime datoteke: " -#: fileaccess.cpp:758 +#: fileaccess.cpp:795 #, fuzzy, kde-format #| msgid "" #| "While trying to make a backup, renaming failed. \n" @@ -1008,179 +1013,179 @@ "Med ustvarjanjem varnostne kopije je spodletelo preimenovanje.\n" "Imena datotek: " -#: fileaccess.cpp:828 +#: fileaccess.cpp:865 #, kde-format msgid "Getting file status: %1" msgstr "Pridobivanje stanja datoteke: %1" -#: fileaccess.cpp:869 +#: fileaccess.cpp:906 #, kde-format msgid "Reading file: %1" msgstr "Branje datoteke: %1 " -#: fileaccess.cpp:907 +#: fileaccess.cpp:944 #, kde-format msgid "Writing file: %1" msgstr "Zapisovanje datoteke: %1" -#: fileaccess.cpp:940 +#: fileaccess.cpp:977 #, kde-format msgid "Out of memory" msgstr "Zmanjkalo pomnilnika" -#: fileaccess.cpp:976 +#: fileaccess.cpp:1013 #, kde-format msgid "Making directory: %1" msgstr "Ustvarjanje mape: %1" -#: fileaccess.cpp:997 +#: fileaccess.cpp:1034 #, kde-format msgid "Removing directory: %1" msgstr "Odstranjevanje mape: %1" -#: fileaccess.cpp:1012 +#: fileaccess.cpp:1049 #, kde-format msgid "Removing file: %1" msgstr "Odstranjevanje datoteke: %1" -#: fileaccess.cpp:1028 +#: fileaccess.cpp:1065 #, kde-format msgid "Creating symbolic link: %1 -> %2" msgstr "Ustvarjanje simbolne povezave: %1 -> %2" -#: fileaccess.cpp:1052 +#: fileaccess.cpp:1089 #, kde-format msgid "Renaming file: %1 -> %2" msgstr "Preimenovanje datoteke: %1 -> %2" -#: fileaccess.cpp:1086 +#: fileaccess.cpp:1123 #, kde-format msgid "Copying file: %1 -> %2" msgstr "Kopiranje datoteke: %1 -> %2" -#: fileaccess.cpp:1108 +#: fileaccess.cpp:1145 #, fuzzy, kde-format #| msgid "Reading directory: " msgid "Reading directory: %1" msgstr "Branje mape: " -#: fileaccess.cpp:1162 +#: fileaccess.cpp:1202 #, kde-format msgid "Listing directory: %1" msgstr "Seznam predmetov v mapi: %1" -#: kdiff3.cpp:181 +#: kdiff3.cpp:182 #, kde-format msgid "Current Configuration:" msgstr "Trenutne nastavitve" -#: kdiff3.cpp:186 +#: kdiff3.cpp:187 #, kde-format msgid "Config Option Error:" msgstr "Napaka možnosti nastavitev:" -#: kdiff3.cpp:240 +#: kdiff3.cpp:246 #, kde-format msgid "Option --auto used, but no output file specified." msgstr "" "Uporabljena je bila možnost --auto, ni pa bila določena izhodna datoteka." -#: kdiff3.cpp:416 +#: kdiff3.cpp:405 #, kde-format msgid "Option --auto ignored for directory comparison." msgstr "Za primerjave map je bila prezrta možnost --auto." -#: kdiff3.cpp:460 +#: kdiff3.cpp:449 #, kde-format msgid "Saving failed." msgstr "Shranjevanje je spodletelo." -#: kdiff3.cpp:496 pdiff.cpp:1098 +#: kdiff3.cpp:494 pdiff.cpp:1096 #, kde-format msgid "Opening of these files failed:" msgstr "Odpiranje teh datotek je spodletelo:" -#: kdiff3.cpp:505 +#: kdiff3.cpp:503 pdiff.cpp:1105 #, kde-format -msgid "File Open Error" +msgid "File open error" msgstr "Napaka med odpiranjem datoteke" -#: kdiff3.cpp:533 +#: kdiff3.cpp:532 #, kde-format msgid "Opens documents for comparison..." msgstr "Odpre dokumente za primerjavo ..." -#: kdiff3.cpp:535 +#: kdiff3.cpp:534 #, kde-format msgid "Reload" msgstr "Znova naloži" -#: kdiff3.cpp:538 +#: kdiff3.cpp:537 #, kde-format msgid "Saves the merge result. All conflicts must be solved!" msgstr "Shrani rezultat združevanja. Vsi spori morajo biti rešeni!" -#: kdiff3.cpp:540 +#: kdiff3.cpp:539 #, kde-format msgid "Saves the current document as..." msgstr "Shrani trenuten dokument kot ..." -#: kdiff3.cpp:543 +#: kdiff3.cpp:542 #, kde-format msgid "Print the differences" msgstr "Natisne razlike" -#: kdiff3.cpp:546 +#: kdiff3.cpp:545 #, kde-format msgid "Quits the application" msgstr "Konča program" -#: kdiff3.cpp:549 +#: kdiff3.cpp:548 #, kde-format msgid "Cuts the selected section and puts it to the clipboard" msgstr "Izreže izbrani odsek in ga odloži v odložišče" -#: kdiff3.cpp:552 +#: kdiff3.cpp:551 #, kde-format msgid "Copies the selected section to the clipboard" msgstr "Kopira izbrani odsek v odložišče" -#: kdiff3.cpp:554 +#: kdiff3.cpp:553 #, kde-format msgid "Pastes the clipboard contents to current position" msgstr "Prilepi vsebino odložišča na trenutni položaj" -#: kdiff3.cpp:557 +#: kdiff3.cpp:556 #, kde-format msgid "Select everything in current window" msgstr "Izbere vse v trenutnem oknu" -#: kdiff3.cpp:560 +#: kdiff3.cpp:559 #, kde-format msgid "Search for a string" msgstr "Poišče niz" -#: kdiff3.cpp:562 +#: kdiff3.cpp:561 #, kde-format msgid "Search again for the string" msgstr "Znova išče za nizom" -#: kdiff3.cpp:567 +#: kdiff3.cpp:566 #, kde-format msgid "Enables/disables the statusbar" msgstr "Omogoči/onemogoči vrstico stanja" -#: kdiff3.cpp:571 +#: kdiff3.cpp:570 #, kde-format msgid "Configure KDiff3..." msgstr "Nastavi KDiff3 ..." -#: kdiff3.cpp:590 +#: kdiff3.cpp:589 #, kde-format msgid "Go to Current Delta" msgstr "Pojdi na trenutno razliko" -#: kdiff3.cpp:590 +#: kdiff3.cpp:589 #, kde-format msgid "" "Current\n" @@ -1189,12 +1194,12 @@ "Trenutna\n" "razlika" -#: kdiff3.cpp:592 +#: kdiff3.cpp:591 #, kde-format msgid "Go to First Delta" msgstr "Pojdi na prvo razliko" -#: kdiff3.cpp:592 +#: kdiff3.cpp:591 #, kde-format msgid "" "First\n" @@ -1203,12 +1208,12 @@ "Prva\n" "razlika" -#: kdiff3.cpp:594 +#: kdiff3.cpp:593 #, kde-format msgid "Go to Last Delta" msgstr "Pojdi na zadnjo razliko" -#: kdiff3.cpp:594 +#: kdiff3.cpp:593 #, kde-format msgid "" "Last\n" @@ -1217,14 +1222,14 @@ "Zadnja\n" "razlika" -#: kdiff3.cpp:596 +#: kdiff3.cpp:595 #, kde-format msgid "(Skips white space differences when \"Show White Space\" is disabled.)" msgstr "" "(preskoči razlike zaradi preslednih znakov, če je onemogočeno \"Pokaži " "presledne znake\".)" -#: kdiff3.cpp:597 +#: kdiff3.cpp:596 #, kde-format msgid "" "(Does not skip white space differences even when \"Show White Space\" is " @@ -1233,12 +1238,12 @@ "(ne preskoči razlike zaradi preslednih znakov, tudi če je onemogočeno " "\"Pokaži presledne znake\".)" -#: kdiff3.cpp:598 +#: kdiff3.cpp:597 #, kde-format msgid "Go to Previous Delta" msgstr "Pojdi na predhodno razliko" -#: kdiff3.cpp:598 +#: kdiff3.cpp:597 #, kde-format msgid "" "Prev\n" @@ -1247,12 +1252,12 @@ "Predh.\n" "razlika" -#: kdiff3.cpp:600 +#: kdiff3.cpp:599 #, kde-format msgid "Go to Next Delta" msgstr "Pojdi na naslednjo razliko" -#: kdiff3.cpp:600 +#: kdiff3.cpp:599 #, kde-format msgid "" "Next\n" @@ -1261,12 +1266,12 @@ "Nasl.\n" "razlika" -#: kdiff3.cpp:602 +#: kdiff3.cpp:601 #, kde-format msgid "Go to Previous Conflict" msgstr "Pojdi na predhodni spor" -#: kdiff3.cpp:602 +#: kdiff3.cpp:601 #, kde-format msgid "" "Prev\n" @@ -1275,12 +1280,12 @@ "Predh.\n" "spor" -#: kdiff3.cpp:604 +#: kdiff3.cpp:603 #, kde-format msgid "Go to Next Conflict" msgstr "Pojdi na naslednji spor" -#: kdiff3.cpp:604 +#: kdiff3.cpp:603 #, kde-format msgid "" "Next\n" @@ -1289,12 +1294,12 @@ "Nasl.\n" "spor" -#: kdiff3.cpp:606 +#: kdiff3.cpp:605 #, kde-format msgid "Go to Previous Unsolved Conflict" msgstr "Pojdi na predhodni nerešen spor" -#: kdiff3.cpp:606 +#: kdiff3.cpp:605 #, kde-format msgid "" "Prev\n" @@ -1303,12 +1308,12 @@ "Predh.\n" "nerešen" -#: kdiff3.cpp:608 +#: kdiff3.cpp:607 #, kde-format msgid "Go to Next Unsolved Conflict" msgstr "Pojdi na naslednji nerešen spor" -#: kdiff3.cpp:608 +#: kdiff3.cpp:607 #, kde-format msgid "" "Next\n" @@ -1317,12 +1322,12 @@ "Nasl.\n" "nerešen" -#: kdiff3.cpp:610 +#: kdiff3.cpp:609 #, kde-format msgid "Select Line(s) From A" msgstr "Izberi vrstice iz A" -#: kdiff3.cpp:610 +#: kdiff3.cpp:609 #, kde-format msgid "" "Choose\n" @@ -1331,12 +1336,12 @@ "Izberi\n" "A" -#: kdiff3.cpp:611 +#: kdiff3.cpp:610 #, kde-format msgid "Select Line(s) From B" msgstr "Izberi vrstice iz B" -#: kdiff3.cpp:611 +#: kdiff3.cpp:610 #, kde-format msgid "" "Choose\n" @@ -1345,12 +1350,12 @@ "Izberi\n" "B" -#: kdiff3.cpp:612 +#: kdiff3.cpp:611 #, kde-format msgid "Select Line(s) From C" msgstr "Izberi vrstice iz C" -#: kdiff3.cpp:612 +#: kdiff3.cpp:611 #, kde-format msgid "" "Choose\n" @@ -1359,12 +1364,12 @@ "Izberi\n" "C" -#: kdiff3.cpp:613 +#: kdiff3.cpp:612 #, kde-format msgid "Automatically Go to Next Unsolved Conflict After Source Selection" msgstr "Po izbiri vira, se samodejno premakni na naslednji nerešen spor" -#: kdiff3.cpp:613 +#: kdiff3.cpp:612 #, kde-format msgid "" "Auto\n" @@ -1373,25 +1378,25 @@ "Samod.\n" "naslednji" -#: kdiff3.cpp:615 +#: kdiff3.cpp:614 #, fuzzy, kde-format #| msgid "Show Space && Tabulator Characters for Differences" msgid "Show Space && Tabulator Characters" msgstr "Za razlike prikaži znake presledkov in tabulatorjev" -#: kdiff3.cpp:615 +#: kdiff3.cpp:614 #, kde-format msgid "" "White\n" "Characters" msgstr "Znaki" -#: kdiff3.cpp:616 +#: kdiff3.cpp:615 #, kde-format msgid "Show White Space" msgstr "Presledni znak" -#: kdiff3.cpp:616 +#: kdiff3.cpp:615 #, kde-format msgid "" "White\n" @@ -1400,12 +1405,12 @@ "Presledne\n" "razlike" -#: kdiff3.cpp:618 +#: kdiff3.cpp:617 #, kde-format msgid "Show Line Numbers" msgstr "Pokaži številke vrstic" -#: kdiff3.cpp:618 +#: kdiff3.cpp:617 #, kde-format msgid "" "Line\n" @@ -1414,195 +1419,195 @@ "Številke\n" "vrstic" -#: kdiff3.cpp:620 +#: kdiff3.cpp:619 #, kde-format msgid "Automatically Solve Simple Conflicts" msgstr "Samodejno reši preproste spore" -#: kdiff3.cpp:621 +#: kdiff3.cpp:620 #, kde-format msgid "Set Deltas to Conflicts" msgstr "Določi razlike za spore" -#: kdiff3.cpp:622 +#: kdiff3.cpp:621 #, kde-format msgid "Run Regular Expression Auto Merge" msgstr "Zaženi samodejno združevanje z regularnimi izrazi" -#: kdiff3.cpp:623 +#: kdiff3.cpp:622 #, kde-format msgid "Automatically Solve History Conflicts" msgstr "Samodejno reši spore zgodovine" -#: kdiff3.cpp:624 +#: kdiff3.cpp:623 #, kde-format msgid "Split Diff At Selection" msgstr "Razdeli Diff pri izbiri" -#: kdiff3.cpp:625 +#: kdiff3.cpp:624 #, kde-format msgid "Join Selected Diffs" msgstr "Združi izbrane Diffe" -#: kdiff3.cpp:627 +#: kdiff3.cpp:626 #, kde-format msgid "Show Window A" msgstr "Pokaži okno A" -#: kdiff3.cpp:628 +#: kdiff3.cpp:627 #, kde-format msgid "Show Window B" msgstr "Pokaži okno B" -#: kdiff3.cpp:629 +#: kdiff3.cpp:628 #, kde-format msgid "Show Window C" msgstr "Pokaži okno C" -#: kdiff3.cpp:631 +#: kdiff3.cpp:630 #, kde-format msgid "Normal Overview" msgstr "Običajni pregled" -#: kdiff3.cpp:632 +#: kdiff3.cpp:631 #, kde-format msgid "A vs. B Overview" msgstr "Pregled A proti B" -#: kdiff3.cpp:633 +#: kdiff3.cpp:632 #, kde-format msgid "A vs. C Overview" msgstr "Pregled A proti C" -#: kdiff3.cpp:634 +#: kdiff3.cpp:633 #, kde-format msgid "B vs. C Overview" msgstr "Pregled B proti C" -#: kdiff3.cpp:635 +#: kdiff3.cpp:634 #, kde-format msgid "Word Wrap Diff Windows" msgstr "Ovijanje besed oken Diffov" -#: kdiff3.cpp:636 +#: kdiff3.cpp:635 #, kde-format msgid "Add Manual Diff Alignment" msgstr "Dodaj ročno poravnavo Diffov" -#: kdiff3.cpp:637 +#: kdiff3.cpp:636 #, kde-format msgid "Clear All Manual Diff Alignments" msgstr "Počisti vse ročne poravnave Diffov" -#: kdiff3.cpp:639 +#: kdiff3.cpp:638 #, kde-format msgid "Focus Next Window" msgstr "Naslednje okno v žarišče" -#: kdiff3.cpp:640 +#: kdiff3.cpp:639 #, kde-format msgid "Focus Prev Window" msgstr "Predhodno okno v žarišče" -#: kdiff3.cpp:641 +#: kdiff3.cpp:640 #, kde-format msgid "Toggle Split Orientation" msgstr "Preklopi usmerjenost razdelitve" -#: kdiff3.cpp:643 +#: kdiff3.cpp:642 #, kde-format msgid "Dir && Text Split Screen View" msgstr "Razdeljeni pogled map in besedila" -#: kdiff3.cpp:645 +#: kdiff3.cpp:644 #, kde-format msgid "Toggle Between Dir && Text View" msgstr "Preklopi med pogledom map in besedila" -#: kdiff3.cpp:697 pdiff.cpp:1909 +#: kdiff3.cpp:696 pdiff.cpp:1919 #, fuzzy, kde-format #| msgid "The merge result hasn't been saved." msgid "The merge result has not been saved." msgstr "Rezultat združevanja ni bil shranjen." -#: kdiff3.cpp:699 +#: kdiff3.cpp:698 #, kde-format msgid "Save && Quit" msgstr "Shrani in končaj" -#: kdiff3.cpp:700 +#: kdiff3.cpp:699 #, kde-format msgid "Quit Without Saving" msgstr "Končaj brez shranjevanja" -#: kdiff3.cpp:708 pdiff.cpp:1920 +#: kdiff3.cpp:707 pdiff.cpp:1930 #, kde-format msgid "Saving the merge result failed." msgstr "Shranjevanje rezultata združevanja je spodletelo." -#: kdiff3.cpp:719 pdiff.cpp:1032 +#: kdiff3.cpp:718 pdiff.cpp:1030 #, kde-format msgid "" "You are currently doing a directory merge. Are you sure, you want to abort?" msgstr "Trenutno združujete mape. Ali ste prepričani, da želite prekiniti?" -#: kdiff3.cpp:742 +#: kdiff3.cpp:741 #, kde-format msgid "Saving file..." msgstr "Shranjevanje datoteke ..." -#: kdiff3.cpp:759 +#: kdiff3.cpp:758 #, kde-format msgid "Saving file with a new filename..." msgstr "Shranjevanje datoteke z novim imenom ..." -#: kdiff3.cpp:761 +#: kdiff3.cpp:760 #, kde-format msgid "Save As..." msgstr "Shrani kot ..." -#: kdiff3.cpp:820 +#: kdiff3.cpp:819 #, kde-format msgid "Printing not implemented." msgstr "Tiskanje ni podprto." -#: kdiff3.cpp:857 +#: kdiff3.cpp:858 #, kde-format msgid "Printing..." msgstr "Tiskanje ..." -#: kdiff3.cpp:943 +#: kdiff3.cpp:948 #, kde-format msgid "Printing page %1 of %2" msgstr "" -#: kdiff3.cpp:1000 +#: kdiff3.cpp:1006 #, fuzzy, kde-format #| msgid "Selection" msgid " (Selection)" msgstr "Izbira" -#: kdiff3.cpp:1027 +#: kdiff3.cpp:1034 #, kde-format msgid "Printing completed." msgstr "Tiskanje je končano.." -#: kdiff3.cpp:1031 +#: kdiff3.cpp:1038 #, kde-format msgid "Printing aborted." msgstr "Tiskanje je prekinjeno.." -#: kdiff3.cpp:1038 +#: kdiff3.cpp:1045 #, kde-format msgid "Exiting..." msgstr "Končujem ..." -#: kdiff3.cpp:1049 +#: kdiff3.cpp:1056 #, kde-format msgid "Toggling toolbar..." msgstr "Preklapljanje orodne vrstice ..." -#: kdiff3.cpp:1070 +#: kdiff3.cpp:1077 #, kde-format msgid "Toggle the statusbar..." msgstr "Preklopi vrstico stanja ..." @@ -1628,7 +1633,7 @@ msgid "Joachim Eibl" msgstr "Joachim Eibl" -#: kdiff3_part.cpp:173 kdiff3_part.cpp:254 +#: kdiff3_part.cpp:174 kdiff3_part.cpp:255 #, fuzzy, kde-format #| msgid "Couldn't find files for comparison." msgid "Could not find files for comparison." @@ -1647,7 +1652,7 @@ msgstr "Nastavi KDiff3 " #. i18n: ectx: ToolBar (mainToolBar) -#: kdiff3_part.rc:16 main.cpp:88 +#: kdiff3_part.rc:16 main.cpp:89 #, kde-format msgid "KDiff3" msgstr "KDiff3" @@ -1719,85 +1724,91 @@ msgid "Main Toolbar" msgstr "Glavna orodna vrstica" -#: main.cpp:68 main.cpp:72 +#: main.cpp:69 main.cpp:73 #, kde-format msgid "Ignored. (User defined.)" msgstr "Prezrto. (Uporabniško določeno.)" -#: main.cpp:92 +#: main.cpp:93 #, kde-format msgid " (64 bit)" msgstr "" -#: main.cpp:94 +#: main.cpp:95 #, kde-format msgid " (32 bit)" msgstr "" -#: main.cpp:95 +#: main.cpp:96 #, kde-format msgid "Tool for Comparison and Merge of Files and Directories" msgstr "Orodje za primerjavo in združevanje datotek in map" -#: main.cpp:96 +#: main.cpp:97 #, kde-format msgid "(c) 2002-2014 Joachim Eibl, (c) 2017 Michael Reeves KF5/Qt5 port" msgstr "" -#: main.cpp:112 +#: main.cpp:113 #, kde-format msgid "Merge the input." msgstr "Združi vhod." -#: main.cpp:113 +#: main.cpp:114 #, kde-format msgid "Explicit base file. For compatibility with certain tools." msgstr "Izrecna osnovna datoteka. Za združljivost z določenimi orodji." -#: main.cpp:114 +#: main.cpp:115 #, kde-format msgid "Output file. Implies -m. E.g.: -o newfile.txt" msgstr "Izhodna datoteka. Vključuje -m. Npr.: -o newfile.txt" -#: main.cpp:115 +#: main.cpp:116 #, kde-format msgid "Output file, again. (For compatibility with certain tools.)" msgstr "Izhodna datoteka, znova. (Za združljivost z določenimi orodji.)" -#: main.cpp:116 +#: main.cpp:118 #, kde-format msgid "No GUI if all conflicts are auto-solvable. (Needs -o file)" msgstr "" "Grafičnega vmesnika ni, če so vsi spori samodejno rešljivi. (Zahteva -o " "datoteka)" -#: main.cpp:117 +#: main.cpp:120 +#, fuzzy, kde-format +#| msgid "Ignore" +msgid "Ignored." +msgstr "Prezri" + +#: main.cpp:122 #, fuzzy, kde-format #| msgid "Don't solve conflicts automatically. (For compatibility...)" msgid "Do not solve conflicts automatically." msgstr "Sporov ne rešuj samodejno. (Za združljivost ...)" -#: main.cpp:118 +#: main.cpp:123 #, kde-format msgid "Visible name replacement for input file 1 (base)." msgstr "Vidna sprememba imena za vhodno datoteko 1 (osnova)." -#: main.cpp:119 +#: main.cpp:124 #, kde-format msgid "Visible name replacement for input file 2." msgstr "Vidna sprememba imena za vhodno datoteko 2." -#: main.cpp:120 +#: main.cpp:125 #, kde-format msgid "Visible name replacement for input file 3." msgstr "Vidna sprememba imena za vhodno datoteko 3." -#: main.cpp:121 +#: main.cpp:126 #, kde-format msgid "Alternative visible name replacement. Supply this once for every input." msgstr "Drugotna vidna sprememba imena. Dodajte to enkrat za vsak vhod." -#: main.cpp:122 +#: main.cpp:127 #, kde-format msgid "" "Override a config setting. Use once for every setting. E.g.: --cs " @@ -1806,87 +1817,87 @@ "Prepiše nastavitev. Uporabite enkrat za vsako nastavitev. Npr.: --cs " "\"AutoAdvance=1\"" -#: main.cpp:123 +#: main.cpp:128 #, kde-format msgid "Show list of config settings and current values." msgstr "Pokaže seznam nastavitev in trenutnih vrednosti." -#: main.cpp:124 +#: main.cpp:129 #, kde-format msgid "Use a different config file." msgstr "Uporabi drugo nastavitveno datoteko." -#: main.cpp:127 +#: main.cpp:132 #, kde-format msgid "file1 to open (base, if not specified via --base)" msgstr "datoteka1, ki bo odprta (osnovna, če ni določena preko --base)" -#: main.cpp:128 +#: main.cpp:133 #, kde-format msgid "file2 to open" msgstr "datoteka2 za odprtje" -#: main.cpp:129 +#: main.cpp:134 #, kde-format msgid "file3 to open" msgstr "datoteka3 za odprtje" -#: main.cpp:153 +#: main.cpp:158 #, kde-format msgid "See kdiff3 --help for supported options." msgstr "" -#: mergeresultwindow.cpp:158 +#: mergeresultwindow.cpp:171 #, kde-format msgid "Choose A Everywhere" msgstr "Povsod izberi A" -#: mergeresultwindow.cpp:159 +#: mergeresultwindow.cpp:172 #, kde-format msgid "Choose B Everywhere" msgstr "Povsod izberi B" -#: mergeresultwindow.cpp:160 +#: mergeresultwindow.cpp:173 #, kde-format msgid "Choose C Everywhere" msgstr "Povsod izberi C" -#: mergeresultwindow.cpp:161 +#: mergeresultwindow.cpp:174 #, kde-format msgid "Choose A for All Unsolved Conflicts" msgstr "Izberi A za vse nerešene spore" -#: mergeresultwindow.cpp:162 +#: mergeresultwindow.cpp:175 #, kde-format msgid "Choose B for All Unsolved Conflicts" msgstr "Izberi B za vse nerešene spore" -#: mergeresultwindow.cpp:163 +#: mergeresultwindow.cpp:176 #, kde-format msgid "Choose C for All Unsolved Conflicts" msgstr "Izberi C za vse nerešene spore" -#: mergeresultwindow.cpp:164 +#: mergeresultwindow.cpp:177 #, kde-format msgid "Choose A for All Unsolved Whitespace Conflicts" msgstr "Izberi A za vse nerešene spore s preslednimi znaki" -#: mergeresultwindow.cpp:165 +#: mergeresultwindow.cpp:178 #, kde-format msgid "Choose B for All Unsolved Whitespace Conflicts" msgstr "Izberi B za vse nerešene spore s preslednimi znaki" -#: mergeresultwindow.cpp:166 +#: mergeresultwindow.cpp:179 #, kde-format msgid "Choose C for All Unsolved Whitespace Conflicts" msgstr "Izberi C za vse nerešene spore s preslednimi znaki" -#: mergeresultwindow.cpp:176 +#: mergeresultwindow.cpp:204 #, kde-format msgid "Number of remaining unsolved conflicts: %1 (of which %2 are whitespace)" msgstr "Število nerešenih sporov: %1 (od tega je %2 preslednih znakov)" -#: mergeresultwindow.cpp:370 +#: mergeresultwindow.cpp:398 #, kde-format msgid "" "The output has been modified.\n" @@ -1895,29 +1906,29 @@ "Izhod je bil spremenjen.\n" "Če nadaljujete, bodo vaše spremembe izgubljene." -#: mergeresultwindow.cpp:936 pdiff.cpp:827 +#: mergeresultwindow.cpp:964 pdiff.cpp:817 #, kde-format msgid "All input files are binary equal." msgstr "Vse vhodne datoteke so dvojiško enake." -#: mergeresultwindow.cpp:938 +#: mergeresultwindow.cpp:966 #, kde-format msgid "All input files contain the same text." msgstr "Vse vhodne datoteke vsebujejo enako besedilo." -#: mergeresultwindow.cpp:942 mergeresultwindow.cpp:946 -#: mergeresultwindow.cpp:950 pdiff.cpp:833 pdiff.cpp:837 pdiff.cpp:841 +#: mergeresultwindow.cpp:970 mergeresultwindow.cpp:974 +#: mergeresultwindow.cpp:978 pdiff.cpp:823 pdiff.cpp:827 pdiff.cpp:831 #, kde-format msgid "Files %1 and %2 are binary equal.\n" msgstr "Datoteki %1 in %2 sta dvojiško enaki.\n" -#: mergeresultwindow.cpp:944 mergeresultwindow.cpp:948 -#: mergeresultwindow.cpp:952 +#: mergeresultwindow.cpp:972 mergeresultwindow.cpp:976 +#: mergeresultwindow.cpp:980 #, kde-format msgid "Files %1 and %2 have equal text.\n" msgstr "Datoteki %1 in %2 vsebujeta enako besedilo.\n" -#: mergeresultwindow.cpp:958 +#: mergeresultwindow.cpp:986 #, kde-format msgid "" "Total number of conflicts: %1\n" @@ -1926,27 +1937,27 @@ "%4" msgstr "" -#: mergeresultwindow.cpp:964 +#: mergeresultwindow.cpp:992 #, kde-format msgid "Conflicts" msgstr "Spori" -#: mergeresultwindow.cpp:1873 +#: mergeresultwindow.cpp:1901 #, kde-format msgid "" msgstr "" -#: mergeresultwindow.cpp:1881 +#: mergeresultwindow.cpp:1909 #, kde-format msgid "" msgstr "" -#: mergeresultwindow.cpp:1883 mergeresultwindow.cpp:2755 +#: mergeresultwindow.cpp:1911 mergeresultwindow.cpp:2783 #, kde-format msgid "" msgstr "" -#: mergeresultwindow.cpp:2967 +#: mergeresultwindow.cpp:2995 #, fuzzy, kde-format #| msgid "" #| "Not all conflicts are solved yet.\n" @@ -1958,12 +1969,12 @@ "Vsi spori še niso bili rešeni.\n" "Datoteka ni bila shranjena.\n" -#: mergeresultwindow.cpp:2969 mergeresultwindow.cpp:2978 +#: mergeresultwindow.cpp:2997 mergeresultwindow.cpp:3006 #, kde-format msgid "Conflicts Left" msgstr "Preostalih sporov" -#: mergeresultwindow.cpp:2976 +#: mergeresultwindow.cpp:3004 #, fuzzy, kde-format #| msgid "" #| "There is a line end style conflict. Please choose the line end style " @@ -1977,7 +1988,7 @@ "Obstaja spor koncev vrstic. Ročno izberite slog konca vrstice.\n" "Datoteka ni bila shranjena.\n" -#: mergeresultwindow.cpp:2990 +#: mergeresultwindow.cpp:3018 #, kde-format msgid "" "\n" @@ -1988,62 +1999,62 @@ "\n" "Ustvarjanje varnostne kopije je spodletelo. Datoteka ni bila shranjena." -#: mergeresultwindow.cpp:2990 mergeresultwindow.cpp:3038 +#: mergeresultwindow.cpp:3018 mergeresultwindow.cpp:3066 #, kde-format msgid "File Save Error" msgstr "Napaka med shranjevanjem datoteke" -#: mergeresultwindow.cpp:3038 +#: mergeresultwindow.cpp:3066 #, kde-format msgid "Error while writing." msgstr "Napaka med zapisovanjem." -#: mergeresultwindow.cpp:3110 +#: mergeresultwindow.cpp:3138 #, fuzzy, kde-format #| msgid "Output" msgid "Output:" msgstr "Izhod" -#: mergeresultwindow.cpp:3123 mergeresultwindow.cpp:3315 +#: mergeresultwindow.cpp:3151 mergeresultwindow.cpp:3343 #, kde-format msgid "[Modified]" msgstr "[Spremenjeno]" -#: mergeresultwindow.cpp:3130 +#: mergeresultwindow.cpp:3158 #, fuzzy, kde-format #| msgid "Encoding for saving" msgid "Encoding for saving:" msgstr "Kodiranje za shranjevanje" -#: mergeresultwindow.cpp:3230 +#: mergeresultwindow.cpp:3258 #, kde-format msgid "Conflict" msgstr "Spor" -#: mergeresultwindow.cpp:3262 +#: mergeresultwindow.cpp:3290 #, fuzzy, kde-format #| msgid "Codec from" msgid "Codec from A: %1" msgstr "Kodiranje iz" -#: mergeresultwindow.cpp:3264 +#: mergeresultwindow.cpp:3292 #, fuzzy, kde-format #| msgid "Codec from" msgid "Codec from B: %1" msgstr "Kodiranje iz" -#: mergeresultwindow.cpp:3266 +#: mergeresultwindow.cpp:3294 #, fuzzy, kde-format #| msgid "Codec from" msgid "Codec from C: %1" msgstr "Kodiranje iz" -#: optiondialog.cpp:119 +#: optiondialog.cpp:121 #, kde-format msgid "Change Font" msgstr "" -#: optiondialog.cpp:135 optiondialog.cpp:145 +#: optiondialog.cpp:137 optiondialog.cpp:147 #, kde-format msgid "" "Font: %1, %2, %3\n" @@ -2051,162 +2062,162 @@ "Example:" msgstr "" -#: optiondialog.cpp:388 +#: optiondialog.cpp:390 #, kde-format msgid "Unicode" msgstr "Unicode" -#: optiondialog.cpp:389 +#: optiondialog.cpp:391 #, kde-format msgid "Latin1" msgstr "Latin1" -#: optiondialog.cpp:408 +#: optiondialog.cpp:410 #, kde-format msgid "Change this if non-ASCII characters are not displayed correctly." msgstr "Spremenite to, če niso pravilno prikazani ne-ASCII znaki." -#: optiondialog.cpp:491 +#: optiondialog.cpp:495 #, kde-format msgid "Configure" msgstr "Nastavi" -#: optiondialog.cpp:568 +#: optiondialog.cpp:573 #, kde-format msgid "Font" msgstr "Pisava" -#: optiondialog.cpp:570 +#: optiondialog.cpp:575 #, kde-format msgid "Editor & Diff Output Font" msgstr "Pisava urejevalnika in izhoda Diff" -#: optiondialog.cpp:589 +#: optiondialog.cpp:594 #, kde-format msgid "Application font" msgstr "" -#: optiondialog.cpp:594 +#: optiondialog.cpp:599 #, fuzzy, kde-format #| msgid "File Save Error" msgid "File view font" msgstr "Napaka med shranjevanjem datoteke" -#: optiondialog.cpp:613 +#: optiondialog.cpp:618 #, fuzzy, kde-format #| msgid "Color" msgctxt "Title for color settings page" msgid "Color" msgstr "Barva" -#: optiondialog.cpp:614 +#: optiondialog.cpp:619 #, kde-format msgid "Colors Settings" msgstr "Nastavitve barv" -#: optiondialog.cpp:631 +#: optiondialog.cpp:644 #, kde-format msgid "Editor and Diff Views:" msgstr "Pogledi urejevalnika in DIff:" -#: optiondialog.cpp:639 +#: optiondialog.cpp:652 #, kde-format msgid "Foreground color:" msgstr "Barva ospredja:" -#: optiondialog.cpp:647 +#: optiondialog.cpp:660 #, kde-format msgid "Background color:" msgstr "Barva ozadja:" -#: optiondialog.cpp:657 +#: optiondialog.cpp:670 #, kde-format msgid "Diff background color:" msgstr "Barva ozadja DIff:" -#: optiondialog.cpp:666 +#: optiondialog.cpp:679 #, kde-format msgid "Color A:" msgstr "Barva A:" -#: optiondialog.cpp:675 +#: optiondialog.cpp:688 #, kde-format msgid "Color B:" msgstr "Barva B:" -#: optiondialog.cpp:684 +#: optiondialog.cpp:697 #, kde-format msgid "Color C:" msgstr "Barva C:" -#: optiondialog.cpp:692 +#: optiondialog.cpp:705 #, kde-format msgid "Conflict color:" msgstr "Barva spora:" -#: optiondialog.cpp:701 +#: optiondialog.cpp:714 #, kde-format msgid "Current range background color:" msgstr "Trenutna barva ozadja obsega:" -#: optiondialog.cpp:710 +#: optiondialog.cpp:723 #, kde-format msgid "Current range diff background color:" msgstr "Trenutna barva ozadja obsega Diff:" -#: optiondialog.cpp:718 +#: optiondialog.cpp:731 #, kde-format msgid "Color for manually aligned difference ranges:" msgstr "Barva za ročno poravnane obsege razlik:" -#: optiondialog.cpp:725 +#: optiondialog.cpp:738 #, kde-format msgid "Directory Comparison View:" msgstr "Pogled primerjave map:" -#: optiondialog.cpp:731 +#: optiondialog.cpp:744 #, kde-format msgid "Newest file color:" msgstr "Barva najnovejše datoteke:" -#: optiondialog.cpp:736 +#: optiondialog.cpp:749 #, kde-format msgid "" "Changing this color will only be effective when starting the next directory " "comparison." msgstr "Sprememba te barve bo vidna, ko bo začeta nova primerjava map." -#: optiondialog.cpp:741 +#: optiondialog.cpp:754 #, kde-format msgid "Oldest file color:" msgstr "Barva najstarejše datoteke:" -#: optiondialog.cpp:750 +#: optiondialog.cpp:763 #, kde-format msgid "Middle age file color:" msgstr "Barva datoteke srednje starosti:" -#: optiondialog.cpp:759 +#: optiondialog.cpp:772 #, kde-format msgid "Color for missing files:" msgstr "Barva za manjkajoče datoteke:" -#: optiondialog.cpp:773 +#: optiondialog.cpp:786 #, kde-format msgid "Editor" msgstr "Urejevalnik" -#: optiondialog.cpp:774 +#: optiondialog.cpp:787 #, kde-format msgid "Editor Behavior" msgstr "Obnašanje urejevalnika" -#: optiondialog.cpp:787 +#: optiondialog.cpp:809 #, kde-format msgid "Tab inserts spaces" msgstr "Tabulator vstavi presledke" -#: optiondialog.cpp:791 +#: optiondialog.cpp:813 #, kde-format msgid "" "On: Pressing tab generates the appropriate number of spaces.\n" @@ -2215,28 +2226,28 @@ "Vključeno: pritisk tabulatorja ustvari primerno število presledkov.\n" "Izključeno: vstavljen bo znak tabulatorja." -#: optiondialog.cpp:796 +#: optiondialog.cpp:818 #, kde-format msgid "Tab size:" msgstr "Velikost tabulatorja:" -#: optiondialog.cpp:803 +#: optiondialog.cpp:825 #, kde-format msgid "Auto indentation" msgstr "Samodejno zamikanje" -#: optiondialog.cpp:807 +#: optiondialog.cpp:829 #, kde-format msgid "On: The indentation of the previous line is used for a new line.\n" msgstr "" "Vključeno: zamikanje predhodne vrstice je uporabljeno za novo vrstico.\n" -#: optiondialog.cpp:810 +#: optiondialog.cpp:832 #, kde-format msgid "Auto copy selection" msgstr "Samodejno kopiraj izbiro" -#: optiondialog.cpp:814 +#: optiondialog.cpp:836 #, fuzzy, kde-format #| msgid "" #| "On: Any selection is immediately written to the clipboard.\n" @@ -2248,7 +2259,7 @@ "Vključeno: vsaka izbira je takoj zapisana v odložišče.\n" "Izključeno: kopirati morate izrecno, npr. preko Ctrl+C." -#: optiondialog.cpp:829 +#: optiondialog.cpp:851 #, kde-format msgid "" "Sets the line endings for when an edited file is saved.\n" @@ -2257,12 +2268,12 @@ "Določi konce vrstic za shranjevanje urejenih datotek.\n" "DOS/Windows: CR+LF; UNIX: LF; z CR=0D, LF=0A" -#: optiondialog.cpp:839 +#: optiondialog.cpp:861 #, kde-format msgid "Diff" msgstr "Diff" -#: optiondialog.cpp:840 +#: optiondialog.cpp:862 #, kde-format msgid "Diff Settings" msgstr "Nastavitve Diff" @@ -2276,13 +2287,13 @@ #. ); #. ++line; #. -#: optiondialog.cpp:865 +#: optiondialog.cpp:896 #, fuzzy, kde-format #| msgid "Treat as white space." msgid "Ignore numbers (treat as white space)" msgstr "Obravnavaj kot presledni znak" -#: optiondialog.cpp:869 +#: optiondialog.cpp:900 #, kde-format msgid "" "Ignore number characters during line matching phase. (Similar to Ignore " @@ -2293,48 +2304,48 @@ "znake.)\n" "Lahko pomaga pri primerjavi datotek s številčnimi podatki." -#: optiondialog.cpp:873 +#: optiondialog.cpp:904 #, fuzzy, kde-format #| msgid "Treat C/C++ comments like white space." msgid "Ignore C/C++ comments (treat as white space)" msgstr "Obravnava opombe C/C++ kot presledne znake." -#: optiondialog.cpp:876 +#: optiondialog.cpp:907 #, kde-format msgid "Treat C/C++ comments like white space." msgstr "Obravnava opombe C/C++ kot presledne znake." -#: optiondialog.cpp:879 +#: optiondialog.cpp:910 #, fuzzy, kde-format #| msgid "Treat as white space." msgid "Ignore case (treat as white space)" msgstr "Obravnavaj kot presledni znak" -#: optiondialog.cpp:883 +#: optiondialog.cpp:914 #, kde-format msgid "Treat case differences like white space changes. ('a'<=>'A')" msgstr "" "Razlike v velikosti črk obravnava kot spremembe preslednih znakov. " "('a'<=>'A')" -#: optiondialog.cpp:886 +#: optiondialog.cpp:917 #, kde-format msgid "Preprocessor command:" msgstr "Ukaz za predobdelovanje:" -#: optiondialog.cpp:891 +#: optiondialog.cpp:922 #, kde-format msgid "User defined pre-processing. (See the docs for details.)" msgstr "" "Uporabniško določeno predobdelovanje. (Za podrobnosti si oglejte " "dokumentacijo.)" -#: optiondialog.cpp:894 +#: optiondialog.cpp:925 #, kde-format msgid "Line-matching preprocessor command:" msgstr "Ukaz ujemanja vrstic za predobdelovanje:" -#: optiondialog.cpp:899 +#: optiondialog.cpp:930 #, kde-format msgid "" "This pre-processor is only used during line matching.\n" @@ -2343,12 +2354,12 @@ "Ta predobdelovalnik je uporabljen le med ujemanjem vrstic.\n" "(Za podrobnosti si oglejte dokumentacijo.)" -#: optiondialog.cpp:902 +#: optiondialog.cpp:933 #, kde-format msgid "Try hard (slower)" msgstr "Potrudi se (počasneje)" -#: optiondialog.cpp:906 +#: optiondialog.cpp:937 #, kde-format msgid "" "Enables the --minimal option for the external diff.\n" @@ -2357,12 +2368,12 @@ "Omogoči možnost --minimal za zunanji diff.\n" "Preučevanje velikih datotek bo veliko počasneje." -#: optiondialog.cpp:910 +#: optiondialog.cpp:941 #, kde-format msgid "Align B and C for 3 input files" msgstr "Poravnaj B in C za 3 vhodne datoteke" -#: optiondialog.cpp:914 +#: optiondialog.cpp:945 #, kde-format msgid "" "Try to align B and C when comparing or merging three input files.\n" @@ -2374,17 +2385,24 @@ "Ni priporočeno za združevanje, ker lahko postane bolj zapleteno.\n" "(Privzeto je izključeno.)" -#: optiondialog.cpp:926 +#: optiondialog.cpp:956 +#, fuzzy, kde-format +#| msgid "Merge" +msgctxt "Settings page" +msgid "Merge" +msgstr "Združi" + +#: optiondialog.cpp:957 #, kde-format msgid "Merge Settings" msgstr "Nastavitve združevanja" -#: optiondialog.cpp:940 +#: optiondialog.cpp:980 #, kde-format msgid "Auto advance delay (ms):" msgstr "Zakasnitev samodejnega napredovanja (ms):" -#: optiondialog.cpp:946 +#: optiondialog.cpp:986 #, kde-format msgid "" "When in Auto-Advance mode the result of the current selection is shown \n" @@ -2394,27 +2412,27 @@ "naslednji spor prikazan rezultat trenutne izbire za določen čas. Obseg: 0 - " "2000 ms" -#: optiondialog.cpp:950 +#: optiondialog.cpp:990 #, kde-format msgid "Show info dialogs" msgstr "Pokaži pogovorna okna s podrobnostmi" -#: optiondialog.cpp:953 +#: optiondialog.cpp:993 #, kde-format msgid "Show a dialog with information about the number of conflicts." msgstr "Pokaže pogovorno okno s podrobnosti o številu sporov." -#: optiondialog.cpp:956 +#: optiondialog.cpp:996 #, kde-format msgid "White space 2-file merge default:" msgstr "Privzeta nastavitev za združevanje preslednih znakov dveh datotek:" -#: optiondialog.cpp:961 optiondialog.cpp:974 +#: optiondialog.cpp:1001 optiondialog.cpp:1014 #, kde-format msgid "Manual Choice" msgstr "Ročna izbira" -#: optiondialog.cpp:965 optiondialog.cpp:979 +#: optiondialog.cpp:1005 optiondialog.cpp:1019 #, kde-format msgid "" "Allow the merge algorithm to automatically select an input for white-space-" @@ -2423,22 +2441,22 @@ "Dovoli algoritmu združevanja, da samodejno izbere vhod za spremembe " "preslednih znakov." -#: optiondialog.cpp:969 +#: optiondialog.cpp:1009 #, kde-format msgid "White space 3-file merge default:" msgstr "Privzeta nastavitev za združevanje preslednih znakov treh datotek:" -#: optiondialog.cpp:983 +#: optiondialog.cpp:1023 #, kde-format msgid "Automatic Merge Regular Expression" msgstr "Regularni izraz samodejnega združevanja" -#: optiondialog.cpp:991 smalldialogs.cpp:449 +#: optiondialog.cpp:1031 smalldialogs.cpp:459 #, kde-format msgid "Auto merge regular expression:" msgstr "Regularni izraz samodejnega združevanja:" -#: optiondialog.cpp:996 +#: optiondialog.cpp:1036 #, kde-format msgid "" "Regular expression for lines where KDiff3 should automatically choose one " @@ -2450,13 +2468,13 @@ "Ko se vrstica s sporom ujema z regularnim izrazom, potem bo izbran\n" "- če je to mogoče - C, v nasprotnem primeru pa B." -#: optiondialog.cpp:1002 +#: optiondialog.cpp:1042 #, kde-format msgid "Run regular expression auto merge on merge start" msgstr "" "Ob začetku združevanja zaženi samodejno združevanje z regularnimi izrazi" -#: optiondialog.cpp:1005 +#: optiondialog.cpp:1045 #, kde-format msgid "" "Run the merge for auto merge regular expressions\n" @@ -2465,17 +2483,17 @@ "Zaženi združevanje z regularnimi izrazi samodejnega združevanja\n" "takoj, ko se združevanje začne.\n" -#: optiondialog.cpp:1010 +#: optiondialog.cpp:1050 #, kde-format msgid "Version Control History Merging" msgstr "Združevanje zgodovina nadzora različic" -#: optiondialog.cpp:1018 smalldialogs.cpp:476 +#: optiondialog.cpp:1058 smalldialogs.cpp:486 #, kde-format msgid "History start regular expression:" msgstr "Regularni izraz začetka zgodovine:" -#: optiondialog.cpp:1023 +#: optiondialog.cpp:1063 #, kde-format msgid "" "Regular expression for the start of the version control history entry.\n" @@ -2486,12 +2504,12 @@ "Običajno ta vrstica vsebuje ključno besedo \"$Log$\".\n" "Privzeta vrednost: \".*\\$Log.*\\$.*\"" -#: optiondialog.cpp:1029 smalldialogs.cpp:504 +#: optiondialog.cpp:1069 smalldialogs.cpp:514 #, kde-format msgid "History entry start regular expression:" msgstr "Regularni izraz za vnos začetka zgodovine:" -#: optiondialog.cpp:1042 +#: optiondialog.cpp:1082 #, kde-format msgid "" "A version control history entry consists of several lines.\n" @@ -2510,22 +2528,22 @@ "ločujejo prazne vrstice.\n" "Za več podrobnosti si oglejte dokumentacijo." -#: optiondialog.cpp:1050 +#: optiondialog.cpp:1090 #, kde-format msgid "History merge sorting" msgstr "Razvrščanje združevanja zgodovine" -#: optiondialog.cpp:1053 +#: optiondialog.cpp:1093 #, kde-format msgid "Sort version control history by a key." msgstr "Razvrsti zgodovino nadzora različic s pomočjo ključa." -#: optiondialog.cpp:1063 +#: optiondialog.cpp:1103 #, kde-format msgid "History entry start sort key order:" msgstr "Vrstni red začetnega ključa vnosa zgodovine:" -#: optiondialog.cpp:1068 +#: optiondialog.cpp:1108 #, kde-format msgid "" "Each pair of parentheses used in the regular expression for the history " @@ -2545,37 +2563,37 @@ "Če to pustite prazno, razvrščanje ne bo izvedeno.\n" "Za več podrobnosti si oglejte dokumentacijo." -#: optiondialog.cpp:1079 +#: optiondialog.cpp:1119 #, kde-format msgid "Merge version control history on merge start" msgstr "Ob začetku združevanja združi zgodovino nadzora različic" -#: optiondialog.cpp:1082 +#: optiondialog.cpp:1122 #, kde-format msgid "Run version control history automerge on merge start." msgstr "Ob začetku združevanja samodejno združi zgodovino nadzora različic." -#: optiondialog.cpp:1086 +#: optiondialog.cpp:1126 #, kde-format msgid "Max number of history entries:" msgstr "Največje število vnosov zgodovine:" -#: optiondialog.cpp:1090 +#: optiondialog.cpp:1130 #, kde-format msgid "Cut off after specified number. Use -1 for infinite number of entries." msgstr "Odreže po določeni številki. Za neskončno število vnosov izberite -1." -#: optiondialog.cpp:1094 +#: optiondialog.cpp:1134 #, kde-format msgid "Test your regular expressions" msgstr "Preizkus vaših regularnih izrazov" -#: optiondialog.cpp:1099 +#: optiondialog.cpp:1139 #, kde-format msgid "Irrelevant merge command:" msgstr "Ukaz za združevanje za nepomembne spremembe:" -#: optiondialog.cpp:1104 +#: optiondialog.cpp:1144 #, kde-format msgid "" "If specified this script is run after automerge\n" @@ -2586,12 +2604,12 @@ "če ne bo zaznanih drugih pomembnih sprememb.\n" "Klicano s parametri: ime_datoteke1 ime_datoteke2 ime_datoteke3" -#: optiondialog.cpp:1109 +#: optiondialog.cpp:1149 #, kde-format msgid "Auto save and quit on merge without conflicts" msgstr "Samodejno shrani in končaj ob združevanju brez sporov" -#: optiondialog.cpp:1113 +#: optiondialog.cpp:1153 #, kde-format msgid "" "If KDiff3 was started for a file-merge from the command line and all\n" @@ -2605,27 +2623,27 @@ "samodejno shranjeno in program se bo končal.\n" "(To je podobno možnosti ukazne vrstice \"--auto\".)" -#: optiondialog.cpp:1124 optiondialog.cpp:1125 +#: optiondialog.cpp:1164 optiondialog.cpp:1165 #, kde-format msgid "Directory" msgstr "Mapa" -#: optiondialog.cpp:1137 +#: optiondialog.cpp:1185 #, kde-format msgid "Recursive directories" msgstr "Rekurzivne mape" -#: optiondialog.cpp:1140 +#: optiondialog.cpp:1188 #, kde-format msgid "Whether to analyze subdirectories or not." msgstr "Ali naj bodo preiskane podmape ali ne." -#: optiondialog.cpp:1142 +#: optiondialog.cpp:1190 #, kde-format msgid "File pattern(s):" msgstr "Vzorci datotek:" -#: optiondialog.cpp:1148 +#: optiondialog.cpp:1196 #, kde-format msgid "" "Pattern(s) of files to be analyzed. \n" @@ -2636,12 +2654,12 @@ "Nadomestni znaki: '*' in '?'\n" "Z uporabo ločilnika ';' lahko določite več vzorcev." -#: optiondialog.cpp:1153 +#: optiondialog.cpp:1201 #, kde-format msgid "File-anti-pattern(s):" msgstr "Vzorci za izključevanje datotek:" -#: optiondialog.cpp:1159 +#: optiondialog.cpp:1207 #, kde-format msgid "" "Pattern(s) of files to be excluded from analysis. \n" @@ -2652,12 +2670,12 @@ "Nadomestni znaki: '*' in '?'\n" "Z uporabo ločilnika ';' lahko določite več vzorcev." -#: optiondialog.cpp:1164 +#: optiondialog.cpp:1212 #, kde-format msgid "Dir-anti-pattern(s):" msgstr "Vzorci za izključevanje map:" -#: optiondialog.cpp:1170 +#: optiondialog.cpp:1218 #, kde-format msgid "" "Pattern(s) of directories to be excluded from analysis. \n" @@ -2668,12 +2686,12 @@ "Nadomestni znaki: '*' in '?'\n" "Z uporabo ločilnika ';' lahko določite več vzorcev." -#: optiondialog.cpp:1175 +#: optiondialog.cpp:1223 #, kde-format msgid "Use .cvsignore" msgstr "Uporabi .cvsignore" -#: optiondialog.cpp:1179 +#: optiondialog.cpp:1227 #, kde-format msgid "" "Extends the antipattern to anything that would be ignored by CVS.\n" @@ -2682,23 +2700,23 @@ "Razširi vzorce izključevanja z vsem kar bi prezrl CVS.\n" "Z uporabo krajevnih datotek \".cvsignore\" je lahko to določeno za mape." -#: optiondialog.cpp:1183 +#: optiondialog.cpp:1231 #, kde-format msgid "Find hidden files and directories" msgstr "Najdi skrite datoteke in mape" -#: optiondialog.cpp:1186 +#: optiondialog.cpp:1234 #, fuzzy, kde-format #| msgid "Find hidden files and directories" msgid "Finds hidden files and directories." msgstr "Najdi skrite datoteke in mape" -#: optiondialog.cpp:1189 +#: optiondialog.cpp:1237 #, kde-format msgid "Follow file links" msgstr "Sledi povezavam datotek" -#: optiondialog.cpp:1193 +#: optiondialog.cpp:1241 #, kde-format msgid "" "On: Compare the file the link points to.\n" @@ -2707,12 +2725,12 @@ "Vključeno: primerja datoteko na katero kaže povezava.\n" "Izključeno: primerja povezave." -#: optiondialog.cpp:1197 +#: optiondialog.cpp:1245 #, kde-format msgid "Follow directory links" msgstr "Sledi povezavam map" -#: optiondialog.cpp:1201 +#: optiondialog.cpp:1249 #, kde-format msgid "" "On: Compare the directory the link points to.\n" @@ -2721,12 +2739,12 @@ "Vključeno: primerja mapo na katero kaže povezava.\n" "Izključeno: primerja povezave." -#: optiondialog.cpp:1210 +#: optiondialog.cpp:1258 #, kde-format msgid "Case sensitive filename comparison" msgstr "Loči velikost črk pri primerjavi imen datotek" -#: optiondialog.cpp:1214 +#: optiondialog.cpp:1262 #, kde-format msgid "" "The directory comparison will compare files or directories when their names " @@ -2739,52 +2757,52 @@ "Nastavite to možnost, če se mora ujemate velikost črk imen. (Za Windows je " "to privzeto izključeno, v nasprotnem primeru je vključeno.)" -#: optiondialog.cpp:1218 +#: optiondialog.cpp:1266 #, fuzzy, kde-format #| msgid "Unfold All Subdirs" msgid "Unfold all subdirectories on load" msgstr "Razširi vse podmape" -#: optiondialog.cpp:1222 +#: optiondialog.cpp:1270 #, kde-format msgid "" "On: Unfold all subdirectories when starting a directory diff.\n" "Off: Leave subdirectories folded." msgstr "" -#: optiondialog.cpp:1226 +#: optiondialog.cpp:1274 #, kde-format msgid "Skip directory status report" msgstr "" -#: optiondialog.cpp:1230 +#: optiondialog.cpp:1278 #, kde-format msgid "" "On: Do not show the Directory Comparison Status.\n" "Off: Show the status dialog on start." msgstr "" -#: optiondialog.cpp:1234 +#: optiondialog.cpp:1282 #, kde-format msgid "File Comparison Mode" msgstr "Način primerjave datotek" -#: optiondialog.cpp:1239 +#: optiondialog.cpp:1287 #, kde-format msgid "Binary comparison" msgstr "Dvojiška primerjava" -#: optiondialog.cpp:1241 +#: optiondialog.cpp:1289 #, kde-format msgid "Binary comparison of each file. (Default)" msgstr "Dvojiška primerjave vsake datoteke. (Privzeto)" -#: optiondialog.cpp:1244 +#: optiondialog.cpp:1292 #, kde-format msgid "Full analysis" msgstr "Polno preučevanje" -#: optiondialog.cpp:1246 +#: optiondialog.cpp:1294 #, kde-format msgid "" "Do a full analysis and show statistics information in extra columns.\n" @@ -2794,12 +2812,12 @@ "stolpcih.\n" "(Počasneje kot dvojiška primerjava, zelo počasno za dvojiške datoteke.)" -#: optiondialog.cpp:1250 +#: optiondialog.cpp:1298 #, kde-format msgid "Trust the size and modification date (unsafe)" msgstr "Zaupaj velikosti in datumu spremembe (ni varno)" -#: optiondialog.cpp:1252 +#: optiondialog.cpp:1300 #, kde-format msgid "" "Assume that files are equal if the modification date and file length are " @@ -2814,7 +2832,7 @@ "kot različne.\n" "Uporabno za velike mape ali počasna omrežja." -#: optiondialog.cpp:1257 +#: optiondialog.cpp:1305 #, kde-format msgid "" "Trust the size and date, but use binary comparison if date does not match " @@ -2823,7 +2841,7 @@ "Zaupaj velikosti in datumu, ampak uporabi dvojiško primerjavo, če se datum " "ne ujema (ni varno)" -#: optiondialog.cpp:1259 +#: optiondialog.cpp:1307 #, kde-format msgid "" "Assume that files are equal if the modification date and file length are " @@ -2837,12 +2855,12 @@ "uporabljena dvojiška primerjava.\n" "Uporabno za velike mape ali počasna omrežja." -#: optiondialog.cpp:1264 +#: optiondialog.cpp:1312 #, kde-format msgid "Trust the size (unsafe)" msgstr "Zaupaj velikosti (ni varno)" -#: optiondialog.cpp:1266 +#: optiondialog.cpp:1314 #, kde-format msgid "" "Assume that files are equal if their file lengths are equal.\n" @@ -2853,12 +2871,12 @@ "Uporabno za velike mape ali počasna omrežja, če je med prejemom spremenjen " "datum." -#: optiondialog.cpp:1273 +#: optiondialog.cpp:1321 #, kde-format msgid "Synchronize directories" msgstr "Uskladi mape" -#: optiondialog.cpp:1277 +#: optiondialog.cpp:1325 #, kde-format msgid "" "Offers to store files in both directories so that\n" @@ -2869,12 +2887,12 @@ "da je na koncu njuna vsebina enaka.\n" "Deluje samo ob primerjavi map, brez da navedete cilj." -#: optiondialog.cpp:1283 +#: optiondialog.cpp:1331 #, kde-format msgid "White space differences considered equal" msgstr "Razlike v preslednih znakih niso pomembne" -#: optiondialog.cpp:1287 +#: optiondialog.cpp:1335 #, kde-format msgid "" "If files differ only by white space consider them equal.\n" @@ -2884,12 +2902,12 @@ "enaki.\n" "To je omogočeno le, če je izbrano polno preučevanje." -#: optiondialog.cpp:1293 +#: optiondialog.cpp:1341 #, kde-format msgid "Copy newer instead of merging (unsafe)" msgstr "Kopiraj novejše namesto združevanja (ni varno)" -#: optiondialog.cpp:1297 +#: optiondialog.cpp:1345 #, fuzzy, kde-format #| msgid "" #| "Don't look inside, just take the newer file.\n" @@ -2904,12 +2922,12 @@ "(To uporabite le, če veste kaj delate!)\n" "To je omogočeno le, če primerjate dve mapi." -#: optiondialog.cpp:1302 +#: optiondialog.cpp:1350 #, kde-format msgid "Backup files (.orig)" msgstr "Ustvari varnostno kopijo (.orig)" -#: optiondialog.cpp:1306 +#: optiondialog.cpp:1354 #, kde-format msgid "" "If a file would be saved over an old file, then the old file\n" @@ -2919,17 +2937,17 @@ "bo stara datoteka preimenovana. Dodana ji bo pripona '.orig'\n" "namesto izbrisa." -#: optiondialog.cpp:1382 optiondialog.cpp:1383 +#: optiondialog.cpp:1430 optiondialog.cpp:1431 #, kde-format msgid "Regional Settings" msgstr "Območne nastavitve" -#: optiondialog.cpp:1397 +#: optiondialog.cpp:1454 #, kde-format msgid "Use the same encoding for everything:" msgstr "Uporabi enako kodiranje za vse:" -#: optiondialog.cpp:1401 +#: optiondialog.cpp:1458 #, kde-format msgid "" "Enable this allows to change all encodings by changing the first only.\n" @@ -2938,18 +2956,18 @@ "Če to omogočite, bodo vsa kodiranja spremenjena le s spremembo prvega.\n" "Onemogočite to, če so zahtevane različne edinstvene nastavitve." -#: optiondialog.cpp:1405 +#: optiondialog.cpp:1462 #, fuzzy, kde-format #| msgid "Note: Local Encoding is " msgid "Note: Local Encoding is \"%1\"" msgstr "Opomba: krajevno kodiranje je " -#: optiondialog.cpp:1409 +#: optiondialog.cpp:1466 #, kde-format msgid "File Encoding for A:" msgstr "Kodiranje datoteke A:" -#: optiondialog.cpp:1416 +#: optiondialog.cpp:1473 #, kde-format msgid "" "If enabled then Unicode (UTF-16 or UTF-8) encoding will be detected.\n" @@ -2962,32 +2980,32 @@ "možnost.\n" "(Zaznavanje Unicode temelji na prvih bajtih datoteke.)" -#: optiondialog.cpp:1419 optiondialog.cpp:1430 optiondialog.cpp:1441 +#: optiondialog.cpp:1476 optiondialog.cpp:1487 optiondialog.cpp:1498 #, kde-format msgid "Auto Detect Unicode" msgstr "Samodejno zaznaj Unicode" -#: optiondialog.cpp:1425 +#: optiondialog.cpp:1482 #, kde-format msgid "File Encoding for B:" msgstr "Kodiranje datoteke B:" -#: optiondialog.cpp:1436 +#: optiondialog.cpp:1493 #, kde-format msgid "File Encoding for C:" msgstr "Kodiranje datoteke C:" -#: optiondialog.cpp:1447 +#: optiondialog.cpp:1504 #, kde-format msgid "File Encoding for Merge Output and Saving:" msgstr "Kodiranje datoteke za združevanje izhoda in shranjevanje:" -#: optiondialog.cpp:1452 +#: optiondialog.cpp:1509 #, kde-format msgid "Auto Select" msgstr "Samodejno izberi" -#: optiondialog.cpp:1456 +#: optiondialog.cpp:1513 #, kde-format msgid "" "If enabled then the encoding from the input files is used.\n" @@ -2998,17 +3016,17 @@ "V dvoumnih primerih bo pogovorno okno vprašalo uporabnika naj izbere " "kodiranje za shranjevanje." -#: optiondialog.cpp:1459 +#: optiondialog.cpp:1516 #, kde-format msgid "File Encoding for Preprocessor Files:" msgstr "Kodiranje za datoteke predobdelovalnika" -#: optiondialog.cpp:1471 +#: optiondialog.cpp:1528 #, kde-format msgid "Right To Left Language" msgstr "Jezik za desno proti levi" -#: optiondialog.cpp:1475 +#: optiondialog.cpp:1532 #, kde-format msgid "" "Some languages are read from right to left.\n" @@ -3017,22 +3035,22 @@ "Nekateri jeziki so brani od desne proti levi.\n" "Ta nastavitev bo primerno spremenila pregledovalnik in urejevalnik." -#: optiondialog.cpp:1485 +#: optiondialog.cpp:1542 #, kde-format msgid "Integration" msgstr "Omogočanje podpore" -#: optiondialog.cpp:1486 +#: optiondialog.cpp:1543 #, kde-format msgid "Integration Settings" msgstr "Nastavitve omogočanja podpore" -#: optiondialog.cpp:1499 +#: optiondialog.cpp:1564 #, kde-format msgid "Command line options to ignore:" msgstr "Možnosti ukazne vrstice, ki bodo prezrte:" -#: optiondialog.cpp:1505 +#: optiondialog.cpp:1570 #, kde-format msgid "" "List of command line options that should be ignored when KDiff3 is used by " @@ -3045,12 +3063,12 @@ "Navedete lahko več vrednosti ločenih z ';'\n" "To bo preprečilo napako \"Neznana možnost\"." -#: optiondialog.cpp:1510 +#: optiondialog.cpp:1575 #, kde-format msgid "Quit also via Escape key" msgstr "Končaj tudi preko tipke Escape" -#: optiondialog.cpp:1514 +#: optiondialog.cpp:1579 #, kde-format msgid "" "Fast method to exit.\n" @@ -3058,7 +3076,7 @@ msgstr "" "Hiter način za izhod, za tiste, ki so navajeni na uporabo tipke Escape." -#: optiondialog.cpp:1598 +#: optiondialog.cpp:1653 #, kde-format msgid "This resets all options. Not only those of the current topic." msgstr "To ponastavi vse možnosti, ne samo tiste za trenutno temo." @@ -3113,79 +3131,70 @@ msgid "Disable Unsafe Options" msgstr "Onemogoči nevarne možnosti" -#: pdiff.cpp:158 +#: pdiff.cpp:160 #, kde-format msgid "Loading A" msgstr "Nalaganje A" -#: pdiff.cpp:167 -#, kde-format -msgid "Errors occurred during pre-processing of file A." -msgstr "" +#: pdiff.cpp:162 +#, fuzzy, kde-format +#| msgid "Loading A" +msgid "Loading A: %1" +msgstr "Nalaganje A" -#: pdiff.cpp:172 +#: pdiff.cpp:170 #, kde-format msgid "Loading B" msgstr "Nalaganje B" -#: pdiff.cpp:179 -#, kde-format -msgid "Errors occurred during pre-processing of file B." -msgstr "" - -#: pdiff.cpp:202 pdiff.cpp:241 +#: pdiff.cpp:201 pdiff.cpp:237 #, kde-format msgid "Diff: A <-> B" msgstr "Diff: A <-> B" -#: pdiff.cpp:208 pdiff.cpp:279 pdiff.cpp:293 +#: pdiff.cpp:207 pdiff.cpp:275 pdiff.cpp:289 #, kde-format msgid "Linediff: A <-> B" msgstr "Linediff: A <-> B" -#: pdiff.cpp:225 +#: pdiff.cpp:224 #, kde-format msgid "Loading C" msgstr "Nalaganje C" -#: pdiff.cpp:232 -#, kde-format -msgid "Errors occurred during pre-processing of file C." -msgstr "" - -#: pdiff.cpp:250 +#: pdiff.cpp:246 #, kde-format msgid "Diff: A <-> C" msgstr "Diff: A <-> C" -#: pdiff.cpp:261 +#: pdiff.cpp:257 #, kde-format msgid "Diff: B <-> C" msgstr "Diff: B <-> C" -#: pdiff.cpp:283 pdiff.cpp:297 +#: pdiff.cpp:279 pdiff.cpp:293 #, kde-format msgid "Linediff: B <-> C" msgstr "Linediff: B <-> C" -#: pdiff.cpp:287 pdiff.cpp:301 +#: pdiff.cpp:283 pdiff.cpp:297 #, kde-format msgid "Linediff: A <-> C" msgstr "Linediff: A <-> C" -#: pdiff.cpp:829 +#: pdiff.cpp:819 #, kde-format msgid "All input files contain the same text, but are not binary equal." msgstr "" "Vse vhodne datoteke vsebujejo enako besedilo, ampak niso dvojiško enake." -#: pdiff.cpp:835 pdiff.cpp:839 pdiff.cpp:843 +#: pdiff.cpp:825 pdiff.cpp:829 pdiff.cpp:833 #, kde-format msgid "Files %1 and %2 have equal text, but are not binary equal. \n" msgstr "" "Datoteki %1 in %2 vsebujeta enako besedilo, ampak nista dvojiško enaki. \n" -#: pdiff.cpp:853 +#: pdiff.cpp:843 #, fuzzy, kde-format #| msgid "" #| "Some inputfiles don't seem to be pure textfiles.\n" @@ -3200,17 +3209,17 @@ "Zapomnite si, da združevanje s KDiff3 ni bilo narejeno za dvojiške podatke.\n" "Nadaljujte na lastno odgovornost." -#: pdiff.cpp:863 +#: pdiff.cpp:853 #, kde-format msgid ", B" msgstr "" -#: pdiff.cpp:865 +#: pdiff.cpp:855 #, kde-format msgid ", C" msgstr "" -#: pdiff.cpp:867 +#: pdiff.cpp:857 #, fuzzy, kde-format #| msgid "" #| "Some input characters could not be converted to valid unicode.\n" @@ -3230,77 +3239,72 @@ "odgovornost.\n" "Prizadete vhodne datoteke so v %1." -#: pdiff.cpp:1034 +#: pdiff.cpp:1032 #, kde-format msgid "Abort" msgstr "Prekini" -#: pdiff.cpp:1040 pdiff.cpp:1130 +#: pdiff.cpp:1038 pdiff.cpp:1129 #, kde-format msgid "Opening files..." msgstr "Odpiranje datotek ..." -#: pdiff.cpp:1107 -#, kde-format -msgid "File open error" -msgstr "Napaka med odpiranjem datoteke" - -#: pdiff.cpp:1202 +#: pdiff.cpp:1212 #, kde-format msgid "Cutting selection..." msgstr "Izrezovanje izbora ..." -#: pdiff.cpp:1223 +#: pdiff.cpp:1233 #, kde-format msgid "Copying selection to clipboard..." msgstr "Kopiranje izbora v odložišče ..." -#: pdiff.cpp:1239 +#: pdiff.cpp:1249 #, kde-format msgid "Inserting clipboard contents..." msgstr "Vstavljanje vsebine odložišča ..." -#: pdiff.cpp:1695 +#: pdiff.cpp:1705 #, kde-format msgid "Word wrap (Cancel disables word wrap)" msgstr "" -#: pdiff.cpp:1696 +#: pdiff.cpp:1706 #, kde-format msgid "Calculating max width for horizontal scrollbar" msgstr "" -#: pdiff.cpp:1911 +#: pdiff.cpp:1921 #, kde-format msgid "Save && Continue" msgstr "Shrani in nadaljuj" -#: pdiff.cpp:1912 +#: pdiff.cpp:1922 #, kde-format msgid "Continue Without Saving" msgstr "Nadaljuj brez shranjevanja" -#: pdiff.cpp:2124 +#: pdiff.cpp:2134 #, kde-format msgid "Search complete." msgstr "Iskanje je zaključeno." -#: pdiff.cpp:2124 +#: pdiff.cpp:2134 #, kde-format msgid "Search Complete" msgstr "Iskanje je zaključeno" -#: pdiff.cpp:2375 +#: pdiff.cpp:2385 #, kde-format msgid "Nothing is selected in either diff input window." msgstr "Nič ni izbrano v nobenem izmed oken z vhodi diff" -#: pdiff.cpp:2375 +#: pdiff.cpp:2385 #, kde-format msgid "Error while adding manual diff range" msgstr "Napaka med dodajanjem ročnega obsega diff" -#: progress.cpp:59 progress.cpp:71 +#: progress.cpp:61 progress.cpp:73 #, kde-format msgid "&Cancel" msgstr "&Prekliči" @@ -3310,128 +3314,128 @@ msgid "A (Base):" msgstr "A (osnova):" -#: smalldialogs.cpp:68 smalldialogs.cpp:85 smalldialogs.cpp:102 -#: smalldialogs.cpp:144 +#: smalldialogs.cpp:71 smalldialogs.cpp:90 smalldialogs.cpp:109 +#: smalldialogs.cpp:154 #, kde-format msgid "File..." msgstr "Datoteka ..." -#: smalldialogs.cpp:70 smalldialogs.cpp:87 smalldialogs.cpp:104 -#: smalldialogs.cpp:146 +#: smalldialogs.cpp:73 smalldialogs.cpp:92 smalldialogs.cpp:111 +#: smalldialogs.cpp:156 #, kde-format msgid "Dir..." msgstr "Mapa ..." -#: smalldialogs.cpp:96 +#: smalldialogs.cpp:103 #, kde-format msgid "C (Optional):" msgstr "C (izbirno):" -#: smalldialogs.cpp:119 +#: smalldialogs.cpp:126 #, fuzzy, kde-format #| msgid "Swap/Copy Names ..." msgid "Swap/Copy Names..." msgstr "Zamenjaj/kopiraj imena ..." -#: smalldialogs.cpp:124 smalldialogs.cpp:125 smalldialogs.cpp:126 +#: smalldialogs.cpp:131 smalldialogs.cpp:132 smalldialogs.cpp:133 #, kde-format msgid "Swap %1<->%2" msgstr "Zamenjaj %1 <-> %2" -#: smalldialogs.cpp:127 smalldialogs.cpp:128 smalldialogs.cpp:129 +#: smalldialogs.cpp:134 smalldialogs.cpp:135 smalldialogs.cpp:136 #, kde-format msgid "Copy %1->Output" msgstr "Kopiraj %1 -> Izhod" -#: smalldialogs.cpp:130 smalldialogs.cpp:131 smalldialogs.cpp:132 +#: smalldialogs.cpp:137 smalldialogs.cpp:138 smalldialogs.cpp:139 #, kde-format msgid "Swap %1<->Output" msgstr "Zamenjaj %1 <-> Izhod" -#: smalldialogs.cpp:138 +#: smalldialogs.cpp:148 #, kde-format msgid "Output (optional):" msgstr "Izpis (izbirno):" -#: smalldialogs.cpp:168 +#: smalldialogs.cpp:178 #, kde-format msgid "Configure..." msgstr "Nastavi ..." -#: smalldialogs.cpp:233 +#: smalldialogs.cpp:243 #, fuzzy, kde-format #| msgid "Directory" msgid "Open Directory" msgstr "Mapa" -#: smalldialogs.cpp:234 +#: smalldialogs.cpp:244 #, kde-format msgid "Select Output File" msgstr "" -#: smalldialogs.cpp:393 +#: smalldialogs.cpp:403 #, kde-format msgid "Search text:" msgstr "Poišči besedilo" -#: smalldialogs.cpp:400 +#: smalldialogs.cpp:410 #, kde-format msgid "Case sensitive" msgstr "Ločevanje velikosti črk" -#: smalldialogs.cpp:403 +#: smalldialogs.cpp:413 #, kde-format msgid "Search A" msgstr "Najdi v A" -#: smalldialogs.cpp:408 +#: smalldialogs.cpp:418 #, kde-format msgid "Search B" msgstr "Najdi v B" -#: smalldialogs.cpp:413 +#: smalldialogs.cpp:423 #, kde-format msgid "Search C" msgstr "Najdi v C" -#: smalldialogs.cpp:418 +#: smalldialogs.cpp:428 #, kde-format msgid "Search output" msgstr "Najdi v izpisu" -#: smalldialogs.cpp:425 +#: smalldialogs.cpp:435 #, kde-format msgid "&Search" msgstr "Po&išči" -#: smalldialogs.cpp:444 +#: smalldialogs.cpp:454 #, kde-format msgid "Regular Expression Tester" msgstr "Preizkuševalnik regularnih izrazov" -#: smalldialogs.cpp:457 +#: smalldialogs.cpp:467 #, kde-format msgid "Example auto merge line:" msgstr "Primer vrstice za samodejno združevanje:" -#: smalldialogs.cpp:459 +#: smalldialogs.cpp:469 #, kde-format msgid "To test auto merge, copy a line as used in your files." msgstr "" "Da preizkusite samodejno združevanje, kopirajte vrstico, kot je uporabljena " "v vaših datotekah." -#: smalldialogs.cpp:465 smalldialogs.cpp:493 smalldialogs.cpp:529 +#: smalldialogs.cpp:475 smalldialogs.cpp:503 smalldialogs.cpp:539 #, kde-format msgid "Match result:" msgstr "Ujemanje rezultata:" -#: smalldialogs.cpp:484 +#: smalldialogs.cpp:494 #, kde-format msgid "Example history start line (with leading comment):" msgstr "Primer začetne vrstice zgodovine (z vodilno opombo):" -#: smalldialogs.cpp:486 +#: smalldialogs.cpp:496 #, kde-format msgid "" "Copy a history start line as used in your files,\n" @@ -3440,17 +3444,17 @@ "Kopirajte začetno vrstico zgodovino, kot je uporabljena\n" "v vaših datotekah, skupaj z vodilno opombo." -#: smalldialogs.cpp:512 +#: smalldialogs.cpp:522 #, kde-format msgid "History sort key order:" msgstr "Vrstni red ključa vnosa zgodovine:" -#: smalldialogs.cpp:520 +#: smalldialogs.cpp:530 #, kde-format msgid "Example history entry start line (without leading comment):" msgstr "Primer začetne vrstice zgodovine (brez vodilne opombe):" -#: smalldialogs.cpp:522 +#: smalldialogs.cpp:532 #, kde-format msgid "" "Copy a history entry start line as used in your files,\n" @@ -3459,48 +3463,48 @@ "Kopirajte začetno vrstico zgodovino, kot je uporabljena\n" "v vaših datotekah, ampak izpustite vodilno opombo." -#: smalldialogs.cpp:536 +#: smalldialogs.cpp:546 #, kde-format msgid "Sort key result:" msgstr "Rezultat ključa razvrščanja:" -#: smalldialogs.cpp:584 smalldialogs.cpp:594 smalldialogs.cpp:614 +#: smalldialogs.cpp:594 smalldialogs.cpp:604 smalldialogs.cpp:624 #, kde-format msgid "Match success." msgstr "Uspeh ujemanja. " -#: smalldialogs.cpp:588 smalldialogs.cpp:598 smalldialogs.cpp:620 +#: smalldialogs.cpp:598 smalldialogs.cpp:608 smalldialogs.cpp:630 #, kde-format msgid "Match failed." msgstr "Ujemanje je spodletelo." -#: smalldialogs.cpp:605 +#: smalldialogs.cpp:615 #, kde-format msgid "Opening and closing parentheses do not match in regular expression." msgstr "Uklepaj in zaklepaj se ne ujemata v regularnem izrazu." -#: SourceData.cpp:150 +#: SourceData.cpp:153 #, kde-format msgid "Writing clipboard data to temp file failed." msgstr "Zapisovanje podatkov iz odložišča v začasno datoteko je spodletelo." -#: SourceData.cpp:154 +#: SourceData.cpp:157 #, kde-format msgid "From Clipboard" msgstr "Iz odložišča" -#: SourceData.cpp:335 +#: SourceData.cpp:348 #, fuzzy, kde-format #| msgid "Mix of links and normal files." msgid "%1 is not a normal file." msgstr "Mešanica povezav in običajnih datotek." -#: SourceData.cpp:427 +#: SourceData.cpp:440 #, kde-format msgid " Temp file is: %1" msgstr "" -#: SourceData.cpp:432 +#: SourceData.cpp:445 #, kde-format msgid "" "Preprocessing possibly failed. Check this command:\n" @@ -3515,12 +3519,12 @@ "\n" "Ukaz za predobdelavo bo sedaj onemogočen." -#: SourceData.cpp:443 SourceData.cpp:512 +#: SourceData.cpp:456 SourceData.cpp:525 #, kde-format msgid "File %1 too large to process. Skipping." msgstr "" -#: SourceData.cpp:487 +#: SourceData.cpp:500 #, kde-format msgid "" "The line-matching-preprocessing possibly failed. Check this command:\n" diff -Nru kdiff3-1.8.01/po/sr/kdiff3fileitemactionplugin.po kdiff3-1.8.3/po/sr/kdiff3fileitemactionplugin.po --- kdiff3-1.8.01/po/sr/kdiff3fileitemactionplugin.po 2019-05-18 01:02:25.000000000 +0000 +++ kdiff3-1.8.3/po/sr/kdiff3fileitemactionplugin.po 2020-06-25 00:18:51.000000000 +0000 @@ -3,8 +3,8 @@ msgid "" msgstr "" "Project-Id-Version: kdiff3fileitemactionplugin\n" -"Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2019-03-22 03:09+0100\n" +"Report-Msgid-Bugs-To: https://bugs.kde.org\n" +"POT-Creation-Date: 2019-08-30 07:40+0200\n" "PO-Revision-Date: 2017-09-28 17:57+0200\n" "Last-Translator: Chusslove Illich \n" "Language-Team: Serbian \n" diff -Nru kdiff3-1.8.01/po/sr/kdiff3.po kdiff3-1.8.3/po/sr/kdiff3.po --- kdiff3-1.8.01/po/sr/kdiff3.po 2019-05-18 01:02:25.000000000 +0000 +++ kdiff3-1.8.3/po/sr/kdiff3.po 2020-06-25 00:18:51.000000000 +0000 @@ -4,8 +4,8 @@ msgid "" msgstr "" "Project-Id-Version: kdiff3\n" -"Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2019-03-30 07:52+0100\n" +"Report-Msgid-Bugs-To: https://bugs.kde.org\n" +"POT-Creation-Date: 2020-06-15 06:48+0200\n" "PO-Revision-Date: 2017-09-28 17:57+0200\n" "Last-Translator: Chusslove Illich \n" "Language-Team: Serbian \n" @@ -30,301 +30,301 @@ msgid "Your emails" msgstr "slsimic@gmail.com,caslav.ilic@gmx.net" -#: difftextwindow.cpp:412 +#: difftextwindow.cpp:414 #, kde-format msgid "File %1: Line %2" msgstr "" -#: difftextwindow.cpp:414 +#: difftextwindow.cpp:416 #, fuzzy, kde-format #| msgid "Line not available" msgid "File %1: Line not available" msgstr "ред недоступан" -#: difftextwindow.cpp:1780 +#: difftextwindow.cpp:1778 #, kde-format msgid "Encoding:" msgstr "Кодирање:" -#: difftextwindow.cpp:1782 mergeresultwindow.cpp:3138 optiondialog.cpp:818 +#: difftextwindow.cpp:1781 mergeresultwindow.cpp:3166 optiondialog.cpp:840 #, kde-format msgid "Line end style:" msgstr "Стил краја редова:" -#: difftextwindow.cpp:1810 directorymergewindow.cpp:382 -#: directorymergewindow.cpp:433 directorymergewindow.cpp:524 -#: directorymergewindow.cpp:3058 directorymergewindow.cpp:3189 -#: directorymergewindow.cpp:3417 mergeresultwindow.cpp:942 -#: mergeresultwindow.cpp:944 mergeresultwindow.cpp:946 -#: mergeresultwindow.cpp:948 mergeresultwindow.cpp:1814 -#: mergeresultwindow.cpp:3170 mergeresultwindow.cpp:3177 optiondialog.cpp:962 -#: optiondialog.cpp:975 pdiff.cpp:833 pdiff.cpp:835 pdiff.cpp:837 pdiff.cpp:839 -#: pdiff.cpp:861 smalldialogs.cpp:124 smalldialogs.cpp:126 smalldialogs.cpp:127 -#: smalldialogs.cpp:130 +#: difftextwindow.cpp:1809 directorymergewindow.cpp:383 +#: directorymergewindow.cpp:434 directorymergewindow.cpp:525 +#: directorymergewindow.cpp:3069 directorymergewindow.cpp:3200 +#: directorymergewindow.cpp:3428 mergeresultwindow.cpp:970 +#: mergeresultwindow.cpp:972 mergeresultwindow.cpp:974 +#: mergeresultwindow.cpp:976 mergeresultwindow.cpp:1842 +#: mergeresultwindow.cpp:3198 mergeresultwindow.cpp:3205 optiondialog.cpp:1002 +#: optiondialog.cpp:1015 pdiff.cpp:844 pdiff.cpp:846 pdiff.cpp:848 +#: pdiff.cpp:850 pdiff.cpp:872 smalldialogs.cpp:131 smalldialogs.cpp:133 +#: smalldialogs.cpp:134 smalldialogs.cpp:137 #, kde-format msgid "A" msgstr "А" -#: difftextwindow.cpp:1810 directorymergewindow.cpp:384 -#: directorymergewindow.cpp:436 directorymergewindow.cpp:526 -#: directorymergewindow.cpp:3064 directorymergewindow.cpp:3190 -#: directorymergewindow.cpp:3418 mergeresultwindow.cpp:942 -#: mergeresultwindow.cpp:944 mergeresultwindow.cpp:950 -#: mergeresultwindow.cpp:952 mergeresultwindow.cpp:1816 -#: mergeresultwindow.cpp:3172 mergeresultwindow.cpp:3179 optiondialog.cpp:963 -#: optiondialog.cpp:976 pdiff.cpp:833 pdiff.cpp:835 pdiff.cpp:841 pdiff.cpp:843 -#: pdiff.cpp:863 smalldialogs.cpp:124 smalldialogs.cpp:125 smalldialogs.cpp:128 -#: smalldialogs.cpp:131 +#: difftextwindow.cpp:1809 directorymergewindow.cpp:385 +#: directorymergewindow.cpp:437 directorymergewindow.cpp:527 +#: directorymergewindow.cpp:3075 directorymergewindow.cpp:3201 +#: directorymergewindow.cpp:3429 mergeresultwindow.cpp:970 +#: mergeresultwindow.cpp:972 mergeresultwindow.cpp:978 +#: mergeresultwindow.cpp:980 mergeresultwindow.cpp:1844 +#: mergeresultwindow.cpp:3200 mergeresultwindow.cpp:3207 optiondialog.cpp:1003 +#: optiondialog.cpp:1016 pdiff.cpp:844 pdiff.cpp:846 pdiff.cpp:852 +#: pdiff.cpp:854 pdiff.cpp:874 smalldialogs.cpp:131 smalldialogs.cpp:132 +#: smalldialogs.cpp:135 smalldialogs.cpp:138 #, kde-format msgid "B" msgstr "Б" -#: difftextwindow.cpp:1810 directorymergewindow.cpp:386 -#: directorymergewindow.cpp:439 directorymergewindow.cpp:528 -#: directorymergewindow.cpp:3070 directorymergewindow.cpp:3191 -#: directorymergewindow.cpp:3419 mergeresultwindow.cpp:946 -#: mergeresultwindow.cpp:948 mergeresultwindow.cpp:950 -#: mergeresultwindow.cpp:952 mergeresultwindow.cpp:1818 -#: mergeresultwindow.cpp:3174 mergeresultwindow.cpp:3181 optiondialog.cpp:977 -#: pdiff.cpp:837 pdiff.cpp:839 pdiff.cpp:841 pdiff.cpp:843 pdiff.cpp:865 -#: smalldialogs.cpp:125 smalldialogs.cpp:126 smalldialogs.cpp:129 -#: smalldialogs.cpp:132 +#: difftextwindow.cpp:1809 directorymergewindow.cpp:387 +#: directorymergewindow.cpp:440 directorymergewindow.cpp:529 +#: directorymergewindow.cpp:3081 directorymergewindow.cpp:3202 +#: directorymergewindow.cpp:3430 mergeresultwindow.cpp:974 +#: mergeresultwindow.cpp:976 mergeresultwindow.cpp:978 +#: mergeresultwindow.cpp:980 mergeresultwindow.cpp:1846 +#: mergeresultwindow.cpp:3202 mergeresultwindow.cpp:3209 optiondialog.cpp:1017 +#: pdiff.cpp:848 pdiff.cpp:850 pdiff.cpp:852 pdiff.cpp:854 pdiff.cpp:876 +#: smalldialogs.cpp:132 smalldialogs.cpp:133 smalldialogs.cpp:136 +#: smalldialogs.cpp:139 #, kde-format msgid "C" msgstr "Ц" -#: difftextwindow.cpp:1810 +#: difftextwindow.cpp:1809 #, fuzzy, kde-format #| msgid "A (Base):" msgid "A (Base)" msgstr "А (база):" -#: difftextwindow.cpp:1812 +#: difftextwindow.cpp:1811 #, fuzzy, kde-format #| msgid "Encoding:" msgid "Encoding: %1" msgstr "Кодирање:" -#: difftextwindow.cpp:1813 mergeresultwindow.cpp:3183 +#: difftextwindow.cpp:1812 mergeresultwindow.cpp:3211 #, kde-format msgid "Unix" msgstr "Уникс" -#: difftextwindow.cpp:1813 mergeresultwindow.cpp:3184 +#: difftextwindow.cpp:1812 mergeresultwindow.cpp:3212 #, kde-format msgid "DOS" msgstr "ДОС" -#: difftextwindow.cpp:1813 +#: difftextwindow.cpp:1812 #, fuzzy, kde-format #| msgid "Line end style:" msgid "Line end style: %1" msgstr "Стил краја редова:" # >! Merge whole string. -#: difftextwindow.cpp:1835 kdiff3.cpp:873 +#: difftextwindow.cpp:1834 kdiff3.cpp:874 #, kde-format msgid "Top line" msgstr "Први ред" -#: difftextwindow.cpp:1845 +#: difftextwindow.cpp:1843 #, kde-format msgid "End" msgstr "Крај" -#: difftextwindow.cpp:1903 smalldialogs.cpp:235 +#: difftextwindow.cpp:1901 smalldialogs.cpp:245 #, fuzzy, kde-format #| msgid "Opening files..." msgid "Open File" msgstr "Отварам фајлове..." -#: difftextwindow.cpp:1951 optiondialog.cpp:387 +#: difftextwindow.cpp:1943 optiondialog.cpp:389 #, kde-format msgid "Unicode, 8 bit" msgstr "уникод, 8‑битни" -#: difftextwindow.cpp:1966 +#: difftextwindow.cpp:1958 #, kde-format msgid "Other" msgstr "" -#: directorymergewindow.cpp:409 directorymergewindow.cpp:3424 +#: directorymergewindow.cpp:410 directorymergewindow.cpp:3435 #, kde-format msgid "Copy A to B" msgstr "Копирај А у Б" -#: directorymergewindow.cpp:412 directorymergewindow.cpp:3425 +#: directorymergewindow.cpp:413 directorymergewindow.cpp:3436 #, kde-format msgid "Copy B to A" msgstr "Копирај Б у А" -#: directorymergewindow.cpp:415 directorymergewindow.cpp:3426 +#: directorymergewindow.cpp:416 directorymergewindow.cpp:3437 #, kde-format msgid "Delete A" msgstr "Обриши А" -#: directorymergewindow.cpp:418 directorymergewindow.cpp:3427 +#: directorymergewindow.cpp:419 directorymergewindow.cpp:3438 #, kde-format msgid "Delete B" msgstr "Обриши Б" -#: directorymergewindow.cpp:421 +#: directorymergewindow.cpp:422 #, kde-format msgid "Delete A & B" msgstr "Обриши А и Б" -#: directorymergewindow.cpp:424 directorymergewindow.cpp:3429 +#: directorymergewindow.cpp:425 directorymergewindow.cpp:3440 #, kde-format msgid "Merge to A" msgstr "Стопи у А" -#: directorymergewindow.cpp:427 directorymergewindow.cpp:3430 +#: directorymergewindow.cpp:428 directorymergewindow.cpp:3441 #, kde-format msgid "Merge to B" msgstr "Стопи у Б" -#: directorymergewindow.cpp:430 +#: directorymergewindow.cpp:431 #, kde-format msgid "Merge to A & B" msgstr "Стопи у А и Б" -#: directorymergewindow.cpp:442 directorymergewindow.cpp:3421 +#: directorymergewindow.cpp:443 directorymergewindow.cpp:3432 #, kde-format msgid "Delete (if exists)" msgstr "Обриши (ако постоји)" -#: directorymergewindow.cpp:445 directorymergewindow.cpp:448 -#: directorymergewindow.cpp:3420 optiondialog.cpp:925 smalldialogs.cpp:113 +#: directorymergewindow.cpp:446 directorymergewindow.cpp:449 +#: directorymergewindow.cpp:3431 smalldialogs.cpp:120 #, kde-format msgid "Merge" msgstr "Стопи" -#: directorymergewindow.cpp:445 directorymergewindow.cpp:448 +#: directorymergewindow.cpp:446 directorymergewindow.cpp:449 #, kde-format msgid "Merge (manual)" msgstr "Стопи (ручно)" -#: directorymergewindow.cpp:451 +#: directorymergewindow.cpp:452 #, kde-format msgid "Error: Conflicting File Types" msgstr "Грешка: сукобљени типови фајлова." -#: directorymergewindow.cpp:454 +#: directorymergewindow.cpp:455 #, kde-format msgid "Error: Changed and Deleted" msgstr "Грешка: измењено и обрисано." -#: directorymergewindow.cpp:457 +#: directorymergewindow.cpp:458 #, kde-format msgid "Error: Dates are equal but files are not." msgstr "Грешка: датуми су једнаки али фајлови нису." -#: directorymergewindow.cpp:471 +#: directorymergewindow.cpp:472 #, fuzzy, kde-format #| msgid "Done." msgid "Done" msgstr "Готово." -#: directorymergewindow.cpp:473 +#: directorymergewindow.cpp:474 #, kde-format msgid "Error" msgstr "Грешка" -#: directorymergewindow.cpp:475 +#: directorymergewindow.cpp:476 #, kde-format msgid "Skipped." msgstr "Прескочено." -#: directorymergewindow.cpp:477 +#: directorymergewindow.cpp:478 #, kde-format msgid "Not saved." msgstr "Није сачувано." -#: directorymergewindow.cpp:479 +#: directorymergewindow.cpp:480 #, kde-format msgid "In progress..." msgstr "У току..." -#: directorymergewindow.cpp:481 +#: directorymergewindow.cpp:482 #, kde-format msgid "To do." msgstr "Урадити." # >> @title:column -#: directorymergewindow.cpp:522 +#: directorymergewindow.cpp:523 #, kde-format msgid "Name" msgstr "име" # >> @title:column -#: directorymergewindow.cpp:530 +#: directorymergewindow.cpp:531 #, kde-format msgid "Operation" msgstr "поступак" # >> @title:column -#: directorymergewindow.cpp:532 +#: directorymergewindow.cpp:533 #, kde-format msgid "Status" msgstr "стање" # >> @title:column -#: directorymergewindow.cpp:534 +#: directorymergewindow.cpp:535 #, kde-format msgid "Unsolved" msgstr "нерешено" # >> @title:column -#: directorymergewindow.cpp:536 +#: directorymergewindow.cpp:537 #, kde-format msgid "Solved" msgstr "решено" # >> non-whitespace # >> @title:column -#: directorymergewindow.cpp:538 +#: directorymergewindow.cpp:539 #, kde-format msgid "Nonwhite" msgstr "непразно" # >> whitespace # >> @title:column -#: directorymergewindow.cpp:540 +#: directorymergewindow.cpp:541 #, kde-format msgid "White" msgstr "празно" -#: directorymergewindow.cpp:674 +#: directorymergewindow.cpp:676 #, kde-format msgid "Unable to compare non-normal file with normal file." msgstr "" -#: directorymergewindow.cpp:688 +#: directorymergewindow.cpp:690 #, kde-format msgid "Mix of links and normal files." msgstr "Мешавина веза и нормалних фајлова." -#: directorymergewindow.cpp:695 +#: directorymergewindow.cpp:697 #, kde-format msgid "Link: " msgstr "Веза: " -#: directorymergewindow.cpp:704 +#: directorymergewindow.cpp:706 #, kde-format msgid "Size. " msgstr "Величина: " -#: directorymergewindow.cpp:718 directorymergewindow.cpp:728 +#: directorymergewindow.cpp:720 directorymergewindow.cpp:730 #, kde-format msgid "Date & Size: " msgstr "Датум и величина: " -#: directorymergewindow.cpp:748 +#: directorymergewindow.cpp:751 #, kde-format msgid "Comparing file..." msgstr "Упоређујем фајл..." -#: directorymergewindow.cpp:801 +#: directorymergewindow.cpp:813 #, kde-format msgid "" "You are currently doing a directory merge. Are you sure, you want to abort " @@ -333,48 +333,48 @@ "Тренутно стапате фасцикле. Желите ли заиста да прекинете стапање и поново " "скенирате фасциклу?" -#: directorymergewindow.cpp:802 kdiff3.cpp:698 kdiff3.cpp:708 kdiff3.cpp:720 -#: mergeresultwindow.cpp:372 pdiff.cpp:1033 pdiff.cpp:1910 pdiff.cpp:1920 +#: directorymergewindow.cpp:814 kdiff3.cpp:697 kdiff3.cpp:707 kdiff3.cpp:719 +#: mergeresultwindow.cpp:400 pdiff.cpp:1052 pdiff.cpp:1930 pdiff.cpp:1940 #, kde-format msgid "Warning" msgstr "Упозорење" -#: directorymergewindow.cpp:803 directorymergewindow.cpp:3393 +#: directorymergewindow.cpp:815 directorymergewindow.cpp:3404 #, kde-format msgid "Rescan" msgstr "Поново скенирај" -#: directorymergewindow.cpp:804 pdiff.cpp:1035 +#: directorymergewindow.cpp:816 pdiff.cpp:1054 #, kde-format msgid "Continue Merging" msgstr "Настави стапање" -#: directorymergewindow.cpp:971 +#: directorymergewindow.cpp:983 #, kde-format msgid "Opening of directories failed:" msgstr "Отварање фасцикли није успело:" -#: directorymergewindow.cpp:975 +#: directorymergewindow.cpp:987 #, kde-format msgid "Dir A \"%1\" does not exist or is not a directory.\n" msgstr "Фасцикла А „%1“ не постоји или није фасцикла.\n" -#: directorymergewindow.cpp:980 +#: directorymergewindow.cpp:992 #, kde-format msgid "Dir B \"%1\" does not exist or is not a directory.\n" msgstr "Фасцикла Б „%1“ не постоји или није фасцикла.\n" -#: directorymergewindow.cpp:985 +#: directorymergewindow.cpp:997 #, kde-format msgid "Dir C \"%1\" does not exist or is not a directory.\n" msgstr "Фасцикла Ц „%1“ не постоји или није фасцикла.\n" -#: directorymergewindow.cpp:988 +#: directorymergewindow.cpp:1000 #, kde-format msgid "Directory Open Error" msgstr "Грешка при отварању фасцикле" -#: directorymergewindow.cpp:996 +#: directorymergewindow.cpp:1008 #, kde-format msgid "" "The destination directory must not be the same as A or B when three " @@ -385,50 +385,50 @@ "фасцикле.\n" "Проверите поново пре него што наставите." -#: directorymergewindow.cpp:998 +#: directorymergewindow.cpp:1010 #, kde-format msgid "Parameter Warning" msgstr "Упозорење о параметрима" -#: directorymergewindow.cpp:1003 +#: directorymergewindow.cpp:1015 #, kde-format msgid "Scanning directories..." msgstr "Скенирам фасцикле..." -#: directorymergewindow.cpp:1029 +#: directorymergewindow.cpp:1041 #, kde-format msgid "Reading Directory A" msgstr "Читам фасциклу А" -#: directorymergewindow.cpp:1038 +#: directorymergewindow.cpp:1050 #, kde-format msgid "Reading Directory B" msgstr "Читам фасциклу Б" -#: directorymergewindow.cpp:1048 +#: directorymergewindow.cpp:1060 #, kde-format msgid "Reading Directory C" msgstr "Читам фасциклу Ц" # >! Merge sentence. -#: directorymergewindow.cpp:1064 +#: directorymergewindow.cpp:1076 #, kde-format msgid "Some subdirectories were not readable in" msgstr "Неке потфасцикле нису биле читљиве у" -#: directorymergewindow.cpp:1069 +#: directorymergewindow.cpp:1081 #, kde-format msgid "Check the permissions of the subdirectories." msgstr "Проверите дозволе потфасцикли." -#: directorymergewindow.cpp:1106 kdiff3.cpp:666 kdiff3.cpp:753 kdiff3.cpp:777 -#: kdiff3.cpp:1065 kdiff3.cpp:1086 pdiff.cpp:1116 pdiff.cpp:1170 pdiff.cpp:1218 -#: pdiff.cpp:1234 pdiff.cpp:1277 pdiff.cpp:1301 +#: directorymergewindow.cpp:1118 kdiff3.cpp:665 kdiff3.cpp:752 kdiff3.cpp:776 +#: kdiff3.cpp:1072 kdiff3.cpp:1093 pdiff.cpp:1136 pdiff.cpp:1190 pdiff.cpp:1238 +#: pdiff.cpp:1254 pdiff.cpp:1297 pdiff.cpp:1321 #, kde-format msgid "Ready." msgstr "Спреман." -#: directorymergewindow.cpp:1121 +#: directorymergewindow.cpp:1133 #, kde-format msgid "" "Directory Comparison Status\n" @@ -438,25 +438,25 @@ "Number of different files: %3" msgstr "" -#: directorymergewindow.cpp:1128 +#: directorymergewindow.cpp:1140 #, fuzzy, kde-format #| msgid "Number of manual merges:" msgid "Number of manual merges: %1" msgstr "Број ручних стапања:" -#: directorymergewindow.cpp:1394 +#: directorymergewindow.cpp:1406 #, kde-format msgid "This affects all merge operations." msgstr "Ово утиче на све поступке стапања." # >> @title:window -#: directorymergewindow.cpp:1395 +#: directorymergewindow.cpp:1407 #, kde-format msgid "Changing All Merge Operations" msgstr "Мењање свих поступака стапања" # >! Merge sentence. -#: directorymergewindow.cpp:1695 +#: directorymergewindow.cpp:1707 #, fuzzy, kde-format #| msgid "Processing " msgid "" @@ -464,45 +464,45 @@ "%3" msgstr "Обрађујем " -#: directorymergewindow.cpp:1738 directorymergewindow.cpp:1742 +#: directorymergewindow.cpp:1750 directorymergewindow.cpp:1754 #, kde-format msgid "Some files could not be processed." msgstr "" -#: directorymergewindow.cpp:2222 directorymergewindow.cpp:2247 -#: directorymergewindow.cpp:2271 +#: directorymergewindow.cpp:2234 directorymergewindow.cpp:2259 +#: directorymergewindow.cpp:2283 #, kde-format msgid "This operation is currently not possible." msgstr "Овај поступак тренутно није могућ." -#: directorymergewindow.cpp:2222 directorymergewindow.cpp:2247 -#: directorymergewindow.cpp:2271 directorymergewindow.cpp:2552 +#: directorymergewindow.cpp:2234 directorymergewindow.cpp:2259 +#: directorymergewindow.cpp:2283 directorymergewindow.cpp:2563 #, kde-format msgid "Operation Not Possible" msgstr "Поступак није могућ" -#: directorymergewindow.cpp:2318 +#: directorymergewindow.cpp:2330 #, fuzzy, kde-format #| msgid "An error occurred while copying.\n" msgid "An error occurred while copying." msgstr "Грешка у току копирања.\n" -#: directorymergewindow.cpp:2319 directorymergewindow.cpp:2759 +#: directorymergewindow.cpp:2331 directorymergewindow.cpp:2770 #, kde-format msgid "Merge Error" msgstr "Грешка стапања" -#: directorymergewindow.cpp:2396 +#: directorymergewindow.cpp:2408 #, kde-format msgid "Unknown merge operation. (This must never happen!)" msgstr "Непознат поступак стапања. (Ово никада не сме да се догоди!)" -#: directorymergewindow.cpp:2441 +#: directorymergewindow.cpp:2453 #, kde-format msgid "Unknown merge operation." msgstr "Непозната поступак стапања." -#: directorymergewindow.cpp:2454 +#: directorymergewindow.cpp:2466 #, kde-format msgid "" "The merge is about to begin.\n" @@ -523,22 +523,22 @@ "ГАРАНЦИЈА! Направите резерве важних података!" # >> @title:window -#: directorymergewindow.cpp:2459 +#: directorymergewindow.cpp:2471 #, kde-format msgid "Starting Merge" msgstr "Почетак стапања" -#: directorymergewindow.cpp:2460 +#: directorymergewindow.cpp:2472 #, kde-format msgid "Do It" msgstr "Уради" -#: directorymergewindow.cpp:2461 +#: directorymergewindow.cpp:2473 #, kde-format msgid "Simulate It" msgstr "Симулирај" -#: directorymergewindow.cpp:2487 +#: directorymergewindow.cpp:2499 #, kde-format msgid "" "The highlighted item has a different type in the different directories. " @@ -547,7 +547,7 @@ "Истакнута ставка има различит тип у различитим фасциклама. Изаберите шта " "урадити." -#: directorymergewindow.cpp:2491 +#: directorymergewindow.cpp:2503 #, kde-format msgid "" "The modification dates of the file are equal but the files are not. Select " @@ -555,7 +555,7 @@ msgstr "" "Датуми измене фајла су једнаки али фајлови нису. Изаберите шта урадити." -#: directorymergewindow.cpp:2495 +#: directorymergewindow.cpp:2507 #, kde-format msgid "" "The highlighted item was changed in one directory and deleted in the other. " @@ -564,14 +564,14 @@ "Истакнута ставка је измењена у једној фасцикли а обрисана у другој. " "Изаберите шта урадити." -#: directorymergewindow.cpp:2552 +#: directorymergewindow.cpp:2563 #, kde-format msgid "" "This operation is currently not possible because directory merge is " "currently running." msgstr "Овај поступак тренутно није могућ зато што је у току стапање фасцикли." -#: directorymergewindow.cpp:2609 +#: directorymergewindow.cpp:2620 #, kde-format msgid "" "There was an error in the last step.\n" @@ -583,32 +583,32 @@ "прескочите?" # >> @title:window -#: directorymergewindow.cpp:2611 +#: directorymergewindow.cpp:2622 #, kde-format msgid "Continue merge after an error" msgstr "Настављање стапања после грешке" -#: directorymergewindow.cpp:2612 +#: directorymergewindow.cpp:2623 #, kde-format msgid "Continue With Last Item" msgstr "Настави са последњом ставком" -#: directorymergewindow.cpp:2613 +#: directorymergewindow.cpp:2624 #, kde-format msgid "Skip Item" msgstr "Прескочи ставку" -#: directorymergewindow.cpp:2709 +#: directorymergewindow.cpp:2720 #, kde-format msgid "Merge operation complete." msgstr "Поступак стапања је завршен." -#: directorymergewindow.cpp:2709 directorymergewindow.cpp:2712 +#: directorymergewindow.cpp:2720 directorymergewindow.cpp:2723 #, kde-format msgid "Merge Complete" msgstr "Стапање завршено" -#: directorymergewindow.cpp:2722 +#: directorymergewindow.cpp:2733 #, kde-format msgid "" "Simulated merge complete: Check if you agree with the proposed operations." @@ -616,49 +616,49 @@ "Симулирано стапање је завршено: проверите да ли вам одговарају предложени " "поступци." -#: directorymergewindow.cpp:2758 +#: directorymergewindow.cpp:2769 #, fuzzy, kde-format #| msgid "An error occurred. Press OK to see detailed information.\n" msgid "An error occurred. Press OK to see detailed information." msgstr "" "Дошло је до грешке. Кликните на „У реду“ да добијете детаљне информације.\n" -#: directorymergewindow.cpp:2791 +#: directorymergewindow.cpp:2802 #, kde-format msgid "Error: While deleting %1: Creating backup failed." msgstr "Грешка: у току брисања %1, прављење резерве није успело." -#: directorymergewindow.cpp:2798 +#: directorymergewindow.cpp:2809 #, kde-format msgid "delete directory recursively( %1 )" msgstr "рекурзивно брисање фасцикле (%1)" -#: directorymergewindow.cpp:2800 +#: directorymergewindow.cpp:2811 #, kde-format msgid "delete( %1 )" msgstr "брисање (%1)" -#: directorymergewindow.cpp:2815 +#: directorymergewindow.cpp:2826 #, kde-format msgid "Error: delete dir operation failed while trying to read the directory." msgstr "Грешка: поступак брисања фасцикле није успео на месту читања фасцикле." -#: directorymergewindow.cpp:2834 +#: directorymergewindow.cpp:2845 #, kde-format msgid "Error: rmdir( %1 ) operation failed." msgstr "Грешка: поступак уклањања фасцикле (%1) није успео." -#: directorymergewindow.cpp:2844 +#: directorymergewindow.cpp:2855 #, kde-format msgid "Error: delete operation failed." msgstr "Грешка: поступак брисања није успео." -#: directorymergewindow.cpp:2870 +#: directorymergewindow.cpp:2881 #, kde-format msgid "manual merge( %1, %2, %3 -> %4)" msgstr "ручно стапање (%1, %2, %3 → %4)" -#: directorymergewindow.cpp:2873 +#: directorymergewindow.cpp:2884 #, kde-format msgid "" " Note: After a manual merge the user should continue by pressing F7." @@ -666,193 +666,193 @@ " Напомена: после ручног стапања корисник треба да настави притиском на " "F7." -#: directorymergewindow.cpp:2900 +#: directorymergewindow.cpp:2911 #, kde-format msgid "Error: copy( %1 -> %2 ) failed.Deleting existing destination failed." msgstr "" "Грешка: копирање (%1 → %2) није успело, брисање постојећег одредишта није " "успело." -#: directorymergewindow.cpp:2909 +#: directorymergewindow.cpp:2920 #, kde-format msgid "copyLink( %1 -> %2 )" msgstr "копирање везе (%1 → %2 )" -#: directorymergewindow.cpp:2918 +#: directorymergewindow.cpp:2929 #, kde-format msgid "Error: copyLink failed: Remote links are not yet supported." msgstr "Грешка: копирање везе није успело, удаљене везе још нису подржане." -#: directorymergewindow.cpp:2928 +#: directorymergewindow.cpp:2939 #, kde-format msgid "Error: copyLink failed." msgstr "Грешка: копирање везе није успело." -#: directorymergewindow.cpp:2953 +#: directorymergewindow.cpp:2964 #, kde-format msgid "copy( %1 -> %2 )" msgstr "копирање (%1 → %2)" -#: directorymergewindow.cpp:2979 +#: directorymergewindow.cpp:2990 #, kde-format msgid "Error during rename( %1 -> %2 ): Cannot delete existing destination." msgstr "" "Грешка у току преименовања (%1 → %2), постојеће одредиште не може да се " "обрише." -#: directorymergewindow.cpp:2986 +#: directorymergewindow.cpp:2997 #, kde-format msgid "rename( %1 -> %2 )" msgstr "преименовање (%1 → %2)" -#: directorymergewindow.cpp:2995 +#: directorymergewindow.cpp:3006 #, kde-format msgid "Error: Rename failed." msgstr "Грешка: преименовање није успело." -#: directorymergewindow.cpp:3013 +#: directorymergewindow.cpp:3024 #, kde-format msgid "Error during makeDir of %1. Cannot delete existing file." msgstr "" "Грешка у току прављења фасцикле (%1), постојећи фајл не може да се обрише." -#: directorymergewindow.cpp:3030 +#: directorymergewindow.cpp:3041 #, kde-format msgid "makeDir( %1 )" msgstr "прављење фасцикле (%1)" -#: directorymergewindow.cpp:3040 +#: directorymergewindow.cpp:3051 #, kde-format msgid "Error while creating directory." msgstr "Грешка у току прављења фасцикле." -#: directorymergewindow.cpp:3076 directorymergewindow.cpp:3195 +#: directorymergewindow.cpp:3087 directorymergewindow.cpp:3206 #, kde-format msgid "Dest" msgstr "Одредиште" # >> @title:column -#: directorymergewindow.cpp:3084 directorymergewindow.cpp:3113 +#: directorymergewindow.cpp:3095 directorymergewindow.cpp:3124 #, kde-format msgid "Dir" msgstr "фасцикла" # >> @title:column -#: directorymergewindow.cpp:3084 +#: directorymergewindow.cpp:3095 #, kde-format msgid "Type" msgstr "тип" # >> @title:column -#: directorymergewindow.cpp:3084 +#: directorymergewindow.cpp:3095 #, kde-format msgid "Size" msgstr "величина" # >> @title:column -#: directorymergewindow.cpp:3085 +#: directorymergewindow.cpp:3096 #, kde-format msgid "Attr" msgstr "атрибути" # >> @title:column -#: directorymergewindow.cpp:3085 +#: directorymergewindow.cpp:3096 #, kde-format msgid "Last Modification" msgstr "последња измена" # >> @title:column -#: directorymergewindow.cpp:3085 +#: directorymergewindow.cpp:3096 #, kde-format msgid "Link-Destination" msgstr "одредиште везе" # >! Merge whole string. # >> @item:intext -#: directorymergewindow.cpp:3113 +#: directorymergewindow.cpp:3124 #, kde-format msgid "File" msgstr "фајл" -#: directorymergewindow.cpp:3113 +#: directorymergewindow.cpp:3124 #, fuzzy, kde-format #| msgid "Link: " msgid "-Link" msgstr "Веза: " -#: directorymergewindow.cpp:3119 +#: directorymergewindow.cpp:3130 #, kde-format msgid "not available" msgstr "недоступно" -#: directorymergewindow.cpp:3137 +#: directorymergewindow.cpp:3148 #, kde-format msgid "A (Dest): " msgstr "А (одредиште): " -#: directorymergewindow.cpp:3141 +#: directorymergewindow.cpp:3152 #, kde-format msgid "A: " msgstr "" -#: directorymergewindow.cpp:3141 +#: directorymergewindow.cpp:3152 #, kde-format msgid "A (Base): " msgstr "А (база): " -#: directorymergewindow.cpp:3147 +#: directorymergewindow.cpp:3158 #, kde-format msgid "B (Dest): " msgstr "Б (одредиште): " -#: directorymergewindow.cpp:3151 +#: directorymergewindow.cpp:3162 #, kde-format msgid "B: " msgstr "" -#: directorymergewindow.cpp:3156 +#: directorymergewindow.cpp:3167 #, kde-format msgid "C (Dest): " msgstr "Ц (одредиште): " -#: directorymergewindow.cpp:3160 +#: directorymergewindow.cpp:3171 #, kde-format msgid "C: " msgstr "" -#: directorymergewindow.cpp:3163 +#: directorymergewindow.cpp:3174 #, kde-format msgid "Dest: " msgstr "Одредиште: " # >> @title:window #. i18n("Saving Directory Merge State ...")); -#: directorymergewindow.cpp:3238 +#: directorymergewindow.cpp:3249 #, kde-format msgid "Save Directory Merge State As..." msgstr "Уписивање стања стапања фасцикли као..." -#: directorymergewindow.cpp:3387 +#: directorymergewindow.cpp:3398 #, kde-format msgid "Start/Continue Directory Merge" msgstr "Покрени/настави стапање фасцикли" -#: directorymergewindow.cpp:3388 +#: directorymergewindow.cpp:3399 #, kde-format msgid "Run Operation for Current Item" msgstr "Изврши поступак за текућу ставку" -#: directorymergewindow.cpp:3389 +#: directorymergewindow.cpp:3400 #, kde-format msgid "Compare Selected File" msgstr "Упореди изабрани фајл" -#: directorymergewindow.cpp:3390 +#: directorymergewindow.cpp:3401 #, kde-format msgid "Merge Current File" msgstr "Стопи текући фајл" -#: directorymergewindow.cpp:3390 +#: directorymergewindow.cpp:3401 #, kde-format msgid "" "Merge\n" @@ -861,51 +861,51 @@ "Стопи\n" "фајл" -#: directorymergewindow.cpp:3391 +#: directorymergewindow.cpp:3402 #, kde-format msgid "Fold All Subdirs" msgstr "Сажми све потфасцикле" -#: directorymergewindow.cpp:3392 +#: directorymergewindow.cpp:3403 #, kde-format msgid "Unfold All Subdirs" msgstr "Рашири све потфасцикле" #. i18n("Save Directory Merge State ..."), 0, this, &DirectoryMergeWindow::slotSaveMergeState, ac, "dir_save_merge_state"); #. i18n("Load Directory Merge State ..."), 0, this, &DirectoryMergeWindow::slotLoadMergeState, ac, "dir_load_merge_state"); -#: directorymergewindow.cpp:3396 +#: directorymergewindow.cpp:3407 #, kde-format msgid "Choose A for All Items" msgstr "Изабери А за све ставке" -#: directorymergewindow.cpp:3397 +#: directorymergewindow.cpp:3408 #, kde-format msgid "Choose B for All Items" msgstr "Изабери Б за све ставке" -#: directorymergewindow.cpp:3398 +#: directorymergewindow.cpp:3409 #, kde-format msgid "Choose C for All Items" msgstr "Изабери Ц за све ставке" -#: directorymergewindow.cpp:3399 +#: directorymergewindow.cpp:3410 #, kde-format msgid "Auto-Choose Operation for All Items" msgstr "Аутоматски изабери поступак за све ставке" -#: directorymergewindow.cpp:3400 +#: directorymergewindow.cpp:3411 #, kde-format msgid "No Operation for All Items" msgstr "Нема поступка за све ставке" #. i18n("Synchronize Directories"), 0, this, &DirectoryMergeWindow::slotSynchronizeDirectories, ac, "dir_synchronize_directories"); #. d->m_pDirChooseNewerFiles = GuiUtils::createAction< KToggleAction >(i18n("Copy Newer Files Instead of Merging"), 0, this, &DirectoryMergeWindow::slotChooseNewerFiles, ac, "dir_choose_newer_files"); -#: directorymergewindow.cpp:3405 +#: directorymergewindow.cpp:3416 #, kde-format msgid "Show Identical Files" msgstr "Прикажи истоветне фајлове" -#: directorymergewindow.cpp:3405 +#: directorymergewindow.cpp:3416 #, kde-format msgid "" "Identical\n" @@ -914,17 +914,17 @@ "Истоветни\n" "фајлови" -#: directorymergewindow.cpp:3406 +#: directorymergewindow.cpp:3417 #, kde-format msgid "Show Different Files" msgstr "Прикажи различите фајлове" -#: directorymergewindow.cpp:3407 +#: directorymergewindow.cpp:3418 #, kde-format msgid "Show Files only in A" msgstr "Прикажи фајлове само у А" -#: directorymergewindow.cpp:3407 +#: directorymergewindow.cpp:3418 #, kde-format msgid "" "Files\n" @@ -933,12 +933,12 @@ "Фајлови\n" "само у А" -#: directorymergewindow.cpp:3408 +#: directorymergewindow.cpp:3419 #, kde-format msgid "Show Files only in B" msgstr "Прикажи фајлове само у Б" -#: directorymergewindow.cpp:3408 +#: directorymergewindow.cpp:3419 #, kde-format msgid "" "Files\n" @@ -947,12 +947,12 @@ "Фајлови\n" "само у Б" -#: directorymergewindow.cpp:3409 +#: directorymergewindow.cpp:3420 #, kde-format msgid "Show Files only in C" msgstr "Прикажи фајлове само у Ц" -#: directorymergewindow.cpp:3409 +#: directorymergewindow.cpp:3420 #, kde-format msgid "" "Files\n" @@ -961,55 +961,60 @@ "Фајлови\n" "само у Ц" -#: directorymergewindow.cpp:3413 +#: directorymergewindow.cpp:3424 #, kde-format msgid "Compare Explicitly Selected Files" msgstr "Упореди изричито изабране фајлове" -#: directorymergewindow.cpp:3414 +#: directorymergewindow.cpp:3425 #, kde-format msgid "Merge Explicitly Selected Files" msgstr "Стопи изричито изабране фајлове" -#: directorymergewindow.cpp:3416 directorymergewindow.cpp:3423 +#: directorymergewindow.cpp:3427 directorymergewindow.cpp:3434 #, kde-format msgid "Do Nothing" msgstr "Не ради ништа" -#: directorymergewindow.cpp:3428 +#: directorymergewindow.cpp:3439 #, kde-format msgid "Delete A && B" msgstr "Обриши А и Б" -#: directorymergewindow.cpp:3431 +#: directorymergewindow.cpp:3442 #, kde-format msgid "Merge to A && B" msgstr "Стопи у А и Б" -#: fileaccess.cpp:462 SourceData.cpp:493 +#: fileaccess.cpp:301 +#, kde-format +msgid "Unable to determine full url. No parent specified." +msgstr "" + +#: fileaccess.cpp:482 SourceData.cpp:506 #, fuzzy, kde-format #| msgid "Reading file: %1" msgid "Failed to read file: %1" msgstr "Читам фајл: %1" -#: fileaccess.cpp:587 +#: fileaccess.cpp:624 #, kde-format msgid "Creating temp copy of %1 failed." msgstr "Прављење привремене копије фајла %1 није успело." -#: fileaccess.cpp:595 fileaccess.cpp:600 +#: fileaccess.cpp:632 fileaccess.cpp:637 #, fuzzy, kde-format #| msgid "Opening %1 failed." msgid "Opening %1 failed. %2" msgstr "Отварање фајла %1 није успело." -#: fileaccess.cpp:619 fileaccess.cpp:627 +#: fileaccess.cpp:656 fileaccess.cpp:664 #, fuzzy, kde-format #| msgid "Error reading from %1" msgid "Error reading from %1. %2" msgstr "Грешка при читању из %1" -#: fileaccess.cpp:751 +#: fileaccess.cpp:788 #, fuzzy, kde-format #| msgid "" #| "While trying to make a backup, deleting an older backup failed. \n" @@ -1021,7 +1026,7 @@ "При покушају прављења резерве, брисање старије резерве није успело.\n" "Име фајла: " -#: fileaccess.cpp:758 +#: fileaccess.cpp:795 #, fuzzy, kde-format #| msgid "" #| "While trying to make a backup, renaming failed. \n" @@ -1033,190 +1038,190 @@ "При покушају прављења резерве, преименовање није успело.\n" "Имена фајлова: " -#: fileaccess.cpp:828 +#: fileaccess.cpp:865 #, kde-format msgid "Getting file status: %1" msgstr "Добављам стање фајла: %1" -#: fileaccess.cpp:869 +#: fileaccess.cpp:906 #, kde-format msgid "Reading file: %1" msgstr "Читам фајл: %1" -#: fileaccess.cpp:907 +#: fileaccess.cpp:944 #, kde-format msgid "Writing file: %1" msgstr "Пишем фајл: %1" -#: fileaccess.cpp:940 +#: fileaccess.cpp:977 #, kde-format msgid "Out of memory" msgstr "Нема више меморије" -#: fileaccess.cpp:976 +#: fileaccess.cpp:1013 #, kde-format msgid "Making directory: %1" msgstr "Правим фасциклу: %1" -#: fileaccess.cpp:997 +#: fileaccess.cpp:1034 #, kde-format msgid "Removing directory: %1" msgstr "Уклањам фасциклу: %1" -#: fileaccess.cpp:1012 +#: fileaccess.cpp:1049 #, kde-format msgid "Removing file: %1" msgstr "Уклањам фајл: %1" -#: fileaccess.cpp:1028 +#: fileaccess.cpp:1065 #, kde-format msgid "Creating symbolic link: %1 -> %2" msgstr "Правим симболичку везу: %1 → %2" -#: fileaccess.cpp:1052 +#: fileaccess.cpp:1089 #, kde-format msgid "Renaming file: %1 -> %2" msgstr "Преименујем фајл: %1 → %2" -#: fileaccess.cpp:1086 +#: fileaccess.cpp:1123 #, kde-format msgid "Copying file: %1 -> %2" msgstr "Копирам фајл: %1 → %2" -#: fileaccess.cpp:1108 +#: fileaccess.cpp:1145 #, fuzzy, kde-format #| msgid "Reading directory: " msgid "Reading directory: %1" msgstr "Читам фасциклу: " -#: fileaccess.cpp:1162 +#: fileaccess.cpp:1202 #, kde-format msgid "Listing directory: %1" msgstr "Листам фасциклу: %1" -#: kdiff3.cpp:181 +#: kdiff3.cpp:182 #, kde-format msgid "Current Configuration:" msgstr "Тренутна постава:" -#: kdiff3.cpp:186 +#: kdiff3.cpp:187 #, kde-format msgid "Config Option Error:" msgstr "Грешка поставне опције:" -#: kdiff3.cpp:240 +#: kdiff3.cpp:246 #, kde-format msgid "Option --auto used, but no output file specified." msgstr "Опција --auto је употребљена, али није наведен излазни фајл." -#: kdiff3.cpp:416 +#: kdiff3.cpp:405 #, kde-format msgid "Option --auto ignored for directory comparison." msgstr "Опција --auto се игнорише за поређење фасцикли." -#: kdiff3.cpp:460 +#: kdiff3.cpp:449 #, kde-format msgid "Saving failed." msgstr "Уписивање није успело." -#: kdiff3.cpp:496 pdiff.cpp:1098 +#: kdiff3.cpp:494 pdiff.cpp:395 pdiff.cpp:1117 #, kde-format msgid "Opening of these files failed:" msgstr "Отварање ових фајлова није успело:" -#: kdiff3.cpp:505 +#: kdiff3.cpp:503 pdiff.cpp:404 pdiff.cpp:1126 #, kde-format -msgid "File Open Error" +msgid "File open error" msgstr "Грешка при отварању фајла" # >> @info:tooltip -#: kdiff3.cpp:533 +#: kdiff3.cpp:532 #, kde-format msgid "Opens documents for comparison..." msgstr "Отвара документе за поређење." -#: kdiff3.cpp:535 +#: kdiff3.cpp:534 #, kde-format msgid "Reload" msgstr "Учитај поново" # >> @info:tooltip -#: kdiff3.cpp:538 +#: kdiff3.cpp:537 #, kde-format msgid "Saves the merge result. All conflicts must be solved!" msgstr "Уписује резултат стапања. Сви сукоби морају бити разрешени." # >> @info:tooltip -#: kdiff3.cpp:540 +#: kdiff3.cpp:539 #, kde-format msgid "Saves the current document as..." msgstr "Уписује текуће документе под именом." # >> @info:tooltip -#: kdiff3.cpp:543 +#: kdiff3.cpp:542 #, kde-format msgid "Print the differences" msgstr "Штампа разлике." # >> @info:tooltip -#: kdiff3.cpp:546 +#: kdiff3.cpp:545 #, kde-format msgid "Quits the application" msgstr "Напушта програм." # >> @info:tooltip -#: kdiff3.cpp:549 +#: kdiff3.cpp:548 #, kde-format msgid "Cuts the selected section and puts it to the clipboard" msgstr "Исеца изабрани одељак и ставља га у клипборд." # >> @info:tooltip -#: kdiff3.cpp:552 +#: kdiff3.cpp:551 #, kde-format msgid "Copies the selected section to the clipboard" msgstr "Копира изабрани одељак у клипборд." # >> @info:tooltip -#: kdiff3.cpp:554 +#: kdiff3.cpp:553 #, kde-format msgid "Pastes the clipboard contents to current position" msgstr "Налепљује садржај клипборда на тренутном положају." # >> @info:tooltip -#: kdiff3.cpp:557 +#: kdiff3.cpp:556 #, kde-format msgid "Select everything in current window" msgstr "Изабира све у текућем прозору." # >> @info:tooltip -#: kdiff3.cpp:560 +#: kdiff3.cpp:559 #, kde-format msgid "Search for a string" msgstr "Тражи ниску." # >> @info:tooltip -#: kdiff3.cpp:562 +#: kdiff3.cpp:561 #, kde-format msgid "Search again for the string" msgstr "Поново тражи ниску." # >> @info:tooltip -#: kdiff3.cpp:567 +#: kdiff3.cpp:566 #, kde-format msgid "Enables/disables the statusbar" msgstr "Укључује/искључује траку стања." -#: kdiff3.cpp:571 +#: kdiff3.cpp:570 #, kde-format msgid "Configure KDiff3..." msgstr "Подеси К‑диф3..." -#: kdiff3.cpp:590 +#: kdiff3.cpp:589 #, kde-format msgid "Go to Current Delta" msgstr "Иди на текућу делту" -#: kdiff3.cpp:590 +#: kdiff3.cpp:589 #, kde-format msgid "" "Current\n" @@ -1225,12 +1230,12 @@ "Текућа\n" "делта" -#: kdiff3.cpp:592 +#: kdiff3.cpp:591 #, kde-format msgid "Go to First Delta" msgstr "Иди на прву делту" -#: kdiff3.cpp:592 +#: kdiff3.cpp:591 #, kde-format msgid "" "First\n" @@ -1239,12 +1244,12 @@ "Прва\n" "делта" -#: kdiff3.cpp:594 +#: kdiff3.cpp:593 #, kde-format msgid "Go to Last Delta" msgstr "Иди на последњу делту" -#: kdiff3.cpp:594 +#: kdiff3.cpp:593 #, kde-format msgid "" "Last\n" @@ -1253,12 +1258,12 @@ "Последња\n" "делта" -#: kdiff3.cpp:596 +#: kdiff3.cpp:595 #, kde-format msgid "(Skips white space differences when \"Show White Space\" is disabled.)" msgstr "(Прескаче разлике у празнинама ако је „Прикажи празнине“ искључено.)" -#: kdiff3.cpp:597 +#: kdiff3.cpp:596 #, kde-format msgid "" "(Does not skip white space differences even when \"Show White Space\" is " @@ -1266,12 +1271,12 @@ msgstr "" "(Не прескаче разлике празнинама ни када је „Прикажи празнине“ искључено.)" -#: kdiff3.cpp:598 +#: kdiff3.cpp:597 #, kde-format msgid "Go to Previous Delta" msgstr "Иди на претходну делту" -#: kdiff3.cpp:598 +#: kdiff3.cpp:597 #, kde-format msgid "" "Prev\n" @@ -1280,12 +1285,12 @@ "Претходна\n" "делта" -#: kdiff3.cpp:600 +#: kdiff3.cpp:599 #, kde-format msgid "Go to Next Delta" msgstr "Иди на следећу делту" -#: kdiff3.cpp:600 +#: kdiff3.cpp:599 #, kde-format msgid "" "Next\n" @@ -1294,12 +1299,12 @@ "Следећа\n" "делта" -#: kdiff3.cpp:602 +#: kdiff3.cpp:601 #, kde-format msgid "Go to Previous Conflict" msgstr "Иди на претходни сукоб" -#: kdiff3.cpp:602 +#: kdiff3.cpp:601 #, kde-format msgid "" "Prev\n" @@ -1308,12 +1313,12 @@ "Претходни\n" "сукоб" -#: kdiff3.cpp:604 +#: kdiff3.cpp:603 #, kde-format msgid "Go to Next Conflict" msgstr "Иди на следећи сукоб" -#: kdiff3.cpp:604 +#: kdiff3.cpp:603 #, kde-format msgid "" "Next\n" @@ -1322,12 +1327,12 @@ "Следећи\n" "сукоб" -#: kdiff3.cpp:606 +#: kdiff3.cpp:605 #, kde-format msgid "Go to Previous Unsolved Conflict" msgstr "Иди на претходни нерешени сукоб" -#: kdiff3.cpp:606 +#: kdiff3.cpp:605 #, kde-format msgid "" "Prev\n" @@ -1336,12 +1341,12 @@ "Претходни\n" "нерешени" -#: kdiff3.cpp:608 +#: kdiff3.cpp:607 #, kde-format msgid "Go to Next Unsolved Conflict" msgstr "Иди на следећи нерешени сукоб" -#: kdiff3.cpp:608 +#: kdiff3.cpp:607 #, kde-format msgid "" "Next\n" @@ -1350,12 +1355,12 @@ "Следећи\n" "нерешени" -#: kdiff3.cpp:610 +#: kdiff3.cpp:609 #, kde-format msgid "Select Line(s) From A" msgstr "Изаберите редове из А" -#: kdiff3.cpp:610 +#: kdiff3.cpp:609 #, kde-format msgid "" "Choose\n" @@ -1364,12 +1369,12 @@ "Изаберите\n" "А" -#: kdiff3.cpp:611 +#: kdiff3.cpp:610 #, kde-format msgid "Select Line(s) From B" msgstr "Изаберите редове из Б" -#: kdiff3.cpp:611 +#: kdiff3.cpp:610 #, kde-format msgid "" "Choose\n" @@ -1378,12 +1383,12 @@ "Изаберите\n" "Б" -#: kdiff3.cpp:612 +#: kdiff3.cpp:611 #, kde-format msgid "Select Line(s) From C" msgstr "Изаберите редове из Ц" -#: kdiff3.cpp:612 +#: kdiff3.cpp:611 #, kde-format msgid "" "Choose\n" @@ -1392,12 +1397,12 @@ "Изаберите\n" "Ц" -#: kdiff3.cpp:613 +#: kdiff3.cpp:612 #, kde-format msgid "Automatically Go to Next Unsolved Conflict After Source Selection" msgstr "Аутоматски иди на следећи нерешени сукоб после избора извора" -#: kdiff3.cpp:613 +#: kdiff3.cpp:612 #, kde-format msgid "" "Auto\n" @@ -1406,13 +1411,13 @@ "Аутоматски\n" "следећи" -#: kdiff3.cpp:615 +#: kdiff3.cpp:614 #, fuzzy, kde-format #| msgid "Show Space && Tabulator Characters for Differences" msgid "Show Space && Tabulator Characters" msgstr "Прикажи знакове размака и табулатора за разлике" -#: kdiff3.cpp:615 +#: kdiff3.cpp:614 #, kde-format msgid "" "White\n" @@ -1421,12 +1426,12 @@ "Знакови\n" "празнина" -#: kdiff3.cpp:616 +#: kdiff3.cpp:615 #, kde-format msgid "Show White Space" msgstr "Прикажи празнине" -#: kdiff3.cpp:616 +#: kdiff3.cpp:615 #, kde-format msgid "" "White\n" @@ -1435,12 +1440,12 @@ "Делте\n" "празнина" -#: kdiff3.cpp:618 +#: kdiff3.cpp:617 #, kde-format msgid "Show Line Numbers" msgstr "Прикажи бројеве редова" -#: kdiff3.cpp:618 +#: kdiff3.cpp:617 #, kde-format msgid "" "Line\n" @@ -1449,196 +1454,196 @@ "Бројеви\n" "редова" -#: kdiff3.cpp:620 +#: kdiff3.cpp:619 #, kde-format msgid "Automatically Solve Simple Conflicts" msgstr "Аутоматски реши једноставне сукобе" -#: kdiff3.cpp:621 +#: kdiff3.cpp:620 #, kde-format msgid "Set Deltas to Conflicts" msgstr "Постави делте на сукобе" -#: kdiff3.cpp:622 +#: kdiff3.cpp:621 #, kde-format msgid "Run Regular Expression Auto Merge" msgstr "Аутоматски стопи по регуларним изразима" -#: kdiff3.cpp:623 +#: kdiff3.cpp:622 #, kde-format msgid "Automatically Solve History Conflicts" msgstr "Аутоматски реши сукобе историјата" -#: kdiff3.cpp:624 +#: kdiff3.cpp:623 #, kde-format msgid "Split Diff At Selection" msgstr "Подели разлику на избору" -#: kdiff3.cpp:625 +#: kdiff3.cpp:624 #, kde-format msgid "Join Selected Diffs" msgstr "Споји изабране разлике" -#: kdiff3.cpp:627 +#: kdiff3.cpp:626 #, kde-format msgid "Show Window A" msgstr "Прикажи прозор А" -#: kdiff3.cpp:628 +#: kdiff3.cpp:627 #, kde-format msgid "Show Window B" msgstr "Прикажи прозор Б" -#: kdiff3.cpp:629 +#: kdiff3.cpp:628 #, kde-format msgid "Show Window C" msgstr "Прикажи прозор Ц" -#: kdiff3.cpp:631 +#: kdiff3.cpp:630 #, kde-format msgid "Normal Overview" msgstr "Нормалан преглед" -#: kdiff3.cpp:632 +#: kdiff3.cpp:631 #, kde-format msgid "A vs. B Overview" msgstr "Преглед А према Б" -#: kdiff3.cpp:633 +#: kdiff3.cpp:632 #, kde-format msgid "A vs. C Overview" msgstr "Преглед А према Ц" -#: kdiff3.cpp:634 +#: kdiff3.cpp:633 #, kde-format msgid "B vs. C Overview" msgstr "Преглед Б према Ц" -#: kdiff3.cpp:635 +#: kdiff3.cpp:634 #, kde-format msgid "Word Wrap Diff Windows" msgstr "Прелом речи у прозорима разлика" -#: kdiff3.cpp:636 +#: kdiff3.cpp:635 #, kde-format msgid "Add Manual Diff Alignment" msgstr "Додај ручно поравнање разлика" -#: kdiff3.cpp:637 +#: kdiff3.cpp:636 #, kde-format msgid "Clear All Manual Diff Alignments" msgstr "Очисти сва ручна поравнања разлика" -#: kdiff3.cpp:639 +#: kdiff3.cpp:638 #, kde-format msgid "Focus Next Window" msgstr "Фокусирај следећи прозор" -#: kdiff3.cpp:640 +#: kdiff3.cpp:639 #, kde-format msgid "Focus Prev Window" msgstr "Фокусирај претходни прозор" -#: kdiff3.cpp:641 +#: kdiff3.cpp:640 #, kde-format msgid "Toggle Split Orientation" msgstr "Пребаци оријентацију поделе" -#: kdiff3.cpp:643 +#: kdiff3.cpp:642 #, kde-format msgid "Dir && Text Split Screen View" msgstr "Подељени приказ екрана на фасциклу и текст" -#: kdiff3.cpp:645 +#: kdiff3.cpp:644 #, kde-format msgid "Toggle Between Dir && Text View" msgstr "Пребаци приказ фасцикле и текста" -#: kdiff3.cpp:697 pdiff.cpp:1909 +#: kdiff3.cpp:696 pdiff.cpp:1929 #, fuzzy, kde-format #| msgid "The merge result hasn't been saved." msgid "The merge result has not been saved." msgstr "Резултат стапања није сачуван." -#: kdiff3.cpp:699 +#: kdiff3.cpp:698 #, kde-format msgid "Save && Quit" msgstr "Сачувај и напусти" -#: kdiff3.cpp:700 +#: kdiff3.cpp:699 #, kde-format msgid "Quit Without Saving" msgstr "Напусти без уписивања" -#: kdiff3.cpp:708 pdiff.cpp:1920 +#: kdiff3.cpp:707 pdiff.cpp:1940 #, kde-format msgid "Saving the merge result failed." msgstr "Уписивање резултата стапања није успело." -#: kdiff3.cpp:719 pdiff.cpp:1032 +#: kdiff3.cpp:718 pdiff.cpp:1051 #, kde-format msgid "" "You are currently doing a directory merge. Are you sure, you want to abort?" msgstr "Тренутно стапате фасцикле. Желите ли заиста да обуставите ово?" -#: kdiff3.cpp:742 +#: kdiff3.cpp:741 #, kde-format msgid "Saving file..." msgstr "Уписујем фајл..." -#: kdiff3.cpp:759 +#: kdiff3.cpp:758 #, kde-format msgid "Saving file with a new filename..." msgstr "Уписујем фајл под новим именом..." # >> @title:window -#: kdiff3.cpp:761 +#: kdiff3.cpp:760 #, kde-format msgid "Save As..." msgstr "Уписивање као" -#: kdiff3.cpp:820 +#: kdiff3.cpp:819 #, kde-format msgid "Printing not implemented." msgstr "Штампање није изведено." -#: kdiff3.cpp:857 +#: kdiff3.cpp:858 #, kde-format msgid "Printing..." msgstr "Штампам..." -#: kdiff3.cpp:943 +#: kdiff3.cpp:948 #, kde-format msgid "Printing page %1 of %2" msgstr "" -#: kdiff3.cpp:1000 +#: kdiff3.cpp:1006 #, fuzzy, kde-format #| msgid "Selection" msgid " (Selection)" msgstr "Избор" -#: kdiff3.cpp:1027 +#: kdiff3.cpp:1034 #, kde-format msgid "Printing completed." msgstr "Штампање завршено." -#: kdiff3.cpp:1031 +#: kdiff3.cpp:1038 #, kde-format msgid "Printing aborted." msgstr "Штампање обустављено." -#: kdiff3.cpp:1038 +#: kdiff3.cpp:1045 #, kde-format msgid "Exiting..." msgstr "Напуштам..." -#: kdiff3.cpp:1049 +#: kdiff3.cpp:1056 #, kde-format msgid "Toggling toolbar..." msgstr "Пребацујем траку алатки..." -#: kdiff3.cpp:1070 +#: kdiff3.cpp:1077 #, kde-format msgid "Toggle the statusbar..." msgstr "Пребацујем траку стања..." @@ -1664,7 +1669,7 @@ msgid "Joachim Eibl" msgstr "Јоахим Ајбл" -#: kdiff3_part.cpp:173 kdiff3_part.cpp:254 +#: kdiff3_part.cpp:172 kdiff3_part.cpp:253 #, fuzzy, kde-format #| msgid "Couldn't find files for comparison." msgid "Could not find files for comparison." @@ -1683,7 +1688,7 @@ msgstr "Подеси К‑диф3" #. i18n: ectx: ToolBar (mainToolBar) -#: kdiff3_part.rc:16 main.cpp:88 +#: kdiff3_part.rc:16 main.cpp:89 #, kde-format msgid "KDiff3" msgstr "&К‑диф3" @@ -1755,83 +1760,88 @@ msgid "Main Toolbar" msgstr "Главна трака" -#: main.cpp:68 main.cpp:72 +#: main.cpp:69 main.cpp:73 #, kde-format msgid "Ignored. (User defined.)" msgstr "Игнорисано (кориснички дефинисано)." -#: main.cpp:92 +#: main.cpp:93 #, kde-format msgid " (64 bit)" msgstr "" -#: main.cpp:94 +#: main.cpp:95 #, kde-format msgid " (32 bit)" msgstr "" -#: main.cpp:95 +#: main.cpp:96 #, kde-format msgid "Tool for Comparison and Merge of Files and Directories" msgstr "Алатка за поређење и стапање фајлова и фасцикли" -#: main.cpp:96 +#: main.cpp:97 #, kde-format msgid "(c) 2002-2014 Joachim Eibl, (c) 2017 Michael Reeves KF5/Qt5 port" msgstr "" -#: main.cpp:112 +#: main.cpp:113 #, kde-format msgid "Merge the input." msgstr "Стопи улаз." -#: main.cpp:113 +#: main.cpp:114 #, kde-format msgid "Explicit base file. For compatibility with certain tools." msgstr "Изричит базни фајл. За сагласност са појединим алаткама." -#: main.cpp:114 +#: main.cpp:115 #, kde-format msgid "Output file. Implies -m. E.g.: -o newfile.txt" msgstr "Излазни фајл. Имплицира -m. Нпр: -o novifajl.txt" -#: main.cpp:115 +#: main.cpp:116 #, kde-format msgid "Output file, again. (For compatibility with certain tools.)" msgstr "Излазни фајл, поново. За сагласност са појединим алаткама." -#: main.cpp:116 +#: main.cpp:118 #, kde-format msgid "No GUI if all conflicts are auto-solvable. (Needs -o file)" msgstr "Без ГУИ‑ја ако су сви сукоби решиви аутоматски. Захтева -o fajl." -#: main.cpp:117 +#: main.cpp:120 +#, kde-format +msgid "Ignored." +msgstr "" + +#: main.cpp:122 #, fuzzy, kde-format #| msgid "Don't solve conflicts automatically. (For compatibility...)" msgid "Do not solve conflicts automatically." msgstr "Не решавај сукобе аутоматски. За сагласност..." -#: main.cpp:118 +#: main.cpp:123 #, kde-format msgid "Visible name replacement for input file 1 (base)." msgstr "Замена видљивог имена за улазни фајл 1 (базни)." -#: main.cpp:119 +#: main.cpp:124 #, kde-format msgid "Visible name replacement for input file 2." msgstr "Замена видљивог имена за улазни фајл 2." -#: main.cpp:120 +#: main.cpp:125 #, kde-format msgid "Visible name replacement for input file 3." msgstr "Замена видљивог имена за улазни фајл 3." -#: main.cpp:121 +#: main.cpp:126 #, kde-format msgid "Alternative visible name replacement. Supply this once for every input." msgstr "Алтернативна замена видљивог имена. Задајте ово једном за сваки улаз." -#: main.cpp:122 +#: main.cpp:127 #, kde-format msgid "" "Override a config setting. Use once for every setting. E.g.: --cs " @@ -1840,87 +1850,87 @@ "Потисни поставку из поставе. Употребите једном за сваку поставку. Нпр: --cs " "\"AutoAdvance=1\"" -#: main.cpp:123 +#: main.cpp:128 #, kde-format msgid "Show list of config settings and current values." msgstr "Наброји поставке и тренутне вредности из поставе." -#: main.cpp:124 +#: main.cpp:129 #, kde-format msgid "Use a different config file." msgstr "Употреби други поставни фајл." -#: main.cpp:127 +#: main.cpp:132 #, kde-format msgid "file1 to open (base, if not specified via --base)" msgstr "Фајл 1 за отварање (базни, ако није наведен преко --base)." -#: main.cpp:128 +#: main.cpp:133 #, kde-format msgid "file2 to open" msgstr "Фајл 2 за отварање." -#: main.cpp:129 +#: main.cpp:134 #, kde-format msgid "file3 to open" msgstr "Фајл 3 за отварање." -#: main.cpp:153 +#: main.cpp:158 #, kde-format msgid "See kdiff3 --help for supported options." msgstr "" -#: mergeresultwindow.cpp:158 +#: mergeresultwindow.cpp:171 #, kde-format msgid "Choose A Everywhere" msgstr "Свуда изабери А" -#: mergeresultwindow.cpp:159 +#: mergeresultwindow.cpp:172 #, kde-format msgid "Choose B Everywhere" msgstr "Свуда изабери Б" -#: mergeresultwindow.cpp:160 +#: mergeresultwindow.cpp:173 #, kde-format msgid "Choose C Everywhere" msgstr "Свуда изабери Ц" -#: mergeresultwindow.cpp:161 +#: mergeresultwindow.cpp:174 #, kde-format msgid "Choose A for All Unsolved Conflicts" msgstr "Изабери А за све нерешене сукобе" -#: mergeresultwindow.cpp:162 +#: mergeresultwindow.cpp:175 #, kde-format msgid "Choose B for All Unsolved Conflicts" msgstr "Изабери Б за све нерешене сукобе" -#: mergeresultwindow.cpp:163 +#: mergeresultwindow.cpp:176 #, kde-format msgid "Choose C for All Unsolved Conflicts" msgstr "Изабери Ц за све нерешене сукобе" -#: mergeresultwindow.cpp:164 +#: mergeresultwindow.cpp:177 #, kde-format msgid "Choose A for All Unsolved Whitespace Conflicts" msgstr "Изабери А за све нерешене сукобе празнина" -#: mergeresultwindow.cpp:165 +#: mergeresultwindow.cpp:178 #, kde-format msgid "Choose B for All Unsolved Whitespace Conflicts" msgstr "Изабери Б за све нерешене сукобе празнина" -#: mergeresultwindow.cpp:166 +#: mergeresultwindow.cpp:179 #, kde-format msgid "Choose C for All Unsolved Whitespace Conflicts" msgstr "Изабери Ц за све нерешене сукобе празнина" -#: mergeresultwindow.cpp:176 +#: mergeresultwindow.cpp:204 #, kde-format msgid "Number of remaining unsolved conflicts: %1 (of which %2 are whitespace)" msgstr "Број преосталих нерешених сукоба: %1 (од чега %2 празнине)." -#: mergeresultwindow.cpp:370 +#: mergeresultwindow.cpp:398 #, kde-format msgid "" "The output has been modified.\n" @@ -1929,29 +1939,29 @@ "Излаз је измењен.\n" "Ако наставите измене ће бити изгубљене." -#: mergeresultwindow.cpp:936 pdiff.cpp:827 +#: mergeresultwindow.cpp:964 pdiff.cpp:838 #, kde-format msgid "All input files are binary equal." msgstr "Сви улазни фајлови бинарно су једнаки." -#: mergeresultwindow.cpp:938 +#: mergeresultwindow.cpp:966 #, kde-format msgid "All input files contain the same text." msgstr "Сви улазни фајлови садрже исти текст." -#: mergeresultwindow.cpp:942 mergeresultwindow.cpp:946 -#: mergeresultwindow.cpp:950 pdiff.cpp:833 pdiff.cpp:837 pdiff.cpp:841 +#: mergeresultwindow.cpp:970 mergeresultwindow.cpp:974 +#: mergeresultwindow.cpp:978 pdiff.cpp:844 pdiff.cpp:848 pdiff.cpp:852 #, kde-format msgid "Files %1 and %2 are binary equal.\n" msgstr "Фајлови %1 и %2 бинарно су једнаки.\n" -#: mergeresultwindow.cpp:944 mergeresultwindow.cpp:948 -#: mergeresultwindow.cpp:952 +#: mergeresultwindow.cpp:972 mergeresultwindow.cpp:976 +#: mergeresultwindow.cpp:980 #, kde-format msgid "Files %1 and %2 have equal text.\n" msgstr "Фајлови %1 и %2 садрже исти текст.\n" -#: mergeresultwindow.cpp:958 +#: mergeresultwindow.cpp:986 #, kde-format msgid "" "Total number of conflicts: %1\n" @@ -1960,27 +1970,27 @@ "%4" msgstr "" -#: mergeresultwindow.cpp:964 +#: mergeresultwindow.cpp:992 #, kde-format msgid "Conflicts" msgstr "Сукоби" -#: mergeresultwindow.cpp:1873 +#: mergeresultwindow.cpp:1901 #, kde-format msgid "" msgstr "<нема изворног реда>" -#: mergeresultwindow.cpp:1881 +#: mergeresultwindow.cpp:1909 #, kde-format msgid "" msgstr "<сукоб стапања (само празнине)>" -#: mergeresultwindow.cpp:1883 mergeresultwindow.cpp:2755 +#: mergeresultwindow.cpp:1911 mergeresultwindow.cpp:2783 #, kde-format msgid "" msgstr "<сукоб стапања>" -#: mergeresultwindow.cpp:2967 +#: mergeresultwindow.cpp:2995 #, fuzzy, kde-format #| msgid "" #| "Not all conflicts are solved yet.\n" @@ -1992,12 +2002,12 @@ "Још нису решени сви сукоби.\n" "Фајл није сачуван.\n" -#: mergeresultwindow.cpp:2969 mergeresultwindow.cpp:2978 +#: mergeresultwindow.cpp:2997 mergeresultwindow.cpp:3006 #, kde-format msgid "Conflicts Left" msgstr "Преостали сукоби" -#: mergeresultwindow.cpp:2976 +#: mergeresultwindow.cpp:3004 #, fuzzy, kde-format #| msgid "" #| "There is a line end style conflict. Please choose the line end style " @@ -2011,7 +2021,7 @@ "Сукоб у стилу завршетака редова. Изаберите ручно стил завршетка редова.\n" "Фајл није сачуван.\n" -#: mergeresultwindow.cpp:2990 +#: mergeresultwindow.cpp:3018 #, kde-format msgid "" "\n" @@ -2022,65 +2032,65 @@ "\n" "Прављење резерве није успело. Фајл није сачуван." -#: mergeresultwindow.cpp:2990 mergeresultwindow.cpp:3038 +#: mergeresultwindow.cpp:3018 mergeresultwindow.cpp:3066 #, kde-format msgid "File Save Error" msgstr "Грешка уписивања фајла" -#: mergeresultwindow.cpp:3038 +#: mergeresultwindow.cpp:3066 #, kde-format msgid "Error while writing." msgstr "Грешка при писању." -#: mergeresultwindow.cpp:3110 +#: mergeresultwindow.cpp:3138 #, fuzzy, kde-format #| msgid "Output" msgid "Output:" msgstr "Излаз" -#: mergeresultwindow.cpp:3123 mergeresultwindow.cpp:3315 +#: mergeresultwindow.cpp:3151 mergeresultwindow.cpp:3343 #, kde-format msgid "[Modified]" msgstr "[измењен]" -#: mergeresultwindow.cpp:3130 +#: mergeresultwindow.cpp:3158 #, fuzzy, kde-format #| msgid "Encoding for saving" msgid "Encoding for saving:" msgstr "Кодирање за уписивање" -#: mergeresultwindow.cpp:3230 +#: mergeresultwindow.cpp:3258 #, kde-format msgid "Conflict" msgstr "Сукоб" # >! Merge sentence. -#: mergeresultwindow.cpp:3262 +#: mergeresultwindow.cpp:3290 #, fuzzy, kde-format #| msgid "Codec from" msgid "Codec from A: %1" msgstr "Кодирање из" # >! Merge sentence. -#: mergeresultwindow.cpp:3264 +#: mergeresultwindow.cpp:3292 #, fuzzy, kde-format #| msgid "Codec from" msgid "Codec from B: %1" msgstr "Кодирање из" # >! Merge sentence. -#: mergeresultwindow.cpp:3266 +#: mergeresultwindow.cpp:3294 #, fuzzy, kde-format #| msgid "Codec from" msgid "Codec from C: %1" msgstr "Кодирање из" -#: optiondialog.cpp:119 +#: optiondialog.cpp:121 #, kde-format msgid "Change Font" msgstr "" -#: optiondialog.cpp:135 optiondialog.cpp:145 +#: optiondialog.cpp:137 optiondialog.cpp:147 #, kde-format msgid "" "Font: %1, %2, %3\n" @@ -2088,165 +2098,165 @@ "Example:" msgstr "" -#: optiondialog.cpp:388 +#: optiondialog.cpp:390 #, kde-format msgid "Unicode" msgstr "уникод" -#: optiondialog.cpp:389 +#: optiondialog.cpp:391 #, kde-format msgid "Latin1" msgstr "латиница‑1" -#: optiondialog.cpp:408 +#: optiondialog.cpp:410 #, kde-format msgid "Change this if non-ASCII characters are not displayed correctly." msgstr "Измените ово ако су не‑аски знакови погрешно приказани." # >> @title:window -#: optiondialog.cpp:491 +#: optiondialog.cpp:495 #, kde-format msgid "Configure" msgstr "Подешавање" -#: optiondialog.cpp:568 +#: optiondialog.cpp:573 #, kde-format msgid "Font" msgstr "Фонт" -#: optiondialog.cpp:570 +#: optiondialog.cpp:575 #, kde-format msgid "Editor & Diff Output Font" msgstr "Фонт уређивача и излаза разлике" -#: optiondialog.cpp:589 +#: optiondialog.cpp:594 #, kde-format msgid "Application font" msgstr "" -#: optiondialog.cpp:594 +#: optiondialog.cpp:599 #, fuzzy, kde-format #| msgid "File Save Error" msgid "File view font" msgstr "Грешка уписивања фајла" -#: optiondialog.cpp:613 +#: optiondialog.cpp:618 #, fuzzy, kde-format #| msgid "Color" msgctxt "Title for color settings page" msgid "Color" msgstr "Боја" -#: optiondialog.cpp:614 +#: optiondialog.cpp:619 #, kde-format msgid "Colors Settings" msgstr "Поставке боја" -#: optiondialog.cpp:631 +#: optiondialog.cpp:644 #, kde-format msgid "Editor and Diff Views:" msgstr "Уређивач и прикази разлика:" -#: optiondialog.cpp:639 +#: optiondialog.cpp:652 #, kde-format msgid "Foreground color:" msgstr "Боја текста:" -#: optiondialog.cpp:647 +#: optiondialog.cpp:660 #, kde-format msgid "Background color:" msgstr "Боја позадине:" -#: optiondialog.cpp:657 +#: optiondialog.cpp:670 #, kde-format msgid "Diff background color:" msgstr "Боја позадине разлика:" -#: optiondialog.cpp:666 +#: optiondialog.cpp:679 #, kde-format msgid "Color A:" msgstr "Боја А:" -#: optiondialog.cpp:675 +#: optiondialog.cpp:688 #, kde-format msgid "Color B:" msgstr "Боја Б:" -#: optiondialog.cpp:684 +#: optiondialog.cpp:697 #, kde-format msgid "Color C:" msgstr "Боја Ц:" -#: optiondialog.cpp:692 +#: optiondialog.cpp:705 #, kde-format msgid "Conflict color:" msgstr "Боја сукоба:" -#: optiondialog.cpp:701 +#: optiondialog.cpp:714 #, kde-format msgid "Current range background color:" msgstr "Позадинска боја текућег опсега:" -#: optiondialog.cpp:710 +#: optiondialog.cpp:723 #, kde-format msgid "Current range diff background color:" msgstr "Позадинска боја текућег опсега разлика:" -#: optiondialog.cpp:718 +#: optiondialog.cpp:731 #, kde-format msgid "Color for manually aligned difference ranges:" msgstr "Боја ручно поравнатих опсега разлика:" -#: optiondialog.cpp:725 +#: optiondialog.cpp:738 #, kde-format msgid "Directory Comparison View:" msgstr "Приказ поређења фасцикли:" -#: optiondialog.cpp:731 +#: optiondialog.cpp:744 #, kde-format msgid "Newest file color:" msgstr "Боја најновијег фајла:" -#: optiondialog.cpp:736 +#: optiondialog.cpp:749 #, kde-format msgid "" "Changing this color will only be effective when starting the next directory " "comparison." msgstr "Измена ове боје ступиће на снагу од првог наредног поређења фасцикли." -#: optiondialog.cpp:741 +#: optiondialog.cpp:754 #, kde-format msgid "Oldest file color:" msgstr "Боја најстаријег фајла:" -#: optiondialog.cpp:750 +#: optiondialog.cpp:763 #, kde-format msgid "Middle age file color:" msgstr "Боја фајла средње старости:" -#: optiondialog.cpp:759 +#: optiondialog.cpp:772 #, kde-format msgid "Color for missing files:" msgstr "Боја за недостајуће фајлове:" -#: optiondialog.cpp:773 +#: optiondialog.cpp:786 #, kde-format msgid "Editor" msgstr "Уређивач" -#: optiondialog.cpp:774 +#: optiondialog.cpp:787 #, kde-format msgid "Editor Behavior" msgstr "Понашање уређивача" # skip-rule: t-tab -#: optiondialog.cpp:787 +#: optiondialog.cpp:809 #, kde-format msgid "Tab inserts spaces" msgstr "Tab умеће размаке" # rewrite-msgid: /generate/insert/ -#: optiondialog.cpp:791 +#: optiondialog.cpp:813 #, kde-format msgid "" "On: Pressing tab generates the appropriate number of spaces.\n" @@ -2255,27 +2265,27 @@ "Укључено: притиском Tab‑а умеће се одговарајући број размака.\n" "Искључено: умеће се знак табулатора." -#: optiondialog.cpp:796 +#: optiondialog.cpp:818 #, kde-format msgid "Tab size:" msgstr "Величина табулатора:" -#: optiondialog.cpp:803 +#: optiondialog.cpp:825 #, kde-format msgid "Auto indentation" msgstr "Аутоматско увлачење" -#: optiondialog.cpp:807 +#: optiondialog.cpp:829 #, kde-format msgid "On: The indentation of the previous line is used for a new line.\n" msgstr "Укључено: увлачење претходног реда узима се за нови ред.\n" -#: optiondialog.cpp:810 +#: optiondialog.cpp:832 #, kde-format msgid "Auto copy selection" msgstr "Аутоматско копирање избора" -#: optiondialog.cpp:814 +#: optiondialog.cpp:836 #, fuzzy, kde-format #| msgid "" #| "On: Any selection is immediately written to the clipboard.\n" @@ -2287,7 +2297,7 @@ "Укључено: сваки избор се одмах уписује у клипборд.\n" "Искључено: морате изричито копирати, нпр. помоћу Ctrl+C." -#: optiondialog.cpp:829 +#: optiondialog.cpp:851 #, kde-format msgid "" "Sets the line endings for when an edited file is saved.\n" @@ -2296,12 +2306,12 @@ "Поставља завршетке редова када се измењени фајл сачува.\n" "ДОС/Виндоуз CR+LF, Уникс LF, где је CR=0D, LF=0A." -#: optiondialog.cpp:839 +#: optiondialog.cpp:861 #, kde-format msgid "Diff" msgstr "Разликовање" -#: optiondialog.cpp:840 +#: optiondialog.cpp:862 #, kde-format msgid "Diff Settings" msgstr "Поставке разликовања" @@ -2316,13 +2326,13 @@ #. ); #. ++line; #. -#: optiondialog.cpp:865 +#: optiondialog.cpp:896 #, fuzzy, kde-format #| msgid "Treat as white space." msgid "Ignore numbers (treat as white space)" msgstr "Третирај као празнине." -#: optiondialog.cpp:869 +#: optiondialog.cpp:900 #, kde-format msgid "" "Ignore number characters during line matching phase. (Similar to Ignore " @@ -2333,45 +2343,45 @@ "празнина).\n" "Може бити корисно при поређењу фајлова са нумеричким подацима." -#: optiondialog.cpp:873 +#: optiondialog.cpp:904 #, fuzzy, kde-format #| msgid "Treat C/C++ comments like white space." msgid "Ignore C/C++ comments (treat as white space)" msgstr "Третирај Ц/Ц++ коментаре као празнине." -#: optiondialog.cpp:876 +#: optiondialog.cpp:907 #, kde-format msgid "Treat C/C++ comments like white space." msgstr "Третирај Ц/Ц++ коментаре као празнине." # >! Merge sentence. -#: optiondialog.cpp:879 +#: optiondialog.cpp:910 #, fuzzy, kde-format #| msgid "Treat as white space." msgid "Ignore case (treat as white space)" msgstr "Третирај као празнине." -#: optiondialog.cpp:883 +#: optiondialog.cpp:914 #, kde-format msgid "Treat case differences like white space changes. ('a'<=>'A')" msgstr "Третира разлику у величини као промене у празнинама (‘а’ једнако ‘А’)." -#: optiondialog.cpp:886 +#: optiondialog.cpp:917 #, kde-format msgid "Preprocessor command:" msgstr "Предобрадна наредба:" -#: optiondialog.cpp:891 +#: optiondialog.cpp:922 #, kde-format msgid "User defined pre-processing. (See the docs for details.)" msgstr "Кориснички дефинисана предобрада. Погледајте документацију за детаље." -#: optiondialog.cpp:894 +#: optiondialog.cpp:925 #, kde-format msgid "Line-matching preprocessor command:" msgstr "Предобрадна наредба за поклапање редова:" -#: optiondialog.cpp:899 +#: optiondialog.cpp:930 #, kde-format msgid "" "This pre-processor is only used during line matching.\n" @@ -2380,12 +2390,12 @@ "Предобрада се користи само током поклапања редова.\n" "Погледајте документацију за детаље." -#: optiondialog.cpp:902 +#: optiondialog.cpp:933 #, kde-format msgid "Try hard (slower)" msgstr "Потруди се (спорије)" -#: optiondialog.cpp:906 +#: optiondialog.cpp:937 #, kde-format msgid "" "Enables the --minimal option for the external diff.\n" @@ -2394,12 +2404,12 @@ "Укључује опцију --minimal за спољашње разликовање.\n" "Анализа великих фајлова ће бити много спорија." -#: optiondialog.cpp:910 +#: optiondialog.cpp:941 #, kde-format msgid "Align B and C for 3 input files" msgstr "Поравнај Б и Ц за три улазна фајла" -#: optiondialog.cpp:914 +#: optiondialog.cpp:945 #, kde-format msgid "" "Try to align B and C when comparing or merging three input files.\n" @@ -2410,17 +2420,24 @@ "Није препоручљиво за стапање зато што га може учинити сложенијим.\n" "Подразумевано је искључено." -#: optiondialog.cpp:926 +#: optiondialog.cpp:956 +#, fuzzy, kde-format +#| msgid "Merge" +msgctxt "Settings page" +msgid "Merge" +msgstr "Стопи" + +#: optiondialog.cpp:957 #, kde-format msgid "Merge Settings" msgstr "Поставке стапања" -#: optiondialog.cpp:940 +#: optiondialog.cpp:980 #, kde-format msgid "Auto advance delay (ms):" msgstr "Застој аутоматског напредовања (ms):" -#: optiondialog.cpp:946 +#: optiondialog.cpp:986 #, kde-format msgid "" "When in Auto-Advance mode the result of the current selection is shown \n" @@ -2429,27 +2446,27 @@ "У режиму аутоматског напредовања резултат текућег избора приказује се \n" "задато време пре скока на следећи сукоб. Опсег: 0–2000 ms." -#: optiondialog.cpp:950 +#: optiondialog.cpp:990 #, kde-format msgid "Show info dialogs" msgstr "Приказуј информативне дијалоге" -#: optiondialog.cpp:953 +#: optiondialog.cpp:993 #, kde-format msgid "Show a dialog with information about the number of conflicts." msgstr "Приказује дијалог са информацијом о броју сукоба." -#: optiondialog.cpp:956 +#: optiondialog.cpp:996 #, kde-format msgid "White space 2-file merge default:" msgstr "Подразумевано стапање празнина два фајла:" -#: optiondialog.cpp:961 optiondialog.cpp:974 +#: optiondialog.cpp:1001 optiondialog.cpp:1014 #, kde-format msgid "Manual Choice" msgstr "Ручни избор" -#: optiondialog.cpp:965 optiondialog.cpp:979 +#: optiondialog.cpp:1005 optiondialog.cpp:1019 #, kde-format msgid "" "Allow the merge algorithm to automatically select an input for white-space-" @@ -2458,22 +2475,22 @@ "Дозвољава алгоритму стапања да аутоматски изабере улаз за измене само у " "празнинама." -#: optiondialog.cpp:969 +#: optiondialog.cpp:1009 #, kde-format msgid "White space 3-file merge default:" msgstr "Подразумевано стапање празнина три фајла:" -#: optiondialog.cpp:983 +#: optiondialog.cpp:1023 #, kde-format msgid "Automatic Merge Regular Expression" msgstr "Регуларни израз за аутоматско стапање" -#: optiondialog.cpp:991 smalldialogs.cpp:449 +#: optiondialog.cpp:1031 smalldialogs.cpp:459 #, kde-format msgid "Auto merge regular expression:" msgstr "Регуларни израз за аутоматско стапање:" -#: optiondialog.cpp:996 +#: optiondialog.cpp:1036 #, kde-format msgid "" "Regular expression for lines where KDiff3 should automatically choose one " @@ -2485,30 +2502,30 @@ "извора. Кад регуларни израз поклопи ред са сукобом бира се Ц ако га има, " "иначе Б." -#: optiondialog.cpp:1002 +#: optiondialog.cpp:1042 #, kde-format msgid "Run regular expression auto merge on merge start" msgstr "Аутоматски стопи по регуларном изразу на почетку стапања" -#: optiondialog.cpp:1005 +#: optiondialog.cpp:1045 #, kde-format msgid "" "Run the merge for auto merge regular expressions\n" "immediately when a merge starts.\n" msgstr "Спроводи стапање регуларним изразом чим стапање почне.\n" -#: optiondialog.cpp:1010 +#: optiondialog.cpp:1050 #, kde-format msgid "Version Control History Merging" msgstr "Стапање историјата управљања верзијама" -#: optiondialog.cpp:1018 smalldialogs.cpp:476 +#: optiondialog.cpp:1058 smalldialogs.cpp:486 #, kde-format msgid "History start regular expression:" msgstr "Регуларни израз за почетак историјата:" # literal-segment: Log -#: optiondialog.cpp:1023 +#: optiondialog.cpp:1063 #, kde-format msgid "" "Regular expression for the start of the version control history entry.\n" @@ -2519,12 +2536,12 @@ "Овај ред обично садржи кључну реч „$Log$“.\n" "Подразумевана вредност је „.*\\$Log.*\\$.*“." -#: optiondialog.cpp:1029 smalldialogs.cpp:504 +#: optiondialog.cpp:1069 smalldialogs.cpp:514 #, kde-format msgid "History entry start regular expression:" msgstr "Регуларни израз за почетак уноса историјата:" -#: optiondialog.cpp:1042 +#: optiondialog.cpp:1082 #, kde-format msgid "" "A version control history entry consists of several lines.\n" @@ -2542,22 +2559,22 @@ "редовима.\n" "Детаље потражите у документацији." -#: optiondialog.cpp:1050 +#: optiondialog.cpp:1090 #, kde-format msgid "History merge sorting" msgstr "Ређање у стапању историјата" -#: optiondialog.cpp:1053 +#: optiondialog.cpp:1093 #, kde-format msgid "Sort version control history by a key." msgstr "Ређа историјат управљања верзијама по кључу." -#: optiondialog.cpp:1063 +#: optiondialog.cpp:1103 #, kde-format msgid "History entry start sort key order:" msgstr "Редослед ређања за кључеве уноса историјата:" -#: optiondialog.cpp:1068 +#: optiondialog.cpp:1108 #, kde-format msgid "" "Each pair of parentheses used in the regular expression for the history " @@ -2575,39 +2592,39 @@ "Ако се остави празно, ређање се не спроводи.\n" "Детаље потражите у документацији." -#: optiondialog.cpp:1079 +#: optiondialog.cpp:1119 #, kde-format msgid "Merge version control history on merge start" msgstr "Стопи историјат управљања верзијама на почетку стапања" -#: optiondialog.cpp:1082 +#: optiondialog.cpp:1122 #, kde-format msgid "Run version control history automerge on merge start." msgstr "Аутоматски стапа историјат управљања верзијама на почетку стапања." -#: optiondialog.cpp:1086 +#: optiondialog.cpp:1126 #, kde-format msgid "Max number of history entries:" msgstr "Највећи број уноса историјата:" # skip-rule: t-cut -#: optiondialog.cpp:1090 +#: optiondialog.cpp:1130 #, kde-format msgid "Cut off after specified number. Use -1 for infinite number of entries." msgstr "Одсеца изнад задатог броја. Ставите -1 за неограничен број уноса." # >> @action:button -#: optiondialog.cpp:1094 +#: optiondialog.cpp:1134 #, kde-format msgid "Test your regular expressions" msgstr "Испробај регуларне изразе" -#: optiondialog.cpp:1099 +#: optiondialog.cpp:1139 #, kde-format msgid "Irrelevant merge command:" msgstr "Наредба при безначајном стапању:" -#: optiondialog.cpp:1104 +#: optiondialog.cpp:1144 #, kde-format msgid "" "If specified this script is run after automerge\n" @@ -2618,12 +2635,12 @@ "никаквих преосталих измена.\n" "Позива се са аргументима: име‑фајла‑1 име‑фајла‑2 име‑фајла‑3" -#: optiondialog.cpp:1109 +#: optiondialog.cpp:1149 #, kde-format msgid "Auto save and quit on merge without conflicts" msgstr "Аутоматски сачувај и напусти при стапању без сукоба" -#: optiondialog.cpp:1113 +#: optiondialog.cpp:1153 #, kde-format msgid "" "If KDiff3 was started for a file-merge from the command line and all\n" @@ -2636,27 +2653,27 @@ "уписују и програм напушта.\n" "Слично опцији командне линије --auto." -#: optiondialog.cpp:1124 optiondialog.cpp:1125 +#: optiondialog.cpp:1164 optiondialog.cpp:1165 #, kde-format msgid "Directory" msgstr "Фасцикла" -#: optiondialog.cpp:1137 +#: optiondialog.cpp:1185 #, kde-format msgid "Recursive directories" msgstr "Рекурзивно кроз фасцикле" -#: optiondialog.cpp:1140 +#: optiondialog.cpp:1188 #, kde-format msgid "Whether to analyze subdirectories or not." msgstr "Да ли анализирати потфасцикле." -#: optiondialog.cpp:1142 +#: optiondialog.cpp:1190 #, kde-format msgid "File pattern(s):" msgstr "Обрасци фајлова:" -#: optiondialog.cpp:1148 +#: optiondialog.cpp:1196 #, kde-format msgid "" "Pattern(s) of files to be analyzed. \n" @@ -2667,12 +2684,12 @@ "Џокери: ‘*’ и ‘?’\n" "Више образаца наводите са тачка-запетом као раздвајачем." -#: optiondialog.cpp:1153 +#: optiondialog.cpp:1201 #, kde-format msgid "File-anti-pattern(s):" msgstr "Противобрасци фајлова:" -#: optiondialog.cpp:1159 +#: optiondialog.cpp:1207 #, kde-format msgid "" "Pattern(s) of files to be excluded from analysis. \n" @@ -2683,12 +2700,12 @@ "Џокери: ‘*’ и ‘?’\n" "Више образаца наводите са тачка-запетом као раздвајачем." -#: optiondialog.cpp:1164 +#: optiondialog.cpp:1212 #, kde-format msgid "Dir-anti-pattern(s):" msgstr "Противобрасци фасцикли:" -#: optiondialog.cpp:1170 +#: optiondialog.cpp:1218 #, kde-format msgid "" "Pattern(s) of directories to be excluded from analysis. \n" @@ -2699,12 +2716,12 @@ "Џокери: ‘*’ и ‘?’\n" "Више образаца наводите са тачка-запетом као раздвајачем." -#: optiondialog.cpp:1175 +#: optiondialog.cpp:1223 #, kde-format msgid "Use .cvsignore" msgstr "Користи .cvsignore" -#: optiondialog.cpp:1179 +#: optiondialog.cpp:1227 #, kde-format msgid "" "Extends the antipattern to anything that would be ignored by CVS.\n" @@ -2713,23 +2730,23 @@ "Проширује противобрасце на све што би игнорисао ЦВС.\n" "Преко локалних фајлова .cvsignore ово може бити посебно по фасцикли." -#: optiondialog.cpp:1183 +#: optiondialog.cpp:1231 #, kde-format msgid "Find hidden files and directories" msgstr "Пронађи скривене фајлове и фасцикле" -#: optiondialog.cpp:1186 +#: optiondialog.cpp:1234 #, fuzzy, kde-format #| msgid "Find hidden files and directories" msgid "Finds hidden files and directories." msgstr "Пронађи скривене фајлове и фасцикле" -#: optiondialog.cpp:1189 +#: optiondialog.cpp:1237 #, kde-format msgid "Follow file links" msgstr "Прати везе фајлова" -#: optiondialog.cpp:1193 +#: optiondialog.cpp:1241 #, kde-format msgid "" "On: Compare the file the link points to.\n" @@ -2738,12 +2755,12 @@ "Укључено: пореди фајлове на које показују везе.\n" "Искључено: пореди везе." -#: optiondialog.cpp:1197 +#: optiondialog.cpp:1245 #, kde-format msgid "Follow directory links" msgstr "Прати везе фасцикли" -#: optiondialog.cpp:1201 +#: optiondialog.cpp:1249 #, kde-format msgid "" "On: Compare the directory the link points to.\n" @@ -2752,12 +2769,12 @@ "Укључено: пореди фасцикле на које показују везе.\n" "Искључено: пореди везе." -#: optiondialog.cpp:1210 +#: optiondialog.cpp:1258 #, kde-format msgid "Case sensitive filename comparison" msgstr "Поређење имена фајлова разликује величину слова" -#: optiondialog.cpp:1214 +#: optiondialog.cpp:1262 #, kde-format msgid "" "The directory comparison will compare files or directories when their names " @@ -2769,52 +2786,52 @@ "Задајте ову опцију имена треба да се поклапају и по величини слова. " "Подразумевано је искључено под Виндоузом, иначе је укључено." -#: optiondialog.cpp:1218 +#: optiondialog.cpp:1266 #, fuzzy, kde-format #| msgid "Unfold All Subdirs" msgid "Unfold all subdirectories on load" msgstr "Рашири све потфасцикле" -#: optiondialog.cpp:1222 +#: optiondialog.cpp:1270 #, kde-format msgid "" "On: Unfold all subdirectories when starting a directory diff.\n" "Off: Leave subdirectories folded." msgstr "" -#: optiondialog.cpp:1226 +#: optiondialog.cpp:1274 #, kde-format msgid "Skip directory status report" msgstr "" -#: optiondialog.cpp:1230 +#: optiondialog.cpp:1278 #, kde-format msgid "" "On: Do not show the Directory Comparison Status.\n" "Off: Show the status dialog on start." msgstr "" -#: optiondialog.cpp:1234 +#: optiondialog.cpp:1282 #, kde-format msgid "File Comparison Mode" msgstr "Режим поређења фајлова" -#: optiondialog.cpp:1239 +#: optiondialog.cpp:1287 #, kde-format msgid "Binary comparison" msgstr "Бинарно поређење" -#: optiondialog.cpp:1241 +#: optiondialog.cpp:1289 #, kde-format msgid "Binary comparison of each file. (Default)" msgstr "Бинарно поређење за сваки фајл (подразумевано)." -#: optiondialog.cpp:1244 +#: optiondialog.cpp:1292 #, kde-format msgid "Full analysis" msgstr "Пуна анализа" -#: optiondialog.cpp:1246 +#: optiondialog.cpp:1294 #, kde-format msgid "" "Do a full analysis and show statistics information in extra columns.\n" @@ -2823,12 +2840,12 @@ "Спроводи пуну анализу и даје статистичке податке у додатним колонама.\n" "Спорије него бинарно поређење, много спорије за бинарне фајлове." -#: optiondialog.cpp:1250 +#: optiondialog.cpp:1298 #, kde-format msgid "Trust the size and modification date (unsafe)" msgstr "Веруј величини и датуму измене (несигурно)" -#: optiondialog.cpp:1252 +#: optiondialog.cpp:1300 #, kde-format msgid "" "Assume that files are equal if the modification date and file length are " @@ -2843,7 +2860,7 @@ "различитим.\n" "Корисно за велике фасцикле или споре мреже." -#: optiondialog.cpp:1257 +#: optiondialog.cpp:1305 #, kde-format msgid "" "Trust the size and date, but use binary comparison if date does not match " @@ -2852,7 +2869,7 @@ "Веруј величини и датуму, али бинарно упореди ако се датум не поклапа " "(несигурно)" -#: optiondialog.cpp:1259 +#: optiondialog.cpp:1307 #, kde-format msgid "" "Assume that files are equal if the modification date and file length are " @@ -2865,12 +2882,12 @@ "Ако датуми нису исти али величина јесте, бинарно упоређује.\n" "Корисно за велике фасцикле или споре мреже." -#: optiondialog.cpp:1264 +#: optiondialog.cpp:1312 #, kde-format msgid "Trust the size (unsafe)" msgstr "Веруј величини (несигурно)" -#: optiondialog.cpp:1266 +#: optiondialog.cpp:1314 #, kde-format msgid "" "Assume that files are equal if their file lengths are equal.\n" @@ -2881,12 +2898,12 @@ "Корисно за велике фасцикле или споре мреже када се датум измени током " "преузимања." -#: optiondialog.cpp:1273 +#: optiondialog.cpp:1321 #, kde-format msgid "Synchronize directories" msgstr "Синхронизуј фасцикле" -#: optiondialog.cpp:1277 +#: optiondialog.cpp:1325 #, kde-format msgid "" "Offers to store files in both directories so that\n" @@ -2896,12 +2913,12 @@ "Нуди да складишти фајлове у обе фасцикле тако да испадну исте после тога.\n" "Ради само када се пореде две фасцикле без задавања одредишта." -#: optiondialog.cpp:1283 +#: optiondialog.cpp:1331 #, kde-format msgid "White space differences considered equal" msgstr "Разлике у празнинама сматрају се једнаким" -#: optiondialog.cpp:1287 +#: optiondialog.cpp:1335 #, kde-format msgid "" "If files differ only by white space consider them equal.\n" @@ -2911,12 +2928,12 @@ "Ово је активно само када се изабере пуна анализа." # >> copy newer file -#: optiondialog.cpp:1293 +#: optiondialog.cpp:1341 #, kde-format msgid "Copy newer instead of merging (unsafe)" msgstr "Копирај новији уместо стапања (несигурно)" -#: optiondialog.cpp:1297 +#: optiondialog.cpp:1345 #, fuzzy, kde-format #| msgid "" #| "Don't look inside, just take the newer file.\n" @@ -2931,12 +2948,12 @@ "Користите ово само ако знате шта радите!\n" "Има ефекта само при поређењу две фасцикле." -#: optiondialog.cpp:1302 +#: optiondialog.cpp:1350 #, kde-format msgid "Backup files (.orig)" msgstr "Прави резерве фајлова (.orig)" -#: optiondialog.cpp:1306 +#: optiondialog.cpp:1354 #, kde-format msgid "" "If a file would be saved over an old file, then the old file\n" @@ -2946,17 +2963,17 @@ "преименован са наставком .orig уместо да буде обрисан." # rewrite-msgid: /Regional/Locale/ -#: optiondialog.cpp:1382 optiondialog.cpp:1383 +#: optiondialog.cpp:1430 optiondialog.cpp:1431 #, kde-format msgid "Regional Settings" msgstr "Поставке локалитета" -#: optiondialog.cpp:1397 +#: optiondialog.cpp:1454 #, kde-format msgid "Use the same encoding for everything:" msgstr "Исто кодирање за све:" -#: optiondialog.cpp:1401 +#: optiondialog.cpp:1458 #, kde-format msgid "" "Enable this allows to change all encodings by changing the first only.\n" @@ -2966,18 +2983,18 @@ "Искључите ово ако поједине поставке треба да буду различите." # >! Merge sentence. -#: optiondialog.cpp:1405 +#: optiondialog.cpp:1462 #, fuzzy, kde-format #| msgid "Note: Local Encoding is " msgid "Note: Local Encoding is \"%1\"" msgstr "Напомена: локално кодирање је " -#: optiondialog.cpp:1409 +#: optiondialog.cpp:1466 #, kde-format msgid "File Encoding for A:" msgstr "Кодирање фајла за А:" -#: optiondialog.cpp:1416 +#: optiondialog.cpp:1473 #, kde-format msgid "" "If enabled then Unicode (UTF-16 or UTF-8) encoding will be detected.\n" @@ -2989,32 +3006,32 @@ "Ако фајл није уникодски изабрано кодирање ће бити употребљено као одступно.\n" "Откривање уникода зависи од првих бајтова у фајлу." -#: optiondialog.cpp:1419 optiondialog.cpp:1430 optiondialog.cpp:1441 +#: optiondialog.cpp:1476 optiondialog.cpp:1487 optiondialog.cpp:1498 #, kde-format msgid "Auto Detect Unicode" msgstr "Аутоматски откриј уникод" -#: optiondialog.cpp:1425 +#: optiondialog.cpp:1482 #, kde-format msgid "File Encoding for B:" msgstr "Кодирање фајла за Б:" -#: optiondialog.cpp:1436 +#: optiondialog.cpp:1493 #, kde-format msgid "File Encoding for C:" msgstr "Кодирање фајла за Ц:" -#: optiondialog.cpp:1447 +#: optiondialog.cpp:1504 #, kde-format msgid "File Encoding for Merge Output and Saving:" msgstr "Кодирање фајла за стопљени излаз и уписивање:" -#: optiondialog.cpp:1452 +#: optiondialog.cpp:1509 #, kde-format msgid "Auto Select" msgstr "Аутоматски изабери" -#: optiondialog.cpp:1456 +#: optiondialog.cpp:1513 #, kde-format msgid "" "If enabled then the encoding from the input files is used.\n" @@ -3025,17 +3042,17 @@ "У двосмисленим случајевима издаје се дијалог где корисник бира кодирање за " "уписивање." -#: optiondialog.cpp:1459 +#: optiondialog.cpp:1516 #, kde-format msgid "File Encoding for Preprocessor Files:" msgstr "Кодирање фајла за предобрадне фајлове:" -#: optiondialog.cpp:1471 +#: optiondialog.cpp:1528 #, kde-format msgid "Right To Left Language" msgstr "Језици здесна улево" -#: optiondialog.cpp:1475 +#: optiondialog.cpp:1532 #, kde-format msgid "" "Some languages are read from right to left.\n" @@ -3044,22 +3061,22 @@ "Неки језици се читају здесна улево.\n" "Ова поставка прилагођава томе приказивач и уређивач." -#: optiondialog.cpp:1485 +#: optiondialog.cpp:1542 #, kde-format msgid "Integration" msgstr "Уклапање" -#: optiondialog.cpp:1486 +#: optiondialog.cpp:1543 #, kde-format msgid "Integration Settings" msgstr "Поставке уклапања" -#: optiondialog.cpp:1499 +#: optiondialog.cpp:1564 #, kde-format msgid "Command line options to ignore:" msgstr "Занемари опције командне линије:" -#: optiondialog.cpp:1505 +#: optiondialog.cpp:1570 #, kde-format msgid "" "List of command line options that should be ignored when KDiff3 is used by " @@ -3072,12 +3089,12 @@ "Више вредности можете задати раздвојене тачка-запетом.\n" "Овим се сузбија грешка „непозната опција“." -#: optiondialog.cpp:1510 +#: optiondialog.cpp:1575 #, kde-format msgid "Quit also via Escape key" msgstr "Напуштање и преко тастера Esc" -#: optiondialog.cpp:1514 +#: optiondialog.cpp:1579 #, kde-format msgid "" "Fast method to exit.\n" @@ -3086,7 +3103,7 @@ "Брз начин напуштања.\n" "За оне навикнуте на тастер Esc у ову сврху." -#: optiondialog.cpp:1598 +#: optiondialog.cpp:1653 #, kde-format msgid "This resets all options. Not only those of the current topic." msgstr "Ово ресетује све опције, и то не само оне у текућој теми." @@ -3142,85 +3159,77 @@ msgstr "Искључи несигурне опције" # >> @info:progress -#: pdiff.cpp:158 +#: pdiff.cpp:160 #, kde-format msgid "Loading A" msgstr "Учитавам А" -#: pdiff.cpp:167 -#, kde-format -msgid "Errors occurred during pre-processing of file A." -msgstr "" +# >> @info:progress +#: pdiff.cpp:162 +#, fuzzy, kde-format +#| msgid "Loading A" +msgid "Loading A: %1" +msgstr "Учитавам А" # >> @info:progress -#: pdiff.cpp:172 +#: pdiff.cpp:170 #, kde-format msgid "Loading B" msgstr "Учитавам Б" -#: pdiff.cpp:179 -#, kde-format -msgid "Errors occurred during pre-processing of file B." -msgstr "" - # >> @info:progress -#: pdiff.cpp:202 pdiff.cpp:241 +#: pdiff.cpp:201 pdiff.cpp:237 #, kde-format msgid "Diff: A <-> B" msgstr "Разликујем А и Б" # >> @info:progress -#: pdiff.cpp:208 pdiff.cpp:279 pdiff.cpp:293 +#: pdiff.cpp:207 pdiff.cpp:275 pdiff.cpp:289 #, kde-format msgid "Linediff: A <-> B" msgstr "Разликујем редове А и Б" # >> @info:progress -#: pdiff.cpp:225 +#: pdiff.cpp:224 #, kde-format msgid "Loading C" msgstr "Учитавам Ц" -#: pdiff.cpp:232 -#, kde-format -msgid "Errors occurred during pre-processing of file C." -msgstr "" - # >> @info:progress -#: pdiff.cpp:250 +#: pdiff.cpp:246 #, kde-format msgid "Diff: A <-> C" msgstr "Разликујем А и Ц" # >> @info:progress -#: pdiff.cpp:261 +#: pdiff.cpp:257 #, kde-format msgid "Diff: B <-> C" msgstr "Разликујем Б и Ц" # >> @info:progress -#: pdiff.cpp:283 pdiff.cpp:297 +#: pdiff.cpp:279 pdiff.cpp:293 #, kde-format msgid "Linediff: B <-> C" msgstr "Разликујем редове Б и Ц" # >> @info:progress -#: pdiff.cpp:287 pdiff.cpp:301 +#: pdiff.cpp:283 pdiff.cpp:297 #, kde-format msgid "Linediff: A <-> C" msgstr "Разликујем редове А и Ц" -#: pdiff.cpp:829 +#: pdiff.cpp:840 #, kde-format msgid "All input files contain the same text, but are not binary equal." msgstr "Сви улазни фајлови садрже исти текст, али нису бинарно једнаки." -#: pdiff.cpp:835 pdiff.cpp:839 pdiff.cpp:843 +#: pdiff.cpp:846 pdiff.cpp:850 pdiff.cpp:854 #, kde-format msgid "Files %1 and %2 have equal text, but are not binary equal. \n" msgstr "Фајлови %1 и %2 имају исти текст али нису бинарно једнаки.\n" -#: pdiff.cpp:853 +#: pdiff.cpp:864 #, fuzzy, kde-format #| msgid "" #| "Some inputfiles don't seem to be pure textfiles.\n" @@ -3235,17 +3244,17 @@ "Имајте на уму да стапање у К‑диф3 није намењено бинарним подацима.\n" "Наставите на сопствену одговорност." -#: pdiff.cpp:863 +#: pdiff.cpp:874 #, kde-format msgid ", B" msgstr "" -#: pdiff.cpp:865 +#: pdiff.cpp:876 #, kde-format msgid ", C" msgstr "" -#: pdiff.cpp:867 +#: pdiff.cpp:878 #, fuzzy, kde-format #| msgid "" #| "Some input characters could not be converted to valid unicode.\n" @@ -3263,77 +3272,72 @@ "Не уписујте резултат ако нисте сигурни. Наставите на сопствену одговорност.\n" "Погођени улазни фајлови налазе се у %1." -#: pdiff.cpp:1034 +#: pdiff.cpp:1053 #, kde-format msgid "Abort" msgstr "Обустави" -#: pdiff.cpp:1040 pdiff.cpp:1130 +#: pdiff.cpp:1059 pdiff.cpp:1150 #, kde-format msgid "Opening files..." msgstr "Отварам фајлове..." -#: pdiff.cpp:1107 -#, kde-format -msgid "File open error" -msgstr "Грешка при отварању фајла" - -#: pdiff.cpp:1202 +#: pdiff.cpp:1222 #, kde-format msgid "Cutting selection..." msgstr "Исецам изабрано..." -#: pdiff.cpp:1223 +#: pdiff.cpp:1243 #, kde-format msgid "Copying selection to clipboard..." msgstr "Копирам избор у клипборд..." -#: pdiff.cpp:1239 +#: pdiff.cpp:1259 #, kde-format msgid "Inserting clipboard contents..." msgstr "Умећем садржај клипборда..." -#: pdiff.cpp:1695 +#: pdiff.cpp:1715 #, kde-format msgid "Word wrap (Cancel disables word wrap)" msgstr "" -#: pdiff.cpp:1696 +#: pdiff.cpp:1716 #, kde-format msgid "Calculating max width for horizontal scrollbar" msgstr "" -#: pdiff.cpp:1911 +#: pdiff.cpp:1931 #, kde-format msgid "Save && Continue" msgstr "Сачувај и настави" -#: pdiff.cpp:1912 +#: pdiff.cpp:1932 #, kde-format msgid "Continue Without Saving" msgstr "Настави без уписивања" -#: pdiff.cpp:2124 +#: pdiff.cpp:2144 #, kde-format msgid "Search complete." msgstr "Претрага је готова." -#: pdiff.cpp:2124 +#: pdiff.cpp:2144 #, kde-format msgid "Search Complete" msgstr "Претрага завршена" -#: pdiff.cpp:2375 +#: pdiff.cpp:2395 #, kde-format msgid "Nothing is selected in either diff input window." msgstr "Ништа није изабрано ни у једном прозору улаза разлике." -#: pdiff.cpp:2375 +#: pdiff.cpp:2395 #, kde-format msgid "Error while adding manual diff range" msgstr "Грешка при додавању ручног опсега разлике" -#: progress.cpp:59 progress.cpp:71 +#: progress.cpp:61 progress.cpp:73 #, kde-format msgid "&Cancel" msgstr "&Одустани" @@ -3343,127 +3347,127 @@ msgid "A (Base):" msgstr "А (база):" -#: smalldialogs.cpp:68 smalldialogs.cpp:85 smalldialogs.cpp:102 -#: smalldialogs.cpp:144 +#: smalldialogs.cpp:71 smalldialogs.cpp:90 smalldialogs.cpp:109 +#: smalldialogs.cpp:154 #, kde-format msgid "File..." msgstr "Фајл..." -#: smalldialogs.cpp:70 smalldialogs.cpp:87 smalldialogs.cpp:104 -#: smalldialogs.cpp:146 +#: smalldialogs.cpp:73 smalldialogs.cpp:92 smalldialogs.cpp:111 +#: smalldialogs.cpp:156 #, kde-format msgid "Dir..." msgstr "Фасцикла..." -#: smalldialogs.cpp:96 +#: smalldialogs.cpp:103 #, kde-format msgid "C (Optional):" msgstr "Ц (опционо):" -#: smalldialogs.cpp:119 +#: smalldialogs.cpp:126 #, fuzzy, kde-format #| msgid "Swap/Copy Names ..." msgid "Swap/Copy Names..." msgstr "Размени/копирај имена..." -#: smalldialogs.cpp:124 smalldialogs.cpp:125 smalldialogs.cpp:126 +#: smalldialogs.cpp:131 smalldialogs.cpp:132 smalldialogs.cpp:133 #, kde-format msgid "Swap %1<->%2" msgstr "Размени %1 и %2" -#: smalldialogs.cpp:127 smalldialogs.cpp:128 smalldialogs.cpp:129 +#: smalldialogs.cpp:134 smalldialogs.cpp:135 smalldialogs.cpp:136 #, kde-format msgid "Copy %1->Output" msgstr "Копирај %1 у излаз" -#: smalldialogs.cpp:130 smalldialogs.cpp:131 smalldialogs.cpp:132 +#: smalldialogs.cpp:137 smalldialogs.cpp:138 smalldialogs.cpp:139 #, kde-format msgid "Swap %1<->Output" msgstr "Размени %1 и излаз" -#: smalldialogs.cpp:138 +#: smalldialogs.cpp:148 #, kde-format msgid "Output (optional):" msgstr "Излаз (опционо):" -#: smalldialogs.cpp:168 +#: smalldialogs.cpp:178 #, kde-format msgid "Configure..." msgstr "Подеси..." -#: smalldialogs.cpp:233 +#: smalldialogs.cpp:243 #, fuzzy, kde-format #| msgid "Directory" msgid "Open Directory" msgstr "Фасцикла" -#: smalldialogs.cpp:234 +#: smalldialogs.cpp:244 #, kde-format msgid "Select Output File" msgstr "" -#: smalldialogs.cpp:393 +#: smalldialogs.cpp:403 #, kde-format msgid "Search text:" msgstr "Тражени текст:" -#: smalldialogs.cpp:400 +#: smalldialogs.cpp:410 #, kde-format msgid "Case sensitive" msgstr "Разликуј величину слова" -#: smalldialogs.cpp:403 +#: smalldialogs.cpp:413 #, kde-format msgid "Search A" msgstr "Претражи А" -#: smalldialogs.cpp:408 +#: smalldialogs.cpp:418 #, kde-format msgid "Search B" msgstr "Претражи Б" -#: smalldialogs.cpp:413 +#: smalldialogs.cpp:423 #, kde-format msgid "Search C" msgstr "Претражи Ц" -#: smalldialogs.cpp:418 +#: smalldialogs.cpp:428 #, kde-format msgid "Search output" msgstr "Излаз претраге" -#: smalldialogs.cpp:425 +#: smalldialogs.cpp:435 #, kde-format msgid "&Search" msgstr "&Тражи" -#: smalldialogs.cpp:444 +#: smalldialogs.cpp:454 #, kde-format msgid "Regular Expression Tester" msgstr "Проба регуларних израза" -#: smalldialogs.cpp:457 +#: smalldialogs.cpp:467 #, kde-format msgid "Example auto merge line:" msgstr "Пример реда за аутоматско стапање:" -#: smalldialogs.cpp:459 +#: smalldialogs.cpp:469 #, kde-format msgid "To test auto merge, copy a line as used in your files." msgstr "" "За пробу аутоматског стапања, копирајте ред какав се налази у фајловима." -#: smalldialogs.cpp:465 smalldialogs.cpp:493 smalldialogs.cpp:529 +#: smalldialogs.cpp:475 smalldialogs.cpp:503 smalldialogs.cpp:539 #, kde-format msgid "Match result:" msgstr "Резултат поклапања:" -#: smalldialogs.cpp:484 +#: smalldialogs.cpp:494 #, kde-format msgid "Example history start line (with leading comment):" msgstr "Пример почетног реда историјата (са водећим коментаром):" -#: smalldialogs.cpp:486 +#: smalldialogs.cpp:496 #, kde-format msgid "" "Copy a history start line as used in your files,\n" @@ -3472,17 +3476,17 @@ "Копирајте почетни ред историјата какав се налази у фајловима, укључујући и " "водећи коментар." -#: smalldialogs.cpp:512 +#: smalldialogs.cpp:522 #, kde-format msgid "History sort key order:" msgstr "Редослед ређања кључева историјата:" -#: smalldialogs.cpp:520 +#: smalldialogs.cpp:530 #, kde-format msgid "Example history entry start line (without leading comment):" msgstr "Пример почетног реда ставке историјата (без водећег коментара):" -#: smalldialogs.cpp:522 +#: smalldialogs.cpp:532 #, kde-format msgid "" "Copy a history entry start line as used in your files,\n" @@ -3491,48 +3495,48 @@ "Копирајте почетни ред ставке историјата какав се налази у фајловима, али " "изостављајући водећи коментар." -#: smalldialogs.cpp:536 +#: smalldialogs.cpp:546 #, kde-format msgid "Sort key result:" msgstr "Резултат ређања кључева:" -#: smalldialogs.cpp:584 smalldialogs.cpp:594 smalldialogs.cpp:614 +#: smalldialogs.cpp:594 smalldialogs.cpp:604 smalldialogs.cpp:624 #, kde-format msgid "Match success." msgstr "Поклапање је успело." -#: smalldialogs.cpp:588 smalldialogs.cpp:598 smalldialogs.cpp:620 +#: smalldialogs.cpp:598 smalldialogs.cpp:608 smalldialogs.cpp:630 #, kde-format msgid "Match failed." msgstr "Поклапање није успело." -#: smalldialogs.cpp:605 +#: smalldialogs.cpp:615 #, kde-format msgid "Opening and closing parentheses do not match in regular expression." msgstr "Не поклапају се отворене и затворене заграде у регуларном изразу." -#: SourceData.cpp:150 +#: SourceData.cpp:153 #, kde-format msgid "Writing clipboard data to temp file failed." msgstr "Уписивање података из клипборда у привремени фајл није успело." -#: SourceData.cpp:154 +#: SourceData.cpp:157 #, kde-format msgid "From Clipboard" msgstr "Из клипборда" -#: SourceData.cpp:335 +#: SourceData.cpp:348 #, fuzzy, kde-format #| msgid "Mix of links and normal files." msgid "%1 is not a normal file." msgstr "Мешавина веза и нормалних фајлова." -#: SourceData.cpp:427 +#: SourceData.cpp:440 #, kde-format msgid " Temp file is: %1" msgstr "" -#: SourceData.cpp:432 +#: SourceData.cpp:445 #, kde-format msgid "" "Preprocessing possibly failed. Check this command:\n" @@ -3547,12 +3551,12 @@ "\n" "Наредба предобраде ће сада бити деактивирана." -#: SourceData.cpp:443 SourceData.cpp:507 +#: SourceData.cpp:456 SourceData.cpp:525 #, kde-format msgid "File %1 too large to process. Skipping." msgstr "" -#: SourceData.cpp:487 +#: SourceData.cpp:500 #, kde-format msgid "" "The line-matching-preprocessing possibly failed. Check this command:\n" diff -Nru kdiff3-1.8.01/po/sr@ijekavian/kdiff3fileitemactionplugin.po kdiff3-1.8.3/po/sr@ijekavian/kdiff3fileitemactionplugin.po --- kdiff3-1.8.01/po/sr@ijekavian/kdiff3fileitemactionplugin.po 2019-05-18 01:02:25.000000000 +0000 +++ kdiff3-1.8.3/po/sr@ijekavian/kdiff3fileitemactionplugin.po 2020-06-25 00:18:52.000000000 +0000 @@ -3,8 +3,8 @@ msgid "" msgstr "" "Project-Id-Version: kdiff3fileitemactionplugin\n" -"Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2019-03-22 03:09+0100\n" +"Report-Msgid-Bugs-To: https://bugs.kde.org\n" +"POT-Creation-Date: 2019-08-30 07:40+0200\n" "PO-Revision-Date: 2017-09-28 17:57+0200\n" "Last-Translator: Chusslove Illich \n" "Language-Team: Serbian \n" diff -Nru kdiff3-1.8.01/po/sr@ijekavian/kdiff3.po kdiff3-1.8.3/po/sr@ijekavian/kdiff3.po --- kdiff3-1.8.01/po/sr@ijekavian/kdiff3.po 2019-05-18 01:02:25.000000000 +0000 +++ kdiff3-1.8.3/po/sr@ijekavian/kdiff3.po 2020-06-25 00:18:52.000000000 +0000 @@ -4,8 +4,8 @@ msgid "" msgstr "" "Project-Id-Version: kdiff3\n" -"Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2019-03-30 07:52+0100\n" +"Report-Msgid-Bugs-To: https://bugs.kde.org\n" +"POT-Creation-Date: 2020-06-15 06:48+0200\n" "PO-Revision-Date: 2017-09-28 17:57+0200\n" "Last-Translator: Chusslove Illich \n" "Language-Team: Serbian \n" @@ -30,301 +30,301 @@ msgid "Your emails" msgstr "slsimic@gmail.com,caslav.ilic@gmx.net" -#: difftextwindow.cpp:412 +#: difftextwindow.cpp:414 #, kde-format msgid "File %1: Line %2" msgstr "" -#: difftextwindow.cpp:414 +#: difftextwindow.cpp:416 #, fuzzy, kde-format #| msgid "Line not available" msgid "File %1: Line not available" msgstr "ред недоступан" -#: difftextwindow.cpp:1780 +#: difftextwindow.cpp:1778 #, kde-format msgid "Encoding:" msgstr "Кодирање:" -#: difftextwindow.cpp:1782 mergeresultwindow.cpp:3138 optiondialog.cpp:818 +#: difftextwindow.cpp:1781 mergeresultwindow.cpp:3166 optiondialog.cpp:840 #, kde-format msgid "Line end style:" msgstr "Стил краја редова:" -#: difftextwindow.cpp:1810 directorymergewindow.cpp:382 -#: directorymergewindow.cpp:433 directorymergewindow.cpp:524 -#: directorymergewindow.cpp:3058 directorymergewindow.cpp:3189 -#: directorymergewindow.cpp:3417 mergeresultwindow.cpp:942 -#: mergeresultwindow.cpp:944 mergeresultwindow.cpp:946 -#: mergeresultwindow.cpp:948 mergeresultwindow.cpp:1814 -#: mergeresultwindow.cpp:3170 mergeresultwindow.cpp:3177 optiondialog.cpp:962 -#: optiondialog.cpp:975 pdiff.cpp:833 pdiff.cpp:835 pdiff.cpp:837 pdiff.cpp:839 -#: pdiff.cpp:861 smalldialogs.cpp:124 smalldialogs.cpp:126 smalldialogs.cpp:127 -#: smalldialogs.cpp:130 +#: difftextwindow.cpp:1809 directorymergewindow.cpp:383 +#: directorymergewindow.cpp:434 directorymergewindow.cpp:525 +#: directorymergewindow.cpp:3069 directorymergewindow.cpp:3200 +#: directorymergewindow.cpp:3428 mergeresultwindow.cpp:970 +#: mergeresultwindow.cpp:972 mergeresultwindow.cpp:974 +#: mergeresultwindow.cpp:976 mergeresultwindow.cpp:1842 +#: mergeresultwindow.cpp:3198 mergeresultwindow.cpp:3205 optiondialog.cpp:1002 +#: optiondialog.cpp:1015 pdiff.cpp:844 pdiff.cpp:846 pdiff.cpp:848 +#: pdiff.cpp:850 pdiff.cpp:872 smalldialogs.cpp:131 smalldialogs.cpp:133 +#: smalldialogs.cpp:134 smalldialogs.cpp:137 #, kde-format msgid "A" msgstr "А" -#: difftextwindow.cpp:1810 directorymergewindow.cpp:384 -#: directorymergewindow.cpp:436 directorymergewindow.cpp:526 -#: directorymergewindow.cpp:3064 directorymergewindow.cpp:3190 -#: directorymergewindow.cpp:3418 mergeresultwindow.cpp:942 -#: mergeresultwindow.cpp:944 mergeresultwindow.cpp:950 -#: mergeresultwindow.cpp:952 mergeresultwindow.cpp:1816 -#: mergeresultwindow.cpp:3172 mergeresultwindow.cpp:3179 optiondialog.cpp:963 -#: optiondialog.cpp:976 pdiff.cpp:833 pdiff.cpp:835 pdiff.cpp:841 pdiff.cpp:843 -#: pdiff.cpp:863 smalldialogs.cpp:124 smalldialogs.cpp:125 smalldialogs.cpp:128 -#: smalldialogs.cpp:131 +#: difftextwindow.cpp:1809 directorymergewindow.cpp:385 +#: directorymergewindow.cpp:437 directorymergewindow.cpp:527 +#: directorymergewindow.cpp:3075 directorymergewindow.cpp:3201 +#: directorymergewindow.cpp:3429 mergeresultwindow.cpp:970 +#: mergeresultwindow.cpp:972 mergeresultwindow.cpp:978 +#: mergeresultwindow.cpp:980 mergeresultwindow.cpp:1844 +#: mergeresultwindow.cpp:3200 mergeresultwindow.cpp:3207 optiondialog.cpp:1003 +#: optiondialog.cpp:1016 pdiff.cpp:844 pdiff.cpp:846 pdiff.cpp:852 +#: pdiff.cpp:854 pdiff.cpp:874 smalldialogs.cpp:131 smalldialogs.cpp:132 +#: smalldialogs.cpp:135 smalldialogs.cpp:138 #, kde-format msgid "B" msgstr "Б" -#: difftextwindow.cpp:1810 directorymergewindow.cpp:386 -#: directorymergewindow.cpp:439 directorymergewindow.cpp:528 -#: directorymergewindow.cpp:3070 directorymergewindow.cpp:3191 -#: directorymergewindow.cpp:3419 mergeresultwindow.cpp:946 -#: mergeresultwindow.cpp:948 mergeresultwindow.cpp:950 -#: mergeresultwindow.cpp:952 mergeresultwindow.cpp:1818 -#: mergeresultwindow.cpp:3174 mergeresultwindow.cpp:3181 optiondialog.cpp:977 -#: pdiff.cpp:837 pdiff.cpp:839 pdiff.cpp:841 pdiff.cpp:843 pdiff.cpp:865 -#: smalldialogs.cpp:125 smalldialogs.cpp:126 smalldialogs.cpp:129 -#: smalldialogs.cpp:132 +#: difftextwindow.cpp:1809 directorymergewindow.cpp:387 +#: directorymergewindow.cpp:440 directorymergewindow.cpp:529 +#: directorymergewindow.cpp:3081 directorymergewindow.cpp:3202 +#: directorymergewindow.cpp:3430 mergeresultwindow.cpp:974 +#: mergeresultwindow.cpp:976 mergeresultwindow.cpp:978 +#: mergeresultwindow.cpp:980 mergeresultwindow.cpp:1846 +#: mergeresultwindow.cpp:3202 mergeresultwindow.cpp:3209 optiondialog.cpp:1017 +#: pdiff.cpp:848 pdiff.cpp:850 pdiff.cpp:852 pdiff.cpp:854 pdiff.cpp:876 +#: smalldialogs.cpp:132 smalldialogs.cpp:133 smalldialogs.cpp:136 +#: smalldialogs.cpp:139 #, kde-format msgid "C" msgstr "Ц" -#: difftextwindow.cpp:1810 +#: difftextwindow.cpp:1809 #, fuzzy, kde-format #| msgid "A (Base):" msgid "A (Base)" msgstr "А (база):" -#: difftextwindow.cpp:1812 +#: difftextwindow.cpp:1811 #, fuzzy, kde-format #| msgid "Encoding:" msgid "Encoding: %1" msgstr "Кодирање:" -#: difftextwindow.cpp:1813 mergeresultwindow.cpp:3183 +#: difftextwindow.cpp:1812 mergeresultwindow.cpp:3211 #, kde-format msgid "Unix" msgstr "Уникс" -#: difftextwindow.cpp:1813 mergeresultwindow.cpp:3184 +#: difftextwindow.cpp:1812 mergeresultwindow.cpp:3212 #, kde-format msgid "DOS" msgstr "ДОС" -#: difftextwindow.cpp:1813 +#: difftextwindow.cpp:1812 #, fuzzy, kde-format #| msgid "Line end style:" msgid "Line end style: %1" msgstr "Стил краја редова:" # >! Merge whole string. -#: difftextwindow.cpp:1835 kdiff3.cpp:873 +#: difftextwindow.cpp:1834 kdiff3.cpp:874 #, kde-format msgid "Top line" msgstr "Први ред" -#: difftextwindow.cpp:1845 +#: difftextwindow.cpp:1843 #, kde-format msgid "End" msgstr "Крај" -#: difftextwindow.cpp:1903 smalldialogs.cpp:235 +#: difftextwindow.cpp:1901 smalldialogs.cpp:245 #, fuzzy, kde-format #| msgid "Opening files..." msgid "Open File" msgstr "Отварам фајлове..." -#: difftextwindow.cpp:1951 optiondialog.cpp:387 +#: difftextwindow.cpp:1943 optiondialog.cpp:389 #, kde-format msgid "Unicode, 8 bit" msgstr "уникод, 8‑битни" -#: difftextwindow.cpp:1966 +#: difftextwindow.cpp:1958 #, kde-format msgid "Other" msgstr "" -#: directorymergewindow.cpp:409 directorymergewindow.cpp:3424 +#: directorymergewindow.cpp:410 directorymergewindow.cpp:3435 #, kde-format msgid "Copy A to B" msgstr "Копирај А у Б" -#: directorymergewindow.cpp:412 directorymergewindow.cpp:3425 +#: directorymergewindow.cpp:413 directorymergewindow.cpp:3436 #, kde-format msgid "Copy B to A" msgstr "Копирај Б у А" -#: directorymergewindow.cpp:415 directorymergewindow.cpp:3426 +#: directorymergewindow.cpp:416 directorymergewindow.cpp:3437 #, kde-format msgid "Delete A" msgstr "Обриши А" -#: directorymergewindow.cpp:418 directorymergewindow.cpp:3427 +#: directorymergewindow.cpp:419 directorymergewindow.cpp:3438 #, kde-format msgid "Delete B" msgstr "Обриши Б" -#: directorymergewindow.cpp:421 +#: directorymergewindow.cpp:422 #, kde-format msgid "Delete A & B" msgstr "Обриши А и Б" -#: directorymergewindow.cpp:424 directorymergewindow.cpp:3429 +#: directorymergewindow.cpp:425 directorymergewindow.cpp:3440 #, kde-format msgid "Merge to A" msgstr "Стопи у А" -#: directorymergewindow.cpp:427 directorymergewindow.cpp:3430 +#: directorymergewindow.cpp:428 directorymergewindow.cpp:3441 #, kde-format msgid "Merge to B" msgstr "Стопи у Б" -#: directorymergewindow.cpp:430 +#: directorymergewindow.cpp:431 #, kde-format msgid "Merge to A & B" msgstr "Стопи у А и Б" -#: directorymergewindow.cpp:442 directorymergewindow.cpp:3421 +#: directorymergewindow.cpp:443 directorymergewindow.cpp:3432 #, kde-format msgid "Delete (if exists)" msgstr "Обриши (ако постоји)" -#: directorymergewindow.cpp:445 directorymergewindow.cpp:448 -#: directorymergewindow.cpp:3420 optiondialog.cpp:925 smalldialogs.cpp:113 +#: directorymergewindow.cpp:446 directorymergewindow.cpp:449 +#: directorymergewindow.cpp:3431 smalldialogs.cpp:120 #, kde-format msgid "Merge" msgstr "Стопи" -#: directorymergewindow.cpp:445 directorymergewindow.cpp:448 +#: directorymergewindow.cpp:446 directorymergewindow.cpp:449 #, kde-format msgid "Merge (manual)" msgstr "Стопи (ручно)" -#: directorymergewindow.cpp:451 +#: directorymergewindow.cpp:452 #, kde-format msgid "Error: Conflicting File Types" msgstr "Грешка: сукобљени типови фајлова." -#: directorymergewindow.cpp:454 +#: directorymergewindow.cpp:455 #, kde-format msgid "Error: Changed and Deleted" msgstr "Грешка: измењено и обрисано." -#: directorymergewindow.cpp:457 +#: directorymergewindow.cpp:458 #, kde-format msgid "Error: Dates are equal but files are not." msgstr "Грешка: датуми су једнаки али фајлови нису." -#: directorymergewindow.cpp:471 +#: directorymergewindow.cpp:472 #, fuzzy, kde-format #| msgid "Done." msgid "Done" msgstr "Готово." -#: directorymergewindow.cpp:473 +#: directorymergewindow.cpp:474 #, kde-format msgid "Error" msgstr "Грешка" -#: directorymergewindow.cpp:475 +#: directorymergewindow.cpp:476 #, kde-format msgid "Skipped." msgstr "Прескочено." -#: directorymergewindow.cpp:477 +#: directorymergewindow.cpp:478 #, kde-format msgid "Not saved." msgstr "Није сачувано." -#: directorymergewindow.cpp:479 +#: directorymergewindow.cpp:480 #, kde-format msgid "In progress..." msgstr "У току..." -#: directorymergewindow.cpp:481 +#: directorymergewindow.cpp:482 #, kde-format msgid "To do." msgstr "Урадити." # >> @title:column -#: directorymergewindow.cpp:522 +#: directorymergewindow.cpp:523 #, kde-format msgid "Name" msgstr "име" # >> @title:column -#: directorymergewindow.cpp:530 +#: directorymergewindow.cpp:531 #, kde-format msgid "Operation" msgstr "поступак" # >> @title:column -#: directorymergewindow.cpp:532 +#: directorymergewindow.cpp:533 #, kde-format msgid "Status" msgstr "стање" # >> @title:column -#: directorymergewindow.cpp:534 +#: directorymergewindow.cpp:535 #, kde-format msgid "Unsolved" msgstr "нерешено" # >> @title:column -#: directorymergewindow.cpp:536 +#: directorymergewindow.cpp:537 #, kde-format msgid "Solved" msgstr "решено" # >> non-whitespace # >> @title:column -#: directorymergewindow.cpp:538 +#: directorymergewindow.cpp:539 #, kde-format msgid "Nonwhite" msgstr "непразно" # >> whitespace # >> @title:column -#: directorymergewindow.cpp:540 +#: directorymergewindow.cpp:541 #, kde-format msgid "White" msgstr "празно" -#: directorymergewindow.cpp:674 +#: directorymergewindow.cpp:676 #, kde-format msgid "Unable to compare non-normal file with normal file." msgstr "" -#: directorymergewindow.cpp:688 +#: directorymergewindow.cpp:690 #, kde-format msgid "Mix of links and normal files." msgstr "Мешавина веза и нормалних фајлова." -#: directorymergewindow.cpp:695 +#: directorymergewindow.cpp:697 #, kde-format msgid "Link: " msgstr "Веза: " -#: directorymergewindow.cpp:704 +#: directorymergewindow.cpp:706 #, kde-format msgid "Size. " msgstr "Величина: " -#: directorymergewindow.cpp:718 directorymergewindow.cpp:728 +#: directorymergewindow.cpp:720 directorymergewindow.cpp:730 #, kde-format msgid "Date & Size: " msgstr "Датум и величина: " -#: directorymergewindow.cpp:748 +#: directorymergewindow.cpp:751 #, kde-format msgid "Comparing file..." msgstr "Упоређујем фајл..." -#: directorymergewindow.cpp:801 +#: directorymergewindow.cpp:813 #, kde-format msgid "" "You are currently doing a directory merge. Are you sure, you want to abort " @@ -333,48 +333,48 @@ "Тренутно стапате фасцикле. Желите ли заиста да прекинете стапање и поново " "скенирате фасциклу?" -#: directorymergewindow.cpp:802 kdiff3.cpp:698 kdiff3.cpp:708 kdiff3.cpp:720 -#: mergeresultwindow.cpp:372 pdiff.cpp:1033 pdiff.cpp:1910 pdiff.cpp:1920 +#: directorymergewindow.cpp:814 kdiff3.cpp:697 kdiff3.cpp:707 kdiff3.cpp:719 +#: mergeresultwindow.cpp:400 pdiff.cpp:1052 pdiff.cpp:1930 pdiff.cpp:1940 #, kde-format msgid "Warning" msgstr "Упозорење" -#: directorymergewindow.cpp:803 directorymergewindow.cpp:3393 +#: directorymergewindow.cpp:815 directorymergewindow.cpp:3404 #, kde-format msgid "Rescan" msgstr "Поново скенирај" -#: directorymergewindow.cpp:804 pdiff.cpp:1035 +#: directorymergewindow.cpp:816 pdiff.cpp:1054 #, kde-format msgid "Continue Merging" msgstr "Настави стапање" -#: directorymergewindow.cpp:971 +#: directorymergewindow.cpp:983 #, kde-format msgid "Opening of directories failed:" msgstr "Отварање фасцикли није успело:" -#: directorymergewindow.cpp:975 +#: directorymergewindow.cpp:987 #, kde-format msgid "Dir A \"%1\" does not exist or is not a directory.\n" msgstr "Фасцикла А „%1“ не постоји или није фасцикла.\n" -#: directorymergewindow.cpp:980 +#: directorymergewindow.cpp:992 #, kde-format msgid "Dir B \"%1\" does not exist or is not a directory.\n" msgstr "Фасцикла Б „%1“ не постоји или није фасцикла.\n" -#: directorymergewindow.cpp:985 +#: directorymergewindow.cpp:997 #, kde-format msgid "Dir C \"%1\" does not exist or is not a directory.\n" msgstr "Фасцикла Ц „%1“ не постоји или није фасцикла.\n" -#: directorymergewindow.cpp:988 +#: directorymergewindow.cpp:1000 #, kde-format msgid "Directory Open Error" msgstr "Грешка при отварању фасцикле" -#: directorymergewindow.cpp:996 +#: directorymergewindow.cpp:1008 #, kde-format msgid "" "The destination directory must not be the same as A or B when three " @@ -385,50 +385,50 @@ "фасцикле.\n" "Проверите поново пре него што наставите." -#: directorymergewindow.cpp:998 +#: directorymergewindow.cpp:1010 #, kde-format msgid "Parameter Warning" msgstr "Упозорење о параметрима" -#: directorymergewindow.cpp:1003 +#: directorymergewindow.cpp:1015 #, kde-format msgid "Scanning directories..." msgstr "Скенирам фасцикле..." -#: directorymergewindow.cpp:1029 +#: directorymergewindow.cpp:1041 #, kde-format msgid "Reading Directory A" msgstr "Читам фасциклу А" -#: directorymergewindow.cpp:1038 +#: directorymergewindow.cpp:1050 #, kde-format msgid "Reading Directory B" msgstr "Читам фасциклу Б" -#: directorymergewindow.cpp:1048 +#: directorymergewindow.cpp:1060 #, kde-format msgid "Reading Directory C" msgstr "Читам фасциклу Ц" # >! Merge sentence. -#: directorymergewindow.cpp:1064 +#: directorymergewindow.cpp:1076 #, kde-format msgid "Some subdirectories were not readable in" msgstr "Неке потфасцикле нису биле читљиве у" -#: directorymergewindow.cpp:1069 +#: directorymergewindow.cpp:1081 #, kde-format msgid "Check the permissions of the subdirectories." msgstr "Проверите дозволе потфасцикли." -#: directorymergewindow.cpp:1106 kdiff3.cpp:666 kdiff3.cpp:753 kdiff3.cpp:777 -#: kdiff3.cpp:1065 kdiff3.cpp:1086 pdiff.cpp:1116 pdiff.cpp:1170 pdiff.cpp:1218 -#: pdiff.cpp:1234 pdiff.cpp:1277 pdiff.cpp:1301 +#: directorymergewindow.cpp:1118 kdiff3.cpp:665 kdiff3.cpp:752 kdiff3.cpp:776 +#: kdiff3.cpp:1072 kdiff3.cpp:1093 pdiff.cpp:1136 pdiff.cpp:1190 pdiff.cpp:1238 +#: pdiff.cpp:1254 pdiff.cpp:1297 pdiff.cpp:1321 #, kde-format msgid "Ready." msgstr "Спреман." -#: directorymergewindow.cpp:1121 +#: directorymergewindow.cpp:1133 #, kde-format msgid "" "Directory Comparison Status\n" @@ -438,25 +438,25 @@ "Number of different files: %3" msgstr "" -#: directorymergewindow.cpp:1128 +#: directorymergewindow.cpp:1140 #, fuzzy, kde-format #| msgid "Number of manual merges:" msgid "Number of manual merges: %1" msgstr "Број ручних стапања:" -#: directorymergewindow.cpp:1394 +#: directorymergewindow.cpp:1406 #, kde-format msgid "This affects all merge operations." msgstr "Ово утиче на све поступке стапања." # >> @title:window -#: directorymergewindow.cpp:1395 +#: directorymergewindow.cpp:1407 #, kde-format msgid "Changing All Merge Operations" msgstr "Мењање свих поступака стапања" # >! Merge sentence. -#: directorymergewindow.cpp:1695 +#: directorymergewindow.cpp:1707 #, fuzzy, kde-format #| msgid "Processing " msgid "" @@ -464,45 +464,45 @@ "%3" msgstr "Обрађујем " -#: directorymergewindow.cpp:1738 directorymergewindow.cpp:1742 +#: directorymergewindow.cpp:1750 directorymergewindow.cpp:1754 #, kde-format msgid "Some files could not be processed." msgstr "" -#: directorymergewindow.cpp:2222 directorymergewindow.cpp:2247 -#: directorymergewindow.cpp:2271 +#: directorymergewindow.cpp:2234 directorymergewindow.cpp:2259 +#: directorymergewindow.cpp:2283 #, kde-format msgid "This operation is currently not possible." msgstr "Овај поступак тренутно није могућ." -#: directorymergewindow.cpp:2222 directorymergewindow.cpp:2247 -#: directorymergewindow.cpp:2271 directorymergewindow.cpp:2552 +#: directorymergewindow.cpp:2234 directorymergewindow.cpp:2259 +#: directorymergewindow.cpp:2283 directorymergewindow.cpp:2563 #, kde-format msgid "Operation Not Possible" msgstr "Поступак није могућ" -#: directorymergewindow.cpp:2318 +#: directorymergewindow.cpp:2330 #, fuzzy, kde-format #| msgid "An error occurred while copying.\n" msgid "An error occurred while copying." msgstr "Грешка у току копирања.\n" -#: directorymergewindow.cpp:2319 directorymergewindow.cpp:2759 +#: directorymergewindow.cpp:2331 directorymergewindow.cpp:2770 #, kde-format msgid "Merge Error" msgstr "Грешка стапања" -#: directorymergewindow.cpp:2396 +#: directorymergewindow.cpp:2408 #, kde-format msgid "Unknown merge operation. (This must never happen!)" msgstr "Непознат поступак стапања. (Ово никада не сме да се догоди!)" -#: directorymergewindow.cpp:2441 +#: directorymergewindow.cpp:2453 #, kde-format msgid "Unknown merge operation." msgstr "Непозната поступак стапања." -#: directorymergewindow.cpp:2454 +#: directorymergewindow.cpp:2466 #, kde-format msgid "" "The merge is about to begin.\n" @@ -523,22 +523,22 @@ "ГАРАНЦИЈА! Направите резерве важних података!" # >> @title:window -#: directorymergewindow.cpp:2459 +#: directorymergewindow.cpp:2471 #, kde-format msgid "Starting Merge" msgstr "Почетак стапања" -#: directorymergewindow.cpp:2460 +#: directorymergewindow.cpp:2472 #, kde-format msgid "Do It" msgstr "Уради" -#: directorymergewindow.cpp:2461 +#: directorymergewindow.cpp:2473 #, kde-format msgid "Simulate It" msgstr "Симулирај" -#: directorymergewindow.cpp:2487 +#: directorymergewindow.cpp:2499 #, kde-format msgid "" "The highlighted item has a different type in the different directories. " @@ -547,7 +547,7 @@ "Истакнута ставка има различит тип у различитим фасциклама. Изаберите шта " "урадити." -#: directorymergewindow.cpp:2491 +#: directorymergewindow.cpp:2503 #, kde-format msgid "" "The modification dates of the file are equal but the files are not. Select " @@ -555,7 +555,7 @@ msgstr "" "Датуми измене фајла су једнаки али фајлови нису. Изаберите шта урадити." -#: directorymergewindow.cpp:2495 +#: directorymergewindow.cpp:2507 #, kde-format msgid "" "The highlighted item was changed in one directory and deleted in the other. " @@ -564,14 +564,14 @@ "Истакнута ставка је измењена у једној фасцикли а обрисана у другој. " "Изаберите шта урадити." -#: directorymergewindow.cpp:2552 +#: directorymergewindow.cpp:2563 #, kde-format msgid "" "This operation is currently not possible because directory merge is " "currently running." msgstr "Овај поступак тренутно није могућ зато што је у току стапање фасцикли." -#: directorymergewindow.cpp:2609 +#: directorymergewindow.cpp:2620 #, kde-format msgid "" "There was an error in the last step.\n" @@ -583,32 +583,32 @@ "прескочите?" # >> @title:window -#: directorymergewindow.cpp:2611 +#: directorymergewindow.cpp:2622 #, kde-format msgid "Continue merge after an error" msgstr "Настављање стапања после грешке" -#: directorymergewindow.cpp:2612 +#: directorymergewindow.cpp:2623 #, kde-format msgid "Continue With Last Item" msgstr "Настави са последњом ставком" -#: directorymergewindow.cpp:2613 +#: directorymergewindow.cpp:2624 #, kde-format msgid "Skip Item" msgstr "Прескочи ставку" -#: directorymergewindow.cpp:2709 +#: directorymergewindow.cpp:2720 #, kde-format msgid "Merge operation complete." msgstr "Поступак стапања је завршен." -#: directorymergewindow.cpp:2709 directorymergewindow.cpp:2712 +#: directorymergewindow.cpp:2720 directorymergewindow.cpp:2723 #, kde-format msgid "Merge Complete" msgstr "Стапање завршено" -#: directorymergewindow.cpp:2722 +#: directorymergewindow.cpp:2733 #, kde-format msgid "" "Simulated merge complete: Check if you agree with the proposed operations." @@ -616,49 +616,49 @@ "Симулирано стапање је завршено: проверите да ли вам одговарају предложени " "поступци." -#: directorymergewindow.cpp:2758 +#: directorymergewindow.cpp:2769 #, fuzzy, kde-format #| msgid "An error occurred. Press OK to see detailed information.\n" msgid "An error occurred. Press OK to see detailed information." msgstr "" "Дошло је до грешке. Кликните на „У реду“ да добијете детаљне информације.\n" -#: directorymergewindow.cpp:2791 +#: directorymergewindow.cpp:2802 #, kde-format msgid "Error: While deleting %1: Creating backup failed." msgstr "Грешка: у току брисања %1, прављење резерве није успело." -#: directorymergewindow.cpp:2798 +#: directorymergewindow.cpp:2809 #, kde-format msgid "delete directory recursively( %1 )" msgstr "рекурзивно брисање фасцикле (%1)" -#: directorymergewindow.cpp:2800 +#: directorymergewindow.cpp:2811 #, kde-format msgid "delete( %1 )" msgstr "брисање (%1)" -#: directorymergewindow.cpp:2815 +#: directorymergewindow.cpp:2826 #, kde-format msgid "Error: delete dir operation failed while trying to read the directory." msgstr "Грешка: поступак брисања фасцикле није успео на месту читања фасцикле." -#: directorymergewindow.cpp:2834 +#: directorymergewindow.cpp:2845 #, kde-format msgid "Error: rmdir( %1 ) operation failed." msgstr "Грешка: поступак уклањања фасцикле (%1) није успео." -#: directorymergewindow.cpp:2844 +#: directorymergewindow.cpp:2855 #, kde-format msgid "Error: delete operation failed." msgstr "Грешка: поступак брисања није успео." -#: directorymergewindow.cpp:2870 +#: directorymergewindow.cpp:2881 #, kde-format msgid "manual merge( %1, %2, %3 -> %4)" msgstr "ручно стапање (%1, %2, %3 → %4)" -#: directorymergewindow.cpp:2873 +#: directorymergewindow.cpp:2884 #, kde-format msgid "" " Note: After a manual merge the user should continue by pressing F7." @@ -666,193 +666,193 @@ " Напомена: после ручног стапања корисник треба да настави притиском на " "F7." -#: directorymergewindow.cpp:2900 +#: directorymergewindow.cpp:2911 #, kde-format msgid "Error: copy( %1 -> %2 ) failed.Deleting existing destination failed." msgstr "" "Грешка: копирање (%1 → %2) није успело, брисање постојећег одредишта није " "успело." -#: directorymergewindow.cpp:2909 +#: directorymergewindow.cpp:2920 #, kde-format msgid "copyLink( %1 -> %2 )" msgstr "копирање везе (%1 → %2 )" -#: directorymergewindow.cpp:2918 +#: directorymergewindow.cpp:2929 #, kde-format msgid "Error: copyLink failed: Remote links are not yet supported." msgstr "Грешка: копирање везе није успело, удаљене везе још нису подржане." -#: directorymergewindow.cpp:2928 +#: directorymergewindow.cpp:2939 #, kde-format msgid "Error: copyLink failed." msgstr "Грешка: копирање везе није успело." -#: directorymergewindow.cpp:2953 +#: directorymergewindow.cpp:2964 #, kde-format msgid "copy( %1 -> %2 )" msgstr "копирање (%1 → %2)" -#: directorymergewindow.cpp:2979 +#: directorymergewindow.cpp:2990 #, kde-format msgid "Error during rename( %1 -> %2 ): Cannot delete existing destination." msgstr "" "Грешка у току преименовања (%1 → %2), постојеће одредиште не може да се " "обрише." -#: directorymergewindow.cpp:2986 +#: directorymergewindow.cpp:2997 #, kde-format msgid "rename( %1 -> %2 )" msgstr "преименовање (%1 → %2)" -#: directorymergewindow.cpp:2995 +#: directorymergewindow.cpp:3006 #, kde-format msgid "Error: Rename failed." msgstr "Грешка: преименовање није успело." -#: directorymergewindow.cpp:3013 +#: directorymergewindow.cpp:3024 #, kde-format msgid "Error during makeDir of %1. Cannot delete existing file." msgstr "" "Грешка у току прављења фасцикле (%1), постојећи фајл не може да се обрише." -#: directorymergewindow.cpp:3030 +#: directorymergewindow.cpp:3041 #, kde-format msgid "makeDir( %1 )" msgstr "прављење фасцикле (%1)" -#: directorymergewindow.cpp:3040 +#: directorymergewindow.cpp:3051 #, kde-format msgid "Error while creating directory." msgstr "Грешка у току прављења фасцикле." -#: directorymergewindow.cpp:3076 directorymergewindow.cpp:3195 +#: directorymergewindow.cpp:3087 directorymergewindow.cpp:3206 #, kde-format msgid "Dest" msgstr "Одредиште" # >> @title:column -#: directorymergewindow.cpp:3084 directorymergewindow.cpp:3113 +#: directorymergewindow.cpp:3095 directorymergewindow.cpp:3124 #, kde-format msgid "Dir" msgstr "фасцикла" # >> @title:column -#: directorymergewindow.cpp:3084 +#: directorymergewindow.cpp:3095 #, kde-format msgid "Type" msgstr "тип" # >> @title:column -#: directorymergewindow.cpp:3084 +#: directorymergewindow.cpp:3095 #, kde-format msgid "Size" msgstr "величина" # >> @title:column -#: directorymergewindow.cpp:3085 +#: directorymergewindow.cpp:3096 #, kde-format msgid "Attr" msgstr "атрибути" # >> @title:column -#: directorymergewindow.cpp:3085 +#: directorymergewindow.cpp:3096 #, kde-format msgid "Last Modification" msgstr "последња измена" # >> @title:column -#: directorymergewindow.cpp:3085 +#: directorymergewindow.cpp:3096 #, kde-format msgid "Link-Destination" msgstr "одредиште везе" # >! Merge whole string. # >> @item:intext -#: directorymergewindow.cpp:3113 +#: directorymergewindow.cpp:3124 #, kde-format msgid "File" msgstr "фајл" -#: directorymergewindow.cpp:3113 +#: directorymergewindow.cpp:3124 #, fuzzy, kde-format #| msgid "Link: " msgid "-Link" msgstr "Веза: " -#: directorymergewindow.cpp:3119 +#: directorymergewindow.cpp:3130 #, kde-format msgid "not available" msgstr "недоступно" -#: directorymergewindow.cpp:3137 +#: directorymergewindow.cpp:3148 #, kde-format msgid "A (Dest): " msgstr "А (одредиште): " -#: directorymergewindow.cpp:3141 +#: directorymergewindow.cpp:3152 #, kde-format msgid "A: " msgstr "" -#: directorymergewindow.cpp:3141 +#: directorymergewindow.cpp:3152 #, kde-format msgid "A (Base): " msgstr "А (база): " -#: directorymergewindow.cpp:3147 +#: directorymergewindow.cpp:3158 #, kde-format msgid "B (Dest): " msgstr "Б (одредиште): " -#: directorymergewindow.cpp:3151 +#: directorymergewindow.cpp:3162 #, kde-format msgid "B: " msgstr "" -#: directorymergewindow.cpp:3156 +#: directorymergewindow.cpp:3167 #, kde-format msgid "C (Dest): " msgstr "Ц (одредиште): " -#: directorymergewindow.cpp:3160 +#: directorymergewindow.cpp:3171 #, kde-format msgid "C: " msgstr "" -#: directorymergewindow.cpp:3163 +#: directorymergewindow.cpp:3174 #, kde-format msgid "Dest: " msgstr "Одредиште: " # >> @title:window #. i18n("Saving Directory Merge State ...")); -#: directorymergewindow.cpp:3238 +#: directorymergewindow.cpp:3249 #, kde-format msgid "Save Directory Merge State As..." msgstr "Уписивање стања стапања фасцикли као..." -#: directorymergewindow.cpp:3387 +#: directorymergewindow.cpp:3398 #, kde-format msgid "Start/Continue Directory Merge" msgstr "Покрени/настави стапање фасцикли" -#: directorymergewindow.cpp:3388 +#: directorymergewindow.cpp:3399 #, kde-format msgid "Run Operation for Current Item" msgstr "Изврши поступак за текућу ставку" -#: directorymergewindow.cpp:3389 +#: directorymergewindow.cpp:3400 #, kde-format msgid "Compare Selected File" msgstr "Упореди изабрани фајл" -#: directorymergewindow.cpp:3390 +#: directorymergewindow.cpp:3401 #, kde-format msgid "Merge Current File" msgstr "Стопи текући фајл" -#: directorymergewindow.cpp:3390 +#: directorymergewindow.cpp:3401 #, kde-format msgid "" "Merge\n" @@ -861,51 +861,51 @@ "Стопи\n" "фајл" -#: directorymergewindow.cpp:3391 +#: directorymergewindow.cpp:3402 #, kde-format msgid "Fold All Subdirs" msgstr "Сажми све потфасцикле" -#: directorymergewindow.cpp:3392 +#: directorymergewindow.cpp:3403 #, kde-format msgid "Unfold All Subdirs" msgstr "Рашири све потфасцикле" #. i18n("Save Directory Merge State ..."), 0, this, &DirectoryMergeWindow::slotSaveMergeState, ac, "dir_save_merge_state"); #. i18n("Load Directory Merge State ..."), 0, this, &DirectoryMergeWindow::slotLoadMergeState, ac, "dir_load_merge_state"); -#: directorymergewindow.cpp:3396 +#: directorymergewindow.cpp:3407 #, kde-format msgid "Choose A for All Items" msgstr "Изабери А за све ставке" -#: directorymergewindow.cpp:3397 +#: directorymergewindow.cpp:3408 #, kde-format msgid "Choose B for All Items" msgstr "Изабери Б за све ставке" -#: directorymergewindow.cpp:3398 +#: directorymergewindow.cpp:3409 #, kde-format msgid "Choose C for All Items" msgstr "Изабери Ц за све ставке" -#: directorymergewindow.cpp:3399 +#: directorymergewindow.cpp:3410 #, kde-format msgid "Auto-Choose Operation for All Items" msgstr "Аутоматски изабери поступак за све ставке" -#: directorymergewindow.cpp:3400 +#: directorymergewindow.cpp:3411 #, kde-format msgid "No Operation for All Items" msgstr "Нема поступка за све ставке" #. i18n("Synchronize Directories"), 0, this, &DirectoryMergeWindow::slotSynchronizeDirectories, ac, "dir_synchronize_directories"); #. d->m_pDirChooseNewerFiles = GuiUtils::createAction< KToggleAction >(i18n("Copy Newer Files Instead of Merging"), 0, this, &DirectoryMergeWindow::slotChooseNewerFiles, ac, "dir_choose_newer_files"); -#: directorymergewindow.cpp:3405 +#: directorymergewindow.cpp:3416 #, kde-format msgid "Show Identical Files" msgstr "Прикажи истоветне фајлове" -#: directorymergewindow.cpp:3405 +#: directorymergewindow.cpp:3416 #, kde-format msgid "" "Identical\n" @@ -914,17 +914,17 @@ "Истоветни\n" "фајлови" -#: directorymergewindow.cpp:3406 +#: directorymergewindow.cpp:3417 #, kde-format msgid "Show Different Files" msgstr "Прикажи различите фајлове" -#: directorymergewindow.cpp:3407 +#: directorymergewindow.cpp:3418 #, kde-format msgid "Show Files only in A" msgstr "Прикажи фајлове само у А" -#: directorymergewindow.cpp:3407 +#: directorymergewindow.cpp:3418 #, kde-format msgid "" "Files\n" @@ -933,12 +933,12 @@ "Фајлови\n" "само у А" -#: directorymergewindow.cpp:3408 +#: directorymergewindow.cpp:3419 #, kde-format msgid "Show Files only in B" msgstr "Прикажи фајлове само у Б" -#: directorymergewindow.cpp:3408 +#: directorymergewindow.cpp:3419 #, kde-format msgid "" "Files\n" @@ -947,12 +947,12 @@ "Фајлови\n" "само у Б" -#: directorymergewindow.cpp:3409 +#: directorymergewindow.cpp:3420 #, kde-format msgid "Show Files only in C" msgstr "Прикажи фајлове само у Ц" -#: directorymergewindow.cpp:3409 +#: directorymergewindow.cpp:3420 #, kde-format msgid "" "Files\n" @@ -961,55 +961,60 @@ "Фајлови\n" "само у Ц" -#: directorymergewindow.cpp:3413 +#: directorymergewindow.cpp:3424 #, kde-format msgid "Compare Explicitly Selected Files" msgstr "Упореди изричито изабране фајлове" -#: directorymergewindow.cpp:3414 +#: directorymergewindow.cpp:3425 #, kde-format msgid "Merge Explicitly Selected Files" msgstr "Стопи изричито изабране фајлове" -#: directorymergewindow.cpp:3416 directorymergewindow.cpp:3423 +#: directorymergewindow.cpp:3427 directorymergewindow.cpp:3434 #, kde-format msgid "Do Nothing" msgstr "Не ради ништа" -#: directorymergewindow.cpp:3428 +#: directorymergewindow.cpp:3439 #, kde-format msgid "Delete A && B" msgstr "Обриши А и Б" -#: directorymergewindow.cpp:3431 +#: directorymergewindow.cpp:3442 #, kde-format msgid "Merge to A && B" msgstr "Стопи у А и Б" -#: fileaccess.cpp:462 SourceData.cpp:493 +#: fileaccess.cpp:301 +#, kde-format +msgid "Unable to determine full url. No parent specified." +msgstr "" + +#: fileaccess.cpp:482 SourceData.cpp:506 #, fuzzy, kde-format #| msgid "Reading file: %1" msgid "Failed to read file: %1" msgstr "Читам фајл: %1" -#: fileaccess.cpp:587 +#: fileaccess.cpp:624 #, kde-format msgid "Creating temp copy of %1 failed." msgstr "Прављење привремене копије фајла %1 није успело." -#: fileaccess.cpp:595 fileaccess.cpp:600 +#: fileaccess.cpp:632 fileaccess.cpp:637 #, fuzzy, kde-format #| msgid "Opening %1 failed." msgid "Opening %1 failed. %2" msgstr "Отварање фајла %1 није успело." -#: fileaccess.cpp:619 fileaccess.cpp:627 +#: fileaccess.cpp:656 fileaccess.cpp:664 #, fuzzy, kde-format #| msgid "Error reading from %1" msgid "Error reading from %1. %2" msgstr "Грешка при читању из %1" -#: fileaccess.cpp:751 +#: fileaccess.cpp:788 #, fuzzy, kde-format #| msgid "" #| "While trying to make a backup, deleting an older backup failed. \n" @@ -1021,7 +1026,7 @@ "При покушају прављења резерве, брисање старије резерве није успело.\n" "Име фајла: " -#: fileaccess.cpp:758 +#: fileaccess.cpp:795 #, fuzzy, kde-format #| msgid "" #| "While trying to make a backup, renaming failed. \n" @@ -1033,190 +1038,190 @@ "При покушају прављења резерве, преименовање није успело.\n" "Имена фајлова: " -#: fileaccess.cpp:828 +#: fileaccess.cpp:865 #, kde-format msgid "Getting file status: %1" msgstr "Добављам стање фајла: %1" -#: fileaccess.cpp:869 +#: fileaccess.cpp:906 #, kde-format msgid "Reading file: %1" msgstr "Читам фајл: %1" -#: fileaccess.cpp:907 +#: fileaccess.cpp:944 #, kde-format msgid "Writing file: %1" msgstr "Пишем фајл: %1" -#: fileaccess.cpp:940 +#: fileaccess.cpp:977 #, kde-format msgid "Out of memory" msgstr "Нема више меморије" -#: fileaccess.cpp:976 +#: fileaccess.cpp:1013 #, kde-format msgid "Making directory: %1" msgstr "Правим фасциклу: %1" -#: fileaccess.cpp:997 +#: fileaccess.cpp:1034 #, kde-format msgid "Removing directory: %1" msgstr "Уклањам фасциклу: %1" -#: fileaccess.cpp:1012 +#: fileaccess.cpp:1049 #, kde-format msgid "Removing file: %1" msgstr "Уклањам фајл: %1" -#: fileaccess.cpp:1028 +#: fileaccess.cpp:1065 #, kde-format msgid "Creating symbolic link: %1 -> %2" msgstr "Правим симболичку везу: %1 → %2" -#: fileaccess.cpp:1052 +#: fileaccess.cpp:1089 #, kde-format msgid "Renaming file: %1 -> %2" msgstr "Преименујем фајл: %1 → %2" -#: fileaccess.cpp:1086 +#: fileaccess.cpp:1123 #, kde-format msgid "Copying file: %1 -> %2" msgstr "Копирам фајл: %1 → %2" -#: fileaccess.cpp:1108 +#: fileaccess.cpp:1145 #, fuzzy, kde-format #| msgid "Reading directory: " msgid "Reading directory: %1" msgstr "Читам фасциклу: " -#: fileaccess.cpp:1162 +#: fileaccess.cpp:1202 #, kde-format msgid "Listing directory: %1" msgstr "Листам фасциклу: %1" -#: kdiff3.cpp:181 +#: kdiff3.cpp:182 #, kde-format msgid "Current Configuration:" msgstr "Тренутна постава:" -#: kdiff3.cpp:186 +#: kdiff3.cpp:187 #, kde-format msgid "Config Option Error:" msgstr "Грешка поставне опције:" -#: kdiff3.cpp:240 +#: kdiff3.cpp:246 #, kde-format msgid "Option --auto used, but no output file specified." msgstr "Опција --auto је употребљена, али није наведен излазни фајл." -#: kdiff3.cpp:416 +#: kdiff3.cpp:405 #, kde-format msgid "Option --auto ignored for directory comparison." msgstr "Опција --auto се игнорише за поређење фасцикли." -#: kdiff3.cpp:460 +#: kdiff3.cpp:449 #, kde-format msgid "Saving failed." msgstr "Уписивање није успело." -#: kdiff3.cpp:496 pdiff.cpp:1098 +#: kdiff3.cpp:494 pdiff.cpp:395 pdiff.cpp:1117 #, kde-format msgid "Opening of these files failed:" msgstr "Отварање ових фајлова није успело:" -#: kdiff3.cpp:505 +#: kdiff3.cpp:503 pdiff.cpp:404 pdiff.cpp:1126 #, kde-format -msgid "File Open Error" +msgid "File open error" msgstr "Грешка при отварању фајла" # >> @info:tooltip -#: kdiff3.cpp:533 +#: kdiff3.cpp:532 #, kde-format msgid "Opens documents for comparison..." msgstr "Отвара документе за поређење." -#: kdiff3.cpp:535 +#: kdiff3.cpp:534 #, kde-format msgid "Reload" msgstr "Учитај поново" # >> @info:tooltip -#: kdiff3.cpp:538 +#: kdiff3.cpp:537 #, kde-format msgid "Saves the merge result. All conflicts must be solved!" msgstr "Уписује резултат стапања. Сви сукоби морају бити разрешени." # >> @info:tooltip -#: kdiff3.cpp:540 +#: kdiff3.cpp:539 #, kde-format msgid "Saves the current document as..." msgstr "Уписује текуће документе под именом." # >> @info:tooltip -#: kdiff3.cpp:543 +#: kdiff3.cpp:542 #, kde-format msgid "Print the differences" msgstr "Штампа разлике." # >> @info:tooltip -#: kdiff3.cpp:546 +#: kdiff3.cpp:545 #, kde-format msgid "Quits the application" msgstr "Напушта програм." # >> @info:tooltip -#: kdiff3.cpp:549 +#: kdiff3.cpp:548 #, kde-format msgid "Cuts the selected section and puts it to the clipboard" msgstr "Исеца изабрани одељак и ставља га у клипборд." # >> @info:tooltip -#: kdiff3.cpp:552 +#: kdiff3.cpp:551 #, kde-format msgid "Copies the selected section to the clipboard" msgstr "Копира изабрани одељак у клипборд." # >> @info:tooltip -#: kdiff3.cpp:554 +#: kdiff3.cpp:553 #, kde-format msgid "Pastes the clipboard contents to current position" msgstr "Налепљује садржај клипборда на тренутном положају." # >> @info:tooltip -#: kdiff3.cpp:557 +#: kdiff3.cpp:556 #, kde-format msgid "Select everything in current window" msgstr "Изабира све у текућем прозору." # >> @info:tooltip -#: kdiff3.cpp:560 +#: kdiff3.cpp:559 #, kde-format msgid "Search for a string" msgstr "Тражи ниску." # >> @info:tooltip -#: kdiff3.cpp:562 +#: kdiff3.cpp:561 #, kde-format msgid "Search again for the string" msgstr "Поново тражи ниску." # >> @info:tooltip -#: kdiff3.cpp:567 +#: kdiff3.cpp:566 #, kde-format msgid "Enables/disables the statusbar" msgstr "Укључује/искључује траку стања." -#: kdiff3.cpp:571 +#: kdiff3.cpp:570 #, kde-format msgid "Configure KDiff3..." msgstr "Подеси К‑диф3..." -#: kdiff3.cpp:590 +#: kdiff3.cpp:589 #, kde-format msgid "Go to Current Delta" msgstr "Иди на текућу делту" -#: kdiff3.cpp:590 +#: kdiff3.cpp:589 #, kde-format msgid "" "Current\n" @@ -1225,12 +1230,12 @@ "Текућа\n" "делта" -#: kdiff3.cpp:592 +#: kdiff3.cpp:591 #, kde-format msgid "Go to First Delta" msgstr "Иди на прву делту" -#: kdiff3.cpp:592 +#: kdiff3.cpp:591 #, kde-format msgid "" "First\n" @@ -1239,12 +1244,12 @@ "Прва\n" "делта" -#: kdiff3.cpp:594 +#: kdiff3.cpp:593 #, kde-format msgid "Go to Last Delta" msgstr "Иди на последњу делту" -#: kdiff3.cpp:594 +#: kdiff3.cpp:593 #, kde-format msgid "" "Last\n" @@ -1253,12 +1258,12 @@ "Последња\n" "делта" -#: kdiff3.cpp:596 +#: kdiff3.cpp:595 #, kde-format msgid "(Skips white space differences when \"Show White Space\" is disabled.)" msgstr "(Прескаче разлике у празнинама ако је „Прикажи празнине“ искључено.)" -#: kdiff3.cpp:597 +#: kdiff3.cpp:596 #, kde-format msgid "" "(Does not skip white space differences even when \"Show White Space\" is " @@ -1266,12 +1271,12 @@ msgstr "" "(Не прескаче разлике празнинама ни када је „Прикажи празнине“ искључено.)" -#: kdiff3.cpp:598 +#: kdiff3.cpp:597 #, kde-format msgid "Go to Previous Delta" msgstr "Иди на претходну делту" -#: kdiff3.cpp:598 +#: kdiff3.cpp:597 #, kde-format msgid "" "Prev\n" @@ -1280,12 +1285,12 @@ "Претходна\n" "делта" -#: kdiff3.cpp:600 +#: kdiff3.cpp:599 #, kde-format msgid "Go to Next Delta" msgstr "Иди на следећу делту" -#: kdiff3.cpp:600 +#: kdiff3.cpp:599 #, kde-format msgid "" "Next\n" @@ -1294,12 +1299,12 @@ "Следећа\n" "делта" -#: kdiff3.cpp:602 +#: kdiff3.cpp:601 #, kde-format msgid "Go to Previous Conflict" msgstr "Иди на претходни сукоб" -#: kdiff3.cpp:602 +#: kdiff3.cpp:601 #, kde-format msgid "" "Prev\n" @@ -1308,12 +1313,12 @@ "Претходни\n" "сукоб" -#: kdiff3.cpp:604 +#: kdiff3.cpp:603 #, kde-format msgid "Go to Next Conflict" msgstr "Иди на следећи сукоб" -#: kdiff3.cpp:604 +#: kdiff3.cpp:603 #, kde-format msgid "" "Next\n" @@ -1322,12 +1327,12 @@ "Следећи\n" "сукоб" -#: kdiff3.cpp:606 +#: kdiff3.cpp:605 #, kde-format msgid "Go to Previous Unsolved Conflict" msgstr "Иди на претходни нерешени сукоб" -#: kdiff3.cpp:606 +#: kdiff3.cpp:605 #, kde-format msgid "" "Prev\n" @@ -1336,12 +1341,12 @@ "Претходни\n" "нерешени" -#: kdiff3.cpp:608 +#: kdiff3.cpp:607 #, kde-format msgid "Go to Next Unsolved Conflict" msgstr "Иди на следећи нерешени сукоб" -#: kdiff3.cpp:608 +#: kdiff3.cpp:607 #, kde-format msgid "" "Next\n" @@ -1350,12 +1355,12 @@ "Следећи\n" "нерешени" -#: kdiff3.cpp:610 +#: kdiff3.cpp:609 #, kde-format msgid "Select Line(s) From A" msgstr "Изаберите редове из А" -#: kdiff3.cpp:610 +#: kdiff3.cpp:609 #, kde-format msgid "" "Choose\n" @@ -1364,12 +1369,12 @@ "Изаберите\n" "А" -#: kdiff3.cpp:611 +#: kdiff3.cpp:610 #, kde-format msgid "Select Line(s) From B" msgstr "Изаберите редове из Б" -#: kdiff3.cpp:611 +#: kdiff3.cpp:610 #, kde-format msgid "" "Choose\n" @@ -1378,12 +1383,12 @@ "Изаберите\n" "Б" -#: kdiff3.cpp:612 +#: kdiff3.cpp:611 #, kde-format msgid "Select Line(s) From C" msgstr "Изаберите редове из Ц" -#: kdiff3.cpp:612 +#: kdiff3.cpp:611 #, kde-format msgid "" "Choose\n" @@ -1392,12 +1397,12 @@ "Изаберите\n" "Ц" -#: kdiff3.cpp:613 +#: kdiff3.cpp:612 #, kde-format msgid "Automatically Go to Next Unsolved Conflict After Source Selection" msgstr "Аутоматски иди на следећи нерешени сукоб после избора извора" -#: kdiff3.cpp:613 +#: kdiff3.cpp:612 #, kde-format msgid "" "Auto\n" @@ -1406,13 +1411,13 @@ "Аутоматски\n" "следећи" -#: kdiff3.cpp:615 +#: kdiff3.cpp:614 #, fuzzy, kde-format #| msgid "Show Space && Tabulator Characters for Differences" msgid "Show Space && Tabulator Characters" msgstr "Прикажи знакове размака и табулатора за разлике" -#: kdiff3.cpp:615 +#: kdiff3.cpp:614 #, kde-format msgid "" "White\n" @@ -1421,12 +1426,12 @@ "Знакови\n" "празнина" -#: kdiff3.cpp:616 +#: kdiff3.cpp:615 #, kde-format msgid "Show White Space" msgstr "Прикажи празнине" -#: kdiff3.cpp:616 +#: kdiff3.cpp:615 #, kde-format msgid "" "White\n" @@ -1435,12 +1440,12 @@ "Делте\n" "празнина" -#: kdiff3.cpp:618 +#: kdiff3.cpp:617 #, kde-format msgid "Show Line Numbers" msgstr "Прикажи бројеве редова" -#: kdiff3.cpp:618 +#: kdiff3.cpp:617 #, kde-format msgid "" "Line\n" @@ -1449,196 +1454,196 @@ "Бројеви\n" "редова" -#: kdiff3.cpp:620 +#: kdiff3.cpp:619 #, kde-format msgid "Automatically Solve Simple Conflicts" msgstr "Аутоматски реши једноставне сукобе" -#: kdiff3.cpp:621 +#: kdiff3.cpp:620 #, kde-format msgid "Set Deltas to Conflicts" msgstr "Постави делте на сукобе" -#: kdiff3.cpp:622 +#: kdiff3.cpp:621 #, kde-format msgid "Run Regular Expression Auto Merge" msgstr "Аутоматски стопи по регуларним изразима" -#: kdiff3.cpp:623 +#: kdiff3.cpp:622 #, kde-format msgid "Automatically Solve History Conflicts" msgstr "Аутоматски реши сукобе историјата" -#: kdiff3.cpp:624 +#: kdiff3.cpp:623 #, kde-format msgid "Split Diff At Selection" msgstr "Подели разлику на избору" -#: kdiff3.cpp:625 +#: kdiff3.cpp:624 #, kde-format msgid "Join Selected Diffs" msgstr "Споји изабране разлике" -#: kdiff3.cpp:627 +#: kdiff3.cpp:626 #, kde-format msgid "Show Window A" msgstr "Прикажи прозор А" -#: kdiff3.cpp:628 +#: kdiff3.cpp:627 #, kde-format msgid "Show Window B" msgstr "Прикажи прозор Б" -#: kdiff3.cpp:629 +#: kdiff3.cpp:628 #, kde-format msgid "Show Window C" msgstr "Прикажи прозор Ц" -#: kdiff3.cpp:631 +#: kdiff3.cpp:630 #, kde-format msgid "Normal Overview" msgstr "Нормалан преглед" -#: kdiff3.cpp:632 +#: kdiff3.cpp:631 #, kde-format msgid "A vs. B Overview" msgstr "Преглед А према Б" -#: kdiff3.cpp:633 +#: kdiff3.cpp:632 #, kde-format msgid "A vs. C Overview" msgstr "Преглед А према Ц" -#: kdiff3.cpp:634 +#: kdiff3.cpp:633 #, kde-format msgid "B vs. C Overview" msgstr "Преглед Б према Ц" -#: kdiff3.cpp:635 +#: kdiff3.cpp:634 #, kde-format msgid "Word Wrap Diff Windows" msgstr "Прелом речи у прозорима разлика" -#: kdiff3.cpp:636 +#: kdiff3.cpp:635 #, kde-format msgid "Add Manual Diff Alignment" msgstr "Додај ручно поравнање разлика" -#: kdiff3.cpp:637 +#: kdiff3.cpp:636 #, kde-format msgid "Clear All Manual Diff Alignments" msgstr "Очисти сва ручна поравнања разлика" -#: kdiff3.cpp:639 +#: kdiff3.cpp:638 #, kde-format msgid "Focus Next Window" msgstr "Фокусирај следећи прозор" -#: kdiff3.cpp:640 +#: kdiff3.cpp:639 #, kde-format msgid "Focus Prev Window" msgstr "Фокусирај претходни прозор" -#: kdiff3.cpp:641 +#: kdiff3.cpp:640 #, kde-format msgid "Toggle Split Orientation" msgstr "Пребаци оријентацију поделе" -#: kdiff3.cpp:643 +#: kdiff3.cpp:642 #, kde-format msgid "Dir && Text Split Screen View" msgstr "Подељени приказ екрана на фасциклу и текст" -#: kdiff3.cpp:645 +#: kdiff3.cpp:644 #, kde-format msgid "Toggle Between Dir && Text View" msgstr "Пребаци приказ фасцикле и текста" -#: kdiff3.cpp:697 pdiff.cpp:1909 +#: kdiff3.cpp:696 pdiff.cpp:1929 #, fuzzy, kde-format #| msgid "The merge result hasn't been saved." msgid "The merge result has not been saved." msgstr "Резултат стапања није сачуван." -#: kdiff3.cpp:699 +#: kdiff3.cpp:698 #, kde-format msgid "Save && Quit" msgstr "Сачувај и напусти" -#: kdiff3.cpp:700 +#: kdiff3.cpp:699 #, kde-format msgid "Quit Without Saving" msgstr "Напусти без уписивања" -#: kdiff3.cpp:708 pdiff.cpp:1920 +#: kdiff3.cpp:707 pdiff.cpp:1940 #, kde-format msgid "Saving the merge result failed." msgstr "Уписивање резултата стапања није успело." -#: kdiff3.cpp:719 pdiff.cpp:1032 +#: kdiff3.cpp:718 pdiff.cpp:1051 #, kde-format msgid "" "You are currently doing a directory merge. Are you sure, you want to abort?" msgstr "Тренутно стапате фасцикле. Желите ли заиста да обуставите ово?" -#: kdiff3.cpp:742 +#: kdiff3.cpp:741 #, kde-format msgid "Saving file..." msgstr "Уписујем фајл..." -#: kdiff3.cpp:759 +#: kdiff3.cpp:758 #, kde-format msgid "Saving file with a new filename..." msgstr "Уписујем фајл под новим именом..." # >> @title:window -#: kdiff3.cpp:761 +#: kdiff3.cpp:760 #, kde-format msgid "Save As..." msgstr "Уписивање као" -#: kdiff3.cpp:820 +#: kdiff3.cpp:819 #, kde-format msgid "Printing not implemented." msgstr "Штампање није изведено." -#: kdiff3.cpp:857 +#: kdiff3.cpp:858 #, kde-format msgid "Printing..." msgstr "Штампам..." -#: kdiff3.cpp:943 +#: kdiff3.cpp:948 #, kde-format msgid "Printing page %1 of %2" msgstr "" -#: kdiff3.cpp:1000 +#: kdiff3.cpp:1006 #, fuzzy, kde-format #| msgid "Selection" msgid " (Selection)" msgstr "Избор" -#: kdiff3.cpp:1027 +#: kdiff3.cpp:1034 #, kde-format msgid "Printing completed." msgstr "Штампање завршено." -#: kdiff3.cpp:1031 +#: kdiff3.cpp:1038 #, kde-format msgid "Printing aborted." msgstr "Штампање обустављено." -#: kdiff3.cpp:1038 +#: kdiff3.cpp:1045 #, kde-format msgid "Exiting..." msgstr "Напуштам..." -#: kdiff3.cpp:1049 +#: kdiff3.cpp:1056 #, kde-format msgid "Toggling toolbar..." msgstr "Пребацујем траку алатки..." -#: kdiff3.cpp:1070 +#: kdiff3.cpp:1077 #, kde-format msgid "Toggle the statusbar..." msgstr "Пребацујем траку стања..." @@ -1664,7 +1669,7 @@ msgid "Joachim Eibl" msgstr "Јоахим Ајбл" -#: kdiff3_part.cpp:173 kdiff3_part.cpp:254 +#: kdiff3_part.cpp:172 kdiff3_part.cpp:253 #, fuzzy, kde-format #| msgid "Couldn't find files for comparison." msgid "Could not find files for comparison." @@ -1683,7 +1688,7 @@ msgstr "Подеси К‑диф3" #. i18n: ectx: ToolBar (mainToolBar) -#: kdiff3_part.rc:16 main.cpp:88 +#: kdiff3_part.rc:16 main.cpp:89 #, kde-format msgid "KDiff3" msgstr "&К‑диф3" @@ -1755,83 +1760,88 @@ msgid "Main Toolbar" msgstr "Главна трака" -#: main.cpp:68 main.cpp:72 +#: main.cpp:69 main.cpp:73 #, kde-format msgid "Ignored. (User defined.)" msgstr "Игнорисано (кориснички дефинисано)." -#: main.cpp:92 +#: main.cpp:93 #, kde-format msgid " (64 bit)" msgstr "" -#: main.cpp:94 +#: main.cpp:95 #, kde-format msgid " (32 bit)" msgstr "" -#: main.cpp:95 +#: main.cpp:96 #, kde-format msgid "Tool for Comparison and Merge of Files and Directories" msgstr "Алатка за поређење и стапање фајлова и фасцикли" -#: main.cpp:96 +#: main.cpp:97 #, kde-format msgid "(c) 2002-2014 Joachim Eibl, (c) 2017 Michael Reeves KF5/Qt5 port" msgstr "" -#: main.cpp:112 +#: main.cpp:113 #, kde-format msgid "Merge the input." msgstr "Стопи улаз." -#: main.cpp:113 +#: main.cpp:114 #, kde-format msgid "Explicit base file. For compatibility with certain tools." msgstr "Изричит базни фајл. За сагласност са појединим алаткама." -#: main.cpp:114 +#: main.cpp:115 #, kde-format msgid "Output file. Implies -m. E.g.: -o newfile.txt" msgstr "Излазни фајл. Имплицира -m. Нпр: -o novifajl.txt" -#: main.cpp:115 +#: main.cpp:116 #, kde-format msgid "Output file, again. (For compatibility with certain tools.)" msgstr "Излазни фајл, поново. За сагласност са појединим алаткама." -#: main.cpp:116 +#: main.cpp:118 #, kde-format msgid "No GUI if all conflicts are auto-solvable. (Needs -o file)" msgstr "Без ГУИ‑ја ако су сви сукоби решиви аутоматски. Захтева -o fajl." -#: main.cpp:117 +#: main.cpp:120 +#, kde-format +msgid "Ignored." +msgstr "" + +#: main.cpp:122 #, fuzzy, kde-format #| msgid "Don't solve conflicts automatically. (For compatibility...)" msgid "Do not solve conflicts automatically." msgstr "Не решавај сукобе аутоматски. За сагласност..." -#: main.cpp:118 +#: main.cpp:123 #, kde-format msgid "Visible name replacement for input file 1 (base)." msgstr "Замена видљивог имена за улазни фајл 1 (базни)." -#: main.cpp:119 +#: main.cpp:124 #, kde-format msgid "Visible name replacement for input file 2." msgstr "Замена видљивог имена за улазни фајл 2." -#: main.cpp:120 +#: main.cpp:125 #, kde-format msgid "Visible name replacement for input file 3." msgstr "Замена видљивог имена за улазни фајл 3." -#: main.cpp:121 +#: main.cpp:126 #, kde-format msgid "Alternative visible name replacement. Supply this once for every input." msgstr "Алтернативна замена видљивог имена. Задајте ово једном за сваки улаз." -#: main.cpp:122 +#: main.cpp:127 #, kde-format msgid "" "Override a config setting. Use once for every setting. E.g.: --cs " @@ -1840,87 +1850,87 @@ "Потисни поставку из поставе. Употребите једном за сваку поставку. Нпр: --cs " "\"AutoAdvance=1\"" -#: main.cpp:123 +#: main.cpp:128 #, kde-format msgid "Show list of config settings and current values." msgstr "Наброји поставке и тренутне вредности из поставе." -#: main.cpp:124 +#: main.cpp:129 #, kde-format msgid "Use a different config file." msgstr "Употреби други поставни фајл." -#: main.cpp:127 +#: main.cpp:132 #, kde-format msgid "file1 to open (base, if not specified via --base)" msgstr "Фајл 1 за отварање (базни, ако није наведен преко --base)." -#: main.cpp:128 +#: main.cpp:133 #, kde-format msgid "file2 to open" msgstr "Фајл 2 за отварање." -#: main.cpp:129 +#: main.cpp:134 #, kde-format msgid "file3 to open" msgstr "Фајл 3 за отварање." -#: main.cpp:153 +#: main.cpp:158 #, kde-format msgid "See kdiff3 --help for supported options." msgstr "" -#: mergeresultwindow.cpp:158 +#: mergeresultwindow.cpp:171 #, kde-format msgid "Choose A Everywhere" msgstr "Свуда изабери А" -#: mergeresultwindow.cpp:159 +#: mergeresultwindow.cpp:172 #, kde-format msgid "Choose B Everywhere" msgstr "Свуда изабери Б" -#: mergeresultwindow.cpp:160 +#: mergeresultwindow.cpp:173 #, kde-format msgid "Choose C Everywhere" msgstr "Свуда изабери Ц" -#: mergeresultwindow.cpp:161 +#: mergeresultwindow.cpp:174 #, kde-format msgid "Choose A for All Unsolved Conflicts" msgstr "Изабери А за све нерешене сукобе" -#: mergeresultwindow.cpp:162 +#: mergeresultwindow.cpp:175 #, kde-format msgid "Choose B for All Unsolved Conflicts" msgstr "Изабери Б за све нерешене сукобе" -#: mergeresultwindow.cpp:163 +#: mergeresultwindow.cpp:176 #, kde-format msgid "Choose C for All Unsolved Conflicts" msgstr "Изабери Ц за све нерешене сукобе" -#: mergeresultwindow.cpp:164 +#: mergeresultwindow.cpp:177 #, kde-format msgid "Choose A for All Unsolved Whitespace Conflicts" msgstr "Изабери А за све нерешене сукобе празнина" -#: mergeresultwindow.cpp:165 +#: mergeresultwindow.cpp:178 #, kde-format msgid "Choose B for All Unsolved Whitespace Conflicts" msgstr "Изабери Б за све нерешене сукобе празнина" -#: mergeresultwindow.cpp:166 +#: mergeresultwindow.cpp:179 #, kde-format msgid "Choose C for All Unsolved Whitespace Conflicts" msgstr "Изабери Ц за све нерешене сукобе празнина" -#: mergeresultwindow.cpp:176 +#: mergeresultwindow.cpp:204 #, kde-format msgid "Number of remaining unsolved conflicts: %1 (of which %2 are whitespace)" msgstr "Број преосталих нерешених сукоба: %1 (од чега %2 празнине)." -#: mergeresultwindow.cpp:370 +#: mergeresultwindow.cpp:398 #, kde-format msgid "" "The output has been modified.\n" @@ -1929,29 +1939,29 @@ "Излаз је измењен.\n" "Ако наставите измене ће бити изгубљене." -#: mergeresultwindow.cpp:936 pdiff.cpp:827 +#: mergeresultwindow.cpp:964 pdiff.cpp:838 #, kde-format msgid "All input files are binary equal." msgstr "Сви улазни фајлови бинарно су једнаки." -#: mergeresultwindow.cpp:938 +#: mergeresultwindow.cpp:966 #, kde-format msgid "All input files contain the same text." msgstr "Сви улазни фајлови садрже исти текст." -#: mergeresultwindow.cpp:942 mergeresultwindow.cpp:946 -#: mergeresultwindow.cpp:950 pdiff.cpp:833 pdiff.cpp:837 pdiff.cpp:841 +#: mergeresultwindow.cpp:970 mergeresultwindow.cpp:974 +#: mergeresultwindow.cpp:978 pdiff.cpp:844 pdiff.cpp:848 pdiff.cpp:852 #, kde-format msgid "Files %1 and %2 are binary equal.\n" msgstr "Фајлови %1 и %2 бинарно су једнаки.\n" -#: mergeresultwindow.cpp:944 mergeresultwindow.cpp:948 -#: mergeresultwindow.cpp:952 +#: mergeresultwindow.cpp:972 mergeresultwindow.cpp:976 +#: mergeresultwindow.cpp:980 #, kde-format msgid "Files %1 and %2 have equal text.\n" msgstr "Фајлови %1 и %2 садрже исти текст.\n" -#: mergeresultwindow.cpp:958 +#: mergeresultwindow.cpp:986 #, kde-format msgid "" "Total number of conflicts: %1\n" @@ -1960,27 +1970,27 @@ "%4" msgstr "" -#: mergeresultwindow.cpp:964 +#: mergeresultwindow.cpp:992 #, kde-format msgid "Conflicts" msgstr "Сукоби" -#: mergeresultwindow.cpp:1873 +#: mergeresultwindow.cpp:1901 #, kde-format msgid "" msgstr "<нема изворног реда>" -#: mergeresultwindow.cpp:1881 +#: mergeresultwindow.cpp:1909 #, kde-format msgid "" msgstr "<сукоб стапања (само празнине)>" -#: mergeresultwindow.cpp:1883 mergeresultwindow.cpp:2755 +#: mergeresultwindow.cpp:1911 mergeresultwindow.cpp:2783 #, kde-format msgid "" msgstr "<сукоб стапања>" -#: mergeresultwindow.cpp:2967 +#: mergeresultwindow.cpp:2995 #, fuzzy, kde-format #| msgid "" #| "Not all conflicts are solved yet.\n" @@ -1992,12 +2002,12 @@ "Још нису решени сви сукоби.\n" "Фајл није сачуван.\n" -#: mergeresultwindow.cpp:2969 mergeresultwindow.cpp:2978 +#: mergeresultwindow.cpp:2997 mergeresultwindow.cpp:3006 #, kde-format msgid "Conflicts Left" msgstr "Преостали сукоби" -#: mergeresultwindow.cpp:2976 +#: mergeresultwindow.cpp:3004 #, fuzzy, kde-format #| msgid "" #| "There is a line end style conflict. Please choose the line end style " @@ -2011,7 +2021,7 @@ "Сукоб у стилу завршетака редова. Изаберите ручно стил завршетка редова.\n" "Фајл није сачуван.\n" -#: mergeresultwindow.cpp:2990 +#: mergeresultwindow.cpp:3018 #, kde-format msgid "" "\n" @@ -2022,65 +2032,65 @@ "\n" "Прављење резерве није успело. Фајл није сачуван." -#: mergeresultwindow.cpp:2990 mergeresultwindow.cpp:3038 +#: mergeresultwindow.cpp:3018 mergeresultwindow.cpp:3066 #, kde-format msgid "File Save Error" msgstr "Грешка уписивања фајла" -#: mergeresultwindow.cpp:3038 +#: mergeresultwindow.cpp:3066 #, kde-format msgid "Error while writing." msgstr "Грешка при писању." -#: mergeresultwindow.cpp:3110 +#: mergeresultwindow.cpp:3138 #, fuzzy, kde-format #| msgid "Output" msgid "Output:" msgstr "Излаз" -#: mergeresultwindow.cpp:3123 mergeresultwindow.cpp:3315 +#: mergeresultwindow.cpp:3151 mergeresultwindow.cpp:3343 #, kde-format msgid "[Modified]" msgstr "[измењен]" -#: mergeresultwindow.cpp:3130 +#: mergeresultwindow.cpp:3158 #, fuzzy, kde-format #| msgid "Encoding for saving" msgid "Encoding for saving:" msgstr "Кодирање за уписивање" -#: mergeresultwindow.cpp:3230 +#: mergeresultwindow.cpp:3258 #, kde-format msgid "Conflict" msgstr "Сукоб" # >! Merge sentence. -#: mergeresultwindow.cpp:3262 +#: mergeresultwindow.cpp:3290 #, fuzzy, kde-format #| msgid "Codec from" msgid "Codec from A: %1" msgstr "Кодирање из" # >! Merge sentence. -#: mergeresultwindow.cpp:3264 +#: mergeresultwindow.cpp:3292 #, fuzzy, kde-format #| msgid "Codec from" msgid "Codec from B: %1" msgstr "Кодирање из" # >! Merge sentence. -#: mergeresultwindow.cpp:3266 +#: mergeresultwindow.cpp:3294 #, fuzzy, kde-format #| msgid "Codec from" msgid "Codec from C: %1" msgstr "Кодирање из" -#: optiondialog.cpp:119 +#: optiondialog.cpp:121 #, kde-format msgid "Change Font" msgstr "" -#: optiondialog.cpp:135 optiondialog.cpp:145 +#: optiondialog.cpp:137 optiondialog.cpp:147 #, kde-format msgid "" "Font: %1, %2, %3\n" @@ -2088,165 +2098,165 @@ "Example:" msgstr "" -#: optiondialog.cpp:388 +#: optiondialog.cpp:390 #, kde-format msgid "Unicode" msgstr "уникод" -#: optiondialog.cpp:389 +#: optiondialog.cpp:391 #, kde-format msgid "Latin1" msgstr "латиница‑1" -#: optiondialog.cpp:408 +#: optiondialog.cpp:410 #, kde-format msgid "Change this if non-ASCII characters are not displayed correctly." msgstr "Измените ово ако су не‑аски знакови погрешно приказани." # >> @title:window -#: optiondialog.cpp:491 +#: optiondialog.cpp:495 #, kde-format msgid "Configure" msgstr "Подешавање" -#: optiondialog.cpp:568 +#: optiondialog.cpp:573 #, kde-format msgid "Font" msgstr "Фонт" -#: optiondialog.cpp:570 +#: optiondialog.cpp:575 #, kde-format msgid "Editor & Diff Output Font" msgstr "Фонт уређивача и излаза разлике" -#: optiondialog.cpp:589 +#: optiondialog.cpp:594 #, kde-format msgid "Application font" msgstr "" -#: optiondialog.cpp:594 +#: optiondialog.cpp:599 #, fuzzy, kde-format #| msgid "File Save Error" msgid "File view font" msgstr "Грешка уписивања фајла" -#: optiondialog.cpp:613 +#: optiondialog.cpp:618 #, fuzzy, kde-format #| msgid "Color" msgctxt "Title for color settings page" msgid "Color" msgstr "Боја" -#: optiondialog.cpp:614 +#: optiondialog.cpp:619 #, kde-format msgid "Colors Settings" msgstr "Поставке боја" -#: optiondialog.cpp:631 +#: optiondialog.cpp:644 #, kde-format msgid "Editor and Diff Views:" msgstr "Уређивач и прикази разлика:" -#: optiondialog.cpp:639 +#: optiondialog.cpp:652 #, kde-format msgid "Foreground color:" msgstr "Боја текста:" -#: optiondialog.cpp:647 +#: optiondialog.cpp:660 #, kde-format msgid "Background color:" msgstr "Боја позадине:" -#: optiondialog.cpp:657 +#: optiondialog.cpp:670 #, kde-format msgid "Diff background color:" msgstr "Боја позадине разлика:" -#: optiondialog.cpp:666 +#: optiondialog.cpp:679 #, kde-format msgid "Color A:" msgstr "Боја А:" -#: optiondialog.cpp:675 +#: optiondialog.cpp:688 #, kde-format msgid "Color B:" msgstr "Боја Б:" -#: optiondialog.cpp:684 +#: optiondialog.cpp:697 #, kde-format msgid "Color C:" msgstr "Боја Ц:" -#: optiondialog.cpp:692 +#: optiondialog.cpp:705 #, kde-format msgid "Conflict color:" msgstr "Боја сукоба:" -#: optiondialog.cpp:701 +#: optiondialog.cpp:714 #, kde-format msgid "Current range background color:" msgstr "Позадинска боја текућег опсега:" -#: optiondialog.cpp:710 +#: optiondialog.cpp:723 #, kde-format msgid "Current range diff background color:" msgstr "Позадинска боја текућег опсега разлика:" -#: optiondialog.cpp:718 +#: optiondialog.cpp:731 #, kde-format msgid "Color for manually aligned difference ranges:" msgstr "Боја ручно поравнатих опсега разлика:" -#: optiondialog.cpp:725 +#: optiondialog.cpp:738 #, kde-format msgid "Directory Comparison View:" msgstr "Приказ поређења фасцикли:" -#: optiondialog.cpp:731 +#: optiondialog.cpp:744 #, kde-format msgid "Newest file color:" msgstr "Боја најновијег фајла:" -#: optiondialog.cpp:736 +#: optiondialog.cpp:749 #, kde-format msgid "" "Changing this color will only be effective when starting the next directory " "comparison." msgstr "Измена ове боје ступиће на снагу од првог наредног поређења фасцикли." -#: optiondialog.cpp:741 +#: optiondialog.cpp:754 #, kde-format msgid "Oldest file color:" msgstr "Боја најстаријег фајла:" -#: optiondialog.cpp:750 +#: optiondialog.cpp:763 #, kde-format msgid "Middle age file color:" msgstr "Боја фајла средње старости:" -#: optiondialog.cpp:759 +#: optiondialog.cpp:772 #, kde-format msgid "Color for missing files:" msgstr "Боја за недостајуће фајлове:" -#: optiondialog.cpp:773 +#: optiondialog.cpp:786 #, kde-format msgid "Editor" msgstr "Уређивач" -#: optiondialog.cpp:774 +#: optiondialog.cpp:787 #, kde-format msgid "Editor Behavior" msgstr "Понашање уређивача" # skip-rule: t-tab -#: optiondialog.cpp:787 +#: optiondialog.cpp:809 #, kde-format msgid "Tab inserts spaces" msgstr "Tab умеће размаке" # rewrite-msgid: /generate/insert/ -#: optiondialog.cpp:791 +#: optiondialog.cpp:813 #, kde-format msgid "" "On: Pressing tab generates the appropriate number of spaces.\n" @@ -2255,27 +2265,27 @@ "Укључено: притиском Tab‑а умеће се одговарајући број размака.\n" "Искључено: умеће се знак табулатора." -#: optiondialog.cpp:796 +#: optiondialog.cpp:818 #, kde-format msgid "Tab size:" msgstr "Величина табулатора:" -#: optiondialog.cpp:803 +#: optiondialog.cpp:825 #, kde-format msgid "Auto indentation" msgstr "Аутоматско увлачење" -#: optiondialog.cpp:807 +#: optiondialog.cpp:829 #, kde-format msgid "On: The indentation of the previous line is used for a new line.\n" msgstr "Укључено: увлачење претходног реда узима се за нови ред.\n" -#: optiondialog.cpp:810 +#: optiondialog.cpp:832 #, kde-format msgid "Auto copy selection" msgstr "Аутоматско копирање избора" -#: optiondialog.cpp:814 +#: optiondialog.cpp:836 #, fuzzy, kde-format #| msgid "" #| "On: Any selection is immediately written to the clipboard.\n" @@ -2287,7 +2297,7 @@ "Укључено: сваки избор се одмах уписује у клипборд.\n" "Искључено: морате изричито копирати, нпр. помоћу Ctrl+C." -#: optiondialog.cpp:829 +#: optiondialog.cpp:851 #, kde-format msgid "" "Sets the line endings for when an edited file is saved.\n" @@ -2296,12 +2306,12 @@ "Поставља завршетке редова када се измењени фајл сачува.\n" "ДОС/Виндоуз CR+LF, Уникс LF, где је CR=0D, LF=0A." -#: optiondialog.cpp:839 +#: optiondialog.cpp:861 #, kde-format msgid "Diff" msgstr "Разликовање" -#: optiondialog.cpp:840 +#: optiondialog.cpp:862 #, kde-format msgid "Diff Settings" msgstr "Поставке разликовања" @@ -2316,13 +2326,13 @@ #. ); #. ++line; #. -#: optiondialog.cpp:865 +#: optiondialog.cpp:896 #, fuzzy, kde-format #| msgid "Treat as white space." msgid "Ignore numbers (treat as white space)" msgstr "Третирај као празнине." -#: optiondialog.cpp:869 +#: optiondialog.cpp:900 #, kde-format msgid "" "Ignore number characters during line matching phase. (Similar to Ignore " @@ -2333,45 +2343,45 @@ "празнина).\n" "Може бити корисно при поређењу фајлова са нумеричким подацима." -#: optiondialog.cpp:873 +#: optiondialog.cpp:904 #, fuzzy, kde-format #| msgid "Treat C/C++ comments like white space." msgid "Ignore C/C++ comments (treat as white space)" msgstr "Третирај Ц/Ц++ коментаре као празнине." -#: optiondialog.cpp:876 +#: optiondialog.cpp:907 #, kde-format msgid "Treat C/C++ comments like white space." msgstr "Третирај Ц/Ц++ коментаре као празнине." # >! Merge sentence. -#: optiondialog.cpp:879 +#: optiondialog.cpp:910 #, fuzzy, kde-format #| msgid "Treat as white space." msgid "Ignore case (treat as white space)" msgstr "Третирај као празнине." -#: optiondialog.cpp:883 +#: optiondialog.cpp:914 #, kde-format msgid "Treat case differences like white space changes. ('a'<=>'A')" msgstr "Третира разлику у величини као промене у празнинама (‘а’ једнако ‘А’)." -#: optiondialog.cpp:886 +#: optiondialog.cpp:917 #, kde-format msgid "Preprocessor command:" msgstr "Предобрадна наредба:" -#: optiondialog.cpp:891 +#: optiondialog.cpp:922 #, kde-format msgid "User defined pre-processing. (See the docs for details.)" msgstr "Кориснички дефинисана предобрада. Погледајте документацију за детаље." -#: optiondialog.cpp:894 +#: optiondialog.cpp:925 #, kde-format msgid "Line-matching preprocessor command:" msgstr "Предобрадна наредба за поклапање редова:" -#: optiondialog.cpp:899 +#: optiondialog.cpp:930 #, kde-format msgid "" "This pre-processor is only used during line matching.\n" @@ -2380,12 +2390,12 @@ "Предобрада се користи само током поклапања редова.\n" "Погледајте документацију за детаље." -#: optiondialog.cpp:902 +#: optiondialog.cpp:933 #, kde-format msgid "Try hard (slower)" msgstr "Потруди се (спорије)" -#: optiondialog.cpp:906 +#: optiondialog.cpp:937 #, kde-format msgid "" "Enables the --minimal option for the external diff.\n" @@ -2394,12 +2404,12 @@ "Укључује опцију --minimal за спољашње разликовање.\n" "Анализа великих фајлова ће бити много спорија." -#: optiondialog.cpp:910 +#: optiondialog.cpp:941 #, kde-format msgid "Align B and C for 3 input files" msgstr "Поравнај Б и Ц за три улазна фајла" -#: optiondialog.cpp:914 +#: optiondialog.cpp:945 #, kde-format msgid "" "Try to align B and C when comparing or merging three input files.\n" @@ -2410,17 +2420,24 @@ "Није препоручљиво за стапање зато што га може учинити сложенијим.\n" "Подразумевано је искључено." -#: optiondialog.cpp:926 +#: optiondialog.cpp:956 +#, fuzzy, kde-format +#| msgid "Merge" +msgctxt "Settings page" +msgid "Merge" +msgstr "Стопи" + +#: optiondialog.cpp:957 #, kde-format msgid "Merge Settings" msgstr "Поставке стапања" -#: optiondialog.cpp:940 +#: optiondialog.cpp:980 #, kde-format msgid "Auto advance delay (ms):" msgstr "Застој аутоматског напредовања (ms):" -#: optiondialog.cpp:946 +#: optiondialog.cpp:986 #, kde-format msgid "" "When in Auto-Advance mode the result of the current selection is shown \n" @@ -2429,27 +2446,27 @@ "У режиму аутоматског напредовања резултат текућег избора приказује се \n" "задато време пре скока на следећи сукоб. Опсег: 0–2000 ms." -#: optiondialog.cpp:950 +#: optiondialog.cpp:990 #, kde-format msgid "Show info dialogs" msgstr "Приказуј информативне дијалоге" -#: optiondialog.cpp:953 +#: optiondialog.cpp:993 #, kde-format msgid "Show a dialog with information about the number of conflicts." msgstr "Приказује дијалог са информацијом о броју сукоба." -#: optiondialog.cpp:956 +#: optiondialog.cpp:996 #, kde-format msgid "White space 2-file merge default:" msgstr "Подразумевано стапање празнина два фајла:" -#: optiondialog.cpp:961 optiondialog.cpp:974 +#: optiondialog.cpp:1001 optiondialog.cpp:1014 #, kde-format msgid "Manual Choice" msgstr "Ручни избор" -#: optiondialog.cpp:965 optiondialog.cpp:979 +#: optiondialog.cpp:1005 optiondialog.cpp:1019 #, kde-format msgid "" "Allow the merge algorithm to automatically select an input for white-space-" @@ -2458,22 +2475,22 @@ "Дозвољава алгоритму стапања да аутоматски изабере улаз за измене само у " "празнинама." -#: optiondialog.cpp:969 +#: optiondialog.cpp:1009 #, kde-format msgid "White space 3-file merge default:" msgstr "Подразумевано стапање празнина три фајла:" -#: optiondialog.cpp:983 +#: optiondialog.cpp:1023 #, kde-format msgid "Automatic Merge Regular Expression" msgstr "Регуларни израз за аутоматско стапање" -#: optiondialog.cpp:991 smalldialogs.cpp:449 +#: optiondialog.cpp:1031 smalldialogs.cpp:459 #, kde-format msgid "Auto merge regular expression:" msgstr "Регуларни израз за аутоматско стапање:" -#: optiondialog.cpp:996 +#: optiondialog.cpp:1036 #, kde-format msgid "" "Regular expression for lines where KDiff3 should automatically choose one " @@ -2485,30 +2502,30 @@ "извора. Кад регуларни израз поклопи ред са сукобом бира се Ц ако га има, " "иначе Б." -#: optiondialog.cpp:1002 +#: optiondialog.cpp:1042 #, kde-format msgid "Run regular expression auto merge on merge start" msgstr "Аутоматски стопи по регуларном изразу на почетку стапања" -#: optiondialog.cpp:1005 +#: optiondialog.cpp:1045 #, kde-format msgid "" "Run the merge for auto merge regular expressions\n" "immediately when a merge starts.\n" msgstr "Спроводи стапање регуларним изразом чим стапање почне.\n" -#: optiondialog.cpp:1010 +#: optiondialog.cpp:1050 #, kde-format msgid "Version Control History Merging" msgstr "Стапање историјата управљања верзијама" -#: optiondialog.cpp:1018 smalldialogs.cpp:476 +#: optiondialog.cpp:1058 smalldialogs.cpp:486 #, kde-format msgid "History start regular expression:" msgstr "Регуларни израз за почетак историјата:" # literal-segment: Log -#: optiondialog.cpp:1023 +#: optiondialog.cpp:1063 #, kde-format msgid "" "Regular expression for the start of the version control history entry.\n" @@ -2519,12 +2536,12 @@ "Овај ред обично садржи кључну реч „$Log$“.\n" "Подразумевана вредност је „.*\\$Log.*\\$.*“." -#: optiondialog.cpp:1029 smalldialogs.cpp:504 +#: optiondialog.cpp:1069 smalldialogs.cpp:514 #, kde-format msgid "History entry start regular expression:" msgstr "Регуларни израз за почетак уноса историјата:" -#: optiondialog.cpp:1042 +#: optiondialog.cpp:1082 #, kde-format msgid "" "A version control history entry consists of several lines.\n" @@ -2542,22 +2559,22 @@ "редовима.\n" "Детаље потражите у документацији." -#: optiondialog.cpp:1050 +#: optiondialog.cpp:1090 #, kde-format msgid "History merge sorting" msgstr "Ређање у стапању историјата" -#: optiondialog.cpp:1053 +#: optiondialog.cpp:1093 #, kde-format msgid "Sort version control history by a key." msgstr "Ређа историјат управљања верзијама по кључу." -#: optiondialog.cpp:1063 +#: optiondialog.cpp:1103 #, kde-format msgid "History entry start sort key order:" msgstr "Редослед ређања за кључеве уноса историјата:" -#: optiondialog.cpp:1068 +#: optiondialog.cpp:1108 #, kde-format msgid "" "Each pair of parentheses used in the regular expression for the history " @@ -2575,39 +2592,39 @@ "Ако се остави празно, ређање се не спроводи.\n" "Детаље потражите у документацији." -#: optiondialog.cpp:1079 +#: optiondialog.cpp:1119 #, kde-format msgid "Merge version control history on merge start" msgstr "Стопи историјат управљања верзијама на почетку стапања" -#: optiondialog.cpp:1082 +#: optiondialog.cpp:1122 #, kde-format msgid "Run version control history automerge on merge start." msgstr "Аутоматски стапа историјат управљања верзијама на почетку стапања." -#: optiondialog.cpp:1086 +#: optiondialog.cpp:1126 #, kde-format msgid "Max number of history entries:" msgstr "Највећи број уноса историјата:" # skip-rule: t-cut -#: optiondialog.cpp:1090 +#: optiondialog.cpp:1130 #, kde-format msgid "Cut off after specified number. Use -1 for infinite number of entries." msgstr "Одсеца изнад задатог броја. Ставите -1 за неограничен број уноса." # >> @action:button -#: optiondialog.cpp:1094 +#: optiondialog.cpp:1134 #, kde-format msgid "Test your regular expressions" msgstr "Испробај регуларне изразе" -#: optiondialog.cpp:1099 +#: optiondialog.cpp:1139 #, kde-format msgid "Irrelevant merge command:" msgstr "Наредба при безначајном стапању:" -#: optiondialog.cpp:1104 +#: optiondialog.cpp:1144 #, kde-format msgid "" "If specified this script is run after automerge\n" @@ -2618,12 +2635,12 @@ "никаквих преосталих измена.\n" "Позива се са аргументима: име‑фајла‑1 име‑фајла‑2 име‑фајла‑3" -#: optiondialog.cpp:1109 +#: optiondialog.cpp:1149 #, kde-format msgid "Auto save and quit on merge without conflicts" msgstr "Аутоматски сачувај и напусти при стапању без сукоба" -#: optiondialog.cpp:1113 +#: optiondialog.cpp:1153 #, kde-format msgid "" "If KDiff3 was started for a file-merge from the command line and all\n" @@ -2636,27 +2653,27 @@ "уписују и програм напушта.\n" "Слично опцији командне линије --auto." -#: optiondialog.cpp:1124 optiondialog.cpp:1125 +#: optiondialog.cpp:1164 optiondialog.cpp:1165 #, kde-format msgid "Directory" msgstr "Фасцикла" -#: optiondialog.cpp:1137 +#: optiondialog.cpp:1185 #, kde-format msgid "Recursive directories" msgstr "Рекурзивно кроз фасцикле" -#: optiondialog.cpp:1140 +#: optiondialog.cpp:1188 #, kde-format msgid "Whether to analyze subdirectories or not." msgstr "Да ли анализирати потфасцикле." -#: optiondialog.cpp:1142 +#: optiondialog.cpp:1190 #, kde-format msgid "File pattern(s):" msgstr "Обрасци фајлова:" -#: optiondialog.cpp:1148 +#: optiondialog.cpp:1196 #, kde-format msgid "" "Pattern(s) of files to be analyzed. \n" @@ -2667,12 +2684,12 @@ "Џокери: ‘*’ и ‘?’\n" "Више образаца наводите са тачка-запетом као раздвајачем." -#: optiondialog.cpp:1153 +#: optiondialog.cpp:1201 #, kde-format msgid "File-anti-pattern(s):" msgstr "Противобрасци фајлова:" -#: optiondialog.cpp:1159 +#: optiondialog.cpp:1207 #, kde-format msgid "" "Pattern(s) of files to be excluded from analysis. \n" @@ -2683,12 +2700,12 @@ "Џокери: ‘*’ и ‘?’\n" "Више образаца наводите са тачка-запетом као раздвајачем." -#: optiondialog.cpp:1164 +#: optiondialog.cpp:1212 #, kde-format msgid "Dir-anti-pattern(s):" msgstr "Противобрасци фасцикли:" -#: optiondialog.cpp:1170 +#: optiondialog.cpp:1218 #, kde-format msgid "" "Pattern(s) of directories to be excluded from analysis. \n" @@ -2699,12 +2716,12 @@ "Џокери: ‘*’ и ‘?’\n" "Више образаца наводите са тачка-запетом као раздвајачем." -#: optiondialog.cpp:1175 +#: optiondialog.cpp:1223 #, kde-format msgid "Use .cvsignore" msgstr "Користи .cvsignore" -#: optiondialog.cpp:1179 +#: optiondialog.cpp:1227 #, kde-format msgid "" "Extends the antipattern to anything that would be ignored by CVS.\n" @@ -2713,23 +2730,23 @@ "Проширује противобрасце на све што би игнорисао ЦВС.\n" "Преко локалних фајлова .cvsignore ово може бити посебно по фасцикли." -#: optiondialog.cpp:1183 +#: optiondialog.cpp:1231 #, kde-format msgid "Find hidden files and directories" msgstr "Пронађи скривене фајлове и фасцикле" -#: optiondialog.cpp:1186 +#: optiondialog.cpp:1234 #, fuzzy, kde-format #| msgid "Find hidden files and directories" msgid "Finds hidden files and directories." msgstr "Пронађи скривене фајлове и фасцикле" -#: optiondialog.cpp:1189 +#: optiondialog.cpp:1237 #, kde-format msgid "Follow file links" msgstr "Прати везе фајлова" -#: optiondialog.cpp:1193 +#: optiondialog.cpp:1241 #, kde-format msgid "" "On: Compare the file the link points to.\n" @@ -2738,12 +2755,12 @@ "Укључено: пореди фајлове на које показују везе.\n" "Искључено: пореди везе." -#: optiondialog.cpp:1197 +#: optiondialog.cpp:1245 #, kde-format msgid "Follow directory links" msgstr "Прати везе фасцикли" -#: optiondialog.cpp:1201 +#: optiondialog.cpp:1249 #, kde-format msgid "" "On: Compare the directory the link points to.\n" @@ -2752,12 +2769,12 @@ "Укључено: пореди фасцикле на које показују везе.\n" "Искључено: пореди везе." -#: optiondialog.cpp:1210 +#: optiondialog.cpp:1258 #, kde-format msgid "Case sensitive filename comparison" msgstr "Поређење имена фајлова разликује величину слова" -#: optiondialog.cpp:1214 +#: optiondialog.cpp:1262 #, kde-format msgid "" "The directory comparison will compare files or directories when their names " @@ -2769,52 +2786,52 @@ "Задајте ову опцију имена треба да се поклапају и по величини слова. " "Подразумевано је искључено под Виндоузом, иначе је укључено." -#: optiondialog.cpp:1218 +#: optiondialog.cpp:1266 #, fuzzy, kde-format #| msgid "Unfold All Subdirs" msgid "Unfold all subdirectories on load" msgstr "Рашири све потфасцикле" -#: optiondialog.cpp:1222 +#: optiondialog.cpp:1270 #, kde-format msgid "" "On: Unfold all subdirectories when starting a directory diff.\n" "Off: Leave subdirectories folded." msgstr "" -#: optiondialog.cpp:1226 +#: optiondialog.cpp:1274 #, kde-format msgid "Skip directory status report" msgstr "" -#: optiondialog.cpp:1230 +#: optiondialog.cpp:1278 #, kde-format msgid "" "On: Do not show the Directory Comparison Status.\n" "Off: Show the status dialog on start." msgstr "" -#: optiondialog.cpp:1234 +#: optiondialog.cpp:1282 #, kde-format msgid "File Comparison Mode" msgstr "Режим поређења фајлова" -#: optiondialog.cpp:1239 +#: optiondialog.cpp:1287 #, kde-format msgid "Binary comparison" msgstr "Бинарно поређење" -#: optiondialog.cpp:1241 +#: optiondialog.cpp:1289 #, kde-format msgid "Binary comparison of each file. (Default)" msgstr "Бинарно поређење за сваки фајл (подразумевано)." -#: optiondialog.cpp:1244 +#: optiondialog.cpp:1292 #, kde-format msgid "Full analysis" msgstr "Пуна анализа" -#: optiondialog.cpp:1246 +#: optiondialog.cpp:1294 #, kde-format msgid "" "Do a full analysis and show statistics information in extra columns.\n" @@ -2823,12 +2840,12 @@ "Спроводи пуну анализу и даје статистичке податке у додатним колонама.\n" "Спорије него бинарно поређење, много спорије за бинарне фајлове." -#: optiondialog.cpp:1250 +#: optiondialog.cpp:1298 #, kde-format msgid "Trust the size and modification date (unsafe)" msgstr "Веруј величини и датуму измене (несигурно)" -#: optiondialog.cpp:1252 +#: optiondialog.cpp:1300 #, kde-format msgid "" "Assume that files are equal if the modification date and file length are " @@ -2843,7 +2860,7 @@ "различитим.\n" "Корисно за велике фасцикле или споре мреже." -#: optiondialog.cpp:1257 +#: optiondialog.cpp:1305 #, kde-format msgid "" "Trust the size and date, but use binary comparison if date does not match " @@ -2852,7 +2869,7 @@ "Веруј величини и датуму, али бинарно упореди ако се датум не поклапа " "(несигурно)" -#: optiondialog.cpp:1259 +#: optiondialog.cpp:1307 #, kde-format msgid "" "Assume that files are equal if the modification date and file length are " @@ -2865,12 +2882,12 @@ "Ако датуми нису исти али величина јесте, бинарно упоређује.\n" "Корисно за велике фасцикле или споре мреже." -#: optiondialog.cpp:1264 +#: optiondialog.cpp:1312 #, kde-format msgid "Trust the size (unsafe)" msgstr "Веруј величини (несигурно)" -#: optiondialog.cpp:1266 +#: optiondialog.cpp:1314 #, kde-format msgid "" "Assume that files are equal if their file lengths are equal.\n" @@ -2881,12 +2898,12 @@ "Корисно за велике фасцикле или споре мреже када се датум измени током " "преузимања." -#: optiondialog.cpp:1273 +#: optiondialog.cpp:1321 #, kde-format msgid "Synchronize directories" msgstr "Синхронизуј фасцикле" -#: optiondialog.cpp:1277 +#: optiondialog.cpp:1325 #, kde-format msgid "" "Offers to store files in both directories so that\n" @@ -2896,12 +2913,12 @@ "Нуди да складишти фајлове у обе фасцикле тако да испадну исте после тога.\n" "Ради само када се пореде две фасцикле без задавања одредишта." -#: optiondialog.cpp:1283 +#: optiondialog.cpp:1331 #, kde-format msgid "White space differences considered equal" msgstr "Разлике у празнинама сматрају се једнаким" -#: optiondialog.cpp:1287 +#: optiondialog.cpp:1335 #, kde-format msgid "" "If files differ only by white space consider them equal.\n" @@ -2911,12 +2928,12 @@ "Ово је активно само када се изабере пуна анализа." # >> copy newer file -#: optiondialog.cpp:1293 +#: optiondialog.cpp:1341 #, kde-format msgid "Copy newer instead of merging (unsafe)" msgstr "Копирај новији уместо стапања (несигурно)" -#: optiondialog.cpp:1297 +#: optiondialog.cpp:1345 #, fuzzy, kde-format #| msgid "" #| "Don't look inside, just take the newer file.\n" @@ -2931,12 +2948,12 @@ "Користите ово само ако знате шта радите!\n" "Има ефекта само при поређењу две фасцикле." -#: optiondialog.cpp:1302 +#: optiondialog.cpp:1350 #, kde-format msgid "Backup files (.orig)" msgstr "Прави резерве фајлова (.orig)" -#: optiondialog.cpp:1306 +#: optiondialog.cpp:1354 #, kde-format msgid "" "If a file would be saved over an old file, then the old file\n" @@ -2946,17 +2963,17 @@ "преименован са наставком .orig уместо да буде обрисан." # rewrite-msgid: /Regional/Locale/ -#: optiondialog.cpp:1382 optiondialog.cpp:1383 +#: optiondialog.cpp:1430 optiondialog.cpp:1431 #, kde-format msgid "Regional Settings" msgstr "Поставке локалитета" -#: optiondialog.cpp:1397 +#: optiondialog.cpp:1454 #, kde-format msgid "Use the same encoding for everything:" msgstr "Исто кодирање за све:" -#: optiondialog.cpp:1401 +#: optiondialog.cpp:1458 #, kde-format msgid "" "Enable this allows to change all encodings by changing the first only.\n" @@ -2966,18 +2983,18 @@ "Искључите ово ако поједине поставке треба да буду различите." # >! Merge sentence. -#: optiondialog.cpp:1405 +#: optiondialog.cpp:1462 #, fuzzy, kde-format #| msgid "Note: Local Encoding is " msgid "Note: Local Encoding is \"%1\"" msgstr "Напомена: локално кодирање је " -#: optiondialog.cpp:1409 +#: optiondialog.cpp:1466 #, kde-format msgid "File Encoding for A:" msgstr "Кодирање фајла за А:" -#: optiondialog.cpp:1416 +#: optiondialog.cpp:1473 #, kde-format msgid "" "If enabled then Unicode (UTF-16 or UTF-8) encoding will be detected.\n" @@ -2989,32 +3006,32 @@ "Ако фајл није уникодски изабрано кодирање ће бити употребљено као одступно.\n" "Откривање уникода зависи од првих бајтова у фајлу." -#: optiondialog.cpp:1419 optiondialog.cpp:1430 optiondialog.cpp:1441 +#: optiondialog.cpp:1476 optiondialog.cpp:1487 optiondialog.cpp:1498 #, kde-format msgid "Auto Detect Unicode" msgstr "Аутоматски откриј уникод" -#: optiondialog.cpp:1425 +#: optiondialog.cpp:1482 #, kde-format msgid "File Encoding for B:" msgstr "Кодирање фајла за Б:" -#: optiondialog.cpp:1436 +#: optiondialog.cpp:1493 #, kde-format msgid "File Encoding for C:" msgstr "Кодирање фајла за Ц:" -#: optiondialog.cpp:1447 +#: optiondialog.cpp:1504 #, kde-format msgid "File Encoding for Merge Output and Saving:" msgstr "Кодирање фајла за стопљени излаз и уписивање:" -#: optiondialog.cpp:1452 +#: optiondialog.cpp:1509 #, kde-format msgid "Auto Select" msgstr "Аутоматски изабери" -#: optiondialog.cpp:1456 +#: optiondialog.cpp:1513 #, kde-format msgid "" "If enabled then the encoding from the input files is used.\n" @@ -3025,17 +3042,17 @@ "У двосмисленим случајевима издаје се дијалог где корисник бира кодирање за " "уписивање." -#: optiondialog.cpp:1459 +#: optiondialog.cpp:1516 #, kde-format msgid "File Encoding for Preprocessor Files:" msgstr "Кодирање фајла за предобрадне фајлове:" -#: optiondialog.cpp:1471 +#: optiondialog.cpp:1528 #, kde-format msgid "Right To Left Language" msgstr "Језици здесна улево" -#: optiondialog.cpp:1475 +#: optiondialog.cpp:1532 #, kde-format msgid "" "Some languages are read from right to left.\n" @@ -3044,22 +3061,22 @@ "Неки језици се читају здесна улево.\n" "Ова поставка прилагођава томе приказивач и уређивач." -#: optiondialog.cpp:1485 +#: optiondialog.cpp:1542 #, kde-format msgid "Integration" msgstr "Уклапање" -#: optiondialog.cpp:1486 +#: optiondialog.cpp:1543 #, kde-format msgid "Integration Settings" msgstr "Поставке уклапања" -#: optiondialog.cpp:1499 +#: optiondialog.cpp:1564 #, kde-format msgid "Command line options to ignore:" msgstr "Занемари опције командне линије:" -#: optiondialog.cpp:1505 +#: optiondialog.cpp:1570 #, kde-format msgid "" "List of command line options that should be ignored when KDiff3 is used by " @@ -3072,12 +3089,12 @@ "Више вредности можете задати раздвојене тачка-запетом.\n" "Овим се сузбија грешка „непозната опција“." -#: optiondialog.cpp:1510 +#: optiondialog.cpp:1575 #, kde-format msgid "Quit also via Escape key" msgstr "Напуштање и преко тастера Esc" -#: optiondialog.cpp:1514 +#: optiondialog.cpp:1579 #, kde-format msgid "" "Fast method to exit.\n" @@ -3086,7 +3103,7 @@ "Брз начин напуштања.\n" "За оне навикнуте на тастер Esc у ову сврху." -#: optiondialog.cpp:1598 +#: optiondialog.cpp:1653 #, kde-format msgid "This resets all options. Not only those of the current topic." msgstr "Ово ресетује све опције, и то не само оне у текућој теми." @@ -3142,85 +3159,77 @@ msgstr "Искључи несигурне опције" # >> @info:progress -#: pdiff.cpp:158 +#: pdiff.cpp:160 #, kde-format msgid "Loading A" msgstr "Учитавам А" -#: pdiff.cpp:167 -#, kde-format -msgid "Errors occurred during pre-processing of file A." -msgstr "" +# >> @info:progress +#: pdiff.cpp:162 +#, fuzzy, kde-format +#| msgid "Loading A" +msgid "Loading A: %1" +msgstr "Учитавам А" # >> @info:progress -#: pdiff.cpp:172 +#: pdiff.cpp:170 #, kde-format msgid "Loading B" msgstr "Учитавам Б" -#: pdiff.cpp:179 -#, kde-format -msgid "Errors occurred during pre-processing of file B." -msgstr "" - # >> @info:progress -#: pdiff.cpp:202 pdiff.cpp:241 +#: pdiff.cpp:201 pdiff.cpp:237 #, kde-format msgid "Diff: A <-> B" msgstr "Разликујем А и Б" # >> @info:progress -#: pdiff.cpp:208 pdiff.cpp:279 pdiff.cpp:293 +#: pdiff.cpp:207 pdiff.cpp:275 pdiff.cpp:289 #, kde-format msgid "Linediff: A <-> B" msgstr "Разликујем редове А и Б" # >> @info:progress -#: pdiff.cpp:225 +#: pdiff.cpp:224 #, kde-format msgid "Loading C" msgstr "Учитавам Ц" -#: pdiff.cpp:232 -#, kde-format -msgid "Errors occurred during pre-processing of file C." -msgstr "" - # >> @info:progress -#: pdiff.cpp:250 +#: pdiff.cpp:246 #, kde-format msgid "Diff: A <-> C" msgstr "Разликујем А и Ц" # >> @info:progress -#: pdiff.cpp:261 +#: pdiff.cpp:257 #, kde-format msgid "Diff: B <-> C" msgstr "Разликујем Б и Ц" # >> @info:progress -#: pdiff.cpp:283 pdiff.cpp:297 +#: pdiff.cpp:279 pdiff.cpp:293 #, kde-format msgid "Linediff: B <-> C" msgstr "Разликујем редове Б и Ц" # >> @info:progress -#: pdiff.cpp:287 pdiff.cpp:301 +#: pdiff.cpp:283 pdiff.cpp:297 #, kde-format msgid "Linediff: A <-> C" msgstr "Разликујем редове А и Ц" -#: pdiff.cpp:829 +#: pdiff.cpp:840 #, kde-format msgid "All input files contain the same text, but are not binary equal." msgstr "Сви улазни фајлови садрже исти текст, али нису бинарно једнаки." -#: pdiff.cpp:835 pdiff.cpp:839 pdiff.cpp:843 +#: pdiff.cpp:846 pdiff.cpp:850 pdiff.cpp:854 #, kde-format msgid "Files %1 and %2 have equal text, but are not binary equal. \n" msgstr "Фајлови %1 и %2 имају исти текст али нису бинарно једнаки.\n" -#: pdiff.cpp:853 +#: pdiff.cpp:864 #, fuzzy, kde-format #| msgid "" #| "Some inputfiles don't seem to be pure textfiles.\n" @@ -3235,17 +3244,17 @@ "Имајте на уму да стапање у К‑диф3 није намењено бинарним подацима.\n" "Наставите на сопствену одговорност." -#: pdiff.cpp:863 +#: pdiff.cpp:874 #, kde-format msgid ", B" msgstr "" -#: pdiff.cpp:865 +#: pdiff.cpp:876 #, kde-format msgid ", C" msgstr "" -#: pdiff.cpp:867 +#: pdiff.cpp:878 #, fuzzy, kde-format #| msgid "" #| "Some input characters could not be converted to valid unicode.\n" @@ -3263,77 +3272,72 @@ "Не уписујте резултат ако нисте сигурни. Наставите на сопствену одговорност.\n" "Погођени улазни фајлови налазе се у %1." -#: pdiff.cpp:1034 +#: pdiff.cpp:1053 #, kde-format msgid "Abort" msgstr "Обустави" -#: pdiff.cpp:1040 pdiff.cpp:1130 +#: pdiff.cpp:1059 pdiff.cpp:1150 #, kde-format msgid "Opening files..." msgstr "Отварам фајлове..." -#: pdiff.cpp:1107 -#, kde-format -msgid "File open error" -msgstr "Грешка при отварању фајла" - -#: pdiff.cpp:1202 +#: pdiff.cpp:1222 #, kde-format msgid "Cutting selection..." msgstr "Исецам изабрано..." -#: pdiff.cpp:1223 +#: pdiff.cpp:1243 #, kde-format msgid "Copying selection to clipboard..." msgstr "Копирам избор у клипборд..." -#: pdiff.cpp:1239 +#: pdiff.cpp:1259 #, kde-format msgid "Inserting clipboard contents..." msgstr "Умећем садржај клипборда..." -#: pdiff.cpp:1695 +#: pdiff.cpp:1715 #, kde-format msgid "Word wrap (Cancel disables word wrap)" msgstr "" -#: pdiff.cpp:1696 +#: pdiff.cpp:1716 #, kde-format msgid "Calculating max width for horizontal scrollbar" msgstr "" -#: pdiff.cpp:1911 +#: pdiff.cpp:1931 #, kde-format msgid "Save && Continue" msgstr "Сачувај и настави" -#: pdiff.cpp:1912 +#: pdiff.cpp:1932 #, kde-format msgid "Continue Without Saving" msgstr "Настави без уписивања" -#: pdiff.cpp:2124 +#: pdiff.cpp:2144 #, kde-format msgid "Search complete." msgstr "Претрага је готова." -#: pdiff.cpp:2124 +#: pdiff.cpp:2144 #, kde-format msgid "Search Complete" msgstr "Претрага завршена" -#: pdiff.cpp:2375 +#: pdiff.cpp:2395 #, kde-format msgid "Nothing is selected in either diff input window." msgstr "Ништа није изабрано ни у једном прозору улаза разлике." -#: pdiff.cpp:2375 +#: pdiff.cpp:2395 #, kde-format msgid "Error while adding manual diff range" msgstr "Грешка при додавању ручног опсега разлике" -#: progress.cpp:59 progress.cpp:71 +#: progress.cpp:61 progress.cpp:73 #, kde-format msgid "&Cancel" msgstr "&Одустани" @@ -3343,127 +3347,127 @@ msgid "A (Base):" msgstr "А (база):" -#: smalldialogs.cpp:68 smalldialogs.cpp:85 smalldialogs.cpp:102 -#: smalldialogs.cpp:144 +#: smalldialogs.cpp:71 smalldialogs.cpp:90 smalldialogs.cpp:109 +#: smalldialogs.cpp:154 #, kde-format msgid "File..." msgstr "Фајл..." -#: smalldialogs.cpp:70 smalldialogs.cpp:87 smalldialogs.cpp:104 -#: smalldialogs.cpp:146 +#: smalldialogs.cpp:73 smalldialogs.cpp:92 smalldialogs.cpp:111 +#: smalldialogs.cpp:156 #, kde-format msgid "Dir..." msgstr "Фасцикла..." -#: smalldialogs.cpp:96 +#: smalldialogs.cpp:103 #, kde-format msgid "C (Optional):" msgstr "Ц (опционо):" -#: smalldialogs.cpp:119 +#: smalldialogs.cpp:126 #, fuzzy, kde-format #| msgid "Swap/Copy Names ..." msgid "Swap/Copy Names..." msgstr "Размени/копирај имена..." -#: smalldialogs.cpp:124 smalldialogs.cpp:125 smalldialogs.cpp:126 +#: smalldialogs.cpp:131 smalldialogs.cpp:132 smalldialogs.cpp:133 #, kde-format msgid "Swap %1<->%2" msgstr "Размени %1 и %2" -#: smalldialogs.cpp:127 smalldialogs.cpp:128 smalldialogs.cpp:129 +#: smalldialogs.cpp:134 smalldialogs.cpp:135 smalldialogs.cpp:136 #, kde-format msgid "Copy %1->Output" msgstr "Копирај %1 у излаз" -#: smalldialogs.cpp:130 smalldialogs.cpp:131 smalldialogs.cpp:132 +#: smalldialogs.cpp:137 smalldialogs.cpp:138 smalldialogs.cpp:139 #, kde-format msgid "Swap %1<->Output" msgstr "Размени %1 и излаз" -#: smalldialogs.cpp:138 +#: smalldialogs.cpp:148 #, kde-format msgid "Output (optional):" msgstr "Излаз (опционо):" -#: smalldialogs.cpp:168 +#: smalldialogs.cpp:178 #, kde-format msgid "Configure..." msgstr "Подеси..." -#: smalldialogs.cpp:233 +#: smalldialogs.cpp:243 #, fuzzy, kde-format #| msgid "Directory" msgid "Open Directory" msgstr "Фасцикла" -#: smalldialogs.cpp:234 +#: smalldialogs.cpp:244 #, kde-format msgid "Select Output File" msgstr "" -#: smalldialogs.cpp:393 +#: smalldialogs.cpp:403 #, kde-format msgid "Search text:" msgstr "Тражени текст:" -#: smalldialogs.cpp:400 +#: smalldialogs.cpp:410 #, kde-format msgid "Case sensitive" msgstr "Разликуј величину слова" -#: smalldialogs.cpp:403 +#: smalldialogs.cpp:413 #, kde-format msgid "Search A" msgstr "Претражи А" -#: smalldialogs.cpp:408 +#: smalldialogs.cpp:418 #, kde-format msgid "Search B" msgstr "Претражи Б" -#: smalldialogs.cpp:413 +#: smalldialogs.cpp:423 #, kde-format msgid "Search C" msgstr "Претражи Ц" -#: smalldialogs.cpp:418 +#: smalldialogs.cpp:428 #, kde-format msgid "Search output" msgstr "Излаз претраге" -#: smalldialogs.cpp:425 +#: smalldialogs.cpp:435 #, kde-format msgid "&Search" msgstr "&Тражи" -#: smalldialogs.cpp:444 +#: smalldialogs.cpp:454 #, kde-format msgid "Regular Expression Tester" msgstr "Проба регуларних израза" -#: smalldialogs.cpp:457 +#: smalldialogs.cpp:467 #, kde-format msgid "Example auto merge line:" msgstr "Пример реда за аутоматско стапање:" -#: smalldialogs.cpp:459 +#: smalldialogs.cpp:469 #, kde-format msgid "To test auto merge, copy a line as used in your files." msgstr "" "За пробу аутоматског стапања, копирајте ред какав се налази у фајловима." -#: smalldialogs.cpp:465 smalldialogs.cpp:493 smalldialogs.cpp:529 +#: smalldialogs.cpp:475 smalldialogs.cpp:503 smalldialogs.cpp:539 #, kde-format msgid "Match result:" msgstr "Резултат поклапања:" -#: smalldialogs.cpp:484 +#: smalldialogs.cpp:494 #, kde-format msgid "Example history start line (with leading comment):" msgstr "Пример почетног реда историјата (са водећим коментаром):" -#: smalldialogs.cpp:486 +#: smalldialogs.cpp:496 #, kde-format msgid "" "Copy a history start line as used in your files,\n" @@ -3472,17 +3476,17 @@ "Копирајте почетни ред историјата какав се налази у фајловима, укључујући и " "водећи коментар." -#: smalldialogs.cpp:512 +#: smalldialogs.cpp:522 #, kde-format msgid "History sort key order:" msgstr "Редослед ређања кључева историјата:" -#: smalldialogs.cpp:520 +#: smalldialogs.cpp:530 #, kde-format msgid "Example history entry start line (without leading comment):" msgstr "Пример почетног реда ставке историјата (без водећег коментара):" -#: smalldialogs.cpp:522 +#: smalldialogs.cpp:532 #, kde-format msgid "" "Copy a history entry start line as used in your files,\n" @@ -3491,48 +3495,48 @@ "Копирајте почетни ред ставке историјата какав се налази у фајловима, али " "изостављајући водећи коментар." -#: smalldialogs.cpp:536 +#: smalldialogs.cpp:546 #, kde-format msgid "Sort key result:" msgstr "Резултат ређања кључева:" -#: smalldialogs.cpp:584 smalldialogs.cpp:594 smalldialogs.cpp:614 +#: smalldialogs.cpp:594 smalldialogs.cpp:604 smalldialogs.cpp:624 #, kde-format msgid "Match success." msgstr "Поклапање је успело." -#: smalldialogs.cpp:588 smalldialogs.cpp:598 smalldialogs.cpp:620 +#: smalldialogs.cpp:598 smalldialogs.cpp:608 smalldialogs.cpp:630 #, kde-format msgid "Match failed." msgstr "Поклапање није успело." -#: smalldialogs.cpp:605 +#: smalldialogs.cpp:615 #, kde-format msgid "Opening and closing parentheses do not match in regular expression." msgstr "Не поклапају се отворене и затворене заграде у регуларном изразу." -#: SourceData.cpp:150 +#: SourceData.cpp:153 #, kde-format msgid "Writing clipboard data to temp file failed." msgstr "Уписивање података из клипборда у привремени фајл није успело." -#: SourceData.cpp:154 +#: SourceData.cpp:157 #, kde-format msgid "From Clipboard" msgstr "Из клипборда" -#: SourceData.cpp:335 +#: SourceData.cpp:348 #, fuzzy, kde-format #| msgid "Mix of links and normal files." msgid "%1 is not a normal file." msgstr "Мешавина веза и нормалних фајлова." -#: SourceData.cpp:427 +#: SourceData.cpp:440 #, kde-format msgid " Temp file is: %1" msgstr "" -#: SourceData.cpp:432 +#: SourceData.cpp:445 #, kde-format msgid "" "Preprocessing possibly failed. Check this command:\n" @@ -3547,12 +3551,12 @@ "\n" "Наредба предобраде ће сада бити деактивирана." -#: SourceData.cpp:443 SourceData.cpp:507 +#: SourceData.cpp:456 SourceData.cpp:525 #, kde-format msgid "File %1 too large to process. Skipping." msgstr "" -#: SourceData.cpp:487 +#: SourceData.cpp:500 #, kde-format msgid "" "The line-matching-preprocessing possibly failed. Check this command:\n" diff -Nru kdiff3-1.8.01/po/sr@ijekavianlatin/kdiff3fileitemactionplugin.po kdiff3-1.8.3/po/sr@ijekavianlatin/kdiff3fileitemactionplugin.po --- kdiff3-1.8.01/po/sr@ijekavianlatin/kdiff3fileitemactionplugin.po 2019-05-18 01:02:27.000000000 +0000 +++ kdiff3-1.8.3/po/sr@ijekavianlatin/kdiff3fileitemactionplugin.po 2020-06-25 00:18:52.000000000 +0000 @@ -3,8 +3,8 @@ msgid "" msgstr "" "Project-Id-Version: kdiff3fileitemactionplugin\n" -"Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2019-03-22 03:09+0100\n" +"Report-Msgid-Bugs-To: https://bugs.kde.org\n" +"POT-Creation-Date: 2019-08-30 07:40+0200\n" "PO-Revision-Date: 2017-09-28 17:57+0200\n" "Last-Translator: Chusslove Illich \n" "Language-Team: Serbian \n" diff -Nru kdiff3-1.8.01/po/sr@ijekavianlatin/kdiff3.po kdiff3-1.8.3/po/sr@ijekavianlatin/kdiff3.po --- kdiff3-1.8.01/po/sr@ijekavianlatin/kdiff3.po 2019-05-18 01:02:27.000000000 +0000 +++ kdiff3-1.8.3/po/sr@ijekavianlatin/kdiff3.po 2020-06-25 00:18:52.000000000 +0000 @@ -4,8 +4,8 @@ msgid "" msgstr "" "Project-Id-Version: kdiff3\n" -"Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2019-03-30 07:52+0100\n" +"Report-Msgid-Bugs-To: https://bugs.kde.org\n" +"POT-Creation-Date: 2020-06-15 06:48+0200\n" "PO-Revision-Date: 2017-09-28 17:57+0200\n" "Last-Translator: Chusslove Illich \n" "Language-Team: Serbian \n" @@ -30,301 +30,301 @@ msgid "Your emails" msgstr "slsimic@gmail.com,caslav.ilic@gmx.net" -#: difftextwindow.cpp:412 +#: difftextwindow.cpp:414 #, kde-format msgid "File %1: Line %2" msgstr "" -#: difftextwindow.cpp:414 +#: difftextwindow.cpp:416 #, fuzzy, kde-format #| msgid "Line not available" msgid "File %1: Line not available" msgstr "red nedostupan" -#: difftextwindow.cpp:1780 +#: difftextwindow.cpp:1778 #, kde-format msgid "Encoding:" msgstr "Kodiranje:" -#: difftextwindow.cpp:1782 mergeresultwindow.cpp:3138 optiondialog.cpp:818 +#: difftextwindow.cpp:1781 mergeresultwindow.cpp:3166 optiondialog.cpp:840 #, kde-format msgid "Line end style:" msgstr "Stil kraja redova:" -#: difftextwindow.cpp:1810 directorymergewindow.cpp:382 -#: directorymergewindow.cpp:433 directorymergewindow.cpp:524 -#: directorymergewindow.cpp:3058 directorymergewindow.cpp:3189 -#: directorymergewindow.cpp:3417 mergeresultwindow.cpp:942 -#: mergeresultwindow.cpp:944 mergeresultwindow.cpp:946 -#: mergeresultwindow.cpp:948 mergeresultwindow.cpp:1814 -#: mergeresultwindow.cpp:3170 mergeresultwindow.cpp:3177 optiondialog.cpp:962 -#: optiondialog.cpp:975 pdiff.cpp:833 pdiff.cpp:835 pdiff.cpp:837 pdiff.cpp:839 -#: pdiff.cpp:861 smalldialogs.cpp:124 smalldialogs.cpp:126 smalldialogs.cpp:127 -#: smalldialogs.cpp:130 +#: difftextwindow.cpp:1809 directorymergewindow.cpp:383 +#: directorymergewindow.cpp:434 directorymergewindow.cpp:525 +#: directorymergewindow.cpp:3069 directorymergewindow.cpp:3200 +#: directorymergewindow.cpp:3428 mergeresultwindow.cpp:970 +#: mergeresultwindow.cpp:972 mergeresultwindow.cpp:974 +#: mergeresultwindow.cpp:976 mergeresultwindow.cpp:1842 +#: mergeresultwindow.cpp:3198 mergeresultwindow.cpp:3205 optiondialog.cpp:1002 +#: optiondialog.cpp:1015 pdiff.cpp:844 pdiff.cpp:846 pdiff.cpp:848 +#: pdiff.cpp:850 pdiff.cpp:872 smalldialogs.cpp:131 smalldialogs.cpp:133 +#: smalldialogs.cpp:134 smalldialogs.cpp:137 #, kde-format msgid "A" msgstr "A" -#: difftextwindow.cpp:1810 directorymergewindow.cpp:384 -#: directorymergewindow.cpp:436 directorymergewindow.cpp:526 -#: directorymergewindow.cpp:3064 directorymergewindow.cpp:3190 -#: directorymergewindow.cpp:3418 mergeresultwindow.cpp:942 -#: mergeresultwindow.cpp:944 mergeresultwindow.cpp:950 -#: mergeresultwindow.cpp:952 mergeresultwindow.cpp:1816 -#: mergeresultwindow.cpp:3172 mergeresultwindow.cpp:3179 optiondialog.cpp:963 -#: optiondialog.cpp:976 pdiff.cpp:833 pdiff.cpp:835 pdiff.cpp:841 pdiff.cpp:843 -#: pdiff.cpp:863 smalldialogs.cpp:124 smalldialogs.cpp:125 smalldialogs.cpp:128 -#: smalldialogs.cpp:131 +#: difftextwindow.cpp:1809 directorymergewindow.cpp:385 +#: directorymergewindow.cpp:437 directorymergewindow.cpp:527 +#: directorymergewindow.cpp:3075 directorymergewindow.cpp:3201 +#: directorymergewindow.cpp:3429 mergeresultwindow.cpp:970 +#: mergeresultwindow.cpp:972 mergeresultwindow.cpp:978 +#: mergeresultwindow.cpp:980 mergeresultwindow.cpp:1844 +#: mergeresultwindow.cpp:3200 mergeresultwindow.cpp:3207 optiondialog.cpp:1003 +#: optiondialog.cpp:1016 pdiff.cpp:844 pdiff.cpp:846 pdiff.cpp:852 +#: pdiff.cpp:854 pdiff.cpp:874 smalldialogs.cpp:131 smalldialogs.cpp:132 +#: smalldialogs.cpp:135 smalldialogs.cpp:138 #, kde-format msgid "B" msgstr "B" -#: difftextwindow.cpp:1810 directorymergewindow.cpp:386 -#: directorymergewindow.cpp:439 directorymergewindow.cpp:528 -#: directorymergewindow.cpp:3070 directorymergewindow.cpp:3191 -#: directorymergewindow.cpp:3419 mergeresultwindow.cpp:946 -#: mergeresultwindow.cpp:948 mergeresultwindow.cpp:950 -#: mergeresultwindow.cpp:952 mergeresultwindow.cpp:1818 -#: mergeresultwindow.cpp:3174 mergeresultwindow.cpp:3181 optiondialog.cpp:977 -#: pdiff.cpp:837 pdiff.cpp:839 pdiff.cpp:841 pdiff.cpp:843 pdiff.cpp:865 -#: smalldialogs.cpp:125 smalldialogs.cpp:126 smalldialogs.cpp:129 -#: smalldialogs.cpp:132 +#: difftextwindow.cpp:1809 directorymergewindow.cpp:387 +#: directorymergewindow.cpp:440 directorymergewindow.cpp:529 +#: directorymergewindow.cpp:3081 directorymergewindow.cpp:3202 +#: directorymergewindow.cpp:3430 mergeresultwindow.cpp:974 +#: mergeresultwindow.cpp:976 mergeresultwindow.cpp:978 +#: mergeresultwindow.cpp:980 mergeresultwindow.cpp:1846 +#: mergeresultwindow.cpp:3202 mergeresultwindow.cpp:3209 optiondialog.cpp:1017 +#: pdiff.cpp:848 pdiff.cpp:850 pdiff.cpp:852 pdiff.cpp:854 pdiff.cpp:876 +#: smalldialogs.cpp:132 smalldialogs.cpp:133 smalldialogs.cpp:136 +#: smalldialogs.cpp:139 #, kde-format msgid "C" msgstr "C" -#: difftextwindow.cpp:1810 +#: difftextwindow.cpp:1809 #, fuzzy, kde-format #| msgid "A (Base):" msgid "A (Base)" msgstr "A (baza):" -#: difftextwindow.cpp:1812 +#: difftextwindow.cpp:1811 #, fuzzy, kde-format #| msgid "Encoding:" msgid "Encoding: %1" msgstr "Kodiranje:" -#: difftextwindow.cpp:1813 mergeresultwindow.cpp:3183 +#: difftextwindow.cpp:1812 mergeresultwindow.cpp:3211 #, kde-format msgid "Unix" msgstr "Unix" -#: difftextwindow.cpp:1813 mergeresultwindow.cpp:3184 +#: difftextwindow.cpp:1812 mergeresultwindow.cpp:3212 #, kde-format msgid "DOS" msgstr "DOS" -#: difftextwindow.cpp:1813 +#: difftextwindow.cpp:1812 #, fuzzy, kde-format #| msgid "Line end style:" msgid "Line end style: %1" msgstr "Stil kraja redova:" # >! Merge whole string. -#: difftextwindow.cpp:1835 kdiff3.cpp:873 +#: difftextwindow.cpp:1834 kdiff3.cpp:874 #, kde-format msgid "Top line" msgstr "Prvi red" -#: difftextwindow.cpp:1845 +#: difftextwindow.cpp:1843 #, kde-format msgid "End" msgstr "Kraj" -#: difftextwindow.cpp:1903 smalldialogs.cpp:235 +#: difftextwindow.cpp:1901 smalldialogs.cpp:245 #, fuzzy, kde-format #| msgid "Opening files..." msgid "Open File" msgstr "Otvaram fajlove..." -#: difftextwindow.cpp:1951 optiondialog.cpp:387 +#: difftextwindow.cpp:1943 optiondialog.cpp:389 #, kde-format msgid "Unicode, 8 bit" msgstr "Unicode, 8‑bitni" -#: difftextwindow.cpp:1966 +#: difftextwindow.cpp:1958 #, kde-format msgid "Other" msgstr "" -#: directorymergewindow.cpp:409 directorymergewindow.cpp:3424 +#: directorymergewindow.cpp:410 directorymergewindow.cpp:3435 #, kde-format msgid "Copy A to B" msgstr "Kopiraj A u B" -#: directorymergewindow.cpp:412 directorymergewindow.cpp:3425 +#: directorymergewindow.cpp:413 directorymergewindow.cpp:3436 #, kde-format msgid "Copy B to A" msgstr "Kopiraj B u A" -#: directorymergewindow.cpp:415 directorymergewindow.cpp:3426 +#: directorymergewindow.cpp:416 directorymergewindow.cpp:3437 #, kde-format msgid "Delete A" msgstr "Obriši A" -#: directorymergewindow.cpp:418 directorymergewindow.cpp:3427 +#: directorymergewindow.cpp:419 directorymergewindow.cpp:3438 #, kde-format msgid "Delete B" msgstr "Obriši B" -#: directorymergewindow.cpp:421 +#: directorymergewindow.cpp:422 #, kde-format msgid "Delete A & B" msgstr "Obriši A i B" -#: directorymergewindow.cpp:424 directorymergewindow.cpp:3429 +#: directorymergewindow.cpp:425 directorymergewindow.cpp:3440 #, kde-format msgid "Merge to A" msgstr "Stopi u A" -#: directorymergewindow.cpp:427 directorymergewindow.cpp:3430 +#: directorymergewindow.cpp:428 directorymergewindow.cpp:3441 #, kde-format msgid "Merge to B" msgstr "Stopi u B" -#: directorymergewindow.cpp:430 +#: directorymergewindow.cpp:431 #, kde-format msgid "Merge to A & B" msgstr "Stopi u A i B" -#: directorymergewindow.cpp:442 directorymergewindow.cpp:3421 +#: directorymergewindow.cpp:443 directorymergewindow.cpp:3432 #, kde-format msgid "Delete (if exists)" msgstr "Obriši (ako postoji)" -#: directorymergewindow.cpp:445 directorymergewindow.cpp:448 -#: directorymergewindow.cpp:3420 optiondialog.cpp:925 smalldialogs.cpp:113 +#: directorymergewindow.cpp:446 directorymergewindow.cpp:449 +#: directorymergewindow.cpp:3431 smalldialogs.cpp:120 #, kde-format msgid "Merge" msgstr "Stopi" -#: directorymergewindow.cpp:445 directorymergewindow.cpp:448 +#: directorymergewindow.cpp:446 directorymergewindow.cpp:449 #, kde-format msgid "Merge (manual)" msgstr "Stopi (ručno)" -#: directorymergewindow.cpp:451 +#: directorymergewindow.cpp:452 #, kde-format msgid "Error: Conflicting File Types" msgstr "Greška: sukobljeni tipovi fajlova." -#: directorymergewindow.cpp:454 +#: directorymergewindow.cpp:455 #, kde-format msgid "Error: Changed and Deleted" msgstr "Greška: izmenjeno i obrisano." -#: directorymergewindow.cpp:457 +#: directorymergewindow.cpp:458 #, kde-format msgid "Error: Dates are equal but files are not." msgstr "Greška: datumi su jednaki ali fajlovi nisu." -#: directorymergewindow.cpp:471 +#: directorymergewindow.cpp:472 #, fuzzy, kde-format #| msgid "Done." msgid "Done" msgstr "Gotovo." -#: directorymergewindow.cpp:473 +#: directorymergewindow.cpp:474 #, kde-format msgid "Error" msgstr "Greška" -#: directorymergewindow.cpp:475 +#: directorymergewindow.cpp:476 #, kde-format msgid "Skipped." msgstr "Preskočeno." -#: directorymergewindow.cpp:477 +#: directorymergewindow.cpp:478 #, kde-format msgid "Not saved." msgstr "Nije sačuvano." -#: directorymergewindow.cpp:479 +#: directorymergewindow.cpp:480 #, kde-format msgid "In progress..." msgstr "U toku..." -#: directorymergewindow.cpp:481 +#: directorymergewindow.cpp:482 #, kde-format msgid "To do." msgstr "Uraditi." # >> @title:column -#: directorymergewindow.cpp:522 +#: directorymergewindow.cpp:523 #, kde-format msgid "Name" msgstr "ime" # >> @title:column -#: directorymergewindow.cpp:530 +#: directorymergewindow.cpp:531 #, kde-format msgid "Operation" msgstr "postupak" # >> @title:column -#: directorymergewindow.cpp:532 +#: directorymergewindow.cpp:533 #, kde-format msgid "Status" msgstr "stanje" # >> @title:column -#: directorymergewindow.cpp:534 +#: directorymergewindow.cpp:535 #, kde-format msgid "Unsolved" msgstr "nerešeno" # >> @title:column -#: directorymergewindow.cpp:536 +#: directorymergewindow.cpp:537 #, kde-format msgid "Solved" msgstr "rešeno" # >> non-whitespace # >> @title:column -#: directorymergewindow.cpp:538 +#: directorymergewindow.cpp:539 #, kde-format msgid "Nonwhite" msgstr "neprazno" # >> whitespace # >> @title:column -#: directorymergewindow.cpp:540 +#: directorymergewindow.cpp:541 #, kde-format msgid "White" msgstr "prazno" -#: directorymergewindow.cpp:674 +#: directorymergewindow.cpp:676 #, kde-format msgid "Unable to compare non-normal file with normal file." msgstr "" -#: directorymergewindow.cpp:688 +#: directorymergewindow.cpp:690 #, kde-format msgid "Mix of links and normal files." msgstr "Mešavina veza i normalnih fajlova." -#: directorymergewindow.cpp:695 +#: directorymergewindow.cpp:697 #, kde-format msgid "Link: " msgstr "Veza: " -#: directorymergewindow.cpp:704 +#: directorymergewindow.cpp:706 #, kde-format msgid "Size. " msgstr "Veličina: " -#: directorymergewindow.cpp:718 directorymergewindow.cpp:728 +#: directorymergewindow.cpp:720 directorymergewindow.cpp:730 #, kde-format msgid "Date & Size: " msgstr "Datum i veličina: " -#: directorymergewindow.cpp:748 +#: directorymergewindow.cpp:751 #, kde-format msgid "Comparing file..." msgstr "Upoređujem fajl..." -#: directorymergewindow.cpp:801 +#: directorymergewindow.cpp:813 #, kde-format msgid "" "You are currently doing a directory merge. Are you sure, you want to abort " @@ -333,48 +333,48 @@ "Trenutno stapate fascikle. Želite li zaista da prekinete stapanje i ponovo " "skenirate fasciklu?" -#: directorymergewindow.cpp:802 kdiff3.cpp:698 kdiff3.cpp:708 kdiff3.cpp:720 -#: mergeresultwindow.cpp:372 pdiff.cpp:1033 pdiff.cpp:1910 pdiff.cpp:1920 +#: directorymergewindow.cpp:814 kdiff3.cpp:697 kdiff3.cpp:707 kdiff3.cpp:719 +#: mergeresultwindow.cpp:400 pdiff.cpp:1052 pdiff.cpp:1930 pdiff.cpp:1940 #, kde-format msgid "Warning" msgstr "Upozorenje" -#: directorymergewindow.cpp:803 directorymergewindow.cpp:3393 +#: directorymergewindow.cpp:815 directorymergewindow.cpp:3404 #, kde-format msgid "Rescan" msgstr "Ponovo skeniraj" -#: directorymergewindow.cpp:804 pdiff.cpp:1035 +#: directorymergewindow.cpp:816 pdiff.cpp:1054 #, kde-format msgid "Continue Merging" msgstr "Nastavi stapanje" -#: directorymergewindow.cpp:971 +#: directorymergewindow.cpp:983 #, kde-format msgid "Opening of directories failed:" msgstr "Otvaranje fascikli nije uspelo:" -#: directorymergewindow.cpp:975 +#: directorymergewindow.cpp:987 #, kde-format msgid "Dir A \"%1\" does not exist or is not a directory.\n" msgstr "Fascikla A „%1“ ne postoji ili nije fascikla.\n" -#: directorymergewindow.cpp:980 +#: directorymergewindow.cpp:992 #, kde-format msgid "Dir B \"%1\" does not exist or is not a directory.\n" msgstr "Fascikla B „%1“ ne postoji ili nije fascikla.\n" -#: directorymergewindow.cpp:985 +#: directorymergewindow.cpp:997 #, kde-format msgid "Dir C \"%1\" does not exist or is not a directory.\n" msgstr "Fascikla C „%1“ ne postoji ili nije fascikla.\n" -#: directorymergewindow.cpp:988 +#: directorymergewindow.cpp:1000 #, kde-format msgid "Directory Open Error" msgstr "Greška pri otvaranju fascikle" -#: directorymergewindow.cpp:996 +#: directorymergewindow.cpp:1008 #, kde-format msgid "" "The destination directory must not be the same as A or B when three " @@ -385,50 +385,50 @@ "fascikle.\n" "Proverite ponovo pre nego što nastavite." -#: directorymergewindow.cpp:998 +#: directorymergewindow.cpp:1010 #, kde-format msgid "Parameter Warning" msgstr "Upozorenje o parametrima" -#: directorymergewindow.cpp:1003 +#: directorymergewindow.cpp:1015 #, kde-format msgid "Scanning directories..." msgstr "Skeniram fascikle..." -#: directorymergewindow.cpp:1029 +#: directorymergewindow.cpp:1041 #, kde-format msgid "Reading Directory A" msgstr "Čitam fasciklu A" -#: directorymergewindow.cpp:1038 +#: directorymergewindow.cpp:1050 #, kde-format msgid "Reading Directory B" msgstr "Čitam fasciklu B" -#: directorymergewindow.cpp:1048 +#: directorymergewindow.cpp:1060 #, kde-format msgid "Reading Directory C" msgstr "Čitam fasciklu C" # >! Merge sentence. -#: directorymergewindow.cpp:1064 +#: directorymergewindow.cpp:1076 #, kde-format msgid "Some subdirectories were not readable in" msgstr "Neke potfascikle nisu bile čitljive u" -#: directorymergewindow.cpp:1069 +#: directorymergewindow.cpp:1081 #, kde-format msgid "Check the permissions of the subdirectories." msgstr "Proverite dozvole potfascikli." -#: directorymergewindow.cpp:1106 kdiff3.cpp:666 kdiff3.cpp:753 kdiff3.cpp:777 -#: kdiff3.cpp:1065 kdiff3.cpp:1086 pdiff.cpp:1116 pdiff.cpp:1170 pdiff.cpp:1218 -#: pdiff.cpp:1234 pdiff.cpp:1277 pdiff.cpp:1301 +#: directorymergewindow.cpp:1118 kdiff3.cpp:665 kdiff3.cpp:752 kdiff3.cpp:776 +#: kdiff3.cpp:1072 kdiff3.cpp:1093 pdiff.cpp:1136 pdiff.cpp:1190 pdiff.cpp:1238 +#: pdiff.cpp:1254 pdiff.cpp:1297 pdiff.cpp:1321 #, kde-format msgid "Ready." msgstr "Spreman." -#: directorymergewindow.cpp:1121 +#: directorymergewindow.cpp:1133 #, kde-format msgid "" "Directory Comparison Status\n" @@ -438,25 +438,25 @@ "Number of different files: %3" msgstr "" -#: directorymergewindow.cpp:1128 +#: directorymergewindow.cpp:1140 #, fuzzy, kde-format #| msgid "Number of manual merges:" msgid "Number of manual merges: %1" msgstr "Broj ručnih stapanja:" -#: directorymergewindow.cpp:1394 +#: directorymergewindow.cpp:1406 #, kde-format msgid "This affects all merge operations." msgstr "Ovo utiče na sve postupke stapanja." # >> @title:window -#: directorymergewindow.cpp:1395 +#: directorymergewindow.cpp:1407 #, kde-format msgid "Changing All Merge Operations" msgstr "Menjanje svih postupaka stapanja" # >! Merge sentence. -#: directorymergewindow.cpp:1695 +#: directorymergewindow.cpp:1707 #, fuzzy, kde-format #| msgid "Processing " msgid "" @@ -464,45 +464,45 @@ "%3" msgstr "Obrađujem " -#: directorymergewindow.cpp:1738 directorymergewindow.cpp:1742 +#: directorymergewindow.cpp:1750 directorymergewindow.cpp:1754 #, kde-format msgid "Some files could not be processed." msgstr "" -#: directorymergewindow.cpp:2222 directorymergewindow.cpp:2247 -#: directorymergewindow.cpp:2271 +#: directorymergewindow.cpp:2234 directorymergewindow.cpp:2259 +#: directorymergewindow.cpp:2283 #, kde-format msgid "This operation is currently not possible." msgstr "Ovaj postupak trenutno nije moguć." -#: directorymergewindow.cpp:2222 directorymergewindow.cpp:2247 -#: directorymergewindow.cpp:2271 directorymergewindow.cpp:2552 +#: directorymergewindow.cpp:2234 directorymergewindow.cpp:2259 +#: directorymergewindow.cpp:2283 directorymergewindow.cpp:2563 #, kde-format msgid "Operation Not Possible" msgstr "Postupak nije moguć" -#: directorymergewindow.cpp:2318 +#: directorymergewindow.cpp:2330 #, fuzzy, kde-format #| msgid "An error occurred while copying.\n" msgid "An error occurred while copying." msgstr "Greška u toku kopiranja.\n" -#: directorymergewindow.cpp:2319 directorymergewindow.cpp:2759 +#: directorymergewindow.cpp:2331 directorymergewindow.cpp:2770 #, kde-format msgid "Merge Error" msgstr "Greška stapanja" -#: directorymergewindow.cpp:2396 +#: directorymergewindow.cpp:2408 #, kde-format msgid "Unknown merge operation. (This must never happen!)" msgstr "Nepoznat postupak stapanja. (Ovo nikada ne sme da se dogodi!)" -#: directorymergewindow.cpp:2441 +#: directorymergewindow.cpp:2453 #, kde-format msgid "Unknown merge operation." msgstr "Nepoznata postupak stapanja." -#: directorymergewindow.cpp:2454 +#: directorymergewindow.cpp:2466 #, kde-format msgid "" "The merge is about to begin.\n" @@ -523,22 +523,22 @@ "GARANCIJA! Napravite rezerve važnih podataka!" # >> @title:window -#: directorymergewindow.cpp:2459 +#: directorymergewindow.cpp:2471 #, kde-format msgid "Starting Merge" msgstr "Početak stapanja" -#: directorymergewindow.cpp:2460 +#: directorymergewindow.cpp:2472 #, kde-format msgid "Do It" msgstr "Uradi" -#: directorymergewindow.cpp:2461 +#: directorymergewindow.cpp:2473 #, kde-format msgid "Simulate It" msgstr "Simuliraj" -#: directorymergewindow.cpp:2487 +#: directorymergewindow.cpp:2499 #, kde-format msgid "" "The highlighted item has a different type in the different directories. " @@ -547,7 +547,7 @@ "Istaknuta stavka ima različit tip u različitim fasciklama. Izaberite šta " "uraditi." -#: directorymergewindow.cpp:2491 +#: directorymergewindow.cpp:2503 #, kde-format msgid "" "The modification dates of the file are equal but the files are not. Select " @@ -555,7 +555,7 @@ msgstr "" "Datumi izmene fajla su jednaki ali fajlovi nisu. Izaberite šta uraditi." -#: directorymergewindow.cpp:2495 +#: directorymergewindow.cpp:2507 #, kde-format msgid "" "The highlighted item was changed in one directory and deleted in the other. " @@ -564,7 +564,7 @@ "Istaknuta stavka je izmenjena u jednoj fascikli a obrisana u drugoj. " "Izaberite šta uraditi." -#: directorymergewindow.cpp:2552 +#: directorymergewindow.cpp:2563 #, kde-format msgid "" "This operation is currently not possible because directory merge is " @@ -572,7 +572,7 @@ msgstr "" "Ovaj postupak trenutno nije moguć zato što je u toku stapanje fascikli." -#: directorymergewindow.cpp:2609 +#: directorymergewindow.cpp:2620 #, kde-format msgid "" "There was an error in the last step.\n" @@ -584,32 +584,32 @@ "preskočite?" # >> @title:window -#: directorymergewindow.cpp:2611 +#: directorymergewindow.cpp:2622 #, kde-format msgid "Continue merge after an error" msgstr "Nastavljanje stapanja posle greške" -#: directorymergewindow.cpp:2612 +#: directorymergewindow.cpp:2623 #, kde-format msgid "Continue With Last Item" msgstr "Nastavi sa poslednjom stavkom" -#: directorymergewindow.cpp:2613 +#: directorymergewindow.cpp:2624 #, kde-format msgid "Skip Item" msgstr "Preskoči stavku" -#: directorymergewindow.cpp:2709 +#: directorymergewindow.cpp:2720 #, kde-format msgid "Merge operation complete." msgstr "Postupak stapanja je završen." -#: directorymergewindow.cpp:2709 directorymergewindow.cpp:2712 +#: directorymergewindow.cpp:2720 directorymergewindow.cpp:2723 #, kde-format msgid "Merge Complete" msgstr "Stapanje završeno" -#: directorymergewindow.cpp:2722 +#: directorymergewindow.cpp:2733 #, kde-format msgid "" "Simulated merge complete: Check if you agree with the proposed operations." @@ -617,50 +617,50 @@ "Simulirano stapanje je završeno: proverite da li vam odgovaraju predloženi " "postupci." -#: directorymergewindow.cpp:2758 +#: directorymergewindow.cpp:2769 #, fuzzy, kde-format #| msgid "An error occurred. Press OK to see detailed information.\n" msgid "An error occurred. Press OK to see detailed information." msgstr "" "Došlo je do greške. Kliknite na „U redu“ da dobijete detaljne informacije.\n" -#: directorymergewindow.cpp:2791 +#: directorymergewindow.cpp:2802 #, kde-format msgid "Error: While deleting %1: Creating backup failed." msgstr "Greška: u toku brisanja %1, pravljenje rezerve nije uspelo." -#: directorymergewindow.cpp:2798 +#: directorymergewindow.cpp:2809 #, kde-format msgid "delete directory recursively( %1 )" msgstr "rekurzivno brisanje fascikle (%1)" -#: directorymergewindow.cpp:2800 +#: directorymergewindow.cpp:2811 #, kde-format msgid "delete( %1 )" msgstr "brisanje (%1)" -#: directorymergewindow.cpp:2815 +#: directorymergewindow.cpp:2826 #, kde-format msgid "Error: delete dir operation failed while trying to read the directory." msgstr "" "Greška: postupak brisanja fascikle nije uspeo na mestu čitanja fascikle." -#: directorymergewindow.cpp:2834 +#: directorymergewindow.cpp:2845 #, kde-format msgid "Error: rmdir( %1 ) operation failed." msgstr "Greška: postupak uklanjanja fascikle (%1) nije uspeo." -#: directorymergewindow.cpp:2844 +#: directorymergewindow.cpp:2855 #, kde-format msgid "Error: delete operation failed." msgstr "Greška: postupak brisanja nije uspeo." -#: directorymergewindow.cpp:2870 +#: directorymergewindow.cpp:2881 #, kde-format msgid "manual merge( %1, %2, %3 -> %4)" msgstr "ručno stapanje (%1, %2, %3 → %4)" -#: directorymergewindow.cpp:2873 +#: directorymergewindow.cpp:2884 #, kde-format msgid "" " Note: After a manual merge the user should continue by pressing F7." @@ -668,193 +668,193 @@ " Napomena: posle ručnog stapanja korisnik treba da nastavi pritiskom na " "F7." -#: directorymergewindow.cpp:2900 +#: directorymergewindow.cpp:2911 #, kde-format msgid "Error: copy( %1 -> %2 ) failed.Deleting existing destination failed." msgstr "" "Greška: kopiranje (%1 → %2) nije uspelo, brisanje postojećeg odredišta nije " "uspelo." -#: directorymergewindow.cpp:2909 +#: directorymergewindow.cpp:2920 #, kde-format msgid "copyLink( %1 -> %2 )" msgstr "kopiranje veze (%1 → %2 )" -#: directorymergewindow.cpp:2918 +#: directorymergewindow.cpp:2929 #, kde-format msgid "Error: copyLink failed: Remote links are not yet supported." msgstr "Greška: kopiranje veze nije uspelo, udaljene veze još nisu podržane." -#: directorymergewindow.cpp:2928 +#: directorymergewindow.cpp:2939 #, kde-format msgid "Error: copyLink failed." msgstr "Greška: kopiranje veze nije uspelo." -#: directorymergewindow.cpp:2953 +#: directorymergewindow.cpp:2964 #, kde-format msgid "copy( %1 -> %2 )" msgstr "kopiranje (%1 → %2)" -#: directorymergewindow.cpp:2979 +#: directorymergewindow.cpp:2990 #, kde-format msgid "Error during rename( %1 -> %2 ): Cannot delete existing destination." msgstr "" "Greška u toku preimenovanja (%1 → %2), postojeće odredište ne može da se " "obriše." -#: directorymergewindow.cpp:2986 +#: directorymergewindow.cpp:2997 #, kde-format msgid "rename( %1 -> %2 )" msgstr "preimenovanje (%1 → %2)" -#: directorymergewindow.cpp:2995 +#: directorymergewindow.cpp:3006 #, kde-format msgid "Error: Rename failed." msgstr "Greška: preimenovanje nije uspelo." -#: directorymergewindow.cpp:3013 +#: directorymergewindow.cpp:3024 #, kde-format msgid "Error during makeDir of %1. Cannot delete existing file." msgstr "" "Greška u toku pravljenja fascikle (%1), postojeći fajl ne može da se obriše." -#: directorymergewindow.cpp:3030 +#: directorymergewindow.cpp:3041 #, kde-format msgid "makeDir( %1 )" msgstr "pravljenje fascikle (%1)" -#: directorymergewindow.cpp:3040 +#: directorymergewindow.cpp:3051 #, kde-format msgid "Error while creating directory." msgstr "Greška u toku pravljenja fascikle." -#: directorymergewindow.cpp:3076 directorymergewindow.cpp:3195 +#: directorymergewindow.cpp:3087 directorymergewindow.cpp:3206 #, kde-format msgid "Dest" msgstr "Odredište" # >> @title:column -#: directorymergewindow.cpp:3084 directorymergewindow.cpp:3113 +#: directorymergewindow.cpp:3095 directorymergewindow.cpp:3124 #, kde-format msgid "Dir" msgstr "fascikla" # >> @title:column -#: directorymergewindow.cpp:3084 +#: directorymergewindow.cpp:3095 #, kde-format msgid "Type" msgstr "tip" # >> @title:column -#: directorymergewindow.cpp:3084 +#: directorymergewindow.cpp:3095 #, kde-format msgid "Size" msgstr "veličina" # >> @title:column -#: directorymergewindow.cpp:3085 +#: directorymergewindow.cpp:3096 #, kde-format msgid "Attr" msgstr "atributi" # >> @title:column -#: directorymergewindow.cpp:3085 +#: directorymergewindow.cpp:3096 #, kde-format msgid "Last Modification" msgstr "poslednja izmena" # >> @title:column -#: directorymergewindow.cpp:3085 +#: directorymergewindow.cpp:3096 #, kde-format msgid "Link-Destination" msgstr "odredište veze" # >! Merge whole string. # >> @item:intext -#: directorymergewindow.cpp:3113 +#: directorymergewindow.cpp:3124 #, kde-format msgid "File" msgstr "fajl" -#: directorymergewindow.cpp:3113 +#: directorymergewindow.cpp:3124 #, fuzzy, kde-format #| msgid "Link: " msgid "-Link" msgstr "Veza: " -#: directorymergewindow.cpp:3119 +#: directorymergewindow.cpp:3130 #, kde-format msgid "not available" msgstr "nedostupno" -#: directorymergewindow.cpp:3137 +#: directorymergewindow.cpp:3148 #, kde-format msgid "A (Dest): " msgstr "A (odredište): " -#: directorymergewindow.cpp:3141 +#: directorymergewindow.cpp:3152 #, kde-format msgid "A: " msgstr "" -#: directorymergewindow.cpp:3141 +#: directorymergewindow.cpp:3152 #, kde-format msgid "A (Base): " msgstr "A (baza): " -#: directorymergewindow.cpp:3147 +#: directorymergewindow.cpp:3158 #, kde-format msgid "B (Dest): " msgstr "B (odredište): " -#: directorymergewindow.cpp:3151 +#: directorymergewindow.cpp:3162 #, kde-format msgid "B: " msgstr "" -#: directorymergewindow.cpp:3156 +#: directorymergewindow.cpp:3167 #, kde-format msgid "C (Dest): " msgstr "C (odredište): " -#: directorymergewindow.cpp:3160 +#: directorymergewindow.cpp:3171 #, kde-format msgid "C: " msgstr "" -#: directorymergewindow.cpp:3163 +#: directorymergewindow.cpp:3174 #, kde-format msgid "Dest: " msgstr "Odredište: " # >> @title:window #. i18n("Saving Directory Merge State ...")); -#: directorymergewindow.cpp:3238 +#: directorymergewindow.cpp:3249 #, kde-format msgid "Save Directory Merge State As..." msgstr "Upisivanje stanja stapanja fascikli kao..." -#: directorymergewindow.cpp:3387 +#: directorymergewindow.cpp:3398 #, kde-format msgid "Start/Continue Directory Merge" msgstr "Pokreni/nastavi stapanje fascikli" -#: directorymergewindow.cpp:3388 +#: directorymergewindow.cpp:3399 #, kde-format msgid "Run Operation for Current Item" msgstr "Izvrši postupak za tekuću stavku" -#: directorymergewindow.cpp:3389 +#: directorymergewindow.cpp:3400 #, kde-format msgid "Compare Selected File" msgstr "Uporedi izabrani fajl" -#: directorymergewindow.cpp:3390 +#: directorymergewindow.cpp:3401 #, kde-format msgid "Merge Current File" msgstr "Stopi tekući fajl" -#: directorymergewindow.cpp:3390 +#: directorymergewindow.cpp:3401 #, kde-format msgid "" "Merge\n" @@ -863,51 +863,51 @@ "Stopi\n" "fajl" -#: directorymergewindow.cpp:3391 +#: directorymergewindow.cpp:3402 #, kde-format msgid "Fold All Subdirs" msgstr "Sažmi sve potfascikle" -#: directorymergewindow.cpp:3392 +#: directorymergewindow.cpp:3403 #, kde-format msgid "Unfold All Subdirs" msgstr "Raširi sve potfascikle" #. i18n("Save Directory Merge State ..."), 0, this, &DirectoryMergeWindow::slotSaveMergeState, ac, "dir_save_merge_state"); #. i18n("Load Directory Merge State ..."), 0, this, &DirectoryMergeWindow::slotLoadMergeState, ac, "dir_load_merge_state"); -#: directorymergewindow.cpp:3396 +#: directorymergewindow.cpp:3407 #, kde-format msgid "Choose A for All Items" msgstr "Izaberi A za sve stavke" -#: directorymergewindow.cpp:3397 +#: directorymergewindow.cpp:3408 #, kde-format msgid "Choose B for All Items" msgstr "Izaberi B za sve stavke" -#: directorymergewindow.cpp:3398 +#: directorymergewindow.cpp:3409 #, kde-format msgid "Choose C for All Items" msgstr "Izaberi C za sve stavke" -#: directorymergewindow.cpp:3399 +#: directorymergewindow.cpp:3410 #, kde-format msgid "Auto-Choose Operation for All Items" msgstr "Automatski izaberi postupak za sve stavke" -#: directorymergewindow.cpp:3400 +#: directorymergewindow.cpp:3411 #, kde-format msgid "No Operation for All Items" msgstr "Nema postupka za sve stavke" #. i18n("Synchronize Directories"), 0, this, &DirectoryMergeWindow::slotSynchronizeDirectories, ac, "dir_synchronize_directories"); #. d->m_pDirChooseNewerFiles = GuiUtils::createAction< KToggleAction >(i18n("Copy Newer Files Instead of Merging"), 0, this, &DirectoryMergeWindow::slotChooseNewerFiles, ac, "dir_choose_newer_files"); -#: directorymergewindow.cpp:3405 +#: directorymergewindow.cpp:3416 #, kde-format msgid "Show Identical Files" msgstr "Prikaži istovetne fajlove" -#: directorymergewindow.cpp:3405 +#: directorymergewindow.cpp:3416 #, kde-format msgid "" "Identical\n" @@ -916,17 +916,17 @@ "Istovetni\n" "fajlovi" -#: directorymergewindow.cpp:3406 +#: directorymergewindow.cpp:3417 #, kde-format msgid "Show Different Files" msgstr "Prikaži različite fajlove" -#: directorymergewindow.cpp:3407 +#: directorymergewindow.cpp:3418 #, kde-format msgid "Show Files only in A" msgstr "Prikaži fajlove samo u A" -#: directorymergewindow.cpp:3407 +#: directorymergewindow.cpp:3418 #, kde-format msgid "" "Files\n" @@ -935,12 +935,12 @@ "Fajlovi\n" "samo u A" -#: directorymergewindow.cpp:3408 +#: directorymergewindow.cpp:3419 #, kde-format msgid "Show Files only in B" msgstr "Prikaži fajlove samo u B" -#: directorymergewindow.cpp:3408 +#: directorymergewindow.cpp:3419 #, kde-format msgid "" "Files\n" @@ -949,12 +949,12 @@ "Fajlovi\n" "samo u B" -#: directorymergewindow.cpp:3409 +#: directorymergewindow.cpp:3420 #, kde-format msgid "Show Files only in C" msgstr "Prikaži fajlove samo u C" -#: directorymergewindow.cpp:3409 +#: directorymergewindow.cpp:3420 #, kde-format msgid "" "Files\n" @@ -963,55 +963,60 @@ "Fajlovi\n" "samo u C" -#: directorymergewindow.cpp:3413 +#: directorymergewindow.cpp:3424 #, kde-format msgid "Compare Explicitly Selected Files" msgstr "Uporedi izričito izabrane fajlove" -#: directorymergewindow.cpp:3414 +#: directorymergewindow.cpp:3425 #, kde-format msgid "Merge Explicitly Selected Files" msgstr "Stopi izričito izabrane fajlove" -#: directorymergewindow.cpp:3416 directorymergewindow.cpp:3423 +#: directorymergewindow.cpp:3427 directorymergewindow.cpp:3434 #, kde-format msgid "Do Nothing" msgstr "Ne radi ništa" -#: directorymergewindow.cpp:3428 +#: directorymergewindow.cpp:3439 #, kde-format msgid "Delete A && B" msgstr "Obriši A i B" -#: directorymergewindow.cpp:3431 +#: directorymergewindow.cpp:3442 #, kde-format msgid "Merge to A && B" msgstr "Stopi u A i B" -#: fileaccess.cpp:462 SourceData.cpp:493 +#: fileaccess.cpp:301 +#, kde-format +msgid "Unable to determine full url. No parent specified." +msgstr "" + +#: fileaccess.cpp:482 SourceData.cpp:506 #, fuzzy, kde-format #| msgid "Reading file: %1" msgid "Failed to read file: %1" msgstr "Čitam fajl: %1" -#: fileaccess.cpp:587 +#: fileaccess.cpp:624 #, kde-format msgid "Creating temp copy of %1 failed." msgstr "Pravljenje privremene kopije fajla %1 nije uspelo." -#: fileaccess.cpp:595 fileaccess.cpp:600 +#: fileaccess.cpp:632 fileaccess.cpp:637 #, fuzzy, kde-format #| msgid "Opening %1 failed." msgid "Opening %1 failed. %2" msgstr "Otvaranje fajla %1 nije uspelo." -#: fileaccess.cpp:619 fileaccess.cpp:627 +#: fileaccess.cpp:656 fileaccess.cpp:664 #, fuzzy, kde-format #| msgid "Error reading from %1" msgid "Error reading from %1. %2" msgstr "Greška pri čitanju iz %1" -#: fileaccess.cpp:751 +#: fileaccess.cpp:788 #, fuzzy, kde-format #| msgid "" #| "While trying to make a backup, deleting an older backup failed. \n" @@ -1023,7 +1028,7 @@ "Pri pokušaju pravljenja rezerve, brisanje starije rezerve nije uspelo.\n" "Ime fajla: " -#: fileaccess.cpp:758 +#: fileaccess.cpp:795 #, fuzzy, kde-format #| msgid "" #| "While trying to make a backup, renaming failed. \n" @@ -1035,190 +1040,190 @@ "Pri pokušaju pravljenja rezerve, preimenovanje nije uspelo.\n" "Imena fajlova: " -#: fileaccess.cpp:828 +#: fileaccess.cpp:865 #, kde-format msgid "Getting file status: %1" msgstr "Dobavljam stanje fajla: %1" -#: fileaccess.cpp:869 +#: fileaccess.cpp:906 #, kde-format msgid "Reading file: %1" msgstr "Čitam fajl: %1" -#: fileaccess.cpp:907 +#: fileaccess.cpp:944 #, kde-format msgid "Writing file: %1" msgstr "Pišem fajl: %1" -#: fileaccess.cpp:940 +#: fileaccess.cpp:977 #, kde-format msgid "Out of memory" msgstr "Nema više memorije" -#: fileaccess.cpp:976 +#: fileaccess.cpp:1013 #, kde-format msgid "Making directory: %1" msgstr "Pravim fasciklu: %1" -#: fileaccess.cpp:997 +#: fileaccess.cpp:1034 #, kde-format msgid "Removing directory: %1" msgstr "Uklanjam fasciklu: %1" -#: fileaccess.cpp:1012 +#: fileaccess.cpp:1049 #, kde-format msgid "Removing file: %1" msgstr "Uklanjam fajl: %1" -#: fileaccess.cpp:1028 +#: fileaccess.cpp:1065 #, kde-format msgid "Creating symbolic link: %1 -> %2" msgstr "Pravim simboličku vezu: %1 → %2" -#: fileaccess.cpp:1052 +#: fileaccess.cpp:1089 #, kde-format msgid "Renaming file: %1 -> %2" msgstr "Preimenujem fajl: %1 → %2" -#: fileaccess.cpp:1086 +#: fileaccess.cpp:1123 #, kde-format msgid "Copying file: %1 -> %2" msgstr "Kopiram fajl: %1 → %2" -#: fileaccess.cpp:1108 +#: fileaccess.cpp:1145 #, fuzzy, kde-format #| msgid "Reading directory: " msgid "Reading directory: %1" msgstr "Čitam fasciklu: " -#: fileaccess.cpp:1162 +#: fileaccess.cpp:1202 #, kde-format msgid "Listing directory: %1" msgstr "Listam fasciklu: %1" -#: kdiff3.cpp:181 +#: kdiff3.cpp:182 #, kde-format msgid "Current Configuration:" msgstr "Trenutna postava:" -#: kdiff3.cpp:186 +#: kdiff3.cpp:187 #, kde-format msgid "Config Option Error:" msgstr "Greška postavne opcije:" -#: kdiff3.cpp:240 +#: kdiff3.cpp:246 #, kde-format msgid "Option --auto used, but no output file specified." msgstr "Opcija --auto je upotrebljena, ali nije naveden izlazni fajl." -#: kdiff3.cpp:416 +#: kdiff3.cpp:405 #, kde-format msgid "Option --auto ignored for directory comparison." msgstr "Opcija --auto se ignoriše za poređenje fascikli." -#: kdiff3.cpp:460 +#: kdiff3.cpp:449 #, kde-format msgid "Saving failed." msgstr "Upisivanje nije uspelo." -#: kdiff3.cpp:496 pdiff.cpp:1098 +#: kdiff3.cpp:494 pdiff.cpp:395 pdiff.cpp:1117 #, kde-format msgid "Opening of these files failed:" msgstr "Otvaranje ovih fajlova nije uspelo:" -#: kdiff3.cpp:505 +#: kdiff3.cpp:503 pdiff.cpp:404 pdiff.cpp:1126 #, kde-format -msgid "File Open Error" +msgid "File open error" msgstr "Greška pri otvaranju fajla" # >> @info:tooltip -#: kdiff3.cpp:533 +#: kdiff3.cpp:532 #, kde-format msgid "Opens documents for comparison..." msgstr "Otvara dokumente za poređenje." -#: kdiff3.cpp:535 +#: kdiff3.cpp:534 #, kde-format msgid "Reload" msgstr "Učitaj ponovo" # >> @info:tooltip -#: kdiff3.cpp:538 +#: kdiff3.cpp:537 #, kde-format msgid "Saves the merge result. All conflicts must be solved!" msgstr "Upisuje rezultat stapanja. Svi sukobi moraju biti razrešeni." # >> @info:tooltip -#: kdiff3.cpp:540 +#: kdiff3.cpp:539 #, kde-format msgid "Saves the current document as..." msgstr "Upisuje tekuće dokumente pod imenom." # >> @info:tooltip -#: kdiff3.cpp:543 +#: kdiff3.cpp:542 #, kde-format msgid "Print the differences" msgstr "Štampa razlike." # >> @info:tooltip -#: kdiff3.cpp:546 +#: kdiff3.cpp:545 #, kde-format msgid "Quits the application" msgstr "Napušta program." # >> @info:tooltip -#: kdiff3.cpp:549 +#: kdiff3.cpp:548 #, kde-format msgid "Cuts the selected section and puts it to the clipboard" msgstr "Iseca izabrani odeljak i stavlja ga u klipbord." # >> @info:tooltip -#: kdiff3.cpp:552 +#: kdiff3.cpp:551 #, kde-format msgid "Copies the selected section to the clipboard" msgstr "Kopira izabrani odeljak u klipbord." # >> @info:tooltip -#: kdiff3.cpp:554 +#: kdiff3.cpp:553 #, kde-format msgid "Pastes the clipboard contents to current position" msgstr "Nalepljuje sadržaj klipborda na trenutnom položaju." # >> @info:tooltip -#: kdiff3.cpp:557 +#: kdiff3.cpp:556 #, kde-format msgid "Select everything in current window" msgstr "Izabira sve u tekućem prozoru." # >> @info:tooltip -#: kdiff3.cpp:560 +#: kdiff3.cpp:559 #, kde-format msgid "Search for a string" msgstr "Traži nisku." # >> @info:tooltip -#: kdiff3.cpp:562 +#: kdiff3.cpp:561 #, kde-format msgid "Search again for the string" msgstr "Ponovo traži nisku." # >> @info:tooltip -#: kdiff3.cpp:567 +#: kdiff3.cpp:566 #, kde-format msgid "Enables/disables the statusbar" msgstr "Uključuje/isključuje traku stanja." -#: kdiff3.cpp:571 +#: kdiff3.cpp:570 #, kde-format msgid "Configure KDiff3..." msgstr "Podesi KDiff3..." -#: kdiff3.cpp:590 +#: kdiff3.cpp:589 #, kde-format msgid "Go to Current Delta" msgstr "Idi na tekuću deltu" -#: kdiff3.cpp:590 +#: kdiff3.cpp:589 #, kde-format msgid "" "Current\n" @@ -1227,12 +1232,12 @@ "Tekuća\n" "delta" -#: kdiff3.cpp:592 +#: kdiff3.cpp:591 #, kde-format msgid "Go to First Delta" msgstr "Idi na prvu deltu" -#: kdiff3.cpp:592 +#: kdiff3.cpp:591 #, kde-format msgid "" "First\n" @@ -1241,12 +1246,12 @@ "Prva\n" "delta" -#: kdiff3.cpp:594 +#: kdiff3.cpp:593 #, kde-format msgid "Go to Last Delta" msgstr "Idi na poslednju deltu" -#: kdiff3.cpp:594 +#: kdiff3.cpp:593 #, kde-format msgid "" "Last\n" @@ -1255,12 +1260,12 @@ "Poslednja\n" "delta" -#: kdiff3.cpp:596 +#: kdiff3.cpp:595 #, kde-format msgid "(Skips white space differences when \"Show White Space\" is disabled.)" msgstr "(Preskače razlike u prazninama ako je „Prikaži praznine“ isključeno.)" -#: kdiff3.cpp:597 +#: kdiff3.cpp:596 #, kde-format msgid "" "(Does not skip white space differences even when \"Show White Space\" is " @@ -1268,12 +1273,12 @@ msgstr "" "(Ne preskače razlike prazninama ni kada je „Prikaži praznine“ isključeno.)" -#: kdiff3.cpp:598 +#: kdiff3.cpp:597 #, kde-format msgid "Go to Previous Delta" msgstr "Idi na prethodnu deltu" -#: kdiff3.cpp:598 +#: kdiff3.cpp:597 #, kde-format msgid "" "Prev\n" @@ -1282,12 +1287,12 @@ "Prethodna\n" "delta" -#: kdiff3.cpp:600 +#: kdiff3.cpp:599 #, kde-format msgid "Go to Next Delta" msgstr "Idi na sledeću deltu" -#: kdiff3.cpp:600 +#: kdiff3.cpp:599 #, kde-format msgid "" "Next\n" @@ -1296,12 +1301,12 @@ "Sledeća\n" "delta" -#: kdiff3.cpp:602 +#: kdiff3.cpp:601 #, kde-format msgid "Go to Previous Conflict" msgstr "Idi na prethodni sukob" -#: kdiff3.cpp:602 +#: kdiff3.cpp:601 #, kde-format msgid "" "Prev\n" @@ -1310,12 +1315,12 @@ "Prethodni\n" "sukob" -#: kdiff3.cpp:604 +#: kdiff3.cpp:603 #, kde-format msgid "Go to Next Conflict" msgstr "Idi na sledeći sukob" -#: kdiff3.cpp:604 +#: kdiff3.cpp:603 #, kde-format msgid "" "Next\n" @@ -1324,12 +1329,12 @@ "Sledeći\n" "sukob" -#: kdiff3.cpp:606 +#: kdiff3.cpp:605 #, kde-format msgid "Go to Previous Unsolved Conflict" msgstr "Idi na prethodni nerešeni sukob" -#: kdiff3.cpp:606 +#: kdiff3.cpp:605 #, kde-format msgid "" "Prev\n" @@ -1338,12 +1343,12 @@ "Prethodni\n" "nerešeni" -#: kdiff3.cpp:608 +#: kdiff3.cpp:607 #, kde-format msgid "Go to Next Unsolved Conflict" msgstr "Idi na sledeći nerešeni sukob" -#: kdiff3.cpp:608 +#: kdiff3.cpp:607 #, kde-format msgid "" "Next\n" @@ -1352,12 +1357,12 @@ "Sledeći\n" "nerešeni" -#: kdiff3.cpp:610 +#: kdiff3.cpp:609 #, kde-format msgid "Select Line(s) From A" msgstr "Izaberite redove iz A" -#: kdiff3.cpp:610 +#: kdiff3.cpp:609 #, kde-format msgid "" "Choose\n" @@ -1366,12 +1371,12 @@ "Izaberite\n" "A" -#: kdiff3.cpp:611 +#: kdiff3.cpp:610 #, kde-format msgid "Select Line(s) From B" msgstr "Izaberite redove iz B" -#: kdiff3.cpp:611 +#: kdiff3.cpp:610 #, kde-format msgid "" "Choose\n" @@ -1380,12 +1385,12 @@ "Izaberite\n" "B" -#: kdiff3.cpp:612 +#: kdiff3.cpp:611 #, kde-format msgid "Select Line(s) From C" msgstr "Izaberite redove iz C" -#: kdiff3.cpp:612 +#: kdiff3.cpp:611 #, kde-format msgid "" "Choose\n" @@ -1394,12 +1399,12 @@ "Izaberite\n" "C" -#: kdiff3.cpp:613 +#: kdiff3.cpp:612 #, kde-format msgid "Automatically Go to Next Unsolved Conflict After Source Selection" msgstr "Automatski idi na sledeći nerešeni sukob posle izbora izvora" -#: kdiff3.cpp:613 +#: kdiff3.cpp:612 #, kde-format msgid "" "Auto\n" @@ -1408,13 +1413,13 @@ "Automatski\n" "sledeći" -#: kdiff3.cpp:615 +#: kdiff3.cpp:614 #, fuzzy, kde-format #| msgid "Show Space && Tabulator Characters for Differences" msgid "Show Space && Tabulator Characters" msgstr "Prikaži znakove razmaka i tabulatora za razlike" -#: kdiff3.cpp:615 +#: kdiff3.cpp:614 #, kde-format msgid "" "White\n" @@ -1423,12 +1428,12 @@ "Znakovi\n" "praznina" -#: kdiff3.cpp:616 +#: kdiff3.cpp:615 #, kde-format msgid "Show White Space" msgstr "Prikaži praznine" -#: kdiff3.cpp:616 +#: kdiff3.cpp:615 #, kde-format msgid "" "White\n" @@ -1437,12 +1442,12 @@ "Delte\n" "praznina" -#: kdiff3.cpp:618 +#: kdiff3.cpp:617 #, kde-format msgid "Show Line Numbers" msgstr "Prikaži brojeve redova" -#: kdiff3.cpp:618 +#: kdiff3.cpp:617 #, kde-format msgid "" "Line\n" @@ -1451,196 +1456,196 @@ "Brojevi\n" "redova" -#: kdiff3.cpp:620 +#: kdiff3.cpp:619 #, kde-format msgid "Automatically Solve Simple Conflicts" msgstr "Automatski reši jednostavne sukobe" -#: kdiff3.cpp:621 +#: kdiff3.cpp:620 #, kde-format msgid "Set Deltas to Conflicts" msgstr "Postavi delte na sukobe" -#: kdiff3.cpp:622 +#: kdiff3.cpp:621 #, kde-format msgid "Run Regular Expression Auto Merge" msgstr "Automatski stopi po regularnim izrazima" -#: kdiff3.cpp:623 +#: kdiff3.cpp:622 #, kde-format msgid "Automatically Solve History Conflicts" msgstr "Automatski reši sukobe istorijata" -#: kdiff3.cpp:624 +#: kdiff3.cpp:623 #, kde-format msgid "Split Diff At Selection" msgstr "Podeli razliku na izboru" -#: kdiff3.cpp:625 +#: kdiff3.cpp:624 #, kde-format msgid "Join Selected Diffs" msgstr "Spoji izabrane razlike" -#: kdiff3.cpp:627 +#: kdiff3.cpp:626 #, kde-format msgid "Show Window A" msgstr "Prikaži prozor A" -#: kdiff3.cpp:628 +#: kdiff3.cpp:627 #, kde-format msgid "Show Window B" msgstr "Prikaži prozor B" -#: kdiff3.cpp:629 +#: kdiff3.cpp:628 #, kde-format msgid "Show Window C" msgstr "Prikaži prozor C" -#: kdiff3.cpp:631 +#: kdiff3.cpp:630 #, kde-format msgid "Normal Overview" msgstr "Normalan pregled" -#: kdiff3.cpp:632 +#: kdiff3.cpp:631 #, kde-format msgid "A vs. B Overview" msgstr "Pregled A prema B" -#: kdiff3.cpp:633 +#: kdiff3.cpp:632 #, kde-format msgid "A vs. C Overview" msgstr "Pregled A prema C" -#: kdiff3.cpp:634 +#: kdiff3.cpp:633 #, kde-format msgid "B vs. C Overview" msgstr "Pregled B prema C" -#: kdiff3.cpp:635 +#: kdiff3.cpp:634 #, kde-format msgid "Word Wrap Diff Windows" msgstr "Prelom reči u prozorima razlika" -#: kdiff3.cpp:636 +#: kdiff3.cpp:635 #, kde-format msgid "Add Manual Diff Alignment" msgstr "Dodaj ručno poravnanje razlika" -#: kdiff3.cpp:637 +#: kdiff3.cpp:636 #, kde-format msgid "Clear All Manual Diff Alignments" msgstr "Očisti sva ručna poravnanja razlika" -#: kdiff3.cpp:639 +#: kdiff3.cpp:638 #, kde-format msgid "Focus Next Window" msgstr "Fokusiraj sledeći prozor" -#: kdiff3.cpp:640 +#: kdiff3.cpp:639 #, kde-format msgid "Focus Prev Window" msgstr "Fokusiraj prethodni prozor" -#: kdiff3.cpp:641 +#: kdiff3.cpp:640 #, kde-format msgid "Toggle Split Orientation" msgstr "Prebaci orijentaciju podele" -#: kdiff3.cpp:643 +#: kdiff3.cpp:642 #, kde-format msgid "Dir && Text Split Screen View" msgstr "Podeljeni prikaz ekrana na fasciklu i tekst" -#: kdiff3.cpp:645 +#: kdiff3.cpp:644 #, kde-format msgid "Toggle Between Dir && Text View" msgstr "Prebaci prikaz fascikle i teksta" -#: kdiff3.cpp:697 pdiff.cpp:1909 +#: kdiff3.cpp:696 pdiff.cpp:1929 #, fuzzy, kde-format #| msgid "The merge result hasn't been saved." msgid "The merge result has not been saved." msgstr "Rezultat stapanja nije sačuvan." -#: kdiff3.cpp:699 +#: kdiff3.cpp:698 #, kde-format msgid "Save && Quit" msgstr "Sačuvaj i napusti" -#: kdiff3.cpp:700 +#: kdiff3.cpp:699 #, kde-format msgid "Quit Without Saving" msgstr "Napusti bez upisivanja" -#: kdiff3.cpp:708 pdiff.cpp:1920 +#: kdiff3.cpp:707 pdiff.cpp:1940 #, kde-format msgid "Saving the merge result failed." msgstr "Upisivanje rezultata stapanja nije uspelo." -#: kdiff3.cpp:719 pdiff.cpp:1032 +#: kdiff3.cpp:718 pdiff.cpp:1051 #, kde-format msgid "" "You are currently doing a directory merge. Are you sure, you want to abort?" msgstr "Trenutno stapate fascikle. Želite li zaista da obustavite ovo?" -#: kdiff3.cpp:742 +#: kdiff3.cpp:741 #, kde-format msgid "Saving file..." msgstr "Upisujem fajl..." -#: kdiff3.cpp:759 +#: kdiff3.cpp:758 #, kde-format msgid "Saving file with a new filename..." msgstr "Upisujem fajl pod novim imenom..." # >> @title:window -#: kdiff3.cpp:761 +#: kdiff3.cpp:760 #, kde-format msgid "Save As..." msgstr "Upisivanje kao" -#: kdiff3.cpp:820 +#: kdiff3.cpp:819 #, kde-format msgid "Printing not implemented." msgstr "Štampanje nije izvedeno." -#: kdiff3.cpp:857 +#: kdiff3.cpp:858 #, kde-format msgid "Printing..." msgstr "Štampam..." -#: kdiff3.cpp:943 +#: kdiff3.cpp:948 #, kde-format msgid "Printing page %1 of %2" msgstr "" -#: kdiff3.cpp:1000 +#: kdiff3.cpp:1006 #, fuzzy, kde-format #| msgid "Selection" msgid " (Selection)" msgstr "Izbor" -#: kdiff3.cpp:1027 +#: kdiff3.cpp:1034 #, kde-format msgid "Printing completed." msgstr "Štampanje završeno." -#: kdiff3.cpp:1031 +#: kdiff3.cpp:1038 #, kde-format msgid "Printing aborted." msgstr "Štampanje obustavljeno." -#: kdiff3.cpp:1038 +#: kdiff3.cpp:1045 #, kde-format msgid "Exiting..." msgstr "Napuštam..." -#: kdiff3.cpp:1049 +#: kdiff3.cpp:1056 #, kde-format msgid "Toggling toolbar..." msgstr "Prebacujem traku alatki..." -#: kdiff3.cpp:1070 +#: kdiff3.cpp:1077 #, kde-format msgid "Toggle the statusbar..." msgstr "Prebacujem traku stanja..." @@ -1666,7 +1671,7 @@ msgid "Joachim Eibl" msgstr "Joahim Ajbl" -#: kdiff3_part.cpp:173 kdiff3_part.cpp:254 +#: kdiff3_part.cpp:172 kdiff3_part.cpp:253 #, fuzzy, kde-format #| msgid "Couldn't find files for comparison." msgid "Could not find files for comparison." @@ -1685,7 +1690,7 @@ msgstr "Podesi KDiff3" #. i18n: ectx: ToolBar (mainToolBar) -#: kdiff3_part.rc:16 main.cpp:88 +#: kdiff3_part.rc:16 main.cpp:89 #, kde-format msgid "KDiff3" msgstr "&KDiff3" @@ -1757,83 +1762,88 @@ msgid "Main Toolbar" msgstr "Glavna traka" -#: main.cpp:68 main.cpp:72 +#: main.cpp:69 main.cpp:73 #, kde-format msgid "Ignored. (User defined.)" msgstr "Ignorisano (korisnički definisano)." -#: main.cpp:92 +#: main.cpp:93 #, kde-format msgid " (64 bit)" msgstr "" -#: main.cpp:94 +#: main.cpp:95 #, kde-format msgid " (32 bit)" msgstr "" -#: main.cpp:95 +#: main.cpp:96 #, kde-format msgid "Tool for Comparison and Merge of Files and Directories" msgstr "Alatka za poređenje i stapanje fajlova i fascikli" -#: main.cpp:96 +#: main.cpp:97 #, kde-format msgid "(c) 2002-2014 Joachim Eibl, (c) 2017 Michael Reeves KF5/Qt5 port" msgstr "" -#: main.cpp:112 +#: main.cpp:113 #, kde-format msgid "Merge the input." msgstr "Stopi ulaz." -#: main.cpp:113 +#: main.cpp:114 #, kde-format msgid "Explicit base file. For compatibility with certain tools." msgstr "Izričit bazni fajl. Za saglasnost sa pojedinim alatkama." -#: main.cpp:114 +#: main.cpp:115 #, kde-format msgid "Output file. Implies -m. E.g.: -o newfile.txt" msgstr "Izlazni fajl. Implicira -m. Npr: -o novifajl.txt" -#: main.cpp:115 +#: main.cpp:116 #, kde-format msgid "Output file, again. (For compatibility with certain tools.)" msgstr "Izlazni fajl, ponovo. Za saglasnost sa pojedinim alatkama." -#: main.cpp:116 +#: main.cpp:118 #, kde-format msgid "No GUI if all conflicts are auto-solvable. (Needs -o file)" msgstr "Bez GUI‑ja ako su svi sukobi rešivi automatski. Zahteva -o fajl." -#: main.cpp:117 +#: main.cpp:120 +#, kde-format +msgid "Ignored." +msgstr "" + +#: main.cpp:122 #, fuzzy, kde-format #| msgid "Don't solve conflicts automatically. (For compatibility...)" msgid "Do not solve conflicts automatically." msgstr "Ne rešavaj sukobe automatski. Za saglasnost..." -#: main.cpp:118 +#: main.cpp:123 #, kde-format msgid "Visible name replacement for input file 1 (base)." msgstr "Zamena vidljivog imena za ulazni fajl 1 (bazni)." -#: main.cpp:119 +#: main.cpp:124 #, kde-format msgid "Visible name replacement for input file 2." msgstr "Zamena vidljivog imena za ulazni fajl 2." -#: main.cpp:120 +#: main.cpp:125 #, kde-format msgid "Visible name replacement for input file 3." msgstr "Zamena vidljivog imena za ulazni fajl 3." -#: main.cpp:121 +#: main.cpp:126 #, kde-format msgid "Alternative visible name replacement. Supply this once for every input." msgstr "Alternativna zamena vidljivog imena. Zadajte ovo jednom za svaki ulaz." -#: main.cpp:122 +#: main.cpp:127 #, kde-format msgid "" "Override a config setting. Use once for every setting. E.g.: --cs " @@ -1842,87 +1852,87 @@ "Potisni postavku iz postave. Upotrebite jednom za svaku postavku. Npr: --cs " "\"AutoAdvance=1\"" -#: main.cpp:123 +#: main.cpp:128 #, kde-format msgid "Show list of config settings and current values." msgstr "Nabroji postavke i trenutne vrednosti iz postave." -#: main.cpp:124 +#: main.cpp:129 #, kde-format msgid "Use a different config file." msgstr "Upotrebi drugi postavni fajl." -#: main.cpp:127 +#: main.cpp:132 #, kde-format msgid "file1 to open (base, if not specified via --base)" msgstr "Fajl 1 za otvaranje (bazni, ako nije naveden preko --base)." -#: main.cpp:128 +#: main.cpp:133 #, kde-format msgid "file2 to open" msgstr "Fajl 2 za otvaranje." -#: main.cpp:129 +#: main.cpp:134 #, kde-format msgid "file3 to open" msgstr "Fajl 3 za otvaranje." -#: main.cpp:153 +#: main.cpp:158 #, kde-format msgid "See kdiff3 --help for supported options." msgstr "" -#: mergeresultwindow.cpp:158 +#: mergeresultwindow.cpp:171 #, kde-format msgid "Choose A Everywhere" msgstr "Svuda izaberi A" -#: mergeresultwindow.cpp:159 +#: mergeresultwindow.cpp:172 #, kde-format msgid "Choose B Everywhere" msgstr "Svuda izaberi B" -#: mergeresultwindow.cpp:160 +#: mergeresultwindow.cpp:173 #, kde-format msgid "Choose C Everywhere" msgstr "Svuda izaberi C" -#: mergeresultwindow.cpp:161 +#: mergeresultwindow.cpp:174 #, kde-format msgid "Choose A for All Unsolved Conflicts" msgstr "Izaberi A za sve nerešene sukobe" -#: mergeresultwindow.cpp:162 +#: mergeresultwindow.cpp:175 #, kde-format msgid "Choose B for All Unsolved Conflicts" msgstr "Izaberi B za sve nerešene sukobe" -#: mergeresultwindow.cpp:163 +#: mergeresultwindow.cpp:176 #, kde-format msgid "Choose C for All Unsolved Conflicts" msgstr "Izaberi C za sve nerešene sukobe" -#: mergeresultwindow.cpp:164 +#: mergeresultwindow.cpp:177 #, kde-format msgid "Choose A for All Unsolved Whitespace Conflicts" msgstr "Izaberi A za sve nerešene sukobe praznina" -#: mergeresultwindow.cpp:165 +#: mergeresultwindow.cpp:178 #, kde-format msgid "Choose B for All Unsolved Whitespace Conflicts" msgstr "Izaberi B za sve nerešene sukobe praznina" -#: mergeresultwindow.cpp:166 +#: mergeresultwindow.cpp:179 #, kde-format msgid "Choose C for All Unsolved Whitespace Conflicts" msgstr "Izaberi C za sve nerešene sukobe praznina" -#: mergeresultwindow.cpp:176 +#: mergeresultwindow.cpp:204 #, kde-format msgid "Number of remaining unsolved conflicts: %1 (of which %2 are whitespace)" msgstr "Broj preostalih nerešenih sukoba: %1 (od čega %2 praznine)." -#: mergeresultwindow.cpp:370 +#: mergeresultwindow.cpp:398 #, kde-format msgid "" "The output has been modified.\n" @@ -1931,29 +1941,29 @@ "Izlaz je izmenjen.\n" "Ako nastavite izmene će biti izgubljene." -#: mergeresultwindow.cpp:936 pdiff.cpp:827 +#: mergeresultwindow.cpp:964 pdiff.cpp:838 #, kde-format msgid "All input files are binary equal." msgstr "Svi ulazni fajlovi binarno su jednaki." -#: mergeresultwindow.cpp:938 +#: mergeresultwindow.cpp:966 #, kde-format msgid "All input files contain the same text." msgstr "Svi ulazni fajlovi sadrže isti tekst." -#: mergeresultwindow.cpp:942 mergeresultwindow.cpp:946 -#: mergeresultwindow.cpp:950 pdiff.cpp:833 pdiff.cpp:837 pdiff.cpp:841 +#: mergeresultwindow.cpp:970 mergeresultwindow.cpp:974 +#: mergeresultwindow.cpp:978 pdiff.cpp:844 pdiff.cpp:848 pdiff.cpp:852 #, kde-format msgid "Files %1 and %2 are binary equal.\n" msgstr "Fajlovi %1 i %2 binarno su jednaki.\n" -#: mergeresultwindow.cpp:944 mergeresultwindow.cpp:948 -#: mergeresultwindow.cpp:952 +#: mergeresultwindow.cpp:972 mergeresultwindow.cpp:976 +#: mergeresultwindow.cpp:980 #, kde-format msgid "Files %1 and %2 have equal text.\n" msgstr "Fajlovi %1 i %2 sadrže isti tekst.\n" -#: mergeresultwindow.cpp:958 +#: mergeresultwindow.cpp:986 #, kde-format msgid "" "Total number of conflicts: %1\n" @@ -1962,27 +1972,27 @@ "%4" msgstr "" -#: mergeresultwindow.cpp:964 +#: mergeresultwindow.cpp:992 #, kde-format msgid "Conflicts" msgstr "Sukobi" -#: mergeresultwindow.cpp:1873 +#: mergeresultwindow.cpp:1901 #, kde-format msgid "" msgstr "" -#: mergeresultwindow.cpp:1881 +#: mergeresultwindow.cpp:1909 #, kde-format msgid "" msgstr "" -#: mergeresultwindow.cpp:1883 mergeresultwindow.cpp:2755 +#: mergeresultwindow.cpp:1911 mergeresultwindow.cpp:2783 #, kde-format msgid "" msgstr "" -#: mergeresultwindow.cpp:2967 +#: mergeresultwindow.cpp:2995 #, fuzzy, kde-format #| msgid "" #| "Not all conflicts are solved yet.\n" @@ -1994,12 +2004,12 @@ "Još nisu rešeni svi sukobi.\n" "Fajl nije sačuvan.\n" -#: mergeresultwindow.cpp:2969 mergeresultwindow.cpp:2978 +#: mergeresultwindow.cpp:2997 mergeresultwindow.cpp:3006 #, kde-format msgid "Conflicts Left" msgstr "Preostali sukobi" -#: mergeresultwindow.cpp:2976 +#: mergeresultwindow.cpp:3004 #, fuzzy, kde-format #| msgid "" #| "There is a line end style conflict. Please choose the line end style " @@ -2013,7 +2023,7 @@ "Sukob u stilu završetaka redova. Izaberite ručno stil završetka redova.\n" "Fajl nije sačuvan.\n" -#: mergeresultwindow.cpp:2990 +#: mergeresultwindow.cpp:3018 #, kde-format msgid "" "\n" @@ -2024,65 +2034,65 @@ "\n" "Pravljenje rezerve nije uspelo. Fajl nije sačuvan." -#: mergeresultwindow.cpp:2990 mergeresultwindow.cpp:3038 +#: mergeresultwindow.cpp:3018 mergeresultwindow.cpp:3066 #, kde-format msgid "File Save Error" msgstr "Greška upisivanja fajla" -#: mergeresultwindow.cpp:3038 +#: mergeresultwindow.cpp:3066 #, kde-format msgid "Error while writing." msgstr "Greška pri pisanju." -#: mergeresultwindow.cpp:3110 +#: mergeresultwindow.cpp:3138 #, fuzzy, kde-format #| msgid "Output" msgid "Output:" msgstr "Izlaz" -#: mergeresultwindow.cpp:3123 mergeresultwindow.cpp:3315 +#: mergeresultwindow.cpp:3151 mergeresultwindow.cpp:3343 #, kde-format msgid "[Modified]" msgstr "[izmenjen]" -#: mergeresultwindow.cpp:3130 +#: mergeresultwindow.cpp:3158 #, fuzzy, kde-format #| msgid "Encoding for saving" msgid "Encoding for saving:" msgstr "Kodiranje za upisivanje" -#: mergeresultwindow.cpp:3230 +#: mergeresultwindow.cpp:3258 #, kde-format msgid "Conflict" msgstr "Sukob" # >! Merge sentence. -#: mergeresultwindow.cpp:3262 +#: mergeresultwindow.cpp:3290 #, fuzzy, kde-format #| msgid "Codec from" msgid "Codec from A: %1" msgstr "Kodiranje iz" # >! Merge sentence. -#: mergeresultwindow.cpp:3264 +#: mergeresultwindow.cpp:3292 #, fuzzy, kde-format #| msgid "Codec from" msgid "Codec from B: %1" msgstr "Kodiranje iz" # >! Merge sentence. -#: mergeresultwindow.cpp:3266 +#: mergeresultwindow.cpp:3294 #, fuzzy, kde-format #| msgid "Codec from" msgid "Codec from C: %1" msgstr "Kodiranje iz" -#: optiondialog.cpp:119 +#: optiondialog.cpp:121 #, kde-format msgid "Change Font" msgstr "" -#: optiondialog.cpp:135 optiondialog.cpp:145 +#: optiondialog.cpp:137 optiondialog.cpp:147 #, kde-format msgid "" "Font: %1, %2, %3\n" @@ -2090,165 +2100,165 @@ "Example:" msgstr "" -#: optiondialog.cpp:388 +#: optiondialog.cpp:390 #, kde-format msgid "Unicode" msgstr "Unicode" -#: optiondialog.cpp:389 +#: optiondialog.cpp:391 #, kde-format msgid "Latin1" msgstr "latinica‑1" -#: optiondialog.cpp:408 +#: optiondialog.cpp:410 #, kde-format msgid "Change this if non-ASCII characters are not displayed correctly." msgstr "Izmenite ovo ako su ne-ASCII znakovi pogrešno prikazani." # >> @title:window -#: optiondialog.cpp:491 +#: optiondialog.cpp:495 #, kde-format msgid "Configure" msgstr "Podešavanje" -#: optiondialog.cpp:568 +#: optiondialog.cpp:573 #, kde-format msgid "Font" msgstr "Font" -#: optiondialog.cpp:570 +#: optiondialog.cpp:575 #, kde-format msgid "Editor & Diff Output Font" msgstr "Font uređivača i izlaza razlike" -#: optiondialog.cpp:589 +#: optiondialog.cpp:594 #, kde-format msgid "Application font" msgstr "" -#: optiondialog.cpp:594 +#: optiondialog.cpp:599 #, fuzzy, kde-format #| msgid "File Save Error" msgid "File view font" msgstr "Greška upisivanja fajla" -#: optiondialog.cpp:613 +#: optiondialog.cpp:618 #, fuzzy, kde-format #| msgid "Color" msgctxt "Title for color settings page" msgid "Color" msgstr "Boja" -#: optiondialog.cpp:614 +#: optiondialog.cpp:619 #, kde-format msgid "Colors Settings" msgstr "Postavke boja" -#: optiondialog.cpp:631 +#: optiondialog.cpp:644 #, kde-format msgid "Editor and Diff Views:" msgstr "Uređivač i prikazi razlika:" -#: optiondialog.cpp:639 +#: optiondialog.cpp:652 #, kde-format msgid "Foreground color:" msgstr "Boja teksta:" -#: optiondialog.cpp:647 +#: optiondialog.cpp:660 #, kde-format msgid "Background color:" msgstr "Boja pozadine:" -#: optiondialog.cpp:657 +#: optiondialog.cpp:670 #, kde-format msgid "Diff background color:" msgstr "Boja pozadine razlika:" -#: optiondialog.cpp:666 +#: optiondialog.cpp:679 #, kde-format msgid "Color A:" msgstr "Boja A:" -#: optiondialog.cpp:675 +#: optiondialog.cpp:688 #, kde-format msgid "Color B:" msgstr "Boja B:" -#: optiondialog.cpp:684 +#: optiondialog.cpp:697 #, kde-format msgid "Color C:" msgstr "Boja C:" -#: optiondialog.cpp:692 +#: optiondialog.cpp:705 #, kde-format msgid "Conflict color:" msgstr "Boja sukoba:" -#: optiondialog.cpp:701 +#: optiondialog.cpp:714 #, kde-format msgid "Current range background color:" msgstr "Pozadinska boja tekućeg opsega:" -#: optiondialog.cpp:710 +#: optiondialog.cpp:723 #, kde-format msgid "Current range diff background color:" msgstr "Pozadinska boja tekućeg opsega razlika:" -#: optiondialog.cpp:718 +#: optiondialog.cpp:731 #, kde-format msgid "Color for manually aligned difference ranges:" msgstr "Boja ručno poravnatih opsega razlika:" -#: optiondialog.cpp:725 +#: optiondialog.cpp:738 #, kde-format msgid "Directory Comparison View:" msgstr "Prikaz poređenja fascikli:" -#: optiondialog.cpp:731 +#: optiondialog.cpp:744 #, kde-format msgid "Newest file color:" msgstr "Boja najnovijeg fajla:" -#: optiondialog.cpp:736 +#: optiondialog.cpp:749 #, kde-format msgid "" "Changing this color will only be effective when starting the next directory " "comparison." msgstr "Izmena ove boje stupiće na snagu od prvog narednog poređenja fascikli." -#: optiondialog.cpp:741 +#: optiondialog.cpp:754 #, kde-format msgid "Oldest file color:" msgstr "Boja najstarijeg fajla:" -#: optiondialog.cpp:750 +#: optiondialog.cpp:763 #, kde-format msgid "Middle age file color:" msgstr "Boja fajla srednje starosti:" -#: optiondialog.cpp:759 +#: optiondialog.cpp:772 #, kde-format msgid "Color for missing files:" msgstr "Boja za nedostajuće fajlove:" -#: optiondialog.cpp:773 +#: optiondialog.cpp:786 #, kde-format msgid "Editor" msgstr "Uređivač" -#: optiondialog.cpp:774 +#: optiondialog.cpp:787 #, kde-format msgid "Editor Behavior" msgstr "Ponašanje uređivača" # skip-rule: t-tab -#: optiondialog.cpp:787 +#: optiondialog.cpp:809 #, kde-format msgid "Tab inserts spaces" msgstr "Tab umeće razmake" # rewrite-msgid: /generate/insert/ -#: optiondialog.cpp:791 +#: optiondialog.cpp:813 #, kde-format msgid "" "On: Pressing tab generates the appropriate number of spaces.\n" @@ -2257,27 +2267,27 @@ "Uključeno: pritiskom Taba umeće se odgovarajući broj razmaka.\n" "Isključeno: umeće se znak tabulatora." -#: optiondialog.cpp:796 +#: optiondialog.cpp:818 #, kde-format msgid "Tab size:" msgstr "Veličina tabulatora:" -#: optiondialog.cpp:803 +#: optiondialog.cpp:825 #, kde-format msgid "Auto indentation" msgstr "Automatsko uvlačenje" -#: optiondialog.cpp:807 +#: optiondialog.cpp:829 #, kde-format msgid "On: The indentation of the previous line is used for a new line.\n" msgstr "Uključeno: uvlačenje prethodnog reda uzima se za novi red.\n" -#: optiondialog.cpp:810 +#: optiondialog.cpp:832 #, kde-format msgid "Auto copy selection" msgstr "Automatsko kopiranje izbora" -#: optiondialog.cpp:814 +#: optiondialog.cpp:836 #, fuzzy, kde-format #| msgid "" #| "On: Any selection is immediately written to the clipboard.\n" @@ -2289,7 +2299,7 @@ "Uključeno: svaki izbor se odmah upisuje u klipbord.\n" "Isključeno: morate izričito kopirati, npr. pomoću Ctrl+C." -#: optiondialog.cpp:829 +#: optiondialog.cpp:851 #, kde-format msgid "" "Sets the line endings for when an edited file is saved.\n" @@ -2298,12 +2308,12 @@ "Postavlja završetke redova kada se izmenjeni fajl sačuva.\n" "DOS/Windows CR+LF, Unix LF, gde je CR=0D, LF=0A." -#: optiondialog.cpp:839 +#: optiondialog.cpp:861 #, kde-format msgid "Diff" msgstr "Razlikovanje" -#: optiondialog.cpp:840 +#: optiondialog.cpp:862 #, kde-format msgid "Diff Settings" msgstr "Postavke razlikovanja" @@ -2318,13 +2328,13 @@ #. ); #. ++line; #. -#: optiondialog.cpp:865 +#: optiondialog.cpp:896 #, fuzzy, kde-format #| msgid "Treat as white space." msgid "Ignore numbers (treat as white space)" msgstr "Tretiraj kao praznine." -#: optiondialog.cpp:869 +#: optiondialog.cpp:900 #, kde-format msgid "" "Ignore number characters during line matching phase. (Similar to Ignore " @@ -2335,45 +2345,45 @@ "praznina).\n" "Može biti korisno pri poređenju fajlova sa numeričkim podacima." -#: optiondialog.cpp:873 +#: optiondialog.cpp:904 #, fuzzy, kde-format #| msgid "Treat C/C++ comments like white space." msgid "Ignore C/C++ comments (treat as white space)" msgstr "Tretiraj C/C++ komentare kao praznine." -#: optiondialog.cpp:876 +#: optiondialog.cpp:907 #, kde-format msgid "Treat C/C++ comments like white space." msgstr "Tretiraj C/C++ komentare kao praznine." # >! Merge sentence. -#: optiondialog.cpp:879 +#: optiondialog.cpp:910 #, fuzzy, kde-format #| msgid "Treat as white space." msgid "Ignore case (treat as white space)" msgstr "Tretiraj kao praznine." -#: optiondialog.cpp:883 +#: optiondialog.cpp:914 #, kde-format msgid "Treat case differences like white space changes. ('a'<=>'A')" msgstr "Tretira razliku u veličini kao promene u prazninama (‘a’ jednako ‘A’)." -#: optiondialog.cpp:886 +#: optiondialog.cpp:917 #, kde-format msgid "Preprocessor command:" msgstr "Predobradna naredba:" -#: optiondialog.cpp:891 +#: optiondialog.cpp:922 #, kde-format msgid "User defined pre-processing. (See the docs for details.)" msgstr "Korisnički definisana predobrada. Pogledajte dokumentaciju za detalje." -#: optiondialog.cpp:894 +#: optiondialog.cpp:925 #, kde-format msgid "Line-matching preprocessor command:" msgstr "Predobradna naredba za poklapanje redova:" -#: optiondialog.cpp:899 +#: optiondialog.cpp:930 #, kde-format msgid "" "This pre-processor is only used during line matching.\n" @@ -2382,12 +2392,12 @@ "Predobrada se koristi samo tokom poklapanja redova.\n" "Pogledajte dokumentaciju za detalje." -#: optiondialog.cpp:902 +#: optiondialog.cpp:933 #, kde-format msgid "Try hard (slower)" msgstr "Potrudi se (sporije)" -#: optiondialog.cpp:906 +#: optiondialog.cpp:937 #, kde-format msgid "" "Enables the --minimal option for the external diff.\n" @@ -2396,12 +2406,12 @@ "Uključuje opciju --minimal za spoljašnje razlikovanje.\n" "Analiza velikih fajlova će biti mnogo sporija." -#: optiondialog.cpp:910 +#: optiondialog.cpp:941 #, kde-format msgid "Align B and C for 3 input files" msgstr "Poravnaj B i C za tri ulazna fajla" -#: optiondialog.cpp:914 +#: optiondialog.cpp:945 #, kde-format msgid "" "Try to align B and C when comparing or merging three input files.\n" @@ -2412,17 +2422,24 @@ "Nije preporučljivo za stapanje zato što ga može učiniti složenijim.\n" "Podrazumevano je isključeno." -#: optiondialog.cpp:926 +#: optiondialog.cpp:956 +#, fuzzy, kde-format +#| msgid "Merge" +msgctxt "Settings page" +msgid "Merge" +msgstr "Stopi" + +#: optiondialog.cpp:957 #, kde-format msgid "Merge Settings" msgstr "Postavke stapanja" -#: optiondialog.cpp:940 +#: optiondialog.cpp:980 #, kde-format msgid "Auto advance delay (ms):" msgstr "Zastoj automatskog napredovanja (ms):" -#: optiondialog.cpp:946 +#: optiondialog.cpp:986 #, kde-format msgid "" "When in Auto-Advance mode the result of the current selection is shown \n" @@ -2431,27 +2448,27 @@ "U režimu automatskog napredovanja rezultat tekućeg izbora prikazuje se \n" "zadato vreme pre skoka na sledeći sukob. Opseg: 0–2000 ms." -#: optiondialog.cpp:950 +#: optiondialog.cpp:990 #, kde-format msgid "Show info dialogs" msgstr "Prikazuj informativne dijaloge" -#: optiondialog.cpp:953 +#: optiondialog.cpp:993 #, kde-format msgid "Show a dialog with information about the number of conflicts." msgstr "Prikazuje dijalog sa informacijom o broju sukoba." -#: optiondialog.cpp:956 +#: optiondialog.cpp:996 #, kde-format msgid "White space 2-file merge default:" msgstr "Podrazumevano stapanje praznina dva fajla:" -#: optiondialog.cpp:961 optiondialog.cpp:974 +#: optiondialog.cpp:1001 optiondialog.cpp:1014 #, kde-format msgid "Manual Choice" msgstr "Ručni izbor" -#: optiondialog.cpp:965 optiondialog.cpp:979 +#: optiondialog.cpp:1005 optiondialog.cpp:1019 #, kde-format msgid "" "Allow the merge algorithm to automatically select an input for white-space-" @@ -2460,22 +2477,22 @@ "Dozvoljava algoritmu stapanja da automatski izabere ulaz za izmene samo u " "prazninama." -#: optiondialog.cpp:969 +#: optiondialog.cpp:1009 #, kde-format msgid "White space 3-file merge default:" msgstr "Podrazumevano stapanje praznina tri fajla:" -#: optiondialog.cpp:983 +#: optiondialog.cpp:1023 #, kde-format msgid "Automatic Merge Regular Expression" msgstr "Regularni izraz za automatsko stapanje" -#: optiondialog.cpp:991 smalldialogs.cpp:449 +#: optiondialog.cpp:1031 smalldialogs.cpp:459 #, kde-format msgid "Auto merge regular expression:" msgstr "Regularni izraz za automatsko stapanje:" -#: optiondialog.cpp:996 +#: optiondialog.cpp:1036 #, kde-format msgid "" "Regular expression for lines where KDiff3 should automatically choose one " @@ -2487,30 +2504,30 @@ "izvora. Kad regularni izraz poklopi red sa sukobom bira se C ako ga ima, " "inače B." -#: optiondialog.cpp:1002 +#: optiondialog.cpp:1042 #, kde-format msgid "Run regular expression auto merge on merge start" msgstr "Automatski stopi po regularnom izrazu na početku stapanja" -#: optiondialog.cpp:1005 +#: optiondialog.cpp:1045 #, kde-format msgid "" "Run the merge for auto merge regular expressions\n" "immediately when a merge starts.\n" msgstr "Sprovodi stapanje regularnim izrazom čim stapanje počne.\n" -#: optiondialog.cpp:1010 +#: optiondialog.cpp:1050 #, kde-format msgid "Version Control History Merging" msgstr "Stapanje istorijata upravljanja verzijama" -#: optiondialog.cpp:1018 smalldialogs.cpp:476 +#: optiondialog.cpp:1058 smalldialogs.cpp:486 #, kde-format msgid "History start regular expression:" msgstr "Regularni izraz za početak istorijata:" # literal-segment: Log -#: optiondialog.cpp:1023 +#: optiondialog.cpp:1063 #, kde-format msgid "" "Regular expression for the start of the version control history entry.\n" @@ -2521,12 +2538,12 @@ "Ovaj red obično sadrži ključnu reč „$Log$“.\n" "Podrazumevana vrednost je „.*\\$Log.*\\$.*“." -#: optiondialog.cpp:1029 smalldialogs.cpp:504 +#: optiondialog.cpp:1069 smalldialogs.cpp:514 #, kde-format msgid "History entry start regular expression:" msgstr "Regularni izraz za početak unosa istorijata:" -#: optiondialog.cpp:1042 +#: optiondialog.cpp:1082 #, kde-format msgid "" "A version control history entry consists of several lines.\n" @@ -2544,22 +2561,22 @@ "redovima.\n" "Detalje potražite u dokumentaciji." -#: optiondialog.cpp:1050 +#: optiondialog.cpp:1090 #, kde-format msgid "History merge sorting" msgstr "Ređanje u stapanju istorijata" -#: optiondialog.cpp:1053 +#: optiondialog.cpp:1093 #, kde-format msgid "Sort version control history by a key." msgstr "Ređa istorijat upravljanja verzijama po ključu." -#: optiondialog.cpp:1063 +#: optiondialog.cpp:1103 #, kde-format msgid "History entry start sort key order:" msgstr "Redosled ređanja za ključeve unosa istorijata:" -#: optiondialog.cpp:1068 +#: optiondialog.cpp:1108 #, kde-format msgid "" "Each pair of parentheses used in the regular expression for the history " @@ -2577,39 +2594,39 @@ "Ako se ostavi prazno, ređanje se ne sprovodi.\n" "Detalje potražite u dokumentaciji." -#: optiondialog.cpp:1079 +#: optiondialog.cpp:1119 #, kde-format msgid "Merge version control history on merge start" msgstr "Stopi istorijat upravljanja verzijama na početku stapanja" -#: optiondialog.cpp:1082 +#: optiondialog.cpp:1122 #, kde-format msgid "Run version control history automerge on merge start." msgstr "Automatski stapa istorijat upravljanja verzijama na početku stapanja." -#: optiondialog.cpp:1086 +#: optiondialog.cpp:1126 #, kde-format msgid "Max number of history entries:" msgstr "Najveći broj unosa istorijata:" # skip-rule: t-cut -#: optiondialog.cpp:1090 +#: optiondialog.cpp:1130 #, kde-format msgid "Cut off after specified number. Use -1 for infinite number of entries." msgstr "Odseca iznad zadatog broja. Stavite -1 za neograničen broj unosa." # >> @action:button -#: optiondialog.cpp:1094 +#: optiondialog.cpp:1134 #, kde-format msgid "Test your regular expressions" msgstr "Isprobaj regularne izraze" -#: optiondialog.cpp:1099 +#: optiondialog.cpp:1139 #, kde-format msgid "Irrelevant merge command:" msgstr "Naredba pri beznačajnom stapanju:" -#: optiondialog.cpp:1104 +#: optiondialog.cpp:1144 #, kde-format msgid "" "If specified this script is run after automerge\n" @@ -2620,12 +2637,12 @@ "nikakvih preostalih izmena.\n" "Poziva se sa argumentima: ime‑fajla‑1 ime‑fajla‑2 ime‑fajla‑3" -#: optiondialog.cpp:1109 +#: optiondialog.cpp:1149 #, kde-format msgid "Auto save and quit on merge without conflicts" msgstr "Automatski sačuvaj i napusti pri stapanju bez sukoba" -#: optiondialog.cpp:1113 +#: optiondialog.cpp:1153 #, kde-format msgid "" "If KDiff3 was started for a file-merge from the command line and all\n" @@ -2638,27 +2655,27 @@ "upisuju i program napušta.\n" "Slično opciji komandne linije --auto." -#: optiondialog.cpp:1124 optiondialog.cpp:1125 +#: optiondialog.cpp:1164 optiondialog.cpp:1165 #, kde-format msgid "Directory" msgstr "Fascikla" -#: optiondialog.cpp:1137 +#: optiondialog.cpp:1185 #, kde-format msgid "Recursive directories" msgstr "Rekurzivno kroz fascikle" -#: optiondialog.cpp:1140 +#: optiondialog.cpp:1188 #, kde-format msgid "Whether to analyze subdirectories or not." msgstr "Da li analizirati potfascikle." -#: optiondialog.cpp:1142 +#: optiondialog.cpp:1190 #, kde-format msgid "File pattern(s):" msgstr "Obrasci fajlova:" -#: optiondialog.cpp:1148 +#: optiondialog.cpp:1196 #, kde-format msgid "" "Pattern(s) of files to be analyzed. \n" @@ -2669,12 +2686,12 @@ "Džokeri: ‘*’ i ‘?’\n" "Više obrazaca navodite sa tačka-zapetom kao razdvajačem." -#: optiondialog.cpp:1153 +#: optiondialog.cpp:1201 #, kde-format msgid "File-anti-pattern(s):" msgstr "Protivobrasci fajlova:" -#: optiondialog.cpp:1159 +#: optiondialog.cpp:1207 #, kde-format msgid "" "Pattern(s) of files to be excluded from analysis. \n" @@ -2685,12 +2702,12 @@ "Džokeri: ‘*’ i ‘?’\n" "Više obrazaca navodite sa tačka-zapetom kao razdvajačem." -#: optiondialog.cpp:1164 +#: optiondialog.cpp:1212 #, kde-format msgid "Dir-anti-pattern(s):" msgstr "Protivobrasci fascikli:" -#: optiondialog.cpp:1170 +#: optiondialog.cpp:1218 #, kde-format msgid "" "Pattern(s) of directories to be excluded from analysis. \n" @@ -2701,12 +2718,12 @@ "Džokeri: ‘*’ i ‘?’\n" "Više obrazaca navodite sa tačka-zapetom kao razdvajačem." -#: optiondialog.cpp:1175 +#: optiondialog.cpp:1223 #, kde-format msgid "Use .cvsignore" msgstr "Koristi .cvsignore" -#: optiondialog.cpp:1179 +#: optiondialog.cpp:1227 #, kde-format msgid "" "Extends the antipattern to anything that would be ignored by CVS.\n" @@ -2715,23 +2732,23 @@ "Proširuje protivobrasce na sve što bi ignorisao CVS.\n" "Preko lokalnih fajlova .cvsignore ovo može biti posebno po fascikli." -#: optiondialog.cpp:1183 +#: optiondialog.cpp:1231 #, kde-format msgid "Find hidden files and directories" msgstr "Pronađi skrivene fajlove i fascikle" -#: optiondialog.cpp:1186 +#: optiondialog.cpp:1234 #, fuzzy, kde-format #| msgid "Find hidden files and directories" msgid "Finds hidden files and directories." msgstr "Pronađi skrivene fajlove i fascikle" -#: optiondialog.cpp:1189 +#: optiondialog.cpp:1237 #, kde-format msgid "Follow file links" msgstr "Prati veze fajlova" -#: optiondialog.cpp:1193 +#: optiondialog.cpp:1241 #, kde-format msgid "" "On: Compare the file the link points to.\n" @@ -2740,12 +2757,12 @@ "Uključeno: poredi fajlove na koje pokazuju veze.\n" "Isključeno: poredi veze." -#: optiondialog.cpp:1197 +#: optiondialog.cpp:1245 #, kde-format msgid "Follow directory links" msgstr "Prati veze fascikli" -#: optiondialog.cpp:1201 +#: optiondialog.cpp:1249 #, kde-format msgid "" "On: Compare the directory the link points to.\n" @@ -2754,12 +2771,12 @@ "Uključeno: poredi fascikle na koje pokazuju veze.\n" "Isključeno: poredi veze." -#: optiondialog.cpp:1210 +#: optiondialog.cpp:1258 #, kde-format msgid "Case sensitive filename comparison" msgstr "Poređenje imena fajlova razlikuje veličinu slova" -#: optiondialog.cpp:1214 +#: optiondialog.cpp:1262 #, kde-format msgid "" "The directory comparison will compare files or directories when their names " @@ -2771,52 +2788,52 @@ "Zadajte ovu opciju imena treba da se poklapaju i po veličini slova. " "Podrazumevano je isključeno pod Windowsom, inače je uključeno." -#: optiondialog.cpp:1218 +#: optiondialog.cpp:1266 #, fuzzy, kde-format #| msgid "Unfold All Subdirs" msgid "Unfold all subdirectories on load" msgstr "Raširi sve potfascikle" -#: optiondialog.cpp:1222 +#: optiondialog.cpp:1270 #, kde-format msgid "" "On: Unfold all subdirectories when starting a directory diff.\n" "Off: Leave subdirectories folded." msgstr "" -#: optiondialog.cpp:1226 +#: optiondialog.cpp:1274 #, kde-format msgid "Skip directory status report" msgstr "" -#: optiondialog.cpp:1230 +#: optiondialog.cpp:1278 #, kde-format msgid "" "On: Do not show the Directory Comparison Status.\n" "Off: Show the status dialog on start." msgstr "" -#: optiondialog.cpp:1234 +#: optiondialog.cpp:1282 #, kde-format msgid "File Comparison Mode" msgstr "Režim poređenja fajlova" -#: optiondialog.cpp:1239 +#: optiondialog.cpp:1287 #, kde-format msgid "Binary comparison" msgstr "Binarno poređenje" -#: optiondialog.cpp:1241 +#: optiondialog.cpp:1289 #, kde-format msgid "Binary comparison of each file. (Default)" msgstr "Binarno poređenje za svaki fajl (podrazumevano)." -#: optiondialog.cpp:1244 +#: optiondialog.cpp:1292 #, kde-format msgid "Full analysis" msgstr "Puna analiza" -#: optiondialog.cpp:1246 +#: optiondialog.cpp:1294 #, kde-format msgid "" "Do a full analysis and show statistics information in extra columns.\n" @@ -2825,12 +2842,12 @@ "Sprovodi punu analizu i daje statističke podatke u dodatnim kolonama.\n" "Sporije nego binarno poređenje, mnogo sporije za binarne fajlove." -#: optiondialog.cpp:1250 +#: optiondialog.cpp:1298 #, kde-format msgid "Trust the size and modification date (unsafe)" msgstr "Veruj veličini i datumu izmene (nesigurno)" -#: optiondialog.cpp:1252 +#: optiondialog.cpp:1300 #, kde-format msgid "" "Assume that files are equal if the modification date and file length are " @@ -2845,7 +2862,7 @@ "različitim.\n" "Korisno za velike fascikle ili spore mreže." -#: optiondialog.cpp:1257 +#: optiondialog.cpp:1305 #, kde-format msgid "" "Trust the size and date, but use binary comparison if date does not match " @@ -2854,7 +2871,7 @@ "Veruj veličini i datumu, ali binarno uporedi ako se datum ne poklapa " "(nesigurno)" -#: optiondialog.cpp:1259 +#: optiondialog.cpp:1307 #, kde-format msgid "" "Assume that files are equal if the modification date and file length are " @@ -2867,12 +2884,12 @@ "Ako datumi nisu isti ali veličina jeste, binarno upoređuje.\n" "Korisno za velike fascikle ili spore mreže." -#: optiondialog.cpp:1264 +#: optiondialog.cpp:1312 #, kde-format msgid "Trust the size (unsafe)" msgstr "Veruj veličini (nesigurno)" -#: optiondialog.cpp:1266 +#: optiondialog.cpp:1314 #, kde-format msgid "" "Assume that files are equal if their file lengths are equal.\n" @@ -2883,12 +2900,12 @@ "Korisno za velike fascikle ili spore mreže kada se datum izmeni tokom " "preuzimanja." -#: optiondialog.cpp:1273 +#: optiondialog.cpp:1321 #, kde-format msgid "Synchronize directories" msgstr "Sinhronizuj fascikle" -#: optiondialog.cpp:1277 +#: optiondialog.cpp:1325 #, kde-format msgid "" "Offers to store files in both directories so that\n" @@ -2898,12 +2915,12 @@ "Nudi da skladišti fajlove u obe fascikle tako da ispadnu iste posle toga.\n" "Radi samo kada se porede dve fascikle bez zadavanja odredišta." -#: optiondialog.cpp:1283 +#: optiondialog.cpp:1331 #, kde-format msgid "White space differences considered equal" msgstr "Razlike u prazninama smatraju se jednakim" -#: optiondialog.cpp:1287 +#: optiondialog.cpp:1335 #, kde-format msgid "" "If files differ only by white space consider them equal.\n" @@ -2913,12 +2930,12 @@ "Ovo je aktivno samo kada se izabere puna analiza." # >> copy newer file -#: optiondialog.cpp:1293 +#: optiondialog.cpp:1341 #, kde-format msgid "Copy newer instead of merging (unsafe)" msgstr "Kopiraj noviji umesto stapanja (nesigurno)" -#: optiondialog.cpp:1297 +#: optiondialog.cpp:1345 #, fuzzy, kde-format #| msgid "" #| "Don't look inside, just take the newer file.\n" @@ -2933,12 +2950,12 @@ "Koristite ovo samo ako znate šta radite!\n" "Ima efekta samo pri poređenju dve fascikle." -#: optiondialog.cpp:1302 +#: optiondialog.cpp:1350 #, kde-format msgid "Backup files (.orig)" msgstr "Pravi rezerve fajlova (.orig)" -#: optiondialog.cpp:1306 +#: optiondialog.cpp:1354 #, kde-format msgid "" "If a file would be saved over an old file, then the old file\n" @@ -2948,17 +2965,17 @@ "preimenovan sa nastavkom .orig umesto da bude obrisan." # rewrite-msgid: /Regional/Locale/ -#: optiondialog.cpp:1382 optiondialog.cpp:1383 +#: optiondialog.cpp:1430 optiondialog.cpp:1431 #, kde-format msgid "Regional Settings" msgstr "Postavke lokaliteta" -#: optiondialog.cpp:1397 +#: optiondialog.cpp:1454 #, kde-format msgid "Use the same encoding for everything:" msgstr "Isto kodiranje za sve:" -#: optiondialog.cpp:1401 +#: optiondialog.cpp:1458 #, kde-format msgid "" "Enable this allows to change all encodings by changing the first only.\n" @@ -2968,18 +2985,18 @@ "Isključite ovo ako pojedine postavke treba da budu različite." # >! Merge sentence. -#: optiondialog.cpp:1405 +#: optiondialog.cpp:1462 #, fuzzy, kde-format #| msgid "Note: Local Encoding is " msgid "Note: Local Encoding is \"%1\"" msgstr "Napomena: lokalno kodiranje je " -#: optiondialog.cpp:1409 +#: optiondialog.cpp:1466 #, kde-format msgid "File Encoding for A:" msgstr "Kodiranje fajla za A:" -#: optiondialog.cpp:1416 +#: optiondialog.cpp:1473 #, kde-format msgid "" "If enabled then Unicode (UTF-16 or UTF-8) encoding will be detected.\n" @@ -2991,32 +3008,32 @@ "Ako fajl nije Unicode izabrano kodiranje će biti upotrebljeno kao odstupno.\n" "Otkrivanje Unicodea zavisi od prvih bajtova u fajlu." -#: optiondialog.cpp:1419 optiondialog.cpp:1430 optiondialog.cpp:1441 +#: optiondialog.cpp:1476 optiondialog.cpp:1487 optiondialog.cpp:1498 #, kde-format msgid "Auto Detect Unicode" msgstr "Automatski otkrij Unicode" -#: optiondialog.cpp:1425 +#: optiondialog.cpp:1482 #, kde-format msgid "File Encoding for B:" msgstr "Kodiranje fajla za B:" -#: optiondialog.cpp:1436 +#: optiondialog.cpp:1493 #, kde-format msgid "File Encoding for C:" msgstr "Kodiranje fajla za C:" -#: optiondialog.cpp:1447 +#: optiondialog.cpp:1504 #, kde-format msgid "File Encoding for Merge Output and Saving:" msgstr "Kodiranje fajla za stopljeni izlaz i upisivanje:" -#: optiondialog.cpp:1452 +#: optiondialog.cpp:1509 #, kde-format msgid "Auto Select" msgstr "Automatski izaberi" -#: optiondialog.cpp:1456 +#: optiondialog.cpp:1513 #, kde-format msgid "" "If enabled then the encoding from the input files is used.\n" @@ -3027,17 +3044,17 @@ "U dvosmislenim slučajevima izdaje se dijalog gde korisnik bira kodiranje za " "upisivanje." -#: optiondialog.cpp:1459 +#: optiondialog.cpp:1516 #, kde-format msgid "File Encoding for Preprocessor Files:" msgstr "Kodiranje fajla za predobradne fajlove:" -#: optiondialog.cpp:1471 +#: optiondialog.cpp:1528 #, kde-format msgid "Right To Left Language" msgstr "Jezici zdesna ulevo" -#: optiondialog.cpp:1475 +#: optiondialog.cpp:1532 #, kde-format msgid "" "Some languages are read from right to left.\n" @@ -3046,22 +3063,22 @@ "Neki jezici se čitaju zdesna ulevo.\n" "Ova postavka prilagođava tome prikazivač i uređivač." -#: optiondialog.cpp:1485 +#: optiondialog.cpp:1542 #, kde-format msgid "Integration" msgstr "Uklapanje" -#: optiondialog.cpp:1486 +#: optiondialog.cpp:1543 #, kde-format msgid "Integration Settings" msgstr "Postavke uklapanja" -#: optiondialog.cpp:1499 +#: optiondialog.cpp:1564 #, kde-format msgid "Command line options to ignore:" msgstr "Zanemari opcije komandne linije:" -#: optiondialog.cpp:1505 +#: optiondialog.cpp:1570 #, kde-format msgid "" "List of command line options that should be ignored when KDiff3 is used by " @@ -3074,12 +3091,12 @@ "Više vrednosti možete zadati razdvojene tačka-zapetom.\n" "Ovim se suzbija greška „nepoznata opcija“." -#: optiondialog.cpp:1510 +#: optiondialog.cpp:1575 #, kde-format msgid "Quit also via Escape key" msgstr "Napuštanje i preko tastera Esc" -#: optiondialog.cpp:1514 +#: optiondialog.cpp:1579 #, kde-format msgid "" "Fast method to exit.\n" @@ -3088,7 +3105,7 @@ "Brz način napuštanja.\n" "Za one naviknute na taster Esc u ovu svrhu." -#: optiondialog.cpp:1598 +#: optiondialog.cpp:1653 #, kde-format msgid "This resets all options. Not only those of the current topic." msgstr "Ovo resetuje sve opcije, i to ne samo one u tekućoj temi." @@ -3144,85 +3161,77 @@ msgstr "Isključi nesigurne opcije" # >> @info:progress -#: pdiff.cpp:158 +#: pdiff.cpp:160 #, kde-format msgid "Loading A" msgstr "Učitavam A" -#: pdiff.cpp:167 -#, kde-format -msgid "Errors occurred during pre-processing of file A." -msgstr "" +# >> @info:progress +#: pdiff.cpp:162 +#, fuzzy, kde-format +#| msgid "Loading A" +msgid "Loading A: %1" +msgstr "Učitavam A" # >> @info:progress -#: pdiff.cpp:172 +#: pdiff.cpp:170 #, kde-format msgid "Loading B" msgstr "Učitavam B" -#: pdiff.cpp:179 -#, kde-format -msgid "Errors occurred during pre-processing of file B." -msgstr "" - # >> @info:progress -#: pdiff.cpp:202 pdiff.cpp:241 +#: pdiff.cpp:201 pdiff.cpp:237 #, kde-format msgid "Diff: A <-> B" msgstr "Razlikujem A i B" # >> @info:progress -#: pdiff.cpp:208 pdiff.cpp:279 pdiff.cpp:293 +#: pdiff.cpp:207 pdiff.cpp:275 pdiff.cpp:289 #, kde-format msgid "Linediff: A <-> B" msgstr "Razlikujem redove A i B" # >> @info:progress -#: pdiff.cpp:225 +#: pdiff.cpp:224 #, kde-format msgid "Loading C" msgstr "Učitavam C" -#: pdiff.cpp:232 -#, kde-format -msgid "Errors occurred during pre-processing of file C." -msgstr "" - # >> @info:progress -#: pdiff.cpp:250 +#: pdiff.cpp:246 #, kde-format msgid "Diff: A <-> C" msgstr "Razlikujem A i C" # >> @info:progress -#: pdiff.cpp:261 +#: pdiff.cpp:257 #, kde-format msgid "Diff: B <-> C" msgstr "Razlikujem B i C" # >> @info:progress -#: pdiff.cpp:283 pdiff.cpp:297 +#: pdiff.cpp:279 pdiff.cpp:293 #, kde-format msgid "Linediff: B <-> C" msgstr "Razlikujem redove B i C" # >> @info:progress -#: pdiff.cpp:287 pdiff.cpp:301 +#: pdiff.cpp:283 pdiff.cpp:297 #, kde-format msgid "Linediff: A <-> C" msgstr "Razlikujem redove A i C" -#: pdiff.cpp:829 +#: pdiff.cpp:840 #, kde-format msgid "All input files contain the same text, but are not binary equal." msgstr "Svi ulazni fajlovi sadrže isti tekst, ali nisu binarno jednaki." -#: pdiff.cpp:835 pdiff.cpp:839 pdiff.cpp:843 +#: pdiff.cpp:846 pdiff.cpp:850 pdiff.cpp:854 #, kde-format msgid "Files %1 and %2 have equal text, but are not binary equal. \n" msgstr "Fajlovi %1 i %2 imaju isti tekst ali nisu binarno jednaki.\n" -#: pdiff.cpp:853 +#: pdiff.cpp:864 #, fuzzy, kde-format #| msgid "" #| "Some inputfiles don't seem to be pure textfiles.\n" @@ -3237,17 +3246,17 @@ "Imajte na umu da stapanje u KDiff3 nije namenjeno binarnim podacima.\n" "Nastavite na sopstvenu odgovornost." -#: pdiff.cpp:863 +#: pdiff.cpp:874 #, kde-format msgid ", B" msgstr "" -#: pdiff.cpp:865 +#: pdiff.cpp:876 #, kde-format msgid ", C" msgstr "" -#: pdiff.cpp:867 +#: pdiff.cpp:878 #, fuzzy, kde-format #| msgid "" #| "Some input characters could not be converted to valid unicode.\n" @@ -3265,77 +3274,72 @@ "Ne upisujte rezultat ako niste sigurni. Nastavite na sopstvenu odgovornost.\n" "Pogođeni ulazni fajlovi nalaze se u %1." -#: pdiff.cpp:1034 +#: pdiff.cpp:1053 #, kde-format msgid "Abort" msgstr "Obustavi" -#: pdiff.cpp:1040 pdiff.cpp:1130 +#: pdiff.cpp:1059 pdiff.cpp:1150 #, kde-format msgid "Opening files..." msgstr "Otvaram fajlove..." -#: pdiff.cpp:1107 -#, kde-format -msgid "File open error" -msgstr "Greška pri otvaranju fajla" - -#: pdiff.cpp:1202 +#: pdiff.cpp:1222 #, kde-format msgid "Cutting selection..." msgstr "Isecam izabrano..." -#: pdiff.cpp:1223 +#: pdiff.cpp:1243 #, kde-format msgid "Copying selection to clipboard..." msgstr "Kopiram izbor u klipbord..." -#: pdiff.cpp:1239 +#: pdiff.cpp:1259 #, kde-format msgid "Inserting clipboard contents..." msgstr "Umećem sadržaj klipborda..." -#: pdiff.cpp:1695 +#: pdiff.cpp:1715 #, kde-format msgid "Word wrap (Cancel disables word wrap)" msgstr "" -#: pdiff.cpp:1696 +#: pdiff.cpp:1716 #, kde-format msgid "Calculating max width for horizontal scrollbar" msgstr "" -#: pdiff.cpp:1911 +#: pdiff.cpp:1931 #, kde-format msgid "Save && Continue" msgstr "Sačuvaj i nastavi" -#: pdiff.cpp:1912 +#: pdiff.cpp:1932 #, kde-format msgid "Continue Without Saving" msgstr "Nastavi bez upisivanja" -#: pdiff.cpp:2124 +#: pdiff.cpp:2144 #, kde-format msgid "Search complete." msgstr "Pretraga je gotova." -#: pdiff.cpp:2124 +#: pdiff.cpp:2144 #, kde-format msgid "Search Complete" msgstr "Pretraga završena" -#: pdiff.cpp:2375 +#: pdiff.cpp:2395 #, kde-format msgid "Nothing is selected in either diff input window." msgstr "Ništa nije izabrano ni u jednom prozoru ulaza razlike." -#: pdiff.cpp:2375 +#: pdiff.cpp:2395 #, kde-format msgid "Error while adding manual diff range" msgstr "Greška pri dodavanju ručnog opsega razlike" -#: progress.cpp:59 progress.cpp:71 +#: progress.cpp:61 progress.cpp:73 #, kde-format msgid "&Cancel" msgstr "&Odustani" @@ -3345,127 +3349,127 @@ msgid "A (Base):" msgstr "A (baza):" -#: smalldialogs.cpp:68 smalldialogs.cpp:85 smalldialogs.cpp:102 -#: smalldialogs.cpp:144 +#: smalldialogs.cpp:71 smalldialogs.cpp:90 smalldialogs.cpp:109 +#: smalldialogs.cpp:154 #, kde-format msgid "File..." msgstr "Fajl..." -#: smalldialogs.cpp:70 smalldialogs.cpp:87 smalldialogs.cpp:104 -#: smalldialogs.cpp:146 +#: smalldialogs.cpp:73 smalldialogs.cpp:92 smalldialogs.cpp:111 +#: smalldialogs.cpp:156 #, kde-format msgid "Dir..." msgstr "Fascikla..." -#: smalldialogs.cpp:96 +#: smalldialogs.cpp:103 #, kde-format msgid "C (Optional):" msgstr "C (opciono):" -#: smalldialogs.cpp:119 +#: smalldialogs.cpp:126 #, fuzzy, kde-format #| msgid "Swap/Copy Names ..." msgid "Swap/Copy Names..." msgstr "Razmeni/kopiraj imena..." -#: smalldialogs.cpp:124 smalldialogs.cpp:125 smalldialogs.cpp:126 +#: smalldialogs.cpp:131 smalldialogs.cpp:132 smalldialogs.cpp:133 #, kde-format msgid "Swap %1<->%2" msgstr "Razmeni %1 i %2" -#: smalldialogs.cpp:127 smalldialogs.cpp:128 smalldialogs.cpp:129 +#: smalldialogs.cpp:134 smalldialogs.cpp:135 smalldialogs.cpp:136 #, kde-format msgid "Copy %1->Output" msgstr "Kopiraj %1 u izlaz" -#: smalldialogs.cpp:130 smalldialogs.cpp:131 smalldialogs.cpp:132 +#: smalldialogs.cpp:137 smalldialogs.cpp:138 smalldialogs.cpp:139 #, kde-format msgid "Swap %1<->Output" msgstr "Razmeni %1 i izlaz" -#: smalldialogs.cpp:138 +#: smalldialogs.cpp:148 #, kde-format msgid "Output (optional):" msgstr "Izlaz (opciono):" -#: smalldialogs.cpp:168 +#: smalldialogs.cpp:178 #, kde-format msgid "Configure..." msgstr "Podesi..." -#: smalldialogs.cpp:233 +#: smalldialogs.cpp:243 #, fuzzy, kde-format #| msgid "Directory" msgid "Open Directory" msgstr "Fascikla" -#: smalldialogs.cpp:234 +#: smalldialogs.cpp:244 #, kde-format msgid "Select Output File" msgstr "" -#: smalldialogs.cpp:393 +#: smalldialogs.cpp:403 #, kde-format msgid "Search text:" msgstr "Traženi tekst:" -#: smalldialogs.cpp:400 +#: smalldialogs.cpp:410 #, kde-format msgid "Case sensitive" msgstr "Razlikuj veličinu slova" -#: smalldialogs.cpp:403 +#: smalldialogs.cpp:413 #, kde-format msgid "Search A" msgstr "Pretraži A" -#: smalldialogs.cpp:408 +#: smalldialogs.cpp:418 #, kde-format msgid "Search B" msgstr "Pretraži B" -#: smalldialogs.cpp:413 +#: smalldialogs.cpp:423 #, kde-format msgid "Search C" msgstr "Pretraži C" -#: smalldialogs.cpp:418 +#: smalldialogs.cpp:428 #, kde-format msgid "Search output" msgstr "Izlaz pretrage" -#: smalldialogs.cpp:425 +#: smalldialogs.cpp:435 #, kde-format msgid "&Search" msgstr "&Traži" -#: smalldialogs.cpp:444 +#: smalldialogs.cpp:454 #, kde-format msgid "Regular Expression Tester" msgstr "Proba regularnih izraza" -#: smalldialogs.cpp:457 +#: smalldialogs.cpp:467 #, kde-format msgid "Example auto merge line:" msgstr "Primer reda za automatsko stapanje:" -#: smalldialogs.cpp:459 +#: smalldialogs.cpp:469 #, kde-format msgid "To test auto merge, copy a line as used in your files." msgstr "" "Za probu automatskog stapanja, kopirajte red kakav se nalazi u fajlovima." -#: smalldialogs.cpp:465 smalldialogs.cpp:493 smalldialogs.cpp:529 +#: smalldialogs.cpp:475 smalldialogs.cpp:503 smalldialogs.cpp:539 #, kde-format msgid "Match result:" msgstr "Rezultat poklapanja:" -#: smalldialogs.cpp:484 +#: smalldialogs.cpp:494 #, kde-format msgid "Example history start line (with leading comment):" msgstr "Primer početnog reda istorijata (sa vodećim komentarom):" -#: smalldialogs.cpp:486 +#: smalldialogs.cpp:496 #, kde-format msgid "" "Copy a history start line as used in your files,\n" @@ -3474,17 +3478,17 @@ "Kopirajte početni red istorijata kakav se nalazi u fajlovima, uključujući i " "vodeći komentar." -#: smalldialogs.cpp:512 +#: smalldialogs.cpp:522 #, kde-format msgid "History sort key order:" msgstr "Redosled ređanja ključeva istorijata:" -#: smalldialogs.cpp:520 +#: smalldialogs.cpp:530 #, kde-format msgid "Example history entry start line (without leading comment):" msgstr "Primer početnog reda stavke istorijata (bez vodećeg komentara):" -#: smalldialogs.cpp:522 +#: smalldialogs.cpp:532 #, kde-format msgid "" "Copy a history entry start line as used in your files,\n" @@ -3493,48 +3497,48 @@ "Kopirajte početni red stavke istorijata kakav se nalazi u fajlovima, ali " "izostavljajući vodeći komentar." -#: smalldialogs.cpp:536 +#: smalldialogs.cpp:546 #, kde-format msgid "Sort key result:" msgstr "Rezultat ređanja ključeva:" -#: smalldialogs.cpp:584 smalldialogs.cpp:594 smalldialogs.cpp:614 +#: smalldialogs.cpp:594 smalldialogs.cpp:604 smalldialogs.cpp:624 #, kde-format msgid "Match success." msgstr "Poklapanje je uspelo." -#: smalldialogs.cpp:588 smalldialogs.cpp:598 smalldialogs.cpp:620 +#: smalldialogs.cpp:598 smalldialogs.cpp:608 smalldialogs.cpp:630 #, kde-format msgid "Match failed." msgstr "Poklapanje nije uspelo." -#: smalldialogs.cpp:605 +#: smalldialogs.cpp:615 #, kde-format msgid "Opening and closing parentheses do not match in regular expression." msgstr "Ne poklapaju se otvorene i zatvorene zagrade u regularnom izrazu." -#: SourceData.cpp:150 +#: SourceData.cpp:153 #, kde-format msgid "Writing clipboard data to temp file failed." msgstr "Upisivanje podataka iz klipborda u privremeni fajl nije uspelo." -#: SourceData.cpp:154 +#: SourceData.cpp:157 #, kde-format msgid "From Clipboard" msgstr "Iz klipborda" -#: SourceData.cpp:335 +#: SourceData.cpp:348 #, fuzzy, kde-format #| msgid "Mix of links and normal files." msgid "%1 is not a normal file." msgstr "Mešavina veza i normalnih fajlova." -#: SourceData.cpp:427 +#: SourceData.cpp:440 #, kde-format msgid " Temp file is: %1" msgstr "" -#: SourceData.cpp:432 +#: SourceData.cpp:445 #, kde-format msgid "" "Preprocessing possibly failed. Check this command:\n" @@ -3549,12 +3553,12 @@ "\n" "Naredba predobrade će sada biti deaktivirana." -#: SourceData.cpp:443 SourceData.cpp:507 +#: SourceData.cpp:456 SourceData.cpp:525 #, kde-format msgid "File %1 too large to process. Skipping." msgstr "" -#: SourceData.cpp:487 +#: SourceData.cpp:500 #, kde-format msgid "" "The line-matching-preprocessing possibly failed. Check this command:\n" diff -Nru kdiff3-1.8.01/po/sr@latin/kdiff3fileitemactionplugin.po kdiff3-1.8.3/po/sr@latin/kdiff3fileitemactionplugin.po --- kdiff3-1.8.01/po/sr@latin/kdiff3fileitemactionplugin.po 2019-05-18 01:02:27.000000000 +0000 +++ kdiff3-1.8.3/po/sr@latin/kdiff3fileitemactionplugin.po 2020-06-25 00:18:53.000000000 +0000 @@ -3,8 +3,8 @@ msgid "" msgstr "" "Project-Id-Version: kdiff3fileitemactionplugin\n" -"Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2019-03-22 03:09+0100\n" +"Report-Msgid-Bugs-To: https://bugs.kde.org\n" +"POT-Creation-Date: 2019-08-30 07:40+0200\n" "PO-Revision-Date: 2017-09-28 17:57+0200\n" "Last-Translator: Chusslove Illich \n" "Language-Team: Serbian \n" diff -Nru kdiff3-1.8.01/po/sr@latin/kdiff3.po kdiff3-1.8.3/po/sr@latin/kdiff3.po --- kdiff3-1.8.01/po/sr@latin/kdiff3.po 2019-05-18 01:02:27.000000000 +0000 +++ kdiff3-1.8.3/po/sr@latin/kdiff3.po 2020-06-25 00:18:53.000000000 +0000 @@ -4,8 +4,8 @@ msgid "" msgstr "" "Project-Id-Version: kdiff3\n" -"Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2019-03-30 07:52+0100\n" +"Report-Msgid-Bugs-To: https://bugs.kde.org\n" +"POT-Creation-Date: 2020-06-15 06:48+0200\n" "PO-Revision-Date: 2017-09-28 17:57+0200\n" "Last-Translator: Chusslove Illich \n" "Language-Team: Serbian \n" @@ -30,301 +30,301 @@ msgid "Your emails" msgstr "slsimic@gmail.com,caslav.ilic@gmx.net" -#: difftextwindow.cpp:412 +#: difftextwindow.cpp:414 #, kde-format msgid "File %1: Line %2" msgstr "" -#: difftextwindow.cpp:414 +#: difftextwindow.cpp:416 #, fuzzy, kde-format #| msgid "Line not available" msgid "File %1: Line not available" msgstr "red nedostupan" -#: difftextwindow.cpp:1780 +#: difftextwindow.cpp:1778 #, kde-format msgid "Encoding:" msgstr "Kodiranje:" -#: difftextwindow.cpp:1782 mergeresultwindow.cpp:3138 optiondialog.cpp:818 +#: difftextwindow.cpp:1781 mergeresultwindow.cpp:3166 optiondialog.cpp:840 #, kde-format msgid "Line end style:" msgstr "Stil kraja redova:" -#: difftextwindow.cpp:1810 directorymergewindow.cpp:382 -#: directorymergewindow.cpp:433 directorymergewindow.cpp:524 -#: directorymergewindow.cpp:3058 directorymergewindow.cpp:3189 -#: directorymergewindow.cpp:3417 mergeresultwindow.cpp:942 -#: mergeresultwindow.cpp:944 mergeresultwindow.cpp:946 -#: mergeresultwindow.cpp:948 mergeresultwindow.cpp:1814 -#: mergeresultwindow.cpp:3170 mergeresultwindow.cpp:3177 optiondialog.cpp:962 -#: optiondialog.cpp:975 pdiff.cpp:833 pdiff.cpp:835 pdiff.cpp:837 pdiff.cpp:839 -#: pdiff.cpp:861 smalldialogs.cpp:124 smalldialogs.cpp:126 smalldialogs.cpp:127 -#: smalldialogs.cpp:130 +#: difftextwindow.cpp:1809 directorymergewindow.cpp:383 +#: directorymergewindow.cpp:434 directorymergewindow.cpp:525 +#: directorymergewindow.cpp:3069 directorymergewindow.cpp:3200 +#: directorymergewindow.cpp:3428 mergeresultwindow.cpp:970 +#: mergeresultwindow.cpp:972 mergeresultwindow.cpp:974 +#: mergeresultwindow.cpp:976 mergeresultwindow.cpp:1842 +#: mergeresultwindow.cpp:3198 mergeresultwindow.cpp:3205 optiondialog.cpp:1002 +#: optiondialog.cpp:1015 pdiff.cpp:844 pdiff.cpp:846 pdiff.cpp:848 +#: pdiff.cpp:850 pdiff.cpp:872 smalldialogs.cpp:131 smalldialogs.cpp:133 +#: smalldialogs.cpp:134 smalldialogs.cpp:137 #, kde-format msgid "A" msgstr "A" -#: difftextwindow.cpp:1810 directorymergewindow.cpp:384 -#: directorymergewindow.cpp:436 directorymergewindow.cpp:526 -#: directorymergewindow.cpp:3064 directorymergewindow.cpp:3190 -#: directorymergewindow.cpp:3418 mergeresultwindow.cpp:942 -#: mergeresultwindow.cpp:944 mergeresultwindow.cpp:950 -#: mergeresultwindow.cpp:952 mergeresultwindow.cpp:1816 -#: mergeresultwindow.cpp:3172 mergeresultwindow.cpp:3179 optiondialog.cpp:963 -#: optiondialog.cpp:976 pdiff.cpp:833 pdiff.cpp:835 pdiff.cpp:841 pdiff.cpp:843 -#: pdiff.cpp:863 smalldialogs.cpp:124 smalldialogs.cpp:125 smalldialogs.cpp:128 -#: smalldialogs.cpp:131 +#: difftextwindow.cpp:1809 directorymergewindow.cpp:385 +#: directorymergewindow.cpp:437 directorymergewindow.cpp:527 +#: directorymergewindow.cpp:3075 directorymergewindow.cpp:3201 +#: directorymergewindow.cpp:3429 mergeresultwindow.cpp:970 +#: mergeresultwindow.cpp:972 mergeresultwindow.cpp:978 +#: mergeresultwindow.cpp:980 mergeresultwindow.cpp:1844 +#: mergeresultwindow.cpp:3200 mergeresultwindow.cpp:3207 optiondialog.cpp:1003 +#: optiondialog.cpp:1016 pdiff.cpp:844 pdiff.cpp:846 pdiff.cpp:852 +#: pdiff.cpp:854 pdiff.cpp:874 smalldialogs.cpp:131 smalldialogs.cpp:132 +#: smalldialogs.cpp:135 smalldialogs.cpp:138 #, kde-format msgid "B" msgstr "B" -#: difftextwindow.cpp:1810 directorymergewindow.cpp:386 -#: directorymergewindow.cpp:439 directorymergewindow.cpp:528 -#: directorymergewindow.cpp:3070 directorymergewindow.cpp:3191 -#: directorymergewindow.cpp:3419 mergeresultwindow.cpp:946 -#: mergeresultwindow.cpp:948 mergeresultwindow.cpp:950 -#: mergeresultwindow.cpp:952 mergeresultwindow.cpp:1818 -#: mergeresultwindow.cpp:3174 mergeresultwindow.cpp:3181 optiondialog.cpp:977 -#: pdiff.cpp:837 pdiff.cpp:839 pdiff.cpp:841 pdiff.cpp:843 pdiff.cpp:865 -#: smalldialogs.cpp:125 smalldialogs.cpp:126 smalldialogs.cpp:129 -#: smalldialogs.cpp:132 +#: difftextwindow.cpp:1809 directorymergewindow.cpp:387 +#: directorymergewindow.cpp:440 directorymergewindow.cpp:529 +#: directorymergewindow.cpp:3081 directorymergewindow.cpp:3202 +#: directorymergewindow.cpp:3430 mergeresultwindow.cpp:974 +#: mergeresultwindow.cpp:976 mergeresultwindow.cpp:978 +#: mergeresultwindow.cpp:980 mergeresultwindow.cpp:1846 +#: mergeresultwindow.cpp:3202 mergeresultwindow.cpp:3209 optiondialog.cpp:1017 +#: pdiff.cpp:848 pdiff.cpp:850 pdiff.cpp:852 pdiff.cpp:854 pdiff.cpp:876 +#: smalldialogs.cpp:132 smalldialogs.cpp:133 smalldialogs.cpp:136 +#: smalldialogs.cpp:139 #, kde-format msgid "C" msgstr "C" -#: difftextwindow.cpp:1810 +#: difftextwindow.cpp:1809 #, fuzzy, kde-format #| msgid "A (Base):" msgid "A (Base)" msgstr "A (baza):" -#: difftextwindow.cpp:1812 +#: difftextwindow.cpp:1811 #, fuzzy, kde-format #| msgid "Encoding:" msgid "Encoding: %1" msgstr "Kodiranje:" -#: difftextwindow.cpp:1813 mergeresultwindow.cpp:3183 +#: difftextwindow.cpp:1812 mergeresultwindow.cpp:3211 #, kde-format msgid "Unix" msgstr "Unix" -#: difftextwindow.cpp:1813 mergeresultwindow.cpp:3184 +#: difftextwindow.cpp:1812 mergeresultwindow.cpp:3212 #, kde-format msgid "DOS" msgstr "DOS" -#: difftextwindow.cpp:1813 +#: difftextwindow.cpp:1812 #, fuzzy, kde-format #| msgid "Line end style:" msgid "Line end style: %1" msgstr "Stil kraja redova:" # >! Merge whole string. -#: difftextwindow.cpp:1835 kdiff3.cpp:873 +#: difftextwindow.cpp:1834 kdiff3.cpp:874 #, kde-format msgid "Top line" msgstr "Prvi red" -#: difftextwindow.cpp:1845 +#: difftextwindow.cpp:1843 #, kde-format msgid "End" msgstr "Kraj" -#: difftextwindow.cpp:1903 smalldialogs.cpp:235 +#: difftextwindow.cpp:1901 smalldialogs.cpp:245 #, fuzzy, kde-format #| msgid "Opening files..." msgid "Open File" msgstr "Otvaram fajlove..." -#: difftextwindow.cpp:1951 optiondialog.cpp:387 +#: difftextwindow.cpp:1943 optiondialog.cpp:389 #, kde-format msgid "Unicode, 8 bit" msgstr "Unicode, 8‑bitni" -#: difftextwindow.cpp:1966 +#: difftextwindow.cpp:1958 #, kde-format msgid "Other" msgstr "" -#: directorymergewindow.cpp:409 directorymergewindow.cpp:3424 +#: directorymergewindow.cpp:410 directorymergewindow.cpp:3435 #, kde-format msgid "Copy A to B" msgstr "Kopiraj A u B" -#: directorymergewindow.cpp:412 directorymergewindow.cpp:3425 +#: directorymergewindow.cpp:413 directorymergewindow.cpp:3436 #, kde-format msgid "Copy B to A" msgstr "Kopiraj B u A" -#: directorymergewindow.cpp:415 directorymergewindow.cpp:3426 +#: directorymergewindow.cpp:416 directorymergewindow.cpp:3437 #, kde-format msgid "Delete A" msgstr "Obriši A" -#: directorymergewindow.cpp:418 directorymergewindow.cpp:3427 +#: directorymergewindow.cpp:419 directorymergewindow.cpp:3438 #, kde-format msgid "Delete B" msgstr "Obriši B" -#: directorymergewindow.cpp:421 +#: directorymergewindow.cpp:422 #, kde-format msgid "Delete A & B" msgstr "Obriši A i B" -#: directorymergewindow.cpp:424 directorymergewindow.cpp:3429 +#: directorymergewindow.cpp:425 directorymergewindow.cpp:3440 #, kde-format msgid "Merge to A" msgstr "Stopi u A" -#: directorymergewindow.cpp:427 directorymergewindow.cpp:3430 +#: directorymergewindow.cpp:428 directorymergewindow.cpp:3441 #, kde-format msgid "Merge to B" msgstr "Stopi u B" -#: directorymergewindow.cpp:430 +#: directorymergewindow.cpp:431 #, kde-format msgid "Merge to A & B" msgstr "Stopi u A i B" -#: directorymergewindow.cpp:442 directorymergewindow.cpp:3421 +#: directorymergewindow.cpp:443 directorymergewindow.cpp:3432 #, kde-format msgid "Delete (if exists)" msgstr "Obriši (ako postoji)" -#: directorymergewindow.cpp:445 directorymergewindow.cpp:448 -#: directorymergewindow.cpp:3420 optiondialog.cpp:925 smalldialogs.cpp:113 +#: directorymergewindow.cpp:446 directorymergewindow.cpp:449 +#: directorymergewindow.cpp:3431 smalldialogs.cpp:120 #, kde-format msgid "Merge" msgstr "Stopi" -#: directorymergewindow.cpp:445 directorymergewindow.cpp:448 +#: directorymergewindow.cpp:446 directorymergewindow.cpp:449 #, kde-format msgid "Merge (manual)" msgstr "Stopi (ručno)" -#: directorymergewindow.cpp:451 +#: directorymergewindow.cpp:452 #, kde-format msgid "Error: Conflicting File Types" msgstr "Greška: sukobljeni tipovi fajlova." -#: directorymergewindow.cpp:454 +#: directorymergewindow.cpp:455 #, kde-format msgid "Error: Changed and Deleted" msgstr "Greška: izmenjeno i obrisano." -#: directorymergewindow.cpp:457 +#: directorymergewindow.cpp:458 #, kde-format msgid "Error: Dates are equal but files are not." msgstr "Greška: datumi su jednaki ali fajlovi nisu." -#: directorymergewindow.cpp:471 +#: directorymergewindow.cpp:472 #, fuzzy, kde-format #| msgid "Done." msgid "Done" msgstr "Gotovo." -#: directorymergewindow.cpp:473 +#: directorymergewindow.cpp:474 #, kde-format msgid "Error" msgstr "Greška" -#: directorymergewindow.cpp:475 +#: directorymergewindow.cpp:476 #, kde-format msgid "Skipped." msgstr "Preskočeno." -#: directorymergewindow.cpp:477 +#: directorymergewindow.cpp:478 #, kde-format msgid "Not saved." msgstr "Nije sačuvano." -#: directorymergewindow.cpp:479 +#: directorymergewindow.cpp:480 #, kde-format msgid "In progress..." msgstr "U toku..." -#: directorymergewindow.cpp:481 +#: directorymergewindow.cpp:482 #, kde-format msgid "To do." msgstr "Uraditi." # >> @title:column -#: directorymergewindow.cpp:522 +#: directorymergewindow.cpp:523 #, kde-format msgid "Name" msgstr "ime" # >> @title:column -#: directorymergewindow.cpp:530 +#: directorymergewindow.cpp:531 #, kde-format msgid "Operation" msgstr "postupak" # >> @title:column -#: directorymergewindow.cpp:532 +#: directorymergewindow.cpp:533 #, kde-format msgid "Status" msgstr "stanje" # >> @title:column -#: directorymergewindow.cpp:534 +#: directorymergewindow.cpp:535 #, kde-format msgid "Unsolved" msgstr "nerešeno" # >> @title:column -#: directorymergewindow.cpp:536 +#: directorymergewindow.cpp:537 #, kde-format msgid "Solved" msgstr "rešeno" # >> non-whitespace # >> @title:column -#: directorymergewindow.cpp:538 +#: directorymergewindow.cpp:539 #, kde-format msgid "Nonwhite" msgstr "neprazno" # >> whitespace # >> @title:column -#: directorymergewindow.cpp:540 +#: directorymergewindow.cpp:541 #, kde-format msgid "White" msgstr "prazno" -#: directorymergewindow.cpp:674 +#: directorymergewindow.cpp:676 #, kde-format msgid "Unable to compare non-normal file with normal file." msgstr "" -#: directorymergewindow.cpp:688 +#: directorymergewindow.cpp:690 #, kde-format msgid "Mix of links and normal files." msgstr "Mešavina veza i normalnih fajlova." -#: directorymergewindow.cpp:695 +#: directorymergewindow.cpp:697 #, kde-format msgid "Link: " msgstr "Veza: " -#: directorymergewindow.cpp:704 +#: directorymergewindow.cpp:706 #, kde-format msgid "Size. " msgstr "Veličina: " -#: directorymergewindow.cpp:718 directorymergewindow.cpp:728 +#: directorymergewindow.cpp:720 directorymergewindow.cpp:730 #, kde-format msgid "Date & Size: " msgstr "Datum i veličina: " -#: directorymergewindow.cpp:748 +#: directorymergewindow.cpp:751 #, kde-format msgid "Comparing file..." msgstr "Upoređujem fajl..." -#: directorymergewindow.cpp:801 +#: directorymergewindow.cpp:813 #, kde-format msgid "" "You are currently doing a directory merge. Are you sure, you want to abort " @@ -333,48 +333,48 @@ "Trenutno stapate fascikle. Želite li zaista da prekinete stapanje i ponovo " "skenirate fasciklu?" -#: directorymergewindow.cpp:802 kdiff3.cpp:698 kdiff3.cpp:708 kdiff3.cpp:720 -#: mergeresultwindow.cpp:372 pdiff.cpp:1033 pdiff.cpp:1910 pdiff.cpp:1920 +#: directorymergewindow.cpp:814 kdiff3.cpp:697 kdiff3.cpp:707 kdiff3.cpp:719 +#: mergeresultwindow.cpp:400 pdiff.cpp:1052 pdiff.cpp:1930 pdiff.cpp:1940 #, kde-format msgid "Warning" msgstr "Upozorenje" -#: directorymergewindow.cpp:803 directorymergewindow.cpp:3393 +#: directorymergewindow.cpp:815 directorymergewindow.cpp:3404 #, kde-format msgid "Rescan" msgstr "Ponovo skeniraj" -#: directorymergewindow.cpp:804 pdiff.cpp:1035 +#: directorymergewindow.cpp:816 pdiff.cpp:1054 #, kde-format msgid "Continue Merging" msgstr "Nastavi stapanje" -#: directorymergewindow.cpp:971 +#: directorymergewindow.cpp:983 #, kde-format msgid "Opening of directories failed:" msgstr "Otvaranje fascikli nije uspelo:" -#: directorymergewindow.cpp:975 +#: directorymergewindow.cpp:987 #, kde-format msgid "Dir A \"%1\" does not exist or is not a directory.\n" msgstr "Fascikla A „%1“ ne postoji ili nije fascikla.\n" -#: directorymergewindow.cpp:980 +#: directorymergewindow.cpp:992 #, kde-format msgid "Dir B \"%1\" does not exist or is not a directory.\n" msgstr "Fascikla B „%1“ ne postoji ili nije fascikla.\n" -#: directorymergewindow.cpp:985 +#: directorymergewindow.cpp:997 #, kde-format msgid "Dir C \"%1\" does not exist or is not a directory.\n" msgstr "Fascikla C „%1“ ne postoji ili nije fascikla.\n" -#: directorymergewindow.cpp:988 +#: directorymergewindow.cpp:1000 #, kde-format msgid "Directory Open Error" msgstr "Greška pri otvaranju fascikle" -#: directorymergewindow.cpp:996 +#: directorymergewindow.cpp:1008 #, kde-format msgid "" "The destination directory must not be the same as A or B when three " @@ -385,50 +385,50 @@ "fascikle.\n" "Proverite ponovo pre nego što nastavite." -#: directorymergewindow.cpp:998 +#: directorymergewindow.cpp:1010 #, kde-format msgid "Parameter Warning" msgstr "Upozorenje o parametrima" -#: directorymergewindow.cpp:1003 +#: directorymergewindow.cpp:1015 #, kde-format msgid "Scanning directories..." msgstr "Skeniram fascikle..." -#: directorymergewindow.cpp:1029 +#: directorymergewindow.cpp:1041 #, kde-format msgid "Reading Directory A" msgstr "Čitam fasciklu A" -#: directorymergewindow.cpp:1038 +#: directorymergewindow.cpp:1050 #, kde-format msgid "Reading Directory B" msgstr "Čitam fasciklu B" -#: directorymergewindow.cpp:1048 +#: directorymergewindow.cpp:1060 #, kde-format msgid "Reading Directory C" msgstr "Čitam fasciklu C" # >! Merge sentence. -#: directorymergewindow.cpp:1064 +#: directorymergewindow.cpp:1076 #, kde-format msgid "Some subdirectories were not readable in" msgstr "Neke potfascikle nisu bile čitljive u" -#: directorymergewindow.cpp:1069 +#: directorymergewindow.cpp:1081 #, kde-format msgid "Check the permissions of the subdirectories." msgstr "Proverite dozvole potfascikli." -#: directorymergewindow.cpp:1106 kdiff3.cpp:666 kdiff3.cpp:753 kdiff3.cpp:777 -#: kdiff3.cpp:1065 kdiff3.cpp:1086 pdiff.cpp:1116 pdiff.cpp:1170 pdiff.cpp:1218 -#: pdiff.cpp:1234 pdiff.cpp:1277 pdiff.cpp:1301 +#: directorymergewindow.cpp:1118 kdiff3.cpp:665 kdiff3.cpp:752 kdiff3.cpp:776 +#: kdiff3.cpp:1072 kdiff3.cpp:1093 pdiff.cpp:1136 pdiff.cpp:1190 pdiff.cpp:1238 +#: pdiff.cpp:1254 pdiff.cpp:1297 pdiff.cpp:1321 #, kde-format msgid "Ready." msgstr "Spreman." -#: directorymergewindow.cpp:1121 +#: directorymergewindow.cpp:1133 #, kde-format msgid "" "Directory Comparison Status\n" @@ -438,25 +438,25 @@ "Number of different files: %3" msgstr "" -#: directorymergewindow.cpp:1128 +#: directorymergewindow.cpp:1140 #, fuzzy, kde-format #| msgid "Number of manual merges:" msgid "Number of manual merges: %1" msgstr "Broj ručnih stapanja:" -#: directorymergewindow.cpp:1394 +#: directorymergewindow.cpp:1406 #, kde-format msgid "This affects all merge operations." msgstr "Ovo utiče na sve postupke stapanja." # >> @title:window -#: directorymergewindow.cpp:1395 +#: directorymergewindow.cpp:1407 #, kde-format msgid "Changing All Merge Operations" msgstr "Menjanje svih postupaka stapanja" # >! Merge sentence. -#: directorymergewindow.cpp:1695 +#: directorymergewindow.cpp:1707 #, fuzzy, kde-format #| msgid "Processing " msgid "" @@ -464,45 +464,45 @@ "%3" msgstr "Obrađujem " -#: directorymergewindow.cpp:1738 directorymergewindow.cpp:1742 +#: directorymergewindow.cpp:1750 directorymergewindow.cpp:1754 #, kde-format msgid "Some files could not be processed." msgstr "" -#: directorymergewindow.cpp:2222 directorymergewindow.cpp:2247 -#: directorymergewindow.cpp:2271 +#: directorymergewindow.cpp:2234 directorymergewindow.cpp:2259 +#: directorymergewindow.cpp:2283 #, kde-format msgid "This operation is currently not possible." msgstr "Ovaj postupak trenutno nije moguć." -#: directorymergewindow.cpp:2222 directorymergewindow.cpp:2247 -#: directorymergewindow.cpp:2271 directorymergewindow.cpp:2552 +#: directorymergewindow.cpp:2234 directorymergewindow.cpp:2259 +#: directorymergewindow.cpp:2283 directorymergewindow.cpp:2563 #, kde-format msgid "Operation Not Possible" msgstr "Postupak nije moguć" -#: directorymergewindow.cpp:2318 +#: directorymergewindow.cpp:2330 #, fuzzy, kde-format #| msgid "An error occurred while copying.\n" msgid "An error occurred while copying." msgstr "Greška u toku kopiranja.\n" -#: directorymergewindow.cpp:2319 directorymergewindow.cpp:2759 +#: directorymergewindow.cpp:2331 directorymergewindow.cpp:2770 #, kde-format msgid "Merge Error" msgstr "Greška stapanja" -#: directorymergewindow.cpp:2396 +#: directorymergewindow.cpp:2408 #, kde-format msgid "Unknown merge operation. (This must never happen!)" msgstr "Nepoznat postupak stapanja. (Ovo nikada ne sme da se dogodi!)" -#: directorymergewindow.cpp:2441 +#: directorymergewindow.cpp:2453 #, kde-format msgid "Unknown merge operation." msgstr "Nepoznata postupak stapanja." -#: directorymergewindow.cpp:2454 +#: directorymergewindow.cpp:2466 #, kde-format msgid "" "The merge is about to begin.\n" @@ -523,22 +523,22 @@ "GARANCIJA! Napravite rezerve važnih podataka!" # >> @title:window -#: directorymergewindow.cpp:2459 +#: directorymergewindow.cpp:2471 #, kde-format msgid "Starting Merge" msgstr "Početak stapanja" -#: directorymergewindow.cpp:2460 +#: directorymergewindow.cpp:2472 #, kde-format msgid "Do It" msgstr "Uradi" -#: directorymergewindow.cpp:2461 +#: directorymergewindow.cpp:2473 #, kde-format msgid "Simulate It" msgstr "Simuliraj" -#: directorymergewindow.cpp:2487 +#: directorymergewindow.cpp:2499 #, kde-format msgid "" "The highlighted item has a different type in the different directories. " @@ -547,7 +547,7 @@ "Istaknuta stavka ima različit tip u različitim fasciklama. Izaberite šta " "uraditi." -#: directorymergewindow.cpp:2491 +#: directorymergewindow.cpp:2503 #, kde-format msgid "" "The modification dates of the file are equal but the files are not. Select " @@ -555,7 +555,7 @@ msgstr "" "Datumi izmene fajla su jednaki ali fajlovi nisu. Izaberite šta uraditi." -#: directorymergewindow.cpp:2495 +#: directorymergewindow.cpp:2507 #, kde-format msgid "" "The highlighted item was changed in one directory and deleted in the other. " @@ -564,7 +564,7 @@ "Istaknuta stavka je izmenjena u jednoj fascikli a obrisana u drugoj. " "Izaberite šta uraditi." -#: directorymergewindow.cpp:2552 +#: directorymergewindow.cpp:2563 #, kde-format msgid "" "This operation is currently not possible because directory merge is " @@ -572,7 +572,7 @@ msgstr "" "Ovaj postupak trenutno nije moguć zato što je u toku stapanje fascikli." -#: directorymergewindow.cpp:2609 +#: directorymergewindow.cpp:2620 #, kde-format msgid "" "There was an error in the last step.\n" @@ -584,32 +584,32 @@ "preskočite?" # >> @title:window -#: directorymergewindow.cpp:2611 +#: directorymergewindow.cpp:2622 #, kde-format msgid "Continue merge after an error" msgstr "Nastavljanje stapanja posle greške" -#: directorymergewindow.cpp:2612 +#: directorymergewindow.cpp:2623 #, kde-format msgid "Continue With Last Item" msgstr "Nastavi sa poslednjom stavkom" -#: directorymergewindow.cpp:2613 +#: directorymergewindow.cpp:2624 #, kde-format msgid "Skip Item" msgstr "Preskoči stavku" -#: directorymergewindow.cpp:2709 +#: directorymergewindow.cpp:2720 #, kde-format msgid "Merge operation complete." msgstr "Postupak stapanja je završen." -#: directorymergewindow.cpp:2709 directorymergewindow.cpp:2712 +#: directorymergewindow.cpp:2720 directorymergewindow.cpp:2723 #, kde-format msgid "Merge Complete" msgstr "Stapanje završeno" -#: directorymergewindow.cpp:2722 +#: directorymergewindow.cpp:2733 #, kde-format msgid "" "Simulated merge complete: Check if you agree with the proposed operations." @@ -617,50 +617,50 @@ "Simulirano stapanje je završeno: proverite da li vam odgovaraju predloženi " "postupci." -#: directorymergewindow.cpp:2758 +#: directorymergewindow.cpp:2769 #, fuzzy, kde-format #| msgid "An error occurred. Press OK to see detailed information.\n" msgid "An error occurred. Press OK to see detailed information." msgstr "" "Došlo je do greške. Kliknite na „U redu“ da dobijete detaljne informacije.\n" -#: directorymergewindow.cpp:2791 +#: directorymergewindow.cpp:2802 #, kde-format msgid "Error: While deleting %1: Creating backup failed." msgstr "Greška: u toku brisanja %1, pravljenje rezerve nije uspelo." -#: directorymergewindow.cpp:2798 +#: directorymergewindow.cpp:2809 #, kde-format msgid "delete directory recursively( %1 )" msgstr "rekurzivno brisanje fascikle (%1)" -#: directorymergewindow.cpp:2800 +#: directorymergewindow.cpp:2811 #, kde-format msgid "delete( %1 )" msgstr "brisanje (%1)" -#: directorymergewindow.cpp:2815 +#: directorymergewindow.cpp:2826 #, kde-format msgid "Error: delete dir operation failed while trying to read the directory." msgstr "" "Greška: postupak brisanja fascikle nije uspeo na mestu čitanja fascikle." -#: directorymergewindow.cpp:2834 +#: directorymergewindow.cpp:2845 #, kde-format msgid "Error: rmdir( %1 ) operation failed." msgstr "Greška: postupak uklanjanja fascikle (%1) nije uspeo." -#: directorymergewindow.cpp:2844 +#: directorymergewindow.cpp:2855 #, kde-format msgid "Error: delete operation failed." msgstr "Greška: postupak brisanja nije uspeo." -#: directorymergewindow.cpp:2870 +#: directorymergewindow.cpp:2881 #, kde-format msgid "manual merge( %1, %2, %3 -> %4)" msgstr "ručno stapanje (%1, %2, %3 → %4)" -#: directorymergewindow.cpp:2873 +#: directorymergewindow.cpp:2884 #, kde-format msgid "" " Note: After a manual merge the user should continue by pressing F7." @@ -668,193 +668,193 @@ " Napomena: posle ručnog stapanja korisnik treba da nastavi pritiskom na " "F7." -#: directorymergewindow.cpp:2900 +#: directorymergewindow.cpp:2911 #, kde-format msgid "Error: copy( %1 -> %2 ) failed.Deleting existing destination failed." msgstr "" "Greška: kopiranje (%1 → %2) nije uspelo, brisanje postojećeg odredišta nije " "uspelo." -#: directorymergewindow.cpp:2909 +#: directorymergewindow.cpp:2920 #, kde-format msgid "copyLink( %1 -> %2 )" msgstr "kopiranje veze (%1 → %2 )" -#: directorymergewindow.cpp:2918 +#: directorymergewindow.cpp:2929 #, kde-format msgid "Error: copyLink failed: Remote links are not yet supported." msgstr "Greška: kopiranje veze nije uspelo, udaljene veze još nisu podržane." -#: directorymergewindow.cpp:2928 +#: directorymergewindow.cpp:2939 #, kde-format msgid "Error: copyLink failed." msgstr "Greška: kopiranje veze nije uspelo." -#: directorymergewindow.cpp:2953 +#: directorymergewindow.cpp:2964 #, kde-format msgid "copy( %1 -> %2 )" msgstr "kopiranje (%1 → %2)" -#: directorymergewindow.cpp:2979 +#: directorymergewindow.cpp:2990 #, kde-format msgid "Error during rename( %1 -> %2 ): Cannot delete existing destination." msgstr "" "Greška u toku preimenovanja (%1 → %2), postojeće odredište ne može da se " "obriše." -#: directorymergewindow.cpp:2986 +#: directorymergewindow.cpp:2997 #, kde-format msgid "rename( %1 -> %2 )" msgstr "preimenovanje (%1 → %2)" -#: directorymergewindow.cpp:2995 +#: directorymergewindow.cpp:3006 #, kde-format msgid "Error: Rename failed." msgstr "Greška: preimenovanje nije uspelo." -#: directorymergewindow.cpp:3013 +#: directorymergewindow.cpp:3024 #, kde-format msgid "Error during makeDir of %1. Cannot delete existing file." msgstr "" "Greška u toku pravljenja fascikle (%1), postojeći fajl ne može da se obriše." -#: directorymergewindow.cpp:3030 +#: directorymergewindow.cpp:3041 #, kde-format msgid "makeDir( %1 )" msgstr "pravljenje fascikle (%1)" -#: directorymergewindow.cpp:3040 +#: directorymergewindow.cpp:3051 #, kde-format msgid "Error while creating directory." msgstr "Greška u toku pravljenja fascikle." -#: directorymergewindow.cpp:3076 directorymergewindow.cpp:3195 +#: directorymergewindow.cpp:3087 directorymergewindow.cpp:3206 #, kde-format msgid "Dest" msgstr "Odredište" # >> @title:column -#: directorymergewindow.cpp:3084 directorymergewindow.cpp:3113 +#: directorymergewindow.cpp:3095 directorymergewindow.cpp:3124 #, kde-format msgid "Dir" msgstr "fascikla" # >> @title:column -#: directorymergewindow.cpp:3084 +#: directorymergewindow.cpp:3095 #, kde-format msgid "Type" msgstr "tip" # >> @title:column -#: directorymergewindow.cpp:3084 +#: directorymergewindow.cpp:3095 #, kde-format msgid "Size" msgstr "veličina" # >> @title:column -#: directorymergewindow.cpp:3085 +#: directorymergewindow.cpp:3096 #, kde-format msgid "Attr" msgstr "atributi" # >> @title:column -#: directorymergewindow.cpp:3085 +#: directorymergewindow.cpp:3096 #, kde-format msgid "Last Modification" msgstr "poslednja izmena" # >> @title:column -#: directorymergewindow.cpp:3085 +#: directorymergewindow.cpp:3096 #, kde-format msgid "Link-Destination" msgstr "odredište veze" # >! Merge whole string. # >> @item:intext -#: directorymergewindow.cpp:3113 +#: directorymergewindow.cpp:3124 #, kde-format msgid "File" msgstr "fajl" -#: directorymergewindow.cpp:3113 +#: directorymergewindow.cpp:3124 #, fuzzy, kde-format #| msgid "Link: " msgid "-Link" msgstr "Veza: " -#: directorymergewindow.cpp:3119 +#: directorymergewindow.cpp:3130 #, kde-format msgid "not available" msgstr "nedostupno" -#: directorymergewindow.cpp:3137 +#: directorymergewindow.cpp:3148 #, kde-format msgid "A (Dest): " msgstr "A (odredište): " -#: directorymergewindow.cpp:3141 +#: directorymergewindow.cpp:3152 #, kde-format msgid "A: " msgstr "" -#: directorymergewindow.cpp:3141 +#: directorymergewindow.cpp:3152 #, kde-format msgid "A (Base): " msgstr "A (baza): " -#: directorymergewindow.cpp:3147 +#: directorymergewindow.cpp:3158 #, kde-format msgid "B (Dest): " msgstr "B (odredište): " -#: directorymergewindow.cpp:3151 +#: directorymergewindow.cpp:3162 #, kde-format msgid "B: " msgstr "" -#: directorymergewindow.cpp:3156 +#: directorymergewindow.cpp:3167 #, kde-format msgid "C (Dest): " msgstr "C (odredište): " -#: directorymergewindow.cpp:3160 +#: directorymergewindow.cpp:3171 #, kde-format msgid "C: " msgstr "" -#: directorymergewindow.cpp:3163 +#: directorymergewindow.cpp:3174 #, kde-format msgid "Dest: " msgstr "Odredište: " # >> @title:window #. i18n("Saving Directory Merge State ...")); -#: directorymergewindow.cpp:3238 +#: directorymergewindow.cpp:3249 #, kde-format msgid "Save Directory Merge State As..." msgstr "Upisivanje stanja stapanja fascikli kao..." -#: directorymergewindow.cpp:3387 +#: directorymergewindow.cpp:3398 #, kde-format msgid "Start/Continue Directory Merge" msgstr "Pokreni/nastavi stapanje fascikli" -#: directorymergewindow.cpp:3388 +#: directorymergewindow.cpp:3399 #, kde-format msgid "Run Operation for Current Item" msgstr "Izvrši postupak za tekuću stavku" -#: directorymergewindow.cpp:3389 +#: directorymergewindow.cpp:3400 #, kde-format msgid "Compare Selected File" msgstr "Uporedi izabrani fajl" -#: directorymergewindow.cpp:3390 +#: directorymergewindow.cpp:3401 #, kde-format msgid "Merge Current File" msgstr "Stopi tekući fajl" -#: directorymergewindow.cpp:3390 +#: directorymergewindow.cpp:3401 #, kde-format msgid "" "Merge\n" @@ -863,51 +863,51 @@ "Stopi\n" "fajl" -#: directorymergewindow.cpp:3391 +#: directorymergewindow.cpp:3402 #, kde-format msgid "Fold All Subdirs" msgstr "Sažmi sve potfascikle" -#: directorymergewindow.cpp:3392 +#: directorymergewindow.cpp:3403 #, kde-format msgid "Unfold All Subdirs" msgstr "Raširi sve potfascikle" #. i18n("Save Directory Merge State ..."), 0, this, &DirectoryMergeWindow::slotSaveMergeState, ac, "dir_save_merge_state"); #. i18n("Load Directory Merge State ..."), 0, this, &DirectoryMergeWindow::slotLoadMergeState, ac, "dir_load_merge_state"); -#: directorymergewindow.cpp:3396 +#: directorymergewindow.cpp:3407 #, kde-format msgid "Choose A for All Items" msgstr "Izaberi A za sve stavke" -#: directorymergewindow.cpp:3397 +#: directorymergewindow.cpp:3408 #, kde-format msgid "Choose B for All Items" msgstr "Izaberi B za sve stavke" -#: directorymergewindow.cpp:3398 +#: directorymergewindow.cpp:3409 #, kde-format msgid "Choose C for All Items" msgstr "Izaberi C za sve stavke" -#: directorymergewindow.cpp:3399 +#: directorymergewindow.cpp:3410 #, kde-format msgid "Auto-Choose Operation for All Items" msgstr "Automatski izaberi postupak za sve stavke" -#: directorymergewindow.cpp:3400 +#: directorymergewindow.cpp:3411 #, kde-format msgid "No Operation for All Items" msgstr "Nema postupka za sve stavke" #. i18n("Synchronize Directories"), 0, this, &DirectoryMergeWindow::slotSynchronizeDirectories, ac, "dir_synchronize_directories"); #. d->m_pDirChooseNewerFiles = GuiUtils::createAction< KToggleAction >(i18n("Copy Newer Files Instead of Merging"), 0, this, &DirectoryMergeWindow::slotChooseNewerFiles, ac, "dir_choose_newer_files"); -#: directorymergewindow.cpp:3405 +#: directorymergewindow.cpp:3416 #, kde-format msgid "Show Identical Files" msgstr "Prikaži istovetne fajlove" -#: directorymergewindow.cpp:3405 +#: directorymergewindow.cpp:3416 #, kde-format msgid "" "Identical\n" @@ -916,17 +916,17 @@ "Istovetni\n" "fajlovi" -#: directorymergewindow.cpp:3406 +#: directorymergewindow.cpp:3417 #, kde-format msgid "Show Different Files" msgstr "Prikaži različite fajlove" -#: directorymergewindow.cpp:3407 +#: directorymergewindow.cpp:3418 #, kde-format msgid "Show Files only in A" msgstr "Prikaži fajlove samo u A" -#: directorymergewindow.cpp:3407 +#: directorymergewindow.cpp:3418 #, kde-format msgid "" "Files\n" @@ -935,12 +935,12 @@ "Fajlovi\n" "samo u A" -#: directorymergewindow.cpp:3408 +#: directorymergewindow.cpp:3419 #, kde-format msgid "Show Files only in B" msgstr "Prikaži fajlove samo u B" -#: directorymergewindow.cpp:3408 +#: directorymergewindow.cpp:3419 #, kde-format msgid "" "Files\n" @@ -949,12 +949,12 @@ "Fajlovi\n" "samo u B" -#: directorymergewindow.cpp:3409 +#: directorymergewindow.cpp:3420 #, kde-format msgid "Show Files only in C" msgstr "Prikaži fajlove samo u C" -#: directorymergewindow.cpp:3409 +#: directorymergewindow.cpp:3420 #, kde-format msgid "" "Files\n" @@ -963,55 +963,60 @@ "Fajlovi\n" "samo u C" -#: directorymergewindow.cpp:3413 +#: directorymergewindow.cpp:3424 #, kde-format msgid "Compare Explicitly Selected Files" msgstr "Uporedi izričito izabrane fajlove" -#: directorymergewindow.cpp:3414 +#: directorymergewindow.cpp:3425 #, kde-format msgid "Merge Explicitly Selected Files" msgstr "Stopi izričito izabrane fajlove" -#: directorymergewindow.cpp:3416 directorymergewindow.cpp:3423 +#: directorymergewindow.cpp:3427 directorymergewindow.cpp:3434 #, kde-format msgid "Do Nothing" msgstr "Ne radi ništa" -#: directorymergewindow.cpp:3428 +#: directorymergewindow.cpp:3439 #, kde-format msgid "Delete A && B" msgstr "Obriši A i B" -#: directorymergewindow.cpp:3431 +#: directorymergewindow.cpp:3442 #, kde-format msgid "Merge to A && B" msgstr "Stopi u A i B" -#: fileaccess.cpp:462 SourceData.cpp:493 +#: fileaccess.cpp:301 +#, kde-format +msgid "Unable to determine full url. No parent specified." +msgstr "" + +#: fileaccess.cpp:482 SourceData.cpp:506 #, fuzzy, kde-format #| msgid "Reading file: %1" msgid "Failed to read file: %1" msgstr "Čitam fajl: %1" -#: fileaccess.cpp:587 +#: fileaccess.cpp:624 #, kde-format msgid "Creating temp copy of %1 failed." msgstr "Pravljenje privremene kopije fajla %1 nije uspelo." -#: fileaccess.cpp:595 fileaccess.cpp:600 +#: fileaccess.cpp:632 fileaccess.cpp:637 #, fuzzy, kde-format #| msgid "Opening %1 failed." msgid "Opening %1 failed. %2" msgstr "Otvaranje fajla %1 nije uspelo." -#: fileaccess.cpp:619 fileaccess.cpp:627 +#: fileaccess.cpp:656 fileaccess.cpp:664 #, fuzzy, kde-format #| msgid "Error reading from %1" msgid "Error reading from %1. %2" msgstr "Greška pri čitanju iz %1" -#: fileaccess.cpp:751 +#: fileaccess.cpp:788 #, fuzzy, kde-format #| msgid "" #| "While trying to make a backup, deleting an older backup failed. \n" @@ -1023,7 +1028,7 @@ "Pri pokušaju pravljenja rezerve, brisanje starije rezerve nije uspelo.\n" "Ime fajla: " -#: fileaccess.cpp:758 +#: fileaccess.cpp:795 #, fuzzy, kde-format #| msgid "" #| "While trying to make a backup, renaming failed. \n" @@ -1035,190 +1040,190 @@ "Pri pokušaju pravljenja rezerve, preimenovanje nije uspelo.\n" "Imena fajlova: " -#: fileaccess.cpp:828 +#: fileaccess.cpp:865 #, kde-format msgid "Getting file status: %1" msgstr "Dobavljam stanje fajla: %1" -#: fileaccess.cpp:869 +#: fileaccess.cpp:906 #, kde-format msgid "Reading file: %1" msgstr "Čitam fajl: %1" -#: fileaccess.cpp:907 +#: fileaccess.cpp:944 #, kde-format msgid "Writing file: %1" msgstr "Pišem fajl: %1" -#: fileaccess.cpp:940 +#: fileaccess.cpp:977 #, kde-format msgid "Out of memory" msgstr "Nema više memorije" -#: fileaccess.cpp:976 +#: fileaccess.cpp:1013 #, kde-format msgid "Making directory: %1" msgstr "Pravim fasciklu: %1" -#: fileaccess.cpp:997 +#: fileaccess.cpp:1034 #, kde-format msgid "Removing directory: %1" msgstr "Uklanjam fasciklu: %1" -#: fileaccess.cpp:1012 +#: fileaccess.cpp:1049 #, kde-format msgid "Removing file: %1" msgstr "Uklanjam fajl: %1" -#: fileaccess.cpp:1028 +#: fileaccess.cpp:1065 #, kde-format msgid "Creating symbolic link: %1 -> %2" msgstr "Pravim simboličku vezu: %1 → %2" -#: fileaccess.cpp:1052 +#: fileaccess.cpp:1089 #, kde-format msgid "Renaming file: %1 -> %2" msgstr "Preimenujem fajl: %1 → %2" -#: fileaccess.cpp:1086 +#: fileaccess.cpp:1123 #, kde-format msgid "Copying file: %1 -> %2" msgstr "Kopiram fajl: %1 → %2" -#: fileaccess.cpp:1108 +#: fileaccess.cpp:1145 #, fuzzy, kde-format #| msgid "Reading directory: " msgid "Reading directory: %1" msgstr "Čitam fasciklu: " -#: fileaccess.cpp:1162 +#: fileaccess.cpp:1202 #, kde-format msgid "Listing directory: %1" msgstr "Listam fasciklu: %1" -#: kdiff3.cpp:181 +#: kdiff3.cpp:182 #, kde-format msgid "Current Configuration:" msgstr "Trenutna postava:" -#: kdiff3.cpp:186 +#: kdiff3.cpp:187 #, kde-format msgid "Config Option Error:" msgstr "Greška postavne opcije:" -#: kdiff3.cpp:240 +#: kdiff3.cpp:246 #, kde-format msgid "Option --auto used, but no output file specified." msgstr "Opcija --auto je upotrebljena, ali nije naveden izlazni fajl." -#: kdiff3.cpp:416 +#: kdiff3.cpp:405 #, kde-format msgid "Option --auto ignored for directory comparison." msgstr "Opcija --auto se ignoriše za poređenje fascikli." -#: kdiff3.cpp:460 +#: kdiff3.cpp:449 #, kde-format msgid "Saving failed." msgstr "Upisivanje nije uspelo." -#: kdiff3.cpp:496 pdiff.cpp:1098 +#: kdiff3.cpp:494 pdiff.cpp:395 pdiff.cpp:1117 #, kde-format msgid "Opening of these files failed:" msgstr "Otvaranje ovih fajlova nije uspelo:" -#: kdiff3.cpp:505 +#: kdiff3.cpp:503 pdiff.cpp:404 pdiff.cpp:1126 #, kde-format -msgid "File Open Error" +msgid "File open error" msgstr "Greška pri otvaranju fajla" # >> @info:tooltip -#: kdiff3.cpp:533 +#: kdiff3.cpp:532 #, kde-format msgid "Opens documents for comparison..." msgstr "Otvara dokumente za poređenje." -#: kdiff3.cpp:535 +#: kdiff3.cpp:534 #, kde-format msgid "Reload" msgstr "Učitaj ponovo" # >> @info:tooltip -#: kdiff3.cpp:538 +#: kdiff3.cpp:537 #, kde-format msgid "Saves the merge result. All conflicts must be solved!" msgstr "Upisuje rezultat stapanja. Svi sukobi moraju biti razrešeni." # >> @info:tooltip -#: kdiff3.cpp:540 +#: kdiff3.cpp:539 #, kde-format msgid "Saves the current document as..." msgstr "Upisuje tekuće dokumente pod imenom." # >> @info:tooltip -#: kdiff3.cpp:543 +#: kdiff3.cpp:542 #, kde-format msgid "Print the differences" msgstr "Štampa razlike." # >> @info:tooltip -#: kdiff3.cpp:546 +#: kdiff3.cpp:545 #, kde-format msgid "Quits the application" msgstr "Napušta program." # >> @info:tooltip -#: kdiff3.cpp:549 +#: kdiff3.cpp:548 #, kde-format msgid "Cuts the selected section and puts it to the clipboard" msgstr "Iseca izabrani odeljak i stavlja ga u klipbord." # >> @info:tooltip -#: kdiff3.cpp:552 +#: kdiff3.cpp:551 #, kde-format msgid "Copies the selected section to the clipboard" msgstr "Kopira izabrani odeljak u klipbord." # >> @info:tooltip -#: kdiff3.cpp:554 +#: kdiff3.cpp:553 #, kde-format msgid "Pastes the clipboard contents to current position" msgstr "Nalepljuje sadržaj klipborda na trenutnom položaju." # >> @info:tooltip -#: kdiff3.cpp:557 +#: kdiff3.cpp:556 #, kde-format msgid "Select everything in current window" msgstr "Izabira sve u tekućem prozoru." # >> @info:tooltip -#: kdiff3.cpp:560 +#: kdiff3.cpp:559 #, kde-format msgid "Search for a string" msgstr "Traži nisku." # >> @info:tooltip -#: kdiff3.cpp:562 +#: kdiff3.cpp:561 #, kde-format msgid "Search again for the string" msgstr "Ponovo traži nisku." # >> @info:tooltip -#: kdiff3.cpp:567 +#: kdiff3.cpp:566 #, kde-format msgid "Enables/disables the statusbar" msgstr "Uključuje/isključuje traku stanja." -#: kdiff3.cpp:571 +#: kdiff3.cpp:570 #, kde-format msgid "Configure KDiff3..." msgstr "Podesi KDiff3..." -#: kdiff3.cpp:590 +#: kdiff3.cpp:589 #, kde-format msgid "Go to Current Delta" msgstr "Idi na tekuću deltu" -#: kdiff3.cpp:590 +#: kdiff3.cpp:589 #, kde-format msgid "" "Current\n" @@ -1227,12 +1232,12 @@ "Tekuća\n" "delta" -#: kdiff3.cpp:592 +#: kdiff3.cpp:591 #, kde-format msgid "Go to First Delta" msgstr "Idi na prvu deltu" -#: kdiff3.cpp:592 +#: kdiff3.cpp:591 #, kde-format msgid "" "First\n" @@ -1241,12 +1246,12 @@ "Prva\n" "delta" -#: kdiff3.cpp:594 +#: kdiff3.cpp:593 #, kde-format msgid "Go to Last Delta" msgstr "Idi na poslednju deltu" -#: kdiff3.cpp:594 +#: kdiff3.cpp:593 #, kde-format msgid "" "Last\n" @@ -1255,12 +1260,12 @@ "Poslednja\n" "delta" -#: kdiff3.cpp:596 +#: kdiff3.cpp:595 #, kde-format msgid "(Skips white space differences when \"Show White Space\" is disabled.)" msgstr "(Preskače razlike u prazninama ako je „Prikaži praznine“ isključeno.)" -#: kdiff3.cpp:597 +#: kdiff3.cpp:596 #, kde-format msgid "" "(Does not skip white space differences even when \"Show White Space\" is " @@ -1268,12 +1273,12 @@ msgstr "" "(Ne preskače razlike prazninama ni kada je „Prikaži praznine“ isključeno.)" -#: kdiff3.cpp:598 +#: kdiff3.cpp:597 #, kde-format msgid "Go to Previous Delta" msgstr "Idi na prethodnu deltu" -#: kdiff3.cpp:598 +#: kdiff3.cpp:597 #, kde-format msgid "" "Prev\n" @@ -1282,12 +1287,12 @@ "Prethodna\n" "delta" -#: kdiff3.cpp:600 +#: kdiff3.cpp:599 #, kde-format msgid "Go to Next Delta" msgstr "Idi na sledeću deltu" -#: kdiff3.cpp:600 +#: kdiff3.cpp:599 #, kde-format msgid "" "Next\n" @@ -1296,12 +1301,12 @@ "Sledeća\n" "delta" -#: kdiff3.cpp:602 +#: kdiff3.cpp:601 #, kde-format msgid "Go to Previous Conflict" msgstr "Idi na prethodni sukob" -#: kdiff3.cpp:602 +#: kdiff3.cpp:601 #, kde-format msgid "" "Prev\n" @@ -1310,12 +1315,12 @@ "Prethodni\n" "sukob" -#: kdiff3.cpp:604 +#: kdiff3.cpp:603 #, kde-format msgid "Go to Next Conflict" msgstr "Idi na sledeći sukob" -#: kdiff3.cpp:604 +#: kdiff3.cpp:603 #, kde-format msgid "" "Next\n" @@ -1324,12 +1329,12 @@ "Sledeći\n" "sukob" -#: kdiff3.cpp:606 +#: kdiff3.cpp:605 #, kde-format msgid "Go to Previous Unsolved Conflict" msgstr "Idi na prethodni nerešeni sukob" -#: kdiff3.cpp:606 +#: kdiff3.cpp:605 #, kde-format msgid "" "Prev\n" @@ -1338,12 +1343,12 @@ "Prethodni\n" "nerešeni" -#: kdiff3.cpp:608 +#: kdiff3.cpp:607 #, kde-format msgid "Go to Next Unsolved Conflict" msgstr "Idi na sledeći nerešeni sukob" -#: kdiff3.cpp:608 +#: kdiff3.cpp:607 #, kde-format msgid "" "Next\n" @@ -1352,12 +1357,12 @@ "Sledeći\n" "nerešeni" -#: kdiff3.cpp:610 +#: kdiff3.cpp:609 #, kde-format msgid "Select Line(s) From A" msgstr "Izaberite redove iz A" -#: kdiff3.cpp:610 +#: kdiff3.cpp:609 #, kde-format msgid "" "Choose\n" @@ -1366,12 +1371,12 @@ "Izaberite\n" "A" -#: kdiff3.cpp:611 +#: kdiff3.cpp:610 #, kde-format msgid "Select Line(s) From B" msgstr "Izaberite redove iz B" -#: kdiff3.cpp:611 +#: kdiff3.cpp:610 #, kde-format msgid "" "Choose\n" @@ -1380,12 +1385,12 @@ "Izaberite\n" "B" -#: kdiff3.cpp:612 +#: kdiff3.cpp:611 #, kde-format msgid "Select Line(s) From C" msgstr "Izaberite redove iz C" -#: kdiff3.cpp:612 +#: kdiff3.cpp:611 #, kde-format msgid "" "Choose\n" @@ -1394,12 +1399,12 @@ "Izaberite\n" "C" -#: kdiff3.cpp:613 +#: kdiff3.cpp:612 #, kde-format msgid "Automatically Go to Next Unsolved Conflict After Source Selection" msgstr "Automatski idi na sledeći nerešeni sukob posle izbora izvora" -#: kdiff3.cpp:613 +#: kdiff3.cpp:612 #, kde-format msgid "" "Auto\n" @@ -1408,13 +1413,13 @@ "Automatski\n" "sledeći" -#: kdiff3.cpp:615 +#: kdiff3.cpp:614 #, fuzzy, kde-format #| msgid "Show Space && Tabulator Characters for Differences" msgid "Show Space && Tabulator Characters" msgstr "Prikaži znakove razmaka i tabulatora za razlike" -#: kdiff3.cpp:615 +#: kdiff3.cpp:614 #, kde-format msgid "" "White\n" @@ -1423,12 +1428,12 @@ "Znakovi\n" "praznina" -#: kdiff3.cpp:616 +#: kdiff3.cpp:615 #, kde-format msgid "Show White Space" msgstr "Prikaži praznine" -#: kdiff3.cpp:616 +#: kdiff3.cpp:615 #, kde-format msgid "" "White\n" @@ -1437,12 +1442,12 @@ "Delte\n" "praznina" -#: kdiff3.cpp:618 +#: kdiff3.cpp:617 #, kde-format msgid "Show Line Numbers" msgstr "Prikaži brojeve redova" -#: kdiff3.cpp:618 +#: kdiff3.cpp:617 #, kde-format msgid "" "Line\n" @@ -1451,196 +1456,196 @@ "Brojevi\n" "redova" -#: kdiff3.cpp:620 +#: kdiff3.cpp:619 #, kde-format msgid "Automatically Solve Simple Conflicts" msgstr "Automatski reši jednostavne sukobe" -#: kdiff3.cpp:621 +#: kdiff3.cpp:620 #, kde-format msgid "Set Deltas to Conflicts" msgstr "Postavi delte na sukobe" -#: kdiff3.cpp:622 +#: kdiff3.cpp:621 #, kde-format msgid "Run Regular Expression Auto Merge" msgstr "Automatski stopi po regularnim izrazima" -#: kdiff3.cpp:623 +#: kdiff3.cpp:622 #, kde-format msgid "Automatically Solve History Conflicts" msgstr "Automatski reši sukobe istorijata" -#: kdiff3.cpp:624 +#: kdiff3.cpp:623 #, kde-format msgid "Split Diff At Selection" msgstr "Podeli razliku na izboru" -#: kdiff3.cpp:625 +#: kdiff3.cpp:624 #, kde-format msgid "Join Selected Diffs" msgstr "Spoji izabrane razlike" -#: kdiff3.cpp:627 +#: kdiff3.cpp:626 #, kde-format msgid "Show Window A" msgstr "Prikaži prozor A" -#: kdiff3.cpp:628 +#: kdiff3.cpp:627 #, kde-format msgid "Show Window B" msgstr "Prikaži prozor B" -#: kdiff3.cpp:629 +#: kdiff3.cpp:628 #, kde-format msgid "Show Window C" msgstr "Prikaži prozor C" -#: kdiff3.cpp:631 +#: kdiff3.cpp:630 #, kde-format msgid "Normal Overview" msgstr "Normalan pregled" -#: kdiff3.cpp:632 +#: kdiff3.cpp:631 #, kde-format msgid "A vs. B Overview" msgstr "Pregled A prema B" -#: kdiff3.cpp:633 +#: kdiff3.cpp:632 #, kde-format msgid "A vs. C Overview" msgstr "Pregled A prema C" -#: kdiff3.cpp:634 +#: kdiff3.cpp:633 #, kde-format msgid "B vs. C Overview" msgstr "Pregled B prema C" -#: kdiff3.cpp:635 +#: kdiff3.cpp:634 #, kde-format msgid "Word Wrap Diff Windows" msgstr "Prelom reči u prozorima razlika" -#: kdiff3.cpp:636 +#: kdiff3.cpp:635 #, kde-format msgid "Add Manual Diff Alignment" msgstr "Dodaj ručno poravnanje razlika" -#: kdiff3.cpp:637 +#: kdiff3.cpp:636 #, kde-format msgid "Clear All Manual Diff Alignments" msgstr "Očisti sva ručna poravnanja razlika" -#: kdiff3.cpp:639 +#: kdiff3.cpp:638 #, kde-format msgid "Focus Next Window" msgstr "Fokusiraj sledeći prozor" -#: kdiff3.cpp:640 +#: kdiff3.cpp:639 #, kde-format msgid "Focus Prev Window" msgstr "Fokusiraj prethodni prozor" -#: kdiff3.cpp:641 +#: kdiff3.cpp:640 #, kde-format msgid "Toggle Split Orientation" msgstr "Prebaci orijentaciju podele" -#: kdiff3.cpp:643 +#: kdiff3.cpp:642 #, kde-format msgid "Dir && Text Split Screen View" msgstr "Podeljeni prikaz ekrana na fasciklu i tekst" -#: kdiff3.cpp:645 +#: kdiff3.cpp:644 #, kde-format msgid "Toggle Between Dir && Text View" msgstr "Prebaci prikaz fascikle i teksta" -#: kdiff3.cpp:697 pdiff.cpp:1909 +#: kdiff3.cpp:696 pdiff.cpp:1929 #, fuzzy, kde-format #| msgid "The merge result hasn't been saved." msgid "The merge result has not been saved." msgstr "Rezultat stapanja nije sačuvan." -#: kdiff3.cpp:699 +#: kdiff3.cpp:698 #, kde-format msgid "Save && Quit" msgstr "Sačuvaj i napusti" -#: kdiff3.cpp:700 +#: kdiff3.cpp:699 #, kde-format msgid "Quit Without Saving" msgstr "Napusti bez upisivanja" -#: kdiff3.cpp:708 pdiff.cpp:1920 +#: kdiff3.cpp:707 pdiff.cpp:1940 #, kde-format msgid "Saving the merge result failed." msgstr "Upisivanje rezultata stapanja nije uspelo." -#: kdiff3.cpp:719 pdiff.cpp:1032 +#: kdiff3.cpp:718 pdiff.cpp:1051 #, kde-format msgid "" "You are currently doing a directory merge. Are you sure, you want to abort?" msgstr "Trenutno stapate fascikle. Želite li zaista da obustavite ovo?" -#: kdiff3.cpp:742 +#: kdiff3.cpp:741 #, kde-format msgid "Saving file..." msgstr "Upisujem fajl..." -#: kdiff3.cpp:759 +#: kdiff3.cpp:758 #, kde-format msgid "Saving file with a new filename..." msgstr "Upisujem fajl pod novim imenom..." # >> @title:window -#: kdiff3.cpp:761 +#: kdiff3.cpp:760 #, kde-format msgid "Save As..." msgstr "Upisivanje kao" -#: kdiff3.cpp:820 +#: kdiff3.cpp:819 #, kde-format msgid "Printing not implemented." msgstr "Štampanje nije izvedeno." -#: kdiff3.cpp:857 +#: kdiff3.cpp:858 #, kde-format msgid "Printing..." msgstr "Štampam..." -#: kdiff3.cpp:943 +#: kdiff3.cpp:948 #, kde-format msgid "Printing page %1 of %2" msgstr "" -#: kdiff3.cpp:1000 +#: kdiff3.cpp:1006 #, fuzzy, kde-format #| msgid "Selection" msgid " (Selection)" msgstr "Izbor" -#: kdiff3.cpp:1027 +#: kdiff3.cpp:1034 #, kde-format msgid "Printing completed." msgstr "Štampanje završeno." -#: kdiff3.cpp:1031 +#: kdiff3.cpp:1038 #, kde-format msgid "Printing aborted." msgstr "Štampanje obustavljeno." -#: kdiff3.cpp:1038 +#: kdiff3.cpp:1045 #, kde-format msgid "Exiting..." msgstr "Napuštam..." -#: kdiff3.cpp:1049 +#: kdiff3.cpp:1056 #, kde-format msgid "Toggling toolbar..." msgstr "Prebacujem traku alatki..." -#: kdiff3.cpp:1070 +#: kdiff3.cpp:1077 #, kde-format msgid "Toggle the statusbar..." msgstr "Prebacujem traku stanja..." @@ -1666,7 +1671,7 @@ msgid "Joachim Eibl" msgstr "Joahim Ajbl" -#: kdiff3_part.cpp:173 kdiff3_part.cpp:254 +#: kdiff3_part.cpp:172 kdiff3_part.cpp:253 #, fuzzy, kde-format #| msgid "Couldn't find files for comparison." msgid "Could not find files for comparison." @@ -1685,7 +1690,7 @@ msgstr "Podesi KDiff3" #. i18n: ectx: ToolBar (mainToolBar) -#: kdiff3_part.rc:16 main.cpp:88 +#: kdiff3_part.rc:16 main.cpp:89 #, kde-format msgid "KDiff3" msgstr "&KDiff3" @@ -1757,83 +1762,88 @@ msgid "Main Toolbar" msgstr "Glavna traka" -#: main.cpp:68 main.cpp:72 +#: main.cpp:69 main.cpp:73 #, kde-format msgid "Ignored. (User defined.)" msgstr "Ignorisano (korisnički definisano)." -#: main.cpp:92 +#: main.cpp:93 #, kde-format msgid " (64 bit)" msgstr "" -#: main.cpp:94 +#: main.cpp:95 #, kde-format msgid " (32 bit)" msgstr "" -#: main.cpp:95 +#: main.cpp:96 #, kde-format msgid "Tool for Comparison and Merge of Files and Directories" msgstr "Alatka za poređenje i stapanje fajlova i fascikli" -#: main.cpp:96 +#: main.cpp:97 #, kde-format msgid "(c) 2002-2014 Joachim Eibl, (c) 2017 Michael Reeves KF5/Qt5 port" msgstr "" -#: main.cpp:112 +#: main.cpp:113 #, kde-format msgid "Merge the input." msgstr "Stopi ulaz." -#: main.cpp:113 +#: main.cpp:114 #, kde-format msgid "Explicit base file. For compatibility with certain tools." msgstr "Izričit bazni fajl. Za saglasnost sa pojedinim alatkama." -#: main.cpp:114 +#: main.cpp:115 #, kde-format msgid "Output file. Implies -m. E.g.: -o newfile.txt" msgstr "Izlazni fajl. Implicira -m. Npr: -o novifajl.txt" -#: main.cpp:115 +#: main.cpp:116 #, kde-format msgid "Output file, again. (For compatibility with certain tools.)" msgstr "Izlazni fajl, ponovo. Za saglasnost sa pojedinim alatkama." -#: main.cpp:116 +#: main.cpp:118 #, kde-format msgid "No GUI if all conflicts are auto-solvable. (Needs -o file)" msgstr "Bez GUI‑ja ako su svi sukobi rešivi automatski. Zahteva -o fajl." -#: main.cpp:117 +#: main.cpp:120 +#, kde-format +msgid "Ignored." +msgstr "" + +#: main.cpp:122 #, fuzzy, kde-format #| msgid "Don't solve conflicts automatically. (For compatibility...)" msgid "Do not solve conflicts automatically." msgstr "Ne rešavaj sukobe automatski. Za saglasnost..." -#: main.cpp:118 +#: main.cpp:123 #, kde-format msgid "Visible name replacement for input file 1 (base)." msgstr "Zamena vidljivog imena za ulazni fajl 1 (bazni)." -#: main.cpp:119 +#: main.cpp:124 #, kde-format msgid "Visible name replacement for input file 2." msgstr "Zamena vidljivog imena za ulazni fajl 2." -#: main.cpp:120 +#: main.cpp:125 #, kde-format msgid "Visible name replacement for input file 3." msgstr "Zamena vidljivog imena za ulazni fajl 3." -#: main.cpp:121 +#: main.cpp:126 #, kde-format msgid "Alternative visible name replacement. Supply this once for every input." msgstr "Alternativna zamena vidljivog imena. Zadajte ovo jednom za svaki ulaz." -#: main.cpp:122 +#: main.cpp:127 #, kde-format msgid "" "Override a config setting. Use once for every setting. E.g.: --cs " @@ -1842,87 +1852,87 @@ "Potisni postavku iz postave. Upotrebite jednom za svaku postavku. Npr: --cs " "\"AutoAdvance=1\"" -#: main.cpp:123 +#: main.cpp:128 #, kde-format msgid "Show list of config settings and current values." msgstr "Nabroji postavke i trenutne vrednosti iz postave." -#: main.cpp:124 +#: main.cpp:129 #, kde-format msgid "Use a different config file." msgstr "Upotrebi drugi postavni fajl." -#: main.cpp:127 +#: main.cpp:132 #, kde-format msgid "file1 to open (base, if not specified via --base)" msgstr "Fajl 1 za otvaranje (bazni, ako nije naveden preko --base)." -#: main.cpp:128 +#: main.cpp:133 #, kde-format msgid "file2 to open" msgstr "Fajl 2 za otvaranje." -#: main.cpp:129 +#: main.cpp:134 #, kde-format msgid "file3 to open" msgstr "Fajl 3 za otvaranje." -#: main.cpp:153 +#: main.cpp:158 #, kde-format msgid "See kdiff3 --help for supported options." msgstr "" -#: mergeresultwindow.cpp:158 +#: mergeresultwindow.cpp:171 #, kde-format msgid "Choose A Everywhere" msgstr "Svuda izaberi A" -#: mergeresultwindow.cpp:159 +#: mergeresultwindow.cpp:172 #, kde-format msgid "Choose B Everywhere" msgstr "Svuda izaberi B" -#: mergeresultwindow.cpp:160 +#: mergeresultwindow.cpp:173 #, kde-format msgid "Choose C Everywhere" msgstr "Svuda izaberi C" -#: mergeresultwindow.cpp:161 +#: mergeresultwindow.cpp:174 #, kde-format msgid "Choose A for All Unsolved Conflicts" msgstr "Izaberi A za sve nerešene sukobe" -#: mergeresultwindow.cpp:162 +#: mergeresultwindow.cpp:175 #, kde-format msgid "Choose B for All Unsolved Conflicts" msgstr "Izaberi B za sve nerešene sukobe" -#: mergeresultwindow.cpp:163 +#: mergeresultwindow.cpp:176 #, kde-format msgid "Choose C for All Unsolved Conflicts" msgstr "Izaberi C za sve nerešene sukobe" -#: mergeresultwindow.cpp:164 +#: mergeresultwindow.cpp:177 #, kde-format msgid "Choose A for All Unsolved Whitespace Conflicts" msgstr "Izaberi A za sve nerešene sukobe praznina" -#: mergeresultwindow.cpp:165 +#: mergeresultwindow.cpp:178 #, kde-format msgid "Choose B for All Unsolved Whitespace Conflicts" msgstr "Izaberi B za sve nerešene sukobe praznina" -#: mergeresultwindow.cpp:166 +#: mergeresultwindow.cpp:179 #, kde-format msgid "Choose C for All Unsolved Whitespace Conflicts" msgstr "Izaberi C za sve nerešene sukobe praznina" -#: mergeresultwindow.cpp:176 +#: mergeresultwindow.cpp:204 #, kde-format msgid "Number of remaining unsolved conflicts: %1 (of which %2 are whitespace)" msgstr "Broj preostalih nerešenih sukoba: %1 (od čega %2 praznine)." -#: mergeresultwindow.cpp:370 +#: mergeresultwindow.cpp:398 #, kde-format msgid "" "The output has been modified.\n" @@ -1931,29 +1941,29 @@ "Izlaz je izmenjen.\n" "Ako nastavite izmene će biti izgubljene." -#: mergeresultwindow.cpp:936 pdiff.cpp:827 +#: mergeresultwindow.cpp:964 pdiff.cpp:838 #, kde-format msgid "All input files are binary equal." msgstr "Svi ulazni fajlovi binarno su jednaki." -#: mergeresultwindow.cpp:938 +#: mergeresultwindow.cpp:966 #, kde-format msgid "All input files contain the same text." msgstr "Svi ulazni fajlovi sadrže isti tekst." -#: mergeresultwindow.cpp:942 mergeresultwindow.cpp:946 -#: mergeresultwindow.cpp:950 pdiff.cpp:833 pdiff.cpp:837 pdiff.cpp:841 +#: mergeresultwindow.cpp:970 mergeresultwindow.cpp:974 +#: mergeresultwindow.cpp:978 pdiff.cpp:844 pdiff.cpp:848 pdiff.cpp:852 #, kde-format msgid "Files %1 and %2 are binary equal.\n" msgstr "Fajlovi %1 i %2 binarno su jednaki.\n" -#: mergeresultwindow.cpp:944 mergeresultwindow.cpp:948 -#: mergeresultwindow.cpp:952 +#: mergeresultwindow.cpp:972 mergeresultwindow.cpp:976 +#: mergeresultwindow.cpp:980 #, kde-format msgid "Files %1 and %2 have equal text.\n" msgstr "Fajlovi %1 i %2 sadrže isti tekst.\n" -#: mergeresultwindow.cpp:958 +#: mergeresultwindow.cpp:986 #, kde-format msgid "" "Total number of conflicts: %1\n" @@ -1962,27 +1972,27 @@ "%4" msgstr "" -#: mergeresultwindow.cpp:964 +#: mergeresultwindow.cpp:992 #, kde-format msgid "Conflicts" msgstr "Sukobi" -#: mergeresultwindow.cpp:1873 +#: mergeresultwindow.cpp:1901 #, kde-format msgid "" msgstr "" -#: mergeresultwindow.cpp:1881 +#: mergeresultwindow.cpp:1909 #, kde-format msgid "" msgstr "" -#: mergeresultwindow.cpp:1883 mergeresultwindow.cpp:2755 +#: mergeresultwindow.cpp:1911 mergeresultwindow.cpp:2783 #, kde-format msgid "" msgstr "" -#: mergeresultwindow.cpp:2967 +#: mergeresultwindow.cpp:2995 #, fuzzy, kde-format #| msgid "" #| "Not all conflicts are solved yet.\n" @@ -1994,12 +2004,12 @@ "Još nisu rešeni svi sukobi.\n" "Fajl nije sačuvan.\n" -#: mergeresultwindow.cpp:2969 mergeresultwindow.cpp:2978 +#: mergeresultwindow.cpp:2997 mergeresultwindow.cpp:3006 #, kde-format msgid "Conflicts Left" msgstr "Preostali sukobi" -#: mergeresultwindow.cpp:2976 +#: mergeresultwindow.cpp:3004 #, fuzzy, kde-format #| msgid "" #| "There is a line end style conflict. Please choose the line end style " @@ -2013,7 +2023,7 @@ "Sukob u stilu završetaka redova. Izaberite ručno stil završetka redova.\n" "Fajl nije sačuvan.\n" -#: mergeresultwindow.cpp:2990 +#: mergeresultwindow.cpp:3018 #, kde-format msgid "" "\n" @@ -2024,65 +2034,65 @@ "\n" "Pravljenje rezerve nije uspelo. Fajl nije sačuvan." -#: mergeresultwindow.cpp:2990 mergeresultwindow.cpp:3038 +#: mergeresultwindow.cpp:3018 mergeresultwindow.cpp:3066 #, kde-format msgid "File Save Error" msgstr "Greška upisivanja fajla" -#: mergeresultwindow.cpp:3038 +#: mergeresultwindow.cpp:3066 #, kde-format msgid "Error while writing." msgstr "Greška pri pisanju." -#: mergeresultwindow.cpp:3110 +#: mergeresultwindow.cpp:3138 #, fuzzy, kde-format #| msgid "Output" msgid "Output:" msgstr "Izlaz" -#: mergeresultwindow.cpp:3123 mergeresultwindow.cpp:3315 +#: mergeresultwindow.cpp:3151 mergeresultwindow.cpp:3343 #, kde-format msgid "[Modified]" msgstr "[izmenjen]" -#: mergeresultwindow.cpp:3130 +#: mergeresultwindow.cpp:3158 #, fuzzy, kde-format #| msgid "Encoding for saving" msgid "Encoding for saving:" msgstr "Kodiranje za upisivanje" -#: mergeresultwindow.cpp:3230 +#: mergeresultwindow.cpp:3258 #, kde-format msgid "Conflict" msgstr "Sukob" # >! Merge sentence. -#: mergeresultwindow.cpp:3262 +#: mergeresultwindow.cpp:3290 #, fuzzy, kde-format #| msgid "Codec from" msgid "Codec from A: %1" msgstr "Kodiranje iz" # >! Merge sentence. -#: mergeresultwindow.cpp:3264 +#: mergeresultwindow.cpp:3292 #, fuzzy, kde-format #| msgid "Codec from" msgid "Codec from B: %1" msgstr "Kodiranje iz" # >! Merge sentence. -#: mergeresultwindow.cpp:3266 +#: mergeresultwindow.cpp:3294 #, fuzzy, kde-format #| msgid "Codec from" msgid "Codec from C: %1" msgstr "Kodiranje iz" -#: optiondialog.cpp:119 +#: optiondialog.cpp:121 #, kde-format msgid "Change Font" msgstr "" -#: optiondialog.cpp:135 optiondialog.cpp:145 +#: optiondialog.cpp:137 optiondialog.cpp:147 #, kde-format msgid "" "Font: %1, %2, %3\n" @@ -2090,165 +2100,165 @@ "Example:" msgstr "" -#: optiondialog.cpp:388 +#: optiondialog.cpp:390 #, kde-format msgid "Unicode" msgstr "Unicode" -#: optiondialog.cpp:389 +#: optiondialog.cpp:391 #, kde-format msgid "Latin1" msgstr "latinica‑1" -#: optiondialog.cpp:408 +#: optiondialog.cpp:410 #, kde-format msgid "Change this if non-ASCII characters are not displayed correctly." msgstr "Izmenite ovo ako su ne-ASCII znakovi pogrešno prikazani." # >> @title:window -#: optiondialog.cpp:491 +#: optiondialog.cpp:495 #, kde-format msgid "Configure" msgstr "Podešavanje" -#: optiondialog.cpp:568 +#: optiondialog.cpp:573 #, kde-format msgid "Font" msgstr "Font" -#: optiondialog.cpp:570 +#: optiondialog.cpp:575 #, kde-format msgid "Editor & Diff Output Font" msgstr "Font uređivača i izlaza razlike" -#: optiondialog.cpp:589 +#: optiondialog.cpp:594 #, kde-format msgid "Application font" msgstr "" -#: optiondialog.cpp:594 +#: optiondialog.cpp:599 #, fuzzy, kde-format #| msgid "File Save Error" msgid "File view font" msgstr "Greška upisivanja fajla" -#: optiondialog.cpp:613 +#: optiondialog.cpp:618 #, fuzzy, kde-format #| msgid "Color" msgctxt "Title for color settings page" msgid "Color" msgstr "Boja" -#: optiondialog.cpp:614 +#: optiondialog.cpp:619 #, kde-format msgid "Colors Settings" msgstr "Postavke boja" -#: optiondialog.cpp:631 +#: optiondialog.cpp:644 #, kde-format msgid "Editor and Diff Views:" msgstr "Uređivač i prikazi razlika:" -#: optiondialog.cpp:639 +#: optiondialog.cpp:652 #, kde-format msgid "Foreground color:" msgstr "Boja teksta:" -#: optiondialog.cpp:647 +#: optiondialog.cpp:660 #, kde-format msgid "Background color:" msgstr "Boja pozadine:" -#: optiondialog.cpp:657 +#: optiondialog.cpp:670 #, kde-format msgid "Diff background color:" msgstr "Boja pozadine razlika:" -#: optiondialog.cpp:666 +#: optiondialog.cpp:679 #, kde-format msgid "Color A:" msgstr "Boja A:" -#: optiondialog.cpp:675 +#: optiondialog.cpp:688 #, kde-format msgid "Color B:" msgstr "Boja B:" -#: optiondialog.cpp:684 +#: optiondialog.cpp:697 #, kde-format msgid "Color C:" msgstr "Boja C:" -#: optiondialog.cpp:692 +#: optiondialog.cpp:705 #, kde-format msgid "Conflict color:" msgstr "Boja sukoba:" -#: optiondialog.cpp:701 +#: optiondialog.cpp:714 #, kde-format msgid "Current range background color:" msgstr "Pozadinska boja tekućeg opsega:" -#: optiondialog.cpp:710 +#: optiondialog.cpp:723 #, kde-format msgid "Current range diff background color:" msgstr "Pozadinska boja tekućeg opsega razlika:" -#: optiondialog.cpp:718 +#: optiondialog.cpp:731 #, kde-format msgid "Color for manually aligned difference ranges:" msgstr "Boja ručno poravnatih opsega razlika:" -#: optiondialog.cpp:725 +#: optiondialog.cpp:738 #, kde-format msgid "Directory Comparison View:" msgstr "Prikaz poređenja fascikli:" -#: optiondialog.cpp:731 +#: optiondialog.cpp:744 #, kde-format msgid "Newest file color:" msgstr "Boja najnovijeg fajla:" -#: optiondialog.cpp:736 +#: optiondialog.cpp:749 #, kde-format msgid "" "Changing this color will only be effective when starting the next directory " "comparison." msgstr "Izmena ove boje stupiće na snagu od prvog narednog poređenja fascikli." -#: optiondialog.cpp:741 +#: optiondialog.cpp:754 #, kde-format msgid "Oldest file color:" msgstr "Boja najstarijeg fajla:" -#: optiondialog.cpp:750 +#: optiondialog.cpp:763 #, kde-format msgid "Middle age file color:" msgstr "Boja fajla srednje starosti:" -#: optiondialog.cpp:759 +#: optiondialog.cpp:772 #, kde-format msgid "Color for missing files:" msgstr "Boja za nedostajuće fajlove:" -#: optiondialog.cpp:773 +#: optiondialog.cpp:786 #, kde-format msgid "Editor" msgstr "Uređivač" -#: optiondialog.cpp:774 +#: optiondialog.cpp:787 #, kde-format msgid "Editor Behavior" msgstr "Ponašanje uređivača" # skip-rule: t-tab -#: optiondialog.cpp:787 +#: optiondialog.cpp:809 #, kde-format msgid "Tab inserts spaces" msgstr "Tab umeće razmake" # rewrite-msgid: /generate/insert/ -#: optiondialog.cpp:791 +#: optiondialog.cpp:813 #, kde-format msgid "" "On: Pressing tab generates the appropriate number of spaces.\n" @@ -2257,27 +2267,27 @@ "Uključeno: pritiskom Taba umeće se odgovarajući broj razmaka.\n" "Isključeno: umeće se znak tabulatora." -#: optiondialog.cpp:796 +#: optiondialog.cpp:818 #, kde-format msgid "Tab size:" msgstr "Veličina tabulatora:" -#: optiondialog.cpp:803 +#: optiondialog.cpp:825 #, kde-format msgid "Auto indentation" msgstr "Automatsko uvlačenje" -#: optiondialog.cpp:807 +#: optiondialog.cpp:829 #, kde-format msgid "On: The indentation of the previous line is used for a new line.\n" msgstr "Uključeno: uvlačenje prethodnog reda uzima se za novi red.\n" -#: optiondialog.cpp:810 +#: optiondialog.cpp:832 #, kde-format msgid "Auto copy selection" msgstr "Automatsko kopiranje izbora" -#: optiondialog.cpp:814 +#: optiondialog.cpp:836 #, fuzzy, kde-format #| msgid "" #| "On: Any selection is immediately written to the clipboard.\n" @@ -2289,7 +2299,7 @@ "Uključeno: svaki izbor se odmah upisuje u klipbord.\n" "Isključeno: morate izričito kopirati, npr. pomoću Ctrl+C." -#: optiondialog.cpp:829 +#: optiondialog.cpp:851 #, kde-format msgid "" "Sets the line endings for when an edited file is saved.\n" @@ -2298,12 +2308,12 @@ "Postavlja završetke redova kada se izmenjeni fajl sačuva.\n" "DOS/Windows CR+LF, Unix LF, gde je CR=0D, LF=0A." -#: optiondialog.cpp:839 +#: optiondialog.cpp:861 #, kde-format msgid "Diff" msgstr "Razlikovanje" -#: optiondialog.cpp:840 +#: optiondialog.cpp:862 #, kde-format msgid "Diff Settings" msgstr "Postavke razlikovanja" @@ -2318,13 +2328,13 @@ #. ); #. ++line; #. -#: optiondialog.cpp:865 +#: optiondialog.cpp:896 #, fuzzy, kde-format #| msgid "Treat as white space." msgid "Ignore numbers (treat as white space)" msgstr "Tretiraj kao praznine." -#: optiondialog.cpp:869 +#: optiondialog.cpp:900 #, kde-format msgid "" "Ignore number characters during line matching phase. (Similar to Ignore " @@ -2335,45 +2345,45 @@ "praznina).\n" "Može biti korisno pri poređenju fajlova sa numeričkim podacima." -#: optiondialog.cpp:873 +#: optiondialog.cpp:904 #, fuzzy, kde-format #| msgid "Treat C/C++ comments like white space." msgid "Ignore C/C++ comments (treat as white space)" msgstr "Tretiraj C/C++ komentare kao praznine." -#: optiondialog.cpp:876 +#: optiondialog.cpp:907 #, kde-format msgid "Treat C/C++ comments like white space." msgstr "Tretiraj C/C++ komentare kao praznine." # >! Merge sentence. -#: optiondialog.cpp:879 +#: optiondialog.cpp:910 #, fuzzy, kde-format #| msgid "Treat as white space." msgid "Ignore case (treat as white space)" msgstr "Tretiraj kao praznine." -#: optiondialog.cpp:883 +#: optiondialog.cpp:914 #, kde-format msgid "Treat case differences like white space changes. ('a'<=>'A')" msgstr "Tretira razliku u veličini kao promene u prazninama (‘a’ jednako ‘A’)." -#: optiondialog.cpp:886 +#: optiondialog.cpp:917 #, kde-format msgid "Preprocessor command:" msgstr "Predobradna naredba:" -#: optiondialog.cpp:891 +#: optiondialog.cpp:922 #, kde-format msgid "User defined pre-processing. (See the docs for details.)" msgstr "Korisnički definisana predobrada. Pogledajte dokumentaciju za detalje." -#: optiondialog.cpp:894 +#: optiondialog.cpp:925 #, kde-format msgid "Line-matching preprocessor command:" msgstr "Predobradna naredba za poklapanje redova:" -#: optiondialog.cpp:899 +#: optiondialog.cpp:930 #, kde-format msgid "" "This pre-processor is only used during line matching.\n" @@ -2382,12 +2392,12 @@ "Predobrada se koristi samo tokom poklapanja redova.\n" "Pogledajte dokumentaciju za detalje." -#: optiondialog.cpp:902 +#: optiondialog.cpp:933 #, kde-format msgid "Try hard (slower)" msgstr "Potrudi se (sporije)" -#: optiondialog.cpp:906 +#: optiondialog.cpp:937 #, kde-format msgid "" "Enables the --minimal option for the external diff.\n" @@ -2396,12 +2406,12 @@ "Uključuje opciju --minimal za spoljašnje razlikovanje.\n" "Analiza velikih fajlova će biti mnogo sporija." -#: optiondialog.cpp:910 +#: optiondialog.cpp:941 #, kde-format msgid "Align B and C for 3 input files" msgstr "Poravnaj B i C za tri ulazna fajla" -#: optiondialog.cpp:914 +#: optiondialog.cpp:945 #, kde-format msgid "" "Try to align B and C when comparing or merging three input files.\n" @@ -2412,17 +2422,24 @@ "Nije preporučljivo za stapanje zato što ga može učiniti složenijim.\n" "Podrazumevano je isključeno." -#: optiondialog.cpp:926 +#: optiondialog.cpp:956 +#, fuzzy, kde-format +#| msgid "Merge" +msgctxt "Settings page" +msgid "Merge" +msgstr "Stopi" + +#: optiondialog.cpp:957 #, kde-format msgid "Merge Settings" msgstr "Postavke stapanja" -#: optiondialog.cpp:940 +#: optiondialog.cpp:980 #, kde-format msgid "Auto advance delay (ms):" msgstr "Zastoj automatskog napredovanja (ms):" -#: optiondialog.cpp:946 +#: optiondialog.cpp:986 #, kde-format msgid "" "When in Auto-Advance mode the result of the current selection is shown \n" @@ -2431,27 +2448,27 @@ "U režimu automatskog napredovanja rezultat tekućeg izbora prikazuje se \n" "zadato vreme pre skoka na sledeći sukob. Opseg: 0–2000 ms." -#: optiondialog.cpp:950 +#: optiondialog.cpp:990 #, kde-format msgid "Show info dialogs" msgstr "Prikazuj informativne dijaloge" -#: optiondialog.cpp:953 +#: optiondialog.cpp:993 #, kde-format msgid "Show a dialog with information about the number of conflicts." msgstr "Prikazuje dijalog sa informacijom o broju sukoba." -#: optiondialog.cpp:956 +#: optiondialog.cpp:996 #, kde-format msgid "White space 2-file merge default:" msgstr "Podrazumevano stapanje praznina dva fajla:" -#: optiondialog.cpp:961 optiondialog.cpp:974 +#: optiondialog.cpp:1001 optiondialog.cpp:1014 #, kde-format msgid "Manual Choice" msgstr "Ručni izbor" -#: optiondialog.cpp:965 optiondialog.cpp:979 +#: optiondialog.cpp:1005 optiondialog.cpp:1019 #, kde-format msgid "" "Allow the merge algorithm to automatically select an input for white-space-" @@ -2460,22 +2477,22 @@ "Dozvoljava algoritmu stapanja da automatski izabere ulaz za izmene samo u " "prazninama." -#: optiondialog.cpp:969 +#: optiondialog.cpp:1009 #, kde-format msgid "White space 3-file merge default:" msgstr "Podrazumevano stapanje praznina tri fajla:" -#: optiondialog.cpp:983 +#: optiondialog.cpp:1023 #, kde-format msgid "Automatic Merge Regular Expression" msgstr "Regularni izraz za automatsko stapanje" -#: optiondialog.cpp:991 smalldialogs.cpp:449 +#: optiondialog.cpp:1031 smalldialogs.cpp:459 #, kde-format msgid "Auto merge regular expression:" msgstr "Regularni izraz za automatsko stapanje:" -#: optiondialog.cpp:996 +#: optiondialog.cpp:1036 #, kde-format msgid "" "Regular expression for lines where KDiff3 should automatically choose one " @@ -2487,30 +2504,30 @@ "izvora. Kad regularni izraz poklopi red sa sukobom bira se C ako ga ima, " "inače B." -#: optiondialog.cpp:1002 +#: optiondialog.cpp:1042 #, kde-format msgid "Run regular expression auto merge on merge start" msgstr "Automatski stopi po regularnom izrazu na početku stapanja" -#: optiondialog.cpp:1005 +#: optiondialog.cpp:1045 #, kde-format msgid "" "Run the merge for auto merge regular expressions\n" "immediately when a merge starts.\n" msgstr "Sprovodi stapanje regularnim izrazom čim stapanje počne.\n" -#: optiondialog.cpp:1010 +#: optiondialog.cpp:1050 #, kde-format msgid "Version Control History Merging" msgstr "Stapanje istorijata upravljanja verzijama" -#: optiondialog.cpp:1018 smalldialogs.cpp:476 +#: optiondialog.cpp:1058 smalldialogs.cpp:486 #, kde-format msgid "History start regular expression:" msgstr "Regularni izraz za početak istorijata:" # literal-segment: Log -#: optiondialog.cpp:1023 +#: optiondialog.cpp:1063 #, kde-format msgid "" "Regular expression for the start of the version control history entry.\n" @@ -2521,12 +2538,12 @@ "Ovaj red obično sadrži ključnu reč „$Log$“.\n" "Podrazumevana vrednost je „.*\\$Log.*\\$.*“." -#: optiondialog.cpp:1029 smalldialogs.cpp:504 +#: optiondialog.cpp:1069 smalldialogs.cpp:514 #, kde-format msgid "History entry start regular expression:" msgstr "Regularni izraz za početak unosa istorijata:" -#: optiondialog.cpp:1042 +#: optiondialog.cpp:1082 #, kde-format msgid "" "A version control history entry consists of several lines.\n" @@ -2544,22 +2561,22 @@ "redovima.\n" "Detalje potražite u dokumentaciji." -#: optiondialog.cpp:1050 +#: optiondialog.cpp:1090 #, kde-format msgid "History merge sorting" msgstr "Ređanje u stapanju istorijata" -#: optiondialog.cpp:1053 +#: optiondialog.cpp:1093 #, kde-format msgid "Sort version control history by a key." msgstr "Ređa istorijat upravljanja verzijama po ključu." -#: optiondialog.cpp:1063 +#: optiondialog.cpp:1103 #, kde-format msgid "History entry start sort key order:" msgstr "Redosled ređanja za ključeve unosa istorijata:" -#: optiondialog.cpp:1068 +#: optiondialog.cpp:1108 #, kde-format msgid "" "Each pair of parentheses used in the regular expression for the history " @@ -2577,39 +2594,39 @@ "Ako se ostavi prazno, ređanje se ne sprovodi.\n" "Detalje potražite u dokumentaciji." -#: optiondialog.cpp:1079 +#: optiondialog.cpp:1119 #, kde-format msgid "Merge version control history on merge start" msgstr "Stopi istorijat upravljanja verzijama na početku stapanja" -#: optiondialog.cpp:1082 +#: optiondialog.cpp:1122 #, kde-format msgid "Run version control history automerge on merge start." msgstr "Automatski stapa istorijat upravljanja verzijama na početku stapanja." -#: optiondialog.cpp:1086 +#: optiondialog.cpp:1126 #, kde-format msgid "Max number of history entries:" msgstr "Najveći broj unosa istorijata:" # skip-rule: t-cut -#: optiondialog.cpp:1090 +#: optiondialog.cpp:1130 #, kde-format msgid "Cut off after specified number. Use -1 for infinite number of entries." msgstr "Odseca iznad zadatog broja. Stavite -1 za neograničen broj unosa." # >> @action:button -#: optiondialog.cpp:1094 +#: optiondialog.cpp:1134 #, kde-format msgid "Test your regular expressions" msgstr "Isprobaj regularne izraze" -#: optiondialog.cpp:1099 +#: optiondialog.cpp:1139 #, kde-format msgid "Irrelevant merge command:" msgstr "Naredba pri beznačajnom stapanju:" -#: optiondialog.cpp:1104 +#: optiondialog.cpp:1144 #, kde-format msgid "" "If specified this script is run after automerge\n" @@ -2620,12 +2637,12 @@ "nikakvih preostalih izmena.\n" "Poziva se sa argumentima: ime‑fajla‑1 ime‑fajla‑2 ime‑fajla‑3" -#: optiondialog.cpp:1109 +#: optiondialog.cpp:1149 #, kde-format msgid "Auto save and quit on merge without conflicts" msgstr "Automatski sačuvaj i napusti pri stapanju bez sukoba" -#: optiondialog.cpp:1113 +#: optiondialog.cpp:1153 #, kde-format msgid "" "If KDiff3 was started for a file-merge from the command line and all\n" @@ -2638,27 +2655,27 @@ "upisuju i program napušta.\n" "Slično opciji komandne linije --auto." -#: optiondialog.cpp:1124 optiondialog.cpp:1125 +#: optiondialog.cpp:1164 optiondialog.cpp:1165 #, kde-format msgid "Directory" msgstr "Fascikla" -#: optiondialog.cpp:1137 +#: optiondialog.cpp:1185 #, kde-format msgid "Recursive directories" msgstr "Rekurzivno kroz fascikle" -#: optiondialog.cpp:1140 +#: optiondialog.cpp:1188 #, kde-format msgid "Whether to analyze subdirectories or not." msgstr "Da li analizirati potfascikle." -#: optiondialog.cpp:1142 +#: optiondialog.cpp:1190 #, kde-format msgid "File pattern(s):" msgstr "Obrasci fajlova:" -#: optiondialog.cpp:1148 +#: optiondialog.cpp:1196 #, kde-format msgid "" "Pattern(s) of files to be analyzed. \n" @@ -2669,12 +2686,12 @@ "Džokeri: ‘*’ i ‘?’\n" "Više obrazaca navodite sa tačka-zapetom kao razdvajačem." -#: optiondialog.cpp:1153 +#: optiondialog.cpp:1201 #, kde-format msgid "File-anti-pattern(s):" msgstr "Protivobrasci fajlova:" -#: optiondialog.cpp:1159 +#: optiondialog.cpp:1207 #, kde-format msgid "" "Pattern(s) of files to be excluded from analysis. \n" @@ -2685,12 +2702,12 @@ "Džokeri: ‘*’ i ‘?’\n" "Više obrazaca navodite sa tačka-zapetom kao razdvajačem." -#: optiondialog.cpp:1164 +#: optiondialog.cpp:1212 #, kde-format msgid "Dir-anti-pattern(s):" msgstr "Protivobrasci fascikli:" -#: optiondialog.cpp:1170 +#: optiondialog.cpp:1218 #, kde-format msgid "" "Pattern(s) of directories to be excluded from analysis. \n" @@ -2701,12 +2718,12 @@ "Džokeri: ‘*’ i ‘?’\n" "Više obrazaca navodite sa tačka-zapetom kao razdvajačem." -#: optiondialog.cpp:1175 +#: optiondialog.cpp:1223 #, kde-format msgid "Use .cvsignore" msgstr "Koristi .cvsignore" -#: optiondialog.cpp:1179 +#: optiondialog.cpp:1227 #, kde-format msgid "" "Extends the antipattern to anything that would be ignored by CVS.\n" @@ -2715,23 +2732,23 @@ "Proširuje protivobrasce na sve što bi ignorisao CVS.\n" "Preko lokalnih fajlova .cvsignore ovo može biti posebno po fascikli." -#: optiondialog.cpp:1183 +#: optiondialog.cpp:1231 #, kde-format msgid "Find hidden files and directories" msgstr "Pronađi skrivene fajlove i fascikle" -#: optiondialog.cpp:1186 +#: optiondialog.cpp:1234 #, fuzzy, kde-format #| msgid "Find hidden files and directories" msgid "Finds hidden files and directories." msgstr "Pronađi skrivene fajlove i fascikle" -#: optiondialog.cpp:1189 +#: optiondialog.cpp:1237 #, kde-format msgid "Follow file links" msgstr "Prati veze fajlova" -#: optiondialog.cpp:1193 +#: optiondialog.cpp:1241 #, kde-format msgid "" "On: Compare the file the link points to.\n" @@ -2740,12 +2757,12 @@ "Uključeno: poredi fajlove na koje pokazuju veze.\n" "Isključeno: poredi veze." -#: optiondialog.cpp:1197 +#: optiondialog.cpp:1245 #, kde-format msgid "Follow directory links" msgstr "Prati veze fascikli" -#: optiondialog.cpp:1201 +#: optiondialog.cpp:1249 #, kde-format msgid "" "On: Compare the directory the link points to.\n" @@ -2754,12 +2771,12 @@ "Uključeno: poredi fascikle na koje pokazuju veze.\n" "Isključeno: poredi veze." -#: optiondialog.cpp:1210 +#: optiondialog.cpp:1258 #, kde-format msgid "Case sensitive filename comparison" msgstr "Poređenje imena fajlova razlikuje veličinu slova" -#: optiondialog.cpp:1214 +#: optiondialog.cpp:1262 #, kde-format msgid "" "The directory comparison will compare files or directories when their names " @@ -2771,52 +2788,52 @@ "Zadajte ovu opciju imena treba da se poklapaju i po veličini slova. " "Podrazumevano je isključeno pod Windowsom, inače je uključeno." -#: optiondialog.cpp:1218 +#: optiondialog.cpp:1266 #, fuzzy, kde-format #| msgid "Unfold All Subdirs" msgid "Unfold all subdirectories on load" msgstr "Raširi sve potfascikle" -#: optiondialog.cpp:1222 +#: optiondialog.cpp:1270 #, kde-format msgid "" "On: Unfold all subdirectories when starting a directory diff.\n" "Off: Leave subdirectories folded." msgstr "" -#: optiondialog.cpp:1226 +#: optiondialog.cpp:1274 #, kde-format msgid "Skip directory status report" msgstr "" -#: optiondialog.cpp:1230 +#: optiondialog.cpp:1278 #, kde-format msgid "" "On: Do not show the Directory Comparison Status.\n" "Off: Show the status dialog on start." msgstr "" -#: optiondialog.cpp:1234 +#: optiondialog.cpp:1282 #, kde-format msgid "File Comparison Mode" msgstr "Režim poređenja fajlova" -#: optiondialog.cpp:1239 +#: optiondialog.cpp:1287 #, kde-format msgid "Binary comparison" msgstr "Binarno poređenje" -#: optiondialog.cpp:1241 +#: optiondialog.cpp:1289 #, kde-format msgid "Binary comparison of each file. (Default)" msgstr "Binarno poređenje za svaki fajl (podrazumevano)." -#: optiondialog.cpp:1244 +#: optiondialog.cpp:1292 #, kde-format msgid "Full analysis" msgstr "Puna analiza" -#: optiondialog.cpp:1246 +#: optiondialog.cpp:1294 #, kde-format msgid "" "Do a full analysis and show statistics information in extra columns.\n" @@ -2825,12 +2842,12 @@ "Sprovodi punu analizu i daje statističke podatke u dodatnim kolonama.\n" "Sporije nego binarno poređenje, mnogo sporije za binarne fajlove." -#: optiondialog.cpp:1250 +#: optiondialog.cpp:1298 #, kde-format msgid "Trust the size and modification date (unsafe)" msgstr "Veruj veličini i datumu izmene (nesigurno)" -#: optiondialog.cpp:1252 +#: optiondialog.cpp:1300 #, kde-format msgid "" "Assume that files are equal if the modification date and file length are " @@ -2845,7 +2862,7 @@ "različitim.\n" "Korisno za velike fascikle ili spore mreže." -#: optiondialog.cpp:1257 +#: optiondialog.cpp:1305 #, kde-format msgid "" "Trust the size and date, but use binary comparison if date does not match " @@ -2854,7 +2871,7 @@ "Veruj veličini i datumu, ali binarno uporedi ako se datum ne poklapa " "(nesigurno)" -#: optiondialog.cpp:1259 +#: optiondialog.cpp:1307 #, kde-format msgid "" "Assume that files are equal if the modification date and file length are " @@ -2867,12 +2884,12 @@ "Ako datumi nisu isti ali veličina jeste, binarno upoređuje.\n" "Korisno za velike fascikle ili spore mreže." -#: optiondialog.cpp:1264 +#: optiondialog.cpp:1312 #, kde-format msgid "Trust the size (unsafe)" msgstr "Veruj veličini (nesigurno)" -#: optiondialog.cpp:1266 +#: optiondialog.cpp:1314 #, kde-format msgid "" "Assume that files are equal if their file lengths are equal.\n" @@ -2883,12 +2900,12 @@ "Korisno za velike fascikle ili spore mreže kada se datum izmeni tokom " "preuzimanja." -#: optiondialog.cpp:1273 +#: optiondialog.cpp:1321 #, kde-format msgid "Synchronize directories" msgstr "Sinhronizuj fascikle" -#: optiondialog.cpp:1277 +#: optiondialog.cpp:1325 #, kde-format msgid "" "Offers to store files in both directories so that\n" @@ -2898,12 +2915,12 @@ "Nudi da skladišti fajlove u obe fascikle tako da ispadnu iste posle toga.\n" "Radi samo kada se porede dve fascikle bez zadavanja odredišta." -#: optiondialog.cpp:1283 +#: optiondialog.cpp:1331 #, kde-format msgid "White space differences considered equal" msgstr "Razlike u prazninama smatraju se jednakim" -#: optiondialog.cpp:1287 +#: optiondialog.cpp:1335 #, kde-format msgid "" "If files differ only by white space consider them equal.\n" @@ -2913,12 +2930,12 @@ "Ovo je aktivno samo kada se izabere puna analiza." # >> copy newer file -#: optiondialog.cpp:1293 +#: optiondialog.cpp:1341 #, kde-format msgid "Copy newer instead of merging (unsafe)" msgstr "Kopiraj noviji umesto stapanja (nesigurno)" -#: optiondialog.cpp:1297 +#: optiondialog.cpp:1345 #, fuzzy, kde-format #| msgid "" #| "Don't look inside, just take the newer file.\n" @@ -2933,12 +2950,12 @@ "Koristite ovo samo ako znate šta radite!\n" "Ima efekta samo pri poređenju dve fascikle." -#: optiondialog.cpp:1302 +#: optiondialog.cpp:1350 #, kde-format msgid "Backup files (.orig)" msgstr "Pravi rezerve fajlova (.orig)" -#: optiondialog.cpp:1306 +#: optiondialog.cpp:1354 #, kde-format msgid "" "If a file would be saved over an old file, then the old file\n" @@ -2948,17 +2965,17 @@ "preimenovan sa nastavkom .orig umesto da bude obrisan." # rewrite-msgid: /Regional/Locale/ -#: optiondialog.cpp:1382 optiondialog.cpp:1383 +#: optiondialog.cpp:1430 optiondialog.cpp:1431 #, kde-format msgid "Regional Settings" msgstr "Postavke lokaliteta" -#: optiondialog.cpp:1397 +#: optiondialog.cpp:1454 #, kde-format msgid "Use the same encoding for everything:" msgstr "Isto kodiranje za sve:" -#: optiondialog.cpp:1401 +#: optiondialog.cpp:1458 #, kde-format msgid "" "Enable this allows to change all encodings by changing the first only.\n" @@ -2968,18 +2985,18 @@ "Isključite ovo ako pojedine postavke treba da budu različite." # >! Merge sentence. -#: optiondialog.cpp:1405 +#: optiondialog.cpp:1462 #, fuzzy, kde-format #| msgid "Note: Local Encoding is " msgid "Note: Local Encoding is \"%1\"" msgstr "Napomena: lokalno kodiranje je " -#: optiondialog.cpp:1409 +#: optiondialog.cpp:1466 #, kde-format msgid "File Encoding for A:" msgstr "Kodiranje fajla za A:" -#: optiondialog.cpp:1416 +#: optiondialog.cpp:1473 #, kde-format msgid "" "If enabled then Unicode (UTF-16 or UTF-8) encoding will be detected.\n" @@ -2991,32 +3008,32 @@ "Ako fajl nije Unicode izabrano kodiranje će biti upotrebljeno kao odstupno.\n" "Otkrivanje Unicodea zavisi od prvih bajtova u fajlu." -#: optiondialog.cpp:1419 optiondialog.cpp:1430 optiondialog.cpp:1441 +#: optiondialog.cpp:1476 optiondialog.cpp:1487 optiondialog.cpp:1498 #, kde-format msgid "Auto Detect Unicode" msgstr "Automatski otkrij Unicode" -#: optiondialog.cpp:1425 +#: optiondialog.cpp:1482 #, kde-format msgid "File Encoding for B:" msgstr "Kodiranje fajla za B:" -#: optiondialog.cpp:1436 +#: optiondialog.cpp:1493 #, kde-format msgid "File Encoding for C:" msgstr "Kodiranje fajla za C:" -#: optiondialog.cpp:1447 +#: optiondialog.cpp:1504 #, kde-format msgid "File Encoding for Merge Output and Saving:" msgstr "Kodiranje fajla za stopljeni izlaz i upisivanje:" -#: optiondialog.cpp:1452 +#: optiondialog.cpp:1509 #, kde-format msgid "Auto Select" msgstr "Automatski izaberi" -#: optiondialog.cpp:1456 +#: optiondialog.cpp:1513 #, kde-format msgid "" "If enabled then the encoding from the input files is used.\n" @@ -3027,17 +3044,17 @@ "U dvosmislenim slučajevima izdaje se dijalog gde korisnik bira kodiranje za " "upisivanje." -#: optiondialog.cpp:1459 +#: optiondialog.cpp:1516 #, kde-format msgid "File Encoding for Preprocessor Files:" msgstr "Kodiranje fajla za predobradne fajlove:" -#: optiondialog.cpp:1471 +#: optiondialog.cpp:1528 #, kde-format msgid "Right To Left Language" msgstr "Jezici zdesna ulevo" -#: optiondialog.cpp:1475 +#: optiondialog.cpp:1532 #, kde-format msgid "" "Some languages are read from right to left.\n" @@ -3046,22 +3063,22 @@ "Neki jezici se čitaju zdesna ulevo.\n" "Ova postavka prilagođava tome prikazivač i uređivač." -#: optiondialog.cpp:1485 +#: optiondialog.cpp:1542 #, kde-format msgid "Integration" msgstr "Uklapanje" -#: optiondialog.cpp:1486 +#: optiondialog.cpp:1543 #, kde-format msgid "Integration Settings" msgstr "Postavke uklapanja" -#: optiondialog.cpp:1499 +#: optiondialog.cpp:1564 #, kde-format msgid "Command line options to ignore:" msgstr "Zanemari opcije komandne linije:" -#: optiondialog.cpp:1505 +#: optiondialog.cpp:1570 #, kde-format msgid "" "List of command line options that should be ignored when KDiff3 is used by " @@ -3074,12 +3091,12 @@ "Više vrednosti možete zadati razdvojene tačka-zapetom.\n" "Ovim se suzbija greška „nepoznata opcija“." -#: optiondialog.cpp:1510 +#: optiondialog.cpp:1575 #, kde-format msgid "Quit also via Escape key" msgstr "Napuštanje i preko tastera Esc" -#: optiondialog.cpp:1514 +#: optiondialog.cpp:1579 #, kde-format msgid "" "Fast method to exit.\n" @@ -3088,7 +3105,7 @@ "Brz način napuštanja.\n" "Za one naviknute na taster Esc u ovu svrhu." -#: optiondialog.cpp:1598 +#: optiondialog.cpp:1653 #, kde-format msgid "This resets all options. Not only those of the current topic." msgstr "Ovo resetuje sve opcije, i to ne samo one u tekućoj temi." @@ -3144,85 +3161,77 @@ msgstr "Isključi nesigurne opcije" # >> @info:progress -#: pdiff.cpp:158 +#: pdiff.cpp:160 #, kde-format msgid "Loading A" msgstr "Učitavam A" -#: pdiff.cpp:167 -#, kde-format -msgid "Errors occurred during pre-processing of file A." -msgstr "" +# >> @info:progress +#: pdiff.cpp:162 +#, fuzzy, kde-format +#| msgid "Loading A" +msgid "Loading A: %1" +msgstr "Učitavam A" # >> @info:progress -#: pdiff.cpp:172 +#: pdiff.cpp:170 #, kde-format msgid "Loading B" msgstr "Učitavam B" -#: pdiff.cpp:179 -#, kde-format -msgid "Errors occurred during pre-processing of file B." -msgstr "" - # >> @info:progress -#: pdiff.cpp:202 pdiff.cpp:241 +#: pdiff.cpp:201 pdiff.cpp:237 #, kde-format msgid "Diff: A <-> B" msgstr "Razlikujem A i B" # >> @info:progress -#: pdiff.cpp:208 pdiff.cpp:279 pdiff.cpp:293 +#: pdiff.cpp:207 pdiff.cpp:275 pdiff.cpp:289 #, kde-format msgid "Linediff: A <-> B" msgstr "Razlikujem redove A i B" # >> @info:progress -#: pdiff.cpp:225 +#: pdiff.cpp:224 #, kde-format msgid "Loading C" msgstr "Učitavam C" -#: pdiff.cpp:232 -#, kde-format -msgid "Errors occurred during pre-processing of file C." -msgstr "" - # >> @info:progress -#: pdiff.cpp:250 +#: pdiff.cpp:246 #, kde-format msgid "Diff: A <-> C" msgstr "Razlikujem A i C" # >> @info:progress -#: pdiff.cpp:261 +#: pdiff.cpp:257 #, kde-format msgid "Diff: B <-> C" msgstr "Razlikujem B i C" # >> @info:progress -#: pdiff.cpp:283 pdiff.cpp:297 +#: pdiff.cpp:279 pdiff.cpp:293 #, kde-format msgid "Linediff: B <-> C" msgstr "Razlikujem redove B i C" # >> @info:progress -#: pdiff.cpp:287 pdiff.cpp:301 +#: pdiff.cpp:283 pdiff.cpp:297 #, kde-format msgid "Linediff: A <-> C" msgstr "Razlikujem redove A i C" -#: pdiff.cpp:829 +#: pdiff.cpp:840 #, kde-format msgid "All input files contain the same text, but are not binary equal." msgstr "Svi ulazni fajlovi sadrže isti tekst, ali nisu binarno jednaki." -#: pdiff.cpp:835 pdiff.cpp:839 pdiff.cpp:843 +#: pdiff.cpp:846 pdiff.cpp:850 pdiff.cpp:854 #, kde-format msgid "Files %1 and %2 have equal text, but are not binary equal. \n" msgstr "Fajlovi %1 i %2 imaju isti tekst ali nisu binarno jednaki.\n" -#: pdiff.cpp:853 +#: pdiff.cpp:864 #, fuzzy, kde-format #| msgid "" #| "Some inputfiles don't seem to be pure textfiles.\n" @@ -3237,17 +3246,17 @@ "Imajte na umu da stapanje u KDiff3 nije namenjeno binarnim podacima.\n" "Nastavite na sopstvenu odgovornost." -#: pdiff.cpp:863 +#: pdiff.cpp:874 #, kde-format msgid ", B" msgstr "" -#: pdiff.cpp:865 +#: pdiff.cpp:876 #, kde-format msgid ", C" msgstr "" -#: pdiff.cpp:867 +#: pdiff.cpp:878 #, fuzzy, kde-format #| msgid "" #| "Some input characters could not be converted to valid unicode.\n" @@ -3265,77 +3274,72 @@ "Ne upisujte rezultat ako niste sigurni. Nastavite na sopstvenu odgovornost.\n" "Pogođeni ulazni fajlovi nalaze se u %1." -#: pdiff.cpp:1034 +#: pdiff.cpp:1053 #, kde-format msgid "Abort" msgstr "Obustavi" -#: pdiff.cpp:1040 pdiff.cpp:1130 +#: pdiff.cpp:1059 pdiff.cpp:1150 #, kde-format msgid "Opening files..." msgstr "Otvaram fajlove..." -#: pdiff.cpp:1107 -#, kde-format -msgid "File open error" -msgstr "Greška pri otvaranju fajla" - -#: pdiff.cpp:1202 +#: pdiff.cpp:1222 #, kde-format msgid "Cutting selection..." msgstr "Isecam izabrano..." -#: pdiff.cpp:1223 +#: pdiff.cpp:1243 #, kde-format msgid "Copying selection to clipboard..." msgstr "Kopiram izbor u klipbord..." -#: pdiff.cpp:1239 +#: pdiff.cpp:1259 #, kde-format msgid "Inserting clipboard contents..." msgstr "Umećem sadržaj klipborda..." -#: pdiff.cpp:1695 +#: pdiff.cpp:1715 #, kde-format msgid "Word wrap (Cancel disables word wrap)" msgstr "" -#: pdiff.cpp:1696 +#: pdiff.cpp:1716 #, kde-format msgid "Calculating max width for horizontal scrollbar" msgstr "" -#: pdiff.cpp:1911 +#: pdiff.cpp:1931 #, kde-format msgid "Save && Continue" msgstr "Sačuvaj i nastavi" -#: pdiff.cpp:1912 +#: pdiff.cpp:1932 #, kde-format msgid "Continue Without Saving" msgstr "Nastavi bez upisivanja" -#: pdiff.cpp:2124 +#: pdiff.cpp:2144 #, kde-format msgid "Search complete." msgstr "Pretraga je gotova." -#: pdiff.cpp:2124 +#: pdiff.cpp:2144 #, kde-format msgid "Search Complete" msgstr "Pretraga završena" -#: pdiff.cpp:2375 +#: pdiff.cpp:2395 #, kde-format msgid "Nothing is selected in either diff input window." msgstr "Ništa nije izabrano ni u jednom prozoru ulaza razlike." -#: pdiff.cpp:2375 +#: pdiff.cpp:2395 #, kde-format msgid "Error while adding manual diff range" msgstr "Greška pri dodavanju ručnog opsega razlike" -#: progress.cpp:59 progress.cpp:71 +#: progress.cpp:61 progress.cpp:73 #, kde-format msgid "&Cancel" msgstr "&Odustani" @@ -3345,127 +3349,127 @@ msgid "A (Base):" msgstr "A (baza):" -#: smalldialogs.cpp:68 smalldialogs.cpp:85 smalldialogs.cpp:102 -#: smalldialogs.cpp:144 +#: smalldialogs.cpp:71 smalldialogs.cpp:90 smalldialogs.cpp:109 +#: smalldialogs.cpp:154 #, kde-format msgid "File..." msgstr "Fajl..." -#: smalldialogs.cpp:70 smalldialogs.cpp:87 smalldialogs.cpp:104 -#: smalldialogs.cpp:146 +#: smalldialogs.cpp:73 smalldialogs.cpp:92 smalldialogs.cpp:111 +#: smalldialogs.cpp:156 #, kde-format msgid "Dir..." msgstr "Fascikla..." -#: smalldialogs.cpp:96 +#: smalldialogs.cpp:103 #, kde-format msgid "C (Optional):" msgstr "C (opciono):" -#: smalldialogs.cpp:119 +#: smalldialogs.cpp:126 #, fuzzy, kde-format #| msgid "Swap/Copy Names ..." msgid "Swap/Copy Names..." msgstr "Razmeni/kopiraj imena..." -#: smalldialogs.cpp:124 smalldialogs.cpp:125 smalldialogs.cpp:126 +#: smalldialogs.cpp:131 smalldialogs.cpp:132 smalldialogs.cpp:133 #, kde-format msgid "Swap %1<->%2" msgstr "Razmeni %1 i %2" -#: smalldialogs.cpp:127 smalldialogs.cpp:128 smalldialogs.cpp:129 +#: smalldialogs.cpp:134 smalldialogs.cpp:135 smalldialogs.cpp:136 #, kde-format msgid "Copy %1->Output" msgstr "Kopiraj %1 u izlaz" -#: smalldialogs.cpp:130 smalldialogs.cpp:131 smalldialogs.cpp:132 +#: smalldialogs.cpp:137 smalldialogs.cpp:138 smalldialogs.cpp:139 #, kde-format msgid "Swap %1<->Output" msgstr "Razmeni %1 i izlaz" -#: smalldialogs.cpp:138 +#: smalldialogs.cpp:148 #, kde-format msgid "Output (optional):" msgstr "Izlaz (opciono):" -#: smalldialogs.cpp:168 +#: smalldialogs.cpp:178 #, kde-format msgid "Configure..." msgstr "Podesi..." -#: smalldialogs.cpp:233 +#: smalldialogs.cpp:243 #, fuzzy, kde-format #| msgid "Directory" msgid "Open Directory" msgstr "Fascikla" -#: smalldialogs.cpp:234 +#: smalldialogs.cpp:244 #, kde-format msgid "Select Output File" msgstr "" -#: smalldialogs.cpp:393 +#: smalldialogs.cpp:403 #, kde-format msgid "Search text:" msgstr "Traženi tekst:" -#: smalldialogs.cpp:400 +#: smalldialogs.cpp:410 #, kde-format msgid "Case sensitive" msgstr "Razlikuj veličinu slova" -#: smalldialogs.cpp:403 +#: smalldialogs.cpp:413 #, kde-format msgid "Search A" msgstr "Pretraži A" -#: smalldialogs.cpp:408 +#: smalldialogs.cpp:418 #, kde-format msgid "Search B" msgstr "Pretraži B" -#: smalldialogs.cpp:413 +#: smalldialogs.cpp:423 #, kde-format msgid "Search C" msgstr "Pretraži C" -#: smalldialogs.cpp:418 +#: smalldialogs.cpp:428 #, kde-format msgid "Search output" msgstr "Izlaz pretrage" -#: smalldialogs.cpp:425 +#: smalldialogs.cpp:435 #, kde-format msgid "&Search" msgstr "&Traži" -#: smalldialogs.cpp:444 +#: smalldialogs.cpp:454 #, kde-format msgid "Regular Expression Tester" msgstr "Proba regularnih izraza" -#: smalldialogs.cpp:457 +#: smalldialogs.cpp:467 #, kde-format msgid "Example auto merge line:" msgstr "Primer reda za automatsko stapanje:" -#: smalldialogs.cpp:459 +#: smalldialogs.cpp:469 #, kde-format msgid "To test auto merge, copy a line as used in your files." msgstr "" "Za probu automatskog stapanja, kopirajte red kakav se nalazi u fajlovima." -#: smalldialogs.cpp:465 smalldialogs.cpp:493 smalldialogs.cpp:529 +#: smalldialogs.cpp:475 smalldialogs.cpp:503 smalldialogs.cpp:539 #, kde-format msgid "Match result:" msgstr "Rezultat poklapanja:" -#: smalldialogs.cpp:484 +#: smalldialogs.cpp:494 #, kde-format msgid "Example history start line (with leading comment):" msgstr "Primer početnog reda istorijata (sa vodećim komentarom):" -#: smalldialogs.cpp:486 +#: smalldialogs.cpp:496 #, kde-format msgid "" "Copy a history start line as used in your files,\n" @@ -3474,17 +3478,17 @@ "Kopirajte početni red istorijata kakav se nalazi u fajlovima, uključujući i " "vodeći komentar." -#: smalldialogs.cpp:512 +#: smalldialogs.cpp:522 #, kde-format msgid "History sort key order:" msgstr "Redosled ređanja ključeva istorijata:" -#: smalldialogs.cpp:520 +#: smalldialogs.cpp:530 #, kde-format msgid "Example history entry start line (without leading comment):" msgstr "Primer početnog reda stavke istorijata (bez vodećeg komentara):" -#: smalldialogs.cpp:522 +#: smalldialogs.cpp:532 #, kde-format msgid "" "Copy a history entry start line as used in your files,\n" @@ -3493,48 +3497,48 @@ "Kopirajte početni red stavke istorijata kakav se nalazi u fajlovima, ali " "izostavljajući vodeći komentar." -#: smalldialogs.cpp:536 +#: smalldialogs.cpp:546 #, kde-format msgid "Sort key result:" msgstr "Rezultat ređanja ključeva:" -#: smalldialogs.cpp:584 smalldialogs.cpp:594 smalldialogs.cpp:614 +#: smalldialogs.cpp:594 smalldialogs.cpp:604 smalldialogs.cpp:624 #, kde-format msgid "Match success." msgstr "Poklapanje je uspelo." -#: smalldialogs.cpp:588 smalldialogs.cpp:598 smalldialogs.cpp:620 +#: smalldialogs.cpp:598 smalldialogs.cpp:608 smalldialogs.cpp:630 #, kde-format msgid "Match failed." msgstr "Poklapanje nije uspelo." -#: smalldialogs.cpp:605 +#: smalldialogs.cpp:615 #, kde-format msgid "Opening and closing parentheses do not match in regular expression." msgstr "Ne poklapaju se otvorene i zatvorene zagrade u regularnom izrazu." -#: SourceData.cpp:150 +#: SourceData.cpp:153 #, kde-format msgid "Writing clipboard data to temp file failed." msgstr "Upisivanje podataka iz klipborda u privremeni fajl nije uspelo." -#: SourceData.cpp:154 +#: SourceData.cpp:157 #, kde-format msgid "From Clipboard" msgstr "Iz klipborda" -#: SourceData.cpp:335 +#: SourceData.cpp:348 #, fuzzy, kde-format #| msgid "Mix of links and normal files." msgid "%1 is not a normal file." msgstr "Mešavina veza i normalnih fajlova." -#: SourceData.cpp:427 +#: SourceData.cpp:440 #, kde-format msgid " Temp file is: %1" msgstr "" -#: SourceData.cpp:432 +#: SourceData.cpp:445 #, kde-format msgid "" "Preprocessing possibly failed. Check this command:\n" @@ -3549,12 +3553,12 @@ "\n" "Naredba predobrade će sada biti deaktivirana." -#: SourceData.cpp:443 SourceData.cpp:507 +#: SourceData.cpp:456 SourceData.cpp:525 #, kde-format msgid "File %1 too large to process. Skipping." msgstr "" -#: SourceData.cpp:487 +#: SourceData.cpp:500 #, kde-format msgid "" "The line-matching-preprocessing possibly failed. Check this command:\n" diff -Nru kdiff3-1.8.01/po/sv/diff_ext.po kdiff3-1.8.3/po/sv/diff_ext.po --- kdiff3-1.8.01/po/sv/diff_ext.po 2019-05-18 01:02:28.000000000 +0000 +++ kdiff3-1.8.3/po/sv/diff_ext.po 2020-06-25 00:18:53.000000000 +0000 @@ -5,8 +5,8 @@ msgid "" msgstr "" "Project-Id-Version: \n" -"Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2019-03-22 03:09+0100\n" +"Report-Msgid-Bugs-To: https://bugs.kde.org\n" +"POT-Creation-Date: 2019-11-04 07:54+0100\n" "PO-Revision-Date: 2018-08-06 20:40+0100\n" "Last-Translator: Stefan Asserhäll \n" "Language-Team: Swedish \n" @@ -17,118 +17,113 @@ "Plural-Forms: nplurals=2; plural=n != 1;\n" "X-Generator: Lokalize 2.0\n" -#: diff_ext.cpp:391 +#: diff_ext.cpp:223 #, kde-format msgid "Compare with %1" msgstr "Jämför med %1" -#: diff_ext.cpp:392 +#: diff_ext.cpp:224 #, kde-format msgid "Merge with %1" msgstr "Sammanfoga med %1" -#: diff_ext.cpp:408 +#: diff_ext.cpp:234 #, kde-format msgid "3-way merge with base" msgstr "Trevägs sammanfogning med bas" -#: diff_ext.cpp:411 +#: diff_ext.cpp:237 #, kde-format msgid "Save '%1' for later" msgstr "Spara '%1' till senare" -#: diff_ext.cpp:426 +#: diff_ext.cpp:251 #, kde-format msgid "Compare with ..." msgstr "Jämför med..." -#: diff_ext.cpp:429 +#: diff_ext.cpp:254 #, kde-format msgid "Clear list" msgstr "Rensa lista" -#: diff_ext.cpp:434 +#: diff_ext.cpp:259 #, kde-format msgid "Compare" msgstr "Jämför" -#: diff_ext.cpp:438 +#: diff_ext.cpp:263 #, kde-format msgid "3 way comparison" msgstr "Trevägs jämförelse" -#: diff_ext.cpp:444 +#: diff_ext.cpp:269 #, kde-format msgid "About Diff-Ext ..." msgstr "Om Diff-Ext..." -#: diff_ext.cpp:515 +#: diff_ext.cpp:340 #, kde-format msgid "(32 Bit)" msgstr "(32 bitar)" -#: diff_ext.cpp:517 -#, kde-format -msgid "(64 Bit)" -msgstr "(64 bitar)" - -#: diff_ext.cpp:518 +#: diff_ext.cpp:342 #, kde-format msgid "Diff-Ext Copyright (c) 2003-2006, Sergey Zorin. All rights reserved.\n" msgstr "" "Diff-Ext Copyright © 2003-2006, Sergey Zorin. Alla rättigheter förbehållna.\n" -#: diff_ext.cpp:519 +#: diff_ext.cpp:343 #, kde-format msgid "This software is distributable under the BSD-2-Clause license.\n" msgstr "Programvaran distribueras enligt licensen BSD-2-Clause.\n" -#: diff_ext.cpp:520 +#: diff_ext.cpp:344 #, kde-format msgid "Some extensions for KDiff3 (c) 2006-2013 by Joachim Eibl.\n" msgstr "Vissa utökningar för Kdiff3 © 2006-2013 by Joachim Eibl.\n" -#: diff_ext.cpp:521 +#: diff_ext.cpp:345 #, kde-format msgid "Homepage for Diff-Ext: http://diff-ext.sourceforge.net\n" msgstr "Hemsida för Diff-Ext: http://diff-ext.sourceforge.net\n" -#: diff_ext.cpp:522 +#: diff_ext.cpp:346 #, kde-format msgid "About Diff-Ext for KDiff3 " msgstr "Om Diff-Ext3 för Kdiff3" -#: diff_ext.cpp:551 +#: diff_ext.cpp:375 #, kde-format msgid "Compare selected files" msgstr "Jämför markerade filer" -#: diff_ext.cpp:557 diff_ext.cpp:577 +#: diff_ext.cpp:381 diff_ext.cpp:399 #, kde-format msgid "Compare '%1' with '%2'" msgstr "Jämför '%1' med '%2'" -#: diff_ext.cpp:563 +#: diff_ext.cpp:386 #, kde-format msgid "Save '%1' for later operation" msgstr "Spara '%1' för senare åtgärd" -#: diff_ext.cpp:619 +#: diff_ext.cpp:440 #, kde-format msgid "Could not start KDiff3. Please rerun KDiff3 installation." msgstr "Kunde inte starta Kdiff3. Gör om installation av Kdiff3." -#: diff_ext.cpp:620 +#: diff_ext.cpp:441 #, kde-format msgid "Command" msgstr "Kommando" -#: diff_ext.cpp:621 +#: diff_ext.cpp:442 #, kde-format msgid "CommandLine" msgstr "Kommandorad" -#: diff_ext.cpp:622 +#: diff_ext.cpp:443 #, kde-format msgid "Diff-Ext For KDiff3" msgstr "Diff-Ext för Kdiff3" \ No newline at end of file diff -Nru kdiff3-1.8.01/po/sv/docs/kdiff3/index.docbook kdiff3-1.8.3/po/sv/docs/kdiff3/index.docbook --- kdiff3-1.8.01/po/sv/docs/kdiff3/index.docbook 1970-01-01 00:00:00.000000000 +0000 +++ kdiff3-1.8.3/po/sv/docs/kdiff3/index.docbook 2020-06-25 00:19:29.000000000 +0000 @@ -0,0 +1,2933 @@ + +KDiff3"> + + +]> + + + + + + +Handbok &kdiff3; + + +Michael Reeves
reeves.87@gmail.com
Joachim Eibl
joachim.eibl snabela gmx.de +
 + +StefanAsserhäll
stefan.asserhall@bredband.net
Översättare + + + +2002-2007 +Joachim Eibl + + +2017-2019 +Michael Reeves + + + +&FDLNotice; + + + +2019-02-22 +1.08.02 + + + +&kdiff3; är ett verktyg för jämförelser och sammanfogning av filer och kataloger, som +jämför och sammanfogar två eller tre indatafiler med text eller kataloger, +visar skillnaden rad-för-rad och tecken-för-tecken(!), +tillhandahåller en automatisk sammanfogningsfunktion, +har en editor för bekväm upplösning av sammanfogningskonflikter, +erbjuder nätverkstransparens via KIO, +har alternativ för att färglägga eller dölja ändringar av blanktecken och kommentarer, +stöder Unicode, UTF-8 och andra filkodningar, +skriver ut skillnader, +stöder versionshanteringsnyckelord och historiksammanfogning. + +Det här dokumentet beskriver &kdiff3; version 1.8. + + + + + +KDE +kdiff3 +diff +sammanfoga +CVS +trippeljämförelse +jämföra +filer +kataloger +versionshantering +trevägs sammanfogning +skillnader på plats +synkronisera +kpart +kio +nätverkstransparent +editor +blanktecken +kommentarer + + + + +Inledning +Ännu ett jämförelsegränssnitt? +Det finns flera grafiska jämförelseverktyg. Varför ska du välja &kdiff3;? Låt mig tala om varför jag skrev det. &kdiff3; påbörjades därför att jag var tvungen att göra en svår sammanfogning. Att sammanfoga är nödvändigt när flera personer arbetar med samma fil i ett projekt. En sammanfogning kan vara delvis automatiserad, när sammanfogningsverktyget inte bara har tillgång till de nya ändrade filerna (som kallas "grenar"), utan också originalfilen (som kallas "bas"). Sammanfogningsverktyget väljer automatiskt en ändring som bara gjorts i en gren. När flera bidragsgivare ändrar samma rader, detekterar sammanfogningsverktyget en konflikt som måste lösas manuellt. Sammanfogningen var svår eftersom en bidragsgivare hade ändrat mycket och rättat indenteringen på många ställen. Den andra bidragsgivaren hade också ändrat mycket text i samma fil, vilket orsakade flera konflikter vid sammanfogningen. Verktyget som jag då använde visade bara ändrade rader, men inte vad som hade ändrats inom raden. Det fanns inte heller någon information om var bara indenteringen hade ändrats. Sammanfogningen var en mindre mardröm. Det var alltså början. Den första versionen kunde visa skillnader på en rad, och visade skillnader i blanktecken. Senare tillkom många funktioner för att öka användbarheten. Om du till exempel snabbt vill jämföra en text, kan du kopiera den till klippbordet och klistra in i endera jämförelsefönstret. En funktion som krävde en stor ansträngning var funktionen för katalogjämförelse och sammanfogning, som gjorde programmet till en nästan fullständig filbläddrare. Jag hoppas att &kdiff3; fungerar för dig, också. Ha det så kul! Joachim Eibl (2003) + + +Skärmbilder och funktioner +Den här skärmbilden visar skillnaden mellan två textfiler +(Med en tidig version av &kdiff3;): + + + + +Trevägs sammanfogning stöds fullständigt. Den är användbar om två personer ändrar kod oberoende av varandra. Originalfilen (basen) används för att hjälpa &kdiff3; att automatiskt välja de riktiga ändringarna. Sammanfogningseditorn under jämförelsefönstren låter dig lösa konflikter, medan utdata du kommer att få visas. Skärmbilden visar tre indatafiler som håller på att' sammanfogas: + + + + + +&kdiff3; hjälper dig också att jämföra och sammanfoga hela kataloger. Den här skärmbilden visar &kdiff3; under en katalogsammanfogning: + + + + + + +Mer funktioner +Rad-för-rad och tecken-för-tecken jämförelsevisning +Genom att använda möjligheterna hos en grafisk färgskärm, visar &kdiff3; exakt vad skillnaderna är. När du måste göra många kodgranskningar, gillar du det här. + + + + + +Se skillnader i blanktecken med en blick +Mellanslag och tabulatorer som skiljer sig åt syns. När rader bara skiljer sig i mängden blanktecken syns det med en blick i sammanfattningskolumnen till vänster. (Inga mer problem om någon ändrar indenteringen.) + + + + + +Trevägsjämförelse +Analysera tre filer och se var de skiljer sig åt. Vänster/mitten/höger fönster kallas A/B/C och har blå/grön/magenta färg. Om en fil är likadan och en annan annorlunda för en rad, så visar färgerna vilken fil som är annorlunda. Den röda färgen betyder att båda de andra filerna är olika. + + + + + +Bekväm sammanfogning av två eller tre indatafiler +&kdiff3; kan användas för att sammanfoga två eller tre indatafiler och sammanfogar automatiskt så mycket som möjligt. Resultatet visas i ett redigerbart fönster där de flesta konflikter kan lösas med ett enda musklick. Välj knapparna A/B/C i verktygsraden för att välja källan som ska användas. Du kan också välja mer än en källa. Eftersom utmatningsfönstret är en editor, kan till och med konflikter som behöver ytterligare korrigering lösas här utan att kräva ett annat verktyg. + + +Och ... + + Snabb navigering via knappar. + Ett musklick i sammanfattningskolumnen synkroniserar alla fönster så att samma position visas. + Markera och kopiera från vilket fönster som helst, och klistra in i resultatfönstret för sammanfogning. + Översiktskolumn som visar var ändringar och konflikter finns. + Färgerna kan justeras enligt dina specifika önskemål. + Justerbar flikstorlek. + Alternativ för att infoga mellanslag istället för tabulatortecken. + Öppna filer bekvämt via dialogrutor, eller ange filnamn på kommandoraden. + Sök efter strängar i alla textfönster. Sök (Ctrl+F) och Sök igen (F3) + Visa radnummer för varje rad. + Klistra in klippbordet eller dra text till ett indatafönster för jämförelse + Nätverkstransparens via KIO. + Kan användas för jämförelsevisning i KDevelop 3. + Radbrytning för långa rader. + Stöd för Unicode, UTF-8 och andra kodningar. + Stöd för språk som läses från höger till vänster. + ... + + + + + +Filjämförelse och sammanfogning + +Kommandoradsväljare + +Jämföra två filer: +kdiff3 fil1 fil2 + + + +Sammanfoga två filer: +kdiff3 fil1 fil2 -m + kdiff3 fil1 fil2 -o utdatafil + + + +Jämföra tre filer: +kdiff3 fil1 fil2 fil3 + + + +Sammanfoga tre filer: +kdiff3 fil1 fil2 fil3 -m + kdiff3 fil1 fil2 fil3 -o utdatafil + +Observera att fil1 behandlas som bas för fil2 och fil3. + + +Specialfall: Filer med samma namn +Om alla filer har samma namn men finns i olika kataloger, kan du reducera hur mycket du måste skriva genom att bara ange filnamnet för den första filen. T.ex.: +kdiff3 kat1/filnamn kat2 kat3 + + + +Kommandorad för att starta en katalogjämförelse eller sammanfogning: +Det här är mycket likt, men nu handlar det om kataloger. +kdiff3 kat1 kat2 + kdiff3 kat1 kat2 -o målkat + kdiff3 kat1 kat2 kat3 + kdiff3 kat1 kat2 kat3 -o målkat + +För katalogjämförelse och sammanfogning kan du fortsätta att läsa här. + + +Andra kommandoradsväljare +För att se alla tillgängliga kommandoradsväljare, skriv +kdiff3 --help + +Exempel på utmatning: +Väljare: + -m, --merge Sammanfoga indata. + -b, --base file Explicit basfil. För att fungera tillsammans med vissa verktyg. + -o, --output file Utdatafil. Betyder underförstått -m. T.ex.: -o ny_fil.txt + --out file Utdatafil, igen. (för att fungera med vissa verktyg.) + --auto Inget grafiskt gränssnitt om alla konflikter kan lösas automatiskt (kräver -o fil) + --qall Lös inte konflikter automatiskt. (För att fungera med andra verktyg...) + --L1 alias1 Synlig ersättning av namn för indatafil 1 (bas). + --L2 alias2 Synlig ersättning av namn för indatafil 2. + --L3 alias3 Synlig ersättning av namn för indatafil 3. + -L, --fname alias Alternativ synlig ersättning av namn. Ange detta en gång för all indata. + --cs string Överskrid en inställning. Använd en gång för varje inställning, t.ex. --cs "AutoAdvance=1" + --confighelp Visa lista med inställningar och nuvarande värden. + --config file Använd en annan inställningsfil. + +Väljaren låter dig justera ett inställningsalternativ som annars bara kan justeras via inställningsdialogrutorna. Men var medveten om att när &kdiff3; avslutas lagras det ändrade värdet tillsammans med andra inställningar. Med kan du ta reda på namnen på tillgängliga alternativ och nuvarande värden. +Via kan du ange en annan inställningsfil. Om du ofta använder &kdiff3; med helt olika inställningar låter det dig enkelt byta mellan dem. + +Kommandoradsväljare som ignoreras +Många personer vill använda &kdiff3; tillsammans med något versionshanteringssystem, men när versionshanteringssystemet anroppar &kdiff3; med kommandoradsväljare som &kdiff3; inte känner igen, avslutas &kdiff3; med ett fel. Integrationsinställningarna gör det möjligt att ange kommandoradsväljare som ska ignoreras av &kdiff3;. De visas i användningshjälpen som i det här exemplet: +--väljare Ignoreras. (anvädardefinierad) + + + Kommandoradsväljare att ignorera:En lista med väljare, åtskilda med semikolon ';'. När en av dessa väljare finns på kommenderaden, ignorerar &kdiff3; den och kör utan att rapportera ett fel. (Förval är "u;query;html;abort"). + +Om det inte är nog, rekommenderas du att skriva ett skalskript som gör översättningen av väljare. + + + + +Dialogrutan Öppna +Eftersom många indatafiler måste kunna väljas, har programmet en särskild öppningsdialogruta: + + + +Öppningsdialogrutan tillåter att filnamnen redigeras för hand, att en fil väljes via filbläddraren ("Fil...") eller att senast använda filer väljes i kombinationsrutorna. Om du öppnar dialogrutan igen, finns de nuvarande namnen fortfarande där. Den tredje indatafilen krävs inte. Om fältet för "C" förblir tomt, görs bara en tvåvägs jämförelseanalys. Du kan också välja en katalog med "Katalog...". Om en katalog anges för A, startar en katalogjämförelse och sammanfogning. Om A anger en fil, men B, C eller utmatningen anger en katalog, använder &kdiff3; filnamnet från A i de angivna katalogerna. Om "Sammanfoga" är valt, blir raden "Utmatning" redigerbar. Det krävs dock inte att utdatafilens namn anges omedelbart. Du kan också vänta med detta till du sparar. Knappen "Anpassa..." visar inställningsdialogrutan, så att du kan ställa in alternativ innan analysen utförs. + + +Klistra in eller släpp indata +Ibland vill du jämföra delar av en text som inte är en egen fil. &kdiff3; låter dig också klistra in text från klippbordet i det indatafönster för jämförelse som har fokus. Jämförelseanalysen sker då omedelbart. I öppningsdialogrutan behöver du då inte ange filer, utan bara stänga den via "Avbryt". Du kan också använda drag och släpp: Dra en fil från en filhanterare eller markerad text från en editor och släpp den på ett indatafönster för jämförelse. Vad är idén? Ibland innehåller en fil två liknande funktioner, men att kontrollera hur lika de verkligen är blir en stor ansträngning om du först måste skapa två filer och sedan ladda dem. Nu kan du helt enkelt kopiera, klistra in och jämföra de relevanta avsnitten. För närvarande kan du inte dra någonting från &kdiff3;. Bara att släppa indata i jämförelsefönstret stöds. Varning: Vissa editorer tolkar fortfarande drag och släpp till ett annat program som klipp ut (istället för kopiera) och klistra in. Ditt ursprungliga data kan då gå förlorat. + + +Jämföra filer och tolka informationen i indatafönstren + + + +InformationsradLängst upp i varje textfönster finns dess "informationsrad". Informationsraderna i indatafönstret innehåller bokstaven "A", "B" eller "C", filnamnet och radnumret för den första synliga raden i fönstret. (Observera att fönstret "C" är valfritt.) Varje informationsrad visas i en egen färg. När du väljer en annan fil genom att bläddra eller avslutar redigera filnamnet här genom att trycka på returtangenten, laddas den nya filen och jämförs med filen eller filerna som redan är laddade. FärgläggningDe tre indatafönstren tilldelas bokstäverna "A", "B" och "C". "A" har blå färg, "B" har grön färg och "C" har magenta. (Det är förvalda färger, men de kan ändras via menyn Inställningar.) När en skillnad upptäcks visar färgen vilken indatafil som skiljer sig åt. När båda övriga indatafiler skiljer sig åt, är färgen som används för att uttrycka det normalt röd ("Konfliktfärg" i inställningarna). Det här färgläggningsschemat är särskilt användbart i fallet med tre indatafiler, som syns i nästa avsnitt (Sammanfogning). SammanfattningskolumnTill vänster om varje text är "sammanfattningskolumnen". Om skillnader uppstod på en rad, visar sammanfattningskolumnen motsvarande färg. För en skillnad som bara består av blanktecken är sammanfattningen kryssad. För programspråk, där blanktecken inte är så viktiga är det användbart för att se med en blick om något av vikt ändrades. (För C/C++ är blanktecken bara intressanta inne i strängar, i kommentarer, för preprocessorn och i några mycket esoteriska situationer.) Den vertikala linjen som skiljer sammanfattningskolumnen och texten är avbruten om indatafilen inte har några rader där. När radbrytning är aktiverad visas den vertikala linjen med punkter för brutna rader. ÖversiktskolumnPå höger sida är en "översiktskolumn" synlig till vänster om den vertikala rullningslisten. Den visar en komprimerad sammanfattning av indata "A". Alla skillnader och konflikter är synliga med en blick. När bara två indatafönster används, syns alla skillnader i rött här, eftersom alla skillnader också är konflikter. En svart rektangel ramar in den synliga delen av indata. För mycket långa indatafiler, där antalet indatarader är större än höjden på översikten i bildpunkter, delar flera indatarader en översiktsrad. En konflikt har prioritet över enkla skillnader, som har prioritet över inga ändringar, så att inga skillnader eller konflikter går förlorade här. Genom att klicka på översiktskolumnen visas motsvarande text. Justera rader manuelltIbland placerar algoritmen fel rader intill varandra, eller så vill du jämföra ett textstycke med text på en helt annan position i den andra filen. I dessa fall kan du manuellt tala om för &kdiff3; att vissa rader ska arrangeras i rak linje. Markera texten som du vill arrangera med musen, som du skulle göra vid kopiera och klistra in, i det första jämförelsefönstret och välj därefter "Lägg till manuell justering av jämförelse" i menyn "Jämförelsevy" (snabbtangenten &Ctrl;Y). En orange rad visas i sammanfattningskolumnen intill den markerade texten. Upprepa det för den andra och (om tillgänglig) tredje jämförelsevyn. &kdiff3; beräknar omedelbart om jämförelsen varje gång du gör det, och radar upp de markerade raderna. Naturligtvis kanske några av raderna som tidigare matchade inte längre matchar. För närvarande stöder inte sammanfogning användning av manuell hjälp vid jämförelse. Manuell ihopfogning och delning av jämförelseavsnittI vissa fall ser &kdiff3; för många eller för få avsnitt att sammanfoga. I ett sådant fall kan du foga ihop eller dela befintliga avsnitt. Lägg till nya avsnitt genom att först markera texten på raderna som hör ihop i något av indatafönstren (som vid kopiering till klippbordet). Välj därefter "Dela jämförelse vid markering" i menyn "Sammanfoga". Delningen görs ovanför den första raden och under den sista raden i den markerade texten. Om du bara vill lägga till ett avsnitt, markera text som börjar på ett annat avsnitts delning. För att foga ihop avsnitt i något indatafönster, markera någonting på raderna i avsnitten som ska fogas ihop. (Du kan också foga ihop flera avsnitt i ett steg.) Välj därefter "Foga ihop markerade jämförelser" i menyn "Sammanfoga". + + + +Sammanfogning och editorfönstret för sammanfogningsutdata + + + +Editorfönstret för sammanfogningsutdata (under indatafönstren för jämförelse) har också en informationsrad längst upp som visar "Utmatning", filnamnet och "[Ändrad]" om du redigerat något. Oftast innehåller det någon text från de automatiska sammanfogningsfunktionerna, men det innehåller också ofta konflikter. Spara är inaktiverat till alla konflikter är lösta! (Använd knapparna "Gå till föregående/nästa olösta konflikt" för att hitta återstående konflikter.) Med bara två filer är varje skillnad också en konflikt, som måste lösas manuellt. Med tre indatafiler behandlas den första som bas, medan den andra och tredje indatafilen innehåller ändringar. Om bara indata B eller C har ändrats för en viss rad, men inte båda väljes den ändrade källan automatiskt. Bara om B och C har ändrats på samma rader, detekterar verktyget en konflikt som måste lösas manuellt. När B och C är likadana, men inte samma som A, väljes C.  SammanfattningskolumnenEditorfönstret för sammanfogningsutdata har också en sammanfattningskolumn till vänster. Den visar bokstaven för indata som raden valdes, eller ingenting om alla tre källorna var likadana för raden. Vid konflikter visar den ett frågetecken "?" och raden visar "< Konflikter vid sammanfogning >", allt med rött. Eftersom det skulle ta mycket lång tid att lösa konflikter rad för rad, grupperas rader i grupper som har samma skillnader och konfliktkaraktär. Konflikter med bara blanktecken skiljs dock från andra konflikter för att förbättra sammanfogningen av filer där indenteringen ändrats på många rader. Ställa in aktuell grupp och synkronisera sammanfognings- och jämförelsevyns positionNär du klickar på sammanfattningskolumnen med vänster musknapp i endera fönstret, så markeras gruppen som hör till den raden i alla fönster och gruppens början visas. (Det här kan innebära ett automatiskt byte av position i fönstren om gruppens början inte syns.) Gruppen blir då den "aktuella gruppen". Den markeras med "Bakgrundsfärgen för aktuellt jämförelseintervall" och en svart rad visas till vänster om texten. Välja indata A, B eller C för aktuell konflikt och redigeringKnappraden under menyraden innehåller tre knappar för indataval som innehåller bokstäverna "A", "B" och "C". Klicka på knappen för indataval för att infoga rader (eller ta bort dem om de redan infogats) från respektive källfil. För att välja rader från flera indatafiler klicka på respektive knappar i nödvändig ordning. Om du till exempel vill att rader från "B" ska hamna före rader från "A" i utdata, klicka först på "B" och därefter på "A". Om du använder alternativet för att automatiskt gå vidare (Gå automatiskt till nästa olösta konflikt efter val av källa), måste du inaktivera det innan du väljer rader från flera indatafiler eller om du vill redigera raderna efter du valt dem. Annars går &kdiff3; till nästa konflikt efter den första indatafilen valts. Det är ofta användbart att direkt redigera sammanfogad utdata. Sammanfattningskolumnen visar "m" för varje rad som ändrades manuellt. När skillnaderna till exempel justeras på ett sätt så att ett enkelt val av indata inte är tillfredsställande, kan du markera texten som behövs och använda normal kopiera och klistra in för att placera den i sammanfogad utdata. Ibland, när en rad tas bort antingen på grund av automatisk sammanfogning eller genom redigering och inga andra rader finns kvar i gruppen, visas texten <Ingen källrad> på raden. Det är bara en platsmarkör för gruppen om du ändrar dig och väljer en källa igen. Texten syns inte i sparade filer eller i några markeringar som du vill kopiera och klistra in. Texten "< Konflikter vid sammanfogning >" visas på klippbordet om du kopierar och klistrar in någon text som innehåller en sådan rad. Men var ändå försiktig med att göra det. Välja indata A, B eller C för alla konflikterDen normala sammanfogningen börjar med att automatiskt lösa enkla konflikter. Menyn "Sammanfoga" tillhandahåller också några alternativ för andra vanliga behov. Om du måste välja samma källfil för de flesta konflikter, kan du välja "A", "B" eller "C" överallt, eller bara för återstående olösta konflikter, eller för olösta konflikter med blanktecken. Om du vill bestämma själv för varje enskild skillnad, kan du "Ändra skillnader till konflikter", eller om du vill återgå till de automatiska valen i &kdiff3; kan du välja "Lös automatiskt enkla konflikter". Då startar &kdiff3; om sammanfogningen. För åtgärder som påverkar dina tidigare ändringar frågar &kdiff3; om bekräftelse innan åtgärden utförs. Observera: När endera källan väljes för olösta konflikter för blanktecken och alternativet "Ignorera siffror" eller "Ignorera C/C++ kommentarer" används, så behandlas ändringar i siffror eller kommentarer också som blanktecken. Sammanfoga automatiskt nyckelord för versionshantering och historik (logg)Många versionshanteringssystem stöder särskilda nyckelord i filen (t.ex. "$Date$", "$Header$", "$Author$", "$Log$" etc.) Vid arkivering ändrar versionshanteringssystemet (VCN) dessa rader. Till exempel ändras "$Date$" till "$Date: 2005/03/22 18:45:01 $". Eftersom raden är olika i varje version av filen, skulle den kräva manuell interaktion under sammanfogningen. &kdiff3; erbjuder automatisk sammanfogning av dessa poster. För enkla rader som matchar alternativet "Reguljärt uttryck för automatisk sammanfogning" i alla indatafiler väljer &kdiff3; raden från B, eller om tillgänglig, den från C. (Dessutom är det nödvändigt att raderna i fråga radas upp i jämförelsen och att föregående rad inte innehåller en konflikt.) Den automatiska sammanfogningen kan antingen utföras omedelbart när sammanfogningen startas (aktivera alternativet "Kör automatisk sammanfogning med reguljärt uttryck när sammanfogning startar") eller senare via "Kör automatisk sammanfogning med reguljärt uttryck" i menyn Sammanfoga. Automatisk sammanfogning för versionshanteringshistorik (också kallat "logg") stöds också. Automatisk sammanfogning av historik kan antingen utföras omedelbart när sammanfogningen startas genom att aktivera alternativet "Sammanfogning enligt versionshanteringshistorik när sammanfogning startar" eller senare via "Lös automatiskt historikkonflikter" i menyn Sammanfoga. Oftast börjar versionshanteringshistoriken med en rad som innehåller nyckelordet "$Log$". Den måste matchas av alternativet "Reguljärt uttryck för historikens början". &kdiff3; detekterar vilka efterföljande rader som ingår i historiken genom att analysera de inledande tecknen som fanns före nyckelordet "$Log$". Om samma "inledande kommentar" också finns på följande rader inkluderas de också i historiken. Vid varje arkivering skriver VCS en unik rad som anger version, datum- och tidsinformation följd av rader med användarens kommentarer. Raderna utgör en historikpost. Historikavsnittet växer vid varje arkivering och de senaste posterna visas längst upp (efter historikens startrad). När två utvecklare arkiverar grenar av en fil under parallell utveckling, kommer historiken för sammanfogning att innehålla flera poster som visas som konflikter under sammafogning av grenarna. Eftersom sammafogning av dem kan bli mycket tröttsam, erbjuder &kdiff3; stöd för den med två möjliga strategier: Bara infoga historikinformationen från båda bidragsgivarna längst upp, eller sortera historikinformationen enligt en användardefinierad nyckel. Metoden att bara infoga alla poster är enklast att ställa in. &kdiff3; behöver bara en metod att detektera vilka rader som hör till en historikpost. De flesta VCS infogar en tom rad efter varje historikpost. Om det inte finns några andra tomma rader, är det ett tillräckligt villkor för &kdiff3;. Ange bara en tom "Reguljärt uttryck för historikens början". Om kriteriet med en tom rad inte är tillräckligt kan du ange ett reguljärt uttryck för att detektera historikpostens början. Observera att &kdiff3; tar bort duplicerade historikposter.Om en historikpost fanns flera gånger i en indatafils historik, förblir bara en post i utmatningen. Om du vill sortera historiken måste du ange hur sorteringsnyckeln ska byggas. Använd parenteser som i "Reguljärt uttryck för historikpostens början" för att gruppera delar av det reguljära uttrycket som senare ska användas i sorteringsnyckeln. Ange därefter "Sorteringsnycklarnas ordning från historikpostens början" med en lista av nummer som refererar till gruppens position i det reguljära uttrycket åtskilda av kommatecken ",". Eftersom det inte är så enkelt att få det rätt omedelbart, kan du prova och förbättra det reguljära uttrycket och nyckelgenereringen i en särskild dialogruta genom att klicka på knappen "Prova dina reguljära uttryck". Antag att historiken ser ut så här: +/************************************************************************** +** HISTORIK: $Log: \toms_sammanfogning_huvudvy\Mitt_program\kod\komplexalgoritm.cpp $ +** +** \head\integreringsgren_12 2 Apr 2001 10:45:41 tom +** Sammanfogade grenen simongren_15. +** +** \main\henry_felrättningsgren_7\1 30 Mar 2001 19:22:05 henry +** Förbättrade hastigheten för delrutinen omvandlaTill(). +** Fixade krasch. +**************************************************************************/ + Historikens inledande rad matchar det reguljära uttrycket ".*\$Log.*\$.*". Därefter följer historikposterna. Raden med nyckelordet "$Log$" börjar med två "*" och därefter följer ett mellanslag. &kdiff3; använder den första strängen utan blanktecken som "inledande kommentar" och antar att historiken slutar med den första raden utan denna inledande kommentar. I exemplet slutar den sista raden med en sträng som också börjar med två "*", men istället för ett mellanslag följer fler "*". Därför avslutar denna rad historiken. Om sortering av historiken inte krävs kan det reguljära uttrycket för historikpostens början se ut så här. (Raden är delad i två eftersom den inte skulle få plats annars.) +\s*\\main\\\S+\s+[0-9]+ (Jan|Feb|Mar|Apr|May|Jun|Jul|Aug|Sep|Oct|Nov|Dec) + [0-9][0-9][0-9][0-9] [0-9][0-9]:[0-9][0-9]:[0-9][0-9]\s+.* + För detaljinformation om reguljära uttryck se Trolltechs dokumentation av reguljära uttryck. Observera att "\s" (med ett litet "s") matchar alla blanktecken och "\S" (med ett stort "S") matchar alla tecken som inte är blanktecken. I vårt exempel innehåller historikpostens början först versionsinformation med det reguljära uttrycket "\\main\\\S+", datumet som består av dagen "[0-9]+", månaden "(Jan|Feb|Mar|Apr|May|Jun|Jul|Aug|Sep|Oct|Nov|Dec)" och året "[0-9][0-9][0-9][0-9]", tiden "[0-9][0-9]:[0-9][0-9]:[0-9][0-9]" och till sist utvecklarens inloggningsnamn ".*". Observera att de "inledande kommentartecknen" (i exemplet "**") redan har tagits bort av &kdiff3; innan försöket att matcha, alltså börjar det reguljära uttrycket med att matcha ett eller flera blanktecken "\s*". Eftersom kommentartecken kan skilja sig åt i varje fil (C/C++ använder t.ex. andra kommentartecken än ett Perl-skript), tar &kdiff3; hand om de inledande kommentartecknen och du ska inte ange dem i det reguljära uttrycket. Om du kräver sorterad historik måste sorteringsnyckeln beräknas. För att göra det måste relevanta delar i det reguljära uttrycket grupperas med parenteser. (De extra parenteserna kan också vara kvar även om historiksortering inaktiveras.) +\s*\\main\\(\S+)\s+([0-9]+) (Jan|Feb|Mar|Apr|May|Jun|Jul|Aug|Sep|Oct|Nov|Dec) + ([0-9][0-9][0-9][0-9]) ([0-9][0-9]:[0-9][0-9]:[0-9][0-9])\s+(.*) + Parenteserna innehåller nu 1. versionsinformation, 2. dag, 3. månad, 4. år, 5. tid, 6. namn. Men om vi vill sortera enligt datum och tid måste vi skapa en nyckel med elementen synliga i en annan ordning: Först året, följt av månad, dag, tid, versionsinformation och namn. Därför ska sorteringsnyckelns ordning som anges vara "4,3,2,5,1,6". Eftersom månadsnamn inte är bra att sortera enligt ("Apr" skulle vara först) detekterar &kdiff3; vilken ordning månadsnamnen anges och använder det numret istället ("Apr"->"04"). Och om ett rent nummer hittas omvandlas det till ett fyrasiffrors värde med inledande nollor för sortering. Till sist blir den resulterande sorteringsnyckeln för den första historikpostens inledande rad: 2001 04 0002 10:45:41 integreringsgren_12 tom + +För mer information, se också Inställningar av sammanfoga. + + + +Navigering och redigering +Mycket navigering görs med rullningslisterna och musen, men du kan också navigera med tangentbordet. Om du klickar på något fönster kan du använda markörtangenterna vänsterpil, högerpil, uppåtpil, neråtpil, Page Up, Page Down, Home, End, Ctrl+Home och Ctrl+End som du kan i andra program. Sammanfattningskolumnen intill indatafilernas vertikala rullningslist kan också användas för att navigera genom att klicka i den. Du kan också använda hjulmusen för att rulla uppåt och neråt. I editorn för sammanfogningsutdata kan du också använda andra tangenter för redigering. Du kan byta mellan infognings- och ersättningsläge med tangenten Insert. (Normalläget är infoga.) Ett klick med vänster musknapp i någon sammanfattningskolumn synkroniserar alla fönster för att visa början på samma grupp av rader (som förklaras i avsnittet Ställa in aktuell grupp och synkronisera sammanfognings- och jämförelsevyns position). Verktygsraden innehåller också nio navigeringsknappar som du kan använda för att gå till aktuell/första/sista skillnaden, till nästa/föregående skillnad (Ctrl+Neråtpil eller Ctrl+Uppåtpil), till nästa/föregående konflikt (Ctrl+Page Down eller Ctrl+Page Up) eller till nästa/föregående olösta konflikt. Observera att för &kdiff3; förblir en "konflikt" som inte automatiskt löstes vid start av sammanfogningen alltid en "konflikt" även om den är löst. Därav nödvändigheten att särskilja "olösta konflikter". +Automatisk fortsättning +Det finns också en knapp som heter "Gå automatiskt till nästa olösta konflikt efter val av källa" (automatisk fortsättning). Om du aktiverar det här, så går &kdiff3; automatiskt till nästa olösta konflikt när en källa väljes. Det kan hjälpa till när du bara vill välja en källa. När du behöver båda källor, eller du vill redigera efter valet, bör du troligen stänga av det här. Innan &kdiff3; fortsätter till nästa olösta konflikt, visas effekten av valet en kort tid. Den här fördröjningen kan justeras i inställningarna under Jämför och sammanfoga. Du kan ange "Fördröjning vid automatisk fortsättning" i millisekunder mellan 0 och 2000. Tips: Är du trött på många klick? Använd en kort fördröjning vid automatisk fortsättning och snabbtangenterna Ctrl+1/2/3 för att välja A/B/C för många konflikter. + + + +Markera, kopiera och klistra in +Indatafönstren visar inte någon markör, så markeringar måste göras med musen, genom att klicka med vänster musknapp på början, hålla nere musknappen och gå till slutet, där musknappen släpps upp igen. Du kan också markera ett ord genom att dubbelklicka på det. I editorn för sammanfogningsutdata kan du också markera med tangentbordet, genom att hålla nere skifttangenten och navigera med piltangenterna. Om markeringen överstiger det synliga området, kan du flytta musen över fönsterkanterna, vilket gör att &kdiff3; rullar i den riktningen. För mycket stora markeringar kan du också använda navigationstangenterna medan musknappen hålls nere. Använd t.ex. Page Up och Page Down för att snabbt gå till en viss position. Släpp upp musknappen på slutpositionen. För att markera allt i det nuvarande fönstret, använd menyn "Redigera" -> "Markera allt" (Ctrl+A). För att kopiera till klippbordet måste du trycka på knappen "Kopiera" (Ctrl+C eller Ctrl+Insert). Men det finns ett alternativ som heter "Kopiera automatiskt markering". Om det är aktiverat, kopieras vad du än väljer omedelbart, och du behöver aldrig explicit kopiera. Men var försiktig när du använder detta, eftersom klippbordets innehåll kan förstöras av misstag. "Klipp ut" (Ctrl+X eller Skift+Delete) kopierar till klippbordet och tar bort den markerade texten. "Klistra in" (Ctrl+V eller Skift+Insert) infogar texten på klippbordet vid markörens position eller istället för den nuvarande markeringen. Om du klistrar in i något av jämförelsefönstren visas klippbordets innehåll i fönstret och jämförelsen startas omedelbart om. Det är användbart om du snabbt vill hämta ett textstycke någonstans och jämföra det med något annat utan att först skapa filer. + + +Spara +Att spara tillåts bara när alla konflikter är lösta. Om filen redan finns och alternativet "Säkerhetskopiera filer" är markerat, ändras originalversionens namn med tillägg av filändelsen .orig, och om en sådan fil redan finns tas den bort. När du avslutar eller startar en ny jämförelseanalys och data inte sparats ännu, frågar &kdiff3; om du vill spara, avbryta eller fortsätta utan att spara. (&kdiff3; fångar inga signaler, så om du "dödar" &kdiff3; går data förlorat.) Radslut sparas enligt den normala metoden i det underliggande operativsystemet. För Unix slutar varje rad med ett nyradstecken "\n", medan för Windows-baserade system slutar varje rad med ett returtecken och ett nyradstecken "\r\n". &kdiff3; behåller inte radslut för indatafilerna, vilket också betyder att du inte ska använda &kdiff3; med binärfiler. + + +Söka efter strängar +Du kan söka efter en sträng i vilket textfönster som helst i &kdiff3;. Kommandot "Sök..." (Ctrl+F) i menyn Redigera, visar en dialogruta som låter dig ange strängen att söka efter. Du kan också välja de fönster som ska sökas. Sökning startar alltid från början. Använd kommandot "Sök igen" (F3) för att fortsätta till nästa förekomst. Om du väljer att söka i flera fönster, söks det första fönstret från början till slut innan sökningen fortsätter från början i nästa fönster, etc. + + +Utskrift +&kdiff3; stöder utskrift av skillnader mellan textfiler. Kommandot "Skriv ut..." (Ctrl+P) i menyn Arkiv visar en dialogruta som låter dig välja skrivare och justera andra alternativ. Det finns flera möjligheter att justera intervallet. Beroende på olika utskriftsdialogrutor på olika operativsystem, varierar metoden för att åstadkomma val av ett visst intervall. + + Alla:Skriv ut allt. + Aktuell:Skriv ut en sida som börjar på den första synliga raden i fönstret. (På system utan alternativet kan det åstadkommas genom att ange sidnumret 10000 för utskrift.) + Markering:Innan du väljer att skriva ut, markera text med musen (som för kopiera och klistra in) i ett av jämförelsefönstren för att definiera start- och slutrad. Om ingen text var markerad i något av jämförelsefönstren, är inte alternativet tillgängligt. (På system utan alternativet kan det åstadkommas genom att ange sidnumret 9999 för utskrift.) + Intervall:Ange första och sista sidan. + +Andra viktiga inställningar för utskrift tas från de normala inställningarna: + Teckensnitt, teckenstorlek + Visa radnummer + Radbryt + Färger + etc. + +Liggande formatering rekommenderas också för utskrift. + + +Alternativ +Alternativ och listan med senaste filer sparas när du avslutar programmet, och laddas igen när du startar det. (Menyn Inställningar -> Anpassa &kdiff3;...) +Teckensnitt +Välj ett teckensnitt med fast breddsteg. (På vissa system visar dialogrutan också teckensnitt med variabel bredd, men du bör inte använda dem.) + + Kursiv stil för skillnader:Om du markerar detta, visas textskillnader med kursiv version av det valda teckensnittet. Om teckensnittet inte stöder kursiv stil, gör det ingenting. + + + + +Färger + + Förgrundsfärg:Oftast svart. + Bakgrundsfärg:Oftast vit. + Bakgrundsfärg för jämförelse:Oftast ljusgrå. + Färg A:Oftast mörkblå. + Färg B:Oftast mörkgrön. + Färg C:Oftast mörk magenta. + Konfliktfärg:Oftast röd. + Bakgrundsfärg för aktuellt intervall:Oftast ljusgul. + Bakgrundsfärg för aktuellt jämförelseintervall:Oftast mörkgul. + Färg för manuellt justerade jämförelseintervall:Oftast orange. + Färg för nyaste fil i katalogjämförelse:Oftast grön. + Färg för äldsta fil i en katalogjämförelse:Oftast röd. + Färg för medelgamla filer i en katalogjämförelse:Oftast mörkgul. + Färg för saknade filer i en katalogjämförelse:Oftast svart. + +Att ändra färgerna för katalogjämförelser får inte någon effekt förrän nästa katalogjämförelse startas. +För system med bara 16 eller 256 färger är vissa rena färger inte tillgängliga. För sådana system väljer knappen "Förval" en ren färg. + + +Inställningar för editor + + Tabulator infogar mellanslag:Om det här inte är markerat, och du trycker på tabulatortangenten, infogas en tabulator, annars infogas lämpligt antal mellanslag. + Tabulatorbredd:Kan justeras för dina speciella behov. Normalvärdet är 8. + Automatisk indentering:När du trycker på Enter eller returtangenten, används föregående rads indentering för den nya raden. + Kopiera automatiskt markering:Varje markering kopieras omedelbart till klippbordet när den aktiveras, och du behöver inte kopiera den explicit. + Radslutstil:När du sparar kan du välja vilken radslutsstil du föredrar. Förvald inställning är det vanliga valet för operativsystemet som används. + + + +Inställningar av jämför +När filer jämförs försöker &kdiff3; först att matcha rader som är lika i alla indatafiler. Det är bara under detta steg som blanktecken kan ignoreras. Det andra steget jämför varje rad. Under detta steg ignoreras inte blanktecken. Under sammanfogning ignoreras inte heller blanktecken. + + + Ignorera siffror:Normalvärdet är av. Siffertecken ('0'-'9', '.', '-') ignoreras under första delen av analysen när radmatchningen görs. Skillnaderna för resultatet visas ändå, men de behandlas som blanktecken. + Ignorera C/C++ kommentarer:Normalvärdet är av. Ändringar i kommentarer behandlas som ändringar i blanktecken. + Ignorera skiftläge:Normalvärdet är av. Ändringar i skiftläge för tecken (som 'A' eller 'a') hanteras som ändringar i blanktecken. + Preprocessorkommando:Se nästa avsnitt. + Radmatchande preprocessorkommando:Se nästa avsnitt. + Var noggrann:Gör en ansträngning att hitta en ännu mindre skillnad (Normalvärdet är på). Det här är troligen effektivt för komplicerade och stora filer, och långsamt för mycket stora filer. + + + +Inställningar av sammanfoga + + Fördröjning vid automatisk fortsättning (ms):I automatiskt fortsättningsläge anger den här inställningen hur länge resultatet för gruppen ska visas innan hopp till nästa olösta konflikt. + Standardvärde för sammanfogning av blanktecken med två/tre filer:Lös automatiskt alla konflikter för blanktecken genom att välja angiven fil. (Normalvärdet är manuellt val.) Användbart om blanktecken verkligen är oviktiga i många filer. Om du bara behöver det ibland, är det bättre att använda "Välj A/B/C för olösta konflikter med blanktecken" i menyn Sammanfoga. Observera att om du antingen aktiverar "Ignorera siffror" eller "Ignorera C/C++ kommentarer" gäller det automatiska valet också vid konflikter för siffror eller kommentarer. + Reguljärt uttryck för automatisk sammanfogning:Reguljärt uttryck för rader där &kdiff3; automatisk ska välja en källa. Se också Automatisk sammanfogning ... + Kör automatisk sammanfogning med reguljärt uttryck när sammanfogning startar:Om aktiverad utför &kdiff3; den automatiska sammanfogningen med "Reguljärt uttryck för automatisk sammanfogning" när en sammanfogning startas. + Reguljärt uttryck för historikens början:Reguljärt uttryck för början av historikposten för sammanfogning. Oftast innehåller raden nyckelordet "$Log$". Förvalt värde: ".*\$Log.*\$.*" + Reguljärt uttryck för historikpostens början:En historikpost för sammanfogning består av flera rader. Ange det reguljära uttrycket för att detektera den första raden (utan inledande kommentar). Använd parenteser för att gruppera nycklarna du vill använda för sortering. Om det lämnas tomt, antar &kdiff3; att tomma rader skiljer historikposterna åt. Se också Automatisk sammanfogning ... + Sortering av historiksammanfogning:Aktivera sortering av versionshanteringshistorik. + Sorteringsnycklarnas ordning från historikpostens början:Varje parentes som används i det reguljära uttrycket för historikens startpost grupperar en nyckel som kan användas för sortering. Ange listan med nycklar (som numreras i ordning de uppträder med början på 1) med ',' som skiljetecken (t.ex. "4,5,6,1,2,3,7"). Om det lämnas tomt utförs ingen sortering. Se också Automatisk sammanfogning ... + Sammanfogning enligt versionshanteringshistorik när sammanfogningen startar:Om aktiverad utför &kdiff3; den automatiska sammafogningen av historik med tidigarenämnda alternativ när en sammanfogning startas. + Maximalt antal historikposter:&kdiff3; kortar av historiklistan till angivet antal poster. Använd -1 för att undvika avkortning. (Standardvärde är -1). + Prova dina reguljära uttryckKnappen visar en dialogruta som låter dig förbättra och prova det reguljära uttrycket ovan. Kopiera bara respektive data från dina filer till exempelraderna. "Matchningsresultat" visar omedelbart om matchningen lyckas eller inte. "Sorteringsnyckelresultat" visar nyckeln som används för sortering vid sammanfogning av historik. + Ej relevant sammanfogningskommando:Ange ett eget kommando som ska anropas när &kdiff3; detekterar att filen från B inte bidrar med något relevant data som inte reda finns i filen från C. Kommandot anropas med de tre filnamnen som parametrar. Data som matchas av "Reguljärt uttryck för automatisk sammanfogning" eller i historiken anses inte vara relevant. + + + + +Katalogsammanfogning +De här alternativen har att göra med avsökning av katalogen och hantering av sammanfogningen: Se Katalogjämförelse och sammanfogning för detaljinformation. Ändå finns det ett alternativ här som också är relevant för att spara enstaka filer: + + Säkerhetskopiera filer:När en fil sparas och en äldre version redan finns, ändras originalversionens namn med tillägg av filändelsen ".orig". Om en gammal säkerhetskopia med filändelsen ".orig" redan finns tas den bort utan säkerhetskopiering. + + + +Inställningar för region och språk + + Språk:Justera användargränssnittets språk. Att ändra alternativet påverkar inte programmet som kör. Du måste avsluta och starta om &kdiff3; för att ändra språk. (Alternativet är inte tillgängligt i ramverksversionen av &kdiff3;.) + Använd samma kodning för allt:Följande kodningsalternativ kan justeras separat för varje objekt, eller om alternativet är sant, ställs alla värden in till det första värdet. + Lokal kodning:Ovanför kodningsväljarna visas en anmärkning som talar om för dig vad den lokala kodningen är (Den kan inte justeras, utan bara som information om du inte vet vad den lokala kodningen är, men behöver kunna välja den.) + Filkodning för A/B/C:Justera filkodningen för indatafiler. Det ger effekt på hur specialtecken tolkas. Eftersom du kan justera varje kodning separat, kan du till och med jämföra och sammanfoga filer som sparades med olika kodningar. + Filkodning för sammanfogad utdata och vid spara:När du har redigerat en fil, kan du justera vilken kodning som används när den sparas till disk. + Filkodning för preprocessorfiler:När du definierar preprocessorer kanske de inte kan hantera din kodning (exempelvis om dina filer använder 16-bitars Unicode och preprocessorn bara kan hantera 8-bitars ASCII). Med det här alternativet kan du definiera kodningen för preprocessorns utdata. + Språk som läses från höger till vänsterVissa språk skrivs från höger till vänster. När alternativet är aktiverat, ritar &kdiff3; text från höger till vänster i jämförelsefönstren och i sammanfogningsfönstret. Observera att om du startar &kdiff3; med kommandoradsväljaren "--reverse" så visas all layout också från höger till vänster. (Det är en funktion som Qt tillhandahåller.) Denna dokumentation är skriven med antagandet att "Språk som läses från höger till vänster" eller omvänd layout inte är aktiverade. Vissa referenser till "vänster" eller "höger" måste ersättas av motsatsen om du använder alternativen. + + + + +Diverse +(Dessa alternativ och åtgärder är tillgängliga i menyerna eller verktygsraden.) + + Visa radnummer:Du kan välja om radnummer ska visas för indatafilerna. + Visa mellanslag och tabulatortecken i jämförelse:Ibland är synliga mellanslag och tabulatortecken störande. Du kan stänga av detta. + Visa blanktecken:Stäng av det här för att inte visa ändringar av bara blanktecken i texten eller översiktskolumnerna. (Observera att detta också gäller ändringar av siffror eller kommentarer om alternativen "Ignorera siffror" eller "Ignorera C/C++ kommentarer" är aktiva.) + Översiktsalternativ:Dessa alternativ är bara tillgängliga när du jämför tre filer. I normalläge visas alla skillnader i en färgkodad översiktskolumn, men ibland är du särskilt intresserad av skillnaderna mellan två av de tre filerna. Genom att välja översikten "A mot B", "A mot C" eller "B mot C", visas en andra översiktskolumn med begärd information intill den vanliga översikten. + Radbryt skillnadsfönster:Radbryt rader när deras längd skulle överskrida ett fönsters bredd. + Visa fönster A/B/C:Ibland vill du använda skärmutrymmet bättre för långa rader. Dölj fönster som inte är viktiga. (I menyn Fönster.) + Byt delningsorientering:Byt mellan jämförelsefönster som visas intill varandra (A till vänster om B till vänster om C) eller ovanför varandra (A ovanför B ovanför C). Det bör också hjälpa för långa rader. (I menyn Fönster.) + Starta sammanfogning snabbt:Ibland tittar du på skillnader, och bestämmer dig för att sammanfoga. "Sammanfoga aktuell fil" i menyn Katalog fungerar också om du bara jämför två filer. Ett enkelklick startar sammanfogningen och använder filnamnet på den sista indatafilen som förvalt utmatningsfilnamn. (När detta används för att starta om en sammanfogning, behålls utmatningsfilnamnet.) + + + +Anpassa snabbtangenter +För närvarande stöder bara ramverksversionen anpassningsbara snabbtangenter (Menyn Inställningar -> Anpassa genvägar...) + + + +Preprocessorkommandon +&kdiff3; stöder två preprocessoralternativ. + + Preprocessorkommando:När en fil läses, skickas den via det här externa kommandot. Utmatningen från kommandot visas istället för den ursprungliga filen. Du kan skriva din egen preprocessor som uppfyller dina speciella behov. Använd det här för att ta bort störande delar av filen, eller för att automatiskt korrigera indenteringen, etc. + Radmatchande preprocessorkommando:När en fil läses, skickas den via det här externa kommandot. Om ett preprocessorkommando (se ovan) också anges är utmatningen från preprocessorn inmatning till den radmatchande preprocessorn. Utmatningen används bara under radmatchningsfasen av analysen. Du kan skriva din egen preprocessor som uppfyller dina speciella behov. Varje indatarad måste ha en motsvarande utdatarad. + + +Idén är att ge användaren större flexibilitet när jämförelseresultatet ställs in, men det kräver ett externt program, och många användare vill inte skriva ett själva. De goda nyheterna är att ofta klarar sed eller perl av jobbet. +Till exempel ett enkelt fall att prova: Betrakta filen a.txt (6 rader): + aa + ba + ca + da + ea + fa + Och filen b.txt (3 rader): + cg + dg + eg + Utan en preprocessor skulle följande rader placeras intill varandra: + aa - cg + ba - dg + ca - eg + da + ea + fa + Det är troligen inte vad som önskas eftersom den första bokstaven innehåller den intressanta informationen. För att hjälpa matchningsalgoritmen att ignorera den andra bokstaven kan man använda ett radmatchande preprocessorkommando som ersätter 'g' med 'a': + sed 's/g/a/' + Med det kommandot blir resultatet av matchningen: + aa + ba + ca - cg + da - dg + ea - eg + fa + Internt ser matchningsalgoritmen filerna efter den radmatchande preprocessorn har körts, men på skärmen är filen oförändrad. (Den normala preprocessorn skulle också ändra data på skärmen.) + +Grundläggande information om <command +>sed</command +> +Det här avsnittet introducerar bara några mycket grundläggande funktioner i sed. För mer information se info:/sed eller http://www.gnu.org/software/sed/manual/html_mono/sed.html. En förkompilerad version för Windows finns på http://unxutils.sourceforge.net. Observera att följande exempel antar att sed finns i någon katalog i miljövariabeln PATH. Om det inte är fallet, måste du ange fullständig absolut sökväg till kommandot. +I det här sammanhanget används bara ersättningskommandot i sed: + sed 's/REGUTTRYCK/ERSÄTTNING/FLAGGOR' + Innan du använder ett nytt kommando inne i &kdiff3;, bör du först prova det i en terminal. Då är kommandot echo användbart. Till exempel: + echo abrakadabra | sed 's/a/o/' + -> obrakadabra + Exemplet visar ett mycket enkelt sed-kommando som ersätter den första förekomsten av "a" med "o". Om du vill ersätta alla förekomster behöver du flaggan "g": + echo abrakadabra | sed 's/a/o/g' + -> obrokodobro + Symbolen "|" är rörledningskommandot som överför utdata från föregående kommando till indata i efterföljande kommando. Om du vill prova med en längre fil kan du använda cat på Unix-liknande system eller type på Windows-liknande system. sed utför ersättningen för varje rad. cat filnamn |sed väljare + + + +Exempel på användning av <command +>sed</command +> i &kdiff3; +Ignorera andra typer av kommentarer +För närvarande förstår &kdiff3; bara C/C++ kommentarer. Genom att använda ett radmatchande preprocessorkommando kan du också ignorera andra typer av kommentarer genom att konvertera dem till C/C++ kommentarer. Exempel: För att ignorera kommentarer som börjar med "#", skulle du vilja konvertera dem till "//". Observera att du också måste aktivera alternativet "Ignorera C/C++ kommentarer" för att få någon effekt. Ett lämpligt radmatchande preprocessorkommando skulle vara: + sed 's/#/\/\//' + Eftersom tecknet "/" har en särskild betydelse i sed, är det nödvändigt att lägga till tecknet "\" innan varje "/" i ersättningssträngen. Ibland behövs "\" för att lägga till eller ta bort en särskild betydelse för vissa tecken. De enkla citationstecknen (') är bara viktiga vid utprovning i kommandoskalet eftersom det annars skulle försöka tolka vissa tecken. Kdiff3 gör inte det utom för teckenföljderna '\"' och '\\'. + +Jämförelse som inte är skiftlägeskänslig +Använd följande radmatchande preprocessorkommando för att omvandla all indata till stora bokstäver: + sed 's/\(.*\)/\U\1/' + Här är ".*" ett reguljärt uttryck som matchar alla strängar, och i det här sammanhanget matchar alla tecken på raden. Tecknet "\1" i ersättningssträngen motsvarar den matchade texten mellan det första paret "\(" och "\)". "\U" konverterar den infogade texten till stora bokstäver. + + +Ignorera nyckelord för versionshantering +CVS och andra versionshanteringssystem använder flera nyckelord för att infoga automatiskt skapade strängar (info:/cvs/Keyword substitution). Alla följer mönstret "$NYCKELORD skapad text$". Nu behöver vi ett radmatchande preprocessorkommando som bara tar bort den skapade texten: + sed 's/\$\(Revision\|Author\|Log\|Header\|Date\).*\$/\$\1\$/' + Strängen "\|" skiljer de möjliga nyckelorden åt. Du kanske vill ändra listan enligt dina behov. Tecknet "\" framför "$" behövs eftersom annars matchar "$" radens slut. +Medan du experimenterar med sed kan du komma att förstå och till och med tycka om de reguljära uttrycken. De är användbara eftersom det finns många andra program som också stöder liknande funktioner. + + +Ignorera siffror +Att ignorera siffror är i själva verket ett inbyggt alternativ, men som ett annat exempel, visas hur det skulle se ut som ett radmatchande preprocessorkommando. + sed 's/[0123456789.-]//g' + Alla tecken inom '[' och ']' matchar och kommer att ersättas av ingenting. + + +Ignorera vissa kolumner +Ibland är texten mycket strikt formaterad, och innehåller kolumner som du alltid vill ignorera, medan det finns andra kolumner du vill bevara för analys. I följande exempel ignoreras de fem första kolumnerna (tecknen), de följande tio kolumnerna bevaras, därefter ignoreras återigen fem kolumner och resten av raden bevaras. + sed 's/.....\(..........\).....\(.*\)/\1\2/' + Varje punkt '.' motsvarar vilket enstaka tecken som helst. Strängarna "\1" och "\2" i ersättningssträngen refererar till den matchande texten inom det första och andra paret av "\(" och "\)" som anger texten att bevara. + + +Kombinera flera ersättningar +Ibland vill du tillämpa flera ersättningar samtidigt. Då kan du använda semikolon ';' för att skilja dem från varandra. Till exempel: echo abrakadabra | sed 's/a/o/g;s/\(.*\)/\U\1/' + -> OBROKODOBRO + + + + +Använda <command +>perl</command +> istället för <command +>sed</command +> +Istället för sed kanske du vill använda något annat som perl. + perl -p -e 's/REGUTTRYCK/ERSÄTTNING/FLAGGOR' + Men vissa detaljer är annorlunda i perl. Observera att där sed behöver "\(" och "\)" kräver perl det enklare "(" och ")" utan inledande '\'. Till exempel: sed 's/\(.*\)/\U\1/' + perl -p -e 's/(.*)/\U\1/' + + + + + +Ordning vid körning av preprocessor +Data skickas igenom all intern och extern förbehandling i följande ordning: + +Normal preprocessor, +Preprocessor för radmatchning, +Ignorera skiftläge (konvertering till stora bokstäver), +Detektering av C/C++ kommentarer, +Ignorera siffror, +Ignorera blanktecken + +Data efter den normala förbehandlingen bevaras för att visas och sammanfogas. De andra åtgärderna ändrar bara data som algoritmen för radmatchande jämförelse ser. I de sällsynta fall då du använder normal förbehandling, observera att den radmatchande förbehandlingen ser utdata från den normala förbehandlingen som indata. + + +Varning +Förbehandlingskommandon är ofta mycket användbara, men som med alla alternativ som ändrar texten eller döljer vissa skillnader automatiskt, kan du av misstag hoppa över vissa skillnader och i värsta fall förstöra viktig data. Av denna orsak, om ett normalt preprocessorkommando används under en sammanfogning, talar &kdiff3; om det för dig och frågar om det ska inaktiveras eller inte. Men du får ingen varning om ett radmatchande preprocessorkommando är aktivt. Sammanfogningen sker inte förrän alla konflikter är lösta. Om du inaktiverade "Visa blanktecken" blir också skillnaderna som togs bort med det radmatchande preprocessorkommandot osynliga. Om knappen Spara förblir inaktiv under en sammanfogning (på grund av kvarvarande konflikter), försäkra dig om att aktivera "Visa blanktecken". Om du inte vill sammanfoga dessa mindre viktiga skillnader för hand kan du välja "Välj [A|B|C] för olösta konflikter med blanktecken" i menyn "Sammanfoga". + + + + + +Katalogjämförelse och sammanfogning med &kdiff3; +Introduktion till katalogjämförelse och sammanfogning +Ofta måste programmerare ändra många filer i en katalog för att uppnå sina syften. För att åstadkomma detta låter &kdiff3; dig också jämföra och sammanfoga hela kataloger rekursivt! Även om jämförelse och sammanfogning av kataloger verkar vara ganska självklart, finns det flera detaljer som du bör känna till. Det viktigaste är förstås faktum att många filer nu kan påverkas av varje åtgärd. Om du inte har säkerhetskopior av originaldata, kan det vara mycket svårt eller till och med omöjligt att återgå till originalläget. Så innan du påbörjar en sammanfogning, försäkra dig om att data är säkert, och att det är möjligt att återställa. Om du skapar ett arkiv, eller använder ett versionshanteringssystem är ditt eget beslut, men till och med erfarna programmerare och integratörer behöver ibland gammal källkod. Observera också att även om jag (upphovsmannen till &kdiff3;) försöker att göra mitt bästa, kan jag inte garantera att det inte finns fel. Enligt GNU GPL finns det INGEN GARANTI av något slag för det här programmet. Så var ödmjuk, och kom alltid ihåg: +
+ Att fela är mänskligt, men för att verkligen ställa till det behövs en dator. +
+Så det här är vad programmet kan göra åt dig: &kdiff3; ... + + ... läser och jämför två eller tre kataloger rekursivt, + ... hanterar symboliska länkar särskilt, + ... låter dig bläddra mellan filer med ett dubbelklick på musen, + ... föreslår ett sammanfogningsalternativ för varje objekt, som du kan ändra innan katalogsammanfogningen startas, + ... låter dig simulera sammanfogningen och listar åtgärderna som skulle ske, utan att verkligen göra dem, + ... låter dig utföra sammanfogningen, och låter dig bestämma så fort manuell interaktion behövs, + ... låter dig utföra vald åtgärd för alla objekt (tangenten F7 ) eller markerat objekt (tangenten F6), + ... låter dig fortsätta sammanfogningen efter manuell interaktion med tangenten F7, + ... skapar valfria säkerhetskopior, med filändelsen ".orig", + ... + + + +Starta katalogjämförelse eller sammanfogning +Det här liknar mycket sammanfogning och jämförelse av en enstaka fil. Du måste bara ange kataloger på kommandoraden eller i dialogrutan för filöppning. +Jämföra eller sammanfoga två kataloger: +kdiff3 kat1 kat2 + kdiff3 kat1 kat2 målkat + +Om ingen målkatalog anges, använder &kdiff3; kat2. + + +Jämföra eller sammanfoga tre kataloger: +kdiff3 kat1 kat2 kat3 + kdiff3 kat1 kat2 kat3 målkat + +När tre kataloger sammanfogas, används kat1 som basen för sammanfogningen. Om ingen målkatalog anges, använder &kdiff3; kat3 som målkatalog för sammanfogningen. + +Observera att bara jämförelsen startas automatiskt, inte sammanfogningen. För det måste du först välja ett menyalternativ eller tangenten F7. (Mer information kommer senare.) + + + +Katalogsammanfogning av synlig information +Medan katalogerna läses visas en meddelanderuta som informerar dig om förloppet. Om du avbryter katalogavsökningen, visas bara filer som hittills har jämförts. När katalogavsökningen är färdig, visar &kdiff3; en listruta med återstående resultat, ... + + + +... och detaljinformation om det markerade objektet till höger: + + + + + +Namnkolumnen +Varje fil och katalog som hittades under avsökningen visas här i ett träd. Du kan välja ett objekt genom att klicka en gång på det med musen. Katalogerna är normalt ihopdragna. Du kan expandera och dra ihop dem genom att klicka på "+"/"-", genom att dubbelklicka på objektet eller genom att använda tangenterna vänsterpil och högerpil. Menyn "Katalog" innehåller också två alternativ "Dra ihop alla underkataloger" och "Expandera alla underkataloger" som du kan använda för att dra ihop eller expandera alla kataloger på en gång. Om du dubbelklickar på ett filobjekt, utförs filjämförelsen och jämförelsefönstret för filer visas. +Ikonen i namnkolumnen motsvarar filtypen i den första katalogen ("A"). Den kan vara någon av dessa: + + Normal fil + Normal katalog (katalogikon) + Länk till en fil (filikon med en länkpil) + Länk till en katalog (katalogikon med en länkpil) + +Om filtypen är annorlunda i övriga kataloger, syns det i kolumnerna A/B/C och i fönstret som visar detaljinformation om det markerade objektet. Observera att i dessa fall kan inte någon sammanfogningsåtgärd väljas automatiskt. När sammanfogningen startas, informeras användaren om den här sortens problem. + + +Kolumnerna A/B/C och färgläggningsschemat +Som syns i bilden ovan, används färgerna röd, grön, gul och svart i kolumnerna A/B/C. + + Svart: Det här objektet finns inte i den här katalogen. + Grön: Nyaste objektet. + Gul: Äldre än grön, nyare än röd. + Röd: Äldsta objektet. + +Utom för objekt som var identiska i jämförelsen, där är färgen också identisk även om åldern inte är det. Kataloger anses vara likadana om alla objekt de innehåller är likadana. Då har de också samma färg. Åldern på en katalog spelar dock ingen roll för dess färg. Idén för färgläggningsschemat hittade jag i dirdiff. Färgerna motsvarar färgerna hos ett löv som är grönt från början, sedan blir gult och till sist rött när det är gammalt. + +Åtgärdskolumnen +Efter att ha jämfört katalogerna utvärderar &kdiff3; också ett förslag på sammanfogningsåtgärd. Det visas i kolumnen "Åtgärd". Du kan ändra den genom att klicka på åtgärden du vill ändra. En liten meny dyker upp och låter dig välja en åtgärd för objektet. (Du kan också välja den oftast använda åtgärden via tangentbordet. Ctrl+1/2/3/4/Delete väljer A/B/C/Sammanfoga/Ta bort om de är tillgängliga.) Åtgärden utförs under sammanfogningen. Vilka åtgärder som är tillgängliga beror på objektet och sammanfogningsläget som används. Sammanfogningsläget är ett av + + Sammanfogning av tre kataloger ("A" behandlas som äldsta bas för båda). + Sammanfogning av två kataloger. + Tvåkatalogs synkroniseringsläge (aktiveras med alternativet "Synkronisera kataloger"). + +Vid trekatalogers sammanfogning är den förslagna åtgärden: Om för ett objekt... + + ... alla tre katalogerna är likadana: Kopiera från C + ... A och C är likadana med B är det inte: Kopiera från B (eller om B inte finns, ta bort målet om det finns) + ... A och B är likadana med C är det inte: Kopiera från C (eller om C inte finns, ta bort målet om det finns) + ... B och C är likadana med A är det inte: Kopiera från C (eller om C inte finns, ta bort målet om det finns) + ... bara A finns: Ta bort målet (om det finns) + ... bara B finns: Kopiera från B + ... bara C finns: Kopiera från C + ... A, B och C är inte likadana: Sammanfoga + ... A, B och C har inte samma filtyp (t.ex. A är en katalog, B är en fil): "Fel: Konflikt i filtyper". Medan sådana objekt finns, kan inte katalogsammanfogningen startas. + +Vid tvåkatalogers sammanfogning är den förslagna åtgärden: Om för ett objekt... + + ... båda katalogerna är likadana: Kopiera från B + ... A finns men inte B: Kopiera från A + ... B finns men inte A: Kopiera från B + ... A och B finns men är inte likadana: Sammanfoga + ... A och B har inte samma filtyp (t.ex. A är en katalog, B är en fil): "Fel: Konflikt i filtyper". Medan sådana objekt finns, kan inte katalogsammanfogningen startas. + +Synkroniseringsläge är bara aktivt om två kataloger och ingen explicit målkatalog anges, och om alternativet "Synkronisera kataloger" är aktivt. &kdiff3; väljer då en standardåtgärd så att båda katalogerna är likadana efteråt. Om för ett objekt ... + + ... båda katalogerna är lika: Ingenting görs. + ... A finns, men inte B: Kopiera A till B + ... B finns, men inte A: Kopiera B till A + ... A och B finns, men är inte likadana: Sammanfoga och lagra resultatet i båda kataloger. (För användaren är det synliga filnamnet för att spara B, men därefter kopierar &kdiff3; också B till A.) + ... A och B har inte samma filtyp (t.ex. A är en katalog, B är en fil): "Fel: Konflikt i filtyper". Medan sådana objekt finns, kan inte katalogsammanfogningen startas. + +När två kataloger sammanfogas och alternativet "Kopiera nyare istället för att sammanfoga" är markerat, tittar &kdiff3; på datum och föreslår att välja den nyare filen. Om filerna inte är lika men har samma datum, innehåller åtgärden "Fel: Datum är lika men filerna är det inte." Medan sådana objekt finns, kan inte katalogsammanfogningen startas. + + +Statuskolumnen +Under sammanfogningen behandlas en fil i taget. Statuskolumnen visar "Klar" för objekt där sammanfogningsåtgärden har lyckats, och någon annan text om något oväntat inträffade. När en sammanfogning är färdig, bör du göra en sista kontroll för att se att status för alla objekt är acceptabel. + + +Statistikkolumner +När filjämförelseläget "Fullständig analys" är aktiverat i alternativen, visar &kdiff3; extra kolumner som innehåller antal oupplösta, upplösta, inte blanka och blanka konflikter. (Kolumnen lösta visas bara när kataloger jämförs eller sammanfogas.) + + +Välja listade filer +Flera alternativ påverkar vilka filer som listas här. Vissa är tillgängliga i inställningsdialogrutan. Menyn Katalog innehåller alternativen: + "Visa identiska filer": Filer som har detekterats som lika i alla indatakataloger. + "Visa olika filer": Filer som finns i två eller flera kataloger men inte är lika. + "Visa bara filer i A": Filer som bara finns i A, men inte i B eller C. + "Visa bara filer i B": Filer som bara finns i B, men inte i A eller C. + "Visa bara filer i C": Filer som bara finns i C, men inte i A eller B. + +Aktivera bara alternativen "Visa" för objekten du vill lista. Om du till exempel bara vill lista alla objekt som antingen finns i A eller i B men inte i båda, måste du aktivera "Visa bara filer i A" och "Visa bara filer i B" och inaktivera alla andra ("Visa identiska filer", "Visa olika filer", "Visa bara filer i C"). Listan uppdateras omedelbart för att motsvara ändringen. Alternativen gäller också för kataloger med ett undantag: Att inaktivera "Visa olika filer" döljer inte hela kataloger. Det fungerar bara för filer inne i dem. Observera att av dessa är bara alternativet "Visa identiska filer" som är bestående Övriga aktiveras när &kdiff3; startas. + + + + + +Utföra en katalogsammanfogning +Du kan antingen sammanfoga markerat objekt (fil eller katalog), eller alla objekt. När du har gjort alla val av åtgärder (också i alla underkataloger), kan du utföra sammanfogningen. Var medveten om att om du inte explicit angav en målkatalog, blir målet "C" i trekatalogsläge, "B" i tvåkatalogsläge, och i synkroniseringsläge är det "A" och/eller "B". Om du också har angivit en målkatalog, kontrollera att alla objekt som ska finnas i utmatningen finns i trädet. Det finns några alternativ som får vissa objekt att utelämnas från katalogjämförelsen och sammanfogningen. Kontrollera dessa alternativ för att undvika obehagliga överraskningar: + + "Rekursiva kataloger": Om det är av, hittas inte objekt i underkataloger. + "Mönster" eller "Undantagsmönster": Inkludera eller undanta objekt som matchar + "Undanta gömda filer" + "Visa"-alternativ (Visa identiska/olika filer, bara filer i A/B/C) + +Om du ändrar inställningarna för att visa fler filer, måste du göra en omsökning via menyn "Katalog" -> "Avsök igen". (Orsaken till det är att &kdiff3; utelämnar jämförelsen för filer enligt kriterierna för att få snabbare jämförelsehastighet.) Om du ändrade fil- och katalogmönster för att undanta filer, uppdateras fillistan omedelbart när inställningsdialogrutan stängs. Observera att när du skriver till en helt ny katalog vill du oftast också kopiera de identiska filerna. Aktivera "Visa identiska filer" i detta fall. Om din målkatalog är en av indatakatalogerna, är det inte nödvändigt eftersom filerna redan finns där. Om du är nöjd hittills, är resten enkelt. För att sammanfoga alla objekt: Välj "Starta eller fortsätt katalogsammanfogning" i menyn "Katalog" eller tryck på F7 (som är snabbtangenten). För att bara sammanfoga aktuellt objekt: Välj "Utför åtgärd för aktuellt objekt" eller tryck på F6. Om vissa objekt med ogiltiga filtyper fortfarande finns, på grund av filtyper med konflikter, visas en meddelanderuta och objekten pekas ut, så att du kan välja en giltig åtgärd för objektet. Om du sammanfogar alla objekt visas en dialogruta som ger dig alternativen "Gör det", "Simulera det" och "Avbryt". + + Välj "Simulera det" om du vill se vad som skulle göras utan att verkligen göra det. En utförlig lista med alla åtgärder visas. + Välj annars "Gör det" för att verkligen utföra sammanfogningen. + +Därefter utför &kdiff3; den angivna åtgärden för alla objekt. Om manuell interaktion krävs (sammanfogning av enstaka fil), visas ett sammanfogningsfönster (se den stora skärmbilden). När du är klar med manuell sammanfogning av en fil, välj återigen "Starta eller fortsätt katalogsammanfogning" eller tryck på F7. Om du inte har sparat ännu, ber en dialogruta dig att göra det. Därefter fortsätter &kdiff3; till nästa objekt. När &kdiff3; stöter på ett fel, meddelas det och utförlig statusinformation visas. Längst ner i listan finns det några felmeddelanden som bör hjälpa dig att förstå problemets orsak. När du fortsätter sammanslagningen (tangenten F7), ger &kdiff3; dig valet att försöka igen eller hoppa över objektet som orsakade problemet. Det betyder att du kan välja en annan åtgärd, eller lösa problemet på annat sätt, innan du fortsätter. När sammanfogningen är färdig, informerar &kdiff3; dig med en meddelanderuta. Om vissa objekt sammanfogades individuellt innan katalogsammanfogningen, kommer &kdiff3; ihåg det (medan sammanfogningssessionen pågår), och sammanfogar dem inte igen när sammanfogningen för alla objekt utförs. Även när sammanfogningen hoppas över eller ingenting sparas räknas dessa objekt som färdiga. Bara när sammanfogningsåtgärden ändras, tas objektets "klar"-status bort och det kan sammanfogas igen. + + +Alternativ för att jämföra och sammanfoga kataloger +Inställning av &kdiff3; (menyn "Inställningar" -> "Anpassa &kdiff3;") har en sida som heter "Katalogsammanfogning" med följande alternativ: + + + Rekursiva kataloger:Välj om kataloger ska sökas igenom rekursivt. + Mönster för filer:Bara filer som matchar något mönster här läggs till i trädet. Mer än ett mönster kan anges genom att använda semikolon ";" som skiljetecken. Giltiga jokertecken: '*' och '?'. (t.ex. "*.cpp;*.h"). Normalvärdet är "*". Mönstret används inte för kataloger. + Undantagsmönster för filer:Filer som matchar något mönster undantas från trädet. Mer än ett mönster kan anges här genom att använda semikolon ";" som skiljetecken. Giltiga jokertecken: '*' och '?'. Normalvärdet är "*.orig;*.o;*.obj". + Undantagsmönster för kataloger:Kataloger som matchar något mönster undantas från trädet. Mer än ett mönster kan anges genom att använda semikolon ";" som skiljetecken. Giltiga jokertecken: '*' och '?'. Normalvärdet är "CVS;deps;.svn". + Använd .cvsignore:Ignorera filer och kataloger som också skulle ignoreras av CVS. Många automatiskt genererade filer ignoreras av CVS. Den stora fördelen är att detta kan vara katalogspecifikt via en lokal ".cvsignore" fil. (Se info:/cvs/cvsignore.) + Sök efter gömda filer och kataloger:För vissa filsystem har filer egenskapen "Dold". För andra system döljs ett filnamn som börjar med en punkt ("."). Alternativet låter dig bestämma om dessa filer ska ingå i trädet eller inte. Normalvärdet är på. + Följ fillänkar:För länkar till filer: Om inaktiverad, jämförs de symboliska länkarna. Om aktiverad, jämförs filerna bakom länkarna. Normalvärdet är av. + Följ kataloglänkar:För länkar till kataloger: Om inaktiverad, jämförs symboliska länkar. Om aktiverad behandlas länken som en katalog och avsöks rekursivt. (Observera att programmet inte kontrollerar om länken är "rekursiv". En katalog som innehåller en länk till samma katalog skulle orsaka en oändlig snurra, och efter en viss tid när stacken blir full eller minnet tar slut, kraschar programmet.) Normalvärdet är av. + Skiftlägeskänslig filnamnsjämförelse:Förvalt värde är falskt på Windows, och sant för andra operativsystem. + Filjämförelseläge: + + Binär jämförelse:Det här är förvalt filjämförelseläge. + Fullständig analys:Gör en fullständig analys av varje fil och visa kolumner med statistisk information. (Antal upplösta, oupplösta, inte blanka och blanka konflikter.) Den fullständiga analysen är långsammare än en enkel binäranalys, och är mycket långsammare för filer som inte innehåller text. (Ange lämpliga filmönster för att undvika dem.) + Lita på ändringsdatum:Om du jämför stora kataloger via ett långsamt nätverk, kan det gå snabbare att bara jämföra ändringsdatum och fillängd. Men hastighetsförbättringen sker till priset av en liten osäkerhet. Använd alternativet med försiktighet. Normalvärdet är av. + Lita på storleken:Liknar att lita på ändringsdatum. Ingen verklig jämförelse sker. Två filer anses vara lika om deras filstorlekar är lika. Detta är användbart när filkopieringsåtgärden inte bevarade ändringsdatum. Använd alternativet med försiktighet. Normalvärdet är av. + + + Synkronisera kataloger:Aktiverar "synkroniseringsläge" när två kataloger jämförs och ingen explicit målkatalog anges. I det här läget väljes föreslagna åtgärder så att båda källkatalogerna är likadana efteråt. Sammanfogningsresultatet skrivs också till båda kataloger. Normalvärdet är av. + Kopiera nyare istället för att sammanfoga:Istället för att sammanfoga kopierar den föreslagna åtgärden den nyare källan om ändringar har skett. (Anses vara osäkert, eftersom det förutsätter att du vet att den andra filen inte också har redigerats. Kontrollera för att vara säker i varje enskilt fall.) Normalvärdet är av. + Säkerhetskopiera filer:Om en fil eller hel katalog ersätts med en annan eller tas bort, då ändras originalversionens namn med tillägg av filändelsen ".orig". Om en gammal säkerhetskopia med filändelsen ".orig" redan finns tas den bort utan säkerhetskopiering. Det här gäller också normal sammanfogning av enstaka filer, inte bara sammanfogningsläge för kataloger. Normalvärdet är på. + + + +Andra funktioner i katalogsammanfogningsfönstret +Delat eller fullskärmsläge +Oftast förblir listfönstret för katalogsammanfogning synligt medan en enstaka fil jämförs eller sammanfogas. Du kan flytta raden som delar fillistan från fönstren för textjämförelse med musen. Om du inte vill göra det, kan du inaktivera "Delad skärmvy" i menyn "Katalog". Därefter kan du använda "Byt vy" i menyn "Katalog" för att byta mellan fillistan och fönstren för textjämförelse, som då upptar hela fönstret. + +Jämföra och sammanfoga en ensam fil +Du föredrar troligen ett vanligt dubbelklick på musen för att jämföra en fil. Hur som helst finns det också ett alternativ i menyn "Katalog". Du kan också direkt sammanfoga en enstaka fil, utan att starta katalogsammanfogning via "Sammanfoga markerade filer" i menyn "Sammanfoga". När resultatet sparas, sätts status till klar, och filen sammanfogas inte igen om en katalogsammanfogning startas. Men observera att statusinformationen går förlorad när du kör om en katalogavsökning: menyn "Katalog", "Avsök igen" + +Jämföra eller sammanfoga filer med olika namn +Ibland behöver du jämföra eller sammanfoga filer med olika namn (t.ex. nuvarande fil och säkerhetskopian i samma katalog). Markera den exakta filen genom att klicka på ikonen i kolumnen A, B eller C. Filen som först markeras på det sättet markeras med "A", den andra och tredje med "B" och "C" oberoende av vilken kolumn de finns i. Bara upp till tre filer kan markeras på detta sätt. Fortsätt genom att välja "Jämför explicit markerade filer" eller "Sammanfoga explicit markerade filer" från menyn "Katalog". Av bekvämlighetsskäl finns också menyalternativen som en sammanhangsberoende meny som visas när du klickar på den senast markerade filen. Jämförelsen eller sammanfogningen av en fil sker i samma fönster. Om metoden används för kataloger öppnas ett nytt fönster. + + + + +Diverse ämnen + +Nätverkstransparens via KIO +I/O-slavar +KIO-biblioteket i Ramverk stöder nätverkstransparens via I/O-slavar. &kdiff3; använder dem för att läsa indatafiler och avsöka kataloger. Det betyder att du kan ange filer och kataloger på lokal- och fjärr-resurser via webbadresser. Exempel: +kdiff3 test.cpp ftp://ftp.langtbortistan.org/test.cpp + kdiff3 tar:/home/hackare/arkiv.tar.gz/kat ./kat + + +Den första raden jämför en lokal fil med en fil på en FTP-server. Den andra raden jämför en katalog i ett komprimerat arkiv med en lokal katalog. Andra I/O-slavar som är intressanta är: + +Filer från WWW (http:), +Filer från FTP (ftp:), +Krypterad filöverföring (fish:, sftp:), +Windows-resurser (smb:), +Lokala filer (file:), + +Andra saker som är möjliga, men troligen mindre användbara, är: + +Manualsidor (man:), +Infosidor (info:), + + + +Hur man skriver webbadresser +En webbadress har en annorlunda syntax jämfört med sökvägar till lokala filer och kataloger. Vissa saker måste tas hänsyn till: + +En sökväg kan vara relativ, och kan innehålla "." eller "..". Det är inte möjligt för webbadresser, som alltid är absoluta. Specialtecken måste skrivas med särskilda "teckenföljder". ("#" blir "%23", mellanslag blir "%20", etc.) Till exempel skulle en fil med namnet "/#foo#" ha webbadressen "file:/%23foo%23". När webbadresser inte fungerar som väntat, försök att öppna dem i Konqueror först. + + + + +Möjligheter med I/O-slavar +Nätverkstransparens har en nackdel: Alla resurser har inte samma möjligheter. Ibland beror det på serverns filsystem, ibland på protokollet. Här är en kort lista med begränsningar: + +Ibland finns det inget stöd för länkar. Eller finns det inget sätt att särskilja om en länk pekar på en fil eller katalog, då antas alltid en fil (ftp:, sftp:). Kan inte alltid avgöra filstorleken. Begränsat stöd för rättigheter. Ingen möjlighet att ändra rättigheter eller ändringstid, så rättigheter eller tiden för en kopia skiljer sig från originalet. (Se alternativet "Lita på storlek". Ändring av rättigheter eller ändringstid är bara möjligt för lokala filer.) + + + + + +Använda &kdiff3; som en Kpart +Kdiff3 är en Kpart. För närvarande implementeras gränssnittet KParts::ReadOnlyPart. Den huvudsakliga användningen är för skillnadsvisning i KDevelop. KDevelop startar alltid den interna skillnadsvisningen först. För att använda &kdiff3;, klicka med höger musknapp i skillnadsvisningens fönster och välj "Visa i KDiff3-del" i den sammanhangsberoende menyn. &kdiff3; kräver normalt två fullständiga filer som indata. När det används som en del, antar &kdiff3; att indatafilen är en programfixfil med unifierat format. &kdiff3; hämtar därefter originalfilernas namn i programfixfilen. Åtminstone en av de två filerna måste vara tillgänglig. &kdiff3; startar då kommandot patch för att återskapa den andra filen. Du kan välja en programfixfil i &dolphin; och välja "Förhandsgranska i"-"Kdiff3-del" i den sammanhangsberoende menyn. Var medveten om att det inte fungerar om ingen av originalfilerna finns tillgänglig, och är inte tillförlitligt om originalfilen eller filerna har ändrats sedan programfixfilen skapades. När det kör som ett delprogram tillhandahåller &kdiff3; bara jämförelse mellan två filer, en mycket liten verktygsrad och meny. Sammanfogning eller katalogjämförelse stöds då inte. + + + +Använda &kdiff3; som ett verktyg för jämförelse och sammanfogning med Git +&kdiff3; kan användas som ett verktyg för jämförelse och sammanfogning med Git. +Lägg bara till följande rader i filen gitconfig. +[diff] + tool = kdiff3 +[difftool "kdiff3"] + path = <sökväg till binärfilen kdiff3 på systemet> +[difftool] + prompt = false + keepBackup = false + trustExitCode = false +[merge] + tool = kdiff3 +[mergetool] + prompt = false + keepBackup = false + keepTemporaries = false +[mergetool "kdiff3"] + path = <sökväg till binärfilen kdiff3 på systemet +> + +För att därefter se skillnaden mellan två incheckningar använd git difftool första kondensat andra kondensat --tool=kdiff3 --cc någon fil i git-trädet +Använd git merge grennamn && git mergetool --tool=kdiff3 för att sammanfoga en gren med &kdiff3;. +Efter att sammanfogningskonflikter har lösts på vanligt sätt är det tillräckligt att checka in ändringarna för att göra färdigt. + + + + +Vanliga frågor&reporting.bugs; &updating.documentation; + +Varför kallas det "&kdiff3;"? Verktyg som heter "KDiff" och "KDiff2" (som nu kallas "Kompare") fanns redan. Dessutom ska "Kdiff3" antyda att programmet kan sammanfoga som verktyget "diff3" från samlingen med diff-verktyg. + +Varför licensieras det under GPL? Jag har använt GPL-program under mycket lång tid nu, och lärt mig mycket genom att titta på en hel del av källkoden. Alltså är det här mitt "tack" till alla programmerare som också gjorde eller kommer att göra samma sak. + +Vissa knappar och funktioner saknas. Vad är fel? Du kompilerade från källkod, men angav troligen inte rätt prefix för installationen. Normalt vill cmake installera i /usr/local, men då kan inte resursfilen för användargränssnittet (dvs. kdiff3ui.rc) hittas. Filen README innehåller mer information om det riktiga prefixet. + +Ofta visas rader som är liknande men inte identiska intill varandra, men inte alltid. Varför? Rader där bara antal blanktecken är olika behandlas som "lika", medan bara ett annorlunda blanktecken gör att raderna är "olika". Om liknande rader finns intill varandra, är detta i själva verket en slump men det är som tur är oftast fallet. Se också hjälpen på manualsidan för diff. + +Varför måste alla konflikter vara lösta innan sammanfogningsresultatet kan sparas? För varje likadant eller annorlunda avsnitt kommer editorn i fönstret med sammanfogningsresultatet ihåg var det börjar och slutar. Det behövs eftersom konflikter kan lösas upp manuellt genom att helt enkelt välja källknappen (A, B eller C). Informationen går förlorad när filen sparas som text, och det är för mycket ansträngning att skapa ett speciellt filformat som stöder att spara och återställa all nödvändig information. + +Hur kan jag synkronisera jämförelsevyn och sammanfogningsvyn så att alla vyer visar samma textposition? Klicka på sammanfattningskolumnen till vänster om texten. (Se också här.) + +Varför har inte editorn i resultatfönstret för sammanfogning en "ångra"-funktion? Hittills har det varit för stor ansträngning. Du kan alltid återställa en version från en källa (A, B eller C) genom att klicka på motsvarande knapp. För större redigering, rekommenderas användning av en annan editor ändå. + +När jag tog bort en del text, visades plötsligt "<Ingen källrad>" och det kan inte tas bort. Vad betyder det och hur kan man ta bort det? För varje likadant eller annorlunda avsnitt kommer editorn i fönstret med sammanfogningsresultatet ihåg var det börjar och slutar. "<Ingen källrad>" betyder att det inte finns någonting kvar i ett avsnitt, inte ens ett nyradstecken. Detta kan inträffa antingen vid automatisk sammanfogning eller efter redigering. Det är inget problem, eftersom informationen inte finns med i den sparade filen. Om du vill ha tillbaka originalkällan, markera bara källan (klicka på sammanfattningskolumnen till vänster) och klicka därefter på källknappen med innehållet som önskas (A, B eller C). + +Varför stöder inte &kdiff3; syntaxfärgläggning? &kdiff3; använder redan många färger för färgläggning av jämförelser. Ytterligare färgläggning skulle vara förvirrande. Använd en annan editor för detta. + +Kan jag använda &kdiff3; för att jämföra filer från OpenOffice.Org, Word, Excel, PDF, och så vidare? Även om &kdiff3; kan analysera alla sorters filer, är resultatet troligen inte särskilt tillfredsställande för dig. &kdiff3; skapades för att jämföra rena textfiler. OpenOffice, Word, Excel, och så vidare, lagrar mycket mer information i filerna (om teckensnitt, bilder, sidor, färger, etc.), som &kdiff3; inte känner till. Alltså visar &kdiff3; dig innehållet i filen tolkat som ren text, men det kan vara oläsbart eller åtminstone se mycket konstigt ut. Eftersom de flesta program nuförtiden lagrar sitt innehåll med XML-format, kanske du kan läsa det som ren text. Om ändringen bara var liten, kanske &kdiff3; fortfarande kan hjälpa dig. Den bästa lösningen om du bara vill jämföra texten (utan inbäddade objekt som bilder) är att använda "Markera alla" och "Kopiera" i programmet för att kopiera den intressanta texten till klippbordet och därefter klistra in texten i något av jämförelsefönstren i &kdiff3;. (Se också Markera, kopiera och klistra in.) + +Vart har katalogalternativet "Lista bara skillnader" tagit vägen? Det finns nu flera olika "Visa"-alternativ i katalogmenyn. Att inaktivera "Visa identiska filer" åstadkommer vad aktivering av "Lista bara skillnader" brukade göra. + +Hur kan man göra en stor markering i jämförelsefönstret fastän det tar så lång tid att rulla texten? Påbörja markeringen som vanligt (klicka och håll nere vänster musknapp). Använd därefter navigationstangenterna (t.ex. Page Up, Page Down) medan vänster musknapp hålls nere. (Se också Markera, kopiera och klistra in.) + +Det finns en stor mängd information här, men din fråga har ändå inte besvarats? Skicka gärna din fråga till mig. Jag uppskattar alla kommentarer. + + + + + + +Tack till och licens + +&kdiff3;: Verktyg för jämförelser och sammanfogning av filer och kataloger +Program copyright 2002-2007 Joachim Eibl joachim.eibl snabela gmx.de +Flera häftiga idéer och felrapporter kom från kolleger och många personer ute i den Vida Vilda Världen. Tack! + +Dokumentation Copyright © 2002-2007 Joachim Eibl joachim. eibl snabela gmx.de + +Översättning Stefan Asserhällstefan.asserhall@bredband.net &underFDL; &underGPL; + +&documentation.index; + + + diff -Nru kdiff3-1.8.01/po/sv/docs/kdiff3/man-kdiff3.1.docbook kdiff3-1.8.3/po/sv/docs/kdiff3/man-kdiff3.1.docbook --- kdiff3-1.8.01/po/sv/docs/kdiff3/man-kdiff3.1.docbook 1970-01-01 00:00:00.000000000 +0000 +++ kdiff3-1.8.3/po/sv/docs/kdiff3/man-kdiff3.1.docbook 2020-06-25 00:19:29.000000000 +0000 @@ -0,0 +1,452 @@ + + +]> + + + +Kdiff3 användarhandbok +BurkhardLueck KDiff3 manualsida. &Burkhard.Lueck.mail; +2019-02-22 +kdiff3 1.8 + + + +kdiff3 +1 + + + +kdiff3 +Verktyg för jämförelse och sammanfogning av filer och kataloger + + + +kdiff3 fil fil fil alias1 alias2 alias3 alias sträng fil + + + +Beskrivning +Jämför två eller tre indatafiler eller -kataloger. + + + + +Alternativ + + + +Ignorera (användardefinierad). + + + + +Ignorera (användardefinierad). + + + + +Ignorera (användardefinierad). + + + + +Ignorera (användardefinierad). + + + + +Sammanfoga indata. + + + + fil +Explicit grundfil. För kompatibilitet med vissa verktyg. + + + + fil +Utdatafil. Förutsätter -m. T.ex. -o nyfil.txt + + + + fil +Utdatafil, igen. (För kompatibilitet med vissa verktyg.) + + + + +Inget grafiskt användargränssnitt om alla konflikter kan lösas automatiskt. (Kräver fil) + + + + +Lös inte konflikter automatiskt. + + + + alias1 +Synlig namnersättning för indatafil 1 (grund). + + + + alias2 +Synlig namnersättning för indatafil 2. + + + + alias3 +Synlig namnersättning för indatafil 3. + + + + alias +Alternativ synlig namnersättning. Använd en gång för varje indata. + + + + sträng +Överskrid en inställning. Använd en gång för varje inställning. T.ex. AutoAdvance=1. + + + + +Visa en lista över inställningsalternativ och nuvarande värden. + + + + fil +Använd en annan inställningsfil. + + + + +Fil 1 att öppna (grund, om ej angiven via --) + + + + +Fil 2 att öppna + + + + +Fil 2 att öppna + + + + + + + +Se också + +Mer detaljerad användardokumentation är tillgänglig med help:/kdiff3 (skriv antingen in webbadressen i &konqueror;, eller kör khelpcenter help:/kdiff3) +kf5options(7) +qt5options(7) + + + + +Upphovsmän +Den här manualsidan är skriven av &Burkhard.Lueck; &Burkhard.Lueck.mail;. + + + diff -Nru kdiff3-1.8.01/po/sv/kdiff3fileitemactionplugin.po kdiff3-1.8.3/po/sv/kdiff3fileitemactionplugin.po --- kdiff3-1.8.01/po/sv/kdiff3fileitemactionplugin.po 2019-05-18 01:02:28.000000000 +0000 +++ kdiff3-1.8.3/po/sv/kdiff3fileitemactionplugin.po 2020-06-25 00:18:53.000000000 +0000 @@ -5,8 +5,8 @@ msgid "" msgstr "" "Project-Id-Version: \n" -"Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2019-03-22 03:09+0100\n" +"Report-Msgid-Bugs-To: https://bugs.kde.org\n" +"POT-Creation-Date: 2019-08-30 07:40+0200\n" "PO-Revision-Date: 2019-03-22 18:20+0100\n" "Last-Translator: Stefan Asserhäll \n" "Language-Team: Swedish \n" diff -Nru kdiff3-1.8.01/po/sv/kdiff3.po kdiff3-1.8.3/po/sv/kdiff3.po --- kdiff3-1.8.01/po/sv/kdiff3.po 2019-05-18 01:02:28.000000000 +0000 +++ kdiff3-1.8.3/po/sv/kdiff3.po 2020-06-25 00:18:53.000000000 +0000 @@ -2,20 +2,20 @@ # Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc. # # Stefan Asserhäll , 2004, 2005, 2006, 2007, 2008, 2009, 2010. -# Stefan Asserhall , 2010, 2011, 2018, 2019. +# Stefan Asserhall , 2010, 2011, 2018, 2019, 2020. msgid "" msgstr "" "Project-Id-Version: kdiff3\n" -"Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2019-04-18 08:02+0200\n" -"PO-Revision-Date: 2019-03-09 08:23+0100\n" +"Report-Msgid-Bugs-To: https://bugs.kde.org\n" +"POT-Creation-Date: 2020-06-22 07:48+0200\n" +"PO-Revision-Date: 2020-02-11 17:04+0100\n" "Last-Translator: Stefan Asserhäll \n" "Language-Team: Swedish \n" "Language: sv\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: Lokalize 2.0\n" +"X-Generator: Lokalize 19.04.3\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" #, kde-format @@ -28,285 +28,285 @@ msgid "Your emails" msgstr "stefan.asserhall@bredband.net" -#: difftextwindow.cpp:412 +#: difftextwindow.cpp:414 #, kde-format msgid "File %1: Line %2" msgstr "Fil %1; Rad %2" -#: difftextwindow.cpp:414 +#: difftextwindow.cpp:416 #, kde-format msgid "File %1: Line not available" msgstr "Fil %1: Rad inte tillgänglig" -#: difftextwindow.cpp:1780 +#: difftextwindow.cpp:1778 #, kde-format msgid "Encoding:" msgstr "Kodning:" -#: difftextwindow.cpp:1782 mergeresultwindow.cpp:3138 optiondialog.cpp:818 +#: difftextwindow.cpp:1781 mergeresultwindow.cpp:3166 optiondialog.cpp:840 #, kde-format msgid "Line end style:" msgstr "Typ av radslut:" -#: difftextwindow.cpp:1810 directorymergewindow.cpp:382 -#: directorymergewindow.cpp:433 directorymergewindow.cpp:524 -#: directorymergewindow.cpp:3058 directorymergewindow.cpp:3189 -#: directorymergewindow.cpp:3417 mergeresultwindow.cpp:942 -#: mergeresultwindow.cpp:944 mergeresultwindow.cpp:946 -#: mergeresultwindow.cpp:948 mergeresultwindow.cpp:1814 -#: mergeresultwindow.cpp:3170 mergeresultwindow.cpp:3177 optiondialog.cpp:962 -#: optiondialog.cpp:975 pdiff.cpp:833 pdiff.cpp:835 pdiff.cpp:837 pdiff.cpp:839 -#: pdiff.cpp:861 smalldialogs.cpp:124 smalldialogs.cpp:126 smalldialogs.cpp:127 -#: smalldialogs.cpp:130 +#: difftextwindow.cpp:1809 directorymergewindow.cpp:383 +#: directorymergewindow.cpp:434 directorymergewindow.cpp:525 +#: directorymergewindow.cpp:3072 directorymergewindow.cpp:3203 +#: directorymergewindow.cpp:3431 mergeresultwindow.cpp:970 +#: mergeresultwindow.cpp:972 mergeresultwindow.cpp:974 +#: mergeresultwindow.cpp:976 mergeresultwindow.cpp:1842 +#: mergeresultwindow.cpp:3198 mergeresultwindow.cpp:3205 optiondialog.cpp:1002 +#: optiondialog.cpp:1015 pdiff.cpp:823 pdiff.cpp:825 pdiff.cpp:827 +#: pdiff.cpp:829 pdiff.cpp:851 smalldialogs.cpp:131 smalldialogs.cpp:133 +#: smalldialogs.cpp:134 smalldialogs.cpp:137 #, kde-format msgid "A" msgstr "A" -#: difftextwindow.cpp:1810 directorymergewindow.cpp:384 -#: directorymergewindow.cpp:436 directorymergewindow.cpp:526 -#: directorymergewindow.cpp:3064 directorymergewindow.cpp:3190 -#: directorymergewindow.cpp:3418 mergeresultwindow.cpp:942 -#: mergeresultwindow.cpp:944 mergeresultwindow.cpp:950 -#: mergeresultwindow.cpp:952 mergeresultwindow.cpp:1816 -#: mergeresultwindow.cpp:3172 mergeresultwindow.cpp:3179 optiondialog.cpp:963 -#: optiondialog.cpp:976 pdiff.cpp:833 pdiff.cpp:835 pdiff.cpp:841 pdiff.cpp:843 -#: pdiff.cpp:863 smalldialogs.cpp:124 smalldialogs.cpp:125 smalldialogs.cpp:128 -#: smalldialogs.cpp:131 +#: difftextwindow.cpp:1809 directorymergewindow.cpp:385 +#: directorymergewindow.cpp:437 directorymergewindow.cpp:527 +#: directorymergewindow.cpp:3078 directorymergewindow.cpp:3204 +#: directorymergewindow.cpp:3432 mergeresultwindow.cpp:970 +#: mergeresultwindow.cpp:972 mergeresultwindow.cpp:978 +#: mergeresultwindow.cpp:980 mergeresultwindow.cpp:1844 +#: mergeresultwindow.cpp:3200 mergeresultwindow.cpp:3207 optiondialog.cpp:1003 +#: optiondialog.cpp:1016 pdiff.cpp:823 pdiff.cpp:825 pdiff.cpp:831 +#: pdiff.cpp:833 pdiff.cpp:853 smalldialogs.cpp:131 smalldialogs.cpp:132 +#: smalldialogs.cpp:135 smalldialogs.cpp:138 #, kde-format msgid "B" msgstr "B" -#: difftextwindow.cpp:1810 directorymergewindow.cpp:386 -#: directorymergewindow.cpp:439 directorymergewindow.cpp:528 -#: directorymergewindow.cpp:3070 directorymergewindow.cpp:3191 -#: directorymergewindow.cpp:3419 mergeresultwindow.cpp:946 -#: mergeresultwindow.cpp:948 mergeresultwindow.cpp:950 -#: mergeresultwindow.cpp:952 mergeresultwindow.cpp:1818 -#: mergeresultwindow.cpp:3174 mergeresultwindow.cpp:3181 optiondialog.cpp:977 -#: pdiff.cpp:837 pdiff.cpp:839 pdiff.cpp:841 pdiff.cpp:843 pdiff.cpp:865 -#: smalldialogs.cpp:125 smalldialogs.cpp:126 smalldialogs.cpp:129 -#: smalldialogs.cpp:132 +#: difftextwindow.cpp:1809 directorymergewindow.cpp:387 +#: directorymergewindow.cpp:440 directorymergewindow.cpp:529 +#: directorymergewindow.cpp:3084 directorymergewindow.cpp:3205 +#: directorymergewindow.cpp:3433 mergeresultwindow.cpp:974 +#: mergeresultwindow.cpp:976 mergeresultwindow.cpp:978 +#: mergeresultwindow.cpp:980 mergeresultwindow.cpp:1846 +#: mergeresultwindow.cpp:3202 mergeresultwindow.cpp:3209 optiondialog.cpp:1017 +#: pdiff.cpp:827 pdiff.cpp:829 pdiff.cpp:831 pdiff.cpp:833 pdiff.cpp:855 +#: smalldialogs.cpp:132 smalldialogs.cpp:133 smalldialogs.cpp:136 +#: smalldialogs.cpp:139 #, kde-format msgid "C" msgstr "C" -#: difftextwindow.cpp:1810 +#: difftextwindow.cpp:1809 #, kde-format msgid "A (Base)" msgstr "A (bas)" -#: difftextwindow.cpp:1812 +#: difftextwindow.cpp:1811 #, kde-format msgid "Encoding: %1" msgstr "Kodning: %1" -#: difftextwindow.cpp:1813 mergeresultwindow.cpp:3183 +#: difftextwindow.cpp:1812 mergeresultwindow.cpp:3211 #, kde-format msgid "Unix" msgstr "Unix" -#: difftextwindow.cpp:1813 mergeresultwindow.cpp:3184 +#: difftextwindow.cpp:1812 mergeresultwindow.cpp:3212 #, kde-format msgid "DOS" msgstr "DOS" -#: difftextwindow.cpp:1813 +#: difftextwindow.cpp:1812 #, kde-format msgid "Line end style: %1" msgstr "Typ av radslut: %1" -#: difftextwindow.cpp:1835 kdiff3.cpp:873 +#: difftextwindow.cpp:1834 kdiff3.cpp:874 #, kde-format msgid "Top line" msgstr "Övre rad" -#: difftextwindow.cpp:1845 +#: difftextwindow.cpp:1843 #, kde-format msgid "End" msgstr "Slut" -#: difftextwindow.cpp:1903 smalldialogs.cpp:235 +#: difftextwindow.cpp:1901 smalldialogs.cpp:245 #, kde-format msgid "Open File" msgstr "Öppna fil" -#: difftextwindow.cpp:1951 optiondialog.cpp:387 +#: difftextwindow.cpp:1943 optiondialog.cpp:389 #, kde-format msgid "Unicode, 8 bit" msgstr "Unicode, 8 bitar" -#: difftextwindow.cpp:1966 +#: difftextwindow.cpp:1958 #, kde-format msgid "Other" msgstr "Annan" -#: directorymergewindow.cpp:409 directorymergewindow.cpp:3424 +#: directorymergewindow.cpp:410 directorymergewindow.cpp:3438 #, kde-format msgid "Copy A to B" msgstr "Kopiera A till B" -#: directorymergewindow.cpp:412 directorymergewindow.cpp:3425 +#: directorymergewindow.cpp:413 directorymergewindow.cpp:3439 #, kde-format msgid "Copy B to A" msgstr "Kopiera B till A" -#: directorymergewindow.cpp:415 directorymergewindow.cpp:3426 +#: directorymergewindow.cpp:416 directorymergewindow.cpp:3440 #, kde-format msgid "Delete A" msgstr "Ta bort A" -#: directorymergewindow.cpp:418 directorymergewindow.cpp:3427 +#: directorymergewindow.cpp:419 directorymergewindow.cpp:3441 #, kde-format msgid "Delete B" msgstr "Ta bort B" -#: directorymergewindow.cpp:421 +#: directorymergewindow.cpp:422 #, kde-format msgid "Delete A & B" msgstr "Ta bort A och B" -#: directorymergewindow.cpp:424 directorymergewindow.cpp:3429 +#: directorymergewindow.cpp:425 directorymergewindow.cpp:3443 #, kde-format msgid "Merge to A" msgstr "Sammanfoga till A" -#: directorymergewindow.cpp:427 directorymergewindow.cpp:3430 +#: directorymergewindow.cpp:428 directorymergewindow.cpp:3444 #, kde-format msgid "Merge to B" msgstr "Sammanfoga till B" -#: directorymergewindow.cpp:430 +#: directorymergewindow.cpp:431 #, kde-format msgid "Merge to A & B" msgstr "Sammanfoga till A och B" -#: directorymergewindow.cpp:442 directorymergewindow.cpp:3421 +#: directorymergewindow.cpp:443 directorymergewindow.cpp:3435 #, kde-format msgid "Delete (if exists)" msgstr "Ta bort (om den finns)" -#: directorymergewindow.cpp:445 directorymergewindow.cpp:448 -#: directorymergewindow.cpp:3420 optiondialog.cpp:925 smalldialogs.cpp:113 +#: directorymergewindow.cpp:446 directorymergewindow.cpp:449 +#: directorymergewindow.cpp:3434 smalldialogs.cpp:120 #, kde-format msgid "Merge" msgstr "Sammanfoga" -#: directorymergewindow.cpp:445 directorymergewindow.cpp:448 +#: directorymergewindow.cpp:446 directorymergewindow.cpp:449 #, kde-format msgid "Merge (manual)" msgstr "Sammanfoga (manuellt)" -#: directorymergewindow.cpp:451 +#: directorymergewindow.cpp:452 #, kde-format msgid "Error: Conflicting File Types" msgstr "Fel: Konflikt i filtyper" -#: directorymergewindow.cpp:454 +#: directorymergewindow.cpp:455 #, kde-format msgid "Error: Changed and Deleted" msgstr "Fel: Ändrad och borttagen" -#: directorymergewindow.cpp:457 +#: directorymergewindow.cpp:458 #, kde-format msgid "Error: Dates are equal but files are not." msgstr "Fel: Datum är lika men filerna är det inte." -#: directorymergewindow.cpp:471 +#: directorymergewindow.cpp:472 #, kde-format msgid "Done" msgstr "Klar" -#: directorymergewindow.cpp:473 +#: directorymergewindow.cpp:474 #, kde-format msgid "Error" msgstr "Fel" -#: directorymergewindow.cpp:475 +#: directorymergewindow.cpp:476 #, kde-format msgid "Skipped." msgstr "Överhoppad." -#: directorymergewindow.cpp:477 +#: directorymergewindow.cpp:478 #, kde-format msgid "Not saved." msgstr "Inte sparad." -#: directorymergewindow.cpp:479 +#: directorymergewindow.cpp:480 #, kde-format msgid "In progress..." msgstr "Pågår..." -#: directorymergewindow.cpp:481 +#: directorymergewindow.cpp:482 #, kde-format msgid "To do." msgstr "Att göra." -#: directorymergewindow.cpp:522 +#: directorymergewindow.cpp:523 #, kde-format msgid "Name" msgstr "Namn" -#: directorymergewindow.cpp:530 +#: directorymergewindow.cpp:531 #, kde-format msgid "Operation" msgstr "Åtgärd" -#: directorymergewindow.cpp:532 +#: directorymergewindow.cpp:533 #, kde-format msgid "Status" msgstr "Status" -#: directorymergewindow.cpp:534 +#: directorymergewindow.cpp:535 #, kde-format msgid "Unsolved" msgstr "Olöst" -#: directorymergewindow.cpp:536 +#: directorymergewindow.cpp:537 #, kde-format msgid "Solved" msgstr "Löst" -#: directorymergewindow.cpp:538 +#: directorymergewindow.cpp:539 #, kde-format msgid "Nonwhite" msgstr "Inte blank" -#: directorymergewindow.cpp:540 +#: directorymergewindow.cpp:541 #, kde-format msgid "White" msgstr "Blank" -#: directorymergewindow.cpp:674 +#: directorymergewindow.cpp:676 #, kde-format msgid "Unable to compare non-normal file with normal file." msgstr "Kan inte jämföra icke-normal fil med normal fil." -#: directorymergewindow.cpp:688 +#: directorymergewindow.cpp:690 #, kde-format msgid "Mix of links and normal files." msgstr "Blandning av länkar och normala filer." -#: directorymergewindow.cpp:695 +#: directorymergewindow.cpp:697 #, kde-format msgid "Link: " msgstr "Länk: " -#: directorymergewindow.cpp:704 +#: directorymergewindow.cpp:706 #, kde-format msgid "Size. " msgstr "Storlek: " -#: directorymergewindow.cpp:718 directorymergewindow.cpp:728 +#: directorymergewindow.cpp:720 directorymergewindow.cpp:730 #, kde-format msgid "Date & Size: " msgstr "Datum och storlek: " -#: directorymergewindow.cpp:748 +#: directorymergewindow.cpp:751 #, kde-format msgid "Comparing file..." msgstr "Jämför fil..." -#: directorymergewindow.cpp:801 +#: directorymergewindow.cpp:813 #, kde-format msgid "" "You are currently doing a directory merge. Are you sure, you want to abort " @@ -315,48 +315,48 @@ "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:802 kdiff3.cpp:698 kdiff3.cpp:708 kdiff3.cpp:720 -#: mergeresultwindow.cpp:372 pdiff.cpp:1033 pdiff.cpp:1910 pdiff.cpp:1920 +#: directorymergewindow.cpp:814 kdiff3.cpp:697 kdiff3.cpp:707 kdiff3.cpp:719 +#: mergeresultwindow.cpp:400 pdiff.cpp:1031 pdiff.cpp:1920 pdiff.cpp:1930 #, kde-format msgid "Warning" msgstr "Varning" -#: directorymergewindow.cpp:803 directorymergewindow.cpp:3393 +#: directorymergewindow.cpp:815 directorymergewindow.cpp:3407 #, kde-format msgid "Rescan" msgstr "Avsök igen" -#: directorymergewindow.cpp:804 pdiff.cpp:1035 +#: directorymergewindow.cpp:816 pdiff.cpp:1033 #, kde-format msgid "Continue Merging" msgstr "Fortsätt sammanfoga" -#: directorymergewindow.cpp:971 +#: directorymergewindow.cpp:984 #, kde-format msgid "Opening of directories failed:" msgstr "Öppna katalogerna misslyckades:" -#: directorymergewindow.cpp:975 +#: directorymergewindow.cpp:988 #, 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:980 +#: directorymergewindow.cpp:993 #, 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:985 +#: directorymergewindow.cpp:998 #, 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:988 +#: directorymergewindow.cpp:1001 #, kde-format msgid "Directory Open Error" msgstr "Fel vid öppna katalog" -#: directorymergewindow.cpp:996 +#: directorymergewindow.cpp:1009 #, kde-format msgid "" "The destination directory must not be the same as A or B when three " @@ -367,49 +367,49 @@ "sammanfogas.\n" "Kontrollera igen innan du fortsätter." -#: directorymergewindow.cpp:998 +#: directorymergewindow.cpp:1011 #, kde-format msgid "Parameter Warning" msgstr "Parametervarning" -#: directorymergewindow.cpp:1003 +#: directorymergewindow.cpp:1016 #, kde-format msgid "Scanning directories..." msgstr "Söker i kataloger..." -#: directorymergewindow.cpp:1029 +#: directorymergewindow.cpp:1042 #, kde-format msgid "Reading Directory A" msgstr "Läser katalog A" -#: directorymergewindow.cpp:1038 +#: directorymergewindow.cpp:1051 #, kde-format msgid "Reading Directory B" msgstr "Läser katalog B" -#: directorymergewindow.cpp:1048 +#: directorymergewindow.cpp:1061 #, kde-format msgid "Reading Directory C" msgstr "Läser katalog C" -#: directorymergewindow.cpp:1064 +#: directorymergewindow.cpp:1077 #, kde-format msgid "Some subdirectories were not readable in" msgstr "Vissa underkataloger kunde inte läsas i" -#: directorymergewindow.cpp:1069 +#: directorymergewindow.cpp:1082 #, kde-format msgid "Check the permissions of the subdirectories." msgstr "Kontrollera rättigheter för underkatalogerna." -#: directorymergewindow.cpp:1106 kdiff3.cpp:666 kdiff3.cpp:753 kdiff3.cpp:777 -#: kdiff3.cpp:1065 kdiff3.cpp:1086 pdiff.cpp:1116 pdiff.cpp:1170 pdiff.cpp:1218 -#: pdiff.cpp:1234 pdiff.cpp:1277 pdiff.cpp:1301 +#: directorymergewindow.cpp:1119 kdiff3.cpp:665 kdiff3.cpp:752 kdiff3.cpp:776 +#: kdiff3.cpp:1072 kdiff3.cpp:1093 pdiff.cpp:1115 pdiff.cpp:1178 pdiff.cpp:1228 +#: pdiff.cpp:1244 pdiff.cpp:1287 pdiff.cpp:1311 #, kde-format msgid "Ready." msgstr "Klar." -#: directorymergewindow.cpp:1121 +#: directorymergewindow.cpp:1134 #, kde-format msgid "" "Directory Comparison Status\n" @@ -424,22 +424,22 @@ "Antal likadana filer: %2\n" "Antal olika filer: %3" -#: directorymergewindow.cpp:1128 +#: directorymergewindow.cpp:1141 #, kde-format msgid "Number of manual merges: %1" msgstr "Antal manuella sammanfogningar: %1" -#: directorymergewindow.cpp:1394 +#: directorymergewindow.cpp:1407 #, kde-format msgid "This affects all merge operations." msgstr "Det här påverkar alla sammanfogningsåtgärder." -#: directorymergewindow.cpp:1395 +#: directorymergewindow.cpp:1408 #, kde-format msgid "Changing All Merge Operations" msgstr "Ändra alla sammanfogningsåtgärder" -#: directorymergewindow.cpp:1695 +#: directorymergewindow.cpp:1708 #, kde-format msgid "" "Processing %1 / %2\n" @@ -448,44 +448,44 @@ "Behandlar %1 / %2\n" "%3" -#: directorymergewindow.cpp:1738 directorymergewindow.cpp:1742 +#: directorymergewindow.cpp:1751 directorymergewindow.cpp:1755 #, kde-format msgid "Some files could not be processed." msgstr "Några filer kunde inte behandlas." -#: directorymergewindow.cpp:2222 directorymergewindow.cpp:2247 -#: directorymergewindow.cpp:2271 +#: directorymergewindow.cpp:2235 directorymergewindow.cpp:2260 +#: directorymergewindow.cpp:2285 #, kde-format 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:2222 directorymergewindow.cpp:2247 -#: directorymergewindow.cpp:2271 directorymergewindow.cpp:2552 +#: directorymergewindow.cpp:2235 directorymergewindow.cpp:2260 +#: directorymergewindow.cpp:2285 directorymergewindow.cpp:2565 #, kde-format msgid "Operation Not Possible" msgstr "Åtgärd inte möjlig" -#: directorymergewindow.cpp:2318 +#: directorymergewindow.cpp:2332 #, kde-format msgid "An error occurred while copying." msgstr "Ett fel uppstod vid kopiering." -#: directorymergewindow.cpp:2319 directorymergewindow.cpp:2759 +#: directorymergewindow.cpp:2333 directorymergewindow.cpp:2772 #, kde-format msgid "Merge Error" msgstr "Sammanfogningsfel" -#: directorymergewindow.cpp:2396 +#: directorymergewindow.cpp:2410 #, kde-format msgid "Unknown merge operation. (This must never happen!)" msgstr "Okänd sammanfogningsåtgärd. (Det här får aldrig inträffa!)" -#: directorymergewindow.cpp:2441 +#: directorymergewindow.cpp:2455 #, kde-format msgid "Unknown merge operation." msgstr "Okänd sammanfogningsåtgärd." -#: directorymergewindow.cpp:2454 +#: directorymergewindow.cpp:2468 #, kde-format msgid "" "The merge is about to begin.\n" @@ -506,22 +506,22 @@ "finns INGA GARANTIER överhuvudtaget! Gör säkerhetskopior av viktig " "information!" -#: directorymergewindow.cpp:2459 +#: directorymergewindow.cpp:2473 #, kde-format msgid "Starting Merge" msgstr "Startar sammanfogning" -#: directorymergewindow.cpp:2460 +#: directorymergewindow.cpp:2474 #, kde-format msgid "Do It" msgstr "Gör det" -#: directorymergewindow.cpp:2461 +#: directorymergewindow.cpp:2475 #, kde-format msgid "Simulate It" msgstr "Simulera det" -#: directorymergewindow.cpp:2487 +#: directorymergewindow.cpp:2501 #, kde-format msgid "" "The highlighted item has a different type in the different directories. " @@ -530,7 +530,7 @@ "Det markerade objektet har olika typ i de olika katalogerna. Välj vad du " "vill göra." -#: directorymergewindow.cpp:2491 +#: directorymergewindow.cpp:2505 #, kde-format msgid "" "The modification dates of the file are equal but the files are not. Select " @@ -539,7 +539,7 @@ "Ändringsdatum för filerna är samma, men filerna är det inte. Välj vad du " "vill göra." -#: directorymergewindow.cpp:2495 +#: directorymergewindow.cpp:2509 #, kde-format msgid "" "The highlighted item was changed in one directory and deleted in the other. " @@ -548,7 +548,7 @@ "Det markerade objektet har olika typ i de olika katalogerna. Välj vad du " "vill göra." -#: directorymergewindow.cpp:2552 +#: directorymergewindow.cpp:2565 #, kde-format msgid "" "This operation is currently not possible because directory merge is " @@ -557,7 +557,7 @@ "Den här åtgärden är för närvarande inte möjlig eftersom katalogsammanfogning " "för närvarande kör." -#: directorymergewindow.cpp:2609 +#: directorymergewindow.cpp:2622 #, kde-format msgid "" "There was an error in the last step.\n" @@ -568,32 +568,32 @@ "Vill du fortsätta med objektet som orsakade felet, eller vill du hoppa över " "objektet?" -#: directorymergewindow.cpp:2611 +#: directorymergewindow.cpp:2624 #, kde-format msgid "Continue merge after an error" msgstr "Fortsätt sammanfoga efter ett fel" -#: directorymergewindow.cpp:2612 +#: directorymergewindow.cpp:2625 #, kde-format msgid "Continue With Last Item" msgstr "Fortsätt med sista objekt" -#: directorymergewindow.cpp:2613 +#: directorymergewindow.cpp:2626 #, kde-format msgid "Skip Item" msgstr "Hoppa över objekt" -#: directorymergewindow.cpp:2709 +#: directorymergewindow.cpp:2722 #, kde-format msgid "Merge operation complete." msgstr "Sammanfogningsåtgärd färdig." -#: directorymergewindow.cpp:2709 directorymergewindow.cpp:2712 +#: directorymergewindow.cpp:2722 directorymergewindow.cpp:2725 #, kde-format msgid "Merge Complete" msgstr "Sammanfogning färdig" -#: directorymergewindow.cpp:2722 +#: directorymergewindow.cpp:2735 #, kde-format msgid "" "Simulated merge complete: Check if you agree with the proposed operations." @@ -601,48 +601,48 @@ "Simulerad sammanfogning färdig. Kontrollera om du håller med om de " "föreslagna åtgärderna." -#: directorymergewindow.cpp:2758 +#: directorymergewindow.cpp:2771 #, kde-format msgid "An error occurred. Press OK to see detailed information." msgstr "Ett fel uppstod. Tryck på Ok för att se detaljerad information." -#: directorymergewindow.cpp:2791 +#: directorymergewindow.cpp:2804 #, kde-format msgid "Error: While deleting %1: Creating backup failed." msgstr "Fel: Vid borttagning av %1: Misslyckades skapa säkerhetskopia." -#: directorymergewindow.cpp:2798 +#: directorymergewindow.cpp:2811 #, kde-format msgid "delete directory recursively( %1 )" msgstr "Ta bort katalog rekursivt (%1)" -#: directorymergewindow.cpp:2800 +#: directorymergewindow.cpp:2813 #, kde-format msgid "delete( %1 )" msgstr "Ta bort (%1)" -#: directorymergewindow.cpp:2815 +#: directorymergewindow.cpp:2828 #, kde-format 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:2834 +#: directorymergewindow.cpp:2847 #, kde-format msgid "Error: rmdir( %1 ) operation failed." msgstr "Fel: Åtgärden rmdir (%1) misslyckades." -#: directorymergewindow.cpp:2844 +#: directorymergewindow.cpp:2857 #, kde-format msgid "Error: delete operation failed." msgstr "Fel: Borttagningsåtgärden misslyckades." -#: directorymergewindow.cpp:2870 +#: directorymergewindow.cpp:2884 #, kde-format msgid "manual merge( %1, %2, %3 -> %4)" msgstr "Manuell sammanfogning (%1, %2, %3 -> %4)" -#: directorymergewindow.cpp:2873 +#: directorymergewindow.cpp:2887 #, kde-format msgid "" " Note: After a manual merge the user should continue by pressing F7." @@ -650,180 +650,180 @@ " Observera: Efter en manuell sammanfogning bör användaren fortsätta " "genom att trycka på F7." -#: directorymergewindow.cpp:2900 +#: directorymergewindow.cpp:2914 #, 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:2909 +#: directorymergewindow.cpp:2923 #, kde-format msgid "copyLink( %1 -> %2 )" msgstr "Kopiera länk (%1 -> %2)" -#: directorymergewindow.cpp:2918 +#: directorymergewindow.cpp:2932 #, kde-format 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:2928 +#: directorymergewindow.cpp:2942 #, kde-format msgid "Error: copyLink failed." msgstr "Fel: Kopiera länk misslyckades." -#: directorymergewindow.cpp:2953 +#: directorymergewindow.cpp:2967 #, kde-format msgid "copy( %1 -> %2 )" msgstr "Kopiera (%1 -> %2)" -#: directorymergewindow.cpp:2979 +#: directorymergewindow.cpp:2993 #, 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:2986 +#: directorymergewindow.cpp:3000 #, kde-format msgid "rename( %1 -> %2 )" msgstr "Byt namn (%1 -> %2)" -#: directorymergewindow.cpp:2995 +#: directorymergewindow.cpp:3009 #, kde-format msgid "Error: Rename failed." msgstr "Fel: Namnbyte misslyckades." -#: directorymergewindow.cpp:3013 +#: directorymergewindow.cpp:3027 #, 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:3030 +#: directorymergewindow.cpp:3044 #, kde-format msgid "makeDir( %1 )" msgstr "Skapa katalog (%1)" -#: directorymergewindow.cpp:3040 +#: directorymergewindow.cpp:3054 #, kde-format msgid "Error while creating directory." msgstr "Fel vid skapa katalog." -#: directorymergewindow.cpp:3076 directorymergewindow.cpp:3195 +#: directorymergewindow.cpp:3090 directorymergewindow.cpp:3209 #, kde-format msgid "Dest" msgstr "Mål" -#: directorymergewindow.cpp:3084 directorymergewindow.cpp:3113 +#: directorymergewindow.cpp:3098 directorymergewindow.cpp:3127 #, kde-format msgid "Dir" msgstr "Katalog" -#: directorymergewindow.cpp:3084 +#: directorymergewindow.cpp:3098 #, kde-format msgid "Type" msgstr "Typ" -#: directorymergewindow.cpp:3084 +#: directorymergewindow.cpp:3098 #, kde-format msgid "Size" msgstr "Storlek" -#: directorymergewindow.cpp:3085 +#: directorymergewindow.cpp:3099 #, kde-format msgid "Attr" msgstr "Egenskap" -#: directorymergewindow.cpp:3085 +#: directorymergewindow.cpp:3099 #, kde-format msgid "Last Modification" msgstr "Senast ändrad" -#: directorymergewindow.cpp:3085 +#: directorymergewindow.cpp:3099 #, kde-format msgid "Link-Destination" msgstr "Länkmål" -#: directorymergewindow.cpp:3113 +#: directorymergewindow.cpp:3127 #, kde-format msgid "File" msgstr "Arkiv" -#: directorymergewindow.cpp:3113 +#: directorymergewindow.cpp:3127 #, kde-format msgid "-Link" msgstr "-Länk" -#: directorymergewindow.cpp:3119 +#: directorymergewindow.cpp:3133 #, kde-format msgid "not available" msgstr "Ej tillgänglig" -#: directorymergewindow.cpp:3137 +#: directorymergewindow.cpp:3151 #, kde-format msgid "A (Dest): " msgstr "A (mål): " -#: directorymergewindow.cpp:3141 +#: directorymergewindow.cpp:3155 #, kde-format msgid "A: " msgstr "A: " -#: directorymergewindow.cpp:3141 +#: directorymergewindow.cpp:3155 #, kde-format msgid "A (Base): " msgstr "A (bas): " -#: directorymergewindow.cpp:3147 +#: directorymergewindow.cpp:3161 #, kde-format msgid "B (Dest): " msgstr "B (mål): " -#: directorymergewindow.cpp:3151 +#: directorymergewindow.cpp:3165 #, kde-format msgid "B: " msgstr "B: " -#: directorymergewindow.cpp:3156 +#: directorymergewindow.cpp:3170 #, kde-format msgid "C (Dest): " msgstr "C (mål): " -#: directorymergewindow.cpp:3160 +#: directorymergewindow.cpp:3174 #, kde-format msgid "C: " msgstr "C: " -#: directorymergewindow.cpp:3163 +#: directorymergewindow.cpp:3177 #, kde-format msgid "Dest: " msgstr "Mål: " #. i18n("Saving Directory Merge State ...")); -#: directorymergewindow.cpp:3238 +#: directorymergewindow.cpp:3252 #, kde-format msgid "Save Directory Merge State As..." msgstr "Spara tillstånd för katalogsammanfogning som..." -#: directorymergewindow.cpp:3387 +#: directorymergewindow.cpp:3401 #, kde-format msgid "Start/Continue Directory Merge" msgstr "Starta eller fortsätt katalogsammanfogning" -#: directorymergewindow.cpp:3388 +#: directorymergewindow.cpp:3402 #, kde-format msgid "Run Operation for Current Item" msgstr "Utför åtgärd för aktuellt objekt" -#: directorymergewindow.cpp:3389 +#: directorymergewindow.cpp:3403 #, kde-format msgid "Compare Selected File" msgstr "Jämför markerade filer" -#: directorymergewindow.cpp:3390 +#: directorymergewindow.cpp:3404 #, kde-format msgid "Merge Current File" msgstr "Sammanfoga markerade filer" -#: directorymergewindow.cpp:3390 +#: directorymergewindow.cpp:3404 #, kde-format msgid "" "Merge\n" @@ -832,51 +832,51 @@ "Sammanfoga\n" "fil" -#: directorymergewindow.cpp:3391 +#: directorymergewindow.cpp:3405 #, kde-format msgid "Fold All Subdirs" msgstr "Dra ihop alla underkataloger" -#: directorymergewindow.cpp:3392 +#: directorymergewindow.cpp:3406 #, kde-format msgid "Unfold All Subdirs" msgstr "Expandera alla underkataloger" #. i18n("Save Directory Merge State ..."), 0, this, &DirectoryMergeWindow::slotSaveMergeState, ac, "dir_save_merge_state"); #. i18n("Load Directory Merge State ..."), 0, this, &DirectoryMergeWindow::slotLoadMergeState, ac, "dir_load_merge_state"); -#: directorymergewindow.cpp:3396 +#: directorymergewindow.cpp:3410 #, kde-format msgid "Choose A for All Items" msgstr "Välj A för alla objekt" -#: directorymergewindow.cpp:3397 +#: directorymergewindow.cpp:3411 #, kde-format msgid "Choose B for All Items" msgstr "Välj B för alla objekt" -#: directorymergewindow.cpp:3398 +#: directorymergewindow.cpp:3412 #, kde-format msgid "Choose C for All Items" msgstr "Välj C för alla objekt" -#: directorymergewindow.cpp:3399 +#: directorymergewindow.cpp:3413 #, kde-format msgid "Auto-Choose Operation for All Items" msgstr "Välj automatiskt åtgärd för alla objekt" -#: directorymergewindow.cpp:3400 +#: directorymergewindow.cpp:3414 #, kde-format msgid "No Operation for All Items" msgstr "Ingen åtgärd för något objekt" #. i18n("Synchronize Directories"), 0, this, &DirectoryMergeWindow::slotSynchronizeDirectories, ac, "dir_synchronize_directories"); #. d->m_pDirChooseNewerFiles = GuiUtils::createAction< KToggleAction >(i18n("Copy Newer Files Instead of Merging"), 0, this, &DirectoryMergeWindow::slotChooseNewerFiles, ac, "dir_choose_newer_files"); -#: directorymergewindow.cpp:3405 +#: directorymergewindow.cpp:3419 #, kde-format msgid "Show Identical Files" msgstr "Visa identiska filer" -#: directorymergewindow.cpp:3405 +#: directorymergewindow.cpp:3419 #, kde-format msgid "" "Identical\n" @@ -885,17 +885,17 @@ "Identiska\n" "filer" -#: directorymergewindow.cpp:3406 +#: directorymergewindow.cpp:3420 #, kde-format msgid "Show Different Files" msgstr "Visa olika filer" -#: directorymergewindow.cpp:3407 +#: directorymergewindow.cpp:3421 #, kde-format msgid "Show Files only in A" msgstr "Visa bara filer i A" -#: directorymergewindow.cpp:3407 +#: directorymergewindow.cpp:3421 #, kde-format msgid "" "Files\n" @@ -904,12 +904,12 @@ "Bara\n" "filer i A" -#: directorymergewindow.cpp:3408 +#: directorymergewindow.cpp:3422 #, kde-format msgid "Show Files only in B" msgstr "Visa bara filer i B" -#: directorymergewindow.cpp:3408 +#: directorymergewindow.cpp:3422 #, kde-format msgid "" "Files\n" @@ -918,12 +918,12 @@ "Bara\n" "filer i B" -#: directorymergewindow.cpp:3409 +#: directorymergewindow.cpp:3423 #, kde-format msgid "Show Files only in C" msgstr "Visa bara filer i C" -#: directorymergewindow.cpp:3409 +#: directorymergewindow.cpp:3423 #, kde-format msgid "" "Files\n" @@ -932,52 +932,58 @@ "Bara\n" "filer i C" -#: directorymergewindow.cpp:3413 +#: directorymergewindow.cpp:3427 #, kde-format msgid "Compare Explicitly Selected Files" msgstr "Jämför explicit markerade filer" -#: directorymergewindow.cpp:3414 +#: directorymergewindow.cpp:3428 #, kde-format msgid "Merge Explicitly Selected Files" msgstr "Sammanfoga explicit markerade filer" -#: directorymergewindow.cpp:3416 directorymergewindow.cpp:3423 +#: directorymergewindow.cpp:3430 directorymergewindow.cpp:3437 #, kde-format msgid "Do Nothing" msgstr "Gör ingenting" -#: directorymergewindow.cpp:3428 +#: directorymergewindow.cpp:3442 #, kde-format msgid "Delete A && B" msgstr "Ta bort A och B" -#: directorymergewindow.cpp:3431 +#: directorymergewindow.cpp:3445 #, kde-format msgid "Merge to A && B" msgstr "Sammanfoga till A och B" -#: fileaccess.cpp:462 SourceData.cpp:493 +#: fileaccess.cpp:301 +#, kde-format +msgid "Unable to determine full url. No parent specified." +msgstr "" +"Kan inte bestämma fullständig webbadress. Inget överliggande objekt angivet." + +#: fileaccess.cpp:482 SourceData.cpp:506 #, kde-format msgid "Failed to read file: %1" msgstr "Misslyckades läsa fil: %1" -#: fileaccess.cpp:587 +#: fileaccess.cpp:624 #, kde-format msgid "Creating temp copy of %1 failed." msgstr "Att skapa tillfällig kopia av %1 misslyckades." -#: fileaccess.cpp:595 fileaccess.cpp:600 +#: fileaccess.cpp:632 fileaccess.cpp:637 #, kde-format msgid "Opening %1 failed. %2" msgstr "Öppna %1 misslyckades: %2" -#: fileaccess.cpp:619 fileaccess.cpp:627 +#: fileaccess.cpp:656 fileaccess.cpp:664 #, kde-format msgid "Error reading from %1. %2" msgstr "Fel vid läsning från %1. %2" -#: fileaccess.cpp:751 +#: fileaccess.cpp:788 #, kde-format msgid "" "While trying to make a backup, deleting an older backup failed.\n" @@ -987,7 +993,7 @@ "säkerhetskopia.\n" "Filnamn: %1" -#: fileaccess.cpp:758 +#: fileaccess.cpp:795 #, kde-format msgid "" "While trying to make a backup, renaming failed.\n" @@ -996,177 +1002,177 @@ "Vid försök att skapa en säkerhetskopia, misslyckades namnbyte.\n" "Filnamn: %1 -> %2" -#: fileaccess.cpp:828 +#: fileaccess.cpp:865 #, kde-format msgid "Getting file status: %1" msgstr "Hämtar filstatus: %1" -#: fileaccess.cpp:869 +#: fileaccess.cpp:906 #, kde-format msgid "Reading file: %1" msgstr "Läser fil: %1" -#: fileaccess.cpp:907 +#: fileaccess.cpp:944 #, kde-format msgid "Writing file: %1" msgstr "Skriver fil: %1" -#: fileaccess.cpp:940 +#: fileaccess.cpp:977 #, kde-format msgid "Out of memory" msgstr "Slut på minne" -#: fileaccess.cpp:976 +#: fileaccess.cpp:1013 #, kde-format msgid "Making directory: %1" msgstr "Skapar katalog: %1" -#: fileaccess.cpp:997 +#: fileaccess.cpp:1034 #, kde-format msgid "Removing directory: %1" msgstr "Tar bort katalog: %1" -#: fileaccess.cpp:1012 +#: fileaccess.cpp:1049 #, kde-format msgid "Removing file: %1" msgstr "Tar bort fil: %1" -#: fileaccess.cpp:1028 +#: fileaccess.cpp:1065 #, kde-format msgid "Creating symbolic link: %1 -> %2" msgstr "Skapar symbolisk länk: %1 -> %2" -#: fileaccess.cpp:1052 +#: fileaccess.cpp:1089 #, kde-format msgid "Renaming file: %1 -> %2" msgstr "Byter namn på fil: %1 -> %2" -#: fileaccess.cpp:1086 +#: fileaccess.cpp:1123 #, kde-format msgid "Copying file: %1 -> %2" msgstr "Kopierar fil: %1 -> %2" -#: fileaccess.cpp:1108 +#: fileaccess.cpp:1145 #, kde-format msgid "Reading directory: %1" msgstr "Läser katalog: %1" -#: fileaccess.cpp:1162 +#: fileaccess.cpp:1202 #, kde-format msgid "Listing directory: %1" msgstr "Listar katalog: %1" -#: kdiff3.cpp:181 +#: kdiff3.cpp:182 #, kde-format msgid "Current Configuration:" msgstr "Aktuell inställning:" -#: kdiff3.cpp:186 +#: kdiff3.cpp:187 #, kde-format msgid "Config Option Error:" msgstr "Fel i inställningsalternativ:" -#: kdiff3.cpp:240 +#: kdiff3.cpp:246 #, kde-format msgid "Option --auto used, but no output file specified." msgstr "Väljaren --auto användes, men ingen utdatafil angavs." -#: kdiff3.cpp:416 +#: kdiff3.cpp:405 #, kde-format msgid "Option --auto ignored for directory comparison." msgstr "Väljaren --auto ignoreras för katalogjämförelse." -#: kdiff3.cpp:460 +#: kdiff3.cpp:449 #, kde-format msgid "Saving failed." msgstr "Misslyckades spara." -#: kdiff3.cpp:496 pdiff.cpp:1098 +#: kdiff3.cpp:494 pdiff.cpp:1096 #, kde-format msgid "Opening of these files failed:" msgstr "Misslyckades öppna följande filer:" -#: kdiff3.cpp:505 +#: kdiff3.cpp:503 pdiff.cpp:1105 #, kde-format -msgid "File Open Error" -msgstr "Fel vid öppna fil" +msgid "File open error" +msgstr "Fel när filen öppnades" -#: kdiff3.cpp:533 +#: kdiff3.cpp:532 #, kde-format msgid "Opens documents for comparison..." msgstr "Öppnar dokument för jämförelse..." -#: kdiff3.cpp:535 +#: kdiff3.cpp:534 #, kde-format msgid "Reload" msgstr "Uppdatera" -#: kdiff3.cpp:538 +#: kdiff3.cpp:537 #, kde-format msgid "Saves the merge result. All conflicts must be solved!" msgstr "Sparar sammanfogningsresultat. Alla konflikter måste vara lösta." -#: kdiff3.cpp:540 +#: kdiff3.cpp:539 #, kde-format msgid "Saves the current document as..." msgstr "Sparar aktuellt dokument som..." -#: kdiff3.cpp:543 +#: kdiff3.cpp:542 #, kde-format msgid "Print the differences" msgstr "Skriv ut skillnaderna" -#: kdiff3.cpp:546 +#: kdiff3.cpp:545 #, kde-format msgid "Quits the application" msgstr "Avslutar programmet" -#: kdiff3.cpp:549 +#: kdiff3.cpp:548 #, kde-format msgid "Cuts the selected section and puts it to the clipboard" msgstr "Klipper ut markerad del och flyttar den till klippbordet" -#: kdiff3.cpp:552 +#: kdiff3.cpp:551 #, kde-format msgid "Copies the selected section to the clipboard" msgstr "Kopierar markerad del till klippbordet" -#: kdiff3.cpp:554 +#: kdiff3.cpp:553 #, kde-format msgid "Pastes the clipboard contents to current position" msgstr "Klistrar in klippbordets innehåll på aktuell position" -#: kdiff3.cpp:557 +#: kdiff3.cpp:556 #, kde-format msgid "Select everything in current window" msgstr "Markera allting i nuvarande fönster" -#: kdiff3.cpp:560 +#: kdiff3.cpp:559 #, kde-format msgid "Search for a string" msgstr "Sök efter en sträng" -#: kdiff3.cpp:562 +#: kdiff3.cpp:561 #, kde-format msgid "Search again for the string" msgstr "Sök efter strängen igen" -#: kdiff3.cpp:567 +#: kdiff3.cpp:566 #, kde-format msgid "Enables/disables the statusbar" msgstr "Aktiverar/inaktiverar statusraden" -#: kdiff3.cpp:571 +#: kdiff3.cpp:570 #, kde-format msgid "Configure KDiff3..." msgstr "Anpassa Kdiff3..." -#: kdiff3.cpp:590 +#: kdiff3.cpp:589 #, kde-format msgid "Go to Current Delta" msgstr "Gå till aktuell skillnad" -#: kdiff3.cpp:590 +#: kdiff3.cpp:589 #, kde-format msgid "" "Current\n" @@ -1175,12 +1181,12 @@ "Aktuell\n" "skillnad" -#: kdiff3.cpp:592 +#: kdiff3.cpp:591 #, kde-format msgid "Go to First Delta" msgstr "Gå till första skillnad" -#: kdiff3.cpp:592 +#: kdiff3.cpp:591 #, kde-format msgid "" "First\n" @@ -1189,12 +1195,12 @@ "Första\n" "skillnad" -#: kdiff3.cpp:594 +#: kdiff3.cpp:593 #, kde-format msgid "Go to Last Delta" msgstr "Gå till sista skillnad" -#: kdiff3.cpp:594 +#: kdiff3.cpp:593 #, kde-format msgid "" "Last\n" @@ -1203,14 +1209,14 @@ "Sista\n" "skillnad" -#: kdiff3.cpp:596 +#: kdiff3.cpp:595 #, kde-format 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:597 +#: kdiff3.cpp:596 #, kde-format msgid "" "(Does not skip white space differences even when \"Show White Space\" is " @@ -1219,12 +1225,12 @@ "(Hoppar inte över skillnader i blanktecken även när \"Visa blanktecken\" är " "inaktiverat.)" -#: kdiff3.cpp:598 +#: kdiff3.cpp:597 #, kde-format msgid "Go to Previous Delta" msgstr "Gå till föregående skillnad" -#: kdiff3.cpp:598 +#: kdiff3.cpp:597 #, kde-format msgid "" "Prev\n" @@ -1233,12 +1239,12 @@ "Föregående\n" "skillnad" -#: kdiff3.cpp:600 +#: kdiff3.cpp:599 #, kde-format msgid "Go to Next Delta" msgstr "Gå till nästa skillnad" -#: kdiff3.cpp:600 +#: kdiff3.cpp:599 #, kde-format msgid "" "Next\n" @@ -1247,12 +1253,12 @@ "Nästa\n" "skillnad" -#: kdiff3.cpp:602 +#: kdiff3.cpp:601 #, kde-format msgid "Go to Previous Conflict" msgstr "Gå till föregående konflikt" -#: kdiff3.cpp:602 +#: kdiff3.cpp:601 #, kde-format msgid "" "Prev\n" @@ -1261,12 +1267,12 @@ "Föregående\n" "konflikt" -#: kdiff3.cpp:604 +#: kdiff3.cpp:603 #, kde-format msgid "Go to Next Conflict" msgstr "Gå till nästa konflikt" -#: kdiff3.cpp:604 +#: kdiff3.cpp:603 #, kde-format msgid "" "Next\n" @@ -1275,12 +1281,12 @@ "Nästa\n" "konflikt" -#: kdiff3.cpp:606 +#: kdiff3.cpp:605 #, kde-format msgid "Go to Previous Unsolved Conflict" msgstr "Gå till föregående olösta konflikt" -#: kdiff3.cpp:606 +#: kdiff3.cpp:605 #, kde-format msgid "" "Prev\n" @@ -1289,12 +1295,12 @@ "Föregående\n" "olösta" -#: kdiff3.cpp:608 +#: kdiff3.cpp:607 #, kde-format msgid "Go to Next Unsolved Conflict" msgstr "Gå till nästa olösta konflikt" -#: kdiff3.cpp:608 +#: kdiff3.cpp:607 #, kde-format msgid "" "Next\n" @@ -1303,12 +1309,12 @@ "Nästa\n" "olösta" -#: kdiff3.cpp:610 +#: kdiff3.cpp:609 #, kde-format msgid "Select Line(s) From A" msgstr "Välj rad(er) från A" -#: kdiff3.cpp:610 +#: kdiff3.cpp:609 #, kde-format msgid "" "Choose\n" @@ -1317,12 +1323,12 @@ "Välj\n" "A" -#: kdiff3.cpp:611 +#: kdiff3.cpp:610 #, kde-format msgid "Select Line(s) From B" msgstr "Välj rad(er) från B" -#: kdiff3.cpp:611 +#: kdiff3.cpp:610 #, kde-format msgid "" "Choose\n" @@ -1331,12 +1337,12 @@ "Välj\n" "B" -#: kdiff3.cpp:612 +#: kdiff3.cpp:611 #, kde-format msgid "Select Line(s) From C" msgstr "Välj rad(er) från C" -#: kdiff3.cpp:612 +#: kdiff3.cpp:611 #, kde-format msgid "" "Choose\n" @@ -1345,12 +1351,12 @@ "Välj\n" "C" -#: kdiff3.cpp:613 +#: kdiff3.cpp:612 #, kde-format 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:613 +#: kdiff3.cpp:612 #, kde-format msgid "" "Auto\n" @@ -1359,12 +1365,12 @@ "Automatiskt\n" "nästa" -#: kdiff3.cpp:615 +#: kdiff3.cpp:614 #, kde-format msgid "Show Space && Tabulator Characters" msgstr "Visa mellanslag och tabulatortecken" -#: kdiff3.cpp:615 +#: kdiff3.cpp:614 #, kde-format msgid "" "White\n" @@ -1373,12 +1379,12 @@ "Blank\n" "tecken" -#: kdiff3.cpp:616 +#: kdiff3.cpp:615 #, kde-format msgid "Show White Space" msgstr "Visa blanktecken" -#: kdiff3.cpp:616 +#: kdiff3.cpp:615 #, kde-format msgid "" "White\n" @@ -1387,12 +1393,12 @@ "Blanktecken\n" "skillnader" -#: kdiff3.cpp:618 +#: kdiff3.cpp:617 #, kde-format msgid "Show Line Numbers" msgstr "Visa radnummer" -#: kdiff3.cpp:618 +#: kdiff3.cpp:617 #, kde-format msgid "" "Line\n" @@ -1401,132 +1407,132 @@ "Rad\n" "nummer" -#: kdiff3.cpp:620 +#: kdiff3.cpp:619 #, kde-format msgid "Automatically Solve Simple Conflicts" msgstr "Lös automatiskt enkla konflikter" -#: kdiff3.cpp:621 +#: kdiff3.cpp:620 #, kde-format msgid "Set Deltas to Conflicts" msgstr "Ändra skillnader till konflikter" -#: kdiff3.cpp:622 +#: kdiff3.cpp:621 #, kde-format msgid "Run Regular Expression Auto Merge" msgstr "Kör automatisk sammanfogning med reguljärt uttryck" -#: kdiff3.cpp:623 +#: kdiff3.cpp:622 #, kde-format msgid "Automatically Solve History Conflicts" msgstr "Lös automatiskt historikkonflikter" -#: kdiff3.cpp:624 +#: kdiff3.cpp:623 #, kde-format msgid "Split Diff At Selection" msgstr "Dela jämförelse vid markering" -#: kdiff3.cpp:625 +#: kdiff3.cpp:624 #, kde-format msgid "Join Selected Diffs" msgstr "Foga ihop markerade jämförelser" -#: kdiff3.cpp:627 +#: kdiff3.cpp:626 #, kde-format msgid "Show Window A" msgstr "Visa fönster A" -#: kdiff3.cpp:628 +#: kdiff3.cpp:627 #, kde-format msgid "Show Window B" msgstr "Visa fönster B" -#: kdiff3.cpp:629 +#: kdiff3.cpp:628 #, kde-format msgid "Show Window C" msgstr "Visa fönster C" -#: kdiff3.cpp:631 +#: kdiff3.cpp:630 #, kde-format msgid "Normal Overview" msgstr "Normal översikt" -#: kdiff3.cpp:632 +#: kdiff3.cpp:631 #, kde-format msgid "A vs. B Overview" msgstr "A mot B-översikt" -#: kdiff3.cpp:633 +#: kdiff3.cpp:632 #, kde-format msgid "A vs. C Overview" msgstr "A mot C-översikt" -#: kdiff3.cpp:634 +#: kdiff3.cpp:633 #, kde-format msgid "B vs. C Overview" msgstr "B mot C-översikt" -#: kdiff3.cpp:635 +#: kdiff3.cpp:634 #, kde-format msgid "Word Wrap Diff Windows" msgstr "Radbryt skillnadsfönster" -#: kdiff3.cpp:636 +#: kdiff3.cpp:635 #, kde-format msgid "Add Manual Diff Alignment" msgstr "Lägg till manuell justering av jämförelse" -#: kdiff3.cpp:637 +#: kdiff3.cpp:636 #, kde-format msgid "Clear All Manual Diff Alignments" msgstr "Rensa alla manuella justeringar av jämförelse" -#: kdiff3.cpp:639 +#: kdiff3.cpp:638 #, kde-format msgid "Focus Next Window" msgstr "Fokus till nästa fönster" -#: kdiff3.cpp:640 +#: kdiff3.cpp:639 #, kde-format msgid "Focus Prev Window" msgstr "Fokus till föregående fönster" -#: kdiff3.cpp:641 +#: kdiff3.cpp:640 #, kde-format msgid "Toggle Split Orientation" msgstr "Byt delningsorientering" -#: kdiff3.cpp:643 +#: kdiff3.cpp:642 #, kde-format msgid "Dir && Text Split Screen View" msgstr "Delad skärmvy för kataloger och text" -#: kdiff3.cpp:645 +#: kdiff3.cpp:644 #, kde-format msgid "Toggle Between Dir && Text View" msgstr "Byt mellan katalog och textvy" -#: kdiff3.cpp:697 pdiff.cpp:1909 +#: kdiff3.cpp:696 pdiff.cpp:1919 #, kde-format msgid "The merge result has not been saved." msgstr "Sammanfogningsresultatet har inte sparats." -#: kdiff3.cpp:699 +#: kdiff3.cpp:698 #, kde-format msgid "Save && Quit" msgstr "Spara och avsluta" -#: kdiff3.cpp:700 +#: kdiff3.cpp:699 #, kde-format msgid "Quit Without Saving" msgstr "Avsluta utan att spara" -#: kdiff3.cpp:708 pdiff.cpp:1920 +#: kdiff3.cpp:707 pdiff.cpp:1930 #, kde-format msgid "Saving the merge result failed." msgstr "Misslyckades spara sammanfogningsresultatet." -#: kdiff3.cpp:719 pdiff.cpp:1032 +#: kdiff3.cpp:718 pdiff.cpp:1030 #, kde-format msgid "" "You are currently doing a directory merge. Are you sure, you want to abort?" @@ -1534,62 +1540,62 @@ "Du håller för närvarande på med en katalogsammanfogning. Är du säker på att " "du vill avbryta?" -#: kdiff3.cpp:742 +#: kdiff3.cpp:741 #, kde-format msgid "Saving file..." msgstr "Sparar fil..." -#: kdiff3.cpp:759 +#: kdiff3.cpp:758 #, kde-format msgid "Saving file with a new filename..." msgstr "Sparar fil med ett nytt namn..." -#: kdiff3.cpp:761 +#: kdiff3.cpp:760 #, kde-format msgid "Save As..." msgstr "Spara som..." -#: kdiff3.cpp:820 +#: kdiff3.cpp:819 #, kde-format msgid "Printing not implemented." msgstr "Utskrift inte implementerad." -#: kdiff3.cpp:857 +#: kdiff3.cpp:858 #, kde-format msgid "Printing..." msgstr "Skriver ut..." -#: kdiff3.cpp:943 +#: kdiff3.cpp:948 #, kde-format msgid "Printing page %1 of %2" msgstr "Skriver ut sida %1 av %2" -#: kdiff3.cpp:1000 +#: kdiff3.cpp:1006 #, kde-format msgid " (Selection)" msgstr " (markering)" -#: kdiff3.cpp:1027 +#: kdiff3.cpp:1034 #, kde-format msgid "Printing completed." msgstr "Utskrift färdig." -#: kdiff3.cpp:1031 +#: kdiff3.cpp:1038 #, kde-format msgid "Printing aborted." msgstr "Utskrift avbruten." -#: kdiff3.cpp:1038 +#: kdiff3.cpp:1045 #, kde-format msgid "Exiting..." msgstr "Avslutar..." -#: kdiff3.cpp:1049 +#: kdiff3.cpp:1056 #, kde-format msgid "Toggling toolbar..." msgstr "Växlar verktygsrad..." -#: kdiff3.cpp:1070 +#: kdiff3.cpp:1077 #, kde-format msgid "Toggle the statusbar..." msgstr "Växla statusraden..." @@ -1614,7 +1620,7 @@ msgid "Joachim Eibl" msgstr "Joachim Eibl" -#: kdiff3_part.cpp:173 kdiff3_part.cpp:254 +#: kdiff3_part.cpp:174 kdiff3_part.cpp:255 #, kde-format msgid "Could not find files for comparison." msgstr "Kunde inte hitta filer för jämförelse." @@ -1632,7 +1638,7 @@ msgstr "Anpassa Kdiff3" #. i18n: ectx: ToolBar (mainToolBar) -#: kdiff3_part.rc:16 main.cpp:88 +#: kdiff3_part.rc:16 main.cpp:89 #, kde-format msgid "KDiff3" msgstr "Kdiff3" @@ -1702,86 +1708,91 @@ msgid "Main Toolbar" msgstr "Huvudverktygsrad" -#: main.cpp:68 main.cpp:72 +#: main.cpp:69 main.cpp:73 #, kde-format msgid "Ignored. (User defined.)" msgstr "Ignorerad. (Användardefinierad.)" -#: main.cpp:92 +#: main.cpp:93 #, kde-format msgid " (64 bit)" msgstr " (64 bitar)" -#: main.cpp:94 +#: main.cpp:95 #, kde-format msgid " (32 bit)" msgstr " (32 bitar)" -#: main.cpp:95 +#: main.cpp:96 #, kde-format msgid "Tool for Comparison and Merge of Files and Directories" msgstr "Verktyg för jämförelse och sammanfogning av filer och kataloger" -#: main.cpp:96 +#: main.cpp:97 #, kde-format msgid "(c) 2002-2014 Joachim Eibl, (c) 2017 Michael Reeves KF5/Qt5 port" msgstr "" "© 2002-2014 Joachim Eibl, © 2017 Michael Reeves Konvertering till KF5/Qt5" -#: main.cpp:112 +#: main.cpp:113 #, kde-format msgid "Merge the input." msgstr "Sammanfoga indata." -#: main.cpp:113 +#: main.cpp:114 #, kde-format msgid "Explicit base file. For compatibility with certain tools." msgstr "Explicit basfil. För att fungera tillsammans med vissa verktyg." -#: main.cpp:114 +#: main.cpp:115 #, kde-format msgid "Output file. Implies -m. E.g.: -o newfile.txt" msgstr "Utdatafil. Betyder underförstått -m. T.ex.: -o ny_fil.txt" -#: main.cpp:115 +#: main.cpp:116 #, kde-format msgid "Output file, again. (For compatibility with certain tools.)" msgstr "Utdatafil, igen. (för att fungera med vissa verktyg.)" -#: main.cpp:116 +#: main.cpp:118 #, kde-format msgid "No GUI if all conflicts are auto-solvable. (Needs -o file)" msgstr "" "Inget grafiskt gränssnitt om alla konflikter kan lösas automatiskt (kräver -" "o fil)" -#: main.cpp:117 +#: main.cpp:120 +#, kde-format +msgid "Ignored." +msgstr "Ignorerad." + +#: main.cpp:122 #, kde-format msgid "Do not solve conflicts automatically." msgstr "Lös inte konflikter automatiskt." -#: main.cpp:118 +#: main.cpp:123 #, kde-format msgid "Visible name replacement for input file 1 (base)." msgstr "Synlig ersättning av namn för indatafil 1 (bas)." -#: main.cpp:119 +#: main.cpp:124 #, kde-format msgid "Visible name replacement for input file 2." msgstr "Synlig ersättning av namn för indatafil 2." -#: main.cpp:120 +#: main.cpp:125 #, kde-format msgid "Visible name replacement for input file 3." msgstr "Synlig ersättning av namn för indatafil 3." -#: main.cpp:121 +#: main.cpp:126 #, kde-format msgid "Alternative visible name replacement. Supply this once for every input." msgstr "" "Alternativ synlig ersättning av namn. Ange detta en gång för all indata." -#: main.cpp:122 +#: main.cpp:127 #, kde-format msgid "" "Override a config setting. Use once for every setting. E.g.: --cs " @@ -1790,87 +1801,87 @@ "Överskrid en inställning. Använd en gång för varje inställning, t.ex. --cs " "\"AutoAdvance=1\"" -#: main.cpp:123 +#: main.cpp:128 #, kde-format msgid "Show list of config settings and current values." msgstr "Visa lista med inställningar och nuvarande värden." -#: main.cpp:124 +#: main.cpp:129 #, kde-format msgid "Use a different config file." msgstr "Använd en annan inställningsfil." -#: main.cpp:127 +#: main.cpp:132 #, kde-format msgid "file1 to open (base, if not specified via --base)" msgstr "Fil 1 att öppna (basfil, om den inte anges med --base)" -#: main.cpp:128 +#: main.cpp:133 #, kde-format msgid "file2 to open" msgstr "Fil 2 att öppna" -#: main.cpp:129 +#: main.cpp:134 #, kde-format msgid "file3 to open" msgstr "Fil 3 att öppna" -#: main.cpp:153 +#: main.cpp:158 #, kde-format msgid "See kdiff3 --help for supported options." msgstr "Se kdiff3 --help för ytterligare väljare som stöds." -#: mergeresultwindow.cpp:158 +#: mergeresultwindow.cpp:171 #, kde-format msgid "Choose A Everywhere" msgstr "Välj A överallt" -#: mergeresultwindow.cpp:159 +#: mergeresultwindow.cpp:172 #, kde-format msgid "Choose B Everywhere" msgstr "Välj B överallt" -#: mergeresultwindow.cpp:160 +#: mergeresultwindow.cpp:173 #, kde-format msgid "Choose C Everywhere" msgstr "Välj C överallt" -#: mergeresultwindow.cpp:161 +#: mergeresultwindow.cpp:174 #, kde-format msgid "Choose A for All Unsolved Conflicts" msgstr "Välj A för alla olösta konflikter" -#: mergeresultwindow.cpp:162 +#: mergeresultwindow.cpp:175 #, kde-format msgid "Choose B for All Unsolved Conflicts" msgstr "Välj B för alla olösta konflikter" -#: mergeresultwindow.cpp:163 +#: mergeresultwindow.cpp:176 #, kde-format msgid "Choose C for All Unsolved Conflicts" msgstr "Välj C för alla olösta konflikter" -#: mergeresultwindow.cpp:164 +#: mergeresultwindow.cpp:177 #, kde-format msgid "Choose A for All Unsolved Whitespace Conflicts" msgstr "Välj A för olösta konflikter med blanktecken" -#: mergeresultwindow.cpp:165 +#: mergeresultwindow.cpp:178 #, kde-format msgid "Choose B for All Unsolved Whitespace Conflicts" msgstr "Välj B för olösta konflikter med blanktecken" -#: mergeresultwindow.cpp:166 +#: mergeresultwindow.cpp:179 #, kde-format msgid "Choose C for All Unsolved Whitespace Conflicts" msgstr "Välj C för olösta konflikter med blanktecken" -#: mergeresultwindow.cpp:176 +#: mergeresultwindow.cpp:204 #, kde-format msgid "Number of remaining unsolved conflicts: %1 (of which %2 are whitespace)" msgstr "Antal återstående olösta konflikter: %1 (av vilka %2 är blanktecken)" -#: mergeresultwindow.cpp:370 +#: mergeresultwindow.cpp:398 #, kde-format msgid "" "The output has been modified.\n" @@ -1879,29 +1890,29 @@ "Utdata har ändrats.\n" "Om du fortsätter kommer dina ändringar att gå förlorade." -#: mergeresultwindow.cpp:936 pdiff.cpp:827 +#: mergeresultwindow.cpp:964 pdiff.cpp:817 #, kde-format msgid "All input files are binary equal." msgstr "Alla indatafiler är binärt lika." -#: mergeresultwindow.cpp:938 +#: mergeresultwindow.cpp:966 #, kde-format msgid "All input files contain the same text." msgstr "Alla indatafiler innehåller samma text." -#: mergeresultwindow.cpp:942 mergeresultwindow.cpp:946 -#: mergeresultwindow.cpp:950 pdiff.cpp:833 pdiff.cpp:837 pdiff.cpp:841 +#: mergeresultwindow.cpp:970 mergeresultwindow.cpp:974 +#: mergeresultwindow.cpp:978 pdiff.cpp:823 pdiff.cpp:827 pdiff.cpp:831 #, kde-format msgid "Files %1 and %2 are binary equal.\n" msgstr "Filerna %1 och %2 är binärt likadana.\n" -#: mergeresultwindow.cpp:944 mergeresultwindow.cpp:948 -#: mergeresultwindow.cpp:952 +#: mergeresultwindow.cpp:972 mergeresultwindow.cpp:976 +#: mergeresultwindow.cpp:980 #, kde-format msgid "Files %1 and %2 have equal text.\n" msgstr "Filerna %1 och %2 innehåller samma text.\n" -#: mergeresultwindow.cpp:958 +#: mergeresultwindow.cpp:986 #, kde-format msgid "" "Total number of conflicts: %1\n" @@ -1914,27 +1925,27 @@ "Antal olösta konflikter: %3\n" "%4" -#: mergeresultwindow.cpp:964 +#: mergeresultwindow.cpp:992 #, kde-format msgid "Conflicts" msgstr "Konflikter" -#: mergeresultwindow.cpp:1873 +#: mergeresultwindow.cpp:1901 #, kde-format msgid "" msgstr "" -#: mergeresultwindow.cpp:1881 +#: mergeresultwindow.cpp:1909 #, kde-format msgid "" msgstr "" -#: mergeresultwindow.cpp:1883 mergeresultwindow.cpp:2755 +#: mergeresultwindow.cpp:1911 mergeresultwindow.cpp:2783 #, kde-format msgid "" msgstr "" -#: mergeresultwindow.cpp:2967 +#: mergeresultwindow.cpp:2995 #, kde-format msgid "" "Not all conflicts are solved yet.\n" @@ -1943,12 +1954,12 @@ "Alla konflikter har inte lösts ännu.\n" "Filen har inte sparats." -#: mergeresultwindow.cpp:2969 mergeresultwindow.cpp:2978 +#: mergeresultwindow.cpp:2997 mergeresultwindow.cpp:3006 #, kde-format msgid "Conflicts Left" msgstr "Konflikter kvar" -#: mergeresultwindow.cpp:2976 +#: mergeresultwindow.cpp:3004 #, kde-format msgid "" "There is a line end style conflict. Please choose the line end style " @@ -1958,7 +1969,7 @@ "Det finns konflikter i typ av radslut. Välj typ av radslut manuellt.\n" "Filen har inte sparats." -#: mergeresultwindow.cpp:2990 +#: mergeresultwindow.cpp:3018 #, kde-format msgid "" "\n" @@ -1969,57 +1980,57 @@ "\n" "Misslyckades skapa säkerhetskopia. Filen sparades inte." -#: mergeresultwindow.cpp:2990 mergeresultwindow.cpp:3038 +#: mergeresultwindow.cpp:3018 mergeresultwindow.cpp:3066 #, kde-format msgid "File Save Error" msgstr "Fel vid spara fil" -#: mergeresultwindow.cpp:3038 +#: mergeresultwindow.cpp:3066 #, kde-format msgid "Error while writing." msgstr "Fel vid skrivning." -#: mergeresultwindow.cpp:3110 +#: mergeresultwindow.cpp:3138 #, kde-format msgid "Output:" msgstr "Utmatning:" -#: mergeresultwindow.cpp:3123 mergeresultwindow.cpp:3315 +#: mergeresultwindow.cpp:3151 mergeresultwindow.cpp:3343 #, kde-format msgid "[Modified]" msgstr "[Ändrad]" -#: mergeresultwindow.cpp:3130 +#: mergeresultwindow.cpp:3158 #, kde-format msgid "Encoding for saving:" msgstr "Kodning för att spara:" -#: mergeresultwindow.cpp:3230 +#: mergeresultwindow.cpp:3258 #, kde-format msgid "Conflict" msgstr "Konflikt" -#: mergeresultwindow.cpp:3262 +#: mergeresultwindow.cpp:3290 #, kde-format msgid "Codec from A: %1" msgstr "Kodare från A: %1" -#: mergeresultwindow.cpp:3264 +#: mergeresultwindow.cpp:3292 #, kde-format msgid "Codec from B: %1" msgstr "Kodare från B: %1" -#: mergeresultwindow.cpp:3266 +#: mergeresultwindow.cpp:3294 #, kde-format msgid "Codec from C: %1" msgstr "Kodare från C: %1" -#: optiondialog.cpp:119 +#: optiondialog.cpp:121 #, kde-format msgid "Change Font" msgstr "Ändra teckensnitt" -#: optiondialog.cpp:135 optiondialog.cpp:145 +#: optiondialog.cpp:137 optiondialog.cpp:147 #, kde-format msgid "" "Font: %1, %2, %3\n" @@ -2030,160 +2041,160 @@ "\n" "Exempel:" -#: optiondialog.cpp:388 +#: optiondialog.cpp:390 #, kde-format msgid "Unicode" msgstr "Unicode" -#: optiondialog.cpp:389 +#: optiondialog.cpp:391 #, kde-format msgid "Latin1" msgstr "Latin1" -#: optiondialog.cpp:408 +#: optiondialog.cpp:410 #, kde-format msgid "Change this if non-ASCII characters are not displayed correctly." msgstr "Ändra det här om tecken som inte är ASCII inte visas riktigt." -#: optiondialog.cpp:491 +#: optiondialog.cpp:495 #, kde-format msgid "Configure" msgstr "Anpassa" -#: optiondialog.cpp:568 +#: optiondialog.cpp:573 #, kde-format msgid "Font" msgstr "Teckensnitt" -#: optiondialog.cpp:570 +#: optiondialog.cpp:575 #, kde-format msgid "Editor & Diff Output Font" msgstr "Teckensnitt för editor och jämförelser" -#: optiondialog.cpp:589 +#: optiondialog.cpp:594 #, kde-format msgid "Application font" msgstr "Programteckensnitt" -#: optiondialog.cpp:594 +#: optiondialog.cpp:599 #, kde-format msgid "File view font" msgstr "Filvisningsteckensnitt" -#: optiondialog.cpp:613 +#: optiondialog.cpp:618 #, kde-format msgctxt "Title for color settings page" msgid "Color" msgstr "Färg" -#: optiondialog.cpp:614 +#: optiondialog.cpp:619 #, kde-format msgid "Colors Settings" msgstr "Färginställningar" -#: optiondialog.cpp:631 +#: optiondialog.cpp:644 #, kde-format msgid "Editor and Diff Views:" msgstr "Editor- och skillnadsvyer:" -#: optiondialog.cpp:639 +#: optiondialog.cpp:652 #, kde-format msgid "Foreground color:" msgstr "Förgrundsfärg:" -#: optiondialog.cpp:647 +#: optiondialog.cpp:660 #, kde-format msgid "Background color:" msgstr "Bakgrundsfärg:" -#: optiondialog.cpp:657 +#: optiondialog.cpp:670 #, kde-format msgid "Diff background color:" msgstr "Bakgrundsfärg för jämförelse:" -#: optiondialog.cpp:666 +#: optiondialog.cpp:679 #, kde-format msgid "Color A:" msgstr "Färg A:" -#: optiondialog.cpp:675 +#: optiondialog.cpp:688 #, kde-format msgid "Color B:" msgstr "Färg B:" -#: optiondialog.cpp:684 +#: optiondialog.cpp:697 #, kde-format msgid "Color C:" msgstr "Färg C:" -#: optiondialog.cpp:692 +#: optiondialog.cpp:705 #, kde-format msgid "Conflict color:" msgstr "Konfliktfärg:" -#: optiondialog.cpp:701 +#: optiondialog.cpp:714 #, kde-format msgid "Current range background color:" msgstr "Bakgrundsfärg för aktuellt intervall:" -#: optiondialog.cpp:710 +#: optiondialog.cpp:723 #, kde-format msgid "Current range diff background color:" msgstr "Bakgrundsfärg för aktuellt jämförelseintervall:" -#: optiondialog.cpp:718 +#: optiondialog.cpp:731 #, kde-format msgid "Color for manually aligned difference ranges:" msgstr "Färg för manuellt justerade jämförelseintervall:" -#: optiondialog.cpp:725 +#: optiondialog.cpp:738 #, kde-format msgid "Directory Comparison View:" msgstr "Katalogjämförelsevy:" -#: optiondialog.cpp:731 +#: optiondialog.cpp:744 #, kde-format msgid "Newest file color:" msgstr "Färg för nyaste fil:" -#: optiondialog.cpp:736 +#: optiondialog.cpp:749 #, kde-format msgid "" "Changing this color will only be effective when starting the next directory " "comparison." msgstr "Att ändra färgen får bara effekt när nästa katalogjämförelse startas." -#: optiondialog.cpp:741 +#: optiondialog.cpp:754 #, kde-format msgid "Oldest file color:" msgstr "Färg för äldsta fil:" -#: optiondialog.cpp:750 +#: optiondialog.cpp:763 #, kde-format msgid "Middle age file color:" msgstr "Färg för medelgammal fil:" -#: optiondialog.cpp:759 +#: optiondialog.cpp:772 #, kde-format msgid "Color for missing files:" msgstr "Färg för saknade filer:" -#: optiondialog.cpp:773 +#: optiondialog.cpp:786 #, kde-format msgid "Editor" msgstr "Editor" -#: optiondialog.cpp:774 +#: optiondialog.cpp:787 #, kde-format msgid "Editor Behavior" msgstr "Editorbeteende" -#: optiondialog.cpp:787 +#: optiondialog.cpp:809 #, kde-format msgid "Tab inserts spaces" msgstr "Tabulator infogar mellanslag" -#: optiondialog.cpp:791 +#: optiondialog.cpp:813 #, kde-format msgid "" "On: Pressing tab generates the appropriate number of spaces.\n" @@ -2192,27 +2203,27 @@ "På: Genom att trycka på tabulator, skapas lämpligt antal mellanslag.\n" "Av: Ett tabulatortecken infogas." -#: optiondialog.cpp:796 +#: optiondialog.cpp:818 #, kde-format msgid "Tab size:" msgstr "Tabulatorbredd:" -#: optiondialog.cpp:803 +#: optiondialog.cpp:825 #, kde-format msgid "Auto indentation" msgstr "Automatisk indentering" -#: optiondialog.cpp:807 +#: optiondialog.cpp:829 #, kde-format msgid "On: The indentation of the previous line is used for a new line.\n" msgstr "På: Indentering av föregående rad används för en ny rad.\n" -#: optiondialog.cpp:810 +#: optiondialog.cpp:832 #, kde-format msgid "Auto copy selection" msgstr "Kopiera automatiskt markering" -#: optiondialog.cpp:814 +#: optiondialog.cpp:836 #, kde-format msgid "" "On: Any selection is immediately written to the clipboard.\n" @@ -2221,7 +2232,7 @@ "På: Alla markeringar skrivs omedelbart till klippbordet.\n" "Av: Du måste kopiera explicit, t.ex. via Ctrl-C." -#: optiondialog.cpp:829 +#: optiondialog.cpp:851 #, kde-format msgid "" "Sets the line endings for when an edited file is saved.\n" @@ -2230,12 +2241,12 @@ "Anger radsluten när en redigerad fil sparas.\n" "DOS/Windows: CR+LF, Unix: LF, med CR=0D och LF=0A" -#: optiondialog.cpp:839 +#: optiondialog.cpp:861 #, kde-format msgid "Diff" msgstr "Jämför" -#: optiondialog.cpp:840 +#: optiondialog.cpp:862 #, kde-format msgid "Diff Settings" msgstr "Inställningar av jämför" @@ -2249,12 +2260,12 @@ #. ); #. ++line; #. -#: optiondialog.cpp:865 +#: optiondialog.cpp:896 #, kde-format msgid "Ignore numbers (treat as white space)" msgstr "Ignorera tal (behandla som blanktecken)" -#: optiondialog.cpp:869 +#: optiondialog.cpp:900 #, kde-format msgid "" "Ignore number characters during line matching phase. (Similar to Ignore " @@ -2264,43 +2275,43 @@ "Ignorera siffror när rader matchas. (Liknar ignorera blanktecken.)\n" "Kan hjälpa till att jämföra filer med numerisk data." -#: optiondialog.cpp:873 +#: optiondialog.cpp:904 #, kde-format msgid "Ignore C/C++ comments (treat as white space)" msgstr "Ignorera C/C++ kommentarer (behandla som blanktecken)" -#: optiondialog.cpp:876 +#: optiondialog.cpp:907 #, kde-format msgid "Treat C/C++ comments like white space." msgstr "Behandla C/C++ kommentarer som blanktecken." -#: optiondialog.cpp:879 +#: optiondialog.cpp:910 #, kde-format msgid "Ignore case (treat as white space)" msgstr "Ignorera skiftläge (behandla som blanktecken)" -#: optiondialog.cpp:883 +#: optiondialog.cpp:914 #, kde-format msgid "Treat case differences like white space changes. ('a'<=>'A')" msgstr "Behandla skiftlägesskillnader som blankteckenskillnader. ('a' <=> 'A')" -#: optiondialog.cpp:886 +#: optiondialog.cpp:917 #, kde-format msgid "Preprocessor command:" msgstr "Preprocessorkommando:" -#: optiondialog.cpp:891 +#: optiondialog.cpp:922 #, kde-format msgid "User defined pre-processing. (See the docs for details.)" msgstr "" "Användardefinierad förbehandling (Se dokumentationen för detaljinformation.)" -#: optiondialog.cpp:894 +#: optiondialog.cpp:925 #, kde-format msgid "Line-matching preprocessor command:" msgstr "Preprocessorkommando för radmatchning:" -#: optiondialog.cpp:899 +#: optiondialog.cpp:930 #, kde-format msgid "" "This pre-processor is only used during line matching.\n" @@ -2309,12 +2320,12 @@ "Den här preprocessorn används bara under radmatchning.\n" "(Se dokumentationen för detaljinformation.)" -#: optiondialog.cpp:902 +#: optiondialog.cpp:933 #, kde-format msgid "Try hard (slower)" msgstr "Var noggrann (långsammare)" -#: optiondialog.cpp:906 +#: optiondialog.cpp:937 #, kde-format msgid "" "Enables the --minimal option for the external diff.\n" @@ -2323,12 +2334,12 @@ "Aktiverar väljaren --minimal för det externa verktyget diff.\n" "Analys av stora filer blir mycket långsammare." -#: optiondialog.cpp:910 +#: optiondialog.cpp:941 #, kde-format msgid "Align B and C for 3 input files" msgstr "Justera B och C vid tre indatafiler" -#: optiondialog.cpp:914 +#: optiondialog.cpp:945 #, kde-format msgid "" "Try to align B and C when comparing or merging three input files.\n" @@ -2340,17 +2351,23 @@ "Rekommenderas inte vid sammanfogning eftersom den kan bli mer komplicerad\n" "(normalvärdet är av)," -#: optiondialog.cpp:926 +#: optiondialog.cpp:956 +#, kde-format +msgctxt "Settings page" +msgid "Merge" +msgstr "Sammanfoga" + +#: optiondialog.cpp:957 #, kde-format msgid "Merge Settings" msgstr "Inställningar av sammanfoga" -#: optiondialog.cpp:940 +#: optiondialog.cpp:980 #, kde-format msgid "Auto advance delay (ms):" msgstr "Fördröjning vid automatisk fortsättning (ms):" -#: optiondialog.cpp:946 +#: optiondialog.cpp:986 #, kde-format msgid "" "When in Auto-Advance mode the result of the current selection is shown \n" @@ -2360,27 +2377,27 @@ "under den angivna tiden, innan det går vidare till nästa konflikt. " "Intervall: 0-2000 ms." -#: optiondialog.cpp:950 +#: optiondialog.cpp:990 #, kde-format msgid "Show info dialogs" msgstr "Visa informationsdialogrutor" -#: optiondialog.cpp:953 +#: optiondialog.cpp:993 #, kde-format msgid "Show a dialog with information about the number of conflicts." msgstr "Visa en dialogruta med information om antal konflikter." -#: optiondialog.cpp:956 +#: optiondialog.cpp:996 #, kde-format msgid "White space 2-file merge default:" msgstr "Standardvärde för sammanfogning av blanktecken med två filer:" -#: optiondialog.cpp:961 optiondialog.cpp:974 +#: optiondialog.cpp:1001 optiondialog.cpp:1014 #, kde-format msgid "Manual Choice" msgstr "Manuellt val" -#: optiondialog.cpp:965 optiondialog.cpp:979 +#: optiondialog.cpp:1005 optiondialog.cpp:1019 #, kde-format msgid "" "Allow the merge algorithm to automatically select an input for white-space-" @@ -2389,22 +2406,22 @@ "Tillåt att sammanfogningsalgoritmen automatiskt väljer indata för ändringar " "av bara blanktecken." -#: optiondialog.cpp:969 +#: optiondialog.cpp:1009 #, kde-format msgid "White space 3-file merge default:" msgstr "Standardvärde för sammanfogning av blanktecken med tre filer:" -#: optiondialog.cpp:983 +#: optiondialog.cpp:1023 #, kde-format msgid "Automatic Merge Regular Expression" msgstr "Automatisk sammanfogning med reguljärt uttryck" -#: optiondialog.cpp:991 smalldialogs.cpp:449 +#: optiondialog.cpp:1031 smalldialogs.cpp:459 #, kde-format msgid "Auto merge regular expression:" msgstr "Reguljärt uttryck för automatisk sammanfogning:" -#: optiondialog.cpp:996 +#: optiondialog.cpp:1036 #, kde-format msgid "" "Regular expression for lines where KDiff3 should automatically choose one " @@ -2416,13 +2433,13 @@ "När en rad med en konflikt matchar det reguljära uttrycket väljes -C\n" "om tillgängligt, annars väljes B." -#: optiondialog.cpp:1002 +#: optiondialog.cpp:1042 #, kde-format msgid "Run regular expression auto merge on merge start" msgstr "" "Kör automatisk sammanfogning med reguljärt uttryck när sammanfogning startar" -#: optiondialog.cpp:1005 +#: optiondialog.cpp:1045 #, kde-format msgid "" "Run the merge for auto merge regular expressions\n" @@ -2431,17 +2448,17 @@ "Kör automatisk sammanfogning med reguljärt\n" "uttryck omedelbart när en sammanfogning startar.\n" -#: optiondialog.cpp:1010 +#: optiondialog.cpp:1050 #, kde-format msgid "Version Control History Merging" msgstr "Sammanfogning enligt versionshanteringshistorik" -#: optiondialog.cpp:1018 smalldialogs.cpp:476 +#: optiondialog.cpp:1058 smalldialogs.cpp:486 #, kde-format msgid "History start regular expression:" msgstr "Reguljärt uttryck för historikens början:" -#: optiondialog.cpp:1023 +#: optiondialog.cpp:1063 #, kde-format msgid "" "Regular expression for the start of the version control history entry.\n" @@ -2452,12 +2469,12 @@ "Oftast innehåller raden nyckelordet \"$Log$\".\n" "Standardvärde: \".*\\$Log.*\\$.*\"" -#: optiondialog.cpp:1029 smalldialogs.cpp:504 +#: optiondialog.cpp:1069 smalldialogs.cpp:514 #, kde-format msgid "History entry start regular expression:" msgstr "Reguljärt uttryck för historikpostens början:" -#: optiondialog.cpp:1042 +#: optiondialog.cpp:1082 #, kde-format msgid "" "A version control history entry consists of several lines.\n" @@ -2476,22 +2493,22 @@ "åt.\n" "Se dokumentationen för detaljinformation." -#: optiondialog.cpp:1050 +#: optiondialog.cpp:1090 #, kde-format msgid "History merge sorting" msgstr "Sortering av historiksammanfogning" -#: optiondialog.cpp:1053 +#: optiondialog.cpp:1093 #, kde-format msgid "Sort version control history by a key." msgstr "Sortera versionshanteringshistoriken med en nyckel." -#: optiondialog.cpp:1063 +#: optiondialog.cpp:1103 #, kde-format msgid "History entry start sort key order:" msgstr "Sorteringsnycklarnas ordning från historikpostens början:" -#: optiondialog.cpp:1068 +#: optiondialog.cpp:1108 #, kde-format msgid "" "Each pair of parentheses used in the regular expression for the history " @@ -2511,40 +2528,40 @@ "Om det lämnas tomt, görs ingen sortering.\n" "Se dokumentationen för detaljinformation." -#: optiondialog.cpp:1079 +#: optiondialog.cpp:1119 #, kde-format msgid "Merge version control history on merge start" msgstr "" "Sammanfogning enligt versionshanteringshistorik när sammanfogning startar" -#: optiondialog.cpp:1082 +#: optiondialog.cpp:1122 #, kde-format msgid "Run version control history automerge on merge start." msgstr "" "Kör automatisk sammanfogning enligt versionshanteringshistorik när " "sammanfogning startar." -#: optiondialog.cpp:1086 +#: optiondialog.cpp:1126 #, kde-format msgid "Max number of history entries:" msgstr "Maximalt antal historikposter:" -#: optiondialog.cpp:1090 +#: optiondialog.cpp:1130 #, kde-format msgid "Cut off after specified number. Use -1 for infinite number of entries." msgstr "Skär bort efter angivet antal. Använd -1 för obegränsat antal poster." -#: optiondialog.cpp:1094 +#: optiondialog.cpp:1134 #, kde-format msgid "Test your regular expressions" msgstr "Prova dina reguljära uttryck" -#: optiondialog.cpp:1099 +#: optiondialog.cpp:1139 #, kde-format msgid "Irrelevant merge command:" msgstr "Ej relevant sammanfogningskommando:" -#: optiondialog.cpp:1104 +#: optiondialog.cpp:1144 #, kde-format msgid "" "If specified this script is run after automerge\n" @@ -2555,12 +2572,12 @@ "när inga andra relevanta ändringar detekterades.\n" "Anropas med parametrarna: filnamn1 filnamn2 filnamn3" -#: optiondialog.cpp:1109 +#: optiondialog.cpp:1149 #, kde-format msgid "Auto save and quit on merge without conflicts" msgstr "Spara automatiskt och avsluta vid sammanfogning utan konflikter" -#: optiondialog.cpp:1113 +#: optiondialog.cpp:1153 #, kde-format msgid "" "If KDiff3 was started for a file-merge from the command line and all\n" @@ -2573,27 +2590,27 @@ "avsluta.\n" "(Liknar kommandoradsväljaren \"--auto\".)" -#: optiondialog.cpp:1124 optiondialog.cpp:1125 +#: optiondialog.cpp:1164 optiondialog.cpp:1165 #, kde-format msgid "Directory" msgstr "Katalog" -#: optiondialog.cpp:1137 +#: optiondialog.cpp:1185 #, kde-format msgid "Recursive directories" msgstr "Rekursiva kataloger" -#: optiondialog.cpp:1140 +#: optiondialog.cpp:1188 #, kde-format msgid "Whether to analyze subdirectories or not." msgstr "Om underkataloger ska analyseras eller inte." -#: optiondialog.cpp:1142 +#: optiondialog.cpp:1190 #, kde-format msgid "File pattern(s):" msgstr "Mönster för filer:" -#: optiondialog.cpp:1148 +#: optiondialog.cpp:1196 #, kde-format msgid "" "Pattern(s) of files to be analyzed. \n" @@ -2604,12 +2621,12 @@ "Jokertecken: '*' och '?'\n" "Flera mönster kan anges genom att använda skiljetecknet ';'" -#: optiondialog.cpp:1153 +#: optiondialog.cpp:1201 #, kde-format msgid "File-anti-pattern(s):" msgstr "Undantagsmönster för filer:" -#: optiondialog.cpp:1159 +#: optiondialog.cpp:1207 #, kde-format msgid "" "Pattern(s) of files to be excluded from analysis. \n" @@ -2620,12 +2637,12 @@ "Jokertecken: '*' och '?'\n" "Flera mönster kan anges genom att använda skiljetecknet ';'" -#: optiondialog.cpp:1164 +#: optiondialog.cpp:1212 #, kde-format msgid "Dir-anti-pattern(s):" msgstr "Undantagsmönster för kataloger:" -#: optiondialog.cpp:1170 +#: optiondialog.cpp:1218 #, kde-format msgid "" "Pattern(s) of directories to be excluded from analysis. \n" @@ -2636,12 +2653,12 @@ "Jokertecken: '*' och '?'\n" "Flera mönster kan anges genom att använda skiljetecknet ';'" -#: optiondialog.cpp:1175 +#: optiondialog.cpp:1223 #, kde-format msgid "Use .cvsignore" msgstr "Använd .cvsignore" -#: optiondialog.cpp:1179 +#: optiondialog.cpp:1227 #, kde-format msgid "" "Extends the antipattern to anything that would be ignored by CVS.\n" @@ -2650,22 +2667,22 @@ "Utökar undantagsmönster med allt som skulle ignoreras av CVS.\n" "Med lokala \".cvsignore\" filer, kan det vara katalogspecifikt." -#: optiondialog.cpp:1183 +#: optiondialog.cpp:1231 #, kde-format msgid "Find hidden files and directories" msgstr "Sök efter gömda filer och kataloger" -#: optiondialog.cpp:1186 +#: optiondialog.cpp:1234 #, kde-format msgid "Finds hidden files and directories." msgstr "Söker efter gömda filer och kataloger." -#: optiondialog.cpp:1189 +#: optiondialog.cpp:1237 #, kde-format msgid "Follow file links" msgstr "Följ fillänkar" -#: optiondialog.cpp:1193 +#: optiondialog.cpp:1241 #, kde-format msgid "" "On: Compare the file the link points to.\n" @@ -2674,12 +2691,12 @@ "På: Jämför filen som länken pekar på.\n" "Av: Jämför länkarna." -#: optiondialog.cpp:1197 +#: optiondialog.cpp:1245 #, kde-format msgid "Follow directory links" msgstr "Följ kataloglänkar" -#: optiondialog.cpp:1201 +#: optiondialog.cpp:1249 #, kde-format msgid "" "On: Compare the directory the link points to.\n" @@ -2688,12 +2705,12 @@ "På: Jämför katalogen som länken pekar på.\n" "Av: Jämför länkarna." -#: optiondialog.cpp:1210 +#: optiondialog.cpp:1258 #, kde-format msgid "Case sensitive filename comparison" msgstr "Skiftlägeskänslig filnamnsjämförelse" -#: optiondialog.cpp:1214 +#: optiondialog.cpp:1262 #, kde-format msgid "" "The directory comparison will compare files or directories when their names " @@ -2705,12 +2722,12 @@ "Ange alternativet om namnens skiftläge måste matcha. (Normalvärdet för " "Windows är av, annars på.)" -#: optiondialog.cpp:1218 +#: optiondialog.cpp:1266 #, kde-format msgid "Unfold all subdirectories on load" msgstr "Expandera alla underkataloger vid inläsning" -#: optiondialog.cpp:1222 +#: optiondialog.cpp:1270 #, kde-format msgid "" "On: Unfold all subdirectories when starting a directory diff.\n" @@ -2719,12 +2736,12 @@ "På: Expandera alla underkataloger när en katalogjämförelse påbörjas.\n" "Av: Lämna underkataloger ihopdragna." -#: optiondialog.cpp:1226 +#: optiondialog.cpp:1274 #, kde-format msgid "Skip directory status report" msgstr "Hoppa över katalogstatusrapport" -#: optiondialog.cpp:1230 +#: optiondialog.cpp:1278 #, kde-format msgid "" "On: Do not show the Directory Comparison Status.\n" @@ -2733,27 +2750,27 @@ "På: Visa inte katalogjämförelsestatus.\n" "Av: Visa statusdialogrutan vid start." -#: optiondialog.cpp:1234 +#: optiondialog.cpp:1282 #, kde-format msgid "File Comparison Mode" msgstr "Filjämförelseläge" -#: optiondialog.cpp:1239 +#: optiondialog.cpp:1287 #, kde-format msgid "Binary comparison" msgstr "Binär jämförelse" -#: optiondialog.cpp:1241 +#: optiondialog.cpp:1289 #, kde-format msgid "Binary comparison of each file. (Default)" msgstr "Binär jämförelse av varje fil. (Standardvärde)" -#: optiondialog.cpp:1244 +#: optiondialog.cpp:1292 #, kde-format msgid "Full analysis" msgstr "Fullständig analys" -#: optiondialog.cpp:1246 +#: optiondialog.cpp:1294 #, kde-format msgid "" "Do a full analysis and show statistics information in extra columns.\n" @@ -2762,12 +2779,12 @@ "Gör en fullständig analys och visa statistisk information i extra kolumner.\n" "(Långsammare än binär jämförelse, mycket långsammare för binärfiler.)" -#: optiondialog.cpp:1250 +#: optiondialog.cpp:1298 #, kde-format msgid "Trust the size and modification date (unsafe)" msgstr "Lita på storlek och ändringsdatum (inte säkert)" -#: optiondialog.cpp:1252 +#: optiondialog.cpp:1300 #, kde-format msgid "" "Assume that files are equal if the modification date and file length are " @@ -2781,7 +2798,7 @@ "olika.\n" "Användbar för stora kataloger eller långsamma nätverk." -#: optiondialog.cpp:1257 +#: optiondialog.cpp:1305 #, kde-format msgid "" "Trust the size and date, but use binary comparison if date does not match " @@ -2790,7 +2807,7 @@ "Lita på storlek och datum, men använd binärjämförelse om datum inte stämmer " "(inte säkert)" -#: optiondialog.cpp:1259 +#: optiondialog.cpp:1307 #, kde-format msgid "" "Assume that files are equal if the modification date and file length are " @@ -2802,12 +2819,12 @@ "Om datumen inte är lika men storlekarna är det, används binärjämförelse.\n" "Användbar för stora kataloger eller långsamma nätverk." -#: optiondialog.cpp:1264 +#: optiondialog.cpp:1312 #, kde-format msgid "Trust the size (unsafe)" msgstr "Lita på storleken (inte säkert)" -#: optiondialog.cpp:1266 +#: optiondialog.cpp:1314 #, kde-format msgid "" "Assume that files are equal if their file lengths are equal.\n" @@ -2818,12 +2835,12 @@ "Användbar för stora kataloger eller långsamma nätverk när datum ändras under " "nerladdning." -#: optiondialog.cpp:1273 +#: optiondialog.cpp:1321 #, kde-format msgid "Synchronize directories" msgstr "Synkronisera kataloger" -#: optiondialog.cpp:1277 +#: optiondialog.cpp:1325 #, kde-format msgid "" "Offers to store files in both directories so that\n" @@ -2834,12 +2851,12 @@ "blir likadana efteråt. Fungerar bara när två kataloger\n" "jämförs och ingen målkatalog anges." -#: optiondialog.cpp:1283 +#: optiondialog.cpp:1331 #, kde-format msgid "White space differences considered equal" msgstr "Skillnader i blanktecken anses lika" -#: optiondialog.cpp:1287 +#: optiondialog.cpp:1335 #, kde-format msgid "" "If files differ only by white space consider them equal.\n" @@ -2848,12 +2865,12 @@ "Om filer bara skiljer sig med blanktecken, anse dem lika.\n" "Det här är bara aktiverat när fullständig analys väljes." -#: optiondialog.cpp:1293 +#: optiondialog.cpp:1341 #, kde-format msgid "Copy newer instead of merging (unsafe)" msgstr "Kopiera nyare istället för att sammanfoga (inte säkert)" -#: optiondialog.cpp:1297 +#: optiondialog.cpp:1345 #, kde-format msgid "" "Do not look inside, just take the newer file.\n" @@ -2864,12 +2881,12 @@ "(Använd bara det här om du vet vad du gör!)\n" "Har bara någon effekt när två kataloger jämförs." -#: optiondialog.cpp:1302 +#: optiondialog.cpp:1350 #, kde-format msgid "Backup files (.orig)" msgstr "Säkerhetskopior (.orig)" -#: optiondialog.cpp:1306 +#: optiondialog.cpp:1354 #, kde-format msgid "" "If a file would be saved over an old file, then the old file\n" @@ -2878,17 +2895,17 @@ "När en fil skulle sparas och en gammal fil redan finns, kommer den\n" "gamla filen att döpas om med filändelsen '.orig' istället för att tas bort." -#: optiondialog.cpp:1382 optiondialog.cpp:1383 +#: optiondialog.cpp:1430 optiondialog.cpp:1431 #, kde-format msgid "Regional Settings" msgstr "Regionsinställningar" -#: optiondialog.cpp:1397 +#: optiondialog.cpp:1454 #, kde-format msgid "Use the same encoding for everything:" msgstr "Använd samma kodning för allt:" -#: optiondialog.cpp:1401 +#: optiondialog.cpp:1458 #, kde-format msgid "" "Enable this allows to change all encodings by changing the first only.\n" @@ -2898,17 +2915,17 @@ "första.\n" "Inaktivera det om olika individuella inställningar behövs." -#: optiondialog.cpp:1405 +#: optiondialog.cpp:1462 #, kde-format msgid "Note: Local Encoding is \"%1\"" msgstr "Observera: Lokal kodning är \"%1\"" -#: optiondialog.cpp:1409 +#: optiondialog.cpp:1466 #, kde-format msgid "File Encoding for A:" msgstr "Filkodning för A:" -#: optiondialog.cpp:1416 +#: optiondialog.cpp:1473 #, kde-format msgid "" "If enabled then Unicode (UTF-16 or UTF-8) encoding will be detected.\n" @@ -2921,32 +2938,32 @@ "reserv.\n" "(Detektering av Unicode beror på den första byten i en fil.)" -#: optiondialog.cpp:1419 optiondialog.cpp:1430 optiondialog.cpp:1441 +#: optiondialog.cpp:1476 optiondialog.cpp:1487 optiondialog.cpp:1498 #, kde-format msgid "Auto Detect Unicode" msgstr "Detektera automatiskt Unicode" -#: optiondialog.cpp:1425 +#: optiondialog.cpp:1482 #, kde-format msgid "File Encoding for B:" msgstr "Filkodning för B:" -#: optiondialog.cpp:1436 +#: optiondialog.cpp:1493 #, kde-format msgid "File Encoding for C:" msgstr "Filkodning för C:" -#: optiondialog.cpp:1447 +#: optiondialog.cpp:1504 #, kde-format msgid "File Encoding for Merge Output and Saving:" msgstr "Filkodning för sammanfogad utdata och vid spara:" -#: optiondialog.cpp:1452 +#: optiondialog.cpp:1509 #, kde-format msgid "Auto Select" msgstr "Automatiskt markering" -#: optiondialog.cpp:1456 +#: optiondialog.cpp:1513 #, kde-format msgid "" "If enabled then the encoding from the input files is used.\n" @@ -2957,17 +2974,17 @@ "I tvetydiga fall ombedes användaren att välja kodning för att spara med en " "dialogruta." -#: optiondialog.cpp:1459 +#: optiondialog.cpp:1516 #, kde-format msgid "File Encoding for Preprocessor Files:" msgstr "Filkodning för preprocessorfiler:" -#: optiondialog.cpp:1471 +#: optiondialog.cpp:1528 #, kde-format msgid "Right To Left Language" msgstr "Språk som läses från höger till vänster" -#: optiondialog.cpp:1475 +#: optiondialog.cpp:1532 #, kde-format msgid "" "Some languages are read from right to left.\n" @@ -2976,22 +2993,22 @@ "Vissa språk läses från höger till vänster.\n" "Inställningen ändrar visningen och editorn på motsvarande sätt." -#: optiondialog.cpp:1485 +#: optiondialog.cpp:1542 #, kde-format msgid "Integration" msgstr "Integrering" -#: optiondialog.cpp:1486 +#: optiondialog.cpp:1543 #, kde-format msgid "Integration Settings" msgstr "Integreringsinställningar" -#: optiondialog.cpp:1499 +#: optiondialog.cpp:1564 #, kde-format msgid "Command line options to ignore:" msgstr "Kommandoradsväljare att ignorera:" -#: optiondialog.cpp:1505 +#: optiondialog.cpp:1570 #, kde-format msgid "" "List of command line options that should be ignored when KDiff3 is used by " @@ -3004,12 +3021,12 @@ "Flera värden kan anges om de åtskiljs av ';'\n" "Detta undertrycker felmeddelandet \"Okänd väljare\"." -#: optiondialog.cpp:1510 +#: optiondialog.cpp:1575 #, kde-format msgid "Quit also via Escape key" msgstr "Avsluta också via Esc-tangenten" -#: optiondialog.cpp:1514 +#: optiondialog.cpp:1579 #, kde-format msgid "" "Fast method to exit.\n" @@ -3018,7 +3035,7 @@ "Snabb metod att avsluta.\n" "För de som är vana vid att använda Esc-tangenten." -#: optiondialog.cpp:1598 +#: optiondialog.cpp:1653 #, kde-format msgid "This resets all options. Not only those of the current topic." msgstr "Det här återställer alla alternativ, inte bara de i nuvarande ämne." @@ -3074,77 +3091,67 @@ msgid "Disable Unsafe Options" msgstr "Inaktivera osäkra alternativ" -#: pdiff.cpp:158 +#: pdiff.cpp:160 #, kde-format msgid "Loading A" -msgstr "Laddar A" +msgstr "Läser in A" -#: pdiff.cpp:167 +#: pdiff.cpp:162 #, kde-format -msgid "Errors occurred during pre-processing of file A." -msgstr "Fel uppstod vid förbehandlingen av fil A." +msgid "Loading A: %1" +msgstr "Läser in A: %1" -#: pdiff.cpp:172 +#: pdiff.cpp:170 #, kde-format msgid "Loading B" -msgstr "Laddar B" - -#: pdiff.cpp:179 -#, kde-format -msgid "Errors occurred during pre-processing of file B." -msgstr "Fel uppstod vid förbehandlingen av fil B." +msgstr "Läser in B" -#: pdiff.cpp:202 pdiff.cpp:241 +#: pdiff.cpp:201 pdiff.cpp:237 #, kde-format msgid "Diff: A <-> B" msgstr "Jämförelse: A <-> B" -#: pdiff.cpp:208 pdiff.cpp:279 pdiff.cpp:293 +#: pdiff.cpp:207 pdiff.cpp:275 pdiff.cpp:289 #, kde-format msgid "Linediff: A <-> B" msgstr "Radjämförelse: A <-> B" -#: pdiff.cpp:225 +#: pdiff.cpp:224 #, kde-format msgid "Loading C" -msgstr "Laddar C" - -#: pdiff.cpp:232 -#, kde-format -msgid "Errors occurred during pre-processing of file C." -msgstr "Fel uppstod vid förbehandlingen av fil C." +msgstr "Läser in C" -#: pdiff.cpp:250 +#: pdiff.cpp:246 #, kde-format msgid "Diff: A <-> C" msgstr "Jämförelse: A <-> C" -#: pdiff.cpp:261 +#: pdiff.cpp:257 #, kde-format msgid "Diff: B <-> C" msgstr "Jämförelse: B <-> C" -#: pdiff.cpp:283 pdiff.cpp:297 +#: pdiff.cpp:279 pdiff.cpp:293 #, kde-format msgid "Linediff: B <-> C" msgstr "Radjämförelse: B <-> C" -#: pdiff.cpp:287 pdiff.cpp:301 +#: pdiff.cpp:283 pdiff.cpp:297 #, kde-format msgid "Linediff: A <-> C" msgstr "Radjämförelse: A <-> C" -#: pdiff.cpp:829 +#: pdiff.cpp:819 #, kde-format 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:835 pdiff.cpp:839 pdiff.cpp:843 +#: pdiff.cpp:825 pdiff.cpp:829 pdiff.cpp:833 #, 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:853 +#: pdiff.cpp:843 #, kde-format msgid "" "Some input files do not seem to be pure text files.\n" @@ -3155,17 +3162,17 @@ "Observera att Kdiff3:s sammanfogning inte är avsedd för binärdata.\n" "Fortsätt på egen risk." -#: pdiff.cpp:863 +#: pdiff.cpp:853 #, kde-format msgid ", B" msgstr ", B" -#: pdiff.cpp:865 +#: pdiff.cpp:855 #, kde-format msgid ", C" msgstr ", C" -#: pdiff.cpp:867 +#: pdiff.cpp:857 #, kde-format msgid "" "Some input characters could not be converted to valid unicode.\n" @@ -3179,77 +3186,72 @@ "Spara inte resultatet om du är osäker. Fortsätt på egen risk.\n" "Berörda indatafiler finns i %1." -#: pdiff.cpp:1034 +#: pdiff.cpp:1032 #, kde-format msgid "Abort" msgstr "Avbryt" -#: pdiff.cpp:1040 pdiff.cpp:1130 +#: pdiff.cpp:1038 pdiff.cpp:1129 #, kde-format msgid "Opening files..." msgstr "Öppnar filer..." -#: pdiff.cpp:1107 -#, kde-format -msgid "File open error" -msgstr "Fel när filen öppnades" - -#: pdiff.cpp:1202 +#: pdiff.cpp:1212 #, kde-format msgid "Cutting selection..." msgstr "Klipper ut markering..." -#: pdiff.cpp:1223 +#: pdiff.cpp:1233 #, kde-format msgid "Copying selection to clipboard..." msgstr "Kopierar markering till klippbord..." -#: pdiff.cpp:1239 +#: pdiff.cpp:1249 #, kde-format msgid "Inserting clipboard contents..." msgstr "Infogar klippbordets innehåll..." -#: pdiff.cpp:1695 +#: pdiff.cpp:1705 #, kde-format msgid "Word wrap (Cancel disables word wrap)" msgstr "Radbrytning (Avbryt inaktiverar radbrytning)" -#: pdiff.cpp:1696 +#: pdiff.cpp:1706 #, kde-format msgid "Calculating max width for horizontal scrollbar" msgstr "Beräknar maximal bredd för horisontell rullningslist" -#: pdiff.cpp:1911 +#: pdiff.cpp:1921 #, kde-format msgid "Save && Continue" msgstr "Spara och fortsätt" -#: pdiff.cpp:1912 +#: pdiff.cpp:1922 #, kde-format msgid "Continue Without Saving" msgstr "Fortsätt utan att spara" -#: pdiff.cpp:2124 +#: pdiff.cpp:2134 #, kde-format msgid "Search complete." msgstr "Sökning färdig." -#: pdiff.cpp:2124 +#: pdiff.cpp:2134 #, kde-format msgid "Search Complete" msgstr "Sökning färdig" -#: pdiff.cpp:2375 +#: pdiff.cpp:2385 #, kde-format msgid "Nothing is selected in either diff input window." msgstr "Ingenting är markerad i något indatafönster med jämförelse." -#: pdiff.cpp:2375 +#: pdiff.cpp:2385 #, kde-format msgid "Error while adding manual diff range" msgstr "Fel vid tillägg av manuellt jämförelseintervall" -#: progress.cpp:59 progress.cpp:71 +#: progress.cpp:61 progress.cpp:73 #, kde-format msgid "&Cancel" msgstr "&Avbryt" @@ -3259,126 +3261,126 @@ msgid "A (Base):" msgstr "A (bas):" -#: smalldialogs.cpp:68 smalldialogs.cpp:85 smalldialogs.cpp:102 -#: smalldialogs.cpp:144 +#: smalldialogs.cpp:71 smalldialogs.cpp:90 smalldialogs.cpp:109 +#: smalldialogs.cpp:154 #, kde-format msgid "File..." msgstr "Fil..." -#: smalldialogs.cpp:70 smalldialogs.cpp:87 smalldialogs.cpp:104 -#: smalldialogs.cpp:146 +#: smalldialogs.cpp:73 smalldialogs.cpp:92 smalldialogs.cpp:111 +#: smalldialogs.cpp:156 #, kde-format msgid "Dir..." msgstr "Katalog..." -#: smalldialogs.cpp:96 +#: smalldialogs.cpp:103 #, kde-format msgid "C (Optional):" msgstr "C (valfri):" -#: smalldialogs.cpp:119 +#: smalldialogs.cpp:126 #, kde-format msgid "Swap/Copy Names..." msgstr "Byt eller kopiera namn..." -#: smalldialogs.cpp:124 smalldialogs.cpp:125 smalldialogs.cpp:126 +#: smalldialogs.cpp:131 smalldialogs.cpp:132 smalldialogs.cpp:133 #, kde-format msgid "Swap %1<->%2" msgstr "Byt ut %1 mot %2" -#: smalldialogs.cpp:127 smalldialogs.cpp:128 smalldialogs.cpp:129 +#: smalldialogs.cpp:134 smalldialogs.cpp:135 smalldialogs.cpp:136 #, kde-format msgid "Copy %1->Output" msgstr "Kopiera %1 till utdata" -#: smalldialogs.cpp:130 smalldialogs.cpp:131 smalldialogs.cpp:132 +#: smalldialogs.cpp:137 smalldialogs.cpp:138 smalldialogs.cpp:139 #, kde-format msgid "Swap %1<->Output" msgstr "Byt %1 mot utmatning" -#: smalldialogs.cpp:138 +#: smalldialogs.cpp:148 #, kde-format msgid "Output (optional):" msgstr "Utmatning (valfri):" -#: smalldialogs.cpp:168 +#: smalldialogs.cpp:178 #, kde-format msgid "Configure..." msgstr "Anpassa..." -#: smalldialogs.cpp:233 +#: smalldialogs.cpp:243 #, kde-format msgid "Open Directory" msgstr "Öppna katalog" -#: smalldialogs.cpp:234 +#: smalldialogs.cpp:244 #, kde-format msgid "Select Output File" msgstr "Välj utdatafil" -#: smalldialogs.cpp:393 +#: smalldialogs.cpp:403 #, kde-format msgid "Search text:" msgstr "Söktext:" -#: smalldialogs.cpp:400 +#: smalldialogs.cpp:410 #, kde-format msgid "Case sensitive" msgstr "Skiftlägeskänslig" -#: smalldialogs.cpp:403 +#: smalldialogs.cpp:413 #, kde-format msgid "Search A" msgstr "Sök A" -#: smalldialogs.cpp:408 +#: smalldialogs.cpp:418 #, kde-format msgid "Search B" msgstr "Sök B" -#: smalldialogs.cpp:413 +#: smalldialogs.cpp:423 #, kde-format msgid "Search C" msgstr "Sök C" -#: smalldialogs.cpp:418 +#: smalldialogs.cpp:428 #, kde-format msgid "Search output" msgstr "Sökutmatning" -#: smalldialogs.cpp:425 +#: smalldialogs.cpp:435 #, kde-format msgid "&Search" msgstr "&Sök" -#: smalldialogs.cpp:444 +#: smalldialogs.cpp:454 #, kde-format msgid "Regular Expression Tester" msgstr "Test av reguljära uttryck" -#: smalldialogs.cpp:457 +#: smalldialogs.cpp:467 #, kde-format msgid "Example auto merge line:" msgstr "Exempel på rad för automatisk sammanfogning:" -#: smalldialogs.cpp:459 +#: smalldialogs.cpp:469 #, kde-format msgid "To test auto merge, copy a line as used in your files." msgstr "" "För att prova automatisk sammanfogning, kopiera en rad som används i dina " "filer." -#: smalldialogs.cpp:465 smalldialogs.cpp:493 smalldialogs.cpp:529 +#: smalldialogs.cpp:475 smalldialogs.cpp:503 smalldialogs.cpp:539 #, kde-format msgid "Match result:" msgstr "Matchningsresultat:" -#: smalldialogs.cpp:484 +#: smalldialogs.cpp:494 #, kde-format msgid "Example history start line (with leading comment):" msgstr "Exempel på startrad för historik (med inledande kommentar):" -#: smalldialogs.cpp:486 +#: smalldialogs.cpp:496 #, kde-format msgid "" "Copy a history start line as used in your files,\n" @@ -3387,17 +3389,17 @@ "Kopiera en startrad för historik som används i dina filer,\n" "inklusive den inledande kommentaren." -#: smalldialogs.cpp:512 +#: smalldialogs.cpp:522 #, kde-format msgid "History sort key order:" msgstr "Sorteringsnyckelordning för historik:" -#: smalldialogs.cpp:520 +#: smalldialogs.cpp:530 #, kde-format msgid "Example history entry start line (without leading comment):" msgstr "Exempel på startrad för en historikpost (utan inledande kommentar):" -#: smalldialogs.cpp:522 +#: smalldialogs.cpp:532 #, kde-format msgid "" "Copy a history entry start line as used in your files,\n" @@ -3406,47 +3408,47 @@ "Kopiera en startrad för en historikpost som används i dina filer,\n" "men utelämna den inledande kommentaren." -#: smalldialogs.cpp:536 +#: smalldialogs.cpp:546 #, kde-format msgid "Sort key result:" msgstr "Sorteringsnyckelresultat:" -#: smalldialogs.cpp:584 smalldialogs.cpp:594 smalldialogs.cpp:614 +#: smalldialogs.cpp:594 smalldialogs.cpp:604 smalldialogs.cpp:624 #, kde-format msgid "Match success." msgstr "Matchning lyckades." -#: smalldialogs.cpp:588 smalldialogs.cpp:598 smalldialogs.cpp:620 +#: smalldialogs.cpp:598 smalldialogs.cpp:608 smalldialogs.cpp:630 #, kde-format msgid "Match failed." msgstr "Matchning misslyckades." -#: smalldialogs.cpp:605 +#: smalldialogs.cpp:615 #, kde-format msgid "Opening and closing parentheses do not match in regular expression." msgstr "Inledande och avslutande parenteser matchar inte i reguljärt uttryck." -#: SourceData.cpp:150 +#: SourceData.cpp:153 #, kde-format msgid "Writing clipboard data to temp file failed." msgstr "Skrivning av klippbordsdata till tillfällig fil misslyckades." -#: SourceData.cpp:154 +#: SourceData.cpp:157 #, kde-format msgid "From Clipboard" msgstr "Från klippbord" -#: SourceData.cpp:335 +#: SourceData.cpp:348 #, kde-format msgid "%1 is not a normal file." msgstr "%1 är inte en normal fil." -#: SourceData.cpp:427 +#: SourceData.cpp:440 #, kde-format msgid " Temp file is: %1" msgstr " Tillfällig fil är: %1" -#: SourceData.cpp:432 +#: SourceData.cpp:445 #, kde-format msgid "" "Preprocessing possibly failed. Check this command:\n" @@ -3461,12 +3463,12 @@ "\n" "Preprocessingkommandot inaktiveras nu." -#: SourceData.cpp:443 SourceData.cpp:512 +#: SourceData.cpp:456 SourceData.cpp:525 #, kde-format msgid "File %1 too large to process. Skipping." msgstr "Filen %1 är för stor för att behandla. Hoppar över." -#: SourceData.cpp:487 +#: SourceData.cpp:500 #, kde-format msgid "" "The line-matching-preprocessing possibly failed. Check this command:\n" diff -Nru kdiff3-1.8.01/po/ta/kdiff3.po kdiff3-1.8.3/po/ta/kdiff3.po --- kdiff3-1.8.01/po/ta/kdiff3.po 2019-05-18 01:02:27.000000000 +0000 +++ kdiff3-1.8.3/po/ta/kdiff3.po 2020-06-25 00:18:55.000000000 +0000 @@ -24,8 +24,8 @@ msgid "" msgstr "" "Project-Id-Version: kdiff3\n" -"Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2019-04-18 08:02+0200\n" +"Report-Msgid-Bugs-To: https://bugs.kde.org\n" +"POT-Creation-Date: 2020-06-22 07:48+0200\n" "PO-Revision-Date: 2004-08-24 04:28+0530\n" "Last-Translator: I. Felix \n" "Language-Team: \n" @@ -45,290 +45,290 @@ msgid "Your emails" msgstr "" -#: difftextwindow.cpp:412 +#: difftextwindow.cpp:414 #, kde-format msgid "File %1: Line %2" msgstr "" -#: difftextwindow.cpp:414 +#: difftextwindow.cpp:416 #, fuzzy, kde-format #| msgid "not available" msgid "File %1: Line not available" msgstr "கிடைக்கவில்லை" -#: difftextwindow.cpp:1780 +#: difftextwindow.cpp:1778 #, kde-format msgid "Encoding:" msgstr "" -#: difftextwindow.cpp:1782 mergeresultwindow.cpp:3138 optiondialog.cpp:818 +#: difftextwindow.cpp:1781 mergeresultwindow.cpp:3166 optiondialog.cpp:840 #, fuzzy, kde-format msgid "Line end style:" msgstr "வரிகளின் பாணி தாள்" -#: difftextwindow.cpp:1810 directorymergewindow.cpp:382 -#: directorymergewindow.cpp:433 directorymergewindow.cpp:524 -#: directorymergewindow.cpp:3058 directorymergewindow.cpp:3189 -#: directorymergewindow.cpp:3417 mergeresultwindow.cpp:942 -#: mergeresultwindow.cpp:944 mergeresultwindow.cpp:946 -#: mergeresultwindow.cpp:948 mergeresultwindow.cpp:1814 -#: mergeresultwindow.cpp:3170 mergeresultwindow.cpp:3177 optiondialog.cpp:962 -#: optiondialog.cpp:975 pdiff.cpp:833 pdiff.cpp:835 pdiff.cpp:837 pdiff.cpp:839 -#: pdiff.cpp:861 smalldialogs.cpp:124 smalldialogs.cpp:126 smalldialogs.cpp:127 -#: smalldialogs.cpp:130 +#: difftextwindow.cpp:1809 directorymergewindow.cpp:383 +#: directorymergewindow.cpp:434 directorymergewindow.cpp:525 +#: directorymergewindow.cpp:3072 directorymergewindow.cpp:3203 +#: directorymergewindow.cpp:3431 mergeresultwindow.cpp:970 +#: mergeresultwindow.cpp:972 mergeresultwindow.cpp:974 +#: mergeresultwindow.cpp:976 mergeresultwindow.cpp:1842 +#: mergeresultwindow.cpp:3198 mergeresultwindow.cpp:3205 optiondialog.cpp:1002 +#: optiondialog.cpp:1015 pdiff.cpp:823 pdiff.cpp:825 pdiff.cpp:827 +#: pdiff.cpp:829 pdiff.cpp:851 smalldialogs.cpp:131 smalldialogs.cpp:133 +#: smalldialogs.cpp:134 smalldialogs.cpp:137 #, kde-format msgid "A" msgstr "A" -#: difftextwindow.cpp:1810 directorymergewindow.cpp:384 -#: directorymergewindow.cpp:436 directorymergewindow.cpp:526 -#: directorymergewindow.cpp:3064 directorymergewindow.cpp:3190 -#: directorymergewindow.cpp:3418 mergeresultwindow.cpp:942 -#: mergeresultwindow.cpp:944 mergeresultwindow.cpp:950 -#: mergeresultwindow.cpp:952 mergeresultwindow.cpp:1816 -#: mergeresultwindow.cpp:3172 mergeresultwindow.cpp:3179 optiondialog.cpp:963 -#: optiondialog.cpp:976 pdiff.cpp:833 pdiff.cpp:835 pdiff.cpp:841 pdiff.cpp:843 -#: pdiff.cpp:863 smalldialogs.cpp:124 smalldialogs.cpp:125 smalldialogs.cpp:128 -#: smalldialogs.cpp:131 +#: difftextwindow.cpp:1809 directorymergewindow.cpp:385 +#: directorymergewindow.cpp:437 directorymergewindow.cpp:527 +#: directorymergewindow.cpp:3078 directorymergewindow.cpp:3204 +#: directorymergewindow.cpp:3432 mergeresultwindow.cpp:970 +#: mergeresultwindow.cpp:972 mergeresultwindow.cpp:978 +#: mergeresultwindow.cpp:980 mergeresultwindow.cpp:1844 +#: mergeresultwindow.cpp:3200 mergeresultwindow.cpp:3207 optiondialog.cpp:1003 +#: optiondialog.cpp:1016 pdiff.cpp:823 pdiff.cpp:825 pdiff.cpp:831 +#: pdiff.cpp:833 pdiff.cpp:853 smalldialogs.cpp:131 smalldialogs.cpp:132 +#: smalldialogs.cpp:135 smalldialogs.cpp:138 #, kde-format msgid "B" msgstr "B" -#: difftextwindow.cpp:1810 directorymergewindow.cpp:386 -#: directorymergewindow.cpp:439 directorymergewindow.cpp:528 -#: directorymergewindow.cpp:3070 directorymergewindow.cpp:3191 -#: directorymergewindow.cpp:3419 mergeresultwindow.cpp:946 -#: mergeresultwindow.cpp:948 mergeresultwindow.cpp:950 -#: mergeresultwindow.cpp:952 mergeresultwindow.cpp:1818 -#: mergeresultwindow.cpp:3174 mergeresultwindow.cpp:3181 optiondialog.cpp:977 -#: pdiff.cpp:837 pdiff.cpp:839 pdiff.cpp:841 pdiff.cpp:843 pdiff.cpp:865 -#: smalldialogs.cpp:125 smalldialogs.cpp:126 smalldialogs.cpp:129 -#: smalldialogs.cpp:132 +#: difftextwindow.cpp:1809 directorymergewindow.cpp:387 +#: directorymergewindow.cpp:440 directorymergewindow.cpp:529 +#: directorymergewindow.cpp:3084 directorymergewindow.cpp:3205 +#: directorymergewindow.cpp:3433 mergeresultwindow.cpp:974 +#: mergeresultwindow.cpp:976 mergeresultwindow.cpp:978 +#: mergeresultwindow.cpp:980 mergeresultwindow.cpp:1846 +#: mergeresultwindow.cpp:3202 mergeresultwindow.cpp:3209 optiondialog.cpp:1017 +#: pdiff.cpp:827 pdiff.cpp:829 pdiff.cpp:831 pdiff.cpp:833 pdiff.cpp:855 +#: smalldialogs.cpp:132 smalldialogs.cpp:133 smalldialogs.cpp:136 +#: smalldialogs.cpp:139 #, kde-format msgid "C" msgstr "C" -#: difftextwindow.cpp:1810 +#: difftextwindow.cpp:1809 #, fuzzy, kde-format #| msgid "A (Base):" msgid "A (Base)" msgstr "A (அடிப்படை)" -#: difftextwindow.cpp:1812 +#: difftextwindow.cpp:1811 #, kde-format msgid "Encoding: %1" msgstr "" -#: difftextwindow.cpp:1813 mergeresultwindow.cpp:3183 +#: difftextwindow.cpp:1812 mergeresultwindow.cpp:3211 #, kde-format msgid "Unix" msgstr "" -#: difftextwindow.cpp:1813 mergeresultwindow.cpp:3184 +#: difftextwindow.cpp:1812 mergeresultwindow.cpp:3212 #, kde-format msgid "DOS" msgstr "" -#: difftextwindow.cpp:1813 +#: difftextwindow.cpp:1812 #, fuzzy, kde-format msgid "Line end style: %1" msgstr "வரிகளின் பாணி தாள்" -#: difftextwindow.cpp:1835 kdiff3.cpp:873 +#: difftextwindow.cpp:1834 kdiff3.cpp:874 #, fuzzy, kde-format msgid "Top line" msgstr "மேல் வரி %1." -#: difftextwindow.cpp:1845 +#: difftextwindow.cpp:1843 #, kde-format msgid "End" msgstr "முடிவு" -#: difftextwindow.cpp:1903 smalldialogs.cpp:235 +#: difftextwindow.cpp:1901 smalldialogs.cpp:245 #, fuzzy, kde-format #| msgid "Opening files..." msgid "Open File" msgstr "திறந்த கோப்புகள்" -#: difftextwindow.cpp:1951 optiondialog.cpp:387 +#: difftextwindow.cpp:1943 optiondialog.cpp:389 #, kde-format msgid "Unicode, 8 bit" msgstr "" -#: difftextwindow.cpp:1966 +#: difftextwindow.cpp:1958 #, kde-format msgid "Other" msgstr "" -#: directorymergewindow.cpp:409 directorymergewindow.cpp:3424 +#: directorymergewindow.cpp:410 directorymergewindow.cpp:3438 #, kde-format msgid "Copy A to B" msgstr " A to B படியெடு" -#: directorymergewindow.cpp:412 directorymergewindow.cpp:3425 +#: directorymergewindow.cpp:413 directorymergewindow.cpp:3439 #, kde-format msgid "Copy B to A" msgstr "படியெடு B to A" -#: directorymergewindow.cpp:415 directorymergewindow.cpp:3426 +#: directorymergewindow.cpp:416 directorymergewindow.cpp:3440 #, kde-format msgid "Delete A" msgstr " A ஐ நீக்கு" -#: directorymergewindow.cpp:418 directorymergewindow.cpp:3427 +#: directorymergewindow.cpp:419 directorymergewindow.cpp:3441 #, kde-format msgid "Delete B" msgstr "B ஐ நீக்கு" -#: directorymergewindow.cpp:421 +#: directorymergewindow.cpp:422 #, kde-format msgid "Delete A & B" msgstr "A & Bஐ நீக்கு " -#: directorymergewindow.cpp:424 directorymergewindow.cpp:3429 +#: directorymergewindow.cpp:425 directorymergewindow.cpp:3443 #, kde-format msgid "Merge to A" msgstr " A ஐ ஒன்றாகச் சேர்." -#: directorymergewindow.cpp:427 directorymergewindow.cpp:3430 +#: directorymergewindow.cpp:428 directorymergewindow.cpp:3444 #, kde-format msgid "Merge to B" msgstr " 'பி' ஐ ஒன்றாகச் சேர்." -#: directorymergewindow.cpp:430 +#: directorymergewindow.cpp:431 #, kde-format msgid "Merge to A & B" msgstr "A & B ஐ ஒன்றாகச் சேர்." -#: directorymergewindow.cpp:442 directorymergewindow.cpp:3421 +#: directorymergewindow.cpp:443 directorymergewindow.cpp:3435 #, kde-format msgid "Delete (if exists)" msgstr "நீக்கு." -#: directorymergewindow.cpp:445 directorymergewindow.cpp:448 -#: directorymergewindow.cpp:3420 optiondialog.cpp:925 smalldialogs.cpp:113 +#: directorymergewindow.cpp:446 directorymergewindow.cpp:449 +#: directorymergewindow.cpp:3434 smalldialogs.cpp:120 #, kde-format msgid "Merge" msgstr "ஒன்றாகச் சேர்." -#: directorymergewindow.cpp:445 directorymergewindow.cpp:448 +#: directorymergewindow.cpp:446 directorymergewindow.cpp:449 #, kde-format msgid "Merge (manual)" msgstr "ஒன்றாகச் சேர்." -#: directorymergewindow.cpp:451 +#: directorymergewindow.cpp:452 #, kde-format msgid "Error: Conflicting File Types" msgstr "பிழை: குழப்ப கோப்பு வகைகள்" -#: directorymergewindow.cpp:454 +#: directorymergewindow.cpp:455 #, kde-format msgid "Error: Changed and Deleted" msgstr "" -#: directorymergewindow.cpp:457 +#: directorymergewindow.cpp:458 #, kde-format msgid "Error: Dates are equal but files are not." msgstr "பிழை: தேதிகள் சமம் ஆனால் கோப்புகள் இல்லை." -#: directorymergewindow.cpp:471 +#: directorymergewindow.cpp:472 #, fuzzy, kde-format #| msgid "Done." msgid "Done" msgstr "முடிந்த." -#: directorymergewindow.cpp:473 +#: directorymergewindow.cpp:474 #, fuzzy, kde-format #| msgid "Error." msgid "Error" msgstr "பிழை." -#: directorymergewindow.cpp:475 +#: directorymergewindow.cpp:476 #, kde-format msgid "Skipped." msgstr "தவிர்த்தது." -#: directorymergewindow.cpp:477 +#: directorymergewindow.cpp:478 #, kde-format msgid "Not saved." msgstr "கோப்பு" -#: directorymergewindow.cpp:479 +#: directorymergewindow.cpp:480 #, kde-format msgid "In progress..." msgstr "செயல்பாட்டில் உள்ளது..." -#: directorymergewindow.cpp:481 +#: directorymergewindow.cpp:482 #, kde-format msgid "To do." msgstr "அதை செய்." -#: directorymergewindow.cpp:522 +#: directorymergewindow.cpp:523 #, kde-format msgid "Name" msgstr "பெயர்." -#: directorymergewindow.cpp:530 +#: directorymergewindow.cpp:531 #, kde-format msgid "Operation" msgstr "இயக்கம்." -#: directorymergewindow.cpp:532 +#: directorymergewindow.cpp:533 #, kde-format msgid "Status" msgstr "நிலை." -#: directorymergewindow.cpp:534 +#: directorymergewindow.cpp:535 #, kde-format msgid "Unsolved" msgstr "Unsolved" -#: directorymergewindow.cpp:536 +#: directorymergewindow.cpp:537 #, kde-format msgid "Solved" msgstr "Solved" -#: directorymergewindow.cpp:538 +#: directorymergewindow.cpp:539 #, kde-format msgid "Nonwhite" msgstr "Nonwhite" -#: directorymergewindow.cpp:540 +#: directorymergewindow.cpp:541 #, kde-format msgid "White" msgstr "White" -#: directorymergewindow.cpp:674 +#: directorymergewindow.cpp:676 #, kde-format msgid "Unable to compare non-normal file with normal file." msgstr "" -#: directorymergewindow.cpp:688 +#: directorymergewindow.cpp:690 #, kde-format msgid "Mix of links and normal files." msgstr "இணைப்புகள் மற்றும் கோப்புகள் கலந்து உள்ளன." -#: directorymergewindow.cpp:695 +#: directorymergewindow.cpp:697 #, kde-format msgid "Link: " msgstr "இணைப்பு." -#: directorymergewindow.cpp:704 +#: directorymergewindow.cpp:706 #, kde-format msgid "Size. " msgstr "அளவு." -#: directorymergewindow.cpp:718 directorymergewindow.cpp:728 +#: directorymergewindow.cpp:720 directorymergewindow.cpp:730 #, kde-format msgid "Date & Size: " msgstr "தேதி மற்றும் அளவு." -#: directorymergewindow.cpp:748 +#: directorymergewindow.cpp:751 #, fuzzy, kde-format msgid "Comparing file..." msgstr "கோப்பினை ஒப்பிடுகிறது...." -#: directorymergewindow.cpp:801 +#: directorymergewindow.cpp:813 #, kde-format msgid "" "You are currently doing a directory merge. Are you sure, you want to abort " @@ -337,48 +337,48 @@ "நீங்கள் தற்பொழுது ஒன்றாக சேர்க்கப்பட்ட அடைவை பயன்படுத்திக் கொண்டிருக்கிறீர்கள். நீங்கள் நிச்சயமாக " "ஒன்று சேர்ப்பதை நிறுத்திவிட்டு அடைவை மறுவருடலை விரும்புகிறீர்களா?" -#: directorymergewindow.cpp:802 kdiff3.cpp:698 kdiff3.cpp:708 kdiff3.cpp:720 -#: mergeresultwindow.cpp:372 pdiff.cpp:1033 pdiff.cpp:1910 pdiff.cpp:1920 +#: directorymergewindow.cpp:814 kdiff3.cpp:697 kdiff3.cpp:707 kdiff3.cpp:719 +#: mergeresultwindow.cpp:400 pdiff.cpp:1031 pdiff.cpp:1920 pdiff.cpp:1930 #, kde-format msgid "Warning" msgstr "" -#: directorymergewindow.cpp:803 directorymergewindow.cpp:3393 +#: directorymergewindow.cpp:815 directorymergewindow.cpp:3407 #, kde-format msgid "Rescan" msgstr "மறுவருடல்" -#: directorymergewindow.cpp:804 pdiff.cpp:1035 +#: directorymergewindow.cpp:816 pdiff.cpp:1033 #, kde-format msgid "Continue Merging" msgstr "தொடர்ந்து ஒன்றாக சேர்." -#: directorymergewindow.cpp:971 +#: directorymergewindow.cpp:984 #, kde-format msgid "Opening of directories failed:" msgstr "அடைவு திறக்க இயலவில்லை:" -#: directorymergewindow.cpp:975 +#: directorymergewindow.cpp:988 #, kde-format msgid "Dir A \"%1\" does not exist or is not a directory.\n" msgstr "அடைவு எ \"%1\" இல்லை அல்லது அது ஒரு அடைவு இல்லை.\n" -#: directorymergewindow.cpp:980 +#: directorymergewindow.cpp:993 #, kde-format msgid "Dir B \"%1\" does not exist or is not a directory.\n" msgstr "அடைவு B \"%1\" உபயோகத்தில் இல்லை (அ) அது ஒரு அடைவே அல்ல.\n" -#: directorymergewindow.cpp:985 +#: directorymergewindow.cpp:998 #, kde-format msgid "Dir C \"%1\" does not exist or is not a directory.\n" msgstr "அடைவு C \"%1\" உபயோகத்தில் இல்லை (அ) அது ஒரு அடைவே அல்ல.\n" -#: directorymergewindow.cpp:988 +#: directorymergewindow.cpp:1001 #, kde-format msgid "Directory Open Error" msgstr "திறந்த தகவல் தளம் தவறு." -#: directorymergewindow.cpp:996 +#: directorymergewindow.cpp:1009 #, kde-format msgid "" "The destination directory must not be the same as A or B when three " @@ -388,49 +388,49 @@ "மூன்று அடைவுகள் ஒன்று சேரும் பொழுது, சேரும் அடைவு A (அ) B போன்று இருக்கக் கூடாது.\n" "தொடர்வதற்கு முன் மீண்டும் சரிபார்க்கவும்." -#: directorymergewindow.cpp:998 +#: directorymergewindow.cpp:1011 #, kde-format msgid "Parameter Warning" msgstr "அளவுருக்கள் எச்சிரிகை." -#: directorymergewindow.cpp:1003 +#: directorymergewindow.cpp:1016 #, fuzzy, kde-format msgid "Scanning directories..." msgstr "Scanning directories ..." -#: directorymergewindow.cpp:1029 +#: directorymergewindow.cpp:1042 #, kde-format msgid "Reading Directory A" msgstr "தகவல் தளம் 'ஏ'வை படிக்கவும்." -#: directorymergewindow.cpp:1038 +#: directorymergewindow.cpp:1051 #, kde-format msgid "Reading Directory B" msgstr "தகவல் தளம் 'பி'ஐ படிக்கவும்." -#: directorymergewindow.cpp:1048 +#: directorymergewindow.cpp:1061 #, kde-format msgid "Reading Directory C" msgstr "தகவல் தளம் 'சி'ஐ படிக்கவும்." -#: directorymergewindow.cpp:1064 +#: directorymergewindow.cpp:1077 #, kde-format msgid "Some subdirectories were not readable in" msgstr "சில துணை அடைவுகளை படிக்க இயலவில்லை" -#: directorymergewindow.cpp:1069 +#: directorymergewindow.cpp:1082 #, kde-format msgid "Check the permissions of the subdirectories." msgstr "துணை அடைவுகளின் அனுமதிகளை சரிபார்க்கவும்." -#: directorymergewindow.cpp:1106 kdiff3.cpp:666 kdiff3.cpp:753 kdiff3.cpp:777 -#: kdiff3.cpp:1065 kdiff3.cpp:1086 pdiff.cpp:1116 pdiff.cpp:1170 pdiff.cpp:1218 -#: pdiff.cpp:1234 pdiff.cpp:1277 pdiff.cpp:1301 +#: directorymergewindow.cpp:1119 kdiff3.cpp:665 kdiff3.cpp:752 kdiff3.cpp:776 +#: kdiff3.cpp:1072 kdiff3.cpp:1093 pdiff.cpp:1115 pdiff.cpp:1178 pdiff.cpp:1228 +#: pdiff.cpp:1244 pdiff.cpp:1287 pdiff.cpp:1311 #, kde-format msgid "Ready." msgstr "தயார்." -#: directorymergewindow.cpp:1121 +#: directorymergewindow.cpp:1134 #, kde-format msgid "" "Directory Comparison Status\n" @@ -440,23 +440,23 @@ "Number of different files: %3" msgstr "" -#: directorymergewindow.cpp:1128 +#: directorymergewindow.cpp:1141 #, fuzzy, kde-format #| msgid "Number of manual merges:" msgid "Number of manual merges: %1" msgstr "கைமுறை ஒன்று சேர்க்கையின் எண்ணிக்கை:" -#: directorymergewindow.cpp:1394 +#: directorymergewindow.cpp:1407 #, kde-format msgid "This affects all merge operations." msgstr "இது அனைத்து ஒன்றுசேர் இயக்கங்களை பாதிக்கிறது." -#: directorymergewindow.cpp:1395 +#: directorymergewindow.cpp:1408 #, kde-format msgid "Changing All Merge Operations" msgstr "அனைத்து ஒன்றுசேர் இயக்கங்களை மாற்றிக்கொண்டிருக்கிறது" -#: directorymergewindow.cpp:1695 +#: directorymergewindow.cpp:1708 #, fuzzy, kde-format #| msgid "Processing " msgid "" @@ -464,45 +464,45 @@ "%3" msgstr "செயலாக்குதல்" -#: directorymergewindow.cpp:1738 directorymergewindow.cpp:1742 +#: directorymergewindow.cpp:1751 directorymergewindow.cpp:1755 #, kde-format msgid "Some files could not be processed." msgstr "" -#: directorymergewindow.cpp:2222 directorymergewindow.cpp:2247 -#: directorymergewindow.cpp:2271 +#: directorymergewindow.cpp:2235 directorymergewindow.cpp:2260 +#: directorymergewindow.cpp:2285 #, kde-format msgid "This operation is currently not possible." msgstr "இந்த இயக்கம் தற்போது சாத்தியமில்லை." -#: directorymergewindow.cpp:2222 directorymergewindow.cpp:2247 -#: directorymergewindow.cpp:2271 directorymergewindow.cpp:2552 +#: directorymergewindow.cpp:2235 directorymergewindow.cpp:2260 +#: directorymergewindow.cpp:2285 directorymergewindow.cpp:2565 #, kde-format msgid "Operation Not Possible" msgstr "இயக்கம் சாதியமில்லை" -#: directorymergewindow.cpp:2318 +#: directorymergewindow.cpp:2332 #, fuzzy, kde-format #| msgid "An error occurred while copying.\n" msgid "An error occurred while copying." msgstr "நகலெடுக்கும்போது பிழை ஏற்பட்டுள்ளது.\n" -#: directorymergewindow.cpp:2319 directorymergewindow.cpp:2759 +#: directorymergewindow.cpp:2333 directorymergewindow.cpp:2772 #, kde-format msgid "Merge Error" msgstr "ஒன்றுசேர் பிழை" -#: directorymergewindow.cpp:2396 +#: directorymergewindow.cpp:2410 #, kde-format msgid "Unknown merge operation. (This must never happen!)" msgstr "தெரியாத ஒன்றுசேர் இயக்கம்.( இது ஒருபோதும் நிகழக்கூடாது)" -#: directorymergewindow.cpp:2441 +#: directorymergewindow.cpp:2455 #, kde-format msgid "Unknown merge operation." msgstr "தெரியாத ஒன்றுசேர் இயக்கம்." -#: directorymergewindow.cpp:2454 +#: directorymergewindow.cpp:2468 #, kde-format msgid "" "The merge is about to begin.\n" @@ -524,22 +524,22 @@ "உத்திரவாதமும் கிடையாது! தங்களது இன்றியமையாத தகவல்களுக்கு பின்னணி " "அமைக்க! " -#: directorymergewindow.cpp:2459 +#: directorymergewindow.cpp:2473 #, kde-format msgid "Starting Merge" msgstr "ஒன்று சேர்ப்பைத் துவக்குதல்" -#: directorymergewindow.cpp:2460 +#: directorymergewindow.cpp:2474 #, kde-format msgid "Do It" msgstr "இதை செய்க" -#: directorymergewindow.cpp:2461 +#: directorymergewindow.cpp:2475 #, kde-format msgid "Simulate It" msgstr "இதை போன்று நட" -#: directorymergewindow.cpp:2487 +#: directorymergewindow.cpp:2501 #, kde-format msgid "" "The highlighted item has a different type in the different directories. " @@ -548,7 +548,7 @@ "பலவிதமான அடைவுகளில் பலவகையாக தனிப்படுத்தப்பட்ட விவரம் உள்ளது. எதை செய்வதென்பதை " "தேர்ந்தெடுக்க." -#: directorymergewindow.cpp:2491 +#: directorymergewindow.cpp:2505 #, kde-format msgid "" "The modification dates of the file are equal but the files are not. Select " @@ -557,7 +557,7 @@ "கோப்புகளின் திருத்திய தேதிகள் ஒன்றாக உள்ளது, ஆனால் கோப்புகள் இல்லை. எதை செய்வதென்பதை " "தேர்ந்தெடுக்க. " -#: directorymergewindow.cpp:2495 +#: directorymergewindow.cpp:2509 #, fuzzy, kde-format #| msgid "" #| "The highlighted item has a different type in the different directories. " @@ -569,7 +569,7 @@ "பலவிதமான அடைவுகளில் பலவகையாக தனிப்படுத்தப்பட்ட விவரம் உள்ளது. எதை செய்வதென்பதை " "தேர்ந்தெடுக்க." -#: directorymergewindow.cpp:2552 +#: directorymergewindow.cpp:2565 #, kde-format msgid "" "This operation is currently not possible because directory merge is " @@ -578,7 +578,7 @@ "இந்த செயற்பாடு தற்போது சாத்தியமில்லை ஏனென்றால் அடைவு ஒற்றினை தற்போது " "இயங்கிக்கொண்டிருக்கின்றது" -#: directorymergewindow.cpp:2609 +#: directorymergewindow.cpp:2622 #, kde-format msgid "" "There was an error in the last step.\n" @@ -589,32 +589,32 @@ "இந்த பிழையை ஏற்படுத்திய விவரத்துடன் தொடர விரும்புகிறீர்களா அல்லது அதை தவிர்க்க " "விரும்புகிறீர்களா?" -#: directorymergewindow.cpp:2611 +#: directorymergewindow.cpp:2624 #, kde-format msgid "Continue merge after an error" msgstr "பிழைக்குப் பிறகு ஒன்று சேர்த்தலை தொடர்க" -#: directorymergewindow.cpp:2612 +#: directorymergewindow.cpp:2625 #, kde-format msgid "Continue With Last Item" msgstr "கடைசி விவரத்துடன் தொடர்க" -#: directorymergewindow.cpp:2613 +#: directorymergewindow.cpp:2626 #, kde-format msgid "Skip Item" msgstr "விவரத்தை தவிர்க்க" -#: directorymergewindow.cpp:2709 +#: directorymergewindow.cpp:2722 #, kde-format msgid "Merge operation complete." msgstr "ஒன்றுசேர் இயக்கம் முடிந்தது" -#: directorymergewindow.cpp:2709 directorymergewindow.cpp:2712 +#: directorymergewindow.cpp:2722 directorymergewindow.cpp:2725 #, kde-format msgid "Merge Complete" msgstr "ஒன்றுசேர்ப்பு முடிந்தது" -#: directorymergewindow.cpp:2722 +#: directorymergewindow.cpp:2735 #, kde-format msgid "" "Simulated merge complete: Check if you agree with the proposed operations." @@ -622,227 +622,227 @@ "போலியான ஒன்றுசேர்ப்பு முடிந்தது: முன்மொழிந்த இயக்கங்களுடன் நீங்கள் ஒத்துப்போகிறீர்களா என்பதை " "சரிபார்க்கவும்." -#: directorymergewindow.cpp:2758 +#: directorymergewindow.cpp:2771 #, fuzzy, kde-format #| msgid "An error occurred. Press OK to see detailed information.\n" msgid "An error occurred. Press OK to see detailed information." msgstr "பிழை ஏற்பட்டுள்ளது. விரிவான விவரங்களுக்கு சரி என்பதை அழுத்துக.\n" -#: directorymergewindow.cpp:2791 +#: directorymergewindow.cpp:2804 #, kde-format msgid "Error: While deleting %1: Creating backup failed." msgstr "பிழை: %1 நீக்கும்போது: பின்னணி உருவாக்கம் தோல்வியடைந்தது." -#: directorymergewindow.cpp:2798 +#: directorymergewindow.cpp:2811 #, kde-format msgid "delete directory recursively( %1 )" msgstr "அடைவு சூழ்நிலை நீக்கு நீக்கு(%1)" -#: directorymergewindow.cpp:2800 +#: directorymergewindow.cpp:2813 #, kde-format msgid "delete( %1 )" msgstr "நீக்கு( %1 )" -#: directorymergewindow.cpp:2815 +#: directorymergewindow.cpp:2828 #, kde-format msgid "Error: delete dir operation failed while trying to read the directory." msgstr "பிழை: அடைவை படிக்கும்போது நீக்க இயலவில்லை." -#: directorymergewindow.cpp:2834 +#: directorymergewindow.cpp:2847 #, kde-format msgid "Error: rmdir( %1 ) operation failed." msgstr " rmdir( %1 } பிழை: இயக்க இயலவில்லை" -#: directorymergewindow.cpp:2844 +#: directorymergewindow.cpp:2857 #, kde-format msgid "Error: delete operation failed." msgstr "பிழை: நீக்கும் இயக்கம் தோல்வியடைந்தது." -#: directorymergewindow.cpp:2870 +#: directorymergewindow.cpp:2884 #, kde-format msgid "manual merge( %1, %2, %3 -> %4)" msgstr "கைமுறை ஒன்றினை(%1, %2,%3 -> %4)" -#: directorymergewindow.cpp:2873 +#: directorymergewindow.cpp:2887 #, kde-format msgid "" " Note: After a manual merge the user should continue by pressing F7." msgstr "குறிப்பு: கையேடு ஒன்றினையின் பிறகு உபயோகிப்பவர் F7 வழியாக தொடர வேண்டும்." -#: directorymergewindow.cpp:2900 +#: directorymergewindow.cpp:2914 #, kde-format msgid "Error: copy( %1 -> %2 ) failed.Deleting existing destination failed." msgstr "பிழை:நகல்( %1 -> %2 ) தோல்வி அடைந்தது. இருக்கும் சேரிடம் நீக்கம் தோல்வி அடைந்தது" -#: directorymergewindow.cpp:2909 +#: directorymergewindow.cpp:2923 #, kde-format msgid "copyLink( %1 -> %2 )" msgstr "நகல் இணை( %1 -> %2 )" -#: directorymergewindow.cpp:2918 +#: directorymergewindow.cpp:2932 #, kde-format msgid "Error: copyLink failed: Remote links are not yet supported." msgstr "பிழை:தொடர்புப் படியெடு தோல்வியடைந்தது: தூரத் தொடர்பு இன்னும் ஆதரிக்கப்படவில்லை" -#: directorymergewindow.cpp:2928 +#: directorymergewindow.cpp:2942 #, kde-format msgid "Error: copyLink failed." msgstr "பிழை: நகல் இணை தோல்வியடைந்தது." -#: directorymergewindow.cpp:2953 +#: directorymergewindow.cpp:2967 #, kde-format msgid "copy( %1 -> %2 )" msgstr "நகல்( %1 -> %2 )" -#: directorymergewindow.cpp:2979 +#: directorymergewindow.cpp:2993 #, kde-format msgid "Error during rename( %1 -> %2 ): Cannot delete existing destination." msgstr "மறுபெயரிடும் போது பிழை( %1 -> %2 ): தற்போதுள்ள சேருமிடத்தை நீக்க இயலாது." -#: directorymergewindow.cpp:2986 +#: directorymergewindow.cpp:3000 #, kde-format msgid "rename( %1 -> %2 )" msgstr "மறுபெயர்( %1 -> %2 )" -#: directorymergewindow.cpp:2995 +#: directorymergewindow.cpp:3009 #, kde-format msgid "Error: Rename failed." msgstr "பிழை: மறுபெயர் தோல்வி அடைந்தது." -#: directorymergewindow.cpp:3013 +#: directorymergewindow.cpp:3027 #, kde-format msgid "Error during makeDir of %1. Cannot delete existing file." msgstr "%1அடைவை உருவாக்கும் போது பிழை: தற்போதைய கோப்பினை நீக்க இயலாது." -#: directorymergewindow.cpp:3030 +#: directorymergewindow.cpp:3044 #, kde-format msgid "makeDir( %1 )" msgstr "( %1 )அடைவை உருவாக்கு" -#: directorymergewindow.cpp:3040 +#: directorymergewindow.cpp:3054 #, kde-format msgid "Error while creating directory." msgstr "அடைவை உருவாக்கும் போது பிழை" -#: directorymergewindow.cpp:3076 directorymergewindow.cpp:3195 +#: directorymergewindow.cpp:3090 directorymergewindow.cpp:3209 #, kde-format msgid "Dest" msgstr "சேருமிடம்" -#: directorymergewindow.cpp:3084 directorymergewindow.cpp:3113 +#: directorymergewindow.cpp:3098 directorymergewindow.cpp:3127 #, kde-format msgid "Dir" msgstr "அடைவு" -#: directorymergewindow.cpp:3084 +#: directorymergewindow.cpp:3098 #, kde-format msgid "Type" msgstr "விதம்" -#: directorymergewindow.cpp:3084 +#: directorymergewindow.cpp:3098 #, kde-format msgid "Size" msgstr "அளவு" -#: directorymergewindow.cpp:3085 +#: directorymergewindow.cpp:3099 #, kde-format msgid "Attr" msgstr "தன்மை" -#: directorymergewindow.cpp:3085 +#: directorymergewindow.cpp:3099 #, kde-format msgid "Last Modification" msgstr "கடைசி திருத்தம்" -#: directorymergewindow.cpp:3085 +#: directorymergewindow.cpp:3099 #, kde-format msgid "Link-Destination" msgstr "இணை-சேருமிடம்" -#: directorymergewindow.cpp:3113 +#: directorymergewindow.cpp:3127 #, fuzzy, kde-format #| msgid "File..." msgid "File" msgstr "கோப்பு" -#: directorymergewindow.cpp:3113 +#: directorymergewindow.cpp:3127 #, fuzzy, kde-format #| msgid "Link: " msgid "-Link" msgstr "இணைப்பு." -#: directorymergewindow.cpp:3119 +#: directorymergewindow.cpp:3133 #, kde-format msgid "not available" msgstr "கிடைக்கவில்லை" -#: directorymergewindow.cpp:3137 +#: directorymergewindow.cpp:3151 #, kde-format msgid "A (Dest): " msgstr "A (சேருமிடம்): " -#: directorymergewindow.cpp:3141 +#: directorymergewindow.cpp:3155 #, kde-format msgid "A: " msgstr "" -#: directorymergewindow.cpp:3141 +#: directorymergewindow.cpp:3155 #, kde-format msgid "A (Base): " msgstr "A (அடித்தளம்):" -#: directorymergewindow.cpp:3147 +#: directorymergewindow.cpp:3161 #, kde-format msgid "B (Dest): " msgstr "B (சேருமிடம்): " -#: directorymergewindow.cpp:3151 +#: directorymergewindow.cpp:3165 #, kde-format msgid "B: " msgstr "" -#: directorymergewindow.cpp:3156 +#: directorymergewindow.cpp:3170 #, kde-format msgid "C (Dest): " msgstr "C (சேருமிடம்):" -#: directorymergewindow.cpp:3160 +#: directorymergewindow.cpp:3174 #, kde-format msgid "C: " msgstr "" -#: directorymergewindow.cpp:3163 +#: directorymergewindow.cpp:3177 #, kde-format msgid "Dest: " msgstr "சேருமிடம்: " #. i18n("Saving Directory Merge State ...")); -#: directorymergewindow.cpp:3238 +#: directorymergewindow.cpp:3252 #, fuzzy, kde-format msgid "Save Directory Merge State As..." msgstr "அடைவுச் சேர்க்கை" -#: directorymergewindow.cpp:3387 +#: directorymergewindow.cpp:3401 #, kde-format msgid "Start/Continue Directory Merge" msgstr "அடைவை சேர்க்கத் துவங்கு" -#: directorymergewindow.cpp:3388 +#: directorymergewindow.cpp:3402 #, kde-format msgid "Run Operation for Current Item" msgstr "நிகழ் உருப்படிக்காக செயற்பாடு இயங்கு" -#: directorymergewindow.cpp:3389 +#: directorymergewindow.cpp:3403 #, kde-format msgid "Compare Selected File" msgstr "தேர்ந்தெடுத்த கோப்பினை ஒப்பிடு" -#: directorymergewindow.cpp:3390 +#: directorymergewindow.cpp:3404 #, kde-format msgid "Merge Current File" msgstr "தற்போதைய கோப்பினை ஒன்றுசேர்" -#: directorymergewindow.cpp:3390 +#: directorymergewindow.cpp:3404 #, fuzzy, kde-format #| msgid "Merge" msgid "" @@ -850,147 +850,152 @@ "File" msgstr "ஒன்றாகச் சேர்." -#: directorymergewindow.cpp:3391 +#: directorymergewindow.cpp:3405 #, kde-format msgid "Fold All Subdirs" msgstr "அனைத்து உபஅடைவுகளையும் மடி" -#: directorymergewindow.cpp:3392 +#: directorymergewindow.cpp:3406 #, kde-format msgid "Unfold All Subdirs" msgstr "அனைத்து உபஅடைவுகளையும் பிரி" #. i18n("Save Directory Merge State ..."), 0, this, &DirectoryMergeWindow::slotSaveMergeState, ac, "dir_save_merge_state"); #. i18n("Load Directory Merge State ..."), 0, this, &DirectoryMergeWindow::slotLoadMergeState, ac, "dir_load_merge_state"); -#: directorymergewindow.cpp:3396 +#: directorymergewindow.cpp:3410 #, kde-format msgid "Choose A for All Items" msgstr "எல்லா விவரங்களுக்கும் Aவைத் தேர்ந்தெடு" -#: directorymergewindow.cpp:3397 +#: directorymergewindow.cpp:3411 #, kde-format msgid "Choose B for All Items" msgstr "எல்லா விவரங்களுக்கும் Bவைத் தேர்ந்தெடு" -#: directorymergewindow.cpp:3398 +#: directorymergewindow.cpp:3412 #, kde-format msgid "Choose C for All Items" msgstr "எல்லா விவரங்களுக்கும் Cவைத் தேர்ந்தெடு" -#: directorymergewindow.cpp:3399 +#: directorymergewindow.cpp:3413 #, kde-format msgid "Auto-Choose Operation for All Items" msgstr "எல்லா விவரங்களுக்கும் தானியக்கத்தேர்வு" -#: directorymergewindow.cpp:3400 +#: directorymergewindow.cpp:3414 #, kde-format msgid "No Operation for All Items" msgstr "எல்லா விவரங்களுக்கும் இயக்கமில்லை" #. i18n("Synchronize Directories"), 0, this, &DirectoryMergeWindow::slotSynchronizeDirectories, ac, "dir_synchronize_directories"); #. d->m_pDirChooseNewerFiles = GuiUtils::createAction< KToggleAction >(i18n("Copy Newer Files Instead of Merging"), 0, this, &DirectoryMergeWindow::slotChooseNewerFiles, ac, "dir_choose_newer_files"); -#: directorymergewindow.cpp:3405 +#: directorymergewindow.cpp:3419 #, kde-format msgid "Show Identical Files" msgstr "" -#: directorymergewindow.cpp:3405 +#: directorymergewindow.cpp:3419 #, kde-format msgid "" "Identical\n" "Files" msgstr "" -#: directorymergewindow.cpp:3406 +#: directorymergewindow.cpp:3420 #, fuzzy, kde-format msgid "Show Different Files" msgstr "வேறு விதமான கோப்புகளின் எண்ணிக்கை:" -#: directorymergewindow.cpp:3407 +#: directorymergewindow.cpp:3421 #, kde-format msgid "Show Files only in A" msgstr "" -#: directorymergewindow.cpp:3407 +#: directorymergewindow.cpp:3421 #, kde-format msgid "" "Files\n" "only in A" msgstr "" -#: directorymergewindow.cpp:3408 +#: directorymergewindow.cpp:3422 #, kde-format msgid "Show Files only in B" msgstr "" -#: directorymergewindow.cpp:3408 +#: directorymergewindow.cpp:3422 #, kde-format msgid "" "Files\n" "only in B" msgstr "" -#: directorymergewindow.cpp:3409 +#: directorymergewindow.cpp:3423 #, kde-format msgid "Show Files only in C" msgstr "" -#: directorymergewindow.cpp:3409 +#: directorymergewindow.cpp:3423 #, kde-format msgid "" "Files\n" "only in C" msgstr "" -#: directorymergewindow.cpp:3413 +#: directorymergewindow.cpp:3427 #, fuzzy, kde-format msgid "Compare Explicitly Selected Files" msgstr "தேர்ந்தெடுத்த கோப்பினை ஒப்பிடு" -#: directorymergewindow.cpp:3414 +#: directorymergewindow.cpp:3428 #, fuzzy, kde-format msgid "Merge Explicitly Selected Files" msgstr "தேர்ந்தெடுத்த கோப்பினை ஒப்பிடு" -#: directorymergewindow.cpp:3416 directorymergewindow.cpp:3423 +#: directorymergewindow.cpp:3430 directorymergewindow.cpp:3437 #, kde-format msgid "Do Nothing" msgstr "ஒன்றும் செய்யாதே" -#: directorymergewindow.cpp:3428 +#: directorymergewindow.cpp:3442 #, fuzzy, kde-format msgid "Delete A && B" msgstr "A & Bஐ நீக்கு " -#: directorymergewindow.cpp:3431 +#: directorymergewindow.cpp:3445 #, fuzzy, kde-format msgid "Merge to A && B" msgstr "A & B ஐ ஒன்றாகச் சேர்." -#: fileaccess.cpp:462 SourceData.cpp:493 +#: fileaccess.cpp:301 +#, kde-format +msgid "Unable to determine full url. No parent specified." +msgstr "" + +#: fileaccess.cpp:482 SourceData.cpp:506 #, fuzzy, kde-format #| msgid "Reading file: %1" msgid "Failed to read file: %1" msgstr "கோப்புகளை படித்தல்: %1" -#: fileaccess.cpp:587 +#: fileaccess.cpp:624 #, kde-format msgid "Creating temp copy of %1 failed." msgstr "வார்ப்புரு படியெடு உருவாக்குவது %1 இயலவில்லை." -#: fileaccess.cpp:595 fileaccess.cpp:600 +#: fileaccess.cpp:632 fileaccess.cpp:637 #, fuzzy, kde-format #| msgid "Opening %1 failed." msgid "Opening %1 failed. %2" msgstr "திறப்பதற்கு %1 இயலவில்லை." -#: fileaccess.cpp:619 fileaccess.cpp:627 +#: fileaccess.cpp:656 fileaccess.cpp:664 #, fuzzy, kde-format #| msgid "Error reading from %1" msgid "Error reading from %1. %2" msgstr "%1னிலிருந்து படிக்கும் பிழை" -#: fileaccess.cpp:751 +#: fileaccess.cpp:788 #, fuzzy, kde-format #| msgid "" #| "While trying to make a backup, deleting an older backup failed. \n" @@ -1002,7 +1007,7 @@ "ஒரு பின்கோப்பினை உருவாக்க முயற்சிக்கும்போது, பழைய பின்கோப்பினை நீக்க முடியவில்லை.\n" "கோப்புப் பெயர்கள்:" -#: fileaccess.cpp:758 +#: fileaccess.cpp:795 #, fuzzy, kde-format #| msgid "" #| "While trying to make a backup, renaming failed. \n" @@ -1014,180 +1019,180 @@ "ஒரு பின்கோப்பினை உருவாக்க முயற்சிக்கும் போது, பெயர் மாற்றம் செய்யப்படவில்லை.\n" "கோப்புப் பெயர்கள்:" -#: fileaccess.cpp:828 +#: fileaccess.cpp:865 #, kde-format msgid "Getting file status: %1" msgstr "கோப்பு நிலைமை வாங்கு: %1" -#: fileaccess.cpp:869 +#: fileaccess.cpp:906 #, kde-format msgid "Reading file: %1" msgstr "கோப்புகளை படித்தல்: %1" -#: fileaccess.cpp:907 +#: fileaccess.cpp:944 #, kde-format msgid "Writing file: %1" msgstr "எழுதும் கோப்பு: %1" -#: fileaccess.cpp:940 +#: fileaccess.cpp:977 #, kde-format msgid "Out of memory" msgstr "நினைவில் இல்லை" -#: fileaccess.cpp:976 +#: fileaccess.cpp:1013 #, kde-format msgid "Making directory: %1" msgstr "அடைவு அமை: %1" -#: fileaccess.cpp:997 +#: fileaccess.cpp:1034 #, kde-format msgid "Removing directory: %1" msgstr "அடைவு அகற்று: %1" -#: fileaccess.cpp:1012 +#: fileaccess.cpp:1049 #, kde-format msgid "Removing file: %1" msgstr "அழித்தல் கோப்பு:%1" -#: fileaccess.cpp:1028 +#: fileaccess.cpp:1065 #, kde-format msgid "Creating symbolic link: %1 -> %2" msgstr "குறியீட்டு இணைப்பு உருவாக்குதல்: %1 -> %2" -#: fileaccess.cpp:1052 +#: fileaccess.cpp:1089 #, kde-format msgid "Renaming file: %1 -> %2" msgstr "மறுபெயர்:( %1 -> %2 )" -#: fileaccess.cpp:1086 +#: fileaccess.cpp:1123 #, kde-format msgid "Copying file: %1 -> %2" msgstr "கோப்பு நகலெடுத்தல்: %1 -> %2 " -#: fileaccess.cpp:1108 +#: fileaccess.cpp:1145 #, fuzzy, kde-format #| msgid "Reading directory: " msgid "Reading directory: %1" msgstr "அடைவை படித்தல்:" -#: fileaccess.cpp:1162 +#: fileaccess.cpp:1202 #, kde-format msgid "Listing directory: %1" msgstr "அடைவை பட்டியலிடல்: %1" -#: kdiff3.cpp:181 +#: kdiff3.cpp:182 #, fuzzy, kde-format msgid "Current Configuration:" msgstr "நடப்பு உருப்படி இசைவு செயற்பாடு" -#: kdiff3.cpp:186 +#: kdiff3.cpp:187 #, fuzzy, kde-format msgid "Config Option Error:" msgstr "கோப்பு திறப்பில் பிழை" -#: kdiff3.cpp:240 +#: kdiff3.cpp:246 #, kde-format msgid "Option --auto used, but no output file specified." msgstr "தேர்வு தானே உபயோகிக்கப்பட்டுள்ளது ஆனால் வெளியீட்டுக் கோப்பு குறிப்பிடப்படவில்லை" -#: kdiff3.cpp:416 +#: kdiff3.cpp:405 #, kde-format msgid "Option --auto ignored for directory comparison." msgstr "அடைவு ஒப்பீட்டுக்காக தேர்வு தானே மறுக்கப்பட்டுள்ளது" -#: kdiff3.cpp:460 +#: kdiff3.cpp:449 #, kde-format msgid "Saving failed." msgstr "சேகரிப்பு தோல்வியடைந்தது." -#: kdiff3.cpp:496 pdiff.cpp:1098 +#: kdiff3.cpp:494 pdiff.cpp:1096 #, kde-format msgid "Opening of these files failed:" msgstr "இந்த கோப்புகளின் திறப்பு தோல்வியடைந்தது:" -#: kdiff3.cpp:505 +#: kdiff3.cpp:503 pdiff.cpp:1105 #, kde-format -msgid "File Open Error" -msgstr "கோப்பு திறப்பில் பிழை" +msgid "File open error" +msgstr "கோப்பு திறப்பு பிழை" -#: kdiff3.cpp:533 +#: kdiff3.cpp:532 #, kde-format msgid "Opens documents for comparison..." msgstr "ஒப்பிடுதலுக்கு ஆவணங்களைத் திறக்க..." -#: kdiff3.cpp:535 +#: kdiff3.cpp:534 #, fuzzy, kde-format #| msgid "Ready." msgid "Reload" msgstr "தயார்." -#: kdiff3.cpp:538 +#: kdiff3.cpp:537 #, kde-format msgid "Saves the merge result. All conflicts must be solved!" msgstr "ஒன்றுசேர் முடிவை சேகரி. அனைத்து குழப்பங்களும் தீர வேண்டும்." -#: kdiff3.cpp:540 +#: kdiff3.cpp:539 #, kde-format msgid "Saves the current document as..." msgstr "தற்போதைய ஆவணத்தை ....வாக சேமி " -#: kdiff3.cpp:543 +#: kdiff3.cpp:542 #, kde-format msgid "Print the differences" msgstr "" -#: kdiff3.cpp:546 +#: kdiff3.cpp:545 #, kde-format msgid "Quits the application" msgstr "பயன்பாட்டை முறிக்க" -#: kdiff3.cpp:549 +#: kdiff3.cpp:548 #, kde-format msgid "Cuts the selected section and puts it to the clipboard" msgstr "தேர்வு செய்த பகுதியை எடுத்து கிளிப்போர்டில் செலுத்துகிறது" -#: kdiff3.cpp:552 +#: kdiff3.cpp:551 #, kde-format msgid "Copies the selected section to the clipboard" msgstr "தேர்வு செய்த பகுதியை கிளிப் போர்டை படி செய்கிறது." -#: kdiff3.cpp:554 +#: kdiff3.cpp:553 #, fuzzy, kde-format #| msgid "Pastes the clipboard contents to actual position" msgid "Pastes the clipboard contents to current position" msgstr "கிளிப்போர்டின் உள்ளடக்கங்களை உரிய இடத்தில் சேர்க்கிறது" -#: kdiff3.cpp:557 +#: kdiff3.cpp:556 #, kde-format msgid "Select everything in current window" msgstr "" -#: kdiff3.cpp:560 +#: kdiff3.cpp:559 #, kde-format msgid "Search for a string" msgstr "தொடர்ச்சிகளை தேடு" -#: kdiff3.cpp:562 +#: kdiff3.cpp:561 #, kde-format msgid "Search again for the string" msgstr "சரத்தை மீண்டும் தேடு" -#: kdiff3.cpp:567 +#: kdiff3.cpp:566 #, kde-format msgid "Enables/disables the statusbar" msgstr "நிலைப்பட்டியை செயல்படுத்து/நீக்கு " -#: kdiff3.cpp:571 +#: kdiff3.cpp:570 #, kde-format msgid "Configure KDiff3..." msgstr "KDiff3யை அமை" -#: kdiff3.cpp:590 +#: kdiff3.cpp:589 #, kde-format msgid "Go to Current Delta" msgstr "தற்போதைய டெல்டாவிற்குச் செல்க" -#: kdiff3.cpp:590 +#: kdiff3.cpp:589 #, fuzzy, kde-format #| msgid "Go to Current Delta" msgid "" @@ -1195,12 +1200,12 @@ "Delta" msgstr "தற்போதைய டெல்டாவிற்குச் செல்க" -#: kdiff3.cpp:592 +#: kdiff3.cpp:591 #, kde-format msgid "Go to First Delta" msgstr "முதல் டெல்டாவிற்குச் செல்க" -#: kdiff3.cpp:592 +#: kdiff3.cpp:591 #, fuzzy, kde-format #| msgid "Go to First Delta" msgid "" @@ -1208,12 +1213,12 @@ "Delta" msgstr "முதல் டெல்டாவிற்குச் செல்க" -#: kdiff3.cpp:594 +#: kdiff3.cpp:593 #, kde-format msgid "Go to Last Delta" msgstr "கடைசி டெல்டாவிற்குச் செல்க" -#: kdiff3.cpp:594 +#: kdiff3.cpp:593 #, fuzzy, kde-format #| msgid "Go to Last Delta" msgid "" @@ -1221,24 +1226,24 @@ "Delta" msgstr "கடைசி டெல்டாவிற்குச் செல்க" -#: kdiff3.cpp:596 +#: kdiff3.cpp:595 #, kde-format msgid "(Skips white space differences when \"Show White Space\" is disabled.)" msgstr "" -#: kdiff3.cpp:597 +#: kdiff3.cpp:596 #, kde-format msgid "" "(Does not skip white space differences even when \"Show White Space\" is " "disabled.)" msgstr "" -#: kdiff3.cpp:598 +#: kdiff3.cpp:597 #, kde-format msgid "Go to Previous Delta" msgstr "முந்தைய டெல்டாவிற்குச் செல்க" -#: kdiff3.cpp:598 +#: kdiff3.cpp:597 #, fuzzy, kde-format #| msgid "Go to Previous Delta" msgid "" @@ -1246,12 +1251,12 @@ "Delta" msgstr "முந்தைய டெல்டாவிற்குச் செல்க" -#: kdiff3.cpp:600 +#: kdiff3.cpp:599 #, kde-format msgid "Go to Next Delta" msgstr "அடுத்த டெல்டாவிற்குச் செல்க" -#: kdiff3.cpp:600 +#: kdiff3.cpp:599 #, fuzzy, kde-format #| msgid "Go to Next Delta" msgid "" @@ -1259,12 +1264,12 @@ "Delta" msgstr "அடுத்த டெல்டாவிற்குச் செல்க" -#: kdiff3.cpp:602 +#: kdiff3.cpp:601 #, kde-format msgid "Go to Previous Conflict" msgstr "முந்தைய குழப்பத்திற்குச் செல்க" -#: kdiff3.cpp:602 +#: kdiff3.cpp:601 #, fuzzy, kde-format #| msgid "Conflicts" msgid "" @@ -1272,12 +1277,12 @@ "Conflict" msgstr "குழப்பங்கள்" -#: kdiff3.cpp:604 +#: kdiff3.cpp:603 #, kde-format msgid "Go to Next Conflict" msgstr "அடுத்த குழப்பத்திற்குச் செல்க" -#: kdiff3.cpp:604 +#: kdiff3.cpp:603 #, fuzzy, kde-format #| msgid "Go to Next Conflict" msgid "" @@ -1285,12 +1290,12 @@ "Conflict" msgstr "அடுத்த குழப்பத்திற்குச் செல்க" -#: kdiff3.cpp:606 +#: kdiff3.cpp:605 #, kde-format msgid "Go to Previous Unsolved Conflict" msgstr "முந்தைய தீர்க்காத குழப்பத்திற்குச் செல்க" -#: kdiff3.cpp:606 +#: kdiff3.cpp:605 #, fuzzy, kde-format #| msgid "Unsolved" msgid "" @@ -1298,12 +1303,12 @@ "Unsolved" msgstr "Unsolved" -#: kdiff3.cpp:608 +#: kdiff3.cpp:607 #, kde-format msgid "Go to Next Unsolved Conflict" msgstr "அடுத்த தீர்க்காத குழப்பத்திற்குச் செல்க" -#: kdiff3.cpp:608 +#: kdiff3.cpp:607 #, fuzzy, kde-format #| msgid "Unsolved" msgid "" @@ -1311,85 +1316,85 @@ "Unsolved" msgstr "Unsolved" -#: kdiff3.cpp:610 +#: kdiff3.cpp:609 #, kde-format msgid "Select Line(s) From A" msgstr "Aவிலிருந்து வரி(களை) தேர்ந்தெடு" -#: kdiff3.cpp:610 +#: kdiff3.cpp:609 #, kde-format msgid "" "Choose\n" "A" msgstr "" -#: kdiff3.cpp:611 +#: kdiff3.cpp:610 #, kde-format msgid "Select Line(s) From B" msgstr "Bவிலிருந்து வரி(களை) தேர்ந்தெடு" -#: kdiff3.cpp:611 +#: kdiff3.cpp:610 #, kde-format msgid "" "Choose\n" "B" msgstr "" -#: kdiff3.cpp:612 +#: kdiff3.cpp:611 #, kde-format msgid "Select Line(s) From C" msgstr "Cவிலிருந்து வரி(களை) தேர்ந்தெடு" -#: kdiff3.cpp:612 +#: kdiff3.cpp:611 #, kde-format msgid "" "Choose\n" "C" msgstr "" -#: kdiff3.cpp:613 +#: kdiff3.cpp:612 #, kde-format msgid "Automatically Go to Next Unsolved Conflict After Source Selection" msgstr "மூலத்தை தேர்வு செய்த பிறகு தானாகவே அடுத்த தீர்க்கப்படாத குழப்பதற்கு செல் " -#: kdiff3.cpp:613 +#: kdiff3.cpp:612 #, fuzzy, kde-format msgid "" "Auto\n" "Next" msgstr "தானாகவே தேர்ந்தெடுக்கப்பட்ட படிவு" -#: kdiff3.cpp:615 +#: kdiff3.cpp:614 #, fuzzy, kde-format #| msgid "Show Space && Tabulator Characters for Differences" msgid "Show Space && Tabulator Characters" msgstr "இடைவெளியை காட்டி மற்றும் வேறுபாட்டிற்காக பட்டியலிடுவான் எழுத்துக்கள்" -#: kdiff3.cpp:615 +#: kdiff3.cpp:614 #, kde-format msgid "" "White\n" "Characters" msgstr "" -#: kdiff3.cpp:616 +#: kdiff3.cpp:615 #, kde-format msgid "Show White Space" msgstr "வெள்ளை இடத்தை காட்டும்" -#: kdiff3.cpp:616 +#: kdiff3.cpp:615 #, kde-format msgid "" "White\n" "Deltas" msgstr "" -#: kdiff3.cpp:618 +#: kdiff3.cpp:617 #, kde-format msgid "Show Line Numbers" msgstr "வரி எண்களை காட்டு" -#: kdiff3.cpp:618 +#: kdiff3.cpp:617 #, fuzzy, kde-format #| msgid "Show Line Numbers" msgid "" @@ -1397,195 +1402,195 @@ "Numbers" msgstr "வரி எண்களை காட்டு" -#: kdiff3.cpp:620 +#: kdiff3.cpp:619 #, kde-format msgid "Automatically Solve Simple Conflicts" msgstr "தானாகவே எளிய குழப்பங்களை தீர்க்க." -#: kdiff3.cpp:621 +#: kdiff3.cpp:620 #, kde-format msgid "Set Deltas to Conflicts" msgstr " Delta வை குழப்பத்திற்கு அமை" -#: kdiff3.cpp:622 +#: kdiff3.cpp:621 #, kde-format msgid "Run Regular Expression Auto Merge" msgstr "" -#: kdiff3.cpp:623 +#: kdiff3.cpp:622 #, fuzzy, kde-format msgid "Automatically Solve History Conflicts" msgstr "தானாகவே எளிய குழப்பங்களை தீர்க்க." -#: kdiff3.cpp:624 +#: kdiff3.cpp:623 #, kde-format msgid "Split Diff At Selection" msgstr "" -#: kdiff3.cpp:625 +#: kdiff3.cpp:624 #, fuzzy, kde-format msgid "Join Selected Diffs" msgstr "தேர்ந்தெடுத்த கோப்பினை ஒப்பிடு" -#: kdiff3.cpp:627 +#: kdiff3.cpp:626 #, kde-format msgid "Show Window A" msgstr "A சாளரத்தைக் காட்டு" -#: kdiff3.cpp:628 +#: kdiff3.cpp:627 #, kde-format msgid "Show Window B" msgstr "B சாளரத்தைக் காட்டு" -#: kdiff3.cpp:629 +#: kdiff3.cpp:628 #, kde-format msgid "Show Window C" msgstr "C சாளரத்தைக் காட்டு" -#: kdiff3.cpp:631 +#: kdiff3.cpp:630 #, kde-format msgid "Normal Overview" msgstr "Normal Overview" -#: kdiff3.cpp:632 +#: kdiff3.cpp:631 #, kde-format msgid "A vs. B Overview" msgstr "A vs. B Overview" -#: kdiff3.cpp:633 +#: kdiff3.cpp:632 #, kde-format msgid "A vs. C Overview" msgstr "A vs. C Overview" -#: kdiff3.cpp:634 +#: kdiff3.cpp:633 #, kde-format msgid "B vs. C Overview" msgstr "B vs. C Overview" -#: kdiff3.cpp:635 +#: kdiff3.cpp:634 #, kde-format msgid "Word Wrap Diff Windows" msgstr "Word Wrap Diff Windows" -#: kdiff3.cpp:636 +#: kdiff3.cpp:635 #, kde-format msgid "Add Manual Diff Alignment" msgstr "" -#: kdiff3.cpp:637 +#: kdiff3.cpp:636 #, kde-format msgid "Clear All Manual Diff Alignments" msgstr "" -#: kdiff3.cpp:639 +#: kdiff3.cpp:638 #, kde-format msgid "Focus Next Window" msgstr "அடுத்த சாளரத்தை நோக்கு" -#: kdiff3.cpp:640 +#: kdiff3.cpp:639 #, kde-format msgid "Focus Prev Window" msgstr "முந்தைய சாளரத்தை நோக்கு" -#: kdiff3.cpp:641 +#: kdiff3.cpp:640 #, kde-format msgid "Toggle Split Orientation" msgstr "பிரிப்பு திசையை மாற்று" -#: kdiff3.cpp:643 +#: kdiff3.cpp:642 #, kde-format msgid "Dir && Text Split Screen View" msgstr "அடைவு மற்றும் உரையின் பிளவின் திரைப்பார்வை" -#: kdiff3.cpp:645 +#: kdiff3.cpp:644 #, kde-format msgid "Toggle Between Dir && Text View" msgstr "அடைவுக்கும் உரை பார்வைக்கும் இடையே மாற்றுக" -#: kdiff3.cpp:697 pdiff.cpp:1909 +#: kdiff3.cpp:696 pdiff.cpp:1919 #, fuzzy, kde-format #| msgid "The merge result hasn't been saved." msgid "The merge result has not been saved." msgstr "ஒன்று சேர் முடிவு சேகரிக்கப்படவில்லை." -#: kdiff3.cpp:699 +#: kdiff3.cpp:698 #, kde-format msgid "Save && Quit" msgstr "சேகரித்து முடி" -#: kdiff3.cpp:700 +#: kdiff3.cpp:699 #, kde-format msgid "Quit Without Saving" msgstr "சேகரிக்காமல் மூடு" -#: kdiff3.cpp:708 pdiff.cpp:1920 +#: kdiff3.cpp:707 pdiff.cpp:1930 #, kde-format msgid "Saving the merge result failed." msgstr "ஒன்றுசேர் முடிவை சேகரித்தல் தோல்வியடைந்தது." -#: kdiff3.cpp:719 pdiff.cpp:1032 +#: kdiff3.cpp:718 pdiff.cpp:1030 #, kde-format msgid "" "You are currently doing a directory merge. Are you sure, you want to abort?" msgstr "நீங்கள் தற்போது அடைவுகளை சேர்த்துக் கொண்டிருக்கிறீர்கள். நிறுத்த விரும்புகிறீர்களா?" -#: kdiff3.cpp:742 +#: kdiff3.cpp:741 #, kde-format msgid "Saving file..." msgstr "கோப்பு சேகரித்தல்..." -#: kdiff3.cpp:759 +#: kdiff3.cpp:758 #, kde-format msgid "Saving file with a new filename..." msgstr "புதிய கோப்புப்பெயருடன் கோப்பினை சேகரித்தல்..." -#: kdiff3.cpp:761 +#: kdiff3.cpp:760 #, kde-format msgid "Save As..." msgstr "" -#: kdiff3.cpp:820 +#: kdiff3.cpp:819 #, fuzzy, kde-format msgid "Printing not implemented." msgstr "ஒன்றுசேர் இயக்கம் முடிந்தது" -#: kdiff3.cpp:857 +#: kdiff3.cpp:858 #, fuzzy, kde-format msgid "Printing..." msgstr "வெளியேறுதல்..." -#: kdiff3.cpp:943 +#: kdiff3.cpp:948 #, kde-format msgid "Printing page %1 of %2" msgstr "" -#: kdiff3.cpp:1000 +#: kdiff3.cpp:1006 #, fuzzy, kde-format #| msgid "Select Another Font" msgid " (Selection)" msgstr "மற்றொரு எழுத்துருவை தேர்தெடு" -#: kdiff3.cpp:1027 +#: kdiff3.cpp:1034 #, fuzzy, kde-format msgid "Printing completed." msgstr "ஒன்றுசேர் இயக்கம் முடிந்தது" -#: kdiff3.cpp:1031 +#: kdiff3.cpp:1038 #, fuzzy, kde-format msgid "Printing aborted." msgstr "ஒன்றுசேர் இயக்கம் முடிந்தது" -#: kdiff3.cpp:1038 +#: kdiff3.cpp:1045 #, kde-format msgid "Exiting..." msgstr "வெளியேறுதல்..." -#: kdiff3.cpp:1049 +#: kdiff3.cpp:1056 #, kde-format msgid "Toggling toolbar..." msgstr "கருவிப்பட்டி மாற்றப்படுகறது" -#: kdiff3.cpp:1070 +#: kdiff3.cpp:1077 #, kde-format msgid "Toggle the statusbar..." msgstr "நிலைப்பட்டியை மாற்று" @@ -1611,7 +1616,7 @@ msgid "Joachim Eibl" msgstr "" -#: kdiff3_part.cpp:173 kdiff3_part.cpp:254 +#: kdiff3_part.cpp:174 kdiff3_part.cpp:255 #, fuzzy, kde-format #| msgid "Couldn't find files for comparison." msgid "Could not find files for comparison." @@ -1630,7 +1635,7 @@ msgstr "அமை KDiff3" #. i18n: ectx: ToolBar (mainToolBar) -#: kdiff3_part.rc:16 main.cpp:88 +#: kdiff3_part.rc:16 main.cpp:89 #, kde-format msgid "KDiff3" msgstr "KDiff3" @@ -1706,200 +1711,206 @@ msgid "Main Toolbar" msgstr "" -#: main.cpp:68 main.cpp:72 +#: main.cpp:69 main.cpp:73 #, kde-format msgid "Ignored. (User defined.)" msgstr "" -#: main.cpp:92 +#: main.cpp:93 #, kde-format msgid " (64 bit)" msgstr "" -#: main.cpp:94 +#: main.cpp:95 #, kde-format msgid " (32 bit)" msgstr "" -#: main.cpp:95 +#: main.cpp:96 #, kde-format msgid "Tool for Comparison and Merge of Files and Directories" msgstr "" -#: main.cpp:96 +#: main.cpp:97 #, kde-format msgid "(c) 2002-2014 Joachim Eibl, (c) 2017 Michael Reeves KF5/Qt5 port" msgstr "" -#: main.cpp:112 +#: main.cpp:113 #, kde-format msgid "Merge the input." msgstr "உள்ளீட்டை ஒன்று சேர்." -#: main.cpp:113 +#: main.cpp:114 #, kde-format msgid "Explicit base file. For compatibility with certain tools." msgstr "தெளிவான அடித்தளக் கோப்பினை சில கருவிகளுடன் பொருத்துவதற்கு" -#: main.cpp:114 +#: main.cpp:115 #, kde-format msgid "Output file. Implies -m. E.g.: -o newfile.txt" msgstr "வெளியீடு கோப்பு" -#: main.cpp:115 +#: main.cpp:116 #, kde-format msgid "Output file, again. (For compatibility with certain tools.)" msgstr "மறுபடியும் கோப்பினை வெளியீடு(சில கருவிகளுடன் பொருத்துவதற்கு)" -#: main.cpp:116 +#: main.cpp:118 #, kde-format msgid "No GUI if all conflicts are auto-solvable. (Needs -o file)" msgstr "எல்லா குழப்பங்களையும் தானாகவே நீங்குமானால் GUI தேவையில்லை" -#: main.cpp:117 +#: main.cpp:120 +#, fuzzy, kde-format +#| msgid "Ignore case" +msgid "Ignored." +msgstr "Ignore case" + +#: main.cpp:122 #, fuzzy, kde-format #| msgid "Don't solve conflicts automatically. (For compatibility...)" msgid "Do not solve conflicts automatically." msgstr "தாமாகவே தீராத குழப்பங்கள் (For compatibility...)" -#: main.cpp:118 +#: main.cpp:123 #, kde-format msgid "Visible name replacement for input file 1 (base)." msgstr "Visible name replacement for input file 1 (base)." -#: main.cpp:119 +#: main.cpp:124 #, kde-format msgid "Visible name replacement for input file 2." msgstr "Visible name replacement for input file 2." -#: main.cpp:120 +#: main.cpp:125 #, kde-format msgid "Visible name replacement for input file 3." msgstr "Visible name replacement for input file 3." -#: main.cpp:121 +#: main.cpp:126 #, kde-format msgid "Alternative visible name replacement. Supply this once for every input." msgstr "" "Alternative visible name replacement. Supply this once for every input." -#: main.cpp:122 +#: main.cpp:127 #, kde-format msgid "" "Override a config setting. Use once for every setting. E.g.: --cs " "\"AutoAdvance=1\"" msgstr "" -#: main.cpp:123 +#: main.cpp:128 #, kde-format msgid "Show list of config settings and current values." msgstr "" -#: main.cpp:124 +#: main.cpp:129 #, fuzzy, kde-format msgid "Use a different config file." msgstr "வேறு விதமான கோப்புகளின் எண்ணிக்கை:" -#: main.cpp:127 +#: main.cpp:132 #, kde-format msgid "file1 to open (base, if not specified via --base)" msgstr "கோப்பு1 யை திற(அடித்தளம் அல்லது via அடித்தளம்)" -#: main.cpp:128 +#: main.cpp:133 #, kde-format msgid "file2 to open" msgstr "கோப்பு2 திற" -#: main.cpp:129 +#: main.cpp:134 #, kde-format msgid "file3 to open" msgstr "கோப்பு 3ன்றை திற" -#: main.cpp:153 +#: main.cpp:158 #, kde-format msgid "See kdiff3 --help for supported options." msgstr "" -#: mergeresultwindow.cpp:158 +#: mergeresultwindow.cpp:171 #, kde-format msgid "Choose A Everywhere" msgstr "எல்லா இடத்திலும் Aவைத் தேர்ந்தெடு" -#: mergeresultwindow.cpp:159 +#: mergeresultwindow.cpp:172 #, kde-format msgid "Choose B Everywhere" msgstr "எல்லா இடத்திலும் Bவைத் தேர்ந்தெடு" -#: mergeresultwindow.cpp:160 +#: mergeresultwindow.cpp:173 #, kde-format msgid "Choose C Everywhere" msgstr "எல்லா இடத்திலும் Cவைத் தேர்ந்தெடு" -#: mergeresultwindow.cpp:161 +#: mergeresultwindow.cpp:174 #, fuzzy, kde-format msgid "Choose A for All Unsolved Conflicts" msgstr "அனைத்து தீர்வற்ற முரணிற்கு A-வை தேர்ந்தெடுக்கவும்" -#: mergeresultwindow.cpp:162 +#: mergeresultwindow.cpp:175 #, fuzzy, kde-format msgid "Choose B for All Unsolved Conflicts" msgstr "அனைத்து தீர்வற்ற முரணிற்கு B-யை தேர்ந்தெடுக்கவும்" -#: mergeresultwindow.cpp:163 +#: mergeresultwindow.cpp:176 #, fuzzy, kde-format msgid "Choose C for All Unsolved Conflicts" msgstr "அனைத்து தீர்வற்ற முரணிற்கு C-யை தேர்ந்தெடுக்கவும்" -#: mergeresultwindow.cpp:164 +#: mergeresultwindow.cpp:177 #, fuzzy, kde-format msgid "Choose A for All Unsolved Whitespace Conflicts" msgstr "அனைத்து தீர்வற்ற வெள்ளை இடம் முரணிற்கு A-வை தேர்ந்தெடுக்கவும்" -#: mergeresultwindow.cpp:165 +#: mergeresultwindow.cpp:178 #, fuzzy, kde-format msgid "Choose B for All Unsolved Whitespace Conflicts" msgstr "அனைத்து தீர்வற்ற வெள்ளை இடம் முரணிற்கு B-யை தேர்ந்தெடுக்கவும்" -#: mergeresultwindow.cpp:166 +#: mergeresultwindow.cpp:179 #, fuzzy, kde-format msgid "Choose C for All Unsolved Whitespace Conflicts" msgstr "அனைத்து தீர்வற்ற வெள்ளை இடம் முரணிற்கு C-யை தேர்ந்தெடுக்கவும்" -#: mergeresultwindow.cpp:176 +#: mergeresultwindow.cpp:204 #, fuzzy, kde-format msgid "Number of remaining unsolved conflicts: %1 (of which %2 are whitespace)" msgstr "இன்னும் தீர்க்கப்படாத குழப்பங்களின் எண்ணிகை: %1" -#: mergeresultwindow.cpp:370 +#: mergeresultwindow.cpp:398 #, kde-format msgid "" "The output has been modified.\n" "If you continue your changes will be lost." msgstr "வெளீயிடு மாற்றப்பட்டுள்ளது. நீங்கள் தொடர்ந்தால் மாற்றங்களை இழந்து விடுவீர்கள்" -#: mergeresultwindow.cpp:936 pdiff.cpp:827 +#: mergeresultwindow.cpp:964 pdiff.cpp:817 #, kde-format msgid "All input files are binary equal." msgstr "அனைத்து உள்ளிடு கோப்புகளும் இருநிலை சமம்" -#: mergeresultwindow.cpp:938 +#: mergeresultwindow.cpp:966 #, kde-format msgid "All input files contain the same text." msgstr "அனைத்து உள்ளீட்டுக் கோப்புகளும் ஒரே உரையைக் கொண்டன." -#: mergeresultwindow.cpp:942 mergeresultwindow.cpp:946 -#: mergeresultwindow.cpp:950 pdiff.cpp:833 pdiff.cpp:837 pdiff.cpp:841 +#: mergeresultwindow.cpp:970 mergeresultwindow.cpp:974 +#: mergeresultwindow.cpp:978 pdiff.cpp:823 pdiff.cpp:827 pdiff.cpp:831 #, fuzzy, kde-format msgid "Files %1 and %2 are binary equal.\n" msgstr "கோப்புகள் B மற்றும் C இருநிலை சமம் உடையன.\n" -#: mergeresultwindow.cpp:944 mergeresultwindow.cpp:948 -#: mergeresultwindow.cpp:952 +#: mergeresultwindow.cpp:972 mergeresultwindow.cpp:976 +#: mergeresultwindow.cpp:980 #, fuzzy, kde-format msgid "Files %1 and %2 have equal text.\n" msgstr "கோப்புகள் A மற்றும் B சம உரை உடையன.\n" -#: mergeresultwindow.cpp:958 +#: mergeresultwindow.cpp:986 #, kde-format msgid "" "Total number of conflicts: %1\n" @@ -1908,27 +1919,27 @@ "%4" msgstr "" -#: mergeresultwindow.cpp:964 +#: mergeresultwindow.cpp:992 #, kde-format msgid "Conflicts" msgstr "குழப்பங்கள்" -#: mergeresultwindow.cpp:1873 +#: mergeresultwindow.cpp:1901 #, kde-format msgid "" msgstr "" -#: mergeresultwindow.cpp:1881 +#: mergeresultwindow.cpp:1909 #, fuzzy, kde-format msgid "" msgstr "<ஒன்றுசேர் குழப்பம்>" -#: mergeresultwindow.cpp:1883 mergeresultwindow.cpp:2755 +#: mergeresultwindow.cpp:1911 mergeresultwindow.cpp:2783 #, kde-format msgid "" msgstr "<ஒன்றுசேர் குழப்பம்>" -#: mergeresultwindow.cpp:2967 +#: mergeresultwindow.cpp:2995 #, fuzzy, kde-format #| msgid "" #| "Not all conflicts are solved yet.\n" @@ -1940,12 +1951,12 @@ "அனைத்து குழப்பங்களும் இன்னும் தீரவில்லை.\n" "கோப்பினை சேமிக்கவில்லை \n" -#: mergeresultwindow.cpp:2969 mergeresultwindow.cpp:2978 +#: mergeresultwindow.cpp:2997 mergeresultwindow.cpp:3006 #, kde-format msgid "Conflicts Left" msgstr "குழப்பமான இடது" -#: mergeresultwindow.cpp:2976 +#: mergeresultwindow.cpp:3004 #, kde-format msgid "" "There is a line end style conflict. Please choose the line end style " @@ -1953,7 +1964,7 @@ "File not saved." msgstr "" -#: mergeresultwindow.cpp:2990 +#: mergeresultwindow.cpp:3018 #, kde-format msgid "" "\n" @@ -1961,59 +1972,59 @@ "Creating backup failed. File not saved." msgstr "" -#: mergeresultwindow.cpp:2990 mergeresultwindow.cpp:3038 +#: mergeresultwindow.cpp:3018 mergeresultwindow.cpp:3066 #, kde-format msgid "File Save Error" msgstr "கோப்பின சேமிப்பு பிழை" -#: mergeresultwindow.cpp:3038 +#: mergeresultwindow.cpp:3066 #, kde-format msgid "Error while writing." msgstr "எழுதும் பொழுது பிழை" -#: mergeresultwindow.cpp:3110 +#: mergeresultwindow.cpp:3138 #, fuzzy, kde-format #| msgid "Output" msgid "Output:" msgstr " வெளியீடு" -#: mergeresultwindow.cpp:3123 mergeresultwindow.cpp:3315 +#: mergeresultwindow.cpp:3151 mergeresultwindow.cpp:3343 #, kde-format msgid "[Modified]" msgstr "[திருத்தப்பட்டது]" -#: mergeresultwindow.cpp:3130 +#: mergeresultwindow.cpp:3158 #, kde-format msgid "Encoding for saving:" msgstr "" -#: mergeresultwindow.cpp:3230 +#: mergeresultwindow.cpp:3258 #, fuzzy, kde-format #| msgid "Conflicts" msgid "Conflict" msgstr "குழப்பங்கள்" -#: mergeresultwindow.cpp:3262 +#: mergeresultwindow.cpp:3290 #, kde-format msgid "Codec from A: %1" msgstr "" -#: mergeresultwindow.cpp:3264 +#: mergeresultwindow.cpp:3292 #, kde-format msgid "Codec from B: %1" msgstr "" -#: mergeresultwindow.cpp:3266 +#: mergeresultwindow.cpp:3294 #, kde-format msgid "Codec from C: %1" msgstr "" -#: optiondialog.cpp:119 +#: optiondialog.cpp:121 #, kde-format msgid "Change Font" msgstr "" -#: optiondialog.cpp:135 optiondialog.cpp:145 +#: optiondialog.cpp:137 optiondialog.cpp:147 #, kde-format msgid "" "Font: %1, %2, %3\n" @@ -2021,163 +2032,163 @@ "Example:" msgstr "" -#: optiondialog.cpp:388 +#: optiondialog.cpp:390 #, kde-format msgid "Unicode" msgstr "" -#: optiondialog.cpp:389 +#: optiondialog.cpp:391 #, kde-format msgid "Latin1" msgstr "" -#: optiondialog.cpp:408 +#: optiondialog.cpp:410 #, kde-format msgid "Change this if non-ASCII characters are not displayed correctly." msgstr "இல்லா-ஆஸ்கி-எழுத்துக்கள் சரியாக வெளிகாட்டவில்லை என்றால் இதை மாற்றுக" -#: optiondialog.cpp:491 +#: optiondialog.cpp:495 #, fuzzy, kde-format #| msgid "Configure..." msgid "Configure" msgstr "அமை" -#: optiondialog.cpp:568 +#: optiondialog.cpp:573 #, kde-format msgid "Font" msgstr "" -#: optiondialog.cpp:570 +#: optiondialog.cpp:575 #, kde-format msgid "Editor & Diff Output Font" msgstr "திருத்துபவரும் வித்தியாசமான வெளியீட்டு எழுத்துக்களும்" -#: optiondialog.cpp:589 +#: optiondialog.cpp:594 #, kde-format msgid "Application font" msgstr "" -#: optiondialog.cpp:594 +#: optiondialog.cpp:599 #, fuzzy, kde-format #| msgid "File Save Error" msgid "File view font" msgstr "கோப்பின சேமிப்பு பிழை" -#: optiondialog.cpp:613 +#: optiondialog.cpp:618 #, fuzzy, kde-format #| msgid "Color" msgctxt "Title for color settings page" msgid "Color" msgstr "வர்ணம்" -#: optiondialog.cpp:614 +#: optiondialog.cpp:619 #, fuzzy, kde-format msgid "Colors Settings" msgstr "இதர அமைப்புகளை உள்ளடக்கியது" -#: optiondialog.cpp:631 +#: optiondialog.cpp:644 #, kde-format msgid "Editor and Diff Views:" msgstr "" -#: optiondialog.cpp:639 +#: optiondialog.cpp:652 #, kde-format msgid "Foreground color:" msgstr "முன்னணி நிறம்" -#: optiondialog.cpp:647 +#: optiondialog.cpp:660 #, kde-format msgid "Background color:" msgstr "பின்னணி நிறம்" -#: optiondialog.cpp:657 +#: optiondialog.cpp:670 #, kde-format msgid "Diff background color:" msgstr "வேறுபட்ட பின்னணி நிறம்" -#: optiondialog.cpp:666 +#: optiondialog.cpp:679 #, kde-format msgid "Color A:" msgstr "வர்ணம் A:" -#: optiondialog.cpp:675 +#: optiondialog.cpp:688 #, kde-format msgid "Color B:" msgstr "வர்ணம் B:" -#: optiondialog.cpp:684 +#: optiondialog.cpp:697 #, kde-format msgid "Color C:" msgstr "வர்ணம் C:" -#: optiondialog.cpp:692 +#: optiondialog.cpp:705 #, kde-format msgid "Conflict color:" msgstr "குழப்பமான நிறம்" -#: optiondialog.cpp:701 +#: optiondialog.cpp:714 #, kde-format msgid "Current range background color:" msgstr "பின்னணி நிறத்தின் தற்போதைய வரம்பு " -#: optiondialog.cpp:710 +#: optiondialog.cpp:723 #, kde-format msgid "Current range diff background color:" msgstr "பின்னணி நிறத்தின் வேறுபட்ட தற்போதைய வரம்பு " -#: optiondialog.cpp:718 +#: optiondialog.cpp:731 #, kde-format msgid "Color for manually aligned difference ranges:" msgstr "" -#: optiondialog.cpp:725 +#: optiondialog.cpp:738 #, fuzzy, kde-format msgid "Directory Comparison View:" msgstr "அடைவு ஒப்பிடும் நிலை" -#: optiondialog.cpp:731 +#: optiondialog.cpp:744 #, kde-format msgid "Newest file color:" msgstr "" -#: optiondialog.cpp:736 +#: optiondialog.cpp:749 #, kde-format msgid "" "Changing this color will only be effective when starting the next directory " "comparison." msgstr "" -#: optiondialog.cpp:741 +#: optiondialog.cpp:754 #, kde-format msgid "Oldest file color:" msgstr "" -#: optiondialog.cpp:750 +#: optiondialog.cpp:763 #, kde-format msgid "Middle age file color:" msgstr "" -#: optiondialog.cpp:759 +#: optiondialog.cpp:772 #, kde-format msgid "Color for missing files:" msgstr "" -#: optiondialog.cpp:773 +#: optiondialog.cpp:786 #, kde-format msgid "Editor" msgstr "திருத்தியவர்" -#: optiondialog.cpp:774 +#: optiondialog.cpp:787 #, fuzzy, kde-format msgid "Editor Behavior" msgstr "திருத்துபவரின் செயல்பாடு" -#: optiondialog.cpp:787 +#: optiondialog.cpp:809 #, kde-format msgid "Tab inserts spaces" msgstr "தத்தல் இடைவெளியை சொருகும்" -#: optiondialog.cpp:791 +#: optiondialog.cpp:813 #, fuzzy, kde-format #| msgid "" #| "On: Pressing tab generates the appropriate number of spaces.\n" @@ -2189,27 +2200,27 @@ "On:தத்தலை அழுத்தும் போது தேவையான இடைவெளி உருவாகிறது, \n" "Off:ஒர் தத்தல் எழுத்து சொருகப்படும்" -#: optiondialog.cpp:796 +#: optiondialog.cpp:818 #, kde-format msgid "Tab size:" msgstr "Tab அளவு" -#: optiondialog.cpp:803 +#: optiondialog.cpp:825 #, kde-format msgid "Auto indentation" msgstr "தானியக்க உள்ளடக்கம்" -#: optiondialog.cpp:807 +#: optiondialog.cpp:829 #, kde-format msgid "On: The indentation of the previous line is used for a new line.\n" msgstr "முந்தைய வரியில் பயன்படுத்தப்பட்ட நகர்ப்பு புதிய வரியிலும் பயன்படுத்தப்படுகிறது\n" -#: optiondialog.cpp:810 +#: optiondialog.cpp:832 #, kde-format msgid "Auto copy selection" msgstr "தானாகவே தேர்ந்தெடுக்கப்பட்ட படிவு" -#: optiondialog.cpp:814 +#: optiondialog.cpp:836 #, fuzzy, kde-format #| msgid "" #| "On: Any selection is immediately written to the clipboard.\n" @@ -2221,7 +2232,7 @@ "எந்த ஒரு தேர்வையும் உடனடியாக கிளிப் போர்டுக்கு எழுதவும்.\n" "நீங்கள் வெளிப்படையாக படிவு செய்" -#: optiondialog.cpp:829 +#: optiondialog.cpp:851 #, fuzzy, kde-format msgid "" "Sets the line endings for when an edited file is saved.\n" @@ -2230,12 +2241,12 @@ "கோட்டின் முடிவை அமைத்து தொகுப்புக்கோப்பில் சேமிDOS/விண்டோஸ்: CR+LF;யுனிக்ஸ்:மற்றும் " "CR=0D, LF=0A" -#: optiondialog.cpp:839 +#: optiondialog.cpp:861 #, fuzzy, kde-format msgid "Diff" msgstr "KDiff3" -#: optiondialog.cpp:840 +#: optiondialog.cpp:862 #, fuzzy, kde-format msgid "Diff Settings" msgstr "வேறுபாடு & சேர்த்திடு அமைப்புகள்" @@ -2249,12 +2260,12 @@ #. ); #. ++line; #. -#: optiondialog.cpp:865 +#: optiondialog.cpp:896 #, fuzzy, kde-format msgid "Ignore numbers (treat as white space)" msgstr "C/C++ குறிப்புரைகளை வெள்ளை இடம் போல உபசரி." -#: optiondialog.cpp:869 +#: optiondialog.cpp:900 #, kde-format msgid "" "Ignore number characters during line matching phase. (Similar to Ignore " @@ -2262,55 +2273,55 @@ "Might help to compare files with numeric data." msgstr "வரி பொருத்துதலின் போது எண் எழுத்துக்களை நிராகரி." -#: optiondialog.cpp:873 +#: optiondialog.cpp:904 #, fuzzy, kde-format #| msgid "Treat C/C++ comments like white space." msgid "Ignore C/C++ comments (treat as white space)" msgstr "C/C++ குறிப்புரைகளை வெள்ளை இடம் போல உபசரி." -#: optiondialog.cpp:876 +#: optiondialog.cpp:907 #, kde-format msgid "Treat C/C++ comments like white space." msgstr "C/C++ குறிப்புரைகளை வெள்ளை இடம் போல உபசரி." -#: optiondialog.cpp:879 +#: optiondialog.cpp:910 #, fuzzy, kde-format msgid "Ignore case (treat as white space)" msgstr "C/C++ குறிப்புரைகளை வெள்ளை இடம் போல உபசரி." -#: optiondialog.cpp:883 +#: optiondialog.cpp:914 #, kde-format msgid "Treat case differences like white space changes. ('a'<=>'A')" msgstr "Treat case differences like white space changes. ('a'<=>'A')" -#: optiondialog.cpp:886 +#: optiondialog.cpp:917 #, kde-format msgid "Preprocessor command:" msgstr "முன் செயலாக்க கட்டளை" -#: optiondialog.cpp:891 +#: optiondialog.cpp:922 #, kde-format msgid "User defined pre-processing. (See the docs for details.)" msgstr "உபயோகிப்பாளரால் அறுதியிடப்பட்ட முன்-செயலாக்கி" -#: optiondialog.cpp:894 +#: optiondialog.cpp:925 #, kde-format msgid "Line-matching preprocessor command:" msgstr "வரி-பொருத்து முன்-செயலாக்கி கட்டளை" -#: optiondialog.cpp:899 +#: optiondialog.cpp:930 #, kde-format msgid "" "This pre-processor is only used during line matching.\n" "(See the docs for details.)" msgstr "முன்-செயலாக்கி வரி-பொருத்துதலின் போது பயன்ப்படுத்தப்படுகிறது" -#: optiondialog.cpp:902 +#: optiondialog.cpp:933 #, kde-format msgid "Try hard (slower)" msgstr "கடினமாக முயற்சி(மெதுவாக)" -#: optiondialog.cpp:906 +#: optiondialog.cpp:937 #, kde-format msgid "" "Enables the --minimal option for the external diff.\n" @@ -2319,12 +2330,12 @@ "வெளி வேற்றுமைக்கான --குறைந்த விருப்பத்தை செயல்படுத்துகிறது.\n" "பெரிய கோப்புகளின் பகுப்பாய்வு மெதுவாக இருக்கும்." -#: optiondialog.cpp:910 +#: optiondialog.cpp:941 #, kde-format msgid "Align B and C for 3 input files" msgstr "" -#: optiondialog.cpp:914 +#: optiondialog.cpp:945 #, kde-format msgid "" "Try to align B and C when comparing or merging three input files.\n" @@ -2332,17 +2343,24 @@ "(Default is off.)" msgstr "" -#: optiondialog.cpp:926 +#: optiondialog.cpp:956 +#, fuzzy, kde-format +#| msgid "Merge" +msgctxt "Settings page" +msgid "Merge" +msgstr "ஒன்றாகச் சேர்." + +#: optiondialog.cpp:957 #, fuzzy, kde-format msgid "Merge Settings" msgstr "வேறுபாடு & சேர்த்திடு அமைப்புகள்" -#: optiondialog.cpp:940 +#: optiondialog.cpp:980 #, kde-format msgid "Auto advance delay (ms):" msgstr "தானாக முன்னேறிய தாமதம் (ms):" -#: optiondialog.cpp:946 +#: optiondialog.cpp:986 #, kde-format msgid "" "When in Auto-Advance mode the result of the current selection is shown \n" @@ -2351,28 +2369,28 @@ "தற்போதைய தேர்ந்தெடுப்பின் முடிவை தானாக - முன்னேறும் அமைப்பில்.\n" "குறிப்பிட்ட கால இடைவெளியில், அடுத்த சிக்கலுக்கு முன் தெரிந்துகொள்ளலாம்." -#: optiondialog.cpp:950 +#: optiondialog.cpp:990 #, fuzzy, kde-format #| msgid "Show Window A" msgid "Show info dialogs" msgstr "A சாளரத்தைக் காட்டு" -#: optiondialog.cpp:953 +#: optiondialog.cpp:993 #, kde-format msgid "Show a dialog with information about the number of conflicts." msgstr "" -#: optiondialog.cpp:956 +#: optiondialog.cpp:996 #, kde-format msgid "White space 2-file merge default:" msgstr "வெள்ளை இடம் 2-கோப்பு ஒன்றிணை முன்னிருப்பு:" -#: optiondialog.cpp:961 optiondialog.cpp:974 +#: optiondialog.cpp:1001 optiondialog.cpp:1014 #, fuzzy, kde-format msgid "Manual Choice" msgstr "கையேடு விருப்பம்" -#: optiondialog.cpp:965 optiondialog.cpp:979 +#: optiondialog.cpp:1005 optiondialog.cpp:1019 #, kde-format msgid "" "Allow the merge algorithm to automatically select an input for white-space-" @@ -2381,22 +2399,22 @@ "வெள்ளை-இடம்-மாற்றங்களுக்காக தானாக தேர்ந்தெடுக்கும் உள்ளீட்டிற்க்கு ஒன்றிணை படிமுறையை " "அனுமதிக்கும்." -#: optiondialog.cpp:969 +#: optiondialog.cpp:1009 #, kde-format msgid "White space 3-file merge default:" msgstr "வெள்ளை இடம் 3-கோப்பு ஒன்றிணை முன்னிருப்பு:" -#: optiondialog.cpp:983 +#: optiondialog.cpp:1023 #, kde-format msgid "Automatic Merge Regular Expression" msgstr "" -#: optiondialog.cpp:991 smalldialogs.cpp:449 +#: optiondialog.cpp:1031 smalldialogs.cpp:459 #, kde-format msgid "Auto merge regular expression:" msgstr "" -#: optiondialog.cpp:996 +#: optiondialog.cpp:1036 #, kde-format msgid "" "Regular expression for lines where KDiff3 should automatically choose one " @@ -2405,29 +2423,29 @@ "- if available - C, otherwise B will be chosen." msgstr "" -#: optiondialog.cpp:1002 +#: optiondialog.cpp:1042 #, kde-format msgid "Run regular expression auto merge on merge start" msgstr "" -#: optiondialog.cpp:1005 +#: optiondialog.cpp:1045 #, kde-format msgid "" "Run the merge for auto merge regular expressions\n" "immediately when a merge starts.\n" msgstr "" -#: optiondialog.cpp:1010 +#: optiondialog.cpp:1050 #, kde-format msgid "Version Control History Merging" msgstr "" -#: optiondialog.cpp:1018 smalldialogs.cpp:476 +#: optiondialog.cpp:1058 smalldialogs.cpp:486 #, kde-format msgid "History start regular expression:" msgstr "" -#: optiondialog.cpp:1023 +#: optiondialog.cpp:1063 #, kde-format msgid "" "Regular expression for the start of the version control history entry.\n" @@ -2435,12 +2453,12 @@ "Default value: \".*\\$Log.*\\$.*\"" msgstr "" -#: optiondialog.cpp:1029 smalldialogs.cpp:504 +#: optiondialog.cpp:1069 smalldialogs.cpp:514 #, kde-format msgid "History entry start regular expression:" msgstr "" -#: optiondialog.cpp:1042 +#: optiondialog.cpp:1082 #, kde-format msgid "" "A version control history entry consists of several lines.\n" @@ -2452,22 +2470,22 @@ "See the documentation for details." msgstr "" -#: optiondialog.cpp:1050 +#: optiondialog.cpp:1090 #, kde-format msgid "History merge sorting" msgstr "" -#: optiondialog.cpp:1053 +#: optiondialog.cpp:1093 #, kde-format msgid "Sort version control history by a key." msgstr "" -#: optiondialog.cpp:1063 +#: optiondialog.cpp:1103 #, kde-format msgid "History entry start sort key order:" msgstr "" -#: optiondialog.cpp:1068 +#: optiondialog.cpp:1108 #, kde-format msgid "" "Each pair of parentheses used in the regular expression for the history " @@ -2479,37 +2497,37 @@ "See the documentation for details." msgstr "" -#: optiondialog.cpp:1079 +#: optiondialog.cpp:1119 #, kde-format msgid "Merge version control history on merge start" msgstr "" -#: optiondialog.cpp:1082 +#: optiondialog.cpp:1122 #, kde-format msgid "Run version control history automerge on merge start." msgstr "" -#: optiondialog.cpp:1086 +#: optiondialog.cpp:1126 #, fuzzy, kde-format msgid "Max number of history entries:" msgstr "உப அடைவுகளின் எண்ணிக்கை:" -#: optiondialog.cpp:1090 +#: optiondialog.cpp:1130 #, kde-format msgid "Cut off after specified number. Use -1 for infinite number of entries." msgstr "" -#: optiondialog.cpp:1094 +#: optiondialog.cpp:1134 #, kde-format msgid "Test your regular expressions" msgstr "" -#: optiondialog.cpp:1099 +#: optiondialog.cpp:1139 #, kde-format msgid "Irrelevant merge command:" msgstr "" -#: optiondialog.cpp:1104 +#: optiondialog.cpp:1144 #, kde-format msgid "" "If specified this script is run after automerge\n" @@ -2517,12 +2535,12 @@ "Called with the parameters: filename1 filename2 filename3" msgstr "" -#: optiondialog.cpp:1109 +#: optiondialog.cpp:1149 #, kde-format msgid "Auto save and quit on merge without conflicts" msgstr "" -#: optiondialog.cpp:1113 +#: optiondialog.cpp:1153 #, kde-format msgid "" "If KDiff3 was started for a file-merge from the command line and all\n" @@ -2531,28 +2549,28 @@ "(Similar to command line option \"--auto\".)" msgstr "" -#: optiondialog.cpp:1124 optiondialog.cpp:1125 +#: optiondialog.cpp:1164 optiondialog.cpp:1165 #, fuzzy, kde-format #| msgid "&Directory" msgid "Directory" msgstr "அடைவு" -#: optiondialog.cpp:1137 +#: optiondialog.cpp:1185 #, kde-format msgid "Recursive directories" msgstr "திரும்ப நிகழும் அடைவுகள்" -#: optiondialog.cpp:1140 +#: optiondialog.cpp:1188 #, kde-format msgid "Whether to analyze subdirectories or not." msgstr "உபஅடைவுகளை பரிசோதிக்க வேண்டுமா?" -#: optiondialog.cpp:1142 +#: optiondialog.cpp:1190 #, kde-format msgid "File pattern(s):" msgstr "கோப்பு வடிவங்கள்:" -#: optiondialog.cpp:1148 +#: optiondialog.cpp:1196 #, kde-format msgid "" "Pattern(s) of files to be analyzed. \n" @@ -2562,12 +2580,12 @@ "பரிசோதனையிலிருந்து வெளியேற்றப்பட வேண்டிய கோப்புகளின் வடிவங்கள்.Wildcards ';' " "உபயோகித்து பல்வேறு வடிவங்களை குறிப்பிடலாம்" -#: optiondialog.cpp:1153 +#: optiondialog.cpp:1201 #, kde-format msgid "File-anti-pattern(s):" msgstr "வடிவற்ற கோப்பு" -#: optiondialog.cpp:1159 +#: optiondialog.cpp:1207 #, kde-format msgid "" "Pattern(s) of files to be excluded from analysis. \n" @@ -2577,12 +2595,12 @@ "பரிசோதனையிலிருந்து வெளியேற்றப்பட வேண்டிய கோப்புகளின் வடிவங்கள்.Wildcards ';' " "உபயோகித்து பல்வேறு வடிவங்களை குறிப்பிடலாம்" -#: optiondialog.cpp:1164 +#: optiondialog.cpp:1212 #, kde-format msgid "Dir-anti-pattern(s):" msgstr "வடிவற்ற அடைவு" -#: optiondialog.cpp:1170 +#: optiondialog.cpp:1218 #, kde-format msgid "" "Pattern(s) of directories to be excluded from analysis. \n" @@ -2592,12 +2610,12 @@ "பரிசோதனையிலிருந்து வெளியேற்றப்பட வேண்டிய கோப்புகளின் வடிவங்கள்.Wildcards ';' " "உபயோகித்து பல்வேறு வடிவங்களை குறிப்பிடலாம்" -#: optiondialog.cpp:1175 +#: optiondialog.cpp:1223 #, kde-format msgid "Use .cvsignore" msgstr ".cvsignore உபயோகி" -#: optiondialog.cpp:1179 +#: optiondialog.cpp:1227 #, fuzzy, kde-format #| msgid "" #| "Extends the antipattern to anything that would be ignored by CVS.\n" @@ -2609,23 +2627,23 @@ "Extends the antipattern to anything that would be ignored by CVS.\n" "Via local \".cvsignore\"-files this can be directory specific." -#: optiondialog.cpp:1183 +#: optiondialog.cpp:1231 #, kde-format msgid "Find hidden files and directories" msgstr "மறைந்த கோப்புகளையும் அடைவுகளையும் தேடு" -#: optiondialog.cpp:1186 +#: optiondialog.cpp:1234 #, fuzzy, kde-format #| msgid "Find hidden files and directories" msgid "Finds hidden files and directories." msgstr "மறைந்த கோப்புகளையும் அடைவுகளையும் தேடு" -#: optiondialog.cpp:1189 +#: optiondialog.cpp:1237 #, kde-format msgid "Follow file links" msgstr "கோப்பு இணைப்பை பின்பற்று" -#: optiondialog.cpp:1193 +#: optiondialog.cpp:1241 #, kde-format msgid "" "On: Compare the file the link points to.\n" @@ -2634,24 +2652,24 @@ "கோப்பினை இணைப்பு குறியோடு ஒப்பிடு.\n" " இணைப்பை ஒப்பிடு" -#: optiondialog.cpp:1197 +#: optiondialog.cpp:1245 #, kde-format msgid "Follow directory links" msgstr "அடைவை இணைப்பை பின்பற்று" -#: optiondialog.cpp:1201 +#: optiondialog.cpp:1249 #, kde-format msgid "" "On: Compare the directory the link points to.\n" "Off: Compare the links." msgstr "On:அடைவை இணைப்பு குறியோடு ஒப்பிடுOff இணைப்பை ஒப்பிடு" -#: optiondialog.cpp:1210 +#: optiondialog.cpp:1258 #, kde-format msgid "Case sensitive filename comparison" msgstr "" -#: optiondialog.cpp:1214 +#: optiondialog.cpp:1262 #, kde-format msgid "" "The directory comparison will compare files or directories when their names " @@ -2660,52 +2678,52 @@ "off, otherwise on.)" msgstr "" -#: optiondialog.cpp:1218 +#: optiondialog.cpp:1266 #, fuzzy, kde-format #| msgid "Unfold All Subdirs" msgid "Unfold all subdirectories on load" msgstr "அனைத்து உபஅடைவுகளையும் பிரி" -#: optiondialog.cpp:1222 +#: optiondialog.cpp:1270 #, kde-format msgid "" "On: Unfold all subdirectories when starting a directory diff.\n" "Off: Leave subdirectories folded." msgstr "" -#: optiondialog.cpp:1226 +#: optiondialog.cpp:1274 #, kde-format msgid "Skip directory status report" msgstr "" -#: optiondialog.cpp:1230 +#: optiondialog.cpp:1278 #, kde-format msgid "" "On: Do not show the Directory Comparison Status.\n" "Off: Show the status dialog on start." msgstr "" -#: optiondialog.cpp:1234 +#: optiondialog.cpp:1282 #, kde-format msgid "File Comparison Mode" msgstr "File Comparison Mode" -#: optiondialog.cpp:1239 +#: optiondialog.cpp:1287 #, fuzzy, kde-format msgid "Binary comparison" msgstr "Binary Comparison" -#: optiondialog.cpp:1241 +#: optiondialog.cpp:1289 #, kde-format msgid "Binary comparison of each file. (Default)" msgstr "Binary comparison of each file. (Default)" -#: optiondialog.cpp:1244 +#: optiondialog.cpp:1292 #, fuzzy, kde-format msgid "Full analysis" msgstr "Full Analysis" -#: optiondialog.cpp:1246 +#: optiondialog.cpp:1294 #, kde-format msgid "" "Do a full analysis and show statistics information in extra columns.\n" @@ -2714,12 +2732,12 @@ "Do a full analysis and show statistics information in extra columns.\n" "(Slower than a binary comparison, much slower for binary files.)" -#: optiondialog.cpp:1250 +#: optiondialog.cpp:1298 #, fuzzy, kde-format msgid "Trust the size and modification date (unsafe)" msgstr "மாற்றிய தேதியை நம்பு(பாதுகாப்பில்லை)" -#: optiondialog.cpp:1252 +#: optiondialog.cpp:1300 #, fuzzy, kde-format msgid "" "Assume that files are equal if the modification date and file length are " @@ -2731,14 +2749,14 @@ "மாற்றிய தேதியும் கோப்பு நீளமும் சமமாக இருந்தால் எல்லா கோப்புகளும் சமம் என எண்ணலாம். இது " "பெரிய அடைவுகளுக்கு அல்லது மெதுவான இணைப்புகளுக்கு உதவும்" -#: optiondialog.cpp:1257 +#: optiondialog.cpp:1305 #, fuzzy, kde-format msgid "" "Trust the size and date, but use binary comparison if date does not match " "(unsafe)" msgstr "மாற்றிய தேதியை நம்பு(பாதுகாப்பில்லை)" -#: optiondialog.cpp:1259 +#: optiondialog.cpp:1307 #, fuzzy, kde-format msgid "" "Assume that files are equal if the modification date and file length are " @@ -2749,12 +2767,12 @@ "மாற்றிய தேதியும் கோப்பு நீளமும் சமமாக இருந்தால் எல்லா கோப்புகளும் சமம் என எண்ணலாம். இது " "பெரிய அடைவுகளுக்கு அல்லது மெதுவான இணைப்புகளுக்கு உதவும்" -#: optiondialog.cpp:1264 +#: optiondialog.cpp:1312 #, kde-format msgid "Trust the size (unsafe)" msgstr "அளவை உறுதிபடுத்து(பாதுகாப்பில்லை)" -#: optiondialog.cpp:1266 +#: optiondialog.cpp:1314 #, kde-format msgid "" "Assume that files are equal if their file lengths are equal.\n" @@ -2764,12 +2782,12 @@ "மாற்றிய தேதியும் கோப்பு நீளமும் சமமாக இருந்தால் எல்லா கோப்புகளும் சமம் என எண்ணலாம். இது " "பெரிய அடைவுகளுக்கு அல்லது மெதுவான இணைப்புகளுக்கு உதவும்." -#: optiondialog.cpp:1273 +#: optiondialog.cpp:1321 #, kde-format msgid "Synchronize directories" msgstr "ஒத்தியக்கு அடைவை" -#: optiondialog.cpp:1277 +#: optiondialog.cpp:1325 #, kde-format msgid "" "Offers to store files in both directories so that\n" @@ -2780,24 +2798,24 @@ "ஒன்றாகவே இருக்கும் .இரண்டு அடைவுகளையும் சேருமிடம் குறிப்பிடாமல் ஒத்திடும் பொழுதுதான் " "வேலை செய்யும்." -#: optiondialog.cpp:1283 +#: optiondialog.cpp:1331 #, fuzzy, kde-format msgid "White space differences considered equal" msgstr "வெள்ளை இடம் 3-கோப்பு ஒன்றிணை முன்னிருப்பு:" -#: optiondialog.cpp:1287 +#: optiondialog.cpp:1335 #, kde-format msgid "" "If files differ only by white space consider them equal.\n" "This is only active when full analysis is chosen." msgstr "" -#: optiondialog.cpp:1293 +#: optiondialog.cpp:1341 #, kde-format msgid "Copy newer instead of merging (unsafe)" msgstr "ஒன்றாக சேர்ப்பதற்கு பதிலாக புதியவரை பதியெடு(பாதுகாப்பில்லை)" -#: optiondialog.cpp:1297 +#: optiondialog.cpp:1345 #, fuzzy, kde-format #| msgid "" #| "Don't look inside, just take the newer file.\n" @@ -2811,12 +2829,12 @@ "உள்ளே பார்க்காதே புதிய கோப்பினை மட்டும் எடு.(நீ செய்வது என்ன என்று தெரிந்தால் மட்டுமே இதை " "உபயோகப்படுத்து) இரண்டு அடைவுகளை ஒத்திடும் போது மட்டுமே விளைவுகள் ஏற்படும்" -#: optiondialog.cpp:1302 +#: optiondialog.cpp:1350 #, kde-format msgid "Backup files (.orig)" msgstr "பின்சேமிப்பு கோப்புகள்(.orig)" -#: optiondialog.cpp:1306 +#: optiondialog.cpp:1354 #, fuzzy, kde-format #| msgid "" #| "When a file would be saved over an old file, then the old file\n" @@ -2828,34 +2846,34 @@ "பழைய கோப்பில் ஒரு கோப்பினை சேமிக்கும் பொழுது, பழைய கோப்பில் மூல நீட்டுதலுடன் பெயர் " "மாறும், நீக்கபடுவதற்கு பதிலாக. " -#: optiondialog.cpp:1382 optiondialog.cpp:1383 +#: optiondialog.cpp:1430 optiondialog.cpp:1431 #, kde-format msgid "Regional Settings" msgstr "இதர அமைப்புகளை உள்ளடக்கியது" -#: optiondialog.cpp:1397 +#: optiondialog.cpp:1454 #, kde-format msgid "Use the same encoding for everything:" msgstr "" -#: optiondialog.cpp:1401 +#: optiondialog.cpp:1458 #, kde-format msgid "" "Enable this allows to change all encodings by changing the first only.\n" "Disable this if different individual settings are needed." msgstr "" -#: optiondialog.cpp:1405 +#: optiondialog.cpp:1462 #, fuzzy, kde-format msgid "Note: Local Encoding is \"%1\"" msgstr "லொகல் குறிமுறையாக்கம் உபயோகி" -#: optiondialog.cpp:1409 +#: optiondialog.cpp:1466 #, kde-format msgid "File Encoding for A:" msgstr "" -#: optiondialog.cpp:1416 +#: optiondialog.cpp:1473 #, kde-format msgid "" "If enabled then Unicode (UTF-16 or UTF-8) encoding will be detected.\n" @@ -2864,32 +2882,32 @@ "(Unicode detection depends on the first bytes of a file.)" msgstr "" -#: optiondialog.cpp:1419 optiondialog.cpp:1430 optiondialog.cpp:1441 +#: optiondialog.cpp:1476 optiondialog.cpp:1487 optiondialog.cpp:1498 #, kde-format msgid "Auto Detect Unicode" msgstr "" -#: optiondialog.cpp:1425 +#: optiondialog.cpp:1482 #, kde-format msgid "File Encoding for B:" msgstr "" -#: optiondialog.cpp:1436 +#: optiondialog.cpp:1493 #, kde-format msgid "File Encoding for C:" msgstr "" -#: optiondialog.cpp:1447 +#: optiondialog.cpp:1504 #, kde-format msgid "File Encoding for Merge Output and Saving:" msgstr "" -#: optiondialog.cpp:1452 +#: optiondialog.cpp:1509 #, fuzzy, kde-format msgid "Auto Select" msgstr "தானாகவே தேர்ந்தெடுக்கப்பட்ட படிவு" -#: optiondialog.cpp:1456 +#: optiondialog.cpp:1513 #, kde-format msgid "" "If enabled then the encoding from the input files is used.\n" @@ -2897,39 +2915,39 @@ "saving." msgstr "" -#: optiondialog.cpp:1459 +#: optiondialog.cpp:1516 #, kde-format msgid "File Encoding for Preprocessor Files:" msgstr "" -#: optiondialog.cpp:1471 +#: optiondialog.cpp:1528 #, kde-format msgid "Right To Left Language" msgstr "" -#: optiondialog.cpp:1475 +#: optiondialog.cpp:1532 #, kde-format msgid "" "Some languages are read from right to left.\n" "This setting will change the viewer and editor accordingly." msgstr "" -#: optiondialog.cpp:1485 +#: optiondialog.cpp:1542 #, fuzzy, kde-format msgid "Integration" msgstr "இயக்கம்." -#: optiondialog.cpp:1486 +#: optiondialog.cpp:1543 #, fuzzy, kde-format msgid "Integration Settings" msgstr "இதர அமைப்புகளை உள்ளடக்கியது" -#: optiondialog.cpp:1499 +#: optiondialog.cpp:1564 #, kde-format msgid "Command line options to ignore:" msgstr "" -#: optiondialog.cpp:1505 +#: optiondialog.cpp:1570 #, kde-format msgid "" "List of command line options that should be ignored when KDiff3 is used by " @@ -2938,19 +2956,19 @@ "This will suppress the \"Unknown option\" error." msgstr "" -#: optiondialog.cpp:1510 +#: optiondialog.cpp:1575 #, kde-format msgid "Quit also via Escape key" msgstr "" -#: optiondialog.cpp:1514 +#: optiondialog.cpp:1579 #, kde-format msgid "" "Fast method to exit.\n" "For those who are used to using the Escape key." msgstr "" -#: optiondialog.cpp:1598 +#: optiondialog.cpp:1653 #, kde-format msgid "This resets all options. Not only those of the current topic." msgstr "இது அனைத்து தேர்வுகளையும் மாற்றியமைக்கும். தற்பொழுதுள்ள தலைப்பு மட்டுமல்ல" @@ -3008,77 +3026,68 @@ msgid "Disable Unsafe Options" msgstr "பாதுகாப்பு இல்லாத தேர்வுகளை முடக்கு" -#: pdiff.cpp:158 +#: pdiff.cpp:160 #, kde-format msgid "Loading A" msgstr "A ஏற்றுதல்" -#: pdiff.cpp:167 -#, kde-format -msgid "Errors occurred during pre-processing of file A." -msgstr "" +#: pdiff.cpp:162 +#, fuzzy, kde-format +#| msgid "Loading A" +msgid "Loading A: %1" +msgstr "A ஏற்றுதல்" -#: pdiff.cpp:172 +#: pdiff.cpp:170 #, kde-format msgid "Loading B" msgstr " B ஏற்றுதல்" -#: pdiff.cpp:179 -#, kde-format -msgid "Errors occurred during pre-processing of file B." -msgstr "" - -#: pdiff.cpp:202 pdiff.cpp:241 +#: pdiff.cpp:201 pdiff.cpp:237 #, kde-format msgid "Diff: A <-> B" msgstr "வித்தியாசம் A <-> B" -#: pdiff.cpp:208 pdiff.cpp:279 pdiff.cpp:293 +#: pdiff.cpp:207 pdiff.cpp:275 pdiff.cpp:289 #, kde-format msgid "Linediff: A <-> B" msgstr "வரி வித்தியாசம் : A <->B" -#: pdiff.cpp:225 +#: pdiff.cpp:224 #, kde-format msgid "Loading C" msgstr " C ஏற்றுதல்" -#: pdiff.cpp:232 -#, kde-format -msgid "Errors occurred during pre-processing of file C." -msgstr "" - -#: pdiff.cpp:250 +#: pdiff.cpp:246 #, kde-format msgid "Diff: A <-> C" msgstr "வித்தியாசம் A <-> C" -#: pdiff.cpp:261 +#: pdiff.cpp:257 #, kde-format msgid "Diff: B <-> C" msgstr "வித்தியாசம் B <-> C" -#: pdiff.cpp:283 pdiff.cpp:297 +#: pdiff.cpp:279 pdiff.cpp:293 #, kde-format msgid "Linediff: B <-> C" msgstr "வரி வித்தியாசம் B <-> C" -#: pdiff.cpp:287 pdiff.cpp:301 +#: pdiff.cpp:283 pdiff.cpp:297 #, kde-format msgid "Linediff: A <-> C" msgstr "வரி வித்தியாசம் : A <-> C" -#: pdiff.cpp:829 +#: pdiff.cpp:819 #, fuzzy, kde-format msgid "All input files contain the same text, but are not binary equal." msgstr "அனைத்து உள்ளீட்டுக் கோப்புகளும் ஒரே உரையைக் கொண்டன." -#: pdiff.cpp:835 pdiff.cpp:839 pdiff.cpp:843 +#: pdiff.cpp:825 pdiff.cpp:829 pdiff.cpp:833 #, fuzzy, kde-format msgid "Files %1 and %2 have equal text, but are not binary equal. \n" msgstr "கோப்புகள் A மற்றும் B இருநிலை சமம் உடையன.\n" -#: pdiff.cpp:853 +#: pdiff.cpp:843 #, fuzzy, kde-format #| msgid "" #| "Some inputfiles don't seem to be pure textfiles.\n" @@ -3093,17 +3102,17 @@ "Note that the KDiff3-merge was not meant for binary data.\n" "Continue at your own risk." -#: pdiff.cpp:863 +#: pdiff.cpp:853 #, kde-format msgid ", B" msgstr "" -#: pdiff.cpp:865 +#: pdiff.cpp:855 #, kde-format msgid ", C" msgstr "" -#: pdiff.cpp:867 +#: pdiff.cpp:857 #, kde-format msgid "" "Some input characters could not be converted to valid unicode.\n" @@ -3112,77 +3121,72 @@ "Affected input files are in %1." msgstr "" -#: pdiff.cpp:1034 +#: pdiff.cpp:1032 #, kde-format msgid "Abort" msgstr "விடுதல்" -#: pdiff.cpp:1040 pdiff.cpp:1130 +#: pdiff.cpp:1038 pdiff.cpp:1129 #, kde-format msgid "Opening files..." msgstr "திறந்த கோப்புகள்" -#: pdiff.cpp:1107 -#, kde-format -msgid "File open error" -msgstr "கோப்பு திறப்பு பிழை" - -#: pdiff.cpp:1202 +#: pdiff.cpp:1212 #, kde-format msgid "Cutting selection..." msgstr "வெட்டுதலை தேர்ந்தெடு" -#: pdiff.cpp:1223 +#: pdiff.cpp:1233 #, kde-format msgid "Copying selection to clipboard..." msgstr "தேர்ந்தெடுக்கப்பட்டதை கிளிப்போர்டிற்கு நகலெடுக்க" -#: pdiff.cpp:1239 +#: pdiff.cpp:1249 #, kde-format msgid "Inserting clipboard contents..." msgstr "கிளிப்போர்டு உள்ளடக்கத்தை சொருகு" -#: pdiff.cpp:1695 +#: pdiff.cpp:1705 #, kde-format msgid "Word wrap (Cancel disables word wrap)" msgstr "" -#: pdiff.cpp:1696 +#: pdiff.cpp:1706 #, kde-format msgid "Calculating max width for horizontal scrollbar" msgstr "" -#: pdiff.cpp:1911 +#: pdiff.cpp:1921 #, kde-format msgid "Save && Continue" msgstr "சேமி தொடரு" -#: pdiff.cpp:1912 +#: pdiff.cpp:1922 #, kde-format msgid "Continue Without Saving" msgstr "சேமிக்காமல் தொடரு" -#: pdiff.cpp:2124 +#: pdiff.cpp:2134 #, kde-format msgid "Search complete." msgstr "தேடல் முடிவடைந்தது" -#: pdiff.cpp:2124 +#: pdiff.cpp:2134 #, kde-format msgid "Search Complete" msgstr "தேடல் முடிவடைந்தது" -#: pdiff.cpp:2375 +#: pdiff.cpp:2385 #, kde-format msgid "Nothing is selected in either diff input window." msgstr "" -#: pdiff.cpp:2375 +#: pdiff.cpp:2385 #, fuzzy, kde-format msgid "Error while adding manual diff range" msgstr "அடைவை உருவாக்கும் போது பிழை" -#: progress.cpp:59 progress.cpp:71 +#: progress.cpp:61 progress.cpp:73 #, kde-format msgid "&Cancel" msgstr "" @@ -3192,190 +3196,190 @@ msgid "A (Base):" msgstr "A (அடிப்படை)" -#: smalldialogs.cpp:68 smalldialogs.cpp:85 smalldialogs.cpp:102 -#: smalldialogs.cpp:144 +#: smalldialogs.cpp:71 smalldialogs.cpp:90 smalldialogs.cpp:109 +#: smalldialogs.cpp:154 #, kde-format msgid "File..." msgstr "கோப்பு" -#: smalldialogs.cpp:70 smalldialogs.cpp:87 smalldialogs.cpp:104 -#: smalldialogs.cpp:146 +#: smalldialogs.cpp:73 smalldialogs.cpp:92 smalldialogs.cpp:111 +#: smalldialogs.cpp:156 #, kde-format msgid "Dir..." msgstr "அடைவு" -#: smalldialogs.cpp:96 +#: smalldialogs.cpp:103 #, kde-format msgid "C (Optional):" msgstr "C (விருப்பங்கள்)" -#: smalldialogs.cpp:119 +#: smalldialogs.cpp:126 #, kde-format msgid "Swap/Copy Names..." msgstr "" -#: smalldialogs.cpp:124 smalldialogs.cpp:125 smalldialogs.cpp:126 +#: smalldialogs.cpp:131 smalldialogs.cpp:132 smalldialogs.cpp:133 #, kde-format msgid "Swap %1<->%2" msgstr "" -#: smalldialogs.cpp:127 smalldialogs.cpp:128 smalldialogs.cpp:129 +#: smalldialogs.cpp:134 smalldialogs.cpp:135 smalldialogs.cpp:136 #, kde-format msgid "Copy %1->Output" msgstr "" -#: smalldialogs.cpp:130 smalldialogs.cpp:131 smalldialogs.cpp:132 +#: smalldialogs.cpp:137 smalldialogs.cpp:138 smalldialogs.cpp:139 #, kde-format msgid "Swap %1<->Output" msgstr "" -#: smalldialogs.cpp:138 +#: smalldialogs.cpp:148 #, kde-format msgid "Output (optional):" msgstr "வெளீயிடு (விருப்பங்கள்)" -#: smalldialogs.cpp:168 +#: smalldialogs.cpp:178 #, kde-format msgid "Configure..." msgstr "அமை" -#: smalldialogs.cpp:233 +#: smalldialogs.cpp:243 #, fuzzy, kde-format #| msgid "&Directory" msgid "Open Directory" msgstr "அடைவு" -#: smalldialogs.cpp:234 +#: smalldialogs.cpp:244 #, kde-format msgid "Select Output File" msgstr "" -#: smalldialogs.cpp:393 +#: smalldialogs.cpp:403 #, fuzzy, kde-format msgid "Search text:" msgstr "உரையைத் தேடு:" -#: smalldialogs.cpp:400 +#: smalldialogs.cpp:410 #, kde-format msgid "Case sensitive" msgstr "எழுத்து வகை உணரக்கூடிய" -#: smalldialogs.cpp:403 +#: smalldialogs.cpp:413 #, kde-format msgid "Search A" msgstr "Aவைத் தேடு" -#: smalldialogs.cpp:408 +#: smalldialogs.cpp:418 #, kde-format msgid "Search B" msgstr "Bவைத் தேடு" -#: smalldialogs.cpp:413 +#: smalldialogs.cpp:423 #, kde-format msgid "Search C" msgstr "Cவைத் தேடு" -#: smalldialogs.cpp:418 +#: smalldialogs.cpp:428 #, kde-format msgid "Search output" msgstr "வெளியீட்டைத் தேடு" -#: smalldialogs.cpp:425 +#: smalldialogs.cpp:435 #, kde-format msgid "&Search" msgstr "தேடு" -#: smalldialogs.cpp:444 +#: smalldialogs.cpp:454 #, kde-format msgid "Regular Expression Tester" msgstr "" -#: smalldialogs.cpp:457 +#: smalldialogs.cpp:467 #, kde-format msgid "Example auto merge line:" msgstr "" -#: smalldialogs.cpp:459 +#: smalldialogs.cpp:469 #, kde-format msgid "To test auto merge, copy a line as used in your files." msgstr "" -#: smalldialogs.cpp:465 smalldialogs.cpp:493 smalldialogs.cpp:529 +#: smalldialogs.cpp:475 smalldialogs.cpp:503 smalldialogs.cpp:539 #, kde-format msgid "Match result:" msgstr "" -#: smalldialogs.cpp:484 +#: smalldialogs.cpp:494 #, kde-format msgid "Example history start line (with leading comment):" msgstr "" -#: smalldialogs.cpp:486 +#: smalldialogs.cpp:496 #, kde-format msgid "" "Copy a history start line as used in your files,\n" "including the leading comment." msgstr "" -#: smalldialogs.cpp:512 +#: smalldialogs.cpp:522 #, kde-format msgid "History sort key order:" msgstr "" -#: smalldialogs.cpp:520 +#: smalldialogs.cpp:530 #, kde-format msgid "Example history entry start line (without leading comment):" msgstr "" -#: smalldialogs.cpp:522 +#: smalldialogs.cpp:532 #, kde-format msgid "" "Copy a history entry start line as used in your files,\n" "but omit the leading comment." msgstr "" -#: smalldialogs.cpp:536 +#: smalldialogs.cpp:546 #, kde-format msgid "Sort key result:" msgstr "" -#: smalldialogs.cpp:584 smalldialogs.cpp:594 smalldialogs.cpp:614 +#: smalldialogs.cpp:594 smalldialogs.cpp:604 smalldialogs.cpp:624 #, kde-format msgid "Match success." msgstr "" -#: smalldialogs.cpp:588 smalldialogs.cpp:598 smalldialogs.cpp:620 +#: smalldialogs.cpp:598 smalldialogs.cpp:608 smalldialogs.cpp:630 #, fuzzy, kde-format msgid "Match failed." msgstr "சேகரிப்பு தோல்வியடைந்தது." -#: smalldialogs.cpp:605 +#: smalldialogs.cpp:615 #, kde-format msgid "Opening and closing parentheses do not match in regular expression." msgstr "" -#: SourceData.cpp:150 +#: SourceData.cpp:153 #, kde-format msgid "Writing clipboard data to temp file failed." msgstr "க்ளிப்போர்டின் எழுத்தின் தரத்தில் உள்ள டெம்ப் கோப்பு தவறு." -#: SourceData.cpp:154 +#: SourceData.cpp:157 #, kde-format msgid "From Clipboard" msgstr "கிளிப் போர்டிலிருந்து." -#: SourceData.cpp:335 +#: SourceData.cpp:348 #, fuzzy, kde-format #| msgid "Mix of links and normal files." msgid "%1 is not a normal file." msgstr "இணைப்புகள் மற்றும் கோப்புகள் கலந்து உள்ளன." -#: SourceData.cpp:427 +#: SourceData.cpp:440 #, kde-format msgid " Temp file is: %1" msgstr "" -#: SourceData.cpp:432 +#: SourceData.cpp:445 #, kde-format msgid "" "Preprocessing possibly failed. Check this command:\n" @@ -3390,12 +3394,12 @@ "\n" "முன்செயலிகள் கட்டளையை இப்பொழுதே முடக்கு," -#: SourceData.cpp:443 SourceData.cpp:512 +#: SourceData.cpp:456 SourceData.cpp:525 #, kde-format msgid "File %1 too large to process. Skipping." msgstr "" -#: SourceData.cpp:487 +#: SourceData.cpp:500 #, kde-format msgid "" "The line-matching-preprocessing possibly failed. Check this command:\n" diff -Nru kdiff3-1.8.01/po/tg/kdiff3.po kdiff3-1.8.3/po/tg/kdiff3.po --- kdiff3-1.8.01/po/tg/kdiff3.po 2019-05-18 01:02:29.000000000 +0000 +++ kdiff3-1.8.3/po/tg/kdiff3.po 2020-06-25 00:18:56.000000000 +0000 @@ -10,8 +10,8 @@ msgid "" msgstr "" "Project-Id-Version: kdiff3\n" -"Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2019-04-18 08:02+0200\n" +"Report-Msgid-Bugs-To: https://bugs.kde.org\n" +"POT-Creation-Date: 2020-06-22 07:48+0200\n" "PO-Revision-Date: 2005-09-17 13:29+0500\n" "Last-Translator: Victor Ibragimov \n" "Language-Team: Tajik\n" @@ -32,288 +32,288 @@ msgid "Your emails" msgstr "" -#: difftextwindow.cpp:412 +#: difftextwindow.cpp:414 #, kde-format msgid "File %1: Line %2" msgstr "" -#: difftextwindow.cpp:414 +#: difftextwindow.cpp:416 #, fuzzy, kde-format #| msgid "not available" msgid "File %1: Line not available" msgstr "дастрас нест" -#: difftextwindow.cpp:1780 +#: difftextwindow.cpp:1778 #, kde-format msgid "Encoding:" msgstr "" -#: difftextwindow.cpp:1782 mergeresultwindow.cpp:3138 optiondialog.cpp:818 +#: difftextwindow.cpp:1781 mergeresultwindow.cpp:3166 optiondialog.cpp:840 #, kde-format msgid "Line end style:" msgstr "" -#: difftextwindow.cpp:1810 directorymergewindow.cpp:382 -#: directorymergewindow.cpp:433 directorymergewindow.cpp:524 -#: directorymergewindow.cpp:3058 directorymergewindow.cpp:3189 -#: directorymergewindow.cpp:3417 mergeresultwindow.cpp:942 -#: mergeresultwindow.cpp:944 mergeresultwindow.cpp:946 -#: mergeresultwindow.cpp:948 mergeresultwindow.cpp:1814 -#: mergeresultwindow.cpp:3170 mergeresultwindow.cpp:3177 optiondialog.cpp:962 -#: optiondialog.cpp:975 pdiff.cpp:833 pdiff.cpp:835 pdiff.cpp:837 pdiff.cpp:839 -#: pdiff.cpp:861 smalldialogs.cpp:124 smalldialogs.cpp:126 smalldialogs.cpp:127 -#: smalldialogs.cpp:130 +#: difftextwindow.cpp:1809 directorymergewindow.cpp:383 +#: directorymergewindow.cpp:434 directorymergewindow.cpp:525 +#: directorymergewindow.cpp:3072 directorymergewindow.cpp:3203 +#: directorymergewindow.cpp:3431 mergeresultwindow.cpp:970 +#: mergeresultwindow.cpp:972 mergeresultwindow.cpp:974 +#: mergeresultwindow.cpp:976 mergeresultwindow.cpp:1842 +#: mergeresultwindow.cpp:3198 mergeresultwindow.cpp:3205 optiondialog.cpp:1002 +#: optiondialog.cpp:1015 pdiff.cpp:823 pdiff.cpp:825 pdiff.cpp:827 +#: pdiff.cpp:829 pdiff.cpp:851 smalldialogs.cpp:131 smalldialogs.cpp:133 +#: smalldialogs.cpp:134 smalldialogs.cpp:137 #, kde-format msgid "A" msgstr "A" -#: difftextwindow.cpp:1810 directorymergewindow.cpp:384 -#: directorymergewindow.cpp:436 directorymergewindow.cpp:526 -#: directorymergewindow.cpp:3064 directorymergewindow.cpp:3190 -#: directorymergewindow.cpp:3418 mergeresultwindow.cpp:942 -#: mergeresultwindow.cpp:944 mergeresultwindow.cpp:950 -#: mergeresultwindow.cpp:952 mergeresultwindow.cpp:1816 -#: mergeresultwindow.cpp:3172 mergeresultwindow.cpp:3179 optiondialog.cpp:963 -#: optiondialog.cpp:976 pdiff.cpp:833 pdiff.cpp:835 pdiff.cpp:841 pdiff.cpp:843 -#: pdiff.cpp:863 smalldialogs.cpp:124 smalldialogs.cpp:125 smalldialogs.cpp:128 -#: smalldialogs.cpp:131 +#: difftextwindow.cpp:1809 directorymergewindow.cpp:385 +#: directorymergewindow.cpp:437 directorymergewindow.cpp:527 +#: directorymergewindow.cpp:3078 directorymergewindow.cpp:3204 +#: directorymergewindow.cpp:3432 mergeresultwindow.cpp:970 +#: mergeresultwindow.cpp:972 mergeresultwindow.cpp:978 +#: mergeresultwindow.cpp:980 mergeresultwindow.cpp:1844 +#: mergeresultwindow.cpp:3200 mergeresultwindow.cpp:3207 optiondialog.cpp:1003 +#: optiondialog.cpp:1016 pdiff.cpp:823 pdiff.cpp:825 pdiff.cpp:831 +#: pdiff.cpp:833 pdiff.cpp:853 smalldialogs.cpp:131 smalldialogs.cpp:132 +#: smalldialogs.cpp:135 smalldialogs.cpp:138 #, kde-format msgid "B" msgstr "B" -#: difftextwindow.cpp:1810 directorymergewindow.cpp:386 -#: directorymergewindow.cpp:439 directorymergewindow.cpp:528 -#: directorymergewindow.cpp:3070 directorymergewindow.cpp:3191 -#: directorymergewindow.cpp:3419 mergeresultwindow.cpp:946 -#: mergeresultwindow.cpp:948 mergeresultwindow.cpp:950 -#: mergeresultwindow.cpp:952 mergeresultwindow.cpp:1818 -#: mergeresultwindow.cpp:3174 mergeresultwindow.cpp:3181 optiondialog.cpp:977 -#: pdiff.cpp:837 pdiff.cpp:839 pdiff.cpp:841 pdiff.cpp:843 pdiff.cpp:865 -#: smalldialogs.cpp:125 smalldialogs.cpp:126 smalldialogs.cpp:129 -#: smalldialogs.cpp:132 +#: difftextwindow.cpp:1809 directorymergewindow.cpp:387 +#: directorymergewindow.cpp:440 directorymergewindow.cpp:529 +#: directorymergewindow.cpp:3084 directorymergewindow.cpp:3205 +#: directorymergewindow.cpp:3433 mergeresultwindow.cpp:974 +#: mergeresultwindow.cpp:976 mergeresultwindow.cpp:978 +#: mergeresultwindow.cpp:980 mergeresultwindow.cpp:1846 +#: mergeresultwindow.cpp:3202 mergeresultwindow.cpp:3209 optiondialog.cpp:1017 +#: pdiff.cpp:827 pdiff.cpp:829 pdiff.cpp:831 pdiff.cpp:833 pdiff.cpp:855 +#: smalldialogs.cpp:132 smalldialogs.cpp:133 smalldialogs.cpp:136 +#: smalldialogs.cpp:139 #, kde-format msgid "C" msgstr "C" -#: difftextwindow.cpp:1810 +#: difftextwindow.cpp:1809 #, fuzzy, kde-format msgid "A (Base)" msgstr "A (баромад): " -#: difftextwindow.cpp:1812 +#: difftextwindow.cpp:1811 #, kde-format msgid "Encoding: %1" msgstr "" -#: difftextwindow.cpp:1813 mergeresultwindow.cpp:3183 +#: difftextwindow.cpp:1812 mergeresultwindow.cpp:3211 #, kde-format msgid "Unix" msgstr "" -#: difftextwindow.cpp:1813 mergeresultwindow.cpp:3184 +#: difftextwindow.cpp:1812 mergeresultwindow.cpp:3212 #, kde-format msgid "DOS" msgstr "" -#: difftextwindow.cpp:1813 +#: difftextwindow.cpp:1812 #, kde-format msgid "Line end style: %1" msgstr "" -#: difftextwindow.cpp:1835 kdiff3.cpp:873 +#: difftextwindow.cpp:1834 kdiff3.cpp:874 #, fuzzy, kde-format msgid "Top line" msgstr "Сатри яккум%1" -#: difftextwindow.cpp:1845 +#: difftextwindow.cpp:1843 #, kde-format msgid "End" msgstr "Охир" -#: difftextwindow.cpp:1903 smalldialogs.cpp:235 +#: difftextwindow.cpp:1901 smalldialogs.cpp:245 #, fuzzy, kde-format msgid "Open File" msgstr "Кушодан %1 нашуд." -#: difftextwindow.cpp:1951 optiondialog.cpp:387 +#: difftextwindow.cpp:1943 optiondialog.cpp:389 #, kde-format msgid "Unicode, 8 bit" msgstr "" -#: difftextwindow.cpp:1966 +#: difftextwindow.cpp:1958 #, kde-format msgid "Other" msgstr "" -#: directorymergewindow.cpp:409 directorymergewindow.cpp:3424 +#: directorymergewindow.cpp:410 directorymergewindow.cpp:3438 #, kde-format msgid "Copy A to B" msgstr "Нусха кардан А ба В" -#: directorymergewindow.cpp:412 directorymergewindow.cpp:3425 +#: directorymergewindow.cpp:413 directorymergewindow.cpp:3439 #, kde-format msgid "Copy B to A" msgstr "Нусха кардан В ба А" -#: directorymergewindow.cpp:415 directorymergewindow.cpp:3426 +#: directorymergewindow.cpp:416 directorymergewindow.cpp:3440 #, kde-format msgid "Delete A" msgstr "Нест кардани А" -#: directorymergewindow.cpp:418 directorymergewindow.cpp:3427 +#: directorymergewindow.cpp:419 directorymergewindow.cpp:3441 #, kde-format msgid "Delete B" msgstr "Нест кардани В" -#: directorymergewindow.cpp:421 +#: directorymergewindow.cpp:422 #, kde-format msgid "Delete A & B" msgstr "Нест кардани А ва В" -#: directorymergewindow.cpp:424 directorymergewindow.cpp:3429 +#: directorymergewindow.cpp:425 directorymergewindow.cpp:3443 #, kde-format msgid "Merge to A" msgstr "Пайваст кардан ба A" -#: directorymergewindow.cpp:427 directorymergewindow.cpp:3430 +#: directorymergewindow.cpp:428 directorymergewindow.cpp:3444 #, kde-format msgid "Merge to B" msgstr "Пайваст кардан ба В" -#: directorymergewindow.cpp:430 +#: directorymergewindow.cpp:431 #, kde-format msgid "Merge to A & B" msgstr "Пайваст кардан ба A & В" -#: directorymergewindow.cpp:442 directorymergewindow.cpp:3421 +#: directorymergewindow.cpp:443 directorymergewindow.cpp:3435 #, kde-format msgid "Delete (if exists)" msgstr "Нест кардан (агар вуҷуд дорад)" -#: directorymergewindow.cpp:445 directorymergewindow.cpp:448 -#: directorymergewindow.cpp:3420 optiondialog.cpp:925 smalldialogs.cpp:113 +#: directorymergewindow.cpp:446 directorymergewindow.cpp:449 +#: directorymergewindow.cpp:3434 smalldialogs.cpp:120 #, kde-format msgid "Merge" msgstr "Пайваст кардан" -#: directorymergewindow.cpp:445 directorymergewindow.cpp:448 +#: directorymergewindow.cpp:446 directorymergewindow.cpp:449 #, kde-format msgid "Merge (manual)" msgstr "Пайваст кардан (дастӣ)" -#: directorymergewindow.cpp:451 +#: directorymergewindow.cpp:452 #, kde-format msgid "Error: Conflicting File Types" msgstr "Хатогӣ: Якҷоянашавандаи шакли файлҳо" -#: directorymergewindow.cpp:454 +#: directorymergewindow.cpp:455 #, kde-format msgid "Error: Changed and Deleted" msgstr "" -#: directorymergewindow.cpp:457 +#: directorymergewindow.cpp:458 #, kde-format msgid "Error: Dates are equal but files are not." msgstr "Хатогӣ: Вақт мувофиқ аст, лекин файлҳо нет." -#: directorymergewindow.cpp:471 +#: directorymergewindow.cpp:472 #, fuzzy, kde-format #| msgid "Done." msgid "Done" msgstr "Тайёр аст." -#: directorymergewindow.cpp:473 +#: directorymergewindow.cpp:474 #, fuzzy, kde-format #| msgid "Error." msgid "Error" msgstr "Хатогӣ." -#: directorymergewindow.cpp:475 +#: directorymergewindow.cpp:476 #, kde-format msgid "Skipped." msgstr "Са дода шуд." -#: directorymergewindow.cpp:477 +#: directorymergewindow.cpp:478 #, kde-format msgid "Not saved." msgstr "Захира нашуд." -#: directorymergewindow.cpp:479 +#: directorymergewindow.cpp:480 #, kde-format msgid "In progress..." msgstr "Кор рафта истодааст..." -#: directorymergewindow.cpp:481 +#: directorymergewindow.cpp:482 #, kde-format msgid "To do." msgstr "Кардан." -#: directorymergewindow.cpp:522 +#: directorymergewindow.cpp:523 #, kde-format msgid "Name" msgstr "Ном" -#: directorymergewindow.cpp:530 +#: directorymergewindow.cpp:531 #, kde-format msgid "Operation" msgstr "Амал" -#: directorymergewindow.cpp:532 +#: directorymergewindow.cpp:533 #, kde-format msgid "Status" msgstr "Вазъият" -#: directorymergewindow.cpp:534 +#: directorymergewindow.cpp:535 #, kde-format msgid "Unsolved" msgstr "Иҷозат дода нашуд" -#: directorymergewindow.cpp:536 +#: directorymergewindow.cpp:537 #, kde-format msgid "Solved" msgstr "Иҷозат дода шуда" -#: directorymergewindow.cpp:538 +#: directorymergewindow.cpp:539 #, kde-format msgid "Nonwhite" msgstr "Сиёҳ" -#: directorymergewindow.cpp:540 +#: directorymergewindow.cpp:541 #, kde-format msgid "White" msgstr "Сафед" -#: directorymergewindow.cpp:674 +#: directorymergewindow.cpp:676 #, kde-format msgid "Unable to compare non-normal file with normal file." msgstr "" -#: directorymergewindow.cpp:688 +#: directorymergewindow.cpp:690 #, kde-format msgid "Mix of links and normal files." msgstr "Мувофиқкунии ишораҳо бо файлҳои оддӣ." -#: directorymergewindow.cpp:695 +#: directorymergewindow.cpp:697 #, kde-format msgid "Link: " msgstr "Алоқа: " -#: directorymergewindow.cpp:704 +#: directorymergewindow.cpp:706 #, kde-format msgid "Size. " msgstr "Андоза. " -#: directorymergewindow.cpp:718 directorymergewindow.cpp:728 +#: directorymergewindow.cpp:720 directorymergewindow.cpp:730 #, kde-format msgid "Date & Size: " msgstr "Таърихи рӯз ва андоза: " -#: directorymergewindow.cpp:748 +#: directorymergewindow.cpp:751 #, fuzzy, kde-format msgid "Comparing file..." msgstr "Нигоҳ доштани файл ..." -#: directorymergewindow.cpp:801 +#: directorymergewindow.cpp:813 #, kde-format msgid "" "You are currently doing a directory merge. Are you sure, you want to abort " @@ -323,48 +323,48 @@ "ҳақиқат мехоҳед, ки ҳамаи тағйиротҳоро нест кунед ва таркиби каталогро ан " "нав кунед?" -#: directorymergewindow.cpp:802 kdiff3.cpp:698 kdiff3.cpp:708 kdiff3.cpp:720 -#: mergeresultwindow.cpp:372 pdiff.cpp:1033 pdiff.cpp:1910 pdiff.cpp:1920 +#: directorymergewindow.cpp:814 kdiff3.cpp:697 kdiff3.cpp:707 kdiff3.cpp:719 +#: mergeresultwindow.cpp:400 pdiff.cpp:1031 pdiff.cpp:1920 pdiff.cpp:1930 #, kde-format msgid "Warning" msgstr "" -#: directorymergewindow.cpp:803 directorymergewindow.cpp:3393 +#: directorymergewindow.cpp:815 directorymergewindow.cpp:3407 #, kde-format msgid "Rescan" msgstr "Дигар кардан" -#: directorymergewindow.cpp:804 pdiff.cpp:1035 +#: directorymergewindow.cpp:816 pdiff.cpp:1033 #, kde-format msgid "Continue Merging" msgstr "Давом додан" -#: directorymergewindow.cpp:971 +#: directorymergewindow.cpp:984 #, kde-format msgid "Opening of directories failed:" msgstr "Наметавонам каталогҳоро кушоям:" -#: directorymergewindow.cpp:975 +#: directorymergewindow.cpp:988 #, kde-format msgid "Dir A \"%1\" does not exist or is not a directory.\n" msgstr "Каталоги А \"%1\" вуҷуд надорад.\n" -#: directorymergewindow.cpp:980 +#: directorymergewindow.cpp:993 #, kde-format msgid "Dir B \"%1\" does not exist or is not a directory.\n" msgstr "Каталоги В \"%1\" вуҷуд надорад.\n" -#: directorymergewindow.cpp:985 +#: directorymergewindow.cpp:998 #, kde-format msgid "Dir C \"%1\" does not exist or is not a directory.\n" msgstr "Каталоги C \"%1\" вуҷуд надорад.\n" -#: directorymergewindow.cpp:988 +#: directorymergewindow.cpp:1001 #, kde-format msgid "Directory Open Error" msgstr "Хатогӣ дар вақти хониши каталог" -#: directorymergewindow.cpp:996 +#: directorymergewindow.cpp:1009 #, kde-format msgid "" "The destination directory must not be the same as A or B when three " @@ -375,49 +375,49 @@ "шуданд.\n" "Санҷед бори дигар пеш аз давомкуни." -#: directorymergewindow.cpp:998 +#: directorymergewindow.cpp:1011 #, kde-format msgid "Parameter Warning" msgstr "Параметри нодуруст" -#: directorymergewindow.cpp:1003 +#: directorymergewindow.cpp:1016 #, fuzzy, kde-format msgid "Scanning directories..." msgstr "Мушоҳидакунии каталогҳо..." -#: directorymergewindow.cpp:1029 +#: directorymergewindow.cpp:1042 #, kde-format msgid "Reading Directory A" msgstr "Хониши каталоги А" -#: directorymergewindow.cpp:1038 +#: directorymergewindow.cpp:1051 #, kde-format msgid "Reading Directory B" msgstr "Хониши каталоги В" -#: directorymergewindow.cpp:1048 +#: directorymergewindow.cpp:1061 #, kde-format msgid "Reading Directory C" msgstr "Хониши каталоги С" -#: directorymergewindow.cpp:1064 +#: directorymergewindow.cpp:1077 #, kde-format msgid "Some subdirectories were not readable in" msgstr "Наметавонам баъзе зеркаталогҳоро хонам дар" -#: directorymergewindow.cpp:1069 +#: directorymergewindow.cpp:1082 #, kde-format msgid "Check the permissions of the subdirectories." msgstr "Ҳуқуқҳои ин каталогҳоро тафтиш кунед." -#: directorymergewindow.cpp:1106 kdiff3.cpp:666 kdiff3.cpp:753 kdiff3.cpp:777 -#: kdiff3.cpp:1065 kdiff3.cpp:1086 pdiff.cpp:1116 pdiff.cpp:1170 pdiff.cpp:1218 -#: pdiff.cpp:1234 pdiff.cpp:1277 pdiff.cpp:1301 +#: directorymergewindow.cpp:1119 kdiff3.cpp:665 kdiff3.cpp:752 kdiff3.cpp:776 +#: kdiff3.cpp:1072 kdiff3.cpp:1093 pdiff.cpp:1115 pdiff.cpp:1178 pdiff.cpp:1228 +#: pdiff.cpp:1244 pdiff.cpp:1287 pdiff.cpp:1311 #, kde-format msgid "Ready." msgstr "Тайёр аст." -#: directorymergewindow.cpp:1121 +#: directorymergewindow.cpp:1134 #, kde-format msgid "" "Directory Comparison Status\n" @@ -427,23 +427,23 @@ "Number of different files: %3" msgstr "" -#: directorymergewindow.cpp:1128 +#: directorymergewindow.cpp:1141 #, fuzzy, kde-format #| msgid "Number of manual merges:" msgid "Number of manual merges: %1" msgstr "Миқдори якҷошавии дастӣ:" -#: directorymergewindow.cpp:1394 +#: directorymergewindow.cpp:1407 #, kde-format msgid "This affects all merge operations." msgstr "Ин ба ҳамаи якҷошавӣ таъсир мерасонад." -#: directorymergewindow.cpp:1395 +#: directorymergewindow.cpp:1408 #, kde-format msgid "Changing All Merge Operations" msgstr "Тағйироти ҳамаи якҷошавиҳо" -#: directorymergewindow.cpp:1695 +#: directorymergewindow.cpp:1708 #, fuzzy, kde-format #| msgid "Processing " msgid "" @@ -451,45 +451,45 @@ "%3" msgstr "Коркард " -#: directorymergewindow.cpp:1738 directorymergewindow.cpp:1742 +#: directorymergewindow.cpp:1751 directorymergewindow.cpp:1755 #, kde-format msgid "Some files could not be processed." msgstr "" -#: directorymergewindow.cpp:2222 directorymergewindow.cpp:2247 -#: directorymergewindow.cpp:2271 +#: directorymergewindow.cpp:2235 directorymergewindow.cpp:2260 +#: directorymergewindow.cpp:2285 #, kde-format msgid "This operation is currently not possible." msgstr "Ҳоло номумкин аст." -#: directorymergewindow.cpp:2222 directorymergewindow.cpp:2247 -#: directorymergewindow.cpp:2271 directorymergewindow.cpp:2552 +#: directorymergewindow.cpp:2235 directorymergewindow.cpp:2260 +#: directorymergewindow.cpp:2285 directorymergewindow.cpp:2565 #, kde-format msgid "Operation Not Possible" msgstr "Пайваст кардан" -#: directorymergewindow.cpp:2318 +#: directorymergewindow.cpp:2332 #, fuzzy, kde-format #| msgid "An error occurred while copying.\n" msgid "An error occurred while copying." msgstr "Хатогии нусхакунӣ.\n" -#: directorymergewindow.cpp:2319 directorymergewindow.cpp:2759 +#: directorymergewindow.cpp:2333 directorymergewindow.cpp:2772 #, kde-format msgid "Merge Error" msgstr "Хатогии якҷояшавӣ" -#: directorymergewindow.cpp:2396 +#: directorymergewindow.cpp:2410 #, kde-format msgid "Unknown merge operation. (This must never happen!)" msgstr "Пайвастшавии номаълум" -#: directorymergewindow.cpp:2441 +#: directorymergewindow.cpp:2455 #, kde-format msgid "Unknown merge operation." msgstr "Пайвастшавии номаълум." -#: directorymergewindow.cpp:2454 +#: directorymergewindow.cpp:2468 #, kde-format msgid "" "The merge is about to begin.\n" @@ -508,22 +508,22 @@ "\n" "Мо малиҳат медиҳем, ки доимо пеш аз якҷояшавӣ нусхаҳои захиравиро кунед!" -#: directorymergewindow.cpp:2459 +#: directorymergewindow.cpp:2473 #, kde-format msgid "Starting Merge" msgstr "Оғози якҷояшавӣ" -#: directorymergewindow.cpp:2460 +#: directorymergewindow.cpp:2474 #, kde-format msgid "Do It" msgstr "Ҳал кардан" -#: directorymergewindow.cpp:2461 +#: directorymergewindow.cpp:2475 #, kde-format msgid "Simulate It" msgstr "Моделсозӣ" -#: directorymergewindow.cpp:2487 +#: directorymergewindow.cpp:2501 #, kde-format msgid "" "The highlighted item has a different type in the different directories. " @@ -532,7 +532,7 @@ "Файли интихобшуда дар ҳар каталог шкли гуногун дорад. Чӣ кор карданро " "интихоб кунед." -#: directorymergewindow.cpp:2491 +#: directorymergewindow.cpp:2505 #, kde-format msgid "" "The modification dates of the file are equal but the files are not. Select " @@ -541,7 +541,7 @@ "Маълумотҳои охирини тағйироти файлҳо якхела ҳастанд, вале таркиб нест. Чӣ " "кор карданро интихоб кунед." -#: directorymergewindow.cpp:2495 +#: directorymergewindow.cpp:2509 #, fuzzy, kde-format #| msgid "" #| "The highlighted item has a different type in the different directories. " @@ -553,14 +553,14 @@ "Файли интихобшуда дар ҳар каталог шкли гуногун дорад. Чӣ кор карданро " "интихоб кунед." -#: directorymergewindow.cpp:2552 +#: directorymergewindow.cpp:2565 #, kde-format msgid "" "This operation is currently not possible because directory merge is " "currently running." msgstr "Ҳоло якҷояшавии каталогҳо ҳал карда мешавад." -#: directorymergewindow.cpp:2609 +#: directorymergewindow.cpp:2622 #, kde-format msgid "" "There was an error in the last step.\n" @@ -570,263 +570,263 @@ "Дар этапи ҷорӣ хатогие ба амал омад.\n" "Давом додан ё сар додан?" -#: directorymergewindow.cpp:2611 +#: directorymergewindow.cpp:2624 #, kde-format msgid "Continue merge after an error" msgstr "Давом додан баъди хатогӣ" -#: directorymergewindow.cpp:2612 +#: directorymergewindow.cpp:2625 #, kde-format msgid "Continue With Last Item" msgstr "Давом додан" -#: directorymergewindow.cpp:2613 +#: directorymergewindow.cpp:2626 #, kde-format msgid "Skip Item" msgstr "Сар додан" -#: directorymergewindow.cpp:2709 +#: directorymergewindow.cpp:2722 #, kde-format msgid "Merge operation complete." msgstr "Якҷояшавӣ ба анҷом расид." -#: directorymergewindow.cpp:2709 directorymergewindow.cpp:2712 +#: directorymergewindow.cpp:2722 directorymergewindow.cpp:2725 #, kde-format msgid "Merge Complete" msgstr "Якҷояшавӣ ба анҷом расид" -#: directorymergewindow.cpp:2722 +#: directorymergewindow.cpp:2735 #, kde-format msgid "" "Simulated merge complete: Check if you agree with the proposed operations." msgstr "Якҷояшавӣ ба анҷом расид. Оё шумо бо тағйиротҳои додашуда розӣ ҳастед?" -#: directorymergewindow.cpp:2758 +#: directorymergewindow.cpp:2771 #, fuzzy, kde-format #| msgid "An error occurred. Press OK to see detailed information.\n" msgid "An error occurred. Press OK to see detailed information." msgstr "Хатогӣ ба амал омад. Барои ахбороти илова OK-ро пахш кунед.\n" -#: directorymergewindow.cpp:2791 +#: directorymergewindow.cpp:2804 #, kde-format msgid "Error: While deleting %1: Creating backup failed." msgstr "Хатогӣ: Наметавонам нусхаи захираро эҷод кунам %1." -#: directorymergewindow.cpp:2798 +#: directorymergewindow.cpp:2811 #, kde-format msgid "delete directory recursively( %1 )" msgstr "нест кардани каталог рекурсивӣ( %1 )" -#: directorymergewindow.cpp:2800 +#: directorymergewindow.cpp:2813 #, kde-format msgid "delete( %1 )" msgstr "нест кардан( %1 )" -#: directorymergewindow.cpp:2815 +#: directorymergewindow.cpp:2828 #, kde-format msgid "Error: delete dir operation failed while trying to read the directory." msgstr "Хатогӣ: наметавонам каталогро нест кунам." -#: directorymergewindow.cpp:2834 +#: directorymergewindow.cpp:2847 #, kde-format msgid "Error: rmdir( %1 ) operation failed." msgstr "Хатогӣ: хатогии rmdir( %1 )." -#: directorymergewindow.cpp:2844 +#: directorymergewindow.cpp:2857 #, kde-format msgid "Error: delete operation failed." msgstr "Хатогӣ: наметавонам нест кунам." -#: directorymergewindow.cpp:2870 +#: directorymergewindow.cpp:2884 #, kde-format msgid "manual merge( %1, %2, %3 -> %4)" msgstr "якҷояшавии дастӣ( %1, %2, %3 -> %4)" -#: directorymergewindow.cpp:2873 +#: directorymergewindow.cpp:2887 #, kde-format msgid "" " Note: After a manual merge the user should continue by pressing F7." msgstr " Қайд: Баъди анҷоми якҷояшавии дастӣ F7-ро пахш кунед." -#: directorymergewindow.cpp:2900 +#: directorymergewindow.cpp:2914 #, kde-format msgid "Error: copy( %1 -> %2 ) failed.Deleting existing destination failed." msgstr "" "Хатогӣ: наметавонам( %1 -> %2 ) нусха кунам. Нест кардани муайяни вуҷулшуда " "муяссар карда нашуд." -#: directorymergewindow.cpp:2909 +#: directorymergewindow.cpp:2923 #, kde-format msgid "copyLink( %1 -> %2 )" msgstr "бадарғаи нишонавӣ( %1 -> %2 )" -#: directorymergewindow.cpp:2918 +#: directorymergewindow.cpp:2932 #, kde-format msgid "Error: copyLink failed: Remote links are not yet supported." msgstr "Хатогӣ: Бадарғаҳои нестшуда пуштибонӣ карда намешаванд." -#: directorymergewindow.cpp:2928 +#: directorymergewindow.cpp:2942 #, kde-format msgid "Error: copyLink failed." msgstr "Хатогӣ: наметавонам бадарғаро эҷод кунам." -#: directorymergewindow.cpp:2953 +#: directorymergewindow.cpp:2967 #, kde-format msgid "copy( %1 -> %2 )" msgstr "нусха кардани ( %1 -> %2 )" -#: directorymergewindow.cpp:2979 +#: directorymergewindow.cpp:2993 #, kde-format msgid "Error during rename( %1 -> %2 ): Cannot delete existing destination." msgstr "" "Хатогӣ дар вақти тағйири ном( %1 -> %2 ): Наметавонам муайяни вуҷудшударо " "нест кунам." -#: directorymergewindow.cpp:2986 +#: directorymergewindow.cpp:3000 #, kde-format msgid "rename( %1 -> %2 )" msgstr "тағйири ном( %1 -> %2 )" -#: directorymergewindow.cpp:2995 +#: directorymergewindow.cpp:3009 #, kde-format msgid "Error: Rename failed." msgstr "Хатогӣ: Наметавонам тағйири номро кунам." -#: directorymergewindow.cpp:3013 +#: directorymergewindow.cpp:3027 #, kde-format msgid "Error during makeDir of %1. Cannot delete existing file." msgstr "" "Хатогӣ дар вақти эҷод кардани каталоги %1. Файли вуҷудшуда нест карда " "намешавад." -#: directorymergewindow.cpp:3030 +#: directorymergewindow.cpp:3044 #, kde-format msgid "makeDir( %1 )" msgstr "эҷоди каталог( %1 )" -#: directorymergewindow.cpp:3040 +#: directorymergewindow.cpp:3054 #, kde-format msgid "Error while creating directory." msgstr "Хатогӣ дар вақти эҷод кардани каталог." -#: directorymergewindow.cpp:3076 directorymergewindow.cpp:3195 +#: directorymergewindow.cpp:3090 directorymergewindow.cpp:3209 #, kde-format msgid "Dest" msgstr "Муайяншуда" -#: directorymergewindow.cpp:3084 directorymergewindow.cpp:3113 +#: directorymergewindow.cpp:3098 directorymergewindow.cpp:3127 #, kde-format msgid "Dir" msgstr "Каталог" -#: directorymergewindow.cpp:3084 +#: directorymergewindow.cpp:3098 #, kde-format msgid "Type" msgstr "Шакл" -#: directorymergewindow.cpp:3084 +#: directorymergewindow.cpp:3098 #, kde-format msgid "Size" msgstr "Андоза" -#: directorymergewindow.cpp:3085 +#: directorymergewindow.cpp:3099 #, kde-format msgid "Attr" msgstr "Хусусиятҳо" -#: directorymergewindow.cpp:3085 +#: directorymergewindow.cpp:3099 #, kde-format msgid "Last Modification" msgstr "Тағйироти охирон" -#: directorymergewindow.cpp:3085 +#: directorymergewindow.cpp:3099 #, kde-format msgid "Link-Destination" msgstr "Бадарғаи-объект" -#: directorymergewindow.cpp:3113 +#: directorymergewindow.cpp:3127 #, kde-format msgid "File" msgstr "" -#: directorymergewindow.cpp:3113 +#: directorymergewindow.cpp:3127 #, fuzzy, kde-format #| msgid "Link: " msgid "-Link" msgstr "Алоқа: " -#: directorymergewindow.cpp:3119 +#: directorymergewindow.cpp:3133 #, kde-format msgid "not available" msgstr "дастрас нест" -#: directorymergewindow.cpp:3137 +#: directorymergewindow.cpp:3151 #, kde-format msgid "A (Dest): " msgstr "A (муайяншуда): " -#: directorymergewindow.cpp:3141 +#: directorymergewindow.cpp:3155 #, kde-format msgid "A: " msgstr "" -#: directorymergewindow.cpp:3141 +#: directorymergewindow.cpp:3155 #, kde-format msgid "A (Base): " msgstr "A (баромад): " -#: directorymergewindow.cpp:3147 +#: directorymergewindow.cpp:3161 #, kde-format msgid "B (Dest): " msgstr "B (муайяншуда): " -#: directorymergewindow.cpp:3151 +#: directorymergewindow.cpp:3165 #, kde-format msgid "B: " msgstr "" -#: directorymergewindow.cpp:3156 +#: directorymergewindow.cpp:3170 #, kde-format msgid "C (Dest): " msgstr "C (муайяншуда): " -#: directorymergewindow.cpp:3160 +#: directorymergewindow.cpp:3174 #, kde-format msgid "C: " msgstr "" -#: directorymergewindow.cpp:3163 +#: directorymergewindow.cpp:3177 #, kde-format msgid "Dest: " msgstr "Муаяйншуда: " #. i18n("Saving Directory Merge State ...")); -#: directorymergewindow.cpp:3238 +#: directorymergewindow.cpp:3252 #, fuzzy, kde-format msgid "Save Directory Merge State As..." msgstr "Хатогӣ дар вақти хониши каталог" -#: directorymergewindow.cpp:3387 +#: directorymergewindow.cpp:3401 #, kde-format msgid "Start/Continue Directory Merge" msgstr "Сар кардан/давом додани якҷояшаии каталогҳо" -#: directorymergewindow.cpp:3388 +#: directorymergewindow.cpp:3402 #, kde-format msgid "Run Operation for Current Item" msgstr "Ба кор даровардан барои нуқтаи ҷорӣ" -#: directorymergewindow.cpp:3389 +#: directorymergewindow.cpp:3403 #, kde-format msgid "Compare Selected File" msgstr "Муқоисаи файли интихобшуда" -#: directorymergewindow.cpp:3390 +#: directorymergewindow.cpp:3404 #, kde-format msgid "Merge Current File" msgstr "Якҷоя кардани файли ҷорӣ" -#: directorymergewindow.cpp:3390 +#: directorymergewindow.cpp:3404 #, fuzzy, kde-format #| msgid "Merge" msgid "" @@ -834,147 +834,152 @@ "File" msgstr "Пайваст кардан" -#: directorymergewindow.cpp:3391 +#: directorymergewindow.cpp:3405 #, kde-format msgid "Fold All Subdirs" msgstr "Дохили ҳамаи зеркаталогҳо" -#: directorymergewindow.cpp:3392 +#: directorymergewindow.cpp:3406 #, kde-format msgid "Unfold All Subdirs" msgstr "Дохилнашудаи ҳамаи зеркаталогҳо" #. i18n("Save Directory Merge State ..."), 0, this, &DirectoryMergeWindow::slotSaveMergeState, ac, "dir_save_merge_state"); #. i18n("Load Directory Merge State ..."), 0, this, &DirectoryMergeWindow::slotLoadMergeState, ac, "dir_load_merge_state"); -#: directorymergewindow.cpp:3396 +#: directorymergewindow.cpp:3410 #, kde-format msgid "Choose A for All Items" msgstr "Интихоби A барои ҳама" -#: directorymergewindow.cpp:3397 +#: directorymergewindow.cpp:3411 #, kde-format msgid "Choose B for All Items" msgstr "Интихоби B барои ҳама" -#: directorymergewindow.cpp:3398 +#: directorymergewindow.cpp:3412 #, kde-format msgid "Choose C for All Items" msgstr "Интихоби C барои ҳама" -#: directorymergewindow.cpp:3399 +#: directorymergewindow.cpp:3413 #, kde-format msgid "Auto-Choose Operation for All Items" msgstr "Худ-интихобкунии шакли амал барои ҳама" -#: directorymergewindow.cpp:3400 +#: directorymergewindow.cpp:3414 #, kde-format msgid "No Operation for All Items" msgstr "Гирифтани амалҳо барои ҳама" #. i18n("Synchronize Directories"), 0, this, &DirectoryMergeWindow::slotSynchronizeDirectories, ac, "dir_synchronize_directories"); #. d->m_pDirChooseNewerFiles = GuiUtils::createAction< KToggleAction >(i18n("Copy Newer Files Instead of Merging"), 0, this, &DirectoryMergeWindow::slotChooseNewerFiles, ac, "dir_choose_newer_files"); -#: directorymergewindow.cpp:3405 +#: directorymergewindow.cpp:3419 #, kde-format msgid "Show Identical Files" msgstr "" -#: directorymergewindow.cpp:3405 +#: directorymergewindow.cpp:3419 #, kde-format msgid "" "Identical\n" "Files" msgstr "" -#: directorymergewindow.cpp:3406 +#: directorymergewindow.cpp:3420 #, fuzzy, kde-format msgid "Show Different Files" msgstr "Миқдори файлҳои ҳархела:" -#: directorymergewindow.cpp:3407 +#: directorymergewindow.cpp:3421 #, kde-format msgid "Show Files only in A" msgstr "" -#: directorymergewindow.cpp:3407 +#: directorymergewindow.cpp:3421 #, kde-format msgid "" "Files\n" "only in A" msgstr "" -#: directorymergewindow.cpp:3408 +#: directorymergewindow.cpp:3422 #, kde-format msgid "Show Files only in B" msgstr "" -#: directorymergewindow.cpp:3408 +#: directorymergewindow.cpp:3422 #, kde-format msgid "" "Files\n" "only in B" msgstr "" -#: directorymergewindow.cpp:3409 +#: directorymergewindow.cpp:3423 #, kde-format msgid "Show Files only in C" msgstr "" -#: directorymergewindow.cpp:3409 +#: directorymergewindow.cpp:3423 #, kde-format msgid "" "Files\n" "only in C" msgstr "" -#: directorymergewindow.cpp:3413 +#: directorymergewindow.cpp:3427 #, fuzzy, kde-format msgid "Compare Explicitly Selected Files" msgstr "Муқоисаи файли интихобшуда" -#: directorymergewindow.cpp:3414 +#: directorymergewindow.cpp:3428 #, fuzzy, kde-format msgid "Merge Explicitly Selected Files" msgstr "Муқоисаи файли интихобшуда" -#: directorymergewindow.cpp:3416 directorymergewindow.cpp:3423 +#: directorymergewindow.cpp:3430 directorymergewindow.cpp:3437 #, kde-format msgid "Do Nothing" msgstr "Ягон чиз" -#: directorymergewindow.cpp:3428 +#: directorymergewindow.cpp:3442 #, fuzzy, kde-format msgid "Delete A && B" msgstr "Нест кардани А ва В" -#: directorymergewindow.cpp:3431 +#: directorymergewindow.cpp:3445 #, fuzzy, kde-format msgid "Merge to A && B" msgstr "Пайваст кардан ба A & В" -#: fileaccess.cpp:462 SourceData.cpp:493 +#: fileaccess.cpp:301 +#, kde-format +msgid "Unable to determine full url. No parent specified." +msgstr "" + +#: fileaccess.cpp:482 SourceData.cpp:506 #, fuzzy, kde-format #| msgid "Reading file: %1" msgid "Failed to read file: %1" msgstr "Хониши файл: %1" -#: fileaccess.cpp:587 +#: fileaccess.cpp:624 #, kde-format msgid "Creating temp copy of %1 failed." msgstr "Наметавонам нусхаи яквақтаро эҷод кунам %1." -#: fileaccess.cpp:595 fileaccess.cpp:600 +#: fileaccess.cpp:632 fileaccess.cpp:637 #, fuzzy, kde-format #| msgid "Opening %1 failed." msgid "Opening %1 failed. %2" msgstr "Кушодан %1 нашуд." -#: fileaccess.cpp:619 fileaccess.cpp:627 +#: fileaccess.cpp:656 fileaccess.cpp:664 #, fuzzy, kde-format #| msgid "Error reading from %1" msgid "Error reading from %1. %2" msgstr "Хатогӣ дар вақти хониш аз %1" -#: fileaccess.cpp:751 +#: fileaccess.cpp:788 #, fuzzy, kde-format #| msgid "" #| "While trying to make a backup, deleting an older backup failed. \n" @@ -986,7 +991,7 @@ "Наметавонам нусхаи кӯҳнаи захираро нест кунам. \n" "Номи файл: " -#: fileaccess.cpp:758 +#: fileaccess.cpp:795 #, fuzzy, kde-format #| msgid "" #| "While trying to make a backup, renaming failed. \n" @@ -998,181 +1003,181 @@ "Наметавонам номгузориро ҳал кунам. \n" "Номи файлҳо: " -#: fileaccess.cpp:828 +#: fileaccess.cpp:865 #, kde-format msgid "Getting file status: %1" msgstr "Гирифтани ҳолати файл: %1" -#: fileaccess.cpp:869 +#: fileaccess.cpp:906 #, kde-format msgid "Reading file: %1" msgstr "Хониши файл: %1" -#: fileaccess.cpp:907 +#: fileaccess.cpp:944 #, kde-format msgid "Writing file: %1" msgstr "Навишти файл: %1" -#: fileaccess.cpp:940 +#: fileaccess.cpp:977 #, kde-format msgid "Out of memory" msgstr "Аз хотира" -#: fileaccess.cpp:976 +#: fileaccess.cpp:1013 #, kde-format msgid "Making directory: %1" msgstr "Эҷоди каталогҳо : %1" -#: fileaccess.cpp:997 +#: fileaccess.cpp:1034 #, kde-format msgid "Removing directory: %1" msgstr "Дур кардани директория: %1" -#: fileaccess.cpp:1012 +#: fileaccess.cpp:1049 #, kde-format msgid "Removing file: %1" msgstr "Дур кардани файл: %1" -#: fileaccess.cpp:1028 +#: fileaccess.cpp:1065 #, kde-format msgid "Creating symbolic link: %1 -> %2" msgstr "Сохтани пайвасти рамзӣ: %1-> %2" -#: fileaccess.cpp:1052 +#: fileaccess.cpp:1089 #, kde-format msgid "Renaming file: %1 -> %2" msgstr "Аз нав номгузории файл: %1-> %2" -#: fileaccess.cpp:1086 +#: fileaccess.cpp:1123 #, kde-format msgid "Copying file: %1 -> %2" msgstr "Нусха бардошатани: %1-> %2" -#: fileaccess.cpp:1108 +#: fileaccess.cpp:1145 #, fuzzy, kde-format #| msgid "Reading directory: " msgid "Reading directory: %1" msgstr "Хондани директория: " -#: fileaccess.cpp:1162 +#: fileaccess.cpp:1202 #, kde-format msgid "Listing directory: %1" msgstr "Нигоҳ кардани директория: %1" -#: kdiff3.cpp:181 +#: kdiff3.cpp:182 #, fuzzy, kde-format msgid "Current Configuration:" msgstr "Тағйироти ҳамаи якҷошавиҳо" -#: kdiff3.cpp:186 +#: kdiff3.cpp:187 #, fuzzy, kde-format msgid "Config Option Error:" msgstr "Хатогӣ дар кушодани файл" -#: kdiff3.cpp:240 +#: kdiff3.cpp:246 #, kde-format msgid "Option --auto used, but no output file specified." msgstr "Интихоб --худ истифода шуда, аммо ягон файли хуруҷ муайян карда нашуд." -#: kdiff3.cpp:416 +#: kdiff3.cpp:405 #, kde-format msgid "Option --auto ignored for directory comparison." msgstr "Интихоб --худ аҳамият надиҳи барои муқоисаи директория." -#: kdiff3.cpp:460 +#: kdiff3.cpp:449 #, kde-format msgid "Saving failed." msgstr "Нигоҳ куни нашуд." -#: kdiff3.cpp:496 pdiff.cpp:1098 +#: kdiff3.cpp:494 pdiff.cpp:1096 #, kde-format msgid "Opening of these files failed:" msgstr "Кушодани ин файлҳо нашуд:" -#: kdiff3.cpp:505 -#, kde-format -msgid "File Open Error" +#: kdiff3.cpp:503 pdiff.cpp:1105 +#, fuzzy, kde-format +msgid "File open error" msgstr "Хатогӣ дар кушодани файл" -#: kdiff3.cpp:533 +#: kdiff3.cpp:532 #, kde-format msgid "Opens documents for comparison..." msgstr "Мекушояд документҳоро барои муқоиса..." -#: kdiff3.cpp:535 +#: kdiff3.cpp:534 #, fuzzy, kde-format #| msgid "Ready." msgid "Reload" msgstr "Тайёр аст." -#: kdiff3.cpp:538 +#: kdiff3.cpp:537 #, kde-format msgid "Saves the merge result. All conflicts must be solved!" msgstr "" "Нигоҳ медорад натиҷаи якҷошавиро. Ҳамаи ҷанҷолҳо бояд ҳал карда шаванд!" -#: kdiff3.cpp:540 +#: kdiff3.cpp:539 #, kde-format msgid "Saves the current document as..." msgstr "Нигоҳ медорад документи ҷориро мисли..." -#: kdiff3.cpp:543 +#: kdiff3.cpp:542 #, kde-format msgid "Print the differences" msgstr "" -#: kdiff3.cpp:546 +#: kdiff3.cpp:545 #, kde-format msgid "Quits the application" msgstr "Маҳкам мекунад аризаро" -#: kdiff3.cpp:549 +#: kdiff3.cpp:548 #, kde-format msgid "Cuts the selected section and puts it to the clipboard" msgstr "Мебурад қисми интихоб карда шударо ва меандозад онро ба клипборд" -#: kdiff3.cpp:552 +#: kdiff3.cpp:551 #, kde-format msgid "Copies the selected section to the clipboard" msgstr "Нусха мебардорад қисми интихоб карда шударо ба клипборд" -#: kdiff3.cpp:554 +#: kdiff3.cpp:553 #, fuzzy, kde-format #| msgid "Pastes the clipboard contents to actual position" msgid "Pastes the clipboard contents to current position" msgstr "Мечаспонад таркиботҳои клибордро ба ҷойгиршавии амалӣ" -#: kdiff3.cpp:557 +#: kdiff3.cpp:556 #, kde-format msgid "Select everything in current window" msgstr "" -#: kdiff3.cpp:560 +#: kdiff3.cpp:559 #, kde-format msgid "Search for a string" msgstr "Ковтукови ришта" -#: kdiff3.cpp:562 +#: kdiff3.cpp:561 #, kde-format msgid "Search again for the string" msgstr "Бори дигар ковтуков барои ришта" -#: kdiff3.cpp:567 +#: kdiff3.cpp:566 #, kde-format msgid "Enables/disables the statusbar" msgstr "Пайраҳаи ҳолати фаъол/ғайри фаъолро созед" -#: kdiff3.cpp:571 +#: kdiff3.cpp:570 #, kde-format msgid "Configure KDiff3..." msgstr "Танзимоти KDiff3..." -#: kdiff3.cpp:590 +#: kdiff3.cpp:589 #, kde-format msgid "Go to Current Delta" msgstr "Равед ба Делтаи Ҷори" -#: kdiff3.cpp:590 +#: kdiff3.cpp:589 #, fuzzy, kde-format #| msgid "Go to Current Delta" msgid "" @@ -1180,12 +1185,12 @@ "Delta" msgstr "Равед ба Делтаи Ҷори" -#: kdiff3.cpp:592 +#: kdiff3.cpp:591 #, kde-format msgid "Go to First Delta" msgstr "Равед ба Делтаи Аввала" -#: kdiff3.cpp:592 +#: kdiff3.cpp:591 #, fuzzy, kde-format #| msgid "Go to First Delta" msgid "" @@ -1193,12 +1198,12 @@ "Delta" msgstr "Равед ба Делтаи Аввала" -#: kdiff3.cpp:594 +#: kdiff3.cpp:593 #, kde-format msgid "Go to Last Delta" msgstr "Равед ба Делтаи Охирон" -#: kdiff3.cpp:594 +#: kdiff3.cpp:593 #, fuzzy, kde-format #| msgid "Go to Last Delta" msgid "" @@ -1206,24 +1211,24 @@ "Delta" msgstr "Равед ба Делтаи Охирон" -#: kdiff3.cpp:596 +#: kdiff3.cpp:595 #, kde-format msgid "(Skips white space differences when \"Show White Space\" is disabled.)" msgstr "" -#: kdiff3.cpp:597 +#: kdiff3.cpp:596 #, kde-format msgid "" "(Does not skip white space differences even when \"Show White Space\" is " "disabled.)" msgstr "" -#: kdiff3.cpp:598 +#: kdiff3.cpp:597 #, kde-format msgid "Go to Previous Delta" msgstr "Равед ба Делтаи Пешангӣ" -#: kdiff3.cpp:598 +#: kdiff3.cpp:597 #, fuzzy, kde-format #| msgid "Go to Previous Delta" msgid "" @@ -1231,12 +1236,12 @@ "Delta" msgstr "Равед ба Делтаи Пешангӣ" -#: kdiff3.cpp:600 +#: kdiff3.cpp:599 #, kde-format msgid "Go to Next Delta" msgstr "Равед ба Делтаи Дар пеш интизор" -#: kdiff3.cpp:600 +#: kdiff3.cpp:599 #, fuzzy, kde-format #| msgid "Go to Next Delta" msgid "" @@ -1244,24 +1249,24 @@ "Delta" msgstr "Равед ба Делтаи Дар пеш интизор" -#: kdiff3.cpp:602 +#: kdiff3.cpp:601 #, kde-format msgid "Go to Previous Conflict" msgstr "Равед ба Ҷанҷоли Пешангӣ" -#: kdiff3.cpp:602 +#: kdiff3.cpp:601 #, fuzzy, kde-format msgid "" "Prev\n" "Conflict" msgstr "Якҷояшавӣ ба анҷом расид" -#: kdiff3.cpp:604 +#: kdiff3.cpp:603 #, kde-format msgid "Go to Next Conflict" msgstr "Равед ба Ҷанҷоли Дар пеш интизор " -#: kdiff3.cpp:604 +#: kdiff3.cpp:603 #, fuzzy, kde-format #| msgid "Go to Next Conflict" msgid "" @@ -1269,12 +1274,12 @@ "Conflict" msgstr "Равед ба Ҷанҷоли Дар пеш интизор " -#: kdiff3.cpp:606 +#: kdiff3.cpp:605 #, kde-format msgid "Go to Previous Unsolved Conflict" msgstr "Равед ба Ҷанҷоли Пешангии Ҳалнашуда" -#: kdiff3.cpp:606 +#: kdiff3.cpp:605 #, fuzzy, kde-format #| msgid "Unsolved" msgid "" @@ -1282,12 +1287,12 @@ "Unsolved" msgstr "Иҷозат дода нашуд" -#: kdiff3.cpp:608 +#: kdiff3.cpp:607 #, kde-format msgid "Go to Next Unsolved Conflict" msgstr "Равед ба Ҷанҷоли Дар пеш интизори Ҳалнашуда" -#: kdiff3.cpp:608 +#: kdiff3.cpp:607 #, fuzzy, kde-format #| msgid "Unsolved" msgid "" @@ -1295,85 +1300,85 @@ "Unsolved" msgstr "Иҷозат дода нашуд" -#: kdiff3.cpp:610 +#: kdiff3.cpp:609 #, kde-format msgid "Select Line(s) From A" msgstr "Интихоб кунед Рах(ҳо)-ро Аз А" -#: kdiff3.cpp:610 +#: kdiff3.cpp:609 #, kde-format msgid "" "Choose\n" "A" msgstr "" -#: kdiff3.cpp:611 +#: kdiff3.cpp:610 #, kde-format msgid "Select Line(s) From B" msgstr "Интихоб кунед Рах(ҳо)-ро Аз В" -#: kdiff3.cpp:611 +#: kdiff3.cpp:610 #, kde-format msgid "" "Choose\n" "B" msgstr "" -#: kdiff3.cpp:612 +#: kdiff3.cpp:611 #, kde-format msgid "Select Line(s) From C" msgstr "Интихоб кунед Рах(ҳо)-ро Аз С" -#: kdiff3.cpp:612 +#: kdiff3.cpp:611 #, kde-format msgid "" "Choose\n" "C" msgstr "" -#: kdiff3.cpp:613 +#: kdiff3.cpp:612 #, kde-format msgid "Automatically Go to Next Unsolved Conflict After Source Selection" msgstr "Зуд равед ба ҷанҷоли пешангии ҳалнашуда баъди интихоби сарчашма" -#: kdiff3.cpp:613 +#: kdiff3.cpp:612 #, kde-format msgid "" "Auto\n" "Next" msgstr "" -#: kdiff3.cpp:615 +#: kdiff3.cpp:614 #, fuzzy, kde-format #| msgid "Show Space && Tabulator Characters for Differences" msgid "Show Space && Tabulator Characters" msgstr "Нишон диҳед фосиларо && Феълҳои табулятори барои гуногуниҳо" -#: kdiff3.cpp:615 +#: kdiff3.cpp:614 #, kde-format msgid "" "White\n" "Characters" msgstr "" -#: kdiff3.cpp:616 +#: kdiff3.cpp:615 #, kde-format msgid "Show White Space" msgstr "Нишон диҳед фосиларо" -#: kdiff3.cpp:616 +#: kdiff3.cpp:615 #, kde-format msgid "" "White\n" "Deltas" msgstr "" -#: kdiff3.cpp:618 +#: kdiff3.cpp:617 #, kde-format msgid "Show Line Numbers" msgstr "Нишон диҳед рахи рақамҳоро" -#: kdiff3.cpp:618 +#: kdiff3.cpp:617 #, fuzzy, kde-format #| msgid "Show Line Numbers" msgid "" @@ -1381,194 +1386,194 @@ "Numbers" msgstr "Нишон диҳед рахи рақамҳоро" -#: kdiff3.cpp:620 +#: kdiff3.cpp:619 #, kde-format msgid "Automatically Solve Simple Conflicts" msgstr "Зуд ҳал мекунад ҷанҷолҳои оддиро" -#: kdiff3.cpp:621 +#: kdiff3.cpp:620 #, kde-format msgid "Set Deltas to Conflicts" msgstr "Танзим кунед делтаҳоро ба ҷанҷолҳо" -#: kdiff3.cpp:622 +#: kdiff3.cpp:621 #, kde-format msgid "Run Regular Expression Auto Merge" msgstr "" -#: kdiff3.cpp:623 +#: kdiff3.cpp:622 #, fuzzy, kde-format msgid "Automatically Solve History Conflicts" msgstr "Зуд ҳал мекунад ҷанҷолҳои оддиро" -#: kdiff3.cpp:624 +#: kdiff3.cpp:623 #, kde-format msgid "Split Diff At Selection" msgstr "" -#: kdiff3.cpp:625 +#: kdiff3.cpp:624 #, fuzzy, kde-format msgid "Join Selected Diffs" msgstr "Муқоисаи файли интихобшуда" -#: kdiff3.cpp:627 +#: kdiff3.cpp:626 #, kde-format msgid "Show Window A" msgstr "Нишон диҳед Тирезаи А-ро" -#: kdiff3.cpp:628 +#: kdiff3.cpp:627 #, kde-format msgid "Show Window B" msgstr "Нишон диҳед Тирезаи В-ро" -#: kdiff3.cpp:629 +#: kdiff3.cpp:628 #, kde-format msgid "Show Window C" msgstr "Нишон диҳед Тирезаи С-ро" -#: kdiff3.cpp:631 +#: kdiff3.cpp:630 #, kde-format msgid "Normal Overview" msgstr "Оддӣ аз назар гузарондан" -#: kdiff3.cpp:632 +#: kdiff3.cpp:631 #, kde-format msgid "A vs. B Overview" msgstr "Аз назар гузарондани A vs. B " -#: kdiff3.cpp:633 +#: kdiff3.cpp:632 #, kde-format msgid "A vs. C Overview" msgstr "Аз назар гузарондани A vs. C" -#: kdiff3.cpp:634 +#: kdiff3.cpp:633 #, kde-format msgid "B vs. C Overview" msgstr "Аз назар гузарондани B vs. C" -#: kdiff3.cpp:635 +#: kdiff3.cpp:634 #, kde-format msgid "Word Wrap Diff Windows" msgstr "Калимаи печидаи тирезаҳои гуногун" -#: kdiff3.cpp:636 +#: kdiff3.cpp:635 #, kde-format msgid "Add Manual Diff Alignment" msgstr "" -#: kdiff3.cpp:637 +#: kdiff3.cpp:636 #, kde-format msgid "Clear All Manual Diff Alignments" msgstr "" -#: kdiff3.cpp:639 +#: kdiff3.cpp:638 #, kde-format msgid "Focus Next Window" msgstr "Активация кардани дигар тиреза" -#: kdiff3.cpp:640 +#: kdiff3.cpp:639 #, kde-format msgid "Focus Prev Window" msgstr "Активация кардани тирезаи гузашта" -#: kdiff3.cpp:641 +#: kdiff3.cpp:640 #, kde-format msgid "Toggle Split Orientation" msgstr "Дигаркунӣ ва тақсимкунии ҷои исти худ" -#: kdiff3.cpp:643 +#: kdiff3.cpp:642 #, kde-format msgid "Dir && Text Split Screen View" msgstr "аппп" -#: kdiff3.cpp:645 +#: kdiff3.cpp:644 #, kde-format msgid "Toggle Between Dir && Text View" msgstr "Дигаркунӣ байни феҳристҳо && намоиши матн" -#: kdiff3.cpp:697 pdiff.cpp:1909 +#: kdiff3.cpp:696 pdiff.cpp:1919 #, fuzzy, kde-format #| msgid "The merge result hasn't been saved." msgid "The merge result has not been saved." msgstr "Натиҷаи иттиҳодия нигоҳ надоштагӣ." -#: kdiff3.cpp:699 +#: kdiff3.cpp:698 #, kde-format msgid "Save && Quit" msgstr "Нигоҳ доштан && баромадан" -#: kdiff3.cpp:700 +#: kdiff3.cpp:699 #, kde-format msgid "Quit Without Saving" msgstr "Бе нигоҳдорӣ баромадан" -#: kdiff3.cpp:708 pdiff.cpp:1920 +#: kdiff3.cpp:707 pdiff.cpp:1930 #, kde-format msgid "Saving the merge result failed." msgstr "Натиҷаи якҷоя кардан,нигоҳ дошта нашуд." -#: kdiff3.cpp:719 pdiff.cpp:1032 +#: kdiff3.cpp:718 pdiff.cpp:1030 #, kde-format msgid "" "You are currently doing a directory merge. Are you sure, you want to abort?" msgstr "Якҷояшавии каталогро нигоҳ дорем.Оё,шумо дилпур мехоҳед, баровардан?" -#: kdiff3.cpp:742 +#: kdiff3.cpp:741 #, kde-format msgid "Saving file..." msgstr "Нигоҳ доштани файл..." -#: kdiff3.cpp:759 +#: kdiff3.cpp:758 #, kde-format msgid "Saving file with a new filename..." msgstr "Бо номи нав нигоҳ доштани файл..." -#: kdiff3.cpp:761 +#: kdiff3.cpp:760 #, kde-format msgid "Save As..." msgstr "" -#: kdiff3.cpp:820 +#: kdiff3.cpp:819 #, fuzzy, kde-format msgid "Printing not implemented." msgstr "Якҷояшавӣ ба анҷом расид." -#: kdiff3.cpp:857 +#: kdiff3.cpp:858 #, fuzzy, kde-format msgid "Printing..." msgstr "Баромад..." -#: kdiff3.cpp:943 +#: kdiff3.cpp:948 #, kde-format msgid "Printing page %1 of %2" msgstr "" -#: kdiff3.cpp:1000 +#: kdiff3.cpp:1006 #, fuzzy, kde-format msgid " (Selection)" msgstr "Интихоб кунед Рах(ҳо)-ро Аз С" -#: kdiff3.cpp:1027 +#: kdiff3.cpp:1034 #, fuzzy, kde-format msgid "Printing completed." msgstr "Якҷояшавӣ ба анҷом расид." -#: kdiff3.cpp:1031 +#: kdiff3.cpp:1038 #, fuzzy, kde-format msgid "Printing aborted." msgstr "Якҷояшавӣ ба анҷом расид." -#: kdiff3.cpp:1038 +#: kdiff3.cpp:1045 #, kde-format msgid "Exiting..." msgstr "Баромад..." -#: kdiff3.cpp:1049 +#: kdiff3.cpp:1056 #, kde-format msgid "Toggling toolbar..." msgstr "Тасвир кардан/панели асбобҳои пинҳонӣ..." -#: kdiff3.cpp:1070 +#: kdiff3.cpp:1077 #, kde-format msgid "Toggle the statusbar..." msgstr "Тасвир кардан/вазъияти панели пинҳонӣ..." @@ -1594,7 +1599,7 @@ msgid "Joachim Eibl" msgstr "" -#: kdiff3_part.cpp:173 kdiff3_part.cpp:254 +#: kdiff3_part.cpp:174 kdiff3_part.cpp:255 #, fuzzy, kde-format #| msgid "Couldn't find files for comparison." msgid "Could not find files for comparison." @@ -1613,7 +1618,7 @@ msgstr "Танзимоти KDiff3..." #. i18n: ectx: ToolBar (mainToolBar) -#: kdiff3_part.rc:16 main.cpp:88 +#: kdiff3_part.rc:16 main.cpp:89 #, fuzzy, kde-format msgid "KDiff3" msgstr "KDiff3Part" @@ -1688,199 +1693,204 @@ msgid "Main Toolbar" msgstr "" -#: main.cpp:68 main.cpp:72 +#: main.cpp:69 main.cpp:73 #, kde-format msgid "Ignored. (User defined.)" msgstr "" -#: main.cpp:92 +#: main.cpp:93 #, kde-format msgid " (64 bit)" msgstr "" -#: main.cpp:94 +#: main.cpp:95 #, kde-format msgid " (32 bit)" msgstr "" -#: main.cpp:95 +#: main.cpp:96 #, kde-format msgid "Tool for Comparison and Merge of Files and Directories" msgstr "" -#: main.cpp:96 +#: main.cpp:97 #, kde-format msgid "(c) 2002-2014 Joachim Eibl, (c) 2017 Michael Reeves KF5/Qt5 port" msgstr "" -#: main.cpp:112 +#: main.cpp:113 #, kde-format msgid "Merge the input." msgstr "Якҷоя даровардан." -#: main.cpp:113 +#: main.cpp:114 #, kde-format msgid "Explicit base file. For compatibility with certain tools." msgstr "" "Эзоҳ додани маълумоти файл.Барои мутобиқ будан бо асбобҳои муқаррар- шуда." -#: main.cpp:114 +#: main.cpp:115 #, kde-format msgid "Output file. Implies -m. E.g.: -o newfile.txt" msgstr "Баромади файл.Тахмин кардани мавҷуд ҳамчун-m. Мисли: -o newfile.txt" -#: main.cpp:115 +#: main.cpp:116 #, kde-format msgid "Output file, again. (For compatibility with certain tools.)" msgstr "Барориши файл.(Барои мутобиқ бо асбобҳои монанд.)" -#: main.cpp:116 +#: main.cpp:118 #, kde-format msgid "No GUI if all conflicts are auto-solvable. (Needs -o file)" msgstr "" -#: main.cpp:117 +#: main.cpp:120 +#, kde-format +msgid "Ignored." +msgstr "" + +#: main.cpp:122 #, kde-format msgid "Do not solve conflicts automatically." msgstr "" -#: main.cpp:118 +#: main.cpp:123 #, kde-format msgid "Visible name replacement for input file 1 (base)." msgstr "" -#: main.cpp:119 +#: main.cpp:124 #, kde-format msgid "Visible name replacement for input file 2." msgstr "" -#: main.cpp:120 +#: main.cpp:125 #, kde-format msgid "Visible name replacement for input file 3." msgstr "" -#: main.cpp:121 +#: main.cpp:126 #, kde-format msgid "Alternative visible name replacement. Supply this once for every input." msgstr "" -#: main.cpp:122 +#: main.cpp:127 #, kde-format msgid "" "Override a config setting. Use once for every setting. E.g.: --cs " "\"AutoAdvance=1\"" msgstr "" -#: main.cpp:123 +#: main.cpp:128 #, kde-format msgid "Show list of config settings and current values." msgstr "" -#: main.cpp:124 +#: main.cpp:129 #, fuzzy, kde-format msgid "Use a different config file." msgstr "Миқдори файлҳои ҳархела:" -#: main.cpp:127 +#: main.cpp:132 #, kde-format msgid "file1 to open (base, if not specified via --base)" msgstr "" -#: main.cpp:128 +#: main.cpp:133 #, kde-format msgid "file2 to open" msgstr "" -#: main.cpp:129 +#: main.cpp:134 #, kde-format msgid "file3 to open" msgstr "" -#: main.cpp:153 +#: main.cpp:158 #, kde-format msgid "See kdiff3 --help for supported options." msgstr "" -#: mergeresultwindow.cpp:158 +#: mergeresultwindow.cpp:171 #, kde-format msgid "Choose A Everywhere" msgstr "Интихоб кунед А-ро дар ҳамаҷой" -#: mergeresultwindow.cpp:159 +#: mergeresultwindow.cpp:172 #, kde-format msgid "Choose B Everywhere" msgstr "Интихоб кунед В-ро дар ҳамаҷой" -#: mergeresultwindow.cpp:160 +#: mergeresultwindow.cpp:173 #, kde-format msgid "Choose C Everywhere" msgstr "Интихоб кунед В-ро дар ҳамаҷой" -#: mergeresultwindow.cpp:161 +#: mergeresultwindow.cpp:174 #, fuzzy, kde-format msgid "Choose A for All Unsolved Conflicts" msgstr "Интихоб кунед А-ро барои ҳамаи ҷанҷолҳои ҳалнашуда" -#: mergeresultwindow.cpp:162 +#: mergeresultwindow.cpp:175 #, fuzzy, kde-format msgid "Choose B for All Unsolved Conflicts" msgstr "Интихоб кунед В-ро барои ҳамаи ҷанҷолҳои ҳалнашуда" -#: mergeresultwindow.cpp:163 +#: mergeresultwindow.cpp:176 #, fuzzy, kde-format msgid "Choose C for All Unsolved Conflicts" msgstr "Интихоб кунед С-ро барои ҳамаи ҷанҷолҳои ҳалнашуда" -#: mergeresultwindow.cpp:164 +#: mergeresultwindow.cpp:177 #, fuzzy, kde-format msgid "Choose A for All Unsolved Whitespace Conflicts" msgstr "Интихоб кунед А-ро барои фосилаи ҳамаи ҷанҷолҳои ҳалнашуда" -#: mergeresultwindow.cpp:165 +#: mergeresultwindow.cpp:178 #, fuzzy, kde-format msgid "Choose B for All Unsolved Whitespace Conflicts" msgstr "Интихоб кунед В-ро барои фосилаи ҳамаи ҷанҷолҳои ҳалнашуда" -#: mergeresultwindow.cpp:166 +#: mergeresultwindow.cpp:179 #, fuzzy, kde-format msgid "Choose C for All Unsolved Whitespace Conflicts" msgstr "Интихоб кунед С-ро барои фосилаи ҳамаи ҷанҷолҳои ҳалнашуда" -#: mergeresultwindow.cpp:176 +#: mergeresultwindow.cpp:204 #, kde-format msgid "Number of remaining unsolved conflicts: %1 (of which %2 are whitespace)" msgstr "" -#: mergeresultwindow.cpp:370 +#: mergeresultwindow.cpp:398 #, kde-format msgid "" "The output has been modified.\n" "If you continue your changes will be lost." msgstr "" -#: mergeresultwindow.cpp:936 pdiff.cpp:827 +#: mergeresultwindow.cpp:964 pdiff.cpp:817 #, kde-format msgid "All input files are binary equal." msgstr "" -#: mergeresultwindow.cpp:938 +#: mergeresultwindow.cpp:966 #, kde-format msgid "All input files contain the same text." msgstr "" -#: mergeresultwindow.cpp:942 mergeresultwindow.cpp:946 -#: mergeresultwindow.cpp:950 pdiff.cpp:833 pdiff.cpp:837 pdiff.cpp:841 +#: mergeresultwindow.cpp:970 mergeresultwindow.cpp:974 +#: mergeresultwindow.cpp:978 pdiff.cpp:823 pdiff.cpp:827 pdiff.cpp:831 #, kde-format msgid "Files %1 and %2 are binary equal.\n" msgstr "" -#: mergeresultwindow.cpp:944 mergeresultwindow.cpp:948 -#: mergeresultwindow.cpp:952 +#: mergeresultwindow.cpp:972 mergeresultwindow.cpp:976 +#: mergeresultwindow.cpp:980 #, kde-format msgid "Files %1 and %2 have equal text.\n" msgstr "" -#: mergeresultwindow.cpp:958 +#: mergeresultwindow.cpp:986 #, kde-format msgid "" "Total number of conflicts: %1\n" @@ -1889,39 +1899,39 @@ "%4" msgstr "" -#: mergeresultwindow.cpp:964 +#: mergeresultwindow.cpp:992 #, kde-format msgid "Conflicts" msgstr "" -#: mergeresultwindow.cpp:1873 +#: mergeresultwindow.cpp:1901 #, kde-format msgid "" msgstr "" -#: mergeresultwindow.cpp:1881 +#: mergeresultwindow.cpp:1909 #, fuzzy, kde-format msgid "" msgstr "Якҷояшавӣ ба анҷом расид" -#: mergeresultwindow.cpp:1883 mergeresultwindow.cpp:2755 +#: mergeresultwindow.cpp:1911 mergeresultwindow.cpp:2783 #, fuzzy, kde-format msgid "" msgstr "Якҷояшавӣ ба анҷом расид" -#: mergeresultwindow.cpp:2967 +#: mergeresultwindow.cpp:2995 #, kde-format msgid "" "Not all conflicts are solved yet.\n" "File not saved." msgstr "" -#: mergeresultwindow.cpp:2969 mergeresultwindow.cpp:2978 +#: mergeresultwindow.cpp:2997 mergeresultwindow.cpp:3006 #, kde-format msgid "Conflicts Left" msgstr "" -#: mergeresultwindow.cpp:2976 +#: mergeresultwindow.cpp:3004 #, kde-format msgid "" "There is a line end style conflict. Please choose the line end style " @@ -1929,7 +1939,7 @@ "File not saved." msgstr "" -#: mergeresultwindow.cpp:2990 +#: mergeresultwindow.cpp:3018 #, kde-format msgid "" "\n" @@ -1937,57 +1947,57 @@ "Creating backup failed. File not saved." msgstr "" -#: mergeresultwindow.cpp:2990 mergeresultwindow.cpp:3038 +#: mergeresultwindow.cpp:3018 mergeresultwindow.cpp:3066 #, fuzzy, kde-format msgid "File Save Error" msgstr "Хатогӣ дар кушодани файл" -#: mergeresultwindow.cpp:3038 +#: mergeresultwindow.cpp:3066 #, fuzzy, kde-format msgid "Error while writing." msgstr "Хатогӣ дар вақти эҷод кардани каталог." -#: mergeresultwindow.cpp:3110 +#: mergeresultwindow.cpp:3138 #, kde-format msgid "Output:" msgstr "" -#: mergeresultwindow.cpp:3123 mergeresultwindow.cpp:3315 +#: mergeresultwindow.cpp:3151 mergeresultwindow.cpp:3343 #, kde-format msgid "[Modified]" msgstr "" -#: mergeresultwindow.cpp:3130 +#: mergeresultwindow.cpp:3158 #, kde-format msgid "Encoding for saving:" msgstr "" -#: mergeresultwindow.cpp:3230 +#: mergeresultwindow.cpp:3258 #, fuzzy, kde-format msgid "Conflict" msgstr "Якҷояшавӣ ба анҷом расид" -#: mergeresultwindow.cpp:3262 +#: mergeresultwindow.cpp:3290 #, kde-format msgid "Codec from A: %1" msgstr "" -#: mergeresultwindow.cpp:3264 +#: mergeresultwindow.cpp:3292 #, kde-format msgid "Codec from B: %1" msgstr "" -#: mergeresultwindow.cpp:3266 +#: mergeresultwindow.cpp:3294 #, kde-format msgid "Codec from C: %1" msgstr "" -#: optiondialog.cpp:119 +#: optiondialog.cpp:121 #, kde-format msgid "Change Font" msgstr "" -#: optiondialog.cpp:135 optiondialog.cpp:145 +#: optiondialog.cpp:137 optiondialog.cpp:147 #, kde-format msgid "" "Font: %1, %2, %3\n" @@ -1995,206 +2005,206 @@ "Example:" msgstr "" -#: optiondialog.cpp:388 +#: optiondialog.cpp:390 #, kde-format msgid "Unicode" msgstr "" -#: optiondialog.cpp:389 +#: optiondialog.cpp:391 #, kde-format msgid "Latin1" msgstr "" -#: optiondialog.cpp:408 +#: optiondialog.cpp:410 #, kde-format msgid "Change this if non-ASCII characters are not displayed correctly." msgstr "" -#: optiondialog.cpp:491 +#: optiondialog.cpp:495 #, fuzzy, kde-format msgid "Configure" msgstr "Танзимоти KDiff3..." -#: optiondialog.cpp:568 +#: optiondialog.cpp:573 #, kde-format msgid "Font" msgstr "" -#: optiondialog.cpp:570 +#: optiondialog.cpp:575 #, kde-format msgid "Editor & Diff Output Font" msgstr "" -#: optiondialog.cpp:589 +#: optiondialog.cpp:594 #, kde-format msgid "Application font" msgstr "" -#: optiondialog.cpp:594 +#: optiondialog.cpp:599 #, fuzzy, kde-format msgid "File view font" msgstr "Хатогӣ дар кушодани файл" -#: optiondialog.cpp:613 +#: optiondialog.cpp:618 #, kde-format msgctxt "Title for color settings page" msgid "Color" msgstr "" -#: optiondialog.cpp:614 +#: optiondialog.cpp:619 #, kde-format msgid "Colors Settings" msgstr "" -#: optiondialog.cpp:631 +#: optiondialog.cpp:644 #, kde-format msgid "Editor and Diff Views:" msgstr "" -#: optiondialog.cpp:639 +#: optiondialog.cpp:652 #, kde-format msgid "Foreground color:" msgstr "" -#: optiondialog.cpp:647 +#: optiondialog.cpp:660 #, kde-format msgid "Background color:" msgstr "" -#: optiondialog.cpp:657 +#: optiondialog.cpp:670 #, kde-format msgid "Diff background color:" msgstr "" -#: optiondialog.cpp:666 +#: optiondialog.cpp:679 #, kde-format msgid "Color A:" msgstr "" -#: optiondialog.cpp:675 +#: optiondialog.cpp:688 #, kde-format msgid "Color B:" msgstr "" -#: optiondialog.cpp:684 +#: optiondialog.cpp:697 #, kde-format msgid "Color C:" msgstr "" -#: optiondialog.cpp:692 +#: optiondialog.cpp:705 #, kde-format msgid "Conflict color:" msgstr "" -#: optiondialog.cpp:701 +#: optiondialog.cpp:714 #, kde-format msgid "Current range background color:" msgstr "" -#: optiondialog.cpp:710 +#: optiondialog.cpp:723 #, kde-format msgid "Current range diff background color:" msgstr "" -#: optiondialog.cpp:718 +#: optiondialog.cpp:731 #, kde-format msgid "Color for manually aligned difference ranges:" msgstr "" -#: optiondialog.cpp:725 +#: optiondialog.cpp:738 #, fuzzy, kde-format msgid "Directory Comparison View:" msgstr "Ҳолати муқоисакунии каталогҳо" -#: optiondialog.cpp:731 +#: optiondialog.cpp:744 #, kde-format msgid "Newest file color:" msgstr "" -#: optiondialog.cpp:736 +#: optiondialog.cpp:749 #, kde-format msgid "" "Changing this color will only be effective when starting the next directory " "comparison." msgstr "" -#: optiondialog.cpp:741 +#: optiondialog.cpp:754 #, kde-format msgid "Oldest file color:" msgstr "" -#: optiondialog.cpp:750 +#: optiondialog.cpp:763 #, kde-format msgid "Middle age file color:" msgstr "" -#: optiondialog.cpp:759 +#: optiondialog.cpp:772 #, kde-format msgid "Color for missing files:" msgstr "" -#: optiondialog.cpp:773 +#: optiondialog.cpp:786 #, kde-format msgid "Editor" msgstr "" -#: optiondialog.cpp:774 +#: optiondialog.cpp:787 #, kde-format msgid "Editor Behavior" msgstr "" -#: optiondialog.cpp:787 +#: optiondialog.cpp:809 #, kde-format msgid "Tab inserts spaces" msgstr "" -#: optiondialog.cpp:791 +#: optiondialog.cpp:813 #, kde-format msgid "" "On: Pressing tab generates the appropriate number of spaces.\n" "Off: A tab character will be inserted." msgstr "" -#: optiondialog.cpp:796 +#: optiondialog.cpp:818 #, kde-format msgid "Tab size:" msgstr "" -#: optiondialog.cpp:803 +#: optiondialog.cpp:825 #, kde-format msgid "Auto indentation" msgstr "" -#: optiondialog.cpp:807 +#: optiondialog.cpp:829 #, kde-format msgid "On: The indentation of the previous line is used for a new line.\n" msgstr "" -#: optiondialog.cpp:810 +#: optiondialog.cpp:832 #, kde-format msgid "Auto copy selection" msgstr "" -#: optiondialog.cpp:814 +#: optiondialog.cpp:836 #, kde-format msgid "" "On: Any selection is immediately written to the clipboard.\n" "Off: You must explicitly copy e.g. via Ctrl-C." msgstr "" -#: optiondialog.cpp:829 +#: optiondialog.cpp:851 #, kde-format msgid "" "Sets the line endings for when an edited file is saved.\n" "DOS/Windows: CR+LF; UNIX: LF; with CR=0D, LF=0A" msgstr "" -#: optiondialog.cpp:839 +#: optiondialog.cpp:861 #, fuzzy, kde-format msgid "Diff" msgstr "KDiff3Part" -#: optiondialog.cpp:840 +#: optiondialog.cpp:862 #, fuzzy, kde-format msgid "Diff Settings" msgstr "Воситаи муқоиса ва якҷоя кардан" @@ -2208,12 +2218,12 @@ #. ); #. ++line; #. -#: optiondialog.cpp:865 +#: optiondialog.cpp:896 #, kde-format msgid "Ignore numbers (treat as white space)" msgstr "" -#: optiondialog.cpp:869 +#: optiondialog.cpp:900 #, kde-format msgid "" "Ignore number characters during line matching phase. (Similar to Ignore " @@ -2221,66 +2231,66 @@ "Might help to compare files with numeric data." msgstr "" -#: optiondialog.cpp:873 +#: optiondialog.cpp:904 #, kde-format msgid "Ignore C/C++ comments (treat as white space)" msgstr "" -#: optiondialog.cpp:876 +#: optiondialog.cpp:907 #, kde-format msgid "Treat C/C++ comments like white space." msgstr "" -#: optiondialog.cpp:879 +#: optiondialog.cpp:910 #, kde-format msgid "Ignore case (treat as white space)" msgstr "" -#: optiondialog.cpp:883 +#: optiondialog.cpp:914 #, kde-format msgid "Treat case differences like white space changes. ('a'<=>'A')" msgstr "" -#: optiondialog.cpp:886 +#: optiondialog.cpp:917 #, kde-format msgid "Preprocessor command:" msgstr "" -#: optiondialog.cpp:891 +#: optiondialog.cpp:922 #, kde-format msgid "User defined pre-processing. (See the docs for details.)" msgstr "" -#: optiondialog.cpp:894 +#: optiondialog.cpp:925 #, kde-format msgid "Line-matching preprocessor command:" msgstr "" -#: optiondialog.cpp:899 +#: optiondialog.cpp:930 #, kde-format msgid "" "This pre-processor is only used during line matching.\n" "(See the docs for details.)" msgstr "" -#: optiondialog.cpp:902 +#: optiondialog.cpp:933 #, kde-format msgid "Try hard (slower)" msgstr "" -#: optiondialog.cpp:906 +#: optiondialog.cpp:937 #, kde-format msgid "" "Enables the --minimal option for the external diff.\n" "The analysis of big files will be much slower." msgstr "" -#: optiondialog.cpp:910 +#: optiondialog.cpp:941 #, kde-format msgid "Align B and C for 3 input files" msgstr "" -#: optiondialog.cpp:914 +#: optiondialog.cpp:945 #, kde-format msgid "" "Try to align B and C when comparing or merging three input files.\n" @@ -2288,67 +2298,74 @@ "(Default is off.)" msgstr "" -#: optiondialog.cpp:926 +#: optiondialog.cpp:956 +#, fuzzy, kde-format +#| msgid "Merge" +msgctxt "Settings page" +msgid "Merge" +msgstr "Пайваст кардан" + +#: optiondialog.cpp:957 #, fuzzy, kde-format msgid "Merge Settings" msgstr "Воситаи муқоиса ва якҷоя кардан" -#: optiondialog.cpp:940 +#: optiondialog.cpp:980 #, kde-format msgid "Auto advance delay (ms):" msgstr "" -#: optiondialog.cpp:946 +#: optiondialog.cpp:986 #, kde-format 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 "" -#: optiondialog.cpp:950 +#: optiondialog.cpp:990 #, fuzzy, kde-format #| msgid "Show Window A" msgid "Show info dialogs" msgstr "Нишон диҳед Тирезаи А-ро" -#: optiondialog.cpp:953 +#: optiondialog.cpp:993 #, kde-format msgid "Show a dialog with information about the number of conflicts." msgstr "" -#: optiondialog.cpp:956 +#: optiondialog.cpp:996 #, kde-format msgid "White space 2-file merge default:" msgstr "" -#: optiondialog.cpp:961 optiondialog.cpp:974 +#: optiondialog.cpp:1001 optiondialog.cpp:1014 #, kde-format msgid "Manual Choice" msgstr "" -#: optiondialog.cpp:965 optiondialog.cpp:979 +#: optiondialog.cpp:1005 optiondialog.cpp:1019 #, kde-format msgid "" "Allow the merge algorithm to automatically select an input for white-space-" "only changes." msgstr "" -#: optiondialog.cpp:969 +#: optiondialog.cpp:1009 #, kde-format msgid "White space 3-file merge default:" msgstr "" -#: optiondialog.cpp:983 +#: optiondialog.cpp:1023 #, kde-format msgid "Automatic Merge Regular Expression" msgstr "" -#: optiondialog.cpp:991 smalldialogs.cpp:449 +#: optiondialog.cpp:1031 smalldialogs.cpp:459 #, kde-format msgid "Auto merge regular expression:" msgstr "" -#: optiondialog.cpp:996 +#: optiondialog.cpp:1036 #, kde-format msgid "" "Regular expression for lines where KDiff3 should automatically choose one " @@ -2357,29 +2374,29 @@ "- if available - C, otherwise B will be chosen." msgstr "" -#: optiondialog.cpp:1002 +#: optiondialog.cpp:1042 #, kde-format msgid "Run regular expression auto merge on merge start" msgstr "" -#: optiondialog.cpp:1005 +#: optiondialog.cpp:1045 #, kde-format msgid "" "Run the merge for auto merge regular expressions\n" "immediately when a merge starts.\n" msgstr "" -#: optiondialog.cpp:1010 +#: optiondialog.cpp:1050 #, kde-format msgid "Version Control History Merging" msgstr "" -#: optiondialog.cpp:1018 smalldialogs.cpp:476 +#: optiondialog.cpp:1058 smalldialogs.cpp:486 #, kde-format msgid "History start regular expression:" msgstr "" -#: optiondialog.cpp:1023 +#: optiondialog.cpp:1063 #, kde-format msgid "" "Regular expression for the start of the version control history entry.\n" @@ -2387,12 +2404,12 @@ "Default value: \".*\\$Log.*\\$.*\"" msgstr "" -#: optiondialog.cpp:1029 smalldialogs.cpp:504 +#: optiondialog.cpp:1069 smalldialogs.cpp:514 #, kde-format msgid "History entry start regular expression:" msgstr "" -#: optiondialog.cpp:1042 +#: optiondialog.cpp:1082 #, kde-format msgid "" "A version control history entry consists of several lines.\n" @@ -2404,22 +2421,22 @@ "See the documentation for details." msgstr "" -#: optiondialog.cpp:1050 +#: optiondialog.cpp:1090 #, kde-format msgid "History merge sorting" msgstr "" -#: optiondialog.cpp:1053 +#: optiondialog.cpp:1093 #, kde-format msgid "Sort version control history by a key." msgstr "" -#: optiondialog.cpp:1063 +#: optiondialog.cpp:1103 #, kde-format msgid "History entry start sort key order:" msgstr "" -#: optiondialog.cpp:1068 +#: optiondialog.cpp:1108 #, kde-format msgid "" "Each pair of parentheses used in the regular expression for the history " @@ -2431,37 +2448,37 @@ "See the documentation for details." msgstr "" -#: optiondialog.cpp:1079 +#: optiondialog.cpp:1119 #, kde-format msgid "Merge version control history on merge start" msgstr "" -#: optiondialog.cpp:1082 +#: optiondialog.cpp:1122 #, kde-format msgid "Run version control history automerge on merge start." msgstr "" -#: optiondialog.cpp:1086 +#: optiondialog.cpp:1126 #, fuzzy, kde-format msgid "Max number of history entries:" msgstr "Миқдори зеркаталогҳо:" -#: optiondialog.cpp:1090 +#: optiondialog.cpp:1130 #, kde-format msgid "Cut off after specified number. Use -1 for infinite number of entries." msgstr "" -#: optiondialog.cpp:1094 +#: optiondialog.cpp:1134 #, kde-format msgid "Test your regular expressions" msgstr "" -#: optiondialog.cpp:1099 +#: optiondialog.cpp:1139 #, kde-format msgid "Irrelevant merge command:" msgstr "" -#: optiondialog.cpp:1104 +#: optiondialog.cpp:1144 #, kde-format msgid "" "If specified this script is run after automerge\n" @@ -2469,12 +2486,12 @@ "Called with the parameters: filename1 filename2 filename3" msgstr "" -#: optiondialog.cpp:1109 +#: optiondialog.cpp:1149 #, kde-format msgid "Auto save and quit on merge without conflicts" msgstr "" -#: optiondialog.cpp:1113 +#: optiondialog.cpp:1153 #, kde-format msgid "" "If KDiff3 was started for a file-merge from the command line and all\n" @@ -2483,27 +2500,27 @@ "(Similar to command line option \"--auto\".)" msgstr "" -#: optiondialog.cpp:1124 optiondialog.cpp:1125 +#: optiondialog.cpp:1164 optiondialog.cpp:1165 #, fuzzy, kde-format msgid "Directory" msgstr "Хониши каталоги А" -#: optiondialog.cpp:1137 +#: optiondialog.cpp:1185 #, fuzzy, kde-format msgid "Recursive directories" msgstr "Мушоҳидакунии каталогҳо..." -#: optiondialog.cpp:1140 +#: optiondialog.cpp:1188 #, fuzzy, kde-format msgid "Whether to analyze subdirectories or not." msgstr "Ҳуқуқҳои ин каталогҳоро тафтиш кунед." -#: optiondialog.cpp:1142 +#: optiondialog.cpp:1190 #, kde-format msgid "File pattern(s):" msgstr "" -#: optiondialog.cpp:1148 +#: optiondialog.cpp:1196 #, kde-format msgid "" "Pattern(s) of files to be analyzed. \n" @@ -2511,12 +2528,12 @@ "Several Patterns can be specified by using the separator: ';'" msgstr "" -#: optiondialog.cpp:1153 +#: optiondialog.cpp:1201 #, kde-format msgid "File-anti-pattern(s):" msgstr "" -#: optiondialog.cpp:1159 +#: optiondialog.cpp:1207 #, kde-format msgid "" "Pattern(s) of files to be excluded from analysis. \n" @@ -2524,12 +2541,12 @@ "Several Patterns can be specified by using the separator: ';'" msgstr "" -#: optiondialog.cpp:1164 +#: optiondialog.cpp:1212 #, kde-format msgid "Dir-anti-pattern(s):" msgstr "" -#: optiondialog.cpp:1170 +#: optiondialog.cpp:1218 #, kde-format msgid "" "Pattern(s) of directories to be excluded from analysis. \n" @@ -2537,58 +2554,58 @@ "Several Patterns can be specified by using the separator: ';'" msgstr "" -#: optiondialog.cpp:1175 +#: optiondialog.cpp:1223 #, kde-format msgid "Use .cvsignore" msgstr "" -#: optiondialog.cpp:1179 +#: optiondialog.cpp:1227 #, kde-format msgid "" "Extends the antipattern to anything that would be ignored by CVS.\n" "Via local \".cvsignore\" files this can be directory specific." msgstr "" -#: optiondialog.cpp:1183 +#: optiondialog.cpp:1231 #, kde-format msgid "Find hidden files and directories" msgstr "" -#: optiondialog.cpp:1186 +#: optiondialog.cpp:1234 #, kde-format msgid "Finds hidden files and directories." msgstr "" -#: optiondialog.cpp:1189 +#: optiondialog.cpp:1237 #, kde-format msgid "Follow file links" msgstr "" -#: optiondialog.cpp:1193 +#: optiondialog.cpp:1241 #, kde-format msgid "" "On: Compare the file the link points to.\n" "Off: Compare the links." msgstr "" -#: optiondialog.cpp:1197 +#: optiondialog.cpp:1245 #, kde-format msgid "Follow directory links" msgstr "" -#: optiondialog.cpp:1201 +#: optiondialog.cpp:1249 #, kde-format msgid "" "On: Compare the directory the link points to.\n" "Off: Compare the links." msgstr "" -#: optiondialog.cpp:1210 +#: optiondialog.cpp:1258 #, kde-format msgid "Case sensitive filename comparison" msgstr "" -#: optiondialog.cpp:1214 +#: optiondialog.cpp:1262 #, kde-format msgid "" "The directory comparison will compare files or directories when their names " @@ -2597,64 +2614,64 @@ "off, otherwise on.)" msgstr "" -#: optiondialog.cpp:1218 +#: optiondialog.cpp:1266 #, fuzzy, kde-format #| msgid "Unfold All Subdirs" msgid "Unfold all subdirectories on load" msgstr "Дохилнашудаи ҳамаи зеркаталогҳо" -#: optiondialog.cpp:1222 +#: optiondialog.cpp:1270 #, kde-format msgid "" "On: Unfold all subdirectories when starting a directory diff.\n" "Off: Leave subdirectories folded." msgstr "" -#: optiondialog.cpp:1226 +#: optiondialog.cpp:1274 #, kde-format msgid "Skip directory status report" msgstr "" -#: optiondialog.cpp:1230 +#: optiondialog.cpp:1278 #, kde-format msgid "" "On: Do not show the Directory Comparison Status.\n" "Off: Show the status dialog on start." msgstr "" -#: optiondialog.cpp:1234 +#: optiondialog.cpp:1282 #, kde-format msgid "File Comparison Mode" msgstr "" -#: optiondialog.cpp:1239 +#: optiondialog.cpp:1287 #, fuzzy, kde-format msgid "Binary comparison" msgstr "Ҳолати муқоисакунии каталогҳо" -#: optiondialog.cpp:1241 +#: optiondialog.cpp:1289 #, kde-format msgid "Binary comparison of each file. (Default)" msgstr "" -#: optiondialog.cpp:1244 +#: optiondialog.cpp:1292 #, kde-format msgid "Full analysis" msgstr "" -#: optiondialog.cpp:1246 +#: optiondialog.cpp:1294 #, kde-format msgid "" "Do a full analysis and show statistics information in extra columns.\n" "(Slower than a binary comparison, much slower for binary files.)" msgstr "" -#: optiondialog.cpp:1250 +#: optiondialog.cpp:1298 #, kde-format msgid "Trust the size and modification date (unsafe)" msgstr "" -#: optiondialog.cpp:1252 +#: optiondialog.cpp:1300 #, kde-format msgid "" "Assume that files are equal if the modification date and file length are " @@ -2664,14 +2681,14 @@ "Useful for big directories or slow networks." msgstr "" -#: optiondialog.cpp:1257 +#: optiondialog.cpp:1305 #, kde-format msgid "" "Trust the size and date, but use binary comparison if date does not match " "(unsafe)" msgstr "" -#: optiondialog.cpp:1259 +#: optiondialog.cpp:1307 #, kde-format msgid "" "Assume that files are equal if the modification date and file length are " @@ -2680,12 +2697,12 @@ "Useful for big directories or slow networks." msgstr "" -#: optiondialog.cpp:1264 +#: optiondialog.cpp:1312 #, kde-format msgid "Trust the size (unsafe)" msgstr "" -#: optiondialog.cpp:1266 +#: optiondialog.cpp:1314 #, kde-format msgid "" "Assume that files are equal if their file lengths are equal.\n" @@ -2693,12 +2710,12 @@ "download." msgstr "" -#: optiondialog.cpp:1273 +#: optiondialog.cpp:1321 #, fuzzy, kde-format msgid "Synchronize directories" msgstr "Мушоҳидакунии каталогҳо..." -#: optiondialog.cpp:1277 +#: optiondialog.cpp:1325 #, kde-format msgid "" "Offers to store files in both directories so that\n" @@ -2706,24 +2723,24 @@ "Works only when comparing two directories without specifying a destination." msgstr "" -#: optiondialog.cpp:1283 +#: optiondialog.cpp:1331 #, kde-format msgid "White space differences considered equal" msgstr "" -#: optiondialog.cpp:1287 +#: optiondialog.cpp:1335 #, kde-format msgid "" "If files differ only by white space consider them equal.\n" "This is only active when full analysis is chosen." msgstr "" -#: optiondialog.cpp:1293 +#: optiondialog.cpp:1341 #, kde-format msgid "Copy newer instead of merging (unsafe)" msgstr "" -#: optiondialog.cpp:1297 +#: optiondialog.cpp:1345 #, kde-format msgid "" "Do not look inside, just take the newer file.\n" @@ -2731,46 +2748,46 @@ "Only effective when comparing two directories." msgstr "" -#: optiondialog.cpp:1302 +#: optiondialog.cpp:1350 #, kde-format msgid "Backup files (.orig)" msgstr "" -#: optiondialog.cpp:1306 +#: optiondialog.cpp:1354 #, kde-format msgid "" "If 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 "" -#: optiondialog.cpp:1382 optiondialog.cpp:1383 +#: optiondialog.cpp:1430 optiondialog.cpp:1431 #, kde-format msgid "Regional Settings" msgstr "" -#: optiondialog.cpp:1397 +#: optiondialog.cpp:1454 #, kde-format msgid "Use the same encoding for everything:" msgstr "" -#: optiondialog.cpp:1401 +#: optiondialog.cpp:1458 #, kde-format msgid "" "Enable this allows to change all encodings by changing the first only.\n" "Disable this if different individual settings are needed." msgstr "" -#: optiondialog.cpp:1405 +#: optiondialog.cpp:1462 #, kde-format msgid "Note: Local Encoding is \"%1\"" msgstr "" -#: optiondialog.cpp:1409 +#: optiondialog.cpp:1466 #, kde-format msgid "File Encoding for A:" msgstr "" -#: optiondialog.cpp:1416 +#: optiondialog.cpp:1473 #, kde-format msgid "" "If enabled then Unicode (UTF-16 or UTF-8) encoding will be detected.\n" @@ -2779,32 +2796,32 @@ "(Unicode detection depends on the first bytes of a file.)" msgstr "" -#: optiondialog.cpp:1419 optiondialog.cpp:1430 optiondialog.cpp:1441 +#: optiondialog.cpp:1476 optiondialog.cpp:1487 optiondialog.cpp:1498 #, kde-format msgid "Auto Detect Unicode" msgstr "" -#: optiondialog.cpp:1425 +#: optiondialog.cpp:1482 #, kde-format msgid "File Encoding for B:" msgstr "" -#: optiondialog.cpp:1436 +#: optiondialog.cpp:1493 #, kde-format msgid "File Encoding for C:" msgstr "" -#: optiondialog.cpp:1447 +#: optiondialog.cpp:1504 #, kde-format msgid "File Encoding for Merge Output and Saving:" msgstr "" -#: optiondialog.cpp:1452 +#: optiondialog.cpp:1509 #, kde-format msgid "Auto Select" msgstr "" -#: optiondialog.cpp:1456 +#: optiondialog.cpp:1513 #, kde-format msgid "" "If enabled then the encoding from the input files is used.\n" @@ -2812,39 +2829,39 @@ "saving." msgstr "" -#: optiondialog.cpp:1459 +#: optiondialog.cpp:1516 #, kde-format msgid "File Encoding for Preprocessor Files:" msgstr "" -#: optiondialog.cpp:1471 +#: optiondialog.cpp:1528 #, kde-format msgid "Right To Left Language" msgstr "" -#: optiondialog.cpp:1475 +#: optiondialog.cpp:1532 #, kde-format msgid "" "Some languages are read from right to left.\n" "This setting will change the viewer and editor accordingly." msgstr "" -#: optiondialog.cpp:1485 +#: optiondialog.cpp:1542 #, fuzzy, kde-format msgid "Integration" msgstr "Амал" -#: optiondialog.cpp:1486 +#: optiondialog.cpp:1543 #, kde-format msgid "Integration Settings" msgstr "" -#: optiondialog.cpp:1499 +#: optiondialog.cpp:1564 #, kde-format msgid "Command line options to ignore:" msgstr "" -#: optiondialog.cpp:1505 +#: optiondialog.cpp:1570 #, kde-format msgid "" "List of command line options that should be ignored when KDiff3 is used by " @@ -2853,19 +2870,19 @@ "This will suppress the \"Unknown option\" error." msgstr "" -#: optiondialog.cpp:1510 +#: optiondialog.cpp:1575 #, kde-format msgid "Quit also via Escape key" msgstr "" -#: optiondialog.cpp:1514 +#: optiondialog.cpp:1579 #, kde-format msgid "" "Fast method to exit.\n" "For those who are used to using the Escape key." msgstr "" -#: optiondialog.cpp:1598 +#: optiondialog.cpp:1653 #, kde-format msgid "This resets all options. Not only those of the current topic." msgstr "" @@ -2920,77 +2937,68 @@ msgid "Disable Unsafe Options" msgstr "" -#: pdiff.cpp:158 +#: pdiff.cpp:160 #, kde-format msgid "Loading A" msgstr "" -#: pdiff.cpp:167 -#, kde-format -msgid "Errors occurred during pre-processing of file A." -msgstr "" +#: pdiff.cpp:162 +#, fuzzy, kde-format +#| msgid "Reading file: %1" +msgid "Loading A: %1" +msgstr "Хониши файл: %1" -#: pdiff.cpp:172 +#: pdiff.cpp:170 #, kde-format msgid "Loading B" msgstr "" -#: pdiff.cpp:179 -#, kde-format -msgid "Errors occurred during pre-processing of file B." -msgstr "" - -#: pdiff.cpp:202 pdiff.cpp:241 +#: pdiff.cpp:201 pdiff.cpp:237 #, kde-format msgid "Diff: A <-> B" msgstr "" -#: pdiff.cpp:208 pdiff.cpp:279 pdiff.cpp:293 +#: pdiff.cpp:207 pdiff.cpp:275 pdiff.cpp:289 #, kde-format msgid "Linediff: A <-> B" msgstr "" -#: pdiff.cpp:225 +#: pdiff.cpp:224 #, kde-format msgid "Loading C" msgstr "" -#: pdiff.cpp:232 -#, kde-format -msgid "Errors occurred during pre-processing of file C." -msgstr "" - -#: pdiff.cpp:250 +#: pdiff.cpp:246 #, kde-format msgid "Diff: A <-> C" msgstr "" -#: pdiff.cpp:261 +#: pdiff.cpp:257 #, kde-format msgid "Diff: B <-> C" msgstr "" -#: pdiff.cpp:283 pdiff.cpp:297 +#: pdiff.cpp:279 pdiff.cpp:293 #, kde-format msgid "Linediff: B <-> C" msgstr "" -#: pdiff.cpp:287 pdiff.cpp:301 +#: pdiff.cpp:283 pdiff.cpp:297 #, kde-format msgid "Linediff: A <-> C" msgstr "" -#: pdiff.cpp:829 +#: pdiff.cpp:819 #, kde-format msgid "All input files contain the same text, but are not binary equal." msgstr "" -#: pdiff.cpp:835 pdiff.cpp:839 pdiff.cpp:843 +#: pdiff.cpp:825 pdiff.cpp:829 pdiff.cpp:833 #, kde-format msgid "Files %1 and %2 have equal text, but are not binary equal. \n" msgstr "" -#: pdiff.cpp:853 +#: pdiff.cpp:843 #, kde-format msgid "" "Some input files do not seem to be pure text files.\n" @@ -2998,17 +3006,17 @@ "Continue at your own risk." msgstr "" -#: pdiff.cpp:863 +#: pdiff.cpp:853 #, kde-format msgid ", B" msgstr "" -#: pdiff.cpp:865 +#: pdiff.cpp:855 #, kde-format msgid ", C" msgstr "" -#: pdiff.cpp:867 +#: pdiff.cpp:857 #, kde-format msgid "" "Some input characters could not be converted to valid unicode.\n" @@ -3017,77 +3025,72 @@ "Affected input files are in %1." msgstr "" -#: pdiff.cpp:1034 +#: pdiff.cpp:1032 #, kde-format msgid "Abort" msgstr "" -#: pdiff.cpp:1040 pdiff.cpp:1130 +#: pdiff.cpp:1038 pdiff.cpp:1129 #, fuzzy, kde-format msgid "Opening files..." msgstr "Кушодан %1 нашуд." -#: pdiff.cpp:1107 -#, fuzzy, kde-format -msgid "File open error" -msgstr "Хатогӣ дар кушодани файл" - -#: pdiff.cpp:1202 +#: pdiff.cpp:1212 #, kde-format msgid "Cutting selection..." msgstr "" -#: pdiff.cpp:1223 +#: pdiff.cpp:1233 #, fuzzy, kde-format msgid "Copying selection to clipboard..." msgstr "Нусха мебардорад қисми интихоб карда шударо ба клипборд" -#: pdiff.cpp:1239 +#: pdiff.cpp:1249 #, kde-format msgid "Inserting clipboard contents..." msgstr "" -#: pdiff.cpp:1695 +#: pdiff.cpp:1705 #, kde-format msgid "Word wrap (Cancel disables word wrap)" msgstr "" -#: pdiff.cpp:1696 +#: pdiff.cpp:1706 #, kde-format msgid "Calculating max width for horizontal scrollbar" msgstr "" -#: pdiff.cpp:1911 +#: pdiff.cpp:1921 #, fuzzy, kde-format msgid "Save && Continue" msgstr "Нигоҳ доштан && баромадан" -#: pdiff.cpp:1912 +#: pdiff.cpp:1922 #, fuzzy, kde-format msgid "Continue Without Saving" msgstr "Бе нигоҳдорӣ баромадан" -#: pdiff.cpp:2124 +#: pdiff.cpp:2134 #, fuzzy, kde-format msgid "Search complete." msgstr "Ҷустуҷу дар ҷамъбаст" -#: pdiff.cpp:2124 +#: pdiff.cpp:2134 #, fuzzy, kde-format msgid "Search Complete" msgstr "Якҷояшавӣ ба анҷом расид" -#: pdiff.cpp:2375 +#: pdiff.cpp:2385 #, kde-format msgid "Nothing is selected in either diff input window." msgstr "" -#: pdiff.cpp:2375 +#: pdiff.cpp:2385 #, fuzzy, kde-format msgid "Error while adding manual diff range" msgstr "Хатогӣ дар вақти эҷод кардани каталог." -#: progress.cpp:59 progress.cpp:71 +#: progress.cpp:61 progress.cpp:73 #, kde-format msgid "&Cancel" msgstr "" @@ -3097,189 +3100,189 @@ msgid "A (Base):" msgstr "A (баромад): " -#: smalldialogs.cpp:68 smalldialogs.cpp:85 smalldialogs.cpp:102 -#: smalldialogs.cpp:144 +#: smalldialogs.cpp:71 smalldialogs.cpp:90 smalldialogs.cpp:109 +#: smalldialogs.cpp:154 #, kde-format msgid "File..." msgstr "" -#: smalldialogs.cpp:70 smalldialogs.cpp:87 smalldialogs.cpp:104 -#: smalldialogs.cpp:146 +#: smalldialogs.cpp:73 smalldialogs.cpp:92 smalldialogs.cpp:111 +#: smalldialogs.cpp:156 #, fuzzy, kde-format msgid "Dir..." msgstr "Каталог" -#: smalldialogs.cpp:96 +#: smalldialogs.cpp:103 #, kde-format msgid "C (Optional):" msgstr "" -#: smalldialogs.cpp:119 +#: smalldialogs.cpp:126 #, kde-format msgid "Swap/Copy Names..." msgstr "" -#: smalldialogs.cpp:124 smalldialogs.cpp:125 smalldialogs.cpp:126 +#: smalldialogs.cpp:131 smalldialogs.cpp:132 smalldialogs.cpp:133 #, kde-format msgid "Swap %1<->%2" msgstr "" -#: smalldialogs.cpp:127 smalldialogs.cpp:128 smalldialogs.cpp:129 +#: smalldialogs.cpp:134 smalldialogs.cpp:135 smalldialogs.cpp:136 #, kde-format msgid "Copy %1->Output" msgstr "" -#: smalldialogs.cpp:130 smalldialogs.cpp:131 smalldialogs.cpp:132 +#: smalldialogs.cpp:137 smalldialogs.cpp:138 smalldialogs.cpp:139 #, kde-format msgid "Swap %1<->Output" msgstr "" -#: smalldialogs.cpp:138 +#: smalldialogs.cpp:148 #, kde-format msgid "Output (optional):" msgstr "" -#: smalldialogs.cpp:168 +#: smalldialogs.cpp:178 #, fuzzy, kde-format msgid "Configure..." msgstr "Танзимоти KDiff3..." -#: smalldialogs.cpp:233 +#: smalldialogs.cpp:243 #, fuzzy, kde-format msgid "Open Directory" msgstr "Хониши каталоги А" -#: smalldialogs.cpp:234 +#: smalldialogs.cpp:244 #, kde-format msgid "Select Output File" msgstr "" -#: smalldialogs.cpp:393 +#: smalldialogs.cpp:403 #, fuzzy, kde-format msgid "Search text:" msgstr "Пайдо кардан:" -#: smalldialogs.cpp:400 +#: smalldialogs.cpp:410 #, kde-format msgid "Case sensitive" msgstr "Ба ҳисоб гирифтани рӯйхат" -#: smalldialogs.cpp:403 +#: smalldialogs.cpp:413 #, kde-format msgid "Search A" msgstr "Ҷустуҷуи A" -#: smalldialogs.cpp:408 +#: smalldialogs.cpp:418 #, kde-format msgid "Search B" msgstr "Ҷустуҷуи B" -#: smalldialogs.cpp:413 +#: smalldialogs.cpp:423 #, kde-format msgid "Search C" msgstr "Ҷустуҷуи C" -#: smalldialogs.cpp:418 +#: smalldialogs.cpp:428 #, kde-format msgid "Search output" msgstr "Ҷустуҷу дар ҷамъбаст" -#: smalldialogs.cpp:425 +#: smalldialogs.cpp:435 #, kde-format msgid "&Search" msgstr "&Ҷустуҷӯ" -#: smalldialogs.cpp:444 +#: smalldialogs.cpp:454 #, kde-format msgid "Regular Expression Tester" msgstr "" -#: smalldialogs.cpp:457 +#: smalldialogs.cpp:467 #, kde-format msgid "Example auto merge line:" msgstr "" -#: smalldialogs.cpp:459 +#: smalldialogs.cpp:469 #, kde-format msgid "To test auto merge, copy a line as used in your files." msgstr "" -#: smalldialogs.cpp:465 smalldialogs.cpp:493 smalldialogs.cpp:529 +#: smalldialogs.cpp:475 smalldialogs.cpp:503 smalldialogs.cpp:539 #, kde-format msgid "Match result:" msgstr "" -#: smalldialogs.cpp:484 +#: smalldialogs.cpp:494 #, kde-format msgid "Example history start line (with leading comment):" msgstr "" -#: smalldialogs.cpp:486 +#: smalldialogs.cpp:496 #, kde-format msgid "" "Copy a history start line as used in your files,\n" "including the leading comment." msgstr "" -#: smalldialogs.cpp:512 +#: smalldialogs.cpp:522 #, kde-format msgid "History sort key order:" msgstr "" -#: smalldialogs.cpp:520 +#: smalldialogs.cpp:530 #, kde-format msgid "Example history entry start line (without leading comment):" msgstr "" -#: smalldialogs.cpp:522 +#: smalldialogs.cpp:532 #, kde-format msgid "" "Copy a history entry start line as used in your files,\n" "but omit the leading comment." msgstr "" -#: smalldialogs.cpp:536 +#: smalldialogs.cpp:546 #, kde-format msgid "Sort key result:" msgstr "" -#: smalldialogs.cpp:584 smalldialogs.cpp:594 smalldialogs.cpp:614 +#: smalldialogs.cpp:594 smalldialogs.cpp:604 smalldialogs.cpp:624 #, kde-format msgid "Match success." msgstr "" -#: smalldialogs.cpp:588 smalldialogs.cpp:598 smalldialogs.cpp:620 +#: smalldialogs.cpp:598 smalldialogs.cpp:608 smalldialogs.cpp:630 #, fuzzy, kde-format msgid "Match failed." msgstr "Нигоҳ куни нашуд." -#: smalldialogs.cpp:605 +#: smalldialogs.cpp:615 #, kde-format msgid "Opening and closing parentheses do not match in regular expression." msgstr "" -#: SourceData.cpp:150 +#: SourceData.cpp:153 #, kde-format msgid "Writing clipboard data to temp file failed." msgstr "Дар силули мухобиротӣ навиштани таърих ва суръати файл." -#: SourceData.cpp:154 +#: SourceData.cpp:157 #, kde-format msgid "From Clipboard" msgstr "Аз буфери иваз" -#: SourceData.cpp:335 +#: SourceData.cpp:348 #, fuzzy, kde-format #| msgid "Mix of links and normal files." msgid "%1 is not a normal file." msgstr "Мувофиқкунии ишораҳо бо файлҳои оддӣ." -#: SourceData.cpp:427 +#: SourceData.cpp:440 #, kde-format msgid " Temp file is: %1" msgstr "" -#: SourceData.cpp:432 +#: SourceData.cpp:445 #, kde-format msgid "" "Preprocessing possibly failed. Check this command:\n" @@ -3294,12 +3297,12 @@ "\n" "Фармони пеш-коркардкуни ҳоло аз кор мемонад." -#: SourceData.cpp:443 SourceData.cpp:512 +#: SourceData.cpp:456 SourceData.cpp:525 #, kde-format msgid "File %1 too large to process. Skipping." msgstr "" -#: SourceData.cpp:487 +#: SourceData.cpp:500 #, kde-format msgid "" "The line-matching-preprocessing possibly failed. Check this command:\n" diff -Nru kdiff3-1.8.01/po/tr/kdiff3.po kdiff3-1.8.3/po/tr/kdiff3.po --- kdiff3-1.8.01/po/tr/kdiff3.po 2019-05-18 01:02:32.000000000 +0000 +++ kdiff3-1.8.3/po/tr/kdiff3.po 2020-06-25 00:18:58.000000000 +0000 @@ -14,8 +14,8 @@ msgid "" msgstr "" "Project-Id-Version: extragear-utils-kde4\n" -"Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2019-04-18 08:02+0200\n" +"Report-Msgid-Bugs-To: https://bugs.kde.org\n" +"POT-Creation-Date: 2020-06-22 07:48+0200\n" "PO-Revision-Date: 2017-08-27 19:51+0000\n" "Last-Translator: Serdar \n" "Language-Team: Turkish (http://www.transifex.com/projects/p/extragear-utils-" @@ -36,291 +36,291 @@ msgid "Your emails" msgstr "tulliana@gmail.com" -#: difftextwindow.cpp:412 +#: difftextwindow.cpp:414 #, kde-format msgid "File %1: Line %2" msgstr "" -#: difftextwindow.cpp:414 +#: difftextwindow.cpp:416 #, fuzzy, kde-format #| msgid "Line not available" msgid "File %1: Line not available" msgstr "Satır kullanılabilir değil" -#: difftextwindow.cpp:1780 +#: difftextwindow.cpp:1778 #, kde-format msgid "Encoding:" msgstr "Kodlama:" -#: difftextwindow.cpp:1782 mergeresultwindow.cpp:3138 optiondialog.cpp:818 +#: difftextwindow.cpp:1781 mergeresultwindow.cpp:3166 optiondialog.cpp:840 #, kde-format msgid "Line end style:" msgstr "Satır ve biçim:" -#: difftextwindow.cpp:1810 directorymergewindow.cpp:382 -#: directorymergewindow.cpp:433 directorymergewindow.cpp:524 -#: directorymergewindow.cpp:3058 directorymergewindow.cpp:3189 -#: directorymergewindow.cpp:3417 mergeresultwindow.cpp:942 -#: mergeresultwindow.cpp:944 mergeresultwindow.cpp:946 -#: mergeresultwindow.cpp:948 mergeresultwindow.cpp:1814 -#: mergeresultwindow.cpp:3170 mergeresultwindow.cpp:3177 optiondialog.cpp:962 -#: optiondialog.cpp:975 pdiff.cpp:833 pdiff.cpp:835 pdiff.cpp:837 pdiff.cpp:839 -#: pdiff.cpp:861 smalldialogs.cpp:124 smalldialogs.cpp:126 smalldialogs.cpp:127 -#: smalldialogs.cpp:130 +#: difftextwindow.cpp:1809 directorymergewindow.cpp:383 +#: directorymergewindow.cpp:434 directorymergewindow.cpp:525 +#: directorymergewindow.cpp:3072 directorymergewindow.cpp:3203 +#: directorymergewindow.cpp:3431 mergeresultwindow.cpp:970 +#: mergeresultwindow.cpp:972 mergeresultwindow.cpp:974 +#: mergeresultwindow.cpp:976 mergeresultwindow.cpp:1842 +#: mergeresultwindow.cpp:3198 mergeresultwindow.cpp:3205 optiondialog.cpp:1002 +#: optiondialog.cpp:1015 pdiff.cpp:823 pdiff.cpp:825 pdiff.cpp:827 +#: pdiff.cpp:829 pdiff.cpp:851 smalldialogs.cpp:131 smalldialogs.cpp:133 +#: smalldialogs.cpp:134 smalldialogs.cpp:137 #, kde-format msgid "A" msgstr "A" -#: difftextwindow.cpp:1810 directorymergewindow.cpp:384 -#: directorymergewindow.cpp:436 directorymergewindow.cpp:526 -#: directorymergewindow.cpp:3064 directorymergewindow.cpp:3190 -#: directorymergewindow.cpp:3418 mergeresultwindow.cpp:942 -#: mergeresultwindow.cpp:944 mergeresultwindow.cpp:950 -#: mergeresultwindow.cpp:952 mergeresultwindow.cpp:1816 -#: mergeresultwindow.cpp:3172 mergeresultwindow.cpp:3179 optiondialog.cpp:963 -#: optiondialog.cpp:976 pdiff.cpp:833 pdiff.cpp:835 pdiff.cpp:841 pdiff.cpp:843 -#: pdiff.cpp:863 smalldialogs.cpp:124 smalldialogs.cpp:125 smalldialogs.cpp:128 -#: smalldialogs.cpp:131 +#: difftextwindow.cpp:1809 directorymergewindow.cpp:385 +#: directorymergewindow.cpp:437 directorymergewindow.cpp:527 +#: directorymergewindow.cpp:3078 directorymergewindow.cpp:3204 +#: directorymergewindow.cpp:3432 mergeresultwindow.cpp:970 +#: mergeresultwindow.cpp:972 mergeresultwindow.cpp:978 +#: mergeresultwindow.cpp:980 mergeresultwindow.cpp:1844 +#: mergeresultwindow.cpp:3200 mergeresultwindow.cpp:3207 optiondialog.cpp:1003 +#: optiondialog.cpp:1016 pdiff.cpp:823 pdiff.cpp:825 pdiff.cpp:831 +#: pdiff.cpp:833 pdiff.cpp:853 smalldialogs.cpp:131 smalldialogs.cpp:132 +#: smalldialogs.cpp:135 smalldialogs.cpp:138 #, kde-format msgid "B" msgstr "B" -#: difftextwindow.cpp:1810 directorymergewindow.cpp:386 -#: directorymergewindow.cpp:439 directorymergewindow.cpp:528 -#: directorymergewindow.cpp:3070 directorymergewindow.cpp:3191 -#: directorymergewindow.cpp:3419 mergeresultwindow.cpp:946 -#: mergeresultwindow.cpp:948 mergeresultwindow.cpp:950 -#: mergeresultwindow.cpp:952 mergeresultwindow.cpp:1818 -#: mergeresultwindow.cpp:3174 mergeresultwindow.cpp:3181 optiondialog.cpp:977 -#: pdiff.cpp:837 pdiff.cpp:839 pdiff.cpp:841 pdiff.cpp:843 pdiff.cpp:865 -#: smalldialogs.cpp:125 smalldialogs.cpp:126 smalldialogs.cpp:129 -#: smalldialogs.cpp:132 +#: difftextwindow.cpp:1809 directorymergewindow.cpp:387 +#: directorymergewindow.cpp:440 directorymergewindow.cpp:529 +#: directorymergewindow.cpp:3084 directorymergewindow.cpp:3205 +#: directorymergewindow.cpp:3433 mergeresultwindow.cpp:974 +#: mergeresultwindow.cpp:976 mergeresultwindow.cpp:978 +#: mergeresultwindow.cpp:980 mergeresultwindow.cpp:1846 +#: mergeresultwindow.cpp:3202 mergeresultwindow.cpp:3209 optiondialog.cpp:1017 +#: pdiff.cpp:827 pdiff.cpp:829 pdiff.cpp:831 pdiff.cpp:833 pdiff.cpp:855 +#: smalldialogs.cpp:132 smalldialogs.cpp:133 smalldialogs.cpp:136 +#: smalldialogs.cpp:139 #, kde-format msgid "C" msgstr "C" -#: difftextwindow.cpp:1810 +#: difftextwindow.cpp:1809 #, fuzzy, kde-format #| msgid "A (Base):" msgid "A (Base)" msgstr "A (Temel):" -#: difftextwindow.cpp:1812 +#: difftextwindow.cpp:1811 #, fuzzy, kde-format #| msgid "Encoding:" msgid "Encoding: %1" msgstr "Kodlama:" -#: difftextwindow.cpp:1813 mergeresultwindow.cpp:3183 +#: difftextwindow.cpp:1812 mergeresultwindow.cpp:3211 #, kde-format msgid "Unix" msgstr "Unix" -#: difftextwindow.cpp:1813 mergeresultwindow.cpp:3184 +#: difftextwindow.cpp:1812 mergeresultwindow.cpp:3212 #, kde-format msgid "DOS" msgstr "DOS" -#: difftextwindow.cpp:1813 +#: difftextwindow.cpp:1812 #, fuzzy, kde-format #| msgid "Line end style:" msgid "Line end style: %1" msgstr "Satır ve biçim:" -#: difftextwindow.cpp:1835 kdiff3.cpp:873 +#: difftextwindow.cpp:1834 kdiff3.cpp:874 #, kde-format msgid "Top line" msgstr "En üst satır" -#: difftextwindow.cpp:1845 +#: difftextwindow.cpp:1843 #, kde-format msgid "End" msgstr "Son" -#: difftextwindow.cpp:1903 smalldialogs.cpp:235 +#: difftextwindow.cpp:1901 smalldialogs.cpp:245 #, fuzzy, kde-format #| msgid "Opening files..." msgid "Open File" msgstr "Dosyalar açılıyor..." -#: difftextwindow.cpp:1951 optiondialog.cpp:387 +#: difftextwindow.cpp:1943 optiondialog.cpp:389 #, kde-format msgid "Unicode, 8 bit" msgstr "Unicode, 8 bit" -#: difftextwindow.cpp:1966 +#: difftextwindow.cpp:1958 #, kde-format msgid "Other" msgstr "" -#: directorymergewindow.cpp:409 directorymergewindow.cpp:3424 +#: directorymergewindow.cpp:410 directorymergewindow.cpp:3438 #, kde-format msgid "Copy A to B" msgstr "A'yı B'ye kopyala" -#: directorymergewindow.cpp:412 directorymergewindow.cpp:3425 +#: directorymergewindow.cpp:413 directorymergewindow.cpp:3439 #, kde-format msgid "Copy B to A" msgstr "B'yi A'ya kopyala" -#: directorymergewindow.cpp:415 directorymergewindow.cpp:3426 +#: directorymergewindow.cpp:416 directorymergewindow.cpp:3440 #, kde-format msgid "Delete A" msgstr "A'yı Sil" -#: directorymergewindow.cpp:418 directorymergewindow.cpp:3427 +#: directorymergewindow.cpp:419 directorymergewindow.cpp:3441 #, kde-format msgid "Delete B" msgstr "B'yi Sil" -#: directorymergewindow.cpp:421 +#: directorymergewindow.cpp:422 #, kde-format msgid "Delete A & B" msgstr "A ve B'yi Sil" -#: directorymergewindow.cpp:424 directorymergewindow.cpp:3429 +#: directorymergewindow.cpp:425 directorymergewindow.cpp:3443 #, kde-format msgid "Merge to A" msgstr "A ile Birleştir" -#: directorymergewindow.cpp:427 directorymergewindow.cpp:3430 +#: directorymergewindow.cpp:428 directorymergewindow.cpp:3444 #, kde-format msgid "Merge to B" msgstr "B ile Birleştir" -#: directorymergewindow.cpp:430 +#: directorymergewindow.cpp:431 #, kde-format msgid "Merge to A & B" msgstr "A ve B ile Birleştir" -#: directorymergewindow.cpp:442 directorymergewindow.cpp:3421 +#: directorymergewindow.cpp:443 directorymergewindow.cpp:3435 #, kde-format msgid "Delete (if exists)" msgstr "(varsa) Sil" -#: directorymergewindow.cpp:445 directorymergewindow.cpp:448 -#: directorymergewindow.cpp:3420 optiondialog.cpp:925 smalldialogs.cpp:113 +#: directorymergewindow.cpp:446 directorymergewindow.cpp:449 +#: directorymergewindow.cpp:3434 smalldialogs.cpp:120 #, kde-format msgid "Merge" msgstr "Birleştir" -#: directorymergewindow.cpp:445 directorymergewindow.cpp:448 +#: directorymergewindow.cpp:446 directorymergewindow.cpp:449 #, kde-format msgid "Merge (manual)" msgstr "Birleştir (el ile)" -#: directorymergewindow.cpp:451 +#: directorymergewindow.cpp:452 #, kde-format msgid "Error: Conflicting File Types" msgstr "Hata: Çakışan Dosya Türleri" -#: directorymergewindow.cpp:454 +#: directorymergewindow.cpp:455 #, kde-format msgid "Error: Changed and Deleted" msgstr "Hata: Değiştirildi ve Silindi" -#: directorymergewindow.cpp:457 +#: directorymergewindow.cpp:458 #, kde-format msgid "Error: Dates are equal but files are not." msgstr "Hata: Tarihler aynı fakat dosyalar aynı değil." -#: directorymergewindow.cpp:471 +#: directorymergewindow.cpp:472 #, fuzzy, kde-format #| msgid "Done." msgid "Done" msgstr "Tamamlandı." -#: directorymergewindow.cpp:473 +#: directorymergewindow.cpp:474 #, kde-format msgid "Error" msgstr "Hata" -#: directorymergewindow.cpp:475 +#: directorymergewindow.cpp:476 #, kde-format msgid "Skipped." msgstr "Atlandı" -#: directorymergewindow.cpp:477 +#: directorymergewindow.cpp:478 #, kde-format msgid "Not saved." msgstr "Kaydedilmedi." -#: directorymergewindow.cpp:479 +#: directorymergewindow.cpp:480 #, kde-format msgid "In progress..." msgstr "Uygulanıyor..." -#: directorymergewindow.cpp:481 +#: directorymergewindow.cpp:482 #, kde-format msgid "To do." msgstr "Yapılacak." -#: directorymergewindow.cpp:522 +#: directorymergewindow.cpp:523 #, kde-format msgid "Name" msgstr "İsim" -#: directorymergewindow.cpp:530 +#: directorymergewindow.cpp:531 #, kde-format msgid "Operation" msgstr "İşlem" -#: directorymergewindow.cpp:532 +#: directorymergewindow.cpp:533 #, kde-format msgid "Status" msgstr "Durum" -#: directorymergewindow.cpp:534 +#: directorymergewindow.cpp:535 #, kde-format msgid "Unsolved" msgstr "Çözülmemiş" -#: directorymergewindow.cpp:536 +#: directorymergewindow.cpp:537 #, kde-format msgid "Solved" msgstr "Çözülmüş" -#: directorymergewindow.cpp:538 +#: directorymergewindow.cpp:539 #, kde-format msgid "Nonwhite" msgstr "Beyaz değil" -#: directorymergewindow.cpp:540 +#: directorymergewindow.cpp:541 #, kde-format msgid "White" msgstr "Beyaz" -#: directorymergewindow.cpp:674 +#: directorymergewindow.cpp:676 #, kde-format msgid "Unable to compare non-normal file with normal file." msgstr "" -#: directorymergewindow.cpp:688 +#: directorymergewindow.cpp:690 #, kde-format msgid "Mix of links and normal files." msgstr "Bağların ve normal dosyaların karışımı." -#: directorymergewindow.cpp:695 +#: directorymergewindow.cpp:697 #, kde-format msgid "Link: " msgstr "Bağ: " -#: directorymergewindow.cpp:704 +#: directorymergewindow.cpp:706 #, kde-format msgid "Size. " msgstr "Boyut. " -#: directorymergewindow.cpp:718 directorymergewindow.cpp:728 +#: directorymergewindow.cpp:720 directorymergewindow.cpp:730 #, kde-format msgid "Date & Size: " msgstr "Tarih & Boyut: " -#: directorymergewindow.cpp:748 +#: directorymergewindow.cpp:751 #, kde-format msgid "Comparing file..." msgstr "Dosya karşılaştırılıyor..." -#: directorymergewindow.cpp:801 +#: directorymergewindow.cpp:813 #, kde-format msgid "" "You are currently doing a directory merge. Are you sure, you want to abort " @@ -329,48 +329,48 @@ "Şu anda bir dizin birleştirmesi yapıyorsunuz. Birleştirmeden çıkmak ve " "dizini yeniden taramak istediğinizden emin misiniz?" -#: directorymergewindow.cpp:802 kdiff3.cpp:698 kdiff3.cpp:708 kdiff3.cpp:720 -#: mergeresultwindow.cpp:372 pdiff.cpp:1033 pdiff.cpp:1910 pdiff.cpp:1920 +#: directorymergewindow.cpp:814 kdiff3.cpp:697 kdiff3.cpp:707 kdiff3.cpp:719 +#: mergeresultwindow.cpp:400 pdiff.cpp:1031 pdiff.cpp:1920 pdiff.cpp:1930 #, kde-format msgid "Warning" msgstr "Uyarı" -#: directorymergewindow.cpp:803 directorymergewindow.cpp:3393 +#: directorymergewindow.cpp:815 directorymergewindow.cpp:3407 #, kde-format msgid "Rescan" msgstr "Yeniden Tara" -#: directorymergewindow.cpp:804 pdiff.cpp:1035 +#: directorymergewindow.cpp:816 pdiff.cpp:1033 #, kde-format msgid "Continue Merging" msgstr "Birleştirmeye Devam Et" -#: directorymergewindow.cpp:971 +#: directorymergewindow.cpp:984 #, kde-format msgid "Opening of directories failed:" msgstr "Dizinler açılamadı:" -#: directorymergewindow.cpp:975 +#: directorymergewindow.cpp:988 #, 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:980 +#: directorymergewindow.cpp:993 #, 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:985 +#: directorymergewindow.cpp:998 #, 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:988 +#: directorymergewindow.cpp:1001 #, kde-format msgid "Directory Open Error" msgstr "Dizin Açma Hatası" -#: directorymergewindow.cpp:996 +#: directorymergewindow.cpp:1009 #, kde-format msgid "" "The destination directory must not be the same as A or B when three " @@ -380,49 +380,49 @@ "3 dizin birleştirilirken hedef dizin A ya da B ile aynı olmamalıdır.\n" "Devam etmeden önce kontrol ediniz." -#: directorymergewindow.cpp:998 +#: directorymergewindow.cpp:1011 #, kde-format msgid "Parameter Warning" msgstr "Parametre Uyarısı" -#: directorymergewindow.cpp:1003 +#: directorymergewindow.cpp:1016 #, kde-format msgid "Scanning directories..." msgstr "Dizinler taranıyor..." -#: directorymergewindow.cpp:1029 +#: directorymergewindow.cpp:1042 #, kde-format msgid "Reading Directory A" msgstr "A Dizini Okunuyor" -#: directorymergewindow.cpp:1038 +#: directorymergewindow.cpp:1051 #, kde-format msgid "Reading Directory B" msgstr "B Dizini Okunuyor" -#: directorymergewindow.cpp:1048 +#: directorymergewindow.cpp:1061 #, kde-format msgid "Reading Directory C" msgstr "C Dizini Okunuyor" -#: directorymergewindow.cpp:1064 +#: directorymergewindow.cpp:1077 #, kde-format msgid "Some subdirectories were not readable in" msgstr "Bazı altdizinler okunabilir değildi" -#: directorymergewindow.cpp:1069 +#: directorymergewindow.cpp:1082 #, kde-format msgid "Check the permissions of the subdirectories." msgstr "Altdizinlerin izinlerini kontrol ediniz." -#: directorymergewindow.cpp:1106 kdiff3.cpp:666 kdiff3.cpp:753 kdiff3.cpp:777 -#: kdiff3.cpp:1065 kdiff3.cpp:1086 pdiff.cpp:1116 pdiff.cpp:1170 pdiff.cpp:1218 -#: pdiff.cpp:1234 pdiff.cpp:1277 pdiff.cpp:1301 +#: directorymergewindow.cpp:1119 kdiff3.cpp:665 kdiff3.cpp:752 kdiff3.cpp:776 +#: kdiff3.cpp:1072 kdiff3.cpp:1093 pdiff.cpp:1115 pdiff.cpp:1178 pdiff.cpp:1228 +#: pdiff.cpp:1244 pdiff.cpp:1287 pdiff.cpp:1311 #, kde-format msgid "Ready." msgstr "Hazır." -#: directorymergewindow.cpp:1121 +#: directorymergewindow.cpp:1134 #, kde-format msgid "" "Directory Comparison Status\n" @@ -432,23 +432,23 @@ "Number of different files: %3" msgstr "" -#: directorymergewindow.cpp:1128 +#: directorymergewindow.cpp:1141 #, fuzzy, kde-format #| msgid "Number of manual merges:" msgid "Number of manual merges: %1" msgstr "El ile birleştirmelerin sayısı:" -#: directorymergewindow.cpp:1394 +#: directorymergewindow.cpp:1407 #, kde-format msgid "This affects all merge operations." msgstr "Bu, tüm birleştirme işlemlerini etkiler." -#: directorymergewindow.cpp:1395 +#: directorymergewindow.cpp:1408 #, kde-format msgid "Changing All Merge Operations" msgstr "Tüm Birleştirme İşlemleri Değiştiriliyor" -#: directorymergewindow.cpp:1695 +#: directorymergewindow.cpp:1708 #, fuzzy, kde-format #| msgid "Processing " msgid "" @@ -456,45 +456,45 @@ "%3" msgstr "İşleniyor" -#: directorymergewindow.cpp:1738 directorymergewindow.cpp:1742 +#: directorymergewindow.cpp:1751 directorymergewindow.cpp:1755 #, kde-format msgid "Some files could not be processed." msgstr "" -#: directorymergewindow.cpp:2222 directorymergewindow.cpp:2247 -#: directorymergewindow.cpp:2271 +#: directorymergewindow.cpp:2235 directorymergewindow.cpp:2260 +#: directorymergewindow.cpp:2285 #, kde-format msgid "This operation is currently not possible." msgstr "Bu işlem şu anda yapılabilir değil." -#: directorymergewindow.cpp:2222 directorymergewindow.cpp:2247 -#: directorymergewindow.cpp:2271 directorymergewindow.cpp:2552 +#: directorymergewindow.cpp:2235 directorymergewindow.cpp:2260 +#: directorymergewindow.cpp:2285 directorymergewindow.cpp:2565 #, kde-format msgid "Operation Not Possible" msgstr "İşlem Yapılabilir Değil" -#: directorymergewindow.cpp:2318 +#: directorymergewindow.cpp:2332 #, fuzzy, kde-format #| msgid "An error occurred while copying.\n" msgid "An error occurred while copying." msgstr "Koplayanırken hata oluştu.\n" -#: directorymergewindow.cpp:2319 directorymergewindow.cpp:2759 +#: directorymergewindow.cpp:2333 directorymergewindow.cpp:2772 #, kde-format msgid "Merge Error" msgstr "Birleştirme Hatası" -#: directorymergewindow.cpp:2396 +#: directorymergewindow.cpp:2410 #, kde-format msgid "Unknown merge operation. (This must never happen!)" msgstr "Bilinmeyen birleştirme işlemi. (Bu, hiçbir zaman oluşmamalı!)" -#: directorymergewindow.cpp:2441 +#: directorymergewindow.cpp:2455 #, kde-format msgid "Unknown merge operation." msgstr "Bilinmeyen birleştirme işlemi." -#: directorymergewindow.cpp:2454 +#: directorymergewindow.cpp:2468 #, kde-format msgid "" "The merge is about to begin.\n" @@ -514,22 +514,22 @@ "Bu uygulama hâlâ beta durumundadır ve ne olursa olsun hiçbir GARANTİSİ " "YOKTUR! Önemli verilerinizin yedeğini alın!!" -#: directorymergewindow.cpp:2459 +#: directorymergewindow.cpp:2473 #, kde-format msgid "Starting Merge" msgstr "Birleştirme Başlıyor" -#: directorymergewindow.cpp:2460 +#: directorymergewindow.cpp:2474 #, kde-format msgid "Do It" msgstr "Yap" -#: directorymergewindow.cpp:2461 +#: directorymergewindow.cpp:2475 #, kde-format msgid "Simulate It" msgstr "Dene" -#: directorymergewindow.cpp:2487 +#: directorymergewindow.cpp:2501 #, kde-format msgid "" "The highlighted item has a different type in the different directories. " @@ -538,7 +538,7 @@ "Renklendirilmiş nesne, değişik dizinlerde değişik dosya türüne sahip. Ne " "yapılacağını seçin." -#: directorymergewindow.cpp:2491 +#: directorymergewindow.cpp:2505 #, kde-format msgid "" "The modification dates of the file are equal but the files are not. Select " @@ -547,7 +547,7 @@ "Dosyaların değiştirilme tarihleri aynı fakat dosyalar aynı değil. Ne " "yapılacağını seçin." -#: directorymergewindow.cpp:2495 +#: directorymergewindow.cpp:2509 #, kde-format msgid "" "The highlighted item was changed in one directory and deleted in the other. " @@ -556,7 +556,7 @@ "Vurgulanan öğe bir dizinde değiştirildi ve diğerinde silindi. Ne " "yapacağınızı seçin." -#: directorymergewindow.cpp:2552 +#: directorymergewindow.cpp:2565 #, kde-format msgid "" "This operation is currently not possible because directory merge is " @@ -564,7 +564,7 @@ msgstr "" "Bu işlem şu anda yapılamaz çünkü dizin birleştirmesi hâlâ devam ediyor." -#: directorymergewindow.cpp:2609 +#: directorymergewindow.cpp:2622 #, kde-format msgid "" "There was an error in the last step.\n" @@ -575,32 +575,32 @@ "Hata oluşturan nesne ile devam etmek mi yoksa bu nesneyi atlamak mı " "istiyorsunuz?" -#: directorymergewindow.cpp:2611 +#: directorymergewindow.cpp:2624 #, kde-format msgid "Continue merge after an error" msgstr "Bir hatadan sonra birleştirmeye devam et" -#: directorymergewindow.cpp:2612 +#: directorymergewindow.cpp:2625 #, kde-format msgid "Continue With Last Item" msgstr "Son Nesne ile Devam Et" -#: directorymergewindow.cpp:2613 +#: directorymergewindow.cpp:2626 #, kde-format msgid "Skip Item" msgstr "Nesneyi Atla" -#: directorymergewindow.cpp:2709 +#: directorymergewindow.cpp:2722 #, kde-format msgid "Merge operation complete." msgstr "Birleştirme işlemi tamamlandı." -#: directorymergewindow.cpp:2709 directorymergewindow.cpp:2712 +#: directorymergewindow.cpp:2722 directorymergewindow.cpp:2725 #, kde-format msgid "Merge Complete" msgstr "Birleştirme Tamamlandı" -#: directorymergewindow.cpp:2722 +#: directorymergewindow.cpp:2735 #, kde-format msgid "" "Simulated merge complete: Check if you agree with the proposed operations." @@ -608,230 +608,230 @@ "Simüle edilen birleştirme tamamlandı: Önerilen işlemleri kabul edip " "etmediğinizi kontrol ediniz." -#: directorymergewindow.cpp:2758 +#: directorymergewindow.cpp:2771 #, fuzzy, kde-format #| msgid "An error occurred. Press OK to see detailed information.\n" msgid "An error occurred. Press OK to see detailed information." msgstr "Bir hata oluştu. Detaylı bilgi görmek için Tamam düğmesine basın.\n" -#: directorymergewindow.cpp:2791 +#: directorymergewindow.cpp:2804 #, kde-format msgid "Error: While deleting %1: Creating backup failed." msgstr "Hata: %1 silinirken oluştu: Yedek alınamadı." -#: directorymergewindow.cpp:2798 +#: directorymergewindow.cpp:2811 #, kde-format msgid "delete directory recursively( %1 )" msgstr "dizini özyinelemeli olarak sil( %1 )" -#: directorymergewindow.cpp:2800 +#: directorymergewindow.cpp:2813 #, kde-format msgid "delete( %1 )" msgstr "sil( %1 )" -#: directorymergewindow.cpp:2815 +#: directorymergewindow.cpp:2828 #, kde-format 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:2834 +#: directorymergewindow.cpp:2847 #, kde-format msgid "Error: rmdir( %1 ) operation failed." msgstr "Hata: rmdir( %1 ) işlemi başarısız oldu." -#: directorymergewindow.cpp:2844 +#: directorymergewindow.cpp:2857 #, kde-format msgid "Error: delete operation failed." msgstr "Hata: silme işlemi başarısız oldu." -#: directorymergewindow.cpp:2870 +#: directorymergewindow.cpp:2884 #, kde-format msgid "manual merge( %1, %2, %3 -> %4)" msgstr "el ile birleştir( %1, %2, %3 -> %4)" -#: directorymergewindow.cpp:2873 +#: directorymergewindow.cpp:2887 #, kde-format 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:2900 +#: directorymergewindow.cpp:2914 #, 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:2909 +#: directorymergewindow.cpp:2923 #, kde-format msgid "copyLink( %1 -> %2 )" msgstr "BağıKopyala( %1 -> %2 )" -#: directorymergewindow.cpp:2918 +#: directorymergewindow.cpp:2932 #, kde-format 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:2928 +#: directorymergewindow.cpp:2942 #, kde-format msgid "Error: copyLink failed." msgstr "Hata: BağıKopyala başarısız oldu." -#: directorymergewindow.cpp:2953 +#: directorymergewindow.cpp:2967 #, kde-format msgid "copy( %1 -> %2 )" msgstr "kopyala( %1 -> %2 )" -#: directorymergewindow.cpp:2979 +#: directorymergewindow.cpp:2993 #, 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:2986 +#: directorymergewindow.cpp:3000 #, kde-format msgid "rename( %1 -> %2 )" msgstr "yeniden isimlendir( %1 -> %2 )" -#: directorymergewindow.cpp:2995 +#: directorymergewindow.cpp:3009 #, kde-format msgid "Error: Rename failed." msgstr "Hata: Yeniden isimlendirme başarısız oldu." -#: directorymergewindow.cpp:3013 +#: directorymergewindow.cpp:3027 #, kde-format msgid "Error during makeDir of %1. Cannot delete existing file." msgstr "%1 dizini oluşturulurken hata: Mevcut dosya silinemiyor." -#: directorymergewindow.cpp:3030 +#: directorymergewindow.cpp:3044 #, kde-format msgid "makeDir( %1 )" msgstr "dizin oluştur( %1 )" -#: directorymergewindow.cpp:3040 +#: directorymergewindow.cpp:3054 #, kde-format msgid "Error while creating directory." msgstr "Dizin oluşturulması sırasında hata oluştu." -#: directorymergewindow.cpp:3076 directorymergewindow.cpp:3195 +#: directorymergewindow.cpp:3090 directorymergewindow.cpp:3209 #, kde-format msgid "Dest" msgstr "Hedef" -#: directorymergewindow.cpp:3084 directorymergewindow.cpp:3113 +#: directorymergewindow.cpp:3098 directorymergewindow.cpp:3127 #, kde-format msgid "Dir" msgstr "Dizin" -#: directorymergewindow.cpp:3084 +#: directorymergewindow.cpp:3098 #, kde-format msgid "Type" msgstr "Tür" -#: directorymergewindow.cpp:3084 +#: directorymergewindow.cpp:3098 #, kde-format msgid "Size" msgstr "Boyut" -#: directorymergewindow.cpp:3085 +#: directorymergewindow.cpp:3099 #, kde-format msgid "Attr" msgstr "Özellikler" -#: directorymergewindow.cpp:3085 +#: directorymergewindow.cpp:3099 #, kde-format msgid "Last Modification" msgstr "Son Değiştirme" -#: directorymergewindow.cpp:3085 +#: directorymergewindow.cpp:3099 #, kde-format msgid "Link-Destination" msgstr "Bağ-Hedefi" -#: directorymergewindow.cpp:3113 +#: directorymergewindow.cpp:3127 #, kde-format msgid "File" msgstr "Dosya" -#: directorymergewindow.cpp:3113 +#: directorymergewindow.cpp:3127 #, fuzzy, kde-format #| msgid "Link: " msgid "-Link" msgstr "Bağ: " -#: directorymergewindow.cpp:3119 +#: directorymergewindow.cpp:3133 #, kde-format msgid "not available" msgstr "mümkün değil" -#: directorymergewindow.cpp:3137 +#: directorymergewindow.cpp:3151 #, kde-format msgid "A (Dest): " msgstr "A (Hedef):" -#: directorymergewindow.cpp:3141 +#: directorymergewindow.cpp:3155 #, kde-format msgid "A: " msgstr "" -#: directorymergewindow.cpp:3141 +#: directorymergewindow.cpp:3155 #, kde-format msgid "A (Base): " msgstr "A (Temel): " -#: directorymergewindow.cpp:3147 +#: directorymergewindow.cpp:3161 #, kde-format msgid "B (Dest): " msgstr "B (Hedef): " -#: directorymergewindow.cpp:3151 +#: directorymergewindow.cpp:3165 #, kde-format msgid "B: " msgstr "" -#: directorymergewindow.cpp:3156 +#: directorymergewindow.cpp:3170 #, kde-format msgid "C (Dest): " msgstr "C (Hedef): " -#: directorymergewindow.cpp:3160 +#: directorymergewindow.cpp:3174 #, kde-format msgid "C: " msgstr "" -#: directorymergewindow.cpp:3163 +#: directorymergewindow.cpp:3177 #, kde-format msgid "Dest: " msgstr "Hedef: " #. i18n("Saving Directory Merge State ...")); -#: directorymergewindow.cpp:3238 +#: directorymergewindow.cpp:3252 #, kde-format msgid "Save Directory Merge State As..." msgstr "Dizin Birleştirme Durumunu Farklı Kaydet..." -#: directorymergewindow.cpp:3387 +#: directorymergewindow.cpp:3401 #, kde-format msgid "Start/Continue Directory Merge" msgstr "Dizin Birleştirmesini Başlat/Devam Et" -#: directorymergewindow.cpp:3388 +#: directorymergewindow.cpp:3402 #, kde-format msgid "Run Operation for Current Item" msgstr "Mevcut Nesne için İşlem Başlat" -#: directorymergewindow.cpp:3389 +#: directorymergewindow.cpp:3403 #, kde-format msgid "Compare Selected File" msgstr "Seçili Dosyayı Karşılaştır" -#: directorymergewindow.cpp:3390 +#: directorymergewindow.cpp:3404 #, kde-format msgid "Merge Current File" msgstr "Mevcut Dosyayı Birleştir" -#: directorymergewindow.cpp:3390 +#: directorymergewindow.cpp:3404 #, kde-format msgid "" "Merge\n" @@ -840,51 +840,51 @@ "Birleştir\n" "Dosya" -#: directorymergewindow.cpp:3391 +#: directorymergewindow.cpp:3405 #, kde-format msgid "Fold All Subdirs" msgstr "Tüm Alt Dizinleri Kapat" -#: directorymergewindow.cpp:3392 +#: directorymergewindow.cpp:3406 #, kde-format msgid "Unfold All Subdirs" msgstr "Tüm Alt Dizinleri Aç" #. i18n("Save Directory Merge State ..."), 0, this, &DirectoryMergeWindow::slotSaveMergeState, ac, "dir_save_merge_state"); #. i18n("Load Directory Merge State ..."), 0, this, &DirectoryMergeWindow::slotLoadMergeState, ac, "dir_load_merge_state"); -#: directorymergewindow.cpp:3396 +#: directorymergewindow.cpp:3410 #, kde-format msgid "Choose A for All Items" msgstr "Tüm Nesneler için A'yı Seç" -#: directorymergewindow.cpp:3397 +#: directorymergewindow.cpp:3411 #, kde-format msgid "Choose B for All Items" msgstr "Tüm Nesneler için B'yi Seç" -#: directorymergewindow.cpp:3398 +#: directorymergewindow.cpp:3412 #, kde-format msgid "Choose C for All Items" msgstr "Tüm Nesneler için C'yi Seç" -#: directorymergewindow.cpp:3399 +#: directorymergewindow.cpp:3413 #, kde-format msgid "Auto-Choose Operation for All Items" msgstr "Tüm Nesneler için Atomatik-Seçim İşlemi" -#: directorymergewindow.cpp:3400 +#: directorymergewindow.cpp:3414 #, kde-format msgid "No Operation for All Items" msgstr "Tüm Nesneler için Hiçbir Seçim" #. i18n("Synchronize Directories"), 0, this, &DirectoryMergeWindow::slotSynchronizeDirectories, ac, "dir_synchronize_directories"); #. d->m_pDirChooseNewerFiles = GuiUtils::createAction< KToggleAction >(i18n("Copy Newer Files Instead of Merging"), 0, this, &DirectoryMergeWindow::slotChooseNewerFiles, ac, "dir_choose_newer_files"); -#: directorymergewindow.cpp:3405 +#: directorymergewindow.cpp:3419 #, kde-format msgid "Show Identical Files" msgstr "Özdeş Dosyaları Göster" -#: directorymergewindow.cpp:3405 +#: directorymergewindow.cpp:3419 #, kde-format msgid "" "Identical\n" @@ -893,17 +893,17 @@ "Özdeş\n" "Dosyalar" -#: directorymergewindow.cpp:3406 +#: directorymergewindow.cpp:3420 #, kde-format msgid "Show Different Files" msgstr "Farklı Dosyaları Göster" -#: directorymergewindow.cpp:3407 +#: directorymergewindow.cpp:3421 #, kde-format msgid "Show Files only in A" msgstr "Sadece A'daki Dosyaları Göster" -#: directorymergewindow.cpp:3407 +#: directorymergewindow.cpp:3421 #, kde-format msgid "" "Files\n" @@ -912,12 +912,12 @@ "Dosyalar\n" "Sadece A içinde" -#: directorymergewindow.cpp:3408 +#: directorymergewindow.cpp:3422 #, kde-format msgid "Show Files only in B" msgstr "Sadece B'deki Dosyaları Göster" -#: directorymergewindow.cpp:3408 +#: directorymergewindow.cpp:3422 #, kde-format msgid "" "Files\n" @@ -926,12 +926,12 @@ "Dosyalar\n" "sadece B içinde" -#: directorymergewindow.cpp:3409 +#: directorymergewindow.cpp:3423 #, kde-format msgid "Show Files only in C" msgstr "Sadece C'deki Dosyaları Göster" -#: directorymergewindow.cpp:3409 +#: directorymergewindow.cpp:3423 #, kde-format msgid "" "Files\n" @@ -940,55 +940,60 @@ "Dosyalar\n" "sadece C içinde" -#: directorymergewindow.cpp:3413 +#: directorymergewindow.cpp:3427 #, kde-format msgid "Compare Explicitly Selected Files" msgstr "Seçilen Dosyaları Karşılaştır" -#: directorymergewindow.cpp:3414 +#: directorymergewindow.cpp:3428 #, kde-format msgid "Merge Explicitly Selected Files" msgstr "Seçilen Dosyaları Birleştir" -#: directorymergewindow.cpp:3416 directorymergewindow.cpp:3423 +#: directorymergewindow.cpp:3430 directorymergewindow.cpp:3437 #, kde-format msgid "Do Nothing" msgstr "Bir Şey Yapma" -#: directorymergewindow.cpp:3428 +#: directorymergewindow.cpp:3442 #, kde-format msgid "Delete A && B" msgstr "A ve B'yi Sil" -#: directorymergewindow.cpp:3431 +#: directorymergewindow.cpp:3445 #, kde-format msgid "Merge to A && B" msgstr "A ve B ile Birleştir" -#: fileaccess.cpp:462 SourceData.cpp:493 +#: fileaccess.cpp:301 +#, kde-format +msgid "Unable to determine full url. No parent specified." +msgstr "" + +#: fileaccess.cpp:482 SourceData.cpp:506 #, fuzzy, kde-format #| msgid "Reading file: %1" msgid "Failed to read file: %1" msgstr "Dosya okunuyor: %1" -#: fileaccess.cpp:587 +#: fileaccess.cpp:624 #, 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." -#: fileaccess.cpp:595 fileaccess.cpp:600 +#: fileaccess.cpp:632 fileaccess.cpp:637 #, fuzzy, kde-format #| msgid "Opening %1 failed." msgid "Opening %1 failed. %2" msgstr "%1 açılamadı." -#: fileaccess.cpp:619 fileaccess.cpp:627 +#: fileaccess.cpp:656 fileaccess.cpp:664 #, fuzzy, kde-format #| msgid "Error reading from %1" msgid "Error reading from %1. %2" msgstr "%1 konumundan okunamıyor" -#: fileaccess.cpp:751 +#: fileaccess.cpp:788 #, fuzzy, kde-format #| msgid "" #| "While trying to make a backup, deleting an older backup failed. \n" @@ -1000,7 +1005,7 @@ "Yedekleme yapılırken, eski bir yedeğin silinmesi başarısız oldu.\n" "Dosya adı: " -#: fileaccess.cpp:758 +#: fileaccess.cpp:795 #, fuzzy, kde-format #| msgid "" #| "While trying to make a backup, renaming failed. \n" @@ -1012,178 +1017,178 @@ "Yedekleme yapılırken, yeniden isimlendirme başarısız oldu.\n" "Dosya adları: " -#: fileaccess.cpp:828 +#: fileaccess.cpp:865 #, kde-format msgid "Getting file status: %1" msgstr "Dosya durumu okunuyor: %1" -#: fileaccess.cpp:869 +#: fileaccess.cpp:906 #, kde-format msgid "Reading file: %1" msgstr "Dosya okunuyor: %1" -#: fileaccess.cpp:907 +#: fileaccess.cpp:944 #, kde-format msgid "Writing file: %1" msgstr "Dosya yazılıyor: %1" -#: fileaccess.cpp:940 +#: fileaccess.cpp:977 #, kde-format msgid "Out of memory" msgstr "Hafıza yetersizliği" -#: fileaccess.cpp:976 +#: fileaccess.cpp:1013 #, kde-format msgid "Making directory: %1" msgstr "Dizin oluşturuluyor: %1" -#: fileaccess.cpp:997 +#: fileaccess.cpp:1034 #, kde-format msgid "Removing directory: %1" msgstr "Dizin siliniyor: %1" -#: fileaccess.cpp:1012 +#: fileaccess.cpp:1049 #, kde-format msgid "Removing file: %1" msgstr "Dosya siliniyor: %1" -#: fileaccess.cpp:1028 +#: fileaccess.cpp:1065 #, kde-format msgid "Creating symbolic link: %1 -> %2" msgstr "Sembolik bağ oluşturuluyor: %1 -> %2" -#: fileaccess.cpp:1052 +#: fileaccess.cpp:1089 #, kde-format msgid "Renaming file: %1 -> %2" msgstr "Dosya yeniden isimlendiriliyor: %1 -> %2" -#: fileaccess.cpp:1086 +#: fileaccess.cpp:1123 #, kde-format msgid "Copying file: %1 -> %2" msgstr "Dosya kopyalanıyor: %1 -> %2" -#: fileaccess.cpp:1108 +#: fileaccess.cpp:1145 #, fuzzy, kde-format #| msgid "Reading directory: " msgid "Reading directory: %1" msgstr "Okuma dizini: " -#: fileaccess.cpp:1162 +#: fileaccess.cpp:1202 #, kde-format msgid "Listing directory: %1" msgstr "Listeleme dizini: %1" -#: kdiff3.cpp:181 +#: kdiff3.cpp:182 #, kde-format msgid "Current Configuration:" msgstr "Geçerli Yapılandırma:" -#: kdiff3.cpp:186 +#: kdiff3.cpp:187 #, kde-format msgid "Config Option Error:" msgstr "Yapılandırma Seçeneği Hatası:" -#: kdiff3.cpp:240 +#: kdiff3.cpp:246 #, kde-format msgid "Option --auto used, but no output file specified." msgstr "--auto seçeneği kullanıldı, fakat çıktı dosyası belirtilmedi." -#: kdiff3.cpp:416 +#: kdiff3.cpp:405 #, kde-format msgid "Option --auto ignored for directory comparison." msgstr "--auto seçeneği dizin karşılaştırmasını reddetti." -#: kdiff3.cpp:460 +#: kdiff3.cpp:449 #, kde-format msgid "Saving failed." msgstr "Kaydetme başarısız oldu." -#: kdiff3.cpp:496 pdiff.cpp:1098 +#: kdiff3.cpp:494 pdiff.cpp:1096 #, kde-format msgid "Opening of these files failed:" msgstr "Şu dosyaların açılması başarısız oldu:" -#: kdiff3.cpp:505 +#: kdiff3.cpp:503 pdiff.cpp:1105 #, kde-format -msgid "File Open Error" -msgstr "Dosya Açma Hatası" +msgid "File open error" +msgstr "Dosya açma hatası" -#: kdiff3.cpp:533 +#: kdiff3.cpp:532 #, kde-format msgid "Opens documents for comparison..." msgstr "Karşılaştırmak için belge açar..." -#: kdiff3.cpp:535 +#: kdiff3.cpp:534 #, kde-format msgid "Reload" msgstr "Yeniden Yükle" -#: kdiff3.cpp:538 +#: kdiff3.cpp:537 #, kde-format 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:540 +#: kdiff3.cpp:539 #, kde-format msgid "Saves the current document as..." msgstr "Mevcut belgeyi farklı kaydeder..." -#: kdiff3.cpp:543 +#: kdiff3.cpp:542 #, kde-format msgid "Print the differences" msgstr "Farkları yazdır" -#: kdiff3.cpp:546 +#: kdiff3.cpp:545 #, kde-format msgid "Quits the application" msgstr "Uygulamadan çıkar" -#: kdiff3.cpp:549 +#: kdiff3.cpp:548 #, kde-format msgid "Cuts the selected section and puts it to the clipboard" msgstr "Seçili bölümü keser ve panoya koyar" -#: kdiff3.cpp:552 +#: kdiff3.cpp:551 #, kde-format msgid "Copies the selected section to the clipboard" msgstr "Seçili bölümü panoya kopyalar" -#: kdiff3.cpp:554 +#: kdiff3.cpp:553 #, kde-format msgid "Pastes the clipboard contents to current position" msgstr "Pano içeriğini mevcut konuma yapıştırır" -#: kdiff3.cpp:557 +#: kdiff3.cpp:556 #, kde-format msgid "Select everything in current window" msgstr "Geçerli penceredeki her şeyi seç" -#: kdiff3.cpp:560 +#: kdiff3.cpp:559 #, kde-format msgid "Search for a string" msgstr "Bir satırı ara" -#: kdiff3.cpp:562 +#: kdiff3.cpp:561 #, kde-format msgid "Search again for the string" msgstr "Satırı tekrar ara" -#: kdiff3.cpp:567 +#: kdiff3.cpp:566 #, kde-format msgid "Enables/disables the statusbar" msgstr "Durum çubuğunu açar/kapatır" -#: kdiff3.cpp:571 +#: kdiff3.cpp:570 #, kde-format msgid "Configure KDiff3..." msgstr "KDiff3 Uygulamasını Yapılandır..." -#: kdiff3.cpp:590 +#: kdiff3.cpp:589 #, kde-format msgid "Go to Current Delta" msgstr "Mevcut Delta'ya Git" -#: kdiff3.cpp:590 +#: kdiff3.cpp:589 #, kde-format msgid "" "Current\n" @@ -1192,12 +1197,12 @@ "Mevcut\n" "Delta" -#: kdiff3.cpp:592 +#: kdiff3.cpp:591 #, kde-format msgid "Go to First Delta" msgstr "İlk Delta'ya Git" -#: kdiff3.cpp:592 +#: kdiff3.cpp:591 #, kde-format msgid "" "First\n" @@ -1206,12 +1211,12 @@ "İlk\n" "Delta" -#: kdiff3.cpp:594 +#: kdiff3.cpp:593 #, kde-format msgid "Go to Last Delta" msgstr "Son Delta'ya Git" -#: kdiff3.cpp:594 +#: kdiff3.cpp:593 #, kde-format msgid "" "Last\n" @@ -1220,14 +1225,14 @@ "Son\n" "Delta" -#: kdiff3.cpp:596 +#: kdiff3.cpp:595 #, kde-format 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:597 +#: kdiff3.cpp:596 #, kde-format msgid "" "(Does not skip white space differences even when \"Show White Space\" is " @@ -1236,12 +1241,12 @@ "(\"Boşluk Karakterini Göster\" seçeneği kapalı iken boşluk farklarını göz " "ardı etmez.)" -#: kdiff3.cpp:598 +#: kdiff3.cpp:597 #, kde-format msgid "Go to Previous Delta" msgstr "Önceki Delta'ya Git" -#: kdiff3.cpp:598 +#: kdiff3.cpp:597 #, kde-format msgid "" "Prev\n" @@ -1250,12 +1255,12 @@ "Önceki\n" "Delta" -#: kdiff3.cpp:600 +#: kdiff3.cpp:599 #, kde-format msgid "Go to Next Delta" msgstr "Sonraki Delta'ya Git" -#: kdiff3.cpp:600 +#: kdiff3.cpp:599 #, kde-format msgid "" "Next\n" @@ -1264,12 +1269,12 @@ "Sonraki\n" "Delta" -#: kdiff3.cpp:602 +#: kdiff3.cpp:601 #, kde-format msgid "Go to Previous Conflict" msgstr "Bir Önceki Çakışmaya Git" -#: kdiff3.cpp:602 +#: kdiff3.cpp:601 #, kde-format msgid "" "Prev\n" @@ -1278,12 +1283,12 @@ "Önceki\n" "Çakışma" -#: kdiff3.cpp:604 +#: kdiff3.cpp:603 #, kde-format msgid "Go to Next Conflict" msgstr "Bir Sonraki Çakışmaya Git" -#: kdiff3.cpp:604 +#: kdiff3.cpp:603 #, kde-format msgid "" "Next\n" @@ -1292,12 +1297,12 @@ "Sonraki\n" "Çakışma" -#: kdiff3.cpp:606 +#: kdiff3.cpp:605 #, kde-format msgid "Go to Previous Unsolved Conflict" msgstr "Bir Önceki Çözülmeyen Çakışmaya Git" -#: kdiff3.cpp:606 +#: kdiff3.cpp:605 #, kde-format msgid "" "Prev\n" @@ -1306,12 +1311,12 @@ "Önceki\n" "Çözümlenmemiş" -#: kdiff3.cpp:608 +#: kdiff3.cpp:607 #, kde-format msgid "Go to Next Unsolved Conflict" msgstr "Bir Sonraki Çözülmeyen Çakışmaya Git" -#: kdiff3.cpp:608 +#: kdiff3.cpp:607 #, kde-format msgid "" "Next\n" @@ -1320,12 +1325,12 @@ "Sonraki\n" "Çözümlenmemiş" -#: kdiff3.cpp:610 +#: kdiff3.cpp:609 #, kde-format msgid "Select Line(s) From A" msgstr "A'dan Satır(lar) Seç" -#: kdiff3.cpp:610 +#: kdiff3.cpp:609 #, kde-format msgid "" "Choose\n" @@ -1334,12 +1339,12 @@ "Seç\n" "A" -#: kdiff3.cpp:611 +#: kdiff3.cpp:610 #, kde-format msgid "Select Line(s) From B" msgstr "B'den Satır(lar) Seç" -#: kdiff3.cpp:611 +#: kdiff3.cpp:610 #, kde-format msgid "" "Choose\n" @@ -1348,12 +1353,12 @@ "Seç\n" "B" -#: kdiff3.cpp:612 +#: kdiff3.cpp:611 #, kde-format msgid "Select Line(s) From C" msgstr "C'den Satır(lar) Seç" -#: kdiff3.cpp:612 +#: kdiff3.cpp:611 #, kde-format msgid "" "Choose\n" @@ -1362,13 +1367,13 @@ "Seç\n" "C" -#: kdiff3.cpp:613 +#: kdiff3.cpp:612 #, kde-format 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:613 +#: kdiff3.cpp:612 #, kde-format msgid "" "Auto\n" @@ -1377,13 +1382,13 @@ "Otomatik\n" "Sonraki" -#: kdiff3.cpp:615 +#: kdiff3.cpp:614 #, fuzzy, kde-format #| msgid "Show Space && Tabulator Characters for Differences" msgid "Show Space && Tabulator Characters" msgstr "Farklar için Boşluk ve Sekme Karakterlerini Göster" -#: kdiff3.cpp:615 +#: kdiff3.cpp:614 #, kde-format msgid "" "White\n" @@ -1392,12 +1397,12 @@ "Beyaz\n" "Karakter" -#: kdiff3.cpp:616 +#: kdiff3.cpp:615 #, kde-format msgid "Show White Space" msgstr "Boşluğu Göster" -#: kdiff3.cpp:616 +#: kdiff3.cpp:615 #, kde-format msgid "" "White\n" @@ -1406,12 +1411,12 @@ "Beyaz\n" "Deltalar" -#: kdiff3.cpp:618 +#: kdiff3.cpp:617 #, kde-format msgid "Show Line Numbers" msgstr "Satır Numaralarını Göster" -#: kdiff3.cpp:618 +#: kdiff3.cpp:617 #, kde-format msgid "" "Line\n" @@ -1420,133 +1425,133 @@ "Satır\n" "Numaraları" -#: kdiff3.cpp:620 +#: kdiff3.cpp:619 #, kde-format msgid "Automatically Solve Simple Conflicts" msgstr "Basit Çakışmaları Otomatik Olarak Çöz" -#: kdiff3.cpp:621 +#: kdiff3.cpp:620 #, kde-format msgid "Set Deltas to Conflicts" msgstr "Deltaları Çakışmalara Ayarla" -#: kdiff3.cpp:622 +#: kdiff3.cpp:621 #, kde-format msgid "Run Regular Expression Auto Merge" msgstr "Düzenli İfade Otomatik Birleştirme'yi Çalıştır" -#: kdiff3.cpp:623 +#: kdiff3.cpp:622 #, kde-format msgid "Automatically Solve History Conflicts" msgstr "Geçmiş Çakışmalarını Otomatik Olarak Çözümle" -#: kdiff3.cpp:624 +#: kdiff3.cpp:623 #, kde-format msgid "Split Diff At Selection" msgstr "Seçimde Farkı Ayır" -#: kdiff3.cpp:625 +#: kdiff3.cpp:624 #, kde-format msgid "Join Selected Diffs" msgstr "Seçili Farkları Birleştir" -#: kdiff3.cpp:627 +#: kdiff3.cpp:626 #, kde-format msgid "Show Window A" msgstr "A Penceresini Göster" -#: kdiff3.cpp:628 +#: kdiff3.cpp:627 #, kde-format msgid "Show Window B" msgstr "B Penceresini Göster" -#: kdiff3.cpp:629 +#: kdiff3.cpp:628 #, kde-format msgid "Show Window C" msgstr "C Penceresini Göster" -#: kdiff3.cpp:631 +#: kdiff3.cpp:630 #, kde-format msgid "Normal Overview" msgstr "Normal Öngörünüm" -#: kdiff3.cpp:632 +#: kdiff3.cpp:631 #, kde-format msgid "A vs. B Overview" msgstr "A - B Karşılaştırılması Öngörünümü" -#: kdiff3.cpp:633 +#: kdiff3.cpp:632 #, kde-format msgid "A vs. C Overview" msgstr "A - C Karşılaştırılması Öngörünümü" -#: kdiff3.cpp:634 +#: kdiff3.cpp:633 #, kde-format msgid "B vs. C Overview" msgstr "B - C Karşılaştırılması Öngörünümü" -#: kdiff3.cpp:635 +#: kdiff3.cpp:634 #, kde-format msgid "Word Wrap Diff Windows" msgstr "Sözcük Kaydırma Fark Pencereleri" -#: kdiff3.cpp:636 +#: kdiff3.cpp:635 #, kde-format msgid "Add Manual Diff Alignment" msgstr "Elle Fark Hizalaması Ekle" -#: kdiff3.cpp:637 +#: kdiff3.cpp:636 #, kde-format msgid "Clear All Manual Diff Alignments" msgstr "Elle Fark Hizalamalarının Tamamını Temizle" -#: kdiff3.cpp:639 +#: kdiff3.cpp:638 #, kde-format msgid "Focus Next Window" msgstr "Bir Sonraki Pencereye Odaklan" -#: kdiff3.cpp:640 +#: kdiff3.cpp:639 #, kde-format msgid "Focus Prev Window" msgstr "Bir Önceki Pencereye Odaklan" -#: kdiff3.cpp:641 +#: kdiff3.cpp:640 #, kde-format msgid "Toggle Split Orientation" msgstr "Bölme Yönünü Değiştir" -#: kdiff3.cpp:643 +#: kdiff3.cpp:642 #, kde-format msgid "Dir && Text Split Screen View" msgstr "Dizin && Metin Ayırma Ekran Görünümü" -#: kdiff3.cpp:645 +#: kdiff3.cpp:644 #, kde-format msgid "Toggle Between Dir && Text View" msgstr "Dizin && Metin Görünümü Arasında Geçiş Yap" -#: kdiff3.cpp:697 pdiff.cpp:1909 +#: kdiff3.cpp:696 pdiff.cpp:1919 #, fuzzy, kde-format #| msgid "The merge result hasn't been saved." msgid "The merge result has not been saved." msgstr "Birleştirme sonucu kaydedilmedi." -#: kdiff3.cpp:699 +#: kdiff3.cpp:698 #, kde-format msgid "Save && Quit" msgstr "Kaydet ve Çık" -#: kdiff3.cpp:700 +#: kdiff3.cpp:699 #, kde-format msgid "Quit Without Saving" msgstr "Kaydetmeden Çık" -#: kdiff3.cpp:708 pdiff.cpp:1920 +#: kdiff3.cpp:707 pdiff.cpp:1930 #, kde-format msgid "Saving the merge result failed." msgstr "Birleştirme sonucunun kaydedilmesi başarısız oldu." -#: kdiff3.cpp:719 pdiff.cpp:1032 +#: kdiff3.cpp:718 pdiff.cpp:1030 #, kde-format msgid "" "You are currently doing a directory merge. Are you sure, you want to abort?" @@ -1554,63 +1559,63 @@ "Şu anda bir dizin birleştirmesi gerçekleştiriyorsunuz. Çıkmak istediğinizden " "emin misiniz?" -#: kdiff3.cpp:742 +#: kdiff3.cpp:741 #, kde-format msgid "Saving file..." msgstr "Dosya kaydediliyor..." -#: kdiff3.cpp:759 +#: kdiff3.cpp:758 #, kde-format msgid "Saving file with a new filename..." msgstr "Dosya yeni bir isimle kaydediliyor..." -#: kdiff3.cpp:761 +#: kdiff3.cpp:760 #, kde-format msgid "Save As..." msgstr "Farklı Kaydet..." -#: kdiff3.cpp:820 +#: kdiff3.cpp:819 #, kde-format msgid "Printing not implemented." msgstr "Yazdırma uygulamaya konmadı." -#: kdiff3.cpp:857 +#: kdiff3.cpp:858 #, kde-format msgid "Printing..." msgstr "Yazdırma..." -#: kdiff3.cpp:943 +#: kdiff3.cpp:948 #, kde-format msgid "Printing page %1 of %2" msgstr "" -#: kdiff3.cpp:1000 +#: kdiff3.cpp:1006 #, fuzzy, kde-format #| msgid "Selection" msgid " (Selection)" msgstr "Seçim" -#: kdiff3.cpp:1027 +#: kdiff3.cpp:1034 #, kde-format msgid "Printing completed." msgstr "Yazdırma işlemi tamamlandı." -#: kdiff3.cpp:1031 +#: kdiff3.cpp:1038 #, kde-format msgid "Printing aborted." msgstr "Yazdırma işlemi sonlandırıldı." -#: kdiff3.cpp:1038 +#: kdiff3.cpp:1045 #, kde-format msgid "Exiting..." msgstr "Çıkılıyor..." -#: kdiff3.cpp:1049 +#: kdiff3.cpp:1056 #, kde-format msgid "Toggling toolbar..." msgstr "Araç çubuğu açılıyor/kapatılıyor..." -#: kdiff3.cpp:1070 +#: kdiff3.cpp:1077 #, kde-format msgid "Toggle the statusbar..." msgstr "Durum çubğunu göster/sakla..." @@ -1636,7 +1641,7 @@ msgid "Joachim Eibl" msgstr "Joachim Eibl" -#: kdiff3_part.cpp:173 kdiff3_part.cpp:254 +#: kdiff3_part.cpp:174 kdiff3_part.cpp:255 #, fuzzy, kde-format #| msgid "Couldn't find files for comparison." msgid "Could not find files for comparison." @@ -1655,7 +1660,7 @@ msgstr "KDiff3 Uygulamasını Yapılandır" #. i18n: ectx: ToolBar (mainToolBar) -#: kdiff3_part.rc:16 main.cpp:88 +#: kdiff3_part.rc:16 main.cpp:89 #, kde-format msgid "KDiff3" msgstr "KDiff3" @@ -1727,84 +1732,90 @@ msgid "Main Toolbar" msgstr "Ana Araç Çubuğu" -#: main.cpp:68 main.cpp:72 +#: main.cpp:69 main.cpp:73 #, kde-format msgid "Ignored. (User defined.)" msgstr "Göz ardı edildi. (Kullanıcı tanımlı)" -#: main.cpp:92 +#: main.cpp:93 #, kde-format msgid " (64 bit)" msgstr "" -#: main.cpp:94 +#: main.cpp:95 #, kde-format msgid " (32 bit)" msgstr "" -#: main.cpp:95 +#: main.cpp:96 #, kde-format msgid "Tool for Comparison and Merge of Files and Directories" msgstr "Dosyaları ve Dizinleri Karşılaştırma ve Birleştirme Aracı" -#: main.cpp:96 +#: main.cpp:97 #, kde-format msgid "(c) 2002-2014 Joachim Eibl, (c) 2017 Michael Reeves KF5/Qt5 port" msgstr "" -#: main.cpp:112 +#: main.cpp:113 #, kde-format msgid "Merge the input." msgstr "Girdiyi birleştir." -#: main.cpp:113 +#: main.cpp:114 #, kde-format msgid "Explicit base file. For compatibility with certain tools." msgstr "Açık temel dosya. Belirli araçlarla uyumluluk için." -#: main.cpp:114 +#: main.cpp:115 #, kde-format msgid "Output file. Implies -m. E.g.: -o newfile.txt" msgstr "Çıktı dosyası. -m ima eder. Örneğin: -o yenidosya.txt" -#: main.cpp:115 +#: main.cpp:116 #, kde-format msgid "Output file, again. (For compatibility with certain tools.)" msgstr "Çıktı dosyası, tekrar. (Belirli araçlarla uyumluluk için.)" -#: main.cpp:116 +#: main.cpp:118 #, kde-format msgid "No GUI if all conflicts are auto-solvable. (Needs -o file)" msgstr "" "Tüm çakışmalar otomatik çözülebilirse GUI yok. (-o dosyaadı na ihtiyaç duyar)" -#: main.cpp:117 +#: main.cpp:120 +#, fuzzy, kde-format +#| msgid "Ignore" +msgid "Ignored." +msgstr "Yoksay" + +#: main.cpp:122 #, fuzzy, kde-format #| msgid "Don't solve conflicts automatically. (For compatibility...)" msgid "Do not solve conflicts automatically." msgstr "Çakışmaları otomatik çözme. (Uyumluluk için...)" -#: main.cpp:118 +#: main.cpp:123 #, kde-format msgid "Visible name replacement for input file 1 (base)." msgstr "Giriş dosyası 1 için görünür isim değiştirme (temel)." -#: main.cpp:119 +#: main.cpp:124 #, kde-format msgid "Visible name replacement for input file 2." msgstr "Giriş dosyası 2 için görünür ad değiştirme." -#: main.cpp:120 +#: main.cpp:125 #, kde-format msgid "Visible name replacement for input file 3." msgstr "Giriş dosyası 3 için görünür ad değiştirme." -#: main.cpp:121 +#: main.cpp:126 #, kde-format msgid "Alternative visible name replacement. Supply this once for every input." msgstr "Alternatif görünür isim değiştirme. Her giriş için bunu bir kez verin." -#: main.cpp:122 +#: main.cpp:127 #, kde-format msgid "" "Override a config setting. Use once for every setting. E.g.: --cs " @@ -1813,87 +1824,87 @@ "Bir yapılandırma ayarının üzerine yazın. Her ayar için bir kez kullanın. " "Örneğin: --cs \"AutoAdvance=1\"" -#: main.cpp:123 +#: main.cpp:128 #, kde-format msgid "Show list of config settings and current values." msgstr "Yapılandırma ayarlarının listesini ve geçerli değerleri göster." -#: main.cpp:124 +#: main.cpp:129 #, kde-format msgid "Use a different config file." msgstr "Farklı bir yapılandırma dosyası kullan." -#: main.cpp:127 +#: main.cpp:132 #, kde-format msgid "file1 to open (base, if not specified via --base)" msgstr "file1'i açmak için (baz, --base ile belirtilmemişse)" -#: main.cpp:128 +#: main.cpp:133 #, kde-format msgid "file2 to open" msgstr "açılacak ikinci dosya" -#: main.cpp:129 +#: main.cpp:134 #, kde-format msgid "file3 to open" msgstr "açılacak üçüncü dosya" -#: main.cpp:153 +#: main.cpp:158 #, kde-format msgid "See kdiff3 --help for supported options." msgstr "" -#: mergeresultwindow.cpp:158 +#: mergeresultwindow.cpp:171 #, kde-format msgid "Choose A Everywhere" msgstr "A'yı Heryerde Seç" -#: mergeresultwindow.cpp:159 +#: mergeresultwindow.cpp:172 #, kde-format msgid "Choose B Everywhere" msgstr "B'yi Heryerde Seç" -#: mergeresultwindow.cpp:160 +#: mergeresultwindow.cpp:173 #, kde-format msgid "Choose C Everywhere" msgstr "C'yi Heryerde Seç" -#: mergeresultwindow.cpp:161 +#: mergeresultwindow.cpp:174 #, kde-format msgid "Choose A for All Unsolved Conflicts" msgstr "Tüm Çözümlenmemiş Çakışmalar için A'yı Seç" -#: mergeresultwindow.cpp:162 +#: mergeresultwindow.cpp:175 #, kde-format msgid "Choose B for All Unsolved Conflicts" msgstr "Tüm Çözümlenmemiş Çakışmalar için B'yi Seç" -#: mergeresultwindow.cpp:163 +#: mergeresultwindow.cpp:176 #, kde-format msgid "Choose C for All Unsolved Conflicts" msgstr "Tüm Çözümlenmemiş Çakışmalar için C'yi Seç" -#: mergeresultwindow.cpp:164 +#: mergeresultwindow.cpp:177 #, kde-format msgid "Choose A for All Unsolved Whitespace Conflicts" msgstr "Tüm Çözümlenmemiş Beyaz Alan Çakışmaları için A'yı Seç" -#: mergeresultwindow.cpp:165 +#: mergeresultwindow.cpp:178 #, kde-format msgid "Choose B for All Unsolved Whitespace Conflicts" msgstr "Tüm Çözümlenmemiş Beyaz Alan Çakışmaları için B'yi Seç" -#: mergeresultwindow.cpp:166 +#: mergeresultwindow.cpp:179 #, kde-format msgid "Choose C for All Unsolved Whitespace Conflicts" msgstr "Tüm Çözümlenmemiş Beyaz Alan Çakışmaları için C'yi Seç" -#: mergeresultwindow.cpp:176 +#: mergeresultwindow.cpp:204 #, kde-format msgid "Number of remaining unsolved conflicts: %1 (of which %2 are whitespace)" msgstr "Bekleyen çözülmeyen çakışmaların sayısı: %1 (%2 beyaz alan)" -#: mergeresultwindow.cpp:370 +#: mergeresultwindow.cpp:398 #, kde-format msgid "" "The output has been modified.\n" @@ -1902,29 +1913,29 @@ "Çıktı üzerinde değişiklik yapıldı.\n" "Devam ederseniz değişiklikleri kaybedeceksiniz." -#: mergeresultwindow.cpp:936 pdiff.cpp:827 +#: mergeresultwindow.cpp:964 pdiff.cpp:817 #, kde-format msgid "All input files are binary equal." msgstr "Tüm girdi dosyaları ikili olarak eşittir." -#: mergeresultwindow.cpp:938 +#: mergeresultwindow.cpp:966 #, kde-format msgid "All input files contain the same text." msgstr "Tüm girdi dosyaları aynı metni içeriyor." -#: mergeresultwindow.cpp:942 mergeresultwindow.cpp:946 -#: mergeresultwindow.cpp:950 pdiff.cpp:833 pdiff.cpp:837 pdiff.cpp:841 +#: mergeresultwindow.cpp:970 mergeresultwindow.cpp:974 +#: mergeresultwindow.cpp:978 pdiff.cpp:823 pdiff.cpp:827 pdiff.cpp:831 #, kde-format msgid "Files %1 and %2 are binary equal.\n" msgstr "%1 ve %2 dosyaları ikili olarak denk.\n" -#: mergeresultwindow.cpp:944 mergeresultwindow.cpp:948 -#: mergeresultwindow.cpp:952 +#: mergeresultwindow.cpp:972 mergeresultwindow.cpp:976 +#: mergeresultwindow.cpp:980 #, kde-format msgid "Files %1 and %2 have equal text.\n" msgstr "%1 ve %2 dosyaları aynı metne sahip. \n" -#: mergeresultwindow.cpp:958 +#: mergeresultwindow.cpp:986 #, kde-format msgid "" "Total number of conflicts: %1\n" @@ -1933,27 +1944,27 @@ "%4" msgstr "" -#: mergeresultwindow.cpp:964 +#: mergeresultwindow.cpp:992 #, kde-format msgid "Conflicts" msgstr "Çakışmalar" -#: mergeresultwindow.cpp:1873 +#: mergeresultwindow.cpp:1901 #, kde-format msgid "" msgstr "" -#: mergeresultwindow.cpp:1881 +#: mergeresultwindow.cpp:1909 #, kde-format msgid "" msgstr "" -#: mergeresultwindow.cpp:1883 mergeresultwindow.cpp:2755 +#: mergeresultwindow.cpp:1911 mergeresultwindow.cpp:2783 #, kde-format msgid "" msgstr "" -#: mergeresultwindow.cpp:2967 +#: mergeresultwindow.cpp:2995 #, fuzzy, kde-format #| msgid "" #| "Not all conflicts are solved yet.\n" @@ -1965,12 +1976,12 @@ "Daha tüm çakışmalar çözülmedi.\n" "Dosya kaydedilmedi.\n" -#: mergeresultwindow.cpp:2969 mergeresultwindow.cpp:2978 +#: mergeresultwindow.cpp:2997 mergeresultwindow.cpp:3006 #, kde-format msgid "Conflicts Left" msgstr "Çakışmalar Var" -#: mergeresultwindow.cpp:2976 +#: mergeresultwindow.cpp:3004 #, fuzzy, kde-format #| msgid "" #| "There is a line end style conflict. Please choose the line end style " @@ -1984,7 +1995,7 @@ "Bir satır sonu stili çakışması var. Lütfen satır sonu stilini elle seçiniz.\n" "Dosya kaydedilemedi.\n" -#: mergeresultwindow.cpp:2990 +#: mergeresultwindow.cpp:3018 #, kde-format msgid "" "\n" @@ -1995,62 +2006,62 @@ "\n" "Yedek oluşturma başarısız oldu. Dosya kaydedilmedi." -#: mergeresultwindow.cpp:2990 mergeresultwindow.cpp:3038 +#: mergeresultwindow.cpp:3018 mergeresultwindow.cpp:3066 #, kde-format msgid "File Save Error" msgstr "Dosya Kaydetme Hatası" -#: mergeresultwindow.cpp:3038 +#: mergeresultwindow.cpp:3066 #, kde-format msgid "Error while writing." msgstr "Yazılırken hata oluştu." -#: mergeresultwindow.cpp:3110 +#: mergeresultwindow.cpp:3138 #, fuzzy, kde-format #| msgid "Output" msgid "Output:" msgstr "Çıktı" -#: mergeresultwindow.cpp:3123 mergeresultwindow.cpp:3315 +#: mergeresultwindow.cpp:3151 mergeresultwindow.cpp:3343 #, kde-format msgid "[Modified]" msgstr "[Değişiklik Yapıldı]" -#: mergeresultwindow.cpp:3130 +#: mergeresultwindow.cpp:3158 #, fuzzy, kde-format #| msgid "Encoding for saving" msgid "Encoding for saving:" msgstr "Kaydetme kodlaması" -#: mergeresultwindow.cpp:3230 +#: mergeresultwindow.cpp:3258 #, kde-format msgid "Conflict" msgstr "Çakışma" -#: mergeresultwindow.cpp:3262 +#: mergeresultwindow.cpp:3290 #, fuzzy, kde-format #| msgid "Codec from" msgid "Codec from A: %1" msgstr "Kod çözücü" -#: mergeresultwindow.cpp:3264 +#: mergeresultwindow.cpp:3292 #, fuzzy, kde-format #| msgid "Codec from" msgid "Codec from B: %1" msgstr "Kod çözücü" -#: mergeresultwindow.cpp:3266 +#: mergeresultwindow.cpp:3294 #, fuzzy, kde-format #| msgid "Codec from" msgid "Codec from C: %1" msgstr "Kod çözücü" -#: optiondialog.cpp:119 +#: optiondialog.cpp:121 #, kde-format msgid "Change Font" msgstr "" -#: optiondialog.cpp:135 optiondialog.cpp:145 +#: optiondialog.cpp:137 optiondialog.cpp:147 #, kde-format msgid "" "Font: %1, %2, %3\n" @@ -2058,125 +2069,125 @@ "Example:" msgstr "" -#: optiondialog.cpp:388 +#: optiondialog.cpp:390 #, kde-format msgid "Unicode" msgstr "Unicode" -#: optiondialog.cpp:389 +#: optiondialog.cpp:391 #, kde-format msgid "Latin1" msgstr "Latin1" -#: optiondialog.cpp:408 +#: optiondialog.cpp:410 #, kde-format msgid "Change this if non-ASCII characters are not displayed correctly." msgstr "ASCII olmayan karakterler doğru görüntülenmiyorsa bunu değiştirin." -#: optiondialog.cpp:491 +#: optiondialog.cpp:495 #, kde-format msgid "Configure" msgstr "Yapılandır" -#: optiondialog.cpp:568 +#: optiondialog.cpp:573 #, kde-format msgid "Font" msgstr "Yazı Tipi" -#: optiondialog.cpp:570 +#: optiondialog.cpp:575 #, kde-format msgid "Editor & Diff Output Font" msgstr "Düzenleyici ve Karşılaştırıcı Çıktısı Yazı Tipi" -#: optiondialog.cpp:589 +#: optiondialog.cpp:594 #, kde-format msgid "Application font" msgstr "" -#: optiondialog.cpp:594 +#: optiondialog.cpp:599 #, fuzzy, kde-format #| msgid "File Save Error" msgid "File view font" msgstr "Dosya Kaydetme Hatası" -#: optiondialog.cpp:613 +#: optiondialog.cpp:618 #, fuzzy, kde-format #| msgid "Color" msgctxt "Title for color settings page" msgid "Color" msgstr "Renk" -#: optiondialog.cpp:614 +#: optiondialog.cpp:619 #, kde-format msgid "Colors Settings" msgstr "Renk Ayarları" -#: optiondialog.cpp:631 +#: optiondialog.cpp:644 #, kde-format msgid "Editor and Diff Views:" msgstr "Düzenleyici ve Diff Görünümü:" -#: optiondialog.cpp:639 +#: optiondialog.cpp:652 #, kde-format msgid "Foreground color:" msgstr "Önplan rengi:" -#: optiondialog.cpp:647 +#: optiondialog.cpp:660 #, kde-format msgid "Background color:" msgstr "Arka alan rengi:" -#: optiondialog.cpp:657 +#: optiondialog.cpp:670 #, kde-format msgid "Diff background color:" msgstr "Karşılaştırıcı arka alanı rengi:" -#: optiondialog.cpp:666 +#: optiondialog.cpp:679 #, kde-format msgid "Color A:" msgstr "A'nın rengi:" -#: optiondialog.cpp:675 +#: optiondialog.cpp:688 #, kde-format msgid "Color B:" msgstr "B'nin rengi:" -#: optiondialog.cpp:684 +#: optiondialog.cpp:697 #, kde-format msgid "Color C:" msgstr "C'nin rengi:" -#: optiondialog.cpp:692 +#: optiondialog.cpp:705 #, kde-format msgid "Conflict color:" msgstr "Çakışma rengi:" -#: optiondialog.cpp:701 +#: optiondialog.cpp:714 #, kde-format msgid "Current range background color:" msgstr "Geçerli aralık arka plan rengi:" -#: optiondialog.cpp:710 +#: optiondialog.cpp:723 #, kde-format msgid "Current range diff background color:" msgstr "Geçerli aralık fark arka plan rengi:" -#: optiondialog.cpp:718 +#: optiondialog.cpp:731 #, kde-format msgid "Color for manually aligned difference ranges:" msgstr "Elle hizalanan fark aralıkları için renk:" -#: optiondialog.cpp:725 +#: optiondialog.cpp:738 #, kde-format msgid "Directory Comparison View:" msgstr "Dizin Karşılaştırma Görünümü:" -#: optiondialog.cpp:731 +#: optiondialog.cpp:744 #, kde-format msgid "Newest file color:" msgstr "En yeni dosya rengi:" -#: optiondialog.cpp:736 +#: optiondialog.cpp:749 #, kde-format msgid "" "Changing this color will only be effective when starting the next directory " @@ -2185,37 +2196,37 @@ "Bu rengi değiştirmek, yalnızca bir sonraki dizin karşılaştırmasını " "başlatırken etkili olur." -#: optiondialog.cpp:741 +#: optiondialog.cpp:754 #, kde-format msgid "Oldest file color:" msgstr "En eski dosya rengi:" -#: optiondialog.cpp:750 +#: optiondialog.cpp:763 #, kde-format msgid "Middle age file color:" msgstr "Orta çağ dosya rengi:" -#: optiondialog.cpp:759 +#: optiondialog.cpp:772 #, kde-format msgid "Color for missing files:" msgstr "Kayıp dosyalar için renk:" -#: optiondialog.cpp:773 +#: optiondialog.cpp:786 #, kde-format msgid "Editor" msgstr "Düzenleyici" -#: optiondialog.cpp:774 +#: optiondialog.cpp:787 #, kde-format msgid "Editor Behavior" msgstr "Düzenleyici Davranışı" -#: optiondialog.cpp:787 +#: optiondialog.cpp:809 #, kde-format msgid "Tab inserts spaces" msgstr "Tab tuşu boşluk yerleştirir" -#: optiondialog.cpp:791 +#: optiondialog.cpp:813 #, kde-format msgid "" "On: Pressing tab generates the appropriate number of spaces.\n" @@ -2224,27 +2235,27 @@ "Açık: Sekmeye basmak uygun sayıda boşluk oluşturur.\n" "Kapalı: Bir sekme karakteri eklenecektir." -#: optiondialog.cpp:796 +#: optiondialog.cpp:818 #, kde-format msgid "Tab size:" msgstr "Tab boyutu:" -#: optiondialog.cpp:803 +#: optiondialog.cpp:825 #, kde-format msgid "Auto indentation" msgstr "Otomatik girintileme" -#: optiondialog.cpp:807 +#: optiondialog.cpp:829 #, kde-format msgid "On: The indentation of the previous line is used for a new line.\n" msgstr "Açık: Bir önceki satırın girintisi yeni bir satır için kullanılır.\n" -#: optiondialog.cpp:810 +#: optiondialog.cpp:832 #, kde-format msgid "Auto copy selection" msgstr "Seçimi otomatik olarak kopyala" -#: optiondialog.cpp:814 +#: optiondialog.cpp:836 #, fuzzy, kde-format #| msgid "" #| "On: Any selection is immediately written to the clipboard.\n" @@ -2256,7 +2267,7 @@ "Açık: Herhangi bir seçim panoya hemen yazılır.\n" "Kapalı: Kesin olarak kopyalamalısınız Ör. Ctrl-C ile." -#: optiondialog.cpp:829 +#: optiondialog.cpp:851 #, kde-format msgid "" "Sets the line endings for when an edited file is saved.\n" @@ -2265,12 +2276,12 @@ "Düzenlenen bir dosya kaydedildiğinde satır sonlarını ayarlar.\n" "DOS/Windows: CR+LF; UNIX: LF; CR=0D, LF=0A ile" -#: optiondialog.cpp:839 +#: optiondialog.cpp:861 #, kde-format msgid "Diff" msgstr "Diff" -#: optiondialog.cpp:840 +#: optiondialog.cpp:862 #, kde-format msgid "Diff Settings" msgstr "Diff Ayarları" @@ -2284,13 +2295,13 @@ #. ); #. ++line; #. -#: optiondialog.cpp:865 +#: optiondialog.cpp:896 #, fuzzy, kde-format #| msgid "Treat as white space." msgid "Ignore numbers (treat as white space)" msgstr "Beyaz alan olarak davran." -#: optiondialog.cpp:869 +#: optiondialog.cpp:900 #, kde-format msgid "" "Ignore number characters during line matching phase. (Similar to Ignore " @@ -2301,46 +2312,46 @@ "yok saymaya benzer.)\n" "Sayısal verilerle dosyaları karşılaştırmak için yardımcı olabilir." -#: optiondialog.cpp:873 +#: optiondialog.cpp:904 #, fuzzy, kde-format #| msgid "Treat C/C++ comments like white space." msgid "Ignore C/C++ comments (treat as white space)" msgstr "C/C++ yorumlarına boşluk olarak davran." -#: optiondialog.cpp:876 +#: optiondialog.cpp:907 #, kde-format msgid "Treat C/C++ comments like white space." msgstr "C/C++ yorumlarına boşluk olarak davran." -#: optiondialog.cpp:879 +#: optiondialog.cpp:910 #, fuzzy, kde-format #| msgid "Treat as white space." msgid "Ignore case (treat as white space)" msgstr "Beyaz alan olarak davran." -#: optiondialog.cpp:883 +#: optiondialog.cpp:914 #, kde-format msgid "Treat case differences like white space changes. ('a'<=>'A')" msgstr "" "Beyaz alan değişiklikleri gibi büyük küçük harf farklılıklarını iyileştir. " "('a'<=>'A')" -#: optiondialog.cpp:886 +#: optiondialog.cpp:917 #, kde-format msgid "Preprocessor command:" msgstr "Önişlemci komutu:" -#: optiondialog.cpp:891 +#: optiondialog.cpp:922 #, kde-format msgid "User defined pre-processing. (See the docs for details.)" msgstr "Kullanıcı tanımlı ön-işleme. (Ayrıntılar için belgelere bakınız.)" -#: optiondialog.cpp:894 +#: optiondialog.cpp:925 #, kde-format msgid "Line-matching preprocessor command:" msgstr "Satır-eşleştirme önişlemci komutu:" -#: optiondialog.cpp:899 +#: optiondialog.cpp:930 #, kde-format msgid "" "This pre-processor is only used during line matching.\n" @@ -2349,12 +2360,12 @@ "Bu ön-işlemci yalnızca satır eşleştirmesi sırasında kullanılır.\n" "(Detaylar için belgelere bakınız.)" -#: optiondialog.cpp:902 +#: optiondialog.cpp:933 #, kde-format msgid "Try hard (slower)" msgstr "Çok uğraş (yavaştır)" -#: optiondialog.cpp:906 +#: optiondialog.cpp:937 #, kde-format msgid "" "Enables the --minimal option for the external diff.\n" @@ -2363,12 +2374,12 @@ "Harici fark için --minimal seçeneğini etkinleştirir.\n" "Büyük dosyaların çözümlemesi çok daha yavaş olacaktır." -#: optiondialog.cpp:910 +#: optiondialog.cpp:941 #, kde-format msgid "Align B and C for 3 input files" msgstr "3 girdi dosyası için B ve C'yi hizalayın" -#: optiondialog.cpp:914 +#: optiondialog.cpp:945 #, kde-format msgid "" "Try to align B and C when comparing or merging three input files.\n" @@ -2381,17 +2392,24 @@ "önerilmez.\n" "(Varsayılan olarak kapalıdır.)" -#: optiondialog.cpp:926 +#: optiondialog.cpp:956 +#, fuzzy, kde-format +#| msgid "Merge" +msgctxt "Settings page" +msgid "Merge" +msgstr "Birleştir" + +#: optiondialog.cpp:957 #, kde-format msgid "Merge Settings" msgstr "Birleştirme Ayarları" -#: optiondialog.cpp:940 +#: optiondialog.cpp:980 #, kde-format msgid "Auto advance delay (ms):" msgstr "Otomatik ilerleme gecikmesi (ms):" -#: optiondialog.cpp:946 +#: optiondialog.cpp:986 #, kde-format msgid "" "When in Auto-Advance mode the result of the current selection is shown \n" @@ -2400,28 +2418,28 @@ "Otomatik-İlerleme modunda, bir sonraki çakışmaya atlamadan önce, \n" "geçerli seçimin sonucu belirtilen süre boyunca gösterilir. Aralık: 0-2000 ms" -#: optiondialog.cpp:950 +#: optiondialog.cpp:990 #, kde-format msgid "Show info dialogs" msgstr "Bilgi pencerelerini göster" -#: optiondialog.cpp:953 +#: optiondialog.cpp:993 #, kde-format msgid "Show a dialog with information about the number of conflicts." msgstr "" "Çakışmaların sayısı hakkında bilgi içeren bir iletişim penceresi göster." -#: optiondialog.cpp:956 +#: optiondialog.cpp:996 #, kde-format msgid "White space 2-file merge default:" msgstr "Beyaz boşluk 2-dosya birleştirme varsayılanı:" -#: optiondialog.cpp:961 optiondialog.cpp:974 +#: optiondialog.cpp:1001 optiondialog.cpp:1014 #, kde-format msgid "Manual Choice" msgstr "El ile Seçim" -#: optiondialog.cpp:965 optiondialog.cpp:979 +#: optiondialog.cpp:1005 optiondialog.cpp:1019 #, kde-format msgid "" "Allow the merge algorithm to automatically select an input for white-space-" @@ -2430,22 +2448,22 @@ "Birleştirme algoritmasına sadece beyaz alan değişiklikleri için otomatik " "olarak bir girdi seçmesine izin verin." -#: optiondialog.cpp:969 +#: optiondialog.cpp:1009 #, kde-format msgid "White space 3-file merge default:" msgstr "Beyaz boşluk 3-dosyalı birleştirme varsayılanı:" -#: optiondialog.cpp:983 +#: optiondialog.cpp:1023 #, kde-format msgid "Automatic Merge Regular Expression" msgstr "Otomatik Birleştirme Düzenli İfadesi" -#: optiondialog.cpp:991 smalldialogs.cpp:449 +#: optiondialog.cpp:1031 smalldialogs.cpp:459 #, kde-format msgid "Auto merge regular expression:" msgstr "Otomatik birleştirme düzenli ifadesi:" -#: optiondialog.cpp:996 +#: optiondialog.cpp:1036 #, kde-format msgid "" "Regular expression for lines where KDiff3 should automatically choose one " @@ -2458,13 +2476,13 @@ "Çakışma olan bir satır düzenli ifadeyle eşleştiğinde\n" "- Eğer varsa-C, aksi halde B seçilecektir." -#: optiondialog.cpp:1002 +#: optiondialog.cpp:1042 #, kde-format msgid "Run regular expression auto merge on merge start" msgstr "" "Birleştirme başlangıcında düzenli ifade otomatik birleştirmeyi çalıştır" -#: optiondialog.cpp:1005 +#: optiondialog.cpp:1045 #, kde-format msgid "" "Run the merge for auto merge regular expressions\n" @@ -2473,17 +2491,17 @@ "Bir birleştirme başladığında düzenli ifadeleri\n" "derhal otomatik birleştirmek için birleştirmeyi çalıştırın.\n" -#: optiondialog.cpp:1010 +#: optiondialog.cpp:1050 #, kde-format msgid "Version Control History Merging" msgstr "Sürüm Kontrol Geçmişi Birleştirme" -#: optiondialog.cpp:1018 smalldialogs.cpp:476 +#: optiondialog.cpp:1058 smalldialogs.cpp:486 #, kde-format msgid "History start regular expression:" msgstr "Tarih başlangıcı düzenli ifadesi:" -#: optiondialog.cpp:1023 +#: optiondialog.cpp:1063 #, kde-format msgid "" "Regular expression for the start of the version control history entry.\n" @@ -2494,12 +2512,12 @@ "Genellikle bu satırda \"$Log$\" anahtar kelimesi bulunur.\n" "Varsayılan değer: \".*\\$Log.*\\$.*\"" -#: optiondialog.cpp:1029 smalldialogs.cpp:504 +#: optiondialog.cpp:1069 smalldialogs.cpp:514 #, kde-format msgid "History entry start regular expression:" msgstr "Tarih girdi başlangıç düzenli ifadesi:" -#: optiondialog.cpp:1042 +#: optiondialog.cpp:1082 #, kde-format msgid "" "A version control history entry consists of several lines.\n" @@ -2518,22 +2536,22 @@ "varsayar.\n" "Ayrıntılar için belgelendirmeye bakınız." -#: optiondialog.cpp:1050 +#: optiondialog.cpp:1090 #, kde-format msgid "History merge sorting" msgstr "Geçmiş birleştirme sıralama" -#: optiondialog.cpp:1053 +#: optiondialog.cpp:1093 #, kde-format msgid "Sort version control history by a key." msgstr "Bir tuş ile sürüm kontrol geçmişini sırala" -#: optiondialog.cpp:1063 +#: optiondialog.cpp:1103 #, kde-format msgid "History entry start sort key order:" msgstr "Geçmiş girdisi sıralama tuşu sıralamasını başlat:" -#: optiondialog.cpp:1068 +#: optiondialog.cpp:1108 #, kde-format msgid "" "Each pair of parentheses used in the regular expression for the history " @@ -2551,39 +2569,39 @@ "Boş bırakılırsa, herhangi bir sıralama yapılmaz.\n" "Ayrıntılar için belgelendirmeyi inceleyiniz." -#: optiondialog.cpp:1079 +#: optiondialog.cpp:1119 #, kde-format msgid "Merge version control history on merge start" msgstr "Birleştirme başlangıcında sürüm kontrol geçmişini birleştir" -#: optiondialog.cpp:1082 +#: optiondialog.cpp:1122 #, kde-format msgid "Run version control history automerge on merge start." msgstr "" "Birleştirme başlangıcında sürüm kontrol geçmişi otomatik birleştirmesini " "çalıştır." -#: optiondialog.cpp:1086 +#: optiondialog.cpp:1126 #, kde-format msgid "Max number of history entries:" msgstr "En fazla geçmiş girdisi sayısı:" -#: optiondialog.cpp:1090 +#: optiondialog.cpp:1130 #, kde-format msgid "Cut off after specified number. Use -1 for infinite number of entries." msgstr "Belirlenen sayıdan sonra kesin. Sonsuz sayıda giriş için -1 kullanın." -#: optiondialog.cpp:1094 +#: optiondialog.cpp:1134 #, kde-format msgid "Test your regular expressions" msgstr "Düzenli ifadenizi test edin" -#: optiondialog.cpp:1099 +#: optiondialog.cpp:1139 #, kde-format msgid "Irrelevant merge command:" msgstr "Alakasız birleştirme komutu:" -#: optiondialog.cpp:1104 +#: optiondialog.cpp:1144 #, kde-format msgid "" "If specified this script is run after automerge\n" @@ -2595,12 +2613,12 @@ "otomatik birleştirmeden sonra çalıştırılır.\n" "Bu parametrelerle çağrılır: filename1 filename2 filename3" -#: optiondialog.cpp:1109 +#: optiondialog.cpp:1149 #, kde-format msgid "Auto save and quit on merge without conflicts" msgstr "Birleştirmede çakışmalar olmadan otomatik kaydedin ve çıkın" -#: optiondialog.cpp:1113 +#: optiondialog.cpp:1153 #, kde-format msgid "" "If KDiff3 was started for a file-merge from the command line and all\n" @@ -2613,27 +2631,27 @@ "kaydet ve çık.\n" "(Komut satırı seçeneği \"--auto\" ya benzer şekilde.)" -#: optiondialog.cpp:1124 optiondialog.cpp:1125 +#: optiondialog.cpp:1164 optiondialog.cpp:1165 #, kde-format msgid "Directory" msgstr "Dizin" -#: optiondialog.cpp:1137 +#: optiondialog.cpp:1185 #, kde-format msgid "Recursive directories" msgstr "Özyinelemeli dizinler" -#: optiondialog.cpp:1140 +#: optiondialog.cpp:1188 #, kde-format msgid "Whether to analyze subdirectories or not." msgstr "Altdizinlerin analiz edilip edilmeyeceği." -#: optiondialog.cpp:1142 +#: optiondialog.cpp:1190 #, kde-format msgid "File pattern(s):" msgstr "Dosya Türleri:" -#: optiondialog.cpp:1148 +#: optiondialog.cpp:1196 #, kde-format msgid "" "Pattern(s) of files to be analyzed. \n" @@ -2644,12 +2662,12 @@ "Joker karakterler: '*' ve '?'\n" "Çeşitli desenler ayırıcı kullanılarak belirtilebilir: ';'" -#: optiondialog.cpp:1153 +#: optiondialog.cpp:1201 #, kde-format msgid "File-anti-pattern(s):" msgstr "Dosya-karşıtı-desen(ler):" -#: optiondialog.cpp:1159 +#: optiondialog.cpp:1207 #, kde-format msgid "" "Pattern(s) of files to be excluded from analysis. \n" @@ -2660,12 +2678,12 @@ "Joker karakterler: '*' ve '?'\n" "Çeşitli Desenler, ayırıcı kullanılarak belirtilebilir: ';'" -#: optiondialog.cpp:1164 +#: optiondialog.cpp:1212 #, kde-format msgid "Dir-anti-pattern(s):" msgstr "Dizin-karşıt-deseni(leri):" -#: optiondialog.cpp:1170 +#: optiondialog.cpp:1218 #, kde-format msgid "" "Pattern(s) of directories to be excluded from analysis. \n" @@ -2676,12 +2694,12 @@ "Joker karakterler: '*' ve '?'\n" "Çeşitli Desenler, ayırıcı kullanılarak belirtilebilir: ';'" -#: optiondialog.cpp:1175 +#: optiondialog.cpp:1223 #, kde-format msgid "Use .cvsignore" msgstr ".cvsignore kullan" -#: optiondialog.cpp:1179 +#: optiondialog.cpp:1227 #, kde-format msgid "" "Extends the antipattern to anything that would be ignored by CVS.\n" @@ -2691,23 +2709,23 @@ "genişletir.\n" "Yerel \".cvsignore\" dosyaları ile bu dizine özgü yapılabilir." -#: optiondialog.cpp:1183 +#: optiondialog.cpp:1231 #, kde-format msgid "Find hidden files and directories" msgstr "Gizli dosya ve dizinleri bul" -#: optiondialog.cpp:1186 +#: optiondialog.cpp:1234 #, fuzzy, kde-format #| msgid "Find hidden files and directories" msgid "Finds hidden files and directories." msgstr "Gizli dosya ve dizinleri bul" -#: optiondialog.cpp:1189 +#: optiondialog.cpp:1237 #, kde-format msgid "Follow file links" msgstr "Dosya bağlarını takip et" -#: optiondialog.cpp:1193 +#: optiondialog.cpp:1241 #, kde-format msgid "" "On: Compare the file the link points to.\n" @@ -2716,12 +2734,12 @@ "Açık: Bağın işaret ettiği dosyayı karşılaştır.\n" "Kapalı: Bağları karşılaştır." -#: optiondialog.cpp:1197 +#: optiondialog.cpp:1245 #, kde-format msgid "Follow directory links" msgstr "Dizin bağlarını takip et" -#: optiondialog.cpp:1201 +#: optiondialog.cpp:1249 #, kde-format msgid "" "On: Compare the directory the link points to.\n" @@ -2730,12 +2748,12 @@ "Açık: Bağın işaret ettiğin dizini karşılaştır.\n" "Kapalı: Bağları karşılaştır." -#: optiondialog.cpp:1210 +#: optiondialog.cpp:1258 #, kde-format msgid "Case sensitive filename comparison" msgstr "Büyük ve küçük harfe duyarlı karşılaştırma" -#: optiondialog.cpp:1214 +#: optiondialog.cpp:1262 #, kde-format msgid "" "The directory comparison will compare files or directories when their names " @@ -2748,52 +2766,52 @@ "Adların büyük/küçük harf eşleşmesi gerekiyorsa bu seçeneği ayarlayın. " "(Windows için varsayılan ayar kapalıdır, aksi durumlarda açıktır.)" -#: optiondialog.cpp:1218 +#: optiondialog.cpp:1266 #, fuzzy, kde-format #| msgid "Unfold All Subdirs" msgid "Unfold all subdirectories on load" msgstr "Tüm Alt Dizinleri Aç" -#: optiondialog.cpp:1222 +#: optiondialog.cpp:1270 #, kde-format msgid "" "On: Unfold all subdirectories when starting a directory diff.\n" "Off: Leave subdirectories folded." msgstr "" -#: optiondialog.cpp:1226 +#: optiondialog.cpp:1274 #, kde-format msgid "Skip directory status report" msgstr "" -#: optiondialog.cpp:1230 +#: optiondialog.cpp:1278 #, kde-format msgid "" "On: Do not show the Directory Comparison Status.\n" "Off: Show the status dialog on start." msgstr "" -#: optiondialog.cpp:1234 +#: optiondialog.cpp:1282 #, kde-format msgid "File Comparison Mode" msgstr "Dosya Karşılaştırma Kipi" -#: optiondialog.cpp:1239 +#: optiondialog.cpp:1287 #, kde-format msgid "Binary comparison" msgstr "İkili dosya karşılaştırması" -#: optiondialog.cpp:1241 +#: optiondialog.cpp:1289 #, kde-format msgid "Binary comparison of each file. (Default)" msgstr "Her dosyanın ikili karşılaştırması. (Varsayılan)" -#: optiondialog.cpp:1244 +#: optiondialog.cpp:1292 #, kde-format msgid "Full analysis" msgstr "Tam analiz" -#: optiondialog.cpp:1246 +#: optiondialog.cpp:1294 #, kde-format msgid "" "Do a full analysis and show statistics information in extra columns.\n" @@ -2803,12 +2821,12 @@ "(İkili karşılaştırmadan daha yavaştır, ikili dosyalar için çok daha " "yavaştır.)" -#: optiondialog.cpp:1250 +#: optiondialog.cpp:1298 #, kde-format msgid "Trust the size and modification date (unsafe)" msgstr "Değiştirilme tarihine ve boyutuna güven (güvenli değil)" -#: optiondialog.cpp:1252 +#: optiondialog.cpp:1300 #, kde-format msgid "" "Assume that files are equal if the modification date and file length are " @@ -2823,7 +2841,7 @@ "görünecektir.\n" "Büyük dizinler veya yavaş ağlar için kullanışlıdır." -#: optiondialog.cpp:1257 +#: optiondialog.cpp:1305 #, kde-format msgid "" "Trust the size and date, but use binary comparison if date does not match " @@ -2832,7 +2850,7 @@ "Boyuta ve tarihe güvenin, ancak eğer tarih uyuşmuyorsa ikili karşılaştırma " "kullanın (güvensizdir)" -#: optiondialog.cpp:1259 +#: optiondialog.cpp:1307 #, kde-format msgid "" "Assume that files are equal if the modification date and file length are " @@ -2845,12 +2863,12 @@ "Tarihler eşit değilse ama boyutlar eşitse, ikili karşılaştırma kullanın.\n" "Büyük dizinler veya yavaş ağlar için kullanışlıdır." -#: optiondialog.cpp:1264 +#: optiondialog.cpp:1312 #, kde-format msgid "Trust the size (unsafe)" msgstr "Boyuta güven (güvenilir değil)" -#: optiondialog.cpp:1266 +#: optiondialog.cpp:1314 #, kde-format msgid "" "Assume that files are equal if their file lengths are equal.\n" @@ -2861,12 +2879,12 @@ "Tarih, indirme sırasında değiştirildiğinde büyük dizinler ve yavaş ağlar " "için kullanışlıdır." -#: optiondialog.cpp:1273 +#: optiondialog.cpp:1321 #, kde-format msgid "Synchronize directories" msgstr "Dizinleri eşzamanla" -#: optiondialog.cpp:1277 +#: optiondialog.cpp:1325 #, kde-format msgid "" "Offers to store files in both directories so that\n" @@ -2877,12 +2895,12 @@ " her iki dizinin de aynı kalmasını sağlar.\n" "Yalnızca bir alış noktası belirtmeden iki dizini karşılaştırırken çalışır. " -#: optiondialog.cpp:1283 +#: optiondialog.cpp:1331 #, kde-format msgid "White space differences considered equal" msgstr "Beyaz boşluk farklılıkları eşit kabul edildi" -#: optiondialog.cpp:1287 +#: optiondialog.cpp:1335 #, kde-format msgid "" "If files differ only by white space consider them equal.\n" @@ -2892,12 +2910,12 @@ "düşünün.\n" "Bu, yalnızca tam çözümleme seçildiğinde etkindir." -#: optiondialog.cpp:1293 +#: optiondialog.cpp:1341 #, kde-format msgid "Copy newer instead of merging (unsafe)" msgstr "Birleştirmek yerine daha yeni olanı kopyala (güvenli değil)" -#: optiondialog.cpp:1297 +#: optiondialog.cpp:1345 #, fuzzy, kde-format #| msgid "" #| "Don't look inside, just take the newer file.\n" @@ -2912,12 +2930,12 @@ "(Bu seçeneği sadece ne yaptığınızı biliyorsanız kullanın!)\n" "Sadece iki dizini karşılaştırırken etkilidir." -#: optiondialog.cpp:1302 +#: optiondialog.cpp:1350 #, kde-format msgid "Backup files (.orig)" msgstr "Dosyaları yedekle (.orig)" -#: optiondialog.cpp:1306 +#: optiondialog.cpp:1354 #, kde-format msgid "" "If a file would be saved over an old file, then the old file\n" @@ -2926,17 +2944,17 @@ "Bir dosya eski bir dosyanın üzerine kaydedileceği zaman,\n" "eski dosya silinmek yerine '.orig' uzantısıyla kaydedilir." -#: optiondialog.cpp:1382 optiondialog.cpp:1383 +#: optiondialog.cpp:1430 optiondialog.cpp:1431 #, kde-format msgid "Regional Settings" msgstr "Bölgesel Ayarlar" -#: optiondialog.cpp:1397 +#: optiondialog.cpp:1454 #, kde-format msgid "Use the same encoding for everything:" msgstr "Her şey için aynı kodlamayı kullan:" -#: optiondialog.cpp:1401 +#: optiondialog.cpp:1458 #, kde-format msgid "" "Enable this allows to change all encodings by changing the first only.\n" @@ -2946,18 +2964,18 @@ "değiştirmenize izin verir.\n" " Farklı bireysel ayarlara ihtiyaç duyulursa bunu devre dışı bırakın." -#: optiondialog.cpp:1405 +#: optiondialog.cpp:1462 #, fuzzy, kde-format #| msgid "Note: Local Encoding is " msgid "Note: Local Encoding is \"%1\"" msgstr "Not: Yerel Kodlama " -#: optiondialog.cpp:1409 +#: optiondialog.cpp:1466 #, kde-format msgid "File Encoding for A:" msgstr "A için Dosya Kodlaması:" -#: optiondialog.cpp:1416 +#: optiondialog.cpp:1473 #, kde-format msgid "" "If enabled then Unicode (UTF-16 or UTF-8) encoding will be detected.\n" @@ -2969,32 +2987,32 @@ " Dosya Unicode değilse, seçilen kodlama geri dönüş olarak kullanılacaktır.\n" " (Unicode algılama, dosyanın ilk baytlarına bağlıdır.)" -#: optiondialog.cpp:1419 optiondialog.cpp:1430 optiondialog.cpp:1441 +#: optiondialog.cpp:1476 optiondialog.cpp:1487 optiondialog.cpp:1498 #, kde-format msgid "Auto Detect Unicode" msgstr "Unicode Kodlamasını Otomatik olarak Bul" -#: optiondialog.cpp:1425 +#: optiondialog.cpp:1482 #, kde-format msgid "File Encoding for B:" msgstr "B için Dosya Kodlaması:" -#: optiondialog.cpp:1436 +#: optiondialog.cpp:1493 #, kde-format msgid "File Encoding for C:" msgstr "C için Dosya Kodlaması:" -#: optiondialog.cpp:1447 +#: optiondialog.cpp:1504 #, kde-format msgid "File Encoding for Merge Output and Saving:" msgstr "Birleştirme Çıktısı ve Kaydetme için Dosya Kodlaması:" -#: optiondialog.cpp:1452 +#: optiondialog.cpp:1509 #, kde-format msgid "Auto Select" msgstr "Otomatik Seç" -#: optiondialog.cpp:1456 +#: optiondialog.cpp:1513 #, kde-format msgid "" "If enabled then the encoding from the input files is used.\n" @@ -3005,17 +3023,17 @@ "Belirsiz durumlarda, bir iletişim penceresi kullanıcıdan kaydetmesi için " "kodlamayı seçmesini ister. " -#: optiondialog.cpp:1459 +#: optiondialog.cpp:1516 #, kde-format msgid "File Encoding for Preprocessor Files:" msgstr "Önişlemci Dosyaları için Dosya Kodlaması:" -#: optiondialog.cpp:1471 +#: optiondialog.cpp:1528 #, kde-format msgid "Right To Left Language" msgstr "Sağdan Sola Yazılan Dil" -#: optiondialog.cpp:1475 +#: optiondialog.cpp:1532 #, kde-format msgid "" "Some languages are read from right to left.\n" @@ -3024,22 +3042,22 @@ "Bazı diller sağdan sola okunur.\n" "Bu ayar görüntüleyiciyi ve düzenleyiciyi buna göre değiştirecektir." -#: optiondialog.cpp:1485 +#: optiondialog.cpp:1542 #, kde-format msgid "Integration" msgstr "Bütünleşme" -#: optiondialog.cpp:1486 +#: optiondialog.cpp:1543 #, kde-format msgid "Integration Settings" msgstr "Bütünleşme Ayarları" -#: optiondialog.cpp:1499 +#: optiondialog.cpp:1564 #, kde-format msgid "Command line options to ignore:" msgstr "Göz ardı etmek için komut satırı seçenekleri:" -#: optiondialog.cpp:1505 +#: optiondialog.cpp:1570 #, kde-format msgid "" "List of command line options that should be ignored when KDiff3 is used by " @@ -3052,12 +3070,12 @@ "';' ile ayrılmışsa, çeşitli değerler belirtilebilir\n" "Bu, \"Bilinmeyen seçenek\" hatasını bastırır." -#: optiondialog.cpp:1510 +#: optiondialog.cpp:1575 #, kde-format msgid "Quit also via Escape key" msgstr "Esc tuşuyla da çık" -#: optiondialog.cpp:1514 +#: optiondialog.cpp:1579 #, kde-format msgid "" "Fast method to exit.\n" @@ -3066,7 +3084,7 @@ "Çıkmak için hızlı bir yöntem.\n" "Escape tuşunu kullanmaya alışkın olanlar için." -#: optiondialog.cpp:1598 +#: optiondialog.cpp:1653 #, kde-format msgid "This resets all options. Not only those of the current topic." msgstr "Bu, sadece bu bölümdekileri değil, tüm seçenekleri sıfırlar." @@ -3122,81 +3140,72 @@ msgid "Disable Unsafe Options" msgstr "Güvenli Olmayan Seçenekleri Devre Dışı Bırak" -#: pdiff.cpp:158 +#: pdiff.cpp:160 #, kde-format msgid "Loading A" msgstr "A yükleniyor" -#: pdiff.cpp:167 -#, kde-format -msgid "Errors occurred during pre-processing of file A." -msgstr "" +#: pdiff.cpp:162 +#, fuzzy, kde-format +#| msgid "Loading A" +msgid "Loading A: %1" +msgstr "A yükleniyor" -#: pdiff.cpp:172 +#: pdiff.cpp:170 #, kde-format msgid "Loading B" msgstr "B Yükleniyor" -#: pdiff.cpp:179 -#, kde-format -msgid "Errors occurred during pre-processing of file B." -msgstr "" - -#: pdiff.cpp:202 pdiff.cpp:241 +#: pdiff.cpp:201 pdiff.cpp:237 #, kde-format msgid "Diff: A <-> B" msgstr "Diff: A <-> B" -#: pdiff.cpp:208 pdiff.cpp:279 pdiff.cpp:293 +#: pdiff.cpp:207 pdiff.cpp:275 pdiff.cpp:289 #, kde-format msgid "Linediff: A <-> B" msgstr "Satır farkı: A <-> B" -#: pdiff.cpp:225 +#: pdiff.cpp:224 #, kde-format msgid "Loading C" msgstr "C Yükleniyor" -#: pdiff.cpp:232 -#, kde-format -msgid "Errors occurred during pre-processing of file C." -msgstr "" - -#: pdiff.cpp:250 +#: pdiff.cpp:246 #, kde-format msgid "Diff: A <-> C" msgstr "Diff: A <-> C" -#: pdiff.cpp:261 +#: pdiff.cpp:257 #, kde-format msgid "Diff: B <-> C" msgstr "Diff: B <-> C" -#: pdiff.cpp:283 pdiff.cpp:297 +#: pdiff.cpp:279 pdiff.cpp:293 #, kde-format msgid "Linediff: B <-> C" msgstr "Satır farkı: B <-> C" -#: pdiff.cpp:287 pdiff.cpp:301 +#: pdiff.cpp:283 pdiff.cpp:297 #, kde-format msgid "Linediff: A <-> C" msgstr "Satır farkı: A<-> C" -#: pdiff.cpp:829 +#: pdiff.cpp:819 #, kde-format msgid "All input files contain the same text, but are not binary equal." msgstr "" "Tüm girdi dosyaları aynı metni içerir, ancak ikili değer olarak eşit " "değildir." -#: pdiff.cpp:835 pdiff.cpp:839 pdiff.cpp:843 +#: pdiff.cpp:825 pdiff.cpp:829 pdiff.cpp:833 #, 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:853 +#: pdiff.cpp:843 #, fuzzy, kde-format #| msgid "" #| "Some inputfiles don't seem to be pure textfiles.\n" @@ -3211,17 +3220,17 @@ "KDiff3 birleşiminin ikili veri için tasarlanmamış olduğunu unutmayınız.\n" "Kendi sorumluluğunuzu alarak devam ediniz." -#: pdiff.cpp:863 +#: pdiff.cpp:853 #, kde-format msgid ", B" msgstr "" -#: pdiff.cpp:865 +#: pdiff.cpp:855 #, kde-format msgid ", C" msgstr "" -#: pdiff.cpp:867 +#: pdiff.cpp:857 #, fuzzy, kde-format #| msgid "" #| "Some input characters could not be converted to valid unicode.\n" @@ -3241,77 +3250,72 @@ "ediniz.\n" "Etkilenen girdi dosyaları %1 içerisindedir." -#: pdiff.cpp:1034 +#: pdiff.cpp:1032 #, kde-format msgid "Abort" msgstr "Çık" -#: pdiff.cpp:1040 pdiff.cpp:1130 +#: pdiff.cpp:1038 pdiff.cpp:1129 #, kde-format msgid "Opening files..." msgstr "Dosyalar açılıyor..." -#: pdiff.cpp:1107 -#, kde-format -msgid "File open error" -msgstr "Dosya açma hatası" - -#: pdiff.cpp:1202 +#: pdiff.cpp:1212 #, kde-format msgid "Cutting selection..." msgstr "Seçim kesiliyor..." -#: pdiff.cpp:1223 +#: pdiff.cpp:1233 #, kde-format msgid "Copying selection to clipboard..." msgstr "Seçim panoya kopyalanıyor..." -#: pdiff.cpp:1239 +#: pdiff.cpp:1249 #, kde-format msgid "Inserting clipboard contents..." msgstr "Pano içeriği yerleştiriliyor..." -#: pdiff.cpp:1695 +#: pdiff.cpp:1705 #, kde-format msgid "Word wrap (Cancel disables word wrap)" msgstr "" -#: pdiff.cpp:1696 +#: pdiff.cpp:1706 #, kde-format msgid "Calculating max width for horizontal scrollbar" msgstr "" -#: pdiff.cpp:1911 +#: pdiff.cpp:1921 #, kde-format msgid "Save && Continue" msgstr "Kaydet ve Devam Et" -#: pdiff.cpp:1912 +#: pdiff.cpp:1922 #, kde-format msgid "Continue Without Saving" msgstr "Kaydetmeden Devam Et" -#: pdiff.cpp:2124 +#: pdiff.cpp:2134 #, kde-format msgid "Search complete." msgstr "Arama tamamlandı." -#: pdiff.cpp:2124 +#: pdiff.cpp:2134 #, kde-format msgid "Search Complete" msgstr "Arama Tamamlandı" -#: pdiff.cpp:2375 +#: pdiff.cpp:2385 #, kde-format msgid "Nothing is selected in either diff input window." msgstr "Fark girişi pencerelerinde hiçbir şey seçilmedi." -#: pdiff.cpp:2375 +#: pdiff.cpp:2385 #, kde-format msgid "Error while adding manual diff range" msgstr "Elle fark aralığı eklenirken hata oluştu" -#: progress.cpp:59 progress.cpp:71 +#: progress.cpp:61 progress.cpp:73 #, kde-format msgid "&Cancel" msgstr "&İptal" @@ -3321,128 +3325,128 @@ msgid "A (Base):" msgstr "A (Temel):" -#: smalldialogs.cpp:68 smalldialogs.cpp:85 smalldialogs.cpp:102 -#: smalldialogs.cpp:144 +#: smalldialogs.cpp:71 smalldialogs.cpp:90 smalldialogs.cpp:109 +#: smalldialogs.cpp:154 #, kde-format msgid "File..." msgstr "Dosya..." -#: smalldialogs.cpp:70 smalldialogs.cpp:87 smalldialogs.cpp:104 -#: smalldialogs.cpp:146 +#: smalldialogs.cpp:73 smalldialogs.cpp:92 smalldialogs.cpp:111 +#: smalldialogs.cpp:156 #, kde-format msgid "Dir..." msgstr "Dizin..." -#: smalldialogs.cpp:96 +#: smalldialogs.cpp:103 #, kde-format msgid "C (Optional):" msgstr "C (İsteğe Bağlı):" -#: smalldialogs.cpp:119 +#: smalldialogs.cpp:126 #, fuzzy, kde-format #| msgid "Swap/Copy Names ..." msgid "Swap/Copy Names..." msgstr "İsimleri Takas Et/Kopyala ..." -#: smalldialogs.cpp:124 smalldialogs.cpp:125 smalldialogs.cpp:126 +#: smalldialogs.cpp:131 smalldialogs.cpp:132 smalldialogs.cpp:133 #, kde-format msgid "Swap %1<->%2" msgstr "Takas yap %1<->%2" -#: smalldialogs.cpp:127 smalldialogs.cpp:128 smalldialogs.cpp:129 +#: smalldialogs.cpp:134 smalldialogs.cpp:135 smalldialogs.cpp:136 #, kde-format msgid "Copy %1->Output" msgstr "%1 Kopyala->Çıktı" -#: smalldialogs.cpp:130 smalldialogs.cpp:131 smalldialogs.cpp:132 +#: smalldialogs.cpp:137 smalldialogs.cpp:138 smalldialogs.cpp:139 #, kde-format msgid "Swap %1<->Output" msgstr "Takas yap %1<->Çıktı" -#: smalldialogs.cpp:138 +#: smalldialogs.cpp:148 #, kde-format msgid "Output (optional):" msgstr "Çıktı (İsteğe Bağlı):" -#: smalldialogs.cpp:168 +#: smalldialogs.cpp:178 #, kde-format msgid "Configure..." msgstr "Yapılandır..." -#: smalldialogs.cpp:233 +#: smalldialogs.cpp:243 #, fuzzy, kde-format #| msgid "Directory" msgid "Open Directory" msgstr "Dizin" -#: smalldialogs.cpp:234 +#: smalldialogs.cpp:244 #, kde-format msgid "Select Output File" msgstr "" -#: smalldialogs.cpp:393 +#: smalldialogs.cpp:403 #, kde-format msgid "Search text:" msgstr "Aranacak metin:" -#: smalldialogs.cpp:400 +#: smalldialogs.cpp:410 #, kde-format msgid "Case sensitive" msgstr "Büyük ve küçük harfe duyarlı" -#: smalldialogs.cpp:403 +#: smalldialogs.cpp:413 #, kde-format msgid "Search A" msgstr "A'yı Ara" -#: smalldialogs.cpp:408 +#: smalldialogs.cpp:418 #, kde-format msgid "Search B" msgstr "B'yi Ara" -#: smalldialogs.cpp:413 +#: smalldialogs.cpp:423 #, kde-format msgid "Search C" msgstr "C'yi Ara" -#: smalldialogs.cpp:418 +#: smalldialogs.cpp:428 #, kde-format msgid "Search output" msgstr "Çıktıyı Ara" -#: smalldialogs.cpp:425 +#: smalldialogs.cpp:435 #, kde-format msgid "&Search" msgstr "&Ara" -#: smalldialogs.cpp:444 +#: smalldialogs.cpp:454 #, kde-format msgid "Regular Expression Tester" msgstr "Düzenli İfade Deneyici" -#: smalldialogs.cpp:457 +#: smalldialogs.cpp:467 #, kde-format msgid "Example auto merge line:" msgstr "Örnek otomatik birleştirme satırı:" -#: smalldialogs.cpp:459 +#: smalldialogs.cpp:469 #, kde-format msgid "To test auto merge, copy a line as used in your files." msgstr "" "Otomatik birleştirmeyi test etmek için dosyalarınızda kullanıldığı gibi bir " "satırı kopyalayın." -#: smalldialogs.cpp:465 smalldialogs.cpp:493 smalldialogs.cpp:529 +#: smalldialogs.cpp:475 smalldialogs.cpp:503 smalldialogs.cpp:539 #, kde-format msgid "Match result:" msgstr "Eşleştirme sonuçları:" -#: smalldialogs.cpp:484 +#: smalldialogs.cpp:494 #, kde-format msgid "Example history start line (with leading comment):" msgstr "Örnek geçmiş başlangıç satırı (önündeki yorumla birlikte):" -#: smalldialogs.cpp:486 +#: smalldialogs.cpp:496 #, kde-format msgid "" "Copy a history start line as used in your files,\n" @@ -3451,17 +3455,17 @@ "Dosyalarınızda kullanıldığı gibi bir geçmiş başlangıç satırını,\n" "önündeki yorum da dahil olmak üzere kopyalayın." -#: smalldialogs.cpp:512 +#: smalldialogs.cpp:522 #, kde-format msgid "History sort key order:" msgstr "Geçmişi sıralama tuş sırası:" -#: smalldialogs.cpp:520 +#: smalldialogs.cpp:530 #, kde-format msgid "Example history entry start line (without leading comment):" msgstr "Örnek geçmiş girdi başlangıç satırı (önünde yorum olmadan):" -#: smalldialogs.cpp:522 +#: smalldialogs.cpp:532 #, kde-format msgid "" "Copy a history entry start line as used in your files,\n" @@ -3471,48 +3475,48 @@ "kopyalayın,\n" "ancak önündeki yorumu atlayın." -#: smalldialogs.cpp:536 +#: smalldialogs.cpp:546 #, kde-format msgid "Sort key result:" msgstr "Sıralama tuşu sonucu:" -#: smalldialogs.cpp:584 smalldialogs.cpp:594 smalldialogs.cpp:614 +#: smalldialogs.cpp:594 smalldialogs.cpp:604 smalldialogs.cpp:624 #, kde-format msgid "Match success." msgstr "Eşleme başarılı oldu." -#: smalldialogs.cpp:588 smalldialogs.cpp:598 smalldialogs.cpp:620 +#: smalldialogs.cpp:598 smalldialogs.cpp:608 smalldialogs.cpp:630 #, kde-format msgid "Match failed." msgstr "Eşleme başarısız oldu." -#: smalldialogs.cpp:605 +#: smalldialogs.cpp:615 #, kde-format msgid "Opening and closing parentheses do not match in regular expression." msgstr "Düzenli ifadedeki açılış ve kapanış parantezleri eşleşmiyor." -#: SourceData.cpp:150 +#: SourceData.cpp:153 #, kde-format msgid "Writing clipboard data to temp file failed." msgstr "Geçici dosyaya pano verisi yazma başarısız." -#: SourceData.cpp:154 +#: SourceData.cpp:157 #, kde-format msgid "From Clipboard" msgstr "Panodan" -#: SourceData.cpp:335 +#: SourceData.cpp:348 #, fuzzy, kde-format #| msgid "Mix of links and normal files." msgid "%1 is not a normal file." msgstr "Bağların ve normal dosyaların karışımı." -#: SourceData.cpp:427 +#: SourceData.cpp:440 #, kde-format msgid " Temp file is: %1" msgstr "" -#: SourceData.cpp:432 +#: SourceData.cpp:445 #, kde-format msgid "" "Preprocessing possibly failed. Check this command:\n" @@ -3527,12 +3531,12 @@ "\n" "Önişleme komutu artık devre dışı bırakılacak." -#: SourceData.cpp:443 SourceData.cpp:512 +#: SourceData.cpp:456 SourceData.cpp:525 #, kde-format msgid "File %1 too large to process. Skipping." msgstr "" -#: SourceData.cpp:487 +#: SourceData.cpp:500 #, kde-format msgid "" "The line-matching-preprocessing possibly failed. Check this command:\n" diff -Nru kdiff3-1.8.01/po/ug/kdiff3fileitemactionplugin.po kdiff3-1.8.3/po/ug/kdiff3fileitemactionplugin.po --- kdiff3-1.8.01/po/ug/kdiff3fileitemactionplugin.po 2019-05-18 01:02:33.000000000 +0000 +++ kdiff3-1.8.3/po/ug/kdiff3fileitemactionplugin.po 2020-06-25 00:18:58.000000000 +0000 @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: kdiff3fileitemactionplugin\n" -"Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2019-03-22 03:09+0100\n" +"Report-Msgid-Bugs-To: https://bugs.kde.org\n" +"POT-Creation-Date: 2019-08-30 07:40+0200\n" "PO-Revision-Date: 2013-09-08 07:04+0900\n" "Last-Translator: Gheyret Kenji \n" "Language-Team: Uyghur \n" diff -Nru kdiff3-1.8.01/po/ug/kdiff3.po kdiff3-1.8.3/po/ug/kdiff3.po --- kdiff3-1.8.01/po/ug/kdiff3.po 2019-05-18 01:02:33.000000000 +0000 +++ kdiff3-1.8.3/po/ug/kdiff3.po 2020-06-25 00:18:58.000000000 +0000 @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: kdiff3\n" -"Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2019-04-18 08:02+0200\n" +"Report-Msgid-Bugs-To: https://bugs.kde.org\n" +"POT-Creation-Date: 2020-06-22 07:48+0200\n" "PO-Revision-Date: 2013-09-08 07:04+0900\n" "Last-Translator: Gheyret Kenji \n" "Language-Team: Uyghur Computer Science Association \n" @@ -27,337 +27,337 @@ msgid "Your emails" msgstr "sahran.ug@gmail.com, gheyret@gmail.com" -#: difftextwindow.cpp:412 +#: difftextwindow.cpp:414 #, kde-format msgid "File %1: Line %2" msgstr "" -#: difftextwindow.cpp:414 +#: difftextwindow.cpp:416 #, fuzzy, kde-format #| msgid "not available" msgid "File %1: Line not available" msgstr "ئىشلەتكىلى بولمايدۇ" -#: difftextwindow.cpp:1780 +#: difftextwindow.cpp:1778 #, kde-format msgid "Encoding:" msgstr "كودلاش:" -#: difftextwindow.cpp:1782 mergeresultwindow.cpp:3138 optiondialog.cpp:818 +#: difftextwindow.cpp:1781 mergeresultwindow.cpp:3166 optiondialog.cpp:840 #, kde-format msgid "Line end style:" msgstr "" -#: difftextwindow.cpp:1810 directorymergewindow.cpp:382 -#: directorymergewindow.cpp:433 directorymergewindow.cpp:524 -#: directorymergewindow.cpp:3058 directorymergewindow.cpp:3189 -#: directorymergewindow.cpp:3417 mergeresultwindow.cpp:942 -#: mergeresultwindow.cpp:944 mergeresultwindow.cpp:946 -#: mergeresultwindow.cpp:948 mergeresultwindow.cpp:1814 -#: mergeresultwindow.cpp:3170 mergeresultwindow.cpp:3177 optiondialog.cpp:962 -#: optiondialog.cpp:975 pdiff.cpp:833 pdiff.cpp:835 pdiff.cpp:837 pdiff.cpp:839 -#: pdiff.cpp:861 smalldialogs.cpp:124 smalldialogs.cpp:126 smalldialogs.cpp:127 -#: smalldialogs.cpp:130 +#: difftextwindow.cpp:1809 directorymergewindow.cpp:383 +#: directorymergewindow.cpp:434 directorymergewindow.cpp:525 +#: directorymergewindow.cpp:3072 directorymergewindow.cpp:3203 +#: directorymergewindow.cpp:3431 mergeresultwindow.cpp:970 +#: mergeresultwindow.cpp:972 mergeresultwindow.cpp:974 +#: mergeresultwindow.cpp:976 mergeresultwindow.cpp:1842 +#: mergeresultwindow.cpp:3198 mergeresultwindow.cpp:3205 optiondialog.cpp:1002 +#: optiondialog.cpp:1015 pdiff.cpp:823 pdiff.cpp:825 pdiff.cpp:827 +#: pdiff.cpp:829 pdiff.cpp:851 smalldialogs.cpp:131 smalldialogs.cpp:133 +#: smalldialogs.cpp:134 smalldialogs.cpp:137 #, kde-format msgid "A" msgstr "A" -#: difftextwindow.cpp:1810 directorymergewindow.cpp:384 -#: directorymergewindow.cpp:436 directorymergewindow.cpp:526 -#: directorymergewindow.cpp:3064 directorymergewindow.cpp:3190 -#: directorymergewindow.cpp:3418 mergeresultwindow.cpp:942 -#: mergeresultwindow.cpp:944 mergeresultwindow.cpp:950 -#: mergeresultwindow.cpp:952 mergeresultwindow.cpp:1816 -#: mergeresultwindow.cpp:3172 mergeresultwindow.cpp:3179 optiondialog.cpp:963 -#: optiondialog.cpp:976 pdiff.cpp:833 pdiff.cpp:835 pdiff.cpp:841 pdiff.cpp:843 -#: pdiff.cpp:863 smalldialogs.cpp:124 smalldialogs.cpp:125 smalldialogs.cpp:128 -#: smalldialogs.cpp:131 +#: difftextwindow.cpp:1809 directorymergewindow.cpp:385 +#: directorymergewindow.cpp:437 directorymergewindow.cpp:527 +#: directorymergewindow.cpp:3078 directorymergewindow.cpp:3204 +#: directorymergewindow.cpp:3432 mergeresultwindow.cpp:970 +#: mergeresultwindow.cpp:972 mergeresultwindow.cpp:978 +#: mergeresultwindow.cpp:980 mergeresultwindow.cpp:1844 +#: mergeresultwindow.cpp:3200 mergeresultwindow.cpp:3207 optiondialog.cpp:1003 +#: optiondialog.cpp:1016 pdiff.cpp:823 pdiff.cpp:825 pdiff.cpp:831 +#: pdiff.cpp:833 pdiff.cpp:853 smalldialogs.cpp:131 smalldialogs.cpp:132 +#: smalldialogs.cpp:135 smalldialogs.cpp:138 #, kde-format msgid "B" msgstr "B" -#: difftextwindow.cpp:1810 directorymergewindow.cpp:386 -#: directorymergewindow.cpp:439 directorymergewindow.cpp:528 -#: directorymergewindow.cpp:3070 directorymergewindow.cpp:3191 -#: directorymergewindow.cpp:3419 mergeresultwindow.cpp:946 -#: mergeresultwindow.cpp:948 mergeresultwindow.cpp:950 -#: mergeresultwindow.cpp:952 mergeresultwindow.cpp:1818 -#: mergeresultwindow.cpp:3174 mergeresultwindow.cpp:3181 optiondialog.cpp:977 -#: pdiff.cpp:837 pdiff.cpp:839 pdiff.cpp:841 pdiff.cpp:843 pdiff.cpp:865 -#: smalldialogs.cpp:125 smalldialogs.cpp:126 smalldialogs.cpp:129 -#: smalldialogs.cpp:132 +#: difftextwindow.cpp:1809 directorymergewindow.cpp:387 +#: directorymergewindow.cpp:440 directorymergewindow.cpp:529 +#: directorymergewindow.cpp:3084 directorymergewindow.cpp:3205 +#: directorymergewindow.cpp:3433 mergeresultwindow.cpp:974 +#: mergeresultwindow.cpp:976 mergeresultwindow.cpp:978 +#: mergeresultwindow.cpp:980 mergeresultwindow.cpp:1846 +#: mergeresultwindow.cpp:3202 mergeresultwindow.cpp:3209 optiondialog.cpp:1017 +#: pdiff.cpp:827 pdiff.cpp:829 pdiff.cpp:831 pdiff.cpp:833 pdiff.cpp:855 +#: smalldialogs.cpp:132 smalldialogs.cpp:133 smalldialogs.cpp:136 +#: smalldialogs.cpp:139 #, kde-format msgid "C" msgstr "C" -#: difftextwindow.cpp:1810 +#: difftextwindow.cpp:1809 #, kde-format msgid "A (Base)" msgstr "" -#: difftextwindow.cpp:1812 +#: difftextwindow.cpp:1811 #, fuzzy, kde-format #| msgid "Encoding:" msgid "Encoding: %1" msgstr "كودلاش:" -#: difftextwindow.cpp:1813 mergeresultwindow.cpp:3183 +#: difftextwindow.cpp:1812 mergeresultwindow.cpp:3211 #, kde-format msgid "Unix" msgstr "" -#: difftextwindow.cpp:1813 mergeresultwindow.cpp:3184 +#: difftextwindow.cpp:1812 mergeresultwindow.cpp:3212 #, kde-format msgid "DOS" msgstr "DOS" -#: difftextwindow.cpp:1813 +#: difftextwindow.cpp:1812 #, kde-format msgid "Line end style: %1" msgstr "" -#: difftextwindow.cpp:1835 kdiff3.cpp:873 +#: difftextwindow.cpp:1834 kdiff3.cpp:874 #, kde-format msgid "Top line" msgstr "" -#: difftextwindow.cpp:1845 +#: difftextwindow.cpp:1843 #, kde-format msgid "End" msgstr "تامام" -#: difftextwindow.cpp:1903 smalldialogs.cpp:235 +#: difftextwindow.cpp:1901 smalldialogs.cpp:245 #, fuzzy, kde-format #| msgid "File" msgid "Open File" msgstr "ھۆججەت" -#: difftextwindow.cpp:1951 optiondialog.cpp:387 +#: difftextwindow.cpp:1943 optiondialog.cpp:389 #, kde-format msgid "Unicode, 8 bit" msgstr "" -#: difftextwindow.cpp:1966 +#: difftextwindow.cpp:1958 #, kde-format msgid "Other" msgstr "" -#: directorymergewindow.cpp:409 directorymergewindow.cpp:3424 +#: directorymergewindow.cpp:410 directorymergewindow.cpp:3438 #, kde-format msgid "Copy A to B" msgstr "" -#: directorymergewindow.cpp:412 directorymergewindow.cpp:3425 +#: directorymergewindow.cpp:413 directorymergewindow.cpp:3439 #, kde-format msgid "Copy B to A" msgstr "" -#: directorymergewindow.cpp:415 directorymergewindow.cpp:3426 +#: directorymergewindow.cpp:416 directorymergewindow.cpp:3440 #, kde-format msgid "Delete A" msgstr "" -#: directorymergewindow.cpp:418 directorymergewindow.cpp:3427 +#: directorymergewindow.cpp:419 directorymergewindow.cpp:3441 #, kde-format msgid "Delete B" msgstr "" -#: directorymergewindow.cpp:421 +#: directorymergewindow.cpp:422 #, kde-format msgid "Delete A & B" msgstr "" -#: directorymergewindow.cpp:424 directorymergewindow.cpp:3429 +#: directorymergewindow.cpp:425 directorymergewindow.cpp:3443 #, kde-format msgid "Merge to A" msgstr "" -#: directorymergewindow.cpp:427 directorymergewindow.cpp:3430 +#: directorymergewindow.cpp:428 directorymergewindow.cpp:3444 #, kde-format msgid "Merge to B" msgstr "" -#: directorymergewindow.cpp:430 +#: directorymergewindow.cpp:431 #, kde-format msgid "Merge to A & B" msgstr "" -#: directorymergewindow.cpp:442 directorymergewindow.cpp:3421 +#: directorymergewindow.cpp:443 directorymergewindow.cpp:3435 #, kde-format msgid "Delete (if exists)" msgstr "" -#: directorymergewindow.cpp:445 directorymergewindow.cpp:448 -#: directorymergewindow.cpp:3420 optiondialog.cpp:925 smalldialogs.cpp:113 +#: directorymergewindow.cpp:446 directorymergewindow.cpp:449 +#: directorymergewindow.cpp:3434 smalldialogs.cpp:120 #, kde-format msgid "Merge" msgstr "بىرىكتۈر" -#: directorymergewindow.cpp:445 directorymergewindow.cpp:448 +#: directorymergewindow.cpp:446 directorymergewindow.cpp:449 #, kde-format msgid "Merge (manual)" msgstr "" -#: directorymergewindow.cpp:451 +#: directorymergewindow.cpp:452 #, kde-format msgid "Error: Conflicting File Types" msgstr "" -#: directorymergewindow.cpp:454 +#: directorymergewindow.cpp:455 #, kde-format msgid "Error: Changed and Deleted" msgstr "" -#: directorymergewindow.cpp:457 +#: directorymergewindow.cpp:458 #, kde-format msgid "Error: Dates are equal but files are not." msgstr "" -#: directorymergewindow.cpp:471 +#: directorymergewindow.cpp:472 #, fuzzy, kde-format #| msgid "Done." msgid "Done" msgstr "تامام." -#: directorymergewindow.cpp:473 +#: directorymergewindow.cpp:474 #, kde-format msgid "Error" msgstr "خاتالىق" -#: directorymergewindow.cpp:475 +#: directorymergewindow.cpp:476 #, kde-format msgid "Skipped." msgstr "" -#: directorymergewindow.cpp:477 +#: directorymergewindow.cpp:478 #, kde-format msgid "Not saved." msgstr "" -#: directorymergewindow.cpp:479 +#: directorymergewindow.cpp:480 #, kde-format msgid "In progress..." msgstr "" -#: directorymergewindow.cpp:481 +#: directorymergewindow.cpp:482 #, kde-format msgid "To do." msgstr "" -#: directorymergewindow.cpp:522 +#: directorymergewindow.cpp:523 #, kde-format msgid "Name" msgstr "ئاتى" -#: directorymergewindow.cpp:530 +#: directorymergewindow.cpp:531 #, kde-format msgid "Operation" msgstr "مەشغۇلات" -#: directorymergewindow.cpp:532 +#: directorymergewindow.cpp:533 #, kde-format msgid "Status" msgstr "ھالىتى" -#: directorymergewindow.cpp:534 +#: directorymergewindow.cpp:535 #, kde-format msgid "Unsolved" msgstr "" -#: directorymergewindow.cpp:536 +#: directorymergewindow.cpp:537 #, kde-format msgid "Solved" msgstr "" -#: directorymergewindow.cpp:538 +#: directorymergewindow.cpp:539 #, kde-format msgid "Nonwhite" msgstr "" -#: directorymergewindow.cpp:540 +#: directorymergewindow.cpp:541 #, kde-format msgid "White" msgstr "ئاق" -#: directorymergewindow.cpp:674 +#: directorymergewindow.cpp:676 #, kde-format msgid "Unable to compare non-normal file with normal file." msgstr "" -#: directorymergewindow.cpp:688 +#: directorymergewindow.cpp:690 #, kde-format msgid "Mix of links and normal files." msgstr "" -#: directorymergewindow.cpp:695 +#: directorymergewindow.cpp:697 #, kde-format msgid "Link: " msgstr "" -#: directorymergewindow.cpp:704 +#: directorymergewindow.cpp:706 #, kde-format msgid "Size. " msgstr "" -#: directorymergewindow.cpp:718 directorymergewindow.cpp:728 +#: directorymergewindow.cpp:720 directorymergewindow.cpp:730 #, kde-format msgid "Date & Size: " msgstr "" -#: directorymergewindow.cpp:748 +#: directorymergewindow.cpp:751 #, kde-format msgid "Comparing file..." msgstr "" -#: directorymergewindow.cpp:801 +#: directorymergewindow.cpp:813 #, kde-format msgid "" "You are currently doing a directory merge. Are you sure, you want to abort " "the merge and rescan the directory?" msgstr "" -#: directorymergewindow.cpp:802 kdiff3.cpp:698 kdiff3.cpp:708 kdiff3.cpp:720 -#: mergeresultwindow.cpp:372 pdiff.cpp:1033 pdiff.cpp:1910 pdiff.cpp:1920 +#: directorymergewindow.cpp:814 kdiff3.cpp:697 kdiff3.cpp:707 kdiff3.cpp:719 +#: mergeresultwindow.cpp:400 pdiff.cpp:1031 pdiff.cpp:1920 pdiff.cpp:1930 #, kde-format msgid "Warning" msgstr "ئاگاھلاندۇرۇش" -#: directorymergewindow.cpp:803 directorymergewindow.cpp:3393 +#: directorymergewindow.cpp:815 directorymergewindow.cpp:3407 #, kde-format msgid "Rescan" msgstr "قايتا تەكشۈر" -#: directorymergewindow.cpp:804 pdiff.cpp:1035 +#: directorymergewindow.cpp:816 pdiff.cpp:1033 #, kde-format msgid "Continue Merging" msgstr "" -#: directorymergewindow.cpp:971 +#: directorymergewindow.cpp:984 #, kde-format msgid "Opening of directories failed:" msgstr "" -#: directorymergewindow.cpp:975 +#: directorymergewindow.cpp:988 #, kde-format msgid "Dir A \"%1\" does not exist or is not a directory.\n" msgstr "" -#: directorymergewindow.cpp:980 +#: directorymergewindow.cpp:993 #, kde-format msgid "Dir B \"%1\" does not exist or is not a directory.\n" msgstr "" -#: directorymergewindow.cpp:985 +#: directorymergewindow.cpp:998 #, kde-format msgid "Dir C \"%1\" does not exist or is not a directory.\n" msgstr "" -#: directorymergewindow.cpp:988 +#: directorymergewindow.cpp:1001 #, kde-format msgid "Directory Open Error" msgstr "" -#: directorymergewindow.cpp:996 +#: directorymergewindow.cpp:1009 #, kde-format msgid "" "The destination directory must not be the same as A or B when three " @@ -365,49 +365,49 @@ "Check again before continuing." msgstr "" -#: directorymergewindow.cpp:998 +#: directorymergewindow.cpp:1011 #, kde-format msgid "Parameter Warning" msgstr "" -#: directorymergewindow.cpp:1003 +#: directorymergewindow.cpp:1016 #, kde-format msgid "Scanning directories..." msgstr "" -#: directorymergewindow.cpp:1029 +#: directorymergewindow.cpp:1042 #, kde-format msgid "Reading Directory A" msgstr "" -#: directorymergewindow.cpp:1038 +#: directorymergewindow.cpp:1051 #, kde-format msgid "Reading Directory B" msgstr "" -#: directorymergewindow.cpp:1048 +#: directorymergewindow.cpp:1061 #, kde-format msgid "Reading Directory C" msgstr "" -#: directorymergewindow.cpp:1064 +#: directorymergewindow.cpp:1077 #, kde-format msgid "Some subdirectories were not readable in" msgstr "" -#: directorymergewindow.cpp:1069 +#: directorymergewindow.cpp:1082 #, kde-format msgid "Check the permissions of the subdirectories." msgstr "" -#: directorymergewindow.cpp:1106 kdiff3.cpp:666 kdiff3.cpp:753 kdiff3.cpp:777 -#: kdiff3.cpp:1065 kdiff3.cpp:1086 pdiff.cpp:1116 pdiff.cpp:1170 pdiff.cpp:1218 -#: pdiff.cpp:1234 pdiff.cpp:1277 pdiff.cpp:1301 +#: directorymergewindow.cpp:1119 kdiff3.cpp:665 kdiff3.cpp:752 kdiff3.cpp:776 +#: kdiff3.cpp:1072 kdiff3.cpp:1093 pdiff.cpp:1115 pdiff.cpp:1178 pdiff.cpp:1228 +#: pdiff.cpp:1244 pdiff.cpp:1287 pdiff.cpp:1311 #, kde-format msgid "Ready." msgstr "تەييار." -#: directorymergewindow.cpp:1121 +#: directorymergewindow.cpp:1134 #, kde-format msgid "" "Directory Comparison Status\n" @@ -417,22 +417,22 @@ "Number of different files: %3" msgstr "" -#: directorymergewindow.cpp:1128 +#: directorymergewindow.cpp:1141 #, kde-format msgid "Number of manual merges: %1" msgstr "" -#: directorymergewindow.cpp:1394 +#: directorymergewindow.cpp:1407 #, kde-format msgid "This affects all merge operations." msgstr "" -#: directorymergewindow.cpp:1395 +#: directorymergewindow.cpp:1408 #, kde-format msgid "Changing All Merge Operations" msgstr "" -#: directorymergewindow.cpp:1695 +#: directorymergewindow.cpp:1708 #, fuzzy, kde-format #| msgid "Processing " msgid "" @@ -440,44 +440,44 @@ "%3" msgstr "بىر تەرەپ قىلىۋاتىدۇ " -#: directorymergewindow.cpp:1738 directorymergewindow.cpp:1742 +#: directorymergewindow.cpp:1751 directorymergewindow.cpp:1755 #, kde-format msgid "Some files could not be processed." msgstr "" -#: directorymergewindow.cpp:2222 directorymergewindow.cpp:2247 -#: directorymergewindow.cpp:2271 +#: directorymergewindow.cpp:2235 directorymergewindow.cpp:2260 +#: directorymergewindow.cpp:2285 #, kde-format msgid "This operation is currently not possible." msgstr "" -#: directorymergewindow.cpp:2222 directorymergewindow.cpp:2247 -#: directorymergewindow.cpp:2271 directorymergewindow.cpp:2552 +#: directorymergewindow.cpp:2235 directorymergewindow.cpp:2260 +#: directorymergewindow.cpp:2285 directorymergewindow.cpp:2565 #, kde-format msgid "Operation Not Possible" msgstr "" -#: directorymergewindow.cpp:2318 +#: directorymergewindow.cpp:2332 #, kde-format msgid "An error occurred while copying." msgstr "" -#: directorymergewindow.cpp:2319 directorymergewindow.cpp:2759 +#: directorymergewindow.cpp:2333 directorymergewindow.cpp:2772 #, kde-format msgid "Merge Error" msgstr "" -#: directorymergewindow.cpp:2396 +#: directorymergewindow.cpp:2410 #, kde-format msgid "Unknown merge operation. (This must never happen!)" msgstr "" -#: directorymergewindow.cpp:2441 +#: directorymergewindow.cpp:2455 #, kde-format msgid "Unknown merge operation." msgstr "" -#: directorymergewindow.cpp:2454 +#: directorymergewindow.cpp:2468 #, kde-format msgid "" "The merge is about to begin.\n" @@ -490,50 +490,50 @@ "whatsoever! Make backups of your vital data!" msgstr "" -#: directorymergewindow.cpp:2459 +#: directorymergewindow.cpp:2473 #, kde-format msgid "Starting Merge" msgstr "" -#: directorymergewindow.cpp:2460 +#: directorymergewindow.cpp:2474 #, kde-format msgid "Do It" msgstr "" -#: directorymergewindow.cpp:2461 +#: directorymergewindow.cpp:2475 #, kde-format msgid "Simulate It" msgstr "" -#: directorymergewindow.cpp:2487 +#: directorymergewindow.cpp:2501 #, kde-format msgid "" "The highlighted item has a different type in the different directories. " "Select what to do." msgstr "" -#: directorymergewindow.cpp:2491 +#: directorymergewindow.cpp:2505 #, kde-format msgid "" "The modification dates of the file are equal but the files are not. Select " "what to do." msgstr "" -#: directorymergewindow.cpp:2495 +#: directorymergewindow.cpp:2509 #, kde-format msgid "" "The highlighted item was changed in one directory and deleted in the other. " "Select what to do." msgstr "" -#: directorymergewindow.cpp:2552 +#: directorymergewindow.cpp:2565 #, kde-format msgid "" "This operation is currently not possible because directory merge is " "currently running." msgstr "" -#: directorymergewindow.cpp:2609 +#: directorymergewindow.cpp:2622 #, kde-format msgid "" "There was an error in the last step.\n" @@ -541,970 +541,975 @@ "to skip this item?" msgstr "" -#: directorymergewindow.cpp:2611 +#: directorymergewindow.cpp:2624 #, kde-format msgid "Continue merge after an error" msgstr "" -#: directorymergewindow.cpp:2612 +#: directorymergewindow.cpp:2625 #, kde-format msgid "Continue With Last Item" msgstr "" -#: directorymergewindow.cpp:2613 +#: directorymergewindow.cpp:2626 #, kde-format msgid "Skip Item" msgstr "" -#: directorymergewindow.cpp:2709 +#: directorymergewindow.cpp:2722 #, kde-format msgid "Merge operation complete." msgstr "" -#: directorymergewindow.cpp:2709 directorymergewindow.cpp:2712 +#: directorymergewindow.cpp:2722 directorymergewindow.cpp:2725 #, kde-format msgid "Merge Complete" msgstr "" -#: directorymergewindow.cpp:2722 +#: directorymergewindow.cpp:2735 #, kde-format msgid "" "Simulated merge complete: Check if you agree with the proposed operations." msgstr "" -#: directorymergewindow.cpp:2758 +#: directorymergewindow.cpp:2771 #, kde-format msgid "An error occurred. Press OK to see detailed information." msgstr "" -#: directorymergewindow.cpp:2791 +#: directorymergewindow.cpp:2804 #, kde-format msgid "Error: While deleting %1: Creating backup failed." msgstr "" -#: directorymergewindow.cpp:2798 +#: directorymergewindow.cpp:2811 #, kde-format msgid "delete directory recursively( %1 )" msgstr "" -#: directorymergewindow.cpp:2800 +#: directorymergewindow.cpp:2813 #, kde-format msgid "delete( %1 )" msgstr "" -#: directorymergewindow.cpp:2815 +#: directorymergewindow.cpp:2828 #, kde-format msgid "Error: delete dir operation failed while trying to read the directory." msgstr "" -#: directorymergewindow.cpp:2834 +#: directorymergewindow.cpp:2847 #, kde-format msgid "Error: rmdir( %1 ) operation failed." msgstr "" -#: directorymergewindow.cpp:2844 +#: directorymergewindow.cpp:2857 #, kde-format msgid "Error: delete operation failed." msgstr "" -#: directorymergewindow.cpp:2870 +#: directorymergewindow.cpp:2884 #, kde-format msgid "manual merge( %1, %2, %3 -> %4)" msgstr "" -#: directorymergewindow.cpp:2873 +#: directorymergewindow.cpp:2887 #, kde-format msgid "" " Note: After a manual merge the user should continue by pressing F7." msgstr "" -#: directorymergewindow.cpp:2900 +#: directorymergewindow.cpp:2914 #, kde-format msgid "Error: copy( %1 -> %2 ) failed.Deleting existing destination failed." msgstr "" -#: directorymergewindow.cpp:2909 +#: directorymergewindow.cpp:2923 #, kde-format msgid "copyLink( %1 -> %2 )" msgstr "" -#: directorymergewindow.cpp:2918 +#: directorymergewindow.cpp:2932 #, kde-format msgid "Error: copyLink failed: Remote links are not yet supported." msgstr "" -#: directorymergewindow.cpp:2928 +#: directorymergewindow.cpp:2942 #, kde-format msgid "Error: copyLink failed." msgstr "" -#: directorymergewindow.cpp:2953 +#: directorymergewindow.cpp:2967 #, kde-format msgid "copy( %1 -> %2 )" msgstr "" -#: directorymergewindow.cpp:2979 +#: directorymergewindow.cpp:2993 #, kde-format msgid "Error during rename( %1 -> %2 ): Cannot delete existing destination." msgstr "" -#: directorymergewindow.cpp:2986 +#: directorymergewindow.cpp:3000 #, kde-format msgid "rename( %1 -> %2 )" msgstr "" -#: directorymergewindow.cpp:2995 +#: directorymergewindow.cpp:3009 #, kde-format msgid "Error: Rename failed." msgstr "" -#: directorymergewindow.cpp:3013 +#: directorymergewindow.cpp:3027 #, kde-format msgid "Error during makeDir of %1. Cannot delete existing file." msgstr "" -#: directorymergewindow.cpp:3030 +#: directorymergewindow.cpp:3044 #, kde-format msgid "makeDir( %1 )" msgstr "" -#: directorymergewindow.cpp:3040 +#: directorymergewindow.cpp:3054 #, kde-format msgid "Error while creating directory." msgstr "" -#: directorymergewindow.cpp:3076 directorymergewindow.cpp:3195 +#: directorymergewindow.cpp:3090 directorymergewindow.cpp:3209 #, kde-format msgid "Dest" msgstr "" -#: directorymergewindow.cpp:3084 directorymergewindow.cpp:3113 +#: directorymergewindow.cpp:3098 directorymergewindow.cpp:3127 #, kde-format msgid "Dir" msgstr "" -#: directorymergewindow.cpp:3084 +#: directorymergewindow.cpp:3098 #, kde-format msgid "Type" msgstr "تىپى" -#: directorymergewindow.cpp:3084 +#: directorymergewindow.cpp:3098 #, kde-format msgid "Size" msgstr "چوڭلۇقى" -#: directorymergewindow.cpp:3085 +#: directorymergewindow.cpp:3099 #, kde-format msgid "Attr" msgstr "" -#: directorymergewindow.cpp:3085 +#: directorymergewindow.cpp:3099 #, kde-format msgid "Last Modification" msgstr "" -#: directorymergewindow.cpp:3085 +#: directorymergewindow.cpp:3099 #, kde-format msgid "Link-Destination" msgstr "" -#: directorymergewindow.cpp:3113 +#: directorymergewindow.cpp:3127 #, kde-format msgid "File" msgstr "ھۆججەت" -#: directorymergewindow.cpp:3113 +#: directorymergewindow.cpp:3127 #, kde-format msgid "-Link" msgstr "" -#: directorymergewindow.cpp:3119 +#: directorymergewindow.cpp:3133 #, kde-format msgid "not available" msgstr "ئىشلەتكىلى بولمايدۇ" -#: directorymergewindow.cpp:3137 +#: directorymergewindow.cpp:3151 #, kde-format msgid "A (Dest): " msgstr "" -#: directorymergewindow.cpp:3141 +#: directorymergewindow.cpp:3155 #, kde-format msgid "A: " msgstr "" -#: directorymergewindow.cpp:3141 +#: directorymergewindow.cpp:3155 #, kde-format msgid "A (Base): " msgstr "" -#: directorymergewindow.cpp:3147 +#: directorymergewindow.cpp:3161 #, kde-format msgid "B (Dest): " msgstr "" -#: directorymergewindow.cpp:3151 +#: directorymergewindow.cpp:3165 #, kde-format msgid "B: " msgstr "" -#: directorymergewindow.cpp:3156 +#: directorymergewindow.cpp:3170 #, kde-format msgid "C (Dest): " msgstr "" -#: directorymergewindow.cpp:3160 +#: directorymergewindow.cpp:3174 #, kde-format msgid "C: " msgstr "" -#: directorymergewindow.cpp:3163 +#: directorymergewindow.cpp:3177 #, kde-format msgid "Dest: " msgstr "" #. i18n("Saving Directory Merge State ...")); -#: directorymergewindow.cpp:3238 +#: directorymergewindow.cpp:3252 #, kde-format msgid "Save Directory Merge State As..." msgstr "" -#: directorymergewindow.cpp:3387 +#: directorymergewindow.cpp:3401 #, kde-format msgid "Start/Continue Directory Merge" msgstr "" -#: directorymergewindow.cpp:3388 +#: directorymergewindow.cpp:3402 #, kde-format msgid "Run Operation for Current Item" msgstr "" -#: directorymergewindow.cpp:3389 +#: directorymergewindow.cpp:3403 #, kde-format msgid "Compare Selected File" msgstr "" -#: directorymergewindow.cpp:3390 +#: directorymergewindow.cpp:3404 #, kde-format msgid "Merge Current File" msgstr "" -#: directorymergewindow.cpp:3390 +#: directorymergewindow.cpp:3404 #, kde-format msgid "" "Merge\n" "File" msgstr "" -#: directorymergewindow.cpp:3391 +#: directorymergewindow.cpp:3405 #, kde-format msgid "Fold All Subdirs" msgstr "" -#: directorymergewindow.cpp:3392 +#: directorymergewindow.cpp:3406 #, kde-format msgid "Unfold All Subdirs" msgstr "" #. i18n("Save Directory Merge State ..."), 0, this, &DirectoryMergeWindow::slotSaveMergeState, ac, "dir_save_merge_state"); #. i18n("Load Directory Merge State ..."), 0, this, &DirectoryMergeWindow::slotLoadMergeState, ac, "dir_load_merge_state"); -#: directorymergewindow.cpp:3396 +#: directorymergewindow.cpp:3410 #, kde-format msgid "Choose A for All Items" msgstr "" -#: directorymergewindow.cpp:3397 +#: directorymergewindow.cpp:3411 #, kde-format msgid "Choose B for All Items" msgstr "" -#: directorymergewindow.cpp:3398 +#: directorymergewindow.cpp:3412 #, kde-format msgid "Choose C for All Items" msgstr "" -#: directorymergewindow.cpp:3399 +#: directorymergewindow.cpp:3413 #, kde-format msgid "Auto-Choose Operation for All Items" msgstr "" -#: directorymergewindow.cpp:3400 +#: directorymergewindow.cpp:3414 #, kde-format msgid "No Operation for All Items" msgstr "" #. i18n("Synchronize Directories"), 0, this, &DirectoryMergeWindow::slotSynchronizeDirectories, ac, "dir_synchronize_directories"); #. d->m_pDirChooseNewerFiles = GuiUtils::createAction< KToggleAction >(i18n("Copy Newer Files Instead of Merging"), 0, this, &DirectoryMergeWindow::slotChooseNewerFiles, ac, "dir_choose_newer_files"); -#: directorymergewindow.cpp:3405 +#: directorymergewindow.cpp:3419 #, kde-format msgid "Show Identical Files" msgstr "" -#: directorymergewindow.cpp:3405 +#: directorymergewindow.cpp:3419 #, kde-format msgid "" "Identical\n" "Files" msgstr "" -#: directorymergewindow.cpp:3406 +#: directorymergewindow.cpp:3420 #, kde-format msgid "Show Different Files" msgstr "" -#: directorymergewindow.cpp:3407 +#: directorymergewindow.cpp:3421 #, kde-format msgid "Show Files only in A" msgstr "" -#: directorymergewindow.cpp:3407 +#: directorymergewindow.cpp:3421 #, kde-format msgid "" "Files\n" "only in A" msgstr "" -#: directorymergewindow.cpp:3408 +#: directorymergewindow.cpp:3422 #, kde-format msgid "Show Files only in B" msgstr "" -#: directorymergewindow.cpp:3408 +#: directorymergewindow.cpp:3422 #, kde-format msgid "" "Files\n" "only in B" msgstr "" -#: directorymergewindow.cpp:3409 +#: directorymergewindow.cpp:3423 #, kde-format msgid "Show Files only in C" msgstr "" -#: directorymergewindow.cpp:3409 +#: directorymergewindow.cpp:3423 #, kde-format msgid "" "Files\n" "only in C" msgstr "" -#: directorymergewindow.cpp:3413 +#: directorymergewindow.cpp:3427 #, kde-format msgid "Compare Explicitly Selected Files" msgstr "" -#: directorymergewindow.cpp:3414 +#: directorymergewindow.cpp:3428 #, kde-format msgid "Merge Explicitly Selected Files" msgstr "" -#: directorymergewindow.cpp:3416 directorymergewindow.cpp:3423 +#: directorymergewindow.cpp:3430 directorymergewindow.cpp:3437 #, kde-format msgid "Do Nothing" msgstr "ھېچقانداق قىلما" -#: directorymergewindow.cpp:3428 +#: directorymergewindow.cpp:3442 #, kde-format msgid "Delete A && B" msgstr "" -#: directorymergewindow.cpp:3431 +#: directorymergewindow.cpp:3445 #, kde-format msgid "Merge to A && B" msgstr "" -#: fileaccess.cpp:462 SourceData.cpp:493 +#: fileaccess.cpp:301 +#, kde-format +msgid "Unable to determine full url. No parent specified." +msgstr "" + +#: fileaccess.cpp:482 SourceData.cpp:506 #, kde-format msgid "Failed to read file: %1" msgstr "" -#: fileaccess.cpp:587 +#: fileaccess.cpp:624 #, kde-format msgid "Creating temp copy of %1 failed." msgstr "" -#: fileaccess.cpp:595 fileaccess.cpp:600 +#: fileaccess.cpp:632 fileaccess.cpp:637 #, kde-format msgid "Opening %1 failed. %2" msgstr "" -#: fileaccess.cpp:619 fileaccess.cpp:627 +#: fileaccess.cpp:656 fileaccess.cpp:664 #, kde-format msgid "Error reading from %1. %2" msgstr "" -#: fileaccess.cpp:751 +#: fileaccess.cpp:788 #, kde-format msgid "" "While trying to make a backup, deleting an older backup failed.\n" "Filename: %1" msgstr "" -#: fileaccess.cpp:758 +#: fileaccess.cpp:795 #, kde-format msgid "" "While trying to make a backup, renaming failed.\n" "Filenames: %1 -> %2" msgstr "" -#: fileaccess.cpp:828 +#: fileaccess.cpp:865 #, kde-format msgid "Getting file status: %1" msgstr "" -#: fileaccess.cpp:869 +#: fileaccess.cpp:906 #, kde-format msgid "Reading file: %1" msgstr "" -#: fileaccess.cpp:907 +#: fileaccess.cpp:944 #, kde-format msgid "Writing file: %1" msgstr "" -#: fileaccess.cpp:940 +#: fileaccess.cpp:977 #, kde-format msgid "Out of memory" msgstr "ئەسلەك يېتىشمىدى" -#: fileaccess.cpp:976 +#: fileaccess.cpp:1013 #, kde-format msgid "Making directory: %1" msgstr "" -#: fileaccess.cpp:997 +#: fileaccess.cpp:1034 #, kde-format msgid "Removing directory: %1" msgstr "" -#: fileaccess.cpp:1012 +#: fileaccess.cpp:1049 #, kde-format msgid "Removing file: %1" msgstr "" -#: fileaccess.cpp:1028 +#: fileaccess.cpp:1065 #, kde-format msgid "Creating symbolic link: %1 -> %2" msgstr "" -#: fileaccess.cpp:1052 +#: fileaccess.cpp:1089 #, kde-format msgid "Renaming file: %1 -> %2" msgstr "" -#: fileaccess.cpp:1086 +#: fileaccess.cpp:1123 #, kde-format msgid "Copying file: %1 -> %2" msgstr "" -#: fileaccess.cpp:1108 +#: fileaccess.cpp:1145 #, fuzzy, kde-format #| msgid "Directory" msgid "Reading directory: %1" msgstr "مۇندەرىجە" -#: fileaccess.cpp:1162 +#: fileaccess.cpp:1202 #, kde-format msgid "Listing directory: %1" msgstr "" -#: kdiff3.cpp:181 +#: kdiff3.cpp:182 #, kde-format msgid "Current Configuration:" msgstr "" -#: kdiff3.cpp:186 +#: kdiff3.cpp:187 #, kde-format msgid "Config Option Error:" msgstr "" -#: kdiff3.cpp:240 +#: kdiff3.cpp:246 #, kde-format msgid "Option --auto used, but no output file specified." msgstr "" -#: kdiff3.cpp:416 +#: kdiff3.cpp:405 #, kde-format msgid "Option --auto ignored for directory comparison." msgstr "" -#: kdiff3.cpp:460 +#: kdiff3.cpp:449 #, kde-format msgid "Saving failed." msgstr "" -#: kdiff3.cpp:496 pdiff.cpp:1098 +#: kdiff3.cpp:494 pdiff.cpp:1096 #, kde-format msgid "Opening of these files failed:" msgstr "" -#: kdiff3.cpp:505 +#: kdiff3.cpp:503 pdiff.cpp:1105 #, kde-format -msgid "File Open Error" +msgid "File open error" msgstr "" -#: kdiff3.cpp:533 +#: kdiff3.cpp:532 #, kde-format msgid "Opens documents for comparison..." msgstr "" -#: kdiff3.cpp:535 +#: kdiff3.cpp:534 #, kde-format msgid "Reload" msgstr "قايتا يۈكلە" -#: kdiff3.cpp:538 +#: kdiff3.cpp:537 #, kde-format msgid "Saves the merge result. All conflicts must be solved!" msgstr "" -#: kdiff3.cpp:540 +#: kdiff3.cpp:539 #, kde-format msgid "Saves the current document as..." msgstr "" -#: kdiff3.cpp:543 +#: kdiff3.cpp:542 #, kde-format msgid "Print the differences" msgstr "" -#: kdiff3.cpp:546 +#: kdiff3.cpp:545 #, kde-format msgid "Quits the application" msgstr "پروگراممىنى ئاخىرلاشتۇرىدۇ" -#: kdiff3.cpp:549 +#: kdiff3.cpp:548 #, kde-format msgid "Cuts the selected section and puts it to the clipboard" msgstr "تاللانغان بۆلەكنى كېسىپ چاپلاش تاختىسىغا كۆچۈرىدۇ" -#: kdiff3.cpp:552 +#: kdiff3.cpp:551 #, kde-format msgid "Copies the selected section to the clipboard" msgstr "تاللانغان بۆلەكنى چاپلاش تاختىسىغا كۆچۈرىدۇ" -#: kdiff3.cpp:554 +#: kdiff3.cpp:553 #, kde-format msgid "Pastes the clipboard contents to current position" msgstr "چاپلاش تاختىسىنىڭ مەزمۇنىنى نۆۋەتتىكى ئورۇنغا چاپلايدۇ" -#: kdiff3.cpp:557 +#: kdiff3.cpp:556 #, kde-format msgid "Select everything in current window" msgstr "" -#: kdiff3.cpp:560 +#: kdiff3.cpp:559 #, kde-format msgid "Search for a string" msgstr "بىر ھەرپ-بەلگە ئىزدە" -#: kdiff3.cpp:562 +#: kdiff3.cpp:561 #, kde-format msgid "Search again for the string" msgstr "" -#: kdiff3.cpp:567 +#: kdiff3.cpp:566 #, kde-format msgid "Enables/disables the statusbar" msgstr "ھالەت بالداقنى ئىناۋەتلىك/ئىناۋەتسىز قىل" -#: kdiff3.cpp:571 +#: kdiff3.cpp:570 #, kde-format msgid "Configure KDiff3..." msgstr "" -#: kdiff3.cpp:590 +#: kdiff3.cpp:589 #, kde-format msgid "Go to Current Delta" msgstr "" -#: kdiff3.cpp:590 +#: kdiff3.cpp:589 #, kde-format msgid "" "Current\n" "Delta" msgstr "" -#: kdiff3.cpp:592 +#: kdiff3.cpp:591 #, kde-format msgid "Go to First Delta" msgstr "" -#: kdiff3.cpp:592 +#: kdiff3.cpp:591 #, kde-format msgid "" "First\n" "Delta" msgstr "" -#: kdiff3.cpp:594 +#: kdiff3.cpp:593 #, kde-format msgid "Go to Last Delta" msgstr "" -#: kdiff3.cpp:594 +#: kdiff3.cpp:593 #, kde-format msgid "" "Last\n" "Delta" msgstr "" -#: kdiff3.cpp:596 +#: kdiff3.cpp:595 #, kde-format msgid "(Skips white space differences when \"Show White Space\" is disabled.)" msgstr "" -#: kdiff3.cpp:597 +#: kdiff3.cpp:596 #, kde-format msgid "" "(Does not skip white space differences even when \"Show White Space\" is " "disabled.)" msgstr "" -#: kdiff3.cpp:598 +#: kdiff3.cpp:597 #, kde-format msgid "Go to Previous Delta" msgstr "" -#: kdiff3.cpp:598 +#: kdiff3.cpp:597 #, kde-format msgid "" "Prev\n" "Delta" msgstr "" -#: kdiff3.cpp:600 +#: kdiff3.cpp:599 #, kde-format msgid "Go to Next Delta" msgstr "" -#: kdiff3.cpp:600 +#: kdiff3.cpp:599 #, kde-format msgid "" "Next\n" "Delta" msgstr "" -#: kdiff3.cpp:602 +#: kdiff3.cpp:601 #, kde-format msgid "Go to Previous Conflict" msgstr "" -#: kdiff3.cpp:602 +#: kdiff3.cpp:601 #, kde-format msgid "" "Prev\n" "Conflict" msgstr "" -#: kdiff3.cpp:604 +#: kdiff3.cpp:603 #, kde-format msgid "Go to Next Conflict" msgstr "" -#: kdiff3.cpp:604 +#: kdiff3.cpp:603 #, kde-format msgid "" "Next\n" "Conflict" msgstr "" -#: kdiff3.cpp:606 +#: kdiff3.cpp:605 #, kde-format msgid "Go to Previous Unsolved Conflict" msgstr "" -#: kdiff3.cpp:606 +#: kdiff3.cpp:605 #, kde-format msgid "" "Prev\n" "Unsolved" msgstr "" -#: kdiff3.cpp:608 +#: kdiff3.cpp:607 #, kde-format msgid "Go to Next Unsolved Conflict" msgstr "" -#: kdiff3.cpp:608 +#: kdiff3.cpp:607 #, kde-format msgid "" "Next\n" "Unsolved" msgstr "" -#: kdiff3.cpp:610 +#: kdiff3.cpp:609 #, kde-format msgid "Select Line(s) From A" msgstr "" -#: kdiff3.cpp:610 +#: kdiff3.cpp:609 #, kde-format msgid "" "Choose\n" "A" msgstr "" -#: kdiff3.cpp:611 +#: kdiff3.cpp:610 #, kde-format msgid "Select Line(s) From B" msgstr "" -#: kdiff3.cpp:611 +#: kdiff3.cpp:610 #, kde-format msgid "" "Choose\n" "B" msgstr "" -#: kdiff3.cpp:612 +#: kdiff3.cpp:611 #, kde-format msgid "Select Line(s) From C" msgstr "" -#: kdiff3.cpp:612 +#: kdiff3.cpp:611 #, kde-format msgid "" "Choose\n" "C" msgstr "" -#: kdiff3.cpp:613 +#: kdiff3.cpp:612 #, kde-format msgid "Automatically Go to Next Unsolved Conflict After Source Selection" msgstr "" -#: kdiff3.cpp:613 +#: kdiff3.cpp:612 #, kde-format msgid "" "Auto\n" "Next" msgstr "" -#: kdiff3.cpp:615 +#: kdiff3.cpp:614 #, kde-format msgid "Show Space && Tabulator Characters" msgstr "" -#: kdiff3.cpp:615 +#: kdiff3.cpp:614 #, kde-format msgid "" "White\n" "Characters" msgstr "" -#: kdiff3.cpp:616 +#: kdiff3.cpp:615 #, kde-format msgid "Show White Space" msgstr "" -#: kdiff3.cpp:616 +#: kdiff3.cpp:615 #, kde-format msgid "" "White\n" "Deltas" msgstr "" -#: kdiff3.cpp:618 +#: kdiff3.cpp:617 #, kde-format msgid "Show Line Numbers" msgstr "قۇر نومۇرىنى كۆرسەت" -#: kdiff3.cpp:618 +#: kdiff3.cpp:617 #, kde-format msgid "" "Line\n" "Numbers" msgstr "" -#: kdiff3.cpp:620 +#: kdiff3.cpp:619 #, kde-format msgid "Automatically Solve Simple Conflicts" msgstr "" -#: kdiff3.cpp:621 +#: kdiff3.cpp:620 #, kde-format msgid "Set Deltas to Conflicts" msgstr "" -#: kdiff3.cpp:622 +#: kdiff3.cpp:621 #, kde-format msgid "Run Regular Expression Auto Merge" msgstr "" -#: kdiff3.cpp:623 +#: kdiff3.cpp:622 #, kde-format msgid "Automatically Solve History Conflicts" msgstr "" -#: kdiff3.cpp:624 +#: kdiff3.cpp:623 #, kde-format msgid "Split Diff At Selection" msgstr "" -#: kdiff3.cpp:625 +#: kdiff3.cpp:624 #, kde-format msgid "Join Selected Diffs" msgstr "" -#: kdiff3.cpp:627 +#: kdiff3.cpp:626 #, kde-format msgid "Show Window A" msgstr "" -#: kdiff3.cpp:628 +#: kdiff3.cpp:627 #, kde-format msgid "Show Window B" msgstr "" -#: kdiff3.cpp:629 +#: kdiff3.cpp:628 #, kde-format msgid "Show Window C" msgstr "" -#: kdiff3.cpp:631 +#: kdiff3.cpp:630 #, kde-format msgid "Normal Overview" msgstr "" -#: kdiff3.cpp:632 +#: kdiff3.cpp:631 #, kde-format msgid "A vs. B Overview" msgstr "" -#: kdiff3.cpp:633 +#: kdiff3.cpp:632 #, kde-format msgid "A vs. C Overview" msgstr "" -#: kdiff3.cpp:634 +#: kdiff3.cpp:633 #, kde-format msgid "B vs. C Overview" msgstr "" -#: kdiff3.cpp:635 +#: kdiff3.cpp:634 #, kde-format msgid "Word Wrap Diff Windows" msgstr "" -#: kdiff3.cpp:636 +#: kdiff3.cpp:635 #, kde-format msgid "Add Manual Diff Alignment" msgstr "" -#: kdiff3.cpp:637 +#: kdiff3.cpp:636 #, kde-format msgid "Clear All Manual Diff Alignments" msgstr "" -#: kdiff3.cpp:639 +#: kdiff3.cpp:638 #, kde-format msgid "Focus Next Window" msgstr "" -#: kdiff3.cpp:640 +#: kdiff3.cpp:639 #, kde-format msgid "Focus Prev Window" msgstr "" -#: kdiff3.cpp:641 +#: kdiff3.cpp:640 #, kde-format msgid "Toggle Split Orientation" msgstr "" -#: kdiff3.cpp:643 +#: kdiff3.cpp:642 #, kde-format msgid "Dir && Text Split Screen View" msgstr "" -#: kdiff3.cpp:645 +#: kdiff3.cpp:644 #, kde-format msgid "Toggle Between Dir && Text View" msgstr "" -#: kdiff3.cpp:697 pdiff.cpp:1909 +#: kdiff3.cpp:696 pdiff.cpp:1919 #, kde-format msgid "The merge result has not been saved." msgstr "" -#: kdiff3.cpp:699 +#: kdiff3.cpp:698 #, kde-format msgid "Save && Quit" msgstr "" -#: kdiff3.cpp:700 +#: kdiff3.cpp:699 #, kde-format msgid "Quit Without Saving" msgstr "" -#: kdiff3.cpp:708 pdiff.cpp:1920 +#: kdiff3.cpp:707 pdiff.cpp:1930 #, kde-format msgid "Saving the merge result failed." msgstr "" -#: kdiff3.cpp:719 pdiff.cpp:1032 +#: kdiff3.cpp:718 pdiff.cpp:1030 #, kde-format msgid "" "You are currently doing a directory merge. Are you sure, you want to abort?" msgstr "" -#: kdiff3.cpp:742 +#: kdiff3.cpp:741 #, kde-format msgid "Saving file..." msgstr "ھۆججەت ساقلاۋاتىدۇ…" -#: kdiff3.cpp:759 +#: kdiff3.cpp:758 #, kde-format msgid "Saving file with a new filename..." msgstr "يېڭى ھۆججەت ئاتىنى ئىشلىتىپ ساقلاۋاتىدۇ…" -#: kdiff3.cpp:761 +#: kdiff3.cpp:760 #, kde-format msgid "Save As..." msgstr "باشقا ئاتتا ساقلا…" -#: kdiff3.cpp:820 +#: kdiff3.cpp:819 #, kde-format msgid "Printing not implemented." msgstr "" -#: kdiff3.cpp:857 +#: kdiff3.cpp:858 #, kde-format msgid "Printing..." msgstr "بېسىۋاتىدۇ…" -#: kdiff3.cpp:943 +#: kdiff3.cpp:948 #, kde-format msgid "Printing page %1 of %2" msgstr "" -#: kdiff3.cpp:1000 +#: kdiff3.cpp:1006 #, fuzzy, kde-format #| msgid "Selection" msgid " (Selection)" msgstr "تاللاش" -#: kdiff3.cpp:1027 +#: kdiff3.cpp:1034 #, kde-format msgid "Printing completed." msgstr "" -#: kdiff3.cpp:1031 +#: kdiff3.cpp:1038 #, kde-format msgid "Printing aborted." msgstr "" -#: kdiff3.cpp:1038 +#: kdiff3.cpp:1045 #, kde-format msgid "Exiting..." msgstr "چېكىنىۋاتىدۇ…" -#: kdiff3.cpp:1049 +#: kdiff3.cpp:1056 #, kde-format msgid "Toggling toolbar..." msgstr "" -#: kdiff3.cpp:1070 +#: kdiff3.cpp:1077 #, kde-format msgid "Toggle the statusbar..." msgstr "ھالەت بالداقنى ئالماشتۇرۇش…" @@ -1530,7 +1535,7 @@ msgid "Joachim Eibl" msgstr "" -#: kdiff3_part.cpp:173 kdiff3_part.cpp:254 +#: kdiff3_part.cpp:174 kdiff3_part.cpp:255 #, kde-format msgid "Could not find files for comparison." msgstr "" @@ -1548,7 +1553,7 @@ msgstr "" #. i18n: ectx: ToolBar (mainToolBar) -#: kdiff3_part.rc:16 main.cpp:88 +#: kdiff3_part.rc:16 main.cpp:89 #, kde-format msgid "KDiff3" msgstr "KDiff3" @@ -1616,198 +1621,204 @@ msgid "Main Toolbar" msgstr "ئاساسىي قورال بالداق" -#: main.cpp:68 main.cpp:72 +#: main.cpp:69 main.cpp:73 #, kde-format msgid "Ignored. (User defined.)" msgstr "" -#: main.cpp:92 +#: main.cpp:93 #, kde-format msgid " (64 bit)" msgstr "" -#: main.cpp:94 +#: main.cpp:95 #, kde-format msgid " (32 bit)" msgstr "" -#: main.cpp:95 +#: main.cpp:96 #, kde-format msgid "Tool for Comparison and Merge of Files and Directories" msgstr "" -#: main.cpp:96 +#: main.cpp:97 #, kde-format msgid "(c) 2002-2014 Joachim Eibl, (c) 2017 Michael Reeves KF5/Qt5 port" msgstr "" -#: main.cpp:112 +#: main.cpp:113 #, kde-format msgid "Merge the input." msgstr "" -#: main.cpp:113 +#: main.cpp:114 #, kde-format msgid "Explicit base file. For compatibility with certain tools." msgstr "" -#: main.cpp:114 +#: main.cpp:115 #, kde-format msgid "Output file. Implies -m. E.g.: -o newfile.txt" msgstr "" -#: main.cpp:115 +#: main.cpp:116 #, kde-format msgid "Output file, again. (For compatibility with certain tools.)" msgstr "" -#: main.cpp:116 +#: main.cpp:118 #, kde-format msgid "No GUI if all conflicts are auto-solvable. (Needs -o file)" msgstr "" -#: main.cpp:117 +#: main.cpp:120 +#, fuzzy, kde-format +#| msgid "Ignore" +msgid "Ignored." +msgstr "پەرۋا قىلما" + +#: main.cpp:122 #, kde-format msgid "Do not solve conflicts automatically." msgstr "" -#: main.cpp:118 +#: main.cpp:123 #, kde-format msgid "Visible name replacement for input file 1 (base)." msgstr "" -#: main.cpp:119 +#: main.cpp:124 #, kde-format msgid "Visible name replacement for input file 2." msgstr "" -#: main.cpp:120 +#: main.cpp:125 #, kde-format msgid "Visible name replacement for input file 3." msgstr "" -#: main.cpp:121 +#: main.cpp:126 #, kde-format msgid "Alternative visible name replacement. Supply this once for every input." msgstr "" -#: main.cpp:122 +#: main.cpp:127 #, kde-format msgid "" "Override a config setting. Use once for every setting. E.g.: --cs " "\"AutoAdvance=1\"" msgstr "" -#: main.cpp:123 +#: main.cpp:128 #, kde-format msgid "Show list of config settings and current values." msgstr "" -#: main.cpp:124 +#: main.cpp:129 #, kde-format msgid "Use a different config file." msgstr "" -#: main.cpp:127 +#: main.cpp:132 #, kde-format msgid "file1 to open (base, if not specified via --base)" msgstr "" -#: main.cpp:128 +#: main.cpp:133 #, kde-format msgid "file2 to open" msgstr "" -#: main.cpp:129 +#: main.cpp:134 #, kde-format msgid "file3 to open" msgstr "" -#: main.cpp:153 +#: main.cpp:158 #, kde-format msgid "See kdiff3 --help for supported options." msgstr "" -#: mergeresultwindow.cpp:158 +#: mergeresultwindow.cpp:171 #, kde-format msgid "Choose A Everywhere" msgstr "" -#: mergeresultwindow.cpp:159 +#: mergeresultwindow.cpp:172 #, kde-format msgid "Choose B Everywhere" msgstr "" -#: mergeresultwindow.cpp:160 +#: mergeresultwindow.cpp:173 #, kde-format msgid "Choose C Everywhere" msgstr "" -#: mergeresultwindow.cpp:161 +#: mergeresultwindow.cpp:174 #, kde-format msgid "Choose A for All Unsolved Conflicts" msgstr "" -#: mergeresultwindow.cpp:162 +#: mergeresultwindow.cpp:175 #, kde-format msgid "Choose B for All Unsolved Conflicts" msgstr "" -#: mergeresultwindow.cpp:163 +#: mergeresultwindow.cpp:176 #, kde-format msgid "Choose C for All Unsolved Conflicts" msgstr "" -#: mergeresultwindow.cpp:164 +#: mergeresultwindow.cpp:177 #, kde-format msgid "Choose A for All Unsolved Whitespace Conflicts" msgstr "" -#: mergeresultwindow.cpp:165 +#: mergeresultwindow.cpp:178 #, kde-format msgid "Choose B for All Unsolved Whitespace Conflicts" msgstr "" -#: mergeresultwindow.cpp:166 +#: mergeresultwindow.cpp:179 #, kde-format msgid "Choose C for All Unsolved Whitespace Conflicts" msgstr "" -#: mergeresultwindow.cpp:176 +#: mergeresultwindow.cpp:204 #, kde-format msgid "Number of remaining unsolved conflicts: %1 (of which %2 are whitespace)" msgstr "" -#: mergeresultwindow.cpp:370 +#: mergeresultwindow.cpp:398 #, kde-format msgid "" "The output has been modified.\n" "If you continue your changes will be lost." msgstr "" -#: mergeresultwindow.cpp:936 pdiff.cpp:827 +#: mergeresultwindow.cpp:964 pdiff.cpp:817 #, kde-format msgid "All input files are binary equal." msgstr "" -#: mergeresultwindow.cpp:938 +#: mergeresultwindow.cpp:966 #, kde-format msgid "All input files contain the same text." msgstr "" -#: mergeresultwindow.cpp:942 mergeresultwindow.cpp:946 -#: mergeresultwindow.cpp:950 pdiff.cpp:833 pdiff.cpp:837 pdiff.cpp:841 +#: mergeresultwindow.cpp:970 mergeresultwindow.cpp:974 +#: mergeresultwindow.cpp:978 pdiff.cpp:823 pdiff.cpp:827 pdiff.cpp:831 #, kde-format msgid "Files %1 and %2 are binary equal.\n" msgstr "" -#: mergeresultwindow.cpp:944 mergeresultwindow.cpp:948 -#: mergeresultwindow.cpp:952 +#: mergeresultwindow.cpp:972 mergeresultwindow.cpp:976 +#: mergeresultwindow.cpp:980 #, kde-format msgid "Files %1 and %2 have equal text.\n" msgstr "" -#: mergeresultwindow.cpp:958 +#: mergeresultwindow.cpp:986 #, kde-format msgid "" "Total number of conflicts: %1\n" @@ -1816,39 +1827,39 @@ "%4" msgstr "" -#: mergeresultwindow.cpp:964 +#: mergeresultwindow.cpp:992 #, kde-format msgid "Conflicts" msgstr "توقۇنۇشلار" -#: mergeresultwindow.cpp:1873 +#: mergeresultwindow.cpp:1901 #, kde-format msgid "" msgstr "" -#: mergeresultwindow.cpp:1881 +#: mergeresultwindow.cpp:1909 #, kde-format msgid "" msgstr "" -#: mergeresultwindow.cpp:1883 mergeresultwindow.cpp:2755 +#: mergeresultwindow.cpp:1911 mergeresultwindow.cpp:2783 #, kde-format msgid "" msgstr "" -#: mergeresultwindow.cpp:2967 +#: mergeresultwindow.cpp:2995 #, kde-format msgid "" "Not all conflicts are solved yet.\n" "File not saved." msgstr "" -#: mergeresultwindow.cpp:2969 mergeresultwindow.cpp:2978 +#: mergeresultwindow.cpp:2997 mergeresultwindow.cpp:3006 #, kde-format msgid "Conflicts Left" msgstr "" -#: mergeresultwindow.cpp:2976 +#: mergeresultwindow.cpp:3004 #, kde-format msgid "" "There is a line end style conflict. Please choose the line end style " @@ -1856,7 +1867,7 @@ "File not saved." msgstr "" -#: mergeresultwindow.cpp:2990 +#: mergeresultwindow.cpp:3018 #, kde-format msgid "" "\n" @@ -1864,59 +1875,59 @@ "Creating backup failed. File not saved." msgstr "" -#: mergeresultwindow.cpp:2990 mergeresultwindow.cpp:3038 +#: mergeresultwindow.cpp:3018 mergeresultwindow.cpp:3066 #, kde-format msgid "File Save Error" msgstr "" -#: mergeresultwindow.cpp:3038 +#: mergeresultwindow.cpp:3066 #, kde-format msgid "Error while writing." msgstr "" -#: mergeresultwindow.cpp:3110 +#: mergeresultwindow.cpp:3138 #, fuzzy, kde-format #| msgid "Output" msgid "Output:" msgstr "چىقار" -#: mergeresultwindow.cpp:3123 mergeresultwindow.cpp:3315 +#: mergeresultwindow.cpp:3151 mergeresultwindow.cpp:3343 #, kde-format msgid "[Modified]" msgstr "" -#: mergeresultwindow.cpp:3130 +#: mergeresultwindow.cpp:3158 #, fuzzy, kde-format #| msgid "Encoding:" msgid "Encoding for saving:" msgstr "كودلاش:" -#: mergeresultwindow.cpp:3230 +#: mergeresultwindow.cpp:3258 #, kde-format msgid "Conflict" msgstr "توقۇنۇش" -#: mergeresultwindow.cpp:3262 +#: mergeresultwindow.cpp:3290 #, kde-format msgid "Codec from A: %1" msgstr "" -#: mergeresultwindow.cpp:3264 +#: mergeresultwindow.cpp:3292 #, kde-format msgid "Codec from B: %1" msgstr "" -#: mergeresultwindow.cpp:3266 +#: mergeresultwindow.cpp:3294 #, kde-format msgid "Codec from C: %1" msgstr "" -#: optiondialog.cpp:119 +#: optiondialog.cpp:121 #, kde-format msgid "Change Font" msgstr "" -#: optiondialog.cpp:135 optiondialog.cpp:145 +#: optiondialog.cpp:137 optiondialog.cpp:147 #, kde-format msgid "" "Font: %1, %2, %3\n" @@ -1924,207 +1935,207 @@ "Example:" msgstr "" -#: optiondialog.cpp:388 +#: optiondialog.cpp:390 #, kde-format msgid "Unicode" msgstr "يۇنىكود" -#: optiondialog.cpp:389 +#: optiondialog.cpp:391 #, kde-format msgid "Latin1" msgstr "Latin1" -#: optiondialog.cpp:408 +#: optiondialog.cpp:410 #, kde-format msgid "Change this if non-ASCII characters are not displayed correctly." msgstr "" -#: optiondialog.cpp:491 +#: optiondialog.cpp:495 #, kde-format msgid "Configure" msgstr "سەپلە" -#: optiondialog.cpp:568 +#: optiondialog.cpp:573 #, kde-format msgid "Font" msgstr "خەت نۇسخا" -#: optiondialog.cpp:570 +#: optiondialog.cpp:575 #, kde-format msgid "Editor & Diff Output Font" msgstr "" -#: optiondialog.cpp:589 +#: optiondialog.cpp:594 #, kde-format msgid "Application font" msgstr "" -#: optiondialog.cpp:594 +#: optiondialog.cpp:599 #, kde-format msgid "File view font" msgstr "" -#: optiondialog.cpp:613 +#: optiondialog.cpp:618 #, fuzzy, kde-format #| msgid "Color" msgctxt "Title for color settings page" msgid "Color" msgstr "رەڭ" -#: optiondialog.cpp:614 +#: optiondialog.cpp:619 #, kde-format msgid "Colors Settings" msgstr "" -#: optiondialog.cpp:631 +#: optiondialog.cpp:644 #, kde-format msgid "Editor and Diff Views:" msgstr "" -#: optiondialog.cpp:639 +#: optiondialog.cpp:652 #, kde-format msgid "Foreground color:" msgstr "ئالدى رەڭگى:" -#: optiondialog.cpp:647 +#: optiondialog.cpp:660 #, kde-format msgid "Background color:" msgstr "تەگلىك رەڭگى:" -#: optiondialog.cpp:657 +#: optiondialog.cpp:670 #, kde-format msgid "Diff background color:" msgstr "" -#: optiondialog.cpp:666 +#: optiondialog.cpp:679 #, kde-format msgid "Color A:" msgstr "" -#: optiondialog.cpp:675 +#: optiondialog.cpp:688 #, kde-format msgid "Color B:" msgstr "" -#: optiondialog.cpp:684 +#: optiondialog.cpp:697 #, kde-format msgid "Color C:" msgstr "" -#: optiondialog.cpp:692 +#: optiondialog.cpp:705 #, kde-format msgid "Conflict color:" msgstr "" -#: optiondialog.cpp:701 +#: optiondialog.cpp:714 #, kde-format msgid "Current range background color:" msgstr "" -#: optiondialog.cpp:710 +#: optiondialog.cpp:723 #, kde-format msgid "Current range diff background color:" msgstr "" -#: optiondialog.cpp:718 +#: optiondialog.cpp:731 #, kde-format msgid "Color for manually aligned difference ranges:" msgstr "" -#: optiondialog.cpp:725 +#: optiondialog.cpp:738 #, kde-format msgid "Directory Comparison View:" msgstr "" -#: optiondialog.cpp:731 +#: optiondialog.cpp:744 #, kde-format msgid "Newest file color:" msgstr "" -#: optiondialog.cpp:736 +#: optiondialog.cpp:749 #, kde-format msgid "" "Changing this color will only be effective when starting the next directory " "comparison." msgstr "" -#: optiondialog.cpp:741 +#: optiondialog.cpp:754 #, kde-format msgid "Oldest file color:" msgstr "" -#: optiondialog.cpp:750 +#: optiondialog.cpp:763 #, kde-format msgid "Middle age file color:" msgstr "" -#: optiondialog.cpp:759 +#: optiondialog.cpp:772 #, kde-format msgid "Color for missing files:" msgstr "" -#: optiondialog.cpp:773 +#: optiondialog.cpp:786 #, kde-format msgid "Editor" msgstr "تەھرىرلىگۈچ" -#: optiondialog.cpp:774 +#: optiondialog.cpp:787 #, kde-format msgid "Editor Behavior" msgstr "" -#: optiondialog.cpp:787 +#: optiondialog.cpp:809 #, kde-format msgid "Tab inserts spaces" msgstr "" -#: optiondialog.cpp:791 +#: optiondialog.cpp:813 #, kde-format msgid "" "On: Pressing tab generates the appropriate number of spaces.\n" "Off: A tab character will be inserted." msgstr "" -#: optiondialog.cpp:796 +#: optiondialog.cpp:818 #, kde-format msgid "Tab size:" msgstr "" -#: optiondialog.cpp:803 +#: optiondialog.cpp:825 #, kde-format msgid "Auto indentation" msgstr "" -#: optiondialog.cpp:807 +#: optiondialog.cpp:829 #, kde-format msgid "On: The indentation of the previous line is used for a new line.\n" msgstr "" -#: optiondialog.cpp:810 +#: optiondialog.cpp:832 #, kde-format msgid "Auto copy selection" msgstr "" -#: optiondialog.cpp:814 +#: optiondialog.cpp:836 #, kde-format msgid "" "On: Any selection is immediately written to the clipboard.\n" "Off: You must explicitly copy e.g. via Ctrl-C." msgstr "" -#: optiondialog.cpp:829 +#: optiondialog.cpp:851 #, kde-format msgid "" "Sets the line endings for when an edited file is saved.\n" "DOS/Windows: CR+LF; UNIX: LF; with CR=0D, LF=0A" msgstr "" -#: optiondialog.cpp:839 +#: optiondialog.cpp:861 #, kde-format msgid "Diff" msgstr "سېلىشتۇرۇش(Diff)" -#: optiondialog.cpp:840 +#: optiondialog.cpp:862 #, kde-format msgid "Diff Settings" msgstr "" @@ -2138,12 +2149,12 @@ #. ); #. ++line; #. -#: optiondialog.cpp:865 +#: optiondialog.cpp:896 #, kde-format msgid "Ignore numbers (treat as white space)" msgstr "" -#: optiondialog.cpp:869 +#: optiondialog.cpp:900 #, kde-format msgid "" "Ignore number characters during line matching phase. (Similar to Ignore " @@ -2151,66 +2162,66 @@ "Might help to compare files with numeric data." msgstr "" -#: optiondialog.cpp:873 +#: optiondialog.cpp:904 #, kde-format msgid "Ignore C/C++ comments (treat as white space)" msgstr "" -#: optiondialog.cpp:876 +#: optiondialog.cpp:907 #, kde-format msgid "Treat C/C++ comments like white space." msgstr "" -#: optiondialog.cpp:879 +#: optiondialog.cpp:910 #, kde-format msgid "Ignore case (treat as white space)" msgstr "" -#: optiondialog.cpp:883 +#: optiondialog.cpp:914 #, kde-format msgid "Treat case differences like white space changes. ('a'<=>'A')" msgstr "" -#: optiondialog.cpp:886 +#: optiondialog.cpp:917 #, kde-format msgid "Preprocessor command:" msgstr "" -#: optiondialog.cpp:891 +#: optiondialog.cpp:922 #, kde-format msgid "User defined pre-processing. (See the docs for details.)" msgstr "" -#: optiondialog.cpp:894 +#: optiondialog.cpp:925 #, kde-format msgid "Line-matching preprocessor command:" msgstr "" -#: optiondialog.cpp:899 +#: optiondialog.cpp:930 #, kde-format msgid "" "This pre-processor is only used during line matching.\n" "(See the docs for details.)" msgstr "" -#: optiondialog.cpp:902 +#: optiondialog.cpp:933 #, kde-format msgid "Try hard (slower)" msgstr "" -#: optiondialog.cpp:906 +#: optiondialog.cpp:937 #, kde-format msgid "" "Enables the --minimal option for the external diff.\n" "The analysis of big files will be much slower." msgstr "" -#: optiondialog.cpp:910 +#: optiondialog.cpp:941 #, kde-format msgid "Align B and C for 3 input files" msgstr "" -#: optiondialog.cpp:914 +#: optiondialog.cpp:945 #, kde-format msgid "" "Try to align B and C when comparing or merging three input files.\n" @@ -2218,66 +2229,73 @@ "(Default is off.)" msgstr "" -#: optiondialog.cpp:926 +#: optiondialog.cpp:956 +#, fuzzy, kde-format +#| msgid "Merge" +msgctxt "Settings page" +msgid "Merge" +msgstr "بىرىكتۈر" + +#: optiondialog.cpp:957 #, kde-format msgid "Merge Settings" msgstr "" -#: optiondialog.cpp:940 +#: optiondialog.cpp:980 #, kde-format msgid "Auto advance delay (ms):" msgstr "" -#: optiondialog.cpp:946 +#: optiondialog.cpp:986 #, kde-format 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 "" -#: optiondialog.cpp:950 +#: optiondialog.cpp:990 #, kde-format msgid "Show info dialogs" msgstr "" -#: optiondialog.cpp:953 +#: optiondialog.cpp:993 #, kde-format msgid "Show a dialog with information about the number of conflicts." msgstr "" -#: optiondialog.cpp:956 +#: optiondialog.cpp:996 #, kde-format msgid "White space 2-file merge default:" msgstr "" -#: optiondialog.cpp:961 optiondialog.cpp:974 +#: optiondialog.cpp:1001 optiondialog.cpp:1014 #, kde-format msgid "Manual Choice" msgstr "" -#: optiondialog.cpp:965 optiondialog.cpp:979 +#: optiondialog.cpp:1005 optiondialog.cpp:1019 #, kde-format msgid "" "Allow the merge algorithm to automatically select an input for white-space-" "only changes." msgstr "" -#: optiondialog.cpp:969 +#: optiondialog.cpp:1009 #, kde-format msgid "White space 3-file merge default:" msgstr "" -#: optiondialog.cpp:983 +#: optiondialog.cpp:1023 #, kde-format msgid "Automatic Merge Regular Expression" msgstr "" -#: optiondialog.cpp:991 smalldialogs.cpp:449 +#: optiondialog.cpp:1031 smalldialogs.cpp:459 #, kde-format msgid "Auto merge regular expression:" msgstr "" -#: optiondialog.cpp:996 +#: optiondialog.cpp:1036 #, kde-format msgid "" "Regular expression for lines where KDiff3 should automatically choose one " @@ -2286,29 +2304,29 @@ "- if available - C, otherwise B will be chosen." msgstr "" -#: optiondialog.cpp:1002 +#: optiondialog.cpp:1042 #, kde-format msgid "Run regular expression auto merge on merge start" msgstr "" -#: optiondialog.cpp:1005 +#: optiondialog.cpp:1045 #, kde-format msgid "" "Run the merge for auto merge regular expressions\n" "immediately when a merge starts.\n" msgstr "" -#: optiondialog.cpp:1010 +#: optiondialog.cpp:1050 #, kde-format msgid "Version Control History Merging" msgstr "" -#: optiondialog.cpp:1018 smalldialogs.cpp:476 +#: optiondialog.cpp:1058 smalldialogs.cpp:486 #, kde-format msgid "History start regular expression:" msgstr "" -#: optiondialog.cpp:1023 +#: optiondialog.cpp:1063 #, kde-format msgid "" "Regular expression for the start of the version control history entry.\n" @@ -2316,12 +2334,12 @@ "Default value: \".*\\$Log.*\\$.*\"" msgstr "" -#: optiondialog.cpp:1029 smalldialogs.cpp:504 +#: optiondialog.cpp:1069 smalldialogs.cpp:514 #, kde-format msgid "History entry start regular expression:" msgstr "" -#: optiondialog.cpp:1042 +#: optiondialog.cpp:1082 #, kde-format msgid "" "A version control history entry consists of several lines.\n" @@ -2333,22 +2351,22 @@ "See the documentation for details." msgstr "" -#: optiondialog.cpp:1050 +#: optiondialog.cpp:1090 #, kde-format msgid "History merge sorting" msgstr "" -#: optiondialog.cpp:1053 +#: optiondialog.cpp:1093 #, kde-format msgid "Sort version control history by a key." msgstr "" -#: optiondialog.cpp:1063 +#: optiondialog.cpp:1103 #, kde-format msgid "History entry start sort key order:" msgstr "" -#: optiondialog.cpp:1068 +#: optiondialog.cpp:1108 #, kde-format msgid "" "Each pair of parentheses used in the regular expression for the history " @@ -2360,37 +2378,37 @@ "See the documentation for details." msgstr "" -#: optiondialog.cpp:1079 +#: optiondialog.cpp:1119 #, kde-format msgid "Merge version control history on merge start" msgstr "" -#: optiondialog.cpp:1082 +#: optiondialog.cpp:1122 #, kde-format msgid "Run version control history automerge on merge start." msgstr "" -#: optiondialog.cpp:1086 +#: optiondialog.cpp:1126 #, kde-format msgid "Max number of history entries:" msgstr "" -#: optiondialog.cpp:1090 +#: optiondialog.cpp:1130 #, kde-format msgid "Cut off after specified number. Use -1 for infinite number of entries." msgstr "" -#: optiondialog.cpp:1094 +#: optiondialog.cpp:1134 #, kde-format msgid "Test your regular expressions" msgstr "" -#: optiondialog.cpp:1099 +#: optiondialog.cpp:1139 #, kde-format msgid "Irrelevant merge command:" msgstr "" -#: optiondialog.cpp:1104 +#: optiondialog.cpp:1144 #, kde-format msgid "" "If specified this script is run after automerge\n" @@ -2398,12 +2416,12 @@ "Called with the parameters: filename1 filename2 filename3" msgstr "" -#: optiondialog.cpp:1109 +#: optiondialog.cpp:1149 #, kde-format msgid "Auto save and quit on merge without conflicts" msgstr "" -#: optiondialog.cpp:1113 +#: optiondialog.cpp:1153 #, kde-format msgid "" "If KDiff3 was started for a file-merge from the command line and all\n" @@ -2412,27 +2430,27 @@ "(Similar to command line option \"--auto\".)" msgstr "" -#: optiondialog.cpp:1124 optiondialog.cpp:1125 +#: optiondialog.cpp:1164 optiondialog.cpp:1165 #, kde-format msgid "Directory" msgstr "مۇندەرىجە" -#: optiondialog.cpp:1137 +#: optiondialog.cpp:1185 #, kde-format msgid "Recursive directories" msgstr "" -#: optiondialog.cpp:1140 +#: optiondialog.cpp:1188 #, kde-format msgid "Whether to analyze subdirectories or not." msgstr "" -#: optiondialog.cpp:1142 +#: optiondialog.cpp:1190 #, kde-format msgid "File pattern(s):" msgstr "" -#: optiondialog.cpp:1148 +#: optiondialog.cpp:1196 #, kde-format msgid "" "Pattern(s) of files to be analyzed. \n" @@ -2440,12 +2458,12 @@ "Several Patterns can be specified by using the separator: ';'" msgstr "" -#: optiondialog.cpp:1153 +#: optiondialog.cpp:1201 #, kde-format msgid "File-anti-pattern(s):" msgstr "" -#: optiondialog.cpp:1159 +#: optiondialog.cpp:1207 #, kde-format msgid "" "Pattern(s) of files to be excluded from analysis. \n" @@ -2453,12 +2471,12 @@ "Several Patterns can be specified by using the separator: ';'" msgstr "" -#: optiondialog.cpp:1164 +#: optiondialog.cpp:1212 #, kde-format msgid "Dir-anti-pattern(s):" msgstr "" -#: optiondialog.cpp:1170 +#: optiondialog.cpp:1218 #, kde-format msgid "" "Pattern(s) of directories to be excluded from analysis. \n" @@ -2466,58 +2484,58 @@ "Several Patterns can be specified by using the separator: ';'" msgstr "" -#: optiondialog.cpp:1175 +#: optiondialog.cpp:1223 #, kde-format msgid "Use .cvsignore" msgstr "" -#: optiondialog.cpp:1179 +#: optiondialog.cpp:1227 #, kde-format msgid "" "Extends the antipattern to anything that would be ignored by CVS.\n" "Via local \".cvsignore\" files this can be directory specific." msgstr "" -#: optiondialog.cpp:1183 +#: optiondialog.cpp:1231 #, kde-format msgid "Find hidden files and directories" msgstr "" -#: optiondialog.cpp:1186 +#: optiondialog.cpp:1234 #, kde-format msgid "Finds hidden files and directories." msgstr "" -#: optiondialog.cpp:1189 +#: optiondialog.cpp:1237 #, kde-format msgid "Follow file links" msgstr "" -#: optiondialog.cpp:1193 +#: optiondialog.cpp:1241 #, kde-format msgid "" "On: Compare the file the link points to.\n" "Off: Compare the links." msgstr "" -#: optiondialog.cpp:1197 +#: optiondialog.cpp:1245 #, kde-format msgid "Follow directory links" msgstr "" -#: optiondialog.cpp:1201 +#: optiondialog.cpp:1249 #, kde-format msgid "" "On: Compare the directory the link points to.\n" "Off: Compare the links." msgstr "" -#: optiondialog.cpp:1210 +#: optiondialog.cpp:1258 #, kde-format msgid "Case sensitive filename comparison" msgstr "" -#: optiondialog.cpp:1214 +#: optiondialog.cpp:1262 #, kde-format msgid "" "The directory comparison will compare files or directories when their names " @@ -2526,63 +2544,63 @@ "off, otherwise on.)" msgstr "" -#: optiondialog.cpp:1218 +#: optiondialog.cpp:1266 #, kde-format msgid "Unfold all subdirectories on load" msgstr "" -#: optiondialog.cpp:1222 +#: optiondialog.cpp:1270 #, kde-format msgid "" "On: Unfold all subdirectories when starting a directory diff.\n" "Off: Leave subdirectories folded." msgstr "" -#: optiondialog.cpp:1226 +#: optiondialog.cpp:1274 #, kde-format msgid "Skip directory status report" msgstr "" -#: optiondialog.cpp:1230 +#: optiondialog.cpp:1278 #, kde-format msgid "" "On: Do not show the Directory Comparison Status.\n" "Off: Show the status dialog on start." msgstr "" -#: optiondialog.cpp:1234 +#: optiondialog.cpp:1282 #, kde-format msgid "File Comparison Mode" msgstr "" -#: optiondialog.cpp:1239 +#: optiondialog.cpp:1287 #, kde-format msgid "Binary comparison" msgstr "" -#: optiondialog.cpp:1241 +#: optiondialog.cpp:1289 #, kde-format msgid "Binary comparison of each file. (Default)" msgstr "" -#: optiondialog.cpp:1244 +#: optiondialog.cpp:1292 #, kde-format msgid "Full analysis" msgstr "" -#: optiondialog.cpp:1246 +#: optiondialog.cpp:1294 #, kde-format msgid "" "Do a full analysis and show statistics information in extra columns.\n" "(Slower than a binary comparison, much slower for binary files.)" msgstr "" -#: optiondialog.cpp:1250 +#: optiondialog.cpp:1298 #, kde-format msgid "Trust the size and modification date (unsafe)" msgstr "" -#: optiondialog.cpp:1252 +#: optiondialog.cpp:1300 #, kde-format msgid "" "Assume that files are equal if the modification date and file length are " @@ -2592,14 +2610,14 @@ "Useful for big directories or slow networks." msgstr "" -#: optiondialog.cpp:1257 +#: optiondialog.cpp:1305 #, kde-format msgid "" "Trust the size and date, but use binary comparison if date does not match " "(unsafe)" msgstr "" -#: optiondialog.cpp:1259 +#: optiondialog.cpp:1307 #, kde-format msgid "" "Assume that files are equal if the modification date and file length are " @@ -2608,12 +2626,12 @@ "Useful for big directories or slow networks." msgstr "" -#: optiondialog.cpp:1264 +#: optiondialog.cpp:1312 #, kde-format msgid "Trust the size (unsafe)" msgstr "" -#: optiondialog.cpp:1266 +#: optiondialog.cpp:1314 #, kde-format msgid "" "Assume that files are equal if their file lengths are equal.\n" @@ -2621,12 +2639,12 @@ "download." msgstr "" -#: optiondialog.cpp:1273 +#: optiondialog.cpp:1321 #, kde-format msgid "Synchronize directories" msgstr "" -#: optiondialog.cpp:1277 +#: optiondialog.cpp:1325 #, kde-format msgid "" "Offers to store files in both directories so that\n" @@ -2634,24 +2652,24 @@ "Works only when comparing two directories without specifying a destination." msgstr "" -#: optiondialog.cpp:1283 +#: optiondialog.cpp:1331 #, kde-format msgid "White space differences considered equal" msgstr "" -#: optiondialog.cpp:1287 +#: optiondialog.cpp:1335 #, kde-format msgid "" "If files differ only by white space consider them equal.\n" "This is only active when full analysis is chosen." msgstr "" -#: optiondialog.cpp:1293 +#: optiondialog.cpp:1341 #, kde-format msgid "Copy newer instead of merging (unsafe)" msgstr "" -#: optiondialog.cpp:1297 +#: optiondialog.cpp:1345 #, kde-format msgid "" "Do not look inside, just take the newer file.\n" @@ -2659,46 +2677,46 @@ "Only effective when comparing two directories." msgstr "" -#: optiondialog.cpp:1302 +#: optiondialog.cpp:1350 #, kde-format msgid "Backup files (.orig)" msgstr "" -#: optiondialog.cpp:1306 +#: optiondialog.cpp:1354 #, kde-format msgid "" "If 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 "" -#: optiondialog.cpp:1382 optiondialog.cpp:1383 +#: optiondialog.cpp:1430 optiondialog.cpp:1431 #, kde-format msgid "Regional Settings" msgstr "" -#: optiondialog.cpp:1397 +#: optiondialog.cpp:1454 #, kde-format msgid "Use the same encoding for everything:" msgstr "" -#: optiondialog.cpp:1401 +#: optiondialog.cpp:1458 #, kde-format msgid "" "Enable this allows to change all encodings by changing the first only.\n" "Disable this if different individual settings are needed." msgstr "" -#: optiondialog.cpp:1405 +#: optiondialog.cpp:1462 #, kde-format msgid "Note: Local Encoding is \"%1\"" msgstr "" -#: optiondialog.cpp:1409 +#: optiondialog.cpp:1466 #, kde-format msgid "File Encoding for A:" msgstr "" -#: optiondialog.cpp:1416 +#: optiondialog.cpp:1473 #, kde-format msgid "" "If enabled then Unicode (UTF-16 or UTF-8) encoding will be detected.\n" @@ -2707,32 +2725,32 @@ "(Unicode detection depends on the first bytes of a file.)" msgstr "" -#: optiondialog.cpp:1419 optiondialog.cpp:1430 optiondialog.cpp:1441 +#: optiondialog.cpp:1476 optiondialog.cpp:1487 optiondialog.cpp:1498 #, kde-format msgid "Auto Detect Unicode" msgstr "" -#: optiondialog.cpp:1425 +#: optiondialog.cpp:1482 #, kde-format msgid "File Encoding for B:" msgstr "" -#: optiondialog.cpp:1436 +#: optiondialog.cpp:1493 #, kde-format msgid "File Encoding for C:" msgstr "" -#: optiondialog.cpp:1447 +#: optiondialog.cpp:1504 #, kde-format msgid "File Encoding for Merge Output and Saving:" msgstr "" -#: optiondialog.cpp:1452 +#: optiondialog.cpp:1509 #, kde-format msgid "Auto Select" msgstr "ئۆزلۈكىدىن تاللا" -#: optiondialog.cpp:1456 +#: optiondialog.cpp:1513 #, kde-format msgid "" "If enabled then the encoding from the input files is used.\n" @@ -2740,39 +2758,39 @@ "saving." msgstr "" -#: optiondialog.cpp:1459 +#: optiondialog.cpp:1516 #, kde-format msgid "File Encoding for Preprocessor Files:" msgstr "" -#: optiondialog.cpp:1471 +#: optiondialog.cpp:1528 #, kde-format msgid "Right To Left Language" msgstr "" -#: optiondialog.cpp:1475 +#: optiondialog.cpp:1532 #, kde-format msgid "" "Some languages are read from right to left.\n" "This setting will change the viewer and editor accordingly." msgstr "" -#: optiondialog.cpp:1485 +#: optiondialog.cpp:1542 #, kde-format msgid "Integration" msgstr "يۈرۈشلەشتۈرۈش" -#: optiondialog.cpp:1486 +#: optiondialog.cpp:1543 #, kde-format msgid "Integration Settings" msgstr "يۈرۈشلەشتۈرۈش تەڭشىكى" -#: optiondialog.cpp:1499 +#: optiondialog.cpp:1564 #, kde-format msgid "Command line options to ignore:" msgstr "پەرۋا قىلمايدىغان بۇيرۇق قۇرى تاللانمىلىرى:" -#: optiondialog.cpp:1505 +#: optiondialog.cpp:1570 #, kde-format msgid "" "List of command line options that should be ignored when KDiff3 is used by " @@ -2781,19 +2799,19 @@ "This will suppress the \"Unknown option\" error." msgstr "" -#: optiondialog.cpp:1510 +#: optiondialog.cpp:1575 #, kde-format msgid "Quit also via Escape key" msgstr "" -#: optiondialog.cpp:1514 +#: optiondialog.cpp:1579 #, kde-format msgid "" "Fast method to exit.\n" "For those who are used to using the Escape key." msgstr "" -#: optiondialog.cpp:1598 +#: optiondialog.cpp:1653 #, kde-format msgid "This resets all options. Not only those of the current topic." msgstr "" @@ -2843,77 +2861,68 @@ msgid "Disable Unsafe Options" msgstr "" -#: pdiff.cpp:158 +#: pdiff.cpp:160 #, kde-format msgid "Loading A" msgstr "" -#: pdiff.cpp:167 -#, kde-format -msgid "Errors occurred during pre-processing of file A." -msgstr "" +#: pdiff.cpp:162 +#, fuzzy, kde-format +#| msgid "Encoding:" +msgid "Loading A: %1" +msgstr "كودلاش:" -#: pdiff.cpp:172 +#: pdiff.cpp:170 #, kde-format msgid "Loading B" msgstr "" -#: pdiff.cpp:179 -#, kde-format -msgid "Errors occurred during pre-processing of file B." -msgstr "" - -#: pdiff.cpp:202 pdiff.cpp:241 +#: pdiff.cpp:201 pdiff.cpp:237 #, kde-format msgid "Diff: A <-> B" msgstr "" -#: pdiff.cpp:208 pdiff.cpp:279 pdiff.cpp:293 +#: pdiff.cpp:207 pdiff.cpp:275 pdiff.cpp:289 #, kde-format msgid "Linediff: A <-> B" msgstr "" -#: pdiff.cpp:225 +#: pdiff.cpp:224 #, kde-format msgid "Loading C" msgstr "" -#: pdiff.cpp:232 -#, kde-format -msgid "Errors occurred during pre-processing of file C." -msgstr "" - -#: pdiff.cpp:250 +#: pdiff.cpp:246 #, kde-format msgid "Diff: A <-> C" msgstr "" -#: pdiff.cpp:261 +#: pdiff.cpp:257 #, kde-format msgid "Diff: B <-> C" msgstr "" -#: pdiff.cpp:283 pdiff.cpp:297 +#: pdiff.cpp:279 pdiff.cpp:293 #, kde-format msgid "Linediff: B <-> C" msgstr "" -#: pdiff.cpp:287 pdiff.cpp:301 +#: pdiff.cpp:283 pdiff.cpp:297 #, kde-format msgid "Linediff: A <-> C" msgstr "" -#: pdiff.cpp:829 +#: pdiff.cpp:819 #, kde-format msgid "All input files contain the same text, but are not binary equal." msgstr "" -#: pdiff.cpp:835 pdiff.cpp:839 pdiff.cpp:843 +#: pdiff.cpp:825 pdiff.cpp:829 pdiff.cpp:833 #, kde-format msgid "Files %1 and %2 have equal text, but are not binary equal. \n" msgstr "" -#: pdiff.cpp:853 +#: pdiff.cpp:843 #, kde-format msgid "" "Some input files do not seem to be pure text files.\n" @@ -2921,17 +2930,17 @@ "Continue at your own risk." msgstr "" -#: pdiff.cpp:863 +#: pdiff.cpp:853 #, kde-format msgid ", B" msgstr "" -#: pdiff.cpp:865 +#: pdiff.cpp:855 #, kde-format msgid ", C" msgstr "" -#: pdiff.cpp:867 +#: pdiff.cpp:857 #, kde-format msgid "" "Some input characters could not be converted to valid unicode.\n" @@ -2940,77 +2949,72 @@ "Affected input files are in %1." msgstr "" -#: pdiff.cpp:1034 +#: pdiff.cpp:1032 #, kde-format msgid "Abort" msgstr "توختات" -#: pdiff.cpp:1040 pdiff.cpp:1130 +#: pdiff.cpp:1038 pdiff.cpp:1129 #, kde-format msgid "Opening files..." msgstr "" -#: pdiff.cpp:1107 -#, kde-format -msgid "File open error" -msgstr "" - -#: pdiff.cpp:1202 +#: pdiff.cpp:1212 #, kde-format msgid "Cutting selection..." msgstr "تاللانغاننى كېسىۋاتىدۇ…" -#: pdiff.cpp:1223 +#: pdiff.cpp:1233 #, kde-format msgid "Copying selection to clipboard..." msgstr "تاللانغاننى چاپلاش تاختىسىغا كۆچۈرۈۋاتىدۇ" -#: pdiff.cpp:1239 +#: pdiff.cpp:1249 #, kde-format msgid "Inserting clipboard contents..." msgstr "چاپلاش تاختىسى مەزمۇنلىرىنى قىستۇرۇۋاتىدۇ…" -#: pdiff.cpp:1695 +#: pdiff.cpp:1705 #, kde-format msgid "Word wrap (Cancel disables word wrap)" msgstr "" -#: pdiff.cpp:1696 +#: pdiff.cpp:1706 #, kde-format msgid "Calculating max width for horizontal scrollbar" msgstr "" -#: pdiff.cpp:1911 +#: pdiff.cpp:1921 #, kde-format msgid "Save && Continue" msgstr "" -#: pdiff.cpp:1912 +#: pdiff.cpp:1922 #, kde-format msgid "Continue Without Saving" msgstr "" -#: pdiff.cpp:2124 +#: pdiff.cpp:2134 #, kde-format msgid "Search complete." msgstr "ئىزدەش تاماملاندى." -#: pdiff.cpp:2124 +#: pdiff.cpp:2134 #, kde-format msgid "Search Complete" msgstr "" -#: pdiff.cpp:2375 +#: pdiff.cpp:2385 #, kde-format msgid "Nothing is selected in either diff input window." msgstr "" -#: pdiff.cpp:2375 +#: pdiff.cpp:2385 #, kde-format msgid "Error while adding manual diff range" msgstr "" -#: progress.cpp:59 progress.cpp:71 +#: progress.cpp:61 progress.cpp:73 #, kde-format msgid "&Cancel" msgstr "ۋاز كەچ(&C)" @@ -3020,189 +3024,189 @@ msgid "A (Base):" msgstr "" -#: smalldialogs.cpp:68 smalldialogs.cpp:85 smalldialogs.cpp:102 -#: smalldialogs.cpp:144 +#: smalldialogs.cpp:71 smalldialogs.cpp:90 smalldialogs.cpp:109 +#: smalldialogs.cpp:154 #, kde-format msgid "File..." msgstr "ھۆججەت …" -#: smalldialogs.cpp:70 smalldialogs.cpp:87 smalldialogs.cpp:104 -#: smalldialogs.cpp:146 +#: smalldialogs.cpp:73 smalldialogs.cpp:92 smalldialogs.cpp:111 +#: smalldialogs.cpp:156 #, kde-format msgid "Dir..." msgstr "" -#: smalldialogs.cpp:96 +#: smalldialogs.cpp:103 #, kde-format msgid "C (Optional):" msgstr "" -#: smalldialogs.cpp:119 +#: smalldialogs.cpp:126 #, kde-format msgid "Swap/Copy Names..." msgstr "" -#: smalldialogs.cpp:124 smalldialogs.cpp:125 smalldialogs.cpp:126 +#: smalldialogs.cpp:131 smalldialogs.cpp:132 smalldialogs.cpp:133 #, kde-format msgid "Swap %1<->%2" msgstr "" -#: smalldialogs.cpp:127 smalldialogs.cpp:128 smalldialogs.cpp:129 +#: smalldialogs.cpp:134 smalldialogs.cpp:135 smalldialogs.cpp:136 #, kde-format msgid "Copy %1->Output" msgstr "" -#: smalldialogs.cpp:130 smalldialogs.cpp:131 smalldialogs.cpp:132 +#: smalldialogs.cpp:137 smalldialogs.cpp:138 smalldialogs.cpp:139 #, kde-format msgid "Swap %1<->Output" msgstr "" -#: smalldialogs.cpp:138 +#: smalldialogs.cpp:148 #, kde-format msgid "Output (optional):" msgstr "" -#: smalldialogs.cpp:168 +#: smalldialogs.cpp:178 #, kde-format msgid "Configure..." msgstr "سەپلە…" -#: smalldialogs.cpp:233 +#: smalldialogs.cpp:243 #, fuzzy, kde-format #| msgid "Directory" msgid "Open Directory" msgstr "مۇندەرىجە" -#: smalldialogs.cpp:234 +#: smalldialogs.cpp:244 #, kde-format msgid "Select Output File" msgstr "" -#: smalldialogs.cpp:393 +#: smalldialogs.cpp:403 #, kde-format msgid "Search text:" msgstr "" -#: smalldialogs.cpp:400 +#: smalldialogs.cpp:410 #, kde-format msgid "Case sensitive" msgstr "چوڭ كىچىك يېزىلىشنى پەرقلەندۈر" -#: smalldialogs.cpp:403 +#: smalldialogs.cpp:413 #, kde-format msgid "Search A" msgstr "" -#: smalldialogs.cpp:408 +#: smalldialogs.cpp:418 #, kde-format msgid "Search B" msgstr "" -#: smalldialogs.cpp:413 +#: smalldialogs.cpp:423 #, kde-format msgid "Search C" msgstr "" -#: smalldialogs.cpp:418 +#: smalldialogs.cpp:428 #, kde-format msgid "Search output" msgstr "" -#: smalldialogs.cpp:425 +#: smalldialogs.cpp:435 #, kde-format msgid "&Search" msgstr "ئىزدە(&S)" -#: smalldialogs.cpp:444 +#: smalldialogs.cpp:454 #, kde-format msgid "Regular Expression Tester" msgstr "" -#: smalldialogs.cpp:457 +#: smalldialogs.cpp:467 #, kde-format msgid "Example auto merge line:" msgstr "" -#: smalldialogs.cpp:459 +#: smalldialogs.cpp:469 #, kde-format msgid "To test auto merge, copy a line as used in your files." msgstr "" -#: smalldialogs.cpp:465 smalldialogs.cpp:493 smalldialogs.cpp:529 +#: smalldialogs.cpp:475 smalldialogs.cpp:503 smalldialogs.cpp:539 #, kde-format msgid "Match result:" msgstr "" -#: smalldialogs.cpp:484 +#: smalldialogs.cpp:494 #, kde-format msgid "Example history start line (with leading comment):" msgstr "" -#: smalldialogs.cpp:486 +#: smalldialogs.cpp:496 #, kde-format msgid "" "Copy a history start line as used in your files,\n" "including the leading comment." msgstr "" -#: smalldialogs.cpp:512 +#: smalldialogs.cpp:522 #, kde-format msgid "History sort key order:" msgstr "" -#: smalldialogs.cpp:520 +#: smalldialogs.cpp:530 #, kde-format msgid "Example history entry start line (without leading comment):" msgstr "" -#: smalldialogs.cpp:522 +#: smalldialogs.cpp:532 #, kde-format msgid "" "Copy a history entry start line as used in your files,\n" "but omit the leading comment." msgstr "" -#: smalldialogs.cpp:536 +#: smalldialogs.cpp:546 #, kde-format msgid "Sort key result:" msgstr "" -#: smalldialogs.cpp:584 smalldialogs.cpp:594 smalldialogs.cpp:614 +#: smalldialogs.cpp:594 smalldialogs.cpp:604 smalldialogs.cpp:624 #, kde-format msgid "Match success." msgstr "" -#: smalldialogs.cpp:588 smalldialogs.cpp:598 smalldialogs.cpp:620 +#: smalldialogs.cpp:598 smalldialogs.cpp:608 smalldialogs.cpp:630 #, kde-format msgid "Match failed." msgstr "" -#: smalldialogs.cpp:605 +#: smalldialogs.cpp:615 #, kde-format msgid "Opening and closing parentheses do not match in regular expression." msgstr "" -#: SourceData.cpp:150 +#: SourceData.cpp:153 #, kde-format msgid "Writing clipboard data to temp file failed." msgstr "" -#: SourceData.cpp:154 +#: SourceData.cpp:157 #, kde-format msgid "From Clipboard" msgstr "چاپلاش تاختىسىدىن" -#: SourceData.cpp:335 +#: SourceData.cpp:348 #, kde-format msgid "%1 is not a normal file." msgstr "" -#: SourceData.cpp:427 +#: SourceData.cpp:440 #, kde-format msgid " Temp file is: %1" msgstr "" -#: SourceData.cpp:432 +#: SourceData.cpp:445 #, kde-format msgid "" "Preprocessing possibly failed. Check this command:\n" @@ -3212,12 +3216,12 @@ "The preprocessing command will be disabled now." msgstr "" -#: SourceData.cpp:443 SourceData.cpp:512 +#: SourceData.cpp:456 SourceData.cpp:525 #, kde-format msgid "File %1 too large to process. Skipping." msgstr "" -#: SourceData.cpp:487 +#: SourceData.cpp:500 #, kde-format msgid "" "The line-matching-preprocessing possibly failed. Check this command:\n" diff -Nru kdiff3-1.8.01/po/uk/diff_ext.po kdiff3-1.8.3/po/uk/diff_ext.po --- kdiff3-1.8.01/po/uk/diff_ext.po 2019-05-18 01:02:35.000000000 +0000 +++ kdiff3-1.8.3/po/uk/diff_ext.po 2020-06-25 00:18:59.000000000 +0000 @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: diff_ext\n" -"Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2019-03-22 03:09+0100\n" +"Report-Msgid-Bugs-To: https://bugs.kde.org\n" +"POT-Creation-Date: 2019-11-04 07:54+0100\n" "PO-Revision-Date: 2018-08-06 09:30+0200\n" "Last-Translator: Yuri Chornoivan \n" "Language-Team: Ukrainian \n" @@ -20,121 +20,116 @@ "%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" "X-Generator: Lokalize 2.0\n" -#: diff_ext.cpp:391 +#: diff_ext.cpp:223 #, kde-format msgid "Compare with %1" msgstr "Порівняти з %1" -#: diff_ext.cpp:392 +#: diff_ext.cpp:224 #, kde-format msgid "Merge with %1" msgstr "Об’єднати з %1" -#: diff_ext.cpp:408 +#: diff_ext.cpp:234 #, kde-format msgid "3-way merge with base" msgstr "3-рівневе об’єднання за основою" -#: diff_ext.cpp:411 +#: diff_ext.cpp:237 #, kde-format msgid "Save '%1' for later" msgstr "Зберегти «%1» на потім" -#: diff_ext.cpp:426 +#: diff_ext.cpp:251 #, kde-format msgid "Compare with ..." msgstr "Порівняти з…" -#: diff_ext.cpp:429 +#: diff_ext.cpp:254 #, kde-format msgid "Clear list" msgstr "Спорожнити список" -#: diff_ext.cpp:434 +#: diff_ext.cpp:259 #, kde-format msgid "Compare" msgstr "Порівняти" -#: diff_ext.cpp:438 +#: diff_ext.cpp:263 #, kde-format msgid "3 way comparison" msgstr "3-рівневе порівняння" -#: diff_ext.cpp:444 +#: diff_ext.cpp:269 #, kde-format msgid "About Diff-Ext ..." msgstr "Про Diff-Ext…" -#: diff_ext.cpp:515 +#: diff_ext.cpp:340 #, kde-format msgid "(32 Bit)" msgstr "(32-бітова)" -#: diff_ext.cpp:517 -#, kde-format -msgid "(64 Bit)" -msgstr "(64-бітова)" - -#: diff_ext.cpp:518 +#: diff_ext.cpp:342 #, kde-format msgid "Diff-Ext Copyright (c) 2003-2006, Sergey Zorin. All rights reserved.\n" msgstr "" "Авторські права на Diff-Ext належать Sergey Zorin, 2003–2006. Усі права " "захищено.\n" -#: diff_ext.cpp:519 +#: diff_ext.cpp:343 #, kde-format msgid "This software is distributable under the BSD-2-Clause license.\n" msgstr "" "Це програмне забезпечення розповсюджується за умов дотримання ліцензії BSD з " "2 пунктів.\n" -#: diff_ext.cpp:520 +#: diff_ext.cpp:344 #, kde-format msgid "Some extensions for KDiff3 (c) 2006-2013 by Joachim Eibl.\n" msgstr "Деякі розширення для KDiff3 виконано Joachim Eibl, 2006–2013.\n" -#: diff_ext.cpp:521 +#: diff_ext.cpp:345 #, kde-format msgid "Homepage for Diff-Ext: http://diff-ext.sourceforge.net\n" msgstr "Домашня сторінка Diff-Ext: http://diff-ext.sourceforge.net\n" -#: diff_ext.cpp:522 +#: diff_ext.cpp:346 #, kde-format msgid "About Diff-Ext for KDiff3 " msgstr "Про Diff-Ext для KDiff3 " -#: diff_ext.cpp:551 +#: diff_ext.cpp:375 #, kde-format msgid "Compare selected files" msgstr "Порівняти позначені файли" -#: diff_ext.cpp:557 diff_ext.cpp:577 +#: diff_ext.cpp:381 diff_ext.cpp:399 #, kde-format msgid "Compare '%1' with '%2'" msgstr "Порівняти «%1» з «%2»" -#: diff_ext.cpp:563 +#: diff_ext.cpp:386 #, kde-format msgid "Save '%1' for later operation" msgstr "Зберегти «%1» для подальших дій" -#: diff_ext.cpp:619 +#: diff_ext.cpp:440 #, kde-format msgid "Could not start KDiff3. Please rerun KDiff3 installation." msgstr "Не вдалося запустити KDiff3. Будь ласка, повторно встановіть KDiff3." -#: diff_ext.cpp:620 +#: diff_ext.cpp:441 #, kde-format msgid "Command" msgstr "Команда" -#: diff_ext.cpp:621 +#: diff_ext.cpp:442 #, kde-format msgid "CommandLine" msgstr "Командний рядок" -#: diff_ext.cpp:622 +#: diff_ext.cpp:443 #, kde-format msgid "Diff-Ext For KDiff3" msgstr "Diff-Ext для KDiff3" \ No newline at end of file diff -Nru kdiff3-1.8.01/po/uk/docs/kdiff3/index.docbook kdiff3-1.8.3/po/uk/docs/kdiff3/index.docbook --- kdiff3-1.8.01/po/uk/docs/kdiff3/index.docbook 2019-05-18 01:02:57.000000000 +0000 +++ kdiff3-1.8.3/po/uk/docs/kdiff3/index.docbook 2020-06-25 00:19:32.000000000 +0000 @@ -82,17 +82,17 @@ Do NOT change these in the translation. --> 2019-02-22 +>22 лютого 2019 року 1.08.00 +>1.08.02 &kdiff3; — це інструмент для порівняння і об’єднання каталогів, який +>&kdiff3; — це інструмент для порівняння і об'єднання каталогів, який порівнює і об’єднує два або три вхідних текстових файлів або каталогів.порівнює і об'єднує два або три вхідних текстових файлів або каталогів. надає можливість автоматичного об’єднання,надає можливість автоматичного об'єднання, містить редактор для полегшення розв’язання конфліктів під час об’єднання,містить редактор для полегшення розв'язання конфліктів під час об'єднання, підтримує об’єднання за ключовими словами і журналом інструментів керування версіями.підтримує об'єднання за ключовими словами і журналом інструментів керування версіями. керування версіями трикомпонентне об’єднання +>трикомпонентне об'єднання посимвольна різниця Існує декілька графічних інструментів для роботи з різницями (diff). Чому саме &kdiff3;? Давайте я, як автор, поясню, чому мною було написано цю програму. Я почав писати &kdiff3;, оскільки мені доводилося виконувати складні операції з об’єднання версій. Потреба у такому об’єднанні виникає, коли декілька осіб працюють над однаковими файлами у проекті. Процес об’єднання можна до певної міри автоматизувати, якщо інструмент об’єднання може працювати не лише з новими модифікованими файлами (які називаються «гілками»), але і з початковим файлом (який називається «базою»). Інструмент об’єднання автоматично обере всі зміни, які було внесено лише у одній гілці. Якщо декілька розробників вносять зміни до одних і тих самих рядків, інструмент об’єднання має визначити конфлікт, який слід буде розв’язати вручну. Я почав писати &kdiff3;, оскільки мені доводилося виконувати складні операції з об'єднання версій. Потреба у такому об'єднанні виникає, коли декілька осіб працюють над однаковими файлами у проєкті. Процес об'єднання можна до певної міри автоматизувати, якщо інструмент об'єднання може працювати не лише з новими модифікованими файлами (які називаються «гілками»), але і з початковим файлом (який називається «базою»). Інструмент об'єднання автоматично обере всі зміни, які було внесено лише у одній гілці. Якщо декілька розробників вносять зміни до одних і тих самих рядків, інструмент об'єднання має визначити конфлікт, який слід буде розв'язати вручну. У останньому випадку об’єднання ускладнюється тим, що один з розробників міг змінити багато рядків і виправити відступи у багатьох місцях. Інший розробник теж міг внести зміни у значну частину тексту того ж файла. Все це призводить до декількох конфліктів під час об’єднання. У останньому випадку об'єднання ускладнюється тим, що один з розробників міг змінити багато рядків і виправити відступи у багатьох місцях. Інший розробник теж міг внести зміни у значну частину тексту того ж файла. Все це призводить до декількох конфліктів під час об'єднання. Інструмент, яким я користувався раніше, показував лише змінені рядки, але не показував, які саме зміни сталися у цих рядках. Він також не міг показувати відомості щодо зміни лише відступів. Об’єднання було схоже на нічний жах. Інструмент, яким я користувався раніше, показував лише змінені рядки, але не показував, які саме зміни сталися у цих рядках. Він також не міг показувати відомості щодо зміни лише відступів. Об'єднання було схоже на нічний жах. Ось з цього я і розпочав свою роботу. Перша версія програми могла показувати різницю у символах рядків, а також різницю у пробілах. Пізніше було додано багато інших можливостей, які поширили перелік корисних можливостей програми. Наприклад, якщо вам потрібно швидко порівняти якісь фрагменти тексту, ви можете скопіювати їх до буфера обміну інформацією і вставити до відповідних частин вікон порівняння. Багато зусиль було покладено на реалізацію порівняння каталогів і можливість їх об’єднання. Втілення цієї можливості майже перетворило програму на повноцінний навігатор файлової системи. Багато зусиль було покладено на реалізацію порівняння каталогів і можливість їх об'єднання. Втілення цієї можливості майже перетворило програму на повноцінний навігатор файлової системи. Сподіваємось &kdiff3; допоможе і вам. Нехай щастить! Повністю підтримується трикомпонентне об’єднання. Ця можливість буде корисною, якщо двоє розробників незалежно змінюють код. Початковий файл (база) буде використано для того, щоб допомогти &kdiff3; автоматично обирати правильні зміни. За допомогою вікна редактора об’єднання під вікнами різниці ви зможете розв’язувати конфлікти, — програма покаже вам результат. Ви навіть можете редагувати результат. На наступному знімку вікна показано три вхідних файли у процесі об’єднання: Повністю підтримується трикомпонентне об'єднання. Ця можливість буде корисною, якщо двоє розробників незалежно змінюють код. Початковий файл (база) буде використано для того, щоб допомогти &kdiff3; автоматично обирати правильні зміни. За допомогою вікна редактора об'єднання під вікнами різниці ви зможете розв'язувати конфлікти, — програма покаже вам результат. Ви навіть можете редагувати результат. На наступному знімку вікна показано три вхідних файли у процесі об'єднання: @@ -231,7 +231,7 @@ Крім того &kdiff3; допоможе вам порівнювати і об’єднувати цілі каталоги. На наступному знімку вікна показано &kdiff3; у процесі об’єднання каталогів: Крім того &kdiff3; допоможе вам порівнювати і об'єднувати цілі каталоги. На наступному знімку вікна показано &kdiff3; у процесі об'єднання каталогів: @@ -290,7 +290,7 @@ Зручне об’єднання двох або трьох вхідних файлів +>Зручне об'єднання двох або трьох вхідних файлів &kdiff3; можна скористатися для об’єднання двох або трьох вхідних файлів, таке об’єднання буде за можливості виконано у автоматичному режимі. Результат буде показано у вікні, у якому ви зможете редагувати текст і розв’язувати більшість конфліктів одним клацанням кнопкою миші: вам достатньо буде натиснути одну з кнопок, A/B/C, на панелі кнопок, щоб вибрати джерело об’єднання, яке буде використано. Ви також можете вибрати одразу декілька джерел. Оскільки вікно результату є вікном редактора, у ньому можна розв’язати навіть конфлікти, які потребують подальшого виправлення, — вам не потрібно буде використовувати сторонні інструменти. @@ -309,7 +309,7 @@ > Вибір і копіювання з будь-якого вікна і вставка у вікно об’єднання результатів.Вибір і копіювання з будь-якого вікна і вставка у вікно об'єднання результатів. Порівняння і об’єднання файлів +>Порівняння і об'єднання файлів <title ->Об’єднання 2 файлів: +>Об'єднання 2 файлів: kdiff3Об’єднання 3 файлів: +>Об'єднання 3 файлів: kdiff3Рядок команди для виконання порівняння або об’єднання каталогів: +>Рядок команди для виконання порівняння або об'єднання каталогів: Дуже подібне до попереднього розділу, але тепер слід вказувати каталоги. Докладніші відомості щодо порівняння каталогів або їх об’єднання можна прочитати у Докладніші відомості щодо порівняння каталогів або їх об'єднання можна прочитати у цьому розділі. @@ -512,12 +512,12 @@ >Приклад виводу команди: Параметри: - -m, --merge Об’єднати вхідні елементи. + -m, --merge Об'єднати вхідні елементи. -b, --base файл Явно вказати базовий файл. Призначено для сумісності з деякими інструментами. -o, --output файл Файл результату. Використовується разом -m. Наприклад: -o newfile.txt --out файл Знову ж таки, файл результату. (Призначено для сумісності з деякими інструментами.) - --auto Не показувати графічний інтерфейс, якщо всі конфлікти можна розв’язати автоматично. (Потрібен параметр -o файл) - --qall Не розв’язувати конфлікти у автоматичному режимі. (Для сумісності...) + --auto Не показувати графічний інтерфейс, якщо всі конфлікти можна розв'язати автоматично. (Потрібен параметр -o файл) + --qall Не розв'язувати конфлікти у автоматичному режимі. (Для сумісності...) --L1 псевдонім1 Візуальний замінник назви вхідного файла 1 (бази). --L2 псевдонім2 Візуальний замінник назви файла 2. --L3 псевдонім3 Візуальний замінник назви файла 3. @@ -648,13 +648,13 @@ >Іноді алгоритмові обробки тексту, використаному у програмі, не вдається розташувати належні рядки один навпроти одного. У вас також може виникнути бажання порівняти фрагмент тексту з фрагментом тексту, розташованим у зовсім іншому місці файла, з яким виконується порівняння. У таких випадках ви можете вказати &kdiff3; рядки для вирівнювання вручну. Позначте текст, вирівнювання якого ви бажаєте покращити за допомогою вказівника миші у першому перегляді даних так, як ви це робите, коли бажаєте скопіювати фрагмент тексту, а потім скористайтеся пунктом «Додати вирівнювання різниці вручну» з меню «Diffview» (клавіатурне скорочення «Ctrl-Y»). Поряд з вибраним фрагментом тексту у стовпчику огляду з’явиться жовтогарячий прямокутник. Повторіть процедуру для другої і (якщо така є) третьої області даних. &kdiff3; негайно переобчислюватиме відмінності після виконання вами дій і вирівнюватиме вибрані рядки. Звичайно ж, деякі з рядків, які збігалися за попереднього порівняння, можуть стати відмінними за нового порівняння. У поточній версії програми ви не можете втручатися вручну у процес об’єднання. У поточній версії програми ви не можете втручатися вручну у процес об'єднання. Об’єднання і розділення розділів відмінностей вручнуОб'єднання і розділення розділів відмінностей вручнуУ певних випадках &kdiff3; визначить забагато або замало розділів відмінностей для об’єднання. У такому випадку ви можете об’єднати або поділити існуючі розділи. У певних випадках &kdiff3; визначить забагато або замало розділів відмінностей для об'єднання. У такому випадку ви можете об'єднати або поділити існуючі розділи. Додайте нові розділи: спочатку виберіть текст у рядках, які відповідають один одному у кожній з областей вхідних даних (так як ви це робите під час копіювання даних до буфера). Потім скористайтеся пунктом «Розділити різницю на вибраному» з меню «Об’єднання». Розрізи буде додано над першим рядком і під останнім рядком вибраного тексту. Якщо ви бажаєте додати лише один розділ, виберіть текст, що починається з іншого розрізу розділів. Об’єднання і вікно редактора виводу об’єднання +>Об'єднання і вікно редактора виводу об'єднання !!! Ви не зможете зберегти дані, аж доки всі конфлікти не буде розв’язано !!! (Скористайтеся кнопками «Перейти до попер./наст. нерозв’язаного конфлікту», щоб перевести перегляд до конфліктів, які ще не розв’язано.) Якщо ви працюєте з двома файлами вхідних даних, кожна з відмінностей є конфліктом, який слід розв’язати вручну. Якщо ви працюєте з двома файлами вхідних даних, кожна з відмінностей є конфліктом, який слід розв'язати вручну. Якщо вхідних файлів буде три, перший з них вважатиметься базовим, а другий і третій — такими, що містять зміни. Якщо певний з рядків змінено лише у файлі B або C, але не у двох цих файлах, програма автоматично обере змінений варіант. Лише у випадках, коли і у B, і у C одночасно змінено однакові рядки, програма вважатиме ситуацію конфліктною і пропонуватиме розв’язати конфлікт вручну. Якщо зміни, внесені у B і C є тотожними, буде вибрано варіант C. Стовпчик резюмеУ області редактора виводу об’єднання також передбачено стовпчик резюме, розташований ліворуч. У цьому стовпчику буде показано літеру варіанта, з якого було взято рядок, або нічого, якщо всі у всіх трьох джерелах рядок є однаковим. Конфліктні рядки буде позначено символом знака питання («?»), а у самому рядку буде показано червоний запис «Конфлікт об’єднання». Оскільки порядкове розв’язання конфліктів є справою досить марудною, рядки буде впорядковано за групами з однаковими відмінностями і характеристиками конфліктів. Конфлікти, які полягають лише у розташуванні пробілів, буде відокремлено від інших конфліктів, щоб полегшити об’єднання файлів, де зміни у відступах було внесено до багатьох рядків. У області редактора виводу об'єднання також передбачено стовпчик резюме, розташований ліворуч. У цьому стовпчику буде показано літеру варіанта, з якого було взято рядок, або нічого, якщо всі у всіх трьох джерелах рядок є однаковим. Конфліктні рядки буде позначено символом знака питання («?»), а у самому рядку буде показано червоний запис «Конфлікт об'єднання». Оскільки порядкове розв'язання конфліктів є справою досить марудною, рядки буде впорядковано за групами з однаковими відмінностями і характеристиками конфліктів. Конфлікти, які полягають лише у розташуванні пробілів, буде відокремлено від інших конфліктів, щоб полегшити об'єднання файлів, де зміни у відступах було внесено до багатьох рядків. Визначення поточної групи і синхронізація позиції об’єднання і перегляду відмінностейВизначення поточної групи і синхронізація позиції об'єднання і перегляду відмінностейПісля наведення вказівника миші у стовпчику резюме будь-якої з областей на певну позицію і клацання лівою кнопкою миші програма відкриє у всіх вікнах фрагмент тексту на початку групи, до якої належить позначений клацанням рядок. Після цього група стане «поточною групою». Цю групу буде позначено «Кольором тла поточного діапазону різниці», а зліва від тексту буде показано чорну рамку. Вибір вхідних даних з A, B або C для розв’язання поточного конфлікту і редагуванняВибір вхідних даних з A, B або C для розв'язання поточного конфлікту і редагуванняНа панелі з кнопками, розташованій під смужкою меню, містяться три кнопки вибору вхідних даних, які позначено літерами «A», «B» і «C». Натисніть кнопку вибору вхідних даних, щоб вставити рядки (або вилучити рядки, якщо ці рядки вже було раніше вставлено) з відповідного джерела. Щоб позначити рядки з декількох вхідних джерел натисніть відповідні кнопки у потрібному порядку. Наприклад, якщо ви бажаєте, щоб рядкам з «B» було надано перевагу перед рядками з «A» у вихідних даних, спочатку натисніть «B», а вже потім «A». «Автоматично перейти до наступного конфлікту за визначення джерела»), вам слід вимкнути його перед вибором рядків з декількох джерел або редагуванням рядків після вибору. Якщо ви цього не зробите, &kdiff3; перейде до наступного конфлікту після вибору першого джерела даних. Часто корисно напряму змінити вивід об’єднання. У перегляді резюме буде показано літеру «m» навпроти всіх рядків, які було змінено вручну. Якщо, наприклад, відмінності вирівняно таким чином, що простого вибору потрібного джерела буде недостатньо, ви можете позначити потрібний текст і скористатися звичайною дією з Часто корисно напряму змінити вивід об'єднання. У перегляді резюме буде показано літеру «m» навпроти всіх рядків, які було змінено вручну. Якщо, наприклад, відмінності вирівняно таким чином, що простого вибору потрібного джерела буде недостатньо, ви можете позначити потрібний текст і скористатися звичайною дією з копіювання з вставленням, щоб розмістити потрібний фрагмент тексту у області виводу об’єднання. , щоб розмістити потрібний фрагмент тексту у області виводу об'єднання. Іноді, якщо певний рядок було вилучено або у результаті автоматично об’єднання, або редагування, і у групі більше не залишиться жодного рядка, програма показуватиме у відповідному рядку текст <Немає рядка джерела>. Цей рядок є лише заповнювачем для групи на випадок, якщо ви зміните свою думку і захочете знову позначити якийсь текст. Відповідний текст заповнювача не буде показано у збереженому файлі, його не буде включено до жодного з фрагментів, які ви копіюватимете і вставлятимете. Іноді, якщо певний рядок було вилучено або у результаті автоматично об'єднання, або редагування, і у групі більше не залишиться жодного рядка, програма показуватиме у відповідному рядку текст <Немає рядка джерела>. Цей рядок є лише заповнювачем для групи на випадок, якщо ви зміните свою думку і захочете знову позначити якийсь текст. Відповідний текст заповнювача не буде показано у збереженому файлі, його не буде включено до жодного з фрагментів, які ви копіюватимете і вставлятимете. Якщо ви спробуєте скопіювати і вставити певний текст, що містить такий рядок, у буфері обміну даними буде лише рядок «<Конфлікт об’єднання>». Але будьте обережними, коли виконуєте подібне копіювання. Якщо ви спробуєте скопіювати і вставити певний текст, що містить такий рядок, у буфері обміну даними буде лише рядок «<Конфлікт об'єднання>». Але будьте обережними, коли виконуєте подібне копіювання. </sect2 ><sect2 id="vcskeywordsmergesupport" ><title ->Автоматичне об’єднання за ключовими словами системи керування версіями і журналуАвтоматичне об'єднання за ключовими словами системи керування версіями і журналуЗначна кількість систем керування версіями підтримує особливі ключові слова (наприклад "$Date$", "$Header$", "$Author$", "$Log$" тощо). Під час синхронізації системи керування версіями змінюють ці рядки. Наприклад, "$Date$" перетвориться на "$Date: 2009/03/22 18:45:01 $". Оскільки цей рядок буде різним у кожній з версій файла, під час спроби об’єднання потрібне буде втручання користувача. Зазвичай, журнал системи керування версіями починається з рядка, що містить ключове слово «$Log$». Початок журналу має відповідати значенню параметра «Початковий формальний вираз журналу». &kdiff3; визначає, які з рядків належать до журналу, аналізуючи початкові символи, які передують ключовому слову «$Log$». Якщо такі самі «початкові коментарі» зустрічаються і у наступних рядках, ці рядки також буде включено до журналу. Під час кожної транзакції система керування версіями записує унікальний рядок з відомостями щодо версії, дати і часу транзакції та коментарів користувача. З цих елементів утворюється окремий запис журналу. Цей розділ журналу збільшується під час кожної транзакції, найсвіжіші записи з’являтимуться у верхній частині журналу (після початкового рядка журналу). Під час кожної транзакції система керування версіями записує унікальний рядок з відомостями щодо версії, дати і часу транзакції та коментарів користувача. З цих елементів утворюється окремий запис журналу. Цей розділ журналу збільшується під час кожної транзакції, найсвіжіші записи з'являтимуться у верхній частині журналу (після початкового рядка журналу). Якщо під час розробки двоє або декілька розробників вивантажують свої версії одного файл, у журналі об’єднання міститимуться декілька записів, які вважатимуться конфліктними під час об’єднання гілок. Оскільки подібні об’єднання можуть бути досить марудною справою, у &kdiff3; передбачено підтримку двох можливих стратегій: простої вставки інформації від обох розробників у верхню частину журналу або впорядкування інформації журналу за визначеним користувачем ключем. Якщо під час розробки двоє або декілька розробників вивантажують свої версії одного файл, у журналі об'єднання міститимуться декілька записів, які вважатимуться конфліктними під час об'єднання гілок. Оскільки подібні об'єднання можуть бути досить марудною справою, у &kdiff3; передбачено підтримку двох можливих стратегій: простої вставки інформації від обох розробників у верхню частину журналу або впорядкування інформації журналу за визначеним користувачем ключем. Налаштувати спосіб одночасної вставки всіх записів простіше. Слід просто вказати &kdiff3; метод визначення рядків, які належатимуть до одного запису журналу. У більшості систем керування версіями після кожного запису журналу додається порожній рядок. Якщо система керування версіями не додає порожніх рядків у інших випадках, подібні рядки можуть слугувати достатнім критерієм для &kdiff3;. Достатньо вказати порожнє значення для параметра «Початковий формальний вираз елемента історії». Якщо використання критерію порожнього рядка є недостатнім, ви можете вказати формальний вираз, за яким можна визначити початок запису журналу. Параметри Diff Під час порівняння файлів &kdiff3; спочатку намагається знайти однакові рядки у всіх файлах вхідних даних. Лише на цьому етапі програма може ігнорувати пробіли. На другому етапі програма порівнює всі рядки окремо. На цьому етапі програма не ігноруватиме пробіли. Крім того, пробіли не ігноруватимуться під час об’єднання. +>Під час порівняння файлів &kdiff3; спочатку намагається знайти однакові рядки у всіх файлах вхідних даних. Лише на цьому етапі програма може ігнорувати пробіли. На другому етапі програма порівнює всі рядки окремо. На цьому етапі програма не ігноруватиме пробіли. Крім того, пробіли не ігноруватимуться під час об'єднання. Параметри об’єднання +>Параметри об'єднання У режимі автоматичного продовження цей параметр визначає час, протягом якого програма показуватиме результат вибору перед переходом до наступного нерозв’язаного конфлікту. У режимі автоматичного продовження цей параметр визначає час, протягом якого програма показуватиме результат вибору перед переходом до наступного нерозв'язаного конфлікту. Типове значення пробілів для об’єднання 2/3 файлів:Типове значення пробілів для об'єднання 2/3 файлів:Формальний вираз автооб’єднання:Формальний вираз автооб'єднання:Якщо буде позначено &kdiff3; виконуватиме автоматичне об’єднання журналів на основі раніше згаданих параметрів після запуску процесу об’єднання. Якщо буде позначено &kdiff3; виконуватиме автоматичне об'єднання журналів на основі раніше згаданих параметрів після запуску процесу об'єднання. Безвідносна команда об’єднання:Безвідносна команда об'єднання:Об’єднання каталогів +>Об'єднання каталогів Ці параметри використовуватимуться під час сканування каталогу і виконання об’єднання: докладніше про це можна дізнатися з розділу щодо порівняння каталогів/об’єднанняЦі параметри використовуватимуться під час сканування каталогу і виконання об'єднання: докладніше про це можна дізнатися з розділу щодо порівняння каталогів/об'єднання. Крім того, тут є ще один параметр, пов’язаних зі збереженням окремих файлів: +>Крім того, тут є ще один параметр, пов'язаних зі збереженням окремих файлів: Кодування файла для об’єднання і збереження:Кодування файла для об'єднання і збереження: Після обробки звичайним препроцесором дані не буде змінено: їх буде показано і об’єднано у початковому вигляді. За допомогою інших дій у програмі можна буде змінити лише дані, які було повернуто алгоритмом пошуку відповідних рядків. Після обробки звичайним препроцесором дані не буде змінено: їх буде показано і об'єднано у початковому вигляді. За допомогою інших дій у програмі можна буде змінити лише дані, які було повернуто алгоритмом пошуку відповідних рядків. У рідкісних випадках використання звичайного препроцесора зауважте, що препроцесор пошуку відповідних рядків оброблятиме лише рядки, передані йому звичайним препроцесором. @@ -1875,18 +1875,18 @@ Порівняння і об’єднання каталогів за допомогою &kdiff3; +>Порівняння і об'єднання каталогів за допомогою &kdiff3; Вступ до порівняння і об’єднання каталогів +>Вступ до порівняння і об'єднання каталогів Часто програмістам для досягнення потрібної мети доводиться змінювати багато файлів у певному каталозі. У такому випадку &kdiff3; надасть вам змогу порівняти і об’єднати цілі каталоги рекурсивно! Часто програмістам для досягнення потрібної мети доводиться змінювати багато файлів у певному каталозі. У такому випадку &kdiff3; надасть вам змогу порівняти і об'єднати цілі каталоги рекурсивно! Хоча порівняння і об’єднання каталогів здається зовсім очевидною дією, існує декілька моментів, на які вам слід звернути увагу. Найважливішим є, звичайно ж, той факт, що кожна з дій на цей раз включатиме цілий набір файлів. Якщо у вас немає резервних копій початкових даних, каталог буде дуже важко або навіть неможливо повернути у початковий стан. Отже, перш ніж виконувати об’єднання, переконайтеся, що ваші дані у безпеці і повернення до попереднього стану можливе. Можна скористатися архівуванням або використати одну з систем керування версіями, але навіть досвідченим програмістам та інтеграторам іноді можуть знадобитися старі коди програм. Зауважте, що хоча автор &kdiff3; намагався (і намагатиметься) зробити програму якомога кращою, гарантувати відсутність вад у програмі просто неможливо. Відповідно до GNU-GPL автор НІЧОГО НЕ ГАРАНТУЄ щодо цієї програми. Отже, змиріться і завжди пам’ятайте, що:
Людині властиво помилятися, але, щоб насправді все заплутати, їй потрібен комп’ютер. +>Людині властиво помилятися, але, щоб насправді все заплутати, їй потрібен комп'ютер.
...для кожного з пунктів запропонувати дію з об’єднання, яку ви можете змінити перед тим, як розпочати об’єднання каталогів,...для кожного з пунктів запропонувати дію з об'єднання, яку ви можете змінити перед тим, як розпочати об'єднання каталогів, ...надати вам змогу зімітувати об’єднання і показати список дій, які буде виконано без їх виконання насправді,...надати вам змогу зімітувати об'єднання і показати список дій, які буде виконано без їх виконання насправді, ...надати вам змогу насправді виконати об’єднання і втрутитися, якщо знадобиться ваше втручання вручну,...надати вам змогу насправді виконати об'єднання і втрутитися, якщо знадобиться ваше втручання вручну, Запуск порівняння або об’єднання каталогів +>Запуск порівняння або об'єднання каталогів Виконання цього завдання дуже подібне на виконання завдання з порівняння і об’єднання окремих файлів. Вам просто слід вказати каталоги у командному рядку або у діалоговому вікні відкриття файлів. +>Виконання цього завдання дуже подібне на виконання завдання з порівняння і об'єднання окремих файлів. Вам просто слід вказати каталоги у командному рядку або у діалоговому вікні відкриття файлів. Порівняння/Об’єднання двох каталогів: +>Порівняння/Об'єднання двох каталогів: kdiff3Порівняння/Об’єднання трьох каталогів: +>Порівняння/Об'єднання трьох каталогів: kdiff3 Якщо об’єднуються три каталоги, базовим для об’єднання буде Якщо об'єднуються три каталоги, базовим для об'єднання буде каталог1. Якщо каталогу призначення не вказано, &kdiff3; використає з цією метою каталог3Візуальні дані щодо об’єднання каталогів +>Візуальні дані щодо об'єднання каталогів Під час читання каталогів програма показуватиме піктограму з поштовою скринькою, яка позначає виконання завдання. Якщо ви перервете сканування каталогів, буде показано список лише тих файлів, які програма встигла просканувати. Але елементи, які є однаковими у всіх каталогах колір теж буде однаковим, хоча їх вік і відрізнятиметься. Але елементи, які є однаковими у всіх теках колір теж буде однаковим, хоча їх вік і відрізнятиметься. Каталоги вважатимуться однаковими, якщо всі елементи, які у них містяться, є однаковими. Однакові елементи програма показуватиме однаковим кольором. Під час визначення кольору вік каталогу до уваги не братиметься. Об’єднання двох каталогів.Об'єднання двох каталогів. Під час виконання об’єднання трьох каталогів логіка програми виглядає так: Якщо елемент... +>Під час виконання об'єднання трьох каталогів логіка програми виглядає так: Якщо елемент... Під час виконання об’єднання двох каталогів логіка програми виглядає так: Якщо елемент... +>Під час виконання об'єднання двох каталогів логіка програми виглядає так: Якщо елемент... Виконання об’єднання каталогів +>Виконання об'єднання каталогів Ви можете наказати програмі виконати об’єднання поточного вибраного елемента (файла чи каталогу) або всіх елементів. Коли ви визначитеся з усіма параметрами дії (у всіх підкаталогах), можна розпочинати об’єднання. Ви можете наказати програмі виконати об'єднання поточного вибраного елемента (файла чи каталогу) або всіх елементів. Коли ви визначитеся з усіма параметрами дії (у всіх підкаталогах), можна розпочинати об'єднання. Пам’ятайте, що якщо ви не вказали каталог призначення явно, призначенням буде «C» у режимі роботи з трьома каталогами, «B» у режимі порівняння двох каталогів, і «A» або/і «B» у режимі синхронізації. Якщо ви вказали каталог призначення, вам також слід перевірити, що у ньому наявні всі належні елементи структури. Існують параметри, які можуть призвести до того, що програма не оброблятиме певні елементи під час порівняння і об’єднання каталогів. Щоб уникнути небажаних сюрпризів, вам слід перевірити наявність позначок навпроти таких пунктів: +>Якщо ви вказали каталог призначення, вам також слід перевірити, що у ньому наявні всі належні елементи структури. Існують параметри, які можуть призвести до того, що програма не оброблятиме певні елементи під час порівняння і об'єднання каталогів. Щоб уникнути небажаних сюрпризів, вам слід перевірити наявність позначок навпроти таких пунктів: &kdiff3; виконає вказану дію для всіх пунктів. Якщо потрібне буде втручання користувача (об’єднання окремого файла), програма відкриє вікно об’єднання (&kdiff3; виконає вказану дію для всіх пунктів. Якщо потрібне буде втручання користувача (об'єднання окремого файла), програма відкриє вікно об'єднання (див. великий знімок вікна). Якщо під час виконання &kdiff3; дій станеться помилка, програма повідомить вам про неї і покаже докладні відомості про стан. У нижній частині списку міститимуться повідомлення про помилки, які допоможуть вам зрозуміти, у чому полягає проблема. Якщо ви спробуєте продовжити об’єднання (натиснете клавішу F7), &kdiff3; надасть вам змогу вибрати між повторенням спроби об’єднання елемента, який спричинив помилку, і його пропуском. Це означає, що перш ніж продовжувати, ви зможете вибрати іншу дію стосовно файла або розв’язати проблему у інших спосіб. Після завершення процедури об’єднання &kdiff3; відкриє вікно повідомлення про завершення дії. Після завершення процедури об'єднання &kdiff3; відкриє вікно повідомлення про завершення дії. Якщо деякі з елементів було об’єднано окремо, перш ніж було виконано запуск об’єднання каталогів, &kdiff3; врахує це (на час поточного сеансу об’єднання) і не виконуватиме їх повторного об’єднання під час наступного загального об’єднання. Навіть якщо об’єднання було пропущено або результати об’єднання не було збережено, програма вважатиме об’єднання відповідних пунктів завершеним. Стан «Виконано» з таких елементів буде знято, лише якщо ви зміните дію з об’єднання. Після цього можна буде повторно виконати їх об’єднання. Варіанти порівняння і об’єднання каталогів +>Варіанти порівняння і об'єднання каталогів У вікні параметрів &kdiff3; (пункт меню «Параметри»->«Налаштувати &kdiff3;») є розділ з назвою «Об’єднання каталогів» з такими пунктами: @@ -2378,7 +2378,7 @@ >У деяких файлових системах певні файли мають атрибут «прихованих». У інших системах файли, назви яких починаються з крапки, «.», вважаються прихованими. За допомогою цього пункту ви може вказати програмі, чи слід включати подібні файли до ієрархії каталогів. Типово, цей пункт позначено.У деяких файлових системах певні файли мають атрибут «прихованих». У інших системах файли, назви яких починаються з крапки, «.», вважаються прихованими. За допомогою цього пункту ви може вказати програмі, чи слід включати подібні файли до ієрархії тек. Типово, цей пункт позначено. Призначено для посилань на каталоги. Якщо пункт не буде позначено, програма порівнюватиме символічні посилання. Якщо ж позначити пункт, програма вважатиме символічне посилання звичайним каталогом і виконуватиме його рекурсивне сканування. Зауважте, що програма не перевірятиме, чи не є посилання «рекурсивним». Отже, якщо, наприклад, у каталозі міститься посилання на сам каталог, виникне нескінченний цикл, після переповнення стека або пам’яті програма аварійно завершить роботу. Типово, пункт не позначено.Призначено для посилань на каталоги. Якщо пункт не буде позначено, програма порівнюватиме символічні посилання. Якщо ж позначити пункт, програма вважатиме символічне посилання звичайним каталогом і виконуватиме його рекурсивне сканування. Зауважте, що програма не перевірятиме, чи не є посилання «рекурсивним». Отже, якщо, наприклад, у каталозі міститься посилання на сам каталог, виникне нескінченний цикл, після переповнення стека або пам'яті програма аварійно завершить роботу. Типово, пункт не позначено. Якщо ви виконуєте порівняння великих каталогів за допомогою повільного мережевого з’єднання, ймовірно, швидше порівняти дати зміни файлів і довжину файлів окремо. Але подібне пришвидшення може призвести до певних неточностей. Будьте обережними з використанням цього пункту. Типово, цей пункт не позначено.Якщо ви виконуєте порівняння великих каталогів за допомогою повільного мережевого з'єднання, ймовірно, швидше порівняти дати зміни файлів і довжину файлів окремо. Але подібне пришвидшення може призвести до певних неточностей. Будьте обережними з використанням цього пункту. Типово, цей пункт не позначено. Замість об’єднання буде виконано дію з копіювання новішого варіанта на місце старішого. Цей спосіб може призвести до небезпечних наслідків, оскільки у такому випадку неявним чином вважається, що старіший файл не було змінено. Типово, цей пункт не позначено.Замість об'єднання буде виконано дію з копіювання новішого варіанта на місце старішого. Цей спосіб може призвести до небезпечних наслідків, оскільки у такому випадку неявним чином вважається, що старіший файл не було змінено. Типово, цей пункт не позначено. Інші функціональні можливості вікна об’єднання каталогів +>Інші функціональні можливості вікна об'єднання каталогів Розділений/Повноекранний режим @@ -2511,7 +2511,7 @@ Порівняння або об’єднання до єдиного файла +>Порівняння або об'єднання до єдиного файла Ймовірно, ви надасте перевагу простому подвійному клацанню лівою кнопкою миші на позначці файла для його порівняння. Крім того, ви можете скористатися відповідним пунктом з меню «Каталог». Ви також можете безпосереднього наказати програмі виконати об’єднання окремого файла: достатньо вибрати цей файл і скористатися пунктом «Об’єднати поточний файл» з меню «Об’єднання». Після зберігання результату стан відповідного пункту у списку буде змінено на «Виконано», програма не виконуватиме повторного об’єднання, якщо ви накажете їй виконати об’єднання цілих каталогів. Порівняння і об’єднання файлів з різними назвами +>Порівняння і об'єднання файлів з різними назвами Іноді у вас виникатиме потреба у порівнянні або об’єднанні файлів з різними назвами (наприклад поточного файла і його резервної копії у цій же теці). Скористайтеся пунктом «Порівняти явно вибрані файли» або «Об’єднати явно вибрані файли» з меню «Каталог». Для зручності ці пункти меню є і у контекстному меню кожного з файлів. Викликати контекстне меню можна за допомогою наведення вказівника миші на позначку файла з наступним клацанням правою кнопкою миші. Порівняння або об’єднання файлів відбувається у одному вікні. Якщо цим методом скористатися для каталогів, програма відкриє нове вікно. Порівняння або об'єднання файлів відбувається у одному вікні. Якщо цим методом скористатися для каталогів, програма відкриє нове вікно. @@ -2773,7 +2773,7 @@ Чому слід розв’язати всі конфлікти, перш ніж програма зможе зберегти результат об’єднання? Чому слід розв'язати всі конфлікти, перш ніж програма зможе зберегти результат об'єднання? Як мені синхронізувати перегляди відмінностей і об’єднання так, щоб у всіх переглядах було показано один фрагмент тексту? Як мені синхронізувати перегляди відмінностей і об'єднання так, щоб у всіх переглядах було показано один фрагмент тексту? Чому у редакторі вікна об’єднання результатів не передбачено можливості скасування дій? Чому у редакторі вікна об'єднання результатів не передбачено можливості скасування дій? Після вилучення певного фрагмента тексту несподівано з’явився напис «<Немає рядка джерела>», який неможливо вилучити. Що це означає і як мені вилучити напис? Після вилучення певного фрагмента тексту несподівано з'явився напис «<Немає рядка джерела>», який неможливо вилучити. Що це означає і як мені вилучити напис? Подяки і ліцензія &kdiff3; — інструмент для порівняння і об’єднання файлів та каталогів +>&kdiff3; — інструмент для порівняння і об'єднання файлів та каталогів Авторські права на програму належать Joachim Eibl joachim.eibl at gmx.de\n" "Language-Team: Ukrainian \n" diff -Nru kdiff3-1.8.01/po/uk/kdiff3.po kdiff3-1.8.3/po/uk/kdiff3.po --- kdiff3-1.8.01/po/uk/kdiff3.po 2019-05-18 01:02:35.000000000 +0000 +++ kdiff3-1.8.3/po/uk/kdiff3.po 2020-06-25 00:18:59.000000000 +0000 @@ -4,20 +4,20 @@ # version 3 or later versions approved by the membership of KDE e.V. # # Ivan Petrouchtchak , 2006, 2008. -# Yuri Chornoivan , 2008, 2009, 2010, 2011, 2013, 2018, 2019. +# Yuri Chornoivan , 2008, 2009, 2010, 2011, 2013, 2018, 2019, 2020. msgid "" msgstr "" "Project-Id-Version: kdiff3\n" -"Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2019-04-18 08:02+0200\n" -"PO-Revision-Date: 2019-03-09 09:15+0200\n" +"Report-Msgid-Bugs-To: https://bugs.kde.org\n" +"POT-Creation-Date: 2020-06-22 07:48+0200\n" +"PO-Revision-Date: 2020-02-08 15:13+0200\n" "Last-Translator: Yuri Chornoivan \n" "Language-Team: Ukrainian \n" "Language: uk\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: Lokalize 19.03.70\n" +"X-Generator: Lokalize 20.03.70\n" "Plural-Forms: nplurals=4; plural=n==1 ? 3 : n%10==1 && n%100!=11 ? 0 : n" "%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" @@ -31,285 +31,285 @@ msgid "Your emails" msgstr "fr.ivan@ukrainian-orthodox.org,yurchor@ukr.net" -#: difftextwindow.cpp:412 +#: difftextwindow.cpp:414 #, kde-format msgid "File %1: Line %2" msgstr "Файл %1: рядок %2" -#: difftextwindow.cpp:414 +#: difftextwindow.cpp:416 #, kde-format msgid "File %1: Line not available" msgstr "Файл %1: рядок недоступний" -#: difftextwindow.cpp:1780 +#: difftextwindow.cpp:1778 #, kde-format msgid "Encoding:" msgstr "Кодування:" -#: difftextwindow.cpp:1782 mergeresultwindow.cpp:3138 optiondialog.cpp:818 +#: difftextwindow.cpp:1781 mergeresultwindow.cpp:3166 optiondialog.cpp:840 #, kde-format msgid "Line end style:" msgstr "Стиль кінців рядка:" -#: difftextwindow.cpp:1810 directorymergewindow.cpp:382 -#: directorymergewindow.cpp:433 directorymergewindow.cpp:524 -#: directorymergewindow.cpp:3058 directorymergewindow.cpp:3189 -#: directorymergewindow.cpp:3417 mergeresultwindow.cpp:942 -#: mergeresultwindow.cpp:944 mergeresultwindow.cpp:946 -#: mergeresultwindow.cpp:948 mergeresultwindow.cpp:1814 -#: mergeresultwindow.cpp:3170 mergeresultwindow.cpp:3177 optiondialog.cpp:962 -#: optiondialog.cpp:975 pdiff.cpp:833 pdiff.cpp:835 pdiff.cpp:837 pdiff.cpp:839 -#: pdiff.cpp:861 smalldialogs.cpp:124 smalldialogs.cpp:126 smalldialogs.cpp:127 -#: smalldialogs.cpp:130 +#: difftextwindow.cpp:1809 directorymergewindow.cpp:383 +#: directorymergewindow.cpp:434 directorymergewindow.cpp:525 +#: directorymergewindow.cpp:3072 directorymergewindow.cpp:3203 +#: directorymergewindow.cpp:3431 mergeresultwindow.cpp:970 +#: mergeresultwindow.cpp:972 mergeresultwindow.cpp:974 +#: mergeresultwindow.cpp:976 mergeresultwindow.cpp:1842 +#: mergeresultwindow.cpp:3198 mergeresultwindow.cpp:3205 optiondialog.cpp:1002 +#: optiondialog.cpp:1015 pdiff.cpp:823 pdiff.cpp:825 pdiff.cpp:827 +#: pdiff.cpp:829 pdiff.cpp:851 smalldialogs.cpp:131 smalldialogs.cpp:133 +#: smalldialogs.cpp:134 smalldialogs.cpp:137 #, kde-format msgid "A" msgstr "A" -#: difftextwindow.cpp:1810 directorymergewindow.cpp:384 -#: directorymergewindow.cpp:436 directorymergewindow.cpp:526 -#: directorymergewindow.cpp:3064 directorymergewindow.cpp:3190 -#: directorymergewindow.cpp:3418 mergeresultwindow.cpp:942 -#: mergeresultwindow.cpp:944 mergeresultwindow.cpp:950 -#: mergeresultwindow.cpp:952 mergeresultwindow.cpp:1816 -#: mergeresultwindow.cpp:3172 mergeresultwindow.cpp:3179 optiondialog.cpp:963 -#: optiondialog.cpp:976 pdiff.cpp:833 pdiff.cpp:835 pdiff.cpp:841 pdiff.cpp:843 -#: pdiff.cpp:863 smalldialogs.cpp:124 smalldialogs.cpp:125 smalldialogs.cpp:128 -#: smalldialogs.cpp:131 +#: difftextwindow.cpp:1809 directorymergewindow.cpp:385 +#: directorymergewindow.cpp:437 directorymergewindow.cpp:527 +#: directorymergewindow.cpp:3078 directorymergewindow.cpp:3204 +#: directorymergewindow.cpp:3432 mergeresultwindow.cpp:970 +#: mergeresultwindow.cpp:972 mergeresultwindow.cpp:978 +#: mergeresultwindow.cpp:980 mergeresultwindow.cpp:1844 +#: mergeresultwindow.cpp:3200 mergeresultwindow.cpp:3207 optiondialog.cpp:1003 +#: optiondialog.cpp:1016 pdiff.cpp:823 pdiff.cpp:825 pdiff.cpp:831 +#: pdiff.cpp:833 pdiff.cpp:853 smalldialogs.cpp:131 smalldialogs.cpp:132 +#: smalldialogs.cpp:135 smalldialogs.cpp:138 #, kde-format msgid "B" msgstr "B" -#: difftextwindow.cpp:1810 directorymergewindow.cpp:386 -#: directorymergewindow.cpp:439 directorymergewindow.cpp:528 -#: directorymergewindow.cpp:3070 directorymergewindow.cpp:3191 -#: directorymergewindow.cpp:3419 mergeresultwindow.cpp:946 -#: mergeresultwindow.cpp:948 mergeresultwindow.cpp:950 -#: mergeresultwindow.cpp:952 mergeresultwindow.cpp:1818 -#: mergeresultwindow.cpp:3174 mergeresultwindow.cpp:3181 optiondialog.cpp:977 -#: pdiff.cpp:837 pdiff.cpp:839 pdiff.cpp:841 pdiff.cpp:843 pdiff.cpp:865 -#: smalldialogs.cpp:125 smalldialogs.cpp:126 smalldialogs.cpp:129 -#: smalldialogs.cpp:132 +#: difftextwindow.cpp:1809 directorymergewindow.cpp:387 +#: directorymergewindow.cpp:440 directorymergewindow.cpp:529 +#: directorymergewindow.cpp:3084 directorymergewindow.cpp:3205 +#: directorymergewindow.cpp:3433 mergeresultwindow.cpp:974 +#: mergeresultwindow.cpp:976 mergeresultwindow.cpp:978 +#: mergeresultwindow.cpp:980 mergeresultwindow.cpp:1846 +#: mergeresultwindow.cpp:3202 mergeresultwindow.cpp:3209 optiondialog.cpp:1017 +#: pdiff.cpp:827 pdiff.cpp:829 pdiff.cpp:831 pdiff.cpp:833 pdiff.cpp:855 +#: smalldialogs.cpp:132 smalldialogs.cpp:133 smalldialogs.cpp:136 +#: smalldialogs.cpp:139 #, kde-format msgid "C" msgstr "C" -#: difftextwindow.cpp:1810 +#: difftextwindow.cpp:1809 #, kde-format msgid "A (Base)" msgstr "A (Основний)" -#: difftextwindow.cpp:1812 +#: difftextwindow.cpp:1811 #, kde-format msgid "Encoding: %1" msgstr "Кодування: %1" -#: difftextwindow.cpp:1813 mergeresultwindow.cpp:3183 +#: difftextwindow.cpp:1812 mergeresultwindow.cpp:3211 #, kde-format msgid "Unix" msgstr "Unix" -#: difftextwindow.cpp:1813 mergeresultwindow.cpp:3184 +#: difftextwindow.cpp:1812 mergeresultwindow.cpp:3212 #, kde-format msgid "DOS" msgstr "DOS" -#: difftextwindow.cpp:1813 +#: difftextwindow.cpp:1812 #, kde-format msgid "Line end style: %1" msgstr "Стиль кінців рядка: %1" -#: difftextwindow.cpp:1835 kdiff3.cpp:873 +#: difftextwindow.cpp:1834 kdiff3.cpp:874 #, kde-format msgid "Top line" msgstr "Верхній рядок" -#: difftextwindow.cpp:1845 +#: difftextwindow.cpp:1843 #, kde-format msgid "End" msgstr "Кінець" -#: difftextwindow.cpp:1903 smalldialogs.cpp:235 +#: difftextwindow.cpp:1901 smalldialogs.cpp:245 #, kde-format msgid "Open File" msgstr "Відкрити файл" -#: difftextwindow.cpp:1951 optiondialog.cpp:387 +#: difftextwindow.cpp:1943 optiondialog.cpp:389 #, kde-format msgid "Unicode, 8 bit" msgstr "Юнікод, 8 бітів" -#: difftextwindow.cpp:1966 +#: difftextwindow.cpp:1958 #, kde-format msgid "Other" msgstr "Інше" -#: directorymergewindow.cpp:409 directorymergewindow.cpp:3424 +#: directorymergewindow.cpp:410 directorymergewindow.cpp:3438 #, kde-format msgid "Copy A to B" msgstr "Копіювати A до B" -#: directorymergewindow.cpp:412 directorymergewindow.cpp:3425 +#: directorymergewindow.cpp:413 directorymergewindow.cpp:3439 #, kde-format msgid "Copy B to A" msgstr "Копіювати B до A" -#: directorymergewindow.cpp:415 directorymergewindow.cpp:3426 +#: directorymergewindow.cpp:416 directorymergewindow.cpp:3440 #, kde-format msgid "Delete A" msgstr "Вилучити A" -#: directorymergewindow.cpp:418 directorymergewindow.cpp:3427 +#: directorymergewindow.cpp:419 directorymergewindow.cpp:3441 #, kde-format msgid "Delete B" msgstr "Вилучити B" -#: directorymergewindow.cpp:421 +#: directorymergewindow.cpp:422 #, kde-format msgid "Delete A & B" msgstr "Вилучити A і B" -#: directorymergewindow.cpp:424 directorymergewindow.cpp:3429 +#: directorymergewindow.cpp:425 directorymergewindow.cpp:3443 #, kde-format msgid "Merge to A" -msgstr "Об’єднати у A" +msgstr "Об'єднати у A" -#: directorymergewindow.cpp:427 directorymergewindow.cpp:3430 +#: directorymergewindow.cpp:428 directorymergewindow.cpp:3444 #, kde-format msgid "Merge to B" -msgstr "Об’єднати у B" +msgstr "Об'єднати у B" -#: directorymergewindow.cpp:430 +#: directorymergewindow.cpp:431 #, kde-format msgid "Merge to A & B" -msgstr "Об’єднати у A і B" +msgstr "Об'єднати у A і B" -#: directorymergewindow.cpp:442 directorymergewindow.cpp:3421 +#: directorymergewindow.cpp:443 directorymergewindow.cpp:3435 #, kde-format msgid "Delete (if exists)" msgstr "Вилучити (якщо існує)" -#: directorymergewindow.cpp:445 directorymergewindow.cpp:448 -#: directorymergewindow.cpp:3420 optiondialog.cpp:925 smalldialogs.cpp:113 +#: directorymergewindow.cpp:446 directorymergewindow.cpp:449 +#: directorymergewindow.cpp:3434 smalldialogs.cpp:120 #, kde-format msgid "Merge" msgstr "Об'єднати" -#: directorymergewindow.cpp:445 directorymergewindow.cpp:448 +#: directorymergewindow.cpp:446 directorymergewindow.cpp:449 #, kde-format msgid "Merge (manual)" -msgstr "Об’єднати (вручну)" +msgstr "Об'єднати (вручну)" -#: directorymergewindow.cpp:451 +#: directorymergewindow.cpp:452 #, kde-format msgid "Error: Conflicting File Types" msgstr "Помилка: Конфлікт типів файлів" -#: directorymergewindow.cpp:454 +#: directorymergewindow.cpp:455 #, kde-format msgid "Error: Changed and Deleted" msgstr "Помилка: змінено і вилучено" -#: directorymergewindow.cpp:457 +#: directorymergewindow.cpp:458 #, kde-format msgid "Error: Dates are equal but files are not." msgstr "Помилка: Дати однакові, а файли відрізняються." -#: directorymergewindow.cpp:471 +#: directorymergewindow.cpp:472 #, kde-format msgid "Done" msgstr "Виконано" -#: directorymergewindow.cpp:473 +#: directorymergewindow.cpp:474 #, kde-format msgid "Error" msgstr "Помилка" -#: directorymergewindow.cpp:475 +#: directorymergewindow.cpp:476 #, kde-format msgid "Skipped." msgstr "Пропущено." -#: directorymergewindow.cpp:477 +#: directorymergewindow.cpp:478 #, kde-format msgid "Not saved." msgstr "Не збережено." -#: directorymergewindow.cpp:479 +#: directorymergewindow.cpp:480 #, kde-format msgid "In progress..." -msgstr "Виконання..." +msgstr "Виконання…" -#: directorymergewindow.cpp:481 +#: directorymergewindow.cpp:482 #, kde-format msgid "To do." msgstr "Реалізувати." -#: directorymergewindow.cpp:522 +#: directorymergewindow.cpp:523 #, kde-format msgid "Name" msgstr "Назва" -#: directorymergewindow.cpp:530 +#: directorymergewindow.cpp:531 #, kde-format msgid "Operation" msgstr "Дія" -#: directorymergewindow.cpp:532 +#: directorymergewindow.cpp:533 #, kde-format msgid "Status" msgstr "Стан" -#: directorymergewindow.cpp:534 +#: directorymergewindow.cpp:535 #, kde-format msgid "Unsolved" msgstr "Не розв'язано" -#: directorymergewindow.cpp:536 +#: directorymergewindow.cpp:537 #, kde-format msgid "Solved" msgstr "Розв'язано" -#: directorymergewindow.cpp:538 +#: directorymergewindow.cpp:539 #, kde-format msgid "Nonwhite" msgstr "Не-білий" -#: directorymergewindow.cpp:540 +#: directorymergewindow.cpp:541 #, kde-format msgid "White" msgstr "Білий" -#: directorymergewindow.cpp:674 +#: directorymergewindow.cpp:676 #, kde-format msgid "Unable to compare non-normal file with normal file." msgstr "Неможливо порівняти незвичайний файл зі звичайним файлом." -#: directorymergewindow.cpp:688 +#: directorymergewindow.cpp:690 #, kde-format msgid "Mix of links and normal files." msgstr "Суміш посилань і звичайних файлів." -#: directorymergewindow.cpp:695 +#: directorymergewindow.cpp:697 #, kde-format msgid "Link: " msgstr "Посилання: " -#: directorymergewindow.cpp:704 +#: directorymergewindow.cpp:706 #, kde-format msgid "Size. " msgstr "Розмір. " -#: directorymergewindow.cpp:718 directorymergewindow.cpp:728 +#: directorymergewindow.cpp:720 directorymergewindow.cpp:730 #, kde-format msgid "Date & Size: " msgstr "Дата і розмір: " -#: directorymergewindow.cpp:748 +#: directorymergewindow.cpp:751 #, kde-format msgid "Comparing file..." -msgstr "Порівняння файла..." +msgstr "Порівняння файла…" -#: directorymergewindow.cpp:801 +#: directorymergewindow.cpp:813 #, kde-format msgid "" "You are currently doing a directory merge. Are you sure, you want to abort " @@ -318,48 +318,48 @@ "Зараз ви виконуєте об’єднання каталогів. Ви впевнені, що бажаєте перервати " "об’єднання і пересканувати каталог?" -#: directorymergewindow.cpp:802 kdiff3.cpp:698 kdiff3.cpp:708 kdiff3.cpp:720 -#: mergeresultwindow.cpp:372 pdiff.cpp:1033 pdiff.cpp:1910 pdiff.cpp:1920 +#: directorymergewindow.cpp:814 kdiff3.cpp:697 kdiff3.cpp:707 kdiff3.cpp:719 +#: mergeresultwindow.cpp:400 pdiff.cpp:1031 pdiff.cpp:1920 pdiff.cpp:1930 #, kde-format msgid "Warning" msgstr "Попередження" -#: directorymergewindow.cpp:803 directorymergewindow.cpp:3393 +#: directorymergewindow.cpp:815 directorymergewindow.cpp:3407 #, kde-format msgid "Rescan" msgstr "Пересканувати" -#: directorymergewindow.cpp:804 pdiff.cpp:1035 +#: directorymergewindow.cpp:816 pdiff.cpp:1033 #, kde-format msgid "Continue Merging" msgstr "Продовжити об'єднання" -#: directorymergewindow.cpp:971 +#: directorymergewindow.cpp:984 #, kde-format msgid "Opening of directories failed:" msgstr "Помилка відкриття каталогів:" -#: directorymergewindow.cpp:975 +#: directorymergewindow.cpp:988 #, kde-format msgid "Dir A \"%1\" does not exist or is not a directory.\n" msgstr "Каталог А «%1» не існує або це не каталог.\n" -#: directorymergewindow.cpp:980 +#: directorymergewindow.cpp:993 #, kde-format msgid "Dir B \"%1\" does not exist or is not a directory.\n" msgstr "Каталог В «%1» не існує або це не каталог.\n" -#: directorymergewindow.cpp:985 +#: directorymergewindow.cpp:998 #, kde-format msgid "Dir C \"%1\" does not exist or is not a directory.\n" msgstr "Каталог С «%1» не існує або це не каталог.\n" -#: directorymergewindow.cpp:988 +#: directorymergewindow.cpp:1001 #, kde-format msgid "Directory Open Error" msgstr "Помилка відкриття каталогу" -#: directorymergewindow.cpp:996 +#: directorymergewindow.cpp:1009 #, kde-format msgid "" "The destination directory must not be the same as A or B when three " @@ -370,49 +370,49 @@ "ієрархічні каталоги.\n" "Перевірте ще раз, перш ніж продовжувати." -#: directorymergewindow.cpp:998 +#: directorymergewindow.cpp:1011 #, kde-format msgid "Parameter Warning" msgstr "Попередження про параметри" -#: directorymergewindow.cpp:1003 +#: directorymergewindow.cpp:1016 #, kde-format msgid "Scanning directories..." msgstr "Сканування каталогів..." -#: directorymergewindow.cpp:1029 +#: directorymergewindow.cpp:1042 #, kde-format msgid "Reading Directory A" msgstr "Читання каталогу A" -#: directorymergewindow.cpp:1038 +#: directorymergewindow.cpp:1051 #, kde-format msgid "Reading Directory B" msgstr "Читання каталогу B" -#: directorymergewindow.cpp:1048 +#: directorymergewindow.cpp:1061 #, kde-format msgid "Reading Directory C" msgstr "Читання каталогу C" -#: directorymergewindow.cpp:1064 +#: directorymergewindow.cpp:1077 #, kde-format msgid "Some subdirectories were not readable in" msgstr "Деякі підтеки не придатні для читання у" -#: directorymergewindow.cpp:1069 +#: directorymergewindow.cpp:1082 #, kde-format msgid "Check the permissions of the subdirectories." msgstr "Перевірте права доступу до підкаталогів." -#: directorymergewindow.cpp:1106 kdiff3.cpp:666 kdiff3.cpp:753 kdiff3.cpp:777 -#: kdiff3.cpp:1065 kdiff3.cpp:1086 pdiff.cpp:1116 pdiff.cpp:1170 pdiff.cpp:1218 -#: pdiff.cpp:1234 pdiff.cpp:1277 pdiff.cpp:1301 +#: directorymergewindow.cpp:1119 kdiff3.cpp:665 kdiff3.cpp:752 kdiff3.cpp:776 +#: kdiff3.cpp:1072 kdiff3.cpp:1093 pdiff.cpp:1115 pdiff.cpp:1178 pdiff.cpp:1228 +#: pdiff.cpp:1244 pdiff.cpp:1287 pdiff.cpp:1311 #, kde-format msgid "Ready." msgstr "Готово." -#: directorymergewindow.cpp:1121 +#: directorymergewindow.cpp:1134 #, kde-format msgid "" "Directory Comparison Status\n" @@ -427,22 +427,22 @@ "Кількість однакових файлів: %2\n" "Кількість різних файлів: %3" -#: directorymergewindow.cpp:1128 +#: directorymergewindow.cpp:1141 #, kde-format msgid "Number of manual merges: %1" -msgstr "Кількість об’єднань вручну: %1" +msgstr "Кількість об'єднань вручну: %1" -#: directorymergewindow.cpp:1394 +#: directorymergewindow.cpp:1407 #, kde-format msgid "This affects all merge operations." -msgstr "Це торкнеться всіх операцій об’єднання." +msgstr "Це торкнеться всіх операцій об'єднання." -#: directorymergewindow.cpp:1395 +#: directorymergewindow.cpp:1408 #, kde-format msgid "Changing All Merge Operations" -msgstr "Зміна всіх операцій об’єднання" +msgstr "Зміна всіх операцій об'єднання" -#: directorymergewindow.cpp:1695 +#: directorymergewindow.cpp:1708 #, kde-format msgid "" "Processing %1 / %2\n" @@ -451,44 +451,44 @@ "Обробка %1 з %2\n" "%3" -#: directorymergewindow.cpp:1738 directorymergewindow.cpp:1742 +#: directorymergewindow.cpp:1751 directorymergewindow.cpp:1755 #, kde-format msgid "Some files could not be processed." msgstr "Деякі з файлів не вдалося обробити." -#: directorymergewindow.cpp:2222 directorymergewindow.cpp:2247 -#: directorymergewindow.cpp:2271 +#: directorymergewindow.cpp:2235 directorymergewindow.cpp:2260 +#: directorymergewindow.cpp:2285 #, kde-format msgid "This operation is currently not possible." msgstr "Зараз ця операція неможлива." -#: directorymergewindow.cpp:2222 directorymergewindow.cpp:2247 -#: directorymergewindow.cpp:2271 directorymergewindow.cpp:2552 +#: directorymergewindow.cpp:2235 directorymergewindow.cpp:2260 +#: directorymergewindow.cpp:2285 directorymergewindow.cpp:2565 #, kde-format msgid "Operation Not Possible" msgstr "Операція неможлива" -#: directorymergewindow.cpp:2318 +#: directorymergewindow.cpp:2332 #, kde-format msgid "An error occurred while copying." msgstr "Під час копіювання сталася помилка." -#: directorymergewindow.cpp:2319 directorymergewindow.cpp:2759 +#: directorymergewindow.cpp:2333 directorymergewindow.cpp:2772 #, kde-format msgid "Merge Error" -msgstr "Помилка об’єднання" +msgstr "Помилка об'єднання" -#: directorymergewindow.cpp:2396 +#: directorymergewindow.cpp:2410 #, kde-format msgid "Unknown merge operation. (This must never happen!)" -msgstr "Невідома операція об’єднання. (Цього не мало статися!)" +msgstr "Невідома операція об'єднання. (Цього не мало статися!)" -#: directorymergewindow.cpp:2441 +#: directorymergewindow.cpp:2455 #, kde-format msgid "Unknown merge operation." -msgstr "Невідома операція об’єднання." +msgstr "Невідома операція об'єднання." -#: directorymergewindow.cpp:2454 +#: directorymergewindow.cpp:2468 #, kde-format msgid "" "The merge is about to begin.\n" @@ -500,7 +500,7 @@ "Be aware that this program still has beta status and there is NO WARRANTY " "whatsoever! Make backups of your vital data!" msgstr "" -"Зараз розпочнеться об’єднання.\n" +"Зараз розпочнеться об'єднання.\n" "\n" "Виберіть «Зробити це», якщо ви прочитали настанови і знаєте, що саме " "робите.\n" @@ -509,22 +509,22 @@ "Зауважте, що ця програма знаходиться у стані тестування і розробники НЕ " "МОЖУТЬ ГАРАНТУВАТИ нічого! Зробіть резервну копію важливих даних!" -#: directorymergewindow.cpp:2459 +#: directorymergewindow.cpp:2473 #, kde-format msgid "Starting Merge" -msgstr "Запуск об’єднання" +msgstr "Запуск об'єднання" -#: directorymergewindow.cpp:2460 +#: directorymergewindow.cpp:2474 #, kde-format msgid "Do It" msgstr "Зробити" -#: directorymergewindow.cpp:2461 +#: directorymergewindow.cpp:2475 #, kde-format msgid "Simulate It" msgstr "Симулювати" -#: directorymergewindow.cpp:2487 +#: directorymergewindow.cpp:2501 #, kde-format msgid "" "The highlighted item has a different type in the different directories. " @@ -533,14 +533,14 @@ "Підсвічений елемент має відмінний тип у різних каталогах. Виберіть потрібну " "дію." -#: directorymergewindow.cpp:2491 +#: directorymergewindow.cpp:2505 #, kde-format msgid "" "The modification dates of the file are equal but the files are not. Select " "what to do." msgstr "Дати змін файлів однакові, але файли — різні. Виберіть дію." -#: directorymergewindow.cpp:2495 +#: directorymergewindow.cpp:2509 #, kde-format msgid "" "The highlighted item was changed in one directory and deleted in the other. " @@ -549,14 +549,14 @@ "Підсвічений елемент було змінено у одному з каталогів і вилучено у іншому. " "Оберіть належну дію." -#: directorymergewindow.cpp:2552 +#: directorymergewindow.cpp:2565 #, kde-format msgid "" "This operation is currently not possible because directory merge is " "currently running." msgstr "Ця дія зараз неможлива, оскільки виконується об’єднання каталогів." -#: directorymergewindow.cpp:2609 +#: directorymergewindow.cpp:2622 #, kde-format msgid "" "There was an error in the last step.\n" @@ -567,321 +567,321 @@ "Бажаєте продовжити з елемента, що викликав помилку чи бажаєте пропустити цей " "елемент?" -#: directorymergewindow.cpp:2611 +#: directorymergewindow.cpp:2624 #, kde-format msgid "Continue merge after an error" -msgstr "Продовжити об’єднання після помилки" +msgstr "Продовжити об'єднання після помилки" -#: directorymergewindow.cpp:2612 +#: directorymergewindow.cpp:2625 #, kde-format msgid "Continue With Last Item" msgstr "Продовжити з останнього елемента" -#: directorymergewindow.cpp:2613 +#: directorymergewindow.cpp:2626 #, kde-format msgid "Skip Item" msgstr "Пропустити елемент" -#: directorymergewindow.cpp:2709 +#: directorymergewindow.cpp:2722 #, kde-format msgid "Merge operation complete." -msgstr "Операцію об’єднання завершено." +msgstr "Операцію об'єднання завершено." -#: directorymergewindow.cpp:2709 directorymergewindow.cpp:2712 +#: directorymergewindow.cpp:2722 directorymergewindow.cpp:2725 #, kde-format msgid "Merge Complete" -msgstr "Об’єднання завершено" +msgstr "Об'єднання завершено" -#: directorymergewindow.cpp:2722 +#: directorymergewindow.cpp:2735 #, kde-format msgid "" "Simulated merge complete: Check if you agree with the proposed operations." msgstr "" -"Імітацію об’єднання завершено: перевірте, чи згодні ви з запропонованими " +"Імітацію об'єднання завершено: перевірте, чи згодні ви з запропонованими " "операціями." -#: directorymergewindow.cpp:2758 +#: directorymergewindow.cpp:2771 #, kde-format msgid "An error occurred. Press OK to see detailed information." msgstr "" "Сталася помилка. Натисніть кнопку «Гаразд», щоб побачити докладнішу " "інформацію." -#: directorymergewindow.cpp:2791 +#: directorymergewindow.cpp:2804 #, kde-format msgid "Error: While deleting %1: Creating backup failed." msgstr "Помилка: під час вилучення %1: невдала спроба створення резерву." -#: directorymergewindow.cpp:2798 +#: directorymergewindow.cpp:2811 #, kde-format msgid "delete directory recursively( %1 )" msgstr "рекурсивно вилучити каталог( %1 )" -#: directorymergewindow.cpp:2800 +#: directorymergewindow.cpp:2813 #, kde-format msgid "delete( %1 )" msgstr "delete( %1 )" -#: directorymergewindow.cpp:2815 +#: directorymergewindow.cpp:2828 #, kde-format msgid "Error: delete dir operation failed while trying to read the directory." msgstr "" "Помилка: невдача під час спроби виконання дії delete для теки на етапі " "читання теки." -#: directorymergewindow.cpp:2834 +#: directorymergewindow.cpp:2847 #, kde-format msgid "Error: rmdir( %1 ) operation failed." msgstr "Помилка: невдала спроба виконати rmdir( %1 )." -#: directorymergewindow.cpp:2844 +#: directorymergewindow.cpp:2857 #, kde-format msgid "Error: delete operation failed." msgstr "Помилка: дія вилучення зазнала невдачі." -#: directorymergewindow.cpp:2870 +#: directorymergewindow.cpp:2884 #, kde-format msgid "manual merge( %1, %2, %3 -> %4)" msgstr "manual merge( %1, %2, %3 -> %4)" -#: directorymergewindow.cpp:2873 +#: directorymergewindow.cpp:2887 #, kde-format msgid "" " Note: After a manual merge the user should continue by pressing F7." msgstr "" -" Зауваження: Після завершення об’єднання вручу користувач може " +" Зауваження: Після завершення об'єднання вручу користувач може " "продовжити роботу натисканням F7." -#: directorymergewindow.cpp:2900 +#: directorymergewindow.cpp:2914 #, kde-format msgid "Error: copy( %1 -> %2 ) failed.Deleting existing destination failed." msgstr "" "Помилка: невдала спроба copy( %1 -> %2 ). Неможливо вилучити існуючий файл " "призначення." -#: directorymergewindow.cpp:2909 +#: directorymergewindow.cpp:2923 #, kde-format msgid "copyLink( %1 -> %2 )" msgstr "copyLink( %1 -> %2 )" -#: directorymergewindow.cpp:2918 +#: directorymergewindow.cpp:2932 #, kde-format msgid "Error: copyLink failed: Remote links are not yet supported." msgstr "" "Помилка: невдала спроба copyLink: віддалені посилання ще не підтримуються." -#: directorymergewindow.cpp:2928 +#: directorymergewindow.cpp:2942 #, kde-format msgid "Error: copyLink failed." msgstr "Помилка: copyLink зазнала невдачі." -#: directorymergewindow.cpp:2953 +#: directorymergewindow.cpp:2967 #, kde-format msgid "copy( %1 -> %2 )" msgstr "copy( %1 -> %2 )" -#: directorymergewindow.cpp:2979 +#: directorymergewindow.cpp:2993 #, kde-format msgid "Error during rename( %1 -> %2 ): Cannot delete existing destination." msgstr "" "Помилка під час rename( %1 -> %2 ): Не вдалося вилучити існуюче призначення." -#: directorymergewindow.cpp:2986 +#: directorymergewindow.cpp:3000 #, kde-format msgid "rename( %1 -> %2 )" msgstr "rename( %1 -> %2 )" -#: directorymergewindow.cpp:2995 +#: directorymergewindow.cpp:3009 #, kde-format msgid "Error: Rename failed." msgstr "Помилка: Перейменування зазнало невдачі." -#: directorymergewindow.cpp:3013 +#: directorymergewindow.cpp:3027 #, kde-format msgid "Error during makeDir of %1. Cannot delete existing file." msgstr "" "Помилка під час виконання makeDir %1. Не вдалося вилучити існуючий файл." -#: directorymergewindow.cpp:3030 +#: directorymergewindow.cpp:3044 #, kde-format msgid "makeDir( %1 )" msgstr "makeDir( %1 )" -#: directorymergewindow.cpp:3040 +#: directorymergewindow.cpp:3054 #, kde-format msgid "Error while creating directory." msgstr "Помилка створення каталогу." -#: directorymergewindow.cpp:3076 directorymergewindow.cpp:3195 +#: directorymergewindow.cpp:3090 directorymergewindow.cpp:3209 #, kde-format msgid "Dest" msgstr "Призн." -#: directorymergewindow.cpp:3084 directorymergewindow.cpp:3113 +#: directorymergewindow.cpp:3098 directorymergewindow.cpp:3127 #, kde-format msgid "Dir" msgstr "Каталог" -#: directorymergewindow.cpp:3084 +#: directorymergewindow.cpp:3098 #, kde-format msgid "Type" msgstr "Тип" -#: directorymergewindow.cpp:3084 +#: directorymergewindow.cpp:3098 #, kde-format msgid "Size" msgstr "Розмір" -#: directorymergewindow.cpp:3085 +#: directorymergewindow.cpp:3099 #, kde-format msgid "Attr" msgstr "Атриб." -#: directorymergewindow.cpp:3085 +#: directorymergewindow.cpp:3099 #, kde-format msgid "Last Modification" msgstr "Час останньої зміни" -#: directorymergewindow.cpp:3085 +#: directorymergewindow.cpp:3099 #, kde-format msgid "Link-Destination" msgstr "Призначення посилання" -#: directorymergewindow.cpp:3113 +#: directorymergewindow.cpp:3127 #, kde-format msgid "File" msgstr "Файл" -#: directorymergewindow.cpp:3113 +#: directorymergewindow.cpp:3127 #, kde-format msgid "-Link" msgstr "-Посилання" -#: directorymergewindow.cpp:3119 +#: directorymergewindow.cpp:3133 #, kde-format msgid "not available" msgstr "не доступне" -#: directorymergewindow.cpp:3137 +#: directorymergewindow.cpp:3151 #, kde-format msgid "A (Dest): " msgstr "A (Призн.): " -#: directorymergewindow.cpp:3141 +#: directorymergewindow.cpp:3155 #, kde-format msgid "A: " msgstr "A: " -#: directorymergewindow.cpp:3141 +#: directorymergewindow.cpp:3155 #, kde-format msgid "A (Base): " msgstr "A (Основа): " -#: directorymergewindow.cpp:3147 +#: directorymergewindow.cpp:3161 #, kde-format msgid "B (Dest): " msgstr "B (Призн.): " -#: directorymergewindow.cpp:3151 +#: directorymergewindow.cpp:3165 #, kde-format msgid "B: " msgstr "B: " -#: directorymergewindow.cpp:3156 +#: directorymergewindow.cpp:3170 #, kde-format msgid "C (Dest): " msgstr "C (Призн.): " -#: directorymergewindow.cpp:3160 +#: directorymergewindow.cpp:3174 #, kde-format msgid "C: " msgstr "C: " -#: directorymergewindow.cpp:3163 +#: directorymergewindow.cpp:3177 #, kde-format msgid "Dest: " msgstr "Призн.:" #. i18n("Saving Directory Merge State ...")); -#: directorymergewindow.cpp:3238 +#: directorymergewindow.cpp:3252 #, kde-format msgid "Save Directory Merge State As..." msgstr "Зберегти режим об’єднання каталогів як..." -#: directorymergewindow.cpp:3387 +#: directorymergewindow.cpp:3401 #, kde-format msgid "Start/Continue Directory Merge" msgstr "Почати/Продовжити об’єднання каталогів" -#: directorymergewindow.cpp:3388 +#: directorymergewindow.cpp:3402 #, kde-format msgid "Run Operation for Current Item" msgstr "Виконати операцію для поточного елемента" -#: directorymergewindow.cpp:3389 +#: directorymergewindow.cpp:3403 #, kde-format msgid "Compare Selected File" msgstr "Порівняти вибраний файл" -#: directorymergewindow.cpp:3390 +#: directorymergewindow.cpp:3404 #, kde-format msgid "Merge Current File" -msgstr "Об’єднати поточний файл" +msgstr "Об'єднати поточний файл" -#: directorymergewindow.cpp:3390 +#: directorymergewindow.cpp:3404 #, kde-format msgid "" "Merge\n" "File" msgstr "" -"Об’єднати\n" +"Об'єднати\n" "файл" -#: directorymergewindow.cpp:3391 +#: directorymergewindow.cpp:3405 #, kde-format msgid "Fold All Subdirs" msgstr "Згорнути всі підтеки" -#: directorymergewindow.cpp:3392 +#: directorymergewindow.cpp:3406 #, kde-format msgid "Unfold All Subdirs" msgstr "Розгорнути всі підтеки" #. i18n("Save Directory Merge State ..."), 0, this, &DirectoryMergeWindow::slotSaveMergeState, ac, "dir_save_merge_state"); #. i18n("Load Directory Merge State ..."), 0, this, &DirectoryMergeWindow::slotLoadMergeState, ac, "dir_load_merge_state"); -#: directorymergewindow.cpp:3396 +#: directorymergewindow.cpp:3410 #, kde-format msgid "Choose A for All Items" msgstr "Вибрати A для списку всіх елементів" -#: directorymergewindow.cpp:3397 +#: directorymergewindow.cpp:3411 #, kde-format msgid "Choose B for All Items" msgstr "Вибрати B для списку всіх елементів" -#: directorymergewindow.cpp:3398 +#: directorymergewindow.cpp:3412 #, kde-format msgid "Choose C for All Items" msgstr "Вибрати C для списку всіх елементів" -#: directorymergewindow.cpp:3399 +#: directorymergewindow.cpp:3413 #, kde-format msgid "Auto-Choose Operation for All Items" msgstr "Операція автовибору для всіх елементів" -#: directorymergewindow.cpp:3400 +#: directorymergewindow.cpp:3414 #, kde-format msgid "No Operation for All Items" msgstr "Нічого не робити з усіма елементами" #. i18n("Synchronize Directories"), 0, this, &DirectoryMergeWindow::slotSynchronizeDirectories, ac, "dir_synchronize_directories"); #. d->m_pDirChooseNewerFiles = GuiUtils::createAction< KToggleAction >(i18n("Copy Newer Files Instead of Merging"), 0, this, &DirectoryMergeWindow::slotChooseNewerFiles, ac, "dir_choose_newer_files"); -#: directorymergewindow.cpp:3405 +#: directorymergewindow.cpp:3419 #, kde-format msgid "Show Identical Files" msgstr "Показувати однакові файли" -#: directorymergewindow.cpp:3405 +#: directorymergewindow.cpp:3419 #, kde-format msgid "" "Identical\n" @@ -890,17 +890,17 @@ "Однакові\n" "файли" -#: directorymergewindow.cpp:3406 +#: directorymergewindow.cpp:3420 #, kde-format msgid "Show Different Files" msgstr "Показувати різні файли" -#: directorymergewindow.cpp:3407 +#: directorymergewindow.cpp:3421 #, kde-format msgid "Show Files only in A" msgstr "Показувати файли лише у A" -#: directorymergewindow.cpp:3407 +#: directorymergewindow.cpp:3421 #, kde-format msgid "" "Files\n" @@ -909,12 +909,12 @@ "Файли\n" "лише у A" -#: directorymergewindow.cpp:3408 +#: directorymergewindow.cpp:3422 #, kde-format msgid "Show Files only in B" msgstr "Показувати файли лише у B" -#: directorymergewindow.cpp:3408 +#: directorymergewindow.cpp:3422 #, kde-format msgid "" "Files\n" @@ -923,12 +923,12 @@ "Файли\n" "лише у B" -#: directorymergewindow.cpp:3409 +#: directorymergewindow.cpp:3423 #, kde-format msgid "Show Files only in C" msgstr "Показувати файли лише у C" -#: directorymergewindow.cpp:3409 +#: directorymergewindow.cpp:3423 #, kde-format msgid "" "Files\n" @@ -937,52 +937,57 @@ "Файли\n" "лише у C" -#: directorymergewindow.cpp:3413 +#: directorymergewindow.cpp:3427 #, kde-format msgid "Compare Explicitly Selected Files" msgstr "Порівняти явно вибрані файли" -#: directorymergewindow.cpp:3414 +#: directorymergewindow.cpp:3428 #, kde-format msgid "Merge Explicitly Selected Files" -msgstr "Об’єднати явно вибрані файли" +msgstr "Об'єднати явно вибрані файли" -#: directorymergewindow.cpp:3416 directorymergewindow.cpp:3423 +#: directorymergewindow.cpp:3430 directorymergewindow.cpp:3437 #, kde-format msgid "Do Nothing" msgstr "Нічого не робити" -#: directorymergewindow.cpp:3428 +#: directorymergewindow.cpp:3442 #, kde-format msgid "Delete A && B" msgstr "Вилучити A і B" -#: directorymergewindow.cpp:3431 +#: directorymergewindow.cpp:3445 #, kde-format msgid "Merge to A && B" -msgstr "Об’єднати у A і B" +msgstr "Об'єднати у A і B" -#: fileaccess.cpp:462 SourceData.cpp:493 +#: fileaccess.cpp:301 +#, kde-format +msgid "Unable to determine full url. No parent specified." +msgstr "Неможливо визначити повну адресу. Не вказано батьківської теки." + +#: fileaccess.cpp:482 SourceData.cpp:506 #, kde-format msgid "Failed to read file: %1" msgstr "Не вдалося прочитати файл: %1" -#: fileaccess.cpp:587 +#: fileaccess.cpp:624 #, kde-format msgid "Creating temp copy of %1 failed." msgstr "Помилка створення тимчасової копії %1." -#: fileaccess.cpp:595 fileaccess.cpp:600 +#: fileaccess.cpp:632 fileaccess.cpp:637 #, kde-format msgid "Opening %1 failed. %2" msgstr "Помилка відкриття %1. %2" -#: fileaccess.cpp:619 fileaccess.cpp:627 +#: fileaccess.cpp:656 fileaccess.cpp:664 #, kde-format msgid "Error reading from %1. %2" msgstr "Помилка читання з %1. %2" -#: fileaccess.cpp:751 +#: fileaccess.cpp:788 #, kde-format msgid "" "While trying to make a backup, deleting an older backup failed.\n" @@ -992,7 +997,7 @@ "копію.\n" "Назва файла: %1" -#: fileaccess.cpp:758 +#: fileaccess.cpp:795 #, kde-format msgid "" "While trying to make a backup, renaming failed.\n" @@ -1001,177 +1006,177 @@ "Під час спроби резервного копіювання, не вдалося перейменування. \n" "Назва файлів: %1 -> %2" -#: fileaccess.cpp:828 +#: fileaccess.cpp:865 #, kde-format msgid "Getting file status: %1" msgstr "Отримання стану файла: %1" -#: fileaccess.cpp:869 +#: fileaccess.cpp:906 #, kde-format msgid "Reading file: %1" msgstr "Читання файла: %1" -#: fileaccess.cpp:907 +#: fileaccess.cpp:944 #, kde-format msgid "Writing file: %1" msgstr "Запис файла: %1" -#: fileaccess.cpp:940 +#: fileaccess.cpp:977 #, kde-format msgid "Out of memory" msgstr "Не вистачає пам'яті" -#: fileaccess.cpp:976 +#: fileaccess.cpp:1013 #, kde-format msgid "Making directory: %1" msgstr "Створення каталогу: %1." -#: fileaccess.cpp:997 +#: fileaccess.cpp:1034 #, kde-format msgid "Removing directory: %1" msgstr "Вилучення каталогу: %1." -#: fileaccess.cpp:1012 +#: fileaccess.cpp:1049 #, kde-format msgid "Removing file: %1" msgstr "Вилучення файла: %1" -#: fileaccess.cpp:1028 +#: fileaccess.cpp:1065 #, kde-format msgid "Creating symbolic link: %1 -> %2" msgstr "Створення символічного посилання: %1 -> %2" -#: fileaccess.cpp:1052 +#: fileaccess.cpp:1089 #, kde-format msgid "Renaming file: %1 -> %2" msgstr "Перейменування файла: %1 -> %2" -#: fileaccess.cpp:1086 +#: fileaccess.cpp:1123 #, kde-format msgid "Copying file: %1 -> %2" msgstr "Копіювання файла: %1 -> %2" -#: fileaccess.cpp:1108 +#: fileaccess.cpp:1145 #, kde-format msgid "Reading directory: %1" msgstr "Читання каталогу: %1" -#: fileaccess.cpp:1162 +#: fileaccess.cpp:1202 #, kde-format msgid "Listing directory: %1" -msgstr "Побудова списку каталогу: %1" +msgstr "Побудова списку теки: %1" -#: kdiff3.cpp:181 +#: kdiff3.cpp:182 #, kde-format msgid "Current Configuration:" msgstr "Поточне налаштування:" -#: kdiff3.cpp:186 +#: kdiff3.cpp:187 #, kde-format msgid "Config Option Error:" msgstr "Помилковий параметр налаштування:" -#: kdiff3.cpp:240 +#: kdiff3.cpp:246 #, kde-format msgid "Option --auto used, but no output file specified." msgstr "Використано параметр --auto, але не вказано файла виводу." -#: kdiff3.cpp:416 +#: kdiff3.cpp:405 #, kde-format msgid "Option --auto ignored for directory comparison." msgstr "Під час порівняння каталогів параметр --auto проігноровано." -#: kdiff3.cpp:460 +#: kdiff3.cpp:449 #, kde-format msgid "Saving failed." msgstr "Помилка збереження." -#: kdiff3.cpp:496 pdiff.cpp:1098 +#: kdiff3.cpp:494 pdiff.cpp:1096 #, kde-format msgid "Opening of these files failed:" msgstr "Під час спроби відкриття цих файлів сталася помилка:" -#: kdiff3.cpp:505 +#: kdiff3.cpp:503 pdiff.cpp:1105 #, kde-format -msgid "File Open Error" +msgid "File open error" msgstr "Помилка відкриття файла" -#: kdiff3.cpp:533 +#: kdiff3.cpp:532 #, kde-format msgid "Opens documents for comparison..." -msgstr "Відкриває документи для порівняння..." +msgstr "Відкриває документи для порівняння…" -#: kdiff3.cpp:535 +#: kdiff3.cpp:534 #, kde-format msgid "Reload" msgstr "Перезавантажити" -#: kdiff3.cpp:538 +#: kdiff3.cpp:537 #, kde-format msgid "Saves the merge result. All conflicts must be solved!" -msgstr "Зберігає результат об’єднання. Всі конфлікти слід розв’язати!" +msgstr "Зберігає результат об'єднання. Всі конфлікти слід розв'язати!" -#: kdiff3.cpp:540 +#: kdiff3.cpp:539 #, kde-format msgid "Saves the current document as..." -msgstr "Зберігає поточний документ як..." +msgstr "Зберігає поточний документ як…" -#: kdiff3.cpp:543 +#: kdiff3.cpp:542 #, kde-format msgid "Print the differences" msgstr "Показати розбіжності" -#: kdiff3.cpp:546 +#: kdiff3.cpp:545 #, kde-format msgid "Quits the application" msgstr "Закриває програму" -#: kdiff3.cpp:549 +#: kdiff3.cpp:548 #, kde-format msgid "Cuts the selected section and puts it to the clipboard" msgstr "Вирізує вибране та кладе його у кишеню" -#: kdiff3.cpp:552 +#: kdiff3.cpp:551 #, kde-format msgid "Copies the selected section to the clipboard" msgstr "Копіює вибране до кишені" -#: kdiff3.cpp:554 +#: kdiff3.cpp:553 #, kde-format msgid "Pastes the clipboard contents to current position" msgstr "Вставляє вміст кишені в поточну позицію" -#: kdiff3.cpp:557 +#: kdiff3.cpp:556 #, kde-format msgid "Select everything in current window" msgstr "Вибрати все у поточному вікні" -#: kdiff3.cpp:560 +#: kdiff3.cpp:559 #, kde-format msgid "Search for a string" msgstr "Шукати рядок" -#: kdiff3.cpp:562 +#: kdiff3.cpp:561 #, kde-format msgid "Search again for the string" msgstr "Шукати знову рядок" -#: kdiff3.cpp:567 +#: kdiff3.cpp:566 #, kde-format msgid "Enables/disables the statusbar" msgstr "Вмикає/вимикає рядок стану" -#: kdiff3.cpp:571 +#: kdiff3.cpp:570 #, kde-format msgid "Configure KDiff3..." -msgstr "Налаштувати KDiff3..." +msgstr "Налаштувати KDiff3…" -#: kdiff3.cpp:590 +#: kdiff3.cpp:589 #, kde-format msgid "Go to Current Delta" msgstr "Перейти до поточної дельти" -#: kdiff3.cpp:590 +#: kdiff3.cpp:589 #, kde-format msgid "" "Current\n" @@ -1180,12 +1185,12 @@ "Поточна\n" "дельта" -#: kdiff3.cpp:592 +#: kdiff3.cpp:591 #, kde-format msgid "Go to First Delta" msgstr "Перейти до першої дельти" -#: kdiff3.cpp:592 +#: kdiff3.cpp:591 #, kde-format msgid "" "First\n" @@ -1194,12 +1199,12 @@ "Перша\n" "дельта" -#: kdiff3.cpp:594 +#: kdiff3.cpp:593 #, kde-format msgid "Go to Last Delta" msgstr "Перейти до останньої дельти" -#: kdiff3.cpp:594 +#: kdiff3.cpp:593 #, kde-format msgid "" "Last\n" @@ -1208,12 +1213,12 @@ "Остання\n" "дельта" -#: kdiff3.cpp:596 +#: kdiff3.cpp:595 #, kde-format msgid "(Skips white space differences when \"Show White Space\" is disabled.)" msgstr "(Пропускає різниці у пробілах, якщо вимкнено «Показувати пробіли».)" -#: kdiff3.cpp:597 +#: kdiff3.cpp:596 #, kde-format msgid "" "(Does not skip white space differences even when \"Show White Space\" is " @@ -1222,12 +1227,12 @@ "(Не пропускати різниці у пробілах, навіть якщо вимкнено параметр «Показувати " "пробіли».)" -#: kdiff3.cpp:598 +#: kdiff3.cpp:597 #, kde-format msgid "Go to Previous Delta" msgstr "Перейти до попередньої дельти" -#: kdiff3.cpp:598 +#: kdiff3.cpp:597 #, kde-format msgid "" "Prev\n" @@ -1236,12 +1241,12 @@ "Попередня\n" "дельта" -#: kdiff3.cpp:600 +#: kdiff3.cpp:599 #, kde-format msgid "Go to Next Delta" msgstr "Перейти до наступної дельти" -#: kdiff3.cpp:600 +#: kdiff3.cpp:599 #, kde-format msgid "" "Next\n" @@ -1250,12 +1255,12 @@ "Наступна\n" "дельта" -#: kdiff3.cpp:602 +#: kdiff3.cpp:601 #, kde-format msgid "Go to Previous Conflict" msgstr "Перейти до попереднього конфлікту" -#: kdiff3.cpp:602 +#: kdiff3.cpp:601 #, kde-format msgid "" "Prev\n" @@ -1264,12 +1269,12 @@ "Попередній\n" "конфлікт" -#: kdiff3.cpp:604 +#: kdiff3.cpp:603 #, kde-format msgid "Go to Next Conflict" msgstr "Перейти до наступного конфлікту" -#: kdiff3.cpp:604 +#: kdiff3.cpp:603 #, kde-format msgid "" "Next\n" @@ -1278,40 +1283,40 @@ "Наступний\n" "конфлікт" -#: kdiff3.cpp:606 +#: kdiff3.cpp:605 #, kde-format msgid "Go to Previous Unsolved Conflict" -msgstr "Перейти до попереднього нерозв’язаного конфлікту" +msgstr "Перейти до попереднього нерозв'язаного конфлікту" -#: kdiff3.cpp:606 +#: kdiff3.cpp:605 #, kde-format msgid "" "Prev\n" "Unsolved" msgstr "" "Попередній\n" -"нерозв’язаний" +"нерозв'язаний" -#: kdiff3.cpp:608 +#: kdiff3.cpp:607 #, kde-format msgid "Go to Next Unsolved Conflict" -msgstr "Перейти до наступного нерозв’язаного конфлікту" +msgstr "Перейти до наступного нерозв'язаного конфлікту" -#: kdiff3.cpp:608 +#: kdiff3.cpp:607 #, kde-format msgid "" "Next\n" "Unsolved" msgstr "" "Неступний\n" -"нерозв’язаний" +"нерозв'язаний" -#: kdiff3.cpp:610 +#: kdiff3.cpp:609 #, kde-format msgid "Select Line(s) From A" msgstr "Виберіть рядки з A" -#: kdiff3.cpp:610 +#: kdiff3.cpp:609 #, kde-format msgid "" "Choose\n" @@ -1320,12 +1325,12 @@ "Вибрати\n" "A" -#: kdiff3.cpp:611 +#: kdiff3.cpp:610 #, kde-format msgid "Select Line(s) From B" msgstr "Вибрати рядки з B" -#: kdiff3.cpp:611 +#: kdiff3.cpp:610 #, kde-format msgid "" "Choose\n" @@ -1334,12 +1339,12 @@ "Вибрати\n" "B" -#: kdiff3.cpp:612 +#: kdiff3.cpp:611 #, kde-format msgid "Select Line(s) From C" msgstr "Вибрати рядки з C" -#: kdiff3.cpp:612 +#: kdiff3.cpp:611 #, kde-format msgid "" "Choose\n" @@ -1348,12 +1353,12 @@ "Вибрати\n" "C" -#: kdiff3.cpp:613 +#: kdiff3.cpp:612 #, kde-format msgid "Automatically Go to Next Unsolved Conflict After Source Selection" msgstr "Автоматично перейти до наступного конфлікту за визначення джерела" -#: kdiff3.cpp:613 +#: kdiff3.cpp:612 #, kde-format msgid "" "Auto\n" @@ -1362,12 +1367,12 @@ "Автоматично\n" "наступний" -#: kdiff3.cpp:615 +#: kdiff3.cpp:614 #, kde-format msgid "Show Space && Tabulator Characters" msgstr "Показувати символи пробілів і табуляцій" -#: kdiff3.cpp:615 +#: kdiff3.cpp:614 #, kde-format msgid "" "White\n" @@ -1376,12 +1381,12 @@ "Символи-\n" "пробіли" -#: kdiff3.cpp:616 +#: kdiff3.cpp:615 #, kde-format msgid "Show White Space" msgstr "Показувати пробіли" -#: kdiff3.cpp:616 +#: kdiff3.cpp:615 #, kde-format msgid "" "White\n" @@ -1390,12 +1395,12 @@ "Пробіли-\n" "дельти" -#: kdiff3.cpp:618 +#: kdiff3.cpp:617 #, kde-format msgid "Show Line Numbers" msgstr "Показувати номери рядків" -#: kdiff3.cpp:618 +#: kdiff3.cpp:617 #, kde-format msgid "" "Line\n" @@ -1404,132 +1409,132 @@ "Номери\n" "рядків" -#: kdiff3.cpp:620 +#: kdiff3.cpp:619 #, kde-format msgid "Automatically Solve Simple Conflicts" -msgstr "Автоматично розв’язувати прості конфлікти" +msgstr "Автоматично розв'язувати прості конфлікти" -#: kdiff3.cpp:621 +#: kdiff3.cpp:620 #, kde-format msgid "Set Deltas to Conflicts" msgstr "Застосувати різницю до конфліктів" -#: kdiff3.cpp:622 +#: kdiff3.cpp:621 #, kde-format msgid "Run Regular Expression Auto Merge" -msgstr "Запустити автооб’єднання за формальними виразами" +msgstr "Запустити автооб'єднання за формальними виразами" -#: kdiff3.cpp:623 +#: kdiff3.cpp:622 #, kde-format msgid "Automatically Solve History Conflicts" -msgstr "Автоматично розв’язувати конфлікти у журналі" +msgstr "Автоматично розв'язувати конфлікти у журналі" -#: kdiff3.cpp:624 +#: kdiff3.cpp:623 #, kde-format msgid "Split Diff At Selection" msgstr "Розділити різницю на вибраному" -#: kdiff3.cpp:625 +#: kdiff3.cpp:624 #, kde-format msgid "Join Selected Diffs" -msgstr "Об’єднати вибрані різниці" +msgstr "Об'єднати вибрані різниці" -#: kdiff3.cpp:627 +#: kdiff3.cpp:626 #, kde-format msgid "Show Window A" msgstr "Показати вікно A" -#: kdiff3.cpp:628 +#: kdiff3.cpp:627 #, kde-format msgid "Show Window B" msgstr "Показати вікно B" -#: kdiff3.cpp:629 +#: kdiff3.cpp:628 #, kde-format msgid "Show Window C" msgstr "Показати вікно C" -#: kdiff3.cpp:631 +#: kdiff3.cpp:630 #, kde-format msgid "Normal Overview" msgstr "Звичайний огляд" -#: kdiff3.cpp:632 +#: kdiff3.cpp:631 #, kde-format msgid "A vs. B Overview" msgstr "Перегляд A з B" -#: kdiff3.cpp:633 +#: kdiff3.cpp:632 #, kde-format msgid "A vs. C Overview" msgstr "Перегляд A з C Overview" -#: kdiff3.cpp:634 +#: kdiff3.cpp:633 #, kde-format msgid "B vs. C Overview" msgstr "Перегляд B з C" -#: kdiff3.cpp:635 +#: kdiff3.cpp:634 #, kde-format msgid "Word Wrap Diff Windows" msgstr "Перенесення рядків у вікнах різниці" -#: kdiff3.cpp:636 +#: kdiff3.cpp:635 #, kde-format msgid "Add Manual Diff Alignment" msgstr "Додати вирівнювання різниці вручну" -#: kdiff3.cpp:637 +#: kdiff3.cpp:636 #, kde-format msgid "Clear All Manual Diff Alignments" msgstr "Очистити всі вирівнювання різниці вручну" -#: kdiff3.cpp:639 +#: kdiff3.cpp:638 #, kde-format msgid "Focus Next Window" msgstr "Фокус до наступного вікна" -#: kdiff3.cpp:640 +#: kdiff3.cpp:639 #, kde-format msgid "Focus Prev Window" msgstr "Фокус на попереднє вікно" -#: kdiff3.cpp:641 +#: kdiff3.cpp:640 #, kde-format msgid "Toggle Split Orientation" msgstr "Перемкнути орієнтацію відокремлення" -#: kdiff3.cpp:643 +#: kdiff3.cpp:642 #, kde-format msgid "Dir && Text Split Screen View" msgstr "Розділений перегляд тексту і тек" -#: kdiff3.cpp:645 +#: kdiff3.cpp:644 #, kde-format msgid "Toggle Between Dir && Text View" msgstr "Перемкнутися між переглядом тексту і тек" -#: kdiff3.cpp:697 pdiff.cpp:1909 +#: kdiff3.cpp:696 pdiff.cpp:1919 #, kde-format msgid "The merge result has not been saved." -msgstr "Результат об’єднання не збережено." +msgstr "Результат об'єднання не збережено." -#: kdiff3.cpp:699 +#: kdiff3.cpp:698 #, kde-format msgid "Save && Quit" msgstr "Зберегти і вийти" -#: kdiff3.cpp:700 +#: kdiff3.cpp:699 #, kde-format msgid "Quit Without Saving" msgstr "Вийти без збереження" -#: kdiff3.cpp:708 pdiff.cpp:1920 +#: kdiff3.cpp:707 pdiff.cpp:1930 #, kde-format msgid "Saving the merge result failed." -msgstr "Помилка під час збереження результатів об’єднання." +msgstr "Помилка під час збереження результатів об'єднання." -#: kdiff3.cpp:719 pdiff.cpp:1032 +#: kdiff3.cpp:718 pdiff.cpp:1030 #, kde-format msgid "" "You are currently doing a directory merge. Are you sure, you want to abort?" @@ -1537,65 +1542,65 @@ "Зараз ви виконуєте об’єднання каталогів. Ви впевнені, що бажаєте перервати " "його?" -#: kdiff3.cpp:742 +#: kdiff3.cpp:741 #, kde-format msgid "Saving file..." -msgstr "Збереження файла..." +msgstr "Збереження файла…" -#: kdiff3.cpp:759 +#: kdiff3.cpp:758 #, kde-format msgid "Saving file with a new filename..." -msgstr "Файл зберігається з новою назвою..." +msgstr "Файл зберігається з новою назвою…" -#: kdiff3.cpp:761 +#: kdiff3.cpp:760 #, kde-format msgid "Save As..." -msgstr "Зберегти як..." +msgstr "Зберегти як…" -#: kdiff3.cpp:820 +#: kdiff3.cpp:819 #, kde-format msgid "Printing not implemented." msgstr "Можливість друку не реалізовано." -#: kdiff3.cpp:857 +#: kdiff3.cpp:858 #, kde-format msgid "Printing..." -msgstr "Друк..." +msgstr "Друк…" -#: kdiff3.cpp:943 +#: kdiff3.cpp:948 #, kde-format msgid "Printing page %1 of %2" msgstr "Друкуємо сторінку %1 з %2" -#: kdiff3.cpp:1000 +#: kdiff3.cpp:1006 #, kde-format msgid " (Selection)" msgstr " (Вибір)" -#: kdiff3.cpp:1027 +#: kdiff3.cpp:1034 #, kde-format msgid "Printing completed." msgstr "Друк завершено." -#: kdiff3.cpp:1031 +#: kdiff3.cpp:1038 #, kde-format msgid "Printing aborted." msgstr "Друк перервано." -#: kdiff3.cpp:1038 +#: kdiff3.cpp:1045 #, kde-format msgid "Exiting..." -msgstr "Вихід..." +msgstr "Вихід…" -#: kdiff3.cpp:1049 +#: kdiff3.cpp:1056 #, kde-format msgid "Toggling toolbar..." -msgstr "Перемикання пенала..." +msgstr "Перемикання пенала…" -#: kdiff3.cpp:1070 +#: kdiff3.cpp:1077 #, kde-format msgid "Toggle the statusbar..." -msgstr "Перемикання рядка стану..." +msgstr "Перемикання рядка стану…" #: kdiff3_part.cpp:45 #, kde-format @@ -1617,7 +1622,7 @@ msgid "Joachim Eibl" msgstr "Joachim Eibl" -#: kdiff3_part.cpp:173 kdiff3_part.cpp:254 +#: kdiff3_part.cpp:174 kdiff3_part.cpp:255 #, kde-format msgid "Could not find files for comparison." msgstr "Не вдалося знайти файли для порівняння." @@ -1635,7 +1640,7 @@ msgstr "Налаштувати KDiff3" #. i18n: ectx: ToolBar (mainToolBar) -#: kdiff3_part.rc:16 main.cpp:88 +#: kdiff3_part.rc:16 main.cpp:89 #, kde-format msgid "KDiff3" msgstr "KDiff3" @@ -1667,7 +1672,7 @@ #: kdiff3_shell.rc:30 #, kde-format msgid "Current Item Merge Operation" -msgstr "Операція об’єднання для поточного елемента" +msgstr "Операція об'єднання для поточного елемента" #. i18n: ectx: Menu (dir_current_sync_menu) #: kdiff3_shell.rc:38 @@ -1705,87 +1710,92 @@ msgid "Main Toolbar" msgstr "Головний пенал" -#: main.cpp:68 main.cpp:72 +#: main.cpp:69 main.cpp:73 #, kde-format msgid "Ignored. (User defined.)" msgstr "Ігнорується (Визначається користувачем)." -#: main.cpp:92 +#: main.cpp:93 #, kde-format msgid " (64 bit)" msgstr " (64-бітова)" -#: main.cpp:94 +#: main.cpp:95 #, kde-format msgid " (32 bit)" msgstr " (32-бітова)" -#: main.cpp:95 +#: main.cpp:96 #, kde-format msgid "Tool for Comparison and Merge of Files and Directories" msgstr "Інструмент для порівняння і злиття файлів і тек" -#: main.cpp:96 +#: main.cpp:97 #, kde-format msgid "(c) 2002-2014 Joachim Eibl, (c) 2017 Michael Reeves KF5/Qt5 port" msgstr "" "© Joachim Eibl, 2002–2014. © Michael Reeves, 2017, портування на KF5/Qt5" -#: main.cpp:112 +#: main.cpp:113 #, kde-format msgid "Merge the input." msgstr "Об'єднати вивід." -#: main.cpp:113 +#: main.cpp:114 #, kde-format msgid "Explicit base file. For compatibility with certain tools." msgstr "Явно вказаний файл-основа. Для сумісності з деякими інструментами." -#: main.cpp:114 +#: main.cpp:115 #, kde-format msgid "Output file. Implies -m. E.g.: -o newfile.txt" msgstr "Файл виводу. У разі наявності -m. Наприклад: -o newfile.txt" -#: main.cpp:115 +#: main.cpp:116 #, kde-format msgid "Output file, again. (For compatibility with certain tools.)" msgstr "Файл виводу, ще раз. (Для сумісності з деякими інструментами.)" -#: main.cpp:116 +#: main.cpp:118 #, kde-format msgid "No GUI if all conflicts are auto-solvable. (Needs -o file)" msgstr "" -"Без графічного інтерфейсу, якщо всі конфлікти розв’язуються автоматично. " +"Без графічного інтерфейсу, якщо всі конфлікти розв'язуються автоматично. " "(Потрібно: -o файл)" -#: main.cpp:117 +#: main.cpp:120 +#, kde-format +msgid "Ignored." +msgstr "Проігноровано." + +#: main.cpp:122 #, kde-format msgid "Do not solve conflicts automatically." -msgstr "Не розв’язувати конфлікти автоматично." +msgstr "Не розв'язувати конфлікти автоматично." -#: main.cpp:118 +#: main.cpp:123 #, kde-format msgid "Visible name replacement for input file 1 (base)." msgstr "Заміна видимої назви для вхідного файла 1 (основи)." -#: main.cpp:119 +#: main.cpp:124 #, kde-format msgid "Visible name replacement for input file 2." msgstr "Заміна видимої назви для вхідного файла 2." -#: main.cpp:120 +#: main.cpp:125 #, kde-format msgid "Visible name replacement for input file 3." msgstr "Заміна видимої назви для вхідного файла 3." -#: main.cpp:121 +#: main.cpp:126 #, kde-format msgid "Alternative visible name replacement. Supply this once for every input." msgstr "" "Альтернативна заміна видимої назви. Вкажіть один раз для кожного набору " "вхідних даних." -#: main.cpp:122 +#: main.cpp:127 #, kde-format msgid "" "Override a config setting. Use once for every setting. E.g.: --cs " @@ -1794,87 +1804,87 @@ "Перевизначити параметр налаштування. Скористайтеся один раз для кожного " "параметра. Наприклад: --cs \"AutoAdvance=1\"" -#: main.cpp:123 +#: main.cpp:128 #, kde-format msgid "Show list of config settings and current values." msgstr "Показати список параметрів налаштування і поточні значення." -#: main.cpp:124 +#: main.cpp:129 #, kde-format msgid "Use a different config file." msgstr "Використовувати інший файл налаштувань.." -#: main.cpp:127 +#: main.cpp:132 #, kde-format msgid "file1 to open (base, if not specified via --base)" msgstr "файл1 для відкриття (основний, якщо не вказано інший за --base)" -#: main.cpp:128 +#: main.cpp:133 #, kde-format msgid "file2 to open" msgstr "файл2 для відкриття" -#: main.cpp:129 +#: main.cpp:134 #, kde-format msgid "file3 to open" msgstr "файл3 для відкриття" -#: main.cpp:153 +#: main.cpp:158 #, kde-format msgid "See kdiff3 --help for supported options." msgstr "Див. kdiff3 --help, щоб ознайомитися із підтримуваними параметрами." -#: mergeresultwindow.cpp:158 +#: mergeresultwindow.cpp:171 #, kde-format msgid "Choose A Everywhere" msgstr "Вибрати A всюди" -#: mergeresultwindow.cpp:159 +#: mergeresultwindow.cpp:172 #, kde-format msgid "Choose B Everywhere" msgstr "Вибрати B всюди" -#: mergeresultwindow.cpp:160 +#: mergeresultwindow.cpp:173 #, kde-format msgid "Choose C Everywhere" msgstr "Вибрати C всюди" -#: mergeresultwindow.cpp:161 +#: mergeresultwindow.cpp:174 #, kde-format msgid "Choose A for All Unsolved Conflicts" -msgstr "Вибрати A для всіх нерозв’язаних конфліктів" +msgstr "Вибрати A для всіх нерозв'язаних конфліктів" -#: mergeresultwindow.cpp:162 +#: mergeresultwindow.cpp:175 #, kde-format msgid "Choose B for All Unsolved Conflicts" -msgstr "Вибрати B для всіх нерозв’язаних конфліктів" +msgstr "Вибрати B для всіх нерозв'язаних конфліктів" -#: mergeresultwindow.cpp:163 +#: mergeresultwindow.cpp:176 #, kde-format msgid "Choose C for All Unsolved Conflicts" -msgstr "Вибрати C для всіх нерозв’язаних конфліктів" +msgstr "Вибрати C для всіх нерозв'язаних конфліктів" -#: mergeresultwindow.cpp:164 +#: mergeresultwindow.cpp:177 #, kde-format msgid "Choose A for All Unsolved Whitespace Conflicts" -msgstr "Вибрати A для всіх нерозв’язаних конфліктів пробілів" +msgstr "Вибрати A для всіх нерозв'язаних конфліктів пробілів" -#: mergeresultwindow.cpp:165 +#: mergeresultwindow.cpp:178 #, kde-format msgid "Choose B for All Unsolved Whitespace Conflicts" -msgstr "Вибрати B для всіх нерозв’язаних конфліктів пробілів" +msgstr "Вибрати B для всіх нерозв'язаних конфліктів пробілів" -#: mergeresultwindow.cpp:166 +#: mergeresultwindow.cpp:179 #, kde-format msgid "Choose C for All Unsolved Whitespace Conflicts" -msgstr "Вибрати C для всіх нерозв’язаних конфліктів пробілів" +msgstr "Вибрати C для всіх нерозв'язаних конфліктів пробілів" -#: mergeresultwindow.cpp:176 +#: mergeresultwindow.cpp:204 #, kde-format msgid "Number of remaining unsolved conflicts: %1 (of which %2 are whitespace)" -msgstr "Кількість ще нерозв’язаних конфліктів: %1 (з яких %2 пробіли)" +msgstr "Кількість ще нерозв'язаних конфліктів: %1 (з яких %2 пробіли)" -#: mergeresultwindow.cpp:370 +#: mergeresultwindow.cpp:398 #, kde-format msgid "" "The output has been modified.\n" @@ -1883,29 +1893,29 @@ "Вивід було змінено.\n" "Якщо ви продовжите, зміни буде втрачено." -#: mergeresultwindow.cpp:936 pdiff.cpp:827 +#: mergeresultwindow.cpp:964 pdiff.cpp:817 #, kde-format msgid "All input files are binary equal." msgstr "Всі вхідні файли однакові." -#: mergeresultwindow.cpp:938 +#: mergeresultwindow.cpp:966 #, kde-format msgid "All input files contain the same text." msgstr "Всі вхідні файли містять однаковий текст." -#: mergeresultwindow.cpp:942 mergeresultwindow.cpp:946 -#: mergeresultwindow.cpp:950 pdiff.cpp:833 pdiff.cpp:837 pdiff.cpp:841 +#: mergeresultwindow.cpp:970 mergeresultwindow.cpp:974 +#: mergeresultwindow.cpp:978 pdiff.cpp:823 pdiff.cpp:827 pdiff.cpp:831 #, kde-format msgid "Files %1 and %2 are binary equal.\n" msgstr "Файли %1 і %2 двійково однакові.\n" -#: mergeresultwindow.cpp:944 mergeresultwindow.cpp:948 -#: mergeresultwindow.cpp:952 +#: mergeresultwindow.cpp:972 mergeresultwindow.cpp:976 +#: mergeresultwindow.cpp:980 #, kde-format msgid "Files %1 and %2 have equal text.\n" msgstr "Текст файлів %1 і %2 однаковий.\n" -#: mergeresultwindow.cpp:958 +#: mergeresultwindow.cpp:986 #, kde-format msgid "" "Total number of conflicts: %1\n" @@ -1918,52 +1928,52 @@ "Кількість нерозв'язаних конфліктів: %3\n" "%4" -#: mergeresultwindow.cpp:964 +#: mergeresultwindow.cpp:992 #, kde-format msgid "Conflicts" msgstr "Конфлікти" -#: mergeresultwindow.cpp:1873 +#: mergeresultwindow.cpp:1901 #, kde-format msgid "" msgstr "<Немає рядка джерела>" -#: mergeresultwindow.cpp:1881 +#: mergeresultwindow.cpp:1909 #, kde-format msgid "" -msgstr "<Конфлікт об’єднання (Лише пробіл)>" +msgstr "<Конфлікт об'єднання (Лише пробіл)>" -#: mergeresultwindow.cpp:1883 mergeresultwindow.cpp:2755 +#: mergeresultwindow.cpp:1911 mergeresultwindow.cpp:2783 #, kde-format msgid "" -msgstr "<Конфлікт об’єднання>" +msgstr "<Конфлікт об'єднання>" -#: mergeresultwindow.cpp:2967 +#: mergeresultwindow.cpp:2995 #, kde-format msgid "" "Not all conflicts are solved yet.\n" "File not saved." msgstr "" -"Розв’язано не всі конфлікти.\n" +"Розв'язано не всі конфлікти.\n" "Файл не збережено." -#: mergeresultwindow.cpp:2969 mergeresultwindow.cpp:2978 +#: mergeresultwindow.cpp:2997 mergeresultwindow.cpp:3006 #, kde-format msgid "Conflicts Left" msgstr "Залишилось конфліктів" -#: mergeresultwindow.cpp:2976 +#: mergeresultwindow.cpp:3004 #, kde-format msgid "" "There is a line end style conflict. Please choose the line end style " "manually.\n" "File not saved." msgstr "" -"Виник конфлікт, пов’язаний з різними стилями завершення рядків. Будь ласка, " +"Виник конфлікт, пов'язаний з різними стилями завершення рядків. Будь ласка, " "оберіть потрібний стиль вручну.\n" "Файл не було збережено." -#: mergeresultwindow.cpp:2990 +#: mergeresultwindow.cpp:3018 #, kde-format msgid "" "\n" @@ -1974,59 +1984,59 @@ "\n" "Помилка створення резервної копії. Файл не збережено." -#: mergeresultwindow.cpp:2990 mergeresultwindow.cpp:3038 +#: mergeresultwindow.cpp:3018 mergeresultwindow.cpp:3066 #, kde-format msgid "File Save Error" msgstr "Помилка збереження файла" -#: mergeresultwindow.cpp:3038 +#: mergeresultwindow.cpp:3066 #, kde-format msgid "Error while writing." msgstr "Помилка при записуванні." -#: mergeresultwindow.cpp:3110 +#: mergeresultwindow.cpp:3138 #, kde-format msgid "Output:" msgstr "Виведення:" -#: mergeresultwindow.cpp:3123 mergeresultwindow.cpp:3315 +#: mergeresultwindow.cpp:3151 mergeresultwindow.cpp:3343 #, kde-format msgid "[Modified]" msgstr "[Змінено]" -#: mergeresultwindow.cpp:3130 +#: mergeresultwindow.cpp:3158 #, kde-format msgid "Encoding for saving:" msgstr "Кодування для збереження:" -#: mergeresultwindow.cpp:3230 +#: mergeresultwindow.cpp:3258 #, kde-format msgid "Conflict" msgstr "Конфлікт" -#: mergeresultwindow.cpp:3262 +#: mergeresultwindow.cpp:3290 #, kde-format msgid "Codec from A: %1" msgstr "Кодек з A: %1" -#: mergeresultwindow.cpp:3264 +#: mergeresultwindow.cpp:3292 #, kde-format msgid "Codec from B: %1" msgstr "Кодек з B: %1" -#: mergeresultwindow.cpp:3266 +#: mergeresultwindow.cpp:3294 #, kde-format msgid "Codec from C: %1" msgstr "Кодек з C: %1" -#: optiondialog.cpp:119 +#: optiondialog.cpp:121 #, kde-format msgid "Change Font" msgstr "" "Змінити шрифт\n" "зміну шрифту" -#: optiondialog.cpp:135 optiondialog.cpp:145 +#: optiondialog.cpp:137 optiondialog.cpp:147 #, kde-format msgid "" "Font: %1, %2, %3\n" @@ -2037,124 +2047,124 @@ "\n" "Приклад:" -#: optiondialog.cpp:388 +#: optiondialog.cpp:390 #, kde-format msgid "Unicode" msgstr "Юнікод" -#: optiondialog.cpp:389 +#: optiondialog.cpp:391 #, kde-format msgid "Latin1" msgstr "Latin1" -#: optiondialog.cpp:408 +#: optiondialog.cpp:410 #, kde-format msgid "Change this if non-ASCII characters are not displayed correctly." msgstr "" "Змінити це, якщо символи, що не належать до ASCII не відображаються коректно." -#: optiondialog.cpp:491 +#: optiondialog.cpp:495 #, kde-format msgid "Configure" msgstr "Налаштувати" -#: optiondialog.cpp:568 +#: optiondialog.cpp:573 #, kde-format msgid "Font" msgstr "Шрифт" -#: optiondialog.cpp:570 +#: optiondialog.cpp:575 #, kde-format msgid "Editor & Diff Output Font" msgstr "Вихідний шрифт редактора і різниці" -#: optiondialog.cpp:589 +#: optiondialog.cpp:594 #, kde-format msgid "Application font" msgstr "Шрифт програми" -#: optiondialog.cpp:594 +#: optiondialog.cpp:599 #, kde-format msgid "File view font" msgstr "Шрифт панелі файлів" -#: optiondialog.cpp:613 +#: optiondialog.cpp:618 #, kde-format msgctxt "Title for color settings page" msgid "Color" msgstr "Колір" -#: optiondialog.cpp:614 +#: optiondialog.cpp:619 #, kde-format msgid "Colors Settings" msgstr "Параметри кольорів" -#: optiondialog.cpp:631 +#: optiondialog.cpp:644 #, kde-format msgid "Editor and Diff Views:" msgstr "Вікна редактора і різниці:" -#: optiondialog.cpp:639 +#: optiondialog.cpp:652 #, kde-format msgid "Foreground color:" msgstr "Колір тексту:" -#: optiondialog.cpp:647 +#: optiondialog.cpp:660 #, kde-format msgid "Background color:" msgstr "Колір тла:" -#: optiondialog.cpp:657 +#: optiondialog.cpp:670 #, kde-format msgid "Diff background color:" msgstr "Колір тла різниці:" -#: optiondialog.cpp:666 +#: optiondialog.cpp:679 #, kde-format msgid "Color A:" msgstr "Колір A:" -#: optiondialog.cpp:675 +#: optiondialog.cpp:688 #, kde-format msgid "Color B:" msgstr "Колір B:" -#: optiondialog.cpp:684 +#: optiondialog.cpp:697 #, kde-format msgid "Color C:" msgstr "Колір C:" -#: optiondialog.cpp:692 +#: optiondialog.cpp:705 #, kde-format msgid "Conflict color:" msgstr "Колір конфліктів:" -#: optiondialog.cpp:701 +#: optiondialog.cpp:714 #, kde-format msgid "Current range background color:" msgstr "Колір тла поточного діапазону:" -#: optiondialog.cpp:710 +#: optiondialog.cpp:723 #, kde-format msgid "Current range diff background color:" msgstr "Колір тла поточного діапазону різниці:" -#: optiondialog.cpp:718 +#: optiondialog.cpp:731 #, kde-format msgid "Color for manually aligned difference ranges:" msgstr "Колір для діапазонів різниць вирівняних вручну:" -#: optiondialog.cpp:725 +#: optiondialog.cpp:738 #, kde-format msgid "Directory Comparison View:" msgstr "Перегляд порівняння каталогів:" -#: optiondialog.cpp:731 +#: optiondialog.cpp:744 #, kde-format msgid "Newest file color:" msgstr "Колір найновішого файла:" -#: optiondialog.cpp:736 +#: optiondialog.cpp:749 #, kde-format msgid "" "Changing this color will only be effective when starting the next directory " @@ -2163,37 +2173,37 @@ "Зміна цього кольору буде ефективною після початку нового порівняння " "каталогів." -#: optiondialog.cpp:741 +#: optiondialog.cpp:754 #, kde-format msgid "Oldest file color:" msgstr "Колір найстарішого файла:" -#: optiondialog.cpp:750 +#: optiondialog.cpp:763 #, kde-format msgid "Middle age file color:" msgstr "Колір файлів проміжного віку:" -#: optiondialog.cpp:759 +#: optiondialog.cpp:772 #, kde-format msgid "Color for missing files:" msgstr "Колір відсутніх файлів:" -#: optiondialog.cpp:773 +#: optiondialog.cpp:786 #, kde-format msgid "Editor" msgstr "Редактор" -#: optiondialog.cpp:774 +#: optiondialog.cpp:787 #, kde-format msgid "Editor Behavior" msgstr "Режим роботи редактора" -#: optiondialog.cpp:787 +#: optiondialog.cpp:809 #, kde-format msgid "Tab inserts spaces" msgstr "Використовувати пробіли замість табуляції" -#: optiondialog.cpp:791 +#: optiondialog.cpp:813 #, kde-format msgid "" "On: Pressing tab generates the appropriate number of spaces.\n" @@ -2203,28 +2213,28 @@ "пробілів.\n" "Вимкнено: Буде вставлено символ Tab." -#: optiondialog.cpp:796 +#: optiondialog.cpp:818 #, kde-format msgid "Tab size:" msgstr "Розмір табуляції:" -#: optiondialog.cpp:803 +#: optiondialog.cpp:825 #, kde-format msgid "Auto indentation" msgstr "Автовідступ" -#: optiondialog.cpp:807 +#: optiondialog.cpp:829 #, kde-format msgid "On: The indentation of the previous line is used for a new line.\n" msgstr "" "Увімкнено: Відступ попереднього рядка буде використано для наступного.\n" -#: optiondialog.cpp:810 +#: optiondialog.cpp:832 #, kde-format msgid "Auto copy selection" msgstr "Автоматичне копіювання позначеного" -#: optiondialog.cpp:814 +#: optiondialog.cpp:836 #, kde-format msgid "" "On: Any selection is immediately written to the clipboard.\n" @@ -2233,7 +2243,7 @@ "Увімкнено: Будь-яка вибрана область копіюється до кишені.\n" "Вимкнено: Явне проведення копіювання, наприклад за допомогою Ctrl-C." -#: optiondialog.cpp:829 +#: optiondialog.cpp:851 #, kde-format msgid "" "Sets the line endings for when an edited file is saved.\n" @@ -2242,12 +2252,12 @@ "Встановлює стиль кінців рядка під час збереження файла.\n" "DOS/Windows: CR+LF; UNIX: LF; де CR=0D, LF=0A" -#: optiondialog.cpp:839 +#: optiondialog.cpp:861 #, kde-format msgid "Diff" msgstr "Diff" -#: optiondialog.cpp:840 +#: optiondialog.cpp:862 #, kde-format msgid "Diff Settings" msgstr "Параметри Diff" @@ -2261,12 +2271,12 @@ #. ); #. ++line; #. -#: optiondialog.cpp:865 +#: optiondialog.cpp:896 #, kde-format msgid "Ignore numbers (treat as white space)" msgstr "Ігнорувати числа (вважати пробілами)" -#: optiondialog.cpp:869 +#: optiondialog.cpp:900 #, kde-format msgid "" "Ignore number characters during line matching phase. (Similar to Ignore " @@ -2277,42 +2287,42 @@ "пробілів.)\n" "Може допомогти для файлів з числовими даними." -#: optiondialog.cpp:873 +#: optiondialog.cpp:904 #, kde-format msgid "Ignore C/C++ comments (treat as white space)" msgstr "Ігнорувати коментарі C/C++ (вважати пробілами)" -#: optiondialog.cpp:876 +#: optiondialog.cpp:907 #, kde-format msgid "Treat C/C++ comments like white space." msgstr "Вважати коментарі C/C++ пробілами." -#: optiondialog.cpp:879 +#: optiondialog.cpp:910 #, kde-format msgid "Ignore case (treat as white space)" msgstr "Ігнорувати зміни регістру (вважати пробілами)" -#: optiondialog.cpp:883 +#: optiondialog.cpp:914 #, kde-format msgid "Treat case differences like white space changes. ('a'<=>'A')" msgstr "Вважати різницю у регістрі змінами у кількості пробілів. («а»<=>«А»)" -#: optiondialog.cpp:886 +#: optiondialog.cpp:917 #, kde-format msgid "Preprocessor command:" msgstr "Команда препроцесора:" -#: optiondialog.cpp:891 +#: optiondialog.cpp:922 #, kde-format msgid "User defined pre-processing. (See the docs for details.)" msgstr "Попередня обробка, визначена користувачем. (Подробиці у документації.)" -#: optiondialog.cpp:894 +#: optiondialog.cpp:925 #, kde-format msgid "Line-matching preprocessor command:" msgstr "Команда відповідності рядків препроцесора:" -#: optiondialog.cpp:899 +#: optiondialog.cpp:930 #, kde-format msgid "" "This pre-processor is only used during line matching.\n" @@ -2321,12 +2331,12 @@ "Цей препроцесор використовується лише для порівняння рядків.\n" "(Подробиці у документації.)" -#: optiondialog.cpp:902 +#: optiondialog.cpp:933 #, kde-format msgid "Try hard (slower)" msgstr "Агресивніше (повільніше)" -#: optiondialog.cpp:906 +#: optiondialog.cpp:937 #, kde-format msgid "" "Enables the --minimal option for the external diff.\n" @@ -2335,34 +2345,40 @@ "Вмикає параметр --minimal для зовнішніх різниць.\n" "Аналіз великих файлів значно уповільнюється." -#: optiondialog.cpp:910 +#: optiondialog.cpp:941 #, kde-format msgid "Align B and C for 3 input files" msgstr "Вирівняти B і C для 3 вхідних файлів" -#: optiondialog.cpp:914 +#: optiondialog.cpp:945 #, kde-format msgid "" "Try to align B and C when comparing or merging three input files.\n" "Not recommended for merging because merge might get more complicated.\n" "(Default is off.)" msgstr "" -"Спробувати вирівняти B і C під час порівняння або об’єднання трьох вхідних " +"Спробувати вирівняти B і C під час порівняння або об'єднання трьох вхідних " "файлів.\n" -"Не рекомендується для об’єднання, оскільки такі дії можуть його ускладнити.\n" +"Не рекомендується для об'єднання, оскільки такі дії можуть його ускладнити.\n" "(Типово вимкнено.)" -#: optiondialog.cpp:926 +#: optiondialog.cpp:956 +#, kde-format +msgctxt "Settings page" +msgid "Merge" +msgstr "Об'єднання" + +#: optiondialog.cpp:957 #, kde-format msgid "Merge Settings" -msgstr "Об’єднати параметри" +msgstr "Об'єднати параметри" -#: optiondialog.cpp:940 +#: optiondialog.cpp:980 #, kde-format msgid "Auto advance delay (ms):" msgstr "Автоматичне продовження за (у мс):" -#: optiondialog.cpp:946 +#: optiondialog.cpp:986 #, kde-format msgid "" "When in Auto-Advance mode the result of the current selection is shown \n" @@ -2372,51 +2388,51 @@ "вказаний проміжок часу перед переходом до наступного конфлікту. Діапазон: " "0-2000 мс" -#: optiondialog.cpp:950 +#: optiondialog.cpp:990 #, kde-format msgid "Show info dialogs" msgstr "Показувати інформаційні вікна" -#: optiondialog.cpp:953 +#: optiondialog.cpp:993 #, kde-format msgid "Show a dialog with information about the number of conflicts." msgstr "Показувати діалогове вікно з відомостями про кількість конфліктів." -#: optiondialog.cpp:956 +#: optiondialog.cpp:996 #, kde-format msgid "White space 2-file merge default:" -msgstr "Типове значення пробілів для об’єднання 2 файлів:" +msgstr "Типове значення пробілів для об'єднання 2 файлів:" -#: optiondialog.cpp:961 optiondialog.cpp:974 +#: optiondialog.cpp:1001 optiondialog.cpp:1014 #, kde-format msgid "Manual Choice" msgstr "Вибір вручну" -#: optiondialog.cpp:965 optiondialog.cpp:979 +#: optiondialog.cpp:1005 optiondialog.cpp:1019 #, kde-format msgid "" "Allow the merge algorithm to automatically select an input for white-space-" "only changes." msgstr "" -"Дозволити алгоритму об’єднання автоматично вибирати вхідне значення для змін " +"Дозволити алгоритму об'єднання автоматично вибирати вхідне значення для змін " "у пробілах." -#: optiondialog.cpp:969 +#: optiondialog.cpp:1009 #, kde-format msgid "White space 3-file merge default:" -msgstr "Типове значення пробілів для об’єднання 3 файлів:" +msgstr "Типове значення пробілів для об'єднання 3 файлів:" -#: optiondialog.cpp:983 +#: optiondialog.cpp:1023 #, kde-format msgid "Automatic Merge Regular Expression" -msgstr "Формальний вираз автоматичного об’єднання" +msgstr "Формальний вираз автоматичного об'єднання" -#: optiondialog.cpp:991 smalldialogs.cpp:449 +#: optiondialog.cpp:1031 smalldialogs.cpp:459 #, kde-format msgid "Auto merge regular expression:" -msgstr "Формальний вираз автооб’єднання:" +msgstr "Формальний вираз автооб'єднання:" -#: optiondialog.cpp:996 +#: optiondialog.cpp:1036 #, kde-format msgid "" "Regular expression for lines where KDiff3 should automatically choose one " @@ -2429,31 +2445,31 @@ "Якщо рядок з конфліктом відповідає формальному виразу, буде вибрано\n" "— якщо доступний — C, у іншому випадку — B." -#: optiondialog.cpp:1002 +#: optiondialog.cpp:1042 #, kde-format msgid "Run regular expression auto merge on merge start" -msgstr "Запустити автооб’єднання за формальними виразом на початку об’єднання" +msgstr "Запустити автооб'єднання за формальними виразом на початку об'єднання" -#: optiondialog.cpp:1005 +#: optiondialog.cpp:1045 #, kde-format msgid "" "Run the merge for auto merge regular expressions\n" "immediately when a merge starts.\n" msgstr "" -"Запускати об’єднання для формальних виразів автоматично об’єднання\n" -"одразу після запуску об’єднання.\n" +"Запускати об'єднання для формальних виразів автоматично об'єднання\n" +"одразу після запуску об'єднання.\n" -#: optiondialog.cpp:1010 +#: optiondialog.cpp:1050 #, kde-format msgid "Version Control History Merging" -msgstr "Об’єднання історії керування версіями" +msgstr "Об'єднання історії керування версіями" -#: optiondialog.cpp:1018 smalldialogs.cpp:476 +#: optiondialog.cpp:1058 smalldialogs.cpp:486 #, kde-format msgid "History start regular expression:" msgstr "Початковий формальний вираз історії:" -#: optiondialog.cpp:1023 +#: optiondialog.cpp:1063 #, kde-format msgid "" "Regular expression for the start of the version control history entry.\n" @@ -2464,12 +2480,12 @@ "Зазвичай, цей рядок містить ключове слово «$Log$».\n" "Типове значення: «.*\\$Log.*\\$.*»" -#: optiondialog.cpp:1029 smalldialogs.cpp:504 +#: optiondialog.cpp:1069 smalldialogs.cpp:514 #, kde-format msgid "History entry start regular expression:" msgstr "Початковий формальний вираз елемента історії:" -#: optiondialog.cpp:1042 +#: optiondialog.cpp:1082 #, kde-format msgid "" "A version control history entry consists of several lines.\n" @@ -2489,22 +2505,22 @@ "відокремлюються порожніми рядками.\n" "Подробиці можна дізнатися з документації." -#: optiondialog.cpp:1050 +#: optiondialog.cpp:1090 #, kde-format msgid "History merge sorting" -msgstr "Впорядкування історії при об’єднанні" +msgstr "Впорядкування історії при об'єднанні" -#: optiondialog.cpp:1053 +#: optiondialog.cpp:1093 #, kde-format msgid "Sort version control history by a key." msgstr "Впорядкувати історію керування версіями за ключем." -#: optiondialog.cpp:1063 +#: optiondialog.cpp:1103 #, kde-format msgid "History entry start sort key order:" msgstr "Порядок сортування початків записів за ключем:" -#: optiondialog.cpp:1068 +#: optiondialog.cpp:1108 #, kde-format msgid "" "Each pair of parentheses used in the regular expression for the history " @@ -2522,39 +2538,39 @@ "Якщо залишити це поле порожнім, сортування не проводитиметься.\n" "Подробиці можна дізнатися з документації." -#: optiondialog.cpp:1079 +#: optiondialog.cpp:1119 #, kde-format msgid "Merge version control history on merge start" -msgstr "Об’єднувати за журналом керування версіями на початку об’єднання" +msgstr "Об'єднувати за журналом керування версіями на початку об'єднання" -#: optiondialog.cpp:1082 +#: optiondialog.cpp:1122 #, kde-format msgid "Run version control history automerge on merge start." -msgstr "Запускати історію керування версіями на початку об’єднання." +msgstr "Запускати історію керування версіями на початку об'єднання." -#: optiondialog.cpp:1086 +#: optiondialog.cpp:1126 #, kde-format msgid "Max number of history entries:" msgstr "Макс. кількість записів у історії:" -#: optiondialog.cpp:1090 +#: optiondialog.cpp:1130 #, kde-format msgid "Cut off after specified number. Use -1 for infinite number of entries." msgstr "" "Обрізати після вказаного номера. Вкажіть -1, що визначити нескінченну " "кількість записів." -#: optiondialog.cpp:1094 +#: optiondialog.cpp:1134 #, kde-format msgid "Test your regular expressions" msgstr "Перевіряти ваші формальні вирази" -#: optiondialog.cpp:1099 +#: optiondialog.cpp:1139 #, kde-format msgid "Irrelevant merge command:" -msgstr "Безвідносна команда об’єднання:" +msgstr "Безвідносна команда об'єднання:" -#: optiondialog.cpp:1104 +#: optiondialog.cpp:1144 #, kde-format msgid "" "If specified this script is run after automerge\n" @@ -2562,15 +2578,15 @@ "Called with the parameters: filename1 filename2 filename3" msgstr "" "Якщо вказано цей параметр, відповідний скрипт буде запущено після\n" -"автоматично об’єднання, якщо не виявлено інших пов’язаних змін.\n" +"автоматично об'єднання, якщо не виявлено інших пов'язаних змін.\n" "Викликають з параметрами: filename1 filename2 filename3" -#: optiondialog.cpp:1109 +#: optiondialog.cpp:1149 #, kde-format msgid "Auto save and quit on merge without conflicts" msgstr "Автоматично зберегти і вийти, якщо немає конфліктів" -#: optiondialog.cpp:1113 +#: optiondialog.cpp:1153 #, kde-format msgid "" "If KDiff3 was started for a file-merge from the command line and all\n" @@ -2578,32 +2594,32 @@ "quit.\n" "(Similar to command line option \"--auto\".)" msgstr "" -"Якщо KDiff3 було запущено для об’єднання файлів з командного рядка і всі\n" -"конфлікти можна розв’язати без втручання користувача, автоматично зберегти " +"Якщо KDiff3 було запущено для об'єднання файлів з командного рядка і всі\n" +"конфлікти можна розв'язати без втручання користувача, автоматично зберегти " "файли і вийти.\n" "(Відповідає параметру командного рядка «--auto».)" -#: optiondialog.cpp:1124 optiondialog.cpp:1125 +#: optiondialog.cpp:1164 optiondialog.cpp:1165 #, kde-format msgid "Directory" msgstr "Каталог" -#: optiondialog.cpp:1137 +#: optiondialog.cpp:1185 #, kde-format msgid "Recursive directories" msgstr "Рекурсивні каталоги" -#: optiondialog.cpp:1140 +#: optiondialog.cpp:1188 #, kde-format msgid "Whether to analyze subdirectories or not." msgstr "Чи аналізувати підкаталоги." -#: optiondialog.cpp:1142 +#: optiondialog.cpp:1190 #, kde-format msgid "File pattern(s):" msgstr "Шаблони файлів:" -#: optiondialog.cpp:1148 +#: optiondialog.cpp:1196 #, kde-format msgid "" "Pattern(s) of files to be analyzed. \n" @@ -2614,12 +2630,12 @@ "Шаблони заміни: «*» і «?»\n" "Декілька шаблонів слід розділяти символом «;»" -#: optiondialog.cpp:1153 +#: optiondialog.cpp:1201 #, kde-format msgid "File-anti-pattern(s):" msgstr "Шаблон(и) виключення файлів:" -#: optiondialog.cpp:1159 +#: optiondialog.cpp:1207 #, kde-format msgid "" "Pattern(s) of files to be excluded from analysis. \n" @@ -2630,12 +2646,12 @@ "Шаблони заміни: «*» і «?»\n" "Декілька шаблонів слід розділяти символом «;»" -#: optiondialog.cpp:1164 +#: optiondialog.cpp:1212 #, kde-format msgid "Dir-anti-pattern(s):" msgstr "Шаблон(и) виключення тек:" -#: optiondialog.cpp:1170 +#: optiondialog.cpp:1218 #, kde-format msgid "" "Pattern(s) of directories to be excluded from analysis. \n" @@ -2646,12 +2662,12 @@ "Шаблони заміни: «*» і «?»\n" "Декілька шаблонів слід розділяти символом «;»" -#: optiondialog.cpp:1175 +#: optiondialog.cpp:1223 #, kde-format msgid "Use .cvsignore" msgstr "Використовувати .cvsignore" -#: optiondialog.cpp:1179 +#: optiondialog.cpp:1227 #, kde-format msgid "" "Extends the antipattern to anything that would be ignored by CVS.\n" @@ -2660,22 +2676,22 @@ "Розширює шаблон виключення до всього, що ігноруватиметься CVS.\n" "Залежить від локальних файлів «.cvsignore» у окремім каталозі." -#: optiondialog.cpp:1183 +#: optiondialog.cpp:1231 #, kde-format msgid "Find hidden files and directories" msgstr "Показувати приховані файли і теки" -#: optiondialog.cpp:1186 +#: optiondialog.cpp:1234 #, kde-format msgid "Finds hidden files and directories." msgstr "Знаходить приховані файли і теки." -#: optiondialog.cpp:1189 +#: optiondialog.cpp:1237 #, kde-format msgid "Follow file links" msgstr "Йти за посиланнями на файли" -#: optiondialog.cpp:1193 +#: optiondialog.cpp:1241 #, kde-format msgid "" "On: Compare the file the link points to.\n" @@ -2684,12 +2700,12 @@ "Увімкнено: Порівнювати файли, на які вказує посилання.\n" "Вимкнено: Порівнювати самі посилання." -#: optiondialog.cpp:1197 +#: optiondialog.cpp:1245 #, kde-format msgid "Follow directory links" msgstr "Переходити за посиланнями на каталоги" -#: optiondialog.cpp:1201 +#: optiondialog.cpp:1249 #, kde-format msgid "" "On: Compare the directory the link points to.\n" @@ -2698,12 +2714,12 @@ "Увімкнено: Порівнювати каталоги, на які вказує посилання.\n" "Вимкнено: Порівнювати посилання." -#: optiondialog.cpp:1210 +#: optiondialog.cpp:1258 #, kde-format msgid "Case sensitive filename comparison" msgstr "Порівняння назв файлів з врахуванням регістру" -#: optiondialog.cpp:1214 +#: optiondialog.cpp:1262 #, kde-format msgid "" "The directory comparison will compare files or directories when their names " @@ -2716,12 +2732,12 @@ "Встановіть цей параметр, якщо мають збігатися і регістри літер назв. (Типово " "вимкнено у Windows, у інших системах увімкнено.)" -#: optiondialog.cpp:1218 +#: optiondialog.cpp:1266 #, kde-format msgid "Unfold all subdirectories on load" msgstr "Розгортати усі підтеки при завантаженні" -#: optiondialog.cpp:1222 +#: optiondialog.cpp:1270 #, kde-format msgid "" "On: Unfold all subdirectories when starting a directory diff.\n" @@ -2731,12 +2747,12 @@ "каталогами.\n" "Вимкнено: лишати підкаталоги згорнутими." -#: optiondialog.cpp:1226 +#: optiondialog.cpp:1274 #, kde-format msgid "Skip directory status report" msgstr "Пропустити звіт щодо стану каталогів" -#: optiondialog.cpp:1230 +#: optiondialog.cpp:1278 #, kde-format msgid "" "On: Do not show the Directory Comparison Status.\n" @@ -2745,27 +2761,27 @@ "Увімкнено: не показувати стан порівняння каталогів.\n" "Вимкнено: показувати діалогове вікно стану на початку." -#: optiondialog.cpp:1234 +#: optiondialog.cpp:1282 #, kde-format msgid "File Comparison Mode" msgstr "Режим порівняння файлів" -#: optiondialog.cpp:1239 +#: optiondialog.cpp:1287 #, kde-format msgid "Binary comparison" msgstr "Двійкове порівняння" -#: optiondialog.cpp:1241 +#: optiondialog.cpp:1289 #, kde-format msgid "Binary comparison of each file. (Default)" msgstr "Двійкове порівняння кожного файла. (Типове)" -#: optiondialog.cpp:1244 +#: optiondialog.cpp:1292 #, kde-format msgid "Full analysis" msgstr "Повний аналіз" -#: optiondialog.cpp:1246 +#: optiondialog.cpp:1294 #, kde-format msgid "" "Do a full analysis and show statistics information in extra columns.\n" @@ -2776,12 +2792,12 @@ "(Повільніше за двійкове порівняння, набагато повільніше для двійкових " "файлів.)" -#: optiondialog.cpp:1250 +#: optiondialog.cpp:1298 #, kde-format msgid "Trust the size and modification date (unsafe)" msgstr "Довіряти розміру і даті зміни (небезпечно)" -#: optiondialog.cpp:1252 +#: optiondialog.cpp:1300 #, kde-format msgid "" "Assume that files are equal if the modification date and file length are " @@ -2794,7 +2810,7 @@ "Якщо вміст файлів однаковий, але дати зміни різні, вважати файли різними.\n" "Корисно для великих каталогів або повільних мереж." -#: optiondialog.cpp:1257 +#: optiondialog.cpp:1305 #, kde-format msgid "" "Trust the size and date, but use binary comparison if date does not match " @@ -2803,7 +2819,7 @@ "Довіряти розміру і даті, але використовувати двійкове порівняння за різниці " "дат (небезпечно)" -#: optiondialog.cpp:1259 +#: optiondialog.cpp:1307 #, kde-format msgid "" "Assume that files are equal if the modification date and file length are " @@ -2815,12 +2831,12 @@ "Якщо розміри однакові, але дати різні, використовувати двійкове порівняння.\n" "Корисно для великих каталогів або повільних мереж." -#: optiondialog.cpp:1264 +#: optiondialog.cpp:1312 #, kde-format msgid "Trust the size (unsafe)" msgstr "Довіряти розміру (небезпечно)" -#: optiondialog.cpp:1266 +#: optiondialog.cpp:1314 #, kde-format msgid "" "Assume that files are equal if their file lengths are equal.\n" @@ -2831,12 +2847,12 @@ "Корисно для великих каталогів або повільного зв’язку мережею, коли під час " "отримання змінюється дата." -#: optiondialog.cpp:1273 +#: optiondialog.cpp:1321 #, kde-format msgid "Synchronize directories" msgstr "Синхронізувати теки." -#: optiondialog.cpp:1277 +#: optiondialog.cpp:1325 #, kde-format msgid "" "Offers to store files in both directories so that\n" @@ -2847,12 +2863,12 @@ "по завершенню обидва каталоги будуть однаковими.\n" "Працює, лише якщо порівнюються два каталоги без визначення призначення." -#: optiondialog.cpp:1283 +#: optiondialog.cpp:1331 #, kde-format msgid "White space differences considered equal" msgstr "Файли з різницею у пробілах — однакові" -#: optiondialog.cpp:1287 +#: optiondialog.cpp:1335 #, kde-format msgid "" "If files differ only by white space consider them equal.\n" @@ -2861,12 +2877,12 @@ "Якщо файли відрізняються лише пробілами, вважати їх однаковими.\n" "Цей параметр активний, лише якщо вибрано повний аналіз." -#: optiondialog.cpp:1293 +#: optiondialog.cpp:1341 #, kde-format msgid "Copy newer instead of merging (unsafe)" -msgstr "Копіювати новіший, замість об’єднання (небезпечно)" +msgstr "Копіювати новіший, замість об'єднання (небезпечно)" -#: optiondialog.cpp:1297 +#: optiondialog.cpp:1345 #, kde-format msgid "" "Do not look inside, just take the newer file.\n" @@ -2877,12 +2893,12 @@ "(Користуйтеся цим, лише якщо знаєте що робите!)\n" "Ефективно лише у разі порівняння двох каталогів." -#: optiondialog.cpp:1302 +#: optiondialog.cpp:1350 #, kde-format msgid "Backup files (.orig)" msgstr "Створювати резервні копії файлів (.orig)" -#: optiondialog.cpp:1306 +#: optiondialog.cpp:1354 #, kde-format msgid "" "If a file would be saved over an old file, then the old file\n" @@ -2891,17 +2907,17 @@ "Якщо файл буде збережено замість старого файла, старий файл\n" "буде перейменовано на файл з суфіксом «.orig» замість вилучення." -#: optiondialog.cpp:1382 optiondialog.cpp:1383 +#: optiondialog.cpp:1430 optiondialog.cpp:1431 #, kde-format msgid "Regional Settings" msgstr "Локалізація" -#: optiondialog.cpp:1397 +#: optiondialog.cpp:1454 #, kde-format msgid "Use the same encoding for everything:" msgstr "Використовувати однакове кодування для всього:" -#: optiondialog.cpp:1401 +#: optiondialog.cpp:1458 #, kde-format msgid "" "Enable this allows to change all encodings by changing the first only.\n" @@ -2911,17 +2927,17 @@ "першого.\n" "Вимкніть його, якщо потрібні окремі параметри для кожної з частин." -#: optiondialog.cpp:1405 +#: optiondialog.cpp:1462 #, kde-format msgid "Note: Local Encoding is \"%1\"" msgstr "Зауваження: локальним кодуванням є «%1»" -#: optiondialog.cpp:1409 +#: optiondialog.cpp:1466 #, kde-format msgid "File Encoding for A:" msgstr "Кодування файла для A:" -#: optiondialog.cpp:1416 +#: optiondialog.cpp:1473 #, kde-format msgid "" "If enabled then Unicode (UTF-16 or UTF-8) encoding will be detected.\n" @@ -2933,32 +2949,32 @@ "Якщо файл не у Юнікоді, відбудеться повернення до вибраного кодування.\n" "(Визначення Юнікоду відбувається за першими байтами файла.)" -#: optiondialog.cpp:1419 optiondialog.cpp:1430 optiondialog.cpp:1441 +#: optiondialog.cpp:1476 optiondialog.cpp:1487 optiondialog.cpp:1498 #, kde-format msgid "Auto Detect Unicode" msgstr "Визначати Юнікод автоматично" -#: optiondialog.cpp:1425 +#: optiondialog.cpp:1482 #, kde-format msgid "File Encoding for B:" msgstr "Кодування файла для B:" -#: optiondialog.cpp:1436 +#: optiondialog.cpp:1493 #, kde-format msgid "File Encoding for C:" msgstr "Кодування файла для C:" -#: optiondialog.cpp:1447 +#: optiondialog.cpp:1504 #, kde-format msgid "File Encoding for Merge Output and Saving:" -msgstr "Кодування файла для об’єднання і збереження:" +msgstr "Кодування файла для об'єднання і збереження:" -#: optiondialog.cpp:1452 +#: optiondialog.cpp:1509 #, kde-format msgid "Auto Select" msgstr "Автовибір" -#: optiondialog.cpp:1456 +#: optiondialog.cpp:1513 #, kde-format msgid "" "If enabled then the encoding from the input files is used.\n" @@ -2969,17 +2985,17 @@ "У неоднозначних випадках користувача буде запитано про кодування для " "збереження файла." -#: optiondialog.cpp:1459 +#: optiondialog.cpp:1516 #, kde-format msgid "File Encoding for Preprocessor Files:" msgstr "Кодування файлів для файлів препроцесора:" -#: optiondialog.cpp:1471 +#: optiondialog.cpp:1528 #, kde-format msgid "Right To Left Language" msgstr "Мова з записом справа ліворуч" -#: optiondialog.cpp:1475 +#: optiondialog.cpp:1532 #, kde-format msgid "" "Some languages are read from right to left.\n" @@ -2988,22 +3004,22 @@ "Читання деякими мовами відбувається справа ліворуч.\n" "Цей параметр дозволяє відповідно змінити поведінку переглядача і редактора." -#: optiondialog.cpp:1485 +#: optiondialog.cpp:1542 #, kde-format msgid "Integration" msgstr "Інтеграція" -#: optiondialog.cpp:1486 +#: optiondialog.cpp:1543 #, kde-format msgid "Integration Settings" msgstr "Параметри інтеграції" -#: optiondialog.cpp:1499 +#: optiondialog.cpp:1564 #, kde-format msgid "Command line options to ignore:" msgstr "Ігнорувати параметри командного рядка:" -#: optiondialog.cpp:1505 +#: optiondialog.cpp:1570 #, kde-format msgid "" "List of command line options that should be ignored when KDiff3 is used by " @@ -3016,12 +3032,12 @@ "Декілька значень можна вказати відокремленням їх за допомогою «;»\n" "Таким чином можна позбутися повідомлень про «Невідомий параметр»." -#: optiondialog.cpp:1510 +#: optiondialog.cpp:1575 #, kde-format msgid "Quit also via Escape key" msgstr "Завершувати роботу за клавішею Escape" -#: optiondialog.cpp:1514 +#: optiondialog.cpp:1579 #, kde-format msgid "" "Fast method to exit.\n" @@ -3030,7 +3046,7 @@ "Швидкий спосіб завершення роботи.\n" "Для тих, хто звик користуватися клавішею Escape." -#: optiondialog.cpp:1598 +#: optiondialog.cpp:1653 #, kde-format msgid "This resets all options. Not only those of the current topic." msgstr "" @@ -3043,7 +3059,7 @@ "Data loss error:\n" "If it is reproducible please contact the author.\n" msgstr "" -"Помилка, пов’язана з втратою даних:\n" +"Помилка, пов'язана з втратою даних:\n" "Якщо цю помилку можна відтворити, зверніться до автора програми.\n" #: pdiff.cpp:80 pdiff.cpp:94 @@ -3069,97 +3085,87 @@ "Do you want to disable these settings or continue with these settings active?" msgstr "" "\n" -"Скоріше за все, ця поведінка небажана під час об’єднання.\n" +"Скоріше за все, ця поведінка небажана під час об'єднання.\n" "Ви бажаєте вимкнути ці параметри ви продовжувати з задіяними параметрами?" #: pdiff.cpp:130 #, kde-format msgid "Option Unsafe for Merging" -msgstr "Параметр небезпечний для об’єднання" +msgstr "Параметр небезпечний для об'єднання" #: pdiff.cpp:131 #, kde-format msgid "Use These Options During Merge" -msgstr "Використовувати ці параметри під час об’єднання" +msgstr "Використовувати ці параметри під час об'єднання" #: pdiff.cpp:132 #, kde-format msgid "Disable Unsafe Options" msgstr "Вимкнути небезпечні параметри" -#: pdiff.cpp:158 +#: pdiff.cpp:160 #, kde-format msgid "Loading A" msgstr "Завантаження A" -#: pdiff.cpp:167 +#: pdiff.cpp:162 #, kde-format -msgid "Errors occurred during pre-processing of file A." -msgstr "Під час попередньої обробки файла A сталася помилка." +msgid "Loading A: %1" +msgstr "Завантаження A: %1" -#: pdiff.cpp:172 +#: pdiff.cpp:170 #, kde-format msgid "Loading B" msgstr "Завантаження B" -#: pdiff.cpp:179 -#, kde-format -msgid "Errors occurred during pre-processing of file B." -msgstr "Під час попередньої обробки файла B сталася помилка." - -#: pdiff.cpp:202 pdiff.cpp:241 +#: pdiff.cpp:201 pdiff.cpp:237 #, kde-format msgid "Diff: A <-> B" msgstr "Diff: A <-> B" -#: pdiff.cpp:208 pdiff.cpp:279 pdiff.cpp:293 +#: pdiff.cpp:207 pdiff.cpp:275 pdiff.cpp:289 #, kde-format msgid "Linediff: A <-> B" msgstr "Linediff: A <-> B" -#: pdiff.cpp:225 +#: pdiff.cpp:224 #, kde-format msgid "Loading C" msgstr "Завантаження C" -#: pdiff.cpp:232 -#, kde-format -msgid "Errors occurred during pre-processing of file C." -msgstr "Під час попередньої обробки файла C сталася помилка." - -#: pdiff.cpp:250 +#: pdiff.cpp:246 #, kde-format msgid "Diff: A <-> C" msgstr "Diff: A <-> C" -#: pdiff.cpp:261 +#: pdiff.cpp:257 #, kde-format msgid "Diff: B <-> C" msgstr "Diff: B <-> C" -#: pdiff.cpp:283 pdiff.cpp:297 +#: pdiff.cpp:279 pdiff.cpp:293 #, kde-format msgid "Linediff: B <-> C" msgstr "Linediff: B <-> C" -#: pdiff.cpp:287 pdiff.cpp:301 +#: pdiff.cpp:283 pdiff.cpp:297 #, kde-format msgid "Linediff: A <-> C" msgstr "Linediff: A <-> C" -#: pdiff.cpp:829 +#: pdiff.cpp:819 #, kde-format msgid "All input files contain the same text, but are not binary equal." msgstr "" "Всі вхідні файли містять однаковий текст, але не є двійково однаковими." -#: pdiff.cpp:835 pdiff.cpp:839 pdiff.cpp:843 +#: pdiff.cpp:825 pdiff.cpp:829 pdiff.cpp:833 #, kde-format msgid "Files %1 and %2 have equal text, but are not binary equal. \n" msgstr "" "Файли %1 і %2 містять однаковий текст, але не є двійково однаковими. \n" -#: pdiff.cpp:853 +#: pdiff.cpp:843 #, kde-format msgid "" "Some input files do not seem to be pure text files.\n" @@ -3167,21 +3173,21 @@ "Continue at your own risk." msgstr "" "Деякі з вхідних файлів не є суто текстовими файлами.\n" -"Зауважте, що операцію об’єднання у KDiff3 не призначено для двійкових " +"Зауважте, що операцію об'єднання у KDiff3 не призначено для двійкових " "файлів.\n" "Продовжуйте, але можливі помилки." -#: pdiff.cpp:863 +#: pdiff.cpp:853 #, kde-format msgid ", B" msgstr ", B" -#: pdiff.cpp:865 +#: pdiff.cpp:855 #, kde-format msgid ", C" msgstr ", C" -#: pdiff.cpp:867 +#: pdiff.cpp:857 #, kde-format msgid "" "Some input characters could not be converted to valid unicode.\n" @@ -3196,77 +3202,72 @@ "лежить лише на вас.\n" "Файли вхідних даних, яких стосується це зауваження, зберігаються у %1." -#: pdiff.cpp:1034 +#: pdiff.cpp:1032 #, kde-format msgid "Abort" msgstr "Перервати" -#: pdiff.cpp:1040 pdiff.cpp:1130 +#: pdiff.cpp:1038 pdiff.cpp:1129 #, kde-format msgid "Opening files..." -msgstr "Відкриття файлів..." - -#: pdiff.cpp:1107 -#, kde-format -msgid "File open error" -msgstr "Помилка відкриття файла" +msgstr "Відкриття файлів…" -#: pdiff.cpp:1202 +#: pdiff.cpp:1212 #, kde-format msgid "Cutting selection..." -msgstr "Вирізання вибраного..." +msgstr "Вирізання вибраного…" -#: pdiff.cpp:1223 +#: pdiff.cpp:1233 #, kde-format msgid "Copying selection to clipboard..." -msgstr "Копіювання вибраного до кишені..." +msgstr "Копіювання вибраного до кишені…" -#: pdiff.cpp:1239 +#: pdiff.cpp:1249 #, kde-format msgid "Inserting clipboard contents..." -msgstr "Вставлення вмісту кишені..." +msgstr "Вставлення вмісту кишені…" -#: pdiff.cpp:1695 +#: pdiff.cpp:1705 #, kde-format msgid "Word wrap (Cancel disables word wrap)" msgstr "Перенесення рядків («Скасувати» вимикає перенесення)" -#: pdiff.cpp:1696 +#: pdiff.cpp:1706 #, kde-format msgid "Calculating max width for horizontal scrollbar" msgstr "Обчислюємо максимальну ширину для горизонтальної смужки гортання" -#: pdiff.cpp:1911 +#: pdiff.cpp:1921 #, kde-format msgid "Save && Continue" msgstr "Зберегти й продовжити" -#: pdiff.cpp:1912 +#: pdiff.cpp:1922 #, kde-format msgid "Continue Without Saving" msgstr "Продовжити без збереження" -#: pdiff.cpp:2124 +#: pdiff.cpp:2134 #, kde-format msgid "Search complete." msgstr "Пошук завершено." -#: pdiff.cpp:2124 +#: pdiff.cpp:2134 #, kde-format msgid "Search Complete" msgstr "Пошук завершено" -#: pdiff.cpp:2375 +#: pdiff.cpp:2385 #, kde-format msgid "Nothing is selected in either diff input window." msgstr "Нічого не позначено у жодному з вхідних вікон різниці." -#: pdiff.cpp:2375 +#: pdiff.cpp:2385 #, kde-format msgid "Error while adding manual diff range" msgstr "Помилка під час додавання вручну діапазону diff" -#: progress.cpp:59 progress.cpp:71 +#: progress.cpp:61 progress.cpp:73 #, kde-format msgid "&Cancel" msgstr "&Скасувати" @@ -3276,126 +3277,126 @@ msgid "A (Base):" msgstr "A (Основний):" -#: smalldialogs.cpp:68 smalldialogs.cpp:85 smalldialogs.cpp:102 -#: smalldialogs.cpp:144 +#: smalldialogs.cpp:71 smalldialogs.cpp:90 smalldialogs.cpp:109 +#: smalldialogs.cpp:154 #, kde-format msgid "File..." -msgstr "Файл..." +msgstr "Файл…" -#: smalldialogs.cpp:70 smalldialogs.cpp:87 smalldialogs.cpp:104 -#: smalldialogs.cpp:146 +#: smalldialogs.cpp:73 smalldialogs.cpp:92 smalldialogs.cpp:111 +#: smalldialogs.cpp:156 #, kde-format msgid "Dir..." msgstr "Каталог..." -#: smalldialogs.cpp:96 +#: smalldialogs.cpp:103 #, kde-format msgid "C (Optional):" msgstr "C (додатковий):" -#: smalldialogs.cpp:119 +#: smalldialogs.cpp:126 #, kde-format msgid "Swap/Copy Names..." msgstr "Обміняти/Копіювати назви…" -#: smalldialogs.cpp:124 smalldialogs.cpp:125 smalldialogs.cpp:126 +#: smalldialogs.cpp:131 smalldialogs.cpp:132 smalldialogs.cpp:133 #, kde-format msgid "Swap %1<->%2" msgstr "Обмін %1<->%2" -#: smalldialogs.cpp:127 smalldialogs.cpp:128 smalldialogs.cpp:129 +#: smalldialogs.cpp:134 smalldialogs.cpp:135 smalldialogs.cpp:136 #, kde-format msgid "Copy %1->Output" msgstr "Копія %1->Вивід" -#: smalldialogs.cpp:130 smalldialogs.cpp:131 smalldialogs.cpp:132 +#: smalldialogs.cpp:137 smalldialogs.cpp:138 smalldialogs.cpp:139 #, kde-format msgid "Swap %1<->Output" msgstr "Обмін %1<->Вивід" -#: smalldialogs.cpp:138 +#: smalldialogs.cpp:148 #, kde-format msgid "Output (optional):" msgstr "Вивід (не обов'язковий):" -#: smalldialogs.cpp:168 +#: smalldialogs.cpp:178 #, kde-format msgid "Configure..." -msgstr "Налаштувати..." +msgstr "Налаштувати…" -#: smalldialogs.cpp:233 +#: smalldialogs.cpp:243 #, kde-format msgid "Open Directory" msgstr "Відкрити каталог" -#: smalldialogs.cpp:234 +#: smalldialogs.cpp:244 #, kde-format msgid "Select Output File" msgstr "Виберіть файл виведених даних" -#: smalldialogs.cpp:393 +#: smalldialogs.cpp:403 #, kde-format msgid "Search text:" msgstr "Знайти текст:" -#: smalldialogs.cpp:400 +#: smalldialogs.cpp:410 #, kde-format msgid "Case sensitive" msgstr "З врахуванням регістру" -#: smalldialogs.cpp:403 +#: smalldialogs.cpp:413 #, kde-format msgid "Search A" msgstr "Пошук в A" -#: smalldialogs.cpp:408 +#: smalldialogs.cpp:418 #, kde-format msgid "Search B" msgstr "Пошук в B" -#: smalldialogs.cpp:413 +#: smalldialogs.cpp:423 #, kde-format msgid "Search C" msgstr "Пошук в C" -#: smalldialogs.cpp:418 +#: smalldialogs.cpp:428 #, kde-format msgid "Search output" msgstr "Пошук у виводі" -#: smalldialogs.cpp:425 +#: smalldialogs.cpp:435 #, kde-format msgid "&Search" msgstr "&Пошук" -#: smalldialogs.cpp:444 +#: smalldialogs.cpp:454 #, kde-format msgid "Regular Expression Tester" msgstr "Тестування формальних виразів" -#: smalldialogs.cpp:457 +#: smalldialogs.cpp:467 #, kde-format msgid "Example auto merge line:" -msgstr "Приклад рядка автооб’єднання:" +msgstr "Приклад рядка автооб'єднання:" -#: smalldialogs.cpp:459 +#: smalldialogs.cpp:469 #, kde-format msgid "To test auto merge, copy a line as used in your files." msgstr "" -"Для перевірки автооб’єднання скопіюйте рядок у тому вигляді, у якому він " +"Для перевірки автооб'єднання скопіюйте рядок у тому вигляді, у якому він " "використовується у ваших файлах." -#: smalldialogs.cpp:465 smalldialogs.cpp:493 smalldialogs.cpp:529 +#: smalldialogs.cpp:475 smalldialogs.cpp:503 smalldialogs.cpp:539 #, kde-format msgid "Match result:" msgstr "Результат пошуку:" -#: smalldialogs.cpp:484 +#: smalldialogs.cpp:494 #, kde-format msgid "Example history start line (with leading comment):" msgstr "Приклад початкового рядка історії (з початковим коментарем):" -#: smalldialogs.cpp:486 +#: smalldialogs.cpp:496 #, kde-format msgid "" "Copy a history start line as used in your files,\n" @@ -3405,17 +3406,17 @@ "ваших файлах,\n" "разом з початковим коментарем." -#: smalldialogs.cpp:512 +#: smalldialogs.cpp:522 #, kde-format msgid "History sort key order:" msgstr "Порядок ключів сортування історії:" -#: smalldialogs.cpp:520 +#: smalldialogs.cpp:530 #, kde-format msgid "Example history entry start line (without leading comment):" msgstr "Приклад початкового рядка запису історії (без початкового коментаря):" -#: smalldialogs.cpp:522 +#: smalldialogs.cpp:532 #, kde-format msgid "" "Copy a history entry start line as used in your files,\n" @@ -3425,47 +3426,47 @@ "використовується у ваших файлах,\n" "але пропустити початковий коментар." -#: smalldialogs.cpp:536 +#: smalldialogs.cpp:546 #, kde-format msgid "Sort key result:" msgstr "Результат ключа впорядкування:" -#: smalldialogs.cpp:584 smalldialogs.cpp:594 smalldialogs.cpp:614 +#: smalldialogs.cpp:594 smalldialogs.cpp:604 smalldialogs.cpp:624 #, kde-format msgid "Match success." msgstr "Знайдено відповідник." -#: smalldialogs.cpp:588 smalldialogs.cpp:598 smalldialogs.cpp:620 +#: smalldialogs.cpp:598 smalldialogs.cpp:608 smalldialogs.cpp:630 #, kde-format msgid "Match failed." msgstr "Відповідників не знайдено." -#: smalldialogs.cpp:605 +#: smalldialogs.cpp:615 #, kde-format msgid "Opening and closing parentheses do not match in regular expression." msgstr "Кількість лівих і правих дужок у формальному виразі не збігаються." -#: SourceData.cpp:150 +#: SourceData.cpp:153 #, kde-format msgid "Writing clipboard data to temp file failed." msgstr "Помилка запису даних кишені у тимчасовий файл." -#: SourceData.cpp:154 +#: SourceData.cpp:157 #, kde-format msgid "From Clipboard" msgstr "З буфера обміну даними" -#: SourceData.cpp:335 +#: SourceData.cpp:348 #, kde-format msgid "%1 is not a normal file." msgstr "%1 не є звичайним файлом." -#: SourceData.cpp:427 +#: SourceData.cpp:440 #, kde-format msgid " Temp file is: %1" msgstr " Тимчасовий файл: %1" -#: SourceData.cpp:432 +#: SourceData.cpp:445 #, kde-format msgid "" "Preprocessing possibly failed. Check this command:\n" @@ -3480,12 +3481,12 @@ "\n" "Зараз команду попередньої обробки буде вимкнено." -#: SourceData.cpp:443 SourceData.cpp:512 +#: SourceData.cpp:456 SourceData.cpp:525 #, kde-format msgid "File %1 too large to process. Skipping." msgstr "Файл %1 є надто великим для обробки. Пропускаємо його." -#: SourceData.cpp:487 +#: SourceData.cpp:500 #, kde-format msgid "" "The line-matching-preprocessing possibly failed. Check this command:\n" diff -Nru kdiff3-1.8.01/po/zh_CN/diff_ext.po kdiff3-1.8.3/po/zh_CN/diff_ext.po --- kdiff3-1.8.01/po/zh_CN/diff_ext.po 2019-05-18 01:02:38.000000000 +0000 +++ kdiff3-1.8.3/po/zh_CN/diff_ext.po 2020-06-25 00:19:02.000000000 +0000 @@ -6,132 +6,128 @@ msgid "" msgstr "" "Project-Id-Version: kdeorg\n" -"Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2019-03-22 03:09+0100\n" -"PO-Revision-Date: 2019-05-05 22:37\n" -"Last-Translator: Guo Yunhe (guoyunhe)\n" +"Report-Msgid-Bugs-To: https://bugs.kde.org\n" +"POT-Creation-Date: 2019-11-04 07:54+0100\n" +"PO-Revision-Date: 2020-06-24 08:02\n" +"Last-Translator: \n" "Language-Team: Chinese Simplified\n" "Language: zh_CN\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -"X-Generator: crowdin.com\n" "X-Crowdin-Project: kdeorg\n" +"X-Crowdin-Project-ID: 269464\n" "X-Crowdin-Language: zh-CN\n" -"X-Crowdin-File: /kf5-stable/messages/extragear-utils/diff_ext.pot\n" +"X-Crowdin-File: /kf5-stable/messages/kdiff3/diff_ext.pot\n" +"X-Crowdin-File-ID: 10290\n" -#: diff_ext.cpp:391 +#: diff_ext.cpp:223 #, kde-format msgid "Compare with %1" msgstr "" -#: diff_ext.cpp:392 +#: diff_ext.cpp:224 #, kde-format msgid "Merge with %1" msgstr "" -#: diff_ext.cpp:408 +#: diff_ext.cpp:234 #, kde-format msgid "3-way merge with base" msgstr "" -#: diff_ext.cpp:411 +#: diff_ext.cpp:237 #, kde-format msgid "Save '%1' for later" msgstr "" -#: diff_ext.cpp:426 +#: diff_ext.cpp:251 #, kde-format msgid "Compare with ..." msgstr "" -#: diff_ext.cpp:429 +#: diff_ext.cpp:254 #, kde-format msgid "Clear list" msgstr "清除列表" -#: diff_ext.cpp:434 +#: diff_ext.cpp:259 #, kde-format msgid "Compare" msgstr "比较" -#: diff_ext.cpp:438 +#: diff_ext.cpp:263 #, kde-format msgid "3 way comparison" msgstr "" -#: diff_ext.cpp:444 +#: diff_ext.cpp:269 #, kde-format msgid "About Diff-Ext ..." msgstr "" -#: diff_ext.cpp:515 +#: diff_ext.cpp:340 #, kde-format msgid "(32 Bit)" msgstr "(32 位)" -#: diff_ext.cpp:517 -#, kde-format -msgid "(64 Bit)" -msgstr "(64 位)" - -#: diff_ext.cpp:518 +#: diff_ext.cpp:342 #, kde-format msgid "Diff-Ext Copyright (c) 2003-2006, Sergey Zorin. All rights reserved.\n" msgstr "" -#: diff_ext.cpp:519 +#: diff_ext.cpp:343 #, kde-format msgid "This software is distributable under the BSD-2-Clause license.\n" msgstr "" -#: diff_ext.cpp:520 +#: diff_ext.cpp:344 #, kde-format msgid "Some extensions for KDiff3 (c) 2006-2013 by Joachim Eibl.\n" msgstr "" -#: diff_ext.cpp:521 +#: diff_ext.cpp:345 #, kde-format msgid "Homepage for Diff-Ext: http://diff-ext.sourceforge.net\n" msgstr "" -#: diff_ext.cpp:522 +#: diff_ext.cpp:346 #, kde-format msgid "About Diff-Ext for KDiff3 " msgstr "" -#: diff_ext.cpp:551 +#: diff_ext.cpp:375 #, kde-format msgid "Compare selected files" msgstr "" -#: diff_ext.cpp:557 diff_ext.cpp:577 +#: diff_ext.cpp:381 diff_ext.cpp:399 #, kde-format msgid "Compare '%1' with '%2'" msgstr "" -#: diff_ext.cpp:563 +#: diff_ext.cpp:386 #, kde-format msgid "Save '%1' for later operation" msgstr "" -#: diff_ext.cpp:619 +#: diff_ext.cpp:440 #, kde-format msgid "Could not start KDiff3. Please rerun KDiff3 installation." msgstr "" -#: diff_ext.cpp:620 +#: diff_ext.cpp:441 #, kde-format msgid "Command" msgstr "命令" -#: diff_ext.cpp:621 +#: diff_ext.cpp:442 #, kde-format msgid "CommandLine" msgstr "" -#: diff_ext.cpp:622 +#: diff_ext.cpp:443 #, kde-format msgid "Diff-Ext For KDiff3" msgstr "" \ No newline at end of file diff -Nru kdiff3-1.8.01/po/zh_CN/kdiff3fileitemactionplugin.po kdiff3-1.8.3/po/zh_CN/kdiff3fileitemactionplugin.po --- kdiff3-1.8.01/po/zh_CN/kdiff3fileitemactionplugin.po 2019-05-18 01:02:38.000000000 +0000 +++ kdiff3-1.8.3/po/zh_CN/kdiff3fileitemactionplugin.po 2020-06-25 00:19:02.000000000 +0000 @@ -5,21 +5,21 @@ msgid "" msgstr "" "Project-Id-Version: kdeorg\n" -"Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2019-03-22 03:09+0100\n" -"PO-Revision-Date: 2019-05-05 22:37\n" -"Last-Translator: Guo Yunhe (guoyunhe)\n" +"Report-Msgid-Bugs-To: https://bugs.kde.org\n" +"POT-Creation-Date: 2019-08-30 07:40+0200\n" +"PO-Revision-Date: 2020-06-24 08:02\n" +"Last-Translator: \n" "Language-Team: Chinese Simplified\n" "Language: zh_CN\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -"X-Generator: crowdin.com\n" "X-Crowdin-Project: kdeorg\n" +"X-Crowdin-Project-ID: 269464\n" "X-Crowdin-Language: zh-CN\n" -"X-Crowdin-File: /kf5-stable/messages/extragear-utils/" -"kdiff3fileitemactionplugin.pot\n" +"X-Crowdin-File: /kf5-stable/messages/kdiff3/kdiff3fileitemactionplugin.pot\n" +"X-Crowdin-File-ID: 10292\n" #: kdiff3fileitemaction.cpp:92 #, kde-format @@ -29,12 +29,12 @@ #: kdiff3fileitemaction.cpp:124 #, kde-format msgid "Compare with %1" -msgstr "" +msgstr "与 %1 比较" #: kdiff3fileitemaction.cpp:130 #, kde-format msgid "Merge with %1" -msgstr "" +msgstr "与 %1 合并" #: kdiff3fileitemaction.cpp:136 #, kde-format @@ -49,7 +49,7 @@ #: kdiff3fileitemaction.cpp:149 #, kde-format msgid "Compare with..." -msgstr "" +msgstr "比较..." #: kdiff3fileitemaction.cpp:161 #, kde-format @@ -64,17 +64,17 @@ #: kdiff3fileitemaction.cpp:175 #, kde-format msgid "3 way comparison" -msgstr "" +msgstr "3 路比较" #: kdiff3fileitemaction.cpp:179 #, kde-format msgid "About KDiff3 menu plugin..." -msgstr "" +msgstr "关于 KDiff3 菜单插件..." #: kdiff3fileitemaction.cpp:287 #, kde-format msgid "KDiff3 File Item Action Plugin: Copyright (C) 2011 Joachim Eibl\n" -msgstr "" +msgstr "KDiff3 文件项目操作插件：版权所有 (C) 2011 Joachim Eibl\n" #: kdiff3fileitemaction.cpp:288 #, kde-format @@ -93,4 +93,4 @@ #: kdiff3fileitemaction.cpp:296 #, kde-format msgid "About KDiff3 File Item Action Plugin" -msgstr "" \ No newline at end of file +msgstr "关于 KDiff3 文件项目动作插件" \ No newline at end of file diff -Nru kdiff3-1.8.01/po/zh_CN/kdiff3.po kdiff3-1.8.3/po/zh_CN/kdiff3.po --- kdiff3-1.8.01/po/zh_CN/kdiff3.po 2019-05-18 01:02:38.000000000 +0000 +++ kdiff3-1.8.3/po/zh_CN/kdiff3.po 2020-06-25 00:19:02.000000000 +0000 @@ -7,20 +7,21 @@ msgid "" msgstr "" "Project-Id-Version: kdeorg\n" -"Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2019-04-18 08:02+0200\n" -"PO-Revision-Date: 2019-05-05 22:37\n" -"Last-Translator: Guo Yunhe (guoyunhe)\n" +"Report-Msgid-Bugs-To: https://bugs.kde.org\n" +"POT-Creation-Date: 2020-06-22 07:48+0200\n" +"PO-Revision-Date: 2020-06-24 08:02\n" +"Last-Translator: \n" "Language-Team: Chinese Simplified\n" "Language: zh_CN\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -"X-Generator: crowdin.com\n" "X-Crowdin-Project: kdeorg\n" +"X-Crowdin-Project-ID: 269464\n" "X-Crowdin-Language: zh-CN\n" -"X-Crowdin-File: /kf5-stable/messages/extragear-utils/kdiff3.pot\n" +"X-Crowdin-File: /kf5-stable/messages/kdiff3/kdiff3.pot\n" +"X-Crowdin-File-ID: 10284\n" #, kde-format msgctxt "NAME OF TRANSLATORS" @@ -32,383 +33,385 @@ msgid "Your emails" msgstr "kde-china@kde.org, honghao.li@outlook.jp" -#: difftextwindow.cpp:412 +#: difftextwindow.cpp:414 #, kde-format msgid "File %1: Line %2" -msgstr "" +msgstr "文件 %1：行 %2" -#: difftextwindow.cpp:414 +#: difftextwindow.cpp:416 #, kde-format msgid "File %1: Line not available" -msgstr "" +msgstr "文件 %1：行不可用" -#: difftextwindow.cpp:1780 +#: difftextwindow.cpp:1778 #, kde-format msgid "Encoding:" msgstr "编码：" -#: difftextwindow.cpp:1782 mergeresultwindow.cpp:3138 optiondialog.cpp:818 +#: difftextwindow.cpp:1781 mergeresultwindow.cpp:3166 optiondialog.cpp:840 #, kde-format msgid "Line end style:" -msgstr "" +msgstr "行尾格式：" -#: difftextwindow.cpp:1810 directorymergewindow.cpp:382 -#: directorymergewindow.cpp:433 directorymergewindow.cpp:524 -#: directorymergewindow.cpp:3058 directorymergewindow.cpp:3189 -#: directorymergewindow.cpp:3417 mergeresultwindow.cpp:942 -#: mergeresultwindow.cpp:944 mergeresultwindow.cpp:946 -#: mergeresultwindow.cpp:948 mergeresultwindow.cpp:1814 -#: mergeresultwindow.cpp:3170 mergeresultwindow.cpp:3177 optiondialog.cpp:962 -#: optiondialog.cpp:975 pdiff.cpp:833 pdiff.cpp:835 pdiff.cpp:837 pdiff.cpp:839 -#: pdiff.cpp:861 smalldialogs.cpp:124 smalldialogs.cpp:126 smalldialogs.cpp:127 -#: smalldialogs.cpp:130 +#: difftextwindow.cpp:1809 directorymergewindow.cpp:383 +#: directorymergewindow.cpp:434 directorymergewindow.cpp:525 +#: directorymergewindow.cpp:3072 directorymergewindow.cpp:3203 +#: directorymergewindow.cpp:3431 mergeresultwindow.cpp:970 +#: mergeresultwindow.cpp:972 mergeresultwindow.cpp:974 +#: mergeresultwindow.cpp:976 mergeresultwindow.cpp:1842 +#: mergeresultwindow.cpp:3198 mergeresultwindow.cpp:3205 optiondialog.cpp:1002 +#: optiondialog.cpp:1015 pdiff.cpp:823 pdiff.cpp:825 pdiff.cpp:827 +#: pdiff.cpp:829 pdiff.cpp:851 smalldialogs.cpp:131 smalldialogs.cpp:133 +#: smalldialogs.cpp:134 smalldialogs.cpp:137 #, kde-format msgid "A" msgstr "A" -#: difftextwindow.cpp:1810 directorymergewindow.cpp:384 -#: directorymergewindow.cpp:436 directorymergewindow.cpp:526 -#: directorymergewindow.cpp:3064 directorymergewindow.cpp:3190 -#: directorymergewindow.cpp:3418 mergeresultwindow.cpp:942 -#: mergeresultwindow.cpp:944 mergeresultwindow.cpp:950 -#: mergeresultwindow.cpp:952 mergeresultwindow.cpp:1816 -#: mergeresultwindow.cpp:3172 mergeresultwindow.cpp:3179 optiondialog.cpp:963 -#: optiondialog.cpp:976 pdiff.cpp:833 pdiff.cpp:835 pdiff.cpp:841 pdiff.cpp:843 -#: pdiff.cpp:863 smalldialogs.cpp:124 smalldialogs.cpp:125 smalldialogs.cpp:128 -#: smalldialogs.cpp:131 +#: difftextwindow.cpp:1809 directorymergewindow.cpp:385 +#: directorymergewindow.cpp:437 directorymergewindow.cpp:527 +#: directorymergewindow.cpp:3078 directorymergewindow.cpp:3204 +#: directorymergewindow.cpp:3432 mergeresultwindow.cpp:970 +#: mergeresultwindow.cpp:972 mergeresultwindow.cpp:978 +#: mergeresultwindow.cpp:980 mergeresultwindow.cpp:1844 +#: mergeresultwindow.cpp:3200 mergeresultwindow.cpp:3207 optiondialog.cpp:1003 +#: optiondialog.cpp:1016 pdiff.cpp:823 pdiff.cpp:825 pdiff.cpp:831 +#: pdiff.cpp:833 pdiff.cpp:853 smalldialogs.cpp:131 smalldialogs.cpp:132 +#: smalldialogs.cpp:135 smalldialogs.cpp:138 #, kde-format msgid "B" -msgstr "蓝" +msgstr "B" -#: difftextwindow.cpp:1810 directorymergewindow.cpp:386 -#: directorymergewindow.cpp:439 directorymergewindow.cpp:528 -#: directorymergewindow.cpp:3070 directorymergewindow.cpp:3191 -#: directorymergewindow.cpp:3419 mergeresultwindow.cpp:946 -#: mergeresultwindow.cpp:948 mergeresultwindow.cpp:950 -#: mergeresultwindow.cpp:952 mergeresultwindow.cpp:1818 -#: mergeresultwindow.cpp:3174 mergeresultwindow.cpp:3181 optiondialog.cpp:977 -#: pdiff.cpp:837 pdiff.cpp:839 pdiff.cpp:841 pdiff.cpp:843 pdiff.cpp:865 -#: smalldialogs.cpp:125 smalldialogs.cpp:126 smalldialogs.cpp:129 -#: smalldialogs.cpp:132 +#: difftextwindow.cpp:1809 directorymergewindow.cpp:387 +#: directorymergewindow.cpp:440 directorymergewindow.cpp:529 +#: directorymergewindow.cpp:3084 directorymergewindow.cpp:3205 +#: directorymergewindow.cpp:3433 mergeresultwindow.cpp:974 +#: mergeresultwindow.cpp:976 mergeresultwindow.cpp:978 +#: mergeresultwindow.cpp:980 mergeresultwindow.cpp:1846 +#: mergeresultwindow.cpp:3202 mergeresultwindow.cpp:3209 optiondialog.cpp:1017 +#: pdiff.cpp:827 pdiff.cpp:829 pdiff.cpp:831 pdiff.cpp:833 pdiff.cpp:855 +#: smalldialogs.cpp:132 smalldialogs.cpp:133 smalldialogs.cpp:136 +#: smalldialogs.cpp:139 #, kde-format msgid "C" msgstr "C" -#: difftextwindow.cpp:1810 +#: difftextwindow.cpp:1809 #, kde-format msgid "A (Base)" msgstr "" -#: difftextwindow.cpp:1812 +#: difftextwindow.cpp:1811 #, kde-format msgid "Encoding: %1" -msgstr "" +msgstr "编码：%1" -#: difftextwindow.cpp:1813 mergeresultwindow.cpp:3183 +#: difftextwindow.cpp:1812 mergeresultwindow.cpp:3211 #, kde-format msgid "Unix" msgstr "Unix" -#: difftextwindow.cpp:1813 mergeresultwindow.cpp:3184 +#: difftextwindow.cpp:1812 mergeresultwindow.cpp:3212 #, kde-format msgid "DOS" msgstr "DOS" -#: difftextwindow.cpp:1813 +#: difftextwindow.cpp:1812 #, kde-format msgid "Line end style: %1" -msgstr "" +msgstr "行尾格式：%1" -#: difftextwindow.cpp:1835 kdiff3.cpp:873 +#: difftextwindow.cpp:1834 kdiff3.cpp:874 #, kde-format msgid "Top line" -msgstr "" +msgstr "顶行" -#: difftextwindow.cpp:1845 +#: difftextwindow.cpp:1843 #, kde-format msgid "End" -msgstr "End" +msgstr "末行" -#: difftextwindow.cpp:1903 smalldialogs.cpp:235 +#: difftextwindow.cpp:1901 smalldialogs.cpp:245 #, kde-format msgid "Open File" msgstr "打开文件" -#: difftextwindow.cpp:1951 optiondialog.cpp:387 +#: difftextwindow.cpp:1943 optiondialog.cpp:389 #, kde-format msgid "Unicode, 8 bit" -msgstr "8 位 Unicode" +msgstr "Unicode, 8位" -#: difftextwindow.cpp:1966 +#: difftextwindow.cpp:1958 #, kde-format msgid "Other" msgstr "其他" -#: directorymergewindow.cpp:409 directorymergewindow.cpp:3424 +#: directorymergewindow.cpp:410 directorymergewindow.cpp:3438 #, kde-format msgid "Copy A to B" msgstr "复制 A 到 B" -#: directorymergewindow.cpp:412 directorymergewindow.cpp:3425 +#: directorymergewindow.cpp:413 directorymergewindow.cpp:3439 #, kde-format msgid "Copy B to A" msgstr "复制 B 到 A" -#: directorymergewindow.cpp:415 directorymergewindow.cpp:3426 +#: directorymergewindow.cpp:416 directorymergewindow.cpp:3440 #, kde-format msgid "Delete A" msgstr "删除 A" -#: directorymergewindow.cpp:418 directorymergewindow.cpp:3427 +#: directorymergewindow.cpp:419 directorymergewindow.cpp:3441 #, kde-format msgid "Delete B" msgstr "删除 B" -#: directorymergewindow.cpp:421 +#: directorymergewindow.cpp:422 #, kde-format msgid "Delete A & B" msgstr "删除 A 和 B" -#: directorymergewindow.cpp:424 directorymergewindow.cpp:3429 +#: directorymergewindow.cpp:425 directorymergewindow.cpp:3443 #, kde-format msgid "Merge to A" msgstr "合并到 A" -#: directorymergewindow.cpp:427 directorymergewindow.cpp:3430 +#: directorymergewindow.cpp:428 directorymergewindow.cpp:3444 #, kde-format msgid "Merge to B" msgstr "合并到 B" -#: directorymergewindow.cpp:430 +#: directorymergewindow.cpp:431 #, kde-format msgid "Merge to A & B" msgstr "合并到 A 和 B" -#: directorymergewindow.cpp:442 directorymergewindow.cpp:3421 +#: directorymergewindow.cpp:443 directorymergewindow.cpp:3435 #, kde-format msgid "Delete (if exists)" msgstr "删除 (如果存在)" -#: directorymergewindow.cpp:445 directorymergewindow.cpp:448 -#: directorymergewindow.cpp:3420 optiondialog.cpp:925 smalldialogs.cpp:113 +#: directorymergewindow.cpp:446 directorymergewindow.cpp:449 +#: directorymergewindow.cpp:3434 smalldialogs.cpp:120 #, kde-format msgid "Merge" msgstr "合并" -#: directorymergewindow.cpp:445 directorymergewindow.cpp:448 +#: directorymergewindow.cpp:446 directorymergewindow.cpp:449 #, kde-format msgid "Merge (manual)" msgstr "合并 (手动)" -#: directorymergewindow.cpp:451 +#: directorymergewindow.cpp:452 #, kde-format msgid "Error: Conflicting File Types" msgstr "错误：文件类型冲突" -#: directorymergewindow.cpp:454 +#: directorymergewindow.cpp:455 #, kde-format msgid "Error: Changed and Deleted" -msgstr "错误：变化并删除" +msgstr "错误：已更改和删除" -#: directorymergewindow.cpp:457 +#: directorymergewindow.cpp:458 #, kde-format msgid "Error: Dates are equal but files are not." -msgstr "错误：日期相同但是文件不同。" +msgstr "错误：文件日期相同但内容不同。" -#: directorymergewindow.cpp:471 +#: directorymergewindow.cpp:472 #, kde-format msgid "Done" -msgstr "完成" +msgstr "已完成" -#: directorymergewindow.cpp:473 +#: directorymergewindow.cpp:474 #, kde-format msgid "Error" -msgstr "误差" +msgstr "错误" -#: directorymergewindow.cpp:475 +#: directorymergewindow.cpp:476 #, kde-format msgid "Skipped." -msgstr "跳过." +msgstr "已跳过。" -#: directorymergewindow.cpp:477 +#: directorymergewindow.cpp:478 #, kde-format msgid "Not saved." msgstr "未保存。" -#: directorymergewindow.cpp:479 +#: directorymergewindow.cpp:480 #, kde-format msgid "In progress..." -msgstr "进行中..." +msgstr "正在进行..." -#: directorymergewindow.cpp:481 +#: directorymergewindow.cpp:482 #, kde-format msgid "To do." -msgstr "" +msgstr "待办" -#: directorymergewindow.cpp:522 +#: directorymergewindow.cpp:523 #, kde-format msgid "Name" msgstr "文件名" -#: directorymergewindow.cpp:530 +#: directorymergewindow.cpp:531 #, kde-format msgid "Operation" msgstr "操作" -#: directorymergewindow.cpp:532 +#: directorymergewindow.cpp:533 #, kde-format msgid "Status" msgstr "状态" -#: directorymergewindow.cpp:534 +#: directorymergewindow.cpp:535 #, kde-format msgid "Unsolved" -msgstr "未解决的" +msgstr "未解决" -#: directorymergewindow.cpp:536 +#: directorymergewindow.cpp:537 #, kde-format msgid "Solved" -msgstr "已解决的" +msgstr "已解决" -#: directorymergewindow.cpp:538 +#: directorymergewindow.cpp:539 #, kde-format msgid "Nonwhite" msgstr "非空白" -#: directorymergewindow.cpp:540 +#: directorymergewindow.cpp:541 #, kde-format msgid "White" -msgstr "白色" +msgstr "空白" -#: directorymergewindow.cpp:674 +#: directorymergewindow.cpp:676 #, kde-format msgid "Unable to compare non-normal file with normal file." msgstr "" -#: directorymergewindow.cpp:688 +#: directorymergewindow.cpp:690 #, kde-format msgid "Mix of links and normal files." msgstr "" -#: directorymergewindow.cpp:695 +#: directorymergewindow.cpp:697 #, kde-format msgid "Link: " msgstr "链接: " -#: directorymergewindow.cpp:704 +#: directorymergewindow.cpp:706 #, kde-format msgid "Size. " msgstr "尺寸. " -#: directorymergewindow.cpp:718 directorymergewindow.cpp:728 +#: directorymergewindow.cpp:720 directorymergewindow.cpp:730 #, kde-format msgid "Date & Size: " -msgstr "" +msgstr "日期和大小： " -#: directorymergewindow.cpp:748 +#: directorymergewindow.cpp:751 #, kde-format msgid "Comparing file..." msgstr "正在比较文件..." -#: directorymergewindow.cpp:801 +#: directorymergewindow.cpp:813 #, kde-format msgid "" "You are currently doing a directory merge. Are you sure, you want to abort " "the merge and rescan the directory?" -msgstr "" +msgstr "您当前正在合并目录。确定要放弃合并并重新扫描目录吗？" -#: directorymergewindow.cpp:802 kdiff3.cpp:698 kdiff3.cpp:708 kdiff3.cpp:720 -#: mergeresultwindow.cpp:372 pdiff.cpp:1033 pdiff.cpp:1910 pdiff.cpp:1920 +#: directorymergewindow.cpp:814 kdiff3.cpp:697 kdiff3.cpp:707 kdiff3.cpp:719 +#: mergeresultwindow.cpp:400 pdiff.cpp:1031 pdiff.cpp:1920 pdiff.cpp:1930 #, kde-format msgid "Warning" msgstr "警告" -#: directorymergewindow.cpp:803 directorymergewindow.cpp:3393 +#: directorymergewindow.cpp:815 directorymergewindow.cpp:3407 #, kde-format msgid "Rescan" msgstr "重新扫描" -#: directorymergewindow.cpp:804 pdiff.cpp:1035 +#: directorymergewindow.cpp:816 pdiff.cpp:1033 #, kde-format msgid "Continue Merging" -msgstr "" +msgstr "继续合并" -#: directorymergewindow.cpp:971 +#: directorymergewindow.cpp:984 #, kde-format msgid "Opening of directories failed:" -msgstr "" +msgstr "打开目录失败：" -#: directorymergewindow.cpp:975 +#: directorymergewindow.cpp:988 #, kde-format msgid "Dir A \"%1\" does not exist or is not a directory.\n" -msgstr "" +msgstr "文件夹 A “%1”不存在或者其不是文件夹。\n" -#: directorymergewindow.cpp:980 +#: directorymergewindow.cpp:993 #, kde-format msgid "Dir B \"%1\" does not exist or is not a directory.\n" -msgstr "" +msgstr "文件夹 B “%1”不存在或者其不是文件夹。\n" -#: directorymergewindow.cpp:985 +#: directorymergewindow.cpp:998 #, kde-format msgid "Dir C \"%1\" does not exist or is not a directory.\n" -msgstr "" +msgstr "文件夹 C “%1”不存在或者其不是文件夹。\n" -#: directorymergewindow.cpp:988 +#: directorymergewindow.cpp:1001 #, kde-format msgid "Directory Open Error" -msgstr "无法打开目录" +msgstr "打开目录出错" -#: directorymergewindow.cpp:996 +#: directorymergewindow.cpp:1009 #, kde-format 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。\n" +"在继续前，请再核对一遍。" -#: directorymergewindow.cpp:998 +#: directorymergewindow.cpp:1011 #, kde-format msgid "Parameter Warning" -msgstr "" +msgstr "参数警告" -#: directorymergewindow.cpp:1003 +#: directorymergewindow.cpp:1016 #, kde-format msgid "Scanning directories..." msgstr "正在扫描目录..." -#: directorymergewindow.cpp:1029 +#: directorymergewindow.cpp:1042 #, kde-format msgid "Reading Directory A" -msgstr "" +msgstr "正在读取目录 A" -#: directorymergewindow.cpp:1038 +#: directorymergewindow.cpp:1051 #, kde-format msgid "Reading Directory B" -msgstr "" +msgstr "正在读取目录 B" -#: directorymergewindow.cpp:1048 +#: directorymergewindow.cpp:1061 #, kde-format msgid "Reading Directory C" -msgstr "" +msgstr "正在读取目录 C" -#: directorymergewindow.cpp:1064 +#: directorymergewindow.cpp:1077 #, kde-format msgid "Some subdirectories were not readable in" -msgstr "" +msgstr "无法读取部分子目录" -#: directorymergewindow.cpp:1069 +#: directorymergewindow.cpp:1082 #, kde-format msgid "Check the permissions of the subdirectories." -msgstr "" +msgstr "检查子目录权限。" -#: directorymergewindow.cpp:1106 kdiff3.cpp:666 kdiff3.cpp:753 kdiff3.cpp:777 -#: kdiff3.cpp:1065 kdiff3.cpp:1086 pdiff.cpp:1116 pdiff.cpp:1170 pdiff.cpp:1218 -#: pdiff.cpp:1234 pdiff.cpp:1277 pdiff.cpp:1301 +#: directorymergewindow.cpp:1119 kdiff3.cpp:665 kdiff3.cpp:752 kdiff3.cpp:776 +#: kdiff3.cpp:1072 kdiff3.cpp:1093 pdiff.cpp:1115 pdiff.cpp:1178 pdiff.cpp:1228 +#: pdiff.cpp:1244 pdiff.cpp:1287 pdiff.cpp:1311 #, kde-format msgid "Ready." msgstr "就绪。" -#: directorymergewindow.cpp:1121 +#: directorymergewindow.cpp:1134 #, kde-format msgid "" "Directory Comparison Status\n" @@ -417,67 +420,74 @@ "Number of equal files: %2\n" "Number of different files: %3" msgstr "" +"文件夹比较状态\n" +"\n" +"子文件夹数: %1\n" +"相同文件数: %2\n" +"不同文件数: %3" -#: directorymergewindow.cpp:1128 +#: directorymergewindow.cpp:1141 #, kde-format msgid "Number of manual merges: %1" -msgstr "" +msgstr "手动合并数：%1" -#: directorymergewindow.cpp:1394 +#: directorymergewindow.cpp:1407 #, kde-format msgid "This affects all merge operations." -msgstr "" +msgstr "这将影响所有合并操作。" -#: directorymergewindow.cpp:1395 +#: directorymergewindow.cpp:1408 #, kde-format msgid "Changing All Merge Operations" -msgstr "" +msgstr "更改所有合并操作" -#: directorymergewindow.cpp:1695 +#: directorymergewindow.cpp:1708 #, kde-format msgid "" "Processing %1 / %2\n" "%3" msgstr "" +"正在处理 %1 / %2\n" +"%3" -#: directorymergewindow.cpp:1738 directorymergewindow.cpp:1742 +#: directorymergewindow.cpp:1751 directorymergewindow.cpp:1755 #, kde-format msgid "Some files could not be processed." -msgstr "" +msgstr "无法处理部分文件。" -#: directorymergewindow.cpp:2222 directorymergewindow.cpp:2247 -#: directorymergewindow.cpp:2271 +#: directorymergewindow.cpp:2235 directorymergewindow.cpp:2260 +#: directorymergewindow.cpp:2285 #, kde-format msgid "This operation is currently not possible." -msgstr "" +msgstr "现在不能执行此操作。" -#: directorymergewindow.cpp:2222 directorymergewindow.cpp:2247 -#: directorymergewindow.cpp:2271 directorymergewindow.cpp:2552 +#: directorymergewindow.cpp:2235 directorymergewindow.cpp:2260 +#: directorymergewindow.cpp:2285 directorymergewindow.cpp:2565 #, kde-format msgid "Operation Not Possible" -msgstr "" +msgstr "操作不可行" -#: directorymergewindow.cpp:2318 +#: directorymergewindow.cpp:2332 #, kde-format msgid "An error occurred while copying." -msgstr "" +msgstr "复制时发生错误。" -#: directorymergewindow.cpp:2319 directorymergewindow.cpp:2759 +#: directorymergewindow.cpp:2333 directorymergewindow.cpp:2772 #, kde-format msgid "Merge Error" -msgstr "" +msgstr "合并错误" -#: directorymergewindow.cpp:2396 +#: directorymergewindow.cpp:2410 #, kde-format msgid "Unknown merge operation. (This must never happen!)" -msgstr "" +msgstr "未知合并操作。(不应该的程序错误)" -#: directorymergewindow.cpp:2441 +#: directorymergewindow.cpp:2455 #, kde-format msgid "Unknown merge operation." -msgstr "" +msgstr "未知合并操作。" -#: directorymergewindow.cpp:2454 +#: directorymergewindow.cpp:2468 #, kde-format msgid "" "The merge is about to begin.\n" @@ -489,1020 +499,1075 @@ "Be aware that this program still has beta status and there is NO WARRANTY " "whatsoever! Make backups of your vital data!" msgstr "" +"将开始合并。\n" +"\n" +"如果您已阅读指南并知道您在做什么，选择“执行”。\n" +"选择“模拟”将告诉您将发生什么。\n" +"\n" +"请注意该功能依然处于测试状态，没有任何保证！备份您的重要数据！" -#: directorymergewindow.cpp:2459 +#: directorymergewindow.cpp:2473 #, kde-format msgid "Starting Merge" -msgstr "" +msgstr "开始合并" -#: directorymergewindow.cpp:2460 +#: directorymergewindow.cpp:2474 #, kde-format msgid "Do It" -msgstr "立刻实行！" +msgstr "执行" -#: directorymergewindow.cpp:2461 +#: directorymergewindow.cpp:2475 #, kde-format msgid "Simulate It" -msgstr "" +msgstr "模拟" -#: directorymergewindow.cpp:2487 +#: directorymergewindow.cpp:2501 #, kde-format msgid "" "The highlighted item has a different type in the different directories. " "Select what to do." -msgstr "" +msgstr "高亮的项目在不同目录中有不同类型。请选择要执行的操作。" -#: directorymergewindow.cpp:2491 +#: directorymergewindow.cpp:2505 #, kde-format msgid "" "The modification dates of the file are equal but the files are not. Select " "what to do." -msgstr "" +msgstr "文件的修改日期相同但内容不同。请选择操作。" -#: directorymergewindow.cpp:2495 +#: directorymergewindow.cpp:2509 #, kde-format msgid "" "The highlighted item was changed in one directory and deleted in the other. " "Select what to do." -msgstr "" +msgstr "高亮项在一个目录被修改，在另一个目录被删除。请选择操作。" -#: directorymergewindow.cpp:2552 +#: directorymergewindow.cpp:2565 #, kde-format msgid "" "This operation is currently not possible because directory merge is " "currently running." -msgstr "" +msgstr "此操作当前不可行，因为目录合并正在运行。" -#: directorymergewindow.cpp:2609 +#: directorymergewindow.cpp:2622 #, kde-format 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 "" +"上一步操作有错误。\n" +"您要继续处理出错的项目还是跳过该项？" -#: directorymergewindow.cpp:2611 +#: directorymergewindow.cpp:2624 #, kde-format msgid "Continue merge after an error" -msgstr "" +msgstr "出错后继续合并" -#: directorymergewindow.cpp:2612 +#: directorymergewindow.cpp:2625 #, kde-format msgid "Continue With Last Item" -msgstr "" +msgstr "从上一项继续" -#: directorymergewindow.cpp:2613 +#: directorymergewindow.cpp:2626 #, kde-format msgid "Skip Item" -msgstr "" +msgstr "跳过该项" -#: directorymergewindow.cpp:2709 +#: directorymergewindow.cpp:2722 #, kde-format msgid "Merge operation complete." -msgstr "" +msgstr "合并操作完成。" -#: directorymergewindow.cpp:2709 directorymergewindow.cpp:2712 +#: directorymergewindow.cpp:2722 directorymergewindow.cpp:2725 #, kde-format msgid "Merge Complete" -msgstr "" +msgstr "合并完成" -#: directorymergewindow.cpp:2722 +#: directorymergewindow.cpp:2735 #, kde-format msgid "" "Simulated merge complete: Check if you agree with the proposed operations." -msgstr "" +msgstr "模拟合并完成：核对您是否同意程序给出的操作。" -#: directorymergewindow.cpp:2758 +#: directorymergewindow.cpp:2771 #, kde-format msgid "An error occurred. Press OK to see detailed information." -msgstr "" +msgstr "发生错误。单击确定查看详细信息。" -#: directorymergewindow.cpp:2791 +#: directorymergewindow.cpp:2804 #, kde-format msgid "Error: While deleting %1: Creating backup failed." -msgstr "" +msgstr "错误：在删除 %1 时：创建备份失败。" -#: directorymergewindow.cpp:2798 +#: directorymergewindow.cpp:2811 #, kde-format msgid "delete directory recursively( %1 )" -msgstr "" +msgstr "递归删除目录( %1 )" -#: directorymergewindow.cpp:2800 +#: directorymergewindow.cpp:2813 #, kde-format msgid "delete( %1 )" -msgstr "" +msgstr "删除( %1 )" -#: directorymergewindow.cpp:2815 +#: directorymergewindow.cpp:2828 #, kde-format msgid "Error: delete dir operation failed while trying to read the directory." -msgstr "" +msgstr "错误：删除文件夹操作失败，读取目录失败。" -#: directorymergewindow.cpp:2834 +#: directorymergewindow.cpp:2847 #, kde-format msgid "Error: rmdir( %1 ) operation failed." -msgstr "" +msgstr "错误：删除目录(%1)操作失败。" -#: directorymergewindow.cpp:2844 +#: directorymergewindow.cpp:2857 #, kde-format msgid "Error: delete operation failed." -msgstr "" +msgstr "错误：删除操作失败。" -#: directorymergewindow.cpp:2870 +#: directorymergewindow.cpp:2884 #, kde-format msgid "manual merge( %1, %2, %3 -> %4)" -msgstr "" +msgstr "手动合并( %1，%2，%3 -> %4)" -#: directorymergewindow.cpp:2873 +#: directorymergewindow.cpp:2887 #, kde-format msgid "" " Note: After a manual merge the user should continue by pressing F7." -msgstr "" +msgstr " 注意：在手动合并之后用户应该按 F7 继续。" -#: directorymergewindow.cpp:2900 +#: directorymergewindow.cpp:2914 #, kde-format msgid "Error: copy( %1 -> %2 ) failed.Deleting existing destination failed." -msgstr "" +msgstr "错误：复制( %1 -> %2 )失败。删除现存目标失败。" -#: directorymergewindow.cpp:2909 +#: directorymergewindow.cpp:2923 #, kde-format msgid "copyLink( %1 -> %2 )" -msgstr "" +msgstr "复制链接( %1 -> %2 )" -#: directorymergewindow.cpp:2918 +#: directorymergewindow.cpp:2932 #, kde-format msgid "Error: copyLink failed: Remote links are not yet supported." -msgstr "" +msgstr "错误：复制链接失败：远程链接尚未支持。" -#: directorymergewindow.cpp:2928 +#: directorymergewindow.cpp:2942 #, kde-format msgid "Error: copyLink failed." -msgstr "" +msgstr "错误：复制链接失败。" -#: directorymergewindow.cpp:2953 +#: directorymergewindow.cpp:2967 #, kde-format msgid "copy( %1 -> %2 )" -msgstr "" +msgstr "复制( %1 -> %2 )" -#: directorymergewindow.cpp:2979 +#: directorymergewindow.cpp:2993 #, kde-format msgid "Error during rename( %1 -> %2 ): Cannot delete existing destination." -msgstr "" +msgstr "重命名( %1 -> %2 ) 错误：无法删除现存目标。" -#: directorymergewindow.cpp:2986 +#: directorymergewindow.cpp:3000 #, kde-format msgid "rename( %1 -> %2 )" -msgstr "" +msgstr "重命名( %1 -> %2 )" -#: directorymergewindow.cpp:2995 +#: directorymergewindow.cpp:3009 #, kde-format msgid "Error: Rename failed." msgstr "错误：重命名失败。" -#: directorymergewindow.cpp:3013 +#: directorymergewindow.cpp:3027 #, kde-format msgid "Error during makeDir of %1. Cannot delete existing file." -msgstr "" +msgstr "建立目录 %1 出错。无法删除现存文件。" -#: directorymergewindow.cpp:3030 +#: directorymergewindow.cpp:3044 #, kde-format msgid "makeDir( %1 )" msgstr "" -#: directorymergewindow.cpp:3040 +#: directorymergewindow.cpp:3054 #, kde-format msgid "Error while creating directory." -msgstr "" +msgstr "创建目录时出错。" -#: directorymergewindow.cpp:3076 directorymergewindow.cpp:3195 +#: directorymergewindow.cpp:3090 directorymergewindow.cpp:3209 #, kde-format msgid "Dest" msgstr "目标" -#: directorymergewindow.cpp:3084 directorymergewindow.cpp:3113 +#: directorymergewindow.cpp:3098 directorymergewindow.cpp:3127 #, kde-format msgid "Dir" -msgstr "" +msgstr "文件夹" -#: directorymergewindow.cpp:3084 +#: directorymergewindow.cpp:3098 #, kde-format msgid "Type" -msgstr "文件系统" +msgstr "类型" -#: directorymergewindow.cpp:3084 +#: directorymergewindow.cpp:3098 #, kde-format msgid "Size" msgstr "大小" -#: directorymergewindow.cpp:3085 +#: directorymergewindow.cpp:3099 #, kde-format msgid "Attr" msgstr "属性" -#: directorymergewindow.cpp:3085 +#: directorymergewindow.cpp:3099 #, kde-format msgid "Last Modification" -msgstr "" +msgstr "最后修改时间" -#: directorymergewindow.cpp:3085 +#: directorymergewindow.cpp:3099 #, kde-format msgid "Link-Destination" -msgstr "" +msgstr "链接目标" -#: directorymergewindow.cpp:3113 +#: directorymergewindow.cpp:3127 #, kde-format msgid "File" msgstr "文件" -#: directorymergewindow.cpp:3113 +#: directorymergewindow.cpp:3127 #, kde-format msgid "-Link" msgstr "-链接" -#: directorymergewindow.cpp:3119 +#: directorymergewindow.cpp:3133 #, kde-format msgid "not available" msgstr "不可用" -#: directorymergewindow.cpp:3137 +#: directorymergewindow.cpp:3151 #, kde-format msgid "A (Dest): " -msgstr "" +msgstr "A (目标)：" -#: directorymergewindow.cpp:3141 +#: directorymergewindow.cpp:3155 #, kde-format msgid "A: " -msgstr "" +msgstr "A: " -#: directorymergewindow.cpp:3141 +#: directorymergewindow.cpp:3155 #, kde-format msgid "A (Base): " msgstr "" -#: directorymergewindow.cpp:3147 +#: directorymergewindow.cpp:3161 #, kde-format msgid "B (Dest): " -msgstr "" +msgstr "B (目标)：" -#: directorymergewindow.cpp:3151 +#: directorymergewindow.cpp:3165 #, kde-format msgid "B: " -msgstr "" +msgstr "B: " -#: directorymergewindow.cpp:3156 +#: directorymergewindow.cpp:3170 #, kde-format msgid "C (Dest): " -msgstr "" +msgstr "C (目标)： " -#: directorymergewindow.cpp:3160 +#: directorymergewindow.cpp:3174 #, kde-format msgid "C: " -msgstr "" +msgstr "C: " -#: directorymergewindow.cpp:3163 +#: directorymergewindow.cpp:3177 #, kde-format msgid "Dest: " msgstr "目标: " #. i18n("Saving Directory Merge State ...")); -#: directorymergewindow.cpp:3238 +#: directorymergewindow.cpp:3252 #, kde-format msgid "Save Directory Merge State As..." -msgstr "" +msgstr "保存目录合并状态为..." -#: directorymergewindow.cpp:3387 +#: directorymergewindow.cpp:3401 #, kde-format msgid "Start/Continue Directory Merge" -msgstr "" +msgstr "开始/继续目录合并" -#: directorymergewindow.cpp:3388 +#: directorymergewindow.cpp:3402 #, kde-format msgid "Run Operation for Current Item" -msgstr "" +msgstr "为当前项运行操作" -#: directorymergewindow.cpp:3389 +#: directorymergewindow.cpp:3403 #, kde-format msgid "Compare Selected File" -msgstr "" +msgstr "比较所选文件" -#: directorymergewindow.cpp:3390 +#: directorymergewindow.cpp:3404 #, kde-format msgid "Merge Current File" -msgstr "" +msgstr "合并当前文件" -#: directorymergewindow.cpp:3390 +#: directorymergewindow.cpp:3404 #, kde-format msgid "" "Merge\n" "File" -msgstr "" +msgstr "合并文件" -#: directorymergewindow.cpp:3391 +#: directorymergewindow.cpp:3405 #, kde-format msgid "Fold All Subdirs" -msgstr "" +msgstr "折叠全部子目录" -#: directorymergewindow.cpp:3392 +#: directorymergewindow.cpp:3406 #, kde-format msgid "Unfold All Subdirs" -msgstr "" +msgstr "展开全部子目录" #. i18n("Save Directory Merge State ..."), 0, this, &DirectoryMergeWindow::slotSaveMergeState, ac, "dir_save_merge_state"); #. i18n("Load Directory Merge State ..."), 0, this, &DirectoryMergeWindow::slotLoadMergeState, ac, "dir_load_merge_state"); -#: directorymergewindow.cpp:3396 +#: directorymergewindow.cpp:3410 #, kde-format msgid "Choose A for All Items" -msgstr "" +msgstr "选择 A 的全部项目" -#: directorymergewindow.cpp:3397 +#: directorymergewindow.cpp:3411 #, kde-format msgid "Choose B for All Items" -msgstr "" +msgstr "选择 B 的全部项目" -#: directorymergewindow.cpp:3398 +#: directorymergewindow.cpp:3412 #, kde-format msgid "Choose C for All Items" -msgstr "" +msgstr "选择 C 的全部项目" -#: directorymergewindow.cpp:3399 +#: directorymergewindow.cpp:3413 #, kde-format msgid "Auto-Choose Operation for All Items" -msgstr "" +msgstr "为全部项自动选择操作" -#: directorymergewindow.cpp:3400 +#: directorymergewindow.cpp:3414 #, kde-format msgid "No Operation for All Items" -msgstr "" +msgstr "全部项目无操作" #. i18n("Synchronize Directories"), 0, this, &DirectoryMergeWindow::slotSynchronizeDirectories, ac, "dir_synchronize_directories"); #. d->m_pDirChooseNewerFiles = GuiUtils::createAction< KToggleAction >(i18n("Copy Newer Files Instead of Merging"), 0, this, &DirectoryMergeWindow::slotChooseNewerFiles, ac, "dir_choose_newer_files"); -#: directorymergewindow.cpp:3405 +#: directorymergewindow.cpp:3419 #, kde-format msgid "Show Identical Files" -msgstr "" +msgstr "显示相同文件" -#: directorymergewindow.cpp:3405 +#: directorymergewindow.cpp:3419 #, kde-format msgid "" "Identical\n" "Files" msgstr "" +"相同\n" +"文件" -#: directorymergewindow.cpp:3406 +#: directorymergewindow.cpp:3420 #, kde-format msgid "Show Different Files" -msgstr "" +msgstr "显示不同文件" -#: directorymergewindow.cpp:3407 +#: directorymergewindow.cpp:3421 #, kde-format msgid "Show Files only in A" -msgstr "" +msgstr "显示只在A中有的文件" -#: directorymergewindow.cpp:3407 +#: directorymergewindow.cpp:3421 #, kde-format msgid "" "Files\n" "only in A" msgstr "" +"文件\n" +"仅A中" -#: directorymergewindow.cpp:3408 +#: directorymergewindow.cpp:3422 #, kde-format msgid "Show Files only in B" -msgstr "" +msgstr "显示只在B中有的文件" -#: directorymergewindow.cpp:3408 +#: directorymergewindow.cpp:3422 #, kde-format msgid "" "Files\n" "only in B" msgstr "" +"文件\n" +"仅B中" -#: directorymergewindow.cpp:3409 +#: directorymergewindow.cpp:3423 #, kde-format msgid "Show Files only in C" -msgstr "" +msgstr "显示只在C中有的文件" -#: directorymergewindow.cpp:3409 +#: directorymergewindow.cpp:3423 #, kde-format msgid "" "Files\n" "only in C" msgstr "" +"文件\n" +"仅C中" -#: directorymergewindow.cpp:3413 +#: directorymergewindow.cpp:3427 #, kde-format msgid "Compare Explicitly Selected Files" -msgstr "" +msgstr "比较所选文件" -#: directorymergewindow.cpp:3414 +#: directorymergewindow.cpp:3428 #, kde-format msgid "Merge Explicitly Selected Files" -msgstr "" +msgstr "合并所选文件" -#: directorymergewindow.cpp:3416 directorymergewindow.cpp:3423 +#: directorymergewindow.cpp:3430 directorymergewindow.cpp:3437 #, kde-format msgid "Do Nothing" -msgstr "不做任何事" +msgstr "无动作" -#: directorymergewindow.cpp:3428 +#: directorymergewindow.cpp:3442 #, kde-format msgid "Delete A && B" -msgstr "" +msgstr "删除 A 和 B" -#: directorymergewindow.cpp:3431 +#: directorymergewindow.cpp:3445 #, kde-format msgid "Merge to A && B" -msgstr "" +msgstr "合并到 A 和 B" -#: fileaccess.cpp:462 SourceData.cpp:493 +#: fileaccess.cpp:301 +#, kde-format +msgid "Unable to determine full url. No parent specified." +msgstr "无法确定完整 URL。没有指定父目录。" + +#: fileaccess.cpp:482 SourceData.cpp:506 #, kde-format msgid "Failed to read file: %1" -msgstr "" +msgstr "读取文件失败 %1" -#: fileaccess.cpp:587 +#: fileaccess.cpp:624 #, kde-format msgid "Creating temp copy of %1 failed." -msgstr "" +msgstr "创建 %1 的临时副本失败。" -#: fileaccess.cpp:595 fileaccess.cpp:600 +#: fileaccess.cpp:632 fileaccess.cpp:637 #, kde-format msgid "Opening %1 failed. %2" -msgstr "" +msgstr "打开 %1 失败。%2" -#: fileaccess.cpp:619 fileaccess.cpp:627 +#: fileaccess.cpp:656 fileaccess.cpp:664 #, kde-format msgid "Error reading from %1. %2" -msgstr "" +msgstr "读取 %1 出错。%2" -#: fileaccess.cpp:751 +#: fileaccess.cpp:788 #, kde-format msgid "" "While trying to make a backup, deleting an older backup failed.\n" "Filename: %1" msgstr "" +"试图备份时，删除旧备份失败。\n" +"文件名：%1" -#: fileaccess.cpp:758 +#: fileaccess.cpp:795 #, kde-format msgid "" "While trying to make a backup, renaming failed.\n" "Filenames: %1 -> %2" msgstr "" +"试图备份时，重命名失败。\n" +"文件名：%1 -> %2" -#: fileaccess.cpp:828 +#: fileaccess.cpp:865 #, kde-format msgid "Getting file status: %1" -msgstr "" +msgstr "正在获取文件状态：%1" -#: fileaccess.cpp:869 +#: fileaccess.cpp:906 #, kde-format msgid "Reading file: %1" -msgstr "" +msgstr "正在读取文件：%1" -#: fileaccess.cpp:907 +#: fileaccess.cpp:944 #, kde-format msgid "Writing file: %1" -msgstr "" +msgstr "正在写入文件：%1" -#: fileaccess.cpp:940 +#: fileaccess.cpp:977 #, kde-format msgid "Out of memory" msgstr "内存不足" -#: fileaccess.cpp:976 +#: fileaccess.cpp:1013 #, kde-format msgid "Making directory: %1" -msgstr "" +msgstr "正在建立目录：%1" -#: fileaccess.cpp:997 +#: fileaccess.cpp:1034 #, kde-format msgid "Removing directory: %1" -msgstr "" +msgstr "正在删除目录：%1" -#: fileaccess.cpp:1012 +#: fileaccess.cpp:1049 #, kde-format msgid "Removing file: %1" -msgstr "" +msgstr "正在删除文件：%1" -#: fileaccess.cpp:1028 +#: fileaccess.cpp:1065 #, kde-format msgid "Creating symbolic link: %1 -> %2" -msgstr "" +msgstr "正在创建符号链接：%1 -> %2" -#: fileaccess.cpp:1052 +#: fileaccess.cpp:1089 #, kde-format msgid "Renaming file: %1 -> %2" -msgstr "" +msgstr "正在重命名文件：%1 -> %2" -#: fileaccess.cpp:1086 +#: fileaccess.cpp:1123 #, kde-format msgid "Copying file: %1 -> %2" -msgstr "" +msgstr "正在复制文件：%1 -> %2" -#: fileaccess.cpp:1108 +#: fileaccess.cpp:1145 #, kde-format msgid "Reading directory: %1" -msgstr "" +msgstr "正在读取目录：%1" -#: fileaccess.cpp:1162 +#: fileaccess.cpp:1202 #, kde-format msgid "Listing directory: %1" -msgstr "" +msgstr "正在列出目录：%1" -#: kdiff3.cpp:181 +#: kdiff3.cpp:182 #, kde-format msgid "Current Configuration:" -msgstr "" +msgstr "当前配置：" -#: kdiff3.cpp:186 +#: kdiff3.cpp:187 #, kde-format msgid "Config Option Error:" -msgstr "" +msgstr "配置选项错误：" -#: kdiff3.cpp:240 +#: kdiff3.cpp:246 #, kde-format msgid "Option --auto used, but no output file specified." -msgstr "" +msgstr "已使用选项 --auto ，但没有指定输出文件。" -#: kdiff3.cpp:416 +#: kdiff3.cpp:405 #, kde-format msgid "Option --auto ignored for directory comparison." -msgstr "" +msgstr "比较目录时忽略选项 --auto。" -#: kdiff3.cpp:460 +#: kdiff3.cpp:449 #, kde-format msgid "Saving failed." msgstr "保存失败。" -#: kdiff3.cpp:496 pdiff.cpp:1098 +#: kdiff3.cpp:494 pdiff.cpp:1096 #, kde-format msgid "Opening of these files failed:" -msgstr "" +msgstr "打开文件失败:" -#: kdiff3.cpp:505 +#: kdiff3.cpp:503 pdiff.cpp:1105 #, kde-format -msgid "File Open Error" -msgstr "" +msgid "File open error" +msgstr "打开文件出错" -#: kdiff3.cpp:533 +#: kdiff3.cpp:532 #, kde-format msgid "Opens documents for comparison..." -msgstr "" +msgstr "打开文件进行比较..." -#: kdiff3.cpp:535 +#: kdiff3.cpp:534 #, kde-format msgid "Reload" msgstr "重新载入" -#: kdiff3.cpp:538 +#: kdiff3.cpp:537 #, kde-format msgid "Saves the merge result. All conflicts must be solved!" -msgstr "" +msgstr "保存合并结果。必须先解决全部冲突！" -#: kdiff3.cpp:540 +#: kdiff3.cpp:539 #, kde-format msgid "Saves the current document as..." -msgstr "" +msgstr "保存当前文档为..." -#: kdiff3.cpp:543 +#: kdiff3.cpp:542 #, kde-format msgid "Print the differences" -msgstr "" +msgstr "打印差异" -#: kdiff3.cpp:546 +#: kdiff3.cpp:545 #, kde-format msgid "Quits the application" msgstr "退出应用程序" -#: kdiff3.cpp:549 +#: kdiff3.cpp:548 #, kde-format msgid "Cuts the selected section and puts it to the clipboard" -msgstr "剪切所选部分并放到剪贴板" +msgstr "剪切所选部分到剪贴板" -#: kdiff3.cpp:552 +#: kdiff3.cpp:551 #, kde-format msgid "Copies the selected section to the clipboard" -msgstr "复制所选部分并放到剪贴板" +msgstr "复制选区到剪贴板" -#: kdiff3.cpp:554 +#: kdiff3.cpp:553 #, kde-format msgid "Pastes the clipboard contents to current position" -msgstr "粘贴剪贴板内容到实际位置" +msgstr "粘贴剪贴板内容到当前位置" -#: kdiff3.cpp:557 +#: kdiff3.cpp:556 #, kde-format msgid "Select everything in current window" -msgstr "" +msgstr "当前窗口全选" -#: kdiff3.cpp:560 +#: kdiff3.cpp:559 #, kde-format msgid "Search for a string" -msgstr "" +msgstr "搜索字符串" -#: kdiff3.cpp:562 +#: kdiff3.cpp:561 #, kde-format msgid "Search again for the string" -msgstr "" +msgstr "再次搜索该字符串" -#: kdiff3.cpp:567 +#: kdiff3.cpp:566 #, kde-format msgid "Enables/disables the statusbar" -msgstr "启用/禁止状态栏" +msgstr "启用/禁用状态栏" -#: kdiff3.cpp:571 +#: kdiff3.cpp:570 #, kde-format msgid "Configure KDiff3..." -msgstr "" +msgstr "配置 KDiff3..." -#: kdiff3.cpp:590 +#: kdiff3.cpp:589 #, kde-format msgid "Go to Current Delta" -msgstr "" +msgstr "转到当前增补" -#: kdiff3.cpp:590 +#: kdiff3.cpp:589 #, kde-format msgid "" "Current\n" "Delta" msgstr "" +"当前\n" +"增补" -#: kdiff3.cpp:592 +#: kdiff3.cpp:591 #, kde-format msgid "Go to First Delta" -msgstr "" +msgstr "转到第一个增补" -#: kdiff3.cpp:592 +#: kdiff3.cpp:591 #, kde-format msgid "" "First\n" "Delta" msgstr "" +"第一个\n" +"增补" -#: kdiff3.cpp:594 +#: kdiff3.cpp:593 #, kde-format msgid "Go to Last Delta" -msgstr "" +msgstr "转到最后一个增补" -#: kdiff3.cpp:594 +#: kdiff3.cpp:593 #, kde-format msgid "" "Last\n" "Delta" msgstr "" +"最后\n" +"增补" -#: kdiff3.cpp:596 +#: kdiff3.cpp:595 #, kde-format msgid "(Skips white space differences when \"Show White Space\" is disabled.)" -msgstr "" +msgstr "(禁用“显示空白字符”时跳过空白字符差异。)" -#: kdiff3.cpp:597 +#: kdiff3.cpp:596 #, kde-format msgid "" "(Does not skip white space differences even when \"Show White Space\" is " "disabled.)" msgstr "" -#: kdiff3.cpp:598 +#: kdiff3.cpp:597 #, kde-format msgid "Go to Previous Delta" -msgstr "" +msgstr "转到上一个增补" -#: kdiff3.cpp:598 +#: kdiff3.cpp:597 #, kde-format msgid "" "Prev\n" "Delta" msgstr "" +"上一个\n" +"增补" -#: kdiff3.cpp:600 +#: kdiff3.cpp:599 #, kde-format msgid "Go to Next Delta" -msgstr "" +msgstr "转到下一个增补" -#: kdiff3.cpp:600 +#: kdiff3.cpp:599 #, kde-format msgid "" "Next\n" "Delta" msgstr "" +"下一个\n" +"增补" -#: kdiff3.cpp:602 +#: kdiff3.cpp:601 #, kde-format msgid "Go to Previous Conflict" -msgstr "" +msgstr "转到前一个冲突" -#: kdiff3.cpp:602 +#: kdiff3.cpp:601 #, kde-format msgid "" "Prev\n" "Conflict" msgstr "" +"上一个\n" +"冲突" -#: kdiff3.cpp:604 +#: kdiff3.cpp:603 #, kde-format msgid "Go to Next Conflict" -msgstr "" +msgstr "转到下一个冲突" -#: kdiff3.cpp:604 +#: kdiff3.cpp:603 #, kde-format msgid "" "Next\n" "Conflict" msgstr "" +"下一个\n" +"冲突" -#: kdiff3.cpp:606 +#: kdiff3.cpp:605 #, kde-format msgid "Go to Previous Unsolved Conflict" -msgstr "" +msgstr "转到上一个未解决的冲突" -#: kdiff3.cpp:606 +#: kdiff3.cpp:605 #, kde-format msgid "" "Prev\n" "Unsolved" msgstr "" +"上一个\n" +"未解决" -#: kdiff3.cpp:608 +#: kdiff3.cpp:607 #, kde-format msgid "Go to Next Unsolved Conflict" -msgstr "" +msgstr "转到下一个未解决的冲突" -#: kdiff3.cpp:608 +#: kdiff3.cpp:607 #, kde-format msgid "" "Next\n" "Unsolved" msgstr "" +"下一个\n" +"未解决" -#: kdiff3.cpp:610 +#: kdiff3.cpp:609 #, kde-format msgid "Select Line(s) From A" -msgstr "" +msgstr "从 A 选择行" -#: kdiff3.cpp:610 +#: kdiff3.cpp:609 #, kde-format msgid "" "Choose\n" "A" msgstr "" +"选择\n" +"A" -#: kdiff3.cpp:611 +#: kdiff3.cpp:610 #, kde-format msgid "Select Line(s) From B" -msgstr "" +msgstr "从 B 选择行" -#: kdiff3.cpp:611 +#: kdiff3.cpp:610 #, kde-format msgid "" "Choose\n" "B" msgstr "" +"选择\n" +"B" -#: kdiff3.cpp:612 +#: kdiff3.cpp:611 #, kde-format msgid "Select Line(s) From C" -msgstr "" +msgstr "从 C 选择行" -#: kdiff3.cpp:612 +#: kdiff3.cpp:611 #, kde-format msgid "" "Choose\n" "C" msgstr "" +"选择\n" +"C" -#: kdiff3.cpp:613 +#: kdiff3.cpp:612 #, kde-format msgid "Automatically Go to Next Unsolved Conflict After Source Selection" -msgstr "" +msgstr "选择源内容后自动跳转至下一个未解决冲突" -#: kdiff3.cpp:613 +#: kdiff3.cpp:612 #, kde-format msgid "" "Auto\n" "Next" msgstr "" +"自动\n" +"下一个" -#: kdiff3.cpp:615 +#: kdiff3.cpp:614 #, kde-format msgid "Show Space && Tabulator Characters" -msgstr "" +msgstr "显示空格和制表符" -#: kdiff3.cpp:615 +#: kdiff3.cpp:614 #, kde-format msgid "" "White\n" "Characters" msgstr "" +"空白\n" +"字符" -#: kdiff3.cpp:616 +#: kdiff3.cpp:615 #, kde-format msgid "Show White Space" -msgstr "" +msgstr "显示空白字符" -#: kdiff3.cpp:616 +#: kdiff3.cpp:615 #, kde-format msgid "" "White\n" "Deltas" msgstr "" +"空白\n" +"增补" -#: kdiff3.cpp:618 +#: kdiff3.cpp:617 #, kde-format msgid "Show Line Numbers" -msgstr "" +msgstr "显示行号" -#: kdiff3.cpp:618 +#: kdiff3.cpp:617 #, kde-format msgid "" "Line\n" "Numbers" -msgstr "" +msgstr "行号" -#: kdiff3.cpp:620 +#: kdiff3.cpp:619 #, kde-format msgid "Automatically Solve Simple Conflicts" -msgstr "" +msgstr "自动解决简单冲突" -#: kdiff3.cpp:621 +#: kdiff3.cpp:620 #, kde-format msgid "Set Deltas to Conflicts" -msgstr "" +msgstr "设置增补为冲突" -#: kdiff3.cpp:622 +#: kdiff3.cpp:621 #, kde-format msgid "Run Regular Expression Auto Merge" -msgstr "" +msgstr "运行正则表达式自动合并" -#: kdiff3.cpp:623 +#: kdiff3.cpp:622 #, kde-format msgid "Automatically Solve History Conflicts" -msgstr "" +msgstr "自动解决历史冲突" -#: kdiff3.cpp:624 +#: kdiff3.cpp:623 #, kde-format msgid "Split Diff At Selection" -msgstr "" +msgstr "在选择时分割差异" -#: kdiff3.cpp:625 +#: kdiff3.cpp:624 #, kde-format msgid "Join Selected Diffs" -msgstr "" +msgstr "合并所选差异" -#: kdiff3.cpp:627 +#: kdiff3.cpp:626 #, kde-format msgid "Show Window A" -msgstr "" +msgstr "显示A窗口" -#: kdiff3.cpp:628 +#: kdiff3.cpp:627 #, kde-format msgid "Show Window B" -msgstr "" +msgstr "显示B窗口" -#: kdiff3.cpp:629 +#: kdiff3.cpp:628 #, kde-format msgid "Show Window C" -msgstr "" +msgstr "显示C窗口" -#: kdiff3.cpp:631 +#: kdiff3.cpp:630 #, kde-format msgid "Normal Overview" msgstr "" -#: kdiff3.cpp:632 +#: kdiff3.cpp:631 #, kde-format msgid "A vs. B Overview" msgstr "" -#: kdiff3.cpp:633 +#: kdiff3.cpp:632 #, kde-format msgid "A vs. C Overview" msgstr "" -#: kdiff3.cpp:634 +#: kdiff3.cpp:633 #, kde-format msgid "B vs. C Overview" msgstr "" -#: kdiff3.cpp:635 +#: kdiff3.cpp:634 #, kde-format msgid "Word Wrap Diff Windows" -msgstr "" +msgstr "比较窗口自动换行" -#: kdiff3.cpp:636 +#: kdiff3.cpp:635 #, kde-format msgid "Add Manual Diff Alignment" msgstr "" -#: kdiff3.cpp:637 +#: kdiff3.cpp:636 #, kde-format msgid "Clear All Manual Diff Alignments" msgstr "" -#: kdiff3.cpp:639 +#: kdiff3.cpp:638 #, kde-format msgid "Focus Next Window" -msgstr "" +msgstr "聚焦下一个窗口" -#: kdiff3.cpp:640 +#: kdiff3.cpp:639 #, kde-format msgid "Focus Prev Window" -msgstr "" +msgstr "聚焦上一个窗口" -#: kdiff3.cpp:641 +#: kdiff3.cpp:640 #, kde-format msgid "Toggle Split Orientation" -msgstr "" +msgstr "切换分割方向" -#: kdiff3.cpp:643 +#: kdiff3.cpp:642 #, kde-format msgid "Dir && Text Split Screen View" -msgstr "" +msgstr "目录和文本分割视图" -#: kdiff3.cpp:645 +#: kdiff3.cpp:644 #, kde-format msgid "Toggle Between Dir && Text View" -msgstr "" +msgstr "切换目录和文本视图" -#: kdiff3.cpp:697 pdiff.cpp:1909 +#: kdiff3.cpp:696 pdiff.cpp:1919 #, kde-format msgid "The merge result has not been saved." -msgstr "" +msgstr "合并结果未保存。" -#: kdiff3.cpp:699 +#: kdiff3.cpp:698 #, kde-format msgid "Save && Quit" -msgstr "" +msgstr "保存并退出" -#: kdiff3.cpp:700 +#: kdiff3.cpp:699 #, kde-format msgid "Quit Without Saving" -msgstr "" +msgstr "退出且不保存" -#: kdiff3.cpp:708 pdiff.cpp:1920 +#: kdiff3.cpp:707 pdiff.cpp:1930 #, kde-format msgid "Saving the merge result failed." -msgstr "" +msgstr "保存合并结果失败。" -#: kdiff3.cpp:719 pdiff.cpp:1032 +#: kdiff3.cpp:718 pdiff.cpp:1030 #, kde-format msgid "" "You are currently doing a directory merge. Are you sure, you want to abort?" -msgstr "" +msgstr "您目前正在进行目录合并。确定要中止吗？" -#: kdiff3.cpp:742 +#: kdiff3.cpp:741 #, kde-format msgid "Saving file..." msgstr "正在保存文件..." -#: kdiff3.cpp:759 +#: kdiff3.cpp:758 #, kde-format msgid "Saving file with a new filename..." msgstr "用新文件名保存文件..." -#: kdiff3.cpp:761 +#: kdiff3.cpp:760 #, kde-format msgid "Save As..." msgstr "另存为..." -#: kdiff3.cpp:820 +#: kdiff3.cpp:819 #, kde-format msgid "Printing not implemented." -msgstr "" +msgstr "打印功能尚未实现" -#: kdiff3.cpp:857 +#: kdiff3.cpp:858 #, kde-format msgid "Printing..." msgstr "正在打印..." -#: kdiff3.cpp:943 +#: kdiff3.cpp:948 #, kde-format msgid "Printing page %1 of %2" -msgstr "" +msgstr "正在打印第 %1 页，共 %2 页" -#: kdiff3.cpp:1000 +#: kdiff3.cpp:1006 #, kde-format msgid " (Selection)" msgstr " (选择)" -#: kdiff3.cpp:1027 +#: kdiff3.cpp:1034 #, kde-format msgid "Printing completed." -msgstr "" +msgstr "打印完成。" -#: kdiff3.cpp:1031 +#: kdiff3.cpp:1038 #, kde-format msgid "Printing aborted." -msgstr "" +msgstr "打印中止。" -#: kdiff3.cpp:1038 +#: kdiff3.cpp:1045 #, kde-format msgid "Exiting..." msgstr "正在退出..." -#: kdiff3.cpp:1049 +#: kdiff3.cpp:1056 #, kde-format msgid "Toggling toolbar..." msgstr "正在切换工具栏..." -#: kdiff3.cpp:1070 +#: kdiff3.cpp:1077 #, kde-format msgid "Toggle the statusbar..." msgstr "切换状态栏..." @@ -1527,10 +1592,10 @@ msgid "Joachim Eibl" msgstr "" -#: kdiff3_part.cpp:173 kdiff3_part.cpp:254 +#: kdiff3_part.cpp:174 kdiff3_part.cpp:255 #, kde-format msgid "Could not find files for comparison." -msgstr "" +msgstr "找不到要比较的文件。" #. i18n: ectx: Menu (movement) #: kdiff3_part.rc:4 @@ -1542,10 +1607,10 @@ #: kdiff3_part.rc:13 #, kde-format msgid "Configure KDiff3" -msgstr "" +msgstr "配置 KDiff3" #. i18n: ectx: ToolBar (mainToolBar) -#: kdiff3_part.rc:16 main.cpp:88 +#: kdiff3_part.rc:16 main.cpp:89 #, kde-format msgid "KDiff3" msgstr "KDiff3" @@ -1557,6 +1622,8 @@ "This usually happens due to an installation problem. Please read the README-" "file in the source package for details." msgstr "" +"无法初始化 KDiff 组件！\n" +"此问题的原因通常为安装错误。详情请阅读源码包内的 README 文件。" #. i18n: ectx: Menu (file) #: kdiff3_shell.rc:4 @@ -1568,37 +1635,37 @@ #: kdiff3_shell.rc:7 #, kde-format msgid "&Directory" -msgstr "&目录" +msgstr "目录(&D)" #. i18n: ectx: Menu (dir_current_merge_menu) #: kdiff3_shell.rc:30 #, kde-format msgid "Current Item Merge Operation" -msgstr "" +msgstr "当前项目合并操作" #. i18n: ectx: Menu (dir_current_sync_menu) #: kdiff3_shell.rc:38 #, kde-format msgid "Current Item Sync Operation" -msgstr "" +msgstr "当前项目同步操作" #. i18n: ectx: Menu (movement) #: kdiff3_shell.rc:50 #, kde-format msgid "M&ovement" -msgstr "" +msgstr "移动(&M)" #. i18n: ectx: Menu (diff) #: kdiff3_shell.rc:61 #, kde-format msgid "D&iffview" -msgstr "" +msgstr "比较视图(&D)" #. i18n: ectx: Menu (merge) #: kdiff3_shell.rc:73 #, kde-format msgid "M&erge" -msgstr "" +msgstr "合并(&M)" #. i18n: ectx: Menu (window) #: kdiff3_shell.rc:95 @@ -1612,198 +1679,205 @@ msgid "Main Toolbar" msgstr "主工具栏" -#: main.cpp:68 main.cpp:72 +#: main.cpp:69 main.cpp:73 #, kde-format msgid "Ignored. (User defined.)" -msgstr "" +msgstr "已忽略。（用户定义的）" -#: main.cpp:92 +#: main.cpp:93 #, kde-format msgid " (64 bit)" msgstr " (64 位)" -#: main.cpp:94 +#: main.cpp:95 #, kde-format msgid " (32 bit)" msgstr " (32 位)" -#: main.cpp:95 +#: main.cpp:96 #, kde-format msgid "Tool for Comparison and Merge of Files and Directories" -msgstr "" +msgstr "比较和合并文件、目录的工具" -#: main.cpp:96 +#: main.cpp:97 #, kde-format msgid "(c) 2002-2014 Joachim Eibl, (c) 2017 Michael Reeves KF5/Qt5 port" msgstr "" -#: main.cpp:112 +#: main.cpp:113 #, kde-format msgid "Merge the input." -msgstr "" +msgstr "合并输入。" -#: main.cpp:113 +#: main.cpp:114 #, kde-format msgid "Explicit base file. For compatibility with certain tools." msgstr "" -#: main.cpp:114 +#: main.cpp:115 #, kde-format msgid "Output file. Implies -m. E.g.: -o newfile.txt" msgstr "" -#: main.cpp:115 +#: main.cpp:116 #, kde-format msgid "Output file, again. (For compatibility with certain tools.)" msgstr "" -#: main.cpp:116 +#: main.cpp:118 #, kde-format msgid "No GUI if all conflicts are auto-solvable. (Needs -o file)" msgstr "" -#: main.cpp:117 +#: main.cpp:120 +#, kde-format +msgid "Ignored." +msgstr "已忽略。" + +#: main.cpp:122 #, kde-format msgid "Do not solve conflicts automatically." -msgstr "" +msgstr "不要自动解决冲突。" -#: main.cpp:118 +#: main.cpp:123 #, kde-format msgid "Visible name replacement for input file 1 (base)." msgstr "" -#: main.cpp:119 +#: main.cpp:124 #, kde-format msgid "Visible name replacement for input file 2." msgstr "" -#: main.cpp:120 +#: main.cpp:125 #, kde-format msgid "Visible name replacement for input file 3." msgstr "" -#: main.cpp:121 +#: main.cpp:126 #, kde-format msgid "Alternative visible name replacement. Supply this once for every input." msgstr "" -#: main.cpp:122 +#: main.cpp:127 #, kde-format msgid "" "Override a config setting. Use once for every setting. E.g.: --cs " "\"AutoAdvance=1\"" msgstr "" -#: main.cpp:123 +#: main.cpp:128 #, kde-format msgid "Show list of config settings and current values." msgstr "" -#: main.cpp:124 +#: main.cpp:129 #, kde-format msgid "Use a different config file." -msgstr "" +msgstr "使用另外的配置文件。" -#: main.cpp:127 +#: main.cpp:132 #, kde-format msgid "file1 to open (base, if not specified via --base)" msgstr "" -#: main.cpp:128 +#: main.cpp:133 #, kde-format msgid "file2 to open" -msgstr "" +msgstr "要打开的文件 2" -#: main.cpp:129 +#: main.cpp:134 #, kde-format msgid "file3 to open" -msgstr "" +msgstr "要打开的文件 3" -#: main.cpp:153 +#: main.cpp:158 #, kde-format msgid "See kdiff3 --help for supported options." -msgstr "" +msgstr "参见 kdiff3 --help 以了解支持的选项。" -#: mergeresultwindow.cpp:158 +#: mergeresultwindow.cpp:171 #, kde-format msgid "Choose A Everywhere" -msgstr "" +msgstr "总是选择 A" -#: mergeresultwindow.cpp:159 +#: mergeresultwindow.cpp:172 #, kde-format msgid "Choose B Everywhere" -msgstr "" +msgstr "总是选择 B" -#: mergeresultwindow.cpp:160 +#: mergeresultwindow.cpp:173 #, kde-format msgid "Choose C Everywhere" -msgstr "" +msgstr "总是选择 C" -#: mergeresultwindow.cpp:161 +#: mergeresultwindow.cpp:174 #, kde-format msgid "Choose A for All Unsolved Conflicts" -msgstr "" +msgstr "所有未解决冲突均选择 A" -#: mergeresultwindow.cpp:162 +#: mergeresultwindow.cpp:175 #, kde-format msgid "Choose B for All Unsolved Conflicts" -msgstr "" +msgstr "所有未解决冲突均选择 B" -#: mergeresultwindow.cpp:163 +#: mergeresultwindow.cpp:176 #, kde-format msgid "Choose C for All Unsolved Conflicts" -msgstr "" +msgstr "所有未解决冲突均选择 C" -#: mergeresultwindow.cpp:164 +#: mergeresultwindow.cpp:177 #, kde-format msgid "Choose A for All Unsolved Whitespace Conflicts" -msgstr "" +msgstr "所有未解决空白字符冲突均选择 A" -#: mergeresultwindow.cpp:165 +#: mergeresultwindow.cpp:178 #, kde-format msgid "Choose B for All Unsolved Whitespace Conflicts" -msgstr "" +msgstr "所有未解决空白字符冲突均选择 B" -#: mergeresultwindow.cpp:166 +#: mergeresultwindow.cpp:179 #, kde-format msgid "Choose C for All Unsolved Whitespace Conflicts" -msgstr "" +msgstr "所有未解决空白字符冲突均选择 C" -#: mergeresultwindow.cpp:176 +#: mergeresultwindow.cpp:204 #, kde-format msgid "Number of remaining unsolved conflicts: %1 (of which %2 are whitespace)" -msgstr "" +msgstr "剩余冲突数：%1(其中 %2 项为空白字符)" -#: mergeresultwindow.cpp:370 +#: mergeresultwindow.cpp:398 #, kde-format msgid "" "The output has been modified.\n" "If you continue your changes will be lost." msgstr "" +"已修改输出。\n" +"如果您继续您的更改将丢失。" -#: mergeresultwindow.cpp:936 pdiff.cpp:827 +#: mergeresultwindow.cpp:964 pdiff.cpp:817 #, kde-format msgid "All input files are binary equal." -msgstr "" +msgstr "全部输入文件二进制数据相同。" -#: mergeresultwindow.cpp:938 +#: mergeresultwindow.cpp:966 #, kde-format msgid "All input files contain the same text." -msgstr "" +msgstr "全部输入文件包含相同文本。" -#: mergeresultwindow.cpp:942 mergeresultwindow.cpp:946 -#: mergeresultwindow.cpp:950 pdiff.cpp:833 pdiff.cpp:837 pdiff.cpp:841 +#: mergeresultwindow.cpp:970 mergeresultwindow.cpp:974 +#: mergeresultwindow.cpp:978 pdiff.cpp:823 pdiff.cpp:827 pdiff.cpp:831 #, kde-format msgid "Files %1 and %2 are binary equal.\n" -msgstr "" +msgstr "文件 %1 和 %2 二进制数据相同。\n" -#: mergeresultwindow.cpp:944 mergeresultwindow.cpp:948 -#: mergeresultwindow.cpp:952 +#: mergeresultwindow.cpp:972 mergeresultwindow.cpp:976 +#: mergeresultwindow.cpp:980 #, kde-format msgid "Files %1 and %2 have equal text.\n" -msgstr "" +msgstr "文件 %1 和 %2 文本相同。\n" -#: mergeresultwindow.cpp:958 +#: mergeresultwindow.cpp:986 #, kde-format msgid "" "Total number of conflicts: %1\n" @@ -1811,40 +1885,44 @@ "Nr of unsolved conflicts: %3\n" "%4" msgstr "" +"冲突总数：%1\n" +"自动解决冲突数: %2\n" +"未解决冲突数: %3\n" +"%4" -#: mergeresultwindow.cpp:964 +#: mergeresultwindow.cpp:992 #, kde-format msgid "Conflicts" -msgstr "处冲突" +msgstr "冲突" -#: mergeresultwindow.cpp:1873 +#: mergeresultwindow.cpp:1901 #, kde-format msgid "" msgstr "" -#: mergeresultwindow.cpp:1881 +#: mergeresultwindow.cpp:1909 #, kde-format msgid "" msgstr "" -#: mergeresultwindow.cpp:1883 mergeresultwindow.cpp:2755 +#: mergeresultwindow.cpp:1911 mergeresultwindow.cpp:2783 #, kde-format msgid "" -msgstr "" +msgstr "<合并冲突>" -#: mergeresultwindow.cpp:2967 +#: mergeresultwindow.cpp:2995 #, kde-format msgid "" "Not all conflicts are solved yet.\n" "File not saved." msgstr "" -#: mergeresultwindow.cpp:2969 mergeresultwindow.cpp:2978 +#: mergeresultwindow.cpp:2997 mergeresultwindow.cpp:3006 #, kde-format msgid "Conflicts Left" -msgstr "" +msgstr "剩余冲突" -#: mergeresultwindow.cpp:2976 +#: mergeresultwindow.cpp:3004 #, kde-format msgid "" "There is a line end style conflict. Please choose the line end style " @@ -1852,7 +1930,7 @@ "File not saved." msgstr "" -#: mergeresultwindow.cpp:2990 +#: mergeresultwindow.cpp:3018 #, kde-format msgid "" "\n" @@ -1860,267 +1938,272 @@ "Creating backup failed. File not saved." msgstr "" -#: mergeresultwindow.cpp:2990 mergeresultwindow.cpp:3038 +#: mergeresultwindow.cpp:3018 mergeresultwindow.cpp:3066 #, kde-format msgid "File Save Error" msgstr "文件保存错误" -#: mergeresultwindow.cpp:3038 +#: mergeresultwindow.cpp:3066 #, kde-format msgid "Error while writing." -msgstr "" +msgstr "写入时出错。" -#: mergeresultwindow.cpp:3110 +#: mergeresultwindow.cpp:3138 #, kde-format msgid "Output:" msgstr "输出：" -#: mergeresultwindow.cpp:3123 mergeresultwindow.cpp:3315 +#: mergeresultwindow.cpp:3151 mergeresultwindow.cpp:3343 #, kde-format msgid "[Modified]" -msgstr "" +msgstr "[已修改]" -#: mergeresultwindow.cpp:3130 +#: mergeresultwindow.cpp:3158 #, kde-format msgid "Encoding for saving:" -msgstr "" +msgstr "保存所用编码：" -#: mergeresultwindow.cpp:3230 +#: mergeresultwindow.cpp:3258 #, kde-format msgid "Conflict" msgstr "冲突" -#: mergeresultwindow.cpp:3262 +#: mergeresultwindow.cpp:3290 #, kde-format msgid "Codec from A: %1" msgstr "" -#: mergeresultwindow.cpp:3264 +#: mergeresultwindow.cpp:3292 #, kde-format msgid "Codec from B: %1" msgstr "" -#: mergeresultwindow.cpp:3266 +#: mergeresultwindow.cpp:3294 #, kde-format msgid "Codec from C: %1" msgstr "" -#: optiondialog.cpp:119 +#: optiondialog.cpp:121 #, kde-format msgid "Change Font" msgstr "更改字体" -#: optiondialog.cpp:135 optiondialog.cpp:145 +#: optiondialog.cpp:137 optiondialog.cpp:147 #, kde-format msgid "" "Font: %1, %2, %3\n" "\n" "Example:" msgstr "" +"字体：%1, %2, %3\n" +"\n" +"示例：" -#: optiondialog.cpp:388 +#: optiondialog.cpp:390 #, kde-format msgid "Unicode" msgstr "Unicode" -#: optiondialog.cpp:389 +#: optiondialog.cpp:391 #, kde-format msgid "Latin1" msgstr "Latin1" -#: optiondialog.cpp:408 +#: optiondialog.cpp:410 #, kde-format msgid "Change this if non-ASCII characters are not displayed correctly." -msgstr "" +msgstr "如果非 ASCII 字符不能正确显示，请更改此选项。" -#: optiondialog.cpp:491 +#: optiondialog.cpp:495 #, kde-format msgid "Configure" msgstr "配置" -#: optiondialog.cpp:568 +#: optiondialog.cpp:573 #, kde-format msgid "Font" msgstr "字体" -#: optiondialog.cpp:570 +#: optiondialog.cpp:575 #, kde-format msgid "Editor & Diff Output Font" -msgstr "" +msgstr "编辑器和比较输出字体" -#: optiondialog.cpp:589 +#: optiondialog.cpp:594 #, kde-format msgid "Application font" -msgstr "" +msgstr "应用程序字体" -#: optiondialog.cpp:594 +#: optiondialog.cpp:599 #, kde-format msgid "File view font" -msgstr "" +msgstr "文件视图字体" -#: optiondialog.cpp:613 +#: optiondialog.cpp:618 #, kde-format msgctxt "Title for color settings page" msgid "Color" -msgstr "彩色" +msgstr "颜色" -#: optiondialog.cpp:614 +#: optiondialog.cpp:619 #, kde-format msgid "Colors Settings" -msgstr "" +msgstr "颜色设置" -#: optiondialog.cpp:631 +#: optiondialog.cpp:644 #, kde-format msgid "Editor and Diff Views:" -msgstr "" +msgstr "编辑器和比较视图：" -#: optiondialog.cpp:639 +#: optiondialog.cpp:652 #, kde-format msgid "Foreground color:" -msgstr "前景颜色：" +msgstr "前景色：" -#: optiondialog.cpp:647 +#: optiondialog.cpp:660 #, kde-format msgid "Background color:" msgstr "背景色：" -#: optiondialog.cpp:657 +#: optiondialog.cpp:670 #, kde-format msgid "Diff background color:" -msgstr "" +msgstr "差异背景色：" -#: optiondialog.cpp:666 +#: optiondialog.cpp:679 #, kde-format msgid "Color A:" -msgstr "" +msgstr "A颜色：" -#: optiondialog.cpp:675 +#: optiondialog.cpp:688 #, kde-format msgid "Color B:" -msgstr "" +msgstr "B颜色：" -#: optiondialog.cpp:684 +#: optiondialog.cpp:697 #, kde-format msgid "Color C:" -msgstr "" +msgstr "C颜色：" -#: optiondialog.cpp:692 +#: optiondialog.cpp:705 #, kde-format msgid "Conflict color:" -msgstr "" +msgstr "冲突颜色：" -#: optiondialog.cpp:701 +#: optiondialog.cpp:714 #, kde-format msgid "Current range background color:" -msgstr "" +msgstr "选区背景色：" -#: optiondialog.cpp:710 +#: optiondialog.cpp:723 #, kde-format msgid "Current range diff background color:" -msgstr "" +msgstr "选区差异背景色：" -#: optiondialog.cpp:718 +#: optiondialog.cpp:731 #, kde-format msgid "Color for manually aligned difference ranges:" -msgstr "" +msgstr "手动对齐差异区域颜色：" -#: optiondialog.cpp:725 +#: optiondialog.cpp:738 #, kde-format msgid "Directory Comparison View:" -msgstr "" +msgstr "目录比较视图：" -#: optiondialog.cpp:731 +#: optiondialog.cpp:744 #, kde-format msgid "Newest file color:" -msgstr "" +msgstr "最新文件颜色：" -#: optiondialog.cpp:736 +#: optiondialog.cpp:749 #, kde-format msgid "" "Changing this color will only be effective when starting the next directory " "comparison." -msgstr "" +msgstr "颜色修改将在下次目录比较时生效。" -#: optiondialog.cpp:741 +#: optiondialog.cpp:754 #, kde-format msgid "Oldest file color:" -msgstr "" +msgstr "最旧文件颜色：" -#: optiondialog.cpp:750 +#: optiondialog.cpp:763 #, kde-format msgid "Middle age file color:" msgstr "" -#: optiondialog.cpp:759 +#: optiondialog.cpp:772 #, kde-format msgid "Color for missing files:" -msgstr "" +msgstr "缺失文件的颜色：" -#: optiondialog.cpp:773 +#: optiondialog.cpp:786 #, kde-format msgid "Editor" msgstr "编辑" -#: optiondialog.cpp:774 +#: optiondialog.cpp:787 #, kde-format msgid "Editor Behavior" -msgstr "" +msgstr "编辑器行为" -#: optiondialog.cpp:787 +#: optiondialog.cpp:809 #, kde-format msgid "Tab inserts spaces" -msgstr "" +msgstr "空格代替制表符" -#: optiondialog.cpp:791 +#: optiondialog.cpp:813 #, kde-format msgid "" "On: Pressing tab generates the appropriate number of spaces.\n" "Off: A tab character will be inserted." msgstr "" -#: optiondialog.cpp:796 +#: optiondialog.cpp:818 #, kde-format msgid "Tab size:" -msgstr "" +msgstr "制表符大小：" -#: optiondialog.cpp:803 +#: optiondialog.cpp:825 #, kde-format msgid "Auto indentation" msgstr "自动缩进" -#: optiondialog.cpp:807 +#: optiondialog.cpp:829 #, kde-format msgid "On: The indentation of the previous line is used for a new line.\n" msgstr "" -#: optiondialog.cpp:810 +#: optiondialog.cpp:832 #, kde-format msgid "Auto copy selection" -msgstr "" +msgstr "自动复制选区" -#: optiondialog.cpp:814 +#: optiondialog.cpp:836 #, kde-format msgid "" "On: Any selection is immediately written to the clipboard.\n" "Off: You must explicitly copy e.g. via Ctrl-C." msgstr "" +"开：选择的内容会复制到剪贴板。\n" +"关：执行明确复制操作例如 Ctrl-C 才会复制到剪贴板。" -#: optiondialog.cpp:829 +#: optiondialog.cpp:851 #, kde-format msgid "" "Sets the line endings for when an edited file is saved.\n" "DOS/Windows: CR+LF; UNIX: LF; with CR=0D, LF=0A" msgstr "" -#: optiondialog.cpp:839 +#: optiondialog.cpp:861 #, kde-format msgid "Diff" msgstr "差别" -#: optiondialog.cpp:840 +#: optiondialog.cpp:862 #, kde-format msgid "Diff Settings" -msgstr "Diff 设置" +msgstr "差异设置" #. i18n("Preserve carriage return"), false, "PreserveCarriageReturn", &m_options.m_bPreserveCarriageReturn, page, this ); #. addOptionItem(pPreserveCarriageReturn); @@ -2131,146 +2214,161 @@ #. ); #. ++line; #. -#: optiondialog.cpp:865 +#: optiondialog.cpp:896 #, kde-format msgid "Ignore numbers (treat as white space)" -msgstr "" +msgstr "忽略数字(作为空白字符处理)" -#: optiondialog.cpp:869 +#: optiondialog.cpp:900 #, kde-format msgid "" "Ignore number characters during line matching phase. (Similar to Ignore " "white space.)\n" "Might help to compare files with numeric data." msgstr "" +"在行匹配阶段忽略数字字符。(与忽略空白字符相似)\n" +"可能对于比较带数值数据的文件有帮助。" -#: optiondialog.cpp:873 +#: optiondialog.cpp:904 #, kde-format msgid "Ignore C/C++ comments (treat as white space)" -msgstr "" +msgstr "忽略 C/C++ 注释 (作为空白字符处理)" -#: optiondialog.cpp:876 +#: optiondialog.cpp:907 #, kde-format msgid "Treat C/C++ comments like white space." -msgstr "" +msgstr "C/C++ 注释作为空白字符处理。" -#: optiondialog.cpp:879 +#: optiondialog.cpp:910 #, kde-format msgid "Ignore case (treat as white space)" -msgstr "" +msgstr "忽略大小写(作为空白字符处理)" -#: optiondialog.cpp:883 +#: optiondialog.cpp:914 #, kde-format msgid "Treat case differences like white space changes. ('a'<=>'A')" -msgstr "" +msgstr "将大小写差异作为空白字符改动处理。('a'<=>'A')" -#: optiondialog.cpp:886 +#: optiondialog.cpp:917 #, kde-format msgid "Preprocessor command:" -msgstr "" +msgstr "预处理命令：" -#: optiondialog.cpp:891 +#: optiondialog.cpp:922 #, kde-format msgid "User defined pre-processing. (See the docs for details.)" -msgstr "" +msgstr "用户定义的预处理。(详情见文档)" -#: optiondialog.cpp:894 +#: optiondialog.cpp:925 #, kde-format msgid "Line-matching preprocessor command:" -msgstr "" +msgstr "行匹配预处理命令：" -#: optiondialog.cpp:899 +#: optiondialog.cpp:930 #, kde-format msgid "" "This pre-processor is only used during line matching.\n" "(See the docs for details.)" msgstr "" +"此预处理仅在行匹配时使用。\n" +"(详情参见文档)" -#: optiondialog.cpp:902 +#: optiondialog.cpp:933 #, kde-format msgid "Try hard (slower)" msgstr "" -#: optiondialog.cpp:906 +#: optiondialog.cpp:937 #, kde-format msgid "" "Enables the --minimal option for the external diff.\n" "The analysis of big files will be much slower." msgstr "" +"为外部比较程序启用 --minimal 选项。\n" +"大文件的分析会慢得多。" -#: optiondialog.cpp:910 +#: optiondialog.cpp:941 #, kde-format msgid "Align B and C for 3 input files" -msgstr "" +msgstr "3路比较时对齐B和C" -#: optiondialog.cpp:914 +#: optiondialog.cpp:945 #, kde-format msgid "" "Try to align B and C when comparing or merging three input files.\n" "Not recommended for merging because merge might get more complicated.\n" "(Default is off.)" msgstr "" +"进行3路比较合并时尝试对齐B与C。\n" +"合并时不推荐，因为会导致情况更复杂。\n" +"(默认禁用)" -#: optiondialog.cpp:926 +#: optiondialog.cpp:956 #, kde-format -msgid "Merge Settings" +msgctxt "Settings page" +msgid "Merge" msgstr "" -#: optiondialog.cpp:940 +#: optiondialog.cpp:957 +#, kde-format +msgid "Merge Settings" +msgstr "合并设置" + +#: optiondialog.cpp:980 #, kde-format msgid "Auto advance delay (ms):" -msgstr "" +msgstr "自动前进延迟(毫秒)：" -#: optiondialog.cpp:946 +#: optiondialog.cpp:986 #, kde-format 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 "" -#: optiondialog.cpp:950 +#: optiondialog.cpp:990 #, kde-format msgid "Show info dialogs" -msgstr "" +msgstr "显示信息对话框" -#: optiondialog.cpp:953 +#: optiondialog.cpp:993 #, kde-format msgid "Show a dialog with information about the number of conflicts." -msgstr "" +msgstr "显示关于冲突数量信息的对话框" -#: optiondialog.cpp:956 +#: optiondialog.cpp:996 #, kde-format msgid "White space 2-file merge default:" msgstr "" -#: optiondialog.cpp:961 optiondialog.cpp:974 +#: optiondialog.cpp:1001 optiondialog.cpp:1014 #, kde-format msgid "Manual Choice" -msgstr "" +msgstr "手动选择" -#: optiondialog.cpp:965 optiondialog.cpp:979 +#: optiondialog.cpp:1005 optiondialog.cpp:1019 #, kde-format msgid "" "Allow the merge algorithm to automatically select an input for white-space-" "only changes." msgstr "" -#: optiondialog.cpp:969 +#: optiondialog.cpp:1009 #, kde-format msgid "White space 3-file merge default:" msgstr "" -#: optiondialog.cpp:983 +#: optiondialog.cpp:1023 #, kde-format msgid "Automatic Merge Regular Expression" -msgstr "" +msgstr "自动合并正则表达式" -#: optiondialog.cpp:991 smalldialogs.cpp:449 +#: optiondialog.cpp:1031 smalldialogs.cpp:459 #, kde-format msgid "Auto merge regular expression:" -msgstr "" +msgstr "自动合并正则表达式：" -#: optiondialog.cpp:996 +#: optiondialog.cpp:1036 #, kde-format msgid "" "Regular expression for lines where KDiff3 should automatically choose one " @@ -2279,29 +2377,29 @@ "- if available - C, otherwise B will be chosen." msgstr "" -#: optiondialog.cpp:1002 +#: optiondialog.cpp:1042 #, kde-format msgid "Run regular expression auto merge on merge start" -msgstr "" +msgstr "合并开始时运行正则表达式自动合并" -#: optiondialog.cpp:1005 +#: optiondialog.cpp:1045 #, kde-format msgid "" "Run the merge for auto merge regular expressions\n" "immediately when a merge starts.\n" msgstr "" -#: optiondialog.cpp:1010 +#: optiondialog.cpp:1050 #, kde-format msgid "Version Control History Merging" -msgstr "" +msgstr "版本控制历史合并" -#: optiondialog.cpp:1018 smalldialogs.cpp:476 +#: optiondialog.cpp:1058 smalldialogs.cpp:486 #, kde-format msgid "History start regular expression:" msgstr "" -#: optiondialog.cpp:1023 +#: optiondialog.cpp:1063 #, kde-format msgid "" "Regular expression for the start of the version control history entry.\n" @@ -2309,12 +2407,12 @@ "Default value: \".*\\$Log.*\\$.*\"" msgstr "" -#: optiondialog.cpp:1029 smalldialogs.cpp:504 +#: optiondialog.cpp:1069 smalldialogs.cpp:514 #, kde-format msgid "History entry start regular expression:" msgstr "" -#: optiondialog.cpp:1042 +#: optiondialog.cpp:1082 #, kde-format msgid "" "A version control history entry consists of several lines.\n" @@ -2326,22 +2424,22 @@ "See the documentation for details." msgstr "" -#: optiondialog.cpp:1050 +#: optiondialog.cpp:1090 #, kde-format msgid "History merge sorting" -msgstr "" +msgstr "历史合并排序" -#: optiondialog.cpp:1053 +#: optiondialog.cpp:1093 #, kde-format msgid "Sort version control history by a key." msgstr "" -#: optiondialog.cpp:1063 +#: optiondialog.cpp:1103 #, kde-format msgid "History entry start sort key order:" -msgstr "" +msgstr "历史条目开始排序关键字顺序：" -#: optiondialog.cpp:1068 +#: optiondialog.cpp:1108 #, kde-format msgid "" "Each pair of parentheses used in the regular expression for the history " @@ -2352,38 +2450,43 @@ "If left empty, then no sorting will be done.\n" "See the documentation for details." msgstr "" +"历史开始条目的正则表达式中括号对将关键字分组能被用于排序。\n" +"指定关键字列表(使用数字，按出现顺序从1开始)使用 ',' 作为分隔符(例如 " +"\"4,5,6,1,2,3,7\")。\n" +"如果留空则不排序。\n" +"详情参见帮助文档。" -#: optiondialog.cpp:1079 +#: optiondialog.cpp:1119 #, kde-format msgid "Merge version control history on merge start" -msgstr "" +msgstr "开始合并时合并版本控制历史" -#: optiondialog.cpp:1082 +#: optiondialog.cpp:1122 #, kde-format msgid "Run version control history automerge on merge start." -msgstr "" +msgstr "开始合并时运行版本控制历史自动合并。" -#: optiondialog.cpp:1086 +#: optiondialog.cpp:1126 #, kde-format msgid "Max number of history entries:" -msgstr "" +msgstr "最大历史记录数：" -#: optiondialog.cpp:1090 +#: optiondialog.cpp:1130 #, kde-format msgid "Cut off after specified number. Use -1 for infinite number of entries." msgstr "" -#: optiondialog.cpp:1094 +#: optiondialog.cpp:1134 #, kde-format msgid "Test your regular expressions" -msgstr "" +msgstr "测试您的正则表达式" -#: optiondialog.cpp:1099 +#: optiondialog.cpp:1139 #, kde-format msgid "Irrelevant merge command:" msgstr "" -#: optiondialog.cpp:1104 +#: optiondialog.cpp:1144 #, kde-format msgid "" "If specified this script is run after automerge\n" @@ -2391,12 +2494,12 @@ "Called with the parameters: filename1 filename2 filename3" msgstr "" -#: optiondialog.cpp:1109 +#: optiondialog.cpp:1149 #, kde-format msgid "Auto save and quit on merge without conflicts" -msgstr "" +msgstr "合并无冲突时自动保存并退出" -#: optiondialog.cpp:1113 +#: optiondialog.cpp:1153 #, kde-format msgid "" "If KDiff3 was started for a file-merge from the command line and all\n" @@ -2404,113 +2507,129 @@ "quit.\n" "(Similar to command line option \"--auto\".)" msgstr "" +"如果从命令行调用 KDiff3 合并文件并且所有\n" +"冲突都可以自动解决，那么自动保存文件并退出。\n" +"(类似命令行选项\"--auto\")" -#: optiondialog.cpp:1124 optiondialog.cpp:1125 +#: optiondialog.cpp:1164 optiondialog.cpp:1165 #, kde-format msgid "Directory" msgstr "目录" -#: optiondialog.cpp:1137 +#: optiondialog.cpp:1185 #, kde-format msgid "Recursive directories" -msgstr "" +msgstr "递归目录" -#: optiondialog.cpp:1140 +#: optiondialog.cpp:1188 #, kde-format msgid "Whether to analyze subdirectories or not." msgstr "" -#: optiondialog.cpp:1142 +#: optiondialog.cpp:1190 #, kde-format msgid "File pattern(s):" -msgstr "" +msgstr "文件名表达式：" -#: optiondialog.cpp:1148 +#: optiondialog.cpp:1196 #, kde-format msgid "" "Pattern(s) of files to be analyzed. \n" "Wildcards: '*' and '?'\n" "Several Patterns can be specified by using the separator: ';'" msgstr "" +"要分析的文件名的表达式。\n" +"通配符：'*' 和 '?'\n" +"可以使用分隔符：分号 ';' 来指定多个表达式。" -#: optiondialog.cpp:1153 +#: optiondialog.cpp:1201 #, kde-format msgid "File-anti-pattern(s):" -msgstr "" +msgstr "排除文件表达式：" -#: optiondialog.cpp:1159 +#: optiondialog.cpp:1207 #, kde-format msgid "" "Pattern(s) of files to be excluded from analysis. \n" "Wildcards: '*' and '?'\n" "Several Patterns can be specified by using the separator: ';'" msgstr "" +"要排除分析的文件名的表达式。\n" +"通配符：'*' 和 '?'\n" +"可以使用分隔符：分号 ';' 来指定多个表达式。" -#: optiondialog.cpp:1164 +#: optiondialog.cpp:1212 #, kde-format msgid "Dir-anti-pattern(s):" -msgstr "" +msgstr "排除目录表达式：" -#: optiondialog.cpp:1170 +#: optiondialog.cpp:1218 #, kde-format msgid "" "Pattern(s) of directories to be excluded from analysis. \n" "Wildcards: '*' and '?'\n" "Several Patterns can be specified by using the separator: ';'" msgstr "" +"要排除分析的目录名的表达式。\n" +"通配符：'*' 和 '?'\n" +"可以使用分隔符：分号 ';' 来指定多个表达式。" -#: optiondialog.cpp:1175 +#: optiondialog.cpp:1223 #, kde-format msgid "Use .cvsignore" -msgstr "" +msgstr "使用 .cvsignore" -#: optiondialog.cpp:1179 +#: optiondialog.cpp:1227 #, kde-format msgid "" "Extends the antipattern to anything that would be ignored by CVS.\n" "Via local \".cvsignore\" files this can be directory specific." msgstr "" -#: optiondialog.cpp:1183 +#: optiondialog.cpp:1231 #, kde-format msgid "Find hidden files and directories" -msgstr "" +msgstr "查找隐藏文件和目录" -#: optiondialog.cpp:1186 +#: optiondialog.cpp:1234 #, kde-format msgid "Finds hidden files and directories." -msgstr "" +msgstr "查找隐藏文件和目录。" -#: optiondialog.cpp:1189 +#: optiondialog.cpp:1237 #, kde-format msgid "Follow file links" -msgstr "" +msgstr "跟随文件链接" -#: optiondialog.cpp:1193 +#: optiondialog.cpp:1241 #, kde-format msgid "" "On: Compare the file the link points to.\n" "Off: Compare the links." msgstr "" +"启用：比较链接指向的文件。\n" +"禁用：比较链接。" -#: optiondialog.cpp:1197 +#: optiondialog.cpp:1245 #, kde-format msgid "Follow directory links" -msgstr "" +msgstr "跟随目录链接" -#: optiondialog.cpp:1201 +#: optiondialog.cpp:1249 #, kde-format msgid "" "On: Compare the directory the link points to.\n" "Off: Compare the links." msgstr "" +"打开：比较链接指向的目录。\n" +"关闭：比较链接。" -#: optiondialog.cpp:1210 +#: optiondialog.cpp:1258 #, kde-format msgid "Case sensitive filename comparison" -msgstr "" +msgstr "文件名区分大小写" -#: optiondialog.cpp:1214 +#: optiondialog.cpp:1262 #, kde-format msgid "" "The directory comparison will compare files or directories when their names " @@ -2518,64 +2637,72 @@ "Set this option if the case of the names must match. (Default for Windows is " "off, otherwise on.)" msgstr "" +"目录比较功能会比较名字相同的文件或目录。\n" +"如果区分大小写，启用此选项。（Windows 上默认关闭，其他操作系统默认开启）" -#: optiondialog.cpp:1218 +#: optiondialog.cpp:1266 #, kde-format msgid "Unfold all subdirectories on load" -msgstr "" +msgstr "加载时展开所有子目录" -#: optiondialog.cpp:1222 +#: optiondialog.cpp:1270 #, kde-format msgid "" "On: Unfold all subdirectories when starting a directory diff.\n" "Off: Leave subdirectories folded." msgstr "" +"启用：比较目录时展开所有子目录。\n" +"禁用：保持子目录折叠。" -#: optiondialog.cpp:1226 +#: optiondialog.cpp:1274 #, kde-format msgid "Skip directory status report" -msgstr "" +msgstr "跳过目录状态报告" -#: optiondialog.cpp:1230 +#: optiondialog.cpp:1278 #, kde-format msgid "" "On: Do not show the Directory Comparison Status.\n" "Off: Show the status dialog on start." msgstr "" +"启用：不要显示目录比较状态。\n" +"关闭：开始时显示状态对话框。" -#: optiondialog.cpp:1234 +#: optiondialog.cpp:1282 #, kde-format msgid "File Comparison Mode" -msgstr "" +msgstr "文件比较模式" -#: optiondialog.cpp:1239 +#: optiondialog.cpp:1287 #, kde-format msgid "Binary comparison" -msgstr "" +msgstr "二进制比较" -#: optiondialog.cpp:1241 +#: optiondialog.cpp:1289 #, kde-format msgid "Binary comparison of each file. (Default)" -msgstr "" +msgstr "用二进制模式比较每个文件。(默认)" -#: optiondialog.cpp:1244 +#: optiondialog.cpp:1292 #, kde-format msgid "Full analysis" -msgstr "" +msgstr "完全分析" -#: optiondialog.cpp:1246 +#: optiondialog.cpp:1294 #, kde-format msgid "" "Do a full analysis and show statistics information in extra columns.\n" "(Slower than a binary comparison, much slower for binary files.)" msgstr "" +"进行完全分析并且在额外的列里显示统计信息。\n" +"(比二进制模式慢，对于二进制文件该模式更慢。)" -#: optiondialog.cpp:1250 +#: optiondialog.cpp:1298 #, kde-format msgid "Trust the size and modification date (unsafe)" -msgstr "" +msgstr "信任文件大小和修改日期(不安全)" -#: optiondialog.cpp:1252 +#: optiondialog.cpp:1300 #, kde-format msgid "" "Assume that files are equal if the modification date and file length are " @@ -2584,15 +2711,18 @@ "different.\n" "Useful for big directories or slow networks." msgstr "" +"如果修改日期和文件长度相同，则认为文件相同。\n" +"具有相同内容但修改日期不同的文件将被视作不同。\n" +"对于大目录或较慢的网络有用。" -#: optiondialog.cpp:1257 +#: optiondialog.cpp:1305 #, kde-format msgid "" "Trust the size and date, but use binary comparison if date does not match " "(unsafe)" -msgstr "" +msgstr "信任文件大小和修改日期，但日期不相同时使用二进制比较(不安全)" -#: optiondialog.cpp:1259 +#: optiondialog.cpp:1307 #, kde-format msgid "" "Assume that files are equal if the modification date and file length are " @@ -2600,26 +2730,31 @@ "If the dates are not equal but the sizes are, use binary comparison.\n" "Useful for big directories or slow networks." msgstr "" +"如果修改日期和文件长度相同，则认为文件相同。\n" +"如果修改日期不相同而文件长度相同，则使用二进制比较。\n" +"对于大目录或较慢的网络有用。" -#: optiondialog.cpp:1264 +#: optiondialog.cpp:1312 #, kde-format msgid "Trust the size (unsafe)" -msgstr "" +msgstr "信任文件大小(不安全)" -#: optiondialog.cpp:1266 +#: optiondialog.cpp:1314 #, kde-format msgid "" "Assume that files are equal if their file lengths are equal.\n" "Useful for big directories or slow networks when the date is modified during " "download." msgstr "" +"如果文件长度相同则认为文件相同。\n" +"对于大目录、较慢网络、文件日期因各种原因被修改的情况有用。" -#: optiondialog.cpp:1273 +#: optiondialog.cpp:1321 #, kde-format msgid "Synchronize directories" -msgstr "" +msgstr "同步目录" -#: optiondialog.cpp:1277 +#: optiondialog.cpp:1325 #, kde-format msgid "" "Offers to store files in both directories so that\n" @@ -2627,71 +2762,78 @@ "Works only when comparing two directories without specifying a destination." msgstr "" -#: optiondialog.cpp:1283 +#: optiondialog.cpp:1331 #, kde-format msgid "White space differences considered equal" -msgstr "" +msgstr "忽略空白字符差异" -#: optiondialog.cpp:1287 +#: optiondialog.cpp:1335 #, kde-format msgid "" "If files differ only by white space consider them equal.\n" "This is only active when full analysis is chosen." msgstr "" +"如果文件只在空白字符上有差异，则认为它们相同。\n" +"仅当选择完全分析时此选项才激活。" -#: optiondialog.cpp:1293 +#: optiondialog.cpp:1341 #, kde-format msgid "Copy newer instead of merging (unsafe)" -msgstr "" +msgstr "复制较新的文件而不合并(不安全)" -#: optiondialog.cpp:1297 +#: optiondialog.cpp:1345 #, kde-format msgid "" "Do not look inside, just take the newer file.\n" "(Use this only if you know what you are doing!)\n" "Only effective when comparing two directories." msgstr "" +"不比较文件内容，仅取较新的文件。\n" +"（仅在知道自己在做什么时再选此项！）\n" +"仅在比较两个目录时有效。" -#: optiondialog.cpp:1302 +#: optiondialog.cpp:1350 #, kde-format msgid "Backup files (.orig)" -msgstr "" +msgstr "备份文件 (.orig)" -#: optiondialog.cpp:1306 +#: optiondialog.cpp:1354 #, kde-format msgid "" "If 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 "" +msgstr "保存文件会覆盖旧文件时，旧文件将被附加“.orig”扩展名而不是被删除。" -#: optiondialog.cpp:1382 optiondialog.cpp:1383 +#: optiondialog.cpp:1430 optiondialog.cpp:1431 #, kde-format msgid "Regional Settings" msgstr "区域设置" -#: optiondialog.cpp:1397 +#: optiondialog.cpp:1454 #, kde-format msgid "Use the same encoding for everything:" -msgstr "" +msgstr "所有内容使用同一编码：" -#: optiondialog.cpp:1401 +#: optiondialog.cpp:1458 #, kde-format msgid "" "Enable this allows to change all encodings by changing the first only.\n" "Disable this if different individual settings are needed." msgstr "" +"启用此选项将使得只更改第一个编码设置即可更改全部文件的编码。\n" +"如果需要为每个文件设置不同的编码，请禁用此选项。" -#: optiondialog.cpp:1405 +#: optiondialog.cpp:1462 #, kde-format msgid "Note: Local Encoding is \"%1\"" -msgstr "" +msgstr "注意：本地编码为“%1”" -#: optiondialog.cpp:1409 +#: optiondialog.cpp:1466 #, kde-format msgid "File Encoding for A:" -msgstr "" +msgstr "A 的文字编码：" -#: optiondialog.cpp:1416 +#: optiondialog.cpp:1473 #, kde-format msgid "" "If enabled then Unicode (UTF-16 or UTF-8) encoding will be detected.\n" @@ -2699,73 +2841,80 @@ "fallback.\n" "(Unicode detection depends on the first bytes of a file.)" msgstr "" +"如果启用，将会检测 Unicode (UTF-16 或 UTF-8) 编码。\n" +"如果文件非 Unicode 编码，将使用选择的编码作为后备。\n" +"(Unicode 检测取决于文件的第一个字节)" -#: optiondialog.cpp:1419 optiondialog.cpp:1430 optiondialog.cpp:1441 +#: optiondialog.cpp:1476 optiondialog.cpp:1487 optiondialog.cpp:1498 #, kde-format msgid "Auto Detect Unicode" -msgstr "" +msgstr "自动检测 Unicode" -#: optiondialog.cpp:1425 +#: optiondialog.cpp:1482 #, kde-format msgid "File Encoding for B:" -msgstr "" +msgstr "B 的文字编码：" -#: optiondialog.cpp:1436 +#: optiondialog.cpp:1493 #, kde-format msgid "File Encoding for C:" -msgstr "" +msgstr "C 的文字编码：" -#: optiondialog.cpp:1447 +#: optiondialog.cpp:1504 #, kde-format msgid "File Encoding for Merge Output and Saving:" -msgstr "" +msgstr "合并输出和保存的文件编码：" -#: optiondialog.cpp:1452 +#: optiondialog.cpp:1509 #, kde-format msgid "Auto Select" -msgstr "" +msgstr "自动选择" -#: optiondialog.cpp:1456 +#: optiondialog.cpp:1513 #, kde-format msgid "" "If enabled then the encoding from the input files is used.\n" "In ambiguous cases a dialog will ask the user to choose the encoding for " "saving." msgstr "" +"如果启用，使用输入文件的文字编码。\n" +"在模棱两可的情况下，对话框将询问用户文件保存编码。" -#: optiondialog.cpp:1459 +#: optiondialog.cpp:1516 #, kde-format msgid "File Encoding for Preprocessor Files:" -msgstr "" +msgstr "预处理文件的文件编码：" -#: optiondialog.cpp:1471 +#: optiondialog.cpp:1528 #, kde-format msgid "Right To Left Language" -msgstr "" +msgstr "从右至左语言" -#: optiondialog.cpp:1475 +#: optiondialog.cpp:1532 #, kde-format msgid "" "Some languages are read from right to left.\n" "This setting will change the viewer and editor accordingly." msgstr "" +"一些语言是从右到左书写的。\n" +"查看器和编辑器的显示方向将据此更改。" -#: optiondialog.cpp:1485 +#: optiondialog.cpp:1542 #, kde-format msgid "Integration" msgstr "整合" -#: optiondialog.cpp:1486 +#: optiondialog.cpp:1543 #, kde-format msgid "Integration Settings" -msgstr "" +msgstr "集成设置" -#: optiondialog.cpp:1499 +#: optiondialog.cpp:1564 #, kde-format msgid "Command line options to ignore:" -msgstr "" +msgstr "要忽略的命令行选项：" -#: optiondialog.cpp:1505 +#: optiondialog.cpp:1570 #, kde-format msgid "" "List of command line options that should be ignored when KDiff3 is used by " @@ -2773,23 +2922,27 @@ "Several values can be specified if separated via ';'\n" "This will suppress the \"Unknown option\" error." msgstr "" +"当 KDiff3 被其他工具调用时忽略的命令行选项。\n" +"多个选项请用分号“;\"分隔，以避免出现“未知参数”错误。" -#: optiondialog.cpp:1510 +#: optiondialog.cpp:1575 #, kde-format msgid "Quit also via Escape key" -msgstr "" +msgstr "通过 Esc 键退出" -#: optiondialog.cpp:1514 +#: optiondialog.cpp:1579 #, kde-format msgid "" "Fast method to exit.\n" "For those who are used to using the Escape key." msgstr "" +"快速退出方法。\n" +"给那些习惯使用 Esc 键退出的人使用。" -#: optiondialog.cpp:1598 +#: optiondialog.cpp:1653 #, kde-format msgid "This resets all options. Not only those of the current topic." -msgstr "" +msgstr "这将重置全部选项，而不仅是当前页面的选项。" #: pdiff.cpp:78 pdiff.cpp:92 #, kde-format @@ -2797,21 +2950,23 @@ "Data loss error:\n" "If it is reproducible please contact the author.\n" msgstr "" +"数据丢失错误：\n" +"如果您可以复现该错误，请联系软件作者。\n" #: pdiff.cpp:80 pdiff.cpp:94 #, kde-format msgid "Severe Internal Error" -msgstr "" +msgstr "严重内部错误" #: pdiff.cpp:122 #, kde-format msgid "PreprocessorCmd: " -msgstr "" +msgstr "预处理程序命令：" #: pdiff.cpp:127 #, kde-format msgid "The following option(s) you selected might change data:\n" -msgstr "" +msgstr "您所指定的以下选项可能会更改数据：\n" #: pdiff.cpp:128 #, kde-format @@ -2820,111 +2975,107 @@ "Most likely this is not wanted during a merge.\n" "Do you want to disable these settings or continue with these settings active?" msgstr "" +"\n" +"大多数情况下合并应该不会用到这些选项。\n" +"您想禁用这些设置还是继续激活这些设置？" #: pdiff.cpp:130 #, kde-format msgid "Option Unsafe for Merging" -msgstr "" +msgstr "合并时会造成不安全的选项" #: pdiff.cpp:131 #, kde-format msgid "Use These Options During Merge" -msgstr "" +msgstr "合并时使用这些选项" #: pdiff.cpp:132 #, kde-format msgid "Disable Unsafe Options" -msgstr "" +msgstr "禁用不安全的选项" -#: pdiff.cpp:158 +#: pdiff.cpp:160 #, kde-format msgid "Loading A" -msgstr "" +msgstr "正在加载A" -#: pdiff.cpp:167 +#: pdiff.cpp:162 #, kde-format -msgid "Errors occurred during pre-processing of file A." -msgstr "" +msgid "Loading A: %1" +msgstr "正在加载 A：%1" -#: pdiff.cpp:172 +#: pdiff.cpp:170 #, kde-format msgid "Loading B" -msgstr "" - -#: pdiff.cpp:179 -#, kde-format -msgid "Errors occurred during pre-processing of file B." -msgstr "" +msgstr "正在加载B" -#: pdiff.cpp:202 pdiff.cpp:241 +#: pdiff.cpp:201 pdiff.cpp:237 #, kde-format msgid "Diff: A <-> B" -msgstr "" +msgstr "比较：A <-> B" -#: pdiff.cpp:208 pdiff.cpp:279 pdiff.cpp:293 +#: pdiff.cpp:207 pdiff.cpp:275 pdiff.cpp:289 #, kde-format msgid "Linediff: A <-> B" -msgstr "" +msgstr "行比较：A <-> B" -#: pdiff.cpp:225 +#: pdiff.cpp:224 #, kde-format msgid "Loading C" -msgstr "" +msgstr "正在加载C" -#: pdiff.cpp:232 -#, kde-format -msgid "Errors occurred during pre-processing of file C." -msgstr "" - -#: pdiff.cpp:250 +#: pdiff.cpp:246 #, kde-format msgid "Diff: A <-> C" -msgstr "" +msgstr "比较：A <-> C" -#: pdiff.cpp:261 +#: pdiff.cpp:257 #, kde-format msgid "Diff: B <-> C" -msgstr "" +msgstr "比较：B <-> C" -#: pdiff.cpp:283 pdiff.cpp:297 +#: pdiff.cpp:279 pdiff.cpp:293 #, kde-format msgid "Linediff: B <-> C" -msgstr "" +msgstr "行比较：B <-> C" -#: pdiff.cpp:287 pdiff.cpp:301 +#: pdiff.cpp:283 pdiff.cpp:297 #, kde-format msgid "Linediff: A <-> C" -msgstr "" +msgstr "行比较：A <-> C" -#: pdiff.cpp:829 +#: pdiff.cpp:819 #, kde-format msgid "All input files contain the same text, but are not binary equal." -msgstr "" +msgstr "全部输入文件包含相同文本，但二进制不相同。" -#: pdiff.cpp:835 pdiff.cpp:839 pdiff.cpp:843 +#: pdiff.cpp:825 pdiff.cpp:829 pdiff.cpp:833 #, kde-format msgid "Files %1 and %2 have equal text, but are not binary equal. \n" -msgstr "" +msgstr "文件%1和%2文本相同，但二进制数据不相同。\n" -#: pdiff.cpp:853 +#: pdiff.cpp:843 #, kde-format msgid "" "Some input files do not seem to be pure text files.\n" "Note that the KDiff3 merge was not meant for binary data.\n" "Continue at your own risk." msgstr "" +"一些输入文件不是纯文本文件\n" +"注意 KDiff3 的合并功能不适用于二进制数据。\n" +"继续则需您自己承担风险。" -#: pdiff.cpp:863 +#: pdiff.cpp:853 #, kde-format msgid ", B" -msgstr ", 蓝" +msgstr ", B" -#: pdiff.cpp:865 +#: pdiff.cpp:855 #, kde-format msgid ", C" msgstr ", C" -#: pdiff.cpp:867 +#: pdiff.cpp:857 #, kde-format msgid "" "Some input characters could not be converted to valid unicode.\n" @@ -2932,78 +3083,77 @@ "Do not save the result if unsure. Continue at your own risk.\n" "Affected input files are in %1." msgstr "" +"一些输入字符无法转换为有效的Unicode。\n" +"您可能使用了错误的编码来读取文件。(例如，以UTF-8表示非UTF-8编码的文件)。\n" +"如果不确定，请不要保存。继续则需您自己承担风险。\n" +"受影响的输入文件在 %1。" -#: pdiff.cpp:1034 +#: pdiff.cpp:1032 #, kde-format msgid "Abort" msgstr "中止" -#: pdiff.cpp:1040 pdiff.cpp:1130 +#: pdiff.cpp:1038 pdiff.cpp:1129 #, kde-format msgid "Opening files..." -msgstr "" - -#: pdiff.cpp:1107 -#, kde-format -msgid "File open error" -msgstr "" +msgstr "打开文件..." -#: pdiff.cpp:1202 +#: pdiff.cpp:1212 #, kde-format msgid "Cutting selection..." -msgstr "正在剪切所选项..." +msgstr "剪切选中内容..." -#: pdiff.cpp:1223 +#: pdiff.cpp:1233 #, kde-format msgid "Copying selection to clipboard..." -msgstr "正在复制所选项到剪贴板..." +msgstr "复制选中内容到剪贴板..." -#: pdiff.cpp:1239 +#: pdiff.cpp:1249 #, kde-format msgid "Inserting clipboard contents..." msgstr "正在插入剪贴板内容..." -#: pdiff.cpp:1695 +#: pdiff.cpp:1705 #, kde-format msgid "Word wrap (Cancel disables word wrap)" -msgstr "" +msgstr "文本换行" -#: pdiff.cpp:1696 +#: pdiff.cpp:1706 #, kde-format msgid "Calculating max width for horizontal scrollbar" -msgstr "" +msgstr "计算水平滚动条的最大宽度" -#: pdiff.cpp:1911 +#: pdiff.cpp:1921 #, kde-format msgid "Save && Continue" -msgstr "" +msgstr "保存并继续" -#: pdiff.cpp:1912 +#: pdiff.cpp:1922 #, kde-format msgid "Continue Without Saving" -msgstr "" +msgstr "继续并不保存" -#: pdiff.cpp:2124 +#: pdiff.cpp:2134 #, kde-format msgid "Search complete." msgstr "搜索完成。" -#: pdiff.cpp:2124 +#: pdiff.cpp:2134 #, kde-format msgid "Search Complete" -msgstr "" +msgstr "搜索完成" -#: pdiff.cpp:2375 +#: pdiff.cpp:2385 #, kde-format msgid "Nothing is selected in either diff input window." -msgstr "" +msgstr "比较输入窗口没有选择内容。" -#: pdiff.cpp:2375 +#: pdiff.cpp:2385 #, kde-format msgid "Error while adding manual diff range" -msgstr "" +msgstr "添加手动比较区域时出错" -#: progress.cpp:59 progress.cpp:71 +#: progress.cpp:61 progress.cpp:73 #, kde-format msgid "&Cancel" msgstr "取消(&C)" @@ -3013,188 +3163,188 @@ msgid "A (Base):" msgstr "" -#: smalldialogs.cpp:68 smalldialogs.cpp:85 smalldialogs.cpp:102 -#: smalldialogs.cpp:144 +#: smalldialogs.cpp:71 smalldialogs.cpp:90 smalldialogs.cpp:109 +#: smalldialogs.cpp:154 #, kde-format msgid "File..." msgstr "文件..." -#: smalldialogs.cpp:70 smalldialogs.cpp:87 smalldialogs.cpp:104 -#: smalldialogs.cpp:146 +#: smalldialogs.cpp:73 smalldialogs.cpp:92 smalldialogs.cpp:111 +#: smalldialogs.cpp:156 #, kde-format msgid "Dir..." -msgstr "" +msgstr "目录..." -#: smalldialogs.cpp:96 +#: smalldialogs.cpp:103 #, kde-format msgid "C (Optional):" -msgstr "" +msgstr "C (可选)：" -#: smalldialogs.cpp:119 +#: smalldialogs.cpp:126 #, kde-format msgid "Swap/Copy Names..." -msgstr "" +msgstr "交换/复制名称..." -#: smalldialogs.cpp:124 smalldialogs.cpp:125 smalldialogs.cpp:126 +#: smalldialogs.cpp:131 smalldialogs.cpp:132 smalldialogs.cpp:133 #, kde-format msgid "Swap %1<->%2" -msgstr "" +msgstr "交换 %1<->%2" -#: smalldialogs.cpp:127 smalldialogs.cpp:128 smalldialogs.cpp:129 +#: smalldialogs.cpp:134 smalldialogs.cpp:135 smalldialogs.cpp:136 #, kde-format msgid "Copy %1->Output" -msgstr "" +msgstr "复制 %1->输出" -#: smalldialogs.cpp:130 smalldialogs.cpp:131 smalldialogs.cpp:132 +#: smalldialogs.cpp:137 smalldialogs.cpp:138 smalldialogs.cpp:139 #, kde-format msgid "Swap %1<->Output" -msgstr "" +msgstr "交换 %1<->输出" -#: smalldialogs.cpp:138 +#: smalldialogs.cpp:148 #, kde-format msgid "Output (optional):" -msgstr "" +msgstr "输出(可选)：" -#: smalldialogs.cpp:168 +#: smalldialogs.cpp:178 #, kde-format msgid "Configure..." msgstr "配置..." -#: smalldialogs.cpp:233 +#: smalldialogs.cpp:243 #, kde-format msgid "Open Directory" msgstr "打开目录" -#: smalldialogs.cpp:234 +#: smalldialogs.cpp:244 #, kde-format msgid "Select Output File" -msgstr "" +msgstr "选择输出文件" -#: smalldialogs.cpp:393 +#: smalldialogs.cpp:403 #, kde-format msgid "Search text:" -msgstr "" +msgstr "搜索文本：" -#: smalldialogs.cpp:400 +#: smalldialogs.cpp:410 #, kde-format msgid "Case sensitive" -msgstr "不区分大小写" +msgstr "区分大小写" -#: smalldialogs.cpp:403 +#: smalldialogs.cpp:413 #, kde-format msgid "Search A" -msgstr "" +msgstr "搜索 A" -#: smalldialogs.cpp:408 +#: smalldialogs.cpp:418 #, kde-format msgid "Search B" -msgstr "" +msgstr "搜索 B" -#: smalldialogs.cpp:413 +#: smalldialogs.cpp:423 #, kde-format msgid "Search C" -msgstr "" +msgstr "搜索 C" -#: smalldialogs.cpp:418 +#: smalldialogs.cpp:428 #, kde-format msgid "Search output" -msgstr "" +msgstr "搜索输出" -#: smalldialogs.cpp:425 +#: smalldialogs.cpp:435 #, kde-format msgid "&Search" msgstr "搜索(&S)" -#: smalldialogs.cpp:444 +#: smalldialogs.cpp:454 #, kde-format msgid "Regular Expression Tester" -msgstr "" +msgstr "正则表达式测试器" -#: smalldialogs.cpp:457 +#: smalldialogs.cpp:467 #, kde-format msgid "Example auto merge line:" -msgstr "" +msgstr "示例自动合并行：" -#: smalldialogs.cpp:459 +#: smalldialogs.cpp:469 #, kde-format msgid "To test auto merge, copy a line as used in your files." -msgstr "" +msgstr "要测试自动合并，复制文件中使用的行。" -#: smalldialogs.cpp:465 smalldialogs.cpp:493 smalldialogs.cpp:529 +#: smalldialogs.cpp:475 smalldialogs.cpp:503 smalldialogs.cpp:539 #, kde-format msgid "Match result:" -msgstr "" +msgstr "匹配结果：" -#: smalldialogs.cpp:484 +#: smalldialogs.cpp:494 #, kde-format msgid "Example history start line (with leading comment):" msgstr "" -#: smalldialogs.cpp:486 +#: smalldialogs.cpp:496 #, kde-format msgid "" "Copy a history start line as used in your files,\n" "including the leading comment." msgstr "" -#: smalldialogs.cpp:512 +#: smalldialogs.cpp:522 #, kde-format msgid "History sort key order:" -msgstr "" +msgstr "历史排序关键字顺序：" -#: smalldialogs.cpp:520 +#: smalldialogs.cpp:530 #, kde-format msgid "Example history entry start line (without leading comment):" msgstr "" -#: smalldialogs.cpp:522 +#: smalldialogs.cpp:532 #, kde-format msgid "" "Copy a history entry start line as used in your files,\n" "but omit the leading comment." msgstr "" -#: smalldialogs.cpp:536 +#: smalldialogs.cpp:546 #, kde-format msgid "Sort key result:" -msgstr "" +msgstr "关键字排序结果：" -#: smalldialogs.cpp:584 smalldialogs.cpp:594 smalldialogs.cpp:614 +#: smalldialogs.cpp:594 smalldialogs.cpp:604 smalldialogs.cpp:624 #, kde-format msgid "Match success." -msgstr "" +msgstr "匹配成功。" -#: smalldialogs.cpp:588 smalldialogs.cpp:598 smalldialogs.cpp:620 +#: smalldialogs.cpp:598 smalldialogs.cpp:608 smalldialogs.cpp:630 #, kde-format msgid "Match failed." -msgstr "" +msgstr "匹配失败。" -#: smalldialogs.cpp:605 +#: smalldialogs.cpp:615 #, kde-format msgid "Opening and closing parentheses do not match in regular expression." -msgstr "" +msgstr "正则表达式中打开和闭合括号不匹配。" -#: SourceData.cpp:150 +#: SourceData.cpp:153 #, kde-format msgid "Writing clipboard data to temp file failed." msgstr "将剪贴板数据写入临时文件失败。" -#: SourceData.cpp:154 +#: SourceData.cpp:157 #, kde-format msgid "From Clipboard" msgstr "从剪贴板" -#: SourceData.cpp:335 +#: SourceData.cpp:348 #, kde-format msgid "%1 is not a normal file." -msgstr "" +msgstr "%1 不是一个正常的文件。" -#: SourceData.cpp:427 +#: SourceData.cpp:440 #, kde-format msgid " Temp file is: %1" -msgstr "" +msgstr " 临时文件是：%1" -#: SourceData.cpp:432 +#: SourceData.cpp:445 #, kde-format msgid "" "Preprocessing possibly failed. Check this command:\n" @@ -3209,12 +3359,12 @@ "\n" "预处理命令将会被禁用。" -#: SourceData.cpp:443 SourceData.cpp:512 +#: SourceData.cpp:456 SourceData.cpp:525 #, kde-format msgid "File %1 too large to process. Skipping." -msgstr "" +msgstr "文件 %1 太大，无法处理。跳过。" -#: SourceData.cpp:487 +#: SourceData.cpp:500 #, kde-format msgid "" "The line-matching-preprocessing possibly failed. Check this command:\n" @@ -3236,14 +3386,14 @@ #: Utils.cpp:80 #, kde-format msgid "Unmatched quote." -msgstr "" +msgstr "引号对不匹配。" #: Utils.cpp:89 #, kde-format msgid "Unexpected quote character within argument." -msgstr "" +msgstr "参数中有未预期的引号字符。" #: Utils.cpp:96 #, kde-format msgid "No program specified." -msgstr "未指定程序" \ No newline at end of file +msgstr "没有指定程序。" \ No newline at end of file diff -Nru kdiff3-1.8.01/po/zh_TW/diff_ext.po kdiff3-1.8.3/po/zh_TW/diff_ext.po --- kdiff3-1.8.01/po/zh_TW/diff_ext.po 2019-05-18 01:02:40.000000000 +0000 +++ kdiff3-1.8.3/po/zh_TW/diff_ext.po 2020-06-25 00:19:03.000000000 +0000 @@ -5,129 +5,124 @@ msgid "" msgstr "" "Project-Id-Version: kdiff3\n" -"Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2019-03-22 03:09+0100\n" -"PO-Revision-Date: 2019-03-14 21:10+0800\n" +"Report-Msgid-Bugs-To: https://bugs.kde.org\n" +"POT-Creation-Date: 2019-11-04 07:54+0100\n" +"PO-Revision-Date: 2019-11-03 14:17+0800\n" "Last-Translator: pan93412 \n" -"Language-Team: Chinese \n" +"Language-Team: Chinese \n" "Language: zh_TW\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -"X-Generator: Lokalize 18.12.3\n" +"X-Generator: Lokalize 19.08.2\n" -#: diff_ext.cpp:391 +#: diff_ext.cpp:223 #, kde-format msgid "Compare with %1" msgstr "與 %1 比較" -#: diff_ext.cpp:392 +#: diff_ext.cpp:224 #, kde-format msgid "Merge with %1" -msgstr "" +msgstr "與 %1 合併" -#: diff_ext.cpp:408 +#: diff_ext.cpp:234 #, kde-format msgid "3-way merge with base" -msgstr "" +msgstr "三路與基礎合併" -#: diff_ext.cpp:411 +#: diff_ext.cpp:237 #, kde-format msgid "Save '%1' for later" -msgstr "" +msgstr "儲存「%1」供稍候使用" -#: diff_ext.cpp:426 +#: diff_ext.cpp:251 #, kde-format msgid "Compare with ..." -msgstr "" +msgstr "跟哪個比較 …" -#: diff_ext.cpp:429 +#: diff_ext.cpp:254 #, kde-format msgid "Clear list" msgstr "清除列表" -#: diff_ext.cpp:434 +#: diff_ext.cpp:259 #, kde-format msgid "Compare" msgstr "比較" -#: diff_ext.cpp:438 +#: diff_ext.cpp:263 #, kde-format msgid "3 way comparison" -msgstr "" +msgstr "三路比較" -#: diff_ext.cpp:444 +#: diff_ext.cpp:269 #, kde-format msgid "About Diff-Ext ..." msgstr "關於 Diff-Ext…" -#: diff_ext.cpp:515 +#: diff_ext.cpp:340 #, kde-format msgid "(32 Bit)" msgstr "(32 位元)" -#: diff_ext.cpp:517 -#, kde-format -msgid "(64 Bit)" -msgstr "(64 位元)" - -#: diff_ext.cpp:518 +#: diff_ext.cpp:342 #, kde-format msgid "Diff-Ext Copyright (c) 2003-2006, Sergey Zorin. All rights reserved.\n" msgstr "Diff-Ext 版權所有 (c) 2003-2006, Sergey Zorin. 保留所有權利。\n" -#: diff_ext.cpp:519 +#: diff_ext.cpp:343 #, kde-format msgid "This software is distributable under the BSD-2-Clause license.\n" msgstr "此軟體根據 BSD-2-Clause 授權重散布。\n" -#: diff_ext.cpp:520 +#: diff_ext.cpp:344 #, kde-format msgid "Some extensions for KDiff3 (c) 2006-2013 by Joachim Eibl.\n" msgstr "部份用於 KDiff3 的擴充元件 (c) 2006-2013 by Joachim Eibl.\n" -#: diff_ext.cpp:521 +#: diff_ext.cpp:345 #, kde-format msgid "Homepage for Diff-Ext: http://diff-ext.sourceforge.net\n" msgstr "Diff-Ext 首頁：http://diff-ext.sourceforge.net\n" -#: diff_ext.cpp:522 +#: diff_ext.cpp:346 #, kde-format msgid "About Diff-Ext for KDiff3 " -msgstr "" +msgstr "關於適用 KDiff3 的 Diff-Ext" -#: diff_ext.cpp:551 +#: diff_ext.cpp:375 #, kde-format msgid "Compare selected files" -msgstr "" +msgstr "比較選取檔案" -#: diff_ext.cpp:557 diff_ext.cpp:577 +#: diff_ext.cpp:381 diff_ext.cpp:399 #, kde-format msgid "Compare '%1' with '%2'" -msgstr "" +msgstr "將「%1」跟「%2」比較" -#: diff_ext.cpp:563 +#: diff_ext.cpp:386 #, kde-format msgid "Save '%1' for later operation" -msgstr "" +msgstr "儲存「%1」供稍候操作" -#: diff_ext.cpp:619 +#: diff_ext.cpp:440 #, kde-format msgid "Could not start KDiff3. Please rerun KDiff3 installation." -msgstr "" +msgstr "無法啟動 KDiff3。請重新執行 KDiff3 安裝套件。" -#: diff_ext.cpp:620 +#: diff_ext.cpp:441 #, kde-format msgid "Command" -msgstr "" +msgstr "指令" -#: diff_ext.cpp:621 +#: diff_ext.cpp:442 #, kde-format msgid "CommandLine" -msgstr "" +msgstr "指令行" -#: diff_ext.cpp:622 +#: diff_ext.cpp:443 #, kde-format msgid "Diff-Ext For KDiff3" -msgstr "" \ No newline at end of file +msgstr "適用於 KDiff3 的 Diff-Ext" \ No newline at end of file diff -Nru kdiff3-1.8.01/po/zh_TW/kdiff3fileitemactionplugin.po kdiff3-1.8.3/po/zh_TW/kdiff3fileitemactionplugin.po --- kdiff3-1.8.01/po/zh_TW/kdiff3fileitemactionplugin.po 2019-05-18 01:02:40.000000000 +0000 +++ kdiff3-1.8.3/po/zh_TW/kdiff3fileitemactionplugin.po 2020-06-25 00:19:03.000000000 +0000 @@ -6,11 +6,11 @@ msgid "" msgstr "" "Project-Id-Version: \n" -"Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2019-03-22 03:09+0100\n" +"Report-Msgid-Bugs-To: https://bugs.kde.org\n" +"POT-Creation-Date: 2019-08-30 07:40+0200\n" "PO-Revision-Date: 2019-04-05 14:22+0800\n" "Last-Translator: pan93412 \n" -"Language-Team: Chinese \n" +"Language-Team: Chinese \n" "Language: zh_TW\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" diff -Nru kdiff3-1.8.01/po/zh_TW/kdiff3.po kdiff3-1.8.3/po/zh_TW/kdiff3.po --- kdiff3-1.8.01/po/zh_TW/kdiff3.po 2019-05-18 01:02:40.000000000 +0000 +++ kdiff3-1.8.3/po/zh_TW/kdiff3.po 2020-06-25 00:19:03.000000000 +0000 @@ -7,11 +7,11 @@ msgid "" msgstr "" "Project-Id-Version: kdiff3\n" -"Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2019-04-18 08:02+0200\n" +"Report-Msgid-Bugs-To: https://bugs.kde.org\n" +"POT-Creation-Date: 2020-06-22 07:48+0200\n" "PO-Revision-Date: 2019-01-19 19:46+0800\n" "Last-Translator: pan93412 \n" -"Language-Team: Chinese \n" +"Language-Team: Chinese \n" "Language: zh_TW\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -29,339 +29,339 @@ msgid "Your emails" msgstr "franklin@goodhorse.idv.tw" -#: difftextwindow.cpp:412 +#: difftextwindow.cpp:414 #, kde-format msgid "File %1: Line %2" msgstr "" -#: difftextwindow.cpp:414 +#: difftextwindow.cpp:416 #, fuzzy, kde-format #| msgid "Line not available" msgid "File %1: Line not available" msgstr "無法取得行號" -#: difftextwindow.cpp:1780 +#: difftextwindow.cpp:1778 #, kde-format msgid "Encoding:" msgstr "編碼：" -#: difftextwindow.cpp:1782 mergeresultwindow.cpp:3138 optiondialog.cpp:818 +#: difftextwindow.cpp:1781 mergeresultwindow.cpp:3166 optiondialog.cpp:840 #, kde-format msgid "Line end style:" msgstr "行結尾樣式：" -#: difftextwindow.cpp:1810 directorymergewindow.cpp:382 -#: directorymergewindow.cpp:433 directorymergewindow.cpp:524 -#: directorymergewindow.cpp:3058 directorymergewindow.cpp:3189 -#: directorymergewindow.cpp:3417 mergeresultwindow.cpp:942 -#: mergeresultwindow.cpp:944 mergeresultwindow.cpp:946 -#: mergeresultwindow.cpp:948 mergeresultwindow.cpp:1814 -#: mergeresultwindow.cpp:3170 mergeresultwindow.cpp:3177 optiondialog.cpp:962 -#: optiondialog.cpp:975 pdiff.cpp:833 pdiff.cpp:835 pdiff.cpp:837 pdiff.cpp:839 -#: pdiff.cpp:861 smalldialogs.cpp:124 smalldialogs.cpp:126 smalldialogs.cpp:127 -#: smalldialogs.cpp:130 +#: difftextwindow.cpp:1809 directorymergewindow.cpp:383 +#: directorymergewindow.cpp:434 directorymergewindow.cpp:525 +#: directorymergewindow.cpp:3072 directorymergewindow.cpp:3203 +#: directorymergewindow.cpp:3431 mergeresultwindow.cpp:970 +#: mergeresultwindow.cpp:972 mergeresultwindow.cpp:974 +#: mergeresultwindow.cpp:976 mergeresultwindow.cpp:1842 +#: mergeresultwindow.cpp:3198 mergeresultwindow.cpp:3205 optiondialog.cpp:1002 +#: optiondialog.cpp:1015 pdiff.cpp:823 pdiff.cpp:825 pdiff.cpp:827 +#: pdiff.cpp:829 pdiff.cpp:851 smalldialogs.cpp:131 smalldialogs.cpp:133 +#: smalldialogs.cpp:134 smalldialogs.cpp:137 #, kde-format msgid "A" msgstr "A" -#: difftextwindow.cpp:1810 directorymergewindow.cpp:384 -#: directorymergewindow.cpp:436 directorymergewindow.cpp:526 -#: directorymergewindow.cpp:3064 directorymergewindow.cpp:3190 -#: directorymergewindow.cpp:3418 mergeresultwindow.cpp:942 -#: mergeresultwindow.cpp:944 mergeresultwindow.cpp:950 -#: mergeresultwindow.cpp:952 mergeresultwindow.cpp:1816 -#: mergeresultwindow.cpp:3172 mergeresultwindow.cpp:3179 optiondialog.cpp:963 -#: optiondialog.cpp:976 pdiff.cpp:833 pdiff.cpp:835 pdiff.cpp:841 pdiff.cpp:843 -#: pdiff.cpp:863 smalldialogs.cpp:124 smalldialogs.cpp:125 smalldialogs.cpp:128 -#: smalldialogs.cpp:131 +#: difftextwindow.cpp:1809 directorymergewindow.cpp:385 +#: directorymergewindow.cpp:437 directorymergewindow.cpp:527 +#: directorymergewindow.cpp:3078 directorymergewindow.cpp:3204 +#: directorymergewindow.cpp:3432 mergeresultwindow.cpp:970 +#: mergeresultwindow.cpp:972 mergeresultwindow.cpp:978 +#: mergeresultwindow.cpp:980 mergeresultwindow.cpp:1844 +#: mergeresultwindow.cpp:3200 mergeresultwindow.cpp:3207 optiondialog.cpp:1003 +#: optiondialog.cpp:1016 pdiff.cpp:823 pdiff.cpp:825 pdiff.cpp:831 +#: pdiff.cpp:833 pdiff.cpp:853 smalldialogs.cpp:131 smalldialogs.cpp:132 +#: smalldialogs.cpp:135 smalldialogs.cpp:138 #, kde-format msgid "B" msgstr "B" -#: difftextwindow.cpp:1810 directorymergewindow.cpp:386 -#: directorymergewindow.cpp:439 directorymergewindow.cpp:528 -#: directorymergewindow.cpp:3070 directorymergewindow.cpp:3191 -#: directorymergewindow.cpp:3419 mergeresultwindow.cpp:946 -#: mergeresultwindow.cpp:948 mergeresultwindow.cpp:950 -#: mergeresultwindow.cpp:952 mergeresultwindow.cpp:1818 -#: mergeresultwindow.cpp:3174 mergeresultwindow.cpp:3181 optiondialog.cpp:977 -#: pdiff.cpp:837 pdiff.cpp:839 pdiff.cpp:841 pdiff.cpp:843 pdiff.cpp:865 -#: smalldialogs.cpp:125 smalldialogs.cpp:126 smalldialogs.cpp:129 -#: smalldialogs.cpp:132 +#: difftextwindow.cpp:1809 directorymergewindow.cpp:387 +#: directorymergewindow.cpp:440 directorymergewindow.cpp:529 +#: directorymergewindow.cpp:3084 directorymergewindow.cpp:3205 +#: directorymergewindow.cpp:3433 mergeresultwindow.cpp:974 +#: mergeresultwindow.cpp:976 mergeresultwindow.cpp:978 +#: mergeresultwindow.cpp:980 mergeresultwindow.cpp:1846 +#: mergeresultwindow.cpp:3202 mergeresultwindow.cpp:3209 optiondialog.cpp:1017 +#: pdiff.cpp:827 pdiff.cpp:829 pdiff.cpp:831 pdiff.cpp:833 pdiff.cpp:855 +#: smalldialogs.cpp:132 smalldialogs.cpp:133 smalldialogs.cpp:136 +#: smalldialogs.cpp:139 #, kde-format msgid "C" msgstr "C" -#: difftextwindow.cpp:1810 +#: difftextwindow.cpp:1809 #, fuzzy, kde-format #| msgid "A (Base): " msgid "A (Base)" msgstr "A(基底)：" -#: difftextwindow.cpp:1812 +#: difftextwindow.cpp:1811 #, fuzzy, kde-format #| msgid "Encoding:" msgid "Encoding: %1" msgstr "編碼：" -#: difftextwindow.cpp:1813 mergeresultwindow.cpp:3183 +#: difftextwindow.cpp:1812 mergeresultwindow.cpp:3211 #, kde-format msgid "Unix" msgstr "Unix" -#: difftextwindow.cpp:1813 mergeresultwindow.cpp:3184 +#: difftextwindow.cpp:1812 mergeresultwindow.cpp:3212 #, kde-format msgid "DOS" msgstr "DOS" -#: difftextwindow.cpp:1813 +#: difftextwindow.cpp:1812 #, fuzzy, kde-format #| msgid "Line end style:" msgid "Line end style: %1" msgstr "行結尾樣式：" -#: difftextwindow.cpp:1835 kdiff3.cpp:873 +#: difftextwindow.cpp:1834 kdiff3.cpp:874 #, kde-format msgid "Top line" msgstr "頂端行" -#: difftextwindow.cpp:1845 +#: difftextwindow.cpp:1843 #, kde-format msgid "End" msgstr "結束" -#: difftextwindow.cpp:1903 smalldialogs.cpp:235 +#: difftextwindow.cpp:1901 smalldialogs.cpp:245 #, fuzzy, kde-format #| msgid "Opening files..." msgid "Open File" msgstr "開啟檔案中..." -#: difftextwindow.cpp:1951 optiondialog.cpp:387 +#: difftextwindow.cpp:1943 optiondialog.cpp:389 #, kde-format msgid "Unicode, 8 bit" msgstr "" -#: difftextwindow.cpp:1966 +#: difftextwindow.cpp:1958 #, kde-format msgid "Other" msgstr "" -#: directorymergewindow.cpp:409 directorymergewindow.cpp:3424 +#: directorymergewindow.cpp:410 directorymergewindow.cpp:3438 #, kde-format msgid "Copy A to B" msgstr "將 A 複製到 B" -#: directorymergewindow.cpp:412 directorymergewindow.cpp:3425 +#: directorymergewindow.cpp:413 directorymergewindow.cpp:3439 #, kde-format msgid "Copy B to A" msgstr "將 B 複製到 A" -#: directorymergewindow.cpp:415 directorymergewindow.cpp:3426 +#: directorymergewindow.cpp:416 directorymergewindow.cpp:3440 #, kde-format msgid "Delete A" msgstr "刪除 A" -#: directorymergewindow.cpp:418 directorymergewindow.cpp:3427 +#: directorymergewindow.cpp:419 directorymergewindow.cpp:3441 #, kde-format msgid "Delete B" msgstr "刪除 B" -#: directorymergewindow.cpp:421 +#: directorymergewindow.cpp:422 #, kde-format msgid "Delete A & B" msgstr "刪除 A 與 B" -#: directorymergewindow.cpp:424 directorymergewindow.cpp:3429 +#: directorymergewindow.cpp:425 directorymergewindow.cpp:3443 #, kde-format msgid "Merge to A" msgstr "合併到 A" -#: directorymergewindow.cpp:427 directorymergewindow.cpp:3430 +#: directorymergewindow.cpp:428 directorymergewindow.cpp:3444 #, kde-format msgid "Merge to B" msgstr "合併到 B" -#: directorymergewindow.cpp:430 +#: directorymergewindow.cpp:431 #, kde-format msgid "Merge to A & B" msgstr "合併到 A 與 B" -#: directorymergewindow.cpp:442 directorymergewindow.cpp:3421 +#: directorymergewindow.cpp:443 directorymergewindow.cpp:3435 #, kde-format msgid "Delete (if exists)" msgstr "刪除（若存在）" -#: directorymergewindow.cpp:445 directorymergewindow.cpp:448 -#: directorymergewindow.cpp:3420 optiondialog.cpp:925 smalldialogs.cpp:113 +#: directorymergewindow.cpp:446 directorymergewindow.cpp:449 +#: directorymergewindow.cpp:3434 smalldialogs.cpp:120 #, kde-format msgid "Merge" msgstr "合併" -#: directorymergewindow.cpp:445 directorymergewindow.cpp:448 +#: directorymergewindow.cpp:446 directorymergewindow.cpp:449 #, kde-format msgid "Merge (manual)" msgstr "合併（手動）" -#: directorymergewindow.cpp:451 +#: directorymergewindow.cpp:452 #, kde-format msgid "Error: Conflicting File Types" msgstr "錯誤：衝突的檔案型態" -#: directorymergewindow.cpp:454 +#: directorymergewindow.cpp:455 #, kde-format msgid "Error: Changed and Deleted" msgstr "錯誤：已變更與刪除" -#: directorymergewindow.cpp:457 +#: directorymergewindow.cpp:458 #, kde-format msgid "Error: Dates are equal but files are not." msgstr "錯誤：日期相同，但檔案不同。" -#: directorymergewindow.cpp:471 +#: directorymergewindow.cpp:472 #, fuzzy, kde-format #| msgid "Done." msgid "Done" msgstr "完成。" -#: directorymergewindow.cpp:473 +#: directorymergewindow.cpp:474 #, kde-format msgid "Error" msgstr "錯誤" -#: directorymergewindow.cpp:475 +#: directorymergewindow.cpp:476 #, kde-format msgid "Skipped." msgstr "已跳過。" -#: directorymergewindow.cpp:477 +#: directorymergewindow.cpp:478 #, kde-format msgid "Not saved." msgstr "未儲存。" -#: directorymergewindow.cpp:479 +#: directorymergewindow.cpp:480 #, kde-format msgid "In progress..." msgstr "進行中..." -#: directorymergewindow.cpp:481 +#: directorymergewindow.cpp:482 #, kde-format msgid "To do." msgstr "待辦。" -#: directorymergewindow.cpp:522 +#: directorymergewindow.cpp:523 #, kde-format msgid "Name" msgstr "名稱" -#: directorymergewindow.cpp:530 +#: directorymergewindow.cpp:531 #, kde-format msgid "Operation" msgstr "操作" -#: directorymergewindow.cpp:532 +#: directorymergewindow.cpp:533 #, kde-format msgid "Status" msgstr "狀態" -#: directorymergewindow.cpp:534 +#: directorymergewindow.cpp:535 #, kde-format msgid "Unsolved" msgstr "未解決" -#: directorymergewindow.cpp:536 +#: directorymergewindow.cpp:537 #, kde-format msgid "Solved" msgstr "已解決" -#: directorymergewindow.cpp:538 +#: directorymergewindow.cpp:539 #, kde-format msgid "Nonwhite" msgstr "非白" -#: directorymergewindow.cpp:540 +#: directorymergewindow.cpp:541 #, kde-format msgid "White" msgstr "白" -#: directorymergewindow.cpp:674 +#: directorymergewindow.cpp:676 #, kde-format msgid "Unable to compare non-normal file with normal file." msgstr "" -#: directorymergewindow.cpp:688 +#: directorymergewindow.cpp:690 #, kde-format msgid "Mix of links and normal files." msgstr "連結與一般檔案混合。" -#: directorymergewindow.cpp:695 +#: directorymergewindow.cpp:697 #, kde-format msgid "Link: " msgstr "連結：" -#: directorymergewindow.cpp:704 +#: directorymergewindow.cpp:706 #, kde-format msgid "Size. " msgstr "大小。" -#: directorymergewindow.cpp:718 directorymergewindow.cpp:728 +#: directorymergewindow.cpp:720 directorymergewindow.cpp:730 #, kde-format msgid "Date & Size: " msgstr "日期與大小：" -#: directorymergewindow.cpp:748 +#: directorymergewindow.cpp:751 #, kde-format msgid "Comparing file..." msgstr "比較檔案中..." -#: directorymergewindow.cpp:801 +#: directorymergewindow.cpp:813 #, kde-format msgid "" "You are currently doing a directory merge. Are you sure, you want to abort " "the merge and rescan the directory?" msgstr "您正在進行目錄合併。您確定要中止合併並重新掃描目錄嗎？" -#: directorymergewindow.cpp:802 kdiff3.cpp:698 kdiff3.cpp:708 kdiff3.cpp:720 -#: mergeresultwindow.cpp:372 pdiff.cpp:1033 pdiff.cpp:1910 pdiff.cpp:1920 +#: directorymergewindow.cpp:814 kdiff3.cpp:697 kdiff3.cpp:707 kdiff3.cpp:719 +#: mergeresultwindow.cpp:400 pdiff.cpp:1031 pdiff.cpp:1920 pdiff.cpp:1930 #, kde-format msgid "Warning" msgstr "警告" -#: directorymergewindow.cpp:803 directorymergewindow.cpp:3393 +#: directorymergewindow.cpp:815 directorymergewindow.cpp:3407 #, kde-format msgid "Rescan" msgstr "重新掃描" -#: directorymergewindow.cpp:804 pdiff.cpp:1035 +#: directorymergewindow.cpp:816 pdiff.cpp:1033 #, kde-format msgid "Continue Merging" msgstr "繼續合併" -#: directorymergewindow.cpp:971 +#: directorymergewindow.cpp:984 #, kde-format msgid "Opening of directories failed:" msgstr "開啟目錄失敗：" -#: directorymergewindow.cpp:975 +#: directorymergewindow.cpp:988 #, kde-format msgid "Dir A \"%1\" does not exist or is not a directory.\n" msgstr "目錄 A \"%1\" 不存在，或不是目錄。\n" -#: directorymergewindow.cpp:980 +#: directorymergewindow.cpp:993 #, kde-format msgid "Dir B \"%1\" does not exist or is not a directory.\n" msgstr "目錄 B \"%1\" 不存在，或不是目錄。\n" -#: directorymergewindow.cpp:985 +#: directorymergewindow.cpp:998 #, kde-format msgid "Dir C \"%1\" does not exist or is not a directory.\n" msgstr "目錄 C \"%1\" 不存在，或不是目錄。\n" -#: directorymergewindow.cpp:988 +#: directorymergewindow.cpp:1001 #, kde-format msgid "Directory Open Error" msgstr "目錄開啟時發生錯誤" -#: directorymergewindow.cpp:996 +#: directorymergewindow.cpp:1009 #, kde-format msgid "" "The destination directory must not be the same as A or B when three " @@ -369,49 +369,49 @@ "Check again before continuing." msgstr "" -#: directorymergewindow.cpp:998 +#: directorymergewindow.cpp:1011 #, kde-format msgid "Parameter Warning" msgstr "參數警告" -#: directorymergewindow.cpp:1003 +#: directorymergewindow.cpp:1016 #, kde-format msgid "Scanning directories..." msgstr "掃描目錄中..." -#: directorymergewindow.cpp:1029 +#: directorymergewindow.cpp:1042 #, kde-format msgid "Reading Directory A" msgstr "讀取目錄 A 中" -#: directorymergewindow.cpp:1038 +#: directorymergewindow.cpp:1051 #, kde-format msgid "Reading Directory B" msgstr "讀取目錄 B 中" -#: directorymergewindow.cpp:1048 +#: directorymergewindow.cpp:1061 #, kde-format msgid "Reading Directory C" msgstr "讀取目錄 C 中" -#: directorymergewindow.cpp:1064 +#: directorymergewindow.cpp:1077 #, kde-format msgid "Some subdirectories were not readable in" msgstr "此目錄裡的某些子目錄無法讀取：" -#: directorymergewindow.cpp:1069 +#: directorymergewindow.cpp:1082 #, kde-format msgid "Check the permissions of the subdirectories." msgstr "請檢查子目錄的權限。" -#: directorymergewindow.cpp:1106 kdiff3.cpp:666 kdiff3.cpp:753 kdiff3.cpp:777 -#: kdiff3.cpp:1065 kdiff3.cpp:1086 pdiff.cpp:1116 pdiff.cpp:1170 pdiff.cpp:1218 -#: pdiff.cpp:1234 pdiff.cpp:1277 pdiff.cpp:1301 +#: directorymergewindow.cpp:1119 kdiff3.cpp:665 kdiff3.cpp:752 kdiff3.cpp:776 +#: kdiff3.cpp:1072 kdiff3.cpp:1093 pdiff.cpp:1115 pdiff.cpp:1178 pdiff.cpp:1228 +#: pdiff.cpp:1244 pdiff.cpp:1287 pdiff.cpp:1311 #, kde-format msgid "Ready." msgstr "已就緒。" -#: directorymergewindow.cpp:1121 +#: directorymergewindow.cpp:1134 #, kde-format msgid "" "Directory Comparison Status\n" @@ -421,23 +421,23 @@ "Number of different files: %3" msgstr "" -#: directorymergewindow.cpp:1128 +#: directorymergewindow.cpp:1141 #, fuzzy, kde-format #| msgid "Number of manual merges:" msgid "Number of manual merges: %1" msgstr "手動合併數量：" -#: directorymergewindow.cpp:1394 +#: directorymergewindow.cpp:1407 #, kde-format msgid "This affects all merge operations." msgstr "這會影響所有的合併操作。" -#: directorymergewindow.cpp:1395 +#: directorymergewindow.cpp:1408 #, kde-format msgid "Changing All Merge Operations" msgstr "變更所有合併操作" -#: directorymergewindow.cpp:1695 +#: directorymergewindow.cpp:1708 #, fuzzy, kde-format #| msgid "Processing " msgid "" @@ -445,45 +445,45 @@ "%3" msgstr "處理中" -#: directorymergewindow.cpp:1738 directorymergewindow.cpp:1742 +#: directorymergewindow.cpp:1751 directorymergewindow.cpp:1755 #, kde-format msgid "Some files could not be processed." msgstr "" -#: directorymergewindow.cpp:2222 directorymergewindow.cpp:2247 -#: directorymergewindow.cpp:2271 +#: directorymergewindow.cpp:2235 directorymergewindow.cpp:2260 +#: directorymergewindow.cpp:2285 #, kde-format msgid "This operation is currently not possible." msgstr "此操作目前無法運作。" -#: directorymergewindow.cpp:2222 directorymergewindow.cpp:2247 -#: directorymergewindow.cpp:2271 directorymergewindow.cpp:2552 +#: directorymergewindow.cpp:2235 directorymergewindow.cpp:2260 +#: directorymergewindow.cpp:2285 directorymergewindow.cpp:2565 #, kde-format msgid "Operation Not Possible" msgstr "無法進行操作" -#: directorymergewindow.cpp:2318 +#: directorymergewindow.cpp:2332 #, fuzzy, kde-format #| msgid "An error occurred while copying.\n" msgid "An error occurred while copying." msgstr "複製時發生錯誤。\n" -#: directorymergewindow.cpp:2319 directorymergewindow.cpp:2759 +#: directorymergewindow.cpp:2333 directorymergewindow.cpp:2772 #, kde-format msgid "Merge Error" msgstr "合併錯誤" -#: directorymergewindow.cpp:2396 +#: directorymergewindow.cpp:2410 #, kde-format msgid "Unknown merge operation. (This must never happen!)" msgstr "未知的合併操作。（此問題不應該發生！）" -#: directorymergewindow.cpp:2441 +#: directorymergewindow.cpp:2455 #, kde-format msgid "Unknown merge operation." msgstr "未知的合併操作。" -#: directorymergewindow.cpp:2454 +#: directorymergewindow.cpp:2468 #, kde-format msgid "" "The merge is about to begin.\n" @@ -502,50 +502,50 @@ "\n" "要注意，這個程式仍然在測試階段，不保證結果是否有問題。請先備份您的重要資料！" -#: directorymergewindow.cpp:2459 +#: directorymergewindow.cpp:2473 #, kde-format msgid "Starting Merge" msgstr "開始合併" -#: directorymergewindow.cpp:2460 +#: directorymergewindow.cpp:2474 #, kde-format msgid "Do It" msgstr "做吧！" -#: directorymergewindow.cpp:2461 +#: directorymergewindow.cpp:2475 #, kde-format msgid "Simulate It" msgstr "先模擬一次" -#: directorymergewindow.cpp:2487 +#: directorymergewindow.cpp:2501 #, kde-format msgid "" "The highlighted item has a different type in the different directories. " "Select what to do." msgstr "" -#: directorymergewindow.cpp:2491 +#: directorymergewindow.cpp:2505 #, kde-format msgid "" "The modification dates of the file are equal but the files are not. Select " "what to do." msgstr "" -#: directorymergewindow.cpp:2495 +#: directorymergewindow.cpp:2509 #, kde-format msgid "" "The highlighted item was changed in one directory and deleted in the other. " "Select what to do." msgstr "" -#: directorymergewindow.cpp:2552 +#: directorymergewindow.cpp:2565 #, kde-format msgid "" "This operation is currently not possible because directory merge is " "currently running." msgstr "" -#: directorymergewindow.cpp:2609 +#: directorymergewindow.cpp:2622 #, kde-format msgid "" "There was an error in the last step.\n" @@ -553,976 +553,981 @@ "to skip this item?" msgstr "" -#: directorymergewindow.cpp:2611 +#: directorymergewindow.cpp:2624 #, kde-format msgid "Continue merge after an error" msgstr "在錯誤之後繼續合併" -#: directorymergewindow.cpp:2612 +#: directorymergewindow.cpp:2625 #, kde-format msgid "Continue With Last Item" msgstr "繼續上一個項目" -#: directorymergewindow.cpp:2613 +#: directorymergewindow.cpp:2626 #, kde-format msgid "Skip Item" msgstr "跳過項目" -#: directorymergewindow.cpp:2709 +#: directorymergewindow.cpp:2722 #, kde-format msgid "Merge operation complete." msgstr "合併操作完成。" -#: directorymergewindow.cpp:2709 directorymergewindow.cpp:2712 +#: directorymergewindow.cpp:2722 directorymergewindow.cpp:2725 #, kde-format msgid "Merge Complete" msgstr "合併完成" -#: directorymergewindow.cpp:2722 +#: directorymergewindow.cpp:2735 #, kde-format msgid "" "Simulated merge complete: Check if you agree with the proposed operations." msgstr "模擬合併完成：請檢查是否同意此合併結果。" -#: directorymergewindow.cpp:2758 +#: directorymergewindow.cpp:2771 #, fuzzy, kde-format #| msgid "An error occurred. Press OK to see detailed information.\n" msgid "An error occurred. Press OK to see detailed information." msgstr "發生錯誤。按「確定」看詳細資訊。\n" -#: directorymergewindow.cpp:2791 +#: directorymergewindow.cpp:2804 #, kde-format msgid "Error: While deleting %1: Creating backup failed." msgstr "錯誤：刪除 %1 時建立備份失敗。" -#: directorymergewindow.cpp:2798 +#: directorymergewindow.cpp:2811 #, kde-format msgid "delete directory recursively( %1 )" msgstr "遞迴刪除目錄（%1）" -#: directorymergewindow.cpp:2800 +#: directorymergewindow.cpp:2813 #, kde-format msgid "delete( %1 )" msgstr "刪除（%1）" -#: directorymergewindow.cpp:2815 +#: directorymergewindow.cpp:2828 #, kde-format msgid "Error: delete dir operation failed while trying to read the directory." msgstr "" -#: directorymergewindow.cpp:2834 +#: directorymergewindow.cpp:2847 #, kde-format msgid "Error: rmdir( %1 ) operation failed." msgstr "" -#: directorymergewindow.cpp:2844 +#: directorymergewindow.cpp:2857 #, kde-format msgid "Error: delete operation failed." msgstr "" -#: directorymergewindow.cpp:2870 +#: directorymergewindow.cpp:2884 #, kde-format msgid "manual merge( %1, %2, %3 -> %4)" msgstr "" -#: directorymergewindow.cpp:2873 +#: directorymergewindow.cpp:2887 #, kde-format msgid "" " Note: After a manual merge the user should continue by pressing F7." msgstr "" -#: directorymergewindow.cpp:2900 +#: directorymergewindow.cpp:2914 #, kde-format msgid "Error: copy( %1 -> %2 ) failed.Deleting existing destination failed." msgstr "" -#: directorymergewindow.cpp:2909 +#: directorymergewindow.cpp:2923 #, kde-format msgid "copyLink( %1 -> %2 )" msgstr "複製連結( %1 -> %2 )" -#: directorymergewindow.cpp:2918 +#: directorymergewindow.cpp:2932 #, kde-format msgid "Error: copyLink failed: Remote links are not yet supported." msgstr "錯誤：複製連結失敗。尚未支援遠端連結。" -#: directorymergewindow.cpp:2928 +#: directorymergewindow.cpp:2942 #, kde-format msgid "Error: copyLink failed." msgstr "錯誤：複製連結失敗。" -#: directorymergewindow.cpp:2953 +#: directorymergewindow.cpp:2967 #, kde-format msgid "copy( %1 -> %2 )" msgstr "複製（%1 -> %2）" -#: directorymergewindow.cpp:2979 +#: directorymergewindow.cpp:2993 #, kde-format msgid "Error during rename( %1 -> %2 ): Cannot delete existing destination." msgstr "" -#: directorymergewindow.cpp:2986 +#: directorymergewindow.cpp:3000 #, kde-format msgid "rename( %1 -> %2 )" msgstr "重新命名（%1->%2）" -#: directorymergewindow.cpp:2995 +#: directorymergewindow.cpp:3009 #, kde-format msgid "Error: Rename failed." msgstr "" -#: directorymergewindow.cpp:3013 +#: directorymergewindow.cpp:3027 #, kde-format msgid "Error during makeDir of %1. Cannot delete existing file." msgstr "" -#: directorymergewindow.cpp:3030 +#: directorymergewindow.cpp:3044 #, kde-format msgid "makeDir( %1 )" msgstr "" -#: directorymergewindow.cpp:3040 +#: directorymergewindow.cpp:3054 #, kde-format msgid "Error while creating directory." msgstr "" -#: directorymergewindow.cpp:3076 directorymergewindow.cpp:3195 +#: directorymergewindow.cpp:3090 directorymergewindow.cpp:3209 #, kde-format msgid "Dest" msgstr "目標" -#: directorymergewindow.cpp:3084 directorymergewindow.cpp:3113 +#: directorymergewindow.cpp:3098 directorymergewindow.cpp:3127 #, kde-format msgid "Dir" msgstr "方向" -#: directorymergewindow.cpp:3084 +#: directorymergewindow.cpp:3098 #, kde-format msgid "Type" msgstr "型態" -#: directorymergewindow.cpp:3084 +#: directorymergewindow.cpp:3098 #, kde-format msgid "Size" msgstr "大小" -#: directorymergewindow.cpp:3085 +#: directorymergewindow.cpp:3099 #, kde-format msgid "Attr" msgstr "屬性" -#: directorymergewindow.cpp:3085 +#: directorymergewindow.cpp:3099 #, kde-format msgid "Last Modification" msgstr "上次變更" -#: directorymergewindow.cpp:3085 +#: directorymergewindow.cpp:3099 #, kde-format msgid "Link-Destination" msgstr "連結目標" -#: directorymergewindow.cpp:3113 +#: directorymergewindow.cpp:3127 #, kde-format msgid "File" msgstr "檔案" -#: directorymergewindow.cpp:3113 +#: directorymergewindow.cpp:3127 #, fuzzy, kde-format #| msgid "Link: " msgid "-Link" msgstr "連結：" -#: directorymergewindow.cpp:3119 +#: directorymergewindow.cpp:3133 #, kde-format msgid "not available" msgstr "無" -#: directorymergewindow.cpp:3137 +#: directorymergewindow.cpp:3151 #, kde-format msgid "A (Dest): " msgstr "A(目標)：" -#: directorymergewindow.cpp:3141 +#: directorymergewindow.cpp:3155 #, kde-format msgid "A: " msgstr "" -#: directorymergewindow.cpp:3141 +#: directorymergewindow.cpp:3155 #, kde-format msgid "A (Base): " msgstr "A(基底)：" -#: directorymergewindow.cpp:3147 +#: directorymergewindow.cpp:3161 #, kde-format msgid "B (Dest): " msgstr "B(目標)：" -#: directorymergewindow.cpp:3151 +#: directorymergewindow.cpp:3165 #, kde-format msgid "B: " msgstr "" -#: directorymergewindow.cpp:3156 +#: directorymergewindow.cpp:3170 #, kde-format msgid "C (Dest): " msgstr "C(目標)：" -#: directorymergewindow.cpp:3160 +#: directorymergewindow.cpp:3174 #, kde-format msgid "C: " msgstr "" -#: directorymergewindow.cpp:3163 +#: directorymergewindow.cpp:3177 #, kde-format msgid "Dest: " msgstr "目標：" #. i18n("Saving Directory Merge State ...")); -#: directorymergewindow.cpp:3238 +#: directorymergewindow.cpp:3252 #, kde-format msgid "Save Directory Merge State As..." msgstr "" -#: directorymergewindow.cpp:3387 +#: directorymergewindow.cpp:3401 #, kde-format msgid "Start/Continue Directory Merge" msgstr "" -#: directorymergewindow.cpp:3388 +#: directorymergewindow.cpp:3402 #, kde-format msgid "Run Operation for Current Item" msgstr "" -#: directorymergewindow.cpp:3389 +#: directorymergewindow.cpp:3403 #, kde-format msgid "Compare Selected File" msgstr "" -#: directorymergewindow.cpp:3390 +#: directorymergewindow.cpp:3404 #, kde-format msgid "Merge Current File" msgstr "" -#: directorymergewindow.cpp:3390 +#: directorymergewindow.cpp:3404 #, kde-format msgid "" "Merge\n" "File" msgstr "" -#: directorymergewindow.cpp:3391 +#: directorymergewindow.cpp:3405 #, kde-format msgid "Fold All Subdirs" msgstr "" -#: directorymergewindow.cpp:3392 +#: directorymergewindow.cpp:3406 #, kde-format msgid "Unfold All Subdirs" msgstr "" #. i18n("Save Directory Merge State ..."), 0, this, &DirectoryMergeWindow::slotSaveMergeState, ac, "dir_save_merge_state"); #. i18n("Load Directory Merge State ..."), 0, this, &DirectoryMergeWindow::slotLoadMergeState, ac, "dir_load_merge_state"); -#: directorymergewindow.cpp:3396 +#: directorymergewindow.cpp:3410 #, kde-format msgid "Choose A for All Items" msgstr "" -#: directorymergewindow.cpp:3397 +#: directorymergewindow.cpp:3411 #, kde-format msgid "Choose B for All Items" msgstr "" -#: directorymergewindow.cpp:3398 +#: directorymergewindow.cpp:3412 #, kde-format msgid "Choose C for All Items" msgstr "" -#: directorymergewindow.cpp:3399 +#: directorymergewindow.cpp:3413 #, kde-format msgid "Auto-Choose Operation for All Items" msgstr "" -#: directorymergewindow.cpp:3400 +#: directorymergewindow.cpp:3414 #, kde-format msgid "No Operation for All Items" msgstr "" #. i18n("Synchronize Directories"), 0, this, &DirectoryMergeWindow::slotSynchronizeDirectories, ac, "dir_synchronize_directories"); #. d->m_pDirChooseNewerFiles = GuiUtils::createAction< KToggleAction >(i18n("Copy Newer Files Instead of Merging"), 0, this, &DirectoryMergeWindow::slotChooseNewerFiles, ac, "dir_choose_newer_files"); -#: directorymergewindow.cpp:3405 +#: directorymergewindow.cpp:3419 #, kde-format msgid "Show Identical Files" msgstr "" -#: directorymergewindow.cpp:3405 +#: directorymergewindow.cpp:3419 #, kde-format msgid "" "Identical\n" "Files" msgstr "" -#: directorymergewindow.cpp:3406 +#: directorymergewindow.cpp:3420 #, kde-format msgid "Show Different Files" msgstr "" -#: directorymergewindow.cpp:3407 +#: directorymergewindow.cpp:3421 #, kde-format msgid "Show Files only in A" msgstr "" -#: directorymergewindow.cpp:3407 +#: directorymergewindow.cpp:3421 #, kde-format msgid "" "Files\n" "only in A" msgstr "" -#: directorymergewindow.cpp:3408 +#: directorymergewindow.cpp:3422 #, kde-format msgid "Show Files only in B" msgstr "" -#: directorymergewindow.cpp:3408 +#: directorymergewindow.cpp:3422 #, kde-format msgid "" "Files\n" "only in B" msgstr "" -#: directorymergewindow.cpp:3409 +#: directorymergewindow.cpp:3423 #, kde-format msgid "Show Files only in C" msgstr "" -#: directorymergewindow.cpp:3409 +#: directorymergewindow.cpp:3423 #, kde-format msgid "" "Files\n" "only in C" msgstr "" -#: directorymergewindow.cpp:3413 +#: directorymergewindow.cpp:3427 #, kde-format msgid "Compare Explicitly Selected Files" msgstr "" -#: directorymergewindow.cpp:3414 +#: directorymergewindow.cpp:3428 #, kde-format msgid "Merge Explicitly Selected Files" msgstr "" -#: directorymergewindow.cpp:3416 directorymergewindow.cpp:3423 +#: directorymergewindow.cpp:3430 directorymergewindow.cpp:3437 #, kde-format msgid "Do Nothing" msgstr "不做任何事" -#: directorymergewindow.cpp:3428 +#: directorymergewindow.cpp:3442 #, kde-format msgid "Delete A && B" msgstr "刪除 A 與 B" -#: directorymergewindow.cpp:3431 +#: directorymergewindow.cpp:3445 #, kde-format msgid "Merge to A && B" msgstr "合併到 A 與 B" -#: fileaccess.cpp:462 SourceData.cpp:493 +#: fileaccess.cpp:301 +#, kde-format +msgid "Unable to determine full url. No parent specified." +msgstr "" + +#: fileaccess.cpp:482 SourceData.cpp:506 #, fuzzy, kde-format #| msgid "Reading file: %1" msgid "Failed to read file: %1" msgstr "正在讀取檔案：%1" -#: fileaccess.cpp:587 +#: fileaccess.cpp:624 #, kde-format msgid "Creating temp copy of %1 failed." msgstr "建立 %1 的暫存複本失敗。" -#: fileaccess.cpp:595 fileaccess.cpp:600 +#: fileaccess.cpp:632 fileaccess.cpp:637 #, fuzzy, kde-format #| msgid "Opening %1 failed." msgid "Opening %1 failed. %2" msgstr "開啟 %1 失敗。" -#: fileaccess.cpp:619 fileaccess.cpp:627 +#: fileaccess.cpp:656 fileaccess.cpp:664 #, fuzzy, kde-format #| msgid "Error reading from %1" msgid "Error reading from %1. %2" msgstr "從 %1 讀取時發生錯誤" -#: fileaccess.cpp:751 +#: fileaccess.cpp:788 #, kde-format msgid "" "While trying to make a backup, deleting an older backup failed.\n" "Filename: %1" msgstr "" -#: fileaccess.cpp:758 +#: fileaccess.cpp:795 #, kde-format msgid "" "While trying to make a backup, renaming failed.\n" "Filenames: %1 -> %2" msgstr "" -#: fileaccess.cpp:828 +#: fileaccess.cpp:865 #, kde-format msgid "Getting file status: %1" msgstr "" -#: fileaccess.cpp:869 +#: fileaccess.cpp:906 #, kde-format msgid "Reading file: %1" msgstr "正在讀取檔案：%1" -#: fileaccess.cpp:907 +#: fileaccess.cpp:944 #, kde-format msgid "Writing file: %1" msgstr "正在寫入檔案：%1" -#: fileaccess.cpp:940 +#: fileaccess.cpp:977 #, kde-format msgid "Out of memory" msgstr "記憶體不足" -#: fileaccess.cpp:976 +#: fileaccess.cpp:1013 #, kde-format msgid "Making directory: %1" msgstr "產生目錄中：%1" -#: fileaccess.cpp:997 +#: fileaccess.cpp:1034 #, kde-format msgid "Removing directory: %1" msgstr "移除目錄中：%1" -#: fileaccess.cpp:1012 +#: fileaccess.cpp:1049 #, kde-format msgid "Removing file: %1" msgstr "移除檔案中：%1" -#: fileaccess.cpp:1028 +#: fileaccess.cpp:1065 #, kde-format msgid "Creating symbolic link: %1 -> %2" msgstr "建立符號連結中：%1 -> %2" -#: fileaccess.cpp:1052 +#: fileaccess.cpp:1089 #, kde-format msgid "Renaming file: %1 -> %2" msgstr "重新命名檔案中：%1 -> %2" -#: fileaccess.cpp:1086 +#: fileaccess.cpp:1123 #, kde-format msgid "Copying file: %1 -> %2" msgstr "正在複製檔案中：%1 -> %2" -#: fileaccess.cpp:1108 +#: fileaccess.cpp:1145 #, fuzzy, kde-format #| msgid "Removing directory: %1" msgid "Reading directory: %1" msgstr "移除目錄中：%1" -#: fileaccess.cpp:1162 +#: fileaccess.cpp:1202 #, kde-format msgid "Listing directory: %1" msgstr "" -#: kdiff3.cpp:181 +#: kdiff3.cpp:182 #, kde-format msgid "Current Configuration:" msgstr "目前設定：" -#: kdiff3.cpp:186 +#: kdiff3.cpp:187 #, kde-format msgid "Config Option Error:" msgstr "" -#: kdiff3.cpp:240 +#: kdiff3.cpp:246 #, kde-format msgid "Option --auto used, but no output file specified." msgstr "" -#: kdiff3.cpp:416 +#: kdiff3.cpp:405 #, kde-format msgid "Option --auto ignored for directory comparison." msgstr "" -#: kdiff3.cpp:460 +#: kdiff3.cpp:449 #, kde-format msgid "Saving failed." msgstr "儲存失敗。" -#: kdiff3.cpp:496 pdiff.cpp:1098 +#: kdiff3.cpp:494 pdiff.cpp:1096 #, kde-format msgid "Opening of these files failed:" msgstr "開啟這些檔案失敗：" -#: kdiff3.cpp:505 +#: kdiff3.cpp:503 pdiff.cpp:1105 #, kde-format -msgid "File Open Error" +msgid "File open error" msgstr "檔案開啟失敗" -#: kdiff3.cpp:533 +#: kdiff3.cpp:532 #, kde-format msgid "Opens documents for comparison..." msgstr "開啟要比較的文件..." -#: kdiff3.cpp:535 +#: kdiff3.cpp:534 #, kde-format msgid "Reload" msgstr "重新載入" -#: kdiff3.cpp:538 +#: kdiff3.cpp:537 #, kde-format msgid "Saves the merge result. All conflicts must be solved!" msgstr "" -#: kdiff3.cpp:540 +#: kdiff3.cpp:539 #, kde-format msgid "Saves the current document as..." msgstr "" -#: kdiff3.cpp:543 +#: kdiff3.cpp:542 #, kde-format msgid "Print the differences" msgstr "" -#: kdiff3.cpp:546 +#: kdiff3.cpp:545 #, kde-format msgid "Quits the application" msgstr "離開應用程式" -#: kdiff3.cpp:549 +#: kdiff3.cpp:548 #, kde-format msgid "Cuts the selected section and puts it to the clipboard" msgstr "剪下所選取的部分並放到剪貼簿" -#: kdiff3.cpp:552 +#: kdiff3.cpp:551 #, kde-format msgid "Copies the selected section to the clipboard" msgstr "複製所選取的部分並放到剪貼簿" -#: kdiff3.cpp:554 +#: kdiff3.cpp:553 #, fuzzy, kde-format #| msgid "Pastes the clipboard contents to actual position" msgid "Pastes the clipboard contents to current position" msgstr "貼上剪貼簿內容到目前位置" -#: kdiff3.cpp:557 +#: kdiff3.cpp:556 #, kde-format msgid "Select everything in current window" msgstr "" -#: kdiff3.cpp:560 +#: kdiff3.cpp:559 #, kde-format msgid "Search for a string" msgstr "" -#: kdiff3.cpp:562 +#: kdiff3.cpp:561 #, kde-format msgid "Search again for the string" msgstr "" -#: kdiff3.cpp:567 +#: kdiff3.cpp:566 #, kde-format msgid "Enables/disables the statusbar" msgstr "啟動/關閉狀態列" -#: kdiff3.cpp:571 +#: kdiff3.cpp:570 #, kde-format msgid "Configure KDiff3..." msgstr "" -#: kdiff3.cpp:590 +#: kdiff3.cpp:589 #, kde-format msgid "Go to Current Delta" msgstr "" -#: kdiff3.cpp:590 +#: kdiff3.cpp:589 #, kde-format msgid "" "Current\n" "Delta" msgstr "" -#: kdiff3.cpp:592 +#: kdiff3.cpp:591 #, kde-format msgid "Go to First Delta" msgstr "" -#: kdiff3.cpp:592 +#: kdiff3.cpp:591 #, kde-format msgid "" "First\n" "Delta" msgstr "" -#: kdiff3.cpp:594 +#: kdiff3.cpp:593 #, kde-format msgid "Go to Last Delta" msgstr "" -#: kdiff3.cpp:594 +#: kdiff3.cpp:593 #, kde-format msgid "" "Last\n" "Delta" msgstr "" -#: kdiff3.cpp:596 +#: kdiff3.cpp:595 #, kde-format msgid "(Skips white space differences when \"Show White Space\" is disabled.)" msgstr "" -#: kdiff3.cpp:597 +#: kdiff3.cpp:596 #, kde-format msgid "" "(Does not skip white space differences even when \"Show White Space\" is " "disabled.)" msgstr "" -#: kdiff3.cpp:598 +#: kdiff3.cpp:597 #, kde-format msgid "Go to Previous Delta" msgstr "" -#: kdiff3.cpp:598 +#: kdiff3.cpp:597 #, kde-format msgid "" "Prev\n" "Delta" msgstr "" -#: kdiff3.cpp:600 +#: kdiff3.cpp:599 #, kde-format msgid "Go to Next Delta" msgstr "" -#: kdiff3.cpp:600 +#: kdiff3.cpp:599 #, kde-format msgid "" "Next\n" "Delta" msgstr "" -#: kdiff3.cpp:602 +#: kdiff3.cpp:601 #, kde-format msgid "Go to Previous Conflict" msgstr "" -#: kdiff3.cpp:602 +#: kdiff3.cpp:601 #, kde-format msgid "" "Prev\n" "Conflict" msgstr "" -#: kdiff3.cpp:604 +#: kdiff3.cpp:603 #, kde-format msgid "Go to Next Conflict" msgstr "" -#: kdiff3.cpp:604 +#: kdiff3.cpp:603 #, kde-format msgid "" "Next\n" "Conflict" msgstr "" -#: kdiff3.cpp:606 +#: kdiff3.cpp:605 #, kde-format msgid "Go to Previous Unsolved Conflict" msgstr "" -#: kdiff3.cpp:606 +#: kdiff3.cpp:605 #, kde-format msgid "" "Prev\n" "Unsolved" msgstr "" -#: kdiff3.cpp:608 +#: kdiff3.cpp:607 #, kde-format msgid "Go to Next Unsolved Conflict" msgstr "" -#: kdiff3.cpp:608 +#: kdiff3.cpp:607 #, kde-format msgid "" "Next\n" "Unsolved" msgstr "" -#: kdiff3.cpp:610 +#: kdiff3.cpp:609 #, kde-format msgid "Select Line(s) From A" msgstr "" -#: kdiff3.cpp:610 +#: kdiff3.cpp:609 #, kde-format msgid "" "Choose\n" "A" msgstr "" -#: kdiff3.cpp:611 +#: kdiff3.cpp:610 #, kde-format msgid "Select Line(s) From B" msgstr "" -#: kdiff3.cpp:611 +#: kdiff3.cpp:610 #, kde-format msgid "" "Choose\n" "B" msgstr "" -#: kdiff3.cpp:612 +#: kdiff3.cpp:611 #, kde-format msgid "Select Line(s) From C" msgstr "" -#: kdiff3.cpp:612 +#: kdiff3.cpp:611 #, kde-format msgid "" "Choose\n" "C" msgstr "" -#: kdiff3.cpp:613 +#: kdiff3.cpp:612 #, kde-format msgid "Automatically Go to Next Unsolved Conflict After Source Selection" msgstr "" -#: kdiff3.cpp:613 +#: kdiff3.cpp:612 #, kde-format msgid "" "Auto\n" "Next" msgstr "" -#: kdiff3.cpp:615 +#: kdiff3.cpp:614 #, kde-format msgid "Show Space && Tabulator Characters" msgstr "" -#: kdiff3.cpp:615 +#: kdiff3.cpp:614 #, kde-format msgid "" "White\n" "Characters" msgstr "" -#: kdiff3.cpp:616 +#: kdiff3.cpp:615 #, kde-format msgid "Show White Space" msgstr "" -#: kdiff3.cpp:616 +#: kdiff3.cpp:615 #, kde-format msgid "" "White\n" "Deltas" msgstr "" -#: kdiff3.cpp:618 +#: kdiff3.cpp:617 #, kde-format msgid "Show Line Numbers" msgstr "顯示行號" -#: kdiff3.cpp:618 +#: kdiff3.cpp:617 #, kde-format msgid "" "Line\n" "Numbers" msgstr "" -#: kdiff3.cpp:620 +#: kdiff3.cpp:619 #, kde-format msgid "Automatically Solve Simple Conflicts" msgstr "" -#: kdiff3.cpp:621 +#: kdiff3.cpp:620 #, kde-format msgid "Set Deltas to Conflicts" msgstr "" -#: kdiff3.cpp:622 +#: kdiff3.cpp:621 #, kde-format msgid "Run Regular Expression Auto Merge" msgstr "" -#: kdiff3.cpp:623 +#: kdiff3.cpp:622 #, kde-format msgid "Automatically Solve History Conflicts" msgstr "" -#: kdiff3.cpp:624 +#: kdiff3.cpp:623 #, kde-format msgid "Split Diff At Selection" msgstr "" -#: kdiff3.cpp:625 +#: kdiff3.cpp:624 #, kde-format msgid "Join Selected Diffs" msgstr "" -#: kdiff3.cpp:627 +#: kdiff3.cpp:626 #, kde-format msgid "Show Window A" msgstr "" -#: kdiff3.cpp:628 +#: kdiff3.cpp:627 #, kde-format msgid "Show Window B" msgstr "" -#: kdiff3.cpp:629 +#: kdiff3.cpp:628 #, kde-format msgid "Show Window C" msgstr "" -#: kdiff3.cpp:631 +#: kdiff3.cpp:630 #, kde-format msgid "Normal Overview" msgstr "" -#: kdiff3.cpp:632 +#: kdiff3.cpp:631 #, kde-format msgid "A vs. B Overview" msgstr "" -#: kdiff3.cpp:633 +#: kdiff3.cpp:632 #, kde-format msgid "A vs. C Overview" msgstr "" -#: kdiff3.cpp:634 +#: kdiff3.cpp:633 #, kde-format msgid "B vs. C Overview" msgstr "" -#: kdiff3.cpp:635 +#: kdiff3.cpp:634 #, kde-format msgid "Word Wrap Diff Windows" msgstr "" -#: kdiff3.cpp:636 +#: kdiff3.cpp:635 #, kde-format msgid "Add Manual Diff Alignment" msgstr "" -#: kdiff3.cpp:637 +#: kdiff3.cpp:636 #, kde-format msgid "Clear All Manual Diff Alignments" msgstr "" -#: kdiff3.cpp:639 +#: kdiff3.cpp:638 #, kde-format msgid "Focus Next Window" msgstr "" -#: kdiff3.cpp:640 +#: kdiff3.cpp:639 #, kde-format msgid "Focus Prev Window" msgstr "" -#: kdiff3.cpp:641 +#: kdiff3.cpp:640 #, kde-format msgid "Toggle Split Orientation" msgstr "" -#: kdiff3.cpp:643 +#: kdiff3.cpp:642 #, kde-format msgid "Dir && Text Split Screen View" msgstr "" -#: kdiff3.cpp:645 +#: kdiff3.cpp:644 #, kde-format msgid "Toggle Between Dir && Text View" msgstr "" -#: kdiff3.cpp:697 pdiff.cpp:1909 +#: kdiff3.cpp:696 pdiff.cpp:1919 #, kde-format msgid "The merge result has not been saved." msgstr "" -#: kdiff3.cpp:699 +#: kdiff3.cpp:698 #, kde-format msgid "Save && Quit" msgstr "" -#: kdiff3.cpp:700 +#: kdiff3.cpp:699 #, kde-format msgid "Quit Without Saving" msgstr "離開但不儲存" -#: kdiff3.cpp:708 pdiff.cpp:1920 +#: kdiff3.cpp:707 pdiff.cpp:1930 #, kde-format msgid "Saving the merge result failed." msgstr "" -#: kdiff3.cpp:719 pdiff.cpp:1032 +#: kdiff3.cpp:718 pdiff.cpp:1030 #, kde-format msgid "" "You are currently doing a directory merge. Are you sure, you want to abort?" msgstr "" -#: kdiff3.cpp:742 +#: kdiff3.cpp:741 #, kde-format msgid "Saving file..." msgstr "正在儲存檔案..." -#: kdiff3.cpp:759 +#: kdiff3.cpp:758 #, kde-format msgid "Saving file with a new filename..." msgstr "正在用新檔名儲存檔案..." -#: kdiff3.cpp:761 +#: kdiff3.cpp:760 #, kde-format msgid "Save As..." msgstr "另存新檔..." -#: kdiff3.cpp:820 +#: kdiff3.cpp:819 #, kde-format msgid "Printing not implemented." msgstr "" -#: kdiff3.cpp:857 +#: kdiff3.cpp:858 #, kde-format msgid "Printing..." msgstr "正在列印..." -#: kdiff3.cpp:943 +#: kdiff3.cpp:948 #, kde-format msgid "Printing page %1 of %2" msgstr "" -#: kdiff3.cpp:1000 +#: kdiff3.cpp:1006 #, fuzzy, kde-format #| msgid "Selection" msgid " (Selection)" msgstr "選擇" -#: kdiff3.cpp:1027 +#: kdiff3.cpp:1034 #, kde-format msgid "Printing completed." msgstr "" -#: kdiff3.cpp:1031 +#: kdiff3.cpp:1038 #, kde-format msgid "Printing aborted." msgstr "" -#: kdiff3.cpp:1038 +#: kdiff3.cpp:1045 #, kde-format msgid "Exiting..." msgstr "正在離開..." -#: kdiff3.cpp:1049 +#: kdiff3.cpp:1056 #, kde-format msgid "Toggling toolbar..." msgstr "切換工具列..." -#: kdiff3.cpp:1070 +#: kdiff3.cpp:1077 #, kde-format msgid "Toggle the statusbar..." msgstr "切換狀態列..." @@ -1548,7 +1553,7 @@ msgid "Joachim Eibl" msgstr "Joachim Eibl" -#: kdiff3_part.cpp:173 kdiff3_part.cpp:254 +#: kdiff3_part.cpp:174 kdiff3_part.cpp:255 #, fuzzy, kde-format #| msgid "Couldn't find files for comparison." msgid "Could not find files for comparison." @@ -1567,7 +1572,7 @@ msgstr "設定 KDiff3" #. i18n: ectx: ToolBar (mainToolBar) -#: kdiff3_part.rc:16 main.cpp:88 +#: kdiff3_part.rc:16 main.cpp:89 #, kde-format msgid "KDiff3" msgstr "KDiff3" @@ -1636,169 +1641,174 @@ msgid "Main Toolbar" msgstr "主工具列" -#: main.cpp:68 main.cpp:72 +#: main.cpp:69 main.cpp:73 #, kde-format msgid "Ignored. (User defined.)" msgstr "已忽略。（使用者定義）" -#: main.cpp:92 +#: main.cpp:93 #, kde-format msgid " (64 bit)" msgstr "" -#: main.cpp:94 +#: main.cpp:95 #, kde-format msgid " (32 bit)" msgstr "" -#: main.cpp:95 +#: main.cpp:96 #, kde-format msgid "Tool for Comparison and Merge of Files and Directories" msgstr "" -#: main.cpp:96 +#: main.cpp:97 #, kde-format msgid "(c) 2002-2014 Joachim Eibl, (c) 2017 Michael Reeves KF5/Qt5 port" msgstr "" -#: main.cpp:112 +#: main.cpp:113 #, kde-format msgid "Merge the input." msgstr "合併輸入。" -#: main.cpp:113 +#: main.cpp:114 #, kde-format msgid "Explicit base file. For compatibility with certain tools." msgstr "" -#: main.cpp:114 +#: main.cpp:115 #, kde-format msgid "Output file. Implies -m. E.g.: -o newfile.txt" msgstr "" -#: main.cpp:115 +#: main.cpp:116 #, kde-format msgid "Output file, again. (For compatibility with certain tools.)" msgstr "" -#: main.cpp:116 +#: main.cpp:118 #, kde-format msgid "No GUI if all conflicts are auto-solvable. (Needs -o file)" msgstr "" -#: main.cpp:117 +#: main.cpp:120 +#, kde-format +msgid "Ignored." +msgstr "" + +#: main.cpp:122 #, kde-format msgid "Do not solve conflicts automatically." msgstr "" -#: main.cpp:118 +#: main.cpp:123 #, kde-format msgid "Visible name replacement for input file 1 (base)." msgstr "" -#: main.cpp:119 +#: main.cpp:124 #, kde-format msgid "Visible name replacement for input file 2." msgstr "" -#: main.cpp:120 +#: main.cpp:125 #, kde-format msgid "Visible name replacement for input file 3." msgstr "" -#: main.cpp:121 +#: main.cpp:126 #, kde-format msgid "Alternative visible name replacement. Supply this once for every input." msgstr "" -#: main.cpp:122 +#: main.cpp:127 #, kde-format msgid "" "Override a config setting. Use once for every setting. E.g.: --cs " "\"AutoAdvance=1\"" msgstr "" -#: main.cpp:123 +#: main.cpp:128 #, kde-format msgid "Show list of config settings and current values." msgstr "" -#: main.cpp:124 +#: main.cpp:129 #, kde-format msgid "Use a different config file." msgstr "" -#: main.cpp:127 +#: main.cpp:132 #, kde-format msgid "file1 to open (base, if not specified via --base)" msgstr "要開啟的檔案 1(若未指定 --base 則以此為基底)" -#: main.cpp:128 +#: main.cpp:133 #, kde-format msgid "file2 to open" msgstr "要開啟的檔案 2" -#: main.cpp:129 +#: main.cpp:134 #, kde-format msgid "file3 to open" msgstr "要開啟的檔案 3" -#: main.cpp:153 +#: main.cpp:158 #, kde-format msgid "See kdiff3 --help for supported options." msgstr "" -#: mergeresultwindow.cpp:158 +#: mergeresultwindow.cpp:171 #, kde-format msgid "Choose A Everywhere" msgstr "" -#: mergeresultwindow.cpp:159 +#: mergeresultwindow.cpp:172 #, kde-format msgid "Choose B Everywhere" msgstr "" -#: mergeresultwindow.cpp:160 +#: mergeresultwindow.cpp:173 #, kde-format msgid "Choose C Everywhere" msgstr "" -#: mergeresultwindow.cpp:161 +#: mergeresultwindow.cpp:174 #, kde-format msgid "Choose A for All Unsolved Conflicts" msgstr "" -#: mergeresultwindow.cpp:162 +#: mergeresultwindow.cpp:175 #, kde-format msgid "Choose B for All Unsolved Conflicts" msgstr "" -#: mergeresultwindow.cpp:163 +#: mergeresultwindow.cpp:176 #, kde-format msgid "Choose C for All Unsolved Conflicts" msgstr "" -#: mergeresultwindow.cpp:164 +#: mergeresultwindow.cpp:177 #, kde-format msgid "Choose A for All Unsolved Whitespace Conflicts" msgstr "" -#: mergeresultwindow.cpp:165 +#: mergeresultwindow.cpp:178 #, kde-format msgid "Choose B for All Unsolved Whitespace Conflicts" msgstr "" -#: mergeresultwindow.cpp:166 +#: mergeresultwindow.cpp:179 #, kde-format msgid "Choose C for All Unsolved Whitespace Conflicts" msgstr "" -#: mergeresultwindow.cpp:176 +#: mergeresultwindow.cpp:204 #, kde-format msgid "Number of remaining unsolved conflicts: %1 (of which %2 are whitespace)" msgstr "" -#: mergeresultwindow.cpp:370 +#: mergeresultwindow.cpp:398 #, kde-format msgid "" "The output has been modified.\n" @@ -1807,29 +1817,29 @@ "輸出已被變更。\n" "若您繼續，您的變更將會遺失。" -#: mergeresultwindow.cpp:936 pdiff.cpp:827 +#: mergeresultwindow.cpp:964 pdiff.cpp:817 #, kde-format msgid "All input files are binary equal." msgstr "所有輸入檔都有相同的內容。" -#: mergeresultwindow.cpp:938 +#: mergeresultwindow.cpp:966 #, kde-format msgid "All input files contain the same text." msgstr "所有輸入檔都有相同的文字內容。" -#: mergeresultwindow.cpp:942 mergeresultwindow.cpp:946 -#: mergeresultwindow.cpp:950 pdiff.cpp:833 pdiff.cpp:837 pdiff.cpp:841 +#: mergeresultwindow.cpp:970 mergeresultwindow.cpp:974 +#: mergeresultwindow.cpp:978 pdiff.cpp:823 pdiff.cpp:827 pdiff.cpp:831 #, kde-format msgid "Files %1 and %2 are binary equal.\n" msgstr "檔案 %1 與 %2 內容完全相同。\n" -#: mergeresultwindow.cpp:944 mergeresultwindow.cpp:948 -#: mergeresultwindow.cpp:952 +#: mergeresultwindow.cpp:972 mergeresultwindow.cpp:976 +#: mergeresultwindow.cpp:980 #, kde-format msgid "Files %1 and %2 have equal text.\n" msgstr "檔案 %1 與 %2 內容文字完全相同。\n" -#: mergeresultwindow.cpp:958 +#: mergeresultwindow.cpp:986 #, kde-format msgid "" "Total number of conflicts: %1\n" @@ -1838,39 +1848,39 @@ "%4" msgstr "" -#: mergeresultwindow.cpp:964 +#: mergeresultwindow.cpp:992 #, kde-format msgid "Conflicts" msgstr "衝突" -#: mergeresultwindow.cpp:1873 +#: mergeresultwindow.cpp:1901 #, kde-format msgid "" msgstr "" -#: mergeresultwindow.cpp:1881 +#: mergeresultwindow.cpp:1909 #, kde-format msgid "" msgstr "" -#: mergeresultwindow.cpp:1883 mergeresultwindow.cpp:2755 +#: mergeresultwindow.cpp:1911 mergeresultwindow.cpp:2783 #, kde-format msgid "" msgstr "" -#: mergeresultwindow.cpp:2967 +#: mergeresultwindow.cpp:2995 #, kde-format msgid "" "Not all conflicts are solved yet.\n" "File not saved." msgstr "" -#: mergeresultwindow.cpp:2969 mergeresultwindow.cpp:2978 +#: mergeresultwindow.cpp:2997 mergeresultwindow.cpp:3006 #, kde-format msgid "Conflicts Left" msgstr "" -#: mergeresultwindow.cpp:2976 +#: mergeresultwindow.cpp:3004 #, kde-format msgid "" "There is a line end style conflict. Please choose the line end style " @@ -1878,7 +1888,7 @@ "File not saved." msgstr "" -#: mergeresultwindow.cpp:2990 +#: mergeresultwindow.cpp:3018 #, kde-format msgid "" "\n" @@ -1886,62 +1896,62 @@ "Creating backup failed. File not saved." msgstr "" -#: mergeresultwindow.cpp:2990 mergeresultwindow.cpp:3038 +#: mergeresultwindow.cpp:3018 mergeresultwindow.cpp:3066 #, kde-format msgid "File Save Error" msgstr "檔案儲存錯誤" -#: mergeresultwindow.cpp:3038 +#: mergeresultwindow.cpp:3066 #, kde-format msgid "Error while writing." msgstr "" -#: mergeresultwindow.cpp:3110 +#: mergeresultwindow.cpp:3138 #, fuzzy, kde-format #| msgid "Output" msgid "Output:" msgstr "輸出" -#: mergeresultwindow.cpp:3123 mergeresultwindow.cpp:3315 +#: mergeresultwindow.cpp:3151 mergeresultwindow.cpp:3343 #, kde-format msgid "[Modified]" msgstr "[已修改]" -#: mergeresultwindow.cpp:3130 +#: mergeresultwindow.cpp:3158 #, fuzzy, kde-format #| msgid "Encoding for saving" msgid "Encoding for saving:" msgstr "儲存的編碼" -#: mergeresultwindow.cpp:3230 +#: mergeresultwindow.cpp:3258 #, kde-format msgid "Conflict" msgstr "衝突" -#: mergeresultwindow.cpp:3262 +#: mergeresultwindow.cpp:3290 #, fuzzy, kde-format #| msgid "Codec from" msgid "Codec from A: %1" msgstr "編解碼器" -#: mergeresultwindow.cpp:3264 +#: mergeresultwindow.cpp:3292 #, fuzzy, kde-format #| msgid "Codec from" msgid "Codec from B: %1" msgstr "編解碼器" -#: mergeresultwindow.cpp:3266 +#: mergeresultwindow.cpp:3294 #, fuzzy, kde-format #| msgid "Codec from" msgid "Codec from C: %1" msgstr "編解碼器" -#: optiondialog.cpp:119 +#: optiondialog.cpp:121 #, kde-format msgid "Change Font" msgstr "" -#: optiondialog.cpp:135 optiondialog.cpp:145 +#: optiondialog.cpp:137 optiondialog.cpp:147 #, kde-format msgid "" "Font: %1, %2, %3\n" @@ -1949,207 +1959,207 @@ "Example:" msgstr "" -#: optiondialog.cpp:388 +#: optiondialog.cpp:390 #, kde-format msgid "Unicode" msgstr "萬國碼" -#: optiondialog.cpp:389 +#: optiondialog.cpp:391 #, kde-format msgid "Latin1" msgstr "Latin1" -#: optiondialog.cpp:408 +#: optiondialog.cpp:410 #, kde-format msgid "Change this if non-ASCII characters are not displayed correctly." msgstr "" -#: optiondialog.cpp:491 +#: optiondialog.cpp:495 #, kde-format msgid "Configure" msgstr "設定" -#: optiondialog.cpp:568 +#: optiondialog.cpp:573 #, kde-format msgid "Font" msgstr "字型" -#: optiondialog.cpp:570 +#: optiondialog.cpp:575 #, kde-format msgid "Editor & Diff Output Font" msgstr "" -#: optiondialog.cpp:589 +#: optiondialog.cpp:594 #, kde-format msgid "Application font" msgstr "" -#: optiondialog.cpp:594 +#: optiondialog.cpp:599 #, fuzzy, kde-format #| msgid "File Save Error" msgid "File view font" msgstr "檔案儲存錯誤" -#: optiondialog.cpp:613 +#: optiondialog.cpp:618 #, kde-format msgctxt "Title for color settings page" msgid "Color" msgstr "顏色" -#: optiondialog.cpp:614 +#: optiondialog.cpp:619 #, kde-format msgid "Colors Settings" msgstr "" -#: optiondialog.cpp:631 +#: optiondialog.cpp:644 #, kde-format msgid "Editor and Diff Views:" msgstr "" -#: optiondialog.cpp:639 +#: optiondialog.cpp:652 #, kde-format msgid "Foreground color:" msgstr "前景顏色：" -#: optiondialog.cpp:647 +#: optiondialog.cpp:660 #, kde-format msgid "Background color:" msgstr "背景顏色：" -#: optiondialog.cpp:657 +#: optiondialog.cpp:670 #, kde-format msgid "Diff background color:" msgstr "" -#: optiondialog.cpp:666 +#: optiondialog.cpp:679 #, kde-format msgid "Color A:" msgstr "" -#: optiondialog.cpp:675 +#: optiondialog.cpp:688 #, kde-format msgid "Color B:" msgstr "" -#: optiondialog.cpp:684 +#: optiondialog.cpp:697 #, kde-format msgid "Color C:" msgstr "" -#: optiondialog.cpp:692 +#: optiondialog.cpp:705 #, kde-format msgid "Conflict color:" msgstr "" -#: optiondialog.cpp:701 +#: optiondialog.cpp:714 #, kde-format msgid "Current range background color:" msgstr "" -#: optiondialog.cpp:710 +#: optiondialog.cpp:723 #, kde-format msgid "Current range diff background color:" msgstr "" -#: optiondialog.cpp:718 +#: optiondialog.cpp:731 #, kde-format msgid "Color for manually aligned difference ranges:" msgstr "" -#: optiondialog.cpp:725 +#: optiondialog.cpp:738 #, kde-format msgid "Directory Comparison View:" msgstr "" -#: optiondialog.cpp:731 +#: optiondialog.cpp:744 #, kde-format msgid "Newest file color:" msgstr "" -#: optiondialog.cpp:736 +#: optiondialog.cpp:749 #, kde-format msgid "" "Changing this color will only be effective when starting the next directory " "comparison." msgstr "" -#: optiondialog.cpp:741 +#: optiondialog.cpp:754 #, kde-format msgid "Oldest file color:" msgstr "" -#: optiondialog.cpp:750 +#: optiondialog.cpp:763 #, kde-format msgid "Middle age file color:" msgstr "" -#: optiondialog.cpp:759 +#: optiondialog.cpp:772 #, kde-format msgid "Color for missing files:" msgstr "" -#: optiondialog.cpp:773 +#: optiondialog.cpp:786 #, kde-format msgid "Editor" msgstr "編輯器" -#: optiondialog.cpp:774 +#: optiondialog.cpp:787 #, kde-format msgid "Editor Behavior" msgstr "" -#: optiondialog.cpp:787 +#: optiondialog.cpp:809 #, kde-format msgid "Tab inserts spaces" msgstr "" -#: optiondialog.cpp:791 +#: optiondialog.cpp:813 #, kde-format msgid "" "On: Pressing tab generates the appropriate number of spaces.\n" "Off: A tab character will be inserted." msgstr "" -#: optiondialog.cpp:796 +#: optiondialog.cpp:818 #, kde-format msgid "Tab size:" msgstr "定位字元寬度：" -#: optiondialog.cpp:803 +#: optiondialog.cpp:825 #, kde-format msgid "Auto indentation" msgstr "" -#: optiondialog.cpp:807 +#: optiondialog.cpp:829 #, kde-format msgid "On: The indentation of the previous line is used for a new line.\n" msgstr "" -#: optiondialog.cpp:810 +#: optiondialog.cpp:832 #, kde-format msgid "Auto copy selection" msgstr "" -#: optiondialog.cpp:814 +#: optiondialog.cpp:836 #, kde-format msgid "" "On: Any selection is immediately written to the clipboard.\n" "Off: You must explicitly copy e.g. via Ctrl-C." msgstr "" -#: optiondialog.cpp:829 +#: optiondialog.cpp:851 #, kde-format msgid "" "Sets the line endings for when an edited file is saved.\n" "DOS/Windows: CR+LF; UNIX: LF; with CR=0D, LF=0A" msgstr "" -#: optiondialog.cpp:839 +#: optiondialog.cpp:861 #, kde-format msgid "Diff" msgstr "比較" -#: optiondialog.cpp:840 +#: optiondialog.cpp:862 #, kde-format msgid "Diff Settings" msgstr "Diff 設定" @@ -2163,12 +2173,12 @@ #. ); #. ++line; #. -#: optiondialog.cpp:865 +#: optiondialog.cpp:896 #, kde-format msgid "Ignore numbers (treat as white space)" msgstr "" -#: optiondialog.cpp:869 +#: optiondialog.cpp:900 #, kde-format msgid "" "Ignore number characters during line matching phase. (Similar to Ignore " @@ -2176,66 +2186,66 @@ "Might help to compare files with numeric data." msgstr "" -#: optiondialog.cpp:873 +#: optiondialog.cpp:904 #, kde-format msgid "Ignore C/C++ comments (treat as white space)" msgstr "" -#: optiondialog.cpp:876 +#: optiondialog.cpp:907 #, kde-format msgid "Treat C/C++ comments like white space." msgstr "" -#: optiondialog.cpp:879 +#: optiondialog.cpp:910 #, kde-format msgid "Ignore case (treat as white space)" msgstr "" -#: optiondialog.cpp:883 +#: optiondialog.cpp:914 #, kde-format msgid "Treat case differences like white space changes. ('a'<=>'A')" msgstr "" -#: optiondialog.cpp:886 +#: optiondialog.cpp:917 #, kde-format msgid "Preprocessor command:" msgstr "" -#: optiondialog.cpp:891 +#: optiondialog.cpp:922 #, kde-format msgid "User defined pre-processing. (See the docs for details.)" msgstr "" -#: optiondialog.cpp:894 +#: optiondialog.cpp:925 #, kde-format msgid "Line-matching preprocessor command:" msgstr "逐行比對預處理指令：" -#: optiondialog.cpp:899 +#: optiondialog.cpp:930 #, kde-format msgid "" "This pre-processor is only used during line matching.\n" "(See the docs for details.)" msgstr "" -#: optiondialog.cpp:902 +#: optiondialog.cpp:933 #, kde-format msgid "Try hard (slower)" msgstr "" -#: optiondialog.cpp:906 +#: optiondialog.cpp:937 #, kde-format msgid "" "Enables the --minimal option for the external diff.\n" "The analysis of big files will be much slower." msgstr "" -#: optiondialog.cpp:910 +#: optiondialog.cpp:941 #, kde-format msgid "Align B and C for 3 input files" msgstr "" -#: optiondialog.cpp:914 +#: optiondialog.cpp:945 #, kde-format msgid "" "Try to align B and C when comparing or merging three input files.\n" @@ -2243,66 +2253,73 @@ "(Default is off.)" msgstr "" -#: optiondialog.cpp:926 +#: optiondialog.cpp:956 +#, fuzzy, kde-format +#| msgid "Merge" +msgctxt "Settings page" +msgid "Merge" +msgstr "合併" + +#: optiondialog.cpp:957 #, kde-format msgid "Merge Settings" msgstr "" -#: optiondialog.cpp:940 +#: optiondialog.cpp:980 #, kde-format msgid "Auto advance delay (ms):" msgstr "" -#: optiondialog.cpp:946 +#: optiondialog.cpp:986 #, kde-format 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 "" -#: optiondialog.cpp:950 +#: optiondialog.cpp:990 #, kde-format msgid "Show info dialogs" msgstr "" -#: optiondialog.cpp:953 +#: optiondialog.cpp:993 #, kde-format msgid "Show a dialog with information about the number of conflicts." msgstr "" -#: optiondialog.cpp:956 +#: optiondialog.cpp:996 #, kde-format msgid "White space 2-file merge default:" msgstr "" -#: optiondialog.cpp:961 optiondialog.cpp:974 +#: optiondialog.cpp:1001 optiondialog.cpp:1014 #, kde-format msgid "Manual Choice" msgstr "" -#: optiondialog.cpp:965 optiondialog.cpp:979 +#: optiondialog.cpp:1005 optiondialog.cpp:1019 #, kde-format msgid "" "Allow the merge algorithm to automatically select an input for white-space-" "only changes." msgstr "" -#: optiondialog.cpp:969 +#: optiondialog.cpp:1009 #, kde-format msgid "White space 3-file merge default:" msgstr "" -#: optiondialog.cpp:983 +#: optiondialog.cpp:1023 #, kde-format msgid "Automatic Merge Regular Expression" msgstr "" -#: optiondialog.cpp:991 smalldialogs.cpp:449 +#: optiondialog.cpp:1031 smalldialogs.cpp:459 #, kde-format msgid "Auto merge regular expression:" msgstr "自動合併正規表示式：" -#: optiondialog.cpp:996 +#: optiondialog.cpp:1036 #, kde-format msgid "" "Regular expression for lines where KDiff3 should automatically choose one " @@ -2311,29 +2328,29 @@ "- if available - C, otherwise B will be chosen." msgstr "" -#: optiondialog.cpp:1002 +#: optiondialog.cpp:1042 #, kde-format msgid "Run regular expression auto merge on merge start" msgstr "" -#: optiondialog.cpp:1005 +#: optiondialog.cpp:1045 #, kde-format msgid "" "Run the merge for auto merge regular expressions\n" "immediately when a merge starts.\n" msgstr "" -#: optiondialog.cpp:1010 +#: optiondialog.cpp:1050 #, kde-format msgid "Version Control History Merging" msgstr "" -#: optiondialog.cpp:1018 smalldialogs.cpp:476 +#: optiondialog.cpp:1058 smalldialogs.cpp:486 #, kde-format msgid "History start regular expression:" msgstr "" -#: optiondialog.cpp:1023 +#: optiondialog.cpp:1063 #, kde-format msgid "" "Regular expression for the start of the version control history entry.\n" @@ -2341,12 +2358,12 @@ "Default value: \".*\\$Log.*\\$.*\"" msgstr "" -#: optiondialog.cpp:1029 smalldialogs.cpp:504 +#: optiondialog.cpp:1069 smalldialogs.cpp:514 #, kde-format msgid "History entry start regular expression:" msgstr "" -#: optiondialog.cpp:1042 +#: optiondialog.cpp:1082 #, kde-format msgid "" "A version control history entry consists of several lines.\n" @@ -2358,22 +2375,22 @@ "See the documentation for details." msgstr "" -#: optiondialog.cpp:1050 +#: optiondialog.cpp:1090 #, kde-format msgid "History merge sorting" msgstr "" -#: optiondialog.cpp:1053 +#: optiondialog.cpp:1093 #, kde-format msgid "Sort version control history by a key." msgstr "" -#: optiondialog.cpp:1063 +#: optiondialog.cpp:1103 #, kde-format msgid "History entry start sort key order:" msgstr "" -#: optiondialog.cpp:1068 +#: optiondialog.cpp:1108 #, kde-format msgid "" "Each pair of parentheses used in the regular expression for the history " @@ -2385,37 +2402,37 @@ "See the documentation for details." msgstr "" -#: optiondialog.cpp:1079 +#: optiondialog.cpp:1119 #, kde-format msgid "Merge version control history on merge start" msgstr "" -#: optiondialog.cpp:1082 +#: optiondialog.cpp:1122 #, kde-format msgid "Run version control history automerge on merge start." msgstr "" -#: optiondialog.cpp:1086 +#: optiondialog.cpp:1126 #, kde-format msgid "Max number of history entries:" msgstr "" -#: optiondialog.cpp:1090 +#: optiondialog.cpp:1130 #, kde-format msgid "Cut off after specified number. Use -1 for infinite number of entries." msgstr "" -#: optiondialog.cpp:1094 +#: optiondialog.cpp:1134 #, kde-format msgid "Test your regular expressions" msgstr "" -#: optiondialog.cpp:1099 +#: optiondialog.cpp:1139 #, kde-format msgid "Irrelevant merge command:" msgstr "" -#: optiondialog.cpp:1104 +#: optiondialog.cpp:1144 #, kde-format msgid "" "If specified this script is run after automerge\n" @@ -2423,12 +2440,12 @@ "Called with the parameters: filename1 filename2 filename3" msgstr "" -#: optiondialog.cpp:1109 +#: optiondialog.cpp:1149 #, kde-format msgid "Auto save and quit on merge without conflicts" msgstr "" -#: optiondialog.cpp:1113 +#: optiondialog.cpp:1153 #, kde-format msgid "" "If KDiff3 was started for a file-merge from the command line and all\n" @@ -2437,27 +2454,27 @@ "(Similar to command line option \"--auto\".)" msgstr "" -#: optiondialog.cpp:1124 optiondialog.cpp:1125 +#: optiondialog.cpp:1164 optiondialog.cpp:1165 #, kde-format msgid "Directory" msgstr "目錄" -#: optiondialog.cpp:1137 +#: optiondialog.cpp:1185 #, kde-format msgid "Recursive directories" msgstr "" -#: optiondialog.cpp:1140 +#: optiondialog.cpp:1188 #, kde-format msgid "Whether to analyze subdirectories or not." msgstr "" -#: optiondialog.cpp:1142 +#: optiondialog.cpp:1190 #, kde-format msgid "File pattern(s):" msgstr "" -#: optiondialog.cpp:1148 +#: optiondialog.cpp:1196 #, kde-format msgid "" "Pattern(s) of files to be analyzed. \n" @@ -2465,12 +2482,12 @@ "Several Patterns can be specified by using the separator: ';'" msgstr "" -#: optiondialog.cpp:1153 +#: optiondialog.cpp:1201 #, kde-format msgid "File-anti-pattern(s):" msgstr "" -#: optiondialog.cpp:1159 +#: optiondialog.cpp:1207 #, kde-format msgid "" "Pattern(s) of files to be excluded from analysis. \n" @@ -2478,12 +2495,12 @@ "Several Patterns can be specified by using the separator: ';'" msgstr "" -#: optiondialog.cpp:1164 +#: optiondialog.cpp:1212 #, kde-format msgid "Dir-anti-pattern(s):" msgstr "" -#: optiondialog.cpp:1170 +#: optiondialog.cpp:1218 #, kde-format msgid "" "Pattern(s) of directories to be excluded from analysis. \n" @@ -2491,58 +2508,58 @@ "Several Patterns can be specified by using the separator: ';'" msgstr "" -#: optiondialog.cpp:1175 +#: optiondialog.cpp:1223 #, kde-format msgid "Use .cvsignore" msgstr "" -#: optiondialog.cpp:1179 +#: optiondialog.cpp:1227 #, kde-format msgid "" "Extends the antipattern to anything that would be ignored by CVS.\n" "Via local \".cvsignore\" files this can be directory specific." msgstr "" -#: optiondialog.cpp:1183 +#: optiondialog.cpp:1231 #, kde-format msgid "Find hidden files and directories" msgstr "" -#: optiondialog.cpp:1186 +#: optiondialog.cpp:1234 #, kde-format msgid "Finds hidden files and directories." msgstr "" -#: optiondialog.cpp:1189 +#: optiondialog.cpp:1237 #, kde-format msgid "Follow file links" msgstr "" -#: optiondialog.cpp:1193 +#: optiondialog.cpp:1241 #, kde-format msgid "" "On: Compare the file the link points to.\n" "Off: Compare the links." msgstr "" -#: optiondialog.cpp:1197 +#: optiondialog.cpp:1245 #, kde-format msgid "Follow directory links" msgstr "" -#: optiondialog.cpp:1201 +#: optiondialog.cpp:1249 #, kde-format msgid "" "On: Compare the directory the link points to.\n" "Off: Compare the links." msgstr "" -#: optiondialog.cpp:1210 +#: optiondialog.cpp:1258 #, kde-format msgid "Case sensitive filename comparison" msgstr "" -#: optiondialog.cpp:1214 +#: optiondialog.cpp:1262 #, kde-format msgid "" "The directory comparison will compare files or directories when their names " @@ -2551,63 +2568,63 @@ "off, otherwise on.)" msgstr "" -#: optiondialog.cpp:1218 +#: optiondialog.cpp:1266 #, kde-format msgid "Unfold all subdirectories on load" msgstr "" -#: optiondialog.cpp:1222 +#: optiondialog.cpp:1270 #, kde-format msgid "" "On: Unfold all subdirectories when starting a directory diff.\n" "Off: Leave subdirectories folded." msgstr "" -#: optiondialog.cpp:1226 +#: optiondialog.cpp:1274 #, kde-format msgid "Skip directory status report" msgstr "" -#: optiondialog.cpp:1230 +#: optiondialog.cpp:1278 #, kde-format msgid "" "On: Do not show the Directory Comparison Status.\n" "Off: Show the status dialog on start." msgstr "" -#: optiondialog.cpp:1234 +#: optiondialog.cpp:1282 #, kde-format msgid "File Comparison Mode" msgstr "" -#: optiondialog.cpp:1239 +#: optiondialog.cpp:1287 #, kde-format msgid "Binary comparison" msgstr "" -#: optiondialog.cpp:1241 +#: optiondialog.cpp:1289 #, kde-format msgid "Binary comparison of each file. (Default)" msgstr "" -#: optiondialog.cpp:1244 +#: optiondialog.cpp:1292 #, kde-format msgid "Full analysis" msgstr "" -#: optiondialog.cpp:1246 +#: optiondialog.cpp:1294 #, kde-format msgid "" "Do a full analysis and show statistics information in extra columns.\n" "(Slower than a binary comparison, much slower for binary files.)" msgstr "" -#: optiondialog.cpp:1250 +#: optiondialog.cpp:1298 #, kde-format msgid "Trust the size and modification date (unsafe)" msgstr "" -#: optiondialog.cpp:1252 +#: optiondialog.cpp:1300 #, kde-format msgid "" "Assume that files are equal if the modification date and file length are " @@ -2617,14 +2634,14 @@ "Useful for big directories or slow networks." msgstr "" -#: optiondialog.cpp:1257 +#: optiondialog.cpp:1305 #, kde-format msgid "" "Trust the size and date, but use binary comparison if date does not match " "(unsafe)" msgstr "" -#: optiondialog.cpp:1259 +#: optiondialog.cpp:1307 #, kde-format msgid "" "Assume that files are equal if the modification date and file length are " @@ -2633,12 +2650,12 @@ "Useful for big directories or slow networks." msgstr "" -#: optiondialog.cpp:1264 +#: optiondialog.cpp:1312 #, kde-format msgid "Trust the size (unsafe)" msgstr "" -#: optiondialog.cpp:1266 +#: optiondialog.cpp:1314 #, kde-format msgid "" "Assume that files are equal if their file lengths are equal.\n" @@ -2646,12 +2663,12 @@ "download." msgstr "" -#: optiondialog.cpp:1273 +#: optiondialog.cpp:1321 #, kde-format msgid "Synchronize directories" msgstr "" -#: optiondialog.cpp:1277 +#: optiondialog.cpp:1325 #, kde-format msgid "" "Offers to store files in both directories so that\n" @@ -2659,24 +2676,24 @@ "Works only when comparing two directories without specifying a destination." msgstr "" -#: optiondialog.cpp:1283 +#: optiondialog.cpp:1331 #, kde-format msgid "White space differences considered equal" msgstr "" -#: optiondialog.cpp:1287 +#: optiondialog.cpp:1335 #, kde-format msgid "" "If files differ only by white space consider them equal.\n" "This is only active when full analysis is chosen." msgstr "" -#: optiondialog.cpp:1293 +#: optiondialog.cpp:1341 #, kde-format msgid "Copy newer instead of merging (unsafe)" msgstr "" -#: optiondialog.cpp:1297 +#: optiondialog.cpp:1345 #, kde-format msgid "" "Do not look inside, just take the newer file.\n" @@ -2684,46 +2701,46 @@ "Only effective when comparing two directories." msgstr "" -#: optiondialog.cpp:1302 +#: optiondialog.cpp:1350 #, kde-format msgid "Backup files (.orig)" msgstr "" -#: optiondialog.cpp:1306 +#: optiondialog.cpp:1354 #, kde-format msgid "" "If 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 "" -#: optiondialog.cpp:1382 optiondialog.cpp:1383 +#: optiondialog.cpp:1430 optiondialog.cpp:1431 #, kde-format msgid "Regional Settings" msgstr "區域設定" -#: optiondialog.cpp:1397 +#: optiondialog.cpp:1454 #, kde-format msgid "Use the same encoding for everything:" msgstr "" -#: optiondialog.cpp:1401 +#: optiondialog.cpp:1458 #, kde-format msgid "" "Enable this allows to change all encodings by changing the first only.\n" "Disable this if different individual settings are needed." msgstr "" -#: optiondialog.cpp:1405 +#: optiondialog.cpp:1462 #, kde-format msgid "Note: Local Encoding is \"%1\"" msgstr "" -#: optiondialog.cpp:1409 +#: optiondialog.cpp:1466 #, kde-format msgid "File Encoding for A:" msgstr "" -#: optiondialog.cpp:1416 +#: optiondialog.cpp:1473 #, kde-format msgid "" "If enabled then Unicode (UTF-16 or UTF-8) encoding will be detected.\n" @@ -2732,32 +2749,32 @@ "(Unicode detection depends on the first bytes of a file.)" msgstr "" -#: optiondialog.cpp:1419 optiondialog.cpp:1430 optiondialog.cpp:1441 +#: optiondialog.cpp:1476 optiondialog.cpp:1487 optiondialog.cpp:1498 #, kde-format msgid "Auto Detect Unicode" msgstr "" -#: optiondialog.cpp:1425 +#: optiondialog.cpp:1482 #, kde-format msgid "File Encoding for B:" msgstr "" -#: optiondialog.cpp:1436 +#: optiondialog.cpp:1493 #, kde-format msgid "File Encoding for C:" msgstr "" -#: optiondialog.cpp:1447 +#: optiondialog.cpp:1504 #, kde-format msgid "File Encoding for Merge Output and Saving:" msgstr "" -#: optiondialog.cpp:1452 +#: optiondialog.cpp:1509 #, kde-format msgid "Auto Select" msgstr "" -#: optiondialog.cpp:1456 +#: optiondialog.cpp:1513 #, kde-format msgid "" "If enabled then the encoding from the input files is used.\n" @@ -2765,39 +2782,39 @@ "saving." msgstr "" -#: optiondialog.cpp:1459 +#: optiondialog.cpp:1516 #, kde-format msgid "File Encoding for Preprocessor Files:" msgstr "" -#: optiondialog.cpp:1471 +#: optiondialog.cpp:1528 #, kde-format msgid "Right To Left Language" msgstr "" -#: optiondialog.cpp:1475 +#: optiondialog.cpp:1532 #, kde-format msgid "" "Some languages are read from right to left.\n" "This setting will change the viewer and editor accordingly." msgstr "" -#: optiondialog.cpp:1485 +#: optiondialog.cpp:1542 #, kde-format msgid "Integration" msgstr "整合" -#: optiondialog.cpp:1486 +#: optiondialog.cpp:1543 #, kde-format msgid "Integration Settings" msgstr "" -#: optiondialog.cpp:1499 +#: optiondialog.cpp:1564 #, kde-format msgid "Command line options to ignore:" msgstr "" -#: optiondialog.cpp:1505 +#: optiondialog.cpp:1570 #, kde-format msgid "" "List of command line options that should be ignored when KDiff3 is used by " @@ -2806,19 +2823,19 @@ "This will suppress the \"Unknown option\" error." msgstr "" -#: optiondialog.cpp:1510 +#: optiondialog.cpp:1575 #, kde-format msgid "Quit also via Escape key" msgstr "" -#: optiondialog.cpp:1514 +#: optiondialog.cpp:1579 #, kde-format msgid "" "Fast method to exit.\n" "For those who are used to using the Escape key." msgstr "" -#: optiondialog.cpp:1598 +#: optiondialog.cpp:1653 #, kde-format msgid "This resets all options. Not only those of the current topic." msgstr "" @@ -2870,77 +2887,68 @@ msgid "Disable Unsafe Options" msgstr "" -#: pdiff.cpp:158 +#: pdiff.cpp:160 #, kde-format msgid "Loading A" msgstr "載入 A 中" -#: pdiff.cpp:167 -#, kde-format -msgid "Errors occurred during pre-processing of file A." -msgstr "" +#: pdiff.cpp:162 +#, fuzzy, kde-format +#| msgid "Loading A" +msgid "Loading A: %1" +msgstr "載入 A 中" -#: pdiff.cpp:172 +#: pdiff.cpp:170 #, kde-format msgid "Loading B" msgstr "載入 B 中" -#: pdiff.cpp:179 -#, kde-format -msgid "Errors occurred during pre-processing of file B." -msgstr "" - -#: pdiff.cpp:202 pdiff.cpp:241 +#: pdiff.cpp:201 pdiff.cpp:237 #, kde-format msgid "Diff: A <-> B" msgstr "" -#: pdiff.cpp:208 pdiff.cpp:279 pdiff.cpp:293 +#: pdiff.cpp:207 pdiff.cpp:275 pdiff.cpp:289 #, kde-format msgid "Linediff: A <-> B" msgstr "" -#: pdiff.cpp:225 +#: pdiff.cpp:224 #, kde-format msgid "Loading C" msgstr "載入 C 中" -#: pdiff.cpp:232 -#, kde-format -msgid "Errors occurred during pre-processing of file C." -msgstr "" - -#: pdiff.cpp:250 +#: pdiff.cpp:246 #, kde-format msgid "Diff: A <-> C" msgstr "" -#: pdiff.cpp:261 +#: pdiff.cpp:257 #, kde-format msgid "Diff: B <-> C" msgstr "" -#: pdiff.cpp:283 pdiff.cpp:297 +#: pdiff.cpp:279 pdiff.cpp:293 #, kde-format msgid "Linediff: B <-> C" msgstr "" -#: pdiff.cpp:287 pdiff.cpp:301 +#: pdiff.cpp:283 pdiff.cpp:297 #, kde-format msgid "Linediff: A <-> C" msgstr "" -#: pdiff.cpp:829 +#: pdiff.cpp:819 #, kde-format msgid "All input files contain the same text, but are not binary equal." msgstr "所有輸入檔都有相同的文字內容，但檔案內容卻不完全相同。" -#: pdiff.cpp:835 pdiff.cpp:839 pdiff.cpp:843 +#: pdiff.cpp:825 pdiff.cpp:829 pdiff.cpp:833 #, kde-format msgid "Files %1 and %2 have equal text, but are not binary equal. \n" msgstr "檔案 %1 與 %2 內容文字完全相同，但檔案內容不完全相同。\n" -#: pdiff.cpp:853 +#: pdiff.cpp:843 #, kde-format msgid "" "Some input files do not seem to be pure text files.\n" @@ -2948,17 +2956,17 @@ "Continue at your own risk." msgstr "" -#: pdiff.cpp:863 +#: pdiff.cpp:853 #, kde-format msgid ", B" msgstr "" -#: pdiff.cpp:865 +#: pdiff.cpp:855 #, kde-format msgid ", C" msgstr "" -#: pdiff.cpp:867 +#: pdiff.cpp:857 #, kde-format msgid "" "Some input characters could not be converted to valid unicode.\n" @@ -2967,77 +2975,72 @@ "Affected input files are in %1." msgstr "" -#: pdiff.cpp:1034 +#: pdiff.cpp:1032 #, kde-format msgid "Abort" msgstr "中止" -#: pdiff.cpp:1040 pdiff.cpp:1130 +#: pdiff.cpp:1038 pdiff.cpp:1129 #, kde-format msgid "Opening files..." msgstr "開啟檔案中..." -#: pdiff.cpp:1107 -#, kde-format -msgid "File open error" -msgstr "檔案開啟失敗" - -#: pdiff.cpp:1202 +#: pdiff.cpp:1212 #, kde-format msgid "Cutting selection..." msgstr "正在剪下所選取的項目..." -#: pdiff.cpp:1223 +#: pdiff.cpp:1233 #, kde-format msgid "Copying selection to clipboard..." msgstr "正在複製所選取的項目到剪貼簿..." -#: pdiff.cpp:1239 +#: pdiff.cpp:1249 #, kde-format msgid "Inserting clipboard contents..." msgstr "正在插入剪貼簿內容..." -#: pdiff.cpp:1695 +#: pdiff.cpp:1705 #, kde-format msgid "Word wrap (Cancel disables word wrap)" msgstr "" -#: pdiff.cpp:1696 +#: pdiff.cpp:1706 #, kde-format msgid "Calculating max width for horizontal scrollbar" msgstr "" -#: pdiff.cpp:1911 +#: pdiff.cpp:1921 #, kde-format msgid "Save && Continue" msgstr "儲存並繼續" -#: pdiff.cpp:1912 +#: pdiff.cpp:1922 #, kde-format msgid "Continue Without Saving" msgstr "不儲存但繼續" -#: pdiff.cpp:2124 +#: pdiff.cpp:2134 #, kde-format msgid "Search complete." msgstr "搜尋完成。" -#: pdiff.cpp:2124 +#: pdiff.cpp:2134 #, kde-format msgid "Search Complete" msgstr "搜尋完成" -#: pdiff.cpp:2375 +#: pdiff.cpp:2385 #, kde-format msgid "Nothing is selected in either diff input window." msgstr "" -#: pdiff.cpp:2375 +#: pdiff.cpp:2385 #, kde-format msgid "Error while adding manual diff range" msgstr "新增手動比對範圍時發生錯誤" -#: progress.cpp:59 progress.cpp:71 +#: progress.cpp:61 progress.cpp:73 #, kde-format msgid "&Cancel" msgstr "取消(&C)" @@ -3047,190 +3050,190 @@ msgid "A (Base):" msgstr "" -#: smalldialogs.cpp:68 smalldialogs.cpp:85 smalldialogs.cpp:102 -#: smalldialogs.cpp:144 +#: smalldialogs.cpp:71 smalldialogs.cpp:90 smalldialogs.cpp:109 +#: smalldialogs.cpp:154 #, kde-format msgid "File..." msgstr "檔案..." -#: smalldialogs.cpp:70 smalldialogs.cpp:87 smalldialogs.cpp:104 -#: smalldialogs.cpp:146 +#: smalldialogs.cpp:73 smalldialogs.cpp:92 smalldialogs.cpp:111 +#: smalldialogs.cpp:156 #, kde-format msgid "Dir..." msgstr "方向..." -#: smalldialogs.cpp:96 +#: smalldialogs.cpp:103 #, kde-format msgid "C (Optional):" msgstr "C (選擇性)：" -#: smalldialogs.cpp:119 +#: smalldialogs.cpp:126 #, kde-format msgid "Swap/Copy Names..." msgstr "" -#: smalldialogs.cpp:124 smalldialogs.cpp:125 smalldialogs.cpp:126 +#: smalldialogs.cpp:131 smalldialogs.cpp:132 smalldialogs.cpp:133 #, kde-format msgid "Swap %1<->%2" msgstr "交換 %1<->%2" -#: smalldialogs.cpp:127 smalldialogs.cpp:128 smalldialogs.cpp:129 +#: smalldialogs.cpp:134 smalldialogs.cpp:135 smalldialogs.cpp:136 #, kde-format msgid "Copy %1->Output" msgstr "複製 %1 -> 輸出" -#: smalldialogs.cpp:130 smalldialogs.cpp:131 smalldialogs.cpp:132 +#: smalldialogs.cpp:137 smalldialogs.cpp:138 smalldialogs.cpp:139 #, kde-format msgid "Swap %1<->Output" msgstr "交換 %1 <-> 輸出" -#: smalldialogs.cpp:138 +#: smalldialogs.cpp:148 #, kde-format msgid "Output (optional):" msgstr "輸出 (選擇性)：" -#: smalldialogs.cpp:168 +#: smalldialogs.cpp:178 #, kde-format msgid "Configure..." msgstr "設定..." -#: smalldialogs.cpp:233 +#: smalldialogs.cpp:243 #, fuzzy, kde-format #| msgid "Directory" msgid "Open Directory" msgstr "目錄" -#: smalldialogs.cpp:234 +#: smalldialogs.cpp:244 #, kde-format msgid "Select Output File" msgstr "" -#: smalldialogs.cpp:393 +#: smalldialogs.cpp:403 #, kde-format msgid "Search text:" msgstr "搜尋文字：" -#: smalldialogs.cpp:400 +#: smalldialogs.cpp:410 #, kde-format msgid "Case sensitive" msgstr "區分大小寫" -#: smalldialogs.cpp:403 +#: smalldialogs.cpp:413 #, kde-format msgid "Search A" msgstr "搜尋 A" -#: smalldialogs.cpp:408 +#: smalldialogs.cpp:418 #, kde-format msgid "Search B" msgstr "搜尋 B" -#: smalldialogs.cpp:413 +#: smalldialogs.cpp:423 #, kde-format msgid "Search C" msgstr "搜尋 C" -#: smalldialogs.cpp:418 +#: smalldialogs.cpp:428 #, kde-format msgid "Search output" msgstr "搜尋輸出" -#: smalldialogs.cpp:425 +#: smalldialogs.cpp:435 #, kde-format msgid "&Search" msgstr "搜尋(&S)" -#: smalldialogs.cpp:444 +#: smalldialogs.cpp:454 #, kde-format msgid "Regular Expression Tester" msgstr "正規表示式測試器" -#: smalldialogs.cpp:457 +#: smalldialogs.cpp:467 #, kde-format msgid "Example auto merge line:" msgstr "" -#: smalldialogs.cpp:459 +#: smalldialogs.cpp:469 #, kde-format msgid "To test auto merge, copy a line as used in your files." msgstr "" -#: smalldialogs.cpp:465 smalldialogs.cpp:493 smalldialogs.cpp:529 +#: smalldialogs.cpp:475 smalldialogs.cpp:503 smalldialogs.cpp:539 #, kde-format msgid "Match result:" msgstr "" -#: smalldialogs.cpp:484 +#: smalldialogs.cpp:494 #, kde-format msgid "Example history start line (with leading comment):" msgstr "" -#: smalldialogs.cpp:486 +#: smalldialogs.cpp:496 #, kde-format msgid "" "Copy a history start line as used in your files,\n" "including the leading comment." msgstr "" -#: smalldialogs.cpp:512 +#: smalldialogs.cpp:522 #, kde-format msgid "History sort key order:" msgstr "" -#: smalldialogs.cpp:520 +#: smalldialogs.cpp:530 #, kde-format msgid "Example history entry start line (without leading comment):" msgstr "" -#: smalldialogs.cpp:522 +#: smalldialogs.cpp:532 #, kde-format msgid "" "Copy a history entry start line as used in your files,\n" "but omit the leading comment." msgstr "" -#: smalldialogs.cpp:536 +#: smalldialogs.cpp:546 #, kde-format msgid "Sort key result:" msgstr "" -#: smalldialogs.cpp:584 smalldialogs.cpp:594 smalldialogs.cpp:614 +#: smalldialogs.cpp:594 smalldialogs.cpp:604 smalldialogs.cpp:624 #, kde-format msgid "Match success." msgstr "" -#: smalldialogs.cpp:588 smalldialogs.cpp:598 smalldialogs.cpp:620 +#: smalldialogs.cpp:598 smalldialogs.cpp:608 smalldialogs.cpp:630 #, kde-format msgid "Match failed." msgstr "" -#: smalldialogs.cpp:605 +#: smalldialogs.cpp:615 #, kde-format msgid "Opening and closing parentheses do not match in regular expression." msgstr "" -#: SourceData.cpp:150 +#: SourceData.cpp:153 #, kde-format msgid "Writing clipboard data to temp file failed." msgstr "將剪貼簿資料寫入暫存檔失敗。" -#: SourceData.cpp:154 +#: SourceData.cpp:157 #, kde-format msgid "From Clipboard" msgstr "從剪貼簿" -#: SourceData.cpp:335 +#: SourceData.cpp:348 #, fuzzy, kde-format #| msgid "Mix of links and normal files." msgid "%1 is not a normal file." msgstr "連結與一般檔案混合。" -#: SourceData.cpp:427 +#: SourceData.cpp:440 #, kde-format msgid " Temp file is: %1" msgstr "" -#: SourceData.cpp:432 +#: SourceData.cpp:445 #, kde-format msgid "" "Preprocessing possibly failed. Check this command:\n" @@ -3245,12 +3248,12 @@ "\n" "預處理指令將會被關閉。" -#: SourceData.cpp:443 SourceData.cpp:512 +#: SourceData.cpp:456 SourceData.cpp:525 #, kde-format msgid "File %1 too large to process. Skipping." msgstr "" -#: SourceData.cpp:487 +#: SourceData.cpp:500 #, kde-format msgid "" "The line-matching-preprocessing possibly failed. Check this command:\n" diff -Nru kdiff3-1.8.01/README kdiff3-1.8.3/README --- kdiff3-1.8.01/README 2019-05-18 01:01:30.000000000 +0000 +++ kdiff3-1.8.3/README 2020-06-25 00:17:35.000000000 +0000 @@ -3,18 +3,25 @@ Author: Joachim Eibl (joachim.eibl at gmx.de) Port to KF5/Qt5 by Michael Reeves (reeves.87@gmail.com) -KDiff3-Version: 1.8 - -Now requires Qt 5.6 or later and KF5 5.14+. Legacy 0.9.98 and earlier builds are not supported. -MacOSX build is untested since port. The Konqueror specific plugin is not ported and no longer maintained. -This plugin would only apply to KDE before 4.6. Support as been removed from main CMakeLists.txt. -As of 1/13/17 cmake 3.1+ is the targeted cmake version. +KDiff3-Version: 1.8.3 +Now requires Qt 5.6 or later and KF5 5.27+. Legacy 0.9.98 and earlier builds are not supported. +MacOSX build is 64-bit only unfortantually I cann't test build locally. The Konqueror specific plugin +is not ported and no longer maintained. This plugin would only apply to KDE before 4.6. As of 1/13/17 +cmake 3.1+ is the targeted cmake version. cmake is now the only build system supported. KF5/Qt5 was big jump. A lot changed besides just the API. I am not against a Qt5-only build variant but see no reason to maintain two separate build systems. At present KF5 is my focus. +Known Issues: +*Binary comparison has been temporarily disabled due to stability issues. +*Network comparison operation via non file urls may hang or crash. This is under investegation. + +The current reprository is at https://invent.kde.org/kde/kdiff3 + +Bugs can be reported at https://bugs.kde.org + The original pre KF5/Qt5 Readme follows old build instructions have been removed to avoid confusion: diff -Nru kdiff3-1.8.01/src/CMakeLists.txt kdiff3-1.8.3/src/CMakeLists.txt --- kdiff3-1.8.01/src/CMakeLists.txt 2019-05-18 01:01:30.000000000 +0000 +++ kdiff3-1.8.3/src/CMakeLists.txt 2020-06-25 00:17:35.000000000 +0000 @@ -31,6 +31,10 @@ Logging.cpp FileNameLineEdit.cpp ) +ki18n_wrap_ui(kdiff3part_PART_SRCS + scroller.ui +) + add_library(kdiff3part MODULE ${kdiff3part_PART_SRCS}) set_target_properties(kdiff3part PROPERTIES DEFINE_SYMBOL KDIFF3_PART) @@ -49,12 +53,33 @@ ${kdiff3part_PART_SRCS} ) +#cann't use add_subdirectory because it changes the scope. +include(icons/CMakeLists.txt) add_executable(kdiff3 ${kdiff3_SRCS}) target_link_libraries(kdiff3 KF5::ConfigCore KF5::ConfigGui KF5::Parts KF5::Crash ${KDiff3_LIBRARIES} ) target_compile_features(kdiff3 PRIVATE ${needed_features}) -install(TARGETS kdiff3 ${INSTALL_TARGETS_DEFAULT_ARGS}) +# See https://cmake.org/cmake/help/v3.15/prop_tgt/MACOSX_BUNDLE_INFO_PLIST.html +if(APPLE) + set_property( + TARGET kdiff3 + PROPERTY MACOSX_BUNDLE_INFO_PLIST ${CMAKE_CURRENT_SOURCE_DIR}/MacOSXBundleInfo.plist.in + ) + + # These are substituted by CMake into plist.in. + set(MACOSX_BUNDLE_DISPLAY_NAME "KDiff3") + set(MACOSX_BUNDLE_GUI_IDENTIFIER "org.kde.KDiff3") + set(MACOSX_BUNDLE_BUNDLE_NAME "KDiff3") + set(MACOSX_BUNDLE_DISPLAY_NAME "KDiff3") + set(MACOSX_BUNDLE_INFO_STRING "KDiff3 - Diff/Patch Frontend") + set(MACOSX_BUNDLE_LONG_VERSION_STRING "KDiff3 ${KDIFF3_VERSION}") + set(MACOSX_BUNDLE_SHORT_VERSION_STRING "${KDIFF3_VERSION_MAJOR}.${KDIFF3_VERSION_MINOR}") + set(MACOSX_BUNDLE_BUNDLE_VERSION "${KDIFF3_VERSION}") + set(MACOSX_BUNDLE_COPYRIGHT "2003-2020 The KDiff3 Authors") +endif() + +install(TARGETS kdiff3 ${KDE_INSTALL_TARGETS_DEFAULT_ARGS}) ########### install files ############### @@ -66,4 +91,3 @@ install( PROGRAMS org.kde.kdiff3.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} ) install( FILES org.kde.kdiff3.appdata.xml DESTINATION ${KDE_INSTALL_METAINFODIR} ) -add_subdirectory(icons) diff -Nru kdiff3-1.8.01/src/cvsignorelist.cpp kdiff3-1.8.3/src/cvsignorelist.cpp --- kdiff3-1.8.01/src/cvsignorelist.cpp 2019-05-18 01:01:30.000000000 +0000 +++ kdiff3-1.8.3/src/cvsignorelist.cpp 2020-06-25 00:17:35.000000000 +0000 @@ -15,6 +15,7 @@ #include #include +#include void CvsIgnoreList::init(FileAccess& dir, const t_DirectoryList* pDirList) { @@ -36,7 +37,7 @@ FileAccess file(dir); file.addPath(".cvsignore"); qint64 size = file.exists() ? file.sizeForReading() : 0; - if(size > 0) + if(size > 0 && size <= (qint64)std::numeric_limits::max()) { char* buf = new char[size]; if(buf != nullptr) @@ -147,7 +148,12 @@ bool CvsIgnoreList::matches(const QString& text, bool bCaseSensitive) const { - if(m_exactPatterns.indexOf(text) >= 0) + /* + Don't let the compilier create a temporary QRegExp explictly create one to prevent a possiable crash + QString::indexOf and therefor QStringList::indexOf may modify the QRegExp passed to it. + */ + QRegExp regexp(text, bCaseSensitive ? Qt::CaseSensitive : Qt::CaseInsensitive); + if(m_exactPatterns.indexOf(regexp) >= 0) { return true; } @@ -156,7 +162,7 @@ QStringList::ConstIterator itEnd; for(it = m_startPatterns.begin(), itEnd = m_startPatterns.end(); it != itEnd; ++it) { - if(text.startsWith(*it)) + if(text.startsWith(*it, bCaseSensitive ? Qt::CaseSensitive : Qt::CaseInsensitive)) { return true; } @@ -164,7 +170,7 @@ for(it = m_endPatterns.begin(), itEnd = m_endPatterns.end(); it != itEnd; ++it) { - if(text.mid(text.length() - (*it).length()) == *it) //(text.endsWith(*it)) + if(text.midRef(text.length() - (*it).length()).compare(*it, bCaseSensitive ? Qt::CaseSensitive : Qt::CaseInsensitive) == 0) //(text.endsWith(*it)) { return true; } diff -Nru kdiff3-1.8.01/src/diff.h kdiff3-1.8.3/src/diff.h --- kdiff3-1.8.01/src/diff.h 2019-05-18 01:01:30.000000000 +0000 +++ kdiff3-1.8.3/src/diff.h 2020-06-25 00:17:35.000000000 +0000 @@ -234,7 +234,7 @@ void calcWhiteDiff3Lines(const LineData* pldA, const LineData* pldB, const LineData* pldC); //TODO: Add safety guards to prevent list from getting too large. Same problem as with QLinkedList. int size() const { - if(std::list::size() > std::numeric_limits::max()) + if(std::list::size() > (size_t)std::numeric_limits::max())//explicit cast insure correct results { qCDebug(kdeMain) << "Diff3Line: List too large. size=" << std::list::size(); Q_ASSERT(false);//Unsupported size diff -Nru kdiff3-1.8.01/src/difftextwindow.cpp kdiff3-1.8.3/src/difftextwindow.cpp --- kdiff3-1.8.01/src/difftextwindow.cpp 2019-05-18 01:01:30.000000000 +0000 +++ kdiff3-1.8.3/src/difftextwindow.cpp 2020-06-25 00:17:35.000000000 +0000 @@ -18,6 +18,7 @@ #include "options.h" #include "FileNameLineEdit.h" #include "RLPainter.h" +#include "Utils.h" #include #include @@ -136,9 +137,9 @@ RLPainter& p, const LineData* pld, const DiffList* pLineDiff1, const DiffList* pLineDiff2, int line, int whatChanged, int whatChanged2, int srcLineIdx, - int wrapLineOffset, int wrapLineLength, bool bWrapLine, const QRect& invalidRect, int deviceWidth); + int wrapLineOffset, int wrapLineLength, bool bWrapLine, const QRect& invalidRect); - void draw(RLPainter& p, const QRect& invalidRect, int deviceWidth, int beginLine, int endLine); + void draw(RLPainter& p, const QRect& invalidRect, int beginLine, int endLine); QStatusBar* m_pStatusBar; @@ -288,19 +289,19 @@ void DiffTextWindow::setHorizScrollOffset(int horizScrollOffset) { - int fontWidth = fontMetrics().width('0'); + int fontWidth = Utils::getHorizontalAdvance(fontMetrics(), '0'); int xOffset = d->leftInfoWidth() * fontWidth; int deltaX = d->m_horizScrollOffset - std::max(0, horizScrollOffset); d->m_horizScrollOffset = std::max(0, horizScrollOffset); - QRect r(xOffset, 0, width() - xOffset, height()); + QRect r(xOffset, 0, width(), height()); if(d->m_pOptions->m_bRightToLeftLanguage) { deltaX = -deltaX; - r = QRect(width() - xOffset - 2, 0, -(width() - xOffset), height()).normalized(); + r = QRect(width() - xOffset - 2, 0, -(width()), height()).normalized(); } if(d->m_bSelectionInProgress && d->m_selection.isValidFirstLine()) @@ -313,6 +314,7 @@ else { scroll(deltaX, 0, r); + update(); } } @@ -433,7 +435,7 @@ int pos; convertToLinePos(e->x(), e->y(), line, pos); - int fontWidth = fontMetrics().width('0'); + int fontWidth = Utils::getHorizontalAdvance(fontMetrics(), '0'); int xOffset = d->leftInfoWidth() * fontWidth; if((!d->m_pOptions->m_bRightToLeftLanguage && e->x() < xOffset) || (d->m_pOptions->m_bRightToLeftLanguage && e->x() > width() - xOffset)) @@ -563,7 +565,7 @@ // Scroll because mouse moved out of the window const QFontMetrics& fm = fontMetrics(); - int fontWidth = fm.width('0'); + int fontWidth = Utils::getHorizontalAdvance(fm, '0'); int deltaX = 0; int deltaY = 0; if(!d->m_pOptions->m_bRightToLeftLanguage) @@ -756,7 +758,7 @@ int leading = m_pDiffTextWindow->fontMetrics().leading(); int height = 0; - int fontWidth = m_pDiffTextWindow->fontMetrics().width('0'); + int fontWidth = Utils::getHorizontalAdvance(m_pDiffTextWindow->fontMetrics(), '0'); int xOffset = leftInfoWidth() * fontWidth - m_horizScrollOffset; int textWidth = visibleTextWidth; if(textWidth < 0) @@ -793,6 +795,10 @@ textLayout.setPosition(QPointF(xOffset, 0)); } +/* + Don't try to use invalid rect to block drawing of lines based on there apparent dementions. + This does not always work for very long lines being scrolled horzontally. (Causes blanking of diff text area) +*/ void DiffTextWindowData::writeLine( RLPainter& p, const LineData* pld, @@ -805,25 +811,18 @@ int wrapLineOffset, int wrapLineLength, bool bWrapLine, - const QRect& invalidRect, - int deviceWidth) + const QRect& invalidRect) { QFont normalFont = p.font(); const QFontMetrics& fm = p.fontMetrics(); int fontHeight = fm.lineSpacing(); int fontAscent = fm.ascent(); - int fontWidth = fm.width('0'); + int fontWidth = Utils::getHorizontalAdvance(fm, '0'); int xOffset = leftInfoWidth() * fontWidth - m_horizScrollOffset; int yOffset = (line - m_firstLine) * fontHeight; - QRect lineRect(xOffset, yOffset, deviceWidth, fontHeight); - if(!invalidRect.intersects(lineRect)) - { - return; - } - int fastSelectorLine1 = m_pDiffTextWindow->convertDiff3LineIdxToLine(m_fastSelectorLine1); int fastSelectorLine2 = m_pDiffTextWindow->convertDiff3LineIdxToLine(m_fastSelectorLine1 + m_fastSelectorNofLines) - 1; @@ -960,8 +959,8 @@ { if(m_pOptions->m_bShowLineNumbers && !bWrapLine) { - QString num; - num.sprintf("%0*d", m_lineNumberWidth, srcLineIdx + 1); + QString num = QString::number(srcLineIdx + 1); + Q_ASSERT(!num.isEmpty()); p.drawText(0, yOffset + fontAscent, num); //p.drawLine( xLeft -1, yOffset, xLeft -1, yOffset+fontHeight-1 ); } @@ -1027,12 +1026,12 @@ int endLine = std::min(d->m_firstLine + getNofVisibleLines() + 2, getNofLines()); - RLPainter p(this, d->m_pOptions->m_bRightToLeftLanguage, width(), fontMetrics().width('0')); + RLPainter p(this, d->m_pOptions->m_bRightToLeftLanguage, width(), Utils::getHorizontalAdvance(fontMetrics(), '0')); p.setFont(font()); p.QPainter::fillRect(invalidRect, d->m_pOptions->m_bgColor); - d->draw(p, invalidRect, width(), d->m_firstLine, endLine); + d->draw(p, invalidRect, d->m_firstLine, endLine); p.end(); d->m_oldFirstLine = d->m_firstLine; @@ -1053,12 +1052,12 @@ QRect invalidRect = QRect(0, 0, 1000000000, 1000000000); QColor bgColor = d->m_pOptions->m_bgColor; d->m_pOptions->m_bgColor = Qt::white; - d->draw(p, invalidRect, p.window().width(), firstLine, std::min(firstLine + nofLinesPerPage, getNofLines())); + d->draw(p, invalidRect, firstLine, std::min(firstLine + nofLinesPerPage, getNofLines())); d->m_pOptions->m_bgColor = bgColor; d->m_firstLine = oldFirstLine; } -void DiffTextWindowData::draw(RLPainter& p, const QRect& invalidRect, int deviceWidth, int beginLine, int endLine) +void DiffTextWindowData::draw(RLPainter& p, const QRect& invalidRect, int beginLine, int endLine) { m_lineNumberWidth = m_pOptions->m_bShowLineNumbers ? (int)log10((double)std::max(m_size, 1)) + 1 : 0; @@ -1122,8 +1121,7 @@ wrapLineOffset, wrapLineLength, bWrapLine, - invalidRect, - deviceWidth); + invalidRect); } } @@ -1182,7 +1180,7 @@ QSize s = e->size(); QFontMetrics fm = fontMetrics(); int visibleLines = s.height() / fm.lineSpacing() - 2; - int visibleColumns = s.width() / fm.width('0') - d->leftInfoWidth(); + int visibleColumns = s.width() / Utils::getHorizontalAdvance(fm, '0') - d->leftInfoWidth(); if(e->size().height() != e->oldSize().height()) emit resizeHeightChangedSignal(visibleLines); if(e->size().width() != e->oldSize().width()) @@ -1201,7 +1199,7 @@ int DiffTextWindow::getVisibleTextAreaWidth() { QFontMetrics fm = fontMetrics(); - return width() - d->leftInfoWidth() * fm.width('0'); + return width() - d->leftInfoWidth() * Utils::getHorizontalAdvance(fm, '0'); } QString DiffTextWindow::getSelection() @@ -1448,7 +1446,7 @@ d->m_selection.end(lastD3LIdx, lastD3LPos); } -int s_maxNofRunnables = 0; +QAtomicInt s_maxNofRunnables = 0; class RecalcWordWrapRunnable : public QRunnable { @@ -1576,7 +1574,7 @@ if(visibleTextWidth < 0) visibleTextWidth = getVisibleTextAreaWidth(); else - visibleTextWidth -= d->leftInfoWidth() * fontMetrics().width('0'); + visibleTextWidth -= d->leftInfoWidth() * Utils::getHorizontalAdvance(fontMetrics(), '0'); int i; int wrapLineIdx = 0; int size = d->m_pDiff3LineVector->size(); @@ -1777,7 +1775,8 @@ pHL2->setMargin(0); pHL2->setSpacing(2); pHL2->addWidget(d->m_pTopLine, 0); - d->m_pEncoding = new EncodingLabel(i18n("Encoding:"), this, psd, pOptions); + d->m_pEncoding = new EncodingLabel(i18n("Encoding:"), psd, pOptions); + connect((EncodingLabel*) d->m_pEncoding, &EncodingLabel::encodingChanged, this, &DiffTextWindowFrame::slotEncodingChanged); d->m_pLineEndStyle = new QLabel(i18n("Line end style:")); pHL2->addWidget(d->m_pEncoding); @@ -1837,8 +1836,7 @@ int l = pDTW->calcTopLineInFile(firstLine); - int w = d->m_pTopLine->fontMetrics().width( - s + ' ' + QString().fill('0', lineNumberWidth)); + int w = Utils::getHorizontalAdvance(d->m_pTopLine->fontMetrics(), s + ' ' + QString().fill('0', lineNumberWidth)); d->m_pTopLine->setMinimumWidth(w); if(l == -1) @@ -1908,15 +1906,9 @@ } } -void DiffTextWindowFrame::sendEncodingChangedSignal(QTextCodec* c) -{ - emit encodingChanged(c); -} - -EncodingLabel::EncodingLabel(const QString& text, DiffTextWindowFrame* pDiffTextWindowFrame, SourceData* pSD, Options* pOptions) +EncodingLabel::EncodingLabel(const QString& text, SourceData* pSD, Options* pOptions) : QLabel(text) { - m_pDiffTextWindowFrame = pDiffTextWindowFrame; m_pOptions = pOptions; m_pSourceData = pSD; m_pContextEncodingMenu = nullptr; @@ -1983,19 +1975,21 @@ if(pCodec != nullptr && !codecEnumList.contains(CodecMIBEnum)) { QAction* pAction = new QAction(pMenu); // menu takes ownership, so deleting the menu deletes the action too. - QLatin1String codecName(pCodec->name()); + QByteArray nameArray = pCodec->name(); + QLatin1String codecName = QLatin1String(nameArray); + pAction->setText(visibleCodecName.isEmpty() ? codecName : visibleCodecName + QLatin1String(" (") + codecName + QLatin1String(")")); pAction->setData(CodecMIBEnum); pAction->setCheckable(true); if(currentTextCodecEnum == CodecMIBEnum) pAction->setChecked(true); pMenu->addAction(pAction); - connect(pAction, &QAction::triggered, this, &EncodingLabel::slotEncodingChanged); + connect(pAction, &QAction::triggered, this, &EncodingLabel::slotSelectEncoding); codecEnumList.append(CodecMIBEnum); } } -void EncodingLabel::slotEncodingChanged() +void EncodingLabel::slotSelectEncoding() { QAction* pAction = qobject_cast(sender()); if(pAction) @@ -2015,6 +2009,7 @@ recentEncodings.append(s); } } - m_pDiffTextWindowFrame->sendEncodingChangedSignal(pCodec); + + emit encodingChanged(pCodec); } } diff -Nru kdiff3-1.8.01/src/difftextwindow.h kdiff3-1.8.3/src/difftextwindow.h --- kdiff3-1.8.01/src/difftextwindow.h 2019-05-18 01:01:30.000000000 +0000 +++ kdiff3-1.8.3/src/difftextwindow.h 2020-06-25 00:17:35.000000000 +0000 @@ -116,7 +116,6 @@ DiffTextWindow* getDiffTextWindow(); void init(); void setFirstLine(int firstLine); - void sendEncodingChangedSignal(QTextCodec* c); Q_SIGNALS: void fileNameChanged(const QString&, e_SrcSelector); void encodingChanged(QTextCodec*); @@ -126,7 +125,7 @@ private Q_SLOTS: void slotReturnPressed(); void slotBrowseButtonClicked(); - + void slotEncodingChanged(QTextCodec* c) { emit encodingChanged(c); };//relay signal from encoding label private: DiffTextWindowFrameData* d; }; @@ -135,14 +134,15 @@ { Q_OBJECT public: - EncodingLabel( const QString & text, DiffTextWindowFrame* pDiffTextWindowFrame, SourceData* psd, Options* pOptions); + EncodingLabel( const QString & text, SourceData* psd, Options* pOptions); protected: void mouseMoveEvent(QMouseEvent *ev) override; void mousePressEvent(QMouseEvent *ev) override; +Q_SIGNALS: + void encodingChanged(QTextCodec*); private Q_SLOTS: - void slotEncodingChanged(); + void slotSelectEncoding(); private: - DiffTextWindowFrame* m_pDiffTextWindowFrame; //To send "EncodingChanged" signal QMenu* m_pContextEncodingMenu; SourceData* m_pSourceData; //SourceData to get access to "isEmpty()" and "isFromBuffer()" functions static const int m_maxRecentEncodings = 5; diff -Nru kdiff3-1.8.01/src/DirectoryInfo.h kdiff3-1.8.3/src/DirectoryInfo.h --- kdiff3-1.8.01/src/DirectoryInfo.h 2019-05-18 01:01:30.000000000 +0000 +++ kdiff3-1.8.3/src/DirectoryInfo.h 2020-06-25 00:17:35.000000000 +0000 @@ -49,6 +49,8 @@ return m_dirC.isValid() ? m_dirC : m_dirB; } + inline bool allowSyncMode() { return !m_dirC.isValid() && !m_dirDest.isValid(); } + inline bool listDirA(const Options& options) { return m_dirA.listDir(&m_dirListA, diff -Nru kdiff3-1.8.01/src/directorymergewindow.cpp kdiff3-1.8.3/src/directorymergewindow.cpp --- kdiff3-1.8.01/src/directorymergewindow.cpp 2019-05-18 01:01:30.000000000 +0000 +++ kdiff3-1.8.3/src/directorymergewindow.cpp 2020-06-25 00:17:35.000000000 +0000 @@ -28,6 +28,7 @@ #include #include #include +#include #include #include #include @@ -556,7 +557,7 @@ : QStyledItemDelegate(pParent), m_pDMW(pParent), d(pParent->d) { } - void paint(QPainter* p, const QStyleOptionViewItem& option, const QModelIndex& index) const override + void paint(QPainter* thePainter, const QStyleOptionViewItem& option, const QModelIndex& index) const override { int column = index.column(); if(column == s_ACol || column == s_BCol || column == s_CCol) @@ -584,27 +585,28 @@ if(!icon.isNull()) { int yOffset = (sizeHint(option, index).height() - icon.height()) / 2; - p->drawPixmap(x + 2, y + yOffset, icon); + thePainter->drawPixmap(x + 2, y + yOffset, icon); int i = index == d->m_selection1Index ? 1 : index == d->m_selection2Index ? 2 : index == d->m_selection3Index ? 3 : 0; if(i != 0) { Options* pOpts = d->m_pOptions; QColor c(i == 1 ? pOpts->m_colorA : i == 2 ? pOpts->m_colorB : pOpts->m_colorC); - p->setPen(c); // highlight() ); - p->drawRect(x + 2, y + yOffset, icon.width(), icon.height()); - p->setPen(QPen(c, 0, Qt::DotLine)); - p->drawRect(x + 1, y + yOffset - 1, icon.width() + 2, icon.height() + 2); - p->setPen(Qt::white); + thePainter->setPen(c); // highlight() ); + thePainter->drawRect(x + 2, y + yOffset, icon.width(), icon.height()); + thePainter->setPen(QPen(c, 0, Qt::DotLine)); + thePainter->drawRect(x + 1, y + yOffset - 1, icon.width() + 2, icon.height() + 2); + thePainter->setPen(Qt::white); QString s(QChar('A' + i - 1)); - p->drawText(x + 2 + (icon.width() - p->fontMetrics().width(s)) / 2, - y + yOffset + (icon.height() + p->fontMetrics().ascent()) / 2 - 1, + + thePainter->drawText(x + 2 + (icon.width() - Utils::getHorizontalAdvance(thePainter->fontMetrics(), s)) / 2, + y + yOffset + (icon.height() + thePainter->fontMetrics().ascent()) / 2 - 1, s); } else { - p->setPen(m_pDMW->palette().background().color()); - p->drawRect(x + 1, y + yOffset - 1, icon.width() + 2, icon.height() + 2); + thePainter->setPen(m_pDMW->palette().window().color()); + thePainter->drawRect(x + 1, y + yOffset - 1, icon.width() + 2, icon.height() + 2); } return; } @@ -614,7 +616,7 @@ { option2.displayAlignment = Qt::AlignRight; } - QStyledItemDelegate::paint(p, option2, index); + QStyledItemDelegate::paint(thePainter, option2, index); } QSize sizeHint(const QStyleOptionViewItem& option, const QModelIndex& index) const override { @@ -741,6 +743,7 @@ if(!fi2.open(QIODevice::ReadOnly)) { + fi1.close(); status = fi2.errorString(); return bEqual; } @@ -758,17 +761,23 @@ if(len != fi1.read(&buf1[0], len)) { status = fi1.errorString(); + fi1.close(); + fi2.close(); return bEqual; } if(len != fi2.read(&buf2[0], len)) { - status = fi2.errorString();; + status = fi2.errorString(); + fi1.close(); + fi2.close(); return bEqual; } if(memcmp(&buf1[0], &buf2[0], len) != 0) { + fi1.close(); + fi2.close(); bError = false; return bEqual; } @@ -780,6 +789,9 @@ // If the program really arrives here, then the files are really equal. bError = false; bEqual = true; + + fi1.close(); + fi2.close(); return bEqual; } @@ -899,13 +911,14 @@ if(m_pOptions->m_bDmFullAnalysis) { + QStringList errors; // A full analysis uses the same resources that a normal text-diff/merge uses. // So make sure that the user saves his data first. bool bCanContinue = false; emit q->checkIfCanContinue(&bCanContinue); if(!bCanContinue) return false; - emit q->startDiffMerge("", "", "", "", "", "", "", nullptr); // hide main window + emit q->startDiffMerge(errors, "", "", "", "", "", "", "", nullptr); // hide main window } q->show(); @@ -1002,7 +1015,7 @@ m_bScanning = true; emit q->statusBarMessage(i18n("Scanning directories...")); - m_bSyncMode = m_pOptions->m_bDmSyncMode && !dirC.isValid() && !dirDest.isValid(); + m_bSyncMode = m_pOptions->m_bDmSyncMode && dirInfo->allowSyncMode(); m_fileMergeMap.clear(); s_eCaseSensitivity = m_bCaseSensitive ? Qt::CaseSensitive : Qt::CaseInsensitive; @@ -1431,7 +1444,7 @@ } else { - emit q->startDiffMerge( + emit q->startDiffMerge(errors, mfi.existsInA() ? mfi.getFileInfoA()->absoluteFilePath() : QString(""), mfi.existsInB() ? mfi.getFileInfoB()->absoluteFilePath() : QString(""), mfi.existsInC() ? mfi.getFileInfoC()->absoluteFilePath() : QString(""), @@ -1680,7 +1693,7 @@ t_fileMergeMap::iterator j; int nrOfFiles = m_fileMergeMap.size(); int currentIdx = 1; - QTime t; + QElapsedTimer t; t.start(); pp.setMaxNofSteps(nrOfFiles); @@ -2222,12 +2235,12 @@ KMessageBox::sorry(this, i18n("This operation is currently not possible."), i18n("Operation Not Possible")); return; } - + QStringList errors; if(MergeFileInfos* pMFI = d->getMFI(currentIndex())) { if(!(pMFI->isDirA() || pMFI->isDirB() || pMFI->isDirC())) { - emit startDiffMerge( + emit startDiffMerge(errors, pMFI->existsInA() ? pMFI->getFileInfoA()->absoluteFilePath() : QString(""), pMFI->existsInB() ? pMFI->getFileInfoB()->absoluteFilePath() : QString(""), pMFI->existsInC() ? pMFI->getFileInfoC()->absoluteFilePath() : QString(""), @@ -2248,7 +2261,8 @@ return; } - emit startDiffMerge( + QStringList errors; + emit startDiffMerge(errors, d->getFileName(d->m_selection1Index), d->getFileName(d->m_selection2Index), d->getFileName(d->m_selection3Index), @@ -2271,12 +2285,12 @@ KMessageBox::sorry(this, i18n("This operation is currently not possible."), i18n("Operation Not Possible")); return; } - + QStringList errors; QString fn1 = d->getFileName(d->m_selection1Index); QString fn2 = d->getFileName(d->m_selection2Index); QString fn3 = d->getFileName(d->m_selection3Index); - emit startDiffMerge(fn1, fn2, fn3, + emit startDiffMerge(errors, fn1, fn2, fn3, fn3.isEmpty() ? fn2 : fn3, "", "", "", nullptr); d->m_selection1Index = QModelIndex(); @@ -2507,7 +2521,6 @@ } m_currentIndexForOperation = m_mergeItemList.begin(); - return; } void DirectoryMergeWindow::slotRunOperationForCurrentItem() @@ -2857,6 +2870,7 @@ return makeDir(nameDest); } + QStringList errors; // Make sure that the dir exists, into which we will save the file later. int pos = nameDest.lastIndexOf('/'); if(pos > 0) @@ -2878,7 +2892,7 @@ setOpStatus(*m_currentIndexForOperation, eOpStatusInProgress); q->scrollTo(*m_currentIndexForOperation, EnsureVisible); - emit q->startDiffMerge(nameA, nameB, nameC, nameDest, "", "", "", nullptr); + emit q->startDiffMerge(errors, nameA, nameB, nameC, nameDest, "", "", "", nullptr); return false; } diff -Nru kdiff3-1.8.01/src/directorymergewindow.h kdiff3-1.8.3/src/directorymergewindow.h --- kdiff3-1.8.01/src/directorymergewindow.h 2019-05-18 01:01:30.000000000 +0000 +++ kdiff3-1.8.3/src/directorymergewindow.h 2020-06-25 00:17:35.000000000 +0000 @@ -115,7 +115,7 @@ void slotLoadMergeState(); Q_SIGNALS: - void startDiffMerge(QString fn1,QString fn2, QString fn3, QString ofn, QString,QString,QString,TotalDiffStatus*); + void startDiffMerge(QStringList &errors, QString fn1,QString fn2, QString fn3, QString ofn, QString,QString,QString,TotalDiffStatus*); void checkIfCanContinue( bool* pbContinue ); void updateAvailabilities(); void statusBarMessage( const QString& msg ); diff -Nru kdiff3-1.8.01/src/fileaccess.cpp kdiff3-1.8.3/src/fileaccess.cpp --- kdiff3-1.8.01/src/fileaccess.cpp 2019-05-18 01:01:30.000000000 +0000 +++ kdiff3-1.8.3/src/fileaccess.cpp 2020-06-25 00:17:35.000000000 +0000 @@ -10,6 +10,7 @@ #include "fileaccess.h" #include "cvsignorelist.h" #include "common.h" +#include "Logging.h" #include "progress.h" #include "Utils.h" @@ -51,7 +52,9 @@ m_bFile = false; m_bDir = false; m_bSymLink = false; + m_bReadable = false; m_bWritable = false; + m_bExecutable = false; m_bHidden = false; m_size = 0; m_modificationTime = QDateTime(); @@ -62,7 +65,6 @@ m_linkTarget = ""; //m_fileType = -1; - m_pParent = nullptr; tmpFile.clear(); tmpFile = QSharedPointer::create(); realFile = nullptr; @@ -83,7 +85,7 @@ m_fileInfo = fi; m_url = QUrl::fromLocalFile(m_fileInfo.filePath()); if(!m_url.scheme().isEmpty()) - m_url.setScheme(QLatin1Literal("file")); + m_url.setScheme(QLatin1String("file")); m_pParent = pParent; loadData(); @@ -101,11 +103,12 @@ void FileAccess::setFile(const QUrl& url, bool bWantToWrite) { reset(); + Q_ASSERT(parent() == nullptr || url != parent()->url()); m_url = url; //QUrl::isLocalFile assumes the scheme is set. if(m_url.scheme().isEmpty()) - m_url.setScheme(QLatin1Literal("file")); + m_url.setScheme(QLatin1String("file")); if(m_url.isLocalFile() || !m_url.isValid()) // Treat invalid urls as local files. { @@ -131,7 +134,7 @@ m_fileInfo.setCaching(true); if(parent() == nullptr) - m_baseDir = m_fileInfo.absoluteFilePath(); + m_baseDir.setPath(m_fileInfo.absoluteFilePath()); else m_baseDir = m_pParent->m_baseDir; @@ -158,7 +161,7 @@ if(isLocal() && m_bSymLink) { - m_linkTarget = m_fileInfo.readLink(); + m_linkTarget = m_fileInfo.symLinkTarget(); #ifndef Q_OS_WIN // Unfortunately Qt5 symLinkTarget/readLink always returns an absolute path, even if the link is relative char* s = (char*)malloc(PATH_MAX + 1); @@ -281,7 +284,24 @@ m_fileInfo = QFileInfo(filePath); m_fileInfo.setCaching(true); if(m_url.isEmpty()) - m_url = QUrl::fromUserInput(filePath); + { + if(parent != nullptr) + { + m_url = parent->url().resolved(QUrl(filePath)); + //Verify that the scheme doesn't change. + Q_ASSERT(m_url.scheme() == parent->url().scheme()); + } + else + { + /* + Invalid entry we don't know the full url because KIO didn't tell us and there is no parent + node supplied. + This is a bug if it happens and should be logged . However it is a recoverable error. + */ + qCWarning(kdiffFileAccess) << i18n("Unable to determine full url. No parent specified."); + return; + } + } m_name = m_fileInfo.fileName(); if(isLocal() && m_name.isEmpty()) @@ -339,8 +359,8 @@ { if(!isLocal()) return m_bExists; - else - return m_fileInfo.exists(); + else//Thank you git for being different. + return m_fileInfo.exists() && absoluteFilePath() != "/dev/null"; } qint64 FileAccess::size() const @@ -473,6 +493,7 @@ bool FileAccess::readFile(void* pDestBuffer, qint64 maxLength) { + bool success = false; //Avoid hang on linux for special files. if(!isNormal()) return true; @@ -480,14 +501,20 @@ if(isLocal() || !m_localCopy.isEmpty()) { if(open(QIODevice::ReadOnly))//krazy:exclude=syscalls - return interruptableReadFile(pDestBuffer, maxLength); // maxLength == f.read( (char*)pDestBuffer, maxLength ); + { + success = interruptableReadFile(pDestBuffer, maxLength); // maxLength == f.read( (char*)pDestBuffer, maxLength ) + close(); + } } else { FileAccessJobHandler jh(this); - return jh.get(pDestBuffer, maxLength); + success = jh.get(pDestBuffer, maxLength); } - return false; + + close(); + Q_ASSERT(!realFile->isOpen() && !tmpFile->isOpen()); + return success; } bool FileAccess::writeFile(const void* pSrcBuffer, qint64 length) @@ -495,8 +522,7 @@ ProgressProxy pp; if(isLocal()) { - QFile f(absoluteFilePath()); - if(f.open(QIODevice::WriteOnly)) + if(realFile->open(QIODevice::WriteOnly)) { const qint64 maxChunkSize = 100000; pp.setMaxNofSteps(length / maxChunkSize + 1); @@ -504,33 +530,44 @@ while(i < length) { qint64 nextLength = std::min(length - i, maxChunkSize); - qint64 reallyWritten = f.write((char*)pSrcBuffer + i, nextLength); + qint64 reallyWritten = realFile->write((char*)pSrcBuffer + i, nextLength); if(reallyWritten != nextLength) { + realFile->close(); return false; } i += reallyWritten; pp.step(); if(pp.wasCancelled()) + { + realFile->close(); return false; + } } - f.close(); if(isExecutable()) // value is true if the old file was executable { // Preserve attributes - f.setPermissions(f.permissions() | QFile::ExeUser); + realFile->setPermissions(realFile->permissions() | QFile::ExeUser); } + realFile->close(); return true; } } else { FileAccessJobHandler jh(this); - return jh.put(pSrcBuffer, length, true /*overwrite*/); + bool success = jh.put(pSrcBuffer, length, true /*overwrite*/); + close(); + + Q_ASSERT(!realFile->isOpen() && !tmpFile->isOpen()); + + return success; } + close(); + Q_ASSERT(!realFile->isOpen() && !tmpFile->isOpen()); return false; } @@ -815,7 +852,7 @@ m_bSuccess = false; } -bool FileAccessJobHandler::stat(int detail, bool bWantToWrite) +bool FileAccessJobHandler::stat(short detail, bool bWantToWrite) { m_bSuccess = false; m_pFileAccess->setStatusText(QString()); @@ -1121,8 +1158,11 @@ QFileInfoList fiList = dir.entryInfoList(); if(fiList.isEmpty()) { - // No Permission to read directory or other error. - m_bSuccess = false; + /* + Sadly Qt provides no error information making this case ambigious. + A readablity check is the best we can do. + */ + m_bSuccess = dir.isReadable(); } else { @@ -1154,7 +1194,7 @@ connect(pListJob, &KIO::ListJob::infoMessage, &pp, &ProgressProxyExtender::slotListDirInfoMessage); // This line makes the transfer via fish unreliable.:-( - /*if(m_pFileAccess->url().scheme() != QLatin1Literal("fish")){ + /*if(m_pFileAccess->url().scheme() != QLatin1String("fish")){ connect( pListJob, static_cast(&KIO::ListJob::percent), &pp, &ProgressProxyExtender::slotPercent); }*/ @@ -1203,7 +1243,8 @@ //must be manually filtered KDE does not supply API for ignoring these. if(fa.fileName() != "." && fa.fileName() != "..") { - fa.addPath(fa.fileName()); + //quick fix to preserve behavoir without creating invalid urls. TODO: look for altertive machanism for use with next major release. + fa.setFile(fa.url()); m_pDirList->push_back(fa); } diff -Nru kdiff3-1.8.01/src/fileaccess.h kdiff3-1.8.3/src/fileaccess.h --- kdiff3-1.8.01/src/fileaccess.h 2019-05-18 01:01:30.000000000 +0000 +++ kdiff3-1.8.3/src/fileaccess.h 2020-06-25 00:17:35.000000000 +0000 @@ -117,10 +117,10 @@ bool interruptableReadFile(void* pDestBuffer, qint64 maxLength); QUrl m_url; - bool m_bValidData; + bool m_bValidData = false; //long m_fileType; // for testing only - FileAccess* m_pParent; + FileAccess* m_pParent = nullptr; QDir m_baseDir; QFileInfo m_fileInfo; @@ -130,16 +130,16 @@ QSharedPointer tmpFile = nullptr; QSharedPointer realFile = nullptr; - qint64 m_size; + qint64 m_size = 0; QDateTime m_modificationTime; - bool m_bSymLink; - bool m_bFile; - bool m_bDir; - bool m_bExists; - bool m_bWritable; - bool m_bReadable; - bool m_bExecutable; - bool m_bHidden; + bool m_bSymLink = false; + bool m_bFile = false; + bool m_bDir = false; + bool m_bExists = false; + bool m_bWritable = false; + bool m_bReadable = false; + bool m_bExecutable = false; + bool m_bHidden = false; QString m_statusText; // Might contain an error string, when the last operation didn't succeed. }; @@ -156,7 +156,7 @@ bool get(void* pDestBuffer, long maxLength); bool put(const void* pSrcBuffer, long maxLength, bool bOverwrite, bool bResume = false, int permissions = -1); - bool stat(int detailLevel = 2, bool bWantToWrite = false); + bool stat(short detailLevel = 2, bool bWantToWrite = false); bool copyFile(const QString& dest); bool rename(const FileAccess& dest); bool listDir(t_DirectoryList* pDirList, bool bRecursive, bool bFindHidden, diff -Nru kdiff3-1.8.01/src/gnudiff_analyze.cpp kdiff3-1.8.3/src/gnudiff_analyze.cpp --- kdiff3-1.8.01/src/gnudiff_analyze.cpp 2019-05-18 01:01:30.000000000 +0000 +++ kdiff3-1.8.3/src/gnudiff_analyze.cpp 2020-06-25 00:17:35.000000000 +0000 @@ -400,7 +400,7 @@ LineRef *p; /* Allocate our results. */ - p = (LineRef *)xmalloc((filevec[0].buffered_lines + filevec[1].buffered_lines) * (2 * sizeof *p)); + p = (LineRef *)xmalloc((filevec[0].buffered_lines + filevec[1].buffered_lines) * (2 * sizeof(*p))); for(f = 0; f < 2; ++f) { filevec[f].undiscarded = p; @@ -412,7 +412,7 @@ /* Set up equiv_count[F][I] as the number of lines in file F that fall in equivalence class I. */ - p = (LineRef *)zalloc(filevec[0].equiv_max * (2 * sizeof *p)); + p = (LineRef *)zalloc(filevec[0].equiv_max * (2 * sizeof(*p))); equiv_count[0] = p; equiv_count[1] = p + filevec[0].equiv_max; @@ -704,7 +704,7 @@ GnuDiff::change *GnuDiff::add_change(LineRef line0, LineRef line1, LineRef deleted, LineRef inserted, struct change *old) { - struct change *newChange = (change *)xmalloc(sizeof *newChange); + struct change *newChange = (change *)xmalloc(sizeof(*newChange)); newChange->line0 = line0; newChange->line1 = line1; @@ -815,7 +815,7 @@ xvec = cmp->file[0].undiscarded; yvec = cmp->file[1].undiscarded; diags = (cmp->file[0].nondiscarded_lines + cmp->file[1].nondiscarded_lines + 3); - fdiag = (LineRef *)xmalloc(diags * (2 * sizeof *fdiag)); + fdiag = (LineRef *)xmalloc(diags * (2 * sizeof(*fdiag))); bdiag = fdiag + diags; fdiag += cmp->file[1].nondiscarded_lines + 1; bdiag += cmp->file[1].nondiscarded_lines + 1; diff -Nru kdiff3-1.8.01/src/gnudiff_diff.h kdiff3-1.8.3/src/gnudiff_diff.h --- kdiff3-1.8.01/src/gnudiff_diff.h 2019-05-18 01:01:30.000000000 +0000 +++ kdiff3-1.8.3/src/gnudiff_diff.h 2020-06-25 00:17:35.000000000 +0000 @@ -24,19 +24,16 @@ #ifndef GNUDIFF_DIFF_H #define GNUDIFF_DIFF_H - +#include +#include #include -#include -#include - +#include #include -#include #include -#include +#include +#include #include -#include - #include #include @@ -47,138 +44,135 @@ static_assert(std::is_signed::value, "LineRef must be signed."); //verify(lin_is_wide_enough, sizeof(int) <= sizeof(LineRef)); - - -inline bool isEndOfLine( QChar c ) +inline bool isEndOfLine(QChar c) { - return c=='\n' || c=='\r' || c=='\x0b'; + return c == '\n' || c == '\r' || c == '\x0b'; } #define TAB_WIDTH 8 class GnuDiff { -public: -/* What kind of changes a hunk contains. */ -enum changes -{ - /* No changes: lines common to both files. */ - UNCHANGED, + public: + /* What kind of changes a hunk contains. */ + enum changes + { + /* No changes: lines common to both files. */ + UNCHANGED, + + /* Deletes only: lines taken from just the first file. */ + OLD, - /* Deletes only: lines taken from just the first file. */ - OLD, + /* Inserts only: lines taken from just the second file. */ + NEW, - /* Inserts only: lines taken from just the second file. */ - NEW, + /* Both deletes and inserts: a hunk containing both old and new lines. */ + CHANGED + }; - /* Both deletes and inserts: a hunk containing both old and new lines. */ - CHANGED -}; - -/* Variables for command line options */ + /* Variables for command line options */ -/* Nonzero if output cannot be generated for identical files. */ -bool no_diff_means_no_output; + /* Nonzero if output cannot be generated for identical files. */ + bool no_diff_means_no_output; -/* Number of lines of context to show in each set of diffs. + /* Number of lines of context to show in each set of diffs. This is zero when context is not to be shown. */ -LineRef context; + LineRef context; -/* Consider all files as text files (-a). + /* Consider all files as text files (-a). Don't interpret codes over 0177 as implying a "binary file". */ -bool text; + bool text; -/* The significance of white space during comparisons. */ -enum -{ - /* All white space is significant (the default). */ - IGNORE_NO_WHITE_SPACE, + /* The significance of white space during comparisons. */ + enum + { + /* All white space is significant (the default). */ + IGNORE_NO_WHITE_SPACE, - /* Ignore changes due to tab expansion (-E). */ - IGNORE_TAB_EXPANSION, + /* Ignore changes due to tab expansion (-E). */ + IGNORE_TAB_EXPANSION, - /* Ignore changes in horizontal white space (-b). */ - IGNORE_SPACE_CHANGE, + /* Ignore changes in horizontal white space (-b). */ + IGNORE_SPACE_CHANGE, - /* Ignore all horizontal white space (-w). */ - IGNORE_ALL_SPACE -} ignore_white_space; + /* Ignore all horizontal white space (-w). */ + IGNORE_ALL_SPACE + } ignore_white_space; -/* Ignore changes that affect only blank lines (-B). */ -bool ignore_blank_lines; + /* Ignore changes that affect only blank lines (-B). */ + bool ignore_blank_lines; -/* Ignore changes that affect only numbers. (J. Eibl) */ -bool bIgnoreNumbers; -bool bIgnoreWhiteSpace; + /* Ignore changes that affect only numbers. (J. Eibl) */ + bool bIgnoreNumbers; + bool bIgnoreWhiteSpace; -/* Files can be compared byte-by-byte, as if they were binary. + /* Files can be compared byte-by-byte, as if they were binary. This depends on various options. */ -bool files_can_be_treated_as_binary; + bool files_can_be_treated_as_binary; -/* Ignore differences in case of letters (-i). */ -bool ignore_case; + /* Ignore differences in case of letters (-i). */ + bool ignore_case; -/* Ignore differences in case of letters in file names. */ -bool ignore_file_name_case; + /* Ignore differences in case of letters in file names. */ + bool ignore_file_name_case; -/* Regexp to identify function-header lines (-F). */ -//struct re_pattern_buffer function_regexp; + /* Regexp to identify function-header lines (-F). */ + //struct re_pattern_buffer function_regexp; -/* Ignore changes that affect only lines matching this regexp (-I). */ -//struct re_pattern_buffer ignore_regexp; + /* Ignore changes that affect only lines matching this regexp (-I). */ + //struct re_pattern_buffer ignore_regexp; -/* Say only whether files differ, not how (-q). */ -bool brief; + /* Say only whether files differ, not how (-q). */ + bool brief; -/* Expand tabs in the output so the text lines up properly + /* Expand tabs in the output so the text lines up properly despite the characters added to the front of each line (-t). */ -bool expand_tabs; + bool expand_tabs; -/* Use a tab in the output, rather than a space, before the text of an + /* Use a tab in the output, rather than a space, before the text of an input line, so as to keep the proper alignment in the input line without changing the characters in it (-T). */ -bool initial_tab; + bool initial_tab; -/* In directory comparison, specify file to start with (-S). + /* In directory comparison, specify file to start with (-S). This is used for resuming an aborted comparison. All file names less than this name are ignored. */ -const QChar *starting_file; + const QChar *starting_file; -/* Pipe each file's output through pr (-l). */ -bool paginate; + /* Pipe each file's output through pr (-l). */ + bool paginate; -/* Line group formats for unchanged, old, new, and changed groups. */ -const QChar *group_format[CHANGED + 1]; + /* Line group formats for unchanged, old, new, and changed groups. */ + const QChar *group_format[CHANGED + 1]; -/* Line formats for unchanged, old, and new lines. */ -const QChar *line_format[NEW + 1]; + /* Line formats for unchanged, old, and new lines. */ + const QChar *line_format[NEW + 1]; -/* If using OUTPUT_SDIFF print extra information to help the sdiff filter. */ -bool sdiff_merge_assist; + /* If using OUTPUT_SDIFF print extra information to help the sdiff filter. */ + bool sdiff_merge_assist; -/* Tell OUTPUT_SDIFF to show only the left version of common lines. */ -bool left_column; + /* Tell OUTPUT_SDIFF to show only the left version of common lines. */ + bool left_column; -/* Tell OUTPUT_SDIFF to not show common lines. */ -bool suppress_common_lines; + /* Tell OUTPUT_SDIFF to not show common lines. */ + bool suppress_common_lines; -/* The half line width and column 2 offset for OUTPUT_SDIFF. */ -unsigned int sdiff_half_width; -unsigned int sdiff_column2_offset; + /* The half line width and column 2 offset for OUTPUT_SDIFF. */ + unsigned int sdiff_half_width; + unsigned int sdiff_column2_offset; -/* Use heuristics for better speed with large files with a small + /* Use heuristics for better speed with large files with a small density of changes. */ -bool speed_large_files; + bool speed_large_files; -/* Patterns that match file names to be excluded. */ -struct exclude *excluded; + /* Patterns that match file names to be excluded. */ + struct exclude *excluded; -/* Don't discard lines. This makes things slower (sometimes much + /* Don't discard lines. This makes things slower (sometimes much slower) but will find a guaranteed minimal set of changes. */ -bool minimal; + bool minimal; - -/* The result of comparison is an "edit script": a chain of `struct change'. + /* The result of comparison is an "edit script": a chain of `struct change'. Each `struct change' represents one place where some lines are deleted and some are inserted. @@ -189,192 +183,191 @@ If DELETED is 0 then LINE0 is the number of the line before which the insertion was done; vice versa for INSERTED and LINE1. */ -struct change -{ - struct change *link; /* Previous or next edit command */ - LineRef inserted; /* # lines of file 1 changed here. */ - LineRef deleted; /* # lines of file 0 changed here. */ - LineRef line0; /* Line number of 1st deleted line. */ - LineRef line1; /* Line number of 1st inserted line. */ - bool ignore; /* Flag used in context.c. */ -}; - -/* Structures that describe the input files. */ - -/* Data on one input file being compared. */ - -struct file_data { - /* Buffer in which text of file is read. */ - const QChar* buffer; - - /* Allocated size of buffer, in QChars. Always a multiple of - sizeof *buffer. */ - size_t bufsize; + struct change { + struct change *link; /* Previous or next edit command */ + LineRef inserted; /* # lines of file 1 changed here. */ + LineRef deleted; /* # lines of file 0 changed here. */ + LineRef line0; /* Line number of 1st deleted line. */ + LineRef line1; /* Line number of 1st inserted line. */ + bool ignore; /* Flag used in context.c. */ + }; + + /* Structures that describe the input files. */ + + /* Data on one input file being compared. */ + + struct file_data { + /* Buffer in which text of file is read. */ + const QChar *buffer; + + /* Allocated size of buffer, in QChars. Always a multiple of + sizeof(*buffer). */ + size_t bufsize; - /* Number of valid bytes now in the buffer. */ - size_t buffered; + /* Number of valid bytes now in the buffer. */ + size_t buffered; - /* Array of pointers to lines in the file. */ - const QChar **linbuf; + /* Array of pointers to lines in the file. */ + const QChar **linbuf; - /* linbuf_base <= buffered_lines <= valid_lines <= alloc_lines. + /* linbuf_base <= buffered_lines <= valid_lines <= alloc_lines. linebuf[linbuf_base ... buffered_lines - 1] are possibly differing. linebuf[linbuf_base ... valid_lines - 1] contain valid data. linebuf[linbuf_base ... alloc_lines - 1] are allocated. */ - LineRef linbuf_base, buffered_lines, valid_lines, alloc_lines; + LineRef linbuf_base, buffered_lines, valid_lines, alloc_lines; - /* Pointer to end of prefix of this file to ignore when hashing. */ - const QChar *prefix_end; + /* Pointer to end of prefix of this file to ignore when hashing. */ + const QChar *prefix_end; - /* Count of lines in the prefix. + /* Count of lines in the prefix. There are this many lines in the file before linbuf[0]. */ - LineRef prefix_lines; + LineRef prefix_lines; - /* Pointer to start of suffix of this file to ignore when hashing. */ - const QChar *suffix_begin; + /* Pointer to start of suffix of this file to ignore when hashing. */ + const QChar *suffix_begin; - /* Vector, indexed by line number, containing an equivalence code for + /* Vector, indexed by line number, containing an equivalence code for each line. It is this vector that is actually compared with that of another file to generate differences. */ - LineRef *equivs; + LineRef *equivs; - /* Vector, like the previous one except that + /* Vector, like the previous one except that the elements for discarded lines have been squeezed out. */ - LineRef *undiscarded; + LineRef *undiscarded; - /* Vector mapping virtual line numbers (not counting discarded lines) + /* Vector mapping virtual line numbers (not counting discarded lines) to real ones (counting those lines). Both are origin-0. */ - LineRef *realindexes; + LineRef *realindexes; - /* Total number of nondiscarded lines. */ - LineRef nondiscarded_lines; + /* Total number of nondiscarded lines. */ + LineRef nondiscarded_lines; - /* Vector, indexed by real origin-0 line number, + /* Vector, indexed by real origin-0 line number, containing TRUE for a line that is an insertion or a deletion. The results of comparison are stored here. */ - bool *changed; + bool *changed; - /* 1 if at end of file. */ - bool eof; + /* 1 if at end of file. */ + bool eof; - /* 1 more than the maximum equivalence value used for this or its + /* 1 more than the maximum equivalence value used for this or its sibling file. */ - LineRef equiv_max; -}; + LineRef equiv_max; + }; -/* Data on two input files being compared. */ + /* Data on two input files being compared. */ -struct comparison - { - struct file_data file[2]; - struct comparison const *parent; /* parent, if a recursive comparison */ - }; - -/* Describe the two files currently being compared. */ - -struct file_data files[2]; - -/* Stdio stream to output diffs to. */ - -FILE *outfile; - -/* Declare various functions. */ - -/* analyze.c */ -struct change* diff_2_files (struct comparison *); - -/* context.c */ -void print_context_header (struct file_data[], bool); -void print_context_script (struct change *, bool); - -/* dir.c */ -int diff_dirs (struct comparison const *, int (*) (struct comparison const *, const QChar *, const QChar *)); - -/* ed.c */ -void print_ed_script (struct change *); -void pr_forward_ed_script (struct change *); - -/* ifdef.c */ -void print_ifdef_script (struct change *); - -/* io.c */ -void file_block_read (struct file_data *, size_t); -bool read_files (struct file_data[], bool); - -/* normal.c */ -void print_normal_script (struct change *); - -/* rcs.c */ -void print_rcs_script (struct change *); - -/* side.c */ -void print_sdiff_script (struct change *); - -/* util.c */ -QChar *concat (const QChar *, const QChar *, const QChar *); -bool lines_differ ( const QChar *, size_t, const QChar *, size_t ); -LineRef translate_line_number (struct file_data const *, LineRef); -struct change *find_change (struct change *); -struct change *find_reverse_change (struct change *); -void *zalloc (size_t); -enum changes analyze_hunk (struct change *, LineRef *, LineRef *, LineRef *, LineRef *); -void begin_output (void); -void debug_script (struct change *); -void finish_output (void); -void message (const QChar *, const QChar *, const QChar *); -void message5 (const QChar *, const QChar *, const QChar *, const QChar *, const QChar *); -void output_1_line (const QChar *, const QChar *, const QChar *, const QChar *); -void perror_with_name (const QChar *); -void setup_output (const QChar *, const QChar *, bool); -void translate_range (struct file_data const *, LineRef, LineRef, long *, long *); - -/* version.c */ -//extern const QChar version_string[]; - -private: - // gnudiff_analyze.cpp - LineRef diag (LineRef xoff, LineRef xlim, LineRef yoff, LineRef ylim, bool find_minimal, struct partition *part); - void compareseq (LineRef xoff, LineRef xlim, LineRef yoff, LineRef ylim, bool find_minimal); - void discard_confusing_lines (struct file_data filevec[]); - void shift_boundaries (struct file_data filevec[]); - struct change * add_change (LineRef line0, LineRef line1, LineRef deleted, LineRef inserted, struct change *old); - struct change * build_reverse_script (struct file_data const filevec[]); - struct change* build_script (struct file_data const filevec[]); - - // gnudiff_io.cpp - void find_and_hash_each_line (struct file_data *current); - void find_identical_ends (struct file_data filevec[]); - - // gnudiff_xmalloc.cpp - void *xmalloc (size_t n); - void *xrealloc(void *p, size_t n); - void xalloc_die (void); - - inline bool isWhite( QChar c ) - { - return c==' ' || c=='\t' || c=='\r'; - } + struct comparison { + struct file_data file[2]; + struct comparison const *parent; /* parent, if a recursive comparison */ + }; + + /* Describe the two files currently being compared. */ + + struct file_data files[2]; + + /* Stdio stream to output diffs to. */ + + FILE *outfile; + + /* Declare various functions. */ + + /* analyze.c */ + struct change* diff_2_files(struct comparison *); + + /* context.c */ + void print_context_header(struct file_data[], bool); + void print_context_script(struct change *, bool); + + /* dir.c */ + int diff_dirs(struct comparison const *, int (*)(struct comparison const *, const QChar *, const QChar *)); + + /* ed.c */ + void print_ed_script(struct change *); + void pr_forward_ed_script(struct change *); + + /* ifdef.c */ + void print_ifdef_script(struct change *); + + /* io.c */ + void file_block_read(struct file_data *, size_t); + bool read_files(struct file_data[], bool); + + /* normal.c */ + void print_normal_script(struct change *); + + /* rcs.c */ + void print_rcs_script(struct change *); + + /* side.c */ + void print_sdiff_script(struct change *); + + /* util.c */ + QChar *concat(const QChar *, const QChar *, const QChar *); + bool lines_differ(const QChar *, size_t, const QChar *, size_t); + LineRef translate_line_number(struct file_data const *, LineRef); + struct change *find_change(struct change *); + struct change *find_reverse_change(struct change *); + void *zalloc(size_t); + enum changes analyze_hunk(struct change *, LineRef *, LineRef *, LineRef *, LineRef *); + void begin_output(); + void debug_script(struct change *); + void finish_output(); + void message(const QChar *, const QChar *, const QChar *); + void message5(const QChar *, const QChar *, const QChar *, const QChar *, const QChar *); + void output_1_line(const QChar *, const QChar *, const QChar *, const QChar *); + void perror_with_name(const QChar *); + void setup_output(const QChar *, const QChar *, bool); + void translate_range(struct file_data const *, LineRef, LineRef, long *, long *); + + /* version.c */ + //extern const QChar version_string[]; + + private: + // gnudiff_analyze.cpp + LineRef diag(LineRef xoff, LineRef xlim, LineRef yoff, LineRef ylim, bool find_minimal, struct partition *part); + void compareseq(LineRef xoff, LineRef xlim, LineRef yoff, LineRef ylim, bool find_minimal); + void discard_confusing_lines(struct file_data filevec[]); + void shift_boundaries(struct file_data filevec[]); + struct change* add_change(LineRef line0, LineRef line1, LineRef deleted, LineRef inserted, struct change *old); + struct change* build_reverse_script(struct file_data const filevec[]); + struct change* build_script(struct file_data const filevec[]); + + // gnudiff_io.cpp + void find_and_hash_each_line(struct file_data *current); + void find_identical_ends(struct file_data filevec[]); + + // gnudiff_xmalloc.cpp + void* xmalloc(size_t n); + void* xrealloc(void *p, size_t n); + void xalloc_die(); + + inline bool isWhite(QChar c) + { + return c == ' ' || c == '\t' || c == '\r'; + } }; // class GnuDiff -# define XMALLOC(Type, N_items) ((Type *) xmalloc (sizeof (Type) * (N_items))) -# define XREALLOC(Ptr, Type, N_items) \ - ((Type *) xrealloc ((void *) (Ptr), sizeof (Type) * (N_items))) +#define XMALLOC(Type, N_items) ((Type *)xmalloc(sizeof(Type) * (N_items))) +#define XREALLOC(Ptr, Type, N_items) \ + ((Type *)xrealloc((void *)(Ptr), sizeof(Type) * (N_items))) /* Declare and alloc memory for VAR of type TYPE. */ -# define NEW(Type, Var) Type *(Var) = XMALLOC (Type, 1) +#define NEW(Type, Var) Type *(Var) = XMALLOC(Type, 1) /* Free VAR only if non NULL. */ -# define XFREE(Var) \ - do { \ - if (Var) \ - free (Var); \ - } while (0) +#define XFREE(Var) \ + do \ + { \ + if(Var) \ + free(Var); \ + } while(0) /* Return a pointer to a malloc'ed copy of the array SRC of NUM elements. */ -# define CCLONE(Src, Num) \ - (memcpy (xmalloc (sizeof (*Src) * (Num)), (Src), sizeof (*Src) * (Num))) +#define CCLONE(Src, Num) \ + (memcpy(xmalloc(sizeof(*Src) * (Num)), (Src), sizeof(*Src) * (Num))) /* Return a malloc'ed copy of SRC. */ -# define CLONE(Src) CCLONE (Src, 1) +#define CLONE(Src) CCLONE(Src, 1) #endif diff -Nru kdiff3-1.8.01/src/gnudiff_io.cpp kdiff3-1.8.3/src/gnudiff_io.cpp --- kdiff3-1.8.01/src/gnudiff_io.cpp 2019-05-18 01:01:30.000000000 +0000 +++ kdiff3-1.8.3/src/gnudiff_io.cpp 2020-06-25 00:17:35.000000000 +0000 @@ -142,7 +142,7 @@ LineRef alloc_lines = current->alloc_lines; LineRef line = 0; LineRef linbuf_base = current->linbuf_base; - LineRef *cureqs = (LineRef *)xmalloc(alloc_lines * sizeof *cureqs); + LineRef *cureqs = (LineRef *)xmalloc(alloc_lines * sizeof(*cureqs)); struct equivclass *eqs = equivs; LineRef eqs_index = equivs_index; LineRef eqs_alloc = equivs_alloc; @@ -212,10 +212,10 @@ i = eqs_index++; if(i == eqs_alloc) { - if((LineRef)(LINEREF_MAX / (2 * sizeof *eqs)) <= eqs_alloc) + if((LineRef)(LINEREF_MAX / (2 * sizeof(*eqs))) <= eqs_alloc) xalloc_die(); eqs_alloc *= 2; - eqs = (equivclass *)xrealloc(eqs, eqs_alloc * sizeof *eqs); + eqs = (equivclass *)xrealloc(eqs, eqs_alloc * sizeof(*eqs)); } eqs[i].next = *bucket; eqs[i].hash = h; @@ -251,13 +251,13 @@ if(line == alloc_lines) { /* Double (alloc_lines - linbuf_base) by adding to alloc_lines. */ - if((LineRef)(LINEREF_MAX / 3) <= alloc_lines || (LineRef)(LINEREF_MAX / sizeof *cureqs) <= 2 * alloc_lines - linbuf_base || (LineRef)(LINEREF_MAX / sizeof *linbuf) <= alloc_lines - linbuf_base) + if((LineRef)(LINEREF_MAX / 3) <= alloc_lines || (LineRef)(LINEREF_MAX / sizeof(*cureqs)) <= 2 * alloc_lines - linbuf_base || (LineRef)(LINEREF_MAX / sizeof(ptrdiff_t)) <= alloc_lines - linbuf_base) xalloc_die(); alloc_lines = 2 * alloc_lines - linbuf_base; - cureqs = (LineRef *)xrealloc(cureqs, alloc_lines * sizeof *cureqs); + cureqs = (LineRef *)xrealloc(cureqs, alloc_lines * sizeof(*cureqs)); linbuf += linbuf_base; linbuf = (const QChar **)xrealloc(linbuf, - (alloc_lines - linbuf_base) * sizeof *linbuf); + (alloc_lines - linbuf_base) * sizeof(ptrdiff_t)); linbuf -= linbuf_base; } linbuf[line] = ip; @@ -275,12 +275,12 @@ if(line == alloc_lines) { /* Double (alloc_lines - linbuf_base) by adding to alloc_lines. */ - if((LineRef)(LINEREF_MAX / 3) <= alloc_lines || (LineRef)(LINEREF_MAX / sizeof *cureqs) <= 2 * alloc_lines - linbuf_base || (LineRef)(LINEREF_MAX / sizeof *linbuf) <= alloc_lines - linbuf_base) + if((LineRef)(LINEREF_MAX / 3) <= alloc_lines || (LineRef)(LINEREF_MAX / sizeof(*cureqs)) <= 2 * alloc_lines - linbuf_base || (LineRef)(LINEREF_MAX / sizeof(ptrdiff_t)) <= alloc_lines - linbuf_base) xalloc_die(); alloc_lines = 2 * alloc_lines - linbuf_base; linbuf += linbuf_base; linbuf = (const QChar **)xrealloc(linbuf, - (alloc_lines - linbuf_base) * sizeof *linbuf); + (alloc_lines - linbuf_base) * sizeof(ptrdiff_t)); linbuf -= linbuf_base; } linbuf[line] = p; @@ -316,7 +316,7 @@ { size_t guessed_bytes_per_line = n < 10 ? 32 : s / (n - 1); size_t guessed_lines = std::max((size_t)1, t / guessed_bytes_per_line); - return (LineRef)std::min((LineRef)guessed_lines, (LineRef)(LINEREF_MAX / (2 * sizeof(QChar *) + 1) - 5)) + 5; + return (LineRef)std::min((LineRef)guessed_lines, (LineRef)(LINEREF_MAX / (2 * sizeof(ptrdiff_t) + 1) - 5)) + 5; } /* Given a vector of two file_data objects, find the identical @@ -431,7 +431,7 @@ prefix_mask = prefix_count - 1; LineRef lines = 0; - linbuf0 = (const QChar **)xmalloc(alloc_lines0 * sizeof(*linbuf0)); + linbuf0 = (const QChar **)xmalloc(alloc_lines0 * sizeof(ptrdiff_t)); p0 = buffer0; /* If the prefix is needed, find the prefix lines. */ @@ -443,10 +443,10 @@ LineRef l = lines++ & prefix_mask; if(l == alloc_lines0) { - if((LineRef)(LINEREF_MAX / (2 * sizeof *linbuf0)) <= alloc_lines0) + if((LineRef)(LINEREF_MAX / (2 * sizeof(ptrdiff_t))) <= alloc_lines0) xalloc_die(); alloc_lines0 *= 2; - linbuf0 = (const QChar **)xrealloc(linbuf0, alloc_lines0 * sizeof(*linbuf0)); + linbuf0 = (const QChar **)xrealloc(linbuf0, alloc_lines0 * sizeof(ptrdiff_t)); } linbuf0[l] = p0; while(p0 < pEnd0 && !isEndOfLine(*p0++)) @@ -460,9 +460,9 @@ middle_guess = guess_lines(lines, p0 - buffer0, p1 - filevec[1].prefix_end); suffix_guess = guess_lines(lines, p0 - buffer0, buffer1 + n1 - p1); alloc_lines1 = buffered_prefix + middle_guess + std::min(context, suffix_guess); - if(alloc_lines1 < buffered_prefix || (LineRef)(LINEREF_MAX / sizeof *linbuf1) <= alloc_lines1) + if(alloc_lines1 < buffered_prefix || (LineRef)(LINEREF_MAX / sizeof(ptrdiff_t)) <= alloc_lines1) xalloc_die(); - linbuf1 = (const QChar **)xmalloc(alloc_lines1 * sizeof(*linbuf1)); + linbuf1 = (const QChar **)xmalloc(alloc_lines1 * sizeof(ptrdiff_t)); LineRef i; if(buffered_prefix != lines) @@ -515,9 +515,9 @@ find_identical_ends(filevec); equivs_alloc = filevec[0].alloc_lines + filevec[1].alloc_lines + 1; - if((LineRef)(LINEREF_MAX / sizeof *equivs) <= equivs_alloc) + if((LineRef)(LINEREF_MAX / sizeof(*equivs)) <= equivs_alloc) xalloc_die(); - equivs = (equivclass *)xmalloc(equivs_alloc * sizeof *equivs); + equivs = (equivclass *)xmalloc(equivs_alloc * sizeof(*equivs)); /* Equivalence class 0 is permanently safe for lines that were not hashed. Real equivalence classes start at 1. */ equivs_index = 1; @@ -528,9 +528,9 @@ for(i = 9; ((LineRef)1 << i) < equivs_alloc / 3; ++i) continue; nbuckets = ((LineRef)1 << i) - prime_offset[i]; - if(LINEREF_MAX / sizeof *buckets <= nbuckets) + if(LINEREF_MAX / sizeof(*buckets) <= nbuckets) xalloc_die(); - buckets = (LineRef *)zalloc((nbuckets + 1) * sizeof *buckets); + buckets = (LineRef *)zalloc((nbuckets + 1) * sizeof(*buckets)); buckets++; for(i = 0; i < 2; ++i) diff -Nru kdiff3-1.8.01/src/gnudiff_xmalloc.cpp kdiff3-1.8.3/src/gnudiff_xmalloc.cpp --- kdiff3-1.8.01/src/gnudiff_xmalloc.cpp 2019-05-18 01:01:30.000000000 +0000 +++ kdiff3-1.8.3/src/gnudiff_xmalloc.cpp 2020-06-25 00:17:35.000000000 +0000 @@ -30,9 +30,9 @@ #include "gnudiff_diff.h" /* If non NULL, call this function when memory is exhausted. */ -void (*xalloc_fail_func)(void) = nullptr; +void (*xalloc_fail_func)() = nullptr; -void GnuDiff::xalloc_die(void) +void GnuDiff::xalloc_die() { if(xalloc_fail_func) (*xalloc_fail_func)(); diff -Nru kdiff3-1.8.01/src/guiutils.h kdiff3-1.8.3/src/guiutils.h --- kdiff3-1.8.01/src/guiutils.h 2019-05-18 01:01:30.000000000 +0000 +++ kdiff3-1.8.3/src/guiutils.h 2020-06-25 00:17:35.000000000 +0000 @@ -129,6 +129,98 @@ theAction->setIconText( iconText ); return theAction; } + + + //Allow actions to be created without connecting them immediately. + + template + inline typename std::enable_if::value, QAction>::type* createAction( + const QString& text, + KActionCollection* ac, + const QString& actionName) + { + Q_ASSERT(ac != nullptr); + QAction* theAction; + + theAction = ac->addAction(actionName); + theAction->setText(text); + + return theAction; + } + + template + inline typename std::enable_if::value, KToggleAction>::type* createAction( + const QString& text, + KActionCollection* ac, + const QString &actionName) { + Q_ASSERT( ac != nullptr ); + KToggleAction* theAction = new KToggleAction(ac); + ac->addAction( actionName, theAction ); + theAction->setText( text ); + return theAction; + } + + template + T* createAction( + const QString& text, + const QKeySequence& shortcut, + KActionCollection* ac, + const QString &actionName) + { + T* theAction = createAction( text, ac, actionName ); + ac->setDefaultShortcut(theAction, shortcut); + return theAction; + } + template + T* createAction( + const QString& text, + const QIcon& icon, + KActionCollection* ac, + const QString &actionName) + { + T* theAction = createAction( text, ac, actionName ); + theAction->setIcon( icon ); + return theAction; + } + template + T* createAction( + const QString& text, + const QIcon& icon, + const QString& iconText, + KActionCollection* ac, + const QString &actionName) + { + T* theAction = createAction( text, ac, actionName ); + theAction->setIcon( icon ); + theAction->setIconText( iconText ); + return theAction; + } + template + T* createAction( + const QString& text, + const QIcon& icon, + const QKeySequence& shortcut, + KActionCollection* ac, + const QString &actionName) + { + T* theAction = createAction( text, shortcut, ac, actionName ); + theAction->setIcon( icon ); + return theAction; + } + template + T* createAction( + const QString& text, + const QIcon& icon, + const QString& iconText, + const QKeySequence& shortcut, + KActionCollection* ac, + const QString &actionName) + { + T* theAction = createAction( text, shortcut, ac, actionName ); + theAction->setIcon( icon ); + theAction->setIconText( iconText ); + return theAction; + } } #endif diff -Nru kdiff3-1.8.01/src/icons/CMakeLists.txt kdiff3-1.8.3/src/icons/CMakeLists.txt --- kdiff3-1.8.01/src/icons/CMakeLists.txt 2019-05-18 01:01:30.000000000 +0000 +++ kdiff3-1.8.3/src/icons/CMakeLists.txt 2020-06-25 00:17:35.000000000 +0000 @@ -1,16 +1,19 @@ +set(KDIFF3_PNG_ICONS + icons/16-apps-kdiff3.png + icons/22-apps-kdiff3.png + icons/32-apps-kdiff3.png + icons/48-apps-kdiff3.png + icons/64-apps-kdiff3.png + icons/128-apps-kdiff3.png + icons/256-apps-kdiff3.png) + set(KDIFF3_ICONS - 16-apps-kdiff3.png - 22-apps-kdiff3.png - 32-apps-kdiff3.png - 48-apps-kdiff3.png - 64-apps-kdiff3.png - 128-apps-kdiff3.png - 256-apps-kdiff3.png - sc-apps-kdiff3.svgz + ${KDIFF3_PNG_ICONS} + icons/sc-apps-kdiff3.svgz ) -# add icons to application sources, to have them bundled -ecm_add_app_icon(kdiff3_SRCS ICONS ${KDIFF3_ICONS}) +# add icons to application sources, to have them bundled -- must be in same scope as src/CMakeLists.txt +ecm_add_app_icon(kdiff3_SRCS ICONS ${KDIFF3_PNG_ICONS}) ecm_install_icons( ICONS diff -Nru kdiff3-1.8.01/src/kdiff3.cpp kdiff3-1.8.3/src/kdiff3.cpp --- kdiff3-1.8.01/src/kdiff3.cpp 2019-05-18 01:01:30.000000000 +0000 +++ kdiff3-1.8.3/src/kdiff3.cpp 2020-06-25 00:17:35.000000000 +0000 @@ -23,6 +23,7 @@ #include "difftextwindow.h" #include "mergeresultwindow.h" #include "RLPainter.h" +#include "Utils.h" #ifndef Q_OS_WIN #include @@ -222,7 +223,12 @@ m_sd2.setOptions(m_pOptions); m_sd3.setOptions(m_pOptions); - m_bAutoFlag = false; //disable --auto option git hard codes this unwanted flag. +#ifdef ENABLE_AUTO + m_bAutoFlag = hasArgs && KDiff3Shell::getParser()->isSet("auto"); +#else + m_bAutoFlag = false; +#endif + m_bAutoMode = m_bAutoFlag || m_pOptions->m_bAutoSaveAndQuitOnMergeWithoutConflicts; if(hasArgs) { m_outputFilename = KDiff3Shell::getParser()->value("output"); @@ -269,7 +275,7 @@ //Set m_bDirCompare flag m_bDirCompare = FileAccess(m_sd1.getFilename()).isDir(); - QStringList aliasList; //KDiff3Shell::getParser()->values( "fname" ); + QStringList aliasList = KDiff3Shell::getParser()->values( "fname" ); QStringList::Iterator ali = aliasList.begin(); QString an1 = KDiff3Shell::getParser()->value("L1"); @@ -312,6 +318,9 @@ /////////////////////////////////////////////////////////////////// // call inits to invoke all other construction parts initActions(actionCollection()); + //Warning: Call this before connecting KDiff3App::slotUpdateAvailabilities or calling KXMLGUIClient::setXMLFile + MergeResultWindow::initActions(actionCollection()); + initStatusBar(); m_pFindDialog = new FindDialog(this); @@ -357,7 +366,7 @@ m_pDirectoryMergeInfo = new DirectoryMergeInfo(m_pDirectoryMergeSplitter); m_pDirectoryMergeWindow->setDirectoryMergeInfo(m_pDirectoryMergeInfo); m_pDirectoryMergeSplitter->addWidget(m_pDirectoryMergeInfo); - + //Warning: Make sure DirectoryMergeWindow::initActions is called before this point or we can crash when selectionChanged is sent. connect(m_pDirectoryMergeWindow, &DirectoryMergeWindow::startDiffMerge, this, &KDiff3App::slotFileOpen2); connect(m_pDirectoryMergeWindow->selectionModel(), &QItemSelectionModel::selectionChanged, this, &KDiff3App::slotUpdateAvailabilities); connect(m_pDirectoryMergeWindow->selectionModel(), &QItemSelectionModel::currentChanged, this, &KDiff3App::slotUpdateAvailabilities); @@ -376,29 +385,9 @@ void KDiff3App::completeInit(const QString& fn1, const QString& fn2, const QString& fn3) { - if(m_pKDiff3Shell != nullptr) - { - QSize size = m_pOptions->m_geometry; - QPoint pos = m_pOptions->m_position; - if(!size.isEmpty()) - { - m_pKDiff3Shell->resize(size); - - QRect visibleRect = QRect(pos, size) & QApplication::desktop()->rect(); - if(visibleRect.width() > 100 && visibleRect.height() > 100) - m_pKDiff3Shell->move(pos); - if(!m_bAutoMode) - { - //Here we want the extra setup showMaximized does since the window has not be shown before - if(m_pOptions->m_bMaximised) - m_pKDiff3Shell->showMaximized();// krazy:exclude=qmethods - else - m_pKDiff3Shell->show(); - } - } - } if(!fn1.isEmpty()) { m_sd1.setFilename(fn1); + m_bDirCompare = FileAccess(m_sd1.getFilename()).isDir(); } if(!fn2.isEmpty()) { m_sd2.setFilename(fn2); @@ -468,13 +457,22 @@ } m_bAutoMode = false; - if(m_pKDiff3Shell) + KToggleFullScreenAction::setFullScreen(m_pKDiff3Shell, m_pOptions->m_bMaximised); + + if(m_pKDiff3Shell && !m_pKDiff3Shell->isVisible()) { - if(m_pOptions->m_bMaximised) - //We want showMaximized here as the window has never been shown. - m_pKDiff3Shell->showMaximized();// krazy:exclude=qmethods - else - m_pKDiff3Shell->show(); + QSize size = m_pOptions->m_geometry; + QPoint pos = m_pOptions->m_position; + if(!size.isEmpty()) + { + m_pKDiff3Shell->resize(size); + + QRect visibleRect = QRect(pos, size) & QApplication::desktop()->rect(); + if(visibleRect.width() > 100 && visibleRect.height() > 100) + m_pKDiff3Shell->move(pos); + } + + m_pKDiff3Shell->show(); } g_pProgressDialog->setStayHidden(false); @@ -489,20 +487,21 @@ if(!m_bDirCompare && m_pKDiff3Shell != nullptr) { bool bFileOpenError = false; - if((!m_sd1.isEmpty() && !m_sd1.hasData()) || - (!m_sd2.isEmpty() && !m_sd2.hasData()) || - (!m_sd3.isEmpty() && !m_sd3.hasData())) + if((!m_sd1.getErrors().isEmpty()) || + (!m_sd2.getErrors().isEmpty()) || + (!m_sd3.getErrors().isEmpty())) { QString text(i18n("Opening of these files failed:")); text += "\n\n"; - if(!m_sd1.isEmpty() && !m_sd1.hasData()) - text += " - " + m_sd1.getAliasName() + '\n'; - if(!m_sd2.isEmpty() && !m_sd2.hasData()) - text += " - " + m_sd2.getAliasName() + '\n'; - if(!m_sd3.isEmpty() && !m_sd3.hasData()) - text += " - " + m_sd3.getAliasName() + '\n'; + if(!m_sd1.getErrors().isEmpty()) + text += " - " + m_sd1.getAliasName() + '\n' + m_sd1.getErrors().join('\n') + '\n'; + if(!m_sd2.getErrors().isEmpty()) + text += " - " + m_sd2.getAliasName() + '\n' + m_sd2.getErrors().join('\n') + '\n'; + if(!m_sd3.getErrors().isEmpty()) + text += " - " + m_sd3.getAliasName() + '\n' + m_sd3.getErrors().join('\n') + '\n'; + + KMessageBox::sorry(this, text, i18n("File open error")); - KMessageBox::sorry(this, text, i18n("File Open Error")); bFileOpenError = true; } @@ -793,7 +792,7 @@ QString s = headerText.mid(p); int i; for(i = 2; i < s.length(); ++i) - if(fm.width(s, i) > view.width()) + if(Utils::getHorizontalAdvance(fm, s, i) > view.width()) { --i; break; @@ -809,7 +808,7 @@ painter.translate(0, view.top()); pDiffTextWindow->print(painter, view, line, linesPerPage); - painter.resetMatrix(); + painter.resetTransform(); } void KDiff3App::slotFilePrint() @@ -834,6 +833,8 @@ m_pDiffTextWindow3->getSelectionRange(&firstSelectionD3LIdx, &lastSelectionD3LIdx, eD3LLineCoords); } + printDialog->setOption(QPrintDialog::PrintCurrentPage); + if(firstSelectionD3LIdx >= 0) { printDialog->addEnabledOption(QPrintDialog::PrintSelection); //printer.setOptionEnabled(QPrinter::PrintSelection,true); @@ -856,7 +857,7 @@ { slotStatusMsg(i18n("Printing...")); // create a painter to paint on the printer object - RLPainter painter(&printer, m_pOptions->m_bRightToLeftLanguage, width(), fontMetrics().width('W')); + RLPainter painter(&printer, m_pOptions->m_bRightToLeftLanguage, width(), Utils::getHorizontalAdvance(fontMetrics(),'W')); QPaintDevice* pPaintDevice = painter.device(); int dpiy = pPaintDevice->logicalDpiY(); @@ -873,7 +874,7 @@ QString topLineText = i18n("Top line"); //int headerWidth = fm.width( m_sd1.getAliasName() + ", "+topLineText+": 01234567" ); - int headerLines = fm.width(m_sd1.getAliasName() + ", " + topLineText + ": 01234567") / columnWidth + 1; + int headerLines = Utils::getHorizontalAdvance(fm, m_sd1.getAliasName() + ", " + topLineText + ": 01234567") / columnWidth + 1; int headerMargin = headerLines * fm.height() + 3; // Text + one horizontal line int footerMargin = fm.height() + 3; @@ -922,8 +923,12 @@ pageList.push_back(i); } } - - if(printer.printRange() == QPrinter::Selection) + else if(printer.printRange() == QPrinter::CurrentPage) + { + bPrintCurrentPage = true; + totalNofPages = 1; + } + else if(printer.printRange() == QPrinter::Selection) { bPrintSelection = true; if(firstSelectionD3LIdx >= 0) @@ -952,8 +957,9 @@ break; page = *pageListIt; line = (page - 1) * linesPerPage; - if(page == 10000) { // This means "Print the current page" - bPrintCurrentPage = true; + + if(bPrintCurrentPage) + { // Detect the first visible line in the window. line = m_pDiffTextWindow1->convertDiff3LineIdxToLine(currentFirstD3LIdx); } @@ -998,10 +1004,11 @@ QString s = bPrintCurrentPage ? QString("") : QString::number(page) + '/' + QString::number(totalNofPages); if(bPrintSelection) s += i18n(" (Selection)"); - painter.drawText((view.right() - painter.fontMetrics().width(s)) / 2, + painter.drawText((view.right() - Utils::getHorizontalAdvance(painter.fontMetrics(), s)) / 2, view.bottom() + painter.fontMetrics().ascent() + 5, s); bFirstPrintedPage = true; + if(bPrintCurrentPage) break; } if(bPrintSelection) diff -Nru kdiff3-1.8.01/src/kdiff3.h kdiff3-1.8.3/src/kdiff3.h --- kdiff3-1.8.01/src/kdiff3.h 2019-05-18 01:01:30.000000000 +0000 +++ kdiff3-1.8.3/src/kdiff3.h 2020-06-25 00:17:35.000000000 +0000 @@ -146,7 +146,7 @@ /** open a file and load it into the document*/ void slotFileOpen(); - void slotFileOpen2(const QString& fn1, const QString& fn2, const QString& fn3, const QString& ofn, + void slotFileOpen2(QStringList &errors, const QString& fn1, const QString& fn2, const QString& fn3, const QString& ofn, const QString& an1, const QString &an2, const QString& an3, TotalDiffStatus* pTotalDiffStatus); void slotFileNameChanged(const QString& fileName, e_SrcSelector winIdx); @@ -318,8 +318,8 @@ QSplitter* m_pMainSplitter; QWidget* m_pMainWidget; QWidget* m_pMergeWindowFrame; - ReversibleScrollBar* m_pHScrollBar; - QScrollBar* m_pDiffVScrollBar; + ReversibleScrollBar* m_pHScrollBar = nullptr; + QScrollBar* m_pDiffVScrollBar = nullptr; QScrollBar* m_pMergeVScrollBar; DiffTextWindow* m_pDiffTextWindow1; @@ -395,8 +395,8 @@ KToolBar* toolBar(QLatin1String); KDiff3Part* m_pKDiff3Part; KParts::MainWindow* m_pKDiff3Shell; - bool m_bAutoFlag; - bool m_bAutoMode; + bool m_bAutoFlag = false; + bool m_bAutoMode = false; void recalcWordWrap(int visibleTextWidthForPrinting = -1); bool m_bRecalcWordWrapPosted; void setHScrollBarRange(); diff -Nru kdiff3-1.8.01/src/kdiff3_part.cpp kdiff3-1.8.3/src/kdiff3_part.cpp --- kdiff3-1.8.01/src/kdiff3_part.cpp 2019-05-18 01:01:30.000000000 +0000 +++ kdiff3-1.8.3/src/kdiff3_part.cpp 2020-06-25 00:17:35.000000000 +0000 @@ -51,7 +51,6 @@ } K_PLUGIN_FACTORY(KDiff3PartFactory, registerPlugin();) -//K_EXPORT_PLUGIN( KDiff3PartFactory(createAboutData())) KDiff3Part::KDiff3Part(QWidget* parentWidget, QObject* parent, const QVariantList& args) : KParts::ReadWritePart(parent) @@ -159,6 +158,8 @@ QString fileName2; QString version1; QString version2; + QStringList errors; + while(!stream.atEnd() && (fileName1.isEmpty() || fileName2.isEmpty())) { str = stream.readLine() + '\n'; @@ -179,7 +180,7 @@ if(f1.exists() && f2.exists() && fileName1 != fileName2) { - m_widget->slotFileOpen2(fileName1, fileName2, "", "", "", "", "", nullptr); + m_widget->slotFileOpen2(errors, fileName1, fileName2, "", "", "", "", "", nullptr); return true; } else if(version1.isEmpty() && f1.exists()) @@ -196,7 +197,7 @@ process.start(cmd); process.waitForFinished(-1); - m_widget->slotFileOpen2(fileName1, tempFileName, "", "", + m_widget->slotFileOpen2(errors, fileName1, tempFileName, "", "", "", version2.isEmpty() ? fileName2 : "REV:" + version2 + ':' + fileName2, "", nullptr); // alias names // std::cerr << "KDiff3: f1:" << fileName1.toLatin1() <<"<->"<slotFileOpen2(tempFileName, fileName2, "", "", + m_widget->slotFileOpen2(errors, tempFileName, fileName2, "", "", version1.isEmpty() ? fileName1 : "REV:" + version1 + ':' + fileName1, "", "", nullptr); // alias name // std::cerr << "KDiff3: f2:" << fileName2.toLatin1() <<"<->"<slotFileOpen2(tempFileName1, tempFileName2, "", "", + m_widget->slotFileOpen2(errors, tempFileName1, tempFileName2, "", "", "REV:" + version1 + ':' + fileName1, "REV:" + version2 + ':' + fileName2, "", nullptr); diff -Nru kdiff3-1.8.01/src/kdiff3part.desktop kdiff3-1.8.3/src/kdiff3part.desktop --- kdiff3-1.8.01/src/kdiff3part.desktop 2019-05-18 01:01:30.000000000 +0000 +++ kdiff3-1.8.3/src/kdiff3part.desktop 2020-06-25 00:17:35.000000000 +0000 @@ -19,6 +19,7 @@ Name[hi]=के-डिफ3पार्ट Name[hne]=के-डिफ3पार्ट Name[hu]=KDiff3Part +Name[ia]=KDiff3Part Name[it]=KDiff3Part Name[ja]=KDiff3Part Name[km]=KDiff3Part diff -Nru kdiff3-1.8.01/src/kdiff3_shell.cpp kdiff3-1.8.3/src/kdiff3_shell.cpp --- kdiff3-1.8.01/src/kdiff3_shell.cpp 2019-05-18 01:01:30.000000000 +0000 +++ kdiff3-1.8.3/src/kdiff3_shell.cpp 2020-06-25 00:17:35.000000000 +0000 @@ -153,7 +153,7 @@ // use the standard toolbar editor KEditToolBar dlg(factory()); - connect(&dlg, &KEditToolBar::newToolbarConfig, this, &KDiff3Shell::applyNewToolbarConfig); + connect(&dlg, &KEditToolBar::newToolBarConfig, this, &KDiff3Shell::applyNewToolbarConfig); dlg.exec(); } diff -Nru kdiff3-1.8.01/src/Logging.cpp kdiff3-1.8.3/src/Logging.cpp --- kdiff3-1.8.01/src/Logging.cpp 2019-05-18 01:01:30.000000000 +0000 +++ kdiff3-1.8.3/src/Logging.cpp 2020-06-25 00:17:35.000000000 +0000 @@ -20,3 +20,4 @@ #include "Logging.h" Q_LOGGING_CATEGORY(kdeMain, "org.kde.kdiff3") +Q_LOGGING_CATEGORY(kdiffFileAccess, "org.kde.kdiff3.fileAccess") diff -Nru kdiff3-1.8.01/src/Logging.h kdiff3-1.8.3/src/Logging.h --- kdiff3-1.8.01/src/Logging.h 2019-05-18 01:01:30.000000000 +0000 +++ kdiff3-1.8.3/src/Logging.h 2020-06-25 00:17:35.000000000 +0000 @@ -22,4 +22,5 @@ #include Q_DECLARE_LOGGING_CATEGORY(kdeMain) +Q_DECLARE_LOGGING_CATEGORY(kdiffFileAccess) #endif // !LOGGING_H diff -Nru kdiff3-1.8.01/src/MacOSXBundleInfo.plist.in kdiff3-1.8.3/src/MacOSXBundleInfo.plist.in --- kdiff3-1.8.01/src/MacOSXBundleInfo.plist.in 1970-01-01 00:00:00.000000000 +0000 +++ kdiff3-1.8.3/src/MacOSXBundleInfo.plist.in 2020-06-25 00:17:35.000000000 +0000 @@ -0,0 +1,53 @@ + + + + + NSPrincipalClass + NSApplication + CFBundleDevelopmentRegion + English + CFBundleExecutable + ${MACOSX_BUNDLE_EXECUTABLE_NAME} + CFBundleGetInfoString + ${MACOSX_BUNDLE_INFO_STRING} + CFBundleIconFile + ${MACOSX_BUNDLE_ICON_FILE} + CFBundleIdentifier + ${MACOSX_BUNDLE_GUI_IDENTIFIER} + CFBundleInfoDictionaryVersion + 6.0 + CFBundleLongVersionString + ${MACOSX_BUNDLE_LONG_VERSION_STRING} + CFBundleName + ${MACOSX_BUNDLE_BUNDLE_NAME} + CFBundlePackageType + APPL + CFBundleShortVersionString + ${MACOSX_BUNDLE_SHORT_VERSION_STRING} + CFBundleSignature + ???? + CFBundleVersion + ${MACOSX_BUNDLE_BUNDLE_VERSION} + CSResourcesFileMapped + + LSRequiresCarbon + + NSHumanReadableCopyright + ${MACOSX_BUNDLE_COPYRIGHT} + LSMultipleInstancesProhibited + + CFBundleDocumentTypes + + + LSItemContentTypes + + * + + CFBundleTypeName + NSStringPboardType + CFBundleTypeRole + Viewer + + + + diff -Nru kdiff3-1.8.01/src/main.cpp kdiff3-1.8.3/src/main.cpp --- kdiff3-1.8.01/src/main.cpp 2019-05-18 01:01:30.000000000 +0000 +++ kdiff3-1.8.3/src/main.cpp 2020-06-25 00:17:35.000000000 +0000 @@ -27,6 +27,7 @@ #include #include #include +#include #include #include #include @@ -113,12 +114,16 @@ cmdLineParser->addOption(QCommandLineOption(QStringList() << QLatin1String("b") << QLatin1String("base"), i18n("Explicit base file. For compatibility with certain tools."), QLatin1String("file"))); cmdLineParser->addOption(QCommandLineOption(QStringList() << QLatin1String("o") << QLatin1String("output"), i18n("Output file. Implies -m. E.g.: -o newfile.txt"), QLatin1String("file"))); cmdLineParser->addOption(QCommandLineOption(QStringList() << QLatin1String("out"), i18n("Output file, again. (For compatibility with certain tools.)"), QLatin1String("file"))); +#ifdef ENABLE_AUTO cmdLineParser->addOption(QCommandLineOption(QStringList() << QLatin1String("auto"), i18n("No GUI if all conflicts are auto-solvable. (Needs -o file)"))); +#else + cmdLineParser->addOption(QCommandLineOption(QStringList() << QLatin1String("auto"), i18n("Ignored."))); +#endif cmdLineParser->addOption(QCommandLineOption(QStringList() << QLatin1String("qall"), i18n("Do not solve conflicts automatically."))); cmdLineParser->addOption(QCommandLineOption(QStringList() << QLatin1String("L1"), i18n("Visible name replacement for input file 1 (base)."), QLatin1String("alias1"))); cmdLineParser->addOption(QCommandLineOption(QStringList() << QLatin1String("L2"), i18n("Visible name replacement for input file 2."), QLatin1String("alias2"))); cmdLineParser->addOption(QCommandLineOption(QStringList() << QLatin1String("L3"), i18n("Visible name replacement for input file 3."), QLatin1String("alias3"))); - cmdLineParser->addOption(QCommandLineOption(QStringList() << QLatin1String("L") << QLatin1String("fname alias"), i18n("Alternative visible name replacement. Supply this once for every input."))); + cmdLineParser->addOption(QCommandLineOption(QStringList() << QLatin1String("L") << QLatin1String("fname"), i18n("Alternative visible name replacement. Supply this once for every input."), QLatin1String("alias"))); cmdLineParser->addOption(QCommandLineOption(QStringList() << QLatin1String("cs"), i18n("Override a config setting. Use once for every setting. E.g.: --cs \"AutoAdvance=1\""), QLatin1String("string"))); cmdLineParser->addOption(QCommandLineOption(QStringList() << QLatin1String("confighelp"), i18n("Show list of config settings and current values."))); cmdLineParser->addOption(QCommandLineOption(QStringList() << QLatin1String("config"), i18n("Use a different config file."), QLatin1String("file"))); @@ -168,8 +173,13 @@ aboutData.processCommandLine(cmdLineParser); - KDiff3Shell* p = new KDiff3Shell(); - p->show(); + /* + Do not attempt to call show here that will be done later. + This variable exists solely to insure the KDiff3Shell is deleted on exit. + */ + QPointer p(new KDiff3Shell()); + Q_UNUSED(p); + //p->setWindowState( p->windowState() | Qt::WindowActive ); // Patch for ubuntu: window not active on startup //app.installEventFilter( new CFilter ); int retVal = app.exec(); diff -Nru kdiff3-1.8.01/src/mergeresultwindow.cpp kdiff3-1.8.3/src/mergeresultwindow.cpp --- kdiff3-1.8.01/src/mergeresultwindow.cpp 2019-05-18 01:01:30.000000000 +0000 +++ kdiff3-1.8.3/src/mergeresultwindow.cpp 2020-06-25 00:17:35.000000000 +0000 @@ -13,6 +13,7 @@ #include "options.h" #include "RLPainter.h" #include "guiutils.h" +#include "Utils.h" #include #include @@ -55,6 +56,16 @@ #undef leftInfoWidth +QAction* MergeResultWindow::chooseAEverywhere = nullptr; +QAction* MergeResultWindow::chooseBEverywhere = nullptr; +QAction* MergeResultWindow::chooseCEverywhere = nullptr; +QAction* MergeResultWindow::chooseAForUnsolvedConflicts = nullptr; +QAction* MergeResultWindow::chooseBForUnsolvedConflicts = nullptr; +QAction* MergeResultWindow::chooseCForUnsolvedConflicts = nullptr; +QAction* MergeResultWindow::chooseAForUnsolvedWhiteSpaceConflicts = nullptr; +QAction* MergeResultWindow::chooseBForUnsolvedWhiteSpaceConflicts = nullptr; +QAction* MergeResultWindow::chooseCForUnsolvedWhiteSpaceConflicts = nullptr; + MergeResultWindow::MergeResultWindow( QWidget* pParent, Options* pOptions, @@ -148,6 +159,8 @@ showUnsolvedConflictsStatusMessage(); } +//This must be called before KXMLGui::SetXMLFile and friends or the actions will not be shown in the menu. +//At that point in startup we don't have a MergeResultWindow object so we cannot connect the signals yet. void MergeResultWindow::initActions(KActionCollection* ac) { if(ac == nullptr){ @@ -155,15 +168,30 @@ exit(-1);//we cannot recover from this. } - chooseAEverywhere = GuiUtils::createAction(i18n("Choose A Everywhere"), QKeySequence(Qt::CTRL + Qt::SHIFT + Qt::Key_1), this, &MergeResultWindow::slotChooseAEverywhere, ac, "merge_choose_a_everywhere"); - chooseBEverywhere = GuiUtils::createAction(i18n("Choose B Everywhere"), QKeySequence(Qt::CTRL + Qt::SHIFT + Qt::Key_2), this, &MergeResultWindow::slotChooseBEverywhere, ac, "merge_choose_b_everywhere"); - chooseCEverywhere = GuiUtils::createAction(i18n("Choose C Everywhere"), QKeySequence(Qt::CTRL + Qt::SHIFT + Qt::Key_3), this, &MergeResultWindow::slotChooseCEverywhere, ac, "merge_choose_c_everywhere"); - chooseAForUnsolvedConflicts = GuiUtils::createAction(i18n("Choose A for All Unsolved Conflicts"), this, &MergeResultWindow::slotChooseAForUnsolvedConflicts, ac, "merge_choose_a_for_unsolved_conflicts"); - chooseBForUnsolvedConflicts = GuiUtils::createAction(i18n("Choose B for All Unsolved Conflicts"), this, &MergeResultWindow::slotChooseBForUnsolvedConflicts, ac, "merge_choose_b_for_unsolved_conflicts"); - chooseCForUnsolvedConflicts = GuiUtils::createAction(i18n("Choose C for All Unsolved Conflicts"), this, &MergeResultWindow::slotChooseCForUnsolvedConflicts, ac, "merge_choose_c_for_unsolved_conflicts"); - chooseAForUnsolvedWhiteSpaceConflicts = GuiUtils::createAction(i18n("Choose A for All Unsolved Whitespace Conflicts"), this, &MergeResultWindow::slotChooseAForUnsolvedWhiteSpaceConflicts, ac, "merge_choose_a_for_unsolved_whitespace_conflicts"); - chooseBForUnsolvedWhiteSpaceConflicts = GuiUtils::createAction(i18n("Choose B for All Unsolved Whitespace Conflicts"), this, &MergeResultWindow::slotChooseBForUnsolvedWhiteSpaceConflicts, ac, "merge_choose_b_for_unsolved_whitespace_conflicts"); - chooseCForUnsolvedWhiteSpaceConflicts = GuiUtils::createAction(i18n("Choose C for All Unsolved Whitespace Conflicts"), this, &MergeResultWindow::slotChooseCForUnsolvedWhiteSpaceConflicts, ac, "merge_choose_c_for_unsolved_whitespace_conflicts"); + chooseAEverywhere = GuiUtils::createAction(i18n("Choose A Everywhere"), QKeySequence(Qt::CTRL + Qt::SHIFT + Qt::Key_1), ac, "merge_choose_a_everywhere"); + chooseBEverywhere = GuiUtils::createAction(i18n("Choose B Everywhere"), QKeySequence(Qt::CTRL + Qt::SHIFT + Qt::Key_2), ac, "merge_choose_b_everywhere"); + chooseCEverywhere = GuiUtils::createAction(i18n("Choose C Everywhere"), QKeySequence(Qt::CTRL + Qt::SHIFT + Qt::Key_3), ac, "merge_choose_c_everywhere"); + chooseAForUnsolvedConflicts = GuiUtils::createAction(i18n("Choose A for All Unsolved Conflicts"), ac, "merge_choose_a_for_unsolved_conflicts"); + chooseBForUnsolvedConflicts = GuiUtils::createAction(i18n("Choose B for All Unsolved Conflicts"), ac, "merge_choose_b_for_unsolved_conflicts"); + chooseCForUnsolvedConflicts = GuiUtils::createAction(i18n("Choose C for All Unsolved Conflicts"), ac, "merge_choose_c_for_unsolved_conflicts"); + chooseAForUnsolvedWhiteSpaceConflicts = GuiUtils::createAction(i18n("Choose A for All Unsolved Whitespace Conflicts"), ac, "merge_choose_a_for_unsolved_whitespace_conflicts"); + chooseBForUnsolvedWhiteSpaceConflicts = GuiUtils::createAction(i18n("Choose B for All Unsolved Whitespace Conflicts"), ac, "merge_choose_b_for_unsolved_whitespace_conflicts"); + chooseCForUnsolvedWhiteSpaceConflicts = GuiUtils::createAction(i18n("Choose C for All Unsolved Whitespace Conflicts"), ac, "merge_choose_c_for_unsolved_whitespace_conflicts"); +} + +void MergeResultWindow::connectActions() +{ + QObject::connect(chooseAEverywhere, &QAction::triggered, this, &MergeResultWindow::slotChooseAEverywhere); + QObject::connect(chooseBEverywhere, &QAction::triggered, this, &MergeResultWindow::slotChooseBEverywhere); + QObject::connect(chooseCEverywhere, &QAction::triggered, this, &MergeResultWindow::slotChooseCEverywhere); + + QObject::connect(chooseAForUnsolvedConflicts, &QAction::triggered, this, &MergeResultWindow::slotChooseAForUnsolvedConflicts); + QObject::connect(chooseBForUnsolvedConflicts, &QAction::triggered, this, &MergeResultWindow::slotChooseBForUnsolvedConflicts); + QObject::connect(chooseCForUnsolvedConflicts, &QAction::triggered, this, &MergeResultWindow::slotChooseCForUnsolvedConflicts); + + QObject::connect(chooseAForUnsolvedWhiteSpaceConflicts, &QAction::triggered, this, &MergeResultWindow::slotChooseAForUnsolvedWhiteSpaceConflicts); + QObject::connect(chooseBForUnsolvedWhiteSpaceConflicts, &QAction::triggered, this, &MergeResultWindow::slotChooseBForUnsolvedWhiteSpaceConflicts); + QObject::connect(chooseCForUnsolvedWhiteSpaceConflicts, &QAction::triggered, this, &MergeResultWindow::slotChooseCForUnsolvedWhiteSpaceConflicts); } void MergeResultWindow::showUnsolvedConflictsStatusMessage() @@ -640,7 +668,7 @@ int MergeResultWindow::getTextXOffset() { QFontMetrics fm = fontMetrics(); - return 3 * fm.width('0'); + return 3 * Utils::getHorizontalAdvance(fm, '0'); } void MergeResultWindow::resizeEvent(QResizeEvent* e) @@ -1219,7 +1247,7 @@ bOk = false; int i = s.toInt(&bOk); if(bOk && i >= 0 && i < 10000) - s.sprintf("%04d", i); // This should help for correct sorting of numbers. + s.asprintf("%04d", i); // This should help for correct sorting of numbers. key += s + ' '; } else @@ -1236,7 +1264,7 @@ else { QString sIdx; - sIdx.sprintf("%02d", idx + 1); // Up to 99 words in the groupRegExp (more than 12 aren't expected) + sIdx.asprintf("%02d", idx + 1); // Up to 99 words in the groupRegExp (more than 12 aren't expected) key += sIdx + ' '; } } @@ -1887,7 +1915,7 @@ else Q_ASSERT(true); - xOffset -= fm.width('0'); + xOffset -= Utils::getHorizontalAdvance(fm, '0'); p.setPen(m_pOptions->m_fgColor); if(rangeMark & 1) // begin mark { @@ -1937,7 +1965,7 @@ bool bOldSelectionContainsData = m_selection.selectionContainsData(); const QFontMetrics& fm = fontMetrics(); - int fontWidth = fm.width('0'); + int fontWidth = Utils::getHorizontalAdvance(fm, '0'); if(!m_bCursorUpdate) // Don't redraw everything for blinking cursor? { @@ -2228,7 +2256,7 @@ // Scroll because mouse moved out of the window const QFontMetrics& fm = fontMetrics(); - int fontWidth = fm.width('0'); + int fontWidth = Utils::getHorizontalAdvance(fm, '0'); int topLineYOffset = 0; int deltaX = 0; int deltaY = 0; diff -Nru kdiff3-1.8.01/src/mergeresultwindow.h kdiff3-1.8.3/src/mergeresultwindow.h --- kdiff3-1.8.01/src/mergeresultwindow.h 2019-05-18 01:01:30.000000000 +0000 +++ kdiff3-1.8.3/src/mergeresultwindow.h 2020-06-25 00:17:35.000000000 +0000 @@ -40,7 +40,16 @@ const Diff3LineList* pDiff3LineList, TotalDiffStatus* pTotalDiffStatus ); - void initActions(KActionCollection* ac); + + inline void clearMergeList() + { + m_mergeLineList.clear(); + m_totalSize = 0; + } + + static void initActions(KActionCollection* ac); + + void connectActions(); void reset(); bool saveDocument( const QString& fileName, QTextCodec* pEncoding, e_LineEndStyle eLineEndStyle ); @@ -119,15 +128,15 @@ void merge(bool bAutoSolve, e_SrcSelector defaultSelector, bool bConflictsOnly=false, bool bWhiteSpaceOnly=false ); QString getString( int lineIdx ); - QAction* chooseAEverywhere = nullptr; - QAction* chooseBEverywhere = nullptr; - QAction* chooseCEverywhere = nullptr; - QAction* chooseAForUnsolvedConflicts = nullptr; - QAction* chooseBForUnsolvedConflicts = nullptr; - QAction* chooseCForUnsolvedConflicts = nullptr; - QAction* chooseAForUnsolvedWhiteSpaceConflicts = nullptr; - QAction* chooseBForUnsolvedWhiteSpaceConflicts = nullptr; - QAction* chooseCForUnsolvedWhiteSpaceConflicts = nullptr; + static QAction* chooseAEverywhere; + static QAction* chooseBEverywhere; + static QAction* chooseCEverywhere; + static QAction* chooseAForUnsolvedConflicts; + static QAction* chooseBForUnsolvedConflicts; + static QAction* chooseCForUnsolvedConflicts; + static QAction* chooseAForUnsolvedWhiteSpaceConflicts; + static QAction* chooseBForUnsolvedWhiteSpaceConflicts; + static QAction* chooseCForUnsolvedWhiteSpaceConflicts; Options* m_pOptions = nullptr; @@ -150,17 +159,17 @@ class MergeEditLine { public: - explicit MergeEditLine(const Diff3LineList::const_iterator &i, e_SrcSelector src=None){m_id3l=i; m_src=src; m_bLineRemoved=false; } - void setConflict() { m_src=None; m_bLineRemoved=false; m_str=QString(); } - bool isConflict() { return m_src==None && !m_bLineRemoved && m_str.isEmpty(); } - void setRemoved(e_SrcSelector src=None) { m_src=src; m_bLineRemoved=true; m_str=QString(); } + explicit MergeEditLine(const Diff3LineList::const_iterator &i, e_SrcSelector src=None){m_id3l=i; m_src=src; m_bLineRemoved=false; mChanged = false; } + void setConflict() { mChanged = false; m_src=None; m_bLineRemoved=false; m_str=QString(); } + bool isConflict() { return m_src==None && !m_bLineRemoved && !mChanged; } + void setRemoved(e_SrcSelector src=None) { m_src=src; m_bLineRemoved=true; mChanged=(m_src == None); m_str=QString(); } bool isRemoved() { return m_bLineRemoved; } bool isEditableText() { return !isConflict() && !isRemoved(); } - void setString( const QString& s ){ m_str=s; m_bLineRemoved=false; m_src=None; } + void setString( const QString& s ){ m_str=s; m_bLineRemoved=false; m_src=None; mChanged=true; } QString getString( const MergeResultWindow* ); - bool isModified() { return ! m_str.isEmpty() || (m_bLineRemoved && m_src==None); } + bool isModified() { return mChanged; } - void setSource( e_SrcSelector src, bool bLineRemoved ) { m_src=src; m_bLineRemoved =bLineRemoved; } + void setSource( e_SrcSelector src, bool bLineRemoved ) { m_src=src; m_bLineRemoved = bLineRemoved; if(bLineRemoved) mChanged = true; if(m_src != None) mChanged = false; } e_SrcSelector src() { return m_src; } Diff3LineList::const_iterator id3l(){return m_id3l;} // getString() is implemented as MergeResultWindow::getString() @@ -169,6 +178,8 @@ e_SrcSelector m_src; // 1, 2 or 3 for A, B or C respectively, or 0 when line is from neither source. QString m_str; // String when modified by user or null-string when orig data is used. bool m_bLineRemoved; + + bool mChanged; }; class MergeEditLineList : private std::list diff -Nru kdiff3-1.8.01/src/optiondialog.cpp kdiff3-1.8.3/src/optiondialog.cpp --- kdiff3-1.8.01/src/optiondialog.cpp 2019-05-18 01:01:30.000000000 +0000 +++ kdiff3-1.8.3/src/optiondialog.cpp 2020-06-25 00:17:35.000000000 +0000 @@ -21,6 +21,7 @@ #include "optiondialog.h" #include "OptionItems.h" #include "ConfigValueMap.h" +#include "ui_scroller.h" #include "diff.h" #include "smalldialogs.h" @@ -44,7 +45,7 @@ #include #include #include -#include +#include #include #include @@ -55,6 +56,7 @@ #include #include #include + #include #define KDIFF3_CONFIG_GROUP "KDiff3 Options" @@ -411,7 +413,9 @@ { if(c != nullptr) { - QString codecName = QLatin1String(c->name()); + QByteArray nameArray = c->name(); + QLatin1String codecName = QLatin1String(nameArray); + for(int i = 0; i < m_codecVec.size(); ++i) { if(c == m_codecVec[i]) @@ -421,7 +425,7 @@ // The m_codecVec.size will at this point return the value we need for the index. if(codecName == defaultName()) saveDefaultIndex(m_codecVec.size()); - QString itemText = visibleCodecName.isEmpty() ? codecName : visibleCodecName + QStringLiteral(" (") + codecName + QStringLiteral(")"); + QString itemText = visibleCodecName.isEmpty() ? codecName : visibleCodecName + QLatin1String(" (") + codecName + QLatin1String(")"); addItem(itemText, (int)m_codecVec.size()); m_codecVec.push_back(c); } @@ -492,6 +496,7 @@ setStandardButtons(QDialogButtonBox::Help | QDialogButtonBox::RestoreDefaults | QDialogButtonBox::Apply | QDialogButtonBox::Ok | QDialogButtonBox::Cancel); setModal(true); + setMinimumSize(600, 500); //showButtonSeparator( true ); //setHelp( "kdiff3/index.html", QString::null ); @@ -609,12 +614,20 @@ void OptionDialog::setupColorPage() { - QFrame* page = new QFrame(); - KPageWidgetItem* pageItem = new KPageWidgetItem(page, i18nc("Title for color settings page","Color")); + QScrollArea* pageFrame = new QScrollArea(); + KPageWidgetItem* pageItem = new KPageWidgetItem(pageFrame, i18nc("Title for color settings page","Color")); pageItem->setHeader(i18n("Colors Settings")); pageItem->setIcon(QIcon::fromTheme(QStringLiteral("colormanagement"))); addPage(pageItem); + QVBoxLayout* scrollLayout = new QVBoxLayout(); + scrollLayout->setMargin(2); + scrollLayout->addWidget(pageFrame); + + QScopedPointer scrollArea(new Ui::ScrollArea()); + scrollArea->setupUi(pageFrame); + + QWidget* page = pageFrame->findChild("contents"); QVBoxLayout* topLayout = new QVBoxLayout(page); topLayout->setMargin(5); @@ -769,12 +782,21 @@ void OptionDialog::setupEditPage() { - QFrame* page = new QFrame(); - KPageWidgetItem* pageItem = new KPageWidgetItem(page, i18n("Editor")); + QScrollArea* pageFrame = new QScrollArea(); + KPageWidgetItem* pageItem = new KPageWidgetItem(pageFrame, i18n("Editor")); pageItem->setHeader(i18n("Editor Behavior")); pageItem->setIcon(QIcon::fromTheme(QStringLiteral("accessories-text-editor"))); addPage(pageItem); + QVBoxLayout* scrollLayout = new QVBoxLayout(); + scrollLayout->setMargin(2); + scrollLayout->addWidget(pageFrame); + + QScopedPointer scrollArea(new Ui::ScrollArea()); + scrollArea->setupUi(pageFrame); + + QWidget* page = pageFrame->findChild("contents"); + QVBoxLayout* topLayout = new QVBoxLayout(page); topLayout->setMargin(5); @@ -835,12 +857,21 @@ void OptionDialog::setupDiffPage() { - QFrame* page = new QFrame(); - KPageWidgetItem* pageItem = new KPageWidgetItem(page, i18n("Diff")); + QScrollArea* pageFrame = new QScrollArea(); + KPageWidgetItem* pageItem = new KPageWidgetItem(pageFrame, i18n("Diff")); pageItem->setHeader(i18n("Diff Settings")); pageItem->setIcon(QIcon::fromTheme(QStringLiteral("text-x-patch"))); addPage(pageItem); + QVBoxLayout* scrollLayout = new QVBoxLayout(); + scrollLayout->setMargin(2); + scrollLayout->addWidget(pageFrame); + + QScopedPointer scrollArea(new Ui::ScrollArea()); + scrollArea->setupUi(pageFrame); + + QWidget* page = pageFrame->findChild("contents"); + QVBoxLayout* topLayout = new QVBoxLayout(page); topLayout->setMargin(5); @@ -921,12 +952,21 @@ void OptionDialog::setupMergePage() { - QFrame* page = new QFrame(); - KPageWidgetItem* pageItem = new KPageWidgetItem(page, i18n("Merge")); + QScrollArea* pageFrame = new QScrollArea(); + KPageWidgetItem* pageItem = new KPageWidgetItem(pageFrame, i18nc("Settings page", "Merge")); pageItem->setHeader(i18n("Merge Settings")); pageItem->setIcon(QIcon::fromTheme(QStringLiteral("merge"))); addPage(pageItem); + QVBoxLayout* scrollLayout = new QVBoxLayout(); + scrollLayout->setMargin(2); + scrollLayout->addWidget(pageFrame); + + QScopedPointer scrollArea(new Ui::ScrollArea()); + scrollArea->setupUi(pageFrame); + + QWidget* page = pageFrame->findChild("contents"); + QVBoxLayout* topLayout = new QVBoxLayout(page); topLayout->setMargin(5); @@ -1120,12 +1160,20 @@ void OptionDialog::setupDirectoryMergePage() { - QFrame* page = new QFrame(); - KPageWidgetItem* pageItem = new KPageWidgetItem(page, i18n("Directory")); + QScrollArea* pageFrame = new QScrollArea(); + KPageWidgetItem* pageItem = new KPageWidgetItem(pageFrame, i18n("Directory")); pageItem->setHeader(i18n("Directory")); pageItem->setIcon(QIcon::fromTheme(QStringLiteral("inode-directory"))); addPage(pageItem); + QVBoxLayout* scrollLayout = new QVBoxLayout(); + scrollLayout->setMargin(2); + scrollLayout->addWidget(pageFrame); + + QScopedPointer scrollArea(new Ui::ScrollArea()); + scrollArea->setupUi(pageFrame); + + QWidget* page = pageFrame->findChild("contents"); QVBoxLayout* topLayout = new QVBoxLayout(page); topLayout->setMargin(5); @@ -1378,12 +1426,21 @@ new Utf8BOMCodec(); */ - QFrame* page = new QFrame(); - KPageWidgetItem* pageItem = new KPageWidgetItem(page, i18n("Regional Settings")); + QScrollArea* pageFrame = new QScrollArea(); + KPageWidgetItem* pageItem = new KPageWidgetItem(pageFrame, i18n("Regional Settings")); pageItem->setHeader(i18n("Regional Settings")); pageItem->setIcon(QIcon::fromTheme(QStringLiteral("preferences-desktop-locale"))); addPage(pageItem); + QVBoxLayout* scrollLayout = new QVBoxLayout(); + scrollLayout->setMargin(2); + scrollLayout->addWidget(pageFrame); + + QScopedPointer scrollArea(new Ui::ScrollArea()); + scrollArea->setupUi(pageFrame); + + QWidget* page = pageFrame->findChild("contents"); + QVBoxLayout* topLayout = new QVBoxLayout(page); topLayout->setMargin(5); @@ -1481,12 +1538,20 @@ void OptionDialog::setupIntegrationPage() { - QFrame* page = new QFrame(); - KPageWidgetItem* pageItem = new KPageWidgetItem(page, i18n("Integration")); + QScrollArea* pageFrame = new QScrollArea(); + KPageWidgetItem* pageItem = new KPageWidgetItem(pageFrame, i18n("Integration")); pageItem->setHeader(i18n("Integration Settings")); pageItem->setIcon(QIcon::fromTheme(QStringLiteral("utilities-terminal"))); addPage(pageItem); + QVBoxLayout* scrollLayout = new QVBoxLayout(); + scrollLayout->setMargin(2); + scrollLayout->addWidget(pageFrame); + + QScopedPointer scrollArea(new Ui::ScrollArea()); + scrollArea->setupUi(pageFrame); + + QWidget* page = pageFrame->findChild("contents"); QVBoxLayout* topLayout = new QVBoxLayout(page); topLayout->setMargin(5); @@ -1579,16 +1644,6 @@ } emit applyDone(); - -#ifdef Q_OS_WIN - QString locale = m_options.m_language; - if(locale == "Auto" || locale.isEmpty()) - locale = QLocale::system().name().left(2); - int spacePos = locale.indexOf(' '); - if(spacePos > 0) locale = locale.left(spacePos); - QSettings settings(QLatin1String("HKEY_CURRENT_USER\\Software\\KDiff3\\diff-ext"), QSettings::NativeFormat); - settings.setValue(QLatin1String("Language"), locale); -#endif } /** Set the default values in the widgets only, while the diff -Nru kdiff3-1.8.01/src/optiondialog.h kdiff3-1.8.3/src/optiondialog.h --- kdiff3-1.8.01/src/optiondialog.h 2019-05-18 01:01:30.000000000 +0000 +++ kdiff3-1.8.3/src/optiondialog.h 2020-06-25 00:17:35.000000000 +0000 @@ -47,7 +47,7 @@ public: explicit OptionDialog( bool bShowDirMergeSettings, QWidget *parent = nullptr ); - ~OptionDialog( void ) override; + ~OptionDialog() override; QString parseOptions( const QStringList& optionList ); QString calcOptionHelp(); @@ -61,9 +61,9 @@ void addOptionItem(OptionItemBase*); KKeyDialog* m_pKeyDialog; protected Q_SLOTS: - virtual void slotDefault( void ); - virtual void slotOk( void ); - virtual void slotApply( void ); + virtual void slotDefault(); + virtual void slotOk(); + virtual void slotApply(); //virtual void buttonClicked( QAbstractButton* ); virtual void helpRequested(); diff -Nru kdiff3-1.8.01/src/OptionItems.h kdiff3-1.8.3/src/OptionItems.h --- kdiff3-1.8.01/src/OptionItems.h 2019-05-18 01:01:30.000000000 +0000 +++ kdiff3-1.8.3/src/OptionItems.h 2020-06-25 00:17:35.000000000 +0000 @@ -18,18 +18,17 @@ * along with KDiff3. If not, see . */ - #ifndef OPTIONITEMS_H #define OPTIONITEMS_H #include "common.h" -#include #include #include +#include #include +#include #include -#include #include @@ -50,18 +49,21 @@ virtual void read(ValueMap*) = 0; void doPreserve() { - if(!m_bPreserved) { + if(!m_bPreserved) + { m_bPreserved = true; preserve(); } } void doUnpreserve() { - if(m_bPreserved) { + if(m_bPreserved) + { unpreserve(); } } QString getSaveName() { return m_saveName; } + protected: virtual void preserve() = 0; virtual void unpreserve() = 0; @@ -87,12 +89,14 @@ explicit Option(const T& defaultVal, const QString& saveName, T* pVar) : Option(pVar, defaultVal, saveName) - {} + { + } + explicit Option(T* pVar, const T& defaultValue, const QString& saveName) : OptionItemBase(saveName) { - m_pVar = pVar; - m_defaultVal = defaultValue; + m_pVar = pVar; + m_defaultVal = defaultValue; } void setToDefault() override {}; @@ -100,24 +104,25 @@ const T& getDefault() const { return m_defaultVal; }; const T getCurrent() const { return *m_pVar; }; - virtual void setCurrent(const T inValue) { *m_pVar= inValue; } + virtual void setCurrent(const T inValue) { *m_pVar = inValue; } void apply() override {}; virtual void apply(const T& inValue) { *m_pVar = inValue; } void write(ValueMap* config) override { config->writeEntry(m_saveName, *m_pVar); } void read(ValueMap* config) override { *m_pVar = config->readEntry(m_saveName, m_defaultVal); } + protected: void preserve() override { m_preservedVal = *m_pVar; } void unpreserve() override { *m_pVar = m_preservedVal; } T* m_pVar; T m_preservedVal; T m_defaultVal; + private: - Q_DISABLE_COPY(Option) + Q_DISABLE_COPY(Option) }; - template class OptionNum : public Option { @@ -126,19 +131,15 @@ explicit OptionNum(T* pVar, const QString& saveName) : Option(pVar, saveName) { - stringValue = QLocale().toString(*pVar); } explicit OptionNum(T* pVar, const T& defaultValue, const QString& saveName) : Option(pVar, defaultValue, saveName) { - stringValue = QLocale().toString(*pVar); } void setCurrent(const T inValue) override { - //setNum does not use locale formatting instead it always use QLocale::C. - stringValue = QLocale().toString(inValue); Option::setCurrent(inValue); } @@ -147,14 +148,13 @@ //QString::setNum does not use locale formatting instead it always use QLocale::C. return QLocale().toString(inValue); } - const QString& getString() const + const QString getString() const { - return stringValue; + //QString::setNum does not use locale formatting instead it always use QLocale::C. + return QLocale().toString(Option::getCurrent()); } private: - QString stringValue; - Q_DISABLE_COPY(OptionNum) }; diff -Nru kdiff3-1.8.01/src/options.h kdiff3-1.8.3/src/options.h --- kdiff3-1.8.01/src/options.h 2019-05-18 01:01:30.000000000 +0000 +++ kdiff3-1.8.3/src/options.h 2020-06-25 00:17:35.000000000 +0000 @@ -149,9 +149,7 @@ QString m_DmFileAntiPattern; QString m_DmDirAntiPattern; - QString m_language; bool m_bRightToLeftLanguage; - QString m_ignorableCmdLineOptions; bool m_bIntegrateWithClearCase; bool m_bEscapeKeyQuits; diff -Nru kdiff3-1.8.01/src/org.kde.kdiff3.appdata.xml kdiff3-1.8.3/src/org.kde.kdiff3.appdata.xml --- kdiff3-1.8.01/src/org.kde.kdiff3.appdata.xml 2019-05-18 01:01:30.000000000 +0000 +++ kdiff3-1.8.3/src/org.kde.kdiff3.appdata.xml 2020-06-25 00:17:35.000000000 +0000 @@ -10,13 +10,16 @@ KDiff3 KDiff3 KDiff3 + KDiff3 KDiff3 KDiff3 KDiff3 + KDiff3 KDiff3 KDiff3 KDiff3 KDiff3 + KDiff3 KDiff3 KDiff3 KDiff3 @@ -33,6 +36,7 @@ Programm zum Vergleichen und Zusammenführen von Dateien und Ordnern A File And Directory Comparison And Merge Tool Una herramienta para comparar y fusionar archivos y directorios + Fitxategiak eta direktorioak konparatzeko eta bateratzeko tresna bat Tiedostojen ja kansioiden vertailu- ja yhdistämistyökalu Un outil de comparaison et de fusion de fichiers et de dossiers Unha ferramenta de comparación e fusión de ficheiros e directorios @@ -47,7 +51,7 @@ Ett verktyg för jämförelse och sammanfogning av filer och kataloger Програма для порівняння і об'єднання файлів та каталогів xxA File And Directory Comparison And Merge Toolxx - 一个文件和目录的比较和合并工具 + 文件和目录比较合并工具 KDE

KDiff3 is a file and directory diff and merge tool which

@@ -56,6 +60,7 @@

KDiff3 ist ein Programm zum Anzeigen von Unterschieden und zum Zusammenführen von Dateien und Ordnern.

KDiff3 is a file and directory diff and merge tool which

KDiff es una herramienta de visualización de diferencias y de fusión de archivos y directorios que

+

KDiff3 fitxategiak eta direktorioak konparatzeko eta bateratzeko tresna bat da,

Kdiff3 on tiedostojen ja kansioiden vertailu- ja yhdistämistyökalu, joka:

KDiff3 est un outil de comparaison et de fusion de fichiers et de dossiers qui

KDiff3 é unha ferramenta de diferenzas e fusión de ficheiros e directorios que

@@ -65,9 +70,12 @@

KDdiff3 is een hulpmiddel om bestanden en mappen te vergelijken en samen te voegen dat

KDiff3 jest narzędziem do pokazywania różnicy i scalania plików i katalogów, które

O KDiff3 é uma ferramenta de detecção e junção das diferenças entre ficheiros e pastas que

+

O KDiff3 é uma ferramenta de diferenças e mesclagem de arquivos e pastas que

+

KDiff3 je nástroj na porovnávanie a zlučovanie súborov a adresárov

Kdiff3 är ett verktyg för jämförelse och sammanfogning av filer och kataloger, som

KDiff3 — програма для визначення відмінностей у файлах і каталогах та об'єднання цих відмінностей в один варіант, яка

xxKDiff3 is a file and directory diff and merge tool whichxx

+

KDiff3 是一个文件和目录比较合并工具，能够

  • compares and merges two or three text input files or directories,
  • compara i fusiona dos o tres fitxers o directoris des de l'entrada,
    • @@ -75,24 +83,29 @@
  • vergleicht zwei oder drei Textdateien bzw. Ordner und führt sie zusammen,
  • compares and merges two or three text input files or directories,
  • compara y fusiona dos o tres archivos de texto de entrada o directorios,
    • +
  • sarrerako bi edo hiru testu fitxategi edo direktorio konparatu eta bateratzen dituena,
  • vertaa kahta tai kolmea tekstitiedostoa tai kansiota ja osaa yhdistää ne
  • compare et fusionne deux ou trois fichiers ou dossiers en entrée,
  • compara e fusiona dous ou tres ficheiros ou directorios de entrada de texto,
  • membandingkan dan menggabungkan dua atau tiga input teks file atau direktori
  • confronta e fonde due o tre file di testo o cartelle in ingresso,
    • -
  • 두 개 또는 세 개의 텍스트 입력 파일 또는 디렉터리를 비교하고 병합하며,
    • +
  • 텍스트 입력 파일 또는 디렉터리 두 개 또는 세 개를 비교하고 병합하며,
  • twee of drie tekstbestanden of mappen vergelijkt en samenvoegt,
  • porównuje i scala dwa, trzy lub więcej plików wejściowych lub katalogów,
  • compara e junta dois ou três ficheiros de texto ou pastas de entrada,
    • +
  • compara e mescla dois ou três arquivos de texto ou pastas,
    • +
  • porovnáva a zlučuje dva alebo viac textových súborov alebo adresárov,
  • jämför och sammanfogar två eller tre textfiler eller kataloger,
  • порівнює і об’єднує два або три вхідних текстових файлів або каталогів.
  • xxcompares and merges two or three text input files or directories,xx
    • +
  • 比较和合并2路、3路输入的文本文件或目录，
  • shows the differences line by line and character by character(!),
  • mostra les diferències línia per línia i caràcter per caràcter!,
  • mostra les diferències línia per línia i caràcter per caràcter!,
  • kann Unterschiede zeilenweise und sogar Zeichen für Zeichen anzeigen,
  • shows the differences line by line and character by character(!),
  • muestra las diferencias línea a línea y carácter a carácter (!),
    • +
  • ezberdintasunak lerroz-lerro eta karakterez-karaktere erakusten ditu(!),
  • näyttää erot riveittäin ja merkeittäin (!)
  • affiche les différences ligne par ligne et caractère par caractère (!),
  • mostra as diferenzas liña por liña e carácter por carácter(!),
    • @@ -102,15 +115,19 @@
  • toont de verschillen regel voor regel en teken voor teken(!),
  • pokazuje różnice wiersz po wierszu i znak po znaku(!),
  • mostra as diferenças linha-a-linha e carácter-a-carácter(!),
    • +
  • mostra as diferenças linha por linha e caractere por caractere(!),
    • +
  • zobrazuje rozdiely riadok po riadku a znak po znaku,
  • visar skillnaderna rad för rad och tecken för tecken (!),
  • показує відмінності за рядками і за символами(!),
  • xxshows the differences line by line and character by character(!),xx
    • +
  • 按单行或单字符显示差异(!)，
  • provides an automatic merge-facility,
  • proporciona la facilitat del fusionat automàtic,
  • proporciona la facilitat del fusionat automàtic,
  • hat eine Funktion zum automatischen Zusammenführen,
  • provides an automatic merge-facility,
  • proporciona una utilidad de fusión automática,
    • +
  • automatikoki bateratzeko erraztasuna ematen du,
  • tarjoaa automaattisen yhdistämistoiminnon
  • offre des fonctionnalités de fusion automatique,
  • fornece unha ferramenta de fusión automática,
    • @@ -120,15 +137,19 @@
  • een automatische samenvoegfunctie biedt,
  • zapewnia narzędzie do samoczynnego scalania,
  • oferece uma funcionalidade de junção automática,
    • +
  • fornecendo a facilidade da mesclagem automática,
    • +
  • poskytuje automatickú možnosť zlúčenia,
  • tillhandahåller en automatisk sammanfogingsfunktion,
  • надає можливість автоматичного об’єднання,
  • xxprovides an automatic merge-facility,xx
    • +
  • 提供自动合并功能，
  • has an editor for comfortable solving of merge-conflicts,
  • té un editor per a la solució còmoda dels conflictes de fusionat,
  • té un editor per a la solució còmoda dels conflictes de fusionat,
  • enthält einen speziellen komfortablen Editor zum Auflösen von Konflikten beim Zusammenführen,
  • has an editor for comfortable solving of merge-conflicts,
  • posee un editor para resolver confortablemente los conflictos de fusión,
    • +
  • bateratze-gatazkak erosotasunez ebazteko editore bat dauka,
  • sisältää muokkaimen yhdistämisristiriitojen ratkaisemiseksi
  • dispose d'un éditeur pour résoudre confortablement les conflits lors de la fusion,
  • ten un editor para solucionar de maneira cómoda conflitos de fusión,
    • @@ -138,15 +159,19 @@
  • een editor heeft voor het comfortabel oplossen van samenvoegconflicten,
  • ma edytor do wygodnego rozwiązywania sprzeczności przy scalaniu,
  • tem um editor para resolver confortavelmente os conflitos de junção,
    • +
  • tem um editor para resolver confortavelmente os conflitos de mesclagem,
    • +
  • má editor na pohodlné riešenie konfliktov zlučovania,
  • har en editor för bekväm lösning av sammanfogningskonflikter,
  • містить редактор для полегшення розв’язання конфліктів під час об’єднання,
  • xxhas an editor for comfortable solving of merge-conflicts,xx
    • +
  • 有一个舒适的编辑器来解决合并冲突，
  • provides network transparency via KIO,
  • proporciona transparència de xarxa a través del KIO,
  • proporciona transparència de xarxa a través del KIO,
  • ist mit Hilfe von KIO Netzwerktransparent,
  • provides network transparency via KIO,
  • proporciona transparencia de red mediante el uso de KIO,
    • +
  • KIO bidez sarearekiko gardentasuna hornitzen du,
  • tarjoaa läpinäkyvän verkon KIOn kautta
  • fournit une transparence réseau via KIO,
  • fornece transparencia de rede mediante KIO,
    • @@ -156,15 +181,19 @@
  • netwerktransparantie biedt via KIO,
  • zapewnia przejrzystość sieciową przez KIO,
  • oferece a transparência na rede com o KIO,
    • +
  • fornece transparência de rede via KIO,
    • +
  • poskytuje sieťovú transparentnosť cez KIO,
  • tillhandahåller nätverkstransparens via KIO,
  • забезпечує мережеву прозорість за допомогою KIO,
  • xxprovides network transparency via KIO,xx
    • +
  • 通过 KIO 提供网络文件透明访问，
  • has options to highlight or hide changes in white-space or comments,
  • té opcions per a ressaltar o ocultar els canvis en els espais en blanc o els comentaris,
  • té opcions per a ressaltar o ocultar els canvis en els espais en blanc o els comentaris,
  • kann Unterschiede in Leerraum-Zeichen oder Kommentaren besonders hervorheben oder ausblenden,
  • has options to highlight or hide changes in white-space or comments,
  • contiene opciones para resaltar u ocultar cambios en espacios en blanco y en comentarios,
    • +
  • zuriune edo iruzkinetako aldaketak nabarmentzeko edo ezkutatzeko aukerak ditu,
  • osaa korostaa tai piilottaa muutokset tyhjemerkeissä ja kommenteissa
  • dispose d'options permettant de surligner ou de cacher les différences d'espaces ou de commentaires,
  • ten opcións para salientar ou agochar cambios en espazos en branco ou comentarios,
    • @@ -174,9 +203,12 @@
  • opties heeft voor het accentueren of verbergen van wijzigingen in witruimte of commentaar,
  • ma opcje do podświetlenia i ukrycia zmian w białych znakach lub komentarzach,
  • tem opções para realçar ou esconder as alterações nos espaços em branco ou comentários,
    • +
  • tem opção para realçar ou ocultar alterações nos espaços em branco ou comentários,
    • +
  • má voľby na zvýraznenie alebo skrytie zmien v bielych znakoch alebo komentároch,
  • har alternativ för att markera eller dölja ändringar av blanktecken eller kommentarer,
  • може підсвічувати або ховати зміни у пробілах або коментарях,
  • xxhas options to highlight or hide changes in white-space or comments,xx
    • +
  • 有选项可以设置高亮或隐藏空白字符和代码注释的更改，
  • supports Unicode, UTF-8 and other file encodings,
  • admet Unicode, UTF-8 i altres codificacions de fitxer,
  • admet Unicode, UTF-8 i altres codificacions de fitxer,
    • @@ -184,6 +216,7 @@
  • unterstützt Unicode, UTF-8 und weitere Dateikodierungen,
  • supports Unicode, UTF-8 and other file encodings,
  • permite el uso de Unicode, UTF-8 y de otras codificaciones de archivos,
    • +
  • Unicode, UTF-8 eta beste fitxategi kodeketa batzuk onartzen ditu,
  • tukee Unicodea, UTF-8:aa ja muita merkistökoodauksia
  • prend en charge Unicode, UTF-8 et d'autres encodages de fichiers,
  • é compatíbel con Unicode, UTF-8 e outras codificacións de ficheiros,s
    • @@ -193,15 +226,19 @@
  • Unicode, UTF-8 en andere bestandscoderingen ondersteunt,
  • obsługuje Unikod, UTF-8 i inne kodowania plików,
  • suporta o Unicode, o UTF-8 e outras codificações de ficheiros,
    • +
  • suporta o Unicode, UTF-8 e outras codificações de arquivos,
    • +
  • podporuje Unicode, UTF-8 a iné kódovania súborov,
  • stöder Unicode, UTF-8 och andra filkodningar,
  • підтримує Unicode, UTF-8 та інші кодування текстів файлів,
  • xxsupports Unicode, UTF-8 and other file encodings,xx
    • +
  • 支持 Unicode, UTF-8 和其他文件编码,
  • prints differences,
  • imprimeix les diferències,
  • imprimeix les diferències,
  • druckt Abweichungen,
  • prints differences,
  • imprime las diferencias,
    • +
  • ezberdintasunak inprimatzen ditu,
  • tulostaa eroavuudet
  • affiche les différences,
  • imprime diferenzas,
    • @@ -211,15 +248,19 @@
  • verschillen in regels afdrukt,
  • drukuje różnice,
  • imprime as diferenças,
    • +
  • imprime as diferenças,
    • +
  • vytlačí rozdiely,
  • skriver ut skillnader,
  • може надсилати на друк різницю,
  • xxprints differences,xx
    • +
  • 打印差异,
  • supports version control keyword and history merging.
  • admet la paraula clau per al control de versions i un historial de les fusions.
  • admet la paraula clau per al control de versions i un historial de les fusions.
  • unterstützt Schlüsselwörter für Versionsverwaltung und Verlauf-Zusammenführung.
  • supports version control keyword and history merging.
  • permite el uso de palabras clave de control de versiones y de fusión de historial.
    • +
  • bertsio-kontrolerako gako-hitzak eta historia bateratzea onartzen ditu.
  • tukee versionhallinnan avainsanoja ja historian yhdistämistä.
  • prend en charge les mots clés de contrôle de version et la fusion des historiques.
  • e permite fusionar historiais e palabras clave de control de versión.
    • @@ -229,14 +270,20 @@
  • versiebeheersleutelwoorden ondersteunt en samenvoegen van geschiedenis.
  • obsługuje scalanie słów kluczowych i historii zarządzania wersjami
  • suporta as palavras-chave de controlo de versões e de junção do histórico.
    • +
  • suporta palavras-chave de controle de versão e mesclagem de histórico.
    • +
  • podporuje kľúčové slová na správu verzií a zlučovanie histórie.
  • stöder nyckelord för versionskontroll och sammanfogning av historik.
  • підтримує об’єднання за ключовими словами і журналом інструментів керування версіями.
  • xxsupports version control keyword and history merging.xx
    • +
  • 支持版本控制关键词和历史合并。
 - https://kde.org/images/screenshots/kdiff3.png + https://cdn.kde.org/screenshots/kdiff3/diffscreen_two_way.png + + + https://cdn.kde.org/screenshots/kdiff3/ManualMerdge.png https://kde.org/applications/development/kdiff3 diff -Nru kdiff3-1.8.01/src/org.kde.kdiff3.desktop kdiff3-1.8.3/src/org.kde.kdiff3.desktop --- kdiff3-1.8.01/src/org.kde.kdiff3.desktop 2019-05-18 01:01:30.000000000 +0000 +++ kdiff3-1.8.3/src/org.kde.kdiff3.desktop 2020-06-25 00:17:35.000000000 +0000 @@ -21,6 +21,7 @@ Name[hne]=के-डिफ3 Name[hr]=KDiff3 Name[hu]=KDiff3 +Name[ia]=KDiff3 Name[it]=KDiff3 Name[ja]=KDiff3 Name[km]=KDiff3 @@ -63,7 +64,7 @@ GenericName[eo]=Fasado por la programoj "diff" kaj "patch" GenericName[es]=Interfaz para diff/patch GenericName[et]=Võrdlemise ja liitmise rakendus -GenericName[eu]=Diff/Patch aurrealdekoa +GenericName[eu]=«Diff»/«Patch» aurrealdekoa GenericName[fi]=Diff/Patch-käyttöliittymä GenericName[fr]=Interface graphique pour « Diff » / « Patch » GenericName[ga]=Comhéadan Diff/Patch @@ -71,6 +72,7 @@ GenericName[hi]=डिफ/पैच फ्रन्टएण्ड GenericName[hne]=डिफ/पैच फ्रन्टएन्ड GenericName[hu]=Diff/Patch Frontend +GenericName[ia]=Fronte anterior de Diff/Patch GenericName[it]=Interfaccia per i comandi diff e patch GenericName[ja]=Diff/Patch フロントエンド GenericName[km]=Diff/Patch ខាង​មុខ @@ -124,6 +126,7 @@ Comment[hi]=फ़ाइल तथा डिरेक्ट्री तुलना करने व मिलाने का औजार Comment[hne]=फाइल अउ डिरेक्टरी तुलना करे अउ मिलाय के औजार Comment[hu]=Egy fájl és könyvtár összehasonlítási és egyesítési eszköz +Comment[ia]=Un instrumento de fusion e comparation de file e directorio Comment[it]=Uno strumento di confronto e fusione di file e cartelle Comment[ja]=ファイルやディレクトリの比較/マージを行うツール Comment[km]=ការ​ប្រៀបធៀប​ថត និង​ឯកសារ និង​ឧបករណ៌​បញ្ចូល​គ្នា @@ -150,7 +153,7 @@ Comment[ug]=ھۆججەت ۋە مۇندەرىجە سېلىشتۇرۇش ۋە بىرىكتۈرۈش قورالى Comment[uk]=Інструмент для порівняння та з’єднання файлів та тек Comment[x-test]=xxA File And Directory Comparison And Merge Toolxx -Comment[zh_CN]=一个文件和目录的比较和合并工具 +Comment[zh_CN]=文件和文件夹比较合并工具 Comment[zh_TW]=一個檔案與目錄比較與合併的工具 Terminal=false Categories=Qt;KDE;Development; diff -Nru kdiff3-1.8.01/src/pdiff.cpp kdiff3-1.8.3/src/pdiff.cpp --- kdiff3-1.8.01/src/pdiff.cpp 2019-05-18 01:01:30.000000000 +0000 +++ kdiff3-1.8.3/src/pdiff.cpp 2020-06-25 00:17:35.000000000 +0000 @@ -142,6 +142,8 @@ // so painting must be suppressed if(bGUI) setLockPainting(true); + //insure merge result window never has stale iterators. + if(m_pMergeResultWindow) m_pMergeResultWindow->clearMergeList(); m_diff3LineList.clear(); m_diff3LineVector.clear(); @@ -157,28 +159,25 @@ // First get all input data. pp.setInformation(i18n("Loading A")); + qCInfo(kdeMain) << i18n("Loading A: %1", m_sd1.getFilename()); if(bUseCurrentEncoding) - errors = m_sd1.readAndPreprocess(m_sd1.getEncoding(), false); + m_sd1.readAndPreprocess(m_sd1.getEncoding(), false); else - errors = m_sd1.readAndPreprocess(m_pOptions->m_pEncodingA, m_pOptions->m_bAutoDetectUnicodeA); - - if(!errors.isEmpty()) - { - KMessageBox::errorList(m_pOptionDialog, i18n("Errors occurred during pre-processing of file A."), errors); - } + m_sd1.readAndPreprocess(m_pOptions->m_pEncodingA, m_pOptions->m_bAutoDetectUnicodeA); pp.step(); pp.setInformation(i18n("Loading B")); + qCInfo(kdeMain) << "Loading B: " << m_sd2.getFilename(); + if(bUseCurrentEncoding) - errors = m_sd2.readAndPreprocess(m_sd2.getEncoding(), false); + m_sd2.readAndPreprocess(m_sd2.getEncoding(), false); else - errors = m_sd2.readAndPreprocess(m_pOptions->m_pEncodingB, m_pOptions->m_bAutoDetectUnicodeB); - - if(!errors.isEmpty()) - KMessageBox::errorList(m_pOptionDialog, i18n("Errors occurred during pre-processing of file B."), errors); + m_sd2.readAndPreprocess(m_pOptions->m_pEncodingB, m_pOptions->m_bAutoDetectUnicodeB); pp.step(); + errors.append(m_sd1.getErrors()); + errors.append(m_sd2.getErrors()); } else { @@ -188,8 +187,8 @@ pp.setMaxNofSteps(6); // 3 comparisons, 3 finediffs } - if(pTotalDiffStatus) - pTotalDiffStatus->reset(); + pTotalDiffStatus->reset(); + if(errors.isEmpty()) { // Run the diff. @@ -224,12 +223,9 @@ { pp.setInformation(i18n("Loading C")); if(bUseCurrentEncoding) - errors = m_sd3.readAndPreprocess(m_sd3.getEncoding(), false); + m_sd3.readAndPreprocess(m_sd3.getEncoding(), false); else - errors = m_sd3.readAndPreprocess(m_pOptions->m_pEncodingC, m_pOptions->m_bAutoDetectUnicodeC); - - if(!errors.isEmpty()) - KMessageBox::errorList(m_pOptionDialog, i18n("Errors occurred during pre-processing of file C."), errors); + m_sd3.readAndPreprocess(m_pOptions->m_pEncodingC, m_pOptions->m_bAutoDetectUnicodeC); pp.step(); } @@ -313,6 +309,7 @@ pTotalDiffStatus->bTextBEqC = false; } } + errors.append(m_sd3.getErrors()); } else { @@ -338,7 +335,7 @@ oldHeights = m_pMainSplitter->sizes(); initView(); - m_pMergeResultWindow->initActions(actionCollection()); + m_pMergeResultWindow->connectActions(); if(m_pDirectoryMergeSplitter->isVisible()) { @@ -390,14 +387,7 @@ pTotalDiffStatus); m_pMergeResultWindowTitle->setFileName(m_outputFilename.isEmpty() ? QString("unnamed.txt") : m_outputFilename); - if(!bGUI) - { - // We now have all needed information. The rest below is only for GUI-activation. - m_sd1.reset(); - m_sd2.reset(); - m_sd3.reset(); - } - else + if(bGUI) { m_pOverview->init(&m_diff3LineList, m_bTripleDiff); m_pDiffVScrollBar->setValue(0); @@ -536,12 +526,12 @@ void KDiff3App::scrollDiffTextWindow(int deltaX, int deltaY) { - if(deltaY != 0) + if(deltaY != 0 && m_pDiffVScrollBar != nullptr) { m_pDiffVScrollBar->setValue(m_pDiffVScrollBar->value() + deltaY); m_pOverview->setRange(m_pDiffVScrollBar->value(), m_pDiffVScrollBar->pageStep()); } - if(deltaX != 0) + if(deltaX != 0 && m_pHScrollBar != nullptr) m_pHScrollBar->QScrollBar::setValue(m_pHScrollBar->value() + deltaX); } @@ -953,15 +943,23 @@ break; case Qt::Key_Home: if(bCtrl) - m_pDiffVScrollBar->setValue(0); + { + if(m_pDiffVScrollBar != nullptr) m_pDiffVScrollBar->setValue(0); + } else - m_pHScrollBar->setValue(0); + { + if(m_pHScrollBar != nullptr) m_pHScrollBar->setValue(0); + } break; case Qt::Key_End: if(bCtrl) - m_pDiffVScrollBar->setValue(m_pDiffVScrollBar->maximum()); + { + if(m_pDiffVScrollBar != nullptr) m_pDiffVScrollBar->setValue(m_pDiffVScrollBar->maximum()); + } else - m_pHScrollBar->setValue(m_pHScrollBar->maximum()); + { + if(m_pHScrollBar != nullptr) m_pHScrollBar->setValue(m_pHScrollBar->maximum()); + } break; default: break; @@ -1091,20 +1089,21 @@ m_pDirectoryMergeSplitter->hide(); mainInit(); - if((!m_sd1.isEmpty() && !m_sd1.hasData()) || - (!m_sd2.isEmpty() && !m_sd2.hasData()) || - (!m_sd3.isEmpty() && !m_sd3.hasData())) + if((!m_sd1.getErrors().isEmpty()) || + (!m_sd2.getErrors().isEmpty()) || + (!m_sd3.getErrors().isEmpty())) { QString text(i18n("Opening of these files failed:")); text += "\n\n"; - if(!m_sd1.isEmpty() && !m_sd1.hasData()) - text += " - " + m_sd1.getAliasName() + '\n'; - if(!m_sd2.isEmpty() && !m_sd2.hasData()) - text += " - " + m_sd2.getAliasName() + '\n'; - if(!m_sd3.isEmpty() && !m_sd3.hasData()) - text += " - " + m_sd3.getAliasName() + '\n'; + if(!m_sd1.getErrors().isEmpty()) + text += " - " + m_sd1.getAliasName() + '\n' + m_sd1.getErrors().join('\n') + '\n'; + if(!m_sd2.getErrors().isEmpty()) + text += " - " + m_sd2.getAliasName() + '\n' + m_sd2.getErrors().join('\n') + '\n'; + if(!m_sd3.getErrors().isEmpty()) + text += " - " + m_sd3.getAliasName() + '\n' + m_sd3.getErrors().join('\n') + '\n'; KMessageBox::sorry(this, text, i18n("File open error")); + continue; } } @@ -1116,7 +1115,7 @@ slotStatusMsg(i18n("Ready.")); } -void KDiff3App::slotFileOpen2(const QString& fn1, const QString& fn2, const QString& fn3, const QString& ofn, +void KDiff3App::slotFileOpen2(QStringList &errors, const QString& fn1, const QString& fn2, const QString& fn3, const QString& ofn, const QString& an1, const QString& an2, const QString& an3, TotalDiffStatus* pTotalDiffStatus) { if(!canContinue()) return; @@ -1155,7 +1154,16 @@ mainInit(pTotalDiffStatus); if(pTotalDiffStatus != nullptr) + { + errors.append(m_sd1.getErrors()); + errors.append(m_sd2.getErrors()); + errors.append(m_sd3.getErrors()); + //Only time this could ever happen so move here to allow for error retrieval. + m_sd1.reset(); + m_sd2.reset(); + m_sd3.reset(); return; + } if(!((!m_sd1.isEmpty() && !m_sd1.hasData()) || (!m_sd2.isEmpty() && !m_sd2.hasData()) || @@ -1172,12 +1180,14 @@ void KDiff3App::slotFileNameChanged(const QString& fileName, e_SrcSelector winIdx) { + QStringList errors; QString fn1 = m_sd1.getFilename(); QString an1 = m_sd1.getAliasName(); QString fn2 = m_sd2.getFilename(); QString an2 = m_sd2.getAliasName(); QString fn3 = m_sd3.getFilename(); QString an3 = m_sd3.getAliasName(); + if(winIdx == A) { fn1 = fileName; @@ -1194,7 +1204,7 @@ an3 = ""; } - slotFileOpen2(fn1, fn2, fn3, m_outputFilename, an1, an2, an3, nullptr); + slotFileOpen2(errors, fn1, fn2, fn3, m_outputFilename, an1, an2, an3, nullptr); } void KDiff3App::slotEditCut() @@ -1564,7 +1574,7 @@ { const QClipboard* clipboard = QApplication::clipboard(); const QMimeData* mimeData = clipboard->mimeData(); - if(mimeData->hasText()) + if(mimeData && mimeData->hasText()) { QString s = clipboard->text(); editPaste->setEnabled(!s.isEmpty()); diff -Nru kdiff3-1.8.01/src/progress.cpp kdiff3-1.8.3/src/progress.cpp --- kdiff3-1.8.01/src/progress.cpp 2019-05-18 01:01:30.000000000 +0000 +++ kdiff3-1.8.3/src/progress.cpp 2020-06-25 00:17:35.000000000 +0000 @@ -13,11 +13,13 @@ #include "common.h" #include +#include #include #include #include #include #include +#include #include #include @@ -259,9 +261,6 @@ pld.m_dSubRangeMax = dMax; } -void qt_enter_modal(QWidget*); -void qt_leave_modal(QWidget*); - void ProgressDialog::enterEventLoop(KJob* pJob, const QString& jobInfo) { m_pJob = pJob; @@ -277,13 +276,16 @@ show(); // instead of using exec() the eventloop is entered and exited often without hiding/showing the window. - //qt_enter_modal(this); - QPointer pEventLoop = QPointer(new QEventLoop(this)); - m_eventLoopStack.push_back(pEventLoop); - pEventLoop->exec(); // this function only returns after ProgressDialog::exitEventLoop() is called. - pEventLoop.clear(); - m_eventLoopStack.pop_back(); - //qt_leave_modal(this); + if(m_eventLoop == nullptr) + { + m_eventLoop = QPointer(new QEventLoop(this)); + m_eventLoop->exec(); // this function only returns after ProgressDialog::exitEventLoop() is called. + m_eventLoop.clear(); + } + else + { + m_eventLoop->processEvents(QEventLoop::WaitForMoreEvents); + } } void ProgressDialog::exitEventLoop() @@ -292,8 +294,8 @@ killTimer(m_progressDelayTimer); m_progressDelayTimer = 0; m_pJob = nullptr; - if(!m_eventLoopStack.empty()) - m_eventLoopStack.back()->exit(); + if( m_eventLoop != nullptr) + m_eventLoop->exit(); } void ProgressDialog::recalc(bool bUpdate) @@ -344,7 +346,6 @@ } } -#include void ProgressDialog::show() { if(m_progressDelayTimer) @@ -443,6 +444,8 @@ { m_bWasCancelled = true; m_eCancelReason = eCancelReason; + if(m_eventLoop != nullptr) + m_eventLoop->exit(1); } } diff -Nru kdiff3-1.8.01/src/progress.h kdiff3-1.8.3/src/progress.h --- kdiff3-1.8.01/src/progress.h 2019-05-18 01:01:30.000000000 +0000 +++ kdiff3-1.8.3/src/progress.h 2020-06-25 00:17:35.000000000 +0000 @@ -14,7 +14,8 @@ #define PROGRESS_H #include -#include +#include +#include #include class KJob; @@ -84,7 +85,7 @@ int m_progressDelayTimer; int m_delayedHideTimer; int m_delayedHideStatusBarWidgetTimer; - QList m_eventLoopStack; + QPointer m_eventLoop; QProgressBar* m_pProgressBar; QProgressBar* m_pSubProgressBar; @@ -92,11 +93,11 @@ QLabel* m_pSubInformation; QLabel* m_pSlowJobInfo; QPushButton* m_pAbortButton; - QTime m_t1; - QTime m_t2; + QElapsedTimer m_t1; + QElapsedTimer m_t2; bool m_bWasCancelled; e_CancelReason m_eCancelReason; - KJob* m_pJob; + KJob* m_pJob = nullptr; QString m_currentJobInfo; // Needed if the job doesn't stop after a reasonable time. bool m_bStayHidden; QThread* m_pGuiThread; diff -Nru kdiff3-1.8.01/src/scroller.ui kdiff3-1.8.3/src/scroller.ui --- kdiff3-1.8.01/src/scroller.ui 1970-01-01 00:00:00.000000000 +0000 +++ kdiff3-1.8.3/src/scroller.ui 2020-06-25 00:17:35.000000000 +0000 @@ -0,0 +1,41 @@ + + + ScrollArea + + + + 0 + 0 + 525 + 432 + + + + + 0 + 0 + + + + Qt::LeftToRight + + + QAbstractScrollArea::AdjustToContents + + + true + + + + + 0 + 0 + 521 + 428 + + + + + + + diff -Nru kdiff3-1.8.01/src/smalldialogs.cpp kdiff3-1.8.3/src/smalldialogs.cpp --- kdiff3-1.8.01/src/smalldialogs.cpp 2019-05-18 01:01:30.000000000 +0000 +++ kdiff3-1.8.3/src/smalldialogs.cpp 2020-06-25 00:17:35.000000000 +0000 @@ -59,11 +59,14 @@ h->setColumnStretch(1, 10); QLabel* label = new QLabel(i18n("A (Base):"), this); + QUrl url = QUrl(n1); + //QUrl::isLocalFile returns false if the scheme is blank. + if(url.scheme().isEmpty()) url.setScheme("file"); m_pLineA = new QComboBox(); m_pLineA->setEditable(true); m_pLineA->insertItems(0, m_pOptions->m_recentAFiles); - m_pLineA->setEditText(QUrl(n1).toDisplayString()); + m_pLineA->setEditText(url.isLocalFile() ? n1 : url.toDisplayString()); m_pLineA->setMinimumWidth(200); QPushButton* button = new QPushButton(QIcon::fromTheme("document-new"), i18n("File..."), this); connect(button, &QPushButton::clicked, this, &OpenDialog::selectFileA); @@ -76,11 +79,13 @@ h->addWidget(button, 0, 2); h->addWidget(button2, 0, 3); + url.setUrl(n2); + if(url.scheme().isEmpty()) url.setScheme("file"); label = new QLabel("B:", this); m_pLineB = new QComboBox(); m_pLineB->setEditable(true); m_pLineB->insertItems(0, m_pOptions->m_recentBFiles); - m_pLineB->setEditText(QUrl(n2).toDisplayString()); + m_pLineB->setEditText(url.isLocalFile() ? n2 :url.toDisplayString()); m_pLineB->setMinimumWidth(200); button = new QPushButton(QIcon::fromTheme("document-new"), i18n("File..."), this); connect(button, &QPushButton::clicked, this, &OpenDialog::selectFileB); @@ -93,11 +98,13 @@ h->addWidget(button, 1, 2); h->addWidget(button2, 1, 3); + url.setUrl(n3); + if(url.scheme().isEmpty()) url.setScheme("file"); label = new QLabel(i18n("C (Optional):"), this); m_pLineC = new QComboBox(); m_pLineC->setEditable(true); m_pLineC->insertItems(0, m_pOptions->m_recentCFiles); - m_pLineC->setEditText(QUrl(n3).toDisplayString()); + m_pLineC->setEditText(url.isLocalFile() ? n3 :url.toDisplayString()); m_pLineC->setMinimumWidth(200); button = new QPushButton(QIcon::fromTheme("document-new"), i18n("File..."), this); connect(button, &QPushButton::clicked, this, &OpenDialog::selectFileC); @@ -135,11 +142,14 @@ hl->addStretch(2); + url.setUrl(outputName); + if(url.scheme().isEmpty()) url.setScheme("file"); + label = new QLabel(i18n("Output (optional):"), this); m_pLineOut = new QComboBox(); m_pLineOut->setEditable(true); m_pLineOut->insertItems(0, m_pOptions->m_recentOutputFiles); - m_pLineOut->setEditText(QUrl(outputName).toDisplayString()); + m_pLineOut->setEditText(url.isLocalFile() ? outputName : url.toDisplayString()); m_pLineOut->setMinimumWidth(200); button = new QPushButton(QIcon::fromTheme("document-new"), i18n("File..."), this); connect(button, &QPushButton::clicked, this, &OpenDialog::selectOutputName); @@ -231,8 +241,8 @@ currentUrl = QUrl::fromUserInput(current, QString(), QUrl::AssumeLocalFile); QUrl newURL = bDir ? QFileDialog::getExistingDirectoryUrl(this, i18n("Open Directory"), currentUrl) - : bSave ? QFileDialog::getSaveFileUrl(this, i18n("Select Output File"), currentUrl, QLatin1Literal("all/allfiles")) - : QFileDialog::getOpenFileUrl(this, i18n("Open File"), currentUrl, QLatin1Literal("all/allfiles")); + : bSave ? QFileDialog::getSaveFileUrl(this, i18n("Select Output File"), currentUrl, QLatin1Literal("all/allfiles (*)")) + : QFileDialog::getOpenFileUrl(this, i18n("Open File"), currentUrl, QLatin1Literal("all/allfiles (*)")); if(!newURL.isEmpty()) { /* Since we are selecting a directory open in the parent directory diff -Nru kdiff3-1.8.01/src/smalldialogs.h kdiff3-1.8.3/src/smalldialogs.h --- kdiff3-1.8.01/src/smalldialogs.h 2019-05-18 01:01:30.000000000 +0000 +++ kdiff3-1.8.3/src/smalldialogs.h 2020-06-25 00:17:35.000000000 +0000 @@ -83,9 +83,9 @@ QCheckBox* m_pSearchInOutput; QCheckBox* m_pCaseSensitive; - int currentLine; - int currentPos; - int currentWindow; + int currentLine = 0; + int currentPos = 0; + int currentWindow = 0; }; diff -Nru kdiff3-1.8.01/src/SourceData.cpp kdiff3-1.8.3/src/SourceData.cpp --- kdiff3-1.8.01/src/SourceData.cpp 2019-05-18 01:01:30.000000000 +0000 +++ kdiff3-1.8.3/src/SourceData.cpp 2020-06-25 00:17:35.000000000 +0000 @@ -66,6 +66,8 @@ m_tempFile.remove(); m_tempInputFileName = ""; } + + mErrors.clear(); } void SourceData::setFilename(const QString& filename) @@ -125,6 +127,8 @@ m_tempFile.remove(); m_tempInputFileName = ""; } + + mErrors.clear(); } void SourceData::setEncoding(QTextCodec* pEncoding) { @@ -133,8 +137,7 @@ QStringList SourceData::setData(const QString& data) { - QStringList errors; - + mErrors.clear(); // Create a temp file for preprocessing: if(m_tempInputFileName.isEmpty()) { @@ -147,7 +150,7 @@ bool bSuccess = f.writeFile(ba.constData(), ba.length()); if(!bSuccess) { - errors.append(i18n("Writing clipboard data to temp file failed.")); + mErrors.append(i18n("Writing clipboard data to temp file failed.")); } else { @@ -155,7 +158,7 @@ m_fileAccess = FileAccess(""); // Effect: m_fileAccess.isValid() is false } - return errors; + return mErrors; } const LineData* SourceData::getLineDataForDiff() const @@ -193,7 +196,7 @@ bool SourceData::isText() { - return m_normalData.isText(); + return m_normalData.isText() || m_normalData.isEmpty(); } bool SourceData::isIncompleteConversion() @@ -215,8 +218,11 @@ void SourceData::FileData::reset() { - delete[](char*) m_pBuf; - m_pBuf = nullptr; + if(m_pBuf != nullptr) + { + delete[](char*) m_pBuf; + m_pBuf = nullptr; + } m_v.clear(); m_size = 0; m_vSize = 0; @@ -249,6 +255,14 @@ m_pBuf = nullptr; m_size = 0; } + else + { + //null terminate buffer + pBuf[m_size + 1] = 0; + pBuf[m_size + 2] = 0; + pBuf[m_size + 3] = 0; + pBuf[m_size + 4] = 0; + } return bSuccess; } @@ -320,7 +334,7 @@ return pFallbackCodec; } -QStringList SourceData::readAndPreprocess(QTextCodec* pEncoding, bool bAutoDetectUnicode) +const QStringList& SourceData::readAndPreprocess(QTextCodec* pEncoding, bool bAutoDetectUnicode) { m_pEncoding = pEncoding; QTemporaryFile fileIn1, fileOut1; @@ -328,12 +342,11 @@ QString fileNameOut1; QString fileNameIn2; QString fileNameOut2; - QStringList errors; if(m_fileAccess.isValid() && !m_fileAccess.isNormal()) { - errors.append(i18n("%1 is not a normal file.", m_fileAccess.prettyAbsPath())); - return errors; + mErrors.append(i18n("%1 is not a normal file.", m_fileAccess.prettyAbsPath())); + return mErrors; } bool bTempFileFromClipboard = !m_fileAccess.isValid(); @@ -382,8 +395,8 @@ // No preprocessing: Read the file directly: if(!m_normalData.readFile(faIn)) { - errors.append(faIn.getStatusText()); - return errors; + mErrors.append(faIn.getStatusText()); + return mErrors; } } else @@ -423,12 +436,12 @@ { if(!m_normalData.readFile(faIn)) { - errors.append(faIn.getStatusText()); - errors.append(i18n(" Temp file is: %1", fileNameIn1)); - return errors; + mErrors.append(faIn.getStatusText()); + mErrors.append(i18n(" Temp file is: %1", fileNameIn1)); + return mErrors; } //Don't fail the preprocessor command if the file cann't be read. - errors.append( + mErrors.append( i18n("Preprocessing possibly failed. Check this command:\n\n %1" "\n\nThe preprocessing command will be disabled now.", ppCmd) + errorReason); @@ -440,12 +453,12 @@ if(!m_normalData.preprocess(m_pOptions->m_bPreserveCarriageReturn, pEncoding1)) { - errors.append(i18n("File %1 too large to process. Skipping.", fileNameIn1)); - return errors; + mErrors.append(i18n("File %1 too large to process. Skipping.", fileNameIn1)); + return mErrors; } //exit early for non text data further processing assumes a text file as input if(!m_normalData.isText()) - return errors; + return mErrors; // LineMatching Preprocessor if(!m_pOptions->m_LineMatchingPreProcessorCmd.isEmpty()) @@ -483,15 +496,15 @@ bool bSuccess = errorReason.isEmpty() && m_lmppData.readFile(fileNameOut2); if(FileAccess(fileNameIn2).size() > 0 && (!bSuccess || m_lmppData.m_size == 0)) { - errors.append( + mErrors.append( i18n("The line-matching-preprocessing possibly failed. Check this command:\n\n %1" "\n\nThe line-matching-preprocessing command will be disabled now.", ppCmd) + errorReason); m_pOptions->m_LineMatchingPreProcessorCmd = ""; if(!m_lmppData.readFile(fileNameIn2)) { - errors.append(i18n("Failed to read file: %1", fileNameIn2)); - return errors; + mErrors.append(i18n("Failed to read file: %1", fileNameIn2)); + return mErrors; } } } @@ -504,13 +517,13 @@ else { //exit early for non-existant files - return errors; + return mErrors; } if(!m_lmppData.preprocess(false, pEncoding2)) { - errors.append(i18n("File %1 too large to process. Skipping.", fileNameIn1)); - return errors; + mErrors.append(i18n("File %1 too large to process. Skipping.", fileNameIn1)); + return mErrors; } Q_ASSERT(m_lmppData.isText()); @@ -538,7 +551,7 @@ } } - return errors; + return mErrors; } /** Prepare the linedata vector for every input line.*/ diff -Nru kdiff3-1.8.01/src/SourceData.h kdiff3-1.8.3/src/SourceData.h --- kdiff3-1.8.01/src/SourceData.h 2019-05-18 01:01:30.000000000 +0000 +++ kdiff3-1.8.3/src/SourceData.h 2020-06-25 00:17:35.000000000 +0000 @@ -51,7 +51,7 @@ bool isValid(); // Either no file is specified or reading was successful // Returns a list of error messages if anything went wrong - QStringList readAndPreprocess(QTextCodec* pEncoding, bool bAutoDetectUnicode); + const QStringList& readAndPreprocess(QTextCodec* pEncoding, bool bAutoDetectUnicode); bool saveNormalDataAs(const QString& fileName); bool isBinaryEqualWith(const SourceData& other) const; @@ -61,6 +61,7 @@ QTextCodec* getEncoding() const { return m_pEncoding; } e_LineEndStyle getLineEndStyle() const { return m_normalData.m_eLineEndStyle; } + const QStringList& getErrors() { return mErrors; } private: bool convertFileEncoding(const QString& fileNameIn, QTextCodec* pCodecIn, const QString& fileNameOut, QTextCodec* pCodecOut); @@ -76,6 +77,8 @@ QString m_tempInputFileName; QTemporaryFile m_tempFile; //Created from clipboard content. + QStringList mErrors; + class FileData { private: @@ -111,11 +114,11 @@ bool isEmpty() { return m_size == 0; } - bool isText() { return m_bIsText; } + bool isText() { return m_bIsText || isEmpty(); } }; FileData m_normalData; FileData m_lmppData; - QTextCodec* m_pEncoding; + QTextCodec* m_pEncoding = nullptr; }; #endif // !SOURCEDATA_H diff -Nru kdiff3-1.8.01/src/Utils.h kdiff3-1.8.3/src/Utils.h --- kdiff3-1.8.01/src/Utils.h 2019-05-18 01:01:30.000000000 +0000 +++ kdiff3-1.8.3/src/Utils.h 2020-06-25 00:17:35.000000000 +0000 @@ -1,26 +1,27 @@ /** * Copyright (C) 2018 Michael Reeves reeves.87@gmail.com - * + * * This file is part of KDiff3. - * + * * KDiff3 is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 2 of the License, or * (at your option) any later version. - * + * * KDiff3 is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with KDiff3. If not, see . - * + * */ #ifndef UTILS_H #define UTILS_H +#include #include #include @@ -28,6 +29,27 @@ public: static bool wildcardMultiMatch(const QString& wildcard, const QString& testString, bool bCaseSensitive); static QString getArguments(QString cmd, QString& program, QStringList& args); + + //Where posiable use QTextLayout in place of these functions especially when dealing with non-latin scripts. + inline static int getHorizontalAdvance(const QFontMetrics &metrics, const QString& s, int len = -1) + { + //Warning: The Qt API used here is not accurate for some non-latin characters. + #if QT_VERSION < QT_VERSION_CHECK(5,12,0) + return metrics.width(s, len); + #else + return metrics.horizontalAdvance(s, len); + #endif + } + + inline static int getHorizontalAdvance(const QFontMetrics &metrics, const QChar& c) + { + //Warning: The Qt API used here is not accurate for some non-latin characters. + #if QT_VERSION < QT_VERSION_CHECK(5,12,0) + return metrics.width(c); + #else + return metrics.horizontalAdvance(c); + #endif + } }; #endif diff -Nru kdiff3-1.8.01/windows_installer/kdiff3.nsi kdiff3-1.8.3/windows_installer/kdiff3.nsi --- kdiff3-1.8.01/windows_installer/kdiff3.nsi 2019-05-18 01:01:30.000000000 +0000 +++ kdiff3-1.8.3/windows_installer/kdiff3.nsi 2020-06-25 00:17:35.000000000 +0000 @@ -3,7 +3,7 @@ ;Apdapted for KDiff3 by Sebastien Fricker and Joachim Eibl ;Requires nsis_v2.19 -!define KDIFF3_VERSION "1.08.01" +!define KDIFF3_VERSION "1.08.02" !define DIFF_EXT32_CLSID "{9F8528E4-AB20-456E-84E5-3CE69D8720F3}" !define DIFF_EXT64_CLSID "{34471FFB-4002-438b-8952-E4588D0C0FE9}"