yukijoou/kwin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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 2023-07-16 02:28:09 +00:00
parent b823747c3b
commit 1db9259bf9
1 changed files with 2 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/plugins/kdecorations/aurorae/src/config/kcm_auroraeconfig.json
View file

@ -16,6 +16,7 @@
"Description[it]": "Motore dei temi delle decorazioni delle finestre",
"Description[ka]": "ფანჯრის დეკორაციის თემის ძრავა",
"Description[nl]": "Engine voor thema van vensterdecoraties",
"Description[nn]": "Vindaugsdekorasjon-temamotor",
"Description[pl]": "Silnik wyglądu okien",
"Description[sl]": "Stroj za teme okrasitev oken",
"Description[tr]": "Pencere Dekorasyon Teması İşletkesi",
@ -39,6 +40,7 @@
"Name[it]": "Aurorae",
"Name[ka]": "ავრორა",
"Name[nl]": "Aurorae",
"Name[nn]": "Aurorae",
"Name[pl]": "Aurorae",
"Name[sl]": "Aurorae",
"Name[tr]": "Aurorae",