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 2018-09-30 05:55:57 +02:00
parent 9f9e9f796b
commit 972108e585
2 changed files with 11 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
effects/showpaint/showpaint_config.desktop
View file

@ -10,6 +10,8 @@ Name[af]=Wys inkleur
Name[ar]=أظهر الطلاء Name[ar]=أظهر الطلاء
Name[bg]=Показване на боята Name[bg]=Показване на боята
Name[bn_IN]=Paint প্রদর্শন করা হবে Name[bn_IN]=Paint প্রদর্শন করা হবে
Name[ca]=Mostra el pintat
Name[ca@valencia]=Mostra el pintat
Name[csb]=Pòkôżë Paint Name[csb]=Pòkôżë Paint
Name[da]=Vis tegning Name[da]=Vis tegning
Name[de]=Zeichnungsbereiche hervorheben Name[de]=Zeichnungsbereiche hervorheben
@ -30,7 +32,6 @@ Name[hne]=पेंट देखाव
Name[hr]=Prikaz nedavnih promjena Name[hr]=Prikaz nedavnih promjena
Name[hu]=Megmutatja a kirajzolt területeket Name[hu]=Megmutatja a kirajzolt területeket
Name[ia]=Monstra pictura Name[ia]=Monstra pictura
Name[id]=Tampilkan Lukisan
Name[is]=Sýna teikningu Name[is]=Sýna teikningu
Name[it]=Mostra il ridisegno Name[it]=Mostra il ridisegno
Name[kk]=Бояулау Name[kk]=Бояулау
@ -58,4 +59,6 @@ Name[tg]=Намоиши Paint
Name[th]=แสดงพื้นที่ Name[th]=แสดงพื้นที่
Name[tr]=Boyamayı Göster Name[tr]=Boyamayı Göster
Name[ug]=سىزىش دائىرىسىنى كۆرسەت Name[ug]=سىزىش دائىرىسىنى كۆرسەت
Name[uk]=Показ малювання
Name[wa]=Mostrer pondaedje Name[wa]=Mostrer pondaedje
Name[x-test]=xxShow Paintxx

7
packageplugins/effect/kwin-packagestructure-effect.desktop
View file

@ -1,5 +1,12 @@
[Desktop Entry] [Desktop Entry]
Name=KWin Effect Name=KWin Effect
Name[ca]=Efecte del KWin
Name[ca@valencia]=Efecte del KWin
Name[es]=Efecto de KWin
Name[nl]=KWin-effect
Name[sv]=Kwin-effekt
Name[uk]=Ефект KWin
Name[x-test]=xxKWin Effectxx
Type=Service Type=Service
X-KDE-ServiceTypes=KPackage/PackageStructure X-KDE-ServiceTypes=KPackage/PackageStructure
X-KDE-Library=kwin_packagestructure_effect X-KDE-Library=kwin_packagestructure_effect