marcoallegretti/shift-shell
1
0
Fork 0
mirror of https://invent.kde.org/marcoa/shift-shell.git synced 2026-04-26 14:23:09 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

SVN_SILENT made messages (.desktop file) - always resolve ours

Browse source 
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"
This commit is contained in:
l10n daemon script 2016-11-04 09:46:15 +00:00
parent ee6cd11efb
commit e8d2bfe884
9 changed files with 15 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
applets/activities/metadata.desktop
View file

@ -3,6 +3,7 @@ Encoding=UTF-8
Name=Phone Activities
Name[ca]=Activitats del telèfon
Name[ca@valencia]=Activitats del telèfon
Name[cs]=Aktivity telefonu
Name[de]=Telefonaktivitäten
Name[en_GB]=Phone Activities
Name[es]=Actividades del teléfono
@ -17,6 +18,7 @@ Name[x-test]=xxPhone Activitiesxx
Comment=Activity switcher for the phone
Comment[ca]=Commutador de l'activitat per al telèfon
Comment[ca@valencia]=Commutador de l'activitat per al telèfon
Comment[cs]=Přepínač aktivit pro telefon
Comment[en_GB]=Activity switcher for the phone
Comment[es]=Selector de actividad para el teléfono
Comment[nl]=Omschakelaar van telefoonactiviteiten

2
applets/clock/metadata.desktop
View file

@ -3,6 +3,7 @@ Encoding=UTF-8
Name=Clock
Name[ca]=Rellotge
Name[ca@valencia]=Rellotge
Name[cs]=Hodiny
Name[de]=Uhr
Name[en_GB]=Clock
Name[es]=Reloj
@ -17,6 +18,7 @@ Name[x-test]=xxClockxx
Comment=Time displayed in a digital format
Comment[ca]=Mostra l'hora en un format digital
Comment[ca@valencia]=Mostra l'hora en un format digital
Comment[cs]=Čas zobrazený v digitální podobě
Comment[de]=Zeigt die Uhrzeit in digitaler Form an.
Comment[en_GB]=Time displayed in a digital format
Comment[es]=La hora mostrada en formato digital

2
applets/notifications/metadata.desktop
View file

@ -3,6 +3,7 @@ Encoding=UTF-8
Name=Notifications
Name[ca]=Notificacions
Name[ca@valencia]=Notificacions
Name[cs]=Oznamování
Name[de]=Benachrichtigungen
Name[en_GB]=Notifications
Name[es]=Notificaciones
@ -16,6 +17,7 @@ Name[x-test]=xxNotificationsxx
Comment=Display notifications and jobs
Comment[ca]=Mostra les notificacions i els treballs
Comment[ca@valencia]=Mostra les notificacions i els treballs
Comment[cs]=Oznámení a úlohy
Comment[de]=Benachrichtigungen und Aktionen anzeigen
Comment[en_GB]=Display notifications and jobs
Comment[es]=Mostrar notificaciones y tareas

1
containments/homescreen/package/metadata.desktop
View file

@ -4,6 +4,7 @@ Keywords=
Name=Phone Homescreen
Name[ca]=Pantalla d'inici del telèfon
Name[ca@valencia]=Pantalla d'inici del telèfon
Name[cs]=Domácí obrazovka telefonu
Name[en_GB]=Phone Homescreen
Name[es]=Pantalla de inicio del teléfono
Name[nl]=Standaardscherm van de telefoon

1
containments/panel/metadata.desktop
View file

@ -4,6 +4,7 @@ Keywords=
Name=Phone Panel
Name[ca]=Plafó del telèfon
Name[ca@valencia]=Plafó del telèfon
Name[cs]=Panel telefonu
Name[en_GB]=Phone Panel
Name[es]=Panel del teléfono
Name[nl]=Telefoonpaneel

1
dialer/package/metadata.desktop
View file

@ -16,6 +16,7 @@ Keywords=
Name=Phone
Name[ca]=Telèfon
Name[ca@valencia]=Telèfon
Name[cs]=Telefon
Name[de]=Telefon
Name[en_GB]=Phone
Name[es]=Teléfono

4
dialer/src/plasma_dialer.notifyrc
View file

@ -3,6 +3,7 @@ IconName=call-start
Comment=Phone
Comment[ca]=Telèfon
Comment[ca@valencia]=Telèfon
Comment[cs]=Telefon
Comment[de]=Telefon
Comment[en_GB]=Phone
Comment[es]=Teléfono
@ -18,6 +19,7 @@ Comment[x-test]=xxPhonexx
Name=Missed Call
Name[ca]=Trucada perduda
Name[ca@valencia]=Trucada perduda
Name[cs]=Zmeškaný hovor
Name[de]=Verpasster Anruf
Name[en_GB]=Missed Call
Name[es]=Llamada perdida
@ -47,6 +49,7 @@ Action=Popup
Name=Ringing
Name[ca]=Sonant...
Name[ca@valencia]=Sonant...
Name[cs]=Zvoní
Name[de]=Es klingelt
Name[en_GB]=Ringing
Name[es]=Sonando
@ -60,6 +63,7 @@ Name[x-test]=xxRingingxx
Comment=The phone is ringing
Comment[ca]=El telèfon està sonant
Comment[ca@valencia]=El telèfon està sonant
Comment[cs]=Telefon zvoní
Comment[de]=Das Telefon klingelt
Comment[en_GB]=The phone is ringing
Comment[es]=El teléfono está sonando

1
look-and-feel/metadata.desktop
View file

@ -2,6 +2,7 @@
Name=Plasma Phone
Name[ca]=Telèfon del Plasma
Name[ca@valencia]=Telèfon del Plasma
Name[cs]=Plasma Phone
Name[en_GB]=Plasma Phone
Name[es]=Plasma Phone
Name[nl]=Plasma telefoon

1
shell/metadata.desktop
View file

@ -2,6 +2,7 @@
Name=Phone
Name[ca]=Telèfon
Name[ca@valencia]=Telèfon
Name[cs]=Telefon
Name[de]=Telefon
Name[en_GB]=Phone
Name[es]=Teléfono