mirror of https://github.com/KDE/kasts.git
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"
This commit is contained in:
parent
cafefd588f
commit
c24eef7fe5
|
@ -16,6 +16,8 @@ Name[it]=Alligator
|
||||||
Name[ko]=Alligator
|
Name[ko]=Alligator
|
||||||
Name[nl]=Alligator
|
Name[nl]=Alligator
|
||||||
Name[nn]=Alligator
|
Name[nn]=Alligator
|
||||||
|
Name[pa]=ਐਲੀਗੇਟਰ
|
||||||
|
Name[pl]=Alligator
|
||||||
Name[pt]=Alligator
|
Name[pt]=Alligator
|
||||||
Name[pt_BR]=Alligator
|
Name[pt_BR]=Alligator
|
||||||
Name[ru]=Alligator
|
Name[ru]=Alligator
|
||||||
|
@ -42,6 +44,8 @@ Comment[it]=Lettore di fonti mobile
|
||||||
Comment[ko]=모바일 피드 리더
|
Comment[ko]=모바일 피드 리더
|
||||||
Comment[nl]=Mobiele feedlezer
|
Comment[nl]=Mobiele feedlezer
|
||||||
Comment[nn]=Mobil kjeldelesar
|
Comment[nn]=Mobil kjeldelesar
|
||||||
|
Comment[pa]=ਮੋਬਾਈਲ ਫੀਡ ਰੀਡਰ
|
||||||
|
Comment[pl]=Przenośny czytnik kanałów
|
||||||
Comment[pt]=Leitor Móvel de Fontes
|
Comment[pt]=Leitor Móvel de Fontes
|
||||||
Comment[pt_BR]=Leitor de fonte de notícias móvel
|
Comment[pt_BR]=Leitor de fonte de notícias móvel
|
||||||
Comment[ru]=Чтение лент новостей для мобильных устройств
|
Comment[ru]=Чтение лент новостей для мобильных устройств
|
||||||
|
@ -67,6 +71,8 @@ GenericName[it]=Lettore di fonti
|
||||||
GenericName[ko]=피드 리더
|
GenericName[ko]=피드 리더
|
||||||
GenericName[nl]=Feedlezer
|
GenericName[nl]=Feedlezer
|
||||||
GenericName[nn]=Kjeldelesar
|
GenericName[nn]=Kjeldelesar
|
||||||
|
GenericName[pa]=ਫੀਡ ਰੀਡਰ
|
||||||
|
GenericName[pl]=Czytnik kanałów
|
||||||
GenericName[pt]=Leitor de Fontes
|
GenericName[pt]=Leitor de Fontes
|
||||||
GenericName[pt_BR]=Leitor de fontes de notícias
|
GenericName[pt_BR]=Leitor de fontes de notícias
|
||||||
GenericName[ru]=Чтение лент новостей
|
GenericName[ru]=Чтение лент новостей
|
||||||
|
|
Loading…
Reference in New Issue