Fix kde templates without testing

desktop/user/20-kde/kde-4.3-4.4/.kde4/share/config/plasma-desktop-appletsrc

@@ -55,16 +55,16 @@ plugin=simplelauncher
 zvalue=0
 [Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app)-#][Configuration]
 icon=kde
-#?cl_remote_host==#
+#?env(client.os_remote_auth)==#
 views=Applications,RunCommand,Leave
-#cl_remote_host#
-#?cl_remote_host!=#
+#env#
+#?env(client.os_remote_auth)!=#
 views=Applications,RunCommand,SwitchUser,LockScreen,Logout
-#cl_remote_host#
+#env#
 [Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app)-#][LayoutInformation]
 Order=#-sum(apporder,apporder)-#
 
-#?cl_remote_host==#
+#?env(client.os_remote_auth)==#
 [Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app+1)-#]
 immutability=1
 !geometry=del
@@ -74,9 +74,9 @@ zvalue=0
 Url=file:///home/#-ur_login-#
 [Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app)-#][LayoutInformation]
 Order=#-sum(apporder,apporder+1)-#
-#cl_remote_host#
+#env#
 
-#?cl_remote_host!=#
+#?env(client.os_remote_auth)!=#
 [Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app+1)-#]
 immutability=1
 !geometry=del
@@ -96,9 +96,9 @@ zvalue=0
 Url=file:///home/#-ur_login-#/Disks
 [Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app)-#][LayoutInformation]
 Order=#-sum(apporder,apporder+1)-#
-#cl_remote_host#
+#env#
 
-#?cl_remote_host!=&&cl_remote_ftp!=#
+#?env(client.os_remote_auth)!=&&server(ftp.host)!=#
 [Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app+1)-#]
 immutability=1
 !geometry=del
@@ -108,10 +108,10 @@ zvalue=0
 Url=file:///home/#-ur_login-#/FTP
 [Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app)-#][LayoutInformation]
 Order=#-sum(apporder,apporder+1)-#
-#cl_remote_host#
-#?cl_remote_ftp==#
+#env#
+#?server(ftp.host)==#
 [Containments][#-sum(cont,cont)-#][Applets][!#-sum(app,app+1)-#]
-#cl_remote_ftp#
+#env#
 
 [Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app+1)-#]
 immutability=1

desktop/user/20-kde/kde-4.3-4.4/Desktop/FTP.desktop

@@ -1,4 +1,4 @@
-# Calculate format=samba env(client.os_remote_auth)!=&&env(client.cl_remote_ftp)!=
+# Calculate format=samba env(client.os_remote_auth)!=&&server(ftp.host)!=
 [Desktop Entry]
 Encoding=UTF-8
 Name=FTP

desktop/user/20-kde/kde-4.3/.config/autostart/kopete.desktop

@@ -1,2 +1,2 @@
-# Calculate format=kde link=/usr/share/applications/kde4/kopete.desktop mirror env(client.os_remote_auth)!=&&env(client.sr_jabber_host)!=
+# Calculate format=kde link=/usr/share/applications/kde4/kopete.desktop mirror env(client.os_remote_auth)!=&&server(jabber.host)!=
 #добавим Kopete в автозагрузку если настроен локальный Jabber сервер

desktop/user/20-kde/kde-4.3/.kde4/share/config/emaildefaults

@@ -6,5 +6,5 @@ Profile=Default
 [PROFILE_Default]
 EmailAddress=#-ur_mail-#
 FullName=#-ur_fullname-#
-Organization=#-env(client.ur_organization)-#
-OutgoingServer=#-env(client.sr_mail_host)-#
+Organization=#-server(mail.organization)-#
+OutgoingServer=#-server(mail.host)-#

desktop/user/20-kde/kde-4.3/.kde4/share/config/emailidentities

@@ -7,14 +7,14 @@ Default Identity=1
 #?os_locale_language==ru#
 Dictionary=Русский
 #os_locale_language#
-#?env(client.os_remote_auth)!=&&env(client.sr_mail_type)==imap#
+#?env(client.os_remote_auth)!=&&server(mail.type)==imap#
 Drafts=.1.directory/Drafts
 Fcc=.1.directory/Sent
 #env#
 Email Address=#-ur_mail-#
 Identity=Default
-Inline Signature=#-env(client.ur_signature)-#
+Inline Signature=#-server(mail.signature)-#
 Name=#-ur_fullname-#
-Organization=#-env(client.ur_organization)-#
+Organization=#-server(mail.organization)-#
 Signature Type=inline
 uoid=1

desktop/user/20-kde/kde-4.3/.kde4/share/config/kmailrc

@@ -1,6 +1,6 @@
 # Calculate format=kde
 #создадим учетную запись
-#?env(client.os_remote_auth)!=&&env(client.sr_mail_type)==imap#
+#?env(client.os_remote_auth)!=&&server(mail.type)==imap#
 [Account 1]
 #автоматически очищать удаленные сообщения
 auto-expunge=true
@@ -12,11 +12,11 @@ Type=Imap
 auth=*
 #периодическая проверка почты
 check-interval=5
-host=#-env(client.sr_mail_host)-#
+host=#-server(mail.host)-#
 #загружать вложения по требованию
 loadondemand=true
 login=#-ur_login-#
-port=#-env(client.sr_mail_port)-#
+port=#-server(mail.port)-#
 trash=.1.directory/Trash
 use-tls=true
 
@@ -35,7 +35,7 @@ isOpen=true
 SystemTrayEnabled=true
 #режим отображения значка
 SystemTrayPolicy=ShowAlways
-#?env(client.os_remote_auth)!=&&env(client.sr_mail_type)==imap#
+#?env(client.os_remote_auth)!=&&server(mail.type)==imap#
 #количество учётных записей
 accounts=1
 #проверять почту при запуске

desktop/user/20-kde/kde-4.3/.kde4/share/config/kopeterc

@@ -1,13 +1,13 @@
 # Calculate format=kde append=replace
-#?env(client.os_remote_auth)!=&&env(client.sr_jabber_host)!=#
+#?env(client.os_remote_auth)!=&&server(jabber.host)!=#
 [Account_JabberProtocol_#-ur_jid-#]
 AccountId=#-ur_jid-#
 AllowPlainTextPassword=true
 CustomServer=true
-Port=#-env(client.sr_jabber_port)-#
+Port=#-server(jabber.port)-#
 Protocol=JabberProtocol
 RememberPassword=true
-Server=#-env(client.sr_jabber_host)-#
+Server=#-server(jabber.host)-#
 UseSSL=true
 #env#
 
@@ -72,7 +72,7 @@ Width 1680=500
 Width 1920=500
 
 [Notification Messages]
-#?env(client.os_remote_auth)!=&&env(client.sr_jabber_host)!=#
+#?env(client.os_remote_auth)!=&&server(jabber.host)!=#
 #выдавать предупреждение при проверке сертификата защищенного соединения
 KopeteTLSWarning#-ur_jid_host-#InvalidCertSelfSigned=false
 #env#

desktop/user/20-kde/kde-4.3/.kde4/share/config/mailtransports

@@ -1,11 +1,11 @@
 # Calculate format=kde
 #настройка отправки писем kmail
-#?env(client.sr_mail_host)!=&&env(client.os_remote_auth)!=#
+#?env(client.os_remote_auth)!=&&server(mail.host)!=#
 [General]
 default-transport=1
 
 [Transport 1]
-host=#-env(client.sr_mail_host)-#
+host=#-server(mail.host)-#
 id=1
 name=SMTP
 #env#

desktop/user/20-kde/kde-4.4/.kde4/share/config/kopeterc

@@ -74,7 +74,7 @@ Width 1920=500
 [Notification Messages]
 #?env(client.os_remote_auth)!=&&server(jabber.host)!=#
 #выдавать предупреждение при проверке сертификата защищенного соединения
-KopeteTLSWarning#-replace('as@','',ur_jid)-#InvalidCertSelfSigned=false
+KopeteTLSWarning#-ur_jid_host-#InvalidCertSelfSigned=false
 #env#
 #предупреждать что программа остается запущенной при закрытии главного окна
 hideOnCloseInfo=false

desktop/user/20-kde/kde-4.4/Desktop/Home-remote.desktop

@@ -1,4 +1,4 @@
-# Calculate name=Home.desktop format=samba env(client.os_remote_auth)!= append=replace
+# Calculate append=replace name=Home.desktop format=samba env(client.os_remote_auth)!=
 [Desktop Entry]
 Encoding=UTF-8
 Name=Home