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"

diff --git a/src/settings/kcm/kcmdolphingeneral.desktop b/src/settings/kcm/kcmdolphingeneral.desktop
index f6f996c41a2ac0b886ecab7cc4ad66b8d81d4cef..ad3453090113145cf8303188af38fa92dc083c52 100644 (file)
--- a/src/settings/kcm/kcmdolphingeneral.desktop
+++ b/src/settings/kcm/kcmdolphingeneral.desktop
@@ -248,7 +248,7 @@ X-KDE-Keywords[sr@latin]=file manager,menadžer fajlova
 X-KDE-Keywords[sv]=filhanterare
 X-KDE-Keywords[tr]=dosya yöneticisi
 X-KDE-Keywords[uk]=менеджер,керування,файл,файли
 X-KDE-Keywords[sv]=filhanterare
 X-KDE-Keywords[tr]=dosya yöneticisi
 X-KDE-Keywords[uk]=менеджер,керування,файл,файли

-X-KDE-Keywords[vi]=file manager,trình quản lí tập tin
+X-KDE-Keywords[vi]=file manager,trình quản lí tá»\87p

 X-KDE-Keywords[x-test]=xxfile managerxx
 X-KDE-Keywords[zh_CN]=文件管理器
 X-KDE-Keywords[zh_TW]=檔案管理員
 X-KDE-Keywords[x-test]=xxfile managerxx
 X-KDE-Keywords[zh_CN]=文件管理器
 X-KDE-Keywords[zh_TW]=檔案管理員

diff --git a/src/settings/kcm/kcmdolphinnavigation.desktop b/src/settings/kcm/kcmdolphinnavigation.desktop
index 1db09c88ae41c8222df570c7fb79e5fd0d03ff7b..18c0b25d64260d858228055534ec73a49695669e 100644 (file)
--- a/src/settings/kcm/kcmdolphinnavigation.desktop
+++ b/src/settings/kcm/kcmdolphinnavigation.desktop
@@ -248,7 +248,7 @@ X-KDE-Keywords[sr@latin]=file manager,menadžer fajlova
 X-KDE-Keywords[sv]=filhanterare
 X-KDE-Keywords[tr]=dosya yöneticisi
 X-KDE-Keywords[uk]=менеджер,керування,файл,файли
 X-KDE-Keywords[sv]=filhanterare
 X-KDE-Keywords[tr]=dosya yöneticisi
 X-KDE-Keywords[uk]=менеджер,керування,файл,файли

-X-KDE-Keywords[vi]=file manager,trình quản lí tập tin
+X-KDE-Keywords[vi]=file manager,trình quản lí tá»\87p

 X-KDE-Keywords[x-test]=xxfile managerxx
 X-KDE-Keywords[zh_CN]=文件管理器
 X-KDE-Keywords[zh_TW]=檔案管理員
 X-KDE-Keywords[x-test]=xxfile managerxx
 X-KDE-Keywords[zh_CN]=文件管理器
 X-KDE-Keywords[zh_TW]=檔案管理員

diff --git a/src/settings/kcm/kcmdolphinservices.desktop b/src/settings/kcm/kcmdolphinservices.desktop
index b504901b79a90e9df6be4075c2d0196d1ec1940b..e29706d1070db5c8e2e2f994c1d2962d4fe7797c 100644 (file)
--- a/src/settings/kcm/kcmdolphinservices.desktop
+++ b/src/settings/kcm/kcmdolphinservices.desktop
@@ -198,7 +198,7 @@ X-KDE-Keywords[sr@latin]=file manager,menadžer fajlova
 X-KDE-Keywords[sv]=filhanterare
 X-KDE-Keywords[tr]=dosya yöneticisi
 X-KDE-Keywords[uk]=менеджер,керування,файл,файли
 X-KDE-Keywords[sv]=filhanterare
 X-KDE-Keywords[tr]=dosya yöneticisi
 X-KDE-Keywords[uk]=менеджер,керування,файл,файли

-X-KDE-Keywords[vi]=file manager,trình quản lí tập tin
+X-KDE-Keywords[vi]=file manager,trình quản lí tá»\87p

 X-KDE-Keywords[x-test]=xxfile managerxx
 X-KDE-Keywords[zh_CN]=文件管理器
 X-KDE-Keywords[zh_TW]=檔案管理員
 X-KDE-Keywords[x-test]=xxfile managerxx
 X-KDE-Keywords[zh_CN]=文件管理器
 X-KDE-Keywords[zh_TW]=檔案管理員

diff --git a/src/settings/kcm/kcmdolphinviewmodes.desktop b/src/settings/kcm/kcmdolphinviewmodes.desktop
index 8f13ce5ab01866c1824a7e4eb4040a6d5b51ddd4..315427a8f3744a58a8108267b83ab06e6bf820cf 100644 (file)
--- a/src/settings/kcm/kcmdolphinviewmodes.desktop
+++ b/src/settings/kcm/kcmdolphinviewmodes.desktop
@@ -247,7 +247,7 @@ X-KDE-Keywords[sr@latin]=file manager,menadžer fajlova
 X-KDE-Keywords[sv]=filhanterare
 X-KDE-Keywords[tr]=dosya yöneticisi
 X-KDE-Keywords[uk]=менеджер,керування,файл,файли
 X-KDE-Keywords[sv]=filhanterare
 X-KDE-Keywords[tr]=dosya yöneticisi
 X-KDE-Keywords[uk]=менеджер,керування,файл,файли

-X-KDE-Keywords[vi]=file manager,trình quản lí tập tin
+X-KDE-Keywords[vi]=file manager,trình quản lí tá»\87p

 X-KDE-Keywords[x-test]=xxfile managerxx
 X-KDE-Keywords[zh_CN]=文件管理器
 X-KDE-Keywords[zh_TW]=檔案管理員
 X-KDE-Keywords[x-test]=xxfile managerxx
 X-KDE-Keywords[zh_CN]=文件管理器
 X-KDE-Keywords[zh_TW]=檔案管理員