mirror of
https://invent.kde.org/marcoa/shift-shell.git
synced 2026-04-29 15:03: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
5ca4a3665b
commit
c6b55a9534
4 changed files with 6 additions and 0 deletions
|
|
@ -16,6 +16,7 @@ Name[fr]=Shell
|
|||
Name[hi]=शेल
|
||||
Name[hu]=Felület
|
||||
Name[ia]=Shell
|
||||
Name[it]=Shell
|
||||
Name[ko]=셸
|
||||
Name[nl]=Shell
|
||||
Name[nn]=Skal
|
||||
|
|
@ -41,6 +42,7 @@ Comment[fr]=Configurer le shell du système
|
|||
Comment[hi]=तंत्र शेल विन्यस्त करें
|
||||
Comment[hu]=A rendszerfelület beállítása
|
||||
Comment[ia]=Configura le shell de systema
|
||||
Comment[it]=Configura la shell di sistema
|
||||
Comment[ko]=시스템 셸 설정
|
||||
Comment[nl]=De systeem-shell configureren
|
||||
Comment[nn]=Set opp systemskalet
|
||||
|
|
@ -82,6 +84,7 @@ X-KDE-Keywords[fr]=système, shell, panneau
|
|||
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[ko]=system,shell,panel,시스템,셸,패널
|
||||
X-KDE-Keywords[nl]=systeem,shell,paneel
|
||||
X-KDE-Keywords[nn]=system,skal,shell,panel
|
||||
|
|
|
|||
|
|
@ -14,6 +14,7 @@ Name[fi]=Näytä tai piilota näyttönäppäimistö
|
|||
Name[fr]=Basculement vers /hors clavier virtuel
|
||||
Name[hu]=Virtuális billentyűzet kapcsoló
|
||||
Name[ia]=Commuta Claviero Virtual
|
||||
Name[it]=Attiva/disattiva la tastiera virtuale
|
||||
Name[ko]=가상 키보드 전환
|
||||
Name[nl]=Omschakeling van virtueel toetsenbord
|
||||
Name[pt]=Comutar o Teclado Virtual
|
||||
|
|
|
|||
|
|
@ -14,6 +14,7 @@ Name[fr]=Menu « Énergie »
|
|||
Name[hi]=शक्ती मेन्यू
|
||||
Name[hu]=Energia menü
|
||||
Name[ia]=Menu de Potentia
|
||||
Name[it]=Menu accensione
|
||||
Name[ko]=전원 메뉴
|
||||
Name[nl]=Energiemenu
|
||||
Name[nn]=Kraftmeny
|
||||
|
|
|
|||
|
|
@ -33,6 +33,7 @@ Description[en_GB]=Settings application quick setting
|
|||
Description[es]=Ajuste rápido de la aplicación de preferencias
|
||||
Description[fi]=Asetussovelluksen pika-asetus
|
||||
Description[fr]=Configuration rapide de la configuration d'une application
|
||||
Description[it]=Impostazione delle impostazioni rapide
|
||||
Description[ko]=설정 프로그램 빠른 설정
|
||||
Description[nl]=Snelle instelling van toepassing voor instellingen
|
||||
Description[pt]=Configuração rápida da aplicação de definições
|
||||
|
|
|
|||
Loading…
Reference in a new issue