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
58ff9c9cc8
commit
3333246dba
|
@ -9,7 +9,6 @@
|
|||
],
|
||||
"Name": "Dolphin View",
|
||||
"Name[ar]": "عرض دولفين",
|
||||
"Name[ast]": "Vista de Dolphin",
|
||||
"Name[az]": "Dolphin görünüşü",
|
||||
"Name[bg]": "Изглед на Dolphin",
|
||||
"Name[ca@valencia]": "Vista de Dolphin",
|
||||
|
|
|
@ -8,7 +8,6 @@ Actions=icons;details;compact;
|
|||
[Desktop Action icons]
|
||||
Name=Icons
|
||||
Name[ar]=الأيقونات
|
||||
Name[ast]=Iconos
|
||||
Name[az]=İkonlar
|
||||
Name[bg]=Икони
|
||||
Name[ca]=Icones
|
||||
|
@ -69,7 +68,6 @@ Exec=dolphin
|
|||
[Desktop Action compact]
|
||||
Name=Compact
|
||||
Name[ar]=متراصّ
|
||||
Name[ast]=Compauta
|
||||
Name[az]=Yığcam
|
||||
Name[bg]=Компактен
|
||||
Name[ca]=Compacta
|
||||
|
@ -129,7 +127,6 @@ Exec=dolphin
|
|||
[Desktop Action details]
|
||||
Name=Details
|
||||
Name[ar]=التّفاصيل
|
||||
Name[ast]=Detalles
|
||||
Name[az]=Ətraflı
|
||||
Name[bg]=Подробности
|
||||
Name[ca]=Detalls
|
||||
|
|
|
@ -1,7 +1,6 @@
|
|||
[Desktop Entry]
|
||||
Name=Dolphin
|
||||
Name[ar]=دولفين
|
||||
Name[ast]=Dolphin
|
||||
Name[az]=Dolphin
|
||||
Name[bg]=Dolphin
|
||||
Name[ca]=Dolphin
|
||||
|
@ -62,7 +61,6 @@ X-DocPath=dolphin/index.html
|
|||
Categories=Qt;KDE;System;FileTools;FileManager;
|
||||
GenericName=File Manager
|
||||
GenericName[ar]=مدير ملفّات
|
||||
GenericName[ast]=Xestor de ficheros
|
||||
GenericName[az]=Fayl meneceri
|
||||
GenericName[bg]=Файлов мениджър
|
||||
GenericName[ca]=Gestor de fitxers
|
||||
|
|
|
@ -39,7 +39,6 @@
|
|||
"Icon": "preferences-desktop-navigation",
|
||||
"Name": "Navigation",
|
||||
"Name[ar]": "التّنقّل",
|
||||
"Name[ast]": "Navegación",
|
||||
"Name[az]": "Naviqasiya",
|
||||
"Name[bg]": "Навигация",
|
||||
"Name[ca@valencia]": "Navegació",
|
||||
|
|
|
@ -39,7 +39,6 @@
|
|||
"Icon": "preferences-desktop-icons",
|
||||
"Name": "View Modes",
|
||||
"Name[ar]": "أوضاع المنظور",
|
||||
"Name[ast]": "Moos de vista",
|
||||
"Name[az]": "Baxış rejimləri",
|
||||
"Name[bg]": "Режими на преглед",
|
||||
"Name[ca@valencia]": "Modes de vista",
|
||||
|
|
Loading…
Reference in a new issue