Commit 96277679 authored by Script Kiddy's avatar Script Kiddy

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 050e06d2
......@@ -271,7 +271,7 @@ Name[x-test]=xxActivity in Non-Focused Monitored Sessionxx
Name[zh_CN]=未取得焦点的被监视会话中的活动
Name[zh_TW]=監控未取得焦點的工作階段
Comment=Activity detected in a non-focused monitored session
Comment[ast]=Actividá deteutada nuna sesión monitorizada ensin el focu
Comment[ast]=Actividá deteutada nuna sesión supervisada ensin el focu
Comment[ca]=Activitat detectada en una sessió controlada sense focus
Comment[ca@valencia]=Activitat detectada en una sessió controlada sense focus
Comment[da]=Aktivitet detekteret i en ikke synlig overvåget session
......@@ -390,7 +390,7 @@ Name[zh_TW]=監控工作階段的活動
Comment=Activity detected in a monitored session
Comment[af]=Aktiwiteit bespeur in 'n sessie wat gemonitor word
Comment[ar]=تم اكتشاف نشاط في جلسةٍ مُراقبة
Comment[ast]=Actividá deteutada nuna sesión monitorizada
Comment[ast]=Actividá deteutada nuna sesión supervisada
Comment[be@latin]=U adsočvanaj sesii zaŭvažanyja pieramieny.
Comment[bg]=Засечена е активност в наблюдаваната сесия
Comment[bn]=মনিটর করা একটি সেশন-এ কিছু ঘটেছে
......@@ -509,7 +509,7 @@ Name[x-test]=xxSilence in Non-Focused Monitored Sessionxx
Name[zh_CN]=未取得焦点的被监视会话中的静默
Name[zh_TW]=監控未取得焦點工作階段的靜默行為
Comment=Silence detected in a non-focused monitored session
Comment[ast]=Silenciu deteutáu nuna sesión monitorizada ensin el focu
Comment[ast]=Silenciu deteutáu nuna sesión supervisada ensin el focu
Comment[ca]=Silenci detectat en una sessió controlada sense focus
Comment[ca@valencia]=Silenci detectat en una sessió controlada sense focus
Comment[da]=Inaktivitetet detekteret i en ikke-synlig overvåget session
......@@ -628,7 +628,7 @@ Name[zh_TW]=監控工作階段的靜默
Comment=Silence detected in a monitored session
Comment[af]=Stilte bespeur in 'n sessie wat gemonitor word
Comment[ar]=تم توقف النشاط في جلسةٍ مُراقبة
Comment[ast]=Silenciu deteutáu nuna sesión monitorizada
Comment[ast]=Silenciu deteutáu nuna sesión supervisada
Comment[be@latin]=U adsočvanaj sesii zaŭvažanaja cišynia.
Comment[bg]=Не е засечена активност в наблюдаваната сесия
Comment[bn]=মনিটর করা একটি সেশন-এ কিছু ঘটছে না
......
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