From d0f43896083a6276856046fa45a0a718edf2ed0c Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sat, 4 May 2024 03:21:24 +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 | 2 +- daemon/org.kde.kdeconnect.daemon.desktop.cmake | 2 +- data/kdeconnect-dde.desktop | 2 +- data/kdeconnect-thunar.desktop | 2 +- indicator/org.kde.kdeconnect.nonplasma.desktop | 2 +- plugins/kdeconnect.notifyrc | 6 +++--- settings/org.kde.kdeconnect-settings.desktop | 2 +- smsapp/org.kde.kdeconnect.sms.desktop | 2 +- urlhandler/org.kde.kdeconnect.handler.desktop | 2 +- 9 files changed, 11 insertions(+), 11 deletions(-) diff --git a/app/org.kde.kdeconnect.app.desktop b/app/org.kde.kdeconnect.app.desktop index f4cc5720a..b35fdb356 100644 --- a/app/org.kde.kdeconnect.app.desktop +++ b/app/org.kde.kdeconnect.app.desktop @@ -17,7 +17,7 @@ Name[es]=KDE Connect Name[et]=KDE Connect Name[eu]=KDE Connect Name[fi]=KDE Connect -Name[fr]=KDE Connect +Name[fr]=KDEConnect Name[gl]=KDE Connect Name[he]=KDE Connect Name[hu]=KDE Connect diff --git a/daemon/org.kde.kdeconnect.daemon.desktop.cmake b/daemon/org.kde.kdeconnect.daemon.desktop.cmake index 64f18a7d6..add949661 100644 --- a/daemon/org.kde.kdeconnect.daemon.desktop.cmake +++ b/daemon/org.kde.kdeconnect.daemon.desktop.cmake @@ -25,7 +25,7 @@ Name[es]=KDE Connect Name[et]=KDE Connect Name[eu]=KDE Connect Name[fi]=KDE Connect -Name[fr]=KDE Connect +Name[fr]=KDEConnect Name[gl]=KDE Connect Name[he]=KDE Connect Name[hu]=KDE Connect diff --git a/data/kdeconnect-dde.desktop b/data/kdeconnect-dde.desktop index bb7080ecc..96e32a711 100644 --- a/data/kdeconnect-dde.desktop +++ b/data/kdeconnect-dde.desktop @@ -20,7 +20,7 @@ Name[es]=Enviar via KDE Connect Name[et]=Saatmine KDE Connecti kaudu Name[eu]=Bidali KDE Connect bidez Name[fi]=Lähetä tiedosto KDE Connectilla -Name[fr]=Envoyer via KDE Connect +Name[fr]=Envoyer via KDEConnect Name[gl]=Enviar por KDE Connect Name[he]=שליחה דרך KDE Connect Name[hu]=Küldés a KDE Connecttel diff --git a/data/kdeconnect-thunar.desktop b/data/kdeconnect-thunar.desktop index 3cce08dc3..db33db78a 100644 --- a/data/kdeconnect-thunar.desktop +++ b/data/kdeconnect-thunar.desktop @@ -20,7 +20,7 @@ Name[es]=Enviar via KDE Connect Name[et]=Saatmine KDE Connecti kaudu Name[eu]=Bidali KDE Connect bidez Name[fi]=Lähetä tiedosto KDE Connectilla -Name[fr]=Envoyer via KDE Connect +Name[fr]=Envoyer via KDEConnect Name[gl]=Enviar por KDE Connect Name[he]=שליחה דרך KDE Connect Name[hu]=Küldés a KDE Connecttel diff --git a/indicator/org.kde.kdeconnect.nonplasma.desktop b/indicator/org.kde.kdeconnect.nonplasma.desktop index 193a5b136..32900fb12 100644 --- a/indicator/org.kde.kdeconnect.nonplasma.desktop +++ b/indicator/org.kde.kdeconnect.nonplasma.desktop @@ -15,7 +15,7 @@ Name[es]=Indicador de KDE Connect Name[et]=KDE Connecti indikaator Name[eu]=KDE Connect adierazlea Name[fi]=KDE Connect -osoitin -Name[fr]=Indicateur de KDE Connect +Name[fr]=Indicateur de KDEConnect Name[gl]=Indicador de KDE Connect Name[he]=מחוון KDE Connect Name[hu]=KDE Connect jelző diff --git a/plugins/kdeconnect.notifyrc b/plugins/kdeconnect.notifyrc index 08de5da4e..4c7182f5b 100644 --- a/plugins/kdeconnect.notifyrc +++ b/plugins/kdeconnect.notifyrc @@ -18,7 +18,7 @@ Name[es]=KDE Connect Name[et]=KDE Connect Name[eu]=KDE Connect Name[fi]=KDE Connect -Name[fr]=KDE Connect +Name[fr]=KDEConnect Name[gl]=KDE Connect Name[he]=KDE Connect Name[hu]=KDE Connect @@ -546,7 +546,7 @@ Name[es]=Ping recibido Name[et]=Pingi saamine Name[eu]=Ping jaso da Name[fi]=Saatiin tiedustelupaketti -Name[fr]=Ping reçu +Name[fr]=Réception du ping Name[gl]=Recibiuse un ping Name[he]=התקבל פינג Name[hu]=Ping érkezett @@ -597,7 +597,7 @@ Comment[es]=Ping recibido Comment[et]=Pingi saamine Comment[eu]=Ping jaso da Comment[fi]=Saatiin tiedustelupaketti -Comment[fr]=Ping reçu +Comment[fr]=Réception du ping Comment[gl]=Recibiuse un “ping”. Comment[he]=התקבל פינג Comment[hu]=Ping érkezett diff --git a/settings/org.kde.kdeconnect-settings.desktop b/settings/org.kde.kdeconnect-settings.desktop index 8439bb717..a99389e6c 100755 --- a/settings/org.kde.kdeconnect-settings.desktop +++ b/settings/org.kde.kdeconnect-settings.desktop @@ -19,7 +19,7 @@ Name[es]=Ajustes de KDE Connect Name[et]=KDE Connecti seadistused Name[eu]=KDE Connect ezarpenak Name[fi]=KDE Connectin asetukset -Name[fr]=Paramètres de KDE Connect +Name[fr]=Paramètres de KDEConnect Name[gl]=Configuración de KDE Connect Name[he]=הגדרות KDE Connect Name[hu]=A KDE Connect beállításai diff --git a/smsapp/org.kde.kdeconnect.sms.desktop b/smsapp/org.kde.kdeconnect.sms.desktop index 195940ce6..e85ebebda 100644 --- a/smsapp/org.kde.kdeconnect.sms.desktop +++ b/smsapp/org.kde.kdeconnect.sms.desktop @@ -15,7 +15,7 @@ Name[es]=SMS de KDE Connect Name[et]=KDE Connecti SMS Name[eu]=KDE Connect SMS Name[fi]=KDE Connectin tekstiviestit -Name[fr]=KDE Connect SMS +Name[fr]=SMS par KDEConnect Name[gl]=SMS de KDE Connect Name[he]=מסרונים עם KDE Connect Name[hu]=KDE Connect SMS diff --git a/urlhandler/org.kde.kdeconnect.handler.desktop b/urlhandler/org.kde.kdeconnect.handler.desktop index 588f4c8d3..b95f2c1b3 100644 --- a/urlhandler/org.kde.kdeconnect.handler.desktop +++ b/urlhandler/org.kde.kdeconnect.handler.desktop @@ -17,7 +17,7 @@ Name[es]=KDE Connect Name[et]=KDE Connect Name[eu]=KDE Connect Name[fi]=KDE Connect -Name[fr]=KDE Connect +Name[fr]=KDEConnect Name[gl]=KDE Connect Name[he]=KDE Connect Name[hu]=KDE Connect