Commit 87f6216f 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 5f045a9f
......@@ -2,7 +2,6 @@
Comment=System Monitor
Comment[ar]=مراقب النظام
Comment[ast]=Monitor del sistema
Comment[bg]=Наблюдение на системата
Comment[bs]=Nadzornik sistema
Comment[ca]=Controlador del sistema
......@@ -70,7 +69,6 @@ Comment[zh_TW]=系統監視器
Name=Pattern Matched
Name[af]=Patroon gevind
Name[ar]=تطابق النموذج
Name[ast]=Patrón atopáu
Name[be@latin]=Šablon maje adpaviednik
Name[bg]=Шаблонът съвпада
Name[bn]=মিল পাওয়া গেছে
......@@ -150,7 +148,6 @@ Name[zh_TW]=樣式已符合
Comment=Search pattern matched
Comment[af]=Soek patroon opgespoor
Comment[ar]=تمت مطابقة نموذج البحث
Comment[ast]=Guetar el patrón
Comment[be@latin]=Šablon pošuku maje adpaviednik.
Comment[bg]=Шаблонът за търсене съвпада
Comment[bn]=সন্ধান করা প্যাটার্ন-এর মিল পাওয়া গেছে
......@@ -234,7 +231,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]=সেনসর সংকেত
......@@ -314,7 +310,6 @@ Name[zh_TW]=感應器警報
Comment=Sensor exceeded critical limit
Comment[af]=Sensor oorskry krities beperk
Comment[ar]=مِجَسّ تجاوز الحد الحرج
Comment[ast]=El sensor sobrepasó'l valor críticu
Comment[be@latin]=Vartaść sensara siahnuła krytyčnaj miažy.
Comment[bg]=Сензорът отчете критично натоварване
Comment[bn]=সেনসর বিপদসীমা ছাড়িয়ে গেছে
[Desktop Entry]
Name[ar]=حارس نظام كيدي
Name[bg]=Системна защита
......@@ -78,7 +77,6 @@ GenericName=System Monitor
GenericName[af]=Stelsel Monitor
GenericName[ar]=مراقب النظام
GenericName[as]=ব্যৱস্থাপ্ৰণালীৰ নিৰীক্ষণ ব্যৱস্থা
GenericName[ast]=Monitor del sistema
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