Commit a9730c7e 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 3b9acdce
......@@ -20,6 +20,7 @@ Name[hu]=KFind
Name[ia]=KFind
Name[it]=KFind
Name[ko]=KFind
Name[lt]=K paieška
Name[nl]=KFind
Name[nn]=KFind
Name[pl]=KFind
......@@ -53,6 +54,7 @@ GenericName[hu]=Fájl- és mappakereső
GenericName[ia]=Trova files/dossieres
GenericName[it]=Trova file/cartelle
GenericName[ko]=파일/폴더 찾기
GenericName[lt]=Ieškoti failų / aplankų
GenericName[nl]=Bestanden/mappen zoeken
GenericName[nn]=Finn filer/mapper
GenericName[pl]=Wyszukiwanie plików/katalogów
......
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