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 2017-01-16 07:52:59 +01:00
parent 516ad25658
commit 81a4156faf
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/kwincompositing/kwineffect.knsrc
View file

@ -8,6 +8,7 @@ Name[es]=Efectos del gestor de ventanas
Name[ia]=Gerente de effectos de fenestra
Name[it]=Effetti del gestore delle finestre
Name[nl]=Effecten van vensterbeheerder
Name[nn]=Effektar for vindaugshandsamar
Name[pl]=Efekty zarządzania oknami
Name[pt]=Efeitos do Gestor de Janelas
Name[sk]=Efekty správcu okien

1
kcmkwin/kwinscripts/kwinscripts.knsrc
View file

@ -8,6 +8,7 @@ Name[es]=Guiones del gestor de ventanas
Name[ia]=Gerente de scripts de fenestra
Name[it]=Script del gestore delle finestre
Name[nl]=Scripts van vensterbeheerder
Name[nn]=Skript for vindaugshandsamar
Name[pl]=Skrypty zarządzania oknami
Name[pt]=Programas do Gestor de Janelas
Name[sk]=Skripty správcu okien