Preparing migration to Gtk+ 3.0
This commit is contained in:
parent
8a6f60a8ea
commit
8dd77b4e9a
24
po/fr.po
24
po/fr.po
|
|
@ -7,14 +7,14 @@ msgid ""
|
|||
msgstr ""
|
||||
"Project-Id-Version: Panel 0.0.5\n"
|
||||
"Report-Msgid-Bugs-To: \n"
|
||||
"POT-Creation-Date: 2011-04-06 23:36+0200\n"
|
||||
"POT-Creation-Date: 2011-04-16 02:08+0200\n"
|
||||
"PO-Revision-Date: 2010-04-22 12:45+0200\n"
|
||||
"Last-Translator: Pierre Pronchery <khorben@defora.org>\n"
|
||||
"Language-Team: French\n"
|
||||
"Language: \n"
|
||||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: 8bit\n"
|
||||
"Language: \n"
|
||||
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
|
||||
|
||||
#: ../src/applets/battery.c:170
|
||||
|
|
@ -84,8 +84,8 @@ msgstr "Verrouiller l'écran"
|
|||
msgid "Logging out is disabled"
|
||||
msgstr "Se déconnecter est désactivé"
|
||||
|
||||
#: ../src/applets/logout.c:70 ../src/panel.c:807 ../src/panel.c:814
|
||||
#: ../src/panel.c:823
|
||||
#: ../src/applets/logout.c:70 ../src/panel.c:827 ../src/panel.c:834
|
||||
#: ../src/panel.c:843
|
||||
msgid "Logout"
|
||||
msgstr "Déconnexion"
|
||||
|
||||
|
|
@ -197,19 +197,19 @@ msgstr "Préférences du Panel"
|
|||
msgid "Top size:"
|
||||
msgstr "Taille du haut :"
|
||||
|
||||
#: ../src/panel.c:546
|
||||
#: ../src/panel.c:556
|
||||
msgid "Bottom size:"
|
||||
msgstr "Taille du bas :"
|
||||
|
||||
#: ../src/panel.c:557
|
||||
#: ../src/panel.c:577
|
||||
msgid "General"
|
||||
msgstr "Général"
|
||||
|
||||
#: ../src/panel.c:750
|
||||
#: ../src/panel.c:770
|
||||
msgid "translator-credits"
|
||||
msgstr "Pierre Pronchery <khorben@defora.org>"
|
||||
|
||||
#: ../src/panel.c:793
|
||||
#: ../src/panel.c:813
|
||||
msgid ""
|
||||
"This will log you out of the current session, therefore closing any "
|
||||
"application currently opened and losing any unsaved data.\n"
|
||||
|
|
@ -220,7 +220,7 @@ msgstr ""
|
|||
"sauvegardées.\n"
|
||||
"Voulez-vous continuer?"
|
||||
|
||||
#: ../src/panel.c:910
|
||||
#: ../src/panel.c:930
|
||||
msgid ""
|
||||
"This will shutdown your device, therefore closing any application currently "
|
||||
"opened and losing any unsaved data.\n"
|
||||
|
|
@ -231,7 +231,7 @@ msgstr ""
|
|||
"sauvegardées.\n"
|
||||
"Voulez-vous continuer?"
|
||||
|
||||
#: ../src/panel.c:915
|
||||
#: ../src/panel.c:935
|
||||
msgid ""
|
||||
"This will shutdown your computer, therefore closing any application "
|
||||
"currently opened and losing any unsaved data.\n"
|
||||
|
|
@ -242,11 +242,11 @@ msgstr ""
|
|||
"sauvegardées.\n"
|
||||
"Voulez-vous continuer?"
|
||||
|
||||
#: ../src/panel.c:929 ../src/panel.c:936 ../src/panel.c:945
|
||||
#: ../src/panel.c:949 ../src/panel.c:956 ../src/panel.c:965
|
||||
msgid "Shutdown"
|
||||
msgstr "Arrêter"
|
||||
|
||||
#: ../src/panel.c:935
|
||||
#: ../src/panel.c:955
|
||||
msgid "Restart"
|
||||
msgstr "Redémarrer"
|
||||
|
||||
|
|
|
|||
|
|
@ -15,13 +15,13 @@
|
|||
|
||||
|
||||
|
||||
#include "Panel.h"
|
||||
#include <stdlib.h>
|
||||
#include <libintl.h>
|
||||
#if GTK_CHECK_VERSION(3, 0, 0)
|
||||
# include <gtk/gtkx.h>
|
||||
#endif
|
||||
#include <gdk/gdkx.h>
|
||||
#include "Panel.h"
|
||||
#define _(string) gettext(string)
|
||||
#define N_(string) (string)
|
||||
|
||||
|
|
|
|||
|
|
@ -15,14 +15,15 @@
|
|||
|
||||
|
||||
|
||||
#include "Panel.h"
|
||||
#include <stdlib.h>
|
||||
#ifdef DEBUG
|
||||
# include <stdio.h>
|
||||
#endif
|
||||
#include <stdio.h>
|
||||
#include <string.h>
|
||||
#if GTK_CHECK_VERSION(3, 0, 0)
|
||||
# include <gtk/gtkx.h>
|
||||
#endif
|
||||
#include <gdk/gdkx.h>
|
||||
#include <X11/Xatom.h>
|
||||
#include "Panel.h"
|
||||
|
||||
|
||||
/* Systray */
|
||||
|
|
|
|||
20
src/panel.c
20
src/panel.c
|
|
@ -536,10 +536,20 @@ static void _show_preferences_window(Panel * panel)
|
|||
gtk_misc_set_alignment(GTK_MISC(widget), 0.0, 0.5);
|
||||
gtk_size_group_add_widget(group, widget);
|
||||
gtk_box_pack_start(GTK_BOX(hbox), widget, FALSE, TRUE, 0);
|
||||
#if GTK_CHECK_VERSION(3, 0, 0)
|
||||
panel->pr_top_size = gtk_combo_box_text_new();
|
||||
#else
|
||||
panel->pr_top_size = gtk_combo_box_new_text();
|
||||
#endif
|
||||
for(i = 0; i < sizeof(_panel_sizes) / sizeof(*_panel_sizes); i++)
|
||||
#if GTK_CHECK_VERSION(3, 0, 0)
|
||||
gtk_combo_box_text_append(GTK_COMBO_BOX_TEXT(
|
||||
panel->pr_top_size), NULL,
|
||||
_(_panel_sizes[i].alias));
|
||||
#else
|
||||
gtk_combo_box_append_text(GTK_COMBO_BOX(panel->pr_top_size),
|
||||
_(_panel_sizes[i].alias));
|
||||
#endif
|
||||
gtk_box_pack_start(GTK_BOX(hbox), panel->pr_top_size, TRUE, TRUE, 0);
|
||||
gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, TRUE, 0);
|
||||
hbox = gtk_hbox_new(FALSE, 4);
|
||||
|
|
@ -547,10 +557,20 @@ static void _show_preferences_window(Panel * panel)
|
|||
gtk_misc_set_alignment(GTK_MISC(widget), 0.0, 0.5);
|
||||
gtk_size_group_add_widget(group, widget);
|
||||
gtk_box_pack_start(GTK_BOX(hbox), widget, FALSE, TRUE, 0);
|
||||
#if GTK_CHECK_VERSION(3, 0, 0)
|
||||
panel->pr_bottom_size = gtk_combo_box_text_new();
|
||||
#else
|
||||
panel->pr_bottom_size = gtk_combo_box_new_text();
|
||||
#endif
|
||||
for(i = 0; i < sizeof(_panel_sizes) / sizeof(*_panel_sizes); i++)
|
||||
#if GTK_CHECK_VERSION(3, 0, 0)
|
||||
gtk_combo_box_text_append(GTK_COMBO_BOX_TEXT(
|
||||
panel->pr_bottom_size), NULL,
|
||||
_(_panel_sizes[i].alias));
|
||||
#else
|
||||
gtk_combo_box_append_text(GTK_COMBO_BOX(panel->pr_bottom_size),
|
||||
_(_panel_sizes[i].alias));
|
||||
#endif
|
||||
gtk_box_pack_start(GTK_BOX(hbox), panel->pr_bottom_size, TRUE, TRUE, 0);
|
||||
gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, TRUE, 0);
|
||||
gtk_notebook_append_page(GTK_NOTEBOOK(panel->pr_notebook), vbox,
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user