Commit f6057cf7 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 216fda1e
......@@ -7,6 +7,7 @@ Name[de]=KDE-Dienstprogramm für Passwörter
Name[el]=Εργαλείο διαχείρισης πορτοφολιού του KDE
Name[en_GB]=KDE Wallet Management Tool
Name[es]=Herramienta de gestión de carteras de KDE
Name[fi]=KDE:n lompakonhallintatyökalu
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
......
......@@ -103,6 +103,7 @@ GenericName[de]=KDE-Dienstprogramm für Passwörter
GenericName[el]=Εργαλείο διαχείρισης πορτοφολιού του KDE
GenericName[en_GB]=KDE Wallet Management Tool
GenericName[es]=Herramienta de gestión de carteras de KDE
GenericName[fi]=KDE:n lompakonhallintatyökalu
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
......
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