Commit 48b984ea 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 16f65e81
......@@ -120,7 +120,7 @@ Name[ne]=केडीई आयोजक
Name[nl]=KOrganizer
Name[nn]=KOrganizer
Name[pa]=ਕੇ-ਪਰਬੰਧਕ
Name[pl]=Organizator
Name[pl]=KOrganizator
Name[pt]=KOrganizer
Name[pt_BR]=KOrganizer
Name[ro]=Organizator
......
......@@ -118,7 +118,7 @@ Name[ne]=केडीई आयोजक
Name[nl]=KOrganizer
Name[nn]=KOrganizer
Name[pa]=ਕੇ-ਪਰਬੰਧਕ
Name[pl]=Organizator
Name[pl]=KOrganizator
Name[pt]=KOrganizer
Name[pt_BR]=KOrganizer
Name[ro]=Organizator
......
......@@ -120,7 +120,7 @@ Name[ne]=केडीई आयोजक
Name[nl]=KOrganizer
Name[nn]=KOrganizer
Name[pa]=ਕੇ-ਪਰਬੰਧਕ
Name[pl]=Organizator
Name[pl]=KOrganizator
Name[pt]=KOrganizer
Name[pt_BR]=KOrganizer
Name[ro]=Organizator
......
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