marcoallegretti/shift-shell
1
0
Fork 0
mirror of https://invent.kde.org/marcoa/shift-shell.git synced 2026-04-26 14:23:09 +00:00
Code Issues 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-03-09 02:33:03 +00:00
parent acd8605a4f
commit 565e752a55
1 changed files with 6 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
kwin/scripts/convergentwindows/metadata.json
View file

@ -8,6 +8,8 @@
"Name[ca@valencia]": "Plata Hill", "Name[ca@valencia]": "Plata Hill",
"Name[ca]": "Plata Hill", "Name[ca]": "Plata Hill",
"Name[es]": "Plata Hill", "Name[es]": "Plata Hill",
"Name[fr]": "Plata Hill",
"Name[ka]": "Plata Hill",
"Name[nl]": "Plata Hill", "Name[nl]": "Plata Hill",
"Name[sl]": "Plata Hill", "Name[sl]": "Plata Hill",
"Name[tr]": "Plata Hill", "Name[tr]": "Plata Hill",
@ -19,6 +21,8 @@
"Description[ca@valencia]": "Elimina les decoracions de les finestres i maximitza les finestres només en la primera pantalla.", "Description[ca@valencia]": "Elimina les decoracions de les finestres i maximitza les finestres només en la primera pantalla.",
"Description[ca]": "Elimina les decoracions de les finestres i maximitza les finestres només en la primera pantalla.", "Description[ca]": "Elimina les decoracions de les finestres i maximitza les finestres només en la primera pantalla.",
"Description[es]": "Elimina las decoraciones de las ventanas y maximiza las ventanas solo en la primera pantalla.", "Description[es]": "Elimina las decoraciones de las ventanas y maximiza las ventanas solo en la primera pantalla.",
"Description[fr]": "Supprime les décorations de fenêtres et maximise les fenêtres sur le premier écran uniquement.",
"Description[ka]": "ფანჯრების მთელ ეკრანზე გაშლა და დეკორაციების მოცილება მხოლოდ პირველ ეკრანზე",
"Description[nl]": "Vensterdecoraties worden verwijderd en maximaliseert vensters alleen op het eerste scherm.", "Description[nl]": "Vensterdecoraties worden verwijderd en maximaliseert vensters alleen op het eerste scherm.",
"Description[sl]": "Odstrani dekoracije oken in maksimiziraj okna samo na prvem zaslonu.", "Description[sl]": "Odstrani dekoracije oken in maksimiziraj okna samo na prvem zaslonu.",
"Description[tr]": "Pencere dekorasyonlarını kaldırır ve pencereleri yalnızca ilk ekranda kaplatır.", "Description[tr]": "Pencere dekorasyonlarını kaldırır ve pencereleri yalnızca ilk ekranda kaplatır.",
@ -31,6 +35,8 @@
"Name[ca@valencia]": "Finestres convergents", "Name[ca@valencia]": "Finestres convergents",
"Name[ca]": "Finestres convergents", "Name[ca]": "Finestres convergents",
"Name[es]": "Ventanas convergentes", "Name[es]": "Ventanas convergentes",
"Name[fr]": "Fenêtres convergentes",
"Name[ka]": "კონვერგენტული ფანჯრები",
"Name[nl]": "Convergente vensters", "Name[nl]": "Convergente vensters",
"Name[sl]": "Convergent Windows", "Name[sl]": "Convergent Windows",
"Name[tr]": "Yakınsak Pencereler", "Name[tr]": "Yakınsak Pencereler",