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

List:       kde-commits
Subject:    [plasma-desktop/amourphious/als] kcms/keyboard: added automatic layout switching,
From:       shivam makkar <amourphious1992 () gmail ! com>
Date:       2014-05-29 20:20:31
Message-ID: E1Wq6oR-0004uY-8X () scm ! kde ! org
[Download RAW message or body]

Git commit 3d1391f63d56ec11e2efee0a41b48ef1777394d8 by shivam makkar.
Committed on 04/05/2014 at 02:13.
Pushed by makkar into branch 'amourphious/als'.

added automatic layout switching, geometry preview and removed warnings at time of build and runtime

M  +1    -0    kcms/keyboard/CMakeLists.txt
M  +0    -61   kcms/keyboard/keyboard.desktop
M  +4    -0    kcms/keyboard/tests/CMakeLists.txt

http://commits.kde.org/plasma-desktop/3d1391f63d56ec11e2efee0a41b48ef1777394d8

diff --git a/kcms/keyboard/CMakeLists.txt b/kcms/keyboard/CMakeLists.txt
index 5ee728b..6493727 100755
--- a/kcms/keyboard/CMakeLists.txt
+++ b/kcms/keyboard/CMakeLists.txt
@@ -209,3 +209,4 @@ add_subdirectory( pics )
 add_subdirectory( tests )
 
 add_subdirectory( LanguageDetection/langdata )
+
diff --git a/kcms/keyboard/keyboard.desktop b/kcms/keyboard/keyboard.desktop
index 4f4e97b..c2f6801 100755
--- a/kcms/keyboard/keyboard.desktop
+++ b/kcms/keyboard/keyboard.desktop
@@ -10,66 +10,5 @@ X-KDE-Kded-phase=1
 OnlyShowIn=KDE;
 
 Name=Keyboard Daemon
-Name[ar]=مراقب لوحة المفاتيح
-Name[ast]=Degorriu de tecláu
-Name[bg]=Демон на клавиатурата
-Name[bn]=কীবোর্ড ডীমন
-Name[bs]=Demon tastature
-Name[ca]=Dimoni del teclat
-Name[ca@valencia]=Dimoni del teclat
-Name[cs]=Démon klávesnice
-Name[da]=Tastatur-dæmon
-Name[de]=Tastatur-Dienst
-Name[el]=Δαίμονας � ληκτρολογίου
-Name[en_GB]=Keyboard Dæmon
-Name[es]=Demonio de teclado
-Name[et]=Klaviatuurideemon
-Name[eu]=Teklatuaren daimona
-Name[fi]=Näppäimistötaustaprosessi
-Name[fr]=Démon du clavier
-Name[ga]=Deamhan Méarchláir
-Name[gl]=Servizo do teclado
-Name[gu]=કીબોર્ડ ડિમન
-Name[he]=תהליך רקע של המקלדת
-Name[hi]=कुंजीपट डेमन
-Name[hr]=Tipkovnički servis
-Name[hu]=Billentyűzetszolgáltatás
-Name[ia]=Demone de claviero
-Name[id]=Jurik Papan Ketik
-Name[is]=Lyklaborðspúki
-Name[it]=Demone della tastiera
-Name[ja]=キーボードデーモン
-Name[kk]=Перенетақта қызметі
-Name[km]=ដេមិន​​ក្ដារចុច
-Name[kn]=ಕೀಲಿಮಣೆ ನೇಪಥಿಕ
-Name[ko]=키보드 데몬
-Name[lt]=Klaviatūros tarnyba
-Name[lv]=Tastatūras dēmons
-Name[mr]=कळफलक डीमन
-Name[nb]=Tastatur-nisse
-Name[nds]=Tastatuur-Dämoon
-Name[nl]=Toetsenbord-daemon
-Name[nn]=Tastaturteneste
-Name[pa]=ਕੀ-ਬੋਰਡ ਡੈਮਨ
-Name[pl]=Demon klawiatury
-Name[pt]=Servidor do Teclado
-Name[pt_BR]=Daemon de teclado
-Name[ro]=Demon de tastatură
-Name[ru]=Фоновая служба клавиатуры
-Name[si]=යතුරුපුවරු ඩීමනය
-Name[sk]=Démon klávesnice
-Name[sl]=Ozadnji program za tipkovnico
-Name[sr]=Демон тастатуре
-Name[sr@ijekavian]=Демон тастатуре
-Name[sr@ijekavianlatin]=Demon tastature
-Name[sr@latin]=Demon tastature
-Name[sv]=Tangentbordsdemon
-Name[th]=ดีมอนแป้นพิมพ์
-Name[tr]=Klavye Servisi
-Name[ug]=ھەرپتاختا نازارەتچى
 Name[uk]=Фонова служба клавіатури
-Name[vi]=Trình nền b� n phím
-Name[wa]=Démon del taprece
 Name[x-test]=xxKeyboard Daemonxx
-Name[zh_CN]=键盘守护进程
-Name[zh_TW]=鍵盤伺服程式
diff --git a/kcms/keyboard/tests/CMakeLists.txt b/kcms/keyboard/tests/CMakeLists.txt
index 258db8e..c35f5c2 100755
--- a/kcms/keyboard/tests/CMakeLists.txt
+++ b/kcms/keyboard/tests/CMakeLists.txt
@@ -55,10 +55,14 @@ if( X11_XTest_FOUND )
                          KF5::CoreAddons
                          KF5::DBusAddons
                          KF5::Plasma
+<<<<<<< HEAD
                          KF5::KDELibs4Support
                          KF5::GlobalAccel
                          XCB::XCB
                          XCB::XKB
+=======
+                         KF5::KDE4Support
+>>>>>>> added automatic layout switching, geometry preview and removed warnings at time of build and runtime
                          ${X11_Xkbfile_LIB}
                          ${X11_XTest_LIB}
                          ${X11_LIBRARIES}
[prev in list] [next in list] [prev in thread] [next in thread]