Mirrors/SubtitleEdit
1
0
Fork 0
mirror of https://github.com/SubtitleEdit/subtitleedit.git synced 2024-11-25 20:52:44 +01:00
Code Issues Projects Releases Wiki Activity
16,014 Commits 4 Branches 60 Tags 350 MiB
cc8346b825
Commit Graph

16014 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
OmrSi
cc8346b825 Cancel on escape 2022-09-08 01:55:25 +03:00
OmrSi
6ee9755727 Take subtitle filename for empty video 2022-09-08 01:55:25 +03:00
niksedk
9ab607ae87 Will need to keep LanguageMaster for a little while... 2022-09-07 20:22:58 +02:00
niksedk
2623a3a5f1 Fix minor issue with master 2 main 2022-09-07 20:18:38 +02:00
niksedk
1bc1eeee63 Fix typo - thx hugok79 :) 
Fix #6229
 2022-09-07 20:10:33 +02:00
niksedk
9c5c1e7347 Change master to main 2022-09-07 19:50:03 +02:00
niksedk
4c3197d93a Update change log 2022-09-07 19:49:30 +02:00
niksedk
edd9828785 Update language base 2022-09-07 17:36:22 +02:00
Nikolaj Olsson
76c823611e
Merge pull request #6224 from Flitskikker/feature/convert-colors-to-dialog 
"Convert colors to dialog" improvements
 2022-09-07 11:34:39 -04:00
Nikolaj Olsson
8cc9e8cd78
Merge pull request #6223 from bovirus/patch-8 
Update italian language
 2022-09-07 11:24:54 -04:00
Martijn van Berkel (Flitskikker)
57705c12d2 Don't add dashes if there are already dashes, use safe substring, add some unit tests 2022-09-07 17:22:05 +02:00
bovirus
3d89506b45
Update italian language 
@niksedk 

Please merge. Thanks.
 2022-09-07 11:03:27 +02:00
Nikolaj Olsson
b382aac4a5
Merge pull request #6218 from Flitskikker/feature/convert-colors-to-dialog 
Add "Convert colors to dialog" tool
 2022-09-07 00:17:30 -04:00
Nikolaj Olsson
1eb4c1fd23
Merge pull request #6221 from nkh0472/patch-52 
Update zh-Hans.xml
 2022-09-07 00:16:23 -04:00
nkh0472
a03bdc1326
Update zh-Hans.xml 2022-09-07 10:33:34 +08:00
niksedk
bce1b3fa74 Rename English translation base xml file 2022-09-06 19:51:02 +02:00
niksedk
e9dea6b1ca Update English language file 2022-09-06 19:37:45 +02:00
niksedk
0c5abfdd80 Improve format SmartTitler -thx George :) 2022-09-06 18:31:05 +02:00
Nikolaj Olsson
26425b6a48
Merge pull request #6220 from nkh0472/patch-35 
Update zh-Hans.xml
 2022-09-06 12:21:01 -04:00
Martijn van Berkel (Flitskikker)
af58d46763 Merge branch 'master' into feature/convert-colors-to-dialog 
# Conflicts:
#	src/libse/Common/Settings.cs
#	src/ui/Forms/BatchConvert.Designer.cs
#	src/ui/Forms/BatchConvert.cs
 2022-09-06 18:12:47 +02:00
nkh0472
f0f0c11297
Update zh-Hans.xml 
For commit 82f0d86f9e
 2022-09-06 20:41:33 +08:00
Nikolaj Olsson
42f3c92b90
Merge pull request #6213 from OmrSi/color-picker-add-hex 
Show HEX and ASSA color with RGB and copy on click
 2022-09-05 23:59:18 -04:00
OmrSi
cd6915a644 Set cursor for control (much better performance) 2022-09-06 03:24:22 +03:00
OmrSi
8ecad1c380 Fix possible crach 2022-09-06 03:23:13 +03:00
OmrSi
82f0d86f9e Shift to a context menu copy options 2022-09-06 03:22:39 +03:00
Nikolaj Olsson
ea891e0a5b
Merge pull request #6217 from Flitskikker/feature/mergesametimecodes-makedialog 
Add "Make dialog" option to "Merge lines with the same time codes"
 2022-09-05 10:37:53 -04:00
niksedk
0f4b6a648a Update Bulgarian translation - thx Калин :) 2022-09-05 16:31:59 +02:00
niksedk
430e0977be Fixes for new format - thx George :) 2022-09-05 06:31:34 +02:00
niksedk
8c8cf595e8 Update Korean translation - thx domddol :) 2022-09-05 06:10:57 +02:00
niksedk
9eb1a8c440 Add new sub format "Magic Video Titler" - thx George :) 2022-09-04 22:08:21 +02:00
niksedk
86fc3cf3f3 Rename format TEK to "Smart Titler" - thx George :) 2022-09-04 21:33:18 +02:00
niksedk
f72ea2c8f6 Work on LRC 2022-09-04 21:11:04 +02:00
niksedk
57a70274a1 Merge branch 'master' of https://github.com/SubtitleEdit/subtitleedit 2022-09-04 20:54:20 +02:00
niksedk
fe4ca65cea Add LRC without end-time format - thx lollita :) 
Work on #6214
 2022-09-04 20:54:06 +02:00
Martijn van Berkel (Flitskikker)
2c98493a79 Batch convert, optimizations, main form logic 2022-09-04 20:20:30 +02:00
Martijn van Berkel (Flitskikker)
fdfcef6659 Work on Convert colors to dialog 2022-09-04 19:24:16 +02:00
Martijn van Berkel (Flitskikker)
1f02b56b22 Add controls to batch convert form 2022-09-04 17:04:40 +02:00
Nikolaj Olsson
d2839a4c29
Merge pull request #6216 from bovirus/patch-7 
Update Italian language
 2022-09-04 08:06:04 -04:00
bovirus
3b4512914f
Update Italian language 
@niksedk 

Please check and merge. Thanks.
 2022-09-04 12:57:23 +02:00
OmrSi
7008c50840 Show HEX and ASSA color with RGB and copy on click 2022-09-04 01:19:29 +03:00
niksedk
5f2ce383ef Merge branch 'master' of https://github.com/SubtitleEdit/subtitleedit 2022-09-03 22:31:23 +02:00
niksedk
1fbce2f7bf Try to make color picker/image color picker easier to use - the Eric :) 2022-09-03 22:31:17 +02:00
Nikolaj Olsson
abfe756de6
Merge pull request #6212 from OmrSi/remove-arabic-comma-processing 
Remove Arabic comma processing for richtextbox
 2022-09-03 15:34:39 -04:00
niksedk
0d253e929a Add check for ffmpeg in "image color picker" 2022-09-03 20:09:42 +02:00
OmrSi
432661c2b8 Remove Arabic comma processing for richtextbox 2022-09-03 20:56:54 +03:00
niksedk
2adc9b4493 Set focus on "Generate button" on window show for generate video+hard-burn 2022-09-03 19:42:24 +02:00
niksedk
c297aebfb3 Update language file 2022-09-03 19:41:32 +02:00
niksedk
118a628938 Update change log 2022-09-03 19:41:10 +02:00
niksedk
58a1d69b7f Add color picker from main window (assa context menu or shortcut) 2022-09-03 18:51:55 +02:00
niksedk
f9d42ead11 Merge branch 'master' of https://github.com/SubtitleEdit/subtitleedit 2022-09-03 17:30:39 +02:00