Merge branch 'master' of git.calculate.ru:/calculate-desktop

desktop/user/20-kde/kde-4.4/.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.4/.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.send_host)-#

desktop/user/20-kde/kde-4.4/.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#
+#?server(mail.type)==imap&&env(client.os_remote_auth)!=#
 Drafts=.1.directory/Drafts
 Fcc=.1.directory/Sent
-#env#
+#server#
 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.4/.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,9 +72,9 @@ 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#-env(client.ur_jid_host)-#InvalidCertSelfSigned=false
+KopeteTLSWarning#-replace('as@','',ur_jid)-#InvalidCertSelfSigned=false
 #env#
 #предупреждать что программа остается запущенной при закрытии главного окна
 hideOnCloseInfo=false

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

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

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

@@ -102,7 +102,7 @@ Url=file:///home/#-ur_login-#/Disks
 Order=#-sum(apporder,apporder+1)-#
 #env#
 
-#?env(client.os_remote_auth)!=&&env(client.cl_remote_ftp)!=#
+#?env(client.os_remote_auth)!=&&server(ftp.host)!=#
 [Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app+1)-#]
 immutability=1
 plugin=icon
@@ -112,10 +112,10 @@ Url=file:///home/#-ur_login-#/FTP
 [Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app)-#][LayoutInformation]
 Order=#-sum(apporder,apporder+1)-#
 #env#
-#?env(client.cl_remote_ftp)==#
+#?server(ftp.host)==#
 [Containments][#-sum(cont,cont)-#][Applets][!#-sum(app,app+1)-#]
 #-sum(apporder,,apporder+1)-#
-#env#
+#server#
 
 [Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app+1)-#]
 immutability=1
@@ -147,7 +147,7 @@ groupingStrategy=0
 maxRows=1
 #показывать задачи только с текущего рабочего стола
 showOnlyCurrentDesktop=true
-#сотрировка
+#сортировка
 sortingStrategy=0
 [Containments][#-sum(cont,cont)-#][Applets][#-sum(app,app)-#][LayoutInformation]
 Order=#-sum(apporder,apporder+1)-#

desktop/user/20-kde/kde-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-always/Desktop/FTP.desktop

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

desktop/user/20-kde/kde-always/Desktop/FTP.desktop.remove

@@ -1 +1 @@
-# Calculate append=remove name=FTP.desktop env(client.os_remote_auth)!=&&env(client.cl_remote_ftp)==
+# Calculate append=remove name=FTP.desktop env(client.os_remote_auth)!=&&server(ftp.host)==

desktop/user/20-kde/kmail-4.4/.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/30-gnome/evolution-2.6/.calculate_directory

@@ -1 +1 @@
-# Calculate append=skip ini(main.update)!=off&&ini(update.evolution)!=off&&ini(ver.evolution)==&&pkg(mail-client/evolution)>=2.26
+# Calculate append=skip ini(update.evolution)!=off&&ini(ver.evolution)==&&pkg(mail-client/evolution)>=2.26

desktop/user/30-gnome/evolution-2.6/.evolution/mail/config/folder-tree-expand-state.xml

@@ -3,8 +3,8 @@
 #-push(serial,#-rnd(num,2)-#)-#
 #-push(pid,#-rnd(num,5)-#)-#
 #-push(mtime,#-rnd(num,10)-#)-#
-#?cl_remote_host!=#
+#?env(client.os_remote_auth)!=#
   <node name="#-sum(mtime,mtime)-#.#-sum(pid,pid)-#.#-sum(serial,serial)-#@#-os_net_hostname-#" expand="true"/>
   <selected uri="imap://#-ur_login-#@#-sr_mail_host-#/INBOX"/>
-#cl_remote_host#
+#env#
 </tree-state>

desktop/user/30-gnome/evolution-2.6/.gconf/apps/evolution/mail/%gconf.xml

@@ -1,4 +1,4 @@
-# Calculate format=xml_gconf cl_remote_host!=
+# Calculate format=xml_gconf env(client.os_remote_auth)!=
 <?xml version="1.0"?>
 <gconf>
 	#-pop(mtime)-#
@@ -17,7 +17,7 @@
 	<entry name="accounts" type="list" ltype="string">
 		<li type="string">
 			<stringvalue>&lt;?xml version=&quot;1.0&quot;?&gt;
-&lt;account name=&quot;IMAP&quot; uid=&quot;#-sum(mtime,mtime)-#.#-sum(pid,pid)-#.#-sum(serial,serial)-#@#-os_net_hostname-#&quot; enabled=&quot;true&quot;&gt;&lt;identity&gt;&lt;name&gt;#-ur_fullname-#&lt;/name&gt;&lt;addr-spec&gt;#-ur_mail-#&lt;/addr-spec&gt;&lt;reply-to&gt;#-ur_mail-#&lt;/reply-to&gt;&lt;organization&gt;#-ur_organization-#&lt;/organization&gt;&lt;signature uid=&quot;#-sum(mtime,mtime)-#.#-sum(pid,pid)-#.0@#-os_net_hostname-#&quot;/&gt;&lt;/identity&gt;&lt;source save-passwd=&quot;true&quot; keep-on-server=&quot;false&quot; auto-check=&quot;true&quot; auto-check-timeout=&quot;5&quot;&gt;&lt;url&gt;imap://#-ur_login-#@#-sr_mail_host-#/;check_lsub;command=ssh%20-C%20-l%20%25u%20%25h%20exec%20/usr/sbin/imapd;use_ssl=always;check_all&lt;/url&gt;&lt;/source&gt;&lt;transport save-passwd=&quot;false&quot;&gt;&lt;url&gt;smtp://#-ur_login-#@#-sr_mail_host-#/;use_ssl=never&lt;/url&gt;&lt;/transport&gt;&lt;drafts-folder&gt;imap://#-ur_login-#@#-sr_mail_host-#/Drafts&lt;/drafts-folder&gt;&lt;sent-folder&gt;imap://#-ur_login-#@#-sr_mail_host-#/Sent&lt;/sent-folder&gt;&lt;auto-cc always=&quot;false&quot;&gt;&lt;recipients&gt;&lt;/recipients&gt;&lt;/auto-cc&gt;&lt;auto-bcc always=&quot;false&quot;&gt;&lt;recipients&gt;&lt;/recipients&gt;&lt;/auto-bcc&gt;&lt;receipt-policy policy=&quot;never&quot;/&gt;&lt;pgp encrypt-to-self=&quot;false&quot; always-trust=&quot;false&quot; always-sign=&quot;false&quot; no-imip-sign=&quot;false&quot;/&gt;&lt;smime sign-default=&quot;false&quot; encrypt-default=&quot;false&quot; encrypt-to-self=&quot;false&quot;/&gt;&lt;/account&gt;
+&lt;account name=&quot;IMAP&quot; uid=&quot;#-sum(mtime,mtime)-#.#-sum(pid,pid)-#.#-sum(serial,serial)-#@#-os_net_hostname-#&quot; enabled=&quot;true&quot;&gt;&lt;identity&gt;&lt;name&gt;#-ur_fullname-#&lt;/name&gt;&lt;addr-spec&gt;#-ur_mail-#&lt;/addr-spec&gt;&lt;reply-to&gt;#-ur_mail-#&lt;/reply-to&gt;&lt;organization&gt;#-ur_organization-#&lt;/organization&gt;&lt;signature uid=&quot;#-sum(mtime,mtime)-#.#-sum(pid,pid)-#.0@#-os_net_hostname-#&quot;/&gt;&lt;/identity&gt;&lt;source save-passwd=&quot;true&quot; keep-on-server=&quot;false&quot; auto-check=&quot;true&quot; auto-check-timeout=&quot;5&quot;&gt;&lt;url&gt;imap://#-ur_login-#@#-sr_mail_host-#/;check_lsub;command=ssh%20-C%20-l%20%25u%20%25h%20exec%20/usr/sbin/imapd;use_ssl=always;check_all&lt;/url&gt;&lt;/source&gt;&lt;transport save-passwd=&quot;false&quot;&gt;&lt;url&gt;smtp://#-ur_login-#@#-sr_mail_host-#/;use_ssl=never&lt;/url&gt;&lt;/transport&gt;&lt;drafts-folder&gt;imap://#-ur_login-#@#-env(client.sr_mail_host)-#/Drafts&lt;/drafts-folder&gt;&lt;sent-folder&gt;imap://#-ur_login-#@#-env(client.sr_mail_host)-#/Sent&lt;/sent-folder&gt;&lt;auto-cc always=&quot;false&quot;&gt;&lt;recipients&gt;&lt;/recipients&gt;&lt;/auto-cc&gt;&lt;auto-bcc always=&quot;false&quot;&gt;&lt;recipients&gt;&lt;/recipients&gt;&lt;/auto-bcc&gt;&lt;receipt-policy policy=&quot;never&quot;/&gt;&lt;pgp encrypt-to-self=&quot;false&quot; always-trust=&quot;false&quot; always-sign=&quot;false&quot; no-imip-sign=&quot;false&quot;/&gt;&lt;smime sign-default=&quot;false&quot; encrypt-default=&quot;false&quot; encrypt-to-self=&quot;false&quot;/&gt;&lt;/account&gt;
 </stringvalue>
 		</li>
 	</entry>

desktop/user/30-gnome/gnome-2.6/.calculate_directory

@@ -1 +1 @@
-# Calculate append=skip ini(main.update)!=off&&ini(update.gnome)!=off&&ini(ver.gnome)==&&pkg(gnome-base/libgnome)>=2.26
+# Calculate append=skip ini(update.gnome)!=off&&ini(ver.gnome)==&&pkg(gnome-base/libgnome)>=2.26

desktop/user/30-gnome/gnome-2.6/.gconf/apps/gnome-power-manager/.calculate_directory

@@ -1,2 +1,2 @@
-# Calculate cl_remote_host!=
+# Calculate env(client.os_remote_auth)!=
 

desktop/user/30-gnome/gnome-2.6/.gconf/apps/gnome_settings_daemon/keybindings/%gconf.xml

@@ -1,11 +1,11 @@
 # Calculate format=xml_gconf
 <?xml version="1.0"?>
 <gconf>
-#?cl_remote_host!=#
+#?env(client.os_remote_auth)!=#
 	<entry name="power" type="string">
 		<stringvalue></stringvalue>
 	</entry>
-#cl_remote_host#
+#env#
 	<entry name="screensaver" type="string">
 		<stringvalue>Scroll_Lock</stringvalue>
 	</entry>

desktop/user/30-gnome/gnome-2.6/.gconf/apps/nautilus/desktop/%gconf.xml

@@ -2,12 +2,12 @@
 <?xml version="1.0"?>
 <gconf>
 	<entry name="computer_icon_visible" type="bool" value="false"/>
-#?cl_remote_host!=#
+#?env(client.os_remote_auth)!=#
 	<entry name="home_icon_visible" type="bool" value="false"/>
-#cl_remote_host#
-#?cl_remote_host==#
+#env#
+#?env(client.os_remote_auth)==#
 	<entry name="home_icon_visible" type="bool" value="true"/>
-#cl_remote_host#
+#env#
 	<entry name="network_icon_visible" type="bool" value="false"/>
 	<entry name="trash_icon_visible" type="bool" value="false"/>
 	<entry name="volumes_visible" type="bool" value="true"/>

desktop/user/30-gnome/gnome-2.6/.gconf/apps/panel/100_top_objects_left/102_disks/.calculate_directory

@@ -1 +1 @@
-# Calculate cl_remote_host!=
+# Calculate env(client.os_remote_auth)!=

desktop/user/30-gnome/gnome-2.6/.gconf/apps/panel/100_top_objects_left/103_ftp/.calculate_directory

@@ -1 +1 @@
-# Calculate cl_remote_host!=&&cl_remote_ftp!=
+# Calculate env(client.os_remote_auth)!=&&env(client.cl_remote_ftp)!=

desktop/user/30-gnome/gnome-2.6/.gconf/apps/panel/200_top_objects_right/200_logout/.calculate_directory

@@ -1 +1 @@
-# Calculate cl_remote_host!=
+# Calculate env(client.os_remote_auth)!=

desktop/user/30-gnome/gnome-2.6/.gconf/apps/panel/200_top_objects_right/201_shutdown/.calculate_directory

@@ -1 +1 @@
-# Calculate cl_remote_host==
+# Calculate env(client.os_remote_auth)==

desktop/user/30-gnome/gnome-2.6/.gconf/apps/panel/general/%gconf.xml

@@ -14,16 +14,16 @@
 		<li type="string">
 			<stringvalue>103_ftp</stringvalue>
 		</li>
-#?cl_remote_host!=#
+#?env(client.os_remote_auth)!=#
 		<li type="string">
 			<stringvalue>200_logout</stringvalue>
 		</li>
-#cl_remote_host#
-#?cl_remote_host==#
+#env#
+#?env(client.os_remote_auth)==#
 		<li type="string">
 			<stringvalue>201_shutdown</stringvalue>
 		</li>
-#cl_remote_host#
+#env#
 		<li type="string">
 			<stringvalue>202_lock</stringvalue>
 		</li>

desktop/user/30-gnome/gnome-2.6/.gconf/desktop/gnome/keybindings/custom_logout/.calculate_directory

@@ -1 +1 @@
-# Calculate cl_remote_host!=
+# Calculate env(client.os_remote_auth)!=

desktop/user/30-gnome/gnome-2.6/.gnome2/panel2.d/default/launchers/Disks.desktop

@@ -1,4 +1,4 @@
-# Calculate format=samba cl_remote_host!=
+# Calculate format=samba env(client.os_remote_auth)!=
 
 [Desktop Entry]
 Encoding=UTF-8

desktop/user/30-gnome/gnome-2.6/.gnome2/panel2.d/default/launchers/FTP.desktop

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

desktop/user/30-gnome/gnome-2.6/.gnome2/panel2.d/default/launchers/Home.desktop

@@ -6,10 +6,10 @@ Version=1.0
 Name=Home
 Comment=Browser Home
 Icon=user-home
-#?cl_remote_host!=#
+#?env(client.os_remote_auth)!=#
 URL=file:///home/#-ur_login-#/Home
-#cl_remote_host#
-#?cl_remote_host==#
+#env#
+#?env(client.os_remote_auth)==#
 URL=file:///home/#-ur_login-#
-#cl_remote_host#
+#env#
 Type=Link

desktop/user/30-gnome/gnome-always/.calculate_directory

@@ -1 +1 @@
-# Calculate append=skip ini(main.update)!=off&&ini(update.gnome)!=off&&pkg(gnome-base/libgnome)>=2.26&&ini(domain)!=#-cl_remote_host-#
+# Calculate append=skip ini(update.gnome)!=off&&pkg(gnome-base/libgnome)>=2.26&& env(client.os_remote_auth)!=&&ini(domain)!=#-env(client.os_remote_auth)-#

desktop/user/30-gnome/gnome-always/.gconf/apps/panel/100_top_objects_left/103_ftp/%gconf.xml

@@ -1,4 +1,4 @@
-# Calculate format=xml_gconf cl_remote_host!=&&cl_remote_ftp!=
+# Calculate format=xml_gconf env(client.os_remote_auth)!=&&env(client.cl_remote_ftp)!=
 <?xml version="1.0"?>
 <gconf>
 	<entry name="attached_toplevel_id" schema="/schemas/apps/panel/objects/attached_toplevel_id"/>

desktop/user/30-gnome/gnome-always/.gconf/apps/panel/100_top_objects_left/103_ftp/%gconf.xml.remove

@@ -1 +1 @@
-# Calculate append=remove name=%gconf.xml cl_remote_host!=&&cl_remote_ftp==
+# Calculate append=remove name=%gconf.xml env(client.os_remote_auth)!=&&env(client.cl_remote_ftp)==

desktop/user/30-gnome/gnome-always/.gnome2/panel2.d/default/launchers/FTP.desktop

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

desktop/user/30-gnome/gnome-always/.gnome2/panel2.d/default/launchers/FTP.desktop.remove

@@ -1,2 +1,2 @@
-# Calculate append=remove name=FTP.desktop cl_remote_host!=&&cl_remote_ftp==
+# Calculate append=remove name=FTP.desktop env(client.os_remote_auth)!=&&env(client.cl_remote_ftp)==