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 2019-09-14 05:25:12 +02:00
parent ab3d7d5277
commit 8461ec49bf
5 changed files with 6 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
kcmkwin/kwinoptions/kwinactions.desktop
View file

@ -11,6 +11,7 @@ X-KDE-PluginKeyword=kwinactions
Name=Window Actions
Name[ca]=Accions de la finestra
Name[cs]=Činnosti oken
Name[es]=Acciones de ventanas
Name[eu]=Leihoetako ekintzak
Name[nl]=Vensteracties

2
kcmkwin/kwinoptions/kwinadvanced.desktop
View file

@ -10,6 +10,7 @@ X-KDE-PluginKeyword=kwinadvanced
Name=Advanced Window Behavior
Name[ca]=Comportament avançat de les finestres
Name[cs]=Pokročilé chování oken
Name[es]=Comportamiento avanzado de las ventanas
Name[eu]=Leihoaren portaera aurreratua
Name[nl]=Geavanceerd venstergedrag
@ -21,6 +22,7 @@ Name[x-test]=xxAdvanced Window Behaviorxx
Comment=Configure advanced window management options
Comment[ca]=Configura les opcions avançades per a la gestió de les finestres
Comment[cs]=Nastavení pokročilých voleb správce oken
Comment[es]=Configurar las opciones avanzadas de la gestión de ventanas
Comment[eu]=Konfiguratu leiho kudeaketa aukera aurreratuak
Comment[nl]=Geavanceerde vensterbeheermogelijkheden configureren

1
kcmkwin/kwinoptions/kwinfocus.desktop
View file

@ -10,6 +10,7 @@ X-KDE-PluginKeyword=kwinfocus
Name=Window Focus Behavior
Name[ca]=Comportament del focus de les finestres
Name[cs]=Chování při zaměření na okno
Name[es]=Comportamiento del foco de las ventanas
Name[eu]=Leiho fokuaren portaera
Name[nl]=Focusgedrag venster

1
kcmkwin/kwinoptions/kwinmoving.desktop
View file

@ -11,6 +11,7 @@ X-KDE-PluginKeyword=kwinmoving
Name=Window Movement
Name[ca]=Moviment de les finestres
Name[cs]=Pohyb oken
Name[es]=Movimiento de las ventanas
Name[eu]=Leihoaren mugimendua
Name[nl]=Verplaatsen van vensters

1
kcmkwin/kwinoptions/kwinoptions.desktop
View file

@ -102,6 +102,7 @@ Name[zh_TW]=視窗行為
Comment=Configure window actions and behavior
Comment[ca]=Configura les accions i comportament de les finestres
Comment[cs]=Nastavte činností a chování oken
Comment[es]=Configurar las acciones y el comportamiento de las ventanas
Comment[eu]=Konfiguratu leihoaren ekintzak eta jokabidea
Comment[nl]=Vensteracties en gedrag configureren