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"
master
l10n daemon script 2 years ago
parent 3324400672
commit 3030a85694

@ -1,111 +1,8 @@
{
"KPlugin": {
"Description": "Manage KWin scripts",
"Description[ar]": "أدر سكربتات كوين",
"Description[az]": "KWin skriptləri meneceri",
"Description[bs]": "Podesi KWin skripte",
"Description[ca@valencia]": "Gestiona els scripts de KWin",
"Description[ca]": "Gestiona els scripts del KWin",
"Description[cs]": "Spravovat skripty KWinu",
"Description[da]": "Håndtér KWin-scripts",
"Description[de]": "KWin-Skripte verwalten",
"Description[el]": "Διαχείριση σεναρίων KWin",
"Description[en_GB]": "Manage KWin scripts",
"Description[es]": "Gestionar guiones de KWin",
"Description[et]": "KWini skriptide haldamine",
"Description[eu]": "Kudeatu KWin scriptak",
"Description[fi]": "KWin-skriptien hallinta",
"Description[fr]": "Gérer les scripts de KWin",
"Description[ga]": "Bainistigh scripteanna KWin",
"Description[gl]": "Xestiona os scripts de KWin",
"Description[he]": "נהל תוספים של KWin",
"Description[hu]": "KWin szkriptek kezelése",
"Description[ia]": "Gere scriptos de KWin",
"Description[id]": "Kelola skrip KWin",
"Description[it]": "Gestione script kwin",
"Description[kk]": "KWin скрипттерін басқару",
"Description[km]": "គ្រប់គ្រង​ស្គ្រីប KWin",
"Description[ko]": "KWin 스크립트 관리",
"Description[lt]": "Tvarkyti KWin scenarijus",
"Description[mr]": "के-विन स्क्रिप्ट्स व्यवस्थापीत करा",
"Description[nb]": "Behandle KWin-skripter",
"Description[nds]": "KWin-Skripten plegen",
"Description[nl]": "KWin-scripts beheren",
"Description[nn]": "Handsam KWin-skript",
"Description[pa]": "ਕੇਵਿਨ ਸਕ੍ਰਿਪਟ ਪਰਬੰਧ",
"Description[pl]": "Zarządzanie skryptami KWin",
"Description[pt]": "Gerir os programas do KWin",
"Description[pt_BR]": "Gerencia os scripts do KWin",
"Description[ro]": "Gestionare scripturi KWin",
"Description[ru]": "Управление сценариями KWin",
"Description[sk]": "Spravovať KWin skripty",
"Description[sl]": "Upravljajte s skripti KWin",
"Description[sr@ijekavian]": "Управљајте К‑винових скриптама",
"Description[sr@ijekavianlatin]": "Upravljajte KWinovih skriptama",
"Description[sr@latin]": "Upravljajte KWinovih skriptama",
"Description[sr]": "Управљајте К‑винових скриптама",
"Description[sv]": "Hantera Kwin-skript",
"Description[ta]": "கேவின்னுக்கான சிறுநிரல்களை நிர்வகியுங்கள்",
"Description[tr]": "KWin betiklerini yönet",
"Description[uk]": "Керування скриптами KWin",
"Description[vi]": "Quản lí các kịch bản KWin",
"Description[x-test]": "xxManage KWin scriptsxx",
"Description[zh_CN]": "管理 KWin 脚本",
"Description[zh_TW]": "管理 KWin 文稿",
"Icon": "preferences-system-windows-actions",
"Name": "KWin Scripts",
"Name[ar]": "سكرِبتات نوافذك",
"Name[az]": "KWin Skriptləri",
"Name[bs]": "KWin skripte",
"Name[ca@valencia]": "Scripts de KWin",
"Name[ca]": "Scripts del KWin",
"Name[cs]": "Skripty KWinu",
"Name[da]": "KWin-scripts",
"Name[de]": "KWin-Skripte",
"Name[el]": "Σενάρια KWin",
"Name[en_GB]": "KWin Scripts",
"Name[es]": "Guiones de KWin",
"Name[et]": "KWini skriptid",
"Name[eu]": "KWin scriptak",
"Name[fi]": "KWin-skriptit",
"Name[fr]": "Scripts de KWin",
"Name[ga]": "Scripteanna KWin",
"Name[gl]": "Scripts de KWin",
"Name[he]": "תוספים של KWin",
"Name[hu]": "KWin szkriptek",
"Name[ia]": "Scripts de KWin",
"Name[id]": "Skrip KWin",
"Name[it]": "Script kwin",
"Name[ja]": "KWin Scripts",
"Name[kk]": "KWin скрипттері",
"Name[km]": "ស្គ្រីប KWin",
"Name[ko]": "KWin 스크립트",
"Name[lt]": "KWin scenarijai",
"Name[mr]": "के-विन स्क्रिप्ट्स",
"Name[nb]": "KWin-skripter",
"Name[nds]": "KWin-Skripten",
"Name[nl]": "KWin-scripts",
"Name[nn]": "KWin-skript",
"Name[pa]": "KWin ਸਕ੍ਰਿਪਟ",
"Name[pl]": "Skrypty KWin",
"Name[pt]": "Programas do KWin",
"Name[pt_BR]": "Scripts do KWin",
"Name[ro]": "Scripturi KWin",
"Name[ru]": "Сценарии KWin",
"Name[sk]": "KWin skripty",
"Name[sl]": "Skripti KWin",
"Name[sr@ijekavian]": "К‑винове скрипте",
"Name[sr@ijekavianlatin]": "KWinove skripte",
"Name[sr@latin]": "KWinove skripte",
"Name[sr]": "К‑винове скрипте",
"Name[sv]": "Kwin-skript",
"Name[ta]": "கேவின் சிறுநிரல்கள்",
"Name[tr]": "KWin Betikleri",
"Name[uk]": "Скрипти KWin",
"Name[vi]": "Kịch bản KWin",
"Name[x-test]": "xxKWin Scriptsxx",
"Name[zh_CN]": "KWin 脚本",
"Name[zh_TW]": "KWin 文稿",
"ServiceTypes": [
"KCModule"
]

Loading…
Cancel
Save