Commit b8fe8a92 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 cae728b6
......@@ -60,7 +60,7 @@ Comment[pt]=Gera uma aplicação baseada no QMake/Qt4 com uma interface gráfica
Comment[pt_BR]=Gera um aplicativo em QMake/Qt4 com uma interface gráfica (compatível com várias plataformas)
Comment[ru]=Основа приложения на Qt4 и CMake. Создаёт кроссплатформенное графическое приложение на базе CMake/Qt4.
Comment[sk]=Generovať aplikáciu QMake/Qt4 s grafickým používateľským rozhraním (crossplatformovo kompatibilný)
Comment[sl]=Ustvari program temelječ na CMake/Qt4 z grafičnim uporabniškim vmesnikom (združljiv z več okolji)
Comment[sl]=Ustvari program temelječ na QMake/Qt4 z grafičnim uporabniškim vmesnikom (združljiv z več okolji)
Comment[sv]=Skapa ett CMake/Qt4-baserat program med grafiskt användargränssnitt (som fungerar på flera plattformar)
Comment[tr]=Grafik arayüz içeren bir QMake/Qt4 tabanlı bir uygulama oluştur (çapraz platform uyumlu)
Comment[uk]=Створити програму, засновану на CMake/Qt4 (сумісну з декількома платформами)
......
......@@ -24,7 +24,7 @@ Name[pt]=Sub-classe de QObject
Name[pt_BR]=Subclasse de QObject
Name[ru]=Подкласс QObject
Name[sk]=Podtrieda QObject
Name[sl]=Pod-razred OObject
Name[sl]=Pod-razred QObject
Name[sv]=QObject-delklass
Name[tr]=QObject alt sınıfı
Name[uk]=Підклас QObject
......@@ -55,7 +55,7 @@ Comment[pt]=Sub-classe de QObject com propriedades
Comment[pt_BR]=Subclasse de QObject com propriedades
Comment[ru]=Подкласс QObject со свойствами
Comment[sk]=Podtrieda QObject s vlastnosťami
Comment[sl]=Pod-razred OObject z lastnostmi
Comment[sl]=Pod-razred QObject z lastnostmi
Comment[sv]=QObject-delklass med egenskaper
Comment[tr]=Özellikleriyle QObject alt sınıfı
Comment[uk]=Підклас QObject з властивостями
......
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