diff options
| author | Wim Taymans <wim.taymans@collabora.co.uk> | 2011-08-22 13:06:27 +0200 |
|---|---|---|
| committer | Wim Taymans <wim.taymans@collabora.co.uk> | 2011-08-22 13:06:27 +0200 |
| commit | 3fab57b5cf84180cbf95600071349e19214a9df0 (patch) | |
| tree | 5ee3df33e8816f90bbad47c9dc936300156e4613 /po/az.po | |
| parent | c81c62d03a183eb524a88485a5a0f48d7f687588 (diff) | |
| parent | 54c15acd118b20f75e2991bf24eaf16e8e910fd8 (diff) | |
Merge branch 'master' into 0.11
Conflicts:
gst-libs/gst/interfaces/videooverlay.c
gst-libs/gst/rtp/gstrtpbuffer.c
po/af.po
po/az.po
po/bg.po
po/ca.po
po/cs.po
po/da.po
po/de.po
po/el.po
po/en_GB.po
po/es.po
po/eu.po
po/fi.po
po/fr.po
po/gl.po
po/hu.po
po/id.po
po/it.po
po/ja.po
po/lt.po
po/lv.po
po/nb.po
po/nl.po
po/or.po
po/pl.po
po/pt_BR.po
po/ro.po
po/ru.po
po/sk.po
po/sl.po
po/sq.po
po/sr.po
po/sv.po
po/tr.po
po/uk.po
po/vi.po
po/zh_CN.po
Diffstat (limited to 'po/az.po')
| -rw-r--r-- | po/az.po | 8 |
1 files changed, 7 insertions, 1 deletions
@@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: gst-plugins-0.8.0\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/\n" -"POT-Creation-Date: 2011-08-02 21:32+0200\n" +"POT-Creation-Date: 2011-08-20 12:18+0100\n" "PO-Revision-Date: 2004-03-19 18:29+0200\n" "Last-Translator: Metin Amiroff <metin@karegen.com>\n" "Language-Team: Azerbaijani <translation-team-az@lists.sourceforge.net>\n" @@ -354,6 +354,12 @@ msgstr "" msgid "Media (image/video) intended vertical pixel density in ppi" msgstr "" +msgid "ID3v2 frame" +msgstr "" + +msgid "unparsed id3v2 tag frame" +msgstr "" + msgid "This CD has no audio tracks" msgstr "" |