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 2015-04-21 13:24:50 +00:00
parent db34ddda53
commit a00f1f3ad4
3 changed files with 4 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
effects/eyeonscreen/package/metadata.desktop
View file

@ -7,6 +7,7 @@ Name[gl]=Ollo na pantalla
Name[nl]=eye On Screen Name[nl]=eye On Screen
Name[pt]=Olho no Ecrã Name[pt]=Olho no Ecrã
Name[pt_BR]=Olho na tela Name[pt_BR]=Olho na tela
Name[ro]=ochi pe ecran
Name[sk]=oko na obrazovke Name[sk]=oko na obrazovke
Name[sl]=Oko na zaslonu Name[sl]=Oko na zaslonu
Name[sv]=Ögat på skärmen Name[sv]=Ögat på skärmen

1
effects/windowaperture/package/metadata.desktop
View file

@ -8,6 +8,7 @@ Name[gl]=Apertura das xanelas
Name[nl]=Vensteropening Name[nl]=Vensteropening
Name[pt]=Aperto das Janelas Name[pt]=Aperto das Janelas
Name[pt_BR]=Aperto das janelas Name[pt_BR]=Aperto das janelas
Name[ro]=Diafragmă fereastră
Name[sk]=Otvor okien Name[sk]=Otvor okien
Name[sl]=Zaslonka okna Name[sl]=Zaslonka okna
Name[sv]=Fönsteröppning Name[sv]=Fönsteröppning

2
kcmkwin/kwincompositing/kcmkwineffects.desktop
View file

@ -39,6 +39,7 @@ Name[pa]=ਡੈਸਕਟਾਪ ਪਰਭਾਵ
Name[pl]=Efekty pulpitu Name[pl]=Efekty pulpitu
Name[pt]=Efeitos do Ecrã Name[pt]=Efeitos do Ecrã
Name[pt_BR]=Efeitos da área de trabalho Name[pt_BR]=Efeitos da área de trabalho
Name[ro]=Efecte de birou
Name[ru]=Эффекты Name[ru]=Эффекты
Name[se]=Čállinbeavdeeffeavttat Name[se]=Čállinbeavdeeffeavttat
Name[sk]=Efekty plochy Name[sk]=Efekty plochy
@ -78,6 +79,7 @@ Comment[pa]=ਡੈਸਕਟਾਪ ਪਰਭਾਵ
Comment[pl]=Efekty pulpitu Comment[pl]=Efekty pulpitu
Comment[pt]=Efeitos do Ecrã Comment[pt]=Efeitos do Ecrã
Comment[pt_BR]=Efeitos da Área de Trabalho Comment[pt_BR]=Efeitos da Área de Trabalho
Comment[ro]=Efecte de birou
Comment[ru]=Настройка эффектов рабочего стола Comment[ru]=Настройка эффектов рабочего стола
Comment[sk]=Efekty plochy Comment[sk]=Efekty plochy
Comment[sl]=Učinki namizja Comment[sl]=Učinki namizja