[vlc-commits] l10n: German update
vlc/vlc-2.1 | branch: master | Michał Trzebiatowski | Thu Sep 12 00:51:09 2013 +0200| [3744fb89827ec2350f4c84a8c031480018e3d87c] | committer: Christoph Miebach l10n: German update Signed-off-by: Christoph Miebach > http://git.videolan.org/gitweb.cgi/vlc/vlc-2.1.git/?a=commit;h=3744fb89827ec2350f4c84a8c031480018e3d87c --- po/de.po | 24 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/po/de.po b/po/de.po index 5ecd613..3163d05 100644 --- a/po/de.po +++ b/po/de.po @@ -22,8 +22,8 @@ msgstr "" "Project-Id-Version: VLC - Trans\n" "Report-Msgid-Bugs-To: vlc-de...@videolan.org\n" "POT-Creation-Date: 2013-09-08 20:08+0200\n" -"PO-Revision-Date: 2013-09-11 14:49+\n" -"Last-Translator: Christoph Miebach \n" +"PO-Revision-Date: 2013-09-11 18:17+\n" +"Last-Translator: Michał Trzebiatowski \n" "Language-Team: German (http://www.transifex.com/projects/p/vlc-trans/"; "language/de/)\n" "Language: de\n" @@ -6011,7 +6011,7 @@ msgid "" "FOURCC code in textual form, e.g. \"ntsc\"." msgstr "" "Gewünschter Video-Input-Modus für DeckLink-Captures. Dieser Wert sollte ein " -"FourCC-Code in Textform sein, z. B. \"ntsc\"." +"FourCC-Code in Textform sein, z.B. \"ntsc\"." #: modules/access/decklink.cpp:55 modules/video_output/decklink.cpp:80 msgid "Audio connection" @@ -7193,7 +7193,7 @@ msgid "" "can only be specified per input item, not globally." msgstr "" "Der Name und die Version des Programms werden vom HTTP-Server " -"bereitgestellt. Sie müssen durch einen Schrägstrich getrennt werden, z. B. " +"bereitgestellt. Sie müssen durch einen Schrägstrich getrennt werden, z.B. " "FooBar/1.2.3. Diese Option kann nur pro Eingang angegeben werden, nicht " "global." @@ -11955,8 +11955,8 @@ msgid "" "'high'" msgstr "" "Verwenden Sie ausdrücklich ein Codec-Profil. Wenn Sie dies nicht tun, wird " -"der Codec das richtige Profil aus anderen Quellen, wie z. B. der Auflösung " -"und der Bitrate ermitteln. z. B. 'hoch'" +"der Codec das richtige Profil aus anderen Quellen, wie z.B. der Auflösung " +"und der Bitrate ermitteln. z.B. 'hoch'" #: modules/codec/qsv.c:67 msgid "Codec Level" @@ -11969,13 +11969,13 @@ msgid "" "'4.2' for mpeg4-part10 or 'low' for mpeg2" msgstr "" "Verwenden Sie ausdrücklich ein Codec-Level. Wenn Sie dies nicht tun, wird " -"der Codec das richtige Profil aus anderen Quellen, wie z. B. der Auflösung " -"und der Bitrate ermitteln. z. B. '4.2' für mpeg4-part10 oder 'niedrig' für " +"der Codec das richtige Profil aus anderen Quellen, wie z.B. der Auflösung " +"und der Bitrate ermitteln. z.B. '4.2' für mpeg4-part10 oder 'niedrig' für " "mpeg2" #: modules/codec/qsv.c:73 msgid "Group of Picture size" -msgstr "Referenzentfernung der Gruppe von Bildern" +msgstr "Größe der Gruppe von Bildern" #: modules/codec/qsv.c:75 msgid "" @@ -12106,9 +12106,9 @@ msgid "" "method. If not set, this parameter. is computed from other sources such as " "bitrate, profile, level, etc." msgstr "" -"Definiert die maximale Bitrate in Kpbs (1000 Bit / s) für das VBR-" +"Definiert die maximale Bitrate in Kpbs (1000 Bit/s) für das VBR-" "Ratensteuerverfahren. Falls nicht gesetzt, wird dieser Parameter aus anderen " -"Quellen errechnet, wie Bitrate, Profil, Level, usw." +"Quellen errechnet, wie der Bitrate, dem Profil, dem Level, usw." #: modules/codec/qsv.c:127 msgid "Accuracy of RateControl" @@ -12122,7 +12122,7 @@ msgid "" "certained convergence period. See the convergence parameter" msgstr "" "Die Toleranz, in Prozent der 'avbr'-Methode (Durchschnittswert der variablen " -"Bitrate), z. B. 10 mit einer Bitrate von 800 kbps bedeutet, dass der Encoder " +"Bitrate), z.B. 10 mit einer Bitrate von 800 kbps bedeutet, dass der Encoder " "versucht, unter 880 kbps und über 730 kbps zu bleiben. Die Zielgenauigkeit " "wird erst nach einem gewissen Konvergenzzeitraum erreicht. Siehe " "Konvergenzparameter." ___ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] l10n: Serbian update
vlc/vlc-2.1 | branch: master | VideoLAN | Thu Sep 12 00:05:21 2013 +0200| [c4477766562251345e98d999371fcfc3c24e5a1d] | committer: Christoph Miebach l10n: Serbian update Signed-off-by: Christoph Miebach > http://git.videolan.org/gitweb.cgi/vlc/vlc-2.1.git/?a=commit;h=c4477766562251345e98d999371fcfc3c24e5a1d --- po/sr.po | 18 +++--- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/po/sr.po b/po/sr.po index 0642125..664b5d4 100644 --- a/po/sr.po +++ b/po/sr.po @@ -4,8 +4,9 @@ # # Translators: # DakSrbija , 2013 +# Rancher , 2013 # Gorana Milicevic , 2008 -# Marko Uskokoddic <>, 2007. +# Marko Uskokoddic <>, 2007 # Marko Uskokovic , 2007-2008. # Predrag Ljubenović , 2010, 2013 # Ђорђе Васиљевић , 2013 @@ -16,8 +17,8 @@ msgstr "" "Project-Id-Version: VLC - Trans\n" "Report-Msgid-Bugs-To: vlc-de...@videolan.org\n" "POT-Creation-Date: 2013-09-08 20:08+0200\n" -"PO-Revision-Date: 2013-08-16 10:05+\n" -"Last-Translator: predrag83yu \n" +"PO-Revision-Date: 2013-09-09 08:20+\n" +"Last-Translator: Yaron Shahrabani \n" "Language-Team: Serbian (http://www.transifex.com/projects/p/vlc-trans/"; "language/sr/)\n" "Language: sr\n" @@ -18194,10 +18195,6 @@ msgid "" "that only a small part of the MMS protocol is supported (MMS encapsulated in " "HTTP)." msgstr "" -"Користите ово да пуштате ток на неколико компјутера користећи Microsoft MMS " -"протокол. Овај протокол се користи као транспортни метод многих Microsoft " -"софтвера. Приметите да је само мали део MMS протокола подржан (MMS уграђен у " -"HTTP)." #: modules/gui/macosx/wizard.m:270 modules/gui/macosx/wizard.m:280 msgid "Enter the address of the computer to stream to." @@ -25085,8 +25082,8 @@ msgid "" "comma-separated list of picture ID(s).These IDs are assigned in the \"mosaic-" "bridge\" module." msgstr "" -"Можете да приморате редослед елемента на мозаику. Морате да дате листу " -"ID(ова) слика одвојених зарезом.Ови ID-еви се додељују у \"mosaic-bridge\" " +"Можете да приморате редослед елемента на мозаику. Морате да дате листу ID" +"(ова) слика одвојених зарезом.Ови ID-еви се додељују у \"mosaic-bridge\" " "модулу." #: modules/video_filter/mosaic.c:148 @@ -27591,9 +27588,8 @@ msgid "Default caching policy" msgstr "" #: modules/gui/qt4/ui/sprefs_interface.h:514 -#, fuzzy msgid "Menus language:" -msgstr "Језик звука" +msgstr "Језик интерфејса:" #: modules/gui/qt4/ui/sprefs_interface.h:515 msgid "Look and feel" ___ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] Qt: fix mismatched tag
vlc | branch: master | Pierre Ynard | Wed Sep 11 21:58:37 2013 +0200| [c03472dddf6122be32568fe70e9f7b03a8176218] | committer: Pierre Ynard Qt: fix mismatched tag > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=c03472dddf6122be32568fe70e9f7b03a8176218 --- modules/gui/qt4/dialogs/firstrun.cpp |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/gui/qt4/dialogs/firstrun.cpp b/modules/gui/qt4/dialogs/firstrun.cpp index 71df066..d440710 100644 --- a/modules/gui/qt4/dialogs/firstrun.cpp +++ b/modules/gui/qt4/dialogs/firstrun.cpp @@ -78,7 +78,7 @@ void FirstRun::buildPrivDialog() "Internet-based services. This includes cover art, track names, " "artist names and other meta-data." "\n" -"Consequently, this may entail identifying some of your media files to third party " +"Consequently, this may entail identifying some of your media files to third party " "entities. Therefore the VLC developers require your express " "consent for the media player to access the Internet automatically." "\n" ___ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] Fix grammar in comments
vlc | branch: master | Pierre Ynard | Wed Sep 11 21:57:58 2013 +0200| [3118ce0cd3870d609401d7f19c3f9619ec843ded] | committer: Pierre Ynard Fix grammar in comments > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=3118ce0cd3870d609401d7f19c3f9619ec843ded --- include/vlc/libvlc.h |2 +- modules/codec/avcodec/video.c |2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/include/vlc/libvlc.h b/include/vlc/libvlc.h index 5cf0ad2..0bc0b40 100644 --- a/include/vlc/libvlc.h +++ b/include/vlc/libvlc.h @@ -374,7 +374,7 @@ LIBVLC_API void libvlc_log_get_context(const libvlc_log_t *ctx, /** * Gets VLC object information about a log message: the type name of the VLC * object emitting the message, the object header if any and a temporaly-unique - * object identifier. These information are mainly meant for manual + * object identifier. This information is mainly meant for manual * troubleshooting. * * The returned type name may be "generic" if unknown, but it cannot be NULL. diff --git a/modules/codec/avcodec/video.c b/modules/codec/avcodec/video.c index 29c6491..720459a 100644 --- a/modules/codec/avcodec/video.c +++ b/modules/codec/avcodec/video.c @@ -1292,7 +1292,7 @@ static enum PixelFormat ffmpeg_GetFormat( AVCodecContext *p_context, if (!can_hwaccel) goto end; -/* Profile and level information are needed now. +/* Profile and level information is needed now. * TODO: avoid code duplication with avcodec.c */ if( p_context->profile != FF_PROFILE_UNKNOWN) p_dec->fmt_in.i_profile = p_context->profile; ___ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] macosx: minor code cleanup
vlc | branch: master | Felix Paul Kühne | Wed Sep 11
17:54:27 2013 +0200| [ae7b7ece58550de04680fa0ff680a9da19cfb1ed] | committer:
Felix Paul Kühne
macosx: minor code cleanup
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=ae7b7ece58550de04680fa0ff680a9da19cfb1ed
---
modules/gui/macosx/bookmarks.m | 21 +++--
1 file changed, 11 insertions(+), 10 deletions(-)
diff --git a/modules/gui/macosx/bookmarks.m b/modules/gui/macosx/bookmarks.m
index cf5f999..e2564d3 100644
--- a/modules/gui/macosx/bookmarks.m
+++ b/modules/gui/macosx/bookmarks.m
@@ -367,17 +367,18 @@ clear:
if (!p_input)
return 0;
-else if (input_Control(p_input, INPUT_GET_BOOKMARKS, &pp_bookmarks,
&i_bookmarks) != VLC_SUCCESS) {
-vlc_object_release(p_input);
+
+int returnValue = input_Control(p_input, INPUT_GET_BOOKMARKS,
&pp_bookmarks, &i_bookmarks);
+vlc_object_release(p_input);
+
+if (returnValue != VLC_SUCCESS)
return 0;
-} else {
-vlc_object_release(p_input);
-// Clear the bookmark list
-for (int i = 0; i < i_bookmarks; i++)
-vlc_seekpoint_Delete(pp_bookmarks[i]);
-free(pp_bookmarks);
-return i_bookmarks;
-}
+
+for (int i = 0; i < i_bookmarks; i++)
+vlc_seekpoint_Delete(pp_bookmarks[i]);
+free(pp_bookmarks);
+
+return i_bookmarks;
}
- (id)tableView:(NSTableView *)theDataTable objectValueForTableColumn:
(NSTableColumn *)theTableColumn row: (NSInteger)row
___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] macosx: minor code cleanup
vlc/vlc-2.1 | branch: master | Felix Paul Kühne | Wed
Sep 11 17:54:27 2013 +0200| [e18da265dba5d6d61143a6d8871594f5b6980a34] |
committer: Felix Paul Kühne
macosx: minor code cleanup
(cherry picked from commit ae7b7ece58550de04680fa0ff680a9da19cfb1ed)
> http://git.videolan.org/gitweb.cgi/vlc/vlc-2.1.git/?a=commit;h=e18da265dba5d6d61143a6d8871594f5b6980a34
---
modules/gui/macosx/bookmarks.m | 21 +++--
1 file changed, 11 insertions(+), 10 deletions(-)
diff --git a/modules/gui/macosx/bookmarks.m b/modules/gui/macosx/bookmarks.m
index cf5f999..e2564d3 100644
--- a/modules/gui/macosx/bookmarks.m
+++ b/modules/gui/macosx/bookmarks.m
@@ -367,17 +367,18 @@ clear:
if (!p_input)
return 0;
-else if (input_Control(p_input, INPUT_GET_BOOKMARKS, &pp_bookmarks,
&i_bookmarks) != VLC_SUCCESS) {
-vlc_object_release(p_input);
+
+int returnValue = input_Control(p_input, INPUT_GET_BOOKMARKS,
&pp_bookmarks, &i_bookmarks);
+vlc_object_release(p_input);
+
+if (returnValue != VLC_SUCCESS)
return 0;
-} else {
-vlc_object_release(p_input);
-// Clear the bookmark list
-for (int i = 0; i < i_bookmarks; i++)
-vlc_seekpoint_Delete(pp_bookmarks[i]);
-free(pp_bookmarks);
-return i_bookmarks;
-}
+
+for (int i = 0; i < i_bookmarks; i++)
+vlc_seekpoint_Delete(pp_bookmarks[i]);
+free(pp_bookmarks);
+
+return i_bookmarks;
}
- (id)tableView:(NSTableView *)theDataTable objectValueForTableColumn:
(NSTableColumn *)theTableColumn row: (NSInteger)row
___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] extras/tools: disable contrib compilation of gpg-error, gcrypt and lua since we don't use it for now
vlc | branch: master | Felix Paul Kühne | Sat Jul 27
19:38:44 2013 +0200| [21f7155e3a5086c02b18bee058b649893de265ad] | committer:
Felix Paul Kühne
extras/tools: disable contrib compilation of gpg-error, gcrypt and lua since we
don't use it for now
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=21f7155e3a5086c02b18bee058b649893de265ad
---
extras/package/ios/build.sh |3 +++
1 file changed, 3 insertions(+)
diff --git a/extras/package/ios/build.sh b/extras/package/ios/build.sh
index 7fdadcb..62fb1b8 100755
--- a/extras/package/ios/build.sh
+++ b/extras/package/ios/build.sh
@@ -214,6 +214,9 @@ fi
--enable-freetype2 \
--enable-ass \
--disable-fontconfig \
+--disable-gpg-error \
+--disable-gcrypt \
+--disable-lua \
--disable-taglib > ${out}
echo "EXTRA_CFLAGS += ${EXTRA_CFLAGS}" >> config.mak
___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] ffmpeg/libav: allow the use of 'thumb' if we don't specify 'small'
vlc | branch: master | Felix Paul Kühne | Wed Sep 11 18:09:01 2013 +0200| [3bfa3ffc2a8e2647c1fea2240d85774427840616] | committer: Felix Paul Kühne ffmpeg/libav: allow the use of 'thumb' if we don't specify 'small' > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=3bfa3ffc2a8e2647c1fea2240d85774427840616 --- contrib/src/ffmpeg/rules.mak |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contrib/src/ffmpeg/rules.mak b/contrib/src/ffmpeg/rules.mak index e9899b6..bd6751a 100644 --- a/contrib/src/ffmpeg/rules.mak +++ b/contrib/src/ffmpeg/rules.mak @@ -40,12 +40,12 @@ endif # Small size ifdef ENABLE_SMALL FFMPEGCONF += --enable-small +endif ifeq ($(ARCH),arm) ifdef HAVE_ARMV7A FFMPEGCONF += --enable-thumb endif endif -endif ifdef HAVE_CROSS_COMPILE FFMPEGCONF += --enable-cross-compile ___ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] quartztext: fix relative font size handling
vlc | branch: master | Felix Paul Kühne | Sun Aug 4
19:50:19 2013 +0200| [ef8b3a7b0d07fd154fe68fecc22449bdb6781278] | committer:
Felix Paul Kühne
quartztext: fix relative font size handling
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=ef8b3a7b0d07fd154fe68fecc22449bdb6781278
---
modules/text_renderer/quartztext.c | 17 ++---
1 file changed, 14 insertions(+), 3 deletions(-)
diff --git a/modules/text_renderer/quartztext.c
b/modules/text_renderer/quartztext.c
index 4b25caa..eb5da4a 100644
--- a/modules/text_renderer/quartztext.c
+++ b/modules/text_renderer/quartztext.c
@@ -205,7 +205,7 @@ static int Create(vlc_object_t *p_this)
p_sys->psz_font_name = var_CreateGetString(p_this, "quartztext-font");
p_sys->i_font_opacity = 255;
p_sys->i_font_color = VLC_CLIP(var_CreateGetInteger(p_this,
"quartztext-color") , 0, 0xFF);
-p_sys->i_font_size= GetFontSize(p_filter);
+p_sys->i_font_size = GetFontSize(p_filter);
p_filter->pf_render_text = RenderText;
p_filter->pf_render_html = RenderHtml;
@@ -317,7 +317,7 @@ static int RenderText(filter_t *p_filter,
subpicture_region_t *p_region_out,
b_bold = b_uline = b_italic = FALSE;
VLC_UNUSED(p_chroma_list);
-p_sys->i_font_size= GetFontSize(p_filter);
+p_sys->i_font_size = GetFontSize(p_filter);
// Sanity check
if (!p_region_in || !p_region_out)
@@ -950,7 +950,18 @@ static offscreen_bitmap_t *Compose(int i_text_align,
static int GetFontSize(filter_t *p_filter)
{
-return p_filter->fmt_out.video.i_height / DEFAULT_REL_FONT_SIZE;
+int i_size = 0;
+
+int i_ratio = var_CreateGetInteger( p_filter, "quartztext-rel-fontsize" );
+if( i_ratio > 0 )
+i_size = (int)p_filter->fmt_out.video.i_height / i_ratio;
+
+if( i_size <= 0 )
+{
+msg_Warn( p_filter, "invalid fontsize, using 12" );
+i_size = 12;
+}
+return i_size;
}
static int RenderYUVA(filter_t *p_filter, subpicture_region_t *p_region,
___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] extras/ios: don't use small contribs anymore
vlc | branch: master | Felix Paul Kühne | Wed Sep 11
18:06:41 2013 +0200| [b3907498a3df206e37c009e239ec55b11cedbe43] | committer:
Felix Paul Kühne
extras/ios: don't use small contribs anymore
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=b3907498a3df206e37c009e239ec55b11cedbe43
---
extras/package/ios/build.sh |1 -
1 file changed, 1 deletion(-)
diff --git a/extras/package/ios/build.sh b/extras/package/ios/build.sh
index 39d90bd..42c87da 100755
--- a/extras/package/ios/build.sh
+++ b/extras/package/ios/build.sh
@@ -186,7 +186,6 @@ fi
../bootstrap --host=${TARGET} --build="i686-apple-darwin10"
--prefix=${VLCROOT}/contrib/${TARGET}-${ARCH} --disable-gpl \
--disable-disc --disable-sout \
---enable-small \
--disable-sdl \
--disable-SDL_image \
--disable-iconv \
___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] postproc: allow the use of 'thumb' if we don't specify 'small'
vlc | branch: master | Felix Paul Kühne | Wed Sep 11 18:09:13 2013 +0200| [c06caaad678b360bafca77db4c2be0d3d82e96f3] | committer: Felix Paul Kühne postproc: allow the use of 'thumb' if we don't specify 'small' > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=c06caaad678b360bafca77db4c2be0d3d82e96f3 --- contrib/src/postproc/rules.mak |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/contrib/src/postproc/rules.mak b/contrib/src/postproc/rules.mak index 307de0c..ed20e17 100644 --- a/contrib/src/postproc/rules.mak +++ b/contrib/src/postproc/rules.mak @@ -12,9 +12,9 @@ DEPS_postproc = ffmpeg ifdef ENABLE_SMALL POSTPROCCONF += --enable-small -ifdef HAVE_ARMV7A -FFMPEGCONF += --enable-thumb endif +ifdef HAVE_ARMV7A +POSTPROCCONF += --enable-thumb endif ifdef HAVE_CROSS_COMPILE ___ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] extras/package: compile quartztext module for iOS
vlc | branch: master | Felix Paul Kühne | Sun Jul 28
19:24:30 2013 +0200| [aeb502a496cf86a1a7a80a26b412c630a0ed4584] | committer:
Felix Paul Kühne
extras/package: compile quartztext module for iOS
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=aeb502a496cf86a1a7a80a26b412c630a0ed4584
---
extras/package/ios/build.sh |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/extras/package/ios/build.sh b/extras/package/ios/build.sh
index 42c87da..7fdadcb 100755
--- a/extras/package/ios/build.sh
+++ b/extras/package/ios/build.sh
@@ -264,7 +264,7 @@ ${VLCROOT}/configure \
--enable-ios-vout \
--enable-ios-vout2 \
--disable-shared \
---disable-macosx-quartztext \
+--enable-macosx-quartztext \
--enable-avcodec \
--enable-mkv \
--enable-opus \
___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] extras/package: compile quartztext module for iOS
vlc/vlc-2.1 | branch: master | Felix Paul Kühne | Sun
Jul 28 19:24:30 2013 +0200| [89edc9653ebbf0e76c73f04c312018450241e5c3] |
committer: Felix Paul Kühne
extras/package: compile quartztext module for iOS
(cherry picked from commit aeb502a496cf86a1a7a80a26b412c630a0ed4584)
> http://git.videolan.org/gitweb.cgi/vlc/vlc-2.1.git/?a=commit;h=89edc9653ebbf0e76c73f04c312018450241e5c3
---
extras/package/ios/build.sh |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/extras/package/ios/build.sh b/extras/package/ios/build.sh
index 42c87da..7fdadcb 100755
--- a/extras/package/ios/build.sh
+++ b/extras/package/ios/build.sh
@@ -264,7 +264,7 @@ ${VLCROOT}/configure \
--enable-ios-vout \
--enable-ios-vout2 \
--disable-shared \
---disable-macosx-quartztext \
+--enable-macosx-quartztext \
--enable-avcodec \
--enable-mkv \
--enable-opus \
___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] postproc: allow the use of 'thumb' if we don't specify 'small'
vlc/vlc-2.1 | branch: master | Felix Paul Kühne | Wed Sep 11 18:09:13 2013 +0200| [969ce71e0c0b850cefa9b482fd3fd31ac655f20c] | committer: Felix Paul Kühne postproc: allow the use of 'thumb' if we don't specify 'small' (cherry picked from commit c06caaad678b360bafca77db4c2be0d3d82e96f3) > http://git.videolan.org/gitweb.cgi/vlc/vlc-2.1.git/?a=commit;h=969ce71e0c0b850cefa9b482fd3fd31ac655f20c --- contrib/src/postproc/rules.mak |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/contrib/src/postproc/rules.mak b/contrib/src/postproc/rules.mak index 307de0c..ed20e17 100644 --- a/contrib/src/postproc/rules.mak +++ b/contrib/src/postproc/rules.mak @@ -12,9 +12,9 @@ DEPS_postproc = ffmpeg ifdef ENABLE_SMALL POSTPROCCONF += --enable-small -ifdef HAVE_ARMV7A -FFMPEGCONF += --enable-thumb endif +ifdef HAVE_ARMV7A +POSTPROCCONF += --enable-thumb endif ifdef HAVE_CROSS_COMPILE ___ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] extras/ios: don't use small contribs anymore
vlc/vlc-2.1 | branch: master | Felix Paul Kühne | Wed
Sep 11 18:06:41 2013 +0200| [35a8fc2579dcee4078708eb8f853b07b1986af8d] |
committer: Felix Paul Kühne
extras/ios: don't use small contribs anymore
(cherry picked from commit b3907498a3df206e37c009e239ec55b11cedbe43)
> http://git.videolan.org/gitweb.cgi/vlc/vlc-2.1.git/?a=commit;h=35a8fc2579dcee4078708eb8f853b07b1986af8d
---
extras/package/ios/build.sh |1 -
1 file changed, 1 deletion(-)
diff --git a/extras/package/ios/build.sh b/extras/package/ios/build.sh
index 39d90bd..42c87da 100755
--- a/extras/package/ios/build.sh
+++ b/extras/package/ios/build.sh
@@ -186,7 +186,6 @@ fi
../bootstrap --host=${TARGET} --build="i686-apple-darwin10"
--prefix=${VLCROOT}/contrib/${TARGET}-${ARCH} --disable-gpl \
--disable-disc --disable-sout \
---enable-small \
--disable-sdl \
--disable-SDL_image \
--disable-iconv \
___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] extras/tools: disable contrib compilation of gpg-error, gcrypt and lua since we don't use it for now
vlc/vlc-2.1 | branch: master | Felix Paul Kühne | Sat
Jul 27 19:38:44 2013 +0200| [9c5d4f719644bc39680c17edbb8c8fc2961d8ca2] |
committer: Felix Paul Kühne
extras/tools: disable contrib compilation of gpg-error, gcrypt and lua since we
don't use it for now
(cherry picked from commit 21f7155e3a5086c02b18bee058b649893de265ad)
> http://git.videolan.org/gitweb.cgi/vlc/vlc-2.1.git/?a=commit;h=9c5d4f719644bc39680c17edbb8c8fc2961d8ca2
---
extras/package/ios/build.sh |3 +++
1 file changed, 3 insertions(+)
diff --git a/extras/package/ios/build.sh b/extras/package/ios/build.sh
index 7fdadcb..62fb1b8 100755
--- a/extras/package/ios/build.sh
+++ b/extras/package/ios/build.sh
@@ -214,6 +214,9 @@ fi
--enable-freetype2 \
--enable-ass \
--disable-fontconfig \
+--disable-gpg-error \
+--disable-gcrypt \
+--disable-lua \
--disable-taglib > ${out}
echo "EXTRA_CFLAGS += ${EXTRA_CFLAGS}" >> config.mak
___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] quartztext: fix relative font size handling
vlc/vlc-2.1 | branch: master | Felix Paul Kühne | Sun
Aug 4 19:50:19 2013 +0200| [8d7bf81ee360975c4b5e2ed62143957b47e172a3] |
committer: Felix Paul Kühne
quartztext: fix relative font size handling
(cherry picked from commit ef8b3a7b0d07fd154fe68fecc22449bdb6781278)
> http://git.videolan.org/gitweb.cgi/vlc/vlc-2.1.git/?a=commit;h=8d7bf81ee360975c4b5e2ed62143957b47e172a3
---
modules/text_renderer/quartztext.c | 17 ++---
1 file changed, 14 insertions(+), 3 deletions(-)
diff --git a/modules/text_renderer/quartztext.c
b/modules/text_renderer/quartztext.c
index 4b25caa..eb5da4a 100644
--- a/modules/text_renderer/quartztext.c
+++ b/modules/text_renderer/quartztext.c
@@ -205,7 +205,7 @@ static int Create(vlc_object_t *p_this)
p_sys->psz_font_name = var_CreateGetString(p_this, "quartztext-font");
p_sys->i_font_opacity = 255;
p_sys->i_font_color = VLC_CLIP(var_CreateGetInteger(p_this,
"quartztext-color") , 0, 0xFF);
-p_sys->i_font_size= GetFontSize(p_filter);
+p_sys->i_font_size = GetFontSize(p_filter);
p_filter->pf_render_text = RenderText;
p_filter->pf_render_html = RenderHtml;
@@ -317,7 +317,7 @@ static int RenderText(filter_t *p_filter,
subpicture_region_t *p_region_out,
b_bold = b_uline = b_italic = FALSE;
VLC_UNUSED(p_chroma_list);
-p_sys->i_font_size= GetFontSize(p_filter);
+p_sys->i_font_size = GetFontSize(p_filter);
// Sanity check
if (!p_region_in || !p_region_out)
@@ -950,7 +950,18 @@ static offscreen_bitmap_t *Compose(int i_text_align,
static int GetFontSize(filter_t *p_filter)
{
-return p_filter->fmt_out.video.i_height / DEFAULT_REL_FONT_SIZE;
+int i_size = 0;
+
+int i_ratio = var_CreateGetInteger( p_filter, "quartztext-rel-fontsize" );
+if( i_ratio > 0 )
+i_size = (int)p_filter->fmt_out.video.i_height / i_ratio;
+
+if( i_size <= 0 )
+{
+msg_Warn( p_filter, "invalid fontsize, using 12" );
+i_size = 12;
+}
+return i_size;
}
static int RenderYUVA(filter_t *p_filter, subpicture_region_t *p_region,
___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] ffmpeg/libav: allow the use of 'thumb' if we don't specify 'small'
vlc/vlc-2.1 | branch: master | Felix Paul Kühne | Wed Sep 11 18:09:01 2013 +0200| [52060a049f99e016ed1ef322eb2ee8a5a1f071b3] | committer: Felix Paul Kühne ffmpeg/libav: allow the use of 'thumb' if we don't specify 'small' (cherry picked from commit 3bfa3ffc2a8e2647c1fea2240d85774427840616) > http://git.videolan.org/gitweb.cgi/vlc/vlc-2.1.git/?a=commit;h=52060a049f99e016ed1ef322eb2ee8a5a1f071b3 --- contrib/src/ffmpeg/rules.mak |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contrib/src/ffmpeg/rules.mak b/contrib/src/ffmpeg/rules.mak index debee52..30f5dbb 100644 --- a/contrib/src/ffmpeg/rules.mak +++ b/contrib/src/ffmpeg/rules.mak @@ -38,12 +38,12 @@ endif # Small size ifdef ENABLE_SMALL FFMPEGCONF += --enable-small +endif ifeq ($(ARCH),arm) ifdef HAVE_ARMV7A FFMPEGCONF += --enable-thumb endif endif -endif ifdef HAVE_CROSS_COMPILE FFMPEGCONF += --enable-cross-compile ___ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] l10n: German update
vlc/vlc-2.1 | branch: master | Michał Trzebiatowski | Wed Sep 11 17:14:46 2013 +0200| [ab75413dacee26c84d307d537d9ac950b826f3df] | committer: Christoph Miebach l10n: German update Signed-off-by: Christoph Miebach > http://git.videolan.org/gitweb.cgi/vlc/vlc-2.1.git/?a=commit;h=ab75413dacee26c84d307d537d9ac950b826f3df --- po/de.po | 108 -- 1 file changed, 91 insertions(+), 17 deletions(-) Diff: http://git.videolan.org/gitweb.cgi/vlc/vlc-2.1.git/?a=commitdiff;h=ab75413dacee26c84d307d537d9ac950b826f3df ___ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] s/informations/information
vlc | branch: master | Jean-Baptiste Kempf | Wed Sep 11
16:42:14 2013 +0200| [2d4b2ba4e270fee99e32f50e3c9948b92c38e5fe] | committer:
Jean-Baptiste Kempf
s/informations/information
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=2d4b2ba4e270fee99e32f50e3c9948b92c38e5fe
---
include/vlc/libvlc.h | 10 +-
include/vlc_interface.h |2 +-
modules/access/bluray.c |2 +-
modules/access/live555.cpp|2 +-
modules/codec/avcodec/video.c |2 +-
5 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/include/vlc/libvlc.h b/include/vlc/libvlc.h
index 485f4ff..5cf0ad2 100644
--- a/include/vlc/libvlc.h
+++ b/include/vlc/libvlc.h
@@ -215,7 +215,7 @@ void libvlc_set_user_agent( libvlc_instance_t *p_instance,
const char *name, const char *http );
/**
- * Sets some meta-informations about the application.
+ * Sets some meta-information about the application.
* See also libvlc_set_user_agent().
*
* \param p_instance LibVLC instance
@@ -353,7 +353,7 @@ enum libvlc_log_level
typedef struct vlc_log_t libvlc_log_t;
/**
- * Gets debugging informations about a log message: the name of the VLC module
+ * Gets debugging information about a log message: the name of the VLC module
* emitting the message and the message location within the source code.
*
* The returned module name and file name will be NULL if unknown.
@@ -372,9 +372,9 @@ LIBVLC_API void libvlc_log_get_context(const libvlc_log_t
*ctx,
const char **module, const char **file, unsigned *line);
/**
- * Gets VLC object informations about a log message: the type name of the VLC
+ * Gets VLC object information about a log message: the type name of the VLC
* object emitting the message, the object header if any and a temporaly-unique
- * object identifier. These informations are mainly meant for manual
+ * object identifier. These information are mainly meant for manual
* troubleshooting.
*
* The returned type name may be "generic" if unknown, but it cannot be NULL.
@@ -399,7 +399,7 @@ LIBVLC_API void libvlc_log_get_object(const libvlc_log_t
*ctx,
* Callback prototype for LibVLC log message handler.
* \param data data pointer as given to libvlc_log_set()
* \param level message level (@ref enum libvlc_log_level)
- * \param ctx message context (meta-informations about the message)
+ * \param ctx message context (meta-information about the message)
* \param fmt printf() format string (as defined by ISO C11)
* \param args variable argument list for the format
* \note Log message handlers must be thread-safe.
diff --git a/include/vlc_interface.h b/include/vlc_interface.h
index 9bc6241..485c303 100644
--- a/include/vlc_interface.h
+++ b/include/vlc_interface.h
@@ -105,7 +105,7 @@ VLC_API void libvlc_Quit( libvlc_int_t * );
* Message logging callback signature.
* \param data data pointer as provided to vlc_msg_SetCallback().
* \param type message type (VLC_MSG_* values from enum vlc_log_type)
- * \param item meta informations
+ * \param item meta information
* \param fmt format string
* \param args format string arguments
*/
diff --git a/modules/access/bluray.c b/modules/access/bluray.c
index e859431..a0c4eb6 100644
--- a/modules/access/bluray.c
+++ b/modules/access/bluray.c
@@ -128,7 +128,7 @@ struct demux_sys_t
unsigned inti_current_clip;
input_title_t **pp_title;
-/* Meta informations */
+/* Meta information */
const META_DL *p_meta;
/* Menus */
diff --git a/modules/access/live555.cpp b/modules/access/live555.cpp
index 7a1ab16..b61546b 100644
--- a/modules/access/live555.cpp
+++ b/modules/access/live555.cpp
@@ -1804,7 +1804,7 @@ static void StreamRead( void *p_private, unsigned int
i_size,
QuickTimeGenericRTPSource::QTState &qtState = qtRTPSource->qtState;
uint8_t *sdAtom = (uint8_t*)&qtState.sdAtom[4];
-/* Get codec informations from the quicktime atoms :
+/* Get codec information from the quicktime atoms :
* http://developer.apple.com/quicktime/icefloe/dispatch026.html */
if( tk->fmt.i_cat == VIDEO_ES ) {
if( qtState.sdAtomSize < 16 + 32 )
diff --git a/modules/codec/avcodec/video.c b/modules/codec/avcodec/video.c
index 9622a94..29c6491 100644
--- a/modules/codec/avcodec/video.c
+++ b/modules/codec/avcodec/video.c
@@ -1292,7 +1292,7 @@ static enum PixelFormat ffmpeg_GetFormat( AVCodecContext
*p_context,
if (!can_hwaccel)
goto end;
-/* Profile and level informations are needed now.
+/* Profile and level information are needed now.
* TODO: avoid code duplication with avcodec.c */
if( p_context->profile != FF_PROFILE_UNKNOWN)
p_dec->fmt_in.i_profile = p_context->profile;
___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] Fix engrish again
vlc/vlc-2.1 | branch: master | Jean-Baptiste Kempf | Wed Sep 11 16:39:32 2013 +0200| [5deb5c8bec2402cbabcba83f5e0309b142e9bc7b] | committer: Jean-Baptiste Kempf Fix engrish again > http://git.videolan.org/gitweb.cgi/vlc/vlc-2.1.git/?a=commit;h=5deb5c8bec2402cbabcba83f5e0309b142e9bc7b --- po/ar.po|2 +- po/be.po|2 +- po/bg.po|2 +- po/bn.po|2 +- po/da.po|2 +- po/de.po|2 +- po/es.po|2 +- po/et.po|2 +- po/eu.po|2 +- po/fi.po|2 +- po/fr.po|2 +- po/gl.po|2 +- po/hr.po|2 +- po/hu.po|2 +- po/it.po|2 +- po/ja.po|2 +- po/km.po|2 +- po/lt.po|2 +- po/nl.po|2 +- po/pl.po|2 +- po/pt_BR.po |2 +- po/ro.po|2 +- po/ru.po|2 +- po/sk.po|2 +- po/sl.po|2 +- po/sv.po|2 +- po/tr.po|2 +- po/uk.po|2 +- po/wa.po|2 +- po/zh_CN.po |2 +- 30 files changed, 30 insertions(+), 30 deletions(-) Diff: http://git.videolan.org/gitweb.cgi/vlc/vlc-2.1.git/?a=commitdiff;h=5deb5c8bec2402cbabcba83f5e0309b142e9bc7b ___ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] PO: Fix previous commit files
vlc/vlc-2.1 | branch: master | Jean-Baptiste Kempf | Wed Sep 11 16:29:26 2013 +0200| [88384dc06284ff2bc4781d76ec662128df7e798c] | committer: Jean-Baptiste Kempf PO: Fix previous commit files > http://git.videolan.org/gitweb.cgi/vlc/vlc-2.1.git/?a=commit;h=88384dc06284ff2bc4781d76ec662128df7e798c --- po/ach.po |2 +- po/af.po|2 +- po/am.po|2 +- po/an.po|2 +- po/ar.po|2 +- po/ast.po |2 +- po/az.po|2 +- po/be.po|2 +- po/bg.po|2 +- po/bn.po|2 +- po/bn_IN.po |2 +- po/br.po|2 +- po/bs.po|2 +- po/ca.po|2 +- po/cgg.po |2 +- po/ckb.po |2 +- po/co.po|2 +- po/cs.po|2 +- po/cy.po|2 +- po/da.po|2 +- po/de.po|2 +- po/el.po|2 +- po/en_GB.po |2 +- po/es.po|2 +- po/et.po|2 +- po/eu.po|2 +- po/fa.po|2 +- po/ff.po|2 +- po/fi.po|2 +- po/fr.po|2 +- po/fur.po |2 +- po/ga.po|2 +- po/gd.po|2 +- po/gl.po|2 +- po/gu.po|2 +- po/he.po|2 +- po/hi.po|2 +- po/hr.po|2 +- po/hu.po|2 +- po/hy.po|2 +- po/ia.po|2 +- po/id.po|2 +- po/is.po|2 +- po/it.po|2 +- po/ja.po|2 +- po/ka.po|2 +- po/kk.po|2 +- po/km.po|2 +- po/kn.po|2 +- po/ko.po|2 +- po/kur.po |2 +- po/ky.po|2 +- po/lg.po|2 +- po/lt.po|2 +- po/lv.po|2 +- po/mk.po|2 +- po/ml.po|2 +- po/mn.po|2 +- po/mr.po|2 +- po/ms.po|2 +- po/my.po|2 +- po/nb.po|2 +- po/ne.po|2 +- po/nl.po|2 +- po/nn.po|2 +- po/oc.po|2 +- po/or.po|2 +- po/pa.po|2 +- po/pl.po|2 +- po/ps.po|2 +- po/pt_BR.po |2 +- po/pt_PT.po |2 +- po/ro.po|2 +- po/ru.po|2 +- po/si.po|2 +- po/sk.po|2 +- po/sl.po|2 +- po/sq.po|2 +- po/sr.po|2 +- po/sv.po|2 +- po/ta.po|2 +- po/te.po|2 +- po/tet.po |2 +- po/th.po|2 +- po/tl.po|2 +- po/tr.po|2 +- po/uk.po|2 +- po/uz.po|2 +- po/vi.po|2 +- po/wa.po|2 +- po/zh_CN.po |2 +- po/zh_TW.po |2 +- po/zu.po|2 +- 93 files changed, 93 insertions(+), 93 deletions(-) Diff: http://git.videolan.org/gitweb.cgi/vlc/vlc-2.1.git/?a=commitdiff;h=88384dc06284ff2bc4781d76ec662128df7e798c ___ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] Qt: fix engrish
vlc/vlc-2.1 | branch: master | Jean-Baptiste Kempf | Wed Sep 11 16:28:03 2013 +0200| [2378a3ceb922d141585b9e679680e69953c07496] | committer: Jean-Baptiste Kempf Qt: fix engrish > http://git.videolan.org/gitweb.cgi/vlc/vlc-2.1.git/?a=commit;h=2378a3ceb922d141585b9e679680e69953c07496 --- modules/gui/qt4/dialogs/firstrun.cpp |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/gui/qt4/dialogs/firstrun.cpp b/modules/gui/qt4/dialogs/firstrun.cpp index e66ee7e..6474d21 100644 --- a/modules/gui/qt4/dialogs/firstrun.cpp +++ b/modules/gui/qt4/dialogs/firstrun.cpp @@ -95,7 +95,7 @@ void FirstRun::buildPrivDialog() gLayout->addWidget( options, 1, 0, 1, 3 ); int line = 0; -checkbox = new QCheckBox( qtr( "Automatically retrieve media infos" ) ); +checkbox = new QCheckBox( qtr( "Automatically retrieve media info" ) ); checkbox->setChecked( true ); optionsLayout->addWidget( checkbox, line++, 0 ); ___ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] PO: s/softwares/software/
vlc/vlc-2.1 | branch: master | Jean-Baptiste Kempf | Wed Sep 11 16:26:37 2013 +0200| [69bd20f5b0f794c4ce1d537c62d2b944473e671d] | committer: Jean-Baptiste Kempf PO: s/softwares/software/ > http://git.videolan.org/gitweb.cgi/vlc/vlc-2.1.git/?a=commit;h=69bd20f5b0f794c4ce1d537c62d2b944473e671d --- po/gl.po |2 +- po/hr.po |2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/po/gl.po b/po/gl.po index ff5bb9a..b473773 100644 --- a/po/gl.po +++ b/po/gl.po @@ -19249,7 +19249,7 @@ msgid "" msgstr "" "Use isto para emitir en fluxo para varios computadores usando o protocolo " "Microsoft MMS. Este protocolo úsase como método de transporte en moitos " -"softwares de Microsoft. Teña en conta que só unha pequena parte do " +"software de Microsoft. Teña en conta que só unha pequena parte do " "protocolo MMS é compatíbel (MMS encapsulado en HTTP)." #: modules/gui/macosx/wizard.m:270 modules/gui/macosx/wizard.m:280 diff --git a/po/hr.po b/po/hr.po index 40a9104..b5f405c 100644 --- a/po/hr.po +++ b/po/hr.po @@ -19273,7 +19273,7 @@ msgstr "" #: modules/gui/macosx/wizard.m:265 msgid "" "Use this to stream to several computers using the Microsoft MMS protocol. " -"This protocol is used as transport method by many Microsoft's softwares. " +"This protocol is used as transport method by many Microsoft's software. " "Note that only a small part of the MMS protocol is supported (MMS " "encapsulated in HTTP)." msgstr "" ___ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] Revert "extras/osx: switch to update-test.v.o so we can provide beta updates for 2.1"
vlc | branch: master | Felix Paul Kühne | Wed Sep 11 16:04:14 2013 +0200| [35821c659dbbf23c6db6ed494f3aa0c9e12bf5fd] | committer: Felix Paul Kühne Revert "extras/osx: switch to update-test.v.o so we can provide beta updates for 2.1" This reverts commit ce972e181e5b8df061cb0b9912e66024690e4887. > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=35821c659dbbf23c6db6ed494f3aa0c9e12bf5fd --- extras/package/macosx/Info.plist.in |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/extras/package/macosx/Info.plist.in b/extras/package/macosx/Info.plist.in index 380530d..cf4a7b7 100644 --- a/extras/package/macosx/Info.plist.in +++ b/extras/package/macosx/Info.plist.in @@ -1343,7 +1343,7 @@ SUFeedURL - http://update-test.videolan.org/vlc/sparkle/vlc.xml + http://update.videolan.org/vlc/sparkle/vlc.xml SUPublicDSAKeyFile dsa_pub.pem CFBundleExecutable ___ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] macosx: Update Sparkle Appcast URL as we won' t provide fat binaries for the foreseeable future anymore
vlc | branch: master | Felix Paul Kühne | Wed Sep 11 16:05:00 2013 +0200| [c77682bf86c533feee6c51e8b47a99df11ebd0d8] | committer: Felix Paul Kühne macosx: Update Sparkle Appcast URL as we won't provide fat binaries for the foreseeable future anymore > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=c77682bf86c533feee6c51e8b47a99df11ebd0d8 --- extras/package/macosx/Info.plist.in |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/extras/package/macosx/Info.plist.in b/extras/package/macosx/Info.plist.in index cf4a7b7..313d2b0 100644 --- a/extras/package/macosx/Info.plist.in +++ b/extras/package/macosx/Info.plist.in @@ -1343,7 +1343,7 @@ SUFeedURL - http://update.videolan.org/vlc/sparkle/vlc.xml + http://update.videolan.org/vlc/sparkle/vlc-intel64.xml SUPublicDSAKeyFile dsa_pub.pem CFBundleExecutable ___ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] l10n: Simplified Chinese update
vlc/vlc-2.1 | branch: master | Dean Lee | Wed Sep 11 14:59:36 2013 +0200| [1300bf9b03c3ec87ee58bad0b166714577c6b2d9] | committer: Christoph Miebach l10n: Simplified Chinese update Signed-off-by: Christoph Miebach > http://git.videolan.org/gitweb.cgi/vlc/vlc-2.1.git/?a=commit;h=1300bf9b03c3ec87ee58bad0b166714577c6b2d9 --- po/zh_CN.po | 17 - 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/po/zh_CN.po b/po/zh_CN.po index 5aae1b9..79e9bda 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -11,8 +11,8 @@ msgstr "" "Project-Id-Version: VLC - Trans\n" "Report-Msgid-Bugs-To: vlc-de...@videolan.org\n" "POT-Creation-Date: 2013-09-08 20:08+0200\n" -"PO-Revision-Date: 2013-07-20 08:23+\n" -"Last-Translator: Dean Lee \n" +"PO-Revision-Date: 2013-09-09 08:20+\n" +"Last-Translator: Yaron Shahrabani \n" "Language-Team: Chinese (China) \n" "Language: zh_CN\n" "MIME-Version: 1.0\n" @@ -3058,7 +3058,7 @@ msgstr "HTTP/TLS 证书废止列表" msgid "" "This file contains an optional CRL to prevent remote clients from using " "revoked certificates in TLS sessions." -msgstr "含可选 CRL 的文件，可阻止移除在 TLS 会话中使用废止证书的客户端。" +msgstr "该文件包含可选的 CRL，可防止远程客户端在 TLS 会话中使用被吊销的证书。" #: src/libvlc-module.c:845 msgid "SOCKS server" @@ -18292,9 +18292,8 @@ msgid "" "that only a small part of the MMS protocol is supported (MMS encapsulated in " "HTTP)." msgstr "" -"使用此选项通过 Microsoft MMS 协议将流发布至多个计算机。此协议被用作许多 " -"Microsoft 软件的传输方式。主机仅支持很小一部分的 MMS 协议 (嵌入 HTTP 的 " -"MMS)。" +"使用本功能可通过 Microsoft MMS 协议串流至多台计算机。许多 Microsoft 软件采用" +"该协议作为传输方式。注意只支持 MMS 协议的一小部分 (HTTP 内封装的 MMS)。" #: modules/gui/macosx/wizard.m:270 modules/gui/macosx/wizard.m:280 msgid "Enter the address of the computer to stream to." @@ -27787,9 +27786,8 @@ msgid "Default caching policy" msgstr "默认缓存策略" #: modules/gui/qt4/ui/sprefs_interface.h:514 -#, fuzzy msgid "Menus language:" -msgstr "音频语言" +msgstr "菜单语言:" #: modules/gui/qt4/ui/sprefs_interface.h:515 msgid "Look and feel" @@ -30983,7 +30981,8 @@ msgstr "媒体管理器列表" #~ msgid "" #~ "This file countains an optional CRL to prevent remote clients from using " #~ "revoked certificates in TLS sessions." -#~ msgstr "含可选 CRL 的文件，可阻止移除在 TLS 会话中使用废止证书的客户端。" +#~ msgstr "" +#~ "该文件包含可选的 CRL，可防止远程客户端在 TLS 会话中使用被吊销的证书。" #, fuzzy #~ msgid "" ___ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] l10n: Ukrainian update
vlc/vlc-2.1 | branch: master | Andriy Bandura | Wed Sep 11 14:55:35 2013 +0200| [006bbb5fe2d590ce2684660573ab3a4a112680ce] | committer: Christoph Miebach l10n: Ukrainian update Signed-off-by: Christoph Miebach > http://git.videolan.org/gitweb.cgi/vlc/vlc-2.1.git/?a=commit;h=006bbb5fe2d590ce2684660573ab3a4a112680ce --- po/uk.po | 13 ++--- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/po/uk.po b/po/uk.po index 79295b3..7e60118 100644 --- a/po/uk.po +++ b/po/uk.po @@ -11,7 +11,7 @@ msgstr "" "Project-Id-Version: VLC - Trans\n" "Report-Msgid-Bugs-To: vlc-de...@videolan.org\n" "POT-Creation-Date: 2013-09-08 20:08+0200\n" -"PO-Revision-Date: 2013-07-17 17:45+\n" +"PO-Revision-Date: 2013-09-09 13:54+\n" "Last-Translator: Андрій Бандура \n" "Language-Team: Ukrainian (http://www.transifex.com/projects/p/vlc-trans/"; "language/uk/)\n" @@ -19683,7 +19683,7 @@ msgstr " o сортувати список відтворе #: modules/gui/ncurses.c:908 msgid " O Reverse order Playlist by title" msgstr "" -" O зворотнє сортування списку відтворення за заголовками" +" O зворотне сортування списку відтворення за заголовками" #: modules/gui/ncurses.c:909 msgid " g Go to the current playing item" @@ -19859,7 +19859,7 @@ msgstr "Покадрово" #: modules/gui/qt4/components/controller.hpp:118 msgid "Trickplay Reverse" -msgstr "Зворотнє відтворювання" +msgstr "Зворотне відтворювання" #: modules/gui/qt4/components/controller.hpp:119 #: modules/gui/qt4/components/controller.hpp:131 @@ -19932,7 +19932,7 @@ msgstr "Покадрово" #: modules/gui/qt4/components/controller.hpp:131 msgid "Reverse" -msgstr "Зворотнє" +msgstr "Зворотне" #: modules/gui/qt4/components/controller.hpp:132 msgid "Change the loop and repeat modes" @@ -28935,9 +28935,8 @@ msgid "Default caching policy" msgstr "Стандартна політика кешування" #: modules/gui/qt4/ui/sprefs_interface.h:514 -#, fuzzy msgid "Menus language:" -msgstr "Мова звуку" +msgstr "Мова меню:" #: modules/gui/qt4/ui/sprefs_interface.h:515 msgid "Look and feel" @@ -35872,7 +35871,7 @@ msgstr "Список медіаменеджеру" #, fuzzy #~ msgid "Sort Reverse" -#~ msgstr "Зворотнє" +#~ msgstr "Зворотне" #, fuzzy #~ msgid "Sort by Path" ___ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] l10n: Turkish update
vlc/vlc-2.1 | branch: master | Kaya Zeren | Wed Sep 11 14:54:29 2013 +0200| [60d5fc87f2fb00cc7eb8856d17b48ebe6603d35d] | committer: Christoph Miebach l10n: Turkish update Signed-off-by: Christoph Miebach > http://git.videolan.org/gitweb.cgi/vlc/vlc-2.1.git/?a=commit;h=60d5fc87f2fb00cc7eb8856d17b48ebe6603d35d --- po/tr.po | 23 +++ 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/po/tr.po b/po/tr.po index 9cb3df0..61beccb 100644 --- a/po/tr.po +++ b/po/tr.po @@ -17,8 +17,8 @@ msgstr "" "Project-Id-Version: VLC - Trans\n" "Report-Msgid-Bugs-To: vlc-de...@videolan.org\n" "POT-Creation-Date: 2013-09-08 20:08+0200\n" -"PO-Revision-Date: 2013-08-16 03:28+\n" -"Last-Translator: Kaya Zeren \n" +"PO-Revision-Date: 2013-09-09 08:20+\n" +"Last-Translator: Yaron Shahrabani \n" "Language-Team: Turkish (http://www.transifex.com/projects/p/vlc-trans/"; "language/tr/)\n" "Language: tr\n" @@ -3249,8 +3249,8 @@ msgid "" "This file contains an optional CRL to prevent remote clients from using " "revoked certificates in TLS sessions." msgstr "" -"Bu dosya, TLS oturumlarında, iptal edilmiş sertifikaları kullanan uzak " -"istemcilerin silinmesini engelleyen, isteğe bağlı bir CRL içerir." +"Bu dosya, uzak istemcilerin, TLS oturumlarında iptal edilmiş sertifikaları " +"kullanmasını engelleyen, isteğe bağlı bir CRL içerir." #: src/libvlc-module.c:845 msgid "SOCKS server" @@ -19064,10 +19064,10 @@ msgid "" "that only a small part of the MMS protocol is supported (MMS encapsulated in " "HTTP)." msgstr "" -"Bunu birkaç bilgisayara Microsoft MMS iletişim kurallarını kullanarak akış " -"yapmak için kullanın. Bu iletişim kuralı çoğu Microsoft yazılımına aktarım " -"için kullanılır. MMS iletişim kurallarının yalnızca küçük bir kısmının " -"desteklendiğini unutmayın (HTTP içine kapsüllenmiş MMS)." +"Bu seçeneği, Microsoft MMS iletişim kurallarını kullanarak, birkaç " +"bilgisayara akış sağlamak için kullanın. Bu iletişim kuralı çoğu Microsoft " +"yazılımına aktarım için kullanılır. Ancak MMS iletişim kurallarının yalnızca " +"küçük bir kısmının desteklendiğini unutmayın (HTTP içine kapsüllenmiş MMS)." #: modules/gui/macosx/wizard.m:270 modules/gui/macosx/wizard.m:280 msgid "Enter the address of the computer to stream to." @@ -28928,9 +28928,8 @@ msgid "Default caching policy" msgstr "Varsayılan ön bellekleme politikası" #: modules/gui/qt4/ui/sprefs_interface.h:514 -#, fuzzy msgid "Menus language:" -msgstr "Ses dili" +msgstr "Arayüz dili:" #: modules/gui/qt4/ui/sprefs_interface.h:515 msgid "Look and feel" @@ -32200,8 +32199,8 @@ msgstr "Ortam Yöneticisi Listesi" #~ "This file countains an optional CRL to prevent remote clients from using " #~ "revoked certificates in TLS sessions." #~ msgstr "" -#~ "Bu dosya, TLS oturumlarında, iptal edilmiş sertifikaları kullanan uzak " -#~ "istemcilerin silinmesini engelleyen, isteğe bağlı bir CRL içerir." +#~ "Bu dosya, uzak istemcilerin, TLS oturumlarında iptal edilmiş " +#~ "sertifikaları kullanmasını engelleyen, isteğe bağlı bir CRL içerir." #, fuzzy #~ msgid "" ___ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] l10n: Swedish update
vlc/vlc-2.1 | branch: master | VideoLAN | Wed Sep 11 14:51:47 2013 +0200| [c9a97b639d183cab98339f727009d79cbb770145] | committer: Christoph Miebach l10n: Swedish update Signed-off-by: Christoph Miebach > http://git.videolan.org/gitweb.cgi/vlc/vlc-2.1.git/?a=commit;h=c9a97b639d183cab98339f727009d79cbb770145 --- po/sv.po |11892 ++ 1 file changed, 5773 insertions(+), 6119 deletions(-) Diff: http://git.videolan.org/gitweb.cgi/vlc/vlc-2.1.git/?a=commitdiff;h=c9a97b639d183cab98339f727009d79cbb770145 ___ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] l10n: Thai update
vlc/vlc-2.1 | branch: master | Thanakrit Chomphuming | Wed Sep 11 14:53:26 2013 +0200| [a3f8722c70d9774fce3d8409ca029479852acd49] | committer: Christoph Miebach l10n: Thai update Signed-off-by: Christoph Miebach > http://git.videolan.org/gitweb.cgi/vlc/vlc-2.1.git/?a=commit;h=a3f8722c70d9774fce3d8409ca029479852acd49 --- po/th.po | 96 +++--- 1 file changed, 48 insertions(+), 48 deletions(-) Diff: http://git.videolan.org/gitweb.cgi/vlc/vlc-2.1.git/?a=commitdiff;h=a3f8722c70d9774fce3d8409ca029479852acd49 ___ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] l10n: Japanese update
vlc/vlc-2.1 | branch: master | Fumio Nakayama | Wed Sep 11 14:21:03 2013 +0200| [05712789b7285c60e50e5741ef9ada695777a6bf] | committer: Christoph Miebach l10n: Japanese update Signed-off-by: Christoph Miebach > http://git.videolan.org/gitweb.cgi/vlc/vlc-2.1.git/?a=commit;h=05712789b7285c60e50e5741ef9ada695777a6bf --- po/ja.po |7 +++ 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/po/ja.po b/po/ja.po index 8081cfb..d574464 100644 --- a/po/ja.po +++ b/po/ja.po @@ -10,8 +10,8 @@ msgstr "" "Project-Id-Version: VLC - Trans\n" "Report-Msgid-Bugs-To: vlc-de...@videolan.org\n" "POT-Creation-Date: 2013-09-08 20:08+0200\n" -"PO-Revision-Date: 2013-08-11 12:31+\n" -"Last-Translator: Fumio Nakayama \n" +"PO-Revision-Date: 2013-09-09 08:20+\n" +"Last-Translator: Yaron Shahrabani \n" "Language-Team: Japanese (http://www.transifex.com/projects/p/vlc-trans/"; "language/ja/)\n" "Language: ja\n" @@ -28777,9 +28777,8 @@ msgid "Default caching policy" msgstr "デフォルトキャッシュポリシー" #: modules/gui/qt4/ui/sprefs_interface.h:514 -#, fuzzy msgid "Menus language:" -msgstr "オーディオ言語" +msgstr "メニュー言語:" #: modules/gui/qt4/ui/sprefs_interface.h:515 msgid "Look and feel" ___ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] l10n: Romanian update
vlc/vlc-2.1 | branch: master | VideoLAN | Wed Sep 11 14:42:46 2013 +0200| [935239978364aa8e6f167c9217a199963635d405] | committer: Christoph Miebach l10n: Romanian update Signed-off-by: Christoph Miebach > http://git.videolan.org/gitweb.cgi/vlc/vlc-2.1.git/?a=commit;h=935239978364aa8e6f167c9217a199963635d405 --- po/ro.po | 8187 -- 1 file changed, 3685 insertions(+), 4502 deletions(-) Diff: http://git.videolan.org/gitweb.cgi/vlc/vlc-2.1.git/?a=commitdiff;h=935239978364aa8e6f167c9217a199963635d405 ___ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] l10n: French update
vlc/vlc-2.1 | branch: master | Éric Lassauge | Wed Sep 11 14:14:53 2013 +0200| [f06de5b9b67ad74dde177ba2faf347c22bf4f90d] | committer: Christoph Miebach l10n: French update Signed-off-by: Christoph Miebach > http://git.videolan.org/gitweb.cgi/vlc/vlc-2.1.git/?a=commit;h=f06de5b9b67ad74dde177ba2faf347c22bf4f90d --- po/fr.po | 39 --- 1 file changed, 20 insertions(+), 19 deletions(-) diff --git a/po/fr.po b/po/fr.po index eee6b75..cdb4630 100644 --- a/po/fr.po +++ b/po/fr.po @@ -16,8 +16,8 @@ msgstr "" "Project-Id-Version: VLC - Trans\n" "Report-Msgid-Bugs-To: vlc-de...@videolan.org\n" "POT-Creation-Date: 2013-09-08 20:08+0200\n" -"PO-Revision-Date: 2013-08-20 17:58+\n" -"Last-Translator: Eric Lassauge \n" +"PO-Revision-Date: 2013-09-09 08:20+\n" +"Last-Translator: Yaron Shahrabani \n" "Language-Team: French (http://www.transifex.com/projects/p/vlc-trans/"; "language/fr/)\n" "Language: fr\n" @@ -3260,8 +3260,6 @@ msgid "" "This file contains an optional CRL to prevent remote clients from using " "revoked certificates in TLS sessions." msgstr "" -"Ce fichier contient un CRL optionnel pour éviter que de clients supprimés " -"utilisent des certificats révoqués pour des sessions TLS." #: src/libvlc-module.c:845 msgid "SOCKS server" @@ -18237,7 +18235,7 @@ msgstr "" #: modules/gui/macosx/simple_prefs.m:221 msgid "Note that these are system-wide settings." -msgstr "" +msgstr "Notez que ces paramètres sont pour l'ensemble du système." #: modules/gui/macosx/simple_prefs.m:226 msgid "Interface style" @@ -18413,6 +18411,14 @@ msgid "" "\n" "Are you sure you want to continue?" msgstr "" +"Ceci va remettre à zéro toutes les préférences de VLC.\n" +"\n" +"Notez que VLC va redémarrer pendant cette procédure, ainsi votre liste de " +"lecture sera vidée et les lectures ou transcodages en cours seront stoppés.\n" +"\n" +"La bibliothèque de médias n'est pas affectée.\n" +"\n" +"Voulez-vous vraiment continuer ?" #: modules/gui/macosx/simple_prefs.m:1062 msgid "Choose the folder to save your video snapshots to." @@ -18933,10 +18939,6 @@ msgid "" "that only a small part of the MMS protocol is supported (MMS encapsulated in " "HTTP)." msgstr "" -"Utilisez ceci pour diffuser vers plusieurs ordinateurs en utilisant le " -"protocole Microsoft MMS. Ce protocole est utilisé comme méthode de transport " -"par les logiciels Microsoft. Veuillez noter que seule une partie du " -"protocole MMS est gérée (MMS encapsulé dans HTTP)" #: modules/gui/macosx/wizard.m:270 modules/gui/macosx/wizard.m:280 msgid "Enter the address of the computer to stream to." @@ -28721,9 +28723,8 @@ msgid "Default caching policy" msgstr "Politique de cache par défaut" #: modules/gui/qt4/ui/sprefs_interface.h:514 -#, fuzzy msgid "Menus language:" -msgstr "Langue audio" +msgstr "Langue de l'interface :" #: modules/gui/qt4/ui/sprefs_interface.h:515 msgid "Look and feel" @@ -31013,6 +31014,14 @@ msgstr "Liste du gestionnaire de médias" #~ msgstr "Aucune donnée de guide des programmes" #, fuzzy +#~ msgid "" +#~ "This file countains an optional CRL to prevent remote clients from using " +#~ "revoked certificates in TLS sessions." +#~ msgstr "" +#~ "Ce fichier contient un CRL optionnel pour éviter que de clients " +#~ "supprimés utilisent des certificats révoqués pour des sessions TLS." + +#, fuzzy #~ msgid "Add a subtitle file" #~ msgstr "Utiliser un fichier de sous-&titres" @@ -31125,14 +31134,6 @@ msgstr "Liste du gestionnaire de médias" #~ msgstr "Visualisations audio" #, fuzzy -#~ msgid "" -#~ "This file countains an optional CRL to prevent remote clients from using " -#~ "revoked certificates in TLS sessions." -#~ msgstr "" -#~ "Ce fichier contient un CRL optionnel pour éviter que de clients " -#~ "supprimés utilisent des certificats révoqués pour des sessions TLS." - -#, fuzzy #~ msgid "Control SAP flow" #~ msgstr "Contrôles" ___ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] l10n: Portuguese update
vlc/vlc-2.1 | branch: master | Bruno Miguel Queiros | Wed Sep 11 14:39:20 2013 +0200| [8780f8ca9c81add56be8878a4e67297da888af14] | committer: Christoph Miebach l10n: Portuguese update Signed-off-by: Christoph Miebach > http://git.videolan.org/gitweb.cgi/vlc/vlc-2.1.git/?a=commit;h=8780f8ca9c81add56be8878a4e67297da888af14 --- po/pt_PT.po | 53 + 1 file changed, 25 insertions(+), 28 deletions(-) diff --git a/po/pt_PT.po b/po/pt_PT.po index 01de09e..8b7e2f0 100644 --- a/po/pt_PT.po +++ b/po/pt_PT.po @@ -15,8 +15,8 @@ msgstr "" "Project-Id-Version: VLC - Trans\n" "Report-Msgid-Bugs-To: vlc-de...@videolan.org\n" "POT-Creation-Date: 2013-09-08 20:08+0200\n" -"PO-Revision-Date: 2013-08-15 16:47+\n" -"Last-Translator: glrs \n" +"PO-Revision-Date: 2013-09-09 08:20+\n" +"Last-Translator: Yaron Shahrabani \n" "Language-Team: Portuguese (Portugal) (http://www.transifex.com/projects/p/"; "vlc-trans/language/pt_PT/)\n" "Language: pt_PT\n" @@ -3232,8 +3232,6 @@ msgid "" "This file contains an optional CRL to prevent remote clients from using " "revoked certificates in TLS sessions." msgstr "" -"Este ficheiro contém uma CRL opcional para evitar remover os clientes de " -"utilizem certificados revogados em sessões TLS." #: src/libvlc-module.c:845 msgid "SOCKS server" @@ -7726,11 +7724,11 @@ msgstr "" #: modules/access_output/livehttp.c:97 msgid "File containing the 16 bytes encryption key" -msgstr "" +msgstr "Ficheiro contendo a chave de encriptação de 16 bytes" #: modules/access_output/livehttp.c:99 msgid "File where vlc reads key-uri and keyfile-location" -msgstr "" +msgstr "Ficheiro que o vlc lê \"key-uri\" e \"keyfile-location\"" #: modules/access_output/livehttp.c:100 msgid "" @@ -7741,7 +7739,7 @@ msgstr "" #: modules/access_output/livehttp.c:104 msgid "Use randomized IV for encryption" -msgstr "" +msgstr "Use IV aleatóreo para a encriptação" #: modules/access_output/livehttp.c:105 msgid "Generate IV instead using segment-number as IV" @@ -7932,11 +7930,11 @@ msgstr "RAR descomprimido" #: modules/access/rdp.c:49 msgid "RDP auth username" -msgstr "" +msgstr "RDP - Nome de Utilizador da autorização" #: modules/access/rdp.c:50 msgid "RDP auth password" -msgstr "" +msgstr "RDP - Senha da autorização" #: modules/access/rdp.c:51 msgid "RDP Password" @@ -7948,7 +7946,7 @@ msgstr "Conexão encriptada" #: modules/access/rdp.c:54 msgid "Acquisition rate (in fps)" -msgstr "" +msgstr "Taxa de Aquisição (em fps)" #: modules/access/rdp.c:65 msgid "RDP" @@ -8188,7 +8186,7 @@ msgstr "Coluna da região esquerda" #: modules/access/screen/xcb.c:44 msgid "Abscissa of the capture region in pixels." -msgstr "" +msgstr "Abcissa da região da captura em pontos." #: modules/access/screen/xcb.c:46 msgid "Region top row" @@ -8212,11 +8210,11 @@ msgstr "Altura da região capturada" #: modules/access/screen/xcb.c:56 msgid "Pixel height of the capture region, or 0 for full height" -msgstr "" +msgstr "Altura do ponto da região da captura, ou 0 para altura completa" #: modules/access/screen/xcb.c:70 msgid "Screen capture (with X11/XCB)" -msgstr "" +msgstr "Captura do Ecrã (com X11/XCB)" #: modules/access/sdp.c:33 modules/stream_out/rtp.c:79 msgid "SDP" @@ -8363,7 +8361,7 @@ msgstr "Entrada TCP" #: modules/access/timecode.c:43 msgid "Time code" -msgstr "" +msgstr "Código de Tempo" #: modules/access/timecode.c:44 msgid "Time code subpicture elementary stream generator" @@ -8462,7 +8460,7 @@ msgstr "Reiniciar controlos" #: modules/access/v4l2/v4l2.c:83 msgid "Reset controls to defaults." -msgstr "" +msgstr "Repor para as predefinições dos controlos." #: modules/access/v4l2/v4l2.c:84 modules/gui/macosx/VideoEffects.m:92 #: modules/video_filter/atmo/atmo.cpp:263 @@ -8472,7 +8470,7 @@ msgstr "Brilho" #: modules/access/v4l2/v4l2.c:85 msgid "Picture brightness or black level." -msgstr "" +msgstr "Brilho da imagem ou nível do preto." #: modules/access/v4l2/v4l2.c:86 msgid "Automatic brightness" @@ -8480,7 +8478,7 @@ msgstr "Brilho Automático" #: modules/access/v4l2/v4l2.c:88 msgid "Automatically adjust the picture brightness." -msgstr "" +msgstr "Ajustar automaticamente o brilho da imagem." #: modules/access/v4l2/v4l2.c:89 modules/gui/macosx/VideoEffects.m:91 #: modules/gui/qt4/ui/video_effects.h:1306 @@ -27622,9 +27620,8 @@ msgid "Default caching policy" msgstr "" #: modules/gui/qt4/ui/sprefs_interface.h:514 -#, fuzzy msgid "Menus language:" -msgstr "Linguagem do áudio" +msgstr "Linguagem dos menus:" #: modules/gui/qt4/ui/sprefs_interface.h:515 msgid "Look and feel" @@ -29846,6 +29843,14 @@ msgstr "Lista do Gestor de Media" #~ msgstr "Tempo restante: %i segundos" #, fuzzy +#~ msgid "" +#~ "This file countains an optional CRL to prevent remote clients from using " +#~ "revoked certificates in TLS sessions." +#~ msgstr "" +#~ "Este ficheiro contém uma CRL opcional para evitar
[vlc-commits] l10n: Slovenian update
vlc/vlc-2.1 | branch: master | Martin Srebotnjak | Wed Sep 11 14:47:21 2013 +0200| [e66d8993ed0c0597e6f76f0878d5d9e5abbe4db1] | committer: Christoph Miebach l10n: Slovenian update Signed-off-by: Christoph Miebach > http://git.videolan.org/gitweb.cgi/vlc/vlc-2.1.git/?a=commit;h=e66d8993ed0c0597e6f76f0878d5d9e5abbe4db1 --- po/sl.po | 38 +- 1 file changed, 17 insertions(+), 21 deletions(-) diff --git a/po/sl.po b/po/sl.po index fa7fdde..9c8c7fb 100644 --- a/po/sl.po +++ b/po/sl.po @@ -11,8 +11,8 @@ msgstr "" "Project-Id-Version: VLC - Trans\n" "Report-Msgid-Bugs-To: vlc-de...@videolan.org\n" "POT-Creation-Date: 2013-09-08 20:08+0200\n" -"PO-Revision-Date: 2013-08-22 19:39+\n" -"Last-Translator: anthonmanix \n" +"PO-Revision-Date: 2013-09-09 11:15+\n" +"Last-Translator: Martin Srebotnjak \n" "Language-Team: Slovenian (http://www.transifex.com/projects/p/vlc-trans/"; "language/sl/)\n" "Language: sl\n" @@ -15976,12 +15976,12 @@ msgstr "Shrani" #: modules/gui/macosx/AudioEffects.m:399 modules/gui/macosx/AudioEffects.m:738 #: modules/gui/macosx/VideoEffects.m:940 msgid "Remove a preset" -msgstr "" +msgstr "Odstrani prednastavitev" #: modules/gui/macosx/AudioEffects.m:400 modules/gui/macosx/AudioEffects.m:739 #: modules/gui/macosx/VideoEffects.m:941 msgid "Select the preset you would like to remove:" -msgstr "" +msgstr "Izberite prednastavitev, ki jo želite odstraniti:" #: modules/gui/macosx/AudioEffects.m:401 modules/gui/macosx/AudioEffects.m:740 #: modules/gui/macosx/bookmarks.m:95 modules/gui/macosx/ConvertAndSave.m:380 @@ -15991,11 +15991,11 @@ msgstr "Odstrani" #: modules/gui/macosx/AudioEffects.m:461 msgid "Add new Preset..." -msgstr "" +msgstr "Dodaj novo prednastavitev ..." #: modules/gui/macosx/AudioEffects.m:466 msgid "Organize Presets..." -msgstr "" +msgstr "Organiziraj prednastavitve ..." #: modules/gui/macosx/AudioEffects.m:639 msgid "Save current selection as new preset" @@ -16260,11 +16260,11 @@ msgstr "Odpri predstavno vsebino ..." #: modules/gui/macosx/ConvertAndSave.m:156 msgid "Choose Profile" -msgstr "" +msgstr "Izberi profil" #: modules/gui/macosx/ConvertAndSave.m:157 msgid "Customize..." -msgstr "" +msgstr "Prilagodi ..." #: modules/gui/macosx/ConvertAndSave.m:158 msgid "Choose Destination" @@ -16293,7 +16293,7 @@ msgstr "" #: modules/gui/macosx/ConvertAndSave.m:164 msgid "Save as File" -msgstr "" +msgstr "Shrani kot datoteko" #: modules/gui/macosx/ConvertAndSave.m:165 #: modules/gui/macosx/ConvertAndSave.m:415 modules/gui/macosx/output.m:134 @@ -16307,7 +16307,7 @@ msgstr "Uporabi" #: modules/gui/macosx/ConvertAndSave.m:169 msgid "Save as new Profile..." -msgstr "" +msgstr "Shrani kot nov profil ..." #: modules/gui/macosx/ConvertAndSave.m:170 modules/gui/qt4/ui/profiles.h:709 msgid "Encapsulation" @@ -16373,7 +16373,7 @@ msgstr "Naslov" #: modules/gui/macosx/ConvertAndSave.m:198 msgid "TTL" -msgstr "" +msgstr "TTL" #: modules/gui/macosx/ConvertAndSave.m:201 modules/gui/macosx/open.m:183 #: modules/gui/macosx/open.m:185 modules/gui/macosx/output.m:138 @@ -16421,15 +16421,15 @@ msgstr "" #: modules/gui/macosx/ConvertAndSave.m:365 msgid "Save as new profile" -msgstr "" +msgstr "Shrani kot nov profil" #: modules/gui/macosx/ConvertAndSave.m:378 msgid "Remove a profile" -msgstr "" +msgstr "Odstrani profil" #: modules/gui/macosx/ConvertAndSave.m:379 msgid "Select the profile you would like to remove:" -msgstr "" +msgstr "Izberite profil, ki ga želite odstraniti:" #: modules/gui/macosx/ConvertAndSave.m:461 msgid "%@ stream to %@:%@" @@ -18485,9 +18485,6 @@ msgid "" "that only a small part of the MMS protocol is supported (MMS encapsulated in " "HTTP)." msgstr "" -"Uporabite za pretakanje na več računalnikov z uporabo Microsoftovega MMS " -"protokola. Protokol se uporablja kot metoda prenašanja med različnimi " -"Microsoftovimi programi. Podprt je le del protokola (MMS zvijanje v HTTP)." #: modules/gui/macosx/wizard.m:270 modules/gui/macosx/wizard.m:280 msgid "Enter the address of the computer to stream to." @@ -28061,9 +28058,8 @@ msgid "Default caching policy" msgstr "Privzeta pravila predpomnjenja" #: modules/gui/qt4/ui/sprefs_interface.h:514 -#, fuzzy msgid "Menus language:" -msgstr "Jezik zvoka" +msgstr "Jezik menijev:" #: modules/gui/qt4/ui/sprefs_interface.h:515 msgid "Look and feel" @@ -35597,7 +35593,7 @@ msgstr "Seznam upravljalnika predstavnih datotek" #, fuzzy #~ msgid "Customize" -#~ msgstr "Po meri" +#~ msgstr "Prilagodi ..." #, fuzzy #~ msgid "Card Selection" @@ -35941,7 +35937,7 @@ msgstr "Seznam upravljalnika predstavnih datotek" #, fuzzy #~ msgid "Customize:" -#~ msgstr "Po meri" +#~ msgstr "Prilagodi ..." #, fuzzy #~ msgid "Use an external subtitles file." ___ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] l10n: Russian update
vlc/vlc-2.1 | branch: master | Alexander Lakhin | Wed Sep 11 14:43:55 2013 +0200| [c3811c04ad321f69532cbc8b43f304d4607d6e90] | committer: Christoph Miebach l10n: Russian update Signed-off-by: Christoph Miebach > http://git.videolan.org/gitweb.cgi/vlc/vlc-2.1.git/?a=commit;h=c3811c04ad321f69532cbc8b43f304d4607d6e90 --- po/ru.po |7 +++ 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/po/ru.po b/po/ru.po index edd66c8..f7ecd7e 100644 --- a/po/ru.po +++ b/po/ru.po @@ -14,8 +14,8 @@ msgstr "" "Project-Id-Version: VLC - Trans\n" "Report-Msgid-Bugs-To: vlc-de...@videolan.org\n" "POT-Creation-Date: 2013-09-08 20:08+0200\n" -"PO-Revision-Date: 2013-07-13 14:19+\n" -"Last-Translator: law \n" +"PO-Revision-Date: 2013-09-09 08:20+\n" +"Last-Translator: Yaron Shahrabani \n" "Language-Team: Russian (http://www.transifex.com/projects/p/vlc-trans/"; "language/ru/)\n" "Language: ru\n" @@ -28865,9 +28865,8 @@ msgid "Default caching policy" msgstr "Политика кэширования по умолчанию" #: modules/gui/qt4/ui/sprefs_interface.h:514 -#, fuzzy msgid "Menus language:" -msgstr "Язык аудио" +msgstr "Язык меню:" #: modules/gui/qt4/ui/sprefs_interface.h:515 msgid "Look and feel" ___ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] l10n: Korean update
vlc/vlc-2.1 | branch: master | VideoLAN | Wed Sep 11 14:24:53 2013 +0200| [ca4523ef87a1f310fecae7480aba90a9a88b4912] | committer: Christoph Miebach l10n: Korean update Signed-off-by: Christoph Miebach > http://git.videolan.org/gitweb.cgi/vlc/vlc-2.1.git/?a=commit;h=ca4523ef87a1f310fecae7480aba90a9a88b4912 --- po/ko.po | 1097 +- 1 file changed, 727 insertions(+), 370 deletions(-) Diff: http://git.videolan.org/gitweb.cgi/vlc/vlc-2.1.git/?a=commitdiff;h=ca4523ef87a1f310fecae7480aba90a9a88b4912 ___ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] l10n: Oriya update
vlc/vlc-2.1 | branch: master | Prasannajit Acharya | Wed Sep 11 14:36:05 2013 +0200| [43868ebdbcd0a8824b5dd4f105f03d953c530165] | committer: Christoph Miebach l10n: Oriya update Signed-off-by: Christoph Miebach > http://git.videolan.org/gitweb.cgi/vlc/vlc-2.1.git/?a=commit;h=43868ebdbcd0a8824b5dd4f105f03d953c530165 --- po/or.po |5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/po/or.po b/po/or.po index 6091bb1..4730dde 100644 --- a/po/or.po +++ b/po/or.po @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: VLC - Trans\n" "Report-Msgid-Bugs-To: vlc-de...@videolan.org\n" "POT-Creation-Date: 2013-09-08 20:08+0200\n" -"PO-Revision-Date: 2013-07-12 08:17+\n" +"PO-Revision-Date: 2013-09-09 08:20+\n" "Last-Translator: Yaron Shahrabani \n" "Language-Team: Oriya (India) (http://www.transifex.com/projects/p/vlc-trans/"; "language/or_IN/)\n" @@ -26846,9 +26846,8 @@ msgid "Default caching policy" msgstr "" #: modules/gui/qt4/ui/sprefs_interface.h:514 -#, fuzzy msgid "Menus language:" -msgstr "ଅଡ଼ିଓ ଭାଷା" +msgstr "ମେନୁ ଭାଷା:" #: modules/gui/qt4/ui/sprefs_interface.h:515 msgid "Look and feel" ___ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] l10n: Slovak update
vlc/vlc-2.1 | branch: master | VideoLAN | Wed Sep 11 14:45:26 2013 +0200| [61bf640f317ebeeb83b3b5d31f9019c3b165c724] | committer: Christoph Miebach l10n: Slovak update Signed-off-by: Christoph Miebach > http://git.videolan.org/gitweb.cgi/vlc/vlc-2.1.git/?a=commit;h=61bf640f317ebeeb83b3b5d31f9019c3b165c724 --- po/sk.po | 158 +++--- 1 file changed, 79 insertions(+), 79 deletions(-) Diff: http://git.videolan.org/gitweb.cgi/vlc/vlc-2.1.git/?a=commitdiff;h=61bf640f317ebeeb83b3b5d31f9019c3b165c724 ___ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] l10n: Croatian update
vlc/vlc-2.1 | branch: master | Dominko Aždajić | Wed Sep 11 15:18:43 2013 +0200| [637838304a8e61447ed4f58206157d250a645cf8] | committer: Christoph Miebach l10n: Croatian update Signed-off-by: Christoph Miebach > http://git.videolan.org/gitweb.cgi/vlc/vlc-2.1.git/?a=commit;h=637838304a8e61447ed4f58206157d250a645cf8 --- po/hr.po | 1470 +- 1 file changed, 685 insertions(+), 785 deletions(-) Diff: http://git.videolan.org/gitweb.cgi/vlc/vlc-2.1.git/?a=commitdiff;h=637838304a8e61447ed4f58206157d250a645cf8 ___ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] l10n: Italian update
vlc/vlc-2.1 | branch: master | VideoLAN | Wed Sep 11 14:20:05 2013 +0200| [89f3588c47bf04999aaa9f1ff90e287bae3a6f92] | committer: Christoph Miebach l10n: Italian update Signed-off-by: Christoph Miebach > http://git.videolan.org/gitweb.cgi/vlc/vlc-2.1.git/?a=commit;h=89f3588c47bf04999aaa9f1ff90e287bae3a6f92 --- po/it.po | 396 +- 1 file changed, 266 insertions(+), 130 deletions(-) Diff: http://git.videolan.org/gitweb.cgi/vlc/vlc-2.1.git/?a=commitdiff;h=89f3588c47bf04999aaa9f1ff90e287bae3a6f92 ___ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] l10n: Dutch update
vlc/vlc-2.1 | branch: master | Thomas De Rocker | Wed Sep 11 14:34:28 2013 +0200| [156001ab4d8525f8c97d3587fc0764f25be6bec4] | committer: Christoph Miebach l10n: Dutch update Signed-off-by: Christoph Miebach > http://git.videolan.org/gitweb.cgi/vlc/vlc-2.1.git/?a=commit;h=156001ab4d8525f8c97d3587fc0764f25be6bec4 --- po/nl.po | 24 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/po/nl.po b/po/nl.po index b262f66..57df238 100644 --- a/po/nl.po +++ b/po/nl.po @@ -12,8 +12,8 @@ msgstr "" "Project-Id-Version: VLC - Trans\n" "Report-Msgid-Bugs-To: vlc-de...@videolan.org\n" "POT-Creation-Date: 2013-09-08 20:08+0200\n" -"PO-Revision-Date: 2013-08-05 12:54+\n" -"Last-Translator: Thomas De Rocker\n" +"PO-Revision-Date: 2013-09-09 08:20+\n" +"Last-Translator: Yaron Shahrabani \n" "Language-Team: Dutch (http://www.transifex.com/projects/p/vlc-trans/language/"; "nl/)\n" "Language: nl\n" @@ -3243,8 +3243,8 @@ msgid "" "This file contains an optional CRL to prevent remote clients from using " "revoked certificates in TLS sessions." msgstr "" -"This file contains an optional CRL to prevent remote clients from using " -"revoked certificates in TLS sessions." +"Dit bestand bevat een optionele CRL om te voorkomen dat remote clients " +"gebruik maken van ingetrokken certificaten in TLS-sessies." #: src/libvlc-module.c:845 msgid "SOCKS server" @@ -19118,10 +19118,11 @@ msgid "" "that only a small part of the MMS protocol is supported (MMS encapsulated in " "HTTP)." msgstr "" -"Gebruik dit om naar meerdere computers te streamen door gebruik te maken van " -"het Microsoft MMS protocol. Dit protocol wordt gebruikt als transportmethode " -"door veel software van Microsoft. NB: alleen een klein gedeelte van het MMS " -"protocol wordt ondersteund (MMS ingekapseld in HTTP)." +"Gebruik dit om naar verschillende computers te streamen door gebruik te " +"maken van het Microsoft MMS protocol. Dit protocol wordt gebruikt als " +"transportmethode door veel software van Microsoft. Merk op dat slechts een " +"klein gedeelte van het MMS protocol ondersteund wordt (MMS ingekapseld in " +"HTTP)." #: modules/gui/macosx/wizard.m:270 modules/gui/macosx/wizard.m:280 msgid "Enter the address of the computer to stream to." @@ -29073,9 +29074,8 @@ msgid "Default caching policy" msgstr "Standaard bufferbeleid" #: modules/gui/qt4/ui/sprefs_interface.h:514 -#, fuzzy msgid "Menus language:" -msgstr "Audiotaal" +msgstr "Menutaal:" #: modules/gui/qt4/ui/sprefs_interface.h:515 msgid "Look and feel" @@ -32511,8 +32511,8 @@ msgstr "Mediabeheerlijst" #~ "This file countains an optional CRL to prevent remote clients from using " #~ "revoked certificates in TLS sessions." #~ msgstr "" -#~ "This file contains an optional CRL to prevent remote clients from using " -#~ "revoked certificates in TLS sessions." +#~ "Dit bestand bevat een optionele CRL om te voorkomen dat remote clients " +#~ "gebruik maken van ingetrokken certificaten in TLS-sessies." #, fuzzy #~ msgid "" ___ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] l10n: Polish update
vlc/vlc-2.1 | branch: master | Michał Trzebiatowski | Wed Sep 11 14:37:33 2013 +0200| [8d50a5f5fd97215b52cebfe3e645747f0519e33e] | committer: Christoph Miebach l10n: Polish update Signed-off-by: Christoph Miebach > http://git.videolan.org/gitweb.cgi/vlc/vlc-2.1.git/?a=commit;h=8d50a5f5fd97215b52cebfe3e645747f0519e33e --- po/pl.po | 2161 -- 1 file changed, 1241 insertions(+), 920 deletions(-) Diff: http://git.videolan.org/gitweb.cgi/vlc/vlc-2.1.git/?a=commitdiff;h=8d50a5f5fd97215b52cebfe3e645747f0519e33e ___ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] l10n: Walloon update
vlc/vlc-2.1 | branch: master | Gaëtan Rousseaux | Wed Sep 11 14:57:59 2013 +0200| [d046467756edfc6728e61281f77f9eb4437f7948] | committer: Christoph Miebach l10n: Walloon update Signed-off-by: Christoph Miebach > http://git.videolan.org/gitweb.cgi/vlc/vlc-2.1.git/?a=commit;h=d046467756edfc6728e61281f77f9eb4437f7948 --- po/wa.po | 4693 +++--- 1 file changed, 2657 insertions(+), 2036 deletions(-) Diff: http://git.videolan.org/gitweb.cgi/vlc/vlc-2.1.git/?a=commitdiff;h=d046467756edfc6728e61281f77f9eb4437f7948 ___ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] l10n: Catalan update
vlc/vlc-2.1 | branch: master | Pau Iranzo | Wed Sep 11 13:08:44 2013 +0200| [30ac0f960bc0098425a07a907f138484ad70dabd] | committer: Christoph Miebach l10n: Catalan update Signed-off-by: Christoph Miebach > http://git.videolan.org/gitweb.cgi/vlc/vlc-2.1.git/?a=commit;h=30ac0f960bc0098425a07a907f138484ad70dabd --- po/ca.po | 17 - 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/po/ca.po b/po/ca.po index 5a6cc28..53df749 100644 --- a/po/ca.po +++ b/po/ca.po @@ -12,7 +12,7 @@ msgstr "" "Project-Id-Version: VLC - Trans\n" "Report-Msgid-Bugs-To: vlc-de...@videolan.org\n" "POT-Creation-Date: 2013-09-08 20:08+0200\n" -"PO-Revision-Date: 2013-07-14 07:06+\n" +"PO-Revision-Date: 2013-09-09 10:44+\n" "Last-Translator: Pau Iranzo \n" "Language-Team: Catalan (http://www.transifex.com/projects/p/vlc-trans/"; "language/ca/)\n" @@ -3297,8 +3297,8 @@ msgid "" "This file contains an optional CRL to prevent remote clients from using " "revoked certificates in TLS sessions." msgstr "" -"Aquest fitxer té un CRL opcional per prevenir l'eliminació de clients en " -"utilitzar certificats revocats en sessions TLS." +"Aquest fitxer conté un CRL opcional per evitar que clients remots utilitzin " +"certificats revocats en sessions TLS." #: src/libvlc-module.c:845 msgid "SOCKS server" @@ -19418,10 +19418,10 @@ msgid "" "that only a small part of the MMS protocol is supported (MMS encapsulated in " "HTTP)." msgstr "" -"Utilitzeu aquesta opció per transmetre a diversos ordinadors mitjançant el " -"protocol de Microsoft MMS. Aquest protocol l'utilitzen com a mètode de " -"transport diversos programes de Microsoft. Tingueu en compte que només admet " -"una petita part del protocol MMS (MMS encapsulat en HTTP)." +"Utilitza-ho per escoltar diversos ortdinadors utilitzant el protocol de " +"Microsoft MMS. Aquest protocol s'utilitza com a mètode de transport per " +"programes diversos de Microsoft. Tingueu en compte que només una petita part " +"és compatible amb el protocol MMS (MMS encapsulat en HTTP). " #: modules/gui/macosx/wizard.m:270 modules/gui/macosx/wizard.m:280 msgid "Enter the address of the computer to stream to." @@ -29434,9 +29434,8 @@ msgid "Default caching policy" msgstr "Política de memòria cau per defecte" #: modules/gui/qt4/ui/sprefs_interface.h:514 -#, fuzzy msgid "Menus language:" -msgstr "Idioma de l'àudio" +msgstr "Idioma dels menús:" #: modules/gui/qt4/ui/sprefs_interface.h:515 msgid "Look and feel" ___ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] l10n: Modern Greek update
vlc/vlc-2.1 | branch: master | VideoLAN | Wed Sep 11 14:08:11 2013 +0200| [d2cd002d82b333b0b661b0a71765386f909a4408] | committer: Christoph Miebach l10n: Modern Greek update Signed-off-by: Christoph Miebach > http://git.videolan.org/gitweb.cgi/vlc/vlc-2.1.git/?a=commit;h=d2cd002d82b333b0b661b0a71765386f909a4408 --- po/el.po | 1092 +++--- 1 file changed, 553 insertions(+), 539 deletions(-) Diff: http://git.videolan.org/gitweb.cgi/vlc/vlc-2.1.git/?a=commitdiff;h=d2cd002d82b333b0b661b0a71765386f909a4408 ___ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] l10n: Galician update
vlc/vlc-2.1 | branch: master | Gonçalo Cordeiro | Wed Sep 11 14:17:03 2013 +0200| [a1c81e8cb04beefb469c52459083a25e3ca2cf58] | committer: Christoph Miebach l10n: Galician update Signed-off-by: Christoph Miebach > http://git.videolan.org/gitweb.cgi/vlc/vlc-2.1.git/?a=commit;h=a1c81e8cb04beefb469c52459083a25e3ca2cf58 --- po/gl.po | 17 - 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/po/gl.po b/po/gl.po index 1975864..ff5bb9a 100644 --- a/po/gl.po +++ b/po/gl.po @@ -11,8 +11,8 @@ msgstr "" "Project-Id-Version: VLC - Trans\n" "Report-Msgid-Bugs-To: vlc-de...@videolan.org\n" "POT-Creation-Date: 2013-09-08 20:08+0200\n" -"PO-Revision-Date: 2013-07-23 23:12+\n" -"Last-Translator: Gonçalo Cordeiro \n" +"PO-Revision-Date: 2013-09-09 08:20+\n" +"Last-Translator: Yaron Shahrabani \n" "Language-Team: Galician (http://www.transifex.com/projects/p/vlc-trans/"; "language/gl/)\n" "Language: gl\n" @@ -3266,8 +3266,8 @@ msgid "" "This file contains an optional CRL to prevent remote clients from using " "revoked certificates in TLS sessions." msgstr "" -"Este ficheiro contén un CRL opcional para previr que clientes remotos poidan " -"usar certificados revogados en sesións TLS." +"Este ficheiro contén un CRL opcional para previr que clientes remotos usen " +"certificados revogados en sesións TLS." #: src/libvlc-module.c:845 msgid "SOCKS server" @@ -19249,8 +19249,8 @@ msgid "" msgstr "" "Use isto para emitir en fluxo para varios computadores usando o protocolo " "Microsoft MMS. Este protocolo úsase como método de transporte en moitos " -"software de Microsoft. Teña en conta que só se admite unha pequena parte do " -"protocolo MMS (MMS encapsulado en HTTP)." +"softwares de Microsoft. Teña en conta que só unha pequena parte do " +"protocolo MMS é compatíbel (MMS encapsulado en HTTP)." #: modules/gui/macosx/wizard.m:270 modules/gui/macosx/wizard.m:280 msgid "Enter the address of the computer to stream to." @@ -29235,9 +29235,8 @@ msgid "Default caching policy" msgstr "Política predeterminada de caché" #: modules/gui/qt4/ui/sprefs_interface.h:514 -#, fuzzy msgid "Menus language:" -msgstr "Idioma de audio" +msgstr "Idioma dos menús:" #: modules/gui/qt4/ui/sprefs_interface.h:515 msgid "Look and feel" @@ -31802,7 +31801,7 @@ msgstr "Lista do xestor multimedia" #~ "revoked certificates in TLS sessions." #~ msgstr "" #~ "Este ficheiro contén un CRL opcional para previr que clientes remotos " -#~ "poidan usar certificados revogados en sesións TLS." +#~ "usen certificados revogados en sesións TLS." #, fuzzy #~ msgid "" ___ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] l10n: Marathi update
vlc/vlc-2.1 | branch: master | Suraj Kawade | Wed Sep 11 14:29:43 2013 +0200| [1eec74c8f0150b6363e4ca36adaeb458ee099b7e] | committer: Christoph Miebach l10n: Marathi update Signed-off-by: Christoph Miebach > http://git.videolan.org/gitweb.cgi/vlc/vlc-2.1.git/?a=commit;h=1eec74c8f0150b6363e4ca36adaeb458ee099b7e --- po/mr.po | 88 -- 1 file changed, 46 insertions(+), 42 deletions(-) Diff: http://git.videolan.org/gitweb.cgi/vlc/vlc-2.1.git/?a=commitdiff;h=1eec74c8f0150b6363e4ca36adaeb458ee099b7e ___ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] l10n: Hebrew update
vlc/vlc-2.1 | branch: master | Yaron Shahrabani | Wed Sep 11 14:17:46 2013 +0200| [142966a626fb8b1da456bc73e4ba32003e35100d] | committer: Christoph Miebach l10n: Hebrew update Signed-off-by: Christoph Miebach > http://git.videolan.org/gitweb.cgi/vlc/vlc-2.1.git/?a=commit;h=142966a626fb8b1da456bc73e4ba32003e35100d --- po/he.po | 2640 +++--- 1 file changed, 1507 insertions(+), 1133 deletions(-) Diff: http://git.videolan.org/gitweb.cgi/vlc/vlc-2.1.git/?a=commitdiff;h=142966a626fb8b1da456bc73e4ba32003e35100d ___ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] l10n: Danish update
vlc/vlc-2.1 | branch: master | VideoLAN | Wed Sep 11 14:01:42 2013 +0200| [4ff559cffafe80fc239ac9cf10d465b58c7a85c5] | committer: Christoph Miebach l10n: Danish update Signed-off-by: Christoph Miebach > http://git.videolan.org/gitweb.cgi/vlc/vlc-2.1.git/?a=commit;h=4ff559cffafe80fc239ac9cf10d465b58c7a85c5 --- po/da.po | 57 ++--- 1 file changed, 30 insertions(+), 27 deletions(-) diff --git a/po/da.po b/po/da.po index 81f768d..8a694da 100644 --- a/po/da.po +++ b/po/da.po @@ -28,8 +28,8 @@ msgstr "" "Project-Id-Version: VLC - Trans\n" "Report-Msgid-Bugs-To: vlc-de...@videolan.org\n" "POT-Creation-Date: 2013-09-08 20:08+0200\n" -"PO-Revision-Date: 2013-08-09 01:05+\n" -"Last-Translator: Aputsiaĸ Niels Janussen \n" +"PO-Revision-Date: 2013-09-09 08:20+\n" +"Last-Translator: Yaron Shahrabani \n" "Language-Team: Danish (http://www.transifex.com/projects/p/vlc-trans/"; "language/da/)\n" "Language: da\n" @@ -3217,7 +3217,7 @@ msgstr "" #: src/libvlc-module.c:840 msgid "HTTP/TLS Certificate Revocation List" -msgstr "" +msgstr "Liste med tilbagekaldelser af HTTP/TLS-certifikater" #: src/libvlc-module.c:842 msgid "" @@ -4297,19 +4297,21 @@ msgstr "Vælg genvejstasten der formindsker undertekstforsinkelsen." #: src/libvlc-module.c:1302 msgid "Subtitle sync / bookmark audio timestamp" -msgstr "" +msgstr "Synk. af undertekster / bogmærke for lydtidsstempel" #: src/libvlc-module.c:1303 msgid "Select the key to bookmark audio timestamp when syncing subtitles." msgstr "" +"Vælg tasten som bogmærker lydtidsstempel når undertekster synkroniseres." #: src/libvlc-module.c:1304 msgid "Subtitle sync / bookmark subtitle timestamp" -msgstr "" +msgstr "Synk. af undertekster / bogmærke for lydtidsstempel" #: src/libvlc-module.c:1305 msgid "Select the key to bookmark subtitle timestamp when syncing subtitles." msgstr "" +"Vælg tasten som bogmærker lydtidsstempel når undertekster synkroniseres." #: src/libvlc-module.c:1306 msgid "Subtitle sync / synchronize audio & subtitle timestamps" @@ -5803,15 +5805,16 @@ msgstr "" #: modules/access/bluray.c:284 msgid "AACS Host certificate revoked." -msgstr "" +msgstr "AACS-værtscertifikat er tilbagekaldt." #: modules/access/bluray.c:287 msgid "AACS MMC failed." -msgstr "" +msgstr "AACS MMC mislykkedes." #: modules/access/bluray.c:293 msgid "Your system AACS decoding library does not work. Missing keys?" msgstr "" +"Dit systems AACS-afkodningsbibliotek fungerer ikke. Mangler der nøgler?" #: modules/access/bluray.c:303 msgid "" @@ -5822,6 +5825,7 @@ msgstr "" #: modules/access/bluray.c:308 msgid "Your system BD+ decoding library does not work. Missing configuration?" msgstr "" +"Dit systems afkodningsbibliotek for BD+ fungerer ikke. Mangles der opsætning?" #: modules/access/bluray.c:370 msgid "Blu-ray error" @@ -6780,7 +6784,7 @@ msgstr "Kunne ikke læse fil" #: modules/access/file.c:177 #, c-format msgid "VLC could not open the file \"%s\" (%m)." -msgstr "" +msgstr "VLC kunne ikke åbne filen \"%s\" (%m)." #: modules/access/file.c:299 #, c-format @@ -6995,7 +6999,7 @@ msgstr "" #: modules/access/http.c:91 msgid "User Agent" -msgstr "" +msgstr "Brugeragent" #: modules/access/http.c:92 msgid "" @@ -7030,7 +7034,7 @@ msgstr "Dummy" #: modules/access/idummy.c:43 msgid "Dummy input" -msgstr "" +msgstr "Attrap-inddata" #: modules/access/imem.c:49 modules/gui/qt4/components/playlist/sorting.h:54 #: modules/stream_out/bridge.c:41 modules/stream_out/mosaic_bridge.c:105 @@ -7195,7 +7199,7 @@ msgstr "JACK-input" #: modules/access/linsys/linsys_hdsdi.c:72 #: modules/access/linsys/linsys_sdi.c:67 msgid "Link #" -msgstr "" +msgstr "Link #" #: modules/access/linsys/linsys_hdsdi.c:74 #: modules/access/linsys/linsys_sdi.c:69 @@ -9749,15 +9753,15 @@ msgstr "" #: modules/audio_filter/resampler/src.c:49 msgid "Sinc function (best quality)" -msgstr "" +msgstr "Sinc-funktion (bedste kvalitet)" #: modules/audio_filter/resampler/src.c:49 msgid "Sinc function (medium quality)" -msgstr "" +msgstr "Sinc-funktion (mellemkvalitet)" #: modules/audio_filter/resampler/src.c:50 msgid "Sinc function (fast)" -msgstr "" +msgstr "Sinc-funktion (hurtig)" #: modules/audio_filter/resampler/src.c:50 msgid "Zero Order Hold (fastest)" @@ -9765,7 +9769,7 @@ msgstr "" #: modules/audio_filter/resampler/src.c:50 msgid "Linear (fastest)" -msgstr "" +msgstr "Lineær (hurtigst)" #: modules/audio_filter/resampler/src.c:58 msgid "SRC resampler" @@ -11753,15 +11757,15 @@ msgstr "" #: modules/codec/schroedinger.c:78 msgid "Constant bitrate mode (CBR)" -msgstr "" +msgstr "Tilstand med konstant bitrate (CBR)" #: modules/codec/schroedinger.c:79 msgid "Low Delay mode" -msgstr "" +msgstr "Tilstand med lav forsinkelse" #: modules/codec/schroedinger.c:80 msgid "Lossless mode" -msgstr "" +msgstr "Tabsfri tilstand" #: modules/codec/schroedinger.c:81 msgid "Const
[vlc-commits] l10n: German update
vlc/vlc-2.1 | branch: master | Mario Siegmann | Wed Sep 11 14:04:31 2013 +0200| [07d730919298ac4ff205a500cad3d6ea89c22bf9] | committer: Christoph Miebach l10n: German update Signed-off-by: Christoph Miebach > http://git.videolan.org/gitweb.cgi/vlc/vlc-2.1.git/?a=commit;h=07d730919298ac4ff205a500cad3d6ea89c22bf9 --- po/de.po | 361 +- 1 file changed, 242 insertions(+), 119 deletions(-) Diff: http://git.videolan.org/gitweb.cgi/vlc/vlc-2.1.git/?a=commitdiff;h=07d730919298ac4ff205a500cad3d6ea89c22bf9 ___ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] l10n: Spanish update
vlc/vlc-2.1 | branch: master | David González | Wed Sep 11 14:11:41 2013 +0200| [ab70353c8fdeb5090a5d283f99ce47e71850bf05] | committer: Christoph Miebach l10n: Spanish update Signed-off-by: Christoph Miebach > http://git.videolan.org/gitweb.cgi/vlc/vlc-2.1.git/?a=commit;h=ab70353c8fdeb5090a5d283f99ce47e71850bf05 --- po/es.po | 29 +++-- 1 file changed, 11 insertions(+), 18 deletions(-) diff --git a/po/es.po b/po/es.po index 68b71ff..b247f93 100644 --- a/po/es.po +++ b/po/es.po @@ -19,8 +19,8 @@ msgstr "" "Project-Id-Version: VLC - Trans\n" "Report-Msgid-Bugs-To: vlc-de...@videolan.org\n" "POT-Creation-Date: 2013-09-08 20:08+0200\n" -"PO-Revision-Date: 2013-08-19 18:05+\n" -"Last-Translator: picodotdev \n" +"PO-Revision-Date: 2013-09-09 08:20+\n" +"Last-Translator: Yaron Shahrabani \n" "Language-Team: Spanish (http://www.transifex.com/projects/p/vlc-trans/"; "language/es/)\n" "Language: es\n" @@ -3262,8 +3262,6 @@ msgid "" "This file contains an optional CRL to prevent remote clients from using " "revoked certificates in TLS sessions." msgstr "" -"Este archivo contiene un CRL opcional para prevenir el borrado de clientes " -"usando certificados revocados en sesiones TLS." #: src/libvlc-module.c:845 msgid "SOCKS server" @@ -19071,10 +19069,6 @@ msgid "" "that only a small part of the MMS protocol is supported (MMS encapsulated in " "HTTP)." msgstr "" -"Use esto para emitir a varias computadoras usando el protocolo MMS de " -"Microsoft. Se usa como método de transporte por muchos programas de " -"Microsoft. Note que solo se soporta una pequeña parte del protocolo MMS (MMS " -"encapsulado en HTTP)." #: modules/gui/macosx/wizard.m:270 modules/gui/macosx/wizard.m:280 msgid "Enter the address of the computer to stream to." @@ -28934,9 +28928,8 @@ msgid "Default caching policy" msgstr "Política de almacenamiento predeterminada" #: modules/gui/qt4/ui/sprefs_interface.h:514 -#, fuzzy msgid "Menus language:" -msgstr "Idioma de audio" +msgstr "Lenguaje de menús:" #: modules/gui/qt4/ui/sprefs_interface.h:515 msgid "Look and feel" @@ -33593,6 +33586,14 @@ msgstr "Lista del administrador multimedia" #~ msgstr "intentando añadir %s a lista de repr.\n" #, fuzzy +#~ msgid "" +#~ "This file countains an optional CRL to prevent remote clients from using " +#~ "revoked certificates in TLS sessions." +#~ msgstr "" +#~ "Este archivo contiene un CRL opcional para prevenir el borrado de " +#~ "clientes usando certificados revocados en sesiones TLS." + +#, fuzzy #~ msgid "Add a subtitle file" #~ msgstr "Usar un archivo de subtítulo" @@ -33806,14 +33807,6 @@ msgstr "Lista del administrador multimedia" #, fuzzy #~ msgid "" -#~ "This file countains an optional CRL to prevent remote clients from using " -#~ "revoked certificates in TLS sessions." -#~ msgstr "" -#~ "Este archivo contiene un CRL opcional para prevenir el borrado de " -#~ "clientes usando certificados revocados en sesiones TLS." - -#, fuzzy -#~ msgid "" #~ "This allow you to configure the initial caching amount for stream output " #~ "muxer. This value should be set in milliseconds." #~ msgstr "" ___ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] l10n: Arabic update
vlc/vlc-2.1 | branch: master | VideoLAN | Wed Sep 11 13:57:41 2013 +0200| [ff0438c5a5b0fcdd515b6ff593f3727a8e952fd6] | committer: Christoph Miebach l10n: Arabic update Signed-off-by: Christoph Miebach > http://git.videolan.org/gitweb.cgi/vlc/vlc-2.1.git/?a=commit;h=ff0438c5a5b0fcdd515b6ff593f3727a8e952fd6 --- po/ar.po | 8737 ++ 1 file changed, 4755 insertions(+), 3982 deletions(-) Diff: http://git.videolan.org/gitweb.cgi/vlc/vlc-2.1.git/?a=commitdiff;h=ff0438c5a5b0fcdd515b6ff593f3727a8e952fd6 ___ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] macosx: add hack so deprecated platforms don't get updates they can' t execute
vlc/vlc-2.0 | branch: master | Felix Paul Kühne | Wed Sep 11 15:51:06 2013 +0200| [3b5526e03d27c5182a85d663515f6aae8a951a40] | committer: Felix Paul Kühne macosx: add hack so deprecated platforms don't get updates they can't execute > http://git.videolan.org/gitweb.cgi/vlc/vlc-2.0.git/?a=commit;h=3b5526e03d27c5182a85d663515f6aae8a951a40 --- extras/package/macosx/Info.plist.in |2 -- modules/gui/macosx/intf.m | 10 ++ 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/extras/package/macosx/Info.plist.in b/extras/package/macosx/Info.plist.in index 48a2109..139a602 100644 --- a/extras/package/macosx/Info.plist.in +++ b/extras/package/macosx/Info.plist.in @@ -1318,8 +1318,6 @@ Binary - SUFeedURL - http://update.videolan.org/vlc/sparkle/vlc.xml SUPublicDSAKeyFile dsa_pub.pem CFBundleExecutable diff --git a/modules/gui/macosx/intf.m b/modules/gui/macosx/intf.m index 654c554..f56cd3b 100644 --- a/modules/gui/macosx/intf.m +++ b/modules/gui/macosx/intf.m @@ -655,6 +655,16 @@ static VLCMain *_o_sharedMainInstance = nil; [self initStrings]; +NSURL *feedURL; +#ifdef __x86_64__ +feedURL = [NSURL URLWithString:@"http://update.videolan.org/vlc/sparkle/vlc-intel64.xml";]; +#elif __i386__ +feedURL = [NSURL URLWithString:@"http://update.videolan.org/vlc/sparkle/vlc-intel32.xml";]; +#else +feedURL = [NSURL URLWithString:@"http://update.videolan.org/vlc/sparkle/vlc-powerpc.xml";]; +#endif +[[SUUpdater sharedUpdater] setFeedURL:feedURL]; + nib_main_loaded = TRUE; } ___ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] extras/tools: bump cmake version to current stable and add a patch fixing build on OSX Mavericks.
vlc/vlc-2.1 | branch: master | Konstantin Pavlov | Sat
Aug 31 18:51:09 2013 +0400| [da7295c1d7a2038c917547b52ec1cff6f15733f1] |
committer: Felix Paul Kühne
extras/tools: bump cmake version to current stable and add a patch fixing build
on OSX Mavericks.
(cherry picked from commit d9a2daacb364b219c9b860c9065312469f54c0c4)
Signed-off-by: Felix Paul Kühne
> http://git.videolan.org/gitweb.cgi/vlc/vlc-2.1.git/?a=commit;h=da7295c1d7a2038c917547b52ec1cff6f15733f1
---
extras/tools/cmake-backport-curl-bug-1192.patch | 172 +++
extras/tools/packages.mak |2 +-
extras/tools/tools.mak |1 +
3 files changed, 174 insertions(+), 1 deletion(-)
diff --git a/extras/tools/cmake-backport-curl-bug-1192.patch
b/extras/tools/cmake-backport-curl-bug-1192.patch
new file mode 100644
index 000..b672daa
--- /dev/null
+++ b/extras/tools/cmake-backport-curl-bug-1192.patch
@@ -0,0 +1,172 @@
+From e643e0259df0736022d484c68a6781c3a380dd06 Mon Sep 17 00:00:00 2001
+Message-Id:
+From: Brad King
+Date: Thu, 27 Jun 2013 16:44:08 -0400
+Subject: [PATCH] cmcurl: Backport curl bug 1192 fix (#14250)
+
+LLVM headers define strlcat as a macro rather than as a function.
+See upstream Curl issue:
+
+ http://curl.haxx.se/bug/view.cgi?id=1192
+
+It was addressed by removing use of strlcat altogether. Port the
+upstream fix to CMake's curl.
+---
+ Utilities/cmcurl/CMakeLists.txt |2 --
+ Utilities/cmcurl/Platforms/WindowsCache.cmake |1 -
+ Utilities/cmcurl/Platforms/config-aix.h |3 --
+ Utilities/cmcurl/config.h.in |3 --
+ Utilities/cmcurl/socks.c | 11 +--
+ Utilities/cmcurl/strequal.c | 42 -
+ Utilities/cmcurl/strequal.h |5 ---
+ 7 files changed, 9 insertions(+), 58 deletions(-)
+
+diff --git a/Utilities/cmcurl/CMakeLists.txt b/Utilities/cmcurl/CMakeLists.txt
+index ef000a1..320612c 100644
+--- a/Utilities/cmcurl/CMakeLists.txt
b/Utilities/cmcurl/CMakeLists.txt
+@@ -376,7 +376,6 @@ MARK_AS_ADVANCED(RANDOM_FILE)
+ #sigaction \
+ #signal \
+ #getpass_r \
+-#strlcat \
+ #getpwuid \
+ #geteuid \
+ #dlopen \
+@@ -428,7 +427,6 @@ CHECK_SYMBOL_EXISTS(closesocket "${CURL_INCLUDES}"
HAVE_CLOSESOCKET)
+ CHECK_SYMBOL_EXISTS(setvbuf "${CURL_INCLUDES}" HAVE_SETVBUF)
+ CHECK_SYMBOL_EXISTS(sigsetjmp "${CURL_INCLUDES}" HAVE_SIGSETJMP)
+ CHECK_SYMBOL_EXISTS(getpass_r "${CURL_INCLUDES}" HAVE_GETPASS_R)
+-CHECK_SYMBOL_EXISTS(strlcat "${CURL_INCLUDES}" HAVE_STRLCAT)
+ CHECK_SYMBOL_EXISTS(getpwuid "${CURL_INCLUDES}" HAVE_GETPWUID)
+ CHECK_SYMBOL_EXISTS(geteuid "${CURL_INCLUDES}" HAVE_GETEUID)
+ CHECK_SYMBOL_EXISTS(utime "${CURL_INCLUDES}" HAVE_UTIME)
+diff --git a/Utilities/cmcurl/Platforms/WindowsCache.cmake
b/Utilities/cmcurl/Platforms/WindowsCache.cmake
+index b4515ce..57ab30b 100644
+--- a/Utilities/cmcurl/Platforms/WindowsCache.cmake
b/Utilities/cmcurl/Platforms/WindowsCache.cmake
+@@ -76,7 +76,6 @@ IF(NOT UNIX)
+ SET(HAVE_SETVBUF 0)
+ SET(HAVE_SIGSETJMP 0)
+ SET(HAVE_GETPASS_R 0)
+-SET(HAVE_STRLCAT 0)
+ SET(HAVE_GETPWUID 0)
+ SET(HAVE_GETEUID 0)
+ SET(HAVE_UTIME 1)
+diff --git a/Utilities/cmcurl/Platforms/config-aix.h
b/Utilities/cmcurl/Platforms/config-aix.h
+index 86d1093..c98b10f 100644
+--- a/Utilities/cmcurl/Platforms/config-aix.h
b/Utilities/cmcurl/Platforms/config-aix.h
+@@ -343,9 +343,6 @@
+ /* Define to 1 if you have the header file. */
+ #define HAVE_STRING_H 1
+
+-/* Define to 1 if you have the `strlcat' function. */
+-/* #undef HAVE_STRLCAT */
+-
+ /* Define to 1 if you have the `strlcpy' function. */
+ /* #undef HAVE_STRLCPY */
+
+diff --git a/Utilities/cmcurl/config.h.in b/Utilities/cmcurl/config.h.in
+index e18af8f..148722b 100644
+--- a/Utilities/cmcurl/config.h.in
b/Utilities/cmcurl/config.h.in
+@@ -441,9 +441,6 @@
+ /* Define to 1 if you have the header file. */
+ #cmakedefine HAVE_STRING_H ${HAVE_STRING_H}
+
+-/* Define to 1 if you have the `strlcat' function. */
+-#cmakedefine HAVE_STRLCAT ${HAVE_STRLCAT}
+-
+ /* Define to 1 if you have the `strlcpy' function. */
+ #cmakedefine HAVE_STRLCPY ${HAVE_STRLCPY}
+
+diff --git a/Utilities/cmcurl/socks.c b/Utilities/cmcurl/socks.c
+index 3319e69..e0e947b 100644
+--- a/Utilities/cmcurl/socks.c
b/Utilities/cmcurl/socks.c
+@@ -199,8 +199,15 @@ CURLcode Curl_SOCKS4(const char *proxy_name,
+* This is currently not supporting "Identification Protocol (RFC1413)".
+*/
+ socksreq[8] = 0; /* ensure empty userid is NUL-terminated */
+- if (proxy_name)
+-strlcat((char*)socksreq + 8, proxy_name, sizeof(socksreq) - 8);
++ if(proxy_name) {
++size_t plen = strlen(proxy_name);
++if(plen >= sizeof(socksreq) - 8) {
++ failf(data, "Too long SOCKS proxy name, can't use!\n");
++ return CURLE_COULDNT_CONNECT;
++}
++/* copy the proxy name WITH traili
[vlc-commits] extras/tools: fix ragel build with clang on OSX Mavericks
vlc/vlc-2.1 | branch: master | Konstantin Pavlov | Sat Aug 31 18:52:48 2013 +0400| [39c35bfcce9c2fbf77940e4dfb7e1f627fce644b] | committer: Felix Paul Kühne extras/tools: fix ragel build with clang on OSX Mavericks (cherry picked from commit 994dfedd6b5abf8833c20a07e9de219b62787c13) Signed-off-by: Felix Paul Kühne > http://git.videolan.org/gitweb.cgi/vlc/vlc-2.1.git/?a=commit;h=39c35bfcce9c2fbf77940e4dfb7e1f627fce644b --- extras/tools/ragel-6.8-javacodegen.patch | 11 +++ extras/tools/tools.mak |1 + 2 files changed, 12 insertions(+) diff --git a/extras/tools/ragel-6.8-javacodegen.patch b/extras/tools/ragel-6.8-javacodegen.patch new file mode 100644 index 000..ff558b9 --- /dev/null +++ b/extras/tools/ragel-6.8-javacodegen.patch @@ -0,0 +1,11 @@ +diff -urN ragel-6.8.orig/ragel/javacodegen.cpp ragel-6.8/ragel/javacodegen.cpp +--- ragel-6.8.orig/ragel/javacodegen.cpp 2013-02-11 05:57:45.0 +0400 ragel-6.8/ragel/javacodegen.cpp2013-09-01 14:42:27.0 +0400 +@@ -50,6 +50,7 @@ + using std::ifstream; + using std::ostream; + using std::ios; ++using std::setiosflags; + using std::cin; + using std::cout; + using std::cerr; diff --git a/extras/tools/tools.mak b/extras/tools/tools.mak index f7efcfa..a009a60 100644 --- a/extras/tools/tools.mak +++ b/extras/tools/tools.mak @@ -240,6 +240,7 @@ ragel: ragel-$(RAGEL_VERSION).tar.gz $(MOVE) .ragel: ragel + $(APPLY) ragel-6.8-javacodegen.patch (cd ragel; ./configure --prefix=$(PREFIX) --disable-shared --enable-static && make && make install) touch $@ ___ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] WinGDI: remove useless includes
vlc | branch: master | Jean-Baptiste Kempf | Wed Sep 11
13:44:53 2013 +0200| [b5b5d5bd61ce94ae58afbfdcfdb3e1798d32270c] | committer:
Jean-Baptiste Kempf
WinGDI: remove useless includes
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=b5b5d5bd61ce94ae58afbfdcfdb3e1798d32270c
---
modules/video_output/msw/wingdi.c |8 +++-
1 file changed, 3 insertions(+), 5 deletions(-)
diff --git a/modules/video_output/msw/wingdi.c
b/modules/video_output/msw/wingdi.c
index 749d5b8..761af9a 100644
--- a/modules/video_output/msw/wingdi.c
+++ b/modules/video_output/msw/wingdi.c
@@ -36,14 +36,9 @@
#include
#include
-#include
#include "common.h"
-#ifndef WS_NONAVDONEBUTTON
-# define WS_NONAVDONEBUTTON 0
-#endif
-
/*
* Module descriptor
*/
@@ -129,6 +124,7 @@ static picture_pool_t *Pool(vout_display_t *vd, unsigned
count)
VLC_UNUSED(count);
return vd->sys->pool;
}
+
static void Display(vout_display_t *vd, picture_t *picture, subpicture_t
*subpicture)
{
vout_display_sys_t *sys = vd->sys;
@@ -172,6 +168,7 @@ static void Display(vout_display_t *vd, picture_t *picture,
subpicture_t *subpic
CommonDisplay(vd);
}
+
static int Control(vout_display_t *vd, int query, va_list args)
{
switch (query) {
@@ -183,6 +180,7 @@ static int Control(vout_display_t *vd, int query, va_list
args)
}
}
+
static void Manage(vout_display_t *vd)
{
CommonManage(vd);
___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] glwin32: remove unneeded includes and defines
vlc | branch: master | Jean-Baptiste Kempf | Wed Sep 11 13:42:12 2013 +0200| [c2aab37ebab408a4dd9fb95f7ab0560a43c9d6f7] | committer: Jean-Baptiste Kempf glwin32: remove unneeded includes and defines > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=c2aab37ebab408a4dd9fb95f7ab0560a43c9d6f7 --- modules/video_output/msw/glwin32.c |9 + 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/modules/video_output/msw/glwin32.c b/modules/video_output/msw/glwin32.c index 8bd0f21..489581b 100644 --- a/modules/video_output/msw/glwin32.c +++ b/modules/video_output/msw/glwin32.c @@ -29,18 +29,11 @@ #include #include -#include -#include - -#undef GetSystemMetrics - -#ifndef MONITOR_DEFAULTTONEAREST -# define MONITOR_DEFAULTTONEAREST 2 -#endif #define GLEW_STATIC #include "../opengl.h" #include + #include "common.h" /* ___ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] DirectDraw: remove unused include
vlc | branch: master | Jean-Baptiste Kempf | Wed Sep 11 13:30:56 2013 +0200| [bb5b541089f9b6f0be39dd34b51f6e3375a62427] | committer: Jean-Baptiste Kempf DirectDraw: remove unused include > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=bb5b541089f9b6f0be39dd34b51f6e3375a62427 --- modules/video_output/msw/directx.c |6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/video_output/msw/directx.c b/modules/video_output/msw/directx.c index 4bae87d..8cbdad3 100644 --- a/modules/video_output/msw/directx.c +++ b/modules/video_output/msw/directx.c @@ -34,19 +34,20 @@ * display video in window mode. * */ + #ifdef HAVE_CONFIG_H # include "config.h" #endif + #include #include #include #include #include/* needed for wallpaper */ -#include +#include /* FromT */ #include -#include #include #include/* ListView_(Get|Set)* */ @@ -62,7 +63,6 @@ # define DIRECTDRAWENUMERATEEX_NAME "DirectDrawEnumerateExA" #endif - /* * Module descriptor */ ___ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] Win32: cleanup the events.c codebase
vlc | branch: master | Jean-Baptiste Kempf | Wed Sep 11 13:03:41 2013 +0200| [88ca4341cd11f6c7b409647512cb2289e0d38f94] | committer: Jean-Baptiste Kempf Win32: cleanup the events.c codebase No functionnal change > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=88ca4341cd11f6c7b409647512cb2289e0d38f94 --- modules/video_output/msw/events.c | 485 +++-- 1 file changed, 249 insertions(+), 236 deletions(-) Diff: http://git.videolan.org/gitweb.cgi/vlc.git/?a=commitdiff;h=88ca4341cd11f6c7b409647512cb2289e0d38f94 ___ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] Win32 vout: update comments
vlc | branch: master | Jean-Baptiste Kempf | Wed Sep 11 12:53:00 2013 +0200| [deb9a70eb6fff31aad3f4980d4eabd7d673431cf] | committer: Jean-Baptiste Kempf Win32 vout: update comments > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=deb9a70eb6fff31aad3f4980d4eabd7d673431cf --- modules/video_output/msw/common.c | 12 ++-- 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/modules/video_output/msw/common.c b/modules/video_output/msw/common.c index 665d30e..3a0f626 100644 --- a/modules/video_output/msw/common.c +++ b/modules/video_output/msw/common.c @@ -1,5 +1,5 @@ /* - * common.c: + * common.c: Windows video output common code * * Copyright (C) 2001-2009 VLC authors and VideoLAN * $Id$ @@ -21,11 +21,12 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. */ - /* - * Preamble: This file contains the functions related to the creation of - * a window and the handling of its messages (events). + * Preamble: This file contains the functions related to the init of the vout + * structure, the common display code, the screensaver, but not the + * events and the Window Creation (events.c) */ + #ifdef HAVE_CONFIG_H # include "config.h" #endif @@ -41,7 +42,7 @@ #include static void CommonChangeThumbnailClip(vout_display_t *, bool show); -static int CommonControlSetFullscreen(vout_display_t *, bool is_fullscreen); +static int CommonControlSetFullscreen(vout_display_t *, bool is_fullscreen); static void DisableScreensaver(vout_display_t *); static void RestoreScreensaver(vout_display_t *); @@ -97,7 +98,6 @@ int CommonInit(vout_display_t *vd) vout_display_SendEventFullscreen(vd, false); } -/* Why not with glwin32 */ var_Create(vd, "disable-screensaver", VLC_VAR_BOOL | VLC_VAR_DOINHERIT); DisableScreensaver (vd); ___ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] Win32 vout: Remove unused sys_t member
vlc | branch: master | Jean-Baptiste Kempf | Wed Sep 11 12:46:57 2013 +0200| [302523b2ae794b3a61c1c62a5f56c160a9e8ccd9] | committer: Jean-Baptiste Kempf Win32 vout: Remove unused sys_t member > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=302523b2ae794b3a61c1c62a5f56c160a9e8ccd9 --- modules/video_output/msw/common.h |1 - 1 file changed, 1 deletion(-) diff --git a/modules/video_output/msw/common.h b/modules/video_output/msw/common.h index 5ed449b..8de45c5 100644 --- a/modules/video_output/msw/common.h +++ b/modules/video_output/msw/common.h @@ -60,7 +60,6 @@ struct vout_display_sys_t /* size of the display */ RECT rect_display; -int display_depth; /* size of the overall window (including black bands) */ RECT rect_parent; ___ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] Glwin32: move affinity to the glwin32 structure
vlc | branch: master | Jean-Baptiste Kempf | Wed Sep 11 12:41:18 2013 +0200| [49ee6502b1c1be9015e64ea9c9d39115ce83ca03] | committer: Jean-Baptiste Kempf Glwin32: move affinity to the glwin32 structure > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=49ee6502b1c1be9015e64ea9c9d39115ce83ca03 --- modules/video_output/msw/common.h |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/video_output/msw/common.h b/modules/video_output/msw/common.h index 1d53a72..5ed449b 100644 --- a/modules/video_output/msw/common.h +++ b/modules/video_output/msw/common.h @@ -125,6 +125,7 @@ struct vout_display_sys_t HGLRC hGLRC; vlc_gl_t gl; vout_display_opengl_t *vgl; +HDC affinityHDC; // DC for the selected GPU #endif #ifdef MODULE_NAME_IS_direct2d @@ -151,6 +152,7 @@ struct vout_display_sys_t D3DCAPS9d3dcaps; LPDIRECT3DDEVICE9 d3ddev; D3DPRESENT_PARAMETERS d3dpp; + // scene objects LPDIRECT3DTEXTURE9 d3dtex; LPDIRECT3DVERTEXBUFFER9 d3dvtc; @@ -186,8 +188,6 @@ struct vout_display_sys_t RGBQUADblue; }; #endif - -HDC affinityHDC; // DC for the selected GPU }; /* ___ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] Win32 Vout: remove unnecessary includes
vlc | branch: master | Jean-Baptiste Kempf | Wed Sep 11 12:30:19 2013 +0200| [ab93e351a251d05ca91c69e7fd02daf45e1983bd] | committer: Jean-Baptiste Kempf Win32 Vout: remove unnecessary includes > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=ab93e351a251d05ca91c69e7fd02daf45e1983bd --- modules/video_output/msw/common.c | 18 +- modules/video_output/msw/common.h |1 - modules/video_output/msw/events.c |4 +--- 3 files changed, 2 insertions(+), 21 deletions(-) diff --git a/modules/video_output/msw/common.c b/modules/video_output/msw/common.c index a0e663d..665d30e 100644 --- a/modules/video_output/msw/common.c +++ b/modules/video_output/msw/common.c @@ -29,28 +29,12 @@ #ifdef HAVE_CONFIG_H # include "config.h" #endif -#include #include #include -#include #include -#include -#include - -#ifdef MODULE_NAME_IS_directdraw -#include -#endif -#ifdef MODULE_NAME_IS_direct3d -#include -#endif -#ifdef MODULE_NAME_IS_glwin32 -#include "../opengl.h" -#endif -#ifdef MODULE_NAME_IS_direct2d -#include -#endif +#include #include "common.h" diff --git a/modules/video_output/msw/common.h b/modules/video_output/msw/common.h index 9e4a57d..1d53a72 100644 --- a/modules/video_output/msw/common.h +++ b/modules/video_output/msw/common.h @@ -38,7 +38,6 @@ /* * event_thread_t: event thread */ -#include #include "events.h" /* diff --git a/modules/video_output/msw/events.c b/modules/video_output/msw/events.c index 844f86d..81eaa9f 100644 --- a/modules/video_output/msw/events.c +++ b/modules/video_output/msw/events.c @@ -21,24 +21,22 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. */ - /* * Preamble: This file contains the functions related to the creation of * a window and the handling of its messages (events). */ + #ifdef HAVE_CONFIG_H # include "config.h" #endif #include #include -#include #include #include /* GET_X_LPARAM */ #include /* ExtractIcon */ -#include #include "common.h" /* ___ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] OpenGL.h: protect double-inclusion
vlc | branch: master | Jean-Baptiste Kempf | Wed Sep 11 12:25:02 2013 +0200| [3a54956ccca06c0bf8e179f6841b7d7ca1284d2a] | committer: Jean-Baptiste Kempf OpenGL.h: protect double-inclusion > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=3a54956ccca06c0bf8e179f6841b7d7ca1284d2a --- modules/video_output/opengl.h |5 + 1 file changed, 5 insertions(+) diff --git a/modules/video_output/opengl.h b/modules/video_output/opengl.h index 55705d1..b01327e 100644 --- a/modules/video_output/opengl.h +++ b/modules/video_output/opengl.h @@ -26,6 +26,9 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. */ +#ifndef VLC_OPENGL_H +#define VLC_OPENGL_H + #include #include #include @@ -90,3 +93,5 @@ int vout_display_opengl_Prepare(vout_display_opengl_t *vgl, picture_t *picture, subpicture_t *subpicture); int vout_display_opengl_Display(vout_display_opengl_t *vgl, const video_format_t *source); + +#endif ___ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] Win32: include headers where needed
vlc | branch: master | Jean-Baptiste Kempf | Wed Sep 11 12:24:38 2013 +0200| [c02f09fff7c608e7ac4b4dcfbd0e12ad0d732aca] | committer: Jean-Baptiste Kempf Win32: include headers where needed > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=c02f09fff7c608e7ac4b4dcfbd0e12ad0d732aca --- modules/video_output/msw/common.h | 13 + modules/video_output/msw/events.c | 13 - 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/modules/video_output/msw/common.h b/modules/video_output/msw/common.h index 8abbac9..9e4a57d 100644 --- a/modules/video_output/msw/common.h +++ b/modules/video_output/msw/common.h @@ -22,6 +22,19 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. */ +#ifdef MODULE_NAME_IS_directdraw +# include +#endif +#ifdef MODULE_NAME_IS_direct3d +# include +#endif +#ifdef MODULE_NAME_IS_glwin32 +# include "../opengl.h" +#endif +#ifdef MODULE_NAME_IS_direct2d +# include +#endif + /* * event_thread_t: event thread */ diff --git a/modules/video_output/msw/events.c b/modules/video_output/msw/events.c index e295cde..844f86d 100644 --- a/modules/video_output/msw/events.c +++ b/modules/video_output/msw/events.c @@ -38,19 +38,6 @@ #include /* GET_X_LPARAM */ #include /* ExtractIcon */ -#ifdef MODULE_NAME_IS_directdraw -# include -#endif -#ifdef MODULE_NAME_IS_direct3d -# include -#endif -#ifdef MODULE_NAME_IS_glwin32 -# include "../opengl.h" -#endif -#ifdef MODULE_NAME_IS_direct2d -# include -#endif - #include #include "common.h" ___ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] Win32: common code is not DirectX specific
vlc | branch: master | Jean-Baptiste Kempf | Wed Sep 11
12:20:14 2013 +0200| [062a0875fe541dd1c61d180be190440aacd675fe] | committer:
Jean-Baptiste Kempf
Win32: common code is not DirectX specific
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=062a0875fe541dd1c61d180be190440aacd675fe
---
modules/video_output/msw/events.c | 64 ++---
1 file changed, 31 insertions(+), 33 deletions(-)
diff --git a/modules/video_output/msw/events.c
b/modules/video_output/msw/events.c
index ada4d43..e295cde 100644
--- a/modules/video_output/msw/events.c
+++ b/modules/video_output/msw/events.c
@@ -1,5 +1,5 @@
/*
- * events.c: Windows DirectX video output events handler
+ * events.c: Windows video output events handler
*
* Copyright (C) 2001-2009 VLC authors and VideoLAN
* $Id$
@@ -35,22 +35,20 @@
#include
#include
-#include
-#include
-
-#include
+#include /* GET_X_LPARAM */
+#include /* ExtractIcon */
#ifdef MODULE_NAME_IS_directdraw
-#include
+# include
#endif
#ifdef MODULE_NAME_IS_direct3d
-#include
+# include
#endif
#ifdef MODULE_NAME_IS_glwin32
-#include "../opengl.h"
+# include "../opengl.h"
#endif
#ifdef MODULE_NAME_IS_direct2d
-#include
+# include
#endif
#include
@@ -106,11 +104,11 @@ struct event_thread_t
bool has_moved;
};
-static int DirectXCreateWindow( event_thread_t * );
-static void DirectXCloseWindow ( event_thread_t * );
-static long FAR PASCAL DirectXEventProc( HWND, UINT, WPARAM, LPARAM );
+static int Win32VoutCreateWindow( event_thread_t * );
+static void Win32VoutCloseWindow ( event_thread_t * );
+static long FAR PASCAL WinVoutEventProc( HWND, UINT, WPARAM, LPARAM );
-static int DirectXConvertKey( int i_key );
+static int Win32VoutConvertKey( int i_key );
static inline bool isMouseEvent( WPARAM type )
{
@@ -209,7 +207,7 @@ static void *EventThread( void *p_this )
/* Create a window for the video */
/* Creating a window under Windows also initializes the thread's event
* message queue */
-if( DirectXCreateWindow( p_event ) )
+if( Win32VoutCreateWindow( p_event ) )
p_event->b_error = true;
p_event->b_ready = true;
@@ -337,7 +335,7 @@ static void *EventThread( void *p_this )
/* The key events are first processed here and not translated
* into WM_CHAR events because we need to know the status of the
* modifier keys. */
-int i_key = DirectXConvertKey( msg.wParam );
+int i_key = Win32VoutConvertKey( msg.wParam );
if( !i_key )
{
/* This appears to be a "normal" (ascii) key */
@@ -438,9 +436,9 @@ static void *EventThread( void *p_this )
p_event->hwnd = NULL; /* Window already destroyed */
}
-msg_Dbg( vd, "DirectXEventThread terminating" );
+msg_Dbg( vd, "Win32 Vout EventThread terminating" );
-DirectXCloseWindow( p_event );
+Win32VoutCloseWindow( p_event );
vlc_restorecancel(canc);
return NULL;
}
@@ -486,13 +484,13 @@ static HWND GetDesktopHandle(vout_display_t *vd)
/* following functions are local */
/*
- * DirectXCreateWindow: create a window for the video.
+ * Win32VoutCreateWindow: create a window for the video.
*
* Before creating a direct draw surface, we need to create a window in which
* the video will be displayed. This window will also allow us to capture the
* events.
*/
-static int DirectXCreateWindow( event_thread_t *p_event )
+static int Win32VoutCreateWindow( event_thread_t *p_event )
{
vout_display_t *vd = p_event->vd;
HINSTANCE hInstance;
@@ -502,7 +500,7 @@ static int DirectXCreateWindow( event_thread_t *p_event )
TCHAR vlc_path[MAX_PATH+1];
inti_style, i_stylex;
-msg_Dbg( vd, "DirectXCreateWindow" );
+msg_Dbg( vd, "Win32VoutCreateWindow" );
/* Get this module's instance */
hInstance = GetModuleHandle(NULL);
@@ -537,7 +535,7 @@ static int DirectXCreateWindow( event_thread_t *p_event )
/* Fill in the window class structure */
wc.style = CS_OWNDC|CS_DBLCLKS; /* style: dbl click */
-wc.lpfnWndProc = (WNDPROC)DirectXEventProc; /* event handler */
+wc.lpfnWndProc = (WNDPROC)WinVoutEventProc; /* event handler */
wc.cbClsExtra= 0; /* no extra class data */
wc.cbWndExtra= 0;/* no extra window data */
wc.hInstance = hInstance;/* instance */
@
