Merge remote-tracking branch 'origin/KDE/4.10' into frameworks
Conflicts: CMakeLists.txt [version number] cmake/modules/KDE4Macros.cmake [modifications to dead code] interfaces/ktexteditor/ktexteditor_loadsavefiltercheckplugin.desktop [deleted] interfaces/ktexteditor/ktexteditorplugin.desktop [deleted] kparts/tests/partviewer.cpp [includes] nepomuk/core/nepomukmainmodel.cpp [deleted] nepomuk/core/resource.cpp [deleted] nepomuk/test/CMakeLists.txt [deleted] tier1/kcoreaddons/src/io/klockfile_unix.cpp [already fixed] tier1/solid/src/solid/backends/hal/halmanager.cpp [modifications to dead code, AFAICS]
This commit is contained in:
commit
fa8d1046ef
@ -27,7 +27,7 @@ Comment[fi]=KRunner-liitännäinen
|
||||
Comment[fr]=Module KRunner
|
||||
Comment[fy]=KRunner plugin
|
||||
Comment[ga]=Breiseán KRunner
|
||||
Comment[gl]=Engadido KFileWrite
|
||||
Comment[gl]=Complemento KFileWrite
|
||||
Comment[gu]=KRunner પ્લગઈન
|
||||
Comment[he]=תוסף KRunner
|
||||
Comment[hi]=केरन्नर प्लगइन
|
||||
|
@ -79,7 +79,7 @@ Comment[eu]=Probatarako gezurretazko plugin bat
|
||||
Comment[fi]=Tyhjä testausliitännäinen
|
||||
Comment[fr]=Un module factice de test
|
||||
Comment[ga]=Bréagbhreiseán le haghaidh tástála
|
||||
Comment[gl]=Un engadido para probas
|
||||
Comment[gl]=Un complemento para probas
|
||||
Comment[he]=תוסף דמה לבדיקה
|
||||
Comment[hr]=Lažan priključak za testiranje
|
||||
Comment[hu]=Üres bővítmény teszteléshez
|
||||
|
Loading…
Reference in New Issue
Block a user