diff options
| -rw-r--r-- | kdoctools/customization/entities/general.entities | 4 | ||||
| -rw-r--r-- | kdoctools/customization/obsolete/general.entities | 2 | ||||
| -rw-r--r-- | kdoctools/customization/pl/user.entities | 12 | ||||
| -rw-r--r-- | kdoctools/customization/sr/user.entities | 6 | ||||
| -rw-r--r-- | tdecore/README.kiosk | 4 | ||||
| -rw-r--r-- | tdecore/kapplication.cpp | 4 | ||||
| -rw-r--r-- | tdecore/kapplication.h | 2 | ||||
| -rw-r--r-- | tdeui/kdepackages.h | 10 |
8 files changed, 22 insertions, 22 deletions
diff --git a/kdoctools/customization/entities/general.entities b/kdoctools/customization/entities/general.entities index 103b3d0ca..ba404b210 100644 --- a/kdoctools/customization/entities/general.entities +++ b/kdoctools/customization/entities/general.entities @@ -195,8 +195,8 @@ <!ENTITY tdesu "<application>KDE su</application>"> <!ENTITY kdiskfree "<application>KDiskFree</application>"> <!ENTITY kdict "<application>KDict</application>"> -<!ENTITY kdm "<application>kdm</application>"> -<!ENTITY kdmrc "<filename>kdmrc</filename>"> +<!ENTITY tdm "<application>tdm</application>"> +<!ENTITY tdmrc "<filename>tdmrc</filename>"> <!ENTITY kdvi "<application>KDVI</application>"> <!ENTITY kenolaba "<application>Kenolaba</application>"> <!ENTITY kedit "<application>KEdit</application>"> diff --git a/kdoctools/customization/obsolete/general.entities b/kdoctools/customization/obsolete/general.entities index 43556d97a..8e93a39eb 100644 --- a/kdoctools/customization/obsolete/general.entities +++ b/kdoctools/customization/obsolete/general.entities @@ -191,7 +191,7 @@ <!ENTITY tdesu "<application>KDE su</application>"> <!ENTITY kdiskfree "<application>KDiskFree</application>"> <!ENTITY kdict "<application>KDict</application>"> -<!ENTITY kdm "<application>kdm</application>"> +<!ENTITY tdm "<application>tdm</application>"> <!ENTITY kdvi "<application>KDVI</application>"> <!ENTITY kenolaba "<application>Kenolaba</application>"> <!ENTITY kedit "<application>KEdit</application>"> diff --git a/kdoctools/customization/pl/user.entities b/kdoctools/customization/pl/user.entities index 3cb8b2f07..9c61eb446 100644 --- a/kdoctools/customization/pl/user.entities +++ b/kdoctools/customization/pl/user.entities @@ -102,12 +102,12 @@ ktnef <!ENTITY kcontrolcenter-narzednik '<application>Centrum sterowania &kde;</application>'> <!ENTITY kcontrolcenter-miejscownik '<application>Centrum sterowania &kde;</application>'> -<!ENTITY kdm-mianownik '<application>KDM</application>'> -<!ENTITY kdm-dopelniacz '<application>KDM</application>'> -<!ENTITY kdm-celownik '<application>KDM</application>'> -<!ENTITY kdm-biernik '<application>KDM</application>'> -<!ENTITY kdm-narzednik '<application>KDM</application>'> -<!ENTITY kdm-miejscownik '<application>KDM</application>'> +<!ENTITY tdm-mianownik '<application>TDM</application>'> +<!ENTITY tdm-dopelniacz '<application>TDM</application>'> +<!ENTITY tdm-celownik '<application>TDM</application>'> +<!ENTITY tdm-biernik '<application>TDM</application>'> +<!ENTITY tdm-narzednik '<application>TDM</application>'> +<!ENTITY tdm-miejscownik '<application>TDM</application>'> <!ENTITY khelpcenter-mianownik '<application>Centrum pomocy &kde;</application>'> <!ENTITY khelpcenter-dopelniacz '<application>Centrum pomocy &kde;</application>'> diff --git a/kdoctools/customization/sr/user.entities b/kdoctools/customization/sr/user.entities index 519b78af4..21dc0a0ec 100644 --- a/kdoctools/customization/sr/user.entities +++ b/kdoctools/customization/sr/user.entities @@ -229,9 +229,9 @@ <!ENTITY tdetoys-n "<acronym>КДЕ</acronym>-играчке" > <!ENTITY tdeutils-n "<acronym>КДЕ</acronym>-алати" > <!ENTITY tdevelop-n "<acronym>КДЕ</acronym>-развој" > -<!ENTITY kdm-a "<application>Кдм</application>" > -<!ENTITY kdm-g "<application>Кдма</application>" > -<!ENTITY kdm-n "<application>Кдм</application>" > +<!ENTITY tdm-a "<application>Кдм</application>" > +<!ENTITY tdm-g "<application>Кдма</application>" > +<!ENTITY tdm-n "<application>Кдм</application>" > <!ENTITY keyC-n "<keycap>C</keycap>" > <!ENTITY keyMinus-n "<keycap>-</keycap>" > <!ENTITY keyPlus-n "<keycap>+</keycap>" > diff --git a/tdecore/README.kiosk b/tdecore/README.kiosk index 38a59a929..927850f01 100644 --- a/tdecore/README.kiosk +++ b/tdecore/README.kiosk @@ -442,10 +442,10 @@ lineedit_text_completion start_new_session - defines whether the user may start a second X session. - See also the kdm configuration. + See also the tdm configuration. switch_user - - defines whether user switching via kdm is allowed + - defines whether user switching via tdm is allowed skip_drm - defines if the user may omit DRM checking. diff --git a/tdecore/kapplication.cpp b/tdecore/kapplication.cpp index ea16f00f8..3ca23c49f 100644 --- a/tdecore/kapplication.cpp +++ b/tdecore/kapplication.cpp @@ -170,8 +170,8 @@ typedef void* IceIOErrorHandler; #include "kappdcopiface.h" -// exported for kdm kfrontend -KDE_EXPORT bool kde_have_kipc = true; // magic hook to disable kipc in kdm +// exported for tdm kfrontend +KDE_EXPORT bool kde_have_kipc = true; // magic hook to disable kipc in tdm bool kde_kiosk_exception = false; // flag to disable kiosk restrictions bool kde_kiosk_admin = false; diff --git a/tdecore/kapplication.h b/tdecore/kapplication.h index fabeed524..36a9addcb 100644 --- a/tdecore/kapplication.h +++ b/tdecore/kapplication.h @@ -1378,7 +1378,7 @@ public: /** * @internal - * Raw access for use by KDM. + * Raw access for use by TDM. */ static TQPalette createApplicationPalette( KConfig *config, int contrast ); diff --git a/tdeui/kdepackages.h b/tdeui/kdepackages.h index 275b81679..88836858a 100644 --- a/tdeui/kdepackages.h +++ b/tdeui/kdepackages.h @@ -333,7 +333,7 @@ const char * const packages[] = { "kcontrol/kcmjoystick", "kcontrol/kcmkabldapconfig", "kcontrol/kcmkded", -"kcontrol/kcmkdm", +"kcontrol/kcmtdm", "kcontrol/kcmkeyboard", "kcontrol/kcmkeys", "kcontrol/kcmkhotkeys", @@ -547,9 +547,9 @@ const char * const packages[] = { "kdict", "kdiff3", "kdiff3/KDiff3Part", -"kdm", -"kdm/kdmdesktop", -"kdm/krootimage", +"tdm", +"tdm/tdmdesktop", +"tdm/krootimage", "kdoc", "kdom", "kdvi", @@ -1274,7 +1274,7 @@ const char * const packages[] = { "systemsettings/kcmkdnssd", "systemsettings/kcmknotify", "systemsettings/kcmlaunch", -"systemsettings/kdm", +"systemsettings/tdm", "systemsettings/keyboard", "systemsettings/keyboard_layout", "systemsettings/keys", |