mirror of
https://invent.kde.org/system/dolphin
synced 2024-10-05 16:19:10 +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
85083b209c
commit
30b62a1c04
|
@ -35,13 +35,16 @@
|
||||||
"Name[lv]": "Dolphin skats",
|
"Name[lv]": "Dolphin skats",
|
||||||
"Name[ml]": "ഡോള്ഫിന് അവതരണരീതി",
|
"Name[ml]": "ഡോള്ഫിന് അവതരണരീതി",
|
||||||
"Name[my]": "လင်းပိုင် မြင်ကွင်း",
|
"Name[my]": "လင်းပိုင် မြင်ကွင်း",
|
||||||
|
"Name[nb]": "Dolphin visning",
|
||||||
"Name[nl]": "Dolphin-weergave",
|
"Name[nl]": "Dolphin-weergave",
|
||||||
|
"Name[nn]": "Dolphin-vising",
|
||||||
"Name[pa]": "ਡਾਲਫਿਨ ਝਲਕ",
|
"Name[pa]": "ਡਾਲਫਿਨ ਝਲਕ",
|
||||||
"Name[pl]": "Widok Dolphina",
|
"Name[pl]": "Widok Dolphina",
|
||||||
"Name[pt]": "Área do Dolphin",
|
"Name[pt]": "Área do Dolphin",
|
||||||
"Name[pt_BR]": "Visualização do Dolphin",
|
"Name[pt_BR]": "Visualização do Dolphin",
|
||||||
"Name[ro]": "Dolphin – Vizualizare",
|
"Name[ro]": "Dolphin – Vizualizare",
|
||||||
"Name[ru]": "Представление Dolphin",
|
"Name[ru]": "Представление Dolphin",
|
||||||
|
"Name[se]": "Dolphinčájeheapmi",
|
||||||
"Name[sk]": "Dolphin pohľad",
|
"Name[sk]": "Dolphin pohľad",
|
||||||
"Name[sl]": "Dolphin - pogled",
|
"Name[sl]": "Dolphin - pogled",
|
||||||
"Name[sr@ijekavian]": "Делфинов приказ",
|
"Name[sr@ijekavian]": "Делфинов приказ",
|
||||||
|
|
|
@ -12,6 +12,7 @@
|
||||||
"Description[it]": "Configura le impostazioni generali del gestore dei file",
|
"Description[it]": "Configura le impostazioni generali del gestore dei file",
|
||||||
"Description[ko]": "일반 파일 관리자 설정",
|
"Description[ko]": "일반 파일 관리자 설정",
|
||||||
"Description[nl]": "Algemene bestandsbeheerderinstellingen configureren",
|
"Description[nl]": "Algemene bestandsbeheerderinstellingen configureren",
|
||||||
|
"Description[nn]": "Set opp generelle innstillingar for filhandsamaren",
|
||||||
"Description[pl]": "Ustawienia ogólne zarządzania plikami",
|
"Description[pl]": "Ustawienia ogólne zarządzania plikami",
|
||||||
"Description[pt]": "Configurar as definições gerais do gestor de ficheiros",
|
"Description[pt]": "Configurar as definições gerais do gestor de ficheiros",
|
||||||
"Description[pt_BR]": "Configura as opções gerais do gerenciador de arquivos",
|
"Description[pt_BR]": "Configura as opções gerais do gerenciador de arquivos",
|
||||||
|
@ -38,6 +39,7 @@
|
||||||
"Name[it]": "Generale",
|
"Name[it]": "Generale",
|
||||||
"Name[ko]": "일반",
|
"Name[ko]": "일반",
|
||||||
"Name[nl]": "Algemeen",
|
"Name[nl]": "Algemeen",
|
||||||
|
"Name[nn]": "Generelt",
|
||||||
"Name[pl]": "Ogólne",
|
"Name[pl]": "Ogólne",
|
||||||
"Name[pt]": "Geral",
|
"Name[pt]": "Geral",
|
||||||
"Name[pt_BR]": "Geral",
|
"Name[pt_BR]": "Geral",
|
||||||
|
|
|
@ -12,6 +12,7 @@
|
||||||
"Description[it]": "Configura la navigazione col gestore dei file",
|
"Description[it]": "Configura la navigazione col gestore dei file",
|
||||||
"Description[ko]": "파일 관리자 탐색 설정",
|
"Description[ko]": "파일 관리자 탐색 설정",
|
||||||
"Description[nl]": "Bestandsbeheerdernavigatie configureren",
|
"Description[nl]": "Bestandsbeheerdernavigatie configureren",
|
||||||
|
"Description[nn]": "Set opp navigasjonen i filhandsamaren",
|
||||||
"Description[pl]": "Ustawienia poruszania się przy zarządzaniu plikami",
|
"Description[pl]": "Ustawienia poruszania się przy zarządzaniu plikami",
|
||||||
"Description[pt]": "Configurar a navegação do gestor de ficheiros",
|
"Description[pt]": "Configurar a navegação do gestor de ficheiros",
|
||||||
"Description[pt_BR]": "Configura a navegação do gerenciador de arquivos",
|
"Description[pt_BR]": "Configura a navegação do gerenciador de arquivos",
|
||||||
|
|
|
@ -12,6 +12,7 @@
|
||||||
"Description[it]": "Configura le viste del gestore dei file",
|
"Description[it]": "Configura le viste del gestore dei file",
|
||||||
"Description[ko]": "파일 관리자 보기 모드 설정",
|
"Description[ko]": "파일 관리자 보기 모드 설정",
|
||||||
"Description[nl]": "Bestandsbeheerderweergavemodussen configureren",
|
"Description[nl]": "Bestandsbeheerderweergavemodussen configureren",
|
||||||
|
"Description[nn]": "Set opp visingsmodusane i filhandsamaren",
|
||||||
"Description[pl]": "Ustawienia trybów widoku zarządzania plikami",
|
"Description[pl]": "Ustawienia trybów widoku zarządzania plikami",
|
||||||
"Description[pt]": "Configurar os modos de visualização do gestor de ficheiros",
|
"Description[pt]": "Configurar os modos de visualização do gestor de ficheiros",
|
||||||
"Description[pt_BR]": "Configura os modos de exibição do gerenciador de arquivos",
|
"Description[pt_BR]": "Configura os modos de exibição do gerenciador de arquivos",
|
||||||
|
|
Loading…
Reference in a new issue