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-04-03 05:14:56 +02:00
parent 7d72aeda5c
commit 8d0939f7fc
6 changed files with 6 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
kcmkwin/kwincompositing/kwineffect.knsrc
View file

@ -3,6 +3,7 @@ Name=Window Manager Effects
Name[ca]=Efectes del gestor de finestres
Name[ca@valencia]=Efectes del gestor de finestres
Name[de]=Fensterverwaltungs-Effekte
Name[es]=Efectos del gestor de ventanas
Name[it]=Effetti del gestore delle finestre
Name[pt]=Efeitos do Gestor de Janelas
Name[sv]=Fönsterhanteringseffekter

1
kcmkwin/kwinscripts/kwinscripts.knsrc
View file

@ -3,6 +3,7 @@ Name=Window Manager Scripts
Name[ca]=Scripts del gestor de finestres
Name[ca@valencia]=Scripts del gestor de finestres
Name[de]=Fensterverwaltungs-Skripte
Name[es]=Guiones del gestor de ventanas
Name[it]=Script del gestore delle finestre
Name[pt]=Programas do Gestor de Janelas
Name[sv]=Fönsterhanteringsskript

1
kcmkwin/kwintabbox/kwinswitcher.knsrc
View file

@ -3,6 +3,7 @@ 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[es]=Esquemas de cambio del gestor de ventanas
Name[it]=Disposizione scambiafinestre del gestore delle finestre
Name[pt]=Disposições de Mudança do Gestor de Janelas
Name[sv]=Fönsterbyteslayouter

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

@ -3,6 +3,7 @@ Name=KWin Script
Name[ca]=Script del KWin
Name[ca@valencia]=Script del KWin
Name[de]=KWin-Skript
Name[es]=Guion de KWin
Name[it]=Script di KWin
Name[pt]=Programa do KWin
Name[sv]=Kwin-skript

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

@ -3,6 +3,7 @@ Name=KWin Window Switcher
Name[ca]=Commutador de finestres del KWin
Name[ca@valencia]=Commutador de finestres del KWin
Name[de]=KWin-Fensterwechsler
Name[es]=Cambiador de ventanas de KWin
Name[it]=Scambiafinestre di KWin
Name[pt]=Mudança de Janelas do KWin
Name[sv]=Kwin-fönsterbyte

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

@ -3,6 +3,7 @@ Name=Aurorae Window Decorations
Name[ca]=Decoracions de finestra Aurorae
Name[ca@valencia]=Decoracions de finestra Aurorae
Name[de]=Aurorae-Fensterdekoration
Name[es]=Decoraciones de ventanas Aurorae
Name[it]=Decorazioni delle finestre Aurorae
Name[pt]=Decorações das Janelas do Aurorae
Name[sv]=Aurora-fönsterdekorationer