From: l10n daemon script <scripty@kde.org>
Date: Tue, 1 Jul 2025 01:33:47 +0000 (+0000)
Subject: SVN_SILENT made messages (.desktop file) - always resolve ours
X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/commitdiff_plain/a5732d5caa262d092be00f5ec52bb7c2e90a2982?hp=e112fc50e0577449990746e1718b79e54748b61f

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 9e68c9cfb..8eb1ce0c5 100644
--- 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 d2285b61f..46ade717c 100755
--- 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