Commit 54bdf78a 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 7c38ab4f
......@@ -14,6 +14,7 @@
"Name[nl]": "Nylas-e-mail-importeur",
"Name[pl]": "Importer Poczty Nylas",
"Name[pt]": "Importador do Nylas Mail",
"Name[sl]": "Uvoznik iz programa Nylas Mail",
"Name[sr@ijekavian]": "Увозник из Најласове поште",
"Name[sr@ijekavianlatin]": "Uvoznik iz Nylasove pošte",
"Name[sr@latin]": "Uvoznik iz Nylasove pošte",
......
......@@ -13,6 +13,7 @@
"Description[nl]": "Deze plug-in stelt u in staat advertenties te blokkeren.",
"Description[pl]": "Ta wtyczka blokuje reklamy.",
"Description[pt]": "Este 'plugin' permite-lhe bloquear a publicidade.",
"Description[sl]": "Ta vstavek omogoča blokiranje oglasov.",
"Description[sr@ijekavian]": "Овај прикључак омогућава блокирање реклама",
"Description[sr@ijekavianlatin]": "Ovaj priključak omogućava blokiranje reklama",
"Description[sr@latin]": "Ovaj priključak omogućava blokiranje reklama",
......
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