Commit 72303d6c 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 244ad71f
......@@ -23,7 +23,7 @@ Name[kk]=Canon_550D_5184x3456
Name[ko]=캐논_550D_5184x3456
Name[nb]=Canon_550D_5184x3456
Name[nl]=Canon_550D_5184x3456
Name[nn]=Canon EOS 550D (5184× 3456)
Name[nn]=Canon EOS 550D (5184 × 3456)
Name[pl]=Canon_550D_5184x3456
Name[pt]=Canon_550D_5184x3456
Name[pt_BR]=Canon 550D 5184x3456
......
......@@ -23,7 +23,7 @@ Name[kk]=Canon_5Dmk3_5760x3840
Name[ko]=캐논_5Dmk3_5760x3840
Name[nb]=Canon_5Dmk3_5760x3840
Name[nl]=Canon_5Dmk3_5760x3840
Name[nn]=Canon EOS 5D Mark III (5760× 3840)
Name[nn]=Canon EOS 5D Mark III (5760 × 3840)
Name[pl]=Canon_5Dmk3_5760x3840
Name[pt]=Canon_5Dmk3_5760x3840
Name[pt_BR]=Canon 5D Mark III 5760x3840
......
......@@ -21,7 +21,7 @@ Name[ja]=テクスチャ 1024x1024 8 ビット sRGB
Name[ko]=텍스처 1024 x 1024 8비트 srgb
Name[nb]=Tekstur 1024x1024 8bit srgb
Name[nl]=Textuur 1024x1024 8bit srgb
Name[nn]=Tekstur 1024× 1024 8-bits SRGB
Name[nn]=Tekstur 1024 × 1024 8-bits SRGB
Name[pl]=Tekstura 1024x1024 8bit srgb
Name[pt]=Textura 1024x1024 8-bits sRGB
Name[pt_BR]=Textura 1024x1024 8-bits sRGB
......
......@@ -21,7 +21,7 @@ Name[ja]=テクスチャ 2048x2048 8 ビット sRGB
Name[ko]=텍스처 2048x2048 8비트 srgb
Name[nb]=Tekstur 2048x2048 8bit srgb
Name[nl]=Textuur 2048x2048 8bit srgb
Name[nn]=Tekstur 2048× 2048 8-bits SRGB
Name[nn]=Tekstur 2048 × 2048 8-bits SRGB
Name[pl]=Tekstura 2048x2048 8bit srgb
Name[pt]=Textura 2048x2048 8-bits sRGB
Name[pt_BR]=Textura 2048x2048 8bits sRGB
......
......@@ -21,7 +21,7 @@ Name[ja]=テクスチャ 256x256 8 ビット sRGB
Name[ko]=텍스처 256x256 8비트 srgb
Name[nb]=Tekstur 256x256 8bit srgb
Name[nl]=Textuur 256x256 8bit srgb
Name[nn]=Tekstur 256× 256 8-bits SRGB
Name[nn]=Tekstur 256 × 256 8-bits SRGB
Name[pl]=Tekstura 256x256 8bit srgb
Name[pt]=Textura 256x256 8-bits sRGB
Name[pt_BR]=Textura 256x256 8bits sRGB
......
......@@ -21,7 +21,7 @@ Name[ja]=テクスチャ 4096x4096 8 ビット sRGB
Name[ko]=텍스처 4096x4096 8비트 srgb
Name[nb]=Tekstur 4096x4096 8bit srgb
Name[nl]=Textuur 4096x4096 8bit srgb
Name[nn]=Tekstur 4096× 4096 8-bits SRGB
Name[nn]=Tekstur 4096 × 4096 8-bits SRGB
Name[pl]=Tekstura 4096x4096 8bit srgb
Name[pt]=Textura 4096x4096 8-bits sRGB
Name[pt_BR]=Textura 4096x4096 8bits sRGB
......
......@@ -21,7 +21,7 @@ Name[ja]=テクスチャ 512x512 8 ビット sRGB
Name[ko]=텍스처 512x512 8비트 srgb
Name[nb]=Tekstur 512x512 8bit srgb
Name[nl]=Textuur 512x512 8bit srgb
Name[nn]=Tekstur 512× 512 8-bits SRGB
Name[nn]=Tekstur 512 × 512 8-bits SRGB
Name[pl]=Tekstura 512x512 8bit srgb
Name[pt]=Textura 512x512 8-bits sRGB
Name[pt_BR]=Textura 512x512 8bits sRGB
......
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