Commit 66e8e52e 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 e25dd659
Pipeline #189811 skipped
...@@ -9,7 +9,7 @@ Comment=A collection manager ...@@ -9,7 +9,7 @@ Comment=A collection manager
Comment[bg]=Управление на колекции Comment[bg]=Управление на колекции
Comment[bs]=Menadžer kolekcija Comment[bs]=Menadžer kolekcija
Comment[ca]=Un gestor de col·leccions Comment[ca]=Un gestor de col·leccions
Comment[ca@valencia]=Un gestor de coleccions Comment[ca@valencia]=Un gestor de col·leccions
Comment[cs]=Správce sbírek Comment[cs]=Správce sbírek
Comment[da]=En Håndtering af samlinger Comment[da]=En Håndtering af samlinger
Comment[de]=Eine Sammlungsverwaltung Comment[de]=Eine Sammlungsverwaltung
...@@ -100,7 +100,7 @@ GenericName=Collection Manager ...@@ -100,7 +100,7 @@ GenericName=Collection Manager
GenericName[bg]=Управление на колекции GenericName[bg]=Управление на колекции
GenericName[bs]=Menadžer kolekcija GenericName[bs]=Menadžer kolekcija
GenericName[ca]=Gestor de col·leccions GenericName[ca]=Gestor de col·leccions
GenericName[ca@valencia]=Gestor de coleccions GenericName[ca@valencia]=Gestor de col·leccions
GenericName[cs]=Správce sbírek GenericName[cs]=Správce sbírek
GenericName[da]=Samlingshåndtering GenericName[da]=Samlingshåndtering
GenericName[de]=Sammlungsverwaltung GenericName[de]=Sammlungsverwaltung
......
Supports Markdown
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