Updated readme for 0.12-rc6

ChangeLog

@@ -1,4 +1,4 @@
-2015-05-23 master
+2015-06-12 master
 - Note: the changes listed here are based on the previous release tint2 0.11, however some distributions (e.g. Debian)
   offered packages using newer commits and/or patches; thus from the user's perspective some of these features are
   already present. They are marked with '(already released by distros)'.
@@ -70,6 +70,7 @@
     background of other icons;
   - a crash caused by a change that prevents Google Chrome (and possibly other misbehaving applications) from leaving a large
     number of empty icons in the system tray;
+  - a crash caused by the system tray code on computers with ATI cards;
   - the panel window had a shadow;
   - some ATI drivers return an extra monitor with size zero which should be ignored when using panel_monitor = all;
   - the battery applet was sometimes working incorrectly with certain laptop models (the battery applet stopped updating after

README.md

@@ -1,14 +1,14 @@
-### New unstable release: 0.12-rc5
+### New unstable release: 0.12-rc6
 Changes: https://gitlab.com/o9000/tint2/blob/master/ChangeLog
 
 Documentation: https://gitlab.com/o9000/tint2/wikis/home
 
 Try it out with (see also [dependencies](https://gitlab.com/o9000/tint2/wikis/Install#dependencies)):
 ```
-mkdir tint2-0.12-rc5
+mkdir tint2-0.12-rc6
-cd tint2-0.12-rc5
+cd tint2-0.12-rc6
-wget 'https://gitlab.com/o9000/tint2/repository/archive.tar.gz?ref=v0.12-rc5' --output-document tint2-0.12-rc5.tar.gz
+wget 'https://gitlab.com/o9000/tint2/repository/archive.tar.gz?ref=v0.12-rc6' --output-document tint2-0.12-rc6.tar.gz
-tar -xzf tint2-0.12-rc5.tar.gz
+tar -xzf tint2-0.12-rc6.tar.gz
 cd tint2.git
 mkdir build
 cd build

src/systray/systraybar.c

@@ -746,7 +746,7 @@ void systray_render_icon_composited(void* t)
 	// drawable. If someone knows why it does not work with the traywindow itself, please tell me ;)
 	Pixmap tmp_pmap = XCreatePixmap(server.dsp, traywin->win, traywin->width, traywin->height, 32);
 	if (!tmp_pmap) {
-		goto on_error;
+		goto on_systray_error;
 	}
 	XRenderPictFormat *f;
 	if (traywin->depth == 24) {
@@ -761,7 +761,7 @@ void systray_render_icon_composited(void* t)
 	XRenderPictFormat *f32 = XRenderFindVisualFormat(server.dsp, server.visual32);
 	if (!f || !f32) {
 		XFreePixmap(server.dsp, tmp_pmap);
-		goto on_error;
+		goto on_systray_error;
 	}
 
 	XSync(server.dsp, False);
@@ -833,7 +833,11 @@ void systray_render_icon_composited(void* t)
 	return;
 
 on_error:
-	printf("systray: rendering error. Disabling compositing and restarting systray...\n");
+	printf("systray %d: rendering error for icon %lu pid %d\n", __LINE__, traywin->win, traywin->pid);
+	return;
+
+on_systray_error:
+	printf("systray %d: rendering error for icon %lu pid %d. Disabling compositing and restarting systray...\n", __LINE__, traywin->win, traywin->pid);
 	systray_composited = 0;
 	stop_net();
 	start_net();

src/tint2conf/po/fr.po

@@ -3,113 +3,111 @@
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 #
+#, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: tint2conf 0.12\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2015-05-21 11:45+0200\n"
-"PO-Revision-Date: 2015-06-11 02:24+0100\n"
+"PO-Revision-Date: 2015-05-21 11:45+0200\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: French\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Last-Translator: Joyce Markoll <meets@gmx.fr>\n"
-"Language-Team: \n"
-"X-Generator: Poedit 1.7.5\n"
-"Plural-Forms: nplurals=2; plural=(n > 1);\n"
-"Language: fr_FR\n"
-"X-Poedit-SourceCharset: UTF-8\n"
 
 #: ../main.c:141
 msgid "tint2conf"
-msgstr "tint2conf"
+msgstr ""
 
 #: ../main.c:149
 msgid "Panel theming"
-msgstr "Personnalisation du panel"
+msgstr ""
 
 #: ../main.c:159
 msgid "Theme"
-msgstr "Thème"
+msgstr ""
 
 #: ../main.c:160
 msgid "_Import theme..."
-msgstr "_Importer un thème…"
+msgstr ""
 
 #: ../main.c:160
 msgid "Import theme"
-msgstr "Importer un thème"
+msgstr ""
 
 #: ../main.c:161
 msgid "_Import default theme..."
-msgstr "_Importer un thème par défaut…"
+msgstr ""
 
 #: ../main.c:161
 msgid "Import default theme"
-msgstr "Importer un thème par défaut"
+msgstr ""
 
 #: ../main.c:162
 msgid "_Save as..."
-msgstr "_Enregistrer sous…"
+msgstr ""
 
 #: ../main.c:162 ../main.c:327
 msgid "Save theme as"
-msgstr "Enregistrer le thème sous"
+msgstr ""
 
 #: ../main.c:163
 msgid "_Delete"
-msgstr "_Supprimer"
+msgstr ""
 
 #: ../main.c:163
 msgid "Delete theme"
-msgstr "Supprimer le thème"
+msgstr ""
 
 #: ../main.c:164
 msgid "_Edit theme..."
-msgstr "_Éditer le thème"
+msgstr ""
 
 #: ../main.c:164
 msgid "Edit selected theme"
-msgstr "Éditer le thème sélectionné"
+msgstr ""
 
 #: ../main.c:165
 msgid "_Quit"
-msgstr "_Quitter"
+msgstr ""
 
 #: ../main.c:165
 msgid "Quit"
-msgstr "Quitter"
+msgstr ""
 
 #: ../main.c:166
 msgid "Edit"
-msgstr "Éditer"
+msgstr ""
 
 #: ../main.c:167
 msgid "Refresh"
-msgstr "Rafraîchir"
+msgstr ""
 
 #: ../main.c:168
 msgid "Refresh all"
-msgstr "Tout rafraîchir"
+msgstr ""
 
 #: ../main.c:169
 msgid "Help"
-msgstr "Aide"
+msgstr ""
 
 #: ../main.c:170
 msgid "_About"
-msgstr "_À propos"
+msgstr ""
 
 #: ../main.c:170
 msgid "About"
-msgstr "À propos"
+msgstr ""
 
 #: ../main.c:190
 msgid "Command to run tint2: "
-msgstr "Commande pour lancer tint2: "
+msgstr ""
 
 #: ../main.c:234
 msgid "Theming tool for tint2 panel"
-msgstr "Outil de personnalisation pour le panel tint2"
+msgstr ""
 
 #: ../main.c:236
 msgid ""
@@ -117,105 +115,102 @@ msgid ""
 "Tint2 License GNU GPL version 2\n"
 "Tintwizard License GNU GPL version 3"
 msgstr ""
-"Copyright 2009-2015 équipe tint2\n"
-"Tint2 Licence GNU GPL version 2\n"
-"Tintwizard Licence GNU GPL version 3"
 
 #: ../main.c:241
 msgid "translator-credits"
-msgstr "crédits pour la traduction"
+msgstr ""
 
 #: ../main.c:250
 msgid "Import theme(s)"
-msgstr "Thème(s) importés"
+msgstr ""
 
 #: ../main.c:285
 msgid "Save default theme as"
-msgstr "Enregistrer le thème par défaut sous"
+msgstr ""
 
 #: ../main.c:317
 msgid "Select the theme to be saved."
-msgstr "Sélectionner le thème à sauvegarder."
+msgstr ""
 
 #: ../properties.c:209
 msgid "Properties"
-msgstr "Propriétés"
+msgstr ""
 
 #: ../properties.c:243
 msgid "Backgrounds"
-msgstr "Arrière plan"
+msgstr ""
 
 #: ../properties.c:251
 msgid "Panel"
-msgstr "Panel"
+msgstr ""
 
 #: ../properties.c:259
 msgid "Panel items"
-msgstr "Élément du panel"
+msgstr ""
 
 #: ../properties.c:267 ../properties.c:1263 ../properties.c:1443
 msgid "Launcher"
-msgstr "Lanceur"
+msgstr ""
 
 #: ../properties.c:275 ../properties.c:1258 ../properties.c:1440
 msgid "Taskbar"
-msgstr "Barre des tâces"
+msgstr ""
 
 #: ../properties.c:283
 msgid "Task buttons"
-msgstr "Commandes des actions"
+msgstr ""
 
 #: ../properties.c:291 ../properties.c:1248 ../properties.c:1434
 msgid "Clock"
-msgstr "Horloge"
+msgstr ""
 
 #: ../properties.c:299 ../properties.c:1253 ../properties.c:1437
 msgid "System tray"
-msgstr "Zone de notification"
+msgstr ""
 
 #: ../properties.c:307 ../properties.c:1243 ../properties.c:1431
 msgid "Battery"
-msgstr "Batterie"
+msgstr ""
 
 #: ../properties.c:315
 msgid "Tooltip"
-msgstr "Infobulle"
+msgstr ""
 
 #: ../properties.c:381
 msgid "<b>Background</b>"
-msgstr "<b>Arrière plan</b>"
+msgstr ""
 
 #: ../properties.c:392
 msgid "Selects the background you would like to modify"
-msgstr "Sélectionnez l'arrière plan que vous voudriez modifier"
+msgstr ""
 
 #: ../properties.c:399
 msgid "Creates a copy of the current background"
-msgstr "Crée une copie de l'actuel arrière plan"
+msgstr ""
 
 #: ../properties.c:406
 msgid "Deletes the current background"
-msgstr "Supprime l'actuel arrière plan"
+msgstr ""
 
 #: ../properties.c:415
 msgid "Fill color"
-msgstr "Remplir la couleur"
+msgstr ""
 
 #: ../properties.c:426
 msgid "The fill color of the current background"
-msgstr "Le remplissage de la couleur de l'arrière plan actuel"
+msgstr ""
 
 #: ../properties.c:429
 msgid "Border color"
-msgstr "Couleur de la bordure"
+msgstr ""
 
 #: ../properties.c:440
 msgid "The border color of the current background"
-msgstr "La couleur de bordure de l'actuel arrière plan"
+msgstr ""
 
 #: ../properties.c:443
 msgid "Border width"
-msgstr "Largeur de bordure"
+msgstr ""
 
 #: ../properties.c:453
 msgid "The width of the border of the current background, in pixels"