Commit 357aa4cd 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 a57f0109
......@@ -139,7 +139,7 @@ Description[nb]=Still inn RTC gjenoppta-tid
Description[nds]=Wedderanmaaktiet na Utsetten na Echttietklock instellen
Description[nl]=Wektijd-na-opschorten instellen
Description[nn]=Vel tidspunkt å vekkjast frå dvale
Description[pl]=Ustaw czas pobudki-z-wstrzymania RTC
Description[pl]=Ustaw czas pobudki-z-uśpienia RTC
Description[pt]=Definir a hora para acordar da suspensão no RTC
Description[pt_BR]=Definir a hora para acordar da suspensão no RTC
Description[ro]=Stabilește ora de trezire din suspendare a calculatorului
......
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