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 2015-12-10 09:14:26 +00:00
parent cc29d0d296
commit a58e788f3c
3 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
kcmkwin/kwindecoration/kwindecoration.desktop
View file

@ -73,7 +73,7 @@ Name[zh_CN]=窗口装饰
Name[zh_TW]=視窗裝飾
Comment=Look and Feel of Window Titles
Comment[ast]=Aspeutu y sintir de los títulos de ventana
Comment[ast]=Aspeutu y sentir de los títulos de ventana
Comment[bs]=Izgled i osjećaj naslova prozora
Comment[ca]=Aspecte i comportament dels títols de les finestres
Comment[ca@valencia]=Aspecte i comportament dels títols de les finestres

1
kcmkwin/kwinoptions/kwinactions.desktop
View file

@ -12,6 +12,7 @@ X-KDE-PluginKeyword=kwinactions
Name=Actions
Name[af]=Aksies
Name[ar]=إجراءات
Name[ast]=Aiciones
Name[be]=Дзеянні
Name[be@latin]=Aperacyi
Name[bg]=Действия

1
kcmkwin/kwinoptions/kwinmoving.desktop
View file

@ -12,6 +12,7 @@ X-KDE-PluginKeyword=kwinmoving
Name=Moving
Name[af]=Beweeg
Name[ar]=التحريك
Name[ast]=Movición
Name[be]=Перамяшчэнне
Name[be@latin]=Pierasoŭvańnie
Name[bg]=Преместване