Commit 9f9e9f79 authored by Script Kiddy's avatar Script Kiddy

SVN_SILENT made messages (.desktop file) - always resolve ours

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"
parent e822d27c
......@@ -6,3 +6,56 @@ X-KDE-Library=kwin_showpaint_config
X-KDE-ParentComponents=showpaint
Name=Show Paint
Name[af]=Wys inkleur
Name[ar]=أظهر الطلاء
Name[bg]=Показване на боята
Name[bn_IN]=Paint প্রদর্শন করা হবে
Name[csb]=Pòkôżë Paint
Name[da]=Vis tegning
Name[de]=Zeichnungsbereiche hervorheben
Name[el]=Εμφάνιση σχεδίασης
Name[en_GB]=Show Paint
Name[eo]=Montri farbon
Name[es]=Muestra pintura
Name[et]=Joonistatud alade näitamine
Name[eu]=Erakutsi pintatutakoa
Name[fi]=Piirtämisen näyttäminen
Name[fr]=Affiche les zones peintes
Name[fy]=Paint sjen litte
Name[ga]=Taispeáin Péint
Name[gl]=Mostrar o pintado
Name[gu]=રંગ બતાવો
Name[hi]=पेंट दिखाएं
Name[hne]=पेंट देखाव
Name[hr]=Prikaz nedavnih promjena
Name[hu]=Megmutatja a kirajzolt területeket
Name[ia]=Monstra pictura
Name[id]=Tampilkan Lukisan
Name[is]=Sýna teikningu
Name[it]=Mostra il ridisegno
Name[kk]=Бояулау
Name[km]=បង្ហាញគំនូរ
Name[kn]=ಕೆಪೈಂಟ್ ತೋರಿಸು
Name[lv]=Rādīt zīmēto
Name[mai]=पेंट देखाउ
Name[mk]=Приказ на нацртано
Name[ml]=പെയിന്റ് കാണിക്കുക
Name[mr]=रंग दर्शवा
Name[nds]=Klöör wiesen
Name[ne]=रङ देखाउनुहोस्
Name[nl]=Intekening tonen
Name[pa]=ਪੇਂਟ ਵੇਖੋ
Name[pl]=Pokaż rysowane
Name[ro]=Afișează desenele
Name[ru]=Подсвечивать отрисовку
Name[si]=ඇඳීම් පෙන්වන්න
Name[sk]=Zobraziť kresbu
Name[sl]=Izrisovanje
Name[sv]=Visa uppritning
Name[ta]=வண்ணங் காட்டு
Name[te]=పెయింట్ చూపుము
Name[tg]=Намоиши Paint
Name[th]=แสดงพื้นที่
Name[tr]=Boyamayı Göster
Name[ug]=سىزىش دائىرىسىنى كۆرسەت
Name[wa]=Mostrer pondaedje
......@@ -34,7 +34,7 @@ Name[hu]=Áttetszőség
Name[ia]=Translucentia
Name[id]=Translucency
Name[is]=Hálfgegnsæi
Name[it]=Traslucenza
Name[it]=Translucenza
Name[ja]=半透明
Name[ka]=ნახევრადგამჭირვალეობა
Name[kk]=Мөлдірлік
......@@ -112,7 +112,7 @@ Comment[hu]=Áttetszővé tesz ablakokat bizonyos feltételek teljesülése eset
Comment[ia]=On face fenestra translucente sub conditiones differente
Comment[id]=Buat jendela translusens di bawah kondisi berbeda
Comment[is]=Gerir glugga hálfgegnsæa við ýmis tilefni
Comment[it]=Rende le finestre traslucide in certe condizioni
Comment[it]=Rende le finestre translucide in certe condizioni
Comment[ja]=さまざまな状況でウィンドウを半透明にします
Comment[kk]=Түрлі жағдайда терезелерді мөлдір қылады
Comment[km]=ធ្វើ​ឲ្យ​បង្អួច​ថ្លា​ក្រោមលក្ខខណ្ឌ​ផ្សេងៗ​គ្នា
......
......@@ -160,7 +160,7 @@ X-KDE-Keywords[gl]=sombra,bordo,beira,pasar,bordos activos,beiras activas,lapela
X-KDE-Keywords[hu]=árnyékolás,szegély,lebegés,aktív szegélyek,csempézés,bejárás,ablakbejárás,ablakcsoportosítás,ablakcsempézés,ablakelhelyezés,ablakok elhelyezése,ablak speciális viselkedése
X-KDE-Keywords[ia]=umbrar,margine,planante,margines active,con tegulas,schedas,tabbing,tabbing de fenestra,gruppante fenestra,fenestra con tegulas,placiamento de fenestra,placiamento de fenestras, comportamento avantiate de fenestra
X-KDE-Keywords[id]=bayangan,batas,melayang,batas aktif,ubin,tab,tab,tab jendela,grup jendela,ubin jendela,penempatan jendela,penempatan jendela,perilaku lanjutan jendela
X-KDE-Keywords[it]=ombreggiatura,bordo,sovrapponi,bordi attivi,affiancatura,schede,navigazione schede,finestre a schede,regruppamento finestre,affaincatura finestre,posizionamento finestre,posizionamento delle finestre,comportamento avanzato delle finestre
X-KDE-Keywords[it]=ombreggiatura,bordo,sovrapponi,bordi attivi,affiancamento,schede,navigazione schede,finestre a schede,raggruppamento finestre,affiancamento finestre,posizionamento finestre,posizionamento delle finestre,comportamento avanzato delle finestre
X-KDE-Keywords[kk]=shading,border,hover,active borders,tiling,tabs,tabbing,window tabbing,window grouping,window tiling,window placement,placement of windows,window advanced behavior
X-KDE-Keywords[km]=shading,border,hover,active borders,tiling,tabs,tabbing,window tabbing,window grouping,window tiling,window placement,placement of windows,window advanced behavior
X-KDE-Keywords[ko]=shading,border,hover,active borders,tiling,tabs,tabbing,window tabbing,window grouping,window tiling,window placement,placement of windows,window advanced behavior,그림자,경계선,호버,지나다니기,타일,탭,창 탭,창 그룹,창 타일,창 위치
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment