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"
This commit is contained in:
l10n daemon script 2020-02-11 05:59:16 +01:00
parent e5546c9236
commit 78c0095a5d
15 changed files with 15 additions and 0 deletions

View file

@ -2,6 +2,7 @@
Name=Login
Name[af]=Aanteken
Name[ar]=ولوج
Name[ast]=Aniciu de sesión
Name[be]=Уваход
Name[be@latin]=Uvachod
Name[bg]=Вход

View file

@ -1,5 +1,6 @@
[Desktop Entry]
Name=Logout
Name[ast]=Zarru de sesión
Name[ca]=Sortida
Name[ca@valencia]=Eixida
Name[cs]=Odhlášení

View file

@ -7,6 +7,7 @@ X-KDE-ParentComponents=magiclamp
Name=Magic Lamp
Name[ar]=المصباح السحري
Name[ast]=Llámpara máxica
Name[be@latin]=Mahičnaja lampa
Name[bg]=Вълшебна лампа
Name[bs]=Magična lampa

View file

@ -47,6 +47,7 @@ Comment[zh_CN]=窗口最大化/从最大化恢复时显示动画
Comment[zh_TW]=/
Icon=preferences-system-windows-effect-maximize
Name=Maximize
Name[ast]=Maximización
Name[bs]=Maksimiziraj
Name[ca]=Maximitza
Name[ca@valencia]=Maximitza

View file

@ -6,6 +6,7 @@ X-KDE-Library=kwin_mouseclick_config
X-KDE-ParentComponents=mouseclick
Name=Mouse Click Animation
Name[ast]=Animación al calcar col mur
Name[bs]=Animacija klika mišem
Name[ca]=Animació en fer clic amb el ratolí
Name[ca@valencia]=Animació de clic de ratolí

View file

@ -8,6 +8,7 @@ X-KDE-ParentComponents=presentwindows
Name=Present Windows
Name[af]=Wys vensters
Name[ar]=النوافذ الحاضرة
Name[ast]=Presentación de ventanes
Name[be]=Існуючыя вокны
Name[be@latin]=Najaŭnyja vokny
Name[bg]=Представяне на прозорци

View file

@ -7,6 +7,7 @@ X-KDE-ParentComponents=resize
Name=Resize Window
Name[ar]=غير حجم النافذة
Name[ast]=Redimensión de ventanes
Name[bg]=Преоразмеряване на прозорци
Name[bs]=Preuveličanje prozora
Name[ca]=Redimensionament de les finestres

View file

@ -1,5 +1,6 @@
[Desktop Entry]
Name=Window Aperture
Name[ast]=Apertura de ventanes
Name[ca]=Obertura de la finestra
Name[ca@valencia]=Obertura de la finestra
Name[cs]=Mřížka oken

View file

@ -8,6 +8,7 @@ X-KDE-ParentComponents=wobblywindows
Name=Wobbly Windows
Name[af]=Wobbly Windows
Name[ar]=نوافذ متذبذبة
Name[ast]=Ventanes cimblantes
Name[be@latin]=Skryŭleńnie akon
Name[bg]=Желирани прозорци
Name[bs]=Lelujavi prozori

View file

@ -9,6 +9,7 @@ Name=Zoom
Name[af]=Zoem
Name[ar]=تكبير
Name[as]=
Name[ast]=Zoom
Name[be]=Маштабаванне
Name[be@latin]=Maštab
Name[bg]=Мащабиране

View file

@ -13,6 +13,7 @@ X-KDE-System-Settings-Parent-Category=display
X-KDE-Weight=60
Name=Compositor
Name[ast]=Compositor
Name[bs]=Compositor
Name[ca]=Compositor
Name[ca@valencia]=Compositor

View file

@ -14,6 +14,7 @@ X-KDE-Weight=60
Name=Virtual Desktops
Name[ar]=أسطح المكتب الافتراضية
Name[ast]=Escritorios virtuales
Name[bg]=Виртуални работни плотове
Name[bs]=Virtuelne površi
Name[ca]=Escriptoris virtuals

View file

@ -1,6 +1,7 @@
[Desktop Entry]
Name=Virtual Desktops
Name[ar]=أسطح المكتب الافتراضية
Name[ast]=Escritorios virtuales
Name[bg]=Виртуални работни плотове
Name[bs]=Virtuelne površi
Name[ca]=Escriptoris virtuals

View file

@ -11,6 +11,7 @@ X-KDE-System-Settings-Parent-Category=desktopbehavior
X-KDE-Weight=50
Name=Touch Screen
Name[ast]=Pantalla táutil
Name[ca]=Pantalla tàctil
Name[ca@valencia]=Pantalla tàctil
Name[cs]=Dotyková obrazovka

View file

@ -88,6 +88,7 @@ Name[zh_CN]=Plastik
Name[zh_TW]=Plastik
Comment=The classic theme known from KDE 3
Comment[ar]=السّمة الكلاسيكيّة المعروفة من كدي 3
Comment[ast]=El tema clásicu y conocíu de KDE 3
Comment[bs]=Klasična tema iz KDE 3
Comment[ca]=El tema clàssic conegut des del KDE 3
Comment[ca@valencia]=El tema clàssic conegut des de KDE 3