Skip to content

Commit f86fbff

Browse files
jonoomphjonoomph
authored
Merge branch 'develop' into ruler-refactor
2 parents e57ac9c + e1b65f9 commit f86fbff

File tree

133 files changed

+358849
-307435
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

133 files changed

+358849
-307435
lines changed

‎src/effects/icons/bars.png

260 Bytes

‎src/effects/icons/[email protected]

41.3 KB

‎src/effects/icons/blur.png

2.83 KB

‎src/effects/icons/[email protected]

87.2 KB

‎src/effects/icons/brightness.png

1.96 KB

‎src/effects/icons/[email protected]

77.9 KB

‎src/effects/icons/caption.png

6.43 KB

‎src/effects/icons/[email protected]

78.8 KB

‎src/effects/icons/chromakey.png

2.66 KB

‎src/effects/icons/[email protected]

88.4 KB

‎src/effects/icons/colorshift.png

2.82 KB

‎src/effects/icons/[email protected]

86.3 KB

‎src/effects/icons/compressor.png

22.7 KB

‎src/effects/icons/[email protected]

80 KB

‎src/effects/icons/crop.png

5.54 KB

‎src/effects/icons/[email protected]

68.8 KB

‎src/effects/icons/deinterlace.png

2.3 KB

‎src/effects/icons/[email protected]

89.7 KB

‎src/effects/icons/delay.png

26.2 KB

‎src/effects/icons/[email protected]

92.8 KB

‎src/effects/icons/distortion.png

23.4 KB

‎src/effects/icons/[email protected]

82.7 KB

‎src/effects/icons/echo.png

23.6 KB

‎src/effects/icons/[email protected]

82 KB

‎src/effects/icons/expander.png

22.9 KB

‎src/effects/icons/[email protected]

80.7 KB

‎src/effects/icons/hue.png

3.25 KB

‎src/effects/icons/[email protected]

91.5 KB

‎src/effects/icons/mask.png

274 Bytes

‎src/effects/icons/[email protected]

29.9 KB

‎src/effects/icons/negate.png

2.67 KB

‎src/effects/icons/[email protected]

89.7 KB

‎src/effects/icons/noise.png

24.4 KB

‎src/effects/icons/[email protected]

87.7 KB

‎src/effects/icons/normalize.png

23.8 KB

‎src/effects/icons/[email protected]

85.5 KB

‎src/effects/icons/objectdetector.png

4.15 KB

‎src/effects/icons/[email protected]

65.9 KB

‎src/effects/icons/parametriceq.png

22.9 KB

‎src/effects/icons/[email protected]

81.6 KB

‎src/effects/icons/pixelate.png

3.62 KB

‎src/effects/icons/[email protected]

85.9 KB

‎src/effects/icons/robotization.png

22.3 KB

‎src/effects/icons/[email protected]

80.3 KB

‎src/effects/icons/saturation.png

2.45 KB

‎src/effects/icons/[email protected]

81.1 KB

‎src/effects/icons/shift.png

2.83 KB

‎src/effects/icons/[email protected]

86 KB

‎src/effects/icons/stabilizer.png

4.25 KB

‎src/effects/icons/[email protected]

69.2 KB

‎src/effects/icons/tracker.png

5.37 KB

‎src/effects/icons/[email protected]

66.3 KB

‎src/effects/icons/wave.png

2.66 KB

‎src/effects/icons/[email protected]

88.9 KB

‎src/effects/icons/whisperization.png

16.9 KB

‎src/effects/icons/[email protected]

59.3 KB

‎src/images/cache/compressor.png

13.8 KB

‎src/images/cache/delay.png

15.6 KB

‎src/images/cache/distortion.png

14.2 KB

‎src/images/cache/echo.png

14.4 KB

‎src/images/cache/expander.png

13.9 KB

‎src/images/cache/noise.png

14.6 KB

‎src/images/cache/parametriceq.png

13.8 KB

‎src/images/cache/robotization.png

13.7 KB

‎src/images/cache/whisperization.png

10.6 KB

‎src/language/OpenShot/OpenShot.pot

+624-524
Large diffs are not rendered by default.

‎src/language/OpenShot/OpenShot_blender.pot

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@
66
#, fuzzy
77
msgid ""
88
msgstr ""
9-
"Project-Id-Version: OpenShot Video Editor (version: 2.5.1-dev2)\n"
9+
"Project-Id-Version: OpenShot Video Editor (version: 2.5.1-dev3)\n"
1010
"Report-Msgid-Bugs-To: Jonathan Thomas <[email protected]>\n"
11-
"POT-Creation-Date: 2021-02-18 16:39:21.345207\n"
11+
"POT-Creation-Date: 2021-07-21 13:13:29.189114\n"
1212
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
1313
"Last-Translator: Jonathan Thomas <[email protected]>\n"
1414
"Language-Team: https://translations.launchpad.net/+groups/launchpad-translators\n"

‎src/language/OpenShot/OpenShot_emojis.pot

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@
66
#, fuzzy
77
msgid ""
88
msgstr ""
9-
"Project-Id-Version: OpenShot Video Editor (version: 2.5.1-dev2)\n"
9+
"Project-Id-Version: OpenShot Video Editor (version: 2.5.1-dev3)\n"
1010
"Report-Msgid-Bugs-To: Jonathan Thomas <[email protected]>\n"
11-
"POT-Creation-Date: 2021-02-18 16:39:21.345207\n"
11+
"POT-Creation-Date: 2021-07-21 13:13:29.189114\n"
1212
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
1313
"Last-Translator: Jonathan Thomas <[email protected]>\n"
1414
"Language-Team: https://translations.launchpad.net/+groups/launchpad-translators\n"

‎src/language/OpenShot/OpenShot_transitions.pot

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@
66
#, fuzzy
77
msgid ""
88
msgstr ""
9-
"Project-Id-Version: OpenShot Video Editor (version: 2.5.1-dev2)\n"
9+
"Project-Id-Version: OpenShot Video Editor (version: 2.5.1-dev3)\n"
1010
"Report-Msgid-Bugs-To: Jonathan Thomas <[email protected]>\n"
11-
"POT-Creation-Date: 2021-02-18 16:39:21.345207\n"
11+
"POT-Creation-Date: 2021-07-21 13:13:29.189114\n"
1212
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
1313
"Last-Translator: Jonathan Thomas <[email protected]>\n"
1414
"Language-Team: https://translations.launchpad.net/+groups/launchpad-translators\n"

0 commit comments

Comments
 (0)