From 4656d3fac0983c10806d6bb144e080f590ef7896 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Wed, 24 Jul 2019 05:43:41 +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" --- krunner/krunner.desktop | 1 + login-sessions/plasmawayland-dev.desktop.cmake | 1 + login-sessions/plasmax11-dev.desktop.cmake | 1 + 3 files changed, 3 insertions(+) diff --git a/krunner/krunner.desktop b/krunner/krunner.desktop index b68323ff9..05d082e3e 100644 --- a/krunner/krunner.desktop +++ b/krunner/krunner.desktop @@ -67,6 +67,7 @@ Name[nn]=Køyr kommando på innhaldet på utklippstavla Name[pl]=Wykonaj polecenie na zawartości schowka Name[pt]=Executar o comando no conteúdo da área de transferência Name[pt_BR]=Executar comando no conteúdo da área de transferência +Name[sk]=Spustiť príkaz na obsahu schránky Name[sv]=Kör kommando med klippbordets innehåll Name[uk]=Виконати команду над вмістом буфера обміну Name[x-test]=xxRun command on clipboard contentsxx diff --git a/login-sessions/plasmawayland-dev.desktop.cmake b/login-sessions/plasmawayland-dev.desktop.cmake index 6bea72f78..25a83a443 100644 --- a/login-sessions/plasmawayland-dev.desktop.cmake +++ b/login-sessions/plasmawayland-dev.desktop.cmake @@ -11,6 +11,7 @@ Name[nn]=Plasma (utvikling ${CMAKE_INSTALL_FULL_BINDIR}) Name[pl]=Plazma (Rozwój ${CMAKE_INSTALL_FULL_BINDIR}) Name[pt]=Plasma (Desenvolvimento ${CMAKE_INSTALL_FULL_BINDIR}) Name[pt_BR]=Plasma (Desenvolvimento ${CMAKE_INSTALL_FULL_BINDIR}) +Name[sk]=Plasma (Development ${CMAKE_INSTALL_FULL_BINDIR}) Name[sv]=Plasma (utveckling ${CMAKE_INSTALL_FULL_BINDIR}) Name[uk]=Пзазма (Розробка ${CMAKE_INSTALL_FULL_BINDIR}) Name[x-test]=xxPlasma (Development ${CMAKE_INSTALL_FULL_BINDIR})xx diff --git a/login-sessions/plasmax11-dev.desktop.cmake b/login-sessions/plasmax11-dev.desktop.cmake index 358e149e8..00c0c57e8 100644 --- a/login-sessions/plasmax11-dev.desktop.cmake +++ b/login-sessions/plasmax11-dev.desktop.cmake @@ -12,6 +12,7 @@ Name[nn]=Plasma (utvikling ${CMAKE_INSTALL_FULL_BINDIR}) Name[pl]=Plazma (Rozwój ${CMAKE_INSTALL_FULL_BINDIR}) Name[pt]=Plasma (Desenvolvimento ${CMAKE_INSTALL_FULL_BINDIR}) Name[pt_BR]=Plasma (Desenvolvimento ${CMAKE_INSTALL_FULL_BINDIR}) +Name[sk]=Plasma (Development ${CMAKE_INSTALL_FULL_BINDIR}) Name[sv]=Plasma (utveckling ${CMAKE_INSTALL_FULL_BINDIR}) Name[uk]=Пзазма (Розробка ${CMAKE_INSTALL_FULL_BINDIR}) Name[x-test]=xxPlasma (Development ${CMAKE_INSTALL_FULL_BINDIR})xx