kde/dolphin
kde/dolphin
1
0
Fork 0
mirror of https://invent.kde.org/system/dolphin synced 2024-10-28 03:21:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

SVN_SILENT made messages (.desktop file) - always resolve ours

Browse source 
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"
This commit is contained in:
l10n daemon script 2020-09-23 06:39:00 +02:00
parent 15928112ce
commit 06d629ec6e
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/views/versioncontrol/fileviewversioncontrolplugin.desktop
View file

@ -45,7 +45,7 @@ Comment[sr@latin]=Priključak upravljanja verzijama za fajl prikaze
Comment[sv]=Insticksprogram för versionskontroll i filvyer Comment[sv]=Insticksprogram för versionskontroll i filvyer
Comment[tr]=Dosya Görünümleri için Sürüm Kontrol Eklentisi Comment[tr]=Dosya Görünümleri için Sürüm Kontrol Eklentisi
Comment[uk]=Додаток керування версіями для панелей перегляду файлів Comment[uk]=Додаток керування версіями для панелей перегляду файлів
Comment[vi]=Phần bổ sung Quản lí Phiên bản cho khung xem tệp Comment[vi]=Phần cài cắm "Quản lí phiên bản" cho khung xem tệp
Comment[x-test]=xxVersion Control Plugin for File Viewsxx Comment[x-test]=xxVersion Control Plugin for File Viewsxx
Comment[zh_CN]=文件视图的版本控制插件 Comment[zh_CN]=文件视图的版本控制插件
Comment[zh_TW]=檔案檢視的版本控制外掛程式 Comment[zh_TW]=檔案檢視的版本控制外掛程式