Commit e713260b 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 60f4fdba
......@@ -15,6 +15,7 @@ Name[gl]=Interface de decoración de calendarios
Name[ia]=Interfacie de decoration de Calendario
Name[it]=Interfaccia di decorazione del calendario
Name[ja]=カレンダー装飾インターフェース
Name[ko]=달력 장식 인터페이스
Name[nb]=Grensesnitt til kalenderpynt
Name[nl]=Interface van agendadecoratie
Name[nn]=Grensesnitt til kalenderpynt
......@@ -52,6 +53,7 @@ Comment[gl]=Complemento para a decoración do calendario
Comment[ia]=Plug-in de decoration de Calendario
Comment[it]=Estensione di decorazione del calendario
Comment[ja]=カレンダー装飾プラグイン
Comment[ko]=달력 장식 플러그인
Comment[nb]=Programtillegg for kalenderpynt
Comment[nl]=Agendadecoratieplug-in
Comment[nn]=Programtillegg for kalenderpynt
......
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