kde/dolphin
kde/dolphin
1
0
Fork 0
mirror of https://invent.kde.org/system/dolphin synced 2024-09-17 15:31:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

SVN_SILENT made messages (.desktop file) - always resolve ours

Browse source 
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:
l10n daemon script 2022-10-20 02:11:03 +00:00
parent 58ff9c9cc8
commit 3333246dba
5 changed files with 0 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/dolphinpart.json.in
View file

@ -9,7 +9,6 @@
], ],
"Name": "Dolphin View", "Name": "Dolphin View",
"Name[ar]": "عرض دولفين", "Name[ar]": "عرض دولفين",
"Name[ast]": "Vista de Dolphin",
"Name[az]": "Dolphin görünüşü", "Name[az]": "Dolphin görünüşü",
"Name[bg]": "Изглед на Dolphin", "Name[bg]": "Изглед на Dolphin",
"Name[ca@valencia]": "Vista de Dolphin", "Name[ca@valencia]": "Vista de Dolphin",

3
src/dolphinpartactions.desktop
View file

@ -8,7 +8,6 @@ Actions=icons;details;compact;
[Desktop Action icons] [Desktop Action icons]
Name=Icons Name=Icons
Name[ar]=الأيقونات Name[ar]=الأيقونات
Name[ast]=Iconos
Name[az]=İkonlar Name[az]=İkonlar
Name[bg]=Икони Name[bg]=Икони
Name[ca]=Icones Name[ca]=Icones
@ -69,7 +68,6 @@ Exec=dolphin
[Desktop Action compact] [Desktop Action compact]
Name=Compact Name=Compact
Name[ar]=متراصّ Name[ar]=متراصّ
Name[ast]=Compauta
Name[az]=Yığcam Name[az]=Yığcam
Name[bg]=Компактен Name[bg]=Компактен
Name[ca]=Compacta Name[ca]=Compacta
@ -129,7 +127,6 @@ Exec=dolphin
[Desktop Action details] [Desktop Action details]
Name=Details Name=Details
Name[ar]=التّفاصيل Name[ar]=التّفاصيل
Name[ast]=Detalles
Name[az]=Ətraflı Name[az]=Ətraflı
Name[bg]=Подробности Name[bg]=Подробности
Name[ca]=Detalls Name[ca]=Detalls

2
src/org.kde.dolphin.desktop
View file

@ -1,7 +1,6 @@
[Desktop Entry] [Desktop Entry]
Name=Dolphin Name=Dolphin
Name[ar]=دولفين Name[ar]=دولفين
Name[ast]=Dolphin
Name[az]=Dolphin Name[az]=Dolphin
Name[bg]=Dolphin Name[bg]=Dolphin
Name[ca]=Dolphin Name[ca]=Dolphin
@ -62,7 +61,6 @@ X-DocPath=dolphin/index.html
Categories=Qt;KDE;System;FileTools;FileManager; Categories=Qt;KDE;System;FileTools;FileManager;
GenericName=File Manager GenericName=File Manager
GenericName[ar]=مدير ملفّات GenericName[ar]=مدير ملفّات
GenericName[ast]=Xestor de ficheros
GenericName[az]=Fayl meneceri GenericName[az]=Fayl meneceri
GenericName[bg]=Файлов мениджър GenericName[bg]=Файлов мениджър
GenericName[ca]=Gestor de fitxers GenericName[ca]=Gestor de fitxers

1
src/settings/kcm/kcmdolphinnavigation.json
View file

@ -39,7 +39,6 @@
"Icon": "preferences-desktop-navigation", "Icon": "preferences-desktop-navigation",
"Name": "Navigation", "Name": "Navigation",
"Name[ar]": "التّنقّل", "Name[ar]": "التّنقّل",
"Name[ast]": "Navegación",
"Name[az]": "Naviqasiya", "Name[az]": "Naviqasiya",
"Name[bg]": "Навигация", "Name[bg]": "Навигация",
"Name[ca@valencia]": "Navegació", "Name[ca@valencia]": "Navegació",

1
src/settings/kcm/kcmdolphinviewmodes.json
View file

@ -39,7 +39,6 @@
"Icon": "preferences-desktop-icons", "Icon": "preferences-desktop-icons",
"Name": "View Modes", "Name": "View Modes",
"Name[ar]": "أوضاع المنظور", "Name[ar]": "أوضاع المنظور",
"Name[ast]": "Moos de vista",
"Name[az]": "Baxış rejimləri", "Name[az]": "Baxış rejimləri",
"Name[bg]": "Режими на преглед", "Name[bg]": "Режими на преглед",
"Name[ca@valencia]": "Modes de vista", "Name[ca@valencia]": "Modes de vista",