Commit b5da4828 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 99d16483
......@@ -8,6 +8,7 @@ Name[el]=Εργαλείο διαχείρισης πορτοφολιού του K
Name[en_GB]=KDE Wallet Management Tool
Name[es]=Herramienta de gestión de carteras de KDE
Name[fr]=Outil de gestion de portefeuilles de KDE
Name[ia]=Instrumento per gerer portafolio de KDE
Name[it]=Strumento per la gestione dei portafogli di KDE
Name[ko]=KDE 지갑 관리 도구
Name[nl]=KDE hulpmiddel voor portefeuillebeheer
......
......@@ -104,6 +104,7 @@ GenericName[el]=Εργαλείο διαχείρισης πορτοφολιού
GenericName[en_GB]=KDE Wallet Management Tool
GenericName[es]=Herramienta de gestión de carteras de KDE
GenericName[fr]=Outil de gestion de portefeuilles de KDE
GenericName[ia]=Instrumento per gerer portafolio de KDE
GenericName[it]=Strumento per la gestione dei portafogli di KDE
GenericName[ko]=KDE 지갑 관리 도구
GenericName[nl]=KDE hulpmiddel voor portefeuillebeheer
......
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