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/gtkui/deadbeef.glade | |
| parent | f01a882aef6df0e0b06c2a14a71db9139aa18618 (diff) | |
| parent | be0f4b1926f7e77c7e03eae7b70ec12f1b905025 (diff) | |
Merge branch 'master' into i18n
Conflicts:
plugins/gtkui/interface.c
Diffstat (limited to 'plugins/gtkui/deadbeef.glade')
| -rw-r--r-- | plugins/gtkui/deadbeef.glade | 4 |
1 files changed, 2 insertions, 2 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 |