Commit 96ca49c8 authored by Script Kiddy's avatar Script Kiddy
Browse files

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 67a235b1
......@@ -20,6 +20,7 @@ Name[ko]=KDE 고전
Name[lt]=KDE klasikinė
Name[nl]=KDE-klassiek
Name[nn]=KDE klassisk
Name[pa]=KDE ਕਲਾਸਿਕ
Name[pl]=Klasyczne KDE
Name[pt]=Clássico do KDE
Name[pt_BR]=KDE Clássico
......
......@@ -20,6 +20,7 @@ Name[ko]=Oxygen 검정
Name[lt]=Oxygen juoda
Name[nl]=Oxygen donker
Name[nn]=Oxygen svart
Name[pa]=ਆਕਸੀਜਨ ਕਾਲਾ
Name[pl]=Czarny Tlen
Name[pt]=Oxygen Preto
Name[pt_BR]=Oxygen Black
......
......@@ -20,6 +20,7 @@ Name[ko]=Oxygen 파랑
Name[lt]=Oxygen mėlyna
Name[nl]=Oxygen blauw
Name[nn]=Oxsygen blå
Name[pa]=ਆਕਸੀਜਨ ਨੀਲਾ
Name[pl]=Niebieski Tlen
Name[pt]=Oxygen Azul
Name[pt_BR]=Oxygen Blue
......
......@@ -20,6 +20,7 @@ Name[ko]=Oxygen 흰색
Name[lt]=Oxygen balta
Name[nl]=Oxygen-wit
Name[nn]=Oxygen kvit
Name[pa]=ਆਕਸੀਜਨ ਚਿੱਟਾ
Name[pl]=Biały Tlen
Name[pt]=Oxygen Branco
Name[pt_BR]=Oxygen White
......
......@@ -20,6 +20,7 @@ Name[ko]=Oxygen 노랑
Name[lt]=Oxygen geltona
Name[nl]=Oxygen geel
Name[nn]=Oxygen gul
Name[pa]=ਆਕਸੀਜਨ ਪੀਲਾ
Name[pl]=Żółty Tlen
Name[pt]=Oxygen Amarelo
Name[pt_BR]=Oxygen Yellow
......
......@@ -17,6 +17,7 @@ Name[ko]=Oxygen 지온
Name[lt]=Oxygen sioninė
Name[nl]=Oxygen zion
Name[nn]=Oxygen zion
Name[pa]=ਆਕਸੀਜਨ ਜ਼ੀਆਨ
Name[pl]=Syjoński Tlen
Name[pt]=Oxygen Sião
Name[pt_BR]=Oxygen Zion
......
......@@ -27,6 +27,7 @@ Name[ko]=창 장식
Name[lt]=Lango dekoracija
Name[nl]=Vensterdecoratie
Name[nn]=Vindaugspynt
Name[pa]=ਵਿੰਡੋ ਸਜਾਵਟ
Name[pl]=Wystrój okien
Name[pt]=Decoração de Janelas
Name[pt_BR]=Decorações da janela
......@@ -93,6 +94,7 @@ X-KDE-Keywords[ko]=oxygen,decoration,장식
X-KDE-Keywords[lt]=oxygen,dekoracija
X-KDE-Keywords[nl]=oxygen,decoratie
X-KDE-Keywords[nn]=oxygen,dekorasjon,pynt
X-KDE-Keywords[pa]=ਆਕਸੀਜਨ,ਸਜਾਵਟ
X-KDE-Keywords[pl]=tlen,wystrój
X-KDE-Keywords[pt]=oxygen,decoração
X-KDE-Keywords[pt_BR]=oxygen,decoração
......
......@@ -29,6 +29,7 @@ Name[ko]=위젯 스타일
Name[lt]=Valdiklių stilius
Name[nl]=Widget-stijl
Name[nn]=Elementstil
Name[pa]=ਵਿਜੈਟ ਸਟਾਈਲ
Name[pl]=Wygląd interfejsu
Name[pt]=Estilo Gráfico
Name[pt_BR]=Estilo dos widgets
......@@ -104,6 +105,7 @@ X-KDE-Keywords[ko]=oxygen,widget,style,위젯,스타일
X-KDE-Keywords[lt]=oxygen,valdiklis,stilius
X-KDE-Keywords[nl]=oxygen,widget,stijl
X-KDE-Keywords[nn]=oxygen,skjermkontroll,stil
X-KDE-Keywords[pa]=ਆਕਸੀਜਨ,ਵਿਜੈਟ,ਸਟਾਈਲ
X-KDE-Keywords[pl]=oxygen,widget,styl,tlen,element interfejsu
X-KDE-Keywords[pt]=oxygen,elemento,estilo
X-KDE-Keywords[pt_BR]=oxygen,widget,estilo
......
......@@ -22,6 +22,7 @@ Comment[nb]=Oxygen språk for skrivebordsdesign
Comment[nds]=Schriefdisch-Utleggspraak Oxygen
Comment[nl]=Ontwerptaal van Oxygen bureaublad
Comment[nn]=Oxygen-språk for skrivebordsdesign
Comment[pa]=ਆਕਸੀਜਨ ਡੈਸਕਟਾਪ ਡਿਜਾਈਨ ਦੀ ਭਾਸ਼ਾ
Comment[pl]=Tlen - język projektowania pulpitu
Comment[pt]=Linguagem de Desenho do Ambiente Oxygen
Comment[pt_BR]=Linguagem de Desenho da Área de Trabalho Oxygen
......
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