[vlc-commits] Correct widespread misuse of the word 'subtitle'

[Edward Wang]

vlc | branch: master | Edward Wang <edward.c.wang at compdigitec.com> | Thu Mar 14 15:32:24 2013 +0000| [9cd6df73b1788bca1d852b26c8a095869d68b128] | committer: Felix Paul Kühne

Correct widespread misuse of the word 'subtitle'

Subtitle is the adjective describing what kind of text. So "subtitle text" is an adjective phrase describing what kind of encoding.

For example, we don't listen to "audios tracks", program "videos codecs", or open "playlists files". Therefore, use the correct form of the word subtitle for the context.

Signed-off-by: Felix Paul Kühne <fkuehne at videolan.org>

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=9cd6df73b1788bca1d852b26c8a095869d68b128
---

 extras/package/macosx/README.MacOSX.rtf                    |    4 ++--
 extras/package/macosx/Resources/English.lproj/MainMenu.xib |    4 ++--
 extras/package/macosx/Resources/English.lproj/Open.xib     |    4 ++--
 .../package/macosx/Resources/English.lproj/SyncTracks.xib  |    4 ++--
 include/vlc_config_cat.h                                   |    8 ++++----
 modules/codec/subsdec.c                                    |   12 ++++++------
 modules/control/rc.c                                       |    2 +-
 modules/demux/ogg.c                                        |    2 +-
 modules/demux/subtitle.c                                   |    8 ++++----
 modules/gui/macosx/MainMenu.m                              |   10 +++++-----
 modules/gui/macosx/TrackSynchronization.m                  |   10 +++++-----
 modules/gui/macosx/open.m                                  |    6 +++---
 modules/gui/macosx/simple_prefs.m                          |    2 +-
 modules/gui/qt4/components/controller.hpp                  |    2 +-
 modules/gui/qt4/components/extended_panels.cpp             |   10 +++++-----
 modules/gui/qt4/components/open_panels.cpp                 |    2 +-
 modules/gui/qt4/components/simple_preferences.cpp          |    4 ++--
 modules/gui/qt4/dialogs_provider.hpp                       |    2 +-
 modules/gui/qt4/menus.cpp                                  |    2 +-
 modules/gui/qt4/ui/open_disk.ui                            |    2 +-
 modules/gui/qt4/ui/open_file.ui                            |    6 +++---
 modules/gui/qt4/ui/sprefs_subtitles.ui                     |    6 +++---
 modules/stream_out/transcode/spu.c                         |    8 ++++----
 modules/stream_out/transcode/transcode.c                   |    8 ++++----
 modules/video_filter/subsdelay.c                           |    4 ++--
 modules/video_output/msw/direct3d.c                        |    2 +-
 share/lua/http/dialogs/old/input                           |    6 +++---
 share/lua/http/dialogs/old/sout                            |    4 ++--
 share/lua/intf/cli.lua                                     |    2 +-
 src/input/input.c                                          |    4 ++--
 src/input/var.c                                            |    2 +-
 src/libvlc-module.c                                        |    6 +++---
 32 files changed, 79 insertions(+), 79 deletions(-)

Diff:   http://git.videolan.org/gitweb.cgi/vlc.git/?a=commitdiff;h=9cd6df73b1788bca1d852b26c8a095869d68b128