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"
8 years ago · effe52f65d
parent 53969e4828
commit effe52f65d
2 changed files with 2 additions and 1 deletions
--- a/scripts/minimizeall/metadata.desktop
+++ b/scripts/minimizeall/metadata.desktop
@ -42,6 +42,7 @@ Name[zh_TW]=全部最小化
 Comment=Adds a shortcut to minimize and restore all windows
 Comment[ca]=Afegeix una drecera per a minimitzar i restaurar totes les finestres
 Comment[ca@valencia]=Afig una drecera per a minimitzar i restaurar totes les finestres
+Comment[da]=Tilføjer en genvej til at minimere og gendanne alle vinduer
 Comment[de]=Fügt einen Kurzbefehl hinzu, um alle Fenster zu minimieren oder wieder anzuzeigen
 Comment[en_GB]=Adds a shortcut to minimise and restore all windows
 Comment[es]=Añade un acceso rápido para minimizar y restaurar todas la ventanas
--- a/scripts/videowall/metadata.desktop
+++ b/scripts/videowall/metadata.desktop
@ -64,7 +64,7 @@ Comment[gl]=Estende un reprodutor de vídeo a pantalla completa por todas as pan
 Comment[he]=מפעיל נגן וידאו במסך מלא על כל המסכים המחוברים ליצירה של קיר וידאו
 Comment[hu]=Kiterjeszti a teljes képernyős videólejátszót az összes csatolt kijelzőre, hogy videófalat hozzon létre
 Comment[ia]=Extende jocator de video de schermo plen super omne schermos attachate pro crea un Muro de Video
-Comment[id]=Rentangkan pemutar video layar penuh ke semua layar yang terhubung untuk menciptakan Dinding Video
+Comment[id]=Rentangkan pemain video layar penuh ke semua layar yang terhubung untuk menciptakan Dinding Video
 Comment[it]=Distribuisci il lettore video a schermo pieno su tutti gli schermi per creare una parete video
 Comment[kk]=Видеоплейердің суретін бейне қабырғаны құратын экрандарға жайып көрсету
 Comment[km]=រំលងកម្មវិធីចាក់វីដេអូលើអេក្រង់ដែលបានភ្ជាប់ ដើម្បីបង្កើតផ្ទាំងវីដេអូ