Commit ecedab2b 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 a358ba53
......@@ -29,7 +29,7 @@ Name[lt]=Manga šablonas
Name[nn]=Japansk teikneserie (manga)
Name[pl]=Szablon Mangi
Name[pt]=Modelo Manga
Name[pt_BR]=Modelo de mangá
......@@ -23,7 +23,7 @@ Name[kk]=Текстура 1k 32 бит скаляр
Name[ko]=텍스처 1k 32비트 스칼라
Name[nb]=Tekstur 1k 32bit skalar
Name[nl]=Textuur 1k 32bit scalar
Name[nn]=Tekstur 1k 32-bits skalar
Name[nn]=Tekstur 1k 32-bits gråtonar
Name[pl]=Tekstura 1k 32bit skalar
Name[pt]=Textura 1k 32-bits escalar
Name[pt_BR]=Textura 1k 32bits escalar
......@@ -23,7 +23,7 @@ Name[kk]=Текстура 2k 32 бит скаляр
Name[ko]=텍스처 2k 32비트 스칼라
Name[nb]=Tekstur 2k 32bit skalar
Name[nl]=Textuur 2k 32bit scalar
Name[nn]=Tekstur 2k 32-bits skalar
Name[nn]=Tekstur 2k 32-bits gråtonar
Name[pl]=Tekstura 2k 32bit skalar
Name[pt]=Textura 2k 32-bits escalar
Name[pt_BR]=Textura 2k 32bits escalar
......@@ -23,7 +23,7 @@ Name[kk]=Текстура 4k 32 бит скаляр
Name[ko]=텍스처 4k 32비트 스칼라
Name[nb]=Tekstur 4k 32bit skalar
Name[nl]=Textuur 4k 32bit scalar
Name[nn]=Tekstur 4k 32-bits skalar
Name[nn]=Tekstur 4k 32-bits gråtonar
Name[pl]=Tekstura 4k 32bit skalar
Name[pt]=Textura 4k 32-bits escalar
Name[pt_BR]=Textura 4k 32bits escalar
......@@ -23,7 +23,7 @@ Name[kk]=Текстура 8k 32 бит скаляр
Name[ko]=텍스처 8k 32비트 스칼라
Name[nb]=Tekstur 8k 32bit skalar
Name[nl]=Textuur 8k 32bit scalar
Name[nn]=Tekstur 8k 32-bits skalar
Name[nn]=Tekstur 8k 32-bits gråtonar
Name[pl]=Tekstura 8k 32bit skalar
Name[pt]=Textura 8k 32-bits escalar
Name[pt_BR]=Textura 8k 32bits escalar
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