From a5732d5caa262d092be00f5ec52bb7c2e90a2982 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Tue, 1 Jul 2025 01:33:47 +0000 Subject: 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" --- src/itemactions/setfoldericonitemaction.json | 1 + 1 file changed, 1 insertion(+) (limited to 'src/itemactions') 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", -- cgit v1.3