Menu
▾
▴
gtkpod-cvs2 — Notification of CVS Commits (replaces gtkpod-cvs after being spam-atacked)
You can subscribe to this list here.
| 2005 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
(132) |
Dec
(135) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2006 |
Jan
(87) |
Feb
(82) |
Mar
(117) |
Apr
(108) |
May
(231) |
Jun
(265) |
Jul
(31) |
Aug
(32) |
Sep
(89) |
Oct
(50) |
Nov
(112) |
Dec
(92) |
| 2007 |
Jan
(136) |
Feb
(82) |
Mar
(66) |
Apr
(104) |
May
(74) |
Jun
(103) |
Jul
(50) |
Aug
(23) |
Sep
(22) |
Oct
(39) |
Nov
(56) |
Dec
(88) |
| 2008 |
Jan
(51) |
Feb
(6) |
Mar
(6) |
Apr
(9) |
May
(39) |
Jun
(24) |
Jul
(48) |
Aug
(40) |
Sep
(9) |
Oct
(21) |
Nov
(12) |
Dec
(31) |
| 2009 |
Jan
(68) |
Feb
(14) |
Mar
(29) |
Apr
(40) |
May
(27) |
Jun
(9) |
Jul
(1) |
Aug
(10) |
Sep
(3) |
Oct
(7) |
Nov
(11) |
Dec
(165) |
| 2010 |
Jan
(72) |
Feb
(49) |
Mar
(30) |
Apr
(41) |
May
(17) |
Jun
(13) |
Jul
(99) |
Aug
(88) |
Sep
(59) |
Oct
(23) |
Nov
(11) |
Dec
(44) |
| 2011 |
Jan
(50) |
Feb
(28) |
Mar
(27) |
Apr
(18) |
May
(38) |
Jun
(5) |
Jul
(59) |
Aug
(7) |
Sep
(44) |
Oct
(12) |
Nov
(7) |
Dec
(10) |
| 2012 |
Jan
(8) |
Feb
(11) |
Mar
(17) |
Apr
(11) |
May
(3) |
Jun
(11) |
Jul
(26) |
Aug
(3) |
Sep
|
Oct
(17) |
Nov
(9) |
Dec
(1) |
| 2013 |
Jan
|
Feb
(5) |
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: Javier K. <jk...@us...> - 2012-10-07 06:47:27
|
commit 53480ebbd8e5456bf74102445b60d0022825d85e
Author: Jonathan Neuschäfer <j.n...@gm...>
Date: Thu Sep 27 21:02:01 2012 +0200
configure.ac: show --disable-udev, not --enable-udev
This makes it more obvious that udev is enabled by default.
configure.ac | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 669d433..25a14d2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -164,7 +164,7 @@ dnl * nowadays (2009), it's the recommended way of having callouts, so
dnl * it should be preferred over HAL, and it's enabled by default.
dnl ***********************************************************************
AC_ARG_ENABLE(udev,
- [AS_HELP_STRING([--enable-udev],[Enable udev callout])],
+ [AS_HELP_STRING([--disable-udev],[Disable udev callout])],
[if test x"$enableval" = "xno" ; then
enable_udev=no
else
|
|
From: Javier K. <jk...@us...> - 2012-10-07 06:47:21
|
commit f03c72afa30dd9eac074b8fafe100c69ac8181c3
Author: Jonathan Neuschäfer <j.n...@gm...>
Date: Thu Sep 27 20:19:45 2012 +0200
replace deprecated gdk_pixbuf_unref()
gdk_pixbuf_unref is depreceted since Gdk 2.0.
src/itdb_artwork.c | 6 +++---
src/itdb_thumb.c | 4 ++--
tests/test-covers.c | 2 +-
tests/test-photos.c | 2 +-
4 files changed, 7 insertions(+), 7 deletions(-)
---
diff --git a/src/itdb_artwork.c b/src/itdb_artwork.c
index 2328840..c595d70 100644
--- a/src/itdb_artwork.c
+++ b/src/itdb_artwork.c
@@ -849,7 +849,7 @@ gpointer itdb_thumb_ipod_item_to_pixbuf (Itdb_Device *device,
NULL);
/* !! do not g_free(pixels) here: it will be freed when doing a
- * gdk_pixbuf_unref() on the GdkPixbuf !! */
+ * g_object_unref() on the GdkPixbuf !! */
/* Remove padding from the pixmap and/or cut the pixmap to the
right size. */
@@ -882,8 +882,8 @@ gpointer itdb_thumb_ipod_item_to_pixbuf (Itdb_Device *device,
pad_x, pad_y,
width, height);
pixbuf = gdk_pixbuf_copy (pixbuf_sub);
- gdk_pixbuf_unref (pixbuf_full);
- gdk_pixbuf_unref (pixbuf_sub);
+ g_object_unref (pixbuf_full);
+ g_object_unref (pixbuf_sub);
return pixbuf;
}
diff --git a/src/itdb_thumb.c b/src/itdb_thumb.c
index 8ed3b6f..8b3c8a1 100644
--- a/src/itdb_thumb.c
+++ b/src/itdb_thumb.c
@@ -374,7 +374,7 @@ const GList *itdb_thumb_ipod_get_thumbs (Itdb_Thumb_Ipod *thumbs)
* GDK_PIXBUF() yourself.
* </note>
*
- * Returns: a #GdkPixbuf that must be unreffed with gdk_pixbuf_unref()
+ * Returns: a #GdkPixbuf that must be unreffed with g_object_unref()
* after use, or NULL if the creation of the gdk-pixbuf failed or if
* libgpod was compiled without gdk-pixbuf support.
*
@@ -547,7 +547,7 @@ static GList *itdb_thumb_ipod_to_pixbufs (Itdb_Device *device,
*
* Returns: a #GList of #GdkPixbuf which are associated with @thumb, NULL
* if the pixbuf was invalid or if libgpod is compiled without gdk-pixbuf
- * support. The #GdkPixbuf must be unreffed with gdk_pixbuf_unref() after use
+ * support. The #GdkPixbuf must be unreffed with g_object_unref() after use
* and the #GList must be freed with g_list_free().
*
* Since: 0.7.0
diff --git a/tests/test-covers.c b/tests/test-covers.c
index 20b4d7b..4d3a68f 100644
--- a/tests/test-covers.c
+++ b/tests/test-covers.c
@@ -53,7 +53,7 @@ save_itdb_thumb (Itdb_Track *track, GdkPixbuf *pixbuf, guint id)
}
g_print (" %s\n", filename);
gdk_pixbuf_save (pixbuf, filename, "png", NULL, NULL);
- gdk_pixbuf_unref (pixbuf);
+ g_object_unref (pixbuf);
/* g_print ("Saved %s\n", filename); */
g_free (filename);
}
diff --git a/tests/test-photos.c b/tests/test-photos.c
index 930e66b..b5bd89d 100644
--- a/tests/test-photos.c
+++ b/tests/test-photos.c
@@ -81,7 +81,7 @@ dump_thumbs (Itdb_PhotoDB *db, Itdb_Artwork *artwork,
path = g_build_filename (dir, filename, NULL);
g_free (filename);
gdk_pixbuf_save (pixbuf, path, "png", NULL, NULL);
- gdk_pixbuf_unref (pixbuf);
+ g_object_unref (pixbuf);
g_free (path);
}
g_list_free (thumbnails);
|
|
From: Javier K. <jk...@us...> - 2012-10-07 06:47:14
|
commit 6c008dfc0c30e4e0a0454b033ccfea8bfac3dba8
Author: Jonathan Neuschäfer <j.n...@gm...>
Date: Thu Sep 27 20:28:31 2012 +0200
replace deprecated g_basename()
g_basename is deprecated since GLib 2.2.
As all of these calls are done just before the program terminates,
we might as well skip the g_free.
tests/get-timezone.c | 4 +++-
tests/itdb_main.c | 5 ++++-
tests/test-cp.cc | 4 +++-
tests/test-fw-id.c | 4 +++-
tests/test-ls.c | 6 ++++--
tests/test-rebuild-db.cc | 4 +++-
tools/ipod-time-sync.c | 6 ++++--
tools/read-sysinfoextended.c | 6 ++++--
8 files changed, 28 insertions(+), 11 deletions(-)
---
diff --git a/tests/get-timezone.c b/tests/get-timezone.c
index e453ca3..60977d9 100644
--- a/tests/get-timezone.c
+++ b/tests/get-timezone.c
@@ -28,7 +28,9 @@ int main (int argc, char **argv)
if (argc >= 2) {
mountpoint = argv[1];
} else {
- g_print ("Usage: %s <mountpoint>\n\n", g_basename(argv[0]));
+ char *basename = g_path_get_basename(argv[0]);
+ g_print ("Usage: %s <mountpoint>\n\n", basename);
+ g_free (basename);
return -1;
}
diff --git a/tests/itdb_main.c b/tests/itdb_main.c
index e7723bb..1cc03a4 100644
--- a/tests/itdb_main.c
+++ b/tests/itdb_main.c
@@ -55,7 +55,10 @@ main (int argc, char *argv[])
if (infile == 0)
{
- printf ("Usage: %s <infile> [<outfile>]\n", g_basename(argv[0]));
+ char *basename = g_path_get_basename(argv[0]);
+ printf ("Usage: %s <infile> [<outfile>]\n", basename);
+ g_free(basename);
+
exit (0);
}
diff --git a/tests/test-cp.cc b/tests/test-cp.cc
index cec778d..73a1dd9 100644
--- a/tests/test-cp.cc
+++ b/tests/test-cp.cc
@@ -108,8 +108,10 @@ int main (int argc, char **argv)
GError *error;
if (argc != 3) {
+ char *basename = g_path_get_basename(argv[0]);
g_print ("Usage:\n");
- g_print ("%s <filename> <mountpoint> \n", g_basename (argv[0]));
+ g_print ("%s <filename> <mountpoint> \n", basename);
+ g_free (basename);
exit (1);
}
diff --git a/tests/test-fw-id.c b/tests/test-fw-id.c
index 7490001..085123a 100644
--- a/tests/test-fw-id.c
+++ b/tests/test-fw-id.c
@@ -42,7 +42,9 @@ main (int argc, char *argv[])
char *fwid;
if (argc < 2) {
- g_print ("Usage: %s <mountpoint>\n", g_basename (argv[0]));
+ char *basename = g_path_get_basename(argv[0]);
+ g_print ("Usage: %s <mountpoint>\n", basename);
+ g_free (basename);
return 1;
}
diff --git a/tests/test-ls.c b/tests/test-ls.c
index e28cd9c..464824e 100644
--- a/tests/test-ls.c
+++ b/tests/test-ls.c
@@ -118,10 +118,12 @@ main (int argc, char *argv[])
if (mountpoint == NULL)
{
+ char *basename = g_path_get_basename (argv[0]);
g_print ("Usage: %s <mountpoint>|-l [<playlistname>]\n\n"
"-l - List from the local repository (~" LOCALDB ")\n"
- "<playlistname> - name of the playlist to list (optional)\n",
- g_basename(argv[0]));
+ "<playlistname> - name of the playlist to list (optional)\n",
+ basename);
+ g_free (basename);
exit (0);
}
diff --git a/tests/test-rebuild-db.cc b/tests/test-rebuild-db.cc
index fbcaf1e..f2b05ef 100644
--- a/tests/test-rebuild-db.cc
+++ b/tests/test-rebuild-db.cc
@@ -216,8 +216,10 @@ int main (int argc, char **argv)
GError *error;
if (argc != 2) {
+ char *basename = g_path_get_basename(argv[0]);
g_print ("Usage:\n");
- g_print ("%s <mountpoint>\n", g_basename (argv[0]));
+ g_print ("%s <mountpoint>\n", basename);
+ g_free (basename);
exit (1);
}
diff --git a/tools/ipod-time-sync.c b/tools/ipod-time-sync.c
index 0cc62f1..a0cc163 100644
--- a/tools/ipod-time-sync.c
+++ b/tools/ipod-time-sync.c
@@ -34,8 +34,10 @@ int
main (int argc, char **argv)
{
if (argc < 2) {
- g_print (_("usage: %s <device> [timezone]\n"), g_basename (argv[0]));
- return 1;
+ char *basename = g_path_get_basename (argv[0]);
+ g_print (_("usage: %s <device> [timezone]\n"), basename);
+ g_free (basename);
+ return 1;
}
sync_time (argv[1], NULL);
diff --git a/tools/read-sysinfoextended.c b/tools/read-sysinfoextended.c
index b3afd2c..8262137 100644
--- a/tools/read-sysinfoextended.c
+++ b/tools/read-sysinfoextended.c
@@ -78,8 +78,10 @@ main (int argc, char **argv)
char *xml;
if (argc < 3) {
- g_print (_("usage: %s <device|uuid|bus device> <mountpoint>\n"), g_basename (argv[0]));
- return 1;
+ char *basename = g_path_get_basename (argv[0]);
+ g_print (_("usage: %s <device|uuid|bus device> <mountpoint>\n"), basename);
+ g_free (basename);
+ return 1;
}
xml = NULL;
|
|
From: Javier K. <jk...@us...> - 2012-10-07 06:47:08
|
commit c77a4b233e2905e4a99348064c8d89aacc9f895c
Author: Jonathan Neuschäfer <j.n...@gm...>
Date: Thu Sep 27 20:15:03 2012 +0200
replace deprecated g_mapped_file_free()
g_mapped_file_free is deprecated since GLib 2.22
src/db-parse-context.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/src/db-parse-context.c b/src/db-parse-context.c
index 88009c9..789b3e9 100644
--- a/src/db-parse-context.c
+++ b/src/db-parse-context.c
@@ -64,7 +64,7 @@ db_parse_context_destroy (DBParseContext *ctx)
g_return_if_fail (ctx != NULL);
if (ctx->mapped_file) {
- g_mapped_file_free(ctx->mapped_file);
+ g_mapped_file_unref(ctx->mapped_file);
}
g_free (ctx);
@@ -215,7 +215,7 @@ db_parse_context_new_from_file (const char *filename, Itdb_DB *db)
device->byte_order);
if (ctx == NULL) {
- g_mapped_file_free(mapped_file);
+ g_mapped_file_unref(mapped_file);
return NULL;
}
ctx->db = db;
|
|
From: Javier K. <jk...@us...> - 2012-10-07 06:47:01
|
Summary of changes: c77a4b2... replace deprecated g_mapped_file_free() 6c008df... replace deprecated g_basename() f03c72a... replace deprecated gdk_pixbuf_unref() 53480eb... configure.ac: show --disable-udev, not --enable-udev f2d3b3c... configure.ac: fix a minor typo c42fe81... configure.ac: show --disable-udev, not --enable-udev 265419c... configure.ac: fix a minor typo b4569d6... replace deprecated gdk_pixbuf_unref() cc909f3... replace deprecated g_basename() c10822a... Merge branch 'dev' of git://github.com/neuschaefer/libgpod 0a3750d... Add backward compatible definition for g_mapped_file_unref. |
|
From: phantomjinx <pha...@us...> - 2012-10-06 20:11:02
|
commit 20679052915918e3b49ad4bd5931e595e737ca8e
Author: phantomjinx <p.g...@ph...>
Date: Sat Oct 6 21:10:27 2012 +0100
Update of chinese translation
* Thanks to Zhixin Tan tanzhxin at gmail.com for the update
po/zh_CN.po | 2374 ++++++++++++++++-------------------------------------------
1 files changed, 617 insertions(+), 1757 deletions(-)
---
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 6c82fe3..f80a2de 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -3,7 +3,6 @@
# This file is distributed under the same license as the gtkpod package.
#
# Tan Zhixin <tan...@gm...>, 2009, 2010.
-#, fuzzy
msgid ""
msgstr ""
"Project-Id-Version: gtkpod\n"
@@ -30,7 +29,6 @@ msgid "Conversion Progress Display"
msgstr "转换进程显示"
#: ../data/glade/core-gtkpod.xml.h:2 ../src/anjuta-app.c:720
-#, fuzzy
msgid "General"
msgstr "通用"
@@ -40,26 +38,25 @@ msgstr "不再显示此对话窗口"
#: ../data/glade/core-gtkpod.xml.h:4
msgid "Session"
-msgstr ""
+msgstr "任务"
#: ../data/glade/core-gtkpod.xml.h:5
msgid ""
"The output of the background conversion scripts is copied below. Each page "
"of the notebook corresponds to one background thread."
-msgstr "下面是背景转换脚本的输出，其每一页对应于一个背景。"
+msgstr "下面是背景转换脚本的输出，每一页对应于一个背景。"
#: ../data/glade/core-gtkpod.xml.h:6
msgid "Turn off the splash screen"
-msgstr ""
+msgstr "关闭初始背景"
#: ../data/gtkpod.desktop.in.h:1
msgid "Manage music and video on an Apple iPod"
msgstr "管理Apple iPod的音乐和视频"
#: ../data/gtkpod.desktop.in.h:2 ../src/main.c:95
-#, fuzzy
msgid "gtkpod"
-msgstr "关于gtkpod"
+msgstr "gtkpod"
#: ../data/gtkpod.desktop.in.h:3
msgid "iPod Manager"
@@ -70,7 +67,7 @@ msgstr "iPod管理器"
msgid ""
"Newly mounted iPod at '%s' could not be loaded into gtkpod.\n"
"\n"
-msgstr "新挂载在'%s'的iPod无法载入gtkpod\n"
+msgstr "'%s'的新iPod无法载入gtkpod\n"
#: ../libgtkpod/autodetection.c:249
#, c-format
@@ -83,7 +80,7 @@ msgstr ""
#: ../libgtkpod/autodetection.c:257
msgid "New iPod"
-msgstr "新iPod"
+msgstr "新加iPod"
#: ../libgtkpod/charset.c:54
msgid "Arabic (IBM-864)"
@@ -271,19 +268,19 @@ msgstr "希伯来语(ISO-8859-8)"
#: ../libgtkpod/charset.c:100
msgid "Western (IBM-850)"
-msgstr "西方(IBM-850)"
+msgstr "西欧(IBM-850)"
#: ../libgtkpod/charset.c:101
msgid "Western (ISO-8859-1)"
-msgstr "西方(ISO-8859-1)"
+msgstr "西欧(ISO-8859-1)"
#: ../libgtkpod/charset.c:102
msgid "Western (ISO-8859-15)"
-msgstr "西方(ISO-8859-15)"
+msgstr "西欧(ISO-8859-15)"
#: ../libgtkpod/charset.c:103
msgid "Western (Windows-1252)"
-msgstr "西方(Windows-1252)"
+msgstr "西欧(Windows-1252)"
#. sanity!
#. check for "System Charset" and return NULL
@@ -310,7 +307,6 @@ msgid "Create new Playlist"
msgstr "创建新的播放列表"
#: ../libgtkpod/context_menus.c:254
-#, fuzzy
msgid "Create Playlist File..."
msgstr "创建播放列表文件"
@@ -323,7 +319,6 @@ msgid "Edit Track Details"
msgstr "编辑音轨信息"
#: ../libgtkpod/context_menus.c:292
-#, fuzzy
msgid "Copy Tracks to Filesystem..."
msgstr "复制音轨到文件系统"
@@ -332,12 +327,11 @@ msgstr "复制音轨到文件系统"
msgid ""
"Using local %s directory since program was started from source directory:\n"
"%s\n"
-msgstr ""
-
+msgstr "使用启动位置的本地目录%s"
+"%s\n"
#: ../libgtkpod/file.c:57
-#, fuzzy
msgid "Unknown error"
-msgstr "未知"
+msgstr "未知错误"
#: ../libgtkpod/file.c:219
#, c-format
@@ -354,7 +348,7 @@ msgid ""
"'%s' is a not a known playlist file.\n"
"\n"
msgstr ""
-"'%s'是一个未知播放列表文件。\n"
+"'%s'不是已知的播放列表文件。\n"
"\n"
#: ../libgtkpod/file.c:241 ../plugins/exporter/file_export.c:236
@@ -366,12 +360,12 @@ msgstr "无法读取'%s'。\n"
#: ../libgtkpod/file.c:320
#, c-format
msgid "Skipping '%s' because it is a directory.\n"
-msgstr "忽略目录文件'%s'\n"
+msgstr "忽略文件目录'%s'\n"
#: ../libgtkpod/file.c:326
#, c-format
msgid "Skipping '%s' to avoid adding playlist file recursively\n"
-msgstr "忽略'%s'以免递归添加播放列表\n"
+msgstr "忽略'%s'以避免递归添加播放列表\n"
#: ../libgtkpod/file.c:674
#, c-format
@@ -393,7 +387,6 @@ msgid "Unknown token '%%%c' in template '%s'"
msgstr "模板'%2$s'中有未知字符串'%%%1$c'"
#: ../libgtkpod/file.c:1036
-#, fuzzy, c-format
msgid ""
"Unable to start video thumbnail generator\n"
"(command line was: '%s')"
@@ -418,29 +411,35 @@ msgid ""
"The filetype '%s' is not currently supported.\n"
"\n"
"If you have a plugin that supports this filetype then please enable it."
-msgstr ""
+msgstr "当前版本不支持'%s'类型文件"
+"\n"
+"如果你已经有一个该文件类型的支持插件，请先启用它。"
#: ../libgtkpod/file.c:1187
-#, fuzzy, c-format
msgid ""
"No track information could be retrieved from the file %s due to the "
"following error:\n"
"\n"
"%s"
-msgstr "无法为下列音轨获取mserv信息"
+msgstr "无法从文件获取音轨信息，"
+"错误原因： \n"
+"\n"
+"%s"
#: ../libgtkpod/file.c:1193
-#, fuzzy, c-format
msgid ""
"No track information could be retrieved from the file %s due to the "
"following error:\n"
"\n"
"An error was not returned."
-msgstr "无法为下列音轨获取mserv信息"
+msgstr "无法从文件获取音轨信息，"
+"错误原因： \n"
+"\n"
+"没有返回错误信息。"
#: ../libgtkpod/file.c:1299 ../plugins/mserv/mserv.c:199
msgid "Nothing to update"
-msgstr "无需要更新的项目"
+msgstr "没有需要更新的项目"
#: ../libgtkpod/file.c:1318
#, c-format
@@ -500,12 +499,12 @@ msgstr "本地文件和iPod中的拷贝都找不到"
#. update not successful -- log this track for later display
#: ../libgtkpod/file.c:1595
msgid "update failed (format not supported?)"
-msgstr "更新失败（格式不支持?）"
+msgstr "更新失败（不支持的格式?）"
#: ../libgtkpod/file.c:1655
#, c-format
msgid "File type of %s is not recognised"
-msgstr ""
+msgstr "文件格式%s无法识别"
#: ../libgtkpod/file.c:1663 ../libgtkpod/misc_playlist.c:742
#, c-format
@@ -528,9 +527,8 @@ msgstr ""
"\n"
#: ../libgtkpod/file.c:1847
-#, fuzzy, c-format
msgid "Couldn't change tags of file: %s"
-msgstr "无法改变文件的标签：%s\n"
+msgstr "无法改变文件的标签：%s"
#: ../libgtkpod/file.c:1863
#, c-format
@@ -545,7 +543,7 @@ msgstr "无法打开文件'%s'读写。\n"
#: ../libgtkpod/file.c:1960
#, c-format
msgid "Could not obtain lock on '%s'.\n"
-msgstr "无法对文件'%s'加锁。\n"
+msgstr "无法获取文件'%s'的锁定。\n"
#. error!
#: ../libgtkpod/file.c:1975 ../libgtkpod/file.c:1983 ../libgtkpod/file.c:1993
@@ -566,8 +564,8 @@ 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 ""
-"iTunesDB中的一些离线播放的音轨找不到。按下'ok'从离线播放计数文件中删除它"
-"们，'Cancel'保持不变。"
+"iTunesDB中的一些离线播放的音轨找不到。按下'OK'从离线播放计数文件中删除它"
+"们，'Cancel'则保持不变。"
#: ../libgtkpod/file.c:2038
#, c-format
@@ -577,13 +575,13 @@ msgstr "写入'%s'时发生错误。\n"
#: ../libgtkpod/file.c:2071
#, c-format
msgid "Failed to read sound check from track with no path setting."
-msgstr ""
+msgstr "从音轨读取声音失败因为没有设置路径"
#: ../libgtkpod/file.c:2079
#, c-format
msgid ""
"Failed to read sound check from track because filetype is not recognised."
-msgstr ""
+msgstr "从音轨读取声音失败因为文件格式不支持"
#: ../libgtkpod/file.c:2109
#, c-format
@@ -591,6 +589,8 @@ msgid ""
"Error: Could not determine filetype for file at path: %s.\n"
"\n"
msgstr ""
+"错误：无法确定该文件的文件类型：%s \n"
+"\n"
#: ../libgtkpod/file.c:2115 ../libgtkpod/file.c:2120
#, c-format
@@ -599,11 +599,14 @@ msgid ""
"\n"
"%s"
msgstr ""
+"错误：读取歌词失败因为：\n"
+"\n"
+"%s"
#: ../libgtkpod/file.c:2124
#, c-format
msgid "Error: Unable to get filename from path"
-msgstr ""
+msgstr "错误：无法获取文件名"
#: ../libgtkpod/file.c:2155
msgid "Error:"
@@ -620,35 +623,33 @@ msgstr ""
"\n"
#: ../libgtkpod/file.c:2178
-#, fuzzy, c-format
msgid ""
"Lyrics not written, file type cannot be determined (%s).\n"
"\n"
msgstr ""
-"歌词未写入，文件名不存在(%s)。\n"
+"歌词未写入，文件类型不确定(%s)。\n"
"\n"
#: ../libgtkpod/file.c:2185
-#, fuzzy, c-format
msgid ""
"Lyrics not written due to the error:\n"
"\n"
"%s"
msgstr ""
-"歌词未写入，文件名不存在(%s)。\n"
+"歌词未写入，由于以下错误：\n"
"\n"
+"%s"
#: ../libgtkpod/file.c:2190
-#, fuzzy, c-format
msgid ""
"Lyrics not written due to the error:\n"
"%s"
msgstr ""
-"歌词未写入，文件名不存在(%s)。\n"
+"歌词未写入，由于以下错误：\n"
"\n"
+"%s"
#: ../libgtkpod/file_convert.c:317
-#, fuzzy
msgid "errors"
msgstr "错误："
@@ -669,7 +670,7 @@ msgstr "不活跃的"
#: ../libgtkpod/file_convert.c:561
#, c-format
msgid "Active threads: %d. Scheduled tracks: %d."
-msgstr "活跃进程：%d 计划播放音轨：%d条"
+msgstr "活跃进程：%d 计划播放音轨数：%d条"
#: ../libgtkpod/file_convert.c:1035
#, c-format
@@ -706,7 +707,7 @@ msgid ""
"Transfer of '%s' failed. %s\n"
"\n"
msgstr ""
-"移动'%s'失败。%s\n"
+"传输'%s'失败。%s\n"
"\n"
#: ../libgtkpod/file_convert.c:1868 ../libgtkpod/file_convert.c:2098
@@ -776,7 +777,7 @@ msgstr ""
#: ../libgtkpod/file_itunesdb.c:121
#, c-format
msgid "Matching SHA1 checksum for file %d/%d"
-msgstr "文件的SHA1验证匹配中 %d/%d"
+msgstr "文件%d/%d的SHA1验证匹配中"
#: ../libgtkpod/file_itunesdb.c:232
msgid "Could not create hash value from itunesdb\n"
@@ -806,7 +807,7 @@ msgid ""
"Expected \"itunesdb_hash=\" but got:\"%s\"\n"
msgstr ""
"%s:\n"
-"期望是\"itunesdb_hash\"，但是得到:\"%s\"\n"
+"期望是\"itunesdb_hash=\"，但是返回:\"%s\"\n"
#: ../libgtkpod/file_itunesdb.c:318
#, c-format
@@ -826,9 +827,9 @@ msgid ""
"than gtkpod.\n"
"\n"
msgstr ""
-"不存在单条音轨的SHA1验证码。\n"
+"单条音轨的SHA1验证码不存在。\n"
"\n"
-"为了避免这种情形，或者打开重复文件探测（当然有SHA1验证码）或者不在gtkpod以外"
+"为了避免这种情形，打开重复文件探测（当然有SHA1验证码）或者避免在gtkpod以外"
"的其他程序中使用iPod。\n"
"\n"
@@ -838,38 +839,34 @@ msgid "Error reading iPod photo database (%s).\n"
msgstr "读取照片数据库(%s)时发生错误。\n"
#: ../libgtkpod/file_itunesdb.c:401
-#, fuzzy
msgid "Error reading iPod photo database. (No error message)\n"
-msgstr "读取照片数据库(%s)时发生错误。\n"
+msgstr "读取照片数据库(%s)时发生错误。(无错误信息)\n"
#: ../libgtkpod/file_itunesdb.c:459
#, c-format
msgid "The repository %s does not have a readable extended database.\n"
-msgstr "音乐库%s没有可读的扩展数据库。\n"
+msgstr "音乐库%s没有扩展数据库。\n"
#: ../libgtkpod/file_itunesdb.c:461
-#, fuzzy
msgid ""
"This database identifies the track on disk with the track data in the "
"repository database. "
-msgstr "该数据库用音乐库中的音轨数据库来识别磁盘上的音轨。"
+msgstr "该数据库用音乐库中的音轨数据库来确定磁盘上的音轨。"
#: ../libgtkpod/file_itunesdb.c:461
-#, fuzzy
msgid ""
"Any tracks already in the database cannot be transferred between "
"repositories without the extended database. "
msgstr "如果没有扩展数据库，数据库中已有的音轨不能在音乐库之间进行转移。"
#: ../libgtkpod/file_itunesdb.c:461
-#, fuzzy
msgid ""
"A new extended database will be created upon saving but existing tracks will "
"need to be reimported to be linked to the file on disk.\n"
"\n"
msgstr ""
-"新的扩展数据库会在保存时创建，但已有的音轨仍需要被重新导入来和磁盘上的文件进"
-"行链接。"
+"在保存时将创建新的扩展数据库，但现有的音轨仍需要被重新导入来和磁盘上的文件进\n"
+"行链接。\n"
#: ../libgtkpod/file_itunesdb.c:468
msgid "Offline iPod database successfully imported"
@@ -923,18 +920,17 @@ msgstr ""
"\n"
#: ../libgtkpod/file_itunesdb.c:504
-#, fuzzy
msgid ""
"Extended info will not be used.\n"
"\n"
msgstr "扩展信息将不会被使用。\n"
#: ../libgtkpod/file_itunesdb.c:509
-#, fuzzy
msgid ""
"iPod Database Successfully Imported\n"
"\n"
-msgstr "iPod数据库已成功导入"
+msgstr "iPod数据库已成功导入\n"
+"\n"
#: ../libgtkpod/file_itunesdb.c:513
#, c-format
@@ -965,14 +961,13 @@ msgstr ""
#. gint id,
#. gboolean modal,
#: ../libgtkpod/file_itunesdb.c:696
-#, fuzzy
msgid "Import Repository Errors"
-msgstr "音乐库"
+msgstr "导入仓库时错误"
#. title
#: ../libgtkpod/file_itunesdb.c:697
msgid "Errors created during repository import"
-msgstr ""
+msgstr "在音乐库导入时发生错误"
#: ../libgtkpod/file_itunesdb.c:823
#, c-format
@@ -986,7 +981,7 @@ msgid ""
msgstr ""
"在'%s'中无法找到iPod目录结构。\n"
"\n"
-"如果你确定iPod正确挂载在'%s'，并且似乎不工作。这种情况下，你可以用gtkpod强制"
+"如果你确定iPod正确挂载在'%s'，它可能没有正确地初始化。这种情况下，你可以用gtkpod强制"
"初始化。\n"
"\n"
"你真的准备现在就创建目录结构吗？"
@@ -1002,25 +997,23 @@ msgstr "创建目录结构"
#: ../libgtkpod/file_itunesdb.c:1089
#, c-format
msgid "Could not open \"%s\" for writing extended info.\n"
-msgstr "无法打开\"%s\"写入扩展信息。\n"
+msgstr "无法打开\"%s\"以写入扩展信息。\n"
#: ../libgtkpod/file_itunesdb.c:1101
msgid "Aborted writing of extended info.\n"
-msgstr "放弃扩展信息的写入操作。\n"
+msgstr "放弃写入扩展信息。\n"
#: ../libgtkpod/file_itunesdb.c:1250
-#, fuzzy, c-format
msgid "%d%% %s"
-msgstr "%d%%"
+msgstr "%d%% %s"
#: ../libgtkpod/file_itunesdb.c:1261
-#, fuzzy, c-format
msgid "%d%% (%d/%d %d:%02d:%02d left) %s"
-msgstr "%d%% (%d/%d 还有%d:%02d:%02d)"
+msgstr "%d%% (%d/%d 剩余%d:%02d:%02d) %s"
#: ../libgtkpod/file_itunesdb.c:1306
msgid "Status: Deleting File"
-msgstr "状态：删除文件中"
+msgstr "当前状态：删除文件中"
#: ../libgtkpod/file_itunesdb.c:1362
#, c-format
@@ -1072,23 +1065,21 @@ msgid ""
"then eject the iPod again. Pressing 'OK' will re-schedule the failed tracks "
"for conversion and transfer."
msgstr ""
-"iPod无法弹出，请按照下面的指示修复并再次尝试弹出。按'ok'将重新安排对操作失败"
+"iPod无法弹出，请按照下面的指示修复并再次尝试弹出。按'OK'将重新安排对操作失败"
"的音轨进行转换和传输。"
#: ../libgtkpod/file_itunesdb.c:1523
#, c-format
msgid "Saving: waiting for %d tracks to be copied"
-msgstr ""
+msgstr "保存：等待，还要复制%d条音轨"
#: ../libgtkpod/file_itunesdb.c:1527
-#, fuzzy, c-format
msgid "Saving: waiting for %d tracks to convert"
-msgstr "等待完成转换"
+msgstr "保存：等待，还要转换%d条音轨"
#: ../libgtkpod/file_itunesdb.c:1530
-#, fuzzy, c-format
msgid "Saving: finished track transfer"
-msgstr "状态：传输完成"
+msgstr "保存：传输完成"
#: ../libgtkpod/file_itunesdb.c:1562
#, c-format
@@ -1127,7 +1118,7 @@ msgstr "现有的iTunes数据库没有被导入"
#: ../libgtkpod/file_itunesdb.c:1635 ../libgtkpod/misc_playlist.c:836
msgid "Proceed anyway"
-msgstr "不管，继续原来操作"
+msgstr "继续原来操作"
#: ../libgtkpod/file_itunesdb.c:1635
msgid "Skip storing"
@@ -1156,7 +1147,7 @@ msgstr "扩展信息文件没有被删除：'%s'"
#: ../libgtkpod/file_itunesdb.c:1754
#, c-format
msgid "Backup database could not be found so backing up database to %s\n"
-msgstr ""
+msgstr "无法找到备份数据库，因此备份到%s\n"
#: ../libgtkpod/file_itunesdb.c:1860
#, c-format
@@ -1170,40 +1161,31 @@ msgstr "%s：改动已经保存"
#: ../libgtkpod/fileselection.c:65
msgid "Set Cover"
-msgstr "设置插图"
+msgstr "设置封面"
#: ../libgtkpod/filetype_iface.c:173
-#, fuzzy
msgid "Error: Track info for this file type not supported."
-msgstr ""
-"均衡化失败：文件类型不支持(%s)。\n"
-"\n"
+msgstr "错误：该文件类型的音轨不支持。"
#: ../libgtkpod/filetype_iface.c:178
-#, fuzzy
msgid "Error: Writing track info to files of this file type is not supported."
-msgstr ""
-"还不支持对视频文件的写入操作(%s)。\n"
-"\n"
+msgstr "错误：不支持该文件类型的音轨信息写入。"
#: ../libgtkpod/filetype_iface.c:183
-#, fuzzy
msgid "Error: Limiting of sound level not supported for this file type."
-msgstr "错误：本文件格式不支持歌词。"
+msgstr "错误：该文件类型支持有限。"
#: ../libgtkpod/filetype_iface.c:193
-#, fuzzy
msgid "Error: Lyrics not supported for this file type."
-msgstr "错误：本文件格式不支持歌词。"
+msgstr "错误：该文件类型不支持歌词。"
#: ../libgtkpod/filetype_iface.c:199
-#, fuzzy
msgid "Error: Writing of lyrics is not supported for this file type."
-msgstr "错误：本文件格式不支持歌词。"
+msgstr "错误：该文件类型不支持歌词写入。"
#: ../libgtkpod/filetype_iface.c:205
msgid "Error: Gapless playback for this file type is not supported."
-msgstr ""
+msgstr "错误：该文件类型不支持无缝回放。"
#: ../libgtkpod/gp_itdb.c:805
msgid "Music Library"
@@ -1213,7 +1195,7 @@ msgstr "音乐库"
#: ../libgtkpod/gp_itdb.c:812 ../libgtkpod/gp_itdb.c:920
#: ../libgtkpod/gp_itdb.c:952
msgid "Podcasts"
-msgstr "Podcast"
+msgstr "Podcasts"
#: ../libgtkpod/gp_itdb.c:922
msgid "Local"
@@ -1229,20 +1211,18 @@ msgstr "iPod"
#: ../libgtkpod/gp_itdb.c:1007
#, c-format
msgid "Increased playcount for '%s'"
-msgstr "'%s'增加播放计数"
+msgstr "为'%s'增加播放计数"
#: ../libgtkpod/gtkpod_app_iface.c:149
-#, fuzzy
msgid ""
"Data has been changed and not been saved. If you quit gtkpod, all unsaved "
"changes will be lost.\n"
"\n"
"Do you want to save your changes first?"
msgstr ""
-"数据已经被改动且还没保存，如果你要退出gtkpod，所有还没有保存的改动都将丢"
-"失。\n"
+"数据已经被改动且还没保存，如果你要退出，所有未保存的改动都将丢失。\n"
"\n"
-"你要先保存改动吗？"
+"先保存改动吗？"
#: ../libgtkpod/gtkpod_app_iface.c:152
msgid "Save changes before quiting?"
@@ -1250,7 +1230,7 @@ msgstr "退出前保存改动吗？"
#: ../libgtkpod/gtkpod_app_iface.c:152
msgid "Quit without saving"
-msgstr "退出并且不保存改动"
+msgstr "退出并且放弃保存"
#. Translators: this is total number of playlists ("P") and number of tracks ("T") in the selected playlist / total number of tracks
#: ../libgtkpod/gtkpod_app_iface.c:224
@@ -1284,7 +1264,7 @@ msgstr ""
#: ../libgtkpod/misc.c:1512
msgid "unspecified error"
-msgstr "未知错误"
+msgstr "未分类错误"
#: ../libgtkpod/misc.c:1519
#, c-format
@@ -1423,7 +1403,7 @@ msgstr "注释"
#: ../plugins/core_preferences/core_prefs.xml.h:32
#: ../plugins/playlist_display/playlist_display_spl.c:91
msgid "Composer"
-msgstr "作曲"
+msgstr "作曲者"
#: ../libgtkpod/misc_conversion.c:67
msgid "File type"
@@ -1444,7 +1424,7 @@ msgstr "iPod ID"
#. 10
#: ../libgtkpod/misc_conversion.c:71
msgid "Track Nr (#)"
-msgstr "Track Nr(#)"
+msgstr "音轨Nr(#)"
#: ../libgtkpod/misc_conversion.c:72
#: ../plugins/track_display/display_tracks.c:1851
@@ -1468,7 +1448,7 @@ msgstr "比特率"
#: ../libgtkpod/misc_conversion.c:76
#: ../plugins/playlist_display/playlist_display_spl.c:81
msgid "Samplerate"
-msgstr "采样速率"
+msgstr "采样率"
#: ../libgtkpod/misc_conversion.c:77
#: ../plugins/playlist_display/playlist_display_spl.c:97
@@ -1634,7 +1614,7 @@ msgstr "按专辑艺术家排序"
#: ../libgtkpod/misc_conversion.c:112
msgid "Sort Composer"
-msgstr "按作曲排序"
+msgstr "按作曲者排序"
#: ../libgtkpod/misc_conversion.c:113
msgid "Sort TV Show"
@@ -1712,7 +1692,7 @@ msgstr "播放列表所在的类别（例如'技术'或'音乐'）"
#: ../libgtkpod/misc_conversion.c:152
msgid "Accessible by selecting the center button on the iPod."
-msgstr "通过iPod中间的按钮选择"
+msgstr "通过iPod的中间按钮来选择"
#: ../libgtkpod/misc_conversion.c:156
msgid "Release date (for podcasts displayed next to the title on the iPod)"
@@ -1733,7 +1713,7 @@ msgstr "URI'%s'不是一个绝对地址"
#: ../libgtkpod/misc_conversion.c:731
#, c-format
msgid "The local file URI '%s' may not include a '#'"
-msgstr "本地文件URI'%s'可能没有包含'#'"
+msgstr "本地文件的URI'%s'可能没有包含'#'"
#: ../libgtkpod/misc_conversion.c:748
#, c-format
@@ -1773,19 +1753,19 @@ msgstr "AR:"
#: ../libgtkpod/misc_playlist.c:107
msgid "AL:"
-msgstr "AL:"
+msgstr "专辑:"
#: ../libgtkpod/misc_playlist.c:110
msgid "GE:"
-msgstr "GE:"
+msgstr "类型:"
#: ../libgtkpod/misc_playlist.c:113
msgid "CO:"
-msgstr "CO:"
+msgstr "作曲:"
#: ../libgtkpod/misc_playlist.c:116
msgid "YE:"
-msgstr "YE:"
+msgstr "年代:"
#: ../libgtkpod/misc_playlist.c:140
msgid "Unknown"
@@ -1804,13 +1784,13 @@ msgstr "未列出"
#, c-format
msgid "Created playlist '%s' with %d track."
msgid_plural "Created playlist '%s' with %d tracks."
-msgstr[0] "从当前%2$d条音轨创建播放列表'%1$s'"
-msgstr[1] "从当前%2$d条音轨创建播放列表'%1$s'"
+msgstr[0] "从当前的%2$d条音轨创建播放列表'%1$s'"
+msgstr[1] "从当前的%2$d条音轨创建播放列表'%1$s'"
#. n==0
#: ../libgtkpod/misc_playlist.c:307
msgid "No tracks available, playlist not created"
-msgstr "无音轨，无法创建播放列表"
+msgstr "没有选择音轨，无法创建播放列表"
#: ../libgtkpod/misc_playlist.c:414
#, c-format
@@ -1834,7 +1814,7 @@ msgstr "未评分的音轨"
#: ../libgtkpod/misc_playlist.c:525
#, c-format
msgid "Rated %d"
-msgstr "评分 %d"
+msgstr "已评分 %d"
#: ../libgtkpod/misc_playlist.c:564
#, c-format
@@ -1859,7 +1839,7 @@ msgstr "在PC上没有对应文件的悬空音轨被移除"
#: ../libgtkpod/misc_playlist.c:769
msgid "Dangling tracks with files on PC were handled."
-msgstr "悬空音轨的PC对应文件已找到"
+msgstr "悬空音轨在PC上的对应文件已找到"
#: ../libgtkpod/misc_playlist.c:789 ../plugins/sjcd/sj-main.c:1503
msgid "Track"
@@ -1886,13 +1866,12 @@ msgid "Creating a tree of known files"
msgstr "创建已知文件的树形图"
#: ../libgtkpod/misc_playlist.c:886
-#, fuzzy
msgid "Checking iPod files against known files in DB"
msgstr "对照数据库中的记录检查iPod的文件"
#: ../libgtkpod/misc_playlist.c:925
msgid "Orphaned"
-msgstr "遗弃的"
+msgstr "遗弃文件"
#: ../libgtkpod/misc_playlist.c:950
#, c-format
@@ -1902,7 +1881,7 @@ msgid ""
"%s\n"
"\n"
msgstr ""
-"下列遗弃文件已经添加再次添加到iPod中，它将在下次同步时被移除：\n"
+"下列遗弃文件已经再次添加到iPod中，它将在下次同步时被移除：\n"
"%s\n"
"\n"
@@ -1962,7 +1941,7 @@ msgstr "从iPod移除所有%d条音轨"
#: ../libgtkpod/misc_playlist.c:1069
#, c-format
msgid "Removed all podcasts from the iPod"
-msgstr "从iPod移除所有音轨"
+msgstr "从iPod移除所有podcast"
#. first use playlist name
#: ../libgtkpod/misc_playlist.c:1073 ../libgtkpod/misc_playlist.c:1128
@@ -2150,56 +2129,50 @@ msgid "Could not find source file for '%s'. Track not copied."
msgstr "找不到'%s'的源文件，不会复制音轨。"
#: ../libgtkpod/misc_track.c:1855
-#, fuzzy, c-format
msgid ""
"drag and drop: ignored '%s'.\n"
"reason: %s\n"
msgstr "拖拽：忽略'%s'\n"
+"原因: %s\n"
#: ../libgtkpod/misc_track.c:1982
-#, fuzzy, c-format
msgid "Deleting one track completely from iPod"
msgid_plural "Deleting %d tracks completely from iPod"
msgstr[0] "已从iPod中完全删除一条音轨"
msgstr[1] "已从iPod中完全删除%d条音轨"
#: ../libgtkpod/misc_track.c:1987 ../libgtkpod/misc_track.c:2007
-#, fuzzy, c-format
msgid "Deleting %d track from playlist '%s'"
msgid_plural "Deleting %d tracks from playlist '%s'"
msgstr[0] "从播放列表'%2$s'删除%1$d条音轨"
msgstr[1] "从播放列表'%2$s'删除%1$d条音轨"
#: ../libgtkpod/misc_track.c:2002
-#, fuzzy, c-format
msgid "Deleting one track from harddisk"
msgid_plural "Deleting %d tracks from harddisk"
msgstr[0] "已从硬盘删除一条音轨"
msgstr[1] "已从硬盘删除%d条音轨"
#: ../libgtkpod/misc_track.c:2012
-#, fuzzy, c-format
msgid "Deleting one track from local database"
msgid_plural "Deleting %d tracks from local database"
msgstr[0] "已从本地数据库删除一条音轨"
msgstr[1] "已从本地数据库删除%d条音轨"
#: ../libgtkpod/misc_track.c:2027
-#, c-format
msgid "Deleting Track %d/%d ..."
-msgstr ""
+msgstr "删除音轨%d/%d ..."
#: ../libgtkpod/misc_track.c:2037
-#, fuzzy
msgid "Completed deletion"
-msgstr "检查重复文件"
+msgstr "删除已完成"
#: ../libgtkpod/misc_track.c:2131
#, c-format
msgid "Copied %d track to '%s' in '%s'"
msgid_plural "Copied %d tracks to %s in '%s'"
-msgstr[0] "复制%1$d条音轨到'%3$s'中的'%2$s'"
-msgstr[1] "复制%1$d条音轨到'%3$s'中的'%2$s'"
+msgstr[0] "从'%3$s'中复制%1$d条音轨到'%2$s'"
+msgstr[1] "从'%3$s'中复制%1$d条音轨到'%2$s'"
#: ../libgtkpod/misc_track.c:2161
#, c-format
@@ -2215,7 +2188,7 @@ msgstr "没有选择音轨"
#: ../libgtkpod/prefs.c:293
#, c-format
msgid "gtkpod version %s usage:\n"
-msgstr "gtkpod版本%s的使用方法：\n"
+msgstr "gtkpod %s的使用方法：\n"
#: ../libgtkpod/prefs.c:294
msgid " -h, --help: display this message\n"
@@ -2249,7 +2222,7 @@ msgstr "验证文件为0 bytes长度\n"
#: ../libgtkpod/sha1.c:234
#, c-format
msgid "Could not open '%s' to calculate SHA1 checksum: %s\n"
-msgstr "无法打开'%s'计算SHA1验证码：%s\n"
+msgstr "无法打开'%s'以计算SHA1码：%s\n"
#: ../libgtkpod/syncdir.c:220
#, c-format
@@ -2283,14 +2256,13 @@ msgstr[1] "下列音轨已从播放列表中完全移除：\n"
#: ../libgtkpod/syncdir.c:245
msgid "Nothing was changed.\n"
-msgstr "无改动。\n"
+msgstr "没有改动。\n"
#: ../libgtkpod/syncdir.c:248
msgid "Sync summary"
msgstr "同步摘要"
#: ../libgtkpod/tools.c:118
-#, fuzzy, c-format
msgid ""
"Could not find '%s'.\n"
"Please specifiy the exact path in the preference dialog or install the "
@@ -2312,11 +2284,10 @@ msgstr ""
"\n"
#: ../libgtkpod/tools.c:255
-#, fuzzy, c-format
msgid "Normalization failed: file not available (%s)."
msgstr ""
-"均衡化失败：文件不存在(%s)。\n"
-"\n"
+"均衡化失败：文件不存在(%s)。"
+
#: ../libgtkpod/tools.c:270
#, c-format
@@ -2324,41 +2295,35 @@ msgid ""
"Normalization failed for file %s: file type not supported.To normalize mp3 "
"and aac files ensure the following commands paths have been set in the Tools "
"section\tmp3 files: mp3gain\taac files: aacgain"
-msgstr ""
+msgstr "文件%s 均衡化失败：不支持的文件类型，如果要对mp3或aac文件均衡化，"
+"请确保以下命令的路径在设置工具"
+"\tmp3文件：mp3增益\taac文件: aac增益"
#. gint id,
#. gboolean modal,
#: ../libgtkpod/tools.c:316
-#, fuzzy
msgid "Normalization Errors"
-msgstr "均衡化"
+msgstr "均衡化错误"
#. title
#: ../libgtkpod/tools.c:317
msgid "Errors created by track normalisation"
-msgstr ""
+msgstr "音轨均衡化时发生的错误"
#: ../libgtkpod/tools.c:414
-#, fuzzy, c-format
msgid "'%s-%s' (%s) could not be normalized. %s\n"
-msgstr ""
-"'%s-%s' (%s)无法设置音量均衡。\n"
-"\n"
+msgstr "'%s-%s' (%s)无法设置音量均衡。%s\n"
#: ../libgtkpod/tools.c:419
-#, fuzzy, c-format
msgid "'%s-%s' (%s) could not be normalized. Unknown error.\n"
-msgstr ""
-"'%s-%s' (%s)无法设置音量均衡。\n"
-"\n"
+msgstr "'%s-%s' (%s)无法设置音量均衡。未知错误。\n"
+
#: ../libgtkpod/tools.c:436
-#, fuzzy, c-format
msgid "%d%% (%d tracks left)"
-msgstr "%d%% (还需要%d:%02d:%02d)"
+msgstr "%d%% (还剩%d条音轨)"
#: ../libgtkpod/tools.c:447
-#, fuzzy, c-format
msgid "Normalized %d of %d track."
msgid_plural "Normalized %d of %d tracks."
msgstr[0] "已完成%2$d条音轨中%1$d条的音量均衡设置"
@@ -2375,7 +2340,7 @@ msgstr[1] "已完成%2$d条音轨中%1$d条的音量均衡设置"
msgid ""
"Please specify the command to be called on the 'Tools' section of the "
"preferences dialog.\n"
-msgstr "请在首选项对话框工具栏中指定命令。\n"
+msgstr "请在首选项对话框工具栏中设定命令。\n"
#: ../libgtkpod/tools.c:565
#, c-format
@@ -2387,7 +2352,7 @@ msgid ""
msgstr ""
"找不到命令 '%s'。\n"
"\n"
-"请检查首选项中'工具'部分的设置。\n"
+"请检查首选项中工具栏的设置。\n"
"\n"
#: ../libgtkpod/tools.c:606
@@ -2402,40 +2367,37 @@ msgstr ""
#: ../libs/atomic-parsley/AtomicParsleyBridge.cpp:465
#, c-format
msgid "ERROR %s is not itunes style."
-msgstr ""
+msgstr "错误：%s不是itunes的方式"
#: ../libs/atomic-parsley/AtomicParsleyBridge.cpp:664
#, c-format
msgid "ERROR failed to change track file's artwork."
-msgstr ""
+msgstr "错误：改变音轨文件的艺术封面失败。"
#: ../plugins/filetype_video/videofile.c:47
-#, fuzzy
msgid "Generic video file"
-msgstr "文件类型"
+msgstr "通用视频文件"
#: ../plugins/core_preferences/core_prefs.c:178
msgid "Browse"
msgstr "浏览"
#: ../plugins/core_preferences/core_prefs.plugin.in.h:1
-#, fuzzy
msgid "Core Preferences Plugin"
-msgstr "转换首选项"
+msgstr "核心插件选择"
#: ../plugins/core_preferences/core_prefs.plugin.in.h:2
-#, fuzzy
msgid "Modify Core Preferences"
-msgstr "转换首选项"
+msgstr "修改核心首选项"
#: ../plugins/core_preferences/core_prefs.xml.h:1
#: ../plugins/repository_editor/repository_editor.xml.h:1
msgid "..."
-msgstr ""
+msgstr "..."
#: ../plugins/core_preferences/core_prefs.xml.h:2
msgid "<b>Auto-Generated Playlists</b>"
-msgstr "<b>自动生成播放列表</b>"
+msgstr "<b>自动生成的播放列表</b>"
#: ../plugins/core_preferences/core_prefs.xml.h:3
msgid "<b>Compatible Formats</b>"
@@ -2470,18 +2432,16 @@ msgid "<b>On-the-fly Conversion</b>"
msgstr "<b>实时转换</b>"
#: ../plugins/core_preferences/core_prefs.xml.h:11
-#, fuzzy
msgid "<b>Preferred gain type</b>"
-msgstr "首选获取类型"
+msgstr "<b>首选获取类型</b>"
#: ../plugins/core_preferences/core_prefs.xml.h:12
msgid "<b>Tag Editing</b>"
msgstr "<b>编辑标签</b>"
#: ../plugins/core_preferences/core_prefs.xml.h:13
-#, fuzzy
msgid "<b>Tags</b>"
-msgstr "<b>n/a</b>"
+msgstr "<b>标签</b>"
#: ../plugins/core_preferences/core_prefs.xml.h:14
msgid "<b>Volume Normalization</b>"
@@ -2501,15 +2461,15 @@ msgstr "<i>mp3增益</i>调整："
#: ../plugins/core_preferences/core_prefs.xml.h:18
msgid "AAC"
-msgstr ""
+msgstr "AAC"
#: ../plugins/core_preferences/core_prefs.xml.h:19
msgid "About unupdated tracks"
-msgstr "未更新的音轨"
+msgstr "关于未更新的音轨"
#: ../plugins/core_preferences/core_prefs.xml.h:20
msgid "About updated tracks"
-msgstr "已更新的音轨"
+msgstr "关于已更新的音轨"
#: ../plugins/core_preferences/core_prefs.xml.h:21
msgid "Add cover art using file name template"
@@ -2535,11 +2495,11 @@ msgstr "允许重复文件"
#: ../plugins/core_preferences/core_prefs.xml.h:27
msgid "Also use this encoding when updating or synchronizing tracks"
-msgstr "当更新和同步时始终使用这种字符编码"
+msgstr "当更新和同步时同样使用这种字符编码"
#: ../plugins/core_preferences/core_prefs.xml.h:28
msgid "Also use this encoding when writing tracks"
-msgstr "当新建时始终使用这种字符编码"
+msgstr "当新建时同样使用这种字符编码"
#: ../plugins/core_preferences/core_prefs.xml.h:30
msgid "Automatically generate video thumbnails"
@@ -2559,16 +2519,15 @@ msgstr "确认同步时删除音轨"
#: ../plugins/core_preferences/core_prefs.xml.h:35
msgid "Confirm deletion of tracks:"
-msgstr "确认删除音轨"
+msgstr "确认删除音轨："
#: ../plugins/core_preferences/core_prefs.xml.h:36
-#, fuzzy
msgid "Conversion Preferences"
msgstr "转换首选项"
#: ../plugins/core_preferences/core_prefs.xml.h:37
msgid "Conversion Settings..."
-msgstr "转换设置"
+msgstr "转换设置..."
#: ../plugins/core_preferences/core_prefs.xml.h:38
msgid "Convert AAC (M4A)"
@@ -2587,21 +2546,20 @@ msgid "Convert compatible formats to a single format"
msgstr "转换兼容格式到单一格式"
#: ../plugins/core_preferences/core_prefs.xml.h:42
-#, fuzzy
msgid "Convert incompatible audio formats to:"
msgstr "转换不兼容音乐格式到："
#: ../plugins/core_preferences/core_prefs.xml.h:43
msgid "Cover Art Search Preferences"
-msgstr "插图搜索首选项"
+msgstr "艺术封面搜索首选项"
#: ../plugins/core_preferences/core_prefs.xml.h:44
msgid "Cover art file pattern:"
-msgstr "插图文件样式"
+msgstr "艺术封面文件的样式"
#: ../plugins/core_preferences/core_prefs.xml.h:45
msgid "Customize..."
-msgstr "定制"
+msgstr "定制..."
#: ../plugins/core_preferences/core_prefs.xml.h:46
msgid "Delete missing tracks when synchronizing playlists"
@@ -2609,7 +2567,7 @@ msgstr "同步播放列表时删除缺失的音轨"
#: ../plugins/core_preferences/core_prefs.xml.h:47
msgid "Display conversion log"
-msgstr "显示转换日志"
+msgstr "显示转换记录"
#: ../plugins/core_preferences/core_prefs.xml.h:48
msgid "Display information about detected duplicate files"
@@ -2675,7 +2633,7 @@ msgstr "包括\"评分最高的\"播放列表中从未使用的音轨"
#: ../plugins/core_preferences/core_prefs.xml.h:64
msgid "MP3"
-msgstr ""
+msgstr "MP3"
#: ../plugins/core_preferences/core_prefs.xml.h:65
msgid "Mass-modify tags when multiple tracks are selected"
@@ -2699,9 +2657,8 @@ msgid "Music"
msgstr "音乐"
#: ../plugins/core_preferences/core_prefs.xml.h:70
-#, fuzzy
msgid "Normalization..."
-msgstr "均衡化"
+msgstr "均衡化..."
#: ../plugins/core_preferences/core_prefs.xml.h:71
msgid ""
@@ -2725,7 +2682,7 @@ msgstr "覆盖已有标签"
#: ../plugins/core_preferences/core_prefs.xml.h:74
msgid "Parse file name to set missing tags"
-msgstr "检查文件名的缺失标签"
+msgstr "检查文件名以设置缺失的标签"
#: ../plugins/core_preferences/core_prefs.xml.h:76
#, no-c-format
@@ -2735,26 +2692,25 @@ msgid ""
"- %f: the input file\n"
"- %o: the output file (which is automatically generated)\n"
msgstr ""
-"指定生成视频文件缩略的shell命令。下面的这些格式串将被展开：- %f: 输入文件\n"
+"指定生成视频文件缩略的shell命令。下面的这些格式串将被展开：\n"
+"- %f: 输入文件\n"
"- %o: 输出文件（自动生成）\n"
#: ../plugins/core_preferences/core_prefs.xml.h:80
msgid "Read embedded cover art information"
-msgstr "读取嵌入的插图信息"
+msgstr "读取嵌入的艺术封面信息"
#: ../plugins/core_preferences/core_prefs.xml.h:81
msgid "Read embedded tags from music files"
msgstr "从音乐文件中读取嵌入的标签"
#: ../plugins/core_preferences/core_prefs.xml.h:82
-#, fuzzy
msgid "ReplayGain Preferences"
-msgstr "播放增益首选项"
+msgstr "重播增益的首选项"
#: ../plugins/core_preferences/core_prefs.xml.h:83
-#, fuzzy
msgid "ReplayGain..."
-msgstr "播放增益中"
+msgstr "重播增益..."
#: ../plugins/core_preferences/core_prefs.xml.h:84
msgid "Set still missing tags to file name"
@@ -2774,11 +2730,11 @@ msgid ""
"could result in tracks that are normalized to different levels until updated."
msgstr ""
"这些设置只会被应用到新添加或新更改的音轨。这会导致音轨被均衡到不同的水平上直"
-"到更新为止。"
+"到再次更新为止。"
#: ../plugins/core_preferences/core_prefs.xml.h:88
msgid "Threshold for import of tracks before a save triggered:"
-msgstr ""
+msgstr "触发保存前，导入音轨的阈值"
#: ../plugins/core_preferences/core_prefs.xml.h:90
msgid "Track gain (formerly \"radio gain\")"
@@ -2786,7 +2742,7 @@ msgstr "音轨增益"
#: ../plugins/core_preferences/core_prefs.xml.h:91
msgid "Transfer tracks in background mode"
-msgstr "在后台传输音轨"
+msgstr "在后台传输音轨的模式"
#: ../plugins/core_preferences/core_prefs.xml.h:92
msgid "Update information about the existing track"
@@ -2794,7 +2750,7 @@ msgstr "更新现有音轨的信息"
#: ../plugins/core_preferences/core_prefs.xml.h:93
msgid "Use legacy format for MP3 tags"
-msgstr "MP3标签采用老格式"
+msgstr "MP3标签采用旧式格式"
#: ../plugins/core_preferences/core_prefs.xml.h:94
msgid "Video Thumbnail Generation"
@@ -2802,7 +2758,7 @@ msgstr "生成视频缩略"
#: ../plugins/core_preferences/core_prefs.xml.h:95
msgid "Video thumbnailing program:"
-msgstr "生成视频缩略的程序："
+msgstr "视频缩略的程序："
#: ../plugins/core_preferences/core_prefs.xml.h:96
msgid ""
@@ -2815,10 +2771,17 @@ msgid ""
"The default is 10 so after 10 tracks have been added a save\n"
"will be imposed on the repository."
msgstr ""
+"在向仓库添加多个音轨时，如果发生错误，可能的情形是没有保存\n"
+"导致所有添加的音轨都将丢失。这一选项确保在处理一定数量音轨\n"
+"后指定一个保存操作。\n"
+"\n"
+"默认是10,因此每添加10个音轨就会对仓库执行一次保存操作。"
+
+
#: ../plugins/core_preferences/core_prefs.xml.h:104
msgid "When updating tracks, display information:"
-msgstr "当更新音轨时显示："
+msgstr "当更新音轨时显示信息："
#: ../plugins/core_preferences/core_prefs.xml.h:105
msgid "Write tags to disk when edited"
@@ -2852,14 +2815,13 @@ msgstr ""
"- 作曲: %c\n"
"- 歌曲: %t\n"
"- 风格: %G\n"
-"- track nr: %T\n"
-"- CD nr: %C\n"
+"- 音轨序号: %T\n"
+"- CD序号: %C\n"
"- 年代: %Y\n"
"- skip data: %*\n"
"- 特殊字符'%': %%."
#: ../plugins/core_preferences/core_prefs.xml.h:122
-#, fuzzy, no-c-format
msgid ""
"You can separate several templates by a ';'. The first one matching the "
"filename will be used.\n"
@@ -2905,27 +2867,23 @@ msgstr ""
"- 特殊字符'%': %%."
#: ../plugins/core_preferences/core_prefs.xml.h:141
-#, fuzzy
msgid "dB"
-msgstr "B"
+msgstr "dB"
#: ../plugins/core_preferences/plugin.c:65
-#, fuzzy
msgid "Core Preferences"
-msgstr "转换首选项"
+msgstr "核心首选项"
#: ../plugins/core_preferences/plugin.c:126
#: ../plugins/core_preferences/plugin.c:131
-#, fuzzy
msgid "Settings"
-msgstr "设定"
+msgstr "设置"
#: ../plugins/cover_display/cover_display.xml.h:1
msgid "<"
msgstr "<"
#: ../plugins/cover_display/cover_display.xml.h:2
-#, fuzzy
msgid "<b>Album Cover Sort Order</b>"
msgstr "<b>排列顺序</b>"
@@ -2968,16 +2926,15 @@ msgstr "背景颜色"
#: ../plugins/sorttab_display/sorttab_display.xml.h:24
#: ../plugins/track_display/track_display.xml.h:8
msgid "Case sensitive sorting"
-msgstr "区分大小写排序"
+msgstr "排序（区分大小写）"
#: ../plugins/cover_display/cover_display.xml.h:11
msgid "Choose a Different Colour for the CoverArt Display Background"
-msgstr "为插图背景选择颜色"
+msgstr "为封面艺术的背景选择颜色"
#: ../plugins/cover_display/cover_display.xml.h:12
-#, fuzzy
msgid "Cover Art Display"
-msgstr "<b>显示封面</b>"
+msgstr "显示封面艺术"
#: ../plugins/cover_display/cover_display.xml.h:13
msgid "Text color"
@@ -2986,21 +2943,19 @@ msgstr "文字颜色"
#: ../plugins/cover_display/cover_display_context_menu.c:40
#: ../plugins/clarity/clarity_context_menu.c:40
msgid "Select Cover From File"
-msgstr "从文件选择插图"
+msgstr "从文件选择封面"
#: ../plugins/cover_display/cover_display_context_menu.c:53
msgid "View Full Size Artwork"
-msgstr "查看全部插图"
+msgstr "查看全尺寸的封面"
#: ../plugins/cover_display/cover_display.plugin.in.h:1
-#, fuzzy
msgid "Cover Display Plugin"
-msgstr "<b>显示封面</b>"
+msgstr "封面显示插件"
#: ../plugins/cover_display/cover_display.plugin.in.h:2
-#, fuzzy
msgid "Display Cover Artwork of Tracks"
-msgstr "显示的音轨"
+msgstr "显示音轨的艺术封面"
#. Set the resolution in the label
#: ../plugins/cover_display/display_coverart.c:1454
@@ -3011,27 +2966,27 @@ msgstr "<b>图片尺寸： %d x %d</b>"
#: ../plugins/cover_display/display_coverart.c:1604
msgid "Failed to remove the album from the album hash store."
-msgstr "将专辑从album hash store删除失败。"
+msgstr "将专辑从album hash store移除失败。"
#: ../plugins/cover_display/display_coverart.c:1969
#: ../plugins/details_editor/details.c:1698
#: ../plugins/clarity/clarity_dnd_support.c:217
msgid "Item had to be downloaded but gtkpod was not compiled with curl."
-msgstr ""
+msgstr "需要下载但gtkpod编译时没有curl支持"
#: ../plugins/cover_display/display_coverart.c:1975
#, c-format
msgid "Error occurred dropping an image onto the coverart display: %s\n"
-msgstr "把图片作为插图显示时发生错误:%s\n"
+msgstr "把图片作为封面显示时发生错误:%s\n"
#: ../plugins/cover_display/display_coverart.c:2008
#: ../plugins/details_editor/details.c:1746
msgid "Successfully set new coverart for selected tracks"
-msgstr "成功为选定音轨设置新的插图"
+msgstr "成功为选定音轨设置新的封面艺术"
#: ../plugins/cover_display/fetchcover.c:149
msgid "Only jpg images are currently supported at this time\n"
-msgstr ""
+msgstr "当前只有jpg图像被支持\n"
#: ../plugins/cover_display/fetchcover.c:172
msgid "fetchcover curl data memory is NULL so failed to download anything!\n"
@@ -3090,7 +3045,7 @@ msgstr ""
#: ../plugins/details_editor/fetchcover.c:365
#: ../plugins/clarity/fetchcover.c:365
msgid "Cover art file already exists"
-msgstr "插图文件存在"
+msgstr "封面艺术文件已存在"
#: ../plugins/cover_display/fetchcover.c:367
#: ../plugins/details_editor/fetchcover.c:367
@@ -3111,67 +3066,58 @@ msgid "Abort"
msgstr "放弃"
#: ../plugins/cover_display/plugin.c:44
-#, fuzzy
msgid "Coverart Display"
-msgstr "<b>显示封面</b>"
+msgstr "显示封面艺术"
#: ../plugins/cover_display/plugin.c:77 ../plugins/coverweb/plugin.c:75
#: ../plugins/clarity/plugin.c:74
-#, fuzzy
msgid "Cover Display"
-msgstr "<b>显示封面</b>"
+msgstr "显示封面"
#: ../plugins/cover_display/plugin.c:102
-#, fuzzy
msgid " Cover Artwork"
-msgstr "浏览"
+msgstr " 封面艺术"
#. Translators: you may change the web address to get a localized page, if it exists
#: ../plugins/coverweb/coverweb.c:92
msgid "http://images.google.com"
-msgstr ""
+msgstr "http://images.google.com"
#: ../plugins/coverweb/coverweb.c:125
-#, fuzzy
msgid "Bookmarks"
-msgstr "<b>标签</b>"
+msgstr "书签"
#: ../plugins/coverweb/coverweb.xml.h:1
-#, fuzzy
msgid "<b>Bookmarks</b>"
-msgstr "<b>标签</b>"
+msgstr "<b>书签</b>"
#: ../plugins/coverweb/coverweb.xml.h:2
-#, fuzzy
msgid "Cover Browser"
-msgstr "浏览"
+msgstr "封面浏览"
#: ../plugins/coverweb/coverweb.plugin.in.h:1
-#, fuzzy
msgid "Cover Web Plugin"
-msgstr "插图"
+msgstr "封面的网络插件"
#: ../plugins/coverweb/coverweb.plugin.in.h:2
msgid "Web Browser for downloading Cover Artwork"
-msgstr ""
+msgstr "网络浏览器以下载封面艺术"
#: ../plugins/coverweb/coverweb_preferences.c:139
msgid "Bookmark Url"
-msgstr ""
+msgstr "URL保存为书签"
#: ../plugins/coverweb/coverweb_preferences.c:139
msgid "Please enter the full url of the bookmark"
-msgstr ""
+msgstr "请输入书签的完整URL"
#: ../plugins/coverweb/plugin.c:46
-#, fuzzy
msgid "Cover Web"
-msgstr "插图"
+msgstr "封面网络"
#: ../plugins/coverweb/plugin.c:94
-#, fuzzy
msgid " Cover Browser"
-msgstr "浏览"
+msgstr " 封面浏览"
#: ../plugins/details_editor/details.c:62
msgid "Audio/Video"
@@ -3229,12 +3175,10 @@ msgid ""
msgstr ""
#: ../plugins/details_editor/details.c:1294
-#, fuzzy
msgid "Tracks in details editor have been modified."
-msgstr "音轨最后被修改的日期和时间"
+msgstr "最后被编辑器处理的音轨"
#: ../plugins/details_editor/details.c:1435
-#, fuzzy
msgid " Edit Track Details"
msgstr "编辑音轨信息"
@@ -3261,77 +3205,71 @@ msgstr "详细"
#: ../plugins/details_editor/details_editor.xml.h:5
msgid "Set Cover Art from _File"
-msgstr "从文件设置插图"
+msgstr "从文件设置封面艺术(_F)"
#: ../plugins/details_editor/details_editor.xml.h:6
msgid "Undo _Track"
-msgstr "取消音轨"
+msgstr "取消音轨(_T)"
#: ../plugins/details_editor/details_editor.xml.h:7
msgid "_General"
-msgstr "通用"
+msgstr "通用(_G)"
#: ../plugins/details_editor/details_editor.xml.h:8
msgid "_Lyrics"
-msgstr "歌词"
+msgstr "歌词(_L)"
#: ../plugins/details_editor/details_editor.xml.h:9
msgid "_Misc."
-msgstr "杂项"
+msgstr "其他(_M)"
#: ../plugins/details_editor/details_editor.xml.h:10
msgid "_Podcasts"
-msgstr "Podcast"
+msgstr "Podcast(_P)"
#: ../plugins/details_editor/details_editor.xml.h:11
-#, fuzzy
msgid "_Remove Cover Art"
-msgstr "移除插图"
+msgstr "移除插图(_R)"
#: ../plugins/details_editor/details_editor.xml.h:12
msgid "_Sorting"
-msgstr "排序中"
+msgstr "排序中(_S)"
#: ../plugins/details_editor/details_editor.xml.h:13
msgid "_Undo All"
-msgstr "取消所有"
+msgstr "取消所有(_U)"
#: ../plugins/details_editor/details_editor.xml.h:14
msgid "_Video"
-msgstr "视频"
+msgstr "视频(_V)"
#: ../plugins/details_editor/details_editor.plugin.in.h:1
-#, fuzzy
msgid "Details Editor Plugin"
-msgstr "详细"
+msgstr "编辑器插件"
#: ../plugins/details_editor/details_editor.plugin.in.h:2
-#, fuzzy
msgid "Edit Track detail of Files"
msgstr "编辑音轨信息"
#: ../plugins/details_editor/plugin.c:64
-#, fuzzy
msgid "Details Editor"
-msgstr "详细"
+msgstr "编辑器"
#: ../plugins/exporter/exporter.plugin.in.h:1
-#, fuzzy
msgid "Export Tracks to File"
-msgstr "复制音轨到文件系统"
+msgstr "导出音轨到文件"
#: ../plugins/exporter/exporter.plugin.in.h:2
msgid "Exporter Plugin"
-msgstr ""
+msgstr "导出插件"
#: ../plugins/exporter/exporter.xml.h:1
msgid "<b>gtkpod Options</b>"
msgstr "<b>gtkpod选项</b>"
#: ../plugins/exporter/exporter.xml.h:2
-#, fuzzy
msgid "Check for existing files when copying from iPod"
-msgstr "当从iPod中复制文件时检查现有文件。"
+msgstr "从iPod中复制文件时检查文件是否存在"
#: ../plugins/exporter/exporter.xml.h:4
#, no-c-format
@@ -3343,7 +3281,7 @@ msgid ""
"nr: %C, year: %Y, original filename (requires extended information file): "
"%o, the character '%': %%."
msgstr ""
-"选择格式串确定如何显示info, 比如'%a/%A/%T - %t.mp3' 或者 '%o'。你可以用分号分"
+"选择格式串确定如何显示信息, 比如'%a/%A/%T - %t.mp3' 或者 '%o'。你可以用分号分"
"隔几个模板，gtkpod按照文件扩展信息选取对应的字段，艺术家: %a, 专辑: %A, 作"
"曲: %c, 歌曲: %t, 风格: %G, track nr: %T, CD nr: %C, 年: %Y, 原始文件名 (需要"
"文件扩展信息): %o, 字符 '%': %%."
@@ -3375,10 +3313,9 @@ msgstr "如果存在的话，播放列表中的音轨指向本地拷贝，否则
#: ../plugins/exporter/exporter.xml.h:9
msgid "Info field template:"
-msgstr "Info区模板:"
+msgstr "信息区域模板:"
#: ../plugins/exporter/exporter.xml.h:10
-#, fuzzy
msgid ""
"Normally the charset specified when first importing the track will be used "
"for the filename. If you set this option you can set a different charset "
@@ -3393,9 +3330,8 @@ msgstr ""
"使用指定字符集"
#: ../plugins/exporter/exporter.xml.h:11
-#, fuzzy
msgid "Playlist type:"
-msgstr "播放列表名："
+msgstr "播放列表类型："
#: ../plugins/exporter/exporter.xml.h:12
msgid "Source:"
@@ -3405,18 +3341,16 @@ msgstr "来源："
msgid ""
"The local copy of the track is referenced in the playlist. If the track is "
"not available locally, an error message is displayed."
-msgstr "播放列表中的音轨指向其本地拷贝，如果找不到文件则显示错误信息。"
+msgstr "播放列表中的音轨指向其本地拷贝，如果本地找不到音轨则显示错误信息。"
#: ../plugins/exporter/exporter.xml.h:14
msgid "The track on the iPod is referenced in the playlist file."
msgstr "播放列表指向iPod中的音轨"
#: ../plugins/exporter/exporter.xml.h:15
-#, fuzzy
msgid "Use selected charset (Preferences/Music/Encoding) for this filename"
-msgstr ""
-"文件名字符编码（首选项/'添加/更新/同步'）采用\n"
-" "
+msgstr "文件名采用编码（首选项/音乐/编码）"
+
#: ../plugins/exporter/exporter.xml.h:16
msgid ""
@@ -3426,28 +3360,28 @@ msgid ""
"skipped, allowing a quick sync of the iPod's contents."
msgstr ""
"当从iPod中复制时不会对目标文件存在与否进行检查，选择此选项后gtkpod就会检查目"
-"标文件的长度是否与iPod中的原始文件一致，如果这样，则忽略文件允许对iPod的内容"
-"快速同步。"
+"标文件的长度是否与iPod中的原始文件一致，因此可以忽略文件，从而可以对iPod的内"
+"容快速同步。"
#: ../plugins/exporter/exporter.xml.h:17
msgid "_Local"
-msgstr "本地"
+msgstr "本地(_L)"
#: ../plugins/exporter/exporter.xml.h:18
msgid "_M3U"
-msgstr "M3U"
+msgstr "M3U(_M)"
#: ../plugins/exporter/exporter.xml.h:19
msgid "_PLS"
-msgstr "PLS"
+msgstr "PLS(_P)"
#: ../plugins/exporter/exporter.xml.h:20
msgid "_Prefer Local"
-msgstr "本地偏好"
+msgstr "本地偏好(_P)"
#: ../plugins/exporter/exporter.xml.h:21
msgid "_iPod"
-msgstr "iPod"
+msgstr "iPod(_i)"
#: ../plugins/exporter/file_export.c:206
#, c-format
@@ -3474,53 +3408,49 @@ msgstr "复制'%s'到'%s'时发生错误(%s)\n"
#: ../plugins/playlist_display/playlist_display_actions.c:173
#, c-format
msgid "'%s'\n"
-msgstr ""
+msgstr "'%s'\n"
#: ../plugins/exporter/file_export.c:331
#, c-format
msgid "Failed to copy file %s. No error reported."
-msgstr ""
+msgstr "复制文件失败 %s，没有返回报告。"
#: ../plugins/exporter/file_export.c:344
-#, fuzzy, c-format
msgid "Could not find file for '%s' on the iPod\n"
-msgstr "无法找到iPod中'%s'的文件\n"
+msgstr "iPod中无法找到'%s'的文件\n"
#. gint id,
#. gboolean modal,
#: ../plugins/exporter/file_export.c:355
-#, fuzzy
msgid "Export Errors"
-msgstr "从数据库导出音轨"
+msgstr "导出错误"
#. title
#: ../plugins/exporter/file_export.c:356
msgid "Errors created by export"
-msgstr ""
+msgstr "导出时产生的错误"
#: ../plugins/exporter/file_export.c:477
-#, fuzzy, c-format
msgid ""
"Failed to write '%s-%s'\n"
"\n"
msgstr "写入'%s-%s'失败\n"
+"\n"
#: ../plugins/exporter/file_export.c:494
#, c-format
msgid "%d%% (%d:%02d:%02d left)"
-msgstr "%d%% (还需要%d:%02d:%02d)"
+msgstr "%d%% (剩余%d:%02d:%02d)"
#: ../plugins/exporter/file_export.c:503
-#, fuzzy, c-format
msgid "Exported %d of %d track."
msgid_plural "Exported %d of %d tracks."
-msgstr[0] "复制%2$d条音轨中的第%1$d条"
-msgstr[1] "复制%2$d条音轨中的第%1$d条"
+msgstr[0] "导出%2$d条音轨中的第%1$d条"
+msgstr[1] "导出%2$d条音轨中的第%1$d条"
#: ../plugins/exporter/file_export.c:511
-#, fuzzy
msgid "Some tracks were not exported."
-msgstr "部分音轨将不会被复制。"
+msgstr "部分音轨将不会被导出。"
#: ../plugins/exporter/file_export.c:570
msgid "Export from iPod database not possible in offline mode."
@@ -3544,7 +3474,7 @@ msgid ""
"included in the current drag and drop operation.\n"
"\n"
msgstr ""
-"部分音轨将不会被复制到你的硬盘，当前的拖拽操作只包括那些复制的音轨。\n"
+"部分音轨复制到你的硬盘，当前的拖拽操作只包括那些复制的音轨。\n"
"\n"
#: ../plugins/exporter/file_export.c:910
@@ -3553,7 +3483,7 @@ msgid ""
"No valid filename for: %s\n"
"\n"
msgstr ""
-"无有效文件名：%s\n"
+"无效文件名：%s\n"
"\n"
#: ../plugins/exporter/file_export.c:924
@@ -3577,35 +3507,32 @@ msgid "Create Playlist File"
msgstr "创建播放列表文件"
#: ../plugins/exporter/plugin.c:49
-#, fuzzy
msgid "_Export Tracks"
-msgstr "从数据库导出音轨"
+msgstr "导出音轨(_E)"
#. Action name
#. Stock icon
#: ../plugins/exporter/plugin.c:57
-#, fuzzy
msgid "Export Tracks To Playlist File..."
-msgstr "从数据库导出音轨"
+msgstr "从播放列表文件导出音轨..."
#. Action name
#. Stock icon
#: ../plugins/exporter/plugin.c:65
-#, fuzzy
msgid "Export Tracks To Filesystem..."
-msgstr "复制音轨到文件系统"
+msgstr "导出音轨到文件系统"
#: ../plugins/exporter/plugin.c:82
msgid "Exporter"
-msgstr ""
+msgstr "导出工具"
#: ../plugins/filetype_flac/filetype_flac.plugin.in.h:1
msgid "Flac File Type Plugin"
-msgstr ""
+msgstr "Flac文件插件"
#: ../plugins/filetype_flac/filetype_flac.plugin.in.h:2
msgid "Support for the flac file type"
-msgstr ""
+msgstr "支持flac文件类型"
#: ../plugins/filetype_flac/flacfile.c:58
#, c-format
@@ -3618,47 +3545,44 @@ msgid "Error retrieving tags for '%s'.\n"
msgstr "获取'%s'的标签时发生错误。\n"
#: ../plugins/filetype_flac/plugin.c:91
-#, fuzzy
msgid "Flac audio file type"
-msgstr "文件类型"
+msgstr "Flac音频文件"
#: ../plugins/filetype_m4a/filetype_m4a.plugin.in.h:1
msgid "M4A File Type Plugin"
-msgstr ""
+msgstr "M4A文件插件"
#: ../plugins/filetype_m4a/filetype_m4a.plugin.in.h:2
msgid "Support for the m4a / m4p file type"
-msgstr ""
+msgstr "支持m4a/m4p文件类型"
#: ../plugins/filetype_m4a/m4afile.c:49 ../plugins/filetype_mp4/mp4file.c:128
-#, fuzzy
msgid "AAC audio file"
-msgstr "文件类型"
+msgstr "AAC音频文件"
#: ../plugins/filetype_m4a/m4afile.c:53 ../plugins/filetype_mp4/mp4file.c:132
msgid "Protected AAC audio file"
-msgstr ""
+msgstr "受保护的AAC音频文件"
#: ../plugins/filetype_m4a/m4afile.c:57 ../plugins/filetype_mp4/mp4file.c:136
-#, fuzzy
msgid "AAC audio book file"
-msgstr "有声书"
+msgstr "AAC有声书"
#: ../plugins/filetype_m4a/m4afile.c:62 ../plugins/filetype_mp4/mp4file.c:141
msgid "MP4 video file"
-msgstr ""
+msgstr "MP4视频文件"
#: ../plugins/filetype_m4a/plugin.c:79
msgid "M4A audio file type"
-msgstr ""
+msgstr "M4a音频文件"
#: ../plugins/filetype_mp3/filetype_mp3.plugin.in.h:1
msgid "MP3 File Type Plugin"
-msgstr ""
+msgstr "MP3文件插件"
#: ../plugins/filetype_mp3/filetype_mp3.plugin.in.h:2
msgid "Support for the MP3 file type"
-msgstr ""
+msgstr "MP3文件支持"
#: ../plugins/filetype_mp3/mp3file.c:1247
#, c-format
@@ -3689,73 +3613,68 @@ msgstr "文件\"%s\"播放时间长度为0，忽略。\n"
#: ../plugins/filetype_mp3/plugin.c:78
msgid "MP3 audio file type"
-msgstr ""
+msgstr "MP3音频文件"
#: ../plugins/filetype_mp4/filetype_mp4.plugin.in.h:1
msgid "MP4 File Type Plugin"
-msgstr ""
+msgstr "MP4文件插件"
#: ../plugins/filetype_mp4/filetype_mp4.plugin.in.h:2
msgid "Support for the MP4 video file type"
-msgstr ""
+msgstr "MP4视频文件支持"
#: ../plugins/filetype_mp4/plugin.c:78
msgid "MP4 video file type"
-msgstr ""
+msgstr "MP4视频文件"
#: ../plugins/filetype_ogg/filetype_ogg.plugin.in.h:1
msgid "Ogg File Type Plugin"
-msgstr ""
+msgstr "Ogg文件插件"
#: ../plugins/filetype_ogg/filetype_ogg.plugin.in.h:2
msgid "Support for the Ogg file type"
-msgstr ""
+msgstr "Ogg文件支持"
#: ../plugins/filetype_ogg/oggfile.c:75
-#, fuzzy, c-format
msgid "'%s' does not appear to be an Ogg audio file.\n"
msgstr "'%s'似乎不是一个ogg音频文件。\n"
#: ../plugins/filetype_ogg/oggfile.c:81
-#, fuzzy
msgid "Ogg audio file"
-msgstr "文件类型"
+msgstr "Ogg音频文件"
#: ../plugins/filetype_ogg/plugin.c:90
-#, fuzzy
msgid "Ogg audio file type"
-msgstr "文件类型"
+msgstr "Ogg音频文件类型"
#: ../plugins/filetype_video/filetype_video.plugin.in.h:1
-#, fuzzy
msgid "Generic video file type"
-msgstr "文件类型"
+msgstr "通用视频文件类型"
#: ../plugins/filetype_video/filetype_video.plugin.in.h:2
msgid "Video File Type Plugin"
-msgstr ""
+msgstr "视频文件插件"
#: ../plugins/filetype_video/plugin.c:78
msgid "Generic Video file type"
-msgstr ""
+msgstr "通用视频文件类型"
#: ../plugins/filetype_wav/filetype_wav.plugin.in.h:1
msgid "Support for the wav file type"
-msgstr ""
+msgstr "wav文件支持"
#: ../plugins/filetype_wav/filetype_wav.plugin.in.h:2
msgid "Wav File Type Plugin"
-msgstr ""
+msgstr "Wav文件插件"
#: ../plugins/filetype_wav/plugin.c:90
msgid "Wav audio file type"
-msgstr ""
+msgstr "Wav音频文件类型"
#. change to kbps
#: ../plugins/filetype_wav/wavfile.c:165
-#, fuzzy
msgid "WAV audio file"
-msgstr "文件类型"
+msgstr "WAV音频文件"
#: ../plugins/filetype_wav/wavfile.c:176
#, c-format
@@ -3781,13 +3700,12 @@ msgid "TB"
msgstr "TB"
#: ../plugins/info_display/info_display.plugin.in.h:1
-#, fuzzy
msgid "Info Display Plugin"
-msgstr "显示"
+msgstr "显示插件"
#: ../plugins/info_display/info_display.plugin.in.h:2
msgid "Information dialog for connected iPods"
-msgstr ""
+msgstr "已连接的iPod信息"
#: ../plugins/info_display/infoview.c:49
msgid ""
@@ -3873,21 +3791,18 @@ msgid "offline"
msgstr "离线"
#: ../plugins/info_display/infoview.c:206
-#, fuzzy
msgid " Repository Information"
-msgstr "音乐库选项"
+msgstr "音乐库信息"
#. Action name
#. Stock icon
#: ../plugins/info_display/plugin.c:48
-#, fuzzy
msgid "_Open Repository Information View"
-msgstr "音乐库选项"
+msgstr "查看音乐库信息(_O)"
#: ../plugins/info_display/plugin.c:64
-#, fuzzy
msgid "Info Display"
-msgstr "显示"
+msgstr "显示信息"
#: ../plugins/media_player/media_player.c:104
#, c-format
@@ -3896,9 +3811,8 @@ msgstr ""
#. title by artist from album
#: ../plugins/media_player/media_player.c:140
-#, fuzzy
msgid "No Track Title"
-msgstr "按歌曲排序"
+msgstr "没有音轨标题"
#: ../plugins/media_player/media_player.c:145
#, c-format
@@ -3906,9 +3820,8 @@ msgid "<b>%s</b> by %s from %s"
msgstr ""
#: ../plugins/media_player/media_player.c:147
-#, fuzzy, c-format
msgid "<b>%s</b> by %s"
-msgstr "<b>标签</b>"
+msgstr ""
#: ../plugins/media_player/media_player.c:149
#, c-format
@@ -3919,64 +3832,60 @@ msgstr ""
#: ../plugins/media_player/media_player.c:280
#, c-format
msgid "GStreamer thread creation failed: %s\n"
-msgstr ""
+msgstr "创建GStreamer线程失败：%s\n"
#: ../plugins/media_player/media_player.c:337
msgid "Seek failed!\n"
-msgstr ""
+msgstr "寻址失败!\n"
#. Translators: %s is an error message
#: ../plugins/media_player/media_player.c:390
-#, fuzzy, c-format
msgid "Failed to play track: %s"
-msgstr "设置插图失败：'%s'\n"
+msgstr "播放音轨失败：%s"
#: ../plugins/media_player/media_player.c:397
msgid ""
"Failed to play track: Cannot create a play element. Ensure that all "
"gstreamer plugins are installed"
msgstr ""
+"播放音轨失败：无法创建播放单元，请确保安装了所有的gstreamer插件"
+""
#: ../plugins/media_player/media_player.xml.h:1
msgid "Next"
-msgstr ""
+msgstr "下一首"
#: ../plugins/media_player/media_player.xml.h:2
#: ../plugins/media_player/plugin.c:139
-#, fuzzy
msgid "Play"
-msgstr "已播放"
+msgstr "播放"
#: ../plugins/media_player/media_player.xml.h:3
msgid "Previous"
-msgstr ""
+msgstr "上一首"
#. Change the label to Stop while extracting
#. TODO: find out why GTK+ needs this to work (see #364371)
#: ../plugins/media_player/media_player.xml.h:4
#: ../plugins/sjcd/sj-extracting.c:838
-#, fuzzy
msgid "Stop"
-msgstr "至"
+msgstr "停止"
#: ../plugins/media_player/media_player.plugin.in.h:1
msgid "Controls for playing tracks and videos"
-msgstr ""
+msgstr "控制台"
#: ../plugins/media_player/media_player.plugin.in.h:2
-#, fuzzy
msgid "Media Player Plugin"
-msgstr "媒体类型"
+msgstr "Media Player插件"
#: ../plugins/media_player/plugin.c:66
-#, fuzzy
msgid "Media Player"
-msgstr "媒体类型"
+msgstr "Media Player"
#: ../plugins/media_player/plugin.c:91
-#, fuzzy
msgid " Media Player"
-msgstr "媒体类型"
+msgstr " Media Player"
#: ../plugins/mserv/mserv.c:53
#, c-format
@@ -4019,7 +3928,7 @@ msgstr "获取mserv数据%s"
#: ../plugins/mserv/mserv.c:218
msgid "no filename available"
-msgstr "没有现成文件名"
+msgstr "没有可用文件名"
#: ../plugins/mserv/mserv.c:223
msgid "Updated selected tracks with data from mserv."
@@ -4027,21 +3936,20 @@ msgstr "以mserv的数据更新选定音轨。"
#: ../plugins/mserv/mserv.plugin.in.h:1
msgid "Mserv Jukebox Plugin"
-msgstr ""
+msgstr "Mserv Jukebox插件"
#: ../plugins/mserv/mserv.plugin.in.h:2
msgid "Mserv is a jukebox-style music server (see http://www.mserv.org)"
-msgstr ""
+msgstr "Mserv是一个jukebox式的音乐服务器(http://www.mserv.org)"
#: ../plugins/mserv/mserv.xml.h:1
-#, fuzzy
msgid "<b>Settings</b>"
-msgstr "<b>mserv选项</b>"
+msgstr "<b>设置</b>"
#: ../plugins/mserv/mserv.xml.h:2 ../plugins/mserv/plugin.c:47
#: ../plugins/mserv/plugin.c:96
msgid "Mserv"
-msgstr ""
+msgstr "Mserv"
#: ../plugins/mserv/mserv.xml.h:3
msgid "Music root:"
@@ -4052,19 +3960,20 @@ msgid "Report problems when accessing mserv"
msgstr "连接mserv时报告问题"
#: ../plugins/mserv/mserv.xml.h:5
-#, fuzzy
msgid ""
"To fill additional information, <i>gtkpod</i> can use a database \n"
"provided by the <i>mserv</i> music server.\n"
"\n"
"More details on mserv can be found at <b>http://www.mserv.org</b>"
msgstr ""
-"填写更多信息，<i>gtkpod</i>可以保存在<i>mserv</i>音乐数据库，如果你不知道什么"
-"是<i>mserv</i>，请留空。"
+"填写更多信息，<i>gtkpod</i>可以保存在<i>mserv</i>音乐服务的数\n"
+"据库上\n"
+"\n"
+"有关mserv的更多信息，请参看<b>http://www.mserv.org</b>"
#: ../plugins/mserv/mserv.xml.h:9
msgid "Use mserv database to fill track information"
-msgstr "用mserv数据库填写音轨信息"
+msgstr "用mserv数据填写音轨信息"
#: ../plugins/mserv/mserv.xml.h:10
msgid "Username:"
@@ -4075,25 +3984,21 @@ msgid "mserv root:"
msgstr "mserv根目录："
#: ../plugins/mserv/plugin.c:57
-#, fuzzy
msgid "_Update mserv Data from File"
-msgstr "从文件更新mserv数据"
+msgstr "从文件更新mserv数据(_U)"
#: ../plugins/mserv/plugin.c:65 ../plugins/playlist_display/plugin.c:276
#: ../plugins/playlist_display/plugin.c:300
-#, fuzzy
msgid "Selected Playlist"
-msgstr "选定播放列表"
+msgstr "选定的播放列表"
#: ../plugins/mserv/plugin.c:73 ../plugins/track_display/plugin.c:64
-#, fuzzy
msgid "Selected Tracks"
msgstr "选定音轨"
#: ../plugins/photo_editor/display_photo.c:163
-#, fuzzy
msgid " iPod Photo Editor"
-msgstr "照片窗口"
+msgstr " iPod照片编辑器"
#: ../plugins/photo_editor/display_photo.c:225
#: ../plugins/photo_editor/display_photo.c:1483
@@ -4136,7 +4041,7 @@ msgstr "新照片簿的名称"
#: ../plugins/photo_editor/display_photo.c:849
msgid "Please enter a new name for the photo album"
-msgstr "请为照片簿输入新名称"
+msgstr "请为照片簿输入新的名称"
#: ../plugins/photo_editor/display_photo.c:857
#: ../plugins/photo_editor/display_photo.c:1044
@@ -4161,7 +4066,7 @@ msgstr "将图片添加到iPod"
#: ../plugins/photo_editor/display_photo.c:1129
msgid "Add a Directory of Images to the iPod. Select the Directory."
-msgstr "添加图片到iPod，请选择目录。"
+msgstr "将目录内的图片添加到iPod，请选择目录。"
#: ../plugins/photo_editor/display_photo.c:1498
#, c-format
@@ -4170,12 +4075,11 @@ msgstr "<无成员>\n"
#: ../plugins/photo_editor/photo_editor.xml.h:1
msgid "Add Image_s"
-msgstr "添加图像"
+msgstr "添加图像(_s)"
#: ../plugins/photo_editor/photo_editor.xml.h:2
-#, fuzzy
msgid "Photo Image"
-msgstr "照片簿"
+msgstr "照片"
#: ../plugins/photo_editor/photo_editor.xml.h:3
msgid "Photo Window"
@@ -4183,44 +4087,43 @@ msgstr "照片窗口"
#: ../plugins/photo_editor/photo_editor.xml.h:4
msgid "R_ename Album"
-msgstr "重命名专辑"
+msgstr "重命名照片补簿(_e)"
#: ../plugins/photo_editor/photo_editor.xml.h:5
msgid "_Add Album"
-msgstr "新增专辑"
+msgstr "新增照片簿(_A)"
#: ../plugins/photo_editor/photo_editor.xml.h:6
msgid "_Add Image"
-msgstr "新增图像"
+msgstr "新增相片(_A)"
#: ../plugins/photo_editor/photo_editor.xml.h:7
msgid "_Album"
-msgstr "专辑"
+msgstr "照片簿(_A)"
#: ../plugins/photo_editor/photo_editor.xml.h:8
msgid "_Photos"
-msgstr "照片"
+msgstr "照片(_P)"
#: ../plugins/photo_editor/photo_editor.xml.h:9
msgid "_Remove Album"
-msgstr "移除专辑"
+msgstr "移除照片簿(_R)"
#: ../plugins/photo_editor/photo_editor.xml.h:10
msgid "_Remove Images"
-msgstr "移除图像"
+msgstr "移除照片(_R)"
#: ../plugins/photo_editor/photo_editor.xml.h:11
-#, fuzzy
msgid "_View Full Size"
-msgstr "查看整个文件"
+msgstr "查看整个文件(_V)"
#: ../plugins/photo_editor/photo_editor.xml.h:12
msgid "_Zoom"
-msgstr "缩放"
+msgstr "缩放(_Z)"
#: ../plugins/photo_editor/photo_editor_context_menu.c:47
msgid "Remove Album"
-msgstr "删除专辑"
+msgstr "删除照片簿"
#: ../plugins/photo_editor/photo_editor_context_menu.c:57
msgid "Remove Photo"
@@ -4228,29 +4131,26 @@ msgstr "删除照片"
#: ../plugins/photo_editor/photo_editor_context_menu.c:78
msgid "Rename Album"
-msgstr "重命名专辑"
+msgstr "重命名照片簿"
#: ../plugins/photo_editor/photo_editor.plugin.in.h:1
-#, fuzzy
msgid "Add and Remove Photographs"
-msgstr "删除照片"
+msgstr "添加和删除相片"
#: ../plugins/photo_editor/photo_editor.plugin.in.h:2
-#, fuzzy
msgid "Photo Editor Plugin"
-msgstr "照片窗口"
+msgstr "照片编辑插件"
#. Action name
#. Stock icon
#: ../plugins/photo_editor/plugin.c:49
#: ../plugins/playlist_display/playlist_display_context_menu.c:301
msgid "Open Photo Editor"
-msgstr ""
+msgstr "打开图像编辑器"
#: ../plugins/photo_editor/plugin.c:71
-#, fuzzy
msgid "Photo Editor"
-msgstr "照片窗口"
+msgstr "照片编辑器"
#. DND between different itdbs
#. Do not allow drags from the iPod in offline mode
@@ -4308,22 +4208,20 @@ msgid "<b>General Options</b>"
msgstr "<b>通用选项</b>"
#: ../plugins/playlist_display/playlist_display.xml.h:6
-#, fuzzy
msgid "<b>Playlist Sort Order</b>"
-msgstr "<b>排列顺序</b>"
+msgstr "<b>播放列表排序</b>"
#: ../plugins/playlist_display/playlist_display.xml.h:7
msgid "<b>Rules</b>"
msgstr "<b>规则</b>"
#: ../plugins/playlist_display/playlist_display.xml.h:8
-#, fuzzy
msgid "All rules"
-msgstr "所有音轨"
+msgstr "所有规则"
#: ../plugins/playlist_display/playlist_display.xml.h:9
msgid "Any rules"
-msgstr ""
+msgstr "任一规则"
#: ../plugins/playlist_display/playlist_display.xml.h:11
#: ../plugins/sorttab_display/sorttab_display.xml.h:30
@@ -4333,19 +4231,19 @@ msgid ""
"sorting will not work well with most charsets."
msgstr ""
"如果选择，则排序时区分大小写，但是注意区分大小写排序在大多数字符集上无法正常"
-"工作"
+"工作。"
#: ../plugins/playlist_display/playlist_display.xml.h:12
msgid "Ignore rules"
-msgstr ""
+msgstr "忽略规则"
#: ../plugins/playlist_display/playlist_display.xml.h:13
msgid "Live _updating"
-msgstr "在线更新"
+msgstr "在线更新(_u)"
#: ../plugins/playlist_display/playlist_display.xml.h:14
msgid "Match only _checked tracks"
-msgstr "只匹配选择的音轨"
+msgstr "只匹配选择的音轨(_c)"
#: ../plugins/playlist_display/playlist_display.xml.h:15
msgid "Match:"
@@ -4354,9 +4252,8 @@ msgstr "匹配："
#: ../plugins/playlist_display/playlist_display.xml.h:16
#: ../plugins/playlist_display/plugin.c:50
#: ../plugins/playlist_display/plugin.c:342
-#, fuzzy
msgid "Playlist Display"
-msgstr "播放列表"
+msgstr "显示播放列表"
#: ../plugins/playlist_display/playlist_display.xml.h:17
msgid "Playlist name:"
@@ -4374,30 +4271,28 @@ msgstr "按此排序："
#: ../plugins/playlist_display/playlist_display.xml.h:20
msgid "_Limit to"
-msgstr "限制"
+msgstr "限制(_L)"
#: ../plugins/playlist_display/playlist_display_actions.c:66
#: ../plugins/playlist_display/playlist_display_actions.c:321
#: ../plugins/sjcd/sj-extracting.c:607
-#, fuzzy, c-format
msgid "%s\n"
-msgstr "%s - %s"
+msgstr "%s\n"
#. gint id,
#. gboolean modal,
#: ../plugins/playlist_display/playlist_display_actions.c:91
msgid "Directory Addition Errors"
-msgstr ""
+msgstr "添加目录错误"
#. title
#: ../plugins/playlist_display/playlist_display_actions.c:92
-#, fuzzy
msgid " Some directories were not added successfully"
msgstr "部分文件没有添加成功"
#: ../plugins/playlist_display/playlist_display_actions.c:105
msgid "Some directories failed to be added but no errors were reported."
-msgstr ""
+msgstr "部分目录添加失败但是没有返回错误"
#: ../plugins/playlist_display/playlist_display_actions.c:128
#: ../plugins/playlist_display/playlist_display_actions.c:268
@@ -4407,25 +4302,24 @@ msgstr "在添加音轨之前请先选择一个播放列表或者音乐库。"
#: ../plugins/playlist_display/playlist_display_actions.c:133
msgid "Add Folder"
-msgstr "添加目录"
+msgstr "添加文件夹"
#. gint id,
#. gboolean modal,
#: ../plugins/playlist_display/playlist_display_actions.c:198
msgid "Playlist Addition Errors"
-msgstr ""
+msgstr "添加播放列表错误"
#. title
#: ../plugins/playlist_display/playlist_display_actions.c:199
-#, fuzzy
msgid "Some tracks in the playlist were not added successfully"
-msgstr "部分文件没有添加成功"
+msgstr "播放列表的部分音轨没有添加成功"
#: ../plugins/playlist_display/playlist_display_actions.c:212
#: ../plugins/playlist_display/playlist_display_actions.c:364
#: ../plugins/sjcd/sj-extracting.c:657
msgid "Some tracks failed to be added but no errors were reported."
-msgstr ""
+msgstr "部分音轨添加失败但是没有返回错误"
#: ../plugins/playlist_display/playlist_display_actions.c:276
#: ../plugins/playlist_display/playlist_display_actions.c:400
@@ -4443,7 +4337,7 @@ msgstr "添加播放列表到'%s'"
#: ../plugins/playlist_display/playlist_display_actions.c:350
#: ../plugins/sjcd/sj-extracting.c:643
msgid "File Addition Errors"
-msgstr ""
+msgstr "添加文件错误"
#. title
#: ../plugins/playlist_display/playlist_display_actions.c:351
@@ -4491,7 +4385...
[truncated message content] |
|
From: phantomjinx <pha...@us...> - 2012-10-06 19:57:08
|
commit 04b931cd04e8672b0dcfde0bb09a47260efacbff
Author: phantomjinx <p.g...@ph...>
Date: Sat Oct 6 20:54:44 2012 +0100
Fix for error caught by turning on error=format-security
* configure.ac
* Leave error trapping switched on to trap further errors.
* Thanks to Brent <we...@ai...> for the report and fix.
configure.ac | 2 +-
plugins/clarity/clarity_cover.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index f2d83c7..692a78f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -124,7 +124,7 @@ dnl else
dnl fi
dnl Force C99 mode (no implicit int declarations)
-CFLAGS="$CFLAGS -std=gnu99 -Werror-implicit-function-declaration"
+CFLAGS="$CFLAGS -std=gnu99 -Werror-implicit-function-declaration -Werror=format-security"
CFLAGS="$CFLAGS $GTK_CFLAGS $GLIB_CFLAGS $GDK_CFLAGS $GMODULE_CFLAGS $GTHREAD_CFLAGS $LIBGLADE_CFLAGS $LIBGPOD_CFLAGS $LIBANJUTA_CFLAGS $LIBGDL_CFLAGS $LIBXML_CFLAGS $ID3TAG_CFLAGS $GTK_CLEANLINESS_FLAGS"
LIBS="$LIBS $GTK_LIBS $GLIB_LIBS $GDK_LIBS $GMODULE_LIBS $GTHREAD_LIBS $LIBGLADE_LIBS $LIBGPOD_LIBS $LIBANJUTA_LIBS $LIBGDL_LIBS $LIBXML_LIBS $ID3TAG_LIBS"
diff --git a/plugins/clarity/clarity_cover.c b/plugins/clarity/clarity_cover.c
index 32e3943..68699fd 100644
--- a/plugins/clarity/clarity_cover.c
+++ b/plugins/clarity/clarity_cover.c
@@ -241,7 +241,7 @@ void clarity_cover_set_album_item (ClarityCover *self, AlbumItem *item) {
// Set cover artwork
gtk_clutter_texture_set_from_pixbuf (GTK_CLUTTER_TEXTURE(priv->texture), item->albumart, &error);
if (error) {
- g_warning(error->message);
+ g_warning("%s", error->message);
g_error_free(error);
return;
}
|
|
From: dforsi <df...@us...> - 2012-08-30 15:48:42
|
commit 14272c4da3bb02206d817dc7ccab21e047e2381e
Author: Daniele Forsi <da...@fo...>
Date: Thu Aug 30 11:40:48 2012 +0200
trivial: remove duplicated NULL check
The same check is performed just above this one.
Found with coccicheck by the coccinelle project
http://coccinelle.lip6.fr/coccicheck.php
plugins/track_display/rb_rating_helper.c | 4 ----
1 files changed, 0 insertions(+), 4 deletions(-)
---
diff --git a/plugins/track_display/rb_rating_helper.c b/plugins/track_display/rb_rating_helper.c
index b953701..fbcf4dd 100644
--- a/plugins/track_display/rb_rating_helper.c
+++ b/plugins/track_display/rb_rating_helper.c
@@ -153,10 +153,6 @@ rb_rating_render_stars (GtkWidget *widget,
return FALSE;
}
- if (buf == NULL) {
- return FALSE;
- }
-
if (rtl) {
star_offset = (RB_RATING_MAX_SCORE - i - 1) * icon_width;
} else {
|
|
From: phantomjinx <pha...@us...> - 2012-08-06 10:23:29
|
commit 3b069f77a5022a4779ee7e473656b9c7938c1be6
Author: phantomjinx <p.g...@ph...>
Date: Mon Aug 6 09:58:02 2012 +0100
fix m4a track length value
* The duration value read by atomic parsley is stored in the mp4 in its
moov->mdia->timescale atom. The duration must be divided by this value
to get the duration in seconds. In addition, gtkpod stores the track
length in ms so the duration must be multiplied by 1000.
* Fixes #3537899
https://sourceforge.net/tracker/?func=detail&atid=519273&aid=3537899&group_id=67873
libs/atomic-parsley/AtomicParsleyBridge.cpp | 11 ++++++++---
1 files changed, 8 insertions(+), 3 deletions(-)
---
diff --git a/libs/atomic-parsley/AtomicParsleyBridge.cpp b/libs/atomic-parsley/AtomicParsleyBridge.cpp
index 4fe40f5..052f47f 100644
--- a/libs/atomic-parsley/AtomicParsleyBridge.cpp
+++ b/libs/atomic-parsley/AtomicParsleyBridge.cpp
@@ -156,13 +156,18 @@ void AP_read_metadata(const char *filePath, Track *track) {
&& ((info->track_type & AUDIO_TRACK) || (info->track_type & VIDEO_TRACK)
|| (info->track_type & DRM_PROTECTED_TRACK))) {
- track->tracklen = info->duration;
+ /*
+ * the info->duration is in the track's timescale units so must be divided by that
+ * value to get seconds, while track->tracklen in gtkpod is in ms
+ */
+ float duration = ((float) info->duration / (float) info->parent->movie_info->timescale) * 1000;
+ track->tracklen = (gint32) duration;
+
track->bitrate = APar_calculate_bitrate(info);
track->samplerate = info->media_sample_rate;
}
audio_or_video_found = TRUE;
-
}
if (prefs_get_int("readtags")) {
@@ -661,7 +666,7 @@ void AP_write_metadata(Track *track, const char *filePath, GError **error) {
g_remove(tmp_file);
}
else {
- gtkpod_log_error(error, g_strdup_printf(_("ERROR failed to change track file's artwork.")));
+ gtkpod_log_error(error, g_strdup_printf(_("ERROR failed to change track file's artwork.") ));
g_error_free(pixbuf_err);
return;
}
|
|
From: phantomjinx <pha...@us...> - 2012-08-01 21:12:05
|
commit 390afeb01a48e206e592afc2b8567741ddf83970
Author: phantomjinx <p.g...@ph...>
Date: Wed Aug 1 22:09:05 2012 +0100
Fix configure script to properly handle 'without' switches
* --without-* switches are available for flac, ogg and curl libraries. This
corrects the logic so that configuration can continue if these libraries
are specifically excluded.
configure.ac | 15 ++++++++-------
1 files changed, 8 insertions(+), 7 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index e0dcee1..f2d83c7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -189,9 +189,9 @@ fi
dnl Check for libcurl
dnl -------------------------------------------------------------
-AC_ARG_WITH(curl, AS_HELP_STRING([--without-curl],[Disable coverart download support]))
+AC_ARG_WITH(curl, AS_HELP_STRING([--without-curl], [Disable coverart download support]), [], [with_curl=yes])
if test "x$with_curl" != "xno" -a "x$have_curl" = "xno"; then
- AC_MSG_ERROR([curl support explicitly requested but curl could not be found])
+ AC_MSG_ERROR([The curl library could not be found. Explicity disable support by rerunning with --without-curl])
fi
AM_CONDITIONAL(HAVE_CURL, test "x$have_curl" = "xyes")
@@ -287,10 +287,11 @@ fi
dnl Checks for filetype_ogg plugin
dnl -------------------------------------------------------------
-AC_ARG_WITH(ogg, AS_HELP_STRING([--without-ogg],[Disable Ogg/Vorbis support]))
+AC_ARG_WITH(ogg, AS_HELP_STRING([--without-ogg], [Disable Ogg/Vorbis support]), [], [with_ogg=yes])
if test "x$with_ogg" != "xno" -a "x$have_vorbis" = "xno"; then
- AC_MSG_ERROR([Ogg/Vorbis support explicitly requested but ogg/vorbis libs could not be found])
+ AC_MSG_ERROR([Ogg/Vorbis libraries could not be found. Explicitly disable support by rerunning with --without-ogg])
fi
+
AM_CONDITIONAL(HAVE_PLUGIN_FILETYPE_OGG, test "x$have_vorbis" = "xyes")
if test "x$have_vorbis" = "xyes"; then
AC_DEFINE(HAVE_PLUGIN_FILETYPE_OGG, 1, [Define if you have the ogg/vorbis support])
@@ -299,9 +300,9 @@ fi
dnl Checks for filetype_flac plugin
dnl -------------------------------------------------------------
-AC_ARG_WITH(flac, AS_HELP_STRING([--without-flac],[Disable FLAC support]))
-if test "xwith_flac" = "xyes" -a "x$have_flac" = "xno"; then
- AC_MSG_ERROR([FLAC support explicitly requested but flac libs could not be found])
+AC_ARG_WITH(flac, AS_HELP_STRING([--without-flac], [Disable FLAC support]), [], [with_flac=yes])
+if test "x$with_flac" != "xno" -a "x$have_flac" = "xno"; then
+ AC_MSG_ERROR([The FLAC library could not be found. Explicitly disable support by rerunning with --without-flac])
fi
AM_CONDITIONAL(HAVE_PLUGIN_FILETYPE_FLAC, test "x$have_flac" = "xyes")
if test "x$have_flac" = "xyes"; then
|
|
From: phantomjinx <pha...@us...> - 2012-07-29 19:01:04
|
commit 967887e0b02a88e3585f3f22683d75d05730ad55
Author: Jonathan Neuschäfer <j.n...@gm...>
Date: Sun Jul 29 20:00:14 2012 +0100
INSTALL: fix indentation in the Optional Packages section
INSTALL | 60 ++++++++++++++++++++++++++++++------------------------------
1 files changed, 30 insertions(+), 30 deletions(-)
---
diff --git a/INSTALL b/INSTALL
index a737c78..b0833d3 100644
--- a/INSTALL
+++ b/INSTALL
@@ -29,36 +29,36 @@ How to compile/install gtkpod:
libid3tag (at least 0.15)
libgnome-vfs-2.0 > 2.6 (for iPod autodetection under GNOME)
- Optional Packages
-
- For web browser plugin:
- webkitgtk (version 1 or 3 depending on version of gtk)
-
- For audio player plugin:
- gstreamer
- gstreamer-base
- gstreamer-plugins-base
- gstreamer-interfaces
- gstreamer-plugins (plugins to support mp3 / mp4 playback)
- gstreamer-pbutils
-
- For filetype conversion:
- flac
- libogg
- libvorbis
- lame
- faad2
-
- For opengl coverart display (clarity) plugin:
- clutter-gtk
-
- For download of coverart:
- libcurl
-
- For sjcd (sound-juicer) plugin:
- libcanberra
- libbrasero-media3
- musicbrainz3
+ Optional Packages
+
+ For web browser plugin:
+ webkitgtk (version 1 or 3 depending on version of gtk)
+
+ For audio player plugin:
+ gstreamer
+ gstreamer-base
+ gstreamer-plugins-base
+ gstreamer-interfaces
+ gstreamer-plugins (plugins to support mp3 / mp4 playback)
+ gstreamer-pbutils
+
+ For filetype conversion:
+ flac
+ libogg
+ libvorbis
+ lame
+ faad2
+
+ For opengl coverart display (clarity) plugin:
+ clutter-gtk
+
+ For download of coverart:
+ libcurl
+
+ For sjcd (sound-juicer) plugin:
+ libcanberra
+ libbrasero-media3
+ musicbrainz3
The following can be used for installing the dependencies on ubuntu 11.10:
|
|
From: dforsi <df...@us...> - 2012-07-14 15:44:58
|
commit c3439ae3dd1a00db3c4de3130501edb92edbb28f
Author: Daniele Forsi <da...@fo...>
Date: Sat Jul 14 17:44:09 2012 +0200
Small fix to Italian translation
po/it.po | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
---
diff --git a/po/it.po b/po/it.po
index 7030d24..61a3af3 100644
--- a/po/it.po
+++ b/po/it.po
@@ -6066,7 +6066,7 @@ msgstr "<b>Comando riproduttore</b>"
#: ../plugins/external_player/external_player.plugin.in.h:1
msgid "External Media Player Plugin"
-msgstr "Plugin Riproduttore multimediale esterno"
+msgstr "Plugin riproduttore multimediale esterno"
#: ../plugins/external_player/external_player.plugin.in.h:2
msgid "Adds track command for playing tracks in external player, eg. xmms"
|
|
From: dforsi <df...@us...> - 2012-07-14 15:44:52
|
commit da1576970b2137d35e1e30679e8681b7874a0e21
Author: Daniele Forsi <da...@fo...>
Date: Sat Jul 14 16:26:40 2012 +0200
Fix adding more sort tabs
Do not store a pointer to a local variable on the caller's stack.
In the following backtrace by chance the same memory area was reused by another filename.
Fixes:
** (lt-gtkpod:15891): ERROR **: Failed to create builder from file /home/daniele/gtkpod/gtkpod/plugins/libtrack_display.so: Errore alla riga 1 carattere 1: Il documento deve iniziare con un elemento (es. <book>)
Program received signal SIGTRAP, Trace/breakpoint trap.
0xb74a8f81 in g_logv () from /lib/i386-linux-gnu/libglib-2.0.so.0
(gdb) bt
#0 0xb74a8f81 in g_logv () from /lib/i386-linux-gnu/libglib-2.0.so.0
#1 0xb74a90c3 in g_log () from /lib/i386-linux-gnu/libglib-2.0.so.0
#2 0xb7fc112d in gtkpod_builder_xml_new (filepath=filepath@entry=0x841b550 "/home/daniele/gtkpod/gtkpod/plugins/libtrack_display.so")
at misc.c:1210
#3 0xaf1bab3b in special_sort_tab_page_new (st_widget_parent=st_widget_parent@entry=0x840e3a8,
glade_file_path=0x841b550 "/home/daniele/gtkpod/gtkpod/plugins/libtrack_display.so") at special_sorttab_page.c:505
#4 0xaf1be18f in _sort_tab_widget_init_page (st_cat=ST_CAT_SPECIAL, self=0x840e3a8) at sorttab_widget.c:227
#5 sort_tab_widget_new (inst=inst@entry=2, parent=0x8af0710,
glade_xml_path=0x841b550 "/home/daniele/gtkpod/gtkpod/plugins/libtrack_display.so") at sorttab_widget.c:336
#6 0xaf1bf8bf in sorttab_display_append_widget () at display_sorttabs.c:145
#7 0xaf1bffa0 in sorttab_display_preference_changed_cb (app=app@entry=0x838f008, pfname=0xaf1c4955, value=0x3, data=0x0) at display_sorttabs.c:354
plugins/sorttab_display/sorttab_widget.c | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
---
diff --git a/plugins/sorttab_display/sorttab_widget.c b/plugins/sorttab_display/sorttab_widget.c
index 8a74ac6..d076946 100644
--- a/plugins/sorttab_display/sorttab_widget.c
+++ b/plugins/sorttab_display/sorttab_widget.c
@@ -92,6 +92,8 @@ static void _sort_tab_widget_dispose(GObject *gobject) {
priv->prev = NULL;
priv->model = NULL;
priv->parent = NULL;
+ g_free(priv->glade_xml_path);
+ priv->glade_xml_path = NULL;
}
/* call the parent class' dispose() method */
@@ -325,7 +327,7 @@ SortTabWidget *sort_tab_widget_new(gint inst, GtkWidget *parent, gchar *glade_xm
priv->parent = parent;
priv->instance = inst;
- priv->glade_xml_path = glade_xml_path;
+ priv->glade_xml_path = g_strdup(glade_xml_path);
/*
* Initialise the notebook pages. This has to be done here rather than
|
|
From: dforsi <df...@us...> - 2012-07-14 15:44:46
|
commit 7786e2f08196618edfeb2b02b2b1cb964851cbb6
Author: Daniele Forsi <da...@fo...>
Date: Sat Jul 14 16:05:53 2012 +0200
Make the string identical to the other ones
Add a \n. One string less to check for translators.
libgtkpod/file.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
---
diff --git a/libgtkpod/file.c b/libgtkpod/file.c
index 9ffe885..f2a7194 100644
--- a/libgtkpod/file.c
+++ b/libgtkpod/file.c
@@ -2187,7 +2187,7 @@ gboolean write_lyrics_to_file(Track *track) {
error = NULL;
}
else
- gtkpod_warning(_("Lyrics not written due to the error:\n%s"), UNKNOWN_ERROR);
+ gtkpod_warning(_("Lyrics not written due to the error:\n\n%s"), UNKNOWN_ERROR);
}
}
|
|
From: dforsi <df...@us...> - 2012-07-14 15:44:39
|
commit f482a5ae034b380350c11e296ea77be313e3d5b2
Author: Daniele Forsi <da...@fo...>
Date: Sat Jul 14 15:54:26 2012 +0200
Fix setting the sort order with the Playlist Display plugin
Dereference gpointer value.
plugins/playlist_display/display_playlists.c | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
---
diff --git a/plugins/playlist_display/display_playlists.c b/plugins/playlist_display/display_playlists.c
index e13c579..380834e 100644
--- a/plugins/playlist_display/display_playlists.c
+++ b/plugins/playlist_display/display_playlists.c
@@ -2134,8 +2134,10 @@ void playlist_display_playlist_removed_cb(GtkPodApp *app, gpointer pl, gpointer
void playlist_display_preference_changed_cb(GtkPodApp *app, gpointer pfname, gpointer value, gpointer data) {
gchar *pref_name = pfname;
- if (g_str_equal(pref_name, "pm_sort"))
- pm_sort((GtkSortType) value);
+ if (g_str_equal(pref_name, "pm_sort")) {
+ GtkSortType *sort_type = value;
+ pm_sort(*sort_type);
+ }
else if (g_str_equal(pref_name, "pm_case_sensitive")) {
gint val = prefs_get_int("pm_sort");
pm_sort((GtkSortType) val);
|
|
From: dforsi <df...@us...> - 2012-07-13 22:24:56
|
commit 818c9c60febd9a2f2458313fb85b40e128de191c
Author: Daniele Forsi <da...@fo...>
Date: Sat Jul 14 00:22:17 2012 +0200
Update Italian translation
po/it.po | 2891 ++++++++++++++++++++++++++++++--------------------------------
1 files changed, 1406 insertions(+), 1485 deletions(-)
---
diff --git a/po/it.po b/po/it.po
index 0f3c55e..7030d24 100644
--- a/po/it.po
+++ b/po/it.po
@@ -1,6 +1,6 @@
# Italian language translation for gtkpod.
# Copyright (C) 2003, 2005 Edward Matteucci <edw...@li...>
-# Copyright (C) 2007, 2008, 2010, 2011 Daniele Forsi <da...@fo...>
+# Copyright (C) 2007, 2008, 2010, 2011, 2012 Daniele Forsi <da...@fo...>
# Copyright (C) 2011 Daniele Napolitano <dn...@gm...>
# This file is distributed under the same license as the gtkpod package.
#
@@ -16,15 +16,16 @@ msgid ""
msgstr ""
"Project-Id-Version: gtkpod\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-05-25 10:07+0100\n"
-"PO-Revision-Date: 2011-12-14 10:05+0000\n"
-"Last-Translator: Daniele Napolitano <dn...@gm...>\n"
+"POT-Creation-Date: 2012-07-14 00:09+0200\n"
+"PO-Revision-Date: 2012-07-13 22:48+0200\n"
+"Last-Translator: Daniele Forsi <df...@gm...>\n"
"Language-Team: Italian <tp...@li...>\n"
"Language: it\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Virtaal 0.7.1\n"
"X-Poedit-Language: Italian\n"
"X-Poedit-Country: ITALY\n"
"X-Poedit-SourceCharset: utf-8\n"
@@ -34,22 +35,26 @@ msgstr ""
"X-Poedit-SearchPath-1: ../data\n"
#: ../data/glade/core-gtkpod.xml.h:1
-msgid "Conversion Progress Display"
-msgstr "Visualizzazione dell'avanzamento della conversione"
+msgid "Turn off the splash screen"
+msgstr "Non mostrare la schermata di avvio"
+
+#: ../data/glade/core-gtkpod.xml.h:2
+msgid "Session"
+msgstr "Sessione"
-#: ../data/glade/core-gtkpod.xml.h:2 ../src/anjuta-app.c:720
+#: ../data/glade/core-gtkpod.xml.h:3
msgid "General"
msgstr "Generale"
-#: ../data/glade/core-gtkpod.xml.h:3
+#: ../data/glade/core-gtkpod.xml.h:4
msgid "Never show this dialogue again"
msgstr "Non mostrare più questa finestra di dialogo"
-#: ../data/glade/core-gtkpod.xml.h:4
-msgid "Session"
-msgstr "Sessione"
-
#: ../data/glade/core-gtkpod.xml.h:5
+msgid "Conversion Progress Display"
+msgstr "Visualizzazione dell'avanzamento della conversione"
+
+#: ../data/glade/core-gtkpod.xml.h:6
msgid ""
"The output of the background conversion scripts is copied below. Each page "
"of the notebook corresponds to one background thread."
@@ -57,23 +62,19 @@ msgstr ""
"L'output degli script di conversione sullo sfondo è copiato sotto. Ogni "
"linguetta corrisponde a un thread sullo sfondo."
-#: ../data/glade/core-gtkpod.xml.h:6
-msgid "Turn off the splash screen"
-msgstr ""
-
-#: ../data/gtkpod.desktop.in.h:1
-msgid "Manage music and video on an Apple iPod"
-msgstr "Gestisce musica e video negli iPod Apple"
-
-#: ../data/gtkpod.desktop.in.h:2 ../src/main.c:95
+#: ../data/gtkpod.desktop.in.h:1 ../src/main.c:101
msgid "gtkpod"
msgstr "gtkpod"
-#: ../data/gtkpod.desktop.in.h:3
+#: ../data/gtkpod.desktop.in.h:2
msgid "iPod Manager"
msgstr "Gestore di iPod"
-#: ../libgtkpod/autodetection.c:245
+#: ../data/gtkpod.desktop.in.h:3
+msgid "Manage music, video and photos on an Apple iPod"
+msgstr "Gestisce musica, video e foto negli iPod Apple"
+
+#: ../libgtkpod/autodetection.c:274
#, c-format
msgid ""
"Newly mounted iPod at '%s' could not be loaded into gtkpod.\n"
@@ -82,7 +83,7 @@ msgstr ""
"Non è stato possibile leggere il nuovo iPod montato in «%s».\n"
"\n"
-#: ../libgtkpod/autodetection.c:249
+#: ../libgtkpod/autodetection.c:278
#, c-format
msgid ""
"Newly mounted iPod at '%s' appears to be already loaded!\n"
@@ -91,7 +92,7 @@ msgstr ""
"Il nuovo iPod montato in «%s» sembra che sia già stato letto.\n"
"\n"
-#: ../libgtkpod/autodetection.c:257
+#: ../libgtkpod/autodetection.c:286
msgid "New iPod"
msgstr "Nuovo iPod"
@@ -312,6 +313,10 @@ msgstr ""
"È stata rilevata un'altra istanza di gtkpod. Server contatore riproduzioni "
"non avviato.\n"
+#: ../libgtkpod/context_menus.c:125
+msgid "Execute"
+msgstr "Esegui"
+
#: ../libgtkpod/context_menus.c:151
#: ../plugins/playlist_display/playlist_display_context_menu.c:352
msgid "Update Tracks from File"
@@ -343,7 +348,7 @@ msgid ""
"Using local %s directory since program was started from source directory:\n"
"%s\n"
msgstr ""
-"Directory locale %s in uso poiché il programma è stato avviato dalla "
+"Directory locale «%s» in uso poiché il programma è stato avviato dalla "
"directory dei sorgenti:\n"
"%s\n"
@@ -607,15 +612,18 @@ msgid "Error writing to '%s'.\n"
msgstr "Errore nella scrittura su «%s».\n"
#: ../libgtkpod/file.c:2071
-#, fuzzy, c-format
+#, c-format
msgid "Failed to read sound check from track with no path setting."
-msgstr "Impossibile leggere il soundcheck dalla traccia perché"
+msgstr ""
+"Impossibile leggere il soundcheck dalla traccia senza un percorso impostato."
#: ../libgtkpod/file.c:2079
-#, fuzzy, c-format
+#, c-format
msgid ""
"Failed to read sound check from track because filetype is not recognised."
-msgstr "Impossibile leggere il soundcheck dalla traccia perché"
+msgstr ""
+"Impossibile leggere il soundcheck dalla traccia perché il tipo di file non è "
+"riconosciuto."
#: ../libgtkpod/file.c:2109
#, c-format
@@ -662,7 +670,9 @@ msgstr ""
msgid ""
"Lyrics not written, file type cannot be determined (%s).\n"
"\n"
-msgstr "Testi non scritti, tipo del file non determinabile (%s).\n"
+msgstr ""
+"Testi non scritti, tipo del file non determinabile (%s).\n"
+"\n"
#: ../libgtkpod/file.c:2185
#, c-format
@@ -684,40 +694,40 @@ msgstr ""
"Testi non scritti a causa dell'errore:\n"
"%s"
-#: ../libgtkpod/file_convert.c:317
+#: ../libgtkpod/file_convert.c:419
msgid "errors"
msgstr "errori"
-#: ../libgtkpod/file_convert.c:325
+#: ../libgtkpod/file_convert.c:427
msgid "Summary status of conversion processes"
msgstr "Riepilogo dello stato del processo di conversione"
#. only change the label if it has changed --
#. otherwise our tooltips will be switched off
-#: ../libgtkpod/file_convert.c:542 ../libgtkpod/file_convert.c:544
+#: ../libgtkpod/file_convert.c:644 ../libgtkpod/file_convert.c:646
msgid "active"
msgstr "attivo"
-#: ../libgtkpod/file_convert.c:548 ../libgtkpod/file_convert.c:549
+#: ../libgtkpod/file_convert.c:650 ../libgtkpod/file_convert.c:651
msgid "inactive"
msgstr "non attivo"
-#: ../libgtkpod/file_convert.c:561
+#: ../libgtkpod/file_convert.c:663
#, c-format
msgid "Active threads: %d. Scheduled tracks: %d."
msgstr "Thread attivi: %d. Tracce in coda: %d."
-#: ../libgtkpod/file_convert.c:1035
+#: ../libgtkpod/file_convert.c:1132
#, c-format
msgid "Original filename not available for '%s.'\n"
msgstr "Nome del file originale non disponibile per «%s».\n"
-#: ../libgtkpod/file_convert.c:1051
+#: ../libgtkpod/file_convert.c:1148
#, c-format
msgid "Filename '%s' is no longer valid for '%s'.\n"
msgstr "Il nome del file «%s» non è più valido per «%s».\n"
-#: ../libgtkpod/file_convert.c:1125
+#: ../libgtkpod/file_convert.c:1222
#, c-format
msgid ""
"Files of type '%s' are not supported by the iPod. Please go to the "
@@ -728,17 +738,17 @@ msgstr ""
"per impostare ed attivare uno script di conversione adatto per «%s».\n"
"\n"
-#: ../libgtkpod/file_convert.c:1198
+#: ../libgtkpod/file_convert.c:1295
msgid "No information available"
msgstr "Nessuna informazione disponibile"
-#: ../libgtkpod/file_convert.c:1227
+#: ../libgtkpod/file_convert.c:1324
#, c-format
msgid "Could not create '%s'. Filetype conversion will not work.\n"
msgstr ""
"Impossibile creare «%s». La conversione del tipo di file non funzionerà.\n"
-#: ../libgtkpod/file_convert.c:1509 ../libgtkpod/file_convert.c:2751
+#: ../libgtkpod/file_convert.c:1598 ../libgtkpod/file_convert.c:2840
#, c-format
msgid ""
"Transfer of '%s' failed. %s\n"
@@ -747,7 +757,7 @@ msgstr ""
"Il trasferimento di «%s» è fallito. %s\n"
"\n"
-#: ../libgtkpod/file_convert.c:1868 ../libgtkpod/file_convert.c:2098
+#: ../libgtkpod/file_convert.c:1957 ../libgtkpod/file_convert.c:2187
#, c-format
msgid ""
"Conversion of '%s' failed: '%s'.\n"
@@ -756,7 +766,7 @@ msgstr ""
"La conversione di «%s» è fallita: «%s».\n"
"\n"
-#: ../libgtkpod/file_convert.c:1883
+#: ../libgtkpod/file_convert.c:1972
#, c-format
msgid ""
"Conversion of '%s' failed: '%s %s' returned exit status %d.\n"
@@ -765,7 +775,7 @@ msgstr ""
"La conversione di «%s» è fallita: «%s %s» ha fornito lo stato di uscita %d.\n"
"\n"
-#: ../libgtkpod/file_convert.c:1909
+#: ../libgtkpod/file_convert.c:1998
#, c-format
msgid ""
"Conversion of '%s' failed: '\"%s\" %s' did not return filename extension as "
@@ -776,7 +786,7 @@ msgstr ""
"del nome del file come previsto.\n"
"\n"
-#: ../libgtkpod/file_convert.c:1974
+#: ../libgtkpod/file_convert.c:2063
#, c-format
msgid ""
"Conversion of '%s' failed: Could not access original file '%s' (%s).\n"
@@ -786,7 +796,7 @@ msgstr ""
"«%s» (%s).\n"
"\n"
-#: ../libgtkpod/file_convert.c:2018
+#: ../libgtkpod/file_convert.c:2107
#, c-format
msgid ""
"Conversion of '%s' failed: Could not create directory '%s'.\n"
@@ -795,7 +805,7 @@ msgstr ""
"La conversione di «%s» è fallita: impossibile creare la directory «%s».\n"
"\n"
-#: ../libgtkpod/file_convert.c:2126
+#: ../libgtkpod/file_convert.c:2215
#, c-format
msgid ""
"Conversion of '%s' failed: '%s' returned exit status %d.\n"
@@ -804,7 +814,7 @@ msgstr ""
"La conversione di «%s» è fallita: «%s» ha restituito lo stato %d.\n"
"\n"
-#: ../libgtkpod/file_convert.c:2160
+#: ../libgtkpod/file_convert.c:2249
#, c-format
msgid ""
"Conversion of '%s' failed: could not stat the converted file '%s'.\n"
@@ -814,21 +824,21 @@ msgstr ""
"convertito «%s».\n"
"\n"
-#: ../libgtkpod/file_itunesdb.c:121
+#: ../libgtkpod/file_itunesdb.c:206
#, c-format
msgid "Matching SHA1 checksum for file %d/%d"
msgstr "Confronto delle somme di controllo SHA1 per il file %d di %d"
-#: ../libgtkpod/file_itunesdb.c:232
+#: ../libgtkpod/file_itunesdb.c:317
msgid "Could not create hash value from itunesdb\n"
msgstr "Impossibile creare il valore di hash da itunesdb\n"
-#: ../libgtkpod/file_itunesdb.c:247
+#: ../libgtkpod/file_itunesdb.c:332
#, c-format
msgid "Error while reading extended info: %s\n"
msgstr "Errore nella lettura delle informazioni estese: %s\n"
-#: ../libgtkpod/file_itunesdb.c:263
+#: ../libgtkpod/file_itunesdb.c:348
#, c-format
msgid ""
"iTunesDB '%s' does not match checksum in extended information file '%s'\n"
@@ -842,7 +852,7 @@ msgstr ""
"controllo SHA1. Questo può richiedere molto tempo.\n"
"\n"
-#: ../libgtkpod/file_itunesdb.c:273
+#: ../libgtkpod/file_itunesdb.c:358
#, c-format
msgid ""
"%s:\n"
@@ -851,7 +861,7 @@ msgstr ""
"%s:\n"
"Atteso «itunesdb_hash=» ma trovato: «%s»\n"
-#: ../libgtkpod/file_itunesdb.c:318
+#: ../libgtkpod/file_itunesdb.c:403
#, c-format
msgid ""
"%s:\n"
@@ -860,7 +870,7 @@ msgstr ""
"%s:\n"
"Errore nel formato: %s\n"
-#: ../libgtkpod/file_itunesdb.c:360
+#: ../libgtkpod/file_itunesdb.c:445
msgid ""
"No SHA1 checksums on individual tracks are available.\n"
"\n"
@@ -876,23 +886,23 @@ msgstr ""
"l'iPod con programmi diversi da gtkpod.\n"
"\n"
-#: ../libgtkpod/file_itunesdb.c:396
+#: ../libgtkpod/file_itunesdb.c:481
#, c-format
msgid "Error reading iPod photo database (%s).\n"
msgstr "Errore durante la lettura del database delle foto dell'iPod (%s).\n"
-#: ../libgtkpod/file_itunesdb.c:401
+#: ../libgtkpod/file_itunesdb.c:486
msgid "Error reading iPod photo database. (No error message)\n"
msgstr ""
"Errore durante la lettura del database delle foto dell'iPod. (Nessun "
"messaggio di errore)\n"
-#: ../libgtkpod/file_itunesdb.c:459
+#: ../libgtkpod/file_itunesdb.c:544
#, c-format
msgid "The repository %s does not have a readable extended database.\n"
msgstr "L'archivio %s non ha un database esteso leggibile.\n"
-#: ../libgtkpod/file_itunesdb.c:461
+#: ../libgtkpod/file_itunesdb.c:546
msgid ""
"This database identifies the track on disk with the track data in the "
"repository database. "
@@ -900,7 +910,7 @@ msgstr ""
"This database identifies the track on disk with the track data in the "
"repository database. "
-#: ../libgtkpod/file_itunesdb.c:461
+#: ../libgtkpod/file_itunesdb.c:546
msgid ""
"Any tracks already in the database cannot be transferred between "
"repositories without the extended database. "
@@ -908,7 +918,7 @@ msgstr ""
"Le tracce già nel database non possono essere trasferite in altri archivi "
"senza il database esteso."
-#: ../libgtkpod/file_itunesdb.c:461
+#: ../libgtkpod/file_itunesdb.c:546
msgid ""
"A new extended database will be created upon saving but existing tracks will "
"need to be reimported to be linked to the file on disk.\n"
@@ -919,24 +929,24 @@ msgstr ""
"file su disco.\n"
"\n"
-#: ../libgtkpod/file_itunesdb.c:468
+#: ../libgtkpod/file_itunesdb.c:553
msgid "Offline iPod database successfully imported"
msgstr "Database non in linea dell'iPod importato con successo"
-#: ../libgtkpod/file_itunesdb.c:470
+#: ../libgtkpod/file_itunesdb.c:555
msgid "Local database successfully imported"
msgstr "Database locale importato con successo"
-#: ../libgtkpod/file_itunesdb.c:475
+#: ../libgtkpod/file_itunesdb.c:560
#, c-format
msgid ""
"Offline iPod database import failed: '%s'\n"
"\n"
msgstr ""
-"Importazione del database non in linea dell'iPod fallita: «%s» \n"
+"Importazione del database non in linea dell'iPod fallita: «%s»\n"
"\n"
-#: ../libgtkpod/file_itunesdb.c:477
+#: ../libgtkpod/file_itunesdb.c:562
#, c-format
msgid ""
"Local database import failed: '%s'\n"
@@ -945,7 +955,7 @@ msgstr ""
"Importazione del database locale fallita: «%s»\n"
"\n"
-#: ../libgtkpod/file_itunesdb.c:483
+#: ../libgtkpod/file_itunesdb.c:568
msgid ""
"Offline iPod database import failed: \n"
"\n"
@@ -953,7 +963,7 @@ msgstr ""
"Importazione del database non in linea dell'iPod fallita: \n"
"\n"
-#: ../libgtkpod/file_itunesdb.c:485
+#: ../libgtkpod/file_itunesdb.c:570
msgid ""
"Local database import failed: \n"
"\n"
@@ -961,7 +971,7 @@ msgstr ""
"Importazione del database locale fallita:\n"
"\n"
-#: ../libgtkpod/file_itunesdb.c:490
+#: ../libgtkpod/file_itunesdb.c:575
#, c-format
msgid ""
"'%s' does not exist. Import aborted.\n"
@@ -970,7 +980,7 @@ msgstr ""
"«%s» non esiste. Importazione interrotta.\n"
"\n"
-#: ../libgtkpod/file_itunesdb.c:504
+#: ../libgtkpod/file_itunesdb.c:589
msgid ""
"Extended info will not be used.\n"
"\n"
@@ -978,7 +988,7 @@ msgstr ""
"Le informazioni estese non verranno usate.\n"
"\n"
-#: ../libgtkpod/file_itunesdb.c:509
+#: ../libgtkpod/file_itunesdb.c:594
msgid ""
"iPod Database Successfully Imported\n"
"\n"
@@ -986,7 +996,7 @@ msgstr ""
"Database dell'iPod importato con successo\n"
"\n"
-#: ../libgtkpod/file_itunesdb.c:513
+#: ../libgtkpod/file_itunesdb.c:598
#, c-format
msgid ""
"iPod Database Import Failed: '%s'\n"
@@ -995,7 +1005,7 @@ msgstr ""
"Importazione del database dell'iPod fallita: «%s»\n"
"\n"
-#: ../libgtkpod/file_itunesdb.c:517
+#: ../libgtkpod/file_itunesdb.c:602
msgid ""
"iPod Database Import Failed.\n"
"\n"
@@ -1003,7 +1013,7 @@ msgstr ""
"Importazione del database dell'iPod fallita.\n"
"\n"
-#: ../libgtkpod/file_itunesdb.c:523
+#: ../libgtkpod/file_itunesdb.c:608
#, c-format
msgid ""
"'%s' (or similar) does not exist. Import aborted.\n"
@@ -1014,16 +1024,16 @@ msgstr ""
#. gint id,
#. gboolean modal,
-#: ../libgtkpod/file_itunesdb.c:696
+#: ../libgtkpod/file_itunesdb.c:781
msgid "Import Repository Errors"
msgstr "Errori dell'importazione dell'archivio"
#. title
-#: ../libgtkpod/file_itunesdb.c:697
+#: ../libgtkpod/file_itunesdb.c:782
msgid "Errors created during repository import"
msgstr "Errori generati durante l'importazione dell'archivio"
-#: ../libgtkpod/file_itunesdb.c:823
+#: ../libgtkpod/file_itunesdb.c:908
#, c-format
msgid ""
"Could not find iPod directory structure at '%s'.\n"
@@ -1034,44 +1044,45 @@ msgid ""
"Do you want to create the directory structure now?"
msgstr ""
"Impossibile trovare la struttura delle directory dell'iPod in «%s».\n"
+"\n"
"Se si è sicuri che l'iPod sia montato correttamente in «%s», allora potrebbe "
"non essere inizializzato per l'uso. In questo caso è possibile "
"inizializzarlo.\n"
"\n"
"Si desidera creare la struttura delle directory ora?"
-#: ../libgtkpod/file_itunesdb.c:827
+#: ../libgtkpod/file_itunesdb.c:912
msgid "iPod directory structure not found"
msgstr "Impossibile trovare la struttura delle directory dell'iPod"
-#: ../libgtkpod/file_itunesdb.c:827
+#: ../libgtkpod/file_itunesdb.c:912
msgid "Create directory structure"
-msgstr "Crea struttura delle directory"
+msgstr "Crea struttura directory"
-#: ../libgtkpod/file_itunesdb.c:1089
+#: ../libgtkpod/file_itunesdb.c:1174
#, c-format
msgid "Could not open \"%s\" for writing extended info.\n"
msgstr "Impossibile aprire «%s» per la scrittura delle informazioni estese.\n"
-#: ../libgtkpod/file_itunesdb.c:1101
+#: ../libgtkpod/file_itunesdb.c:1186
msgid "Aborted writing of extended info.\n"
msgstr "Scrittura delle informazioni estese interrotta.\n"
-#: ../libgtkpod/file_itunesdb.c:1250
+#: ../libgtkpod/file_itunesdb.c:1341
#, c-format
msgid "%d%% %s"
msgstr "%d%% %s"
-#: ../libgtkpod/file_itunesdb.c:1261
+#: ../libgtkpod/file_itunesdb.c:1352
#, c-format
msgid "%d%% (%d/%d %d:%02d:%02d left) %s"
msgstr "%d%% (%d/%d %d.%02d.%02d rimanenti) %s"
-#: ../libgtkpod/file_itunesdb.c:1306
+#: ../libgtkpod/file_itunesdb.c:1397
msgid "Status: Deleting File"
msgstr "Stato: eliminazione file in corso"
-#: ../libgtkpod/file_itunesdb.c:1362
+#: ../libgtkpod/file_itunesdb.c:1448
#, c-format
msgid ""
"Could not remove the following file: '%s'\n"
@@ -1080,7 +1091,7 @@ msgstr ""
"Impossibile rimuovere il file seguente: «%s»\n"
"\n"
-#: ../libgtkpod/file_itunesdb.c:1457
+#: ../libgtkpod/file_itunesdb.c:1543
msgid ""
"The following track could not be converted successfully:\n"
"\n"
@@ -1094,7 +1105,7 @@ msgstr[1] ""
"Le tracce seguenti non sono state convertite con successo:\n"
"\n"
-#: ../libgtkpod/file_itunesdb.c:1463
+#: ../libgtkpod/file_itunesdb.c:1549
msgid ""
"The following track could not be transferred successfully:\n"
"\n"
@@ -1110,12 +1121,12 @@ msgstr[1] ""
#. ID
#. modal,
-#: ../libgtkpod/file_itunesdb.c:1470 ../libgtkpod/gtkpod_app_iface.c:253
+#: ../libgtkpod/file_itunesdb.c:1556 ../libgtkpod/gtkpod_app_iface.c:253
msgid "Warning"
msgstr "Attenzione"
#. title
-#: ../libgtkpod/file_itunesdb.c:1471
+#: ../libgtkpod/file_itunesdb.c:1557
msgid ""
"The iPod could not be ejected. Please fix the problems mentioned below and "
"then eject the iPod again. Pressing 'OK' will re-schedule the failed tracks "
@@ -1125,23 +1136,23 @@ msgstr ""
"espellere di nuovo l'iPod. Premendo «Ok» le tracce mancanti saranno di nuovo "
"messe in coda per la conversione e il trasferimento."
-#: ../libgtkpod/file_itunesdb.c:1523
+#: ../libgtkpod/file_itunesdb.c:1609
#, c-format
msgid "Saving: waiting for %d tracks to be copied"
msgstr "Salvataggio: in attesa del completamento della copia di %d tracce"
-#: ../libgtkpod/file_itunesdb.c:1527
+#: ../libgtkpod/file_itunesdb.c:1613
#, c-format
msgid "Saving: waiting for %d tracks to convert"
msgstr ""
"Salvataggio: in attesa del completamento della conversione di %d tracce"
-#: ../libgtkpod/file_itunesdb.c:1530
+#: ../libgtkpod/file_itunesdb.c:1616
#, c-format
msgid "Saving: finished track transfer"
msgstr "Salvataggio: trasferimento completato"
-#: ../libgtkpod/file_itunesdb.c:1562
+#: ../libgtkpod/file_itunesdb.c:1648
#, c-format
msgid ""
"One track could not be transferred because your iPod is full. Either delete "
@@ -1160,7 +1171,7 @@ msgstr[1] ""
"alcune tracce oppure creare spazio sull'iPod in altro modo prima di "
"espellerlo di nuovo."
-#: ../libgtkpod/file_itunesdb.c:1631
+#: ../libgtkpod/file_itunesdb.c:1717
#, c-format
msgid ""
"You did not import the existing iTunesDB ('%s'). This is most likely "
@@ -1175,19 +1186,19 @@ msgstr ""
"Se si salta l'archiviazione, si può importare il database esistente prima di "
"richiamare di nuovo questa funzione.\n"
-#: ../libgtkpod/file_itunesdb.c:1635 ../libgtkpod/misc_playlist.c:836
+#: ../libgtkpod/file_itunesdb.c:1721 ../libgtkpod/misc_playlist.c:836
msgid "Existing iTunes database not imported"
msgstr "Il database di iTunes esistente non è stato impostato"
-#: ../libgtkpod/file_itunesdb.c:1635 ../libgtkpod/misc_playlist.c:836
+#: ../libgtkpod/file_itunesdb.c:1721 ../libgtkpod/misc_playlist.c:836
msgid "Proceed anyway"
msgstr "Continua ugualmente"
-#: ../libgtkpod/file_itunesdb.c:1635
+#: ../libgtkpod/file_itunesdb.c:1721
msgid "Skip storing"
msgstr "Salta archiviazione"
-#: ../libgtkpod/file_itunesdb.c:1658
+#: ../libgtkpod/file_itunesdb.c:1744
msgid ""
"iPod directory structure must be present before synching to the iPod can be "
"performed.\n"
@@ -1195,33 +1206,35 @@ msgstr ""
"La struttura delle directory dell'iPod deve essere presente prima che la "
"sincronizzazione verso l'iPod possa essere eseguita.\n"
-#: ../libgtkpod/file_itunesdb.c:1665
+#: ../libgtkpod/file_itunesdb.c:1751
msgid "Some tracks could not be deleted from the iPod. Export aborted!"
msgstr ""
"Alcune tracce non possono essere eliminate dall'iPod. Esportazione "
"interrotta!"
-#: ../libgtkpod/file_itunesdb.c:1687
+#: ../libgtkpod/file_itunesdb.c:1773
#, c-format
msgid "Now writing database '%s'. Please wait..."
-msgstr "Scrittura del database «%s» in corso. Attendere prego..."
+msgstr "Scrittura del database «%s» in corso. Attendere..."
-#: ../libgtkpod/file_itunesdb.c:1736
+#: ../libgtkpod/file_itunesdb.c:1822
#, c-format
msgid "Extended information file not deleted: '%s'"
msgstr "Il file con le informazioni estese non è stato eliminato: «%s»"
-#: ../libgtkpod/file_itunesdb.c:1754
+#: ../libgtkpod/file_itunesdb.c:1840
#, c-format
msgid "Backup database could not be found so backing up database to %s\n"
msgstr ""
+"Il backup del database sarà eseguito su «%s» perché il database di backup "
+"non è stato trovato\n"
-#: ../libgtkpod/file_itunesdb.c:1860
+#: ../libgtkpod/file_itunesdb.c:1946
#, c-format
msgid "%s: Database saved"
msgstr "%s: database salvato"
-#: ../libgtkpod/file_itunesdb.c:1863
+#: ../libgtkpod/file_itunesdb.c:1949
#, c-format
msgid "%s: Changes saved"
msgstr "%s: modifiche salvate"
@@ -1279,7 +1292,7 @@ msgstr "Locale"
#. These are the items for the 'Repository type' combo in the 'Create Repository' dialog. Keep the three items in order!
#: ../libgtkpod/gp_itdb.c:924
#: ../plugins/repository_editor/repository_editor.c:1113
-#: ../plugins/repository_editor/repository_editor.xml.h:52
+#: ../plugins/repository_editor/repository_editor.xml.h:4
msgid "iPod"
msgstr "iPod"
@@ -1442,7 +1455,7 @@ msgstr "Tutti"
#. 0
#: ../libgtkpod/misc_conversion.c:61
-#: ../plugins/core_preferences/core_prefs.xml.h:24
+#: ../plugins/core_preferences/core_prefs.xml.h:116
#: ../plugins/playlist_display/playlist_display_spl.c:78
#: ../plugins/sorttab_display/sorttab_widget.c:241
#: ../plugins/sjcd/egg-play-preview.c:199
@@ -1450,7 +1463,7 @@ msgid "Album"
msgstr "Album"
#: ../libgtkpod/misc_conversion.c:62
-#: ../plugins/core_preferences/core_prefs.xml.h:29
+#: ../plugins/core_preferences/core_prefs.xml.h:112
#: ../plugins/playlist_display/playlist_display_spl.c:79
#: ../plugins/sorttab_display/sorttab_widget.c:238
#: ../plugins/sjcd/egg-play-preview.c:189 ../plugins/sjcd/sj-main.c:521
@@ -1459,7 +1472,7 @@ msgid "Artist"
msgstr "Artista"
#: ../libgtkpod/misc_conversion.c:63
-#: ../plugins/core_preferences/core_prefs.xml.h:89
+#: ../plugins/core_preferences/core_prefs.xml.h:113
#: ../plugins/playlist_display/playlist_display_spl.c:77
#: ../plugins/sorttab_display/sorttab_widget.c:250
#: ../plugins/sjcd/egg-play-preview.c:179 ../plugins/sjcd/sj-main.c:515
@@ -1468,7 +1481,7 @@ msgid "Title"
msgstr "Titolo"
#: ../libgtkpod/misc_conversion.c:64
-#: ../plugins/core_preferences/core_prefs.xml.h:62
+#: ../plugins/core_preferences/core_prefs.xml.h:114
#: ../plugins/playlist_display/playlist_display_spl.c:83
#: ../plugins/sorttab_display/sorttab_widget.c:244
msgid "Genre"
@@ -1481,7 +1494,7 @@ msgstr "Commento"
#. 5
#: ../libgtkpod/misc_conversion.c:66
-#: ../plugins/core_preferences/core_prefs.xml.h:32
+#: ../plugins/core_preferences/core_prefs.xml.h:115
#: ../plugins/playlist_display/playlist_display_spl.c:91
msgid "Composer"
msgstr "Compositore"
@@ -1816,19 +1829,20 @@ msgid "The URI '%s' contains invalidly escaped characters"
msgstr "L'URI «%s» contiene caratteri di escape non validi"
#: ../libgtkpod/misc_playlist.c:69
-#: ../plugins/playlist_display/playlist_display_spl.c:1503
+#: ../plugins/playlist_display/playlist_display_spl.c:1514
msgid "Please load the iPod before adding playlists."
msgstr "Leggere l'iPod prima di aggiungere le playlist."
#: ../libgtkpod/misc_playlist.c:74 ../libgtkpod/misc_playlist.c:318
-#: ../plugins/playlist_display/playlist_display_spl.c:1452
-#: ../plugins/playlist_display/playlist_display_spl.c:1508
+#: ../plugins/playlist_display/playlist_display_spl.c:1463
+#: ../plugins/playlist_display/playlist_display_spl.c:1518
+#: ../plugins/playlist_display/playlist_display_spl.c:1521
#: ../plugins/playlist_display/plugin.c:345
msgid "New Playlist"
msgstr "Nuova playlist"
#: ../libgtkpod/misc_playlist.c:74 ../libgtkpod/misc_playlist.c:318
-#: ../plugins/playlist_display/playlist_display_spl.c:1508
+#: ../plugins/playlist_display/playlist_display_spl.c:1521
msgid "Please enter a name for the new playlist"
msgstr "Inserire un nome per la nuova playlist"
@@ -1899,7 +1913,7 @@ msgstr "Tracce senza voto"
#: ../libgtkpod/misc_playlist.c:525
#, c-format
msgid "Rated %d"
-msgstr "Con voto (%d)"
+msgstr "Con voto %d"
#: ../libgtkpod/misc_playlist.c:564
#, c-format
@@ -2291,32 +2305,32 @@ msgstr[1] "Copiate %d tracce in «%s»"
msgid "No tracks selected"
msgstr "Nessuna traccia selezionata"
-#: ../libgtkpod/prefs.c:293
+#: ../libgtkpod/prefs.c:323
#, c-format
msgid "gtkpod version %s usage:\n"
msgstr "Uso di gtkpod versione %s:\n"
-#: ../libgtkpod/prefs.c:294
+#: ../libgtkpod/prefs.c:324
msgid " -h, --help: display this message\n"
msgstr " -h, --help: mostra questo messaggio\n"
-#: ../libgtkpod/prefs.c:295
+#: ../libgtkpod/prefs.c:325
msgid " -p <file>: increment playcount for file by one\n"
msgstr " -p <file>: incrementa di uno il contatore delle riproduzioni\n"
-#: ../libgtkpod/prefs.c:296
+#: ../libgtkpod/prefs.c:326
msgid " --hash <file>:print gtkpod hash for file\n"
msgstr " --hash <file>:stampa l'hash di gtkpod per il file\n"
-#: ../libgtkpod/prefs.c:297
+#: ../libgtkpod/prefs.c:327
msgid " -m path: define the mountpoint of your iPod\n"
msgstr " -m percorso: definisce il punto di montaggio dell'iPod\n"
-#: ../libgtkpod/prefs.c:298
+#: ../libgtkpod/prefs.c:328
msgid " --mountpoint: same as '-m'.\n"
msgstr " --mountpoint: come «-m».\n"
-#: ../libgtkpod/prefs.c:466
+#: ../libgtkpod/prefs.c:496
#, c-format
msgid "Couldn't create '%s'\n"
msgstr "Impossibile creare «%s»\n"
@@ -2370,8 +2384,8 @@ msgstr "Nessun cambiamento.\n"
msgid "Sync summary"
msgstr "Riepilogo della sincronizzazione"
-#: ../libgtkpod/tools.c:118
-#, fuzzy, c-format
+#: ../libgtkpod/tools.c:190
+#, c-format
msgid ""
"Could not find '%s'.\n"
"Please specifiy the exact path in the preference dialog or install the "
@@ -2379,12 +2393,11 @@ msgid ""
"\n"
msgstr ""
"Impossibile trovare «%s».\n"
-"Specificare il percorso esatto nella sezione «Strumenti» della finestra di "
-"dialogo delle preferenze o installare il programma se non è installato nel "
-"sistema.\n"
+"Specificare il percorso esatto nella finestra di dialogo delle preferenze o "
+"installare il programma se non è installato nel sistema.\n"
"\n"
-#: ../libgtkpod/tools.c:217
+#: ../libgtkpod/tools.c:289
#, c-format
msgid ""
"Execution of '%s' failed.\n"
@@ -2393,19 +2406,19 @@ msgstr ""
"L'esecuzione di «%s» è fallita.\n"
"\n"
-#: ../libgtkpod/tools.c:255
-#, fuzzy, c-format
+#: ../libgtkpod/tools.c:327
+#, c-format
msgid "Normalization failed: file not available (%s)."
-msgstr ""
-"Normalizzazione fallita: file non disponibile (%s).\n"
-"\n"
+msgstr "Normalizzazione fallita: file non disponibile (%s)."
-#: ../libgtkpod/tools.c:270
-#, fuzzy, c-format
+#: ../libgtkpod/tools.c:342
+#, c-format
msgid ""
-"Normalization failed for file %s: file type not supported.To normalize mp3 "
-"and aac files ensure the following commands paths have been set in the Tools "
-"section\tmp3 files: mp3gain\taac files: aacgain"
+"Normalization failed for file %s: file type not supported.\n"
+"To normalize mp3 and aac files ensure the following commands paths have been "
+"set in the Tools section\n"
+"\tmp3 files: mp3gain\n"
+"\taac files: aacgain"
msgstr ""
"Normalizzazione fallita per il file %s: tipo file non supportato.\n"
"Per normalizzare file MP3 e AAC assicurarsi che i percorsi dei seguenti "
@@ -2415,51 +2428,45 @@ msgstr ""
#. gint id,
#. gboolean modal,
-#: ../libgtkpod/tools.c:316
-#, fuzzy
+#: ../libgtkpod/tools.c:388
msgid "Normalization Errors"
-msgstr "Normalizzazione..."
+msgstr "Errori di normalizzazione"
#. title
-#: ../libgtkpod/tools.c:317
-#, fuzzy
+#: ../libgtkpod/tools.c:389
msgid "Errors created by track normalisation"
-msgstr "Errori generati dall'esportazione"
+msgstr "Errori generati dalla normalizzazione delle tracce"
-#: ../libgtkpod/tools.c:414
-#, fuzzy, c-format
+#: ../libgtkpod/tools.c:481
+#, c-format
msgid "'%s-%s' (%s) could not be normalized. %s\n"
-msgstr ""
-"«%s-%s» (%s) non può essere normalizzata.\n"
-"\n"
+msgstr "«%s-%s» (%s) non può essere normalizzata. %s\n"
-#: ../libgtkpod/tools.c:419
-#, fuzzy, c-format
+#: ../libgtkpod/tools.c:486
+#, c-format
msgid "'%s-%s' (%s) could not be normalized. Unknown error.\n"
-msgstr ""
-"«%s-%s» (%s) non può essere normalizzata.\n"
-"\n"
+msgstr "«%s-%s» (%s) non può essere normalizzata. Errore sconosciuto.\n"
-#: ../libgtkpod/tools.c:436
-#, fuzzy, c-format
+#: ../libgtkpod/tools.c:503
+#, c-format
msgid "%d%% (%d tracks left)"
-msgstr "%d%% (%d:%02d:%02d rimasti)"
+msgstr "%d%% (%d tracce rimaste)"
-#: ../libgtkpod/tools.c:447
-#, fuzzy, c-format
+#: ../libgtkpod/tools.c:514
+#, c-format
msgid "Normalized %d of %d track."
msgid_plural "Normalized %d of %d tracks."
-msgstr[0] "Esportata traccia %d di %d."
+msgstr[0] "Normalizzata traccia %d di %d."
msgstr[1] "Esportata traccia %d di %d."
-#: ../libgtkpod/tools.c:464
-#, fuzzy, c-format
+#: ../libgtkpod/tools.c:531
+#, c-format
msgid "Normalized %d of %d tracks."
msgid_plural "Normalized %d of %d tracks."
-msgstr[0] "Esportata traccia %d di %d."
-msgstr[1] "Esportata traccia %d di %d."
+msgstr[0] "Normalizzata traccia %d di %d."
+msgstr[1] "Normalizzata traccia %d di %d."
-#: ../libgtkpod/tools.c:554
+#: ../libgtkpod/tools.c:621
msgid ""
"Please specify the command to be called on the 'Tools' section of the "
"preferences dialog.\n"
@@ -2467,7 +2474,7 @@ msgstr ""
"Specificare il comando da richiamare nella sezione «Strumenti» della "
"finestra di dialogo delle preferenze.\n"
-#: ../libgtkpod/tools.c:565
+#: ../libgtkpod/tools.c:632
#, c-format
msgid ""
"Could not find the command '%s'.\n"
@@ -2481,7 +2488,7 @@ msgstr ""
"dialogo delle preferenze.\n"
"\n"
-#: ../libgtkpod/tools.c:606
+#: ../libgtkpod/tools.c:673
#, c-format
msgid ""
"'%s' returned the following output:\n"
@@ -2493,12 +2500,12 @@ msgstr ""
#: ../libs/atomic-parsley/AtomicParsleyBridge.cpp:465
#, c-format
msgid "ERROR %s is not itunes style."
-msgstr ""
+msgstr "ERRORE %s non è nello stile di iTunes."
#: ../libs/atomic-parsley/AtomicParsleyBridge.cpp:664
#, c-format
msgid "ERROR failed to change track file's artwork."
-msgstr ""
+msgstr "ERRORE impossibile cambiare il file con la copertina della traccia."
#: ../plugins/filetype_video/videofile.c:47
msgid "Generic video file"
@@ -2517,91 +2524,173 @@ msgid "Modify Core Preferences"
msgstr "Modifica le preferenze di base"
#: ../plugins/core_preferences/core_prefs.xml.h:1
-#: ../plugins/repository_editor/repository_editor.xml.h:1
-msgid "..."
-msgstr "..."
+msgid "MP3"
+msgstr "MP3"
#: ../plugins/core_preferences/core_prefs.xml.h:2
-msgid "<b>Auto-Generated Playlists</b>"
-msgstr "<b>Playlist generate automaticamente</b>"
+msgid "AAC"
+msgstr "AAC"
#: ../plugins/core_preferences/core_prefs.xml.h:3
-msgid "<b>Compatible Formats</b>"
-msgstr "<b>Formati compatibili</b>"
+msgid "Encoding Preferences"
+msgstr "Preferenze codifica"
#: ../plugins/core_preferences/core_prefs.xml.h:4
-msgid "<b>Conversion Settings</b>"
-msgstr "<b>Impostazioni per la conversione</b>"
+msgid "Tag and filename encoding:"
+msgstr "Codifica etichette e nomi file:"
#: ../plugins/core_preferences/core_prefs.xml.h:5
-msgid "<b>Cover Art</b>"
-msgstr "<b>Copertina</b>"
+msgid ""
+"Normally, the encoding specified above will only be used when importing new "
+"tracks, and for any operations involving existing tracks, the encoding "
+"specified when the file was first imported will be used. You can use the "
+"options below to override this behavior, in case you specified the encoding "
+"incorrectly for the first import."
+msgstr ""
+"Normalmente la codifica specificata sopra sarà usata solo per importare "
+"nuove tracce, mentre per qualsiasi operazione che coinvolga tracce esistenti "
+"sarà usata la codifica specificata quando il file fu importato. È possibile "
+"usare le opzioni qui sotto per scavalcare questo comportamento se era stata "
+"specificata una codifica errata durante la prima importazione."
#: ../plugins/core_preferences/core_prefs.xml.h:6
-msgid "<b>Deletion Confirmation Messages</b>"
-msgstr "<b>Messaggi di conferma eliminazione</b>"
+msgid "Also use this encoding when updating or synchronizing tracks"
+msgstr ""
+"Usare questa codifica anche durante l'aggiornamento e la sincronizzazione "
+"delle tracce"
#: ../plugins/core_preferences/core_prefs.xml.h:7
-msgid "<b>Import and Synchronization</b>"
-msgstr "<b>Importazione e sincronizzazione</b>"
+msgid "Also use this encoding when writing tracks"
+msgstr "Usare questa codifica anche durante la scrittura delle tracce"
#: ../plugins/core_preferences/core_prefs.xml.h:8
-msgid "<b>Information Messages</b>"
-msgstr "<b>Messaggi informativi</b>"
+msgid "Filename Parse Preferences"
+msgstr "Preferenze per l'analisi del nome del file"
#: ../plugins/core_preferences/core_prefs.xml.h:9
-msgid "<b>Offset to add to ReplayGain</b>"
-msgstr "<b>Scostamento da aggiungere a ReplayGain</b>"
-
-#: ../plugins/core_preferences/core_prefs.xml.h:10
-msgid "<b>On-the-fly Conversion</b>"
-msgstr "<b>Conversione al volo</b>"
+msgid "Filename parse pattern:"
+msgstr "Modello per l'analisi del nome del file:"
#: ../plugins/core_preferences/core_prefs.xml.h:11
-msgid "<b>Preferred gain type</b>"
-msgstr "<b>Tipo di guadagno preferito</b>"
-
-#: ../plugins/core_preferences/core_prefs.xml.h:12
-msgid "<b>Tag Editing</b>"
-msgstr "<b>Modifica etichette</b>"
-
-#: ../plugins/core_preferences/core_prefs.xml.h:13
-msgid "<b>Tags</b>"
-msgstr "<b>Etichette</b>"
+#, no-c-format
+msgid ""
+"You can separate several templates by a ';'. The first one matching the "
+"filename will be used.\n"
+"\n"
+"Example: <i>%a - %A/%T %t.mp3;%t.wav</i>.\n"
+"\n"
+"- artist: %a\n"
+"- album: %A\n"
+"- composer: %c\n"
+"- title: %t\n"
+"- genre: %G\n"
+"- track nr: %T\n"
+"- CD nr: %C\n"
+"- year: %Y\n"
+"- skip data: %*\n"
+"- the character '%': %%."
+msgstr ""
+"È possibile separare diversi modelli con «;». Sarà usato il primo che "
+"coincide con il nome del file.\n"
+"\n"
+"Esempio: <i>%a - %A/%T %t.mp3;%t.wav</i>.\n"
+"\n"
+"- artista: %a\n"
+"- album: %A\n"
+"- compositore: %c\n"
+"- titolo: %t\n"
+"- genere: %G\n"
+"- n° traccia: %T\n"
+"- n° CD: %C\n"
+"- anno: %Y\n"
+"- salta dati: %*\n"
+"- il carattere «%»: %%."
-#: ../plugins/core_preferences/core_prefs.xml.h:14
-msgid "<b>Volume Normalization</b>"
-msgstr "<b>Normalizzazione del volume</b>"
+#: ../plugins/core_preferences/core_prefs.xml.h:25
+msgid "Overwrite existing tags"
+msgstr "Sovrascrivere le etichette esistenti"
-#: ../plugins/core_preferences/core_prefs.xml.h:15
-msgid "<b>When Attempting to Add an Existing Track</b>"
-msgstr "<b>Quando si tenta di aggiungere una traccia già esistente</b>"
+#: ../plugins/core_preferences/core_prefs.xml.h:26
+msgid "Cover Art Search Preferences"
+msgstr "Preferenze ricerca copertine"
-#: ../plugins/core_preferences/core_prefs.xml.h:16
-msgid "<i>aacgain</i> executable:"
-msgstr "Eseguibile <i>aacgain</i>:"
+#: ../plugins/core_preferences/core_prefs.xml.h:27
+msgid "Cover art file pattern:"
+msgstr "Modello file della copertina:"
-#: ../plugins/core_preferences/core_prefs.xml.h:17
-msgid "<i>mp3gain</i> executable:"
-msgstr "Eseguibile <i>mp3gain</i>:"
+#: ../plugins/core_preferences/core_prefs.xml.h:29
+#, no-c-format
+msgid ""
+"You can separate several templates by a ';'. The first one matching the "
+"filename will be used.\n"
+"\n"
+"Examples:\n"
+"- <i>folder.jpg</i>: Use <i>folder.jpg</i> as cover art.\n"
+"- <i>folder</i>: Use <i>folder.jpg</i>, <i>folder.png</i>...\n"
+"- <i>../%A.jpg</i>: Use <i><Album>.jpg</i> in the parent directory\n"
+"- <i>%A</i>: Use <i><Album>.jpg</i>, <i><Album>.png</i>...\n"
+"- <i>folder.jpg;%a.jpg</i>: First try <i>folder.jpg</i>, then <i><"
+"artist>.jpg</i>\n"
+"\n"
+"- artist: %a\n"
+"- album: %A\n"
+"- composer: %c\n"
+"- title: %t\n"
+"- genre: %G\n"
+"- track nr: %T\n"
+"- CD nr: %C\n"
+"- year: %Y\n"
+"- skip data: %*\n"
+"- the character '%': %%."
+msgstr ""
+"È possibile separare diversi modelli con «;». Sarà usato il primo che "
+"coincide con il nome del file.\n"
+"\n"
+"Esempi:\n"
+"- <i>folder.jpg</i>: Usa <i>folder.jpg</i> come copertina.\n"
+"- <i>folder</i>: Usa <i>folder.jpg</i>, <i>folder.png</i>...\n"
+"- <i>../%A.jpg</i>: Usa <i><Album>.jpg</i> nella directory superiore\n"
+"- <i>%A</i>: Usa <i><Album>.jpg</i>, <i><Album>.png</i>...\n"
+"- <i>folder.jpg;%a.jpg</i>: Prima prova <i>folder.jpg</i>, poi <i><"
+"artista>.jpg</i>\n"
+"\n"
+"- artista: %a\n"
+"- album: %A\n"
+"- compositore: %c\n"
+"- titolo: %t\n"
+"- genere: %G\n"
+"- n° traccia: %T\n"
+"- n° CD: %C\n"
+"- anno: %Y\n"
+"- salta dati: %*\n"
+"- il carattere «%»: %%."
-#: ../plugins/core_preferences/core_prefs.xml.h:18
-msgid "AAC"
-msgstr "AAC"
+#: ../plugins/core_preferences/core_prefs.xml.h:48
+msgid "Video Thumbnail Generation"
+msgstr "Generazione miniature video"
-#: ../plugins/core_preferences/core_prefs.xml.h:19
-msgid "About unupdated tracks"
-msgstr "Sulle tracce non aggiornate"
+#: ../plugins/core_preferences/core_prefs.xml.h:49
+msgid "Video thumbnailing program:"
+msgstr "Programma per generare le miniature video:"
-#: ../plugins/core_preferences/core_prefs.xml.h:20
-msgid "About updated tracks"
-msgstr "Sulle tracce aggiornate"
+#: ../plugins/core_preferences/core_prefs.xml.h:51
+#, no-c-format
+msgid ""
+"Provide a shell command to generate a thumbnail image of your video file. "
+"The following format strings will be expanded:\n"
+"- %f: the input file\n"
+"- %o: the output file (which is automatically generated)\n"
+msgstr ""
+"Fornire un comando della shell per generare un'immagine in miniatura del "
+"file video. Le seguenti stringhe di formato saranno espanse:\n"
+"- %f: il nome del file di input\n"
+"- %o: il nome del file di output (generato automaticamente)\n"
-#: ../plugins/core_preferences/core_prefs.xml.h:21
-msgid "Add cover art using file name template"
-msgstr "Aggiungere la copertina usando un modello di nome di file"
+#: ../plugins/core_preferences/core_prefs.xml.h:55
+msgid "Exclusions List"
+msgstr "Elenco esclusioni"
-#: ../plugins/core_preferences/core_prefs.xml.h:22
+#: ../plugins/core_preferences/core_prefs.xml.h:56
msgid ""
"Add file masks to be excluded from import and synchronization, for example, "
"<i>*.mp3</i>."
@@ -2609,257 +2698,98 @@ msgstr ""
"Aggiungere le maschere dei file da escludere dall'importazione e dalla "
"sincronizzazione, ad esempio <i>*.mp3</i>."
-#: ../plugins/core_preferences/core_prefs.xml.h:23
-msgid "Add subfolders recursively"
-msgstr "Aggiungere le sottocartelle ricorsivamente"
+#: ../plugins/core_preferences/core_prefs.xml.h:57
+msgid "<i>aacgain</i> executable:"
+msgstr "Eseguibile <i>aacgain</i>:"
-#: ../plugins/core_preferences/core_prefs.xml.h:25
-msgid "Album gain (formerly \"audiophile gain\")"
-msgstr "Guadagno album (già «Guadagno audiophile»)"
+#: ../plugins/core_preferences/core_prefs.xml.h:58
+msgid "<i>mp3gain</i> executable:"
+msgstr "Eseguibile <i>mp3gain</i>:"
-#: ../plugins/core_preferences/core_prefs.xml.h:26
-msgid "Allow duplicate files"
-msgstr "Permettere file duplicati"
-
-#: ../plugins/core_preferences/core_prefs.xml.h:27
-msgid "Also use this encoding when updating or synchronizing tracks"
-msgstr ""
-"Usare questa codifica anche durante l'aggiornamento e la sincronizzazione "
-"delle tracce"
-
-#: ../plugins/core_preferences/core_prefs.xml.h:28
-msgid "Also use this encoding when writing tracks"
-msgstr "Usare questa codifica anche durante la scrittura delle tracce"
-
-#: ../plugins/core_preferences/core_prefs.xml.h:30
-msgid "Automatically generate video thumbnails"
-msgstr "Generare automaticamente le miniature dei video"
-
-#: ../plugins/core_preferences/core_prefs.xml.h:31
-msgid "Cache folder:"
-msgstr "Cartella per la cache:"
-
-#: ../plugins/core_preferences/core_prefs.xml.h:33
-msgid "Confirm deletion of playlists or tracks from a playlist"
-msgstr ""
-"Confermare l'eliminazione delle playlist o delle tracce da una playlist"
-
-#: ../plugins/core_preferences/core_prefs.xml.h:34
-msgid "Confirm deletion of tracks during synchronization"
-msgstr "Confermare l'eliminazione delle tracce durante la sincronizzazione"
+#: ../plugins/core_preferences/core_prefs.xml.h:59
+#: ../plugins/repository_editor/repository_editor.xml.h:25
+msgid "..."
+msgstr "..."
-#: ../plugins/core_preferences/core_prefs.xml.h:35
-msgid "Confirm deletion of tracks:"
-msgstr "Confermare l'eliminazione delle tracce:"
+#: ../plugins/core_preferences/core_prefs.xml.h:60
+msgid "<b>Volume Normalization</b>"
+msgstr "<b>Normalizzazione del volume</b>"
-#: ../plugins/core_preferences/core_prefs.xml.h:36
+#: ../plugins/core_preferences/core_prefs.xml.h:61
msgid "Conversion Preferences"
msgstr "Preferenze di conversione"
-#: ../plugins/core_preferences/core_prefs.xml.h:37
-msgid "Conversion Settings..."
-msgstr "Impostazioni di conversione..."
-
-#: ../plugins/core_preferences/core_prefs.xml.h:38
-msgid "Convert AAC (M4A)"
-msgstr "Convertire AAC (M4A)"
+#: ../plugins/core_preferences/core_prefs.xml.h:62
+msgid "Convert compatible formats to a single format"
+msgstr "Convertire in un singolo formato i formati compatibili"
-#: ../plugins/core_preferences/core_prefs.xml.h:39
+#: ../plugins/core_preferences/core_prefs.xml.h:63
msgid "Convert MP3"
msgstr "Convertire MP3"
-#: ../plugins/core_preferences/core_prefs.xml.h:40
+#: ../plugins/core_preferences/core_prefs.xml.h:64
+msgid "Convert AAC (M4A)"
+msgstr "Convertire AAC (M4A)"
+
+#: ../plugins/core_preferences/core_prefs.xml.h:65
msgid "Convert WAV"
msgstr "Convertire WAV"
-#: ../plugins/core_preferences/core_prefs.xml.h:41
-msgid "Convert compatible formats to a single format"
-msgstr "Convertire in un singolo formato i formati compatibili"
-
-#: ../plugins/core_preferences/core_prefs.xml.h:42
-msgid "Convert incompatible audio formats to:"
-msgstr "Convertire formati audio incompatibili in:"
-
-#: ../plugins/core_preferences/core_prefs.xml.h:43
-msgid "Cover Art Search Preferences"
-msgstr "Preferenze ricerca copertine"
-
-#: ../plugins/core_preferences/core_prefs.xml.h:44
-msgid "Cover art file pattern:"
-msgstr "Modello file della copertina:"
-
-#: ../plugins/core_preferences/core_prefs.xml.h:45
-msgid "Customize..."
-msgstr "Personalizza..."
-
-#: ../plugins/core_preferences/core_prefs.xml.h:46
-msgid "Delete missing tracks when synchronizing playlists"
-msgstr ""
-"Eliminare le tracce inesistenti durante la sincronizzazione delle playlist"
-
-#: ../plugins/core_preferences/core_prefs.xml.h:47
-msgid "Display conversion log"
-msgstr "Mostrare il registro di conversione"
-
-#: ../plugins/core_preferences/core_prefs.xml.h:48
-msgid "Display information about detected duplicate files"
-msgstr "Mostrare le informazioni sui file duplicati individuati"
-
-#: ../plugins/core_preferences/core_prefs.xml.h:49
-msgid "Display messages and warnings at startup"
-msgstr "Mostrare i messaggi e gli avvisi all'avvio"
-
-#: ../plugins/core_preferences/core_prefs.xml.h:50
-msgid "Display synchronization results"
-msgstr "Mostrare i risultati della sincronizzazione"
-
-#: ../plugins/core_preferences/core_prefs.xml.h:51
-msgid "Encoding Preferences"
-msgstr "Preferenze codifica"
-
-#: ../plugins/core_preferences/core_prefs.xml.h:52
-msgid "Encoding..."
-msgstr "Codifica..."
-
-#: ../plugins/core_preferences/core_prefs.xml.h:53
-msgid "Excluded files..."
-msgstr "File esclusi..."
-
-#: ../plugins/core_preferences/core_prefs.xml.h:54
-msgid "Exclusions List"
-msgstr "Elenco esclusioni"
-
-#: ../plugins/core_preferences/core_prefs.xml.h:55
-msgid "Feedback"
-msgstr "Notifiche"
-
-#: ../plugins/core_preferences/core_prefs.xml.h:56
-msgid "Filename Parse Preferences"
-msgstr "Preferenze per l'analisi del nome del file"
-
-#: ../plugins/core_preferences/core_prefs.xml.h:57
-msgid "Filename parse pattern:"
-msgstr "Modello per l'analisi del nome del file:"
-
-#: ../plugins/core_preferences/core_prefs.xml.h:58
-msgid "From the hard disk"
-msgstr "Dal disco fisso"
-
-#: ../plugins/core_preferences/core_prefs.xml.h:59
-msgid "From the iPod"
-msgstr "Dall'iPod"
-
-#: ../plugins/core_preferences/core_prefs.xml.h:60
-msgid "From the local database"
-msgstr "Dal database locale"
+#: ../plugins/core_preferences/core_prefs.xml.h:66
+msgid "<b>Compatible Formats</b>"
+msgstr "<b>Formati compatibili</b>"
-#: ../plugins/core_preferences/core_prefs.xml.h:61
+#: ../plugins/core_preferences/core_prefs.xml.h:67
#: ../plugins/info_display/info.c:371
#: ../plugins/playlist_display/playlist_display_spl.c:168
msgid "GB"
msgstr "GB"
-#: ../plugins/core_preferences/core_prefs.xml.h:63
-msgid "Include tracks never played in the \"Best Rated\" playlist"
-msgstr "Includere anche le tracce mai ascoltate nella playlist «Voto migliore»"
-
-#: ../plugins/core_preferences/core_prefs.xml.h:64
-msgid "MP3"
-msgstr "MP3"
-
-#: ../plugins/core_preferences/core_prefs.xml.h:65
-msgid "Mass-modify tags when multiple tracks are selected"
-msgstr "Modificare le etichette in blocco quando sono selezionate più tracce"
+#: ../plugins/core_preferences/core_prefs.xml.h:68
+msgid "Cache folder:"
+msgstr "Cartella per la cache:"
-#: ../plugins/core_preferences/core_prefs.xml.h:66
+#: ../plugins/core_preferences/core_prefs.xml.h:69
msgid "Maximum cache size:"
msgstr "Dimensione massima della cache:"
-#: ../plugins/core_preferences/core_prefs.xml.h:67
+#: ../plugins/core_preferences/core_prefs.xml.h:70
msgid "Maximum threads:"
msgstr "Numero massimo di thread:"
-#: ../plugins/core_preferences/core_prefs.xml.h:68
-msgid "Metadata"
-msgstr "Metadati"
-
-#. Register actions
-#: ../plugins/core_preferences/core_prefs.xml.h:69 ../src/anjuta-app.c:511
-msgid "Music"
-msgstr "Musica"
-
-#: ../plugins/core_preferences/core_prefs.xml.h:70
-msgid "Normalization..."
-msgstr "Normalizzazione..."
-
#: ../plugins/core_preferences/core_prefs.xml.h:71
-msgid ""
-"Normally, the encoding specified above will only be used when importing new "
-"tracks, and for any operations involving existing tracks, the encoding "
-"specified when the file was first imported will be used. You can use the "
-"options below to override this behavior, in case you specified the encoding "
-"incorrectly for the first import."
-msgstr ""
-"Normalmente la codifica specificata sopra sarà usata solo per importare "
-"nuove tracce, mentre per qualsiasi operazione che coinvolga tracce esistenti "
-"sarà usata la codifica specificata quando il file fu importato. È possibile "
-"usare le opzioni qui sotto per scavalcare questo comportamento se era stata "
-"specificata una codifica errata durante la prima importazione."
+msgid "Display conversion log"
+msgstr "Mostrare il registro di conversione"
#: ../plugins/core_preferences/core_prefs.xml.h:72
-msgid "Number of tracks:"
-msgstr "Numero di tracce:"
+msgid "<b>Conversion Settings</b>"
+msgstr "<b>Impostazioni per la conversione</b>"
#: ../plugins/core_preferences/core_prefs.xml.h:73
-msgid "Overwrite existing tags"
-msgstr "Sovrascrivere le etichette esistenti"
-
-#: ../plugins/core_preferences/core_prefs.xml.h:74
-msgid "Parse file name to set missing tags"
-msgstr "Analizzare il nome del file per impostare le etichette mancanti"
-
-#: ../plugins/core_preferences/core_prefs.xml.h:76
-#, no-c-format
-msgid ""
-"Provide a shell command to generate a thumbnail image of your video file. "
-"The following format strings will be expanded:\n"
-"- %f: the input file\n"
-"- %o: the output file (which is automatically generated)\n"
-msgstr ""
-"Fornire un comando della shell per generare un'immagine in miniatura del "
-"file video. Le seguenti stringhe di formato saranno espanse:\n"
-"- %f: il nome del file di input\n"
-"- %o: il nome del file di output (generato automaticamente)\n"
-
-#: ../plugins/core_preferences/core_prefs.xml.h:80
-msgid "Read embedded cover art information"
-msgstr "Leggere le informazioni incorporate sulle copertine"
-
-#: ../plugins/core_preferences/core_prefs.xml.h:81
-msgid "Read embedded tags from music files"
-msgstr "Leggere le etichette incorporate dai file musicali"
-
-#: ../plugins/core_preferences/core_prefs.xml.h:82
msgid "ReplayGain Preferences"
msgstr "Preferenze di ReplayGain"
-#: ../plugins/core_preferences/core_prefs.xml.h:83
-msgid "ReplayGain..."
-msgstr "ReplayGain..."
+#: ../plugins/core_preferences/core_prefs.xml.h:74
+msgid "Album gain (formerly \"audiophile gain\")"
+msgstr "Guadagno album (già «Guadagno audiophile»)"
-#: ../plugins/core_preferences/core_prefs.xml.h:84
-msgid "Set still missing tags to file name"
-msgstr "Impostare con il nome del file le etichette ancora mancanti:"
+#: ../plugins/core_preferences/core_prefs.xml.h:75
+msgid "Track gain (formerly \"radio gain\")"
+msgstr "Guadagno album (già «Guadagno radio»)"
-#: ../plugins/core_preferences/core_prefs.xml.h:85
-msgid "Skip the track"
-msgstr "Saltare la traccia"
+#: ../plugins/core_preferences/core_prefs.xml.h:76
+msgid "<b>Preferred gain type</b>"
+msgstr "<b>Tipo di guadagno preferito</b>"
-#: ../plugins/core_preferences/core_prefs.xml.h:86
-msgid "Tag and filename encoding:"
-msgstr "Codifica etichetta e nome file"
+#: ../plugins/core_preferences/core_prefs.xml.h:77
+msgid "dB"
+msgstr "dB"
-#: ../plugins/core_preferences/core_prefs.xml.h:87
+#: ../plugins/core_preferences/core_prefs.xml.h:78
+msgid "<b>Offset to add to ReplayGain</b>"
+msgstr "<b>Scostamento da aggiungere a ReplayGain</b>"
+
+#: ../plugins/core_preferences/core_prefs.xml.h:79
msgid ""
"These settings will only be applied to newly added or updated tracks. This "
"could result in tracks that are normalized to different levels until updated."
@@ -2868,36 +2798,24 @@ msgstr ""
"da ora in poi. Ciò significa che alcune tracce potrebbero essere "
"normalizzate a livelli differenti fino a quando non saranno aggiornate."
-#: ../plugins/core_preferences/core_prefs.xml.h:88
-msgid "Threshold for import of tracks before a save triggered:"
-msgstr ""
-"Soglia per l'importazione delle tracce prima che scatti un salvataggio:"
-
-#: ../plugins/core_preferences/core_prefs.xml.h:90
-msgid "Track gain (formerly \"radio gain\")"
-msgstr "Guadagno album (già «Guadagno radio»)"
-
-#: ../plugins/core_preferences/core_prefs.xml.h:91
+#: ../plugins/core_preferences/core_prefs.xml.h:80
msgid "Transfer tracks in background mode"
msgstr "Trasferire le tracce con la modalità sullo sfondo"
-#: ../plugins/core_preferences/core_prefs.xml.h:92
-msgid "Update information about the existing track"
-msgstr "Aggiornare le informazioni sulla traccia esistente"
-
-#: ../plugins/core_preferences/core_prefs.xml.h:93
-msgid "Use legacy format for MP3 tags"
-msgstr "Usare il vecchio formato per le etichette MP3"
+#: ../plugins/core_preferences/core_prefs.xml.h:81
+msgid "Add subfolders recursively"
+msgstr "Aggiungere le sottocartelle ricorsivamente"
-#: ../plugins/core_preferences/core_prefs.xml.h:94
-msgid "Video Thumbnail Generation"
-msgstr "Generazione miniature video"
+#: ../plugins/core_preferences/core_prefs.xml.h:82
+msgid "Allow duplicate files"
+msgstr "Permettere file duplicati"
-#: ../plugins/core_preferences/core_prefs.xml.h:95
-msgid "Video thumbnailing program:"
-msgstr "Programma per generare le miniature video:"
+#: ../plugins/core_preferences/core_prefs.xml.h:83
+msgid "Delete missing tracks when synchronizing playlists"
+msgstr ""
+"Eliminare le tracce inesistenti durante la sincronizzazione delle playlist"
-#: ../plugins/core_preferences/core_prefs.xml.h:96
+#: ../plugins/core_preferences/core_prefs.xml.h:84
msgid ""
"When multiple tracks are added to a repository, should an\n"
"error occur then it is likely, without saving all added tracks\n"
@@ -2908,107 +2826,197 @@ msgid ""
"The default is 10 so after 10 tracks have been added a save\n"
"will be imposed on the repository."
msgstr ""
-"Quando più tracce sono aggiunte all'archivio, qualora siverifichi un errore, "
-"è probabile che in mancanza di un salvataggio, tutte le tracce aggiunte "
-"siano perse in quanto non salvate. Questa preferenza permette di effettuare "
-"un'operazione di salvataggio dopo il numero specificato di tracce.\n"
+"Quando più tracce sono aggiunte all'archivio, qualora si verifichi un "
+"errore, è probabile che in mancanza di un salvataggio, tutte le tracce "
+"aggiunte siano perse in quanto non salvate. Questa preferenza permette di "
+"effettuare un'operazione di salvataggio dopo il numero specificato di "
+"tracce.\n"
"\n"
"Il valore predefinito è 10 per cui dopo che sono state aggiunte 10 tracce "
"verrà imposto un salvataggio dell'archivio."
-#: ../plugins/core_preferences/core_prefs.xml.h:104
-msgid "When updating tracks, display information:"
-msgstr "Durante l'aggiornamento delle tracce mostrare informazioni:"
+#: ../plugins/core_preferences/core_prefs.xml.h:92
+msgid "Threshold for import of tracks before a save triggered:"
+msgstr ""
+"Soglia per l'importazione delle tracce prima che scatti un salvataggio:"
+
+#: ../plugins/core_preferences/core_prefs.xml.h:93
+msgid "Excluded files..."
+msgstr "File esclusi..."
+
+#: ../plugins/core_preferences/core_prefs.xml.h:94
+msgid "Encoding..."
+msgstr "Codifica..."
+
+#: ../plugins/core_preferences/core_prefs.xml.h:95
+msgid "Normalization..."
+msgstr "Normalizzazione..."
+
+#: ../plugins/core_preferences/core_prefs.xml.h:96
+msgid "ReplayGain..."
+msgstr "ReplayGain..."
+
+#: ../plugins/core_preferences/core_prefs.xml.h:97
+msgid "<b>Import and Synchronization</b>"
+msgstr "<b>Importazione e sincronizzazione</b>"
+
+#: ../plugins/core_preferences/core_prefs.xml.h:98
+msgid "Update information about the existing track"
+msgstr "Aggiornare le informazioni sulla traccia esistente"
+
+#: ../plugins/core_preferences/core_prefs.xml.h:99
+msgid "Skip the track"
+msgstr "Saltare la traccia"
+
+#: ../plugins/core_preferences/core_prefs.xml.h:100
+msgid "<b>When Attempting to Add an Existing Track</b>"
+msgstr "<b>Quando si tenta di aggiungere una traccia già esistente</b>"
+
+#: ../plugins/core_preferences/core_prefs.xml.h:101
+msgid "Number of tracks:"
+msgstr "Numero di tracce:"
+
+#: ../plugins/core_preferences/core_prefs.xml.h:102
+msgid "Include tracks never played in the \"Best Rated\" playlist"
+msgstr "Includere anche le tracce mai ascoltate nella playlist «Voto migliore»"
+
+#: ../plugins/core_preferences/core_prefs.xml.h:103
+msgid "<b>Auto-Generated Playlists</b>"
+msgstr "<b>Playlist generate automaticamente</b>"
+
+#: ../plugins/core_preferences/core_prefs.xml.h:104
+msgid "Convert incompatible audio formats to:"
+msgstr "Convertire formati audio incompatibili in:"
#: ../plugins/core_preferences/core_prefs.xml.h:105
+msgid "Conversion Settings..."
+msgstr "Impostazioni di conversione..."
+
+#: ../plugins/core_preferences/core_prefs.xml.h:106
+msgid "<b>On-the-fly Conversion</b>"
+msgstr "<b>Conversione al volo</b>"
+
+#. Register actions
+#: ../plugins/core_preferences/core_prefs.xml.h:107 ../src/anjuta-app.c:511
+msgid "Music"
+msgstr "Musica"
+
+#: ../plugins/core_preferences/core_prefs.xml.h:108
+msgid "Read embedded tags from music files"
+msgstr "Leggere le etichette incorporate dai file musicali"
+
+#: ../plugins/core_preferences/core_prefs.xml.h:109
+msgid "Parse file name to set missing tags"
+msgstr "Analizzare il nome del file per impostare le etichette mancanti"
+
+#: ../plugins/core_preferences/core_prefs.xml.h:110
+msgid "Customize..."
+msgstr "Personalizza..."
+
+#: ../plugins/core_preferences/core_prefs.xml.h:111
+msgid "Set still missing tags to file name"
+msgstr "Impostare con il nome del file le etichette ancora mancanti"
+
+#: ../plugins/core_preferences/core_prefs.xml.h:117
+msgid "<b>Tags</b>"
+msgstr "<b>Etichette</b>"
+
+#: ../plugins/core_preferences/core_prefs.xml.h:118
+msgid "Mass-modify tags when multiple tracks are selected"
+msgstr "Modificare le etichette in blocco quando sono selezionate più tracce"
+
+#: ../plugins/core_preferences/core_prefs.xml.h:119
msgid "Write tags to disk when edited"
msgstr "Scrivere le etichette sul disco quando vengono modificate"
-#: ../plugins/core_preferences/core_prefs.xml.h:107
-#, no-c-format
-msgid ""
-"You can separate several templates by a ';'. The first one matching the "
-"filename will be used.\n"
-"\n"
-"Example: <i>%a - %A/%T %t.mp3;%t.wav</i>.\n"
-"\n"
-"- artist: %a\n"
-"- album: %A\n"
-"- composer: %c\n"
-"- title: %t\n"
-"- genre: %G\n"
-"- track nr: %T\n"
-"- CD nr: %C\n"
-"- year: %Y\n"
-"- skip data: %*\n"
-"- the character '%': %%."
-msgstr ""
-"È possibile separare diversi modelli con «;». Sarà usato il primo che "
-"coincide con il nome del file.\n"
-"\n"
-"Esempio: <i>%a - %A/%T %t.mp3;%t.wav</i>.\n"
-"\n"
-"- artista: %a\n"
-"- album: %A\n"
-"- compositore: %c\n"
-"- titolo: %t\n"
-"- genere: %G\n"
-"- n° traccia: %T\n"
-"- n° CD: %C\n"
-"- anno: %Y\n"
-"- salta dati: %*\n"
-"- il carattere «%»: %%."
+#: ../plugins/core_preferences/core_prefs.xml.h:120
+msgid "Use legacy format for MP3 tags"
+msgstr "Usare il vecchio formato per le etichette MP3"
+
+#: ../plugins/core_preferences/core_prefs.xml.h:121
+msgid "<b>Tag Editing</b>"
+msgstr "<b>Modifica etichette</b>"
#: ../plugins/core_preferences/core_prefs.xml.h:122
-#, no-c-format
-msgid ""
-"You can separate several templates by a ';'. The first one matching the "
-"filename will be used.\n"
-"\n"
-"Examples:\n"
-"- <i>folder.jpg</i>: Use <i>folder.jpg</i> as cover art.\n"
-"- <i>folder</i>: Use <i>folder.jpg</i>, <i>folder.png</i>...\n"
-"- <i>../%A.jpg</i>: Use <i><Album>.jpg</i> in the parent directory\n"
-"- <i>%A</i>: Use <i><Album>.jpg</i>, <i><Album>.png</i>...\n"
-"- <i>folder.jpg;%a.jpg</i>: First try <i>folder.jpg</i>, then <i><"
-"artist>.jpg</i>\n"
-"\n"
-"- artist: %a\n"
-"- album: %A\n"
-"- composer: %c\n"
-"- title: %t\n"
-"- genre: %G\n"
-"- track nr: %T\n"
-"- CD nr: %C\n"
-"- year: %Y\n"
-"- skip data: %*\n"
-"- the character '%': %%."
+msgid "Read embedded cover art information"
+msgstr "Leggere le informazioni incorporate sulle copertine"
+
+#: ../plugins/core_preferences/core_prefs.xml.h:123
+msgid "Add cover art using file name template"
+msgstr "Aggiungere la copertina usando un modello di nome di file"
+
+#: ../plugins/core_preferences/core_prefs.xml.h:124
+msgid "Automatically generate video thumbnails"
+msgstr "Generare automaticamente le miniature dei video"
+
+#: ../plugins/core_preferences/core_prefs.xml.h:125
+m...
[truncated message content] |
|
From: dforsi <df...@us...> - 2012-07-13 22:24:50
|
commit 5c204698ea61b15fbd98afe53b9addd8626bb561
Author: Daniele Forsi <da...@fo...>
Date: Sat Jul 14 00:20:13 2012 +0200
Make more strings translatable
Add *.plugin.in for of Clarity and External Player plugins and fix
an existing entry.
po/POTFILES.in | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
---
diff --git a/po/POTFILES.in b/po/POTFILES.in
index af2c6ef..9efae1b 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -122,13 +122,15 @@ plugins/track_display/plugin.c
plugins/track_display/track_display_context_menu.c
[type: gettext/ini]plugins/track_display/track_display.plugin.in
plugins/track_display/track_display_preferences.c
-[type: gettext/ini]plugins/clarity/clarity.xml
+[type: gettext/glade]plugins/clarity/clarity.xml
+[type: gettext/ini]plugins/clarity/clarity.plugin.in
plugins/clarity/clarity_context_menu.c
plugins/clarity/clarity_dnd_support.c
plugins/clarity/fetchcover.c
plugins/clarity/plugin.c
plugins/external_player/plugin.c
[type: gettext/glade]plugins/external_player/external_player.xml
+[type: gettext/ini]plugins/external_player/external_player.plugin.in
plugins/external_player/plugin.c
plugins/sjcd/egg-play-preview.c
plugins/sjcd/libjuicer/sj-extractor.c
|
|
From: dforsi <df...@us...> - 2012-07-13 22:24:44
|
commit 991b17e33e7a5d0715966b3d293ad6efa459babb
Author: Daniele Forsi <da...@fo...>
Date: Fri Jul 13 23:44:45 2012 +0200
Fix memleak
plugins/sorttab_display/plugin.c | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
---
diff --git a/plugins/sorttab_display/plugin.c b/plugins/sorttab_display/plugin.c
index fef6383..5656a5e 100644
--- a/plugins/sorttab_display/plugin.c
+++ b/plugins/sorttab_display/plugin.c
@@ -181,6 +181,7 @@ static gboolean activate_sorttab_display_plugin(AnjutaPlugin *plugin) {
gchar *glade_path = g_build_filename(get_glade_dir(), "sorttab_display.xml", NULL);
sorttab_display_new(GTK_PANED(sorttab_display_plugin->sort_tab_widget_parent), glade_path);
+ g_free(glade_path);
gtk_widget_show(sorttab_display_plugin->sort_tab_widget_parent);
g_signal_connect (gtkpod_app, SIGNAL_PLAYLIST_SELECTED, G_CALLBACK (sorttab_display_select_playlist_cb), NULL);
|
|
From: dforsi <df...@us...> - 2012-07-13 20:51:53
|
commit 50b15b8dd5a067874e0ffa284d607a1df371007b
Author: Daniele Forsi <da...@fo...>
Date: Fri Jul 13 22:49:53 2012 +0200
Make another string translatable
Add 2 leading spaces like similar strings.
plugins/clarity/plugin.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
---
diff --git a/plugins/clarity/plugin.c b/plugins/clarity/plugin.c
index ba0436b..c3c1123 100644
--- a/plugins/clarity/plugin.c
+++ b/plugins/clarity/plugin.c
@@ -91,7 +91,7 @@ static gboolean activate_plugin(AnjutaPlugin *plugin) {
clarity_plugin->clarity_widget = CLARITY_WIDGET(clarity_widget_new ());
gtk_scrolled_window_add_with_viewport(clarity_plugin->cover_window, GTK_WIDGET(clarity_plugin->clarity_widget));
gtk_widget_show_all(GTK_WIDGET(clarity_plugin->cover_window));
- anjuta_shell_add_widget(plugin->shell, GTK_WIDGET(clarity_plugin->cover_window), "ClarityPlugin", "Clarity Cover Display", NULL, ANJUTA_SHELL_PLACEMENT_CENTER, NULL);
+ anjuta_shell_add_widget(plugin->shell, GTK_WIDGET(clarity_plugin->cover_window), "ClarityPlugin", _(" Clarity Cover Display"), NULL, ANJUTA_SHELL_PLACEMENT_CENTER, NULL);
g_signal_connect (gtkpod_app, SIGNAL_PREFERENCE_CHANGE, G_CALLBACK (clarity_widget_preference_changed_cb), clarity_plugin->clarity_widget);
g_signal_connect (gtkpod_app, SIGNAL_PLAYLIST_SELECTED, G_CALLBACK (clarity_widget_playlist_selected_cb), clarity_plugin->clarity_widget);
|
|
From: dforsi <df...@us...> - 2012-07-13 20:51:47
|
commit f8be71f0a51fa8c8ada982286a3ff5d502a8d46c
Author: Daniele Forsi <da...@fo...>
Date: Fri Jul 13 21:26:10 2012 +0200
Fix multiple icons appearing when toggling plugins in preferences window
The anjuta_preferences_dialog_add_page() was using the translated string
while anjuta_preferences_remove_page() was using the untranslated string.
Make the code similar to most plugins.
Fixes:
libanjuta-WARNING **: Could not find page to remove
Program received signal SIGTRAP, Trace/breakpoint trap.
0xb74a9f81 in g_logv () from /lib/i386-linux-gnu/libglib-2.0.so.0
(gdb) bt
[...]
#2 0xb7ef4b40 in anjuta_preferences_dialog_remove_page () from /usr/lib/libanjuta-3.so.0
#3 0xb7ef5c3b in anjuta_preferences_remove_page () from /usr/lib/libanjuta-3.so.0
#4 0xa61abc45 in ipreferences_unmerge (ipref=0x855f650, prefs=0x83b0a60, e=0x0) at plugin.c:446
[...]
plugins/external_player/plugin.c | 4 ++--
plugins/playlist_display/plugin.c | 4 ++--
plugins/sjcd/plugin.c | 4 ++--
3 files changed, 6 insertions(+), 6 deletions(-)
---
diff --git a/plugins/external_player/plugin.c b/plugins/external_player/plugin.c
index 55c44fe..334f3b8 100644
--- a/plugins/external_player/plugin.c
+++ b/plugins/external_player/plugin.c
@@ -38,7 +38,7 @@
#include "plugin.h"
#include "external_player.h"
-#define TAB_NAME "External Media Player"
+#define TAB_NAME _("External Media Player")
/* Parent class. Part of standard class definition */
static gpointer parent_class;
@@ -137,7 +137,7 @@ static void ipreferences_merge(IAnjutaPreferences* ipref, AnjutaPreferences* pre
scaled = gdk_pixbuf_scale_simple(pixbuf, 48, 48, GDK_INTERP_BILINEAR);
- anjuta_preferences_dialog_add_page(ANJUTA_PREFERENCES_DIALOG (anjuta_preferences_get_dialog (prefs)), "gtkpod-external-player-settings", _(TAB_NAME), scaled, plugin->prefs);
+ anjuta_preferences_dialog_add_page(ANJUTA_PREFERENCES_DIALOG (anjuta_preferences_get_dialog (prefs)), "gtkpod-external-player-settings", TAB_NAME, scaled, plugin->prefs);
g_object_unref(scaled);
g_object_unref(pixbuf);
}
diff --git a/plugins/playlist_display/plugin.c b/plugins/playlist_display/plugin.c
index 9ef7016..03d506f 100644
--- a/plugins/playlist_display/plugin.c
+++ b/plugins/playlist_display/plugin.c
@@ -47,7 +47,7 @@
#define PREFERENCE_ICON "playlist_display-playlist-category"
#define PREFERENCE_ICON_STOCK_ID "playlist_display-preference-icon"
-#define TAB_NAME N_("Playlist Display")
+#define TAB_NAME _("Playlist Display")
/* Parent class. Part of standard class definition */
static gpointer parent_class;
@@ -438,7 +438,7 @@ static void ipreferences_merge(IAnjutaPreferences* ipref, AnjutaPreferences* pre
g_error_free(error);
}
- anjuta_preferences_dialog_add_page(ANJUTA_PREFERENCES_DIALOG (anjuta_preferences_get_dialog (prefs)), "gtkpod-track-display-settings", _(TAB_NAME), pixbuf, plugin->prefs);
+ anjuta_preferences_dialog_add_page(ANJUTA_PREFERENCES_DIALOG (anjuta_preferences_get_dialog (prefs)), "gtkpod-track-display-settings", TAB_NAME, pixbuf, plugin->prefs);
g_object_unref(pixbuf);
}
diff --git a/plugins/sjcd/plugin.c b/plugins/sjcd/plugin.c
index 41bcb31..590cced 100644
--- a/plugins/sjcd/plugin.c
+++ b/plugins/sjcd/plugin.c
@@ -41,7 +41,7 @@
#define PREFERENCE_ICON "sjcd-category"
#define PREFERENCE_ICON_STOCK_ID "sjcd-preference-icon"
-#define TAB_NAME N_("Sound Juicer")
+#define TAB_NAME _("Sound Juicer")
/* Parent class. Part of standard class definition */
static gpointer parent_class;
@@ -125,7 +125,7 @@ static void ipreferences_merge(IAnjutaPreferences* ipref, AnjutaPreferences* pre
g_error_free(error);
}
- anjuta_preferences_dialog_add_page(ANJUTA_PREFERENCES_DIALOG (anjuta_preferences_get_dialog (prefs)), "gtkpod-track-display-settings", _(TAB_NAME), pixbuf, plugin->prefs);
+ anjuta_preferences_dialog_add_page(ANJUTA_PREFERENCES_DIALOG (anjuta_preferences_get_dialog (prefs)), "gtkpod-track-display-settings", TAB_NAME, pixbuf, plugin->prefs);
g_object_unref(pixbuf);
}
|
|
From: dforsi <df...@us...> - 2012-07-13 14:56:39
|
commit d7724bdbb4d40818c33b73a76a0af52b8cb909d8
Author: Daniele Forsi <da...@fo...>
Date: Fri Jul 13 16:08:28 2012 +0200
Fix segfault when using playcount spin buttons
All callbacks expect to receive a pointer to userdata.
Fixes:
(lt-gtkpod:7461): GLib-GObject-WARNING **: instance of invalid non-instantiatable type `<unknown>'
Program received signal SIGSEGV, Segmentation fault.
_get_sort_tab_widget_instance (self=0x84c3008) at special_sorttab_page.c:104
104 return sort_tab_widget_get_instance(priv->st_widget_parent);
(gdb) bt
[...]
plugins/sorttab_display/special_sorttab_page.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/plugins/sorttab_display/special_sorttab_page.c b/plugins/sorttab_display/special_sorttab_page.c
index 12015dd..0aaf996 100644
--- a/plugins/sorttab_display/special_sorttab_page.c
+++ b/plugins/sorttab_display/special_sorttab_page.c
@@ -571,7 +571,7 @@ GtkWidget *special_sort_tab_page_new(SortTabWidget *st_widget_parent, gchar *gla
g_signal_connect ((gpointer)w,
"value_changed",
G_CALLBACK (_on_sp_playcount_low_value_changed),
- sst);
+ userdata);
w = gtkpod_builder_xml_get_widget(special_xml, "sp_playcount_high");
gtk_spin_button_set_value(GTK_SPIN_BUTTON (w),
@@ -579,7 +579,7 @@ GtkWidget *special_sort_tab_page_new(SortTabWidget *st_widget_parent, gchar *gla
g_signal_connect ((gpointer)w,
"value_changed",
G_CALLBACK (_on_sp_playcount_high_value_changed),
- sst);
+ userdata);
/* PLAYED */
buf = prefs_get_string_index("sp_played_state", inst);
|
|
From: dforsi <df...@us...> - 2012-07-13 14:56:32
|
commit 2724e16a73702184235a3105615218b39cf7d07b
Author: Daniele Forsi <da...@fo...>
Date: Fri Jul 13 15:58:58 2012 +0200
gtkpod also manages photos on supported iPods
data/gtkpod.desktop.in | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
---
diff --git a/data/gtkpod.desktop.in b/data/gtkpod.desktop.in
index 30a306a..85d019b 100644
--- a/data/gtkpod.desktop.in
+++ b/data/gtkpod.desktop.in
@@ -1,7 +1,7 @@
[Desktop Entry]
_Name=gtkpod
_GenericName=iPod Manager
-_Comment=Manage music and video on an Apple iPod
+_Comment=Manage music, video and photos on an Apple iPod
Exec=gtkpod
Icon=gtkpod
Terminal=false
|
|
From: dforsi <df...@us...> - 2012-07-13 14:56:25
|
commit 21007b23c21d3a05dd90136a38efe19b0ed79e8f
Author: Daniele Forsi <da...@fo...>
Date: Fri Jul 13 11:33:22 2012 +0200
Replace g_warning() with g_message() since they are printed during normal use
Printing those as warnings would also interfere with the use of --g-fatal-warnings
for debugging with gdb.
plugins/sorttab_display/special_sorttab_page.c | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
---
diff --git a/plugins/sorttab_display/special_sorttab_page.c b/plugins/sorttab_display/special_sorttab_page.c
index 999f2a6..12015dd 100644
--- a/plugins/sorttab_display/special_sorttab_page.c
+++ b/plugins/sorttab_display/special_sorttab_page.c
@@ -269,7 +269,7 @@ static gboolean _sp_check_track(SpecialSortTabPage *self, Track *track) {
/* time added */
if (prefs_get_int_index("sp_added_cond", inst)) {
IntervalState result = _sp_check_time(self, T_TIME_ADDED, track);
- g_warning("time added result %d for track %s", result, track->title);
+ g_message("time added result %d for track %s", result, track->title);
if (sp_or && (result == IS_INSIDE))
return TRUE;
if ((!sp_or) && (result == IS_OUTSIDE))
@@ -278,7 +278,7 @@ static gboolean _sp_check_track(SpecialSortTabPage *self, Track *track) {
checked = TRUE;
}
- g_warning("Returning %d (checked %d) for track %s", result, checked, track->title);
+ g_message("Returning %d (checked %d) for track %s", result, checked, track->title);
if (checked)
return result;
else
@@ -360,7 +360,7 @@ static void _on_sp_cond_button_toggled(GtkToggleButton *togglebutton, gpointer u
guint32 inst = _get_sort_tab_widget_instance(pagedata->page);
T_item cond = (guint32) GPOINTER_TO_UINT(pagedata->data);
- g_warning("value of cond: %d", cond);
+ g_message("value of cond: %d", cond);
switch (cond) {
case T_RATING:
prefs_set_int_index("sp_rating_cond", inst, gtk_toggle_button_get_active(togglebutton));
|
|
From: dforsi <df...@us...> - 2012-07-13 14:56:19
|
commit b52bbddb5d92bc24d6e26779fd4537f7f196651b
Author: Daniele Forsi <da...@fo...>
Date: Fri Jul 13 11:20:56 2012 +0200
Remove empty and unused item from list of date types
Valid choices are Last Played, Last Modified and Added; choosing the
empty item prints on the terminal:
Programming error: cal_get_category () -- item not found.
plugins/sorttab_display/sorttab_display.xml | 3 ---
1 files changed, 0 insertions(+), 3 deletions(-)
---
diff --git a/plugins/sorttab_display/sorttab_display.xml b/plugins/sorttab_display/sorttab_display.xml
index 74802b1..b4a7178 100644
--- a/plugins/sorttab_display/sorttab_display.xml
+++ b/plugins/sorttab_display/sorttab_display.xml
@@ -574,9 +574,6 @@
<row>
<col id="0" translatable="yes">Added</col>
</row>
- <row>
- <col id="0" translatable="yes"></col>
- </row>
</data>
</object>
<object class="GtkWindow" id="preference_window">
|
|
From: dforsi <df...@us...> - 2012-07-12 15:22:44
|
commit 3045557e781d2a88ceb2755e6c5d248f7134fb85
Author: Daniele Forsi <da...@fo...>
Date: Thu Jul 12 14:45:55 2012 +0200
Only the box containing smart playlist rules need to expand
plugins/playlist_display/playlist_display.xml | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
---
diff --git a/plugins/playlist_display/playlist_display.xml b/plugins/playlist_display/playlist_display.xml
index a1fe119..52d4e44 100644
--- a/plugins/playlist_display/playlist_display.xml
+++ b/plugins/playlist_display/playlist_display.xml
@@ -379,7 +379,7 @@
</child>
</object>
<packing>
- <property name="expand">True</property>
+ <property name="expand">False</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
|
157 messages has been excluded from this view by a project administrator.
