From 4aa4bfea25ff93e8cd92f2a9f18350d169f8de2e Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sun, 15 Oct 2017 02:04:31 +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" --- doc/kdesrc-build.desktop | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/kdesrc-build.desktop b/doc/kdesrc-build.desktop index d95e551..bc4f683 100644 --- a/doc/kdesrc-build.desktop +++ b/doc/kdesrc-build.desktop @@ -56,7 +56,7 @@ Comment[es]=Construye la Plataforma KDE y el software asociado desde su código Comment[et]=KDE platvormi ja sellega seotud tarkvara ehitamine lähtekoodist. Ainult käsureal kasutatav programm. Comment[fi]=Kääntää KDE-alustan ja siihen liittyvät ohjelmistot lähdekoodista. On vain komentoriviohjelma. Comment[fr]=Construit la plate-forme KDE et les logiciels associés à partir de son code source. Uniquement un programme en ligne de commandes. -Comment[gl]=Compila a plataforma KDE e o software asociado a partires do código fonte. Programa de liña de ordes. +Comment[gl]=Compila a plataforma KDE e o software asociado a partires do código fonte. Programa de só liña de ordes. Comment[hu]=Lefordítja a KDE platformot és a kapcsolódó szoftvereket a forráskódjukból. Kizárólag parancssoros program. Comment[it]=Genera la piattaforma di KDE e il software ad essa associato dal codice sorgente. Un programma disponibile solo dalla riga di comando. Comment[km]=ស្ថាបនា​កម្មវិធី​របស់​ KDE និង​កម្មវិធី​​ដែល​ភ្ជាប់​​ពី​កូដ​ប្រភព​របស់​វា​​ ។​ កម្មវិធី​បន្ទាត់​ពាក្យ​បញ្ជា​តែ​​​ប៉ុណ្ណោះ​ ។​