mirror of
https://github.com/SubtitleEdit/subtitleedit.git
synced 2024-11-23 03:33:18 +01:00
Merge branch 'master' into feature/teletext
This commit is contained in:
Nikolaj Olsson
commit
6ac2d94448
@ -1,40 +1,40 @@
|
||||
<NoBreakAfterList>
|
||||
<Item>г-дин</Item>
|
||||
<Item>Г-дин</Item>
|
||||
<Item>г-ѓа</Item>
|
||||
<Item>Г-ѓа</Item>
|
||||
<Item>Г-ѓо</Item>
|
||||
<Item>г-ѓо</Item>
|
||||
<Item>Г-ѓица</Item>
|
||||
<Item>г-ѓица</Item>
|
||||
<Item>Г-ѓице</Item>
|
||||
<Item>г-ѓице</Item>
|
||||
<Item>Г-ѓици</Item>
|
||||
<Item>г-ѓици</Item>
|
||||
<Item>Г-ѓи</Item>
|
||||
<Item>г-ѓи</Item>
|
||||
<Item>Г-дини</Item>
|
||||
<Item>г-дини</Item>
|
||||
<Item>Д-р</Item>
|
||||
<Item>Проф.</Item>
|
||||
<Item>д-р</Item>
|
||||
<Item>проф.</Item>
|
||||
<Item>т.н.</Item>
|
||||
<Item>на пр.</Item>
|
||||
<Item>год.</Item>
|
||||
<Item>На пр.</Item>
|
||||
<Item>Год.</Item>
|
||||
<Item>ГОД.</Item>
|
||||
<Item>м-р</Item>
|
||||
<Item>М-р</Item>
|
||||
<Item>анг.</Item>
|
||||
<Item>англ.</Item>
|
||||
<Item>пр.н.е</Item>
|
||||
<Item>г.ш.</Item>
|
||||
<Item>н.в.</Item>
|
||||
<Item>г-дин</Item>
|
||||
<Item>Г-дин</Item>
|
||||
<Item>г-дини</Item>
|
||||
<Item>Г-дини</Item>
|
||||
<Item>г-ѓа</Item>
|
||||
<Item>Г-ѓа</Item>
|
||||
<Item>г-ѓи</Item>
|
||||
<Item>Г-ѓи</Item>
|
||||
<Item>г-ѓица</Item>
|
||||
<Item>Г-ѓица</Item>
|
||||
<Item>г-ѓице</Item>
|
||||
<Item>Г-ѓице</Item>
|
||||
<Item>г-ѓици</Item>
|
||||
<Item>Г-ѓици</Item>
|
||||
<Item>г-ѓо</Item>
|
||||
<Item>Г-ѓо</Item>
|
||||
<Item>г-ин</Item>
|
||||
<Item>Г-ин</Item>
|
||||
<Item>г-н</Item>
|
||||
<Item>Г-н</Item>
|
||||
<Item>год.</Item>
|
||||
<Item>Год.</Item>
|
||||
<Item>ГОД.</Item>
|
||||
<Item>д-р</Item>
|
||||
<Item>Д-р</Item>
|
||||
<Item>м-р</Item>
|
||||
<Item>М-р</Item>
|
||||
<Item>н.в.</Item>
|
||||
<Item>на пр.</Item>
|
||||
<Item>На пр.</Item>
|
||||
<Item>пр.н.е</Item>
|
||||
<Item>проф.</Item>
|
||||
<Item>Проф.</Item>
|
||||
<Item>т.н.</Item>
|
||||
<Item>чл.</Item>
|
||||
</NoBreakAfterList>
|
||||
@ -1,4 +1,5 @@
|
||||
<ReplaceList>
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<OCRFixReplaceList>
|
||||
<WholeWords>
|
||||
<Word from="5ВЕЗДЕНИ" to="ЅВЕЗДЕНИ" />
|
||||
<Word from="5везден" to="ѕвезден" />
|
||||
@ -40,14 +41,15 @@
|
||||
<Word from="не не" to="не нѐ" />
|
||||
<Word from="и и" to="и ѝ" />
|
||||
</WholeWords>
|
||||
<PartialWordsAlways />
|
||||
<PartialWords>
|
||||
<!-- Will be used to check words not in dictionary -->
|
||||
<!-- If new word(s) exists in spelling dictionary, it is (they are) accepted -->
|
||||
</PartialWords>
|
||||
<WholeLines />
|
||||
<PartialLinesAlways />
|
||||
<PartialLines />
|
||||
<BeginLines />
|
||||
<EndLines />
|
||||
<WholeLines>
|
||||
</WholeLines>
|
||||
<RemovedWholeWords />
|
||||
<RemovedPartialLines />
|
||||
<RemovedBeginLines />
|
||||
<RemovedEndLines />
|
||||
<RemovedWholeLines />
|
||||
</ReplaceList>
|
||||
<RegularExpressions />
|
||||
</OCRFixReplaceList>
|
||||
@ -330,6 +330,23 @@ ko.types_custom=사용자 지정 설치
|
||||
ko.types_default=기본 설치
|
||||
|
||||
|
||||
; Macedonian
|
||||
mk.comp_translations=Преводи
|
||||
mk.msg_AskToDownNET=За користење на Subtitle Edit потребно е .NET Framework 4.0. Ве молиме, преземете и инсталирајте .NET Framework и пак започнете со инсталација.%n%nДали сакате сега да преземете .NET Framework 4.0?
|
||||
mk.msg_DeleteSettings=Дали сакате да ги избришете и поставките во Subtitle Edit и сите сопствени промени во речниците?%n%nАко планирате да го реинсталирате Subtitle Edit не треба да ги избришете.
|
||||
mk.msg_OptimizingPerformance=Оптимизирање на работата на програмот...
|
||||
mk.run_VisitWebsite=Посетете ја веб страницата на Subtitle Edit
|
||||
mk.sm_com_Changelog=Извештај за промени во Subtitle Edit
|
||||
mk.tsk_AllUsers=За сите корисници
|
||||
mk.tsk_CurrentUser=Само за моменталниот корисник
|
||||
mk.tsk_Other=Друго:
|
||||
mk.tsk_ResetDictionaries=Ресетирај речници и избриши додадени називи по избор
|
||||
mk.tsk_ResetSettings=Ресетирај поставки на Subtitle Edit
|
||||
mk.tsk_SetFileTypes=Постави го Subtitle edit како стандарден програм за SubRip Text (.srt) записи
|
||||
mk.types_custom=Инсталиција по избор
|
||||
mk.types_default=Стандардна инсталација
|
||||
|
||||
|
||||
; Dutch
|
||||
nl.comp_translations=Vertalingen
|
||||
nl.msg_AskToDownNET=Subtitle Edit vereist .NET Framework 4.0. Download en instaleer deze software alstublieft en doe de setup opnieuw.%n%nWilt u nu .NET Framework 4.0 instaleren?
|
||||
@ -499,6 +516,7 @@ sv.tsk_SetFileTypes=Associate SubRip Text (.srt) files with Subtitle Edit
|
||||
sv.types_custom=Custom installation
|
||||
sv.types_default=Default installation
|
||||
|
||||
|
||||
; Thai
|
||||
th.comp_translations=Translations
|
||||
th.msg_AskToDownNET=Subtitle Edit requires the .NET Framework 4.0. Please download and install the .NET Framework and run setup again.%n%nDo you want to download the .NET Framework 4.0 now?
|
||||
@ -515,6 +533,7 @@ th.tsk_SetFileTypes=Associate SubRip Text (.srt) files with Subtitle Edit
|
||||
th.types_custom=Custom installation
|
||||
th.types_default=Default installation
|
||||
|
||||
|
||||
; Turkish
|
||||
tr.comp_translations=Translations
|
||||
tr.msg_AskToDownNET=Subtitle Edit requires the .NET Framework 4.0. Please download and install the .NET Framework and run setup again.%n%nDo you want to download the .NET Framework 4.0 now?
|
||||
@ -531,6 +550,7 @@ tr.tsk_SetFileTypes=Associate SubRip Text (.srt) files with Subtitle Edit
|
||||
tr.types_custom=Custom installation
|
||||
tr.types_default=Default installation
|
||||
|
||||
|
||||
; Ukrainian
|
||||
uk.comp_translations=Файли локалізації
|
||||
uk.msg_AskToDownNET=Subtitle Edit потребує для своєї роботи .NET Framework 4.0. Будь ласка, звантажте та встановіть .NET Framework і запустіть інсталяцію ще раз.%n%nБажаєте звантажити .NET Framework 4.0 зараз?
|
||||
@ -547,6 +567,7 @@ uk.tsk_SetFileTypes=Associate SubRip Text (.srt) files with Subtitle Edit
|
||||
uk.types_custom=Налаштовуване встановлення
|
||||
uk.types_default=Типове встановлення
|
||||
|
||||
|
||||
; Vietnamese
|
||||
vi.comp_translations=Translations
|
||||
vi.msg_AskToDownNET=Subtitle Edit requires the .NET Framework 4.0. Please download and install the .NET Framework and run setup again.%n%nDo you want to download the .NET Framework 4.0 now?
|
||||
@ -563,6 +584,7 @@ vi.tsk_SetFileTypes=Associate SubRip Text (.srt) files with Subtitle Edit
|
||||
vi.types_custom=Custom installation
|
||||
vi.types_default=Default installation
|
||||
|
||||
|
||||
; Chinese Simplified
|
||||
zh.comp_translations=Translations
|
||||
zh.msg_AskToDownNET=Subtitle Edit requires the .NET Framework 4.0. Please download and install the .NET Framework and run setup again.%n%nDo you want to download the .NET Framework 4.0 now?
|
||||
@ -579,6 +601,7 @@ zh.tsk_SetFileTypes=Associate SubRip Text (.srt) files with Subtitle Edit
|
||||
zh.types_custom=Custom installation
|
||||
zh.types_default=Default installation
|
||||
|
||||
|
||||
; Chinese Traditional
|
||||
zhTW.comp_translations=Translations
|
||||
zhTW.msg_AskToDownNET=Subtitle Edit requires the .NET Framework 4.0. Please download and install the .NET Framework and run setup again.%n%nDo you want to download the .NET Framework 4.0 now?
|
||||
@ -595,6 +618,7 @@ zhTW.tsk_SetFileTypes=Associate SubRip Text (.srt) files with Subtitle Edit
|
||||
zhTW.types_custom=Custom installation
|
||||
zhTW.types_default=Default installation
|
||||
|
||||
|
||||
; Indonesian
|
||||
;id.comp_translations=Terjemahan
|
||||
;id.msg_AskToDownNET=Subtitle Edit membutuhkan .NET Framework 4.0. Silakan unduh dan instal .NET Framework dan jalankan setup lagi.%n%nApakah Anda ingin mengunduh .NET Framework 4.0 sekarang?
|
||||
@ -611,20 +635,4 @@ zhTW.types_default=Default installation
|
||||
;id.types_custom=Instalasi khusus
|
||||
;id.types_default=Instalasi standar
|
||||
|
||||
; Macedonian
|
||||
mk.comp_translations=Преводи
|
||||
mk.msg_AskToDownNET=За користење на Subtitle Edit потребно е .NET Framework 4.0. Ве молиме, преземете и инсталирајте .NET Framework и пак започнете со инсталација.%n%nДали сакате сега да преземете .NET Framework 4.0?
|
||||
mk.msg_DeleteSettings=Дали сакате да ги избришете и поставките во Subtitle Edit и сите сопствени промени во речниците?%n%nАко планирате да го реинсталирате Subtitle Edit не треба да ги избришете.
|
||||
mk.msg_OptimizingPerformance=Оптимизирање на работата на програмот...
|
||||
mk.run_VisitWebsite=Посетете ја веб страницата на Subtitle Edit
|
||||
mk.sm_com_Changelog=Извештај за промени во Subtitle Edit
|
||||
mk.tsk_AllUsers=За сите корисници
|
||||
mk.tsk_CurrentUser=Само за моменталниот корисник
|
||||
mk.tsk_Other=Друго:
|
||||
mk.tsk_ResetDictionaries=Ресетирај речници и избриши додадени називи по избор
|
||||
mk.tsk_ResetSettings=Ресетирај поставки на Subtitle Edit
|
||||
mk.tsk_SetFileTypes=Постави го Subtitle edit како стандарден програм за SubRip Text (.srt) записи
|
||||
mk.types_custom=Инсталиција по избор
|
||||
mk.types_default=Стандардна инсталација
|
||||
|
||||
#endif
|
||||
|
||||
@ -251,6 +251,7 @@ Source: {#bindir}\Languages\id-ID.xml; DestDir: {app}\Languages;
|
||||
Source: {#bindir}\Languages\it-IT.xml; DestDir: {app}\Languages; Flags: ignoreversion; Components: translations
|
||||
Source: {#bindir}\Languages\ja-JP.xml; DestDir: {app}\Languages; Flags: ignoreversion; Components: translations
|
||||
Source: {#bindir}\Languages\ko-KR.xml; DestDir: {app}\Languages; Flags: ignoreversion; Components: translations
|
||||
Source: {#bindir}\Languages\mk-MK.xml; DestDir: {app}\Languages; Flags: ignoreversion; Components: translations
|
||||
Source: {#bindir}\Languages\nb-NO.xml; DestDir: {app}\Languages; Flags: ignoreversion; Components: translations
|
||||
Source: {#bindir}\Languages\nl-NL.xml; DestDir: {app}\Languages; Flags: ignoreversion; Components: translations
|
||||
Source: {#bindir}\Languages\pl-PL.xml; DestDir: {app}\Languages; Flags: ignoreversion; Components: translations
|
||||
@ -369,6 +370,7 @@ Type: files; Name: {app}\Languages\id-ID.xml; Check: not IsComponentSe
|
||||
Type: files; Name: {app}\Languages\it-IT.xml; Check: not IsComponentSelected('translations') and IsUpgrade()
|
||||
Type: files; Name: {app}\Languages\ja-JP.xml; Check: not IsComponentSelected('translations') and IsUpgrade()
|
||||
Type: files; Name: {app}\Languages\ko-KR.xml; Check: not IsComponentSelected('translations') and IsUpgrade()
|
||||
Type: files; Name: {app}\Languages\mk-MK.xml; Check: not IsComponentSelected('translations') and IsUpgrade()
|
||||
Type: files; Name: {app}\Languages\nb-NO.xml; Check: not IsComponentSelected('translations') and IsUpgrade()
|
||||
Type: files; Name: {app}\Languages\nl-NL.xml; Check: not IsComponentSelected('translations') and IsUpgrade()
|
||||
Type: files; Name: {app}\Languages\pl-PL.xml; Check: not IsComponentSelected('translations') and IsUpgrade()
|
||||
|
||||
@ -150,6 +150,7 @@ namespace Nikse.SubtitleEdit.Forms
|
||||
{
|
||||
Initialize(subtitle);
|
||||
GeneratePreview();
|
||||
SetDeleteIndices();
|
||||
}
|
||||
|
||||
internal void RunFromBatch(Subtitle subtitle, IEnumerable<string> importFileNames)
|
||||
|
||||
@ -1572,10 +1572,8 @@
|
||||
</None>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<None Include="Resources\Transparent Background.png" />
|
||||
<Content Include="DLLs\Voikkox64.dll" />
|
||||
<Content Include="DLLs\Voikkox86.dll" />
|
||||
<Content Include="Icons\RemoveTextForHI.png" />
|
||||
<Content Include="Languages\ar-EG.xml">
|
||||
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
|
||||
</Content>
|
||||
@ -1621,6 +1619,9 @@
|
||||
<Content Include="Languages\fr-FR.xml">
|
||||
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
|
||||
</Content>
|
||||
<Content Include="Languages\hr-HR.xml">
|
||||
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
|
||||
</Content>
|
||||
<Content Include="Languages\hu-HU.xml">
|
||||
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
|
||||
</Content>
|
||||
@ -1630,13 +1631,13 @@
|
||||
<Content Include="Languages\it-IT.xml">
|
||||
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
|
||||
</Content>
|
||||
<Content Include="Languages\ja-JP.xml">
|
||||
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
|
||||
</Content>
|
||||
<Content Include="Languages\ko-KR.xml">
|
||||
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
|
||||
</Content>
|
||||
<Content Include="Languages\hr-HR.xml">
|
||||
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
|
||||
</Content>
|
||||
<Content Include="Languages\ja-JP.xml">
|
||||
<Content Include="Languages\mk-MK.xml">
|
||||
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
|
||||
</Content>
|
||||
<Content Include="Languages\nb-NO.xml">
|
||||
@ -1654,6 +1655,12 @@
|
||||
<Content Include="Languages\pt-PT.xml">
|
||||
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
|
||||
</Content>
|
||||
<Content Include="Languages\ro-RO.xml">
|
||||
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
|
||||
</Content>
|
||||
<Content Include="Languages\ru-RU.xml">
|
||||
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
|
||||
</Content>
|
||||
<Content Include="Languages\sl-SI.xml">
|
||||
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
|
||||
</Content>
|
||||
@ -1663,21 +1670,15 @@
|
||||
<Content Include="Languages\sr-Latn-RS.xml">
|
||||
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
|
||||
</Content>
|
||||
<Content Include="Languages\sv-SE.xml">
|
||||
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
|
||||
</Content>
|
||||
<Content Include="Languages\th-TH.xml">
|
||||
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
|
||||
</Content>
|
||||
<Content Include="Languages\tr-TR.xml">
|
||||
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
|
||||
</Content>
|
||||
<Content Include="Languages\ro-RO.xml">
|
||||
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
|
||||
</Content>
|
||||
<Content Include="Languages\ru-RU.xml">
|
||||
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
|
||||
</Content>
|
||||
<Content Include="Languages\sv-SE.xml">
|
||||
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
|
||||
</Content>
|
||||
<Content Include="Languages\uk-UA.xml">
|
||||
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
|
||||
</Content>
|
||||
@ -1690,9 +1691,6 @@
|
||||
<Content Include="Languages\zh-TW.xml">
|
||||
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
|
||||
</Content>
|
||||
<None Include="Resources\pictureBoxNoFSOver.Image.png" />
|
||||
<None Include="Resources\pictureBoxNoFSDown.Image.png" />
|
||||
<None Include="Resources\pictureBoxNoFS.Image.png" />
|
||||
<None Include="Web References\SeNetworkService\SeService.disco" />
|
||||
<None Include="DLLs\Interop.QuartzTypeLib.dll" />
|
||||
<Content Include="..\Changelog.txt" />
|
||||
@ -1745,6 +1743,7 @@
|
||||
<Content Include="Icons\Help.png" />
|
||||
<Content Include="Icons\New.png" />
|
||||
<Content Include="Icons\Open.png" />
|
||||
<Content Include="Icons\RemoveTextForHI.png" />
|
||||
<Content Include="Icons\Replace.png" />
|
||||
<Content Include="Icons\Save.png" />
|
||||
<Content Include="Icons\SaveAs.png" />
|
||||
@ -1753,16 +1752,20 @@
|
||||
<Content Include="Icons\VideoToggle.png" />
|
||||
<Content Include="Icons\VisualSync.png" />
|
||||
<Content Include="Icons\WaveformToggle.png" />
|
||||
<None Include="Resources\bookmark22.png" />
|
||||
<None Include="Resources\pictureBoxFS.Image.png" />
|
||||
<None Include="Resources\pictureBoxFSDown.Image.png" />
|
||||
<None Include="Resources\pictureBoxFSOver.Image.png" />
|
||||
<None Include="Resources\pictureBoxFastForward.Image.png" />
|
||||
<None Include="Resources\pictureBoxFastForwardMouseDown.Image.png" />
|
||||
<None Include="Resources\pictureBoxFastForwardMouseOver.Image.png" />
|
||||
<None Include="Resources\pictureBoxNoFS.Image.png" />
|
||||
<None Include="Resources\pictureBoxNoFSDown.Image.png" />
|
||||
<None Include="Resources\pictureBoxNoFSOver.Image.png" />
|
||||
<None Include="Resources\pictureBoxReverse.Image.png" />
|
||||
<None Include="Resources\pictureBoxReverseMouseDown.Image.png" />
|
||||
<None Include="Resources\pictureBoxReverseMouseOver.Image.png" />
|
||||
<None Include="Resources\bookmark22.png" />
|
||||
<None Include="Resources\Transparent Background.png" />
|
||||
<Content Include="Resources\TesseractDictionaries.xml">
|
||||
<SubType>Designer</SubType>
|
||||
</Content>
|
||||
|
||||
Loading…
Reference in New Issue
Block a user