From af97d4476c6c12a6543c94bc6f0803e8abc70df7 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Tue, 8 Sep 2015 12:50:45 +0000 Subject: [PATCH] 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" --- app/org.kde.kdeconnect.app.desktop | 3 +++ daemon/kdeconnect.desktop | 2 +- kcm/kcm_kdeconnect.desktop | 3 ++- kcm/kdeconnect.desktop | 7 +++++++ kdeconnect-non-plasma.desktop | 12 ++++++++++++ plasmoid/package/metadata.desktop | 2 +- plugins/kdeconnect.notifyrc | 2 +- plugins/notifications/kdeconnect_notifications.json | 1 + 8 files changed, 28 insertions(+), 4 deletions(-) diff --git a/app/org.kde.kdeconnect.app.desktop b/app/org.kde.kdeconnect.app.desktop index 29c5fefeb..cb63f6493 100644 --- a/app/org.kde.kdeconnect.app.desktop +++ b/app/org.kde.kdeconnect.app.desktop @@ -6,6 +6,7 @@ Name[de]=KDE-Connect-Anwendung Name[es]=Aplicación KDE Connect Name[fi]=KDE Connect -sovellus Name[gl]=Programa de KDE Connect +Name[hu]=KDE Connect alkalmazás Name[it]=Applicazione KDE Connect Name[nl]=KDE Connect-toepassing Name[pl]=Program KDE Connect @@ -24,6 +25,7 @@ GenericName[de]=Geräteabgleich GenericName[es]=Sincronización de dispositivos GenericName[fi]=Laitteiden synkronointi GenericName[gl]=Sincronización de dispositivos +GenericName[hu]=Eszközszinkronizáció GenericName[it]=Sincronizzazione dispositivo GenericName[nl]=Synchronisatie van apparaat GenericName[pl]=Synchronizacja urządzenia @@ -42,6 +44,7 @@ Comment[de]=Gleichen Sie alle Ihre Geräte ab Comment[es]=Convertir todos sus dispositivos en uno Comment[fi]=Yhdistä kaikki laitteesi toisiinsa Comment[gl]=Unifique os seus dispositivos. +Comment[hu]=Egyesítse eszközeit Comment[it]=Fai di tutti i tuoi dispositivi un solo dispositivo Comment[nl]=Al uw apparaten een maken Comment[pl]=Uczyń wszystkie swoje urządzenia jednym diff --git a/daemon/kdeconnect.desktop b/daemon/kdeconnect.desktop index fd253e307..cc7562430 100644 --- a/daemon/kdeconnect.desktop +++ b/daemon/kdeconnect.desktop @@ -31,7 +31,7 @@ Name[pt_BR]=KDE Connect Name[ro]=KDE Connect Name[ru]=KDE Connect Name[sk]=KDE Connect -Name[sv]=KDE anslut +Name[sv]=KDE-anslut Name[tr]=KDE Bağlan Name[uk]=З’єднання KDE Name[x-test]=xxKDE Connectxx diff --git a/kcm/kcm_kdeconnect.desktop b/kcm/kcm_kdeconnect.desktop index 4c6469c01..b9ed68916 100755 --- a/kcm/kcm_kdeconnect.desktop +++ b/kcm/kcm_kdeconnect.desktop @@ -32,7 +32,7 @@ Name[pt_BR]=KDE Connect Name[ro]=KDE Connect Name[ru]=KDE Connect Name[sk]=KDE Connect -Name[sv]=KDE anslut +Name[sv]=KDE-anslut Name[tr]=KDE Bağlan Name[uk]=З’єднання KDE Name[x-test]=xxKDE Connectxx @@ -45,6 +45,7 @@ Comment[de]=Verbinden und Abgleichen Ihrer Geräte Comment[es]=Conectar y sincronizar sus dispositivos Comment[fi]=Yhdistä ja synkronoi laitteitasi Comment[gl]=Conecte e sincronice os seus dispositivos. +Comment[hu]=Csatlakoztassa és szinkronizálja eszközeit Comment[it]=Connetti e sincronizza i tuoi dispositivi Comment[nl]=Uw apparaten verbinden en synchroniseren Comment[pl]=Podłącz i zsynchronizuj swoje urządzenia diff --git a/kcm/kdeconnect.desktop b/kcm/kdeconnect.desktop index 158209f11..11c4729c6 100755 --- a/kcm/kdeconnect.desktop +++ b/kcm/kdeconnect.desktop @@ -4,6 +4,12 @@ Icon=kdeconnect Terminal=false Exec=kcmshell5 kcm_kdeconnect Name=KDE Connect Settings +Name[nl]=Instellingen van KDE Connect +Name[pt]=Configuração do KDE Connect +Name[pt_BR]=Configurações do KDE Connect +Name[sv]=Inställning av KDE-anslut +Name[uk]=Параметри KDE Connect +Name[x-test]=xxKDE Connect Settingsxx GenericName=Connect and sync your devices GenericName[ca]=Connecta i sincronitza els vostres dispositius GenericName[cs]=Připojte a synchronizujte svá zařízení @@ -11,6 +17,7 @@ GenericName[de]=Verbinden und Abgleichen Ihrer Geräte GenericName[es]=Conectar y sincronizar sus dispositivos GenericName[fi]=Yhdistä ja synkronoi laitteitasi GenericName[gl]=Conecte e sincronice os seus dispositivos +GenericName[hu]=Csatlakoztassa és szinkronizálja eszközeit GenericName[it]=Connetti e sincronizza i tuoi dispositivi GenericName[nl]=Uw apparaten verbinden en synchroniseren GenericName[pl]=Podłącz i zsynchronizuj swoje urządzenia diff --git a/kdeconnect-non-plasma.desktop b/kdeconnect-non-plasma.desktop index a25fa2fd2..8373c78f9 100755 --- a/kdeconnect-non-plasma.desktop +++ b/kdeconnect-non-plasma.desktop @@ -1,6 +1,18 @@ [Desktop Entry] Name=KDE Connect Monitor +Name[nl]=KDE-Connectmonitor +Name[pt]=Monitor do KDE Connect +Name[pt_BR]=Monitor do KDE Connect +Name[sv]=KDE-anslut övervakning +Name[uk]=Монітор KDE Connect +Name[x-test]=xxKDE Connect Monitorxx Comment=Display information about your devices +Comment[nl]=Toon informatie over uw apparaten +Comment[pt]=Mostrar informações sobre os seus dispositivos +Comment[pt_BR]=Mostra informações sobre seus dispositivos +Comment[sv]=Visa information om enheter +Comment[uk]=Показати дані щодо ваших пристроїв +Comment[x-test]=xxDisplay information about your devicesxx Exec=plasmawindowed org.kde.kdeconnect --statusnotifier Icon=kdeconnect Type=Application diff --git a/plasmoid/package/metadata.desktop b/plasmoid/package/metadata.desktop index 28cf1236f..78f9691a4 100644 --- a/plasmoid/package/metadata.desktop +++ b/plasmoid/package/metadata.desktop @@ -21,7 +21,7 @@ Name[pt_BR]=KDE Connect Name[ro]=KDE Connect Name[ru]=KDE Connect Name[sk]=KDE Connect -Name[sv]=KDE anslut +Name[sv]=KDE-anslut Name[tr]=KDE Bağlan Name[uk]=З’єднання KDE Name[x-test]=xxKDE Connectxx diff --git a/plugins/kdeconnect.notifyrc b/plugins/kdeconnect.notifyrc index 7c3b38e7d..42ce78344 100644 --- a/plugins/kdeconnect.notifyrc +++ b/plugins/kdeconnect.notifyrc @@ -22,7 +22,7 @@ Name[pt_BR]=KDE Connect Name[ro]=KDE Connect Name[ru]=KDE Connect Name[sk]=KDE Connect -Name[sv]=KDE anslut +Name[sv]=KDE-anslut Name[tr]=KDE Bağlan Name[uk]=З’єднання KDE Name[x-test]=xxKDE Connectxx diff --git a/plugins/notifications/kdeconnect_notifications.json b/plugins/notifications/kdeconnect_notifications.json index 878622d91..e703fdfa3 100644 --- a/plugins/notifications/kdeconnect_notifications.json +++ b/plugins/notifications/kdeconnect_notifications.json @@ -14,6 +14,7 @@ "Description[es]": "Mostrar notificaciones del teléfono en su equipo y mantenerlas en sincronía", "Description[fi]": "Näytä puhelimen ilmoitukset tietokoneellasi ja pidä ne ajan tasalla", "Description[gl]": "Mostre notificacións dun teléfono móbil no computador e deixe que as notificacións se sincronicen co teléfono.", + "Description[hu]": "A telefon értesítéseinek megjelenítése a számítógépén és azok szinkronizációja", "Description[it]": "Mostra le notifiche del telefono sul tuo computer e tienile sincronizzate", "Description[nl]": "Telefoonmeldingen op uw computer tonen en ze gesynchroniseerd houden", "Description[pl]": "Pokaż powiadomienia telefonu na swoim komputerze i synchronizuj je",