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 2018-12-03 05:36:39 +01:00
parent a23368d638
commit bec589fedc
3 changed files with 7 additions and 0 deletions

View file

@ -55,6 +55,7 @@ Comment[uk]=Притлумлює кольори усього екрана, ко
Comment[vi]=Làm ti toàn màn hình khi yêu cu quyn qun tr
Comment[wa]=Fwait pus noer li waitroûle etire cwand on dmande les droets da root
Comment[x-test]=xxDarkens the entire screen when requesting root privilegesxx
Comment[zh_TW]= root
Icon=preferences-system-windows-effect-dimscreen
Name=Dim Screen for Administrator Mode
Name[af]=Verdof vir Administrateurmodus
@ -114,6 +115,7 @@ Name[uk]=Притлумлення кольорів у режимі адміні
Name[vi]=Làm ti màn hình cho chế đ qun tr
Name[wa]=Fé pus noere li waitroûle pol môde Manaedjeu
Name[x-test]=xxDim Screen for Administrator Modexx
Name[zh_TW]=
Type=Service
X-KDE-ParentApp=

View file

@ -2,6 +2,7 @@
Name=Fading Popups
Name[ca]=Missatges emergents esvaïts
Name[ca@valencia]=Missatges emergents esvaïts
Name[en_GB]=Fading Popups
Name[fi]=Hiipuvat ponnahdusikkunat
Name[gl]=Xanelas emerxentes que esvaen
Name[id]=Fading Popups
@ -13,10 +14,12 @@ Name[ru]=Растворяющиеся всплывающие окна
Name[sv]=Borttonande meddelanderutor
Name[uk]=Інтерактивні контекстні панелі
Name[x-test]=xxFading Popupsxx
Name[zh_TW]=
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[en_GB]=Make popups smoothly fade in and out when they are shown or hidden
Comment[fi]=Ponnahdusikkunat tulevat näkyviin tai poistuvat näkyvistä pehmeästi häivyttäen
Comment[gl]=Esvae e fai opacas as xanelas emerxentes con suavidade ao mostralas ou agochadas
Comment[id]=Buat sembulan secara halus lesap-masuk dan lesap-keluar ketika ia ditampilkan atau disembunyikan
@ -28,6 +31,7 @@ Comment[ru]=Всплывающие окна при закрытии будут
Comment[sv]=Gör att meddelanderutor mjukt tonas in eller ut när de visas eller döljs
Comment[uk]=Поступова поява або зникнення контекстних вікон вікон при відкритті чи закритті
Comment[x-test]=xxMake popups smoothly fade in and out when they are shown or hiddenxx
Comment[zh_TW]=
Type=Service
X-KDE-ServiceTypes=KWin/Effect

View file

@ -32,6 +32,7 @@ Comment=Make windows smoothly scale in and out when they are shown or hidden
Comment[ca]=Fa que les finestres entrin o surtin volant quan es mostren o s'oculten
Comment[ca@valencia]=Fa que les finestres entrin o isquen volant quan es mostren o s'oculten
Comment[de]=Ändert die Fenstergröße langsam beim Ein- oder Ausblenden
Comment[en_GB]=Make windows smoothly scale in and out when they are shown or hidden
Comment[fi]=Ikkunat ilmestyvät näkyviin tai poistuvat näkyvistä hiljalleen
Comment[gl]=Facer que as xanelas crezan ou decrezan suavemente cando se mostran ou agochan
Comment[id]=Buat window menskala besar atau kecil secara mulus ketika ia ditampilkan atau disembunyikan