]> cloud.milkyroute.net Git - dolphin.git/commitdiff
projects / dolphin.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 104213a)
SVN_SILENT made messages (.desktop file) - always resolve ours
authorl10n daemon script <scripty@kde.org>
Mon, 6 Mar 2023 01:43:29 +0000 (01:43 +0000)
committerl10n daemon script <scripty@kde.org>
Mon, 6 Mar 2023 01:43:29 +0000 (01:43 +0000)
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/dolphinpartactions.desktop patch | blob | blame | history

diff --git a/src/dolphinpartactions.desktop b/src/dolphinpartactions.desktop
index ae36ac0d98b3a9bda44d2335fe7ffb096cff0500..9a547f0cadb1772c396ff72aae2e033c5fbc660b 100644 (file)
--- a/src/dolphinpartactions.desktop
+++ b/src/dolphinpartactions.desktop
@@ -107,7 +107,7 @@ Name[nb]=Kompakt
 Name[nl]=Compact
 Name[nn]=Kompakt
 Name[pa]=ਸੰਖੇਪ
 Name[nl]=Compact
 Name[nn]=Kompakt
 Name[pa]=ਸੰਖੇਪ
-Name[pl]=Kompaktowy
+Name[pl]=Zwarty
 Name[pt]=Compacta
 Name[pt_BR]=Compacto
 Name[ro]=Compactă
 Name[pt]=Compacta
 Name[pt_BR]=Compacto
 Name[ro]=Compactă