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-04-17 09:16:37 +02:00
parent f6ddaf505d
commit a9bfec5f16
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
kcmkwin/kwinrules/kwinrules.desktop
View file

@ -35,7 +35,7 @@ Name[hi]=विंडो निय
Name[hr]=Pravila prozora Name[hr]=Pravila prozora
Name[hu]=Ablakszabályok Name[hu]=Ablakszabályok
Name[ia]=Regulas de fenestra Name[ia]=Regulas de fenestra
Name[id]=Pengaturan Window Name[id]=Peraturan Window
Name[is]=Gluggahegðunarreglur Name[is]=Gluggahegðunarreglur
Name[it]=Regole delle finestre Name[it]=Regole delle finestre
Name[ja]=ウィンドウルール Name[ja]=ウィンドウルール
@ -135,7 +135,7 @@ X-KDE-Keywords[ga]=méid,ionad,staid,oibriú na bhfuinneog,fuinneoga,sainiúil,r
X-KDE-Keywords[gl]=tamaño,posición,estado,comportamento da xanela,xanelas,específico,regra X-KDE-Keywords[gl]=tamaño,posición,estado,comportamento da xanela,xanelas,específico,regra
X-KDE-Keywords[hu]=méret,elhelyezkedés,állapot,ablakműködés,ablakok,specifikus,kerülő megoldások,megjegyzés,szabályok X-KDE-Keywords[hu]=méret,elhelyezkedés,állapot,ablakműködés,ablakok,specifikus,kerülő megoldások,megjegyzés,szabályok
X-KDE-Keywords[ia]=grandor,position,stato,comportamento de fenestra,fenestras,specific,workarounds,memora,regulas X-KDE-Keywords[ia]=grandor,position,stato,comportamento de fenestra,fenestras,specific,workarounds,memora,regulas
X-KDE-Keywords[id]=ukuran,posisi,kondisi,perilaku window,window,spesifik,sekeliling,ingat,aturan X-KDE-Keywords[id]=ukuran,posisi,kondisi,perilaku window,window,spesifik,sekeliling,ingat,peraturan
X-KDE-Keywords[it]=dimensione,posizione,stato,comportamento della finestra,finestre,specifico,espedienti,ricorda,regole X-KDE-Keywords[it]=dimensione,posizione,stato,comportamento della finestra,finestre,specifico,espedienti,ricorda,regole
X-KDE-Keywords[kk]=size,position,state,window behavior,windows,specific,workarounds,remember,rules X-KDE-Keywords[kk]=size,position,state,window behavior,windows,specific,workarounds,remember,rules
X-KDE-Keywords[km]=size,position,state,window behavior,windows,specific,workarounds,remember,rules X-KDE-Keywords[km]=size,position,state,window behavior,windows,specific,workarounds,remember,rules