Commit d8fe2674 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 b46ce68f
......@@ -3,11 +3,27 @@
"Authors": [
{
"Email": "hein@kde.org",
"Name": "Eike Hein"
"Name": "Eike Hein",
"Name[ca]": "Eike Hein",
"Name[hu]": "Eike Hein",
"Name[nl]": "Eike Hein",
"Name[sl]": "Eike Hein",
"Name[sv]": "Eike Hein",
"Name[uk]": "Eike Hein",
"Name[vi]": "Eike Hein",
"Name[x-test]": "xxEike Heinxx"
}
],
"Category": "Windows and Tasks",
"Description": "Switch between running applications",
"Description[ca]": "Commuta entre les aplicacions en execució",
"Description[hu]": "A futó alkalmazások között lehet vele váltani",
"Description[nl]": "Schakel tussen draaiende programma's",
"Description[sl]": "Preklapljaj med zagnanimi programi",
"Description[sv]": "Byt mellan program som kör",
"Description[uk]": "Перемкніть запущені програми",
"Description[vi]": "Chuyển giữa các ứng dụng đang chạy",
"Description[x-test]": "xxSwitch between running applicationsxx",
"EnabledByDefault": true,
"Icon": "preferences-system-windows",
"Id": "org.kde.plasma.icontasks",
......
......@@ -3,10 +3,26 @@
"Authors": [
{
"Email": "butirsky@gmail.com",
"Name": "Andrey Butirsky"
"Name": "Andrey Butirsky",
"Name[ca]": "Andrey Butirsky",
"Name[hu]": "Andrey Butirsky",
"Name[nl]": "Andrey Butirsky",
"Name[sl]": "Andrey Butirsky",
"Name[sv]": "Andrey Butirsky",
"Name[uk]": "Андрєй Бутирскій",
"Name[vi]": "Andrey Butirsky",
"Name[x-test]": "xxAndrey Butirskyxx"
}
],
"Description": "Show/switch keyboard layout",
"Description[ca]": "Mostra/commuta la disposició del teclat",
"Description[hu]": "Billentyűzetkiosztások megjelenítése/váltása",
"Description[nl]": "Toon/schakel tussen toetsenbordindelingen",
"Description[sl]": "Oglej/preklopi razporeditev tipk",
"Description[sv]": "Visa och byt tangentbordslayout",
"Description[uk]": "Показати/Перемкнути розкладку клавіатури",
"Description[vi]": "Hiện/chuyển bố cục bàn phím",
"Description[x-test]": "xxShow/switch keyboard layoutxx",
"EnabledByDefault": true,
"Icon": "input-keyboard",
"Id": "org.kde.plasma.keyboardlayout",
......
......@@ -3,11 +3,27 @@
"Authors": [
{
"Email": "hein@kde.org",
"Name": "Eike Hein"
"Name": "Eike Hein",
"Name[ca]": "Eike Hein",
"Name[hu]": "Eike Hein",
"Name[nl]": "Eike Hein",
"Name[sl]": "Eike Hein",
"Name[sv]": "Eike Hein",
"Name[uk]": "Eike Hein",
"Name[vi]": "Eike Hein",
"Name[x-test]": "xxEike Heinxx"
}
],
"Category": "Application Launchers",
"Description": "A launcher based on cascading popup menus",
"Description[ca]": "Un llançador basat en menús emergents en cascada",
"Description[hu]": "Felugró menükre épülő alkalmazásindító",
"Description[nl]": "Een starter gebaseerd op achter elkaar liggende popup-menu's",
"Description[sl]": "Zaganjalnik, ki temelji na kaskadnih pojavnih menijih",
"Description[sv]": "Ett startprogram baserat på kaskadmenyer",
"Description[uk]": "Засіб запуску, заснований на вкладених контекстних меню",
"Description[vi]": "Một trình khởi chạy dựa trên các trình đơn bật lên xếp tầng",
"Description[x-test]": "xxA launcher based on cascading popup menusxx",
"EnabledByDefault": true,
"Icon": "start-here-kde",
"Id": "org.kde.plasma.kicker",
......
......@@ -3,15 +3,39 @@
"Authors": [
{
"Email": "plasma-devel@kde.org",
"Name": "Martin Graesslin"
"Name": "Martin Graesslin",
"Name[ca]": "Martin Graesslin",
"Name[hu]": "Martin Graesslin",
"Name[nl]": "Martin Graesslin",
"Name[sl]": "Martin Graesslin",
"Name[sv]": "Martin Graesslin",
"Name[uk]": "Martin Graesslin",
"Name[vi]": "Martin Graesslin",
"Name[x-test]": "xxMartin Graesslinxx"
},
{
"Email": "mikel5764@gmail.com",
"Name": "Mikel Johnson"
"Name": "Mikel Johnson",
"Name[ca]": "Mikel Johnson",
"Name[hu]": "Mikel Johnson",
"Name[nl]": "Mikel Johnson",
"Name[sl]": "Mikel Johnson",
"Name[sv]": "Mikel Johnson",
"Name[uk]": "Mikel Johnson",
"Name[vi]": "Mikel Johnson",
"Name[x-test]": "xxMikel Johnsonxx"
}
],
"Category": "Application Launchers",
"Description": "Launcher to start applications",
"Description[ca]": "Llançador per a iniciar aplicacions",
"Description[hu]": "Alkalmazásindító",
"Description[nl]": "Applet voor het starten van programma's",
"Description[sl]": "Zaganjalnik za zagon programov",
"Description[sv]": "Startprogram för att köra program",
"Description[uk]": "Програма для запуску програм",
"Description[vi]": "Trình khởi chạy để khởi động ứng dụng",
"Description[x-test]": "xxLauncher to start applicationsxx",
"EnabledByDefault": true,
"Icon": "start-here-kde",
"Id": "org.kde.plasma.kickoff",
......
......@@ -3,11 +3,27 @@
"Authors": [
{
"Email": "wengxt@gmail.com",
"Name": "Weng Xuetian"
"Name": "Weng Xuetian",
"Name[ca]": "Weng Xuetian",
"Name[hu]": "Weng Xuetian",
"Name[nl]": "Weng Xuetian",
"Name[sl]": "Weng Xuetian",
"Name[sv]": "Weng Xuetian",
"Name[uk]": "Weng Xuetian",
"Name[vi]": "Weng Xuetian",
"Name[x-test]": "xxWeng Xuetianxx"
}
],
"Category": "Language",
"Description": "A generic input method panel",
"Description[ca]": "Un plafó per al mètode d'entrada genèric",
"Description[hu]": "Általános bevitelimód-panel",
"Description[nl]": "Een paneel met een algemene invoermethode",
"Description[sl]": "Plošča splošnega vnosnega načina",
"Description[sv]": "En generell panel för inmatningsmetod",
"Description[uk]": "Загальна панель методів введення",
"Description[vi]": "Một bảng phương thức nhập chung",
"Description[x-test]": "xxA generic input method panelxx",
"EnabledByDefault": true,
"Icon": "draw-freehand",
"Id": "org.kde.plasma.kimpanel",
......
......@@ -3,11 +3,27 @@
"Authors": [
{
"Email": "niccolo@venerandi.com",
"Name": "Niccolo Venerandi"
"Name": "Niccolo Venerandi",
"Name[ca]": "Niccolo Venerandi",
"Name[hu]": "Niccolo Venerandi",
"Name[nl]": "Niccolo Venerandi",
"Name[sl]": "Niccolo Venerandi",
"Name[sv]": "Niccolo Venerandi",
"Name[uk]": "Niccolo Venerandi",
"Name[vi]": "Niccolo Venerandi",
"Name[x-test]": "xxNiccolo Venerandixx"
}
],
"Category": "Utilities",
"Description": "To be used as a separator between margin areas in themes that support them",
"Description[ca]": "S'usarà com a separador entre les àrees de marge en els temes que els permeten",
"Description[hu]": "Elválasztó margóterületek között olyan témákban, amik támogatják azokat",
"Description[nl]": "Als een scheiding gebruiken tussen gebieden in marges in thema's die dat ondersteunen",
"Description[sl]": "Za uporabo kot ločilnik med robnimi področji pri temah, ki to podpirajo",
"Description[sv]": "Att använda som en avdelare mellan marginalområden i teman som stöder dem",
"Description[uk]": "Буде використано як роздільник між областями полів у темах, де передбачено підтримку таких роздільників",
"Description[vi]": "Để dùng làm phần phân cách giữa các vùng viền trong các chủ đề có hỗ trợ viền",
"Description[x-test]": "xxTo be used as a separator between margin areas in themes that support themxx",
"Icon": "filename-divider",
"Id": "org.kde.plasma.marginsseparator",
"License": "GPLv2",
......
......@@ -3,11 +3,27 @@
"Authors": [
{
"Email": "sebas@kde.org",
"Name": "Sebastian Kügler"
"Name": "Sebastian Kügler",
"Name[ca]": "Sebastian Kügler",
"Name[hu]": "Sebastian Kügler",
"Name[nl]": "Sebastian Kügler",
"Name[sl]": "Sebastian Kügler",
"Name[sv]": "Sebastian Kügler",
"Name[uk]": "Sebastian Kügler",
"Name[vi]": "Sebastian Kügler",
"Name[x-test]": "xxSebastian Küglerxx"
}
],
"Category": "Windows and Tasks",
"Description": "Shows the desktop by minimizing all windows",
"Description[ca]": "Mostra l'escriptori minimitzant totes les finestres",
"Description[hu]": "Megjeleníti az asztalt az összes ablak minimalizálásával",
"Description[nl]": "Toont het bureaublad door alle vensters te minimaliseren",
"Description[sl]": "Prikaže namizje s strnjevanjem vseh oken",
"Description[sv]": "Visar skrivbordet genom att minimera alla fönster",
"Description[uk]": "Показати стільницю, мінімізувавши усі вікна",
"Description[vi]": "Hiện bàn làm việc bằng cách thu nhỏ tất cả các cửa sổ",
"Description[x-test]": "xxShows the desktop by minimizing all windowsxx",
"EnabledByDefault": true,
"Icon": "user-desktop",
"Id": "org.kde.plasma.minimizeall",
......
......@@ -3,11 +3,27 @@
"Authors": [
{
"Email": "plasma-devel@kde.org",
"Name": "The Plasma Team"
"Name": "The Plasma Team",
"Name[ca]": "L'equip del Plasma",
"Name[hu]": "A Plasma fejlesztői",
"Name[nl]": "Het team van Plasma",
"Name[sl]": "Ekipa Plasme",
"Name[sv]": "Plasma-gruppen",
"Name[uk]": "Команда розробників Плазми",
"Name[vi]": "Đội ngũ Plasma",
"Name[x-test]": "xxThe Plasma Teamxx"
}
],
"Category": "Windows and Tasks",
"Description": "Switch between virtual desktops",
"Description[ca]": "Commuta entre escriptoris virtuals",
"Description[hu]": "Virtuális asztalok közötti váltásra szolgáló elem",
"Description[nl]": "Schakel tussen virtuele bureaubladen",
"Description[sl]": "Preklopi med navideznimi namizji",
"Description[sv]": "Byt mellan virtuella skrivbord",
"Description[uk]": "Перемкніть віртуальні стільниці",
"Description[vi]": "Chuyển giữa các bàn làm việc ảo",
"Description[x-test]": "xxSwitch between virtual desktopsxx",
"EnabledByDefault": true,
"Icon": "user-desktop",
"Id": "org.kde.plasma.pager",
......
......@@ -3,11 +3,27 @@
"Authors": [
{
"Email": "plasma-devel@kde.org",
"Name": "Gregor Tätzner"
"Name": "Gregor Tätzner",
"Name[ca]": "Gregor Tätzner",
"Name[hu]": "Gregor Tätzner",
"Name[nl]": "Gregor Tätzner",
"Name[sl]": "Gregor Tätzner",
"Name[sv]": "Gregor Tätzner",
"Name[uk]": "Gregor Tätzner",
"Name[vi]": "Gregor Tätzner",
"Name[x-test]": "xxGregor Tätznerxx"
}
],
"Category": "Windows and Tasks",
"Description": "Shows the activity manager",
"Description[ca]": "Mostra el gestor d'activitats",
"Description[hu]": "Aktivitáskezelő megjelenítése",
"Description[nl]": "Toont de activiteitenbeheerder",
"Description[sl]": "Prikaži upravljalnika dejavnosti",
"Description[sv]": "Visar Aktivitetshanteraren",
"Description[uk]": "Показує вікно керування просторами дій",
"Description[vi]": "Hiện trình quản lí Hoạt động",
"Description[x-test]": "xxShows the activity managerxx",
"EnabledByDefault": true,
"Icon": "activities",
"Id": "org.kde.plasma.showActivityManager",
......
......@@ -3,11 +3,27 @@
"Authors": [
{
"Email": "damu@iki.fi",
"Name": "Petri Damstén"
"Name": "Petri Damstén",
"Name[ca]": "Petri Damstén",
"Name[hu]": "Petri Damstén",
"Name[nl]": "Petri Damstén",
"Name[sl]": "Petri Damstén",
"Name[sv]": "Petri Damstén",
"Name[uk]": "Petri Damstén",
"Name[vi]": "Petri Damstén",
"Name[x-test]": "xxPetri Damsténxx"
}
],
"Category": "Windows and Tasks",
"Description": "Shows the desktop by moving windows aside",
"Description[ca]": "Mostra l'escriptori movent les finestres a part",
"Description[hu]": "Az asztal megjelenítése az ablakok oldalra mozgatásával",
"Description[nl]": "Toont het bureaublad door vensters opzij te schuiven",
"Description[sl]": "Prikaži namizje s pomikom vseh oken na stran",
"Description[sv]": "Visar skrivbordet genom flytta undan fönster",
"Description[uk]": "Показує стільницю, прибравши вікна",
"Description[vi]": "Hiện bàn làm việc bằng cách di chuyển các cửa sổ sang bên",
"Description[x-test]": "xxShows the desktop by moving windows asidexx",
"EnabledByDefault": true,
"FormFactors": [
"desktop"
......
......@@ -3,11 +3,27 @@
"Authors": [
{
"Email": "hein@kde.org",
"Name": "Eike Hein"
"Name": "Eike Hein",
"Name[ca]": "Eike Hein",
"Name[hu]": "Eike Hein",
"Name[nl]": "Eike Hein",
"Name[sl]": "Eike Hein",
"Name[sv]": "Eike Hein",
"Name[uk]": "Eike Hein",
"Name[vi]": "Eike Hein",
"Name[x-test]": "xxEike Heinxx"
}
],
"Category": "Windows and Tasks",
"Description": "Switch between tasks",
"Description[ca]": "Commuta entre tasques",
"Description[hu]": "Váltás a feladatok között",
"Description[nl]": "Wissel tussen taken",
"Description[sl]": "Preklopi med opravili",
"Description[sv]": "Byt mellan aktiviteter",
"Description[uk]": "Перемикання між завданнями",
"Description[vi]": "Chuyển giữa các tác vụ",
"Description[x-test]": "xxSwitch between tasksxx",
"EnabledByDefault": true,
"Icon": "preferences-system-windows",
"Id": "org.kde.plasma.taskmanager",
......
......@@ -3,11 +3,27 @@
"Authors": [
{
"Email": "heena393@gmail.com",
"Name": "Heena"
"Name": "Heena",
"Name[ca]": "Heena",
"Name[hu]": "Heena",
"Name[nl]": "Heena",
"Name[sl]": "Heena",
"Name[sv]": "Heena",
"Name[uk]": "Heena",
"Name[vi]": "Heena",
"Name[x-test]": "xxHeenaxx"
}
],
"Category": "File System",
"Description": "Provides access to the files sent to trash",
"Description[ca]": "Proporciona accés als fitxers enviats a la paperera",
"Description[hu]": "Hozzáférést biztosít a kukába helyezett fájlokhoz",
"Description[nl]": "Biedt toegang tot de bestanden verzonden naar de prullenbak",
"Description[sl]": "Ponuja dostop do datotek poslanih v Smeti",
"Description[sv]": "Tillhandahåller åtkomst av filerna skickade till papperskorgen",
"Description[uk]": "Надає доступ до файлів, які було надіслано до Смітника",
"Description[vi]": "Cho phép truy cập các tệp đã bị đưa vào thùng rác",
"Description[x-test]": "xxProvides access to the files sent to trashxx",
"EnabledByDefault": true,
"Icon": "user-trash",
"Id": "org.kde.plasma.trash",
......
......@@ -3,11 +3,27 @@
"Authors": [
{
"Email": "hein@kde.org",
"Name": "Eike Hein"
"Name": "Eike Hein",
"Name[ca]": "Eike Hein",
"Name[hu]": "Eike Hein",
"Name[nl]": "Eike Hein",
"Name[sl]": "Eike Hein",
"Name[sv]": "Eike Hein",
"Name[uk]": "Eike Hein",
"Name[vi]": "Eike Hein",
"Name[x-test]": "xxEike Heinxx"
}
],
"Category": "Windows and Tasks",
"Description": "Plasmoid to show list of opened windows.",
"Description[ca]": "Plasmoide que mostra una llista de les finestres obertes.",
"Description[hu]": "Plazmoid a megnyitott ablakok listájának megjelenítésére.",
"Description[nl]": "Plasmoid voor het tonen van een lijst van geopende vensters.",
"Description[sl]": "Plasmoid, ki prikazuje seznam odprtih oken.",
"Description[sv]": "Plasmoid för att visa lista med öppna fönster.",
"Description[uk]": "Плазмоїд для показу списку відкритих вікон.",
"Description[vi]": "Plasmoid để hiện danh sách các cửa sổ đã mở.",
"Description[x-test]": "xxPlasmoid to show list of opened windows.xx",
"Icon": "preferences-system-windows",
"Id": "org.kde.plasma.windowlist",
"License": "GPL-2.0+",
......
......@@ -3,11 +3,27 @@
"Authors": [
{
"Email": "sebas@kde.org, hein@kde.org",
"Name": "Sebastian Kügler, Eike Hein"
"Name": "Sebastian Kügler, Eike Hein",
"Name[ca]": "Sebastian Kügler, Eike Hein",
"Name[hu]": "Sebastian Kügler, Eike Hein",
"Name[nl]": "Sebastian Kügler, Eike Hein",
"Name[sl]": "Sebastian Kügler, Eike Hein",
"Name[sv]": "Sebastian Kügler, Eike Hein",
"Name[uk]": "Sebastian Kügler, Eike Hein",
"Name[vi]": "Sebastian Kügler, Eike Hein",
"Name[x-test]": "xxSebastian Kügler, Eike Heinxx"
}
],
"Category": "Containments",
"Description": "A clean and simple layout",
"Description[ca]": "Una disposició neta i senzilla",
"Description[hu]": "Egy tiszta és egyszerű elrendezés",
"Description[nl]": "Een schone en simpele opmaak",
"Description[sl]": "Čist in preprost razpored",
"Description[sv]": "En ren och enkel layout",
"Description[uk]": "Просте компонування",
"Description[vi]": "Một bố cục thoáng đãng và đơn giản",
"Description[x-test]": "xxA clean and simple layoutxx",
"EnabledByDefault": true,
"Icon": "user-desktop",
"Id": "org.kde.desktopcontainment",
......
......@@ -3,11 +3,27 @@
"Authors": [
{
"Email": "hein@kde.org",
"Name": "Eike Hein"
"Name": "Eike Hein",
"Name[ca]": "Eike Hein",
"Name[hu]": "Eike Hein",
"Name[nl]": "Eike Hein",
"Name[sl]": "Eike Hein",
"Name[sv]": "Eike Hein",
"Name[uk]": "Eike Hein",
"Name[vi]": "Eike Hein",
"Name[x-test]": "xxEike Heinxx"
}
],
"Category": "File System",
"Description": "Display the contents of folders",
"Description[ca]": "Mostra el contingut de les carpetes",
"Description[hu]": "Megjeleníti a mappák tartalmát",
"Description[nl]": "Toon de inhoud van mappen",
"Description[sl]": "Pokaži vsebino map",
"Description[sv]": "Visa innehåll i kataloger",
"Description[uk]": "Показ вмісту тек",
"Description[vi]": "Hiển thị nội dung các thư mục",
"Description[x-test]": "xxDisplay the contents of foldersxx",
"EnabledByDefault": true,
"Icon": "org.kde.plasma.folder",
"Id": "org.kde.plasma.folder",
......
......@@ -3,7 +3,15 @@
"Authors": [
{
"Email": "mart@kde.org",
"Name": "Marco Martin"
"Name": "Marco Martin",
"Name[ca]": "Marco Martin",
"Name[hu]": "Marco Martin",
"Name[nl]": "Marco Martin",
"Name[sl]": "Marco Martin",
"Name[sv]": "Marco Martin",
"Name[uk]": "Marco Martin",
"Name[vi]": "Marco Martin",
"Name[x-test]": "xxMarco Martinxx"
}
],
"Category": "",
......
......@@ -2,6 +2,14 @@
"Categories": "Qt;KDE;X-KDE-settings-accessibility;",
"KPlugin": {
"Description": "Configure Accessibility Options",
"Description[ca]": "Configura les opcions d'accessibilitat",
"Description[hu]": "Akadálymentesítési beállítások",
"Description[nl]": "Opties voor toegankelijkheid configureren",
"Description[sl]": "Nastavi možnosti dostopnosti",
"Description[sv]": "Anpassa alternativ för handikappstöd",
"Description[uk]": "Налаштувати параметри доступності",
"Description[vi]": "Cấu hình các lựa chọn hỗ trợ truy cập",
"Description[x-test]": "xxConfigure Accessibility Optionsxx",
"Icon": "preferences-desktop-accessibility",
"Name": "Accessibility",
"Name[af]": "Toeganklikheid",
......
{
"KPlugin": {
"Description": "Activities help you to focus on a specific task",
"Description[ca]": "Les activitats ajuden a centrar-vos en una tasca específica",
"Description[hu]": "Az aktivitások segítenek egy-egy feladatra koncentrálni",
"Description[nl]": "Activiteiten helpen u om u te focussen op een specifieke taak",
"Description[sl]": "Dejavnosti vam pomagajo, da se osredotočite na določeno opravilo",
"Description[sv]": "Aktiviteter hjälper dig att fokusera på en viss uppgift",
"Description[uk]": "Простори дій допоможуть вам зосередитися на певному завданні",
"Description[vi]": "Chức năng \"Hoạt động\" giúp bạn tập trung vào một tác vụ nhất định",
"Description[x-test]": "xxActivities help you to focus on a specific taskxx",
"Icon": "preferences-desktop-activities",
"Name": "Activities",
"Name[ar]": "الأنشطة",
......
{
"KPlugin": {
"Description": "Configure File Search",
"Description[ca]": "Configura la cerca de fitxers",
"Description[hu]": "Fájlkeresés beállítása",
"Description[nl]": "Bestanden zoeken instellen",
"Description[sl]": "Nastavi iskanje datotek",
"Description[sv]": "Anpassa filsökning",
"Description[uk]": "Налаштовування пошуку файлів",
"Description[vi]": "Cấu hình tìm kiếm tệp",
"Description[x-test]": "xxConfigure File Searchxx",
"Icon": "preferences-desktop-baloo",
"Name": "File Search",
"Name[ar]": "بحث الملفّات",
......
{
"KPlugin": {
"Description": "Choose default Applications",
"Description[ca]": "Trieu les aplicacions predeterminades",
"Description[hu]": "Alapértelmezett alkalmazások kiválasztása",
"Description[nl]": "Standaard toepassingen kiezen",
"Description[sl]": "Izberi privzete programe",
"Description[sv]": "Välj standardprogram",
"Description[uk]": "Вибір типових програм",
"Description[vi]": "Chọn ứng dụng mặc định",
"Description[x-test]": "xxChoose default Applicationsxx",
"FormFactors": [
"desktop",
"handset",
......
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