From 80182cf86beb07b79e7a3b02297c578588dcb413 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Wed, 26 Aug 2020 09:43:35 +0200 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" --- libsound/src/qtgstreamerbackend/qtgstreamerbackend.json | 2 ++ libsound/src/qtmultimediabackend/qtmultimediabackend.json | 2 ++ 2 files changed, 4 insertions(+) diff --git a/libsound/src/qtgstreamerbackend/qtgstreamerbackend.json b/libsound/src/qtgstreamerbackend/qtgstreamerbackend.json index bf55d0a..28377da 100644 --- a/libsound/src/qtgstreamerbackend/qtgstreamerbackend.json +++ b/libsound/src/qtgstreamerbackend/qtgstreamerbackend.json @@ -14,6 +14,7 @@ "Description[fi]": "GStreamer-äänitaustajärjestelmä", "Description[fr]": "Moteur de son pour GStreamer.", "Description[gl]": "Infraestrutura de son para GStreamer.", + "Description[hi]": "जी-स्ट्रीमर के लिए ध्वनि बैकएंड।", "Description[ia]": "Retro-administration de Sono per GStreamer.", "Description[it]": "Motore sonoro per GStreamer.", "Description[ko]": "GStreamer 소리 백엔드입니다.", @@ -45,6 +46,7 @@ "Name[fi]": "GStreamer-taustajärjestelmä", "Name[fr]": "Moteur GStreamer", "Name[gl]": "Infraestrutura de GStreamer", + "Name[hi]": "जी-स्ट्रीमर बैकएंड", "Name[ia]": "Retro-administration de GStreamer", "Name[it]": "Motore GStreamer", "Name[ko]": "GStreamer 백엔드", diff --git a/libsound/src/qtmultimediabackend/qtmultimediabackend.json b/libsound/src/qtmultimediabackend/qtmultimediabackend.json index fd215cf..257a990 100644 --- a/libsound/src/qtmultimediabackend/qtmultimediabackend.json +++ b/libsound/src/qtmultimediabackend/qtmultimediabackend.json @@ -14,6 +14,7 @@ "Description[fi]": "QtMultimedia-äänitaustajärjestelmä", "Description[fr]": "Moteur de son pour QtMultimedia", "Description[gl]": "Infraestrutura de son para QtMultimedia.", + "Description[hi]": "क्यूटी मल्टीमीडिया के लिए ध्वनि बैकएंड।", "Description[ia]": "Retro-administration de Sono per QtMultimedia.", "Description[it]": "Motore sonoro per QtMultimedia.", "Description[ko]": "QtMultimedia 소리 백엔드입니다.", @@ -45,6 +46,7 @@ "Name[fi]": "QtMultimedia-taustajärjestelmä", "Name[fr]": "Moteur QtMultimedia", "Name[gl]": "Infraestrutura de QtMultimedia", + "Name[hi]": "क्यूटी मल्टीमीडिया बैकएंड", "Name[ia]": "Retro-Administration QtMultimedia", "Name[it]": "Motore QtMultimedia", "Name[ko]": "QtMultimedia 백엔드", -- GitLab