Commit 1a3e2996 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 76ac97cf
......@@ -17,7 +17,7 @@ Name[bn_IN]=ফাইল/ফোল্ডার অনুসন্ধান
Name[br]=Klask restroù/renkelloù
Name[bs]=Traženje datoteka i fascikli
Name[ca]=Cerca fitxers i carpetes
Name[ca@valencia]=Cerca fitxers i carpetes
Name[ca@valencia]=Busca fitxers i carpetes
Name[cs]=Najít soubory/složky
Name[csb]=Szëkba lopków/katalogów
Name[da]=Find filer/mapper
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