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 · b2d8e0a657
parent bf44afcb2a
commit b2d8e0a657
3 changed files with 3 additions and 0 deletions
--- a/applets/appmenu/package/metadata.desktop
+++ b/applets/appmenu/package/metadata.desktop
@ -35,6 +35,7 @@ Comment=Classic menu for finding and starting applications
 Comment[ca]=Menú clàssic per cercar i iniciar aplicacions
 Comment[ca@valencia]=Menú clàssic per buscar i iniciar aplicacions
 Comment[cs]=Klasická nabídka pro hledání a spouštění aplikací
+Comment[de]=Klassisches Menü zum Suchen und Starten von Anwendungen
 Comment[el]=Κλασσικό μενού για εύρεση και εκκίνηση εφαρμογών
 Comment[en_GB]=Classic menu for finding and starting applications
 Comment[es]=Menú clásico para encontrar y lanzar aplicaciones
--- a/applets/calendar/package/metadata.desktop
+++ b/applets/calendar/package/metadata.desktop
@ -80,6 +80,7 @@ Name[zh_TW]=行事曆
 Comment=Month display with your appointments and events
 Comment[ca]=Mostra el mes amb les cites i els esdeveniments
 Comment[ca@valencia]=Mostra el mes amb les cites i els esdeveniments
+Comment[de]=Monatsanzeige mit Ihren Verabredungen und Terminen
 Comment[el]=Εμφάνιση συναντήσεων και συμβάντων ανά μήνα
 Comment[en_GB]=Month display with your appointments and events
 Comment[es]=Calendario mensual con sus citas y eventos
--- a/runners/appstream/appstreamrunner.desktop
+++ b/runners/appstream/appstreamrunner.desktop
@ -26,6 +26,7 @@ Comment=Lets you find software
 Comment[ca]=Permet cercar programari
 Comment[ca@valencia]=Permet buscar programari
 Comment[cs]=Umožní vám hledat software
+Comment[de]=Unterstützt die Suche nach Software
 Comment[el]=Σας δίνει τη δυνατότητα να βρείτε λογισμικό
 Comment[es]=Le permite encontrar software
 Comment[it]=Ti consente di trovare i programmi