Commit 75335a51 authored by Script Kiddy's avatar Script Kiddy

SVN_SILENT made messages (.desktop file) - always resolve ours

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"
parent 7a353f40
......@@ -33,6 +33,7 @@ Name[nn]=KFind
Name[pl]=KFind
Name[pt]=KFind
Name[pt_BR]=KFind
Name[ro]=KFind
Name[ru]=KFind
Name[sk]=KFind
Name[sl]=KFind
......@@ -75,6 +76,7 @@ GenericName[nn]=Finn filer/mapper
GenericName[pl]=Wyszukiwanie plików/katalogów
GenericName[pt]=Procurar nos Ficheiros/Pastas
GenericName[pt_BR]=Procurar arquivos/pastas
GenericName[ro]=Găsește fișiere/dosare
GenericName[ru]=Поиск файлов и папок
GenericName[sk]=Nájdenie súborov alebo priečinkov
GenericName[sl]=Poiščite datoteke in mape
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment