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"
5 years ago · 757b078d2e
parent 7e2531f33d
commit 757b078d2e
1 changed files with 1 additions and 1 deletions
--- a/kioslave/desktop/directory.trash
+++ b/kioslave/desktop/directory.trash
@ -19,7 +19,7 @@ Name[he]=אשפה
 Name[hi]=कचरा
 Name[hu]=Kuka
 Name[ia]=Corbe
-Name[id]=Sesampahan
+Name[id]=Tempat Sampah
 Name[is]=Rusl
 Name[it]=Cestino
 Name[ja]=ごみ箱