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-04-10 02:20:04 +00:00
parent 72547cce46
commit fd0ebf4f93
1 changed files with 3 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -10,6 +10,7 @@
"Name[cs]": "Plata Hill", "Name[cs]": "Plata Hill",
"Name[en_GB]": "Plata Hill", "Name[en_GB]": "Plata Hill",
"Name[es]": "Plata Hill", "Name[es]": "Plata Hill",
"Name[eu]": "Plata Hill",
"Name[fi]": "Plata Hill", "Name[fi]": "Plata Hill",
"Name[fr]": "Plata Hill", "Name[fr]": "Plata Hill",
"Name[ia]": "Plata Hill", "Name[ia]": "Plata Hill",
@ -30,6 +31,7 @@
"Description[cs]": "Odstraní dekorace oken a maximalizuje je pouze na první obrazovce.", "Description[cs]": "Odstraní dekorace oken a maximalizuje je pouze na první obrazovce.",
"Description[en_GB]": "Removes window decorations and maximises windows on the first screen only.", "Description[en_GB]": "Removes window decorations and maximises windows on the first screen only.",
"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[eu]": "Leihoko apaingarriak kendu eta leihoak maximizatzen ditu, lehenengo pantailan bakarrik.",
"Description[fi]": "Poistaa ikkunakoristeet ja suurentaa ikkunat vain ensimmäisellä näytöllä.", "Description[fi]": "Poistaa ikkunakoristeet ja suurentaa ikkunat vain ensimmäisellä näytöllä.",
"Description[fr]": "Supprime les décorations de fenêtres et maximise les fenêtres sur le premier écran uniquement.", "Description[fr]": "Supprime les décorations de fenêtres et maximise les fenêtres sur le premier écran uniquement.",
"Description[ia]": "Remove decorationes de fenestra e maximiza fenestra solmente sur prime schermo.", "Description[ia]": "Remove decorationes de fenestra e maximiza fenestra solmente sur prime schermo.",
@ -49,6 +51,7 @@
"Name[ca]": "Finestres convergents", "Name[ca]": "Finestres convergents",
"Name[en_GB]": "Convergent Windows", "Name[en_GB]": "Convergent Windows",
"Name[es]": "Ventanas convergentes", "Name[es]": "Ventanas convergentes",
"Name[eu]": "Leiho konbergenteak",
"Name[fi]": "Mukautuvat ikkunat", "Name[fi]": "Mukautuvat ikkunat",
"Name[fr]": "Fenêtres convergentes", "Name[fr]": "Fenêtres convergentes",
"Name[ia]": "Fenestras Convergente", "Name[ia]": "Fenestras Convergente",