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-10-23 02:08:50 +00:00
parent 0d3b017b23
commit 5d55ee4a0c
1 changed files with 4 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
examples/quick-effect/package/metadata.json
View file

@ -8,12 +8,14 @@
"Name[ca@valencia]": "Nom real",
"Name[ca]": "Nom real",
"Name[es]": "Nombre real",
"Name[eu]": "Benetako izena",
"Name[fr]": "Nom réel",
"Name[ia]": "Nomine real",
"Name[ka]": "ნამდვილი სახელი",
"Name[nl]": "Echte naam",
"Name[pl]": "Rzeczywista nazwa",
"Name[sl]": "Pravo ime",
"Name[ta]": "உண்மையான பெயர்",
"Name[tr]": "Gerçek Adı",
"Name[uk]": "Справжнє ім'я",
"Name[x-test]": "xxReal Namexx",
@ -25,6 +27,7 @@
"Description[ca@valencia]": "Efecte ràpid",
"Description[ca]": "Efecte ràpid",
"Description[es]": "Efecto rápido",
"Description[eu]": "Efektu azkarra",
"Description[fr]": "Effet rapide",
"Description[ia]": "Effecto Rapide",
"Description[ka]": "სწრაფი ეფექტი",
@ -42,6 +45,7 @@
"Name[ca@valencia]": "Efecte ràpid",
"Name[ca]": "Efecte ràpid",
"Name[es]": "Efecto rápido",
"Name[eu]": "Efektu azkarra",
"Name[fr]": "Effet rapide",
"Name[ia]": "Effecto Rapide",
"Name[ka]": "სწრაფი ეფექტი",