From d876dde05b8b4e524c69f8c5510c2a8c07d41e60 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Tue, 31 Mar 2020 06:35:42 +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/eyeonscreen/package/metadata.desktop | 2 ++ effects/windowaperture/package/metadata.desktop | 1 + kcmkwin/kwincompositing/kwincompositing.desktop | 1 + 3 files changed, 4 insertions(+) diff --git a/effects/eyeonscreen/package/metadata.desktop b/effects/eyeonscreen/package/metadata.desktop index 1f8ac92d7c..6bd5c54aed 100644 --- a/effects/eyeonscreen/package/metadata.desktop +++ b/effects/eyeonscreen/package/metadata.desktop @@ -2,6 +2,7 @@ Name=Eye on Screen Name[ca]=Ull a la pantalla Name[cs]=Oko na obrazovce +Name[en_GB]=Eye on Screen Name[es]=Ojo a la pantalla Name[et]=Eye on Screen Name[eu]=Begirada pantailan @@ -23,6 +24,7 @@ Name[zh_TW]=螢幕之眼 Icon=preferences-system-windows-effect-eyeonscreen Comment=Suck windows into the desktop Comment[ca]=Enganxa les finestres a l'escriptori +Comment[en_GB]=Suck windows into the desktop Comment[es]=Aspirar las ventanas en el escritorio Comment[et]=Akende imemine töölauale Comment[eu]=Mahaigainak leihoak xurgatu diff --git a/effects/windowaperture/package/metadata.desktop b/effects/windowaperture/package/metadata.desktop index 1ea04acc6c..fc8d13731f 100644 --- a/effects/windowaperture/package/metadata.desktop +++ b/effects/windowaperture/package/metadata.desktop @@ -44,6 +44,7 @@ Icon=preferences-system-windows-effect-windowaperture Comment=Move windows into screen corners Comment[ca]=Mou les finestres cap a les cantonades de la pantalla Comment[cs]=Přesunout okna do rohů obrazovky +Comment[en_GB]=Move windows into screen corners Comment[es]=Mover las ventanas a las esquinas de la pantalla Comment[et]=Akende liigutamine ekraani nurkadesse Comment[eu]=Eraman leihoak pantailako bazterretara diff --git a/kcmkwin/kwincompositing/kwincompositing.desktop b/kcmkwin/kwincompositing/kwincompositing.desktop index 70aa154abe..d5c8a97b0a 100644 --- a/kcmkwin/kwincompositing/kwincompositing.desktop +++ b/kcmkwin/kwincompositing/kwincompositing.desktop @@ -106,6 +106,7 @@ Comment[zh_TW]=桌面效果使用的組合器設定 X-KDE-Keywords=kwin,window,manager,compositing,effect,3D effects,2D effects,OpenGL,XRender,video settings,graphical effects,desktop effects X-KDE-Keywords[ca]=kwin,finestra,gestor,composició,efecte,efectes 3D,efectes 2D,OpenGL,XRender,arranjament de vídeo,efectes gràfics,efectes de l'escriptori X-KDE-Keywords[da]=kwin,vindue,håndtering,window,manager,compositing,effekt,3D effekter,2D effekter,OpenGL,XRender,video-indstillinger,grafiske effekter,skrivebordseffekter,desktop effects +X-KDE-Keywords[en_GB]=kwin,window,manager,compositing,effect,3D effects,2D effects,OpenGL,XRender,video settings,graphical effects,desktop effects X-KDE-Keywords[es]=kwin,ventana,gestor,composición,efecto,efectos 3D,efectos 2D,OpenGL,XRender,preferencias de vídeo,efectos gráficos,efectos del escritorio X-KDE-Keywords[et]=kwin,aken,haldur,komposiit,komposiitor,efekt,3D efektid,ruumilised efektid,2D efektid,OpenGL,XRender,videoseadistused,graafilised efektid,töölauaefektid X-KDE-Keywords[eu]=kwin,leihoa,kudeatzailea,konposatzailea,efektua,3Dtako efektuak,2Dtako efektuak,OpenGL,XRender,bideo ezarpenak,efektu grafikoak,mahaigaineko efektuak