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-05-23 11:09:17 +00:00
parent df1499784f
commit cdf5ef113a
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
effects/dialogparent/package/metadata.desktop
View file

@ -119,7 +119,7 @@ Comment[nds]=Maakt dat Moderfinstern vun den aktiven Dialoog düüsterer
Comment[nl]=Maakt het venster dat bij de ouder van de actieve dialoog hoort donkerder
Comment[nn]=Gjer foreldrevindauget til det aktive dialogvindauget mørkare
Comment[pa]=ਮੌਜੂਦਾ ਐਕਟਿਵ ਡਾਈਲਾਗ ਉੱਤੇ ਮੁੱਢਲੇ ਵਿੰਡੋ ਦਾ ਪਰਛਾਵਾਂ
Comment[pl]=Przyciemnienie nadrzędnego okno obecnie aktywnego okna dialogowego
Comment[pl]=Przyciemnia nadrzędne okna obecnie aktywnego okna dialogowego
Comment[pt]=Escurece a janela-mãe da janela activa de momento
Comment[pt_BR]=Escurece as janelas pai do diálogo ativo atual
Comment[ro]=Întunecă fereastra-părinte a dialogului activ