From f5900a5fd0cdfb5edd62d9c9c69789e8d5a2ccfb Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sat, 12 Sep 2020 06:11:10 +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" --- effects/fullscreen/package/metadata.desktop | 4 ++++ effects/maximize/package/metadata.desktop | 2 +- kwin.notifyrc | 2 ++ 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/effects/fullscreen/package/metadata.desktop b/effects/fullscreen/package/metadata.desktop index 049cead8b1..4a929db6e7 100644 --- a/effects/fullscreen/package/metadata.desktop +++ b/effects/fullscreen/package/metadata.desktop @@ -3,7 +3,9 @@ Comment=Animation for a window going to and leaving full screen mode Comment[ca]=Animació per a una finestra que entra o abandona el mode de pantalla completa Comment[es]=Animación para una ventana que entra en el modo de pantalla completa o sale de él Comment[nl]=Animatie voor een venster dat gaat naar volledig scherm en deze verlaat +Comment[pt]=Animação para uma janela que vai entrar/sair do modo de ecrã completo Comment[sk]=Animácia pre okno smerujúce do a opúšťajúce režim celej obrazovky +Comment[sl]=Animacija za razpenjanje ali zapuščanje čez zaslon razpetega okna Comment[sv]=Animering för ett fönster till och från fullskärmsläge Comment[uk]=Анімація для вікон під час входу до повноекранного режиму і виходу з нього Comment[x-test]=xxAnimation for a window going to and leaving full screen modexx @@ -12,8 +14,10 @@ Name=Full Screen Name[ca]=Pantalla completa Name[es]=Pantalla completa Name[nl]=Volledig scherm +Name[pt]=Ecrã Completo Name[pt_BR]=Tela inteira Name[sk]=Celá obrazovka +Name[sl]=Celotni zaslon Name[sv]=Fullskärm Name[uk]=Повноекранний режим Name[x-test]=xxFull Screenxx diff --git a/effects/maximize/package/metadata.desktop b/effects/maximize/package/metadata.desktop index cbeb7f0494..4065a817ea 100644 --- a/effects/maximize/package/metadata.desktop +++ b/effects/maximize/package/metadata.desktop @@ -29,7 +29,7 @@ Comment[nds]=Animeren för en Finster, dat maximeert/vun maximeert wedderherstel Comment[nl]=Animatie voor een venster dat gaat naar maximaliseren/herstellen vanuit maximaliseren Comment[nn]=Vindaugsanimasjon i samband med bruk av maksimering/gjenoppretting. Comment[pl]=Okna są gładko skalowane przy maksymalizacji i przy powrocie z niej -Comment[pt]=Animação para um janela que se vai maximizar/repor da maximização +Comment[pt]=Animação para uma janela que se vai maximizar/repor da maximização Comment[pt_BR]=Animação para uma janela a ser maximizada/restaurada Comment[ro]=Animație pentru o fereastră ce trece la maximizare/restabilire din maximizare Comment[ru]=Анимация для окна, которое будет максимизировано/восстановит размер после максимизации diff --git a/kwin.notifyrc b/kwin.notifyrc index e6a6e69f14..68c89613c2 100644 --- a/kwin.notifyrc +++ b/kwin.notifyrc @@ -298,6 +298,7 @@ Name[ko]=Xwayland 충돌 Name[nl]=Xwayland-crash Name[pt]=Estoiro do Xwayland Name[sk]=Pád Xwayland-u +Name[sl]=Sesutje Xwayland Name[sv]=Krasch av Xwayland Name[uk]=Аварія Xwayland Name[x-test]=xxXwayland Crashxx @@ -311,6 +312,7 @@ Comment[ko]=Xwayland가 충돌함 Comment[nl]=Xwayland is gecrasht Comment[pt]=O Xwayland estoirou Comment[sk]=Xwayland spadol +Comment[sl]=Xwayland se je sesul Comment[sv]=Xwayland har kraschat Comment[uk]=Xwayland завершив роботу в аварійному режимі Comment[x-test]=xxXwayland has crashedxx