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 2019-09-18 05:37:05 +02:00
parent dcf91d4321
commit 44aeeedd60
2 changed files with 2 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
kcmkwin/kwineffects/kcm_kwin_effects.desktop
View file

@ -63,6 +63,7 @@ Name[zh_CN]=桌面特效
Name[zh_TW]=桌面效果
Comment=Configure compositor settings for desktop effects
Comment[ca]=Configura l'arranjament del compositor per als efectes de l'escriptori
Comment[es]=Configurar las preferencias del compositor para los efectos del escritorio
Comment[nl]=Instellingen van compositor configureren voor bureaubladeffecten
Comment[pt]=Configuração do compositor para os efeitos do ecrã
Comment[sv]=Anpassa sammansättningsinställningar för skrivbordseffekter

1
kcmkwin/kwinoptions/kwinmoving.desktop
View file

@ -24,6 +24,7 @@ Name[x-test]=xxWindow Movementxx
Comment=Configure window movement options
Comment[ca]=Configura les opcions de moviment de les finestres
Comment[cs]=Nastavit volby pohybu oken
Comment[es]=Configurar las opciones del movimiento de las ventanas
Comment[eu]=Konfiguratu leiho mugimenduaren aukerak
Comment[it]=Configura opzioni di spostamento delle finestre