alecs/plasma-framework
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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-11-14 12:52:39 +00:00
parent e6ad818f59
commit 694131fdb6
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
autotests/data/testfallbackpackage/metadata.desktop
View File

@ -20,7 +20,7 @@ Name[nb]=Test reservepakke
Name[nds]=Test-Torüchfallpaket
Name[nl]=Testterugvalpakket
Name[nn]=Test-reservepakke
Name[pl]=Awaryjny pakiet próbny
Name[pl]=Zapasowy pakiet próbny
Name[pt]=Pacote de Salvaguarda de Testes
Name[pt_BR]=Pacote de teste secundário
Name[ru]=Тестовый резервный пакет