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-21 02:07:21 +00:00
parent 2e3881b14d
commit 4719013aa5
1 changed files with 3 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -9,6 +9,7 @@
"Name[ca]": "Nom real", "Name[ca]": "Nom real",
"Name[es]": "Nombre real", "Name[es]": "Nombre real",
"Name[ia]": "Nomine real", "Name[ia]": "Nomine real",
"Name[ka]": "ნამდვილი სახელი",
"Name[nl]": "Echte naam", "Name[nl]": "Echte naam",
"Name[sl]": "Pravo ime", "Name[sl]": "Pravo ime",
"Name[tr]": "Gerçek Adı", "Name[tr]": "Gerçek Adı",
@ -23,6 +24,7 @@
"Description[ca]": "Efecte ràpid", "Description[ca]": "Efecte ràpid",
"Description[es]": "Efecto rápido", "Description[es]": "Efecto rápido",
"Description[ia]": "Effecto Rapide", "Description[ia]": "Effecto Rapide",
"Description[ka]": "სწრაფი ეფექტი",
"Description[nl]": "Snel-effect", "Description[nl]": "Snel-effect",
"Description[sl]": "Hitri učinek", "Description[sl]": "Hitri učinek",
"Description[tr]": "Tez Efekt", "Description[tr]": "Tez Efekt",
@ -37,6 +39,7 @@
"Name[ca]": "Efecte ràpid", "Name[ca]": "Efecte ràpid",
"Name[es]": "Efecto rápido", "Name[es]": "Efecto rápido",
"Name[ia]": "Effecto Rapide", "Name[ia]": "Effecto Rapide",
"Name[ka]": "სწრაფი ეფექტი",
"Name[nl]": "Snel-effect", "Name[nl]": "Snel-effect",
"Name[sl]": "Hitri učinek", "Name[sl]": "Hitri učinek",
"Name[tr]": "Tez Efekt", "Name[tr]": "Tez Efekt",