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-11-13 01:51:17 +00:00
parent 28ed199576
commit 4cb06a3713
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/effects/windowaperture/package/metadata.json
View file

@ -28,7 +28,7 @@
"Description": "Move windows into screen corners",
"Description[ar]": "تحرك النوافذ إلى زوايا الشاشة",
"Description[bg]": "Преместване на прозорците в ъглите на екрана",
"Description[ca@valencia]": "Mou les finestres cap a les cantonades de la pantalla",
"Description[ca@valencia]": "Mou les finestres cap als cantons de la pantalla",
"Description[ca]": "Mou les finestres cap a les cantonades de la pantalla",
"Description[es]": "Mover las ventanas a las esquinas de la pantalla",
"Description[eu]": "Eraman leihoak pantailako bazterretara",

2
src/kcmkwin/kwinscreenedges/kcm_kwinscreenedges.json
View file

@ -5,7 +5,7 @@
"Description[ar]": "اضبط زوايا وحواف الشاشة",
"Description[az]": "Aktiv ekran künclərini və kənarlarını tənzimləyin",
"Description[bg]": "Настройки на активните краища и ъгли на екрана",
"Description[ca@valencia]": "Configura les cantonades i vores actives de la pantalla",
"Description[ca@valencia]": "Configura els cantons i vores actives de la pantalla",
"Description[ca]": "Configura les cantonades i vores actives de la pantalla",
"Description[de]": "Aktive Bildschirmränder und -ecken einrichten",
"Description[en_GB]": "Configure active screen corners and edges",