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"
4 years ago · f5a4498776
parent 943a575a16
commit f5a4498776
1 changed files with 1 additions and 1 deletions
--- a/menu/desktop/kf5-toys.directory
+++ b/menu/desktop/kf5-toys.directory
@ -14,7 +14,7 @@ Name[bn_IN]=খেলনা
 Name[br]=C'hoarielloù
 Name[bs]=Igračke
 Name[ca]=Joguines
-Name[ca@valencia]=Joguines
+Name[ca@valencia]=Joguets
 Name[cs]=Hračky
 Name[csb]=Zabôwczi
 Name[cy]=Tegannau