Members of the KDE Community are recommended to subscribe to the kde-community mailing list at https://mail.kde.org/mailman/listinfo/kde-community to allow them to participate in important discussions and receive other important announcements

Commit 481b66c4 authored by Script Kiddy's avatar Script Kiddy

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 d43631c1
[KDE Backdeck]
Name=Nicu Ornamental
Name[bs]=Ukrasni Nicu
Name[ca]=Nicu Ornamental
Name[ca@valencia]=Nicu Ornamental
Name[ca]=Nicu ornamental
Name[ca@valencia]=Nicu ornamental
Name[cs]=Nicu Ornamental
Name[da]=Nicu Ornamental
Name[de]=Nicu (verziert)
......
[KDE Backdeck]
Name=Oxygen White
Name[bs]=Oxygen bijela
Name[ca]=Oxygen-blanc
Name[ca@valencia]=Oxygen-blanc
Name[ca]=Oxygen blanc
Name[ca@valencia]=Oxygen blanc
Name[cs]=Oxygen - Bílý
Name[da]=Oxygen-hvid
Name[de]=Oxygen (weiß)
......
[KDE Backdeck]
Name=Tigullio International
Name[bs]=Tigullio internacional
Name[ca]=Tigullio International
Name[ca@valencia]=Tigullio International
Name[ca]=Tigullio international
Name[ca@valencia]=Tigullio international
Name[cs]=Tigullio International
Name[da]=Tigullio International
Name[de]=Tigullio International
......
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