diff options
| author | l10n daemon script <[email protected]> | 2023-03-21 01:43:27 +0000 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2023-03-21 01:43:27 +0000 |
| commit | 53eba0b14c83b85edbd55962e49c6df3e0049380 (patch) | |
| tree | 82f3980805cde0c5f8b442cc6748b69e1fe0f300 /src | |
| parent | 7b2847568f0af9311f26761d4d4da748f83d1054 (diff) | |
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"
Diffstat (limited to 'src')
| -rwxr-xr-x | src/org.kde.dolphin.desktop | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/org.kde.dolphin.desktop b/src/org.kde.dolphin.desktop index 8b957e66e..701976202 100755 --- a/src/org.kde.dolphin.desktop +++ b/src/org.kde.dolphin.desktop @@ -134,6 +134,7 @@ Keywords[da]=filer;filhåndtering;stifinder;filbrowsing;samba;netværksressource Keywords[de]=Dateien;Dateiverwaltung;Netzwerkfreigaben; Keywords[el]=αρχεία;διαχείριση αρχείων;περιήγηση;samba;δικτυακοί πόροι;Εξερευνητής;Αναζήτηση; Keywords[en_GB]=files;file management;file browsing;samba;network shares;Explorer;Finder; +Keywords[eo]=dosieroj;dosieradministrado;dosierfoliumado;samba;retkunhavigoj;Explorer;Finder; Keywords[es]=archivos;gestión de archivos;administración de archivos;exploración de archivos;samba;recursos compartidos de red;gestor de archivos;administrador de archivos;explorador;buscador; Keywords[eu]=fitxategiak;fitxategi kudeaketa;fitxategiak arakatzea;samba;sare partekatzeak; Esploratzailea;Bilatzailea; Keywords[fi]=tiedostot;tiedostonhallinta;tiedostojen selaus;samba;verkko;verkkojaot;Explorer;Finder; |