From b854fd462c6a95baf613543c8504caa283773c40 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Mon, 19 Nov 2018 05:20:59 +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/dimscreen/package/metadata.desktop | 4 ++++ effects/fadingpopups/package/metadata.desktop | 2 ++ 2 files changed, 6 insertions(+) diff --git a/effects/dimscreen/package/metadata.desktop b/effects/dimscreen/package/metadata.desktop index 1e5de91478..27152aadbc 100644 --- a/effects/dimscreen/package/metadata.desktop +++ b/effects/dimscreen/package/metadata.desktop @@ -2,6 +2,8 @@ Comment=Darkens the entire screen when requesting root privileges Comment[ar]=يعتم كامل الشاشة عند طلب صلاحيات الجذر Comment[bg]=Екранът затъмнява при необходимост от администраторски права +Comment[ca]=Enfosqueix tota la pantalla en demanar privilegis d'administrador +Comment[ca@valencia]=Enfosqueix tota la pantalla en demanar privilegis d'administrador Comment[da]=Gør hele skærmen mørkere når der bedes om root-privilegier Comment[de]=Dunkelt den gesamten Bildschirm ab, wenn nach dem Systemverwalter-Passwort gefragt wird. Comment[el]=Σκίαση ολόκληρης της οθόνης όταν απαιτούνται διακαιώματα ριζικού χρήστη root @@ -55,6 +57,8 @@ Name=Dim Screen for Administrator Mode Name[af]=Verdof vir Administrateurmodus Name[ar]=يعتم الشاشة لنمط المدير Name[bg]=Затъмняване на екрана в администраторски режим +Name[ca]=Enfosqueix la pantalla pel mode administrador +Name[ca@valencia]=Enfosqueix la pantalla pel mode administrador Name[da]=Dæmp skærmen til administratortilstand Name[de]=Bildschirm für Systemverwaltungsmodus abdunkeln Name[el]=Σκίαση οθόνης σε λειτουργία διαχειριστή diff --git a/effects/fadingpopups/package/metadata.desktop b/effects/fadingpopups/package/metadata.desktop index eab5b0b71e..1146551e2a 100644 --- a/effects/fadingpopups/package/metadata.desktop +++ b/effects/fadingpopups/package/metadata.desktop @@ -1,6 +1,7 @@ [Desktop Entry] Name=Fading Popups Name[ca]=Missatges emergents esvaïts +Name[ca@valencia]=Missatges emergents esvaïts Name[gl]=Xanelas emerxentes que esvaen Name[nl]=Vervagende pop-ups Name[nn]=Inn- og uttoning av sprettoppvindauge @@ -11,6 +12,7 @@ Name[x-test]=xxFading Popupsxx Icon=preferences-system-windows-effect-fadingpopups Comment=Make popups smoothly fade in and out when they are shown or hidden Comment[ca]=Fa que els missatges emergents s'encenguin o s'apaguin de manera gradual quan es mostren o s'oculten +Comment[ca@valencia]=Fa que els missatges emergents s'encenguin o s'apaguin de manera gradual quan es mostren o s'oculten Comment[gl]=Esvae e fai opacas as xanelas emerxentes con suavidade ao mostralas ou agochadas Comment[nl]=Laat pop-ups vloeiend opkomen/vervagen als ze worden weergegeven of verborgen Comment[nn]=Ton sprettoppvindauge gradvis inn og ut når dei vert viste eller gøymde