Commit 92fc4a96 authored by Script Kiddy's avatar Script Kiddy
Browse files

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 bcd15121
......@@ -50,7 +50,7 @@ Name[nn]=Mappefilter
Name[pa]=ਡਾਇਰੈਕਟਰੀ ਫਿਲਟਰ
Name[pl]=Filtr katalogu
Name[pt]=Filtro de Pastas
Name[pt_BR]=Filtro de diretório
Name[pt_BR]=Filtro de pasta
Name[ro]=Filtru de directoare
Name[ru]=Фильтр каталогов
Name[sk]=Filter adresárov
......@@ -110,7 +110,7 @@ Comment[nn]=Filtrer mappevising ved bruk av attributtfilter
Comment[pa]=ਇੱਕ ਗੁਣ ਫਿਲਟਰ ਦੀ ਵਰਤੋਂ ਕਰਕੇ ਡਾਇਰੈਕਟਰੀ ਵੇਖਣ ਫਿਲਟਰ
Comment[pl]=Filtruje widok katalogu przy użyciu filtra atrybutów
Comment[pt]=Filtra a visualização da pasta com um filtro de atributos
Comment[pt_BR]=Filtra a visualização do diretório usando um filtro de atributos
Comment[pt_BR]=Filtra a visualização da pasta usando um filtro de atributos
Comment[ro]=Filtrează vederea de directoare folosind un filtru de atribute
Comment[ru]=Отфильтровать каталоги по атрибуту
Comment[sk]=Podľa atribútov filtruje zobrazenie adresárov
......
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