Commit bd9d7016 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 91df5636
......@@ -21,6 +21,7 @@ Name[pt]=RubyGem
Name[ru]=Пакет Ruby («gem»)
......@@ -48,6 +49,7 @@ Comment[pl]=Tworzy prosty RubyGem
Comment[pt]=Gerar um RubyGem simples
Comment[pt_BR]=Gera um RubyGem simples
Comment[sk]=Vygenerovať jednoduchý RubyGem
Comment[sl]=Generiraj enostaven RubyGem
Comment[sv]=Skapa en enkelt RubyGem
Comment[tr]=Basit bir RubyGem oluştur
Comment[uk]=Створити простий RubyGem
......@@ -20,6 +20,7 @@ Name[pl]=Prosta aplikacja Ruby
Name[pt]=Aplicação Simples em Ruby
Name[pt_BR]=Aplicativo Ruby simples
Name[sk]=Jednoduchá Ruby aplikácia
Name[sl]=Enostavna aplikacija Ruby
Name[sv]=Enkelt Ruby-program
Name[tr]=Basit Ruby Uygulaması
Name[uk]=Проста програма мовою Ruby
......@@ -47,6 +48,7 @@ Comment[pl]=Tworzy prostą aplikację Ruby
Comment[pt]=Gerar uma aplicação simples em Ruby
Comment[pt_BR]=Gera um aplicativo Ruby simples
Comment[sk]=Vygenerovať jednoduchú Ruby aplikáciu
Comment[sl]=Generiraj enostavno aplikacijo Ruby
Comment[sv]=Skapa ett enkelt Ruby-program
Comment[tr]=Basit bir Ruby uygulaması oluştur
Comment[uk]=Створити просту програму мовою Ruby
......@@ -22,6 +22,7 @@
"Description[pt_BR]": "Suporte à linguagem Ruby",
"Description[ru]": "Поддержка языка программирования Ruby",
"Description[sk]": "Podpora jazyka Ruby",
"Description[sl]": "Podpora jeziku Ruby",
"Description[sv]": "Ruby-språkstöd",
"Description[tr]": "Ruby Dil Desteği",
"Description[uk]": "Підтримка мови Ruby",
......@@ -52,6 +53,7 @@
"Name[pt_BR]": "Suporte à Ruby",
"Name[ru]": "Поддержка Ruby",
"Name[sk]": "Podpora Ruby",
"Name[sl]": "Podpora Ruby",
"Name[sv]": "Stöd för Ruby",
"Name[tr]": "Ruby Desteği",
"Name[uk]": "Підтримка Ruby",
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