Merge lp:~jesuisbenjamin/cairo-dock-plug-ins-extras/my-plug-ins into lp:~cairo-dock-team/cairo-dock-plug-ins-extras/third-party

[benjamin]

Gmail: improved configuration panel organisation using strings from other applets.

=== modified file 'Gmail/Gmail.conf'
--- Gmail/Gmail.conf	2011-11-06 01:58:42 +0000
+++ Gmail/Gmail.conf	2012-01-05 16:35:50 +0000
@@ -1,29 +1,29 @@
-#11.08.26.12.39
+#12.01.05.17.27
 
 #[gtk-about]
 [Icon]
 
-#F[Applet]
+#F[Icon]
 frame_maininfo=
 
 #d Name of the dock it belongs to:
-dock name=_MainDock_
-
-#s Name of the icon as it will appear in its label in the dock :
-name=
-
-#F[Display]
-frame_display=
-
-#S+ Image's filename :
-#{Let empty to use the default one.}
+dock name =
+
+#s Name of the icon as it will appear in its caption in the dock:
+name =
+#v
+sep_display=
+
 icon=
 
-#j+[0;128] Desired icon size for this applet
+#j+[0;400] Desired icon size for this applet
 #{Set to 0 to use the default applet size}
-icon size=0;0;
-
-order=24.6875
+icon size = 0;0
+
+#b Always display the icon, even when the dock is hidden?
+always visi = false
+
+order=
 
 #F[Applet's Handbook]
 frame_hand=
@@ -103,40 +103,34 @@
 #[gtk-preferences]
 [Configuration]
 
-#F[Behaviour;gtk-execute]
+#i[1;120] Delay between refreshes:
+#{(in minutes)}
+UPDATE=1
+
+#F[Alerts;gtk-execute]
 frame2=
 
-#B[4] Do you want to receive notifications for new mail?
+#B[4] Show alerts?
 NOTIFY=true
-#L+[superior;always;different] Which condition?
-#{"always" will notify you whenever the number of notifications is not 0; "different" will do so whenever the number of notifications changes; "superior" will notify you whenever it increases (default).}
+#L+[superior;always;different] On which condition?
+#{"always" will notify you whenever the number of emails is not 0; "different" will do so whenever the number of emails changes; "superior" will notify you whenever it increases (default).}
 WHEN=superior
-#B- With animation?
+#B- Show animation?
 #{Should an animation be applied to the icon?}
 ANIM=false
-#a Which animation?
+#a Choose animation?
 #{Which animation should the apply to the icon?}
 HOW=
-#b With dialogue?
+#b Show dialogue?
 #{Should the applet display a dialogue box with the notification?}
 DIA=true
-#B- With sound?
+#B- Play a sound?
 #{Should the applet play a sound with the notification?}
 SOUND=true
-#u Choose sound file other than default:
+#u Path to sound file:
 #{Several files are available in ~/.config/cairo-dock/third-party/Gmail/snd/}
 WAV=
-
-#v
-sep_notify=
-
-#i[1;120] Reccurence between updates (in minutes):
-#{How often should the applet look for new mail?}
-UPDATE=1
-
-#F[Appearance;gtk-execute]
-frame3=
-#B- Do you want to display a counter on the icon?
+#B- Display a counter on the icon?
 COUNT=true
 #L+[small emblem;large emblem;quickinfo] How?
 #{Do you want an emblem or a quick-info label to be displayed?}