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 2022-04-18 01:40:14 +00:00
parent d320756206
commit 5acf8aa792
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/effects/windowview/metadata.json
View file

@ -4,6 +4,7 @@
"Description": "Helper effect for the task manager", "Description": "Helper effect for the task manager",
"Description[ca@valencia]": "Efecte auxiliar per al gestor de tasques", "Description[ca@valencia]": "Efecte auxiliar per al gestor de tasques",
"Description[ca]": "Efecte auxiliar per al gestor de tasques", "Description[ca]": "Efecte auxiliar per al gestor de tasques",
"Description[es]": "Efecto auxiliar para el gestor de tareas",
"Description[fr]": "Effet d'assistance pour le gestionnaire de tâches", "Description[fr]": "Effet d'assistance pour le gestionnaire de tâches",
"Description[ko]": "작업 관리자용 도우미 효과", "Description[ko]": "작업 관리자용 도우미 효과",
"Description[nl]": "Effect van hulp voor de takenbeheerder", "Description[nl]": "Effect van hulp voor de takenbeheerder",
@ -17,6 +18,7 @@
"Name": "Window View", "Name": "Window View",
"Name[ca@valencia]": "Vista de finestres", "Name[ca@valencia]": "Vista de finestres",
"Name[ca]": "Vista de finestres", "Name[ca]": "Vista de finestres",
"Name[es]": "Vista de ventanas",
"Name[fr]": "Affichage en fenêtres", "Name[fr]": "Affichage en fenêtres",
"Name[ko]": "창 보기", "Name[ko]": "창 보기",
"Name[nl]": "Weergave met vensters", "Name[nl]": "Weergave met vensters",