Merge translation files from master branch.

1 files changed, 0 insertions, 22 deletions

diff --git a/tde-i18n-zh_CN/messages/tdebase/ktip.po b/tde-i18n-zh_CN/messages/tdebase/ktip.po
index e4c56d3699e..267684bf523 100644
--- a/tde-i18n-zh_CN/messages/tdebase/ktip.po
+++ b/tde-i18n-zh_CN/messages/tdebase/ktip.po
@@ -1014,14 +1014,6 @@ msgstr ""
 
 #: tips:706
 #, fuzzy
-#| msgid ""
-#| "<p>\n"
-#| "Each UNIX user has a so-called Home folder in which his or her\n"
-#| "files as well as user-dependent configuration files are saved. If you\n"
-#| "work in a Konsole window, you can easily change to your home folder\n"
-#| "by entering the <b>cd</b> command without any parameters.\n"
-#| "</p>\n"
-#| "<p align=\"right\"><em>Contributed by Carsten Niehaus</em></p>\n"
 msgid ""
 "<p>\n"
 "Each UNIX user has a so-called Home folder in which their\n"
@@ -1481,20 +1473,6 @@ msgstr ""
 
 #: tips:1107
 #, fuzzy
-#| msgid ""
-#| "<p>\n"
-#| "You can let TDE turn the <b>NumLock</b> ON or OFF at startup.\n"
-#| "</p>\n"
-#| "<p>\n"
-#| "Open the Control Center, select Peripherals->Keyboard and make your\n"
-#| " choice.\n"
-#| "</p>\n"
-#| "<p>\n"
-#| "<hr><br><br>\n"
-#| "<i>This is the last tip in the tips database. Clicking \"Next\" will take "
-#| "you back to\n"
-#| " the first tip.</i>\n"
-#| "</p>\n"
 msgid ""
 "<p>\n"
 "You can let TDE turn the <b>NumLock</b> ON or OFF at startup.\n"