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-03-23 02:09:06 +00:00
parent 2a6746a921
commit 149f756ce8
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/effects/eyeonscreen/package/metadata.desktop
View file

@ -41,7 +41,7 @@ Comment=Suck windows into the desktop
Comment[ar]=تمتص النوافذ في سطح المكتب Comment[ar]=تمتص النوافذ في سطح المكتب
Comment[az]=Pəncərənin İş Masasının mərkəzinə çəkilməsi Comment[az]=Pəncərənin İş Masasının mərkəzinə çəkilməsi
Comment[ca]=Enganxa les finestres a l'escriptori Comment[ca]=Enganxa les finestres a l'escriptori
Comment[ca@valencia]=Enganxa les finestres a l'escriptori Comment[ca@valencia]=Apega les finestres a l'escriptori
Comment[de]= Fenster in die Arbeitsfläche saugen Comment[de]= Fenster in die Arbeitsfläche saugen
Comment[en_GB]=Suck windows into the desktop Comment[en_GB]=Suck windows into the desktop
Comment[es]=Aspirar las ventanas en el escritorio Comment[es]=Aspirar las ventanas en el escritorio

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

@ -4,7 +4,7 @@
"Description": "Slide back windows when another window is raised", "Description": "Slide back windows when another window is raised",
"Description[ar]": "مرر النوافذ للخلف عند صعود نافذة أخرى", "Description[ar]": "مرر النوافذ للخلف عند صعود نافذة أخرى",
"Description[az]": "Yeni pəncərə qaldırıldığında digər pəncərə arxaya sürüşür", "Description[az]": "Yeni pəncərə qaldırıldığında digər pəncərə arxaya sürüşür",
"Description[ca@valencia]": "Llisca arrere les finestres quan s'eleva una altra finestra", "Description[ca@valencia]": "Llisca enrere les finestres quan s'eleva una altra finestra",
"Description[ca]": "Llisca enrere 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[cs]": "Zasunout okna, pokud ztratí zaměření",
"Description[en_GB]": "Slide back windows when another window is raised", "Description[en_GB]": "Slide back windows when another window is raised",
@ -35,7 +35,7 @@
"Name": "Slide Back", "Name": "Slide Back",
"Name[ar]": "التمرير الخلفي", "Name[ar]": "التمرير الخلفي",
"Name[az]": "Arxasına sürüşdürmək", "Name[az]": "Arxasına sürüşdürmək",
"Name[ca@valencia]": "Llisca cap arrere", "Name[ca@valencia]": "Llisca cap enrere",
"Name[ca]": "Llisca cap enrere", "Name[ca]": "Llisca cap enrere",
"Name[cs]": "Zasunout", "Name[cs]": "Zasunout",
"Name[en_GB]": "Slide Back", "Name[en_GB]": "Slide Back",