From 53facb3220df5ac51fe678bb82330a46054f819d Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Mon, 15 Jul 2019 05:11:52 +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" --- login-sessions/plasmawayland-dev.desktop.cmake | 1 + login-sessions/plasmax11-dev.desktop.cmake | 1 + 2 files changed, 2 insertions(+) diff --git a/login-sessions/plasmawayland-dev.desktop.cmake b/login-sessions/plasmawayland-dev.desktop.cmake index bd44764ab..c449a9508 100644 --- a/login-sessions/plasmawayland-dev.desktop.cmake +++ b/login-sessions/plasmawayland-dev.desktop.cmake @@ -8,6 +8,7 @@ Name[eu]=Plasma (Garapena ${CMAKE_INSTALL_FULL_BINDIR}) Name[it]=Plasma (Sviluppo ${CMAKE_INSTALL_FULL_BINDIR}) Name[nl]=Plasma (Ontwikkeling ${CMAKE_INSTALL_FULL_BINDIR}) 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[sv]=Plasma (utveckling ${CMAKE_INSTALL_FULL_BINDIR}) diff --git a/login-sessions/plasmax11-dev.desktop.cmake b/login-sessions/plasmax11-dev.desktop.cmake index 885c72716..077ada701 100644 --- a/login-sessions/plasmax11-dev.desktop.cmake +++ b/login-sessions/plasmax11-dev.desktop.cmake @@ -9,6 +9,7 @@ Name[eu]=Plasma (Garapena ${CMAKE_INSTALL_FULL_BINDIR}) Name[it]=Plasma (Sviluppo ${CMAKE_INSTALL_FULL_BINDIR}) Name[nl]=Plasma (Ontwikkeling ${CMAKE_INSTALL_FULL_BINDIR}) 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[sv]=Plasma (utveckling ${CMAKE_INSTALL_FULL_BINDIR})