# HG changeset patch # User al # Date 1381949776 0 # Node ID cd83754e4f3a7adb4acbd0d9eb74ff430f37a585 # Parent 3cdf45841125a19afcdfad7571cbc851be151566 vo jpeg, png, pnm: Make output directory message less confusing The current message is rather irritating and could be easily misread as an error. diff -r 3cdf45841125 -r cd83754e4f3a help/help_mp-bg.h --- a/help/help_mp-bg.h Wed Oct 16 17:47:16 2013 +0000 +++ b/help/help_mp-bg.h Wed Oct 16 18:56:16 2013 +0000 @@ -800,7 +800,6 @@ #define MSGTR_VO_UnableToAccess "Достъпът е невъзможен" #define MSGTR_VO_ExistsButNoDirectory "вече съществува, но не е директория." #define MSGTR_VO_DirExistsButNotWritable "Директорията съществува, но не е разрешен запис." -#define MSGTR_VO_DirExistsAndIsWritable "Директорията съществува и е разрешена за запис." #define MSGTR_VO_CantCreateDirectory "Директорията не може да бъде създадена." #define MSGTR_VO_CantCreateFile "Файлът не може да бъде създаден." #define MSGTR_VO_DirectoryCreateSuccess "Директорията е успешно създадена." diff -r 3cdf45841125 -r cd83754e4f3a help/help_mp-cs.h --- a/help/help_mp-cs.h Wed Oct 16 17:47:16 2013 +0000 +++ b/help/help_mp-cs.h Wed Oct 16 18:56:16 2013 +0000 @@ -790,7 +790,6 @@ #define MSGTR_VO_UnableToAccess "Nemám přístup k" #define MSGTR_VO_ExistsButNoDirectory "již existuje, ale není to adresář." #define MSGTR_VO_DirExistsButNotWritable "Výstupní adresář již existuje, ale nelze do něj zapisovat." -#define MSGTR_VO_DirExistsAndIsWritable "Výstupní adresář již existuje a lze do něj zapisovat." #define MSGTR_VO_CantCreateDirectory "Nelze vytvořit výstupní adresář." #define MSGTR_VO_CantCreateFile "Nelze vytvořit výstupní soubor." #define MSGTR_VO_DirectoryCreateSuccess "Úspěšně vytvořen výstupní adresář." diff -r 3cdf45841125 -r cd83754e4f3a help/help_mp-de.h --- a/help/help_mp-de.h Wed Oct 16 17:47:16 2013 +0000 +++ b/help/help_mp-de.h Wed Oct 16 18:56:16 2013 +0000 @@ -1103,7 +1103,6 @@ #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." diff -r 3cdf45841125 -r cd83754e4f3a help/help_mp-en.h --- a/help/help_mp-en.h Wed Oct 16 17:47:16 2013 +0000 +++ b/help/help_mp-en.h Wed Oct 16 18:56:16 2013 +0000 @@ -892,10 +892,10 @@ "Try appending the scale filter to your filter list,\n"\ "e.g. -vf spp,scale instead of -vf spp.\n" #define MSGTR_VO_GenericError "This error has occurred" +#define MSGTR_VO_OutputDirectory "output directory" #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." diff -r 3cdf45841125 -r cd83754e4f3a help/help_mp-es.h --- a/help/help_mp-es.h Wed Oct 16 17:47:16 2013 +0000 +++ b/help/help_mp-es.h Wed Oct 16 18:56:16 2013 +0000 @@ -814,7 +814,6 @@ #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_CantCreateFile "No es posible crear archivo de salida." #define MSGTR_VO_DirectoryCreateSuccess "Directorio de salida creado exitosamente." diff -r 3cdf45841125 -r cd83754e4f3a help/help_mp-fr.h --- a/help/help_mp-fr.h Wed Oct 16 17:47:16 2013 +0000 +++ b/help/help_mp-fr.h Wed Oct 16 18:56:16 2013 +0000 @@ -956,7 +956,6 @@ #define MSGTR_VO_UnableToAccess "Impossible d'accéder" #define MSGTR_VO_ExistsButNoDirectory "Existe déjà, mais n'est pas un répertoire." #define MSGTR_VO_DirExistsButNotWritable "Répertoire de sortie existe déjà, mais n'est pas en écriture." -#define MSGTR_VO_DirExistsAndIsWritable "Répertoire de sortie existe déjà et n'est pas en écriture." #define MSGTR_VO_CantCreateDirectory "Impossible de créer répertoire de sortie." #define MSGTR_VO_CantCreateFile "Impossible de créer fichier de sortie." #define MSGTR_VO_DirectoryCreateSuccess "Répertoire de sortie créé avec succès." diff -r 3cdf45841125 -r cd83754e4f3a help/help_mp-hu.h --- a/help/help_mp-hu.h Wed Oct 16 17:47:16 2013 +0000 +++ b/help/help_mp-hu.h Wed Oct 16 18:56:16 2013 +0000 @@ -802,7 +802,6 @@ #define MSGTR_VO_UnableToAccess "Nem elérhető" #define MSGTR_VO_ExistsButNoDirectory "már létezik, de nem könyvtár." #define MSGTR_VO_DirExistsButNotWritable "A célkönyvtár már létezik, de nem írható." -#define MSGTR_VO_DirExistsAndIsWritable "A célkönyvtár már létezik és írható." #define MSGTR_VO_CantCreateDirectory "Nem tudtam létrehozni a célkönyvtárat." #define MSGTR_VO_CantCreateFile "A kimeneti fájl nem hozható létre." #define MSGTR_VO_DirectoryCreateSuccess "A célkönyvtárat sikeresen létrehoztam." diff -r 3cdf45841125 -r cd83754e4f3a help/help_mp-it.h --- a/help/help_mp-it.h Wed Oct 16 17:47:16 2013 +0000 +++ b/help/help_mp-it.h Wed Oct 16 18:56:16 2013 +0000 @@ -799,7 +799,6 @@ #define MSGTR_VO_UnableToAccess "Impossibile accedere a" #define MSGTR_VO_ExistsButNoDirectory "già esiste, ma non è una directory." #define MSGTR_VO_DirExistsButNotWritable "La directory di output esiste già ma non è scrivibile." -#define MSGTR_VO_DirExistsAndIsWritable "La directory di output esiste già ed è scrivibile." #define MSGTR_VO_CantCreateDirectory "Non posso creare la directory di output." #define MSGTR_VO_CantCreateFile "Non posso creare il file di output." #define MSGTR_VO_DirectoryCreateSuccess "Directory di output creata con successo." diff -r 3cdf45841125 -r cd83754e4f3a help/help_mp-nl.h --- a/help/help_mp-nl.h Wed Oct 16 17:47:16 2013 +0000 +++ b/help/help_mp-nl.h Wed Oct 16 18:56:16 2013 +0000 @@ -747,7 +747,6 @@ #define MSGTR_VO_UnableToAccess "Geen toegang" #define MSGTR_VO_ExistsButNoDirectory "bestaat al, maar is geen directory." #define MSGTR_VO_DirExistsButNotWritable "Output directory bestaat reeds, maar is alleen-lezen." -#define MSGTR_VO_DirExistsAndIsWritable "Output directory bestaat reeds en is beschrijfbaar." #define MSGTR_VO_CantCreateDirectory "Kan de output directory niet aanmaken." #define MSGTR_VO_CantCreateFile "Kan het output bestand niet aanmaken." #define MSGTR_VO_DirectoryCreateSuccess "Output directory succesvol aangemaakt." diff -r 3cdf45841125 -r cd83754e4f3a help/help_mp-pl.h --- a/help/help_mp-pl.h Wed Oct 16 17:47:16 2013 +0000 +++ b/help/help_mp-pl.h Wed Oct 16 18:56:16 2013 +0000 @@ -924,7 +924,6 @@ #define MSGTR_VO_UnableToAccess "Brak dostępu" #define MSGTR_VO_ExistsButNoDirectory "istnieje, ale nie jest folderem." #define MSGTR_VO_DirExistsButNotWritable "Folder wyjściowy istnieje ale nie ma praw do zapisu." -#define MSGTR_VO_DirExistsAndIsWritable "Folder wyjściowy już istnieje i ma prawa zapisu." #define MSGTR_VO_CantCreateDirectory "Nie mogę stworzyć folderu wyjściowego." #define MSGTR_VO_CantCreateFile "Nie mogę stworzyć pliku wyjściowego." #define MSGTR_VO_DirectoryCreateSuccess "Folder wyjściowy utworzony pomyślnie." diff -r 3cdf45841125 -r cd83754e4f3a help/help_mp-ru.h --- a/help/help_mp-ru.h Wed Oct 16 17:47:16 2013 +0000 +++ b/help/help_mp-ru.h Wed Oct 16 18:56:16 2013 +0000 @@ -791,7 +791,6 @@ #define MSGTR_VO_UnableToAccess "Не могу получить доступ" #define MSGTR_VO_ExistsButNoDirectory "уже существует, но не является директорией." #define MSGTR_VO_DirExistsButNotWritable "Директория вывода уже существует, но не доступна для записи." -#define MSGTR_VO_DirExistsAndIsWritable "Директория вывода уже существует и доступна для записи." #define MSGTR_VO_CantCreateDirectory "Не могу создать директорию вывода." #define MSGTR_VO_CantCreateFile "Не могу создать выходной файл." #define MSGTR_VO_DirectoryCreateSuccess "Директория вывода успешно создана." diff -r 3cdf45841125 -r cd83754e4f3a help/help_mp-sv.h --- a/help/help_mp-sv.h Wed Oct 16 17:47:16 2013 +0000 +++ b/help/help_mp-sv.h Wed Oct 16 18:56:16 2013 +0000 @@ -763,7 +763,6 @@ #define MSGTR_VO_UnableToAccess "Kan inte accessa" #define MSGTR_VO_ExistsButNoDirectory "finns redan, men är inte en katalog." #define MSGTR_VO_DirExistsButNotWritable "Ut-katalog finns redan, men är inte skrivbar." -#define MSGTR_VO_DirExistsAndIsWritable "Utkatalog finns redan och är skrivbar." #define MSGTR_VO_CantCreateDirectory "Oförmögen att skapa ut-katalog." #define MSGTR_VO_CantCreateFile "Oförmögen att skapa utfil." #define MSGTR_VO_DirectoryCreateSuccess "Ut-katalog skapad." diff -r 3cdf45841125 -r cd83754e4f3a help/help_mp-tr.h --- a/help/help_mp-tr.h Wed Oct 16 17:47:16 2013 +0000 +++ b/help/help_mp-tr.h Wed Oct 16 18:56:16 2013 +0000 @@ -970,7 +970,6 @@ #define MSGTR_VO_UnableToAccess "Erişilemiyor" #define MSGTR_VO_ExistsButNoDirectory "zaten var, ancak bir dizin değil." #define MSGTR_VO_DirExistsButNotWritable "Çıktı dizini zaten var, ancak yazılabilir değil." -#define MSGTR_VO_DirExistsAndIsWritable " Çıktı dizini zaten var ve yazılabilir." #define MSGTR_VO_CantCreateDirectory "Çıktı dizini oluşturulamıyor." #define MSGTR_VO_CantCreateFile "Çıktı dosyası oluşturulamıyor." #define MSGTR_VO_DirectoryCreateSuccess "Çıktı dizini başarıyla oluşturuldu." diff -r 3cdf45841125 -r cd83754e4f3a help/help_mp-uk.h --- a/help/help_mp-uk.h Wed Oct 16 17:47:16 2013 +0000 +++ b/help/help_mp-uk.h Wed Oct 16 18:56:16 2013 +0000 @@ -784,7 +784,6 @@ #define MSGTR_VO_UnableToAccess "Неможлово отримати доступ" #define MSGTR_VO_ExistsButNoDirectory "вже існує, але це не директорія." #define MSGTR_VO_DirExistsButNotWritable "Директорія виводу вже існує, але не доступна для запису." -#define MSGTR_VO_DirExistsAndIsWritable "Директорія виводу вже існує та доступна для запису." #define MSGTR_VO_CantCreateDirectory "Не можу створити директорію виводу." #define MSGTR_VO_CantCreateFile "Не можу створити файл виводу." #define MSGTR_VO_DirectoryCreateSuccess "Директорія виводу успішно створена." diff -r 3cdf45841125 -r cd83754e4f3a help/help_mp-zh_CN.h --- a/help/help_mp-zh_CN.h Wed Oct 16 17:47:16 2013 +0000 +++ b/help/help_mp-zh_CN.h Wed Oct 16 18:56:16 2013 +0000 @@ -895,7 +895,6 @@ #define MSGTR_VO_UnableToAccess "无法访问" #define MSGTR_VO_ExistsButNoDirectory "已经存在，但不是一个目录。" #define MSGTR_VO_DirExistsButNotWritable "输出目录已经存在，但是不可写。" -#define MSGTR_VO_DirExistsAndIsWritable "输出目录已经存在并且可写。" #define MSGTR_VO_CantCreateDirectory "无法创建输出目录。" #define MSGTR_VO_CantCreateFile "无法创建输出文件。" #define MSGTR_VO_DirectoryCreateSuccess "输出目录创建成功。" diff -r 3cdf45841125 -r cd83754e4f3a help/help_mp-zh_TW.h --- a/help/help_mp-zh_TW.h Wed Oct 16 17:47:16 2013 +0000 +++ b/help/help_mp-zh_TW.h Wed Oct 16 18:56:16 2013 +0000 @@ -942,7 +942,6 @@ #define MSGTR_VO_UnableToAccess "無法訪問" #define MSGTR_VO_ExistsButNoDirectory "已經存在, 但不是一個目録。" #define MSGTR_VO_DirExistsButNotWritable "輸出目録已經存在, 但是不可寫。" -#define MSGTR_VO_DirExistsAndIsWritable "輸出目録已經存在并且可寫。" #define MSGTR_VO_CantCreateDirectory "無法創建輸出目録。" #define MSGTR_VO_CantCreateFile "無法創建輸出文件。" #define MSGTR_VO_DirectoryCreateSuccess "輸出目録創建成功。" diff -r 3cdf45841125 -r cd83754e4f3a libvo/vo_jpeg.c --- a/libvo/vo_jpeg.c Wed Oct 16 17:47:16 2013 +0000 +++ b/libvo/vo_jpeg.c Wed Oct 16 18:56:16 2013 +0000 @@ -134,8 +134,7 @@ exit_player(EXIT_ERROR); } - mp_msg(MSGT_VO, MSGL_INFO, "%s: %s - %s\n", info.short_name, - buf, MSGTR_VO_DirExistsAndIsWritable); + mp_msg(MSGT_VO, MSGL_INFO, "%s: %s: %s\n", info.short_name, MSGTR_VO_OutputDirectory, buf); break; default: diff -r 3cdf45841125 -r cd83754e4f3a libvo/vo_png.c --- a/libvo/vo_png.c Wed Oct 16 17:47:16 2013 +0000 +++ b/libvo/vo_png.c Wed Oct 16 18:56:16 2013 +0000 @@ -91,8 +91,7 @@ exit_player(EXIT_ERROR); } - mp_msg(MSGT_VO, MSGL_INFO, "%s: %s - %s\n", info.short_name, - buf, MSGTR_VO_DirExistsAndIsWritable); + mp_msg(MSGT_VO, MSGL_INFO, "%s: %s: %s\n", info.short_name, MSGTR_VO_OutputDirectory, buf); break; default: diff -r 3cdf45841125 -r cd83754e4f3a libvo/vo_pnm.c --- a/libvo/vo_pnm.c Wed Oct 16 17:47:16 2013 +0000 +++ b/libvo/vo_pnm.c Wed Oct 16 18:56:16 2013 +0000 @@ -228,8 +228,7 @@ } if (strcmp(buf, ".") != 0) { - mp_msg(MSGT_VO, MSGL_INFO, "%s: %s - %s\n", info.short_name, - buf, MSGTR_VO_DirExistsAndIsWritable); + mp_msg(MSGT_VO, MSGL_INFO, "%s: %s: %s\n", info.short_name, MSGTR_VO_OutputDirectory, buf); } break;