Commit 81e9f43d 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 8f7bbaa9
[KNewStuff3]
Name=GTK 2.x Themes
Name[ar]=سمات جتك الثّانية
Name[ast]=Estilos pa GTK 2.x
Name[ca]=Temes GTK 2.x
Name[ca@valencia]=Temes GTK 2.x
Name[cs]=Motivy GTK 2.x
Name[da]=GTK 2.x-temaer
Name[de]=GTK 2.x-Designs
Name[el]=Θέματα GTK 2.x
Name[en_GB]=GTK 2.x Themes
Name[es]=Temas de GTK 2.x
Name[et]=GTK 2.x teemad
Name[eu]=GTK 2.x gaiak
Name[fi]=GTK 2.x -teemat
Name[fr]=Thèmes GTK 2.x
Name[gl]=Temas de GTK 2.x
Name[he]=ערכות נושא של GTK 2.x
Name[hu]=GTK 2.x témák
Name[id]=Tema GTK 2.x
Name[it]=Temi GTK 2.x
Name[ko]=GTK 2.x 테마
Name[ia]=Themas de GTK 2.x
Name[lt]=GTK 2.x apipavidalinimai
Name[nl]=GTK 2.x thema's
Name[nn]=GTK 2.x-tema
Name[pl]=Wygląd GTK 2.x
Name[pt]=Temas do GTK 2.x
Name[pt_BR]=Temas GTK 2.x
Name[ru]=Темы GTK 2.x
Name[sk]=Témy GTK 2.x
Name[sl]=Teme GTK 2.x
Name[sr]=ГТК 2.x теме
Name[sr@ijekavian]=ГТК 2.x теме
Name[sr@ijekavianlatin]=GTK 2.x teme
Name[sr@latin]=GTK 2.x teme
Name[sk]=GTK 2.x Témy
Name[sv]=GTK 2.x-teman
Name[tg]=Мавзӯъҳои GTK 2.x
Name[tr]=GTK 2.x Temaları
Name[uk]=Теми GTK 2.x
Name[x-test]=xxGTK 2.x Themesxx
Name[zh_CN]=GTK 2.x 主题
Name[zh_TW]=GTK 2.x 主題
Categories=GTK 2.x Theme/Style
......
[KNewStuff3]
Name=GTK 3.x Themes
Name[ar]=سمات جتك الثّالثة
Name[ast]=Estilos pa GTK 3.x
Name[ca]=Temes GTK 3.x
Name[ca@valencia]=Temes GTK 3.x
Name[cs]=Motivy GTK 3.x
Name[da]=GTK 3.x-temaer
Name[de]=GTK 3.x-Designs
Name[el]=Θέματα GTK 3.x
Name[en_GB]=GTK 3.x Themes
Name[es]=Temas de GTK 3.x
Name[et]=GTK 3.x teemad
Name[eu]=GTK 3.x gaiak
Name[fi]=GTK 3.x -teemat
Name[fr]=Thèmes GTK 3.x
Name[gl]=Temas de GTK 3.x
Name[he]=ערכות נושא של GTK 3.x
Name[hu]=GTK 3.x témák
Name[id]=Tema GTK 3.x
Name[it]=Temi GTK 3.x
Name[ko]=GTK 3.x 테마
Name[ia]=Themas de GTK 3.x
Name[lt]=GTK 3.x apipavidalinimai
Name[nl]=GTK 3.x thema's
Name[nn]=GTK 3.x-tema
Name[pl]=Wygląd GTK 3.x
Name[pt]=Temas do GTK 3.x
Name[pt_BR]=Temas GTK 3.x
Name[ru]=Темы GTK 3.x
Name[sk]=Témy GTK 3.x
Name[sl]=Teme GTK 3.x
Name[sr]=ГТК 3.x теме
Name[sr@ijekavian]=ГТК 3.x теме
Name[sr@ijekavianlatin]=GTK 3.x teme
Name[sr@latin]=GTK 3.x teme
Name[sk]=GTK 3.x Témy
Name[sv]=GTK 3.x-teman
Name[tg]=Мавзӯъҳои GTK 3.x
Name[tr]=GTK 3.x Temaları
Name[uk]=Теми GTK 3.x
Name[x-test]=xxGTK 3.x Themesxx
Name[zh_CN]=GTK 3.x 主题
Name[zh_TW]=GTK 3.x 主題
Categories=GTK 3.x Theme/Style
......
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