mirror of
https://invent.kde.org/marcoa/shift-shell.git
synced 2026-04-26 14:23:09 +00:00
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"
This commit is contained in:
parent
50470cd98a
commit
309285fb39
7 changed files with 72 additions and 0 deletions
|
|
@ -76,6 +76,14 @@
|
|||
"Name[zh_TW]": "行動網路"
|
||||
},
|
||||
"X-KDE-Keywords": "mobile,data,network",
|
||||
"X-KDE-Keywords[ca]": "mòbil,dades,xarxa",
|
||||
"X-KDE-Keywords[he]": "נייד,נתונים,רשת,פס רחב",
|
||||
"X-KDE-Keywords[ia]": "mobile,data,network",
|
||||
"X-KDE-Keywords[ka]": "mobile,data,network,მობილური ინტერნეტი,ქსელი",
|
||||
"X-KDE-Keywords[sl]": "mobilnik,podatki,omrežje",
|
||||
"X-KDE-Keywords[sv]": "mobil,data,nätverk",
|
||||
"X-KDE-Keywords[uk]": "mobile,data,network,мобільний,дані,мережа",
|
||||
"X-KDE-Keywords[x-test]": "xxmobilexx,xxdataxx,xxnetworkxx",
|
||||
"X-KDE-System-Settings-Parent-Category": "network",
|
||||
"X-KDE-Weight": 70
|
||||
}
|
||||
|
|
|
|||
|
|
@ -79,5 +79,13 @@
|
|||
"Name[zh_TW]": "通知"
|
||||
},
|
||||
"X-KDE-Keywords": "info, distro, system",
|
||||
"X-KDE-Keywords[ca]": "informació,distribució,sistema",
|
||||
"X-KDE-Keywords[he]": "פרטים,מידע,הפצה,מערכת",
|
||||
"X-KDE-Keywords[ia]": "info, distro, system",
|
||||
"X-KDE-Keywords[ka]": "info, distro, system, ინფორმაცია, დისტრიბუტივი, სისტემა",
|
||||
"X-KDE-Keywords[sl]": "informacije,distribucija,sistem",
|
||||
"X-KDE-Keywords[sv]": "information, distribution, system",
|
||||
"X-KDE-Keywords[uk]": "info, distro, system, інфо, відомості, дистрибутив, система",
|
||||
"X-KDE-Keywords[x-test]": "xxinfoxx,xx distroxx,xx systemxx",
|
||||
"X-KDE-System-Settings-Parent-Category": "system-administration"
|
||||
}
|
||||
|
|
|
|||
|
|
@ -131,5 +131,29 @@
|
|||
"Website": "https://plasma-mobile.org/"
|
||||
},
|
||||
"X-KDE-Keywords": "system,shell,panel",
|
||||
"X-KDE-Keywords[az]": "sistem,örtük,panel",
|
||||
"X-KDE-Keywords[ca]": "sistema,intèrpret d'ordres,plafó",
|
||||
"X-KDE-Keywords[en_GB]": "system,shell,panel",
|
||||
"X-KDE-Keywords[es]": "sistema,intérprete,intérprete de órdenes,panel",
|
||||
"X-KDE-Keywords[eu]": "sistema,shell,oskola,panela",
|
||||
"X-KDE-Keywords[fi]": "järjestelmä,komentotulkki,paneeli",
|
||||
"X-KDE-Keywords[he]": "מערכת,מעטפת,של,שאל,לוח,פאנל",
|
||||
"X-KDE-Keywords[hi]": "तंत्र,शैल,पैनल",
|
||||
"X-KDE-Keywords[hu]": "rendszer,felület,panel",
|
||||
"X-KDE-Keywords[ia]": "system,systema,shell,pannello",
|
||||
"X-KDE-Keywords[it]": "sistema,shell,pannello",
|
||||
"X-KDE-Keywords[ka]": "system,shell,panel, სისტემა, გარემო, პანელი",
|
||||
"X-KDE-Keywords[ko]": "system,shell,panel,시스템,셸,패널",
|
||||
"X-KDE-Keywords[nl]": "systeem,shell,paneel",
|
||||
"X-KDE-Keywords[pa]": "ਸਿਸਟਮ,ਸ਼ੈੱਲ,ਪੈਨਲ",
|
||||
"X-KDE-Keywords[pl]": "system,powłoka,panel",
|
||||
"X-KDE-Keywords[pt_BR]": "sistema,shell,painel",
|
||||
"X-KDE-Keywords[ro]": "sistem,interpretor,panou",
|
||||
"X-KDE-Keywords[sk]": "systém,shell,panel",
|
||||
"X-KDE-Keywords[sl]": "sistem,shell,kontrolna plošča",
|
||||
"X-KDE-Keywords[sv]": "system,skal,panel",
|
||||
"X-KDE-Keywords[tr]": "sistem,kabuk,panel",
|
||||
"X-KDE-Keywords[uk]": "system,shell,panel,система,оболонка,панель",
|
||||
"X-KDE-Keywords[x-test]": "xxsystemxx,xxshellxx,xxpanelxx",
|
||||
"X-KDE-System-Settings-Parent-Category": "personalization"
|
||||
}
|
||||
|
|
|
|||
|
|
@ -78,6 +78,14 @@
|
|||
"Name[zh_TW]": "電源"
|
||||
},
|
||||
"X-KDE-Keywords": "video, monitor, graphics, timeout, sleep, lock, screenlocker, screensaver",
|
||||
"X-KDE-Keywords[ca]": "vídeo,monitor,gràfics,temps d'espera,dormir,bloqueig,bloqueig de pantalla,estil de pantalla",
|
||||
"X-KDE-Keywords[he]": "וידאו,צג,תצוגה,מסך,מקרן,גרפיקה,תום זמן,המתנה,השהיה,שינה,נעילה,נועל מסך,שומר מסך",
|
||||
"X-KDE-Keywords[ia]": "video, monitor, graphics, timeout, sleep, lock, screenlocker, screensaver",
|
||||
"X-KDE-Keywords[ka]": "video, monitor, graphics, timeout, sleep, lock, screenlocker, screensaver, ეკრანის შემნახველი, ვიდეო, ეკრანი, გრაფიკა, მოლოდინის დრო, ძილი",
|
||||
"X-KDE-Keywords[sl]": "video, monitor, grafika, časovna omejitev, spanje, zaklepanje, zaklepanje zaslona, ohranjevalnik zaslona",
|
||||
"X-KDE-Keywords[sv]": "video, bildskärm, grafik, tidsgräns, viloläge, lår, skärmlåsning, skärmsläckare",
|
||||
"X-KDE-Keywords[uk]": "video, monitor, graphics, timeout, sleep, lock, screenlocker, screensaver, відео, монітор, графіка, час очікування, присипляння, блокування, збереження, екран",
|
||||
"X-KDE-Keywords[x-test]": "xxvideoxx,xx monitorxx,xx graphicsxx,xx timeoutxx,xx sleepxx,xx lockxx,xx screenlockerxx,xx screensaverxx",
|
||||
"X-KDE-System-Settings-Parent-Category": "system-administration",
|
||||
"X-KDE-Weight": 20
|
||||
}
|
||||
|
|
|
|||
|
|
@ -79,6 +79,14 @@
|
|||
"Name[zh_TW]": "時間與日期"
|
||||
},
|
||||
"X-KDE-Keywords": "theme, look, feel",
|
||||
"X-KDE-Keywords[ca]": "tema,aspecte,comportament",
|
||||
"X-KDE-Keywords[he]": "ערכת עיצוב,מראה,תחושה",
|
||||
"X-KDE-Keywords[ia]": "thema, semblantia, apparentia",
|
||||
"X-KDE-Keywords[ka]": "theme, look, feel, თემა, გარეგნობა",
|
||||
"X-KDE-Keywords[sl]": "tema, videz, občutek",
|
||||
"X-KDE-Keywords[sv]": "tema, utseende, känsla",
|
||||
"X-KDE-Keywords[uk]": "theme,look,feel,тема,вигляд,поведінка",
|
||||
"X-KDE-Keywords[x-test]": "xxthemexx,xx lookxx,xx feelxx",
|
||||
"X-KDE-System-Settings-Parent-Category": "regionalsettings",
|
||||
"X-KDE-Weight": 70
|
||||
}
|
||||
|
|
|
|||
|
|
@ -119,5 +119,13 @@
|
|||
"Website": "https://plasma-mobile.org"
|
||||
},
|
||||
"X-KDE-Keywords": "onscreen,osk,virtualkeyboard,keyboard",
|
||||
"X-KDE-Keywords[ca]": "en pantalla,osk,teclat virtual,teclat",
|
||||
"X-KDE-Keywords[he]": "על המסך,מקלדת על המסך,מקלדת וירטואלית,מקלדת",
|
||||
"X-KDE-Keywords[ia]": "onscreen,osk,virtualkeyboard,keyboard",
|
||||
"X-KDE-Keywords[ka]": "onscreen,osk,virtualkeyboard,keyboard,ეკრანზე, კლავიატურა ეკრანზე, კლავიატურა",
|
||||
"X-KDE-Keywords[sl]": "na zaslonu,osk,virtualna tipkovnica,tipkovnica",
|
||||
"X-KDE-Keywords[sv]": "på skärmen,virtuellt tangentbord,tangentbord",
|
||||
"X-KDE-Keywords[uk]": "onscreen,osk,virtualkeyboard,keyboard,екранна,екран,клавіатура",
|
||||
"X-KDE-Keywords[x-test]": "xxonscreenxx,xxoskxx,xxvirtualkeyboardxx,xxkeyboardxx",
|
||||
"X-KDE-System-Settings-Parent-Category": "input-devices"
|
||||
}
|
||||
|
|
|
|||
|
|
@ -84,6 +84,14 @@
|
|||
"Name[zh_TW]": "Wi-Fi"
|
||||
},
|
||||
"X-KDE-Keywords": "wifi,network",
|
||||
"X-KDE-Keywords[ca]": "wi-fi,xarxa",
|
||||
"X-KDE-Keywords[he]": "רשת אלחוטית,רשת,תקשורת",
|
||||
"X-KDE-Keywords[ia]": "wifi,network",
|
||||
"X-KDE-Keywords[ka]": "wifi,network, ქსელი",
|
||||
"X-KDE-Keywords[sl]": "wifi,omrežje",
|
||||
"X-KDE-Keywords[sv]": "wifi,nätverk",
|
||||
"X-KDE-Keywords[uk]": "wifi,network,вайфай,мережа",
|
||||
"X-KDE-Keywords[x-test]": "xxwifixx,xxnetworkxx",
|
||||
"X-KDE-System-Settings-Parent-Category": "network",
|
||||
"X-KDE-Weight": 70
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in a new issue