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"

diff --git a/src/itemactions/setfoldericonitemaction.json b/src/itemactions/setfoldericonitemaction.json
index fc54ce9aaba2f306d108e1b52aad50b7f5cf0ad4..29638e4e583df2882fee7558b7cc7410cf2ba433 100644 (file)
--- a/src/itemactions/setfoldericonitemaction.json
+++ b/src/itemactions/setfoldericonitemaction.json
@@ -24,6 +24,7 @@
         "Name[lv]": "Norādīt datnes ikonu",
         "Name[nl]": "Mappictogram instellen",
         "Name[pl]": "Ustaw ikonę katalogu",
         "Name[lv]": "Norādīt datnes ikonu",
         "Name[nl]": "Mappictogram instellen",
         "Name[pl]": "Ustaw ikonę katalogu",

+        "Name[pt_BR]": "Definir ícone da pasta",

         "Name[sl]": "Nastavi ikono mape",
         "Name[sv]": "Ange katalogikon",
         "Name[tr]": "Klasör Simgesi Ayarla",
         "Name[sl]": "Nastavi ikono mape",
         "Name[sv]": "Ange katalogikon",
         "Name[tr]": "Klasör Simgesi Ayarla",