┌   ┐
54
└   ┘

summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorl10n daemon script <[email protected]>2025-07-01 01:33:47 +0000
committerl10n daemon script <[email protected]>2025-07-01 01:33:47 +0000
commita5732d5caa262d092be00f5ec52bb7c2e90a2982 (patch)
treecc326d0f3fa6288369ee9ce7cc9e955feef8788f /src
parente112fc50e0577449990746e1718b79e54748b61f (diff)
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"
Diffstat (limited to 'src')
-rw-r--r--src/itemactions/setfoldericonitemaction.json1
-rwxr-xr-xsrc/org.kde.dolphin.desktop1
2 files changed, 2 insertions, 0 deletions
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