yukijoou/kwin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

SVN_SILENT made messages (.desktop file) - always resolve ours

Browse source 
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-10-08 06:07:21 +02:00
parent ca3cbbce84
commit e60c878647
4 changed files with 5 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
effects/logout/package/metadata.desktop
View file

@ -3,6 +3,7 @@ Name=Logout
Name[ca]=Sortida Name[ca]=Sortida
Name[ca@valencia]=Eixida Name[ca@valencia]=Eixida
Name[cs]=Odhlášení Name[cs]=Odhlášení
Name[de]=Abmeldung
Name[en_GB]=Logout Name[en_GB]=Logout
Name[es]=Cerrar la sesión Name[es]=Cerrar la sesión
Name[eu]=Saio-ixtea Name[eu]=Saio-ixtea

1
effects/scale/scale_config.desktop
View file

@ -9,6 +9,7 @@ Name=Scale
Name[ca]=Escala Name[ca]=Escala
Name[ca@valencia]=Escala Name[ca@valencia]=Escala
Name[cs]=Měřítko Name[cs]=Měřítko
Name[de]=Skalieren
Name[en_GB]=Scale Name[en_GB]=Scale
Name[es]=Escalar Name[es]=Escalar
Name[eu]=Eskalatu Name[eu]=Eskalatu

1
effects/showpaint/showpaint_config.desktop
View file

@ -47,6 +47,7 @@ Name[mr]=रंग दर्शवा
Name[nds]=Klöör wiesen Name[nds]=Klöör wiesen
Name[ne]=रङ देखाउनुहोस् Name[ne]=रङ देखाउनुहोस्
Name[nl]=Intekening tonen Name[nl]=Intekening tonen
Name[nn]=Vis oppteikning
Name[pa]=ਪੇਂਟ ਵੇਖੋ Name[pa]=ਪੇਂਟ ਵੇਖੋ
Name[pl]=Pokaż rysowane Name[pl]=Pokaż rysowane
Name[pt]=Mostrar a Pintura Name[pt]=Mostrar a Pintura

2
packageplugins/effect/kwin-packagestructure-effect.desktop
View file

@ -2,10 +2,12 @@
Name=KWin Effect Name=KWin Effect
Name[ca]=Efecte del KWin Name[ca]=Efecte del KWin
Name[ca@valencia]=Efecte del KWin Name[ca@valencia]=Efecte del KWin
Name[de]=KWin-Effekt
Name[es]=Efecto de KWin Name[es]=Efecto de KWin
Name[id]=KWin Effect Name[id]=KWin Effect
Name[it]=Effetto di KWin Name[it]=Effetto di KWin
Name[nl]=KWin-effect Name[nl]=KWin-effect
Name[nn]=KWin-effekt
Name[pt]=Efeito do KWin Name[pt]=Efeito do KWin
Name[pt_BR]=Efeito do KWin Name[pt_BR]=Efeito do KWin
Name[ru]=Эффект диспетчера окон Name[ru]=Эффект диспетчера окон