Commit 81f3fec1 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 a5df264c
Pipeline #27139 skipped
......@@ -509,6 +509,7 @@ Name[sk]=Pošta pridaná to fronty na odoslanie neskôr
Name[sl]=Sporočilo dodano v čakalno vrsto za kasnejše pošiljanje
Name[sv]=E-post tillagd i kö för att skicka senare
Name[uk]=Повідомлення додано до черги відкладеного надсилання
Name[x-test]=xxEmail added to the send later queuexx
Comment=A delayed email delivery is configured and can be canceled
Comment[ca]=S'ha configurat un lliurament de correu retardat i es pot cancel·lar
Comment[en_GB]=A delayed email delivery is configured and can be cancelled
......@@ -526,5 +527,6 @@ Comment[sk]=Je nakonfigurované oneskorené doručovanie pošty a je možné ho
Comment[sl]=Nastavljeno je pošiljanje sporočila z zakasnitvijo in je lahko tudi preklicano
Comment[sv]=En fördröjd e-postleverans är inställd och kan avbrytas
Comment[uk]=Налаштовано відкладене надсилання пошти, його можна скасувати
Comment[x-test]=xxA delayed email delivery is configured and can be canceledxx
Action=Popup
Urgency=Normal
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