Skip to content

chore(i18n): Correct capitalization of 'FFmpeg' #1433

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
marcelklehr merged 2 commits into from
Dec 22, 2025
Merged

chore(i18n): Correct capitalization of 'FFmpeg' #1433

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
007de70
chore(i18n): Correct capitalization of 'FFmpeg'
rakekniven Dec 20, 2025
1a65080
chore(i18n): Correct capitalization of 'FFmpeg'
rakekniven Dec 20, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -179,7 +179,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
* fix(FileListener): Listen to file movements across share boundaries
* fix plsatform check (Thanks to @mr-bryn)
* Fixed spelling mistake in appinfo/routes.php (Thanks to @asp.nut)
* fix(InstallDeps): Use ffmpegDir to install ffmpeg
* fix(InstallDeps): Use ffmpegDir to install FFmpeg

## [6.1.0] - 2024-02-28

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

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

Expand Down
8 changes: 4 additions & 4 deletions src/components/ViewAdmin.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -331,16 +331,16 @@
</NcSettingsSection>
<NcSettingsSection :name="t('recognize', 'FFMPEG')">
<p v-if="ffmpeg === undefined">
<span class="icon-loading-small" />&nbsp;&nbsp;&nbsp;&nbsp;{{ t('recognize', 'Checking FFMPEG') }}
<span class="icon-loading-small" />&nbsp;&nbsp;&nbsp;&nbsp;{{ t('recognize', 'Checking FFmpeg') }}
</p>
<NcNoteCard v-else-if="ffmpeg === false" type="warning">
{{ t('recognize', 'Could not execute the ffmpeg binary. You may need to set the path to a working binary manually.') }}
{{ t('recognize', 'Could not execute the FFmpeg binary. You may need to set the path to a working binary manually.') }}
</NcNoteCard>
<NcNoteCard v-else type="success">
{{ t('recognize', 'ffmpeg {version} binary was installed successfully.', { version: ffmpeg }) }}
{{ t('recognize', 'FFmpeg {version} binary was installed successfully.', { version: ffmpeg }) }}
</NcNoteCard>
<p>
{{ 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.') }}
{{ 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.') }}
</p>
<p>
<NcTextField :value.sync="settings['ffmpeg_binary']" @update:value="onChange" />
Expand Down
Loading