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-05-05 01:46:17 +00:00
parent 7bececfa2f
commit fa36628a8b
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/kcmkwin/kwinscripts/kwinscripts.json
View file

@ -11,6 +11,7 @@
"Description[it]": "Gestisci gli script di KWin", "Description[it]": "Gestisci gli script di KWin",
"Description[nl]": "KWin-scripts beheren", "Description[nl]": "KWin-scripts beheren",
"Description[pl]": "Zarządzanie skryptami KWin", "Description[pl]": "Zarządzanie skryptami KWin",
"Description[pt]": "Gerir os programas do KWin",
"Description[pt_BR]": "Gerencia os scripts do KWin", "Description[pt_BR]": "Gerencia os scripts do KWin",
"Description[sl]": "Upravljaj KWin Scripte", "Description[sl]": "Upravljaj KWin Scripte",
"Description[sv]": "Hantera Kwin-skript", "Description[sv]": "Hantera Kwin-skript",
@ -30,6 +31,7 @@
"Name[it]": "Script di KWin", "Name[it]": "Script di KWin",
"Name[nl]": "KWin-scripts", "Name[nl]": "KWin-scripts",
"Name[pl]": "Skrypty KWin", "Name[pl]": "Skrypty KWin",
"Name[pt]": "Programas do KWin",
"Name[pt_BR]": "Scripts do KWin", "Name[pt_BR]": "Scripts do KWin",
"Name[sl]": "KWin Scripti", "Name[sl]": "KWin Scripti",
"Name[sv]": "Kwin-skript", "Name[sv]": "Kwin-skript",