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 2016-10-31 12:00:16 +00:00
parent 82054a406a
commit 9e23d20f8f
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/resize/resize_config.desktop
View file

@ -49,7 +49,7 @@ Name[mr]=चौकट आकार बदल
Name[nb]=Endre størrelse på vinduet Name[nb]=Endre størrelse på vinduet
Name[nds]=Finstergrött ännern Name[nds]=Finstergrött ännern
Name[nl]=Afmeting venster aanpassen Name[nl]=Afmeting venster aanpassen
Name[nn]=Endra storleik på vindauget Name[nn]=Skaler vindauge
Name[pa]=ਵਿੰਡੋ ਮੁੜ-ਆਕਾਰ Name[pa]=ਵਿੰਡੋ ਮੁੜ-ਆਕਾਰ
Name[pl]=Zmiana rozmiaru okien Name[pl]=Zmiana rozmiaru okien
Name[pt]=Dimensionar a Janela Name[pt]=Dimensionar a Janela