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"
7 years ago · 57e0c8169b
parent 4c4223ed77
commit 57e0c8169b
1 changed files with 1 additions and 1 deletions
--- a/runners/services/plasma-runner-services.desktop
+++ b/runners/services/plasma-runner-services.desktop
@ -28,7 +28,7 @@ Name[fi]=Sovellukset
 Name[fr]=Applications
 Name[fy]=Programma's
 Name[ga]=Feidhmchláir
-Name[gl]=Aplicativos
+Name[gl]=Aplicacións
 Name[gu]=કાર્યક્રમો
 Name[he]=תוכניות
 Name[hi]=अनुप्रयोग