kde/dolphin
kde/dolphin
1
0
Fork 0
mirror of https://invent.kde.org/system/dolphin synced 2024-08-22 01:40:02 +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 2019-01-06 08:35:14 +01:00
parent 504db3f702
commit 5d9ad8d24f
5 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/dolphinpart.desktop
View file

@ -101,7 +101,7 @@ Name[sv]=Ikoner
Name[tr]=Simgeler
Name[uk]=Піктограми
Name[x-test]=xxIconsxx
Name[zh_CN]=图标视图
Name[zh_CN]=图标
Name[zh_TW]=圖示
Icon=view-list-icons
# Dummy
@ -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

2
src/settings/kcm/kcmdolphingeneral.desktop
View file

@ -226,5 +226,5 @@ X-KDE-Keywords[sv]=filhanterare
X-KDE-Keywords[tr]=dosya yöneticisi
X-KDE-Keywords[uk]=менеджер,керування,файл,файли
X-KDE-Keywords[x-test]=xxfile managerxx
X-KDE-Keywords[zh_CN]=file manager,文件管理器
X-KDE-Keywords[zh_CN]=文件管理器
X-KDE-Keywords[zh_TW]=檔案管理員

2
src/settings/kcm/kcmdolphinnavigation.desktop
View file

@ -227,5 +227,5 @@ X-KDE-Keywords[sv]=filhanterare
X-KDE-Keywords[tr]=dosya yöneticisi
X-KDE-Keywords[uk]=менеджер,керування,файл,файли
X-KDE-Keywords[x-test]=xxfile managerxx
X-KDE-Keywords[zh_CN]=file manager,文件管理器
X-KDE-Keywords[zh_CN]=文件管理器
X-KDE-Keywords[zh_TW]=檔案管理員

2
src/settings/kcm/kcmdolphinservices.desktop
View file

@ -181,5 +181,5 @@ X-KDE-Keywords[sv]=filhanterare
X-KDE-Keywords[tr]=dosya yöneticisi
X-KDE-Keywords[uk]=менеджер,керування,файл,файли
X-KDE-Keywords[x-test]=xxfile managerxx
X-KDE-Keywords[zh_CN]=file manager,文件管理器
X-KDE-Keywords[zh_CN]=文件管理器
X-KDE-Keywords[zh_TW]=檔案管理員

2
src/settings/kcm/kcmdolphinviewmodes.desktop
View file

@ -226,5 +226,5 @@ X-KDE-Keywords[sv]=filhanterare
X-KDE-Keywords[tr]=dosya yöneticisi
X-KDE-Keywords[uk]=менеджер,керування,файл,файли
X-KDE-Keywords[x-test]=xxfile managerxx
X-KDE-Keywords[zh_CN]=file manager,文件管理器
X-KDE-Keywords[zh_CN]=文件管理器
X-KDE-Keywords[zh_TW]=檔案管理員