Commit 22d22d88 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 68ff6e20
{
"Encoding": "UTF-8",
"GenericName": "Ruby Support",
"GenericName[ast]": "Sofitu Ruby",
"GenericName[bg]": "Поддръжка на Ruby",
"GenericName[bs]": "Podrška za jezik Ruby",
"GenericName[ca@valencia]": "Implementació de Ruby",
"GenericName[ca]": "Implementació de Ruby",
"GenericName[cs]": "Podpora Ruby",
"GenericName[de]": "Unterstützung für Ruby",
"GenericName[el]": "Υποστήριξη Ruby",
"GenericName[en_GB]": "Ruby Support",
"GenericName[es]": "Implementación de Ruby",
"GenericName[et]": "Ruby toetus",
"GenericName[fi]": "Ruby-tuki",
"GenericName[fr]": "Prise en charge de Ruby",
"GenericName[ga]": "Tacaíocht Ruby",
"GenericName[gl]": "Compatibilidade con Ruby",
"GenericName[hne]": "रूबी समर्थन",
"GenericName[hu]": "Ruby-támogatás",
"GenericName[it]": "Supporto per Ruby",
"GenericName[ja]": "Ruby サポート",
"GenericName[nds]": "Ruby-Ünnerstütten",
"GenericName[nl]": "Ondersteuning voor Ruby",
"GenericName[pa]": "ਰੂਬੀ ਸਹਿਯੋਗ",
"GenericName[pl]": "Obsługa Ruby",
"GenericName[pt]": "Suporte para Ruby",
"GenericName[pt_BR]": "Suporte à Ruby",
"GenericName[ru]": "Поддержка Ruby",
"GenericName[sk]": "Podpora Ruby",
"GenericName[sv]": "Ruby-stöd",
"GenericName[tr]": "Ruby Desteği",
"GenericName[ug]": "Ruby قوللىشى",
"GenericName[uk]": "Підтримка Ruby",
"GenericName[x-test]": "xxRuby Supportxx",
"GenericName[zh_CN]": "Ruby 支持",
"Encoding": "UTF-8",
"GenericName": "Ruby Support",
"GenericName[ast]": "Sofitu Ruby",
"GenericName[bg]": "Поддръжка на Ruby",
"GenericName[bs]": "Podrška za jezik Ruby",
"GenericName[ca@valencia]": "Implementació de Ruby",
"GenericName[ca]": "Implementació de Ruby",
"GenericName[cs]": "Podpora Ruby",
"GenericName[de]": "Unterstützung für Ruby",
"GenericName[el]": "Υποστήριξη Ruby",
"GenericName[en_GB]": "Ruby Support",
"GenericName[es]": "Implementación de Ruby",
"GenericName[et]": "Ruby toetus",
"GenericName[fi]": "Ruby-tuki",
"GenericName[fr]": "Prise en charge de Ruby",
"GenericName[ga]": "Tacaíocht Ruby",
"GenericName[gl]": "Compatibilidade con Ruby",
"GenericName[hne]": "रूबी समर्थन",
"GenericName[hu]": "Ruby-támogatás",
"GenericName[it]": "Supporto per Ruby",
"GenericName[ja]": "Ruby サポート",
"GenericName[nds]": "Ruby-Ünnerstütten",
"GenericName[nl]": "Ondersteuning voor Ruby",
"GenericName[pa]": "ਰੂਬੀ ਸਹਿਯੋਗ",
"GenericName[pl]": "Obsługa Ruby",
"GenericName[pt]": "Suporte para Ruby",
"GenericName[pt_BR]": "Suporte à Ruby",
"GenericName[ru]": "Поддержка Ruby",
"GenericName[sk]": "Podpora Ruby",
"GenericName[sv]": "Ruby-stöd",
"GenericName[tr]": "Ruby Desteği",
"GenericName[ug]": "Ruby قوللىشى",
"GenericName[uk]": "Підтримка Ruby",
"GenericName[x-test]": "xxRuby Supportxx",
"GenericName[zh_CN]": "Ruby 支持",
"KPlugin": {
"Description": "Ruby Language Support",
"Description[ast]": "Sofitu de llinguax Ruby",
"Description[bg]": "Поддръжка на езика Ruby",
"Description[bs]": "Podrška za jezik Ruby",
"Description[ca@valencia]": "Implementació del llenguatge Ruby",
"Description[ca]": "Implementació del llenguatge Ruby",
"Description[cs]": "Podpora jazyka Ruby",
"Description[de]": "Sprachunterstützung für Ruby",
"Description[el]": "Υποστήριξη γλώσσας Ruby",
"Description[en_GB]": "Ruby Language Support",
"Description[es]": "Implementación del lenguaje Ruby",
"Description[et]": "Ruby keele toetus",
"Description[fi]": "Ruby-kielituki",
"Description[fr]": "Prise en charge du langage Ruby",
"Description[ga]": "Tacaíocht Ruby",
"Description[gl]": "Compatibilidade con Ruby",
"Description[hne]": "रूबी भाखा समर्थन",
"Description[hu]": "Ruby nyelvi támogatás",
"Description[it]": "Supporto per il linguaggio Ruby",
"Description[ja]": "Ruby 言語のサポート",
"Description[nds]": "Ünnerstütten för Ruby",
"Description[nl]": "Ondersteuning voor de taal Ruby",
"Description[pl]": "Obsługa języka Ruby",
"Description[pt]": "Suporte para a Linguagem Ruby",
"Description[pt_BR]": "Suporte à linguagem Ruby",
"Description[ru]": "Поддержка языка Ruby",
"Description[sk]": "Podpora jazyka Ruby",
"Description[sv]": "Stöd för språket Ruby",
"Description[tr]": "Ruby Dil Desteği",
"Description[uk]": "Підтримка мови Ruby",
"Description[x-test]": "xxRuby Language Supportxx",
"Description[zh_CN]": "Ruby 语言支持",
"Icon": "application-x-ruby",
"Id": "KDevRubySupport",
"Name": "Ruby Support",
"Name[ast]": "Sofitu Ruby",
"Name[bg]": "Поддръжка на Ruby",
"Name[bs]": "Podrška za jezik Ruby",
"Name[ca@valencia]": "Implementació de Ruby",
"Name[ca]": "Implementació de Ruby",
"Name[cs]": "Podpora Ruby",
"Name[de]": "Unterstützung für Ruby",
"Name[en_GB]": "Ruby Support",
"Name[es]": "Implementación de Ruby",
"Name[et]": "Ruby toetus",
"Name[fi]": "Ruby-tuki",
"Name[fr]": "Prise en charge de Ruby",
"Name[ga]": "Tacaíocht Ruby",
"Name[gl]": "Compatibilidade con Ruby",
"Name[hu]": "Ruby-támogatás",
"Name[nl]": "Ondersteuning voor Ruby",
"Name[pl]": "Obsługa Ruby",
"Name[pt]": "Suporte para Ruby",
"Name[pt_BR]": "Suporte à Ruby",
"Name[ru]": "Поддержка Ruby",
"Name[sk]": "Podpora Ruby",
"Name[sv]": "Ruby-stöd",
"Name[tr]": "Ruby Desteği",
"Name[ug]": "Ruby قوللىشى",
"Name[uk]": "Підтримка Ruby",
"Name[x-test]": "xxRuby Supportxx",
"Name[zh_CN]": "Ruby 支持",
"Description": "Ruby Language Support",
"Icon": "application-x-ruby",
"Id": "KDevRubySupport",
"Name": "Ruby Support",
"ServiceTypes": [
"KDevelop/Plugin"
]
},
"X-KDevelop-Args": "RUBY",
"X-KDevelop-Interfaces": "ILanguageSupport",
"X-KDevelop-Language": "Ruby",
"X-KDevelop-LoadMode": "AlwaysOn",
"X-KDevelop-Mode": "NoGUI",
},
"X-KDevelop-Args": "RUBY",
"X-KDevelop-Interfaces": "ILanguageSupport",
"X-KDevelop-Language": "Ruby",
"X-KDevelop-LoadMode": "AlwaysOn",
"X-KDevelop-Mode": "NoGUI",
"X-KDevelop-SupportedMimeTypes": "application/x-ruby"
}
}
\ No newline at end of file
Supports Markdown
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