diff options
| author | l10n daemon script <scripty@kde.org> | 2025-09-08 02:08:09 +0000 |
|---|---|---|
| committer | l10n daemon script <scripty@kde.org> | 2025-09-08 02:08:09 +0000 |
| commit | 97a500a3676ea3d3f7992e60479932db6e474a1e (patch) | |
| tree | 7847f3e2fddd4e5d90a411d068c97e2967d1e2e2 | |
| parent | 106897a0ccea8838b373cfb960db0ad04b7d6819 (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 | app/org.kde.krusader.desktop | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/app/org.kde.krusader.desktop b/app/org.kde.krusader.desktop index 6c7dccc80..12f2d573f 100755 --- a/app/org.kde.krusader.desktop +++ b/app/org.kde.krusader.desktop @@ -49,7 +49,6 @@ Name[sv]=Krusader Name[tr]=Krusader Name[ug]=Krusader Name[uk]=Krusader -Name[x-test]=xxKrusaderxx Name[zh_CN]=Krusader Name[zh_TW]=Krusader Exec=krusader -qwindowtitle %c %u @@ -110,7 +109,6 @@ Comment[sv]=Filhanterare med två paneler Comment[tr]=İkiz Panelli Dosya Yöneticisi Comment[ug]=قوش كۆزنەكچىسى بار ھۆججەت باشقۇرغۇ Comment[uk]=Двопанельний менеджер файлів -Comment[x-test]=xxTwin-Panel File Managerxx Comment[zh_CN]=双面板文件管理器 Comment[zh_TW]=雙面板檔案管理員 GenericName=File Manager @@ -164,6 +162,5 @@ GenericName[sv]=Filhanterare GenericName[tr]=Dosya Yöneticisi GenericName[ug]=ھۆججەت باشقۇرغۇ GenericName[uk]=Менеджер файлів -GenericName[x-test]=xxFile Managerxx GenericName[zh_CN]=文件管理器 GenericName[zh_TW]=檔案管理員 |