Commit 6d083de4 authored by Script Kiddy's avatar Script Kiddy
Browse files

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"
parent 3f8eea09
......@@ -235,7 +235,6 @@ Comment[zh_TW]=搜尋樣式比對符合
Name=Sensor Alarm
Name[af]=Sensor Alarm
Name[ar]=إنذار المجسّ
Name[ast]=Alarma del sensor
Name[be@latin]=Tryvožny syhnał ad sensara
Name[bg]=Аларма от сензорите
Name[bn]=সেনসর সংকেত
......@@ -316,7 +315,6 @@ Name[zh_TW]=感應器警報
Comment=Sensor exceeded critical limit
Comment[af]=Sensor oorskry krities beperk
Comment[ar]=تجاوز المجسّ الحدّ الحرج
Comment[ast]=El sensor perpasó'l valor críticu
Comment[be@latin]=Vartaść sensara siahnuła krytyčnaj miažy.
Comment[bg]=Сензорът отчете критично натоварване
Comment[bn]=সেনসর বিপদসীমা ছাড়িয়ে গেছে
......
......@@ -15,7 +15,7 @@ TargetDir=ksysguard
# How to name the files?
# doesn't use payload file name
CustomName=true
CustomName=true
# What to do after installation? Any number of the lines below
# unpack the downloaded archive
......
[Desktop Entry]
Name=KSysGuard
Name[ar]=حارس نظامك
Name[ast]=KSysGuard
Name[bg]=Системна защита
Name[br]=KSysGuard
Name[bs]=KSysGuard
......@@ -79,7 +78,6 @@ GenericName=System Monitor
GenericName[af]=Stelsel Monitor
GenericName[ar]=مراقب النّظام
GenericName[as]=ব্যৱস্থাপ্ৰণালীৰ নিৰীক্ষণ ব্যৱস্থা
GenericName[ast]=Monitor del sistema
GenericName[be]=Сістэма
GenericName[be@latin]=Systemny nazirańnik
GenericName[bg]=Наблюдение на системата
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment