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-07-31 01:49:29 +00:00
parent 63bf811200
commit 84e5d92f67
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/effects/slideback/metadata.json
View file

@ -5,7 +5,7 @@
"Description[ar]": "مرر النوافذ للخلف عند صعود نافذة أخرى",
"Description[az]": "Yeni pəncərə qaldırıldığında digər pəncərə arxaya sürüşür",
"Description[bg]": "Плъзгане на прозорците назад, когато се повдигне друг прозорец",
"Description[ca@valencia]": "Llisca enrere les finestres quan s'eleva una altra finestra",
"Description[ca@valencia]": "Llisca arrere les finestres quan s'eleva una altra finestra",
"Description[ca]": "Llisca enrere les finestres quan s'eleva una altra finestra",
"Description[cs]": "Zasunout okna, pokud ztratí zaměření",
"Description[de]": "Fenster nach hinten gleiten, wenn ein anderes Fenster aktiviert wird.",
@ -41,7 +41,7 @@
"Name[ar]": "التمرير الخلفي",
"Name[az]": "Arxasına sürüşdürmək",
"Name[bg]": "Плъзгане назад",
"Name[ca@valencia]": "Llisca cap enrere",
"Name[ca@valencia]": "Llisca cap arrere",
"Name[ca]": "Llisca cap enrere",
"Name[cs]": "Zasunout",
"Name[de]": "Nach hinten gleiten",