summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--help/help_mp-de.h27
-rw-r--r--help/help_mp-en.h26
-rw-r--r--help/help_mp-es.h15
-rw-r--r--libvo/vo_jpeg.c46
4 files changed, 58 insertions, 56 deletions
diff --git a/help/help_mp-de.h b/help/help_mp-de.h
index c671c49cd5..3b4000f5da 100644
--- a/help/help_mp-de.h
+++ b/help/help_mp-de.h
@@ -755,22 +755,23 @@ static char help_text[]=
// ======================= VO Video Output drivers ========================
#define MSGTR_VOincompCodec "Der ausgewählte Videoausgabetreiber ist nicht kompatibel mit diesem Codec.\n"
+#define MSGTR_VO_GenericError "Dieser Fehler ist aufgetreten"
+#define MSGTR_VO_UnableToAccess "Zugriff nicht möglich."
+#define MSGTR_VO_ExistsButNoDirectory "existiert schon, ist aber kein Verzeichnis."
+#define MSGTR_VO_DirExistsButNotWritable "Ausgabeverzeichnis existiert schon, ist aber nicht beschreibbar."
+#define MSGTR_VO_DirExistsAndIsWritable "Ausgabeverzeichnis existiert schon und ist beschreibbar."
+#define MSGTR_VO_CantCreateDirectory "Kann Ausgabeverzeichnis nicht erstellen."
+#define MSGTR_VO_CantCreateFile "Kann Ausgabedatei nicht erstellen."
+#define MSGTR_VO_DirectoryCreateSuccess "Ausgabeverzeichnis erfolgreich erstellt."
+#define MSGTR_VO_ParsingSuboptions "Unteroptionen werden geparst."
+#define MSGTR_VO_SuboptionsParsedOK "Parsen der Unteroptionen OK."
+#define MSGTR_VO_ValueOutOfRange "Wert außerhalb des gültigen Bereichs"
+#define MSGTR_VO_NoValueSpecified "Kein Wert angegeben."
+#define MSGTR_VO_UnknownSuboptions "Unbekannte Unteroption(en)"
// vo_jpeg.c
-#define MSGTR_VO_JPEG_GenericError "Dieser Fehler ist aufgetreten"
-#define MSGTR_VO_JPEG_UnableToAccess "Zugriff nicht möglich."
-#define MSGTR_VO_JPEG_ExistsButNoDirectory "existiert schon, ist aber kein Verzeichnis."
-#define MSGTR_VO_JPEG_DirExistsButNotWritable "Ausgabeverzeichnis existiert schon, ist aber nicht beschreibbar."
-#define MSGTR_VO_JPEG_DirExistsAndIsWritable "Ausgabeverzeichnis existiert schon und ist beschreibbar."
-#define MSGTR_VO_JPEG_CantCreateDirectory "Kann Ausgabeverzeichnis nicht erstellen."
-#define MSGTR_VO_JPEG_CantCreateFile "Kann Ausgabedatei nicht erstellen."
-#define MSGTR_VO_JPEG_DirectoryCreateSuccess "Ausgabeverzeichnis erfolgreich erstellt."
-#define MSGTR_VO_JPEG_ParsingSuboptions "Unteroptionen werden geparst."
-#define MSGTR_VO_JPEG_SuboptionsParsedOK "Parsen der Unteroptionen OK."
#define MSGTR_VO_JPEG_ProgressiveJPEG "Progressives JPEG aktiviert."
#define MSGTR_VO_JPEG_NoProgressiveJPEG "Progressives JPEG deaktiviert."
#define MSGTR_VO_JPEG_BaselineJPEG "Baseline-JPEG aktiviert."
#define MSGTR_VO_JPEG_NoBaselineJPEG "Baseline-JPEG deaktiviert."
-#define MSGTR_VO_JPEG_ValueOutOfRange "Wert außerhalb des gültigen Bereichs"
-#define MSGTR_VO_JPEG_NoValueSpecified "Kein Wert angegeben."
-#define MSGTR_VO_JPEG_UnknownOptions "Unbekannte Option(en)"
+
diff --git a/help/help_mp-en.h b/help/help_mp-en.h
index 05f789ac92..0c662cdbba 100644
--- a/help/help_mp-en.h
+++ b/help/help_mp-en.h
@@ -749,23 +749,23 @@ static char help_text[]=
// ======================= VO Video Output drivers ========================
#define MSGTR_VOincompCodec "The selected video_out device is incompatible with this codec.\n"
+#define MSGTR_VO_GenericError "This error has occurred"
+#define MSGTR_VO_UnableToAccess "Unable to access"
+#define MSGTR_VO_ExistsButNoDirectory "already exists, but is not a directory."
+#define MSGTR_VO_DirExistsButNotWritable "Output directory already exists, but is not writable."
+#define MSGTR_VO_DirExistsAndIsWritable "Output directory already exists and is writable."
+#define MSGTR_VO_CantCreateDirectory "Unable to create output directory."
+#define MSGTR_VO_CantCreateFile "Unable to create output file."
+#define MSGTR_VO_DirectoryCreateSuccess "Output directory successfully created."
+#define MSGTR_VO_ParsingSuboptions "Parsing suboptions."
+#define MSGTR_VO_SuboptionsParsedOK "Suboptions parsed OK."
+#define MSGTR_VO_ValueOutOfRange "Value out of range"
+#define MSGTR_VO_NoValueSpecified "No value specified."
+#define MSGTR_VO_UnknownSuboptions "Unknown suboption(s)"
// vo_jpeg.c
-#define MSGTR_VO_JPEG_GenericError "This error has occurred"
-#define MSGTR_VO_JPEG_UnableToAccess "Unable to access"
-#define MSGTR_VO_JPEG_ExistsButNoDirectory "already exists, but is not a directory."
-#define MSGTR_VO_JPEG_DirExistsButNotWritable "Output directory already exists, but is not writable."
-#define MSGTR_VO_JPEG_DirExistsAndIsWritable "Output directory already exists and is writable."
-#define MSGTR_VO_JPEG_CantCreateDirectory "Unable to create output directory."
-#define MSGTR_VO_JPEG_CantCreateFile "Unable to create output file."
-#define MSGTR_VO_JPEG_DirectoryCreateSuccess "Output directory successfully created."
-#define MSGTR_VO_JPEG_ParsingSuboptions "Parsing suboptions."
-#define MSGTR_VO_JPEG_SuboptionsParsedOK "Suboptions parsed OK."
#define MSGTR_VO_JPEG_ProgressiveJPEG "Progressive JPEG enabled."
#define MSGTR_VO_JPEG_NoProgressiveJPEG "Progressive JPEG disabled."
#define MSGTR_VO_JPEG_BaselineJPEG "Baseline JPEG enabled."
#define MSGTR_VO_JPEG_NoBaselineJPEG "Baseline JPEG disabled."
-#define MSGTR_VO_JPEG_ValueOutOfRange "Value out of range"
-#define MSGTR_VO_JPEG_NoValueSpecified "No value specified."
-#define MSGTR_VO_JPEG_UnknownOptions "Unknown option(s)"
diff --git a/help/help_mp-es.h b/help/help_mp-es.h
index 3f21c1bda7..c80a127034 100644
--- a/help/help_mp-es.h
+++ b/help/help_mp-es.h
@@ -759,12 +759,13 @@ static char help_text[]=
// ======================= VO Video Output drivers ========================
#define MSGTR_VOincompCodec "Disculpe, el dispositivo de salida de vídeo es incompatible con este codec.\n"
+#define MSGTR_VO_GenericError "Este error ha ocurrido"
+#define MSGTR_VO_UnableToAccess "No es posible acceder"
+#define MSGTR_VO_ExistsButNoDirectory "ya existe, pero no es un directorio."
+#define MSGTR_VO_DirExistsButNotWritable "El directorio ya existe, pero no se puede escribir en él."
+#define MSGTR_VO_DirExistsAndIsWritable "El directorio ya existe y se puede escribir en él."
+#define MSGTR_VO_CantCreateDirectory "No es posible crear el directorio de salida."
+#define MSGTR_VO_DirectoryCreateSuccess "Directorio de salida creado exitosamente."
// vo_jpeg.c
-#define MSGTR_VO_JPEG_GenericError "Este error ha ocurrido"
-#define MSGTR_VO_JPEG_UnableToAccess "No es posible acceder"
-#define MSGTR_VO_JPEG_ExistsButNoDirectory "ya existe, pero no es un directorio."
-#define MSGTR_VO_JPEG_DirExistsButNotWritable "El directorio ya existe, pero no se puede escribir en él."
-#define MSGTR_VO_JPEG_DirExistsAndIsWritable "El directorio ya existe y se puede escribir en él."
-#define MSGTR_VO_JPEG_CantCreateDirectory "No es posible crear el directorio de salida."
-#define MSGTR_VO_JPEG_DirectoryCreateSuccess "Directorio de salida creado exitosamente."
+
diff --git a/libvo/vo_jpeg.c b/libvo/vo_jpeg.c
index e2843bb508..93668d8169 100644
--- a/libvo/vo_jpeg.c
+++ b/libvo/vo_jpeg.c
@@ -103,36 +103,36 @@ void jpeg_mkdir(char *buf, int verbose) {
case EEXIST:
if ( stat(buf, &stat_p ) < 0 ) {
mp_msg(MSGT_VO, MSGL_ERR, "%s: %s: %s\n", info.short_name,
- MSGTR_VO_JPEG_GenericError, strerror(errno) );
+ MSGTR_VO_GenericError, strerror(errno) );
mp_msg(MSGT_VO, MSGL_ERR, "%s: %s %s\n", info.short_name,
- MSGTR_VO_JPEG_UnableToAccess,buf);
+ MSGTR_VO_UnableToAccess,buf);
exit_player(MSGTR_Exit_error);
}
if ( !S_ISDIR(stat_p.st_mode) ) {
mp_msg(MSGT_VO, MSGL_ERR, "%s: %s %s\n", info.short_name,
- buf, MSGTR_VO_JPEG_ExistsButNoDirectory);
+ buf, MSGTR_VO_ExistsButNoDirectory);
exit_player(MSGTR_Exit_error);
}
if ( !(stat_p.st_mode & S_IWUSR) ) {
mp_msg(MSGT_VO, MSGL_ERR, "%s: %s - %s\n", info.short_name,
- buf, MSGTR_VO_JPEG_DirExistsButNotWritable);
+ buf, MSGTR_VO_DirExistsButNotWritable);
exit_player(MSGTR_Exit_error);
}
mp_msg(MSGT_VO, MSGL_INFO, "%s: %s - %s\n", info.short_name,
- buf, MSGTR_VO_JPEG_DirExistsAndIsWritable);
+ buf, MSGTR_VO_DirExistsAndIsWritable);
break;
default:
mp_msg(MSGT_VO, MSGL_ERR, "%s: %s: %s\n", info.short_name,
- MSGTR_VO_JPEG_GenericError, strerror(errno) );
+ MSGTR_VO_GenericError, strerror(errno) );
mp_msg(MSGT_VO, MSGL_ERR, "%s: %s - %s\n", info.short_name,
- buf, MSGTR_VO_JPEG_CantCreateDirectory);
+ buf, MSGTR_VO_CantCreateDirectory);
exit_player(MSGTR_Exit_error);
} /* end switch */
} else if ( verbose ) {
mp_msg(MSGT_VO, MSGL_INFO, "%s: %s - %s\n", info.short_name,
- buf, MSGTR_VO_JPEG_DirectoryCreateSuccess);
+ buf, MSGTR_VO_DirectoryCreateSuccess);
} /* end if */
}
@@ -170,9 +170,9 @@ static uint32_t jpeg_write(uint8_t * name, uint8_t * buffer)
if ( !buffer ) return 1;
if ( (outfile = fopen(name, "wb") ) == NULL ) {
mp_msg(MSGT_VO, MSGL_ERR, "\n%s: %s\n", info.short_name,
- MSGTR_VO_JPEG_CantCreateFile);
+ MSGTR_VO_CantCreateFile);
mp_msg(MSGT_VO, MSGL_ERR, "%s: %s: %s\n",
- info.short_name, MSGTR_VO_JPEG_GenericError,
+ info.short_name, MSGTR_VO_GenericError,
strerror(errno) );
exit_player(MSGTR_Exit_error);
}
@@ -298,7 +298,7 @@ static uint32_t preinit(const char *arg)
int value; /* storage for parsed integer values */
mp_msg(MSGT_VO, MSGL_INFO, "%s: %s\n", info.short_name,
- MSGTR_VO_JPEG_ParsingSuboptions);
+ MSGTR_VO_ParsingSuboptions);
if (arg) {
@@ -332,7 +332,7 @@ static uint32_t preinit(const char *arg)
if ( (value < 0 ) || (value > 100) ) {
mp_msg(MSGT_VO, MSGL_ERR, "%s: %s - %s %s.\n",
info.short_name, "optimize",
- MSGTR_VO_JPEG_ValueOutOfRange, "[0-100]");
+ MSGTR_VO_ValueOutOfRange, "[0-100]");
exit_player(MSGTR_Exit_error);
} else {
jpeg_optimize = value;
@@ -342,7 +342,7 @@ static uint32_t preinit(const char *arg)
} else {
mp_msg(MSGT_VO, MSGL_ERR, "%s: %s - %s\n",
info.short_name, "optimize",
- MSGTR_VO_JPEG_NoValueSpecified);
+ MSGTR_VO_NoValueSpecified);
exit_player(MSGTR_Exit_error);
}
/* only here if value is set and sane */
@@ -357,7 +357,7 @@ static uint32_t preinit(const char *arg)
if ( (value < 0) || (value > 100) ) {
mp_msg(MSGT_VO, MSGL_ERR, "%s: %s - %s %s.\n",
info.short_name, "smooth",
- MSGTR_VO_JPEG_ValueOutOfRange, "[0-100]");
+ MSGTR_VO_ValueOutOfRange, "[0-100]");
exit_player(MSGTR_Exit_error);
} else {
jpeg_smooth = value;
@@ -367,7 +367,7 @@ static uint32_t preinit(const char *arg)
} else {
mp_msg(MSGT_VO, MSGL_ERR, "%s: %s - %s\n",
info.short_name, "smooth",
- MSGTR_VO_JPEG_NoValueSpecified);
+ MSGTR_VO_NoValueSpecified);
exit_player(MSGTR_Exit_error);
}
/* only here if value is set and sane */
@@ -382,7 +382,7 @@ static uint32_t preinit(const char *arg)
if ( (value < 0) || (value > 100) ) {
mp_msg(MSGT_VO, MSGL_ERR, "%s: %s - %s %s.\n",
info.short_name, "quality",
- MSGTR_VO_JPEG_ValueOutOfRange, "[0-100]");
+ MSGTR_VO_ValueOutOfRange, "[0-100]");
exit_player(MSGTR_Exit_error);
} else {
jpeg_quality = value;
@@ -392,7 +392,7 @@ static uint32_t preinit(const char *arg)
} else {
mp_msg(MSGT_VO, MSGL_ERR, "%s: %s - %s\n",
info.short_name, "quality",
- MSGTR_VO_JPEG_NoValueSpecified);
+ MSGTR_VO_NoValueSpecified);
exit_player(MSGTR_Exit_error);
}
/* only here if value is set and sane */
@@ -420,7 +420,7 @@ static uint32_t preinit(const char *arg)
} else {
mp_msg(MSGT_VO, MSGL_ERR, "%s: %s - %s\n",
info.short_name, "outdir",
- MSGTR_VO_JPEG_NoValueSpecified);
+ MSGTR_VO_NoValueSpecified);
exit_player(MSGTR_Exit_error);
}
} else if (!strncmp(arg, "subdirs=", 8)) {
@@ -442,7 +442,7 @@ static uint32_t preinit(const char *arg)
} else {
mp_msg(MSGT_VO, MSGL_ERR, "%s: %s - %s\n",
info.short_name, "subdirs",
- MSGTR_VO_JPEG_NoValueSpecified);
+ MSGTR_VO_NoValueSpecified);
exit_player(MSGTR_Exit_error);
}
} else if (!strncmp(arg, "maxfiles=", 9)) {
@@ -451,7 +451,7 @@ static uint32_t preinit(const char *arg)
if (value < 1) {
mp_msg(MSGT_VO, MSGL_ERR, "%s: %s - %s %s.\n",
info.short_name, "maxfiles",
- MSGTR_VO_JPEG_ValueOutOfRange, ">=1");
+ MSGTR_VO_ValueOutOfRange, ">=1");
exit_player(MSGTR_Exit_error);
} else {
jpeg_maxfiles = value;
@@ -461,7 +461,7 @@ static uint32_t preinit(const char *arg)
} else {
mp_msg(MSGT_VO, MSGL_ERR, "%s: %s - %s\n",
info.short_name, "maxfiles",
- MSGTR_VO_JPEG_NoValueSpecified);
+ MSGTR_VO_NoValueSpecified);
exit_player(MSGTR_Exit_error);
}
/* only here if value is set and sane */
@@ -472,14 +472,14 @@ static uint32_t preinit(const char *arg)
}
} else {
mp_msg(MSGT_VO, MSGL_ERR, "%s: %s %-20s...\n", info.short_name,
- MSGTR_VO_JPEG_UnknownOptions, arg);
+ MSGTR_VO_UnknownSuboptions, arg);
exit_player(MSGTR_Exit_error);
}
} /* end while */
} /* endif */
mp_msg(MSGT_VO, MSGL_INFO, "%s: %s\n", info.short_name,
- MSGTR_VO_JPEG_SuboptionsParsedOK);
+ MSGTR_VO_SuboptionsParsedOK);
return 0;
}
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-16 11:36:53 +0000