diff options
| author | Underground78 <underground78@users.sourceforge.net> | 2013-08-31 17:26:49 +0400 |
|---|---|---|
| committer | Underground78 <underground78@users.sourceforge.net> | 2013-09-01 01:50:42 +0400 |
| commit | 3c79306a0eca973bcb72061531b680d0d185d809 (patch) | |
| tree | e834fd7bed9273f4558056fa15a807c8cb4c893d /src | |
| parent | 2f0cc320aa8fe530e70387df4d3927cce3508f98 (diff) | |
Play > Subtitles menu: Improve the external subtitles naming.
Show the subtitle filename and detect the language whenever possible.
Diffstat (limited to 'src')
53 files changed, 68 insertions, 34 deletions
diff --git a/src/mpc-hc/MainFrm.cpp b/src/mpc-hc/MainFrm.cpp index d02b76485..1af7da32d 100644 --- a/src/mpc-hc/MainFrm.cpp +++ b/src/mpc-hc/MainFrm.cpp @@ -13651,18 +13651,79 @@ bool CMainFrame::LoadSubtitle(CString fn, ISubStream** actualStream /*= nullptr* // The filename of the video file
CString videoName = m_wndPlaylistBar.GetCurFileName();
- videoName = videoName.Left(videoName.ReverseFind('.')).Mid(videoName.ReverseFind('\\') + 1);
+ int iExtStart = videoName.ReverseFind('.');
+ if (iExtStart < 0) {
+ iExtStart = videoName.GetLength();
+ }
+ CString videoExt = videoName.Mid(iExtStart + 1).MakeLower();
+ videoName = videoName.Left(iExtStart).Mid(videoName.ReverseFind('\\') + 1);
// The filename of the subtitle file
- CString subName = fn.Left(fn.ReverseFind('.')).Mid(fn.ReverseFind('\\') + 1);
+ iExtStart = fn.ReverseFind('.');
+ if (iExtStart < 0) {
+ iExtStart = fn.GetLength();
+ }
+ CString subName = fn.Left(iExtStart).Mid(fn.ReverseFind('\\') + 1);
+ CString subExt = fn.Mid(iExtStart + 1);
+
+ CString subNameNoCase = CString(subName).MakeLower();
+ CString videoNameNoCase = CString(videoName).MakeLower();
+
+ CString name, lang;
+ bool bHearingImpaired = false;
+ // Check if the subtitle filename starts with the video filename
+ // so that we can try to find a language info right after it
+ if (GetPlaybackMode() == PM_FILE && subNameNoCase.Find(videoNameNoCase) == 0) {
+ int iVideoNameEnd = videoName.GetLength();
+ // Get ride of the video extension if it's in the subtitle filename
+ if (subNameNoCase.Find(videoExt, iVideoNameEnd) == iVideoNameEnd + 1) {
+ iVideoNameEnd += 1 + videoExt.GetLength();
+ }
+ subName = subName.Mid(iVideoNameEnd);
+
+ CAtlRegExp<CAtlRECharTraits> re;
+ CAtlREMatchContext<CAtlRECharTraits> mc;
+ if (REPARSE_ERROR_OK == re.Parse(_T("^[.\\-_ ]+{[^.\\-_ ]+}([.\\-_ ]+{[^.\\-_ ]+})?"), FALSE) && re.Match(subName, &mc)) {
+ LPCTSTR s, e;
+ mc.GetMatch(0, &s, &e);
+ lang = ISO639XToLanguage(CStringA(s, e - s), true);
+ if (!lang.IsEmpty()) {
+ mc.GetMatch(1, &s, &e);
+ bHearingImpaired = (CString(s, e -s).CompareNoCase(_T("hi")) == 0);
+ }
+ }
+ }
- CString name;
- if (subName.Find(videoName) != -1 && videoName.CompareNoCase(subName) != 0 && subName.Replace(videoName, _T("")) == 1) {
- name = subName.TrimLeft('.');
- } else {
- name.LoadString(IDS_UNDETERMINED);
+ // If we couldn't find any info yet, we try to find the language at the end of the filename
+ if (lang.IsEmpty()) {
+ CAtlRegExp<CAtlRECharTraits> re;
+ CAtlREMatchContext<CAtlRECharTraits> mc;
+ if (REPARSE_ERROR_OK == re.Parse(_T(".*?[.\\-_ ]+{[^.\\-_ ]+}([.\\-_ ]+{[^.\\-_ ]+})?$"), FALSE) && re.Match(subName, &mc)) {
+ LPCTSTR s, e;
+ mc.GetMatch(0, &s, &e);
+ lang = ISO639XToLanguage(CStringA(s, e - s), true);
+
+ mc.GetMatch(1, &s, &e);
+ CStringA str(s, e - s);
+
+ if (!lang.IsEmpty() && str.CompareNoCase("hi") == 0) {
+ bHearingImpaired = true;
+ } else {
+ lang = ISO639XToLanguage(str, true);
+ }
+ }
}
+ name = fn.Mid(fn.ReverseFind('\\') + 1);
+ if (name.GetLength() > 100) { // Cut some part of the filename if it's too long
+ name.Format(_T("%s...%s"), name.Left(50).TrimRight(_T(".-_ ")), name.Right(50).TrimLeft(_T(".-_ ")));
+ }
+ if (!lang.IsEmpty()) {
+ name.AppendFormat(_T(" [%s]"), lang);
+ if (bHearingImpaired) {
+ name.Append(_T(" [hearing impaired]"));
+ }
+ }
if (pRTS && pRTS->Open(fn, DEFAULT_CHARSET, name) && pRTS->GetStreamCount() > 0) {
pSubStream = pRTS.Detach();
}
diff --git a/src/mpc-hc/mpcresources/mplayerc.br.rc b/src/mpc-hc/mpcresources/mplayerc.br.rc Binary files differindex d5028d6a9..bc53f5509 100644 --- a/src/mpc-hc/mpcresources/mplayerc.br.rc +++ b/src/mpc-hc/mpcresources/mplayerc.br.rc diff --git a/src/mpc-hc/mpcresources/mplayerc.by.rc b/src/mpc-hc/mpcresources/mplayerc.by.rc Binary files differindex 60d4a25b7..00430ab59 100644 --- a/src/mpc-hc/mpcresources/mplayerc.by.rc +++ b/src/mpc-hc/mpcresources/mplayerc.by.rc diff --git a/src/mpc-hc/mpcresources/mplayerc.ca.rc b/src/mpc-hc/mpcresources/mplayerc.ca.rc Binary files differindex ee76eb5b9..1abb85f71 100644 --- a/src/mpc-hc/mpcresources/mplayerc.ca.rc +++ b/src/mpc-hc/mpcresources/mplayerc.ca.rc diff --git a/src/mpc-hc/mpcresources/mplayerc.cz.rc b/src/mpc-hc/mpcresources/mplayerc.cz.rc Binary files differindex e133d33e8..23ea33b2b 100644 --- a/src/mpc-hc/mpcresources/mplayerc.cz.rc +++ b/src/mpc-hc/mpcresources/mplayerc.cz.rc diff --git a/src/mpc-hc/mpcresources/mplayerc.de.rc b/src/mpc-hc/mpcresources/mplayerc.de.rc Binary files differindex 7bab9ed4c..b7ecd3b05 100644 --- a/src/mpc-hc/mpcresources/mplayerc.de.rc +++ b/src/mpc-hc/mpcresources/mplayerc.de.rc diff --git a/src/mpc-hc/mpcresources/mplayerc.el.rc b/src/mpc-hc/mpcresources/mplayerc.el.rc Binary files differindex 6dc42d198..493e3f955 100644 --- a/src/mpc-hc/mpcresources/mplayerc.el.rc +++ b/src/mpc-hc/mpcresources/mplayerc.el.rc diff --git a/src/mpc-hc/mpcresources/mplayerc.es.rc b/src/mpc-hc/mpcresources/mplayerc.es.rc Binary files differindex b42b7ef15..3d7717793 100644 --- a/src/mpc-hc/mpcresources/mplayerc.es.rc +++ b/src/mpc-hc/mpcresources/mplayerc.es.rc diff --git a/src/mpc-hc/mpcresources/mplayerc.eu.rc b/src/mpc-hc/mpcresources/mplayerc.eu.rc Binary files differindex c89751cd4..fc1839ae1 100644 --- a/src/mpc-hc/mpcresources/mplayerc.eu.rc +++ b/src/mpc-hc/mpcresources/mplayerc.eu.rc diff --git a/src/mpc-hc/mpcresources/mplayerc.fr.rc b/src/mpc-hc/mpcresources/mplayerc.fr.rc Binary files differindex b0823f6e4..cf236e874 100644 --- a/src/mpc-hc/mpcresources/mplayerc.fr.rc +++ b/src/mpc-hc/mpcresources/mplayerc.fr.rc diff --git a/src/mpc-hc/mpcresources/mplayerc.he.rc b/src/mpc-hc/mpcresources/mplayerc.he.rc Binary files differindex 8c8ef2806..2555e67a1 100644 --- a/src/mpc-hc/mpcresources/mplayerc.he.rc +++ b/src/mpc-hc/mpcresources/mplayerc.he.rc diff --git a/src/mpc-hc/mpcresources/mplayerc.hu.rc b/src/mpc-hc/mpcresources/mplayerc.hu.rc Binary files differindex 0d14e637a..35efeb2cb 100644 --- a/src/mpc-hc/mpcresources/mplayerc.hu.rc +++ b/src/mpc-hc/mpcresources/mplayerc.hu.rc diff --git a/src/mpc-hc/mpcresources/mplayerc.hy.rc b/src/mpc-hc/mpcresources/mplayerc.hy.rc Binary files differindex 716083ffe..6c0605c05 100644 --- a/src/mpc-hc/mpcresources/mplayerc.hy.rc +++ b/src/mpc-hc/mpcresources/mplayerc.hy.rc diff --git a/src/mpc-hc/mpcresources/mplayerc.it.rc b/src/mpc-hc/mpcresources/mplayerc.it.rc Binary files differindex 55f3c8599..c22c1dafe 100644 --- a/src/mpc-hc/mpcresources/mplayerc.it.rc +++ b/src/mpc-hc/mpcresources/mplayerc.it.rc diff --git a/src/mpc-hc/mpcresources/mplayerc.ja.rc b/src/mpc-hc/mpcresources/mplayerc.ja.rc Binary files differindex 156c605c6..88cd439d1 100644 --- a/src/mpc-hc/mpcresources/mplayerc.ja.rc +++ b/src/mpc-hc/mpcresources/mplayerc.ja.rc diff --git a/src/mpc-hc/mpcresources/mplayerc.kr.rc b/src/mpc-hc/mpcresources/mplayerc.kr.rc Binary files differindex 219512604..446ae9aca 100644 --- a/src/mpc-hc/mpcresources/mplayerc.kr.rc +++ b/src/mpc-hc/mpcresources/mplayerc.kr.rc diff --git a/src/mpc-hc/mpcresources/mplayerc.nl.rc b/src/mpc-hc/mpcresources/mplayerc.nl.rc Binary files differindex 785f08d04..cdf791867 100644 --- a/src/mpc-hc/mpcresources/mplayerc.nl.rc +++ b/src/mpc-hc/mpcresources/mplayerc.nl.rc diff --git a/src/mpc-hc/mpcresources/mplayerc.pl.rc b/src/mpc-hc/mpcresources/mplayerc.pl.rc Binary files differindex 58266e96d..4b64bc816 100644 --- a/src/mpc-hc/mpcresources/mplayerc.pl.rc +++ b/src/mpc-hc/mpcresources/mplayerc.pl.rc diff --git a/src/mpc-hc/mpcresources/mplayerc.ro.rc b/src/mpc-hc/mpcresources/mplayerc.ro.rc Binary files differindex 49c818469..b1a1d1eb4 100644 --- a/src/mpc-hc/mpcresources/mplayerc.ro.rc +++ b/src/mpc-hc/mpcresources/mplayerc.ro.rc diff --git a/src/mpc-hc/mpcresources/mplayerc.ru.rc b/src/mpc-hc/mpcresources/mplayerc.ru.rc Binary files differindex 35ef57f64..a58cbf388 100644 --- a/src/mpc-hc/mpcresources/mplayerc.ru.rc +++ b/src/mpc-hc/mpcresources/mplayerc.ru.rc diff --git a/src/mpc-hc/mpcresources/mplayerc.sc.rc b/src/mpc-hc/mpcresources/mplayerc.sc.rc Binary files differindex 47727b0f6..d05154c58 100644 --- a/src/mpc-hc/mpcresources/mplayerc.sc.rc +++ b/src/mpc-hc/mpcresources/mplayerc.sc.rc diff --git a/src/mpc-hc/mpcresources/mplayerc.sk.rc b/src/mpc-hc/mpcresources/mplayerc.sk.rc Binary files differindex 605980439..ce92483db 100644 --- a/src/mpc-hc/mpcresources/mplayerc.sk.rc +++ b/src/mpc-hc/mpcresources/mplayerc.sk.rc diff --git a/src/mpc-hc/mpcresources/mplayerc.sv.rc b/src/mpc-hc/mpcresources/mplayerc.sv.rc Binary files differindex 61fa914db..beca74c9c 100644 --- a/src/mpc-hc/mpcresources/mplayerc.sv.rc +++ b/src/mpc-hc/mpcresources/mplayerc.sv.rc diff --git a/src/mpc-hc/mpcresources/mplayerc.tc.rc b/src/mpc-hc/mpcresources/mplayerc.tc.rc Binary files differindex 7a0a95a5e..57a544f70 100644 --- a/src/mpc-hc/mpcresources/mplayerc.tc.rc +++ b/src/mpc-hc/mpcresources/mplayerc.tc.rc diff --git a/src/mpc-hc/mpcresources/mplayerc.tr.rc b/src/mpc-hc/mpcresources/mplayerc.tr.rc Binary files differindex 046fe7fc9..fb939e41b 100644 --- a/src/mpc-hc/mpcresources/mplayerc.tr.rc +++ b/src/mpc-hc/mpcresources/mplayerc.tr.rc diff --git a/src/mpc-hc/mpcresources/mplayerc.ua.rc b/src/mpc-hc/mpcresources/mplayerc.ua.rc Binary files differindex 5201398d2..cb349b447 100644 --- a/src/mpc-hc/mpcresources/mplayerc.ua.rc +++ b/src/mpc-hc/mpcresources/mplayerc.ua.rc diff --git a/src/mpc-hc/mpcresources/text/mplayerc.br.rc.txt b/src/mpc-hc/mpcresources/text/mplayerc.br.rc.txt index 1df637099..557cf3578 100644 --- a/src/mpc-hc/mpcresources/text/mplayerc.br.rc.txt +++ b/src/mpc-hc/mpcresources/text/mplayerc.br.rc.txt @@ -1856,7 +1856,6 @@ STRING IDS_TOP_FRONT_LEFT "Topo frontal esquerdo" STRING IDS_TOP_FRONT_RIGHT "Topo frontal direito"
STRING IDS_TOUCH_WINDOW_FROM_INSIDE "Tocar janela por dentro"
STRING IDS_TOUCH_WINDOW_FROM_OUTSIDE "Tocar janela por fora"
-STRING IDS_UNDETERMINED "Indeterminado"
STRING IDS_UNKNOWN_SWITCH "Opções desconhecidas encontrados na linha de comandos: \n\n"
STRING IDS_UPDATE_CLOSE "&Fechar"
STRING IDS_UPDATE_CONFIG_AUTO_CHECK "Você quer checar periodicamente por atualizações do MPC-HC?\n\nVocê pode desativar a checagem a qualquer momento na página Miscelânea das opções."
diff --git a/src/mpc-hc/mpcresources/text/mplayerc.by.rc.txt b/src/mpc-hc/mpcresources/text/mplayerc.by.rc.txt index e482a2326..9abc452ca 100644 --- a/src/mpc-hc/mpcresources/text/mplayerc.by.rc.txt +++ b/src/mpc-hc/mpcresources/text/mplayerc.by.rc.txt @@ -1856,7 +1856,6 @@ STRING IDS_TOP_FRONT_LEFT "Верх. пярэдні левы" STRING IDS_TOP_FRONT_RIGHT "Верх. пярэдні правы"
STRING IDS_TOUCH_WINDOW_FROM_INSIDE "Упісаць відэакадр унутр вакна"
STRING IDS_TOUCH_WINDOW_FROM_OUTSIDE "Відэакадр апісаць звонку вакна"
-STRING IDS_UNDETERMINED "Нявызначана"
STRING IDS_UNKNOWN_SWITCH "У камандным радку знойдзены нераспазнаныя перамыкачы: \n\n"
STRING IDS_UPDATE_CLOSE "&Закрыць"
STRING IDS_UPDATE_CONFIG_AUTO_CHECK "Ці жадаеце вы час ад часу правяраць абнаўленні MPC-HC?\n\nГэта опцыя можа быць адключана праз старонку Рознае ў наладах."
diff --git a/src/mpc-hc/mpcresources/text/mplayerc.ca.rc.txt b/src/mpc-hc/mpcresources/text/mplayerc.ca.rc.txt index 43e854986..04f1d2041 100644 --- a/src/mpc-hc/mpcresources/text/mplayerc.ca.rc.txt +++ b/src/mpc-hc/mpcresources/text/mplayerc.ca.rc.txt @@ -1856,7 +1856,6 @@ STRING IDS_TOP_FRONT_LEFT "Dalt Davant Esquerre" STRING IDS_TOP_FRONT_RIGHT "Dalt Davant Dreta"
STRING IDS_TOUCH_WINDOW_FROM_INSIDE "Tocar la finestra des de dins"
STRING IDS_TOUCH_WINDOW_FROM_OUTSIDE "Tocar la finestra des de fora"
-STRING IDS_UNDETERMINED "Indeterminat"
STRING IDS_UNKNOWN_SWITCH "Opció(ns) desconeguda(es) a la cadena de línia de comandaments: \n\n"
STRING IDS_UPDATE_CLOSE "&Tancar"
STRING IDS_UPDATE_CONFIG_AUTO_CHECK "Vols comprovar periòdicament si hi ha actualitzacions del MPC-HC?\n\nAquesta funció pot ser desactivada més tard a Miscel.lània en menú d'opcions."
diff --git a/src/mpc-hc/mpcresources/text/mplayerc.cz.rc.txt b/src/mpc-hc/mpcresources/text/mplayerc.cz.rc.txt index f90fe87e9..ba1b5bc08 100644 --- a/src/mpc-hc/mpcresources/text/mplayerc.cz.rc.txt +++ b/src/mpc-hc/mpcresources/text/mplayerc.cz.rc.txt @@ -1856,7 +1856,6 @@ STRING IDS_TOP_FRONT_LEFT "Horní přední levý" STRING IDS_TOP_FRONT_RIGHT "Horní přední pravý"
STRING IDS_TOUCH_WINDOW_FROM_INSIDE "Dotknout se okna zevnitř"
STRING IDS_TOUCH_WINDOW_FROM_OUTSIDE "Dotknout se okna zvenčí"
-STRING IDS_UNDETERMINED "Nerozpoznáno"
STRING IDS_UNKNOWN_SWITCH "V příkazovém řádku byly použity neznámé parametry: \n\n"
STRING IDS_UPDATE_CLOSE "&Zavřít"
STRING IDS_UPDATE_CONFIG_AUTO_CHECK "Chcete pravidelně kontrolovat dostupnost aktualizací MPC-HC?\n\nTato funkce může být později zakázána v dialogu nastavení v sekci Ostatní."
diff --git a/src/mpc-hc/mpcresources/text/mplayerc.de.rc.txt b/src/mpc-hc/mpcresources/text/mplayerc.de.rc.txt index 7e6c96614..966c2a517 100644 --- a/src/mpc-hc/mpcresources/text/mplayerc.de.rc.txt +++ b/src/mpc-hc/mpcresources/text/mplayerc.de.rc.txt @@ -1855,7 +1855,6 @@ STRING IDS_TOP_FRONT_LEFT "Oben-vorne-links (TpFL)" STRING IDS_TOP_FRONT_RIGHT "Oben-vorne-rechts (TpFR)"
STRING IDS_TOUCH_WINDOW_FROM_INSIDE "Fenster von innen berühren"
STRING IDS_TOUCH_WINDOW_FROM_OUTSIDE "Fenster von außen berühren"
-STRING IDS_UNDETERMINED "Unbekannt"
STRING IDS_UNKNOWN_SWITCH "Unbekannte Option(en) in der Befehlszeile gefunden: \n\n"
STRING IDS_UPDATE_CLOSE "&Schließen"
STRING IDS_UPDATE_CONFIG_AUTO_CHECK "Wollen Sie in regelmäßigen Abständen überprüfen, ob Aktualisierungen für den MPC-HC vorliegen?\n\nDiese Funktion kann bei Bedarf in den Optionen wieder deaktiviert werden."
diff --git a/src/mpc-hc/mpcresources/text/mplayerc.el.rc.txt b/src/mpc-hc/mpcresources/text/mplayerc.el.rc.txt index fd24e81f8..3b2ca7bad 100644 --- a/src/mpc-hc/mpcresources/text/mplayerc.el.rc.txt +++ b/src/mpc-hc/mpcresources/text/mplayerc.el.rc.txt @@ -1856,7 +1856,6 @@ STRING IDS_TOP_FRONT_LEFT "Μπροστά πάνω αριστερά" STRING IDS_TOP_FRONT_RIGHT "Μπροστά πάνω δεξιά" STRING IDS_TOUCH_WINDOW_FROM_INSIDE "Άγγιγμα παραθύρου εσωτερικά" STRING IDS_TOUCH_WINDOW_FROM_OUTSIDE "Άγγιγμα παραθύρου εξωτερικά" -STRING IDS_UNDETERMINED "Απροσδιόριστο" STRING IDS_UNKNOWN_SWITCH "Άγνωστη παράμετρος βρέθηκε στη συμβολοσειρά της γραμμής εντολών: \n\n" STRING IDS_UPDATE_CLOSE "&Κλείσιμο" STRING IDS_UPDATE_CONFIG_AUTO_CHECK "Θέλετε να γίνεται έλεγχος περιοδικά για ενημερώσεις του MPC-HC;\n\nΑυτή η δυνατότητα μπορεί να απενεργοποιηθεί αργότερα από τη σελίδα επιλογών «Διάφορα»." diff --git a/src/mpc-hc/mpcresources/text/mplayerc.es.rc.txt b/src/mpc-hc/mpcresources/text/mplayerc.es.rc.txt index 3fe587d7f..ecbbf0242 100644 --- a/src/mpc-hc/mpcresources/text/mplayerc.es.rc.txt +++ b/src/mpc-hc/mpcresources/text/mplayerc.es.rc.txt @@ -1856,7 +1856,6 @@ STRING IDS_TOP_FRONT_LEFT "Encima Delante Izq." STRING IDS_TOP_FRONT_RIGHT "Encima Delante Der."
STRING IDS_TOUCH_WINDOW_FROM_INSIDE "Tocar ventana desde interior"
STRING IDS_TOUCH_WINDOW_FROM_OUTSIDE "Tocar ventana desde exterior"
-STRING IDS_UNDETERMINED "Undetermined"
STRING IDS_UNKNOWN_SWITCH "Switch(es) no conocido(s) encontrados en la linea de comandos mandada: \n\n"
STRING IDS_UPDATE_CLOSE "&Close"
STRING IDS_UPDATE_CONFIG_AUTO_CHECK "Do you want to check periodically for MPC-HC updates?\n\nThis feature can be disabled later from the Miscellaneous options page."
diff --git a/src/mpc-hc/mpcresources/text/mplayerc.fr.rc.txt b/src/mpc-hc/mpcresources/text/mplayerc.fr.rc.txt index f95f30a2e..cace07f45 100644 --- a/src/mpc-hc/mpcresources/text/mplayerc.fr.rc.txt +++ b/src/mpc-hc/mpcresources/text/mplayerc.fr.rc.txt @@ -1856,7 +1856,6 @@ STRING IDS_TOP_FRONT_LEFT "Top Avant Gauche" STRING IDS_TOP_FRONT_RIGHT "Top Avant Droite"
STRING IDS_TOUCH_WINDOW_FROM_INSIDE "Toucher la fenêtre de l'intérieur"
STRING IDS_TOUCH_WINDOW_FROM_OUTSIDE "Toucher la fenêtre de l'extérieur"
-STRING IDS_UNDETERMINED "Indéterminé"
STRING IDS_UNKNOWN_SWITCH "Option(s) non reconnue dans la ligne de commande : \n\n"
STRING IDS_UPDATE_CLOSE "&Fermer"
STRING IDS_UPDATE_CONFIG_AUTO_CHECK "Souhaitez-vous vérifer régulièrement si des mises à jour sont disponibles ?\n\nCette fonctionnalité peut être désactivée ultérieurement depuis la page Divers des options."
diff --git a/src/mpc-hc/mpcresources/text/mplayerc.he.rc.txt b/src/mpc-hc/mpcresources/text/mplayerc.he.rc.txt index 4ce109bcb..b0dfb27b4 100644 --- a/src/mpc-hc/mpcresources/text/mplayerc.he.rc.txt +++ b/src/mpc-hc/mpcresources/text/mplayerc.he.rc.txt @@ -1856,7 +1856,6 @@ STRING IDS_TOP_FRONT_LEFT "קדמי שמאלי למעלה" STRING IDS_TOP_FRONT_RIGHT "קדמי ימני למעלה"
STRING IDS_TOUCH_WINDOW_FROM_INSIDE "גע בחלון מבפנים"
STRING IDS_TOUCH_WINDOW_FROM_OUTSIDE "גע בחלון מבחוץ"
-STRING IDS_UNDETERMINED "Undetermined"
STRING IDS_UNKNOWN_SWITCH "פרמטר(ים) לא ידוע(ים) נמצא(ו) במחרוזת שורת הפקודה: \n\n"
STRING IDS_UPDATE_CLOSE "&Close"
STRING IDS_UPDATE_CONFIG_AUTO_CHECK "Do you want to check periodically for MPC-HC updates?\n\nThis feature can be disabled later from the Miscellaneous options page."
diff --git a/src/mpc-hc/mpcresources/text/mplayerc.hu.rc.txt b/src/mpc-hc/mpcresources/text/mplayerc.hu.rc.txt index c9da5383f..d99ca85a8 100644 --- a/src/mpc-hc/mpcresources/text/mplayerc.hu.rc.txt +++ b/src/mpc-hc/mpcresources/text/mplayerc.hu.rc.txt @@ -1856,7 +1856,6 @@ STRING IDS_TOP_FRONT_LEFT "Top Front " STRING IDS_TOP_FRONT_RIGHT "Top Front Jobb"
STRING IDS_TOUCH_WINDOW_FROM_INSIDE "Ablak érintése belülről"
STRING IDS_TOUCH_WINDOW_FROM_OUTSIDE "Ablak érintése kívülről"
-STRING IDS_UNDETERMINED "Undetermined"
STRING IDS_UNKNOWN_SWITCH "Nem felismerhető kapcsoló(k) találhatóak a parancssortól kapott szövegben: \n\n"
STRING IDS_UPDATE_CLOSE "&Close"
STRING IDS_UPDATE_CONFIG_AUTO_CHECK "Do you want to check periodically for MPC-HC updates?\n\nThis feature can be disabled later from the Miscellaneous options page."
diff --git a/src/mpc-hc/mpcresources/text/mplayerc.hy.rc.txt b/src/mpc-hc/mpcresources/text/mplayerc.hy.rc.txt index 5b7ccde12..9abb505b1 100644 --- a/src/mpc-hc/mpcresources/text/mplayerc.hy.rc.txt +++ b/src/mpc-hc/mpcresources/text/mplayerc.hy.rc.txt @@ -1856,7 +1856,6 @@ STRING IDS_TOP_FRONT_LEFT "Վերին առաջն. ձախ" STRING IDS_TOP_FRONT_RIGHT "Վերին առաջն. աջ"
STRING IDS_TOUCH_WINDOW_FROM_INSIDE "Գրել պատուհանի ներսում"
STRING IDS_TOUCH_WINDOW_FROM_OUTSIDE "Գրել պատուհանից դուրս"
-STRING IDS_UNDETERMINED "Անորոշ"
STRING IDS_UNKNOWN_SWITCH "Սխալներ հրամանների տողում. \n\n"
STRING IDS_UPDATE_CLOSE "&Փակել"
STRING IDS_UPDATE_CONFIG_AUTO_CHECK "Պարբերաբար ստուգե՞լ MPC-HC-ի թարմացումները։\n\nԱյս հնարավորությունը կարող եք անջատել Ընտրանքներ»Տարբեր բաժնից։"
diff --git a/src/mpc-hc/mpcresources/text/mplayerc.it.rc.txt b/src/mpc-hc/mpcresources/text/mplayerc.it.rc.txt index 665e17cf2..474b312f5 100644 --- a/src/mpc-hc/mpcresources/text/mplayerc.it.rc.txt +++ b/src/mpc-hc/mpcresources/text/mplayerc.it.rc.txt @@ -1856,7 +1856,6 @@ STRING IDS_TOP_FRONT_LEFT "Superiore frontale sinistro" STRING IDS_TOP_FRONT_RIGHT "Superiore frontale destro"
STRING IDS_TOUCH_WINDOW_FROM_INSIDE "Ritocca la finestra dall'interno"
STRING IDS_TOUCH_WINDOW_FROM_OUTSIDE "Ritocca la finestra dall'esterno"
-STRING IDS_UNDETERMINED "Non determinato"
STRING IDS_UNKNOWN_SWITCH "Opzioni non riconosciute nella stringa a riga di comando: \n\n"
STRING IDS_UPDATE_CLOSE "&Close"
STRING IDS_UPDATE_CONFIG_AUTO_CHECK "Vuoi verificare periodicamente la presenza di aggiornamenti per MPC-HC?\n\nQuesta opzione può essere disabilitata nelle Opzioni, sezione Varie."
diff --git a/src/mpc-hc/mpcresources/text/mplayerc.ja.rc.txt b/src/mpc-hc/mpcresources/text/mplayerc.ja.rc.txt index 2a22c2db3..ab599135e 100644 --- a/src/mpc-hc/mpcresources/text/mplayerc.ja.rc.txt +++ b/src/mpc-hc/mpcresources/text/mplayerc.ja.rc.txt @@ -1856,7 +1856,6 @@ STRING IDS_TOP_FRONT_LEFT "トップ・フロント・左" STRING IDS_TOP_FRONT_RIGHT "トップ・フロント・右"
STRING IDS_TOUCH_WINDOW_FROM_INSIDE "ウィンドウサイズに合わせる"
STRING IDS_TOUCH_WINDOW_FROM_OUTSIDE "縦か横に合わせてカット"
-STRING IDS_UNDETERMINED "判別できない"
STRING IDS_UNKNOWN_SWITCH "コマンドライン文字列に不明なスイッチが見つかりました: \n\n"
STRING IDS_UPDATE_CLOSE "閉じる(&C)"
STRING IDS_UPDATE_CONFIG_AUTO_CHECK "MPC-HCの更新を定期的にチェックしますか？\n\nこの機能はオプションのその他から後で無効にできます。"
diff --git a/src/mpc-hc/mpcresources/text/mplayerc.kr.rc.txt b/src/mpc-hc/mpcresources/text/mplayerc.kr.rc.txt index 54042f7ab..1336cf587 100644 --- a/src/mpc-hc/mpcresources/text/mplayerc.kr.rc.txt +++ b/src/mpc-hc/mpcresources/text/mplayerc.kr.rc.txt @@ -1856,7 +1856,6 @@ STRING IDS_TOP_FRONT_LEFT "위쪽 전면 좌측" STRING IDS_TOP_FRONT_RIGHT "위쪽 전면 우측"
STRING IDS_TOUCH_WINDOW_FROM_INSIDE "안쪽 윈도우창에서"
STRING IDS_TOUCH_WINDOW_FROM_OUTSIDE "바깥쪽 윈도우창에서"
-STRING IDS_UNDETERMINED "미정의"
STRING IDS_UNKNOWN_SWITCH "인식불가능한 스위치가 사용됨: \n\n"
STRING IDS_UPDATE_CLOSE "종료(&C)"
STRING IDS_UPDATE_CONFIG_AUTO_CHECK "Do you want to check periodically for MPC-HC updates?\n\nThis feature can be disabled later from the Miscellaneous options page."
diff --git a/src/mpc-hc/mpcresources/text/mplayerc.nl.rc.txt b/src/mpc-hc/mpcresources/text/mplayerc.nl.rc.txt index 1ed11f331..933d88617 100644 --- a/src/mpc-hc/mpcresources/text/mplayerc.nl.rc.txt +++ b/src/mpc-hc/mpcresources/text/mplayerc.nl.rc.txt @@ -1856,7 +1856,6 @@ STRING IDS_TOP_FRONT_LEFT "Top Front Links" STRING IDS_TOP_FRONT_RIGHT "Top Front Rechts"
STRING IDS_TOUCH_WINDOW_FROM_INSIDE "Touch Window From Inside"
STRING IDS_TOUCH_WINDOW_FROM_OUTSIDE "Touch Window From Outside"
-STRING IDS_UNDETERMINED "Undetermined"
STRING IDS_UNKNOWN_SWITCH "Onbekende parameter(s) in opdrachtprompt: \n\n"
STRING IDS_UPDATE_CLOSE "&Close"
STRING IDS_UPDATE_CONFIG_AUTO_CHECK "Do you want to check periodically for MPC-HC updates?\n\nThis feature can be disabled later from the Miscellaneous options page."
diff --git a/src/mpc-hc/mpcresources/text/mplayerc.pl.rc.txt b/src/mpc-hc/mpcresources/text/mplayerc.pl.rc.txt index 709664c52..9864aff73 100644 --- a/src/mpc-hc/mpcresources/text/mplayerc.pl.rc.txt +++ b/src/mpc-hc/mpcresources/text/mplayerc.pl.rc.txt @@ -1855,7 +1855,6 @@ STRING IDS_TOP_FRONT_LEFT "Górny przedni lewy" STRING IDS_TOP_FRONT_RIGHT "Górny przedni prawy"
STRING IDS_TOUCH_WINDOW_FROM_INSIDE "Dopasowanie obrazu do wewnątrz"
STRING IDS_TOUCH_WINDOW_FROM_OUTSIDE "Dopasowanie obrazu na zewnątrz"
-STRING IDS_UNDETERMINED "Nieokreślone"
STRING IDS_UNKNOWN_SWITCH "Znaleziono nierozpoznane parametry w wierszu poleceń: \n\n"
STRING IDS_UPDATE_CLOSE "&Zamknij"
STRING IDS_UPDATE_CONFIG_AUTO_CHECK "Chcesz, aby okresowo były sprawdzane aktualizacje MPC-HC?\n\nTa opcja może zostać później wyłączona w zakładce „Różne” w opcjach."
diff --git a/src/mpc-hc/mpcresources/text/mplayerc.rc.txt b/src/mpc-hc/mpcresources/text/mplayerc.rc.txt index 8d63804eb..a3bc3ba38 100644 --- a/src/mpc-hc/mpcresources/text/mplayerc.rc.txt +++ b/src/mpc-hc/mpcresources/text/mplayerc.rc.txt @@ -1856,7 +1856,6 @@ STRING IDS_TOP_FRONT_LEFT "Top Front Left" STRING IDS_TOP_FRONT_RIGHT "Top Front Right"
STRING IDS_TOUCH_WINDOW_FROM_INSIDE "Touch Window From Inside"
STRING IDS_TOUCH_WINDOW_FROM_OUTSIDE "Touch Window From Outside"
-STRING IDS_UNDETERMINED "Undetermined"
STRING IDS_UNKNOWN_SWITCH "Unrecognized switch(es) found in command line string: \n\n"
STRING IDS_UPDATE_CLOSE "&Close"
STRING IDS_UPDATE_CONFIG_AUTO_CHECK "Do you want to check periodically for MPC-HC updates?\n\nThis feature can be disabled later from the Miscellaneous options page."
diff --git a/src/mpc-hc/mpcresources/text/mplayerc.ro.rc.txt b/src/mpc-hc/mpcresources/text/mplayerc.ro.rc.txt index ad3f55fb3..8dd057ee5 100644 --- a/src/mpc-hc/mpcresources/text/mplayerc.ro.rc.txt +++ b/src/mpc-hc/mpcresources/text/mplayerc.ro.rc.txt @@ -1856,7 +1856,6 @@ STRING IDS_TOP_FRONT_LEFT "Stânga față sus" STRING IDS_TOP_FRONT_RIGHT "Dreapta față sus" STRING IDS_TOUCH_WINDOW_FROM_INSIDE "Atinge fereastra din interior" STRING IDS_TOUCH_WINDOW_FROM_OUTSIDE "Atinge fereastra din exterior" -STRING IDS_UNDETERMINED "Nedeterminat" STRING IDS_UNKNOWN_SWITCH "Au fost găsite comutatoare nerecunoscute în șirul liniei de comandă: \n\n" STRING IDS_UPDATE_CLOSE "În&chide" STRING IDS_UPDATE_CONFIG_AUTO_CHECK "Doriţi să verificaţi periodic pentru actualizări ale MPC-HC?\n\nAceastă caracteristică poate fi dezactivată mai târziu din pagina de opţiuni Diverse." diff --git a/src/mpc-hc/mpcresources/text/mplayerc.ru.rc.txt b/src/mpc-hc/mpcresources/text/mplayerc.ru.rc.txt index 51b308ee0..bcb23e763 100644 --- a/src/mpc-hc/mpcresources/text/mplayerc.ru.rc.txt +++ b/src/mpc-hc/mpcresources/text/mplayerc.ru.rc.txt @@ -1856,7 +1856,6 @@ STRING IDS_TOP_FRONT_LEFT "Верх. передн. левый" STRING IDS_TOP_FRONT_RIGHT "Верх. передн. правый"
STRING IDS_TOUCH_WINDOW_FROM_INSIDE "Вписать в размер экрана"
STRING IDS_TOUCH_WINDOW_FROM_OUTSIDE "Заполнить экран и обрезать кадр"
-STRING IDS_UNDETERMINED "undetermined"
STRING IDS_UNKNOWN_SWITCH "В командной строке найдены нераспознанные переключатели: \n\n"
STRING IDS_UPDATE_CLOSE "&Закрыть"
STRING IDS_UPDATE_CONFIG_AUTO_CHECK "Вы хотите, чтобы плеер автоматически проверял обновления?\n\nЭту функция может быть отключена в настройках на странице 'Разное'."
diff --git a/src/mpc-hc/mpcresources/text/mplayerc.sc.rc.txt b/src/mpc-hc/mpcresources/text/mplayerc.sc.rc.txt index 1a6bcf2c5..3dcfcf0a5 100644 --- a/src/mpc-hc/mpcresources/text/mplayerc.sc.rc.txt +++ b/src/mpc-hc/mpcresources/text/mplayerc.sc.rc.txt @@ -1856,7 +1856,6 @@ STRING IDS_TOP_FRONT_LEFT "上 前 左" STRING IDS_TOP_FRONT_RIGHT "上 前 右"
STRING IDS_TOUCH_WINDOW_FROM_INSIDE "从内部接触窗口"
STRING IDS_TOUCH_WINDOW_FROM_OUTSIDE "从外部接触窗口"
-STRING IDS_UNDETERMINED "未定的"
STRING IDS_UNKNOWN_SWITCH "在命令行字串中发现未认证的开关符: \n\n"
STRING IDS_UPDATE_CLOSE "关闭(&C)"
STRING IDS_UPDATE_CONFIG_AUTO_CHECK "您确实要定期检查 MPC-HC 的更新吗？\n\n此功能可以在其它选项页中被关闭。"
diff --git a/src/mpc-hc/mpcresources/text/mplayerc.sk.rc.txt b/src/mpc-hc/mpcresources/text/mplayerc.sk.rc.txt index f1ec2e7a7..7a520ae82 100644 --- a/src/mpc-hc/mpcresources/text/mplayerc.sk.rc.txt +++ b/src/mpc-hc/mpcresources/text/mplayerc.sk.rc.txt @@ -1856,7 +1856,6 @@ STRING IDS_TOP_FRONT_LEFT "Horný ľavý - vpredu" STRING IDS_TOP_FRONT_RIGHT "Horný pravý - vpredu"
STRING IDS_TOUCH_WINDOW_FROM_INSIDE "Dotýkať sa okna zvnútra"
STRING IDS_TOUCH_WINDOW_FROM_OUTSIDE "Dotýkať sa okna zvonku"
-STRING IDS_UNDETERMINED "Nezistené"
STRING IDS_UNKNOWN_SWITCH "V príkaze na príkazovom riadku sa našli neznáme parametre: \n\n"
STRING IDS_UPDATE_CLOSE "&Zatvoriť"
STRING IDS_UPDATE_CONFIG_AUTO_CHECK "Chcete pravidelne kontrolovať výskyt aktualizácií programu MPC-HC?\n\nTúto funkciu môžete neskôr vypnúť v sekcii s rôznymi nastaveniami programu."
diff --git a/src/mpc-hc/mpcresources/text/mplayerc.sv.rc.txt b/src/mpc-hc/mpcresources/text/mplayerc.sv.rc.txt index 15364bb95..e422c8fc4 100644 --- a/src/mpc-hc/mpcresources/text/mplayerc.sv.rc.txt +++ b/src/mpc-hc/mpcresources/text/mplayerc.sv.rc.txt @@ -1856,7 +1856,6 @@ STRING IDS_TOP_FRONT_LEFT "Top Front Left" STRING IDS_TOP_FRONT_RIGHT "Top Front Right"
STRING IDS_TOUCH_WINDOW_FROM_INSIDE "Touch Window From Inside"
STRING IDS_TOUCH_WINDOW_FROM_OUTSIDE "Touch Window From Outside"
-STRING IDS_UNDETERMINED "Obestämbar"
STRING IDS_UNKNOWN_SWITCH "Okända växlar finns i kommandoraden: \n\n"
STRING IDS_UPDATE_CLOSE "&Stäng"
STRING IDS_UPDATE_CONFIG_AUTO_CHECK "Vill du kontrollera uppdateringar med jämna mellanrum för MPC-HC?\n\nDen här funktionen kan inaktiveras under Diverse i inställningarna."
diff --git a/src/mpc-hc/mpcresources/text/mplayerc.tc.rc.txt b/src/mpc-hc/mpcresources/text/mplayerc.tc.rc.txt index b98a1d7a1..9b063b621 100644 --- a/src/mpc-hc/mpcresources/text/mplayerc.tc.rc.txt +++ b/src/mpc-hc/mpcresources/text/mplayerc.tc.rc.txt @@ -1856,7 +1856,6 @@ STRING IDS_TOP_FRONT_LEFT "左上前側" STRING IDS_TOP_FRONT_RIGHT "右上前側"
STRING IDS_TOUCH_WINDOW_FROM_INSIDE "由內貼齊視窗"
STRING IDS_TOUCH_WINDOW_FROM_OUTSIDE "由外貼齊視窗"
-STRING IDS_UNDETERMINED "未確定"
STRING IDS_UNKNOWN_SWITCH "在命令列字串裡找到無法辨識的選項: \n\n"
STRING IDS_UPDATE_CLOSE "關閉(&C)"
STRING IDS_UPDATE_CONFIG_AUTO_CHECK "您要定期檢查 MPC-HC 的更新嗎?\n\n這個功能稍後可在設定選項裡的其它頁面停用。"
diff --git a/src/mpc-hc/mpcresources/text/mplayerc.tr.rc.txt b/src/mpc-hc/mpcresources/text/mplayerc.tr.rc.txt index eee1563bc..0e152bafa 100644 --- a/src/mpc-hc/mpcresources/text/mplayerc.tr.rc.txt +++ b/src/mpc-hc/mpcresources/text/mplayerc.tr.rc.txt @@ -1856,7 +1856,6 @@ STRING IDS_TOP_FRONT_LEFT "Üst Ön - Sol" STRING IDS_TOP_FRONT_RIGHT "Üst Ön - Sağ"
STRING IDS_TOUCH_WINDOW_FROM_INSIDE "Pencereyi İçeriden Uyarla"
STRING IDS_TOUCH_WINDOW_FROM_OUTSIDE "Pencereyi Dışarıdan Uyarla"
-STRING IDS_UNDETERMINED "Tanımlanmamış"
STRING IDS_UNKNOWN_SWITCH "Komut satırında geçersiz anahtar(lar) bulundu: \n\n"
STRING IDS_UPDATE_CLOSE "&Kapat"
STRING IDS_UPDATE_CONFIG_AUTO_CHECK "MPC-HC güncelleştirmelerinin düzenli olarak denetlenmesini istiyor musunuz?\n\nBu özelliği daha sonra ayarlar sayfasının Çeşitli kısmından kapatabilirsiniz."
diff --git a/src/mpc-hc/mpcresources/text/mplayerc.ua.rc.txt b/src/mpc-hc/mpcresources/text/mplayerc.ua.rc.txt index 40453fa1f..aa4f5db2f 100644 --- a/src/mpc-hc/mpcresources/text/mplayerc.ua.rc.txt +++ b/src/mpc-hc/mpcresources/text/mplayerc.ua.rc.txt @@ -1856,7 +1856,6 @@ STRING IDS_TOP_FRONT_LEFT "Верхній фронтальний лівий" STRING IDS_TOP_FRONT_RIGHT "Верхній фронтальний правий"
STRING IDS_TOUCH_WINDOW_FROM_INSIDE "Вписати у вікно з середини"
STRING IDS_TOUCH_WINDOW_FROM_OUTSIDE "Описати вікно ззовні"
-STRING IDS_UNDETERMINED "Невизначено"
STRING IDS_UNKNOWN_SWITCH "В рядку запуску знайдено невідомі перемикачі: \n\n"
STRING IDS_UPDATE_CLOSE "&Закрити"
STRING IDS_UPDATE_CONFIG_AUTO_CHECK "Ви хочете періодично перевіряти оновлення MPC-HC?\n\nДана можливість може бути вимкнена пізніше на сторінці налаштувань Різне."
diff --git a/src/mpc-hc/mplayerc.rc b/src/mpc-hc/mplayerc.rc index 021fcf205..0eaa67cbe 100644 --- a/src/mpc-hc/mplayerc.rc +++ b/src/mpc-hc/mplayerc.rc @@ -2435,7 +2435,6 @@ BEGIN IDS_PIXELSHADERCOMPILER_1
"Cannot find necessary function entry points in D3DX9_xx.dll, pixel shaders will not work."
IDS_AG_NOT_KNOWN "Not known"
- IDS_UNDETERMINED "Undetermined"
IDS_MPLAYERC_0 "Quick Open File"
IDS_AG_OPEN_FILE "Open File"
END
diff --git a/src/mpc-hc/resource.h b/src/mpc-hc/resource.h index a194c4b5d..229768139 100644 --- a/src/mpc-hc/resource.h +++ b/src/mpc-hc/resource.h @@ -1300,7 +1300,6 @@ #define IDS_REGAIN_VOLUME 41335
#define IDS_OSD_REGAIN_VOLUME_ON 41336
#define IDS_OSD_REGAIN_VOLUME_OFF 41337
-#define IDS_UNDETERMINED 41338
#define IDS_SIZE_UNIT_K 41339
#define IDS_SIZE_UNIT_M 41340
#define IDS_SIZE_UNIT_G 41341
|