Commit 89009532 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 f922fc05
......@@ -24,6 +24,7 @@ Name[es]=Archivador web
Name[eu]=Web artxibatzailea
Name[fr]=Archiveur Web
Name[ga]=Cartlannaí Gréasáin
Name[gl]=Arquivador web
Name[he]=ארכיוני רשת
......@@ -76,6 +77,7 @@ Comment[es]=Crea archivos de sitios web
Comment[et]=Võimaldab luua veebilehekülgede arhiive
Comment[eu]=Webguneen artxiboak sortzen ditu
Comment[fi]=Luo arkistoja verkkosivuista
Comment[fr]=Crée des archives de sites Web
Comment[ga]=Cruthaigh cartlann de shuímh Ghréasáin
Comment[gl]=Crea arquivos de páxinas web
Comment[he]=יוצר ארכיבים של אתרי אינטרנט
......@@ -7,6 +7,7 @@ Name[el]=Αρχειοθήκες ιστού και HTML αρχεία
Name[en_GB]=Web Archives and HTML files
Name[es]=Archivos web y HTML
Name[it]=Archivi web e file HTML
Name[ko]=웹 보관 파일과 HTML 파일
Name[nl]=Webarchieven en HTML-bestanden
Name[pt]=Arquivos Web e ficheiros HTML
Name[pt_BR]=Arquivos da Internet e arquivos 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