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
02ccfb4faa
commit
e49068db5e
7 changed files with 8 additions and 1 deletions
|
|
@ -77,6 +77,7 @@
|
|||
},
|
||||
"X-KDE-Keywords": "mobile,data,network",
|
||||
"X-KDE-Keywords[ca]": "mòbil,dades,xarxa",
|
||||
"X-KDE-Keywords[gl]": "móbil,datos,rede",
|
||||
"X-KDE-Keywords[he]": "נייד,נתונים,רשת,פס רחב",
|
||||
"X-KDE-Keywords[ia]": "mobile,data,network",
|
||||
"X-KDE-Keywords[ka]": "mobile,data,network,მობილური ინტერნეტი,ქსელი",
|
||||
|
|
|
|||
|
|
@ -80,6 +80,7 @@
|
|||
},
|
||||
"X-KDE-Keywords": "info, distro, system",
|
||||
"X-KDE-Keywords[ca]": "informació,distribució,sistema",
|
||||
"X-KDE-Keywords[gl]": "info, información, distro, distribución, sistema",
|
||||
"X-KDE-Keywords[he]": "פרטים,מידע,הפצה,מערכת",
|
||||
"X-KDE-Keywords[ia]": "info, distro, system",
|
||||
"X-KDE-Keywords[ka]": "info, distro, system, ინფორმაცია, დისტრიბუტივი, სისტემა",
|
||||
|
|
|
|||
|
|
@ -137,6 +137,8 @@
|
|||
"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[fr]": "système, shell, panneau",
|
||||
"X-KDE-Keywords[gl]": "system,sistema,shell,terminal,consola,intérprete de ordes,panel",
|
||||
"X-KDE-Keywords[he]": "מערכת,מעטפת,של,שאל,לוח,פאנל",
|
||||
"X-KDE-Keywords[hi]": "तंत्र,शैल,पैनल",
|
||||
"X-KDE-Keywords[hu]": "rendszer,felület,panel",
|
||||
|
|
@ -146,7 +148,6 @@
|
|||
"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",
|
||||
|
|
|
|||
|
|
@ -79,6 +79,7 @@
|
|||
},
|
||||
"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[gl]": "vídeo, monitor, gráficos, tempo límite, hibernar, bloquear, bloqueador de pantalla, salvapantallas",
|
||||
"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, ეკრანის შემნახველი, ვიდეო, ეკრანი, გრაფიკა, მოლოდინის დრო, ძილი",
|
||||
|
|
|
|||
|
|
@ -80,6 +80,7 @@
|
|||
},
|
||||
"X-KDE-Keywords": "theme, look, feel",
|
||||
"X-KDE-Keywords[ca]": "tema,aspecte,comportament",
|
||||
"X-KDE-Keywords[gl]": "tema, aparencia, estilo, comportamento",
|
||||
"X-KDE-Keywords[he]": "ערכת עיצוב,מראה,תחושה",
|
||||
"X-KDE-Keywords[ia]": "thema, semblantia, apparentia",
|
||||
"X-KDE-Keywords[ka]": "theme, look, feel, თემა, გარეგნობა",
|
||||
|
|
|
|||
|
|
@ -120,6 +120,7 @@
|
|||
},
|
||||
"X-KDE-Keywords": "onscreen,osk,virtualkeyboard,keyboard",
|
||||
"X-KDE-Keywords[ca]": "en pantalla,osk,teclat virtual,teclat",
|
||||
"X-KDE-Keywords[gl]": "onscreen,en pantalla,osk,virtualkeyboard,teclado virtual,keyboard,teclado",
|
||||
"X-KDE-Keywords[he]": "על המסך,מקלדת על המסך,מקלדת וירטואלית,מקלדת",
|
||||
"X-KDE-Keywords[ia]": "onscreen,osk,virtualkeyboard,keyboard",
|
||||
"X-KDE-Keywords[ka]": "onscreen,osk,virtualkeyboard,keyboard,ეკრანზე, კლავიატურა ეკრანზე, კლავიატურა",
|
||||
|
|
|
|||
|
|
@ -85,6 +85,7 @@
|
|||
},
|
||||
"X-KDE-Keywords": "wifi,network",
|
||||
"X-KDE-Keywords[ca]": "wi-fi,xarxa",
|
||||
"X-KDE-Keywords[gl]": "sen fíos,wifi,rede",
|
||||
"X-KDE-Keywords[he]": "רשת אלחוטית,רשת,תקשורת",
|
||||
"X-KDE-Keywords[ia]": "wifi,network",
|
||||
"X-KDE-Keywords[ka]": "wifi,network, ქსელი",
|
||||
|
|
|
|||
Loading…
Reference in a new issue