diff options
| author | l10n daemon script <[email protected]> | 2025-06-01 01:36:41 +0000 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2025-06-01 01:36:41 +0000 |
| commit | 41c7a9267f32424eda40c73ff691688173a47dbe (patch) | |
| tree | c8699d5f86d4d4874afefe81f6300fd44b8f3111 | |
| parent | 3e4d9ca10c33746cb545e930886491e6a1227e6e (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"
| -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 ec8d2b136..b82eaaecc 100755 --- a/src/org.kde.dolphin.desktop +++ b/src/org.kde.dolphin.desktop @@ -128,6 +128,7 @@ GenericName[zh_CN]=文件管理器 GenericName[zh_TW]=檔案管理員 Comment=Manage your files Comment[ar]=أدر ملفاتك +Comment[bg]=Управление на файловете Comment[ca]=Gestioneu els fitxers Comment[ca@valencia]=Gestioneu els fitxers Comment[es]=Gestión de archivos @@ -140,6 +141,7 @@ Comment[ia]=Gere tu files Comment[it]=Gestisci i tuoi file Comment[ka]=მართეთ თქვენი ფაილები Comment[nl]=Uw bestanden beheren +Comment[pl]=Zarządzaj swoimi plikami Comment[sl]=Upravlja vaše datoteke Comment[sv]=Hantera filer Comment[tr]=Dosyalarınızı yönetin |