Members of the KDE Community are recommended to subscribe to the kde-community mailing list at https://mail.kde.org/mailman/listinfo/kde-community to allow them to participate in important discussions and receive other important announcements

Commit 06be99fc 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 bc386d4f
Pipeline #18089 passed with stage
in 6 minutes and 33 seconds
......@@ -4,6 +4,7 @@ Comment=Plasma Mobile Calendar
Comment[ca]=Calendari del Plasma Mòbil
Comment[ca@valencia]=Calendari del Plasma Mòbil
Comment[de]=Kalender für Plasma Mobile
Comment[en_GB]=Plasma Mobile Calendar
Comment[es]=Calendario de Plasma Mobile
Comment[et]=Plasma Mobile kalender
Comment[fi]=Plasma-mobiilikalenteri
......@@ -23,6 +24,7 @@ Name[ca]=Calindori
Name[ca@valencia]=Calindori
Name[cs]=Calindori
Name[de]=Calindori
Name[en_GB]=Calindori
Name[es]=Calindori
Name[et]=Calindori
Name[fi]=Calindori
......@@ -43,6 +45,7 @@ Name=Incidence uid
Name[ca]=UID de la incidència
Name[ca@valencia]=UID de la incidència
Name[de]=Ereigniskennung
Name[en_GB]=Incidence UID
Name[es]=UID de la incidencia
Name[et]=Sündmuse UID
Name[fr]=Uid de l'incidence
......@@ -59,6 +62,7 @@ Comment=The uid of the incidence of the alarm
Comment[ca]=L'UID de la incidència de l'alarma
Comment[ca@valencia]=L'UID de la incidència de l'alarma
Comment[de]=Die Ereigniskennung der Erinnerung
Comment[en_GB]=The UID of the incidence of the alarm
Comment[es]=El UID de la incidencia de la alarma
Comment[et]=Häiresündmuse UID
Comment[fr]=L'uid de l'incidence de l'alarme
......@@ -78,6 +82,7 @@ Name[ca]=Alarma
Name[ca@valencia]=Alarma
Name[cs]=Alarm
Name[de]=Erinnerung
Name[en_GB]=Alarm
Name[es]=Alarma
Name[et]=Häire
Name[fi]=Hälytys
......@@ -97,6 +102,7 @@ Comment=Alarm Notification
Comment[ca]=Notificació de l'alarma
Comment[ca@valencia]=Notificació de l'alarma
Comment[de]=Erinnerungs-Benachrichtigung
Comment[en_GB]=Alarm Notification
Comment[es]=Notificación de alarma
Comment[et]=Häire märguanne
Comment[fi]=Hälytysilmoitus
......
......@@ -3,6 +3,7 @@ Name=Calindori Reminder Client
Name[ca]=Client de recordatori del Calindori
Name[ca@valencia]=Client de recordatori del Calindori
Name[de]=Calindori-Erinnerungsprogramm
Name[en_GB]=Calindori Reminder Client
Name[es]=Cliente de recordatorios de Calindori
Name[et]=Calindori meeldetuletuste klient
Name[fi]=Calindorin muistutusasiakas
......@@ -25,6 +26,7 @@ GenericName=Calindori Reminder Daemon Client
GenericName[ca]=Client del dimoni de recordatori del Calindori
GenericName[ca@valencia]=Client del dimoni de recordatori del Calindori
GenericName[de]=Dienst für das Calindori-Erinnerungsprogramm
GenericName[en_GB]=Calindori Reminder Daemon Client
GenericName[es]=Cliente del demonio de recordatorios de Calindori
GenericName[et]=Calindori meeldetuletuste deemoni klient
GenericName[fi]=Calindorin muistutuspalveluasiakas
......
......@@ -4,6 +4,7 @@ Name[ca]=Calindori
Name[ca@valencia]=Calindori
Name[cs]=Calindori
Name[de]=Calindori
Name[en_GB]=Calindori
Name[es]=Calindori
Name[et]=Calindori
Name[fi]=Calindori
......@@ -23,6 +24,7 @@ Comment[ca]=Calindori
Comment[ca@valencia]=Calindori
Comment[cs]=Calindori
Comment[de]=Calindori
Comment[en_GB]=Calindori
Comment[es]=Calindori
Comment[et]=Calindori
Comment[fi]=Calindori
......
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