Members of the KDE Community are recommended to subscribe to the kde-community mailing list at to allow them to participate in important discussions and receive other important announcements

Commit c2c81693 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 b7fd588c
......@@ -4,6 +4,8 @@ ServiceTypes=KTextEditor/Plugin
Name=External Tools
Name[ar]=الأدوات الخارجية
Name[ca]=Eines externes
Name[cs]=Externí nástroje
Name[da]=Eksterne værktøjer
Name[de]=Externe Programme
Name[el]=Εξωτερικά εργαλεία
......@@ -15,6 +17,7 @@ Name[fr]=Outils externes
Name[ga]=Uirlisí Seachtracha
Name[gl]=Utilidades externas
Name[hu]=Külső eszközök
Name[ia]=Instrumentos externe
Name[it]=Strumenti esterni
Name[kk]=Сыртқы құралдар
......@@ -24,6 +27,7 @@ Name[ne]=बाह्य उपकरण
Name[nl]=Externe hulpmiddelen
Name[pa]=ਬਾਹਰੀ ਟੂਲ
Name[pl]=Narzędzia zewnętrzne
Name[pt]=Ferramentas Externas
Name[ro]=Unelte externe
Name[si]=බාහිර මෙවලම්
Name[sv]=Externa verktyg
......@@ -31,10 +35,13 @@ Name[tg]=Асбобҳои берунӣ
Name[ug]=سىرتقى قوراللار
Name[uk]=Зовнішні засоби
Name[wa]=Divantrinnès usteyes
Name[x-test]=xxExternal Toolsxx
Comment=External Tools
Comment[ar]=الأدوات الخارجية
Comment[be]=Знешнія інструменты
Comment[bg]=Външни инструменти
Comment[ca]=Eines externes
Comment[cs]=Externí nástroje
Comment[da]=Eksterne værktøjer
Comment[de]=Externe Programme
Comment[el]=Εξωτερικά εργαλεία
......@@ -46,6 +53,7 @@ Comment[fr]=Outils externes
Comment[ga]=Uirlisí Seachtracha
Comment[gl]=Utilidades externas
Comment[hu]=Külső eszközök
Comment[ia]=Instrumentos externe
Comment[it]=Strumenti esterni
Comment[kk]=Сыртқы құралдар
......@@ -56,6 +64,7 @@ Comment[ne]=बाह्य उपकरण
Comment[nl]=Externe hulpmiddelen
Comment[pa]=ਬਾਹਰੀ ਟੂਲ
Comment[pl]=Narzędzia zewnętrzne
Comment[pt]=Ferramentas Externas
Comment[ro]=Unelte externe
Comment[si]=බාහිර මෙවලම්
Comment[sv]=Externa verktyg
......@@ -63,3 +72,4 @@ Comment[tg]=Асбобҳои берунӣ
Comment[ug]=سىرتقى قوراللار
Comment[uk]=Зовнішні інструменти
Comment[wa]=Divantrinnès usteyes
Comment[x-test]=xxExternal Toolsxx
......@@ -11,6 +11,7 @@ Name[es]=Cliente LSP
Name[eu]=LSP bezeroa
Name[fr]=Client LSP
Name[gl]=Cliente de LSP
Name[ia]=Cliente LSP
Name[id]=Klien LSP
Name[it]=Client LSP
Name[ko]=LSP 클라이언트
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