From f0a021eae544e74ad79219b48e28c870a56a55f3 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sun, 3 Nov 2019 05:21:29 +0100 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/sessionquit/package/metadata.desktop | 16 ++++++++++++++++ kcmkwin/kwineffects/kcm_kwin_effects.desktop | 1 + 2 files changed, 17 insertions(+) diff --git a/effects/sessionquit/package/metadata.desktop b/effects/sessionquit/package/metadata.desktop index 9ec8304e4c..34cd49f342 100644 --- a/effects/sessionquit/package/metadata.desktop +++ b/effects/sessionquit/package/metadata.desktop @@ -1,7 +1,23 @@ [Desktop Entry] Name=Session Quit +Name[ca]=Sortida de la sessió +Name[eu]=Saiotik irtetea +Name[lt]=Seanso baigimas +Name[nl]=Afsluiten van sessie +Name[pt]=Saída da Sessão +Name[pt_BR]=Saída da sessão +Name[uk]=Вихід з сеансу +Name[x-test]=xxSession Quitxx Icon=preferences-system-windows-effect-logout Comment=Keep the desktop background alive during logout until the end +Comment[ca]=Manté viu el fons de l'escriptori durant la sortida de la sessió fins el final +Comment[eu]=Eutsi mahaigaineko atzeko-planoa bizirik saio-ixtean bukaera arte +Comment[lt]=Atsijungiant, išlaikyti darbalaukio foną reaguojantį iki pat galo +Comment[nl]=De achtergrond van het bureaublad tot het einde levend houden gedurende afmelden +Comment[pt]=Manter o fundo do ecrã activo durante a saída da sessão até ao fim +Comment[pt_BR]=Mantém ativo o fundo da área de trabalho até o fim do fechamento da sessão +Comment[uk]=Не вимикати тло стільниці до кінця процедури виходу із облікового запису +Comment[x-test]=xxKeep the desktop background alive during logout until the endxx Type=Service X-KDE-ServiceTypes=KWin/Effect diff --git a/kcmkwin/kwineffects/kcm_kwin_effects.desktop b/kcmkwin/kwineffects/kcm_kwin_effects.desktop index 7c7dcde4f4..903c42fa16 100644 --- a/kcmkwin/kwineffects/kcm_kwin_effects.desktop +++ b/kcmkwin/kwineffects/kcm_kwin_effects.desktop @@ -68,6 +68,7 @@ Comment[de]=Compositor-Einstellungen für Arbeitsflächen-Effekte einrichten Comment[en_GB]=Configure compositor settings for desktop effects Comment[es]=Configurar las preferencias del compositor para los efectos del escritorio Comment[et]=Komposiitori seadistamine töölauaefektide tarbeks +Comment[eu]=Konfiguratu konposatzailearen ezarpenak mahaigaineko efektuetarako Comment[fi]=Koostimen asetukset työpöytätehosteille Comment[gl]=Configurar o compositor para os efectos de escritorio Comment[id]=Konfigurasikan pengaturan kompositor untuk efek desktop