kde/dolphin
kde/dolphin
1
0
Fork 0
mirror of https://invent.kde.org/system/dolphin synced 2024-10-05 16:19:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

SVN_SILENT made messages (.desktop file) - always resolve ours

Browse source 
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"
This commit is contained in:
l10n daemon script 2022-05-07 01:45:00 +00:00
parent 2c91112c61
commit 2e333e1b97
1 changed files with 1 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/settings/kcm/kcmdolphingeneral.json
View file

@ -27,6 +27,7 @@
"Name[az]": "Əsas",
"Name[ca@valencia]": "General",
"Name[ca]": "General",
"Name[cs]": "Obecné",
"Name[es]": "General",
"Name[fr]": "Général",
"Name[it]": "Generale",