[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    kdebase/kxkb
From:       Andy Rysin <arysin () yahoo ! com>
Date:       2003-10-29 7:30:36
[Download RAW message or body]

CVS commit by rysin: 

- revert invalid fixing for XFree86 messages


  M +4 -12     kcmlayout.cpp   1.80
  M +0 -2      kcmlayout.h   1.22


--- kdebase/kxkb/kcmlayout.cpp  #1.79:1.80
@@ -692,14 +692,4 @@ void LayoutConfig::defaults()
 }
 
-QString LayoutConfig::quickHelp() const
-{
-  return i18n("<h1>Keyboard Layout</h1> Here you can choose your keyboard layout and \
                model."
-    " The 'model' refers to the type of keyboard that is connected to your computer, \
                while the keyboard"
-    " layout defines \"which key does what\" and may be different for different \
                countries.<p>"
-    " In addition to the 'Primary Layout', which will be used as the default, you \
                can specify additional"
-    " layouts, which you can easily switch between using the KDE panel.");
-}
-
-
 extern "C"
 {
@@ -753,4 +743,6 @@ extern "C"
 
 #if 0// do not remove!
+// please don't change/fix messages below
+// they're taken from XFree86 as is and should stay the same
    I18N_NOOP("Brazilian ABNT2");
    I18N_NOOP("Dell 101-key PC");
@@ -825,7 +817,7 @@ extern "C"
  
 //these seem to be new in XFree86 4.4.0
- I18N_NOOP("Shift with numeric keypad works the same as in Microsoft Windows.");
+ I18N_NOOP("Shift with numpad keys works as in MS Windows.");
  I18N_NOOP("Special keys (Ctrl+Alt+<key>) handled in a server.");
  I18N_NOOP("Miscellaneous compatibility options");
- I18N_NOOP("Right Ctrl key works the same as Right Alt");
+ I18N_NOOP("Right Control key works as Right Alt");
 #endif

--- kdebase/kxkb/kcmlayout.h  #1.21:1.22
@@ -43,6 +43,4 @@ public:
   void defaults();
 
-  QString quickHelp() const;
-
   void itemStateChanged(); // must be slot?
 


[prev in list] [next in list] [prev in thread] [next in thread]