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"
9 years ago · cb835e4bd7
parent fef56c1a3f
commit cb835e4bd7
4 changed files with 4 additions and 4 deletions
--- a/src/data/kmail_config_plugins.desktop
+++ b/src/data/kmail_config_plugins.desktop
@ -36,7 +36,7 @@ Name[fi]=Liitännäiset
 Name[fr]=Modules externes
 Name[fy]=Plugins
 Name[ga]=Breiseáin
-Name[gl]=Engadidos
+Name[gl]=Complementos
 Name[he]=תוספים
 Name[hu]=Bővítőmodulok
 Name[ia]=Plug-ins
--- a/src/data/kmail_view.desktop
+++ b/src/data/kmail_view.desktop
@ -14,7 +14,7 @@ Name[et]=KMaili vaade
 Name[fi]=KMail-näkymä
 Name[fr]=KMail view
 Name[ga]=Amharc KMail
-Name[gl]=Vista do KMail
+Name[gl]=Vista de KMail
 Name[hu]=KMail-nézet
 Name[ia]=Vista de KMail
 Name[it]=Visualizzatore di KMail
--- a/src/kontactplugin/kmail/kmailplugin.desktop
+++ b/src/kontactplugin/kmail/kmailplugin.desktop
@ -40,7 +40,7 @@ Comment[fi]=Kontactin KMail-liitännäinen
 Comment[fr]=Module KMail pour Kontact
 Comment[fy]=Kontact KMail-plugin
 Comment[ga]=Breiseán KMail le haghaidh Kontact
-Comment[gl]=Engadido do KMail para o Kontact
+Comment[gl]=Complemento de KMail para Kontact
 Comment[he]=תוסף KMail ל-Kontact
 Comment[hu]=Kontact KMail-bővítőmodul
 Comment[ia]=Plug-in pro Kontact KMail
--- a/src/kontactplugin/summary/summaryplugin.desktop
+++ b/src/kontactplugin/summary/summaryplugin.desktop
@ -32,7 +32,7 @@ Comment[fi]=Kontactin yhteenvetonäkymän liitännäinen
 Comment[fr]=Module de vue résumée pour Kontact
 Comment[fy]=Kontact SummaryView-plugin
 Comment[ga]=Breiseán Amharc Achoimre Kontact
-Comment[gl]=Engadido de VistaResumo para o Kontact
+Comment[gl]=Complemento de VistaResumo para Kontact
 Comment[hu]=Kontact bővítőmodul a névjegyek áttekintéséhez
 Comment[ia]=Plug-in pro Kontact SummaryView
 Comment[is]=Kontact yfirlitssýnar íforrit