diff options
| author | l10n daemon script <[email protected]> | 2024-07-09 01:19:12 +0000 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2024-07-09 01:19:12 +0000 |
| commit | 22de178ad6001451eaa7e0cbf46801a18b027695 (patch) | |
| tree | 9cce95b4bf2795e1b30e68b3c0a388e3fbedf073 /src | |
| parent | 0d981e7b7df266c867004e23a169ba8cc13c8683 (diff) | |
SVN_SILENT made messages (.desktop file) - always resolve ours
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
Diffstat (limited to 'src')
| -rwxr-xr-x | src/org.kde.dolphin.desktop | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/org.kde.dolphin.desktop b/src/org.kde.dolphin.desktop index 561ed26e1..15d4421ff 100755 --- a/src/org.kde.dolphin.desktop +++ b/src/org.kde.dolphin.desktop @@ -52,6 +52,7 @@ Name[sr@ijekavianlatin]=Dolphin Name[sr@latin]=Dolphin Name[sv]=Dolphin Name[ta]=டால்பின் +Name[tok]=ilo ijo Dolphin Name[tr]=Dolphin Name[uk]=Dolphin Name[vi]=Dolphin @@ -116,6 +117,7 @@ GenericName[sr@ijekavianlatin]=Menadžer fajlova GenericName[sr@latin]=Menadžer fajlova GenericName[sv]=Filhanterare GenericName[ta]=கோப்பு உலாவி +GenericName[tok]=ilo ijo GenericName[tr]=Dosya Yöneticisi GenericName[uk]=Менеджер файлів GenericName[vi]=Trình quản lí tệp |