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
0cef797eb3
commit
ad3a2b2fb1
4 changed files with 9 additions and 0 deletions
|
|
@ -5,6 +5,7 @@
|
|||
Name=Shell
|
||||
Name[az]=Örtük
|
||||
Name[ca]=Intèrpret d'ordres
|
||||
Name[cs]=Shell
|
||||
Name[en_GB]=Shell
|
||||
Name[es]=Intérprete de órdenes
|
||||
Name[eu]=Oskola
|
||||
|
|
@ -14,6 +15,7 @@ Name[hu]=Felület
|
|||
Name[ko]=셸
|
||||
Name[nl]=Shell
|
||||
Name[nn]=Skal
|
||||
Name[pt_BR]=Shell
|
||||
Name[ro]=Interpretor
|
||||
Name[sl]=Shell
|
||||
Name[sv]=Skal
|
||||
|
|
@ -33,6 +35,7 @@ Comment[hu]=A rendszerfelület beállítása
|
|||
Comment[ko]=시스템 셸 설정
|
||||
Comment[nl]=De systeem-shell configureren
|
||||
Comment[nn]=Set opp systemskalet
|
||||
Comment[pt_BR]=Configurar o shell do sistema
|
||||
Comment[ro]=Configurează interpretorul sistemului
|
||||
Comment[sl]=Nastavi sistemski shell
|
||||
Comment[sv]=Anpassa systemskalet
|
||||
|
|
@ -68,6 +71,7 @@ X-KDE-Keywords[hu]=rendszer,felület,panel
|
|||
X-KDE-Keywords[ko]=system,shell,panel,시스템,셸,패널
|
||||
X-KDE-Keywords[nl]=systeem,shell,paneel
|
||||
X-KDE-Keywords[nn]=system,skal,shell,panel
|
||||
X-KDE-Keywords[pt_BR]=sistema,shell,painel
|
||||
X-KDE-Keywords[ro]=sistem,interpretor,panou
|
||||
X-KDE-Keywords[sl]=sistem,shell,kontrolna plošča
|
||||
X-KDE-Keywords[sv]=system,skal,panel
|
||||
|
|
|
|||
|
|
@ -5,6 +5,7 @@
|
|||
Name=Caffeine
|
||||
Name[az]=Caffeine
|
||||
Name[ca]=Caffeine
|
||||
Name[cs]=Caffeine
|
||||
Name[en_GB]=Caffeine
|
||||
Name[es]=Cafeína
|
||||
Name[eu]=Caffeine
|
||||
|
|
@ -14,6 +15,7 @@ Name[hu]=Caffeine
|
|||
Name[ko]=카페인
|
||||
Name[nl]=Cafeïne
|
||||
Name[nn]=Caffeine
|
||||
Name[pt_BR]=Cafeína
|
||||
Name[ro]=Cafeină
|
||||
Name[sl]=Caffeine
|
||||
Name[sv]=Koffein
|
||||
|
|
|
|||
|
|
@ -5,6 +5,7 @@
|
|||
Name=Virtual Keyboard Toggle
|
||||
Name[az]=Virtual klaviatura keçidi
|
||||
Name[ca]=Commutació del teclat virtual
|
||||
Name[cs]=Přepínání virtuální klávesnice
|
||||
Name[en_GB]=Virtual Keyboard Toggle
|
||||
Name[es]=Conmutación del teclado virtual
|
||||
Name[eu]=Alegiazko teklatua txandakatzea
|
||||
|
|
@ -12,6 +13,7 @@ Name[fr]=Basculement vers /hors clavier virtuel
|
|||
Name[hu]=Virtuális billentyűzet kapcsoló
|
||||
Name[ko]=가상 키보드 전환
|
||||
Name[nl]=Omschakeling van virtueel toetsenbord
|
||||
Name[pt_BR]=Alternar teclado virtual
|
||||
Name[sl]=Preklop navidezne tipkovnice
|
||||
Name[sv]=Visa eller dölj virtuellt tangentbord
|
||||
Name[tr]=Sanal Klavye Geçişi
|
||||
|
|
|
|||
|
|
@ -14,6 +14,7 @@ Name[hu]=Energia menü
|
|||
Name[ko]=전원 메뉴
|
||||
Name[nl]=Energiemenu
|
||||
Name[nn]=Kraftmeny
|
||||
Name[pt_BR]=Menu de energia
|
||||
Name[ro]=Meniu avansat
|
||||
Name[sl]=Meni energije
|
||||
Name[sv]=Strömmeny
|
||||
|
|
|
|||
Loading…
Reference in a new issue