Commit 1a4facae 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 69f8f2bd
Pipeline #22582 passed with stage
in 12 minutes and 40 seconds
......@@ -22,6 +22,7 @@ Name[ko]=MBoxImporter
Name[nb]=MBoxImporter
Name[nds]=Mbox-Import
Name[nl]=MBoxImporter
Name[nn]=MBox-importering
Name[pl]=Import skrzynki pocztowej
Name[pt]=Importação MBox
Name[pt_BR]=MBoxImporter
......
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