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 2023-01-17 02:03:45 +00:00
parent d42442b424
commit 03c407cb7d
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

@ -66,7 +66,7 @@
"Name[ar]": "إزاحة النوافذ",
"Name[be]": "Аконная дыяфрагма",
"Name[bg]": "Апертура на прозорци",
"Name[ca@valencia]": "Obertura de la finestra",
"Name[ca@valencia]": "Obriu la finestra",
"Name[ca]": "Obertura de la finestra",
"Name[cs]": "Mřížka oken",
"Name[en_GB]": "Window Aperture",

2
src/kcms/compositing/kwincompositing.json
View file

@ -6,7 +6,7 @@
"Description[az]": "İş masası effektləri üçün düzücü ayarları",
"Description[be]": "Налады сродку кампазітынгу для эфектаў працоўнага стала",
"Description[bg]": "Настройки на композитора за ефекти на работния плот",
"Description[ca@valencia]": "Configuració del compositor per als efectes de l'escriptori",
"Description[ca@valencia]": "Configureu el compositor per als efectes de l'escriptori",
"Description[ca]": "Arranjament del compositor per als efectes d'escriptori",
"Description[de]": "Compositor-Einstellungen für Arbeitsflächen-Effekte",
"Description[en_GB]": "Compositor Settings for Desktop Effects",