[vlc-devel] commit: fmt ( Rémi Denis-Courmont )
git version control
git at videolan.org
Tue Mar 31 17:44:08 CEST 2009
vlc | branch: master | Rémi Denis-Courmont <remi.denis-courmont at nokia.com> | Tue Mar 24 23:43:39 2009 +0200| [c539b3dd4e6b78d73bd482b30655c058050efc2f] | committer: Rémi Denis-Courmont
fmt
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=c539b3dd4e6b78d73bd482b30655c058050efc2f
---
modules/access/file.c | 2 +-
modules/access/ftp.c | 12 ++++++------
modules/access/mmap.c | 2 +-
3 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/modules/access/file.c b/modules/access/file.c
index 33d8c2d..3b210fa 100644
--- a/modules/access/file.c
+++ b/modules/access/file.c
@@ -222,7 +222,7 @@ static ssize_t Read( access_t *p_access, uint8_t *p_buffer, size_t i_len )
default:
msg_Err (p_access, "failed to read (%m)");
- dialog_Fatal (p_access, _("File reading failed"),
+ dialog_Fatal (p_access, _("File reading failed"), "%s",
_("VLC could not read the file."));
p_access->info.b_eof = true;
return 0;
diff --git a/modules/access/ftp.c b/modules/access/ftp.c
index e4cc188..268d2cd 100644
--- a/modules/access/ftp.c
+++ b/modules/access/ftp.c
@@ -133,7 +133,7 @@ static int Login( vlc_object_t *p_access, access_sys_t *p_sys )
if( fd == -1 )
{
msg_Err( p_access, "connection failed" );
- dialog_Fatal( p_access, _("Network interaction failed"),
+ dialog_Fatal( p_access, _("Network interaction failed"), "%s",
_("VLC could not connect with the given server.") );
return -1;
}
@@ -143,7 +143,7 @@ static int Login( vlc_object_t *p_access, access_sys_t *p_sys )
if( i_answer / 100 != 2 )
{
msg_Err( p_access, "connection rejected" );
- dialog_Fatal( p_access, _("Network interaction failed"),
+ dialog_Fatal( p_access, _("Network interaction failed"), "%s",
_("VLC's connection to the given server was rejected.") );
return -1;
}
@@ -208,8 +208,8 @@ static int Login( vlc_object_t *p_access, access_sys_t *p_sys )
{
msg_Err( p_access, "account rejected" );
dialog_Fatal( p_access,
- _("Network interaction failed"),
- _("Your account was rejected.") );
+ _("Network interaction failed"),
+ "%s", _("Your account was rejected.") );
return -1;
}
msg_Dbg( p_access, "account accepted" );
@@ -218,13 +218,13 @@ static int Login( vlc_object_t *p_access, access_sys_t *p_sys )
default:
msg_Err( p_access, "password rejected" );
dialog_Fatal( p_access, _("Network interaction failed"),
- _("Your password was rejected.") );
+ "%s", _("Your password was rejected.") );
return -1;
}
break;
default:
msg_Err( p_access, "user rejected" );
- dialog_Fatal( p_access, _("Network interaction failed"),
+ dialog_Fatal( p_access, _("Network interaction failed"), "%s",
_("Your connection attempt to the server was rejected.") );
return -1;
}
diff --git a/modules/access/mmap.c b/modules/access/mmap.c
index 8194a82..9a07085 100644
--- a/modules/access/mmap.c
+++ b/modules/access/mmap.c
@@ -226,7 +226,7 @@ static block_t *Block (access_t *p_access)
if (addr == MAP_FAILED)
{
msg_Err (p_access, "memory mapping failed (%m)");
- dialog_Fatal (p_access, _("File reading failed"),
+ dialog_Fatal (p_access, _("File reading failed"), "%s",
_("VLC could not read the file."));
goto fatal;
}
More information about the vlc-devel
mailing list