Commit 99347f74 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 c2842df5
......@@ -16,6 +16,7 @@ Name[bg]=Архивиране на страници
Name[bs]=Veb arhivar
Name[ca]=Arxivador de webs
Name[ca@valencia]=Arxivador de webs
Name[cs]=Webový archivátor
Name[da]=Webarkivering
Name[de]=Web-Archivierung
Name[el]=Αρχειοθέτης ιστοσελίδας
......@@ -69,6 +70,7 @@ Comment[bg]=Създаване на архиви на сайтове
Comment[bs]=Pravi arhive veb sajtova
Comment[ca]=Crea arxius de llocs web
Comment[ca@valencia]=Crea arxius de llocs web
Comment[cs]=Vytvoří archiv z webových stránek
Comment[da]=Kan arkivere websider
Comment[de]=Erstellt ein Archiv von Webseiten
Comment[el]=Δημιουργεί αρχειοθήκες από ιστοσελίδες
......
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