Commit 52e69e1a 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 4d877853
......@@ -47,6 +47,7 @@ Name[ms]=Pengarkib Web
Name[pa]=ਵੈਬ ਅਕਾਇਵਰ
Name[pl]=Archiwizator sieciowy
......@@ -100,6 +101,7 @@ Comment[mr]=वेबसाइटचा संग्रह तयार कर
Comment[nb]=Lager arkiver av nettsteder
Comment[nds]=Stellt Archiven ut Nettsieden op
Comment[nl]=Maakt archieven van websites aan
Comment[nn]=Lag arkiv av nettsider
Comment[pa]=ਵੈੱਬ ਸਾਈਟਾਂ ਦਾ ਅਕਾਇਵ ਬਣਾਓ
Comment[pl]=Tworzy archiwa dla stron internetowych
Comment[pt]=Cria pacotes de arquivo de páginas Web
......@@ -13,6 +13,7 @@ Name[ia]=Archivos Web e files HTML
Name[it]=Archivi web e file HTML
Name[ko]=웹 보관 파일과 HTML 파일
Name[nl]=Webarchieven en HTML-bestanden
Name[nn]=Vevarkiv og HTML-filer
Name[pt]=Arquivos Web e ficheiros HTML
Name[pt_BR]=Arquivos da Internet e arquivos HTML
Name[sl]=Spletni arhivi in datoteke HTML
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