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/dolphinpart.json.in b/src/dolphinpart.json.in
index 58c0d9a9cc3e4447b33cf3ef78bc3c01a6f8d728..445e309ef99341378c2843b08ef3ccf491fdf0c0 100644 (file)
--- a/src/dolphinpart.json.in
+++ b/src/dolphinpart.json.in
@@ -37,7 +37,7 @@
         "Name[ka]": "Dolphin -ის ხედი",
         "Name[ko]": "Dolphin 보기",
         "Name[lt]": "Dolphin rodinys",
-        "Name[lv]": "Dolphin skats",
+        "Name[lv]": "„Dolphin“ skats",
         "Name[ml]": "ഡോള്‍ഫിന്‍ അവതരണരീതി",
         "Name[my]": "လင်းပိုင် မြင်ကွင်း",
         "Name[nb]": "Dolphin-visning",

diff --git a/src/dolphinpartactions.desktop b/src/dolphinpartactions.desktop
index 52cdf58c05926a8ea46c805c031127fc3c3d4048..d6f15b4de7dcabdcc43e2ee61fb9e139241676d6 100644 (file)
--- a/src/dolphinpartactions.desktop
+++ b/src/dolphinpartactions.desktop
@@ -164,7 +164,7 @@ Name[ja]=詳細
 Name[ka]=დეტალები
 Name[ko]=자세히
 Name[lt]=Išsamus
-Name[lv]=Detaļas
+Name[lv]=Informācija
 Name[ml]=വിശദമായി
 Name[my]=အသေးစိတ်
 Name[nb]=Detaljer

diff --git a/src/org.kde.dolphin.desktop b/src/org.kde.dolphin.desktop
index d8baa93a5eb9b0e2c452666b4362f45407181122..674977ace4d9e3d1409d8750472f5f1090464960 100755 (executable)
--- a/src/org.kde.dolphin.desktop
+++ b/src/org.kde.dolphin.desktop
@@ -154,6 +154,7 @@ Keywords[it]=file;gestione dei file;navigazione dei file;samba;condivisioni di r
 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[lt]=failai;failų valdymas;failu valdymas;failų tvarkymas;failu tvarkymas;failų naršymas;failu narsymas;samba;tinklo viešiniai;tinklo viesiniai;Finder;Explorer
+Keywords[lv]=datnes;faili;datņu pārvaldnieks;datņu pārlūks;failu pārvaldnieks;failu pārlūks;samba;tīkls;Explorer;Finder;
 Keywords[nb]=filer;filbehandling;filutforskning;samba;nettverksressurser;Explorer;Finder;
 Keywords[nl]=bestanden;bestandsbeheer;bladeren in bestanden;samba;netwerk-shares;verkenner;zoeksysteem;
 Keywords[nn]=filer;filhandsaming;filutforsking;samba;nettverksressursar;Explorer;Finder;

diff --git a/src/settings/kcm/kcmdolphingeneral.json b/src/settings/kcm/kcmdolphingeneral.json
index 5c15b5a71871c9a4c7582841c33cb40ccf9baf46..975e181b76e6b536ce53d2f0511af36bdb7fe989 100644 (file)
--- a/src/settings/kcm/kcmdolphingeneral.json
+++ b/src/settings/kcm/kcmdolphingeneral.json
@@ -30,6 +30,7 @@
         "Name[ka]": "მთავარი",
         "Name[ko]": "일반",
         "Name[lt]": "Bendrosios",
+        "Name[lv]": "Vispārīgi",
         "Name[nb]": "Generelt",
         "Name[nl]": "Algemeen",
         "Name[nn]": "Generelt",