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-10-07 08:37:26 +02:00
parent 6ee6cc0293
commit 10ade3e9c7
4 changed files with 6 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
kcmkwin/kwineffects/kcm_kwin_effects.desktop
View file

@ -64,6 +64,7 @@ Name[zh_TW]=桌面效果
Comment=Configure compositor settings for desktop effects
Comment[ca]=Configura l'arranjament del compositor per als efectes de l'escriptori
Comment[cs]=Nastavení kompozitoru pro efekty pracovní plochy
Comment[de]=Compositor-Einstellungen für Arbeitsflächen-Effekte einrichten
Comment[en_GB]=Configure compositor settings for desktop effects
Comment[es]=Configurar las preferencias del compositor para los efectos del escritorio
Comment[gl]=Configurar o compositor para os efectos de escritorio

2
kcmkwin/kwinoptions/kwinactions.desktop
View file

@ -12,6 +12,7 @@ X-KDE-PluginKeyword=kwinactions
Name=Window Actions
Name[ca]=Accions de la finestra
Name[cs]=Činnosti oken
Name[de]=Fensteraktionen
Name[en_GB]=Window Actions
Name[es]=Acciones de ventanas
Name[eu]=Leihoetako ekintzak
@ -32,6 +33,7 @@ Name[zh_TW]=視窗動作
Comment=Configure mouse actions for windows and titlebars
Comment[ca]=Configura les accions de ratolí per a les finestres i les barres de títol
Comment[cs]=Nastavení činností myši na oknech a pruhu titulku
Comment[de]=Mausaktionen für Fenster und Titelleisten einrichten
Comment[en_GB]=Configure mouse actions for windows and titlebars
Comment[es]=Configurar las acciones del ratón para las ventanas y las barras de títulos
Comment[eu]=Konfiguratu saguaren ekintzak leihoekin eta titulu-barrekin

2
kcmkwin/kwinoptions/kwinadvanced.desktop
View file

@ -11,6 +11,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[de]=Erweitertes Fensterverhalten
Name[en_GB]=Advanced Window Behaviour
Name[es]=Comportamiento avanzado de las ventanas
Name[eu]=Leihoaren portaera aurreratua
@ -31,6 +32,7 @@ Name[zh_TW]=進階視窗行為
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[de]=Einstellungen für erweiterte Fensterverwaltung einrichten
Comment[en_GB]=Configure advanced window management options
Comment[es]=Configurar las opciones avanzadas de la gestión de ventanas
Comment[eu]=Konfiguratu leiho kudeaketa aukera aurreratuak

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[de]=Fenster-Aktionen und -verhalten einrichten
Comment[en_GB]=Configure window actions and behaviour
Comment[es]=Configurar las acciones y el comportamiento de las ventanas
Comment[eu]=Konfiguratu leihoaren ekintzak eta jokabidea