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"
4 years ago · 57de3bf16e
parent 2365ba3fd0
commit 57de3bf16e
2 changed files with 8 additions and 1 deletions
--- a/klipper/klipperrc.desktop
+++ b/klipper/klipperrc.desktop
@ -91,7 +91,7 @@ Description[ta]=Jpeg-படம்
 Description[te]=జెపిఈజి చిత్రం
 Description[tg]=Тасвири Jpeg
 Description[th]=แฟ้มภาพ Jpeg
-Description[tr]=Jpeg Resmi
+Description[tr]=Jpeg Görseli
 Description[ug]=Jpeg سۈرەت
 Description[uk]=Зображення Jpeg
 Description[uz]=Jpeg-rasm
--- a/systemmonitor/org.kde.systemmonitor.desktop
+++ b/systemmonitor/org.kde.systemmonitor.desktop
@ -3,5 +3,12 @@
 Type=Application
 Exec=systemmonitor
 Name=System Activity
+Name[ca]=Activitat del sistema
+Name[ca@valencia]=Activitat del sistema
+Name[eu]=Sistemaren jarduera
+Name[nl]=Systeemactiviteit
+Name[tr]=Sistem Etkinliği
+Name[uk]=Дії системи
+Name[x-test]=xxSystem Activityxx
 Icon=utilities-system-monitor
 NoDisplay=true