Commit 46214cb1 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 a7b87153
......@@ -6,6 +6,15 @@ Icon=kdevelop
X-DocPath=kdevelop/index.html
Terminal=false
Name=KDevelop
Name[ca]=KDevelop
Name[de]=KDevelop
Name[es]=KDevelop
Name[nl]=KDevelop
Name[pt]=KDevelop
Name[pt_BR]=KDevelop
Name[sv]=KDevelop
Name[uk]=KDevelop
Name[x-test]=xxKDevelopxx
GenericName=Integrated Development Environment
GenericName[ar]=بيئة تطوير متكاملة
GenericName[bs]=Integrisano razvojno okruženje
......
......@@ -45,7 +45,7 @@
"Name[sk]": "Backend formátovača AStyle",
"Name[sl]": "Zaledje oblikovalnika AStyle",
"Name[sv]": "Astyle-formateringsgränssnitt",
"Name[tr]": "Astyle Biçimleyici Arka Ucu",
"Name[tr]": "Astyle Biçimlendirici Arka Ucu",
"Name[uk]": "Сервер форматування AStyle",
"Name[x-test]": "xxAStyle Formatter Backendxx",
"Name[zh_CN]": "AStyle 格式化器后端",
......
......@@ -21,7 +21,7 @@
"Description[sk]": "Umožní vám vidieť plazmoid",
"Description[sl]": "Vam omogoča ogled plasmoida",
"Description[sv]": "Låter dig visa en Plasmoid",
"Description[tr]": "Bir plazmoid görüntülemenize imkan verir",
"Description[tr]": "Bir plazmoid görüntülemenize izin verir",
"Description[uk]": "Надає вам змогу переглядати роботу плазмоїдів",
"Description[x-test]": "xxLets you view a plasmoidxx",
"Description[zh_CN]": "让您查看一个 plasmoid",
......@@ -44,7 +44,7 @@
"Name[sk]": "Spúšťač plazmoidov",
"Name[sl]": "Zaganjalnik plasmoidov",
"Name[sv]": " Plasmoid-startprogram",
"Name[tr]": "Plazmoid Başlatıcı",
"Name[tr]": "Plazmoid Başlatıcı",
"Name[uk]": "Засіб запуску плазмоїдів",
"Name[x-test]": "xxPlasmoid Launcherxx",
"Name[zh_CN]": "Plasmoid 启动器",
......
......@@ -16,7 +16,7 @@
"Description[sk]": "Povolí použiť vlastné buildovacie systémy pre projekty KDevelop",
"Description[sl]": "Dovoli uporabo sistemov za izgradnjo po meri za projekte KDevelop",
"Description[sv]": "Gör det möjligt att använda egna byggsystem för projekt i KDevelop",
"Description[tr]": "KDevelop prjeleri için özel inşa sistemlerinin kullanılmasına izin verir",
"Description[tr]": "KDevelop projeleri için özel inşa sistemlerinin kullanılmasına izin verir",
"Description[uk]": "Надає змогу використовувати нетипові системи збирання у проектах KDevelop",
"Description[x-test]": "xxAllows to use custom buildsystems for KDevelop projectsxx",
"Description[zh_CN]": "允许对 KDevelop 工程使用自定义构建系统",
......
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