Skip to content

Commit fc1ad13

Browse files
authored
Merge pull request #1433 from nextcloud/rakekniven-patch-1
chore(i18n): Correct capitalization of 'FFmpeg'
2 parents 74db209 + 1a65080 commit fc1ad13

File tree

2 files changed

+8
-8
lines changed

2 files changed

+8
-8
lines changed

CHANGELOG.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -192,7 +192,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
192192
* fix(FileListener): Listen to file movements across share boundaries
193193
* fix plsatform check (Thanks to @mr-bryn)
194194
* Fixed spelling mistake in appinfo/routes.php (Thanks to @asp.nut)
195-
* fix(InstallDeps): Use ffmpegDir to install ffmpeg
195+
* fix(InstallDeps): Use ffmpegDir to install FFmpeg
196196

197197
## [6.1.0] - 2024-02-28
198198

@@ -410,7 +410,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
410410
- Copy face detections to sharees on ShareCreated; Delete them on ShareDeleted
411411
- Add face detections for all users that can see the file
412412
- Implement code paths for moving files
413-
- limit ffmpeg CPU core usage according to settings
413+
- limit FFmpeg CPU core usage according to settings
414414
- Utilize mozart to avoid dependency hell
415415
- Update translations from Transifex
416416
- Add note about 1-core policy for WASM
@@ -446,7 +446,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
446446

447447
### Fixed
448448
- Add Migration step: Add index for detections#file_id column
449-
- Run custom ffmpeg install in InstallDeps (Support musicnn,movinet on ARM)
449+
- Run custom FFmpeg install in InstallDeps (Support musicnn,movinet on ARM)
450450
- MusicnnClassifier: Increase WASM timeout
451451
- ClusteringFaceClassifier: Filter out non-straight faces
452452
- Set max execution time for classifier cron job
@@ -688,7 +688,7 @@ Drop support for Nextcloud 24
688688
- ViewAdmin: Clarify node path setting description
689689
- ViewAdmin: Add examples for each tagging setting
690690
- ViewAdmin: Update Note about background job interval
691-
- InstallDeps: Fix ffmpeg
691+
- InstallDeps: Fix FFmpeg
692692
- Settings: Allow enabling geo tagging
693693
- Fine-tune musicnn
694694

src/components/ViewAdmin.vue

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -331,16 +331,16 @@
331331
</NcSettingsSection>
332332
<NcSettingsSection :name="t('recognize', 'FFMPEG')">
333333
<p v-if="ffmpeg === undefined">
334-
<span class="icon-loading-small" />&nbsp;&nbsp;&nbsp;&nbsp;{{ t('recognize', 'Checking FFMPEG') }}
334+
<span class="icon-loading-small" />&nbsp;&nbsp;&nbsp;&nbsp;{{ t('recognize', 'Checking FFmpeg') }}
335335
</p>
336336
<NcNoteCard v-else-if="ffmpeg === false" type="warning">
337-
{{ t('recognize', 'Could not execute the ffmpeg binary. You may need to set the path to a working binary manually.') }}
337+
{{ t('recognize', 'Could not execute the FFmpeg binary. You may need to set the path to a working binary manually.') }}
338338
</NcNoteCard>
339339
<NcNoteCard v-else type="success">
340-
{{ t('recognize', 'ffmpeg {version} binary was installed successfully.', { version: ffmpeg }) }}
340+
{{ t('recognize', 'FFmpeg {version} binary was installed successfully.', { version: ffmpeg }) }}
341341
</NcNoteCard>
342342
<p>
343-
{{ t('recognize', 'If the shipped ffmpeg binary doesn\'t work on your system for some reason you can set the path to a custom ffmpeg binary.') }}
343+
{{ t('recognize', 'If the shipped FFmpeg binary doesn\'t work on your system for some reason you can set the path to a custom FFmpeg binary.') }}
344344
</p>
345345
<p>
346346
<NcTextField :value.sync="settings['ffmpeg_binary']" @update:value="onChange" />

0 commit comments

Comments
 (0)