mirror of
https://invent.kde.org/system/dolphin
synced 2024-10-28 03:21:56 +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
95f9dc9de0
commit
4d9c396a98
|
@ -71,6 +71,7 @@ Name[et]=Ikoonid
|
|||
Name[fi]=Kuvakkeet
|
||||
Name[fr]=Icônes
|
||||
Name[gl]=Iconas
|
||||
Name[he]=סמלים
|
||||
Name[hu]=Ikonok
|
||||
Name[ia]=Icones
|
||||
Name[id]=Ikon
|
||||
|
@ -118,6 +119,7 @@ Name[et]=Kompaktne
|
|||
Name[fi]=Tiivis
|
||||
Name[fr]=Concis
|
||||
Name[gl]=Compacta
|
||||
Name[he]=קומפקטי
|
||||
Name[hu]=Kompakt
|
||||
Name[ia]=Compacte
|
||||
Name[id]=Sederhana
|
||||
|
@ -165,6 +167,7 @@ Name[et]=Üksikasjad
|
|||
Name[fi]=Yksityiskohdat
|
||||
Name[fr]=Détails
|
||||
Name[gl]=Detalles
|
||||
Name[he]=פרטים
|
||||
Name[hu]=Részletek
|
||||
Name[ia]=Detalios
|
||||
Name[id]=Detail
|
||||
|
|
|
@ -62,6 +62,7 @@ GenericName[et]=Failihaldur
|
|||
GenericName[fi]=Tiedostonhallinta
|
||||
GenericName[fr]=Gestionnaire de fichiers
|
||||
GenericName[gl]=Xestor de ficheiros
|
||||
GenericName[he]=מנהל קבצים
|
||||
GenericName[hu]=Fájlkezelő
|
||||
GenericName[ia]=Gerente de file
|
||||
GenericName[id]=Manajer Berkas
|
||||
|
|
|
@ -108,6 +108,7 @@ Name[et]=Üldine
|
|||
Name[fi]=Yleiset
|
||||
Name[fr]=Général
|
||||
Name[gl]=Xerais
|
||||
Name[he]=כללי
|
||||
Name[hu]=Általános
|
||||
Name[ia]=General
|
||||
Name[id]=Umum
|
||||
|
@ -191,6 +192,7 @@ X-KDE-Keywords[et]=failihaldur
|
|||
X-KDE-Keywords[fi]=tiedostonhallinta
|
||||
X-KDE-Keywords[fr]=gestionnaire de fichiers
|
||||
X-KDE-Keywords[gl]=xestor de ficheiros
|
||||
X-KDE-Keywords[he]=מנהל קבצים
|
||||
X-KDE-Keywords[hu]=fájlkezelő
|
||||
X-KDE-Keywords[ia]=gerente de file
|
||||
X-KDE-Keywords[id]=manajer berkas
|
||||
|
|
|
@ -107,6 +107,7 @@ Name[et]=Liikumine
|
|||
Name[fi]=Selaus
|
||||
Name[fr]=Navigation
|
||||
Name[gl]=Navegación
|
||||
Name[he]=ניווט
|
||||
Name[hu]=Navigálás
|
||||
Name[ia]=Navigation
|
||||
Name[id]=Navigasi
|
||||
|
@ -192,6 +193,7 @@ X-KDE-Keywords[et]=failihaldur
|
|||
X-KDE-Keywords[fi]=tiedostonhallinta
|
||||
X-KDE-Keywords[fr]=gestionnaire de fichiers
|
||||
X-KDE-Keywords[gl]=xestor de ficheiros
|
||||
X-KDE-Keywords[he]=מנהל קבצים
|
||||
X-KDE-Keywords[hu]=fájlkezelő
|
||||
X-KDE-Keywords[ia]=gerente de file
|
||||
X-KDE-Keywords[id]=manajer berkas
|
||||
|
|
|
@ -66,6 +66,7 @@ Name[et]=Teenused
|
|||
Name[fi]=Palvelut
|
||||
Name[fr]=Services
|
||||
Name[gl]=Servizos
|
||||
Name[he]=שירותים
|
||||
Name[hu]=Szolgáltatások
|
||||
Name[ia]=Servicios
|
||||
Name[id]=Layanan
|
||||
|
@ -149,6 +150,7 @@ X-KDE-Keywords[et]=failihaldur
|
|||
X-KDE-Keywords[fi]=tiedostonhallinta
|
||||
X-KDE-Keywords[fr]=gestionnaire de fichiers
|
||||
X-KDE-Keywords[gl]=xestor de ficheiros
|
||||
X-KDE-Keywords[he]=מנהל קבצים
|
||||
X-KDE-Keywords[hu]=fájlkezelő
|
||||
X-KDE-Keywords[ia]=gerente de file
|
||||
X-KDE-Keywords[id]=manajer berkas
|
||||
|
|
|
@ -191,6 +191,7 @@ X-KDE-Keywords[et]=failihaldur
|
|||
X-KDE-Keywords[fi]=tiedostonhallinta
|
||||
X-KDE-Keywords[fr]=gestionnaire de fichiers
|
||||
X-KDE-Keywords[gl]=xestor de ficheiros
|
||||
X-KDE-Keywords[he]=מנהל קבצים
|
||||
X-KDE-Keywords[hu]=fájlkezelő
|
||||
X-KDE-Keywords[ia]=gerente de file
|
||||
X-KDE-Keywords[id]=manajer berkas
|
||||
|
|
Loading…
Reference in a new issue