Menu
▾
▴
gnac-svn-commit — Email for each commit on the SVN repository
You can subscribe to this list here.
| 2008 |
Jan
|
Feb
|
Mar
|
Apr
(8) |
May
|
Jun
|
Jul
(6) |
Aug
(8) |
Sep
(1) |
Oct
|
Nov
|
Dec
|
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2009 |
Jan
(25) |
Feb
(89) |
Mar
(101) |
Apr
(50) |
May
(7) |
Jun
(4) |
Jul
(20) |
Aug
(2) |
Sep
|
Oct
|
Nov
|
Dec
|
|
From: <bdu...@us...> - 2009-08-07 07:28:14
|
Revision: 385
http://gnac.svn.sourceforge.net/gnac/?rev=385&view=rev
Author: bdupasqu
Date: 2009-08-07 07:28:04 +0000 (Fri, 07 Aug 2009)
Log Message:
-----------
Tagging the 0.2.1 release of Gnac.
Added Paths:
-----------
tags/gnac-0.2.1/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <da...@us...> - 2009-08-02 08:18:06
|
Revision: 384
http://gnac.svn.sourceforge.net/gnac/?rev=384&view=rev
Author: daiji
Date: 2009-08-02 08:17:58 +0000 (Sun, 02 Aug 2009)
Log Message:
-----------
Update cs translation, fix a mistake in Makefile.am (thanks to Lubos Stanek)
Modified Paths:
--------------
trunk/data/Makefile.am
trunk/po/cs.po
Modified: trunk/data/Makefile.am
===================================================================
--- trunk/data/Makefile.am 2009-07-31 14:27:37 UTC (rev 383)
+++ trunk/data/Makefile.am 2009-08-02 08:17:58 UTC (rev 384)
@@ -84,8 +84,8 @@
rmdir "$(configdir)"; \
fi
+install-schemas:
if GCONF_SCHEMAS_INSTALL
-install-schemas:
@-if test -z "$(DESTDIR)" ; then \
for p in $(schema_DATA) ; do \
GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $$p 2>&1 > /dev/null; \
@@ -94,8 +94,8 @@
@true
endif
+uninstall-schemas:
if GCONF_SCHEMAS_INSTALL
-uninstall-schemas:
@-if test -z "$(DESTDIR)" ; then \
for p in $(schema_DATA) ; do \
GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-uninstall-rule $(schemadir)/$$p 2>&1 > /dev/null; \
Modified: trunk/po/cs.po
===================================================================
--- trunk/po/cs.po 2009-07-31 14:27:37 UTC (rev 383)
+++ trunk/po/cs.po 2009-08-02 08:17:58 UTC (rev 384)
@@ -8,7 +8,7 @@
"Project-Id-Version: gnac\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2009-07-22 16:33+0200\n"
-"PO-Revision-Date: 2009-07-22 16:37+0200\n"
+"PO-Revision-Date: 2009-07-30 21:32+0200\n"
"Last-Translator: Luboš Staněk <lu...@us...>\n"
"Language-Team: Czech <tra...@li...>\n"
"MIME-Version: 1.0\n"
@@ -30,11 +30,11 @@
#: ../data/gnac.schemas.in.h:3
msgid "Folder hierarchy"
-msgstr ""
+msgstr "Hierarchie složek"
#: ../data/gnac.schemas.in.h:4
msgid "Folder hierarchy pattern"
-msgstr ""
+msgstr "šablona hierarchie složek"
#: ../data/gnac.schemas.in.h:5
msgid "Folder type"
@@ -53,13 +53,12 @@
msgstr "Výstupní název souboru"
#: ../data/gnac.schemas.in.h:9
-#, fuzzy
msgid "Output filename pattern"
-msgstr "Výstupní název souboru"
+msgstr "Šablona názvu výstupního souboru"
#: ../data/gnac.schemas.in.h:10
msgid "Strip special characters in filenames"
-msgstr ""
+msgstr "Odebrat speciální znaky v názvu souboru"
#: ../data/gnac-pref-window.xml.h:1
msgid "<b>Conversion:</b>"
@@ -70,9 +69,8 @@
msgstr "<b>Zobrazení:</b>"
#: ../data/gnac-pref-window.xml.h:3
-#, fuzzy
msgid "<b>File and folder naming:</b>"
-msgstr "<b>Informace o profilu</b>"
+msgstr "<b>Pojmenování souborů a složek:</b>"
#: ../data/gnac-pref-window.xml.h:4
msgid "Album"
@@ -107,14 +105,12 @@
msgstr "Umělec/Album (Rok)"
#: ../data/gnac-pref-window.xml.h:12
-#, fuzzy
msgid "Audio"
-msgstr "Automaticky"
+msgstr "Zvuk"
#: ../data/gnac-pref-window.xml.h:13
-#, fuzzy
msgid "Custom"
-msgstr "Uživatelská složka"
+msgstr "Podle uživatele"
#: ../data/gnac-pref-window.xml.h:14
msgid "Custom folder"
@@ -130,7 +126,7 @@
#: ../data/gnac-pref-window.xml.h:17
msgid "Folder hierarchy:"
-msgstr ""
+msgstr "Hierarchie složek:"
#: ../data/gnac-pref-window.xml.h:18
msgid "Folder location:"
@@ -138,7 +134,7 @@
#: ../data/gnac-pref-window.xml.h:19
msgid "General"
-msgstr ""
+msgstr "Obecné"
#: ../data/gnac-pref-window.xml.h:20
msgid "Gnac preferences"
@@ -146,7 +142,7 @@
#: ../data/gnac-pref-window.xml.h:21
msgid "None"
-msgstr ""
+msgstr "Žádná"
#: ../data/gnac-pref-window.xml.h:22
msgid "Number - Artist - Album - Title"
@@ -178,7 +174,7 @@
#: ../data/gnac-pref-window.xml.h:29
msgid "Strip special characters"
-msgstr ""
+msgstr "Odebrat speciální znaky"
#: ../data/gnac-pref-window.xml.h:30
msgid "Subfolder"
@@ -844,13 +840,13 @@
msgstr "Nelze vytvořit cílový adresář"
#: ../libgnac/libgnac-converter.c:1029
-#, fuzzy, c-format
+#, c-format
msgid "Destination file %s already exists"
-msgstr "Soubor %s je již na seznamu"
+msgstr "Cílový soubor %s již existuje"
#: ../libgnac/libgnac-converter.c:1031
msgid "Destination file already exists"
-msgstr ""
+msgstr "Cílový soubor již existuje"
#: ../libgnac/libgnac-converter.c:1038
msgid "Unable to access destination file"
@@ -910,15 +906,15 @@
#: ../libgnac/libgnac-metadata.c:723
msgid "filename.ext"
-msgstr ""
+msgstr "název.přípona"
#: ../libgnac/libgnac-metadata.c:753
msgid "Converted by Gnac"
-msgstr ""
+msgstr "Převedl Gnac"
#: ../src/profiles/gnac-profiles-manager.c:39
msgid " (copy)"
-msgstr ""
+msgstr " (kopie)"
#: ../src/profiles/gnac-profiles-manager.c:249
#: ../src/profiles/gnac-profiles-manager.c:252
@@ -985,9 +981,8 @@
#: ../src/profiles/gnac-profiles-manager.c:1011
#: ../src/profiles/gnac-profiles-manager.c:1037
-#, fuzzy
msgid "Failed to copy the profile"
-msgstr "Nelze procházet adresář profilů"
+msgstr "Selhalo zkopírování profilu"
#: ../src/profiles/gnac-profiles-manager.c:1065
msgid "Edit profile"
@@ -1145,7 +1140,7 @@
#: ../src/gnac-main.c:533
#, c-format
msgid "Could not open link %s: %s\n"
-msgstr ""
+msgstr "Nelze otevřít odkaz %s: %s\n"
#: ../src/gnac-main.c:562
msgid ""
@@ -1156,15 +1151,17 @@
"Opravdu chcete skončit?"
#: ../src/gnac-main.c:707
-#, fuzzy, c-format
+#, c-format
msgid ""
"File %s already exists...\n"
"Overwrite?"
-msgstr "Soubor %s je již na seznamu"
+msgstr ""
+"Soubor %s již exituje...\n"
+"Přepsat?"
#: ../src/gnac-main.c:712
msgid "Remember my decision"
-msgstr ""
+msgstr "Pamatuj si mou volbu"
#: ../src/gnac-main.c:745
#, c-format
@@ -1196,7 +1193,7 @@
#: ../src/gnac-main.c:938
#, c-format
msgid "File not converted (%s)"
-msgstr ""
+msgstr "Soubor nepřeveden (%s)"
#: ../src/gnac-main.c:946
#, c-format
@@ -1245,6 +1242,18 @@
" <b>\\%n:</b> track number\n"
" <b>\\%y:</b> year"
msgstr ""
+"Dostupné šablony:\n"
+" <b>\\%a:</b> umělec\n"
+" <b>\\%b:</b> album\n"
+" <b>\\%c:</b> komentář\n"
+" <b>\\%d:</b> číslo disku\n"
+" <b>\\%e:</b> počet disků\n"
+" <b>\\%f:</b> název souboru\n"
+" <b>\\%g:</b> žánr\n"
+" <b>\\%t:</b> titul\n"
+" <b>\\%l:</b> počet stop\n"
+" <b>\\%n:</b> číslo stopy\n"
+" <b>\\%y:</b> rok"
#: ../src/gnac-prefs.c:326 ../src/gnac-properties.c:407 ../src/gnac-ui.c:84
#, c-format
@@ -1277,11 +1286,11 @@
#: ../src/gnac-properties.c:113
msgid "Track Gain"
-msgstr ""
+msgstr "Zesílení stopy"
#: ../src/gnac-properties.c:114
msgid "Track Peak"
-msgstr ""
+msgstr "Max. hlasitost stopy"
#: ../src/gnac-properties.c:339
#, c-format
@@ -1306,6 +1315,8 @@
" <b>%s</b>\n"
" <span color=\"#888\">by</span> %s <span color=\"#888\">from</span> %s"
msgstr ""
+" <b>%s</b>\n"
+" <span color=\"#888\">od</span> %s <span color=\"#888\">z</span> %s"
#: ../src/gnac-ui.c:498
msgid "Hide"
@@ -1316,7 +1327,6 @@
msgstr "Zobrazit"
#: ../src/gnac-ui.c:566
-#, fuzzy
msgid "Cannot trash the file. Do you want to delete it immediately?"
msgstr "Soubor nelze hodit do koše. Chcete ho ihned smazat?"
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bdu...@us...> - 2009-07-31 14:27:45
|
Revision: 383
http://gnac.svn.sourceforge.net/gnac/?rev=383&view=rev
Author: bdupasqu
Date: 2009-07-31 14:27:37 +0000 (Fri, 31 Jul 2009)
Log Message:
-----------
- Fix a bug in gnac-prefs preventing the output filename to be saved,
- Handle properly cases when a filename does not have any extension.
Modified Paths:
--------------
trunk/data/Makefile.am
trunk/data/gnac-pref-window.xml
trunk/libgnac/libgnac-output.c
trunk/src/gnac-prefs.c
Modified: trunk/data/Makefile.am
===================================================================
--- trunk/data/Makefile.am 2009-07-31 08:44:00 UTC (rev 382)
+++ trunk/data/Makefile.am 2009-07-31 14:27:37 UTC (rev 383)
@@ -77,8 +77,7 @@
else \
echo "*** Desktop database not updated. After install, run this:"; \
echo "*** $(update_desktop_database)"; \
- fi \
- @true
+ fi
remove-gnac-dir:
if test -d "$(configdir)" ; then \
Modified: trunk/data/gnac-pref-window.xml
===================================================================
--- trunk/data/gnac-pref-window.xml 2009-07-31 08:44:00 UTC (rev 382)
+++ trunk/data/gnac-pref-window.xml 2009-07-31 14:27:37 UTC (rev 383)
@@ -400,7 +400,7 @@
</packing>
</child>
<child>
- <object class="GtkComboBox" id="file_pattern_combo">
+ <object class="GtkComboBox" id="output_filename_combo">
<property name="visible">True</property>
<property name="model">output_filename_model</property>
<signal name="changed" handler="gnac_prefs_pattern_changed_cb"/>
@@ -468,7 +468,7 @@
<property name="visible">True</property>
<property name="has_tooltip">True</property>
<property name="above_child">True</property>
- <signal name="button_press_event" handler="gnac_prefs_button_press_event_cb" object="file_pattern_combo"/>
+ <signal name="button_press_event" handler="gnac_prefs_button_press_event_cb" object="output_filename_combo"/>
<signal name="query_tooltip" handler="gnac_prefs_query_tooltip_cb"/>
<child>
<object class="GtkEntry" id="output_filename_entry">
Modified: trunk/libgnac/libgnac-output.c
===================================================================
--- trunk/libgnac/libgnac-output.c 2009-07-31 08:44:00 UTC (rev 382)
+++ trunk/libgnac/libgnac-output.c 2009-07-31 14:27:37 UTC (rev 383)
@@ -78,17 +78,21 @@
static gchar *
libgnac_output_remove_extension(const gchar *filename)
{
+ gchar *ext;
gchar *output;
glong ext_pos;
glong output_long;
g_return_val_if_fail(filename, NULL);
- ext_pos = g_utf8_strlen(g_utf8_strrchr(filename, -1, '.'), -1);
- output_long = g_utf8_strlen(filename, -1) - ext_pos ;
+ ext = g_utf8_strrchr(filename, -1, '.');
+ ext_pos = ext ? g_utf8_strlen(ext, -1) : 0;
+ output_long = g_utf8_strlen(filename, -1) - ext_pos;
+
output = g_malloc((output_long + 1) * sizeof(gchar));
g_utf8_strncpy(output, filename, output_long);
+
return output;
}
Modified: trunk/src/gnac-prefs.c
===================================================================
--- trunk/src/gnac-prefs.c 2009-07-31 08:44:00 UTC (rev 382)
+++ trunk/src/gnac-prefs.c 2009-07-31 14:27:37 UTC (rev 383)
@@ -92,56 +92,6 @@
}
-static void
-gnac_prefs_update_label(gint index_folder, gint index_filename)
-{
- const gchar *pattern_filename;
- gchar *clean_label;
- gchar *pattern;
- gchar *preview;
- GtkWidget *label;
-
- label = GTK_WIDGET(gtk_builder_get_object(gnac_prefs_builder,
- "example_label"));
-
- pattern_filename = gnac_prefs_entry_get_text("output_filename_entry");
- if (pattern_filename)
- {
- gnac_gconf_set_string(GNAC_GCONF_RENAME_PATTERN_PATTERN, pattern_filename);
- }
-
- if (index_folder != 0)
- {
- const gchar *pattern_folder;
- pattern_folder = gnac_prefs_entry_get_text("folder_hierarchy_entry");
- if (pattern_folder && !g_str_equal(pattern_folder, ""))
- {
- gnac_gconf_set_string(GNAC_GCONF_FOLDER_HIERARCHY_PATTERN, pattern_folder);
- pattern = g_strdup_printf("%s/%s", pattern_folder, pattern_filename);
- }
- else
- {
- pattern = g_strdup(pattern_filename);
- }
- }
- else
- {
- pattern = g_strdup(pattern_filename);
- }
-
- preview = libgnac_output_get_preview_from_pattern(pattern,
- gnac_gconf_get_boolean(GNAC_GCONF_STRIP_SPECIAL));
- clean_label = g_markup_printf_escaped("<small><i>%s.%s</i></small>",
- preview, gnac_profiles_get_extension());
-
- gtk_label_set_markup(GTK_LABEL(label), clean_label);
-
- g_free(pattern);
- g_free(preview);
- g_free(clean_label);
-}
-
-
static void
gnac_prefs_set_same_mode(void)
{
@@ -251,7 +201,7 @@
folder_type = gnac_gconf_get_int(GNAC_GCONF_FOLDER_TYPE);
/* output filename combo */
combo = GTK_COMBO_BOX(gtk_builder_get_object(gnac_prefs_builder,
- "file_pattern_combo"));
+ "output_filename_combo"));
gtk_combo_box_set_active(combo,
gnac_gconf_get_int(GNAC_GCONF_RENAME_PATTERN));
/* output filename entry */
@@ -364,7 +314,7 @@
gint size;
GtkComboBox *combo;
combo = GTK_COMBO_BOX(gtk_builder_get_object(gnac_prefs_builder,
- "file_pattern_combo"));
+ "output_filename_combo"));
index = gtk_combo_box_get_active(combo);
size = G_N_ELEMENTS(rename_pattern_default);
if (index < 0 || index > size)
@@ -489,19 +439,54 @@
gnac_prefs_update_example_label(GtkWidget *widget,
gpointer data)
{
- gint active_folder;
- gint active_filename;
- GtkWidget *combo;
+ const gchar *pattern_filename;
+ gchar *clean_label;
+ gchar *pattern;
+ gchar *preview;
+ GtkWidget *combo;
+ GtkWidget *label;
combo = GTK_WIDGET(gtk_builder_get_object(
- gnac_prefs_builder, "file_pattern_combo"));
- active_filename = gtk_combo_box_get_active(GTK_COMBO_BOX(combo));
-
- combo = GTK_WIDGET(gtk_builder_get_object(
gnac_prefs_builder, "folder_hierarchy_combo"));
- active_folder = gtk_combo_box_get_active(GTK_COMBO_BOX(combo));
- gnac_prefs_update_label(active_folder, active_filename);
+ label = GTK_WIDGET(gtk_builder_get_object(gnac_prefs_builder,
+ "example_label"));
+
+ pattern_filename = gnac_prefs_entry_get_text("output_filename_entry");
+ if (pattern_filename && !g_str_equal(pattern_filename, ""))
+ {
+ gnac_gconf_set_string(GNAC_GCONF_RENAME_PATTERN_PATTERN, pattern_filename);
+ }
+
+ if (gtk_combo_box_get_active(GTK_COMBO_BOX(combo)) != 0)
+ {
+ const gchar *pattern_folder;
+ pattern_folder = gnac_prefs_entry_get_text("folder_hierarchy_entry");
+ if (pattern_folder && !g_str_equal(pattern_folder, ""))
+ {
+ gnac_gconf_set_string(GNAC_GCONF_FOLDER_HIERARCHY_PATTERN, pattern_folder);
+ pattern = g_strdup_printf("%s/%s", pattern_folder, pattern_filename);
+ }
+ else
+ {
+ pattern = g_strdup(pattern_filename);
+ }
+ }
+ else
+ {
+ pattern = g_strdup(pattern_filename);
+ }
+
+ preview = libgnac_output_get_preview_from_pattern(pattern,
+ gnac_gconf_get_boolean(GNAC_GCONF_STRIP_SPECIAL));
+ clean_label = g_markup_printf_escaped("<small><i>%s.%s</i></small>",
+ preview, gnac_profiles_get_extension());
+
+ gtk_label_set_markup(GTK_LABEL(label), clean_label);
+
+ g_free(pattern);
+ g_free(preview);
+ g_free(clean_label);
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bdu...@us...> - 2009-07-31 08:44:06
|
Revision: 382
http://gnac.svn.sourceforge.net/gnac/?rev=382&view=rev
Author: bdupasqu
Date: 2009-07-31 08:44:00 +0000 (Fri, 31 Jul 2009)
Log Message:
-----------
Fix a bug.
Modified Paths:
--------------
trunk/src/gnac-prefs.c
Modified: trunk/src/gnac-prefs.c
===================================================================
--- trunk/src/gnac-prefs.c 2009-07-29 15:51:20 UTC (rev 381)
+++ trunk/src/gnac-prefs.c 2009-07-31 08:44:00 UTC (rev 382)
@@ -366,12 +366,12 @@
combo = GTK_COMBO_BOX(gtk_builder_get_object(gnac_prefs_builder,
"file_pattern_combo"));
index = gtk_combo_box_get_active(combo);
- size = gnac_utils_get_combo_size(combo);
- if (index < 0 || index >= size)
+ size = G_N_ELEMENTS(rename_pattern_default);
+ if (index < 0 || index > size)
{
index = 0;
}
- if (index == size-1)
+ if (index == size)
{
return gnac_gconf_get_string(GNAC_GCONF_RENAME_PATTERN_PATTERN);
}
@@ -388,12 +388,12 @@
combo = GTK_COMBO_BOX(gtk_builder_get_object(gnac_prefs_builder,
"folder_hierarchy_combo"));
index = gtk_combo_box_get_active(combo);
- size = gnac_utils_get_combo_size(combo);
- if (index < 0 || index >= size)
+ size = G_N_ELEMENTS(folder_hierarchy_default);
+ if (index < 0 || index > size)
{
index = 0;
}
- if (index == size-1)
+ if (index == size)
{
return gnac_gconf_get_string(GNAC_GCONF_FOLDER_HIERARCHY_PATTERN);
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bdu...@us...> - 2009-07-29 15:51:30
|
Revision: 381
http://gnac.svn.sourceforge.net/gnac/?rev=381&view=rev
Author: bdupasqu
Date: 2009-07-29 15:51:20 +0000 (Wed, 29 Jul 2009)
Log Message:
-----------
Fix a bug in the flac profile: the compression level goes from 0 to 8, although gst-inspect flacenc indicates it goes up to 9. Thanks to Jay Moore for pointing out the bug.
Modified Paths:
--------------
trunk/data/profiles/flac.xml.in
Modified: trunk/data/profiles/flac.xml.in
===================================================================
--- trunk/data/profiles/flac.xml.in 2009-07-27 12:07:50 UTC (rev 380)
+++ trunk/data/profiles/flac.xml.in 2009-07-29 15:51:20 UTC (rev 381)
@@ -16,7 +16,7 @@
<variable-name>quality</variable-name>
<control-type>slider</control-type>
<min-value>0.0</min-value>
- <max-value>9.0</max-value>
+ <max-value>8.0</max-value>
<step-value>1.0</step-value>
<default-value>5.0</default-value>
</variable>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bdu...@us...> - 2009-07-27 12:07:59
|
Revision: 380
http://gnac.svn.sourceforge.net/gnac/?rev=380&view=rev
Author: bdupasqu
Date: 2009-07-27 12:07:50 +0000 (Mon, 27 Jul 2009)
Log Message:
-----------
Fix a bug in the update of the toolbar.
Modified Paths:
--------------
trunk/src/gnac-bars.c
trunk/src/gnac-main.c
Modified: trunk/src/gnac-bars.c
===================================================================
--- trunk/src/gnac-bars.c 2009-07-22 17:35:09 UTC (rev 379)
+++ trunk/src/gnac-bars.c 2009-07-27 12:07:50 UTC (rev 380)
@@ -39,7 +39,7 @@
#include "gnac-stock-items.h"
#include "gnac-ui.h"
-extern guint nb_files_added;
+extern gint nb_files_total;
void
gnac_bars_on_row_inserted(void)
@@ -48,7 +48,7 @@
GtkWidget *convert_button;
GtkAction *action;
- activate = (nb_files_added != 0);
+ activate = (nb_files_total != 0);
action = gnac_ui_get_action("convert_item");
gtk_action_set_sensitive(action, activate);
@@ -163,7 +163,7 @@
gnac_ui_enable_profiles();
gnac_bars_activate_add(TRUE);
- gnac_bars_activate_clear((nb_files_added != 0));
+ gnac_bars_activate_clear((nb_files_total != 0));
gnac_bars_activate_pause(FALSE);
gnac_bars_activate_preferences(TRUE);
}
Modified: trunk/src/gnac-main.c
===================================================================
--- trunk/src/gnac-main.c 2009-07-22 17:35:09 UTC (rev 379)
+++ trunk/src/gnac-main.c 2009-07-27 12:07:50 UTC (rev 380)
@@ -74,6 +74,7 @@
/* TODO add an option overwrite in gnac-prefs? */
static gboolean overwrite = FALSE;
static gboolean remember_overwrite = FALSE;
+gint nb_files_total;
guint nb_files_added;
GnacState state;
@@ -103,6 +104,8 @@
prev_state = state;
state = new_state;
+ g_object_get(G_OBJECT(converter), "nb-files", &nb_files_total, NULL);
+
gnac_file_list_update_cursor();
switch (state) {
@@ -741,7 +744,7 @@
{
gint total;
- g_object_get(converter, "nb-files", &total, NULL);
+ g_object_get(G_OBJECT(converter), "nb-files", &total, NULL);
gnac_ui_push_status(g_strdup_printf(_("Converting file %d of %d"),
nb_converted, total));
gnac_ui_set_progress_fraction(fraction);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bdu...@us...> - 2009-07-22 17:35:12
|
Revision: 379
http://gnac.svn.sourceforge.net/gnac/?rev=379&view=rev
Author: bdupasqu
Date: 2009-07-22 17:35:09 +0000 (Wed, 22 Jul 2009)
Log Message:
-----------
- Fix a piece of code preventing gnac from being compiled,
- Update some strings and translations.
Modified Paths:
--------------
trunk/data/gnac-properties-window.xml
trunk/libgnac/libgnac-converter.c
trunk/po/cs.po
trunk/po/de.po
trunk/po/fr.po
trunk/po/gnac.pot
trunk/po/he.po
trunk/po/it.po
trunk/po/ro.po
trunk/po/sv.po
trunk/src/gnac-prefs.c
trunk/src/gnac-ui.c
trunk/src/profiles/formats/gnac-profiles-lame.c
trunk/src/profiles/gnac-profiles-manager.c
Modified: trunk/data/gnac-properties-window.xml
===================================================================
--- trunk/data/gnac-properties-window.xml 2009-07-21 16:36:58 UTC (rev 378)
+++ trunk/data/gnac-properties-window.xml 2009-07-22 17:35:09 UTC (rev 379)
@@ -47,7 +47,7 @@
<object class="GtkLabel" id="label40">
<property name="visible">True</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">Title :</property>
+ <property name="label" translatable="yes">Title:</property>
</object>
<packing>
<property name="expand">False</property>
@@ -80,7 +80,7 @@
<object class="GtkLabel" id="label39">
<property name="visible">True</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">Artist :</property>
+ <property name="label" translatable="yes">Artist:</property>
</object>
<packing>
<property name="expand">False</property>
@@ -114,7 +114,7 @@
<object class="GtkLabel" id="label38">
<property name="visible">True</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">Album :</property>
+ <property name="label" translatable="yes">Album:</property>
</object>
<packing>
<property name="expand">False</property>
@@ -147,7 +147,7 @@
<object class="GtkLabel" id="label37">
<property name="visible">True</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">Genre :</property>
+ <property name="label" translatable="yes">Genre:</property>
</object>
<packing>
<property name="expand">False</property>
@@ -181,7 +181,7 @@
<object class="GtkLabel" id="label36">
<property name="visible">True</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">Comment :</property>
+ <property name="label" translatable="yes">Comment:</property>
</object>
<packing>
<property name="expand">False</property>
@@ -234,7 +234,7 @@
<object class="GtkLabel" id="label23">
<property name="visible">True</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">Track number :</property>
+ <property name="label" translatable="yes">Track number:</property>
</object>
<packing>
<property name="expand">False</property>
@@ -301,7 +301,7 @@
<object class="GtkLabel" id="label24">
<property name="visible">True</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">Disc number :</property>
+ <property name="label" translatable="yes">Disc number:</property>
</object>
<packing>
<property name="expand">False</property>
@@ -368,7 +368,7 @@
<object class="GtkLabel" id="label25">
<property name="visible">True</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">Year :</property>
+ <property name="label" translatable="yes">Year:</property>
</object>
<packing>
<property name="expand">False</property>
@@ -443,6 +443,7 @@
<property name="headers_visible">False</property>
<property name="headers_clickable">False</property>
<property name="enable_search">False</property>
+ <!--<property name="enable_grid_lines">vertical</property>-->
</object>
</child>
</object>
Modified: trunk/libgnac/libgnac-converter.c
===================================================================
--- trunk/libgnac/libgnac-converter.c 2009-07-21 16:36:58 UTC (rev 378)
+++ trunk/libgnac/libgnac-converter.c 2009-07-22 17:35:09 UTC (rev 379)
@@ -219,7 +219,7 @@
g_value_set_int(value, g_hash_table_size(self->priv->file_table));
break;
- default :
+ default:
/* We don't have any other property... */
G_OBJECT_WARN_INVALID_PROPERTY_ID(object, property_id, pspec);
break;
@@ -271,7 +271,7 @@
self->priv->extension = g_value_dup_string(value);
break;
- default :
+ default:
/* We don't have any other property... */
G_OBJECT_WARN_INVALID_PROPERTY_ID(object, property_id, pspec);
break;
Modified: trunk/po/cs.po
===================================================================
--- trunk/po/cs.po 2009-07-21 16:36:58 UTC (rev 378)
+++ trunk/po/cs.po 2009-07-22 17:35:09 UTC (rev 379)
@@ -7,8 +7,8 @@
msgstr ""
"Project-Id-Version: gnac\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-07-20 09:09+0200\n"
-"PO-Revision-Date: 2009-04-03 21:41+0100\n"
+"POT-Creation-Date: 2009-07-22 16:33+0200\n"
+"PO-Revision-Date: 2009-07-22 16:37+0200\n"
"Last-Translator: Luboš Staněk <lu...@us...>\n"
"Language-Team: Czech <tra...@li...>\n"
"MIME-Version: 1.0\n"
@@ -75,19 +75,16 @@
msgstr "<b>Informace o profilu</b>"
#: ../data/gnac-pref-window.xml.h:4
-#, fuzzy
msgid "Album"
-msgstr "Album :"
+msgstr "Album"
#: ../data/gnac-pref-window.xml.h:5
-#, fuzzy
msgid "Artist"
-msgstr "Umělec :"
+msgstr "Umělec"
#: ../data/gnac-pref-window.xml.h:6
-#, fuzzy
msgid "Artist - Album"
-msgstr "Umělec - Album - Název"
+msgstr "Umělec - Album"
#: ../data/gnac-pref-window.xml.h:7
msgid "Artist - Album - Title"
@@ -102,14 +99,12 @@
msgstr "Umělec – Název"
#: ../data/gnac-pref-window.xml.h:10
-#, fuzzy
msgid "Artist/Album"
-msgstr "Umělec - Album - Název"
+msgstr "Umělec/Album"
#: ../data/gnac-pref-window.xml.h:11
-#, fuzzy
msgid "Artist/Album (Year)"
-msgstr "Umělec - Album - Název"
+msgstr "Umělec/Album (Rok)"
#: ../data/gnac-pref-window.xml.h:12
#, fuzzy
@@ -198,44 +193,44 @@
msgstr "Název"
#: ../data/gnac-properties-window.xml.h:1
-msgid "Album :"
-msgstr "Album :"
+msgid "Album:"
+msgstr "Album:"
#: ../data/gnac-properties-window.xml.h:2
-msgid "Artist :"
-msgstr "Umělec :"
+msgid "Artist:"
+msgstr "Umělec:"
#: ../data/gnac-properties-window.xml.h:3
msgid "Basic"
msgstr "Základní"
#: ../data/gnac-properties-window.xml.h:4
-msgid "Comment :"
-msgstr "Poznámka :"
+msgid "Comment:"
+msgstr "Poznámka:"
#: ../data/gnac-properties-window.xml.h:5
-msgid "Disc number :"
-msgstr "Číslo disku :"
+msgid "Disc number:"
+msgstr "Číslo disku:"
#: ../data/gnac-properties-window.xml.h:6
-msgid "Genre :"
-msgstr "Žánr :"
+msgid "Genre:"
+msgstr "Žánr:"
#: ../data/gnac-properties-window.xml.h:7
msgid "Properties"
msgstr "Vlastnosti"
#: ../data/gnac-properties-window.xml.h:8
-msgid "Title :"
-msgstr "Název :"
+msgid "Title:"
+msgstr "Název:"
#: ../data/gnac-properties-window.xml.h:9
-msgid "Track number :"
-msgstr "Číslo stopy :"
+msgid "Track number:"
+msgstr "Číslo stopy:"
#: ../data/gnac-properties-window.xml.h:10
-msgid "Year :"
-msgstr "Rok :"
+msgid "Year:"
+msgstr "Rok:"
#: ../data/gnac-properties-window.xml.h:11
msgid "of"
@@ -914,9 +909,8 @@
msgstr "Selhalo vytvoření elementu %s"
#: ../libgnac/libgnac-metadata.c:723
-#, fuzzy
msgid "filename.ext"
-msgstr "Název souboru"
+msgstr ""
#: ../libgnac/libgnac-metadata.c:753
msgid "Converted by Gnac"
@@ -1042,7 +1036,7 @@
msgstr "Položka přípony nesmí být prázdná"
#. update the status bar
-#: ../src/gnac-bars.c:184
+#: ../src/gnac-bars.c:188
msgid "paused"
msgstr "pozastaveno"
@@ -1060,11 +1054,11 @@
msgid "Unable to set key: %s\n"
msgstr "Nelze nastavit klíč: %s\n"
-#: ../src/gnac-main.c:268
+#: ../src/gnac-main.c:272
msgid "Importing files..."
msgstr "Importuji soubory..."
-#: ../src/gnac-main.c:281
+#: ../src/gnac-main.c:285
#, c-format
msgid "%u file imported"
msgid_plural "%u files imported"
@@ -1072,88 +1066,88 @@
msgstr[1] "%u soubory importovány"
msgstr[2] "%u souborů importováno"
-#: ../src/gnac-main.c:301
+#: ../src/gnac-main.c:305
#, c-format
msgid "Impossible to launch thread to add files: %s\n"
msgstr "Není možné spustit vlákno přidání souborů: %s\n"
-#: ../src/gnac-main.c:329
+#: ../src/gnac-main.c:333
msgid "MPEG files (*.mp3)"
msgstr "Soubory MPEG (*.mp3)"
-#: ../src/gnac-main.c:330
+#: ../src/gnac-main.c:334
msgid "MPEG-4 files (*.aac, *.m4a, *.mp4)"
msgstr "Soubory MPEG-4 (*.aac, *.m4a, *.mp4)"
-#: ../src/gnac-main.c:331
+#: ../src/gnac-main.c:335
msgid "Musepack files (*.mpc)"
msgstr "Soubory Musepack (*.mpc)"
-#: ../src/gnac-main.c:332
+#: ../src/gnac-main.c:336
msgid "Ogg Vorbis files (*.ogg)"
msgstr "Soubory Ogg Vorbis (*.ogg)"
-#: ../src/gnac-main.c:333
+#: ../src/gnac-main.c:337
msgid "RealAudio files (*.ra)"
msgstr "Soubory RealAudio (*.ra)"
-#: ../src/gnac-main.c:334
+#: ../src/gnac-main.c:338
msgid "Speex files (*.spx)"
msgstr "Soubory Speex (*.spx)"
-#: ../src/gnac-main.c:335
+#: ../src/gnac-main.c:339
msgid "Windows Media files (*.wma)"
msgstr "Soubory Windows Media (*.wma)"
#. XXX the Monkey's Audio plug-in has not yet been ported
#. * to gstreamer-0.10
#. { "audio/x-ape" , _("Ape files (*.ape)") },
-#: ../src/gnac-main.c:343
+#: ../src/gnac-main.c:347
msgid "Flac files (*.flac)"
msgstr "Soubory Flac (*.flac)"
-#: ../src/gnac-main.c:344
+#: ../src/gnac-main.c:348
msgid "WAV files (*.wav)"
msgstr "Soubory WAV (*.wav)"
-#: ../src/gnac-main.c:349
+#: ../src/gnac-main.c:353
msgid "M3U playlists (*.m3u)"
msgstr "Seznamy skladeb M3U (*.m3u)"
-#: ../src/gnac-main.c:350
+#: ../src/gnac-main.c:354
msgid "PLS playlists (*.pls)"
msgstr "Seznamy skladeb PLS (*.pls)"
-#: ../src/gnac-main.c:351
+#: ../src/gnac-main.c:355
msgid "XSPF playlists (*.xspf)"
msgstr "Seznamy skladeb XSPF (*.xspf)"
-#: ../src/gnac-main.c:357
+#: ../src/gnac-main.c:361
msgid "All files (*.*)"
msgstr "Všechny soubory (*.*)"
-#: ../src/gnac-main.c:360
+#: ../src/gnac-main.c:364
msgid "All supported files"
msgstr "Všechny podporované soubory"
-#: ../src/gnac-main.c:378
+#: ../src/gnac-main.c:382
msgid "All playlists files"
msgstr "Všechny seznamy skladeb"
-#: ../src/gnac-main.c:393
+#: ../src/gnac-main.c:397
msgid "Lossless codecs"
msgstr "Bezztrátové kodeky"
-#: ../src/gnac-main.c:404
+#: ../src/gnac-main.c:408
msgid "Lossy codecs"
msgstr "Ztrátové kodeky"
-#: ../src/gnac-main.c:529
+#: ../src/gnac-main.c:533
#, c-format
msgid "Could not open link %s: %s\n"
msgstr ""
-#: ../src/gnac-main.c:558
+#: ../src/gnac-main.c:562
msgid ""
"A conversion is currently running...\n"
"Are you sure you want to quit?"
@@ -1161,50 +1155,50 @@
"Převod právě probíhá...\n"
"Opravdu chcete skončit?"
-#: ../src/gnac-main.c:680
+#: ../src/gnac-main.c:707
#, fuzzy, c-format
msgid ""
"File %s already exists...\n"
"Overwrite?"
msgstr "Soubor %s je již na seznamu"
-#: ../src/gnac-main.c:685
+#: ../src/gnac-main.c:712
msgid "Remember my decision"
msgstr ""
-#: ../src/gnac-main.c:720
+#: ../src/gnac-main.c:745
#, c-format
msgid "Converting file %d of %d"
msgstr "Převádím soubor %d z %d"
-#: ../src/gnac-main.c:738
+#: ../src/gnac-main.c:763
#, c-format
msgid "%s left"
msgstr "Zbývá %s"
-#: ../src/gnac-main.c:849 ../src/gnac-main.c:1065 ../src/gnac-main.c:1097
+#: ../src/gnac-main.c:874 ../src/gnac-main.c:1094 ../src/gnac-main.c:1126
#, c-format
msgid "Error: %s\n"
msgstr "Chyba: %s\n"
-#: ../src/gnac-main.c:881
+#: ../src/gnac-main.c:906
msgid "Conversion completed with errors"
msgstr "Převod byl dokončen s chybami!"
-#: ../src/gnac-main.c:883
+#: ../src/gnac-main.c:908
msgid "Conversion completed!"
msgstr "Převod byl dokončen!"
-#: ../src/gnac-main.c:900
+#: ../src/gnac-main.c:925
msgid "Conversion stopped"
msgstr "Převod byl zastaven!"
-#: ../src/gnac-main.c:913
+#: ../src/gnac-main.c:938
#, c-format
msgid "File not converted (%s)"
msgstr ""
-#: ../src/gnac-main.c:921
+#: ../src/gnac-main.c:946
#, c-format
msgid ""
"Gnac failed to convert file %s\n"
@@ -1213,20 +1207,20 @@
"Gnac selhal při převodu souboru %s\n"
" Chybová zpráva: %s\n"
-#: ../src/gnac-main.c:1021
+#: ../src/gnac-main.c:1046
msgid "Open a file..."
msgstr "Otevřít soubor.."
-#: ../src/gnac-main.c:1034
+#: ../src/gnac-main.c:1059
msgid "Close dialog on add"
msgstr "Zavřít dialog při přidání"
-#: ../src/gnac-main.c:1114
+#: ../src/gnac-main.c:1143
msgid "No help available yet"
msgstr "Nápověda dosud není dostupná"
#. Parse command line arguments
-#: ../src/gnac-main.c:1232
+#: ../src/gnac-main.c:1261
msgid "[URI...] - Convert your audio files"
msgstr "[URI...] - Převést vaše audio soubory"
@@ -1252,7 +1246,7 @@
" <b>\\%y:</b> year"
msgstr ""
-#: ../src/gnac-prefs.c:318 ../src/gnac-properties.c:407 ../src/gnac-ui.c:84
+#: ../src/gnac-prefs.c:326 ../src/gnac-properties.c:407 ../src/gnac-ui.c:84
#, c-format
msgid "Unable to read file: %s\n"
msgstr "Nelze číst soubor: %s\n"
@@ -1314,17 +1308,16 @@
msgstr ""
#: ../src/gnac-ui.c:498
-#, fuzzy
msgid "Hide"
-msgstr "Zobrazit/skrýt"
+msgstr "Skrýt"
#: ../src/gnac-ui.c:498
-#, fuzzy
msgid "Show"
-msgstr "Zobrazit/skrýt"
+msgstr "Zobrazit"
#: ../src/gnac-ui.c:566
-msgid "Cannot trash the file. Do you want to delete it immediately ?"
+#, fuzzy
+msgid "Cannot trash the file. Do you want to delete it immediately?"
msgstr "Soubor nelze hodit do koše. Chcete ho ihned smazat?"
#: ../src/gnac-ui.c:570
Modified: trunk/po/de.po
===================================================================
--- trunk/po/de.po 2009-07-21 16:36:58 UTC (rev 378)
+++ trunk/po/de.po 2009-07-22 17:35:09 UTC (rev 379)
@@ -2,8 +2,8 @@
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-07-20 09:09+0200\n"
-"PO-Revision-Date: \n"
+"POT-Creation-Date: 2009-07-22 16:33+0200\n"
+"PO-Revision-Date: 2009-07-22 16:33+0200\n"
"Last-Translator: Martin Lettner <m.l...@gm...>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -14,7 +14,7 @@
#: ../data/gnac.desktop.in.in.h:1 ../data/gnac.xml.h:2
msgid "An audio converter for GNOME"
-msgstr "Ein Audio-Konvertierer für GNOME"
+msgstr "Ein Audio-Konverter für GNOME"
#: ../data/gnac.schemas.in.h:1
msgid "Delete source files after conversion"
@@ -26,7 +26,7 @@
#: ../data/gnac.schemas.in.h:3
msgid "Folder hierarchy"
-msgstr ""
+msgstr "Ordner-Hierarchie"
#: ../data/gnac.schemas.in.h:4
msgid "Folder hierarchy pattern"
@@ -71,19 +71,16 @@
msgstr "<b>Profil-Informationen</b>"
#: ../data/gnac-pref-window.xml.h:4
-#, fuzzy
msgid "Album"
-msgstr "Album:"
+msgstr "Album"
#: ../data/gnac-pref-window.xml.h:5
-#, fuzzy
msgid "Artist"
-msgstr "Künstler:"
+msgstr "Künstler"
#: ../data/gnac-pref-window.xml.h:6
-#, fuzzy
msgid "Artist - Album"
-msgstr "Künstler - Album - Titel"
+msgstr "Künstler - Album"
#: ../data/gnac-pref-window.xml.h:7
msgid "Artist - Album - Title"
@@ -98,14 +95,12 @@
msgstr "Künstler - Titel"
#: ../data/gnac-pref-window.xml.h:10
-#, fuzzy
msgid "Artist/Album"
-msgstr "Künstler - Album - Titel"
+msgstr "Künstler/Album"
#: ../data/gnac-pref-window.xml.h:11
-#, fuzzy
msgid "Artist/Album (Year)"
-msgstr "Künstler - Album - Titel"
+msgstr "Künstler/Album (Jahr)"
#: ../data/gnac-pref-window.xml.h:12
msgid "Audio"
@@ -193,11 +188,11 @@
msgstr "Titel"
#: ../data/gnac-properties-window.xml.h:1
-msgid "Album :"
+msgid "Album:"
msgstr "Album:"
#: ../data/gnac-properties-window.xml.h:2
-msgid "Artist :"
+msgid "Artist:"
msgstr "Künstler:"
#: ../data/gnac-properties-window.xml.h:3
@@ -205,15 +200,15 @@
msgstr "Grundlegend"
#: ../data/gnac-properties-window.xml.h:4
-msgid "Comment :"
+msgid "Comment:"
msgstr "Kommentar:"
#: ../data/gnac-properties-window.xml.h:5
-msgid "Disc number :"
+msgid "Disc number:"
msgstr "CD-Nummer:"
#: ../data/gnac-properties-window.xml.h:6
-msgid "Genre :"
+msgid "Genre:"
msgstr "Genre:"
#: ../data/gnac-properties-window.xml.h:7
@@ -221,15 +216,15 @@
msgstr "Eigenschaften"
#: ../data/gnac-properties-window.xml.h:8
-msgid "Title :"
+msgid "Title:"
msgstr "Titel:"
#: ../data/gnac-properties-window.xml.h:9
-msgid "Track number :"
+msgid "Track number:"
msgstr "Titelnummer:"
#: ../data/gnac-properties-window.xml.h:10
-msgid "Year :"
+msgid "Year:"
msgstr "Jahr:"
#: ../data/gnac-properties-window.xml.h:11
@@ -260,6 +255,19 @@
"Gnac; if not, write to the Free Software Foundation, Inc., 51 Franklin St, "
"Fifth Floor, Boston, MA 02110-1301 USA\n"
msgstr ""
+"Gnac ist freie Software, Sie können das Programm weiter verteilen oder "
+"verändern unter Beachtung der GNU General Public License , so wie sie von "
+"der Free Software Foundation festgelegt wurde. Entweder in Version 2 der "
+"Lizenz oder (nach Ihrem Ermessen) in jeder späteren Version.\n"
+"\n"
+"Gnac wurde in der Hoffnung veröffentlicht, dass Sie es als nützlich "
+"empfinden, jedoch OHNE JEGLICHE GARANTIE AUF FUNKTIONSFÄHIGKEIT UND OHNE "
+"RECHTSANSPRUCH BEI FEHLERHAFTEM VERHALTEN DER SOFTWARE. Lesen Sie die GNU "
+"General Public License für weiterführende Informationen.\n"
+"\n"
+"Im Paket mit Gnac sollten Sie ebenfalls eine Kopie der GNU General Public "
+"License erhalten haben. Wenn nicht, schreiben Sie bitte an die Free Software "
+"Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA\n"
#: ../data/gnac.xml.h:10
msgid "Show/Hide"
@@ -656,7 +664,7 @@
#: ../data/profiles/mp3-lame.xml.in.h:16 ../data/profiles/speex.xml.in.h:7
#: ../data/profiles/vorbis.xml.in.h:3
msgid "Variable bitrate (VBR)"
-msgstr ""
+msgstr "Variable Bitrate (VBR)"
#: ../data/profiles/speex.xml.in.h:1
msgid "A codec optimized for high quality speech at low bit rate."
@@ -826,9 +834,8 @@
msgstr ""
#: ../libgnac/libgnac-metadata.c:723
-#, fuzzy
msgid "filename.ext"
-msgstr "Dateiname"
+msgstr ""
#: ../libgnac/libgnac-metadata.c:753
msgid "Converted by Gnac"
@@ -952,7 +959,7 @@
msgstr ""
#. update the status bar
-#: ../src/gnac-bars.c:184
+#: ../src/gnac-bars.c:188
msgid "paused"
msgstr "angehalten"
@@ -970,168 +977,168 @@
msgid "Unable to set key: %s\n"
msgstr ""
-#: ../src/gnac-main.c:268
+#: ../src/gnac-main.c:272
msgid "Importing files..."
msgstr ""
-#: ../src/gnac-main.c:281
+#: ../src/gnac-main.c:285
#, c-format
msgid "%u file imported"
msgid_plural "%u files imported"
msgstr[0] ""
msgstr[1] ""
-#: ../src/gnac-main.c:301
+#: ../src/gnac-main.c:305
#, c-format
msgid "Impossible to launch thread to add files: %s\n"
msgstr ""
-#: ../src/gnac-main.c:329
+#: ../src/gnac-main.c:333
msgid "MPEG files (*.mp3)"
msgstr ""
-#: ../src/gnac-main.c:330
+#: ../src/gnac-main.c:334
msgid "MPEG-4 files (*.aac, *.m4a, *.mp4)"
msgstr ""
-#: ../src/gnac-main.c:331
+#: ../src/gnac-main.c:335
msgid "Musepack files (*.mpc)"
msgstr ""
-#: ../src/gnac-main.c:332
+#: ../src/gnac-main.c:336
msgid "Ogg Vorbis files (*.ogg)"
msgstr ""
-#: ../src/gnac-main.c:333
+#: ../src/gnac-main.c:337
msgid "RealAudio files (*.ra)"
msgstr ""
-#: ../src/gnac-main.c:334
+#: ../src/gnac-main.c:338
msgid "Speex files (*.spx)"
msgstr ""
-#: ../src/gnac-main.c:335
+#: ../src/gnac-main.c:339
msgid "Windows Media files (*.wma)"
msgstr ""
#. XXX the Monkey's Audio plug-in has not yet been ported
#. * to gstreamer-0.10
#. { "audio/x-ape" , _("Ape files (*.ape)") },
-#: ../src/gnac-main.c:343
+#: ../src/gnac-main.c:347
msgid "Flac files (*.flac)"
msgstr ""
-#: ../src/gnac-main.c:344
+#: ../src/gnac-main.c:348
msgid "WAV files (*.wav)"
msgstr ""
-#: ../src/gnac-main.c:349
+#: ../src/gnac-main.c:353
msgid "M3U playlists (*.m3u)"
msgstr ""
-#: ../src/gnac-main.c:350
+#: ../src/gnac-main.c:354
msgid "PLS playlists (*.pls)"
msgstr ""
-#: ../src/gnac-main.c:351
+#: ../src/gnac-main.c:355
msgid "XSPF playlists (*.xspf)"
msgstr ""
-#: ../src/gnac-main.c:357
+#: ../src/gnac-main.c:361
msgid "All files (*.*)"
msgstr "Alle Dateien (*.*)"
-#: ../src/gnac-main.c:360
+#: ../src/gnac-main.c:364
msgid "All supported files"
msgstr "Alle unterstützten Dateien"
-#: ../src/gnac-main.c:378
+#: ../src/gnac-main.c:382
msgid "All playlists files"
msgstr "Alle Playlist-Dateien"
-#: ../src/gnac-main.c:393
+#: ../src/gnac-main.c:397
msgid "Lossless codecs"
msgstr "Verlustfreie Codecs"
-#: ../src/gnac-main.c:404
+#: ../src/gnac-main.c:408
msgid "Lossy codecs"
msgstr "Verlustbehaftete Codecs"
-#: ../src/gnac-main.c:529
+#: ../src/gnac-main.c:533
#, c-format
msgid "Could not open link %s: %s\n"
msgstr ""
-#: ../src/gnac-main.c:558
+#: ../src/gnac-main.c:562
msgid ""
"A conversion is currently running...\n"
"Are you sure you want to quit?"
msgstr ""
-#: ../src/gnac-main.c:680
+#: ../src/gnac-main.c:707
#, fuzzy, c-format
msgid ""
"File %s already exists...\n"
"Overwrite?"
msgstr "Datei %s befindet sich bereits in der Liste"
-#: ../src/gnac-main.c:685
+#: ../src/gnac-main.c:712
msgid "Remember my decision"
msgstr ""
-#: ../src/gnac-main.c:720
+#: ../src/gnac-main.c:745
#, c-format
msgid "Converting file %d of %d"
msgstr "Konvertiere Datei %d von %d"
-#: ../src/gnac-main.c:738
+#: ../src/gnac-main.c:763
#, c-format
msgid "%s left"
msgstr "%s verbleibend"
-#: ../src/gnac-main.c:849 ../src/gnac-main.c:1065 ../src/gnac-main.c:1097
+#: ../src/gnac-main.c:874 ../src/gnac-main.c:1094 ../src/gnac-main.c:1126
#, c-format
msgid "Error: %s\n"
msgstr "Fehler: %s\n"
-#: ../src/gnac-main.c:881
+#: ../src/gnac-main.c:906
msgid "Conversion completed with errors"
msgstr "Konvertierung beendet, mit Fehlern"
-#: ../src/gnac-main.c:883
+#: ../src/gnac-main.c:908
msgid "Conversion completed!"
msgstr "Konvertierung beendet!"
-#: ../src/gnac-main.c:900
+#: ../src/gnac-main.c:925
msgid "Conversion stopped"
msgstr "Konvertierung gestoppt"
-#: ../src/gnac-main.c:913
+#: ../src/gnac-main.c:938
#, c-format
msgid "File not converted (%s)"
msgstr ""
-#: ../src/gnac-main.c:921
+#: ../src/gnac-main.c:946
#, c-format
msgid ""
"Gnac failed to convert file %s\n"
" Error message: %s\n"
msgstr ""
-#: ../src/gnac-main.c:1021
+#: ../src/gnac-main.c:1046
msgid "Open a file..."
msgstr "Datei öffnen..."
-#: ../src/gnac-main.c:1034
+#: ../src/gnac-main.c:1059
msgid "Close dialog on add"
msgstr "Dialog nach dem Hinzufügen schließen"
-#: ../src/gnac-main.c:1114
+#: ../src/gnac-main.c:1143
msgid "No help available yet"
msgstr "Hilfe ist noch nicht verfügbar"
#. Parse command line arguments
-#: ../src/gnac-main.c:1232
+#: ../src/gnac-main.c:1261
msgid "[URI...] - Convert your audio files"
msgstr ""
@@ -1157,7 +1164,7 @@
" <b>\\%y:</b> year"
msgstr ""
-#: ../src/gnac-prefs.c:318 ../src/gnac-properties.c:407 ../src/gnac-ui.c:84
+#: ../src/gnac-prefs.c:326 ../src/gnac-properties.c:407 ../src/gnac-ui.c:84
#, c-format
msgid "Unable to read file: %s\n"
msgstr "Datei kann nicht gelesen werden: %s\n"
@@ -1218,17 +1225,15 @@
msgstr ""
#: ../src/gnac-ui.c:498
-#, fuzzy
msgid "Hide"
-msgstr "Zeigen/Verstecken"
+msgstr "Verstecken"
#: ../src/gnac-ui.c:498
-#, fuzzy
msgid "Show"
-msgstr "Zeigen/Verstecken"
+msgstr "Zeigen"
#: ../src/gnac-ui.c:566
-msgid "Cannot trash the file. Do you want to delete it immediately ?"
+msgid "Cannot trash the file. Do you want to delete it immediately?"
msgstr ""
#: ../src/gnac-ui.c:570
Modified: trunk/po/fr.po
===================================================================
--- trunk/po/fr.po 2009-07-21 16:36:58 UTC (rev 378)
+++ trunk/po/fr.po 2009-07-22 17:35:09 UTC (rev 379)
@@ -9,9 +9,9 @@
msgstr ""
"Project-Id-Version: Gnac 0.2-svn\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-07-20 09:09+0200\n"
-"PO-Revision-Date: 2009-07-19 17:25+0200\n"
-"Last-Translator: David Joaquim <dav...@gm...>\n"
+"POT-Creation-Date: 2009-07-22 16:33+0200\n"
+"PO-Revision-Date: 2009-07-22 13:56+0200\n"
+"Last-Translator: Benoit Dupasquier <bdu...@us...>\n"
"Language-Team: French <bdu...@us...>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -28,7 +28,7 @@
#: ../data/gnac.schemas.in.h:2
msgid "Display a tray icon during the conversion"
-msgstr "Afficher une icone de notification durant la conversion"
+msgstr "Afficher une icône de notification durant la conversion"
#: ../data/gnac.schemas.in.h:3
msgid "Folder hierarchy"
@@ -124,7 +124,7 @@
#: ../data/gnac-pref-window.xml.h:16
msgid "Display notification icon during conversion"
-msgstr "Afficher une icone de notification durant la conversion"
+msgstr "Afficher une icône de notification durant la conversion"
#: ../data/gnac-pref-window.xml.h:17
msgid "Folder hierarchy:"
@@ -160,15 +160,15 @@
#: ../data/gnac-pref-window.xml.h:25
msgid "Output filename:"
-msgstr "Noms des fichiers convertis"
+msgstr "Noms des fichiers convertis:"
#: ../data/gnac-pref-window.xml.h:26
msgid "Output folder:"
-msgstr "Dossier de sortie"
+msgstr "Dossier de sortie:"
#: ../data/gnac-pref-window.xml.h:27
msgid "Same folder as source"
-msgstr "Dans le même dossier que la source"
+msgstr "Même dossier que la source"
#: ../data/gnac-pref-window.xml.h:28
msgid "Source Filename"
@@ -184,18 +184,18 @@
#: ../data/gnac-pref-window.xml.h:31
msgid "Subfolder name:"
-msgstr "Nom du sous-dossier"
+msgstr "Nom du sous-dossier:"
#: ../data/gnac-pref-window.xml.h:32
msgid "Title"
msgstr "Titre"
#: ../data/gnac-properties-window.xml.h:1
-msgid "Album :"
+msgid "Album:"
msgstr "Album:"
#: ../data/gnac-properties-window.xml.h:2
-msgid "Artist :"
+msgid "Artist:"
msgstr "Artiste:"
#: ../data/gnac-properties-window.xml.h:3
@@ -203,15 +203,15 @@
msgstr "Basiques"
#: ../data/gnac-properties-window.xml.h:4
-msgid "Comment :"
+msgid "Comment:"
msgstr "Commentaire:"
#: ../data/gnac-properties-window.xml.h:5
-msgid "Disc number :"
+msgid "Disc number:"
msgstr "Numéro du disque:"
#: ../data/gnac-properties-window.xml.h:6
-msgid "Genre :"
+msgid "Genre:"
msgstr "Genre:"
#: ../data/gnac-properties-window.xml.h:7
@@ -219,15 +219,15 @@
msgstr "Propriétés"
#: ../data/gnac-properties-window.xml.h:8
-msgid "Title :"
+msgid "Title:"
msgstr "Titre:"
#: ../data/gnac-properties-window.xml.h:9
-msgid "Track number :"
+msgid "Track number:"
msgstr "Numéro de piste:"
#: ../data/gnac-properties-window.xml.h:10
-msgid "Year :"
+msgid "Year:"
msgstr "Année:"
#: ../data/gnac-properties-window.xml.h:11
@@ -1033,7 +1033,7 @@
msgstr "Le champs définissant l'extension ne doit pas être vide"
#. update the status bar
-#: ../src/gnac-bars.c:184
+#: ../src/gnac-bars.c:188
msgid "paused"
msgstr "suspendu"
@@ -1051,100 +1051,100 @@
msgid "Unable to set key: %s\n"
msgstr "Echec lors de l'application de la clé: %s\n"
-#: ../src/gnac-main.c:268
+#: ../src/gnac-main.c:272
msgid "Importing files..."
msgstr "Importation des fichiers..."
-#: ../src/gnac-main.c:281
+#: ../src/gnac-main.c:285
#, c-format
msgid "%u file imported"
msgid_plural "%u files imported"
msgstr[0] "%u fichier importé"
msgstr[1] "%u fichiers importés"
-#: ../src/gnac-main.c:301
+#: ../src/gnac-main.c:305
#, c-format
msgid "Impossible to launch thread to add files: %s\n"
msgstr ""
"Impossible de lancer le thread collectant les fichiers à importer: %s\n"
-#: ../src/gnac-main.c:329
+#: ../src/gnac-main.c:333
msgid "MPEG files (*.mp3)"
msgstr "Fichiers MPEG (*.mp3)"
-#: ../src/gnac-main.c:330
+#: ../src/gnac-main.c:334
msgid "MPEG-4 files (*.aac, *.m4a, *.mp4)"
msgstr "Fichiers MPEG-4 (*.aac, *.m4a, *.mp4)"
-#: ../src/gnac-main.c:331
+#: ../src/gnac-main.c:335
msgid "Musepack files (*.mpc)"
msgstr "Fichiers Musepack (*.mpc)"
-#: ../src/gnac-main.c:332
+#: ../src/gnac-main.c:336
msgid "Ogg Vorbis files (*.ogg)"
msgstr "Fichiers Ogg Vorbis (*.ogg)"
-#: ../src/gnac-main.c:333
+#: ../src/gnac-main.c:337
msgid "RealAudio files (*.ra)"
msgstr "Fichiers RealAudio (*.ra)"
-#: ../src/gnac-main.c:334
+#: ../src/gnac-main.c:338
msgid "Speex files (*.spx)"
msgstr "Fichiers Speex (*.spx)"
-#: ../src/gnac-main.c:335
+#: ../src/gnac-main.c:339
msgid "Windows Media files (*.wma)"
msgstr "Fichiers Windows Media (*.wma)"
#. XXX the Monkey's Audio plug-in has not yet been ported
#. * to gstreamer-0.10
#. { "audio/x-ape" , _("Ape files (*.ape)") },
-#: ../src/gnac-main.c:343
+#: ../src/gnac-main.c:347
msgid "Flac files (*.flac)"
msgstr "Fichiers Flac (*.flac)"
-#: ../src/gnac-main.c:344
+#: ../src/gnac-main.c:348
msgid "WAV files (*.wav)"
msgstr "Fichiers WAV (*.wav)"
-#: ../src/gnac-main.c:349
+#: ../src/gnac-main.c:353
msgid "M3U playlists (*.m3u)"
msgstr "Listes de lecture M3U (*.m3u)"
-#: ../src/gnac-main.c:350
+#: ../src/gnac-main.c:354
msgid "PLS playlists (*.pls)"
msgstr "Listes de lecture PLS (*.pls)"
-#: ../src/gnac-main.c:351
+#: ../src/gnac-main.c:355
msgid "XSPF playlists (*.xspf)"
msgstr "Listes de lecture XSPF (*.xspf)"
-#: ../src/gnac-main.c:357
+#: ../src/gnac-main.c:361
msgid "All files (*.*)"
msgstr "Tous les fichiers (*.*)"
-#: ../src/gnac-main.c:360
+#: ../src/gnac-main.c:364
msgid "All supported files"
msgstr "Fichiers pris en charge"
-#: ../src/gnac-main.c:378
+#: ../src/gnac-main.c:382
msgid "All playlists files"
msgstr "Toutes les listes de lecture"
-#: ../src/gnac-main.c:393
+#: ../src/gnac-main.c:397
msgid "Lossless codecs"
msgstr "Codecs sans pertes"
-#: ../src/gnac-main.c:404
+#: ../src/gnac-main.c:408
msgid "Lossy codecs"
msgstr "Codecs avec pertes"
-#: ../src/gnac-main.c:529
+#: ../src/gnac-main.c:533
#, c-format
msgid "Could not open link %s: %s\n"
msgstr "Impossible d'ouvrir le lien %s: %s\n"
-#: ../src/gnac-main.c:558
+#: ../src/gnac-main.c:562
msgid ""
"A conversion is currently running...\n"
"Are you sure you want to quit?"
@@ -1152,7 +1152,7 @@
"Une conversion est en cours...\n"
"Êtes-vous sûr de vouloir quitter?"
-#: ../src/gnac-main.c:680
+#: ../src/gnac-main.c:707
#, c-format
msgid ""
"File %s already exists...\n"
@@ -1161,43 +1161,43 @@
"Le fichier %s existe déjà...\n"
"L'écraser?"
-#: ../src/gnac-main.c:685
+#: ../src/gnac-main.c:712
msgid "Remember my decision"
msgstr "Se souvenir de ma décision"
-#: ../src/gnac-main.c:720
+#: ../src/gnac-main.c:745
#, c-format
msgid "Converting file %d of %d"
msgstr "Conversion du fichier %d sur %d"
-#: ../src/gnac-main.c:738
+#: ../src/gnac-main.c:763
#, c-format
msgid "%s left"
msgstr "%s restantes"
-#: ../src/gnac-main.c:849 ../src/gnac-main.c:1065 ../src/gnac-main.c:1097
+#: ../src/gnac-main.c:874 ../src/gnac-main.c:1094 ../src/gnac-main.c:1126
#, c-format
msgid "Error: %s\n"
msgstr "Erreur: %s\n"
-#: ../src/gnac-main.c:881
+#: ../src/gnac-main.c:906
msgid "Conversion completed with errors"
msgstr "Conversion terminée avec des erreurs"
-#: ../src/gnac-main.c:883
+#: ../src/gnac-main.c:908
msgid "Conversion completed!"
msgstr "Conversion terminée"
-#: ../src/gnac-main.c:900
+#: ../src/gnac-main.c:925
msgid "Conversion stopped"
msgstr "Conversion interrompue!"
-#: ../src/gnac-main.c:913
+#: ../src/gnac-main.c:938
#, c-format
msgid "File not converted (%s)"
msgstr "Fichier non converti (%s)"
-#: ../src/gnac-main.c:921
+#: ../src/gnac-main.c:946
#, c-format
msgid ""
"Gnac failed to convert file %s\n"
@@ -1206,20 +1206,20 @@
"Echec lors de la conversion du fichier %s\n"
" Message d'erreur: %s\n"
-#: ../src/gnac-main.c:1021
+#: ../src/gnac-main.c:1046
msgid "Open a file..."
msgstr "Ouvrir un fichier..."
-#: ../src/gnac-main.c:1034
+#: ../src/gnac-main.c:1059
msgid "Close dialog on add"
msgstr "Fermer la fenêtre après l'ajout"
-#: ../src/gnac-main.c:1114
+#: ../src/gnac-main.c:1143
msgid "No help available yet"
msgstr "Aucune aide disponible pour le moment"
#. Parse command line arguments
-#: ../src/gnac-main.c:1232
+#: ../src/gnac-main.c:1261
msgid "[URI...] - Convert your audio files"
msgstr "[URI...] - Convertissez vos fichiers audio"
@@ -1257,7 +1257,7 @@
" <b>\\%n:</b> nombre de piste\n"
" <b>\\%y:</b> année"
-#: ../src/gnac-prefs.c:318 ../src/gnac-properties.c:407 ../src/gnac-ui.c:84
+#: ../src/gnac-prefs.c:326 ../src/gnac-properties.c:407 ../src/gnac-ui.c:84
#, c-format
msgid "Unable to read file: %s\n"
msgstr "Echec lors de la lecture du fichier: %s\n"
@@ -1328,7 +1328,7 @@
msgstr "Afficher"
#: ../src/gnac-ui.c:566
-msgid "Cannot trash the file. Do you want to delete it immediately ?"
+msgid "Cannot trash the file. Do you want to delete it immediately?"
msgstr ""
"Echec lors du déplacement du fichier dans la corbeille. Voulez-vous le "
"supprimer immédiatement?"
Modified: trunk/po/gnac.pot
===================================================================
--- trunk/po/gnac.pot 2009-07-21 16:36:58 UTC (rev 378)
+++ trunk/po/gnac.pot 2009-07-22 17:35:09 UTC (rev 379)
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-07-20 09:09+0200\n"
+"POT-Creation-Date: 2009-07-22 16:33+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL...@li...>\n"
@@ -190,11 +190,11 @@
msgstr ""
#: ../data/gnac-properties-window.xml.h:1
-msgid "Album :"
+msgid "Album:"
msgstr ""
#: ../data/gnac-properties-window.xml.h:2
-msgid "Artist :"
+msgid "Artist:"
msgstr ""
#: ../data/gnac-properties-window.xml.h:3
@@ -202,15 +202,15 @@
msgstr ""
#: ../data/gnac-properties-window.xml.h:4
-msgid "Comment :"
+msgid "Comment:"
msgstr ""
#: ../data/gnac-properties-window.xml.h:5
-msgid "Disc number :"
+msgid "Disc number:"
msgstr ""
#: ../data/gnac-properties-window.xml.h:6
-msgid "Genre :"
+msgid "Genre:"
msgstr ""
#: ../data/gnac-properties-window.xml.h:7
@@ -218,15 +218,15 @@
msgstr ""
#: ../data/gnac-properties-window.xml.h:8
-msgid "Title :"
+msgid "Title:"
msgstr ""
#: ../data/gnac-properties-window.xml.h:9
-msgid "Track number :"
+msgid "Track number:"
msgstr ""
#: ../data/gnac-properties-window.xml.h:10
-msgid "Year :"
+msgid "Year:"
msgstr ""
#: ../data/gnac-properties-window.xml.h:11
@@ -948,7 +948,7 @@
msgstr ""
#. update the status bar
-#: ../src/gnac-bars.c:184
+#: ../src/gnac-bars.c:188
msgid "paused"
msgstr ""
@@ -966,168 +966,168 @@
msgid "Unable to set key: %s\n"
msgstr ""
-#: ../src/gnac-main.c:268
+#: ../src/gnac-main.c:272
msgid "Importing files..."
msgstr ""
-#: ../src/gnac-main.c:281
+#: ../src/gnac-main.c:285
#, c-format
msgid "%u file imported"
msgid_plural "%u files imported"
msgstr[0] ""
msgstr[1] ""
-#: ../src/gnac-main.c:301
+#: ../src/gnac-main.c:305
#, c-format
msgid "Impossible to launch thread to add files: %s\n"
msgstr ""
-#: ../src/gnac-main.c:329
+#: ../src/gnac-main.c:333
msgid "MPEG files (*.mp3)"
msgstr ""
-#: ../src/gnac-main.c:330
+#: ../src/gnac-main.c:334
msgid "MPEG-4 files (*.aac, *.m4a, *.mp4)"
msgstr ""
-#: ../src/gnac-main.c:331
+#: ../src/gnac-main.c:335
msgid "Musepack files (*.mpc)"
msgstr ""
-#: ../src/gnac-main.c:332
+#: ../src/gnac-main.c:336
msgid "Ogg Vorbis files (*.ogg)"
msgstr ""
-#: ../src/gnac-main.c:333
+#: ../src/gnac-main.c:337
msgid "RealAudio files (*.ra)"
msgstr ""
-#: ../src/gnac-main.c:334
+#: ../src/gnac-main.c:338
msgid "Speex files (*.spx)"
msgstr ""
-#: ../src/gnac-main.c:335
+#: ../src/gnac-main.c:339
msgid "Windows Media files (*.wma)"
msgstr ""
#. XXX the Monkey's Audio plug-in has not yet been ported
#. * to gstreamer-0.10
#. { "audio/x-ape" , _("Ape files (*.ape)") },
-#: ../src/gnac-main.c:343
+#: ../src/gnac-main.c:347
msgid "Flac files (*.flac)"
msgstr ""
-#: ../src/gnac-main.c:344
+#: ../src/gnac-main.c:348
msgid "WAV files (*.wav)"
msgstr ""
-#: ../src/gnac-main.c:349
+#: ../src/gnac-main.c:353
msgid "M3U playlists (*.m3u)"
msgstr ""
-#: ../src/gnac-main.c:350
+#: ../src/gnac-main.c:354
msgid "PLS playlists (*.pls)"
msgstr ""
-#: ../src/gnac-main.c:351
+#: ../src/gnac-main.c:355
msgid "XSPF playlists (*.xspf)"
msgstr ""
-#: ../src/gnac-main.c:357
+#: ../src/gnac-main.c:361
msgid "All files (*.*)"
msgstr ""
-#: ../src/gnac-main.c:360
+#: ../src/gnac-main.c:364
msgid "All supported files"
msgstr ""
-#: ../src/gnac-main.c:378
+#: ../src/gnac-main.c:382
msgid "All playlists files"
msgstr ""
-#: ../src/gnac-main.c:393
+#: ../src/gnac-main.c:397
msgid "Lossless codecs"
msgstr ""
-#: ../src/gnac-main.c:404
+#: ../src/gnac-main.c:408
msgid "Lossy codecs"
msgstr ""
-#: ../src/gnac-main.c:529
+#: ../src/gnac-main.c:533
#, c-format
msgid "Could not open link %s: %s\n"
msgstr ""
-#: ../src/gnac-main.c:558
+#: ../src/gnac-main.c:562
msgid ""
"A conversion is currently running...\n"
"Are you sure you want to quit?"
msgstr ""
-#: ../src/gnac-main.c:680
+#: ../src/gnac-main.c:707
#, c-format
msgid ""
"File %s already exists...\n"
"Overwrite?"
msgstr ""
-#: ../src/gnac-main.c:685
+#: ../src/gnac-main.c:712
msgid "Remember my decision"
msgstr ""
-#: ../src/gnac-main.c:720
+#: ../src/gnac-main.c:745
#, c-format
msgid "Converting file %d of %d"
msgstr ""
-#: ../src/gnac-main.c:738
+#: ../src/gnac-main.c:763
#, c-format
msgid "%s left"
msgstr ""
-#: ../src/gnac-main.c:849 ../src/gnac-main.c:1065 ../src/gnac-main.c:1097
+#: ../src/gnac-main.c:874 ../src/gnac-main.c:1094 ../src/gnac-main.c:1126
#, c-format
msgid "Error: %s\n"
msgstr ""
-#: ../src/gnac-main.c:881
+#: ../src/gnac-main.c:906
msgid "Conversion completed with errors"
msgstr ""
-#: ../src/gnac-main.c:883
+#: ../src/gnac-main.c:908
msgid "Conversion completed!"
msgstr ""
-#: ../src/gnac-main.c:900
+#: ../src/gnac-main.c:925
msgid "Conversion stopped"
msgstr ""
-#: ../src/gnac-main.c:913
+#: ../src/gnac-main.c:938
#, c-format
msgid "File not converted (%s)"
msgstr ""
-#: ../src/gnac-main.c:921
+#: ../src/gnac-main.c:946
#, c-format
msgid ""
"Gnac failed to convert file %s\n"
" Error message: %s\n"
msgstr ""
-#: ../src/gnac-main.c:1021
+#: ../src/gnac-main.c:1046
msgid "Open a file..."
msgstr ""
-#: ../src/gnac-main.c:1034
+#: ../src/gnac-main.c:1059
msgid "Close dialog on add"
msgstr ""
-#: ../src/gnac-main.c:1114
+#: ../src/gnac-main.c:1143
msgid "No help available yet"
msgstr ""
#. Parse command line arguments
-#: ../src/gnac-main.c:1232
+#: ../src/gnac-main.c:1261
msgid "[URI...] - Convert your audio files"
msgstr ""
@@ -1153,7 +1153,7 @@
" <b>\\%y:</b> year"
msgstr ""
-#: ../src/gnac-prefs.c:318 ../src/gnac-properties.c:407 ../src/gnac-ui.c:84
+#: ../src/gnac-prefs.c:326 ../src/gnac-properties.c:407 ../src/gnac-ui.c:84
#, c-format
msgid "Unable to read file: %s\n"
msgstr ""
@@ -1222,7 +1222,7 @@
msgstr ""
#: ../src/gnac-ui.c:566
-msgid "Cannot trash the file. Do you want to delete it immediately ?"
+msgid "Cannot trash the file. Do you want to delete it immediately?"
msgstr ""
#: ../src/gnac-ui.c:570
Modified: trunk/po/he.po
===================================================================
--- trunk/po/he.po 2009-07-21 16:36:58 UTC (rev 378)
+++ trunk/po/he.po 2009-07-22 17:35:09 UTC (rev 379)
@@ -7,14 +7,14 @@
msgstr ""
"Project-Id-Version: Gnac-0.2-svn\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-07-20 09:09+0200\n"
-"PO-Revision-Date: 2009-04-05 12:33+0100\n"
+"POT-Creation-Date: 2009-07-22 16:33+0200\n"
+"PO-Revision-Date: 2009-07-22 16:47+0200\n"
"Last-Translator: David Joaquim <dav...@gm...>\n"
"Language-Team: LANGUAGE <LL...@li...>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
"X-Poedit-Language: Hebrew\n"
#: ../data/gnac.desktop.in.in.h:1 ../data/gnac.xml.h:2
@@ -200,12 +200,12 @@
#: ../data/gnac-properties-window.xml.h:1
#, fuzzy
-msgid "Album :"
+msgid "Album:"
msgstr "<b>אלבום:</b>"
#: ../data/gnac-properties-window.xml.h:2
#, fuzzy
-msgid "Artist :"
+msgid "Artist:"
msgstr "אמן - אלבום"
#: ../data/gnac-properties-window.xml.h:3
@@ -214,17 +214,17 @@
#: ../data/gnac-properties-window.xml.h:4
#, fuzzy
-msgid "Comment :"
+msgid "Comment:"
msgstr "<b>המרה</b>"
#: ../data/gnac-properties-window.xml.h:5
#, fuzzy
-msgid "Disc number :"
+msgid "Disc number:"
msgstr "<b>מספר תקליטור:</b>"
#: ../data/gnac-properties-window.xml.h:6
#, fuzzy
-msgid "Genre :"
+msgid "Genre:"
msgstr "<b>סגנון:</b>"
#: ../data/gnac-properties-window.xml.h:7
@@ -233,16 +233,16 @@
#: ../data/gnac-properties-window.xml.h:8
#, fuzzy
-msgid "Title :"
+msgid "Title:"
msgstr "כותרת"
#: ../data/gnac-properties-window.xml.h:9
#, fuzzy
-msgid "Track number :"
+msgid "Track number:"
msgstr "<b>מספר רצועה:</b>"
#: ../data/gnac-properties-window.xml.h:10
-msgid "Year :"
+msgid "Year:"
msgstr ""
#: ../data/gnac-properties-window.xml.h:11
@@ -873,9 +873,8 @@
msgstr "יצירת מקודד נכשלה"
#: ../libgnac/libgnac-metadata.c:723
-#, fuzzy
msgid "filename.ext"
-msgstr "שם קובץ המקור"
+msgstr ""
#: ../libgnac/libgnac-metadata.c:753
msgid "Converted by Gnac"
@@ -1005,7 +1004,7 @@
msgstr ""
#. update the status bar
-#: ../src/gnac-bars.c:184
+#: ../src/gnac-bars.c:188
msgid "paused"
msgstr ""
@@ -1023,174 +1022,173 @@
msgid "Unable to set key: %s\n"
msgstr "לא ניתן לפתוח את הקובץ %s\n"
-#: ../src/gnac-main.c:268
+#: ../src/gnac-main.c:272
#, fuzzy
msgid "Importing files..."
msgstr "פתיחת קובץ..."
-#: ../src/gnac-main.c:281
+#: ../src/gnac-main.c:285
#, c-format
msgid "%u file imported"
msgid_plural "%u files imported"
msgstr[0] ""
msgstr[1] ""
-#: ../src/gnac-main.c:301
+#: ../src/gnac-main.c:305
#, fuzzy, c-format
msgid "Impossible to launch thread to add files: %s\n"
msgstr "לא ניתן לפתוח את הקובץ %s\n"
-#: ../src/gnac-main.c:329
+#: ../src/gnac-main.c:333
msgid "MPEG files (*.mp3)"
msgstr "קבצי MPEG (*.mp3)"
-#: ../src/gnac-main.c:330
+#: ../src/gnac-main.c:334
msgid "MPEG-4 files (*.aac, *.m4a, *.mp4)"
msgstr "קבצי MPEG-4 (*.aac, *.m4a, *.mp4)"
-#: ../src/gnac-main.c:331
+#: ../src/gnac-main.c:335
msgid "Musepack files (*.mpc)"
msgstr "קבצי Musepack (*.mpc)"
-#: ../src/gnac-main.c:332
+#: ../src/gnac-main.c:336
msgid "Ogg Vorbis files (*.ogg)"
msgstr "קבצי Ogg Vorbis (*.ogg)"
-#: ../src/gnac-main.c:333
+#: ../src/gnac-main.c:337
msgid "RealAudio files (*.ra)"
msgstr "קבצי RealAudio (*.ra)"
-#: ../src/gnac-main.c:334
-#, fuzzy
+#: ../src/gnac-main.c:338
msgid "Speex files (*.spx)"
-msgstr "קבצי MPEG (*.mp3)"
+msgstr ""
-#: ../src/gnac-main.c:335
+#: ../src/gnac-main.c:339
msgid "Windows Media files (*.wma)"
msgstr "קבצי Windows Media (*.wma)"
#. XXX the Monkey's Audio plug-in has not yet been ported
#. * to gstreamer-0.10
#. { "audio/x-ape" , _("Ape files (*.ape)") },
-#: ../src/gnac-main.c:343
+#: ../src/gnac-main.c:347
msgid "Flac files (*.flac)"
msgstr "קבצי Flac (*.flac)"
-#: ../src/gnac-main.c:344
+#: ../src/gnac-main.c:348
msgid "WAV files (*.wav)"
msgstr "קבצי WAV (*.wav)"
-#: ../src/gnac-main.c:349
+#: ../src/gnac-main.c:353
msgid "M3U playlists (*.m3u)"
msgstr "רשימות השמעה מסוג M3U (*.m3u)"
-#: ../src/gnac-main.c:350
+#: ../src/gnac-main.c:354
msgid "PLS playlists (*.pls)"
msgstr "רשימות השמעה מסוג PLS (*.pls)"
-#: ../src/gnac-main.c:351
+#: ../src/gnac-main.c:355
msgid "XSPF playlists (*.xspf)"
msgstr "רשימות השמעה מסוג XSPF (*.xspf)"
-#: ../src/gnac-main.c:357
+#: ../src/gnac-main.c:361
msgid "All files (*.*)"
msgstr "כל הקבצים (*.*)"
-#: ../src/gnac-main.c:360
+#: ../src/gnac-main.c:364
msgid "All supported files"
msgstr "כל הקבצים הנתמכים"
-#: ../src/gnac-main.c:378
+#: ../src/gnac-main.c:382
msgid "All playlists files"
msgstr "כל סוגי רשימות ההשמעה"
-#: ../src/gnac-main.c:393
+#: ../src/gnac-main.c:397
msgid "Lossless codecs"
msgstr ""
-#: ../src/gnac-main.c:404
+#: ../src/gnac-main.c:408
msgid "Lossy codecs"
msgstr ""
-#: ../src/gnac-main.c:529
+#: ../src/gnac-main.c:533
#, c-format
msgid "Could not open link %s: %s\n"
msgstr ""
-#: ../src/gnac-main.c:558
+#: ../src/gnac-main.c:562
#, fuzzy
msgid ""
"A conversion is currently running...\n"
"Are you sure you want to quit?"
msgstr "תהליך ההמרה מתבצע כעת..."
-#: ../src/gnac-main.c:680
+#: ../src/gnac-main.c:707
#, c-format
msgid ""
"File %s already exists...\n"
"Overwrite?"
msgstr ""
-#: ../src/gnac-main.c:685
+#: ../src/gnac-main.c:712
msgid "Remember my decision"
msgstr ""
-#: ../src/gnac-main.c:720
+#: ../src/gnac-main.c:745
#, c-format
msgid "Converting file %d of %d"
msgstr ""
-#: ../src/gnac-main.c:738
+#: ../src/gnac-main.c:763
#, c-format
msgid "%s left"
msgstr ""
-#: ../src/gnac-main.c:849 ../src/gnac-main.c:1065 ../src/gnac-main.c:1097
+#: ../src/gnac-main.c:874 ../src/gnac-main.c:1094 ../src/gnac-main.c:1126
#, c-format
msgid "Error: %s\n"
msgstr ""
-#: ../src/gnac-main.c:881
+#: ../src/gnac-main.c:906
#, fuzzy
msgid "Conversion completed with errors"
msgstr "ההמרה הופסקה!"
-#: ../src/gnac-main.c:883
+#: ../src/gnac-main.c:908
#, fuzzy
msgid "Conversion completed!"
msgstr "ההמרה הופסקה!"
-#: ../src/gnac-main.c:900
+#: ../src/gnac-main.c:925
#, fuzzy
msgid "Conversion stopped"
msgstr "ההמרה הופסקה!"
-#: ../src/gnac-main.c:913
+#: ../src/gnac-main.c:938
#, c-format
msgid "File not converted (%s)"
msgstr ""
-#: ../src/gnac-main.c:921
+#: ../src/gnac-main.c:946
#, c-format
msgid ""
"Gnac failed to convert file %s\n"
" Error message: %s\n"
msgstr ""
-#: ../src/gnac-main.c:1021
+#: ../src/gnac-main.c:1046
msgid "Open a file..."
msgstr "פתיחת קובץ..."
-#: ../src/gnac-main.c:1034
+#: ../src/gnac-main.c:1059
msgid "Close dialog on add"
msgstr "סגור חלון לאחר הוספה"
-#: ../src/gnac-main.c:1114
+#: ../src/gnac-main.c:1143
msgid "No help available yet"
msgstr "אין עזרה זמינה כרגע"
#. Parse command line arguments
-#: ../src/gnac-main.c:1232
+#: ../src/gnac-main.c:1261
msgid "[URI...] - Convert your audio files"
msgstr "[URI...] - המר את קבצי השמע שלך"
@@ -1216,7 +1214,7 @@
" <b>\\%y:</b> year"
msgstr ""
-#: ../src/gnac-prefs.c:318 ../src/gnac-properties.c:407 ../src/gnac-ui.c:84
+#: ../src/gnac-prefs.c:326 ../src/gnac-properties.c:407 ../src/gnac-ui.c:84
#, fuzzy, c-format
msgid "Unable to read file: %s\n"
msgstr "לא ניתן לפתוח את הקובץ %s\n"
@@ -1278,24 +1276,18 @@
msgstr ""
#: ../src/gnac-ui.c:498
-#, fuzzy
msgid "Hide"
-msgstr "הצג/הסתר"
+msgstr "הסתר"
#: ../src/gnac-ui.c:498
-#, fuzzy
msgid "Show"
-msgstr "הצג/הסתר"
+msgstr "הצג"
#: ../src/gnac-ui.c:566
-msgid "Cannot trash the file. Do you want to delete it immediately ?"
+msgid "Cannot trash the file. Do you want to delete it immediately?"
msgstr ""
#: ../src/gnac-ui.c:570
#, c-format
msgid "Cannot trash file %s"
msgstr ""
-
-#, fuzzy
-#~ msgid "Unable to browse to format directory\n"
-#~ msgstr "יצירת מפענח נכשלה"
Modified: trunk/po/it.po
===================================================================
--- trunk/po/it.po 2009-07-21 16:36:58 UTC (rev 378)
+++ trunk/po/it.po 2009-07-22 17:35:09 UTC (rev 379)
@@ -7,14 +7,14 @@
msgstr ""
"Project-Id-Version: Gnac 0.1-cvs\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-07-20 09:09+0200\n"
-"PO-Revision-Date: 2009-04-05 14:09+0100\n"
+"POT-Creation-Date: 2009-07-22 16:33+0200\n"
+"PO-Revision-Date: 2009-07-22 16:47+0200\n"
"Last-Translator: Cristian Grada <kri...@gm...>\n"
"Language-Team: Italian <dn...@gm...>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#: ../data/gnac.desktop.in.in.h:1 ../data/gnac.xml.h:2
msgid "An audio converter for GNOME"
@@ -75,19 +75,16 @@
msgstr "<b>Informazioni profilo</b>"
#: ../data/gnac-pref-window.xml.h:4
-#, fuzzy
msgid "Album"
-msgstr "Album:"
+msgstr "Album"
#: ../data/gnac-pref-window.xml.h:5
-#, fuzzy
msgid "Artist"
-msgstr "Artista:"
+msgstr "Artista"
#: ../data/gnac-pref-window.xml.h:6
-#, fuzzy
msgid "Artist - Album"
-msgstr "Artista - Album - Titolo"
+msgstr "Artista - Album"
#: ../data/gnac-pref-window.xml.h:7
msgid "Artist - Album - Title"
@@ -102,14 +99,12 @@
msgstr "Artista - Titolo"
#: ../data/gnac-pref-window.xml.h:10
-#, fuzzy
msgid "Artist/Album"
-msgstr "Artista - Album - Titolo"
+msgstr "Artista/Album"
#: ../data/gnac-pref-window.xml.h:11
-#, fuzzy
msgid "Artist/Album (Year)"
-msgstr "Artista - Album - Titolo"
+msgstr "Artista/Album (Anno)"
#: ../data/gnac-pref-window.xml.h:12
#, fuzzy
@@ -198,11 +193,11 @@
msgstr "Titolo"
#: ../data/gnac-properties-window.xml.h:1
-msgid "Album :"
+msgid "Album:"
msgstr "Album:"
#: ../data/gnac-properties-window.xml.h:2
-msgid "Artist :"
+msgid "Artist:"
msgstr "Artista:"
#: ../data/gnac-properties-window.xml.h:3
@@ -210,15 +205,15 @@
msgstr "Base"
#: ../data/gnac-properties-window.xml.h:4
-msgid "Comment :"
+msgid "Comment:"
msgstr "Commento:"
#: ../data/gnac-properties-window.xml.h:5
-msgid "Disc number :"
+msgid "Disc number:"
msgstr "Numero disco:"
#: ../data/gnac-properties-window.xml.h:6
-msgid "Genre :"
+msgid "Genre:"
msgstr "Genere:"
#: ../data/gnac-properties-window.xml.h:7
@@ -226,15 +221,15 @@
msgstr "Proprietà"
#: ../data/gnac-properties-window.xml.h:8
-msgid "Title :"
+msgid "Title:"
msgstr "Titolo:"
#: ../data/gnac-properties-window.xml.h:9
-msgid "Track number :"
+msgid "Track number:"
msgstr "Numero traccia:"
#: ../data/gnac-properties-window.xml.h:10
-msgid "Year :"
+msgid "Year:"
msgstr "Anno:"
#: ../data/gnac-properties-window.xml.h:11
@@ -897,9 +892,8 @@
msgstr "Errore nella creazione del elemento %s"
#: ../libgnac/libgnac-metadata.c:723
-#, fuzzy
msgid "filename.ext"
-msgstr "Nome file"
+msgstr ""
#: ../libgnac/libgnac-metadata.c:753
msgid "Converted by Gnac"
@@ -1027,7 +1021,7 @@
msgstr "Campo estensione non deve essere vuoto"
#. update the status bar
-#: ../src/gnac-bars.c:184
+#: ../src/gnac-bars.c:188
msgid "paused"
msgstr "interrotto"
@@ -1045,150 +1039,150 @@
msgid "Unable to set key: %s\n"
msgstr "Impossibile settare la chiave: %s\n"
-#: ../src/gnac-main.c:268
+#: ../src/gnac-main.c:272
msgid "Importing files..."
msgstr "Importazione file in corso..."
-#: ../src/gnac-main.c:281
+#: ../src/gnac-main.c:285
#, c-format
msgid "%u file imported"
msgid_plural "%u files imported"
msgstr[0] "%u file importato"
msgstr[1] "%u files importati"
-#: ../src/gnac-main.c:301
+#: ../src/gnac-main.c:305
#, c-format
msgid "Impossible to launch thread to add files: %s\n"
msgstr "Impossibile lanciare il processo di aggiunta file: %s\n"
-#: ../src/gnac-main.c:329
+#: ../src/gnac-main.c:333
msgid "MPEG files (*.mp3)"
msgstr "Files MPEG (*.mp3)"
-#: ../src/gnac-main.c:330
+#: ../src/gnac-main.c:334
msgid "MPEG-4 files (*.aac, *.m4a, *.mp4)"
msgstr "Files MPEG-4 (*.aac, *.m4a, *.mp4)"
-#: ../src/gnac-main.c:331
+#: ../src/gnac-main.c:335
msgid "Musepack files (*.mpc)"
msgstr "Files Musepack (*.mpc)"
-#: ../src/gnac-main.c:332
+#: ../src/gnac-main.c:336
msgid "Ogg Vorbis files (*.ogg)"
msgstr "Files Ogg Vorbis (*.ogg)"
-#: ../src/gnac-main.c:333
+#: ../src/gnac-main.c:337
msgid "RealAudio files (*.ra)"
msgstr "Files RealAudio (*.ra)"
-#: ../src/gnac-main.c:334
+#: ../src/gnac-main.c:338
msgid "Speex files (*.spx)"
msgstr "Files Speex (*.spx)"
-#: ../src/gnac-main.c:335
+#: ../src/gnac-main.c:339
msgid "Windows Media files (*.wma)"
msgstr "Files Windows Media (*.wma)"
#. XXX the Monkey's Audio plug-in has not yet been ported
#. * to gstreamer-0.10
#. { "audio/x-ape" , _("Ape files (*.ape)") },
-#: ../src/gnac-main.c:343
+#: ../src/gnac-main.c:347
msgid "Flac files (*.flac)"
msgstr "Files Flac (*.flac)"
-#: ../src/gnac-main.c:344
+#: ../src/gnac-main.c:348
msgid "WAV files (*.wav)"
msgstr "Files WAV (*.wav)"
-#: ../src/gnac-main.c:349
+#: ../src/gnac-main.c:353
msgid "M3U playlists (*.m3u)"
msgstr "Liste di riproduzione M3U (*.m3u)"
-#: ../src/gnac-main.c:350
+#: ../src/gnac-main.c:354
msgid "PLS playlists (*.pls)"
msgstr "Liste di riproduzione PLS (*.pls)"
-#: ../src/gnac-main.c:351
+#: ../src/gnac-main.c:355
msgid "XSPF playlists (*.xspf)"
msgstr "Liste di riproduzione XSPF (*.xspf)"
-#: ../src/gnac-main.c:357
+#: ../src/gnac-main.c:361
msgid "All files (*.*)"
msgstr "Tutti i file (*.*)"
-#: ../src/gnac-main.c:360
+#: ../src/gnac-main.c:364
msgid "All supported files"
msgstr "Tutti i file supportati"
-#: ../src/gnac-main.c:378
+#: ../src/gnac-main.c:382
msgid "All playlists files"
msgstr "Tutte le liste di riproduzione"
-#: ../src/gnac-main.c:393
+#: ../src/gnac-main.c:397
msgid "Lossless codecs"
msgstr "Codec senza perdita"
-#: ../src/gnac-main.c:404
+#: ../src/gnac-main.c:408
msgid "Lossy codecs"
msgstr "Codec con perdita"
-#: ../src/gnac-main.c:529
+#: ../src/gnac-main.c:533
#, c-format
msgid "Could not open link %s: %s\n"
msgstr ""
-#: ../src/gnac-main.c:558
+#: ../src/gnac-main.c:562
msgid ""
"A conversion is currently running...\n"
"Are you sure you want to quit?"
msgstr ""
"Conversione in corso...\n"
-"Sicuro di voler uscire ?"
+"Sicuro di voler uscire?"
-#: ../src/gnac-main.c:680
+#: ../src/gnac-main.c:707
#, fuzzy, c-format
msgid ""
"File %s already exists...\n"
"Overwrite?"
msgstr "File %s già presente in lista"
-#: ../src/gnac-main.c:685
+#: ../src/gnac-main.c:712
msgid "Remember my decision"
msgstr ""
-#: ../src/gnac-main.c:720
+#: ../src/gnac-main.c:745
#, c-format
msgid "Converting file %d of %d"
msgstr "Conversione file %d di %d"
-#: ../src/gnac-main.c:738
+#: ../src/gnac-main.c:763
#, c-format
msgid "%s left"
msgstr "%s rimasto"
-#: ../src/gnac-main.c:849 ../src/gnac-main.c:1065 ../src/gnac-main.c:1097
+#: ../src/gnac-main.c:874 ../src/gnac-main.c:1094 ../src/gnac-main.c:1126
#, c-format
msgid "Error: %s\n"
msgstr "Errore: %s\n"
-#: ../src/gnac-main.c:881
+#: ../src/gnac-main.c:906
msgid "Conversion completed with errors"
msgstr "Conversione completata con errori"
-#: ../src/gnac-main.c:883
+#: ../src/gnac-main.c:908
msgid "Conversion completed!"
msgstr "Conversione completata!"
-#: ../src/gnac-main.c:900
+#: ../src/gnac-main.c:925
msgid "Conversion stopped"
msgstr "Conversione fermata"
-#: ../src/gnac-main.c:913
+#: ../src/gnac-main.c:938
#, c-format
msgid "File not converted (%s)"
msgstr ""
-#: ../src/gnac-main.c:921
+#: ../src/gnac-main.c:946
#, c-format
msgid ""
"Gnac failed to convert file %s\n"
@@ -1197,20 +1191,20 @@
"Gnac ha fallito l'operazione sul file %s\n"
"Messaggio errore: %s\n"
-#: ../src/gnac-main.c:1021
+#: ../src/gnac-main.c:1046
msgid "Open a file..."
msgstr "Apri un file..."
-#: ../src/gnac-main.c:1034
+#: ../src/gnac-main.c:1059
msgid "Close dialog on add"
msgstr "Chiudi dialogo una volta aggiunti i file"
-#: ../src/gnac-main.c:1114
+#: ../src/gnac-main.c:1143
msgid "No help available yet"
msgstr "Nessun aiuto disponibile al momento"
#. Parse command line arguments
-#: ../src/gnac-main.c:1232
+#: ../src/gnac-main.c:1261
msgid "[URI...] - Convert your audio files"
msgstr "[URI...] - Converte i file audio personali"
@@ -1236,7 +1230,7 @@
" <b>\\%y:</b> year"
msgstr ""
-#: ../src/gnac-prefs.c:318 ../src/gnac-properties.c:407 ../src/gnac-ui.c:84
+#: ../src/gnac-prefs.c:326 ../src/gnac-properties.c:407 ../src/gnac-ui.c:84
#, c-format
msgid "Unable to read file: %s\n"
msgstr "Impossibile leggere il file %s\n"
@@ -1297,33 +1291,19 @@
msgstr ""
#: ../src/gnac-ui.c:498
-#, fuzzy
msgid "Hide"
-msgstr "Mostra/Nascondi"
+msgstr "Nascondi"
#: ../src/gnac-ui.c:498
-#, fuzzy
msgid "Show"
-msgstr "Mostra/Nascondi"
+msgstr "Mostra"
#: ../src/gnac-ui.c:566
-msgid "Cannot trash the file. Do you want to delete it immediately ?"
+#, fuzzy
+msgid "Cannot trash the file. Do you want to delete it immediately?"
msgstr "Impossibile cestinare il file. Vuoi eliminarlo immediatamente?"
#: ../src/gnac-ui.c:570
#, c-format
msgid "Cannot trash file %s"
msgstr "Non posso cestinare il file %s"
-
-#, fuzzy
-#~ msgid "files imported"
-#~ msgstr "file importato con successo"
-
-#~ msgid "Impossible to load format module %s\n"
-#~ msgstr "Non si può caricare il modulo del formato %s\n"
-
-#~ msgid "The format modules directory doesn't exits\n"
-#~ msgstr "Directory dei moduli dei formati inesistente\n"
-
-#~ msgid "Unable to browse to format directory\n"
-#~ msgstr "Non posso navigare nella directory dei formati\n"
Modified: trunk/po/ro.po
===================================================================
--- trunk/po/ro.po 2009-07-21 16:36:58 UTC (rev 378)
+++ trunk/po/ro.po 2009-07-22 17:35:09 UTC (rev 379)
@@ -7,8 +7,8 @@
msgstr ""
"Project-Id-Version: Gnac 0.2-svn\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-07-20 09:09+0200\n"
-"PO-Revision-Date: 2009-04-05 14:03+0100\n"
+"POT-Creation-Date: 2009-07-22 16:33+0200\n"
+"PO-Revision-Date: 2009-07-22 16:43+0200\n"
"Last-Translator: Cristian Grada <kri...@gm...>\n"
"Language-Team: Romanian <kri...@gm...>\n"
"MIME-Version: 1.0\n"
@@ -75,19 +75,16 @@
msgstr "<b>Informaţii profil</b>"
#: ../data/gnac-pref-window.xml.h:4
-#, fuzzy
msgid "Album"
-msgstr "Album:"
+msgstr "Album"
#: ../data/gnac-pref-window.xml.h:5
-#, fuzzy
msgid "Artist"
-msgstr "Artist:"
+msgstr "Artist"
#: ../data/gnac-pref-window.xml.h:6
-#, fuzzy
msgid "Artist - Album"
-msgstr "Artist - Album - Titlu"
+msgstr "Artist - Album"
#: ../data/gnac-pref-window.xml.h:7
msgid "Artist - Album - Title"
@@ -102,14 +99,12 @@
msgstr "Artist - Titlu"
#: ../data/gnac-pref-window.xml.h:10
-#, fuzzy
msgid "Artist/Album"
-msgstr "Artist - Album - Titlu"
+msgstr "Artist/Album"
#: ../data/gnac-pref-window.xml.h:11
-#, fuzzy
msgid "Artist/Album (Year)"
-msgstr "Artist - Album - Titlu"
+msgstr "Artist/Album (An)"
#: ../data/gnac-pref-window.xml.h:12
#, fuzzy
@@ -198,11 +193,11 @@
msgstr "Titlu"
#: ../data/gnac-properties-window.xml.h:1
-msgid "Album :"
+msgid "Album:"
msgstr "Album:"
#: ../data/gnac-properties-window.xml.h:2
-msgid "Artist :"
+msgid "Artist:"
msgstr "Artist:"
#: ../data/gnac-properties-window.xml.h:3
@@ -210,15 +205,15 @@
msgstr "Sumar"
#: ../data/gnac-properties-window.xml.h:4
-msgid "Comment :"
+msgid "Comment:"
msgstr "Comentariu:"
#: ../data/gnac-properties-window.xml.h:5
-msgid "Disc number :"
+msgid "Disc number:"
msgstr "Număr disc:"
#: ../data/gnac-properties-window.xml.h:6
-msgid ...
[truncated message content] |
|
From: <bdu...@us...> - 2009-07-21 16:37:26
|
Revision: 378
http://gnac.svn.sourceforge.net/gnac/?rev=378&view=rev
Author: bdupasqu
Date: 2009-07-21 16:36:58 +0000 (Tue, 21 Jul 2009)
Log Message:
-----------
- Clicking on a non-sensitive entry (e.g., custom pattern entry) makes it sensitive.
Modified Paths:
--------------
trunk/data/gnac-pref-window.xml
trunk/src/gnac-prefs.c
trunk/src/gnac-prefs.h
Modified: trunk/data/gnac-pref-window.xml
===================================================================
--- trunk/data/gnac-pref-window.xml 2009-07-20 18:36:03 UTC (rev 377)
+++ trunk/data/gnac-pref-window.xml 2009-07-21 16:36:58 UTC (rev 378)
@@ -220,28 +220,35 @@
<property name="n_columns">2</property>
<property name="homogeneous">True</property>
<child>
- <object class="GtkEntry" id="subfolder_entry">
+ <object class="GtkLabel" id="subfolder_label">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="invisible_char">●</property>
- <property name="caps_lock_warning">False</property>
- <signal name="changed" handler="gnac_prefs_subfolder_editing_done"/>
+ <property name="xalign">0</property>
+ <property name="xpad">22</property>
+ <property name="label" translatable="yes">Subfolder name:</property>
+ <property name="single_line_mode">True</property>
</object>
<packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
<property name="y_options">GTK_FILL</property>
</packing>
</child>
<child>
- <object class="GtkLabel" id="subfolder_label">
+ <object class="GtkEventBox" id="subfolder_eventbox">
<property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="xpad">22</property>
- <property name="label" translatable="yes">Subfolder name:</property>
- <property name="single_line_mode">True</property>
+ <property name="above_child">True</property>
+ <signal name="button_press_event" handler="gnac_prefs_button_press_event_cb" object="subfolder_radiobutton"/>
+ <child>
+ <object class="GtkEntry" id="subfolder_entry">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="invisible_char">●</property>
+ <property name="caps_lock_warning">False</property>
+ <signal name="changed" handler="gnac_prefs_subfolder_editing_done"/>
+ </object>
+ </child>
</object>
<packing>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
<property name="y_options">GTK_FILL</property>
</packing>
</child>
@@ -425,40 +432,6 @@
</packing>
</child>
<child>
- <object class="GtkEntry" id="folder_hierarchy_entry">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="has_tooltip">True</property>
- <property name="invisible_char">●</property>
- <property name="caps_lock_warning">False</property>
- <signal name="changed" handler="gnac_prefs_update_example_label"/>
- <signal name="query_tooltip" handler="gnac_prefs_query_tooltip_cb"/>
- </object>
- <packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- </packing>
- </child>
- <child>
- <object class="GtkEntry" id="output_filename_entry">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="has_tooltip">True</property>
- <property name="invisible_char">●</property>
- <property name="caps_lock_warning">False</property>
- <signal name="changed" handler="gnac_prefs_update_example_label"/>
- <signal name="query_tooltip" handler="gnac_prefs_query_tooltip_cb"/>
- </object>
- <packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="top_attach">3</property>
- <property name="bottom_attach">4</property>
- </packing>
- </child>
- <child>
<object class="GtkComboBox" id="folder_hierarchy_combo">
<property name="visible">True</property>
<property name="model">folder_hierarchy_model</property>
@@ -491,6 +464,54 @@
</packing>
</child>
<child>
+ <object class="GtkEventBox" id="output_filename_eventbox">
+ <property name="visible">True</property>
+ <property name="has_tooltip">True</property>
+ <property name="above_child">True</property>
+ <signal name="button_press_event" handler="gnac_prefs_button_press_event_cb" object="file_pattern_combo"/>
+ <signal name="query_tooltip" handler="gnac_prefs_query_tooltip_cb"/>
+ <child>
+ <object class="GtkEntry" id="output_filename_entry">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="invisible_char">●</property>
+ <property name="caps_lock_warning">False</property>
+ <signal name="changed" handler="gnac_prefs_update_example_label"/>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
+ <property name="top_attach">3</property>
+ <property name="bottom_attach">4</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkEventBox" id="folder_hierarchy_eventbox">
+ <property name="visible">True</property>
+ <property name="has_tooltip">True</property>
+ <property name="above_child">True</property>
+ <signal name="button_press_event" handler="gnac_prefs_button_press_event_cb" object="folder_hierarchy_combo"/>
+ <signal name="query_tooltip" handler="gnac_prefs_query_tooltip_cb"/>
+ <child>
+ <object class="GtkEntry" id="folder_hierarchy_entry">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="invisible_char">●</property>
+ <property name="caps_lock_warning">False</property>
+ <signal name="changed" handler="gnac_prefs_update_example_label"/>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
+ <property name="top_attach">1</property>
+ <property name="bottom_attach">2</property>
+ </packing>
+ </child>
+ <child>
<placeholder/>
</child>
<child>
Modified: trunk/src/gnac-prefs.c
===================================================================
--- trunk/src/gnac-prefs.c 2009-07-20 18:36:03 UTC (rev 377)
+++ trunk/src/gnac-prefs.c 2009-07-21 16:36:58 UTC (rev 378)
@@ -147,6 +147,7 @@
{
GtkWidget *filechooserbutton;
GtkWidget *subfolder_entry;
+ GtkWidget *subfolder_eventbox;
GtkWidget *subfolder_label;
GtkWidget *selected_label;
@@ -154,11 +155,14 @@
"filechooserbutton"));
subfolder_entry = GTK_WIDGET(gtk_builder_get_object(gnac_prefs_builder,
"subfolder_entry"));
+ subfolder_eventbox = GTK_WIDGET(gtk_builder_get_object(gnac_prefs_builder,
+ "subfolder_eventbox"));
subfolder_label = GTK_WIDGET(gtk_builder_get_object(gnac_prefs_builder,
"subfolder_label"));
selected_label = GTK_WIDGET(gtk_builder_get_object(gnac_prefs_builder,
"selected_label"));
+ gtk_event_box_set_above_child(GTK_EVENT_BOX(subfolder_eventbox), TRUE);
gtk_widget_set_sensitive(subfolder_entry, FALSE);
gtk_widget_set_sensitive(filechooserbutton, FALSE);
gtk_widget_set_sensitive(selected_label, FALSE);
@@ -195,6 +199,7 @@
{
GtkWidget *filechooserbutton;
GtkWidget *subfolder_entry;
+ GtkWidget *subfolder_eventbox;
GtkWidget *subfolder_label;
GtkWidget *selected_label;
@@ -202,11 +207,14 @@
"filechooserbutton"));
subfolder_entry = GTK_WIDGET(gtk_builder_get_object(gnac_prefs_builder,
"subfolder_entry"));
+ subfolder_eventbox = GTK_WIDGET(gtk_builder_get_object(gnac_prefs_builder,
+ "subfolder_eventbox"));
subfolder_label = GTK_WIDGET(gtk_builder_get_object(gnac_prefs_builder,
"subfolder_label"));
selected_label = GTK_WIDGET(gtk_builder_get_object(gnac_prefs_builder,
"selected_label"));
+ gtk_event_box_set_above_child(GTK_EVENT_BOX(subfolder_eventbox), TRUE);
gtk_widget_set_sensitive(subfolder_entry, FALSE);
gtk_widget_set_sensitive(filechooserbutton, TRUE);
gtk_widget_set_sensitive(subfolder_label, FALSE);
@@ -497,6 +505,42 @@
}
+gboolean
+gnac_prefs_button_press_event_cb(GtkWidget *widget,
+ GdkEventButton *event,
+ gpointer user_data)
+{
+ GtkWidget *entry;
+
+ /* handle left clicks only */
+ if (event->button != 1) return FALSE;
+
+ entry = gtk_bin_get_child(GTK_BIN(user_data));
+
+ switch (GTK_WIDGET_TYPE(widget))
+ {
+ case GTK_TYPE_COMBO_BOX:
+ {
+ gint size;
+ size = gnac_utils_get_combo_size(GTK_COMBO_BOX(widget));
+ gtk_combo_box_set_active(GTK_COMBO_BOX(widget), size-1);
+ break;
+ }
+ case GTK_TYPE_RADIO_BUTTON:
+ gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(widget), TRUE);
+ break;
+ default:
+ break;
+ }
+
+ gtk_event_box_set_above_child(GTK_EVENT_BOX(user_data), FALSE);
+ gtk_widget_set_sensitive(entry, TRUE);
+ gtk_widget_grab_focus(entry);
+
+ return TRUE;
+}
+
+
void
gnac_prefs_pattern_changed_cb(GtkWidget *widget,
gpointer data)
@@ -505,16 +549,19 @@
gint active;
gchar *pattern;
GtkWidget *filename_entry;
+ GtkWidget *filename_eventbox;
active = gtk_combo_box_get_active(GTK_COMBO_BOX(widget));
gnac_prefs_update_example_label(widget, data);
filename_entry = GTK_WIDGET(gtk_builder_get_object(
gnac_prefs_builder, "output_filename_entry"));
+ filename_eventbox = GTK_WIDGET(gtk_builder_get_object(
+ gnac_prefs_builder, "output_filename_eventbox"));
- /* TODO if the user clicks on the entry, make it sensitive and select "Custom" */
- /* set the widget to be sensitive only when custom is selected */
size = gnac_utils_get_combo_size(GTK_COMBO_BOX(widget));
+ gtk_event_box_set_above_child(GTK_EVENT_BOX(filename_eventbox),
+ (active != size-1));
gtk_widget_set_sensitive(filename_entry, (active == size-1));
pattern = gnac_prefs_get_rename_pattern_as_str();
@@ -535,22 +582,25 @@
gint size;
gint active;
gchar *pattern;
- GtkWidget *folder_hierarchy_entry;
+ GtkWidget *folder_entry;
+ GtkWidget *folder_eventbox;
active = gtk_combo_box_get_active(GTK_COMBO_BOX(widget));
gnac_prefs_update_example_label(widget, data);
- folder_hierarchy_entry = GTK_WIDGET(gtk_builder_get_object(
- gnac_prefs_builder, "folder_hierarchy_entry"));
+ folder_entry = GTK_WIDGET(gtk_builder_get_object(
+ gnac_prefs_builder, "folder_hierarchy_entry"));
+ folder_eventbox = GTK_WIDGET(gtk_builder_get_object(
+ gnac_prefs_builder, "folder_hierarchy_eventbox"));
- /* TODO if the user clicks on the entry, make it sensitive and select "Custom" */
- /* set the widget to be sensitive only when custom is selected */
size = gnac_utils_get_combo_size(GTK_COMBO_BOX(widget));
- gtk_widget_set_sensitive(folder_hierarchy_entry, (active == size-1));
+ gtk_event_box_set_above_child(GTK_EVENT_BOX(folder_eventbox),
+ (active != size-1));
+ gtk_widget_set_sensitive(folder_entry, (active == size-1));
pattern = gnac_prefs_get_folder_hierarchy_as_str();
- gtk_entry_set_text(GTK_ENTRY(folder_hierarchy_entry), pattern);
+ gtk_entry_set_text(GTK_ENTRY(folder_entry), pattern);
gnac_gconf_set_int(GNAC_GCONF_FOLDER_HIERARCHY, active);
gnac_gconf_set_string(GNAC_GCONF_FOLDER_HIERARCHY_PATTERN, pattern);
Modified: trunk/src/gnac-prefs.h
===================================================================
--- trunk/src/gnac-prefs.h 2009-07-20 18:36:03 UTC (rev 377)
+++ trunk/src/gnac-prefs.h 2009-07-21 16:36:58 UTC (rev 378)
@@ -74,6 +74,11 @@
gnac_prefs_update_example_label(GtkWidget *widget,
gpointer data);
+gboolean
+gnac_prefs_button_press_event_cb(GtkWidget *combo,
+ GdkEventButton *event,
+ gpointer user_data);
+
void
gnac_prefs_pattern_changed_cb(GtkWidget *widget,
gpointer data);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bdu...@us...> - 2009-07-20 18:36:09
|
Revision: 377
http://gnac.svn.sourceforge.net/gnac/?rev=377&view=rev
Author: bdupasqu
Date: 2009-07-20 18:36:03 +0000 (Mon, 20 Jul 2009)
Log Message:
-----------
- Fix some bugs (close_dialog_on_add, sensitivity of widgets when no files are
added),
- New feature: double clicking on a file in the file chooser adds this file to
the list,
- New feature: hitting 'enter' in the file chooser adds the selected
file/folder to the list.
Modified Paths:
--------------
trunk/src/gnac-bars.c
trunk/src/gnac-main.c
Modified: trunk/src/gnac-bars.c
===================================================================
--- trunk/src/gnac-bars.c 2009-07-20 07:14:12 UTC (rev 376)
+++ trunk/src/gnac-bars.c 2009-07-20 18:36:03 UTC (rev 377)
@@ -39,20 +39,24 @@
#include "gnac-stock-items.h"
#include "gnac-ui.h"
+extern guint nb_files_added;
void
gnac_bars_on_row_inserted(void)
{
+ gboolean activate;
GtkWidget *convert_button;
GtkAction *action;
+ activate = (nb_files_added != 0);
+
action = gnac_ui_get_action("convert_item");
- gtk_action_set_sensitive(action, TRUE);
+ gtk_action_set_sensitive(action, activate);
convert_button = gnac_ui_get_widget("convert_button");
- gtk_widget_set_sensitive(convert_button, TRUE);
+ gtk_widget_set_sensitive(convert_button, activate);
- gnac_bars_activate_clear(TRUE);
+ gnac_bars_activate_clear(activate);
}
@@ -159,7 +163,7 @@
gnac_ui_enable_profiles();
gnac_bars_activate_add(TRUE);
- gnac_bars_activate_clear(TRUE);
+ gnac_bars_activate_clear((nb_files_added != 0));
gnac_bars_activate_pause(FALSE);
gnac_bars_activate_preferences(TRUE);
}
Modified: trunk/src/gnac-main.c
===================================================================
--- trunk/src/gnac-main.c 2009-07-20 07:14:12 UTC (rev 376)
+++ trunk/src/gnac-main.c 2009-07-20 18:36:03 UTC (rev 377)
@@ -29,6 +29,7 @@
#include "config.h"
#endif /* HAVE_CONFIG_H */
+#include <gdk/gdkkeysyms.h>
#include <gio/gio.h>
#include <glib/gi18n.h>
#include <glib/gstdio.h>
@@ -122,14 +123,16 @@
gnac_utils_moving_avg_reset();
gnac_bars_activate_clear(FALSE);
break;
+
case GNAC_AUDIO_FILE_ACTION_STATE:
timeout_id = g_timeout_add(100,
(GSourceFunc)gnac_ui_pulse_progress, NULL);
-
gnac_bars_on_add_files();
gnac_ui_show_progress(TRUE);
break;
+
case GNAC_AUDIO_READY_STATE:
+ remember_overwrite = FALSE;
gnac_bars_on_row_inserted();
if (gnac_gconf_get_boolean(GNAC_GCONF_TRAY_ICON)) gnac_ui_hide_trayicon();
gnac_ui_show_progress(FALSE);
@@ -145,6 +148,7 @@
prev_time_left = -1;
gnac_utils_moving_avg_reset();
break;
+
case GNAC_AUDIO_CLEAR_STATE:
// TODO do stg?
break;
@@ -157,6 +161,7 @@
gnac_bars_on_convert();
gnac_bars_on_convert_resume();
break;
+
case GNAC_AUDIO_PAUSED_STATE:
gnac_bars_on_convert_pause();
break;
@@ -261,7 +266,6 @@
{
GSList *files;
gchar *files_added_text;
- //GSList *temp;
gdk_threads_enter();
gnac_file_list_attach_default_model(FALSE);
@@ -609,6 +613,28 @@
}
+static void
+gnac_file_chooser_file_activated_cb(GtkFileChooser *chooser,
+ gpointer user_data)
+{
+ gnac_file_chooser_response(GTK_DIALOG(chooser), GTK_RESPONSE_NONE, NULL);
+}
+
+
+static gboolean
+gnac_file_chooser_key_press_event_cb(GtkWidget *widget,
+ GdkEventKey *event,
+ gpointer user_data)
+{
+ if (event->type == GDK_KEY_PRESS && event->keyval == GDK_Return)
+ {
+ gnac_file_chooser_response(GTK_DIALOG(widget), GTK_RESPONSE_NONE, NULL);
+ return TRUE;
+ }
+ return FALSE;
+}
+
+
void
gnac_file_chooser_response(GtkDialog *dialog,
gint response,
@@ -639,11 +665,12 @@
/* Do we have to close de file chooser? */
close_on_add_button = gtk_file_chooser_get_extra_widget(GTK_FILE_CHOOSER(dialog));
- if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(close_on_add_button))) {
- /* Get the current uri */
- g_free(current_directory);
- current_directory = gtk_file_chooser_get_current_folder_uri(GTK_FILE_CHOOSER(dialog));
- }
+ /* Get the current uri */
+ g_free(current_directory);
+ current_directory = gtk_file_chooser_get_current_folder_uri(GTK_FILE_CHOOSER(dialog));
+
+ if (!gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(close_on_add_button))) return;
+
break;
case GTK_RESPONSE_CLOSE:
@@ -691,13 +718,11 @@
response = gtk_dialog_run(GTK_DIALOG(dialog));
gdk_threads_leave();
- if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(checkbox)))
- remember_overwrite = TRUE;
+ remember_overwrite = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(checkbox));
gtk_widget_destroy(dialog);
- if (response == GTK_RESPONSE_YES) overwrite = TRUE;
- else overwrite = FALSE;
+ overwrite = (response == GTK_RESPONSE_YES);
}
g_object_unref(info);
@@ -1038,10 +1063,14 @@
gnac_add_filters(GTK_FILE_CHOOSER(file_chooser));
- g_signal_connect(file_chooser,
- "response", G_CALLBACK(gnac_file_chooser_response), data);
+ g_signal_connect(file_chooser, "response",
+ G_CALLBACK(gnac_file_chooser_response), data);
+ g_signal_connect(file_chooser, "key-press-event",
+ G_CALLBACK(gnac_file_chooser_key_press_event_cb), data);
+ g_signal_connect(file_chooser, "file-activated",
+ G_CALLBACK(gnac_file_chooser_file_activated_cb), data);
- gtk_dialog_run (GTK_DIALOG(file_chooser));
+ gtk_dialog_run(GTK_DIALOG(file_chooser));
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bdu...@us...> - 2009-07-20 07:14:16
|
Revision: 376
http://gnac.svn.sourceforge.net/gnac/?rev=376&view=rev
Author: bdupasqu
Date: 2009-07-20 07:14:12 +0000 (Mon, 20 Jul 2009)
Log Message:
-----------
- Add some folder hierarchy patterns,
- Fancier tooltips for the custom patterns,
- Update french translation.
Modified Paths:
--------------
trunk/data/gnac-pref-window.xml
trunk/data/gnac.xml
trunk/libgnac/libgnac-metadata.c
trunk/po/cs.po
trunk/po/de.po
trunk/po/fr.po
trunk/po/gnac.pot
trunk/po/he.po
trunk/po/it.po
trunk/po/ro.po
trunk/po/sv.po
trunk/src/gnac-prefs.c
trunk/src/gnac-prefs.h
Modified: trunk/data/gnac-pref-window.xml
===================================================================
--- trunk/data/gnac-pref-window.xml 2009-07-17 07:08:04 UTC (rev 375)
+++ trunk/data/gnac-pref-window.xml 2009-07-20 07:14:12 UTC (rev 376)
@@ -50,12 +50,18 @@
<col id="0" translatable="yes">Artist</col>
</row>
<row>
- <col id="0" translatable="yes">Artist/Album</col>
+ <col id="0" translatable="yes">Album</col>
</row>
<row>
<col id="0" translatable="yes">Artist - Album</col>
</row>
<row>
+ <col id="0" translatable="yes">Artist/Album</col>
+ </row>
+ <row>
+ <col id="0" translatable="yes">Artist/Album (Year)</col>
+ </row>
+ <row>
<col id="0" translatable="yes">Custom</col>
</row>
</data>
@@ -422,21 +428,11 @@
<object class="GtkEntry" id="folder_hierarchy_entry">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="tooltip_text" translatable="yes">Patterns available:
- %b: album
- %a: artist
- %c: comment
- %d: disc number
- %e: disc count
- %f: filename
- %g: genre
- %t: title
- %l: track count
- %n: track number
- %y: year</property>
+ <property name="has_tooltip">True</property>
<property name="invisible_char">●</property>
<property name="caps_lock_warning">False</property>
<signal name="changed" handler="gnac_prefs_update_example_label"/>
+ <signal name="query_tooltip" handler="gnac_prefs_query_tooltip_cb"/>
</object>
<packing>
<property name="left_attach">1</property>
@@ -449,21 +445,11 @@
<object class="GtkEntry" id="output_filename_entry">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="tooltip_text" translatable="yes">Patterns available:
- %b: album
- %a: artist
- %c: comment
- %d: disc number
- %e: disc count
- %f: filename
- %g: genre
- %t: title
- %l: track count
- %n: track number
- %y: year</property>
+ <property name="has_tooltip">True</property>
<property name="invisible_char">●</property>
<property name="caps_lock_warning">False</property>
<signal name="changed" handler="gnac_prefs_update_example_label"/>
+ <signal name="query_tooltip" handler="gnac_prefs_query_tooltip_cb"/>
</object>
<packing>
<property name="left_attach">1</property>
Modified: trunk/data/gnac.xml
===================================================================
--- trunk/data/gnac.xml 2009-07-17 07:08:04 UTC (rev 375)
+++ trunk/data/gnac.xml 2009-07-20 07:14:12 UTC (rev 376)
@@ -159,18 +159,18 @@
</menu>
</menubar>
<toolbar name="main_toolbar">
- <toolitem action='add_item' />
- <toolitem action='remove_item' />
- <toolitem action='clear_item' />
+ <toolitem action="add_item" />
+ <toolitem action="remove_item" />
+ <toolitem action="clear_item" />
<separator />
- <toolitem action='convert_item' />
+ <toolitem action="convert_item" />
</toolbar>
<popup name="main_popup">
- <menuitem action='add_item' />
- <menuitem action='remove_item' />
- <menuitem action='clear_item' />
+ <menuitem action="add_item" />
+ <menuitem action="remove_item" />
+ <menuitem action="clear_item" />
<separator />
- <menuitem action='properties_item' />
+ <menuitem action="properties_item" />
</popup>
<popup name="tray_popup">
<menuitem action="tray_show_hide_item"/>
Modified: trunk/libgnac/libgnac-metadata.c
===================================================================
--- trunk/libgnac/libgnac-metadata.c 2009-07-17 07:08:04 UTC (rev 375)
+++ trunk/libgnac/libgnac-metadata.c 2009-07-20 07:14:12 UTC (rev 376)
@@ -720,7 +720,7 @@
GValue *filename_value;
filename_value = g_new0(GValue, 1);
g_value_init(filename_value, G_TYPE_STRING);
- g_value_set_static_string(filename_value, "filename.ext");
+ g_value_set_static_string(filename_value, _("filename.ext"));
g_hash_table_insert(dummy_tags, GNAC_TAG_FILENAME, filename_value);
GValue *album_value;
@@ -750,7 +750,7 @@
GValue *comment_value;
comment_value = g_new0(GValue, 1);
g_value_init(comment_value, G_TYPE_STRING);
- g_value_set_static_string(comment_value, "Converted by Gnac");
+ g_value_set_static_string(comment_value, _("Converted by Gnac"));
g_hash_table_insert(dummy_tags, GST_TAG_COMMENT, comment_value);
GValue *date_value;
Modified: trunk/po/cs.po
===================================================================
--- trunk/po/cs.po 2009-07-17 07:08:04 UTC (rev 375)
+++ trunk/po/cs.po 2009-07-20 07:14:12 UTC (rev 376)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: gnac\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-07-15 08:49+0200\n"
+"POT-Creation-Date: 2009-07-20 09:09+0200\n"
"PO-Revision-Date: 2009-04-03 21:41+0100\n"
"Last-Translator: Luboš Staněk <lu...@us...>\n"
"Language-Team: Czech <tra...@li...>\n"
@@ -76,131 +76,124 @@
#: ../data/gnac-pref-window.xml.h:4
#, fuzzy
+msgid "Album"
+msgstr "Album :"
+
+#: ../data/gnac-pref-window.xml.h:5
+#, fuzzy
msgid "Artist"
msgstr "Umělec :"
-#: ../data/gnac-pref-window.xml.h:5
+#: ../data/gnac-pref-window.xml.h:6
#, fuzzy
msgid "Artist - Album"
msgstr "Umělec - Album - Název"
-#: ../data/gnac-pref-window.xml.h:6
+#: ../data/gnac-pref-window.xml.h:7
msgid "Artist - Album - Title"
msgstr "Umělec - Album - Název"
-#: ../data/gnac-pref-window.xml.h:7
+#: ../data/gnac-pref-window.xml.h:8
msgid "Artist - Number - Title"
msgstr "Umělec – Stopa – Název"
-#: ../data/gnac-pref-window.xml.h:8
+#: ../data/gnac-pref-window.xml.h:9
msgid "Artist - Title"
msgstr "Umělec – Název"
-#: ../data/gnac-pref-window.xml.h:9
+#: ../data/gnac-pref-window.xml.h:10
#, fuzzy
msgid "Artist/Album"
msgstr "Umělec - Album - Název"
-#: ../data/gnac-pref-window.xml.h:10
+#: ../data/gnac-pref-window.xml.h:11
#, fuzzy
+msgid "Artist/Album (Year)"
+msgstr "Umělec - Album - Název"
+
+#: ../data/gnac-pref-window.xml.h:12
+#, fuzzy
msgid "Audio"
msgstr "Automaticky"
-#: ../data/gnac-pref-window.xml.h:11
+#: ../data/gnac-pref-window.xml.h:13
#, fuzzy
msgid "Custom"
msgstr "Uživatelská složka"
-#: ../data/gnac-pref-window.xml.h:12
+#: ../data/gnac-pref-window.xml.h:14
msgid "Custom folder"
msgstr "Uživatelská složka"
-#: ../data/gnac-pref-window.xml.h:13
+#: ../data/gnac-pref-window.xml.h:15
msgid "Delete original files after conversion"
msgstr "Smazat původní soubory po převodu"
-#: ../data/gnac-pref-window.xml.h:14
+#: ../data/gnac-pref-window.xml.h:16
msgid "Display notification icon during conversion"
msgstr "Zobrazit ikonu na panelu v průběhu převodu"
-#: ../data/gnac-pref-window.xml.h:15
+#: ../data/gnac-pref-window.xml.h:17
msgid "Folder hierarchy:"
msgstr ""
-#: ../data/gnac-pref-window.xml.h:16
+#: ../data/gnac-pref-window.xml.h:18
msgid "Folder location:"
msgstr "Umístění složky:"
-#: ../data/gnac-pref-window.xml.h:17
+#: ../data/gnac-pref-window.xml.h:19
msgid "General"
msgstr ""
-#: ../data/gnac-pref-window.xml.h:18
+#: ../data/gnac-pref-window.xml.h:20
msgid "Gnac preferences"
msgstr "Nastavení aplikace Gnac"
-#: ../data/gnac-pref-window.xml.h:19
+#: ../data/gnac-pref-window.xml.h:21
msgid "None"
msgstr ""
-#: ../data/gnac-pref-window.xml.h:20
+#: ../data/gnac-pref-window.xml.h:22
msgid "Number - Artist - Album - Title"
msgstr "Stopa - Umělec - Album – Název"
-#: ../data/gnac-pref-window.xml.h:21
+#: ../data/gnac-pref-window.xml.h:23
msgid "Number - Artist - Title"
msgstr "Stopa - Umělec – Název"
-#: ../data/gnac-pref-window.xml.h:22
+#: ../data/gnac-pref-window.xml.h:24
msgid "Number - Title"
msgstr "Stopa – Název"
-#: ../data/gnac-pref-window.xml.h:23
+#: ../data/gnac-pref-window.xml.h:25
msgid "Output filename:"
msgstr "Název výstupního souboru:"
-#: ../data/gnac-pref-window.xml.h:24
+#: ../data/gnac-pref-window.xml.h:26
msgid "Output folder:"
msgstr "Název výstupní složky:"
-#: ../data/gnac-pref-window.xml.h:26
-#, no-c-format
-msgid ""
-"Patterns available:\n"
-" %b: album\n"
-" %a: artist\n"
-" %c: comment\n"
-" %d: disc number\n"
-" %e: disc count\n"
-" %f: filename\n"
-" %g: genre\n"
-" %t: title\n"
-" %l: track count\n"
-" %n: track number\n"
-" %y: year"
-msgstr ""
-
-#: ../data/gnac-pref-window.xml.h:38
+#: ../data/gnac-pref-window.xml.h:27
msgid "Same folder as source"
msgstr "Stejná složka jako zdroj"
-#: ../data/gnac-pref-window.xml.h:39
+#: ../data/gnac-pref-window.xml.h:28
msgid "Source Filename"
msgstr "Název zdrojového souboru"
-#: ../data/gnac-pref-window.xml.h:40
+#: ../data/gnac-pref-window.xml.h:29
msgid "Strip special characters"
msgstr ""
-#: ../data/gnac-pref-window.xml.h:41
+#: ../data/gnac-pref-window.xml.h:30
msgid "Subfolder"
msgstr "Podsložka"
-#: ../data/gnac-pref-window.xml.h:42
+#: ../data/gnac-pref-window.xml.h:31
msgid "Subfolder name:"
msgstr "Název podsložky:"
-#: ../data/gnac-pref-window.xml.h:43
+#: ../data/gnac-pref-window.xml.h:32
msgid "Title"
msgstr "Název"
@@ -459,7 +452,7 @@
msgstr "Popis"
#: ../data/profiles/gnac-profiles-properties.xml.h:4
-#: ../src/profiles/gnac-profiles-manager.c:166
+#: ../src/profiles/gnac-profiles-manager.c:171
msgid "Format"
msgstr "Formát"
@@ -468,12 +461,12 @@
msgstr "Roura Gstreameru"
#: ../data/profiles/gnac-profiles-properties.xml.h:6
-#: ../src/profiles/gnac-profiles-manager.c:158
+#: ../src/profiles/gnac-profiles-manager.c:163
msgid "Name"
msgstr "Název"
#: ../data/profiles/gnac-profiles-unknown.xml.h:1
-#: ../src/profiles/gnac-profiles-manager.c:174
+#: ../src/profiles/gnac-profiles-manager.c:179
msgid "Extension"
msgstr "Přípona"
@@ -841,42 +834,42 @@
msgid "Very high compression"
msgstr "Velmi vysoká komprese"
-#: ../libgnac/libgnac-converter.c:624
+#: ../libgnac/libgnac-converter.c:626
#, c-format
msgid "File %s is already in list"
msgstr "Soubor %s je již na seznamu"
-#: ../libgnac/libgnac-converter.c:677
+#: ../libgnac/libgnac-converter.c:679
#, c-format
msgid "File %s isn't in list"
msgstr "Soubor %s není na seznamu"
-#: ../libgnac/libgnac-converter.c:994
+#: ../libgnac/libgnac-converter.c:996
msgid "Unable to create destination directory"
msgstr "Nelze vytvořit cílový adresář"
-#: ../libgnac/libgnac-converter.c:1027
+#: ../libgnac/libgnac-converter.c:1029
#, fuzzy, c-format
msgid "Destination file %s already exists"
msgstr "Soubor %s je již na seznamu"
-#: ../libgnac/libgnac-converter.c:1029
+#: ../libgnac/libgnac-converter.c:1031
msgid "Destination file already exists"
msgstr ""
-#: ../libgnac/libgnac-converter.c:1036
+#: ../libgnac/libgnac-converter.c:1038
msgid "Unable to access destination file"
msgstr "Nelze zpřístupnit cílový soubor"
-#: ../libgnac/libgnac-converter.c:1041
+#: ../libgnac/libgnac-converter.c:1043
msgid "Unable to read source file"
msgstr "Nelze číst zdrojový soubor"
-#: ../libgnac/libgnac-converter.c:1050
+#: ../libgnac/libgnac-converter.c:1052
msgid "An error occured during conversion"
msgstr "Při převodu došlo k chybě"
-#: ../libgnac/libgnac-converter.c:1088
+#: ../libgnac/libgnac-converter.c:1090
msgid "unable to handle this format"
msgstr "nelze zpracovat tento formát"
@@ -920,70 +913,89 @@
msgid "Failed to create %s element"
msgstr "Selhalo vytvoření elementu %s"
-#: ../src/profiles/gnac-profiles-manager.c:244
-#: ../src/profiles/gnac-profiles-manager.c:247
+#: ../libgnac/libgnac-metadata.c:723
+#, fuzzy
+msgid "filename.ext"
+msgstr "Název souboru"
+
+#: ../libgnac/libgnac-metadata.c:753
+msgid "Converted by Gnac"
+msgstr ""
+
+#: ../src/profiles/gnac-profiles-manager.c:39
+msgid " (copy)"
+msgstr ""
+
+#: ../src/profiles/gnac-profiles-manager.c:249
+#: ../src/profiles/gnac-profiles-manager.c:252
msgid "Unable to create directory for saved profiles."
msgstr "Nelze vytvořit adresář pro uložené profily."
-#: ../src/profiles/gnac-profiles-manager.c:245
+#: ../src/profiles/gnac-profiles-manager.c:250
msgid "You may not be able to save your profiles"
msgstr "Nemusíte být schopni uložit vaše profily"
-#: ../src/profiles/gnac-profiles-manager.c:285
-#: ../src/profiles/gnac-profiles-manager.c:287
+#: ../src/profiles/gnac-profiles-manager.c:293
+#: ../src/profiles/gnac-profiles-manager.c:295
msgid "Unable to browse the profiles directory"
msgstr "Nelze procházet adresář profilů"
-#: ../src/profiles/gnac-profiles-manager.c:313
+#: ../src/profiles/gnac-profiles-manager.c:322
msgid "Unable to find directory containing default profiles"
msgstr "Nelze nalézt adresář obsahující výchozí profily"
-#: ../src/profiles/gnac-profiles-manager.c:347
+#: ../src/profiles/gnac-profiles-manager.c:356
msgid "Unable to browse the default profiles directory"
msgstr "Nelze procházet výchozí adresář profilů"
-#: ../src/profiles/gnac-profiles-manager.c:716
+#: ../src/profiles/gnac-profiles-manager.c:728
#, c-format
msgid "Impossible to launch thread for collecting files to import: %s\n"
msgstr "Není možné spustit vlákno sběru souborů pro import: %s\n"
-#: ../src/profiles/gnac-profiles-manager.c:718
+#: ../src/profiles/gnac-profiles-manager.c:730
msgid "Impossible to import file(s)"
msgstr "Není možné importovat soubor(y)"
-#: ../src/profiles/gnac-profiles-manager.c:789
+#: ../src/profiles/gnac-profiles-manager.c:801
#, c-format
msgid ""
"Impossible to load file \"%s\": a profile with same file name already "
"exists.\n"
msgstr "Není možné načíst soubor \"%s\": profil stejného jména již existuje.\n"
-#: ../src/profiles/gnac-profiles-manager.c:823
+#: ../src/profiles/gnac-profiles-manager.c:835
#, c-format
msgid "Impossible to import the file \"%s\". File type not supported\n"
msgstr "Není možné importovat soubor \"%s\". Souborový typ není podporován\n"
-#: ../src/profiles/gnac-profiles-manager.c:839
+#: ../src/profiles/gnac-profiles-manager.c:851
msgid "files failed to be imported"
msgstr "selhal import souborů"
-#: ../src/profiles/gnac-profiles-manager.c:839
+#: ../src/profiles/gnac-profiles-manager.c:851
msgid "file failed to be imported"
msgstr "selhal import souboru"
-#: ../src/profiles/gnac-profiles-manager.c:842
+#: ../src/profiles/gnac-profiles-manager.c:854
msgid "files successfully imported"
msgstr "soubory byly úspěšně importovány"
-#: ../src/profiles/gnac-profiles-manager.c:842
+#: ../src/profiles/gnac-profiles-manager.c:854
msgid "file successfully imported"
msgstr "soubor byl úspěšně importován"
-#: ../src/profiles/gnac-profiles-manager.c:953
+#: ../src/profiles/gnac-profiles-manager.c:965
msgid "New profile"
msgstr "Nový profil"
-#: ../src/profiles/gnac-profiles-manager.c:979
+#: ../src/profiles/gnac-profiles-manager.c:1011
+#: ../src/profiles/gnac-profiles-manager.c:1037
+#, fuzzy
+msgid "Failed to copy the profile"
+msgstr "Nelze procházet adresář profilů"
+
+#: ../src/profiles/gnac-profiles-manager.c:1065
msgid "Edit profile"
msgstr "Upravit profil"
@@ -1170,7 +1182,7 @@
msgid "%s left"
msgstr "Zbývá %s"
-#: ../src/gnac-main.c:849 ../src/gnac-main.c:1054 ../src/gnac-main.c:1086
+#: ../src/gnac-main.c:849 ../src/gnac-main.c:1065 ../src/gnac-main.c:1097
#, c-format
msgid "Error: %s\n"
msgstr "Chyba: %s\n"
@@ -1201,20 +1213,20 @@
"Gnac selhal při převodu souboru %s\n"
" Chybová zpráva: %s\n"
-#: ../src/gnac-main.c:1010
+#: ../src/gnac-main.c:1021
msgid "Open a file..."
msgstr "Otevřít soubor.."
-#: ../src/gnac-main.c:1023
+#: ../src/gnac-main.c:1034
msgid "Close dialog on add"
msgstr "Zavřít dialog při přidání"
-#: ../src/gnac-main.c:1103
+#: ../src/gnac-main.c:1114
msgid "No help available yet"
msgstr "Nápověda dosud není dostupná"
#. Parse command line arguments
-#: ../src/gnac-main.c:1221
+#: ../src/gnac-main.c:1232
msgid "[URI...] - Convert your audio files"
msgstr "[URI...] - Převést vaše audio soubory"
@@ -1224,7 +1236,23 @@
msgid "Invalid UTF-8 filename: %s\n"
msgstr "Neplatný název souboru UTF-8: %s\n"
-#: ../src/gnac-prefs.c:295 ../src/gnac-properties.c:407 ../src/gnac-ui.c:84
+#: ../src/gnac-prefs.c:47
+msgid ""
+"Patterns available:\n"
+" <b>\\%a:</b> artist\n"
+" <b>\\%b:</b> album\n"
+" <b>\\%c:</b> comment\n"
+" <b>\\%d:</b> disc number\n"
+" <b>\\%e:</b> disc count\n"
+" <b>\\%f:</b> filename\n"
+" <b>\\%g:</b> genre\n"
+" <b>\\%t:</b> title\n"
+" <b>\\%l:</b> track count\n"
+" <b>\\%n:</b> track number\n"
+" <b>\\%y:</b> year"
+msgstr ""
+
+#: ../src/gnac-prefs.c:318 ../src/gnac-properties.c:407 ../src/gnac-ui.c:84
#, c-format
msgid "Unable to read file: %s\n"
msgstr "Nelze číst soubor: %s\n"
Modified: trunk/po/de.po
===================================================================
--- trunk/po/de.po 2009-07-17 07:08:04 UTC (rev 375)
+++ trunk/po/de.po 2009-07-20 07:14:12 UTC (rev 376)
@@ -2,7 +2,7 @@
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-07-15 08:49+0200\n"
+"POT-Creation-Date: 2009-07-20 09:09+0200\n"
"PO-Revision-Date: \n"
"Last-Translator: Martin Lettner <m.l...@gm...>\n"
"Language-Team: \n"
@@ -72,130 +72,123 @@
#: ../data/gnac-pref-window.xml.h:4
#, fuzzy
+msgid "Album"
+msgstr "Album:"
+
+#: ../data/gnac-pref-window.xml.h:5
+#, fuzzy
msgid "Artist"
msgstr "Künstler:"
-#: ../data/gnac-pref-window.xml.h:5
+#: ../data/gnac-pref-window.xml.h:6
#, fuzzy
msgid "Artist - Album"
msgstr "Künstler - Album - Titel"
-#: ../data/gnac-pref-window.xml.h:6
+#: ../data/gnac-pref-window.xml.h:7
msgid "Artist - Album - Title"
msgstr "Künstler - Album - Titel"
-#: ../data/gnac-pref-window.xml.h:7
+#: ../data/gnac-pref-window.xml.h:8
msgid "Artist - Number - Title"
msgstr "Künstler - Nummer - Titel"
-#: ../data/gnac-pref-window.xml.h:8
+#: ../data/gnac-pref-window.xml.h:9
msgid "Artist - Title"
msgstr "Künstler - Titel"
-#: ../data/gnac-pref-window.xml.h:9
+#: ../data/gnac-pref-window.xml.h:10
#, fuzzy
msgid "Artist/Album"
msgstr "Künstler - Album - Titel"
-#: ../data/gnac-pref-window.xml.h:10
+#: ../data/gnac-pref-window.xml.h:11
+#, fuzzy
+msgid "Artist/Album (Year)"
+msgstr "Künstler - Album - Titel"
+
+#: ../data/gnac-pref-window.xml.h:12
msgid "Audio"
msgstr ""
-#: ../data/gnac-pref-window.xml.h:11
+#: ../data/gnac-pref-window.xml.h:13
#, fuzzy
msgid "Custom"
msgstr "Benutzerdefinierter Ordner"
-#: ../data/gnac-pref-window.xml.h:12
+#: ../data/gnac-pref-window.xml.h:14
msgid "Custom folder"
msgstr "Benutzerdefinierter Ordner"
-#: ../data/gnac-pref-window.xml.h:13
+#: ../data/gnac-pref-window.xml.h:15
msgid "Delete original files after conversion"
msgstr "Ursprungs-Dateien nach der Umwandlung löschen"
-#: ../data/gnac-pref-window.xml.h:14
+#: ../data/gnac-pref-window.xml.h:16
msgid "Display notification icon during conversion"
msgstr "Ein Benachrichtigungssymbol während der Umwandlung anzeigen"
-#: ../data/gnac-pref-window.xml.h:15
+#: ../data/gnac-pref-window.xml.h:17
msgid "Folder hierarchy:"
msgstr ""
-#: ../data/gnac-pref-window.xml.h:16
+#: ../data/gnac-pref-window.xml.h:18
msgid "Folder location:"
msgstr "Ordner Pfad:"
-#: ../data/gnac-pref-window.xml.h:17
+#: ../data/gnac-pref-window.xml.h:19
msgid "General"
msgstr ""
-#: ../data/gnac-pref-window.xml.h:18
+#: ../data/gnac-pref-window.xml.h:20
msgid "Gnac preferences"
msgstr "Gnac Einstellungen"
-#: ../data/gnac-pref-window.xml.h:19
+#: ../data/gnac-pref-window.xml.h:21
msgid "None"
msgstr ""
-#: ../data/gnac-pref-window.xml.h:20
+#: ../data/gnac-pref-window.xml.h:22
msgid "Number - Artist - Album - Title"
msgstr "Nummer - Künstler - Album - Titel"
-#: ../data/gnac-pref-window.xml.h:21
+#: ../data/gnac-pref-window.xml.h:23
msgid "Number - Artist - Title"
msgstr "Nummer - Künstler - Titel"
-#: ../data/gnac-pref-window.xml.h:22
+#: ../data/gnac-pref-window.xml.h:24
msgid "Number - Title"
msgstr "Nummer - Titel"
-#: ../data/gnac-pref-window.xml.h:23
+#: ../data/gnac-pref-window.xml.h:25
msgid "Output filename:"
msgstr "Ausgabe-Dateiname:"
-#: ../data/gnac-pref-window.xml.h:24
+#: ../data/gnac-pref-window.xml.h:26
msgid "Output folder:"
msgstr "Ausgabe-Ordner:"
-#: ../data/gnac-pref-window.xml.h:26
-#, no-c-format
-msgid ""
-"Patterns available:\n"
-" %b: album\n"
-" %a: artist\n"
-" %c: comment\n"
-" %d: disc number\n"
-" %e: disc count\n"
-" %f: filename\n"
-" %g: genre\n"
-" %t: title\n"
-" %l: track count\n"
-" %n: track number\n"
-" %y: year"
-msgstr ""
-
-#: ../data/gnac-pref-window.xml.h:38
+#: ../data/gnac-pref-window.xml.h:27
msgid "Same folder as source"
msgstr "Gleicher Ordner wie Quelle"
-#: ../data/gnac-pref-window.xml.h:39
+#: ../data/gnac-pref-window.xml.h:28
msgid "Source Filename"
msgstr "Quell-Dateiname"
-#: ../data/gnac-pref-window.xml.h:40
+#: ../data/gnac-pref-window.xml.h:29
msgid "Strip special characters"
msgstr ""
-#: ../data/gnac-pref-window.xml.h:41
+#: ../data/gnac-pref-window.xml.h:30
msgid "Subfolder"
msgstr "Unterordner"
-#: ../data/gnac-pref-window.xml.h:42
+#: ../data/gnac-pref-window.xml.h:31
msgid "Subfolder name:"
msgstr "Name des Unterordners:"
-#: ../data/gnac-pref-window.xml.h:43
+#: ../data/gnac-pref-window.xml.h:32
msgid "Title"
msgstr "Titel"
@@ -423,7 +416,7 @@
msgstr "Beschreibung"
#: ../data/profiles/gnac-profiles-properties.xml.h:4
-#: ../src/profiles/gnac-profiles-manager.c:166
+#: ../src/profiles/gnac-profiles-manager.c:171
msgid "Format"
msgstr "Format"
@@ -432,12 +425,12 @@
msgstr ""
#: ../data/profiles/gnac-profiles-properties.xml.h:6
-#: ../src/profiles/gnac-profiles-manager.c:158
+#: ../src/profiles/gnac-profiles-manager.c:163
msgid "Name"
msgstr "Name"
#: ../data/profiles/gnac-profiles-unknown.xml.h:1
-#: ../src/profiles/gnac-profiles-manager.c:174
+#: ../src/profiles/gnac-profiles-manager.c:179
msgid "Extension"
msgstr "Erweiterung"
@@ -753,42 +746,42 @@
msgid "Very high compression"
msgstr ""
-#: ../libgnac/libgnac-converter.c:624
+#: ../libgnac/libgnac-converter.c:626
#, c-format
msgid "File %s is already in list"
msgstr "Datei %s befindet sich bereits in der Liste"
-#: ../libgnac/libgnac-converter.c:677
+#: ../libgnac/libgnac-converter.c:679
#, c-format
msgid "File %s isn't in list"
msgstr "Datei %s befindet sich nicht in der Liste"
-#: ../libgnac/libgnac-converter.c:994
+#: ../libgnac/libgnac-converter.c:996
msgid "Unable to create destination directory"
msgstr "Ziel-Verzeichnis kann nicht erstellt werden"
-#: ../libgnac/libgnac-converter.c:1027
+#: ../libgnac/libgnac-converter.c:1029
#, fuzzy, c-format
msgid "Destination file %s already exists"
msgstr "Datei %s befindet sich bereits in der Liste"
-#: ../libgnac/libgnac-converter.c:1029
+#: ../libgnac/libgnac-converter.c:1031
msgid "Destination file already exists"
msgstr ""
-#: ../libgnac/libgnac-converter.c:1036
+#: ../libgnac/libgnac-converter.c:1038
msgid "Unable to access destination file"
msgstr "Ziel-Datei kann nicht geschrieben werden"
-#: ../libgnac/libgnac-converter.c:1041
+#: ../libgnac/libgnac-converter.c:1043
msgid "Unable to read source file"
msgstr "Quell-Datei kann nicht gelesen werden"
-#: ../libgnac/libgnac-converter.c:1050
+#: ../libgnac/libgnac-converter.c:1052
msgid "An error occured during conversion"
msgstr ""
-#: ../libgnac/libgnac-converter.c:1088
+#: ../libgnac/libgnac-converter.c:1090
msgid "unable to handle this format"
msgstr ""
@@ -832,70 +825,88 @@
msgid "Failed to create %s element"
msgstr ""
-#: ../src/profiles/gnac-profiles-manager.c:244
-#: ../src/profiles/gnac-profiles-manager.c:247
+#: ../libgnac/libgnac-metadata.c:723
+#, fuzzy
+msgid "filename.ext"
+msgstr "Dateiname"
+
+#: ../libgnac/libgnac-metadata.c:753
+msgid "Converted by Gnac"
+msgstr ""
+
+#: ../src/profiles/gnac-profiles-manager.c:39
+msgid " (copy)"
+msgstr ""
+
+#: ../src/profiles/gnac-profiles-manager.c:249
+#: ../src/profiles/gnac-profiles-manager.c:252
msgid "Unable to create directory for saved profiles."
msgstr ""
-#: ../src/profiles/gnac-profiles-manager.c:245
+#: ../src/profiles/gnac-profiles-manager.c:250
msgid "You may not be able to save your profiles"
msgstr ""
-#: ../src/profiles/gnac-profiles-manager.c:285
-#: ../src/profiles/gnac-profiles-manager.c:287
+#: ../src/profiles/gnac-profiles-manager.c:293
+#: ../src/profiles/gnac-profiles-manager.c:295
msgid "Unable to browse the profiles directory"
msgstr ""
-#: ../src/profiles/gnac-profiles-manager.c:313
+#: ../src/profiles/gnac-profiles-manager.c:322
msgid "Unable to find directory containing default profiles"
msgstr ""
-#: ../src/profiles/gnac-profiles-manager.c:347
+#: ../src/profiles/gnac-profiles-manager.c:356
msgid "Unable to browse the default profiles directory"
msgstr ""
-#: ../src/profiles/gnac-profiles-manager.c:716
+#: ../src/profiles/gnac-profiles-manager.c:728
#, c-format
msgid "Impossible to launch thread for collecting files to import: %s\n"
msgstr ""
-#: ../src/profiles/gnac-profiles-manager.c:718
+#: ../src/profiles/gnac-profiles-manager.c:730
msgid "Impossible to import file(s)"
msgstr ""
-#: ../src/profiles/gnac-profiles-manager.c:789
+#: ../src/profiles/gnac-profiles-manager.c:801
#, c-format
msgid ""
"Impossible to load file \"%s\": a profile with same file name already "
"exists.\n"
msgstr ""
-#: ../src/profiles/gnac-profiles-manager.c:823
+#: ../src/profiles/gnac-profiles-manager.c:835
#, c-format
msgid "Impossible to import the file \"%s\". File type not supported\n"
msgstr ""
-#: ../src/profiles/gnac-profiles-manager.c:839
+#: ../src/profiles/gnac-profiles-manager.c:851
msgid "files failed to be imported"
msgstr ""
-#: ../src/profiles/gnac-profiles-manager.c:839
+#: ../src/profiles/gnac-profiles-manager.c:851
msgid "file failed to be imported"
msgstr ""
-#: ../src/profiles/gnac-profiles-manager.c:842
+#: ../src/profiles/gnac-profiles-manager.c:854
msgid "files successfully imported"
msgstr ""
-#: ../src/profiles/gnac-profiles-manager.c:842
+#: ../src/profiles/gnac-profiles-manager.c:854
msgid "file successfully imported"
msgstr ""
-#: ../src/profiles/gnac-profiles-manager.c:953
+#: ../src/profiles/gnac-profiles-manager.c:965
msgid "New profile"
msgstr "Neues Profil"
-#: ../src/profiles/gnac-profiles-manager.c:979
+#: ../src/profiles/gnac-profiles-manager.c:1011
+#: ../src/profiles/gnac-profiles-manager.c:1037
+msgid "Failed to copy the profile"
+msgstr ""
+
+#: ../src/profiles/gnac-profiles-manager.c:1065
msgid "Edit profile"
msgstr "Profil bearbeiten"
@@ -1078,7 +1089,7 @@
msgid "%s left"
msgstr "%s verbleibend"
-#: ../src/gnac-main.c:849 ../src/gnac-main.c:1054 ../src/gnac-main.c:1086
+#: ../src/gnac-main.c:849 ../src/gnac-main.c:1065 ../src/gnac-main.c:1097
#, c-format
msgid "Error: %s\n"
msgstr "Fehler: %s\n"
@@ -1107,20 +1118,20 @@
" Error message: %s\n"
msgstr ""
-#: ../src/gnac-main.c:1010
+#: ../src/gnac-main.c:1021
msgid "Open a file..."
msgstr "Datei öffnen..."
-#: ../src/gnac-main.c:1023
+#: ../src/gnac-main.c:1034
msgid "Close dialog on add"
msgstr "Dialog nach dem Hinzufügen schließen"
-#: ../src/gnac-main.c:1103
+#: ../src/gnac-main.c:1114
msgid "No help available yet"
msgstr "Hilfe ist noch nicht verfügbar"
#. Parse command line arguments
-#: ../src/gnac-main.c:1221
+#: ../src/gnac-main.c:1232
msgid "[URI...] - Convert your audio files"
msgstr ""
@@ -1130,7 +1141,23 @@
msgid "Invalid UTF-8 filename: %s\n"
msgstr ""
-#: ../src/gnac-prefs.c:295 ../src/gnac-properties.c:407 ../src/gnac-ui.c:84
+#: ../src/gnac-prefs.c:47
+msgid ""
+"Patterns available:\n"
+" <b>\\%a:</b> artist\n"
+" <b>\\%b:</b> album\n"
+" <b>\\%c:</b> comment\n"
+" <b>\\%d:</b> disc number\n"
+" <b>\\%e:</b> disc count\n"
+" <b>\\%f:</b> filename\n"
+" <b>\\%g:</b> genre\n"
+" <b>\\%t:</b> title\n"
+" <b>\\%l:</b> track count\n"
+" <b>\\%n:</b> track number\n"
+" <b>\\%y:</b> year"
+msgstr ""
+
+#: ../src/gnac-prefs.c:318 ../src/gnac-properties.c:407 ../src/gnac-ui.c:84
#, c-format
msgid "Unable to read file: %s\n"
msgstr "Datei kann nicht gelesen werden: %s\n"
Modified: trunk/po/fr.po
===================================================================
--- trunk/po/fr.po 2009-07-17 07:08:04 UTC (rev 375)
+++ trunk/po/fr.po 2009-07-20 07:14:12 UTC (rev 376)
@@ -9,8 +9,8 @@
msgstr ""
"Project-Id-Version: Gnac 0.2-svn\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-07-15 08:49+0200\n"
-"PO-Revision-Date: 2009-07-15 09:07+0200\n"
+"POT-Creation-Date: 2009-07-20 09:09+0200\n"
+"PO-Revision-Date: 2009-07-19 17:25+0200\n"
"Last-Translator: David Joaquim <dav...@gm...>\n"
"Language-Team: French <bdu...@us...>\n"
"MIME-Version: 1.0\n"
@@ -32,11 +32,11 @@
#: ../data/gnac.schemas.in.h:3
msgid "Folder hierarchy"
-msgstr "Hiérarchie de dossiers"
+msgstr "Hiérarchie des dossiers"
#: ../data/gnac.schemas.in.h:4
msgid "Folder hierarchy pattern"
-msgstr ""
+msgstr "Modèle pour la hiérarchie des dossiers"
#: ../data/gnac.schemas.in.h:5
msgid "Folder type"
@@ -55,9 +55,8 @@
msgstr "Noms des fichiers convertis"
#: ../data/gnac.schemas.in.h:9
-#, fuzzy
msgid "Output filename pattern"
-msgstr "Noms des fichiers convertis"
+msgstr "Modèle pour les noms de fichiers convertis"
#: ../data/gnac.schemas.in.h:10
msgid "Strip special characters in filenames"
@@ -72,132 +71,122 @@
msgstr "<b>Affichage:</b>"
#: ../data/gnac-pref-window.xml.h:3
-#, fuzzy
msgid "<b>File and folder naming:</b>"
-msgstr "<b>Informations sur le profile</b>"
+msgstr "<b>Nommage des fichiers et dossiers:</b>"
#: ../data/gnac-pref-window.xml.h:4
+msgid "Album"
+msgstr "Album"
+
+#: ../data/gnac-pref-window.xml.h:5
msgid "Artist"
msgstr "Artiste"
-#: ../data/gnac-pref-window.xml.h:5
+#: ../data/gnac-pref-window.xml.h:6
msgid "Artist - Album"
msgstr "Artiste - Album"
-#: ../data/gnac-pref-window.xml.h:6
+#: ../data/gnac-pref-window.xml.h:7
msgid "Artist - Album - Title"
msgstr "Artiste - Album - Titre"
-#: ../data/gnac-pref-window.xml.h:7
+#: ../data/gnac-pref-window.xml.h:8
msgid "Artist - Number - Title"
msgstr "Artiste - Numéro - Titre"
-#: ../data/gnac-pref-window.xml.h:8
+#: ../data/gnac-pref-window.xml.h:9
msgid "Artist - Title"
msgstr "Artiste - Titre"
-#: ../data/gnac-pref-window.xml.h:9
+#: ../data/gnac-pref-window.xml.h:10
msgid "Artist/Album"
msgstr "Artiste/Album"
-#: ../data/gnac-pref-window.xml.h:10
+#: ../data/gnac-pref-window.xml.h:11
+msgid "Artist/Album (Year)"
+msgstr "Artiste/Album (Année)"
+
+#: ../data/gnac-pref-window.xml.h:12
msgid "Audio"
msgstr "Audio"
-#: ../data/gnac-pref-window.xml.h:11
+#: ../data/gnac-pref-window.xml.h:13
msgid "Custom"
msgstr "Personnalisée"
-#: ../data/gnac-pref-window.xml.h:12
+#: ../data/gnac-pref-window.xml.h:14
msgid "Custom folder"
msgstr "Dossier personnalisé"
-#: ../data/gnac-pref-window.xml.h:13
+#: ../data/gnac-pref-window.xml.h:15
msgid "Delete original files after conversion"
msgstr "Effacer les fichiers originaux après la conversion"
-#: ../data/gnac-pref-window.xml.h:14
+#: ../data/gnac-pref-window.xml.h:16
msgid "Display notification icon during conversion"
msgstr "Afficher une icone de notification durant la conversion"
-#: ../data/gnac-pref-window.xml.h:15
+#: ../data/gnac-pref-window.xml.h:17
msgid "Folder hierarchy:"
-msgstr ""
+msgstr "Hiérarchie des dossiers:"
-#: ../data/gnac-pref-window.xml.h:16
+#: ../data/gnac-pref-window.xml.h:18
msgid "Folder location:"
msgstr "Emplacement du dossier"
-#: ../data/gnac-pref-window.xml.h:17
+#: ../data/gnac-pref-window.xml.h:19
msgid "General"
msgstr "Général"
-#: ../data/gnac-pref-window.xml.h:18
+#: ../data/gnac-pref-window.xml.h:20
msgid "Gnac preferences"
msgstr "Préférences de Gnac"
-#: ../data/gnac-pref-window.xml.h:19
+#: ../data/gnac-pref-window.xml.h:21
msgid "None"
msgstr "Aucune"
-#: ../data/gnac-pref-window.xml.h:20
+#: ../data/gnac-pref-window.xml.h:22
msgid "Number - Artist - Album - Title"
msgstr "Numéro - Artiste - Album - Titre"
-#: ../data/gnac-pref-window.xml.h:21
+#: ../data/gnac-pref-window.xml.h:23
msgid "Number - Artist - Title"
msgstr "Numéro - Artiste - Titre"
-#: ../data/gnac-pref-window.xml.h:22
+#: ../data/gnac-pref-window.xml.h:24
msgid "Number - Title"
msgstr "Numéro - Titre"
-#: ../data/gnac-pref-window.xml.h:23
+#: ../data/gnac-pref-window.xml.h:25
msgid "Output filename:"
msgstr "Noms des fichiers convertis"
-#: ../data/gnac-pref-window.xml.h:24
+#: ../data/gnac-pref-window.xml.h:26
msgid "Output folder:"
msgstr "Dossier de sortie"
-#: ../data/gnac-pref-window.xml.h:26
-#, no-c-format
-msgid ""
-"Patterns available:\n"
-" %b: album\n"
-" %a: artist\n"
-" %c: comment\n"
-" %d: disc number\n"
-" %e: disc count\n"
-" %f: filename\n"
-" %g: genre\n"
-" %t: title\n"
-" %l: track count\n"
-" %n: track number\n"
-" %y: year"
-msgstr ""
-
-#: ../data/gnac-pref-window.xml.h:38
+#: ../data/gnac-pref-window.xml.h:27
msgid "Same folder as source"
msgstr "Dans le même dossier que la source"
-#: ../data/gnac-pref-window.xml.h:39
+#: ../data/gnac-pref-window.xml.h:28
msgid "Source Filename"
msgstr "Nom du fichier source"
-#: ../data/gnac-pref-window.xml.h:40
+#: ../data/gnac-pref-window.xml.h:29
msgid "Strip special characters"
msgstr "Enlever les caractères spéciaux"
-#: ../data/gnac-pref-window.xml.h:41
+#: ../data/gnac-pref-window.xml.h:30
msgid "Subfolder"
msgstr "Sous-dossier"
-#: ../data/gnac-pref-window.xml.h:42
+#: ../data/gnac-pref-window.xml.h:31
msgid "Subfolder name:"
msgstr "Nom du sous-dossier"
-#: ../data/gnac-pref-window.xml.h:43
+#: ../data/gnac-pref-window.xml.h:32
msgid "Title"
msgstr "Titre"
@@ -441,7 +430,7 @@
msgstr "Description"
#: ../data/profiles/gnac-profiles-properties.xml.h:4
-#: ../src/profiles/gnac-profiles-manager.c:166
+#: ../src/profiles/gnac-profiles-manager.c:171
msgid "Format"
msgstr "Format"
@@ -450,12 +439,12 @@
msgstr "Pipeline gstreamer"
#: ../data/profiles/gnac-profiles-properties.xml.h:6
-#: ../src/profiles/gnac-profiles-manager.c:158
+#: ../src/profiles/gnac-profiles-manager.c:163
msgid "Name"
msgstr "Nom"
#: ../data/profiles/gnac-profiles-unknown.xml.h:1
-#: ../src/profiles/gnac-profiles-manager.c:174
+#: ../src/profiles/gnac-profiles-manager.c:179
msgid "Extension"
msgstr "Extension"
@@ -831,42 +820,42 @@
msgid "Very high compression"
msgstr "Très haute compression"
-#: ../libgnac/libgnac-converter.c:624
+#: ../libgnac/libgnac-converter.c:626
#, c-format
msgid "File %s is already in list"
msgstr "Le fichier %s se trouve déjà dans la liste"
-#: ../libgnac/libgnac-converter.c:677
+#: ../libgnac/libgnac-converter.c:679
#, c-format
msgid "File %s isn't in list"
msgstr "Le fichier %s ne se trouve pas dans la liste"
-#: ../libgnac/libgnac-converter.c:994
+#: ../libgnac/libgnac-converter.c:996
msgid "Unable to create destination directory"
msgstr "Echec lors de la création du répertoire de sortie"
-#: ../libgnac/libgnac-converter.c:1027
+#: ../libgnac/libgnac-converter.c:1029
#, c-format
msgid "Destination file %s already exists"
msgstr "Le fichier de destination %s existe déjà"
-#: ../libgnac/libgnac-converter.c:1029
+#: ../libgnac/libgnac-converter.c:1031
msgid "Destination file already exists"
msgstr "Le fichier de destination existe déjà"
-#: ../libgnac/libgnac-converter.c:1036
+#: ../libgnac/libgnac-converter.c:1038
msgid "Unable to access destination file"
msgstr "Echec lors de l'accès au fichier destination"
-#: ../libgnac/libgnac-converter.c:1041
+#: ../libgnac/libgnac-converter.c:1043
msgid "Unable to read source file"
msgstr "Echec lors de la lecture du fichier source"
-#: ../libgnac/libgnac-converter.c:1050
+#: ../libgnac/libgnac-converter.c:1052
msgid "An error occured during conversion"
msgstr "Une erreur est survenue durant la conversion"
-#: ../libgnac/libgnac-converter.c:1088
+#: ../libgnac/libgnac-converter.c:1090
msgid "unable to handle this format"
msgstr "Format non pris en charge par Gnac"
@@ -910,39 +899,51 @@
msgid "Failed to create %s element"
msgstr "Erreur lors de la création de l'élément %s"
-#: ../src/profiles/gnac-profiles-manager.c:244
-#: ../src/profiles/gnac-profiles-manager.c:247
+#: ../libgnac/libgnac-metadata.c:723
+msgid "filename.ext"
+msgstr "nom du fichier.ext"
+
+#: ../libgnac/libgnac-metadata.c:753
+msgid "Converted by Gnac"
+msgstr "Converti par Gnac"
+
+#: ../src/profiles/gnac-profiles-manager.c:39
+msgid " (copy)"
+msgstr " (copie)"
+
+#: ../src/profiles/gnac-profiles-manager.c:249
+#: ../src/profiles/gnac-profiles-manager.c:252
msgid "Unable to create directory for saved profiles."
msgstr "Impossible de créer le dossier contenant les profiles sauvegardés."
-#: ../src/profiles/gnac-profiles-manager.c:245
+#: ../src/profiles/gnac-profiles-manager.c:250
msgid "You may not be able to save your profiles"
msgstr "Vous ne pourrez pas sauvegarder vos profiles"
-#: ../src/profiles/gnac-profiles-manager.c:285
-#: ../src/profiles/gnac-profiles-manager.c:287
+#: ../src/profiles/gnac-profiles-manager.c:293
+#: ../src/profiles/gnac-profiles-manager.c:295
msgid "Unable to browse the profiles directory"
msgstr "Impossible de lire le répertoire contenant les profiles"
-#: ../src/profiles/gnac-profiles-manager.c:313
+#: ../src/profiles/gnac-profiles-manager.c:322
msgid "Unable to find directory containing default profiles"
msgstr "Impossible de trouver le dossier contenant les profiles par défaut"
-#: ../src/profiles/gnac-profiles-manager.c:347
+#: ../src/profiles/gnac-profiles-manager.c:356
msgid "Unable to browse the default profiles directory"
msgstr "Impossible de lire le dossier contenant les profiles par défaut"
-#: ../src/profiles/gnac-profiles-manager.c:716
+#: ../src/profiles/gnac-profiles-manager.c:728
#, c-format
msgid "Impossible to launch thread for collecting files to import: %s\n"
msgstr ""
"Impossible de lancer le thread collectant les fichiers à importer: %s\n"
-#: ../src/profiles/gnac-profiles-manager.c:718
+#: ../src/profiles/gnac-profiles-manager.c:730
msgid "Impossible to import file(s)"
msgstr "Impossible d'importer le(s) fichier(s)"
-#: ../src/profiles/gnac-profiles-manager.c:789
+#: ../src/profiles/gnac-profiles-manager.c:801
#, c-format
msgid ""
"Impossible to load file \"%s\": a profile with same file name already "
@@ -951,34 +952,39 @@
"Impossible de charger le fichier \"%s\": un profile avec le même nom existe "
"déjà.\n"
-#: ../src/profiles/gnac-profiles-manager.c:823
+#: ../src/profiles/gnac-profiles-manager.c:835
#, c-format
msgid "Impossible to import the file \"%s\". File type not supported\n"
msgstr ""
"Impossible d'importer le fichier \"%s\". Le type de fichier n'est pas "
"supporté.\n"
-#: ../src/profiles/gnac-profiles-manager.c:839
+#: ../src/profiles/gnac-profiles-manager.c:851
msgid "files failed to be imported"
msgstr "fichiers n'ont pas pu être importé"
-#: ../src/profiles/gnac-profiles-manager.c:839
+#: ../src/profiles/gnac-profiles-manager.c:851
msgid "file failed to be imported"
msgstr "fichier n'a pas pu être importé"
-#: ../src/profiles/gnac-profiles-manager.c:842
+#: ../src/profiles/gnac-profiles-manager.c:854
msgid "files successfully imported"
msgstr "fichiers importés avec succès"
-#: ../src/profiles/gnac-profiles-manager.c:842
+#: ../src/profiles/gnac-profiles-manager.c:854
msgid "file successfully imported"
msgstr "fichier importé avec succès"
-#: ../src/profiles/gnac-profiles-manager.c:953
+#: ../src/profiles/gnac-profiles-manager.c:965
msgid "New profile"
msgstr "Nouveau profile"
-#: ../src/profiles/gnac-profiles-manager.c:979
+#: ../src/profiles/gnac-profiles-manager.c:1011
+#: ../src/profiles/gnac-profiles-manager.c:1037
+msgid "Failed to copy the profile"
+msgstr "Impossible de copier le profile"
+
+#: ../src/profiles/gnac-profiles-manager.c:1065
msgid "Edit profile"
msgstr "Édition du profile"
@@ -1169,7 +1175,7 @@
msgid "%s left"
msgstr "%s restantes"
-#: ../src/gnac-main.c:849 ../src/gnac-main.c:1054 ../src/gnac-main.c:1086
+#: ../src/gnac-main.c:849 ../src/gnac-main.c:1065 ../src/gnac-main.c:1097
#, c-format
msgid "Error: %s\n"
msgstr "Erreur: %s\n"
@@ -1200,20 +1206,20 @@
"Echec lors de la conversion du fichier %s\n"
" Message d'erreur: %s\n"
-#: ../src/gnac-main.c:1010
+#: ../src/gnac-main.c:1021
msgid "Open a file..."
msgstr "Ouvrir un fichier..."
-#: ../src/gnac-main.c:1023
+#: ../src/gnac-main.c:1034
msgid "Close dialog on add"
msgstr "Fermer la fenêtre après l'ajout"
-#: ../src/gnac-main.c:1103
+#: ../src/gnac-main.c:1114
msgid "No help available yet"
msgstr "Aucune aide disponible pour le moment"
#. Parse command line arguments
-#: ../src/gnac-main.c:1221
+#: ../src/gnac-main.c:1232
msgid "[URI...] - Convert your audio files"
msgstr "[URI...] - Convertissez vos fichiers audio"
@@ -1223,7 +1229,35 @@
msgid "Invalid UTF-8 filename: %s\n"
msgstr "Nom de fichier UTF-8 invalide: %s\n"
-#: ../src/gnac-prefs.c:295 ../src/gnac-properties.c:407 ../src/gnac-ui.c:84
+#: ../src/gnac-prefs.c:47
+msgid ""
+"Patterns available:\n"
+" <b>\\%a:</b> artist\n"
+" <b>\\%b:</b> album\n"
+" <b>\\%c:</b> comment\n"
+" <b>\\%d:</b> disc number\n"
+" <b>\\%e:</b> disc count\n"
+" <b>\\%f:</b> filename\n"
+" <b>\\%g:</b> genre\n"
+" <b>\\%t:</b> title\n"
+" <b>\\%l:</b> track count\n"
+" <b>\\%n:</b> track number\n"
+" <b>\\%y:</b> year"
+msgstr ""
+"Modèles disponibles:\n"
+" <b>\\%a:</b> artiste\n"
+" <b>\\%b:</b> album\n"
+" <b>\\%c:</b> commentaire\n"
+" <b>\\%d:</b> numéro du disques\n"
+" <b>\\%e:</b> nombre de disques\n"
+" <b>\\%f:</b> nom du fichier\n"
+" <b>\\%g:</b> genre\n"
+" <b>\\%t:</b> titre\n"
+" <b>\\%l:</b> numéro de piste\n"
+" <b>\\%n:</b> nombre de piste\n"
+" <b>\\%y:</b> année"
+
+#: ../src/gnac-prefs.c:318 ../src/gnac-properties.c:407 ../src/gnac-ui.c:84
#, c-format
msgid "Unable to read file: %s\n"
msgstr "Echec lors de la lecture du fichier: %s\n"
@@ -1303,33 +1337,3 @@
#, c-format
msgid "Cannot trash file %s"
msgstr "Impossible de déplacer le fichier %s dans la corbeille"
-
-#~ msgid "files imported"
-#~ msgstr "fichiers importés"
-
-#~ msgid "Impossible to load format module %s\n"
-#~ msgstr "Impossible de charger le module de format %s\n"
-
-#~ msgid "The format modules directory doesn't exits\n"
-#~ msgstr "Le répertoire contenant les modules de format n'existe pas\n"
-
-#~ msgid "Unable to browse to format directory\n"
-#~ msgstr "Impossible de lire le répertoire contenant les modules de format\n"
-
-#~ msgid "Good trade-off between quality and file size."
-#~ msgstr "Offre un bon compromis entre qualité et taille de fichiers."
-
-#~ msgid "High quality with minimally-compressed file size."
-#~ msgstr ""
-#~ "Offre une haute qualité tout en compressant les fichiers de manière "
-#~ "optimale."
-
-#~ msgid "Audio codec that features both lossless and lossy encoding."
-#~ msgstr "Codec audio capable d'encoder à la fois avec et sans perte."
-
-#~ msgid ""
-#~ "Allows to stop transmitting completely when the background noise is "
-#~ "stationary."
-#~ msgstr ""
-#~ "Permet d'arrêter complêtement la transmission lorsque le bruit de fond "
-#~ "est stationnaire."
Modified: trunk/po/gnac.pot
===================================================================
--- trunk/po/gnac.pot 2009-07-17 07:08:04 UTC (rev 375)
+++ trunk/po/gnac.pot 2009-07-20 07:14:12 UTC (rev 376)
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-07-15 08:49+0200\n"
+"POT-Creation-Date: 2009-07-20 09:09+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL...@li...>\n"
@@ -74,127 +74,118 @@
msgstr ""
#: ../data/gnac-pref-window.xml.h:4
-msgid "Artist"
+msgid "Album"
msgstr ""
#: ../data/gnac-pref-window.xml.h:5
-msgid "Artist - Album"
+msgid "Artist"
msgstr ""
#: ../data/gnac-pref-window.xml.h:6
-msgid "Artist - Album - Title"
+msgid "Artist - Album"
msgstr ""
#: ../data/gnac-pref-window.xml.h:7
-msgid "Artist - Number - Title"
+msgid "Artist - Album - Title"
msgstr ""
#: ../data/gnac-pref-window.xml.h:8
-msgid "Artist - Title"
+msgid "Artist - Number - Title"
msgstr ""
#: ../data/gnac-pref-window.xml.h:9
-msgid "Artist/Album"
+msgid "Artist - Title"
msgstr ""
#: ../data/gnac-pref-window.xml.h:10
-msgid "Audio"
+msgid "Artist/Album"
msgstr ""
#: ../data/gnac-pref-window.xml.h:11
-msgid "Custom"
+msgid "Artist/Album (Year)"
msgstr ""
#: ../data/gnac-pref-window.xml.h:12
-msgid "Custom folder"
+msgid "Audio"
msgstr ""
#: ../data/gnac-pref-window.xml.h:13
-msgid "Delete original files after conversion"
+msgid "Custom"
msgstr ""
#: ../data/gnac-pref-window.xml.h:14
-msgid "Display notification icon during conversion"
+msgid "Custom folder"
msgstr ""
#: ../data/gnac-pref-window.xml.h:15
-msgid "Folder hierarchy:"
+msgid "Delete original files after conversion"
msgstr ""
#: ../data/gnac-pref-window.xml.h:16
-msgid "Folder location:"
+msgid "Display notification icon during conversion"
msgstr ""
#: ../data/gnac-pref-window.xml.h:17
-msgid "General"
+msgid "Folder hierarchy:"
msgstr ""
#: ../data/gnac-pref-window.xml.h:18
-msgid "Gnac preferences"
+msgid "Folder location:"
msgstr ""
#: ../data/gnac-pref-window.xml.h:19
-msgid "None"
+msgid "General"
msgstr ""
#: ../data/gnac-pref-window.xml.h:20
-msgid "Number - Artist - Album - Title"
+msgid "Gnac preferences"
msgstr ""
#: ../data/gnac-pref-window.xml.h:21
-msgid "Number - Artist - Title"
+msgid "None"
msgstr ""
#: ../data/gnac-pref-window.xml.h:22
-msgid "Number - Title"
+msgid "Number - Artist - Album - Title"
msgstr ""
#: ../data/gnac-pref-window.xml.h:23
-msgid "Output filename:"
+msgid "Number - Artist - Title"
msgstr ""
#: ../data/gnac-pref-window.xml.h:24
-msgid "Output folder:"
+msgid "Number - Title"
msgstr ""
+#: ../data/gnac-pref-window.xml.h:25
+msgid "Output filename:"
+msgstr ""
+
#: ../data/gnac-pref-window.xml.h:26
-#, no-c-format
-msgid ""
-"Patterns available:\n"
-" %b: album\n"
-" %a: artist\n"
-" %c: comment\n"
-" %d: disc number\n"
-" %e: disc count\n"
-" %f: filename\n"
-" %g: genre\n"
-" %t: title\n"
-" %l: track count\n"
-" %n: track number\n"
-" %y: year"
+msgid "Output folder:"
msgstr ""
-#: ../data/gnac-pref-window.xml.h:38
+#: ../data/gnac-pref-window.xml.h:27
msgid "Same folder as source"
msgstr ""
-#: ../data/gnac-pref-window.xml.h:39
+#: ../data/gnac-pref-window.xml.h:28
msgid "Source Filename"
msgstr ""
-#: ../data/gnac-pref-window.xml.h:40
+#: ../data/gnac-pref-window.xml.h:29
msgid "Strip special characters"
msgstr ""
-#: ../data/gnac-pref-window.xml.h:41
+#: ../data/gnac-pref-window.xml.h:30
msgid "Subfolder"
msgstr ""
-#: ../data/gnac-pref-window.xml.h:42
+#: ../data/gnac-pref-window.xml.h:31
msgid "Subfolder name:"
msgstr ""
-#: ../data/gnac-pref-window.xml.h:43
+#: ../data/gnac-pref-window.xml.h:32
msgid "Title"
msgstr ""
@@ -422,7 +413,7 @@
msgstr ""
#: ../data/profiles/gnac-profiles-properties.xml.h:4
-#: ../src/profiles/gnac-profiles-manager.c:166
+#: ../src/profiles/gnac-profiles-manager.c:171
msgid "Format"
msgstr ""
@@ -431,12 +422,12 @@
msgstr ""
#: ../data/profiles/gnac-profiles-properties.xml.h:6
-#: ../src/profiles/gnac-profiles-manager.c:158
+#: ../src/profiles/gnac-profiles-manager.c:163
msgid "Name"
msgstr ""
#: ../data/profiles/gnac-profiles-unknown.xml.h:1
-#: ../src/profiles/gnac-profiles-manager.c:174
+#: ../src/profiles/gnac-profiles-manager.c:179
msgid "Extension"
msgstr ""
@@ -752,42 +743,42 @@
msgid "Very high compression"
msgstr ""
-#: ../libgnac/libgnac-converter.c:624
+#: ../libgnac/libgnac-converter.c:626
#, c-format
msgid "File %s is already in list"
msgstr ""
-#: ../libgnac/libgnac-converter.c:677
+#: ../libgnac/libgnac-converter.c:679
#, c-format
msgid "File %s isn't in list"
msgstr ""
-#: ../libgnac/libgnac-converter.c:994
+#: ../libgnac/libgnac-converter.c:996
msgid "Unable to create destination directory"
msgstr ""
-#: ../libgnac/libgnac-converter.c:1027
+#: ../libgnac/libgnac-converter.c:1029
#, c-format
msgid "Destination file %s already exists"
msgstr ""
-#: ../libgnac/libgnac-converter.c:1029
+#: ../libgnac/libgnac-converter.c:1031
msgid "Destination file already exists"
msgstr ""
-#: ../libgnac/libgnac-converter.c:1036
+#: ../libgnac/libgnac-converter.c:1038
msgid "Unable to access destination file"
msgstr ""
-#: ../libgnac/libgnac-converter.c:1041
+#: ../libgnac/libgnac-converter.c:1043
msgid "Unable to read source file"
msgstr ""
-#: ../libgnac/libgnac-converter.c:1050
+#: ../libgnac/libgnac-converter.c:1052
msgid "An error occured during conversion"
msgstr ""
-#: ../libgnac/libgnac-converter.c:1088
+#: ../libgnac/libgnac-converter.c:1090
msgid "unable to handle this format"
msgstr ""
@@ -831,70 +822,87 @@
msgid "Failed to create %s element"
msgstr ""
-#: ../src/profiles/gnac-profiles-manager.c:244
-#: ../src/profiles/gnac-profiles-manager.c:247
+#: ../libgnac/libgnac-metadata.c:723
+msgid "filename.ext"
+msgstr ""
+
+#: ../libgnac/libgnac-metadata.c:753
+msgid "Converted by Gnac"
+msgstr ""
+
+#: ../src/profiles/gnac-profiles-manager.c:39
+msgid " (copy)"
+msgstr ""
+
+#: ../src/profiles/gnac-profiles-manager.c:249
+#: ../src/profiles/gnac-profiles-manager.c:252
msgid "Unable to create directory for saved profiles."
msgstr ""
-#: ../src/profiles/gnac-profiles-manager.c:245
+#: ../src/profiles/gnac-profiles-manager.c:250
msgid "You may not be able to save your profiles"
msgstr ""
-#: ../src/profiles/gnac-profiles-manager.c:285
-#: ../src/profiles/gnac-profiles-manager.c:287
+#: ../src/profiles/gnac-profiles-manager.c:293
+#: ../src/profiles/gnac-profiles-manager.c:295
msgid "Unable to browse the profiles directory"
msgstr ""
-#: ../src/profiles/gnac-profiles-manager.c:313
+#: ../src/profiles/gnac-profiles-manager.c:322
msgid "Unable to find directory containing default profiles"
msgstr ""
-#: ../src/profiles/gnac-profiles-manager.c:347
+#: ../src/profiles/gnac-profiles-manager.c:356
msgid "Unable to browse the default profiles directory"
msgstr ""
-#: ../src/profiles/gnac-profiles-manager.c:716
+#: ../src/profiles/gnac-profiles-manager.c:728
#, c-format
msgid "Impossible to launch thread for collecting files to import: %s\n"
msgstr ""
-#: ../src/profiles/gnac-profiles-manager.c:718
+#: ../src/profiles/gnac-profiles-manager.c:730
msgid "Impossible to import file(s)"
msgstr ""
-#: ../src/profiles/gnac-profiles-manager.c:789
+#: ../src/profiles/gnac-profiles-manager.c:801
#, c-format
msgid ""
"Impossible to load file \"%s\": a profile with same file name already "
"exists.\n"
msgstr ""
-#: ../src/profiles/gnac-profiles-manager.c:823
+#: ../src/profiles/gnac-profiles-manager.c:835
#, c-format
msgid "Impossible to import the file \"%s\". File type not supported\n"
msgstr ""
-#: ../src/profiles/gnac-profiles-manager.c:839
+#: ../src/profiles/gnac-profiles-manager.c:851
msgid "files failed to be imported"
msgstr ""
-#: ../src/profiles/gnac-profiles-manager.c:839
+#: ../src/profiles/gnac-profiles-manager.c:851
msgid "file failed to be imported"
msgstr ""
-#: ../src/profiles/gnac-profiles-manager.c:842
+#: ../src/profiles/gnac-profiles-manager.c:854
msgid "files successfully imported"
msgstr ""
-#: ../src/profiles/gnac-profiles-manager.c:842
+#: ../src/profiles/gnac-profiles-manager.c:854
msgid "file successfully imported"
msgstr ""
-#: ../src/profiles/gnac-profiles-manager.c:953
+#: ../src/profiles/gnac-profiles-manager.c:965
msgid "New profile"
msgstr ""
-#: ../src/profiles/gnac-profiles-manager.c:979
+#: ../src/profiles/gnac-profiles-manager.c:1011
+#: ../src/profiles/gnac-profiles-manager.c:1037
+msgid "Failed to copy the profile"
+msgstr ""
+
+#: ../src/profiles/gnac-profiles-manager.c:1065
msgid "Edit profile"
msgstr ""
@@ -1077,7 +1085,7 @@
msgid "%s left"
msgstr ""
-#: ../src/gnac-main.c:849 ../src/gnac-main.c:1054 ../src/gnac-main.c:1086
+#: ../src/gnac-main.c:849 ../src/gnac-main.c:1065 ../src/gnac-main.c:1097
#, c-format
msgid "Error: %s\n"
msgstr ""
@@ -1106,20 +1114,20 @@
" Error message: %s\n"
msgstr ""
-#: ../src/gnac-main.c:1010
+#: ../src/gnac-main.c:1021
msgid "Open a file..."
msgstr ""
-#: ../src/gnac-main.c:1023
+#: ../src/gnac-main.c:1034
msgid "Close dialog on add"
msgstr ""
-#: ../src/gnac-main.c:1103
+#: ../src/gnac-main.c:1114
msgid "No help available yet"
msgstr ""
#. Parse command line arguments
-#: ../src/gnac-main.c:1221
+#: ../src/gnac-main.c:1232
msgid "[URI...] - Convert your audio files"
msgstr ""
@@ -1129,7 +1137,23 @@
msgid "Invalid UTF-8 filename: %s\n"
msgstr ""
-#: ../src/gnac-prefs.c:295 ../src/gnac-properties.c:407 ../src/gnac-ui.c:84
+#: ../src/gnac-prefs.c:47
+msgid ""
+"Patterns available:\n"
+" <b>\\%a:</b> artist\n"
+" <b>\\%b:</b> album\n"
+" <b>\\%c:</b> comment\n"
+" <b>\\%d:</b> disc number\n"
+" <b>\\%e:</b> disc count\n"
+" <b>\\%f:</b> filename\n"
+" <b>\\%g:</b> genre\n"
+" <b>\\%t:</b> title\n"
+" <b>\\%l:</b> track count\n"
+" <b>\\%n:</b> track number\n"
+" <b>\\%y:</b> year"
+msgstr ""
+
+#: ../src/gnac-prefs.c:318 ../src/gnac-properties.c:407 ../src/gnac-ui.c:84
#, c-format
msgid "Unable to read file: %s\n"
msgstr ""
Modified: trunk/po/he.po
===================================================================
--- trunk/po/he.po 2009-07-17 07:08:04 UTC (rev 375)
+++ trunk/po/he.po 2009-07-20 07:14:12 UTC (rev 376)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: Gnac-0.2-svn\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-07-15 08:49+0200\n"
+"POT-Creation-Date: 2009-07-20 09:09+0200\n"
"PO-Revision-Date: 2009-04-05 12:33+0100\n"
"Last-Translator: David Joaquim <dav...@gm...>\n"
"Language-Team: LANGUAGE <LL...@li...>\n"
@@ -77,131 +77,124 @@
#: ../data/gnac-pref-window.xml.h:4
#, fuzzy
+msgid "Album"
+msgstr "<b>אלבום:</b>"
+
+#: ../data/gnac-pref-window.xml.h:5
+#, fuzzy
msgid "Artist"
msgstr "אמן - אלבום"
-#: ../data/gnac-pref-window.xml.h:5
+#: ../data/gnac-pref-window.xml.h:6
#, fuzzy
msgid "Artist - Album"
msgstr "אמן - אלבום - כותרת"
-#: ../data/gnac-pref-window.xml.h:6
+#: ../data/gnac-pref-window.xml.h:7
msgid "Artist - Album - Title"
msgstr "אמן - אלבום - כותרת"
-#: ../data/gnac-pref-window.xml.h:7
+#: ../data/gnac-pref-window.xml.h:8
msgid "Artist - Number - Title"
msgstr "אמן - מספר - כותרת"
-#: ../data/gnac-pref-window.xml.h:8
+#: ../data/gnac-pref-window.xml.h:9
msgid "Artist - Title"
msgstr "אמן - אלבום"
-#: ../data/gnac-pref-window.xml.h:9
+#: ../data/gnac-pref-window.xml.h:10
#, fuzzy
msgid "Artist/Album"
msgstr "אמן - אלבום - כותרת"
-#: ../data/gnac-pref-window.xml.h:10
+#: ../data/gnac-pref-window.xml.h:11
+#, fuzzy
+msgid "Artist/Album (Year)"
+msgstr "אמן - אלבום - כותרת"
+
+#: ../data/gnac-pref-window.xml.h:12
msgid "Audio"
msgstr ""
-#: ../data/gnac-pref-window.xml.h:11
+#: ../data/gnac-pref-window.xml.h:13
#, fuzzy
msgid "Custom"
msgstr "תיקייה מותאמת אישית"
-#: ../data/gnac-pref-window.xml.h:12
+#: ../data/gnac-pref-window.xml.h:14
msgid "Custom folder"
msgstr "תיקייה מותאמת אישית"
-#: ../data/gnac-pref-window.xml.h:13
+#: ../data/gnac-pref-window.xml.h:15
msgid "Delete original files after conversion"
msgstr "מחק את הקבצים המקוריים לאחר ההמרה"
-#: ../data/gnac-pref-window.xml.h:14
+#: ../data/gnac-pref-window.xml.h:16
msgid "Display notification icon during conversion"
msgstr "הצג סמל באיזור ההתראות במשך ההמרה"
-#: ../data/gnac-pref-window.xml.h:15
+#: ../data/gnac-pref-window.xml.h:17
msgid "Folder hierarchy:"
msgstr ""
-#: ../data/gnac-pref-window.xml.h:16
+#: ../data/gnac-pref-window.xml.h:18
msgid "Folder location:"
msgstr "מיקום התיקייה"
-#: ../data/gnac-pref-window.xml.h:17
+#: ../data/gnac-pref-window.xml.h:19
msgid "General"
msgstr ""
-#: ../data/gnac-pref-window.xml.h:18
+#: ../data/gnac-pref-window.xml.h:20
msgid "Gnac preferences"
msgstr "העדפות Gnac"
-#: ../data/gnac-pref-window.xml.h:19
+#: ../data/gnac-pref-window.xml.h:21
msgid "None"
msgstr ""
-#: ../data/gnac-pref-window.xml.h:20
+#: ../data/gnac-pref-window.xml.h:22
msgid "Number - Artist - Album - Title"
msgstr "מספר - אמן - אלבום - כותרת"
-#: ../data/gnac-pref-window.xml.h:21
+#: ../data/gnac-pref-window.xml.h:23
msgid "Number - Artist - Title"
msgstr "מספר - אמן - כותרת"
-#: ../data/gnac-pref-window.xml.h:22
+#: ../data/gnac-pref-window.xml.h:24
msgid "Number - Title"
msgstr "מספר - כותרת"
-#: ../data/gnac-pref-window.xml.h:23
+#: ../data/gnac-pref-window.xml.h:25
#, fuzzy
msgid "Output filename:"
msgstr "שמות קבצי פלט:"
-#: ../data/gnac-pref-window.xml.h:24
+#: ../data/gnac-pref-window.xml.h:26
msgid "Output folder:"
msgstr "תיקיית פלט:"
-#: ../data/gnac-pref-window.xml.h:26
-#, no-c-format
-msgid ""
-"Patterns available:\n"
-" %b: album\n"
-" %a: artist\n"
-" %c: comment\n"
-" %d: disc number\n"
-" %e: disc count\n"
-" %f: filename\n"
-" %g: genre\n"
-" %t: title\n"
-" %l: track count\n"
-" %n: track number\n"
-" %y: year"
-msgstr ""
-
-#: ../data/gnac-pref-window.xml.h:38
+#: ../data/gnac-pref-window.xml.h:27
msgid "Same folder as source"
msgstr "זהה לתיקייה המקורית"
-#: ../data/gnac-pref-window.xml.h:39
+#: ../data/gnac-pref-window.xml.h:28
msgid "Source Filename"
msgstr "שם קובץ המקור"
-#: ../data/gnac-pref-window.xml.h:40
+#: ../data/gnac-pref-window.xml.h:29
msgid "Strip special characters"
msgstr ""
-#: ../data/gnac-pref-window.xml.h:41
+#: ../data/gnac-pref-window.xml.h:30
msgid "Subfolder"
msgstr "תת תיקייה"
-#: ../data/gnac-pref-window.xml.h:42
+#: ../data/gnac-pref-window.xml.h:31
msgid "Subfolder name:"
msgstr "שם תת תיקייה"
-#: ../data/gnac-pref-window.xml.h:43
+#: ../data/gnac-pref-window.xml.h:32
msgid "Title"
msgstr "כותרת"
@@ -453,7 +446,7 @@
msgstr ""
#: ../data/profiles/gnac-profiles-properties.xml.h:4
-#: ../src/profiles/gnac-profiles-manager.c:166
+#: ../src/profiles/gnac-profiles-manager.c:171
msgid "Format"
msgstr ""
@@ -463,12 +456,12 @@
msgstr "נכשל ביצירת ערוץ תקשורת מרכזי"
#: ../data/profiles/gnac-profiles-properties.xml.h:6
-#: ../src/profiles/gnac-profiles-manager.c:158
+#: ../src/profiles/gnac-profiles-manager.c:163
msgid "Name"
msgstr ""
#: ../data/profiles/gnac-profiles-unknown.xml.h:1
-#: ../src/profiles/gnac-profiles-manager.c:174
+#: ../src/profiles/gnac-profiles-manager.c:179
msgid "Extension"
msgstr ""
@@ -797,45 +790,45 @@
msgid "Very high compression"
msgstr "ההמרה הסתיימה!"
-#: ../libgnac/libgnac-converter.c:624
+#: ../libgnac/libgnac-converter.c:626
#, c-format
msgid "File %s is already in list"
msgstr ""
-#: ../libgnac/libgnac-converter.c:677
+#: ../libgnac/libgnac-converter.c:679
#, c-format
msgid "File %s isn't in list"
msgstr ""
-#: ../libgnac/libgnac-converter.c:994
+#: ../libgnac/libgnac-converter.c:996
#, fuzzy
msgid "Unable to create destination directory"
msgstr "יצירת מפענח נ...
[truncated message content] |
|
From: <bdu...@us...> - 2009-07-17 07:08:07
|
Revision: 375
http://gnac.svn.sourceforge.net/gnac/?rev=375&view=rev
Author: bdupasqu
Date: 2009-07-17 07:08:04 +0000 (Fri, 17 Jul 2009)
Log Message:
-----------
Fix some memory leaks.
Modified Paths:
--------------
trunk/data/gnac-pref-window.xml
trunk/libgnac/libgnac-converter.c
trunk/libgnac/libgnac-output.c
trunk/libgnac/libgnac-output.h
trunk/src/gnac-main.c
trunk/src/gnac-prefs.c
trunk/src/gnac-prefs.h
Modified: trunk/data/gnac-pref-window.xml
===================================================================
--- trunk/data/gnac-pref-window.xml 2009-07-15 17:52:55 UTC (rev 374)
+++ trunk/data/gnac-pref-window.xml 2009-07-17 07:08:04 UTC (rev 375)
@@ -493,7 +493,7 @@
<child>
<object class="GtkLabel" id="example_label">
<property name="visible">True</property>
- <property name="xalign">0</property>
+ <property name="xalign">0.95</property>
<property name="use_markup">True</property>
<property name="ellipsize">start</property>
</object>
Modified: trunk/libgnac/libgnac-converter.c
===================================================================
--- trunk/libgnac/libgnac-converter.c 2009-07-15 17:52:55 UTC (rev 374)
+++ trunk/libgnac/libgnac-converter.c 2009-07-17 07:08:04 UTC (rev 375)
@@ -170,6 +170,8 @@
g_free(self->priv->folder_path);
}
+ libgnac_output_finalize();
+
/* Chain up to the parent class */
G_OBJECT_CLASS(libgnac_converter_parent_class)->finalize(gobject);
}
Modified: trunk/libgnac/libgnac-output.c
===================================================================
--- trunk/libgnac/libgnac-output.c 2009-07-15 17:52:55 UTC (rev 374)
+++ trunk/libgnac/libgnac-output.c 2009-07-17 07:08:04 UTC (rev 375)
@@ -67,8 +67,8 @@
static LibgnacRenamePattern *
libgnac_output_rename_pattern_new(const gchar pattern);
-/*static void
-libgnac_output_rename_patterns_free(void);*/
+static void
+libgnac_output_rename_patterns_free(void);
static void
libgnac_output_rename_pattern_set_replace(LibgnacRenamePattern *pattern,
@@ -320,13 +320,11 @@
}
-/* TODO this function must be called when the patterns are no more
- * needed, ideally when gnac is closed */
-/*static void
+static void
libgnac_output_rename_patterns_free(void)
{
g_slist_free(rename_patterns);
-}*/
+}
static void
@@ -377,6 +375,13 @@
void
+libgnac_output_finalize(void)
+{
+ libgnac_output_rename_patterns_free();
+}
+
+
+void
libgnac_output_build_output(LibgnacConverterItem *item,
GError **error)
{
@@ -456,6 +461,10 @@
item->destination = g_file_get_child(out_directory, sanitized);
/* cleanup */
+ g_free(extension);
+ g_free(folder_hierarchy);
+ g_free(folder_path);
+ g_free(rename_pattern);
g_free(output_name);
g_free(sanitized);
g_free(filename);
Modified: trunk/libgnac/libgnac-output.h
===================================================================
--- trunk/libgnac/libgnac-output.h 2009-07-15 17:52:55 UTC (rev 374)
+++ trunk/libgnac/libgnac-output.h 2009-07-17 07:08:04 UTC (rev 375)
@@ -85,6 +85,9 @@
} GnacFolderId;
void
+libgnac_output_finalize(void);
+
+void
libgnac_output_build_output(LibgnacConverterItem *item,
GError **error);
Modified: trunk/src/gnac-main.c
===================================================================
--- trunk/src/gnac-main.c 2009-07-15 17:52:55 UTC (rev 374)
+++ trunk/src/gnac-main.c 2009-07-17 07:08:04 UTC (rev 375)
@@ -962,17 +962,28 @@
break;
case GNAC_AUDIO_READY_STATE:
+ {
+ gchar *folder_hierarchy;
+ gchar *folder_path;
+ gchar *rename_pattern;
+ folder_hierarchy = gnac_gconf_get_string(GNAC_GCONF_FOLDER_HIERARCHY_PATTERN),
+ folder_path = gnac_gconf_get_string(GNAC_GCONF_DESTINATION_DIRECTORY);
+ rename_pattern = gnac_gconf_get_string(GNAC_GCONF_RENAME_PATTERN_PATTERN);
g_object_set(G_OBJECT(converter),
- "pipeline-description", gnac_profiles_get_pipeline(),
- "folder-path", gnac_gconf_get_string(GNAC_GCONF_DESTINATION_DIRECTORY),
- "extension", gnac_profiles_get_extension(),
- "rename-pattern", gnac_gconf_get_string(GNAC_GCONF_RENAME_PATTERN_PATTERN),
- "folder-type", gnac_gconf_get_int(GNAC_GCONF_FOLDER_TYPE),
- "folder-hierarchy", gnac_gconf_get_string(GNAC_GCONF_FOLDER_HIERARCHY_PATTERN),
- "strip-special", gnac_gconf_get_boolean(GNAC_GCONF_STRIP_SPECIAL),
- NULL);
+ "extension", gnac_profiles_get_extension(),
+ "folder-hierarchy", folder_hierarchy,
+ "folder-path", folder_path,
+ "folder-type", gnac_gconf_get_int(GNAC_GCONF_FOLDER_TYPE),
+ "pipeline-description", gnac_profiles_get_pipeline(),
+ "rename-pattern", rename_pattern,
+ "strip-special", gnac_gconf_get_boolean(GNAC_GCONF_STRIP_SPECIAL),
+ NULL);
libgnac_converter_start(converter, &error);
- break;
+ g_free(folder_path);
+ g_free(folder_hierarchy);
+ g_free(rename_pattern);
+ break;
+ }
case GNAC_AUDIO_FILE_ACTION_STATE:
continue_files_action = FALSE;
Modified: trunk/src/gnac-prefs.c
===================================================================
--- trunk/src/gnac-prefs.c 2009-07-15 17:52:55 UTC (rev 374)
+++ trunk/src/gnac-prefs.c 2009-07-17 07:08:04 UTC (rev 375)
@@ -63,7 +63,12 @@
"\%a - \%b"
};
+static gchar *
+gnac_prefs_get_folder_hierarchy_as_str(void);
+static gchar *
+gnac_prefs_get_rename_pattern_as_str(void);
+
static const gchar *
gnac_prefs_entry_get_text(const gchar *name)
{
@@ -198,7 +203,7 @@
static void
gnac_prefs_gconf_retrieve(void)
{
- gchar *folder;
+ gchar *str;
GtkComboBox *combo;
GtkEntry *entry;
GtkToggleButton *check_button;
@@ -228,18 +233,22 @@
gtk_combo_box_set_active(combo,
gnac_gconf_get_int(GNAC_GCONF_RENAME_PATTERN));
/* output filename entry */
+ str = gnac_prefs_get_rename_pattern_as_str();
entry = GTK_ENTRY(gtk_builder_get_object(gnac_prefs_builder,
"output_filename_entry"));
- gtk_entry_set_text(entry, gnac_prefs_get_rename_pattern_as_str());
+ gtk_entry_set_text(entry, str);
+ g_free(str);
/* folder hierarchy combo */
combo = GTK_COMBO_BOX(gtk_builder_get_object(gnac_prefs_builder,
"folder_hierarchy_combo"));
gtk_combo_box_set_active(combo,
gnac_gconf_get_int(GNAC_GCONF_FOLDER_HIERARCHY));
/* folder hierarchy entry */
+ str = gnac_prefs_get_folder_hierarchy_as_str();
entry = GTK_ENTRY(gtk_builder_get_object(gnac_prefs_builder,
"folder_hierarchy_entry"));
- gtk_entry_set_text(entry, gnac_prefs_get_folder_hierarchy_as_str());
+ gtk_entry_set_text(entry, str);
+ g_free(str);
switch (folder_type)
{
/* Subfolder */
@@ -248,9 +257,9 @@
gnac_prefs_builder, "subfolder_radiobutton"));
temp = GTK_WIDGET(gtk_builder_get_object(gnac_prefs_builder,
"subfolder_entry"));
- folder = gnac_gconf_get_string(GNAC_GCONF_DESTINATION_DIRECTORY);
- gtk_entry_set_text(GTK_ENTRY(temp), folder);
- g_free(folder);
+ str = gnac_gconf_get_string(GNAC_GCONF_DESTINATION_DIRECTORY);
+ gtk_entry_set_text(GTK_ENTRY(temp), str);
+ g_free(str);
gtk_toggle_button_set_active(check_button, TRUE);
gnac_prefs_set_subfolder_mode();
break;
@@ -261,9 +270,9 @@
gnac_prefs_builder, "selected_radiobutton"));
temp = GTK_WIDGET(gtk_builder_get_object(gnac_prefs_builder,
"filechooserbutton"));
- folder = gnac_gconf_get_string(GNAC_GCONF_DESTINATION_DIRECTORY);
- gtk_file_chooser_select_uri(GTK_FILE_CHOOSER(temp), folder);
- g_free(folder);
+ str = gnac_gconf_get_string(GNAC_GCONF_DESTINATION_DIRECTORY);
+ gtk_file_chooser_select_uri(GTK_FILE_CHOOSER(temp), str);
+ g_free(str);
gtk_toggle_button_set_active(check_button, TRUE);
gnac_prefs_set_selected_mode();
break;
@@ -326,7 +335,7 @@
}
-const gchar *
+static gchar *
gnac_prefs_get_rename_pattern_as_str(void)
{
gint index;
@@ -344,11 +353,11 @@
{
return gnac_gconf_get_string(GNAC_GCONF_RENAME_PATTERN_PATTERN);
}
- return rename_pattern_default[index];
+ return g_strdup(rename_pattern_default[index]);
}
-const gchar *
+static gchar *
gnac_prefs_get_folder_hierarchy_as_str(void)
{
gint index;
@@ -366,7 +375,7 @@
{
return gnac_gconf_get_string(GNAC_GCONF_FOLDER_HIERARCHY_PATTERN);
}
- return folder_hierarchy_default[index];
+ return g_strdup(folder_hierarchy_default[index]);
}
@@ -479,7 +488,7 @@
gpointer data)
{
gint active;
- const gchar *pattern;
+ gchar *pattern;
GtkWidget *filename_entry;
active = gtk_combo_box_get_active(GTK_COMBO_BOX(widget));
@@ -500,6 +509,8 @@
gnac_gconf_set_int(GNAC_GCONF_RENAME_PATTERN, active);
gnac_gconf_set_string(GNAC_GCONF_RENAME_PATTERN_PATTERN, pattern);
+
+ g_free(pattern);
}
@@ -508,7 +519,7 @@
gpointer data)
{
gint active;
- const gchar *pattern;
+ gchar *pattern;
GtkWidget *folder_hierarchy_entry;
active = gtk_combo_box_get_active(GTK_COMBO_BOX(widget));
@@ -529,6 +540,8 @@
gnac_gconf_set_int(GNAC_GCONF_FOLDER_HIERARCHY, active);
gnac_gconf_set_string(GNAC_GCONF_FOLDER_HIERARCHY_PATTERN, pattern);
+
+ g_free(pattern);
}
Modified: trunk/src/gnac-prefs.h
===================================================================
--- trunk/src/gnac-prefs.h 2009-07-15 17:52:55 UTC (rev 374)
+++ trunk/src/gnac-prefs.h 2009-07-17 07:08:04 UTC (rev 375)
@@ -36,12 +36,6 @@
void
gnac_prefs_window_show(void);
-const gchar *
-gnac_prefs_get_rename_pattern_as_str(void);
-
-const gchar *
-gnac_prefs_get_folder_hierarchy_as_str(void);
-
void
gnac_prefs_window_hide(void);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bdu...@us...> - 2009-07-15 17:52:58
|
Revision: 374
http://gnac.svn.sourceforge.net/gnac/?rev=374&view=rev
Author: bdupasqu
Date: 2009-07-15 17:52:55 +0000 (Wed, 15 Jul 2009)
Log Message:
-----------
Add the possibility to copy an existing profile.
Modified Paths:
--------------
trunk/data/profiles/gnac-profiles-manager.xml
trunk/src/profiles/gnac-profiles-manager.c
trunk/src/profiles/gnac-profiles-manager.h
Modified: trunk/data/profiles/gnac-profiles-manager.xml
===================================================================
--- trunk/data/profiles/gnac-profiles-manager.xml 2009-07-15 07:08:34 UTC (rev 373)
+++ trunk/data/profiles/gnac-profiles-manager.xml 2009-07-15 17:52:55 UTC (rev 374)
@@ -86,6 +86,21 @@
</packing>
</child>
<child>
+ <object class="GtkButton" id="copy_button">
+ <property name="label">gtk-copy</property>
+ <property name="visible">True</property>
+ <property name="sensitive">False</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="use_stock">True</property>
+ <signal name="clicked" handler="gnac_profiles_mgr_on_copy"/>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
<object class="GtkButton" id="edit_button">
<property name="label">gtk-edit</property>
<property name="visible">True</property>
@@ -97,7 +112,7 @@
</object>
<packing>
<property name="expand">False</property>
- <property name="position">1</property>
+ <property name="position">2</property>
</packing>
</child>
<child>
@@ -112,7 +127,7 @@
</object>
<packing>
<property name="expand">False</property>
- <property name="position">2</property>
+ <property name="position">3</property>
</packing>
</child>
</object>
Modified: trunk/src/profiles/gnac-profiles-manager.c
===================================================================
--- trunk/src/profiles/gnac-profiles-manager.c 2009-07-15 07:08:34 UTC (rev 373)
+++ trunk/src/profiles/gnac-profiles-manager.c 2009-07-15 17:52:55 UTC (rev 374)
@@ -25,6 +25,10 @@
* Boston, MA 02110-1301 USA
*/
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif /* HAVE_CONFIG_H */
+
#include <gio/gio.h>
#include <gdk/gdkkeysyms.h>
#include <glib/gi18n.h>
@@ -32,6 +36,7 @@
#include "gnac-profiles-manager.h"
#include "libgnac-debug.h"
+#define GNAC_COPY_SUFFIX N_(" (copy)")
enum {
COL_NAME,
@@ -252,7 +257,10 @@
gnac_profiles_mgr_import_default_profiles();
}
}
-
+
+ /* TODO if the profiles directory exists, but does not
+ * contain any profile, import the default ones */
+
files = g_file_enumerate_children(dir,
G_FILE_ATTRIBUTE_STANDARD_NAME ","
G_FILE_ATTRIBUTE_STANDARD_TYPE,
@@ -289,6 +297,7 @@
g_error_free(error);
return;
}
+
g_object_unref(dir);
g_file_enumerator_close(files, NULL, NULL);
g_object_unref(files);
@@ -575,6 +584,9 @@
{
GtkWidget *widget;
+ widget = GTK_WIDGET(gtk_builder_get_object(profiles_mgr_builder, "copy_button"));
+ gtk_widget_set_sensitive(widget, activate);
+
widget = GTK_WIDGET(gtk_builder_get_object(profiles_mgr_builder, "edit_button"));
gtk_widget_set_sensitive(widget, activate);
@@ -963,6 +975,80 @@
}
void
+gnac_profiles_mgr_on_copy(GtkWidget *widget,
+ gpointer data)
+{
+ AudioProfileGeneric *profile;
+ AudioProfileGeneric *generic;
+ AudioProfileGeneric *copy_profile;
+ gchar *full_path;
+ gchar *new_path;
+ gchar *new_name;
+ GError *error = NULL;
+ GFile *dst;
+ GFile *src;
+ GList *selected;
+
+ selected = gnac_profiles_mgr_get_selected_rows();
+ gnac_profiles_mgr_get((GtkTreeRowReference*)selected->data,
+ COL_PROFILE, (void**)&profile);
+ generic = profile->generic;
+
+ full_path = g_strconcat(GNAC_SAVED_PROFILES_URL_WITH_EXT(generic->name), NULL);
+ new_name = g_strconcat(GNAC_SAVED_PROFILES_URL(generic->name),
+ gettext(GNAC_COPY_SUFFIX), NULL);
+ new_path = g_strconcat(new_name, ".xml", NULL);
+
+ src = g_file_new_for_path(full_path);
+ dst = g_file_new_for_path(new_path);
+
+ g_file_copy(src, dst, G_FILE_COPY_NONE, NULL, NULL, NULL, &error);
+ if (error)
+ {
+ libgnac_debug("Failed to copy the profile %s: %s",
+ generic->name, error->message);
+ gnac_profiles_mgr_display_status_message(
+ NULL, _("Failed to copy the profile"));
+ g_clear_error(&error);
+ g_object_unref(src);
+ g_object_unref(dst);
+ g_free(full_path);
+ g_free(new_path);
+ g_free(new_name);
+ g_list_foreach(selected, (GFunc)gtk_tree_row_reference_free, NULL);
+ g_list_free(selected);
+ return;
+ }
+
+ copy_profile = gnac_profiles_properties_load_profile_from_file(
+ new_path, new_name, &error);
+ if (copy_profile)
+ {
+ (copy_profile->generic)->name = g_strconcat(generic->name,
+ gettext(GNAC_COPY_SUFFIX), NULL);
+ gnac_profiles_properties_save_profile(copy_profile);
+ gnac_profiles_mgr_insert(copy_profile);
+ }
+ else if (error)
+ {
+ libgnac_debug("Failed to load the profile %s: %s",
+ (copy_profile->generic)->name, error->message);
+ gnac_profiles_mgr_display_status_message(
+ NULL, _("Failed to copy the profile"));
+ g_clear_error(&error);
+ }
+
+ /* cleanup */
+ g_object_unref(src);
+ g_object_unref(dst);
+ g_free(full_path);
+ g_free(new_path);
+ g_free(new_name);
+ g_list_foreach(selected, (GFunc)gtk_tree_row_reference_free, NULL);
+ g_list_free(selected);
+}
+
+void
gnac_profiles_mgr_on_edit(GtkWidget *widget, gpointer data)
{
GList *selected;
Modified: trunk/src/profiles/gnac-profiles-manager.h
===================================================================
--- trunk/src/profiles/gnac-profiles-manager.h 2009-07-15 07:08:34 UTC (rev 373)
+++ trunk/src/profiles/gnac-profiles-manager.h 2009-07-15 17:52:55 UTC (rev 374)
@@ -67,6 +67,9 @@
gnac_profiles_mgr_on_add(GtkWidget *widget, gpointer data);
void
+gnac_profiles_mgr_on_copy(GtkWidget *widget, gpointer data);
+
+void
gnac_profiles_mgr_on_edit(GtkWidget *widget, gpointer data);
void
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bdu...@us...> - 2009-07-15 07:08:39
|
Revision: 373
http://gnac.svn.sourceforge.net/gnac/?rev=373&view=rev
Author: bdupasqu
Date: 2009-07-15 07:08:34 +0000 (Wed, 15 Jul 2009)
Log Message:
-----------
Update translations.
Modified Paths:
--------------
trunk/ChangeLog
trunk/po/cs.po
trunk/po/de.po
trunk/po/fr.po
trunk/po/gnac.pot
trunk/po/he.po
trunk/po/it.po
trunk/po/ro.po
trunk/po/sv.po
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2009-07-15 06:48:37 UTC (rev 372)
+++ trunk/ChangeLog 2009-07-15 07:08:34 UTC (rev 373)
@@ -1,3 +1,163 @@
+2009-07-14 17:28 bdupasqu
+
+ * src/gnac-ui.c: - Update the trayicon's popup menu (Show/Hide)
+ depending on the visibility of the main window.
+
+2009-07-14 17:13 bdupasqu
+
+ * libgnac/libgnac-converter.c, src/gnac-file-list.c,
+ src/gnac-file-list.h, src/gnac-main.c, src/gnac-ui.c: - Don't
+ print error messages when the user has chosen not to overwrite a
+ file (display rather a GTK_STOCK_DIALOG_INFO).
+ - Update the trayicon's tooltip even if it is currently
+ displayed.
+
+2009-07-14 06:59 bdupasqu
+
+ * libgnac/libgnac-converter.c, libgnac/libgnac-converter.h,
+ libgnac/libgnac-marshallers.c, libgnac/libgnac-marshallers.h,
+ src/gnac-file-list.c, src/gnac-main.c: - Better error handling:
+ display a dialog when the destination file already
+ exists.
+
+2009-07-14 06:55 bdupasqu
+
+ * src/profiles/formats/gnac-profiles-aac.h,
+ src/profiles/formats/gnac-profiles-flac.h,
+ src/profiles/formats/gnac-profiles-lame.h,
+ src/profiles/formats/gnac-profiles-speex.h,
+ src/profiles/formats/gnac-profiles-unknown.h,
+ src/profiles/formats/gnac-profiles-vorbis.h,
+ src/profiles/formats/gnac-profiles-wav.h,
+ src/profiles/formats/gnac-profiles-wavpack.h: - Set the svn
+ keyword 'Id' on all headers files in src/profiles/formats.
+
+2009-07-09 16:46 bdupasqu
+
+ * src/gnac-main.c, src/gnac-ui.c: - Disable the 'APE' filter (the
+ Monkey's Audio plug-in has not yet been
+ ported to gstreamer-0.10)
+
+2009-07-08 20:57 bdupasqu
+
+ * data/gnac-properties-window.xml, libgnac/libgnac-metadata.c,
+ src/gnac-properties.c, src/gnac-ui.c, src/gnac-utils.c,
+ src/gnac-utils.h: - Fix a bug preventing the tooltip to be
+ displayed when a tag contains
+ special characters (e.g. '&'),
+ - Move the rescaling of images from libgnac-metadata to
+ gnac-utils,
+ - Add a border to images (trayicon's tooltip, properties window).
+
+2009-07-07 22:15 bdupasqu
+
+ * src/gnac-main.c, src/gnac-prefs.c, src/gnac-ui.c, src/gnac-ui.h:
+ - Use GtkTooltip to display fancy tooltips on the trayicon.
+
+2009-07-07 20:30 bdupasqu
+
+ * data/gnac-pref-window.xml, src/gnac-gconf.c, src/gnac-prefs.c,
+ src/gnac-properties.c: - Fix a bug in the handling of
+ GNAC_GCONF_FOLDER_TYPE.
+ - Ensure the preferences window always starts with the 'General'
+ tab selected.
+
+2009-06-30 10:33 bdupasqu
+
+ * src/gnac-file-list.c, src/gnac-file-list.h, src/gnac-main.c:
+ Change the shape of the cursor during conversion and file
+ addition (only on
+ the tree view).
+
+2009-06-24 10:22 bdupasqu
+
+ * src/gnac-main.c, src/gnac-prefs.c, src/gnac-prefs.h,
+ src/gnac-utils.c, src/gnac-utils.h: Code refactoring.
+
+2009-06-17 13:32 daiji
+
+ * data/gnac.xml, src/gnac-file-list.c: Add accelerators to main
+ interface
+
+2009-06-08 06:38 bdupasqu
+
+ * data/gnac-pref-window.xml, data/gnac.schemas.in, data/gnac.xml,
+ libgnac/libgnac-converter.c, libgnac/libgnac-metadata-tags.h,
+ libgnac/libgnac-metadata.c, libgnac/libgnac-metadata.h,
+ libgnac/libgnac-output.c, libgnac/libgnac-output.h,
+ src/gnac-gconf.c, src/gnac-gconf.h, src/gnac-main.c,
+ src/gnac-prefs.c, src/gnac-prefs.h, src/gnac-ui.c: Modification
+ of the preferences window to handle custom patterns.
+
+2009-05-31 20:53 bdupasqu
+
+ * data/Makefile.am: Modify data/Makefile.am to ensure compatibility
+ with gentoo ebuilds
+ (thanks to Christian Ludwig for the patch).
+
+2009-05-29 14:56 bdupasqu
+
+ * libgnac/libgnac-output.c, src/gnac-main.c, src/gnac-prefs.c:
+ Handle properly the case when the output pattern is unspecified
+ (keep the original filename, but replace the extension).
+
+2009-05-25 14:48 bdupasqu
+
+ * libgnac/libgnac-output.c: Sanitize filenames before creating
+ files.
+
+2009-05-25 07:07 bdupasqu
+
+ * libgnac/libgnac-metadata-tags.h, libgnac/libgnac-metadata.c,
+ libgnac/libgnac-metadata.h, libgnac/libgnac-output.c,
+ libgnac/libgnac-output.h, m4/intltool.m4: Add code to handle
+ customized rename patterns (e.g. to create a subfolder
+ hierarchy (artist/album)).
+
+2009-05-08 15:11 daiji
+
+ * libgnac/libgnac-converter.c, libgnac/libgnac-metadata-tags.h,
+ src/gnac-properties.c: Backported bugfix from branch gnac-video.
+ Add display of replaygain values, track gain and peak
+
+2009-04-09 07:47 daiji
+
+ * po/de.po: Forgot to add de.po
+
+2009-04-09 07:42 daiji
+
+ * po/LINGUAS, po/cs.po, po/fr.po, po/gnac.pot, po/he.po, po/it.po,
+ po/ro.po, po/sv.po: Add incomplete german translation, Thanks to
+ Martin Lettner
+
+2009-04-08 08:12 bdupasqu
+
+ * configure.ac, src/gnac-main.c: On the road to gnac-0.2.1!
+ Make the links in the about box clickable.
+
+2009-04-06 17:13 bdupasqu
+
+ * configure.ac, src/gnac-main.c: Make distcheck now also generates
+ a .tar.gz.
+
+2009-04-05 13:45 daiji
+
+ * ChangeLog, po/POTFILES.in: Update Changelog and POTFILES.in
+
+2009-04-05 12:28 daiji
+
+ * po/he.po, po/it.po, po/ro.po: Update romanian and italian
+ translations
+
+2009-04-05 10:34 daiji
+
+ * po/cs.po, po/fr.po, po/gnac.pot, po/he.po, po/it.po, po/ro.po,
+ po/sv.po: Add plural support in translation files
+
+2009-04-05 10:25 daiji
+
+ * po/fr.po: Fix french translation
+
2009-04-05 09:53 alexandreroux
* src/profiles/gnac-profiles-manager.c: - correct a segfault
Modified: trunk/po/cs.po
===================================================================
--- trunk/po/cs.po 2009-07-15 06:48:37 UTC (rev 372)
+++ trunk/po/cs.po 2009-07-15 07:08:34 UTC (rev 373)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: gnac\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-04-09 09:38+0200\n"
+"POT-Creation-Date: 2009-07-15 08:49+0200\n"
"PO-Revision-Date: 2009-04-03 21:41+0100\n"
"Last-Translator: Luboš Staněk <lu...@us...>\n"
"Language-Team: Czech <tra...@li...>\n"
@@ -29,21 +29,38 @@
msgstr "Zobrazit ikonu panelu v průběhu převodu"
#: ../data/gnac.schemas.in.h:3
+msgid "Folder hierarchy"
+msgstr ""
+
+#: ../data/gnac.schemas.in.h:4
+msgid "Folder hierarchy pattern"
+msgstr ""
+
+#: ../data/gnac.schemas.in.h:5
msgid "Folder type"
msgstr "Typ složky"
-#: ../data/gnac.schemas.in.h:4
+#: ../data/gnac.schemas.in.h:6
msgid "Last used profile"
msgstr "Naposledy použitý profil"
-#: ../data/gnac.schemas.in.h:5
+#: ../data/gnac.schemas.in.h:7
msgid "Output directory"
msgstr "Výstupní adresář"
-#: ../data/gnac.schemas.in.h:6
+#: ../data/gnac.schemas.in.h:8
msgid "Output filename"
msgstr "Výstupní název souboru"
+#: ../data/gnac.schemas.in.h:9
+#, fuzzy
+msgid "Output filename pattern"
+msgstr "Výstupní název souboru"
+
+#: ../data/gnac.schemas.in.h:10
+msgid "Strip special characters in filenames"
+msgstr ""
+
#: ../data/gnac-pref-window.xml.h:1
msgid "<b>Conversion:</b>"
msgstr "<b>Převod:</b>"
@@ -53,74 +70,137 @@
msgstr "<b>Zobrazení:</b>"
#: ../data/gnac-pref-window.xml.h:3
+#, fuzzy
+msgid "<b>File and folder naming:</b>"
+msgstr "<b>Informace o profilu</b>"
+
+#: ../data/gnac-pref-window.xml.h:4
+#, fuzzy
+msgid "Artist"
+msgstr "Umělec :"
+
+#: ../data/gnac-pref-window.xml.h:5
+#, fuzzy
+msgid "Artist - Album"
+msgstr "Umělec - Album - Název"
+
+#: ../data/gnac-pref-window.xml.h:6
msgid "Artist - Album - Title"
msgstr "Umělec - Album - Název"
-#: ../data/gnac-pref-window.xml.h:4
+#: ../data/gnac-pref-window.xml.h:7
msgid "Artist - Number - Title"
msgstr "Umělec – Stopa – Název"
-#: ../data/gnac-pref-window.xml.h:5
+#: ../data/gnac-pref-window.xml.h:8
msgid "Artist - Title"
msgstr "Umělec – Název"
-#: ../data/gnac-pref-window.xml.h:6
+#: ../data/gnac-pref-window.xml.h:9
+#, fuzzy
+msgid "Artist/Album"
+msgstr "Umělec - Album - Název"
+
+#: ../data/gnac-pref-window.xml.h:10
+#, fuzzy
+msgid "Audio"
+msgstr "Automaticky"
+
+#: ../data/gnac-pref-window.xml.h:11
+#, fuzzy
+msgid "Custom"
+msgstr "Uživatelská složka"
+
+#: ../data/gnac-pref-window.xml.h:12
msgid "Custom folder"
msgstr "Uživatelská složka"
-#: ../data/gnac-pref-window.xml.h:7
+#: ../data/gnac-pref-window.xml.h:13
msgid "Delete original files after conversion"
msgstr "Smazat původní soubory po převodu"
-#: ../data/gnac-pref-window.xml.h:8
+#: ../data/gnac-pref-window.xml.h:14
msgid "Display notification icon during conversion"
msgstr "Zobrazit ikonu na panelu v průběhu převodu"
-#: ../data/gnac-pref-window.xml.h:9
+#: ../data/gnac-pref-window.xml.h:15
+msgid "Folder hierarchy:"
+msgstr ""
+
+#: ../data/gnac-pref-window.xml.h:16
msgid "Folder location:"
msgstr "Umístění složky:"
-#: ../data/gnac-pref-window.xml.h:10
+#: ../data/gnac-pref-window.xml.h:17
+msgid "General"
+msgstr ""
+
+#: ../data/gnac-pref-window.xml.h:18
msgid "Gnac preferences"
msgstr "Nastavení aplikace Gnac"
-#: ../data/gnac-pref-window.xml.h:11
+#: ../data/gnac-pref-window.xml.h:19
+msgid "None"
+msgstr ""
+
+#: ../data/gnac-pref-window.xml.h:20
msgid "Number - Artist - Album - Title"
msgstr "Stopa - Umělec - Album – Název"
-#: ../data/gnac-pref-window.xml.h:12
+#: ../data/gnac-pref-window.xml.h:21
msgid "Number - Artist - Title"
msgstr "Stopa - Umělec – Název"
-#: ../data/gnac-pref-window.xml.h:13
+#: ../data/gnac-pref-window.xml.h:22
msgid "Number - Title"
msgstr "Stopa – Název"
-#: ../data/gnac-pref-window.xml.h:14
+#: ../data/gnac-pref-window.xml.h:23
msgid "Output filename:"
msgstr "Název výstupního souboru:"
-#: ../data/gnac-pref-window.xml.h:15
+#: ../data/gnac-pref-window.xml.h:24
msgid "Output folder:"
msgstr "Název výstupní složky:"
-#: ../data/gnac-pref-window.xml.h:16
+#: ../data/gnac-pref-window.xml.h:26
+#, no-c-format
+msgid ""
+"Patterns available:\n"
+" %b: album\n"
+" %a: artist\n"
+" %c: comment\n"
+" %d: disc number\n"
+" %e: disc count\n"
+" %f: filename\n"
+" %g: genre\n"
+" %t: title\n"
+" %l: track count\n"
+" %n: track number\n"
+" %y: year"
+msgstr ""
+
+#: ../data/gnac-pref-window.xml.h:38
msgid "Same folder as source"
msgstr "Stejná složka jako zdroj"
-#: ../data/gnac-pref-window.xml.h:17
+#: ../data/gnac-pref-window.xml.h:39
msgid "Source Filename"
msgstr "Název zdrojového souboru"
-#: ../data/gnac-pref-window.xml.h:18
+#: ../data/gnac-pref-window.xml.h:40
+msgid "Strip special characters"
+msgstr ""
+
+#: ../data/gnac-pref-window.xml.h:41
msgid "Subfolder"
msgstr "Podsložka"
-#: ../data/gnac-pref-window.xml.h:19
+#: ../data/gnac-pref-window.xml.h:42
msgid "Subfolder name:"
msgstr "Název podsložky:"
-#: ../data/gnac-pref-window.xml.h:20
+#: ../data/gnac-pref-window.xml.h:43
msgid "Title"
msgstr "Název"
@@ -250,7 +330,7 @@
msgid "Advanced"
msgstr "Rozšířené"
-#: ../data/profiles/gnac-profiles-aac.xml.h:2 ../src/gnac-properties.c:110
+#: ../data/profiles/gnac-profiles-aac.xml.h:2 ../src/gnac-properties.c:112
msgid "Bitrate"
msgstr "Bitová rychlost"
@@ -267,7 +347,7 @@
msgstr "Tvarování šumu v čase (TNS)"
#: ../data/profiles/gnac-profiles-base-advanced.xml.h:1
-#: ../src/gnac-properties.c:106
+#: ../src/gnac-properties.c:108
msgid "Channels"
msgstr "Kanály"
@@ -332,7 +412,7 @@
msgstr "Min. bitová rychlost"
#: ../data/profiles/gnac-profiles-lame.xml.h:11
-#: ../data/profiles/gnac-profiles-speex.xml.h:9 ../src/gnac-properties.c:107
+#: ../data/profiles/gnac-profiles-speex.xml.h:9 ../src/gnac-properties.c:109
msgid "Mode"
msgstr "Režim"
@@ -761,33 +841,42 @@
msgid "Very high compression"
msgstr "Velmi vysoká komprese"
-#: ../libgnac/libgnac-converter.c:555
+#: ../libgnac/libgnac-converter.c:624
#, c-format
msgid "File %s is already in list"
msgstr "Soubor %s je již na seznamu"
-#: ../libgnac/libgnac-converter.c:608
+#: ../libgnac/libgnac-converter.c:677
#, c-format
msgid "File %s isn't in list"
msgstr "Soubor %s není na seznamu"
-#: ../libgnac/libgnac-converter.c:926
+#: ../libgnac/libgnac-converter.c:994
msgid "Unable to create destination directory"
msgstr "Nelze vytvořit cílový adresář"
-#: ../libgnac/libgnac-converter.c:935
+#: ../libgnac/libgnac-converter.c:1027
+#, fuzzy, c-format
+msgid "Destination file %s already exists"
+msgstr "Soubor %s je již na seznamu"
+
+#: ../libgnac/libgnac-converter.c:1029
+msgid "Destination file already exists"
+msgstr ""
+
+#: ../libgnac/libgnac-converter.c:1036
msgid "Unable to access destination file"
msgstr "Nelze zpřístupnit cílový soubor"
-#: ../libgnac/libgnac-converter.c:939
+#: ../libgnac/libgnac-converter.c:1041
msgid "Unable to read source file"
msgstr "Nelze číst zdrojový soubor"
-#: ../libgnac/libgnac-converter.c:948
+#: ../libgnac/libgnac-converter.c:1050
msgid "An error occured during conversion"
msgstr "Při převodu došlo k chybě"
-#: ../libgnac/libgnac-converter.c:983
+#: ../libgnac/libgnac-converter.c:1088
msgid "unable to handle this format"
msgstr "nelze zpracovat tento formát"
@@ -826,7 +915,7 @@
msgid "Invalid UTF-8 tag: %s\n"
msgstr "Neplatná značka UTF-8: %s\n"
-#: ../libgnac/libgnac-metadata.c:500
+#: ../libgnac/libgnac-metadata.c:504
#, c-format
msgid "Failed to create %s element"
msgstr "Selhalo vytvoření elementu %s"
@@ -945,27 +1034,25 @@
msgid "paused"
msgstr "pozastaveno"
-#: ../src/gnac-gconf.c:51
+#: ../src/gnac-gconf.c:61
msgid "Could not create GConf client.\n"
msgstr "Nešlo vytvořit klienta GConf.\n"
-#: ../src/gnac-gconf.c:80 ../src/gnac-gconf.c:113 ../src/gnac-gconf.c:145
-#: ../src/gnac-gconf.c:176 ../src/gnac-gconf.c:207 ../src/gnac-gconf.c:239
+#: ../src/gnac-gconf.c:90 ../src/gnac-gconf.c:123 ../src/gnac-gconf.c:155
#, c-format
msgid "Unable to read key: %s\n"
msgstr "Nelze načíst klíč: %s\n"
-#: ../src/gnac-gconf.c:97 ../src/gnac-gconf.c:129 ../src/gnac-gconf.c:160
-#: ../src/gnac-gconf.c:191 ../src/gnac-gconf.c:224 ../src/gnac-gconf.c:256
+#: ../src/gnac-gconf.c:107 ../src/gnac-gconf.c:138 ../src/gnac-gconf.c:172
#, c-format
msgid "Unable to set key: %s\n"
msgstr "Nelze nastavit klíč: %s\n"
-#: ../src/gnac-main.c:262
+#: ../src/gnac-main.c:268
msgid "Importing files..."
msgstr "Importuji soubory..."
-#: ../src/gnac-main.c:275
+#: ../src/gnac-main.c:281
#, c-format
msgid "%u file imported"
msgid_plural "%u files imported"
@@ -973,87 +1060,88 @@
msgstr[1] "%u soubory importovány"
msgstr[2] "%u souborů importováno"
-#: ../src/gnac-main.c:295
+#: ../src/gnac-main.c:301
#, c-format
msgid "Impossible to launch thread to add files: %s\n"
msgstr "Není možné spustit vlákno přidání souborů: %s\n"
-#: ../src/gnac-main.c:323
+#: ../src/gnac-main.c:329
msgid "MPEG files (*.mp3)"
msgstr "Soubory MPEG (*.mp3)"
-#: ../src/gnac-main.c:324
+#: ../src/gnac-main.c:330
msgid "MPEG-4 files (*.aac, *.m4a, *.mp4)"
msgstr "Soubory MPEG-4 (*.aac, *.m4a, *.mp4)"
-#: ../src/gnac-main.c:325
+#: ../src/gnac-main.c:331
msgid "Musepack files (*.mpc)"
msgstr "Soubory Musepack (*.mpc)"
-#: ../src/gnac-main.c:326
+#: ../src/gnac-main.c:332
msgid "Ogg Vorbis files (*.ogg)"
msgstr "Soubory Ogg Vorbis (*.ogg)"
-#: ../src/gnac-main.c:327
+#: ../src/gnac-main.c:333
msgid "RealAudio files (*.ra)"
msgstr "Soubory RealAudio (*.ra)"
-#: ../src/gnac-main.c:328
+#: ../src/gnac-main.c:334
msgid "Speex files (*.spx)"
msgstr "Soubory Speex (*.spx)"
-#: ../src/gnac-main.c:329
+#: ../src/gnac-main.c:335
msgid "Windows Media files (*.wma)"
msgstr "Soubory Windows Media (*.wma)"
-#. No more gstreamer plugin
-#. { "audio/x-ape" , _("Ape files (*.ape)") },
-#: ../src/gnac-main.c:336
+#. XXX the Monkey's Audio plug-in has not yet been ported
+#. * to gstreamer-0.10
+#. { "audio/x-ape" , _("Ape files (*.ape)") },
+#: ../src/gnac-main.c:343
msgid "Flac files (*.flac)"
msgstr "Soubory Flac (*.flac)"
-#: ../src/gnac-main.c:337
+#: ../src/gnac-main.c:344
msgid "WAV files (*.wav)"
msgstr "Soubory WAV (*.wav)"
-#: ../src/gnac-main.c:342
+#: ../src/gnac-main.c:349
msgid "M3U playlists (*.m3u)"
msgstr "Seznamy skladeb M3U (*.m3u)"
-#: ../src/gnac-main.c:343
+#: ../src/gnac-main.c:350
msgid "PLS playlists (*.pls)"
msgstr "Seznamy skladeb PLS (*.pls)"
-#: ../src/gnac-main.c:344
+#: ../src/gnac-main.c:351
msgid "XSPF playlists (*.xspf)"
msgstr "Seznamy skladeb XSPF (*.xspf)"
-#: ../src/gnac-main.c:350
+#: ../src/gnac-main.c:357
msgid "All files (*.*)"
msgstr "Všechny soubory (*.*)"
-#: ../src/gnac-main.c:353
+#: ../src/gnac-main.c:360
msgid "All supported files"
msgstr "Všechny podporované soubory"
-#: ../src/gnac-main.c:371
+#: ../src/gnac-main.c:378
msgid "All playlists files"
msgstr "Všechny seznamy skladeb"
-#: ../src/gnac-main.c:386
+#: ../src/gnac-main.c:393
msgid "Lossless codecs"
msgstr "Bezztrátové kodeky"
-#: ../src/gnac-main.c:397
+#: ../src/gnac-main.c:404
msgid "Lossy codecs"
msgstr "Ztrátové kodeky"
-#: ../src/gnac-main.c:523
+#: ../src/gnac-main.c:529
#, c-format
msgid "Could not open link %s: %s\n"
msgstr ""
-#: ../src/gnac-main.c:552
+#: ../src/gnac-main.c:558
msgid ""
"A conversion is currently running...\n"
"Are you sure you want to quit?"
@@ -1061,35 +1149,51 @@
"Převod právě probíhá...\n"
"Opravdu chcete skončit?"
-#: ../src/gnac-main.c:710
+#: ../src/gnac-main.c:680
+#, fuzzy, c-format
+msgid ""
+"File %s already exists...\n"
+"Overwrite?"
+msgstr "Soubor %s je již na seznamu"
+
+#: ../src/gnac-main.c:685
+msgid "Remember my decision"
+msgstr ""
+
+#: ../src/gnac-main.c:720
#, c-format
msgid "Converting file %d of %d"
msgstr "Převádím soubor %d z %d"
-#: ../src/gnac-main.c:728
+#: ../src/gnac-main.c:738
#, c-format
msgid "%s left"
msgstr "Zbývá %s"
-#: ../src/gnac-main.c:841 ../src/gnac-main.c:1033 ../src/gnac-main.c:1065
+#: ../src/gnac-main.c:849 ../src/gnac-main.c:1054 ../src/gnac-main.c:1086
#, c-format
msgid "Error: %s\n"
msgstr "Chyba: %s\n"
-#: ../src/gnac-main.c:873
+#: ../src/gnac-main.c:881
msgid "Conversion completed with errors"
msgstr "Převod byl dokončen s chybami!"
-#: ../src/gnac-main.c:875
+#: ../src/gnac-main.c:883
msgid "Conversion completed!"
msgstr "Převod byl dokončen!"
-#: ../src/gnac-main.c:892
+#: ../src/gnac-main.c:900
msgid "Conversion stopped"
msgstr "Převod byl zastaven!"
-#: ../src/gnac-main.c:904
+#: ../src/gnac-main.c:913
#, c-format
+msgid "File not converted (%s)"
+msgstr ""
+
+#: ../src/gnac-main.c:921
+#, c-format
msgid ""
"Gnac failed to convert file %s\n"
" Error message: %s\n"
@@ -1097,20 +1201,20 @@
"Gnac selhal při převodu souboru %s\n"
" Chybová zpráva: %s\n"
-#: ../src/gnac-main.c:989
+#: ../src/gnac-main.c:1010
msgid "Open a file..."
msgstr "Otevřít soubor.."
-#: ../src/gnac-main.c:1002
+#: ../src/gnac-main.c:1023
msgid "Close dialog on add"
msgstr "Zavřít dialog při přidání"
-#: ../src/gnac-main.c:1082
+#: ../src/gnac-main.c:1103
msgid "No help available yet"
msgstr "Nápověda dosud není dostupná"
#. Parse command line arguments
-#: ../src/gnac-main.c:1200
+#: ../src/gnac-main.c:1221
msgid "[URI...] - Convert your audio files"
msgstr "[URI...] - Převést vaše audio soubory"
@@ -1120,36 +1224,44 @@
msgid "Invalid UTF-8 filename: %s\n"
msgstr "Neplatný název souboru UTF-8: %s\n"
-#: ../src/gnac-prefs.c:220 ../src/gnac-properties.c:397 ../src/gnac-ui.c:81
+#: ../src/gnac-prefs.c:295 ../src/gnac-properties.c:407 ../src/gnac-ui.c:84
#, c-format
msgid "Unable to read file: %s\n"
msgstr "Nelze číst soubor: %s\n"
-#: ../src/gnac-properties.c:102
+#: ../src/gnac-properties.c:104
msgid "Filename"
msgstr "Název souboru"
-#: ../src/gnac-properties.c:103
+#: ../src/gnac-properties.c:105
msgid "Location"
msgstr "Umístění"
-#: ../src/gnac-properties.c:104
+#: ../src/gnac-properties.c:106
msgid "Duration"
msgstr "Délka trvání"
-#: ../src/gnac-properties.c:105
+#: ../src/gnac-properties.c:107
msgid "File size"
msgstr "Velikost souboru"
-#: ../src/gnac-properties.c:108
+#: ../src/gnac-properties.c:110
msgid "Rate"
msgstr "Vzorkování"
-#: ../src/gnac-properties.c:109
+#: ../src/gnac-properties.c:111
msgid "Codec"
msgstr "Kodek"
-#: ../src/gnac-properties.c:331
+#: ../src/gnac-properties.c:113
+msgid "Track Gain"
+msgstr ""
+
+#: ../src/gnac-properties.c:114
+msgid "Track Peak"
+msgstr ""
+
+#: ../src/gnac-properties.c:339
#, c-format
msgid "%s had an unknown type: %s\n"
msgstr "%s je neznámého typu: %s\n"
@@ -1158,7 +1270,7 @@
msgid "_Resume"
msgstr "P_okračovat"
-#: ../src/gnac-ui.c:192
+#: ../src/gnac-ui.c:196
#, c-format
msgid "%u file added"
msgid_plural "%u files added"
@@ -1166,11 +1278,28 @@
msgstr[1] "%u soubory přidány"
msgstr[2] "%u souborů přidáno"
-#: ../src/gnac-ui.c:490
+#: ../src/gnac-ui.c:371
+#, c-format
+msgid ""
+" <b>%s</b>\n"
+" <span color=\"#888\">by</span> %s <span color=\"#888\">from</span> %s"
+msgstr ""
+
+#: ../src/gnac-ui.c:498
+#, fuzzy
+msgid "Hide"
+msgstr "Zobrazit/skrýt"
+
+#: ../src/gnac-ui.c:498
+#, fuzzy
+msgid "Show"
+msgstr "Zobrazit/skrýt"
+
+#: ../src/gnac-ui.c:566
msgid "Cannot trash the file. Do you want to delete it immediately ?"
msgstr "Soubor nelze hodit do koše. Chcete ho ihned smazat?"
-#: ../src/gnac-ui.c:494
+#: ../src/gnac-ui.c:570
#, c-format
msgid "Cannot trash file %s"
msgstr "Soubor nelze hodit do koše %s"
Modified: trunk/po/de.po
===================================================================
--- trunk/po/de.po 2009-07-15 06:48:37 UTC (rev 372)
+++ trunk/po/de.po 2009-07-15 07:08:34 UTC (rev 373)
@@ -2,7 +2,7 @@
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-04-09 09:38+0200\n"
+"POT-Creation-Date: 2009-07-15 08:49+0200\n"
"PO-Revision-Date: \n"
"Last-Translator: Martin Lettner <m.l...@gm...>\n"
"Language-Team: \n"
@@ -25,21 +25,38 @@
msgstr "Ein Benachrichtigungssymbol während der Umwandlung anzeigen"
#: ../data/gnac.schemas.in.h:3
+msgid "Folder hierarchy"
+msgstr ""
+
+#: ../data/gnac.schemas.in.h:4
+msgid "Folder hierarchy pattern"
+msgstr ""
+
+#: ../data/gnac.schemas.in.h:5
msgid "Folder type"
msgstr "Ordner-Typ"
-#: ../data/gnac.schemas.in.h:4
+#: ../data/gnac.schemas.in.h:6
msgid "Last used profile"
msgstr "Zuletzt benutztes Profil"
-#: ../data/gnac.schemas.in.h:5
+#: ../data/gnac.schemas.in.h:7
msgid "Output directory"
msgstr "Ausgabe-Ordner"
-#: ../data/gnac.schemas.in.h:6
+#: ../data/gnac.schemas.in.h:8
msgid "Output filename"
msgstr "Ausgabe-Dateiname"
+#: ../data/gnac.schemas.in.h:9
+#, fuzzy
+msgid "Output filename pattern"
+msgstr "Ausgabe-Dateiname"
+
+#: ../data/gnac.schemas.in.h:10
+msgid "Strip special characters in filenames"
+msgstr ""
+
#: ../data/gnac-pref-window.xml.h:1
msgid "<b>Conversion:</b>"
msgstr "<b>Umwandlung:</b>"
@@ -49,74 +66,136 @@
msgstr "<b>Anzeige:</b>"
#: ../data/gnac-pref-window.xml.h:3
+#, fuzzy
+msgid "<b>File and folder naming:</b>"
+msgstr "<b>Profil-Informationen</b>"
+
+#: ../data/gnac-pref-window.xml.h:4
+#, fuzzy
+msgid "Artist"
+msgstr "Künstler:"
+
+#: ../data/gnac-pref-window.xml.h:5
+#, fuzzy
+msgid "Artist - Album"
+msgstr "Künstler - Album - Titel"
+
+#: ../data/gnac-pref-window.xml.h:6
msgid "Artist - Album - Title"
msgstr "Künstler - Album - Titel"
-#: ../data/gnac-pref-window.xml.h:4
+#: ../data/gnac-pref-window.xml.h:7
msgid "Artist - Number - Title"
msgstr "Künstler - Nummer - Titel"
-#: ../data/gnac-pref-window.xml.h:5
+#: ../data/gnac-pref-window.xml.h:8
msgid "Artist - Title"
msgstr "Künstler - Titel"
-#: ../data/gnac-pref-window.xml.h:6
+#: ../data/gnac-pref-window.xml.h:9
+#, fuzzy
+msgid "Artist/Album"
+msgstr "Künstler - Album - Titel"
+
+#: ../data/gnac-pref-window.xml.h:10
+msgid "Audio"
+msgstr ""
+
+#: ../data/gnac-pref-window.xml.h:11
+#, fuzzy
+msgid "Custom"
+msgstr "Benutzerdefinierter Ordner"
+
+#: ../data/gnac-pref-window.xml.h:12
msgid "Custom folder"
msgstr "Benutzerdefinierter Ordner"
-#: ../data/gnac-pref-window.xml.h:7
+#: ../data/gnac-pref-window.xml.h:13
msgid "Delete original files after conversion"
msgstr "Ursprungs-Dateien nach der Umwandlung löschen"
-#: ../data/gnac-pref-window.xml.h:8
+#: ../data/gnac-pref-window.xml.h:14
msgid "Display notification icon during conversion"
msgstr "Ein Benachrichtigungssymbol während der Umwandlung anzeigen"
-#: ../data/gnac-pref-window.xml.h:9
+#: ../data/gnac-pref-window.xml.h:15
+msgid "Folder hierarchy:"
+msgstr ""
+
+#: ../data/gnac-pref-window.xml.h:16
msgid "Folder location:"
msgstr "Ordner Pfad:"
-#: ../data/gnac-pref-window.xml.h:10
+#: ../data/gnac-pref-window.xml.h:17
+msgid "General"
+msgstr ""
+
+#: ../data/gnac-pref-window.xml.h:18
msgid "Gnac preferences"
msgstr "Gnac Einstellungen"
-#: ../data/gnac-pref-window.xml.h:11
+#: ../data/gnac-pref-window.xml.h:19
+msgid "None"
+msgstr ""
+
+#: ../data/gnac-pref-window.xml.h:20
msgid "Number - Artist - Album - Title"
msgstr "Nummer - Künstler - Album - Titel"
-#: ../data/gnac-pref-window.xml.h:12
+#: ../data/gnac-pref-window.xml.h:21
msgid "Number - Artist - Title"
msgstr "Nummer - Künstler - Titel"
-#: ../data/gnac-pref-window.xml.h:13
+#: ../data/gnac-pref-window.xml.h:22
msgid "Number - Title"
msgstr "Nummer - Titel"
-#: ../data/gnac-pref-window.xml.h:14
+#: ../data/gnac-pref-window.xml.h:23
msgid "Output filename:"
msgstr "Ausgabe-Dateiname:"
-#: ../data/gnac-pref-window.xml.h:15
+#: ../data/gnac-pref-window.xml.h:24
msgid "Output folder:"
msgstr "Ausgabe-Ordner:"
-#: ../data/gnac-pref-window.xml.h:16
+#: ../data/gnac-pref-window.xml.h:26
+#, no-c-format
+msgid ""
+"Patterns available:\n"
+" %b: album\n"
+" %a: artist\n"
+" %c: comment\n"
+" %d: disc number\n"
+" %e: disc count\n"
+" %f: filename\n"
+" %g: genre\n"
+" %t: title\n"
+" %l: track count\n"
+" %n: track number\n"
+" %y: year"
+msgstr ""
+
+#: ../data/gnac-pref-window.xml.h:38
msgid "Same folder as source"
msgstr "Gleicher Ordner wie Quelle"
-#: ../data/gnac-pref-window.xml.h:17
+#: ../data/gnac-pref-window.xml.h:39
msgid "Source Filename"
msgstr "Quell-Dateiname"
-#: ../data/gnac-pref-window.xml.h:18
+#: ../data/gnac-pref-window.xml.h:40
+msgid "Strip special characters"
+msgstr ""
+
+#: ../data/gnac-pref-window.xml.h:41
msgid "Subfolder"
msgstr "Unterordner"
-#: ../data/gnac-pref-window.xml.h:19
+#: ../data/gnac-pref-window.xml.h:42
msgid "Subfolder name:"
msgstr "Name des Unterordners:"
-#: ../data/gnac-pref-window.xml.h:20
+#: ../data/gnac-pref-window.xml.h:43
msgid "Title"
msgstr "Titel"
@@ -215,7 +294,7 @@
msgid "Advanced"
msgstr "Erweitert"
-#: ../data/profiles/gnac-profiles-aac.xml.h:2 ../src/gnac-properties.c:110
+#: ../data/profiles/gnac-profiles-aac.xml.h:2 ../src/gnac-properties.c:112
msgid "Bitrate"
msgstr "Bitrate"
@@ -232,7 +311,7 @@
msgstr ""
#: ../data/profiles/gnac-profiles-base-advanced.xml.h:1
-#: ../src/gnac-properties.c:106
+#: ../src/gnac-properties.c:108
msgid "Channels"
msgstr "Kanäle"
@@ -297,7 +376,7 @@
msgstr "Minimale Bitrate"
#: ../data/profiles/gnac-profiles-lame.xml.h:11
-#: ../data/profiles/gnac-profiles-speex.xml.h:9 ../src/gnac-properties.c:107
+#: ../data/profiles/gnac-profiles-speex.xml.h:9 ../src/gnac-properties.c:109
msgid "Mode"
msgstr "Modus"
@@ -674,33 +753,42 @@
msgid "Very high compression"
msgstr ""
-#: ../libgnac/libgnac-converter.c:555
+#: ../libgnac/libgnac-converter.c:624
#, c-format
msgid "File %s is already in list"
msgstr "Datei %s befindet sich bereits in der Liste"
-#: ../libgnac/libgnac-converter.c:608
+#: ../libgnac/libgnac-converter.c:677
#, c-format
msgid "File %s isn't in list"
msgstr "Datei %s befindet sich nicht in der Liste"
-#: ../libgnac/libgnac-converter.c:926
+#: ../libgnac/libgnac-converter.c:994
msgid "Unable to create destination directory"
msgstr "Ziel-Verzeichnis kann nicht erstellt werden"
-#: ../libgnac/libgnac-converter.c:935
+#: ../libgnac/libgnac-converter.c:1027
+#, fuzzy, c-format
+msgid "Destination file %s already exists"
+msgstr "Datei %s befindet sich bereits in der Liste"
+
+#: ../libgnac/libgnac-converter.c:1029
+msgid "Destination file already exists"
+msgstr ""
+
+#: ../libgnac/libgnac-converter.c:1036
msgid "Unable to access destination file"
msgstr "Ziel-Datei kann nicht geschrieben werden"
-#: ../libgnac/libgnac-converter.c:939
+#: ../libgnac/libgnac-converter.c:1041
msgid "Unable to read source file"
msgstr "Quell-Datei kann nicht gelesen werden"
-#: ../libgnac/libgnac-converter.c:948
+#: ../libgnac/libgnac-converter.c:1050
msgid "An error occured during conversion"
msgstr ""
-#: ../libgnac/libgnac-converter.c:983
+#: ../libgnac/libgnac-converter.c:1088
msgid "unable to handle this format"
msgstr ""
@@ -739,7 +827,7 @@
msgid "Invalid UTF-8 tag: %s\n"
msgstr ""
-#: ../libgnac/libgnac-metadata.c:500
+#: ../libgnac/libgnac-metadata.c:504
#, c-format
msgid "Failed to create %s element"
msgstr ""
@@ -857,167 +945,182 @@
msgid "paused"
msgstr "angehalten"
-#: ../src/gnac-gconf.c:51
+#: ../src/gnac-gconf.c:61
msgid "Could not create GConf client.\n"
msgstr ""
-#: ../src/gnac-gconf.c:80 ../src/gnac-gconf.c:113 ../src/gnac-gconf.c:145
-#: ../src/gnac-gconf.c:176 ../src/gnac-gconf.c:207 ../src/gnac-gconf.c:239
+#: ../src/gnac-gconf.c:90 ../src/gnac-gconf.c:123 ../src/gnac-gconf.c:155
#, c-format
msgid "Unable to read key: %s\n"
msgstr ""
-#: ../src/gnac-gconf.c:97 ../src/gnac-gconf.c:129 ../src/gnac-gconf.c:160
-#: ../src/gnac-gconf.c:191 ../src/gnac-gconf.c:224 ../src/gnac-gconf.c:256
+#: ../src/gnac-gconf.c:107 ../src/gnac-gconf.c:138 ../src/gnac-gconf.c:172
#, c-format
msgid "Unable to set key: %s\n"
msgstr ""
-#: ../src/gnac-main.c:262
+#: ../src/gnac-main.c:268
msgid "Importing files..."
msgstr ""
-#: ../src/gnac-main.c:275
+#: ../src/gnac-main.c:281
#, c-format
msgid "%u file imported"
msgid_plural "%u files imported"
msgstr[0] ""
msgstr[1] ""
-#: ../src/gnac-main.c:295
+#: ../src/gnac-main.c:301
#, c-format
msgid "Impossible to launch thread to add files: %s\n"
msgstr ""
-#: ../src/gnac-main.c:323
+#: ../src/gnac-main.c:329
msgid "MPEG files (*.mp3)"
msgstr ""
-#: ../src/gnac-main.c:324
+#: ../src/gnac-main.c:330
msgid "MPEG-4 files (*.aac, *.m4a, *.mp4)"
msgstr ""
-#: ../src/gnac-main.c:325
+#: ../src/gnac-main.c:331
msgid "Musepack files (*.mpc)"
msgstr ""
-#: ../src/gnac-main.c:326
+#: ../src/gnac-main.c:332
msgid "Ogg Vorbis files (*.ogg)"
msgstr ""
-#: ../src/gnac-main.c:327
+#: ../src/gnac-main.c:333
msgid "RealAudio files (*.ra)"
msgstr ""
-#: ../src/gnac-main.c:328
+#: ../src/gnac-main.c:334
msgid "Speex files (*.spx)"
msgstr ""
-#: ../src/gnac-main.c:329
+#: ../src/gnac-main.c:335
msgid "Windows Media files (*.wma)"
msgstr ""
-#. No more gstreamer plugin
-#. { "audio/x-ape" , _("Ape files (*.ape)") },
-#: ../src/gnac-main.c:336
+#. XXX the Monkey's Audio plug-in has not yet been ported
+#. * to gstreamer-0.10
+#. { "audio/x-ape" , _("Ape files (*.ape)") },
+#: ../src/gnac-main.c:343
msgid "Flac files (*.flac)"
msgstr ""
-#: ../src/gnac-main.c:337
+#: ../src/gnac-main.c:344
msgid "WAV files (*.wav)"
msgstr ""
-#: ../src/gnac-main.c:342
+#: ../src/gnac-main.c:349
msgid "M3U playlists (*.m3u)"
msgstr ""
-#: ../src/gnac-main.c:343
+#: ../src/gnac-main.c:350
msgid "PLS playlists (*.pls)"
msgstr ""
-#: ../src/gnac-main.c:344
+#: ../src/gnac-main.c:351
msgid "XSPF playlists (*.xspf)"
msgstr ""
-#: ../src/gnac-main.c:350
+#: ../src/gnac-main.c:357
msgid "All files (*.*)"
msgstr "Alle Dateien (*.*)"
-#: ../src/gnac-main.c:353
+#: ../src/gnac-main.c:360
msgid "All supported files"
msgstr "Alle unterstützten Dateien"
-#: ../src/gnac-main.c:371
+#: ../src/gnac-main.c:378
msgid "All playlists files"
msgstr "Alle Playlist-Dateien"
-#: ../src/gnac-main.c:386
+#: ../src/gnac-main.c:393
msgid "Lossless codecs"
msgstr "Verlustfreie Codecs"
-#: ../src/gnac-main.c:397
+#: ../src/gnac-main.c:404
msgid "Lossy codecs"
msgstr "Verlustbehaftete Codecs"
-#: ../src/gnac-main.c:523
+#: ../src/gnac-main.c:529
#, c-format
msgid "Could not open link %s: %s\n"
msgstr ""
-#: ../src/gnac-main.c:552
+#: ../src/gnac-main.c:558
msgid ""
"A conversion is currently running...\n"
"Are you sure you want to quit?"
msgstr ""
-#: ../src/gnac-main.c:710
+#: ../src/gnac-main.c:680
+#, fuzzy, c-format
+msgid ""
+"File %s already exists...\n"
+"Overwrite?"
+msgstr "Datei %s befindet sich bereits in der Liste"
+
+#: ../src/gnac-main.c:685
+msgid "Remember my decision"
+msgstr ""
+
+#: ../src/gnac-main.c:720
#, c-format
msgid "Converting file %d of %d"
msgstr "Konvertiere Datei %d von %d"
-#: ../src/gnac-main.c:728
+#: ../src/gnac-main.c:738
#, c-format
msgid "%s left"
msgstr "%s verbleibend"
-#: ../src/gnac-main.c:841 ../src/gnac-main.c:1033 ../src/gnac-main.c:1065
+#: ../src/gnac-main.c:849 ../src/gnac-main.c:1054 ../src/gnac-main.c:1086
#, c-format
msgid "Error: %s\n"
msgstr "Fehler: %s\n"
-#: ../src/gnac-main.c:873
+#: ../src/gnac-main.c:881
msgid "Conversion completed with errors"
msgstr "Konvertierung beendet, mit Fehlern"
-#: ../src/gnac-main.c:875
+#: ../src/gnac-main.c:883
msgid "Conversion completed!"
msgstr "Konvertierung beendet!"
-#: ../src/gnac-main.c:892
+#: ../src/gnac-main.c:900
msgid "Conversion stopped"
msgstr "Konvertierung gestoppt"
-#: ../src/gnac-main.c:904
+#: ../src/gnac-main.c:913
#, c-format
+msgid "File not converted (%s)"
+msgstr ""
+
+#: ../src/gnac-main.c:921
+#, c-format
msgid ""
"Gnac failed to convert file %s\n"
" Error message: %s\n"
msgstr ""
-#: ../src/gnac-main.c:989
+#: ../src/gnac-main.c:1010
msgid "Open a file..."
msgstr "Datei öffnen..."
-#: ../src/gnac-main.c:1002
+#: ../src/gnac-main.c:1023
msgid "Close dialog on add"
msgstr "Dialog nach dem Hinzufügen schließen"
-#: ../src/gnac-main.c:1082
+#: ../src/gnac-main.c:1103
msgid "No help available yet"
msgstr "Hilfe ist noch nicht verfügbar"
#. Parse command line arguments
-#: ../src/gnac-main.c:1200
+#: ../src/gnac-main.c:1221
msgid "[URI...] - Convert your audio files"
msgstr ""
@@ -1027,36 +1130,44 @@
msgid "Invalid UTF-8 filename: %s\n"
msgstr ""
-#: ../src/gnac-prefs.c:220 ../src/gnac-properties.c:397 ../src/gnac-ui.c:81
+#: ../src/gnac-prefs.c:295 ../src/gnac-properties.c:407 ../src/gnac-ui.c:84
#, c-format
msgid "Unable to read file: %s\n"
msgstr "Datei kann nicht gelesen werden: %s\n"
-#: ../src/gnac-properties.c:102
+#: ../src/gnac-properties.c:104
msgid "Filename"
msgstr "Dateiname"
-#: ../src/gnac-properties.c:103
+#: ../src/gnac-properties.c:105
msgid "Location"
msgstr "Ort"
-#: ../src/gnac-properties.c:104
+#: ../src/gnac-properties.c:106
msgid "Duration"
msgstr "Dauer"
-#: ../src/gnac-properties.c:105
+#: ../src/gnac-properties.c:107
msgid "File size"
msgstr "Dateigröße"
-#: ../src/gnac-properties.c:108
+#: ../src/gnac-properties.c:110
msgid "Rate"
msgstr "Rate"
-#: ../src/gnac-properties.c:109
+#: ../src/gnac-properties.c:111
msgid "Codec"
msgstr "Codec"
-#: ../src/gnac-properties.c:331
+#: ../src/gnac-properties.c:113
+msgid "Track Gain"
+msgstr ""
+
+#: ../src/gnac-properties.c:114
+msgid "Track Peak"
+msgstr ""
+
+#: ../src/gnac-properties.c:339
#, c-format
msgid "%s had an unknown type: %s\n"
msgstr ""
@@ -1065,18 +1176,35 @@
msgid "_Resume"
msgstr ""
-#: ../src/gnac-ui.c:192
+#: ../src/gnac-ui.c:196
#, c-format
msgid "%u file added"
msgid_plural "%u files added"
msgstr[0] ""
msgstr[1] ""
-#: ../src/gnac-ui.c:490
+#: ../src/gnac-ui.c:371
+#, c-format
+msgid ""
+" <b>%s</b>\n"
+" <span color=\"#888\">by</span> %s <span color=\"#888\">from</span> %s"
+msgstr ""
+
+#: ../src/gnac-ui.c:498
+#, fuzzy
+msgid "Hide"
+msgstr "Zeigen/Verstecken"
+
+#: ../src/gnac-ui.c:498
+#, fuzzy
+msgid "Show"
+msgstr "Zeigen/Verstecken"
+
+#: ../src/gnac-ui.c:566
msgid "Cannot trash the file. Do you want to delete it immediately ?"
msgstr ""
-#: ../src/gnac-ui.c:494
+#: ../src/gnac-ui.c:570
#, c-format
msgid "Cannot trash file %s"
msgstr ""
Modified: trunk/po/fr.po
===================================================================
--- trunk/po/fr.po 2009-07-15 06:48:37 UTC (rev 372)
+++ trunk/po/fr.po 2009-07-15 07:08:34 UTC (rev 373)
@@ -9,8 +9,8 @@
msgstr ""
"Project-Id-Version: Gnac 0.2-svn\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-04-09 09:38+0200\n"
-"PO-Revision-Date: 2009-04-05 12:24+0100\n"
+"POT-Creation-Date: 2009-07-15 08:49+0200\n"
+"PO-Revision-Date: 2009-07-15 09:07+0200\n"
"Last-Translator: David Joaquim <dav...@gm...>\n"
"Language-Team: French <bdu...@us...>\n"
"MIME-Version: 1.0\n"
@@ -31,21 +31,38 @@
msgstr "Afficher une icone de notification durant la conversion"
#: ../data/gnac.schemas.in.h:3
+msgid "Folder hierarchy"
+msgstr "Hiérarchie de dossiers"
+
+#: ../data/gnac.schemas.in.h:4
+msgid "Folder hierarchy pattern"
+msgstr ""
+
+#: ../data/gnac.schemas.in.h:5
msgid "Folder type"
msgstr "Type de dossier"
-#: ../data/gnac.schemas.in.h:4
+#: ../data/gnac.schemas.in.h:6
msgid "Last used profile"
msgstr "Dernier profile utilisé"
-#: ../data/gnac.schemas.in.h:5
+#: ../data/gnac.schemas.in.h:7
msgid "Output directory"
msgstr "Dossier de sortie"
-#: ../data/gnac.schemas.in.h:6
+#: ../data/gnac.schemas.in.h:8
msgid "Output filename"
msgstr "Noms des fichiers convertis"
+#: ../data/gnac.schemas.in.h:9
+#, fuzzy
+msgid "Output filename pattern"
+msgstr "Noms des fichiers convertis"
+
+#: ../data/gnac.schemas.in.h:10
+msgid "Strip special characters in filenames"
+msgstr "Enlever les caractères spéciaux dans les noms de fichiers"
+
#: ../data/gnac-pref-window.xml.h:1
msgid "<b>Conversion:</b>"
msgstr "<b>Conversion:</b>"
@@ -55,74 +72,132 @@
msgstr "<b>Affichage:</b>"
#: ../data/gnac-pref-window.xml.h:3
+#, fuzzy
+msgid "<b>File and folder naming:</b>"
+msgstr "<b>Informations sur le profile</b>"
+
+#: ../data/gnac-pref-window.xml.h:4
+msgid "Artist"
+msgstr "Artiste"
+
+#: ../data/gnac-pref-window.xml.h:5
+msgid "Artist - Album"
+msgstr "Artiste - Album"
+
+#: ../data/gnac-pref-window.xml.h:6
msgid "Artist - Album - Title"
msgstr "Artiste - Album - Titre"
-#: ../data/gnac-pref-window.xml.h:4
+#: ../data/gnac-pref-window.xml.h:7
msgid "Artist - Number - Title"
msgstr "Artiste - Numéro - Titre"
-#: ../data/gnac-pref-window.xml.h:5
+#: ../data/gnac-pref-window.xml.h:8
msgid "Artist - Title"
msgstr "Artiste - Titre"
-#: ../data/gnac-pref-window.xml.h:6
+#: ../data/gnac-pref-window.xml.h:9
+msgid "Artist/Album"
+msgstr "Artiste/Album"
+
+#: ../data/gnac-pref-window.xml.h:10
+msgid "Audio"
+msgstr "Audio"
+
+#: ../data/gnac-pref-window.xml.h:11
+msgid "Custom"
+msgstr "Personnalisée"
+
+#: ../data/gnac-pref-window.xml.h:12
msgid "Custom folder"
msgstr "Dossier personnalisé"
-#: ../data/gnac-pref-window.xml.h:7
+#: ../data/gnac-pref-window.xml.h:13
msgid "Delete original files after conversion"
msgstr "Effacer les fichiers originaux après la conversion"
-#: ../data/gnac-pref-window.xml.h:8
+#: ../data/gnac-pref-window.xml.h:14
msgid "Display notification icon during conversion"
msgstr "Afficher une icone de notification durant la conversion"
-#: ../data/gnac-pref-window.xml.h:9
+#: ../data/gnac-pref-window.xml.h:15
+msgid "Folder hierarchy:"
+msgstr ""
+
+#: ../data/gnac-pref-window.xml.h:16
msgid "Folder location:"
msgstr "Emplacement du dossier"
-#: ../data/gnac-pref-window.xml.h:10
+#: ../data/gnac-pref-window.xml.h:17
+msgid "General"
+msgstr "Général"
+
+#: ../data/gnac-pref-window.xml.h:18
msgid "Gnac preferences"
msgstr "Préférences de Gnac"
-#: ../data/gnac-pref-window.xml.h:11
+#: ../data/gnac-pref-window.xml.h:19
+msgid "None"
+msgstr "Aucune"
+
+#: ../data/gnac-pref-window.xml.h:20
msgid "Number - Artist - Album - Title"
msgstr "Numéro - Artiste - Album - Titre"
-#: ../data/gnac-pref-window.xml.h:12
+#: ../data/gnac-pref-window.xml.h:21
msgid "Number - Artist - Title"
msgstr "Numéro - Artiste - Titre"
-#: ../data/gnac-pref-window.xml.h:13
+#: ../data/gnac-pref-window.xml.h:22
msgid "Number - Title"
msgstr "Numéro - Titre"
-#: ../data/gnac-pref-window.xml.h:14
+#: ../data/gnac-pref-window.xml.h:23
msgid "Output filename:"
msgstr "Noms des fichiers convertis"
-#: ../data/gnac-pref-window.xml.h:15
+#: ../data/gnac-pref-window.xml.h:24
msgid "Output folder:"
msgstr "Dossier de sortie"
-#: ../data/gnac-pref-window.xml.h:16
+#: ../data/gnac-pref-window.xml.h:26
+#, no-c-format
+msgid ""
+"Patterns available:\n"
+" %b: album\n"
+" %a: artist\n"
+" %c: comment\n"
+" %d: disc number\n"
+" %e: disc count\n"
+" %f: filename\n"
+" %g: genre\n"
+" %t: title\n"
+" %l: track count\n"
+" %n: track number\n"
+" %y: year"
+msgstr ""
+
+#: ../data/gnac-pref-window.xml.h:38
msgid "Same folder as source"
msgstr "Dans le même dossier que la source"
-#: ../data/gnac-pref-window.xml.h:17
+#: ../data/gnac-pref-window.xml.h:39
msgid "Source Filename"
msgstr "Nom du fichier source"
-#: ../data/gnac-pref-window.xml.h:18
+#: ../data/gnac-pref-window.xml.h:40
+msgid "Strip special characters"
+msgstr "Enlever les caractères spéciaux"
+
+#: ../data/gnac-pref-window.xml.h:41
msgid "Subfolder"
msgstr "Sous-dossier"
-#: ../data/gnac-pref-window.xml.h:19
+#: ../data/gnac-pref-window.xml.h:42
msgid "Subfolder name:"
msgstr "Nom du sous-dossier"
-#: ../data/gnac-pref-window.xml.h:20
+#: ../data/gnac-pref-window.xml.h:43
msgid "Title"
msgstr "Titre"
@@ -237,7 +312,7 @@
msgid "Advanced"
msgstr "Propriétés Avancées"
-#: ../data/profiles/gnac-profiles-aac.xml.h:2 ../src/gnac-properties.c:110
+#: ../data/profiles/gnac-profiles-aac.xml.h:2 ../src/gnac-properties.c:112
msgid "Bitrate"
msgstr "Bitrate"
@@ -254,7 +329,7 @@
msgstr "Formation de bruit temporel"
#: ../data/profiles/gnac-profiles-base-advanced.xml.h:1
-#: ../src/gnac-properties.c:106
+#: ../src/gnac-properties.c:108
msgid "Channels"
msgstr "Voies"
@@ -319,7 +394,7 @@
msgstr "Débit audio minimal"
#: ../data/profiles/gnac-profiles-lame.xml.h:11
-#: ../data/profiles/gnac-profiles-speex.xml.h:9 ../src/gnac-properties.c:107
+#: ../data/profiles/gnac-profiles-speex.xml.h:9 ../src/gnac-properties.c:109
msgid "Mode"
msgstr "Mode"
@@ -756,33 +831,42 @@
msgid "Very high compression"
msgstr "Très haute compression"
-#: ../libgnac/libgnac-converter.c:555
+#: ../libgnac/libgnac-converter.c:624
#, c-format
msgid "File %s is already in list"
msgstr "Le fichier %s se trouve déjà dans la liste"
-#: ../libgnac/libgnac-converter.c:608
+#: ../libgnac/libgnac-converter.c:677
#, c-format
msgid "File %s isn't in list"
msgstr "Le fichier %s ne se trouve pas dans la liste"
-#: ../libgnac/libgnac-converter.c:926
+#: ../libgnac/libgnac-converter.c:994
msgid "Unable to create destination directory"
msgstr "Echec lors de la création du répertoire de sortie"
-#: ../libgnac/libgnac-converter.c:935
+#: ../libgnac/libgnac-converter.c:1027
+#, c-format
+msgid "Destination file %s already exists"
+msgstr "Le fichier de destination %s existe déjà"
+
+#: ../libgnac/libgnac-converter.c:1029
+msgid "Destination file already exists"
+msgstr "Le fichier de destination existe déjà"
+
+#: ../libgnac/libgnac-converter.c:1036
msgid "Unable to access destination file"
msgstr "Echec lors de l'accès au fichier destination"
-#: ../libgnac/libgnac-converter.c:939
+#: ../libgnac/libgnac-converter.c:1041
msgid "Unable to read source file"
msgstr "Echec lors de la lecture du fichier source"
-#: ../libgnac/libgnac-converter.c:948
+#: ../libgnac/libgnac-converter.c:1050
msgid "An error occured during conversion"
msgstr "Une erreur est survenue durant la conversion"
-#: ../libgnac/libgnac-converter.c:983
+#: ../libgnac/libgnac-converter.c:1088
msgid "unable to handle this format"
msgstr "Format non pris en charge par Gnac"
@@ -821,7 +905,7 @@
msgid "Invalid UTF-8 tag: %s\n"
msgstr "Tag UTF-8 invalid: %s\n"
-#: ../libgnac/libgnac-metadata.c:500
+#: ../libgnac/libgnac-metadata.c:504
#, c-format
msgid "Failed to create %s element"
msgstr "Erreur lors de la création de l'élément %s"
@@ -947,115 +1031,114 @@
msgid "paused"
msgstr "suspendu"
-#: ../src/gnac-gconf.c:51
+#: ../src/gnac-gconf.c:61
msgid "Could not create GConf client.\n"
msgstr "Erreur lors de la création du client GConf.\n"
-#: ../src/gnac-gconf.c:80 ../src/gnac-gconf.c:113 ../src/gnac-gconf.c:145
-#: ../src/gnac-gconf.c:176 ../src/gnac-gconf.c:207 ../src/gnac-gconf.c:239
+#: ../src/gnac-gconf.c:90 ../src/gnac-gconf.c:123 ../src/gnac-gconf.c:155
#, c-format
msgid "Unable to read key: %s\n"
msgstr "Echec de la lecture de la clé: %s\n"
-#: ../src/gnac-gconf.c:97 ../src/gnac-gconf.c:129 ../src/gnac-gconf.c:160
-#: ../src/gnac-gconf.c:191 ../src/gnac-gconf.c:224 ../src/gnac-gconf.c:256
+#: ../src/gnac-gconf.c:107 ../src/gnac-gconf.c:138 ../src/gnac-gconf.c:172
#, c-format
msgid "Unable to set key: %s\n"
msgstr "Echec lors de l'application de la clé: %s\n"
-#: ../src/gnac-main.c:262
+#: ../src/gnac-main.c:268
msgid "Importing files..."
msgstr "Importation des fichiers..."
-#: ../src/gnac-main.c:275
+#: ../src/gnac-main.c:281
#, c-format
msgid "%u file imported"
msgid_plural "%u files imported"
msgstr[0] "%u fichier importé"
msgstr[1] "%u fichiers importés"
-#: ../src/gnac-main.c:295
+#: ../src/gnac-main.c:301
#, c-format
msgid "Impossible to launch thread to add files: %s\n"
msgstr ""
"Impossible de lancer le thread collectant les fichiers à importer: %s\n"
-#: ../src/gnac-main.c:323
+#: ../src/gnac-main.c:329
msgid "MPEG files (*.mp3)"
msgstr "Fichiers MPEG (*.mp3)"
-#: ../src/gnac-main.c:324
+#: ../src/gnac-main.c:330
msgid "MPEG-4 files (*.aac, *.m4a, *.mp4)"
msgstr "Fichiers MPEG-4 (*.aac, *.m4a, *.mp4)"
-#: ../src/gnac-main.c:325
+#: ../src/gnac-main.c:331
msgid "Musepack files (*.mpc)"
msgstr "Fichiers Musepack (*.mpc)"
-#: ../src/gnac-main.c:326
+#: ../src/gnac-main.c:332
msgid "Ogg Vorbis files (*.ogg)"
msgstr "Fichiers Ogg Vorbis (*.ogg)"
-#: ../src/gnac-main.c:327
+#: ../src/gnac-main.c:333
msgid "RealAudio files (*.ra)"
msgstr "Fichiers RealAudio (*.ra)"
-#: ../src/gnac-main.c:328
+#: ../src/gnac-main.c:334
msgid "Speex files (*.spx)"
msgstr "Fichiers Speex (*.spx)"
-#: ../src/gnac-main.c:329
+#: ../src/gnac-main.c:335
msgid "Windows Media files (*.wma)"
msgstr "Fichiers Windows Media (*.wma)"
-#. No more gstreamer plugin
-#. { "audio/x-ape" , _("Ape files (*.ape)") },
-#: ../src/gnac-main.c:336
+#. XXX the Monkey's Audio plug-in has not yet been ported
+#. * to gstreamer-0.10
+#. { "audio/x-ape" , _("Ape files (*.ape)") },
+#: ../src/gnac-main.c:343
msgid "Flac files (*.flac)"
msgstr "Fichiers Flac (*.flac)"
-#: ../src/gnac-main.c:337
+#: ../src/gnac-main.c:344
msgid "WAV files (*.wav)"
msgstr "Fichiers WAV (*.wav)"
-#: ../src/gnac-main.c:342
+#: ../src/gnac-main.c:349
msgid "M3U playlists (*.m3u)"
msgstr "Listes de lecture M3U (*.m3u)"
-#: ../src/gnac-main.c:343
+#: ../src/gnac-main.c:350
msgid "PLS playlists (*.pls)"
msgstr "Listes de lecture PLS (*.pls)"
-#: ../src/gnac-main.c:344
+#: ../src/gnac-main.c:351
msgid "XSPF playlists (*.xspf)"
msgstr "Listes de lecture XSPF (*.xspf)"
-#: ../src/gnac-main.c:350
+#: ../src/gnac-main.c:357
msgid "All files (*.*)"
msgstr "Tous les fichiers (*.*)"
-#: ../src/gnac-main.c:353
+#: ../src/gnac-main.c:360
msgid "All supported files"
msgstr "Fichiers pris en charge"
-#: ../src/gnac-main.c:371
+#: ../src/gnac-main.c:378
msgid "All playlists files"
msgstr "Toutes les listes de lecture"
-#: ../src/gnac-main.c:386
+#: ../src/gnac-main.c:393
msgid "Lossless codecs"
msgstr "Codecs sans pertes"
-#: ../src/gnac-main.c:397
+#: ../src/gnac-main.c:404
msgid "Lossy codecs"
msgstr "Codecs avec pertes"
-#: ../src/gnac-main.c:523
+#: ../src/gnac-main.c:529
#, c-format
msgid "Could not open link %s: %s\n"
-msgstr ""
+msgstr "Impossible d'ouvrir le lien %s: %s\n"
-#: ../src/gnac-main.c:552
+#: ../src/gnac-main.c:558
msgid ""
"A conversion is currently running...\n"
"Are you sure you want to quit?"
@@ -1063,35 +1146,53 @@
"Une conversion est en cours...\n"
"Êtes-vous sûr de vouloir quitter?"
-#: ../src/gnac-main.c:710
+#: ../src/gnac-main.c:680
#, c-format
+msgid ""
+"File %s already exists...\n"
+"Overwrite?"
+msgstr ""
+"Le fichier %s existe déjà...\n"
+"L'écraser?"
+
+#: ../src/gnac-main.c:685
+msgid "Remember my decision"
+msgstr "Se souvenir de ma décision"
+
+#: ../src/gnac-main.c:720
+#, c-format
msgid "Converting file %d of %d"
msgstr "Conversion du fichier %d sur %d"
-#: ../src/gnac-main.c:728
+#: ../src/gnac-main.c:738
#, c-format
msgid "%s left"
msgstr "%s restantes"
-#: ../src/gnac-main.c:841 ../src/gnac-main.c:1033 ../src/gnac-main.c:1065
+#: ../src/gnac-main.c:849 ../src/gnac-main.c:1054 ../src/gnac-main.c:1086
#, c-format
msgid "Error: %s\n"
msgstr "Erreur: %s\n"
-#: ../src/gnac-main.c:873
+#: ../src/gnac-main.c:881
msgid "Conversion completed with errors"
msgstr "Conversion terminée avec des erreurs"
-#: ../src/gnac-main.c:875
+#: ../src/gnac-main.c:883
msgid "Conversion completed!"
msgstr "Conversion terminée"
-#: ../src/gnac-main.c:892
+#: ../src/gnac-main.c:900
msgid "Conversion stopped"
msgstr "Conversion interrompue!"
-#: ../src/gnac-main.c:904
+#: ../src/gnac-main.c:913
#, c-format
+msgid "File not converted (%s)"
+msgstr "Fichier non converti (%s)"
+
+#: ../src/gnac-main.c:921
+#, c-format
msgid ""
"Gnac failed to convert file %s\n"
" Error message: %s\n"
@@ -1099,20 +1200,20 @@
"Echec lors de la conversion du fichier %s\n"
" Message d'erreur: %s\n"
-#: ../src/gnac-main.c:989
+#: ../src/gnac-main.c:1010
msgid "Open a file..."
msgstr "Ouvrir un fichier..."
-#: ../src/gnac-main.c:1002
+#: ../src/gnac-main.c:1023
msgid "Close dialog on add"
msgstr "Fermer la fenêtre après l'ajout"
-#: ../src/gnac-main.c:1082
+#: ../src/gnac-main.c:1103
msgid "No help available yet"
msgstr "Aucune aide disponible pour le moment"
#. Parse command line arguments
-#: ../src/gnac-main.c:1200
+#: ../src/gnac-main.c:1221
msgid "[URI...] - Convert your audio files"
msgstr "[URI...] - Convertissez vos fichiers audio"
@@ -1122,36 +1223,44 @@
msgid "Invalid UTF-8 filename: %s\n"
msgstr "Nom de fichier UTF-8 invalide: %s\n"
-#: ../src/gnac-prefs.c:220 ../src/gnac-properties.c:397 ../src/gnac-ui.c:81
+#: ../src/gnac-prefs.c:295 ../src/gnac-properties.c:407 ../src/gnac-ui.c:84
#, c-format
msgid "Unable to read file: %s\n"
msgstr "Echec lors de la lecture du fichier: %s\n"
-#: ../src/gnac-properties.c:102
+#: ../src/gnac-properties.c:104
msgid "Filename"
msgstr "Nom du fichier"
-#: ../src/gnac-properties.c:103
+#: ../src/gnac-properties.c:105
msgid "Location"
msgstr "Emplacement"
-#: ../src/gnac-properties.c:104
+#: ../src/gnac-properties.c:106
msgid "Duration"
msgstr "Durée"
-#: ../src/gnac-properties.c:105
+#: ../src/gnac-properties.c:107
msgid "File size"
msgstr "Taille du fichier"
-#: ../src/gnac-properties.c:108
+#: ../src/gnac-properties.c:110
msgid "Rate"
msgstr "Échantillonnage"
-#: ../src/gnac-properties.c:109
+#: ../src/gnac-properties.c:111
msgid "Codec"
msgstr "Codec"
-#: ../src/gnac-properties.c:331
+#: ../src/gnac-properties.c:113
+msgid "Track Gain"
+msgstr ""
+
+#: ../src/gnac-properties.c:114
+msgid "Track Peak"
+msgstr ""
+
+#: ../src/gnac-properties.c:339
#, c-format
msgid "%s had an unknown type: %s\n"
msgstr "%s avait un type inconnu: %s\n"
@@ -1160,20 +1269,37 @@
msgid "_Resume"
msgstr "_Reprendre"
-#: ../src/gnac-ui.c:192
+#: ../src/gnac-ui.c:196
#, c-format
msgid "%u file added"
msgid_plural "%u files added"
msgstr[0] "%u fichier ajouté"
msgstr[1] "%u fichiers ajoutés"
-#: ../src/gnac-ui.c:490
+#: ../src/gnac-ui.c:371
+#, c-format
+msgid ""
+" <b>%s</b>\n"
+" <span color=\"#888\">by</span> %s <span color=\"#888\">from</span> %s"
+msgstr ""
+" <b>%s</b>\n"
+" <span color=\"#888\">par</span> %s <span color=\"#888\">sur</span> %s"
+
+#: ../src/gnac-ui.c:498
+msgid "Hide"
+msgstr "Masquer"
+
+#: ../src/gnac-ui.c:498
+msgid "Show"
+msgstr "Afficher"
+
+#: ../src/gnac-ui.c:566
msgid "Cannot trash the file. Do you want to delete it immediately ?"
msgstr ""
"Echec lors du déplacement du fichier dans la corbeille. Voulez-vous le "
"supprimer immédiatement?"
-#: ../src/gnac-ui.c:494
+#: ../src/gnac-ui.c:570
#, c-format
msgid "Cannot trash file %s"
msgstr "Impossible de déplacer le fichier %s dans la corbeille"
Modified: trunk/po/gnac.pot
===================================================================
--- trunk/po/gnac.pot 2009-07-15 06:48:37 UTC (rev 372)
+++ trunk/po/gnac.pot 2009-07-15 07:08:34 UTC (rev 373)
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-04-09 09:38+0200\n"
+"POT-Creation-Date: 2009-07-15 08:49+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL...@li...>\n"
@@ -30,21 +30,37 @@
msgstr ""
#: ../data/gnac.schemas.in.h:3
+msgid "Folder hierarchy"
+msgstr ""
+
+#: ../data/gnac.schemas.in.h:4
+msgid "Folder hierarchy pattern"
+msgstr ""
+
+#: ../data/gnac.schemas.in.h:5
msgid "Folder type"
msgstr ""
-#: ../data/gnac.schemas.in.h:4
+#: ../data/gnac.schemas.in.h:6
msgid "Last used profile"
msgstr ""
-#: ../data/gnac.schemas.in.h:5
+#: ../data/gnac.schemas.in.h:7
msgid "Output directory"
msgstr ""
-#: ../data/gnac.schemas.in.h:6
+#: ../data/gnac.schemas.in.h:8
msgid "Output filename"
msgstr ""
+#: ../data/gnac.schemas.in.h:9
+msgid "Output filename pattern"
+msgstr ""
+
+#: ../data/gnac.schemas.in.h:10
+msgid "Strip special characters in filenames"
+msgstr ""
+
#: ../data/gnac-pref-window.xml.h:1
msgid "<b>Conversion:</b>"
msgstr ""
@@ -54,74 +70,131 @@
msgstr ""
#: ../data/gnac-pref-window.xml.h:3
+msgid "<b>File and folder naming:</b>"
+msgstr ""
+
+#: ../data/gnac-pref-window.xml.h:4
+msgid "Artist"
+msgstr ""
+
+#: ../data/gnac-pref-window.xml.h:5
+msgid "Artist - Album"
+msgstr ""
+
+#: ../data/gnac-pref-window.xml.h:6
msgid "Artist - Album - Title"
msgstr ""
-#: ../data/gnac-pref-window.xml.h:4
+#: ../data/gnac-pref-window.xml.h:7
msgid "Artist - Number - Title"
msgstr ""
-#: ../data/gnac-pref-window.xml.h:5
+#: ../data/gnac-pref-window.xml.h:8
msgid "Artist - Title"
msgstr ""
-#: ../data/gnac-pref-window.xml.h:6
+#: ../data/gnac-pref-window.xml.h:9
+msgid "Artist/Album"
+msgstr ""
+
+#: ../data/gnac-pref-window.xml.h:10
+msgid "Audio"
+msgstr ""
+
+#: ../data/gnac-pref-window.xml.h:11
+msgid "Custom"
+msgstr ""
+
+#: ../data/gnac-pref-window.xml.h:12
msgid "Custom folder"
msgstr ""
-#: ../data/gnac-pref-window.xml.h:7
+#: ../data/gnac-pref-window.xml.h:13
msgid "Delete original files after conversion"
msgstr ""
-#: ../data/gnac-pref-window.xml.h:8
+#: ../data/gnac-pref-window.xml.h:14
msgid "Display notification icon during conversion"
msgstr ""
-#: ../data/gnac-pref-window.xml.h:9
+#: ../data/gnac-pref-window.xml.h:15
+msgid "Folder hierarchy:"
+msgstr ""
+
+#: ../data/gnac-pref-window.xml.h:16
msgid "Folder location:"
msgstr ""
-#: ../data/gnac-pref-window.xml.h:10
+#: ../data/gnac-pref-window.xml.h:17
+msgid "General"
+msgstr ""
+
+#: ../data/gnac-pref-window.xml.h:18
msgid "Gnac preferences"
msgstr ""
-#: ../data/gnac-pref-window.xml.h:11
+#: ../data/gnac-pref-window.xml.h:19
+msgid "None"
+msgstr ""
+
+#: ../data/gnac-pref-window.xml.h:20
msgid "Number - Artist - Album - Title"
msgstr ""
-#: ../data/gnac-pref-window.xml.h:12
+#: ../data/gnac-pref-window.xml.h:21
msgid "Number - Artist - Title"
msgstr ""
-#: ../data/gnac-pref-window.xml.h:13
+#: ../data/gnac-pref-window.xml.h:22
msgid "Number - Title"
msgstr ""
-#: ../data/gnac-pref-window.xml.h:14
+#: ../data/gnac-pref-window.xml.h:23
msgid "Output filename:"
msgstr ""
-#: ../data/gnac-pref-window.xml.h:15
+#: ../data/gnac-pref-window.xml.h:24
msgid "Output folder:"
msgstr ""
-#: ../data/gnac-pref-window.xml.h:16
+#: ../data/gnac-pref-window.xml.h:26
+#, no-c-format
+msgid ""
+"Patterns available:\n"
+" %b: album\n"
+" %a: artist\n"
+" %c: comment\n"
+" %d: disc number\n"
+" %e: disc count\n"
+" %f: filename\n"
+" %g: genre\n"
+" %t: title\n"
+" %l: track count\n"
+" %n: track number\n"
+" %y: year"
+msgstr ""
+
+#: ../data/gnac-pref-window.xml.h:38
msgid "Same folder as source"
msgstr ""
-#: ../data/gnac-pref-window.xml.h:17
+#: ../data/gnac-pref-window.xml.h:39
msgid "Source Filename"
msgstr ""
-#: ../data/gnac-pref-window.xml.h:18
+#: ../data/gnac-pref-window.xml.h:40
+msgid "Strip special characters"
+msgstr ""
+
+#: ../data/gnac-pref-window.xml.h:41
msgid "Subfolder"
msgstr ""
-#: ../data/gnac-pref-window.xml.h:19
+#: ../data/gnac-pref-window.xml.h:42
msgid "Subfolder name:"
msgstr ""
-#: ../data/gnac-pref-window.xml.h:20
+#: ../data/gnac-pref-window.xml.h:43
msgid "Title"
msgstr ""
@@ -220,7 +293,7 @@
msgid "Advanced"
msgstr ""
-#: ../data/profiles/gnac-profiles-aac.xml.h:2 ../src/gnac-properties.c:110
+#: ../data/profiles/gnac-profiles-aac.xml.h:2 ../src/gnac-properties.c:112
msgid "Bitrate"
msgstr ""
@@ -237,7 +310,7 @@
msgstr ""
#: ../data/profiles/gnac-profiles-base-advanced.xml.h:1
-#: ../src/gnac-properties.c:106
+#: ../src/gnac-properties.c:108
msgid "Channels"
msgstr ""
@@ -302,7 +375,7 @@
msgstr ""
#: ../data/profiles/gnac-profiles-lame.xml.h:11
-#: ../data/profiles/gnac-profiles-speex.xml.h:9 ../src/gnac-properties.c:107
+#: ../data/profiles/gnac-profiles-speex.xml.h:9 ../src/gnac-properties.c:109
msgid "Mode"
msgstr ""
@@ -679,33 +752,42 @@
msgid "Very high compression"
msgstr ""
-#: ../libgnac/libgnac-converter.c:555
+#: ../libgnac/libgnac-converter.c:624
#, c-format
msgid "File %s is already in list"
msgstr ""
-#: ../libgnac/libgnac-converter.c:608
+#: ../libgnac/libgnac-converter.c:677
#, c-format
msgid "File %s isn't in list"
msgstr ""
-#: ../libgnac/libgnac-converter.c:926
+#: ../libgnac/libgnac-converter.c:994
msgid "Unable to create destination directory"
msgstr ""
-#: ../libgnac/libgnac-converter.c:935
+#: ../libgnac/libgnac-converter.c:1027
+#, c-format
+msgid "Destination file %s already exists"
+msgstr ""
+
+#: ../libgnac/libgnac-converter.c:1029
+msgid "Destination file already exists"
+msgstr ""
+
+#: ../libgnac/libgnac-converter.c:1036
msgid "Unable to access destination file"
msgstr ""
-#: ../libgnac/libgnac-converter.c:939
+#: ../libgnac/libgnac-converter.c:1041
msgid "Unable to read source file"
msgstr ""
-#: ../libgnac/libgnac-converter.c:948
+#: ../libgnac/libgnac-converter.c:1050
msgid "An error occured during conversion"
msgstr ""
-#: ../libgnac/libgnac-converter.c:983
+#: ../libgnac/libgnac-converter.c:1088
msgid "unable to handle this format"
msgstr ""
@@ -744,7 +826,7 @@
msgid "Invalid UTF-8 tag: %s\n"
msgstr ""
-#: ../libgnac/libgnac-metadata.c:500
+#: ../libgnac/libgnac-metadata.c:504
#, c-format
msgid "Failed to create %s element"
msgstr ""
@@ -862,167 +944,182 @@
msgid "paused"
msgstr ""
-#: ../src/gnac-gconf.c:51
+#: ../src/gnac-gconf.c:61
msgid "Could not create GConf client.\n"
msgstr ""
-#: ../src/gnac-gconf.c:80 ../src/gnac-gconf.c:113 ../src/gnac-gconf.c:145
-#: ../src/gnac-gconf.c:176 ../src/gnac-gconf.c:207 ../src/gnac-gconf.c:239
+#: ../src/gnac-gconf.c:90 ../src/gnac-gconf.c:123 ../src/gnac-gconf.c:155
#, c-format
msgid "Unable to read key: %s\n"
msgstr ""
-#: ../src/gnac-gconf.c:97 ../src/gnac-gconf.c:129 ../src/gnac-gconf.c:160
-#: ../src/gnac-gconf.c:191 ../src/gnac-gconf.c:224 ../src/gnac-gconf.c:256
+#: ../src/gnac-gconf.c:107 ../src/gnac-gconf.c:138 ../src/gnac-gconf.c:172
#, c-format
msgid "Unable to set key: %s\n"
msgstr ""
-#: ../src/gnac-main.c:262
+#: ../src/gnac-main.c:268
msgid "Importing files..."
msgstr ""
-#: ../src/gnac-main.c:275
+#: ../src/gnac-main.c:281
#, c-format
msgid "%u file imported"
msgid_plural "%u files imported"
msgstr[0] ""
msgstr[1] ""
-#: ../src/gnac-main.c:295
+#: ../src/gnac-main.c:301
#, c-format
msgid "Impossible to launch thread to add files:...
[truncated message content] |
|
From: <bdu...@us...> - 2009-07-15 06:48:41
|
Revision: 372
http://gnac.svn.sourceforge.net/gnac/?rev=372&view=rev
Author: bdupasqu
Date: 2009-07-15 06:48:37 +0000 (Wed, 15 Jul 2009)
Log Message:
-----------
- Add a 'Strip special characters' option in gnac-prefs.
Modified Paths:
--------------
trunk/data/gnac-pref-window.xml
trunk/data/gnac.schemas.in
trunk/libgnac/libgnac-converter.c
trunk/libgnac/libgnac-output.c
trunk/libgnac/libgnac-output.h
trunk/src/gnac-gconf.c
trunk/src/gnac-gconf.h
trunk/src/gnac-main.c
trunk/src/gnac-prefs.c
trunk/src/gnac-prefs.h
Modified: trunk/data/gnac-pref-window.xml
===================================================================
--- trunk/data/gnac-pref-window.xml 2009-07-14 17:28:19 UTC (rev 371)
+++ trunk/data/gnac-pref-window.xml 2009-07-15 06:48:37 UTC (rev 372)
@@ -294,6 +294,19 @@
</packing>
</child>
<child>
+ <object class="GtkCheckButton" id="strip_special_checkbutton">
+ <property name="label" translatable="yes">Strip special characters</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="draw_indicator">True</property>
+ <signal name="toggled" handler="gnac_prefs_strip_special_toggled"/>
+ </object>
+ <packing>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
<object class="GtkCheckButton" id="erase_originals_checkbutton">
<property name="label" translatable="yes">Delete original files after conversion</property>
<property name="visible">True</property>
@@ -303,7 +316,7 @@
<signal name="toggled" handler="gnac_prefs_erase_source_toggled"/>
</object>
<packing>
- <property name="position">1</property>
+ <property name="position">2</property>
</packing>
</child>
</object>
Modified: trunk/data/gnac.schemas.in
===================================================================
--- trunk/data/gnac.schemas.in 2009-07-14 17:28:19 UTC (rev 371)
+++ trunk/data/gnac.schemas.in 2009-07-15 06:48:37 UTC (rev 372)
@@ -82,6 +82,16 @@
</locale>
</schema>
<schema>
+ <key>/schemas/apps/gnac/conversion/strip_special</key>
+ <applyto>/apps/gnac/conversion/strip_special</applyto>
+ <owner>gnac</owner>
+ <type>bool</type>
+ <default>false</default>
+ <locale name="C">
+ <short>Strip special characters in filenames</short>
+ </locale>
+ </schema>
+ <schema>
<key>/schemas/apps/gnac/conversion/last_used_profile</key>
<applyto>/apps/gnac/conversion/last_used_profile</applyto>
<owner>gnac</owner>
Modified: trunk/libgnac/libgnac-converter.c
===================================================================
--- trunk/libgnac/libgnac-converter.c 2009-07-14 17:28:19 UTC (rev 371)
+++ trunk/libgnac/libgnac-converter.c 2009-07-15 06:48:37 UTC (rev 372)
@@ -58,6 +58,7 @@
{
PROP_0,
PROP_PIPELINE_DESC,
+ PROP_STRIP_SPECIAL,
PROP_RENAME_PATTERN,
PROP_FOLDER_HIERARCHY,
PROP_FOLDER_TYPE,
@@ -79,6 +80,7 @@
guint64 elapsed_duration;
guint64 total_duration;
+ gboolean strip_special;
gchar *pipeline_description;
gchar *rename_pattern;
gint folder_type;
@@ -187,6 +189,10 @@
g_value_set_string(value, self->priv->pipeline_description);
break;
+ case PROP_STRIP_SPECIAL:
+ g_value_set_boolean(value, self->priv->strip_special);
+ break;
+
case PROP_RENAME_PATTERN:
g_value_set_string(value, self->priv->rename_pattern);
break;
@@ -235,6 +241,10 @@
self->priv->pipeline_description = g_value_dup_string(value);
break;
+ case PROP_STRIP_SPECIAL:
+ self->priv->strip_special = g_value_get_boolean(value);
+ break;
+
case PROP_RENAME_PATTERN:
self->priv->rename_pattern = g_value_dup_string(value);
break;
@@ -339,6 +349,18 @@
g_object_class_install_property(gobject_class,
PROP_EXTENSION,
pspec);
+
+ /* Strip special characters */
+ pspec = g_param_spec_boolean("strip-special",
+ "Strip special",
+ "Strip special characters",
+ FALSE,
+ G_PARAM_READWRITE);
+
+ g_object_class_install_property(gobject_class,
+ PROP_STRIP_SPECIAL,
+ pspec);
+
/* Rename pattern */
pspec = g_param_spec_string("rename-pattern",
"Rename Pattern",
Modified: trunk/libgnac/libgnac-output.c
===================================================================
--- trunk/libgnac/libgnac-output.c 2009-07-14 17:28:19 UTC (rev 371)
+++ trunk/libgnac/libgnac-output.c 2009-07-15 06:48:37 UTC (rev 372)
@@ -75,38 +75,6 @@
LibgnacTags *tags);
-static void
-libgnac_output_create_subdir(GFile *file,
- const gchar *subdir,
- GError **error)
-{
- gchar *path;
- GError *err = NULL;
- GFile *child;
-
- path = g_file_get_path(file);
- if (!g_file_test(path, G_FILE_TEST_IS_DIR)) return;
- g_free(path);
-
- child = g_file_get_child(file, subdir);
-
- g_file_make_directory_with_parents(child, NULL, &err);
- if (err)
- {
- /* if one of the directory already exists, there is nothing to do
- * otherwise, just print out the error */
- if (!g_error_matches(err, G_IO_ERROR, G_IO_ERROR_EXISTS))
- {
- g_error("Error: %s", err->message);
- g_clear_error(&err);
- }
- }
-
- /* cleanup */
- g_object_unref(child);
-}
-
-
static gchar *
libgnac_output_remove_extension(const gchar *filename)
{
@@ -154,7 +122,8 @@
static gchar*
-libgnac_output_sanitize_path(const gchar* str)
+libgnac_output_sanitize_path(const gchar *str,
+ gboolean strip_special)
{
gchar *res = NULL;
gchar *s;
@@ -164,20 +133,22 @@
s = g_strdup(str);
+ /* XXX we cannot do that because of the custom patterns */
/* Replace path seperators with a hyphen */
- g_strdelimit (s, G_DIR_SEPARATOR_S, '-');
+ //g_strdelimit (s, G_DIR_SEPARATOR_S, '-');
// TODO filesystem specific sanitizing
- // TODO add gconf_option to strip special characters
- //if (strip_chars) {
+ if (strip_special)
+ {
/* Replace separators with a hyphen */
- //g_strdelimit (s, "\\:|", '-');
+ g_strdelimit(s, "\\:|", '-');
/* Replace all other weird characters to whitespace */
- //g_strdelimit (s, "*?&!\'\"$()`>{}[]<>", ' ');
+ g_strdelimit(s, "*?&!\'\"$`{}()[]<>", ' ');
/* Replace all whitespace with underscores */
- //g_strdelimit (s, "\t ", '_');
- //}
+ g_strdelimit(s, "\t ", '_');
+ }
+
res = g_filename_from_utf8(s, -1, NULL, NULL, NULL);
g_free(s);
return res ? res : g_strdup(str);
@@ -376,7 +347,6 @@
GFile *file = NULL;
LibgnacTags *tags = NULL;
gchar *output = NULL;
- gchar *sanitized = NULL;
file = item->source;
@@ -402,9 +372,7 @@
(GFunc)libgnac_output_rename_pattern_process, &output);
}
- sanitized = libgnac_output_sanitize_path(output);
- g_free(output);
- return sanitized;
+ return output;
}
@@ -420,12 +388,15 @@
gchar *folder_hierarchy;
gchar *folder_path;
gchar *output_name;
+ gchar *sanitized;
gchar *rename_pattern;
+ gboolean strip_special;
GnacFolderId folder_type;
g_return_if_fail(!error || !*error);
g_object_get(item->converter, "extension", &extension, NULL);
+ g_object_get(item->converter, "strip-special", &strip_special, NULL);
g_object_get(item->converter, "folder-hierarchy", &folder_hierarchy, NULL);
g_object_get(item->converter, "folder-path", &folder_path, NULL);
g_object_get(item->converter, "rename-pattern", &rename_pattern, NULL);
@@ -478,25 +449,40 @@
output_name = g_strdup_printf("%s.%s", filename, extension);
}
- libgnac_output_create_subdir(out_directory, folder_hierarchy, error);
- item->destination = g_file_get_child(out_directory, output_name);
+ /* sanitize the whole path */
+ sanitized = libgnac_output_sanitize_path(output_name, strip_special);
+ /* create the folder hierarchy and destination file */
+ item->destination = g_file_get_child(out_directory, sanitized);
+
/* cleanup */
g_free(output_name);
+ g_free(sanitized);
g_free(filename);
}
gchar *
-libgnac_output_get_preview_from_pattern(const gchar *pattern)
+libgnac_output_get_preview_from_pattern(const gchar *pattern,
+ gboolean strip_special)
{
gchar *preview;
+ gchar *sanitized;
LibgnacTags *tags;
+
preview = g_strdup(pattern);
tags = libgnac_metadata_get_dummy_tags();
libgnac_output_rename_patterns_init(tags);
+
/* replace all known patterns by their value for the given file */
g_slist_foreach(rename_patterns,
(GFunc)libgnac_output_rename_pattern_process, &preview);
- return preview;
+
+ /* sanitize the filename */
+ sanitized = libgnac_output_sanitize_path(preview, strip_special);
+
+ /* cleanup */
+ g_free(preview);
+
+ return sanitized;
}
Modified: trunk/libgnac/libgnac-output.h
===================================================================
--- trunk/libgnac/libgnac-output.h 2009-07-14 17:28:19 UTC (rev 371)
+++ trunk/libgnac/libgnac-output.h 2009-07-15 06:48:37 UTC (rev 372)
@@ -89,7 +89,8 @@
GError **error);
gchar *
-libgnac_output_get_preview_from_pattern(const gchar *pattern);
+libgnac_output_get_preview_from_pattern(const gchar *pattern,
+ gboolean strip_special);
G_END_DECLS
Modified: trunk/src/gnac-gconf.c
===================================================================
--- trunk/src/gnac-gconf.c 2009-07-14 17:28:19 UTC (rev 371)
+++ trunk/src/gnac-gconf.c 2009-07-15 06:48:37 UTC (rev 372)
@@ -39,6 +39,7 @@
static const gchar *gnac_gconf_paths[] = {
"/apps/gnac/display/tray_icon",
"/apps/gnac/conversion/clear_sources",
+ "/apps/gnac/conversion/strip_special",
"/apps/gnac/conversion/rename_pattern",
"/apps/gnac/conversion/rename_pattern_pattern",
"/apps/gnac/conversion/folder_hierarchy",
Modified: trunk/src/gnac-gconf.h
===================================================================
--- trunk/src/gnac-gconf.h 2009-07-14 17:28:19 UTC (rev 371)
+++ trunk/src/gnac-gconf.h 2009-07-15 06:48:37 UTC (rev 372)
@@ -37,6 +37,7 @@
typedef enum {
GNAC_GCONF_TRAY_ICON,
GNAC_GCONF_CLEAR_SOURCE,
+ GNAC_GCONF_STRIP_SPECIAL,
GNAC_GCONF_RENAME_PATTERN,
GNAC_GCONF_RENAME_PATTERN_PATTERN,
GNAC_GCONF_FOLDER_HIERARCHY,
Modified: trunk/src/gnac-main.c
===================================================================
--- trunk/src/gnac-main.c 2009-07-14 17:28:19 UTC (rev 371)
+++ trunk/src/gnac-main.c 2009-07-15 06:48:37 UTC (rev 372)
@@ -969,6 +969,7 @@
"rename-pattern", gnac_gconf_get_string(GNAC_GCONF_RENAME_PATTERN_PATTERN),
"folder-type", gnac_gconf_get_int(GNAC_GCONF_FOLDER_TYPE),
"folder-hierarchy", gnac_gconf_get_string(GNAC_GCONF_FOLDER_HIERARCHY_PATTERN),
+ "strip-special", gnac_gconf_get_boolean(GNAC_GCONF_STRIP_SPECIAL),
NULL);
libgnac_converter_start(converter, &error);
break;
Modified: trunk/src/gnac-prefs.c
===================================================================
--- trunk/src/gnac-prefs.c 2009-07-14 17:28:19 UTC (rev 371)
+++ trunk/src/gnac-prefs.c 2009-07-15 06:48:37 UTC (rev 372)
@@ -110,7 +110,8 @@
pattern = g_strdup(pattern_filename);
}
- preview = libgnac_output_get_preview_from_pattern(pattern);
+ preview = libgnac_output_get_preview_from_pattern(pattern,
+ gnac_gconf_get_boolean(GNAC_GCONF_STRIP_SPECIAL));
clean_label = g_markup_printf_escaped("<small><i>%s.%s</i></small>",
preview, gnac_profiles_get_extension());
@@ -214,6 +215,11 @@
"erase_originals_checkbutton"));
gtk_toggle_button_set_active(check_button,
gnac_gconf_get_boolean(GNAC_GCONF_CLEAR_SOURCE));
+ /* strip special characters */
+ check_button = GTK_TOGGLE_BUTTON(gtk_builder_get_object(gnac_prefs_builder,
+ "strip_special_checkbutton"));
+ gtk_toggle_button_set_active(check_button,
+ gnac_gconf_get_boolean(GNAC_GCONF_STRIP_SPECIAL));
/* output folder */
folder_type = gnac_gconf_get_int(GNAC_GCONF_FOLDER_TYPE);
/* output filename combo */
@@ -393,6 +399,16 @@
void
+gnac_prefs_strip_special_toggled(GtkWidget *widget,
+ gpointer data)
+{
+ gnac_gconf_set_boolean(GNAC_GCONF_STRIP_SPECIAL,
+ gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget)));
+ gnac_prefs_update_example_label(widget, data);
+}
+
+
+void
gnac_prefs_subfolder_radio_toggled(GtkWidget *widget,
gpointer data)
{
Modified: trunk/src/gnac-prefs.h
===================================================================
--- trunk/src/gnac-prefs.h 2009-07-14 17:28:19 UTC (rev 371)
+++ trunk/src/gnac-prefs.h 2009-07-15 06:48:37 UTC (rev 372)
@@ -54,6 +54,10 @@
gpointer data);
void
+gnac_prefs_strip_special_toggled(GtkWidget *widget,
+ gpointer data);
+
+void
gnac_prefs_same_radio_toggled(GtkWidget *widget,
gpointer data);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bdu...@us...> - 2009-07-14 17:28:20
|
Revision: 371
http://gnac.svn.sourceforge.net/gnac/?rev=371&view=rev
Author: bdupasqu
Date: 2009-07-14 17:28:19 +0000 (Tue, 14 Jul 2009)
Log Message:
-----------
- Update the trayicon's popup menu (Show/Hide) depending on the visibility of the main window.
Modified Paths:
--------------
trunk/src/gnac-ui.c
Modified: trunk/src/gnac-ui.c
===================================================================
--- trunk/src/gnac-ui.c 2009-07-14 17:13:07 UTC (rev 370)
+++ trunk/src/gnac-ui.c 2009-07-14 17:28:19 UTC (rev 371)
@@ -49,7 +49,7 @@
static gchar *status_msg = NULL;
static gchar *tooltip_path = NULL;
static gchar *progress_msg = NULL;
-extern guint nb_files_added;
+extern guint nb_files_added;
static gint root_x;
static gint root_y;
@@ -483,12 +483,27 @@
guint activate_time,
gpointer data)
{
+ gboolean window_displayed;
+ gchar *label_text;
+ GtkAction *show_action;
+ GtkWidget *main_window;
GtkWidget *trayicon_menu;
+ /* get the widgets */
+ main_window = gnac_ui_get_widget("main_window");
+ show_action = gnac_ui_get_action("tray_show_hide_item");
trayicon_menu = gnac_ui_get_widget("tray_popup");
+
+ g_object_get(main_window, "visible", &window_displayed, NULL);
+ label_text = g_strdup(window_displayed ? _("Hide") : _("Show"));
+
+ /* update the menu and then display it */
+ gtk_action_set_label(GTK_ACTION(show_action), label_text);
gtk_menu_popup(GTK_MENU(trayicon_menu), NULL, NULL, NULL, NULL,
- button,
- activate_time);
+ button, activate_time);
+
+ /* cleanup */
+ g_free(label_text);
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bdu...@us...> - 2009-07-14 17:13:11
|
Revision: 370
http://gnac.svn.sourceforge.net/gnac/?rev=370&view=rev
Author: bdupasqu
Date: 2009-07-14 17:13:07 +0000 (Tue, 14 Jul 2009)
Log Message:
-----------
- Don't print error messages when the user has chosen not to overwrite a file (display rather a GTK_STOCK_DIALOG_INFO).
- Update the trayicon's tooltip even if it is currently displayed.
Modified Paths:
--------------
trunk/libgnac/libgnac-converter.c
trunk/src/gnac-file-list.c
trunk/src/gnac-file-list.h
trunk/src/gnac-main.c
trunk/src/gnac-ui.c
Modified: trunk/libgnac/libgnac-converter.c
===================================================================
--- trunk/libgnac/libgnac-converter.c 2009-07-14 06:59:02 UTC (rev 369)
+++ trunk/libgnac/libgnac-converter.c 2009-07-14 17:13:07 UTC (rev 370)
@@ -1000,8 +1000,12 @@
}
else
{
+ GError *err = NULL;
+ g_set_error(&err, LIBGNAC_ERROR, LIBGNAC_ERROR_FILE_EXISTS,
+ _("Destination file %s already exists"), uri);
g_signal_emit(item->converter, signals[ERROR], 0, uri,
- _("Destination file already exists"), error);
+ _("Destination file already exists"), err);
+ g_clear_error(&err);
}
}
else
Modified: trunk/src/gnac-file-list.c
===================================================================
--- trunk/src/gnac-file-list.c 2009-07-14 06:59:02 UTC (rev 369)
+++ trunk/src/gnac-file-list.c 2009-07-14 17:13:07 UTC (rev 370)
@@ -614,7 +614,8 @@
void
gnac_file_list_visual_error(const gchar *uri,
- const gchar *msg)
+ const gchar *msg,
+ const gchar *stock_item)
{
GtkTreeRowReference *ref = NULL;
GtkTreePath *path = NULL;
@@ -633,8 +634,8 @@
if (gtk_tree_model_get_iter(model, &iter, path))
{
gtk_list_store_set(GTK_LIST_STORE(model), &iter,
- COL_STOCK, GTK_STOCK_DIALOG_ERROR,
- COL_TOOLTIP, g_strdup(msg), -1);
+ COL_STOCK, stock_item ? stock_item : GTK_STOCK_DIALOG_ERROR,
+ COL_TOOLTIP, g_strdup(msg), -1);
gtk_tree_path_free(path);
if (!gtk_tree_view_column_get_visible(column)) {
Modified: trunk/src/gnac-file-list.h
===================================================================
--- trunk/src/gnac-file-list.h 2009-07-14 06:59:02 UTC (rev 369)
+++ trunk/src/gnac-file-list.h 2009-07-14 17:13:07 UTC (rev 370)
@@ -104,7 +104,9 @@
gnac_file_list_hide_visual_bar(void);
void
-gnac_file_list_visual_error(const gchar *uri, const gchar *msg);
+gnac_file_list_visual_error(const gchar *uri,
+ const gchar *msg,
+ const gchar *stock_item);
void
gnac_file_list_remove_visual_error(const gchar *uri);
Modified: trunk/src/gnac-main.c
===================================================================
--- trunk/src/gnac-main.c 2009-07-14 06:59:02 UTC (rev 369)
+++ trunk/src/gnac-main.c 2009-07-14 17:13:07 UTC (rev 370)
@@ -50,6 +50,7 @@
#include "gnac-properties.h"
#include "gnac-utils.h"
#include "libgnac-converter.h"
+#include "libgnac-error.h"
#include "libgnac-metadata.h"
#include "libgnac-debug.h"
@@ -906,9 +907,19 @@
const gchar *msg,
GError *error)
{
- conversion_errors = TRUE;
- gnac_file_list_visual_error(uri, msg);
- g_printerr(_("Gnac failed to convert file %s\n Error message: %s\n"), uri, msg);
+ if (g_error_matches(error, LIBGNAC_ERROR, LIBGNAC_ERROR_FILE_EXISTS))
+ {
+ gchar *text;
+ text = g_strdup_printf(_("File not converted (%s)"), msg);
+ gnac_file_list_visual_error(uri, text, GTK_STOCK_DIALOG_INFO);
+ g_free(text);
+ }
+ else
+ {
+ conversion_errors = TRUE;
+ gnac_file_list_visual_error(uri, msg, NULL);
+ g_printerr(_("Gnac failed to convert file %s\n Error message: %s\n"), uri, msg);
+ }
}
Modified: trunk/src/gnac-ui.c
===================================================================
--- trunk/src/gnac-ui.c 2009-07-14 06:59:02 UTC (rev 369)
+++ trunk/src/gnac-ui.c 2009-07-14 17:13:07 UTC (rev 370)
@@ -496,10 +496,12 @@
gnac_ui_trayicon_tooltip_update(const gchar *tooltip)
{
gchar *tmp = NULL;
+ GdkDisplay *display;
tmp = tooltip_path;
tooltip_path = g_strdup(tooltip);
- //gtk_status_icon_set_tooltip(trayicon, tooltip_path);
+ display = gdk_display_get_default();
+ if (display) gtk_tooltip_trigger_tooltip_query(display);
g_free(tmp);
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bdu...@us...> - 2009-07-14 06:59:05
|
Revision: 369
http://gnac.svn.sourceforge.net/gnac/?rev=369&view=rev
Author: bdupasqu
Date: 2009-07-14 06:59:02 +0000 (Tue, 14 Jul 2009)
Log Message:
-----------
- Better error handling: display a dialog when the destination file already
exists.
Modified Paths:
--------------
trunk/libgnac/libgnac-converter.c
trunk/libgnac/libgnac-converter.h
trunk/libgnac/libgnac-marshallers.c
trunk/libgnac/libgnac-marshallers.h
trunk/src/gnac-file-list.c
trunk/src/gnac-main.c
Modified: trunk/libgnac/libgnac-converter.c
===================================================================
--- trunk/libgnac/libgnac-converter.c 2009-07-14 06:55:05 UTC (rev 368)
+++ trunk/libgnac/libgnac-converter.c 2009-07-14 06:59:02 UTC (rev 369)
@@ -40,6 +40,7 @@
enum
{
+ OVERWRITE,
PROGRESS,
FILE_ADDED,
FILE_REMOVED,
@@ -266,8 +267,23 @@
}
+static gboolean
+libgnac_converter_allow_overwrite_accumulator(GSignalInvocationHint *ihint,
+ GValue *return_accu,
+ const GValue *handler_return,
+ gpointer data)
+{
+ gboolean allow_overwrite;
+
+ allow_overwrite = g_value_get_boolean(handler_return);
+ g_value_set_boolean(return_accu, allow_overwrite);
+
+ return FALSE;
+}
+
+
static void
-libgnac_converter_class_init (LibgnacConverterClass *klass)
+libgnac_converter_class_init(LibgnacConverterClass *klass)
{
GObjectClass *gobject_class = G_OBJECT_CLASS(klass);
GParamSpec *pspec;
@@ -359,6 +375,14 @@
/* Signals */
+ signals[OVERWRITE] = g_signal_new("allow-overwrite",
+ G_TYPE_FROM_CLASS(gobject_class),
+ G_SIGNAL_RUN_LAST,
+ G_STRUCT_OFFSET(LibgnacConverterClass, overwrite),
+ libgnac_converter_allow_overwrite_accumulator, NULL,
+ g_cclosure_user_marshal_BOOLEAN__POINTER,
+ G_TYPE_BOOLEAN, 1, G_TYPE_POINTER);
+
signals[PROGRESS] = g_signal_new("progress",
G_TYPE_FROM_CLASS(gobject_class),
G_SIGNAL_RUN_LAST,
@@ -930,8 +954,6 @@
gst_message_parse_error(message, &error, NULL);
- libgnac_debug("Conversion failed:\n Object: %s\n Message: %s\n File: %s",
- name, error->message, uri);
if (g_str_equal("sink", name))
{
if (g_error_matches(error,
@@ -955,8 +977,38 @@
GST_RESOURCE_ERROR,
GST_RESOURCE_ERROR_OPEN_READ))
{
- g_signal_emit(item->converter, signals[ERROR], 0, uri,
- _("Unable to access destination file"), error);
+ if (g_file_test(g_file_get_path(item->destination), G_FILE_TEST_EXISTS))
+ {
+ gboolean overwrite = FALSE;
+ g_signal_emit(item->converter, signals[OVERWRITE], 0,
+ item->destination, &overwrite);
+ if (overwrite)
+ {
+ GError *err = NULL;
+ g_file_delete(item->destination, NULL, &err);
+ if (err) {
+ libgnac_debug("Unable to overwrite file %s: %s", uri, err->message);
+ g_clear_error(&err);
+ }
+ if (!err && libgnac_converter_restart_current(item->converter))
+ {
+ g_clear_error(&error);
+ g_free(name);
+ g_free(uri);
+ return;
+ }
+ }
+ else
+ {
+ g_signal_emit(item->converter, signals[ERROR], 0, uri,
+ _("Destination file already exists"), error);
+ }
+ }
+ else
+ {
+ g_signal_emit(item->converter, signals[ERROR], 0, uri,
+ _("Unable to access destination file"), error);
+ }
}
} else if (g_str_equal("source", name)) {
g_signal_emit(item->converter, signals[ERROR], 0, uri,
@@ -972,6 +1024,9 @@
_("An error occured during conversion"), error);
}
+ libgnac_debug("Conversion failed:\n Object: %s\n Message: %s\n File: %s",
+ name, error->message, uri);
+
g_clear_error(&error);
g_free(name);
g_free(uri);
Modified: trunk/libgnac/libgnac-converter.h
===================================================================
--- trunk/libgnac/libgnac-converter.h 2009-07-14 06:55:05 UTC (rev 368)
+++ trunk/libgnac/libgnac-converter.h 2009-07-14 06:59:02 UTC (rev 369)
@@ -71,6 +71,7 @@
/* class members */
/* signals */
+ gboolean (*overwrite) (LibgnacConverter *converter, gpointer file);
void (*progress) (LibgnacConverter *converter, gfloat fraction);
void (*file_added) (LibgnacConverter *converter, gchar *uri);
void (*file_removed) (LibgnacConverter *converter, gchar *uri);
Modified: trunk/libgnac/libgnac-marshallers.c
===================================================================
--- trunk/libgnac/libgnac-marshallers.c 2009-07-14 06:55:05 UTC (rev 368)
+++ trunk/libgnac/libgnac-marshallers.c 2009-07-14 06:59:02 UTC (rev 369)
@@ -1,7 +1,33 @@
+/*
+ * $Id$
+ *
+ * This file is part of GNAC - Gnome Audio Converter
+ *
+ * Copyright (C) 2007 - 2009 Gnac
+ *
+ * - DUPASQUIER Benoit <bdu...@us...>
+ * - JOAQUIM David <da...@us...>
+ * - ROUX Alexandre <ale...@us...>
+ *
+ * GNAC is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * GNAC is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNAC; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301 USA
+ */
+
#include <glib-object.h>
#include "libgnac-marshallers.h"
-
#ifdef G_ENABLE_DEBUG
#define g_marshal_value_peek_boolean(v) g_value_get_boolean (v)
#define g_marshal_value_peek_char(v) g_value_get_char (v)
@@ -47,7 +73,7 @@
#endif /* !G_ENABLE_DEBUG */
-/* VOID:STRING,STRING,POINTER (marshal:1) */
+/* VOID:STRING,STRING,POINTER */
void
g_cclosure_user_marshal_VOID__STRING_STRING_POINTER (GClosure *closure,
GValue *return_value G_GNUC_UNUSED,
@@ -86,7 +112,7 @@
data2);
}
-/* VOID:UINT,FLOAT,UINT64 (marshal:3) */
+/* VOID:UINT,FLOAT,UINT64 */
void
g_cclosure_user_marshal_VOID__UINT_FLOAT_UINT64 (GClosure *closure,
GValue *return_value G_GNUC_UNUSED,
@@ -125,3 +151,42 @@
data2);
}
+
+/* BOOLEAN:POINTER */
+void
+g_cclosure_user_marshal_BOOLEAN__POINTER (GClosure *closure,
+ GValue *return_value G_GNUC_UNUSED,
+ guint n_param_values,
+ const GValue *param_values,
+ gpointer invocation_hint G_GNUC_UNUSED,
+ gpointer marshal_data)
+{
+ typedef gboolean (*GMarshalFunc_BOOLEAN__POINTER) (gpointer data1,
+ gpointer arg_1,
+ gpointer data2);
+ register GMarshalFunc_BOOLEAN__POINTER callback;
+ register GCClosure *cc = (GCClosure*) closure;
+ register gpointer data1, data2;
+ gboolean v_return;
+
+ g_return_if_fail (return_value != NULL);
+ g_return_if_fail (n_param_values == 2);
+
+ if (G_CCLOSURE_SWAP_DATA (closure))
+ {
+ data1 = closure->data;
+ data2 = g_value_peek_pointer (param_values + 0);
+ }
+ else
+ {
+ data1 = g_value_peek_pointer (param_values + 0);
+ data2 = closure->data;
+ }
+ callback = (GMarshalFunc_BOOLEAN__POINTER) (marshal_data ? marshal_data : cc->callback);
+
+ v_return = callback (data1,
+ g_marshal_value_peek_pointer (param_values + 1),
+ data2);
+
+ g_value_set_boolean (return_value, v_return);
+}
Modified: trunk/libgnac/libgnac-marshallers.h
===================================================================
--- trunk/libgnac/libgnac-marshallers.h 2009-07-14 06:55:05 UTC (rev 368)
+++ trunk/libgnac/libgnac-marshallers.h 2009-07-14 06:59:02 UTC (rev 369)
@@ -1,12 +1,38 @@
+/*
+ * $Id$
+ *
+ * This file is part of GNAC - Gnome Audio Converter
+ *
+ * Copyright (C) 2007 - 2009 Gnac
+ *
+ * - DUPASQUIER Benoit <bdu...@us...>
+ * - JOAQUIM David <da...@us...>
+ * - ROUX Alexandre <ale...@us...>
+ *
+ * GNAC is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * GNAC is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNAC; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301 USA
+ */
-#ifndef __g_cclosure_user_marshal_MARSHAL_H__
-#define __g_cclosure_user_marshal_MARSHAL_H__
+#ifndef __LIBGNAC_MARSHALLERS_H__
+#define __LIBGNAC_MARSHALLERS_H__
#include <glib-object.h>
G_BEGIN_DECLS
-/* VOID:STRING,STRING,POINTER (marshal:1) */
+/* VOID:STRING,STRING,POINTER */
extern void g_cclosure_user_marshal_VOID__STRING_STRING_POINTER (GClosure *closure,
GValue *return_value,
guint n_param_values,
@@ -14,7 +40,7 @@
gpointer invocation_hint,
gpointer marshal_data);
-/* VOID:UINT,FLOAT,UINT64 (marshal:3) */
+/* VOID:UINT,FLOAT,UINT64 */
extern void g_cclosure_user_marshal_VOID__UINT_FLOAT_UINT64 (GClosure *closure,
GValue *return_value,
guint n_param_values,
@@ -22,7 +48,14 @@
gpointer invocation_hint,
gpointer marshal_data);
+/* BOOLEAN:POINTER */
+extern void g_cclosure_user_marshal_BOOLEAN__POINTER (GClosure *closure,
+ GValue *return_value,
+ guint n_param_values,
+ const GValue *param_values,
+ gpointer invocation_hint,
+ gpointer marshal_data);
+
G_END_DECLS
-#endif /* __g_cclosure_user_marshal_MARSHAL_H__ */
-
+#endif /* __LIBGNAC_MARSHALLERS_H__ */
Modified: trunk/src/gnac-file-list.c
===================================================================
--- trunk/src/gnac-file-list.c 2009-07-14 06:55:05 UTC (rev 368)
+++ trunk/src/gnac-file-list.c 2009-07-14 06:59:02 UTC (rev 369)
@@ -623,7 +623,6 @@
column = gtk_tree_view_get_column(GTK_TREE_VIEW(view),COL_STOCK);
-
ref = g_hash_table_lookup(reference_table, uri);
if (!ref)
{
Modified: trunk/src/gnac-main.c
===================================================================
--- trunk/src/gnac-main.c 2009-07-14 06:55:05 UTC (rev 368)
+++ trunk/src/gnac-main.c 2009-07-14 06:59:02 UTC (rev 369)
@@ -62,14 +62,17 @@
static GSList *filters;
static gchar *current_directory;
static LibgnacConverter *converter;
-static gboolean conversion_errors;
-static guint64 prev_time_left;
-static guint timeout_id;
+static gboolean conversion_errors;
+static guint64 prev_time_left;
+static guint timeout_id;
//volatile?
-static gboolean continue_files_action;
-static gboolean quit_app = FALSE;
+static gboolean continue_files_action;
+static gboolean quit_app = FALSE;
static GThread *file_action_thread = NULL;
-guint nb_files_added;
+/* TODO add an option overwrite in gnac-prefs? */
+static gboolean overwrite = FALSE;
+static gboolean remember_overwrite = FALSE;
+guint nb_files_added;
GnacState state;
GnacState prev_state;
@@ -467,7 +470,6 @@
for (next = filters; next; next = next->next) {
g_object_ref_sink(G_OBJECT(next->data));
g_object_unref(next->data);
- g_object_unref(next->data);
}
g_slist_free(filters);
}
@@ -651,26 +653,28 @@
}
-/*static gboolean
+static gboolean
gnac_on_converter_overwrite_cb(LibgnacConverter *converter,
- gpointer data,
+ gpointer file,
gpointer user_data)
{
GFile *uri;
GFileInfo *info;
GError *error = NULL;
- uri = (GFile *) data;
+ uri = (GFile*) file;
info = g_file_query_info(uri, G_FILE_ATTRIBUTE_STANDARD_DISPLAY_NAME,
G_FILE_QUERY_INFO_NONE, NULL, &error);
- if (!remember) {
+ if (!remember_overwrite)
+ {
+ gint response;
GtkWidget *dialog;
GtkWidget *checkbox;
dialog = gtk_message_dialog_new(
GTK_WINDOW(gnac_ui_get_widget("main_window")),
- GTK_DIALOG_DESTROY_WITH_PARENT,
+ GTK_DIALOG_MODAL,
GTK_MESSAGE_WARNING, GTK_BUTTONS_YES_NO,
_("File %s already exists...\nOverwrite?"),
g_file_info_get_display_name(info));
@@ -682,10 +686,12 @@
gtk_box_pack_end(GTK_BOX(GTK_DIALOG(dialog)->vbox), checkbox, FALSE, FALSE, 0);
gtk_widget_show(checkbox);
- gint response = gtk_dialog_run(GTK_DIALOG(dialog));
+ gdk_threads_enter();
+ response = gtk_dialog_run(GTK_DIALOG(dialog));
+ gdk_threads_leave();
if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(checkbox)))
- remember = TRUE;
+ remember_overwrite = TRUE;
gtk_widget_destroy(dialog);
@@ -696,7 +702,7 @@
g_object_unref(info);
return overwrite;
-}*/
+}
static void
@@ -1232,6 +1238,8 @@
/* Initialise converter and connect signals */
metadata = LIBGNAC_METADATA(libgnac_metadata_new());
converter = LIBGNAC_CONVERTER(libgnac_converter_new(metadata));
+ g_signal_connect(converter, "allow-overwrite",
+ G_CALLBACK(gnac_on_converter_overwrite_cb), converter);
g_signal_connect(converter, "progress",
G_CALLBACK(gnac_on_converter_progress_cb), converter);
g_signal_connect(converter, "error",
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bdu...@us...> - 2009-07-14 06:55:08
|
Revision: 368
http://gnac.svn.sourceforge.net/gnac/?rev=368&view=rev
Author: bdupasqu
Date: 2009-07-14 06:55:05 +0000 (Tue, 14 Jul 2009)
Log Message:
-----------
- Set the svn keyword 'Id' on all headers files in src/profiles/formats.
Modified Paths:
--------------
trunk/src/profiles/formats/gnac-profiles-aac.h
trunk/src/profiles/formats/gnac-profiles-flac.h
trunk/src/profiles/formats/gnac-profiles-lame.h
trunk/src/profiles/formats/gnac-profiles-speex.h
trunk/src/profiles/formats/gnac-profiles-unknown.h
trunk/src/profiles/formats/gnac-profiles-vorbis.h
trunk/src/profiles/formats/gnac-profiles-wav.h
trunk/src/profiles/formats/gnac-profiles-wavpack.h
Property Changed:
----------------
trunk/src/profiles/formats/gnac-profiles-aac.h
trunk/src/profiles/formats/gnac-profiles-flac.h
trunk/src/profiles/formats/gnac-profiles-lame.h
trunk/src/profiles/formats/gnac-profiles-speex.h
trunk/src/profiles/formats/gnac-profiles-unknown.h
trunk/src/profiles/formats/gnac-profiles-vorbis.h
trunk/src/profiles/formats/gnac-profiles-wav.h
trunk/src/profiles/formats/gnac-profiles-wavpack.h
Modified: trunk/src/profiles/formats/gnac-profiles-aac.h
===================================================================
--- trunk/src/profiles/formats/gnac-profiles-aac.h 2009-07-09 16:46:46 UTC (rev 367)
+++ trunk/src/profiles/formats/gnac-profiles-aac.h 2009-07-14 06:55:05 UTC (rev 368)
@@ -1,5 +1,5 @@
/*
- * $Id
+ * $Id$
*
* This file is part of GNAC - Gnome Audio Converter
*
Property changes on: trunk/src/profiles/formats/gnac-profiles-aac.h
___________________________________________________________________
Added: svn:keywords
+ Id
Modified: trunk/src/profiles/formats/gnac-profiles-flac.h
===================================================================
--- trunk/src/profiles/formats/gnac-profiles-flac.h 2009-07-09 16:46:46 UTC (rev 367)
+++ trunk/src/profiles/formats/gnac-profiles-flac.h 2009-07-14 06:55:05 UTC (rev 368)
@@ -1,5 +1,5 @@
/*
- * $Id
+ * $Id$
*
* This file is part of GNAC - Gnome Audio Converter
*
Property changes on: trunk/src/profiles/formats/gnac-profiles-flac.h
___________________________________________________________________
Added: svn:keywords
+ Id
Modified: trunk/src/profiles/formats/gnac-profiles-lame.h
===================================================================
--- trunk/src/profiles/formats/gnac-profiles-lame.h 2009-07-09 16:46:46 UTC (rev 367)
+++ trunk/src/profiles/formats/gnac-profiles-lame.h 2009-07-14 06:55:05 UTC (rev 368)
@@ -1,5 +1,5 @@
/*
- * $Id
+ * $Id$
*
* This file is part of GNAC - Gnome Audio Converter
*
Property changes on: trunk/src/profiles/formats/gnac-profiles-lame.h
___________________________________________________________________
Added: svn:keywords
+ Id
Modified: trunk/src/profiles/formats/gnac-profiles-speex.h
===================================================================
--- trunk/src/profiles/formats/gnac-profiles-speex.h 2009-07-09 16:46:46 UTC (rev 367)
+++ trunk/src/profiles/formats/gnac-profiles-speex.h 2009-07-14 06:55:05 UTC (rev 368)
@@ -1,5 +1,5 @@
/*
- * $Id
+ * $Id$
*
* This file is part of GNAC - Gnome Audio Converter
*
Property changes on: trunk/src/profiles/formats/gnac-profiles-speex.h
___________________________________________________________________
Added: svn:keywords
+ Id
Modified: trunk/src/profiles/formats/gnac-profiles-unknown.h
===================================================================
--- trunk/src/profiles/formats/gnac-profiles-unknown.h 2009-07-09 16:46:46 UTC (rev 367)
+++ trunk/src/profiles/formats/gnac-profiles-unknown.h 2009-07-14 06:55:05 UTC (rev 368)
@@ -1,5 +1,5 @@
/*
- * $Id
+ * $Id$
*
* This file is part of GNAC - Gnome Audio Converter
*
Property changes on: trunk/src/profiles/formats/gnac-profiles-unknown.h
___________________________________________________________________
Added: svn:keywords
+ Id
Modified: trunk/src/profiles/formats/gnac-profiles-vorbis.h
===================================================================
--- trunk/src/profiles/formats/gnac-profiles-vorbis.h 2009-07-09 16:46:46 UTC (rev 367)
+++ trunk/src/profiles/formats/gnac-profiles-vorbis.h 2009-07-14 06:55:05 UTC (rev 368)
@@ -1,5 +1,5 @@
/*
- * $Id
+ * $Id$
*
* This file is part of GNAC - Gnome Audio Converter
*
Property changes on: trunk/src/profiles/formats/gnac-profiles-vorbis.h
___________________________________________________________________
Added: svn:keywords
+ Id
Modified: trunk/src/profiles/formats/gnac-profiles-wav.h
===================================================================
--- trunk/src/profiles/formats/gnac-profiles-wav.h 2009-07-09 16:46:46 UTC (rev 367)
+++ trunk/src/profiles/formats/gnac-profiles-wav.h 2009-07-14 06:55:05 UTC (rev 368)
@@ -1,5 +1,5 @@
/*
- * $Id
+ * $Id$
*
* This file is part of GNAC - Gnome Audio Converter
*
Property changes on: trunk/src/profiles/formats/gnac-profiles-wav.h
___________________________________________________________________
Added: svn:keywords
+ Id
Modified: trunk/src/profiles/formats/gnac-profiles-wavpack.h
===================================================================
--- trunk/src/profiles/formats/gnac-profiles-wavpack.h 2009-07-09 16:46:46 UTC (rev 367)
+++ trunk/src/profiles/formats/gnac-profiles-wavpack.h 2009-07-14 06:55:05 UTC (rev 368)
@@ -1,5 +1,5 @@
/*
- * $Id
+ * $Id$
*
* This file is part of GNAC - Gnome Audio Converter
*
Property changes on: trunk/src/profiles/formats/gnac-profiles-wavpack.h
___________________________________________________________________
Added: svn:keywords
+ Id
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bdu...@us...> - 2009-07-09 16:46:53
|
Revision: 367
http://gnac.svn.sourceforge.net/gnac/?rev=367&view=rev
Author: bdupasqu
Date: 2009-07-09 16:46:46 +0000 (Thu, 09 Jul 2009)
Log Message:
-----------
- Disable the 'APE' filter (the Monkey's Audio plug-in has not yet been
ported to gstreamer-0.10)
Modified Paths:
--------------
trunk/src/gnac-main.c
trunk/src/gnac-ui.c
Modified: trunk/src/gnac-main.c
===================================================================
--- trunk/src/gnac-main.c 2009-07-08 20:57:30 UTC (rev 366)
+++ trunk/src/gnac-main.c 2009-07-09 16:46:46 UTC (rev 367)
@@ -333,7 +333,9 @@
};
const gchar *lossless_mime[][2] = {
- { "audio/x-ape" , _("Ape files (*.ape)") },
+ /* XXX the Monkey's Audio plug-in has not yet been ported
+ * to gstreamer-0.10 */
+ /*{ "audio/x-ape" , _("Ape files (*.ape)") },*/
{ "audio/x-flac", _("Flac files (*.flac)") },
{ "audio/x-wav" , _("WAV files (*.wav)") },
{ NULL, NULL }
Modified: trunk/src/gnac-ui.c
===================================================================
--- trunk/src/gnac-ui.c 2009-07-08 20:57:30 UTC (rev 366)
+++ trunk/src/gnac-ui.c 2009-07-09 16:46:46 UTC (rev 367)
@@ -368,7 +368,6 @@
GST_TAG_ARTIST, GST_TAG_ALBUM, GST_TAG_TITLE, NULL))
{
gchar *text;
-
text = g_markup_printf_escaped(_(" <b>%s</b>\n"
" <span color=\"#888\">by</span> %s "
"<span color=\"#888\">from</span> %s"),
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bdu...@us...> - 2009-07-08 20:57:37
|
Revision: 366
http://gnac.svn.sourceforge.net/gnac/?rev=366&view=rev
Author: bdupasqu
Date: 2009-07-08 20:57:30 +0000 (Wed, 08 Jul 2009)
Log Message:
-----------
- Fix a bug preventing the tooltip to be displayed when a tag contains
special characters (e.g. '&'),
- Move the rescaling of images from libgnac-metadata to gnac-utils,
- Add a border to images (trayicon's tooltip, properties window).
Modified Paths:
--------------
trunk/data/gnac-properties-window.xml
trunk/libgnac/libgnac-metadata.c
trunk/src/gnac-properties.c
trunk/src/gnac-ui.c
trunk/src/gnac-utils.c
trunk/src/gnac-utils.h
Modified: trunk/data/gnac-properties-window.xml
===================================================================
--- trunk/data/gnac-properties-window.xml 2009-07-07 22:15:39 UTC (rev 365)
+++ trunk/data/gnac-properties-window.xml 2009-07-08 20:57:30 UTC (rev 366)
@@ -401,8 +401,8 @@
</child>
<child>
<object class="GtkImage" id="image">
- <property name="width_request">96</property>
- <property name="height_request">96</property>
+ <property name="width_request">98</property>
+ <property name="height_request">98</property>
<property name="visible">True</property>
</object>
<packing>
Modified: trunk/libgnac/libgnac-metadata.c
===================================================================
--- trunk/libgnac/libgnac-metadata.c 2009-07-07 22:15:39 UTC (rev 365)
+++ trunk/libgnac/libgnac-metadata.c 2009-07-08 20:57:30 UTC (rev 366)
@@ -169,7 +169,7 @@
gint height,
gpointer user_data)
{
- gdk_pixbuf_loader_set_size(loader, 96, 96);
+ gdk_pixbuf_loader_set_size(loader, width, height);
}
Modified: trunk/src/gnac-properties.c
===================================================================
--- trunk/src/gnac-properties.c 2009-07-07 22:15:39 UTC (rev 365)
+++ trunk/src/gnac-properties.c 2009-07-08 20:57:30 UTC (rev 366)
@@ -313,6 +313,8 @@
if (LIBGNAC_METADATA_TAG_IS_IMAGE(entry_name))
{
GdkPixbuf *pixbuf = g_value_get_object(entry_value);
+ pixbuf = gnac_utils_scale_pixbuf(pixbuf, 96, 96);
+ pixbuf = gnac_utils_add_border_to_pixbuf(pixbuf);
gtk_image_set_from_pixbuf(GTK_IMAGE(entry), pixbuf);
return;
}
Modified: trunk/src/gnac-ui.c
===================================================================
--- trunk/src/gnac-ui.c 2009-07-07 22:15:39 UTC (rev 365)
+++ trunk/src/gnac-ui.c 2009-07-08 20:57:30 UTC (rev 366)
@@ -368,8 +368,9 @@
GST_TAG_ARTIST, GST_TAG_ALBUM, GST_TAG_TITLE, NULL))
{
gchar *text;
- text = g_strdup_printf(_("<b>%s</b>\n"
- "<span color=\"#888\">by</span> %s "
+
+ text = g_markup_printf_escaped(_(" <b>%s</b>\n"
+ " <span color=\"#888\">by</span> %s "
"<span color=\"#888\">from</span> %s"),
g_value_get_string(LIBGNAC_METADATA_TAG_TITLE(tags)),
g_value_get_string(LIBGNAC_METADATA_TAG_ARTIST(tags)),
@@ -381,6 +382,8 @@
{
GdkPixbuf *pixbuf;
pixbuf = g_value_get_object(LIBGNAC_METADATA_TAG_IMAGE(tags));
+ pixbuf = gnac_utils_scale_pixbuf(pixbuf, 80, 80);
+ pixbuf = gnac_utils_add_border_to_pixbuf(pixbuf);
gtk_tooltip_set_icon(tooltip, pixbuf);
}
}
Modified: trunk/src/gnac-utils.c
===================================================================
--- trunk/src/gnac-utils.c 2009-07-07 22:15:39 UTC (rev 365)
+++ trunk/src/gnac-utils.c 2009-07-08 20:57:30 UTC (rev 366)
@@ -30,6 +30,7 @@
#include "gnac-utils.h"
+#define GNAC_UTILS_ICON_BORDER_WIDTH 1
static guint64 average;
static guint64 total_samples;
@@ -131,3 +132,53 @@
return count;
}
+
+
+GdkPixbuf *
+gnac_utils_scale_pixbuf(GdkPixbuf *pixbuf,
+ gint new_width,
+ gint new_height)
+{
+ gint height, width;
+ gint n_height, n_width;
+
+ g_return_val_if_fail(GDK_IS_PIXBUF(pixbuf), NULL);
+
+ width = gdk_pixbuf_get_width(pixbuf);
+ height = gdk_pixbuf_get_height(pixbuf);
+
+ if (width > height)
+ {
+ n_width = new_width;
+ n_height = n_width * height / width;
+ }
+ else
+ {
+ n_height = new_height;
+ n_width = n_height * width / height;
+ }
+
+ return gdk_pixbuf_scale_simple(pixbuf, n_width, n_height, GDK_INTERP_BILINEAR);
+}
+
+
+GdkPixbuf *
+gnac_utils_add_border_to_pixbuf(GdkPixbuf *pixbuf)
+{
+ GdkPixbuf *bordered;
+ gint width, height;
+
+ g_return_val_if_fail(GDK_IS_PIXBUF(pixbuf), NULL);
+
+ width = gdk_pixbuf_get_width(pixbuf);
+ height = gdk_pixbuf_get_height(pixbuf);
+ bordered = gdk_pixbuf_new(gdk_pixbuf_get_colorspace(pixbuf),
+ gdk_pixbuf_get_has_alpha(pixbuf),
+ gdk_pixbuf_get_bits_per_sample(pixbuf),
+ width + (GNAC_UTILS_ICON_BORDER_WIDTH*2),
+ height +(GNAC_UTILS_ICON_BORDER_WIDTH*2));
+ gdk_pixbuf_fill(bordered, 0xff);
+ gdk_pixbuf_copy_area(pixbuf, 0, 0, width, height, bordered,
+ GNAC_UTILS_ICON_BORDER_WIDTH, GNAC_UTILS_ICON_BORDER_WIDTH);
+ return bordered;
+}
Modified: trunk/src/gnac-utils.h
===================================================================
--- trunk/src/gnac-utils.h 2009-07-07 22:15:39 UTC (rev 365)
+++ trunk/src/gnac-utils.h 2009-07-08 20:57:30 UTC (rev 366)
@@ -49,4 +49,14 @@
gint
gnac_utils_get_combo_size(GtkComboBox *combo);
+/* scale pixbuf to width x height while keeping the aspect ratio */
+GdkPixbuf *
+gnac_utils_scale_pixbuf(GdkPixbuf *pixbuf,
+ gint width,
+ gint height);
+
+/* add a one pixel black border around pixbuf */
+GdkPixbuf *
+gnac_utils_add_border_to_pixbuf(GdkPixbuf *pixbuf);
+
#endif /* GNAC_UTILS_H */
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bdu...@us...> - 2009-07-07 22:15:41
|
Revision: 365
http://gnac.svn.sourceforge.net/gnac/?rev=365&view=rev
Author: bdupasqu
Date: 2009-07-07 22:15:39 +0000 (Tue, 07 Jul 2009)
Log Message:
-----------
- Use GtkTooltip to display fancy tooltips on the trayicon.
Modified Paths:
--------------
trunk/src/gnac-main.c
trunk/src/gnac-prefs.c
trunk/src/gnac-ui.c
trunk/src/gnac-ui.h
Modified: trunk/src/gnac-main.c
===================================================================
--- trunk/src/gnac-main.c 2009-07-07 20:30:20 UTC (rev 364)
+++ trunk/src/gnac-main.c 2009-07-07 22:15:39 UTC (rev 365)
@@ -786,10 +786,8 @@
const gchar *output)
{
GError *err = NULL;
- const gchar *display;
gnac_file_list_remove_visual_error(input);
- display = gnac_utils_get_display_name(input, &err);
gnac_file_list_select_uri_and_follow(input);
@@ -799,7 +797,7 @@
}
if (gnac_gconf_get_boolean(GNAC_GCONF_TRAY_ICON)) {
- gnac_ui_trayicon_tooltip_update(display);
+ gnac_ui_trayicon_tooltip_update(input);
}
}
@@ -973,7 +971,8 @@
void
-gnac_on_ui_profile_changed_cb(GtkComboBox *box, gpointer data)
+gnac_on_ui_profile_changed_cb(GtkComboBox *box,
+ gpointer data)
{
const gchar *profile_name = NULL;
profile_name = gnac_profiles_get_name();
Modified: trunk/src/gnac-prefs.c
===================================================================
--- trunk/src/gnac-prefs.c 2009-07-07 20:30:20 UTC (rev 364)
+++ trunk/src/gnac-prefs.c 2009-07-07 22:15:39 UTC (rev 365)
@@ -86,7 +86,7 @@
"example_label"));
pattern_filename = gnac_prefs_entry_get_text("output_filename_entry");
- if (pattern_filename && !g_str_equal(pattern_filename, ""))
+ if (pattern_filename)
{
gnac_gconf_set_string(GNAC_GCONF_RENAME_PATTERN_PATTERN, pattern_filename);
}
Modified: trunk/src/gnac-ui.c
===================================================================
--- trunk/src/gnac-ui.c 2009-07-07 20:30:20 UTC (rev 364)
+++ trunk/src/gnac-ui.c 2009-07-07 22:15:39 UTC (rev 365)
@@ -38,14 +38,16 @@
#include "gnac-main.h"
#include "gnac-stock-items.h"
#include "gnac-ui.h"
+#include "gnac-utils.h"
#include "gnac-gconf.h"
#include "profiles/gnac-profiles.h"
+extern LibgnacMetadata *metadata;
static GtkBuilder *gnac_main_builder = NULL;
static GtkStatusIcon *trayicon = NULL;
static gchar *status_msg = NULL;
-static gchar *tooltip_msg = NULL;
+static gchar *tooltip_path = NULL;
static gchar *progress_msg = NULL;
extern guint nb_files_added;
@@ -68,9 +70,9 @@
gnac_ui_new(void)
{
gchar *current_profile;
- GError *err = NULL;
GtkWidget *file_list;
GtkWidget *audio_profile_hbox;
+ GError *err = NULL;
gnac_stock_items_init();
@@ -348,6 +350,52 @@
* - update label of Show/Hide depending on visibility or not of the window
*/
+gboolean
+gnac_ui_query_tooltip_cb(GtkStatusIcon *status_icon,
+ gint x,
+ gint y,
+ gboolean keyboard_mode,
+ GtkTooltip *tooltip,
+ gpointer user_data)
+{
+ LibgnacTags *tags;
+ GFile *tooltip_file;
+
+ tooltip_file = g_file_new_for_uri(tooltip_path);
+ tags = libgnac_metadata_extract(metadata, tooltip_file, NULL);
+
+ if (libgnac_metadata_tags_exist(tags,
+ GST_TAG_ARTIST, GST_TAG_ALBUM, GST_TAG_TITLE, NULL))
+ {
+ gchar *text;
+ text = g_strdup_printf(_("<b>%s</b>\n"
+ "<span color=\"#888\">by</span> %s "
+ "<span color=\"#888\">from</span> %s"),
+ g_value_get_string(LIBGNAC_METADATA_TAG_TITLE(tags)),
+ g_value_get_string(LIBGNAC_METADATA_TAG_ARTIST(tags)),
+ g_value_get_string(LIBGNAC_METADATA_TAG_ALBUM(tags)));
+ gtk_tooltip_set_markup(tooltip, text);
+
+ /* check wether we have a cover to display */
+ if (libgnac_metadata_tag_exists(tags, GST_TAG_IMAGE))
+ {
+ GdkPixbuf *pixbuf;
+ pixbuf = g_value_get_object(LIBGNAC_METADATA_TAG_IMAGE(tags));
+ gtk_tooltip_set_icon(tooltip, pixbuf);
+ }
+ }
+ else
+ {
+ gtk_tooltip_set_text(tooltip,
+ gnac_utils_get_display_name(tooltip_path, NULL));
+ }
+
+ g_object_unref(tooltip_file);
+
+ return TRUE;
+}
+
+
void
gnac_ui_show_trayicon(void)
{
@@ -358,7 +406,10 @@
if (!trayicon)
{
trayicon = gtk_status_icon_new_from_icon_name("gnac");
+ gtk_status_icon_set_has_tooltip(trayicon, TRUE);
+ g_signal_connect(G_OBJECT(trayicon), "query-tooltip",
+ G_CALLBACK(gnac_ui_query_tooltip_cb), NULL);
g_signal_connect(G_OBJECT(trayicon), "activate",
G_CALLBACK(gnac_ui_on_trayicon), NULL);
g_signal_connect(G_OBJECT(trayicon), "popup-menu",
@@ -385,10 +436,13 @@
gtk_window_move(GTK_WINDOW(main_window), root_x, root_y);
}
- if (!trayicon)
+ if (!trayicon)
{
trayicon = gtk_status_icon_new_from_icon_name("gnac");
-
+ gtk_status_icon_set_has_tooltip(trayicon, TRUE);
+
+ g_signal_connect(G_OBJECT(trayicon), "query-tooltip",
+ G_CALLBACK(gnac_ui_query_tooltip_cb), NULL);
g_signal_connect(G_OBJECT(trayicon), "activate",
G_CALLBACK(gnac_ui_on_trayicon), NULL);
g_signal_connect(G_OBJECT(trayicon), "popup-menu",
@@ -441,9 +495,9 @@
{
gchar *tmp = NULL;
- tmp = tooltip_msg;
- tooltip_msg = g_strdup(tooltip);
- gtk_status_icon_set_tooltip(trayicon, tooltip_msg);
+ tmp = tooltip_path;
+ tooltip_path = g_strdup(tooltip);
+ //gtk_status_icon_set_tooltip(trayicon, tooltip_path);
g_free(tmp);
}
Modified: trunk/src/gnac-ui.h
===================================================================
--- trunk/src/gnac-ui.h 2009-07-07 20:30:20 UTC (rev 364)
+++ trunk/src/gnac-ui.h 2009-07-07 22:15:39 UTC (rev 365)
@@ -89,6 +89,13 @@
gpointer user_data);
/* Status icon */
+gboolean
+gnac_ui_query_tooltip_cb(GtkStatusIcon *status_icon,
+ gint x,
+ gint y,
+ gboolean keyboard_mode,
+ GtkTooltip *tooltip,
+ gpointer user_data);
void
gnac_ui_show_trayicon(void);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bdu...@us...> - 2009-07-07 20:30:47
|
Revision: 364
http://gnac.svn.sourceforge.net/gnac/?rev=364&view=rev
Author: bdupasqu
Date: 2009-07-07 20:30:20 +0000 (Tue, 07 Jul 2009)
Log Message:
-----------
- Fix a bug in the handling of GNAC_GCONF_FOLDER_TYPE.
- Ensure the preferences window always starts with the 'General' tab selected.
Modified Paths:
--------------
trunk/data/gnac-pref-window.xml
trunk/src/gnac-gconf.c
trunk/src/gnac-prefs.c
trunk/src/gnac-properties.c
Modified: trunk/data/gnac-pref-window.xml
===================================================================
--- trunk/data/gnac-pref-window.xml 2009-06-30 10:33:36 UTC (rev 363)
+++ trunk/data/gnac-pref-window.xml 2009-07-07 20:30:20 UTC (rev 364)
@@ -78,7 +78,7 @@
<property name="orientation">vertical</property>
<property name="spacing">6</property>
<child>
- <object class="GtkNotebook" id="notebook1">
+ <object class="GtkNotebook" id="notebook">
<property name="visible">True</property>
<property name="can_focus">True</property>
<child>
Modified: trunk/src/gnac-gconf.c
===================================================================
--- trunk/src/gnac-gconf.c 2009-06-30 10:33:36 UTC (rev 363)
+++ trunk/src/gnac-gconf.c 2009-07-07 20:30:20 UTC (rev 364)
@@ -113,7 +113,7 @@
gnac_gconf_get_int(GnacGConfParam param)
{
GError *err = NULL;
- gboolean val;
+ gint val;
val = gconf_client_get_int(gconf_client, gnac_gconf_paths[param], &err);
Modified: trunk/src/gnac-prefs.c
===================================================================
--- trunk/src/gnac-prefs.c 2009-06-30 10:33:36 UTC (rev 363)
+++ trunk/src/gnac-prefs.c 2009-07-07 20:30:20 UTC (rev 364)
@@ -288,7 +288,7 @@
{
g_printerr(_("Unable to read file: %s\n"), err->message);
g_error_free(err);
- }
+ }
g_assert(err == NULL && gnac_prefs_builder != NULL);
gtk_builder_connect_signals(gnac_prefs_builder, NULL);
@@ -304,12 +304,17 @@
void
gnac_prefs_window_show(void)
{
+ GtkWidget *notebook;
if (!gnac_prefs_window) {
gnac_prefs_window = gnac_prefs_window_new();
}
gnac_prefs_gconf_retrieve();
+ /* always start with the general tab selected */
+ notebook = GTK_WIDGET(gtk_builder_get_object(gnac_prefs_builder, "notebook"));
+ gtk_notebook_set_current_page(GTK_NOTEBOOK(notebook), 0);
+
gtk_widget_show_all(gnac_prefs_window);
gtk_window_present(GTK_WINDOW(gnac_prefs_window));
}
@@ -373,11 +378,8 @@
gpointer data)
{
gnac_prefs_set_same_mode();
- if (gnac_gconf_get_int(GNAC_GCONF_FOLDER_TYPE) != FOLDER_CURRENT)
- {
- gnac_gconf_set_int(GNAC_GCONF_FOLDER_TYPE, FOLDER_CURRENT);
- gnac_gconf_set_string(GNAC_GCONF_DESTINATION_DIRECTORY, "");
- }
+ gnac_gconf_set_int(GNAC_GCONF_FOLDER_TYPE, FOLDER_CURRENT);
+ gnac_gconf_set_string(GNAC_GCONF_DESTINATION_DIRECTORY, "");
}
@@ -395,12 +397,9 @@
gpointer data)
{
gnac_prefs_set_subfolder_mode();
- if (gnac_gconf_get_int(GNAC_GCONF_FOLDER_TYPE) != FOLDER_SUBDIRECTORY)
- {
- gnac_gconf_set_int(GNAC_GCONF_FOLDER_TYPE, FOLDER_SUBDIRECTORY);
- gnac_gconf_set_string(GNAC_GCONF_DESTINATION_DIRECTORY,
+ gnac_gconf_set_int(GNAC_GCONF_FOLDER_TYPE, FOLDER_SUBDIRECTORY);
+ gnac_gconf_set_string(GNAC_GCONF_DESTINATION_DIRECTORY,
gnac_prefs_entry_get_text("subfolder_entry"));
- }
}
@@ -421,12 +420,9 @@
filechooserbutton = GTK_WIDGET(gtk_builder_get_object(gnac_prefs_builder,
"filechooserbutton"));
gnac_prefs_set_selected_mode();
- if (gnac_gconf_get_int(GNAC_GCONF_FOLDER_TYPE) != FOLDER_SELECTED)
- {
- gnac_gconf_set_int(GNAC_GCONF_FOLDER_TYPE, FOLDER_SELECTED);
- gnac_gconf_set_string(GNAC_GCONF_DESTINATION_DIRECTORY,
+ gnac_gconf_set_int(GNAC_GCONF_FOLDER_TYPE, FOLDER_SELECTED);
+ gnac_gconf_set_string(GNAC_GCONF_DESTINATION_DIRECTORY,
gtk_file_chooser_get_uri(GTK_FILE_CHOOSER(filechooserbutton)));
- }
}
Modified: trunk/src/gnac-properties.c
===================================================================
--- trunk/src/gnac-properties.c 2009-06-30 10:33:36 UTC (rev 363)
+++ trunk/src/gnac-properties.c 2009-07-07 20:30:20 UTC (rev 364)
@@ -303,6 +303,8 @@
}
else if (GTK_IS_IMAGE(entry))
{
+ /* TODO look for a cover in the current directory?
+ * (folder.jpg, cover.jpg, front.jpg, ...) */
gtk_image_clear(GTK_IMAGE(entry));
}
return;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bdu...@us...> - 2009-06-30 10:33:58
|
Revision: 363
http://gnac.svn.sourceforge.net/gnac/?rev=363&view=rev
Author: bdupasqu
Date: 2009-06-30 10:33:36 +0000 (Tue, 30 Jun 2009)
Log Message:
-----------
Change the shape of the cursor during conversion and file addition (only on
the tree view).
Modified Paths:
--------------
trunk/src/gnac-file-list.c
trunk/src/gnac-file-list.h
trunk/src/gnac-main.c
Modified: trunk/src/gnac-file-list.c
===================================================================
--- trunk/src/gnac-file-list.c 2009-06-24 10:22:10 UTC (rev 362)
+++ trunk/src/gnac-file-list.c 2009-06-30 10:33:36 UTC (rev 363)
@@ -743,6 +743,19 @@
*/
+void
+gnac_file_list_update_cursor(void)
+{
+ GdkCursor *cursor = NULL;
+ if (state == GNAC_AUDIO_FILE_ACTION_STATE ||
+ state == GNAC_AUDIO_CONVERT_STATE)
+ {
+ cursor = gdk_cursor_new(GDK_WATCH);
+ }
+ gdk_window_set_cursor(view->window, cursor);
+}
+
+
/* XXX this function is never used */
/*void
gnac_file_list_display_uri(GtkTreeViewColumn *tree_column,
Modified: trunk/src/gnac-file-list.h
===================================================================
--- trunk/src/gnac-file-list.h 2009-06-24 10:22:10 UTC (rev 362)
+++ trunk/src/gnac-file-list.h 2009-06-30 10:33:36 UTC (rev 363)
@@ -129,6 +129,9 @@
GdkEventKey *key,
gpointer data);
+void
+gnac_file_list_update_cursor(void);
+
void
gnac_file_list_display_uri(GtkTreeViewColumn *tree_column,
GtkCellRenderer *cell,
Modified: trunk/src/gnac-main.c
===================================================================
--- trunk/src/gnac-main.c 2009-06-24 10:22:10 UTC (rev 362)
+++ trunk/src/gnac-main.c 2009-06-30 10:33:36 UTC (rev 363)
@@ -97,6 +97,8 @@
prev_state = state;
state = new_state;
+
+ gnac_file_list_update_cursor();
switch (state) {
case GNAC_AUDIO_EMPTY_STATE:
@@ -947,9 +949,9 @@
"pipeline-description", gnac_profiles_get_pipeline(),
"folder-path", gnac_gconf_get_string(GNAC_GCONF_DESTINATION_DIRECTORY),
"extension", gnac_profiles_get_extension(),
- "rename-pattern", gnac_prefs_get_rename_pattern_as_str(),
+ "rename-pattern", gnac_gconf_get_string(GNAC_GCONF_RENAME_PATTERN_PATTERN),
"folder-type", gnac_gconf_get_int(GNAC_GCONF_FOLDER_TYPE),
- "folder-hierarchy", gnac_prefs_get_folder_hierarchy_as_str(),
+ "folder-hierarchy", gnac_gconf_get_string(GNAC_GCONF_FOLDER_HIERARCHY_PATTERN),
NULL);
libgnac_converter_start(converter, &error);
break;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bdu...@us...> - 2009-06-24 10:23:17
|
Revision: 362
http://gnac.svn.sourceforge.net/gnac/?rev=362&view=rev
Author: bdupasqu
Date: 2009-06-24 10:22:10 +0000 (Wed, 24 Jun 2009)
Log Message:
-----------
Code refactoring.
Modified Paths:
--------------
trunk/src/gnac-main.c
trunk/src/gnac-prefs.c
trunk/src/gnac-prefs.h
trunk/src/gnac-utils.c
trunk/src/gnac-utils.h
Modified: trunk/src/gnac-main.c
===================================================================
--- trunk/src/gnac-main.c 2009-06-17 13:32:49 UTC (rev 361)
+++ trunk/src/gnac-main.c 2009-06-24 10:22:10 UTC (rev 362)
@@ -947,11 +947,9 @@
"pipeline-description", gnac_profiles_get_pipeline(),
"folder-path", gnac_gconf_get_string(GNAC_GCONF_DESTINATION_DIRECTORY),
"extension", gnac_profiles_get_extension(),
- "rename-pattern", gnac_prefs_get_rename_pattern_as_str(
- gnac_gconf_get_int(GNAC_GCONF_RENAME_PATTERN)),
+ "rename-pattern", gnac_prefs_get_rename_pattern_as_str(),
"folder-type", gnac_gconf_get_int(GNAC_GCONF_FOLDER_TYPE),
- "folder-hierarchy", gnac_prefs_get_folder_hierarchy_as_str(
- gnac_gconf_get_int(GNAC_GCONF_FOLDER_HIERARCHY)),
+ "folder-hierarchy", gnac_prefs_get_folder_hierarchy_as_str(),
NULL);
libgnac_converter_start(converter, &error);
break;
Modified: trunk/src/gnac-prefs.c
===================================================================
--- trunk/src/gnac-prefs.c 2009-06-17 13:32:49 UTC (rev 361)
+++ trunk/src/gnac-prefs.c 2009-06-24 10:22:10 UTC (rev 362)
@@ -36,6 +36,7 @@
#include "gnac-prefs.h"
#include "gnac-properties.h"
#include "gnac-ui.h"
+#include "gnac-utils.h"
#include "libgnac-output.h"
#include "profiles/gnac-profiles.h"
@@ -109,7 +110,6 @@
pattern = g_strdup(pattern_filename);
}
- /* FIXME accentuated characters fail (eg \acute{e}) */
preview = libgnac_output_get_preview_from_pattern(pattern);
clean_label = g_markup_printf_escaped("<small><i>%s.%s</i></small>",
preview, gnac_profiles_get_extension());
@@ -204,44 +204,42 @@
GtkWidget *temp;
gint folder_type;
+ /* notification icon */
check_button = GTK_TOGGLE_BUTTON(gtk_builder_get_object(gnac_prefs_builder,
"check_notification_icon"));
gtk_toggle_button_set_active(check_button,
gnac_gconf_get_boolean(GNAC_GCONF_TRAY_ICON));
-
+ /* delete original files */
check_button = GTK_TOGGLE_BUTTON(gtk_builder_get_object(gnac_prefs_builder,
"erase_originals_checkbutton"));
gtk_toggle_button_set_active(check_button,
gnac_gconf_get_boolean(GNAC_GCONF_CLEAR_SOURCE));
-
+ /* output folder */
folder_type = gnac_gconf_get_int(GNAC_GCONF_FOLDER_TYPE);
-
+ /* output filename combo */
combo = GTK_COMBO_BOX(gtk_builder_get_object(gnac_prefs_builder,
- "file_pattern_combo"));
+ "file_pattern_combo"));
gtk_combo_box_set_active(combo,
gnac_gconf_get_int(GNAC_GCONF_RENAME_PATTERN));
-
+ /* output filename entry */
entry = GTK_ENTRY(gtk_builder_get_object(gnac_prefs_builder,
- "output_filename_entry"));
- gtk_entry_set_text(entry, gnac_prefs_get_rename_pattern_as_str(
- gtk_combo_box_get_active(GTK_COMBO_BOX(combo))));
-
+ "output_filename_entry"));
+ gtk_entry_set_text(entry, gnac_prefs_get_rename_pattern_as_str());
+ /* folder hierarchy combo */
combo = GTK_COMBO_BOX(gtk_builder_get_object(gnac_prefs_builder,
- "folder_hierarchy_combo"));
+ "folder_hierarchy_combo"));
gtk_combo_box_set_active(combo,
gnac_gconf_get_int(GNAC_GCONF_FOLDER_HIERARCHY));
-
+ /* folder hierarchy entry */
entry = GTK_ENTRY(gtk_builder_get_object(gnac_prefs_builder,
- "folder_hierarchy_entry"));
- gtk_entry_set_text(entry, gnac_prefs_get_folder_hierarchy_as_str(
- gtk_combo_box_get_active(GTK_COMBO_BOX(combo))));
-
+ "folder_hierarchy_entry"));
+ gtk_entry_set_text(entry, gnac_prefs_get_folder_hierarchy_as_str());
switch (folder_type)
{
/* Subfolder */
case FOLDER_SUBDIRECTORY:
- check_button = GTK_TOGGLE_BUTTON(gtk_builder_get_object(gnac_prefs_builder,
- "subfolder_radiobutton"));
+ check_button = GTK_TOGGLE_BUTTON(gtk_builder_get_object(
+ gnac_prefs_builder, "subfolder_radiobutton"));
temp = GTK_WIDGET(gtk_builder_get_object(gnac_prefs_builder,
"subfolder_entry"));
folder = gnac_gconf_get_string(GNAC_GCONF_DESTINATION_DIRECTORY);
@@ -253,10 +251,10 @@
/* Selected folder */
case FOLDER_SELECTED:
- check_button = GTK_TOGGLE_BUTTON(gtk_builder_get_object(gnac_prefs_builder,
- "selected_radiobutton"));
+ check_button = GTK_TOGGLE_BUTTON(gtk_builder_get_object(
+ gnac_prefs_builder, "selected_radiobutton"));
temp = GTK_WIDGET(gtk_builder_get_object(gnac_prefs_builder,
- "filechooserbutton"));
+ "filechooserbutton"));
folder = gnac_gconf_get_string(GNAC_GCONF_DESTINATION_DIRECTORY);
gtk_file_chooser_select_uri(GTK_FILE_CHOOSER(temp), folder);
g_free(folder);
@@ -267,8 +265,8 @@
/* Same as source */
case FOLDER_CURRENT:
default :
- check_button = GTK_TOGGLE_BUTTON(gtk_builder_get_object(gnac_prefs_builder,
- "same_radiobutton"));
+ check_button = GTK_TOGGLE_BUTTON(gtk_builder_get_object(
+ gnac_prefs_builder, "same_radiobutton"));
gtk_toggle_button_set_active(check_button, TRUE);
gnac_prefs_set_same_mode();
break;
@@ -289,16 +287,16 @@
if (err != NULL)
{
g_printerr(_("Unable to read file: %s\n"), err->message);
- g_error_free (err);
+ g_error_free(err);
}
- g_assert (err == NULL && gnac_prefs_builder != NULL);
+ g_assert(err == NULL && gnac_prefs_builder != NULL);
gtk_builder_connect_signals(gnac_prefs_builder, NULL);
prefs_window = GTK_WIDGET(gtk_builder_get_object(gnac_prefs_builder,
"gnac_preference_window"));
/* Set the parent */
gtk_window_set_transient_for(GTK_WINDOW(prefs_window),
- GTK_WINDOW(gnac_ui_get_widget("main_window")));
+ GTK_WINDOW(gnac_ui_get_widget("main_window")));
return prefs_window;
}
@@ -318,36 +316,46 @@
const gchar *
-gnac_prefs_get_rename_pattern_as_str(gint id)
+gnac_prefs_get_rename_pattern_as_str(void)
{
- gint index = id;
- /* TODO don't hard code the upper bound */
- if (id < 0 || id >= 9)
+ gint index;
+ gint size;
+ GtkComboBox *combo;
+ combo = GTK_COMBO_BOX(gtk_builder_get_object(gnac_prefs_builder,
+ "file_pattern_combo"));
+ index = gtk_combo_box_get_active(combo);
+ size = gnac_utils_get_combo_size(combo);
+ if (index < 0 || index >= size)
{
index = 0;
}
- if (index == 8)
+ if (index == size-1)
{
return gnac_gconf_get_string(GNAC_GCONF_RENAME_PATTERN_PATTERN);
}
- return rename_pattern_default[id];
+ return rename_pattern_default[index];
}
const gchar *
-gnac_prefs_get_folder_hierarchy_as_str(gint id)
+gnac_prefs_get_folder_hierarchy_as_str(void)
{
- gint index = id;
- /* TODO don't hard code the upper bound */
- if (id < 0 || id >= 5)
+ gint index;
+ gint size;
+ GtkComboBox *combo;
+ combo = GTK_COMBO_BOX(gtk_builder_get_object(gnac_prefs_builder,
+ "folder_hierarchy_combo"));
+ index = gtk_combo_box_get_active(combo);
+ size = gnac_utils_get_combo_size(combo);
+ if (index < 0 || index >= size)
{
index = 0;
}
- if (index == 4)
+ if (index == size-1)
{
return gnac_gconf_get_string(GNAC_GCONF_FOLDER_HIERARCHY_PATTERN);
}
- return folder_hierarchy_default[id];
+ return folder_hierarchy_default[index];
}
@@ -412,7 +420,6 @@
GtkWidget *filechooserbutton;
filechooserbutton = GTK_WIDGET(gtk_builder_get_object(gnac_prefs_builder,
"filechooserbutton"));
-
gnac_prefs_set_selected_mode();
if (gnac_gconf_get_int(GNAC_GCONF_FOLDER_TYPE) != FOLDER_SELECTED)
{
@@ -475,8 +482,7 @@
gtk_combo_box_get_active_text(GTK_COMBO_BOX(widget)),
GNAC_COMBO_CUSTOM));
- pattern = gnac_prefs_get_rename_pattern_as_str(
- gtk_combo_box_get_active(GTK_COMBO_BOX(widget)));
+ pattern = gnac_prefs_get_rename_pattern_as_str();
gtk_entry_set_text(GTK_ENTRY(filename_entry), pattern);
@@ -505,8 +511,7 @@
gtk_combo_box_get_active_text(GTK_COMBO_BOX(widget)),
GNAC_COMBO_CUSTOM));
- pattern = gnac_prefs_get_folder_hierarchy_as_str(
- gtk_combo_box_get_active(GTK_COMBO_BOX(widget)));
+ pattern = gnac_prefs_get_folder_hierarchy_as_str();
gtk_entry_set_text(GTK_ENTRY(folder_hierarchy_entry), pattern);
Modified: trunk/src/gnac-prefs.h
===================================================================
--- trunk/src/gnac-prefs.h 2009-06-17 13:32:49 UTC (rev 361)
+++ trunk/src/gnac-prefs.h 2009-06-24 10:22:10 UTC (rev 362)
@@ -37,10 +37,10 @@
gnac_prefs_window_show(void);
const gchar *
-gnac_prefs_get_rename_pattern_as_str(gint id);
+gnac_prefs_get_rename_pattern_as_str(void);
const gchar *
-gnac_prefs_get_folder_hierarchy_as_str(gint id);
+gnac_prefs_get_folder_hierarchy_as_str(void);
void
gnac_prefs_window_hide(void);
Modified: trunk/src/gnac-utils.c
===================================================================
--- trunk/src/gnac-utils.c 2009-06-17 13:32:49 UTC (rev 361)
+++ trunk/src/gnac-utils.c 2009-06-24 10:22:10 UTC (rev 362)
@@ -108,3 +108,26 @@
{
gnac_utils_moving_avg_init();
}
+
+
+/* FIXME not really efficient (although in our case we only
+ * have combos with less than 10 elements) */
+gint
+gnac_utils_get_combo_size(GtkComboBox *combo)
+{
+ gboolean valid;
+ guint count = 0;
+ GtkTreeIter iter;
+ GtkTreeModel *model;
+
+ model = gtk_combo_box_get_model(combo);
+ valid = gtk_tree_model_get_iter_first(model, &iter);
+
+ while (valid)
+ {
+ count++;
+ valid = gtk_tree_model_iter_next(model, &iter);
+ }
+
+ return count;
+}
Modified: trunk/src/gnac-utils.h
===================================================================
--- trunk/src/gnac-utils.h 2009-06-17 13:32:49 UTC (rev 361)
+++ trunk/src/gnac-utils.h 2009-06-24 10:22:10 UTC (rev 362)
@@ -28,6 +28,8 @@
#ifndef GNAC_UTILS_H
#define GNAC_UTILS_H
+#include <gtk/gtk.h>
+
gchar *
gnac_utils_get_display_name(const gchar *uri,
GError **error);
@@ -44,4 +46,7 @@
void
gnac_utils_moving_avg_reset(void);
+gint
+gnac_utils_get_combo_size(GtkComboBox *combo);
+
#endif /* GNAC_UTILS_H */
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <da...@us...> - 2009-06-17 14:05:58
|
Revision: 361
http://gnac.svn.sourceforge.net/gnac/?rev=361&view=rev
Author: daiji
Date: 2009-06-17 13:32:49 +0000 (Wed, 17 Jun 2009)
Log Message:
-----------
Add accelerators to main interface
Modified Paths:
--------------
trunk/data/gnac.xml
trunk/src/gnac-file-list.c
Modified: trunk/data/gnac.xml
===================================================================
--- trunk/data/gnac.xml 2009-06-08 06:38:39 UTC (rev 360)
+++ trunk/data/gnac.xml 2009-06-17 13:32:49 UTC (rev 361)
@@ -17,6 +17,7 @@
<property name="sensitive">False</property>
<signal handler="gnac_on_ui_convert_cb" name="activate"/>
</object>
+ <accelerator key="X" modifiers="GDK_CONTROL_MASK | GDK_SHIFT_MASK"/>
</child>
<child>
<object class="GtkAction" id="pause_item">
@@ -33,6 +34,7 @@
<property name="sensitive">False</property>
<signal handler="gnac_on_ui_properties_cb" name="activate"/>
</object>
+ <accelerator key="Return" modifiers="GDK_MOD1_MASK"/>
</child>
<child>
<object class="GtkAction" id="quit_item">
@@ -53,6 +55,7 @@
<property name="name">add_item</property>
<signal handler="gnac_on_ui_add_cb" name="activate"/>
</object>
+ <accelerator key="I" modifiers="GDK_CONTROL_MASK"/>
</child>
<child>
<object class="GtkAction" id="remove_item">
@@ -61,6 +64,7 @@
<property name="sensitive">False</property>
<signal handler="gnac_on_ui_remove_cb" name="activate"/>
</object>
+ <accelerator key="Delete" />
</child>
<child>
<object class="GtkAction" id="clear_item">
@@ -69,6 +73,7 @@
<property name="sensitive">False</property>
<signal handler="gnac_on_ui_clear_cb" name="activate"/>
</object>
+ <accelerator key="C" modifiers="GDK_CONTROL_MASK | GDK_SHIFT_MASK"/>
</child>
<child>
<object class="GtkAction" id="prefs_item">
@@ -224,7 +229,6 @@
<signal handler="gnac_file_list_popup_menu" name="popup_menu"/>
<signal handler="gnac_file_list_on_button_pressed" name="button_press_event"/>
<signal handler="gnac_file_list_on_row_activated_cb" name="row_activated"/>
- <signal handler="gnac_file_list_delete_key_pressed" name="key_release_event"/>
<signal handler="gnac_on_ui_drag_data_received_cb" name="drag_data_received"/>
</object>
</child>
Modified: trunk/src/gnac-file-list.c
===================================================================
--- trunk/src/gnac-file-list.c 2009-06-08 06:38:39 UTC (rev 360)
+++ trunk/src/gnac-file-list.c 2009-06-17 13:32:49 UTC (rev 361)
@@ -730,6 +730,7 @@
}
+/*
void
gnac_file_list_delete_key_pressed(GtkWidget *widget,
GdkEventKey *key,
@@ -739,6 +740,7 @@
gnac_on_ui_remove_cb(widget, data);
}
}
+*/
/* XXX this function is never used */
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
