Commit d33b482b 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 8e9e4963
...@@ -2,6 +2,7 @@ ...@@ -2,6 +2,7 @@
Name=Sticky Note Name=Sticky Note
Name[ca]=Nota adhesiva Name[ca]=Nota adhesiva
Name[cs]=Lepicí poznámka Name[cs]=Lepicí poznámka
Name[da]=Post-it-note
Name[de]=Haftnotiz Name[de]=Haftnotiz
Name[en_GB]=Sticky Note Name[en_GB]=Sticky Note
Name[es]=Nota adhesiva Name[es]=Nota adhesiva
...@@ -28,6 +29,7 @@ Name[zh_TW]=便利貼 ...@@ -28,6 +29,7 @@ Name[zh_TW]=便利貼
Comment=Desktop sticky note Comment=Desktop sticky note
Comment[ca]=Nota adhesiva per a l'escriptori Comment[ca]=Nota adhesiva per a l'escriptori
Comment[cs]=Lepicí poznámka na plochu Comment[cs]=Lepicí poznámka na plochu
Comment[da]=Post-it-noter på skrivebordet
Comment[de]=Haftnotiz für die Arbeitsfläche Comment[de]=Haftnotiz für die Arbeitsfläche
Comment[en_GB]=Desktop sticky note Comment[en_GB]=Desktop sticky note
Comment[es]=Nota adhesiva del escritorio Comment[es]=Nota adhesiva del escritorio
......
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