From ff9d6b336bfaa6ef338469d20502630b0e37b121 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Fri, 3 Apr 2015 10:36:58 +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" --- daemon/kdeconnectd.desktop.cmake | 1 + plugins/battery/kdeconnect_battery.json | 2 ++ plugins/clipboard/kdeconnect_clipboard.json | 2 ++ plugins/kdeconnect.notifyrc | 12 ++++++++++-- plugins/mousepad/kdeconnect_mousepad.json | 2 ++ plugins/mpriscontrol/kdeconnect_mpriscontrol.json | 2 ++ plugins/notifications/kdeconnect_notifications.json | 2 ++ plugins/pausemusic/kdeconnect_pausemusic.json | 2 ++ plugins/ping/kdeconnect_ping.json | 2 ++ .../kdeconnect_screensaver_inhibit.json | 2 ++ plugins/sftp/kdeconnect_sftp.json | 2 ++ plugins/share/kdeconnect_share.json | 2 ++ plugins/telephony/kdeconnect_telephony.json | 2 ++ 13 files changed, 33 insertions(+), 2 deletions(-) diff --git a/daemon/kdeconnectd.desktop.cmake b/daemon/kdeconnectd.desktop.cmake index 2780e65cb..c1b73ba88 100644 --- a/daemon/kdeconnectd.desktop.cmake +++ b/daemon/kdeconnectd.desktop.cmake @@ -13,6 +13,7 @@ Name[cs]=Démon KDE Connect Name[de]=KDE-Connect-Dienst Name[en_GB]=KDEConnect daemon Name[es]=Demonio de KDE Connect +Name[fi]=KDEConnect-taustapalvelu Name[gl]=Servizo de KDE Connect Name[it]=Demone KDE Connect Name[nl]=KDEConnect-daemon diff --git a/plugins/battery/kdeconnect_battery.json b/plugins/battery/kdeconnect_battery.json index 933fa879b..a1c92d02c 100644 --- a/plugins/battery/kdeconnect_battery.json +++ b/plugins/battery/kdeconnect_battery.json @@ -13,6 +13,7 @@ "Description[de]": "Zeigt den Akku Ihres Telefons neben dem Akku des Rechners", "Description[en_GB]": "Show your phone battery next to your computer battery", "Description[es]": "Mostrar la batería del teléfono junto a la batería del equipo", + "Description[fi]": "Näytä puhelimesi akku tietokoneen akun rinnalla", "Description[gl]": "Mostra o nivel de batería do teléfono canda o nivel de batería do computador.", "Description[nl]": "Uw telefoonbatterij naast uw computerbatterij tonen", "Description[pt]": "Mostrar a bateria do seu telefone ao lado da do seu computador", @@ -31,6 +32,7 @@ "Name[de]": "Akkuüberwachung", "Name[en_GB]": "Battery monitor", "Name[es]": "Monitor de batería", + "Name[fi]": "Akkuvalvonta", "Name[gl]": "Vixilante da batería", "Name[nl]": "Batterijmonitor", "Name[pt]": "Monitor da bateria", diff --git a/plugins/clipboard/kdeconnect_clipboard.json b/plugins/clipboard/kdeconnect_clipboard.json index dfaab191d..9b24116e9 100644 --- a/plugins/clipboard/kdeconnect_clipboard.json +++ b/plugins/clipboard/kdeconnect_clipboard.json @@ -13,6 +13,7 @@ "Description[de]": "Die Zwischenablage mit Geräten teilen", "Description[en_GB]": "Share the clipboard between devices", "Description[es]": "Compartir portapapeles entre dispositivos", + "Description[fi]": "Jaa leikepöytä laitteiden välillä", "Description[gl]": "Comparta o portapapeis entre os dispositivos.", "Description[nl]": "Het klembord tussen apparaten delen", "Description[pt]": "Partilhar a área de transferência entre dispositivos", @@ -31,6 +32,7 @@ "Name[de]": "Zwischenablage", "Name[en_GB]": "Clipboard", "Name[es]": "Portapapeles", + "Name[fi]": "Leikepöytä", "Name[gl]": "Portapapeis", "Name[nl]": "Klembord", "Name[pt]": "Área de Transferência", diff --git a/plugins/kdeconnect.notifyrc b/plugins/kdeconnect.notifyrc index 8c30212a1..5bca7ae0b 100644 --- a/plugins/kdeconnect.notifyrc +++ b/plugins/kdeconnect.notifyrc @@ -107,6 +107,7 @@ Name[cs]=Příchozí hovor Name[de]=Eingehender Anruf Name[en_GB]=Incoming Call Name[es]=Llamada entrante +Name[fi]=Saapuva puhelu Name[gl]=Chamada entrante Name[it]=Chiamata in ingresso Name[nl]=Inkomende oproep @@ -151,6 +152,7 @@ Name[cs]=Zmeškaný hovor Name[de]=Verpasster Anruf Name[en_GB]=Missed Call Name[es]=Llamada perdida +Name[fi]=Vastaamaton puhelu Name[gl]=Chamada perdida Name[nl]=Gemiste oproep Name[pt]=Chamada Não Atendida @@ -194,6 +196,7 @@ Name[cs]=SMS přijata Name[de]=SMS empfangen Name[en_GB]=SMS Received Name[es]=SMS recibido +Name[fi]=Saatiin tekstiviesti Name[gl]=Recibiuse un SMS Name[nl]=SMS ontvangen Name[pt]=SMS Recebido @@ -237,6 +240,7 @@ Name[cs]=Baterie je téměř vybitá Name[de]=Akku-Ladestand niedrig Name[en_GB]=Battery Low Name[es]=Batería baja +Name[fi]=Akku vähissä Name[gl]=Batería baixa Name[nl]=Batterij op laag niveau Name[pt]=Bateria Fraca @@ -280,6 +284,7 @@ Name[cs]=Ping přijat Name[de]=Ping empfangen Name[en_GB]=Ping Received Name[es]=Ping recibido +Name[fi]=Saatiin tiedustelupaketti Name[gl]=Recibiuse un ping Name[it]=Ping ricevuto Name[nl]=Ping ontvangen @@ -298,7 +303,7 @@ Comment[da]=Ping modtaget Comment[de]=Ping empfangen Comment[en_GB]=Ping received Comment[es]=Ping recibido -Comment[fi]=Vastaanotettiin tiedustelupaketti +Comment[fi]=Saatiin tiedustelupaketti Comment[fr]=Commande « Ping » reçue Comment[gl]=Recibiuse un “ping”. Comment[hu]=Ping érkezett @@ -324,6 +329,7 @@ Name[cs]=Obecná hlášení Name[de]=Allgemeine Benachrichtigung Name[en_GB]=Generic Notification Name[es]=Notificación genérica +Name[fi]=Yleinen ilmoitus Name[gl]=Notificación xenérica Name[it]=Notifica generica Name[nl]=Algemene melding @@ -342,7 +348,7 @@ Comment[da]=Bekendtgørelse modtaget Comment[de]=Benachrichtigung eingegangen Comment[en_GB]=Notification received Comment[es]=Notificación recibida -Comment[fi]=Vastaanotettiin ilmoitus +Comment[fi]=Saatiin ilmoitus Comment[fr]=Notification reçue Comment[gl]=Recibiuse unha notificación. Comment[hu]=Értesítés érkezett @@ -368,6 +374,7 @@ Name[cs]=Přenos souboru Name[de]=Dateiübertragung Name[en_GB]=File Transfer Name[es]=Transferencia de archivo +Name[fi]=Tiedostonsiirto Name[gl]=Transferencia dun ficheiro Name[it]=Trasferimento file Name[nl]=Bestandsoverdracht @@ -383,6 +390,7 @@ Comment[cs]=Příchozí soubor Comment[de]=Eingehende Datei Comment[en_GB]=Incoming file Comment[es]=Archivo entrante +Comment[fi]=Saapuva tiedosto Comment[gl]=Ficheiro entrante Comment[it]=File in ingresso Comment[nl]=Inkomend bestand diff --git a/plugins/mousepad/kdeconnect_mousepad.json b/plugins/mousepad/kdeconnect_mousepad.json index bf4809ac8..c7cc7eb11 100644 --- a/plugins/mousepad/kdeconnect_mousepad.json +++ b/plugins/mousepad/kdeconnect_mousepad.json @@ -13,6 +13,7 @@ "Description[de]": "Verwendet Ihr Handy als Touchpad und Tastatur", "Description[en_GB]": "Use your phone as a touchpad and keyboard", "Description[es]": "Usar teléfono como panel táctil y teclado", + "Description[fi]": "Käytä puhelintasi kosketuslevynä ja näppäimistönä", "Description[gl]": "Usar o teléfono móbil como touchpad e teclado.", "Description[nl]": "Uw telefoon gebruiken als een touchpad en toetsenbord", "Description[pt]": "Use o seu telefone como um rato e teclado por toque", @@ -31,6 +32,7 @@ "Name[de]": "Virtuelle Eingabe", "Name[en_GB]": "Virtual input", "Name[es]": "Entrada virtual", + "Name[fi]": "Virtuaalinen syöttö", "Name[gl]": "Entrada virtual", "Name[nl]": "Virtuele invoer", "Name[pt]": "Entrada virtual", diff --git a/plugins/mpriscontrol/kdeconnect_mpriscontrol.json b/plugins/mpriscontrol/kdeconnect_mpriscontrol.json index d5ec6f02b..dc197ff28 100644 --- a/plugins/mpriscontrol/kdeconnect_mpriscontrol.json +++ b/plugins/mpriscontrol/kdeconnect_mpriscontrol.json @@ -13,6 +13,7 @@ "Description[de]": "Fernbedienung für Musik und Videos", "Description[en_GB]": "Remote control your music and videos", "Description[es]": "Controlar remotamente vídeos y música", + "Description[fi]": "Kaukosäädin musiikkiisi ja videoihisi", "Description[gl]": "Use o teléfono móbil como mando a distancia para música e vídeos.", "Description[nl]": "Op afstand bedienen van uw muziek en video's", "Description[pt]": "Comandar à distância a sua música e vídeos", @@ -31,6 +32,7 @@ "Name[de]": "Steuerung für Multimedia-Empfänger", "Name[en_GB]": "Multimedia control receiver", "Name[es]": "Receptor de control multimedia", + "Name[fi]": "Multimediakaukosäädin", "Name[gl]": "Receptor de controis multimedia", "Name[nl]": "Ontvanger van bediening voor multimedia", "Name[pt]": "Receptor de controlo multimédia", diff --git a/plugins/notifications/kdeconnect_notifications.json b/plugins/notifications/kdeconnect_notifications.json index 3eb9dab12..aa0c188d4 100644 --- a/plugins/notifications/kdeconnect_notifications.json +++ b/plugins/notifications/kdeconnect_notifications.json @@ -13,6 +13,7 @@ "Description[de]": "Benachrichtigungen in KDE anzeigen und abgleichen", "Description[en_GB]": "Show phone notifications in KDE and keep them in sync", "Description[es]": "Mostrar notificaciones del teléfono en KDE y mantenerlas en sincronía", + "Description[fi]": "Näytä puhelimen ilmoitukset KDE:ssa ja pidä ne ajan tasalla", "Description[gl]": "Mostre notificacións dun teléfono móbil en KDE e deixe que as notificacións se sincronicen co teléfono.", "Description[nl]": "Telefoonmeldingen in KDE tonen en ze gesynchroniseerd houden", "Description[pt]": "Mostrar as notificações do telefone no KDE e mantê-las sincronizadas", @@ -31,6 +32,7 @@ "Name[de]": "Benachrichtigungs-Abgleich", "Name[en_GB]": "Notification sync", "Name[es]": "Sincronización de notificaciones", + "Name[fi]": "Ilmoitusten synkronointi", "Name[gl]": "Sincronización de notificacións", "Name[nl]": "Synchronisatie van meldingen", "Name[pt]": "Sincronização de notificações", diff --git a/plugins/pausemusic/kdeconnect_pausemusic.json b/plugins/pausemusic/kdeconnect_pausemusic.json index 5e059aae2..a51cba513 100644 --- a/plugins/pausemusic/kdeconnect_pausemusic.json +++ b/plugins/pausemusic/kdeconnect_pausemusic.json @@ -13,6 +13,7 @@ "Description[de]": "Hält Musik oder Videos währen eines Anrufs an", "Description[en_GB]": "Pause music/videos during a phone call", "Description[es]": "Pausar música/video durante las llamadas telefónicas", + "Description[fi]": "Keskeytä musiikki ja videot puhelun aikana", "Description[gl]": "Deter a reprodución de música ou vídeos durante as chamadas.", "Description[nl]": "Muziek/video's pauzeren tijdens een telefoongesprek", "Description[pt]": "Pausar a música/vídeos durante uma chamada telefónica", @@ -31,6 +32,7 @@ "Name[de]": "Medium bei Anrufen anhalten", "Name[en_GB]": "Pause media during calls", "Name[es]": "Pausar medios durante las llamadas", + "Name[fi]": "Keskeytä toisto puhelujen aikana", "Name[gl]": "Deter a reprodución durante as chamadas.", "Name[nl]": "Media pauzeren tijdens oproepen", "Name[pt]": "Pausar a reprodução durante as chamadas", diff --git a/plugins/ping/kdeconnect_ping.json b/plugins/ping/kdeconnect_ping.json index f19d6623e..048a59796 100644 --- a/plugins/ping/kdeconnect_ping.json +++ b/plugins/ping/kdeconnect_ping.json @@ -13,6 +13,7 @@ "Description[de]": "Senden und Empfangen von Pings", "Description[en_GB]": "Send and receive pings", "Description[es]": "Enviar y recibir pings", + "Description[fi]": "Lähetä ja vastaanota tiedustelupaketteja", "Description[gl]": "Enviar e recibir pings.", "Description[nl]": "Pings verzenden en ontvangen", "Description[pt]": "Enviar e receber contactos", @@ -31,6 +32,7 @@ "Name[de]": "Ping", "Name[en_GB]": "Ping", "Name[es]": "Ping", + "Name[fi]": "Tiedustelupaketti", "Name[gl]": "Ping", "Name[nl]": "Ping", "Name[pt]": "Contacto", diff --git a/plugins/screensaver-inhibit/kdeconnect_screensaver_inhibit.json b/plugins/screensaver-inhibit/kdeconnect_screensaver_inhibit.json index 4475f9ff0..90fe10825 100644 --- a/plugins/screensaver-inhibit/kdeconnect_screensaver_inhibit.json +++ b/plugins/screensaver-inhibit/kdeconnect_screensaver_inhibit.json @@ -12,6 +12,7 @@ "Description[cs]": "Potlačit spořič pokud je zařízení připojeno", "Description[en_GB]": "Inhibit the screensaver when the device is connected", "Description[es]": "Inhibir el salvapantallas cuando el dispositivo está conectado", + "Description[fi]": "Estä näytönsäästäjän käynnistyminen, kun laite on yhteydessä", "Description[gl]": "Desactivar o salvapantallas mentres o dispositivo estea conectado.", "Description[nl]": "Houdt de schermbeveiliging tegen wanneer het apparaat is verbonden", "Description[pt]": "Inibir o protector de ecrã quando o dispositivo estiver ligado", @@ -30,6 +31,7 @@ "Name[de]": "Bildschirmschoner unterbinden", "Name[en_GB]": "Inhibit screensaver", "Name[es]": "Inhibir salvapantallas", + "Name[fi]": "Estä näytönsäästäjän käynnistyminen", "Name[gl]": "Desactivar o salvapantallas", "Name[nl]": "Schermbeveiliging tegenhouden", "Name[pt]": "Inibir o protector de ecrã", diff --git a/plugins/sftp/kdeconnect_sftp.json b/plugins/sftp/kdeconnect_sftp.json index 8b34a2948..0b596c5d7 100644 --- a/plugins/sftp/kdeconnect_sftp.json +++ b/plugins/sftp/kdeconnect_sftp.json @@ -13,6 +13,7 @@ "Description[de]": "Browsen im Dateisystem des entfernten Geräts mit SFTP", "Description[en_GB]": "Browse the remote device filesystem using SFTP", "Description[es]": "Navegar por el sistema de archivos del dispositivo remoto usando SFTP", + "Description[fi]": "Selaa etälaitteiden tiedostojärjestelmiä SFTP:llä", "Description[gl]": "Explore o sistema de ficheiros do dispositivo remoto mediante SFTP.", "Description[nl]": "Blader door het bestandssysteem met SFTP op het apparaat op afstand", "Description[pt]": "Navegar pelo sistema de ficheiros de um dispositivo remoto por SFTP", @@ -31,6 +32,7 @@ "Name[de]": "Datei-Browser für entferne Systeme", "Name[en_GB]": "Remote filesystem browser", "Name[es]": "Navegador de sistema de archivos remoto", + "Name[fi]": "Etätiedostojärjestelmäselain", "Name[gl]": "Navegador do sistema de ficheiros remoto.", "Name[nl]": "Bestandssysteembrowser op afstand", "Name[pt]": "Navegador de sistemas de ficheiros remotos", diff --git a/plugins/share/kdeconnect_share.json b/plugins/share/kdeconnect_share.json index f8a846c02..8166435ee 100644 --- a/plugins/share/kdeconnect_share.json +++ b/plugins/share/kdeconnect_share.json @@ -13,6 +13,7 @@ "Description[de]": "Empfang und Senden von Dateien, URLs oder einfachem Text", "Description[en_GB]": "Receive and send files, URLs or plain text easily", "Description[es]": "Recibir y enviar archivos, URL o texto sin formato fácilmente", + "Description[fi]": "Vastaanota ja lähetä tiedostoja, verkko-osoitteita tai tekstiä helposti", "Description[gl]": "Comparta e reciba con facilidade ficheiros, enderezos URL ou texto simple.", "Description[nl]": "Bestanden, URL's of platte tekst gemakkelijk ontvangen en verzenden", "Description[pt]": "Receber e enviar ficheiros, URL's ou texto normal de forma simples", @@ -31,6 +32,7 @@ "Name[de]": "Senden und Empfangen", "Name[en_GB]": "Share and receive", "Name[es]": "Compartir y recibir", + "Name[fi]": "Jaa ja vastaanota", "Name[gl]": "Compartir e recibir.", "Name[nl]": "Delen en ontvangen", "Name[pt]": "Partilhar e receber", diff --git a/plugins/telephony/kdeconnect_telephony.json b/plugins/telephony/kdeconnect_telephony.json index c4a6b793d..0521b3053 100644 --- a/plugins/telephony/kdeconnect_telephony.json +++ b/plugins/telephony/kdeconnect_telephony.json @@ -13,6 +13,7 @@ "Description[de]": "Zeigt Benachrichtigungen für Anrufe und SMS", "Description[en_GB]": "Show notifications for calls and SMS (answering coming soon)", "Description[es]": "Mostrar notificaciones para llamadas y SMS (el soporte para las contestaciones es inminente)", + "Description[fi]": "Näytä puhelujen ja tekstiviestien ilmoitukset (vastaaminen tulossa pian)", "Description[gl]": "Mostrar notificacións de chamadas e mensaxes SMS (no futuro tamén poderá contestar chamadas).", "Description[nl]": "Meldingen tonen van oproepen en SMSjes (beantwoorden komt spoedig)", "Description[pt]": "Mostrar notificações para as chamadas e SMS (atendimento em breve)", @@ -31,6 +32,7 @@ "Name[de]": "Telefon-Integration", "Name[en_GB]": "Telephony integration", "Name[es]": "Integración con el teléfono", + "Name[fi]": "Puhelinintegrointi", "Name[gl]": "Integración telefónica", "Name[nl]": "Telefoonintegratie", "Name[pt]": "Integração telefónica",