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-23 05:50:40 +01:00
parent 8725f2441e
commit c2a3f88b6b
6 changed files with 24 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
kcmkwin/kwincompositing/kwineffect.knsrc
View file

@ -1,5 +1,9 @@
[KNewStuff3] [KNewStuff3]
Name=Window Manager Effects Name=Window Manager Effects
Name[de]=Fensterverwaltungs-Effekte
Name[pt]=Efeitos do Gestor de Janelas
Name[sv]=Fönsterhanteringseffekter
Name[x-test]=xxWindow Manager Effectsxx
ProvidersUrl=http://download.kde.org/ocs/providers.xml ProvidersUrl=http://download.kde.org/ocs/providers.xml
Categories=KWin Effects Categories=KWin Effects

4
kcmkwin/kwinscripts/kwinscripts.knsrc
View file

@ -1,5 +1,9 @@
[KNewStuff3] [KNewStuff3]
Name=Window Manager Scripts Name=Window Manager Scripts
Name[de]=Fensterverwaltungs-Skripte
Name[pt]=Programas do Gestor de Janelas
Name[sv]=Fönsterhanteringsskript
Name[x-test]=xxWindow Manager Scriptsxx
ProvidersUrl=http://download.kde.org/ocs/providers.xml ProvidersUrl=http://download.kde.org/ocs/providers.xml
Categories=KWin Scripts Categories=KWin Scripts

4
kcmkwin/kwintabbox/kwinswitcher.knsrc
View file

@ -1,5 +1,9 @@
[KNewStuff3] [KNewStuff3]
Name=Window Manager Switching Layouts Name=Window Manager Switching Layouts
Name[de]=Wechsel-Layout für Fensterverwaltung
Name[pt]=Disposições de Mudança do Gestor de Janelas
Name[sv]=Fönsterbyteslayouter
Name[x-test]=xxWindow Manager Switching Layoutsxx
ProvidersUrl=http://download.kde.org/ocs/providers.xml ProvidersUrl=http://download.kde.org/ocs/providers.xml
Categories=KWin Switching Layouts Categories=KWin Switching Layouts

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

@ -1,5 +1,9 @@
[Desktop Entry] [Desktop Entry]
Name=KWin Script Name=KWin Script
Name[de]=KWin-Skript
Name[pt]=Programa do KWin
Name[sv]=Kwin-skript
Name[x-test]=xxKWin Scriptxx
Type=Service Type=Service
X-KDE-ServiceTypes=KPackage/PackageStructure X-KDE-ServiceTypes=KPackage/PackageStructure
X-KDE-Library=kwin_packagestructure_scripts X-KDE-Library=kwin_packagestructure_scripts

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

@ -1,5 +1,9 @@
[Desktop Entry] [Desktop Entry]
Name=KWin Window Switcher Name=KWin Window Switcher
Name[de]=KWin-Fensterwechsler
Name[pt]=Mudança de Janelas do KWin
Name[sv]=Kwin-fönsterbyte
Name[x-test]=xxKWin Window Switcherxx
Type=Service Type=Service
X-KDE-ServiceTypes=KPackage/PackageStructure X-KDE-ServiceTypes=KPackage/PackageStructure
X-KDE-Library=kwin_packagestructure_windowswitcher X-KDE-Library=kwin_packagestructure_windowswitcher

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

@ -1,5 +1,9 @@
[KNewStuff3] [KNewStuff3]
Name=Aurorae Window Decorations Name=Aurorae Window Decorations
Name[de]=Aurorae-Fensterdekoration
Name[pt]=Decorações das Janelas do Aurorae
Name[sv]=Aurora-fönsterdekorationer
Name[x-test]=xxAurorae Window Decorationsxx
ProvidersUrl=http://download.kde.org/ocs/providers.xml ProvidersUrl=http://download.kde.org/ocs/providers.xml
Categories=Window Decoration Aurorae Categories=Window Decoration Aurorae