mirror of
https://invent.kde.org/system/dolphin
synced 2024-10-28 03:21:56 +00:00
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"
This commit is contained in:
parent
89158c6b3d
commit
1873e2f08f
|
@ -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
|
||||
|
|
|
@ -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]=檔案管理員
|
||||
|
|
|
@ -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]=檔案管理員
|
||||
|
|
|
@ -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]=檔案管理員
|
||||
|
|
|
@ -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]=檔案管理員
|
||||
|
|
Loading…
Reference in a new issue