Fixed KMail Address book rename (kabc -> tdeabc). This resolves bug 2272.

Signed-off-by: Michele Calgaro <michele.calgaro@...>

diff --git a/r14-xdg-update b/r14-xdg-update
index edae0ca..86d4293 100644
--- a/r14-xdg-update
+++ b/r14-xdg-update
@@ -3,7 +3,7 @@
 # A script to perform R14.0.0 XDG compliance updates.
 
 SCRIPT_NAME="`basename \`readlink -f $0\``"
-SCRIPT_VERSION=201412080
+SCRIPT_VERSION=201412270
 
 # This script should be needed to run only once, but corner cases
 # and file/directory permissions could cause incomplete updates.
@@ -940,6 +940,13 @@
   fi
 fi
 
+if [ "$R14_VERSION" -lt "201412270" ]; then
+  if [ ! -d $PROFILE_DIR/share/apps/tdeabc ] && [ -d $PROFILE_DIR/share/apps/kabc ]; then
+    Log "  kabc->tdeabc"
+    mv $PROFILE_DIR/share/apps/kabc $PROFILE_DIR/share/apps/tdeabc 2>/dev/null
+  fi
+fi
+
 # Perform some nominal update validations.
 # First clean house from any previous failures.
 if [ "$CACHE_DIR" = "" ]; then
diff --git a/starttde b/starttde
index b1f6505..0465f21 100755
--- a/starttde
+++ b/starttde
@@ -326,6 +326,7 @@
   fi
   if [ "$R14_UPDATED" != "true" ] || [ "$R14_VERSION" -lt "$R14_SCRIPT" ]; then
     if [ -e $TDEDIR/bin/r14-xdg-update ]; then
+      echo "[starttde] Running $TDEDIR/bin/r14-xdg-update script." 1>&2
       sh $TDEDIR/bin/r14-xdg-update
       EXIT_CODE="$?"
     else

Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tdebase

diff --git a/kpersonalizer/kcountrypage.cpp b/kpersonalizer/kcountrypage.cpp
index 36276ec..cec71ba 100644
--- a/kpersonalizer/kcountrypage.cpp
+++ b/kpersonalizer/kcountrypage.cpp
@@ -45,7 +45,7 @@
 	b_startedLanguageChanged = false;
 
 	// set appropriate Trinity version (tdeapplication.h)
-	txt_welcome->setText(i18n("<h3>Welcome to Trinity %1</h3>").arg(TDE_VERSION_STRING));
+	txt_welcome->setText(i18n("<h3>Welcome to Trinity %1</h3>").arg(KDE::versionString()));
 
 	flang = new KFindLanguage();