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/itemactions/setfoldericonitemaction.json b/src/itemactions/setfoldericonitemaction.json
index 9e68c9cfbc8497a53e9e42f8f4b36ac8aa9175b4..8eb1ce0c58e9432e46de053e18774a483349ba88 100644 (file)
--- a/src/itemactions/setfoldericonitemaction.json
+++ b/src/itemactions/setfoldericonitemaction.json
@@ -17,6 +17,7 @@
         "Name[it]": "Imposta icona della cartella",
         "Name[ka]": "საქაღალდის ხატულას დაყენება",
         "Name[ko]": "폴더 아이콘 설정",
+        "Name[lv]": "Norādīt datnes ikonu",
         "Name[nl]": "Mappictogram instellen",
         "Name[pl]": "Ustaw ikonę katalogu",
         "Name[sl]": "Nastavi ikono mape",

diff --git a/src/org.kde.dolphin.desktop b/src/org.kde.dolphin.desktop
index d2285b61ff0d887cf90bbb650d617e22fadc8c53..46ade717ce1c5cf9ee2f04745498c814b874c2b2 100755 (executable)
--- a/src/org.kde.dolphin.desktop
+++ b/src/org.kde.dolphin.desktop
@@ -142,6 +142,7 @@ Comment[is]=Hafðu umsjón með skránum þínum
 Comment[it]=Gestisci i tuoi file
 Comment[ka]=მართეთ თქვენი ფაილები
 Comment[ko]=내 파일 관리
+Comment[lv]=Pārvaldiet ierīces datnes
 Comment[nl]=Uw bestanden beheren
 Comment[pl]=Zarządzaj swoimi plikami
 Comment[pt_BR]=Gerencie seus arquivos