[Pkg-gtkpod-devel] r118 - in gtkpod/branches/upstream/current: . po scripts src

Sat Apr 8 19:36:10 UTC 2006

Author: djpig
Date: 2006-04-08 19:35:58 +0000 (Sat, 08 Apr 2006)
New Revision: 118

Modified:
   gtkpod/branches/upstream/current/ChangeLog
   gtkpod/branches/upstream/current/INSTALL
   gtkpod/branches/upstream/current/TODOandBUGS.txt
   gtkpod/branches/upstream/current/TROUBLESHOOTING
   gtkpod/branches/upstream/current/autogen.sh
   gtkpod/branches/upstream/current/configure
   gtkpod/branches/upstream/current/configure.in
   gtkpod/branches/upstream/current/gtkpod.glade
   gtkpod/branches/upstream/current/po/de.gmo
   gtkpod/branches/upstream/current/po/de.po
   gtkpod/branches/upstream/current/po/fr.gmo
   gtkpod/branches/upstream/current/po/fr.po
   gtkpod/branches/upstream/current/po/gtkpod.pot
   gtkpod/branches/upstream/current/po/he.gmo
   gtkpod/branches/upstream/current/po/he.po
   gtkpod/branches/upstream/current/po/it.gmo
   gtkpod/branches/upstream/current/po/it.po
   gtkpod/branches/upstream/current/po/ja.gmo
   gtkpod/branches/upstream/current/po/ja.po
   gtkpod/branches/upstream/current/po/sv.gmo
   gtkpod/branches/upstream/current/po/sv.po
   gtkpod/branches/upstream/current/scripts/mab2vcard
   gtkpod/branches/upstream/current/scripts/sync-knotes.sh
   gtkpod/branches/upstream/current/src/context_menus.c
   gtkpod/branches/upstream/current/src/display.c
   gtkpod/branches/upstream/current/src/file.c
   gtkpod/branches/upstream/current/src/file_export.c
   gtkpod/branches/upstream/current/src/file_itunesdb.c
   gtkpod/branches/upstream/current/src/fileselection.c
   gtkpod/branches/upstream/current/src/mp3file.c
   gtkpod/branches/upstream/current/src/podcast.c
   gtkpod/branches/upstream/current/src/podcast.h
   gtkpod/branches/upstream/current/src/prefs.c
   gtkpod/branches/upstream/current/src/prefs_window.c
Log:
Load /tmp/tmp.4kfgYw/gtkpod-0.99.4 into
gtkpod/branches/upstream/current.


Modified: gtkpod/branches/upstream/current/ChangeLog
===================================================================

--- gtkpod/branches/upstream/current/ChangeLog	2006-04-08 19:20:23 UTC (rev 117)
+++ gtkpod/branches/upstream/current/ChangeLog	2006-04-08 19:35:58 UTC (rev 118)
@@ -1,3 +1,20 @@
+gtkpod V0.99.4
+
+       BUGFIX: Options for exporting playlist files could not be
+       changed.
+
+       BUGFIX: Fixed segfault when updating tracks or directories with
+       artowrk present.
+
+       BUGFIX: Browse button for "Sync Notes Script" opened a
+       directory browser instead of a file browser.
+
+       BUGFIX: Writing ID3v2.4 tags in UTF8 did not always
+       work. Thanks to 't0c' for the patch.
+
+       BUGFIX: Context Menus for removing playlists from the iPod were
+       not displayed. Thanks to 'rob/biffhero' for pointing this out.
+
 gtkpod V0.99.2
        BUGFIX: Fix segfault when applying preferences.
 

Modified: gtkpod/branches/upstream/current/INSTALL
===================================================================
--- gtkpod/branches/upstream/current/INSTALL	2006-04-08 19:20:23 UTC (rev 117)
+++ gtkpod/branches/upstream/current/INSTALL	2006-04-08 19:35:58 UTC (rev 118)
@@ -27,11 +27,13 @@
 
    ./bootstrap --disable-server ; make ; make install
 
-   If you install to /usr/local/lib please don't forget to add the
-   path to LD_LIBRARY_PATH:
+2. If you install libraries to /usr/local/lib please don't forget to
+   add the path to LD_LIBRARY_PATH and PKG_CONFIG_PATH
 
      LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/local/lib
+     PKG_CONFIG_PATH=$PKG_CONFIG_PATH:/usr/local/lib
      export LD_LIBRARY_PATH
+     export PKG_CONFIG_PATH
 
    You can add those lines to your ~/.bashrc or add it globally to
    /etc/profile.
@@ -40,7 +42,7 @@
    that you will need to install the "-dev" packages as well to be
    able to compile.
 
-2. Run the gtkpod 'configure' script to set up the compile
+3. Run the gtkpod 'configure' script to set up the compile
 
    ./configure
 
@@ -48,11 +50,11 @@
 
    ./configure --help
 
-3. Compile the gtkpod software:
+4. Compile the gtkpod software:
 
    make
 
-4. Install the gtkpod software (may require root privileges):
+5. Install the gtkpod software (may require root privileges):
 
    make install
 

Modified: gtkpod/branches/upstream/current/TODOandBUGS.txt
===================================================================
--- gtkpod/branches/upstream/current/TODOandBUGS.txt	2006-04-08 19:20:23 UTC (rev 117)
+++ gtkpod/branches/upstream/current/TODOandBUGS.txt	2006-04-08 19:35:58 UTC (rev 118)
@@ -1,5 +1,11 @@
 TODO:
 
+>         {"S492", 30 * GB, MODEL_TYPE_REGULAR, FOURTH_GENERATION},
+HP-iPod.
+
+
+- retag tracks with database information
+
 - photo support
 
 - lyrics support (http://www.jcbsoft.net/podlyrics/)
@@ -219,6 +225,8 @@
 
 BUGLIST:
 
+- segfault when sorting the playlists (0.99.2)
+
 drag playlist to track view: (JCS)
 (gtkpod:19911): Gtk-CRITICAL **: gtk_text_buffer_emit_insert: assertion `g_utf8_validate (text, len, NULL)' failed
 

Modified: gtkpod/branches/upstream/current/TROUBLESHOOTING
===================================================================
--- gtkpod/branches/upstream/current/TROUBLESHOOTING	2006-04-08 19:20:23 UTC (rev 117)
+++ gtkpod/branches/upstream/current/TROUBLESHOOTING	2006-04-08 19:35:58 UTC (rev 118)
@@ -3,8 +3,8 @@
 
 Contents:
 
-- Installed libmp4v2 from source to /usr/local/lib, but gtkpod is
-  unable to locate libmp4.so.0
+- Installed libmp4v2 or libgpod from source to /usr/local/lib, but
+  gtkpod is unable to locate libmp4.so.0 or libgpod.so.0
 
 - Files copied to gtkpod but they don't appear in the database (0.80,
   Tony Williams)
@@ -17,6 +17,12 @@
      ieee1394: sbp2: aborting sbp2 command
      Test Unit Ready 00 00 00 00 00
 
+- The following error message is displayed when accessing the device
+  (Ingo Reimann)
+     usb-storage: Attempting to get CSW...
+     usb-storage: usb_stor_bulk_transfer_buf: xfer 13 bytes
+     usb-storage: Status code -75; transferred 0/13
+
 - When connecting an iPod via USB to a 2.6 kernel machine the iPod will
   be recognized but not work correctly. In /var/log/messages you'll
   see the a bunch of "Buffer I/O error on device sd?" when connecting
@@ -32,8 +38,8 @@
 
 ----------------------------------------------------------------------
 
-Installed libmp4v2 from source to /usr/local/lib, but gtkpod is unable
-to locate libmp4.so.0
+Installed libmp4v2 or libgpod from source to /usr/local/lib, but
+gtkpod is unable to locate libmp4.so.0 or libgpod.so.0
 
 
 If you install to /usr/local/lib please don't forget to add the path
@@ -76,8 +82,8 @@
 ----------------------------------------------------------------------
 The following error message is displayed when accessing the device:
 
-ieee1394: sbp2: aborting sbp2 command
-Test Unit Ready 00 00 00 00 00
+     ieee1394: sbp2: aborting sbp2 command
+     Test Unit Ready 00 00 00 00 00
 
 Solution:
 
@@ -103,6 +109,23 @@
 
 
 ----------------------------------------------------------------------
+The following error message is displayed when accessing the device
+
+     usb-storage: Attempting to get CSW...
+     usb-storage: usb_stor_bulk_transfer_buf: xfer 13 bytes
+     usb-storage: Status code -75; transferred 0/13
+
+Solution (by Ingo Reimann):
+
+I tried to use an iPod Mini with my nforce2-Board, kernel
+2.6.14/2.6.15 debian sid and got messages like [above] in
+dmesg. /dev/sda appeared, but fdisk -l did not show anything
+
+The solution, that i found in a discussion on
+http://kerneltrap.org/node/3844 was to unload ehci_hcd.
+
+
+----------------------------------------------------------------------
 When connecting an iPod via USB to a 2.6 kernel machine the iPod will
 be recognized but not work correctly. In /var/log/messages you'll see
 the a bunch of "Buffer I/O error on device sd?" when connecting the

Modified: gtkpod/branches/upstream/current/autogen.sh
===================================================================
--- gtkpod/branches/upstream/current/autogen.sh	2006-04-08 19:20:23 UTC (rev 117)
+++ gtkpod/branches/upstream/current/autogen.sh	2006-04-08 19:35:58 UTC (rev 118)
@@ -19,7 +19,7 @@
     exit 1
 }
 
-(autoconf --version) < /dev/null > /dev/null 2>&1 || {
+(${AUTOCONF:-autoconf} --version) < /dev/null > /dev/null 2>&1 || {
   echo
   echo "**Error**: You must have \`autoconf' installed."
   echo "Download the appropriate package for your distribution,"
@@ -48,7 +48,7 @@
 }
 
 (grep "^AM_PROG_LIBTOOL" $srcdir/configure.in >/dev/null) && {
-  (libtool --version) < /dev/null > /dev/null 2>&1 || {
+  (${LIBTOOL:-libtool} --version) < /dev/null > /dev/null 2>&1 || {
     echo
     echo "**Error**: You must have \`libtool' installed."
     echo "You can get it from: ftp://ftp.gnu.org/pub/gnu/"
@@ -72,7 +72,7 @@
   }
 }
 
-(automake --version) < /dev/null > /dev/null 2>&1 || {
+(${AUTOMAKE:-automake} --version) < /dev/null > /dev/null 2>&1 || {
   echo
   echo "**Error**: You must have \`automake' installed."
   echo "You can get it from: ftp://ftp.gnu.org/pub/gnu/"
@@ -82,7 +82,7 @@
 
 
 # if no automake, don't bother testing for aclocal
-test -n "$NO_AUTOMAKE" || (aclocal --version) < /dev/null > /dev/null 2>&1 || {
+test -n "$NO_AUTOMAKE" || (${ACLOCAL:-aclocal} --version) < /dev/null > /dev/null 2>&1 || {
   echo
   echo "**Error**: Missing \`aclocal'.  The version of \`automake'"
   echo "installed doesn't appear recent enough."
@@ -136,19 +136,19 @@
       if grep "^AM_PROG_LIBTOOL" configure.in >/dev/null; then
 	if test -z "$NO_LIBTOOLIZE" ; then 
 	  echo "Running libtoolize..."
-	  libtoolize --force --copy
+	  ${LIBTOOLIZE:-libtoolize} --force --copy
 	fi
       fi
       echo "Running aclocal $aclocalinclude ..."
-      aclocal $aclocalinclude
+      ${ACLOCAL:-aclocal} $aclocalinclude
       if grep "^AM_CONFIG_HEADER" configure.in >/dev/null; then
 	echo "Running autoheader..."
-	autoheader
+	${AUTOHEADER:-autoheader}
       fi
       echo "Running automake --gnu $am_opt ..."
-      automake --add-missing --gnu $am_opt
+      ${AUTOMAKE:-automake} --add-missing --gnu $am_opt
       echo "Running autoconf ..."
-      autoconf
+      ${AUTOCONF:-autoconf}
     )
   fi
 done

Modified: gtkpod/branches/upstream/current/configure
===================================================================
--- gtkpod/branches/upstream/current/configure	2006-04-08 19:20:23 UTC (rev 117)
+++ gtkpod/branches/upstream/current/configure	2006-04-08 19:35:58 UTC (rev 118)
@@ -1593,7 +1593,7 @@
 
 # Define the identity of the package.
  PACKAGE=gtkpod
- VERSION=0.99.2
+ VERSION=0.99.4
 
 
 cat >>confdefs.h <<_ACEOF

Modified: gtkpod/branches/upstream/current/configure.in
===================================================================
--- gtkpod/branches/upstream/current/configure.in	2006-04-08 19:20:23 UTC (rev 117)
+++ gtkpod/branches/upstream/current/configure.in	2006-04-08 19:35:58 UTC (rev 118)
@@ -4,7 +4,7 @@
 AC_PREREQ(2.55)
 
 AC_INIT(configure.in)
-AM_INIT_AUTOMAKE(gtkpod, 0.99.2)
+AM_INIT_AUTOMAKE(gtkpod, 0.99.4)
 AM_CONFIG_HEADER(config.h)
 AM_MAINTAINER_MODE
 AC_CANONICAL_HOST

Modified: gtkpod/branches/upstream/current/gtkpod.glade
===================================================================
--- gtkpod/branches/upstream/current/gtkpod.glade	2006-04-08 19:20:23 UTC (rev 117)
+++ gtkpod/branches/upstream/current/gtkpod.glade	2006-04-08 19:35:58 UTC (rev 118)
@@ -12410,12 +12410,13 @@
 			  <child>
 			    <widget class="GtkLabel" id="prefs_label_syncexamples">
 			      <property name="visible">True</property>
+			      <property name="can_focus">True</property>
 			      <property name="label">&lt;i&gt;label&lt;/i&gt;</property>
 			      <property name="use_underline">False</property>
 			      <property name="use_markup">True</property>
 			      <property name="justify">GTK_JUSTIFY_LEFT</property>
 			      <property name="wrap">True</property>
-			      <property name="selectable">False</property>
+			      <property name="selectable">True</property>
 			      <property name="xalign">0</property>
 			      <property name="yalign">0.5</property>
 			      <property name="xpad">10</property>

Modified: gtkpod/branches/upstream/current/po/de.gmo
===================================================================
(Binary files differ)

Modified: gtkpod/branches/upstream/current/po/de.po
===================================================================
--- gtkpod/branches/upstream/current/po/de.po	2006-04-08 19:20:23 UTC (rev 117)
+++ gtkpod/branches/upstream/current/po/de.po	2006-04-08 19:35:58 UTC (rev 118)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: gtkpod 0.52\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-12-14 23:51+0900\n"
+"POT-Creation-Date: 2006-03-05 23:01+0900\n"
 "PO-Revision-Date: 2005-12-14 23:22+0900\n"
 "Last-Translator: JÃ¶rg Schuler <jcsjcs at users.sourceforge.net>\n"
 "Language-Team: none\n"
@@ -235,103 +235,100 @@
 msgid "Confirmation Dialogue"
 msgstr "Sicherheitsabfrage"
 
-#: src/context_menus.c:368 gtkpod.glade:530
-msgid "Edit"
-msgstr "Bearbeiten"
-
-#: src/context_menus.c:370 src/tools.c:634
+#: src/context_menus.c:352 src/tools.c:634
 msgid "Play Now"
 msgstr "Jetzt Spielen"
 
-#: src/context_menus.c:372 src/tools.c:645
+#: src/context_menus.c:354 src/tools.c:645
 msgid "Enqueue"
 msgstr "Zum Abspielen Vormerken"
 
-#: src/context_menus.c:375
-msgid "Export Tracks"
-msgstr "StÃ¼cke Exportieren"
+#: src/context_menus.c:357
+#, fuzzy
+msgid "Copy Tracks to Filesystem"
+msgstr "_Aktualiere StÃ¼cke aus der Datei"
 
-#: src/context_menus.c:377 src/file_export.c:1069
+#: src/context_menus.c:359 src/file_export.c:1069
 msgid "Create Playlist File"
 msgstr "Wiedergabelistendatei erstellen"
 
-#: src/context_menus.c:379
+#: src/context_menus.c:361
 msgid "Edit Details"
 msgstr "Details editieren"
 
-#: src/context_menus.c:381 gtkpod.glade:12816
+#: src/context_menus.c:363 gtkpod.glade:12817
 msgid "Update"
 msgstr "Aktualisieren"
 
-#: src/context_menus.c:383
+#: src/context_menus.c:365
 msgid "Sync Dirs"
 msgstr "Verzeichnisse abgleichen"
 
-#: src/context_menus.c:385
+#: src/context_menus.c:367
 msgid "Normalize"
 msgstr "LautstÃ¤rkenormalisierung"
 
-#: src/context_menus.c:387
+#: src/context_menus.c:369
 msgid "Create new Playlist"
 msgstr "Neue Wiedergabeliste erstellen"
 
-#: src/context_menus.c:390
+#: src/context_menus.c:372
 msgid "Edit Smart Playlist"
 msgstr "Intelligente Wiedergabeliste editieren"
 
-#: src/context_menus.c:396
+#: src/context_menus.c:378
 msgid "Alphabetize"
 msgstr "Sortieren"
 
-#: src/context_menus.c:420
+#: src/context_menus.c:402
 msgid "Delete From iPod"
 msgstr "Vom iPod entfernen "
 
-#: src/context_menus.c:426
+#: src/context_menus.c:408
 msgid "Delete From Harddisk"
 msgstr "Von der Festplatte lÃ¶schen"
 
-#: src/context_menus.c:432
+#: src/context_menus.c:414
 msgid "Delete From Database"
 msgstr "Aus der Datenbank entfernen"
 
-#: src/context_menus.c:438
+#: src/context_menus.c:420
 msgid "Delete From Playlist"
 msgstr "Von der Wiedergabeliste entfernen"
 
-#: src/context_menus.c:457
+#: src/context_menus.c:439
 msgid "Delete Including Tracks"
 msgstr "LÃ¶schen inklusive der StÃ¼cke"
 
-#: src/context_menus.c:463
+#: src/context_menus.c:445
 msgid "Delete Including Tracks (Harddisk)"
 msgstr "LÃ¶schen inklusive der StÃ¼cke (Festplatte)"
 
-#: src/context_menus.c:469
+#: src/context_menus.c:451
 msgid "Delete Including Tracks (Database)"
 msgstr "LÃ¶schen inklusive der StÃ¼cke (Datenbank)"
 
-#: src/context_menus.c:475
+#: src/context_menus.c:457
 msgid "Delete But Keep Tracks"
 msgstr "LÃ¶schen aber StÃ¼cke behalten"
 
-#: src/context_menus.c:481
+#: src/context_menus.c:463
 msgid "Remove All Tracks from iPod"
 msgstr "Alle StÃ¼cke vom iPod entfernen"
 
-#: src/context_menus.c:487
+#: src/context_menus.c:469
 msgid "Remove All Tracks from Database"
 msgstr "Alle StÃ¼cke aus der Datenbank entfernen"
 
-#: src/context_menus.c:494
+#: src/context_menus.c:476
 msgid "Remove All Podcasts from iPod"
 msgstr "Alle Podcasts vom iPod entfernen"
 
-#: src/context_menus.c:505 gtkpod.glade:156
+#: src/context_menus.c:487 gtkpod.glade:156
 msgid "Update Podcasts"
 msgstr "Podcasts erneuern"
 
-#: src/context_menus.c:512
+#: src/context_menus.c:494
 msgid "Podcasts Preferences"
 msgstr "Podcasts Einstellungen"
 
@@ -436,7 +433,7 @@
 
 #. add podcast playlist
 #: src/display_itdb.c:843 src/display_itdb.c:871 src/display_itdb.c:975
-#: gtkpod.glade:13668
+#: gtkpod.glade:13669
 msgid "Podcasts"
 msgstr "Podcasts"
 
@@ -908,27 +905,27 @@
 msgid "Unknown token '%s' in template '%s'\n"
 msgstr "Unbekanntes Token '%s' in der Schablone '%s'\n"
 
-#: src/file.c:815
+#: src/file.c:817
 #, c-format
 msgid "Local filename not valid (%s)"
 msgstr "Lokaler Dateiname ist nicht gÃ¼ltig (%s)"
 
-#: src/file.c:868
+#: src/file.c:870
 #, c-format
 msgid "No information found for user '%s' in '%s'"
 msgstr "Keine Informationen fÃ¼r den Benutzer '%s' gefunden in '%s'"
 
-#: src/file.c:875
+#: src/file.c:877
 #, c-format
 msgid "mserv data file (%s) not available for track (%s)"
 msgstr "mserv Datei (%s) nicht verfÃ¼gbar fÃ¼r Track (%s)"
 
-#: src/file.c:883
+#: src/file.c:885
 #, c-format
 msgid "Track (%s) not in mserv music root directory (%s)"
 msgstr "Track (%s) ist nicht im mserv Root-Verzeichnis (%s)"
 
-#: src/file.c:988
+#: src/file.c:990
 #, c-format
 msgid ""
 "The following track could not be processed (file does not exist): '%s'\n"
@@ -936,14 +933,14 @@
 "Das folgende StÃ¼ck konnte nicht bearbeitet werden (Datei existiert nicht): '%"
 "s'\n"
 
-#: src/file.c:1037
+#: src/file.c:1039
 #, c-format
 msgid "The following track could not be processed (filetype unknown): '%s'\n"
 msgstr ""
 "Das folgende StÃ¼ck konnte nicht bearbeitet werden (Dateityp unbekannt): '%"
 "s'\n"
 
-#: src/file.c:1119
+#: src/file.c:1121
 #, c-format
 msgid ""
 "The following track could not be processed (filetype is known but analysis "
@@ -952,42 +949,42 @@
 "Das folgende StÃ¼ck konnte nicht bearbeitet werden (Dateityp ist bekannt aber "
 "die Analyse schlug fehl): '%s'\n"
 
-#: src/file.c:1148 src/file.c:1203
+#: src/file.c:1150 src/file.c:1205
 msgid "Nothing to update"
 msgstr "Nichts zum Aktualisieren"
 
-#: src/file.c:1168
+#: src/file.c:1170
 #, c-format
 msgid "Updating %s"
 msgstr "Aktualisiere '%s'"
 
-#: src/file.c:1184
+#: src/file.c:1186
 msgid "Updated selected tracks with info from file."
 msgstr ""
 "Die ausgewÃ¤hlten StÃ¼cke wurden mit Informationen aus der Datei aktualisiert."
 
-#: src/file.c:1216
+#: src/file.c:1218
 #, c-format
 msgid "Retrieving mserv data %s"
 msgstr "Hole mserv Daten %s"
 
 #. no path available
-#: src/file.c:1222 src/file.c:1900
+#: src/file.c:1224 src/file.c:1902
 msgid "no filename available"
 msgstr "Es steht kein Dateiname zur VerfÃ¼gung"
 
-#: src/file.c:1227
+#: src/file.c:1229
 msgid "Updated selected tracks with data from mserv."
 msgstr ""
 "Die ausgewÃ¤hlten StÃ¼cke wurden mit Informationen aus der mserv-Datenbank "
 "aktualisiert."
 
-#: src/file.c:1294
+#: src/file.c:1296
 #, c-format
 msgid "Syncing directory '%s'"
 msgstr "Verzeichnis '%s' wird abgeglichen"
 
-#: src/file.c:1319
+#: src/file.c:1321
 msgid "Syncing completed. No files deleted."
 msgstr "Abgleich beendet. Keine Dateien gelÃ¶scht."
 
@@ -996,29 +993,29 @@
 #. title
 #. label
 #. scrolled text
-#: src/file.c:1432
+#: src/file.c:1434
 msgid "Never delete any files when syncing"
 msgstr "Beim Abgleich nie Dateien lÃ¶schen"
 
-#: src/file.c:1461
+#: src/file.c:1463
 msgid "Syncing completed."
 msgstr "Abgleich beendet."
 
-#: src/file.c:1481
+#: src/file.c:1483
 msgid "Syncing aborted"
 msgstr "Abgleich abgebrochen."
 
-#: src/file.c:1519
+#: src/file.c:1521
 msgid "No tracks in selection"
 msgstr "Keine StÃ¼cke ausgewÃ¤hlt"
 
-#: src/file.c:1569
+#: src/file.c:1571
 #, c-format
 msgid "'%s' is not a directory. Ignored.\n"
 msgstr "'%s' ist kein Verzeichnis und wird ignoriert.\n"
 
 #. no directory names available
-#: src/file.c:1599
+#: src/file.c:1601
 msgid ""
 "No directory names were stored. Make sure that you enable 'Write extended "
 "information' in the Export section of the preferences at the time of "
@@ -1036,13 +1033,13 @@
 "Option 'Mehrfaches Einlesen von StÃ¼cken verhindern' in der Import-Sektion "
 "und fÃ¼gen anschlieÃŸend die gewÃ¼nschten Verzeichnisse erneut hinzu.\n"
 
-#: src/file.c:1603
+#: src/file.c:1605
 msgid "No valid directories have been found. Sync aborted.\n"
 msgstr ""
 "Es wurden keine gÃ¼ltigen Verzeichnisse gefunden. Abgleich wurde "
 "abgebrochen.\n"
 
-#: src/file.c:1612
+#: src/file.c:1614
 msgid ""
 "The (former) contents of the following directories will be removed from the "
 "database:\n"
@@ -1052,7 +1049,7 @@
 "entfernt:\n"
 "\n"
 
-#: src/file.c:1620
+#: src/file.c:1622
 msgid ""
 "The following directories will be synchronized:\n"
 "\n"
@@ -1062,16 +1059,16 @@
 
 #. gint id,
 #. gboolean modal,
-#: src/file.c:1631
+#: src/file.c:1633
 msgid "Synchronize directories"
 msgstr "Verzeichnisse abgleichen"
 
 #. title
-#: src/file.c:1632
+#: src/file.c:1634
 msgid "OK to synchronize the following directories?"
 msgstr "Sollen die folgenden Verzeichnisse abgeglichen werden?"
 
-#: src/file.c:1670
+#: src/file.c:1672
 #, c-format
 msgid "The following track could not be updated"
 msgid_plural "The following %d tracks could not be updated"
@@ -1080,11 +1077,11 @@
 
 #. gint id,
 #. gboolean modal,
-#: src/file.c:1676
+#: src/file.c:1678
 msgid "Failed Track Update"
 msgstr "Aktualisierung fehlgeschlagen"
 
-#: src/file.c:1734
+#: src/file.c:1736
 #, c-format
 msgid "The following track has been updated"
 msgid_plural "The following %d tracks have been updated"
@@ -1093,11 +1090,11 @@
 
 #. gint id,
 #. gboolean modal,
-#: src/file.c:1740
+#: src/file.c:1742
 msgid "Successful Track Update"
 msgstr "Aktualisierung erfolgreich"
 
-#: src/file.c:1799
+#: src/file.c:1801
 #, c-format
 msgid "No mserv information could be retrieved for the following track"
 msgid_plural ""
@@ -1109,66 +1106,66 @@
 
 #. gint id,
 #. gboolean modal,
-#: src/file.c:1805
+#: src/file.c:1807
 msgid "mserv data retrieval problem"
 msgstr "Problem beim Nachschlagen der mserv Daten"
 
-#: src/file.c:1946
+#: src/file.c:1948
 msgid "file not found"
 msgstr "Datei nicht gefunden"
 
-#: src/file.c:1950
+#: src/file.c:1952
 msgid "format not supported"
 msgstr "Format wird nicht unterstÃ¼tzt"
 
-#: src/file.c:2031
+#: src/file.c:2033
 #, c-format
 msgid "Processing '%s'..."
 msgstr "Bearbeite '%s'..."
 
-#: src/file.c:2135 src/misc_track.c:1169 src/misc_track.c:1225
+#: src/file.c:2137 src/misc_track.c:1169 src/misc_track.c:1225
 #, c-format
 msgid ""
 "Podcast already present: '%s'\n"
 "\n"
 msgstr "Podcast ist bereits vorhanden: '%s'\n"
 
-#: src/file.c:2196
+#: src/file.c:2198
 #, c-format
 msgid ""
 "Writing to video files not yet supported (%s).\n"
 "\n"
 msgstr "Schreiben in Videodateien wird noch nicht unterstÃ¼tzt (%s).\n"
 
-#: src/file.c:2250 src/file.c:2264
+#: src/file.c:2252 src/file.c:2266
 #, c-format
 msgid "Couldn't change tags of file: %s\n"
 msgstr "Konnte Tags der Datei '%s' nicht Ã¤ndern\n"
 
-#: src/file.c:2548
+#: src/file.c:2550
 #, c-format
 msgid "Could not open '%s' for reading and writing.\n"
 msgstr "Datei '%s' konnte nicht zum Lesen und Schreiben geÃ¶ffnet werden.\n"
 
-#: src/file.c:2555
+#: src/file.c:2557
 #, c-format
 msgid "Could not obtain lock on '%s'.\n"
 msgstr "Lock auf '%s' konnte nicht erstellt werden.\n"
 
 #. error!
-#: src/file.c:2572 src/file.c:2581 src/file.c:2592 src/file.c:2602
+#: src/file.c:2574 src/file.c:2583 src/file.c:2594 src/file.c:2604
 #, c-format
 msgid "Malformed line in '%s': %s\n"
 msgstr "UngÃ¼ltige Zeile in '%s': %s\n"
 
 #. gint id,
 #. gboolean modal,
-#: src/file.c:2631
+#: src/file.c:2633
 msgid "Remove offline playcounts?"
 msgstr "Sollen Offline-Playcounts gelÃ¶scht werden?"
 
 #. title
-#: src/file.c:2632
+#: src/file.c:2634
 msgid ""
 "Some tracks played offline could not be found in the iTunesDB. Press 'OK' to "
 "remove them from the offline playcount file, 'Cancel' to keep them."
@@ -1177,19 +1174,19 @@
 "werden. WÃ¤hlen Sie 'OK', um diese aus der Playcount-Datei zu entfernen, "
 "'Abbrechen' um sie beizubehalten."
 
-#: src/file.c:2649
+#: src/file.c:2651
 #, c-format
 msgid "Error writing to '%s'.\n"
 msgstr "Fehler beim Schreiben in die Datei '%s'.\n"
 
-#: src/file.c:2698
+#: src/file.c:2700
 #, c-format
 msgid ""
 "Normalization failed: file type not supported (%s).\n"
 "\n"
 msgstr "Normalisierung fehlgeschlagen: Dateityp nicht unterstÃ¼tzt (%s).\n"
 
-#: src/file.c:2713
+#: src/file.c:2715
 #, c-format
 msgid ""
 "Normalization failed: file not available (%s).\n"
@@ -1227,7 +1224,7 @@
 msgstr "Konnte Datei fÃ¼r '%s' auf dem iPod nicht finden\n"
 
 #. create the dialog window
-#: src/file_export.c:390 src/file_itunesdb.c:1060 src/tools.c:148
+#: src/file_export.c:390 src/file_itunesdb.c:1062 src/tools.c:148
 msgid "Information"
 msgstr "Information"
 
@@ -1251,7 +1248,7 @@
 msgstr[0] "%d von insgesamt %d StÃ¼ck kopiert."
 msgstr[1] "%d von insgesamt %d StÃ¼cken kopiert."
 
-#: src/file_export.c:494 src/file_itunesdb.c:1324 src/tools.c:307
+#: src/file_export.c:494 src/file_itunesdb.c:1326 src/tools.c:307
 #, c-format
 msgid "%d%% (%d:%02d:%02d left)"
 msgstr "%d%% (noch %d:%02d:%02d)"
@@ -1474,7 +1471,7 @@
 msgid "Aborted writing of extended info.\n"
 msgstr "Schreiben der erweiterten Infos abgebrochen.\n"
 
-#: src/file_itunesdb.c:1071
+#: src/file_itunesdb.c:1073
 msgid ""
 "Press button to abort.\n"
 "Export can be continued at a later time."
@@ -1482,27 +1479,27 @@
 "Zum Abbrechen bitte anklicken.\n"
 "Der Export kann zu einem spÃ¤teren Zeitpunkt fortgesetzt werden."
 
-#: src/file_itunesdb.c:1140
+#: src/file_itunesdb.c:1142
 msgid "deleting..."
 msgstr "Entferne gelÃ¶schte Tracks..."
 
-#: src/file_itunesdb.c:1244
+#: src/file_itunesdb.c:1246
 msgid "preparing to copy..."
 msgstr "Vorbereitung zum Kopieren..."
 
-#: src/file_itunesdb.c:1307
+#: src/file_itunesdb.c:1309
 #, c-format
 msgid "Copied %d of %d new track."
 msgid_plural "Copied %d of %d new tracks."
 msgstr[0] "%d von insgesamt %d StÃ¼ck kopiert."
 msgstr[1] "%d von insgesamt %d StÃ¼cken kopiert."
 
-#: src/file_itunesdb.c:1334
+#: src/file_itunesdb.c:1336
 msgid "Some tracks were not written to iPod. Export aborted!"
 msgstr ""
 "Einige StÃ¼cke wurden nicht auf den iPod Ã¼bertragen. Export abgebrochen!"
 
-#: src/file_itunesdb.c:1387
+#: src/file_itunesdb.c:1389
 #, c-format
 msgid ""
 "You did not import the existing iTunesDB ('%s'). This is most likely "
@@ -1520,7 +1517,7 @@
 "'Abbrechen', um jetzt nicht zu speichern. Wenn Sie den Vorgang abbrechen, "
 "kÃ¶nnen Sie die existierende Datenbank einlesen und dann erneut abgleichen.\n"
 
-#: src/file_itunesdb.c:1417
+#: src/file_itunesdb.c:1419
 msgid ""
 "iPod directory structure must be present before synching to the iPod can be "
 "performed.\n"
@@ -1528,25 +1525,25 @@
 "Die iPod Verzeichnisstruktur muÃŸ vorhanden sein bevor Daten auf den iPod "
 "kopiert werden kÃ¶nnen.\n"
 
-#: src/file_itunesdb.c:1426
+#: src/file_itunesdb.c:1428
 msgid "Some tracks could not be deleted from the iPod. Export aborted!"
 msgstr ""
 "Einige Dateien konnten nicht vom iPod gelÃ¶scht werden. Export abgebrochen!"
 
-#: src/file_itunesdb.c:1442
+#: src/file_itunesdb.c:1444
 msgid "Now writing iTunesDB. Please wait..."
 msgstr "Schreibe iTunesDB. Bitte warten..."
 
-#: src/file_itunesdb.c:1488
+#: src/file_itunesdb.c:1490
 #, c-format
 msgid "Extended information file not deleted: '%s'"
 msgstr "Die Datei mit den erweiterten Informationen wurde nicht gefunden: '%s'"
 
-#: src/file_itunesdb.c:1574
+#: src/file_itunesdb.c:1577
 msgid "iPod Database Saved"
 msgstr "iPod Datenbank gespeichert"
 
-#: src/file_itunesdb.c:1633
+#: src/file_itunesdb.c:1636
 msgid "Syncing contacts, calendar and notes..."
 msgstr "Gleiche Kontakte, Kalender und Notizen ab..."
 
@@ -1577,11 +1574,11 @@
 msgid "Select directory to add recursively"
 msgstr "WÃ¤hlen Sie Verzeichnisse zum HinzufÃ¼gen"
 
-#: src/fileselection.c:749
+#: src/fileselection.c:759
 msgid "Ok"
 msgstr "OK"
 
-#: src/fileselection.c:758
+#: src/fileselection.c:768
 msgid "Cancel"
 msgstr "Abbrechen"
 
@@ -2780,22 +2777,22 @@
 msgid "drag and drop: ignored '%s'\n"
 msgstr "Drag und Drop: '%s' ignoriert\n"
 
-#: src/mp3file.c:1117
+#: src/mp3file.c:1118
 #, c-format
 msgid "Error setting ID3 field: %s\n"
 msgstr "Fehler beim Setzen des ID3 Feldes: '%s'\n"
 
-#: src/mp3file.c:1142 src/mp3file.c:1289 src/mp3file.c:2035
+#: src/mp3file.c:1143 src/mp3file.c:1290 src/mp3file.c:2036
 #, c-format
 msgid "ERROR while opening file: '%s' (%s).\n"
 msgstr "FEHLER beim Ã–ffnen der Datei: '%s' (%s).\n"
 
-#: src/mp3file.c:1356
+#: src/mp3file.c:1357
 #, c-format
 msgid "ERROR while writing tag to file: '%s' (%s).\n"
 msgstr "FEHLER beim Schreiben eines Tags: '%s' (%s).\n"
 
-#: src/mp3file.c:1879
+#: src/mp3file.c:1880
 #, c-format
 msgid ""
 "Could not find mp3gain. I tried to use the following executable: '%s'.\n"
@@ -2816,13 +2813,13 @@
 "Wenn Sie 'mp3gain' nicht installiert haben, kÃ¶nnen Sie es von 'http://www."
 "sourceforge.net/projects/mp3gain' herunterladen."
 
-#: src/mp3file.c:1919
+#: src/mp3file.c:1920
 #, c-format
 msgid "Execution of mp3gain ('%s') failed."
 msgstr "Der Aufruf von mp3gain ('%s') schlug fehl."
 
 #. Tracks with zero play length are ignored by iPod...
-#: src/mp3file.c:2178
+#: src/mp3file.c:2179
 #, c-format
 msgid "File \"%s\" has zero play length. Ignoring.\n"
 msgstr "Die Datei '%s' hat Null-Spielzeit und wird ignoriert.\n"
@@ -3016,35 +3013,40 @@
 msgid "'%s': only '%%[%s]' allowed.\n"
 msgstr "'%s': nur '%%[%s]' erlaubt.\n"
 
-#: src/prefs_window.c:105
+#: src/prefs_window.c:108
 msgid "Please select command for 'Play Now'"
 msgstr "Programm fÃ¼r 'Jetzt abspielen'"
 
-#: src/prefs_window.c:106
+#: src/prefs_window.c:109
 msgid "Please select command for 'Enqueue'"
 msgstr "Programm fÃ¼r 'Zum Abspielen Vormerken':"
 
-#: src/prefs_window.c:107
+#: src/prefs_window.c:110
 msgid "Please select the mp3gain executable"
 msgstr "Genauer Pfad des mp3gain-Programms"
 
-#: src/prefs_window.c:108
+#: src/prefs_window.c:111
 msgid "Please select command to sync contacts"
 msgstr "Skript zum Exportieren der Kontakte"
 
-#: src/prefs_window.c:109
+#: src/prefs_window.c:112
 msgid "Please select command to sync calendar"
 msgstr "Skript zum Exportieren des Terminkalenders"
 
-#: src/prefs_window.c:110
+#: src/prefs_window.c:113
 msgid "Select the mserv music root directory"
 msgstr "WÃ¤hlen Sie das mserv Stammverzeichnis fÃ¼r Musik"
 
-#: src/prefs_window.c:111
+#: src/prefs_window.c:114
 msgid "Select the mserv trackinfo root directory"
 msgstr "WÃ¤hlen Sie das mserv Stammverzeichnis (trackinfo)"
 
-#: src/prefs_window.c:824
+#: src/prefs_window.c:115
+#, fuzzy
+msgid "Please select command to sync notes"
+msgstr "Skript zum Exportieren der Kontakte"
+
+#: src/prefs_window.c:854
 #, c-format
 msgid ""
 "<i>Have a look at the scripts provided in '%s'. If you write a new script, "
@@ -3056,11 +3058,11 @@
 "at users.sourceforge.net, damit es in die nÃ¤chste Version aufgenommen werden "
 "kann.</i>"
 
-#: src/prefs_window.c:1257 src/prefs_window.c:1275
+#: src/prefs_window.c:1287 src/prefs_window.c:1305
 msgid "Preferences not updated"
 msgstr "Die Einstellungen wurden nicht Ã¼bernommen"
 
-#: src/prefs_window.c:1284
+#: src/prefs_window.c:1314
 msgid "Preferences applied"
 msgstr "Die Einstellungen wurden Ã¼bernommen"
 
@@ -3233,6 +3235,10 @@
 msgid "_Edit"
 msgstr "_Bearbeiten"
 
+#: gtkpod.glade:530
+msgid "Edit"
+msgstr "Bearbeiten"
+
 #: gtkpod.glade:551
 msgid "Tracks in Selected _Playlist"
 msgstr "StÃ¼cke in ausgewÃ¤hlter _Wiedergabeliste"
@@ -3407,7 +3413,7 @@
 msgid "_Arrange Sort Tabs"
 msgstr "Sort Tabs _Anordnen"
 
-#: gtkpod.glade:1106 gtkpod.glade:12692
+#: gtkpod.glade:1106 gtkpod.glade:12693
 msgid "_Tools"
 msgstr "_Werkzeuge"
 
@@ -3670,8 +3676,8 @@
 #: gtkpod.glade:9700 gtkpod.glade:10487 gtkpod.glade:10644 gtkpod.glade:10801
 #: gtkpod.glade:10922 gtkpod.glade:10975 gtkpod.glade:11132 gtkpod.glade:11389
 #: gtkpod.glade:11443 gtkpod.glade:11554 gtkpod.glade:11657 gtkpod.glade:11813
-#: gtkpod.glade:12027 gtkpod.glade:12248 gtkpod.glade:12386 gtkpod.glade:12751
-#: gtkpod.glade:12869 gtkpod.glade:13043 gtkpod.glade:13278 gtkpod.glade:13380
+#: gtkpod.glade:12027 gtkpod.glade:12248 gtkpod.glade:12386 gtkpod.glade:12752
+#: gtkpod.glade:12870 gtkpod.glade:13044 gtkpod.glade:13279 gtkpod.glade:13381
 msgid "    "
 msgstr "    "
 
@@ -4231,7 +4237,7 @@
 "Erweiterte Informationen schreiben (PC Dateinamen,\n"
 "MD5-PrÃ¼fsummen, Kodierung). Empfohlen."
 
-#: gtkpod.glade:8463 gtkpod.glade:14969
+#: gtkpod.glade:8463 gtkpod.glade:14970
 msgid "_General"
 msgstr "_Allgemein"
 
@@ -4381,7 +4387,7 @@
 "Benutzername, der zum Nachschlagen in der mserv-Datenbank verwendet wird."
 
 #: gtkpod.glade:9535 gtkpod.glade:9554 gtkpod.glade:12102 gtkpod.glade:12172
-#: gtkpod.glade:12317 gtkpod.glade:12490 gtkpod.glade:12555 gtkpod.glade:12620
+#: gtkpod.glade:12317 gtkpod.glade:12491 gtkpod.glade:12556 gtkpod.glade:12621
 msgid "Browse"
 msgstr "Durchsuchen"
 
@@ -4729,11 +4735,11 @@
 msgid "<b>Synchronization</b>"
 msgstr "<b>Synchronisierung</b>"
 
-#: gtkpod.glade:12443
+#: gtkpod.glade:12444
 msgid "Contacts sync command:"
 msgstr "Befehl zum Abgleich der Kontakte:"
 
-#: gtkpod.glade:12467 gtkpod.glade:12532 gtkpod.glade:12597
+#: gtkpod.glade:12468 gtkpod.glade:12533 gtkpod.glade:12598
 msgid ""
 "Specify exact path including command line options. '%i' will be replaced "
 "with the mount point of the iPod."
@@ -4741,95 +4747,95 @@
 "Geben sie den genauen Pfad einschlieÃŸlich Kommandozeilenoptionen an. '%i' "
 "wird mit dem Mountpoint des iPods ersetzt."
 
-#: gtkpod.glade:12508
+#: gtkpod.glade:12509
 msgid "Calendar sync command:"
 msgstr "Befehl zum Abgleich des Kalenders:"
 
-#: gtkpod.glade:12573
+#: gtkpod.glade:12574
 msgid "Notes sync command:"
 msgstr "Befehl zum Abgleich der Notizen:"
 
-#: gtkpod.glade:12646
+#: gtkpod.glade:12647
 msgid "Call automatically when synchronizing iTunesDB"
 msgstr "Automatisch aufrufen wenn die iTunesDB abgeglichen wird"
 
-#: gtkpod.glade:12724
+#: gtkpod.glade:12725
 msgid "<b>Podcast subscriptions</b>"
 msgstr ""
 
-#: gtkpod.glade:12799
+#: gtkpod.glade:12800
 msgid "Add"
 msgstr "HinzufÃ¼gen"
 
-#: gtkpod.glade:12833
+#: gtkpod.glade:12834
 msgid "Delete"
 msgstr "LÃ¶schen"
 
-#: gtkpod.glade:12899
+#: gtkpod.glade:12900
 msgid "Name: "
 msgstr "Name: "
 
-#: gtkpod.glade:12923
+#: gtkpod.glade:12924
 msgid "URL: "
 msgstr ""
 
-#: gtkpod.glade:13016
+#: gtkpod.glade:13017
 msgid "<b>File options</b>"
 msgstr "<b>Datei-Optionen</b>"
 
-#: gtkpod.glade:13076
+#: gtkpod.glade:13077
 msgid "Save podcasts to: "
 msgstr ""
 
-#: gtkpod.glade:13131
+#: gtkpod.glade:13132
 msgid "Delete from computer when "
 msgstr ""
 
-#: gtkpod.glade:13171 gtkpod.glade:13473
+#: gtkpod.glade:13172 gtkpod.glade:13474
 msgid " days old"
 msgstr "Tage alt"
 
-#: gtkpod.glade:13200
+#: gtkpod.glade:13201
 msgid "Delete once copied to iPod"
 msgstr ""
 
-#: gtkpod.glade:13226
+#: gtkpod.glade:13227
 msgid "Automatically fetch podcasts on startup"
 msgstr ""
 
-#: gtkpod.glade:13253
+#: gtkpod.glade:13254
 msgid "Create podcast logfile at:"
 msgstr ""
 
-#: gtkpod.glade:13353
+#: gtkpod.glade:13354
 msgid "<b>iPod options</b>"
 msgstr "<b>iPod Optionen</b>"
 
-#: gtkpod.glade:13408
+#: gtkpod.glade:13409
 msgid "Automatically sync to iPod"
 msgstr ""
 
-#: gtkpod.glade:13434
+#: gtkpod.glade:13435
 msgid "Delete from iPod when "
 msgstr "Vom iPod entfernen wenn "
 
-#: gtkpod.glade:13502
+#: gtkpod.glade:13503
 msgid "Delete from iPod if podcast has been played"
 msgstr ""
 
-#: gtkpod.glade:13522
+#: gtkpod.glade:13523
 msgid "Include broadcast date in track title"
 msgstr ""
 
-#: gtkpod.glade:13542
+#: gtkpod.glade:13543
 msgid "Set all podcast genres to 'Podcast'"
 msgstr ""
 
-#: gtkpod.glade:13588 gtkpod.glade:15341
+#: gtkpod.glade:13589 gtkpod.glade:15342
 msgid "_Podcasts"
 msgstr ""
 
-#: gtkpod.glade:13753
+#: gtkpod.glade:13754
 msgid ""
 "\n"
 "\n"
@@ -4837,31 +4843,31 @@
 "\n"
 "\n"
 
-#: gtkpod.glade:13787
+#: gtkpod.glade:13788
 msgid "Abort selected"
 msgstr "Abrechen gewÃ¤hlt"
 
-#: gtkpod.glade:13803
+#: gtkpod.glade:13804
 msgid "Abort current"
 msgstr ""
 
-#: gtkpod.glade:13819
+#: gtkpod.glade:13820
 msgid "Abort all"
 msgstr ""
 
-#: gtkpod.glade:13843
+#: gtkpod.glade:13844
 msgid "Details"
 msgstr "Details"
 
-#: gtkpod.glade:13904
+#: gtkpod.glade:13905
 msgid "Cover"
 msgstr "Artwork"
 
-#: gtkpod.glade:13989
+#: gtkpod.glade:13990
 msgid "Set Cover Art"
 msgstr "Artwork setzen"
 
-#: gtkpod.glade:14022
+#: gtkpod.glade:14023
 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 "
@@ -4871,24 +4877,27 @@
 "StÃ¼ck (Artwork und sonstige Angaben) automatisch in alle ausgweÃ¤hlten StÃ¼cke "
 "kopiert. Bitte mit Vorsicht verwenden."
 
-#: gtkpod.glade:14068
+#: gtkpod.glade:14069
 msgid ""
 "Change all tracks\n"
 "simultaneously"
 msgstr "Alle StÃ¼cke simultan modifizieren"
 
-#: gtkpod.glade:14156
+#: gtkpod.glade:14157
 msgid "Remove Cover Art"
 msgstr "Artwork entfernen"
 
-#: gtkpod.glade:16245
+#: gtkpod.glade:16246
 msgid "_Other"
 msgstr "_Anderes"
 
-#: gtkpod.glade:16535
+#: gtkpod.glade:16536
 msgid "_Undo All"
 msgstr "_Alles RÃ¼ckgÃ¤ngig"
 
-#: gtkpod.glade:16605
+#: gtkpod.glade:16606
 msgid "_Undo Track"
 msgstr "_Track RÃ¼ckgÃ¤ngig"
+
+#~ msgid "Export Tracks"
+#~ msgstr "StÃ¼cke Exportieren"

Modified: gtkpod/branches/upstream/current/po/fr.gmo
===================================================================
(Binary files differ)

Modified: gtkpod/branches/upstream/current/po/fr.po
===================================================================
--- gtkpod/branches/upstream/current/po/fr.po	2006-04-08 19:20:23 UTC (rev 117)
+++ gtkpod/branches/upstream/current/po/fr.po	2006-04-08 19:35:58 UTC (rev 118)
@@ -9,7 +9,7 @@
 msgstr ""
 "Project-Id-Version: gtkpod 0.94\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-12-14 23:51+0900\n"
+"POT-Creation-Date: 2006-03-05 23:01+0900\n"
 "PO-Revision-Date: 2005-09-14 21:46+0900\n"
 "Last-Translator: Ã‰ric Lassauge <lassauge at users.sf.net>\n"
 "Language-Team: FR\n"
@@ -236,104 +236,101 @@
 msgid "Confirmation Dialogue"
 msgstr "Message de confirmation"
 
-#: src/context_menus.c:368 gtkpod.glade:530
-msgid "Edit"
-msgstr "Ã‰dition"
-
-#: src/context_menus.c:370 src/tools.c:634
+#: src/context_menus.c:352 src/tools.c:634
 msgid "Play Now"
 msgstr "Jouer maintenant"
 
-#: src/context_menus.c:372 src/tools.c:645
+#: src/context_menus.c:354 src/tools.c:645
 msgid "Enqueue"
 msgstr "Mettre dans la file d'attente"
 
-#: src/context_menus.c:375
-msgid "Export Tracks"
-msgstr "Exporter les morceaux"
+#: src/context_menus.c:357
+#, fuzzy
+msgid "Copy Tracks to Filesystem"
+msgstr "_Mettre Ã  jour les morceaux Ã  partir des fichiers"
 
-#: src/context_menus.c:377 src/file_export.c:1069
+#: src/context_menus.c:359 src/file_export.c:1069
 msgid "Create Playlist File"
 msgstr "CrÃ©er un fichier de liste"
 
-#: src/context_menus.c:379
+#: src/context_menus.c:361
 msgid "Edit Details"
 msgstr ""
 
-#: src/context_menus.c:381 gtkpod.glade:12816
+#: src/context_menus.c:363 gtkpod.glade:12817
 msgid "Update"
 msgstr "Mettre Ã  jour"
 
-#: src/context_menus.c:383
+#: src/context_menus.c:365
 msgid "Sync Dirs"
 msgstr "Synchroniser les rÃ©pertoires"
 
-#: src/context_menus.c:385
+#: src/context_menus.c:367
 msgid "Normalize"
 msgstr "Normaliser"
 
-#: src/context_menus.c:387
+#: src/context_menus.c:369
 msgid "Create new Playlist"
 msgstr "CrÃ©er une nouvelle liste"
 
-#: src/context_menus.c:390
+#: src/context_menus.c:372
 msgid "Edit Smart Playlist"
 msgstr "Ã‰diter la liste intelligente"
 
-#: src/context_menus.c:396
+#: src/context_menus.c:378
 msgid "Alphabetize"
 msgstr "Trier"
 
-#: src/context_menus.c:420
+#: src/context_menus.c:402
 msgid "Delete From iPod"
 msgstr "Supprimer de l'iPod"
 
-#: src/context_menus.c:426
+#: src/context_menus.c:408
 msgid "Delete From Harddisk"
 msgstr "Supprimer du disque dur"
 
-#: src/context_menus.c:432
+#: src/context_menus.c:414
 msgid "Delete From Database"
 msgstr "Supprimer de la base de donnÃ©es"
 
-#: src/context_menus.c:438
+#: src/context_menus.c:420
 msgid "Delete From Playlist"
 msgstr "Supprimer de la liste de lecture"
 
-#: src/context_menus.c:457
+#: src/context_menus.c:439
 msgid "Delete Including Tracks"
 msgstr "Supprimer avec les morceaux"
 
-#: src/context_menus.c:463
+#: src/context_menus.c:445
 msgid "Delete Including Tracks (Harddisk)"
 msgstr "Supprimer les morceaux inclus (disque dur)"
 
-#: src/context_menus.c:469
+#: src/context_menus.c:451
 msgid "Delete Including Tracks (Database)"
 msgstr "Supprimer les morceaux inclus (base de donnÃ©es)"
 
-#: src/context_menus.c:475
+#: src/context_menus.c:457
 msgid "Delete But Keep Tracks"
 msgstr "Supprimer mais garder les morceaux"
 
-#: src/context_menus.c:481
+#: src/context_menus.c:463
 msgid "Remove All Tracks from iPod"
 msgstr "Supprimer tout les morceaux du iPod"
 
-#: src/context_menus.c:487
+#: src/context_menus.c:469
 msgid "Remove All Tracks from Database"
 msgstr "Supprimer tout les morceaux de la base de donnÃ©es"
 
-#: src/context_menus.c:494
+#: src/context_menus.c:476
 #, fuzzy
 msgid "Remove All Podcasts from iPod"
 msgstr "Supprimer tout les morceaux du iPod"
 
-#: src/context_menus.c:505 gtkpod.glade:156
+#: src/context_menus.c:487 gtkpod.glade:156
 msgid "Update Podcasts"
 msgstr ""
 
-#: src/context_menus.c:512
+#: src/context_menus.c:494
 #, fuzzy
 msgid "Podcasts Preferences"
 msgstr "_PrÃ©fÃ©rences"
@@ -448,7 +445,7 @@
 
 #. add podcast playlist
 #: src/display_itdb.c:843 src/display_itdb.c:871 src/display_itdb.c:975
-#: gtkpod.glade:13668
+#: gtkpod.glade:13669
 msgid "Podcasts"
 msgstr ""
 
@@ -922,41 +919,41 @@
 msgid "Unknown token '%s' in template '%s'\n"
 msgstr "ParamÃ¨tre Â«%sÂ» dans le modÃ¨le Â«%sÂ» inexistant\n"
 
-#: src/file.c:815
+#: src/file.c:817
 #, c-format
 msgid "Local filename not valid (%s)"
 msgstr "Nom de fichier local invalide (%s)"
 
-#: src/file.c:868
+#: src/file.c:870
 #, c-format
 msgid "No information found for user '%s' in '%s'"
 msgstr "Aucune info pour l'utilisateur Â«%sÂ» dans Â«%sÂ»"
 
-#: src/file.c:875
+#: src/file.c:877
 #, c-format
 msgid "mserv data file (%s) not available for track (%s)"
 msgstr "Fichier de donnÃ©es mserv (%s) non prÃ©sent pour le morceau (%s)"
 
-#: src/file.c:883
+#: src/file.c:885
 #, c-format
 msgid "Track (%s) not in mserv music root directory (%s)"
 msgstr "Morceau (%s) non prÃ©sent dans le rÃ©pertoire de musique mserv (%s)"
 
-#: src/file.c:988
+#: src/file.c:990
 #, c-format
 msgid ""
 "The following track could not be processed (file does not exist): '%s'\n"
 msgstr ""
 "Le morceau suivant ne peut pas Ãªtre mis Ã  jour (fichier inexistant)Â : '%s'\n"
 
-#: src/file.c:1037
+#: src/file.c:1039
 #, c-format
 msgid "The following track could not be processed (filetype unknown): '%s'\n"
 msgstr ""
 "Le morceau suivant ne peut pas Ãªtre mis Ã  jour (type de fichier inconnu)Â : '%"
 "s'\n"
 
-#: src/file.c:1119
+#: src/file.c:1121
 #, c-format
 msgid ""
 "The following track could not be processed (filetype is known but analysis "
@@ -965,40 +962,40 @@
 "Le morceau suivant ne peut pas Ãªtre mis Ã  jour (type de fichier connu mais "
 "Ã©chec de l'analyse)Â : '%s'\n"
 
-#: src/file.c:1148 src/file.c:1203
+#: src/file.c:1150 src/file.c:1205
 msgid "Nothing to update"
 msgstr "Rien Ã  mettre Ã  jour"
 
-#: src/file.c:1168
+#: src/file.c:1170
 #, c-format
 msgid "Updating %s"
 msgstr "%s en cours de mise Ã  jour"
 
-#: src/file.c:1184
+#: src/file.c:1186
 msgid "Updated selected tracks with info from file."
 msgstr "Les morceaux sÃ©lectionnÃ©s ont Ã©tÃ© mis Ã  jour Ã  partir des fichiers."
 
-#: src/file.c:1216
+#: src/file.c:1218
 #, c-format
 msgid "Retrieving mserv data %s"
 msgstr "RÃ©cupÃ©ration des donnÃ©es mserv %s"
 
 #. no path available
-#: src/file.c:1222 src/file.c:1900
+#: src/file.c:1224 src/file.c:1902
 msgid "no filename available"
 msgstr "pas de nom de fichier disponible"
 
-#: src/file.c:1227
+#: src/file.c:1229
 msgid "Updated selected tracks with data from mserv."
 msgstr ""
 "Les morceaux sÃ©lectionnÃ©s ont Ã©tÃ© mis Ã  jour Ã  partir des donnÃ©es mserv."
 
-#: src/file.c:1294
+#: src/file.c:1296
 #, c-format
 msgid "Syncing directory '%s'"
 msgstr "Synchronisation du rÃ©pertoires Â«%sÂ»"
 
-#: src/file.c:1319
+#: src/file.c:1321
 msgid "Syncing completed. No files deleted."
 msgstr "Synchronisation terminÃ©e. Aucun fichier effacÃ©."
 
@@ -1007,29 +1004,29 @@
 #. title
 #. label
 #. scrolled text
-#: src/file.c:1432
+#: src/file.c:1434
 msgid "Never delete any files when syncing"
 msgstr "Ne jamais effacer les fichiers lors des synchronisations"
 
-#: src/file.c:1461
+#: src/file.c:1463
 msgid "Syncing completed."
 msgstr "Synchronisation terminÃ©e."
 
-#: src/file.c:1481
+#: src/file.c:1483
 msgid "Syncing aborted"
 msgstr "Synchronisation annulÃ©e"
 
-#: src/file.c:1519
+#: src/file.c:1521
 msgid "No tracks in selection"
 msgstr "Aucun morceau sÃ©lectionnÃ©"
 
-#: src/file.c:1569
+#: src/file.c:1571
 #, c-format
 msgid "'%s' is not a directory. Ignored.\n"
 msgstr "Â«%sÂ» n'est pas un rÃ©pertoire. IgnorÃ©.\n"
 
 #. no directory names available
-#: src/file.c:1599
+#: src/file.c:1601
 msgid ""
 "No directory names were stored. Make sure that you enable 'Write extended "
 "information' in the Export section of the preferences at the time of "
@@ -1047,11 +1044,11 @@
 "doublons' dans l'onglet Import des prÃ©fÃ©rences et ajoutez les rÃ©pertoires "
 "que vous souhaitez synchroniser de nouveau.\n"
 
-#: src/file.c:1603
+#: src/file.c:1605
 msgid "No valid directories have been found. Sync aborted.\n"
 msgstr "Aucun rÃ©pertoire valide n'a Ã©tÃ© trouvÃ©. Synchro annulÃ©e.\n"
 
-#: src/file.c:1612
+#: src/file.c:1614
 msgid ""
 "The (former) contents of the following directories will be removed from the "
 "database:\n"
@@ -1061,7 +1058,7 @@
 "donnÃ©esÂ :\n"
 "\n"
 
-#: src/file.c:1620
+#: src/file.c:1622
 msgid ""
 "The following directories will be synchronized:\n"
 "\n"
@@ -1071,16 +1068,16 @@
 
 #. gint id,
 #. gboolean modal,
-#: src/file.c:1631
+#: src/file.c:1633
 msgid "Synchronize directories"
 msgstr "Synchroniser les rÃ©pertoires"
 
 #. title
-#: src/file.c:1632
+#: src/file.c:1634
 msgid "OK to synchronize the following directories?"
 msgstr "PrÃªt Ã  synchroniser les rÃ©pertoires suivants ?"
 
-#: src/file.c:1670
+#: src/file.c:1672
 #, c-format
 msgid "The following track could not be updated"
 msgid_plural "The following %d tracks could not be updated"
@@ -1089,11 +1086,11 @@
 
 #. gint id,
 #. gboolean modal,
-#: src/file.c:1676
+#: src/file.c:1678
 msgid "Failed Track Update"
 msgstr "Ã‰chec de la mise Ã  jour du morceau"
 
-#: src/file.c:1734
+#: src/file.c:1736
 #, c-format
 msgid "The following track has been updated"
 msgid_plural "The following %d tracks have been updated"
@@ -1102,11 +1099,11 @@
 
 #. gint id,
 #. gboolean modal,
-#: src/file.c:1740
+#: src/file.c:1742
 msgid "Successful Track Update"
 msgstr "Morceau mis Ã  jour"
 
-#: src/file.c:1799
+#: src/file.c:1801
 #, c-format
 msgid "No mserv information could be retrieved for the following track"
 msgid_plural ""
@@ -1117,66 +1114,66 @@
 
 #. gint id,
 #. gboolean modal,
-#: src/file.c:1805
+#: src/file.c:1807
 msgid "mserv data retrieval problem"
 msgstr "problÃ¨me de rÃ©cupÃ©ration des donnÃ©es mserv"
 
-#: src/file.c:1946
+#: src/file.c:1948
 msgid "file not found"
 msgstr "fichier introuvable"
 
-#: src/file.c:1950
+#: src/file.c:1952
 msgid "format not supported"
 msgstr "format non supportÃ©"
 
-#: src/file.c:2031
+#: src/file.c:2033
 #, c-format
 msgid "Processing '%s'..."
 msgstr "Traitement de Â«%sÂ»..."
 
-#: src/file.c:2135 src/misc_track.c:1169 src/misc_track.c:1225
+#: src/file.c:2137 src/misc_track.c:1169 src/misc_track.c:1225
 #, c-format
 msgid ""
 "Podcast already present: '%s'\n"
 "\n"
 msgstr ""
 
-#: src/file.c:2196
+#: src/file.c:2198
 #, fuzzy, c-format
 msgid ""
 "Writing to video files not yet supported (%s).\n"
 "\n"
 msgstr "Ã‰chec de la normalisationÂ : type de fichier non supportÃ©.\n"
 
-#: src/file.c:2250 src/file.c:2264
+#: src/file.c:2252 src/file.c:2266
 #, c-format
 msgid "Couldn't change tags of file: %s\n"
 msgstr "Ne peut changer les attributs du fichierÂ : %s\n"
 
-#: src/file.c:2548
+#: src/file.c:2550
 #, c-format
 msgid "Could not open '%s' for reading and writing.\n"
 msgstr "Ne peut ouvrir en lecture/Ã©criture le fichier Â«%sÂ».\n"
 
-#: src/file.c:2555
+#: src/file.c:2557
 #, c-format
 msgid "Could not obtain lock on '%s'.\n"
 msgstr "Impossible de verrouiller Â«%sÂ»\n"
 
 #. error!
-#: src/file.c:2572 src/file.c:2581 src/file.c:2592 src/file.c:2602
+#: src/file.c:2574 src/file.c:2583 src/file.c:2594 src/file.c:2604
 #, c-format
 msgid "Malformed line in '%s': %s\n"
 msgstr "Ligne incomplÃ¨te dans Â«%sÂ»Â : %s\n"
 
 #. gint id,
 #. gboolean modal,
-#: src/file.c:2631
+#: src/file.c:2633
 msgid "Remove offline playcounts?"
 msgstr "Supprimer les compteurs de lecture hors-ligne ?"
 
 #. title
-#: src/file.c:2632
+#: src/file.c:2634
 msgid ""
 "Some tracks played offline could not be found in the iTunesDB. Press 'OK' to "
 "remove them from the offline playcount file, 'Cancel' to keep them."
@@ -1184,19 +1181,19 @@
 "Certains morceaux jouÃ©s hors-ligne ne peuvent Ãªtre trouvÃ©s dans iTunesDB.\n"
 "OK pour les supprimer du fichier de compteur de lecture hors-ligne ?"
 
-#: src/file.c:2649
+#: src/file.c:2651
 #, c-format
 msgid "Error writing to '%s'.\n"
 msgstr "Erreur d'Ã©criture du fichier Â«%sÂ».\n"
 
-#: src/file.c:2698
+#: src/file.c:2700
 #, fuzzy, c-format
 msgid ""
 "Normalization failed: file type not supported (%s).\n"
 "\n"
 msgstr "Ã‰chec de la normalisationÂ : type de fichier non supportÃ©.\n"
 
-#: src/file.c:2713
+#: src/file.c:2715
 #, fuzzy, c-format
 msgid ""
 "Normalization failed: file not available (%s).\n"
@@ -1234,7 +1231,7 @@
 msgstr "Impossible de trouver le fichier pour Â«%sÂ» sur l'iPod\n"
 
 #. create the dialog window
-#: src/file_export.c:390 src/file_itunesdb.c:1060 src/tools.c:148
+#: src/file_export.c:390 src/file_itunesdb.c:1062 src/tools.c:148
 msgid "Information"
 msgstr "Information"
 
@@ -1258,7 +1255,7 @@
 msgstr[0] "%d morceau copiÃ©s sur %d."
 msgstr[1] "%d morceaux copiÃ©s sur %d."
 
-#: src/file_export.c:494 src/file_itunesdb.c:1324 src/tools.c:307
+#: src/file_export.c:494 src/file_itunesdb.c:1326 src/tools.c:307
 #, c-format
 msgid "%d%% (%d:%02d:%02d left)"
 msgstr "%d%% (%d:%02dÂ :%02d restant)"
@@ -1479,7 +1476,7 @@
 msgid "Aborted writing of extended info.\n"
 msgstr "Ã‰criture des infos Ã©tendues interrompue.\n"
 
-#: src/file_itunesdb.c:1071
+#: src/file_itunesdb.c:1073
 msgid ""
 "Press button to abort.\n"
 "Export can be continued at a later time."
@@ -1487,26 +1484,26 @@
 "Appuyer sur le bouton pour Interrompre.\n"
 "L'export peut Ãªtre repris plus tard."
 
-#: src/file_itunesdb.c:1140
+#: src/file_itunesdb.c:1142
 msgid "deleting..."
 msgstr "suppression..."
 
-#: src/file_itunesdb.c:1244
+#: src/file_itunesdb.c:1246
 msgid "preparing to copy..."
 msgstr "prÃ©paration de la copie..."
 
-#: src/file_itunesdb.c:1307
+#: src/file_itunesdb.c:1309
 #, c-format
 msgid "Copied %d of %d new track."
 msgid_plural "Copied %d of %d new tracks."
 msgstr[0] "%d sur %d du nouveau morceau copiÃ©."
 msgstr[1] "%d sur %d des nouveaux morceaux copiÃ©s."
 
-#: src/file_itunesdb.c:1334
+#: src/file_itunesdb.c:1336
 msgid "Some tracks were not written to iPod. Export aborted!"
 msgstr "Des morceaux n'ont pas Ã©tÃ© copiÃ©s sur l'iPod. Export annulÃ©!"
 
-#: src/file_itunesdb.c:1387
+#: src/file_itunesdb.c:1389
 #, c-format
 msgid ""
 "You did not import the existing iTunesDB ('%s'). This is most likely "
@@ -1523,7 +1520,7 @@
 "annulez, vous pouvez importer la base existante avant d'appeler de nouveau "
 "cette fonction.\n"
 
-#: src/file_itunesdb.c:1417
+#: src/file_itunesdb.c:1419
 msgid ""
 "iPod directory structure must be present before synching to the iPod can be "
 "performed.\n"
@@ -1531,24 +1528,24 @@
 "Les rÃ©pertoires systÃ¨mes de l'iPod doivent exister avant de pouvoir "
 "synchroniser l'ipod.\n"
 
-#: src/file_itunesdb.c:1426
+#: src/file_itunesdb.c:1428
 msgid "Some tracks could not be deleted from the iPod. Export aborted!"
 msgstr "Des morceaux ne peuvent pas Ãªtre supprimÃ©s de l'iPod. Export annulÃ©!"
 
-#: src/file_itunesdb.c:1442
+#: src/file_itunesdb.c:1444
 msgid "Now writing iTunesDB. Please wait..."
 msgstr "Ã‰criture de la base iTunesDB. Veuillez patienter..."
 
-#: src/file_itunesdb.c:1488
+#: src/file_itunesdb.c:1490
 #, c-format
 msgid "Extended information file not deleted: '%s'"
 msgstr "Fichier d'infos Ã©tendues non supprimÃ©Â : Â«%sÂ»"
 
-#: src/file_itunesdb.c:1574
+#: src/file_itunesdb.c:1577
 msgid "iPod Database Saved"
 msgstr "Base de l'iPod sauvegardÃ©e"
 
-#: src/file_itunesdb.c:1633
+#: src/file_itunesdb.c:1636
 msgid "Syncing contacts, calendar and notes..."
 msgstr "Synchronisation du calendrier, contacts et notes..."
 
@@ -1579,11 +1576,11 @@
 msgid "Select directory to add recursively"
 msgstr "SÃ©lectionner un rÃ©pertoire Ã  ajouter rÃ©cursivement"
 
-#: src/fileselection.c:749
+#: src/fileselection.c:759
 msgid "Ok"
 msgstr "Ok"
 
-#: src/fileselection.c:758
+#: src/fileselection.c:768
 msgid "Cancel"
 msgstr "Annuler"
 
@@ -2766,22 +2763,22 @@
 msgid "drag and drop: ignored '%s'\n"
 msgstr "Glisser/dÃ©poserÂ : Â«%sÂ» ignorÃ©\n"
 
-#: src/mp3file.c:1117
+#: src/mp3file.c:1118
 #, c-format
 msgid "Error setting ID3 field: %s\n"
 msgstr "Erreur en remplissant le champ ID3Â : %s\n"
 
-#: src/mp3file.c:1142 src/mp3file.c:1289 src/mp3file.c:2035
+#: src/mp3file.c:1143 src/mp3file.c:1290 src/mp3file.c:2036
 #, c-format
 msgid "ERROR while opening file: '%s' (%s).\n"
 msgstr "Erreur Ã  l'ouverture du fichierÂ : Â«%sÂ» (%s).\n"
 
-#: src/mp3file.c:1356
+#: src/mp3file.c:1357
 #, c-format
 msgid "ERROR while writing tag to file: '%s' (%s).\n"
 msgstr "ERREUR pour Ã©crire l'attribut dans le fichierÂ : Â«%sÂ» (%s).\n"
 
-#: src/mp3file.c:1879
+#: src/mp3file.c:1880
 #, c-format
 msgid ""
 "Could not find mp3gain. I tried to use the following executable: '%s'.\n"
@@ -2802,13 +2799,13 @@
 "officiel http://mp3gain.sourceforge.net ou dans les paquetages de votre "
 "systÃ¨me."
 
-#: src/mp3file.c:1919
+#: src/mp3file.c:1920
 #, c-format
 msgid "Execution of mp3gain ('%s') failed."
 msgstr "Ã‰chec de l'exÃ©cution de mp3gain (Â«%sÂ»)."
 
 #. Tracks with zero play length are ignored by iPod...
-#: src/mp3file.c:2178
+#: src/mp3file.c:2179
 #, c-format
 msgid "File \"%s\" has zero play length. Ignoring.\n"
 msgstr "Fichier \"%s\" Ã  une durÃ©e de zÃ©ro. IgnorÃ©.\n"
@@ -2998,35 +2995,40 @@
 msgid "'%s': only '%%[%s]' allowed.\n"
 msgstr "Â«%sÂ»Â : seulement Â«%%s[%s]Â» autorisÃ©.\n"
 
-#: src/prefs_window.c:105
+#: src/prefs_window.c:108
 msgid "Please select command for 'Play Now'"
 msgstr "Ligne de commande pour Â«Jouer maintenantÂ»"
 
-#: src/prefs_window.c:106
+#: src/prefs_window.c:109
 msgid "Please select command for 'Enqueue'"
 msgstr "Ligne de commande pour Â«Mettre dans la file d'attenteÂ»"
 
-#: src/prefs_window.c:107
+#: src/prefs_window.c:110
 msgid "Please select the mp3gain executable"
 msgstr "Chemin de l'exÃ©cutable Â«mp3gainÂ»"
 
-#: src/prefs_window.c:108
+#: src/prefs_window.c:111
 msgid "Please select command to sync contacts"
 msgstr "Ligne de commande pour synchroniser les contacts"
 
-#: src/prefs_window.c:109
+#: src/prefs_window.c:112
 msgid "Please select command to sync calendar"
 msgstr "Ligne de commande pour synchroniser le calendrier"
 
-#: src/prefs_window.c:110
+#: src/prefs_window.c:113
 msgid "Select the mserv music root directory"
 msgstr "SÃ©lectionner le rÃ©pertoire racine de musique mserv"
 
-#: src/prefs_window.c:111
+#: src/prefs_window.c:114
 msgid "Select the mserv trackinfo root directory"
 msgstr "SÃ©lectionner le rÃ©pertoire racine d'infos mserv"
 
-#: src/prefs_window.c:824
+#: src/prefs_window.c:115
+#, fuzzy
+msgid "Please select command to sync notes"
+msgstr "Ligne de commande pour synchroniser les contacts"
+
+#: src/prefs_window.c:854
 #, fuzzy, c-format
 msgid ""
 "<i>Have a look at the scripts provided in '%s'. If you write a new script, "
@@ -3038,11 +3040,11 @@
 "sourceforge.net afin qu'il soit ajoutÃ© dans les prochaines versions de "
 "gtkpod."
 
-#: src/prefs_window.c:1257 src/prefs_window.c:1275
+#: src/prefs_window.c:1287 src/prefs_window.c:1305
 msgid "Preferences not updated"
 msgstr "PrÃ©fÃ©rences non mises Ã  jour"
 
-#: src/prefs_window.c:1284
+#: src/prefs_window.c:1314
 msgid "Preferences applied"
 msgstr "PrÃ©fÃ©rences mises Ã  jour"
 
@@ -3217,6 +3219,10 @@
 msgid "_Edit"
 msgstr "_Ã‰dition"
 
+#: gtkpod.glade:530
+msgid "Edit"
+msgstr "Ã‰dition"
+
 #: gtkpod.glade:551
 #, fuzzy
 msgid "Tracks in Selected _Playlist"
@@ -3403,7 +3409,7 @@
 msgid "_Arrange Sort Tabs"
 msgstr "_Organiser les zones de tri"
 
-#: gtkpod.glade:1106 gtkpod.glade:12692
+#: gtkpod.glade:1106 gtkpod.glade:12693
 msgid "_Tools"
 msgstr "_Outils"
 
@@ -3665,8 +3671,8 @@
 #: gtkpod.glade:9700 gtkpod.glade:10487 gtkpod.glade:10644 gtkpod.glade:10801
 #: gtkpod.glade:10922 gtkpod.glade:10975 gtkpod.glade:11132 gtkpod.glade:11389
 #: gtkpod.glade:11443 gtkpod.glade:11554 gtkpod.glade:11657 gtkpod.glade:11813
-#: gtkpod.glade:12027 gtkpod.glade:12248 gtkpod.glade:12386 gtkpod.glade:12751
-#: gtkpod.glade:12869 gtkpod.glade:13043 gtkpod.glade:13278 gtkpod.glade:13380
+#: gtkpod.glade:12027 gtkpod.glade:12248 gtkpod.glade:12386 gtkpod.glade:12752
+#: gtkpod.glade:12870 gtkpod.glade:13044 gtkpod.glade:13279 gtkpod.glade:13381
 msgid "    "
 msgstr "     "
 
@@ -4219,7 +4225,7 @@
 "MD5,\n"
 " jeu des caractÃ¨res). RecommandÃ©."
 
-#: gtkpod.glade:8463 gtkpod.glade:14969
+#: gtkpod.glade:8463 gtkpod.glade:14970
 #, fuzzy
 msgid "_General"
 msgstr "GÃ©nÃ©ral"
@@ -4372,7 +4378,7 @@
 msgstr "Utilisateur pour se connecter Ã  la base mserv."
 
 #: gtkpod.glade:9535 gtkpod.glade:9554 gtkpod.glade:12102 gtkpod.glade:12172
-#: gtkpod.glade:12317 gtkpod.glade:12490 gtkpod.glade:12555 gtkpod.glade:12620
+#: gtkpod.glade:12317 gtkpod.glade:12491 gtkpod.glade:12556 gtkpod.glade:12621
 msgid "Browse"
 msgstr "Parcourir"
 
@@ -4707,11 +4713,11 @@
 msgid "<b>Synchronization</b>"
 msgstr "<b>Synchronization</b>"
 
-#: gtkpod.glade:12443
+#: gtkpod.glade:12444
 msgid "Contacts sync command:"
 msgstr "Commande pour la synchronisation des contactsÂ :"
 
-#: gtkpod.glade:12467 gtkpod.glade:12532 gtkpod.glade:12597
+#: gtkpod.glade:12468 gtkpod.glade:12533 gtkpod.glade:12598
 msgid ""
 "Specify exact path including command line options. '%i' will be replaced "
 "with the mount point of the iPod."
@@ -4719,168 +4725,171 @@
 "Indiquer le chemin exact ainsi que les paramÃ¨tres de ligne de commande. '%i' "
 "sera remplacÃ© par le point de montage de l'iPod."
 
-#: gtkpod.glade:12508
+#: gtkpod.glade:12509
 msgid "Calendar sync command:"
 msgstr "Commande pour la synchronisation du calendrierÂ :"
 
-#: gtkpod.glade:12573
+#: gtkpod.glade:12574
 msgid "Notes sync command:"
 msgstr "Commande pour la synchronisation des notesÂ :"
 
-#: gtkpod.glade:12646
+#: gtkpod.glade:12647
 msgid "Call automatically when synchronizing iTunesDB"
 msgstr "ExÃ©cuter en mÃªme temps que la synchronisation de la base iTunesDB"
 
-#: gtkpod.glade:12724
+#: gtkpod.glade:12725
 msgid "<b>Podcast subscriptions</b>"
 msgstr ""
 
-#: gtkpod.glade:12799
+#: gtkpod.glade:12800
 #, fuzzy
 msgid "Add"
 msgstr "AjoutÃ©"
 
-#: gtkpod.glade:12833
+#: gtkpod.glade:12834
 #, fuzzy
 msgid "Delete"
 msgstr "Morceaux supprimÃ©s"
 
-#: gtkpod.glade:12899
+#: gtkpod.glade:12900
 #, fuzzy
 msgid "Name: "
 msgstr "UtilisateurÂ :"
 
-#: gtkpod.glade:12923
+#: gtkpod.glade:12924
 msgid "URL: "
 msgstr ""
 
-#: gtkpod.glade:13016
+#: gtkpod.glade:13017
 #, fuzzy
 msgid "<b>File options</b>"
 msgstr "<b>Confirmation de suppression</b>"
 
-#: gtkpod.glade:13076
+#: gtkpod.glade:13077
 msgid "Save podcasts to: "
 msgstr ""
 
-#: gtkpod.glade:13131
+#: gtkpod.glade:13132
 msgid "Delete from computer when "
 msgstr ""
 
-#: gtkpod.glade:13171 gtkpod.glade:13473
+#: gtkpod.glade:13172 gtkpod.glade:13474
 #, fuzzy
 msgid " days old"
 msgstr "jours"
 
-#: gtkpod.glade:13200
+#: gtkpod.glade:13201
 #, fuzzy
 msgid "Delete once copied to iPod"
 msgstr "Suppression d'un morceau de l'iPod"
 
-#: gtkpod.glade:13226
+#: gtkpod.glade:13227
 #, fuzzy
 msgid "Automatically fetch podcasts on startup"
 msgstr "Importer les donnÃ©es de l'iPod au dÃ©marrage de gtkpod"
 
-#: gtkpod.glade:13253
+#: gtkpod.glade:13254
 #, fuzzy
 msgid "Create podcast logfile at:"
 msgstr "CrÃ©er un fichier de liste"
 
-#: gtkpod.glade:13353
+#: gtkpod.glade:13354
 #, fuzzy
 msgid "<b>iPod options</b>"
 msgstr "<b>Infobulles</b>"
 
-#: gtkpod.glade:13408
+#: gtkpod.glade:13409
 #, fuzzy
 msgid "Automatically sync to iPod"
 msgstr "SÃ©lection automatique..."
 
-#: gtkpod.glade:13434
+#: gtkpod.glade:13435
 #, fuzzy
 msgid "Delete from iPod when "
 msgstr "Supprimer de l'iPod"
 
-#: gtkpod.glade:13502
+#: gtkpod.glade:13503
 #, fuzzy
 msgid "Delete from iPod if podcast has been played"
 msgstr "La derniÃ¨re fois que le fichier a Ã©tÃ© jouÃ©"
 
-#: gtkpod.glade:13522
+#: gtkpod.glade:13523
 msgid "Include broadcast date in track title"
 msgstr ""
 
-#: gtkpod.glade:13542
+#: gtkpod.glade:13543
 msgid "Set all podcast genres to 'Podcast'"
 msgstr ""
 
-#: gtkpod.glade:13588 gtkpod.glade:15341
+#: gtkpod.glade:13589 gtkpod.glade:15342
 msgid "_Podcasts"
 msgstr ""
 
-#: gtkpod.glade:13753
+#: gtkpod.glade:13754
 msgid ""
 "\n"
 "\n"
 msgstr ""
 
-#: gtkpod.glade:13787
+#: gtkpod.glade:13788
 #, fuzzy
 msgid "Abort selected"
 msgstr "Aucun morceau sÃ©lectionnÃ©"
 
-#: gtkpod.glade:13803
+#: gtkpod.glade:13804
 msgid "Abort current"
 msgstr ""
 
-#: gtkpod.glade:13819
+#: gtkpod.glade:13820
 msgid "Abort all"
 msgstr ""
 
-#: gtkpod.glade:13843
+#: gtkpod.glade:13844
 msgid "Details"
 msgstr ""
 
-#: gtkpod.glade:13904
+#: gtkpod.glade:13905
 #, fuzzy
 msgid "Cover"
 msgstr "Compositeur"
 
-#: gtkpod.glade:13989
+#: gtkpod.glade:13990
 msgid "Set Cover Art"
 msgstr ""
 
-#: gtkpod.glade:14022
+#: gtkpod.glade:14023
 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 ""
 
-#: gtkpod.glade:14068
+#: gtkpod.glade:14069
 msgid ""
 "Change all tracks\n"
 "simultaneously"
 msgstr ""
 
-#: gtkpod.glade:14156
+#: gtkpod.glade:14157
 msgid "Remove Cover Art"
 msgstr ""
 
-#: gtkpod.glade:16245
+#: gtkpod.glade:16246
 msgid "_Other"
 msgstr ""
 
-#: gtkpod.glade:16535
+#: gtkpod.glade:16536
 msgid "_Undo All"
 msgstr ""
 
-#: gtkpod.glade:16605
+#: gtkpod.glade:16606
 #, fuzzy
 msgid "_Undo Track"
 msgstr "Morceaux non notÃ©s"
 
+#~ msgid "Export Tracks"
+#~ msgstr "Exporter les morceaux"
+
 #~ msgid ""
 #~ "Icons of buttons were made by Nicolas Chariot.\n"
 #~ "\n"

Modified: gtkpod/branches/upstream/current/po/gtkpod.pot
===================================================================
--- gtkpod/branches/upstream/current/po/gtkpod.pot	2006-04-08 19:20:23 UTC (rev 117)
+++ gtkpod/branches/upstream/current/po/gtkpod.pot	2006-04-08 19:35:58 UTC (rev 118)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-12-14 23:51+0900\n"
+"POT-Creation-Date: 2006-03-05 23:01+0900\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -234,103 +234,99 @@
 msgid "Confirmation Dialogue"
 msgstr ""
 
-#: src/context_menus.c:368 gtkpod.glade:530
-msgid "Edit"
-msgstr ""
-
-#: src/context_menus.c:370 src/tools.c:634
+#: src/context_menus.c:352 src/tools.c:634
 msgid "Play Now"
 msgstr ""
 
-#: src/context_menus.c:372 src/tools.c:645
+#: src/context_menus.c:354 src/tools.c:645
 msgid "Enqueue"
 msgstr ""
 
-#: src/context_menus.c:375
-msgid "Export Tracks"
+#: src/context_menus.c:357
+msgid "Copy Tracks to Filesystem"
 msgstr ""
 
-#: src/context_menus.c:377 src/file_export.c:1069
+#: src/context_menus.c:359 src/file_export.c:1069
 msgid "Create Playlist File"
 msgstr ""
 
-#: src/context_menus.c:379
+#: src/context_menus.c:361
 msgid "Edit Details"
 msgstr ""
 
-#: src/context_menus.c:381 gtkpod.glade:12816
+#: src/context_menus.c:363 gtkpod.glade:12817
 msgid "Update"
 msgstr ""
 
-#: src/context_menus.c:383
+#: src/context_menus.c:365
 msgid "Sync Dirs"
 msgstr ""
 
-#: src/context_menus.c:385
+#: src/context_menus.c:367
 msgid "Normalize"
 msgstr ""
 
-#: src/context_menus.c:387
+#: src/context_menus.c:369
 msgid "Create new Playlist"
 msgstr ""
 
-#: src/context_menus.c:390
+#: src/context_menus.c:372
 msgid "Edit Smart Playlist"
 msgstr ""
 
-#: src/context_menus.c:396
+#: src/context_menus.c:378
 msgid "Alphabetize"
 msgstr ""
 
-#: src/context_menus.c:420
+#: src/context_menus.c:402
 msgid "Delete From iPod"
 msgstr ""
 
-#: src/context_menus.c:426
+#: src/context_menus.c:408
 msgid "Delete From Harddisk"
 msgstr ""
 
-#: src/context_menus.c:432
+#: src/context_menus.c:414
 msgid "Delete From Database"
 msgstr ""
 
-#: src/context_menus.c:438
+#: src/context_menus.c:420
 msgid "Delete From Playlist"
 msgstr ""
 
-#: src/context_menus.c:457
+#: src/context_menus.c:439
 msgid "Delete Including Tracks"
 msgstr ""
 
-#: src/context_menus.c:463
+#: src/context_menus.c:445
 msgid "Delete Including Tracks (Harddisk)"
 msgstr ""
 
-#: src/context_menus.c:469
+#: src/context_menus.c:451
 msgid "Delete Including Tracks (Database)"
 msgstr ""
 
-#: src/context_menus.c:475
+#: src/context_menus.c:457
 msgid "Delete But Keep Tracks"
 msgstr ""
 
-#: src/context_menus.c:481
+#: src/context_menus.c:463
 msgid "Remove All Tracks from iPod"
 msgstr ""
 
-#: src/context_menus.c:487
+#: src/context_menus.c:469
 msgid "Remove All Tracks from Database"
 msgstr ""
 
-#: src/context_menus.c:494
+#: src/context_menus.c:476
 msgid "Remove All Podcasts from iPod"
 msgstr ""
 
-#: src/context_menus.c:505 gtkpod.glade:156
+#: src/context_menus.c:487 gtkpod.glade:156
 msgid "Update Podcasts"
 msgstr ""
 
-#: src/context_menus.c:512
+#: src/context_menus.c:494
 msgid "Podcasts Preferences"
 msgstr ""
 
@@ -428,7 +424,7 @@
 
 #. add podcast playlist
 #: src/display_itdb.c:843 src/display_itdb.c:871 src/display_itdb.c:975
-#: gtkpod.glade:13668
+#: gtkpod.glade:13669
 msgid "Podcasts"
 msgstr ""
 
@@ -886,77 +882,77 @@
 msgid "Unknown token '%s' in template '%s'\n"
 msgstr ""
 
-#: src/file.c:815
+#: src/file.c:817
 #, c-format
 msgid "Local filename not valid (%s)"
 msgstr ""
 
-#: src/file.c:868
+#: src/file.c:870
 #, c-format
 msgid "No information found for user '%s' in '%s'"
 msgstr ""
 
-#: src/file.c:875
+#: src/file.c:877
 #, c-format
 msgid "mserv data file (%s) not available for track (%s)"
 msgstr ""
 
-#: src/file.c:883
+#: src/file.c:885
 #, c-format
 msgid "Track (%s) not in mserv music root directory (%s)"
 msgstr ""
 
-#: src/file.c:988
+#: src/file.c:990
 #, c-format
 msgid ""
 "The following track could not be processed (file does not exist): '%s'\n"
 msgstr ""
 
-#: src/file.c:1037
+#: src/file.c:1039
 #, c-format
 msgid "The following track could not be processed (filetype unknown): '%s'\n"
 msgstr ""
 
-#: src/file.c:1119
+#: src/file.c:1121
 #, c-format
 msgid ""
 "The following track could not be processed (filetype is known but analysis "
 "failed): '%s'\n"
 msgstr ""
 
-#: src/file.c:1148 src/file.c:1203
+#: src/file.c:1150 src/file.c:1205
 msgid "Nothing to update"
 msgstr ""
 
-#: src/file.c:1168
+#: src/file.c:1170
 #, c-format
 msgid "Updating %s"
 msgstr ""
 
-#: src/file.c:1184
+#: src/file.c:1186
 msgid "Updated selected tracks with info from file."
 msgstr ""
 
-#: src/file.c:1216
+#: src/file.c:1218
 #, c-format
 msgid "Retrieving mserv data %s"
 msgstr ""
 
 #. no path available
-#: src/file.c:1222 src/file.c:1900
+#: src/file.c:1224 src/file.c:1902
 msgid "no filename available"
 msgstr ""
 
-#: src/file.c:1227
+#: src/file.c:1229
 msgid "Updated selected tracks with data from mserv."
 msgstr ""
 
-#: src/file.c:1294
+#: src/file.c:1296
 #, c-format
 msgid "Syncing directory '%s'"
 msgstr ""
 
-#: src/file.c:1319
+#: src/file.c:1321
 msgid "Syncing completed. No files deleted."
 msgstr ""
 
@@ -965,29 +961,29 @@
 #. title
 #. label
 #. scrolled text
-#: src/file.c:1432
+#: src/file.c:1434
 msgid "Never delete any files when syncing"
 msgstr ""
 
-#: src/file.c:1461
+#: src/file.c:1463
 msgid "Syncing completed."
 msgstr ""
 
-#: src/file.c:1481
+#: src/file.c:1483
 msgid "Syncing aborted"
 msgstr ""
 
-#: src/file.c:1519
+#: src/file.c:1521
 msgid "No tracks in selection"
 msgstr ""
 
-#: src/file.c:1569
+#: src/file.c:1571
 #, c-format
 msgid "'%s' is not a directory. Ignored.\n"
 msgstr ""
 
 #. no directory names available
-#: src/file.c:1599
+#: src/file.c:1601
 msgid ""
 "No directory names were stored. Make sure that you enable 'Write extended "
 "information' in the Export section of the preferences at the time of "
@@ -998,18 +994,18 @@
 "want to sync again.\n"
 msgstr ""
 
-#: src/file.c:1603
+#: src/file.c:1605
 msgid "No valid directories have been found. Sync aborted.\n"
 msgstr ""
 
-#: src/file.c:1612
+#: src/file.c:1614
 msgid ""
 "The (former) contents of the following directories will be removed from the "
 "database:\n"
 "\n"
 msgstr ""
 
-#: src/file.c:1620
+#: src/file.c:1622
 msgid ""
 "The following directories will be synchronized:\n"
 "\n"
@@ -1017,16 +1013,16 @@
 
 #. gint id,
 #. gboolean modal,
-#: src/file.c:1631
+#: src/file.c:1633
 msgid "Synchronize directories"
 msgstr ""
 
 #. title
-#: src/file.c:1632
+#: src/file.c:1634
 msgid "OK to synchronize the following directories?"
 msgstr ""
 
-#: src/file.c:1670
+#: src/file.c:1672
 #, c-format
 msgid "The following track could not be updated"
 msgid_plural "The following %d tracks could not be updated"
@@ -1035,11 +1031,11 @@
 
 #. gint id,
 #. gboolean modal,
-#: src/file.c:1676
+#: src/file.c:1678
 msgid "Failed Track Update"
 msgstr ""
 
-#: src/file.c:1734
+#: src/file.c:1736
 #, c-format
 msgid "The following track has been updated"
 msgid_plural "The following %d tracks have been updated"
@@ -1048,11 +1044,11 @@
 
 #. gint id,
 #. gboolean modal,
-#: src/file.c:1740
+#: src/file.c:1742
 msgid "Successful Track Update"
 msgstr ""
 
-#: src/file.c:1799
+#: src/file.c:1801
 #, c-format
 msgid "No mserv information could be retrieved for the following track"
 msgid_plural ""
@@ -1062,84 +1058,84 @@
 
 #. gint id,
 #. gboolean modal,
-#: src/file.c:1805
+#: src/file.c:1807
 msgid "mserv data retrieval problem"
 msgstr ""
 
-#: src/file.c:1946
+#: src/file.c:1948
 msgid "file not found"
 msgstr ""
 
-#: src/file.c:1950
+#: src/file.c:1952
 msgid "format not supported"
 msgstr ""
 
-#: src/file.c:2031
+#: src/file.c:2033
 #, c-format
 msgid "Processing '%s'..."
 msgstr ""
 
-#: src/file.c:2135 src/misc_track.c:1169 src/misc_track.c:1225
+#: src/file.c:2137 src/misc_track.c:1169 src/misc_track.c:1225
 #, c-format
 msgid ""
 "Podcast already present: '%s'\n"
 "\n"
 msgstr ""
 
-#: src/file.c:2196
+#: src/file.c:2198
 #, c-format
 msgid ""
 "Writing to video files not yet supported (%s).\n"
 "\n"
 msgstr ""
 
-#: src/file.c:2250 src/file.c:2264
+#: src/file.c:2252 src/file.c:2266
 #, c-format
 msgid "Couldn't change tags of file: %s\n"
 msgstr ""
 
-#: src/file.c:2548
+#: src/file.c:2550
 #, c-format
 msgid "Could not open '%s' for reading and writing.\n"
 msgstr ""
 
-#: src/file.c:2555
+#: src/file.c:2557
 #, c-format
 msgid "Could not obtain lock on '%s'.\n"
 msgstr ""
 
 #. error!
-#: src/file.c:2572 src/file.c:2581 src/file.c:2592 src/file.c:2602
+#: src/file.c:2574 src/file.c:2583 src/file.c:2594 src/file.c:2604
 #, c-format
 msgid "Malformed line in '%s': %s\n"
 msgstr ""
 
 #. gint id,
 #. gboolean modal,
-#: src/file.c:2631
+#: src/file.c:2633
 msgid "Remove offline playcounts?"
 msgstr ""
 
 #. title
-#: src/file.c:2632
+#: src/file.c:2634
 msgid ""
 "Some tracks played offline could not be found in the iTunesDB. Press 'OK' to "
 "remove them from the offline playcount file, 'Cancel' to keep them."
 msgstr ""
 
-#: src/file.c:2649
+#: src/file.c:2651
 #, c-format
 msgid "Error writing to '%s'.\n"
 msgstr ""
 
-#: src/file.c:2698
+#: src/file.c:2700
 #, c-format
 msgid ""
 "Normalization failed: file type not supported (%s).\n"
 "\n"
 msgstr ""
 
-#: src/file.c:2713
+#: src/file.c:2715
 #, c-format
 msgid ""
 "Normalization failed: file not available (%s).\n"
@@ -1177,7 +1173,7 @@
 msgstr ""
 
 #. create the dialog window
-#: src/file_export.c:390 src/file_itunesdb.c:1060 src/tools.c:148
+#: src/file_export.c:390 src/file_itunesdb.c:1062 src/tools.c:148
 msgid "Information"
 msgstr ""
 
@@ -1201,7 +1197,7 @@
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/file_export.c:494 src/file_itunesdb.c:1324 src/tools.c:307
+#: src/file_export.c:494 src/file_itunesdb.c:1326 src/tools.c:307
 #, c-format
 msgid "%d%% (%d:%02d:%02d left)"
 msgstr ""
@@ -1382,32 +1378,32 @@
 msgid "Aborted writing of extended info.\n"
 msgstr ""
 
-#: src/file_itunesdb.c:1071
+#: src/file_itunesdb.c:1073
 msgid ""
 "Press button to abort.\n"
 "Export can be continued at a later time."
 msgstr ""
 
-#: src/file_itunesdb.c:1140
+#: src/file_itunesdb.c:1142
 msgid "deleting..."
 msgstr ""
 
-#: src/file_itunesdb.c:1244
+#: src/file_itunesdb.c:1246
 msgid "preparing to copy..."
 msgstr ""
 
-#: src/file_itunesdb.c:1307
+#: src/file_itunesdb.c:1309
 #, c-format
 msgid "Copied %d of %d new track."
 msgid_plural "Copied %d of %d new tracks."
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/file_itunesdb.c:1334
+#: src/file_itunesdb.c:1336
 msgid "Some tracks were not written to iPod. Export aborted!"
 msgstr ""
 
-#: src/file_itunesdb.c:1387
+#: src/file_itunesdb.c:1389
 #, c-format
 msgid ""
 "You did not import the existing iTunesDB ('%s'). This is most likely "
@@ -1418,30 +1414,30 @@
 "again.\n"
 msgstr ""
 
-#: src/file_itunesdb.c:1417
+#: src/file_itunesdb.c:1419
 msgid ""
 "iPod directory structure must be present before synching to the iPod can be "
 "performed.\n"
 msgstr ""
 
-#: src/file_itunesdb.c:1426
+#: src/file_itunesdb.c:1428
 msgid "Some tracks could not be deleted from the iPod. Export aborted!"
 msgstr ""
 
-#: src/file_itunesdb.c:1442
+#: src/file_itunesdb.c:1444
 msgid "Now writing iTunesDB. Please wait..."
 msgstr ""
 
-#: src/file_itunesdb.c:1488
+#: src/file_itunesdb.c:1490
 #, c-format
 msgid "Extended information file not deleted: '%s'"
 msgstr ""
 
-#: src/file_itunesdb.c:1574
+#: src/file_itunesdb.c:1577
 msgid "iPod Database Saved"
 msgstr ""
 
-#: src/file_itunesdb.c:1633
+#: src/file_itunesdb.c:1636
 msgid "Syncing contacts, calendar and notes..."
 msgstr ""
 
@@ -1472,11 +1468,11 @@
 msgid "Select directory to add recursively"
 msgstr ""
 
-#: src/fileselection.c:749
+#: src/fileselection.c:759
 msgid "Ok"
 msgstr ""
 
-#: src/fileselection.c:758
+#: src/fileselection.c:768
 msgid "Cancel"
 msgstr ""
 
@@ -2512,22 +2508,22 @@
 msgid "drag and drop: ignored '%s'\n"
 msgstr ""
 
-#: src/mp3file.c:1117
+#: src/mp3file.c:1118
 #, c-format
 msgid "Error setting ID3 field: %s\n"
 msgstr ""
 
-#: src/mp3file.c:1142 src/mp3file.c:1289 src/mp3file.c:2035
+#: src/mp3file.c:1143 src/mp3file.c:1290 src/mp3file.c:2036
 #, c-format
 msgid "ERROR while opening file: '%s' (%s).\n"
 msgstr ""
 
-#: src/mp3file.c:1356
+#: src/mp3file.c:1357
 #, c-format
 msgid "ERROR while writing tag to file: '%s' (%s).\n"
 msgstr ""
 
-#: src/mp3file.c:1879
+#: src/mp3file.c:1880
 #, c-format
 msgid ""
 "Could not find mp3gain. I tried to use the following executable: '%s'.\n"
@@ -2539,13 +2535,13 @@
 "sourceforge.net/projects/mp3gain."
 msgstr ""
 
-#: src/mp3file.c:1919
+#: src/mp3file.c:1920
 #, c-format
 msgid "Execution of mp3gain ('%s') failed."
 msgstr ""
 
 #. Tracks with zero play length are ignored by iPod...
-#: src/mp3file.c:2178
+#: src/mp3file.c:2179
 #, c-format
 msgid "File \"%s\" has zero play length. Ignoring.\n"
 msgstr ""
@@ -2717,35 +2713,39 @@
 msgid "'%s': only '%%[%s]' allowed.\n"
 msgstr ""
 
-#: src/prefs_window.c:105
+#: src/prefs_window.c:108
 msgid "Please select command for 'Play Now'"
 msgstr ""
 
-#: src/prefs_window.c:106
+#: src/prefs_window.c:109
 msgid "Please select command for 'Enqueue'"
 msgstr ""
 
-#: src/prefs_window.c:107
+#: src/prefs_window.c:110
 msgid "Please select the mp3gain executable"
 msgstr ""
 
-#: src/prefs_window.c:108
+#: src/prefs_window.c:111
 msgid "Please select command to sync contacts"
 msgstr ""
 
-#: src/prefs_window.c:109
+#: src/prefs_window.c:112
 msgid "Please select command to sync calendar"
 msgstr ""
 
-#: src/prefs_window.c:110
+#: src/prefs_window.c:113
 msgid "Select the mserv music root directory"
 msgstr ""
 
-#: src/prefs_window.c:111
+#: src/prefs_window.c:114
 msgid "Select the mserv trackinfo root directory"
 msgstr ""
 
-#: src/prefs_window.c:824
+#: src/prefs_window.c:115
+msgid "Please select command to sync notes"
+msgstr ""
+
+#: src/prefs_window.c:854
 #, c-format
 msgid ""
 "<i>Have a look at the scripts provided in '%s'. If you write a new script, "
@@ -2753,11 +2753,11 @@
 "next release.</i>"
 msgstr ""
 
-#: src/prefs_window.c:1257 src/prefs_window.c:1275
+#: src/prefs_window.c:1287 src/prefs_window.c:1305
 msgid "Preferences not updated"
 msgstr ""
 
-#: src/prefs_window.c:1284
+#: src/prefs_window.c:1314
 msgid "Preferences applied"
 msgstr ""
 
@@ -2920,6 +2920,10 @@
 msgid "_Edit"
 msgstr ""
 
+#: gtkpod.glade:530
+msgid "Edit"
+msgstr ""
+
 #: gtkpod.glade:551
 msgid "Tracks in Selected _Playlist"
 msgstr ""
@@ -3092,7 +3096,7 @@
 msgid "_Arrange Sort Tabs"
 msgstr ""
 
-#: gtkpod.glade:1106 gtkpod.glade:12692
+#: gtkpod.glade:1106 gtkpod.glade:12693
 msgid "_Tools"
 msgstr ""
 
@@ -3350,8 +3354,8 @@
 #: gtkpod.glade:9700 gtkpod.glade:10487 gtkpod.glade:10644 gtkpod.glade:10801
 #: gtkpod.glade:10922 gtkpod.glade:10975 gtkpod.glade:11132 gtkpod.glade:11389
 #: gtkpod.glade:11443 gtkpod.glade:11554 gtkpod.glade:11657 gtkpod.glade:11813
-#: gtkpod.glade:12027 gtkpod.glade:12248 gtkpod.glade:12386 gtkpod.glade:12751
-#: gtkpod.glade:12869 gtkpod.glade:13043 gtkpod.glade:13278 gtkpod.glade:13380
+#: gtkpod.glade:12027 gtkpod.glade:12248 gtkpod.glade:12386 gtkpod.glade:12752
+#: gtkpod.glade:12870 gtkpod.glade:13044 gtkpod.glade:13279 gtkpod.glade:13381
 msgid "    "
 msgstr ""
 
@@ -3813,7 +3817,7 @@
 " MD5 hashes, encoding). Recommended."
 msgstr ""
 
-#: gtkpod.glade:8463 gtkpod.glade:14969
+#: gtkpod.glade:8463 gtkpod.glade:14970
 msgid "_General"
 msgstr ""
 
@@ -3946,7 +3950,7 @@
 msgstr ""
 
 #: gtkpod.glade:9535 gtkpod.glade:9554 gtkpod.glade:12102 gtkpod.glade:12172
-#: gtkpod.glade:12317 gtkpod.glade:12490 gtkpod.glade:12555 gtkpod.glade:12620
+#: gtkpod.glade:12317 gtkpod.glade:12491 gtkpod.glade:12556 gtkpod.glade:12621
 msgid "Browse"
 msgstr ""
 
@@ -4226,159 +4230,159 @@
 msgid "<b>Synchronization</b>"
 msgstr ""
 
-#: gtkpod.glade:12443
+#: gtkpod.glade:12444
 msgid "Contacts sync command:"
 msgstr ""
 
-#: gtkpod.glade:12467 gtkpod.glade:12532 gtkpod.glade:12597
+#: gtkpod.glade:12468 gtkpod.glade:12533 gtkpod.glade:12598
 msgid ""
 "Specify exact path including command line options. '%i' will be replaced "
 "with the mount point of the iPod."
 msgstr ""
 
-#: gtkpod.glade:12508
+#: gtkpod.glade:12509
 msgid "Calendar sync command:"
 msgstr ""
 
-#: gtkpod.glade:12573
+#: gtkpod.glade:12574
 msgid "Notes sync command:"
 msgstr ""
 
-#: gtkpod.glade:12646
+#: gtkpod.glade:12647
 msgid "Call automatically when synchronizing iTunesDB"
 msgstr ""
 
-#: gtkpod.glade:12724
+#: gtkpod.glade:12725
 msgid "<b>Podcast subscriptions</b>"
 msgstr ""
 
-#: gtkpod.glade:12799
+#: gtkpod.glade:12800
 msgid "Add"
 msgstr ""
 
-#: gtkpod.glade:12833
+#: gtkpod.glade:12834
 msgid "Delete"
 msgstr ""
 
-#: gtkpod.glade:12899
+#: gtkpod.glade:12900
 msgid "Name: "
 msgstr ""
 
-#: gtkpod.glade:12923
+#: gtkpod.glade:12924
 msgid "URL: "
 msgstr ""
 
-#: gtkpod.glade:13016
+#: gtkpod.glade:13017
 msgid "<b>File options</b>"
 msgstr ""
 
-#: gtkpod.glade:13076
+#: gtkpod.glade:13077
 msgid "Save podcasts to: "
 msgstr ""
 
-#: gtkpod.glade:13131
+#: gtkpod.glade:13132
 msgid "Delete from computer when "
 msgstr ""
 
-#: gtkpod.glade:13171 gtkpod.glade:13473
+#: gtkpod.glade:13172 gtkpod.glade:13474
 msgid " days old"
 msgstr ""
 
-#: gtkpod.glade:13200
+#: gtkpod.glade:13201
 msgid "Delete once copied to iPod"
 msgstr ""
 
-#: gtkpod.glade:13226
+#: gtkpod.glade:13227
 msgid "Automatically fetch podcasts on startup"
 msgstr ""
 
-#: gtkpod.glade:13253
+#: gtkpod.glade:13254
 msgid "Create podcast logfile at:"
 msgstr ""
 
-#: gtkpod.glade:13353
+#: gtkpod.glade:13354
 msgid "<b>iPod options</b>"
 msgstr ""
 
-#: gtkpod.glade:13408
+#: gtkpod.glade:13409
 msgid "Automatically sync to iPod"
 msgstr ""
 
-#: gtkpod.glade:13434
+#: gtkpod.glade:13435
 msgid "Delete from iPod when "
 msgstr ""
 
-#: gtkpod.glade:13502
+#: gtkpod.glade:13503
 msgid "Delete from iPod if podcast has been played"
 msgstr ""
 
-#: gtkpod.glade:13522
+#: gtkpod.glade:13523
 msgid "Include broadcast date in track title"
 msgstr ""
 
-#: gtkpod.glade:13542
+#: gtkpod.glade:13543
 msgid "Set all podcast genres to 'Podcast'"
 msgstr ""
 
-#: gtkpod.glade:13588 gtkpod.glade:15341
+#: gtkpod.glade:13589 gtkpod.glade:15342
 msgid "_Podcasts"
 msgstr ""
 
-#: gtkpod.glade:13753
+#: gtkpod.glade:13754
 msgid ""
 "\n"
 "\n"
 msgstr ""
 
-#: gtkpod.glade:13787
+#: gtkpod.glade:13788
 msgid "Abort selected"
 msgstr ""
 
-#: gtkpod.glade:13803
+#: gtkpod.glade:13804
 msgid "Abort current"
 msgstr ""
 
-#: gtkpod.glade:13819
+#: gtkpod.glade:13820
 msgid "Abort all"
 msgstr ""
 
-#: gtkpod.glade:13843
+#: gtkpod.glade:13844
 msgid "Details"
 msgstr ""
 
-#: gtkpod.glade:13904
+#: gtkpod.glade:13905
 msgid "Cover"
 msgstr ""
 
-#: gtkpod.glade:13989
+#: gtkpod.glade:13990
 msgid "Set Cover Art"
 msgstr ""
 
-#: gtkpod.glade:14022
+#: gtkpod.glade:14023
 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 ""
 
-#: gtkpod.glade:14068
+#: gtkpod.glade:14069
 msgid ""
 "Change all tracks\n"
 "simultaneously"
 msgstr ""
 
-#: gtkpod.glade:14156
+#: gtkpod.glade:14157
 msgid "Remove Cover Art"
 msgstr ""
 
-#: gtkpod.glade:16245
+#: gtkpod.glade:16246
 msgid "_Other"
 msgstr ""
 
-#: gtkpod.glade:16535
+#: gtkpod.glade:16536
 msgid "_Undo All"
 msgstr ""
 
-#: gtkpod.glade:16605
+#: gtkpod.glade:16606
 msgid "_Undo Track"
 msgstr ""

Modified: gtkpod/branches/upstream/current/po/he.gmo
===================================================================
(Binary files differ)

Modified: gtkpod/branches/upstream/current/po/he.po
===================================================================
--- gtkpod/branches/upstream/current/po/he.po	2006-04-08 19:20:23 UTC (rev 117)
+++ gtkpod/branches/upstream/current/po/he.po	2006-04-08 19:35:58 UTC (rev 118)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: gtkpod\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-12-14 23:51+0900\n"
+"POT-Creation-Date: 2006-03-05 23:01+0900\n"
 "PO-Revision-Date: 2005-08-02 21:19+0300\n"
 "Last-Translator: Assaf Gillat\n"
 "Language-Team: HEBREW <kde-il at yahoogroups.com>\n"
@@ -234,104 +234,101 @@
 msgid "Confirmation Dialogue"
 msgstr "×ª×™×‘×ª ×“×• ×©×™×— ×œ××™×©×•×¨"
 
-#: src/context_menus.c:368 gtkpod.glade:530
-msgid "Edit"
-msgstr "×¢×¨×™×›×”"
-
-#: src/context_menus.c:370 src/tools.c:634
+#: src/context_menus.c:352 src/tools.c:634
 msgid "Play Now"
 msgstr "× ×’×Ÿ ×¢×›×©×™×•"
 
-#: src/context_menus.c:372 src/tools.c:645
+#: src/context_menus.c:354 src/tools.c:645
 msgid "Enqueue"
 msgstr "×”×›× ×¡ ×œ×ª×•×¨"
 
-#: src/context_menus.c:375
-msgid "Export Tracks"
-msgstr "×™×™×¦× ×¨×¦×•×¢×•×ª"
+#: src/context_menus.c:357
+#, fuzzy
+msgid "Copy Tracks to Filesystem"
+msgstr "_×¡× ×›×¨×•×Ÿ ×¨×¦×•×¢×•×ª ×ž×§×•×‘×¥"
 
-#: src/context_menus.c:377 src/file_export.c:1069
+#: src/context_menus.c:359 src/file_export.c:1069
 msgid "Create Playlist File"
 msgstr "×™×¦×™×¨×ª ×§×•×‘×¥ ×¨×©×™×ž×ª ×”×©×ž×¢×”"
 
-#: src/context_menus.c:379
+#: src/context_menus.c:361
 msgid "Edit Details"
 msgstr ""
 
-#: src/context_menus.c:381 gtkpod.glade:12816
+#: src/context_menus.c:363 gtkpod.glade:12817
 msgid "Update"
 msgstr "×¢×“×›×•×Ÿ"
 
-#: src/context_menus.c:383
+#: src/context_menus.c:365
 msgid "Sync Dirs"
 msgstr "×¡× ×›×¨×•×Ÿ ×ª×™×§×™×•×ª"
 
-#: src/context_menus.c:385
+#: src/context_menus.c:367
 msgid "Normalize"
 msgstr "× ×¨×ž×•×œ"
 
-#: src/context_menus.c:387
+#: src/context_menus.c:369
 msgid "Create new Playlist"
 msgstr "×™×¦×™×¨×ª ×¨×©×™×ž×ª ×”×©×ž×¢×” ×—×“×©×”"
 
-#: src/context_menus.c:390
+#: src/context_menus.c:372
 msgid "Edit Smart Playlist"
 msgstr "×¢×¨×•×š ×¨×©×™×ž×ª ×”×©×ž×¢×” ×—×›×ž×”"
 
-#: src/context_menus.c:396
+#: src/context_menus.c:378
 msgid "Alphabetize"
 msgstr "×¡×“×¨ ××œ×¤××‘×ª×™"
 
-#: src/context_menus.c:420
+#: src/context_menus.c:402
 msgid "Delete From iPod"
 msgstr "×ž×—×§ ×ž×”-iPod"
 
-#: src/context_menus.c:426
+#: src/context_menus.c:408
 msgid "Delete From Harddisk"
 msgstr "×ž×—×§ ×ž×”×“×™×¡×§ ×”×§×©×™×—"
 
-#: src/context_menus.c:432
+#: src/context_menus.c:414
 msgid "Delete From Database"
 msgstr "×ž×—×§ ×ž×ž×¡×“ ×”× ×ª×•× ×™×"
 
-#: src/context_menus.c:438
+#: src/context_menus.c:420
 msgid "Delete From Playlist"
 msgstr "×ž×—×§ ×ž×¨×©×™×ž×ª ×”×”×©×ž×¢×”"
 
-#: src/context_menus.c:457
+#: src/context_menus.c:439
 msgid "Delete Including Tracks"
 msgstr "×ž×—×§ ×›×•×œ×œ ×¨×¦×•×¢×•×ª"
 
-#: src/context_menus.c:463
+#: src/context_menus.c:445
 msgid "Delete Including Tracks (Harddisk)"
 msgstr "×ž×—×§ ×›×•×œ×œ ×¨×¦×•×¢×•×ª (×“×™×¡×§ ×§×©×™×—)"
 
-#: src/context_menus.c:469
+#: src/context_menus.c:451
 msgid "Delete Including Tracks (Database)"
 msgstr "×ž×—×§ ×›×•×œ×œ ×¨×¦×•×¢×•×ª (×ž×¡×“ × ×ª×•× ×™×)"
 
-#: src/context_menus.c:475
+#: src/context_menus.c:457
 msgid "Delete But Keep Tracks"
 msgstr "×ž×—×§ ××‘×œ ×©×ž×•×¨ ×¨×¦×•×¢×•×ª"
 
-#: src/context_menus.c:481
+#: src/context_menus.c:463
 msgid "Remove All Tracks from iPod"
 msgstr "×ž×—×§ ××ª ×›×œ ×”×¨×¦×•×¢×•×ª ×ž×”-iPod"
 
-#: src/context_menus.c:487
+#: src/context_menus.c:469
 msgid "Remove All Tracks from Database"
 msgstr "×ž×—×§ ××ª ×›×œ ×”×¨×¦×•×¢×•×ª ×ž×ž×¡×“ ×”× ×ª×•× ×™×"
 
-#: src/context_menus.c:494
+#: src/context_menus.c:476
 #, fuzzy
 msgid "Remove All Podcasts from iPod"
 msgstr "×ž×—×§ ××ª ×›×œ ×”×¨×¦×•×¢×•×ª ×ž×”-iPod"
 
-#: src/context_menus.c:505 gtkpod.glade:156
+#: src/context_menus.c:487 gtkpod.glade:156
 msgid "Update Podcasts"
 msgstr ""
 
-#: src/context_menus.c:512
+#: src/context_menus.c:494
 #, fuzzy
 msgid "Podcasts Preferences"
 msgstr "_×¢×¨×™×›×ª ×”×¢×“×¤×•×ª"
@@ -436,7 +433,7 @@
 
 #. add podcast playlist
 #: src/display_itdb.c:843 src/display_itdb.c:871 src/display_itdb.c:975
-#: gtkpod.glade:13668
+#: gtkpod.glade:13669
 msgid "Podcasts"
 msgstr ""
 
@@ -909,77 +906,77 @@
 msgid "Unknown token '%s' in template '%s'\n"
 msgstr "×”×¡×™×ž×Ÿ '%s' ×‘×ª×‘× ×™×ª '%s' ×œ× ×™×“×•×¢\n"
 
-#: src/file.c:815
+#: src/file.c:817
 #, c-format
 msgid "Local filename not valid (%s)"
 msgstr "×©× ×§×•×‘×¥ ×ž×§×•×ž×™ ×œ× ×ª×§×™×Ÿ (%s)"
 
-#: src/file.c:868
+#: src/file.c:870
 #, c-format
 msgid "No information found for user '%s' in '%s'"
 msgstr "×œ× ×§×™×™× ×ž×™×“×¢ ×œ×ž×©×ª×ž×© '%s' ×‘- '%s'"
 
-#: src/file.c:875
+#: src/file.c:877
 #, c-format
 msgid "mserv data file (%s) not available for track (%s)"
 msgstr "×ž×™×“×¢ ×§×•×‘×¥ mserv (%s) ×œ× ×–×ž×™×Ÿ ×¢×‘×•×¨ ×¨×¦×•×¢×” (%s)"
 
-#: src/file.c:883
+#: src/file.c:885
 #, c-format
 msgid "Track (%s) not in mserv music root directory (%s)"
 msgstr "×”×¨×¦×•×¢×” (%s) ×œ× ×§×™×™×ž×ª ×‘×ª×™×§×™×™×ª ×”×©×•×¨×© ×©×œ mserv (%s)"
 
-#: src/file.c:988
+#: src/file.c:990
 #, c-format
 msgid ""
 "The following track could not be processed (file does not exist): '%s'\n"
 msgstr "××™ ××¤×©×¨ ×œ×¢×‘×“ ××ª ×”×¨×¦×•×¢×” ×”×‘××” (×”×§×•×‘×¥ ×œ× ×§×™×™×): '%s'\n"
 
-#: src/file.c:1037
+#: src/file.c:1039
 #, c-format
 msgid "The following track could not be processed (filetype unknown): '%s'\n"
 msgstr "××™ ××¤×©×¨ ×œ×¢×‘×“ ××ª ×”×¨×¦×•×¢×” ×”×‘××” (×¡×•×’ ×§×•×‘×¥ ×œ× ×™×“×•×¢): '%s'\n"
 
-#: src/file.c:1119
+#: src/file.c:1121
 #, c-format
 msgid ""
 "The following track could not be processed (filetype is known but analysis "
 "failed): '%s'\n"
 msgstr "××™ ××¤×©×¨ ×œ×¢×‘×“ ××ª ×”×¨×¦×•×¢×” ×”×‘××” (×¡×•×’ ×§×•×‘×¥ ×™×“×•×¢, ××š ×”×‘×“×™×§×” × ×›×©×œ×”): '%s'\n"
 
-#: src/file.c:1148 src/file.c:1203
+#: src/file.c:1150 src/file.c:1205
 msgid "Nothing to update"
 msgstr "××™×Ÿ ×ž×” ×œ×¢×“×›×Ÿ"
 
-#: src/file.c:1168
+#: src/file.c:1170
 #, c-format
 msgid "Updating %s"
 msgstr "×ž×¢×“×›×Ÿ %s"
 
-#: src/file.c:1184
+#: src/file.c:1186
 msgid "Updated selected tracks with info from file."
 msgstr "×ž×¢×“×›×Ÿ ×¨×¦×•×¢×•×ª × ×‘×—×¨×•×ª ×¢× ×ž×™×“×¢ ×ž×§×•×‘×¥."
 
-#: src/file.c:1216
+#: src/file.c:1218
 #, c-format
 msgid "Retrieving mserv data %s"
 msgstr "×ž××—×–×¨ × ×ª×•× ×™ mserv %s"
 
 #. no path available
-#: src/file.c:1222 src/file.c:1900
+#: src/file.c:1224 src/file.c:1902
 msgid "no filename available"
 msgstr "×§×•×‘×¥ ×œ× ×§×™×™×"
 
-#: src/file.c:1227
+#: src/file.c:1229
 msgid "Updated selected tracks with data from mserv."
 msgstr "×¢×•×“×›× ×• ×¨×¦×•×¢×•×ª × ×‘×—×¨×•×ª ×¢× × ×ª×•× ×™× ×ž-mserv"
 
-#: src/file.c:1294
+#: src/file.c:1296
 #, c-format
 msgid "Syncing directory '%s'"
 msgstr "×ž×¡× ×›×¨×Ÿ ×ª×™×§×™×™×ª '%s'"
 
-#: src/file.c:1319
+#: src/file.c:1321
 msgid "Syncing completed. No files deleted."
 msgstr "×”×¡× ×›×¨×•×Ÿ ×”×•×©×œ×. ×§×‘×¦×™× ×œ× × ×ž×—×§×•."
 
@@ -988,29 +985,29 @@
 #. title
 #. label
 #. scrolled text
-#: src/file.c:1432
+#: src/file.c:1434
 msgid "Never delete any files when syncing"
 msgstr "×‘×–×ž×Ÿ ×¡× ×›×¨×•×Ÿ, ××œ ×ª×ž×—×§ ×©×•× ×§×•×‘×¥"
 
-#: src/file.c:1461
+#: src/file.c:1463
 msgid "Syncing completed."
 msgstr "×¡× ×›×¨×•×Ÿ ×”×•×©×œ×."
 
-#: src/file.c:1481
+#: src/file.c:1483
 msgid "Syncing aborted"
 msgstr "×¡× ×›×¨×•×Ÿ ×‘×•×˜×œ"
 
-#: src/file.c:1519
+#: src/file.c:1521
 msgid "No tracks in selection"
 msgstr "××™×Ÿ ×¨×¦×•×¢×•×ª ×‘×‘×—×™×¨×”"
 
-#: src/file.c:1569
+#: src/file.c:1571
 #, c-format
 msgid "'%s' is not a directory. Ignored.\n"
 msgstr "'%s' ×”×™× ×œ× ×ª×™×§×™×™×”. ×ž×ª×¢×œ×.\n"
 
 #. no directory names available
-#: src/file.c:1599
+#: src/file.c:1601
 msgid ""
 "No directory names were stored. Make sure that you enable 'Write extended "
 "information' in the Export section of the preferences at the time of "
@@ -1026,11 +1023,11 @@
 "×¢×œ ×ž× ×ª ×œ×¡× ×›×¨×Ÿ ×ª×™×§×™×•×ª ×¢×›×©×™×•, ×”×¤×¢×œ ××ª ×–×™×”×•×™ ×›×¤×™×œ×•×™×•×ª ('××œ ×ª×¨×©×” ×›×¤×™×œ×•×™×•×ª') ×‘×—×œ×§ "
 "×”×™×™×‘×•× ×•×”×•×¡×£ ××ª ×”×ª×™×§×™×™×” ×©××ª×” ×¨×•×¦×” ×œ×¡× ×›×¨×Ÿ ×©×•×‘.\n"
 
-#: src/file.c:1603
+#: src/file.c:1605
 msgid "No valid directories have been found. Sync aborted.\n"
 msgstr "×œ× × ×ž×¦××• ×ª×™×§×™×•×ª ×ª×§×™× ×•×ª. ×¡× ×›×¨×•×Ÿ ×‘×•×˜×œ.\n"
 
-#: src/file.c:1612
+#: src/file.c:1614
 msgid ""
 "The (former) contents of the following directories will be removed from the "
 "database:\n"
@@ -1039,7 +1036,7 @@
 "×”×ª×•×›×Ÿ (×”×§×•×“×) ×©×œ ×”×ª×™×§×™×•×ª ×”×‘××•×ª ×™×•×¡×¨ ×ž×ž×¡×“ ×”× ×ª×•× ×™×:\n"
 "\n"
 
-#: src/file.c:1620
+#: src/file.c:1622
 msgid ""
 "The following directories will be synchronized:\n"
 "\n"
@@ -1049,16 +1046,16 @@
 
 #. gint id,
 #. gboolean modal,
-#: src/file.c:1631
+#: src/file.c:1633
 msgid "Synchronize directories"
 msgstr "×ž×¡× ×›×¨×Ÿ ×ª×™×§×™×•×ª"
 
 #. title
-#: src/file.c:1632
+#: src/file.c:1634
 msgid "OK to synchronize the following directories?"
 msgstr "×”×× ×œ×¡× ×›×¨×Ÿ ××ª ×”×ª×™×§×™×•×ª ×”×‘××•×ª?"
 
-#: src/file.c:1670
+#: src/file.c:1672
 #, c-format
 msgid "The following track could not be updated"
 msgid_plural "The following %d tracks could not be updated"
@@ -1067,11 +1064,11 @@
 
 #. gint id,
 #. gboolean modal,
-#: src/file.c:1676
+#: src/file.c:1678
 msgid "Failed Track Update"
 msgstr "×¢×“×›×•×Ÿ ×¨×¦×•×¢×” × ×›×©×œ"
 
-#: src/file.c:1734
+#: src/file.c:1736
 #, c-format
 msgid "The following track has been updated"
 msgid_plural "The following %d tracks have been updated"
@@ -1080,11 +1077,11 @@
 
 #. gint id,
 #. gboolean modal,
-#: src/file.c:1740
+#: src/file.c:1742
 msgid "Successful Track Update"
 msgstr "×”×¨×¦×•×¢×” ×¢×•×“×›× ×” ×‘×”×¦×œ×—×”"
 
-#: src/file.c:1799
+#: src/file.c:1801
 #, c-format
 msgid "No mserv information could be retrieved for the following track"
 msgid_plural ""
@@ -1094,66 +1091,66 @@
 
 #. gint id,
 #. gboolean modal,
-#: src/file.c:1805
+#: src/file.c:1807
 msgid "mserv data retrieval problem"
 msgstr "×‘×¢×™×” ×‘×”×©×’×ª ×ž×™×“×¢ ×ž-mserv"
 
-#: src/file.c:1946
+#: src/file.c:1948
 msgid "file not found"
 msgstr "×”×§×•×‘×¥ ×œ× × ×ž×¦×"
 
-#: src/file.c:1950
+#: src/file.c:1952
 msgid "format not supported"
 msgstr "×”×¤×•×¨×ž×˜ ×œ× × ×ª×ž×š"
 
-#: src/file.c:2031
+#: src/file.c:2033
 #, c-format
 msgid "Processing '%s'..."
 msgstr "×ž×¢×‘×“ '%s'..."
 
-#: src/file.c:2135 src/misc_track.c:1169 src/misc_track.c:1225
+#: src/file.c:2137 src/misc_track.c:1169 src/misc_track.c:1225
 #, c-format
 msgid ""
 "Podcast already present: '%s'\n"
 "\n"
 msgstr ""
 
-#: src/file.c:2196
+#: src/file.c:2198
 #, fuzzy, c-format
 msgid ""
 "Writing to video files not yet supported (%s).\n"
 "\n"
 msgstr "× ×¨×ž×•×œ × ×›×©×œ: ×¡×•×’ ×§×•×‘×¥ ×œ× × ×ª×ž×š.\n"
 
-#: src/file.c:2250 src/file.c:2264
+#: src/file.c:2252 src/file.c:2266
 #, c-format
 msgid "Couldn't change tags of file: %s\n"
 msgstr "×œ× ×ž×¡×•×’×œ ×œ×©× ×•×ª ×ª×’ ×©×œ ×§×•×‘×¥: %s\n"
 
-#: src/file.c:2548
+#: src/file.c:2550
 #, c-format
 msgid "Could not open '%s' for reading and writing.\n"
 msgstr "××™ ××¤×©×¨ ×œ×¤×ª×•×— ××ª '%s' ×œ×§×¨×™××” ×•×›×ª×™×‘×”.\n"
 
-#: src/file.c:2555
+#: src/file.c:2557
 #, c-format
 msgid "Could not obtain lock on '%s'.\n"
 msgstr "××™ ××©×¤×¨ ×œ×”×©×™×’ × ×¢×™×œ×” ×¢×œ '%s'.\n"
 
 #. error!
-#: src/file.c:2572 src/file.c:2581 src/file.c:2592 src/file.c:2602
+#: src/file.c:2574 src/file.c:2583 src/file.c:2594 src/file.c:2604
 #, c-format
 msgid "Malformed line in '%s': %s\n"
 msgstr "×©×•×¨×” ×œ× ×ª×§×™× ×” ×‘ '%s' : %s\n"
 
 #. gint id,
 #. gboolean modal,
-#: src/file.c:2631
+#: src/file.c:2633
 msgid "Remove offline playcounts?"
 msgstr "×”×¡×¨ ×ž×¡×¤×•×¨ ×”×©×ž×¢×•×ª ×œ× ×ž×§×•×•×Ÿ?"
 
 #. title
-#: src/file.c:2632
+#: src/file.c:2634
 msgid ""
 "Some tracks played offline could not be found in the iTunesDB. Press 'OK' to "
 "remove them from the offline playcount file, 'Cancel' to keep them."
@@ -1161,19 +1158,19 @@
 "××™ ××¤×©×¨ ×œ××ª×¨ ×ž×¡×¤×¨ ×¨×¦×•×¢×•×ª ×©× ×•×’× ×• ×‘×¦×•×¨×” ×œ× ×ž×§×•×•× ×ª ×‘-iTunesDB. ×œ×—×¥ ×¢×œ '××™×©×•×¨' "
 "×œ×”×¡×™×¨ ××•×ª×Ÿ ×ž×ž×¡×¤×•×¨ ×”×”×©×ž×¢×” ×”×œ× ×ž×§×•×•×Ÿ, ×•×¢×œ '×‘×™×˜×•×œ' ×œ×”×©××™×¨ ××•×ª×Ÿ."
 
-#: src/file.c:2649
+#: src/file.c:2651
 #, c-format
 msgid "Error writing to '%s'.\n"
 msgstr "×ª×§×œ×” ×‘×›×ª×™×‘×” ×œ-'%s'.\n"
 
-#: src/file.c:2698
+#: src/file.c:2700
 #, fuzzy, c-format
 msgid ""
 "Normalization failed: file type not supported (%s).\n"
 "\n"
 msgstr "× ×¨×ž×•×œ × ×›×©×œ: ×¡×•×’ ×§×•×‘×¥ ×œ× × ×ª×ž×š.\n"
 
-#: src/file.c:2713
+#: src/file.c:2715
 #, fuzzy, c-format
 msgid ""
 "Normalization failed: file not available (%s).\n"
@@ -1211,7 +1208,7 @@
 msgstr "××™ ××¤×©×¨ ×œ×ž×¦×•× ××ª ×”×§×•×‘×¥ '%s' ×¢×œ ×”-iPod\n"
 
 #. create the dialog window
-#: src/file_export.c:390 src/file_itunesdb.c:1060 src/tools.c:148
+#: src/file_export.c:390 src/file_itunesdb.c:1062 src/tools.c:148
 msgid "Information"
 msgstr "×ž×™×“×¢"
 
@@ -1235,7 +1232,7 @@
 msgstr[0] "×”×•×¢×ª×§ %d ×ž×ª×•×š %d ×¨×¦×•×¢×”."
 msgstr[1] "×”×•×¢×ª×§×• %d ×ž×ª×•×š %d ×¨×¦×•×¢×•×ª."
 
-#: src/file_export.c:494 src/file_itunesdb.c:1324 src/tools.c:307
+#: src/file_export.c:494 src/file_itunesdb.c:1326 src/tools.c:307
 #, c-format
 msgid "%d%% (%d:%02d:%02d left)"
 msgstr "%d%% (%d:%02d:%02d × ×•×ª×¨×•)"
@@ -1451,7 +1448,7 @@
 msgid "Aborted writing of extended info.\n"
 msgstr "×›×ª×™×‘×ª ×ž×™×“×¢ ×ž×•×¨×—×‘ ×‘×•×˜×œ×”.\n"
 
-#: src/file_itunesdb.c:1071
+#: src/file_itunesdb.c:1073
 msgid ""
 "Press button to abort.\n"
 "Export can be continued at a later time."
@@ -1459,26 +1456,26 @@
 "×œ×—×¥ ×¢×œ ×”×›×¤×ª×•×¨ ×œ×‘×™×˜×•×œ.\n"
 "×‘×›×œ ×¢×ª × ×™×ª×Ÿ ×œ×”×ž×©×™×š ××ª ×”×™×¦×•×."
 
-#: src/file_itunesdb.c:1140
+#: src/file_itunesdb.c:1142
 msgid "deleting..."
 msgstr "×ž×•×—×§..."
 
-#: src/file_itunesdb.c:1244
+#: src/file_itunesdb.c:1246
 msgid "preparing to copy..."
 msgstr "×ž×ª×›×•× ×Ÿ ×œ×”×¢×ª×™×§..."
 
-#: src/file_itunesdb.c:1307
+#: src/file_itunesdb.c:1309
 #, c-format
 msgid "Copied %d of %d new track."
 msgid_plural "Copied %d of %d new tracks."
 msgstr[0] "×”×•×¢×ª×§×• %d ×ž×ª×•×š %d ×¨×¦×•×¢×” ×—×“×©×”."
 msgstr[1] "×”×•×¢×ª×§×• %d ×ž×ª×•×š %d ×¨×¦×•×¢×•×ª ×—×“×©×•×ª."
 
-#: src/file_itunesdb.c:1334
+#: src/file_itunesdb.c:1336
 msgid "Some tracks were not written to iPod. Export aborted!"
 msgstr "×ž×¡×¤×¨ ×¨×¦×•×¢×•×ª ×œ× × ×›×ª×‘×• ×œ-iPod. ×™×¦×•× ×‘×•×˜×œ!"
 
-#: src/file_itunesdb.c:1387
+#: src/file_itunesdb.c:1389
 #, c-format
 msgid ""
 "You did not import the existing iTunesDB ('%s'). This is most likely "
@@ -1494,30 +1491,30 @@
 "×œ×—×¥ ××™×©×•×¨ ×× ×ª×¨×¦×” ×œ×”×ž×©×™×š ×‘×›×œ ×–××ª ××• ×‘×™×˜×•×œ ×œ×“×œ×’ ×¢×œ ×”×©×ž×™×¨×”. ×× ×ª×‘×˜×œ, ×ª×•×›×œ "
 "×œ×™×™×‘× ××ª ×ž×¡×“ ×”× ×ª×•× ×™× ×”×§×™×™× ×œ×¤× ×™ ×§×¨×™××” ×œ×¤×•× ×§×¦×™×” ×–×• ×©×•×‘.\n"
 
-#: src/file_itunesdb.c:1417
+#: src/file_itunesdb.c:1419
 msgid ""
 "iPod directory structure must be present before synching to the iPod can be "
 "performed.\n"
 msgstr "×ž×‘× ×” ×”×ª×™×§×™×•×ª ×©×œ ×”-iPod ×—×™×™×‘ ×œ×”×™×•×ª ×–×ž×™×Ÿ ×œ×¤× ×™ ×¡× ×›×¨×•×Ÿ ×”-iPod.\n"
 
-#: src/file_itunesdb.c:1426
+#: src/file_itunesdb.c:1428
 msgid "Some tracks could not be deleted from the iPod. Export aborted!"
 msgstr "×ž×¡×¤×¨ ×¨×¦×•×¢×•×ª ×œ× ×™×›×œ×• ×œ×”×™×ž×—×§ ×ž×”-iPod. ×™×¦×•× ×‘×•×˜×œ!"
 
-#: src/file_itunesdb.c:1442
+#: src/file_itunesdb.c:1444
 msgid "Now writing iTunesDB. Please wait..."
 msgstr "×›×•×ª×‘ ×›×¢×ª iTunesDB. ×× × ×”×ž×ª×Ÿ..."
 
-#: src/file_itunesdb.c:1488
+#: src/file_itunesdb.c:1490
 #, c-format
 msgid "Extended information file not deleted: '%s'"
 msgstr "×§×•×‘×¥ ×ž×™×“×¢ ×ž×•×¨×—×‘ ×œ× × ×ž×—×§: '%s'"
 
-#: src/file_itunesdb.c:1574
+#: src/file_itunesdb.c:1577
 msgid "iPod Database Saved"
 msgstr "×ž×¡×“ × ×ª×•× ×™× ×©×œ iPod × ×©×ž×¨"
 
-#: src/file_itunesdb.c:1633
+#: src/file_itunesdb.c:1636
 msgid "Syncing contacts, calendar and notes..."
 msgstr "×ž×¡× ×›×¨×Ÿ ×× ×©×™ ×§×©×¨, ×™×•×ž×Ÿ ×•×¤×ª×§×™×..."
 
@@ -1548,11 +1545,11 @@
 msgid "Select directory to add recursively"
 msgstr "×‘×—×¨ ×ª×™×§×™×™×” ×œ×”×•×¡×¤×” ×¨×§×•×¨×¡×™×‘×™×ª"
 
-#: src/fileselection.c:749
+#: src/fileselection.c:759
 msgid "Ok"
 msgstr "××™×©×•×¨"
 
-#: src/fileselection.c:758
+#: src/fileselection.c:768
 msgid "Cancel"
 msgstr "×‘×™×˜×•×œ"
 
@@ -2673,22 +2670,22 @@
 msgid "drag and drop: ignored '%s'\n"
 msgstr "×’×¨×•×¨ ×•×©×—×¨×¨: ×”×ª×¢×œ×ž×•×ª ×ž '%s'\n"
 
-#: src/mp3file.c:1117
+#: src/mp3file.c:1118
 #, c-format
 msgid "Error setting ID3 field: %s\n"
 msgstr "×©×’×™××” ×‘×§×‘×™×¢×ª ×©×“×” ID3: %s\n"
 
-#: src/mp3file.c:1142 src/mp3file.c:1289 src/mp3file.c:2035
+#: src/mp3file.c:1143 src/mp3file.c:1290 src/mp3file.c:2036
 #, c-format
 msgid "ERROR while opening file: '%s' (%s).\n"
 msgstr "×©×’×™××” ×‘×–×ž×Ÿ ×¤×ª×™×—×ª ×§×•×‘×¥: '%s' (%s).\n"
 
-#: src/mp3file.c:1356
+#: src/mp3file.c:1357
 #, c-format
 msgid "ERROR while writing tag to file: '%s' (%s).\n"
 msgstr "×©×’×™××” ×‘×–×ž×Ÿ ×›×ª×™×‘×ª ×ª×’ ×œ×§×•×‘×¥: '%s' (%s).\n"
 
-#: src/mp3file.c:1879
+#: src/mp3file.c:1880
 #, c-format
 msgid ""
 "Could not find mp3gain. I tried to use the following executable: '%s'.\n"
@@ -2707,13 +2704,13 @@
 "×× ××™×Ÿ ×œ×š ××ª mp3gain ×ž×•×ª×§×Ÿ, ××ª×” ×™×›×•×œ ×œ×”×•×¨×™×“×• ×ž: http://www.sourceforge.net/"
 "projects/mp3gain"
 
-#: src/mp3file.c:1919
+#: src/mp3file.c:1920
 #, c-format
 msgid "Execution of mp3gain ('%s') failed."
 msgstr "×‘×™×¦×•×¢ ×©×œ mp3gain ('%s') × ×›×©×œ."
 
 #. Tracks with zero play length are ignored by iPod...
-#: src/mp3file.c:2178
+#: src/mp3file.c:2179
 #, c-format
 msgid "File \"%s\" has zero play length. Ignoring.\n"
 msgstr "×”×§×•×‘×¥ \"%s\" ×‘×¢×œ ×–×ž×Ÿ ××¤×¡. ×ž×ª×¢×œ×.\n"
@@ -2897,35 +2894,40 @@
 msgid "'%s': only '%%[%s]' allowed.\n"
 msgstr "×¨×§ '%%[%s]' ×ž×•×ª×¨ : '%s'\n"
 
-#: src/prefs_window.c:105
+#: src/prefs_window.c:108
 msgid "Please select command for 'Play Now'"
 msgstr "×‘×—×¨ ×‘×‘×§×©×” ×¤×§×•×“×” ×œ '× ×’×Ÿ ×¢×›×©×™×•'"
 
-#: src/prefs_window.c:106
+#: src/prefs_window.c:109
 msgid "Please select command for 'Enqueue'"
 msgstr "×‘×—×¨ ×‘×‘×§×©×” ×¤×§×•×“×” ×œ '×”×›× ×¡ ×œ×ª×•×¨'"
 
-#: src/prefs_window.c:107
+#: src/prefs_window.c:110
 msgid "Please select the mp3gain executable"
 msgstr "×‘×—×¨ ×‘×‘×§×©×” ××ª ×§×•×‘×¥ ×”×”×¨×¦×” ×œ-mp3gain"
 
-#: src/prefs_window.c:108
+#: src/prefs_window.c:111
 msgid "Please select command to sync contacts"
 msgstr "×‘×—×¨ ×‘×‘×§×©×” ×¤×§×•×“×” ×œ×¡× ×›×¨×•×Ÿ ×× ×©×™ ×§×©×¨"
 
-#: src/prefs_window.c:109
+#: src/prefs_window.c:112
 msgid "Please select command to sync calendar"
 msgstr "×‘×—×¨ ×‘×‘×§×©×” ×¤×§×•×“×” ×œ×¡× ×›×¨×•×Ÿ ×™×•×ž×Ÿ"
 
-#: src/prefs_window.c:110
+#: src/prefs_window.c:113
 msgid "Select the mserv music root directory"
 msgstr "×‘×—×¨ ××ª ×ª×™×§×™×™×ª ×”×©×•×¨×© ×œ mserv music"
 
-#: src/prefs_window.c:111
+#: src/prefs_window.c:114
 msgid "Select the mserv trackinfo root directory"
 msgstr "×‘×—×¨ ××ª ×ª×™×§×™×™×ª ×”×©×•×¨×© ×œ mserv trackinfo"
 
-#: src/prefs_window.c:824
+#: src/prefs_window.c:115
+#, fuzzy
+msgid "Please select command to sync notes"
+msgstr "×‘×—×¨ ×‘×‘×§×©×” ×¤×§×•×“×” ×œ×¡× ×›×¨×•×Ÿ ×× ×©×™ ×§×©×¨"
+
+#: src/prefs_window.c:854
 #, fuzzy, c-format
 msgid ""
 "<i>Have a look at the scripts provided in '%s'. If you write a new script, "
@@ -2935,11 +2937,11 @@
 "×”×¡×ª×›×œ ×¢×œ ×§×‘×¦×™ ×”××¦×•×•×” ×”×ž×•×¤×™×¢×™× ×‘-'%s'. ×× ×ª×›×ª×•×‘ ×§×•×‘×¥ ××¦×•×•×” ×—×“×©, ×©×œ×— ××•×ª×• "
 "×‘×‘×§×©×” ××œ jcsjcs ×‘- users.sourceforge.net ×œ×”×›×œ×œ×” ×‘×’×¨×¡×” ×”×‘××”."
 
-#: src/prefs_window.c:1257 src/prefs_window.c:1275
+#: src/prefs_window.c:1287 src/prefs_window.c:1305
 msgid "Preferences not updated"
 msgstr "×”×¢×“×¤×•×ª ×œ× ×¢×•×“×›× ×•"
 
-#: src/prefs_window.c:1284
+#: src/prefs_window.c:1314
 msgid "Preferences applied"
 msgstr "×”×¢×“×¤×•×ª ×¢×•×“×›× ×•"
 
@@ -3112,6 +3114,10 @@
 msgid "_Edit"
 msgstr "_×¢×¨×™×›×”"
 
+#: gtkpod.glade:530
+msgid "Edit"
+msgstr "×¢×¨×™×›×”"
+
 #: gtkpod.glade:551
 #, fuzzy
 msgid "Tracks in Selected _Playlist"
@@ -3298,7 +3304,7 @@
 msgid "_Arrange Sort Tabs"
 msgstr "_×¡×“×¨ ×›×¨×˜×™×¡×™×•×ª ×ž×™×•×Ÿ"
 
-#: gtkpod.glade:1106 gtkpod.glade:12692
+#: gtkpod.glade:1106 gtkpod.glade:12693
 msgid "_Tools"
 msgstr "_×›×œ×™×"
 
@@ -3559,8 +3565,8 @@
 #: gtkpod.glade:9700 gtkpod.glade:10487 gtkpod.glade:10644 gtkpod.glade:10801
 #: gtkpod.glade:10922 gtkpod.glade:10975 gtkpod.glade:11132 gtkpod.glade:11389
 #: gtkpod.glade:11443 gtkpod.glade:11554 gtkpod.glade:11657 gtkpod.glade:11813
-#: gtkpod.glade:12027 gtkpod.glade:12248 gtkpod.glade:12386 gtkpod.glade:12751
-#: gtkpod.glade:12869 gtkpod.glade:13043 gtkpod.glade:13278 gtkpod.glade:13380
+#: gtkpod.glade:12027 gtkpod.glade:12248 gtkpod.glade:12386 gtkpod.glade:12752
+#: gtkpod.glade:12870 gtkpod.glade:13044 gtkpod.glade:13279 gtkpod.glade:13381
 msgid "    "
 msgstr "    "
 
@@ -4093,7 +4099,7 @@
 " MD5 hashes, encoding). Recommended."
 msgstr "×›×ª×•×‘ ×ž×™×“×¢ ×ž×•×¨×—×‘ (×©×ž×•×ª ×§×‘×¦×™× ×‘-PC ×¢×¨×‘×•×‘×™ MD5, ×¢×¨×›×•×ª ×ª×•×•×™×). ×ž×•×ž×œ×¥."
 
-#: gtkpod.glade:8463 gtkpod.glade:14969
+#: gtkpod.glade:8463 gtkpod.glade:14970
 #, fuzzy
 msgid "_General"
 msgstr "×›×œ×œ×™"
@@ -4243,7 +4249,7 @@
 msgstr "×©× ×ž×©×ª×ž×© ×”× ×•×¢×“ ×œ×©×™×ž×•×© ×‘×ž×¡×“ ×”× ×ª×•× ×™× ×©×œ mserv."
 
 #: gtkpod.glade:9535 gtkpod.glade:9554 gtkpod.glade:12102 gtkpod.glade:12172
-#: gtkpod.glade:12317 gtkpod.glade:12490 gtkpod.glade:12555 gtkpod.glade:12620
+#: gtkpod.glade:12317 gtkpod.glade:12491 gtkpod.glade:12556 gtkpod.glade:12621
 msgid "Browse"
 msgstr "×¡×™×™×¨"
 
@@ -4559,11 +4565,11 @@
 msgid "<b>Synchronization</b>"
 msgstr "<b>×¡× ×›×¨×•×Ÿ</b>"
 
-#: gtkpod.glade:12443
+#: gtkpod.glade:12444
 msgid "Contacts sync command:"
 msgstr "×¤×§×•×“×ª ×¡× ×›×¨×•×Ÿ ×œ×× ×©×™ ×§×©×¨:"
 
-#: gtkpod.glade:12467 gtkpod.glade:12532 gtkpod.glade:12597
+#: gtkpod.glade:12468 gtkpod.glade:12533 gtkpod.glade:12598
 msgid ""
 "Specify exact path including command line options. '%i' will be replaced "
 "with the mount point of the iPod."
@@ -4571,168 +4577,171 @@
 "×ž×¦×™×™×Ÿ × ×ª×™×‘ ×ž×œ× ×›×•×œ×œ ××¤×©×¨×•×™×•×ª ×©×•×¨×ª ×¤×§×•×“×”. ×”×ž×—×¨×•×–×ª '%i' ×ª×•×—×œ×£ ×¢× × ×§×•×“×ª ×”×¢×’×™× ×” "
 "×©×œ ×”-iPod."
 
-#: gtkpod.glade:12508
+#: gtkpod.glade:12509
 msgid "Calendar sync command:"
 msgstr "×¤×§×•×“×ª ×¡× ×›×¨×•×Ÿ ×œ×™×•×ž×Ÿ:"
 
-#: gtkpod.glade:12573
+#: gtkpod.glade:12574
 msgid "Notes sync command:"
 msgstr "×¤×§×•×“×ª ×¡× ×›×¨×•×Ÿ ×œ×¤×ª×§××•×ª (notes):"
 
-#: gtkpod.glade:12646
+#: gtkpod.glade:12647
 msgid "Call automatically when synchronizing iTunesDB"
 msgstr "×§×¨× ××•×˜×•×ž×˜×™×ª ×‘×–×ž×Ÿ ×¡× ×›×¨×•×Ÿ iTunesDB"
 
-#: gtkpod.glade:12724
+#: gtkpod.glade:12725
 msgid "<b>Podcast subscriptions</b>"
 msgstr ""
 
-#: gtkpod.glade:12799
+#: gtkpod.glade:12800
 #, fuzzy
 msgid "Add"
 msgstr "×”×•×¡×¤×•"
 
-#: gtkpod.glade:12833
+#: gtkpod.glade:12834
 #, fuzzy
 msgid "Delete"
 msgstr "×¨×¦×•×¢×•×ª × ×ž×—×§×•×ª"
 
-#: gtkpod.glade:12899
+#: gtkpod.glade:12900
 #, fuzzy
 msgid "Name: "
 msgstr "×©× ×ž×©×ª×ž×©:"
 
-#: gtkpod.glade:12923
+#: gtkpod.glade:12924
 msgid "URL: "
 msgstr ""
 
-#: gtkpod.glade:13016
+#: gtkpod.glade:13017
 #, fuzzy
 msgid "<b>File options</b>"
 msgstr "<b>×•×•×™×“×•× ×ž×—×™×§×”</b>"
 
-#: gtkpod.glade:13076
+#: gtkpod.glade:13077
 msgid "Save podcasts to: "
 msgstr ""
 
-#: gtkpod.glade:13131
+#: gtkpod.glade:13132
 msgid "Delete from computer when "
 msgstr ""
 
-#: gtkpod.glade:13171 gtkpod.glade:13473
+#: gtkpod.glade:13172 gtkpod.glade:13474
 #, fuzzy
 msgid " days old"
 msgstr "×™×ž×™×"
 
-#: gtkpod.glade:13200
+#: gtkpod.glade:13201
 #, fuzzy
 msgid "Delete once copied to iPod"
 msgstr "×”×¨×¦×•×¢×” × ×ž×—×§×” ×œ×’×ž×¨×™ ×ž×”-iPod"
 
-#: gtkpod.glade:13226
+#: gtkpod.glade:13227
 #, fuzzy
 msgid "Automatically fetch podcasts on startup"
 msgstr "×™×‘× ××•×˜×•×ž×˜×™×ª iTunesDB ×‘×ª×—×™×œ×ª ×”×ª×•×›× ×™×ª"
 
-#: gtkpod.glade:13253
+#: gtkpod.glade:13254
 #, fuzzy
 msgid "Create podcast logfile at:"
 msgstr "×™×¦×™×¨×ª ×§×•×‘×¥ ×¨×©×™×ž×ª ×”×©×ž×¢×”"
 
-#: gtkpod.glade:13353
+#: gtkpod.glade:13354
 #, fuzzy
 msgid "<b>iPod options</b>"
 msgstr "<b>×ª×•×•×™×•×ª ×ž×™×“×¢</b>"
 
-#: gtkpod.glade:13408
+#: gtkpod.glade:13409
 #, fuzzy
 msgid "Automatically sync to iPod"
 msgstr "×‘×—×™×¨×” ××•×˜×•×ž×˜×™×ª..."
 
-#: gtkpod.glade:13434
+#: gtkpod.glade:13435
 #, fuzzy
 msgid "Delete from iPod when "
 msgstr "×ž×—×§ ×ž×”-iPod"
 
-#: gtkpod.glade:13502
+#: gtkpod.glade:13503
 #, fuzzy
 msgid "Delete from iPod if podcast has been played"
 msgstr "×ª××¨×™×š ×•×©×¢×” ×©×”×¨×¦×•×¢×” ×”×•×©×ž×¢×” ×œ××—×¨×•× ×”"
 
-#: gtkpod.glade:13522
+#: gtkpod.glade:13523
 msgid "Include broadcast date in track title"
 msgstr ""
 
-#: gtkpod.glade:13542
+#: gtkpod.glade:13543
 msgid "Set all podcast genres to 'Podcast'"
 msgstr ""
 
-#: gtkpod.glade:13588 gtkpod.glade:15341
+#: gtkpod.glade:13589 gtkpod.glade:15342
 msgid "_Podcasts"
 msgstr ""
 
-#: gtkpod.glade:13753
+#: gtkpod.glade:13754
 msgid ""
 "\n"
 "\n"
 msgstr ""
 
-#: gtkpod.glade:13787
+#: gtkpod.glade:13788
 #, fuzzy
 msgid "Abort selected"
 msgstr "×œ× × ×‘×—×¨×• ×¨×¦×•×¢×•×ª"
 
-#: gtkpod.glade:13803
+#: gtkpod.glade:13804
 msgid "Abort current"
 msgstr ""
 
-#: gtkpod.glade:13819
+#: gtkpod.glade:13820
 msgid "Abort all"
 msgstr ""
 
-#: gtkpod.glade:13843
+#: gtkpod.glade:13844
 msgid "Details"
 msgstr ""
 
-#: gtkpod.glade:13904
+#: gtkpod.glade:13905
 #, fuzzy
 msgid "Cover"
 msgstr "×™×•×¦×¨"
 
-#: gtkpod.glade:13989
+#: gtkpod.glade:13990
 msgid "Set Cover Art"
 msgstr ""
 
-#: gtkpod.glade:14022
+#: gtkpod.glade:14023
 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 ""
 
-#: gtkpod.glade:14068
+#: gtkpod.glade:14069
 msgid ""
 "Change all tracks\n"
 "simultaneously"
 msgstr ""
 
-#: gtkpod.glade:14156
+#: gtkpod.glade:14157
 msgid "Remove Cover Art"
 msgstr ""
 
-#: gtkpod.glade:16245
+#: gtkpod.glade:16246
 msgid "_Other"
 msgstr ""
 
-#: gtkpod.glade:16535
+#: gtkpod.glade:16536
 msgid "_Undo All"
 msgstr ""
 
-#: gtkpod.glade:16605
+#: gtkpod.glade:16606
 #, fuzzy
 msgid "_Undo Track"
 msgstr "×¨×¦×•×¢×•×ª ×œ× ×“×•×¨×’×•"
 
+#~ msgid "Export Tracks"
+#~ msgstr "×™×™×¦× ×¨×¦×•×¢×•×ª"
+
 #~ msgid ""
 #~ "Icons of buttons were made by Nicolas Chariot.\n"
 #~ "\n"

Modified: gtkpod/branches/upstream/current/po/it.gmo
===================================================================
(Binary files differ)

Modified: gtkpod/branches/upstream/current/po/it.po
===================================================================
--- gtkpod/branches/upstream/current/po/it.po	2006-04-08 19:20:23 UTC (rev 117)
+++ gtkpod/branches/upstream/current/po/it.po	2006-04-08 19:35:58 UTC (rev 118)
@@ -11,7 +11,7 @@
 msgstr ""
 "Project-Id-Version: it2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-12-14 23:51+0900\n"
+"POT-Creation-Date: 2006-03-05 23:01+0900\n"
 "PO-Revision-Date: 2005-09-18 01:54+0900\n"
 "Last-Translator: \n"
 "Language-Team:  <it at li.org>\n"
@@ -240,104 +240,101 @@
 msgid "Confirmation Dialogue"
 msgstr "Finestra di conferma"
 
-#: src/context_menus.c:368 gtkpod.glade:530
-msgid "Edit"
-msgstr "Modifica"
-
-#: src/context_menus.c:370 src/tools.c:634
+#: src/context_menus.c:352 src/tools.c:634
 msgid "Play Now"
 msgstr "Suona"
 
-#: src/context_menus.c:372 src/tools.c:645
+#: src/context_menus.c:354 src/tools.c:645
 msgid "Enqueue"
 msgstr "Metti in coda"
 
-#: src/context_menus.c:375
-msgid "Export Tracks"
-msgstr "Tracce da esportare"
+#: src/context_menus.c:357
+#, fuzzy
+msgid "Copy Tracks to Filesystem"
+msgstr "_Aggiorna le tracce dai file"
 
-#: src/context_menus.c:377 src/file_export.c:1069
+#: src/context_menus.c:359 src/file_export.c:1069
 msgid "Create Playlist File"
 msgstr "Crea un File Playlist"
 
-#: src/context_menus.c:379
+#: src/context_menus.c:361
 msgid "Edit Details"
 msgstr ""
 
-#: src/context_menus.c:381 gtkpod.glade:12816
+#: src/context_menus.c:363 gtkpod.glade:12817
 msgid "Update"
 msgstr "Aggiorna"
 
-#: src/context_menus.c:383
+#: src/context_menus.c:365
 msgid "Sync Dirs"
 msgstr "Sincronizza le directory"
 
-#: src/context_menus.c:385
+#: src/context_menus.c:367
 msgid "Normalize"
 msgstr "Normalizza"
 
-#: src/context_menus.c:387
+#: src/context_menus.c:369
 msgid "Create new Playlist"
 msgstr "Crea una nuova Playlist"
 
-#: src/context_menus.c:390
+#: src/context_menus.c:372
 msgid "Edit Smart Playlist"
 msgstr "Modifica la playlist intelligente"
 
-#: src/context_menus.c:396
+#: src/context_menus.c:378
 msgid "Alphabetize"
 msgstr "Ordine alfabetico"
 
-#: src/context_menus.c:420
+#: src/context_menus.c:402
 msgid "Delete From iPod"
 msgstr "Cancella dall'iPod"
 
-#: src/context_menus.c:426
+#: src/context_menus.c:408
 msgid "Delete From Harddisk"
 msgstr "Cancella dal disco fisso"
 
-#: src/context_menus.c:432
+#: src/context_menus.c:414
 msgid "Delete From Database"
 msgstr "Cancella dal database"
 
-#: src/context_menus.c:438
+#: src/context_menus.c:420
 msgid "Delete From Playlist"
 msgstr "Cancella dalla Playlist"
 
-#: src/context_menus.c:457
+#: src/context_menus.c:439
 msgid "Delete Including Tracks"
 msgstr "Cancella le tracce incluse"
 
-#: src/context_menus.c:463
+#: src/context_menus.c:445
 msgid "Delete Including Tracks (Harddisk)"
 msgstr "Cancella le tracce incluse (disco fisso)"
 
-#: src/context_menus.c:469
+#: src/context_menus.c:451
 msgid "Delete Including Tracks (Database)"
 msgstr "Cancella le tracce incluse (Database)"
 
-#: src/context_menus.c:475
+#: src/context_menus.c:457
 msgid "Delete But Keep Tracks"
 msgstr "Cancella ma preserva le tracce"
 
-#: src/context_menus.c:481
+#: src/context_menus.c:463
 msgid "Remove All Tracks from iPod"
 msgstr "Rimuovi tutte le Tracce dall'iPod"
 
-#: src/context_menus.c:487
+#: src/context_menus.c:469
 msgid "Remove All Tracks from Database"
 msgstr "Rimuovi tutte le tracce dal Database"
 
-#: src/context_menus.c:494
+#: src/context_menus.c:476
 #, fuzzy
 msgid "Remove All Podcasts from iPod"
 msgstr "Rimuovi tutte le Tracce dall'iPod"
 
-#: src/context_menus.c:505 gtkpod.glade:156
+#: src/context_menus.c:487 gtkpod.glade:156
 msgid "Update Podcasts"
 msgstr ""
 
-#: src/context_menus.c:512
+#: src/context_menus.c:494
 #, fuzzy
 msgid "Podcasts Preferences"
 msgstr "_Modifica le preferenze"
@@ -453,7 +450,7 @@
 
 #. add podcast playlist
 #: src/display_itdb.c:843 src/display_itdb.c:871 src/display_itdb.c:975
-#: gtkpod.glade:13668
+#: gtkpod.glade:13669
 msgid "Podcasts"
 msgstr ""
 
@@ -926,40 +923,40 @@
 msgid "Unknown token '%s' in template '%s'\n"
 msgstr "Token '%s' sconosciuto nel formato '%s'\n"
 
-#: src/file.c:815
+#: src/file.c:817
 #, c-format
 msgid "Local filename not valid (%s)"
 msgstr "Nome del file locale non valido (%s)"
 
-#: src/file.c:868
+#: src/file.c:870
 #, c-format
 msgid "No information found for user '%s' in '%s'"
 msgstr "Nessuna informazioni sull'utente '%s' in '%s'"
 
-#: src/file.c:875
+#: src/file.c:877
 #, c-format
 msgid "mserv data file (%s) not available for track (%s)"
 msgstr "il file dei dati mserv (%s) non Ã¨ disponibileper la traccia (%s)"
 
-#: src/file.c:883
+#: src/file.c:885
 #, c-format
 msgid "Track (%s) not in mserv music root directory (%s)"
 msgstr "La traccia (%s) Ã¨ non nella directory radice musicale di mserv (%s)"
 
-#: src/file.c:988
+#: src/file.c:990
 #, c-format
 msgid ""
 "The following track could not be processed (file does not exist): '%s'\n"
 msgstr ""
 "La traccia seguente non puÃ² essereelaborata (il file non esiste): '%s'\n"
 
-#: src/file.c:1037
+#: src/file.c:1039
 #, c-format
 msgid "The following track could not be processed (filetype unknown): '%s'\n"
 msgstr ""
 "La traccia seguente non puÃ² essereelaborata (tipo di file conosciuto): '%s'\n"
 
-#: src/file.c:1119
+#: src/file.c:1121
 #, c-format
 msgid ""
 "The following track could not be processed (filetype is known but analysis "
@@ -968,39 +965,39 @@
 "La traccia seguente non puÃ² essere elaborata (tipo di file conosciuto ma "
 "l'analisi Ã¨ fallita): '%s'\n"
 
-#: src/file.c:1148 src/file.c:1203
+#: src/file.c:1150 src/file.c:1205
 msgid "Nothing to update"
 msgstr "Nulla da aggiornare"
 
-#: src/file.c:1168
+#: src/file.c:1170
 #, c-format
 msgid "Updating %s"
 msgstr "Aggiornamento di %s in corso"
 
-#: src/file.c:1184
+#: src/file.c:1186
 msgid "Updated selected tracks with info from file."
 msgstr "Le tracce sono state aggiornate con le informazioni dal file."
 
-#: src/file.c:1216
+#: src/file.c:1218
 #, c-format
 msgid "Retrieving mserv data %s"
 msgstr "Ricezione dei dati mserv %s"
 
 #. no path available
-#: src/file.c:1222 src/file.c:1900
+#: src/file.c:1224 src/file.c:1902
 msgid "no filename available"
 msgstr "nessun nome di file disponibile"
 
-#: src/file.c:1227
+#: src/file.c:1229
 msgid "Updated selected tracks with data from mserv."
 msgstr "Le tracce sono state aggiornate con le informazioni dal mserv."
 
-#: src/file.c:1294
+#: src/file.c:1296
 #, c-format
 msgid "Syncing directory '%s'"
 msgstr "Sincronizzazione della directory '%s' in corso"
 
-#: src/file.c:1319
+#: src/file.c:1321
 msgid "Syncing completed. No files deleted."
 msgstr "Sincronizzazione completata. Nessun file cancellato."
 
@@ -1009,29 +1006,29 @@
 #. title
 #. label
 #. scrolled text
-#: src/file.c:1432
+#: src/file.c:1434
 msgid "Never delete any files when syncing"
 msgstr "Non cancellare i file durante la sincronizzazione"
 
-#: src/file.c:1461
+#: src/file.c:1463
 msgid "Syncing completed."
 msgstr "Sincronizzazione completata."
 
-#: src/file.c:1481
+#: src/file.c:1483
 msgid "Syncing aborted"
 msgstr "Sincronizzazione abortita"
 
-#: src/file.c:1519
+#: src/file.c:1521
 msgid "No tracks in selection"
 msgstr "Nessuna traccia selezionata"
 
-#: src/file.c:1569
+#: src/file.c:1571
 #, c-format
 msgid "'%s' is not a directory. Ignored.\n"
 msgstr "'%s' non Ã¨ una directory. Ignorata.\n"
 
 #. no directory names available
-#: src/file.c:1599
+#: src/file.c:1601
 msgid ""
 "No directory names were stored. Make sure that you enable 'Write extended "
 "information' in the Export section of the preferences at the time of "
@@ -1049,11 +1046,11 @@
 "duplicati'  ('Non permettere i file duplicati')nella sezione Importazione e "
 "aggiungi le directory che vuoi sincronizzare di nuovo.\n"
 
-#: src/file.c:1603
+#: src/file.c:1605
 msgid "No valid directories have been found. Sync aborted.\n"
 msgstr "Nessuna directory valida Ã¨ stata trovata. Sincronizzazione abortita.\n"
 
-#: src/file.c:1612
+#: src/file.c:1614
 msgid ""
 "The (former) contents of the following directories will be removed from the "
 "database:\n"
@@ -1063,7 +1060,7 @@
 "database:\n"
 "\n"
 
-#: src/file.c:1620
+#: src/file.c:1622
 msgid ""
 "The following directories will be synchronized:\n"
 "\n"
@@ -1073,16 +1070,16 @@
 
 #. gint id,
 #. gboolean modal,
-#: src/file.c:1631
+#: src/file.c:1633
 msgid "Synchronize directories"
 msgstr "Sincronizza le directory"
 
 #. title
-#: src/file.c:1632
+#: src/file.c:1634
 msgid "OK to synchronize the following directories?"
 msgstr "Vuoi sincronizzare le seguenti directory?"
 
-#: src/file.c:1670
+#: src/file.c:1672
 #, c-format
 msgid "The following track could not be updated"
 msgid_plural "The following %d tracks could not be updated"
@@ -1091,11 +1088,11 @@
 
 #. gint id,
 #. gboolean modal,
-#: src/file.c:1676
+#: src/file.c:1678
 msgid "Failed Track Update"
 msgstr "Aggiornamento delle tracce fallito"
 
-#: src/file.c:1734
+#: src/file.c:1736
 #, c-format
 msgid "The following track has been updated"
 msgid_plural "The following %d tracks have been updated"
@@ -1104,11 +1101,11 @@
 
 #. gint id,
 #. gboolean modal,
-#: src/file.c:1740
+#: src/file.c:1742
 msgid "Successful Track Update"
 msgstr "Aggiornamento delle tracce completato con successo."
 
-#: src/file.c:1799
+#: src/file.c:1801
 #, c-format
 msgid "No mserv information could be retrieved for the following track"
 msgid_plural ""
@@ -1122,66 +1119,66 @@
 
 #. gint id,
 #. gboolean modal,
-#: src/file.c:1805
+#: src/file.c:1807
 msgid "mserv data retrieval problem"
 msgstr "problemi nel raccogliere le informazioni mserv"
 
-#: src/file.c:1946
+#: src/file.c:1948
 msgid "file not found"
 msgstr "file non trovato"
 
-#: src/file.c:1950
+#: src/file.c:1952
 msgid "format not supported"
 msgstr "formato non supportato"
 
-#: src/file.c:2031
+#: src/file.c:2033
 #, c-format
 msgid "Processing '%s'..."
 msgstr "Elaborazione di '%s' in corso..."
 
-#: src/file.c:2135 src/misc_track.c:1169 src/misc_track.c:1225
+#: src/file.c:2137 src/misc_track.c:1169 src/misc_track.c:1225
 #, c-format
 msgid ""
 "Podcast already present: '%s'\n"
 "\n"
 msgstr ""
 
-#: src/file.c:2196
+#: src/file.c:2198
 #, fuzzy, c-format
 msgid ""
 "Writing to video files not yet supported (%s).\n"
 "\n"
 msgstr "Normalizzazione fallita: tipo di file non supportato.\n"
 
-#: src/file.c:2250 src/file.c:2264
+#: src/file.c:2252 src/file.c:2266
 #, c-format
 msgid "Couldn't change tags of file: %s\n"
 msgstr "Impossibile cambiare il tag del file: %s\n"
 
-#: src/file.c:2548
+#: src/file.c:2550
 #, c-format
 msgid "Could not open '%s' for reading and writing.\n"
 msgstr "Impossibile aprire il file \"%s\" in scrittura e lettura.\n"
 
-#: src/file.c:2555
+#: src/file.c:2557
 #, c-format
 msgid "Could not obtain lock on '%s'.\n"
 msgstr "Impossibile ottenere il lock su '%s'.\n"
 
 #. error!
-#: src/file.c:2572 src/file.c:2581 src/file.c:2592 src/file.c:2602
+#: src/file.c:2574 src/file.c:2583 src/file.c:2594 src/file.c:2604
 #, c-format
 msgid "Malformed line in '%s': %s\n"
 msgstr "Linea malformata in '%s': %s\n"
 
 #. gint id,
 #. gboolean modal,
-#: src/file.c:2631
+#: src/file.c:2633
 msgid "Remove offline playcounts?"
 msgstr "Rimuovere i conta-riproduzione offline?"
 
 #. title
-#: src/file.c:2632
+#: src/file.c:2634
 msgid ""
 "Some tracks played offline could not be found in the iTunesDB. Press 'OK' to "
 "remove them from the offline playcount file, 'Cancel' to keep them."
@@ -1190,19 +1187,19 @@
 "'OK' per rimuoverle dal file conta-riproduzioni offline, 'Cancel' per "
 "tenerle."
 
-#: src/file.c:2649
+#: src/file.c:2651
 #, c-format
 msgid "Error writing to '%s'.\n"
 msgstr "Errore nella scrittura verso '%s'.\n"
 
-#: src/file.c:2698
+#: src/file.c:2700
 #, fuzzy, c-format
 msgid ""
 "Normalization failed: file type not supported (%s).\n"
 "\n"
 msgstr "Normalizzazione fallita: tipo di file non supportato.\n"
 
-#: src/file.c:2713
+#: src/file.c:2715
 #, fuzzy, c-format
 msgid ""
 "Normalization failed: file not available (%s).\n"
@@ -1240,7 +1237,7 @@
 msgstr "Impossibile trovare il file per '%s' sull'iPod\n"
 
 #. create the dialog window
-#: src/file_export.c:390 src/file_itunesdb.c:1060 src/tools.c:148
+#: src/file_export.c:390 src/file_itunesdb.c:1062 src/tools.c:148
 msgid "Information"
 msgstr "Informazioni"
 
@@ -1264,7 +1261,7 @@
 msgstr[0] "Copiato %d di %d della traccia"
 msgstr[1] "Copiato %d di %d delle tracce"
 
-#: src/file_export.c:494 src/file_itunesdb.c:1324 src/tools.c:307
+#: src/file_export.c:494 src/file_itunesdb.c:1326 src/tools.c:307
 #, c-format
 msgid "%d%% (%d:%02d:%02d left)"
 msgstr "%d%% (%d:%02d:%02d rimasti)"
@@ -1485,7 +1482,7 @@
 msgstr ""
 "Impossibile aprire \"%s\" per la scrittura delle informazioni estese.\n"
 
-#: src/file_itunesdb.c:1071
+#: src/file_itunesdb.c:1073
 msgid ""
 "Press button to abort.\n"
 "Export can be continued at a later time."
@@ -1493,26 +1490,26 @@
 "Premi il bottone per abortire.\n"
 "l'esportazione puÃ² essere ultimata in un secondo momento."
 
-#: src/file_itunesdb.c:1140
+#: src/file_itunesdb.c:1142
 msgid "deleting..."
 msgstr "cancellazione in corso..."
 
-#: src/file_itunesdb.c:1244
+#: src/file_itunesdb.c:1246
 msgid "preparing to copy..."
 msgstr "copia in preparazione..."
 
-#: src/file_itunesdb.c:1307
+#: src/file_itunesdb.c:1309
 #, c-format
 msgid "Copied %d of %d new track."
 msgid_plural "Copied %d of %d new tracks."
 msgstr[0] "Copiato %d di %d di una nuova traccia"
 msgstr[1] "Copiato %d di %d di nuove tracce"
 
-#: src/file_itunesdb.c:1334
+#: src/file_itunesdb.c:1336
 msgid "Some tracks were not written to iPod. Export aborted!"
 msgstr "Alcune tracce non sono state scritte sull'iPod. Esportazione abortita!"
 
-#: src/file_itunesdb.c:1387
+#: src/file_itunesdb.c:1389
 #, c-format
 msgid ""
 "You did not import the existing iTunesDB ('%s'). This is most likely "
@@ -1529,7 +1526,7 @@
 "interrompere l'operazione. Se la interrompi, puoi importare il database "
 "esistente prima di richiamare di nuovo questa funzione.\n"
 
-#: src/file_itunesdb.c:1417
+#: src/file_itunesdb.c:1419
 msgid ""
 "iPod directory structure must be present before synching to the iPod can be "
 "performed.\n"
@@ -1537,25 +1534,25 @@
 "La struttura delle directory dell'iPod deve essere presente prima che la "
 "sincronizzazione verso l'iPod possa avere inizio.\n"
 
-#: src/file_itunesdb.c:1426
+#: src/file_itunesdb.c:1428
 msgid "Some tracks could not be deleted from the iPod. Export aborted!"
 msgstr ""
 "Alcune tracce non possono essere cancellate dall'iPod. Esportazione abortita!"
 
-#: src/file_itunesdb.c:1442
+#: src/file_itunesdb.c:1444
 msgid "Now writing iTunesDB. Please wait..."
 msgstr "Scrittura del iTunesDB in corso. Attendere prego..."
 
-#: src/file_itunesdb.c:1488
+#: src/file_itunesdb.c:1490
 #, c-format
 msgid "Extended information file not deleted: '%s'"
 msgstr "Il file delle informazioni estese non Ã¨ stato cancellato: '%s'"
 
-#: src/file_itunesdb.c:1574
+#: src/file_itunesdb.c:1577
 msgid "iPod Database Saved"
 msgstr "Database iPod salvato"
 
-#: src/file_itunesdb.c:1633
+#: src/file_itunesdb.c:1636
 msgid "Syncing contacts, calendar and notes..."
 msgstr "Sincronizzazione di contatti, calendari e note..."
 
@@ -1586,11 +1583,11 @@
 msgid "Select directory to add recursively"
 msgstr "Seleziona una directory da aggiungere ricorsivamente"
 
-#: src/fileselection.c:749
+#: src/fileselection.c:759
 msgid "Ok"
 msgstr "Ok"
 
-#: src/fileselection.c:758
+#: src/fileselection.c:768
 msgid "Cancel"
 msgstr "Cancella"
 
@@ -2755,22 +2752,22 @@
 msgid "drag and drop: ignored '%s'\n"
 msgstr "drag and drop: ignorato '%s'\n"
 
-#: src/mp3file.c:1117
+#: src/mp3file.c:1118
 #, c-format
 msgid "Error setting ID3 field: %s\n"
 msgstr "Errore nella impostazione del campo ID3: %s\n"
 
-#: src/mp3file.c:1142 src/mp3file.c:1289 src/mp3file.c:2035
+#: src/mp3file.c:1143 src/mp3file.c:1290 src/mp3file.c:2036
 #, c-format
 msgid "ERROR while opening file: '%s' (%s).\n"
 msgstr "ERRORE nell'apertura del file: '%s' (%s).\n"
 
-#: src/mp3file.c:1356
+#: src/mp3file.c:1357
 #, c-format
 msgid "ERROR while writing tag to file: '%s' (%s).\n"
 msgstr "ERRORE nella scrittura del tag sul file: '%s' (%s).\n"
 
-#: src/mp3file.c:1879
+#: src/mp3file.c:1880
 #, c-format
 msgid ""
 "Could not find mp3gain. I tried to use the following executable: '%s'.\n"
@@ -2790,13 +2787,13 @@
 "Se non hai mp3gain installato, puoi scaricarlo da http://www.sourceforge.net/"
 "projects/mp3gain."
 
-#: src/mp3file.c:1919
+#: src/mp3file.c:1920
 #, c-format
 msgid "Execution of mp3gain ('%s') failed."
 msgstr "Esecuzione di mp3gain ('%s') fallita."
 
 #. Tracks with zero play length are ignored by iPod...
-#: src/mp3file.c:2178
+#: src/mp3file.c:2179
 #, c-format
 msgid "File \"%s\" has zero play length. Ignoring.\n"
 msgstr "Il file \"%s\" ha durata zero. Ignorato.\n"
@@ -2981,35 +2978,40 @@
 msgid "'%s': only '%%[%s]' allowed.\n"
 msgstr "'%s': Ã¨ permesso solo '%%[%s]'.\n"
 
-#: src/prefs_window.c:105
+#: src/prefs_window.c:108
 msgid "Please select command for 'Play Now'"
 msgstr "Selezionare il comando per 'Riproduci Ora'"
 
-#: src/prefs_window.c:106
+#: src/prefs_window.c:109
 msgid "Please select command for 'Enqueue'"
 msgstr "Selezionare la riga di comando per 'Metti in coda'"
 
-#: src/prefs_window.c:107
+#: src/prefs_window.c:110
 msgid "Please select the mp3gain executable"
 msgstr "Selezionare Path esatta per l'eseguibile 'mp3gain'"
 
-#: src/prefs_window.c:108
+#: src/prefs_window.c:111
 msgid "Please select command to sync contacts"
 msgstr "Selezionare il comando per sincronizzare i contatti"
 
-#: src/prefs_window.c:109
+#: src/prefs_window.c:112
 msgid "Please select command to sync calendar"
 msgstr "Sincronizzare il comando per sincronizzare i calendari"
 
-#: src/prefs_window.c:110
+#: src/prefs_window.c:113
 msgid "Select the mserv music root directory"
 msgstr "Seleziona la directory musicale radice di mserv"
 
-#: src/prefs_window.c:111
+#: src/prefs_window.c:114
 msgid "Select the mserv trackinfo root directory"
 msgstr "Seleziona la directory trackinfo radice di mserv"
 
-#: src/prefs_window.c:824
+#: src/prefs_window.c:115
+#, fuzzy
+msgid "Please select command to sync notes"
+msgstr "Selezionare il comando per sincronizzare i contatti"
+
+#: src/prefs_window.c:854
 #, fuzzy, c-format
 msgid ""
 "<i>Have a look at the scripts provided in '%s'. If you write a new script, "
@@ -3020,11 +3022,11 @@
 "per favore a jcsjcs at users.sourceforge.net per la inclusione nella "
 "prossima release."
 
-#: src/prefs_window.c:1257 src/prefs_window.c:1275
+#: src/prefs_window.c:1287 src/prefs_window.c:1305
 msgid "Preferences not updated"
 msgstr "Preferenze non aggiornate"
 
-#: src/prefs_window.c:1284
+#: src/prefs_window.c:1314
 msgid "Preferences applied"
 msgstr "Preferenze applicate"
 
@@ -3202,6 +3204,10 @@
 msgid "_Edit"
 msgstr "_Modifica"
 
+#: gtkpod.glade:530
+msgid "Edit"
+msgstr "Modifica"
+
 #: gtkpod.glade:551
 #, fuzzy
 msgid "Tracks in Selected _Playlist"
@@ -3389,7 +3395,7 @@
 msgid "_Arrange Sort Tabs"
 msgstr "_Sistema i blocchi di ordinamento"
 
-#: gtkpod.glade:1106 gtkpod.glade:12692
+#: gtkpod.glade:1106 gtkpod.glade:12693
 msgid "_Tools"
 msgstr "_Strumenti"
 
@@ -3652,8 +3658,8 @@
 #: gtkpod.glade:9700 gtkpod.glade:10487 gtkpod.glade:10644 gtkpod.glade:10801
 #: gtkpod.glade:10922 gtkpod.glade:10975 gtkpod.glade:11132 gtkpod.glade:11389
 #: gtkpod.glade:11443 gtkpod.glade:11554 gtkpod.glade:11657 gtkpod.glade:11813
-#: gtkpod.glade:12027 gtkpod.glade:12248 gtkpod.glade:12386 gtkpod.glade:12751
-#: gtkpod.glade:12869 gtkpod.glade:13043 gtkpod.glade:13278 gtkpod.glade:13380
+#: gtkpod.glade:12027 gtkpod.glade:12248 gtkpod.glade:12386 gtkpod.glade:12752
+#: gtkpod.glade:12870 gtkpod.glade:13044 gtkpod.glade:13279 gtkpod.glade:13381
 msgid "    "
 msgstr "     "
 
@@ -4204,7 +4210,7 @@
 "Scrivi informazioni estese (nome del file sul PC,\n"
 " hash MD5, codifica dei caratteri). Raccomandato."
 
-#: gtkpod.glade:8463 gtkpod.glade:14969
+#: gtkpod.glade:8463 gtkpod.glade:14970
 #, fuzzy
 msgid "_General"
 msgstr "Generale"
@@ -4355,7 +4361,7 @@
 msgstr "Nome utente da utilizzare per la consultazione del database mserv"
 
 #: gtkpod.glade:9535 gtkpod.glade:9554 gtkpod.glade:12102 gtkpod.glade:12172
-#: gtkpod.glade:12317 gtkpod.glade:12490 gtkpod.glade:12555 gtkpod.glade:12620
+#: gtkpod.glade:12317 gtkpod.glade:12491 gtkpod.glade:12556 gtkpod.glade:12621
 msgid "Browse"
 msgstr ""
 
@@ -4690,11 +4696,11 @@
 msgid "<b>Synchronization</b>"
 msgstr "<b>Sincronizzazione</b>"
 
-#: gtkpod.glade:12443
+#: gtkpod.glade:12444
 msgid "Contacts sync command:"
 msgstr "Comando sincronizzazione contatti:"
 
-#: gtkpod.glade:12467 gtkpod.glade:12532 gtkpod.glade:12597
+#: gtkpod.glade:12468 gtkpod.glade:12533 gtkpod.glade:12598
 msgid ""
 "Specify exact path including command line options. '%i' will be replaced "
 "with the mount point of the iPod."
@@ -4702,168 +4708,171 @@
 "Specificare la path esatta incluse le opzioni della linea di comando. '%i' "
 "verrÃ  sostituito con il punto di montaggio dell'iPod."
 
-#: gtkpod.glade:12508
+#: gtkpod.glade:12509
 msgid "Calendar sync command:"
 msgstr "Comando sincronizzazione calendario:"
 
-#: gtkpod.glade:12573
+#: gtkpod.glade:12574
 msgid "Notes sync command:"
 msgstr "Comando sincronizzazione note:"
 
-#: gtkpod.glade:12646
+#: gtkpod.glade:12647
 msgid "Call automatically when synchronizing iTunesDB"
 msgstr "Chiama automaticamente mentre sincronizzi l'iTunesDB"
 
-#: gtkpod.glade:12724
+#: gtkpod.glade:12725
 msgid "<b>Podcast subscriptions</b>"
 msgstr ""
 
-#: gtkpod.glade:12799
+#: gtkpod.glade:12800
 #, fuzzy
 msgid "Add"
 msgstr "Aggiunta"
 
-#: gtkpod.glade:12833
+#: gtkpod.glade:12834
 #, fuzzy
 msgid "Delete"
 msgstr "_Tracce Cancellate"
 
-#: gtkpod.glade:12899
+#: gtkpod.glade:12900
 #, fuzzy
 msgid "Name: "
 msgstr "Nome utente: "
 
-#: gtkpod.glade:12923
+#: gtkpod.glade:12924
 msgid "URL: "
 msgstr ""
 
-#: gtkpod.glade:13016
+#: gtkpod.glade:13017
 #, fuzzy
 msgid "<b>File options</b>"
 msgstr "<b>Conferma la cancellazione</b>"
 
-#: gtkpod.glade:13076
+#: gtkpod.glade:13077
 msgid "Save podcasts to: "
 msgstr ""
 
-#: gtkpod.glade:13131
+#: gtkpod.glade:13132
 msgid "Delete from computer when "
 msgstr ""
 
-#: gtkpod.glade:13171 gtkpod.glade:13473
+#: gtkpod.glade:13172 gtkpod.glade:13474
 #, fuzzy
 msgid " days old"
 msgstr "giorni"
 
-#: gtkpod.glade:13200
+#: gtkpod.glade:13201
 #, fuzzy
 msgid "Delete once copied to iPod"
 msgstr "Cancella completamente una traccia dall'iPod"
 
-#: gtkpod.glade:13226
+#: gtkpod.glade:13227
 #, fuzzy
 msgid "Automatically fetch podcasts on startup"
 msgstr "Importa automaticamente l'iTunesDB all'avvio"
 
-#: gtkpod.glade:13253
+#: gtkpod.glade:13254
 #, fuzzy
 msgid "Create podcast logfile at:"
 msgstr "Crea un File Playlist"
 
-#: gtkpod.glade:13353
+#: gtkpod.glade:13354
 #, fuzzy
 msgid "<b>iPod options</b>"
 msgstr "<b>Suggerimenti</b>"
 
-#: gtkpod.glade:13408
+#: gtkpod.glade:13409
 #, fuzzy
 msgid "Automatically sync to iPod"
 msgstr "Seleziona automaticamente..."
 
-#: gtkpod.glade:13434
+#: gtkpod.glade:13435
 #, fuzzy
 msgid "Delete from iPod when "
 msgstr "Cancella dall'iPod"
 
-#: gtkpod.glade:13502
+#: gtkpod.glade:13503
 #, fuzzy
 msgid "Delete from iPod if podcast has been played"
 msgstr "Data e ora in cui la traccia Ã¨ stata riprodotta l'ultima volta"
 
-#: gtkpod.glade:13522
+#: gtkpod.glade:13523
 msgid "Include broadcast date in track title"
 msgstr ""
 
-#: gtkpod.glade:13542
+#: gtkpod.glade:13543
 msgid "Set all podcast genres to 'Podcast'"
 msgstr ""
 
-#: gtkpod.glade:13588 gtkpod.glade:15341
+#: gtkpod.glade:13589 gtkpod.glade:15342
 msgid "_Podcasts"
 msgstr ""
 
-#: gtkpod.glade:13753
+#: gtkpod.glade:13754
 msgid ""
 "\n"
 "\n"
 msgstr ""
 
-#: gtkpod.glade:13787
+#: gtkpod.glade:13788
 #, fuzzy
 msgid "Abort selected"
 msgstr "Nessuna traccia selezionata."
 
-#: gtkpod.glade:13803
+#: gtkpod.glade:13804
 msgid "Abort current"
 msgstr ""
 
-#: gtkpod.glade:13819
+#: gtkpod.glade:13820
 msgid "Abort all"
 msgstr ""
 
-#: gtkpod.glade:13843
+#: gtkpod.glade:13844
 msgid "Details"
 msgstr ""
 
-#: gtkpod.glade:13904
+#: gtkpod.glade:13905
 #, fuzzy
 msgid "Cover"
 msgstr "Compositore"
 
-#: gtkpod.glade:13989
+#: gtkpod.glade:13990
 msgid "Set Cover Art"
 msgstr ""
 
-#: gtkpod.glade:14022
+#: gtkpod.glade:14023
 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 ""
 
-#: gtkpod.glade:14068
+#: gtkpod.glade:14069
 msgid ""
 "Change all tracks\n"
 "simultaneously"
 msgstr ""
 
-#: gtkpod.glade:14156
+#: gtkpod.glade:14157
 msgid "Remove Cover Art"
 msgstr ""
 
-#: gtkpod.glade:16245
+#: gtkpod.glade:16246
 msgid "_Other"
 msgstr ""
 
-#: gtkpod.glade:16535
+#: gtkpod.glade:16536
 msgid "_Undo All"
 msgstr ""
 
-#: gtkpod.glade:16605
+#: gtkpod.glade:16606
 #, fuzzy
 msgid "_Undo Track"
 msgstr "Tracce senza voto"
 
+#~ msgid "Export Tracks"
+#~ msgstr "Tracce da esportare"
+
 #~ msgid ""
 #~ "Icons of buttons were made by Nicolas Chariot.\n"
 #~ "\n"

Modified: gtkpod/branches/upstream/current/po/ja.gmo
===================================================================
(Binary files differ)

Modified: gtkpod/branches/upstream/current/po/ja.po
===================================================================
--- gtkpod/branches/upstream/current/po/ja.po	2006-04-08 19:20:23 UTC (rev 117)
+++ gtkpod/branches/upstream/current/po/ja.po	2006-04-08 19:35:58 UTC (rev 118)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: gtkpod 0.40\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-12-14 23:51+0900\n"
+"POT-Creation-Date: 2006-03-05 23:01+0900\n"
 "PO-Revision-Date: 2005-06-20 23:25+0900\n"
 "Last-Translator: Kentaro Fukuchi <fukuchi at users.sourceforge.net>\n"
 "Language-Team: n/a\n"
@@ -233,105 +233,101 @@
 msgid "Confirmation Dialogue"
 msgstr "³ÎÇ§"
 
-#: src/context_menus.c:368 gtkpod.glade:530
-msgid "Edit"
-msgstr "ÊÔ½¸"
-
-#: src/context_menus.c:370 src/tools.c:634
+#: src/context_menus.c:352 src/tools.c:634
 msgid "Play Now"
 msgstr "º£¤¹¤°±éÁÕ"
 
-#: src/context_menus.c:372 src/tools.c:645
+#: src/context_menus.c:354 src/tools.c:645
 msgid "Enqueue"
 msgstr "±éÁÕ¥¥å¡¼¤Ë²Ã¤¨¤ë"
 
-#: src/context_menus.c:375
+#: src/context_menus.c:357
 #, fuzzy
-msgid "Export Tracks"
-msgstr "¥½¡¼¥È¥¿¥Ö"
+msgid "Copy Tracks to Filesystem"
+msgstr "iPod¤«¤é¶Ê¤ò¥³¥Ô¡¼¤¹¤ë(_T)"
 
-#: src/context_menus.c:377 src/file_export.c:1069
+#: src/context_menus.c:359 src/file_export.c:1069
 msgid "Create Playlist File"
 msgstr "¥×¥ì¥¤¥ê¥¹¥È¤òºîÀ®"
 
-#: src/context_menus.c:379
+#: src/context_menus.c:361
 msgid "Edit Details"
 msgstr ""
 
-#: src/context_menus.c:381 gtkpod.glade:12816
+#: src/context_menus.c:363 gtkpod.glade:12817
 msgid "Update"
 msgstr "¹¹¿·"
 
-#: src/context_menus.c:383
+#: src/context_menus.c:365
 msgid "Sync Dirs"
 msgstr "¥Ç¥£¥ì¥¯¥È¥ê¤ÎÆ±´ü"
 
-#: src/context_menus.c:385
+#: src/context_menus.c:367
 msgid "Normalize"
 msgstr "²»ÎÌ¤ÎÊ¿¶Ñ²½"
 
-#: src/context_menus.c:387
+#: src/context_menus.c:369
 msgid "Create new Playlist"
 msgstr "¥×¥ì¥¤¥ê¥¹¥È¤Î¿·µ¬ºîÀ®"
 
-#: src/context_menus.c:390
+#: src/context_menus.c:372
 msgid "Edit Smart Playlist"
 msgstr "¥¹¥Þ¡¼¥È¥×¥ì¥¤¥ê¥¹¥È¤ÎÊÔ½¸"
 
-#: src/context_menus.c:396
+#: src/context_menus.c:378
 msgid "Alphabetize"
 msgstr "ÊÂ¤Ù´¹¤¨"
 
-#: src/context_menus.c:420
+#: src/context_menus.c:402
 msgid "Delete From iPod"
 msgstr "iPod¤«¤éºï½ü"
 
-#: src/context_menus.c:426
+#: src/context_menus.c:408
 msgid "Delete From Harddisk"
 msgstr "¥Ï¡¼¥É¥Ç¥£¥¹¥¯¤«¤éºï½ü"
 
-#: src/context_menus.c:432
+#: src/context_menus.c:414
 msgid "Delete From Database"
 msgstr "¥Ç¡¼¥¿¥Ù¡¼¥¹¤«¤éºï½ü"
 
-#: src/context_menus.c:438
+#: src/context_menus.c:420
 msgid "Delete From Playlist"
 msgstr "¥×¥ì¥¤¥ê¥¹¥È¤«¤éºï½ü"
 
-#: src/context_menus.c:457
+#: src/context_menus.c:439
 msgid "Delete Including Tracks"
 msgstr "Ãæ¤Î¶Ê¤´¤Èºï½ü"
 
-#: src/context_menus.c:463
+#: src/context_menus.c:445
 msgid "Delete Including Tracks (Harddisk)"
 msgstr "Ãæ¤Î¶Ê¤´¤Èºï½ü (¥Ï¡¼¥É¥Ç¥£¥¹¥¯¤«¤é)"
 
-#: src/context_menus.c:469
+#: src/context_menus.c:451
 msgid "Delete Including Tracks (Database)"
 msgstr "Ãæ¤Î¶Ê¤´¤Èºï½ü (¥Ç¡¼¥¿¥Ù¡¼¥¹¤«¤é)"
 
-#: src/context_menus.c:475
+#: src/context_menus.c:457
 msgid "Delete But Keep Tracks"
 msgstr "¶Ê¤Ï»Ä¤·¤¿¤Þ¤Þºï½ü"
 
-#: src/context_menus.c:481
+#: src/context_menus.c:463
 msgid "Remove All Tracks from iPod"
 msgstr "iPod¤«¤é¶Ê¤òºï½ü"
 
-#: src/context_menus.c:487
+#: src/context_menus.c:469
 msgid "Remove All Tracks from Database"
 msgstr "¤¹¤Ù¤Æ¤Î¶Ê¤ò¥Ç¡¼¥¿¥Ù¡¼¥¹¤«¤éºï½ü"
 
-#: src/context_menus.c:494
+#: src/context_menus.c:476
 #, fuzzy
 msgid "Remove All Podcasts from iPod"
 msgstr "iPod¤«¤é¶Ê¤òºï½ü"
 
-#: src/context_menus.c:505 gtkpod.glade:156
+#: src/context_menus.c:487 gtkpod.glade:156
 msgid "Update Podcasts"
 msgstr ""
 
-#: src/context_menus.c:512
+#: src/context_menus.c:494
 #, fuzzy
 msgid "Podcasts Preferences"
 msgstr "ÀßÄê(_E)"
@@ -436,7 +432,7 @@
 
 #. add podcast playlist
 #: src/display_itdb.c:843 src/display_itdb.c:871 src/display_itdb.c:975
-#: gtkpod.glade:13668
+#: gtkpod.glade:13669
 msgid "Podcasts"
 msgstr ""
 
@@ -908,77 +904,77 @@
 msgid "Unknown token '%s' in template '%s'\n"
 msgstr "'%s' (¥Æ¥ó¥×¥ì¡¼¥È '%s' Ãæ) ¤ÏÌ¤ÃÎ¤Î¤â¤Î¤Ç¤¹¡£\n"
 
-#: src/file.c:815
+#: src/file.c:817
 #, c-format
 msgid "Local filename not valid (%s)"
 msgstr "¥í¡¼¥«¥ë¤Î¥Õ¥¡¥¤¥ëÌ¾¤¬ÉÔÀµ¤Ç¤¹ (%s)"
 
-#: src/file.c:868
+#: src/file.c:870
 #, c-format
 msgid "No information found for user '%s' in '%s'"
 msgstr "¥æ¡¼¥¶¡¼ '%s' ¤Î¾ðÊó¤¬ '%s' Æâ¤Ë¸«¤Ä¤«¤ê¤Þ¤»¤ó"
 
-#: src/file.c:875
+#: src/file.c:877
 #, c-format
 msgid "mserv data file (%s) not available for track (%s)"
 msgstr ""
 
-#: src/file.c:883
+#: src/file.c:885
 #, c-format
 msgid "Track (%s) not in mserv music root directory (%s)"
 msgstr ""
 
-#: src/file.c:988
+#: src/file.c:990
 #, fuzzy, c-format
 msgid ""
 "The following track could not be processed (file does not exist): '%s'\n"
 msgstr "°Ê²¼¤Î%d¶Ê¤ò¹¹¿·¤Ç¤¤Þ¤»¤ó¤Ç¤·¤¿"
 
-#: src/file.c:1037
+#: src/file.c:1039
 #, fuzzy, c-format
 msgid "The following track could not be processed (filetype unknown): '%s'\n"
 msgstr "°Ê²¼¤Î%d¶Ê¤ò¹¹¿·¤Ç¤¤Þ¤»¤ó¤Ç¤·¤¿"
 
-#: src/file.c:1119
+#: src/file.c:1121
 #, c-format
 msgid ""
 "The following track could not be processed (filetype is known but analysis "
 "failed): '%s'\n"
 msgstr ""
 
-#: src/file.c:1148 src/file.c:1203
+#: src/file.c:1150 src/file.c:1205
 msgid "Nothing to update"
 msgstr "¹¹¿·¤µ¤ì¤ë¥Ç¡¼¥¿¤Ï¤¢¤ê¤Þ¤»¤ó"
 
-#: src/file.c:1168
+#: src/file.c:1170
 #, c-format
 msgid "Updating %s"
 msgstr "%s ¤ò¹¹¿·Ãæ"
 
-#: src/file.c:1184
+#: src/file.c:1186
 msgid "Updated selected tracks with info from file."
 msgstr "ÁªÂò¤µ¤ì¤¿¶Ê¤Î¾ðÊó¤ò¡¢¥Õ¥¡¥¤¥ë¤ò¸µ¤Ë¹¹¿·¤·¤Þ¤·¤¿¡£"
 
-#: src/file.c:1216
+#: src/file.c:1218
 #, c-format
 msgid "Retrieving mserv data %s"
 msgstr ""
 
 #. no path available
-#: src/file.c:1222 src/file.c:1900
+#: src/file.c:1224 src/file.c:1902
 msgid "no filename available"
 msgstr "¥Õ¥¡¥¤¥ëÌ¾¤¬¤ï¤«¤ê¤Þ¤»¤ó"
 
-#: src/file.c:1227
+#: src/file.c:1229
 msgid "Updated selected tracks with data from mserv."
 msgstr ""
 
-#: src/file.c:1294
+#: src/file.c:1296
 #, c-format
 msgid "Syncing directory '%s'"
 msgstr "¥Ç¥£¥ì¥¯¥È¥ê '%s' ¤ÎÆ±´ü½èÍýÃæ"
 
-#: src/file.c:1319
+#: src/file.c:1321
 msgid "Syncing completed. No files deleted."
 msgstr "Æ±´ü½èÍý¤¬½ªÎ»¤·¤Þ¤·¤¿¡£ºï½ü¤µ¤ì¤¿¥Õ¥¡¥¤¥ë¤Ï¤¢¤ê¤Þ¤»¤ó¡£"
 
@@ -987,29 +983,29 @@
 #. title
 #. label
 #. scrolled text
-#: src/file.c:1432
+#: src/file.c:1434
 msgid "Never delete any files when syncing"
 msgstr "Æ±´ü½èÍý¤Ç¥Õ¥¡¥¤¥ë¤òºï½ü¤·¤Ê¤¤"
 
-#: src/file.c:1461
+#: src/file.c:1463
 msgid "Syncing completed."
 msgstr "Æ±´ü½èÍý¤¬½ªÎ»¤·¤Þ¤·¤¿¡£"
 
-#: src/file.c:1481
+#: src/file.c:1483
 msgid "Syncing aborted"
 msgstr "Æ±´ü½èÍý¤ÏÃæÃÇ¤µ¤ì¤Þ¤·¤¿¡£"
 
-#: src/file.c:1519
+#: src/file.c:1521
 msgid "No tracks in selection"
 msgstr "¶Ê¤¬ÁªÂò¤µ¤ì¤Æ¤¤¤Þ¤»¤ó"
 
-#: src/file.c:1569
+#: src/file.c:1571
 #, c-format
 msgid "'%s' is not a directory. Ignored.\n"
 msgstr "'%s' ¤Ï¥Ç¥£¥ì¥¯¥È¥ê¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó¡£Ìµ»ë¤·¤Þ¤¹¡£\n"
 
 #. no directory names available
-#: src/file.c:1599
+#: src/file.c:1601
 msgid ""
 "No directory names were stored. Make sure that you enable 'Write extended "
 "information' in the Export section of the preferences at the time of "
@@ -1026,11 +1022,11 @@
 "¥Ç¥£¥ì¥¯¥È¥ê¤ÎÆ±´ü¤òº£¹Ô¤¦¤¿¤á¤Ë¤Ï¡¢ÀßÄê¥á¥Ë¥å¡¼¤Î¡Ö¥¤¥ó¥Ý¡¼¥È¡×Íó¤ÎÃæ¤Ë¤¢"
 "¤ë¡¢¡Ö½ÅÊ£¤Î¸¡½Ð¡×¤ò¥ª¥ó¤Ë¤·¤Æ¡¢ºÆ¤ÓÆ±´ü½èÍý¤ò¹Ô¤Ã¤Æ¤¯¤À¤µ¤¤¡£\n"
 
-#: src/file.c:1603
+#: src/file.c:1605
 msgid "No valid directories have been found. Sync aborted.\n"
 msgstr "Àµ¤·¤¤¥Ç¥£¥ì¥¯¥È¥ê¤¬¸«ÉÕ¤«¤ê¤Þ¤»¤ó¡£Æ±´ü½èÍý¤òÃæ»ß¤·¤Þ¤¹¡£\n"
 
-#: src/file.c:1612
+#: src/file.c:1614
 msgid ""
 "The (former) contents of the following directories will be removed from the "
 "database:\n"
@@ -1039,7 +1035,7 @@
 "°Ê²¼¤Î¥Ç¥£¥ì¥¯¥È¥ê¤Ë´Þ¤Þ¤ì¤ëÆâÍÆ¤Ï¡¢¥Ç¡¼¥¿¥Ù¡¼¥¹¤«¤éºï½ü¤µ¤ì¤Þ¤¹:\n"
 "\n"
 
-#: src/file.c:1620
+#: src/file.c:1622
 msgid ""
 "The following directories will be synchronized:\n"
 "\n"
@@ -1049,16 +1045,16 @@
 
 #. gint id,
 #. gboolean modal,
-#: src/file.c:1631
+#: src/file.c:1633
 msgid "Synchronize directories"
 msgstr "¥Ç¥£¥ì¥¯¥È¥ê¤ÎÆ±´ü"
 
 #. title
-#: src/file.c:1632
+#: src/file.c:1634
 msgid "OK to synchronize the following directories?"
 msgstr "°Ê²¼¤Î¥Ç¥£¥ì¥¯¥È¥ê¤ÇÆ±´ü½èÍý¤ò¤·¤Æ¤â¤è¤í¤·¤¤¤Ç¤¹¤«?"
 
-#: src/file.c:1670
+#: src/file.c:1672
 #, c-format
 msgid "The following track could not be updated"
 msgid_plural "The following %d tracks could not be updated"
@@ -1066,11 +1062,11 @@
 
 #. gint id,
 #. gboolean modal,
-#: src/file.c:1676
+#: src/file.c:1678
 msgid "Failed Track Update"
 msgstr "¶Ê¤Î¹¹¿·¤Ë¼ºÇÔ"
 
-#: src/file.c:1734
+#: src/file.c:1736
 #, c-format
 msgid "The following track has been updated"
 msgid_plural "The following %d tracks have been updated"
@@ -1078,11 +1074,11 @@
 
 #. gint id,
 #. gboolean modal,
-#: src/file.c:1740
+#: src/file.c:1742
 msgid "Successful Track Update"
 msgstr "¶Ê¤Î¹¹¿·¤ò´°Î»"
 
-#: src/file.c:1799
+#: src/file.c:1801
 #, c-format
 msgid "No mserv information could be retrieved for the following track"
 msgid_plural ""
@@ -1091,84 +1087,84 @@
 
 #. gint id,
 #. gboolean modal,
-#: src/file.c:1805
+#: src/file.c:1807
 msgid "mserv data retrieval problem"
 msgstr ""
 
-#: src/file.c:1946
+#: src/file.c:1948
 msgid "file not found"
 msgstr "¥Õ¥¡¥¤¥ë¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó"
 
-#: src/file.c:1950
+#: src/file.c:1952
 msgid "format not supported"
 msgstr "ÂÐ±þ¤·¤Æ¤¤¤Ê¤¤·Á¼°¤Ç¤¹"
 
-#: src/file.c:2031
+#: src/file.c:2033
 #, c-format
 msgid "Processing '%s'..."
 msgstr "'%s' ¤Î½èÍýÃæ..."
 
-#: src/file.c:2135 src/misc_track.c:1169 src/misc_track.c:1225
+#: src/file.c:2137 src/misc_track.c:1169 src/misc_track.c:1225
 #, c-format
 msgid ""
 "Podcast already present: '%s'\n"
 "\n"
 msgstr ""
 
-#: src/file.c:2196
+#: src/file.c:2198
 #, fuzzy, c-format
 msgid ""
 "Writing to video files not yet supported (%s).\n"
 "\n"
 msgstr "'%s'¤Î½ñ¤¹þ¤ß¤Ë¼ºÇÔ¤·¤Þ¤·¤¿¡£(%s)"
 
-#: src/file.c:2250 src/file.c:2264
+#: src/file.c:2252 src/file.c:2266
 #, c-format
 msgid "Couldn't change tags of file: %s\n"
 msgstr "¼¡¤Î¥Õ¥¡¥¤¥ë¤Î¥¿¥°¤òÊÑ¹¹¤Ç¤¤Þ¤»¤ó: %s\n"
 
-#: src/file.c:2548
+#: src/file.c:2550
 #, c-format
 msgid "Could not open '%s' for reading and writing.\n"
 msgstr "¥Õ¥¡¥¤¥ë '%s' ¤ÎÆÉ¤ß¹þ¤ß¤ª¤è¤Ó½ñ¤¹þ¤ß¤¬¤Ç¤¤Þ¤»¤ó¡£\n"
 
-#: src/file.c:2555
+#: src/file.c:2557
 #, c-format
 msgid "Could not obtain lock on '%s'.\n"
 msgstr ""
 
 #. error!
-#: src/file.c:2572 src/file.c:2581 src/file.c:2592 src/file.c:2602
+#: src/file.c:2574 src/file.c:2583 src/file.c:2594 src/file.c:2604
 #, c-format
 msgid "Malformed line in '%s': %s\n"
 msgstr ""
 
 #. gint id,
 #. gboolean modal,
-#: src/file.c:2631
+#: src/file.c:2633
 msgid "Remove offline playcounts?"
 msgstr "¥ª¥Õ¥é¥¤¥ó¤Ç¤ÎºÆÀ¸²ó¿ô¤òºï½ü¤·¤Þ¤¹¤«"
 
 #. title
-#: src/file.c:2632
+#: src/file.c:2634
 msgid ""
 "Some tracks played offline could not be found in the iTunesDB. Press 'OK' to "
 "remove them from the offline playcount file, 'Cancel' to keep them."
 msgstr ""
 
-#: src/file.c:2649
+#: src/file.c:2651
 #, c-format
 msgid "Error writing to '%s'.\n"
 msgstr "'%s'¤Î½ñ¤¹þ¤ßÃæ¤Ë¥¨¥é¡¼¤¬È¯À¸¤·¤Þ¤·¤¿¡£\n"
 
-#: src/file.c:2698
+#: src/file.c:2700
 #, c-format
 msgid ""
 "Normalization failed: file type not supported (%s).\n"
 "\n"
 msgstr ""
 
-#: src/file.c:2713
+#: src/file.c:2715
 #, c-format
 msgid ""
 "Normalization failed: file not available (%s).\n"
@@ -1206,7 +1202,7 @@
 msgstr "iPod ¾å¤Î '%s' ¤ËÁêÅö¤¹¤ë¥Õ¥¡¥¤¥ë¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó\n"
 
 #. create the dialog window
-#: src/file_export.c:390 src/file_itunesdb.c:1060 src/tools.c:148
+#: src/file_export.c:390 src/file_itunesdb.c:1062 src/tools.c:148
 msgid "Information"
 msgstr "¾ðÊó"
 
@@ -1229,7 +1225,7 @@
 msgid_plural "Copied %d of %d tracks."
 msgstr[0] "%d¶ÊÃæ %d¶Ê¤ò¥³¥Ô¡¼¤·¤Þ¤·¤¿¡£"
 
-#: src/file_export.c:494 src/file_itunesdb.c:1324 src/tools.c:307
+#: src/file_export.c:494 src/file_itunesdb.c:1326 src/tools.c:307
 #, c-format
 msgid "%d%% (%d:%02d:%02d left)"
 msgstr "%d%% (»Ä¤ê %d:%02d:%02d)"
@@ -1435,7 +1431,7 @@
 msgid "Aborted writing of extended info.\n"
 msgstr "³ÈÄ¥¾ðÊó¤Î½ñ¤¹þ¤ß¤ÏÃæ»ß¤µ¤ì¤Þ¤·¤¿¡£\n"
 
-#: src/file_itunesdb.c:1071
+#: src/file_itunesdb.c:1073
 msgid ""
 "Press button to abort.\n"
 "Export can be continued at a later time."
@@ -1443,25 +1439,25 @@
 "¥Ü¥¿¥ó¤ò²¡¤¹¤ÈÃæÃÇ¤·¤Þ¤¹¡£\n"
 "¥Õ¥¡¥¤¥ë¤Î¥¨¥¯¥¹¥Ý¡¼¥È¤Ï¸å¤ÇºÆ³«¤¹¤ë»ö¤¬¤Ç¤¤Þ¤¹¡£"
 
-#: src/file_itunesdb.c:1140
+#: src/file_itunesdb.c:1142
 msgid "deleting..."
 msgstr "ºï½üÃæ..."
 
-#: src/file_itunesdb.c:1244
+#: src/file_itunesdb.c:1246
 msgid "preparing to copy..."
 msgstr "¥³¥Ô¡¼¤Î½àÈ÷Ãæ..."
 
-#: src/file_itunesdb.c:1307
+#: src/file_itunesdb.c:1309
 #, c-format
 msgid "Copied %d of %d new track."
 msgid_plural "Copied %d of %d new tracks."
 msgstr[0] "%d¶ÊÃæ %d¶Ê¤ò¥³¥Ô¡¼¤·¤Þ¤·¤¿¡£"
 
-#: src/file_itunesdb.c:1334
+#: src/file_itunesdb.c:1336
 msgid "Some tracks were not written to iPod. Export aborted!"
 msgstr "°ìÉô¤Î¶Ê¤òiPod¤ËÅ¾Á÷¤Ç¤¤Þ¤»¤ó¤Ç¤·¤¿¡£¥¨¥¯¥¹¥Ý¡¼¥È¤òÃæ»ß¤·¤Þ¤¹!"
 
-#: src/file_itunesdb.c:1387
+#: src/file_itunesdb.c:1389
 #, c-format
 msgid ""
 "You did not import the existing iTunesDB ('%s'). This is most likely "
@@ -1472,30 +1468,30 @@
 "again.\n"
 msgstr ""
 
-#: src/file_itunesdb.c:1417
+#: src/file_itunesdb.c:1419
 msgid ""
 "iPod directory structure must be present before synching to the iPod can be "
 "performed.\n"
 msgstr ""
 
-#: src/file_itunesdb.c:1426
+#: src/file_itunesdb.c:1428
 msgid "Some tracks could not be deleted from the iPod. Export aborted!"
 msgstr "°ìÉô¤Î¶Ê¤òiPod¤«¤éºï½ü¤Ç¤¤Þ¤»¤ó¤Ç¤·¤¿¡£¥¨¥¯¥¹¥Ý¡¼¥È¤òÃæÃÇ¤·¤Þ¤¹¡£"
 
-#: src/file_itunesdb.c:1442
+#: src/file_itunesdb.c:1444
 msgid "Now writing iTunesDB. Please wait..."
 msgstr "iTunesDB¤Î½ñ¤¹þ¤ßÃæ¡£¤·¤Ð¤é¤¯¤ªÂÔ¤Á¤¯¤À¤µ¤¤..."
 
-#: src/file_itunesdb.c:1488
+#: src/file_itunesdb.c:1490
 #, c-format
 msgid "Extended information file not deleted: '%s'"
 msgstr "³ÈÄ¥¾ðÊó¥Õ¥¡¥¤¥ë¤òºï½ü¤Ç¤¤Þ¤»¤ó: '%s'"
 
-#: src/file_itunesdb.c:1574
+#: src/file_itunesdb.c:1577
 msgid "iPod Database Saved"
 msgstr "iPod¥Ç¡¼¥¿¥Ù¡¼¥¹¤òÊÝÂ¸¤·¤Þ¤·¤¿"
 
-#: src/file_itunesdb.c:1633
+#: src/file_itunesdb.c:1636
 msgid "Syncing contacts, calendar and notes..."
 msgstr ""
 
@@ -1526,11 +1522,11 @@
 msgid "Select directory to add recursively"
 msgstr "ºÆµ¢Åª¤ËÄÉ²Ã¤¹¤ë¥Ç¥£¥ì¥¯¥È¥ê¤òÁªÂò¤·¤Æ¤¯¤À¤µ¤¤"
 
-#: src/fileselection.c:749
+#: src/fileselection.c:759
 msgid "Ok"
 msgstr "OK"
 
-#: src/fileselection.c:758
+#: src/fileselection.c:768
 msgid "Cancel"
 msgstr "¥¥ã¥ó¥»¥ë"
 
@@ -2590,22 +2586,22 @@
 msgid "drag and drop: ignored '%s'\n"
 msgstr "¥É¥é¥Ã¥°¥¢¥ó¥É¥É¥í¥Ã¥×: '%s'¤ÏÌµ»ë¤·¤Þ¤¹\n"
 
-#: src/mp3file.c:1117
+#: src/mp3file.c:1118
 #, fuzzy, c-format
 msgid "Error setting ID3 field: %s\n"
 msgstr "'%s'¤ÎºîÀ®¤Ë¼ºÇÔ: %s\n"
 
-#: src/mp3file.c:1142 src/mp3file.c:1289 src/mp3file.c:2035
+#: src/mp3file.c:1143 src/mp3file.c:1290 src/mp3file.c:2036
 #, c-format
 msgid "ERROR while opening file: '%s' (%s).\n"
 msgstr "¥Õ¥¡¥¤¥ë '%s' ¤ò³«¤¯ºÝ¤Ë¥¨¥é¡¼¤¬È¯À¸¤·¤Þ¤·¤¿¡£ (%s)\n"
 
-#: src/mp3file.c:1356
+#: src/mp3file.c:1357
 #, fuzzy, c-format
 msgid "ERROR while writing tag to file: '%s' (%s).\n"
 msgstr "¥Õ¥¡¥¤¥ë '%s' ¤ò³«¤¯ºÝ¤Ë¥¨¥é¡¼¤¬È¯À¸¤·¤Þ¤·¤¿¡£ (%s)\n"
 
-#: src/mp3file.c:1879
+#: src/mp3file.c:1880
 #, c-format
 msgid ""
 "Could not find mp3gain. I tried to use the following executable: '%s'.\n"
@@ -2624,13 +2620,13 @@
 "¤â¤· mp3gain ¤ò¥¤¥ó¥¹¥È¡¼¥ë¤·¤Æ¤¤¤Ê¤¤¾ì¹ç¤Ï¡¢http://www.sourceforge.net/"
 "projects/mp3gain ¤è¤ê¥À¥¦¥ó¥í¡¼¥É¤·¤Æ¤¯¤À¤µ¤¤¡£"
 
-#: src/mp3file.c:1919
+#: src/mp3file.c:1920
 #, c-format
 msgid "Execution of mp3gain ('%s') failed."
 msgstr ""
 
 #. Tracks with zero play length are ignored by iPod...
-#: src/mp3file.c:2178
+#: src/mp3file.c:2179
 #, c-format
 msgid "File \"%s\" has zero play length. Ignoring.\n"
 msgstr "¥Õ¥¡¥¤¥ë \"%s\" ¤ÏÄ¹¤µ¤¬0¤Ê¤Î¤ÇÌµ»ë¤·¤Þ¤¹¡£\n"
@@ -2812,35 +2808,39 @@
 msgid "'%s': only '%%[%s]' allowed.\n"
 msgstr "'%s': '%%%s' ¤Ï°ì¤Ä¤Þ¤Ç¤·¤«»È¤¨¤Þ¤»¤ó¡£\n"
 
-#: src/prefs_window.c:105
+#: src/prefs_window.c:108
 msgid "Please select command for 'Play Now'"
 msgstr ""
 
-#: src/prefs_window.c:106
+#: src/prefs_window.c:109
 msgid "Please select command for 'Enqueue'"
 msgstr ""
 
-#: src/prefs_window.c:107
+#: src/prefs_window.c:110
 msgid "Please select the mp3gain executable"
 msgstr ""
 
-#: src/prefs_window.c:108
+#: src/prefs_window.c:111
 msgid "Please select command to sync contacts"
 msgstr ""
 
-#: src/prefs_window.c:109
+#: src/prefs_window.c:112
 msgid "Please select command to sync calendar"
 msgstr ""
 
-#: src/prefs_window.c:110
+#: src/prefs_window.c:113
 msgid "Select the mserv music root directory"
 msgstr ""
 
-#: src/prefs_window.c:111
+#: src/prefs_window.c:114
 msgid "Select the mserv trackinfo root directory"
 msgstr ""
 
-#: src/prefs_window.c:824
+#: src/prefs_window.c:115
+msgid "Please select command to sync notes"
+msgstr ""
+
+#: src/prefs_window.c:854
 #, c-format
 msgid ""
 "<i>Have a look at the scripts provided in '%s'. If you write a new script, "
@@ -2848,11 +2848,11 @@
 "next release.</i>"
 msgstr ""
 
-#: src/prefs_window.c:1257 src/prefs_window.c:1275
+#: src/prefs_window.c:1287 src/prefs_window.c:1305
 msgid "Preferences not updated"
 msgstr "ÀßÄê¤Ï¹¹¿·¤µ¤ì¤Þ¤»¤ó"
 
-#: src/prefs_window.c:1284
+#: src/prefs_window.c:1314
 msgid "Preferences applied"
 msgstr "ÀßÄê¤òÅ¬ÍÑ¤·¤Þ¤·¤¿"
 
@@ -3015,6 +3015,10 @@
 msgid "_Edit"
 msgstr "ÊÔ½¸(_E)"
 
+#: gtkpod.glade:530
+msgid "Edit"
+msgstr "ÊÔ½¸"
+
 #: gtkpod.glade:551
 #, fuzzy
 msgid "Tracks in Selected _Playlist"
@@ -3199,7 +3203,7 @@
 msgid "_Arrange Sort Tabs"
 msgstr "¥½¡¼¥È¥¿¥Ö¤òºÆÇÛÃÖ(_A)"
 
-#: gtkpod.glade:1106 gtkpod.glade:12692
+#: gtkpod.glade:1106 gtkpod.glade:12693
 msgid "_Tools"
 msgstr "¥Ä¡¼¥ë(_T)"
 
@@ -3462,8 +3466,8 @@
 #: gtkpod.glade:9700 gtkpod.glade:10487 gtkpod.glade:10644 gtkpod.glade:10801
 #: gtkpod.glade:10922 gtkpod.glade:10975 gtkpod.glade:11132 gtkpod.glade:11389
 #: gtkpod.glade:11443 gtkpod.glade:11554 gtkpod.glade:11657 gtkpod.glade:11813
-#: gtkpod.glade:12027 gtkpod.glade:12248 gtkpod.glade:12386 gtkpod.glade:12751
-#: gtkpod.glade:12869 gtkpod.glade:13043 gtkpod.glade:13278 gtkpod.glade:13380
+#: gtkpod.glade:12027 gtkpod.glade:12248 gtkpod.glade:12386 gtkpod.glade:12752
+#: gtkpod.glade:12870 gtkpod.glade:13044 gtkpod.glade:13279 gtkpod.glade:13381
 msgid "    "
 msgstr ""
 
@@ -3988,7 +3992,7 @@
 "³ÈÄ¥¾ðÊó(PC¾å¤Î¥Õ¥¡¥¤¥ëÌ¾,MD5ÃÍ,Ê¸»ú¥³¡¼¥É)¤ò½ñ¤¹þ¤à¡£\n"
 "¿ä¾©¤µ¤ì¤ëÀßÄê¤Ç¤¹¡£"
 
-#: gtkpod.glade:8463 gtkpod.glade:14969
+#: gtkpod.glade:8463 gtkpod.glade:14970
 #, fuzzy
 msgid "_General"
 msgstr "´ðËÜÀßÄê"
@@ -4133,7 +4137,7 @@
 msgstr ""
 
 #: gtkpod.glade:9535 gtkpod.glade:9554 gtkpod.glade:12102 gtkpod.glade:12172
-#: gtkpod.glade:12317 gtkpod.glade:12490 gtkpod.glade:12555 gtkpod.glade:12620
+#: gtkpod.glade:12317 gtkpod.glade:12491 gtkpod.glade:12556 gtkpod.glade:12621
 msgid "Browse"
 msgstr "¥Ö¥é¥¦¥º"
 
@@ -4450,177 +4454,181 @@
 msgid "<b>Synchronization</b>"
 msgstr "<b>Æ±´ü</b>"
 
-#: gtkpod.glade:12443
+#: gtkpod.glade:12444
 msgid "Contacts sync command:"
 msgstr ""
 
-#: gtkpod.glade:12467 gtkpod.glade:12532 gtkpod.glade:12597
+#: gtkpod.glade:12468 gtkpod.glade:12533 gtkpod.glade:12598
 msgid ""
 "Specify exact path including command line options. '%i' will be replaced "
 "with the mount point of the iPod."
 msgstr ""
 
-#: gtkpod.glade:12508
+#: gtkpod.glade:12509
 msgid "Calendar sync command:"
 msgstr ""
 
-#: gtkpod.glade:12573
+#: gtkpod.glade:12574
 msgid "Notes sync command:"
 msgstr ""
 
-#: gtkpod.glade:12646
+#: gtkpod.glade:12647
 msgid "Call automatically when synchronizing iTunesDB"
 msgstr ""
 
-#: gtkpod.glade:12724
+#: gtkpod.glade:12725
 msgid "<b>Podcast subscriptions</b>"
 msgstr ""
 
-#: gtkpod.glade:12799
+#: gtkpod.glade:12800
 #, fuzzy
 msgid "Add"
 msgstr "ÅÐÏ¿Æü"
 
-#: gtkpod.glade:12833
+#: gtkpod.glade:12834
 #, fuzzy
 msgid "Delete"
 msgstr "ºï½ü¤µ¤ì¤¿¶Ê"
 
-#: gtkpod.glade:12899
+#: gtkpod.glade:12900
 msgid "Name: "
 msgstr ""
 
-#: gtkpod.glade:12923
+#: gtkpod.glade:12924
 msgid "URL: "
 msgstr ""
 
-#: gtkpod.glade:13016
+#: gtkpod.glade:13017
 #, fuzzy
 msgid "<b>File options</b>"
 msgstr "<b>ºï½ü¤Î³ÎÇ§</b>"
 
-#: gtkpod.glade:13076
+#: gtkpod.glade:13077
 msgid "Save podcasts to: "
 msgstr ""
 
-#: gtkpod.glade:13131
+#: gtkpod.glade:13132
 msgid "Delete from computer when "
 msgstr ""
 
-#: gtkpod.glade:13171 gtkpod.glade:13473
+#: gtkpod.glade:13172 gtkpod.glade:13474
 #, fuzzy
 msgid " days old"
 msgstr "Æü"
 
-#: gtkpod.glade:13200
+#: gtkpod.glade:13201
 #, fuzzy
 msgid "Delete once copied to iPod"
 msgstr "iPod¤«¤é1¶Ê´°Á´¤Ëºï½ü¤·¤Þ¤·¤¿"
 
-#: gtkpod.glade:13226
+#: gtkpod.glade:13227
 #, fuzzy
 msgid "Automatically fetch podcasts on startup"
 msgstr "µ¯Æ°»þ¤Ë¼«Æ°Åª¤Ë iTunesDB ¤òÆÉ¤ß¹þ¤à"
 
-#: gtkpod.glade:13253
+#: gtkpod.glade:13254
 #, fuzzy
 msgid "Create podcast logfile at:"
 msgstr "¥×¥ì¥¤¥ê¥¹¥È¤òºîÀ®"
 
-#: gtkpod.glade:13353
+#: gtkpod.glade:13354
 #, fuzzy
 msgid "<b>iPod options</b>"
 msgstr "<b>¥Ä¡¼¥ë¥Á¥Ã¥×</b>"
 
-#: gtkpod.glade:13408
+#: gtkpod.glade:13409
 #, fuzzy
 msgid "Automatically sync to iPod"
 msgstr "¼«Æ°Åª¤ËÁªÂò..."
 
-#: gtkpod.glade:13434
+#: gtkpod.glade:13435
 #, fuzzy
 msgid "Delete from iPod when "
 msgstr "iPod¤«¤éºï½ü"
 
-#: gtkpod.glade:13502
+#: gtkpod.glade:13503
 #, fuzzy
 msgid "Delete from iPod if podcast has been played"
 msgstr "ºÇ¸å¤Ë±éÁÕ¤µ¤ì¤¿¤È¤¤ÎÆüÉÕ¤È»þ¹ï"
 
-#: gtkpod.glade:13522
+#: gtkpod.glade:13523
 msgid "Include broadcast date in track title"
 msgstr ""
 
-#: gtkpod.glade:13542
+#: gtkpod.glade:13543
 msgid "Set all podcast genres to 'Podcast'"
 msgstr ""
 
-#: gtkpod.glade:13588 gtkpod.glade:15341
+#: gtkpod.glade:13589 gtkpod.glade:15342
 msgid "_Podcasts"
 msgstr ""
 
-#: gtkpod.glade:13753
+#: gtkpod.glade:13754
 msgid ""
 "\n"
 "\n"
 msgstr ""
 
-#: gtkpod.glade:13787
+#: gtkpod.glade:13788
 #, fuzzy
 msgid "Abort selected"
 msgstr "¶Ê¤¬ÁªÂò¤µ¤ì¤Æ¤¤¤Þ¤»¤ó"
 
-#: gtkpod.glade:13803
+#: gtkpod.glade:13804
 msgid "Abort current"
 msgstr ""
 
-#: gtkpod.glade:13819
+#: gtkpod.glade:13820
 msgid "Abort all"
 msgstr ""
 
-#: gtkpod.glade:13843
+#: gtkpod.glade:13844
 msgid "Details"
 msgstr ""
 
-#: gtkpod.glade:13904
+#: gtkpod.glade:13905
 #, fuzzy
 msgid "Cover"
 msgstr "ºî¶Ê¼Ô"
 
-#: gtkpod.glade:13989
+#: gtkpod.glade:13990
 msgid "Set Cover Art"
 msgstr ""
 
-#: gtkpod.glade:14022
+#: gtkpod.glade:14023
 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 ""
 
-#: gtkpod.glade:14068
+#: gtkpod.glade:14069
 msgid ""
 "Change all tracks\n"
 "simultaneously"
 msgstr ""
 
-#: gtkpod.glade:14156
+#: gtkpod.glade:14157
 msgid "Remove Cover Art"
 msgstr ""
 
-#: gtkpod.glade:16245
+#: gtkpod.glade:16246
 msgid "_Other"
 msgstr ""
 
-#: gtkpod.glade:16535
+#: gtkpod.glade:16536
 msgid "_Undo All"
 msgstr ""
 
-#: gtkpod.glade:16605
+#: gtkpod.glade:16606
 #, fuzzy
 msgid "_Undo Track"
 msgstr "Ì¤É¾²Á¤Î¶Ê"
 
+#, fuzzy
+#~ msgid "Export Tracks"
+#~ msgstr "¥½¡¼¥È¥¿¥Ö"
+
 #~ msgid "Settings are not saved.\n"
 #~ msgstr "ÀßÄê¤ÏÊÝÂ¸¤µ¤ì¤Þ¤»¤ó¡£\n"
 
@@ -4802,6 +4810,3 @@
 
 #~ msgid "Copy from iPod"
 #~ msgstr "iPod¤«¤é¥³¥Ô¡¼"
-
-#~ msgid "Copy _Tracks from iPod"
-#~ msgstr "iPod¤«¤é¶Ê¤ò¥³¥Ô¡¼¤¹¤ë(_T)"

Modified: gtkpod/branches/upstream/current/po/sv.gmo
===================================================================
(Binary files differ)

Modified: gtkpod/branches/upstream/current/po/sv.po
===================================================================
--- gtkpod/branches/upstream/current/po/sv.po	2006-04-08 19:20:23 UTC (rev 117)
+++ gtkpod/branches/upstream/current/po/sv.po	2006-04-08 19:35:58 UTC (rev 118)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: sv\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-12-14 23:51+0900\n"
+"POT-Creation-Date: 2006-03-05 23:01+0900\n"
 "PO-Revision-Date: 2005-12-12 18:58+0100\n"
 "Last-Translator: Stefan AsserhÃ¤ll <stefan.asserhall at comhem.se>\n"
 "Language-Team: Svenska <sv at li.org>\n"
@@ -234,103 +234,100 @@
 msgid "Confirmation Dialogue"
 msgstr "BekrÃ¤ftelsedialogruta"
 
-#: src/context_menus.c:368 gtkpod.glade:530
-msgid "Edit"
-msgstr "Redigera"
-
-#: src/context_menus.c:370 src/tools.c:634
+#: src/context_menus.c:352 src/tools.c:634
 msgid "Play Now"
 msgstr "Spela nu"
 
-#: src/context_menus.c:372 src/tools.c:645
+#: src/context_menus.c:354 src/tools.c:645
 msgid "Enqueue"
 msgstr "KÃ¶a"
 
-#: src/context_menus.c:375
-msgid "Export Tracks"
-msgstr "Exportera spÃ¥r"
+#: src/context_menus.c:357
+#, fuzzy
+msgid "Copy Tracks to Filesystem"
+msgstr "_Uppdatera spÃ¥r frÃ¥n fil"
 
-#: src/context_menus.c:377 src/file_export.c:1069
+#: src/context_menus.c:359 src/file_export.c:1069
 msgid "Create Playlist File"
 msgstr "Skapa spellistefil"
 
-#: src/context_menus.c:379
+#: src/context_menus.c:361
 msgid "Edit Details"
 msgstr "Redigera detaljinformation"
 
-#: src/context_menus.c:381 gtkpod.glade:12816
+#: src/context_menus.c:363 gtkpod.glade:12817
 msgid "Update"
 msgstr "Uppdatera"
 
-#: src/context_menus.c:383
+#: src/context_menus.c:365
 msgid "Sync Dirs"
 msgstr "Synkronisera kataloger"
 
-#: src/context_menus.c:385
+#: src/context_menus.c:367
 msgid "Normalize"
 msgstr "Normalisera"
 
-#: src/context_menus.c:387
+#: src/context_menus.c:369
 msgid "Create new Playlist"
 msgstr "Skapa ny spellista"
 
-#: src/context_menus.c:390
+#: src/context_menus.c:372
 msgid "Edit Smart Playlist"
 msgstr "Redigera smart spellista"
 
-#: src/context_menus.c:396
+#: src/context_menus.c:378
 msgid "Alphabetize"
 msgstr "Sortera alfabetiskt"
 
-#: src/context_menus.c:420
+#: src/context_menus.c:402
 msgid "Delete From iPod"
 msgstr "Ta bort frÃ¥n iPod"
 
-#: src/context_menus.c:426
+#: src/context_menus.c:408
 msgid "Delete From Harddisk"
 msgstr "Ta bort frÃ¥n hÃ¥rddisk"
 
-#: src/context_menus.c:432
+#: src/context_menus.c:414
 msgid "Delete From Database"
 msgstr "Ta bort frÃ¥n databas"
 
-#: src/context_menus.c:438
+#: src/context_menus.c:420
 msgid "Delete From Playlist"
 msgstr "Ta bort frÃ¥n spellista"
 
-#: src/context_menus.c:457
+#: src/context_menus.c:439
 msgid "Delete Including Tracks"
 msgstr "Ta bort inklusive spÃ¥r"
 
-#: src/context_menus.c:463
+#: src/context_menus.c:445
 msgid "Delete Including Tracks (Harddisk)"
 msgstr "Ta bort inklusive spÃ¥r (hÃ¥rddisk)"
 
-#: src/context_menus.c:469
+#: src/context_menus.c:451
 msgid "Delete Including Tracks (Database)"
 msgstr "Ta bort inklusive spÃ¥r (databas)"
 
-#: src/context_menus.c:475
+#: src/context_menus.c:457
 msgid "Delete But Keep Tracks"
 msgstr "Ta bort men behÃ¥ll spÃ¥r"
 
-#: src/context_menus.c:481
+#: src/context_menus.c:463
 msgid "Remove All Tracks from iPod"
 msgstr "Ta bort alla spÃ¥r frÃ¥n iPod"
 
-#: src/context_menus.c:487
+#: src/context_menus.c:469
 msgid "Remove All Tracks from Database"
 msgstr "Ta bort alla spÃ¥r frÃ¥n databasen"
 
-#: src/context_menus.c:494
+#: src/context_menus.c:476
 msgid "Remove All Podcasts from iPod"
 msgstr "Ta bort alla podradiosÃ¤ndningar frÃ¥n iPod"
 
-#: src/context_menus.c:505 gtkpod.glade:156
+#: src/context_menus.c:487 gtkpod.glade:156
 msgid "Update Podcasts"
 msgstr "Uppdatera podradiosÃ¤ndningar"
 
-#: src/context_menus.c:512
+#: src/context_menus.c:494
 msgid "Podcasts Preferences"
 msgstr "InstÃ¤llningar fÃ¶r podradiosÃ¤ndningar"
 
@@ -430,7 +427,7 @@
 
 #. add podcast playlist
 #: src/display_itdb.c:843 src/display_itdb.c:871 src/display_itdb.c:975
-#: gtkpod.glade:13668
+#: gtkpod.glade:13669
 msgid "Podcasts"
 msgstr "PodradiosÃ¤ndningar"
 
@@ -902,38 +899,38 @@
 msgid "Unknown token '%s' in template '%s'\n"
 msgstr "OkÃ¤nd beteckning '%s' i mallen '%s'\n"
 
-#: src/file.c:815
+#: src/file.c:817
 #, c-format
 msgid "Local filename not valid (%s)"
 msgstr "Lokalt filnamn inte giltigt (%s)"
 
-#: src/file.c:868
+#: src/file.c:870
 #, c-format
 msgid "No information found for user '%s' in '%s'"
 msgstr "Ingen information hittades fÃ¶r anvÃ¤ndaren '%s' i '%s'"
 
-#: src/file.c:875
+#: src/file.c:877
 #, c-format
 msgid "mserv data file (%s) not available for track (%s)"
 msgstr "Datafilen frÃ¥n mserv (%s) Ã¤r inte tillgÃ¤nglig fÃ¶r spÃ¥ret (%s)"
 
-#: src/file.c:883
+#: src/file.c:885
 #, c-format
 msgid "Track (%s) not in mserv music root directory (%s)"
 msgstr "SpÃ¥ret (%s) finns inte i mserv rotkatalog fÃ¶r musik (%s)"
 
-#: src/file.c:988
+#: src/file.c:990
 #, c-format
 msgid ""
 "The following track could not be processed (file does not exist): '%s'\n"
 msgstr "FÃ¶ljande spÃ¥r kunde inte behandlas (filen finns inte): '%s'\n"
 
-#: src/file.c:1037
+#: src/file.c:1039
 #, c-format
 msgid "The following track could not be processed (filetype unknown): '%s'\n"
 msgstr "FÃ¶ljande spÃ¥r kunde inte behandlas (filtypen okÃ¤nd): '%s'\n"
 
-#: src/file.c:1119
+#: src/file.c:1121
 #, c-format
 msgid ""
 "The following track could not be processed (filetype is known but analysis "
@@ -942,39 +939,39 @@
 "FÃ¶ljande spÃ¥r kunde inte behandlas (filtypen kÃ¤nd, men analys misslyckades): "
 "'%s'\n"
 
-#: src/file.c:1148 src/file.c:1203
+#: src/file.c:1150 src/file.c:1205
 msgid "Nothing to update"
 msgstr "Ingenting att uppdatera"
 
-#: src/file.c:1168
+#: src/file.c:1170
 #, c-format
 msgid "Updating %s"
 msgstr "Uppdaterar %s"
 
-#: src/file.c:1184
+#: src/file.c:1186
 msgid "Updated selected tracks with info from file."
 msgstr "Uppdaterar markerade spÃ¥r med information frÃ¥n fil."
 
-#: src/file.c:1216
+#: src/file.c:1218
 #, c-format
 msgid "Retrieving mserv data %s"
 msgstr "HÃ¤mtar data frÃ¥n mserv %s"
 
 #. no path available
-#: src/file.c:1222 src/file.c:1900
+#: src/file.c:1224 src/file.c:1902
 msgid "no filename available"
 msgstr "inget filnamn tillgÃ¤ngligt"
 
-#: src/file.c:1227
+#: src/file.c:1229
 msgid "Updated selected tracks with data from mserv."
 msgstr "Uppdaterar markerade spÃ¥r med data frÃ¥n mserv."
 
-#: src/file.c:1294
+#: src/file.c:1296
 #, c-format
 msgid "Syncing directory '%s'"
 msgstr "Synkroniserar katalog '%s'"
 
-#: src/file.c:1319
+#: src/file.c:1321
 msgid "Syncing completed. No files deleted."
 msgstr "Synkronisering klar. Inga filer har tagits bort."
 
@@ -983,29 +980,29 @@
 #. title
 #. label
 #. scrolled text
-#: src/file.c:1432
+#: src/file.c:1434
 msgid "Never delete any files when syncing"
 msgstr "Ta aldrig bort nÃ¥gra filer vid synkronisering"
 
-#: src/file.c:1461
+#: src/file.c:1463
 msgid "Syncing completed."
 msgstr "Synkronisering klar."
 
-#: src/file.c:1481
+#: src/file.c:1483
 msgid "Syncing aborted"
 msgstr "Synkronisering avbruten"
 
-#: src/file.c:1519
+#: src/file.c:1521
 msgid "No tracks in selection"
 msgstr "Inga spÃ¥r i markeringen"
 
-#: src/file.c:1569
+#: src/file.c:1571
 #, c-format
 msgid "'%s' is not a directory. Ignored.\n"
 msgstr "'%s' Ã¤r inte en katalog. Ignoreras.\n"
 
 #. no directory names available
-#: src/file.c:1599
+#: src/file.c:1601
 msgid ""
 "No directory names were stored. Make sure that you enable 'Write extended "
 "information' in the Export section of the preferences at the time of "
@@ -1023,11 +1020,11 @@
 "inte duplicerade filer) under avdelningen Import och lÃ¤gg till katalogerna "
 "du vill synkronisera igen.\n"
 
-#: src/file.c:1603
+#: src/file.c:1605
 msgid "No valid directories have been found. Sync aborted.\n"
 msgstr "Inga giltiga kataloger hittades. Synkronisering avbruten.\n"
 
-#: src/file.c:1612
+#: src/file.c:1614
 msgid ""
 "The (former) contents of the following directories will be removed from the "
 "database:\n"
@@ -1037,7 +1034,7 @@
 "databasen:\n"
 "\n"
 
-#: src/file.c:1620
+#: src/file.c:1622
 msgid ""
 "The following directories will be synchronized:\n"
 "\n"
@@ -1047,16 +1044,16 @@
 
 #. gint id,
 #. gboolean modal,
-#: src/file.c:1631
+#: src/file.c:1633
 msgid "Synchronize directories"
 msgstr "Synkronisera kataloger"
 
 #. title
-#: src/file.c:1632
+#: src/file.c:1634
 msgid "OK to synchronize the following directories?"
 msgstr "Ok att synkronisera fÃ¶ljande kataloger?"
 
-#: src/file.c:1670
+#: src/file.c:1672
 #, c-format
 msgid "The following track could not be updated"
 msgid_plural "The following %d tracks could not be updated"
@@ -1065,11 +1062,11 @@
 
 #. gint id,
 #. gboolean modal,
-#: src/file.c:1676
+#: src/file.c:1678
 msgid "Failed Track Update"
 msgstr "Uppdatering av spÃ¥r misslyckades"
 
-#: src/file.c:1734
+#: src/file.c:1736
 #, c-format
 msgid "The following track has been updated"
 msgid_plural "The following %d tracks have been updated"
@@ -1078,11 +1075,11 @@
 
 #. gint id,
 #. gboolean modal,
-#: src/file.c:1740
+#: src/file.c:1742
 msgid "Successful Track Update"
 msgstr "Uppdatering av spÃ¥r lyckades"
 
-#: src/file.c:1799
+#: src/file.c:1801
 #, c-format
 msgid "No mserv information could be retrieved for the following track"
 msgid_plural ""
@@ -1092,24 +1089,24 @@
 
 #. gint id,
 #. gboolean modal,
-#: src/file.c:1805
+#: src/file.c:1807
 msgid "mserv data retrieval problem"
 msgstr "Problem att hÃ¤mta data frÃ¥n mserv"
 
-#: src/file.c:1946
+#: src/file.c:1948
 msgid "file not found"
 msgstr "filen hittades inte"
 
-#: src/file.c:1950
+#: src/file.c:1952
 msgid "format not supported"
 msgstr "formatet stÃ¶ds inte"
 
-#: src/file.c:2031
+#: src/file.c:2033
 #, c-format
 msgid "Processing '%s'..."
 msgstr "Behandlar '%s'..."
 
-#: src/file.c:2135 src/misc_track.c:1169 src/misc_track.c:1225
+#: src/file.c:2137 src/misc_track.c:1169 src/misc_track.c:1225
 #, c-format
 msgid ""
 "Podcast already present: '%s'\n"
@@ -1118,7 +1115,7 @@
 "PodradiosÃ¤ndning finns redan: '%s'\n"
 "\n"
 
-#: src/file.c:2196
+#: src/file.c:2198
 #, c-format
 msgid ""
 "Writing to video files not yet supported (%s).\n"
@@ -1127,35 +1124,35 @@
 "Att skriva till videofiler stÃ¶ds inte Ã¤n (%s).\n"
 "\n"
 
-#: src/file.c:2250 src/file.c:2264
+#: src/file.c:2252 src/file.c:2266
 #, c-format
 msgid "Couldn't change tags of file: %s\n"
 msgstr "Kunde inte Ã¤ndra taggar fÃ¶r filen: %s\n"
 
-#: src/file.c:2548
+#: src/file.c:2550
 #, c-format
 msgid "Could not open '%s' for reading and writing.\n"
 msgstr "Kunde inte Ã¶ppna '%s' fÃ¶r lÃ¤sning och skrivning.\n"
 
-#: src/file.c:2555
+#: src/file.c:2557
 #, c-format
 msgid "Could not obtain lock on '%s'.\n"
 msgstr "Kunde inte lÃ¥sa '%s'.\n"
 
 #. error!
-#: src/file.c:2572 src/file.c:2581 src/file.c:2592 src/file.c:2602
+#: src/file.c:2574 src/file.c:2583 src/file.c:2594 src/file.c:2604
 #, c-format
 msgid "Malformed line in '%s': %s\n"
 msgstr "Felaktig rad i '%s': %s\n"
 
 #. gint id,
 #. gboolean modal,
-#: src/file.c:2631
+#: src/file.c:2633
 msgid "Remove offline playcounts?"
 msgstr "Ta bort nerkopplade spelningsantal?"
 
 #. title
-#: src/file.c:2632
+#: src/file.c:2634
 msgid ""
 "Some tracks played offline could not be found in the iTunesDB. Press 'OK' to "
 "remove them from the offline playcount file, 'Cancel' to keep them."
@@ -1164,12 +1161,12 @@
 "Klicka pÃ¥ 'Ok' fÃ¶r att ta bort dem frÃ¥n filen med nerkopplade "
 "spelningsantal, eller 'Avbryt' fÃ¶r att behÃ¥lla dem."
 
-#: src/file.c:2649
+#: src/file.c:2651
 #, c-format
 msgid "Error writing to '%s'.\n"
 msgstr "Fel vid skrivning till '%s'.\n"
 
-#: src/file.c:2698
+#: src/file.c:2700
 #, c-format
 msgid ""
 "Normalization failed: file type not supported (%s).\n"
@@ -1178,7 +1175,7 @@
 "Normalisering misslyckades: Filtypen stÃ¶ds inte (%s).\n"
 "\n"
 
-#: src/file.c:2713
+#: src/file.c:2715
 #, c-format
 msgid ""
 "Normalization failed: file not available (%s).\n"
@@ -1218,7 +1215,7 @@
 msgstr "Kunde hitta fil fÃ¶r '%s' pÃ¥ iPod\n"
 
 #. create the dialog window
-#: src/file_export.c:390 src/file_itunesdb.c:1060 src/tools.c:148
+#: src/file_export.c:390 src/file_itunesdb.c:1062 src/tools.c:148
 msgid "Information"
 msgstr "Information"
 
@@ -1242,7 +1239,7 @@
 msgstr[0] "Kopierade %d av %d spÃ¥r."
 msgstr[1] "Kopierade %d av %d spÃ¥r."
 
-#: src/file_export.c:494 src/file_itunesdb.c:1324 src/tools.c:307
+#: src/file_export.c:494 src/file_itunesdb.c:1326 src/tools.c:307
 #, c-format
 msgid "%d%% (%d:%02d:%02d left)"
 msgstr "%d%% (%d:%02d:%02d kvar)"
@@ -1461,7 +1458,7 @@
 msgid "Aborted writing of extended info.\n"
 msgstr "AvbrÃ¶t skrivning av utÃ¶kad information.\n"
 
-#: src/file_itunesdb.c:1071
+#: src/file_itunesdb.c:1073
 msgid ""
 "Press button to abort.\n"
 "Export can be continued at a later time."
@@ -1469,26 +1466,26 @@
 "Tryck pÃ¥ knappen fÃ¶r att avbryta.\n"
 "Exporten kan fortsÃ¤ttas vid ett senare tillfÃ¤lle."
 
-#: src/file_itunesdb.c:1140
+#: src/file_itunesdb.c:1142
 msgid "deleting..."
 msgstr "tar bort..."
 
-#: src/file_itunesdb.c:1244
+#: src/file_itunesdb.c:1246
 msgid "preparing to copy..."
 msgstr "fÃ¶rbereder kopiering..."
 
-#: src/file_itunesdb.c:1307
+#: src/file_itunesdb.c:1309
 #, c-format
 msgid "Copied %d of %d new track."
 msgid_plural "Copied %d of %d new tracks."
 msgstr[0] "Kopierade %d av %d nya spÃ¥r."
 msgstr[1] "Kopierade %d av %d nya spÃ¥r."
 
-#: src/file_itunesdb.c:1334
+#: src/file_itunesdb.c:1336
 msgid "Some tracks were not written to iPod. Export aborted!"
 msgstr "Vissa spÃ¥r skrevs inte till iPod. Export avbruten."
 
-#: src/file_itunesdb.c:1387
+#: src/file_itunesdb.c:1389
 #, c-format
 msgid ""
 "You did not import the existing iTunesDB ('%s'). This is most likely "
@@ -1505,7 +1502,7 @@
 "lagringen. Om du avbryter, kan du importera befintlig databas innan du "
 "anvÃ¤nder den hÃ¤r funktionen igen.\n"
 
-#: src/file_itunesdb.c:1417
+#: src/file_itunesdb.c:1419
 msgid ""
 "iPod directory structure must be present before synching to the iPod can be "
 "performed.\n"
@@ -1513,24 +1510,24 @@
 "Katalogstrukturen i iPod mÃ¥ste finnas innan synkronisering av iPod kan "
 "utfÃ¶ras.\n"
 
-#: src/file_itunesdb.c:1426
+#: src/file_itunesdb.c:1428
 msgid "Some tracks could not be deleted from the iPod. Export aborted!"
 msgstr "Vissa spÃ¥r kunde inte tas bort frÃ¥n iPod. Export avbruten."
 
-#: src/file_itunesdb.c:1442
+#: src/file_itunesdb.c:1444
 msgid "Now writing iTunesDB. Please wait..."
 msgstr "Skriver nu iTunes databas. VÃ¤nta..."
 
-#: src/file_itunesdb.c:1488
+#: src/file_itunesdb.c:1490
 #, c-format
 msgid "Extended information file not deleted: '%s'"
 msgstr "Filen med utÃ¶kad information inte borttagen: '%s'"
 
-#: src/file_itunesdb.c:1574
+#: src/file_itunesdb.c:1577
 msgid "iPod Database Saved"
 msgstr "iPod-databas sparad"
 
-#: src/file_itunesdb.c:1633
+#: src/file_itunesdb.c:1636
 msgid "Syncing contacts, calendar and notes..."
 msgstr "Synkroniserar kontakter, kalender och anteckningar..."
 
@@ -1561,11 +1558,11 @@
 msgid "Select directory to add recursively"
 msgstr "Markera katalog att lÃ¤gga till rekursivt"
 
-#: src/fileselection.c:749
+#: src/fileselection.c:759
 msgid "Ok"
 msgstr "Ok"
 
-#: src/fileselection.c:758
+#: src/fileselection.c:768
 msgid "Cancel"
 msgstr "Avbryt"
 
@@ -2728,22 +2725,22 @@
 msgid "drag and drop: ignored '%s'\n"
 msgstr "drag och slÃ¤pp: ignorerade '%s'\n"
 
-#: src/mp3file.c:1117
+#: src/mp3file.c:1118
 #, c-format
 msgid "Error setting ID3 field: %s\n"
 msgstr "Fel nÃ¤r ID3-fÃ¤lt skulle Ã¤ndras: %s\n"
 
-#: src/mp3file.c:1142 src/mp3file.c:1289 src/mp3file.c:2035
+#: src/mp3file.c:1143 src/mp3file.c:1290 src/mp3file.c:2036
 #, c-format
 msgid "ERROR while opening file: '%s' (%s).\n"
 msgstr "FEL nÃ¤r filen skulle Ã¶ppnas: '%s' (%s).\n"
 
-#: src/mp3file.c:1356
+#: src/mp3file.c:1357
 #, c-format
 msgid "ERROR while writing tag to file: '%s' (%s).\n"
 msgstr "FEL nÃ¤r tagg skulle skrivas till filen: '%s' (%s).\n"
 
-#: src/mp3file.c:1879
+#: src/mp3file.c:1880
 #, c-format
 msgid ""
 "Could not find mp3gain. I tried to use the following executable: '%s'.\n"
@@ -2763,13 +2760,13 @@
 "Om du inte har installerat mp3gain, kan du ladda ner det frÃ¥n http://www."
 "sourceforge.net/projects/mp3gain."
 
-#: src/mp3file.c:1919
+#: src/mp3file.c:1920
 #, c-format
 msgid "Execution of mp3gain ('%s') failed."
 msgstr "KÃ¶rning av mp3gain ('%s') misslyckades."
 
 #. Tracks with zero play length are ignored by iPod...
-#: src/mp3file.c:2178
+#: src/mp3file.c:2179
 #, c-format
 msgid "File \"%s\" has zero play length. Ignoring.\n"
 msgstr "Filen \"%s\" har spelningslÃ¤ngden noll. Ignoreras.\n"
@@ -2957,35 +2954,40 @@
 msgid "'%s': only '%%[%s]' allowed.\n"
 msgstr "'%s': bara '%%[%s]' tillÃ¥ts.\n"
 
-#: src/prefs_window.c:105
+#: src/prefs_window.c:108
 msgid "Please select command for 'Play Now'"
 msgstr "VÃ¤lj kommando fÃ¶r 'Spela nu'"
 
-#: src/prefs_window.c:106
+#: src/prefs_window.c:109
 msgid "Please select command for 'Enqueue'"
 msgstr "VÃ¤lj kommando fÃ¶r 'KÃ¶a'"
 
-#: src/prefs_window.c:107
+#: src/prefs_window.c:110
 msgid "Please select the mp3gain executable"
 msgstr "VÃ¤lj kÃ¶rbart program mp3gain"
 
-#: src/prefs_window.c:108
+#: src/prefs_window.c:111
 msgid "Please select command to sync contacts"
 msgstr "VÃ¤lj kommando fÃ¶r att synkronisera kontakter"
 
-#: src/prefs_window.c:109
+#: src/prefs_window.c:112
 msgid "Please select command to sync calendar"
 msgstr "VÃ¤lj kommando fÃ¶r att synkronisera kalender"
 
-#: src/prefs_window.c:110
+#: src/prefs_window.c:113
 msgid "Select the mserv music root directory"
 msgstr "VÃ¤lj mserv rotkatalog fÃ¶r musik"
 
-#: src/prefs_window.c:111
+#: src/prefs_window.c:114
 msgid "Select the mserv trackinfo root directory"
 msgstr "VÃ¤lj mserv rotkatalog fÃ¶r spÃ¥rinformation"
 
-#: src/prefs_window.c:824
+#: src/prefs_window.c:115
+#, fuzzy
+msgid "Please select command to sync notes"
+msgstr "VÃ¤lj kommando fÃ¶r att synkronisera kontakter"
+
+#: src/prefs_window.c:854
 #, c-format
 msgid ""
 "<i>Have a look at the scripts provided in '%s'. If you write a new script, "
@@ -2996,11 +2998,11 @@
 "skript, skicka det gÃ¤rna till \"jcsjcs snabela users.sourceforge.net\" fÃ¶r "
 "att lÃ¤gga till det i nÃ¤sta utgÃ¥va.</i>"
 
-#: src/prefs_window.c:1257 src/prefs_window.c:1275
+#: src/prefs_window.c:1287 src/prefs_window.c:1305
 msgid "Preferences not updated"
 msgstr "InstÃ¤llningarna har inte uppdaterats"
 
-#: src/prefs_window.c:1284
+#: src/prefs_window.c:1314
 msgid "Preferences applied"
 msgstr "InstÃ¤llningar Ã¤ndrade"
 
@@ -3174,6 +3176,10 @@
 msgid "_Edit"
 msgstr "_Redigera"
 
+#: gtkpod.glade:530
+msgid "Edit"
+msgstr "Redigera"
+
 #: gtkpod.glade:551
 msgid "Tracks in Selected _Playlist"
 msgstr "SpÃ¥r i markerad _spellista"
@@ -3346,7 +3352,7 @@
 msgid "_Arrange Sort Tabs"
 msgstr "_Ordna sorteringsflikar"
 
-#: gtkpod.glade:1106 gtkpod.glade:12692
+#: gtkpod.glade:1106 gtkpod.glade:12693
 msgid "_Tools"
 msgstr "Verk_tyg"
 
@@ -3608,8 +3614,8 @@
 #: gtkpod.glade:9700 gtkpod.glade:10487 gtkpod.glade:10644 gtkpod.glade:10801
 #: gtkpod.glade:10922 gtkpod.glade:10975 gtkpod.glade:11132 gtkpod.glade:11389
 #: gtkpod.glade:11443 gtkpod.glade:11554 gtkpod.glade:11657 gtkpod.glade:11813
-#: gtkpod.glade:12027 gtkpod.glade:12248 gtkpod.glade:12386 gtkpod.glade:12751
-#: gtkpod.glade:12869 gtkpod.glade:13043 gtkpod.glade:13278 gtkpod.glade:13380
+#: gtkpod.glade:12027 gtkpod.glade:12248 gtkpod.glade:12386 gtkpod.glade:12752
+#: gtkpod.glade:12870 gtkpod.glade:13044 gtkpod.glade:13279 gtkpod.glade:13381
 msgid "    "
 msgstr "    "
 
@@ -4151,7 +4157,7 @@
 "Skriv utÃ¶kad information (PC-filnamn, MD5-\n"
 "checksummor, teckenkodning). Rekommenderas."
 
-#: gtkpod.glade:8463 gtkpod.glade:14969
+#: gtkpod.glade:8463 gtkpod.glade:14970
 msgid "_General"
 msgstr "_AllmÃ¤nt"
 
@@ -4296,7 +4302,7 @@
 msgstr "AnvÃ¤ndarnamn att anvÃ¤nda vid uppslagning i mserv databasen."
 
 #: gtkpod.glade:9535 gtkpod.glade:9554 gtkpod.glade:12102 gtkpod.glade:12172
-#: gtkpod.glade:12317 gtkpod.glade:12490 gtkpod.glade:12555 gtkpod.glade:12620
+#: gtkpod.glade:12317 gtkpod.glade:12491 gtkpod.glade:12556 gtkpod.glade:12621
 msgid "Browse"
 msgstr "BlÃ¤ddra"
 
@@ -4628,11 +4634,11 @@
 msgid "<b>Synchronization</b>"
 msgstr "<b>Synkronisering</b>"
 
-#: gtkpod.glade:12443
+#: gtkpod.glade:12444
 msgid "Contacts sync command:"
 msgstr "Synkroniseringskommando fÃ¶r kontakter:"
 
-#: gtkpod.glade:12467 gtkpod.glade:12532 gtkpod.glade:12597
+#: gtkpod.glade:12468 gtkpod.glade:12533 gtkpod.glade:12598
 msgid ""
 "Specify exact path including command line options. '%i' will be replaced "
 "with the mount point of the iPod."
@@ -4640,95 +4646,95 @@
 "Ange fullstÃ¤ndig sÃ¶kvÃ¤g inklusive kommandoradsvÃ¤ljare. '%i' ersÃ¤tts med "
 "monteringspunkten fÃ¶r iPod."
 
-#: gtkpod.glade:12508
+#: gtkpod.glade:12509
 msgid "Calendar sync command:"
 msgstr "Synkroniseringskommando fÃ¶r kalender:"
 
-#: gtkpod.glade:12573
+#: gtkpod.glade:12574
 msgid "Notes sync command:"
 msgstr "Synkroniseringskommando fÃ¶r anteckningar:"
 
-#: gtkpod.glade:12646
+#: gtkpod.glade:12647
 msgid "Call automatically when synchronizing iTunesDB"
 msgstr "Anropa automatiskt vid synkronisering av iTunes databas"
 
-#: gtkpod.glade:12724
+#: gtkpod.glade:12725
 msgid "<b>Podcast subscriptions</b>"
 msgstr "<b>Prenumeration pÃ¥ podradiosÃ¤ndningar</b>"
 
-#: gtkpod.glade:12799
+#: gtkpod.glade:12800
 msgid "Add"
 msgstr "LÃ¤gg till"
 
-#: gtkpod.glade:12833
+#: gtkpod.glade:12834
 msgid "Delete"
 msgstr "Ta bort"
 
-#: gtkpod.glade:12899
+#: gtkpod.glade:12900
 msgid "Name: "
 msgstr "Namn: "
 
-#: gtkpod.glade:12923
+#: gtkpod.glade:12924
 msgid "URL: "
 msgstr "Webbadress: "
 
-#: gtkpod.glade:13016
+#: gtkpod.glade:13017
 msgid "<b>File options</b>"
 msgstr "<b>InstÃ¤llningar av filer</b>"
 
-#: gtkpod.glade:13076
+#: gtkpod.glade:13077
 msgid "Save podcasts to: "
 msgstr "Spara podradiosÃ¤ndningar i: "
 
-#: gtkpod.glade:13131
+#: gtkpod.glade:13132
 msgid "Delete from computer when "
 msgstr "Ta bort frÃ¥n datorn nÃ¤r "
 
-#: gtkpod.glade:13171 gtkpod.glade:13473
+#: gtkpod.glade:13172 gtkpod.glade:13474
 msgid " days old"
 msgstr " dagar gammal"
 
-#: gtkpod.glade:13200
+#: gtkpod.glade:13201
 msgid "Delete once copied to iPod"
 msgstr "Ta bort efter kopiering till iPod"
 
-#: gtkpod.glade:13226
+#: gtkpod.glade:13227
 msgid "Automatically fetch podcasts on startup"
 msgstr "HÃ¤mta automatiskt podradiosÃ¤ndningar vid start"
 
-#: gtkpod.glade:13253
+#: gtkpod.glade:13254
 msgid "Create podcast logfile at:"
 msgstr "Skapa loggfil fÃ¶r podradiosÃ¤ndningar pÃ¥:"
 
-#: gtkpod.glade:13353
+#: gtkpod.glade:13354
 msgid "<b>iPod options</b>"
 msgstr "<b>InstÃ¤llningar av iPod</b>"
 
-#: gtkpod.glade:13408
+#: gtkpod.glade:13409
 msgid "Automatically sync to iPod"
 msgstr "Synkronisera automatiskt med iPod"
 
-#: gtkpod.glade:13434
+#: gtkpod.glade:13435
 msgid "Delete from iPod when "
 msgstr "Ta bort frÃ¥n iPod nÃ¤r "
 
-#: gtkpod.glade:13502
+#: gtkpod.glade:13503
 msgid "Delete from iPod if podcast has been played"
 msgstr "Ta bort frÃ¥n iPod om podradiosÃ¤ndning har spelats"
 
-#: gtkpod.glade:13522
+#: gtkpod.glade:13523
 msgid "Include broadcast date in track title"
 msgstr "Inkludera sÃ¤ndningsdatum i spÃ¥rtitel"
 
-#: gtkpod.glade:13542
+#: gtkpod.glade:13543
 msgid "Set all podcast genres to 'Podcast'"
 msgstr "StÃ¤ll in alla podradiosÃ¤ndningars genre till 'Podradio'"
 
-#: gtkpod.glade:13588 gtkpod.glade:15341
+#: gtkpod.glade:13589 gtkpod.glade:15342
 msgid "_Podcasts"
 msgstr "_PodradiosÃ¤ndningar"
 
-#: gtkpod.glade:13753
+#: gtkpod.glade:13754
 msgid ""
 "\n"
 "\n"
@@ -4736,31 +4742,31 @@
 "\n"
 "\n"
 
-#: gtkpod.glade:13787
+#: gtkpod.glade:13788
 msgid "Abort selected"
 msgstr "Avbryt markerade"
 
-#: gtkpod.glade:13803
+#: gtkpod.glade:13804
 msgid "Abort current"
 msgstr "Avbryt nuvarande"
 
-#: gtkpod.glade:13819
+#: gtkpod.glade:13820
 msgid "Abort all"
 msgstr "Avbryt alla"
 
-#: gtkpod.glade:13843
+#: gtkpod.glade:13844
 msgid "Details"
 msgstr "Detaljinformation"
 
-#: gtkpod.glade:13904
+#: gtkpod.glade:13905
 msgid "Cover"
 msgstr "Omslag"
 
-#: gtkpod.glade:13989
+#: gtkpod.glade:13990
 msgid "Set Cover Art"
 msgstr "Ange omslagsbild"
 
-#: gtkpod.glade:14022
+#: gtkpod.glade:14023
 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 "
@@ -4770,7 +4776,7 @@
 "som Ã¤ndrats fÃ¶r spÃ¥ret ocksÃ¥ till alla andra markerade spÃ¥r. AnvÃ¤nd med "
 "fÃ¶rsiktighet."
 
-#: gtkpod.glade:14068
+#: gtkpod.glade:14069
 msgid ""
 "Change all tracks\n"
 "simultaneously"
@@ -4778,18 +4784,21 @@
 "Ã„ndra alla spÃ¥r\n"
 "samtidigt"
 
-#: gtkpod.glade:14156
+#: gtkpod.glade:14157
 msgid "Remove Cover Art"
 msgstr "Ta bort omslagsbild"
 
-#: gtkpod.glade:16245
+#: gtkpod.glade:16246
 msgid "_Other"
 msgstr "Ã–_vriga"
 
-#: gtkpod.glade:16535
+#: gtkpod.glade:16536
 msgid "_Undo All"
 msgstr "Ã…_ngra alla"
 
-#: gtkpod.glade:16605
+#: gtkpod.glade:16606
 msgid "_Undo Track"
 msgstr "Ã…_ngra spÃ¥r"
+
+#~ msgid "Export Tracks"
+#~ msgstr "Exportera spÃ¥r"

Modified: gtkpod/branches/upstream/current/scripts/mab2vcard
===================================================================
--- gtkpod/branches/upstream/current/scripts/mab2vcard	2006-04-08 19:20:23 UTC (rev 117)
+++ gtkpod/branches/upstream/current/scripts/mab2vcard	2006-04-08 19:35:58 UTC (rev 118)
@@ -57,6 +57,16 @@
 #
 ##########################################################################
 #
+# Just added support for parsing mobile phones (cell phones) entries in
+# address books from Thunderbird.
+# My work was so lame hacking this file that I couldn't help myself
+# being in the credits too. :-P
+# Of course, my lines of program are GPL licensed too.
+#
+# Sebastian Cruz (crux at lugmen.org.ar)
+#
+##########################################################################
+#
 # Contributed to the gtkpod project by Clinton Gormley
 # (perl at traveljury.com). This code can be used either under the
 # license mentioned above or under the terms of the GNU General Pulic
@@ -125,7 +135,7 @@
 
 #use Data::Dumper;
 my $progname = $0; $progname =~ s at .*/@@g;
-my $version = q{ $Revision: 1.1 $ }; $version =~ s/^[^0-9]+([0-9.]+).*$/$1/;
+my $version = q{ $Revision: 1.2 $ }; $version =~ s/^[^0-9]+([0-9.]+).*$/$1/;
 
 my (%key_table, %val_table, %row_hash);
 my ($total, $skipped) = (0, 0);
@@ -402,6 +412,8 @@
 	   	'TEL;TYPE=FAX'	 	=> [' ',qw(FaxNumber)],
 	   	'TEL;TYPE=WORK;TYPE=VOICE'
 	   			 	=> [' ',qw(WorkPhone)],
+		'TEL;TYPE=CELL;TYPE=VOICE'
+	   				=> [' ',qw(CellularNumber)],
 	   	'TEL;TYPE=PAGER;TYPE=VOICE'
 	   				=> [' ',qw(PagerNumber)],
 	   	'EMAIL;TYPE=INTERNET;X-EVOLUTION-UI-SLOT=1'
@@ -450,7 +462,7 @@
 		my %vcard = map {$_=>''} qw (
 			FirstName LastName WorkAddress WorkAddress2 WorkCity WorkState WorkCountry WorkZipCode
 			HomeAddress HomeAddress2 HomeCity HomeState HomeCountry HomeZipCode 
-			HomePhone FaxNumber WorkPhone PagerNumber PrimaryEmail SecondEmail
+			HomePhone FaxNumber WorkPhone CellularNumber PagerNumber PrimaryEmail SecondEmail
 			NickName Notes Company Department JobTitle URL _AimScreenName
 			PreferMailFormat WebPage1 WebPage2
 		);

Modified: gtkpod/branches/upstream/current/scripts/sync-knotes.sh
===================================================================
--- gtkpod/branches/upstream/current/scripts/sync-knotes.sh	2006-04-08 19:20:23 UTC (rev 117)
+++ gtkpod/branches/upstream/current/scripts/sync-knotes.sh	2006-04-08 19:35:58 UTC (rev 118)
@@ -52,8 +52,8 @@
 rm -rf $IPOD_MOUNT/Notes/*
 
 #Add new notes
-INDICES=`dcop knotes KNotesIface notes| awk --field-separator '->' '{print $1}'`
-TITLES=`dcop knotes KNotesIface notes | awk --field-separator '->' '{print $2}'`
+INDICES=`dcop knotes KNotesIface notes| awk -F '->' '{print $1}'`
+TITLES=`dcop knotes KNotesIface notes | awk -F '->' '{print $2}'`
 COUNT=1
 for INDEX in $INDICES
 do

Modified: gtkpod/branches/upstream/current/src/context_menus.c
===================================================================
--- gtkpod/branches/upstream/current/src/context_menus.c	2006-04-08 19:20:23 UTC (rev 117)
+++ gtkpod/branches/upstream/current/src/context_menus.c	2006-04-08 19:35:58 UTC (rev 118)
@@ -1,4 +1,4 @@
-/* Time-stamp: <2005-12-14 23:12:43 jcs>
+/* Time-stamp: <2006-02-19 19:58:45 jcs>
 |
 |  Copyright (C) 2003 Corey Donohoe <atmos at atmos dot org>
 |  Copyright (C) 2003-2005 Jorg Schuler <jcsjcs at users sourceforge net>
@@ -25,7 +25,7 @@
 | 
 |  This product is not supported/written/published by Apple!
 |
-|  $Id: context_menus.c,v 1.52 2005/12/11 08:52:30 jcsjcs Exp $
+|  $Id: context_menus.c,v 1.55 2006/02/19 11:01:22 jcsjcs Exp $
 */
 
 #ifdef HAVE_CONFIG_H
@@ -124,21 +124,6 @@
 }
 
 
-/**
- * edit_entries - open a dialog to edit the track(s) or playlist
- * @mi - the menu item selected
- * @data - Ignored, should be NULL
- * FIXME: How this should work needs to be decided
- */
-#if 0
-static void 
-edit_entries(GtkButton *b, gpointer data)
-{
-
-    fprintf(stderr, "edit entries Selected\n");
-}
-#endif
-
 /*
  * play_entries_now - play the entries currently selected in xmms
  * @mi - the menu item selected
@@ -364,15 +349,12 @@
     if(!menu[type])
     {
 	menu[type] =  gtk_menu_new();
-#if 0
-	hookup_mi (menu[type], _("Edit"), NULL, G_CALLBACK (edit_entries));
-#endif
 	hookup_mi (menu[type], _("Play Now"), GTK_STOCK_CDROM,
 		   G_CALLBACK (play_entries_now), NULL);
 	hookup_mi (menu[type], _("Enqueue"), GTK_STOCK_CDROM,
 		   G_CALLBACK (play_entries_enqueue), NULL);
 	mi_exp[type] = hookup_mi (menu[type], 
-				  _("Export Tracks"), GTK_STOCK_FLOPPY,
+				  _("Copy Tracks to Filesystem"), GTK_STOCK_FLOPPY,
 				  G_CALLBACK (export_entries), NULL);
 	hookup_mi (menu[type], _("Create Playlist File"), GTK_STOCK_FLOPPY,
 		   G_CALLBACK (create_playlist_file), NULL);
@@ -561,12 +543,9 @@
 		    }
 		    else
 		    {
-			/* FIXME: PODCASTS: remove Podcast menu */
-			/*
 			gtk_widget_show (mi_delsep[type]);
 			gtk_widget_show (mi_delipod[type]);
 			gtk_widget_show (mi_delpl[type]);
-			*/
 		    }
 		}
 	    }

Modified: gtkpod/branches/upstream/current/src/display.c
===================================================================
--- gtkpod/branches/upstream/current/src/display.c	2006-04-08 19:20:23 UTC (rev 117)
+++ gtkpod/branches/upstream/current/src/display.c	2006-04-08 19:35:58 UTC (rev 118)
@@ -24,7 +24,7 @@
 |
 |  This product is not supported/written/published by Apple!
 |
-|  $Id: display.c,v 1.129 2005/12/11 08:52:30 jcsjcs Exp $
+|  $Id: display.c,v 1.130 2005/12/14 14:58:55 jcsjcs Exp $
 */
 
 #ifdef HAVE_CONFIG_H

Modified: gtkpod/branches/upstream/current/src/file.c
===================================================================
--- gtkpod/branches/upstream/current/src/file.c	2006-04-08 19:20:23 UTC (rev 117)
+++ gtkpod/branches/upstream/current/src/file.c	2006-04-08 19:35:58 UTC (rev 118)
@@ -1,4 +1,4 @@
-/* Time-stamp: <2005-12-11 02:00:47 jcs>
+/* Time-stamp: <2006-02-19 14:35:41 jcs>
 |
 |  Copyright (C) 2002-2005 Jorg Schuler <jcsjcs at users sourceforge net>
 |  Part of the gtkpod project.
@@ -24,7 +24,7 @@
 |
 |  This product is not supported/written/published by Apple!
 |
-|  $Id: file.c,v 1.152 2005/12/10 17:04:28 jcsjcs Exp $
+|  $Id: file.c,v 1.153 2006/02/19 05:46:24 jcsjcs Exp $
 */
 
 #ifdef HAVE_CONFIG_H
@@ -772,6 +772,8 @@
     eto->pc_path_utf8 = g_strdup (efrom->pc_path_utf8);
     eto->pc_path_locale = g_strdup (efrom->pc_path_locale);
     eto->charset = g_strdup (efrom->charset);
+    eto->thumb_path_utf8 = g_strdup (efrom->thumb_path_utf8);
+    eto->thumb_path_locale = g_strdup (efrom->thumb_path_locale);
     to->size = from->size;
     to->tracklen = from->tracklen;
     to->cd_nr = from->cd_nr;

Modified: gtkpod/branches/upstream/current/src/file_export.c
===================================================================
--- gtkpod/branches/upstream/current/src/file_export.c	2006-04-08 19:20:23 UTC (rev 117)
+++ gtkpod/branches/upstream/current/src/file_export.c	2006-04-08 19:35:58 UTC (rev 118)
@@ -1,4 +1,4 @@
-/* Time-stamp: <2005-12-11 00:14:03 jcs>
+/* Time-stamp: <2006-03-04 11:00:52 jcs>
 |
 |  Copyright (C) 2002 Corey Donohoe <atmos at atmos.org>
 |  Copyright (C) 2002-2005 Jorg Schuler <jcsjcs at users sourceforge net>
@@ -25,7 +25,7 @@
 | 
 |  This product is not supported/written/published by Apple!
 |
-|  $Id: file_export.c,v 1.57 2005/12/10 17:04:28 jcsjcs Exp $
+|  $Id: file_export.c,v 1.58 2006/03/04 02:15:46 jcsjcs Exp $
 */
 #ifdef HAVE_CONFIG_H
 #  include <config.h>
@@ -1080,6 +1080,8 @@
 
     options = gtkpod_xml_get_widget (export_playlist_xml, "options_frame");
 
+    fcd->win_xml = export_playlist_xml;
+
     /* Information needed to clean up later */
     fcd->tracks = g_list_copy (tracks);
     fcd->fc = fc;

Modified: gtkpod/branches/upstream/current/src/file_itunesdb.c
===================================================================
--- gtkpod/branches/upstream/current/src/file_itunesdb.c	2006-04-08 19:20:23 UTC (rev 117)
+++ gtkpod/branches/upstream/current/src/file_itunesdb.c	2006-04-08 19:35:58 UTC (rev 118)
@@ -1,4 +1,4 @@
-/* Time-stamp: <2005-12-04 23:45:22 jcs>
+/* Time-stamp: <2006-02-25 22:56:41 jcs>
 |
 |  Copyright (C) 2002-2005 Jorg Schuler <jcsjcs at users sourceforge net>
 |  Part of the gtkpod project.
@@ -24,7 +24,7 @@
 |
 |  This product is not supported/written/published by Apple!
 |
-|  $Id: file_itunesdb.c,v 1.72 2005/12/04 16:00:39 jcsjcs Exp $
+|  $Id: file_itunesdb.c,v 1.75 2006/02/25 14:01:43 jcsjcs Exp $
 */
 
 #ifdef HAVE_CONFIG_H
@@ -927,6 +927,8 @@
 	  fprintf (fp, "thumbnail_utf8=%s\n", etr->thumb_path_utf8);
       /* this is just for convenience for people looking for a track
 	 on the ipod away from gktpod/itunes etc. */
+      if (strlen (track->ipod_path) != 0)
+	  fprintf (fp, "filename_ipod=%s\n", track->ipod_path);
       if (etr->md5_hash && *etr->md5_hash)
 	  fprintf (fp, "md5_hash=%s\n", etr->md5_hash);
       if (etr->charset && *etr->charset)
@@ -1569,8 +1571,9 @@
   if (success)
   {
       eitdb->data_changed = FALSE;
-      /* block menu item and button */
-      display_disable_gtkpod_import_buttons();
+      /* block menu item and button if successfully written to iPod */
+      if (itdb->usertype & GP_ITDB_TYPE_IPOD)
+	  display_disable_gtkpod_import_buttons();
       gtkpod_statusbar_message(_("iPod Database Saved"));
   }
 
@@ -1698,7 +1701,29 @@
     g_return_if_fail (gtkpod_window);
     itdbs_head = g_object_get_data (G_OBJECT (gtkpod_window),
 				    "itdbs_head");
-    if (!itdbs_head) return;
+    if (!itdbs_head)
+    {  /* this means we are called before all the data is set up, for
+	* example because gtkpod was called with the '-m' flag.
+	* We'll set all itdb_n_mountpoint for which itdb_n_type is
+	* GP_ITDB_TYPE_IPOD */
+	gboolean valid;
+	i=0;
+	do
+	{
+	    gchar *property = g_strdup_printf ("itdb_%d_type", i);
+	    gint type;
+	    valid = prefs_get_int_value (property, &type);
+	    g_free (property);
+	    if (valid && (type & GP_ITDB_TYPE_IPOD))
+	    {
+		gchar *pmp = g_strdup_printf ("itdb_%d_mountpoint", i);
+		prefs_set_string_value (pmp, mp);
+		g_free (pmp);
+	    }
+	    ++i;
+	} while (valid);
+	return;
+    }
 
     i=0;
     for (gl=itdbs_head->itdbs; gl; gl=gl->next)

Modified: gtkpod/branches/upstream/current/src/fileselection.c
===================================================================
--- gtkpod/branches/upstream/current/src/fileselection.c	2006-04-08 19:20:23 UTC (rev 117)
+++ gtkpod/branches/upstream/current/src/fileselection.c	2006-04-08 19:35:58 UTC (rev 118)
@@ -1,4 +1,4 @@
-/* Time-stamp: <2005-12-04 17:02:33 jcs>
+/* Time-stamp: <2006-03-05 18:25:08 jcs>
 |
 |  Copyright (C) 2002-2005 Jorg Schuler <jcsjcs at users.sourceforge.net>
 |  Part of the gtkpod project.
@@ -23,7 +23,7 @@
 |
 |  This product is not supported/written/published by Apple!
 |
-|  $Id: fileselection.c,v 1.4 2005/12/04 10:24:38 jcsjcs Exp $
+|  $Id: fileselection.c,v 1.5 2006/03/05 09:28:58 jcsjcs Exp $
 */
 
 /***********************************************************************
@@ -495,18 +495,28 @@
     gtk_widget_show (dirbrowser);
 }
 
+/* called when dirbrowser gets destroyed with the window-close button */
+static void dirbrowser_destroyed (GtkWidget *w, gpointer userdata)
+{
+    g_return_if_fail (dirbrowser);
+
+    dirbrowser = NULL;
+}
+
+
 /* called when the file selector is closed */
 static void add_dir_close (GtkWidget *w1, GtkWidget *w2)
 {
-    if (dirbrowser)
-    {
-	gint x,y;
-	gtk_window_get_size (GTK_WINDOW (dirbrowser), &x, &y);
-	/* stor size for next time */
-	prefs_set_size_dirbr (x, y);
-	gtk_widget_destroy(dirbrowser);
-	dirbrowser = NULL;
-    }
+    gint x,y;
+
+    g_return_if_fail (dirbrowser);
+
+    gtk_window_get_size (GTK_WINDOW (dirbrowser), &x, &y);
+    /* store size for next time */
+    prefs_set_size_dirbr (x, y);
+    gtk_widget_destroy(dirbrowser);
+    /* dirbrowser = NULL; -- will be done by the dirbrowser_destroy()
+       as part of the callback */
 }
 
 
@@ -763,6 +773,10 @@
 			      GTK_OBJECT(window));
     gtk_widget_show(cancel);
 
+    gtk_signal_connect(GTK_OBJECT(window), "destroy",
+		       GTK_SIGNAL_FUNC(dirbrowser_destroyed),
+		       NULL);
+
     gtk_box_pack_start(GTK_BOX(vbox), bbox, FALSE, FALSE, 0);
     gtk_widget_show(bbox);
     gtk_widget_show(vbox);

Modified: gtkpod/branches/upstream/current/src/mp3file.c
===================================================================
--- gtkpod/branches/upstream/current/src/mp3file.c	2006-04-08 19:20:23 UTC (rev 117)
+++ gtkpod/branches/upstream/current/src/mp3file.c	2006-04-08 19:35:58 UTC (rev 118)
@@ -24,7 +24,7 @@
 |
 |  This product is not supported/written/published by Apple!
 |
-|  $Id: mp3file.c,v 1.58 2005/11/23 04:16:12 jcsjcs Exp $
+|  $Id: mp3file.c,v 1.59 2006/02/19 10:20:06 jcsjcs Exp $
 */
 
 /* The code in the first section of this file is taken from the
@@ -1037,6 +1037,10 @@
 
     frame = id3_frame_new (frame_name);
     id3_tag_attachframe (tag, frame);
+
+    /* Use the specified text encoding */
+    field = id3_frame_field (frame, 0);
+    id3_field_settextencoding(field, encoding);
    
     if (frame_name == ID3_FRAME_COMMENT)
     {
@@ -1049,10 +1053,7 @@
 	field->type = ID3_FIELD_TYPE_STRINGLIST;
     }
 
-    /* Use the specified text encoding */
-    id3_field_settextencoding(field, encoding);
 
-
     /* maybe could be optimized see
        http://www.mars.org/mailman/public/mad-dev/2002-October/000739.html
     */

Modified: gtkpod/branches/upstream/current/src/podcast.c
===================================================================
--- gtkpod/branches/upstream/current/src/podcast.c	2006-04-08 19:20:23 UTC (rev 117)
+++ gtkpod/branches/upstream/current/src/podcast.c	2006-04-08 19:35:58 UTC (rev 118)
@@ -24,7 +24,7 @@
 |
 |  This product is not supported/written/published by Apple!
 |
-|  $Id: podcast.c,v 1.7 2005/11/26 13:44:41 jcsjcs Exp $
+|  $Id: podcast.c,v 1.8 2005/12/14 14:58:55 jcsjcs Exp $
 */
 
 /* FIXME: PODCASTS: remove Podcast menu */

Modified: gtkpod/branches/upstream/current/src/podcast.h
===================================================================
--- gtkpod/branches/upstream/current/src/podcast.h	2006-04-08 19:20:23 UTC (rev 117)
+++ gtkpod/branches/upstream/current/src/podcast.h	2006-04-08 19:35:58 UTC (rev 118)
@@ -24,7 +24,7 @@
 |
 |  This product is not supported/written/published by Apple!
 |
-|  $Id: podcast.h,v 1.5 2005/11/12 08:54:31 jcsjcs Exp $
+|  $Id: podcast.h,v 1.6 2005/12/14 14:58:55 jcsjcs Exp $
 */
 
 #ifndef __PODCAST_H__

Modified: gtkpod/branches/upstream/current/src/prefs.c
===================================================================
--- gtkpod/branches/upstream/current/src/prefs.c	2006-04-08 19:20:23 UTC (rev 117)
+++ gtkpod/branches/upstream/current/src/prefs.c	2006-04-08 19:35:58 UTC (rev 118)
@@ -1,4 +1,4 @@
-/* Time-stamp: <2005-12-14 23:13:45 jcs>
+/* Time-stamp: <2006-02-04 21:00:33 jcs>
 |
 |  Copyright (C) 2002-2005 Jorg Schuler <jcsjcs at users sourceforge net>
 |  Part of the gtkpod project.
@@ -24,7 +24,7 @@
 |
 |  This product is not supported/written/published by Apple!
 |
-|  $Id: prefs.c,v 1.155 2005/12/10 17:04:29 jcsjcs Exp $
+|  $Id: prefs.c,v 1.157 2006/02/04 12:04:52 jcsjcs Exp $
 */
 
 /* -------------------------------------------------------------------
@@ -1405,7 +1405,7 @@
 void prefs_set_ipod_mount(const gchar *mp)
 {
     if (!mp) return; /* ignore NULL pointer */
-    if(cfg->ipod_mount) g_free(cfg->ipod_mount);
+    g_free (cfg->ipod_mount);
     /* if new mount point starts with "~/", we replace it with the
        home directory */
     cfg->ipod_mount = convert_filename (mp);

Modified: gtkpod/branches/upstream/current/src/prefs_window.c
===================================================================
--- gtkpod/branches/upstream/current/src/prefs_window.c	2006-04-08 19:20:23 UTC (rev 117)
+++ gtkpod/branches/upstream/current/src/prefs_window.c	2006-04-08 19:35:58 UTC (rev 118)
@@ -1,4 +1,4 @@
-/* Time-stamp: <2005-12-14 23:22:13 jcs>
+/* Time-stamp: <2006-01-02 22:56:30 jcs>
 |
 |  Copyright (C) 2002 Corey Donohoe <atmos at atmos.org>
 |  Copyright (C) 2002-2005 Jorg Schuler <jcsjcs at users sourceforge net>
@@ -25,7 +25,7 @@
 |
 |  This product is not supported/written/published by Apple!
 |
-|  $Id: prefs_window.c,v 1.112 2005/12/11 08:52:30 jcsjcs Exp $
+|  $Id: prefs_window.c,v 1.114 2006/01/02 14:01:42 jcsjcs Exp $
 */
 
 #include <stdio.h>
@@ -58,6 +58,10 @@
 static void prefs_window_set_path (PathType i, const gchar *path);
 static void prefs_window_set_sort_tab_num (gint num);
 
+/* where to find the scripts */
+static const gchar *scriptdir = PACKAGE_DATA_DIR G_DIR_SEPARATOR_S PACKAGE G_DIR_SEPARATOR_S "scripts" G_DIR_SEPARATOR_S;
+
+
 /* FIXME: PODCASTS: remove Podcast menu */
 #if 0
 static void on_pc_subs_list_row_activated (GtkTreeView *view,
@@ -65,7 +69,6 @@
                                            GtkTreeViewColumn *col,
                                            gpointer user_data);
 
-
 /* Pointer to the treeview that holds the podcast subscriptions */
 static GtkTreeView *pc_subs_list = NULL;
 #endif
@@ -109,6 +112,7 @@
     N_("Please select command to sync calendar"),
     N_("Select the mserv music root directory"),
     N_("Select the mserv trackinfo root directory"),
+    N_("Please select command to sync notes"),
     NULL
 };
 static const GtkFileChooserAction path_type[] =
@@ -118,9 +122,9 @@
     GTK_FILE_CHOOSER_ACTION_OPEN,
     GTK_FILE_CHOOSER_ACTION_OPEN,
     GTK_FILE_CHOOSER_ACTION_OPEN,
-    GTK_FILE_CHOOSER_ACTION_OPEN,
     GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER, /* select folder */
     GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER,
+    GTK_FILE_CHOOSER_ACTION_OPEN,
     -1
 };
 
@@ -269,16 +273,42 @@
     else
 	buf = g_strdup (path);
 
-    /* get full path */
+    /* get full path -- if the file cannot be found it can't be
+     * selected in the filechooser */
     fbuf = g_find_program_in_path (buf);
-    if (!fbuf) fbuf = g_strdup (buf);
 
-    if (fbuf)
+    if (!fbuf)
+    {   /* set some default */
+	switch (i)
+	{
+	case PATH_SYNC_CONTACTS:
+	case PATH_SYNC_CALENDAR:
+	case PATH_SYNC_NOTES:
+	    fbuf = g_strdup (scriptdir);
+	    break;
+	case PATH_PLAY_NOW:
+	case PATH_PLAY_ENQUEUE:
+	case PATH_MP3GAIN:
+	case PATH_MSERV_MUSIC_ROOT:
+	case PATH_MSERV_TRACKINFO_ROOT:
+	case PATH_NUM:
+	    break;
+	}
+    }
+
+    if (fbuf && *fbuf)
     {
 	gchar *fbuf_utf8 = g_filename_from_utf8 (fbuf, -1, NULL, NULL, NULL);
 	if (path_type[i] == GTK_FILE_CHOOSER_ACTION_OPEN)
 	{
-	    gtk_file_chooser_set_filename (fc, fbuf_utf8);
+	    if (g_file_test (fbuf, G_FILE_TEST_IS_DIR))
+	    {
+		gtk_file_chooser_set_current_folder (fc, fbuf_utf8);
+	    }
+	    else
+	    {
+		gtk_file_chooser_set_filename (fc, fbuf_utf8);
+	    }
 	}
 	if (path_type[i] == GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER)
 	{
@@ -821,7 +851,7 @@
 /* 					 tmpcfg->unused_gboolean3); */
 /* 	} */
     w = gtkpod_xml_get_widget (prefs_window_xml, "prefs_label_syncexamples");
-    gchar *str = g_markup_printf_escaped (_("<i>Have a look at the scripts provided in '%s'. If you write a new script, please send it to jcsjcs at users.sourceforge.net for inclusion into the next release.</i>"), PACKAGE_DATA_DIR G_DIR_SEPARATOR_S PACKAGE G_DIR_SEPARATOR_S "scripts" G_DIR_SEPARATOR_S);
+    gchar *str = g_markup_printf_escaped (_("<i>Have a look at the scripts provided in '%s'. If you write a new script, please send it to jcsjcs at users.sourceforge.net for inclusion into the next release.</i>"), scriptdir);
     gtk_label_set_markup (GTK_LABEL (w), str);
     g_free (str);
 


