Thread: [gtpd-cvs] SF.net SVN: gtkpod: [1511] gtkpod/trunk (2024)

Revision: 1511 Author: phantom_sfDate: 2007-05-30 11:18:27 -0700 (Wed, 30 May 2007)Log Message:-----------2007-05-30 P.G. Richardson <phantom_sf at users.sourceforge.net> * display_coverart.c Changed the on_main_cover_image_clicked so that only the tracks belonging to the album are displayed in the track listing. The sorttabs are no longer updated. A lot quicker and doesnt rely on the artist/album sorttabs being visible. * fetchcover.c Status bar content changes in case album is not found.Modified Paths:-------------- gtkpod/trunk/ChangeLog_detailed gtkpod/trunk/src/display_coverart.c gtkpod/trunk/src/fetchcover.cModified: gtkpod/trunk/ChangeLog_detailed===================================================================--- gtkpod/trunk/ChangeLog_detailed2007-05-30 14:45:20 UTC (rev 1510)+++ gtkpod/trunk/ChangeLog_detailed2007-05-30 18:18:27 UTC (rev 1511)@@ -1,3 +1,17 @@+2007-05-30 P.G. Richardson <phantom_sf at users.sourceforge.net>++ * display_coverart.c+ + Changed the on_main_cover_image_clicked so that only the+ tracks belonging to the album are displayed in the track+ listing. The sorttabs are no longer updated. A lot+ quicker and doesnt rely on the artist/album sorttabs+ being visible.+ + * fetchcover.c++ Status bar content changes in case album is not found.+ 2007-05-30 Todd Zullinger <tmzullinger at users.sourceforge.net> * configure.inModified: gtkpod/trunk/src/display_coverart.c===================================================================--- gtkpod/trunk/src/display_coverart.c2007-05-30 14:45:20 UTC (rev 1510)+++ gtkpod/trunk/src/display_coverart.c2007-05-30 18:18:27 UTC (rev 1511)@@ -501,7 +501,6 @@ static gint on_main_cover_image_clicked (GnomeCanvasItem *canvasitem, GdkEvent *event, gpointer data) { Cover_Item *cover;-gboolean status; guint mbutton; if(event->type != GDK_BUTTON_PRESS)@@ -522,9 +521,19 @@ /* Select the correct track in the sorttabs */ album = cover->album;-track = g_list_nth_data (album->tracks, 0);-status = st_set_selection (track);-+g_return_val_if_fail (album, FALSE);++/* Clear the tracks listed in the display */+tm_remove_all_tracks ();++GList *tracks = album->tracks;+while (tracks)+{+track = (Track *) tracks->data;+tm_add_track_to_track_model (track, NULL);+tracks = tracks->next;+}+ /* Turn the display change back on */ coverart_block_change (FALSE); }Modified: gtkpod/trunk/src/fetchcover.c===================================================================--- gtkpod/trunk/src/fetchcover.c2007-05-30 14:45:20 UTC (rev 1510)+++ gtkpod/trunk/src/fetchcover.c2007-05-30 18:18:27 UTC (rev 1511)@@ -398,6 +398,8 @@ fetchcover_debug("fetchcover_next_button: getting cover for:\n- Artist: %s\n- Album: %s", fetchcover_track->artist, fetchcover_track->album); +fetchcover_statusbar_update ("");+ if (netsearched == FALSE) { net_search_track ();@@ -436,7 +438,12 @@ if (displayed_cover->image == NULL) { net_retrieve_image (displayed_cover->url);-g_return_if_fail (displayed_cover->image);+if (displayed_cover->image == NULL)+{+gdk_window_set_cursor (window, NULL);+fetchcover_statusbar_update ("Failed to retrieve image.");+g_return_if_fail (displayed_cover->image);+} } fetchcover_debug("Displayed Image path: %s/%s\n", displayed_cover->dir, displayed_cover->filename);@@ -444,7 +451,7 @@ GdkPixbuf *scaled = gdk_pixbuf_scale_simple(displayed_cover->image, IMGSCALE, IMGSCALE, GDK_INTERP_NEAREST); gnome_canvas_item_set(fetchcover_canvasitem, "pixbuf", scaled, NULL); -gdk_window_set_cursor (window, gdk_cursor_new (GDK_LEFT_PTR));+gdk_window_set_cursor (window, NULL); return; }@@ -460,6 +467,8 @@ /* decrease the index by 1 */ displayed_cover_index--; +fetchcover_statusbar_update ("");+ if (displayed_cover_index <= 0) { /* Something went awry so make the index@@ -484,7 +493,11 @@ if (displayed_cover->image == NULL) { net_retrieve_image (displayed_cover->url);-g_return_if_fail (displayed_cover->image);+if (displayed_cover->image == NULL)+{+fetchcover_statusbar_update ("Failed to retrieve image.");+g_return_if_fail (displayed_cover->image);+} } GdkPixbuf *scaled = gdk_pixbuf_scale_simple(displayed_cover->image, IMGSCALE, IMGSCALE, GDK_INTERP_NEAREST);This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 1512 Author: jcsjcsDate: 2007-05-31 07:02:42 -0700 (Thu, 31 May 2007)Log Message:-----------* src/autodetection.c: fix non-responsive buttons introduced with automounting.Modified Paths:-------------- gtkpod/trunk/ChangeLog_detailed gtkpod/trunk/src/autodetection.cModified: gtkpod/trunk/ChangeLog_detailed===================================================================--- gtkpod/trunk/ChangeLog_detailed2007-05-30 18:18:27 UTC (rev 1511)+++ gtkpod/trunk/ChangeLog_detailed2007-05-31 14:02:42 UTC (rev 1512)@@ -1,16 +1,20 @@+2007-05-16 Jorg Schuler <jcsjcs at users.sourceforge.net>++* src/autodetection.c: fix non-responsive buttons introduced+ with automounting.+ 2007-05-30 P.G. Richardson <phantom_sf at users.sourceforge.net> - * display_coverart.c+* display_coverart.c - Changed the on_main_cover_image_clicked so that only the- tracks belonging to the album are displayed in the track- listing. The sorttabs are no longer updated. A lot- quicker and doesnt rely on the artist/album sorttabs- being visible.+ Changed the on_main_cover_image_clicked so that only the+ tracks belonging to the album are displayed in the track+ listing. The sorttabs are no longer updated. A lot quicker+ and doesnt rely on the artist/album sorttabs being visible. - * fetchcover.c+ * fetchcover.c - Status bar content changes in case album is not found.+ Status bar content changes in case album is not found. 2007-05-30 Todd Zullinger <tmzullinger at users.sourceforge.net> @@ -22,11 +26,11 @@ 2007-05-17 P.G. Richardson <phantom_sf at users.sourceforge.net> - * display_coverart.c+ * display_coverart.c - Completely forgot compile time errors for- g_hash_table_remove_all so removed glib_version call to ensure- back compilation compatibility.+ Completely forgot compile time errors for+ g_hash_table_remove_all so removed glib_version call to+ ensure back compilation compatibility. 2007-05-16 Todd Zullinger <tmzullinger at users.sourceforge.net> @@ -34,13 +38,12 @@ 2007-05-16 P.G. Richardson <phantom_sf at users.sourceforge.net> - * display_coverart.c+* display_coverart.c - Null checks placed in free_album.- g_hash_table_remove_all only used if running GLib version is- newer than 2.12.0.- Otherwise falls back on g_hash_table_foreach_remove.- Thanks to Mario Rossi for squashing these bugs.+ Null checks placed in free_album. g_hash_table_remove_all+ only used if running GLib version is newer than 2.12.0.+ Otherwise falls back on g_hash_table_foreach_remove. Thanks+ to Mario Rossi for squashing these bugs. 2007-05-16 Jorg Schuler <jcsjcs at users.sourceforge.net> Modified: gtkpod/trunk/src/autodetection.c===================================================================--- gtkpod/trunk/src/autodetection.c2007-05-30 18:18:27 UTC (rev 1511)+++ gtkpod/trunk/src/autodetection.c2007-05-31 14:02:42 UTC (rev 1512)@@ -350,8 +350,8 @@ if (!widgets_blocked) { gdk_threads_enter ();-block_widgets (); g_mutex_lock (ad->mutex);+ while (ad->new_ipod_uris) { iTunesDB *itdb, *loaded_itdb = NULL;@@ -375,6 +375,8 @@ itdbs = gp_get_itdbs_head (gtkpod_window); g_return_val_if_fail (itdbs, (gdk_threads_leave(), release_widgets(), TRUE)); + block_widgets ();+ if (itdb) { ExtraiTunesDBData *eitdb = itdb->userdata;@@ -422,12 +424,13 @@ debug ("...OK (new)\n"); } + release_widgets ();+ g_free (mountpoint); g_mutex_lock (ad->mutex); } g_mutex_unlock (ad->mutex);-release_widgets (); gdk_threads_leave(); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 1513 Author: jcsjcsDate: 2007-05-31 07:43:57 -0700 (Thu, 31 May 2007)Log Message:-----------* scripts/sync-tomboy.sh scripts/sync-notes.sh: fixes by Oliver Sherouse* scripts/sync-abook.sh scripts/sync-webcalendar.sh: set more reasonable default path.Modified Paths:-------------- gtkpod/trunk/ChangeLog_detailed gtkpod/trunk/scripts/sync-abook.sh gtkpod/trunk/scripts/sync-notes.sh gtkpod/trunk/scripts/sync-tomboy.sh gtkpod/trunk/scripts/sync-webcalendar.shModified: gtkpod/trunk/ChangeLog_detailed===================================================================--- gtkpod/trunk/ChangeLog_detailed2007-05-31 14:02:42 UTC (rev 1512)+++ gtkpod/trunk/ChangeLog_detailed2007-05-31 14:43:57 UTC (rev 1513)@@ -3,6 +3,13 @@ * src/autodetection.c: fix non-responsive buttons introduced with automounting. +* scripts/sync-tomboy.sh+ scripts/sync-notes.sh: fixes by Oliver Sherouse++* scripts/sync-abook.sh+ scripts/sync-webcalendar.sh:+ set more reasonable default path.+ 2007-05-30 P.G. Richardson <phantom_sf at users.sourceforge.net> * display_coverart.cModified: gtkpod/trunk/scripts/sync-abook.sh===================================================================--- gtkpod/trunk/scripts/sync-abook.sh2007-05-31 14:02:42 UTC (rev 1512)+++ gtkpod/trunk/scripts/sync-abook.sh2007-05-31 14:43:57 UTC (rev 1513)@@ -10,7 +10,7 @@ # with the following defaults: IPOD_MOUNT='/mnt/ipod'# mount point of ipod-DATAFILE='/home/daniel/.abook/addressbook'# the abook db+DATAFILE='~/.abook/addressbook' # the abook db ENCODING_FROM=UTF-8 # encoding used by abook ENCODING=ISO-8859-15 # encoding used by ipod @@ -38,6 +38,10 @@ # 2005/06/15 (Jorg Schuler <jcsjcs at users dot sourceforge dot net>): # Received original script from Daniel Kercher and added character # conversion and command line options.+#+# 2007/05/31 (Jorg Schuler <jcsjcs at users dot sourceforge dot net>):+# Set a more reasonable default datafile.+# # overwrite default settings with optional command line arguments while getopts i:d:e:f: option; doModified: gtkpod/trunk/scripts/sync-notes.sh===================================================================--- gtkpod/trunk/scripts/sync-notes.sh2007-05-31 14:02:42 UTC (rev 1512)+++ gtkpod/trunk/scripts/sync-notes.sh2007-05-31 14:43:57 UTC (rev 1513)@@ -4,16 +4,16 @@ # Usage: # -# sync-notes.sh [-i <ipod mountpoint>] [-p <path to folder containing notes (~/ipod_notes by default)>]+# sync-notes.sh [-i <ipod mountpoint>] [-d <path to folder containing notes (~/ipod_notes by default)>] # ... [-e <encoding>] # # with the following defaults: -IPOD_MOUNT=/media/PERLIPOD # mountpoint of ipod-NOTESPATH=~/Desktop/Notizen # path to folder containing notes-ENCODING=ISO-8859-15 # encoding used by ipod+IPOD_MOUNT=/media/ipod # mountpoint of ipod+NOTESPATH=~/Desktop/notes # path to folder containing notes+ENCODING=ISO-8859-15 # encoding used by ipod -# Unless called with "-e none" this script requires "iconv" available+# Unless called with "-e=none" this script requires "iconv" available # from http://www.gnu.org/software/libiconv/ # About the encoding used by the iPod (by Jorg Schuler):@@ -50,7 +50,7 @@ # Added Usage-line, added check for vcard file, rearranged source # # 2004/07/03 (Jorg Schuler <jcsjcs at users dot sourceforge dot net>):-# Made "iconv" optional (call with "-e none")+# Made "iconv" optional (call with "-e=none") # # Removed "dos2unix" as my iPod (firmware 1.3) happily accepted # DOS-type vcards as well. Instead changed the "grep" pattern to@@ -70,7 +70,13 @@ # 2005/06/12 (Jorg Schuler <jcsjcs at users dot sourceforge dot net>): # * added patch by Alexey Dokuchaev to replace recode by iconv # * changed check for recode to check of iconv+#+# 2007/05/31 (Jorg Schuler <jcsjcs at users dot sourceforge dot net>):+# Corrections By Oliver Sherouse <oliver.sherouse AT gmail DOT com>+# (replaced some arithmetic expressions), fixed "-e=none", correctly+# indicate "-d" in 'usage' instead of "-p") + # overwrite default settings with optional command line arguments while getopts i:d:e: option; do case $option in@@ -122,8 +128,8 @@ find -type f | ( read FILE- while [ "$?" == "0" ]; do-((++I))+ while [ "$?" = "0" ]; do+I=`expr $I + 1` mkdir -p "$IPOD_MOUNT/Notes/`dirname "$FILE"`/" cat "$FILE" | $RECODE > "$IPOD_MOUNT/Notes/$FILE" read FILEModified: gtkpod/trunk/scripts/sync-tomboy.sh===================================================================--- gtkpod/trunk/scripts/sync-tomboy.sh2007-05-31 14:02:42 UTC (rev 1512)+++ gtkpod/trunk/scripts/sync-tomboy.sh2007-05-31 14:43:57 UTC (rev 1513)@@ -6,16 +6,16 @@ # Usage: # -# sync-notes.sh [-i <ipod mountpoint>] [-p <path to folder containing notes (~/ipod_notes by default)>]+# sync-notes.sh [-i <ipod mountpoint>] [-d <path to folder containing notes (~/ipod_notes by default)>] # ... [-e <encoding>] # # with the following defaults: -IPOD_MOUNT=/media/disk-1 # mountpoint of ipod+IPOD_MOUNT=/media/ipod # mountpoint of ipod NOTESPATH=~/.tomboy # path to folder containing notes-ENCODING=ISO-8859-15 # encoding used by ipod+ENCODING=ISO-8859-15 # encoding used by ipod -# Unless called with "-e none" this script requires "iconv" available+# Unless called with "-e=none" this script requires "iconv" available # from http://www.gnu.org/software/libiconv/ # About the encoding used by the iPod (by Jorg Schuler):@@ -52,7 +52,7 @@ # Added Usage-line, added check for vcard file, rearranged source # # 2004/07/03 (Jorg Schuler <jcsjcs at users dot sourceforge dot net>):-# Made "iconv" optional (call with "-e none")+# Made "iconv" optional (call with -e="none") # # Removed "dos2unix" as my iPod (firmware 1.3) happily accepted # DOS-type vcards as well. Instead changed the "grep" pattern to@@ -72,6 +72,11 @@ # 2005/06/12 (Jorg Schuler <jcsjcs at users dot sourceforge dot net>): # * added patch by Alexey Dokuchaev to replace recode by iconv # * changed check for recode to check of iconv+#+# 2007/05/31 (Jorg Schuler <jcsjcs at users dot sourceforge dot net>):+# Corrections By Oliver Sherouse <oliver.sherouse AT gmail DOT com>+# (replaced some arithmetic expressions, improved conversion, correctly+# indicate "-d" in 'usage' instead of "-p") # overwrite default settings with optional command line arguments while getopts i:d:e: option; do@@ -124,8 +129,8 @@ ls *.note | ( read FILE- while [ "$?" == "0" ]; do-((++I))+ while [ "$?" = "0" ]; do+I=`expr $I + 1` # Get the starting and ending lines for the data LIMITS=`cat $FILE | grep -n note-content | cut -d ":" -f 1 | tr "\n" " "`@@ -138,10 +143,10 @@ # Get the Lines with the useful data DATA=`cat "$FILE" | cut -d "-" -f $((START+2))-$END`+" -f $(( $START + 2 ))-$END` # Strip the tomboy stuff :(-for i in "<\/note-content>" "<\/text>" "<link:broken>" "<\/link:broken>" "<link:internal>" "<\/link:internal>" "<link:external>" "<\/link:external>"; do+for i in "<\/note-content>" "<\/text>" "<link:broken>" "<\/link:broken>" "<link:internal>" "<\/link:internal>" "<link:external>" "<\/link:external>" "<\/list>" "<list>" "<\/list-item>" "<list-item dir=\"ltr\">"; do DATA=`printf "$DATA" | sed "s/$i//g"` done Modified: gtkpod/trunk/scripts/sync-webcalendar.sh===================================================================--- gtkpod/trunk/scripts/sync-webcalendar.sh2007-05-31 14:02:42 UTC (rev 1512)+++ gtkpod/trunk/scripts/sync-webcalendar.sh2007-05-31 14:43:57 UTC (rev 1513)@@ -10,8 +10,8 @@ # mount point of ipod IPOD_MOUNT='/mnt/ipod'-# uri for webcalendar-DATAFILE=' https://native.intern.net/projekte/webcalendar/publish.php/daniel.ics'+# uri for webcalendar (example)+DATAFILE='https://somewhere.local/calendar.ics' # calendar name CALENDAR='webcalendar' # special options for wget@@ -42,6 +42,9 @@ # Received original script from Daniel Kercher and added command line # options #+# 2007/05/31 (Jorg Schuler <jcsjcs at users dot sourceforge dot net>):+# Set a more reasonable default datafile.+# # FIXME: some way to convert the character set # overwrite default settings with optional command line argumentsThis was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 1516 Author: phantom_sfDate: 2007-06-01 13:18:55 -0700 (Fri, 01 Jun 2007)Log Message:-----------2007-06-01 P.G. Richardson <phantom_sf at users.sourceforge.net> * display_coverart.cAdded callback on display_coverart content panel for actingon scroll events with the mouse wheel. Result is that movingthe scroll wheel while the mouse is over the coverart displaywill scroll the covers in the respective direction.Avoided possible null pointer in track_changed function.Thanks to Daniele Forsi for raising it. May need further workif this does not solve it.Modified Paths:-------------- gtkpod/trunk/ChangeLog_detailed gtkpod/trunk/src/display_coverart.c gtkpod/trunk/src/display_playlists.cModified: gtkpod/trunk/ChangeLog_detailed===================================================================--- gtkpod/trunk/ChangeLog_detailed2007-06-01 14:19:21 UTC (rev 1515)+++ gtkpod/trunk/ChangeLog_detailed2007-06-01 20:18:55 UTC (rev 1516)@@ -1,5 +1,19 @@-2007-05-16 Jorg Schuler <jcsjcs at users.sourceforge.net>+2007-06-01 P.G. Richardson <phantom_sf at users.sourceforge.net> + * display_coverart.c++Added callback on display_coverart content panel for acting+on scroll events with the mouse wheel. Result is that moving+the scroll wheel while the mouse is over the coverart display+will scroll the covers in the respective direction.++Avoided possible null pointer in track_changed function.+Thanks to Daniele Forsi for raising it. May need further work+if this does not solve it.+++2007-05-31 Jorg Schuler <jcsjcs at users.sourceforge.net>+ * src/autodetection.c: fix non-responsive buttons introduced with automounting. Modified: gtkpod/trunk/src/display_coverart.c===================================================================--- gtkpod/trunk/src/display_coverart.c2007-06-01 14:19:21 UTC (rev 1515)+++ gtkpod/trunk/src/display_coverart.c2007-06-01 20:18:55 UTC (rev 1516)@@ -90,6 +90,7 @@ static gulong rbutton_signal_id; static gulong lbutton_signal_id; static gulong window_signal_id;+static gulong contentpanel_signal_id; #if 0 static void debug_albums ()@@ -948,6 +949,32 @@ return FALSE; } +static gboolean on_contentpanel_scroll_wheel_turned (GtkWidget *widget, GdkEventScroll *event, gpointer user_data)+{+gint displaytotal;++if (event->direction == GDK_SCROLL_DOWN)+cdwidget->first_imgindex++;+ else+ cdwidget->first_imgindex--;+ + displaytotal = g_list_length(album_key_list) - 8;+ + if (displaytotal <= 0)+ return TRUE;+ + /* Use the index value from the slider for the main image index */+ if (cdwidget->first_imgindex < 0)+ cdwidget->first_imgindex = 0;+ else if (cdwidget->first_imgindex > (displaytotal - 1))+ cdwidget->first_imgindex = displaytotal - 1;+ +/* Change the value of the slider to do the work of scrolling the covers */+gtk_range_set_value (GTK_RANGE (cdwidget->cdslider), cdwidget->first_imgindex);++return TRUE;+}+ /** * gtkpod_window_configure_callback: *@@ -1296,6 +1323,9 @@ gtk_box_pack_start_defaults (GTK_BOX(cdwidget->canvasbox), GTK_WIDGET(cdwidget->canvas)); +contentpanel_signal_id = g_signal_connect (G_OBJECT(cdwidget->contentpanel), "scroll-event",+G_CALLBACK(on_contentpanel_scroll_wheel_turned), NULL);+ lbutton_signal_id = g_signal_connect (G_OBJECT(cdwidget->leftbutton), "clicked", G_CALLBACK(on_cover_display_button_clicked), NULL); @@ -1569,6 +1599,8 @@ * album items track list. If it does then b) is true and nothing more is required. */ album = g_hash_table_lookup (album_hash, trk_key);+ g_return_if_fail (album);+ index = g_list_index (album->tracks, track); if (index != -1) {Modified: gtkpod/trunk/src/display_playlists.c===================================================================--- gtkpod/trunk/src/display_playlists.c2007-06-01 14:19:21 UTC (rev 1515)+++ gtkpod/trunk/src/display_playlists.c2007-06-01 20:18:55 UTC (rev 1516)@@ -1493,10 +1493,10 @@ for (gl_pl=itdb->playlists; gl_pl; gl_pl=gl_pl->next) {-Playlist *pl = gl_pl->data;-g_return_if_fail (pl);-if (itdb_playlist_is_mpl (pl)) pm_add_playlist (pl, pos);-else pm_add_playlist (pl, -1);+Playlist *pl = gl_pl->data;+g_return_if_fail (pl);+if (itdb_playlist_is_mpl (pl)) pm_add_playlist (pl, pos);+else pm_add_playlist (pl, -1); } } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 1519 Author: dforsiDate: 2007-06-02 08:08:17 -0700 (Sat, 02 Jun 2007)Log Message:-----------updated Italian translationModified Paths:-------------- gtkpod/trunk/ChangeLog gtkpod/trunk/ChangeLog_detailedModified: gtkpod/trunk/ChangeLog===================================================================--- gtkpod/trunk/ChangeLog2007-06-02 13:02:25 UTC (rev 1518)+++ gtkpod/trunk/ChangeLog2007-06-02 15:08:17 UTC (rev 1519)@@ -29,6 +29,8 @@ BUGFIX: dragging tracks between two iPods would sometimes not actually copy the file. + UPDATED: Italian translation (thanks to Daniele Forsi)+ gtkpod V0.99.8 NEW FEATURE: Support of several iPods (currently you need toModified: gtkpod/trunk/ChangeLog_detailed===================================================================--- gtkpod/trunk/ChangeLog_detailed2007-06-02 13:02:25 UTC (rev 1518)+++ gtkpod/trunk/ChangeLog_detailed2007-06-02 15:08:17 UTC (rev 1519)@@ -1,3 +1,7 @@+2007-06-02 Daniele Forsi <dforsi at users.sourceforge.net>++ * po/it.po: updated Italian translation+ 2007-06-01 P.G. Richardson <phantom_sf at users.sourceforge.net> * display_coverart.cThis was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 1523 Author: tmzullingerDate: 2007-06-03 10:40:48 -0700 (Sun, 03 Jun 2007)Log Message:-----------rename INSTALL_CVS to INSTALL_SVNAdded Paths:----------- gtkpod/trunk/INSTALL_SVNRemoved Paths:------------- gtkpod/trunk/INSTALL_CVSDeleted: gtkpod/trunk/INSTALL_CVS===================================================================--- gtkpod/trunk/INSTALL_CVS2007-06-03 17:38:23 UTC (rev 1522)+++ gtkpod/trunk/INSTALL_CVS2007-06-03 17:40:48 UTC (rev 1523)@@ -1,7 +0,0 @@-If you install from Subversion, call--./autogen.sh-make-make install--See the INSTALL and TROUBLESHOOTING file for more information.Copied: gtkpod/trunk/INSTALL_SVN (from rev 1522, gtkpod/trunk/INSTALL_CVS)===================================================================--- gtkpod/trunk/INSTALL_SVN (rev 0)+++ gtkpod/trunk/INSTALL_SVN2007-06-03 17:40:48 UTC (rev 1523)@@ -0,0 +1,7 @@+If you install from Subversion, call++./autogen.sh+make+make install++See the INSTALL and TROUBLESHOOTING file for more information.This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 1525 Author: phantom_sfDate: 2007-06-05 14:18:13 -0700 (Tue, 05 Jun 2007)Log Message:-----------2007-06-05 P.G. Richardson <phantom_sf at users.sourceforge.net> * display_coverart.c Fixed free_CDWidget() function which tried to free visible albums twice. Also click hide button on coverart display once again hides the slider and navigation buttons. Thanks to Todd for the spot.Modified Paths:-------------- gtkpod/trunk/ChangeLog_detailed gtkpod/trunk/src/display_coverart.cModified: gtkpod/trunk/ChangeLog_detailed===================================================================--- gtkpod/trunk/ChangeLog_detailed2007-06-03 17:41:07 UTC (rev 1524)+++ gtkpod/trunk/ChangeLog_detailed2007-06-05 21:18:13 UTC (rev 1525)@@ -1,3 +1,13 @@+2007-06-05 P.G. Richardson <phantom_sf at users.sourceforge.net>++ * display_coverart.c+ + Fixed free_CDWidget() function which tried to free visible+ albums twice. Also click hide button on coverart display once+ again hides the slider and navigation buttons. Thanks to Todd+ for the spot.+ + 2007-06-02 Daniele Forsi <dforsi at users.sourceforge.net> * po/it.po: updated Italian translationModified: gtkpod/trunk/src/display_coverart.c===================================================================--- gtkpod/trunk/src/display_coverart.c2007-06-03 17:41:07 UTC (rev 1524)+++ gtkpod/trunk/src/display_coverart.c2007-06-05 21:18:13 UTC (rev 1525)@@ -133,43 +133,50 @@ */ static void free_CDWidget() {- g_signal_handler_disconnect (cdwidget->leftbutton, lbutton_signal_id);- g_signal_handler_disconnect (cdwidget->rightbutton, rbutton_signal_id);- g_signal_handler_disconnect (gtkpod_window, window_signal_id);- - /* Components not freed as they are part of the glade xml file */- cdwidget->leftbutton = NULL;- cdwidget->rightbutton = NULL;- cdwidget->cdslider = NULL;- cdwidget->contentpanel = NULL;- cdwidget->canvasbox = NULL;-cdwidget->controlbox = NULL;+ gint i;+ g_signal_handler_disconnect (cdwidget->leftbutton, lbutton_signal_id);+ g_signal_handler_disconnect (cdwidget->rightbutton, rbutton_signal_id);+ g_signal_handler_disconnect (cdwidget->cdslider, slide_signal_id);+ g_signal_handler_disconnect (cdwidget->contentpanel, contentpanel_signal_id);+ g_signal_handler_disconnect (gtkpod_window, window_signal_id);++ /* Components not freed as they are part of the glade xml file */+ cdwidget->leftbutton = NULL;+ cdwidget->rightbutton = NULL;+ cdwidget->cdslider = NULL;+ cdwidget->contentpanel = NULL;+ cdwidget->canvasbox = NULL;+cdwidget->controlbox = NULL; -/* native variables rather than references so should be destroyed when freed */- cdwidget->first_imgindex = 0;- cdwidget->block_display_change = FALSE;+/* native variables rather than references so should be destroyed when freed */+ cdwidget->first_imgindex = 0;+ cdwidget->block_display_change = FALSE; -int i;-Cover_Item *cover;-for(i = 0; i < IMG_TOTAL; ++i)- {- cover = g_ptr_array_index(cdwidget->cdcovers, i);- free_album (cover->album);- }+Cover_Item *cover;+for(i = 0; i < IMG_TOTAL; ++i)+ {+ cover = g_ptr_array_index(cdwidget->cdcovers, i);+ /* Nullify pointer to album reference. Will be freed below */+ cover->album = NULL;+ } - g_ptr_array_free (cdwidget->cdcovers, TRUE);+ g_ptr_array_free (cdwidget->cdcovers, TRUE); - /* Destroying canvas should destroy the background and cvrtext */- cdwidget->bground = NULL;- cdwidget->cvrtext = NULL;- gtk_widget_destroy (GTK_WIDGET(cdwidget->canvas));+ /* Destroying canvas should destroy the background and cvrtext */+ cdwidget->bground = NULL;+ cdwidget->cvrtext = NULL;+ gtk_widget_destroy (GTK_WIDGET(cdwidget->canvas)); -g_hash_table_destroy (album_hash);-g_list_free (album_key_list);+/* Remove all null tracks before any sorting should take place */+ album_key_list = g_list_remove_all (album_key_list, NULL);+ + g_hash_table_foreach_remove(album_hash, (GHRFunc) gtk_true, NULL);+g_hash_table_destroy (album_hash);+g_list_free (album_key_list); -g_free (cdwidget);-cdwidget = NULL;- }+g_free (cdwidget);+cdwidget = NULL;+} /** * draw_blank_cdimage:@@ -869,6 +876,10 @@ coverart_set_images (TRUE); gtk_widget_show_all (cdwidget->contentpanel);+gtk_widget_show (GTK_WIDGET(cdwidget->cdslider));+gtk_widget_show (GTK_WIDGET(cdwidget->leftbutton));+gtk_widget_show (GTK_WIDGET(cdwidget->rightbutton));+ gtk_widget_hide (widget); GtkWidget *downbutton = gtkpod_xml_get_widget (main_window_xml, "cover_down_button");@@ -889,6 +900,9 @@ prefs_set_int (KEY_DISPLAY_COVERART, FALSE); gtk_widget_hide_all (cdwidget->contentpanel);+gtk_widget_hide (GTK_WIDGET(cdwidget->cdslider));+gtk_widget_hide (GTK_WIDGET(cdwidget->leftbutton));+gtk_widget_hide (GTK_WIDGET(cdwidget->rightbutton)); if (cdwidget != NULL) {@@ -1255,9 +1269,14 @@ { if (album != NULL) {-g_list_free (album->tracks);+if (album->tracks)+{+g_list_free (album->tracks);+}+ g_free (album->albumname); g_free (album->artist);+ if (album->albumart) gdk_pixbuf_unref (album->albumart); }@@ -1276,12 +1295,18 @@ */ GtkWidget *upbutton = gtkpod_xml_get_widget (main_window_xml, "cover_up_button"); GtkWidget *downbutton = gtkpod_xml_get_widget (main_window_xml, "cover_down_button");-+GtkWidget *lbutton = gtkpod_xml_get_widget (main_window_xml, "cover_display_leftbutton");+GtkWidget *rbutton = gtkpod_xml_get_widget (main_window_xml, "cover_display_rightbutton");+GtkWidget *slider = gtkpod_xml_get_widget (main_window_xml, "cover_display_scaler");+ /* show/hide coverart display -- default to show */ if (prefs_get_int (KEY_DISPLAY_COVERART)) { gtk_widget_hide (upbutton); gtk_widget_show (downbutton);+gtk_widget_show (lbutton);+gtk_widget_show (rbutton);+gtk_widget_show (slider); if (cdwidget != NULL) gtk_widget_show_all (cdwidget->contentpanel); }@@ -1289,6 +1314,9 @@ { gtk_widget_show (upbutton); gtk_widget_hide (downbutton);+gtk_widget_hide (lbutton);+gtk_widget_hide (rbutton);+gtk_widget_hide (slider); if (cdwidget != NULL) gtk_widget_hide_all (cdwidget->contentpanel); return;@@ -1775,7 +1803,7 @@ /* Insert the new Album Item into the hash */ g_hash_table_insert (album_hash, album_key, album); /* Add the key to the list for sorting and other functions */-album_key_list = g_list_append (album_key_list, album_key);+album_key_list = g_list_append (album_key_list, g_strdup(album_key)); } else {This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 1526 Author: phantom_sfDate: 2007-06-05 14:27:42 -0700 (Tue, 05 Jun 2007)Log Message:-----------2007-06-05 P.G. Richardson <phantom_sf at users.sourceforge.net> * fetchcover.* Add license headers to source files.Modified Paths:-------------- gtkpod/trunk/ChangeLog_detailed gtkpod/trunk/src/fetchcover.c gtkpod/trunk/src/fetchcover.hModified: gtkpod/trunk/ChangeLog_detailed===================================================================--- gtkpod/trunk/ChangeLog_detailed2007-06-05 21:18:13 UTC (rev 1525)+++ gtkpod/trunk/ChangeLog_detailed2007-06-05 21:27:42 UTC (rev 1526)@@ -1,5 +1,12 @@ 2007-06-05 P.G. Richardson <phantom_sf at users.sourceforge.net> + * fetchcover.*+ + Add license headers to source files.+ + +2007-06-05 P.G. Richardson <phantom_sf at users.sourceforge.net>+ * display_coverart.c Fixed free_CDWidget() function which tried to free visibleModified: gtkpod/trunk/src/fetchcover.c===================================================================--- gtkpod/trunk/src/fetchcover.c2007-06-05 21:18:13 UTC (rev 1525)+++ gtkpod/trunk/src/fetchcover.c2007-06-05 21:27:42 UTC (rev 1526)@@ -1,3 +1,30 @@+/*+| Copyright (C) 2002-2007 Jorg Schuler <jcsjcs at users sourceforge net>+| Part of the gtkpod project.+| +| URL: http://www.gtkpod.org/+| URL: http://gtkpod.sourceforge.net/+| +| This program 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.+| +| This program 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 this program; if not, write to the Free Software+| Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA+| +| iTunes and iPod are trademarks of Apple+| +| This product is not supported/written/published by Apple!+|+*/+ #ifdef HAVE_CONFIG_H # include <config.h> #endifModified: gtkpod/trunk/src/fetchcover.h===================================================================--- gtkpod/trunk/src/fetchcover.h2007-06-05 21:18:13 UTC (rev 1525)+++ gtkpod/trunk/src/fetchcover.h2007-06-05 21:27:42 UTC (rev 1526)@@ -1,3 +1,30 @@+/*+| Copyright (C) 2002-2007 Jorg Schuler <jcsjcs at users sourceforge net>+| Part of the gtkpod project.+| +| URL: http://www.gtkpod.org/+| URL: http://gtkpod.sourceforge.net/+| +| This program 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.+| +| This program 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 this program; if not, write to the Free Software+| Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA+| +| iTunes and iPod are trademarks of Apple+| +| This product is not supported/written/published by Apple!+|+*/+ #ifndef __FETCHCOVER_H__ #define __FETCHCOVER_H__ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 1530 Author: tmzullingerDate: 2007-06-08 15:38:34 -0700 (Fri, 08 Jun 2007)Log Message:-----------hide Last.FM tab (d?\195?\169j?\195?\160 vu)Modified Paths:-------------- gtkpod/trunk/ChangeLog_detailed gtkpod/trunk/gtkpod.glade gtkpod/trunk/src/prefs_window.cModified: gtkpod/trunk/ChangeLog_detailed===================================================================--- gtkpod/trunk/ChangeLog_detailed2007-06-07 15:25:25 UTC (rev 1529)+++ gtkpod/trunk/ChangeLog_detailed2007-06-08 22:38:34 UTC (rev 1530)@@ -1,3 +1,9 @@+2007-06-08 Todd Zullinger <tmzullinger at users.sourceforge.net>++* gtkpod.glade+ src/prefs_window.c:+ hide Last.FM tab (déjà vu)+ 2007-06-05 P.G. Richardson <phantom_sf at users.sourceforge.net> * src/fetchcover.cModified: gtkpod/trunk/gtkpod.glade===================================================================--- gtkpod/trunk/gtkpod.glade2007-06-07 15:25:25 UTC (rev 1529)+++ gtkpod/trunk/gtkpod.glade2007-06-08 22:38:34 UTC (rev 1530)@@ -14356,7 +14356,7 @@ </child> <child>- <widget class="GtkScrolledWindow" id="scrolledwindow32">+ <widget class="GtkScrolledWindow" id="scrolledwindowfm"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>Modified: gtkpod/trunk/src/prefs_window.c===================================================================--- gtkpod/trunk/src/prefs_window.c2007-06-07 15:25:25 UTC (rev 1529)+++ gtkpod/trunk/src/prefs_window.c2007-06-08 22:38:34 UTC (rev 1530)@@ -533,7 +533,7 @@ # else w = gtkpod_xml_get_widget (prefs_window_xml, "labelfm"); gtk_widget_hide(w);- w = gtkpod_xml_get_widget (prefs_window_xml, "vboxfm");+ w = gtkpod_xml_get_widget (prefs_window_xml, "scrolledwindowfm"); gtk_widget_hide(w); #endif This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 1531 Author: tmzullingerDate: 2007-06-08 17:52:54 -0700 (Fri, 08 Jun 2007)Log Message:-----------rename pixmaps to dataAdded Paths:----------- gtkpod/trunk/data/Removed Paths:------------- gtkpod/trunk/pixmaps/Copied: gtkpod/trunk/data (from rev 1530, gtkpod/trunk/pixmaps)This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 1532 Author: tmzullingerDate: 2007-06-08 17:53:11 -0700 (Fri, 08 Jun 2007)Log Message:-----------mv gtkpod.glade to data dirAdded Paths:----------- gtkpod/trunk/data/gtkpod.gladeRemoved Paths:------------- gtkpod/trunk/gtkpod.gladeCopied: gtkpod/trunk/data/gtkpod.glade (from rev 1531, gtkpod/trunk/gtkpod.glade)===================================================================--- gtkpod/trunk/data/gtkpod.glade (rev 0)+++ gtkpod/trunk/data/gtkpod.glade2007-06-09 00:53:11 UTC (rev 1532)@@ -0,0 +1,21227 @@+<?xml version="1.0" standalone="no"?> <!--*- mode: xml -*-->+<!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd">++<glade-interface>++<widget class="GtkWindow" id="gtkpod">+ <property name="title" translatable="yes">gtkpod</property>+ <property name="type">GTK_WINDOW_TOPLEVEL</property>+ <property name="window_position">GTK_WIN_POS_NONE</property>+ <property name="modal">False</property>+ <property name="default_width">600</property>+ <property name="default_height">500</property>+ <property name="resizable">True</property>+ <property name="destroy_with_parent">False</property>+ <property name="icon">gtkpod-icon-48.png</property>+ <property name="decorated">True</property>+ <property name="skip_taskbar_hint">False</property>+ <property name="skip_pager_hint">False</property>+ <property name="type_hint">GDK_WINDOW_TYPE_HINT_NORMAL</property>+ <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>+ <property name="focus_on_map">True</property>+ <property name="urgency_hint">False</property>+ <signal name="delete_event" handler="on_gtkpod_delete_event" last_modification_time="Sun, 24 Nov 2002 13:00:13 GMT"/>++ <child>+ <widget class="GtkVBox" id="vbox1">+ <property name="visible">True</property>+ <property name="hom*ogeneous">False</property>+ <property name="spacing">0</property>++ <child>+<widget class="GtkMenuBar" id="menubar">+ <property name="visible">True</property>+ <property name="pack_direction">GTK_PACK_DIRECTION_LTR</property>+ <property name="child_pack_direction">GTK_PACK_DIRECTION_LTR</property>++ <child>+ <widget class="GtkMenuItem" id="menuitem10">+ <property name="visible">True</property>+ <property name="label" translatable="yes">_File</property>+ <property name="use_underline">True</property>++ <child>+<widget class="GtkMenu" id="menuitem10_menu">++ <child>+ <widget class="GtkImageMenuItem" id="load_ipods_mi">+ <property name="visible">True</property>+ <property name="label" translatable="yes">_Load iPod(s)</property>+ <property name="use_underline">True</property>+ <signal name="activate" handler="on_load_ipods_mi" last_modification_time="Sat, 20 May 2006 14:21:46 GMT"/>++ <child internal-child="image">+<widget class="GtkImage" id="image3926">+ <property name="visible">True</property>+ <property name="pixbuf">gtkpod-read.png</property>+ <property name="xalign">0.5</property>+ <property name="yalign">0.5</property>+ <property name="xpad">0</property>+ <property name="ypad">0</property>+</widget>+ </child>+ </widget>+ </child>++ <child>+ <widget class="GtkImageMenuItem" id="save_changes_mi">+ <property name="visible">True</property>+ <property name="label" translatable="yes">_Save Changes</property>+ <property name="use_underline">True</property>+ <signal name="activate" handler="on_save_changes_mi" last_modification_time="Sat, 20 May 2006 14:22:12 GMT"/>++ <child internal-child="image">+<widget class="GtkImage" id="image3927">+ <property name="visible">True</property>+ <property name="stock">gtk-save</property>+ <property name="icon_size">1</property>+ <property name="xalign">0.5</property>+ <property name="yalign">0.5</property>+ <property name="xpad">0</property>+ <property name="ypad">0</property>+</widget>+ </child>+ </widget>+ </child>++ <child>+ <widget class="GtkImageMenuItem" id="add_files1">+ <property name="visible">True</property>+ <property name="label" translatable="yes">Add _Files</property>+ <property name="use_underline">True</property>+ <signal name="activate" handler="create_add_files_dialog" last_modification_time="Sun, 05 Jun 2005 13:03:47 GMT"/>++ <child internal-child="image">+<widget class="GtkImage" id="image3928">+ <property name="visible">True</property>+ <property name="stock">gtk-add</property>+ <property name="icon_size">1</property>+ <property name="xalign">0.5</property>+ <property name="yalign">0.5</property>+ <property name="xpad">0</property>+ <property name="ypad">0</property>+</widget>+ </child>+ </widget>+ </child>++ <child>+ <widget class="GtkImageMenuItem" id="add_directory1">+ <property name="visible">True</property>+ <property name="label" translatable="yes">Add _Directory</property>+ <property name="use_underline">True</property>+ <signal name="activate" handler="dirbrowser_create" last_modification_time="Sun, 05 Jun 2005 13:09:31 GMT"/>++ <child internal-child="image">+<widget class="GtkImage" id="image3929">+ <property name="visible">True</property>+ <property name="stock">gtk-add</property>+ <property name="icon_size">1</property>+ <property name="xalign">0.5</property>+ <property name="yalign">0.5</property>+ <property name="xpad">0</property>+ <property name="ypad">0</property>+</widget>+ </child>+ </widget>+ </child>++ <child>+ <widget class="GtkImageMenuItem" id="add_playlist1">+ <property name="visible">True</property>+ <property name="label" translatable="yes">Add _Playlist</property>+ <property name="use_underline">True</property>+ <signal name="activate" handler="create_add_playlists_dialog" last_modification_time="Sun, 05 Jun 2005 13:14:57 GMT"/>++ <child internal-child="image">+<widget class="GtkImage" id="image3930">+ <property name="visible">True</property>+ <property name="stock">gtk-add</property>+ <property name="icon_size">1</property>+ <property name="xalign">0.5</property>+ <property name="yalign">0.5</property>+ <property name="xpad">0</property>+ <property name="ypad">0</property>+</widget>+ </child>+ </widget>+ </child>++ <child>+ <widget class="GtkSeparatorMenuItem" id="separator3">+ <property name="visible">True</property>+ </widget>+ </child>++ <child>+ <widget class="GtkImageMenuItem" id="update_menu">+ <property name="visible">True</property>+ <property name="label" translatable="yes">_Update Tracks from File</property>+ <property name="use_underline">True</property>++ <child internal-child="image">+<widget class="GtkImage" id="image3931">+ <property name="visible">True</property>+ <property name="stock">gtk-refresh</property>+ <property name="icon_size">1</property>+ <property name="xalign">0.5</property>+ <property name="yalign">0.5</property>+ <property name="xpad">0</property>+ <property name="ypad">0</property>+</widget>+ </child>++ <child>+<widget class="GtkMenu" id="update_menu_menu">++ <child>+ <widget class="GtkMenuItem" id="update_playlist_menu">+ <property name="visible">True</property>+ <property name="label" translatable="yes">Selected _Playlist</property>+ <property name="use_underline">True</property>+ <signal name="activate" handler="on_update_playlist_activate" last_modification_time="Sun, 23 Mar 2003 09:00:04 GMT"/>+ </widget>+ </child>++ <child>+ <widget class="GtkMenuItem" id="update_tab_entry_menu">+ <property name="visible">True</property>+ <property name="label" translatable="yes">Selected Tab _Entry</property>+ <property name="use_underline">True</property>+ <signal name="activate" handler="on_update_tab_entry_activate" last_modification_time="Sat, 15 Mar 2003 03:49:29 GMT"/>+ </widget>+ </child>++ <child>+ <widget class="GtkMenuItem" id="update_tracks_menu">+ <property name="visible">True</property>+ <property name="label" translatable="yes">Selected _Tracks</property>+ <property name="use_underline">True</property>+ <signal name="activate" handler="on_update_tracks_activate" last_modification_time="Sun, 23 Mar 2003 09:00:04 GMT"/>+ </widget>+ </child>+</widget>+ </child>+ </widget>+ </child>++ <child>+ <widget class="GtkImageMenuItem" id="mserv_from_file_menu">+ <property name="visible">True</property>+ <property name="label" translatable="yes">Update _mserv Data from File</property>+ <property name="use_underline">True</property>++ <child internal-child="image">+<widget class="GtkImage" id="image3932">+ <property name="visible">True</property>+ <property name="stock">gtk-refresh</property>+ <property name="icon_size">1</property>+ <property name="xalign">0.5</property>+ <property name="yalign">0.5</property>+ <property name="xpad">0</property>+ <property name="ypad">0</property>+</widget>+ </child>++ <child>+<widget class="GtkMenu" id="mserv_from_file_menu_menu">++ <child>+ <widget class="GtkMenuItem" id="mserv_from_file_playlist_menu">+ <property name="visible">True</property>+ <property name="label" translatable="yes">Selected _Playlist</property>+ <property name="use_underline">True</property>+ <signal name="activate" handler="on_mserv_from_file_playlist_menu_activate" last_modification_time="Sat, 02 Oct 2004 05:09:52 GMT"/>+ </widget>+ </child>++ <child>+ <widget class="GtkMenuItem" id="mserv_from_file_entry_menu">+ <property name="visible">True</property>+ <property name="label" translatable="yes">Selected Tab _Entry</property>+ <property name="use_underline">True</property>+ <signal name="activate" handler="on_mserv_from_file_entry_menu_activate" last_modification_time="Sat, 02 Oct 2004 05:09:52 GMT"/>+ </widget>+ </child>++ <child>+ <widget class="GtkMenuItem" id="mserv_from_file_tracks_menu">+ <property name="visible">True</property>+ <property name="label" translatable="yes">Selected _Tracks</property>+ <property name="use_underline">True</property>+ <signal name="activate" handler="on_mserv_from_file_tracks_menu_activate" last_modification_time="Sat, 02 Oct 2004 05:09:52 GMT"/>+ </widget>+ </child>+</widget>+ </child>+ </widget>+ </child>++ <child>+ <widget class="GtkImageMenuItem" id="sync_menu">+ <property name="visible">True</property>+ <property name="label" translatable="yes">_Synchronize Playlist with Dir(s)</property>+ <property name="use_underline">True</property>+ <signal name="activate" handler="on_sync_playlist_activate" last_modification_time="Mon, 15 May 2006 15:39:05 GMT"/>++ <child internal-child="image">+<widget class="GtkImage" id="image3933">+ <property name="visible">True</property>+ <property name="stock">gtk-refresh</property>+ <property name="icon_size">1</property>+ <property name="xalign">0.5</property>+ <property name="yalign">0.5</property>+ <property name="xpad">0</property>+ <property name="ypad">0</property>+</widget>+ </child>+ </widget>+ </child>++ <child>+ <widget class="GtkSeparatorMenuItem" id="separator6">+ <property name="visible">True</property>+ </widget>+ </child>++ <child>+ <widget class="GtkImageMenuItem" id="export_menu">+ <property name="visible">True</property>+ <property name="label" translatable="yes">_Export Tracks from Database</property>+ <property name="use_underline">True</property>++ <child internal-child="image">+<widget class="GtkImage" id="image3934">+ <property name="visible">True</property>+ <property name="stock">gtk-save-as</property>+ <property name="icon_size">1</property>+ <property name="xalign">0.5</property>+ <property name="yalign">0.5</property>+ <property name="xpad">0</property>+ <property name="ypad">0</property>+</widget>+ </child>++ <child>+<widget class="GtkMenu" id="export_menu_menu">++ <child>+ <widget class="GtkMenuItem" id="export_playlist">+ <property name="visible">True</property>+ <property name="label" translatable="yes">Selected _Playlist</property>+ <property name="use_underline">True</property>+ <signal name="activate" handler="on_export_playlist_activate" last_modification_time="Sun, 23 Mar 2003 09:00:04 GMT"/>+ </widget>+ </child>++ <child>+ <widget class="GtkMenuItem" id="export_tab_entry_menu">+ <property name="visible">True</property>+ <property name="label" translatable="yes">Selected Tab _Entry</property>+ <property name="use_underline">True</property>+ <signal name="activate" handler="on_export_tab_entry_activate" last_modification_time="Sun, 23 Mar 2003 09:00:04 GMT"/>+ </widget>+ </child>++ <child>+ <widget class="GtkMenuItem" id="export_tracks">+ <property name="visible">True</property>+ <property name="label" translatable="yes">Selected _Tracks</property>+ <property name="use_underline">True</property>+ <signal name="activate" handler="on_export_tracks_activate" last_modification_time="Sun, 23 Mar 2003 09:00:04 GMT"/>+ </widget>+ </child>+</widget>+ </child>+ </widget>+ </child>++ <child>+ <widget class="GtkImageMenuItem" id="create_playlist_file_menu">+ <property name="visible">True</property>+ <property name="label" translatable="yes">Create _Playlist File</property>+ <property name="use_underline">True</property>++ <child internal-child="image">+<widget class="GtkImage" id="image3935">+ <property name="visible">True</property>+ <property name="stock">gtk-save-as</property>+ <property name="icon_size">1</property>+ <property name="xalign">0.5</property>+ <property name="yalign">0.5</property>+ <property name="xpad">0</property>+ <property name="ypad">0</property>+</widget>+ </child>++ <child>+<widget class="GtkMenu" id="create_playlist_file_menu_menu">++ <child>+ <widget class="GtkMenuItem" id="playlist_file_playlist">+ <property name="visible">True</property>+ <property name="label" translatable="yes">Selected _Playlist</property>+ <property name="use_underline">True</property>+ <signal name="activate" handler="on_playlist_file_playlist_activate" last_modification_time="Sat, 21 Aug 2004 08:43:11 GMT"/>+ </widget>+ </child>++ <child>+ <widget class="GtkMenuItem" id="playlist_file_tab_entry">+ <property name="visible">True</property>+ <property name="label" translatable="yes">Selected Tab _Entry</property>+ <property name="use_underline">True</property>+ <signal name="activate" handler="on_playlist_file_tab_entry_activate" last_modification_time="Sat, 21 Aug 2004 08:43:11 GMT"/>+ </widget>+ </child>++ <child>+ <widget class="GtkMenuItem" id="playlist_file_tracks">+ <property name="visible">True</property>+ <property name="label" translatable="yes">Selected _Tracks</property>+ <property name="use_underline">True</property>+ <signal name="activate" handler="on_playlist_file_tracks_activate" last_modification_time="Sat, 21 Aug 2004 08:43:11 GMT"/>+ </widget>+ </child>+</widget>+ </child>+ </widget>+ </child>++ <child>+ <widget class="GtkSeparatorMenuItem" id="trennlinie6">+ <property name="visible">True</property>+ </widget>+ </child>++ <child>+ <widget class="GtkImageMenuItem" id="ipod_directories">+ <property name="visible">True</property>+ <property name="label" translatable="yes">_Create iPod's Directories</property>+ <property name="use_underline">True</property>+ <signal name="activate" handler="on_ipod_directories_menu" last_modification_time="Sat, 18 Jan 2003 02:10:39 GMT"/>++ <child internal-child="image">+<widget class="GtkImage" id="image3936">+ <property name="visible">True</property>+ <property name="stock">gtk-execute</property>+ <property name="icon_size">1</property>+ <property name="xalign">0.5</property>+ <property name="yalign">0.5</property>+ <property name="xpad">0</property>+ <property name="ypad">0</property>+</widget>+ </child>+ </widget>+ </child>++ <child>+ <widget class="GtkMenuItem" id="check_ipod_files_mi">+ <property name="visible">True</property>+ <property name="tooltip" translatable="yes">Find orphan files (files with no track info in DB) and dangling tracks (tracks with no corresponding files on iPod)</property>+ <property name="label" translatable="yes">_Check iPod's Files</property>+ <property name="use_underline">True</property>+ <signal name="activate" handler="on_check_ipod_files_activate" last_modification_time="Sat, 24 Jan 2004 09:02:49 GMT"/>+ </widget>+ </child>++ <child>+ <widget class="GtkSeparatorMenuItem" id="trennlinie3">+ <property name="visible">True</property>+ </widget>+ </child>++ <child>+ <widget class="GtkImageMenuItem" id="quit1">+ <property name="visible">True</property>+ <property name="label">gtk-quit</property>+ <property name="use_stock">True</property>+ <signal name="activate" handler="on_quit1_activate" last_modification_time="Sat, 23 Nov 2002 03:06:04 GMT"/>+ </widget>+ </child>+</widget>+ </child>+ </widget>+ </child>++ <child>+ <widget class="GtkMenuItem" id="edit_menu">+ <property name="visible">True</property>+ <property name="label" translatable="yes">_Edit</property>+ <property name="use_underline">True</property>++ <child>+<widget class="GtkMenu" id="edit_menu_menu">++ <child>+ <widget class="GtkImageMenuItem" id="edit_details_menu">+ <property name="visible">True</property>+ <property name="label" translatable="yes">Edit Track Details</property>+ <property name="use_underline">True</property>++ <child internal-child="image">+<widget class="GtkImage" id="image3937">+ <property name="visible">True</property>+ <property name="stock">gtk-edit</property>+ <property name="icon_size">1</property>+ <property name="xalign">0.5</property>+ <property name="yalign">0.5</property>+ <property name="xpad">0</property>+ <property name="ypad">0</property>+</widget>+ </child>++ <child>+<widget class="GtkMenu" id="edit_details_menu_menu">++ <child>+ <widget class="GtkMenuItem" id="edit_details_selected_playlist">+ <property name="visible">True</property>+ <property name="label" translatable="yes">Tracks in Selected _Playlist</property>+ <property name="use_underline">True</property>+ <signal name="activate" handler="on_edit_details_selected_playlist" last_modification_time="Fri, 09 Dec 2005 15:42:30 GMT"/>+ </widget>+ </child>++ <child>+ <widget class="GtkMenuItem" id="edit_details_selected_tab_entry">+ <property name="visible">True</property>+ <property name="label" translatable="yes">Tracks in Selected Tab _Entry</property>+ <property name="use_underline">True</property>+ <signal name="activate" handler="on_edit_details_selected_tab_entry" last_modification_time="Fri, 09 Dec 2005 15:42:30 GMT"/>+ </widget>+ </child>++ <child>+ <widget class="GtkMenuItem" id="edit_details_selected_tracks">+ <property name="visible">True</property>+ <property name="label" translatable="yes">Selected _Tracks</property>+ <property name="use_underline">True</property>+ <signal name="activate" handler="on_edit_details_selected_tracks" last_modification_time="Fri, 09 Dec 2005 15:42:30 GMT"/>+ </widget>+ </child>+</widget>+ </child>+ </widget>+ </child>++ <child>+ <widget class="GtkMenuItem" id="edit_smart_playlist">+ <property name="visible">True</property>+ <property name="label" translatable="yes">Edit Smart Playlist</property>+ <property name="use_underline">True</property>+ <signal name="activate" handler="on_edit_smart_playlist" last_modification_time="Sat, 10 Dec 2005 07:48:01 GMT"/>+ </widget>+ </child>++ <child>+ <widget class="GtkImageMenuItem" id="delete_menu">+ <property name="visible">True</property>+ <property name="label" translatable="yes">_Delete</property>+ <property name="use_underline">True</property>++ <child internal-child="image">+<widget class="GtkImage" id="image3938">+ <property name="visible">True</property>+ <property name="stock">gtk-delete</property>+ <property name="icon_size">1</property>+ <property name="xalign">0.5</property>+ <property name="yalign">0.5</property>+ <property name="xpad">0</property>+ <property name="ypad">0</property>+</widget>+ </child>++ <child>+<widget class="GtkMenu" id="delete_menu_menu">++ <child>+ <widget class="GtkMenuItem" id="delete_selected_playlist">+ <property name="visible">True</property>+ <property name="label" translatable="yes">Selected playlist</property>+ <property name="use_underline">True</property>+ <signal name="activate" handler="on_delete_selected_playlist" last_modification_time="Sat, 10 Dec 2005 07:34:07 GMT"/>+ </widget>+ </child>++ <child>+ <widget class="GtkMenuItem" id="delete_selected_playlist_including_tracks_from_ipod">+ <property name="visible">True</property>+ <property name="label" translatable="yes">Selected playlist including tracks from iPod</property>+ <property name="use_underline">True</property>+ <signal name="activate" handler="on_delete_selected_playlist_including_tracks_from_ipod" last_modification_time="Sat, 10 Dec 2005 07:34:07 GMT"/>+ </widget>+ </child>++ <child>+ <widget class="GtkMenuItem" id="delete_selected_playlist_including_tracks_from_database">+ <property name="visible">True</property>+ <property name="label" translatable="yes">Selected playlist including tracks from database</property>+ <property name="use_underline">True</property>+ <signal name="activate" handler="on_delete_selected_playlist_including_tracks_from_database" last_modification_time="Sat, 10 Dec 2005 07:34:07 GMT"/>+ </widget>+ </child>++ <child>+ <widget class="GtkMenuItem" id="delete_selected_playlist_including_tracks_from_harddisk">+ <property name="visible">True</property>+ <property name="label" translatable="yes">Selected playlist including tracks from harddisk</property>+ <property name="use_underline">True</property>+ <signal name="activate" handler="on_delete_selected_playlist_including_tracks_from_harddisk" last_modification_time="Sat, 10 Dec 2005 07:34:07 GMT"/>+ </widget>+ </child>++ <child>+ <widget class="GtkSeparatorMenuItem" id="delete_separator1">+ <property name="visible">True</property>+ </widget>+ </child>++ <child>+ <widget class="GtkMenuItem" id="delete_selected_entry_from_playlist">+ <property name="visible">True</property>+ <property name="label" translatable="yes">Selected filter tab entry from playlist</property>+ <property name="use_underline">True</property>+ <signal name="activate" handler="on_delete_selected_entry_from_playlist" last_modification_time="Sat, 10 Dec 2005 07:34:07 GMT"/>+ </widget>+ </child>++ <child>+ <widget class="GtkMenuItem" id="delete_selected_entry_from_ipod">+ <property name="visible">True</property>+ <property name="label" translatable="yes">Selected filter tab entry from iPod</property>+ <property name="use_underline">True</property>+ <signal name="activate" handler="on_delete_selected_entry_from_ipod" last_modification_time="Sat, 10 Dec 2005 07:34:07 GMT"/>+ </widget>+ </child>++ <child>+ <widget class="GtkMenuItem" id="delete_selected_entry_from_database">+ <property name="visible">True</property>+ <property name="label" translatable="yes">Selected filter tab entry from database</property>+ <property name="use_underline">True</property>+ <signal name="activate" handler="on_delete_selected_entry_from_database" last_modification_time="Sat, 10 Dec 2005 07:34:07 GMT"/>+ </widget>+ </child>++ <child>+ <widget class="GtkMenuItem" id="delete_selected_entry_from_harddisk">+ <property name="visible">True</property>+ <property name="label" translatable="yes">Selected filter tab entry from harddisk</property>+ <property name="use_underline">True</property>+ <signal name="activate" handler="on_delete_selected_entry_from_harddisk" last_modification_time="Sat, 10 Dec 2005 07:34:07 GMT"/>+ </widget>+ </child>++ <child>+ <widget class="GtkSeparatorMenuItem" id="delete_separator2">+ <property name="visible">True</property>+ </widget>+ </child>++ <child>+ <widget class="GtkMenuItem" id="delete_selected_tracks_from_playlist">+ <property name="visible">True</property>+ <property name="label" translatable="yes">Selected tracks from playlist</property>+ <property name="use_underline">True</property>+ <signal name="activate" handler="on_delete_selected_tracks_from_playlist" last_modification_time="Sat, 10 Dec 2005 07:34:07 GMT"/>+ </widget>+ </child>++ <child>+ <widget class="GtkMenuItem" id="delete_selected_tracks_from_ipod">+ <property name="visible">True</property>+ <property name="label" translatable="yes">Selected tracks from iPod</property>+ <property name="use_underline">True</property>+ <signal name="activate" handler="on_delete_selected_tracks_from_ipod" last_modification_time="Sat, 10 Dec 2005 07:34:07 GMT"/>+ </widget>+ </child>++ <child>+ <widget class="GtkMenuItem" id="delete_selected_tracks_from_database">+ <property name="visible">True</property>+ <property name="label" translatable="yes">Selected tracks from database</property>+ <property name="use_underline">True</property>+ <signal name="activate" handler="on_delete_selected_tracks_from_database" last_modification_time="Sat, 10 Dec 2005 07:34:07 GMT"/>+ </widget>+ </child>++ <child>+ <widget class="GtkMenuItem" id="delete_selected_tracks_from_harddisk">+ <property name="visible">True</property>+ <property name="label" translatable="yes">Selected tracks from harddisk</property>+ <property name="use_underline">True</property>+ <signal name="activate" handler="on_delete_selected_tracks_from_harddisk" last_modification_time="Sat, 10 Dec 2005 07:34:07 GMT"/>+ </widget>+ </child>+</widget>+ </child>+ </widget>+ </child>++ <child>+ <widget class="GtkSeparatorMenuItem" id="separator7">+ <property name="visible">True</property>+ </widget>+ </child>++ <child>+ <widget class="GtkImageMenuItem" id="create_playlists_menu">+ <property name="visible">True</property>+ <property name="label" translatable="yes">_Create Playlists</property>+ <property name="use_underline">True</property>++ <child internal-child="image">+<widget class="GtkImage" id="image3939">+ <property name="visible">True</property>+ <property name="stock">gtk-copy</property>+ <property name="icon_size">1</property>+ <property name="xalign">0.5</property>+ <property name="yalign">0.5</property>+ <property name="xpad">0</property>+ <property name="ypad">0</property>+</widget>+ </child>++ <child>+<widget class="GtkMenu" id="create_playlists_menu_menu">++ <child>+ <widget class="GtkMenuItem" id="new_playlist1">+ <property name="visible">True</property>+ <property name="label" translatable="yes">Empty Playlist</property>+ <property name="use_underline">True</property>+ <signal name="activate" handler="on_new_playlist1_activate" last_modification_time="Sun, 03 Aug 2003 03:58:25 GMT"/>+ </widget>+ </child>++ <child>+ <widget class="GtkMenuItem" id="smart_playlist">+ <property name="visible">True</property>+ <property name="label" translatable="yes">Smart Playlist</property>+ <property name="use_underline">True</property>+ <signal name="activate" handler="on_smart_playlist_activate" last_modification_time="Mon, 06 Dec 2004 14:36:42 GMT"/>+ </widget>+ </child>++ <child>+ <widget class="GtkSeparatorMenuItem" id="separator8">+ <property name="visible">True</property>+ </widget>+ </child>++ <child>+ <widget class="GtkMenuItem" id="random_playlist">+ <property name="visible">True</property>+ <property name="label" translatable="yes">Random Playlist from Displayed Tracks</property>+ <property name="use_underline">True</property>+ <signal name="activate" handler="on_random_playlist_activate" last_modification_time="Fri, 19 Mar 2004 17:27:51 GMT"/>+ </widget>+ </child>++ <child>+ <widget class="GtkMenuItem" id="pl_containing_displayed_tracks">+ <property name="visible">True</property>+ <property name="label" translatable="yes">Containing Displayed Tracks</property>+ <property name="use_underline">True</property>+ <signal name="activate" handler="on_pl_containing_displayed_tracks_activate" last_modification_time="Sun, 03 Aug 2003 04:03:36 GMT"/>+ </widget>+ </child>++ <child>+ <widget class="GtkMenuItem" id="pl_containing_selected_tracks">+ <property name="visible">True</property>+ <property name="label" translatable="yes">Containing Selected Tracks</property>+ <property name="use_underline">True</property>+ <signal name="activate" handler="on_pl_containing_selected_tracks_activate" last_modification_time="Sun, 03 Aug 2003 04:03:36 GMT"/>+ </widget>+ </child>++ <child>+ <widget class="GtkMenuItem" id="pl_for_each_artist">+ <property name="visible">True</property>+ <property name="label" translatable="yes">One for each Artist</property>+ <property name="use_underline">True</property>+ <signal name="activate" handler="on_pl_for_each_artist_activate" last_modification_time="Sun, 03 Aug 2003 03:48:28 GMT"/>+ </widget>+ </child>++ <child>+ <widget class="GtkMenuItem" id="pl_for_each_album">+ <property name="visible">True</property>+ <property name="label" translatable="yes">One for each Album</property>+ <property name="use_underline">True</property>+ <signal name="activate" handler="on_pl_for_each_album_activate" last_modification_time="Sun, 03 Aug 2003 03:48:28 GMT"/>+ </widget>+ </child>++ <child>+ <widget class="GtkMenuItem" id="pl_for_each_genre">+ <property name="visible">True</property>+ <property name="label" translatable="yes">One for each Genre</property>+ <property name="use_underline">True</property>+ <signal name="activate" handler="on_pl_for_each_genre_activate" last_modification_time="Sun, 03 Aug 2003 03:48:28 GMT"/>+ </widget>+ </child>++ <child>+ <widget class="GtkMenuItem" id="pl_for_each_composer">+ <property name="visible">True</property>+ <property name="label" translatable="yes">One for each Composer</property>+ <property name="use_underline">True</property>+ <signal name="activate" handler="on_pl_for_each_composer_activate" last_modification_time="Sun, 03 Aug 2003 03:48:28 GMT"/>+ </widget>+ </child>++ <child>+ <widget class="GtkMenuItem" id="pl_for_each_year">+ <property name="visible">True</property>+ <property name="label" translatable="yes">One for each Year</property>+ <property name="use_underline">True</property>+ <signal name="activate" handler="on_pl_for_each_year_activate" last_modification_time="Thu, 11 Mar 2004 14:10:34 GMT"/>+ </widget>+ </child>++ <child>+ <widget class="GtkMenuItem" id="pl_for_each_rating">+ <property name="visible">True</property>+ <property name="label" translatable="yes">One for each Rating</property>+ <property name="use_underline">True</property>+ <signal name="activate" handler="on_pl_for_each_rating_activate" last_modification_time="Sun, 05 Dec 2004 12:52:43 GMT"/>+ </widget>+ </child>++ <child>+ <widget class="GtkMenuItem" id="most_rated_tracks">+ <property name="visible">True</property>+ <property name="label" translatable="yes">Best Rated Tracks</property>+ <property name="use_underline">True</property>+ <signal name="activate" handler="on_most_rated_tracks_playlist_s1_activate" last_modification_time="Sun, 10 Aug 2003 14:21:51 GMT"/>+ </widget>+ </child>++ <child>+ <widget class="GtkMenuItem" id="most_listened_tracks">+ <property name="visible">True</property>+ <property name="label" translatable="yes">Tracks Most Often Listened To</property>+ <property name="use_underline">True</property>+ <signal name="activate" handler="on_most_listened_tracks1_activate" last_modification_time="Sun, 10 Aug 2003 14:24:20 GMT"/>+ </widget>+ </child>++ <child>+ <widget class="GtkMenuItem" id="most_recent_played_tracks">+ <property name="visible">True</property>+ <property name="label" translatable="yes">Most Recently Played Tracks</property>+ <property name="use_underline">True</property>+ <signal name="activate" handler="on_most_recent_played_tracks_activate" last_modification_time="Sun, 10 Aug 2003 14:24:57 GMT"/>+ </widget>+ </child>++ <child>+ <widget class="GtkMenuItem" id="played_since_last_time1">+ <property name="visible">True</property>+ <property name="label" translatable="yes">All Tracks Played Since Last Time</property>+ <property name="use_underline">True</property>+ <signal name="activate" handler="on_played_since_last_time1_activate" last_modification_time="Fri, 22 Aug 2003 12:24:50 GMT"/>+ </widget>+ </child>++ <child>+ <widget class="GtkMenuItem" id="all_tracks_never_listened_to1">+ <property name="visible">True</property>+ <property name="label" translatable="yes">All Tracks Never Listened To</property>+ <property name="use_underline">True</property>+ <signal name="activate" handler="on_all_tracks_never_listened_to1_activate" last_modification_time="Fri, 07 Nov 2003 15:51:06 GMT"/>+ </widget>+ </child>++ <child>+ <widget class="GtkMenuItem" id="all_tracks_not_listed_in_any_playlist1">+ <property name="visible">True</property>+ <property name="label" translatable="yes">All Tracks not Listed in any Playlist</property>+ <property name="use_underline">True</property>+ <signal name="activate" handler="on_all_tracks_not_listed_in_any_playlist1_activate" last_modification_time="Thu, 11 Mar 2004 14:09:28 GMT"/>+ </widget>+ </child>+</widget>+ </child>+ </widget>+ </child>++ <child>+ <widget class="GtkSeparatorMenuItem" id="separator1">+ <property name="visible">True</property>+ </widget>+ </child>++ <child>+ <widget class="GtkImageMenuItem" id="sorting1">+ <property name="visible">True</property>+ <property name="label" translatable="yes">_Sorting</property>+ <property name="use_underline">True</property>+ <signal name="activate" handler="on_sorting_activate" last_modification_time="Mon, 22 Sep 2003 08:00:42 GMT"/>+ <accelerator key="s" modifiers="GDK_CONTROL_MASK" signal="activate"/>++ <child internal-child="image">+<widget class="GtkImage" id="image3940">+ <property name="visible">True</property>+ <property name="stock">gtk-sort-ascending</property>+ <property name="icon_size">1</property>+ <property name="xalign">0.5</property>+ <property name="yalign">0.5</property>+ <property name="xpad">0</property>+ <property name="ypad">0</property>+</widget>+ </child>+ </widget>+ </child>++ <child>+ <widget class="GtkMenuItem" id="randomize_current_playlist_menu">+ <property name="visible">True</property>+ <property name="label" translatable="yes">Randomize Current Playlist</property>+ <property name="use_underline">True</property>+ <signal name="activate" handler="on_randomize_current_playlist_activate" last_modification_time="Fri, 19 Mar 2004 17:27:51 GMT"/>+ </widget>+ </child>++ <child>+ <widget class="GtkImageMenuItem" id="save_track_order_menu">+ <property name="visible">True</property>+ <property name="label" translatable="yes">_Save Displayed Track Order</property>+ <property name="use_underline">True</property>+ <signal name="activate" handler="on_save_track_order1_activate" last_modification_time="Sat, 08 Mar 2003 13:45:01 GMT"/>+ <accelerator key="s" modifiers="GDK_CONTROL_MASK | GDK_SHIFT_MASK" signal="activate"/>++ <child internal-child="image">+<widget class="GtkImage" id="image3941">+ <property name="visible">True</property>+ <property name="stock">gtk-justify-fill</property>+ <property name="icon_size">1</property>+ <property name="xalign">0.5</property>+ <property name="yalign">0.5</property>+ <property name="xpad">0</property>+ <property name="ypad">0</property>+</widget>+ </child>+ </widget>+ </child>++ <child>+ <widget class="GtkSeparatorMenuItem" id="separator2">+ <property name="visible">True</property>+ </widget>+ </child>++ <child>+ <widget class="GtkImageMenuItem" id="edit_repository_options">+ <property name="visible">True</property>+ <property name="label" translatable="yes">Edit Repository/iPod Options</property>+ <property name="use_underline">True</property>+ <signal name="activate" handler="on_edit_repository_options_activate" last_modification_time="Sun, 21 May 2006 03:40:14 GMT"/>++ <child internal-child="image">+<widget class="GtkImage" id="image3942">+ <property name="visible">True</property>+ <property name="stock">gtk-preferences</property>+ <property name="icon_size">1</property>+ <property name="xalign">0.5</property>+ <property name="yalign">0.5</property>+ <property name="xpad">0</property>+ <property name="ypad">0</property>+</widget>+ </child>+ </widget>+ </child>++ <child>+ <widget class="GtkImageMenuItem" id="edit_preferences">+ <property name="visible">True</property>+ <property name="label" translatable="yes">Edit _Preferences</property>+ <property name="use_underline">True</property>+ <signal name="activate" handler="on_edit_preferences_activate" last_modification_time="Sun, 21 May 2006 03:41:05 GMT"/>+ <accelerator key="p" modifiers="GDK_CONTROL_MASK" signal="activate"/>++ <child internal-child="image">+<widget class="GtkImage" id="image3943">+ <property name="visible">True</property>+ <property name="stock">gtk-preferences</property>+ <property name="icon_size">1</property>+ <property name="xalign">0.5</property>+ <property name="yalign">0.5</property>+ <property name="xpad">0</property>+ <property name="ypad">0</property>+</widget>+ </child>+ </widget>+ </child>+</widget>+ </child>+ </widget>+ </child>++ <child>+ <widget class="GtkMenuItem" id="item1">+ <property name="visible">True</property>+ <property name="label" translatable="yes">_View</property>+ <property name="use_underline">True</property>++ <child>+<widget class="GtkMenu" id="item1_menu">++ <child>+ <widget class="GtkCheckMenuItem" id="toolbar_menu">+ <property name="visible">True</property>+ <property name="label" translatable="yes">_Toolbar</property>+ <property name="use_underline">True</property>+ <property name="active">False</property>+ <signal name="activate" handler="on_toolbar_menu_activate" last_modification_time="Fri, 14 Mar 2003 10:58:38 GMT"/>+ </widget>+ </child>++ <child>+ <widget class="GtkCheckMenuItem" id="tooltips_menu">+ <property name="visible">True</property>+ <property name="label" translatable="yes">_Tooltips</property>+ <property name="use_underline">True</property>+ <property name="active">False</property>+ <signal name="activate" handler="on_tooltips_menu_activate" last_modification_time="Sat, 14 Jun 2003 16:48:32 GMT"/>+ </widget>+ </child>++ <child>+ <widget class="GtkCheckMenuItem" id="info_window_menu">+ <property name="visible">True</property>+ <property name="label" translatable="yes">_Info Window</property>+ <property name="use_underline">True</property>+ <property name="active">False</property>+ <signal name="activate" handler="on_info_window1_activate" last_modification_time="Sun, 23 Nov 2003 15:25:04 GMT"/>+ <accelerator key="i" modifiers="GDK_CONTROL_MASK" signal="activate"/>+ </widget>+ </child>++ <child>+ <widget class="GtkCheckMenuItem" id="conversion_log">+ <property name="visible">True</property>+ <property name="label" translatable="yes">_Conversion Log</property>+ <property name="use_underline">True</property>+ <property name="active">False</property>+ <signal name="activate" handler="on_conversion_log1_activate" last_modification_time="Sun, 22 Apr 2007 15:25:48 GMT"/>+ </widget>+ </child>++ <child>+ <widget class="GtkImageMenuItem" id="more_sort_tabs">+ <property name="visible">True</property>+ <property name="label" translatable="yes">_More Sort Tabs</property>+ <property name="use_underline">True</property>+ <signal name="activate" handler="on_more_sort_tabs_activate" last_modification_time="Fri, 14 Mar 2003 11:57:43 GMT"/>++ <child internal-child="image">+<widget class="GtkImage" id="image3944">+ <property name="visible">True</property>+ <property name="stock">gtk-add</property>+ <property name="icon_size">1</property>+ <property name="xalign">0.5</property>+ <property name="yalign">0.5</property>+ <property name="xpad">0</property>+ <property name="ypad">0</property>+</widget>+ </child>+ </widget>+ </child>++ <child>+ <widget class="GtkImageMenuItem" id="less_sort_tabs">+ <property name="visible">True</property>+ <property name="label" translatable="yes">_Less Sort Tabs</property>+ <property name="use_underline">True</property>+ <signal name="activate" handler="on_less_sort_tabs_activate" last_modification_time="Fri, 14 Mar 2003 11:57:43 GMT"/>++ <child internal-child="image">+<widget class="GtkImage" id="image3945">+ <property name="visible">True</property>+ <property name="stock">gtk-remove</property>+ <property name="icon_size">1</property>+ <property name="xalign">0.5</property>+ <property name="yalign">0.5</property>+ <property name="xpad">0</property>+ <property name="ypad">0</property>+</widget>+ </child>+ </widget>+ </child>++ <child>+ <widget class="GtkMenuItem" id="arrange_sort_tabs">+ <property name="visible">True</property>+ <property name="label" translatable="yes">_Arrange Sort Tabs</property>+ <property name="use_underline">True</property>+ <signal name="activate" handler="on_arrange_sort_tabs_activate" last_modification_time="Tue, 25 Mar 2003 13:59:28 GMT"/>+ </widget>+ </child>+</widget>+ </child>+ </widget>+ </child>++ <child>+ <widget class="GtkMenuItem" id="tools1">+ <property name="visible">True</property>+ <property name="label" translatable="yes">_Tools</property>+ <property name="use_underline">True</property>++ <child>+<widget class="GtkMenu" id="tools1_menu">++ <child>+ <widget class="GtkImageMenuItem" id="play_menu">+ <property name="visible">True</property>+ <property name="label" translatable="yes">_Play Now</property>+ <property name="use_underline">True</property>++ <child internal-child="image">+<widget class="GtkImage" id="image3946">+ <property name="visible">True</property>+ <property name="stock">gtk-cdrom</property>+ <property name="icon_size">1</property>+ <property name="xalign">0.5</property>+ <property name="yalign">0.5</property>+ <property name="xpad">0</property>+ <property name="ypad">0</property>+</widget>+ </child>++ <child>+<widget class="GtkMenu" id="play_menu_menu">++ <child>+ <widget class="GtkMenuItem" id="play_playlist_menu">+ <property name="visible">True</property>+ <property name="label" translatable="yes">Selected _Playlist</property>+ <property name="use_underline">True</property>+ <signal name="activate" handler="on_play_playlist_activate" last_modification_time="Sun, 23 Mar 2003 09:00:04 GMT"/>+ </widget>+ </child>++ <child>+ <widget class="GtkMenuItem" id="play_tab_entry_menu">+ <property name="visible">True</property>+ <property name="label" translatable="yes">Selected Tab _Entry</property>+ <property name="use_underline">True</property>+ <signal name="activate" handler="on_play_tab_entry_activate" last_modification_time="Sun, 23 Mar 2003 09:00:04 GMT"/>+ </widget>+ </child>++ <child>+ <widget class="GtkMenuItem" id="play_tracks_menu">+ <property name="visible">True</property>+ <property name="label" translatable="yes">Selected _Tracks</property>+ <property name="use_underline">True</property>+ <signal name="activate" handler="on_play_tracks_activate" last_modification_time="Sun, 23 Mar 2003 09:00:04 GMT"/>+ </widget>+ </child>+</widget>+ </child>+ </widget>+ </child>++ <child>+ <widget class="GtkImageMenuItem" id="enqueue_menu">+ <property name="visible">True</property>+ <property name="label" translatable="yes">_Enqueue</property>+ <property name="use_underline">True</property>++ <child internal-child="image">+<widget class="GtkImage" id="image3947">+ <property name="visible">True</property>+ <property name="stock">gtk-cdrom</property>+ <property name="icon_size">1</property>+ <property name="xalign">0.5</property>+ <property name="yalign">0.5</property>+ <property name="xpad">0</property>+ <property name="ypad">0</property>+</widget>+ </child>++ <child>+<widget class="GtkMenu" id="enqueue_menu_menu">++ <child>+ <widget class="GtkMenuItem" id="enqueue_playlist_menu">+ <property name="visible">True</property>+ <property name="label" translatable="yes">Selected _Playlist</property>+ <property name="use_underline">True</property>+ <signal name="activate" handler="on_enqueue_playlist_activate" last_modification_time="Sun, 23 Mar 2003 09:00:04 GMT"/>+ </widget>+ </child>++ <child>+ <widget class="GtkMenuItem" id="enqueue_tab_entry_menu">+ <property name="visible">True</property>+ <property name="label" translatable="yes">Selected Tab _Entry</property>+ <property name="use_underline">True</property>+ <signal name="activate" handler="on_enqueue_tab_entry_activate" last_modification_time="Sun, 23 Mar 2003 09:00:04 GMT"/>+ </widget>+ </child>++ <child>+ <widget class="GtkMenuItem" id="enqueue_tracks_menu">+ <property name="visible">True</property>+ <property name="label" translatable="yes">Selected _Tracks</property>+ <property name="use_underline">True</property>+ <signal name="activate" handler="on_enqueue_tracks_activate" last_modification_time="Sun, 23 Mar 2003 09:00:04 GMT"/>+ </widget>+ </child>+</widget>+ </child>+ </widget>+ </child>++ <child>+ <widget class="GtkSeparatorMenuItem" id="trennlinie4">+ <property name="visible">True</property>+ </widget>+ </child>++ <child>+ <widget class="GtkMenuItem" id="normalize_tracks1">+ <property name="visible">True</property>+ <property name="label" translatable="yes">_Normalize Volume</property>+ <property name="use_underline">True</property>++ <child>+<widget class="GtkMenu" id="normalize_tracks1_menu">++ <child>+ <widget class="GtkMenuItem" id="normalize_selected_playlist">+ <property name="visible">True</property>+ <property name="label" translatable="yes">Selected _Playlist</property>+ <property name="use_underline">True</property>+ <signal name="activate" handler="on_normalize_selected_playlist_activate" last_modification_time="Fri, 26 Sep 2003 16:01:19 GMT"/>+ </widget>+ </child>++ <child>+ <widget class="GtkMenuItem" id="normalize_selected_tab_entry">+ <property name="visible">True</property>+ <property name="label" translatable="yes">Selected Tab _Entry</property>+ <property name="use_underline">True</property>+ <signal name="activate" handler="on_normalize_selected_tab_entry_activate" last_modification_time="Fri, 26 Sep 2003 16:01:19 GMT"/>+ </widget>+ </child>++ <child>+ <widget class="GtkMenuItem" id="normalize_selected_tracks">+ <property name="visible">True</property>+ <property name="label" translatable="yes">Selected _Tracks</property>+ <property name="use_underline">True</property>+ <signal name="activate" handler="on_normalize_selected_tracks_activate" last_modification_time="Fri, 26 Sep 2003 16:01:19 GMT"/>+ </widget>+ </child>++ <child>+ <widget class="GtkMenuItem" id="normalize_displayed_tracks">+ <property name="visible">True</property>+ <property name="label" translatable="yes">_Displayed Tracks</property>+ <property name="use_underline">True</property>+ <signal name="activate" handler="on_normalize_displayed_tracks_activate" last_modification_time="Fri, 26 Sep 2003 16:01:19 GMT"/>+ </widget>+ </child>++ <child>+ <widget class="GtkMenuItem" id="normalize_all_tracks">+ <property name="visible">True</property>+ <property name="label" translatable="yes">_All Tracks</property>+ <property name="use_underline">True</property>+ <signal name="activate" handler="on_normalize_all_tracks" last_modification_time="Fri, 26 Sep 2003 16:01:19 GMT"/>+ </widget>+ </child>++ <child>+ <widget class="GtkMenuItem" id="normalize_newly_added_tracks">+ <property name="visible">True</property>+ <property name="label" translatable="yes">_Newly Added Tracks</property>+ <property name="use_underline">True</property>+ <signal name="activate" handler="on_normalize_newly_added_tracks" last_modification_time="Fri, 26 Sep 2003 16:01:19 GMT"/>+ </widget>+ </child>+</widget>+ </child>+ </widget>+ </child>++ <child>+ <widget class="GtkSeparatorMenuItem" id="trennlinie5">+ <property name="visible">True</property>+ </widget>+ </child>++ <child>+ <widget class="GtkMenuItem" id="sync_all">+ <property name="visible">True</property>+ <property name="tooltip" translatable="yes">Synchronise Contacts, Calendar and Notes</property>+ <property name="label" translatable="yes">Synchronize All</property>+ <property name="use_underline">True</property>+ <signal name="activate" handler="on_sync_all_activate" last_modification_time="Thu, 16 Dec 2004 00:15:04 GMT"/>+ </widget>+ </child>++ <child>+ <widget class="GtkMenuItem" id="sync_contacts">+ <property name="visible">True</property>+ <property name="label" translatable="yes">Synchronize Contacts</property>+ <property name="use_underline">True</property>+ <signal name="activate" handler="on_sync_contacts_activate" last_modification_time="Sun, 01 Feb 2004 10:51:37 GMT"/>+ </widget>+ </child>++ <child>+ <widget class="GtkMenuItem" id="sync_calendar">+ <property name="visible">True</property>+ <property name="label" translatable="yes">Synchronize Calendar</property>+ <property name="use_underline">True</property>+ <signal name="activate" handler="on_sync_calendar_activate" last_modification_time="Sun, 01 Feb 2004 10:51:37 GMT"/>+ </widget>+ </child>++ <child>+ <widget class="GtkMenuItem" id="sync_notes">+ <property name="visible">True</property>+ <property name="label" translatable="yes">Synchronize Notes</property>+ <property name="use_underline">True</property>+ <signal name="activate" handler="on_sync_notes_activate" last_modification_time="Thu, 16 Dec 2004 00:15:04 GMT"/>+ </widget>+ </child>+</widget>+ </child>+ </widget>+ </child>++ <child>+ <widget class="GtkMenuItem" id="menuitem13">+ <property name="visible">True</property>+ <property name="label" translatable="yes">_Help</property>+ <property name="use_underline">True</property>++ <child>+<widget class="GtkMenu" id="menuitem13_menu">++ <child>+ <widget class="GtkImageMenuItem" id="about1">+ <property name="visible">True</property>+ <property name="label" translatable="yes">_About</property>+ <property name="use_underline">True</property>+ <signal name="activate" handler="open_about_window" last_modification_time="Sun, 05 Jun 2005 13:09:31 GMT"/>++ <child internal-child="image">+<widget class="GtkImage" id="image3948">+ <property name="visible">True</property>+ <property name="stock">gtk-dialog-info</property>+ <property name="icon_size">1</property>+ <property name="xalign">0.5</property>+ <property name="yalign">0.5</property>+ <property name="xpad">0</property>+ <property name="ypad">0</property>+</widget>+ </child>+ </widget>+ </child>+</widget>+ </child>+ </widget>+ </child>+</widget>+<packing>+ <property name="padding">0</property>+ <property name="expand">False</property>+ <property name="fill">False</property>+</packing>+ </child>++ <child>+<widget class="GtkToolbar" id="toolbar">+ <property name="visible">True</property>+ <property name="orientation">GTK_ORIENTATION_HORIZONTAL</property>+ <property name="toolbar_style">GTK_TOOLBAR_BOTH</property>+ <property name="tooltips">True</property>+ <property name="show_arrow">True</property>++ <child>+ <widget class="GtkToolButton" id="load_ipods_button">+ <property name="visible">True</property>+ <property name="tooltip" translatable="yes">Try to load contents of all connected iPods. For each iPod a separate repository must be set up.</property>+ <property name="label" translatable="yes">Load iPod(s)</property>+ <property name="use_underline">True</property>+ <property name="icon">gtkpod-read.png</property>+ <property name="visible_horizontal">True</property>+ <property name="visible_vertical">True</property>+ <property name="is_important">False</property>+ <signal name="clicked" handler="on_load_ipods_clicked" last_modification_time="Sat, 20 May 2006 14:20:43 GMT"/>+ </widget>+ <packing>+ <property name="expand">False</property>+ <property name="hom*ogeneous">True</property>+ </packing>+ </child>++ <child>+ <widget class="GtkToolButton" id="save_changes_button">+ <property name="visible">True</property>+ <property name="tooltip" translatable="yes">Write all changes made to the disk and the iPod(s).</property>+ <property name="label" translatable="yes">Save Changes</property>+ <property name="use_underline">True</property>+ <property name="stock_id">gtk-save</property>+ <property name="visible_horizontal">True</property>+ <property name="visible_vertical">True</property>+ <property name="is_important">False</property>+ <signal name="clicked" handler="on_save_changes_clicked" last_modification_time="Sat, 20 May 2006 14:20:33 GMT"/>+ </widget>+ <packing>+ <property name="expand">False</property>+ <property name="hom*ogeneous">True</property>+ </packing>+ </child>++ <child>+ <widget class="GtkToolButton" id="add_files_button">+ <property name="visible">True</property>+ <property name="tooltip" translatable="yes">Add Files or Directories</property>+ <property name="label" translatable="yes">Files</property>+ <property name="use_underline">True</property>+ <property name="icon">gtkpod-add-files.png</property>+ <property name="visible_horizontal">True</property>+ <property name="visible_vertical">True</property>+ <property name="is_important">False</property>+ <signal name="clicked" handler="create_add_files_dialog" last_modification_time="Sun, 05 Jun 2005 13:09:54 GMT"/>+ </widget>+ <packing>+ <property name="expand">False</property>+ <property name="hom*ogeneous">True</property>+ </packing>+ </child>++ <child>+ <widget class="GtkToolButton" id="add_dirs_button">+ <property name="visible">True</property>+ <property name="tooltip" translatable="yes">Add Directories Recursively</property>+ <property name="label" translatable="yes">Dirs</property>+ <property name="use_underline">True</property>+ <property name="icon">gtkp... [truncated message content]

Revision: 1533 Author: tmzullingerDate: 2007-06-08 17:53:17 -0700 (Fri, 08 Jun 2007)Log Message:-----------mv gtkpod.gladep to data dirAdded Paths:----------- gtkpod/trunk/data/gtkpod.gladepRemoved Paths:------------- gtkpod/trunk/gtkpod.gladepCopied: gtkpod/trunk/data/gtkpod.gladep (from rev 1532, gtkpod/trunk/gtkpod.gladep)===================================================================--- gtkpod/trunk/data/gtkpod.gladep (rev 0)+++ gtkpod/trunk/data/gtkpod.gladep2007-06-09 00:53:17 UTC (rev 1533)@@ -0,0 +1,8 @@+<?xml version="1.0" standalone="no"?> <!--*- mode: xml -*-->+<!DOCTYPE glade-project SYSTEM "http://glade.gnome.org/glade-project-2.0.dtd">++<glade-project>+ <name>Gtkpod</name>+ <program_name>gtkpod</program_name>+ <gnome_support>FALSE</gnome_support>+</glade-project>Deleted: gtkpod/trunk/gtkpod.gladep===================================================================--- gtkpod/trunk/gtkpod.gladep2007-06-09 00:53:11 UTC (rev 1532)+++ gtkpod/trunk/gtkpod.gladep2007-06-09 00:53:17 UTC (rev 1533)@@ -1,8 +0,0 @@-<?xml version="1.0" standalone="no"?> <!--*- mode: xml -*-->-<!DOCTYPE glade-project SYSTEM "http://glade.gnome.org/glade-project-2.0.dtd">--<glade-project>- <name>Gtkpod</name>- <program_name>gtkpod</program_name>- <gnome_support>FALSE</gnome_support>-</glade-project>This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 1534 Author: tmzullingerDate: 2007-06-08 17:57:34 -0700 (Fri, 08 Jun 2007)Log Message:-----------Fixup 'make distcheck' and add some files missing for i18n.Modified Paths:-------------- gtkpod/trunk/ChangeLog_detailed gtkpod/trunk/Makefile.am gtkpod/trunk/configure.in gtkpod/trunk/data/gtkpod.gladep gtkpod/trunk/po/POTFILES.in gtkpod/trunk/po/de.po gtkpod/trunk/po/es.po gtkpod/trunk/po/fr.po gtkpod/trunk/po/gtkpod.pot gtkpod/trunk/po/he.po gtkpod/trunk/po/it.po gtkpod/trunk/po/ja.po gtkpod/trunk/po/sv.po gtkpod/trunk/src/Makefile.am gtkpod/trunk/src/display_coverart.c gtkpod/trunk/src/misc.cAdded Paths:----------- gtkpod/trunk/data/Makefile.am gtkpod/trunk/po/POTFILES.skipModified: gtkpod/trunk/ChangeLog_detailed===================================================================--- gtkpod/trunk/ChangeLog_detailed2007-06-09 00:53:17 UTC (rev 1533)+++ gtkpod/trunk/ChangeLog_detailed2007-06-09 00:57:34 UTC (rev 1534)@@ -4,6 +4,25 @@ src/prefs_window.c: hide Last.FM tab (déjà vu) +* configure.in+ src/display_coverart.c+ src/Makefile.am+ src/misc.c+ data/gtkpod.gladep+ data/Makefile.am+ Makefile.am+ po/es.po+ po/fr.po+ po/de.po+ po/sv.po+ po/ja.po+ po/gtkpod.pot+ po/he.po+ po/it.po+ po/POTFILES.in+ po/POTFILES.skip:+ Fixup 'make distcheck' and add some files missing for i18n.+ 2007-06-05 P.G. Richardson <phantom_sf at users.sourceforge.net> * src/fetchcover.cModified: gtkpod/trunk/Makefile.am===================================================================--- gtkpod/trunk/Makefile.am2007-06-09 00:53:17 UTC (rev 1533)+++ gtkpod/trunk/Makefile.am2007-06-09 00:57:34 UTC (rev 1534)@@ -1,53 +1,13 @@ ## Process this file with automake to produce Makefile.in -SUBDIRS = src po scripts+SUBDIRS = src po scripts data - EXTRA_DIST = \ autogen.sh \-gtkpod.glade \-gtkpod.gladep \ TROUBLESHOOTING \-TODOandBUGS.txt \-pixmaps+TODOandBUGS.txt -install-data-hook:-if test -d $(srcdir)/pixmaps; then \- $(mkinstalldirs) $(DESTDIR)$(pkgdatadir)/pixmaps; \- for pixmap in $(srcdir)/pixmaps/*; do \- if test -f $$pixmap; then \- if ! test -h $$pixmap; then \- $(INSTALL_DATA) $$pixmap $(DESTDIR)$(pkgdatadir)/pixmaps; \- fi \- fi \- done \-fi-for gladefile in gtkpod.glade gtkpod.gladep; do \- if test -f $$gladefile; then \- $(INSTALL_DATA) $$gladefile $(DESTDIR)$(pkgdatadir); \- rm -f $(DESTDIR)$(pkgdatadir)/pixmaps/$$gladefile; \- ln -s ../$$gladefile $(DESTDIR)$(pkgdatadir)/pixmaps/$$gladefile; \- fi \-done- uninstall-hook:-if test -d $(DESTDIR)$(pkgdatadir)/pixmaps; then \- rm -fr $(DESTDIR)$(pkgdatadir)/pixmaps/ ; \-fi-for gladefile in gtkpod.glade gtkpod.gladep; do \- rm -f $(DESTDIR)$(pkgdatadir)/$$gladefile; \-done-if test -d $(DESTDIR)$(pkgdatadir)/scripts ; then \- rmdir --ignore-fail-on-non-empty $(DESTDIR)$(pkgdatadir)/scripts; \-fi-if test -d $(DESTDIR)$(pkgdatadir) ; then \- rmdir --ignore-fail-on-non-empty $(DESTDIR)$(pkgdatadir); \-fi--dist-hook:-for gladefile in gtkpod.glade gtkpod.gladep; do \- rm -f $(distdir)/pixmaps/$$gladefile; \-done-rm -rf $(distdir)/pixmaps/.svn--+-rmdir --ignore-fail-on-non-empty $(DESTDIR)$(pkgdatadir)/data+-rmdir --ignore-fail-on-non-empty $(DESTDIR)$(pkgdatadir)/scripts+-rmdir --ignore-fail-on-non-empty $(DESTDIR)$(pkgdatadir)Modified: gtkpod/trunk/configure.in===================================================================--- gtkpod/trunk/configure.in2007-06-09 00:53:17 UTC (rev 1533)+++ gtkpod/trunk/configure.in2007-06-09 00:57:34 UTC (rev 1534)@@ -178,6 +178,7 @@ src/Makefile po/Makefile.in scripts/Makefile+data/Makefile ]) echo "Added: gtkpod/trunk/data/Makefile.am===================================================================--- gtkpod/trunk/data/Makefile.am (rev 0)+++ gtkpod/trunk/data/Makefile.am2007-06-09 00:57:34 UTC (rev 1534)@@ -0,0 +1,25 @@+appdatadir = $(pkgdatadir)/data+appdata_DATA =\+gtkpod.glade\+cdshine.png\+cdshine_main.png\+default-cover.png\+gtkpod-add-dirs.png\+gtkpod-add-files.png\+gtkpod-add-playlists.png \+gtkpod-icon-32.png\+gtkpod-icon-32x32-2.png\+gtkpod-icon-32x32.png\+gtkpod-icon-48.png\+gtkpod-icon-48x48.png\+gtkpod-icon-64x64.png\+gtkpod-logo.png\+gtkpod-new-playlist.png\+gtkpod-read.png\+gtkpod-sync.png++EXTRA_DIST = \+$(appdata_DATA)++CLEANFILES = \+gtkpod.gladepModified: gtkpod/trunk/data/gtkpod.gladep===================================================================--- gtkpod/trunk/data/gtkpod.gladep2007-06-09 00:53:17 UTC (rev 1533)+++ gtkpod/trunk/data/gtkpod.gladep2007-06-09 00:57:34 UTC (rev 1534)@@ -4,5 +4,6 @@ <glade-project> <name>Gtkpod</name> <program_name>gtkpod</program_name>+ <pixmaps_directory>.</pixmaps_directory> <gnome_support>FALSE</gnome_support> </glade-project>Modified: gtkpod/trunk/po/POTFILES.in===================================================================--- gtkpod/trunk/po/POTFILES.in2007-06-09 00:53:17 UTC (rev 1533)+++ gtkpod/trunk/po/POTFILES.in2007-06-09 00:57:34 UTC (rev 1534)@@ -1,31 +1,34 @@ # List of source files containing translatable strings (output of-# ls src/*.[cl] gtkpod.glade)+# ls src/*.[cl] data/*.glade | grep -vf po/POTFILES.skip+# in a clean checkout) -gtkpod.glade+data/gtkpod.glade src/charset.c src/clientserver.c src/confirmation.c src/context_menus.c-#src/date_parser2.c src/date_parser2.l-#src/date_parser.c src/date_parser.l src/details.c src/display.c+src/display_coverart.c src/display_itdb.c src/display_playlists.c-src/display_tracks.c src/display_sorttabs.c src/display_spl.c+src/display_tracks.c+src/fetchcover.c src/file.c+src/file_convert.c src/file_export.c src/file_itunesdb.c src/fileselection.c+src/flacfile.c src/getopt1.c src/getopt.c src/info.c+src/ipod_init.c src/main.c-src/md5.c src/misc.c src/misc_confirm.c src/misc_conversion.c@@ -34,10 +37,11 @@ src/misc_track.c src/mp3file.c src/mp4file.c-#src/podcast.c+src/oggfile.c src/prefs.c src/prefs_window.c src/repository.c+src/sha1.c src/syncdir.c src/tools.c src/wavfile.cAdded: gtkpod/trunk/po/POTFILES.skip===================================================================--- gtkpod/trunk/po/POTFILES.skip (rev 0)+++ gtkpod/trunk/po/POTFILES.skip2007-06-09 00:57:34 UTC (rev 1534)@@ -0,0 +1,3 @@+src/md5.c+src/podcast.c+src/support.cModified: gtkpod/trunk/po/de.po===================================================================--- gtkpod/trunk/po/de.po2007-06-09 00:53:17 UTC (rev 1533)+++ gtkpod/trunk/po/de.po2007-06-09 00:57:34 UTC (rev 1534)@@ -82,7 +82,7 @@ msgstr "" "Project-Id-Version: de\n" "Report-Msgid-Bugs-To: \n"-"POT-Creation-Date: 2006-09-24 23:08+0900\n"+"POT-Creation-Date: 2007-06-03 17:15-0400\n" "PO-Revision-Date: 2007-03-15 22:33+0100\n" "Last-Translator: Kai-Ove\n" "Language-Team: <de...@li...>\n"@@ -92,457 +92,475 @@ "Plural-Forms: nplurals=2; plural=n != 1;\n" "X-Generator: KBabel 1.9.1\n" -#: gtkpod.glade:7+#: data/gtkpod.glade:7 msgid "gtkpod" msgstr "gtkpod" -#: gtkpod.glade:40+#: data/gtkpod.glade:40 msgid "_File" msgstr "_Datei" -#: gtkpod.glade:49+#: data/gtkpod.glade:49 msgid "_Load iPod(s)" msgstr "i_Pod(s) einlesen" -#: gtkpod.glade:69+#: data/gtkpod.glade:69 msgid "_Save Changes" msgstr "_Änderungen sichern" -#: gtkpod.glade:90+#: data/gtkpod.glade:90 msgid "Add _Files" msgstr "_Dateien hinzufügen" -#: gtkpod.glade:111+#: data/gtkpod.glade:111 msgid "Add _Directory" msgstr "_Verzeichnisse hinzufügen" -#: gtkpod.glade:132+#: data/gtkpod.glade:132 msgid "Add _Playlist" msgstr "_Wiedergabeliste hinzufügen" -#: gtkpod.glade:159+#: data/gtkpod.glade:159 msgid "_Update Tracks from File" msgstr "_Stücke aus Datei aktualisieren" -#: gtkpod.glade:180 gtkpod.glade:232 gtkpod.glade:311 gtkpod.glade:363-#: gtkpod.glade:1092 gtkpod.glade:1144 gtkpod.glade:1190+#: data/gtkpod.glade:180 data/gtkpod.glade:232 data/gtkpod.glade:311+#: data/gtkpod.glade:363 data/gtkpod.glade:1102 data/gtkpod.glade:1154+#: data/gtkpod.glade:1200 msgid "Selected _Playlist" msgstr "Ausgewählte _Wiedergabeliste" -#: gtkpod.glade:189 gtkpod.glade:241 gtkpod.glade:320 gtkpod.glade:372-#: gtkpod.glade:1101 gtkpod.glade:1153 gtkpod.glade:1199+#: data/gtkpod.glade:189 data/gtkpod.glade:241 data/gtkpod.glade:320+#: data/gtkpod.glade:372 data/gtkpod.glade:1111 data/gtkpod.glade:1163+#: data/gtkpod.glade:1209 msgid "Selected Tab _Entry" msgstr "Ausgewählter _Eintrag" -#: gtkpod.glade:198 gtkpod.glade:250 gtkpod.glade:329 gtkpod.glade:381-#: gtkpod.glade:498 gtkpod.glade:1110 gtkpod.glade:1162 gtkpod.glade:1208+#: data/gtkpod.glade:198 data/gtkpod.glade:250 data/gtkpod.glade:329+#: data/gtkpod.glade:381 data/gtkpod.glade:498 data/gtkpod.glade:1120+#: data/gtkpod.glade:1172 data/gtkpod.glade:1218 msgid "Selected _Tracks" msgstr "Ausgewählte _Stücke" -#: gtkpod.glade:211+#: data/gtkpod.glade:211 msgid "Update _mserv Data from File" msgstr "_mserv-Daten aktualisieren" -#: gtkpod.glade:263-msgid "_Synchronize Playlist"-msgstr "_Abgleich der Wiedergabeliste"+#: data/gtkpod.glade:263+#, fuzzy+msgid "_Synchronize Playlist with Dir(s)"+msgstr "Wiedergabeliste mit Verzeichnis(sen) abgleichen" -#: gtkpod.glade:290+#: data/gtkpod.glade:290 msgid "_Export Tracks from Database" msgstr "E_xport aus der Datenbank" -#: gtkpod.glade:342+#: data/gtkpod.glade:342 msgid "Create _Playlist File" msgstr "_Erstelle Datei der Wiedergabeliste" -#: gtkpod.glade:400+#: data/gtkpod.glade:400 msgid "_Create iPod's Directories" msgstr "_iPod-Verzeichnis(se) erstellen" -#: gtkpod.glade:421+#: data/gtkpod.glade:421+#, fuzzy msgid "" "Find orphan files (files with no track info in DB) and dangling tracks "-"(tracks with no corresponding files on iPOD)"+"(tracks with no corresponding files on iPod)" msgstr "" "Verwaiste Stücke (Stücke, für die kein Eintrag in der iTunesDB erscheint) " "und verlorene Stücke (Stücke ohne Datei auf dem iPod) finden" -#: gtkpod.glade:422+#: data/gtkpod.glade:422 msgid "_Check iPod's Files" msgstr "_Überprüfe iPod Dateien" -#: gtkpod.glade:450 gtkpod.glade:12687+#: data/gtkpod.glade:450 data/gtkpod.glade:12948 msgid "_Edit" msgstr "_Bearbeiten" -#: gtkpod.glade:459 src/context_menus.c:480+#: data/gtkpod.glade:459 src/context_menus.c:746 msgid "Edit Track Details" msgstr "_Bearbeite Stücke" -#: gtkpod.glade:480+#: data/gtkpod.glade:480 msgid "Tracks in Selected _Playlist" msgstr "Stücke in ausgewählter _Wiedergabeliste" -#: gtkpod.glade:489+#: data/gtkpod.glade:489 msgid "Tracks in Selected Tab _Entry" msgstr "Stücke im ausgewählten _Sortierungseintrag" -#: gtkpod.glade:511 src/context_menus.c:407+#: data/gtkpod.glade:511 src/context_menus.c:659 msgid "Edit Smart Playlist" msgstr "Intelligente Wiedergabeliste editieren" -#: gtkpod.glade:520+#: data/gtkpod.glade:520 msgid "_Delete" msgstr "_Löschen" -#: gtkpod.glade:541+#: data/gtkpod.glade:541 msgid "Selected playlist" msgstr "Ausgewählte Wiedergabeliste" -#: gtkpod.glade:550+#: data/gtkpod.glade:550 msgid "Selected playlist including tracks from iPod" msgstr "Ausgewählte Wiedergabeliste einschließlich der Stücke vom iPod" -#: gtkpod.glade:559+#: data/gtkpod.glade:559 msgid "Selected playlist including tracks from database"-msgstr "Ausgewählte Wiedergabeliste einschließlich der Stücke aus der Datenbank"+msgstr ""+"Ausgewählte Wiedergabeliste einschließlich der Stücke aus der Datenbank" -#: gtkpod.glade:568+#: data/gtkpod.glade:568 msgid "Selected playlist including tracks from harddisk"-msgstr "Ausgewählte Wiedergabeliste einschließlich der Stücke von der Festplatte"+msgstr ""+"Ausgewählte Wiedergabeliste einschließlich der Stücke von der Festplatte" -#: gtkpod.glade:583+#: data/gtkpod.glade:583 msgid "Selected filter tab entry from playlist" msgstr "Ausgewählter Filter-Eintrag der Wiedergabeliste" -#: gtkpod.glade:592+#: data/gtkpod.glade:592 msgid "Selected filter tab entry from iPod" msgstr "Ausgewählter Filter-Eintrag vom iPod" -#: gtkpod.glade:601+#: data/gtkpod.glade:601 msgid "Selected filter tab entry from database" msgstr "Ausgewählter Filter-Eintrag der lokalen Datenbank" -#: gtkpod.glade:610+#: data/gtkpod.glade:610 msgid "Selected filter tab entry from harddisk" msgstr "Ausgewählter Filter-Eintrag der Festplatte" -#: gtkpod.glade:625+#: data/gtkpod.glade:625 msgid "Selected tracks from playlist" msgstr "Ausgewählte Stücke aus der Wiedergabeliste" -#: gtkpod.glade:634+#: data/gtkpod.glade:634 msgid "Selected tracks from iPod" msgstr "Ausgewählte Stücke vom iPod" -#: gtkpod.glade:643+#: data/gtkpod.glade:643 msgid "Selected tracks from database" msgstr "Ausgewählte Stücke aus der Datenbank" -#: gtkpod.glade:652+#: data/gtkpod.glade:652 msgid "Selected tracks from harddisk" msgstr "Ausgewählte Stücke von der Festplatte" -#: gtkpod.glade:671+#: data/gtkpod.glade:671 msgid "_Create Playlists" msgstr "_Erstelle Wiedergabelisten" -#: gtkpod.glade:692+#: data/gtkpod.glade:692 msgid "Empty Playlist" msgstr "Wiedergabeliste leeren" -#: gtkpod.glade:701 gtkpod.glade:7379 src/misc_playlist.c:97-#: src/repository.c:1359+#: data/gtkpod.glade:701 data/gtkpod.glade:7598 src/misc_playlist.c:96+#: src/repository.c:1356 msgid "Smart Playlist" msgstr "Intelligente Wiedergabeliste" -#: gtkpod.glade:716+#: data/gtkpod.glade:716 msgid "Random Playlist from Displayed Tracks" msgstr "Zufällige aus den angezeigten Stücken" -#: gtkpod.glade:725+#: data/gtkpod.glade:725 msgid "Containing Displayed Tracks" msgstr "Aus den angezeigten Stücken" -#: gtkpod.glade:734+#: data/gtkpod.glade:734 msgid "Containing Selected Tracks" msgstr "Aus den ausgewählten Stücken" -#: gtkpod.glade:743+#: data/gtkpod.glade:743 msgid "One for each Artist" msgstr "Eine für jeden Künstler" -#: gtkpod.glade:752+#: data/gtkpod.glade:752 msgid "One for each Album" msgstr "Eine für jedes Album" -#: gtkpod.glade:761+#: data/gtkpod.glade:761 msgid "One for each Genre" msgstr "Eine für jedes Genre" -#: gtkpod.glade:770+#: data/gtkpod.glade:770 msgid "One for each Composer" msgstr "Eine für jeden Komponisten" -#: gtkpod.glade:779+#: data/gtkpod.glade:779 msgid "One for each Year" msgstr "Eine für jedes Jahr" -#: gtkpod.glade:788+#: data/gtkpod.glade:788 msgid "One for each Rating" msgstr "Eine für jede Bewertung" -#: gtkpod.glade:797+#: data/gtkpod.glade:797 msgid "Best Rated Tracks" msgstr "Am besten bewertete Stücke" -#: gtkpod.glade:806+#: data/gtkpod.glade:806 msgid "Tracks Most Often Listened To" msgstr "Am häufigsten gehörte Stücke" -#: gtkpod.glade:815+#: data/gtkpod.glade:815 msgid "Most Recently Played Tracks" msgstr "Zuletzt gespielte Stücke" -#: gtkpod.glade:824+#: data/gtkpod.glade:824 msgid "All Tracks Played Since Last Time" msgstr "Seit dem letzten Mal gespielte Stücke" -#: gtkpod.glade:833+#: data/gtkpod.glade:833 msgid "All Tracks Never Listened To" msgstr "Nie gehörte Stücke" -#: gtkpod.glade:842+#: data/gtkpod.glade:842 msgid "All Tracks not Listed in any Playlist" msgstr "In keiner Wiedergabeliste aufgeführte Stücke" -#: gtkpod.glade:861+#: data/gtkpod.glade:861 msgid "_Sorting" msgstr "_Sortierung" -#: gtkpod.glade:883+#: data/gtkpod.glade:883 msgid "Randomize Current Playlist" msgstr "_Aktuelle Wiedergabeliste zufällig sortieren" -#: gtkpod.glade:892+#: data/gtkpod.glade:892 msgid "_Save Displayed Track Order" msgstr "_Reihenfolge der angezeigten Stücke speichern" -#: gtkpod.glade:920+#: data/gtkpod.glade:920 msgid "Edit Repository/iPod Options" msgstr "_Ändere Verzeichnis / iPod Optionen" -#: gtkpod.glade:941+#: data/gtkpod.glade:941 msgid "Edit _Preferences" msgstr "_Einstellungen ändern" -#: gtkpod.glade:967+#: data/gtkpod.glade:967 msgid "_View" msgstr "_Ansicht" -#: gtkpod.glade:976+#: data/gtkpod.glade:976 msgid "_Toolbar" msgstr "Werkzeug_leiste" -#: gtkpod.glade:986+#: data/gtkpod.glade:986 msgid "_Tooltips" msgstr "Werkzeug_tipps" -#: gtkpod.glade:996+#: data/gtkpod.glade:996 msgid "_Info Window" msgstr "Info _Fenster" -#: gtkpod.glade:1007+#: data/gtkpod.glade:1007+msgid "_Conversion Log"+msgstr ""++#: data/gtkpod.glade:1017 msgid "_More Sort Tabs" msgstr "_Mehr Sortierungseinträge" -#: gtkpod.glade:1028+#: data/gtkpod.glade:1038 msgid "_Less Sort Tabs" msgstr "_Weniger Sortierungseinträge" -#: gtkpod.glade:1049+#: data/gtkpod.glade:1059 msgid "_Arrange Sort Tabs" msgstr "_Ordne Sortierungseinträge" -#: gtkpod.glade:1062 gtkpod.glade:13297+#: data/gtkpod.glade:1072 data/gtkpod.glade:14338 msgid "_Tools" msgstr "_Werkzeuge" -#: gtkpod.glade:1071+#: data/gtkpod.glade:1081 msgid "_Play Now" msgstr "_Jetzt abspielen" -#: gtkpod.glade:1123+#: data/gtkpod.glade:1133 msgid "_Enqueue" msgstr "_Vormerken zum Abspielen" -#: gtkpod.glade:1181+#: data/gtkpod.glade:1191 msgid "_Normalize Volume" msgstr "_Lautstärke normalisieren" -#: gtkpod.glade:1217+#: data/gtkpod.glade:1227 msgid "_Displayed Tracks" msgstr "_Angezeigte Stücke" -#: gtkpod.glade:1226+#: data/gtkpod.glade:1236 msgid "_All Tracks" msgstr "_Alle Stücke" -#: gtkpod.glade:1235+#: data/gtkpod.glade:1245 msgid "_Newly Added Tracks" msgstr "_Neu hinzugefügte Stücke" -#: gtkpod.glade:1254+#: data/gtkpod.glade:1264 msgid "Synchronise Contacts, Calendar and Notes" msgstr "Kontakte, Kalender und Notizen abgleichen" -#: gtkpod.glade:1255+#: data/gtkpod.glade:1265 msgid "Synchronize All" msgstr "Alles abgleichen" -#: gtkpod.glade:1264+#: data/gtkpod.glade:1274 msgid "Synchronize Contacts" msgstr "Kontakte abgleichen" -#: gtkpod.glade:1273+#: data/gtkpod.glade:1283 msgid "Synchronize Calendar" msgstr "Kalender abgleichen" -#: gtkpod.glade:1282+#: data/gtkpod.glade:1292 msgid "Synchronize Notes" msgstr "Notizen abgleichen" -#: gtkpod.glade:1295+#: data/gtkpod.glade:1305 msgid "_Help" msgstr "_Hilfe" -#: gtkpod.glade:1304+#: data/gtkpod.glade:1314 msgid "_About" msgstr "_Über" -#: gtkpod.glade:1344+#: data/gtkpod.glade:1354 msgid "" "Try to load contents of all connected iPods. For each iPod a separate " "repository must be set up."-msgstr "Versuche den Inhalt aller angeschlossenen iPods zu laden. Für jeden iPod muss ein separates Verzeichnis existieren."+msgstr ""+"Versuche den Inhalt aller angeschlossenen iPods zu laden. Für jeden iPod "+"muss ein separates Verzeichnis existieren." -#: gtkpod.glade:1345+#: data/gtkpod.glade:1355 msgid "Load iPod(s)" msgstr "iPod(s) einlesen" -#: gtkpod.glade:1362+#: data/gtkpod.glade:1372 msgid "Write all changes made to the disk and the iPod(s)." msgstr "Alle Änderungen auf Festplatte und iPod(s) sichern." -#: gtkpod.glade:1363 src/context_menus.c:507+#: data/gtkpod.glade:1373 src/context_menus.c:808 msgid "Save Changes" msgstr "Änderungen sichern" -#: gtkpod.glade:1380+#: data/gtkpod.glade:1390 msgid "Add Files or Directories" msgstr "Dateien oder Verzeichnisse hinzufügen." -#: gtkpod.glade:1381+#: data/gtkpod.glade:1391 msgid "Files" msgstr "Dateien" -#: gtkpod.glade:1398+#: data/gtkpod.glade:1408 msgid "Add Directories Recursively" msgstr "Verzeichnisse rekursiv hinzufügen" -#: gtkpod.glade:1399+#: data/gtkpod.glade:1409 msgid "Dirs" msgstr "Verzeichnisse" -#: gtkpod.glade:1416+#: data/gtkpod.glade:1426 msgid "Add playlist from file" msgstr "Wiedergabeliste aus Datei hinzufügen" -#: gtkpod.glade:1417 src/display_spl.c:105+#: data/gtkpod.glade:1427 src/display_spl.c:105 msgid "Playlist" msgstr "Wiedergabeliste" -#: gtkpod.glade:1434+#: data/gtkpod.glade:1444 msgid "Create New Playlist" msgstr "Neue Wiedergabeliste erstellen" -#: gtkpod.glade:1435+#: data/gtkpod.glade:1445 msgid "New PL" msgstr "Neue Wiedergabeliste" -#: gtkpod.glade:1451-msgid "Stop Display Update"-msgstr "Aktualisierung der Anzeige abbrechen"+#: data/gtkpod.glade:1572+#, fuzzy+msgid "Album Art"+msgstr "Album" -#: gtkpod.glade:1452-msgid "Stop"-msgstr "Stopp"+#: data/gtkpod.glade:1634+msgid "<"+msgstr "" -#: gtkpod.glade:1625+#: data/gtkpod.glade:1668+msgid ">"+msgstr ""++#: data/gtkpod.glade:1844 msgid "About gtkpod" msgstr "Über gtkpod" -#: gtkpod.glade:1752+#: data/gtkpod.glade:1971 msgid "Credits" msgstr "Danksagung" -#: gtkpod.glade:1810+#: data/gtkpod.glade:2029 msgid "Translators" msgstr "Übersetzer" -#: gtkpod.glade:1868+#: data/gtkpod.glade:2087 msgid "special_sorttab -- Don't translate!" msgstr "special_sorttab -- Don't translate!\"" -#: gtkpod.glade:1903+#: data/gtkpod.glade:2122 msgid " Logic: " msgstr " Logik:" -#: gtkpod.glade:1929+#: data/gtkpod.glade:2148 msgid "Any (OR)" msgstr "Eines (ODER)" -#: gtkpod.glade:1948+#: data/gtkpod.glade:2167 msgid "All (AND)" msgstr "Alle (UND)" -#: gtkpod.glade:2001+#: data/gtkpod.glade:2220 msgid "0" msgstr "0" -#: gtkpod.glade:2020+#: data/gtkpod.glade:2239 msgid "1" msgstr "1" -#: gtkpod.glade:2039+#: data/gtkpod.glade:2258 msgid "2" msgstr "2" -#: gtkpod.glade:2058+#: data/gtkpod.glade:2277 msgid "3" msgstr "3" -#: gtkpod.glade:2077+#: data/gtkpod.glade:2296 msgid "4" msgstr "4" -#: gtkpod.glade:2096+#: data/gtkpod.glade:2315 msgid "5" msgstr "5" -#: gtkpod.glade:2135+#: data/gtkpod.glade:2354 msgid "Select '0' for no lower limit." msgstr "'0' wählen für 'keine untere Schranke'." -#: gtkpod.glade:2156+#: data/gtkpod.glade:2375 msgid " <= cts <= " msgstr " <= num <= " -#: gtkpod.glade:2181+#: data/gtkpod.glade:2400 msgid "Select '-1' for no upper limit." msgstr "'-1' wählen für 'keine obere Schranke'." -#: gtkpod.glade:2224 gtkpod.glade:2301 gtkpod.glade:2471+#: data/gtkpod.glade:2443 data/gtkpod.glade:2520 data/gtkpod.glade:2690 msgid "" "'DD/MM/YYYY HH:MM < d < DD/MM/YYYY HH:MM' or similar. Press 'enter' when " "finished."@@ -550,43 +568,45 @@ "z.B. 'TT/MM/JJJJ SS:MM < d < TT/MM/JJJJ SS:MM' oder ähnliches. Nach der " "Eingabe bitte 'Return' drücken." -#: gtkpod.glade:2270 gtkpod.glade:2347 gtkpod.glade:2517 gtkpod.glade:2696+#: data/gtkpod.glade:2489 data/gtkpod.glade:2566 data/gtkpod.glade:2736+#: data/gtkpod.glade:2915 msgid "Calendar" msgstr "Kalender" -#: gtkpod.glade:2372+#: data/gtkpod.glade:2591 msgid "Specify interval" msgstr "Intervall angeben" -#: gtkpod.glade:2374 src/display_spl.c:98 src/misc_conversion.c:78+#: data/gtkpod.glade:2593 src/display_spl.c:98 src/misc_conversion.c:77 msgid "Playcount" msgstr "Wiedergabezähler" -#: gtkpod.glade:2397 src/display_spl.c:101 src/misc_conversion.c:79+#: data/gtkpod.glade:2616 src/display_spl.c:101 src/misc_conversion.c:78 msgid "Rating" msgstr "Bewertung" -#: gtkpod.glade:2420 src/display_songs.c:1951+#: data/gtkpod.glade:2639 src/display_tracks.c:1990 msgid "Played" msgstr "Gespielt" -#: gtkpod.glade:2443 src/display_songs.c:1954+#: data/gtkpod.glade:2662 src/display_tracks.c:1993 msgid "Modified" msgstr "Modifiziert" -#: gtkpod.glade:2542 src/display_songs.c:1957 src/display_sorttabs.c:3218+#: data/gtkpod.glade:2761 src/display_sorttabs.c:3223+#: src/display_tracks.c:1996 msgid "Added" msgstr "Hinzugefügt" -#: gtkpod.glade:2587+#: data/gtkpod.glade:2806 msgid "Display tracks that match the criteria entered above." msgstr "Stücke anzeigen, welche die oben genannten Kriterien erfüllen." -#: gtkpod.glade:2630 gtkpod.glade:12009+#: data/gtkpod.glade:2849 data/gtkpod.glade:12252 msgid "_Display" msgstr "_Anzeige" -#: gtkpod.glade:2666+#: data/gtkpod.glade:2885 msgid "" "Automatically start displaying tracks that match the criteria entered above. " "If not selected, you must press 'Display' to start displaying."@@ -595,64 +615,64 @@ "automatisch starten. Wenn diese Option nicht aktiviert ist, müssen Sie " "'Anzeige' drücken." -#: gtkpod.glade:2668+#: data/gtkpod.glade:2887 msgid "Start display automatically" msgstr "Anzeige automatisch starten" -#: gtkpod.glade:2743+#: data/gtkpod.glade:2962 msgid "Sorttab: " msgstr "Sortierungseintrag: " -#: gtkpod.glade:2787+#: data/gtkpod.glade:3006 msgid " " msgstr " " -#: gtkpod.glade:2813+#: data/gtkpod.glade:3032 msgid "Category: " msgstr "Kategorie: " -#: gtkpod.glade:2894+#: data/gtkpod.glade:3113 msgid "Please specify a time interval" msgstr "Bitte Zeitintervall angeben" -#: gtkpod.glade:2943+#: data/gtkpod.glade:3162 msgid "Lower Margin" msgstr "Untere Grenze" -#: gtkpod.glade:2994 gtkpod.glade:3208+#: data/gtkpod.glade:3213 data/gtkpod.glade:3427 msgid "Time:" msgstr "Zeit:" -#: gtkpod.glade:3037 gtkpod.glade:3251+#: data/gtkpod.glade:3256 data/gtkpod.glade:3470 msgid ":" msgstr ":" -#: gtkpod.glade:3114+#: data/gtkpod.glade:3333 msgid "No lower margin" msgstr "Keine untere Grenze" -#: gtkpod.glade:3157+#: data/gtkpod.glade:3376 msgid "Upper margin" msgstr "Obere Grenze" -#: gtkpod.glade:3328+#: data/gtkpod.glade:3547 msgid "No upper margin" msgstr "Keine obere Grenze" -#: gtkpod.glade:3426+#: data/gtkpod.glade:3645 msgid "Sorting Options" msgstr "Sortieroptionen" -#: gtkpod.glade:3458+#: data/gtkpod.glade:3677 msgid "<b>Sort Order</b>" msgstr "<b>Sortier-Reihenfolge</b>" -#: gtkpod.glade:3489 gtkpod.glade:4762 gtkpod.glade:11638 gtkpod.glade:12134-#: gtkpod.glade:12249+#: data/gtkpod.glade:3708 data/gtkpod.glade:4981 data/gtkpod.glade:11917+#: data/gtkpod.glade:12391 data/gtkpod.glade:12506 msgid " " msgstr " " -#: gtkpod.glade:3521+#: data/gtkpod.glade:3740 msgid "" "In order to save the displayed track order to the iPod choose 'Save " "Displayed Track Order' from the 'Edit' menu or select 'Auto Store' below."@@ -661,47 +681,47 @@ "'Dargestellte Reihenfolge speichern' im 'Bearbeiten' Menü oder wählen die " "Option \"Autom. speichern\" unten aus." -#: gtkpod.glade:3905+#: data/gtkpod.glade:4124 msgid "Ascending" msgstr "Aufsteigend" -#: gtkpod.glade:3953+#: data/gtkpod.glade:4172 msgid "Descending" msgstr "Absteigend" -#: gtkpod.glade:4001+#: data/gtkpod.glade:4220 msgid "None" msgstr "Keine" -#: gtkpod.glade:4048 src/display_playlists.c:2106+#: data/gtkpod.glade:4267 src/display_playlists.c:2176 msgid "Playlists" msgstr "Wiedergabelisten" -#: gtkpod.glade:4097+#: data/gtkpod.glade:4316 msgid "Sorttabs" msgstr "Sortierungseinträge" -#: gtkpod.glade:4146+#: data/gtkpod.glade:4365 msgid "Tracks" msgstr "Stücke" -#: gtkpod.glade:4306+#: data/gtkpod.glade:4525 msgid "Auto Store" msgstr "Autom. speichern" -#: gtkpod.glade:4349+#: data/gtkpod.glade:4568 msgid "Please refer to the notice below." msgstr "Bitte beachten Sie den Hinweis weiter unten." -#: gtkpod.glade:4383 gtkpod.glade:4564 src/details.c:1118+#: data/gtkpod.glade:4602 data/gtkpod.glade:4783 src/details.c:1175 msgid "n/a" msgstr "---" -#: gtkpod.glade:4613+#: data/gtkpod.glade:4832 msgid "Sort tracks according to: " msgstr "Sortiere Stücke nach: " -#: gtkpod.glade:4647+#: data/gtkpod.glade:4866 msgid "" "You can also use the table headers, but this allows you to sort according to " "a column that is not displayed."@@ -709,7 +729,7 @@ "Sie können auch die Spaltenköpfe anklicken, aber diese Option ermöglicht es " "auch nach Spalten zu sortieren, die nicht angezeigt werden." -#: gtkpod.glade:4683+#: data/gtkpod.glade:4902 msgid "" "If checked, sorting will be case sensitive. Please note that case sensitive " "sorting will not work well with most charsets."@@ -718,64 +738,64 @@ "Kleinschreibung beachtet. Mit den meisten Zeichensätzen funktioniert diese " "Funktion jedoch nicht wie gewünscht." -#: gtkpod.glade:4685+#: data/gtkpod.glade:4904 msgid "Sorting case sensitive" msgstr "Beim Sortieren Groß-/Kleinschreibung beachten" -#: gtkpod.glade:4731+#: data/gtkpod.glade:4950 msgid "<b>Ignore Frequent Words</b>" msgstr "<b>Ignoriere oft verwendete Wörter</b>" -#: gtkpod.glade:4831+#: data/gtkpod.glade:5050 msgid "Ignore these words when at the beginning of the following fields:" msgstr "Ignoriere folgende Wörter, wenn Sie am Anfang von Feldern stehen:" -#: gtkpod.glade:5106+#: data/gtkpod.glade:5325 msgid "gtkpod Info" msgstr "gtkpod Info" -#: gtkpod.glade:5427 gtkpod.glade:5514 gtkpod.glade:5543 gtkpod.glade:6261-#: gtkpod.glade:6406+#: data/gtkpod.glade:5646 data/gtkpod.glade:5733 data/gtkpod.glade:5762+#: data/gtkpod.glade:6480 data/gtkpod.glade:6625 msgid " " msgstr " " -#: gtkpod.glade:5832+#: data/gtkpod.glade:6051 msgid "Number of tracks" msgstr "Anzahl der Stücke" -#: gtkpod.glade:5862+#: data/gtkpod.glade:6081 msgid "Play time" msgstr "Spielzeit" -#: gtkpod.glade:5893+#: data/gtkpod.glade:6112 msgid "File size" msgstr "Dateigröße" -#: gtkpod.glade:5923+#: data/gtkpod.glade:6142 msgid "Number of playlists" msgstr "Anzahl der Wiedergabelisten" -#: gtkpod.glade:5953+#: data/gtkpod.glade:6172 msgid "Deleted tracks" msgstr "Gelöschte Stücke" -#: gtkpod.glade:5983+#: data/gtkpod.glade:6202 msgid "File size (deleted)" msgstr "Dateigröße (gelöscht)" -#: gtkpod.glade:6013+#: data/gtkpod.glade:6232 msgid "Non-transferred tracks" msgstr "Nicht übertragene Stücke" -#: gtkpod.glade:6043+#: data/gtkpod.glade:6262 msgid "File size (non-transferred)" msgstr "Dateigröße (nicht übertragen)" -#: gtkpod.glade:6073+#: data/gtkpod.glade:6292 msgid "Effective free space" msgstr "Effektiv freier Platz" -#: gtkpod.glade:6103+#: data/gtkpod.glade:6322 msgid "" "Total\n" "(iPod)"@@ -783,7 +803,7 @@ "Insgesamt\n" "(iPod)" -#: gtkpod.glade:6135+#: data/gtkpod.glade:6354 msgid "" "Selected\n" "Playlist"@@ -791,7 +811,7 @@ "Ausgewählte\n" "Wiedergabeliste" -#: gtkpod.glade:6167+#: data/gtkpod.glade:6386 msgid "" "Displayed\n" "Tracks"@@ -799,7 +819,7 @@ "Angezeigte\n" "Stücke" -#: gtkpod.glade:6199+#: data/gtkpod.glade:6418 msgid "" "Selected\n" "Tracks"@@ -807,7 +827,7 @@ "Ausgewählte\n" "Stücke" -#: gtkpod.glade:6231+#: data/gtkpod.glade:6450 msgid "" "Total\n" "(local)"@@ -815,71 +835,73 @@ "Insgesamt\n" "(lokal)" -#: gtkpod.glade:6651+#: data/gtkpod.glade:6870+#, fuzzy msgid "label21" msgstr "label21" -#: gtkpod.glade:6746+#: data/gtkpod.glade:6965 msgid "Never show this dialogue again" msgstr "Diesen Dialog nie wieder zeigen" -#: gtkpod.glade:6791 gtkpod.glade:7135+#: data/gtkpod.glade:7010 data/gtkpod.glade:7354 msgid "window1" msgstr "window1" -#: gtkpod.glade:6850+#: data/gtkpod.glade:7069 msgid "_M3U" msgstr "_M3U" -#: gtkpod.glade:6869+#: data/gtkpod.glade:7088 msgid "_PLS" msgstr "_PLS" -#: gtkpod.glade:6907+#: data/gtkpod.glade:7126 msgid "" "If available, the local copy of the track is referenced in the playlist. " "Otherwise the file on the iPod is used." msgstr ""-"Falls verfügbar, wird die lokale Kopie des Stückes in die Wiedergabeliste eingetragen. "-"Andernfalls wird die Datei auf dem iPod verwendet."+"Falls verfügbar, wird die lokale Kopie des Stückes in die Wiedergabeliste "+"eingetragen. Andernfalls wird die Datei auf dem iPod verwendet." -#: gtkpod.glade:6909+#: data/gtkpod.glade:7128 msgid "_Prefer Local" msgstr "_Bevorzuge lokal" -#: gtkpod.glade:6927+#: data/gtkpod.glade:7146 msgid "" "The local copy of the track is referenced in the playlist. If the track is " "not available locally, an error message is displayed." msgstr "" "Die lokale Kopie des Stückes wird in der Wiedergabeliste eingetragen.\n"-"Falls das Stück lokal nicht verfügbar ist, wird eine Fehlermeldung ausgegeben."+"Falls das Stück lokal nicht verfügbar ist, wird eine Fehlermeldung "+"ausgegeben." -#: gtkpod.glade:6929+#: data/gtkpod.glade:7148 msgid "_Local" msgstr "_Lokal" -#: gtkpod.glade:6948+#: data/gtkpod.glade:7167 msgid "The track on the iPod is referenced in the playlist file." msgstr "Die Datei auf dem iPod wird in die Wiedergabeliste eingetragen." -#: gtkpod.glade:6950+#: data/gtkpod.glade:7169 msgid "_iPod" msgstr "_iPod" -#: gtkpod.glade:6983+#: data/gtkpod.glade:7202 msgid "Playlist type:" msgstr "Art der Wiedergabeliste:" -#: gtkpod.glade:7012+#: data/gtkpod.glade:7231 msgid "Source:" msgstr "Quelle:" -#: gtkpod.glade:7055+#: data/gtkpod.glade:7274 msgid "Template for info field: " msgstr "Schablone für dieses Feld: " -#: gtkpod.glade:7080+#: data/gtkpod.glade:7299 msgid "" "Determines how the string for the info field should be constructed, e.g '%a/%" "A/%T - %t.mp3' or '%o'. You can separate several templates by semicolons -- "@@ -895,15 +917,15 @@ "Musikrichtung: %G, Stück-Nr.: %T, CD-Nr.: %C, Jahr: %Y, ursprünglicher " "Dateiname (benötigt 'Erweiterte Informationen'): %o, das Zeichen '%': %%." -#: gtkpod.glade:7111 gtkpod.glade:7355+#: data/gtkpod.glade:7330 data/gtkpod.glade:7574 msgid "gtkpod options" msgstr "gtkpod Optionen" -#: gtkpod.glade:7173+#: data/gtkpod.glade:7392 msgid "Filename Format: " msgstr "Format für Dateinamen: " -#: gtkpod.glade:7198+#: data/gtkpod.glade:7417 msgid "" "Determines the filename of tracks you copy from the iPod, e.g '%a/%A/%T - %t." "mp3' or '%o'. You can separate several patterns by semicolons -- gtkpod "@@ -920,11 +942,11 @@ "Dateiname (benötigt 'Erweiterte Informationen'): %o, die aktuelle " "Wiedergabeliste: %p, das Zeichen '%': %%." -#: gtkpod.glade:7203+#: data/gtkpod.glade:7422 msgid " " msgstr " " -#: gtkpod.glade:7225+#: data/gtkpod.glade:7444 msgid "" "Normally the charset specified when first importing the track will be used " "for the filename. If you set this option you can set a different charset "@@ -942,7 +964,7 @@ "eingelesen wurden, haben keine Informationen über den Zeichensatz " "gespeichert und der oben spezifizierte Zeichensatz wird verwendet." -#: gtkpod.glade:7227+#: data/gtkpod.glade:7446 msgid "" "Use selected charset (Preferences/'Adding/Updating/ Syncing')\n" "for this filename."@@ -950,108 +972,117 @@ "Gewählten Zeichensatz (Einstellungen/'Hinzufügen/Aktualisieren/Abgleichen')\n" "für diesen Dateinamen verwenden." -#: gtkpod.glade:7246+#: data/gtkpod.glade:7465 msgid "" "When copying from iPod no check is performed on whether the destination file " "exists. Enabling this option will make gtkpod check whether the length of " "the destination file is the same as the file in the iPod. If so the file is " "skipped, allowing a quick sync of the iPod's contents." msgstr ""-"Wird ein Stück vom iPod kopiert, wird normalerweise nicht überprüft, ob "-"die Datei im Zielverzeichnis bereits vorhanden ist. Wenn Sie diese Option "+"Wird ein Stück vom iPod kopiert, wird normalerweise nicht überprüft, ob die "+"Datei im Zielverzeichnis bereits vorhanden ist. Wenn Sie diese Option " "aktivieren, wird gtkpod anhand der Dateigröße überprüfen, ob die Datei "-"bereits existiert. Falls ja, wird das Kopieren übersprungen. Dies erlaubt es, einen schnellen Abgleich der Daten auf Ihrer Festplatte mit denen des iPods "-"vorzunehmen."+"bereits existiert. Falls ja, wird das Kopieren übersprungen. Dies erlaubt "+"es, einen schnellen Abgleich der Daten auf Ihrer Festplatte mit denen des "+"iPods vorzunehmen." -#: gtkpod.glade:7248+#: data/gtkpod.glade:7467 msgid "Check for existing files when copying from iPod." msgstr "Bei Kopieren vom iPod Überprüfen, ob Datei bereits existiert." -#: gtkpod.glade:7423+#: data/gtkpod.glade:7642 msgid "Playlist name:" msgstr "Name der Wiedergabeliste:" -#: gtkpod.glade:7492+#: data/gtkpod.glade:7711 msgid "Match al_l of the following" msgstr "Al_le der folgenden Regeln" -#: gtkpod.glade:7511+#: data/gtkpod.glade:7730 msgid "Match an_y of the following" msgstr "Mindestens _eine der folgenden Regeln" -#: gtkpod.glade:7531+#: data/gtkpod.glade:7750 msgid "_Ignore rules" msgstr "_Ignoriere die Regeln" -#: gtkpod.glade:7601+#: data/gtkpod.glade:7820 msgid "Rules" msgstr "Regeln" -#: gtkpod.glade:7638+#: data/gtkpod.glade:7857 msgid "_Limit to" msgstr "_Begrenzen auf" -#: gtkpod.glade:7689+#: data/gtkpod.glade:7908 msgid " Sort by:" msgstr " Sortieren nach:" -#: gtkpod.glade:7741+#: data/gtkpod.glade:7960 msgid "Match only _checked tracks" msgstr "Nur ausgewählte Stü_cke einbeziehen" -#: gtkpod.glade:7773+#: data/gtkpod.glade:7992 msgid "Live _updating" msgstr "Live Akt_ualisierung" -#: gtkpod.glade:7864+#: data/gtkpod.glade:8083 msgid "Preferences" msgstr "Einstellungen" -#: gtkpod.glade:7927+#: data/gtkpod.glade:8146 msgid "<b>Mountpoint and individual repository/playlist options</b>"-msgstr "<b>Einhängepunkt u. individuelle Datenbank/Wiedergabeliste Optionen</b>"+msgstr ""+"<b>Einhängepunkt u. individuelle Datenbank/Wiedergabeliste Optionen</b>" -#: gtkpod.glade:7990+#: data/gtkpod.glade:8209 msgid "Set mountpoint or edit repository options" msgstr "Einhängepunkt festlegen oder Datenbank-Optionen editieren" -#: gtkpod.glade:8037-msgid "<b>Import</b>"-msgstr "<b>Importieren</b>"--#: gtkpod.glade:8108-msgid "Automatically import iTunesDBs on startup"-msgstr "Beim Start die iTunes Datenbank automatisch importieren"--#: gtkpod.glade:8154+#: data/gtkpod.glade:8260 msgid "<b>Adding/Updating/Syncing</b>" msgstr "<b>Hinzufügen/Aktualisieren/Abgleichen</b>" -#: gtkpod.glade:8226+#: data/gtkpod.glade:8328 msgid "Exclude file mask(s)" msgstr "Schließe Dateimaske(n) aus" -#: gtkpod.glade:8251-msgid "Semicolon seperated list of file exclusion masks, e.g. '*.mp3'"-msgstr "Per Semikolon getrennte Liste der durch Maske ausgeschlossenen Stücke, z.B. '*.mp3'"+#: data/gtkpod.glade:8353+#, fuzzy+msgid "Semicolon separated list of file exclusion masks, e.g. '*.mp3'"+msgstr ""+"Per Semikolon getrennte Liste der durch Maske ausgeschlossenen Stücke, z.B. "+"'*.mp3'" -#: gtkpod.glade:8285+#: data/gtkpod.glade:8387 msgid "_Encoding (ID3, files):" msgstr "Kodi_erung (ID3, Dateien):" -#: gtkpod.glade:8320+#: data/gtkpod.glade:8422 msgid "" "gtkpod expects the ID3 tags and the filenames to be in the encoding " "specified here. You can change it for consecutive 'Add Files' and 'Add Dirs' " "operation. 'System Charset' is the charset used by your current locale." msgstr ""-"gtkpod erwartet, dass die Dateinamen und ID3 tags in der Kodierung vorliegen, "-"die hier angegeben wird. Diese kann natürlich zwischen zwei Aufrufen von "-"'Dateien hinzufügen' oder 'Verzeichnisse hinzufügen' geändert werden. "-"'Systemzeichensatz' bezeichnet die Standardkodierung der benutzten Sprache."+"gtkpod erwartet, dass die Dateinamen und ID3 tags in der Kodierung "+"vorliegen, die hier angegeben wird. Diese kann natürlich zwischen zwei "+"Aufrufen von 'Dateien hinzufügen' oder 'Verzeichnisse hinzufügen' geändert "+"werden. 'Systemzeichensatz' bezeichnet die Standardkodierung der benutzten "+"Sprache." -#: gtkpod.glade:8357+#: data/gtkpod.glade:8459 msgid ""+"Tracks can be transferred in the background as soon as they are added to an "+"iPod repository. Otherwise they will be transferred when ejecting the "+"contents of the iPod completely unchanged until then."+msgstr ""++#: data/gtkpod.glade:8461+msgid "Transfer tracks to the iPod in the background"+msgstr ""++#: data/gtkpod.glade:8480+msgid "" "Normally the charset specified when first importing the track will be used " "to update the track information. If you have chosen a wrong charset when " "first importing a track and want to correct it using the 'Update Track' "@@ -1070,41 +1101,45 @@ "eingelesen wurden, haben keine Informationen über den Zeichensatz " "gespeichert und der oben spezifizierte Zeichensatz wird verwendet." -#: gtkpod.glade:8359-msgid ""-"Use selected encoding also when updating \n"-"or syncing tracks"-msgstr "Gewählte Kodierung auch verwenden, wenn Stücke aktualisiert oder abgeglichen werden"+#: data/gtkpod.glade:8482+#, fuzzy+msgid "Use selected encoding also when updating or syncing tracks"+msgstr ""+"Gewählte Kodierung auch verwenden, wenn Stücke aktualisiert oder abgeglichen "+"werden" -#: gtkpod.glade:8379+#: data/gtkpod.glade:8501 msgid "If you check this, gtkpod will descend into subdirectories recursively."-msgstr "Wenn Sie diese Option wählen, werden Verzeichnisse rekursiv eingelesen."+msgstr ""+"Wenn Sie diese Option wählen, werden Verzeichnisse rekursiv eingelesen." -#: gtkpod.glade:8381+#: data/gtkpod.glade:8503 msgid "Add directories recursively" msgstr "Verzeichnisse rekursiv hinzufügen" -#: gtkpod.glade:8400-msgid "Duplicate Recognition is based on a (modified) md5 hash over the file."+#: data/gtkpod.glade:8522+#, fuzzy+msgid "Duplicate Recognition is based on a (modified) sha1 hash over the file." msgstr "" "Die Duplikat-Erkennung basiert auf einem (modifizierten) md5-Hash über die " "Dateien." -#: gtkpod.glade:8402+#: data/gtkpod.glade:8524 msgid "Don't allow file duplication" msgstr "Mehrfaches Einlesen von Stücken verhindern" -#: gtkpod.glade:8452-msgid "Display the list of duplicates that have been detected after adding files."+#: data/gtkpod.glade:8574+msgid ""+"Display the list of duplicates that have been detected after adding files." msgstr "" "Eine Liste der Duplikate anzeigen, die während des Hinzufügens von Stücken " "erkannt wurden." -#: gtkpod.glade:8454+#: data/gtkpod.glade:8576 msgid "Display info about detected duplicates" msgstr "Information über erkannte Duplikate anzeigen" -#: gtkpod.glade:8480+#: data/gtkpod.glade:8602 msgid "" "If the filename (full path) of an existing track matches that of a track to " "be added, this option allows you to update the information about the "@@ -1113,49 +1148,49 @@ "allow file duplication' option above." msgstr "" "Wenn der Dateiname (inkl. Pfad) eines bereits eingelesenen Stückes identisch "-"ist mit dem Namen eines neu einzulesenden Stückes, dann erlaubt diese "-"Option Ihnen, das alte Stück zu überschreiben. Normalerweise wird das "-"Einlesen des Stückes einfach übersprungen. Wenn sich die Datei nicht geändert "-"hat und Sie die Option 'Mehrfaches Einlesen von Stücken verhindern' "-"aktiviert haben, wird das Einlesen ebenfalls übersprungen."+"ist mit dem Namen eines neu einzulesenden Stückes, dann erlaubt diese Option "+"Ihnen, das alte Stück zu überschreiben. Normalerweise wird das Einlesen des "+"Stückes einfach übersprungen. Wenn sich die Datei nicht geändert hat und Sie "+"die Option 'Mehrfaches Einlesen von Stücken verhindern' aktiviert haben, "+"wird das Einlesen ebenfalls übersprungen." -#: gtkpod.glade:8482+#: data/gtkpod.glade:8604 msgid "" "When adding dirs/files, update information of\n" "existing tracks with identical filenames" msgstr ""-"Beim Hinzufügen von Stücken bereits eingelesene"-"Stücke mit demselben Dateinamen aktualisieren."+"Beim Hinzufügen von Stücken bereits eingeleseneStücke mit demselben "+"Dateinamen aktualisieren." -#: gtkpod.glade:8533+#: data/gtkpod.glade:8655 msgid "Display a list of tracks that could actually be updated." msgstr "" "Nach dem Aktualisieren eine Liste der Stücke anzeigen,\n" "die tatsächlich aktualisiert werden könnten." -#: gtkpod.glade:8535+#: data/gtkpod.glade:8657 msgid "Display info about updated tracks" msgstr "Informationen über aktualisierte Stücke anzeigen" -#: gtkpod.glade:8592+#: data/gtkpod.glade:8714 msgid "Display a list of tracks that could not be updated." msgstr "" "Liste der Stücke anzeigen, bei denen die Aktualisierung\n" "nicht vorgenommen werden konnte." -#: gtkpod.glade:8594+#: data/gtkpod.glade:8716 msgid "Display info about non-updated tracks" msgstr "Informationen über nicht aktualisierte Stücke anzeigen" -#: gtkpod.glade:8620+#: data/gtkpod.glade:8742 msgid "When syncing playlists" msgstr "Beim Abgleich von Wiedergabelisten" -#: gtkpod.glade:8694+#: data/gtkpod.glade:8816 msgid "Confirm lists of directories" msgstr "Liste der Verzeichnisse bestätigen" -#: gtkpod.glade:8712 gtkpod.glade:17758+#: data/gtkpod.glade:8834 data/gtkpod.glade:19597 msgid "" "Normally, if a track is no longer present in the sync directory, it will be " "removed from the playlist, but not from the iPod or local repository.\n"@@ -1166,46 +1201,56 @@ "you want tracks to be removed, because removing from the master playlist " "means removing from the iPod." msgstr ""-"Normalerweise wird ein Stück, das nicht im Synchronisationsverzeichnis existiert, aus der Wiedergabeliste gelöscht, nicht aber auf dem iPod oder dem lokalen Verzeichnis. Wird diese Option gewählt, werden die Stücke vollständig gelöscht, falls ein Stück nicht in einer anderen Wiedergabeliste erscheint. "-"Hinweis: Bei Synchronisierung mit der 'Hauptwiedergabeliste' muss diese Option gewählt sein, wenn Stücke gelöscht werden sollen, da Löschen aus der Wiedergabeliste auch Löschen auf dem iPod bedeutet."+"Normalerweise wird ein Stück, das nicht im Synchronisationsverzeichnis "+"existiert, aus der Wiedergabeliste gelöscht, nicht aber auf dem iPod oder "+"dem lokalen Verzeichnis. Wird diese Option gewählt, werden die Stücke "+"vollständig gelöscht, falls ein Stück nicht in einer anderen Wiedergabeliste "+"erscheint. Hinweis: Bei Synchronisierung mit der 'Hauptwiedergabeliste' muss "+"diese Option gewählt sein, wenn Stücke gelöscht werden sollen, da Löschen "+"aus der Wiedergabeliste auch Löschen auf dem iPod bedeutet." -#: gtkpod.glade:8716 gtkpod.glade:17762+#: data/gtkpod.glade:8838 data/gtkpod.glade:19601+#, fuzzy msgid "" "Delete tracks that are no longer present from the\n"-"ipod or repository"-msgstr "Lösche Stücke, die nicht mehr auf dem iPod oder in der Datenbank vorhanden sind."+"iPod or repository"+msgstr ""+"Lösche Stücke, die nicht mehr auf dem iPod oder in der Datenbank vorhanden "+"sind." -#: gtkpod.glade:8735+#: data/gtkpod.glade:8857 msgid "This is the same option as in 'Edit/Delete Confirmation'" msgstr "" "Diese Option ist identisch mit der Sicherheitsabfrage \n" "beim 'Bearbeiten/Löschen'" -#: gtkpod.glade:8737 gtkpod.glade:17782+#: data/gtkpod.glade:8859 data/gtkpod.glade:19621 msgid "Confirm before removing tracks from the iPod or repository" msgstr ""-"Bestätigung vor dem vollständigen Löschen vom iPod "-"oder aus der Datenbank"+"Bestätigung vor dem vollständigen Löschen vom iPod oder aus der Datenbank" -#: gtkpod.glade:8756 gtkpod.glade:17800+#: data/gtkpod.glade:8878 data/gtkpod.glade:19639 msgid "" "Will show a list of tracks removed and a list of tracks newly added or " "updated."-msgstr "Zeigt eine Liste von gelöschten, neu hinzugefügten oder aktualisierten Stücken."+msgstr ""+"Zeigt eine Liste von gelöschten, neu hinzugefügten oder aktualisierten "+"Stücken." -#: gtkpod.glade:8758 gtkpod.glade:17802+#: data/gtkpod.glade:8880 data/gtkpod.glade:19641 msgid "Show summary of sync result" msgstr "Zeige Zusammenfassung nach Abgleich." -#: gtkpod.glade:8819+#: data/gtkpod.glade:8941 msgid "<b>Sync</b>" msgstr "<b>Abgleichen</b>" -#: gtkpod.glade:8875+#: data/gtkpod.glade:8997+#, fuzzy msgid "" "Highly recommended for faster import when taking advantage of the " "duplication recognition. Also, having the PC filenames allows writing "-"changed ID3 tags to disk, and even to reconstruct your ipod's contents in "+"changed ID3 tags to disk, and even to reconstruct your iPod's contents in " "case of file system corruption (change the \"transferred=\" entries in your " "backuped database)." msgstr ""@@ -1217,25 +1262,28 @@ "rekonstruieren (dazu müssen die 'transferred=' Einträge in der gesicherten " "Datenbank auf '0' gesetzt und 'offline' eingelesen werden)." -#: gtkpod.glade:8877+#: data/gtkpod.glade:8999+#, fuzzy msgid ""-"Write extended information (PC filenames,\n"-" MD5 hashes, encoding). Recommended."-msgstr "Erweiterte Informationen schreiben (PC Dateinamen, MD5-Prüfsummen, Kodierung). Empfohlen."+"Write extended information (PC filenames, SHA1 hashes,\n"+"encoding...). Recommended."+msgstr ""+"Erweiterte Informationen schreiben (PC Dateinamen, MD5-Prüfsummen, "+"Kodierung). Empfohlen." -#: gtkpod.glade:8921 gtkpod.glade:14688+#: data/gtkpod.glade:9043 data/gtkpod.glade:16224 msgid "_General" msgstr "All_gemein" -#: gtkpod.glade:8957+#: data/gtkpod.glade:9093 msgid "<b>Tag Reading</b>" msgstr "<b>Lesen von Tags</b>" -#: gtkpod.glade:9020+#: data/gtkpod.glade:9156 msgid "Read tags from file contents (e.g. ID3 tags in MP3 files)" msgstr "Tags aus der Datei lesen (z.B. ID3 Tags bei MP3 Dateien)" -#: gtkpod.glade:9039 gtkpod.glade:9413+#: data/gtkpod.glade:9175 data/gtkpod.glade:9549 msgid "" "artist: %a, album: %A, composer: %c, title: %t, genre: %G, track nr: %T, CD " "nr: %C, year: %Y, skip data: %*, the character '%': %%. You can separate "@@ -1248,65 +1296,70 @@ "die auf den Filenamen passt, wird verwendet. Beispiel: '%a - %A/%T %t.mp3;%t." "wav'." -#: gtkpod.glade:9041+#: data/gtkpod.glade:9177 msgid "Use this template to parse filename for tag information:"-msgstr "Diese Schablone verwenden, um aus dem Dateinamen die Tags zu bestimmen:"+msgstr ""+"Diese Schablone verwenden, um aus dem Dateinamen die Tags zu bestimmen:" -#: gtkpod.glade:9118+#: data/gtkpod.glade:9254 msgid "Overwrite tags that are already set" msgstr "Tags, die bereits gesetzt sind, überschreiben." -#: gtkpod.glade:9151+#: data/gtkpod.glade:9287 msgid "" "As a last resort set the following tags to the\n" "filename if they are (still) empty:"-msgstr "Falls Tags (immer noch) nicht gesetzt sind, die folgenden Tags mit dem Dateinamen initialisieren:"+msgstr ""+"Falls Tags (immer noch) nicht gesetzt sind, die folgenden Tags mit dem "+"Dateinamen initialisieren:" -#: gtkpod.glade:9187 src/display_sorttabs.c:2942 src/display_spl.c:85-#: src/misc_conversion.c:62+#: data/gtkpod.glade:9323 src/display_sorttabs.c:2943 src/display_spl.c:85+#: src/misc_conversion.c:61 msgid "Artist" msgstr "Künstler" -#: gtkpod.glade:9209 src/display_sorttabs.c:2948 src/display_spl.c:89-#: src/misc_conversion.c:64+#: data/gtkpod.glade:9345 src/display_sorttabs.c:2949 src/display_spl.c:89+#: src/misc_conversion.c:63 msgid "Genre" msgstr "Genre" #. 0-#: gtkpod.glade:9231 src/display_sorttabs.c:2945 src/display_spl.c:84-#: src/misc_conversion.c:61+#: data/gtkpod.glade:9367 src/display_sorttabs.c:2946 src/display_spl.c:84+#: src/misc_conversion.c:60 msgid "Album" msgstr "Album" #. 5-#: gtkpod.glade:9253 src/display_spl.c:97 src/misc_conversion.c:66+#: data/gtkpod.glade:9389 src/display_spl.c:97 src/misc_conversion.c:65 msgid "Composer" msgstr "Komponist" -#: gtkpod.glade:9275 src/display_sorttabs.c:2954 src/display_spl.c:83-#: src/misc_conversion.c:63+#: data/gtkpod.glade:9411 src/display_sorttabs.c:2955 src/display_spl.c:83+#: src/misc_conversion.c:62 msgid "Title" msgstr "Titel" -#: gtkpod.glade:9330+#: data/gtkpod.glade:9466 msgid "<b>Coverart</b>" msgstr "<b>Cover-Bild</b>" -#: gtkpod.glade:9392+#: data/gtkpod.glade:9528 msgid "" "Music files can have images embedded in the APIC tag. Currently this is only " "supported for MP3 files."-msgstr "Musikdateien können Bilder im 'APIC Tag' enthalten. Dies wird derzeit nur bei MP3-Dateien unterstützt."+msgstr ""+"Musikdateien können Bilder im 'APIC Tag' enthalten. Dies wird derzeit nur "+"bei MP3-Dateien unterstützt." -#: gtkpod.glade:9394+#: data/gtkpod.glade:9530 msgid "Read coverart from embedded APIC data" msgstr "Lese Cover-Bild aus den APIC Daten" -#: gtkpod.glade:9415+#: data/gtkpod.glade:9551 msgid "Add coverart from file using the following template" msgstr "Cover-Bild nach folgender Schablone aus Datei einlesen" -#: gtkpod.glade:9471+#: data/gtkpod.glade:9607 msgid "" "Determines the name of the file with the cover art. You can separate several " "patterns by semicolons which will be tried in order. Artist: %a, album: %A, "@@ -1324,130 +1377,140 @@ "Dateiname ohne Erweiterung: %O, die aktuelle Wiedergabelist: %p, das Zeichen " "'%': %%." -#: gtkpod.glade:9492+#: data/gtkpod.glade:9628 msgid "<b>Examples</b>" msgstr "<b>Beispiele</b>" -#: gtkpod.glade:9526+#: data/gtkpod.glade:9662 msgid "folder.jpg" msgstr "folder.jpg" -#: gtkpod.glade:9554+#: data/gtkpod.glade:9690 msgid "folder" msgstr "Mappe" -#: gtkpod.glade:9582+#: data/gtkpod.glade:9718 msgid "../%A.jpg" msgstr "../%A.jpg" -#: gtkpod.glade:9610+#: data/gtkpod.glade:9746 msgid "%A" msgstr "%A" -#: gtkpod.glade:9638+#: data/gtkpod.glade:9774 msgid "Use <i>folder.jpg</i> as cover art." msgstr "Benutze <i>folder.jpg</i> als Cover-Bild" -#: gtkpod.glade:9666+#: data/gtkpod.glade:9802 msgid "Use <i>folder.jpg</i>, <i>folder.png</i>..." msgstr "Benutze <i>folder.jpg</i>, <i>folder.png</i>..." -#: gtkpod.glade:9694+#: data/gtkpod.glade:9830+#, fuzzy msgid "Use <i>&lt;Album&gt;.jpg</i> in the parent directory" msgstr "Benutze <i>&lt;Album&gt;.jpg</i> im übergeordneten Verzeichnis" -#: gtkpod.glade:9722+#: data/gtkpod.glade:9858+#, fuzzy msgid "Use <i>&lt;Album&gt;.jpg</i>, <i>&lt;Album&gt;.png</i>..." msgstr "Benutze <i>&lt;Album&gt;.jpg</i>, <i>&lt;Album&gt;.png</i>..." -#: gtkpod.glade:9750+#: data/gtkpod.glade:9886 msgid "folder.jpg;%a.jpg" msgstr "folder.jpg;%a.jpg" -#: gtkpod.glade:9778+#: data/gtkpod.glade:9914+#, fuzzy msgid "First try <i>folder.jpg</i>, then <i>&lt;artist&gt;.jpg</i>" msgstr "Versuche zuerst <i>folder.jpg</i>, dann <i>&lt;Künstler&gt;.jpg</i>" -#: gtkpod.glade:9835+#: data/gtkpod.glade:9971 msgid "If both options are selected, embedded APIC data takes precedence." msgstr "Falls beide Optionen angewählt sind, werden die APIC-Daten verwendet." -#: gtkpod.glade:9887+#: data/gtkpod.glade:10023 msgid "<b>mserv</b>" msgstr "<b>mserv</b>" -#: gtkpod.glade:9949 gtkpod.glade:10175+#: data/gtkpod.glade:10085 data/gtkpod.glade:10311 msgid "Currently only rating is supported." msgstr "Gegenwärtig wird nur 'Bewertung' unterstützt." -#: gtkpod.glade:9951+#: data/gtkpod.glade:10087 msgid "Use mserv database to fill additional information" msgstr "Benutze die mserv Datenbank für zusätzliche Informationen" -#: gtkpod.glade:9979+#: data/gtkpod.glade:10115 msgid "Music Root:" msgstr "Stammverzeichnis für Musik:" -#: gtkpod.glade:10007+#: data/gtkpod.glade:10143 msgid "mserv database lookup will be done for music in this directory." msgstr "Die mserv Datenbank wird für Stücke in diesem Verzeichnis verwendet." -#: gtkpod.glade:10029+#: data/gtkpod.glade:10165 msgid "mserv Root:" msgstr "mserv Stammverzeichnis:" -#: gtkpod.glade:10057+#: data/gtkpod.glade:10193 msgid "Root directory of mserv database (trackinfo root)." msgstr "Stammverzeichnis für die mserv Datenbank (trackinfo root)." -#: gtkpod.glade:10079+#: data/gtkpod.glade:10215 data/gtkpod.glade:14568 msgid "Username:" msgstr "Benutzername:" -#: gtkpod.glade:10107+#: data/gtkpod.glade:10243 msgid "Username to be used for mserv database lookup."-msgstr "Benutzername, der zum Nachschlagen in der mserv Datenbank verwendet wird."+msgstr ""+"Benutzername, der zum Nachschlagen in der mserv Datenbank verwendet wird." -#: gtkpod.glade:10131 gtkpod.glade:10150 gtkpod.glade:12889 gtkpod.glade:12908-#: gtkpod.glade:13069 gtkpod.glade:13138 gtkpod.glade:17159 gtkpod.glade:17179-#: gtkpod.glade:17199 gtkpod.glade:17219 gtkpod.glade:17239 gtkpod.glade:17679-#: gtkpod.glade:18238 gtkpod.glade:18281 gtkpod.glade:18301 gtkpod.glade:18711+#: data/gtkpod.glade:10267 data/gtkpod.glade:10286 data/gtkpod.glade:13164+#: data/gtkpod.glade:13183 data/gtkpod.glade:13344 data/gtkpod.glade:13413+#: data/gtkpod.glade:13693 data/gtkpod.glade:13761 data/gtkpod.glade:13829+#: data/gtkpod.glade:13897 data/gtkpod.glade:13965 data/gtkpod.glade:18998+#: data/gtkpod.glade:19018 data/gtkpod.glade:19038 data/gtkpod.glade:19058+#: data/gtkpod.glade:19078 data/gtkpod.glade:19518 data/gtkpod.glade:20077+#: data/gtkpod.glade:20120 data/gtkpod.glade:20140 data/gtkpod.glade:20550 msgid "Browse" msgstr "Durchsuchen" -#: gtkpod.glade:10177+#: data/gtkpod.glade:10313 msgid "Show information about problems when accessing mserv"-msgstr "Informationen über Probleme während des Zugriffs auf die mserv Datenbank anzeigen."+msgstr ""+"Informationen über Probleme während des Zugriffs auf die mserv Datenbank "+"anzeigen." -#: gtkpod.glade:10223+#: data/gtkpod.glade:10363 msgid "_Track Info" msgstr "_Meta-Infos" -#: gtkpod.glade:10273+#: data/gtkpod.glade:10413 msgid "<b>Displayed Track Attributes</b>" msgstr "<b>Angezeigte Informationen</b>" -#: gtkpod.glade:11083+#: data/gtkpod.glade:11362 msgid "<b>Sort Tabs</b>" msgstr "<b>Sortierungseinträge</b>" -#: gtkpod.glade:11145+#: data/gtkpod.glade:11424 msgid "Keeps all compilation CDs grouped together in the artists sort tab."-msgstr "Alle Sampler-CDs im Filter-Eintrag 'Künstler' als 'Sampler' gruppieren."+msgstr ""+"Alle Sampler-CDs im Filter-Eintrag 'Künstler' als 'Sampler' gruppieren." -#: gtkpod.glade:11147+#: data/gtkpod.glade:11426 msgid "Group artists on compilation CDs" msgstr "Künstler auf Sampler-CDs gruppieren" -#: gtkpod.glade:11172+#: data/gtkpod.glade:11451 msgid "_Number of sort tabs:" msgstr "A_nzahl der Sortierungseinträge:" -#: gtkpod.glade:11252+#: data/gtkpod.glade:11531 msgid "<b>Automatically select...</b>" msgstr "<b>Wähle automatisch...</b>" -#: gtkpod.glade:11314+#: data/gtkpod.glade:11593 msgid "" "If you don't select the master playlist automatically, the initial database " "import is much faster because the display dosn't have to be updated."@@ -1456,118 +1519,84 @@ "der Import der iTunes Datenbank zu Beginn deutlich schneller, da die Anzeige " "nicht aktualisiert werden muss." -#: gtkpod.glade:11316+#: data/gtkpod.glade:11595 msgid "...master playlist" msgstr "...Hauptwiedergabeliste" -#: gtkpod.glade:11336+#: data/gtkpod.glade:11615 msgid "...entry 'All' in sort tab..." msgstr " ...Begriff 'Alle' im Sortierungseintrag..." -#: gtkpod.glade:11421+#: data/gtkpod.glade:11700 msgid "<b>Tooltips</b>" msgstr "<b>Werkzeugtipps</b>" -#: gtkpod.glade:11484+#: data/gtkpod.glade:11763 msgid "Display tooltips in main window" msgstr "Werkzeugtipps im Hauptfenster anzeigen" -#: gtkpod.glade:11504+#: data/gtkpod.glade:11783 msgid "Display tooltips in prefs window" msgstr "Werkzeugtipps im Fenster 'Einstellungen' anzeigen" -#: gtkpod.glade:11550+#: data/gtkpod.glade:11829 msgid "<b>Toolbar</b>" msgstr "<b>Werkzeugleiste</b>" -#: gtkpod.glade:11613+#: data/gtkpod.glade:11892 msgid "Display toolbar..." msgstr "Werkzeugleiste anzeigen..." -#: gtkpod.glade:11670+#: data/gtkpod.glade:11949 msgid "...as icons" msgstr "...als Symbol" -#: gtkpod.glade:11690+#: data/gtkpod.glade:11969 msgid "...as text" msgstr "...als Text" -#: gtkpod.glade:11711+#: data/gtkpod.glade:11990 msgid "...both as icons and text" msgstr "...als Text und Symbol" -#: gtkpod.glade:11772+#: data/gtkpod.glade:12051 msgid "<b>Misc</b>" msgstr "<b>Verschiedenes</b>" -#: gtkpod.glade:11834-msgid ""-"It is much faster to sort the display after all tracks have been added. Some "-"people might feel irritated by this behaviour and should uncheck this option."+#: data/gtkpod.glade:12113+msgid "This option will be re-activated when you upgrade gtkpod." msgstr ""-"Es ist deutlich schneller, die Sortierung vorzunehmen nachdem alle Stücke "-"hinzugefügt wurden. Wen dieses Verhalten irritiert, sollte diese Option "-"jedoch nicht wählen."+"Diese Option wird automatisch aktiviert, wenn eine neue Version von gtkpod "+"installiert wird." -#: gtkpod.glade:11836-msgid ""-"Temporarily disable sorting when changing playlist\n"-"or tab entry (faster!)"-msgstr ""-"Sortieren vorübergehend deaktivieren, wenn die "-"Wiedergabeliste oder der Sortierungseintrag gewechselt wird (schneller!)"--#: gtkpod.glade:11856-msgid ""-"The display can be blocked after changing a selection. The display update is "-"faster, but you have to wait until it's finished. When using this option, "-"sorting is also temporarily disabled (see option above)."-msgstr ""-"Die Anzei... [truncated message content]

Revision: 1536 Author: tmzullingerDate: 2007-06-08 20:51:23 -0700 (Fri, 08 Jun 2007)Log Message:-----------Add a .desktop file and reorganize the icons.Modified Paths:-------------- gtkpod/trunk/ChangeLog_detailed gtkpod/trunk/Makefile.am gtkpod/trunk/autogen.sh gtkpod/trunk/configure.in gtkpod/trunk/data/Makefile.am gtkpod/trunk/po/POTFILES.inAdded Paths:----------- gtkpod/trunk/data/gtkpod.desktop.in gtkpod/trunk/data/icons/ gtkpod/trunk/data/icons/32x32/ gtkpod/trunk/data/icons/32x32/Makefile.am gtkpod/trunk/data/icons/48x48/ gtkpod/trunk/data/icons/48x48/Makefile.am gtkpod/trunk/data/icons/64x64/ gtkpod/trunk/data/icons/64x64/Makefile.am gtkpod/trunk/data/icons/Makefile.amModified: gtkpod/trunk/ChangeLog_detailed===================================================================--- gtkpod/trunk/ChangeLog_detailed2007-06-09 00:58:05 UTC (rev 1535)+++ gtkpod/trunk/ChangeLog_detailed2007-06-09 03:51:23 UTC (rev 1536)@@ -23,6 +23,22 @@ po/POTFILES.skip: Fixup 'make distcheck' and add some files missing for i18n. +* configure.in+ Makefile.am+ data/gtkpod.desktop.in+ data/Makefile.am+ data/icons+ data/icons/48x48+ data/icons/48x48/Makefile.am+ data/icons/32x32+ data/icons/32x32/Makefile.am+ data/icons/Makefile.am+ data/icons/64x64+ data/icons/64x64/Makefile.am+ autogen.sh+ po/POTFILES.in:+ Add a .desktop file and reorganize the icons.+ 2007-06-05 P.G. Richardson <phantom_sf at users.sourceforge.net> * src/fetchcover.cModified: gtkpod/trunk/Makefile.am===================================================================--- gtkpod/trunk/Makefile.am2007-06-09 00:58:05 UTC (rev 1535)+++ gtkpod/trunk/Makefile.am2007-06-09 03:51:23 UTC (rev 1536)@@ -2,11 +2,19 @@ SUBDIRS = src po scripts data -EXTRA_DIST = \-autogen.sh \-TROUBLESHOOTING \+EXTRA_DIST =\+autogen.sh\+intltool-extract.in\+intltool-merge.in\+intltool-update.in\+TROUBLESHOOTING\ TODOandBUGS.txt +DISTCLEANFILES =\+intltool-extract\+intltool-merge\+intltool-update+ uninstall-hook: -rmdir --ignore-fail-on-non-empty $(DESTDIR)$(pkgdatadir)/data -rmdir --ignore-fail-on-non-empty $(DESTDIR)$(pkgdatadir)/scriptsModified: gtkpod/trunk/autogen.sh===================================================================--- gtkpod/trunk/autogen.sh2007-06-09 00:58:05 UTC (rev 1535)+++ gtkpod/trunk/autogen.sh2007-06-09 03:51:23 UTC (rev 1536)@@ -6,11 +6,11 @@ DIE=0 if [ -n "$GNOME2_DIR" ]; then-ACLOCAL_FLAGS="-I $GNOME2_DIR/share/aclocal $ACLOCAL_FLAGS"-LD_LIBRARY_PATH="$GNOME2_DIR/lib:$LD_LIBRARY_PATH"-PATH="$GNOME2_DIR/bin:$PATH"-export PATH-export LD_LIBRARY_PATH+ ACLOCAL_FLAGS="-I $GNOME2_DIR/share/aclocal $ACLOCAL_FLAGS"+ LD_LIBRARY_PATH="$GNOME2_DIR/lib:$LD_LIBRARY_PATH"+ PATH="$GNOME2_DIR/bin:$PATH"+ export PATH+ export LD_LIBRARY_PATH fi (test -f $srcdir/configure.in) || {@@ -27,7 +27,7 @@ DIE=1 } -(grep "^AC_PROG_INTLTOOL" $srcdir/configure.in >/dev/null) && {+(grep "^IT_PROG_INTLTOOL" $srcdir/configure.in >/dev/null) && { (intltoolize --version) < /dev/null > /dev/null 2>&1 || { echo echo "**Error**: You must have \`intltool' installed."@@ -60,13 +60,13 @@ (grep "sed.*POTFILES" $srcdir/configure.in) > /dev/null || \ (glib-gettextize --version) < /dev/null > /dev/null 2>&1 || { if [ -f /etc/debian_version ]- then- echo "**Error**: Please apt-get install libglib2.0-dev"- else- echo- echo "**Error**: You must have \`glib' installed."- echo "You can get it from: ftp://ftp.gtk.org/pub/gtk."-echo "When using packages, make sure you also install the -dev package."+ then+ echo "**Error**: Please apt-get install libglib2.0-dev"+ else+ echo+ echo "**Error**: You must have \`glib' installed."+ echo "You can get it from: ftp://ftp.gtk.org/pub/gtk."+ echo "When using packages, make sure you also install the -dev package." fi DIE=1 }@@ -118,32 +118,32 @@ aclocalinclude="$ACLOCAL_FLAGS" if grep "^AM_GLIB_GNU_GETTEXT" configure.in >/dev/null; then-echo "Creating $dr/aclocal.m4 ..."-test -r $dr/aclocal.m4 || touch $dr/aclocal.m4-echo "Running glib-gettextize... Ignore non-fatal messages."-echo "no" | glib-gettextize --force --copy-echo "Making $dr/aclocal.m4 writable ..."-test -r $dr/aclocal.m4 && chmod u+w $dr/aclocal.m4+ echo "Creating $dr/aclocal.m4 ..."+ test -r $dr/aclocal.m4 || touch $dr/aclocal.m4+ echo "Running glib-gettextize... Ignore non-fatal messages."+ echo "no" | glib-gettextize --force --copy+ echo "Making $dr/aclocal.m4 writable ..."+ test -r $dr/aclocal.m4 && chmod u+w $dr/aclocal.m4 fi- if grep "^AC_PROG_INTLTOOL" configure.in >/dev/null; then+ if grep "^IT_PROG_INTLTOOL" configure.in >/dev/null; then echo "Running intltoolize..."-intltoolize --copy --force --automake+ intltoolize --copy --force --automake fi if grep "^AM_PROG_XML_I18N_TOOLS" configure.in >/dev/null; then echo "Running xml-i18n-toolize..."-xml-i18n-toolize --copy --force --automake+ xml-i18n-toolize --copy --force --automake fi if grep "^AM_PROG_LIBTOOL" configure.in >/dev/null; then-if test -z "$NO_LIBTOOLIZE" ; then - echo "Running libtoolize..."- ${LIBTOOLIZE:-libtoolize} --force --copy-fi+ if test -z "$NO_LIBTOOLIZE" ; then + echo "Running libtoolize..."+ ${LIBTOOLIZE:-libtoolize} --force --copy+ fi fi echo "Running aclocal $aclocalinclude ..." ${ACLOCAL:-aclocal} $aclocalinclude if grep "^AM_CONFIG_HEADER" configure.in >/dev/null; then-echo "Running autoheader..."-${AUTOHEADER:-autoheader}+ echo "Running autoheader..."+ ${AUTOHEADER:-autoheader} fi echo "Running automake --gnu $am_opt ..." ${AUTOMAKE:-automake} --add-missing --gnu $am_optModified: gtkpod/trunk/configure.in===================================================================--- gtkpod/trunk/configure.in2007-06-09 00:58:05 UTC (rev 1535)+++ gtkpod/trunk/configure.in2007-06-09 03:51:23 UTC (rev 1536)@@ -12,6 +12,8 @@ AC_PROG_CC AM_PROG_CC_STDC +IT_PROG_INTLTOOL([0.33])+ dnl Only use -Wall if we have gcc if test "x$GCC" = "xyes"; then if test -z "`echo "$CFLAGS" | grep "\-Wall" 2> /dev/null`" ; then@@ -179,6 +181,10 @@ po/Makefile.in scripts/Makefile data/Makefile+data/icons/Makefile+data/icons/32x32/Makefile+data/icons/48x48/Makefile+data/icons/64x64/Makefile ]) echo "Modified: gtkpod/trunk/data/Makefile.am===================================================================--- gtkpod/trunk/data/Makefile.am2007-06-09 00:58:05 UTC (rev 1535)+++ gtkpod/trunk/data/Makefile.am2007-06-09 03:51:23 UTC (rev 1536)@@ -1,3 +1,10 @@+SUBDIRS = icons++desktopdir = $(datadir)/applications+desktop_in_files = gtkpod.desktop.in+desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)+@INTLTOOL_DESKTOP_RULE@+ appdatadir = $(pkgdatadir)/data appdata_DATA =\ gtkpod.glade\@@ -6,20 +13,19 @@ default-cover.png\ gtkpod-add-dirs.png\ gtkpod-add-files.png\-gtkpod-add-playlists.png \+gtkpod-add-playlists.png\+gtkpod-icon-32-2.png\ gtkpod-icon-32.png\-gtkpod-icon-32x32-2.png\-gtkpod-icon-32x32.png\ gtkpod-icon-48.png\-gtkpod-icon-48x48.png\-gtkpod-icon-64x64.png\ gtkpod-logo.png\ gtkpod-new-playlist.png\ gtkpod-read.png\ gtkpod-sync.png EXTRA_DIST = \+$(desktop_in_files)\ $(appdata_DATA) -CLEANFILES = \+CLEANFILES =\+$(desktop_DATA)\ gtkpod.gladepAdded: gtkpod/trunk/data/gtkpod.desktop.in===================================================================--- gtkpod/trunk/data/gtkpod.desktop.in (rev 0)+++ gtkpod/trunk/data/gtkpod.desktop.in2007-06-09 03:51:23 UTC (rev 1536)@@ -0,0 +1,8 @@+[Desktop Entry]+_Name=GtkPod+_GenericName=iPod Manager+_Comment=Manage music and video on an Apple iPod+Exec=gtkpod+Icon=gtkpod.png+Type=Application+Categories=GTK;AudioVideo;Added: gtkpod/trunk/data/icons/32x32/Makefile.am===================================================================--- gtkpod/trunk/data/icons/32x32/Makefile.am (rev 0)+++ gtkpod/trunk/data/icons/32x32/Makefile.am2007-06-09 03:51:23 UTC (rev 1536)@@ -0,0 +1,4 @@+appicondir = $(datadir)/icons/hicolor/32x32/apps+appicon_DATA = gtkpod.png++EXTRA_DIST = $(appicon_DATA)Added: gtkpod/trunk/data/icons/48x48/Makefile.am===================================================================--- gtkpod/trunk/data/icons/48x48/Makefile.am (rev 0)+++ gtkpod/trunk/data/icons/48x48/Makefile.am2007-06-09 03:51:23 UTC (rev 1536)@@ -0,0 +1,4 @@+appicondir = $(datadir)/icons/hicolor/48x48/apps+appicon_DATA = gtkpod.png++EXTRA_DIST = $(appicon_DATA)Added: gtkpod/trunk/data/icons/64x64/Makefile.am===================================================================--- gtkpod/trunk/data/icons/64x64/Makefile.am (rev 0)+++ gtkpod/trunk/data/icons/64x64/Makefile.am2007-06-09 03:51:23 UTC (rev 1536)@@ -0,0 +1,4 @@+appicondir = $(datadir)/icons/hicolor/64x64/apps+appicon_DATA = gtkpod.png++EXTRA_DIST = $(appicon_DATA)Added: gtkpod/trunk/data/icons/Makefile.am===================================================================--- gtkpod/trunk/data/icons/Makefile.am (rev 0)+++ gtkpod/trunk/data/icons/Makefile.am2007-06-09 03:51:23 UTC (rev 1536)@@ -0,0 +1,14 @@+SUBDIRS = 32x32 48x48 64x64++gtk_update_icon_cache = gtk-update-icon-cache -f -t $(datadir)/icons/hicolor++install-data-hook: update-icon-cache+uninstall-hook: update-icon-cache+update-icon-cache:+@-if test -z "$(DESTDIR)"; then \+echo "Updating Gtk icon cache."; \+$(gtk_update_icon_cache); \+else \+echo "*** Icon cache not updated. After (un)install, run this:"; \+echo "*** $(gtk_update_icon_cache)"; \+fiModified: gtkpod/trunk/po/POTFILES.in===================================================================--- gtkpod/trunk/po/POTFILES.in2007-06-09 00:58:05 UTC (rev 1535)+++ gtkpod/trunk/po/POTFILES.in2007-06-09 03:51:23 UTC (rev 1536)@@ -1,7 +1,8 @@ # List of source files containing translatable strings (output of-# ls src/*.[cl] data/*.glade | grep -vf po/POTFILES.skip+# ls src/*.[cl] data/*.glade data/*.desktop.in | grep -vf po/POTFILES.skip # in a clean checkout) +data/gtkpod.desktop.in data/gtkpod.glade src/charset.c src/clientserver.cThis was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 1546 Author: jcsjcsDate: 2007-06-13 07:44:42 -0700 (Wed, 13 Jun 2007)Log Message:-----------* src/prefs.c (read_prefs_get_key_value): don't strip whitespace from prefs values. This is none of this function's business! (Thanks to Todd for tracking this down)* src/display_sorttabs.c (st_create_notebook): set up compare function so that the ignore strings work right after startup. (Thanks to Todd for tracking this down)Modified Paths:-------------- gtkpod/trunk/ChangeLog_detailed gtkpod/trunk/src/display_sorttabs.c gtkpod/trunk/src/prefs.cModified: gtkpod/trunk/ChangeLog_detailed===================================================================--- gtkpod/trunk/ChangeLog_detailed2007-06-11 13:57:42 UTC (rev 1545)+++ gtkpod/trunk/ChangeLog_detailed2007-06-13 14:44:42 UTC (rev 1546)@@ -1,3 +1,13 @@+2007-06-13 Jorg Schuler <jcsjcs at users.sourceforge.net>++* src/prefs.c (read_prefs_get_key_value): don't strip+ whitespace from prefs values. This is none of this+ function's business! (Thanks to Todd for tracking this down)++* src/display_sorttabs.c (st_create_notebook): set up compare+ function so that the ignore strings work right after startup.+ (Thanks to Todd for tracking this down)+ 2007-06-08 Todd Zullinger <tmzullinger at users.sourceforge.net> * gtkpod.gladeModified: gtkpod/trunk/src/display_sorttabs.c===================================================================--- gtkpod/trunk/src/display_sorttabs.c2007-06-11 13:57:42 UTC (rev 1545)+++ gtkpod/trunk/src/display_sorttabs.c2007-06-13 14:44:42 UTC (rev 1546)@@ -261,6 +261,20 @@ } +/* set string compare function according to whether the ignore field+ is set or not */+static void st_set_string_compare_func (guint inst, guint page_num)+{+ gchar *buf;+ buf = g_strdup_printf ("sort_ign_field_%d", ST_to_T (page_num));+ if (prefs_get_int (buf))+sorttab[inst]->string_compare_func = compare_string_fuzzy;+ else+sorttab[inst]->string_compare_func = compare_string;+ g_free (buf);+}++ /* callback */ static void on_st_switch_page (GtkNotebook *notebook,@@ -268,7 +282,6 @@ guint page_num, gpointer user_data) {- gchar *buf; guint inst = GPOINTER_TO_UINT( user_data ); @@ -277,12 +290,7 @@ /* set compare function for strings (to speed up sorting) */ if (page_num != ST_CAT_SPECIAL) {-buf = g_strdup_printf ("sort_ign_field_%d", ST_to_T (page_num));-if (prefs_get_int (buf))- sorttab[inst]->string_compare_func = compare_string_fuzzy;-else- sorttab[inst]->string_compare_func = compare_string;-g_free (buf);+st_set_string_compare_func (inst, page_num); } space_data_update (); st_page_selected (notebook, page_num);@@ -3062,6 +3070,8 @@ page = prefs_get_int_index("st_category", inst); st->current_category = page; gtk_notebook_set_current_page (st->notebook, page);+ st_set_string_compare_func (inst, page);+ if (prefs_get_int("st_sort") != SORT_NONE) st_sort_inst (inst, prefs_get_int("st_sort")); @@ -3082,7 +3092,6 @@ for (inst=SORT_TAB_MAX-1; inst>=0; --inst) { sorttab[inst] = g_malloc0 (sizeof (SortTab));-sorttab[inst]->string_compare_func = compare_string; st_create_notebook (inst); } /* adjust number of visible sorttabs (cannot use st_show_visible()Modified: gtkpod/trunk/src/prefs.c===================================================================--- gtkpod/trunk/src/prefs.c2007-06-11 13:57:42 UTC (rev 1545)+++ gtkpod/trunk/src/prefs.c2007-06-13 14:44:42 UTC (rev 1546)@@ -602,8 +602,8 @@ if ((len > 0) && ((*value)[len - 1] == 0x0a)) (*value)[len - 1] = 0; - /* Strip whitespace */- g_strstrip (*value);+ /* Don't strip whitespace! If there is any, there's a reason for it. */+ /* g_strstrip (*value); */ return TRUE; }This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 1548 Author: jcsjcsDate: 2007-06-14 07:01:58 -0700 (Thu, 14 Jun 2007)Log Message:-----------* po/es.po: new version updated by Alejandro Lamas Davi?\195?\177a. make update-poModified Paths:-------------- gtkpod/trunk/ChangeLog_detailed gtkpod/trunk/po/de.po gtkpod/trunk/po/es.po gtkpod/trunk/po/fr.po gtkpod/trunk/po/gtkpod.pot gtkpod/trunk/po/he.po gtkpod/trunk/po/it.po gtkpod/trunk/po/ja.po gtkpod/trunk/po/sv.poModified: gtkpod/trunk/ChangeLog_detailed===================================================================--- gtkpod/trunk/ChangeLog_detailed2007-06-14 14:01:34 UTC (rev 1547)+++ gtkpod/trunk/ChangeLog_detailed2007-06-14 14:01:58 UTC (rev 1548)@@ -1,3 +1,7 @@+2007-06-14 Jorg Schuler <jcsjcs at users.sourceforge.net>++* po/es.po: new version updated by Alejandro Lamas Daviña.+ 2007-06-13 Jorg Schuler <jcsjcs at users.sourceforge.net> * src/prefs.c (read_prefs_get_key_value): don't stripModified: gtkpod/trunk/po/de.po===================================================================--- gtkpod/trunk/po/de.po2007-06-14 14:01:34 UTC (rev 1547)+++ gtkpod/trunk/po/de.po2007-06-14 14:01:58 UTC (rev 1548)@@ -82,7 +82,7 @@ msgstr "" "Project-Id-Version: de\n" "Report-Msgid-Bugs-To: \n"-"POT-Creation-Date: 2007-06-03 17:15-0400\n"+"POT-Creation-Date: 2007-06-14 22:57+0900\n" "PO-Revision-Date: 2007-03-15 22:33+0100\n" "Last-Translator: Kai-Ove\n" "Language-Team: <de...@li...>\n"@@ -92,771 +92,800 @@ "Plural-Forms: nplurals=2; plural=n != 1;\n" "X-Generator: KBabel 1.9.1\n" -#: data/gtkpod.glade:7-msgid "gtkpod"+#: ../data/gtkpod.desktop.in.h:1+#, fuzzy+msgid "GtkPod" msgstr "gtkpod" -#: data/gtkpod.glade:40-msgid "_File"-msgstr "_Datei"+#: ../data/gtkpod.desktop.in.h:2+msgid "Manage music and video on an Apple iPod"+msgstr "" -#: data/gtkpod.glade:49-msgid "_Load iPod(s)"-msgstr "i_Pod(s) einlesen"+#: ../data/gtkpod.desktop.in.h:3+msgid "iPod Manager"+msgstr "" -#: data/gtkpod.glade:69-msgid "_Save Changes"-msgstr "_Änderungen sichern"+#: ../data/gtkpod.glade.h:1+msgid " "+msgstr " " -#: data/gtkpod.glade:90-msgid "Add _Files"-msgstr "_Dateien hinzufügen"+#: ../data/gtkpod.glade.h:2+msgid " "+msgstr " " -#: data/gtkpod.glade:111-msgid "Add _Directory"-msgstr "_Verzeichnisse hinzufügen"+#: ../data/gtkpod.glade.h:3+msgid " "+msgstr " " -#: data/gtkpod.glade:132-msgid "Add _Playlist"-msgstr "_Wiedergabeliste hinzufügen"+#: ../data/gtkpod.glade.h:4+msgid " "+msgstr " " -#: data/gtkpod.glade:159-msgid "_Update Tracks from File"-msgstr "_Stücke aus Datei aktualisieren"+#: ../data/gtkpod.glade.h:5+msgid " Sort by:"+msgstr " Sortieren nach:" -#: data/gtkpod.glade:180 data/gtkpod.glade:232 data/gtkpod.glade:311-#: data/gtkpod.glade:363 data/gtkpod.glade:1102 data/gtkpod.glade:1154-#: data/gtkpod.glade:1200-msgid "Selected _Playlist"-msgstr "Ausgewählte _Wiedergabeliste"+#: ../data/gtkpod.glade.h:6+msgid " <= cts <= "+msgstr " <= num <= " -#: data/gtkpod.glade:189 data/gtkpod.glade:241 data/gtkpod.glade:320-#: data/gtkpod.glade:372 data/gtkpod.glade:1111 data/gtkpod.glade:1163-#: data/gtkpod.glade:1209-msgid "Selected Tab _Entry"-msgstr "Ausgewählter _Eintrag"+#: ../data/gtkpod.glade.h:7+msgid " Logic: "+msgstr " Logik:" -#: data/gtkpod.glade:198 data/gtkpod.glade:250 data/gtkpod.glade:329-#: data/gtkpod.glade:381 data/gtkpod.glade:498 data/gtkpod.glade:1120-#: data/gtkpod.glade:1172 data/gtkpod.glade:1218-msgid "Selected _Tracks"-msgstr "Ausgewählte _Stücke"+#: ../data/gtkpod.glade.h:9+#, no-c-format+msgid "%A"+msgstr "%A" -#: data/gtkpod.glade:211-msgid "Update _mserv Data from File"-msgstr "_mserv-Daten aktualisieren"+#: ../data/gtkpod.glade.h:10+msgid ""+"'DD/MM/YYYY HH:MM < d < DD/MM/YYYY HH:MM' or similar. Press 'enter' when "+"finished."+msgstr ""+"z.B. 'TT/MM/JJJJ SS:MM < d < TT/MM/JJJJ SS:MM' oder ähnliches. Nach der "+"Eingabe bitte 'Return' drücken." -#: data/gtkpod.glade:263-#, fuzzy-msgid "_Synchronize Playlist with Dir(s)"-msgstr "Wiedergabeliste mit Verzeichnis(sen) abgleichen"+#: ../data/gtkpod.glade.h:11+msgid "'aacgain' executable:"+msgstr "'aacgain'-Programm:" -#: data/gtkpod.glade:290-msgid "_Export Tracks from Database"-msgstr "E_xport aus der Datenbank"+#: ../data/gtkpod.glade.h:12+msgid "'mp3gain' executable:"+msgstr "'mp3gain'-Programm:" -#: data/gtkpod.glade:342-msgid "Create _Playlist File"-msgstr "_Erstelle Datei der Wiedergabeliste"+#: ../data/gtkpod.glade.h:13+msgid "(Checked)"+msgstr "(Gewählt)" -#: data/gtkpod.glade:400-msgid "_Create iPod's Directories"-msgstr "_iPod-Verzeichnis(se) erstellen"+#: ../data/gtkpod.glade.h:14+msgid "...as icons"+msgstr "...als Symbol" -#: data/gtkpod.glade:421-#, fuzzy-msgid ""-"Find orphan files (files with no track info in DB) and dangling tracks "-"(tracks with no corresponding files on iPod)"-msgstr ""-"Verwaiste Stücke (Stücke, für die kein Eintrag in der iTunesDB erscheint) "-"und verlorene Stücke (Stücke ohne Datei auf dem iPod) finden"+#: ../data/gtkpod.glade.h:15+msgid "...as text"+msgstr "...als Text" -#: data/gtkpod.glade:422-msgid "_Check iPod's Files"-msgstr "_Überprüfe iPod Dateien"+#: ../data/gtkpod.glade.h:16+msgid "...both as icons and text"+msgstr "...als Text und Symbol" -#: data/gtkpod.glade:450 data/gtkpod.glade:12948-msgid "_Edit"-msgstr "_Bearbeiten"+#: ../data/gtkpod.glade.h:17+msgid "...entry 'All' in sort tab..."+msgstr " ...Begriff 'Alle' im Sortierungseintrag..." -#: data/gtkpod.glade:459 src/context_menus.c:746-msgid "Edit Track Details"-msgstr "_Bearbeite Stücke"+#: ../data/gtkpod.glade.h:18+msgid "...master playlist"+msgstr "...Hauptwiedergabeliste" -#: data/gtkpod.glade:480-msgid "Tracks in Selected _Playlist"-msgstr "Stücke in ausgewählter _Wiedergabeliste"+#: ../data/gtkpod.glade.h:20+#, no-c-format+msgid "../%A.jpg"+msgstr "../%A.jpg" -#: data/gtkpod.glade:489-msgid "Tracks in Selected Tab _Entry"-msgstr "Stücke im ausgewählten _Sortierungseintrag"+#: ../data/gtkpod.glade.h:21+msgid "0"+msgstr "0" -#: data/gtkpod.glade:511 src/context_menus.c:659-msgid "Edit Smart Playlist"-msgstr "Intelligente Wiedergabeliste editieren"+#: ../data/gtkpod.glade.h:22+msgid "1"+msgstr "1" -#: data/gtkpod.glade:520-msgid "_Delete"-msgstr "_Löschen"+#: ../data/gtkpod.glade.h:23+msgid "2"+msgstr "2" -#: data/gtkpod.glade:541-msgid "Selected playlist"-msgstr "Ausgewählte Wiedergabeliste"+#: ../data/gtkpod.glade.h:24+msgid "3"+msgstr "3" -#: data/gtkpod.glade:550-msgid "Selected playlist including tracks from iPod"-msgstr "Ausgewählte Wiedergabeliste einschließlich der Stücke vom iPod"+#: ../data/gtkpod.glade.h:25+msgid "4"+msgstr "4" -#: data/gtkpod.glade:559-msgid "Selected playlist including tracks from database"-msgstr ""-"Ausgewählte Wiedergabeliste einschließlich der Stücke aus der Datenbank"+#: ../data/gtkpod.glade.h:26+msgid "5"+msgstr "5" -#: data/gtkpod.glade:568-msgid "Selected playlist including tracks from harddisk"+#: ../data/gtkpod.glade.h:27+msgid ":"+msgstr ":"++#: ../data/gtkpod.glade.h:28+msgid "<" msgstr ""-"Ausgewählte Wiedergabeliste einschließlich der Stücke von der Festplatte" -#: data/gtkpod.glade:583-msgid "Selected filter tab entry from playlist"-msgstr "Ausgewählter Filter-Eintrag der Wiedergabeliste"+#: ../data/gtkpod.glade.h:29+#, fuzzy+msgid "<b>Account Information</b>"+msgstr "<b>Sicherheitsabfrage beim Löschen</b>" -#: data/gtkpod.glade:592-msgid "Selected filter tab entry from iPod"-msgstr "Ausgewählter Filter-Eintrag vom iPod"+#: ../data/gtkpod.glade.h:30+msgid "<b>Adding/Updating/Syncing</b>"+msgstr "<b>Hinzufügen/Aktualisieren/Abgleichen</b>" -#: data/gtkpod.glade:601-msgid "Selected filter tab entry from database"-msgstr "Ausgewählter Filter-Eintrag der lokalen Datenbank"+#: ../data/gtkpod.glade.h:31+#, fuzzy+msgid "<b>Audioscrobbler</b>"+msgstr "<b>Werkzeugleiste</b>" -#: data/gtkpod.glade:610-msgid "Selected filter tab entry from harddisk"-msgstr "Ausgewählter Filter-Eintrag der Festplatte"+#: ../data/gtkpod.glade.h:32+msgid "<b>Auto-Generated Playlists</b>"+msgstr "<b>Automatisch generierte Wiedergabelisten</b>" -#: data/gtkpod.glade:625-msgid "Selected tracks from playlist"-msgstr "Ausgewählte Stücke aus der Wiedergabeliste"+#: ../data/gtkpod.glade.h:33+msgid "<b>Automatically select...</b>"+msgstr "<b>Wähle automatisch...</b>" -#: data/gtkpod.glade:634-msgid "Selected tracks from iPod"-msgstr "Ausgewählte Stücke vom iPod"+#: ../data/gtkpod.glade.h:34+msgid "<b>Calendar/Contacts/Notes</b>"+msgstr "<b>Kalender/Kontakte/Notizen</b>" -#: data/gtkpod.glade:643-msgid "Selected tracks from database"-msgstr "Ausgewählte Stücke aus der Datenbank"+#: ../data/gtkpod.glade.h:35+msgid "<b>Coverart</b>"+msgstr "<b>Cover-Bild</b>" -#: data/gtkpod.glade:652-msgid "Selected tracks from harddisk"-msgstr "Ausgewählte Stücke von der Festplatte"+#: ../data/gtkpod.glade.h:36+msgid "<b>Delete Confirmation</b>"+msgstr "<b>Sicherheitsabfrage beim Löschen</b>" -#: data/gtkpod.glade:671-msgid "_Create Playlists"-msgstr "_Erstelle Wiedergabelisten"+#: ../data/gtkpod.glade.h:37+msgid "<b>Displayed Track Attributes</b>"+msgstr "<b>Angezeigte Informationen</b>" -#: data/gtkpod.glade:692-msgid "Empty Playlist"-msgstr "Wiedergabeliste leeren"+#: ../data/gtkpod.glade.h:38+msgid "<b>Examples</b>"+msgstr "<b>Beispiele</b>" -#: data/gtkpod.glade:701 data/gtkpod.glade:7598 src/misc_playlist.c:96-#: src/repository.c:1356-msgid "Smart Playlist"-msgstr "Intelligente Wiedergabeliste"+#: ../data/gtkpod.glade.h:39+msgid "<b>Ignore Frequent Words</b>"+msgstr "<b>Ignoriere oft verwendete Wörter</b>" -#: data/gtkpod.glade:716-msgid "Random Playlist from Displayed Tracks"-msgstr "Zufällige aus den angezeigten Stücken"+#: ../data/gtkpod.glade.h:40+msgid "<b>Misc</b>"+msgstr "<b>Verschiedenes</b>" -#: data/gtkpod.glade:725-msgid "Containing Displayed Tracks"-msgstr "Aus den angezeigten Stücken"+#: ../data/gtkpod.glade.h:41+msgid "<b>Mountpoint and individual repository/playlist options</b>"+msgstr ""+"<b>Einhängepunkt u. individuelle Datenbank/Wiedergabeliste Optionen</b>" -#: data/gtkpod.glade:734-msgid "Containing Selected Tracks"-msgstr "Aus den ausgewählten Stücken"+#: ../data/gtkpod.glade.h:42+#, fuzzy+msgid "<b>On-the-fly Conversion</b>"+msgstr "<b>Sicherheitsabfrage beim Löschen</b>" -#: data/gtkpod.glade:743-msgid "One for each Artist"-msgstr "Eine für jeden Künstler"+#: ../data/gtkpod.glade.h:43+msgid "<b>Play</b>"+msgstr "<b>Wiedergabe</b>" -#: data/gtkpod.glade:752-msgid "One for each Album"-msgstr "Eine für jedes Album"+#: ../data/gtkpod.glade.h:44+msgid "<b>Playlists</b>"+msgstr "<b>Wiedergabeliste(n)</b>" -#: data/gtkpod.glade:761-msgid "One for each Genre"-msgstr "Eine für jedes Genre"+#: ../data/gtkpod.glade.h:45+msgid "<b>Please select mountpoint and your iPod model</b>"+msgstr "<b>Bitte Einhängepunkt und iPod Modell wählen</b>" -#: data/gtkpod.glade:770-msgid "One for each Composer"-msgstr "Eine für jeden Komponisten"+#: ../data/gtkpod.glade.h:46+msgid "<b>Repositories</b>"+msgstr "<b>Datenbanken</b>" -#: data/gtkpod.glade:779-msgid "One for each Year"-msgstr "Eine für jedes Jahr"+#: ../data/gtkpod.glade.h:47+msgid "<b>Sort Order</b>"+msgstr "<b>Sortier-Reihenfolge</b>" -#: data/gtkpod.glade:788-msgid "One for each Rating"-msgstr "Eine für jede Bewertung"+#: ../data/gtkpod.glade.h:48+msgid "<b>Sort Tabs</b>"+msgstr "<b>Sortierungseinträge</b>" -#: data/gtkpod.glade:797-msgid "Best Rated Tracks"-msgstr "Am besten bewertete Stücke"+#: ../data/gtkpod.glade.h:49+msgid "<b>Sync</b>"+msgstr "<b>Abgleichen</b>" -#: data/gtkpod.glade:806-msgid "Tracks Most Often Listened To"-msgstr "Am häufigsten gehörte Stücke"+#: ../data/gtkpod.glade.h:50+msgid "<b>Synchronization</b>"+msgstr "<b>Abgleich</b>" -#: data/gtkpod.glade:815-msgid "Most Recently Played Tracks"-msgstr "Zuletzt gespielte Stücke"+#: ../data/gtkpod.glade.h:51+msgid "<b>Tag Reading</b>"+msgstr "<b>Lesen von Tags</b>" -#: data/gtkpod.glade:824-msgid "All Tracks Played Since Last Time"-msgstr "Seit dem letzten Mal gespielte Stücke"+#: ../data/gtkpod.glade.h:52+msgid "<b>Toolbar</b>"+msgstr "<b>Werkzeugleiste</b>" -#: data/gtkpod.glade:833-msgid "All Tracks Never Listened To"-msgstr "Nie gehörte Stücke"+#: ../data/gtkpod.glade.h:53+msgid "<b>Tooltips</b>"+msgstr "<b>Werkzeugtipps</b>" -#: data/gtkpod.glade:842-msgid "All Tracks not Listed in any Playlist"-msgstr "In keiner Wiedergabeliste aufgeführte Stücke"+#: ../data/gtkpod.glade.h:54+msgid "<b>Track Editing</b>"+msgstr "<b>Bearbeiten von Stücken</b>" -#: data/gtkpod.glade:861-msgid "_Sorting"-msgstr "_Sortierung"+#: ../data/gtkpod.glade.h:55+msgid "<b>Volume Normalization</b>"+msgstr "<b>Lautstärkenormalisierung</b>" -#: data/gtkpod.glade:883-msgid "Randomize Current Playlist"-msgstr "_Aktuelle Wiedergabeliste zufällig sortieren"+#: ../data/gtkpod.glade.h:56+msgid "<b>mserv</b>"+msgstr "<b>mserv</b>" -#: data/gtkpod.glade:892-msgid "_Save Displayed Track Order"-msgstr "_Reihenfolge der angezeigten Stücke speichern"+#: ../data/gtkpod.glade.h:57+msgid ">"+msgstr "" -#: data/gtkpod.glade:920-msgid "Edit Repository/iPod Options"-msgstr "_Ändere Verzeichnis / iPod Optionen"+#: ../data/gtkpod.glade.h:58+msgid "About gtkpod"+msgstr "Über gtkpod" -#: data/gtkpod.glade:941-msgid "Edit _Preferences"-msgstr "_Einstellungen ändern"+#: ../data/gtkpod.glade.h:59+msgid "Add Directories Recursively"+msgstr "Verzeichnisse rekursiv hinzufügen" -#: data/gtkpod.glade:967-msgid "_View"-msgstr "_Ansicht"+#: ../data/gtkpod.glade.h:60+msgid "Add Files or Directories"+msgstr "Dateien oder Verzeichnisse hinzufügen." -#: data/gtkpod.glade:976-msgid "_Toolbar"-msgstr "Werkzeug_leiste"+#: ../data/gtkpod.glade.h:61+msgid "Add _Directory"+msgstr "_Verzeichnisse hinzufügen" -#: data/gtkpod.glade:986-msgid "_Tooltips"-msgstr "Werkzeug_tipps"+#: ../data/gtkpod.glade.h:62+msgid "Add _Files"+msgstr "_Dateien hinzufügen" -#: data/gtkpod.glade:996-msgid "_Info Window"-msgstr "Info _Fenster"+#: ../data/gtkpod.glade.h:63+msgid "Add _Playlist"+msgstr "_Wiedergabeliste hinzufügen" -#: data/gtkpod.glade:1007-msgid "_Conversion Log"-msgstr ""+#: ../data/gtkpod.glade.h:64+msgid "Add coverart from file using the following template"+msgstr "Cover-Bild nach folgender Schablone aus Datei einlesen" -#: data/gtkpod.glade:1017-msgid "_More Sort Tabs"-msgstr "_Mehr Sortierungseinträge"+#: ../data/gtkpod.glade.h:65+msgid "Add directories recursively"+msgstr "Verzeichnisse rekursiv hinzufügen" -#: data/gtkpod.glade:1038-msgid "_Less Sort Tabs"-msgstr "_Weniger Sortierungseinträge"+#: ../data/gtkpod.glade.h:66+msgid "Add new repository/iPod"+msgstr "Füge Verzeichnis/iPod hinzu" -#: data/gtkpod.glade:1059-msgid "_Arrange Sort Tabs"-msgstr "_Ordne Sortierungseinträge"+#: ../data/gtkpod.glade.h:67+msgid "Add playlist from file"+msgstr "Wiedergabeliste aus Datei hinzufügen" -#: data/gtkpod.glade:1072 data/gtkpod.glade:14338-msgid "_Tools"-msgstr "_Werkzeuge"+#: ../data/gtkpod.glade.h:68 ../src/display_sorttabs.c:3232+#: ../src/display_tracks.c:1996+msgid "Added"+msgstr "Hinzugefügt" -#: data/gtkpod.glade:1081-msgid "_Play Now"-msgstr "_Jetzt abspielen"+#: ../data/gtkpod.glade.h:69+msgid "Advanced Sorting Options"+msgstr "Weitere Sortieroptionen" -#: data/gtkpod.glade:1133-msgid "_Enqueue"-msgstr "_Vormerken zum Abspielen"+#. 0+#: ../data/gtkpod.glade.h:70 ../src/display_sorttabs.c:2954+#: ../src/display_spl.c:84 ../src/misc_conversion.c:60+msgid "Album"+msgstr "Album" -#: data/gtkpod.glade:1191-msgid "_Normalize Volume"-msgstr "_Lautstärke normalisieren"+#: ../data/gtkpod.glade.h:71+#, fuzzy+msgid "Album Art"+msgstr "Album" -#: data/gtkpod.glade:1227-msgid "_Displayed Tracks"-msgstr "_Angezeigte Stücke"+#: ../data/gtkpod.glade.h:72+msgid "All (AND)"+msgstr "Alle (UND)" -#: data/gtkpod.glade:1236-msgid "_All Tracks"-msgstr "_Alle Stücke"+#: ../data/gtkpod.glade.h:73+msgid "All Tracks Never Listened To"+msgstr "Nie gehörte Stücke" -#: data/gtkpod.glade:1245-msgid "_Newly Added Tracks"-msgstr "_Neu hinzugefügte Stücke"+#: ../data/gtkpod.glade.h:74+msgid "All Tracks Played Since Last Time"+msgstr "Seit dem letzten Mal gespielte Stücke" -#: data/gtkpod.glade:1264-msgid "Synchronise Contacts, Calendar and Notes"-msgstr "Kontakte, Kalender und Notizen abgleichen"+#: ../data/gtkpod.glade.h:75+msgid "All Tracks not Listed in any Playlist"+msgstr "In keiner Wiedergabeliste aufgeführte Stücke" -#: data/gtkpod.glade:1265-msgid "Synchronize All"-msgstr "Alles abgleichen"+#: ../data/gtkpod.glade.h:76+msgid "Also include tracks never played in \"Best Rated\" playlist"+msgstr ""+"Auch Stücke in die 'am besten' bewertete' Wiedergabeliste aufnehmen, die nie "+"gespielt wurden" -#: data/gtkpod.glade:1274-msgid "Synchronize Contacts"-msgstr "Kontakte abgleichen"+#: ../data/gtkpod.glade.h:77+msgid "Always write ID3v2.4 tags (only applies to MP3)"+msgstr "Immer ID3v2.4 Tags schreiben (trifft nur auf MP3 zu)" -#: data/gtkpod.glade:1283-msgid "Synchronize Calendar"-msgstr "Kalender abgleichen"+#: ../data/gtkpod.glade.h:78+msgid "Any (OR)"+msgstr "Eines (ODER)" -#: data/gtkpod.glade:1292-msgid "Synchronize Notes"-msgstr "Notizen abgleichen"+#: ../data/gtkpod.glade.h:79 ../src/display_sorttabs.c:2951+#: ../src/display_spl.c:85 ../src/misc_conversion.c:61+msgid "Artist"+msgstr "Künstler" -#: data/gtkpod.glade:1305-msgid "_Help"-msgstr "_Hilfe"+#: ../data/gtkpod.glade.h:80+msgid ""+"As a last resort set the following tags to the\n"+"filename if they are (still) empty:"+msgstr ""+"Falls Tags (immer noch) nicht gesetzt sind, die folgenden Tags mit dem "+"Dateinamen initialisieren:" -#: data/gtkpod.glade:1314-msgid "_About"-msgstr "_Über"+#: ../data/gtkpod.glade.h:82+msgid "Ascending"+msgstr "Aufsteigend" -#: data/gtkpod.glade:1354+#: ../data/gtkpod.glade.h:83 msgid ""-"Try to load contents of all connected iPods. For each iPod a separate "-"repository must be set up."+"Audio/Video\n"+"Audio\n"+"Video\n"+"Podcast\n"+"Video Podcast\n"+"Audiobook\n"+"Music Video\n"+"TV Show\n"+"TV Show & Music Video\n" msgstr ""-"Versuche den Inhalt aller angeschlossenen iPods zu laden. Für jeden iPod "-"muss ein separates Verzeichnis existieren." -#: data/gtkpod.glade:1355-msgid "Load iPod(s)"-msgstr "iPod(s) einlesen"+#: ../data/gtkpod.glade.h:93+msgid "Auto Store"+msgstr "Autom. speichern" -#: data/gtkpod.glade:1372-msgid "Write all changes made to the disk and the iPod(s)."-msgstr "Alle Änderungen auf Festplatte und iPod(s) sichern."+#: ../data/gtkpod.glade.h:94+msgid ""+"Automatically start displaying tracks that match the criteria entered above. "+"If not selected, you must press 'Display' to start displaying."+msgstr ""+"Die Anzeige der Stücke, welche die oben genannten Kriterien erfüllen, "+"automatisch starten. Wenn diese Option nicht aktiviert ist, müssen Sie "+"'Anzeige' drücken." -#: data/gtkpod.glade:1373 src/context_menus.c:808-msgid "Save Changes"-msgstr "Änderungen sichern"+#: ../data/gtkpod.glade.h:95+msgid "Before removing playlists or tracks from a playlist"+msgstr ""+"Vor dem Entfernen von Wiedergabelisten oder Stücken aus einer Wiedergabeliste" -#: data/gtkpod.glade:1390-msgid "Add Files or Directories"-msgstr "Dateien oder Verzeichnisse hinzufügen."+#: ../data/gtkpod.glade.h:96+msgid "Before removing tracks from the harddisk"+msgstr "Vor dem vollständigen Löschen auf der Festplatte" -#: data/gtkpod.glade:1391-msgid "Files"-msgstr "Dateien"+#: ../data/gtkpod.glade.h:97+msgid "Before removing tracks from the iPod"+msgstr "Vor dem vollständigen Löschen vom iPod" -#: data/gtkpod.glade:1408-msgid "Add Directories Recursively"-msgstr "Verzeichnisse rekursiv hinzufügen"+#: ../data/gtkpod.glade.h:98+msgid "Before removing tracks from the local database"+msgstr "Vor dem Entfernen aus der lokalen Datenbank" -#: data/gtkpod.glade:1409-msgid "Dirs"-msgstr "Verzeichnisse"+#: ../data/gtkpod.glade.h:99+msgid "Best Rated Tracks"+msgstr "Am besten bewertete Stücke" -#: data/gtkpod.glade:1426-msgid "Add playlist from file"-msgstr "Wiedergabeliste aus Datei hinzufügen"+#: ../data/gtkpod.glade.h:100+msgid "Browse"+msgstr "Durchsuchen" -#: data/gtkpod.glade:1427 src/display_spl.c:105-msgid "Playlist"-msgstr "Wiedergabeliste"+#: ../data/gtkpod.glade.h:101+#, fuzzy+msgid "Cache directory:"+msgstr "_Verzeichnisse hinzufügen" -#: data/gtkpod.glade:1444-msgid "Create New Playlist"-msgstr "Neue Wiedergabeliste erstellen"+#: ../data/gtkpod.glade.h:102+msgid "Calendar"+msgstr "Kalender" -#: data/gtkpod.glade:1445-msgid "New PL"-msgstr "Neue Wiedergabeliste"+#: ../data/gtkpod.glade.h:103+msgid "Calendar sync command:"+msgstr "Befehl zum Abgleich des Kalenders:" -#: data/gtkpod.glade:1572-#, fuzzy-msgid "Album Art"-msgstr "Album"+#: ../data/gtkpod.glade.h:104+msgid "Call automatically when synchronizing iTunesDB"+msgstr "Automatisch aufrufen, wenn die iTunesDB abgeglichen wird" -#: data/gtkpod.glade:1634-msgid "<"-msgstr ""+#: ../data/gtkpod.glade.h:105+msgid "Category: "+msgstr "Kategorie: " -#: data/gtkpod.glade:1668-msgid ">"+#: ../data/gtkpod.glade.h:106+msgid ""+"Change all tracks\n"+"simultaneously" msgstr ""+"Alle Stücke simultan \n"+"modifizieren" -#: data/gtkpod.glade:1844-msgid "About gtkpod"-msgstr "Über gtkpod"+#: ../data/gtkpod.glade.h:108+msgid "Check for existing files when copying from iPod."+msgstr "Bei Kopieren vom iPod Überprüfen, ob Datei bereits existiert." -#: data/gtkpod.glade:1971-msgid "Credits"-msgstr "Danksagung"+#: ../data/gtkpod.glade.h:109+msgid "Command for 'Enqueue':"+msgstr "Befehl für 'Zum Abspielen Vormerken':" -#: data/gtkpod.glade:2029-msgid "Translators"-msgstr "Übersetzer"+#: ../data/gtkpod.glade.h:110+msgid "Command for 'Play now':"+msgstr "Befehl für 'Jetzt abspielen':" -#: data/gtkpod.glade:2087-msgid "special_sorttab -- Don't translate!"-msgstr "special_sorttab -- Don't translate!\""+#. 5+#: ../data/gtkpod.glade.h:111 ../src/display_spl.c:97+#: ../src/misc_conversion.c:65+msgid "Composer"+msgstr "Komponist" -#: data/gtkpod.glade:2122-msgid " Logic: "-msgstr " Logik:"+#: ../data/gtkpod.glade.h:112+msgid "Confirm before removing tracks from the iPod or repository"+msgstr ""+"Bestätigung vor dem vollständigen Löschen vom iPod oder aus der Datenbank" -#: data/gtkpod.glade:2148-msgid "Any (OR)"-msgstr "Eines (ODER)"+#: ../data/gtkpod.glade.h:113+msgid ""+"Confirm before removing tracks from the iPod or repository\n"+"when syncing playlists"+msgstr ""+"Bestätigung vor dem Löschen vom iPod oder Musikverzeichnis beim Abgleichen "+"der Wiedergabelisten." -#: data/gtkpod.glade:2167-msgid "All (AND)"-msgstr "Alle (UND)"+#: ../data/gtkpod.glade.h:115+msgid "Confirm lists of directories"+msgstr "Liste der Verzeichnisse bestätigen" -#: data/gtkpod.glade:2220-msgid "0"-msgstr "0"+#: ../data/gtkpod.glade.h:116+msgid "Contacts sync command:"+msgstr "Befehl zum Abgleich der Kontakte:" -#: data/gtkpod.glade:2239-msgid "1"-msgstr "1"+#: ../data/gtkpod.glade.h:117+msgid "Containing Displayed Tracks"+msgstr "Aus den angezeigten Stücken" -#: data/gtkpod.glade:2258-msgid "2"-msgstr "2"+#: ../data/gtkpod.glade.h:118+msgid "Containing Selected Tracks"+msgstr "Aus den ausgewählten Stücken" -#: data/gtkpod.glade:2277-msgid "3"-msgstr "3"+#: ../data/gtkpod.glade.h:119+msgid "Conversion Progress Display"+msgstr "" -#: data/gtkpod.glade:2296-msgid "4"-msgstr "4"+#: ../data/gtkpod.glade.h:120+msgid "Cover"+msgstr "Cover" -#: data/gtkpod.glade:2315-msgid "5"-msgstr "5"+#: ../data/gtkpod.glade.h:121+msgid "Create New Playlist"+msgstr "Neue Wiedergabeliste erstellen" -#: data/gtkpod.glade:2354-msgid "Select '0' for no lower limit."-msgstr "'0' wählen für 'keine untere Schranke'."+#: ../data/gtkpod.glade.h:122+msgid "Create Repository"+msgstr "Erstelle Datenbank " -#: data/gtkpod.glade:2375-msgid " <= cts <= "-msgstr " <= num <= "+#: ../data/gtkpod.glade.h:123+msgid "Create _Playlist File"+msgstr "_Erstelle Datei der Wiedergabeliste" -#: data/gtkpod.glade:2400-msgid "Select '-1' for no upper limit."-msgstr "'-1' wählen für 'keine obere Schranke'."+#: ../data/gtkpod.glade.h:124+msgid "Credits"+msgstr "Danksagung" -#: data/gtkpod.glade:2443 data/gtkpod.glade:2520 data/gtkpod.glade:2690+#: ../data/gtkpod.glade.h:125+msgid "Currently only rating is supported."+msgstr "Gegenwärtig wird nur 'Bewertung' unterstützt."++#: ../data/gtkpod.glade.h:126+msgid "Delete repository"+msgstr "Datenbank löschen"++#: ../data/gtkpod.glade.h:127+#, fuzzy msgid ""-"'DD/MM/YYYY HH:MM < d < DD/MM/YYYY HH:MM' or similar. Press 'enter' when "-"finished."+"Delete tracks that are no longer present from the\n"+"iPod or repository" msgstr ""-"z.B. 'TT/MM/JJJJ SS:MM < d < TT/MM/JJJJ SS:MM' oder ähnliches. Nach der "-"Eingabe bitte 'Return' drücken."+"Lösche Stücke, die nicht mehr auf dem iPod oder in der Datenbank vorhanden "+"sind." -#: data/gtkpod.glade:2489 data/gtkpod.glade:2566 data/gtkpod.glade:2736-#: data/gtkpod.glade:2915-msgid "Calendar"-msgstr "Kalender"+#: ../data/gtkpod.glade.h:129+msgid "Deleted tracks"+msgstr "Gelöschte Stücke" -#: data/gtkpod.glade:2591-msgid "Specify interval"-msgstr "Intervall angeben"+#: ../data/gtkpod.glade.h:130+msgid "Descending"+msgstr "Absteigend" -#: data/gtkpod.glade:2593 src/display_spl.c:98 src/misc_conversion.c:77-msgid "Playcount"-msgstr "Wiedergabezähler"+#: ../data/gtkpod.glade.h:131+msgid "Details"+msgstr "Details" -#: data/gtkpod.glade:2616 src/display_spl.c:101 src/misc_conversion.c:78-msgid "Rating"-msgstr "Bewertung"+#: ../data/gtkpod.glade.h:133+#, no-c-format+msgid ""+"Determines how the string for the info field should be constructed, e.g '%a/%"+"A/%T - %t.mp3' or '%o'. You can separate several templates by semicolons -- "+"gtkpod will determine which one to use by the filename extension given. "+"Artist: %a, album: %A, composer: %c, title: %t, genre: %G, track nr: %T, CD "+"nr: %C, year: %Y, original filename (requires extended information file): %"+"o, the character '%': %%."+msgstr ""+"Bestimmt, wie der Text des Info-Feldes erstellt werden soll, z.B. '%a/%A/%T "+"- %t.mp3' oder '%o'. Mehrere Schablonen können durch Semikolons getrennt "+"werden -- gtkpod ermittelt die passende Schablone anhand des "+"Dateinamensuffix. Künstler: %a, Album: %A, Komponist: %c, Titel: %t, "+"Musikrichtung: %G, Stück-Nr.: %T, CD-Nr.: %C, Jahr: %Y, ursprünglicher "+"Dateiname (benötigt 'Erweiterte Informationen'): %o, das Zeichen '%': %%." -#: data/gtkpod.glade:2639 src/display_tracks.c:1990-msgid "Played"-msgstr "Gespielt"+#: ../data/gtkpod.glade.h:135+#, no-c-format+msgid ""+"Determines the filename of tracks you copy from the iPod, e.g '%a/%A/%T - %t."+"mp3' or '%o'. You can separate several patterns by semicolons -- gtkpod "+"will determine which one to use by the filename extension given. Artist: %a, "+"album: %A, composer: %c, title: %t, genre: %G, track nr: %T, CD nr: %C, "+"year: %Y, original filename (requires extended information file): %o, "+"current playlist: %p, the character '%': %%."+msgstr ""+"Bestimmt, wie der Dateiname von Stücken gewählt wird, die vom iPod kopiert "+"werden. Bsp.: '%a/%A/%T - %t.mp3' oder '%o'. Mehrere Schablonen können durch "+"Semikolons getrennt werden -- gtkpod ermittelt die passende Schablone anhand "+"des Dateinamensuffix. Künstler: %a, Album: %A, Komponist: %c, Titel: %t, "+"Musikrichtung: %G, Stück-Nr.: %T, CD-Nr.: %C, Jahr: %Y, ursprünglicher "+"Dateiname (benötigt 'Erweiterte Informationen'): %o, die aktuelle "+"Wiedergabeliste: %p, das Zeichen '%': %%." -#: data/gtkpod.glade:2662 src/display_tracks.c:1993-msgid "Modified"-msgstr "Modifiziert"+#: ../data/gtkpod.glade.h:137+#, no-c-format+msgid ""+"Determines the name of the file with the cover art. You can separate several "+"patterns by semicolons which will be tried in order. Artist: %a, album: %A, "+"composer: %c, title: %t, genre: %G, track nr: %T, CD nr: %C, year: %Y, "+"original filename (requires extended information file): %o, original "+"filename without file extension: %O, current playlist: %p, the character "+"'%': %%."+msgstr ""+"Bestimmt, wie der Dateiname von Stücken gewählt wird, die vom iPod kopiert "+"werden. Bsp.: '%a/%A/%T - %t.mp3' oder '%o'. Mehrere Schablonen können durch "+"Semikolons getrennt werden -- gtkpod ermittelt die passende Schablone anhand "+"des Dateinamensuffix. Künstler: %a, Album: %A, Komponist: %c, Titel: %t, "+"Musikrichtung: %G, Stück-Nr.: %T, CD-Nr.: %C, Jahr: %Y, ursprünglicher "+"Dateiname (benötigt 'Erweiterte Informationen'): %o, ursprünglicher "+"Dateiname ohne Erweiterung: %O, die aktuelle Wiedergabelist: %p, das Zeichen "+"'%': %%." -#: data/gtkpod.glade:2761 src/display_sorttabs.c:3223-#: src/display_tracks.c:1996-msgid "Added"-msgstr "Hinzugefügt"--#: data/gtkpod.glade:2806-msgid "Display tracks that match the criteria entered above."-msgstr "Stücke anzeigen, welche die oben genannten Kriterien erfüllen."--#: data/gtkpod.glade:2849 data/gtkpod.glade:12252-msgid "_Display"-msgstr "_Anzeige"--#: data/gtkpod.glade:2885+#: ../data/gtkpod.glade.h:138 msgid ""-"Automatically start displaying tracks that match the criteria entered above. "-"If not selected, you must press 'Display' to start displaying."+"Directories to sync with are determined from the filenames of the tracks in "+"the playlist." msgstr ""-"Die Anzeige der Stücke, welche die oben genannten Kriterien erfüllen, "-"automatisch starten. Wenn diese Option nicht aktiviert ist, müssen Sie "-"'Anzeige' drücken."+"Abzugleichende Verzeichnisse werden aus den Dateinamen der Wiedergabeliste "+"ermittelt." -#: data/gtkpod.glade:2887-msgid "Start display automatically"-msgstr "Anzeige automatisch starten"+#: ../data/gtkpod.glade.h:139+msgid "Dirs"+msgstr "Verzeichnisse" -#: data/gtkpod.glade:2962-msgid "Sorttab: "-msgstr "Sortierungseintrag: "+#: ../data/gtkpod.glade.h:140+msgid "Display a list of tracks that could actually be updated."+msgstr ""+"Nach dem Aktualisieren eine Liste der Stücke anzeigen,\n"+"die tatsächlich aktualisiert werden könnten." -#: data/gtkpod.glade:3006-msgid " "-msgstr " "+#: ../data/gtkpod.glade.h:141+msgid "Display a list of tracks that could not be updated."+msgstr ""+"Liste der Stücke anzeigen, bei denen die Aktualisierung\n"+"nicht vorgenommen werden konnte." -#: data/gtkpod.glade:3032-msgid "Category: "-msgstr "Kategorie: "+#: ../data/gtkpod.glade.h:142+msgid "Display conversion log"+msgstr "" -#: data/gtkpod.glade:3113-msgid "Please specify a time interval"-msgstr "Bitte Zeitintervall angeben"+#: ../data/gtkpod.glade.h:143+msgid "Display info about detected duplicates"+msgstr "Information über erkannte Duplikate anzeigen" -#: data/gtkpod.glade:3162-msgid "Lower Margin"-msgstr "Untere Grenze"+#: ../data/gtkpod.glade.h:144+msgid "Display info about non-updated tracks"+msgstr "Informationen über nicht aktualisierte Stücke anzeigen" -#: data/gtkpod.glade:3213 data/gtkpod.glade:3427-msgid "Time:"-msgstr "Zeit:"+#: ../data/gtkpod.glade.h:145+msgid "Display info about updated tracks"+msgstr "Informationen über aktualisierte Stücke anzeigen" -#: data/gtkpod.glade:3256 data/gtkpod.glade:3470-msgid ":"-msgstr ":"+#: ../data/gtkpod.glade.h:146+msgid "Display messages and warnings at startup"+msgstr "Nachrichten und Warnungen beim Start des Programms anzeigen" -#: data/gtkpod.glade:3333-msgid "No lower margin"-msgstr "Keine untere Grenze"+#: ../data/gtkpod.glade.h:147+msgid ""+"Display the list of duplicates that have been detected after adding files."+msgstr ""+"Eine Liste der Duplikate anzeigen, die während des Hinzufügens von Stücken "+"erkannt wurden." -#: data/gtkpod.glade:3376-msgid "Upper margin"-msgstr "Obere Grenze"+#: ../data/gtkpod.glade.h:148+msgid "Display toolbar..."+msgstr "Werkzeugleiste anzeigen..." -#: data/gtkpod.glade:3547-msgid "No upper margin"-msgstr "Keine obere Grenze"+#: ../data/gtkpod.glade.h:149+msgid "Display tooltips in main window"+msgstr "Werkzeugtipps im Hauptfenster anzeigen" -#: data/gtkpod.glade:3645-msgid "Sorting Options"-msgstr "Sortieroptionen"+#: ../data/gtkpod.glade.h:150+msgid "Display tooltips in prefs window"+msgstr "Werkzeugtipps im Fenster 'Einstellungen' anzeigen" -#: data/gtkpod.glade:3677-msgid "<b>Sort Order</b>"-msgstr "<b>Sortier-Reihenfolge</b>"+#: ../data/gtkpod.glade.h:151+msgid "Display tracks that match the criteria entered above."+msgstr "Stücke anzeigen, welche die oben genannten Kriterien erfüllen." -#: data/gtkpod.glade:3708 data/gtkpod.glade:4981 data/gtkpod.glade:11917-#: data/gtkpod.glade:12391 data/gtkpod.glade:12506-msgid " "-msgstr " "--#: data/gtkpod.glade:3740+#: ../data/gtkpod.glade.h:152 msgid ""-"In order to save the displayed track order to the iPod choose 'Save "-"Displayed Track Order' from the 'Edit' menu or select 'Auto Store' below."+"Displayed\n"+"Tracks" msgstr ""-"Um die angezeigte Reihenfolge der Stücke zu speichern, benutzen Sie "-"'Dargestellte Reihenfolge speichern' im 'Bearbeiten' Menü oder wählen die "-"Option \"Autom. speichern\" unten aus."+"Angezeigte\n"+"Stücke" -#: data/gtkpod.glade:4124-msgid "Ascending"-msgstr "Aufsteigend"+#: ../data/gtkpod.glade.h:154+msgid "Don't allow file duplication"+msgstr "Mehrfaches Einlesen von Stücken verhindern" -#: data/gtkpod.glade:4172-msgid "Descending"-msgstr "Absteigend"+#: ../data/gtkpod.glade.h:155+msgid "Don't automatically sync on startup"+msgstr "Beim Start nicht automatisch abgleichen" -#: data/gtkpod.glade:4220-msgid "None"-msgstr "Keine"--#: data/gtkpod.glade:4267 src/display_playlists.c:2176-msgid "Playlists"-msgstr "Wiedergabelisten"--#: data/gtkpod.glade:4316-msgid "Sorttabs"-msgstr "Sortierungseinträge"--#: data/gtkpod.glade:4365-msgid "Tracks"-msgstr "Stücke"--#: data/gtkpod.glade:4525-msgid "Auto Store"-msgstr "Autom. speichern"--#: data/gtkpod.glade:4568-msgid "Please refer to the notice below."-msgstr "Bitte beachten Sie den Hinweis weiter unten."--#: data/gtkpod.glade:4602 data/gtkpod.glade:4783 src/details.c:1175-msgid "n/a"-msgstr "---"--#: data/gtkpod.glade:4832-msgid "Sort tracks according to: "-msgstr "Sortiere Stücke nach: "--#: data/gtkpod.glade:4866-msgid ""-"You can also use the table headers, but this allows you to sort according to "-"a column that is not displayed."+#: ../data/gtkpod.glade.h:156+msgid "Download Cover" msgstr ""-"Sie können auch die Spaltenköpfe anklicken, aber diese Option ermöglicht es "-"auch nach Spalten zu sortieren, die nicht angezeigt werden." -#: data/gtkpod.glade:4902-msgid ""-"If checked, sorting will be case sensitive. Please note that case sensitive "-"sorting will not work well with most charsets."+#: ../data/gtkpod.glade.h:157+#, fuzzy+msgid "Duplicate Recognition is based on a (modified) sha1 hash over the file." msgstr ""-"Wenn diese Option aktiviert ist, wird beim Sortieren die Groß-/"-"Kleinschreibung beachtet. Mit den meisten Zeichensätzen funktioniert diese "-"Funktion jedoch nicht wie gewünscht."+"Die Duplikat-Erkennung basiert auf einem (modifizierten) md5-Hash über die "+"Dateien." -#: data/gtkpod.glade:4904-msgid "Sorting case sensitive"-msgstr "Beim Sortieren Groß-/Kleinschreibung beachten"+#: ../data/gtkpod.glade.h:158+msgid "Edit Repository/iPod Options"+msgstr "_Ändere Verzeichnis / iPod Optionen" -#: data/gtkpod.glade:4950-msgid "<b>Ignore Frequent Words</b>"-msgstr "<b>Ignoriere oft verwendete Wörter</b>"+#: ../data/gtkpod.glade.h:159 ../src/context_menus.c:659+msgid "Edit Smart Playlist"+msgstr "Intelligente Wiedergabeliste editieren" -#: data/gtkpod.glade:5050-msgid "Ignore these words when at the beginning of the following fields:"-msgstr "Ignoriere folgende Wörter, wenn Sie am Anfang von Feldern stehen:"+#: ../data/gtkpod.glade.h:160 ../src/context_menus.c:746+msgid "Edit Track Details"+msgstr "_Bearbeite Stücke" -#: data/gtkpod.glade:5325-msgid "gtkpod Info"-msgstr "gtkpod Info"+#: ../data/gtkpod.glade.h:161+msgid "Edit _Preferences"+msgstr "_Einstellungen ändern" -#: data/gtkpod.glade:5646 data/gtkpod.glade:5733 data/gtkpod.glade:5762-#: data/gtkpod.glade:6480 data/gtkpod.glade:6625-msgid " "-msgstr " "+#: ../data/gtkpod.glade.h:162+msgid "Effective free space"+msgstr "Effektiv freier Platz" -#: data/gtkpod.glade:6051-msgid "Number of tracks"-msgstr "Anzahl der Stücke"+#: ../data/gtkpod.glade.h:163+msgid "Empty Playlist"+msgstr "Wiedergabeliste leeren" -#: data/gtkpod.glade:6081-msgid "Play time"-msgstr "Spielzeit"+#: ../data/gtkpod.glade.h:164+msgid "Exclude file mask(s)"+msgstr "Schließe Dateimaske(n) aus" -#: data/gtkpod.glade:6112+#: ../data/gtkpod.glade.h:165 msgid "File size" msgstr "Dateigröße" -#: data/gtkpod.glade:6142-msgid "Number of playlists"-msgstr "Anzahl der Wiedergabelisten"--#: data/gtkpod.glade:6172-msgid "Deleted tracks"-msgstr "Gelöschte Stücke"--#: data/gtkpod.glade:6202+#: ../data/gtkpod.glade.h:166 msgid "File size (deleted)" msgstr "Dateigröße (gelöscht)" -#: data/gtkpod.glade:6232-msgid "Non-transferred tracks"-msgstr "Nicht übertragene Stücke"--#: data/gtkpod.glade:6262+#: ../data/gtkpod.glade.h:167 msgid "File size (non-transferred)" msgstr "Dateigröße (nicht übertragen)" -#: data/gtkpod.glade:6292-msgid "Effective free space"-msgstr "Effektiv freier Platz"+#: ../data/gtkpod.glade.h:168+msgid "Filename Format: "+msgstr "Format für Dateinamen: " -#: data/gtkpod.glade:6322-msgid ""-"Total\n"-"(iPod)"-msgstr ""-"Insgesamt\n"-"(iPod)"+#: ../data/gtkpod.glade.h:169+msgid "Files"+msgstr "Dateien" -#: data/gtkpod.glade:6354+#: ../data/gtkpod.glade.h:170+#, fuzzy msgid ""-"Selected\n"-"Playlist"+"Find orphan files (files with no track info in DB) and dangling tracks "+"(tracks with no corresponding files on iPod)" msgstr ""-"Ausgewählte\n"-"Wiedergabeliste"+"Verwaiste Stücke (Stücke, für die kein Eintrag in der iTunesDB erscheint) "+"und verlorene Stücke (Stücke ohne Datei auf dem iPod) finden" -#: data/gtkpod.glade:6386-msgid ""-"Displayed\n"-"Tracks"+#: ../data/gtkpod.glade.h:171+#, fuzzy+msgid "First try <i>folder.jpg</i>, then <i><artist>.jpg</i>"+msgstr "Versuche zuerst <i>folder.jpg</i>, dann <i>&lt;Künstler&gt;.jpg</i>"++#: ../data/gtkpod.glade.h:172+msgid "Flac with :" msgstr ""-"Angezeigte\n"-"Stücke" -#: data/gtkpod.glade:6418+#: ../data/gtkpod.glade.h:174+#, no-c-format msgid ""-"Selected\n"-"Tracks"+"For example, 'xmms %s' will clear xmms' current playlist, add the selected "+"tracks and start playing." msgstr ""-"Ausgewählte\n"-"Stücke"+"'xmms %s', z.B., löscht die aktuelle Wiedergabeliste von xmms, fügt die "+"ausgewählten Stücke hinzu und beginnt mit der Wiedergabe." -#: data/gtkpod.glade:6450+#: ../data/gtkpod.glade.h:176+#, no-c-format msgid ""-"Total\n"-"(local)"+"For example, 'xmms -e %s' will append (enqueue) the selected tracks to xmms' "+"current playlist." msgstr ""-"Insgesamt\n"-"(lokal)"+"'xmms -e %s', z.B., fügt die ausgewählten Stücke zur aktuellen "+"Wiedergabeliste von xmms hinzu." -#: data/gtkpod.glade:6870-#, fuzzy-msgid "label21"-msgstr "label21"+#: ../data/gtkpod.glade.h:177 ../src/display_sorttabs.c:2957+#: ../src/display_spl.c:89 ../src/misc_conversion.c:63+msgid "Genre"+msgstr "Genre" -#: data/gtkpod.glade:6965-msgid "Never show this dialogue again"-msgstr "Diesen Dialog nie wieder zeigen"+#: ../data/gtkpod.glade.h:178+msgid "Group artists on compilation CDs"+msgstr "Künstler auf Sampler-CDs gruppieren" -#: data/gtkpod.glade:7010 data/gtkpod.glade:7354-msgid "window1"-msgstr "window1"+#: ../data/gtkpod.glade.h:179+#, fuzzy+msgid ""+"Highly recommended for faster import when taking advantage of the "+"duplication recognition. Also, having the PC filenames allows writing "+"changed ID3 tags to disk, and even to reconstruct your iPod's contents in "+"case of file system corruption (change the \"transferred=\" entries in your "+"backuped database)."+msgstr ""+"Diese Option wird dringend empfohlen, um einen schnelleren Import der "+"iTunesDB bei eingeschalteter Duplikatenerkennung zu erreichen. Da außerdem "+"die Originaldateinamen gespeichert werden, können Tag-Änderungen in die "+"Originaldatei übernommen werden und es ist sogar möglich, den Inhalt Ihres "+"iPods im Falle eines Dateisystemschadens (Neuformatierung des iPods) zu "+"rekonstruieren (dazu müssen die 'transferred=' Einträge in der gesicherten "+"Datenbank auf '0' gesetzt und 'offline' eingelesen werden)." -#: data/gtkpod.glade:7069-msgid "_M3U"-msgstr "_M3U"+#: ../data/gtkpod.glade.h:180 ../src/context_menus.c:682+#: ../src/context_menus.c:700 ../src/context_menus.c:824+msgid "I'm sure"+msgstr "Ich bin sicher" -#: data/gtkpod.glade:7088-msgid "_PLS"-msgstr "_PLS"--#: data/gtkpod.glade:7126+#: ../data/gtkpod.glade.h:181 msgid "" "If available, the local copy of the track is referenced in the playlist. " "Otherwise the file on the iPod is used."@@ -864,224 +893,204 @@ "Falls verfügbar, wird die lokale Kopie des Stückes in die Wiedergabeliste " "eingetragen. Andernfalls wird die Datei auf dem iPod verwendet." -#: data/gtkpod.glade:7128-msgid "_Prefer Local"-msgstr "_Bevorzuge lokal"+#: ../data/gtkpod.glade.h:182+msgid "If both options are selected, embedded APIC data takes precedence."+msgstr "Falls beide Optionen angewählt sind, werden die APIC-Daten verwendet." -#: data/gtkpod.glade:7146+#: ../data/gtkpod.glade.h:183 msgid ""-"The local copy of the track is referenced in the playlist. If the track is "-"not available locally, an error message is displayed."+"If checked, sorting will be case sensitive. Please note that case sensitive "+"sorting will not work well with most charsets." msgstr ""-"Die lokale Kopie des Stückes wird in der Wiedergabeliste eingetragen.\n"-"Falls das Stück lokal nicht verfügbar ist, wird eine Fehlermeldung "-"ausgegeben."+"Wenn diese Option aktiviert ist, wird beim Sortieren die Groß-/"+"Kleinschreibung beachtet. Mit den meisten Zeichensätzen funktioniert diese "+"Funktion jedoch nicht wie gewünscht." -#: data/gtkpod.glade:7148-msgid "_Local"-msgstr "_Lokal"+#: ../data/gtkpod.glade.h:184+msgid ""+"If the filename (full path) of an existing track matches that of a track to "+"be added, this option allows you to update the information about the "+"existing track rather than just skipping the track altogether. No update "+"will take place if the file hasn't changed and you have selected the 'Don't "+"allow file duplication' option above."+msgstr ""+"Wenn der Dateiname (inkl. Pfad) eines bereits eingelesenen Stückes identisch "+"ist mit dem Namen eines neu einzulesenden Stückes, dann erlaubt diese Option "+"Ihnen, das alte Stück zu überschreiben. Normalerweise wird das Einlesen des "+"Stückes einfach übersprungen. Wenn sich die Datei nicht geändert hat und Sie "+"die Option 'Mehrfaches Einlesen von Stücken verhindern' aktiviert haben, "+"wird das Einlesen ebenfalls übersprungen." -#: data/gtkpod.glade:7167-msgid "The track on the iPod is referenced in the playlist file."-msgstr "Die Datei auf dem iPod wird in die Wiedergabeliste eingetragen."+#: ../data/gtkpod.glade.h:185+msgid "If you check this, gtkpod will descend into subdirectories recursively."+msgstr ""+"Wenn Sie diese Option wählen, werden Verzeichnisse rekursiv eingelesen." -#: data/gtkpod.glade:7169-msgid "_iPod"-msgstr "_iPod"+#: ../data/gtkpod.glade.h:186+msgid ""+"If you check this, information (cover art and meta information) changed for "+"this track will be copied to all other selected tracks as well. Use with "+"care."+msgstr ""+"Falls diese Option gewählt wird, werden alle Änderungen für das dargestellte "+"Stück (Cover und sonstige Angaben) automatisch in alle ausgewählten Stücke "+"kopiert. Bitte mit Vorsicht verwenden." -#: data/gtkpod.glade:7202-msgid "Playlist type:"-msgstr "Art der Wiedergabeliste:"--#: data/gtkpod.glade:7231-msgid "Source:"-msgstr "Quelle:"--#: data/gtkpod.glade:7274-msgid "Template for info field: "-msgstr "Schablone für dieses Feld: "--#: data/gtkpod.glade:7299+#: ../data/gtkpod.glade.h:187 msgid ""-"Determines how the string for the info field should be constructed, e.g '%a/%"-"A/%T - %t.mp3' or '%o'. You can separate several templates by semicolons -- "-"gtkpod will determine which one to use by the filename extension given. "-"Artist: %a, album: %A, composer: %c, title: %t, genre: %G, track nr: %T, CD "-"nr: %C, year: %Y, original filename (requires extended information file): %"-"o, the character '%': %%."+"If you don't select the master playlist automatically, the initial database "+"import is much faster because the display dosn't have to be updated." msgstr ""-"Bestimmt, wie der Text des Info-Feldes erstellt werden soll, z.B. '%a/%A/%T "-"- %t.mp3' oder '%o'. Mehrere Schablonen können durch Semikolons getrennt "-"werden -- gtkpod ermittelt die passende Schablone anhand des "-"Dateinamensuffix. Künstler: %a, Album: %A, Komponist: %c, Titel: %t, "-"Musikrichtung: %G, Stück-Nr.: %T, CD-Nr.: %C, Jahr: %Y, ursprünglicher "-"Dateiname (benötigt 'Erweiterte Informationen'): %o, das Zeichen '%': %%."+"Wenn die Hauptwiedergabeliste nicht automatisch ausgewählt wird, verläuft "+"der Import der iTunes Datenbank zu Beginn deutlich schneller, da die Anzeige "+"nicht aktualisiert werden muss." -#: data/gtkpod.glade:7330 data/gtkpod.glade:7574-msgid "gtkpod options"-msgstr "gtkpod Optionen"--#: data/gtkpod.glade:7392-msgid "Filename Format: "-msgstr "Format für Dateinamen: "--#: data/gtkpod.glade:7417+#: ../data/gtkpod.glade.h:188 msgid ""-"Determines the filename of tracks you copy from the iPod, e.g '%a/%A/%T - %t."-"mp3' or '%o'. You can separate several patterns by semicolons -- gtkpod "-"will determine which one to use by the filename extension given. Artist: %a, "-"album: %A, composer: %c, title: %t, genre: %G, track nr: %T, CD nr: %C, "-"year: %Y, original filename (requires extended information file): %o, "-"current playlist: %p, the character '%': %%."+"If you select several tracks in the track list and edit a tag of the first "+"track, the tags in the other tracks are updated as well." msgstr ""-"Bestimmt, wie der Dateiname von Stücken gewählt wird, die vom iPod kopiert "-"werden. Bsp.: '%a/%A/%T - %t.mp3' oder '%o'. Mehrere Schablonen können durch "-"Semikolons getrennt werden -- gtkpod ermittelt die passende Schablone anhand "-"des Dateinamensuffix. Künstler: %a, Album: %A, Komponist: %c, Titel: %t, "-"Musikrichtung: %G, Stück-Nr.: %T, CD-Nr.: %C, Jahr: %Y, ursprünglicher "-"Dateiname (benötigt 'Erweiterte Informationen'): %o, die aktuelle "-"Wiedergabeliste: %p, das Zeichen '%': %%."+"Falls mehrere Stücke in der Stücke-Anzeige ausgewählt sind und ein Tag des "+"ersten Stückes geändert wird, werden die entsprechenden Tags auch in den "+"anderen Stücken aktualisiert." -#: data/gtkpod.glade:7422-msgid " "-msgstr " "+#: ../data/gtkpod.glade.h:189+msgid "Ignore these words when at the beginning of the following fields:"+msgstr "Ignoriere folgende Wörter, wenn Sie am Anfang von Feldern stehen:" -#: data/gtkpod.glade:7444+#: ../data/gtkpod.glade.h:190 msgid ""-"Normally the charset specified when first importing the track will be used "-"for the filename. If you set this option you can set a different charset "-"with the charset selector (Preferences/'Adding/Updating/Syncing'). Note: the "-"charset info is stored in the extended information file (see "-"Preferences/'Writing of the iTunesDB'). Tracks imported before V0.51 will "-"have no charset stored. Instead the charset specified will be used."+"In order to save the displayed track order to the iPod choose 'Save "+"Displayed Track Order' from the 'Edit' menu or select 'Auto Store' below." msgstr ""-"Normalerweise wird der Zeichensatz, der beim ersten Einlesen spezifiziert "-"wurde, auch für den Dateinamen verwendet. Wenn Sie diese Option aktivieren, "-"können Sie einen anderen Zeichensatz auswählen (Einstellungen/'Hinzufügen/"-"Aktualisieren/Abgleichen'). Bitte beachten Sie: die Information über den "-"verwendeten Zeichensatz wird mit den erweiterten Informationen gespeichert "-"(siehe Einstellungen/'Schreiben der iTunesDB'). Stücke, die vor Version 0.51 "-"eingelesen wurden, haben keine Informationen über den Zeichensatz "-"gespeichert und der oben spezifizierte Zeichensatz wird verwendet."+"Um die angezeigte Reihenfolge der Stücke zu speichern, benutzen Sie "+"'Dargestellte Reihenfolge speichern' im 'Bearbeiten' Menü oder wählen die "+"Option \"Autom. speichern\" unten aus." -#: data/gtkpod.glade:7446+#: ../data/gtkpod.glade.h:191+msgid "Initialize iPod"+msgstr "Initialisiere iPod"++#: ../data/gtkpod.glade.h:192 msgid ""-"Use selected charset (Preferences/'Adding/Updating/ Syncing')\n"-"for this filename."+"Insert before\n"+"Insert after" msgstr ""-"Gewählten Zeichensatz (Einstellungen/'Hinzufügen/Aktualisieren/Abgleichen')\n"-"für diesen Dateinamen verwenden."+"Davor einfügen\n"+"Danach einfügen" -#: data/gtkpod.glade:7465-msgid ""-"When copying from iPod no check is performed on whether the destination file "-"exists. Enabling this option will make gtkpod check whether the length of "-"the destination file is the same as the file in the iPod. If so the file is "-"skipped, allowing a quick sync of the iPod's contents."+#: ../data/gtkpod.glade.h:194+msgid "Keeps all compilation CDs grouped together in the artists sort tab." msgstr ""-"Wird ein Stück vom iPod kopiert, wird normalerweise nicht überprüft, ob die "-"Datei im Zielverzeichnis bereits vorhanden ist. Wenn Sie diese Option "-"aktivieren, wird gtkpod anhand der Dateigröße überprüfen, ob die Datei "-"bereits existiert. Falls ja, wird das Kopieren übersprungen. Dies erlaubt "-"es, einen schnellen Abgleich der Daten auf Ihrer Festplatte mit denen des "-"iPods vorzunehmen."+"Alle Sampler-CDs im Filter-Eintrag 'Künstler' als 'Sampler' gruppieren." -#: data/gtkpod.glade:7467-msgid "Check for existing files when copying from iPod."-msgstr "Bei Kopieren vom iPod Überprüfen, ob Datei bereits existiert."+#: ../data/gtkpod.glade.h:195+msgid "Live _updating"+msgstr "Live Akt_ualisierung" -#: data/gtkpod.glade:7642-msgid "Playlist name:"-msgstr "Name der Wiedergabeliste:"+#: ../data/gtkpod.glade.h:196+msgid "Load iPod(s)"+msgstr "iPod(s) einlesen" -#: data/gtkpod.glade:7711+#: ../data/gtkpod.glade.h:197+msgid "Lower Margin"+msgstr "Untere Grenze"++#: ../data/gtkpod.glade.h:198+msgid "M4A with :"+msgstr ""++#: ../data/gtkpod.glade.h:199+msgid "MP3 with :"+msgstr ""++#: ../data/gtkpod.glade.h:200 msgid "Match al_l of the following" msgstr "Al_le der folgenden Regeln" -#: data/gtkpod.glade:7730+#: ../data/gtkpod.glade.h:201 msgid "Match an_y of the following" msgstr "Mindestens _eine der folgenden Regeln" -#: data/gtkpod.glade:7750-msgid "_Ignore rules"-msgstr "_Ignoriere die Regeln"+#: ../data/gtkpod.glade.h:202+msgid "Match only _checked tracks"+msgstr "Nur ausgewählte Stü_cke einbeziehen" -#: data/gtkpod.glade:7820-msgid "Rules"-msgstr "Regeln"+#: ../data/gtkpod.glade.h:203+msgid "Maximum number of background threads:"+msgstr "" -#: data/gtkpod.glade:7857-msgid "_Limit to"-msgstr "_Begrenzen auf"+#: ../data/gtkpod.glade.h:204+msgid "Maximum size of cache directory (in GB):"+msgstr "" -#: data/gtkpod.glade:7908-msgid " Sort by:"-msgstr " Sortieren nach:"+#: ../data/gtkpod.glade.h:205+msgid "Model:"+msgstr "Modell:" -#: data/gtkpod.glade:7960-msgid "Match only _checked tracks"-msgstr "Nur ausgewählte Stü_cke einbeziehen"+#: ../data/gtkpod.glade.h:206 ../src/display_tracks.c:1993+msgid "Modified"+msgstr "Modifiziert" -#: data/gtkpod.glade:7992-msgid "Live _updating"-msgstr "Live Akt_ualisierung"+#: ../data/gtkpod.glade.h:207+msgid "Most Recently Played Tracks"+msgstr "Zuletzt gespielte Stücke" -#: data/gtkpod.glade:8083-msgid "Preferences"-msgstr "Einstellungen"+#: ../data/gtkpod.glade.h:208+msgid "Music Root:"+msgstr "Stammverzeichnis für Musik:" -#: data/gtkpod.glade:8146-msgid "<b>Mountpoint and individual repository/playlist options</b>"+#: ../data/gtkpod.glade.h:209+msgid ""+"Music files can have images embedded in the APIC tag. Currently this is only "+"supported for MP3 files." msgstr ""-"<b>Einhängepunkt u. individuelle Datenbank/Wiedergabeliste Optionen</b>"+"Musikdateien können Bilder im 'APIC Tag' enthalten. Dies wird derzeit nur "+"bei MP3-Dateien unterstützt." -#: data/gtkpod.glade:8209-msgid "Set mountpoint or edit repository options"-msgstr "Einhängepunkt festlegen oder Datenbank-Optionen editieren"+#: ../data/gtkpod.glade.h:210+msgid "Never show this dialogue again"+msgstr "Diesen Dialog nie wieder zeigen" -#: data/gtkpod.glade:8260-msgid "<b>Adding/Updating/Syncing</b>"-msgstr "<b>Hinzufügen/Aktualisieren/Abgleichen</b>"+#: ../data/gtkpod.glade.h:211+msgid "New PL"+msgstr "Neue Wiedergabeliste" -#: data/gtkpod.glade:8328-msgid "Exclude file mask(s)"-msgstr "Schließe Dateimaske(n) aus"+#: ../data/gtkpod.glade.h:212+msgid "No lower margin"+msgstr "Keine untere Grenze" -#: data/gtkpod.glade:8353-#, fuzzy-msgid "Semicolon separated list of file exclusion masks, e.g. '*.mp3'"-msgstr ""-"Per Semikolon getrennte Liste der durch Maske ausgeschlossenen Stücke, z.B. "-"'*.mp3'"+#: ../data/gtkpod.glade.h:213+msgid "No upper margin"+msgstr "Keine obere Grenze" -#: data/gtkpod.glade:8387-msgid "_Encoding (ID3, files):"-msgstr "Kodi_erung (ID3, Dateien):"+#: ../data/gtkpod.glade.h:214+msgid "Non-transferred tracks"+msgstr "Nicht übertragene Stücke" -#: data/gtkpod.glade:8422-msgid ""-"gtkpod expects the ID3 tags and the filenames to be in the encoding "-"specified here. You can change it for consecutive 'Add Files' and 'Add Dirs' "-"operation. 'System Charset' is the charset used by your current locale."-msgstr ""-"gtkpod erwartet, dass die Dateinamen und ID3 tags in der Kodierung "-"vorliegen, die hier angegeben wird. Diese kann natürlich zwischen zwei "-"Aufrufen von 'Dateien hinzufügen' oder 'Verzeichnisse hinzufügen' geändert "-"werden. 'Systemzeichensatz' bezeichnet die Standardkodierung der benutzten "-"Sprache."+#: ../data/gtkpod.glade.h:215+msgid "None"+msgstr "Keine" -#: data/gtkpod.glade:8459+#: ../data/gtkpod.glade.h:216 msgid ""-"Tracks can be transferred in the background as soon as they are added to an "-"iPod repository. Otherwise they will be transferred when ejecting the "-"contents of the iPod completely unchanged until then."+"Normally the charset specified when first importing the track will be used "+"for the filename. If you set this option you can set a different charset "+"with the charset selector (Preferences/'Adding/Updating/Syncing'). Note: the "+"charset info is stored in the extended information file (see "+"Preferences/'Writing of the iTunesDB'). Tracks imported before V0.51 will "+"have no charset stored. Instead the charset specified will be used." msgstr ""+"Normalerweise wird der Zeichensatz, der beim ersten Einlesen spezifiziert "+"wurde, auch für den Dateinamen verwendet. Wenn Sie diese Option aktivieren, "+"können Sie einen anderen Zeichensatz auswählen (Einstellungen/'Hinzufügen/"+"Aktualisieren/Abgleichen'). Bitte beachten Sie: die Information über den "+"verwendeten Zeichensatz wird mit den erweiterten Informationen gespeichert "+"(siehe Einstellungen/'Schreiben der iTunesDB'). Stücke, die vor Version 0.51 "+"eingelesen wurden, haben keine Informationen über den Zeichensatz "+"gespeichert und der oben spezifizierte Zeichensatz wird verwendet." -#: data/gtkpod.glade:8461-msgid "Transfer tracks to the iPod in the background"-msgstr ""--#: data/gtkpod.glade:8480+#: ../data/gtkpod.glade.h:217 msgid "" "Normally the charset specified when first importing the track will be used " "to update the track information. If you have chosen a wrong charset when "@@ -1101,97 +1110,28 @@ "eingelesen wurden, haben keine Informationen über den Zeichensatz " "gespeichert und der oben spezifizierte Zeichensatz wird verwendet." -#: data/gtkpod.glade:8482-#, fuzzy-msgid "Use selected encoding also when updating or syncing tracks"-msgstr ""-"Gewählte Kodierung auch verwenden, wenn Stücke aktualisiert oder abgeglichen "-"werden"--#: data/gtkpod.glade:8501-msgid "If you check this, gtkpod will descend into subdirectories recursively."-msgstr ""-"Wenn Sie diese Option wählen, werden Verzeichnisse rekursiv eingelesen."--#: data/gtkpod.glade:8503-msgid "Add directories recursively"-msgstr "Verzeichnisse rekursiv hinzufügen"--#: data/gtkpod.glade:8522-#, fuzzy-msgid "Duplicate Recognition is based on a (modified) sha1 hash over the file."-msgstr ""-"Die Duplikat-Erkennung basiert auf einem (modifizierten) md5-Hash über die "-"Dateien."--#: data/gtkpod.glade:8524-msgid "Don't allow file duplication"-msgstr "Mehrfaches Einlesen von Stücken verhindern"--#: data/gtkpod.glade:8574+#: ../data/gtkpod.glade.h:218 msgid ""-"Display the list of duplicates that have been detected after adding files."+"Normally the charset specified when first importing the track will be used "+"to write the tags. If you have chosen a wrong charset when first importing a "+"track, you should select this option along with the correct charset. Note: "+"uses the extended information file to store the charset information (see "+"'Writing of the iTunesDB' on the 'Input/Output' page) and tracks imported "+"before V0.51 will have no charset stored -- the charset specified on the "+"'Input/Output' page will be used." msgstr ""-"Eine Liste der Duplikate anzeigen, die während des Hinzufügens von Stücken "-"erkannt wurden."+"Normalerweise wird der Zeichensatz, der beim ersten Einlesen des Stückes "+"angegeben wurde, auch beim Schreiben der ID3-Tags verwendet. Wenn Sie beim "+"ersten Einlesen einen falschen Zeichensatz angegeben haben, müssen Sie diese "+"Option zusammen mit dem richtigen Zeichensatz auswählen. Bitte beachten Sie: "+"Die Information über den verwendeten Zeichensatz wird mit den erweiterten "+"Informationen gespeichert (siehe 'Schreiben der iTunesDB' auf der 'Eingabe-"+"Ausgabe' Seite). Stücke, die vor Version 0.51 eingelesen wurden, haben keine "+"Informationen über den Zeichensatz gespeichert und der auf der 'Eingabe/"+"Ausgabe'-Seite eingestellte Zeichensatz wird verwendet." -#: data/gtkpod.glade:8576-msgid "Display info about detected duplicates"-msgstr "Information über erkannte Duplikate anzeigen"--#: data/gtkpod.glade:8602+#: ../data/gtkpod.glade.h:219 msgid ""-"If the filename (full path) of an existing track matches that of a track to "-"be added, this option allows you to update the information about the "-"existing track rather than just skipping the track altogether. No update "-"will take place if the file hasn't changed and you have selected the 'Don't "-"allow file duplication' option above."-msgstr ""-"Wenn der Dateiname (inkl. Pfad) eines bereits eingelesenen Stückes identisch "-"ist mit dem Namen eines neu einzulesenden Stückes, dann erlaubt diese Option "-"Ihnen, das alte Stück zu überschreiben. Normalerweise wird das Einlesen des "-"Stückes einfach übersprungen. Wenn sich die Datei nicht geändert hat und Sie "-"die Option 'Mehrfaches Einlesen von Stücken verhindern' aktiviert haben, "-"wird das Einlesen ebenfalls übersprungen."--#: data/gtkpod.glade:8604-msgid ""-"When adding dirs/files, update information of\n"-"existing tracks with identical filenames"-msgstr ""-"Beim Hinzufügen von Stücken... [truncated message content]

Revision: 1550 Author: jcsjcsDate: 2007-06-17 07:14:38 -0700 (Sun, 17 Jun 2007)Log Message:-----------* src/info.c (gtkpod_statusbar_message): fixed memory leak -- thanks to Daniele Forsi.* src/display_sorttabs.c (st_create_special): fixed memory leak.* src/prefs.c (init_prefs): fixed memory leak.* src/syncdir.c (sync_playlist): fixed memory leak.* src/display_coverart.c (coverart_block_change): fixed memory leak.Modified Paths:-------------- gtkpod/trunk/ChangeLog_detailed gtkpod/trunk/src/display_coverart.c gtkpod/trunk/src/display_sorttabs.c gtkpod/trunk/src/file_itunesdb.c gtkpod/trunk/src/info.c gtkpod/trunk/src/prefs.c gtkpod/trunk/src/syncdir.cModified: gtkpod/trunk/ChangeLog_detailed===================================================================--- gtkpod/trunk/ChangeLog_detailed2007-06-17 08:44:07 UTC (rev 1549)+++ gtkpod/trunk/ChangeLog_detailed2007-06-17 14:14:38 UTC (rev 1550)@@ -1,3 +1,18 @@+2007-06-17 Jorg Schuler <jcsjcs at users.sourceforge.net>++* src/info.c (gtkpod_statusbar_message): fixed memory leak --+ thanks to Daniele Forsi.++* src/display_sorttabs.c (st_create_special): fixed memory+ leak.++* src/prefs.c (init_prefs): fixed memory leak.++* src/syncdir.c (sync_playlist): fixed memory leak.++* src/display_coverart.c (coverart_block_change): fixed memory+ leak.+ 2007-06-14 Jorg Schuler <jcsjcs at users.sourceforge.net> * po/es.po: new version updated by Alejandro Lamas Daviña.Modified: gtkpod/trunk/src/display_coverart.c===================================================================--- gtkpod/trunk/src/display_coverart.c2007-06-17 08:44:07 UTC (rev 1549)+++ gtkpod/trunk/src/display_coverart.c2007-06-17 14:14:38 UTC (rev 1550)@@ -1857,14 +1857,18 @@ { if (GTK_WIDGET_REALIZED(gtkpod_window)) {-if (val)-gdk_window_set_cursor (gtkpod_window->window, gdk_cursor_new (GDK_WATCH));-else-gdk_window_set_cursor (gtkpod_window->window, NULL);-}--if (cdwidget != NULL)-cdwidget->block_display_change = val;+ if (val)+ {+ GdkCursor *cursor = gdk_cursor_new (GDK_WATCH);+ gdk_window_set_cursor (gtkpod_window->window, cursor);+ gdk_cursor_unref (cursor);+ }+ else+ gdk_window_set_cursor (gtkpod_window->window, NULL);+ }++ if (cdwidget != NULL)+ cdwidget->block_display_change = val; } /**Modified: gtkpod/trunk/src/display_sorttabs.c===================================================================--- gtkpod/trunk/src/display_sorttabs.c2007-06-17 08:44:07 UTC (rev 1549)+++ gtkpod/trunk/src/display_sorttabs.c2007-06-17 14:14:38 UTC (rev 1550)@@ -2841,7 +2841,6 @@ "clicked", G_CALLBACK (on_sp_cal_button_clicked), GUINT_TO_POINTER((T_TIME_PLAYED<<SP_SHIFT) + inst));- g_free(buf); /* MODIFIED */@@ -2866,7 +2865,6 @@ "clicked", G_CALLBACK (on_sp_cal_button_clicked), GUINT_TO_POINTER((T_TIME_MODIFIED<<SP_SHIFT) + inst));- g_free(buf); /* ADDED */@@ -2902,6 +2900,7 @@ GINT_TO_POINTER(inst)); gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(w), prefs_get_int_index("sp_autodisplay", inst));+ g_free (buf); /* Safe pointer to tooltips */ st->sp_tooltips_data = gtk_tooltips_data_get(gtkpod_xml_get_widget (special_xml, "sp_modified_entry"));Modified: gtkpod/trunk/src/file_itunesdb.c===================================================================--- gtkpod/trunk/src/file_itunesdb.c2007-06-17 08:44:07 UTC (rev 1549)+++ gtkpod/trunk/src/file_itunesdb.c2007-06-17 14:14:38 UTC (rev 1550)@@ -220,7 +220,7 @@ /* Return TRUE on success, FALSE otherwise */ static gboolean read_extended_info (gchar *name, gchar *itunes) {- gchar *sha1, buf[PATH_MAX], *arg, *line, *bufp;+ gchar *sha1, buf[PATH_MAX]; gboolean success = TRUE; gboolean expect_hash, hash_matched=FALSE; gint len;@@ -247,6 +247,8 @@ expect_hash = TRUE; /* next we expect the hash value (checksum) */ while (success && fgets (buf, PATH_MAX, fp)) {+gchar *line, *arg, *bufp;+ /* allow comments */ if ((buf[0] == ';') || (buf[0] == '#')) continue; arg = strchr (buf, '=');@@ -283,102 +285,104 @@ { gtkpod_warning (_("%s:\nExpected \"itunesdb_hash=\" but got:\"%s\"\n"), name, buf); success = FALSE;+g_free (line); break; } }-else- if(g_ascii_strcasecmp (line, "id") == 0)- { /* found new id */-if (sei)-{- if (sei->ipod_id != 0)- { /* normal extended information */-if (hash_matched)+else if(g_ascii_strcasecmp (line, "id") == 0)+{ /* found new id */+ if (sei)+ {+if (sei->ipod_id != 0)+{ /* normal extended information */+ if (hash_matched)+ {+if (!extendedinfohash) {- if (!extendedinfohash)- {-extendedinfohash = g_hash_table_new_full (- g_int_hash,g_int_equal, NULL,hash_delete);- }- g_hash_table_insert (extendedinfohash,- &sei->ipod_id, sei);+ extendedinfohash = g_hash_table_new_full (+g_int_hash,g_int_equal, NULL,hash_delete); }-else if (sei->sha1_hash)+g_hash_table_insert (extendedinfohash,+ &sei->ipod_id, sei);+ }+ else if (sei->sha1_hash)+ {+if (!extendedinfohash_sha1) {- if (!extendedinfohash_sha1)- {-extendedinfohash_sha1 = g_hash_table_new_full (- g_str_hash,g_str_equal, NULL,hash_delete);- }- g_hash_table_insert (extendedinfohash_sha1,- sei->sha1_hash, sei);+ extendedinfohash_sha1 = g_hash_table_new_full (+g_str_hash,g_str_equal, NULL,hash_delete); }-else-{- hash_delete ((gpointer)sei);-}+g_hash_table_insert (extendedinfohash_sha1,+ sei->sha1_hash, sei); } else- { /* this is a deleted track that hasn't yet been- removed from the iPod's hard drive */-Track *track = gp_track_new ();-track->ipod_path = g_strdup (sei->ipod_path);-extendeddeletion = g_list_append (extendeddeletion,- track);-hash_delete ((gpointer)sei); /* free sei */+ {+hash_delete ((gpointer)sei); }- sei = NULL; }-if (strcmp (arg, "xxx") != 0)-{- sei = g_malloc0 (sizeof (struct track_extended_info));- sei->ipod_id = atoi (arg);+else+{ /* this is a deleted track that hasn't yet been+ removed from the iPod's hard drive */+ Track *track = gp_track_new ();+ track->ipod_path = g_strdup (sei->ipod_path);+ extendeddeletion = g_list_append (extendeddeletion,+ track);+ hash_delete ((gpointer)sei); /* free sei */ }+sei = NULL; }- else if (g_ascii_strcasecmp (line, "version") == 0)- { /* found version */-extendedinfoversion = g_ascii_strtod (arg, NULL);- }- else if (sei == NULL)+ if (strcmp (arg, "xxx") != 0) {-gtkpod_warning (_("%s:\nFormat error: %s\n"), name, buf);-success = FALSE;-break;+sei = g_malloc0 (sizeof (struct track_extended_info));+sei->ipod_id = atoi (arg); }- else if (g_ascii_strcasecmp (line, "hostname") == 0)-sei->hostname = g_strdup (arg);- else if (g_ascii_strcasecmp (line, "converted_file") == 0)-sei->converted_file = g_strdup (arg);- else if (g_ascii_strcasecmp (line, "filename_locale") == 0)-sei->pc_path_locale = g_strdup (arg);- else if (g_ascii_strcasecmp (line, "filename_utf8") == 0)-sei->pc_path_utf8 = g_strdup (arg);- else if (g_ascii_strcasecmp (line, "thumbnail_locale") == 0)-sei->thumb_path_locale = g_strdup (arg);- else if (g_ascii_strcasecmp (line, "thumbnail_utf8") == 0)-sei->thumb_path_utf8 = g_strdup (arg);- else if ((g_ascii_strcasecmp (line, "md5_hash") == 0) ||- (g_ascii_strcasecmp (line, "sha1_hash") == 0))- { /* only accept hash value if version is >= 0.53 or- PATH_MAX is 4096 -- in 0.53 I changed the MD5 hash- routine to using blocks of 4096 Bytes in- length. Before it was PATH_MAX, which might be- different on different architectures. */-if ((extendedinfoversion >= 0.53) || (PATH_MAX == 4096))- sei->sha1_hash = g_strdup (arg);- }- else if (g_ascii_strcasecmp (line, "charset") == 0)-sei->charset = g_strdup (arg);- else if (g_ascii_strcasecmp (line, "transferred") == 0)-sei->transferred = atoi (arg);- else if (g_ascii_strcasecmp (line, "filename_ipod") == 0)-sei->ipod_path = g_strdup (arg);- else if (g_ascii_strcasecmp (line, "pc_mtime") == 0)-sei->mtime = (time_t)g_ascii_strtoull (arg, NULL, 10);- else if (g_ascii_strcasecmp (line, "local_itdb_id") == 0)-sei->local_itdb_id = (guint64)g_ascii_strtoull (arg, NULL, 10);- else if (g_ascii_strcasecmp (line, "local_track_dbid") == 0)-sei->local_track_dbid = (guint64)g_ascii_strtoull (arg, NULL, 10);+}+else if (g_ascii_strcasecmp (line, "version") == 0)+{ /* found version */+ extendedinfoversion = g_ascii_strtod (arg, NULL);+}+else if (sei == NULL)+{+ gtkpod_warning (_("%s:\nFormat error: %s\n"), name, buf);+ success = FALSE;+ g_free (line);+ break;+}+else if (g_ascii_strcasecmp (line, "hostname") == 0)+ sei->hostname = g_strdup (arg);+else if (g_ascii_strcasecmp (line, "converted_file") == 0)+ sei->converted_file = g_strdup (arg);+else if (g_ascii_strcasecmp (line, "filename_locale") == 0)+ sei->pc_path_locale = g_strdup (arg);+else if (g_ascii_strcasecmp (line, "filename_utf8") == 0)+ sei->pc_path_utf8 = g_strdup (arg);+else if (g_ascii_strcasecmp (line, "thumbnail_locale") == 0)+ sei->thumb_path_locale = g_strdup (arg);+else if (g_ascii_strcasecmp (line, "thumbnail_utf8") == 0)+ sei->thumb_path_utf8 = g_strdup (arg);+else if ((g_ascii_strcasecmp (line, "md5_hash") == 0) ||+ (g_ascii_strcasecmp (line, "sha1_hash") == 0))+{ /* only accept hash value if version is >= 0.53 or+ PATH_MAX is 4096 -- in 0.53 I changed the MD5 hash+ routine to using blocks of 4096 Bytes in+ length. Before it was PATH_MAX, which might be+ different on different architectures. */+ if ((extendedinfoversion >= 0.53) || (PATH_MAX == 4096))+sei->sha1_hash = g_strdup (arg);+}+else if (g_ascii_strcasecmp (line, "charset") == 0)+ sei->charset = g_strdup (arg);+else if (g_ascii_strcasecmp (line, "transferred") == 0)+ sei->transferred = atoi (arg);+else if (g_ascii_strcasecmp (line, "filename_ipod") == 0)+ sei->ipod_path = g_strdup (arg);+else if (g_ascii_strcasecmp (line, "pc_mtime") == 0)+ sei->mtime = (time_t)g_ascii_strtoull (arg, NULL, 10);+else if (g_ascii_strcasecmp (line, "local_itdb_id") == 0)+ sei->local_itdb_id = (guint64)g_ascii_strtoull (arg, NULL, 10);+else if (g_ascii_strcasecmp (line, "local_track_dbid") == 0)+ sei->local_track_dbid = (guint64)g_ascii_strtoull (arg, NULL, 10);+g_free (line); } g_free (sha1); fclose (fp);Modified: gtkpod/trunk/src/info.c===================================================================--- gtkpod/trunk/src/info.c2007-06-17 08:44:07 UTC (rev 1549)+++ gtkpod/trunk/src/info.c2007-06-17 14:14:38 UTC (rev 1550)@@ -454,6 +454,9 @@ gtk_statusbar_pop(GTK_STATUSBAR(gtkpod_statusbar), context); gtk_statusbar_push(GTK_STATUSBAR(gtkpod_statusbar), context, text);++g_free (text);+ gtkpod_statusbar_reset_timeout (); } }Modified: gtkpod/trunk/src/prefs.c===================================================================--- gtkpod/trunk/src/prefs.c2007-06-17 08:44:07 UTC (rev 1549)+++ gtkpod/trunk/src/prefs.c2007-06-17 14:14:38 UTC (rev 1550)@@ -1156,9 +1156,11 @@ /* This string was a wrong autoconvert--just ignore it */ buf = prefs_get_string("export_template"); - if (strcmp(buf, "%a - %a/%T - %T.mp3") == 0)+ if (buf && strcmp(buf, "%a - %a/%T - %T.mp3") == 0) prefs_set_string("export_template", NULL); + g_free (buf);+ /* We changed the meaning of the %x in export_template */ if (version < 0.72) {Modified: gtkpod/trunk/src/syncdir.c===================================================================--- gtkpod/trunk/src/syncdir.c2007-06-17 08:44:07 UTC (rev 1549)+++ gtkpod/trunk/src/syncdir.c2007-06-17 14:14:38 UTC (rev 1550)@@ -1,4 +1,4 @@-/* Time-stamp: <2007-04-28 00:06:00 jcs>+/* Time-stamp: <2007-06-17 23:01:18 jcs> | | Copyright (C) 2002-2005 Jorg Schuler <jcsjcs at users sourceforge net> | Part of the gtkpod project.@@ -613,6 +613,7 @@ remove = TRUE; } }+ g_free (dirname_local); } if (remove)This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 1551 Author: jcsjcsDate: 2007-06-17 07:39:14 -0700 (Sun, 17 Jun 2007)Log Message:-----------* README: some changes initiated by Daniele Forsi.Modified Paths:-------------- gtkpod/trunk/ChangeLog_detailed gtkpod/trunk/READMEModified: gtkpod/trunk/ChangeLog_detailed===================================================================--- gtkpod/trunk/ChangeLog_detailed2007-06-17 14:14:38 UTC (rev 1550)+++ gtkpod/trunk/ChangeLog_detailed2007-06-17 14:39:14 UTC (rev 1551)@@ -1,5 +1,7 @@ 2007-06-17 Jorg Schuler <jcsjcs at users.sourceforge.net> +* README: some changes initiated by Daniele Forsi.+ * src/info.c (gtkpod_statusbar_message): fixed memory leak -- thanks to Daniele Forsi. Modified: gtkpod/trunk/README===================================================================--- gtkpod/trunk/README2007-06-17 14:14:38 UTC (rev 1550)+++ gtkpod/trunk/README2007-06-17 14:39:14 UTC (rev 1551)@@ -49,29 +49,36 @@ *----------------------------------* -Follow steps 1-7 in the "Connecting your iPod to a Linux box"-(basically you need to get the iPod partition mounted to /mnt/ipod)+1) If your iPod is not mounted automatically when connecting it to+ your computer follow steps 1-7 in the "Connecting your iPod to a+ Linux box" (basically you need to get the iPod partition mounted to+ /mnt/ipod). In most cases this should not be necessary any more+ these days. +2) If you are using GNOME, starting with V1.0 of gtkpod your iPod will+ be automatically loaded and displayed within gtkpod once you+ connect it to your box. Otherwise: -1) The faint-of-heart make a backup of their iTunesDB:+ - Use "Load iPods" to import the contents of your old iTunesDB (you+ may have to specify the correct mountpoint: right-button click on+ the "iPod" repository, select "Edit iPod's Properties" and change+ the mountpoint). -cp /mnt/ipod/iPod_Control/iTunes/iTunesDB /mnt/ipod/iPod_Control/iTunes/iTunesDB.bak--2) Start gtkpod--3) Use "Import" to import the contents of your old iTunesDB.--4) Use "Add Files", "Add Directories" or DND to add files or+3) Use "Add Files", "Add Directories" or DND to add files or directories. -5) Use "Sync" to write the added files to the iPod and create a new- iTunesDB.+4) Use "Eject iPod" in the context menu or click on the icon to the+ right of the iPod name to write the added files to the iPod and+ create a new iTunesDB and unload the iPod from gtkpod. -6) Quit the program.+5) Unmount your iPod. The easiest way is to use the windowmanager. If+ this is not an option for you continue with step 8-11 of the+ "Connecting your iPod to a Linux box" section (basically describing+ how to unmount and disconnect your iPod). -and continue with step 8-11 of the "Connecting your iPod to a Linux-box" section (basically describing how to unmount and disconnect your-iPod).+ You can automate the unmounting by adding creating a+ ~/.gtkpod/gtkpod.eject file with the following line in it (without+ the quotation marks): "eject $1" *----------------------------------*@@ -203,7 +210,7 @@ ------------------- You can instruct gtkpod (in the prefs window) to use-file-size-dependent MD5 checksums to prevent the same file from+file-size-dependent SHA1 checksums to prevent the same file from being copied to your iPod twice. If a duplicate is detected, gtkpod will print out the the filenames@@ -220,10 +227,16 @@ database. You can therefore instruct gtkpod to write an additional file (iTunesDB.ext) with extended information. For each track it stores - - MD5 hash+ - SHA1 hash - filename in the locale's encoding - filename in UTF8 encoding - hostname where the file was added (not used for anything yet)+ - filename of an associated converted file (for example an .mp3 for+ a .flac file)+ - if the file is present in the local database a reference to there+ in order for playcounts to work on the local database as well+ - last modification time+ - the charset used for the file when adding it Since the extended information file is only valid with the corresponding standard iTunes database, a checksum of the iTunes@@ -231,7 +244,7 @@ Using an extended information file will considerably speed up the import of an existing iTunes database when using duplicate detection,-since the MD5 checksums do not have to be re-calculated.+since the SHA1 checksums do not have to be re-calculated. Using an extended information file will also allow modification of ID3 tags in the track files after the initial import, because the fullThis was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 1553 Author: jcsjcsDate: 2007-06-17 08:51:24 -0700 (Sun, 17 Jun 2007)Log Message:-----------* src/mp4file.c src/mp3file.c: read/write tempo (BPM) value from/to tags. src/flacfile.c src/oggfile.c: read tempo (BPM) value from tags (not sure if this is correct) src/file.c (copy_new_info): copy BPM after having read it.Modified Paths:-------------- gtkpod/trunk/ChangeLog_detailed gtkpod/trunk/src/file.c gtkpod/trunk/src/flacfile.c gtkpod/trunk/src/mp3file.c gtkpod/trunk/src/mp4file.c gtkpod/trunk/src/oggfile.cModified: gtkpod/trunk/ChangeLog_detailed===================================================================--- gtkpod/trunk/ChangeLog_detailed2007-06-17 15:27:05 UTC (rev 1552)+++ gtkpod/trunk/ChangeLog_detailed2007-06-17 15:51:24 UTC (rev 1553)@@ -1,5 +1,14 @@ 2007-06-17 Jorg Schuler <jcsjcs at users.sourceforge.net> +* src/mp4file.c+ src/mp3file.c: read/write tempo (BPM) value from/to tags.++ src/flacfile.c+ src/oggfile.c: read tempo (BPM) value from tags (not sure+ if this is correct)++ src/file.c (copy_new_info): copy BPM after having read it.+ * README: some changes initiated by Daniele Forsi. * src/info.c (gtkpod_statusbar_message): fixed memory leak --Modified: gtkpod/trunk/src/file.c===================================================================--- gtkpod/trunk/src/file.c2007-06-17 15:27:05 UTC (rev 1552)+++ gtkpod/trunk/src/file.c2007-06-17 15:51:24 UTC (rev 1553)@@ -873,6 +873,7 @@ to->mediatype = from->mediatype; to->lyrics_flag = from->lyrics_flag; to->movie_flag = from->movie_flag;+ to->BPM = from->BPM; } /* Updates mserv data (rating only) of @track using filename @name toModified: gtkpod/trunk/src/flacfile.c===================================================================--- gtkpod/trunk/src/flacfile.c2007-06-17 15:27:05 UTC (rev 1552)+++ gtkpod/trunk/src/flacfile.c2007-06-17 15:51:24 UTC (rev 1553)@@ -93,13 +93,16 @@ } if (g_ascii_strncasecmp("CDS=", tag, 4) == 0) { track->cds = atoi (tag + 4);+ }+ /* I'm not sure if "BPM=" is correct */ + if (g_ascii_strncasecmp("BPM=", tag, 4) == 0) {+ track->BPM = atoi (tag + 4); } } } FLAC__metadata_object_delete (tags); }- /* TODO: immediate conversion if thread ? */ } return track;Modified: gtkpod/trunk/src/mp3file.c===================================================================--- gtkpod/trunk/src/mp3file.c2007-06-17 15:27:05 UTC (rev 1552)+++ gtkpod/trunk/src/mp3file.c2007-06-17 15:51:24 UTC (rev 1553)@@ -1,4 +1,4 @@-/* Time-stamp: <2007-04-19 20:18:03 jcs>+/* Time-stamp: <2007-06-18 00:48:53 jcs> | | Copyright (C) 2002-2005 Jorg Schuler <jcsjcs at users sourceforge net> | Part of the gtkpod project.@@ -66,7 +66,6 @@ gchar *comment; /* Comment */ gchar *composer; /* Composer */ guint32 songlen; /* Length of file in ms */- /* CD/disc number handling */ gchar *cdnostring; /* Position of disc in the album */ gchar *cdno_total; /* The number of discs in the album (ex: 1/2) */ gchar *compilation; /* The track is a member of a compilation */@@ -75,6 +74,7 @@ gchar *podcastrss; gchar *time_released; gchar *subtitle;+ gchar *BPM; /* beats per minute */ gchar *lyrics; /* does not appear to be the full lyrics -- only used to set the flag 'lyrics_flag' of the Track structure */@@ -1423,6 +1423,7 @@ tag->podcastrss = id3_get_string (id3tag, "YWFD"); tag->description = id3_get_string (id3tag, "YTDS"); tag->time_released = id3_get_string (id3tag, "YTDR");+tag->BPM = id3_get_string (id3tag, "TBPM"); string = id3_get_string (id3tag, "TLEN"); if (string)@@ -1592,6 +1593,10 @@ id3_set_string(id3tag, ID3_FRAME_YEAR, string1, encoding); g_free(string1); +string1 = g_strdup_printf("%d", track->BPM);+id3_set_string(id3tag, "TBPM", string1, encoding);+g_free(string1);+ if (track->tracks) string1 = g_strdup_printf ("%d/%d", track->track_nr, track->tracks);@@ -2305,6 +2310,16 @@ g_free (filetag.compilation); } +if (filetag.BPM == NULL)+{+ track->BPM = 0;+}+else+{+ track->BPM = atoi(filetag.BPM);+ g_free (filetag.BPM);+}+ if (filetag.lyrics) { track->lyrics_flag = 0x01;Modified: gtkpod/trunk/src/mp4file.c===================================================================--- gtkpod/trunk/src/mp4file.c2007-06-17 15:27:05 UTC (rev 1552)+++ gtkpod/trunk/src/mp4file.c2007-06-17 15:51:24 UTC (rev 1553)@@ -1,4 +1,4 @@-/* Time-stamp: <2006-10-15 23:48:05 jcs>+/* Time-stamp: <2007-06-18 00:48:52 jcs> | | Copyright (C) 2002-2005 Jorg Schuler <jcsjcs at users sourceforge net> | Part of the gtkpod project.@@ -75,6 +75,8 @@ guint16 samplerate; /+ e.g.: CD is 44100 +/ guint32 peak_signal; /+ LAME Peak Signal * 0x800000 +/ gboolean compilation; /+ Track is part of a compilation CD +/+ gboolean lyrics_flag;+ gint16 bpm; If prefs_get_int("readtags") returns FALSE you only should fill in tracklen, bitrate, samplerate, soundcheck and filetype@@ -347,6 +349,10 @@ track->genre = charset_to_utf8 (value); g_free(value); }+ if (MP4GetMetadataTempo (mp4File, &numvalue))+ {+track->BPM = numvalue;+ } } mp4_scan_soundcheck (mp4File, track); audio_or_video_found = TRUE;@@ -452,6 +458,8 @@ MP4SetMetadataDisk (mp4File, track->cd_nr, track->cds); + MP4SetMetadataTempo (mp4File, track->BPM);+ value = charset_from_utf8 (track->genre); MP4SetMetadataGenre (mp4File, value); g_free (value);Modified: gtkpod/trunk/src/oggfile.c===================================================================--- gtkpod/trunk/src/oggfile.c2007-06-17 15:27:05 UTC (rev 1552)+++ gtkpod/trunk/src/oggfile.c2007-06-17 15:51:24 UTC (rev 1553)@@ -1,4 +1,4 @@-/* Time-stamp: <2007-01-19 00:56:31 jcs>+/* Time-stamp: <2007-06-18 00:48:50 jcs> | | Copyright (C) 2007 Marc d[r]eadlock <m.dreadlock at gmail com> | Part of the gtkpod project.@@ -122,6 +122,10 @@ if ((str=vorbis_comment_query(vc,"cds",0))!=NULL){ track->cds = atoi(str); }+ /* I'm not sure if "bpm" is correct */ + if ((str=vorbis_comment_query(vc,"bpm",0))!=NULL){+ track->BPM = atoi(str);+ } } }This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 1558 Author: jcsjcsDate: 2007-06-18 08:33:07 -0700 (Mon, 18 Jun 2007)Log Message:-----------* src/misc.h src/details.c src/misc.c data/gtkpod.glade: moved mediatype combobox handling in edit details window completely inside details.c for easier maintenance.Modified Paths:-------------- gtkpod/trunk/ChangeLog_detailed gtkpod/trunk/data/gtkpod.glade gtkpod/trunk/src/details.c gtkpod/trunk/src/misc.c gtkpod/trunk/src/misc.hModified: gtkpod/trunk/ChangeLog_detailed===================================================================--- gtkpod/trunk/ChangeLog_detailed2007-06-18 14:12:13 UTC (rev 1557)+++ gtkpod/trunk/ChangeLog_detailed2007-06-18 15:33:07 UTC (rev 1558)@@ -1,5 +1,14 @@ 2007-06-17 Jorg Schuler <jcsjcs at users.sourceforge.net> +* src/misc.h+ src/details.c+ src/misc.c+ data/gtkpod.glade: moved mediatype combobox handling in edit+ details window completely inside details.c for easier+ maintenance.++2007-06-17 Jorg Schuler <jcsjcs at users.sourceforge.net>+ * src/mp4file.c src/mp3file.c: read/write tempo (BPM) value from/to tags. Modified: gtkpod/trunk/data/gtkpod.glade===================================================================--- gtkpod/trunk/data/gtkpod.glade2007-06-18 14:12:13 UTC (rev 1557)+++ gtkpod/trunk/data/gtkpod.glade2007-06-18 15:33:07 UTC (rev 1558)@@ -16174,16 +16174,6 @@ <child> <widget class="GtkComboBox" id="details_combobox_41"> <property name="visible">True</property>- <property name="items" translatable="yes">Audio/Video-Audio-Video-Podcast-Video Podcast-Audiobook-Music Video-TV Show-TV Show &amp; Music Video-</property> <property name="add_tearoffs">False</property> <property name="focus_on_click">True</property> </widget>Modified: gtkpod/trunk/src/details.c===================================================================--- gtkpod/trunk/src/details.c2007-06-18 14:12:13 UTC (rev 1557)+++ gtkpod/trunk/src/details.c2007-06-18 15:33:07 UTC (rev 1558)@@ -53,7 +53,41 @@ static const gchar *DETAILS_WINDOW_DEFY="details_window_defy"; static const gchar *DETAILS_WINDOW_NOTEBOOK_PAGE="details_window_notebook_page"; +/* enum types */+typedef enum+{+ DETAILS_MEDIATYPE_AUDIO_VIDEO = 0,+ DETAILS_MEDIATYPE_AUDIO,+ DETAILS_MEDIATYPE_MOVIE,+ DETAILS_MEDIATYPE_PODCAST,+ DETAILS_MEDIATYPE_VIDEO_PODCAST,+ DETAILS_MEDIATYPE_AUDIOBOOK,+ DETAILS_MEDIATYPE_MUSICVIDEO,+ DETAILS_MEDIATYPE_TVSHOW,+ DETAILS_MEDIATYPE_MUSICVIDEO_TVSHOW+} DETAILS_MEDIATYPE; +typedef struct+{+ guint32 id;+ const gchar *str;+} ComboEntry;++/* strings for mediatype combobox */+static const ComboEntry mediatype_comboentries[] =+{+ { 0, N_("Audio/Video") },+ { ITDB_MEDIATYPE_AUDIO, N_("Audio") },+ { ITDB_MEDIATYPE_MOVIE, N_("Video") },+ { ITDB_MEDIATYPE_PODCAST, N_("Podcast") },+ { ITDB_MEDIATYPE_PODCAST|ITDB_MEDIATYPE_MOVIE, N_("Video Podcast") },+ { ITDB_MEDIATYPE_AUDIOBOOK, N_("Audiobook") },+ { ITDB_MEDIATYPE_MUSICVIDEO, N_("Music Video") },+ { ITDB_MEDIATYPE_TVSHOW, N_("TV Show") },+ { ITDB_MEDIATYPE_TVSHOW|ITDB_MEDIATYPE_MUSICVIDEO, N_("TV Show & Music Video") },+ { 0, NULL }+};+ /* Declarations */ static void details_set_track (Detail *detail, Track *track); static void details_free (Detail *detail);@@ -550,7 +584,56 @@ } +/****** comboentries helper functions ******/ +/* Get index from ID (returns -1 if ID could not be found) */+static gint comboentry_index_from_id (const ComboEntry centries[],+ guint32 id)+{+ gint i;++ g_return_val_if_fail (centries, -1);++ for (i=0; centries[i].str; ++i)+ {+if (centries[i].id == id) return i;+ }+ return -1;+}+++/* initialize a combobox with the corresponding entry strings */+static void details_setup_combobox (GtkWidget *cb,+ const ComboEntry centries[])+{+ const ComboEntry *ce = centries;+ GtkCellRenderer *cell;+ GtkListStore *store;++ g_return_if_fail (cb);+ g_return_if_fail (centries);++ /* clear any renderers that may have been set */+ gtk_cell_layout_clear (GTK_CELL_LAYOUT (cb));+ /* set new model */+ store = gtk_list_store_new (1, G_TYPE_STRING);+ gtk_combo_box_set_model (GTK_COMBO_BOX (cb), GTK_TREE_MODEL (store));+ g_object_unref (store);++ cell = gtk_cell_renderer_text_new ();+ gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (cb), cell, TRUE);+ gtk_cell_layout_set_attributes (GTK_CELL_LAYOUT (cb), cell,+ "text", 0,+ NULL);++ while (ce->str != NULL)+ {+gtk_combo_box_append_text (GTK_COMBO_BOX (cb), _(ce->str));+++ce;+ }+}++ /****** Setup of widgets ******/ static void details_setup_widget (Detail *detail, T_item item) {@@ -655,6 +738,7 @@ case T_MEDIA_TYPE: buf = g_strdup_printf ("details_combobox_%d", item); w = gtkpod_xml_get_widget (detail->xml, buf);+details_setup_combobox (w, mediatype_comboentries); g_signal_connect (w, "changed", G_CALLBACK (details_combobox_changed), detail);@@ -820,13 +904,18 @@ case T_MEDIA_TYPE: if ((w = gtkpod_xml_get_widget (detail->xml, combobox))) {- if (track)+ gint index = -1;+ if (track) {- gint gui = dbToGUI(track->mediatype);- gtk_combo_box_set_active (GTK_COMBO_BOX (w), gui);+index = comboentry_index_from_id (mediatype_comboentries,+ track->mediatype);+if (index == -1)+{+ gtkpod_warning (_("Please report unknown mediatype %x\n"),+ track->mediatype);+} }- else- gtk_combo_box_set_active (GTK_COMBO_BOX (w), 0);+ gtk_combo_box_set_active (GTK_COMBO_BOX (w), index); } break; case T_ALL:@@ -838,6 +927,7 @@ g_free (entry); g_free (checkbutton); g_free (textview);+ g_free (combobox); g_free (text); } @@ -1024,12 +1114,15 @@ { gint active; active = gtk_combo_box_get_active (GTK_COMBO_BOX (w));- guint32 mediatype_db = guiToDB(active);+ if (active != -1)+ {+guint32 new_mediatype = mediatype_comboentries[active].id; - if (track->mediatype != mediatype_db)- {-track->mediatype = mediatype_db;-changed = TRUE;+if (track->mediatype != new_mediatype)+{+ track->mediatype = new_mediatype;+ changed = TRUE;+} } } break;@@ -1077,6 +1170,7 @@ g_free (entry); g_free (checkbutton); g_free (textview);+ g_free (combobox); details_update_buttons (detail); }@@ -1486,11 +1580,10 @@ G_CALLBACK (details_writethrough_toggled), detail); -- g_signal_connect (detail->window, "delete_event", G_CALLBACK (details_delete_event), detail); + details_set_tracks (detail, selected_tracks); /* set notebook page */Modified: gtkpod/trunk/src/misc.c===================================================================--- gtkpod/trunk/src/misc.c2007-06-18 14:12:13 UTC (rev 1557)+++ gtkpod/trunk/src/misc.c2007-06-18 15:33:07 UTC (rev 1558)@@ -1405,51 +1405,6 @@ } -guint32 guiToDB(gint gui)-{- guint32 db = 0;- switch (gui)- {- case 0: db = 0x00000000; break;- case 1: db = 0x00000001; break;- case 2: db = 0x00000002; break;- case 3: db = 0x00000004; break;- case 4: db = 0x00000006; break;- case 5: db = 0x00000008; break;- case 6: db = 0x00000020; break;- case 7: db = 0x00000040; break;- case 8: db = 0x00000060; break;- default:- /* This is an error */- g_warning ("Programming error: GUI is not in sync with Media Types.\n");- db = 0;- };-- return db;-}--gint dbToGUI(guint32 db)-{- gint gui = 0;- switch (db)- {- case 0x00000000: gui = 0; break;- case 0x00000001: gui = 1; break;- case 0x00000002: gui = 2; break;- case 0x00000004: gui = 3; break;- case 0x00000006: gui = 4; break;- case 0x00000008: gui = 5; break;- case 0x00000020: gui = 6; break;- case 0x00000040: gui = 7; break;- case 0x00000060: gui = 8; break;- default:- /* Warning */- g_warning ("Unknown media type found: %#.8x\n", db);- gui = 0;- };- return gui;-}- /* ------------------------------------------------------------ * * Helper functions for pref keysModified: gtkpod/trunk/src/misc.h===================================================================--- gtkpod/trunk/src/misc.h2007-06-18 14:12:13 UTC (rev 1557)+++ gtkpod/trunk/src/misc.h2007-06-18 15:33:07 UTC (rev 1558)@@ -264,8 +264,4 @@ gboolean save_ipod_prefs (iTunesDB *itdb, const gchar *mountpoint); gboolean get_offline (iTunesDB *itdb);--guint32 guiToDB(gint gui);-gint dbToGUI(guint32 db);- #endifThis was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 1561 Author: phantom_sfDate: 2007-06-18 15:39:26 -0700 (Mon, 18 Jun 2007)Log Message:-----------2007-06-17 P.G. Richardson <phantom_sf at users.sourceforge.net>Bug fixes spotted by Daniele Forsi.Change in coverart not made to coverart display when apply buttonclicked on Details window.Fetchcover behaved awkwardly with naming the downloaded image files ifthe tracks concerned lacked album info in their ID3 tags.Coverart files from fetchcover subject to template values in the prefs.Should always be a default value of folder.jpg if none of the templatesprovide a non-null value.* details.c: details_copy_artwork() has to now always recopy the artwork from file. The reason being, fetchcover overwrites the artwork hence the file name will still be the same while different artwork. * display_coverart.h display_coverart.c: set_covers() and set_cover_item() now has a parameter to force an update of the cover images from file. Only used by details_copy_artwork() when the apply button is clicked on the details window. * fetchcover.c: dialog will now appear if a cover image file already exists in the tracks directory. Gives the options to overwrite, save as unique name or cancel completely.Modified Paths:-------------- gtkpod/trunk/ChangeLog_detailed gtkpod/trunk/src/details.c gtkpod/trunk/src/display_coverart.c gtkpod/trunk/src/display_coverart.h gtkpod/trunk/src/fetchcover.cModified: gtkpod/trunk/ChangeLog_detailed===================================================================--- gtkpod/trunk/ChangeLog_detailed2007-06-18 16:16:31 UTC (rev 1560)+++ gtkpod/trunk/ChangeLog_detailed2007-06-18 22:39:26 UTC (rev 1561)@@ -1,3 +1,32 @@+2007-06-17 P.G. Richardson <phantom_sf at users.sourceforge.net>++Bug fixes spotted by Daniele Forsi.++Change in coverart not made to coverart display when apply button+clicked on Details window.+Fetchcover behaved awkwardly with naming the downloaded image files if+the tracks concerned lacked album info in their ID3 tags.+Coverart files from fetchcover subject to template values in the prefs.+Should always be a default value of folder.jpg if none of the templates+provide a non-null value.++* details.c:+ details_copy_artwork() has to now always recopy the artwork+ from file. The reason being, fetchcover overwrites the artwork hence+ the file name will still be the same while different artwork.+ +* display_coverart.h+ display_coverart.c:+ set_covers() and set_cover_item() now has a+ parameter to force an update of the cover images from file. Only used+ by details_copy_artwork() when the apply button is clicked on the+ details window.+ +* fetchcover.c:+ dialog will now appear if a cover image file already exists in the+ tracks directory. Gives the options to overwrite, save as unique name+ or cancel completely.+ 2007-06-17 Jorg Schuler <jcsjcs at users.sourceforge.net> * src/misc.hModified: gtkpod/trunk/src/details.c===================================================================--- gtkpod/trunk/src/details.c2007-06-18 16:16:31 UTC (rev 1560)+++ gtkpod/trunk/src/details.c2007-06-18 22:39:26 UTC (rev 1561)@@ -34,6 +34,7 @@ #include "fileselection.h" #include "misc.h" #include "fetchcover.h"+#include "display_coverart.h" #include "misc_track.h" #include "prefs.h" #include <string.h>@@ -514,8 +515,6 @@ g_return_val_if_fail (fretr->thumb_path_locale, FALSE); g_return_val_if_fail (toetr->thumb_path_locale, FALSE); - if (strcmp (fretr->thumb_path_locale, toetr->thumb_path_locale) != 0)- { itdb_artwork_free (totrack->artwork); totrack->artwork = itdb_artwork_duplicate (frtrack->artwork); totrack->artwork_size = frtrack->artwork_size;@@ -526,13 +525,19 @@ toetr->thumb_path_locale = g_strdup (fretr->thumb_path_locale); toetr->thumb_path_utf8 = g_strdup (fretr->thumb_path_utf8); changed = TRUE;- }+ /* make sure artwork gets removed, even if both thumb_paths were unset ("") */ if (!frtrack->artwork->thumbnails) { changed |= gp_track_remove_thumbnails (totrack); }+ + /* Since no data changes affect the coverart display.+ * Need to force a change by calling set covers directly.+ */+ force_update_covers ();+ return changed; } Modified: gtkpod/trunk/src/display_coverart.c===================================================================--- gtkpod/trunk/src/display_coverart.c2007-06-18 16:16:31 UTC (rev 1560)+++ gtkpod/trunk/src/display_coverart.c2007-06-18 22:39:26 UTC (rev 1561)@@ -42,7 +42,7 @@ /* Declarations */ static void free_album (Album_Item *album);- static void free_CDWidget ();+static void free_CDWidget (); static gint compare_album_keys (gchar *a, gchar *b); static void set_display_dimensions (); static GdkPixbuf *draw_blank_cdimage ();@@ -57,8 +57,8 @@ static void coverart_sort_images (GtkSortType order); static void prepare_canvas (); static void set_slider_range (gint index);-static void set_covers ();-static void set_cover_item (gint ndex, Cover_Item *cover, gchar *key);+static void set_covers (gboolean force_imgupdate);+static void set_cover_item (gint ndex, Cover_Item *cover, gchar *key, gboolean force_imgupdate); /* Prefs keys */ const gchar *KEY_DISPLAY_COVERART="display_coverart";@@ -291,14 +291,29 @@ } /**+ * + * force_update_covers:+ * + * Call the resetting of the covers and override the cached images so that they+ * are loaded with the latest files existing on the filesystem.+ * + */+void force_update_covers ()+{+set_covers (TRUE);+}++/** * set_covers: * * Internal function responsible for the resetting of the artwork * covers in response to some kind of change in selection, eg. new * selection in sort tab, button click etc... * + * @force_imgupdate: forces the resetting of the cached images so that the+ * values are reread from the tracks and updated. Used sparingly. */-static void set_covers ()+static void set_covers (gboolean force_imgupdate) { gint i, dataindex; gchar *key;@@ -314,7 +329,7 @@ */ key = g_list_nth_data (album_key_list, dataindex); -set_cover_item (i, cover, key);+set_cover_item (i, cover, key, force_imgupdate); } } @@ -324,7 +339,7 @@ * Internal function called by set_covers to reset an artwork cover. * */-static void set_cover_item (gint index, Cover_Item *cover, gchar *key)+static void set_cover_item (gint index, Cover_Item *cover, gchar *key, gboolean force_imgupdate) { GdkPixbuf *reflection; GdkPixbuf *scaled;@@ -375,6 +390,12 @@ cover->album = album; Track *track;+if (force_imgupdate)+{+gdk_pixbuf_unref (album->albumart);+album->albumart = NULL;+}+ if (album->albumart == NULL) { track = g_list_nth_data (album->tracks, 0);@@ -451,7 +472,7 @@ if (cdwidget->first_imgindex > (displaytotal - IMG_MAIN)) cdwidget->first_imgindex = displaytotal - IMG_MAIN; - set_covers ();+ set_covers (FALSE); } /**@@ -956,7 +977,7 @@ set_highlight (cover, TRUE); } -set_covers ();+set_covers (FALSE); } @@ -1412,7 +1433,7 @@ else if((cdwidget->first_imgindex + IMG_TOTAL) >= displaytotal) cdwidget->first_imgindex = displaytotal - IMG_TOTAL; - set_covers ();+ set_covers (FALSE); /* Set the index value of the slider but avoid causing an infinite * cover selection by blocking the event@@ -1523,7 +1544,7 @@ if (index >= cdwidget->first_imgindex && index <= (cdwidget->first_imgindex + IMG_TOTAL)) { /* reset the covers and should reset to original position but without the index */-set_covers ();+set_covers (FALSE); } /* Size of key list may have changed so reset the slider @@ -1583,7 +1604,7 @@ for (i = 0; i < IMG_MAIN; ++i) album_key_list = g_list_prepend (album_key_list, NULL); -set_covers ();+set_covers (FALSE); } else {@@ -1632,7 +1653,7 @@ index = g_list_index (album->tracks, track); if (index != -1) {- /* Track exists in the album list so return and ignore the change */+ /* Track exists in the album list so ignore the change and return */ return; } else@@ -1668,7 +1689,7 @@ * under the new album key */ remove_track_from_album (album, track, key, index, klist);- set_covers();+ set_covers(FALSE); /* Found the album and removed so no need to continue the loop */ break; }@@ -1833,7 +1854,7 @@ for (i = 0; i < IMG_MAIN; ++i) album_key_list = g_list_prepend (album_key_list, NULL); -set_covers ();+set_covers (FALSE); set_slider_range (cdwidget->first_imgindex); @@ -1908,7 +1929,7 @@ g_free (filename); - set_covers ();+ set_covers (FALSE); } /**@@ -1946,5 +1967,5 @@ on_coverart_context_menu_click (tracks); -set_covers ();+set_covers (FALSE); }Modified: gtkpod/trunk/src/display_coverart.h===================================================================--- gtkpod/trunk/src/display_coverart.h2007-06-18 16:16:31 UTC (rev 1560)+++ gtkpod/trunk/src/display_coverart.h2007-06-18 22:39:26 UTC (rev 1561)@@ -54,6 +54,7 @@ GList *coverart_get_displayed_tracks (void); GdkPixbuf *coverart_get_default_track_thumb (void); void coverart_init (gchar *progpath);+void force_update_covers (); void coverart_select_cover (Itdb_Track *track); void coverart_set_images (gboolean clear_track_list); void coverart_track_changed (Track *track, gint signal);Modified: gtkpod/trunk/src/fetchcover.c===================================================================--- gtkpod/trunk/src/fetchcover.c2007-06-18 16:16:31 UTC (rev 1560)+++ gtkpod/trunk/src/fetchcover.c2007-06-18 22:39:26 UTC (rev 1561)@@ -67,6 +67,8 @@ static GtkWidget *fetchcover_statusbar; /* Flag indicating whether a new net search should be initiated */ static gboolean netsearched = FALSE;+/* Display a dialog explaining the options if a file with the proposed name already exists */+static gchar *display_file_exist_dialog (gchar *filename); #define IMGSCALE 256 @@ -337,19 +339,33 @@ gchar *template = prefs_get_string("coverart_template"); gchar **template_items = g_strsplit(template, ";", 0); -gchar *filename = get_string_from_template(fetchcover_track, *template_items, FALSE, FALSE);+gint i;+gchar *filename = NULL; +for (i = 0; filename == NULL && i < g_strv_length (template_items); ++i)+{+filename = get_string_from_template(fetchcover_track, template_items[i], FALSE, FALSE);+if (strlen(filename) == 0)+filename = NULL;+}++/* Check filename still equals null then take a default stance+ * to ensure the file has a name.+ */+if (filename == NULL)+filename = "folder.jpg";+ /* Use the index position of the cover in the glist to create a unique filename * Convert the index number to a string and prefix with a dot (hidden file) */ gint display_cover_index; display_cover_index = g_list_index (fetchcover_image_list, displayed_cover); gchar *dcstr_index = NULL;-dcstr_index = (gchar *) g_malloc (4);+dcstr_index = (gchar *) g_malloc (sizeof(gint) + (sizeof(gchar) * 3)); g_sprintf (dcstr_index, ".%d_@_", display_cover_index); gchar *fname = NULL;-if (g_str_has_suffix(*template_items, ".jpg"))+if (g_str_has_suffix(filename, ".jpg")) fname = g_strconcat(dcstr_index, filename, NULL); else fname = g_strconcat(dcstr_index, filename, ".jpg", NULL);@@ -566,14 +582,24 @@ /* Assign the filename ready to rename the file */ newname = g_build_filename(displayed_cover->dir, fname_items[1], NULL); fetchcover_debug("New name of file is %s\n", newname);--if (g_file_test (newname, G_FILE_TEST_EXISTS))++while (g_file_test (newname, G_FILE_TEST_EXISTS)) {-/* file with the new name exists so delete the file */-g_remove (newname);+newname = display_file_exist_dialog (newname);+if (newname == NULL)+break; } +/* Carry the nullified value back to the original called so the+ * entire fetchcover process can be cancelled+ */+if (newname == NULL)+return NULL;+ gchar *oldname = g_build_filename(displayed_cover->dir, displayed_cover->filename, NULL);+/* Rename the preferred choice, ie. .2_@_After_Forever.jpg, to the preferred name, + * ie. After_Forever.jpg+ */ g_rename (oldname, newname); /* Tidy up to ensure the path will not get cleaned up@@ -590,6 +616,75 @@ } #endif /* HAVE_CURL */ +static gchar *display_file_exist_dialog (gchar *filename)+{+gint result;+gchar **splitarr = NULL;+gchar *basename = NULL;+gint i;+gchar *message;+GtkWidget *label;+GtkWidget *dialog = gtk_dialog_new_with_buttons ("Coverart file already exists",+ NULL,+ GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT,+ GTK_STOCK_YES,+ GTK_RESPONSE_YES,+ GTK_STOCK_NO,+ GTK_RESPONSE_NO,+ GTK_STOCK_CANCEL,+ GTK_RESPONSE_REJECT,+ NULL);+message = g_strdup_printf (_("The picture file %s already exists. \+\nThis may be associated with other music files in the directory. \+\n\n- Clicking Yes will overwrite the existing file, possibly associating \+\n other music files in the same directory with this coverart file. \+\n- Clicking No will save the file with a unique file name. \+\n- Clicking Cancel will abort the fetchcover operation."), filename);+ +label = gtk_label_new (message);+ + /* Add the label, and show everything we've added to the dialog. */+ gtk_container_add (GTK_CONTAINER (GTK_DIALOG(dialog)->vbox), label);++gtk_widget_show_all (dialog);+result = gtk_dialog_run (GTK_DIALOG(dialog));+g_free (message);++switch (result)+{+case GTK_RESPONSE_REJECT:+/* Cancel has been clicked so no save */+gtk_widget_destroy (dialog);+return NULL;+case GTK_RESPONSE_YES:+/* Yes clicked so overwrite the file is okay. Leave final_filename intact+ * and remove the original+ */+g_remove (filename);+gtk_widget_destroy (dialog);+return filename;+case GTK_RESPONSE_NO:+/* User doesnt want to overwrite anything so need to do some work on filename */+splitarr = g_strsplit (filename, ".", 0);+basename = splitarr[0];++for (i = 1; g_file_test (filename, G_FILE_TEST_EXISTS); ++i)+{+g_sprintf (filename, "%s%d.jpg", basename, i);+}++/* Should have found a filename that really doesnt exist so this needs to be returned */+basename = NULL;+g_strfreev(splitarr);+gtk_widget_destroy (dialog);++return filename;+default:+gtk_widget_destroy (dialog);+return NULL;+}+}+ /** * free_fetchcover: * @@ -658,9 +753,6 @@ } #endif /* CURL */ free_fetchcover_list();--/* Clear the status bar */-gtk_statusbar_pop(GTK_STATUSBAR(fetchcover_statusbar), 1); } /**@@ -798,8 +890,7 @@ gtk_widget_set_sensitive (prev_button, FALSE); fetchcover_statusbar_update ("CURL has not been installed so this function is not available"); #endif /* HAVE_CURL */--+ gtk_widget_show_all (fetchcover_dialog); g_object_unref (fetchcover_xml);@@ -828,6 +919,7 @@ } } + /** * fetchcover_statusbar_update: * @@ -844,6 +936,7 @@ } } + /** * on_coverart_context_menu_click: *@@ -867,13 +960,15 @@ g_return_if_fail (dialog); result = gtk_dialog_run (GTK_DIALOG (dialog));-+gtk_widget_hide (GTK_WIDGET(dialog));+gtk_widget_destroy (GTK_WIDGET(dialog));+ #ifdef HAVE_CURL gchar *filename = NULL; switch (result) {- case GTK_RESPONSE_ACCEPT:+ case GTK_RESPONSE_ACCEPT: filename = fetchcover_save (); if (filename) {@@ -892,7 +987,6 @@ #endif /* HAVE_CURL */ fetchcover_cleanup();- gtk_widget_destroy (GTK_WIDGET (dialog)); } /**@@ -912,7 +1006,8 @@ g_return_if_fail (dialog); result = gtk_dialog_run (GTK_DIALOG (dialog));-+gtk_widget_hide (GTK_WIDGET(dialog));+gtk_widget_destroy (GTK_WIDGET(dialog)); #ifdef HAVE_CURL gchar *filename = NULL;@@ -958,5 +1053,4 @@ #endif /* HAVE_CURL */ fetchcover_cleanup();- gtk_widget_destroy (GTK_WIDGET (dialog)); }This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 1562 Author: jcsjcsDate: 2007-06-19 06:20:14 -0700 (Tue, 19 Jun 2007)Log Message:-----------* src/file_itunesdb.c: Todd's patch to display the repository name while writing to the iPod.* data/gtkpod.glade: Todd's patch to substitute custom button with stock button in the export dialog.Modified Paths:-------------- gtkpod/trunk/ChangeLog_detailed gtkpod/trunk/data/gtkpod.glade gtkpod/trunk/src/file_itunesdb.cModified: gtkpod/trunk/ChangeLog_detailed===================================================================--- gtkpod/trunk/ChangeLog_detailed2007-06-18 22:39:26 UTC (rev 1561)+++ gtkpod/trunk/ChangeLog_detailed2007-06-19 13:20:14 UTC (rev 1562)@@ -1,5 +1,13 @@-2007-06-17 P.G. Richardson <phantom_sf at users.sourceforge.net>+2007-06-19 Jorg Schuler <jcsjcs at users.sourceforge.net> +* src/file_itunesdb.c: Todd's patch to display the repository+ name while writing to the iPod.++* data/gtkpod.glade: Todd's patch to substitute custom button+ with stock button in the export dialog.++2007-06-18 P.G. Richardson <phantom_sf at users.sourceforge.net>+ Bug fixes spotted by Daniele Forsi. Change in coverart not made to coverart display when apply button@@ -10,24 +18,24 @@ Should always be a default value of folder.jpg if none of the templates provide a non-null value. -* details.c:+* src/details.c: details_copy_artwork() has to now always recopy the artwork from file. The reason being, fetchcover overwrites the artwork hence the file name will still be the same while different artwork. -* display_coverart.h- display_coverart.c:+* src/display_coverart.h+ src/display_coverart.c: set_covers() and set_cover_item() now has a parameter to force an update of the cover images from file. Only used by details_copy_artwork() when the apply button is clicked on the details window. -* fetchcover.c:+* src/fetchcover.c: dialog will now appear if a cover image file already exists in the tracks directory. Gives the options to overwrite, save as unique name or cancel completely. -2007-06-17 Jorg Schuler <jcsjcs at users.sourceforge.net>+2007-06-18 Jorg Schuler <jcsjcs at users.sourceforge.net> * src/misc.h src/details.cModified: gtkpod/trunk/data/gtkpod.glade===================================================================--- gtkpod/trunk/data/gtkpod.glade2007-06-18 22:39:26 UTC (rev 1561)+++ gtkpod/trunk/data/gtkpod.glade2007-06-19 13:20:14 UTC (rev 1562)@@ -21065,75 +21065,13 @@ <widget class="GtkButton" id="abortbutton"> <property name="border_width">2</property> <property name="visible">True</property>+ <property name="tooltip" translatable="yes">Export can be continued at a later time if canceled.</property> <property name="can_default">True</property> <property name="can_focus">True</property>+ <property name="label">gtk-cancel</property>+ <property name="use_stock">True</property> <property name="relief">GTK_RELIEF_NORMAL</property> <property name="focus_on_click">True</property>-- <child>-<widget class="GtkAlignment" id="alignment15">- <property name="visible">True</property>- <property name="xalign">0.5</property>- <property name="yalign">0.5</property>- <property name="xscale">0</property>- <property name="yscale">0</property>- <property name="top_padding">0</property>- <property name="bottom_padding">0</property>- <property name="left_padding">0</property>- <property name="right_padding">0</property>-- <child>- <widget class="GtkHBox" id="hbox211">- <property name="visible">True</property>- <property name="hom*ogeneous">False</property>- <property name="spacing">2</property>-- <child>-<widget class="GtkImage" id="image3881">- <property name="visible">True</property>- <property name="stock">gtk-cancel</property>- <property name="icon_size">4</property>- <property name="xalign">0.5</property>- <property name="yalign">0.5</property>- <property name="xpad">0</property>- <property name="ypad">0</property>-</widget>-<packing>- <property name="padding">0</property>- <property name="expand">False</property>- <property name="fill">False</property>-</packing>- </child>-- <child>-<widget class="GtkLabel" id="label458">- <property name="visible">True</property>- <property name="label" translatable="yes">Press button to abort.-Export can be continued at a later time.</property>- <property name="use_underline">True</property>- <property name="use_markup">False</property>- <property name="justify">GTK_JUSTIFY_CENTER</property>- <property name="wrap">False</property>- <property name="selectable">False</property>- <property name="xalign">0.5</property>- <property name="yalign">0.5</property>- <property name="xpad">0</property>- <property name="ypad">0</property>- <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>- <property name="width_chars">-1</property>- <property name="single_line_mode">False</property>- <property name="angle">0</property>-</widget>-<packing>- <property name="padding">0</property>- <property name="expand">False</property>- <property name="fill">False</property>-</packing>- </child>- </widget>- </child>-</widget>- </child> </widget> </child> </widget>Modified: gtkpod/trunk/src/file_itunesdb.c===================================================================--- gtkpod/trunk/src/file_itunesdb.c2007-06-18 22:39:26 UTC (rev 1561)+++ gtkpod/trunk/src/file_itunesdb.c2007-06-19 13:20:14 UTC (rev 1562)@@ -1754,6 +1754,7 @@ gboolean success = TRUE; ExtraiTunesDBData *eitdb; GtkWidget *dialog;+ Playlist *mpl; TransferData *transferdata; g_return_val_if_fail (itdb, FALSE);@@ -1763,6 +1764,9 @@ cfgdir = prefs_get_cfgdir (); g_return_val_if_fail (cfgdir, FALSE); + mpl = itdb_playlist_mpl (itdb);+ g_return_val_if_fail (mpl, FALSE);+ if (!eitdb->itdb_imported) { /* No iTunesDB was read but user wants to export current data. If an iTunesDB is present on the iPod or in cfgdir,@@ -1854,8 +1858,10 @@ if (success) {- gtk_label_set_text (GTK_LABEL (transferdata->textlabel),- _("Now writing database. Please wait..."));+ gchar *buf;+ buf = g_strdup_printf (_("Now writing database '%s'. Please wait..."), mpl->name);+ gtk_label_set_text (GTK_LABEL (transferdata->textlabel), buf);+ g_free (buf); while (widgets_blocked && gtk_events_pending ()) gtk_main_iteration ();@@ -1983,8 +1989,6 @@ /* indicate that files and/or database is saved */ if (success) {- Playlist *mpl = itdb_playlist_mpl (itdb);- g_return_val_if_fail (mpl, success); data_unchanged (itdb); if (itdb->usertype & GP_ITDB_TYPE_IPOD) {This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 1563 Author: jcsjcsDate: 2007-06-19 06:21:50 -0700 (Tue, 19 Jun 2007)Log Message:-----------* src/file.c: set mediatype to 'audiobook' for .mb4 files.Modified Paths:-------------- gtkpod/trunk/ChangeLog_detailed gtkpod/trunk/src/file.cModified: gtkpod/trunk/ChangeLog_detailed===================================================================--- gtkpod/trunk/ChangeLog_detailed2007-06-19 13:20:14 UTC (rev 1562)+++ gtkpod/trunk/ChangeLog_detailed2007-06-19 13:21:50 UTC (rev 1563)@@ -6,6 +6,8 @@ * data/gtkpod.glade: Todd's patch to substitute custom button with stock button in the export dialog. +* src/file.c: set mediatype to 'audiobook' for .mb4 files.+ 2007-06-18 P.G. Richardson <phantom_sf at users.sourceforge.net> Bug fixes spotted by Daniele Forsi.Modified: gtkpod/trunk/src/file.c===================================================================--- gtkpod/trunk/src/file.c2007-06-19 13:20:14 UTC (rev 1562)+++ gtkpod/trunk/src/file.c2007-06-19 13:21:50 UTC (rev 1563)@@ -1106,24 +1106,31 @@ case FILE_TYPE_MP3: nti = mp3_get_file_info (name); /* Set mediatype to audio */-if (nti) nti->mediatype = 0x00000001;+if (nti) nti->mediatype = ITDB_MEDIATYPE_AUDIO; break; case FILE_TYPE_M4A: case FILE_TYPE_M4P:- case FILE_TYPE_M4B: nti = mp4_get_file_info (name); /* Set mediatype to audio */ if (nti) {- nti->mediatype = 0x00000001;+ nti->mediatype = ITDB_MEDIATYPE_AUDIO; } break;+ case FILE_TYPE_M4B:+nti = mp4_get_file_info (name);+/* Set mediatype to audiobook */+if (nti)+{+ nti->mediatype = ITDB_MEDIATYPE_AUDIOBOOK;+}+break; case FILE_TYPE_WAV: nti = wav_get_file_info (name); /* Set mediatype to audio */ if (nti) {- nti->mediatype = 0x00000001;+ nti->mediatype = ITDB_MEDIATYPE_AUDIO; } break; case FILE_TYPE_OGG:@@ -1131,7 +1138,7 @@ /* Set unk208 to audio */ if (nti) {- nti->mediatype = 0x00000001;+ nti->mediatype = ITDB_MEDIATYPE_AUDIO; } break; case FILE_TYPE_FLAC:@@ -1139,7 +1146,7 @@ /* Set unk208 to audio */ if (nti) {- nti->mediatype = 0x00000001;+ nti->mediatype = ITDB_MEDIATYPE_AUDIO; } break; case FILE_TYPE_M4V:@@ -1151,7 +1158,7 @@ /* Set mediatype to video */ if (nti) {- nti->mediatype = 0x00000002;+ nti->mediatype = ITDB_MEDIATYPE_MOVIE; nti->movie_flag = 0x01; } break;@@ -1162,7 +1169,7 @@ /* Set mediatype to video */ if (nti) {- nti->mediatype = 0x00000002;+ nti->mediatype = ITDB_MEDIATYPE_MOVIE; nti->movie_flag = 0x01; } break;This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 1564 Author: jcsjcsDate: 2007-06-19 06:54:47 -0700 (Tue, 19 Jun 2007)Log Message:-----------* src/ipod_init.c (gp_ipod_init_set_model): avoid segfault if iPod model cannot be selected (possibly GTK+ or glade version incompatibility?).Modified Paths:-------------- gtkpod/trunk/ChangeLog_detailed gtkpod/trunk/src/ipod_init.cModified: gtkpod/trunk/ChangeLog_detailed===================================================================--- gtkpod/trunk/ChangeLog_detailed2007-06-19 13:21:50 UTC (rev 1563)+++ gtkpod/trunk/ChangeLog_detailed2007-06-19 13:54:47 UTC (rev 1564)@@ -8,6 +8,10 @@ * src/file.c: set mediatype to 'audiobook' for .mb4 files. +* src/ipod_init.c (gp_ipod_init_set_model): avoid segfault if+ iPod model cannot be selected (possibly GTK+ or glade version+ incompatibility?).+ 2007-06-18 P.G. Richardson <phantom_sf at users.sourceforge.net> Bug fixes spotted by Daniele Forsi.Modified: gtkpod/trunk/src/ipod_init.c===================================================================--- gtkpod/trunk/src/ipod_init.c2007-06-19 13:21:50 UTC (rev 1563)+++ gtkpod/trunk/src/ipod_init.c2007-06-19 13:54:47 UTC (rev 1564)@@ -1,4 +1,4 @@-/* Time-stamp: <2006-11-25 00:50:21 jcs>+/* Time-stamp: <2007-06-19 22:52:52 jcs> | | Copyright (C) 2002-2005 Jorg Schuler <jcsjcs at users sourceforge net> | Part of the gtkpod project.@@ -458,7 +458,11 @@ case GTK_RESPONSE_OK: model = gtk_combo_box_get_active_text ( GTK_COMBO_BOX (GET_WIDGET (MODEL_COMBO)));-if (strcmp (model, gettext(SELECT_OR_ENTER_YOUR_MODEL)) == 0)+if (!model)+{+ gtkpod_warning (_("Could not determine the model you selected -- this could be a bug or incompatibilty in the GTK+ or glade library.\n\n"));+}+else if (strcmp (model, gettext(SELECT_OR_ENTER_YOUR_MODEL)) == 0) { /* User didn't choose a model */ g_free (model); model = NULL;This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 1565 Author: tmzullingerDate: 2007-06-19 21:46:34 -0700 (Tue, 19 Jun 2007)Log Message:-----------disable debug output for releaseModified Paths:-------------- gtkpod/trunk/ChangeLog_detailed gtkpod/trunk/src/autodetection.c gtkpod/trunk/src/file_convert.cModified: gtkpod/trunk/ChangeLog_detailed===================================================================--- gtkpod/trunk/ChangeLog_detailed2007-06-19 13:54:47 UTC (rev 1564)+++ gtkpod/trunk/ChangeLog_detailed2007-06-20 04:46:34 UTC (rev 1565)@@ -1,3 +1,9 @@+2007-06-20 Todd Zullinger <tmzullinger at users.sourceforge.net>++* src/file_convert.c+ src/autodetection.c:+ disable debug output for release+ 2007-06-19 Jorg Schuler <jcsjcs at users.sourceforge.net> * src/file_itunesdb.c: Todd's patch to display the repositoryModified: gtkpod/trunk/src/autodetection.c===================================================================--- gtkpod/trunk/src/autodetection.c2007-06-19 13:54:47 UTC (rev 1564)+++ gtkpod/trunk/src/autodetection.c2007-06-20 04:46:34 UTC (rev 1565)@@ -23,7 +23,7 @@ | | This product is not supported/written/published by Apple! |-| $Id: autodetection.c,v 1.1 2007/05/11 15:41:53 jcsjcs Exp $+| $Id$ */ @@ -44,7 +44,7 @@ #include <dbus/dbus.h> #endif -#define DEBUG_AUTO+#undef DEBUG_AUTO #ifdef DEBUG_AUTO # define _TO_STR(x) #x # define TO_STR(x) _TO_STR(x)Modified: gtkpod/trunk/src/file_convert.c===================================================================--- gtkpod/trunk/src/file_convert.c2007-06-19 13:54:47 UTC (rev 1564)+++ gtkpod/trunk/src/file_convert.c2007-06-20 04:46:34 UTC (rev 1565)@@ -48,7 +48,7 @@ #include <sys/wait.h> #include <unistd.h> -#define DEBUG_CONV+#undef DEBUG_CONV #ifdef DEBUG_CONV # define _TO_STR(x) #x # define TO_STR(x) _TO_STR(x)This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.