Commit bd90b0d6 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 0836ef43
Pipeline #18424 passed with stage
in 6 minutes and 17 seconds
......@@ -15,6 +15,7 @@ Comment[ko]=Plasma 모바일 달력
Comment[nl]=Plasma agenda voor mobiel
Comment[pl]=Przenośny kalendarz Plazmy
Comment[pt]=Calendário do Plasma Mobile
Comment[pt_BR]=Calendário do Plasma Mobile
Comment[sv]=Plasma mobilkalender
Comment[uk]=Календар для мобільної Плазми
Comment[x-test]=xxPlasma Mobile Calendarxx
......@@ -35,6 +36,7 @@ Name[ko]=Calindori
Name[nl]=Calindori
Name[pl]=Calindori
Name[pt]=Calindori
Name[pt_BR]=Calindori
Name[sv]=Calindori
Name[uk]=Calindori
Name[x-test]=xxCalindorixx
......@@ -55,6 +57,7 @@ Name[ko]=일정 UID
Name[nl]=Uid van incident
Name[pl]=UID wystąpienia
Name[pt]=UID da incidência
Name[pt_BR]=UID da incidência
Name[sv]=Förekomstens användar-id
Name[uk]=Ідентифікатор випадку
Name[x-test]=xxIncidence uidxx
......@@ -72,6 +75,7 @@ Comment[ko]=알람 일정의 UID
Comment[nl]=De uid van het incident van het alarm
Comment[pl]=UID wystąpienia alarmu
Comment[pt]=O UID da incidência do alarme
Comment[pt_BR]=A UID da incidência do alarme
Comment[sv]=Användar-id för förekomsten av alarmet
Comment[uk]=Ідентифікатор випадку нагадування
Comment[x-test]=xxThe uid of the incidence of the alarmxx
......@@ -93,6 +97,7 @@ Name[ko]=알람
Name[nl]=Alarm
Name[pl]=Alarm
Name[pt]=Alarme
Name[pt_BR]=Alarme
Name[sv]=Alarm
Name[uk]=Нагадування
Name[x-test]=xxAlarmxx
......@@ -113,6 +118,7 @@ Comment[ko]=알람 알림
Comment[nl]=Alarmmelding
Comment[pl]=Powiadomienie o alarmie
Comment[pt]=Notificação do Alarme
Comment[pt_BR]=Notificação de alarme
Comment[sv]=Alarmunderrättelse
Comment[uk]=Сповіщення для нагадування
Comment[x-test]=xxAlarm Notificationxx
......
......@@ -14,6 +14,7 @@ Name[ko]=Calindori 알림 클라이언트
Name[nl]=Calindori client voor herinnering
Name[pl]=Klient przypominania Calindori
Name[pt]=Cliente de Chamadas de Atenção do Calindori
Name[pt_BR]=Daemon do cliente de lembretes Calindori
Name[sv]=Calindori påminnelseklient
Name[uk]=Клієнт нагадування Calindori
Name[x-test]=xxCalindori Reminder Clientxx
......@@ -37,6 +38,7 @@ GenericName[ko]=Calindori 알림 데몬 클라이언트
GenericName[nl]=Calindori client voor herinneringsdaemon
GenericName[pl]=Klient usługi przypominania Calindori
GenericName[pt]=Cliente do Serviço de Chamadas de Atenção do Calindori
GenericName[pt_BR]=Cliente de lembretes Calindori
GenericName[sv]=Calindori påminnelsedemonklient
GenericName[uk]=Клієнт фонової служби нагадування Calindori
GenericName[x-test]=xxCalindori Reminder Daemon Clientxx
......
......@@ -15,6 +15,7 @@ Name[ko]=Calindori
Name[nl]=Calindori
Name[pl]=Calindori
Name[pt]=Calindori
Name[pt_BR]=Calindori
Name[sv]=Calindori
Name[uk]=Calindori
Name[x-test]=xxCalindorixx
......@@ -35,6 +36,7 @@ Comment[ko]=Calindori
Comment[nl]=Calindori
Comment[pl]=Calindori
Comment[pt]=Calindori
Comment[pt_BR]=Calindori
Comment[sv]=Calindori
Comment[uk]=Calindori
Comment[x-test]=xxCalindorixx
......
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