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"

1 files changed, 3 insertions, 0 deletions

diff --git a/src/org.kde.dolphin.desktop b/src/org.kde.dolphin.desktop
index a9dea916e..66f4ddf70 100755
--- a/src/org.kde.dolphin.desktop
+++ b/src/org.kde.dolphin.desktop
@@ -25,6 +25,7 @@ Name[id]=Dolphin
 Name[is]=Dolphin
 Name[it]=Dolphin
 Name[ja]=Dolphin
+Name[ka]=Dolphin
 Name[ko]=Dolphin
 Name[lt]=Dolphin
 Name[lv]=Dolphin
@@ -85,6 +86,7 @@ GenericName[id]=Pengelola File
 GenericName[is]=Skráastjóri
 GenericName[it]=Gestore dei file
 GenericName[ja]=ファイルマネージャ
+GenericName[ka]=ფაილების მმართველი
 GenericName[ko]=파일 관리자
 GenericName[lt]=Failų tvarkytuvė
 GenericName[lv]=Datņu pārvaldnieks
@@ -136,6 +138,7 @@ Keywords[ia]=files; gestion de file; navigation de file;samba; partes de rete;Ex
 Keywords[id]=files;file management;file browsing;samba;network shares;Explorer;Finder;manajer;
 Keywords[is]=skrár;skráastjórn;skráaskoðun;samba;netsameignir;Explorer;Finder;
 Keywords[it]=file;gestione dei file;navigazione dei file;samba;condivisioni di rete;Explorer;Finder;
+Keywords[ka]=files;file management;file browsing;samba;network shares;Explorer;Finder;
 Keywords[ko]=files;file management;file browsing;samba;network shares;Explorer;Finder;파일;파일 관리;파일 관리자;탐색;탐색기;삼바;네트워크 공유;
 Keywords[nl]=bestanden;bestandsbeheer;bladeren in bestanden;samba;netwerk-shares;verkenner;zoeksysteem;
 Keywords[nn]=filer;filhandsaming;filutforsking;samba;nettverksressursar;Explorer;Finder;