Commit e4211272 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 98d687d1
......@@ -23,7 +23,6 @@
"Description[lt]": "Paskyrų tvarkymas",
"Description[nl]": "Accountbeheer",
"Description[nn]": "Konto­handsaming",
"Description[pl]": "Zarządzanie kontami",
"Description[pt]": "Gestão de contas",
"Description[pt_BR]": "Gerenciamento de contas",
"Description[ro]": "Gestiune conturi",
......@@ -58,7 +57,6 @@
"Name[lt]": "Paskyros",
"Name[nl]": "Accounts",
"Name[nn]": "Kontoar",
"Name[pl]": "Konta",
"Name[pt]": "Contas",
"Name[pt_BR]": "Contas",
"Name[ro]": "Conturi",
......
......@@ -22,7 +22,6 @@
"Description[lt]": "Prijungti WebDAV viešinius naudojant KIO",
"Description[nl]": "WebDAV-shares met KIO aankoppelen",
"Description[nn]": "Monter WebDAV-ressursar med KIO",
"Description[pl]": "Podpinaj udziały WebDAV przy użyciu KIO",
"Description[pt]": "Montar partilhas de WebDAV com o KIO",
"Description[pt_BR]": "Montar compartilhamentos WebDAV com KIO",
"Description[ro]": "Montează partajări WebDAV cu KIO",
......@@ -59,7 +58,6 @@
"Name[lt]": "KIO WebDAV",
"Name[nl]": "KIO WebDAV",
"Name[nn]": "KIO WebDAV",
"Name[pl]": "KIO WebDAV",
"Name[pt]": "KIO de WebDAV",
"Name[pt_BR]": "KIO WebDAV",
"Name[ro]": "KIO WebDAV",
......
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