kde/dolphin
kde/dolphin
1
0
Fork 0
mirror of https://invent.kde.org/system/dolphin synced 2024-07-04 17:30:55 +00:00
Code Issues 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 2019-01-28 05:21:42 +01:00
parent 2100a7a5c8
commit 52c019c9cb
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/dolphinpart.desktop
View File

@ -150,7 +150,7 @@ Name[sv]=Kompakt
Name[tr]=Sıkışık
Name[uk]=Компактний
Name[x-test]=xxCompactxx
Name[zh_CN]=精简视图
Name[zh_CN]=紧凑
Name[zh_TW]=簡潔模式
Icon=view-list-details
# Dummy
@ -199,7 +199,7 @@ Name[sv]=Detaljinformation
Name[tr]=Ayrıntılar
Name[uk]=Подробиці
Name[x-test]=xxDetailsxx
Name[zh_CN]=详细信息
Name[zh_CN]=详细
Name[zh_TW]=詳細模式
Icon=view-list-tree
# Dummy