wilderjds
/
okular
1
0
Fork 0
Code Issues Pull Requests 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"
remotes/origin/work/aacid/okular_focus_actions
l10n daemon script 5 years ago
parent 45a50b2d81
commit dd621979cd
1 changed files with 1 additions and 1 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      generators/fictionbook/libokularGenerator_fb.json

2
generators/fictionbook/libokularGenerator_fb.json
Unescape View File

@ -136,7 +136,7 @@
"Name[et]": "Fiction Booki taustaprogramm", "Name[et]": "Fiction Booki taustaprogramm",
"Name[eu]": "Fiction Book-en bizkarraldekoa", "Name[eu]": "Fiction Book-en bizkarraldekoa",
"Name[fi]": "FictionBook-taustaosa", "Name[fi]": "FictionBook-taustaosa",
"Name[fr]": "Moteur pour FictionBook", "Name[fr]": "Moteur pour « FictionBook »",
"Name[gl]": "Infraestrutura para libros FictionBook", "Name[gl]": "Infraestrutura para libros FictionBook",
"Name[ia]": "Retro adminisration de Fiction Book", "Name[ia]": "Retro adminisration de Fiction Book",
"Name[it]": "Backend Fiction Book", "Name[it]": "Backend Fiction Book",

Write Preview
Loading…
Cancel
Save