tristan/kdeconnect-kde
1
0
Fork 0
Code Issues Pull requests 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 2015-12-09 09:05:00 +00:00
parent b8a351092d
commit 4c06c63d39
1 changed files with 3 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
plugins/notifications/kdeconnect_notifications_config.desktop
View file

@ -8,6 +8,9 @@ X-KDE-ParentComponents=kdeconnect_notifications
Name=Notification synchronization plugin settings
Name[ca]=Ajustament del connector per a la sincronització de les notificacions
Name[ca@valencia]=Ajustament del connector per a la sincronització de les notificacions
Name[en_GB]=Notification synchronisation plugin settings
Name[fi]=Ilmoitusten synkronointiliitännäisen asetukset
Name[gl]=Configuración do complemento de sincronización de notificacións
Name[nl]=Instellingen van plug-in voor synchronisatie van meldingen
Name[pt]=Configuração do 'plugin' de sincronização das notificações
Name[pt_BR]=Configuração do plugin de sincronização das notificações