# HG changeset patch
# User joachim99
# Date 1269805938 0
# Node ID 5024edf906362a693264538487a5d50f64f41a9a
# Parent  9000a9763f6f9d89fde72daf24cf313ee7927904
- Fixed typo.
- Applied patch for installation of kdiff3_part.rc (Sourceforge id
  2978067)

diff -r 9000a9763f6f -r 5024edf90636 kdiff3/src-QT4/CMakeLists.txt
--- a/kdiff3/src-QT4/CMakeLists.txt	Thu Mar 25 20:37:37 2010 +0000
+++ b/kdiff3/src-QT4/CMakeLists.txt	Sun Mar 28 19:52:18 2010 +0000
@@ -48,7 +48,7 @@
 ########### install files ###############
 
 install( FILES  kdiff3part.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
-install( FILES  kdiff3_part.rc DESTINATION ${DATA_INSTALL_DIR}/kdiff3 )
+install( FILES  kdiff3_part.rc DESTINATION ${DATA_INSTALL_DIR}/kdiff3part )
 install( FILES  kdiff3_shell.rc DESTINATION ${DATA_INSTALL_DIR}/kdiff3 )
 install( FILES  kdiff3.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} )
 
diff -r 9000a9763f6f -r 5024edf90636 kdiff3/src-QT4/diff.cpp
--- a/kdiff3/src-QT4/diff.cpp	Thu Mar 25 20:37:37 2010 +0000
+++ b/kdiff3/src-QT4/diff.cpp	Sun Mar 28 19:52:18 2010 +0000
@@ -1660,7 +1660,7 @@
          {
             KMessageBox::error(0, i18n(
                "Data loss error:\n"
-               "If it is reproducable please contact the author.\n"
+               "If it is reproducible please contact the author.\n"
                ), i18n("Severe Internal Error") );
             assert(false);
             std::cerr << "Severe Internal Error.\n";
@@ -1674,7 +1674,7 @@
    {
       KMessageBox::error(0, i18n(
          "Data loss error:\n"
-         "If it is reproducable please contact the author.\n"
+         "If it is reproducible please contact the author.\n"
          ), i18n("Severe Internal Error") );
       assert(false);
       std::cerr << "Severe Internal Error.\n";