Benjamin Otte
2007-Nov-15 12:53 UTC
[Swfdec] 9 commits - data/Makefile.am player/swfdec-player.ui player/swfdec-window.c po/fr.po po/POTFILES.in po/POTFILES.skip thumbnailer/Makefile.am
data/Makefile.am | 8 ++--- player/swfdec-player.ui | 22 +++++++------- player/swfdec-window.c | 2 - po/POTFILES.in | 1 po/POTFILES.skip | 1 po/fr.po | 72 ++++++++++++++++++++++++++++++++---------------- thumbnailer/Makefile.am | 20 +++++-------- 7 files changed, 74 insertions(+), 52 deletions(-) New commits: commit 141fa1fcaf7b2f88af46d78e0cb630e1cfe9cfbd Merge: 07ea6bb... b67e5f5... Author: Stephane Loeuillet <leroutier at gmail.com> Date: Thu Nov 15 12:54:42 2007 +0100 Merge branch 'master' of git://anongit.freedesktop.org/git/swfdec/swfdec-gnome Conflicts: data/Makefile.am commit 07ea6bb961822789a7b4bcea28c640066d9d1a2b Merge: 1479875... 278f254... Author: Stephane Loeuillet <leroutier at gmail.com> Date: Fri Nov 9 01:25:24 2007 +0100 Merge branch 'master' of git://anongit.freedesktop.org/git/swfdec/swfdec-gnome commit 147987593df5f64eb8a2328d59b57e30779d98f8 Author: Stephane Loeuillet <leroutier at gmail.com> Date: Thu Nov 1 15:00:29 2007 +0100 Fix a really fuzzy translation diff --git a/po/fr.po b/po/fr.po index 5499be4..978c761 100644 --- a/po/fr.po +++ b/po/fr.po @@ -80,9 +80,8 @@ msgstr "" #~ msgid "Play / P_ause" #~ msgstr "Lecture / P_ause" -#, fuzzy #~ msgid "Play or pause the file" -#~ msgstr "Permet de lire des fichiers Adobe Flash" +#~ msgstr "Lecture ou pause sur le fichier" #~ msgid "_About" #~ msgstr "A _propos" commit c2888a79f6e9479f1ec0e128b742f79fea9ab8e5 Author: Stephane Loeuillet <leroutier at gmail.com> Date: Thu Nov 1 14:51:36 2007 +0100 Include translations for .ui file even if they're unused for now diff --git a/po/fr.po b/po/fr.po index 91138b3..5499be4 100644 --- a/po/fr.po +++ b/po/fr.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: 0.5.3.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-11-01 14:10+0100\n" +"POT-Creation-Date: 2007-11-01 14:47+0100\n" "PO-Revision-Date: 2007-10-28 16:24+0100\n" "Last-Translator: St??phane Loeuillet <leroutier at gmail.com>\n" "Language-Team: Fran??ais <fr at li.org>\n" @@ -34,7 +34,7 @@ msgstr "Mettre en pause la lecture apr??s chargement du fichier" #: ../player/swfdec-window-handlers.c:54 msgid "Select a file to play" -msgstr "Choisir le fichier ?? lire" +msgstr "Choisissez le fichier ?? lire" #: ../player/swfdec-window.c:165 msgid "Internal error in the user interface definition" @@ -64,3 +64,37 @@ msgstr "" "Commande et param??tres de lancement valides pour le cr??ateur de miniatures " "pour fichiers Flash.Lisez la documentation Nautilus relative ?? la cr??ation " "de miniatures pour plus de d??tails." + +#~ msgid "Close" +#~ msgstr "Quitter le lecteur Flash" + +#~ msgid "Mute" +#~ msgstr "Sourdine" + +#~ msgid "Mute sound output" +#~ msgstr "Coupe le son" + +#~ msgid "Open a file" +#~ msgstr "Ouvrir un fichier" + +#~ msgid "Play / P_ause" +#~ msgstr "Lecture / P_ause" + +#, fuzzy +#~ msgid "Play or pause the file" +#~ msgstr "Permet de lire des fichiers Adobe Flash" + +#~ msgid "_About" +#~ msgstr "A _propos" + +#~ msgid "_Close" +#~ msgstr "_Quitter" + +#~ msgid "_File" +#~ msgstr "_Fichier" + +#~ msgid "_Help" +#~ msgstr "Aid_e" + +#~ msgid "_Open..." +#~ msgstr "_Ouvrir..." commit 1ae07d69d0d9877fffc65602a887a1c170e49ac0 Author: Stephane Loeuillet <leroutier at gmail.com> Date: Thu Nov 1 14:50:28 2007 +0100 Move .ui file to POTFILES.skip as it lacks context information for all translations and so intltool won't find those and won't allow translation diff --git a/po/POTFILES.in b/po/POTFILES.in index 23e9ed4..db39b20 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -3,7 +3,6 @@ [encoding: UTF-8] data/swfdec-player.desktop.in player/swfdec-player.c -player/swfdec-player.ui player/swfdec-window-handlers.c player/swfdec-window.c thumbnailer/swfdec-thumbnailer.schemas.in diff --git a/po/POTFILES.skip b/po/POTFILES.skip index 8b13789..8102f2a 100644 --- a/po/POTFILES.skip +++ b/po/POTFILES.skip @@ -1 +1,2 @@ +player/swfdec-player.ui commit 372ff7a000f7aa46864facfb218b3a026da061e9 Author: Stephane Loeuillet <leroutier at gmail.com> Date: Thu Nov 1 14:49:28 2007 +0100 Mark more strings translatable diff --git a/player/swfdec-player.ui b/player/swfdec-player.ui index 7c23c43..fbba9e9 100644 --- a/player/swfdec-player.ui +++ b/player/swfdec-player.ui @@ -8,40 +8,40 @@ <object class="GtkActionGroup" id="main-action-group"> <child> <object class="GtkAction" id="file-menu"> - <property name="label">_File</property> + <property name="label" translatable="yes">_File</property> </object> </child> <child> <object class="GtkAction" id="open"> - <property name="label">_Open...</property> + <property name="label" translatable="yes">_Open...</property> <property name="stock-id">gtk-open</property> - <property name="tooltip">Open a file</property> + <property name="tooltip" translatable="yes">Open a file</property> <signal name="activate" handler="menu_file_open"/> </object> <accelerator key="O" modifiers="GDK_CONTROL_MASK"/> </child> <child> <object class="GtkToggleAction" id="play"> - <property name="label">Play / P_ause</property> + <property name="label" translatable="yes">Play / P_ause</property> <property name="stock-id">gtk-media-play</property> - <property name="tooltip">Play or pause the file</property> + <property name="tooltip" translatable="yes">Play or pause the file</property> <signal name="toggled" handler="menu_file_play"/> </object> <accelerator key="space" modifiers="GDK_CONTROL_MASK"/> </child> <child> <object class="GtkToggleAction" id="mute"> - <property name="label">Mute</property> - <property name="tooltip">Mute sound output</property> + <property name="label" translatable="yes">Mute</property> + <property name="tooltip" translatable="yes">Mute sound output</property> <signal name="toggled" handler="menu_file_mute"/> </object> <accelerator key="M" modifiers="GDK_CONTROL_MASK"/> </child> <child> <object class="GtkAction" id="quit"> - <property name="label">_Close</property> + <property name="label" translatable="yes">_Close</property> <property name="stock-id">gtk-close</property> - <property name="tooltip">Close</property> + <property name="tooltip" translatable="yes">Close</property> <signal name="activate" handler="menu_file_close"/> </object> <accelerator key="W" modifiers="GDK_CONTROL_MASK"/> @@ -49,12 +49,12 @@ <child> <object class="GtkAction" id="help-menu"> - <property name="label">_Help</property> + <property name="label" translatable="yes">_Help</property> </object> </child> <child> <object class="GtkAction" id="about"> - <property name="label">_About</property> + <property name="label" translatable="yes">_About</property> <property name="stock-id">gtk-about</property> <signal name="activate" handler="menu_help_about"/> </object> commit 6814efa3edc8e206696fa4bf884c4d47224d7313 Author: Stephane Loeuillet <leroutier at gmail.com> Date: Thu Nov 1 14:12:56 2007 +0100 Makefile.am clean-up diff --git a/data/Makefile.am b/data/Makefile.am index 59cdcf1..ffde790 100644 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -1,11 +1,11 @@ -EXTRA_DIST = \ - swfdec-player.desktop.in - desktop_in_files = swfdec-player.desktop.in desktopdir = $(datadir)/applications desktop_DATA = $(desktop_in_files:.desktop.in=.desktop) @INTLTOOL_DESKTOP_RULE@ +EXTRA_DIST = \ + $(desktop_in_files) + CLEANFILES = \ - swfdec-player.deskto + $(desktop_DATA) diff --git a/thumbnailer/Makefile.am b/thumbnailer/Makefile.am index 29fb1da..1c06f8b 100644 --- a/thumbnailer/Makefile.am +++ b/thumbnailer/Makefile.am @@ -1,5 +1,3 @@ - at INTLTOOL_SCHEMAS_RULE@ - bin_PROGRAMS = swfdec-thumbnailer swfdec_thumbnailer_SOURCES = swfdec-thumbnailer.c @@ -7,13 +5,10 @@ swfdec_thumbnailer_SOURCES = swfdec-thumbnailer.c INCLUDES = $(GLOBAL_CFLAGS) $(THUMBNAILER_CFLAGS) swfdec_thumbnailer_LDFLAGS = $(THUMBNAILER_LIBS) -schema_files = \ - swfdec-thumbnailer.schemas.in - -schema_DATA = \ - swfdec-thumbnailer.schemas - -schemadir = $(GCONF_SCHEMA_FILE_DIR) +schemas_in_files = swfdec-thumbnailer.schemas.in +schemasdir = $(GCONF_SCHEMA_FILE_DIR) +schemas_DATA = $(schemas_in_files:.schemas.in=.schemas) + at INTLTOOL_SCHEMAS_RULE@ install-data-local: if GCONF_SCHEMAS_INSTALL @@ -25,7 +20,8 @@ if GCONF_SCHEMAS_INSTALL endif EXTRA_DIST = \ - $(schema_files) + $(schemas_in_files) + +CLEANFILES = \ + $(schemas_DATA) -DISTCLEANFILES = \ - $(schema_DATA) commit 26a4d39043b6d7efc3ff5803bf5a5d9130a26248 Author: Stephane Loeuillet <leroutier at gmail.com> Date: Thu Nov 1 14:11:52 2007 +0100 Update french translation diff --git a/po/fr.po b/po/fr.po index f082883..91138b3 100644 --- a/po/fr.po +++ b/po/fr.po @@ -6,9 +6,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" +"Project-Id-Version: 0.5.3.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-10-28 16:27+0100\n" +"POT-Creation-Date: 2007-11-01 14:10+0100\n" "PO-Revision-Date: 2007-10-28 16:24+0100\n" "Last-Translator: St??phane Loeuillet <leroutier at gmail.com>\n" "Language-Team: Fran??ais <fr at li.org>\n" @@ -18,56 +18,49 @@ msgstr "" #: ../data/swfdec-player.desktop.in.h:1 msgid "Play Adobe Flash files" -msgstr "" +msgstr "Permet de lire des fichiers Adobe Flash" #: ../data/swfdec-player.desktop.in.h:2 ../player/swfdec-player.c:63 msgid "Swfdec Flash Player" -msgstr "" - -#: ../data/swfdec.xml.in.h:1 -msgid "???" -msgstr "" - -#: ../data/swfdec.xml.in.h:2 -msgid "Adobe/Macromedia Flash animation" -msgstr "" - -#: ../data/swfdec.xml.in.h:3 -msgid "Adobe/Macromedia Flash video" -msgstr "" +msgstr "Lecteur Flash Swfdec" #: ../player/swfdec-player.c:56 msgid "don't play sound" -msgstr "" +msgstr "Ne pas jouer le son" #: ../player/swfdec-player.c:57 msgid "start player paused" -msgstr "" +msgstr "Mettre en pause la lecture apr??s chargement du fichier" #: ../player/swfdec-window-handlers.c:54 msgid "Select a file to play" -msgstr "" +msgstr "Choisir le fichier ?? lire" #: ../player/swfdec-window.c:165 -msgid "Internal error in the user interface defintion" -msgstr "" +msgid "Internal error in the user interface definition" +msgstr "Erreur interne dans la d??finition de l'interface utilisateur" #: ../thumbnailer/swfdec-thumbnailer.schemas.in.h:1 msgid "" "Boolean options available, true enables thumbnailing and false disables the " "creation of new thumbnails" msgstr "" +"De cette valeur d??pend la cr??ation de miniatures pour les fichiers Flash, ou " +"non" #: ../thumbnailer/swfdec-thumbnailer.schemas.in.h:2 msgid "Enable thumbnailing of Flash files" -msgstr "" +msgstr "Activation de la cr??ation de miniatures pour les fichiers Flash" #: ../thumbnailer/swfdec-thumbnailer.schemas.in.h:3 msgid "Thumbnail command for Flash files" -msgstr "" +msgstr "Commande de cr??ation de miniatures pour les fichiers Flash" #: ../thumbnailer/swfdec-thumbnailer.schemas.in.h:4 msgid "" "Valid command plus arguments for the Flash file thumbnailer. See nautilus " "thumbnailer documentation for more information." msgstr "" +"Commande et param??tres de lancement valides pour le cr??ateur de miniatures " +"pour fichiers Flash.Lisez la documentation Nautilus relative ?? la cr??ation " +"de miniatures pour plus de d??tails." commit e98b5c2d244780ce2bd2af49321fe6cb5c4dfc35 Author: Stephane Loeuillet <leroutier at gmail.com> Date: Thu Nov 1 14:11:23 2007 +0100 Typo diff --git a/player/swfdec-window.c b/player/swfdec-window.c index 4de20c3..a623352 100644 --- a/player/swfdec-window.c +++ b/player/swfdec-window.c @@ -162,7 +162,7 @@ swfdec_window_new (const char *url) gtk_builder_connect_signals (window->builder, window); window->window = GTK_WIDGET (gtk_builder_get_object (window->builder, "player-window")); if (window->window == NULL) { - swfdec_window_error (window, _("Internal error in the user interface defintion")); + swfdec_window_error (window, _("Internal error in the user interface definition")); return window; } g_object_weak_ref (G_OBJECT (window->window), (GWeakNotify) g_object_unref, window);