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 2017-03-29 05:17:37 +02:00
parent a04d4de06a
commit 7d72aeda5c
6 changed files with 12 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
kcmkwin/kwincompositing/kwineffect.knsrc
View file

@ -1,5 +1,7 @@
[KNewStuff3]
Name=Window Manager Effects
Name[ca]=Efectes del gestor de finestres
Name[ca@valencia]=Efectes del gestor de finestres
Name[de]=Fensterverwaltungs-Effekte
Name[it]=Effetti del gestore delle finestre
Name[pt]=Efeitos do Gestor de Janelas

2
kcmkwin/kwinscripts/kwinscripts.knsrc
View file

@ -1,5 +1,7 @@
[KNewStuff3]
Name=Window Manager Scripts
Name[ca]=Scripts del gestor de finestres
Name[ca@valencia]=Scripts del gestor de finestres
Name[de]=Fensterverwaltungs-Skripte
Name[it]=Script del gestore delle finestre
Name[pt]=Programas do Gestor de Janelas

2
kcmkwin/kwintabbox/kwinswitcher.knsrc
View file

@ -1,5 +1,7 @@
[KNewStuff3]
Name=Window Manager Switching Layouts
Name[ca]=Disposicions del commutador del gestor de finestres
Name[ca@valencia]=Disposicions del commutador del gestor de finestres
Name[de]=Wechsel-Layout für Fensterverwaltung
Name[it]=Disposizione scambiafinestre del gestore delle finestre
Name[pt]=Disposições de Mudança do Gestor de Janelas

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

@ -1,5 +1,7 @@
[Desktop Entry]
Name=KWin Script
Name[ca]=Script del KWin
Name[ca@valencia]=Script del KWin
Name[de]=KWin-Skript
Name[it]=Script di KWin
Name[pt]=Programa do KWin

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

@ -1,5 +1,7 @@
[Desktop Entry]
Name=KWin Window Switcher
Name[ca]=Commutador de finestres del KWin
Name[ca@valencia]=Commutador de finestres del KWin
Name[de]=KWin-Fensterwechsler
Name[it]=Scambiafinestre di KWin
Name[pt]=Mudança de Janelas do KWin

2
plugins/kdecorations/aurorae/src/aurorae.knsrc
View file

@ -1,5 +1,7 @@
[KNewStuff3]
Name=Aurorae Window Decorations
Name[ca]=Decoracions de finestra Aurorae
Name[ca@valencia]=Decoracions de finestra Aurorae
Name[de]=Aurorae-Fensterdekoration
Name[it]=Decorazioni delle finestre Aurorae
Name[pt]=Decorações das Janelas do Aurorae