diff options
| author |  Alexey Yakovenko <wakeroid@gmail.com> | 2010-05-23 16:48:04 +0200 |
|---|---|---|
| committer | Alexey Yakovenko <wakeroid@gmail.com> | 2010-05-23 16:48:04 +0200 |
| commit | b8a78d06685650a1bc8dd10d8b41cd07f705e354 (patch) | |
| tree | 3d4fa1538af8c53ae75ce8b3721f865c59c90de9 /plugins | |
| parent | f01a882aef6df0e0b06c2a14a71db9139aa18618 (diff) | |
| parent | be0f4b1926f7e77c7e03eae7b70ec12f1b905025 (diff) | |
Merge branch 'master' into i18n
Conflicts:
plugins/gtkui/interface.c
Diffstat (limited to 'plugins')
| -rw-r--r-- | plugins/gtkui/deadbeef.glade | 4 | ||||
| -rw-r--r-- | plugins/gtkui/interface.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/plugins/gtkui/deadbeef.glade b/plugins/gtkui/deadbeef.glade index 18d2ce04..ded6befc 100644 --- a/plugins/gtkui/deadbeef.glade +++ b/plugins/gtkui/deadbeef.glade @@ -2245,7 +2245,7 @@ Right</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="label" translatable="yes">Format conversions (start with %): - [a]rtist, [t]itle, al[b]um, [B]and, + [a]rtist, [t]itle, al[b]um, [B]and, [C]omposer track[n]umber, [N]totaltracks, [l]ength, [y]ear, [g]enre, [c]omment, copy[r]ight, [f]ilename, [T]ags @@ -5815,7 +5815,7 @@ SOCKS5_HOSTNAME</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="label" translatable="yes">Format conversions (start with %): - [a]rtist, [t]itle, al[b]um, [B]and, + [a]rtist, [t]itle, al[b]um, [B]and, [C]omposer track[n]umber, [N]totaltracks, [l]ength, [y]ear, [g]enre, [c]omment, copy[r]ight, [f]ilename, [T]ags diff --git a/plugins/gtkui/interface.c b/plugins/gtkui/interface.c index f88fd78c..29105a69 100644 --- a/plugins/gtkui/interface.c +++ b/plugins/gtkui/interface.c @@ -1456,7 +1456,7 @@ create_editcolumndlg (void) gtk_combo_box_append_text (GTK_COMBO_BOX (align), _("Left")); gtk_combo_box_append_text (GTK_COMBO_BOX (align), _("Right")); - label25 = gtk_label_new (_("Format conversions (start with %):\n [a]rtist, [t]itle, al[b]um, [B]and,\n track[n]umber, [N]totaltracks,\n [l]ength, [y]ear, [g]enre, [c]omment,\n copy[r]ight, [f]ilename, [T]ags\nExample: %a - %t [%l]")); + label25 = gtk_label_new (_("Format conversions (start with %):\n [a]rtist, [t]itle, al[b]um, [B]and, [C]omposer\n track[n]umber, [N]totaltracks,\n [l]ength, [y]ear, [g]enre, [c]omment,\n copy[r]ight, [f]ilename, [T]ags\nExample: %a - %t [%l]")); gtk_widget_show (label25); gtk_box_pack_start (GTK_BOX (vbox14), label25, TRUE, TRUE, 0); GTK_WIDGET_SET_FLAGS (label25, GTK_CAN_FOCUS); @@ -3004,7 +3004,7 @@ create_groupbydlg (void) gtk_entry_set_invisible_char (GTK_ENTRY (format), 9679); gtk_entry_set_activates_default (GTK_ENTRY (format), TRUE); - label82 = gtk_label_new (_("Format conversions (start with %):\n [a]rtist, [t]itle, al[b]um, [B]and,\n track[n]umber, [N]totaltracks,\n [l]ength, [y]ear, [g]enre, [c]omment,\n copy[r]ight, [f]ilename, [T]ags\nExample: %a - %t [%l]")); + label82 = gtk_label_new (_("Format conversions (start with %):\n [a]rtist, [t]itle, al[b]um, [B]and, [C]omposer\n track[n]umber, [N]totaltracks,\n [l]ength, [y]ear, [g]enre, [c]omment,\n copy[r]ight, [f]ilename, [T]ags\nExample: %a - %t [%l]")); gtk_widget_show (label82); gtk_box_pack_start (GTK_BOX (vbox25), label82, FALSE, FALSE, 0); GTK_WIDGET_SET_FLAGS (label82, GTK_CAN_FOCUS); |